1 files changed, 12 insertions, 0 deletions
diff --git a/spec/ruby/core/float/plus_spec.rb b/spec/ruby/core/float/plus_spec.rb
new file mode 100644
index 0000000000..e3e19d7f39
--- /dev/null
+++ b/spec/ruby/core/float/plus_spec.rb
@@ -0,0 +1,12 @@
+require_relative '../../spec_helper'
+require_relative 'shared/arithmetic_exception_in_coerce'
+
+describe "Float#+" do
+  it_behaves_like :float_arithmetic_exception_in_coerce, :+
+
+  it "returns self plus other" do
+    (491.213 + 2).should be_close(493.213, TOLERANCE)
+    (9.99 + bignum_value).should be_close(18446744073709551616.0, TOLERANCE)
+    (1001.99 + 5.219).should be_close(1007.209, TOLERANCE)
+  end
+end
diff --git a/.cvsignore b/.cvsignore
index 76c9bc0b78..a72211d03f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,7 +14,6 @@
 COPYING.LIB
 ChangeLog.pre-alpha
 ChangeLog.pre1_1
-ChangeLog-1.8.0
 Makefile
 README.fat-patch
 README.v6
@@ -35,12 +34,9 @@ newdate.rb
 newver.rb
 parse.c
 patches
-patches-master
-pitest.rb
 ppack
 preview
 rbconfig.rb
-rename2.h
 repack
 riscos
 rubicon
diff --git a/.gdbinit b/.gdbinit
deleted file mode 100644
index 8598cf0ab7..0000000000
--- a/.gdbinit
+++ /dev/null
@@ -1,522 +0,0 @@
-define rp
-  if (VALUE)$arg0 & RUBY_FIXNUM_FLAG
-    printf "FIXNUM: %ld\n", $arg0 >> 1
-  else
-  if ((VALUE)$arg0 & ~(~(VALUE)0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
-    printf "SYMBOL(%ld)\n", $arg0 >> RUBY_SPECIAL_SHIFT
-  else
-  if $arg0 == RUBY_Qfalse
-    echo false\n
-  else
-  if $arg0 == RUBY_Qtrue
-    echo true\n
-  else
-  if $arg0 == RUBY_Qnil
-    echo nil\n
-  else
-  if $arg0 == RUBY_Qundef
-    echo undef\n
-  else
-  if (VALUE)$arg0 & RUBY_IMMEDIATE_MASK
-    echo immediate\n
-  else
-  set $flags = ((struct RBasic*)$arg0)->flags
-  if ($flags & RUBY_T_MASK) == RUBY_T_NONE
-    printf "T_NONE: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_NIL
-    printf "T_NIL: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
-    printf "T_OBJECT: "
-    print (struct RObject *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
-    printf "T_CLASS: "
-    print (struct RClass *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
-    printf "T_ICLASS: "
-    print (struct RClass *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
-    printf "T_MODULE: "
-    print (struct RClass *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
-    printf "T_FLOAT: %.16g ", (((struct RFloat*)$arg0)->float_value)
-    print (struct RFloat *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_STRING
-    printf "T_STRING: "
-    set print address off
-    output (char *)(($flags & RUBY_FL_USER1) ? \
-	    ((struct RString*)$arg0)->as.heap.ptr : \
-	    ((struct RString*)$arg0)->as.ary)
-    set print address on
-    printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
-            ((struct RString*)$arg0)->as.heap.len : \
-            (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
-    if !($flags & RUBY_FL_USER1)
-      printf "(embed) "
-    else
-      if ($flags & RUBY_FL_USER2)
-        printf "(shared) "
-      end
-      if ($flags & RUBY_FL_USER3)
-        printf "(assoc) "
-      end
-    end
-    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
-      printf "coderange:unknown "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
-      printf "coderange:7bit "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
-      printf "coderange:valid "
-    else
-      printf "coderange:broken "
-    end
-    end
-    end
-    print (struct RString *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
-    printf "T_REGEXP: "
-    set print address off
-    output ((struct RRegexp*)$arg0)->str
-    set print address on
-    printf " len:%ld ", ((struct RRegexp*)$arg0)->len
-    if $flags & RUBY_FL_USER6
-      printf "(none) "
-    end
-    if $flags & RUBY_FL_USER5
-      printf "(literal) "
-    end
-    if $flags & RUBY_FL_USER4
-      printf "(fixed) "
-    end
-    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
-    print (struct RRegexp *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
-    printf "T_ARRAY: len=%ld ", ((struct RArray*)$arg0)->len
-    print (struct RArray *)$arg0
-    x/xw ((struct RArray*)$arg0)->ptr
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
-    printf "T_FIXNUM: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_HASH
-    printf "T_HASH: ",
-    if ((struct RHash *)$arg0)->ntbl
-      printf "len=%ld ", ((struct RHash *)$arg0)->ntbl->num_entries
-    end
-    print (struct RHash *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
-    printf "T_STRUCT: len=%ld ", \
-      (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
-       ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
-       ((struct RStruct *)$arg0)->as.heap.len)
-    print (struct RStruct *)$arg0
-    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
-          ((struct RStruct *)$arg0)->as.ary : \
-          ((struct RStruct *)$arg0)->as.heap.len)
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
-    printf "T_BIGNUM: sign=%d len=%ld ", \
-      (($flags & RUBY_FL_USER1) != 0), \
-      (($flags & RUBY_FL_USER2) ? \
-       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
-       ((struct RBignum*)$arg0)->as.heap.len)
-    if $flags & RUBY_FL_USER2
-      printf "(embed) "
-    end
-    print (struct RBignum *)$arg0
-    x/xw (($flags & RUBY_FL_USER2) ? \
-          ((struct RBignum*)$arg0)->as.ary : \
-          ((struct RBignum*)$arg0)->as.heap.digits)
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
-    printf "T_RATIONAL: "
-    print (struct RRational *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
-    printf "T_COMPLEX: "
-    print (struct RComplex *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_FILE
-    printf "T_FILE: "
-    print (struct RFile *)$arg0
-    output *((struct RFile *)$arg0)->fptr
-    printf "\n"
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_TRUE
-    printf "T_TRUE: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_FALSE
-    printf "T_FALSE: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_DATA
-    printf "T_DATA: "
-    print (struct RData *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
-    printf "T_MATCH: "
-    print (struct RMatch *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
-    printf "T_SYMBOL: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
-    printf "T_UNDEF: "
-    print (struct RBasic *)$arg0
-  else
-  if ($flags & RUBY_T_MASK) == RUBY_T_NODE
-    printf "T_NODE("
-    output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
-    printf "): "
-    print *(NODE *)$arg0
-  else
-    printf "unknown: "
-    print (struct RBasic *)$arg0
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-end
-document rp
-  Print a Ruby's VALUE.
-end
-
-define nd_type
-  print (enum node_type)((((NODE*)$arg0)->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
-end
-document nd_type
-  Print a Ruby' node type.
-end
-
-define nd_file
-  print ((NODE*)$arg0)->nd_file
-end
-document nd_file
-  Print the source file name of a node.
-end
-
-define nd_line
-  print ((unsigned int)((((NODE*)$arg0)->flags>>RUBY_NODE_LSHIFT)&RUBY_NODE_LMASK))
-end
-document nd_line
-  Print the source line number of a node.
-end
-
-# Print members of ruby node.
-
-define nd_head
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_alen
-  printf "u2.argc: "
-  p $arg0.u2.argc
-end
-
-define nd_next
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_cond
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_body
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-define nd_else
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_orig
-  printf "u3.value: "
-  rp $arg0.u3.value
-end
-
-
-define nd_resq
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-define nd_ensr
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_1st
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_2nd
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-
-define nd_stts
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-
-define nd_entry
-  printf "u3.entry: "
-  p $arg0.u3.entry
-end
-
-define nd_vid
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_cflag
-  printf "u2.id: "
-  p $arg0.u2.id
-end
-
-define nd_cval
-  printf "u3.value: "
-  rp $arg0.u3.value
-end
-
-
-define nd_cnt
-  printf "u3.cnt: "
-  p $arg0.u3.cnt
-end
-
-define nd_tbl
-  printf "u1.tbl: "
-  p $arg0.u1.tbl
-end
-
-
-define nd_var
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_ibdy
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-define nd_iter
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_value
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-define nd_aid
-  printf "u3.id: "
-  p $arg0.u3.id
-end
-
-
-define nd_lit
-  printf "u1.value: "
-  rp $arg0.u1.value
-end
-
-
-define nd_frml
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_rest
-  printf "u2.argc: "
-  p $arg0.u2.argc
-end
-
-define nd_opt
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-
-define nd_recv
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_mid
-  printf "u2.id: "
-  p $arg0.u2.id
-end
-
-define nd_args
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_noex
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_defn
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_old
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_new
-  printf "u2.id: "
-  p $arg0.u2.id
-end
-
-
-define nd_cfnc
-  printf "u1.cfunc: "
-  p $arg0.u1.cfunc
-end
-
-define nd_argc
-  printf "u2.argc: "
-  p $arg0.u2.argc
-end
-
-
-define nd_cname
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_super
-  printf "u3.node: "
-  rp $arg0.u3.node
-end
-
-
-define nd_modl
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_clss
-  printf "u1.value: "
-  rp $arg0.u1.value
-end
-
-
-define nd_beg
-  printf "u1.node: "
-  rp $arg0.u1.node
-end
-
-define nd_end
-  printf "u2.node: "
-  rp $arg0.u2.node
-end
-
-define nd_state
-  printf "u3.state: "
-  p $arg0.u3.state
-end
-
-define nd_rval
-  printf "u2.value: "
-  rp $arg0.u2.value
-end
-
-
-define nd_nth
-  printf "u2.argc: "
-  p $arg0.u2.argc
-end
-
-
-define nd_tag
-  printf "u1.id: "
-  p $arg0.u1.id
-end
-
-define nd_tval
-  printf "u2.value: "
-  rp $arg0.u2.value
-end
-
-define rb_p
-  call rb_p($arg0)
-end
-
-define rb_id2name
-  call rb_id2name($arg0)
-end
-
-define rb_classname
-  call classname($arg0)
-  rb_p $
-  print *(struct RClass*)$arg0
-end
-
-define rb_backtrace
-  call rb_backtrace()
-end
diff --git a/COPYING.ja b/COPYING.ja
index aa2a163848..933cc7cb9a 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,6 +1,6 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL (the GNU General
-Public License)$B%P!<%8%g%s(B2$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`(B
-$B$r:FG[I[$G$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
+Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
+$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
 
   1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
 
diff --git a/ChangeLog b/ChangeLog
index 066ebdf3b2..38fab4707a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1354 +1,411 @@
-Fri Jul 25 21:55:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Tue Feb  3 14:35:26 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* test/ruby/enc/test_koi8.rb: move from test/ruby/test_koi8.rb.
+	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
+	  [ruby-dev:36631]
 
-Fri Jul 25 21:09:32 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* test/net/pop/test_pop.rb: ditto.
 
-	* ext/win32ole/win32ole.c (ole_invoke, add_event_callback,
-	  rescue_callback): refactoring.
+Mon Feb  2 20:03:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul 25 20:52:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* time.c (time_mdump, time_mload): preserves GMT status.
+	  [ruby-core:19252]
 
-	* test/win32ole/err_in_callback.rb : add test of raising
-	  exception in WIN32OLE_EVENT callback.
+Mon Feb  2 11:34:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/win32ole/test_err_in_callback.rb : ditto.
+	* variable.c (autoload_delete, autoload_file): should not delete
+	  autoload table, since it may be shared with duplicated modules.
+	  [ruby-core:19181]
 
-Fri Jul 25 20:43:57 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Thu Jan 29 11:54:22 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* ext/win32ole/win32ole.c (Init_win32ole): add
-	  WIN32OLE_EVENT#off_event.
+	* lib/date.rb (today,now): should produce own instances.
+	  [ruby-talk:317020]
 
-	* test/win32ole/test_win32ole_event.rb: ditto.
+Wed Jan 28 22:51:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/win32ole/test_win32ole_event.rb: some refactoring.
+	* eval.c (rb_mod_modfunc): method undefined in included module
+	  may not have nd_body.  [ruby-core:18738]
 
-Fri Jul 25 19:50:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 28 20:53:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regint.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
+	* marshal.c (marshal_dump): fixed for check_dump_arg.
 
-Fri Jul 25 15:52:40 2008  Koichi Sasada  <ko1@atdot.net>
+Tue Jan 27 17:30:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm.c (vm_invoke_proc): skip setting safe_level if
-	  it from bmethod.  This change makes test/ruby/test_proc.rb pass.
+	* marshal.c (marshal_dump): initializes dump_arg before any funcall.
+	  [ruby-dev:36648]
 
-Fri Jul 25 10:00:00 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+Tue Jan 27 15:17:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/test_transcode.rb: refactoring/cleanup of
-	  test_iso_2022_jp(_1)
+	* ext/socket/socket.c (host_str): numeric address should be unsigned.
+	  [ruby-core:18971]
 
-Fri Jul 25 04:12:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Jan 26 11:12:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/nkf/nkf.c (rb_nkf_convert): output of mime encode is US-ASCII.
-	  [ruby-list:45257]
+	* lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
+	  fixed [ruby-dev:36493]
 
-Fri Jul 25 02:43:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Sun Jan 25 00:07:23 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sample/coverage.rb: move from lib/coverage.rb because this remains in
-	  an early phase of development.
+	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
+	  abandon wrapping if the line contains no space.  [ruby-dev:36045]
+	  fix: #342
 
-Fri Jul 25 00:10:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan 25 00:02:23 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
-	* file.c (rb_find_file_ext, rb_find_file): converts Windows style path
-	  to Cygwin path.  [ruby-dev:35647]
+	* lib/matrix.rb (Vector#eql?): typo of the method name as "eqn?".
+	  (Vector#eqn?): removed. Defined by mistake.
+	  Fixes [ruby-dev:36294]. Reported by weda <weda AT
+	  issp.u-tokyo.ac.jp> and an anonymous user.
 
-Thu Jul 24 16:30:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/matrix/test_matrix.rb: added.
 
-	* win32/win32.c (exit_handler): use st_free_table() to free socklist.
+	* test/matrix/test_vector.rb: added.
 
-	* win32/win32.c (rb_w32_pipe_exec, rb_w32_accept, rb_w32_socket,
-	  rb_w32_socketpair): should check and release fd and sockets/handles
-	  if an error occurs in rb_w32_open_osfhandle().
+Fri Jan 23 11:49:45 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Jul 24 16:05:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* NEWS: added an entry for REXML.
 
-	* win32/win32.c (overlapped_socket_io): avoid warnings.
+	* lib/rexml/document.rb: fixed typo.
 
-	* thread_win32.c (ubf_handle): refactoring.
+Fri Jan 23 11:49:45 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Jul 24 07:01:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rexml/document.rb: limit entity expansion.  Thanks, Luka
+	  Treiber, Mitja Kolsek, and Michael Koziarski.  backported from
+	  trunk r19033, r19317, r19318.
 
-	* ext/win32ole/win32ole.c: got rid of improper casts.
+	* lib/rexml/entity.rb: ditto.
 
-Wed Jul 23 23:19:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* test/rexml/test_document.rb: ditto.
 
-	* test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test
-	  for old behavior.
+Thu Jan 22 15:19:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul 23 21:38:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* marshal.c (marshal_load): arg.data is no longer a VALUE but a
+	  st_table, and freed in load_ensure.  pointed out by pegacorn.
+	  [ruby-dev:37008]
 
-	* test/ruby/test_marshal.rb: suppress warning during test.
+Thu Jan 22 15:19:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul 23 21:35:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_dir.rb: suppress warning during test.
-
-Wed Jul 23 18:27:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/{stubs,tcltklib}.c, ext/tk/tkutil/tkutil.c: fix warnings
-	  about constness and signedness.
-
-Wed Jul 23 17:04:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/openssl_missing.h (d2i_of_void): define for older
-	  versions.  [ruby-dev:35637]
-
-Wed Jul 23 13:53:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/curses/extconf.rb: use try_static_assert.
-
-Wed Jul 23 10:06:19 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/zlib/test_zlib.rb (TestZlibDeflate#test_params): suppress a
-	  finalizer warning.
-
-Wed Jul 23 06:25:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck: suppress warnings more.
+	* gc.c (rb_mark_set): new function to mark keys.
 
-Wed Jul 23 03:19:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (struct dump_arg, struct load_arg): added wrappers to mark
+	  data entries.  backport from trunk r13527,r13528,r13961,r16533.
+	  [ruby-dev:36082]
 
-	* ext/nkf/nkf-utf8/nkf.c (struct input_code.name, input_codename):
-	  constified.
+Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Jul 23 03:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (filetime_to_timeval): new function, split from
+	  gettimeofday().
 
-	* ext/syck: suppress warnings.
+	* win32/win32.c (gettimeofday): use above function.
 
-Wed Jul 23 00:34:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (filetime_to_unixtime): ditto. [ruby-dev:36135]
 
-	* ext/openssl: suppress warnings.
+Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Jul 22 23:01:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* win32/win32.c (gettimeofday): tv_usec is usec, not msec.
+	  [ruby-dev:36094]
 
-	* ext/syck/rubyext.c, ext/syck/yaml2byte.c, ext/syck/emitter.c,
-	  ext/syck/syck.c, ext/syck/handler.c, ext/syck/syck.h: suppress GCC
-	  warning.
+Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Jul 22 20:42:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system
+	  time by myself. [ruby-dev:36084]
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): BigDecimal#<=> should
-	  return nil if an argument can't be coerced into BigDecimal.
+Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.h, ext/bigdecimal/bigdecimal.c
-	  (VpIsNegDoubleZero, VpItoV): comment out unused functions.
+	* win32/win32.c (gettimeofday): shouldn't use mktime(2) because it's
+	  buggy about handling summer time.
+	  reported by Yoshikawa <yoshixool AT gmail.com> at [ruby-dev:36071]
 
-Tue Jul 22 20:33:54 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Tue Jan 20 12:23:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/rdoc/test_rdoc_parser_ruby.rb (teardown): close tempfile.
+	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
+	  single digit decimal.  [ruby-core:18355]
 
-Tue Jul 22 19:38:38 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
+Mon Jan 19 18:25:28 2009  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_transcode.rb: added two comments
+	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
+	  rb_broken_glibc_ia64_erfc.
+	  [ruby-core:18228]
 
-Tue Jul 22 18:08:34 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jan 17 12:16:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* README.EXT, README.EXT.ja: mention about FIX2LONG and NUM2LONG.
-	  see [ruby-dev:35197]
+	* random.c (Init_Random): always initialize seed.
 
-Tue Jul 22 17:53:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 16 10:59:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* compile.c (insn_data_to_s_detail), file.c (rb_stat_inspect),
-	  iseq.c (ruby_iseq_disasm_insn, ruby_iseq_disasm),
-	  process.c (pst_message), re.c (match_inspect): use rb_str_catf.
+	* class.c (clone_method): should copy cbase in cref as well.
+	  [ruby-dev:35116]
 
-	* dir.c (dir_inspect), iseq.c (iseq_inspect, insn_operand_intern): use
-	  rb_sprintf.
+	* node.h (NEW_CREF): new NEW_ macro.
 
-	* error.c (rb_name_error, rb_raise, rb_loaderror, rb_fatal): use
-	  rb_vsprintf.
+	* eval.c (PUSH_CREF): use NEW_CREF().
 
-Tue Jul 22 17:20:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jan 15 14:34:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (init_func): new function to get API's address which
-	  is often used and not supported on all Windows.
+	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
+	  [ruby-core:18207]
+Wed Jan 14 10:39:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (overlapped_socket_io): shouldn't use overlapped I/O if
-	  CancelIo() is not supported.
+	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
+	  preprocessor directives.  a patch from Peter Bowen at
+	  [ruby-core:18211].
 
-Tue Jul 22 16:47:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 13 04:40:30 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* include/ruby/intern.h, sprintf.c (rb_str_catf, rb_str_vcatf): new
-	  functions.  [ruby-dev:35597]
+	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
+	  is not supplied.  backported from trunk.  fixed [ruby-core:18058].
 
-	* string.c (rb_str_capacity): new function to return the capacity.
+Mon Jan 12 00:23:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jul 22 16:08:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and
+	  Data.  [ruby-dev:35578]
 
-	* ext/socket/socket.c (connect_blocking, socks_connect_blocking,
-	  ruby_connect): cast.
+	* gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers
+	  cannot be invoked.  [ruby-dev:35681]
 
-Tue Jul 22 11:05:08 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Sun Jan 11 11:33:27 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
+	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
+	  backported from trunk.  fixed [ruby-core:18057].
 
-	* test/ruby/test_process.rb: ditto.
+Fri Jan  9 19:25:25 2009  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Jul 22 09:51:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
+	  environments without OpenSSL.  backported from trunk.
+	  fixed [ruby-dev:35755].
 
-	* misc/ruby-mode.el: fix here-doc strings with inner quotes.  patches
-	  by Nathan Weizenbaum <nex342 AT gmail.com> from [ruby-core:17615]
-	  through [ruby-core:17910].
+Thu Jan  8 13:24:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jul 22 04:26:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix
+	  up fixnum range literal in conditional as automagical line number
+	  comparison.  [ruby-core:12124], [ruby-dev:35731]
 
-	* include/ruby/intern.h (rb_str_buf_new2): optimization for literals.
+Wed Jan  7 10:09:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (str_buf_cat): returns VALUE.
+	* eval.c (timeofday): use monotonic clock.  based on a patch
+	  from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
 
-Tue Jul 22 03:34:01 2008  Eric Hodel  <drbrain@segment7.net>
+Tue Jan  6 09:03:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc*: Update to RDoc 2.1.0 r112.
+	* parse.y (yylex): 8 and 9 in octal integer should cause compile
+	  error.  [ruby-dev:35729]
 
-Tue Jul 22 02:51:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* include/ruby/intern.h (rb_str_buf_cat2, rb_str_cat2): optimization
-	  for literals.
+	* eval.c (rb_thread_schedule): runs deferred finalizers.
 
-Tue Jul 22 02:50:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_sweep): sets rb_thread_pending to run deferred finalizers.
 
-	* README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): fix the
-	  prototype of rb_vsprintf, and added rb_str_cat2.  [ruby-dev:35622]
+	* rubysig.h (CHECK_INTS): now checks rb_thread_pending even on
+	  platforms where setitimer is not available.  [ruby-core:18045]
 
-Mon Jul 21 17:15:38 2008  Tanaka Akira  <akr@fsij.org>
+Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* encoding.c (rb_filesystem_encoding): use locale encoding on Unix.
-	  [ruby-dev:35617]
+	* rubysig.h (CHECK_INTS): gives the chance to perform to deferred
+	  finalizers before explicit GC.start or the process termination.
+	  [ruby-core:18045]
 
-Mon Jul 21 15:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan  4 04:49:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
+	* win32/win32.c (rb_w32_telldir): just returns loc.
 
-	* sprintf.c (ruby__sfvwrite): ditto.
+	* win32/win32.c (rb_w32_rewinddir): needs to intialize loc.
+	  [ruby-core:18041]
 
-Mon Jul 21 13:55:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan  4 04:45:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* README.EXT, README.EXT.ja (1.5 Manipulating Ruby data): mentioned
-	  rb_sprintf and rb_vsprintf.  [ruby-dev:35611]
+	* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
+	  iterations.  [ruby-core:18015]
 
-Mon Jul 21 10:25:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan  2 03:08:47 2009  Kouhei Sutou  <kou@cozmixng.org>
 
-	* io.c (prepare_getline_args): check if rs is a string when non-nil
-	  lim is given.  [ruby-dev:35610]
+	* test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
 
-Mon Jul 21 04:55:20 2008  Tanaka Akira  <akr@fsij.org>
+Tue Nov 11 01:07:32 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* dir.c (dir_initialize): use rb_convert_type instead of
-	  rb_check_convert_type to prevent SEGV by Dir.new(".", true).
-	  (dir_initialize): use FilePathValue before rb_enc_get(dirname) to
-	  prevent SEGV by Dir.new(0).
+	* configure.in: fix SEGV on Mac OS X 10.5.3 with --enable-pthread.
+	  a patch from Wataru Kimura in Bug #193 [ruby-core:17333].
 
-Mon Jul 21 04:42:15 2008  Tanaka Akira  <akr@fsij.org>
+Mon Aug 11 09:37:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* re.c (rb_reg_s_union): useless rb_enc_get call removed to prevent
-	  SEGV by Regexp.union("", nil).
+	* ext/dl/dl.c (rb_str_to_ptr): should propagate taint to dlptr.
 
-Sun Jul 20 22:50:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dl/dl.c (rb_ary_to_ptr): ditto.
 
-	* compile.c (iseq_compile_each): NODE_POSTEXE should set each end
-	  procs only once.  [ruby-dev:35596]
+	* ext/dl/sym.c (rb_dlsym_call): should check taint of DLPtrData as
+	  well.
 
-Sun Jul 20 16:00:37 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Aug  8 10:53:52 2008  Tanaka Akira  <akr@fsij.org>
 
-	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): use rb_protect
-	  instead of rb_rescue2. [ruby-dev:35595]
+	* lib/resolv.rb: randomize source port and transaction id.
+	  CVE-2008-1447.
 
-Sun Jul 20 01:23:24 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/resolv-replace.rb (UDPSocket#bind): don't resolv host if host is
+	  "".
 
-	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
+Mon Aug  4 14:49:35 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (EVENTSINK_GetIDsOfNames): return
-	  ITypeInfo::GetIDsOfNames().
+	* lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from
+	  Masao Takaku <masao at nii.ac.jp>
+	  fix [ruby-dev:35489].
 
-Sat Jul 19 09:31:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Aug  4 14:13:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
+	* regex.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
 
-	* ext/win32ole/win32ole.c: add document of inspect methods.
+	* regex.c (DOUBLE_STACK, re_compile_fastmap0, re_adjust_startpos),
+	  (re_search, re_match_exec): check if failed to allocate memory.
 
-Sat Jul 19 06:08:43 2008  Eric Hodel  <drbrain@segment7.net>
+Mon Aug  4 13:53:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc*: Import RDoc r104.  Various make test-all fixes.
+	* bignum.c (rb_big2str0, bigsqr): made interruptible.  [ruby-Bugs-20622]
 
-Sat Jul 19 00:27:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Aug  4 13:31:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
 	  about 64bit positive value.
-
-Fri Jul 18 23:23:37 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): avoid cfp consistency
-	  error when exception raised in event callback.
-
-Fri Jul 18 14:52:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (socklist): table for registering socket options
-	  (currently only O_NONBLOCK).
-
-	* win32/win32.c (StartSockets, exit_handler): alloc/free socklist.
-
-	* win32/win32.c (is_socket): use socklist.
-
-	* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
-	  register new socket to socklist.
-
-	* win32/win32.c (rb_w32_close): remove closing socket from socklist.
-
-	* win32/win32.c (fcntl): register socket options.
-
-	* win32/win32.c (overlapped_socket_io): send to/recv from socket with
-	  overlapped operation if the socket is not nonblocking mode.
-	  [experimental]
-
-	* win32/win32.c (rb_w32_send, rb_w32_sendto, rb_w32_recv,
-	  rb_w32_recvfrom): use overlapped_socket_io().
-
-	* win32/win32.c (open_ifs_socket): set overlapped mode. this is the
-	  default mode of winsock's socket(), so lacking it is an old bug.
-
-Fri Jul 18 09:44:30 2008
-
-	* lib/rdoc/*: Import RDoc r101.
-
-Thu Jul 17 23:45:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/rdoc/test_rdoc_c_parser.rb (teardown): close tempfile.
-
-Thu Jul 17 21:08:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_process.rb (test_getpriority, test_setpriority): use
-	  PRIO_PROCESS instead of PRIO_USER.
-
-Thu Jul 17 20:41:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* pack.c (pack_unpack): fix v and V with big endian.
-	  [1].pack("V").unpack("V") was [4294967296].
-
-Thu Jul 17 20:35:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* pack.c (pack_pack): fix i! with big endian.  [1].pack("i!") was
-	  "\0\0\0\0".
-
-Thu Jul 17 16:48:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): select() for connect() has
-	  mean only when the socket is non-blocking.
-
-Thu Jul 17 10:55:24 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* mkconfig.rb: Simplify expression for RDoc.
-
-Thu Jul 17 10:21:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Aug  4 13:31:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
 	  fixed [ruby-dev:33683]
 
-Thu Jul 17 04:19:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): wake up joining threads.
-
-	* thread.c (sleep_forever, sleep_timeval): return when interrupted.
-	  [ruby-dev:35542]
-
-	* thread.c (timer_thread_function): restore main thread status.
-	  [ruby-core:17270]
-
-Thu Jul 17 01:27:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* io.c (appendline): remove invalid access.
-
-Wed Jul 16 18:04:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (signal_exec, trap_handler): trap accepts a string as
-	  command.  [ruby-dev:35533]
-
-Wed Jul 16 00:04:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): new
-	  method.
-
-	* test/ruby/test_argf.rb: use assert_in_out_err instead of
-	  EnvUtil.rubyexec.
-
-	* test/ruby/test_module.rb: ditto.
-
-	* test/ruby/test_require.rb: ditto.
+Thu Jul 17 21:42:07 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* test/ruby/test_objectspace.rb: ditto.
+	* lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821
+	  violation. [ruby-dev:35487]
 
-	* test/ruby/test_object.rb: ditto.
+Thu Jul 17 21:32:49 2008  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_string.rb: ditto.
-
-	* test/ruby/test_method.rb: ditto.
-
-	* test/ruby/test_variable.rb: ditto.
-
-	* test/ruby/test_io.rb: ditto.
-
-	* test/ruby/test_rubyoptions.rb: ditto.
-
-	* test/ruby/test_exception.rb: ditto.
-
-	* test/ruby/test_class.rb: ditto.
-
-	* test/ruby/test_thread.rb: ditto.
-
-Tue Jul 15 22:34:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (ruby_version): follow changes in configure.in.
-
-Tue Jul 15 21:58:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/{,tkutil/}extconf.rb: ruby/ruby.h no longer needs to be
-	  checked.
-
-	* ext/tk/{tcltklib.c,tkutil/tkutil.c}: check macros for each headers.
-
-Tue Jul 15 21:45:41 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/tk/extconf.rb, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: Do
-	  not test ruby/ruby.h, which makes OS X's gcc pick the wrong
-	  header file from Ruby.framework.
-
-Tue Jul 15 21:31:26 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in (--with-ruby-version): Add a new option to specify
-	  the ruby version string for version specific directories.
-	  [ruby-dev:35490]
-
-	* mkconfig.rb: Definition of ruby_version is now determined by the
-	  configure script.
-
-Tue Jul 15 18:14:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect, s_accept): check before readable/
-	  writable by select() instead of wrapping in blocking region.
-
-	* ext/socket/socket.c (bsock_send, s_recvfrom, udp_send, unix_send_io,
-	  unix_recv_io): should check readable/writable before calling blocking
-	  functions.
-	  see [ruby-dev:35446]
-
-Tue Jul 15 18:12:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (ubf_handle): cancel blocking IO if it can (only
-	  Vista). see [ruby-dev:35446]
-
-	* win32/win32.c (errmap): add ERROR_OPERATION_ABORTED as EINTR.
-
-Mon Jul 14 20:35:21 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_event.rb (teardown): fix typo.
-
-Mon Jul 14 18:47:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_loop): constified.
-
-	* transcode.c (str_transcode): rb_str_set_len() sets a delimiter.
-
-	* transcode_data.h (rb_transcoder): constified preprocessor and
-	  postprocessor input.
-
-	* enc/trans/japanese.c: ditto.
-
-Sun Jul 13 05:37:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): typo.
-
-	* {bcc32,win32}/Makefile.sub: (SIZEOF_SIZE_T, SIZEOF_PTRDIFF_T): added.
-
-Sat Jul 12 23:54:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (LIBRUBY_DLDFLAGS): import library which created
-	  with DLL is broken. save import library which created by lib.exe and
-	  install it.
-	  fixed the problem mentioned at the postscript of [ruby-dev:35448]
-
-Sat Jul 12 23:24:21 2008  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c: use PRIuSIZE.
-
-Sat Jul 12 22:41:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRI_PTRDIFF_PREFIX, PRI_SIZE_PREFIX): fixed typo.
-
-Sat Jul 12 22:30:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (HAVE_RUBY_RUBY_H): defines macros so that
-	  extconf.rb do not need to check if headers exist under separated
-	  directory.  [ruby-dev:35437]
-
-	* include/{ruby,rubyio,rubysig}.h, include/ruby/intern.h: use
-	  "ruby/..." instead of <ruby/...>.
-
-Sat Jul 12 22:17:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (sizeof ptrdiff_t): check for size of ptrdiff_t.
+	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
+	  problem.
 
-	* include/ruby/ruby.h (PRI?PTRDIFF, PRI?SIZE): printf conversion
-	  specifiers for ptrdiff_t and size_t/ssize_t.
+Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* insns.def (leave), marshal.c (long_toobig), transcode.c
-	  (str_transcode), vm_dump.c (control_frame_dump, stack_dump_each),
-	  (debug_print_register, debug_print_pre): t and z length modifiers
-	  are C99.
+	* lib/optparse.rb (OptionParser#environment): requires shellwords.
+	  [ruby-dev:35466]
 
-Sat Jul 12 16:02:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 17 02:05:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
 	  webrick/cookie.  [ ruby-Bugs-21139 ]
 
-Sat Jul 12 09:25:07 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_event.rb: add test
-	  for WIN32OLE_EVENT#on_event_with_outargs
-
-	* test/win32ole/test_win32ole_event.rb(teardown): calling
-	  WIN32OLE_EVENT.message_loop
-
-Sat Jul 12 01:54:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select): shoudn't pass non-socket handle to
-	  original select().
-
-Fri Jul 11 23:05:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/zlib/test_zlib.rb: add a test for Zlib::Deflate#params.
+Thu Jul 17 01:38:31 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-Fri Jul 11 22:58:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]
 
-	* ext/zlib/zlib.c (rb_deflate_params): flush before deflateParams.
-	  [ruby-core:17675]
-
-Fri Jul 11 22:09:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.rb, win32/Makefile.sub (PLATFORM): use $(PLATFORM)
-	  instead of $(OS) because ENV["OS"] is used in test-all (drb).
-
-Fri Jul 11 20:51:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_wait_readable, rb_io_wait_writable): check if the file
-	  descriptor is closed.
-
-	* thread.c (rb_thread_wait_fd_rw): ditto.
-
-Fri Jul 11 16:16:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_accept, rb_w32_socket, rb_w32_socketpair):
-	  prohibit inheritance of sockets, too. [experimental]
-
-Fri Jul 11 14:39:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): the measures for Vista is no longer
-	  unnecessary.
-
-Fri Jul 11 06:16:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (process.o): depends on util.h.
-
-Fri Jul 11 05:07:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h (pipe): prohibit inheritance.
-	  fixed: [ruby-dev:35421]
-
-Fri Jul 11 00:56:46 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (thread_create_core): fix GC problem.
-	  [ruby-core:17669]
-
-Thu Jul 10 22:06:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pstore.rb (PStore#transaction): return the result from the
-	  block.  [ruby-core:17718]
-
-Thu Jul 10 21:15:49 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_typelib.rb: add some illegal argument
-	  test.
-
-	* test/win32ole/test_win32ole_type.rb: ditto.
-
-	* test/win32ole/test_win32ole_event.rb: ditto.
-
-	* test/win32ole/test_win32ole_param.rb: ditto.
-
-	* test/win32ole/test_win32ole_method.rb: ditto.
-
-Thu Jul 10 19:38:35 2008  wanabe  <s.wanabe@gmail.com>
-
-	* test/ruby/envutil.rb (assert_normal_exit): r17993 revert.
-
-Thu Jul 10 18:29:41 2008  wanabe  <s.wanabe@gmail.com>
-
-	* test/ruby/envutil.rb (assert_normal_exit): finish writing script
-	  before spawn("ruby") to avoid blocking in win32.
-
-Thu Jul 10 17:20:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (insert): follow recent changes of globbing.
-
-Thu Jul 10 14:09:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/coverage/coverage.c (rb_coverage_start): return nil.
-
-Thu Jul 10 12:41:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_wait_for): fixed variable name.
-
-Thu Jul 10 12:09:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_thread_t), vm.c (rb_thread_mark), process.c
-	  (rb_last_status_get, rb_last_status_set, rb_last_status_clear):
-	  moved last_status from rb_vm_t.  [ruby-dev:35414]
-
-	* vm.c (th_init2): initialize last_status with nil.
-
-Thu Jul 10 12:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_wait_for): wait until timed out only when
-	  sleeping with timeout.
-
-Wed Jul  9 22:41:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (sleep_timeval): wait until timed out.  [ruby-core:17270]
-
-Wed Jul  9 20:58:16 2008  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_fill): don't raise even if length is negative.
-	  [ruby-core:17483], [ruby-core:17661]
-
-Wed Jul  9 20:18:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_va_args_macro): check for __VA_ARGS__.
-
-	* thread.c (thread_debug): show source name and line if possible.
-
-	* thread_{pthread,win32}.c (rb_thread_create_timer_thread): needs more
-	  stack for debug.
-
-Wed Jul  9 11:13:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/profiler.rb (Profiler__#print_profile): sort in the descending
-	  order of cumulative time.
-
-Wed Jul  9 11:11:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (struct glob_args, rb_glob_caller, rb_glob2, push_pattern),
-	  (glob_brace): make consistent prototypes.
-
-	* dir.c (push_glob): set enc in the caller of rb_glob_caller as well
-	  as rb_glob2.
-
-Wed Jul  9 09:12:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (options): use input_endian.
-
-Wed Jul  9 01:38:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_succ): alphabets or numerics mutually enclosing
-	  non-alphanumeric characters can carry up.  e.g., "1.999".succ should
-	  be "2.000".
-
-Wed Jul  9 00:12:31 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (rb_set_coverages, rb_reset_coverages): enable and disable
-	  coverage measurement.
-
-	* thread.c (rb_get_coverages): rename and move from vm.c.
-
-	* vm.c (rb_vm_get_coverages): ditto.
-
-	* iseq.c (prepare_iseq_build): ditto.
-
-	* thread.c (clear_coverage): ditto.
-
-	* parse.y (coverage): ditto.
-
-	* ext/coverage/coverage.c: use above functions, add new method
-	  Coverage.start and fix rdoc .
-
-Tue Jul  8 23:02:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (find_default_source): bug fix when
-	  OLE object does not have default source interface.
-
-	* test/win32ole/test_win32ole_event.rb: ditto.
-
-Tue Jul  8 22:56:23 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (rb_enable_coverages): hide coverage array by setting 0 to
-	  klass during measurement.
-
-	* parse.y (coverage, yycompile0): ditto.
-
-	* iseq.c (prepare_iseq_build): use rb_hash_lookup instead of
-	  rb_hash_aref.
-
-	* thread.c (rb_coverage_result): restore klass of coverage array
-	  and return it.
-
-	* theaad.c (update_coverage): chcek whether its klass is 0.
-
-Tue Jul  8 22:28:25 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/debug.rb, lib/profile.rb: fix to use RubyVM.
-
-	* lib/rdoc/parsers/parse_c.rb: ditto.
-
-Tue Jul  8 21:45:22 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm.c (rb_vm_mark): mark the last element of special_exceptions.
-
-Tue Jul  8 19:55:40 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (find_default_source): try to
-	  find COCLASS when WIN32OLE object is not COCLASS.
-
-	* test/win32ole/test_win32ole_event.rb: ditto
-
-Tue Jul  8 13:38:22 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h: fix to skip inserting a trace insn.
-
-Tue Jul  8 11:41:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c: shoudn't use ruby object in globbing, because glob service
-	  routines are called before initializing ruby on some platforms (ex.
-	  windows).
-
-Tue Jul  8 10:08:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* dir.c (Next): use rb_enc_mbclen. [ruby-dev:35390]
-
-Tue Jul  8 07:59:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* dir.c (Next): use rb_enc_precise_mbclen.
-
-Tue Jul  8 02:27:23 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* dir.c: preserve encoding of strings in glob and fnmatch.
-
-	* include/ruby/ruby.h: related changes.
-
-Tue Jul  8 00:22:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_succ): limit carrying in an alphanumeric region if
-	  exists.  [ruby-dev:35094]
-
-Mon Jul  7 20:39:28 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(Init_win32ole): add
-	  WIN32OLE_TYPE#source_ole_types, WIN32OLE_TYPE#default_ole_types,
-	  WIN32OLE_TYPE#default_event_sources.
-
-	* test/win32ole/test_win32ole_type.rb: ditto.
-
-Mon Jul  7 19:45:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/ruby/test_dir.rb (test_chroot_nodir): add Errno::EPERM.
-
-Mon Jul  7 17:12:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 13 00:08:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
 	  IPAddr#to_range.  a patch from okkez <okkez000 AT gmail.com> in
 	  [ruby-dev:35091].
 
-Mon Jul  7 01:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): fix for file name with spaces.
-	  [ruby-talk:307404]
-
-Mon Jul  7 00:59:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (ruby_init_stack): prior STACK_END_ADDRESS if
-	  found.  [ruby-core:17624]
-
-Sun Jul  6 23:48:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (bsock_send, s_recvfrom, ruby_connect, s_accept),
-	  (udp_send, unix_send_io, unix_recv_io): blocking region support.
+Sun Jul 13 00:04:38 2008  Tanaka Akira  <akr@fsij.org>
 
-Sun Jul  6 18:34:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_type.rb (test_initialize): add
-	  more assertions.
-
-Sun Jul  6 10:12:21 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/test/unit/collector/objectspace.rb
-	  (Test::Unit::Collector::ObjectSpace::NAME): fix a typo.
-
-Sun Jul  6 00:56:51 2008  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c (host_str): fix type mismatch in rb_raise
-	  format and argument.
-	  (port_str): ditto.
-	  (unix_recv_io): ditto.
-	  (sock_s_unpack_sockaddr_un): ditto.
-
-Sat Jul  5 23:42:23 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (NUM2INT): cast to int.
-	  (FIX2INT): ditto.
-	  (NUM2UINT): cast to unsigned int.
-	  (FIX2UINT): ditto.
-
-Sat Jul  5 23:10:41 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_pipe): new function for handling EMFILE and ENFILE
-	  error of pipe().
-	  (UPDATE_MAXFD_PIPE): removed.
-	  (pipe_open): use rb_pipe.
-	  (rb_io_s_pipe): ditto.
-
-	* process.c (pipe_nocrash): use rb_pipe.
-
-	* include/ruby/intern.h (rb_pipe): declared.
-
-Sat Jul  5 22:22:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_initialize): NUM2INT() returns int.
-
-	* thread.c (timer_thread_function), thread_pthread.c (thread_timer),
-	  thread_win32.c (timer_thread_func), thread_{pthread,win32}.c
-	  (rb_thread_create_timer_thread): passing VM.
-
-Sat Jul  5 20:53:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_word.rb: check word installed.
-
-Sat Jul  5 16:12:54 2008  Narihiro Nakamura  <authorNari@gmail.com>
-
-	* gc.c: revert. before lazy sweep.
-
-Sat Jul  5 09:55:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE#ole_respond_to?
-
-	* test/win32ole/test_win32ole.rb: ditto.
-
-Sat Jul  5 08:48:05 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (unescape_nonascii): add has_property argument not to
-	  raise error by /\p{Hiragana}\u{3042}/ in EUC-JP script.
-	  (rb_reg_preprocess): use has_property argument to make regexp
-	  encoding fixed.
-
-Sat Jul  5 08:29:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (unescape_nonascii): make regexp fixed_encoding if \p is used.
-	  fixed [ruby-core:17279].
-
-Fri Jul  4 23:12:53 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (d2time): fix the bug of VT_DATE
-	  to String conversion when negative value.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-Fri Jul  4 22:15:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/test/unit/testcase.rb: collect decendants of
-	  Test::Unit::TestCase using inherited.
-
-	* lib/test/unit/autorunner.rb: don't use ObjectSpace.each_object.
-
-	* lib/test/unit/collector/dir.rb: ditto.
-
-	* lib/test/unit/collector/objectspace.rb: ditto.
-
-	[ruby-core:17126]
+	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
+	  on IA64 is broken.  erfc(10000.0) aborts.
+	  use missing/erf.c instead.
+	  http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
 
-Fri Jul  4 20:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 10 18:50:48 2008  Tanaka Akira  <akr@fsij.org>
 
-	* include/ruby/oniguruma.h (OnigEncoding): removed auxiliary_data.
+	* common.mk (SPEC_GIT_BASE): update RubySpec GIT URL.
 
-	* include/ruby/encoding.h (ENC_DUMMY_P): moved dummy encoding flag to
-	  rb_encoding from Encoding instance.
+Thu Jul 10 18:46:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* encoding.c (rb_encoding_list): list of Encoding instances.
+	* file.c (rb_file_s_extname): fix for file name with spaces.
+	  [ruby-talk:307404]
 
-	* encoding.c (struct rb_encoding_entry): moved base encoding from
-	  instance variable.
+Thu Jul 10 18:42:37 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Fri Jul  4 17:51:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
 
-	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): proper check.
+	* test/erb/test_erb.rb (test_percent): ditto.
 
-Fri Jul  4 14:17:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 10 18:40:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/net/ftp.rb (Net::FTP#sendport): use divmod.  [ruby-core:17557]
 
-Fri Jul  4 11:08:37 2008  Narihiro Nakamura  <authorNari@gmail.com>
-
-	* gc.c (garbage_collect_force): sweep is completely ended.
-
-	* gc.c (os_obj_of): invoke garbage_collect_force() when freelist none.
-
-Fri Jul  4 05:01:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (rb_num2uint, rb_fix2uint): typo.
-
-Fri Jul  4 02:21:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): also needs checking
-	  negative value. see [ruby-dev:33683]
-
-Thu Jul  3 23:26:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* include/ruby/intern.h: remove prototypes about coverage.
-
-	* iseq.c (prepare_iseq_build): add prototype.
-
-	* parse.y (coverage): ditto.
-
-	* thread.c (clear_coverage): ditto.
-
-	* thread.c (update_coverage): use rb_sourceline.
-
-	* thread.c (rb_get_coverages): rename and move to vm.c.
+Thu Jul 10 18:36:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* vm.c (rb_vm_get_coverages): ditto.
+	* ruby.c: Mac OS X needs origargc times of '\0' in
+	  origargv. [ruby-dev:35308]
 
-	* ext/coverage/coverage.c: add rdoc.
+Thu Jul 10 13:53:08 2008  Tanaka Akira  <akr@fsij.org>
 
-Thu Jul  3 21:51:21 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/coverage/coverage.c, ext/coverage/extconf.rb: eliminate
-	  COVERAGE__ and introduce coverage.so instead.  How to measure
-	  coverage: (1) require "coverage.so", (2) require or load Ruby source
-	  file, and (3) Coverage.result will return the same hash as COVERAGE__.
-	  [ruby-dev:35324]
-
-	* thread.c (rb_enable_coverages): start coverage measurement by using
-	  rb_add_event_hook.
-
-	* thread.c (rb_get_coverages): returns current results of coverage
-	  measurement.
-
-	* include/ruby/intern.h: add prototype for above two functions.
-
-	* vm_core.h, vm.c: add field of coverages to rb_vm_t.
-
-	* insns.def (trace): remove special handling for COVERAGE__.
-
-	* iseq.c (prepare_iseq_build): switch COVERAGE__ to
-	  rb_get_coverages().
-
-	* parse.y (coverage): ditto.
-
-	* thread.c (clear_coverage): ditto.
-
-	* lib/coverage.rb: use coverage.so instead of COVERAGE__.
-
-Thu Jul  3 21:20:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (thread_initialize): NUM2INT returns long.
-
-Thu Jul  3 21:06:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (Init_eval): typo fixed in r17833.
-
-Thu Jul  3 19:44:44 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (Init_win32ole): remove duplicate line.
-
-Thu Jul  3 16:08:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
-	  on IA64 is broken.  erfc(10000.0) aborts.
-	  use missing/erf.c instead.
-	  http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
+	  FIXNUM_MAX to make it possible to convert to double accurately.
+	  It assumes FLT_RADIX is 2.
+	  fix RubyForge bug #14102.
+	  backported from 1.9.
 
-Thu Jul  3 12:49:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul  7 16:21:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
 	  'localhost.localdomain'.  [ruby-dev:35333]
 
 	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
 
-Thu Jul  3 07:06:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (SET_LC_MESSAGES): LC_MESSAGES must be C.
-
-Thu Jul  3 07:02:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul  7 15:02:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
-	  messages of preallocated special exceptions also.
-
-Thu Jul  3 04:39:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_during_gc): VALUE cache is irrelevant.
-
-Thu Jul  3 01:44:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* regint.h (GET_ALIGNMENT_PAD_SIZE, ALIGNMENT_RIGHT): cast pointer to
-	  uintptr_t instead of unsigned int.
-
-Thu Jul  3 01:23:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* sprintf.c: include ieeefp.h to refer isinf.
+	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
+	  if it was frozen.  clear all raised flags.
 
-	* ext/bigdecimal/bigdecimal.c: ditto.
+	* eval.c (stack_check): leave clearing flag to rb_longjmp.
 
-	* ext/json/ext/generator/generator.c: ditto.
+	* eval.c (rb_thread_set_raised, rb_thread_reset_raised): use generic
+	  flags.
 
-	* rational.c: ditto.
+	* eval.c (Init_Proc), gc.c (Init_GC): freeze preallocated special exceptions.
 
-Thu Jul  3 01:01:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* gc.c (rb_memerror): use thread raised flag instead of static flag,
+	  and raise nomem_error without backtrace if failed to make backtrace.
+	  [ruby-dev:34724]
 
-	* missing/tgamma.c (tgamma): remove unused variable.
+	* gc.c (ruby_xmalloc): increase malloc_increase only if malloc
+	  succeeds.  failed malloc size can be huge.  it may increase
+	  malloc_limit too big which cause less GC and memory full.
+	  (ruby_xrealloc): ditto.
 
-Thu Jul  3 00:18:00 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c: avoid creating Ruby object during
 	  GC. thanks to arton <artonx AT yahoo.co.jp>. [ruby-dev:35313]
 
-	* test/win32ole/test_win32ole_event.rb: ditto.
-
-Thu Jul  3 00:09:31 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
-	  yahoo.co.jp> at [ruby-dev:35313].
-
-	* include/ruby/intern.h: ditto.
-
-Wed Jul  2 09:49:10 2008  Narihiro Nakamura  <authorNari@gmail.com>
-
-	* gc.c (gc_lazy_sweep): use lazy sweep algorithm for response
-	  performance gain.
-
-	* gc.c (garbage_collect_force): mark and lazysweep invoke, after
-	  erasing all mark.
-
-	* gc.c (GC_NOT_LAZY_SWEEP): not lazy sweep flag. for debug.
-
-Wed Jul  2 03:42:44 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_settracefunc.rb: fix expected traces for
-	  RubyVM::FrozenCore's event and r17744.
-
-Wed Jul  2 03:10:41 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h, insns.def: reduce insn operand of "trace".
-
-	* include/ruby/ruby.h: add RUBY_EVENT_COVERAGE event.
-
-Wed Jul  2 02:02:34 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c, vm.c: fix to refer next ruby level cfp to make binding.
+	* ext/win32ole/tests: add test_win32ole_event.rb, remove
+	  testOLEEVENT.rb
 
-Wed Jul  2 01:58:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/win32ole/tests/testWIN32OLE.rb(test_convert_bignum):
+	  fix test.
 
-	* insns.def (trace): C99ism.
+Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Wed Jul  2 01:53:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* Add coverage measurement constant COVERAGE__.  This constant is not
-	  for casual use.  Usage: (1) assign {} to COVERAGE__, (2) require or
-	  load Ruby source file, and (3) COVERAGE__["sourcefilepath"] will
-	  return an array whose elements represent number of executions per
-	  line of source code.
-
-	* vm_core.h: add field of coverage array to iseq.
-
-	* iseq.c (prepare_iseq_build): ditto.
-
-	* insns.def (trace): update coverage array.
-
-	* parse.y (coverage): create and initialize coverage array.
-
-	* compile.h (ADD_TRACE): add trace instruction to update covearge
-	  array.
-
-	* thread.c (clear_coverage): delete coverage array when forking.
-	  Otherwise, double count of coverage may occur.
-
-	* lib/coverage.rb: sample coverage measurement tool.
-
-	* error.c: distinguish explicitly between parse_in_eval and
-	  mild_compile_error.
-
-	* load.c: ditto.
-
-	* vm_eval.c: ditto.
-
-Tue Jul  1 21:32:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* lib/test/unit/ui/console/testrunner.rb: prevent destructive
-	  modification to $0.
-
-	* test/rubygems/gemutilities.rb (build_rake_in): move from
-	  test_gem_ext_rake_builder.rb.
-
-	* test/rubygems/test_gem_ext_rake_builder.rb: ditto.
-
-	* test/rubygems/test_gem_installer.rb: override Gem.ruby and
-	  ENV["rake"].
-
-	* test/rubygems/test_gem_uninstaller.rb: ditto.
-
-
-Tue Jul  1 21:13:17 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, vm.c, insns.def: call FrozenCore.set_postexe method
-	  instead to use "postexe" insn.
-
-	* id.c, id.h: add a prepared id for above.
-
-Tue Jul  1 21:09:58 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/mkmf.rb (create_tmpsrc): we need to include COMMON_HEADERS,
-	  namely inclusion of ruby.h, because _GNU_SOURCE is now defined
-	  there (if any) and socket.so requires it on Linux systems.
-
-Tue Jul  1 20:55:07 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* eval.c (rb_interrupt): trick to suppress GCC warning.
-
-	* sprintf.c (rb_str_format): ditto.
-
-Tue Jul  1 20:44:36 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/instruction.rb: RubyVM is not module.
-
-Tue Jul  1 19:31:24 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ext/digest/digest.c (rb_digest_instance_inspect): constified.
-
-	* variable.c (rb_path2class): field precision should have type int.
-
-Tue Jul  1 19:01:00 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c (code_is_ctype): HALF WIDTH KATAKANA is
-	  a character.
-
-Tue Jul  1 17:56:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/vsnprintf.c (BSD__uqtoa): constified.
-
-Tue Jul  1 17:50:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/make_encdb.h: always add ';' at the end of line.
-
-Tue Jul  1 17:44:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (COMPILE_OPTION_FALSE), time.c (timegm_noleapsecond),
-	  thread.c (eKillSignal, eTerminateSignal),
-	  missing/vsnprintf.c (BSD_vfprintf): constified.
-
-Tue Jul  1 17:37:43 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* enc/ascii.c: ISO C does not allow extra ';' outside of a
-	  function
-
-	* enc/us_ascii.c: ditto.
-
-	* enc/utf_8.c: ditto.
-
-	* enc/big5.c: ditto.
-
-	* enc/euc_jp.c: ditto.
-
-	* enc/euc_kr.c: ditto.
-
-	* enc/euc_tw.c: ditto.
-
-	* enc/gb2312.c: ditto.
-
-	* enc/gbk.c: ditto.
-
-	* enc/iso_8859_1.c: ditto.
-
-	* enc/iso_8859_2.c: ditto.
-
-	* enc/iso_8859_3.c: ditto.
-
-	* enc/iso_8859_4.c: ditto.
-
-	* enc/iso_8859_5.c: ditto.
-
-	* enc/iso_8859_6.c: ditto.
-
-	* enc/iso_8859_7.c: ditto.
-
-	* enc/iso_8859_8.c: ditto.
-
-	* enc/iso_8859_9.c: ditto.
-
-	* enc/iso_8859_10.c: ditto.
-
-	* enc/iso_8859_11.c: ditto.
-
-	* enc/iso_8859_13.c: ditto.
-
-	* enc/iso_8859_14.c: ditto.
-
-	* enc/iso_8859_15.c: ditto.
-
-	* enc/iso_8859_16.c: ditto.
-
-	* enc/koi8_r.c: ditto.
-
-	* enc/shift_jis.c: ditto.
-
-	* enc/utf_16be.c: ditto.
-
-	* enc/utf_32be.c: ditto.
-
-	* enc/utf_32le.c: ditto.
-
-	* enc/windows_1251.c: ditto.
-
-	* process.c (run_exec_rlimit): ISO C90 forbids mixed declarations
-	  and code
-
-	* include/ruby/ruby.h (enum ruby_special_consts): ISO C forbids
-	  comma at end of enumerator list
-
-	* include/ruby/ruby.h (enum ruby_value_type): ditto.
-
-	* eval_intern.h (enum): ditto.
-
-	* vm_core.h (enum rb_thread_status): ditto.
-
-	* parse.y (enum lex_state_e): ditto.
-
-	* parse.y (enum string_type): ditto.
-
-	* process.c (enum): ditto.
-
-	* ruby.c (enum dump_flag_bits): ditto.
-
-	* ruby.c (enum disable_flag_bits): ditto.
-
-	* enc/gb18030.c (enum): ditto.
-
-Tue Jul  1 17:21:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regexec.c (stack_double): use MatchStackLimitSize atomically.
-
-	* regparse.c (onig_free_shared_cclass_table): OnigTypeCClassTable
-	  needs atomicity
-
-	* regsyntax.c: constified all predefined OnigSyntaxTypes.
-
-Tue Jul  1 16:57:44 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* include/ruby/st.h (struct st_table): type of bit-field
-	  'num_entries' is a GCC extension
-
-	* include/ruby/ruby.h (rb_intern): prefix __extnsion__ for
-	  braced-groups within expressions.
-
-	* include/ruby/intern.h (rb_usascii_str_new2): ditto.
-
-	* include/ruby/intern.h (rb_tainted_str_new2): ditto.
-
-	* include/ruby/intern.h (rb_str_new2): ditto.
-
-Tue Jul  1 15:01:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make),
-	  (Gem::Ext::Builder.run): EXIT_SUCCESS may be 0 or may not.
-
-	* test/rubygems/test_gem_ext_rake_builder.rb (build_rake_in): override
-	  Gem.ruby and ENV["rake"].
-
-	* runruby.rb: bin/rake does not exist in archdir where architecture
-	  depend script (i.e. rbconfig.rb) exists.
-
-Tue Jul  1 13:19:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_fill): check if beg is too big.
-
-Tue Jul  1 12:01:16 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def, vm.c, vm_core.h: remove some insns
-	  (undef, alias, definemethod).
-	  Call RubyVM::FrozenCore's singleton method instead.
-	  Add "putiseq" and "putspecialobject" instructions.
+	* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
+	  yahoo.co.jp> at [ruby-dev:35313].   
 
-	* id.c, id.h: add ids for above.
+	* intern.h: ditto.
 
-	* tool/parse.rb: "VM" no longer exists.  Use RubyVM instead.
+Thu Jul  3 20:13:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jul  1 03:28:16 2008  Eric Hodel  <drbrain@segment7.net>
+	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
+	  public methods only.  [ruby-core:17283]
 
-	* test/rubygems/test_ext_configure_builder.rb:  Apply locale-free
-	  patch by Yusuke ENDOH.  [ruby-core:17444].
+	* object.c (convert_type): ditto.
 
-	* runruby.rb: Set ENV['rake'].  Patch by Yusuke ENDOH
-	  [ruby-core:17442].
+	* lib/singleton.rb (Singleton#_dump): conversion method should be
+	  public.
 
-Tue Jul  1 01:07:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul  2 19:06:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
 	  double quotes are allowed.  [ruby-list:45140]
 
-Tue Jul  1 00:59:43 2008  Tanaka Akira  <akr@fsij.org>
+Wed Jul  2 19:03:37 2008  Tanaka Akira  <akr@fsij.org>
 
 	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
 	  evaluation order of function arguments.
 
-Tue Jul  1 00:49:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_newobj): abort GC phase before rb_bug.
-
-Mon Jun 30 23:15:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/openssl/test_ssl.rb (start_server): shutdown TCPServer before
-	  close.
-
-Mon Jun 30 23:01:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUBY_H_INCLUDES): common headers which are included with
-	  ruby.h together.
-
-Mon Jun 30 22:57:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_settracefunc.rb (test_raise): reveal an exception
-	  hided by rescue modifier.
-
-Mon Jun 30 22:49:32 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_array.rb (test_aset): access with too big index
-	  raises not ArgumentError but IndexError now.
-
-Mon Jun 30 22:30:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/collector/dir.rb (recursive_collect): r15662 reverted.
-
-Mon Jun 30 22:27:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/stringio/stringio.c (strio_getline): fix for nil and "" as
-	  separator.  [ruby-dev:34591]
-
-Mon Jun 30 22:21:30 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* io.c (argf_each_line): pass args to each_line. [ruby-dev:34958]
-
-Mon Jun 30 22:12:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (chain_finalized_object): should not delete from finalizer
-	  table until run.
-
-	* gc.c (rb_gc_call_finalizer_at_exit): deferred_final_list may be
-	  empty first.
-
-Mon Jun 30 18:57:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_finalize_deferred): allow object allocation in finalizers.
-
-	* gc.c (rb_gc_call_finalizer_at_exit): ditto.
-
-Mon Jun 30 14:41:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc when
-	  USE_VALUE_CACHE is not defined (normal case).
-
-Mon Jun 30 10:28:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul  2 18:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syslog/syslog.c (syslog_write): syslog operations should be
 	  protected from $SAFE level 4.  a patch from Keita Yamaguchi
@@ -1358,1211 +415,156 @@ Mon Jun 30 10:28:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syslog/syslog.c (mSyslog_set_mask): ditto.
 
-Mon Jun 30 03:01:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/net/http/test_http.rb (_test_request__file): specify encoding
-	  explicitly.
-
-	* test/net/http/utils.rb: ditto.
-
-Mon Jun 30 02:31:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_utf8_encindex): defined.
-
-	* include/ruby/encoding.h (rb_utf8_encindex): ditto.
-
-Mon Jun 30 02:14:34 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_core.h,vm_core.h, vm_dump.c, iseq.c: rename class name
-	  VM -> RubyVM, and rename rb_cVM -> rb_cRubyVM.
-	  "VM" is too short name for class.
-
-	* test/ruby/test_method.rb, test/ruby/test_settracefunc.rb: ditto.
-
-	* include/ruby/ruby.h: rb_cRubyVM, rb_cEnv, rb_cISeq should not be
-	  exposed.
-
-Mon Jun 30 02:10:32 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* process.c (Init_process): fix to avoid a warning.
-
-Mon Jun 30 01:52:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_parse.rb: remove tests for open_args.
-
-Sun Jun 29 23:01:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
-	  problem.
-
-Sun Jun 29 18:01:30 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb, lib/rss/utils.rb: merge documents from ruby_1_8.
-
-Sun Jun 29 17:44:23 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb (RSS::ListenerMixin#known_class): define to
-	  work with ruby 1.8.x too.
-
-Sun Jun 29 17:41:42 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/base.rb (RSS::Maker::RSSBase#to_feed): raise
-	  exception not return nil if RSS::Maker.make can't get required
-	  information.
-
-	* test/rss/rss-assertions.rb: follow the above change.
-
-Sun Jun 29 17:37:23 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block.
-
-	* test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change.
-
-Sun Jun 29 17:33:34 2008  Kouhei Sutou  <kou@cozmixng.org>
+Wed Jul  2 18:26:20 2008  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/maker/base.rb, lib/rss/maker/itunes.rb: don't use
-	  instance_eval to initialize variables. (speed up)
+	* math.c (domain_check): fix preprocess condition.
 
-Sun Jun 29 17:31:15 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb (RSS::VERSION):
-	  0.2.4 -> 0.2.5.
-
-Sun Jun 29 11:36:20 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* dir.rb: fix resource leak.
-
-Sun Jun 29 09:43:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul  2 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
 	  should be clean.  based on a patch from arton <artonx AT
 	  yahoo.co.jp> at [ruby-dev:35269]
 
-Sun Jun 29 07:53:08 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Wed Jul  2 18:16:19 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
 	  some situation. [ruby-bugs-20793]
 
-Sat Jun 28 21:25:08 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (struct RRegexp): new field usecnt.  replace
-	  str and len by src.
-
-	* gc.c (gc_mark_children): mark src field of regexp.
-	  (obj_free): don't free str field.
-
-	* re.c (REG_BUSY): removed.
-	  (rb_reg_initialize): prohibit re-initialize regexp.
-	  (rb_reg_search): use usecnt to prevent freeing regexp currently
-	  using.  this prevents SEGV by:
-	    r = /\A((a.)*(a.)*)*b/
-	    r =~ "ab" + "\xc2\xa1".force_encoding("euc-jp")
-	    t = Thread.new { r =~ "ab"*8 + "\xc2\xa1".force_encoding("utf-8")}
-	    sleep 0.2
-	    r =~ "ab"*8 + "\xc2\xa1".force_encoding("euc-jp")
+Tue Jul  1 15:11:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jun 28 21:15:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
-	  rb_usascii_str_new2): use inline versions only for constant
-	  literals.
-
-Sat Jun 28 13:12:06 2008  Tanaka Akira  <akr@fsij.org>
+	* array.c (rb_ary_fill): check if beg is too big.
 
-	* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
-	  fixed /tmp/apple_gem_home directory.
+Mon Jun 30 20:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jun 28 08:40:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* string.c (str_buf_cat): check for self concatenation.
 
-	* ext/win32ole/win32ole.c : check String encoding when
-	  converting String to VT_BSTR in OLE.
+Sun Jun 29 21:39:54 2008  Tanaka Akira  <akr@fsij.org>
 
-	* test/win32ole/test_win32ole.rb : ditto.
+	* eval.c (rb_obj_respond_to): use RTEST to test the result of
+	  respond_to? method.
 
-Sat Jun 28 01:08:42 2008  Tanaka Akira  <akr@fsij.org>
+Sun Jun 29 21:20:17 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* time.c (time_timespec): fix rounding negative float.
+	* array.c (rb_ary_fill): (compatibility) do not raise
+	  ArgumentError on negative length.  This behaviour shall change
+	  in a future release.
 
-Fri Jun 27 21:38:57 2008  Tanaka Akira  <akr@fsij.org>
+Sun Jun 29 20:08:11 2008  Tanaka Akira  <akr@fsij.org>
 
-	* struct.c: __size__ removed.  use the length of __members__ instead.
-	  (num_members): new function.
+	* time.c (time_timeval): fix rounding negative float.
 
-Fri Jun 27 21:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
 	  $0.  [ruby-dev:35261]
 
 	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
 
-Fri Jun 27 17:45:17 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/erb.rb: adjust line number for magic comment.
-
-	* test/erb/test_erb.rb: add tests for def_method.
-
-Fri Jun 27 14:29:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): empty not should call '!' on nil.
-	  cf [ruby-dev:35227]
-
-Fri Jun 27 14:25:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_eval_body): if thrown exception is frozen, reraise it to
-	  create a new instance.
-
-Fri Jun 27 13:29:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
-	  rb_usascii_str_new2): use with-length versions with strlen to
-	  optimize strlen, if optimized.
-
-Fri Jun 27 12:28:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/un.rb (mkmf): new command to create makefile.
-
-Fri Jun 27 11:06:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/un.rb (wait_writable): added help message.
-
-Fri Jun 27 06:52:54 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in: need a ",".
-
-	* process.c (rb_fork): check CANNOT_FORK_WITH_PTHREAD macro.
-
-Fri Jun 27 06:50:56 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_eval.c (vm_call_super): fix to call method_missing.
-	  [ruby-core:15719], [ruby-core:17340]
-
-Fri Jun 27 00:00:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
 	  Yamaguchi <keita.yamaguchi at gmail.com>.
 
-Thu Jun 26 23:58:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Sun Jun 29 18:33:33 2008  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (rb_str_index_m, rb_str_rindex_m, rb_str_include): fix
-	  rdoc.
+	* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
+	  pointed by TOYOFUKU Chikanobu.  [ruby-dev:35258]
 
-Thu Jun 26 17:43:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 29 18:26:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.  
 	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
 
-Thu Jun 26 11:04:30 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems: Update to RubyGems 1.2.0 r1824.  Incorporates patch by
-	  Yusuke ENDOH [ruby-core:17353].
-
-Thu Jun 26 00:48:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): not operand might be empty.  [ruby-dev:35227]
-
-Wed Jun 25 21:54:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): make functional-style not operator to act
-	  like function.  see <http://d.hatena.ne.jp/ku-ma-me/20080624/p1>.
+	* eval.c (rb_call0): wrong condition to check insecure method.
+	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
 
-Wed Jun 25 15:28:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 29 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
 	  overflow.  reported by Vincenzo Iozzo <snagg AT openssl.it>.
 
-Wed Jun 25 13:42:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
-
-	* lib/erb.rb (ERB::Compiler#compile): fix for broken input.
-
-Wed Jun 25 12:10:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/erb.rb (ERB::Compiler#compile): magic comment needs LF.
-
-Wed Jun 25 09:31:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/erb.rb (ERB::Compiler#compile): output magic comment.
-
-Tue Jun 24 22:14:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
-	  exception raised.
-
-Tue Jun 24 22:09:18 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Jun 29 18:22:06 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
 	  [ruby-bugs-20792]
 
-Tue Jun 24 17:20:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_fork_with_pthread): check after check for
-	  pthread library, and define the macro when checked only.
-
-Tue Jun 24 17:04:39 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/io/wait/extconf.rb: check sys/socket.h for cygwin.
-
-Tue Jun 24 16:51:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_reopen): remove cygwin handling because it seems to be for
-	  C's stdio.
-	  fixed [ruby-dev:35183]
-
-Tue Jun 24 11:12:33 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h, win32/win32.c (rb_w32_getppid): now support
-	  getppid() on win32 (but only Win2k or later).
-
-	* process.c (get_ppid): remove win32 special logic.
-
-Tue Jun 24 09:40:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (init_sock): socket is binmode on platforms
-	  which support binmode.
+Sun Jun 29 18:19:11 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Jun 24 00:21:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
+	  possible optimization bug on OS X/PPC.  This at least makes
+	  build with gcc -O1 and `make test' pass.
 
-	* compile.c (iseq_build_from_ary): initialize arg_opts, a patch from
-	  Adam Strzelecki <ono@java.pl> in [ruby-core:17220].
-
-Tue Jun 24 00:10:53 2008  wanabe  <s.wanabe@gmail.com>
-	* compile.c (iseq_build_from_ary): fix expression to obtain 
-	  iseq->local_size and iseq->local_table_size.  [ruby-dev:35205]
-
-Mon Jun 23 11:31:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Rational::power2): removed incomplete method.
-	  see [ruby-dev:35195].   [ruby-core:17293]
-
-Sun Jun 22 14:16:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/extconf.rb (have_readline_func): readline on Mac OS X
-	  needs headers to detect some functions.
-
-Sun Jun 22 09:51:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_superclass): rdoc improvement, a patch from
-	  Gaston Ramos <ramos.gaston AT gmail.com> in [ruby-core:17371].
-
-Sun Jun 22 09:22:32 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* README.EXT: translated README.EXT.ja
-
-Sun Jun 22 00:42:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_osid, rb_w32_osver, CreateChild): XP is
-	  is different from Vista about pipe handle inheritance.
-	  fixed [ruby-core:17367], reported by Lars Christensen <larsch at
-	  belunktum.dk>
-
-Sun Jun 22 00:38:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* README.EXT.ja: add note about mark and free.
-
-Sun Jun 22 00:01:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_binmode_p, argf_binmode_p, Init_IO): new method
-	  IO#binmode? and ARGF.binmode?  [ruby-dev:35148]
-
-Sat Jun 21 17:33:50 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_spawn): no longer support P_WAIT.
-
-Sat Jun 21 16:46:09 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (native_sleep): must block reentrance when accessing
-	  th->unblock.
-	  fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>
-
-Sat Jun 21 16:29:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (call_args2, open_args): removed.
-
-	* parse.y (parser_yylex): unified warnings at space between method
-	  name and argument parenthesis.  [ruby-dev:33943]
-
-Sat Jun 21 16:21:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): get rid of overflow.
-
-Sat Jun 21 15:57:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 29 17:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
 	  magic comment.
 
-Sat Jun 21 15:54:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 29 17:22:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
+	  IO#readlines do not affect $_.  [ruby-core:17277]
 
-	* configure.in: check if fork works with pthread.
+Sun Jun 29 17:19:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jun 21 15:31:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/stringio/stringio.c (strio_readline, strio_each)
+	  (strio_readlines): set lastline.  [ruby-core:17257]
 
-	* tool/make-snapshot: ported to ruby.
+Sun Jun 29 17:15:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* tool/make-snapshot: fixed digests.
+	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
+	  a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]
 
-Sat Jun 21 04:36:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 29 17:09:48 2008  wanabe  <s.wanabe@gmail.com>
 
-	* ext/bigdecimal/lib/bigdecimal/jacobian.rb (Jacobian::dfdxi):
-	  typo fixed (raize -> raise).  [ruby-list:45101]
+	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
+	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
 
-	* enumerator.c (enum_each_cons): typo in RDoc fixed.
+Sat Jun 28 19:23:40 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-Sat Jun 21 00:45:34 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* class.c (clone_method): use rb_copy_node_scope.
+	  fixed [ruby-list:45102]
+	  fixed [ruby-core:17393]
 
-	* tool/make-snapshot: do not use sha256sum; use BASERUBY instead
+Sat Jun 28 18:49:50 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* common.mk (dist): use tool/make-snapshot instead
+	* class.c: revert to r15855.
 
-Fri Jun 20 16:34:14 2008  Tanaka Akira  <akr@fsij.org>
+Fri Jun 20 18:25:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c (Init_process): Process::Status#to_int removed.
-	  (PST2INT): defined.
-	  (pst_to_s): use PST2INT.
-	  (pst_inspect): ditto.
-	  (pst_equal): ditto.
-	  (pst_bitand): ditto.
-	  (pst_rshift): ditto.
-	  (pst_wifstopped): ditto.
-	  (pst_wstopsig): ditto.
-	  (pst_wifsignaled): ditto.
-	  (pst_wtermsig): ditto.
-	  (pst_wifexited): ditto.
-	  (pst_wexitstatus): ditto.
-	  (pst_success_p): ditto.
-	  (pst_wcoredump): ditto.
-	  (rb_f_system): ditto.
+	* string.c (rb_str_buf_append): should infect.
 
-Fri Jun 20 15:40:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 20 16:33:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
 	  behavior at integer overflow.
 
 	* string.c (str_buf_cat): ditto.
 
-Fri Jun 20 12:39:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_detach_process): store detached process ID in the
-	  thread local storage.  moved from lib/open3.rb.
-
-Fri Jun 20 11:57:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_sub_bang): should preserve replacement points
-	  since they may be altered in the yielded block.
-
-Fri Jun 20 11:07:56 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_memhash): randomize hash to avoid algorithmic
-	  complexity attacks.
-	  (rb_str_hash): use rb_memhash.
-
-	* include/ruby/intern.h (rb_reset_random_seed): declared.
-
-	* thread.c (rb_thread_atfork): call rb_reset_random_seed.
-
-	* inits.c (rb_call_inits): call Init_RandomSeed at first.
-
-	* random.c (seed_initialized): defined.
-	  (fill_random_seed): extracted from random_seed.
-	  (make_seed_value): extracted from random_seed.
-	  (rb_f_rand): initialize random seed at first.
-	  (initial_seed): defined.
-	  (Init_RandomSeed): defined.
-	  (Init_RandomSeed2): defined.
-	  (rb_reset_random_seed): defined.
-	  (Init_Random): call Init_RandomSeed2.
-
-Wed Jun 18 21:52:38 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Wed Jun 18 22:24:46 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* array.c (ary_new, rb_ary_initialize, rb_ary_store,
-	  rb_ary_splice, rb_ary_times): integer overflows should be
+	  rb_ary_aplice, rb_ary_times): integer overflows should be
 	  checked. based on patches from Drew Yao <ayao at apple.com>
 	  fixed CVE-2008-2726
 
-	* string.c (rb_enc_cr_str_buf_cat): fixed unsafe use of alloca,
+	* string.c (rb_str_buf_append): fixed unsafe use of alloca,
 	  which led memory corruption. based on a patch from Drew Yao
 	  <ayao at apple.com> fixed CVE-2008-2726
 
-Fri Jun 20 03:26:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_f_fork): NetBSD 4.0 or later can fork.
-
-Fri Jun 20 03:19:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/testunit/collector/test_dir.rb: r15825 made it unnecessary to change
-	  String to Symbol.
-
-	* test/testunit/collector/test_objectspace.rb: ditto.
-
-Fri Jun 20 03:14:31 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*, test/rubygems/*:  Update to RubyGems 1.1.1 r1784 (pre
-	  1.2).
-
-Fri Jun 20 03:01:59 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c: try to remove false positive of deadlock detection (second
-	  trial).
-
-Fri Jun 20 02:16:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Rational::power2): typo fixed.  [ruby-core:17293]
-
-Fri Jun 20 02:11:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): should preserve last successful match
-	  data.  [ruby-dev:35182]
-
-Fri Jun 20 01:07:28 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* KNOWNBUGS.rb, bootstraptest/pending.rb: move a bug (?) to pending.
-
-Fri Jun 20 00:40:08 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_new): fix to return Proc object if block is already
-	  in heap.  [ruby-core:15711]
-
-	* bootstraptest/test_proc.rb: add a test.
-
-Fri Jun 20 00:18:04 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_win32.c (native_sleep): fix to decrement sleeper count.
-
-Thu Jun 19 23:48:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/net/http/test_http.rb: compare encodings of two strings before
-	  comparing themself, which suppress too big error output.
-
-Thu Jun 19 23:46:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/json/ext/parser/parser.rl, ext/json/ext/parser/parser.c: JSON
-	  text SHALL be encoded in Unicode.
-
-Thu Jun 19 23:17:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c, thread_win32.c, vm_core.h: try to remove false positive of
-	  deadlock detection.
-
-Thu Jun 19 21:38:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): check if compile before showing message.
-
-Thu Jun 19 21:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot: supported multiple snapshots.
-
-Thu Jun 19 20:37:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/net/pop.rb (Net::POP3#set_all_uids): speed
-	  up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
-
-Thu Jun 19 17:44:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/etc/etc.c (Init_etc): define constant aliases Etc::Passwd
-	  and Etc::Group.  [ruby-dev:35150]
-
-Thu Jun 19 17:37:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_alloc): specify 'inline' modifier.
-
-	* string.c (str_alloc): remove cSymbol hack that no longer
-	  necessary.
-
-	* string.c (scan_once): avoid retrieving encoding info unless
-	  necessary.
-
-Thu Jun 19 17:19:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_scan): String#scan should preserve last
-	  successful match data.  [ruby-dev:35106]
-
-Thu Jun 19 16:49:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/acosh.c (atanh): should set ERANGE to errno if parameter
-	  is the boundary case. fixed [ruby-dev:35155]
-
-Thu Jun 19 16:06:01 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile/treeview.rb: cannot configure tags.
-
-Thu Jun 19 11:48:33 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_enumerator.rb: fix to skip "with_memo" test.
-
-Thu Jun 19 11:40:55 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_throw): fix "return" process from "lambda".
-
-	* bootstraptest/test_proc.rb: add a test.
-
-	* bootstraptest/pending.rb: add a pending bug.
-
-Thu Jun 19 00:33:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/etc/test_etc.rb: avoid infinite loop.  [ruby-dev:35158]
-
-Wed Jun 18 23:07:19 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
-	  a patch from Sylvain Joyeux in [ruby-core:12099].
-
-Wed Jun 18 21:08:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (verbose_setter, opt_W_getter): fixed prototypes.
-
-Wed Jun 18 19:20:00 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (opt_W_getter): use ruby_verbose directly instead of parameter
-	  because ruby_verbose is not a real variable, so the address of
-	  parameter is not collect.
-
-Wed Jun 18 18:31:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (errmap): add some pipe errors.
-
-	* win32/win32.c (rb_w32_write): set errno when CRT's errno is EINVAL
-	  for pipe errors.
-
-Wed Jun 18 18:09:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c (rb_str_format): backported from trunk.
 
-	* win32/win32.c (poll_child_status): set EINVAL to errno when
-	  GetExitCodeProcess() fails with ERROR_INVALID_HANDLE.
-
-Wed Jun 18 15:01:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_open_file): fs_encoding and fname_encoding is
-	  rb_encoding *.
-	  fixed [ruby-dev:35151]
-
-Wed Jun 18 14:30:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_open_file): not rb_enc_get_index but rb_enc_get.
-
-Wed Jun 18 13:49:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h (pipe): now pipe is textmode. although this
-	  change is experimental, it will be spec if no compatibility problem
-	  is reported.
-
-Wed Jun 18 12:05:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
-	  public methods only.  [ruby-core:17283]
-
-	* object.c (convert_type): ditto.
-
-	* lib/singleton.rb (Singleton#_dump): conversion method should be
-	  public.
-
-Wed Jun 18 10:18:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc.  a patch from
-	  okkez <okkez000 AT gmail.com> in [ruby-dev:35141].
-
-Wed Jun 18 08:58:16 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/*:  Fix errors for 1.9.
-
-	* gem_prelude.rb:  Only remove methods from gem_prelude.rb when
-	  loading real RubyGems.
-
-Wed Jun 18 07:03:30 2008  Eric Hodel  <drbrain@egment7.net>
-
-	* lib/rubygems/*:  Update to RubyGems r1778 (pre 1.2).
-
-Wed Jun 18 04:27:58 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* KNOWNBUGS.rb, bootstraptest/pending.rb: move pending bug.
-
-Wed Jun 18 04:24:20 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_insnhelper.c: fix escape process with "break" and "return"
-	  syntax in "lambda".  [ ruby-Bugs-19304 ], [ruby-core:17164]
-
-	* KNOWNBUGS.rb, bootstraptest/test_proc.rb: add/move solved test.
-
-Wed Jun 18 01:51:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: cannot access class variable from
-	  singleton method. 
-
-Wed Jun 18 00:03:33 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c (Init_Dir): dir_foreach() takes variable argument.
-
-Tue Jun 17 23:04:24 2008  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/net/telnet.rb:  Fixing Telnet#wairfor() which was broken by
-	  changes to the Kernel::Integer() method.  [ruby-core:17272]
-
-Tue Jun 17 23:02:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (opt_W_getter): made a hooked variable.
-
-Tue Jun 17 22:04:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* enc/euc_jp.c (property_name_to_ctype): core dumped when sizeof(int)
-	  differs from sizeof(long).  [ruby-dev:35131]
-
-	* enc/shift_jis.c (property_name_to_ctype): ditto.
-
-	* enc/unicode.c (onigenc_unicode_property_name_to_ctype): ditto.
-
-Tue Jun 17 20:32:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (miniruby$(EXEEXT)): $(PREP) isn't always same as
-	  miniruby, and tests, debug, etc have no meaning when
-	  cross-compiling.
-
-Tue Jun 17 18:39:11 2008  Ryan Davis  <ryan@wrath.local>
-
-	* common.mk: fixed dependencies on miniruby.
-
-Tue Jun 17 18:11:01 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h (pipe): expand pipe buffer size.
-
-Tue Jun 17 17:07:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): no need to inherit handles here because
-	  spawn'ed child cannot detect that STDIN is closed.
-
-Tue Jun 17 06:32:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* dir.c (dir_data): add intenc and extenc.
-
-	* dir.c (dir_s_alloc): ditto.
-
-	* dir.c (dir_initialize): now accept internal_encoding and
-	  external_encoding.
-
-	* dir.c (dir_s_open): changed for dir_initialize.
-
-	* dir.c (dir_open_dir): ditto.
-
-	* dir.c (dir_foreach): changed for dir_open_dir.
-
-	* dir.c (dir_entries): changed for dir_open_dir.
-
-	* dir.c (dir_enc_str): defined.
-
-	* dir.c (dir_path): use dir_enc_str.
-
-	* dir.c (dir_read): ditto.
-
-	* dir.c (dir_each): ditto.
-
-Tue Jun 17 06:28:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (io_set_encoding): defined.
-
-	* io.c (rb_open_file): convert path on Windows and Mac OS X.
-
-	* io.c (open_key_args): use io_set_encoding and now accept
-	  internal_encoding and external_encoding.
-
-Tue Jun 17 06:26:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_filesystem_encoding): defined.
-
-	* include/ruby/encoding.h (rb_filesystem_encoding): added.
-
-Tue Jun 17 06:24:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/syck/rubyext.c: add encoding header.
-
-Tue Jun 17 01:52:50 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: SEGV when exit.
-
-	* ext/tk/lib/tk.rb: add a check for safety to Tk.exit.
-
-	* ext/tk/sample/irbtkw.rbw: freezes when receives SIGINT.
-
-Mon Jun 16 21:58:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
-	  IO#readlines do not affect $_.  [ruby-core:17277]
-
-Mon Jun 16 18:52:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/thwait.rb (ThreadsWait): Exception2MessageMapper no longer has
-	  extend_to method.  [ruby-core:17267]
-
-Mon Jun 16 14:46:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/e2mmap.rb (E2MM.def_e2message): typo.
-
-Mon Jun 16 09:43:27 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_with_object, Init_Enumerator):
-	  Temporarily back out with_memo, for which we need a better name.
-
-Mon Jun 16 07:14:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_readline, strio_each)
-	  (strio_readlines): set lastline.  [ruby-core:17257]
-
-Mon Jun 16 01:49:39 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_f_block_given_p): fix to skip class frame.
-	  [ruby-core:14813]
-
-	* KNOWNBUGS.rb, bootstraptest/test_method.rb: move solved test.
-
-Mon Jun 16 01:48:08 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c (vm_stack_dump_raw): disable verbose debug output.
-
-Mon Jun 16 01:33:08 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, thread.c: rename global_interpreter_lock to
-	  global_vm_lock.
-
-Sun Jun 15 18:40:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/syck/rubyext.c (yaml_org_handler): associate encoding.
-
-	* ext/syck/rubyext.c (syck_genericresolver_node_import): ditto.
-
-Sun Jun 15 18:17:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_t), vm.c (rb_vm_mark): moved preallocated special
-	  exceptions.
-
-	* eval.c (Init_eval), gc.c (Init_GC), proc.c (Init_Proc): freeze
-	  preallocated special exceptions.
-
-	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
-	  if it was frozen.
-
-	* gc.c (rb_memerror): raise nomem_error without backtrace if failed to
-	  make backtrace.
-
-Sat Jun 14 22:52:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_sysread): should not raise at empty
-	  read.  a patch from Arthur Schreiber at [ruby-core:17245].
+	* intern.h: ditto.
 
-Sat Jun 14 16:55:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 17 15:09:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): no need to expand root path which has no
 	  short file name.  [ruby-dev:35095]
 
-Sat Jun 14 11:59:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.h (STACK_UPPER): moved from gc.c
-
-	* thread.c, thread_{pthread,win32}.c (ruby_init_stack,
-	  ruby_thread_init_stack): moved stack initialization from gc.c.
+Sun Jun 15 19:27:40 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Jun 14 11:57:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.h (STACK_UPPER): moved from gc.c
-
-	* thread.c, thread_{pthread,win32}.c (ruby_init_stack,
-	  ruby_thread_init_stack): moved stack initialization from gc.c.
-
-Sat Jun 14 07:52:53 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (ruby_initial_gc_stress): defined.
-	  (ruby_initial_gc_stress_ptr): defined.
-
-	* debug.c (set_debug_option): use ruby_initial_gc_stress_ptr for
-	  gc_stress option.
-
-Sat Jun 14 00:09:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (ruby_gc_stress): moved to rb_objspace_t.
-
-	* gc.c (gc_stress_get, gc_stress_set): VM local attribute.
-
-	* signal.c (sigsegv): ditto.
-
-Fri Jun 13 21:55:48 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (nurat_equal_p): Rational(0,x) and 0 are equivalent,
-	  anyway.
-
-Fri Jun 13 21:26:39 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (string_to_c, nucomp_s_convert): preserve the current
-	  backref.
-
-	* rational.c (string_to_r, nurat_s_convert): ditto.
-
-	* include/ruby/intern.h (rb_match_busy): added a declaration.
-
-Fri Jun 13 18:08:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.xmlschema): don't accept decimal dot without
-	  fractional digits.  fractional digits handling simplified.
-
-Fri Jun 13 17:20:40 2008  wanabe  <s.wanabe@gmail.com>
-
-	* complex.c (string_to_c_internal): save and restore backref.
-	  fixed [ruby-dev:34991]
-
-Fri Jun 13 17:06:20 2008  wanabe  <s.wanabe@gmail.com>
-
-	* rational.c (string_to_r_internal): save and restore backref.
-	  fixed [ruby-dev:34990]
-
-Fri Jun 13 14:41:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* README.EXT.ja: update about Fixnum. reported in
-	   <http://www.tmtm.org/ja/tdiary/?date=20080611#p01>
-
-	* README.EXT.ja: describe about StringValueCStr().
-
-	* README.EXT: ditto.
-
-Fri Jun 13 14:24:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_memerror): exit with EXIT_FAILURE instead of magic number.
-
-	* gc.c (ruby_stack_check): STACK_LENGTH should be less than
-	  STACK_LEVEL_MAX.
-
-Fri Jun 13 12:55:37 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (sort_by_i): use NODE_DOT2 instead of NODE_MEMO to avoid
-	  extra calls to is_pointer_to_heap() in GC.
-
-	* enum.c (enum_zip): ditto.
-
-Fri Jun 13 00:41:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_thread.rb: add a test.
-
-Thu Jun 12 23:30:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (mutex_unlock): fix cond_notified consistency.
-
-Thu Jun 12 22:19:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (native_sleep): fixed previous commit.
-
-Thu Jun 12 21:59:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c, vm_core.h, vm.c, thread_pthread.c, thread_win32.c: add
-	  deadlock detection.  [ruby-dev:35044]
-
-	* bootstraptest/test_thread.rb: add tests for above.
-
-Thu Jun 12 21:39:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c: refactoring.
-
-	* rational.c: ditto.
-
-Thu Jun 12 17:11:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regint.h: undefine USE_CAPTURE_HISTORY which is mentioned as
-	  unsupported in the Onigiruma document.
-
-Thu Jun 12 13:36:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (rb_intern): use rb_intern2 with strlen for
-	  constant symbols to optimize strlen.
-
-Thu Jun 12 08:47:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): should use io_read_encoding(), not
-	  io_input_encoding().
-
-	* io.c (rb_io_getline_1): reduce calling of io_read_encoding().
-
-	* string.c (rb_str_scan): need not to restore $~ value, so avoid
-	  pinning match object.
-
-Thu Jun 12 02:49:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/stringio/stringio.c (strio_init): rewind when reopened.
-
-Thu Jun 12 02:43:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* array.c (rb_ary_zip): ANSI style.
-
-Thu Jun 12 02:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_reopen): clear read buffer.
-
-Thu Jun 12 00:56:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk: check proper conditions.  [ruby-dev:35047]
-
-Wed Jun 11 23:33:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fread): bypass buffered read if reading buffer is empty.
-
-	* io.c (remain_size): do not add extra one byte.
-
-Wed Jun 11 12:15:17 2008  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_normal_exit): hide stderr output
-	  when success.
-
-Wed Jun 11 09:26:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (encs): need to pass miniruby path for windows.
-
-Wed Jun 11 05:53:20 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, eval_intern.h (PASS_PASSED_BLOCK):
-	  set a VM_FRAME_FLAG_PASSED flag to skip this frame when
-	  searching ruby-level-cfp.
-
-	* eval.c, eval_intern.h, proc.c: fix to check cfp.  if there is
-	  no valid ruby-level-cfp, cause RuntimeError exception.
-	  [ruby-dev:34128]
-
-	* vm_core.h, vm_evalbody.c, vm.c, vm_dump.c, vm_insnhelper.c,
-	  insns.def: rename FRAME_MAGIC_* to VM_FRAME_MAGIC_*.
-
-	* KNOWNBUGS.rb, bootstraptest/test*.rb: move solved bugs.
-
-Wed Jun 11 05:55:31 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
-
-	* ext/tk/tcltklib.c: avoid error on a shared object.
-
-	* ext/tk/extconf.rb: support --with-tcltkversion
-
-	* ext/tk/README.tcltklib: add document about --with-tcltkversion
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb, ext/tk/lib/remote-tk.rb: 
-	  not work on $SAFE==4
-
-	* ext/tk/lib/multi-tk.rb: Object#methods returns Symbols on Ruby1.9.
-
-	* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the 
-	  procedure which called at end of the timer.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: 
-	  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
-
-	* ext/tk/lib/*: treat __IGNORE_UNKNOWN_CONFIGURE_OPTION__
-
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. 
-
-	* ext/tk/lib/tk/text.rb: typo. call a wrong method.
-
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemconfig.rb, 
-	  ext/tk/lib/tk/canvas.rb: support alias names of option keys.
-
-	* ext/tk/lib/tk/grid.rb: lack of module-method definitions.
-
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported 
-	  parameter patterns of configure method.
-
-	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
-
-	* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
-	  pass the given block to methods of Tk::Wm module.
-
-	* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites argument to 
-	  an invalid value.
-
-	* ext/tk/lib/tk.rb: fix memory (object) leak bug.
-
-	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
-
-	* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
-	  bug fix.
-
-	* ext/tk/lib/tkextlib/blt/component.rb, 
-	  ext/tk/lib/tkextlib/tile/tentry.rb, 
-	  ext/tk/lib/tkextlib/tile/treeview.rb: ditto.
-
-	* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
-
-	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, 
-	  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, 
-	  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: 
-	  bug fix.
-
-	* ext/tk/sample/ttk_wrapper.rb: ditto.
-
-	* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
-
-	* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
-
-	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
-	  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. 
-	  add Tk::Tile.themes and Tk::Tile.set_theme(theme).
-
-	* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
-
-	* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) 
-	  characters for headings.
-
-	* ext/tk/lib/tkextlib/tkDND/shape.rb: wrong package name.
-
-	* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. 
-	  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
-	  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. 
-	  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; 
-	  those are attributes of event object). It means that Ruby/Tk accepts
-	  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but 
-	  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". 
-	  It is potentially incompatible, when user passes symbols to the
-	  arguments of the callback block (the block receives the symbols as
-	  strings). I think that is very rare case (probably, used by Ruby/Tk
-	  experts only). When causes such trouble, please give strings instead
-	  of such symbol parameters (e.g. call Symbol#to_s method).
-
-	* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, 
-	  ext/tk/lib/tkextlib/blt/treeview.rb, 
-	  ext/tk/lib/tkextlib/winico/winico.rb: ditto.
-
-	* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on 
-	  TkUtil::CallbackSubst class (it is useful on Ruby 1.9). 
-
-	* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/spinner.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/entryfield.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/calendar.rb, 
-	  ext/tk/lib/tkextlib/blt/dragdrop.rb, 
-	  ext/tk/lib/tkextlib/tkDND/tkdnd.rb, 
-	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, 
-	  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became 
-	  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/multi-tk.rb: change strategy to define
-	  the constant WITH_ENCODING.
-
-	* ext/tk/lib/tk.rb: fix bug on Tk::Encoding.tk_encoding_names.
-
-Wed Jun 11 03:40:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/find.rb (Find#find): Return an enumerator if no block is
-	  given.
-
-Wed Jun 11 01:28:12 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/intern.h, proc.c: revert rb_proc_call() and
-	  create rb_proc_call_with_block() instead.
-
-	* include/ruby/ruby.h, eval_jump.c, thread.c, vm_insnhelper.c: 
-	  rb_blockptr should not be exposed.
-
-Tue Jun 10 21:07:19 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_float.rb: add tests. [ruby-dev:35009]
-
-Tue Jun 10 20:55:57 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (nucomp_s_convert): need not to initialize optional
-	  argument for rb_scan_args().
-
-Tue Jun 10 20:13:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: negate default of --without-ext if --with-ext is
-	  given.
-
-	* ext/extmk.rb: negate default of --without-ext.
-
-Tue Jun 10 17:43:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle_bang): update RDoc.  [ruby-dev:35034]
-
-Tue Jun 10 17:30:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_obj_instance_exec, rb_mod_module_exec):
-	  added prototypes.
-
-Tue Jun 10 17:00:29 2008  wanabe  <s.wanabe@gmail.com>
-
-	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
-	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
-
-Tue Jun 10 13:48:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rational.c (nurat_s_convert): need not to initialize optional
-	  argument for rb_scan_args().
-
-Tue Jun 10 12:58:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/wait.c (FIONREAD_POSSIBLE_P): suppress warnings.
-
-Tue Jun 10 12:43:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (CONST_ID_CACHE): fixed statement expression.
-
-Tue Jun 10 11:25:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (rb_argv0): revised for ext/tk.
-
-	* include/ruby/encoding.h: not to use varargs.h since requiring C89.
-
-Tue Jun 10 00:50:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* include/ruby/ruby.h, vm_core.h: add a type rb_blockptr.
-
-	* vm_insnhelper.c (vm_yield_with_cfunc): vm_yield_with_cfunc receives
-	  blockptr and passes it to iterating block.
-
-	* proc.c (rb_proc_call), include/ruby/intern.h: rb_proc_call receives
-	  blockptr.  "rb_proc_call(self, args, blockptr)" in C corresponds to
-	  "self.call(*args, &block)" in Ruby.
-
-	* proc.c (proc_call): pass blockptr to block that is written in C.
-
-	* proc.c (curry): receive blockptr and pass it to original proc.
-	  [ruby-core:15551]
-
-	* vm.c (invoke_block_from_c): fix for change of vm_yield_with_cfunc.
-
-	* thread.c (call_trace_proc), eval_jump.c (rb_call_end_proc): fix for
-	  change of rb_proc_call.
-
-Tue Jun 10 00:10:49 2008  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (test-knownbug): give $(OPTS) for bootstraptest/runner.rb.
-
-Mon Jun  9 23:10:50 2008  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (Init_stack): don't declare.  it is a macro now.
-
-Mon Jun  9 22:46:47 2008  wanabe  <s.wanabe@gmail.com>
-
-	* compile.c : treat []&&= in virtually the same way as []||=.
-	  [ruby-dev:34679]
-
-Mon Jun  9 21:17:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/depend (clean): remove build directories.
-
-	* test_knownbug.rb -> KNOWNBUGS.rb: renamed.
-
-	* common.mk: apply above change.
-
-Mon Jun  9 21:14:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): set flags.
-
-Mon Jun  9 21:09:02 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb -> ./test_knownbug.rb: moved.
-
-	* common.mk: add a rule "test-knownbug".
-
-Mon Jun  9 21:00:32 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (nucomp_s_convert): can accept Complex('i').
-	  [ruby-dev:34991]
-
-Mon Jun  9 18:25:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (CONST_ID): constant ID cache for non-gcc.
-
-	* *.c: no cache in init functions.
+	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
+	  directories; submitted by Takahiro Kambe <taca at
+	  back-street.net> in [ruby-dev:35099].
 
 Mon Jun  9 17:56:30 2008  Akinori MUSHA  <knu@iDaemons.org>
 
@@ -2574,138 +576,35 @@ Mon Jun  9 17:56:30 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  (TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
 	  Arthur Schreiber.
 
-Mon Jun  9 17:47:09 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (fptr_finalize): close IO object if fd is already closed.
-	  (rb_p): call rb_io_write just once.
-
-Mon Jun  9 15:37:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (require_libraries): req_list may be NULL.  [ruby-dev:35008]
-
-Mon Jun  9 14:18:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (struct rb_vm_struct): moved src_encoding_index,
-	  ruby_debug, ruby_verbose, and rb_progname.
-
-	* ruby.c (rb_argv0): no longer used.
-
-	* ruby.c (struct cmdline_options): moved setids and req_list, and the
-	  latter is now an array, to prevent memory leak.
-
-	* ruby.c (cmdline_options_init): added.
-
-	* ruby.c (add_modules, require_libraries, init_ids, forbid_setid): use
-	  struct cmdline_options.
-
-	* vm.c (vm_init2): initialize src_encoding_index.
-
-	* vm.c: getters/setters for ruby_{debug,verbose}.
+Mon Jun  9 03:28:05 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jun  9 09:54:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (Init_stack): make to call ruby_init_stack.
-
-Mon Jun  9 08:12:40 2008  wanabe  <s.wanabe@gmail.com>
-
-	* vm_insnhelper.c, vm.c, proc.c : revert r17021. [ruby-dev:34997]
-
-Mon Jun  9 03:12:23 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/pending.rb: move/remove solved issues.
-
-	* bootstraptest/test_class.rb: ditto.
-
-Mon Jun  9 02:32:58 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/zlib/zlib.c (rb_deflate_init_copy): Copy buffers as well.
-	  [ruby-list:45018]
-
-Sun Jun  8 22:22:20 2008  wanabe  <s.wanabe@gmail.com>
-
-	* vm_insnhelper.c, vm.c, proc.c (proc_call): allow call method with
-	  block that both is written in C. [ruby-dev:34273] [ruby-core:15551]
-
-	*  proc.c (curry): use proc_call instead of rb_proc_call.
-	  [ruby-dev:34273] [ruby-core:15551]
-
-Sun Jun  8 21:50:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/zlib/test_zlib.rb: add tests to achieve over 90% test coverage
-	  of zlib.
-
-Sun Jun  8 20:12:47 2008  wanabe  <s.wanabe@gmail.com>
-
-	* vm_insnhelper.c (vm_throw): regard break as return in lambda.
-	  [ruby-dev:34646]
-
-Sun Jun  8 19:17:59 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add a build option "CALC_EXACT_MALLOC_SIZE".
-	  This option enables to calculate exact size of current 
-	  allocated size by malloc().  You can access these information
-	  with GC.malloc_allocated_size and GC.malloc_allocations.
-	  This option consume additional memory as a header of each memory
-	  object.  This option also helps to find out xmalloc()/xfree()
-	  consistency.  If you get trouble with this option, some extension
-	  using "free()" instead of "xfree()".
-	  This options is disabled by default.
-
-Sun Jun  8 18:15:38 2008  Koichi Sasada  <ko1@atdot.net>
+	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
+	  initialize_copy; [ruby-list:45016], [ruby-list:45018].
 
-	* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
-	  enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
-	  io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
-	  string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
-	  vm.c, gc.c:
-	  allocated memory objects by xmalloc (ruby_xmalloc) should be
-	  freed by xfree (ruby_xfree).
+Mon Jun  9 03:26:03 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c, 
-	  ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c, 
-	  ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
-	  ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
-	  ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
-	  ditto.
+	* NEWS: Mention new constants.
 
-Sun Jun  8 01:15:11 2008  Tanaka Akira  <akr@fsij.org>
+Mon Jun  9 03:24:18 2008  Tanaka Akira  <akr@fsij.org>
 
 	* hash.c (hash_i): make Hash#hash order insensitive.
-	  (rb_hash_dup): use DUPSETUP.
 
-Sat Jun  7 23:47:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
-	  initialize_copy; [ruby-list:45016].
-
-Sat Jun  7 22:15:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun  9 03:22:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
 	  SITE_DIR.  a patch from Richard Brown <rbrown AT exherbo.org> in
 	  [ruby-core:17129].
 
-Sat Jun  7 21:37:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_f_open), re.c (rb_reg_search), transcode.c (str_transcode):
-	  suppress warnings.
+Mon Jun  9 03:21:20 2008  Tanaka Akira  <akr@fsij.org>
 
-	* util.c (quorem, rv_alloc, nrv_alloc): only used in dtoa().
+	* gc.c (os_obj_of): assure to not free the scanning heap.
 
-Sat Jun  7 16:06:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (CFLAGS, CXXFLAGS): append default flags.
-
-Sat Jun  7 01:23:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jun  9 03:20:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
 	  fixed [ruby-dev:34979]
 
-Fri Jun  6 23:46:19 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_callee_setup_arg): check simple flag before
-	  calling setup_arg function().  this change reduce function call.
-
-Fri Jun  6 21:51:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Jun  6 21:16:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
 
@@ -2713,70 +612,43 @@ Fri Jun  6 21:51:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 	  freehostent, freeaddrinfo): undef before define because these are
 	  macros in some versions of Windows SDK.
 
-	  merged from ruby_1_8.
-
-Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/iconv/utils.rb (default_test): override not to croak.
-
-Fri Jun  6 16:41:45 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
-
-Fri Jun  6 15:05:02 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (count_objects): clear hash after counting objects.
-
-Fri Jun  6 12:43:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_dir.rb (TestDir::test_glob): glob file names not sorted.
-
-Fri Jun  6 00:05:33 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.xmlschema): don't use float.  fix
-	  http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
+	* win32/setup.mak: maybe commit miss.
 
-Thu Jun  5 23:56:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Jun  6 19:34:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_gc.rb: add tests to achieve over 90% test coverage of
-	  gc.c.
-
-	* test/ruby/test_objectspace.rb: ditto.
-
-	* test/ruby/test_marshal.rb: ditto.
-
-Thu Jun  5 23:40:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* gc.c (rb_objspace_alloc): this function is needed only when
-	  ENABLE_VM_OBJSPACE macro is defined.
+	* mkconfig.rb: hide build path from rbconfig.rb.
 
-	* vm.c: ditto.
+	* util.c (ruby_strtod, dtoa): initialize more variables for error
+	  handling.
 
-Thu Jun  5 23:31:21 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
+	  (path2class, path2module): constified.
 
-	* test/stringio/test_stringio.rb: add tests to achieve over 95% test
-	  coverage of stringio.
+	* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
 
-	* test/strscan/test_stringscanner.rb: ditto for strscan.
+	* suppress warnings on cygwin, mingw and mswin.
 
-Thu Jun  5 23:25:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Jun  6 19:23:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (ruby_finalize_0): clear trace_func after executing END
-	  procs.
+	* file.c (file_expand_path): fix for non-existent files and SFN of
+	  symlinks.  [ruby-talk:303736]
 
-	* thread.c: fix typo.
+Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun  5 22:50:50 2008  Tanaka Akira  <akr@fsij.org>
+	* test/iconv: Tests fixed.
 
-	* gc.c (os_obj_of): heaps may be modified in yield.
+Fri Jun  6 17:04:56 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Jun  5 21:46:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
 
-	* st.c (st_reverse_foreach): comment out unused function.
+	* lib/time.rb (Time.xmlschema): don't use float.  fix
+	  http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
 
-	* util.c (dtoa): ditto.
+	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
+	  Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
 
-Thu Jun  5 20:30:46 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/rdoc.rb: massive spelling correction patch from Evan Farrar
+	  <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
 
 	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
 	  Add a null check for ssl; submitted by akira yamada
@@ -2790,127 +662,24 @@ Thu Jun  5 20:30:46 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  workaround for the case where OpenSSL is configured with
 	  --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
 
-Thu Jun  5 20:24:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (thread_set_trace_func_m): fix check for proc argument.
-
-Thu Jun  5 20:17:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* lib/rexml/document.rb (REXML::Document:write): leaky modification
-	  trans -> transitive.  [ruby-dev:32040], r13686
-
-	* lib/rexml/text.rb (Text.check): fix check for illegal character.
-
-Thu Jun  5 14:03:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_create): find encoding without options.
-
-Thu Jun  5 07:48:32 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (hash): should be "static".
-
-Thu Jun  5 01:47:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_transcode.rb: add tests for iso-2022-jp.
-
-Thu Jun  5 01:27:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_process.rb: add tests.
-
-Wed Jun  4 23:10:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.
-
-Wed Jun  4 18:53:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
-	  Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
-
-Wed Jun  4 18:36:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc.rb: massive spelling correction patch from Evan Farrar
-	  <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
-
-Wed Jun  4 17:52:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  6 16:58:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
-	  allows range.  [ruby-core:17092]
-
-Wed Jun  4 15:45:41 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_with_index, enumerator_with_memo): Fix
-	  grammo in rdoc.
-
-Wed Jun  4 13:06:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (CFLAGS, CXXFLAGS): include additional flags to
-	  CFLAGS and CXXFLAGS while configuration.
-
-Tue Jun  3 23:06:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/strscan/strscan.c (strscan_scan_full, strscan_search_full): fix
-	  document.
-
-Tue Jun  3 22:37:26 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/strscan/strscan.c (strscan_exist_p): fix document.
-
-Tue Jun  3 22:33:29 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_dir.rb: add tests to achieve over 90% test coverage
-	  of dir.c.
-
-	* test/ruby/test_encoding.rb: add tests for dummy?, name_list and
-	  aliases.
-
-	* test/ruby/test_marshal.rb: add some tests.
-
-Tue Jun  3 22:25:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	  allows range.  [ruby-core:17092] [ruby-core:17115]
 
-	* test/etc/test_etc.rb: new tests for etc.
+Wed Jun  4 17:22:30 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Jun  3 19:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (enumerator_with_memo): New method: with_memo().
-
-Tue Jun  3 20:04:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (miniruby$(EXEEXT)): miniruby cannot be
-	  written by miniruby itself.
+	* NEWS: Fix typos and move misplaced entries.
+	  NEWS: Somehow optflags and warnflags were not actually included
+	  in this release.
 
 Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enumerator.c (enumerator_init_copy): Take care of
 	  initialize_copy as well as initialize.
 
-Tue Jun  3 16:06:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): fix for non-existent files and SFN of
-	  symlinks.  [ruby-talk:303736]
-
-Tue Jun  3 15:12:01 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#classify): Back out the `group_by' alias.
-	  Better think twice.
-
-Tue Jun  3 15:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#collect, Set#select): Back out.  I thought it
-	  was consistent but turned out to be wrong.
-
-Tue Jun  3 13:41:08 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#collect, Set#select): Override Enumerable
-	  methods and make them return a set. [ruby-core:17055]
-	  (Set#delete_if, Set#collect!, Set#reject!, Set#classify)
-	  (Set#divide, Set#delete_if): Return an enumerator if no block is
-	  given.
-	  (Set#classify): Define an alias `group_by' to override that of
-	  Enumerable.
-
-Tue Jun  3 13:35:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (run_exec_pgroup): C99 ism.
+	* test/ruby/test_enumerator.rb: Pull in the test suite for
+	  enumerator from trunk.
 
 Tue Jun  3 12:51:57 2008  Akinori MUSHA  <knu@iDaemons.org>
 
@@ -2919,232 +688,65 @@ Tue Jun  3 12:51:57 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  appropriate.
 	  (enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]
 
-Tue Jun  3 01:21:51 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_method.rb: add a test.
-
-Tue Jun  3 00:26:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* marshal.c (w_object): add a check for modification of array during
-	  its dump.
-
-Mon Jun  2 22:27:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* enc/iso_8859_5.c: Large omicron should lowercase to small omicron.
-
-	* test/ruby/test_big5.rb, test/ruby/test_cp949.rb,
-	  test/ruby/test_euc_jp.rb, test/ruby/test_euc_kr.rb,
-	  test/ruby/test_euc_tw.rb, test/ruby/test_gb18030.rb,
-	  test/ruby/test_gbk.rb, test/ruby/test_iso_8859.rb,
-	  test/ruby/test_koi8.rb, test/ruby/test_shift_jis.rb,
-	  test/ruby/test_windows_1251.rb: new tests for encoding.
-
-	* test/ruby/test_utf16.rb, test/ruby/test_utf32.rb,
-	  test/ruby/test_regexp.rb: add tests.
-
-Mon Jun  2 21:56:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_file.rb: add tests for uninitialized object.
-
-	* test/ruby/test_class.rb: ditto.
-
-	* test/ruby/test_thread.rb: ditto.
-
-Mon Jun  2 21:44:15 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* re.c: fix SEGV by Regexp.allocate.names, Match.allocate.names, etc.
-
-	* test/ruby/test_regexp.rb: add tests for above.
-
-	* io.c: fix SEGV by IO.allocate.print, etc.
-
-	* test/ruby/test_io.rb: add tests for above.
-
-Mon Jun  2 19:17:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_argf.rb (teardown): remove renamed temporary files.
-
-Mon Jun  2 18:51:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/un.rb (wait_writable): wait until target files can be
-	  written actually.
-
-	* win32/Makefile.sub (LDSHARED_0, LINK_SO): get rid of failure of
-	  mt.exe.
-
-Mon Jun  2 16:26:17 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/delegate.rb (Delegator::MethodDelegation#respond_to):
-	  respond_to? should now take optional second argument; submitted
-	  by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
-
-Mon Jun  2 16:14:18 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops.  This
-	  change did not apply to trunk.  Backed out.
-
-Mon Jun  2 16:08:24 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jun  3 10:16:40 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
-	  where tokens are not yielded one by one.
+	  where tokens are not yilelded one by one.
+	  (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without-
+	  strscan problems. [ruby_core:17028].
 
 	* test/erb/test_erb.rb (TestERBCore#_test_01)
 	  (TestERBCore#test_02_safe_04): The expected value should come
 	  first for assert_equal().
+	  (TestERBCoreWOStrScan): Add test class for without-strscan.
 
-Mon Jun  2 13:06:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* mkconfig.rb: hide build path from rbconfig.rb.
-
-Mon Jun  2 08:46:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod, dtoa): initialize more variables for error
-	  handling.
-
-Mon Jun  2 04:55:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* suppress warnings on cygwin, mingw and mswin.
-
-Mon Jun  2 04:35:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/gb18030.c (gb18030_code_to_mbc): add 0x80000000
-	  for 4bytes character.
-
-Mon Jun  2 03:52:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (set_arg0): reverted used variable definition.
+Mon Jun  2 19:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jun  2 03:23:25 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/delegate.rb (DelegateClass, Delegator#respond_to?):
+	  respond_to? must take optional second argument.  This was a
+	  latent bug exposed by a recent internal change of marshal.c to
+	  call respond_to? with a second argument; submitted by Jeremy
+	  Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
 
-	* enc/gb18030.c (gb18030_mbc_to_code): mask by 0x7FFFFFFF
-	  because OnigCodePoint will be used as 32bit signed int.
-	  Masking by 0x7FFFFFFF is ok on GB18030;
-	  Minimum 4bytes character is 0x81308130.
+Sat May 31 23:53:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jun  1 22:29:35 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* rational.c (string_to_r_internal): use rb_isdigit.
-
-	* marshal.c (long_toobig): use %zd.
-
-	* ruby.c (set_arg0): move unused variable definition.
-
-Sun Jun  1 12:18:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
-	  this is not int on 64bit system.
-
-	* vm_dump.c (control_frame_dump): ditto.
-
-	* vm_dump.c (stack_dump_each): ditto.
-
-	* vm_dump.c (debug_print_register): ditto.
-
-	* vm_dump.c (debug_print_pre): ditto.
-
-	* transcode.c (str_transcode): ditto.
-
-Sun Jun  1 10:32:18 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_normal_exit): show coredump status.
+	* .: Release as Ruby 1.8.7.
 
 Sat May 31 23:33:34 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* README, README.ja: Add a note about default C flags.
 
-Sat May 31 23:02:00 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (count_objects): clear given hash.
+Sat May 31 22:11:15 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Sat May 31 20:28:10 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* version.c (ruby_description, ruby_copyright): backported from
+	  1.9. bug#19002, [ruby-dev:34883]
 
-	* test/ruby/test_regexp.rb: add tests.
+	* error.c (report_bug): uses ruby_description.
 
-Sat May 31 19:11:39 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat May 31 20:56:04 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* enc/utf_16{be,le}.c (utf16{be,le}_code_to_mbc):
-	  fix codepoint to bytes.
+	* array.c (rb_ary_delete_if): should return enumerator if no block
+	  is given.  [ruby-dev:34901]
 
 Sat May 31 18:28:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* suppress warnings with -Wwrite-string.
 
-Sat May 31 18:26:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_delete_if): should return enumerator if no block
-	  is given.  [ruby-dev:34901]
-
 Sat May 31 15:58:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, configure.in (warnflags): defaulted to -Wall
 	  -Wno-parentheses with gcc.  [ruby-dev:34810]
 
-Sat May 31 15:17:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/mvm.h: new header file for MVM, and moved rb_vm_t and
-	  rb_thread_t from vm_core.h.
-
-Sat May 31 12:02:23 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_normal_exit): show pid when fail.
-
-Fri May 30 23:55:56 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_rubyoptions.rb: add a test of RUBY_DESCRIPTION.
-
-Fri May 30 22:47:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_regexp.rb: add tests.
-
-Fri May 30 22:40:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_signal.rb: add tests to achieve over 80% test
-	  coverage of signal.c.
-
-Fri May 30 22:28:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* signal.c (esignal_signo): fix SignalException#signo which returned
-	  nil absolutely.
-
-	* signal.c (esignal_init): always prepend "SIG" to a string that is
-	  returned by SignalException#signm.
-
-Fri May 30 22:17:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_argf.rb: rename a conflicting method name.
-
-	* test/ruby/test_string.rb: ditto.
-
-	* test/ruby/test_io.rb: ditto.
-
-Fri May 30 22:14:37 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (defined_expr): fix SEGV by defined?([1]).
-
-Fri May 30 12:18:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 30 05:28:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* common.mk (prelude.c): simply depends on PREP.  [ruby-dev:34877]
+	* enum.c (count_i, count_iter_i, count_all_i): add prototypes for VC.
 
-	* enc/make_encdb.rb, enc/trans/make_transdb.rb: ditto.
+Fri May 30 04:32:07 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri May 30 10:55:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (struct rb_unblock_callback), thread.c
-	  (set_unblock_function), thread_{pthread,win32}.c (native_sleep):
-	  extracted from struct rb_thread_struct.
-
-	* thread.c (reset_unblock_function): not check interrupts at leaving
-	  blocking region.  [ruby-dev:34874]
-
-Fri May 30 06:09:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_8.c: add UTF8-MAC (UTF-8-MAC).
-
-Fri May 30 04:17:13 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_count, count_all_i, Init_Enumerable),
-	  array.c (rb_ary_count): If no argument or block is given, count
-	  the number of all elements.
+	* enum.c (count_i, count_iter_i): Sync with trunk.
+	  enum.c (enum_count, count_all_i, Init_Enumerable),
+	  array.c (rb_ary_count): Sync with trunk.  If no argument or
+	  block is given, count the number of all elements.
 
 Fri May 30 03:12:18 2008  Akinori MUSHA  <knu@iDaemons.org>
 
@@ -3163,64 +765,33 @@ Fri May 30 02:35:00 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  use FIX2INT() without checking the value type.  Use NUM2INT()
 	  instead; found by akr in [ruby-dev:34890].
 
-Fri May 30 02:08:20 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* signal.c (esignal_init): handle a non-integer argument correctly,
-	  allowing SignalException.new(:INT).
-
-Fri May 30 00:59:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_regexp.rb: add tests.
-
-Thu May 29 22:51:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_require.rb: add a test for load with wrap flag, to
-	  achieve 100% test coverage of eval_jump.c.
-
-Thu May 29 22:47:53 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_argf.rb: new tests for ARGF, to achieve over 85% test
-	  coverage of file.c.
-
-	* test/ruby/test_io.rb: add tests.
+Thu May 29 20:07:45 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu May 29 22:41:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* io.c (argf_readchar): raise EOFError, synchronizing IO#readchar.
-
-Thu May 29 22:29:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* io.c (argf_external_encoding, argf_internal_encoding): fix SEGV by
-	  ARGF.external_encoding.
+	* configure.in, win32/Makefile.sub, mkconfig.rb, instruby.rb,
+	  ruby.c, lib/mkmf.rb, README.EXT, README.EXT.ja: Backport the
+	  vendor_ruby directory support.
 
 Thu May 29 17:52:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
 	  as WIN32.  [ruby-core:16984]
 
-Wed May 28 18:05:28 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_nitems, Init_Array): Axe Array#nitems().
-	  cf. [ruby-dev:34676]-[ruby-dev:34713]
-
-Wed May 28 17:50:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/mkexports.rb (Exports#objdump, Exports#each_line): extracted.
-
-Wed May 28 17:41:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 28 17:54:29 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* Makefile.in (MKPREP): appended $(RBCONFIG).
+	* string.c (rb_str_start_with): Remove an unused variable.
+	  (rb_str_upto_m): Fix a prototype.
 
-	* common.mk (enc.mk, prelude.c): not depend on $(RBCONFIG) on mswin32
-	  to get of compiling twice each time.
+Wed May 28 17:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* win32/Makefile.sub (prelude.c): not depend on $(PREP).
+	* range.c (range_step): Fix brokenness when a non-integer numeric
+	  value is specified as step. [rubyspec]
+	  (range_step): Make use of String#step internally if a string (or
+	  string-alike) range is given.
 
-Wed May 28 17:37:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_str_upto_m, Init_String): Add an optional second
+	  argument to specify if the last value should be included.
 
-	* win32/mkexports.rb (Exports::Mswin#each_export): speed up.
-
-Wed May 28 16:41:59 2008  Akinori MUSHA  <knu@iDaemons.org>
+Wed May 28 16:53:39 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
 	  beginning. [rubyspec]
@@ -3232,20 +803,10 @@ Wed May 28 16:12:44 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  present and the status code is not valid as a client
 	  redirection.  cf. RFC 3875 6.2.3, 6.2.4.
 
-Wed May 28 15:53:52 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/trans/japanese.c (to_SHIFT_JIS_EF_infos): typo.
-
 Wed May 28 15:18:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/singleton.rb (SingletonClassMethods): _load should be public.
 
-Wed May 28 13:30:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/japanese.c: add workaround for Unicode to CP932.
-	  U+2015->0x815C, U+2225->0x8161, U+FF0D->0x817C, U+FF3C->0x815F,
-	  U+FF5E->0x8160, U+FFE0->0x8191, U+FFE1->0x8192, U+FFE2->0x81CA
-
 Wed May 28 12:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
@@ -3253,69 +814,73 @@ Wed May 28 12:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (convert_type): ditto.
 
-Wed May 28 08:42:51 2008  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c: "%" is required before PRI?VALUE.
+Tue May 27 23:26:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue May 27 22:10:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* error.c (rb_bug): description from rb_bug() should include
+	  patchlevel.  [ruby-dev:34826]
 
-	* eval_error.c (error_handle): SystemExit and SignalException throws
-	  TAG_RAISE but not TAG_FATAL.
-
-	* thread.c (rb_thread_execute_interrupts): delay interrupts during
-	  raising exceptions.  [ruby-dev:34855]
-
-Tue May 27 20:18:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue May 27 20:19:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* array.c (rb_ary_slice_bang): Return an empty array instead of
 	  nil when pos is valid and len is adjusted from a valid value to
 	  zero; caught by RubySpec.
 
-Tue May 27 19:12:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 27 19:45:20 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* Makefile.in (MKPREP), common.mk, win32/Makefile.sub (prelude.c): get
-	  rid of depending PREP with nmake.
+	* numeric.c (flo_divmod): Revert the behavior change; do not
+	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]
 
-	* common.mk (encs): depends on libruby.
+Tue May 27 19:24:40 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue May 27 19:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enum.c (enum_to_a): Pass arguments through to #each().
+	  (enum_sort): Follow the enum_to_a signature change.
+	  (enum_reverse_each): Add #reverse_each().
+
+Tue May 27 18:54:02 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/stringio/stringio.c (strio_each_char, Init_stringio): Add
 	  StringIO#{each_char,chars}.
-	  (Init_stringio): Fix StringIO#bytes.
 
-Tue May 27 17:54:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue May 27 17:59:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/stringio/stringio.c (strio_each): Return an enumerator if no
+	  block is given.
+	  (strio_each_byte): Return an enumerator if no block is given,
+	  and return self if one is given as the rdoc says.
 
-	* ext/stringio/stringio.c (strio_each_byte): Return self instead
-	  of nil as the rdoc says.
+	* io.c (rb_io_each_byte): Fix rdoc.  IO#each_byte returns self,
+	  not nil.
 
-Tue May 27 15:36:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 27 16:02:58 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* numeric.c (check_int): use PRIxVALUE format specifier.
+	* eval.c (rb_mod_module_exec, Init_eval): Add
+	  Module#{module_exec,class_exec}.
 
-	* numeric.c (check_uint, rb_num2fix, int_chr): ditto.
+Tue May 27 15:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* numeric.c (num_fdiv): fallback to_f should always return float
-	  result.  should not use #quo that may return rational.
+	* io.c (rb_io_each_char, argf_each_char, Init_IO):
+	  Add {IO#,ARGF.}{each_char,chars}.
 
-	* numeric.c (num_div): should raise ZeroDivisionError.
+Tue May 27 13:46:52 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* numeric.c (fix_divide): ditto.
+	* ext/stringio/stringio.c (Init_stringio): Define
+	  StringIO#{getbyte,readbyte}.
 
-	* test/ruby/test_numeric.rb (TestNumeric::test_divmod): avoid
-	  ZeroDivisionError in tests.
+Tue May 27 13:38:51 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue May 27 13:14:53 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* io.c (Init_IO): Define {IO#,ARGF.}{getbyte,readbyte}.
 
-	* enum.c (enum_to_a): Pass arguments through to #each().
-	  (enum_sort): Follow the enum_to_a signature change.
-	  (enum_reverse_each): Add #reverse_each().
+Tue May 27 13:26:15 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/stringio/stringio.c (Init_stringio): Define #bytes and
+	  #lines.
 
-	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+Tue May 27 13:20:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue May 27 12:06:37 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c: (rb_io_lines, rb_io_bytes, Init_IO): Define
+	  IO#{lines,bytes} and ARGF.{lines,bytes}.
+
+Tue May 27 12:13:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
 
@@ -3327,193 +892,167 @@ Mon May 26 18:24:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): use BUFCHECK.
 
-Mon May 26 17:48:42 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (struct enumerator, enumerator_init)
-	  (enumerator_init_copy, enumerator_each): Eliminate iter.
-	  (enumerator_ptr): Do not hardcode the class name.
-	  (enumerator_with_index): Delay variable initialization after
-	  RETURN_ENUMERATOR().
-
-Mon May 26 17:23:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (file_expand_path): add more space for '/'.
-
-	* file.c (file_expand_path): should reset address of p after calling
-	  rb_str_resize(). [ruby-dev:34800]
-
-Mon May 26 16:49:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode): use run-hooks if run-mode-hook is
-	  not available.  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>
-	  in [ruby-dev:34853].
-
-Mon May 26 16:41:35 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon May 26 16:46:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (ntfs_tail): filename which starts with '.' is valid.
 
 	* file.c (file_expand_path): cygwin symlink support.
 
-Mon May 26 07:15:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 26 12:16:43 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* vm_dump.c (rb_vm_bugreport): rb_make_backtrace has no arguments.
+	* .: Release as Ruby 1.8.7-preview4.
 
-Mon May 26 01:17:54 2008  Tanaka Akira  <akr@fsij.org>
+Mon May 26 12:12:26 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/envutil.rb (assert_normal_exit): signal description
-	  refined.
+	* marshal.c (dump_ensure, load_ensure): should return values.
 
-Mon May 26 00:52:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (yield_under, yield_under_i, yield_args_under_i)
+	  (specific_eval, rb_obj_instance_exec, Init_eval): Implement
+	  Object#instance_exec(), a 1.9 feature.
 
-	* hash.c (env_each_key, env_each_value, env_reject_bang)
-	  (rb_env_clear, env_replace): Omit duplicated secure level check.
+Mon May 26 11:53:21 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon May 26 00:37:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a
+	  block to a Proc.  [ruby-dev:23533]; by nobu; backported from
+	  1.9.  This implementation in current shape is known to be
+	  buggy/broken, especially with nested block invocation.  Take
+	  this as an experimental feature.
 
-	* hash.c (env_each_value): Do not call env_values() twice.
-
-Sun May 25 17:54:36 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (iseq_compile): set local_table for
-	  ISEQ_TYPE_DEFINED_GUARD.
-
-Sun May 25 17:52:25 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* parse.y (block_par, block_var): ditto.
 
-	* compile.c (iseq_build_body): remove side effect from
-	  VM::InstructionSequence.load.
+Mon May 26 08:00:52 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun May 25 04:30:45 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
+	  definition; fixes [ruby-dev:34843].
 
-	* test/ruby/test_modules.rb (remove_json_mixins): change judgment
-	  condition.
+Mon May 26 03:16:20 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun May 25 03:54:39 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* hash.c (rb_hash_default): Fix rdoc.
+	  (rb_hash_each, env_each_value, env_each_pair): Return an
+	  enumerator if no block is given.
+	  (rb_hash_update): Update rdoc.
+	  (envix): Conditionalize the definition itself.
+	  (rb_f_getenv, env_fetch, env_keys, env_values, env_values_at)
+	  (env_select, env_inspect, env_to_a, env_empty_p, env_has_key)
+	  (env_has_value, env_index, env_indexes, env_to_hash, env_shift)
+	  (env_update): Require secure level 4.
+	  (env_each_value, env_each_i): Delay variable initialization.
+	  (env_each_key, env_each_value, env_reject_bang)
+	  (env_clear, env_replace): Omit duplicated secure level check.
+	  (env_has_value): Do to_str conversion.
+
+Sun May 25 19:48:12 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* hash.c (env_delete_if): Return an enumerator if no block is
+	  given.
+	  (env_each_key): Delay a variable initialization after
+	  RETURN_ENUMERATOR().
 
-	* test/ruby/test_modules.rb (test_ancestors, test_included_modules):
-	  ignore json mixins.
+Sun May 25 05:07:19 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun May 25 02:37:25 2008  Koichi Sasada  <ko1@atdot.net>
+	* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
+	  and String#slice!().  Just return nil when a negative length or
+	  out of boundary index is given instead of raising an exception
+	  via internal functions.
+	  (rb_ary_slice_bang): should not use rb_ary_subseq() which shares
+	  internal pointer.  splice modifies the receiver right after
+	  subseq.  [ruby-dev:34005]
+	  (rb_ary_slice_bang): should adjust length before making
+	  sub-array.
 
-	* eval_method.c: renamed from vm_method.c.  "vm_method.c" is included
-	  by "vm.c".
+	* enumerator.c (Init_Enumerator): Override
+	  Enumerable::Enumerator#each_with_index with #with_index.
 
-	* vm_eval.c: added.  Some codes are moved from "eval.c"
+Sun May 25 03:13:09 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* common.mk: fix for above changes.
+	* eval.c (Init_Thread): Initialize recursive_key.
 
-	* compile.c: make a vm_eval(0)
+Sun May 25 02:45:49 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c, eval_error.c, eval_intern.h, eval_jump.c, proc.c, vm.c,
-	  id.c, id.h, vm_core.h, vm_dump.c, vm_evalbody.c, vm_insnhelper.c,
-	  blockinlining.c: fix for above changes.  and do some refactoring.
-	  this changes improve rb_yield() performance.
+	* error.c (syserr_eqq): Use en.
 
 Sat May 24 22:32:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* util.c (ruby_strtod): clear errno at the top of our own
-	  implementation of strtod(3).  [ruby-dev:34834] [ruby-dev:34839]
+	* object.c (rb_cstr_to_dbl): should clear errno before calling
+	  strtod(3).  [ruby-dev:34834]
 
-Sat May 24 15:26:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Sat May 24 22:27:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* compile.c (iseq_set_exception_table, NODE_WHILE, NODE_NEXT): remove
-	  special handling that decrements sp in CATCH_TYPE_NEXT for NODE_WHILE.
+	* marshal.c (marshal_load): should initialize arg.data used for
+	  reentrant check.  [ruby-dev:34837]
 
-	* vm.c (vm_eval_body), vm_insnhelper.c (vm_throw): remove unused code.
+Sat May 24 00:34:59 2008  Tanaka Akira  <akr@fsij.org>
 
-Sat May 24 08:13:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/rational.rb (Rational#to_i): fix rdoc.  Rational(-7,4).to_i
+	  should be -1.
 
-	* transcode.c (rb_str_transcode): argc is 1, and argv is &to.
+Fri May 23 20:22:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri May 23 17:55:11 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* marshal.c (reentrant_check): check reentrance via callcc.
+	  [ruby-dev:34802]
 
-	* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
-	  and String#slice!().  Just return nil when a negative length or
-	  out of boundary index is given instead of raising an exception
-	  via internal functions.
+Fri May 23 16:46:28 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri May 23 16:44:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enumerator.c (proc_call): Remove an unused static function.
 
-	* enumerator.c (Init_Enumerator): Override
-	  Enumerable::Enumerator#each_with_index with #with_index.
+Fri May 23 13:46:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri May 23 12:23:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (cflags): commit miss.
 
-	* vm_core.h (rb_num_t): moved form vm.h.
+Fri May 23 09:52:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* tool/instruction.rb (RubyVM::Instruction#sp_increase_c_expr),
-	  tool/instruction.rb (RubyVM::VmBodyGenerator#make_header_operands):
-	  omit unused variables.
+	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
+	  [ruby-core:16642]
 
-Fri May 23 08:47:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb: load purelib.rb only when not cross compiling.
 
-	* error.c (exc_equal): == operator should be transitional.  
-	  [ruby-dev:34808]
+Fri May 23 08:47:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* error.c (syserr_eqq): === should be able to handle delegated
 	  objects as well.
 
-Fri May 23 06:15:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): get rid of segv.
-
-Fri May 23 02:29:14 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (opt_gt|ge|lt|le): use values directly to compare.
-
-Fri May 23 01:15:09 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, eval_intern.h, include/ruby/intern.h, include/ruby/ruby.h,
-	  vm.c, vm_core.h, vm_insnhelper.c: remove pointless "const".
-
-Thu May 22 23:45:17 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (get_destination_insn, get_next_insn, get_prev_insn):
-	  peephole optimization should not ignore ISEQ_ELEMENT_ADJUST.
+Fri May 23 04:22:19 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Thu May 22 20:20:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (check_dump_arg, check_load_arg): check if reentered.
-	  [ruby-dev:34802]
-
-Thu May 22 20:14:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
 
-	* iseq.c (iseq_load, iseq_data_to_ary): support
-	  ISEQ_TYPE_DEFINED_GUARD.
+	* ext/tk/lib/tk.rb: avoid trouble when finalize TclTkIp.
 
-Thu May 22 19:01:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/*: help to fix troubles when
+	  use Ttk widgets on old Tk scripts.
 
-	* vm.c (vm_get_ruby_level_cfp): moved from eval_intern.h.
+	* ext/tk/sample/*: update and add demo scripts. some of them are
+	  introduction about new features of Tcl/Tk8.5.
 
-	* vm.c (sdr, nsdr): define methods only if VMDEBUG is defined.
+Fri May 23 03:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu May 22 17:18:35 2008  Tanaka Akira  <akr@fsij.org>
+	* class.c (clone_method): Just use ruby_cref as cref.
 
-	* array.c (rb_ary_compact_bang): fix reallocation size.
+Fri May 23 01:03:23 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu May 22 15:20:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* class.c (rb_singleton_class_clone): Pass Qnil, not 0.
 
-	* eval_intern.h, vm_core.h, include/ruby/intern.h, include/ruby/ruby.h,
-	  vm.c: need to add const to prototypes, of course.
+Fri May 23 00:51:48 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu May 22 13:24:43 2008  Koichi Sasada  <ko1@atdot.net>
+	* class.c (clone_method): Totally revamp the previous fix which
+	  was incorrect.
+	  (rb_mod_init_copy): Ditto.
+	  (singleton_class_clone_int): Ditto.
 
-	* eval.c, vm.c, vm_core.h, vm_insnhelper.c: specify "const".
+Fri May 23 00:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* vm_opts.h: add a OPT_TOKEN_THREADED_CODE macro.
+	* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
+	  and export.
 
-Thu May 22 12:51:41 2008  Tanaka Akira  <akr@fsij.org>
+Thu May 22 21:24:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* insns.def (newhash): fix a variable definition: "const k".
+	* parse.y (top_local_setup): fixed memory leak bug based on a
+	  patch from Roger Pack <rogerpack2005 at gmail.com> in
+	  [ruby-core:16610].
 
-Thu May 22 12:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 22 14:20:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (flatten): check if reentered.  [ruby-dev:34798]
 
-Thu May 22 11:39:59 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_normal_exit): capture stdout and stderr
-	  of the child process.
-
 Thu May 22 08:28:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (flatten): free memo hash table before raising exception.
@@ -3523,172 +1062,31 @@ Thu May 22 06:30:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* array.c (flatten): fix memory leak.
 
-Thu May 22 06:21:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.
-
 Thu May 22 05:45:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* proc.c (proc_dup): should copy safe_level from src proc
 	  properly.  a patch from Keita Yamaguchi
 	  <keita.yamaguchi at gmail.com>
 
-Thu May 22 02:46:08 2008  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: do not use Thread#raise. [ruby-dev:34739]
-
-Thu May 22 00:30:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_require.rb: new tests for library requiring, to
-	  achieve over 90% test coverage of dln.c.
-
-	* test/ruby/test_class.rb: add tests to achieve over 90% test coverage
-	  of class.c.
-
-	* test/ruby/test_module.rb: ditto.
-
-Thu May 22 00:15:44 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm_insnhelper.c: specify "const".
-
-Wed May 21 23:20:21 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_eval.rb: fix syntax.
-
-Wed May 21 17:46:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index):
-	  use strcasecmp. [ruby-dev:34787]
-
-Wed May 21 16:48:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_compact_bang): avoid forceful realloc.
-
-Wed May 21 07:42:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_usascii_str_new): use rb_str_new.
-
-	* string.c (rb_enc_str_new): ditto.
-
-	* string.c (rb_usascii_str_new2): use rb_str_new2.
+Wed May 21 23:31:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 21 07:22:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* eval.c (rb_get_method_body, rb_alias, rb_eval): should not cache
+	  uninitialized value, since search_method doesn't set origin if the
+	  method wasn't found.
 
-	* encoding.c, include/ruby/encoding.h
-	  (rb_enc_associate, rb_enc_associate_index):
-	  returns obj. [ruby-dev:34778]
+	* eval.c (search_method, remove_method, error_print, rb_alias)
+	  (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create),
+	  gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline),
+	  parse.y (rb_id2name, rb_parser_free): suppress warnings.
 
-Wed May 21 04:20:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed May 21 12:34:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* encoding.c (rb_ascii8bit_encoding): use ENCINDEX_ASCII.
+	* hash.c (rb_hash_delete): rdoc fix based on a patch from Gaston Ramos
+	  <ramos.gaston AT gmail.com>.  [ruby-core:16825]
 
-	* encoding.c, include/ruby/encoding.h (rb_ascii8bit_encindex):
-	  added.
+Tue May 20 13:15:46 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* encoding.c (rb_locale_encoding): use rb_usascii_encoding().
-
-Wed May 21 01:45:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file_exhaustive.rb (setup): workaround for Windows
-	  Vista.
-
-	* test/ruby/envutil.rb (rubyexec): now Open3.open3 is supported on
-	  Windows.
-
-	* test/ruby/test_process.rb: use ``||'' instead of ``;'' because
-	  cmd.exe not support it.
-
-Wed May 21 01:28:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* transcode.c, include/ruby/encoding.h (rb_str_transcode):
-	  C API of encoding conversion for Ruby object.
-	  VALUE rb_str_transcode(VALUE str, VALUE to).
-
-	* transcode.c (str_encode, str_encode_bang):
-	  rename from rb_tr_transcode or rb_str_transcode_bang.
-
-Tue May 20 23:26:05 2008  Yusuke Endoh	<mame@tsg.ne.jp>
-
-	* test/ruby/test_array.rb: fix tests for 64bit CPU.
-
-Tue May 20 20:59:56 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (rb_nkf_convert) (nkf_enc_without_bom):
-	  reverted. nkf-utf8/nkf.c should be independent of ruby.
-
-	* ext/nkf/nkf.c (options):
-	  moved from nkf-utf8/nkf.c. 
-	  override nkf's original settings for Unicode BOM.
-
-Tue May 20 13:20:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/nkf.c (rb_nkf_convert), ext/nkf/nkf-utf8/nkf.c
-	  (nkf_enc_without_bom): BOM is not a part of encodings.
-
-	* ext/nkf/nkf.c (Init_nkf), ext/nkf/nkf-utf8/nkf.c (options):
-	  UTF-{16,32} without endian have no sense.
-
-Tue May 20 12:13:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options, process_options): --dump option.
-
-Tue May 20 11:36:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRI[diouxX]VALUE): printf format for VALUE.
-
-	* gc.c (assign_heap_slot): suppress a warning.
-
-Tue May 20 03:42:43 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, vm_insnhelper.c: fix cref in instance_eval
-	  and cvar_base search protocol.
-
-	* bootstraptest/test_knownbug.rb, test_eval.rb: move solved test
-	  and add new tests.
-
-	* test/ruby/test_eval.rb: fix tests for spec.
-
-Tue May 20 01:43:44 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: fix a test.
-	  "block_given?" returns true if "yield" can be used.
-
-Tue May 20 01:07:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* parse.y (assignable_gen): when "self = 1" was evaluated, unnecessary
-	  error message was output, which might cause null pointer access.
-
-Tue May 20 08:38:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_enc_strlen_cr): need to set ENC_CODERANGE_7BIT if
-	  search_nonascii() fails.    [ruby-dev:34751]
-
-	* string.c (rb_str_reverse): preserve coderange info if the
-	  receiver is 7bit string.
-
-	* string.c (rb_str_reverse_bang): ditto.
-
-	* string.c (rb_str_reverse_bang): should have called
-	  single_byte_optimizable before rb_str_modify() that clears
-	  coderange info.
-
-	* string.c (tr_trans): handle single bytes more eagerly.
-
-Mon May 19 23:32:12 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block_from_c): fix call flow.
-
-Mon May 19 23:19:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* regexec.c (slow_search): check the case when the length is 1.
-	  The behavior of memcmp is undefined if the third argument is 0.
-
-Mon May 19 21:07:48 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (native_thread_apply_priority): 
-	  fix argument range check.  [ruby-dev:33124]
+	* file.c (lchmod_internal): Remove a compiler warning.
 
 Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
@@ -3696,73 +1094,32 @@ Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 	  of md; pointed out by Takahiro Kambe <taca at back-street.net>
 	  in [ruby-dev:34748].
 
-Mon May 19 17:23:55 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regparse.c (PINC): use optimized enclen() instead of
-	  ONIGENC_MBC_ENC_LEN().
-
-	* regparse.c (PFETCH): ditto.
-
-	* regparse.c (PFETCH): small optimization.
-
-	* regexec.c (slow_search): single byte encoding optimization.
-
-	* regenc.h (enclen): avoid calling function when encoding's
-	  min_len == max_len.
-
-	* re.c (rb_reg_regsub): rb_enc_ascget() optimization for single
-	  byte encoding.
-
-	* re.c (rb_reg_search): avoid allocating new re_registers if we
-	  already have MatchData.
-
-	* re.c (match_init_copy): avoid unnecessary onig_region_free()
-	  before onig_region_copy. 
-
-	* encoding.c (rb_enc_get_index): remove implicit enc_capable check
-	  each time.
-
-	* encoding.c (rb_enc_set_index): ditto.
-
-	* encoding.c (enc_compatible_p): small refactoring.
-
-	* include/ruby/encoding.h (rb_enc_dummy_p): inline
-	  rb_enc_dummy_p() and export related code.
-
-Mon May 19 14:32:03 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h: fix strange change by version.h update tool.
+Mon May 19 14:20:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon May 19 14:18:13 2008  Koichi Sasada  <ko1@atdot.net>
+	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
 
-	* bootstraptest/test_knownbug.rb: move solved tests.
+Mon May 19 13:29:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* bootstraptest/test_eval.rb, test_literal.rb, test_syntax.rb,
-	  test_thread.rb: ditto.
+	* process.c (rb_f_system): set last_status when status == -1 because
+	  there is no path to set it on win32. this patch is derived from
+	  [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
 
-	* test/ruby/test_m17n.rb, test_proc.rb, test_sprintf.rb,
-	  test_string.rb, test/ruby/test_struct.rb: ditto.
+Mon May 19 13:01:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon May 19 13:23:03 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
 
-	* process.c (rb_spawn_internal): set last_status when status == -1
-	  because there is no path to set it on win32. this patch is derived
-	  from [ruby-core:16787], submitted by Luis Lavena <luislavena at
-	  gmail.com>
+	* {win32,bcc32}/Makefile.sub (update-rubyspec): added.
 
-Mon May 19 11:32:47 2008  Koichi Sasada  <ko1@atdot.net>
+Mon May 19 11:53:45 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* vm.c, insns.def, eval.c, vm_insnhelper.c: fix CREF handling.
-	  VM value stack frame of block contains cref information.
-	 (dfp[-1] points CREF)
-
-	* compile.c, eval_intern.h, eval_method.c, load.c, proc.c,
-	  vm_dump.h, vm_core.h: ditto.
+	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
+	  prototype change in openssl bundled with newer OpenBSD.
+	  a patch from Takahiro Kambe <taca at back-street.net> in
+	  [ruby-dev:34691].
 
-	* include/ruby/ruby.h, gc.c: remove T_VALUES because of above
-	  changes.
+Mon May 19 06:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* bootstraptest/test_eval.rb, test_knownbug.rb: move solved test.
+	* .: Release as Ruby 1.8.7-preview3.
 
 Sun May 18 22:26:51 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
@@ -3774,589 +1131,216 @@ Sun May 18 22:26:51 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  filename) is less than perfect.
 
 	* lib/webrick/httpservlet/abstract.rb
-	  (WEBrick::HTTPServlet::AbstractServlet#redirect_to_directory_uri):
+	  (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
 	  should escape the value of Location: header.
 
 	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
 	  command line arguments.
 
-Sun May 18 02:54:46 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* pack.c (pack_pack): check errno to detect error of ruby_strtoul.
-
-	* pack.c (pack_unpack): ditto.
-
-	* test/ruby/test_pack.rb: add a test for above.
-
 Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): fix for short file name on Cygwin.
 
-Sat May 17 18:03:52 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
-	* vm.c (Init_VM): removed the definition of Thread#initialize,
-	  which is overwritten in Init_Thread and is never used.
-
-Sat May 17 14:01:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): should not free shared pointer, and set
-	  shared.  [ruby-dev:34732]
-
-Sat May 17 12:34:54 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
-
-	* thread_pthread.c (Init_native_thread): Kernel#.sleep used never to
-	  sleep on Mac OS X. Reported by arton <artonx AT yahoo.co.jp>.
-
-	* thread_pthread.c (native_sleep): added error checks.
-
 Sat May 17 11:29:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_extname): first dot is not an extension name.
 
-Sat May 17 03:21:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): stop memory leak.  [ruby-dev:34726]
+Sat May 17 10:18:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (rb_reg_search): need to free allocated buffer in re_register.
 
-	* regexec.c (onig_region_new): more pedantic malloc check.
-
-	* regexec.c (onig_region_resize): ditto.
-
-	* regexec.c (STATE_CHECK_BUFF_INIT): ditto.
-
-	* regexec.c (onig_region_copy): use onig_region_resize.
+Fri May 16 17:01:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri May 16 12:48:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/Makefile.sub (test-rubyspec): added.
 
-	* math.c (to_flo): rb_Float() accepts even strings for input.
+Fri May 16 16:22:40 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* complex.c (nucomp_to_f): fix wrong message.
+	* ext/tk/tcltklib.c: sometimes freeze when receive Interrupt signal.
 
-	* complex.c (nucomp_to_r): ditto.
+Fri May 16 14:54:56 2008  Tanaka Akira  <akr@fsij.org>
 
-	* object.c (rb_Float): do not check NaN for error.  NaN is a part
-	  of valid float values.
+	* Makefile.in (update-rubyspec): move rubyspec to srcdir. 
+	  (test-rubyspec): ditto.
 
-Thu May 15 23:36:09 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri May 16 14:25:22 2008  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_string.rb: add tests to achieve over 90% test
-	  coverage of string.c.
+	* Makefile.in (test-rubyspec): use RUNRUBY.  suggested by nobu.
 
-	* test/ruby/test_m17n.rb: ditto.
+Fri May 16 13:01:43 2008  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_symbol.rb: ditto.
+	* Makefile.in (update-rubyspec): new target to download rubyspec.
+	  (test-rubyspec): new target to run rubyspec.  this doesn't work
+	  before install.
 
-	* test/ruby/test_pack.rb: ditto.
+Fri May 16 08:15:52 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Thu May 15 23:01:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* string.c (tr_find): String#delete returned wrong result when multiple
-	  utf-8 arguments are passed.
+	* ext/tk/lib/tk.rb: fix memory (object) leak bug.
 
-	* test/ruby/test_m17n.rb (test_delete): add a test for above.
+	* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
+	  bug fix.
 
-Thu May 15 22:37:56 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu May 15 17:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* parse.y (ripper_warningS): now used.
+	* string.c (Init_String): Define #bytesize as an alias for #size
+	  for compatibility with 1.9.
 
 Thu May 15 15:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (file_expand_path): support for alternative data stream
-	  and ignored trailing garbage of NTFS.
+	  and ignored trailing garbages of NTFS.
 
 	* file.c (rb_file_s_basename): ditto.
 
 	* file.c (rb_file_s_extname): ditto.
 
-Thu May 15 13:43:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): no need for forceful warning when
-	  converting to float.  overflow is a nature of float values.
-
-	* parse.y (parser_yylex): ditto.
-
-Thu May 15 13:23:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_enc): error condition was updated for non
-	  ASCII compatible strings.
-
-Thu May 15 12:19:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
-	  prototype change in openssl bundled with newer OpenBSD.
-	  a patch from Takahiro Kambe <taca at back-street.net> in
-	  [ruby-dev:34691].
-
-Wed May 14 22:09:25 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ChangeLog: fix typo.
-
-Wed May 14 21:49:14 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_object.rb: new tests to achieve over 90% test
-	  coverage of object.c, eval.c and eval_method.c.
-
-	* test/ruby/test_module.rb: ditto.
-
-	* test/ruby/test_trace.rb: ditto.
-
-	* test/ruby/test_integer.rb: ditto.
-
-	* test/ruby/test_float.rb: ditto.
-
-	* test/ruby/test_method.rb: ditto.
-
-	* test/ruby/test_variable.rb: ditto.
-
-	* test/ruby/test_eval.rb: ditto.
-
-	* test/ruby/test_exception.rb: ditto.
-
-	* test/ruby/test_class.rb: ditto.
-
-Wed May 14 12:46:37 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (insn_operand_intern): remove Qundef related code.
-
-Wed May 14 12:42:36 2008  Akinori MUSHA  <knu@iDaemons.org>
+Wed May 14 19:24:59 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* array.c (rb_ary_count): Override Enumerable#count for better
 	  performance.
+	  (rb_ary_nitems): Undo the backport.  Use #count {} instead.
 
-Wed May 14 11:29:06 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: add a "putcbase" instruction.
-
-	* compile.c, insns.def: fix to use putcbase instruction for
-	  class search.  Qundef should not be used.
-
-Wed May 14 07:49:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): defer calling of rb_frame_self() until it
-	  become really necessary.
-
-	* eval.c (rb_call): ditto.
-
-Wed May 14 00:55:56 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_io_m17n.rb: remove a duplicative method.
-
-	* test/ruby/test_utf16.rb: rename a conflicting method name.
-
-	* test/ruby/test_array.rb: ditto.
-
-	* test/ruby/test_file_exhaustive.rb: ditto.
-
-	* test/ruby/test_hash.rb: ditto.
-
-	* test/ruby/test_env.rb: ditto.
+	* enumerator.c (enumerator_iter_i): Remove an unused function.
+	  (enumerator_with_index, enumerator_each): Remove unused
+	  variables.
 
-	* test/ruby/test_fixnum.rb: ditto.
+Wed May 14 17:15:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/ruby/test_rational.rb: ditto.
+	* ext/tk/tkutil/extronf.rb: check stdndup() because it's not standard
+	  function of C.
 
-Wed May 14 00:45:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): use malloc() and
+	  strncpy() instead of strndup() if not available.
 
-	* eval_method.c (rb_add_method): fix check for warning when
-	  Object#initialize is redefined. (same as 1.8)
+Wed May 14 09:52:02 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Tue May 13 23:32:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. 
+	  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
+	  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. 
+	  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; 
+	  those are attributes of event object). It means that Ruby/Tk accepts
+	  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but 
+	  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". 
+	  It is potentially incompatible, when user passes symbols to the
+	  arguments of the callback block (the block receives the symbols as
+	  strings). I think that is very rare case (probably, used by Ruby/Tk
+	  experts only). When causes such trouble, please give strings instead
+	  of such symbol parameters (e.g. call Symbol#to_s method).
 
-	* enum.c (enum_yield): use rb_yield_values2.
+	* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, 
+	  ext/tk/lib/tkextlib/blt/treeview.rb, 
+	  ext/tk/lib/tkextlib/winico/winico.rb: ditto.
 
-	* enum.c (DEFINE_ENUMFUNCS): macro to define enumerator and yielding
-	  functions.
+	* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on 
+	  TkUtil::CallbackSubst class (it is useful on Ruby 1.9). 
 
-	* enum.c (enum_all_func, enum_any_func, enum_one_func,
-	  enum_none_func): reduced duplicate code.
+	* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, 
+	  ext/tk/lib/tkextlib/iwidgets/spinner.rb, 
+	  ext/tk/lib/tkextlib/iwidgets/entryfield.rb, 
+	  ext/tk/lib/tkextlib/iwidgets/calendar.rb, 
+	  ext/tk/lib/tkextlib/blt/dragdrop.rb, 
+	  ext/tk/lib/tkextlib/tkDND/tkdnd.rb, 
+	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, 
+	  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became 
+	  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
 
-Tue May 13 15:09:38 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue May 13 15:10:50 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enumerator.c: Update rdoc.
 	  (enumerator_initialize): Discourage the use.
 	  (enum_each_slice, enum_each_cons, enumerator_each)
 	  (enumerator_with_index): Add a note about a call without a block.
 
-Tue May 13 08:25:31 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_f_gets): re-enable rdoc.
-	  (rb_f_readline): ditto.
-	  (rb_f_readlines): ditto.
+	* NEWS: Intentionally omit enum_slice and enum_cons, which are
+	  removed in 1.9.
 
 Tue May 13 07:56:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_cat): fixed buffer overrun reported by
 	  Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
 
-Mon May 12 23:37:57 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm.c (collect_local_variables_in_env): remove unnecessary check
-	  which causes: x=1;proc{local_variables}.call #=> []
-
-	* test/ruby/test_variable.rb: add a test for above.
-
-Mon May 12 23:05:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c, include/ruby/intern.h (rb_run_exec_options): externed.
-
-	* process.c (save_redirect_fd, save_env_i, save_env, run_exec_dup2,
-	  run_exec_open, run_exec_pgroup, run_exec_rlimit, rb_run_exec_options):
-	  save parent's process environments.
-
-	* process.c (rb_spawn_internal): remove calling run_exec_options()
-	  because cannot restore after spawn.
-
-	* io.c (pipe_open): ditto.
-
-	* test/ruby/test_process.rb (test_execopts_env): upcase environment
-	  variable name for case insensitive platforms.
-
-	* win32/win32.c (init_env): set USER environment variable only when
-	  USERNAME is available.
-
-Mon May 12 22:23:01 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/date.rb (once): use Object#object_id instead of Symbol#to_i.
-
-Mon May 12 21:34:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/envutil.rb (rubybin): return expanded rubyexe instead of
-	  expanded ruby if available.
-
-Mon May 12 20:19:55 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (grep_i): Be aware of multiple values;
-	  fix [ruby-dev:34653].
-	  (grep_iter_i): Ditto.
-	  (count_i): Ditto.
-	  (find_i): Ditto.
-	  (find_index_i): Ditto.
-	  (find_all_i): Ditto.
-	  (reject_i): Ditto.
-	  (inject_i): Ditto.
-	  (inject_op_i): Ditto.
-	  (partition_i): Ditto.
-	  (group_by_i): Ditto.
-	  (first_i): Ditto.
-	  (sort_by_i): Ditto.
-	  (all_i): Ditto.
-	  (all_iter_i): Ditto.
-	  (any_i): Ditto.
-	  (any_iter_i): Ditto.
-	  (one_i): Ditto.
-	  (one_iter_i): Ditto.
-	  (none_i): Ditto.
-	  (none_iter_i): Ditto.
-	  (min_i): Ditto.
-	  (min_ii): Ditto.
-	  (max_i): Ditto.
-	  (max_ii): Ditto.
-	  (minmax_i): Ditto.
-	  (minmax_ii): Ditto.
-	  (min_by_i): Ditto.
-	  (max_by_i): Ditto.
-	  (minmax_by_i): Ditto.
-	  (member_i): Ditto.
-	  (take_i): Ditto.
-	  (take_while_i): Ditto.
-	  (drop_i): Ditto.
-	  (drop_while_i): Ditto.
-	  (cycle_i): Ditto.
-
-	* enum.c (each_with_index): Update rdoc.  each_with_index() takes
-	  arguments that are passed through to each(), and a hash preserves
-	  key order.
-
-Mon May 12 19:05:24 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_spawn_internal): remove calling run_exec_options()
-	  because cannot restore after spawn. we'll fix this later.
-
-Mon May 12 18:16:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_spawn_internal): need to call run_exec_options() before
-	  spawn if the platform doesn't have fork. [ruby-dev:34647]
-
-Mon May 12 15:20:02 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (ruby_vm_xmalloc): increase malloc_increase only if malloc
-	  succeeds.  failed malloc size can be huge.  it may increase
-	  malloc_limit too big which cause less GC and memory full.
-	  (ruby_vm_xrealloc): ditto.
-	  (rb_objspace): make params.limit and params.increase size_t.
-
-Mon May 12 15:04:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_re): made non static with small refactoring.
-
-	* ext/strscan/strscan.c (strscan_do_scan): should adjust encoding
-	  before regex searching.
-
 Mon May 12 13:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
 	  should not operate assignment.  [ruby-dev:34645]
 
-Mon May 12 13:29:26 2008  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (bigzero_p): check from MSB to LSB.  [ruby-dev:34649]
+Mon May 12 12:59:23 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Mon May 12 12:32:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUBYOPT): affected BASERUBY too.  [ruby-talk:301514]
-
-Mon May 12 12:27:55 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to
+	  an invalid value.
 
-	* gc.c (assign_heap_slot): fix condition for number of objects in
-	  a heap.
+	* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
 
-Mon May 12 12:24:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon May 12 12:36:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* string.c (sym_to_i): really removed.  [ruby-dev:34641]
+	* win32/win32.c (rb_w32_select): backport from trunk.
+	  [ruby-talk:300743]
 
-Mon May 12 11:15:55 2008  Yuki Sonoda (Yugui) <yugui@yugui.jp>
+Mon May 12 12:33:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (assign_heap_slot):  put the binary search routine in order.
+	* common.mk (RUBYLIB, RUBYOPT): clear.
 
-Mon May 12 10:52:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 12 10:41:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined
-	  instead of Gem::Enable.
+	* lib/delegate.rb (SimpleDelegator::dup): removed needless argument.
+	  [ruby-list:44910]
 
-	* gem_prelude.rb (load_full_rubygems_library, const_missing): prevent
-	  infinite recursion.  [ruby-dev:34539]
+	* lib/delegate.rb (clone, dup): keep relationship with the target
+	  object.
 
 Sun May 11 23:19:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
 
-Sun May 11 22:54:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/runner.rb (main): leave -I options for purelib.rb
-	  untouched.
-
-	* bootstraptest/runner.rb (main): handle relative path -r options.
-
-Sun May 11 19:04:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_thread.rb: kill and join temporal threads that are
-	  created in each test.
-
-Sun May 11 17:58:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (TestProcess#with_stdin): defined.
-	  (TestProcess#test_argv0_noarg): don't use redirect_fds.
-	  [ruby-dev:34647]
-
 Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (MINIRUBY): should not include extension library path.
 
-Sun May 11 14:40:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (SIZET2NUM): new macro.
-	  (NUM2SIZET): new macro.
+Sun May 11 10:36:10 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* gc.c (struct rb_objspace): use size_t for increment, length and
-	  used for 64bit.
-	  (allocate_heaps): ditto.
-	  (assign_heap_slot): ditto.
-	  (set_heaps_increment): ditto.
-	  (gc_mark_all): ditto.
-	  (is_pointer_to_heap): ditto.
-	  (free_unused_heaps): ditto.
-	  (gc_sweep): ditto.
-	  (os_obj_of): ditto.
-	  (rb_gc_call_finalizer_at_exit): ditto.
-	  (count_objects): ditto.
-
-Sun May 11 13:14:09 2008  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c (thread_cleanup_func_before_exec): extracted from
-	  thread_cleanup_func not to touch pthread data.
-	  pthread_cond_destroy in forked process may cause deadlock on
-	  Debian GNU/Linux Etch on x86, x86-64 and IA64.
-	  this doesn't cause resource leak because the process will exec soon.
-	  (terminate_atfork_before_exec_i): defined.
-	  (rb_thread_atfork_before_exec): defined.
-
-	* include/ruby/intern.h (rb_thread_atfork_before_exec): declared.
-
-	* process.c (rb_exec_atfork): call rb_thread_atfork_before_exec
-	  instead of rb_thread_atfork.
-
-	* io.c (popen_exec): call rb_thread_atfork_before_exec instead of
-	  rb_thread_atfork.
-
-Sat May 10 22:14:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_trans): single '^' does not mean negation.
-	  [ruby-dev:34632]
-
-	* string.c (tr_trans): should check src size, not str size.
-	  [ruby-dev:34637]
-
-	* string.c (tr_trans): should not turn on modify flag if no
-	  modification happens.  [ruby-dev:34631]
-
-Sat May 10 18:11:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_each_line): zero length record separator should
-	  split a string into paragraphs.  [ruby-dev:34586]
-
-	* string.c (rb_str_each_line): RDoc updated.
-
-Sat May 10 11:36:20 2008  Tanaka Akira  <akr@fsij.org>
-
-	* vm.c (env_mark): mark env->block.self.  prevent SEGV when GC occur
-	  in prepare_iseq_build with gcc version 3.4.6 [FreeBSD] 20060305 on
-	  FreeBSD/amd64.
-
-Fri May  9 19:16:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (timeofday): use monotonic clock.  based on a patch
-	  from zimbatm <zimbatm at oree.ch> in [ruby-core:16627].
-
-Fri May  9 07:47:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* cont.c (cont_restore_0): dynamic stack direction code should be
-	  consistent with static one.  [ruby-talk:301152]
-
-Fri May  9 00:03:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): operator assignment "a += b rescue c" should be
-	  parsed as "a += (b rescue c)" just like normal assignment.
-	  [ruby-talk:301000]
-
-Thu May  8 18:14:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_and): bit-wise operation should not take float
-	  values.  [ruby-dev:34612]
-
-	* bignum.c (rb_big_or): ditto.
-
-	* bignum.c (rb_big_xor): ditto.
+	* eval.c (method_name, method_owner): New methods; backported
+	  from 1.9. (UnboundMethod#name, UnboundMethod#owner)
 
-Thu May  8 17:44:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun May 11 02:48:13 2008    <nagai@orca16.orcabay.ddo.jp>
 
-	* common.mk, ext/extmk.rb, lib/mkmf.rb: use absolute path for RUBYOPT.
+	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fail to do pack/grid 
+	  without options.
 
-	* file.c (rb_find_file_ext): guard load_path from GC.
-	  gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) optimizes
-	  load_path by holding only RARRAY_LEN(load_path) and
-	  RARRAY_PTR(load_path) in registers on IA64 GNU/Linux Etch.
-
-Thu May  8 16:41:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
-	  [ruby-core:16642]
-
-Thu May  8 16:00:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): ! and ? at the bottom are no longer part
-	  of valid symbol names.  [ruby-dev:34590]
-
-Thu May  8 15:36:11 2008  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c (rb_gc_save_machine_context): call FLUSH_REGISTER_WINDOWS
-	  to mark the register stack from GC on another thread.
-
-Thu May  8 15:14:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): freeze temporary array.
-
-Thu May  8 13:19:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_thread_mark): mark stat_insn_usage only when ptr is not
-	  null.
-
-Thu May  8 10:44:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (sort_reentered): reentered check may be called from
-	  Array#sort.
-
-Thu May  8 09:51:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (sort_1, sort_2): check for reentered and if elements are
-	  accessible.  [ruby-core:16679]
-
-Thu May  8 06:43:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (dln_find_exe_r, dln_find_file_r): reentrant versions.
-
-	* file.c (rb_find_file_ext, rb_find_file), process.c (proc_exec_v),
-	  (rb_proc_exec, proc_spawn_v, proc_spawn), ruby.c (process_options):
-	  use reentrant versions.
-
-Thu May  8 06:27:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_key_p): thread local storage stores ID.
-
-Thu May  8 01:10:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_trans): should squeeze properly.  [ruby-dev:34587]
-
-	* string.c (tr_trans): had a bug in treating multi-byte character
-	  replacement.
-
-	* string.c (rb_str_delete_bang): need not to do anything for empty
-	  strings.
-
-	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_delete): add
-	  test for empty receiver.
-
-Wed May  7 20:19:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (process_options, ruby_set_argv): set encoding of rb_argv
-	  after Init_prelude() because cannot load encoding extensions before
-	  it.
-
-Wed May  7 20:00:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (bit_coerce): float should not be a valid operand of
-	  bitwise operations.  [ruby-dev:34583]
-
-Wed May  7 19:35:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (rb_thread_key_p): should always convert symbol to ID.
-	  [ruby-dev:34588]
-
-Wed May  7 19:30:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_divide): float division should floor() before
-	  rounding into integer.  [ruby-dev:34584]
+	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
 
-Wed May  7 18:02:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May 10 18:19:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (sym_to_i): remove obsolete method.  preparation for
-	  symbol GC.
+	* string.c (rb_str_each_line): RDoc updated.  [ruby-dev:34586]
 
-	* numeric.c (fix_to_sym): ditto.
+Sat May 10 13:17:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* numeric.c (fix_id2name): ditto.
+	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
+	  parameter patterns of configure method.
 
-Wed May  7 17:43:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 10 09:16:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_puts_ary): check recursion first.  [ruby-dev:34580]
+	* util.c (ruby_strtod): backported from 1.9.  a patch from Satoshi
+	  Nakagawa <psychs at limechat.net> in [ruby-dev:34625]. 
+	  fixed: [ruby-dev:34623]
 
-Wed May  7 17:41:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May  9 23:33:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* vm.c (vm_eval_body): initialize retval.  [ruby-dev:34576]
+	* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
+	  pass the given block to methods of Tk::Wm module.
 
-Wed May  7 13:02:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/tk/lib/tk/grid.rb: lack of module-method definitions.
 
-	* bignum.c (rb_big_fdiv): flo.fdiv(NaN) should result NaN.
+	* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
 
-	* numeric.c (num_quo): renamed and moved from bignum.c.
-	  [ruby-dev:34582]
+	* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) 
+	  characters for headings.
 
-	* bignum.c (rb_big_fdiv): update RDoc description
+	* ext/tk/tcltklib.c: maybe a little more stable about @encoding value 
+	  of TclTkIp object.
 
-	* rational.c (nurat_s_new_m): small refactoring.
+Wed May  7 08:46:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (rb_big2dbl): no need for forceful warning when
-	  converting to float.  overflow is a nature of float values.
+	* struct.c (rb_struct_s_def): to_str should be called only once.
+	  [ruby-core:16647]
 
 Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -4364,154 +1348,39 @@ Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  a patch from Kouya <kouyataifu4 at gmail.com> in
 	  [ruby-reference-manual:762].
 
-Tue May  6 02:08:18 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/io/nonblock/test_flush.rb: don't set Thread.abort_on_exception.
-
-	* test/net/imap/test_imap.rb: ensure disconnecting imap to terminate
-	  receiver thread.
-
-Tue May  6 00:29:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* iseq.c (insn_operand_intern): should handle Qundef embedded in
-	  operand.  [ruby-core:16656]
-
-Tue May  6 00:00:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): should call compile_cpath() for
-	  modules as well.  [ruby-dev:34585]
-
-	* insns.def (defineclass): add undef handling.
-
-Mon May  5 23:49:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insns.def (defineclass): was using wrong variable.  [ruby-dev:34592]
-
-Mon May  5 20:07:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun May  4 09:35:51 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* io.c (io_fflush): IO#flush problem within threads.  a patch from
-	  <s.wanabe at gmail.com> in [ruby-dev:34595].
+	* sample/erb/erb4html.rb (ERB4Html) : add example of ERB#set_eoutvar.
+	  ERB4Html is an auto-quote ERB.
 
-Mon May  5 19:58:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May  3 22:52:48 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* compile.c (defined_expr): protect some expression from
-	  segmentation fault.  a patch from wanabe <s.wanabe at gmail.com>
-	  in [ruby-dev:34593].
-
-Mon May  5 19:49:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_def): Struct.new(0) should not SEGV.
-	  based on the patch from wanabe <s.wanabe at gmail.com> in
-	  [ruby-dev:34594].
-
-	* struct.c (make_struct): call to_str on name object.
-
-Mon May  5 17:17:40 2008  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to
-	  avoid SEGV by at_exit { Fiber.new{}.resume } on IA64.
-
-Mon May  5 12:12:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_slice_bang): should adjust length before making
-	  sub-array.
-
-Mon May  5 11:36:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_dup): should dupe corresponding information.
-	  [ruby-dev:34581]
-
-Mon May  5 11:13:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compile.c (compile_cpath): use Qundef to denote cbase lookup.
-
-	* insns.def (defineclass): Qundef is passed for cbase.
-
-	* insns.def (setconstant): ditto.
-
-	* vm_insnhelper.c (vm_check_if_namespace): use rb_inspect()
-	  instead of rb_obj_as_string() for better description.
-
-Mon May  5 02:10:23 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (set_heaps_increment): fix memory allocation strategy by
-	  determining heaps_inc from heaps_used, not objects_delta.
-	  (struct rb_objspace): delta removed.  change increment, length and
-	  used to long for LP64.
-	  (objects_delta): removed.
-	  (allocate_heaps): add next_heaps_length argument.
-	  (init_heap): renamed from add_heap.
-	  (garbage_collect): use heaps_increment in dont_gc.
-
-Sun May  4 21:09:32 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/getoptlong.rb: use $stderr instead of $deferr.
-
-Sun May  4 16:04:28 2008  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (obj2nsec): fix string argument.
-
-Sun May  4 14:29:14 2008  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_obj_respond_to): check the result of respond_to? method
-	  by RTEST.
-
-Sun May  4 12:57:58 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_each_line): return original string.
-
-Sat May  3 20:57:06 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_normal_exit):
-	  new method.
-
-Sat May  3 18:10:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_timespec): raise TypeError for nil and other objects
-	  which has no divmod method.
-
-Fri May  2 23:59:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (internal_read_func, internal_write_func): split from
-	  internal_io_func.
-
-Fri May  2 23:55:15 2008  Tanaka Akira  <akr@fsij.org>
-
-	* variable.c (rb_define_hooked_variable): guard *var from GC to
-	  prevent collecting argf under RUBY_DEBUG=gc_stress.
-
-Fri May  2 17:29:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): call to_int if step is not a numeric
-	  value.  [ruby-dev:34575]
-
-Fri May  2 16:10:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): do not forcefully convert steps into
-	  integers.  [ruby-dev:34571]
+	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
+	  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. 
+	  add Tk::Tile.themes and Tk::Tile.set_theme(theme).
 
 Fri May  2 14:52:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el: move fontifying code from hook.  a patch from
 	  Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
 
-Fri May  2 14:10:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri May  2 13:47:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* range.c (range_step): step may be bignum.
+	* re.c (match_select): restore previous behavior of MatchData#select.
+	  RDoc updated as well, mentioning the plan to remove this method
+	  in the future.  [ruby-dev:34556]
 
-Fri May  2 13:52:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri May  2 13:04:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* re.c (Init_Regexp): remove MatchData#select.  [ruby-dev:34563]
-
-Thu May  1 23:59:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_divide), numeric.c (fix_divide): check for result
-	  domain.  [ruby-dev:34559]
+	* ext/dbm/dbm.c (Init_dbm): defines DBM::VERSION even when
+	  DB_VERSION_STRING is not available.  [ruby-dev:34569]
 
 Thu May  1 23:57:06 2008  James Edward Gray II  <jeg2@ruby-lang.org>
 
+	Merged 16257 from trunk.
+
 	* lib/net/telnet.rb:  This patch from Brian Candler adds a FailEOF mode which
-	  can be activated to have net/telnet raise EOFError exceptions when the
+	  can be activated to have net/telnet raise EOFError exceptions when the 
 	  remote connection is closed.  The default behavior remains unchanged though.
 
 Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -4522,1090 +1391,663 @@ Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* range.c (range_step): allow float step bigger than zero but less
 	  than one.  [ruby-dev:34557]
 
-Thu May  1 23:20:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_divide): return an integer for idiv.
-	  [ruby-dev:34553]
-
-Thu May  1 20:47:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_s_create): should access converted hash value.
-	  [ruby-dev:34555]
-
-Thu May  1 20:31:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_parse.rb (TestParse::test_void_expr_stmts_value):
-	  shut up warning.
-
-	* rational.c (nurat_to_f): no need for forceful warning when
-	  converting to float.  overflow is a nature of float values.
-
-Thu May  1 16:10:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_delete_if): return enumerator if no block given.
-	  [ruby-dev:34554]
-
-Wed Apr 30 21:36:40 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (url_encode): [ruby-dev:34497] ERB::Util#url_encode
-	  bug fix. Reported by rubikitch.
+Wed Apr 30 20:22:40 2008  James Edward Gray II  <jeg2@ruby-lang.org>
 
-	* test/erb/test_erb.rb: ditto
-
-Wed Apr 30 20:11:36 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+	Merged 16241 from trunk.
 
 	* lib/net/telnet.rb:  Fixing a bug where line endings would not be properly
 	  escaped when the two character ending was broken up into separate TCP
 	  packets.  Issue reported and patched by Brian Candler.
 
-Wed Apr 30 18:03:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_load_path), vm_core.h (rb_vm_t): moved to VM.
-
-	* load.c (rb_get_load_path): returns absolute load path.
-
-	* load.c (load_path_getter): $LOAD_PATH getter.
-
-	* file.c (rb_find_file_ext, rb_find_file), ruby.c (push_include,
-	  ruby_init_loadpath): use the accessor.
-
-	* vm.c (rb_vm_mark): mark load_path.
-
 Wed Apr 30 17:47:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* re.c (rb_reg_search): use local variable.  a patch from wanabe
 	  <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]
 
-Wed Apr 30 16:10:18 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* eval_intern.h: specify the values of the enumeration constants
-	  explicitly.  [ruby-dev:34489]
-
-Wed Apr 30 12:32:39 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (check_exec_redirect_fd): prohibit duplex IO.
-	  (check_exec_fds): record maxhint even if close_others is not
-	  specified.
-	  (rb_exec_arg_fixup): renamed from rb_exec_arg_fix.
-
-Mon Apr 28 20:24:27 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (nurat_marshal_load): checks the given
-	  denominator. [ruby-dev:34536]
-
-Mon Apr 28 14:21:18 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
-	  FIXNUM_MAX to make it possible to convert to double accurately on
-	  environments with 64bit VALUE and 64bit double.
-	  It assumes FLT_RADIX is 2.
-	  fix RubyForge bug #14102.
-
-Mon Apr 28 12:48:57 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify
-	  close_exec on having no fork environment (but still meaningless).
-
-Mon Apr 28 11:11:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (run_exec_options): don't call FIX2INT for nil.
-
-Mon Apr 28 11:11:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (method_name): should return symbols instead of strings.
-	  [ruby-dev:34531]
-
-Mon Apr 28 09:02:43 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h (rb_exec_arg_init): declared.
-	  (rb_exec_arg_addopt): declared.
-	  (rb_exec_arg_fix): declared.
-	  (rb_exec_initarg): removed.
-	  (rb_exec_getargs): removed.
-	  (rb_exec_initarg2): removed.
-
-	* io.c (struct popen_arg): make execarg as a pointer.
-	  (popen_exec): follow popen_arg change.
-	  (pipe_open): add eargp argument.  extract argc and argv from eargp.
-	  use rb_exec_arg_addopt to add redirect options.
-	  (pipe_open_v): set up struct rb_exec_arg.
-	  (pipe_open_s): set up struct rb_exec_arg.
-
-	* process.c (rb_exec_arg_addopt): new function extracted from
-	  check_exec_options_i.
-	  (check_exec_options_i): use rb_exec_arg_addopt.
-	  (rb_check_exec_options): opthash is always a hash now.
-	  (rb_exec_getargs): make it static.
-	  (rb_exec_fillarg): renamed from rb_exec_initarg2.  don't set up
-	  redirect_fds.
-	  (rb_exec_arg_init): new function.
-	  (rb_exec_arg_fix): new function.
-	  (rb_f_exec): use rb_exec_arg_init and rb_exec_arg_fix.  use
-	  rb_exec_arg_addopt to set close_others option.
-	  (run_exec_options): make close_others by default.
-	  (rb_spawn_internal): use rb_exec_arg_init and rb_exec_arg_fix.  use
-	  rb_exec_arg_addopt to set close_others option.
-
-Sun Apr 27 18:59:04 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (nurat_expt): use f_rational_new2. [ruby-dev:34524]
-
-Sun Apr 27 15:23:40 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_count): add a GC.count method.  This method returns
-	  a GC invoking count.
-
-Sun Apr 27 12:20:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_t), gc.c (rb_objspace, rb_newobj), vm.c
-	  (Init_BareVM): per-VM object space support, which is disabled now.
-
-	* gc.c (rb_objspace_alloc), vm.c (Init_BareVM): should not use ruby
-	  malloc here.
-
-	* gc.c (garbage_collect, etc): performance improvement by passing the
-	  reference instead of referring the global variable in each functions.
-
-Sun Apr 27 08:06:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ruby.c (ruby_set_argv): ARGV should be locale encoding.
-	  [ruby-list:44861]
-
-Sun Apr 27 01:46:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open3.rb (Open3.popen3w): removed.
-	  (Open3.popen3): notice wait_thr.
-
-Sun Apr 27 01:13:05 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc, test/rdoc:  Update to RDoc 2.0.0 r56.
-
-Sat Apr 26 21:30:40 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h (rb_hash_dup): declared.
-
-	* hash.c (rb_hash_dup): new function.
-
-	* process.c (rb_spawn_internal): don't modify option hash.
-
-Sat Apr 26 18:36:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c, signal.c, thread.c, thread_win32.c, include/ruby/intern.h:
-	  suppress warnings.
-
-Sat Apr 26 17:42:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (builtin_types), gc.c (count_objects): added Complex and
-	  Rational.
-
-Sat Apr 26 17:35:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_eNOERROR): renamed.
-
-Sat Apr 26 17:30:11 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h, gc.c: remove T_BLOCK.
+Sat Apr 26 19:40:34 2008  Guy Decoux  <decoux@moulon.inra.fr>
 
-	* include/ruby/ruby.h: re-number T_xxx.
+	* class.c (struct clone_method_data): Add cref.
+	  (clone_method): Properly handle NODE_BMETHOD and NODE_DMETHOD.
+	  (rb_singleton_class_clone, singleton_class_clone_int): Set a
+	  proper value to klass and propagate cref. [ruby-core:16238]
 
-Sat Apr 26 17:31:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_block_dup, rb_method_dup), intern.h: Add duplicator
+	  methods for use from class.c#clone_method().
 
-	* process.c (rb_cProcessTms, rb_cProcessStatus): renamed.
+Fri Apr 25 15:46:37 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* error.c (builtin_types), signal.c (siglist), st.c (primes),
-	  struct.c (ref_func), time.c (months): constified.
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/scale.rb:
+	  improve unknonw-option check when create a widget. 
 
-Sat Apr 26 13:00:41 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/tk/lib/tkextlib/blt/unix_dnd.rb, ext/tk/lib/tkextlib/blt/ted.rb,
+	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix on 'cget'.
 
-	* lib/open3.rb: double fork is replaced by spawn with Process.detach.
-	  (Open3.popen3w): new method to access the thread returned by
-	  Process.detach.
+	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
+	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
 
-Sat Apr 26 00:47:43 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/tk/lib/tk/palette.rb: bug fix.
 
-	* process.c (rb_spawn_internal): new function to specify
-	  default_close_others.
-	  (rb_spawn): specify default_close_others true.
-	  (rb_f_system): call rb_spawn_internal with default_close_others as
-	  false.
-
-Sat Apr 26 12:26:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_each): use INT2FIX() for fixnum values.
-
-Fri Apr 25 17:56:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (free_unused_heaps): preserve last used heap segment to
-	  reduce malloc() call.
+Fri Apr 25 12:37:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Apr 25 17:54:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (flatten): returns an instance of same class.
+	  [ruby-core:16554]
 
-	* gc.c (HEAP_SIZE): use smaller heap segment (2K) for more chance
-	  to be freed.  based on patch from authorNari <authornari at gmail.com>.
+Thu Apr 24 23:47:50 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* gc.c (rb_newobj_from_heap): eventually allocate heap segments.
+	* lib/net/pop.rb: backported from 1.9. bug#19003
 
-Fri Apr 25 15:35:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/lib/openssl/ssl.rb: set_params; backported from 1.9.
+	  bug#19552, [ruby-dev:34402]
 
-	* process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
-	  earg.
+	* ext/openssl/ossl_ssl.c: ditto.
 
-Fri Apr 25 12:37:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/openssl/test_ssl.rb: ditto.
 
-	* array.c (flatten): returns an instance of same class.
-	  [ruby-core:16554]
+Thu Apr 24 17:06:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Apr 25 10:52:27 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h: define mode_t for umask.
-
-	* process.c (check_exec_options_i, check_exec_fds, run_exec_options):
-	  support "close_others" only when fork(2) is available.
-
-Fri Apr 25 00:16:11 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: include sys/stat.h for umask.
-
-Thu Apr 24 23:25:17 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h (rb_env_clear): declared.
-	  (rb_io_mode_modenum): declared.
-	  (rb_close_before_exec): declared.
-	  (struct rb_exec_arg): add options and redirect_fds field.
-	  (rb_check_argv): removed.
-	  (rb_exec_initarg): declared.
-	  (rb_exec_getargs): declared.
-	  (rb_exec_initarg2): declared.
-	  (rb_fork): add third argument: fds.
-
-	* io.c (max_file_descriptor): new static variable to record maximum
-	  file descriptor ruby used.
-	  (UPDATE_MAXFD): new macro.
-	  (UPDATE_MAXFD_PIPE): new macro.
-	  (rb_io_mode_modenum): externed.
-	  (rb_sysopen): update max_file_descriptor.
-	  (rb_close_before_exec): new function.
-	  (popen_exec): redirection removed because it is done by extended
-	  spawn mechanism.
-	  (pipe_open): generate a hash for spawn options to specify
-	  redirections.
-	  (pipe_open_v): use rb_exec_getargs.
-	  (pipe_open_s): use rb_exec_getargs.
-	  (rb_io_initialize): update max_file_descriptor.
-
-	* process.c (hide_obj): new function.
-	  (check_exec_redirect_fd): new function.
-	  (check_exec_redirect): new function.
-	  (check_exec_options_i): new function.
-	  (check_exec_fds): new function.
-	  (rb_check_exec_options): new function.
-	  (check_exec_env_i): new function.
-	  (rb_check_exec_env): new function.
-	  (rb_exec_getargs): new function.
-	  (rb_exec_initarg2): new function.
-	  (rb_exec_initarg): new function.
-	  (rb_f_exec): use rb_exec_initarg.
-	  (intcmp): new function.
-	  (run_exec_dup2): new function.
-	  (run_exec_close): new function.
-	  (run_exec_open): new function.
-	  (run_exec_pgroup): new function.
-	  (run_exec_rlimit): new function.
-	  (run_exec_options): new function.
-	  (rb_exec): call run_exec_options.
-	  (move_fds_to_avoid_crash): new function.
-	  (pipe_nocrash): new function.
-	  (rb_fork): use pipe_nocrash to avoid file descriptor conflicts.
-	  (rb_spawn): use rb_exec_initarg.
-	  (rlimit_resource_name2int): extracted from rlimit_resource_type.
-	  (rlimit_type_by_hname): new function.
-	  (rlimit_type_by_lname): new function.
-	  (rlimit_resource_type): use rlimit_type_by_hname.
-	  (proc_daemon): add fds argument for rb_fork.
-
-	* hash.c (rb_env_clear): renamed from env_clear and externed.
-
-	[ruby-dev:34086]
-
-Thu Apr 24 23:00:58 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_thread.rb: fix typos.
-
-	* test/ruby/envutil.rb (rubyexec): move Open3.popen3 call into timeout
-	  block.
-
-Thu Apr 24 22:34:52 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_comparable.rb: new tests for Comparable, to achieve
-	  100% test coverage of compar.c.
-
-Thu Apr 24 17:19:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (process_options): set safe_level before loading script.
-	  [ruby-dev:34421]
+	* eval.c (THREAD_SAVE_CONTEXT): remove unnecessary
+	  FLUSH_REGISTER_WINDOWS before calling setjmp().  [ruby-core:16285]
 
 Thu Apr 24 14:15:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dln.c (dln_find_1): prior files with extensions to files sans
 	  extensions.  [ruby-core:16517]
 
-Thu Apr 24 00:26:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rdoc/ri/descriptions.rb: fixed wrong class nestings.
-
-Thu Apr 24 00:20:01 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_settracefunc.rb: add a test for set_trace_func.
-
-	* test/ruby/envutil.rb: move "rubyexec" method from test_rubyoptions.rb.
+Wed Apr 23 15:39:31 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_rubyoptions.rb: use rubyexec in envutil.rb.
-
-	* test/ruby/test_thread.rb: add tests to achieve over 90% test coverage
-	  of thread.c.
+	* eval.c (bind_eval): Add Binding#eval, a shorthand method for
+	  eval(str, binding, ..); backported from 1.9.
 
 Wed Apr 23 15:28:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): failed
 	  notice moved from comment to assertion message. [ruby-dev:29127]
 
+Wed Apr 23 14:00:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (create_makefile): Add a missing dependency on the
+	  target directory for each .rb file.  This will hopefully fix
+	  parallel make (-jN).  Tested on FreeBSD.
+
 Wed Apr 23 11:49:54 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
 	  an enumerator if no block is given.
 
-Wed Apr 23 00:36:03 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Wed Apr 23 00:42:49 2008  Tanaka Akira  <akr@fsij.org>
 
-	* test/openssl/test_ssl.rb (start_server): add timeout to server.join.
+	* eval.c (error_print): show full stack grace except SystemStackError.
+	  backport from 1.9.  [ruby-dev:31014]
 
 Wed Apr 23 00:18:45 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
 	  tests of Symbol#to_proc.
 
-Tue Apr 22 22:40:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should
-	  check method names by symbols, not by strings.  a patch from
-	  Kazuhiro NISHIYAMA <zn at mbf.nifty.com> in [ruby-dev:34487].
+Tue Apr 22 22:43:05 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Apr 22 22:15:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_proc_new, YIELD_FUNC_LAMBDA): Add a new nd_state
+	  YIELD_FUNC_LAMBDA which avoids automatic `avalue' conversion for
+	  arguments.  This fixes a bug where [1,[2,3]].map(&:object_id)
+	  fails.
 
-	* misc/ruby-style.el (ruby-style-{case,label}-indent): up list from
-	  indentation point.
+	* intern.h, object.c: Hide rb_proc_new() from intern.h.  It should
+	  not be considered an official API function yet.
 
-Tue Apr 22 21:09:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Apr 22 21:24:32 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/nkf/nkf-utf8/nkf.c (score_table_A0, score_table_F0):
-	  type of content is unsigned char.
+	* eval.c (rb_proc_new): Turn the BLOCK_LAMBDA flag on.
 
-	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): 'c' is nkf_char.
+	* object.c (sym_to_proc), test/ruby/test_symbol.rb: Add back
+	  Symbol#to_proc, now that it passes the tests.
 
-	* ext/nkf/nkf-utf8/nkf.c (push_broken_buf): enc is 0 or pointer.
-
-	* ext/nkf//nkf.c (options): type of option is unsigned char.
-
-Tue Apr 22 20:51:58 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (z_conv): characters must be nkf_char.
-
-Tue Apr 22 19:23:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Apr 22 19:35:03 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enumerator.c (enumerator_initialize): Remove an undocumented
 	  feature (passing a block to the constructor) that's broken.
 	  This is not what I intended.
 
-Tue Apr 22 17:54:05 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* vm_core.h (exec_event_hooks): ``inline'' is a type modifier, not
-	  a type itself.
-
-Tue Apr 22 16:24:27 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Tue Apr 22 17:49:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_enc_cr_str_buf_cat): do not use C++ comments.
+	* sprintf.c (rb_f_sprintf): should protect temporary string from
+	  GC.   [ruby-dev:34480]
 
-Tue Apr 22 16:23:53 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Tue Apr 22 17:12:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: use AC_USE_SYSTEM_EXTENSIONS.
+	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
 
-Tue Apr 22 16:23:16 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Tue Apr 22 16:44:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* vm_evalbody.c (DECL_SC_REG): use __asm__ instead.
+	* object.c (rb_obj_tap): Correct documentation; pointed out by
+	  okkez in [ruby-dev:34472].
 
-Tue Apr 22 16:18:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_evalbody.c (DECL_SC_REG): typo fixed.
-
-Tue Apr 22 15:25:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (struct timespec): needs time.h according to POSIX.
-
-Tue Apr 22 13:19:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (rb_thread_stop_timer_thread): should clear
-	  timer_thread_id after stopping it.
-
-Tue Apr 22 13:12:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_join): remove the current thread from the join list
-	  of the target thread.
-
-Tue Apr 22 12:03:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): search from the base klass if it
-	  is given.
-
-Tue Apr 22 09:58:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c: avoid warnings.
-
-Tue Apr 22 09:56:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Apr 22 10:05:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (eaccess): workaround for recent msvcrt's behavior.
 	  [ruby-core:16460]
 
-Mon Apr 21 19:08:32 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (copy_stream_body): call rb_io_check_readable and
-	  rb_io_check_writable.
-
-Mon Apr 21 17:45:27 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dbm/dbm.c (fdbm_each_value, fdbm_each_key, fdbm_each_pair):
-	  GDBM#{each,each_pair,each_key,each_value}: Return an enumerator
-	  if no block is given.
-
-	* ext/gdbm/gdbm.c (fgdbm_each_value, fgdbm_each_key,
-	  fgdbm_each_pair): GDBM#{each,each_pair,each_key,each_value}:
-	  Return an enumerator if no block is given.
-
-	* ext/openssl/ossl_config.c (ossl_config_each):
-	  OpenSSL::Config#each: Return an enumerator if no block is given.
-
-	* ext/readline/readline.c (hist_each): Readline::HISTORY#each:
-	  Return an enumerator if no block is given.
-
-	* ext/sdbm/init.c (fsdbm_each_value, fsdbm_each_key,
-	  fsdbm_each_pair): SDBM#{each,each_pair,each_key,each_value}:
-	  Return an enumerator if no block is given.
-
-	* ext/stringio/stringio.c (strio_each_byte, strio_each):
-	  StringIO#{each,each_line,each_byte}: Return an enumerator if no
-	  block is given.
+Mon Apr 21 16:06:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/stringio/stringio.c (Init_stringio): Add #lines and #bytes,
-	  which are aliases to #each_line and #each_byte, respectively.
+	* enumerator.c (enumerator_init): preserve the method name in ID.
 
-	* ext/win32ole/win32ole.c (fole_each): WIN32OLE#each: Return an
-	  enumerator if no block is given.
+	* enumerator.c (enumerator_each): need not to call rb_to_id().
 
-	* ext/zlib/zlib.c (rb_gzreader_each_byte, rb_gzreader_each):
-	  Zlib::GzipReader#{each,each_line,each_byte}: Return an
-	  enumerator if no block is given.
+	* enumerator.c (enumerator_with_index): ditto.
 
-	* ext/zlib/zlib.c (Init_zlib): Add Zlib::GzipReader#lines and
-	  #bytes, which are aliases to #each_line and #each_byte,
-	  respectively.
+Mon Apr 21 17:19:52 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Apr 21 17:01:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_f_method_name): New gloval function: __method__;
+	  backported from matzruby / 1.9.
 
-	* iseq.c (rb_iseq_compile_with_option): check if src is a string.
-	  [ruby-core:16453]
+	* eval.c (rb_frame_this_func), intern.h: New internal function.
 
-Mon Apr 21 16:06:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* intern.h (RETURN_ENUMERATOR): Use rb_frame_this_func() instead
+	  of rb_frame_last_func(), to accommodate the behavior to that of
+	  1.9.
 
-	* enumerator.c (enumerator_init): preserve the method name in ID.
+Mon Apr 21 15:54:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* enumerator.c (enumerator_each): need not to call rb_to_id().
+	* lib/tempfile.rb (Tempfile::_close): check @data before modifying
+	  it; backported from 1.9.  [ruby-dev:34094]
 
-	* enumerator.c (enumerator_with_index): ditto.
+	* lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.
 
-Mon Apr 21 11:00:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Apr 21 10:17:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* compile.c (defined_expr): capture exception during defined?
-	  evaluation.  a patch from wanabe <s.wanabe at gmail.com> in
-	  [ruby-dev:34461].  [ruby-core:16010]
+	* time.c: should include <errno.h> to refer errno.
 
-Mon Apr 21 10:06:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Apr 21 10:02:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* time.c: should include <errno.h> to refer errno.
+	* hash.c (recursive_hash): prototype.
 
-Mon Apr 21 09:58:04 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Apr 21 10:00:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
 	  this is workaround for recent version of MSVCRT.
 	  [ruby-dev:34456]
 
-Mon Apr 21 08:54:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Apr 20 21:10:04 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* gc.c (ruby_xmalloc): use size_t for malloc argument instead of long.
+	* .: Release as Ruby 1.8.7-preview2.
 
-Sun Apr 20 21:00:21 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c, include/ruby/ruby.h: Export rb_cEnumerator.
-
-Sun Apr 20 20:47:50 2008  Akinori MUSHA  <knu@iDaemons.org>
+Sun Apr 20 21:02:06 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enumerator.c: Resolve the method every time an enumeration
 	  method is run, not once when the enumerator is initialized as it
 	  was before, so that method_missing() and method (re)definition
 	  afterwards are both in effect; pointed out in: [ruby-core:16441]
 
-Sun Apr 20 15:11:00 2008  Tanaka Akira  <akr@fsij.org>
+Sun Apr 20 17:59:25 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* io.c (copy_stream_rbuf_to_dst): removed.
-	  (copy_stream_fallback_body): don't bypass write method.
-	  (copy_stream_body): simplified.
+	* object.c, NEWS, test/ruby/test_symbol.rb: Revert Symbol#to_proc
+	  since it does not pass the tests.
 
-Sun Apr 20 15:01:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 20 14:29:35 2008  Technorama Ltd.  <oss-ruby@technorama.net>
 
-	* vm_core.h (struct iseq_compile_data): moved label_no from
-	  new_label_body().
+	* ext/openssl/ossl_ssl.c: initialize session class.
 
-	* compile.c (iseq_set_exception_table): allocates catch_table only
-	  when entries exist.
+Sat Apr 19 20:54:42 2008  akira yamada  <akira@arika.org>
 
-	* compile.c (struct iseq_link_element, struct iseq_insn_data): made
-	  enum for debuggers.
+	* lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
+	  test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
+	  [ruby-dev:31318]
 
-Sun Apr 20 14:44:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 19 20:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* compile.c (iseq_compile_each): fix for splat in when and rescue.
-	  a patch from wanabe <s.wanabe AT gmail.com> in [ruby-dev:34429].
-	  [ruby-core:14537]
+	* lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance
+	  tuning around String#gsub.
 
-Sun Apr 20 13:55:37 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (copy_stream_fallback): write directly (bypassing write method)
-	  if possible.
+	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+	  documented.
 
-Sun Apr 20 12:49:03 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/yaml/store.rb (YAML::load): modified to support empty
+	  database.
 
-	* io.c (copy_stream_fallback): read directly (bypassing readpartial
-	  method) if possible.
+	* lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
+	  add a method to support faster PStore.
 
-Sun Apr 20 04:45:13 2008  Tanaka Akira  <akr@fsij.org>
+Sat Apr 19 20:16:52 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* io.c (copy_stream_body): use readpartial and write method for
-	  non-IOs such as StringIO and ARGF.
+	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
+	  merged from 1.9.
 
-Fri Apr 18 20:57:33 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
+	  identify repeated object references, since GC will reuse memory of
+	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
+	  merged from 1.9.
 
-	* test/ruby/test_array.rb: add tests to achieve over 95% test coverage
-	  of array.c.
+Sat Apr 19 20:05:39 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr 18 17:37:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):
+	  Make Array#eql?, #hash, #== and #<=> use rb_exec_recursive() and
+	  handle recursive data properly.
 
-	* gc.c (rb_gc_mark_locations): get rid of underflow.
+	* hash.c (hash_equal, rb_hash_hash): Make Hash#eql?, #hash and #==
+	  use rb_exec_recursive() and handle recursive data properly.
 
-	* gc.c (mark_current_machine_context): check if the main thread stack
-	  position may shrink under the initialized position.  [ruby-core:16436]
+Sat Apr 19 19:26:09 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Apr 17 22:20:52 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* intern.h, eval.c (rb_exec_recursive): New internal function to
+	  help perform recursive operation; backported from 1.9.
 
-	* enc/trans/utf_16_32.c (fun_so_to_utf_16be, fun_so_to_utf_16le): add
-	  parentheses to remove warnings of gcc.
+Sat Apr 19 18:42:04 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* io.c (rb_io_getc): remove unused variables.
+	* intern.h, hash.c (rb_hash_lookup): New internal function to
+	  check if a key exists in a hash, ignoring #default; backported
+	  from 1.9.
 
-	* compile.c (NODE_NEXT, NODE_REDO): remove unused labels.
+Fri Apr 18 18:56:57 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/nkf/nkf.c (rb_nkf_convert): remove unused variables.
+	* ext/syck/rubyext.c (syck_genericresolver_node_import): should
+	  not set instance variable "@kind" before initializing it.
+	  [ruby-dev:32677]
 
 	* ext/syck/rubyext.c (syck_resolver_initialize,
 	  syck_resolver_detect_implicit, syck_emitter_emit): remove unused
 	  variables.
 
-Thu Apr 17 20:12:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Apr 18 18:54:57 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_rubyoptions.rb (test_search): enable some assertions.
-
-	* test/ruby/test_rubyoptions.rb: flunk message in win32.
-
-Thu Apr 17 16:07:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/syck/rubyext.c: Node#value defined twice.
 
-	* test/ruby/test_rubyoptions.rb (ruby): run in C locale.
+	* lib/yaml/: several method redefinitions causing warnings.
 
-	* test/ruby/test_rubyoptions.rb (test_encoding): --encoding does not
-	  affect source code.
+Fri Apr 18 16:36:16 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Apr 17 00:45:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
+	  variable.  a patch from Tadayoshi Funaba <tadf AT dotrb.org> in 
+	  [ruby-dev:32783].
 
-	* test/ruby/test_process.rb (test_rlimit_nofile): reset RLIMIT_NOFILE
-	  before exit (for gcov).
+Fri Apr 18 16:01:37 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_rubyoptions.rb: new tests for option of ruby
-	  interpreter, to achieve over 95% test coverage of ruby.c.
+	* lib/rexml: Merge fixes since 1.8.6 made solely on the ruby_1_8_6
+	  branch.
 
-Wed Apr 16 02:40:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 16 06:11:49 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ruby.c (process_options): preludes and parser need to run in safe
-	  level 0.  [ruby-dev:34407]
+	* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
+	  Fix tests to reflect the following changes: r15833, r15759.
 
-Wed Apr 16 02:26:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 16 05:03:48 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ruby.c (process_options): dln_find_file returns the pointer to a
-	  static buffer, so should copy it.  [ruby-dev:34409]
+	* .: Release as Ruby 1.8.7-preview1.
 
-Tue Apr 15 23:08:46 2008  Kouhei Sutou  <kou@cozmixng.org>
+Wed Apr 16 02:09:14 2008  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
 
 	* test/xmlrpc/test_cookie.rb: add a test for the above fix.
 
-Tue Apr 15 19:20:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr 15 23:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* io.c: #undef rb_argv moved before #define.
+	* version.h: Branch off ruby_1_8_7 from ruby_1_8 in preparation
+	  for the forthcoming 1.8.7 release.
 
-Tue Apr 15 18:02:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 15 23:40:39 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* include/ruby/intern.h (rb_argv): replaced with rb_get_argv().
-	  [ruby-Bugs-19514]
+	* ext/syck/rubyext.c (rb_syck_mktime): Avoid buffer overflow.
 
-Tue Apr 15 17:10:59 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Apr 15 20:32:03 2008  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/http.rb, lib/net/smtp.rb, lib/net/pop.rb: update
-	  URLs of Japanese documents.
+	* re.c (match_inspect): backported from 1.9.
 
-Tue Apr 15 16:45:14 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Apr 15 19:03:28 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
+	* eval.c (method_receiver, method_name, method_owner): New
+	  methods; backported from 1.9. bug#19007
 
-Tue Apr 15 15:38:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 15 18:39:14 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* misc/ruby-mode.el (ruby-encoding-map): added shift-jis for older
-	  versions.
+	* lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
+	  scheme; backported from 1.9. bug#19015, [ruby-dev:31896]
 
-	* misc/ruby-mode.el (ruby-mode-set-encoding):
-	  coding-system-to-mime-charset is not a standard function.
-	  [carbon-emacs:795]
-	  fix for the case that magic comment exists but coding system is
-	  absent.
+Tue Apr 15 17:45:43 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* misc/ruby-mode.el (ruby-mode): use write-contents-functions or
-	  write-contents-hooks for older versions.
+	* lib/net/smtp.rb: backported from 1.9. bug#19003
 
-Tue Apr 15 07:21:21 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Apr 15 17:06:12 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* complex.c (nucomp_div): [ruby-dev:34357]
+	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
 
-	* complex.c (nucomp_abs): use hypot.
+Tue Apr 15 16:58:55 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* complex.c (nucomp_quo): do not force conversion.
+	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
+	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
 
-	* test/ruby/test_complex.rb: omitted some meaningless tests.
+	* ext/tk/lib/tk/palette.rb: bug fix.
 
-Mon Apr 14 23:25:50 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Tue Apr 15 16:47:48 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* test/ruby/test_objectspace.rb: add a test for
-	  ObjectSpace.count_objects.
+	* signal.c, gc.c: New methods: GC.stress, GC.stress=;
+	  backported from 1.9. a patch from Tadashi Saito
+	  in [ruby-dev:34394] and bug#19000
 
-Mon Apr 14 22:44:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr 15 12:35:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
-	  half-baked result string.
+	* rubyio.h (rb_io_t): renamed from OpenFile.
 
-	* re.c (rb_reg_search): make search reentrant.  [ruby-dev:34223]
+	* ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
+	  ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
+	  ext/socket/socket.c: ditto.
 
-	* test/ruby/test_parse.rb (TestParse::test_global_variable):
-	  should preserve $& variable.
+	* win32/win32.h: removed workaround for OpenFile.
 
-Mon Apr 14 17:23:27 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Apr 15 00:15:29 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
-	  env_reject_bang): Return an enumerator if no block is given.
+	* ext/tk/lib/tk/text.rb: typo. call a wrong method.
 
-Mon Apr 14 14:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/lib/tk/itemconfig.rb: ditto.
 
-	* compile.c, compile.h (compile_debug): made runtime option.
+	* ext/tk/sample/ttk_wrapper.rb: bug fix.
 
-	* debug.c (ruby_debug_print_indent): returns if debug_level exceeds
-	  the threshold.
+	* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
 
-	* debug.c (ruby_debug_printf): printf to stderr.
+	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: 
+	  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
 
-	* iseq.c (make_compile_option, make_compile_option_value): added
-	  debug_level option.
+	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, 
+	  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, 
+	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. 
 
-	* vm_core.h (rb_compile_option_t): added debug_level.
+	* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
 
-	* vm_core.h (struct iseq_compile_data): added node_level.
+	* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the 
+	  procedure which called at end of the timer.
 
-Mon Apr 14 12:52:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr 14 19:54:21 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
+	* array.c (rb_ary_flatten, rb_ary_flatten_bang): Take an optional
+	  argument that determines the level of recursion to flatten;
+	  backported from 1.9.
 
-	* gc.c (rb_objspace_t): packed globals.  [ruby-dev:34348]
+	* array.c (rb_ary_shuffle_bang, rb_ary_shuffle, rb_ary_choice,
+	  rb_ary_cycle, rb_ary_permutation, rb_ary_combination,
+	  rb_ary_product, rb_ary_take, rb_ary_take_while, rb_ary_drop,
+	  rb_ary_drop_while): New methods: Array#shuffle, #shuffle!,
+	  #choice, #cycle, #permutation, #combination, #product, #take,
+	  #take_while, #drop, #drop_while; backported from 1.9.
 
-	* gc.c (finalizers): removed.  [ruby-dev:34349]
+Mon Apr 14 19:52:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Apr 14 11:30:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h: New macro: RB_GC_GUARD().
 
-	* array.c (ary_new): new integer overflow check condition.
-	  suggested by TOYOFUKU Chikanobu <nobu_toyofuku at nifty.com> in
-	  [ruby-dev:34156].
+Mon Apr 14 19:49:35 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* array.c (rb_ary_initialize): ditto.
+	* random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
 
-Mon Apr 14 00:51:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* string.c (rb_str_tmp_new), intern.h: New function.
 
-	* test/ruby/test_parse.rb: add tests to achieve over 95% test coverage
-	  of parse.y.
+Mon Apr 14 19:18:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sun Apr 13 23:53:58 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enum.c (inject_i, inject_op_i): prototype.
 
-	* enum.c (enum_cycle): Make Enumerable#cycle do a finite loop when
-	  the number of cycles is specified.
+Mon Apr 14 19:10:47 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* array.c (rb_ary_cycle): Ditto for Array#cycle.
+	* enum.c New methods: Enumerable#take, #take_while, #drop and
+	  #drop_while; backported from 1.9.
 
-Sun Apr 13 18:52:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr 14 18:50:15 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* thread_pthread.c (lock_func): should not check interrupts in
-	  blocking region.  [ruby-dev:34378]
+	* enum.c: New methods: Enumerable#one?, #none?, #minmax, #min_by,
+	  #max_by, #minmax_by and #cycle; backported from 1.9.
 
-Sat Apr 12 12:41:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_find_index): Add support for find_index(obj);
+	  [ruby-dev:34313]; backported from 1.9.
 
-	* eval.c (ruby_exec_node, ruby_run_node), ruby.c (process_options):
-	  use iseq instead of NODE.
+	* enum.c (enum_inject): Add support for Enumerable#inject(:binop);
+	  backported from 1.9.
 
-	* gc.c (source_filenames): removed.
+	* enum.c: Alias Enumerable#reject to #inject; backported from 1.9.
 
-	* include/ruby/intern.h, parse.y (yycompile, parser_mark, parser_free,
-	  ripper_initialize): rb_source_filename() is no longer used.
+Mon Apr 14 18:14:19 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* compile.c, compile.h (ERROR_ARGS), parse.y (node_newnode, fixpos,
-	  parser_warn, e_option_supplied, warn_unless_e_option, range_op,
-	  cond0): nd_file is no longer used.
+	* enum.c (enum_find, enum_reject): Return an enumerator if no
+	  block is given; backported from 1.9.
 
-Sat Apr 12 12:17:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
+	  argf_each_line, argf_each_byte): Ditto.
 
-	* prelude.rb (require_relative): move require_relative from
-	  lib/require_relative.rb.  [ruby-core:16356]
+	* string.c (str_gsub): Ditto.
 
-	* lib/require_relative.rb: removed.
+Mon Apr 14 18:10:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Apr 12 05:55:57 2008  Eric Hodel  <drbrain@segment7.net>
+	* enum.c (find_index_i, find_index_iter_i): add prototype for VC.
 
-	* lib/rubygems*, test/rubygems*:  Update to RubyGems 1.1.1 r1701.
+Mon Apr 14 17:55:30 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Apr 12 03:13:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_collect_bang, rb_ary_select): Return an
+	  enumerator if no block is given; backported from 1.9.
 
-	* file.c (file_expand_path): set external encoding.
+	* dir.c (dir_each, dir_foreach): Ditto.
 
-	* file.c (rb_file_s_basename, rb_file_s_dirname, rb_file_s_extname):
-	  copy encoding.
+	* enum.c (enum_partition, enum_sort_by): Ditto.
 
-Fri Apr 11 17:35:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (os_each_obj): Ditto.
 
-	* enum.c (count_i): modified to shut warning up.
+	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, rb_hash_select,
+	  rb_hash_each_value, rb_hash_each_key, rb_hash_each_pair,
+	  env_each_key, env_each_value, env_each, env_each_pair,
+	  env_reject_bang, env_delete_if, env_select): Ditto.
 
-Fri Apr 11 17:25:09 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* numeric.c (num_step, int_upto, int_downto, int_dotimes): Ditto.
 
-	* enum.c (count_i, count_iter_i, enum_count, enum_find_index):
-	  Reduce code.
+Mon Apr 14 16:42:53 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr 11 17:06:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h (rb_block_call_func): Fix prototype.
 
-	* enum.c (find_index_i): modified to shut warning up.
+	* enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.
 
-	* enum.c (find_index_iter_i): ditto.
+Mon Apr 14 15:49:05 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr 11 16:44:43 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enum.c (enum_count, enum_find_index): New methods:
+	  Enumerable#count and #find_index; backported from 1.9.
 
-	* enum.c (enum_find_index): Add support for find_index(obj);
-	  [ruby-dev:34313].
+Mon Apr 14 14:16:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* array.c (rb_ary_index): Define find_index as an alias to index.
+	* enumerator.c (enumerator_mark, enumerator_iter_i, enumerator_each_i,
+	  enumerator_allocate): add prototype.
 
-Fri Apr 11 16:42:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* enumerator.c (enumerator_each_i): declare unused two arguments.
 
-	* lib/yaml/store.rb (YAML::load): modified to support empty
-	  database.
+Mon Apr 14 13:58:32 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr 11 08:05:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_each_char): New methods: String#chars and
+	  #each_char; backported from 1.9.
 
-	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
-	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
-	  in [ruby-dev:34311].
+Mon Apr 14 13:42:20 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Apr 10 23:08:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_each_line, rb_str_each_byte): Reflect
+	  enumerator integration.  #lines and #bytes are now aliases to
+	  #each_line and #each_byte, respectively.
 
-	* lib/pstore.rb (PStore::dump, PStore::load): allow subclass
-	  overriding.  [ruby-dev:34305]
+Mon Apr 14 13:19:36 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
-	  add a method to support faster PStore.
+	* range.c (range_each, range_step): Return an enumerator if no
+	  block is given; backported from 1.9.
 
-Thu Apr 10 20:36:45 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* struct.c (rb_struct_each, rb_struct_each_pair): Ditto.
 
-	* misc/rdebug.el, misc/README: Remove rdebug.el as per request
-	  from the maintainer and mention the ruby-debug project at
-	  RubyForge in README; bug#19043.
+Mon Apr 14 13:07:59 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Apr 10 19:41:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c (rb_str_partition, rb_str_rpartition,
+	  rb_str_start_with, rb_str_end_with): New methods:
+	  String#partition, #rpartition, #start_with? and #end_with?;
+	  backported from 1.9.  These methods are $KCODE aware unlike
+	  #index, #rindex and #include?.
 
-	* eval.c (rb_f_loop): Mention StopIteration in the document.
+Sun Apr 13 15:55:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Thu Apr 10 19:23:55 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* object.c (sym_to_proc): new method Symbol#to_proc; backported
+	  from 1.9. bug#19012
 
-	* array.c (rb_ary_pop_m, rb_ary_shift_m): Update documents for
-	  #pop() and #shift().
+Fri Apr 11 19:14:30 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* array.c (rb_ary_slice_bang): Update document.  Assigning
-	  array[*args]= nil no longer removes elements.
+	* object.c (rb_obj_tap): new method Object#tap; backported from
+	  1.9. bug#19008
 
-Thu Apr 10 16:58:44 2008  Tanaka Akira  <akr@fsij.org>
+Fri Apr 11 18:58:09 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* marshal.c (w_object): TYPE_USERDEF assigns id for ivars first.
-	  [ruby-dev:34159] by nagachika.
+	* process.c: new method Process.exec; backported from 1.9. bug#19006
 
-Thu Apr 10 15:03:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 11 12:43:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* lib/generator.rb: removed obsolete library.  [ruby-core:16233]
-
-	* test/test_generator.rb: removed as well.  [ruby-dev:34306]
-
-	* lib/pstore.rb: replaced by Hongli Lai's faster version.
-
-Thu Apr 10 10:27:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (native_sleep): sleep_cond is initialized at
-	  creation.  [ruby-Patches-19361].
-
-Wed Apr  9 14:43:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (lock_func): optimized and checks for interrupt_flag.
-	  based on a patch from Sylvain Joyeux in [ruby-Patches-19361] and
-	  [ruby-Patches-19362].
-
-Wed Apr  9 12:12:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
+	  ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.
 
-	* test/ruby/test_thread.rb: new tests from Sylvain Joyeux in
-	  [ruby-Patches-19361].
+Fri Apr 11 10:22:54 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Tue Apr  8 21:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/lib/tkextlib/tile.rb:
+	  __define_LoadImages_proc_for_compatibility__! do nothing when the 
+	  Tcl command exists.
 
-	* thread.c (rb_mutex_sleep): ensures to re-acquire at waking up.
-	  [ruby-Patches-19361]
+	* ext/tk/lib/tkextlib/tile/style.rb:
+	  __define_wrapper_proc_for_compatibility__! do nothing when the Tcl
+	  command exists.
 
-Tue Apr  8 11:00:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/tk/sample/tkextlib/tile/demo.rb: don't create 'step' theme if 
+	  it already exists.
 
-	* lib/complex.rb: remove Math first before overwriting by CMath.
+Fri Apr 11 08:05:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Tue Apr  8 10:34:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
+	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
+	  in [ruby-dev:34311].
 
-	* load.c (rb_require_safe): should check fname path after $SAFE is
-	  properly set.  [ruby-dev:34268]
+Thu Apr 10 20:29:13 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* re.c (rb_reg_quote): should always copy the quoting string.
-	  [ruby-core:16235]
+	* misc/rdebug.el, misc/README: Remove rdebug.el as per request
+	  from the maintainer and mention the ruby-debug project at
+	  RubyForge in README; bug#19043.
 
-Tue Apr  8 10:30:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 10 20:08:37 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* common.mk (prelude.c): depends on enc/prelude.rb.
+	* enum.c (enum_first, enum_group_by): New methods:
+	  Enumerable#first and #group_by; backported from 1.9.
 
-	* enc/prelude.rb: fixed initial library names.
+Thu Apr 10 19:49:10 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Apr  8 03:39:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enumerator.c (rb_eStopIteration), eval.c (rb_f_loop), ruby.h:
+	  Add a new exception class StopIteration, which breaks Kernel#loop
+	  iteration when raised; backported from 1.9.
 
-	* load.c (rb_provided): check expanded path for relative path
-	  features, loading or loaded features are already expanded in 1.9.
+	* enumerator.c (enumerator_next, enumerator_rewind): Implement
+	  #next and #rewind using the "generator" library.
 
-	* variable.c (rb_autoload_load): no needs to check if provided before
-	  rb_require_safe.  [ruby-dev:34266]
+	* lib/generator.rb: Implement Enumerable::Enumerator#next and
+	  #rewind.
 
-Mon Apr  7 22:41:21 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Apr 10 19:29:48 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* numeric.c: cancelled recent changes (except to remove rdiv).
+	* array.c (rb_ary_first, rb_ary_last): Return a shared array when
+	  possible.
 
-	* bignum.c: ditto.
+	* array.c (rb_ary_pop, rb_ary_pop_m, rb_ary_shift, rb_ary_shift_m):
+	  Array#pop and Array#shift can take an optional argument
+	  specifying the number of elements to remove and return;
+	  backported from 1.9.
 
-	* bignum.c: added rb_big_idiv.
+Thu Apr 10 14:00:44 2008  Tanaka Akira  <akr@fsij.org>
 
-Mon Apr  7 15:51:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
+	  CNAME.  [ruby-dev:34200]
 
-	* encoding.c (enc_init_db): moved to enc/encdb.c.
+Thu Apr 10 01:42:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.
+	* enum.c (iterate_method): add prototype to avoid warning on VC++.
 
-	* enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
-	  corresponding headers.
+Wed Apr  9 23:12:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* common.mk (COMMONOBJS): moved transcode.o from OBJS
+	* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
 
-Mon Apr  7 12:26:32 2008  Koichi Sasada  <ko1@atdot.net>
+	* ext/tk/tcltklib.c: avoid error on a shared object.
 
-	* bootstraptest/test_knownbug.rb: add a known-bug.
+	* ext/tk/extconf.rb: support --with-tcltkversion
 
-Mon Apr  7 12:15:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/README.tcltklib: add document about --with-tcltkversion
 
-	* range.c (range_each_func): should not leave a variable
-	  uninitialized, which could cause SEGV.
+	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, 
+	  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, 
+	  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: 
+	  bug fix.
 
-	* range.c (range_step): removed duplicated and unreachable code.
+Wed Apr  9 21:54:45 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Apr  7 02:12:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_pop): Do not reallocate too often; backported
+	  from 1.9.
 
-	* string.c (rb_str_intern): need not to check if tainted.
-	  [ruby-dev:34219]
+Wed Apr  9 21:13:05 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_each, rb_ary_each_index, rb_ary_reverse_each,
+	  rb_ary_reject, rb_ary_reject_bang): Array#each, #each_index,
+	  #reverse_each, #reject, #reject! and #delete_if return an
+	  enumerator if no block is given; backported from 1.9.
 
-	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
+Wed Apr  9 20:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Apr  5 23:17:20 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+	* array.c (rb_ary_index, rb_ary_index): Array#index and #rindex
+	  can take a block instead of an argument; backported from 1.9.
 
-	* lib/cmath.rb: new.
+Wed Apr  9 19:58:31 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/complex.rb: depends lib/cmath.rb.
+	* enumerator.c, inits.c (rb_call_inits), ruby.h, intern.h,
+	  ext/enumerator, common.mk (OBJS, enumerator.$(OBJEXT)): Make the
+	  enumerator module built-in.
 
-	* lib/rational.rb: added rdiv.
+	* enumerator.c: New method: Enumerable::Enumerator#with_index.
 
-	* complex.c: removed some math functions.
+	* enum.c (enum_each_with_index): Enumerable#each_with_index now
+	  returns an enumerator instead of raising an exception if no
+	  block is given.  Enumerable#enum_with_index, formerly defined in
+	  the enumerator module, is kept as an alias to each_with_index
+	  for backward compatibility.
 
-Sat Apr  5 05:50:57 2008  Eric Hodel  <drbrain@segment7.net>
+Wed Apr  9 19:43:51 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rdoc/parsers/parse_rb.rb: Fix uninitialized variable warnings.
+	* eval.c (rb_obj_method, rb_proc_call), intern.h: Export.
 
-	* lib/rdoc/generator/html.rb: ditto.
+Tue Apr  8 11:11:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rdoc/options.rb: Fix shadowed variable warning.
+	* eval.c (EXEC_TAG): remove unnecessary FLUSH_REGISTER_WINDOWS for
+	  better performance on SPARC.  [ruby-core:16159]
 
-	* lib/webrick/httprequest.rb: Fix redefined method warning.
+Tue Apr  8 10:49:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Apr  5 02:13:52 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* re.c (rb_reg_quote): should always copy the quoting string.
+	  [ruby-core:16235]
 
-	* bignum.c (rb_cmpint): moved from compar.c, to check bignum
-	  zero.
+Mon Apr  7 21:35:08 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr  4 23:24:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* array.c (rb_ary_nitems): Backport Array#nitems with a block;
+	  suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
+	  [ruby-talk:134083].
 
-	* re.c (rb_memsearch_qs): wrong boundary condition.
+Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* re.c (rb_memsearch_qs_utf8): ditto.
+	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
 
-Fri Apr  4 14:11:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr  5 10:05:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* re.c (rb_memsearch_qs): wrong boundary condition.  a patch from
-	  wanabe <s.wanabe AT gmail.com> in [ruby-dev:34248].
+	* object.c (rb_check_to_integer): backported for range_step.
 
 Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
 	  @n_bytes as well.  [ruby-core:16144]
 
-Fri Apr  4 01:59:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_step): add step for each iteration if begin and
-	  end are numeric.  [ruby-core:15990]
-
-Fri Apr  4 00:42:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (Init_Bignum): rdiv method removed.  [ruby-dev:34242]
-
-	* complex.c (nucomp_quo): ditto.
-
-	* numeric.c (num_rdiv): ditto.
-
-	* rational.c (nurat_div): ditto.
-
-	* complex.c (nucomp_fdiv): fdiv implementation restored.
-
-	* numeric.c (num_quo): RDoc updated.
-
-Thu Apr  3 21:51:45 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (nucomp_int_check): function for DRY real check.
-
-	* complex.c (nucomp_{add,sub,mul,div,expt}): use rb_num_coerce_bin().
-
-Thu Apr  3 19:59:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (defineclass): check if cbase is a class or a module.
-	  [ruby-core:16118]
-
-Thu Apr  3 14:42:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (INSNS): add insns_info.inc.
-
-	* common.mk (INSNS): make incs separately for nmake.
-
-Thu Apr  3 13:20:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (endb.h, transdb.h, prelude.c): depend on $(PREP) and
-	  check if really changed.  [ruby-core:16102]
-
-	* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
-	  (MINIOBJS, ARCHMINIOBJS): separated.
-
-Thu Apr  3 09:00:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr  4 02:17:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* compile.c (iseq_set_sequence, iseq_insns_unification,
-	  insn_data_to_s_detail): constified.
-
-	* iseq.c (insn_operand_intern, ruby_iseq_disasm_insn): ditto.
-
-	* template/{insns_info,opt_sc,optunifs}.inc.tmpl: ditto.
-
-	* tool/instruction.rb (OptUnifsIncGenerator): ditto.
-
-Thu Apr  3 08:46:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_include): add RDoc to describe that comparison
-	  for numeric is done according magnitude of values.
-	  [ruby-core:15907]
-
-Wed Apr  2 22:29:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rational.c (nurat_int_check): function for DRY integer check.
-
-	* numeric.c (num_rdiv): should always return rational number.
-
-	* rational.c (nurat_add, nurat_sub, nurat_mul, nurat_fdiv,
-	  nurat_cmp): use rb_num_coerce_bin().
-
-	* rational.c (nurat_division): does / and rdiv.
-
-	* .gdbinit (rp): no longer use rb_p().
-
-Wed Apr  2 06:52:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* .gdbinit (rp): supports rational and complex numbers.  it's
-	  cheating since it uses rb_p().
-
-Wed Apr  2 06:24:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/node.h: add new constants for rb_call()'s scope.
-
-	* eval.c (iterate_method): use CALL_* scope constant to specify
-	  proper scope value.
-
-	* eval.c (rb_each, rb_apply, rb_funcall, rb_funcall2, rb_funcall3):
-	  ditto.
-
-Tue Apr  1 21:19:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rational.c: need to include <float.h> just once.
-
-Tue Apr  1 16:40:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (big2dbl): more precise conversion at edge cases.
-	  [ruby-dev:34195]
+	* range.c (range_step): should not round step into integer if
+	  begin and end are numeric.  [ruby-core:15990]
 
 Tue Apr  1 14:43:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: get rid of empty expansion.
 
-	* configure.in: _setjmp is available but _longjmp is not on mingw.
-
-Tue Apr  1 09:41:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
 	* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
 
-Tue Apr  1 07:31:58 2008  Eric Hodel  <drbrain@segment7.net>
+Tue Apr  1 11:36:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
+	* configure.in: _setjmp is available but _longjmp is not on mingw.
 
 Tue Apr  1 03:20:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -5625,221 +2067,124 @@ Tue Apr  1 01:55:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
 	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
 
-Tue Apr  1 01:40:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c: adopted the ruby's style.
+Mon Mar 31 14:51:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* rational.c: ditto.
+	* bignum.c (rb_big_div): Bignum#div should return integer for
+	  floating number operand.
 
-Tue Apr  1 00:17:35 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Mar 30 07:00:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* rational.c: revert.
-
-Mon Mar 31 18:57:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc,win}32/Makefile.sub (config.h): define ssize_t.
-
-	* io.c (copy_stream_body): some platform don't have O_NOCTTY.
-
-Mon Mar 31 18:42:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check for ssize_t.  [ruby-dev:34184]
-
-Mon Mar 31 14:45:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_quo): should convert its operand to Rational.
-
-	* rational.c (string_to_r_strict): should raise TypeError.
-
-	* bignum.c (Init_Bignum): should not redefine Bignum#div.
-	  Numeric#div will do.  [ruby-dev:34066]
-
-Mon Mar 31 04:05:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (io_getc): set coderange while getting characters.
-
-Sun Mar 30 23:16:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (proc_dup): should copy is_lambda attribute as well.
-	  [ruby-talk:296244]
-
-Sun Mar 30 15:33:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: IO.copy_stream implemented.  [ruby-dev:33843]
-
-	* thread.c (rb_fd_select): new function.
-
-	* configure.in (sys/sendfile.h): check the header file.
-	  (sendfile): check the function.
-	  (pread): check the function.
+	* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
 
 Sat Mar 29 14:18:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
 
-	* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets'
+	* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' 
 	  instate/state/identify method to avoid the conflict with standard
 	  widget options. Those methods are renamed to ttk_instate/ttk_state/
-	  ttk_identify (tile_instate/tile_state/tile_identify are available
-	  too). Although I don't recommend, if you really need old methods,
-	  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before
+	  ttk_identify (tile_instate/tile_state/tile_identify are available 
+	  too). Although I don't recommend, if you realy need old methods, 
+	  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before 
 	  "require 'tkextlib/tile'".
 
 	* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
-	  is obsolete. It outputs warning. To control default widget set,
+	  is obsolete. It outputs warning. To control default widget set, 
 	  use "Tk.default_widget_set = :Ttk".
 
-	* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and
-	  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defined
-	  as module methods of TkConfigMethod. It may help users to wrap old
+	* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and 
+	  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind 
+	  as module methods of TkConfigMethod. It may help users to wrap old 
 	  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
-	  Ttk widgets don't have some options of standard widgets which are
-	  control the view of widgets. When set ignore-mode true, configure
-	  method tries to ignore such unknown options with no exception.
-	  Of course, it may raise other troubles on the GUI design.
-	  So, those are a little danger methods.
-
-	* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__
-	  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method
-	  are defined as module methods of TkItemConfigMethod as the same
+	  Ttk widgets don't have some options of standard widgets which are 
+	  control the view of widgets. When set ignore-mode true, configure 
+	  method tries to ignoure such unknown options with no exception. 
+	  Of course, it may raise other troubles on the GUI design. 
+	  So, those are a little danger methods. 
+
+	* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ 
+	  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method 
+	  are defind as module methods of TkItemConfigMethod as the same 
 	  purpose as TkConfigMethod's ones.
 
-	* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for
-	  wrapping old Ruby/Tk scripts (which use standard widgets) to use
+	* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for 
+	  wrapping old Ruby/Tk scripts (which use standard widgets) to use 
 	  Ttk (Tile) widgets as default.
 
-	* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state
+	* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state 
 	  method instead of instate/state method.
 
 	* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
-	  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's
+	  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's  
 	  are replaced to "instance_exec(self)".
 
-	* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not
+	* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not 
 	  a character code on Ruby1.9).
 
-	* ext/tk/lib/tk/variable.rb: support new style of operation argument
-	  on Tcl/Tk's 'trace' command for variables.
+	* ext/tk/lib/tk/variable.rb: support new style of operation argument 
+	  on Tcl/Tk's 'trace' command for variables. 
 
 	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
 
-	* ext/tk/sample/demos-jp/textpeer.rb,
-	  ext/tk/sample/demos-en/textpeer.rb: new widget demo.
+	* ext/tk/sammple/demos-jp/textpeer.rb, 
+	  ext/tk/sammple/demos-en/textpeer.rb: new widget demo.
 
-	* ext/tk/tcltklib.c: decrease SEGV troubles (probably)
+	* ext/tk/tcltklib.c: decrase SEGV troubles (probably)
 
 	* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
 
 	* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
 
-	* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command
-	  to make Tcl/Tk theme sources (based on different version of Tile
-	  extension) available.
-	  (Tk::Tile::__define_LoadImages_proc_for_compatibility__)
+	* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command 
+	  to make Tcl/Tk theme sources (based on different version of Tile 
+	  extension) available. 
+	  (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)
 
 	* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
-	  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets
+	  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets 
 	  as toplevel widgets.
 
 	* ext/tk/lib/tkextlib/tile/style.rb: ditto.
 	  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
 
-	* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get
-	  properties as a hash. metrics_hash method returns a boolean value
-	  for 'fixed' option. But metrics method returns numeric value
-	  (0 or 1) for 'fixed' option, because of backward compatibility.
+	* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get 
+	  properties as a hash. metrics_hash method returns a boolean value 
+	  for 'fixed' option. But metrics method returns numeric value 
+	  (0 or 1) for 'fixed' option, because of backward compatibility. 
 
-	* ext/tk/lib/tk/timer.rb: sometimes fail to set callback procedure.
+	* ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.
 
-	* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep
-	  doesn't block the eventloop. It will be better to use the method
+	* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep 
+	  doesn't block the eventloop. It will be better to use the method 
 	  in event callbacks.
 
 	* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
 
-Thu Mar 27 20:44:22 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (f_lcm): removed.
-
-	* rational.c (rb_lcm, rb_gcdlcm): added.
-
-	* lib/complex.rb (gcd, lcm, gcdlcm): removed.
-
-	* lib/rational.rb (gcd, lcm, gcdlcm): ditto.
-
-Wed Mar 26 18:11:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_mod_constants): rdoc updated.  a patch from
-	  Florian Gilcher <flo AT andersground.net> in [ruby-core:16009].
-
-Wed Mar 26 00:55:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_rand.rb: add tests to achieve over 95% test coverage
-	  of random.c.
-
-Wed Mar 26 00:28:55 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_rational.rb: add tests to achieve over 90% test
-	  coverage of rational.c.
+Sat Mar 29 04:08:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/ruby/test_complex.rb: ditto for complex.c.
+	* class.c (clone_method): should copy cref as well.
+	  [ruby-core:15833]
 
-Tue Mar 25 19:34:05 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Mon Mar 24 20:07:42 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* bootstraptest/test_knownbug.rb: add tests.  [ruby-dev:34128]
+	* eval.c (rb_eval): Call trace hook for if expression after the
+	  condition has been evaluated, not before; submitted by Rocky
+	  Bernstein in #18722.
 
-Tue Mar 25 19:09:04 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Mon Mar 24 19:44:53 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* array.c (ary_new): fix size check.  [ruby-dev:34123]
-
-	* array.c (rb_ary_take, rb_ary_drop): check negative size and use
-	  NUM2LONG instead of FIX2LONG.  [ruby-dev:34123]
-
-	* enum.c (enum_take, enum_drop): check negative size.
-
-	* test/ruby/test_array.rb: add tests for above.
-
-Tue Mar 25 16:32:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): checks if the word is empty.
-
-	* ruby.c (process_options): typo fixed.  [ruby-dev:34122]
-
-Tue Mar 25 15:26:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (defined_expr): false short-circuit destination label may
-	  be needed.  [ruby-talk:295296]
-
-	* compile.c (iseq_compile_each): put nil if false short-circuit is
-	  created.
-
-	* compile.c (compile_massign_opt): no need to use alloca.
-
-Mon Mar 24 19:23:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* parse.y (debug_lines): Always prepare a new array for each
-	  file's SCRIPT_LINES__ storage, instead of appending source lines
-	  every time a file is re-loaded; submitted by Rocky Bernstein in
+	* parse.y (yycompile): Always prepare a new array for each file's
+	  SCRIPT_LINES__ storage, instead of appending source lines every
+	  time a file is re-loaded; submitted by Rocky Bernstein in
 	  #18517.
 
 Mon Mar 24 10:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: sitearch should use target_cpu.  [ruby-core:15986]
 
-Sun Mar 23 02:51:57 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rlimit_resource_value): use NUM2RLIM.
-
-Sun Mar 23 02:28:01 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Mar 24 01:24:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* complex.c: fixed. [ruby-dev:34109]
-
-	* rational.c: ditto.
-
-Fri Mar 21 21:32:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_f_gets, rb_f_readline, rb_f_readlines): delegates to ARGF
-	  as well as puts and putc.  [ruby-dev:34100]
+	* lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
 
 Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -5866,125 +2211,28 @@ Fri Mar 21 09:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* instruby.rb (open_for_install): write block result and rewrite only
 	  if changed from existing file.
 
-Fri Mar 21 08:29:33 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (nurat_to_f): rearrangement.
-
-Fri Mar 21 06:44:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rational.c (nurat_to_f): C99.
-
-Fri Mar 21 01:40:27 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* complex.c (nucomp_sub, nucomp_expt): call corresponding functions.
-
-Fri Mar 21 01:21:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* missing/tgamma.c: include config.h before math.h.  [ruby-dev:34075]
-
-Thu Mar 20 21:46:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_getline): use receiver.
-
-Thu Mar 20 21:20:19 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Mar 19 21:01:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* rational.c: some improvements (include Shin-ichiro HARA's
-	  effort).
-
-	* complex.c: some improvements.
-
-	* test/ruby/test_rational2.rb: new.
-
-Thu Mar 20 00:21:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_initialize_copy): get rid of segfault.
-
-	* io.c (argf_tell, argf_seek_m, argf_set_pos, argf_rewind,
-	  argf_fileno, argf_to_io, argf_eofl, argf_getc, argf_getbyte,
-	  argf_readchar, argf_readbyte, argf_each_line): use receiver.
-
-Wed Mar 19 23:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_putc, rb_io_puts): output directly if the receiver is
-	  rb_stdout to get rid of infinite recursion.  [ruby-dev:34059]
-
-Wed Mar 19 22:27:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c: added rb_gcd.
-
-	* complex.c: use rb_gcd.
-
-Wed Mar 19 18:37:00 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c: revert.
-
-	* rational.c: revert.
-
-Wed Mar 19 17:31:20 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_intern.h (TH_EXEC_TAG): need not to FLUSH_REGISTER_WINDOWS.
-	  [ruby-core:15871], [ruby-dev:34088]
+	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
+	  is not needed.  [ruby-dev:32640]
 
-Wed Mar 19 14:53:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 19 20:25:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* complex.c (nucomp_to_s, nucomp_inspect): get rid of making
-	  unnecessary intermediate objects.
+	* dir.c (Init_Dir): define inspect method.  [ruby-core:15960]
 
-	* complex.c (make_patterns, string_to_c): do not treat successive
-	  underscores as a part of numeric like as literals.  [ruby-dev:34085]
+Wed Mar 19 14:59:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* rational.c (make_patterns, string_to_r): ditto.
+	* misc/ruby-style.el (ruby-style-{case,label}-indent): fix for labels
+	  inside blocks in switch and function top level.
 
 Wed Mar 19 14:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_cstr_to_inum): treat successive underscores as
 	  nondigit.  [ruby-dev:34089]
 
-Wed Mar 19 14:08:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_check_encoding): should not load autoloaded encoding
-	  directly, instead use rb_enc_find_index() which deal with alias and
-	  replica.  [ruby-core:15957]
-
-Wed Mar 19 11:49:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* regint.h (include): include ruby.h instead of defines.h and config.h.
-
-Wed Mar 19 10:17:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regint.h (CHECK_INTERRUPT_IN_MATCH_AT): add interrupt check
-	  during match.  [ruby-talk:295002]
-
-Tue Mar 18 16:24:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (literal_concat_gen): bail out at different encoding.
-
-Tue Mar 18 04:00:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_memsearch_ss): simple shift search.
+Wed Mar 19 00:01:23 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* re.c (rb_memsearch_qs): quick search.
-
-	* re.c (rb_memsearch_qs_utf8): quick search for UTF-8 string.
-
-	* re.c (rb_memsearch_qs_utf8_hash): hash functions for above.
-
-	* re.c (rb_memsearch): use above functions.
-
-	* string.c (rb_str_index): give enc to rb_memsearch.
-
-	* include/ruby/intern.h (rb_memsearch): move to encoding.h.
-
-	* include/ruby/encoding.h (rb_memsearch): move from intern.h.
-
-	* common.mk (PREP): add dependency.
-
-Mon Mar 17 22:23:54 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* array.c (rb_ary_take, rb_ary_take_while, rb_ary_drop,
-	  rb_ary_drop_while): new methods. [ruby-dev:34067]
-
-	* test/ruby/test_array.rb: add tests for above.
+	* lib/erb.rb (ERB::Compiler): Make some minor code optimization.
 
 Mon Mar 17 17:11:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -5996,69 +2244,6 @@ Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
 
-Sun Mar 16 18:07:07 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/trans/utf_16_32.c: bug fix (some invalid UTF-8 sequences
-	  were legal)
-
-	* test/ruby/test_transcode.rb: test for above bug
-
-Sun Mar 16 17:28:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (LIBRUBY_SO): add dependency to $(BUILTIN_ENCOBJS).
-
-Sun Mar 16 08:51:41 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* include/ruby/intern.h: added some declarations.
-
-	* include/ruby/ruby.h: ditto.
-
-	* common.mk: added some entries.
-
-	* configure.in: added a check for signbit.
-
-	* lib/complex.rb: nearly all of core definitions have been removed.
-
-	* lib/rational.rb: ditto.
-
-	* lib/mathn.rb: some trivial adjustments.
-
-	* complex.c: new.
-
-	* rational.c: ditto.
-
-	* numeric.c (flo_{quo,rdiv}, fix_fdiv): added.
-
-	* numeric.c ({num,int}_{numerator,denominator}): ditto.
-
-	* bignum.c (rb_big_fdiv): ditto.
-
-	* numeric.c (fix_{quo,pow}): now may yield rational number.
-
-	* bignum.c (rb_big_{quo,pow}): ditto.
-
-	* numeric.c (rb_{int,flo}_induced_from): now can accept rational.
-
-	* gc.c (gc_mark_children, obj_free): now detects complex and rational.
-
-	* inits.c (rb_call_inits): now calls Init_{Complex,Rational}.
-
-	* test/ruby/test_complex.rb: new.
-
-	* test/ruby/test_rational.rb: ditto.
-
-Sat Mar 15 17:48:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_enc_associate_index): pass unnecessary enc_capable().
-
-	* string.c (rb_str_cmp): reduce invocation of rb_enc_compatible().
-
-Fri Mar 14 17:04:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (inttypes.h): includes always if available.
-
-	* string.c, ext/digest/defs.h: moved inttypes.h to ruby.h.
-
 Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
@@ -6072,702 +2257,94 @@ Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_LIB_PREFIX): use libdir.
 
-Fri Mar 14 14:24:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/digest/defs.h: inttypes.h is still needed.
-
-Fri Mar 14 11:34:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc,win}32/Makefile.sub: follow below changes.
-
-Fri Mar 14 11:24:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-encoding-map, ruby-use-encoding-map): added
-	  to customize.
-
-Fri Mar 14 10:37:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (int8_t, uint8_t,  int16_t,  uint16_t int32_t,
-	  uint32_t int64_t, uint64_t, int128_t, uint128_t,
-	  intptr_t, uintptr_t): check if defined.
-
-	* win32/Makefile.sub: follow configure.in.
-
-	* ext/digest/defs.h: remove checks for uint8_t, uint32_t and uint64_t.
-
 Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
 	  directives.
 
-Fri Mar 14 10:03:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (UNALIGNED_WORD_ACCESS): IA64 cannot access unaligned word.
-
-Thu Mar 13 21:00:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_slice_bang): should not use rb_ary_subseq()
-	  which shares internal pointer.  splice modifies the receiver
-	  right after subseq.  [ruby-dev:34005]
+Thu Mar 13 00:37:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bootstraptest/test_struct.rb: some test moved from test to shut
-	  warning up.
+	* eval.c (rb_call0): yields the last executed node line number at
+	  return event.  [ruby-core:15855]
 
-Thu Mar 13 19:42:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 12 02:12:20 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* {bcc,win}32/Makefile.sub (config.h): define uint32_t.
-
-Thu Mar 13 14:14:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* trunk/configure.in (AC_CHECK_HEADERS): stdint.h is not needed to
-	  check.
-
-	* trunk/configure.in (rb_cv_type_uint32_t): unquoted.  [ruby-dev:34030]
-
-	* trunk/string.c (hash): use inttypes.h instead of stdint.h.
-
-Thu Mar 13 10:42:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_divmod): should return integer division.  [ruby-dev:34006]
-
-	* enum.c (zip_ary): wrong boundary condition.
-
-	* test/ruby/test_numeric.rb (TestNumeric::test_num2long): bit-and
-	  should not raise RangeError.
-
-Thu Mar 13 03:12:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/cmd/help.rb: should be updated for new ri structure.
-	  [ruby-core:15825]
-
-	* lib/rdoc/ri/driver.rb (RDoc::initialize): allow options to be optional.
-
-	* lib/rdoc/ri/driver.rb (RDoc::class_cache): map_dirs may be
-	  empty.
-
-	* lib/rdoc/ri/driver.rb (RDoc::get_info_for): revive get_info_for
-	  method.  maybe broken.
-
-	* lib/rdoc/ri/util.rb (RDoc::initialize): should not use RiError
-	  no more.
-
-Thu Mar 13 01:45:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (stdint.h): check if presence.
-
-	* configure.in (uint32_t): check if defined.
-
-	* string.c (hash): fix for portability.  [ruby-dev:34020]
-
-Wed Mar 12 17:33:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): fix for a mere underscore.
-
-Wed Mar 12 14:47:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_intern.h (rb_thread_raised_set): use generic flags.
-
-	* eval.c (rb_longjmp): clear all raised flags.
-
-	* eval.c (stack_check): leave clearing flag to rb_longjmp.
-
-	* gc.c (rb_memerror): use thread raised flag instead of static flag.
-
-Tue Mar 11 23:38:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_combination): argument check before creating
-	  Enumerator.
-
-	* array.c (rb_ary_permutation): ditto.
-
-	* enum.c (enum_zip): optimize if all arguments are arrays.
+	* lib/delegate.rb: check $@ to avoid NoMethodError.
 
 Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (fix_coerce): try conversion before type check.
 	  [ruby-core:15838]
 
-Tue Mar 11 12:39:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (clean-local): WINMAINOBJ is Windows specific.
-
-Tue Mar 11 10:19:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (hash): replaced by MurmurHash described in
-	  <http://murmurhash.googlepages.com/>.
-
-Tue Mar 11 09:52:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_comparable): empty strings in any encoding are
-	  compatible each other.
-
-Tue Mar 11 00:46:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (usage): remove some unimportant lines to fit -h message
-	  in a page.  [ruby-dev:34018]
-
-Mon Mar 10 17:11:00 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_local_variables): local_variables should return an
-	  array of symbols.  [ruby-dev:34008]
-
-	* vm.c (collect_local_variables_in_env): ditto.
+Tue Mar 11 17:03:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Mar 10 15:53:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/delegate.rb (Delegator#initialize, DelegateClass): skip correct
+	  backtrace.  [ruby-dev:34019]
 
-	* version.c (MKSTR): make US-ASCII.  [ruby-dev:34010]
+Tue Mar 11 16:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Mar 10 02:08:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* win32/win32.c (rb_w32_cmdvector): terminate shrunken command line.
 
-	* string.c (rb_str_index): if t == s + pos, the character beginning
-	  from s + pos is valid.
+Tue Mar 11 12:39:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Mar  9 13:51:21 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/generator.rb: Restore missing line to #params.  Patch by
-	  Lincoln Stoll <lstoll at lstoll.net>
-
-Sun Mar  9 09:52:00 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/code_objects.rb: Remove debugging Kernel#p.  Patch by
-	  Lincoln Stoll <lstoll at lstoll.net>
-	* lib/rdoc/generator/html.rb: Fully qualify AllReferences.  Patch by
-	  Lincoln Stoll <lstoll at lstoll.net>
-	* lib/rdoc/ri/writer.rb: Fix 1.8 backwards compatibility.
+	* common.mk (clean-local): removes MINOBJS.
 
 Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (isdirsep): backslash is valid path separator on cygwin too.
 
-Sat Mar  8 06:53:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (search_nonascii): Use VALUE instead of unsigned long
-	  because VALUE can be the fastest unsigned integer type.
-	  On LLP64 unsigned long isn't the fastest.
-	* string.c (str_strlen): ditto.
-	* string.c (str_utf8_nth): ditto.
-	* string.c (count_utf8_lead_bytes_with_ulong): ditto.
-
-	* string.c (count_utf8_lead_bytes_with_word): renamed.
-
-Fri Mar  7 21:27:43 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* bignum.c: fix indent.
-
-Fri Mar  7 21:12:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* bignum.c (power_cache_init, power_cache_get_power0, Init_Bignum):
-	  delayed initializing power cache per base.  [ruby-dev:34003]
-
-Fri Mar  7 20:30:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cont.c (cont_restore_0): fixed typo.  [ruby-core:15821]
-
 Fri Mar  7 19:56:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: rdoc added.  [ruby-Patches-9762]
 
-Thu Mar  6 17:26:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): space flag is in effect for Inf/NaN too.
-	  [ruby-dev:34002]
-
-Thu Mar  6 15:44:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): casting double to long is undefined
-	  if the integer part of double is out of the range of long.
-
-Thu Mar  6 15:11:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): ignore 0 flag for NaN and Inf.
-	  [ruby-dev:33994]
-
-Thu Mar  6 15:05:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar  6 15:10:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
 	  ruby$(EXEEXT).
 	  suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
 	  [ruby-dev:34000]
 
-Thu Mar  6 14:46:08 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/lgamma_r.c (loggamma): return 0 for 1 and 2.
-
-	* test/ruby/test_math.rb: accept errors by functions under missing/.
-
-Thu Mar  6 14:29:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* transcode.c (rb_str_transcode_bang): set coderange.
-
-	* transcode.c (rb_str_transcode): use rb_str_transcode_bang.
-
-Thu Mar  6 14:00:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/missing.h (cbrt): add declaration.
-
-Thu Mar  6 11:14:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-add-log-current-method): use ruby style
-	  method name format.
-
-Thu Mar  6 11:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): no need of loop.
-
-Thu Mar  6 08:30:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_freeze): call rb_class_name() directly.
-	  [ruby-core:15802]
-
-Thu Mar  6 04:32:06 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (count_utf8_lead_bytes_with_ulong): fix shift size.
-	  [ruby-dev:33993]
-
-	* string.c (str_utf8_nth) fix wrong counting.
-
-Thu Mar  6 00:34:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): size_t returned from strlen() can be
-	  unsigned.
-
-Thu Mar  6 00:31:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (make_struct): preserve encoding of struct name.
-
-Wed Mar  5 22:49:20 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (is_utf8_lead_byte, count_utf8_lead_bytes_with_ulong):
-	  defined for UTF-8 optimization.
-
-	* string.c (str_strlen): use is_utf8_lead_byte and
-	  count_utf8_lead_bytes_with_ulong.
-
-	* string.c (str_utf8_nth) ditto.
-
-Wed Mar  5 17:53:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_flock): returns false on EAGAIN if non-blocking.
-	  [ruby-core:15795]
-
-Wed Mar  5 17:43:43 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c (transcode_loop): Adjusted detection of invalid
-	  (ill-formed) UTF-8 sequences. Fixing potential security issue, see
-	  http://www.unicode.org/versions/Unicode5.1.0/#Notable_Changes.
-
-	* test/ruby/test_transcode.rb: Added two tests for above fix.
-
-Wed Mar  5 14:00:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_to_s): avoid rb_scan_args() when no argument
-	  given.
-	* bignum.c (rb_big_to_s): ditto.
-	* enum.c (enum_first): ditto.
-	* eval_jump.c (rb_f_catch): ditto.
-	* io.c (rb_obj_display): ditto.
-	* class.c (rb_obj_singleton_methods): ditto.
-	* object.c (rb_class_initialize): ditto.
-	* random.c (rb_f_srand): ditto.
-	* range.c (range_step): ditto.
-	* re.c (rb_reg_s_last_match): ditto.
-	* string.c (rb_str_to_i): ditto.
-	* string.c (rb_str_each_line): ditto.
-	* string.c (rb_str_chomp_bang): ditto.
-	* string.c (rb_str_sum): ditto.
-
-	* string.c (str_modifiable): declare inline.
-	* string.c (str_independent): ditto.
-
-Wed Mar  5 11:50:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/debug.rb: require 'continuation' to implement "restart"
-	  command.  [ruby-dev:33992]
-
-	* lib/debug.rb (Context::debug_command): remove local variable
-	  shadowing to shut up warnings.  [ruby-dev:33992]
-
-	* lib/debug.rb (Context::display_list): ditto.
-
-	* lib/debug.rb (Context::resume): ditto.
-
-	* lib/debug.rb (Context::get_thread): no longer use #index for Hash.
-
-Tue Mar  4 21:35:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb.rb (IRB::Irb::eval_input): SyntaxError should not be
-	  considered as IRB bug.  [ruby-dev:33991]
-
-	* lib/irb/workspace.rb (IRB::WorkSpace::filter_backtrace): should
-	  filter 'irb.rb' as well for context mode 2 and 3.
-
-Tue Mar  4 19:10:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_aset): should not copy key string when
-	  compare_by_identity is set.  [ruby-dev:33604]
-
-	* hash.c (hash_equal): two hash tables are different when internal
-	  comparison table differ.  [ruby-dev:33989]
-
-Tue Mar  4 16:29:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): disallow non digits '0o' expression.
-
-Tue Mar  4 14:35:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar  6 12:15:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (open_key_args): use rb_io_open_with_args instead of rb_f_open.
-	  [ruby-core:15763]
-
-Tue Mar  4 13:41:46 2008  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (add_heap): fix previous change.  [ruby-dev:33988]
-
-Tue Mar  4 10:21:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (add_heap): use binary search to find the place to insert the
-	  new heap slot.  [ruby-dev:33983]
+	* parse.y (opt_block_param): command can start just after block param
+	  definition.  [ruby-list:44479]
 
-Tue Mar  4 05:30:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar  6 00:34:11 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* io.c (open_key_args): use rb_io_open instead of rb_f_open.
-	  [ruby-core:15746]
+	* lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
 
-Mon Mar  3 23:28:37 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Mar  3 23:28:34 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  separators in path_info to prevent directory traversal
-	  attacks on DOSISH platforms.
+	  separators in path_info to prevent directory traversal attacks
+	  on DOSISH platforms.
 	  reported by Digital Security Research Group [DSECRG-08-026].
 
 	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
 	  not to be published should be checked case-insensitively.
 
-Mon Mar  3 17:25:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): sort heaps array in ascending order to use
-	  binary search.
-
-	* gc.c (is_pointer_to_heap): use binary search to identify object
-	  in heaps.  works better when number of heap segments grow big.
-
-Mon Mar  3 17:15:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_regsub): remove too strict encoding check.
-	  [ruby-dev:33966]
-
 Mon Mar  3 16:14:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* hash.c (rb_any_hash): shrinks all results in Fixnum range.
 	  [ruby-core:15713]
 
-Sun Mar  2 23:03:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_ungetc): reduce redundant call.
-
-Sun Mar  2 10:13:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (load_file): parse shebang in us-ascii.  a patch from
-	  sheepman <sheepman AT sheepman.sakura.ne.jp> in [ruby-dev:33955]
-
-Sun Mar  2 00:08:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): check for successive underscores.
-	  [ruby-dev:33952]
-
-Sat Mar  1 17:59:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (struct argf): packed ARGF stuffs.
-
-	* ruby.c (proc_options): use ruby_set_inplace_mode().
-
-Sat Mar  1 17:51:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/collector/dir.rb (recursive_collect): do not always
-	  include all test_*.rb.
-
-Sat Mar  1 14:14:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* development snapshot 1.9.0-1 released.
-
-Sat Mar  1 13:46:26 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* tool/make-snapshot: make prereq uses MINIRUBY.
-
-	* tool/make-snapshot: allow packaging like 1.9.0-1 by second
-	  command-line argument.
-
-Sat Mar  1 13:11:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/allpairs.rb: new file for all pairs method.
-
-	* test/ruby/test_m17n_comb.rb: use allpairs.rb to reduce test cases.
-
-	* test/ruby/test_sprintf_comb.rb: ditto.
-
-Sat Mar  1 12:34:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (sym_inspect): use rb_str_inspect() instead of
-	  rb_str_dump().  [ruby-dev:33946]
-
-Sat Mar  1 12:15:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_method.c (rb_get_method_body): ent->method may be freed by
-	  GC.  [ruby-dev:31819]
-
-	* thread.c (remove_event_hook): should not access freed memory.
-	  [ruby-dev:31820]
-
-Sat Mar  1 10:31:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (read_all, rb_io_getline_fast): encoding is io_input_encoding.
-
-Sat Mar  1 10:09:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_setup_table, rb_str_split_m, rb_str_chomp_bang):
-	  simplified with rb_enc_ascget().  [ruby-dev:33944]
-
-Sat Mar  1 10:01:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_coderange_scan_restartable): should not return
-	  offset in the middle of a character.
-
-	* string.c (rb_str_coderange_scan_restartable): should not return
-	  invalid cr value.
-
-Sat Mar  1 09:36:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): "%#.0o" should keep prefix where
-	  "%#.0x" should not.
-
 Sat Mar  1 02:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (big2str_find_n1): check integer overflow.
 
-Sat Mar  1 00:29:07 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_dummy_p): bootstrap encodings can not be dummy.
-
-	* encoding.c (rb_enc_ascget): no needs to call rb_enc_precise_mbclen()
-	  twice.
-
-Fri Feb 29 23:14:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_chomp): test
-	  updated.
-
-Fri Feb 29 20:58:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_iterator.rb (TestIterator::test_enumerator):
-	  adjust test for zip behavior reversion.
-
-Fri Feb 29 20:25:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_chomp_bang): now works on UTF-16.
-
-	* string.c (tr_setup_table): negation should work on non ASCII
-	  compatible strings as well.
-
-	* string.c (rb_str_split_m): awk split should work on non ASCII
-	  compatible strings as well.
-
-Fri Feb 29 18:08:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_strftime): format should be ascii compatible.
-
-	* parse.y (rb_intern3): non ASCII compatible symbols.
-
-	* re.c (rb_reg_regsub): add encoding check.
-
-	* string.c (rb_str_chomp_bang): ditto.
-
-	* test/ruby/test_utf16.rb (TestUTF16::test_chomp): raises exception.
-
-Fri Feb 29 15:16:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_rpartition): calculation was done in byte indexing.
-
-	* test/ruby/test_m17n_comb.rb (TestM17NComb::test_str_start_with):
-	  allow start_with? matching on broken strings.
-
-Fri Feb 29 15:12:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (opt_block_param): command can start just after block param
-	  definition.  [ruby-list:44479]
-
-Fri Feb 29 03:22:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/ruby/test_time.rb (test_readers): fix typo.
-	  (test_strftime): "UTC" is also ok for time.gmtime.strftime("%Z").
-
-Fri Feb 29 02:50:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_new): remove encoding assumption of empty string.
-
-	* hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should
-	  be always ASCII-8BIT.
-
-	* object.c (nil_to_s): nil.to_s should be US-ASCII.
-
-Fri Feb 29 02:24:22 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/text.rb,
-	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: remove adhoc check
-	  of Ruby's features (use existence of some classes instead of
-	  comparing with RUBY_VERSION)
-
-	* ext/tk/lib/tk/root.rb, ext/tk/lib/tk/autoload.rb: make TkRoot
-	  (Tk::Root) unswitchable
-
-	* ext/tk/lib/multi-tk.rb: partial bug fix (still not work!!)
-
-Thu Feb 28 23:37:12 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): use ASCII-8BIT
-	  for charset unspecified non-text data.
-
-Thu Feb 28 22:19:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (enc_capable): IMMEDIATE_P doesn't include Qnil and Qfalse.
-	  use SPECIAL_CONST_P.
-
-Thu Feb 28 19:45:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (enc_find): check type of argument and convert to String
-	  if it is StringValue. [ruby-cvs:22866]
-
-Thu Feb 28 18:07:52 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI::Meta#meta_setup_encoding): setup encoding
-	  by charset.
-	  (OpenURI::Meta#meta_add_field): call meta_setup_encoding when
-	  content-type.
-
-Thu Feb 28 15:29:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_getline_fast): scan coderange.
-
-Thu Feb 28 14:36:46 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_str_copy): removed.
-
-Thu Feb 28 13:51:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (stack_check): made flag per threads.
-
-	* thread.c (rb_thread_set_raised, rb_thread_reset_raised): prefixed.
-
-Thu Feb 28 11:43:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_flock): immediately returns on EAGAIN if
-	  non-blocking.  [ruby-core:15672]
-
-Thu Feb 28 11:23:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline_1): get rid of segfault.  [ruby-dev:33938]
-
-Thu Feb 28 11:19:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_reverse_bang): removed unused variables.
-
-	* include/ruby/encoding.h (rb_str_coderange_scan_restartable): added
-	  prototype.
-
-	* string.c (rb_str_coderange_scan_restartable, rb_str_times): removed
-	  unused variables.
-
-	* string.c (rb_str_reverse_bang): ditto
-
-	* string.c (rb_enc_str_copy): unused now.  may be used in future?
-
-Thu Feb 28 03:03:32 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/*: make default widget set
-	  switchable between Tk (standard Tcl/Tk widget set) and
-	  Ttk (Tile). Initial default widget set is Tk. Now, toplevel
-	  widget classes are removed and defined as aliases.
-	  For example, "TkButton" is an alias of the "Tk::Button" class.
-	  Those aliases are replaced when switching default widget set.
-	  "Tk.default_widget_set=" is the method for switching default
-	  widget set. "Tk.default_widget_set = :Ttk" defines Ttk (Tile)
-	  widget set as default. It means that "TkButton" denotes
-	  "Tk::Tile::Button" class. And then, "TkButton.new" creates
-	  a Tk::Tile::Button widget. Of course, you can back to use
-	  standard Tk widgets as the default widget set by calling
-	  "Tk.default_widget_set = :Tk", whenever you want. Based on
-	  the feature, you can use Ttk widget styling engine on your
-	  old Ruby/Tk application without modifying its source, if you
-	  don't use widget options unsupported on Ttk widgets (At first,
-	  call "Tk.default_widget_set = :Ttk", and next load and run
-	  your application).
-	  This is one step for supporting Tcl/Tk8.5 features.
-
-Wed Feb 27 22:55:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_coderange_scan_restartable): coderange scanning
-	  for partial read.
-
-	* io.c (read_all): set coderange when not convert encoding.
-
-Wed Feb 27 03:55:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, enc/make_encmake.rb: load current mkmf.rb even if
-	  cross-compiling.
-
-	* ext/extmk.rb, enc/make_encmake.rb, lib/mkmf.rb: need to be 1.8
-	  compatible for cross-compiling.
-
-Tue Feb 26 16:53:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-calculate-indent): should distinguish
-	  comment and # in strings.  [ruby-dev:33874]
-
-Tue Feb 26 16:41:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (combi_len, rb_ary_product): check for overflow.
-	  [ruby-Bugs-18355]
-
-Tue Feb 26 16:38:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (recursive_cmp): compare minimal length parts.
-
 Tue Feb 26 16:06:00 2008  Technorama Ltd.  <oss-ruby@technorama.net>
 
-	* ext/openssl/ossl_{ec,dh,dsa,rsa}.c: Remove useless warnings.
+	* ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings.
 
 	* ext/openssl/ossl_asn1.c: Simplify code.
 
 	* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
 	  Undefine #id if SSL_SESSION_get_id is not supported.
 
-Tue Feb 26 15:50:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (value_expr_gen): removed inappropriate warning.
-	  [ruby-core:15660]
-
 Tue Feb 26 15:43:42 2008  Tanaka Akira  <akr@fsij.org>
 
 	* parse.y (tokadd_escape): refactored.  [ruby-core:15657]
 
-Tue Feb 26 15:30:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_eql, rb_ary_cmp): get rid of stack overflow with
-	  self-recursive constructs.  [ruby-Bugs-18356]
-
-Tue Feb 26 01:16:01 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (ROBJECT_NUMIV): renamed from ROBJECT_LEN.
-	  (ROBJECT_IVPTR): renamed from ROBJECT_PTR.
-
-	* variable.c: follow the above renaming.
-
-	* object.c: ditto.
-
-	* gc.c: ditto.
-
-	* marshal.c: ditto.
-
 Mon Feb 25 17:30:29 2008  Technorama Ltd.  <oss-ruby@technorama.net>
 
 	* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
@@ -6776,171 +2353,29 @@ Mon Feb 25 17:30:29 2008  Technorama Ltd.  <oss-ruby@technorama.net>
 	  existing Digest framework.
 	  Enhance performance.
 
-Mon Feb 25 15:33:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (big2str_karatsuba): initialize cache if not initialized.
-
-	* bignum.c (Init_Bignum): delayed initializing cache.
-	  [ruby-dev:33930]
-
 Mon Feb 25 13:40:03 2008  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (Init_process): share bignum objects for RLIM_INFINITY,
 	  RLIM_SAVED_MAX and RLIM_SAVED_CUR if they are equal.
 
-Mon Feb 25 10:41:41 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* encoding.c (Encoding#dummy): minor grammatical fixes
-	  in rdoc documentation.
-
-Mon Feb 25 00:01:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (clean-local): should be double-colon.
-
-Sun Feb 24 23:39:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 24 23:29:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
 	  intermediate files.
 
-	* cygwin/GNUmakefile.in (clean-local): remove def file.
-
-Sun Feb 24 06:49:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* debug.c (ruby_set_debug_option): separated ruby_each_words().
-
-	* util.c (ruby_each_words): extracted from ruby_set_debug_option().
-
-	* ruby.c (enable_option, disable_option): allow all for all known
-	  features.
-
-	* ruby.c (proc_options): generalized enable/disable options.
-
-	* ruby.c (ruby_init_gems): take enabled flag.  [ruby-core:14840]
-
-	* ruby.c (process_options): added --disable-rubyopt flag.
-
-	* include/ruby/util.h (ruby_each_words): prototype.
-
-Sun Feb 24 05:25:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): check if argument for -E exists.
-
-Sun Feb 24 05:09:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-style.el (ruby-style-label-indent): fix for labels inside
-	  blocks in switch.
-
 Sun Feb 24 03:52:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (valid_filename): use O_EXCL to get rid of clobbering
 	  existing files in race conditions.
 
-Sat Feb 23 21:36:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (ole_init_cp): should return value.
-
-Sat Feb 23 20:16:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_sublen): removed.
-
-	* string.c (rb_str_reverse, rb_str_reverse_bang): use
-	  single_byte_optimizable.
-
-Sat Feb 23 19:25:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_copy_for_substr): renamed from
-	  rb_enc_cr_str_copy.
-
-	* string.c: use rb_enc_cr_str_copy_for_substr and keep coderange.
-
-Sat Feb 23 18:50:17 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_encoding2cp): remove US-ASCII
-	  mapping.
-
-Sat Feb 23 01:09:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rlimit_resource_type): new function.
-	  (rlimit_resource_value): new function.
-	  (proc_getrlimit): use rlimit_resource_type to accept
-	  symbol and string as resource type.
-	  (proc_setrlimit): use rlimit_resource_type and rlimit_resource_value
-	  to accept symbol and string as resource type and values.
-
-Fri Feb 22 21:12:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_copy): check string's coderange is 7bit or
-	  valid.
-
 Fri Feb 22 19:50:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
 
-Fri Feb 22 15:47:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_mbclen): return minlen instead of 1 when
-	  a character is not found properly.
-
-	* string.c (rb_enc_strlen): round up string length with fixed
-	  multibyte encoding such as UTF-32.
-	  (rb_enc_strlen_cr): ditto.
-	  (rb_str_substr): fix substring with fixed multibyte encoding.
-	  (rb_str_justify): check number of characters.
-
-Fri Feb 22 12:11:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): string of ascii incompatible encoding
-	  should be escaped and returned as US-ASCII encoding.
-
-Fri Feb 22 11:16:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_substr): copy encoding although empty string.
-
-Fri Feb 22 04:48:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_times): empty string's coderange is CODERANGE_7BIT.
-
-	* string.c (rb_str_substr): ditto.
-
-	* encoding.c (rb_enc_compatible): empty string is compatible with not
-	  only nonasciicompatible strings. [ruby-dev:33895]
-
-Thu Feb 21 17:15:15 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c: Added basic support for passing options to String#encode
-	  via a hash. Currently only one option, with one value, is supported:
-	  invalid: :ignore (dropping invalid byte sequences instead of
-	  producing an error). Option naming is not yet stable!
-
-	* test/ruby/test_transcode.rb: Added a single test for invalid: :ignore
-	  option. Not more tests because most data does not yet distinguish
-	  between INVALID and UNKNOWN.
-
-Thu Feb 21 16:35:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_unshift_m): expands enough for argc.  [ruby-dev:33880]
-
-Thu Feb 21 14:49:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_set_encoding): uses current_file after check if next
-	  input is available.
-
-Thu Feb 21 14:13:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_putc): invoke stdout method so that redefining putc
-	  may take effect.   [ruby-talk:291844]
-
-	* io.c (rb_f_puts): ditto.
-
-Thu Feb 21 11:10:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 22 16:09:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c: replace rb_enc_copy by rb_enc_cr_str_copy or
-	  rb_enc_cr_str_exact_copy.
-
-Thu Feb 21 10:35:04 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_asciicompat): dummy encoding is not
-	  ascii compatible. [ruby-dev:33878]
+	* bignum.c (rb_big_lshift, rb_big_rshift, rb_big_aref): removed excess
+	  arguments.
 
 Thu Feb 21 00:01:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -6951,29 +2386,6 @@ Wed Feb 20 23:55:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_map_errno): exported.
 
-Wed Feb 20 23:28:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/readline/extconf.rb (rl_event_hook): workaround for native
-	  windows.
-
-Wed Feb 20 19:42:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_enc_associate_index): doesn't clear coderange
-	  when new encoding equals to old one.
-
-Wed Feb 20 19:15:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_str_copy): added for wrapper for rb_enc_copy.
-	  this also copy coderange when ptr and len is equal.
-
-	* string.c (rb_enc_cr_str_copy): added for wrapper for rb_enc_copy.
-	  this always copy coderange.
-
-	* string.c (str_replace_shared): use rb_enc_str_copy.
-
-	* string.c (str_new3): don't rb_enc_copy because encoding is copied
-	  at str_replace_shared.
-
 Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (parse_args): added --dir-mode, --script-mode and
@@ -6983,7 +2395,7 @@ Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  type, for compiled files and script files.
 
 	* instruby.rb (parse_args): deal with make style command line macros,
-	  and count as long style options if prefixed with INSTALL_.
+	  and count as long syle options if prefixed with INSTALL_.
 
 	* instruby.rb (makedirs): use $dir_mode.  [ruby-dev:33805]
 
@@ -6993,21 +2405,6 @@ Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* instruby.rb (bin-comm): installs scripts with replacing shebang
 	  lines.
 
-Wed Feb 20 10:04:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (open_key_args): set arg->io even if no options passed.
-	  [ruby-dev:33072]
-
-Tue Feb 19 21:11:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_strlen_cr): get length with coderange scan.
-
-	* string.c (str_strlen): use rb_enc_strlen_cr. [ruby-dev:33849]
-
-Tue Feb 19 20:49:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_raise_jump): moved adjustment for control frame.
-
 Tue Feb 19 18:34:32 2008  Tanaka Akira  <akr@fsij.org>
 
 	* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]
@@ -7017,272 +2414,39 @@ Tue Feb 19 14:27:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/readline/readline.c (readline_event): prevent polling.  based on
 	  a patch from error errorsson in [ruby-Bugs-17675].
 
-Tue Feb 19 11:14:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_exec_node): no thread starts inside iseq compilation.
-
-	* eval.c (rb_f_raise): skip current control frame.  [ruby-core:15589]
+Tue Feb 19 12:08:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* insns.def (opt_div): raise as the ordinary method. [ruby-core:15589]
+	* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
 
-Mon Feb 18 15:16:30 2008  Tanaka Akira  <akr@fsij.org>
+Mon Feb 18 16:23:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_each_line): fix newline size.
-
-Mon Feb 18 13:06:37 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/irb/locale.rb (IRB::Locale#lc2kconv): check ja_JP.EUC-JP as well.
-
-Mon Feb 18 11:51:19 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (re_warn): defined to restore warnings for /[a-c-e]/, etc.
+	* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
 
 Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
 	  [ruby-Bugs-17940]
 
-Mon Feb 18 00:33:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_regsub): don't repeat repl twice with
-	  "X".sub!(/./, sprintf("\\%c", 255)).
-
-Sun Feb 17 23:06:55 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]
-
-Sun Feb 17 21:38:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]
-
-	* string.c (rb_str_times): fix broken case. [ruby-dev:33826]
-
-Sun Feb 17 20:45:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_prepare_re): add enable_warning parameter.
-	  (rb_reg_adjust_startpos): disable warning by rb_reg_prepare_re.
-	  (rb_reg_search): follow rb_reg_prepare_re parameter change.
-
-Sun Feb 17 20:12:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_regexp.rb: add tests to achieve over 90% test
-	  coverage of re.c.
-
-Sun Feb 17 15:25:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (ENC_CODERANGE_AND): added.
-
-	* string.c (rb_str_plus, rb_str_times): keep coderange.
-
-	* parse.y (STR_NEW0) use rb_usascii_str_new.
-
-Sun Feb 17 14:07:24 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (str_strlen): rb_enc_strlen doesn't fail.
-
-Sun Feb 17 13:03:48 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (str_sublen): use rb_enc_strlen.
-
-Sun Feb 17 12:17:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/{euc_jp.c,gbk.c,iso_8859_1.c,iso_8859_11.c,iso_8859_13.c,
-	  iso_8859_2.c,iso_8859_6.c,iso_8859_7.c,iso_8859_8.c,iso_8859_9.c,
-	  shift_jis.c,windows_1251.c}: add document about encodings.
-
-	* enc/cp949.c: divided into new file.
-
-Sun Feb 17 10:59:04 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_quote): return US-ASCII string consistently.
-
-Sun Feb 17 09:17:08 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_times): reduce loop overhead.
-
-Sun Feb 17 03:37:01 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/re.h (struct rmatch_offset): new struct for character
-	  offsets.
-	  (struct rmatch): new struct.
-	  (struct RMatch): reference struct rmatch.
-	  (RMATCH_REGS): new macro.
-
-	* re.c (match_alloc): initialize struct rmatch.
-	  (pair_byte_cmp): new function.
-	  (update_char_offset): update character offsets.
-	  (match_init_copy): copy regexp and character offsets.
-	  (match_sublen): removed.
-	  (match_offset): use update_char_offset.
-	  (match_begin): ditto.
-	  (match_end): ditto.
-	  (rb_reg_search): make character offset updated flag false.
-	  (match_size): use RMATCH_REGS.
-	  (match_backref_number): ditto.
-	  (rb_reg_nth_defined): ditto.
-	  (rb_reg_nth_match): ditto.
-	  (rb_reg_match_pre): ditto.
-	  (rb_reg_match_post): ditto.
-	  (rb_reg_match_last): ditto.
-	  (match_array): ditto.
-	  (match_aref): ditto.
-	  (match_values_at): ditto.
-	  (match_inspect): ditto.
-
-	* string.c (rb_str_subpat_set): use RMATCH_REGS.
-	  (rb_str_sub_bang): ditto.
-	  (str_gsub): ditto.
-	  (rb_str_split_m): ditto.
-	  (scan_once): ditto.
-
-	* gc.c (obj_free): free character offsets.
-
-Sun Feb 17 03:13:40 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/resource.rb: made version infos confirm to OS spec.
-
-	* {bcc32,win32}/Makefile.sub (*.rc): add dependency.
-
-Sat Feb 16 20:49:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_substr): optimized for UTF-8.
-
-Sat Feb 16 18:13:53 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_compatible): check encoding incapable arguments.
-
-Sat Feb 16 20:12:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (match_inspect): avoid SEGV with MatchData.allocate.inspect.
-
-Sat Feb 16 19:04:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_strlen): revert r15507. [ruby-dev:33810]
-
-Sat Feb 16 18:25:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_strlen): little more optimization.
-	  (rb_enc_nth): remove needless variable 'c'.
-
-Sat Feb 16 18:00:13 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_compatible): empty strings are always compatible.
-
-	* string.c (rb_enc_cr_str_buf_cat): ditto.
-
-Sat Feb 16 16:14:35 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_enc_strlen): UTF-8 character count moved to str_strlen.
-	  (str_strlen): UTF-8 character count is only applicable for valid
-	  UTF-8 string.  [ruby-dev:33807]
-
-Sat Feb 16 13:16:49 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_sub_bang): stringize replacing hash values.
-	  (str_gsub): ditto.
-
-Sat Feb 16 13:01:33 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_enc_strlen): add search_nonascii like character
-	  counter for UTF-8.
-
-Sat Feb 16 11:53:35 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_strlen): moved to string.c.
-
-	* string.c (rb_enc_strlen): use search_nonascii.
-	  (str_strlen): don't use search_nonascii.
+Fri Feb 15 20:37:06 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Sat Feb 16 11:45:31 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/require_relative.rb: check require_relative call in eval.
-
-Sat Feb 16 08:00:01 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ruby.c (process_options): set default_external before loading
-	  libraries. [ruby-dev:33801]
-
-Sat Feb 16 05:49:54 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/iso_8859_{4,13}.c: Windows-1257 is replica of ISO-8859-13.
-
-	* string.c (single_byte_optimizable): rb_enc_mbminlen must be 1
-	  when rb_enc_mbmaxlen is 1.
-
-Sat Feb 16 03:43:18 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_nth): moved to string.c.
-
-	* string.c (rb_enc_nth): moved from string.c.  use search_nonascii
-	  for ASCII compatible string.
-	  (str_nth): wrong optimization removed to fix
-	  "a".force_encoding("EUC-JP").slice!(0,10) returns
-	  "a\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-
-Sat Feb 16 00:21:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (rb_range_beg_len): check if responds to "begin" and "end"
-	  methods for non-Range object.
-
-Fri Feb 15 20:29:42 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_init_cp): initialize WIN32OLE.codepage
-	  according to Encoding.default_external.
-
-	* test/win32ole/test_win32ole.rb: ditto.
-
-Fri Feb 15 19:31:23 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/node.h (NODE_FL_NEWLINE): renamed from NODE_NEWLINE
-	  to denote its a flag.  [ruby-core:15529]
-
-Fri Feb 15 18:23:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_sub_bang, str_gsub): allows hash for replacement.
-
-Fri Feb 15 17:12:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_strlen): use search_nonascii() for performance.
-
-	* string.c (str_nth): ditto.
-
-Fri Feb 15 16:22:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (open_key_args): allow specifying both :mode and :encoding.
+	* lib/rational.rb (floor, ceil, truncate, round): do not use
+	  definitions of Numeric.
 
-Fri Feb 15 15:34:47 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/rational.rb (to_i): should returns truncated self.
 
-	* string.c (rb_str_getbyte): new method.
-	  (rb_str_setbyte): new method.
+	* lib/complex.rb (numerator): requires
+	  Integer#{numerator,denominator}.
 
-Fri Feb 15 15:29:03 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/complex.rb (quo): do not use definition of Numeric.
 
-	* lib/require_relative.rb: new file.
+	* lib/complex.rb (div, divmod, floor, ceil, truncate, round):
+	  undef'ed.
 
 Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
 	  Daniel Luz at [ruby-Bugs-17910].
 
-Fri Feb 15 10:35:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_quote): set US-ASCII for ASCII-only string.
-	  [ruby-dev:33785]
-
-Fri Feb 15 10:27:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {win,bcc}32/Makefile.sub (config.h): added HAVE_FTRUNCATE.
-	  [ruby-dev:33786]
-
-Fri Feb 15 09:44:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_compile_gen): reg_fragment_setenc might not raise an
-	  exception before rb_reg_compile.
-
-Fri Feb 15 07:37:40 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
-
 Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ftruncate): check if available.
@@ -7296,33 +2460,15 @@ Fri Feb 15 02:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
 	  available.
 
-Thu Feb 14 23:56:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_error.c (error_print): append a newline to rest lines.
-
-	* parse.y (reg_compile_gen): appends error message from
-	  rb_reg_compile() to one from reg_fragment_setenc().
-
-Thu Feb 14 21:00:14 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_reopen): check STDIN, STDOUT and STDERR mode according to
-	  stdio streams.
+Thu Feb 14 17:44:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Feb 14 16:07:40 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_math.rb: actual-expected argument ordering for
-	  test_math.rb fixed.  a patch from Tadashi Saito
-	  <shiba AT mail2.accsnet.ne.jp> in [ruby-dev:33770].
+	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
+	  Yoshiki <ikoma AT mb.i-chubu.ne.jp> in [ruby-dev:33776].
 
 Thu Feb 14 16:02:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_utime): inhibits with secure level 2 or higher.
 
-Thu Feb 14 12:30:02 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_preprocess_dregexp): use non-preprocessed regexp source
-	  for result.
-
 Thu Feb 14 01:43:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
@@ -7334,186 +2480,15 @@ Thu Feb 14 00:49:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (parse_args): added --data-mode and --prog-mode options.
 
-Thu Feb 14 00:02:19 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* eval.c (eval): allow to eval in a binding that has a singleton method.
-	  [ruby-dev:33763]
-
-	* test/ruby/test_proc.rb: add tests to achieve over 70% test coverage
-	  of proc.c.
-
-	* test/ruby/test_method.rb: ditto.
-
-Wed Feb 13 22:46:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pathname.rb (Pathname#sub_ext): new method.  [ruby-list:44608]
-
-Wed Feb 13 21:50:32 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* proc.c (proc_curry): new method. [ruby-dev:33676]
-
-	* test/ruby/test_proc.rb: add tests for above.
-
-Wed Feb 13 20:48:50 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (RObject): add iv_index_tbl for shortcut of
-	  RCLASS_IV_INDEX_TBL(rb_obj_class(obj)).
-	  (ROBJECT_IV_INDEX_TBL): defined.
-
-	* object.c (init_copy): initialize iv_index_tbl in struct RObject.
-
-	* variable.c (ivar_get): use ROBJECT_IV_INDEX_TBL.
-	  (rb_ivar_defined): ditto.
-	  (obj_ivar_each): ditto.
-	  (rb_obj_remove_instance_variable): ditto.
-	  (rb_ivar_set): update iv_index_tbl in struct RObject.
-
-Wed Feb 13 16:21:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
-	  escapes. [ruby-dev:33726]
-
-	* bootstraptest/test_method.rb, enc/depend, instruby.rb, lib/mkmf.rb,
-	  mkconfig.rb: revert r15443. ditto.
-
-Wed Feb 13 11:20:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/depend: fix typo.
-
-	* lib/mkmf.rb: revert r15443. "\\1#{sep}\\2" is wrong if sep is ended
-	  with "\\".
-
-Wed Feb 13 08:57:21 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/markup/inline.rb:  Allow inline markup to have a leading
-	  '#' or '\', or trailing punctuation.  i.e. *#freeze?*, *\foo?*.
-
-Wed Feb 13 07:21:23 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/to_html_hyperlink.rb:  Moved linking to to_html.rb, move
-	  crossref to to_html_crossref.rb
-
-Wed Feb 13 04:15:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (arg_concat_gen, arg_append_gen): optimize for array push.
-
-	* parse.y (arg_concat_gen): optimize for array concat.
-
-	* parse.y (arg_add_gen): removed since identical to arg_append_gen.
-
-Tue Feb 12 21:04:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (exc_list): should use mrhs if non array.
-
-Tue Feb 12 20:32:50 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/rational.rb (floor, ceil, truncate, round): do not use
-	  definitions of Numeric.
-
-	* lib/rational.rb (to_i): should returns truncated self.
-
-	* lib/complex.rb (numerator): requires
-	  Integer#{numerator,denominator}.
-
-	* lib/complex.rb (quo): do not use definition of Numeric.
-
-	* lib/complex.rb (>, >=, <, <=, between?, div, divmod, modulo,
-	  floor, ceil, truncate, round): undef'ed.
-
-	* lib/mathn.rb (Rational#inspect): removed.
-
-Tue Feb 12 16:48:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (args, mrhs): flattens literal array splats.
-
-	* parse.y (exc_list): splat literal array.
-
-Tue Feb 12 15:27:19 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bootstraptest/runner.rb, bootstraptest/test_method.rb, enc/depend,
-	  instruby.rb, lib/mkmf.rb, lib/test/unit/util/procwrapper.rb,
-	  mkconfig.rb, sample/test.rb, template/vm.inc.tmpl,
-	  test/ruby/test_stringchar.rb: fixes around String#gsub.
-
-
-Tue Feb 12 15:11:47 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json/lib/json/pure/generator.rb,
-	  ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb,
-	  ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb,
-	  lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb,
-	  lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb,
-	  lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb,
-	  lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb,
-	  lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb,
-	  lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb,
-	  lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb,
-	  lib/yaml/encoding.rb: performance tuning around String#gsub.
-
-Tue Feb 12 12:16:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_hash_cmp): lighter version of rb_str_cmp() for
-	  hash comparison function.
-
-	* hash.c (rb_any_cmp): use rb_str_hash_cmp().
-
-	* string.c (rb_str_casecmp): should return nil for incompatible
-	  comparison.
-
-Tue Feb 12 12:13:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* instruby.rb: specify file mode to install.  a patch from
-	  pegacorn  <subscriber.jp AT gmail.com> in [ruby-dev:33699].
-
-Tue Feb 12 11:38:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (rb_num_coerce_bin): add ID argument to specify
-	  caller's method name.  [ruby-dev:33663]
-
-	* numeric.c (rb_num_coerce_cmp): ditto.
-
-	* numeric.c (rb_num_coerce_relop): ditto.
-
-	* ext/bigdecimal/bigdecimal.c (DoSomeOne): add function name argument.
-
-Tue Feb 12 10:25:02 2008
-
-	* lib/rdoc/rdoc.rb:  Wrap parse_files' read in version check for
-	  backwards compatibility.
+Tue Feb 12 11:33:26 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Tue Feb 12 10:15:14 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/erb/test_erb.rb(TestERBCore): import from erb-2.0.4.
 
-	* ruby.c (load_file): enc must effect source encoding.
-	  [ruby-core:15496]
+	* test/erb/hello.erb: ditto
 
-Tue Feb 12 10:16:47 2008  Eric Hodel  <drbrain@segment7.net>
+Mon Feb 11 17:25:21 2008  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/rdoc/ri/paths.rb:  Restore require rubygems check.
-
-Tue Feb 12 02:42:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_include): specialize single character string
-	  case (e.g. (?a ..?z).include(?x)) for performance.
-	  [ruby-core:15481]
-
-	* string.c (rb_str_upto): specialize single character case.
-
-	* string.c (rb_str_hash): omit coderange scan for performance.
-
-	* object.c (rb_check_to_integer): check Fixnum first.
-
-	* object.c (rb_to_integer): ditto.
-
-	* string.c (rb_str_equal): inline memcmp to avoid unnecessary
-	  rb_str_comparable().
-
-	* parse.y (rb_intern2): use US-ASCII encoding.
-
-	* parse.y (rb_intern_str): ditto.
-
-Mon Feb 11 17:21:18 2008  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb:
+	* lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb, NEWS:
 	  0.2.3 -> 0.2.4.
 
 	* lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
@@ -7524,86 +2499,28 @@ Mon Feb 11 17:21:18 2008  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss/maker/0.9.rb, test/rss/test_maker_0.9.rb:
 	  RSS::Maker.make("0.9") generates RSS 0.92 not RSS 0.91.
 
-Mon Feb 11 10:43:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ruby.c (load_file): the encoding of DATA follows the source
-	  file encoding. [ruby-dev:33693]
-
-Mon Feb 11 06:50:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_pack.rb: fix tests for 64bit CPU.
+Mon Feb 11 16:57:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* test/ruby/test_bignum.rb: ditto.
-
-	* test/ruby/test_file_exhaustive.rb: ditto.
-
-	* test/ruby/test_integer.rb: ditto.
+	* ChangeLog: format-time-string under C locale. [ruby-dev:33261]
 
-	* test/ruby/test_time.rb: ditto.
+Mon Feb 11 16:31:47 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
-	* test/ruby/test_numeric.rb: ditto.
+	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
+	  Submitted by Sylvain Joyeux [ruby-core:12099].
 
-	* test/ruby/test_fixnum.rb: ditto.
+	* ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
+	  Slightly modified fix bassed on a patch by Sylvain Joyeux
+	  [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
+	  [ ruby-patches-13151 ].
 
-Mon Feb 11 00:18:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb 11 00:22:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
 
-Sun Feb 10 21:58:32 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (encdb, transdb): depend on $(PREP).
-
-Sun Feb 10 16:58:20 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*, test/rubygems*, gem_prelude.rb: Import RubyGems
-	  r1601.  [ruby-core:15381]
-
-Sun Feb 10 15:07:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (MISSING): added cbrt.obj.
-
-Sun Feb 10 12:58:33 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/code_objects.rb: Make some attributes accessible for reuse.
-	* lib/rdoc/generator/html.rb: Pull out ContextUser classes and related
-	  methods for reuse.
-	* lib/rdoc/generator.rb: Move ContextUser classes to
-	  RDoc::Generator::Context for reuse.
-	* lib/rdoc/rdoc.rb: Make RDoc::RDoc initialization a little easier.
-	* lib/rdoc/options.rb: Make RDoc::Options easier to use without
-	  parsing an ARGV.
-	* lib/rdoc/markup/to_*.rb: Subclass RDoc::Markup::Formatter.
-	* lib/rdoc/markup/formatter.rb: Add RDoc::Markup::Formatter to make
-	  RDoc markup conversion easier.
-	* lib/rdoc/markup/fragments.rb: Make RDoc::Markup::ListItem easier to
-	  test.
-	* lib/rdoc/markup/to_html_hyperlink.rb: Pulled out of the HTML
-	  generator for easier reusability.
-	* lib/rdoc/markup.rb: Fix bug with labeled lists containing bullet
-	  lists.
-	* lib/rdoc/generators/html/html.rb: Fix Constant display.
-
-Sat Feb  9 23:44:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/tgamma.c (tgamma): use lgamma_r if available.
-
 Sat Feb  9 23:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/extconf.rb: simplified the condition.
 
-Sat Feb  9 21:20:28 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_math.rb: add tests for Math.gamma, Math.lgamma and
-	  Math.cbrt, and use assert_in_delta instead of assert.
-
-Sat Feb  9 18:34:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* math.c (math_cbrt): new method Math.cbrt.
-
-	* configure.in (cbrt): check for replacement functions.
-
-	* missing/cbrt.c: new file.
-
 Sat Feb  9 17:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
@@ -7613,165 +2530,15 @@ Sat Feb  9 17:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/extconf.rb: ditto.  [ruby-dev:33658]
 
-Sat Feb  9 12:06:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/tgamma.c (tgamma): add error check.
-
-Sat Feb  9 11:47:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* math.c (math_gamma): add error check.
-	  (math_lgamma): ditto.
-
-Sat Feb  9 11:09:26 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/lgamma_r.c (lgamma_r): return HUGE_VAL for non-positive
-	  integers.
-
-Sat Feb  9 10:03:07 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_new4): copy encoding from orig, instead of shared
-	  one.
-
-Sat Feb 09 01:01:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (lchmod_internal): fix warning cast from pointer to integer of
-	  different size.
-
 Sat Feb  9 00:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
 	  SystemExit and SignalException.  [ruby-core:15359]
 
-Fri Feb  8 23:51:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/lgamma_r.c (lgamma_r): use smaller argument for sin function.
-
-Fri Feb  8 22:10:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI.open_http): rescue URI::InvalidURIError by
-	  URI.parse for location URI.
-
-Fri Feb  8 19:22:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (rb_str_derive): uses rb_str_subseq() for byte
-	  length.  [ruby-dev:33653]
-
-	* ext/iconv/iconv.c (iconv_convert): added toidx argument to set
-	  encoding of successfully converted string.  [ruby-dev:33221]
-
 Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (xsystem): expand macros like as make.
 
-Fri Feb  8 09:27:57 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rdoc/ri/driver.rb (read_yaml): remove SM* for compatibility.
-
-Fri Feb  8 00:07:24 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_hash.rb: follow the change of Hash#flatten.
-
-	* test/ruby/test_time.rb: add tests to achieve over 70% test coverage
-	  of time.c.
-
-	* test/ruby/test_prec.rb: ditto over 90% for prec.c.
-
-Thu Feb  7 19:11:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_dup): reverted unneeded change.  [ruby-dev:33634]
-
-	* string.c (rb_str_replace): makes frozen shared string before
-	  sharing.
-
-Thu Feb  7 16:33:51 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_reopen): don't change access mode for stdin, stdout and
-	  stderr.  [ruby-core:15360]
-
-Thu Feb  7 16:33:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_replace_shared): replaces string with sharing.
-
-	* string.c (rb_str_new4, rb_str_associate, rb_str_associated): allows
-	  associated strings shared.
-
-	* string.c (rb_str_dup, rb_str_substr, rb_str_replace): shares memory.
-	  [ruby-core:15400]
-
-Thu Feb  7 15:42:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_end_with): compares with the suffix.
-
-Thu Feb  7 15:03:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/korean.c: add support for CP949 by Park Ji-In.
-	  [ruby-dev:33626]
-
-Thu Feb  7 11:11:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/lgamma_r.c (lgamma_r): some compilers don't permit dividing
-	  by literal 0.0. use const variable instead.
-
-	* {bcc32,win32,wince}/Makefile.sub (MISSING): add lgamma_r.obj and
-	  tgamma.obj.
-
-Thu Feb  7 10:39:21 2008  Tanaka Akira  <akr@fsij.org>
-
-	* math.c (math_gamma): new method Math.gamma.
-	  (math_lgamma): new method Math.lgamma.
-
-	* include/ruby/missing.h (tgamma): declared unless HAVE_TGAMMA.
-	  (lgamma_r): declared unless HAVE_LGAMMA_R.
-
-	* configure.in (tgamma): check for replacement functions.
-	  (lgamma_r): ditto.
-
-	* missing/tgamma.c: new file.  based on gamma.c from
-	  "C-gengo niyoru saishin algorithm jiten" (New Algorithm handbook
-	  in C language) (Gijyutsu hyouron sha, Tokyo, 1991)
-	  by Haruhiko Okumura.
-
-	* missing/lgamma_r.c: ditto.
-
-	* LEGAL (missing/tgamma.c): describe as public domain.
-	  (missing/lgamma_r.c): ditto.
-
-Thu Feb  7 09:05:57 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_from_index): BINARY does not
-	  have in-bound encoding index.
-
-Thu Feb  7 04:26:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/korean.c: add EUC-KR conversion support by Park Ji-In.
-	  [ruby-dev:33621]
-
-Wed Feb  6 01:47:39 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_flatten): do not flatten recursively by default.
-	  [ruby-dev:33603]
-
-Wed Feb  6 00:50:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* insns.def (adjuststack): never use INC_SP with minus value because
-	  some compilers cannot deal it correctly. use DEC_SP instead.
-
-Wed Feb  6 00:48:41 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_hash.rb: add tests to achieve over 90% test coverage
-	  of hash.c.
-
-	* test/ruby/test_env.rb: ditto.
-
-Wed Feb  6 00:24:49 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* hash.c (env_rassoc): remove access to free'd environment on mswin32.
-
-Tue Feb  5 21:57:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm.c (rb_call_super): pass a passed block when super is called via
-	  rb_call_super.  [ruby-dev:33598]
-
 Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
@@ -7780,52 +2547,19 @@ Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  $NONINSTALLFILES.
 
 	* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
-	  temporary files.
-
-Mon Feb  4 21:52:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (DelegateClass): use define_method instead of
-	  module_eval to improve performance.  [ruby-dev:33586]
+	  temporary filse.
 
 Mon Feb  4 16:44:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L.
 	  [ruby-dev:33584]
 
-Mon Feb  4 14:51:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_enc_symname2_p): support "!", "!=" and "!~".
-	  [ruby-dev:33592]
-
-Mon Feb  4 13:58:42 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator.preserved, DelegateClass.methods): extend
-	  shouldn't be delegated. [ruby-dev:32987], etc.
-
-Mon Feb  4 08:59:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::[]): no more transition
-	  extend(CGI::Value).  a patch from <tommy AT tmtm.org> in
-	  [ruby-dev:33583].
-
-Sun Feb  3 21:13:13 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_numeric.rb: forgot to add this (at r15360).
-
-	* test/ruby/test_file_exhaustive.rb: add tests to achieve over 80% test
-	  coverage of file.c.
-
 Sat Feb  2 20:06:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
 	  a bit faster.  a patch from Alexander Dymo <dymo AT ukrpost.ua> in
 	  [ruby-core:15337].
 
-Sat Feb  2 17:40:21 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (time_cmp): Time.<=> no longer supports comparison with
-	  numeric. [ruby-core:15332]
-
 Sat Feb  2 09:53:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): disabled fat-binary support which confuses
@@ -7834,11 +2568,6 @@ Sat Feb  2 09:53:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  after builds for each archs.  Anyway, config.h and rbconfig.rb must
 	  be separated definitely at least.
 
-Sat Feb  2 09:28:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* random.c (limited_big_rand): fix buffer overflow when SIZEOF_BDIGITS
-	  is 2.  fixed by Kenta Murata.  [ruby-dev:33565]
-
 Fri Feb  1 21:42:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
@@ -7847,312 +2576,33 @@ Fri Feb  1 21:42:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): ucontext on PowerPC MacOS X 10.5 is broken.
 
-Fri Feb  1 11:44:22 2008  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb (C_ESC): use octal escape to avoid
-	  "\x09for (;;) ..." to be interpret the first character 0x9f.
-
-Thu Jan 31 23:06:42 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_bignum.rb: suppress warnings during test.
-
-	* test/ruby/test_enum.rb: ditto.
-
-	* test/ruby/test_integer.rb: add tests to achieve over 90% test
-	  coverage of numeric.c.
-
-	* test/ruby/test_float.rb: ditto.
-
-	* test/ruby/test_fixnum.rb: ditto.
-
-	* test/ruby/test_numeric.rb: ditto.
-
-	* test/ruby/test_pack.rb: add tests to achieve over 90% test coverage
-	  of pack.c.
-
-Thu Jan 31 17:30:42 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* marshal.c (r_object0): no need to call r_entry for immediate values.
-
-Thu Jan 31 15:46:30 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rdoc/ri/formatter.rb (output): add accessor.
-
-	* lib/rdoc/ri/display.rb (page): replace @formatter.output instead of
-	  $stdout.
-
-Thu Jan 31 15:06:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* marshal.c (r_object0): call r_entry/r_leave to call proc when
-	  TYPE_FIXNUM, TYPE_NIL, TYPE_TRUE, TYPE_FALSE, TYPE_SYMBOL.
-
-Thu Jan 31 14:03:38 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rdoc/ri/display.rb (display_method_list, display_class_list):
-	  use @formatter.raw_print_line instead of puts.
-
-	* lib/rdoc/ri/driver.rb (select_methods): new method to collect all
-	  instance/class methods which match with passed pattern.
-
-	* lib/rdoc/ri/driver.rb (run): use class_cache's result directly
-	  instead of select_classes' because it's removed now.
-
-	* lib/rdoc/ri/driver.rb (run): search methods when passed name is not
-	  class name. [ruby-core:15309]
-
 Thu Jan 31 08:31:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (ext/extmk.rb, instruby.rb): inlined $(MAKE) so that can
 	  be executed even with -n.
 
-Thu Jan 31 06:24:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 31 07:00:19 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* io.c (rb_io_close_read): replaces fptr with the tied writer if
-	  duplex.
+	* lib/rinda/tuplespace.rb (bin_for_find): should find a symbol by
+	  Symbol class.
 
-	* io.c (rb_io_close_write): unties the tied IO for writing if duplex.
-	  [ruby-dev:33532]
+	* test/rinda/test_rinda.rb (test_symbol_tuple): ditto.
 
-Thu Jan 31 02:22:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jan 30 22:07:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* io.c (open_key_args): allow encoding key to take two encoding
-	  names.  a patch from <rubikitch AT ruby-lang.org>.  [ruby-dev:33540]
+	* lib/date.rb: refined deprecated methods.
 
-Thu Jan 31 02:15:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dsym): allow empty symbols.  [ruby-core:15248]
-
-Thu Jan 31 00:01:51 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (select_internal): fix SEGV by `select [STDIN],nil,[STDIN]'.
-	  fixed by Petr Chromec.
-	  http://rubyforge.org/tracker/index.php?func=detail&aid=17275&group_id=426&atid=1698
-
-Wed Jan 30 17:32:49 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/*.c: add GB12345, UCS-{2,4}{BE,LE}.
-
-Wed Jan 30 14:32:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rdoc/ri/driver.rb (cache_file_for): shouldn't use `:' in filename.
-
-Wed Jan 30 14:27:19 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_succ): use wrapped character as a carry for
-	  ASCII incompatible encoding.
-
-Wed Jan 30 12:26:59 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/utf_16be.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
-	  (UTF16_IS_SURROGATE_SECOND): ditto.
-	  (UTF16_IS_SURROGATE): defined.
-	  (utf16be_mbc_enc_len): validation implemented.
-
-	* enc/utf_16le.c (UTF16_IS_SURROGATE_FIRST): avoid branch.
-	  (UTF16_IS_SURROGATE_SECOND): ditto.
-	  (UTF16_IS_SURROGATE): defined.
-	  (utf16le_mbc_enc_len): validation implemented.
-
-Wed Jan 30 12:06:43 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jan 30 22:06:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* bignum.c (rb_cstr_to_inum): '0_2' is a valid representation.
 
-Wed Jan 30 11:57:50 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bootstraptest/runner.rb: fix -I../../hoge case.
-
-Wed Jan 30 01:25:16 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_range.rb: add tests to achieve over 90% test coverage
-	  of range.c.
-
-Wed Jan 30 00:09:37 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/euc_tw.c (euctw_mbc_enc_len): validation implemented.
-
-Tue Jan 29 22:58:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_enumerator.rb: add tests to achieve over 90% test
-	  coverage of enumerator.c.
-
-	* test/ruby/test_enum.rb: add for enum.c.
-
-Tue Jan 29 22:29:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* enumerator.c: fix documents.
-
-Tue Jan 29 22:27:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* range.c: fix SEGV by ("a" .. "z").step(2 ** 30) { }.
-
-Tue Jan 29 21:59:16 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/euc_tw.c (euctw_islead): 0x8e is a leading byte.
-
-Tue Jan 29 21:55:35 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* bignum.c: move object allocation out of blocking_region.
-	  [ruby-dev:33139]
-
-Tue Jan 29 20:37:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/make_transdb.rb: add for make transdb.h.
-
-	* dmytranscode.c: add for miniruby.
-
-	* enc/gbk.c (gbk_left_adjust_char_head, gbk_is_allowed_reverse_match):
-	  fix odd regexp match. [ruby-dev:33502]
-
-Tue Jan 29 20:17:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32}/Makefile.sub (MINIOBJS): add dmytranscode.$(OBJEXT).
-
-Tue Jan 29 19:39:40 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in, common.mk: fix rule for dmytranscode.o.
-
-Tue Jan 29 19:03:16 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
-
-	* common.mk: add rules for transdb.h.
-
-	* transcode.c (init_transcoder_table): use transdb.h.
-
-Tue Jan 29 18:05:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (encdb_{replicate,alias,dummy,declare}): define only if
-	  NO_ENCDB_H is not defined.
-
-Tue Jan 29 17:54:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/gbk.c (EncLen_gbk): too short. [ruby-dev:33497]
-
-Tue Jan 29 17:25:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* dmyencoding.c, encoding.c (enc_init_db, NO_ENCDB_H):
-	  miniruby doesn't use encdb.
-
-	* common.mk: encdb.h use miniruby.
-
-Tue Jan 29 17:37:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/gb18030.c (gb18030_mbc_enc_len): validation implemented.
-
-Tue Jan 29 17:01:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/ifchange: remove $temp when unchanged.
-
-Tue Jan 29 16:59:01 2008  Tanaka Akira  <akr@fsij.org>
-
-	* insns.def (toregexp): generate a regexp from strings instead of one
-	  string.
-
-	* re.c (rb_reg_new_ary): defined for toregexp.  it concatenates
-	  strings after each string is preprocessed.
-
-	* compile.c (compile_dstr_fragments): split from compile_dstr.
-	  (compile_dstr): call compile_dstr_fragments.
-	  (compile_dregx): defined for dynamic regexp.
-	  (iseq_compile_each): use compile_dregx for dynamic regexp.
-
-	  [ruby-dev:33400]
-
-Tue Jan 29 16:25:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk, ext/extmk.rb: always make encdb.h.
-
-Tue Jan 29 12:53:39 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/gbk.c: add GBK, CP936 and CP949.
-
-	* enc/euc_kr.c: remove CP949.
-
-	* enc/euc_cn.c: remove CP936 and rename to gb2312.c
-
-	* enc/gb2312.c: GB2312 is preferred MIME name.
-
-Tue Jan 29 03:01:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (reg_fragment_setenc_gen): US-ASCII script special code.
-
-	* parse.y (reg_fragment_check_len, reg_compile_gen): no need such
-	  trick.
-	  [ruby-dev:33399]
-
-	* test/ruby/test_m17n.rb (test_regexp_usacii_literal): add tests.
-
-Tue Jan 29 01:38:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk ($(srcdir)/revision.h): no need to show ifchange execution
-	  because ifchange echos updated or unchanged.
-
-Tue Jan 29 01:26:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (up): use last changed revision.
-
-	* common.mk (up): force to update revision.h.
-
-Tue Jan 29 00:12:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): should be US-ASCII.
-
-Tue Jan 29 00:10:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-set-encoding): updates magic comment.
-
-Mon Jan 28 23:47:52 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (rb_id2str, ripper_initialize, Init_ripper):
-	  use rb_usascii_str_new2. [ruby-dev:33449]
+Tue Jan 29 22:40:12 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-Mon Jan 28 19:37:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* range.c (step_i): rb_funcall receives VALUE as an argument.
 
-	* ext/win32ole/win32ole.c (ole_cp2encoding): new function.
+Tue Jan 29 11:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (ole_wc2vstr, ole_variant2val, fole_missing):
-	  set encoding to result.
-
-	* ext/win32ole/win32ole.c (fole_s_set_code_page, Init_win32ole): set
-	  default encoding.
-	  [ruby-dev:33433]
-
-Mon Jan 28 11:17:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c, parse.y, re.c: use rb_ascii8bit_encoding.
-
-Mon Jan 28 17:54:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_7.h: add dummy encoding UTF-7 and its alias CP65000.
-
-Mon Jan 28 17:41:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/utf_8.c: add alias CP65001.
-
-Mon Jan 28 15:33:23 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/big5.c (big5_mbc_enc_len): validation implemented.
-
-Mon Jan 28 13:02:02 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/euc_kr.c (euckr_mbc_enc_len): validation implemented.
-
-Mon Jan 28 11:24:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_str_new): encoding of UTF-8 literal string in
-	  US-ASCII script is UTF-8. [ruby-dev:33406]
-
-Mon Jan 28 10:25:59 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_m17n.rb (test_magic_comment): add test.
-
-Mon Jan 28 09:34:54 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (help): use double quotes for nmake.
-
-Mon Jan 28 00:39:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_set_encode): check if encoding is ASCII compatible.
+	* configure.in: rm largefile.h.
 
 Mon Jan 28 01:21:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -8165,635 +2615,42 @@ Mon Jan 28 01:21:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (next_argv): ditto.
 
-Sun Jan 27 23:33:35 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): fix for left justify flag.
-
-	* sprintf.c (rb_str_format): zero-precision zero bug revised.
-	  [ruby-dev:33419]
-
-Sun Jan 27 23:20:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/oniguruma.h: precise mbclen API redesigned to avoid
-	  inline functions.
-	  (onigenc_mbclen_charfound): removed.
-	  (onigenc_mbclen_needmore): removed.
-	  (onigenc_mbclen_recover): removed.
-	  (ONIGENC_MBCLEN_CHARFOUND): removed.
-	  (ONIGENC_MBCLEN_CHARFOUND_P): defined.
-	  (ONIGENC_MBCLEN_CHARFOUND_LEN): defined.
-	  (ONIGENC_MBCLEN_INVALID): removed.
-	  (ONIGENC_MBCLEN_INVALID_P): defined.
-	  (ONIGENC_MBCLEN_NEEDMORE): removed.
-	  (ONIGENC_MBCLEN_NEEDMORE_P): defined.
-	  (ONIGENC_MBCLEN_NEEDMORE_LEN): defined.
-	  (ONIGENC_MBC_ENC_LEN): use onigenc_mbclen_approximate.
-
-	* regenc.c (onigenc_mbclen_approximate): defined.
-
-	* include/ruby/encoding.h (MBCLEN_CHARFOUND): removed.
-	  (MBCLEN_INVALID): removed.
-	  (MBCLEN_NEEDMORE): removed.
-	  (MBCLEN_CHARFOUND_P): defined.
-	  (MBCLEN_INVALID_P): defined.
-	  (MBCLEN_NEEDMORE_P): defined.
-	  (MBCLEN_CHARFOUND_LEN): defined.
-	  (MBCLEN_NEEDMORE_LEN): defined.
-
-	* encoding.c: use new API.
-
-	* re.c: ditto.
-
-	* string.c: ditto.
-
-	* parse.y: ditto.
-
-Sun Jan 27 22:55:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (value_expr_gen): reverted r12880.  [ruby-dev:33388]
-
-Sun Jan 27 22:33:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): fix for octal with precision.
-	  [ruby-dev:33411]
-
-Sun Jan 27 22:31:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-set-encoding): automatically insert
-	  encoding magic comment.
-
-	* misc/ruby-mode.el (ruby-mode): set ruby-mode-set-encoding to buffer
-	  local before-save-hook.
-
-Sun Jan 27 19:51:15 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_inspect): avoid exception by
-	  "\#\xa1".force_encoding("euc-jp").inspect.
-
-Sun Jan 27 19:07:33 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_succ): warning suppressed.
-
-Sun Jan 27 18:18:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (help): show major targets.
-
-Sun Jan 27 17:54:48 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c: raise error when no output encoding is given.
-
-Sun Jan 27 17:20:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_succ): don't increment/decrement codepoint.
-
-Sun Jan 27 16:03:42 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex#buf_input): use chars.to_a.
-
-Sun Jan 27 16:27:22 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8: update nkf.
-
-Sun Jan 27 16:25:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_source): set encoding as regexp encoding.
-
-Sun Jan 27 05:56:39 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_preprocess): force fixed encoding when ASCII
-	  incompatible source string.
-
-Sat Jan 26 23:46:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): zero-precision zero should be empty.
-	  [ruby-dev:33363]
-
-	* sprintf.c (rb_str_format): not prepend octal prefix to negative or
-	  zero value.  [ruby-dev:33363], [ruby-dev:33367]
-
-Sat Jan 26 23:42:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.
-
-Sat Jan 26 19:08:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c (w_object): dump string encoding in USERDEF.
-	  [ruby-dev:33401]
-
-Sat Jan 26 17:42:23 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): validate argument expr of "next"
-	  statement.
-
-	* bootstraptest/test_syntax.rb: add a test.
-
-Sat Jan 26 17:22:46 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h: fix to calculate correct stack depth
-	   at each instruction.
-
-Sat Jan 26 09:41:02 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rexml/doctype.rb, test/rss/test_maker_itunes.rb: replace
-	  multi-byte string.
-
-	* test/json/{test_json.rb, test_json_unicode.rb}:
-	  add magic comment.
-
-Sat Jan 26 09:30:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_usascii_encindex): added prototype.
-
-	* include/ruby/intern.h (rb_usascii_str_new, rb_usascii_str_new2):
-	  ditto.
-
-Sat Jan 26 09:17:13 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when
-	  empty string (len == 0).
-
-Sat Jan 26 03:41:53 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_initialize): set default script encoding as US-ASCII.
-
-	* ruby.c (load_file): ditto.
-
-	* ruby.c (process_options): set script encoding of -e from locale
-	  except when -K is specified.
-
-	* ruby.c (load_file): set script encoding of stdin from locale except
-	  when -K is specified. [ruby-dev:33375]
-
-Sat Jan 26 02:51:06 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h: fix stack pointer issues.
-	  calculate correct stack depth at compile time.
-
-	* insns.def (emptstack): remove it and add a new insn "adjuststack".
-
-	* bootstraptest/test_knownbug.rb: move/remove fixed test.
-
-	* bootstraptest/test_syntax.rb: ditto.
-
-Sat Jan 26 00:17:18 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_usascii_new{,2}: defined.
-	  (rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
-	  string.
-
-	* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
-	  (rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
-	  use rb_str_ascii_new.
-
-	* array.c (recursive_join, inspect_ary): ditto.
-
-	* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
-	  rb_mod_to_s): ditto.
-
-	* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
-	  env_clear, env_to_s, env_inspect): ditto.
-
-	* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
-
-	* bignum.c (rb_big2str): ditto.
-
-	* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
-	  file_inspect_join, Init_file): ditto.
-
-	* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
-
-Sat Jan 26 01:35:46 2008  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c (r_byte): use getbyte instead of getc.
-	  (marshal_load): ditto.
-	  [ruby-dev:33264]
-
-Sat Jan 26 00:43:40 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_io_getline_fast): don't care ASCII incompatible encoding.
-	  (prepare_getline_args): generate a newline according to IO encoding
-	  when necessary.
-	  (rb_io_getline_1): call rb_io_getline_fast only for ASCII
-	  compatible encoding.
-
-Fri Jan 25 21:49:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_buf_cat_ascii): use rb_enc_cr_str_buf_cat.
-
-Fri Jan 25 19:38:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (version.$(OBJEXT)): depends on $(srcdir)/revision.h.
-
-	* common.mk (revision.h): extracts revision number with ``svn info''.
+	* io.c (rb_io_s_foreach): ditto.
 
-	* common.mk (up): target to update from the repository.
+	* io.c (rb_io_s_readlines): ditto.
 
-	* Makefile.in, {win,bcc}32/Makefile.sub (IFCHANGE): tool to update a
-	  file if changed.
+	* io.c (rb_io_s_read): ditto.
 
-	* tool/ifchange: for unixen.
+Fri Jan 25 22:33:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* win32/ifchange.bat: some fix
-
-Fri Jan 25 17:12:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (load_file): set default to ASCII-8BIT explicitly if -K
-	  option is not given.
-
-Fri Jan 25 16:31:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h (rb_str_buf_cat_ascii): declared.
-
-	* string.c (rb_str_buf_cat_ascii): defined.
-
-	* re.c (rb_reg_s_union): use rb_str_buf_cat_ascii to support ASCII
-	  incompatible encoding.
-
-Fri Jan 25 16:11:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options, load_file, rb_load_file): propagates script
-	  encoding by -K to libraries.  [ruby-dev:33156]
-
-Fri Jan 25 15:56:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (cmdline_arguments): split argc and argv from cmdline_options.
-
-	* ruby.c (process_options): not set encoding of -e option from -E
-	  option if they are not compatible.
-
-Fri Jan 25 13:15:23 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (proc_options, process_options, load_file): shouldn't effect
-	  --encoding to script encoding. [ruby-dev:33169]
+	* math.c: fix comment.  [ruby-dev:33276]
 
 Fri Jan 25 10:31:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* */*.bat: set svn:mime-type to text/batch.
 
-Thu Jan 24 23:23:06 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* enum.c (enum_one, enum_take_while, enum_drop_while): fix documents.
-
-Thu Jan 24 21:46:24 2008  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (reg_fragment_setenc_gen): associate ASCII-8BIT only if
-	  str has only ASCII characters.
-
-Thu Jan 24 20:46:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_m17n.rb: follow to the following changes.
-
-Thu Jan 24 20:21:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parser.y (parser_str_new): automatically update string literal's
-	  encoding from US-ASCII to ASCII-8BIT when script encoding is US-ASCII
-	  and the string includes non-ascii bytes. [ruby-dev:33348]
-
-	* parser.y (reg_fragment_check_gen, reg_compile_gen): automatically
-	  update regexp literal's encoding from US-ASCII to ASCII-8BIT when
-	  script encoding is US-ASCII, the regexp has no kcode option and the
-	  regexp includes non-ascii bytes. [ruby-dev:33353]
-
 Thu Jan 24 19:36:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
 	  object_id with printf.  [ruby-dev:33347]
 
-Thu Jan 24 19:29:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (remove_sign_bits): returns pointer to the first char to
-	  be used, instead of copying.
-
-	* sprintf.c (rb_str_format): negative indicator dots should come
-	  before sign digits always.  [ruby-dev:33224]
-
-Thu Jan 24 18:19:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_is_newline): parenthesized arguments.
-
-Thu Jan 24 18:14:14 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_reg_fixed_encoding_p): no need to treat ASCII-8BIT specially.
-
-Thu Jan 24 16:53:06 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): 7bit clean regexp should be US-ASCII.
-	  [ruby-dev:33346]
-
-Thu Jan 24 16:31:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_getline_fast): the end point of left_char_head()
-	  must be the last character.  [ruby-cvs:22445]
-
-Thu Jan 24 16:24:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (reg_fragment_setenc_gen): recognize regexp with option n as
-	  as ASCII-8BIT instead of US-ASCII. [ruby-dev:33339]
-
-Thu Jan 24 15:44:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (collect_bang_i): use rb_ary_store() to avoid potential
-	  memory corruption.  a patch from Yusuke Endoh <mame@tsg.ne.jp>
-	  in [ruby-dev:33328].
-
-	* array.c (ITERATE): remove unnecessary macro.
-
-	* array.c (sort_1): remove ary_sort_check().  in-place sort keep
-	  original elements even when it's modified.
-
-	* array.c (sort_2): ditto.
-
-Thu Jan 24 15:09:40 2008  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (make_time_t): revert round trip test.  [ruby-dev:33058]
-
-Thu Jan 24 11:14:56 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is
-	  not compatible with any other encoding.
-
-Thu Jan 24 07:34:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (STR_NEW0): set encoding as US-ASCII.
-
-Thu Jan 24 03:47:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rexml/text.rb, lib/rubygems/open-uri.rb, lib/open-uri.rb,
-	  test/logger/test_logger.rb, test/ruby/test_regexp.rb:
-	  fix tests. [ruby-dev:33336]
-
-Thu Jan 24 03:23:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_each_line): use memchr(3) for faster newline
-	  search.
-
-	* io.c (appendline): remove unused arguments
-
-	* io.c (rb_io_getline_fast): make much simpler (and faster).
-
-Thu Jan 24 02:13:07 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* insns.def (expandarray): fix stack inc.  [ruby-dev:32892]
-
-	* bootstraptest/test_knownbug.rb, test_massign.rb: move a fixed test.
-
-Thu Jan 24 01:00:34 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.{c, h} (rb_usascii_encoding): added.
-
-	* parse.y (parser_str_new, rb_intern3): ascii only string literal is
-	  US-ASCII.
-
-	* ruby.c (proc_optionc): -Kn means ASCII-8BIT.
-
-Wed Jan 23 23:54:40 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* sprintf.c: fix comment.  [ruby-dev:33275]
-
-	* math.c: fix comment.  [ruby-dev:33276]
-
-Wed Jan 23 22:47:34 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_struct.rb: add tests to achieve over 90% test
-	  coverage of struct.c.
-
-	* test/ruby/test_sprintf.rb: ditto for sprintf.c.
-
-	* test/ruby/test_math.rb: ditto for math.c.
-
-Wed Jan 23 22:14:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/japanese.c (rb_from_Windows_31J, rb_to_Windows_31J):
-	  provisional workaround for Windows-31J.  [ruby-dev:33320]
-
-Wed Jan 23 15:25:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_strftime): copy encoding from format.  [ruby-dev:33303]
-
-Wed Jan 23 15:04:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_make_independent): should set length.
-
-	* string.c (rb_str_associate): hide associated array from ObjectSpace.
-
-	* string.c (rb_str_associated): return associated array with freezing
-	  instead of false.  [ruby-dev:33282]
-
-	* string.c (rb_str_freeze): freeze associated array together.
-
-Wed Jan 23 13:39:48 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_prepare_re): fix SEGV by
-	  /a/ =~ "aa".force_encoding("utf-16be").
-
-Wed Jan 23 11:53:26 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_mod_check, str_nth, str_offset): constified.
-
-	* string.c (rb_str_dump): dump in ASCII-8BIT always.
-
-Wed Jan 23 10:18:10 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_method.c (rb_export_method): set ruby_vm_redefined_flag for
-	  visibility change as well.  reported by K.Kosako in
-	  http://d.hatena.ne.jp/kkos/20080122#1201012720.
-
-Tue Jan 22 22:26:23 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_bignum.rb: change some tests because rational
-	  redefines Bignum#quo and Bignum#**.
-
-Tue Jan 22 20:58:15 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): need to output sodir rule.
-
-Tue Jan 22 19:37:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): lib files shouldn't depend on install
-	  dir because if the dir is newer than lib files, lib files will be
-	  always copied.
-
-Tue Jan 22 17:52:52 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/trans/utf_16_32.c: Streamline parentheses, add more
-	  'static' qualifiers.
-
-Tue Jan 22 12:57:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in (MINIRUBY): remove -I$(EXTOUT)/$(arch) from
-	  MINIRUBY since miniruby might not be able to load DLL.
-
-	* test/ruby/test_m17n.rb: move tests from bootstrap test.
-
-	* encoding.c (enc_find): should check name if ASCII compatible.
-
-	* string.c (rb_str_end_with): should check character boundary.
-
-	* encoding.c (rb_enc_compatible): encoding must be ASCII
-	  compatible before checking ENC_CODERANGE_7BIT.
-
-	* encoding.c (rb_enc_compatible): wrong compatibility condition.
-	  [ruby-dev:33273]
-
-Tue Jan 22 09:26:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_each_char): iterates over a shadow.
-	  [ruby-dev:33243]
-
-Tue Jan 22 08:59:52 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/formatter.rb:  Indent labeled lists like note lists.
-
-	* test/rdoc/test_rdoc_ri_overstrike_formatter.rb:  Added.
-
-	* test/rdoc/test_rdoc_ri_formatter.rb:  Added tests.
-
-Tue Jan 22 04:40:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (rb_intern3): do not call rb_enc_mbclen() if *m is
-	  ASCII.  [ruby-talk:287225]
-
-	* string.c (rb_str_each_line): use rb_enc_is_newline() to gain
-	  performance if the record separator ($/) is not modified.
+Tue Jan 22 11:22:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Jan 22 01:15:51 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ChangeLog: format-time-string under C locale. [ruby-dev:33261]
-
-Tue Jan 22 00:45:12 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/ruby/test_bignum.rb: add tests for bignum.c.
-
-Tue Jan 22 00:30:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* bignum.c (big_shift): fix a bug that caused infinite loop when
-	  left shifting.
-
-Mon Jan 21 20:09:38 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (marshal_load): initialize the cache.
-
-Mon Jan 21 19:42:42 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
-	  added UTF-32BE and UTF-32LE conversions.
+	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
+	  a space will be inserted on the top of the line.
 
-Mon Jan 21 14:36:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (MKFILES): stop make process if Makefile is
+	  updated.
 
-	* transcode.c (str_transcode): initialize transcoder in
-	  rb_transcoding.  [ruby-dev:33234]
+Mon Jan 21 17:34:41 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* transcode_data.h (rb_transcoding): transcoder constified.
+	* io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding
+	  options for forward compatibility.
 
 Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
 
-Mon Jan 21 12:35:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_loop, str_transcoding_resize): use unsigned
-	  char.  [ruby-dev:33232]
-
-	* transcode_data.h (rb_transcoding, rb_transcoder): removed callback
-	  parameters.
-
-	* enc/trans/japanese.c: ditto.
-
-	* enc/trans/utf_16_32.c: parenthesized bit-or operands.
-
-Mon Jan 21 11:59:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_each_char): move forward.  [ruby-dev:33231]
-
-Mon Jan 21 06:40:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_dispatch): constified return value.
-
-	* transcode_data.h (rb_transcoding): include pointer to rb_transcoder
-	  and auxiliary data.
-
-	* transcode_data.h (rb_transcoder): all callback functions should have
-	  their own parameters.
-
-	* enc/trans/{japanese,single_byte}.c: constified.
-
-Mon Jan 21 03:45:49 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_each_char): advance offset before get next char
-	  length.  [ruby-dev:33211]
-
-Sun Jan 20 20:00:20 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c, enc/trans/utf_16_32.c, test/ruby/test_transcode.rb:
-	  added UTF-16LE conversions.
-
-	* fixed changelog for last commit
-
-Sun Jan 20 17:54:00 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* added changelog for last commit
-
-Sun Jan 20 15:08:08 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/trans/utf_16_32.c: new file, currently implementing
-	  UTF-16BE conversions only.
-
-	* test/ruby/test_transcode.rb: Added tests for UTF-16BE;
-	  made check_both_ways() use force_encoding differently.
-
-	* transcode_data.h, transcode.c: Support for more conversion
-	  functions.
-
-Sun Jan 20 13:06:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_each_char): performance improvement, and stop if
-	  shortened in the block.  [ruby-dev:33189]
-
-Sun Jan 20 09:12:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk: use -Ks when read insns.def. [ruby-dev#33185]
-
-	* parse.y: fix -e and stdin strings aren't set encoding.
-
-Sun Jan 20 05:12:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/make_encdb.rb: fix duplication check.
-
-Sun Jan 20 05:03:46 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ascii.c: remove definition of replica KOI8-U.
-
-Sun Jan 20 00:33:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/koi8_u.c: added.
-
-	* regenc.c, enc/utf_8.c, enc/unicode.c, enc/gb18030.c: add ARG_UNUSED.
-
-Sat Jan 19 22:41:39 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (coderange_scan): don't call mbclen functions for ASCII
-	  characters with ASCII compatible encoding.
-
-Sat Jan 19 21:00:34 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rdoc/template.rb (RDoc): defined to avoid uninitialized constant
-	  error by `./ruby test/rubygems/test_gem_server.rb'.
-
-Sat Jan 19 20:41:29 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (enc_new): don't free rb_encoding to avoid SEGV by
-	  `miniruby -e exit' on x86_64 GNU/Linux.
-
-Sat Jan 19 18:40:19 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (once): use an instance variable which points a hash
-	  as cache. [experimental]
-
-Sat Jan 19 17:21:29 2008  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: parse's hints as an
-	  experimental function has been removed.
-
 Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (sigsetjmp): check if available.
@@ -8805,192 +2662,7 @@ Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
 	  Corinna Vinschen in [ruby-Bugs-17018].
 
-Sat Jan 19 09:23:14 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_set_safe_array): should not use
-	  recursive calling.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-Sat Jan 19 08:58:47 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/markup: Remove ListBase and Line constants.
-
-	* lib/rdoc/ri: Allow output IO to be specified.
-
-	* test/rdoc/parser/test_parse_c.rb: Move up one level, fixed.
-
-	* test/rdoc/parser/test_rdoc_markup_attribute_manager.rb: Renamed to
-	  match new class name, updated to match new classes.
-
-	* test/rdoc/test_rdoc_ri_formatter.rb: Start of RI formatting tests.
-
-	* test/rdoc/test_rdoc_ri_attribute_manager.rb: Start of
-	  RDoc::RI::AttributeManager tests.
-
-	* test/rdoc/test_simple_markup.rb: Moved to match new class name.
-
-Sat Jan 19 08:35:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_prepare): get encoding from the first line.
-	  [ruby-dev:33168]
-
-	* ruby.c (load_file): set encoding to input with set_encoding.
-
-Sat Jan 19 03:46:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (thread_create_core): prohibit thread creation in the
-	  frozen thread group.  a patch in [ruby-dev:33176] from sheepman
-	  <sheepman AT sheepman.sakura.ne.jp>.
-
-	* thread.c (thread_create_core): should inherit ThreadGroup from
-	  the current thread.
-
-Sat Jan 19 00:37:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): set result encoding for wider width.
-
-Sat Jan 19 00:13:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (w32_wait_events): shouldn't invoke interrupt handle
-	  by timer_thread.
-
-Fri Jan 18 23:49:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_create_core): set thread group before creating
-	  thread.
-
-Fri Jan 18 20:19:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (ripper_initialize): too early to set parser->enc.
-
-Fri Jan 18 20:03:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak (BASERUBY): nmake cannot execute ruby correctly
-	  if the path of ruby.exe is quoted.
-
-	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
-	  a space will be inserted on the top of the line.
-
-Fri Jan 18 17:56:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h:
-	  prefixed include guards with RUBY.
-
-	* id.h: added include guard.
-
-	* regenc.h, regint.h, regparse.h: prefixed include guards with
-	  ONIGURUMA.
-
-Fri Jan 18 15:57:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_cleanup_func): ignore errors from destroying mutex
-	  of dead thread.  [ruby-core:15069]
-
-	* thread_pthread.c, thread_win32.c (native_thread_destroy): ditto.
-
-Fri Jan 18 15:56:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_name_list_i, rb_enc_aliases_enc_i): freeze
-	  element strings to be returned.
-
-Fri Jan 18 14:36:34 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_m17n.rb (test_str_dump): added test for
-	  String#dump. [ruby-dev:33142]
-
-Fri Jan 18 12:25:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (load_encoding): check if successfully loaded.
-
-	* encoding.c (rb_enc_find_index): use original encoding name to
-	  replicate loaded encoding instead alias.
-
-Fri Jan 18 09:43:02 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_char_to_option_kcode): Regexp switch `s' should mean
-	  Windows-31J, as wells as `-Ks'.
-
-Fri Jan 18 09:22:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
-
-	* parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
-
-	* parse.y (rb_parser_compile_string): set encoding from input string.
-
-	* encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
-	  encoding failed.
-
-	* parse.y (ripper_initialize): move parser->enc initialization.
-
-	* encoding.c (rb_enc_aliases_enc_i): exclude non alias names from
-	  Encoding.aliases.
-
-	* encoding.c (rb_enc_find_index): use original encoding name to
-	  load DLL.
-
-Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (Init_IO): stdin/stdout may not be duplex.
-
-Fri Jan 18 04:27:57 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* sample/rdoc/markup/rdoc2latex.rb:  Fix for new namespacing.
-
-	* lib/rdoc/markup/to_latex.rb:  Fix namespacing.
-
-Fri Jan 18 02:02:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/runner.rb (assert_valid_syntax): added.
-
-	* bootstraptest/test_knownbug.rb: added test for [ruby-list:44479]
-
-Fri Jan 18 01:48:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): check argument number to
-	  attr_reader.  [ruby-core:15120]
-
-Fri Jan 18 00:49:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_check_readable): flush tied write IO too.
-
-	* io.c (Init_IO): tie stdin with stdout.  [ruby-core:15107]
-
-Fri Jan 18 00:23:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_free): removed since rb_encoding may be used while
-	  cleanup.
-
-Fri Jan 18 00:17:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/euc_cn.c: split from enc/euc_kr.c.
-
-Fri Jan 18 00:03:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_init): use default external encoding
-	  if nothing is given.  a patch from sheepman <sheepman AT
-	  sheepman.sakura.ne.jp> in [ruby-dev:33159].
-
-Thu Jan 17 23:56:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encdb.h): give output file name to make_encdb.rb.
-
-	* encoding.c (enc_table): simplified.
-
-	* encoding.c (enc_register_at): lazy loading.  [ruby-dev:33013]
-
-	* regenc.h (ENC_DUMMY): added.
-
-	* enc/make_encdb.rb: now emits macros only.
-
-	* enc/iso_2022_jp.h: split from encoding.c.
-
-Thu Jan 17 21:48:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_char_to_option_kcode): fixed typo.
-
-Thu Jan 17 21:01:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Jan 17 21:06:01 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (Date::Infinity#<=>): didn't work.  A patch from
 	  Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
@@ -8999,132 +2671,10 @@ Thu Jan 17 21:01:25 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: some trivial changes.
 
-Thu Jan 17 13:07:18 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_dump): preserve the encoding of source string
-	  if it is ASCII compatible.  otherwise, add '.force_encoding()'
-	  for ugly work around.  maybe we should implement some other way
-	  to keep non ASCII encoding in dumped string.  [ruby-dev:33142]
-
-Thu Jan 17 10:30:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fwrite): always flush IO on tty, even without newlines.
-	  [ruby-core:15107]
-
-Wed Jan 16 22:45:27 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_register_at): make own copy.  [ruby-dev:33136]
-
-Wed Jan 16 18:03:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open, rb_io_s_popen): clear temporary object to release
-	  and prevent from GC.
-
-Wed Jan 16 17:55:07 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (fix_quo): typo. a patch from Shin-ichiro HARA
-	  <sinara AT blade.nagaokaut.ac.jp> in [ruby-dev:33130]
-
-Wed Jan 16 17:36:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/test_delegate.rb: add new test file for delegate.rb.
-
-Wed Jan 16 16:14:00 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.1: Fix grammar.
-
-Wed Jan 16 15:26:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (sys_fail2): get rid of unlimited alloca.
-
-	* io.c (mode_enc, pipe_open, rb_io_s_popen): ditto.
-
-	* load.c (rb_feature_p): ditto.
-
-	* object.c (rb_cstr_to_dbl): ditto.
-
-	* io.c (mode_enc): fixed uninitialized variable.
-
-Wed Jan 16 12:51:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_str_tmp_new, rb_str_shared_replace):
-	  prototype moved.
-
-Tue Jan 15 23:52:51 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/*: add ARG_UNUSED.
-
-	* enc/koi8_u.c: added.
-
-Tue Jan 15 23:00:08 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_{16,32}{be,le}.c: remove some ARG_UNUSED.  replace struct
-	  OnigEncodingST by OnigEncoding.
-
-Tue Jan 15 22:30:43 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (ENC_REGISTER): use &OnigEncoding*.
-	  (ENCINDEX_UTF_8): renamed from ENCINDEX_UTF8.
-	  (rb_enc_init): use ENC_REGISTER.
-
-	* include/ruby/oniguruma.h (OnigEncodingUTF8, ONIG_ENCODING_UTF8):
-	  removed.
-
-	* enc/*.c: remove use of &encoding_*; use enc argument instead.
-
-Tue Jan 15 18:44:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enc/utf_8.c: remove use of ONIG_ENCODING_UTF8 altogether; use
-	  enc argument instead.
-
-Tue Jan 15 18:05:26 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/utf_8.c (ONIG_ENCODING_UTF8): reverted.
-
-Tue Jan 15 18:01:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (MKFILES): add dependencies.
-
-Tue Jan 15 18:00:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enc/utf_8.c (OnigEncodingDefine): encoding name should be kept
-	  unchanged.
-
-Tue Jan 15 17:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/utf_8.c: renamed as IANA name.
-
-	* enc/Makefile.in: ditto.
-
-Tue Jan 15 16:59:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): encoding libraries cannot be loaded until
-	  load path is set.
-
 Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/setup.mak: strip out empty lines from CPP output.
 
-Tue Jan 15 14:57:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
-	  to get rid of ./ruby.exe.
-
-	* win32/enc-setup.mak: workaround for Borland make.
-
-Tue Jan 15 14:44:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_locale_charmap): use ASCII-8BIT in miniruby.
-
-Tue Jan 15 13:54:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32}/Makefile.sub (RUNRUBY): need to set archdir when
-	  invoking ruby.
-
-Tue Jan 15 13:43:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (us_ascii.o): add dependencies. [ruby-dev:33111]
-
 Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
@@ -9133,282 +2683,26 @@ Tue Jan 15 01:28:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk: simplified dummy objects dependencies.
 
-Tue Jan 15 01:19:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (OBJS): moved encoding.o from COMMONOBJS.
-
-	* common.mk (dmyencoding.o): added.  [ruby-dev:33099]
-
-	* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
-	  dmyencoding.o.
-
-	* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.
-
-Tue Jan 15 00:05:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (appendline): specifying limit should not generate broken
-	  byte sequence.  strings should be rounded.  [ruby-dev:33088]
-
-Mon Jan 14 23:33:02 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (Kconv.tolocale): argument is str.
-
-Mon Jan 14 23:31:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
-
-	* bootstraptest/runner.rb (main): expand -I directory path.
-
-Mon Jan 14 23:28:10 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
-
-Mon Jan 14 22:48:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
-	  of using fixed index value.
-
-	* enc/Makefile.in (encsrcdir): make US-ASCII built-in.
-
-Mon Jan 14 22:25:02 2008  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* golf_prelude.rb: Shorter method name completion.  Same method
-	  used for const missing. do_while and do_until added.  Enumerator
-	  gains all of Array's abilities. Ex:
-	    '123'.m{|i|i*2} #=> "112233"
-	    '123'.pe #=> '123'.perm*' ' #=> "123 132 213 231 312 321"
-	  base on a patch from Darren Smith <darrenks AT ml1.net>.
-
-Mon Jan 14 21:10:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enc/us_ascii.c: wrong alias name: ANSI_X3.4-1986.
-
-	* rubytest.rb: add -I#{srcdir} to load encoding DLL.
-
-Mon Jan 14 18:53:58 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c: clear thread structure.
-	  (TODO: survey that child process should clear mutex or not).
-
-	* bootstraptest/test_knownbug.rb, test_thread.rb: move a fixed test.
-
-Mon Jan 14 18:43:38 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: add "flunk" method.
-
-	* bootstraptest/test_knownbug.rb: fix to use flunk.
-
-Mon Jan 14 18:10:59 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h: remove dangerous assembler sentence.
-
-Mon Jan 14 18:06:37 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_locale_encoding): return US-ASCII when charmap is
-	  nil.
-
 Mon Jan 14 16:12:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/shellwords.rb: scape should be an alias to shellescape.  a
 	  patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
 	  [ruby-dev:33060].
 
-Mon Jan 14 16:09:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.1: a patch to describe --encoding.  a patch from Yugui
-	  <yugui AT yugui.sakura.ne.jp> in [ruby-dev:33079].
-
-	* ruby.c: ditto.
-
-Mon Jan 14 13:49:26 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_prepare_re): initialize error message buffer.
-	  (rb_reg_search): ditto.
-	  (rb_reg_check_preprocess): ditto.
-	  (rb_reg_new_str): ditto.
-	  (rb_enc_reg_new): ditto.
-	  (rb_reg_compile): ditto.
-	  (rb_reg_initialize_m): ditto.
-	  (rb_reg_s_union_m): ditto.
-
-Mon Jan 14 12:33:07 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/markup*:  Renamespace from SM::SimpleMarkup to
-	  RDoc::Markup.
-
-Mon Jan 14 10:45:45 2008  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/ascii.c: Exchanged order of arguments for one ENC_ALIAS
-
-Mon Jan 14 09:19:07 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Jan 14 09:32:40 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/time.rb: do not reference Time directly from the inside of
 	  definitions. [ruby-dev:33059]
 
-Mon Jan 14 05:44:44 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/*.c: add replicas and aliases.
-
-	* enc/make_encdb.h: add duplicate and undefined check.
-
-Mon Jan 14 02:03:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/oniguruma.h: remove ONIG_ENCODING_* and OnigEncoding*
-	  which are not builtin.
-
-	* regenc.{c,h} (onigenc_mb2_code_to_mbclen, onigenc_mb4_code_to_mbclen):
-	  fix prototype.
-
-	* enc/big5.c, enc/euc_kr.c, enc/euc_tw.c, enc/gb18030.c,
-	  enc/koi8_r.c, enc/windows_1251.c: imported from Oniguruma.
-
-Sun Jan 13 22:47:28 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/make_encdb.h: sort encoding names by original name.
-
-	* encoding.c, enc/*.c: define replicas and aliases.
-
-Sun Jan 13 20:24:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c: add documents.
-
-Sun Jan 13 18:41:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (Init_Encoding): moved initialization from encdb.h.
-
-	* enc/make_encdb.rb (enc_name_list): constified.
-
-	* enc/make_encdb.rb (enc_init_db): moved some functions to encoding.c.
-
-Sun Jan 13 13:53:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (load_file): local variable was not initialized when -x flag
-	  is given.
-
-	* ruby.c (load_file): script files should not be affected by locale.
-	  [ruby-dev:33054]
-
-Sun Jan 13 12:01:32 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/generators*: Reorganize RDoc generators.
-
-Sun Jan 13 11:41:11 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (ENCINDEX_EUC_JP, ENCINDEX_SJIS): removed.
-	  (rb_enc_init): EUC-JP and Shift_JIS are not builtin now.
-
-	* enc/Makefile.in: ditto.
-
-	* common.mk: ditto.
-
-	* ruby.c (proc_options): ditto.
-
-	* enc/shift_jis.c, enc/euc_jp.c: fixes for remove from builtin.
-
-Sun Jan 13 10:21:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_table): packed all enc_table stuff.
-
-Sun Jan 13 09:58:17 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_enc_init): revert removing SJIS.
-
-	* enc/sjis.c: move to enc/shift_jis.c, to make encoding name equal to
-	  filename for convenience of loading lib.
-
-	* enc/shift_jis.c: moved from enc/sjis.c.
-
-	* common.mk: follows enc/shift_jis.c.
-
-	* enc/Makefile.in: ditto.
-
-Sun Jan 13 09:22:33 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (incs): includes encdb.h.
-
-Sun Jan 13 09:17:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc,win}32/Makefile.sub (MV): use move instead of ren.  [ruby-Bugs-17019]
-
-Sun Jan 13 01:52:31 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enc/make_encdb.rb: should work on Ruby 1.8.  [ruby-dev:33069]
-
-	* common.mk (encdb.h): pass enc dir from outside to make_encdb.rb.
-
-Sun Jan 13 00:01:07 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/make_encdb.rb: added. search enc/*.c and make encoding database.
-
-	* regenc.h (ENC_REPLICATE, ENC_ALIAS): added for defining replica
-	  encoding and encoding alias.
-
-	* encoding.c (rb_enc_init): move alias definitions to enc/*.c.
-	  (rb_enc_find_index): search original of replica and alias when no
-	  encoding library.
-	  (rb_enc_name_list, rb_enc_aliases_enc_i, rb_enc_aliases_str_i,
-	   rb_enc_aliases, Encoding.name_list, Encoding.aliases): added.
-	  (Init_Encoding): init encdb.
-
-	* enc/ascii.c, enc/us_ascii.c, enc/euc_jp.c, enc/sjis.c:
-	  add replica encoding and encoding alias definition.
-
-	* common.mk (dist-clean-local): add rule for remove encdb.h.
-
 Sat Jan 12 18:27:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
-	  define/undef on a singleton class.  [ruby-core:09959]
-
-Sat Jan 12 12:44:36 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c: rdoc update.
+	  define/undef on a signleton class.  [ruby-core:09959]
 
-Sat Jan 12 12:01:49 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jan 12 12:04:14 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: tuning for performance.
 
-Sat Jan 12 11:29:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/test_proc.rb: fixed wrong expected result.  pointed
-	  out by Kornelius "murphy" Kalnbach <murphy AT rubychan.de> in
-	  [ruby-core:15022].
-
-Sat Jan 12 04:38:38 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ruby.c (process_options): -e'script' is locale encoding by default.
-	  (load_file): ruby script from stdin is locale encoding by default.
-
-Sat Jan 12 04:31:59 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: fix bug: -m was -m0.
-
-Fri Jan 11 23:22:31 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (string.c): call rb_str_buf_append to update encoding of
-	  str1, even if str2 is empty.
-
-Fri Jan 11 20:20:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_mark): needs to mark the receiver too.  a patch from
-	  Chris Heath <chris AT heathens.co.nz> in [ruby-core:14983].
-	  [ruby-core:14885]
-
-Fri Jan 11 18:28:49 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/usage.rb: Removed.
-
-	* lib/getoptlong.rb: Update example to not use lib/rdoc/usage.rb.
-
-Fri Jan 11 18:17:10 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/driver.rb (read_yaml): Follow namespace change
-	  [ruby-core:14964].
-
-Fri Jan 11 16:55:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_append): performance improvement.
-
 Fri Jan 11 12:35:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: moved broken syscall checks from process.c etc.
@@ -9416,1166 +2710,95 @@ Fri Jan 11 12:35:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of
 	  configure.
 
-	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
-	  is not Windows but mingw is on it.
-
-Fri Jan 11 09:59:05 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: update to r1.163.
-
-	* ext/nkf/nkf.c: ASCII's canonical name is US-ASCII.
-
-	* ext/nkf/lib/kconv.rb (Kconv.isjis): force_encoding('BINARY').
-
-Fri Jan 11 09:23:31 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (set_base_encoding): must use rb_enc_dummy_p.
-
-Fri Jan 11 06:13:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_to_encoding_index, rb_to_encoding): disallow nil.
-	  [ruby-dev:33003]
-
-Fri Jan 11 01:08:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (rb_mutex_unlock): proper error message for unlocking
-	  mutex that is not locked.  a patch from Yusuke ENDOH
-	  <mame at tsg.ne.jp> in [ruby-dev:33010].
-
-Thu Jan 10 18:00:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* prelude.rb (Mutex::synchronize): capture exception from unlock.
-	  [ruby-dev:32935]
-
-Thu Jan 10 10:15:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_encoding_set): IO.pipe("euc-jp", nil) should work as
-	  IO.pipe("euc-jp", nil).  [ruby-dev:33000]
-
-	* io.c (io_encoding_set): handle nil for v1.
-
-Thu Jan 10 02:41:22 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_binmode): should not alter encoding.  [ruby-dev:32918]
+	* dln.c: use dlopen on Mac OS X 10.3 or later.  backport from trunk.
 
-	* io.c (io_read_encoding): need not to return ASCII-8BIT for
-	  binary IO.
-
-Wed Jan  9 22:04:17 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/mathn.rb (Prime#each): returns an enumerator if no block
-	  given. [ruby-dev:32815]
-
-Wed Jan  9 22:03:26 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_enc_replicate): replica of dummy is a dummy.
-
-Wed Jan  9 20:55:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/e2mmap.rb (Exception2MessageMapper::Raise): define fail.
-	  [ruby-dev:32854]
-
-Wed Jan  9 20:35:42 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb: support X-Forwarded-* header fields.
-	  WEBrick::HTTPRequest#{host,port,request_uri} is derived having
-	  regards to X-Forwarded-Proto and X-Forwarded-Host.
-
-	* lib/webrick/httprequest.rb
-	  (WEBrick::HTTPRequest#server_name?): new method.
-	  (WEBrick::HTTPRequest#remote_ip?): new method.
-	  (WEBrick::HTTPRequest#ssl?): new method.
-
-Wed Jan  9 18:24:39 2008  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* golf_prelude.rb (Array#to_s): alias to join.
-
-	* golf_prelude.rb (FalseClass#to_s): return "".
-
-Wed Jan  9 16:59:54 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): fix self appending.
-
-Wed Jan  9 15:54:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): give priority command line encoding option
-	  to RUBYOPT, and enable -E option in RUBYOPT.
-
-	* ruby.c (load_file): deal with encoding option in shebang line if
-	  nothing in command line and RUBYOPT.
-
-Wed Jan  9 14:55:36 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (yycompile0): remove setting parser->enc because it is set
-	  in parser_prepare() by previous change of parser_prepare().
-
-Wed Jan  9 14:52:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_buf_cat, rb_str_buf_append): deal with self
-	  appending.
-
-Wed Jan  9 14:44:57 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_prepare): set parser->enc from lex_input for ripper.
-
-Wed Jan  9 13:45:52 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::HTTPServer#start):
-	  :DoNotReverseLookup option had not been performed.
-
-Wed Jan  9 13:03:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
-	  value if it's given from outside.
-
-Wed Jan  9 08:42:01 2008  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* enum.c:  Updating the documentation of Enumerable#zip to reflect
-	  the recent changes Matz made to the method.
-
-Wed Jan  9 01:35:10 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/Makefile.in (BUILTIN_ENCS): UTF-{16,32}{BE,LE} are not builtin.
-
-Tue Jan  8 23:55:15 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_enc_init): UTF-{16,32}{BE,LE} are not builtin.
+	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
+	  is not Windows but minwg is on it.
 
-Tue Jan  8 22:33:03 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Jan 10 10:53:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* encoding.c, Makefile.in, include/ruby/oniguruma.h,
-	  enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}.
+	* win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
+	  [ ruby-Bugs-16948 ]
 
 Tue Jan  8 20:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win{32,ce}/Makefile.sub: merged.
 
-Tue Jan  8 19:48:15 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/driver.rb: Speed up Marshal.load. Fix bug with nested
-	  classes' methods.
-
-Tue Jan  8 19:17:29 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/*: Clean up namespacing of RI's classes.
-
-Tue Jan  8 18:05:35 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* bin/ri, lib/rdoc/ri/*: Replace with Ryan Davis' cached ri.
-
-Tue Jan  8 17:32:07 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_zip): honor length of the receiver, not the
-	  shortest length.  [ruby-core:14738]
-
-	* enum.c (enum_zip): returns array not enumerator for no block
-	  form.  [ruby-core:14738]
-
-	* enumerator.c (next_ii): do not ignore multiple values yielded.
-
-	* array.c (rb_ary_zip): faster version without creating generators.
-
-Tue Jan  8 15:47:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/utf{16,32}_{be,le}.c: use &OnigEncodingName(*) instead of
-	  ONIG_ENCODING_*.
-
-Tue Jan  8 15:40:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regenc.c (onigenc_strlen_null, onigenc_str_bytelen_null): suppressed
-	  warnings.
-
-	* regenc.h, enc/unicode.c (onigenc_unicode_ctype_code_range): added
-	  encoding argument.
-
-	* enc/utf{16,32}_{be,le}.c: added init functions.
-
-	* enc/utf{16,32}_{be,le}.c: imported from Oniguruma 5.9.1.
-
-Tue Jan  8 15:03:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (str_gsub): avoid appending empty pre-match substr.
-
-Tue Jan  8 13:05:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_build_from_ary), iseq.c (iseq_load): fix for format change.
-
-Tue Jan  8 07:56:11 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_buf_append): fix append itself.
-
-Tue Jan  8 01:13:50 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (STR_ENC_GET): defined.  same as rb_enc_get without
-	  enc_capable.
-	  (coderange_scan): ASCII-8BIT test refined.
-	  (rb_enc_cr_str_buf_cat): new internal function to accumulate
-	  strings with encoding.
-	  (rb_enc_str_buf_cat): use rb_enc_cr_str_buf_cat.
-	  (rb_str_buf_append): ditto
-	  (str_gsub): use rb_str_buf_append.
-	  (rb_str_hash): use ENCODING_GET.
-	  (rb_str_comparable): ditto.
-	  (rb_str_cmp): compare encoding index, not rb_encoding address.
-
-Mon Jan  7 20:37:55 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb: external encoding of
-	  tempfiles is set to "ASCII-8BIT".
-
-Mon Jan  7 19:39:50 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/template.rb:  Use ERB instead of custom template language.
-
-	* lib/rdoc/generators/template/html/old_html.rb:  Remove.
-
-	* lib/rdoc/generators/template/*: Convert to ERB.
-
-Mon Jan  7 19:11:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (Init_String): sym_match arity spec was wrong.  a patch
-	  from Hiroyuki Iwatsuki <don at na.rim.or.jp> in [ruby-dev:32957].
-
-Mon Jan  7 18:10:33 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (str_gsub): move rb_enc_get(str) to out of loop.
-
-Mon Jan  7 15:52:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/oniguruma.h (OnigEncodingType): new member
-	  ruby_encoding_index to avoid linear search in rb_enc_to_index.
-
-	* include/ruby/encoding.h (rb_enc_to_index): macro defined to use
-	  ruby_encoding_index.
-
-	* encoding.c (rb_enc_to_index): removed.
-	  (enc_register_at): initialize ruby_encoding_index member.
-
-Mon Jan  7 16:10:35 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/tokenstream.rb:  Namespace under RDoc.
-
-Mon Jan  7 16:06:09 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/dot.rb:  Namespace under RDoc.
-
-	* lib/rdoc/diagram.rb:  Clean up formatting.
-
-Mon Jan  7 15:51:35 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/options.rb:  Convert to OptionParser, clean up -h output,
-	  namespace under RDoc.
-	* lib/rdoc/*:  Namespace RDoc::Options.
-
-Mon Jan  7 15:42:46 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk, Makefile.in, */Makefile.sub (distclean-local): move
-	  removing rule of ext/ripper/y.output from common.mk to Makefiles
-	  that depend on platforms.
-
-Mon Jan  7 13:54:57 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_preprocess): fix fixed_enc condition.
-
-Mon Jan  7 11:51:49 2008  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/generators/ri_generator.rb:  Merge documentation from the
-	  same class on output.  Fixes bug where documentation could
-	  disappear.
-
-	* lib/rdoc/options.rb:  Fix typo.
-
-	* lib/rdoc/generators/*: Clean up some namespacing and make RDoc
-	  consistent.
-
-Mon Jan  7 11:44:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_internal_get_index): extracted from
-	  rb_enc_get_index.
-	  (rb_enc_internal_set_index): extracted from rb_enc_associate_index
-
-	* include/ruby/encoding.h (ENCODING_SET): work over ENCODING_INLINE_MAX.
-	  (ENCODING_GET): ditto.
-	  (ENCODING_IS_ASCII8BIT): defined.
-	  (ENCODING_CODERANGE_SET): defined.
-
-	* re.c (rb_reg_fixed_encoding_p): use ENCODING_IS_ASCII8BIT.
-
-	* string.c (rb_enc_str_buf_cat): use ENCODING_IS_ASCII8BIT.
-
-	* parse.y (reg_fragment_setenc_gen): use ENCODING_IS_ASCII8BIT.
-
-	* marshal.c (has_ivars): use ENCODING_IS_ASCII8BIT.
-
-Mon Jan  7 02:14:07 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (coderange_scan): avoid rb_enc_to_index.
-	  (rb_enc_str_buf_cat): ditto.
-	  (str_cat_char): use rb_enc_str_buf_cat.
-	  (rb_str_inspect): ditto.
-
-Mon Jan  7 01:36:49 2008  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (coderange_scan): optimize ASCII-8BIT string.
-	  (rb_enc_str_buf_cat): don't call coderange_scan if possible.
-
-Mon Jan  7 01:05:45 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/erb.rb (ERB::Revision): cut off locale dependent string in Date
-	  keyword.
-
-Mon Jan  7 00:48:02 2008  Tanaka Akira  <akr@fsij.org>
-
-	* Date keyword removed to avoid inclusion of locale dependent
-	  string.  [ruby-dev:32940]
-
-Sun Jan  6 21:14:12 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_initialize_str): forbid raw non ASCII character
-	  for ASCII-8BIT regexp in non ASCII-8BIT script.
-
-Sun Jan  6 18:19:12 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h (rb_enc_str_buf_cat): declared.
-
-	* string.c (coderange_scan): extracted from rb_enc_str_coderange.
-	  (rb_enc_str_coderange): use coderange_scan.
-	  (rb_str_shared_replace): copy encoding and coderange.
-	  (rb_enc_str_buf_cat): new function for linear complexity string
-	  accumulation with encoding.
-	  (rb_str_sub_bang): don't conflict substituted part and replacement.
-	  (str_gsub): use rb_enc_str_buf_cat.
-	  (rb_str_clear): clear coderange.
-
-	* re.c (rb_reg_regsub): use rb_enc_str_buf_cat.
-
-Sun Jan  6 17:55:44 2008  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* lib/securerandom.rb: Add Win32 support.
-
-Sun Jan  6 09:32:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Jan  6 09:39:02 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: introduced some constants
-	  (for internal use) and aliases (minute and second).
+	  (for internal use).
 
 	* sample/cal.rb: trivial adjustments.
 
-Sun Jan  6 01:38:07 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_initialize_str): /\x80/n is not an error even if script
-	  encoding is EUC-JP.
-
-Sun Jan  6 00:48:12 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::DNS#each_address): get A record and then AAAA
-	  record. [ruby-dev:32925]
-
-Sat Jan  5 21:48:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* vm_insnhelper.c (vm_callee_setup_arg): it is not inlinable because
-	  alloca is used.
-
-Sat Jan  5 16:50:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resize): copy if old data is not empty
-	  [ruby-core:14785]
-
-Sat Jan  5 13:04:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): no need for intermediate object.
-
-Sat Jan  5 11:48:19 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (Init_Encoding): alias csWindows31J to Windows-31J.
-	  IE6 accepts csWindows31J but Windows-31J.
-
-Sat Jan  5 02:21:10 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (rb_intern): memorize interned ID for constant
-	  string, using gcc's __builtin_constant_p and statement expression.
-
-Sat Jan  5 02:14:45 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (trnext): should enable backslash escape.
-
-Sat Jan  5 01:50:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_eval): move instance_eval and instance_exec to
-	  BasicObject.  [ruby-core:14747]
-
-	* lib/delegate.rb: should preserve new methods in BasicObject.
-
-Sat Jan  5 01:46:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): update according to the last API revert.
-
-Sat Jan  5 01:30:30 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h, re.c (rb_reg_new): keep interface same as
-	  1.8.  [ruby-core:14583]
-
-	* include/ruby/intern.h, re.c (rb_reg_new_str): renamed, and defines
-	  HAVE_RB_REG_NEW_STR macro to tell if it is available.
-
-	* include/ruby/encoding.h (rb_enc_reg_new): added.
-
-	* insns.def (toregexp), marshal.c (r_object0): use rb_reg_new_str().
-
-	* re.c (rb_reg_regcomp, rb_reg_s_union): ditto.
-
 Fri Jan  4 23:08:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_arg): use converted object.  [ruby-core:14759]
 
-Fri Jan  4 16:24:58 2008  Tanaka Akira  <akr@fsij.org>
-
-	* ext/digest/lib/digest/hmac.rb (Digest::HMAC#initialize): use
-	  String#bytesize to avoid test errors on EUC-JP environment.
-
-Fri Jan  4 14:00:50 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_prepare_re): check string encoding.  Oniguruma doesn't
-	  support invalid encoding.
-
-Fri Jan  4 10:22:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_search): avoid inner loop for reverse search.
-
-	* regexec.c: unset USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
-	  which is turned on since oniguruma 5.9.1.
-
-Fri Jan  4 02:53:31 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/euc_jp.c: remove eucjp_ prefix.  breakpoint can be specified as
-	  euc_jp.c:mbc_enc_len.  avoid needless conflict by merge.
-
-	* enc/sjis.c: remove sjis_ prefix.
-
-	* enc/utf8.c: remove utf8_ prefix.
-
-	* enc/iso_8859_1.c: remove iso_8859_1_ prefix.
-
-	* enc/iso_8859_2.c: remove iso_8859_2_ prefix.
-
-	* enc/iso_8859_3.c: remove iso_8859_3_ prefix.
-
-	* enc/iso_8859_4.c: remove iso_8859_4_ prefix.
-
-	* enc/iso_8859_5.c: remove iso_8859_5_ prefix.
-
-	* enc/iso_8859_6.c: remove iso_8859_6_ prefix.
-
-	* enc/iso_8859_7.c: remove iso_8859_7_ prefix.
-
-	* enc/iso_8859_8.c: remove iso_8859_8_ prefix.
-
-	* enc/iso_8859_9.c: remove iso_8859_9_ prefix.
-
-	* enc/iso_8859_10.c: remove iso_8859_10_ prefix.
-
-	* enc/iso_8859_11.c: remove iso_8859_11_ prefix.
-
-	* enc/iso_8859_13.c: remove iso_8859_13_ prefix.
-
-	* enc/iso_8859_14.c: remove iso_8859_14_ prefix.
-
-	* enc/iso_8859_15.c: remove iso_8859_15_ prefix.
-
-	* enc/iso_8859_16.c: remove iso_8859_16_ prefix.
-
-Fri Jan  4 02:47:06 2008  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_search): iterate onig_match for reverse mode.
-
 Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
 
-Fri Jan  4 00:54:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/oniguruma.h: Oniguruma 5.9.1 merged.
-
-Fri Jan  4 00:20:47 2008  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_ungetc): move data in buffer if it is required to store the
-	  argument.
-
-Thu Jan  3 21:56:07 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (st_strcasecmp): declared for STRCASECMP.
-	  (st_strncasecmp): declared for STRNCASECMP.
-
-Thu Jan  3 20:24:48 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_jump.c (rb_f_catch): Restore cfp if caught thrown object.
-
-Thu Jan  3 19:45:57 2008  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_eval.rb, test_knownbug.rb: move a fixed test.
-
-Thu Jan  3 18:39:12 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c: (rb_tolower, rb_toupper): body was exchanged.
-
-Thu Jan  3 17:54:01 2008  Tanaka Akira  <akr@fsij.org>
-
-	* regenc.h (onigenc_ascii_is_code_ctype): put back.
-
-Thu Jan  3 17:33:09 2008  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_isalnum): defined.
-	  (rb_isalpha): ditto.
-	  (rb_isblank): ditto.
-	  (rb_iscntrl): ditto.
-	  (rb_isdigit): ditto.
-	  (rb_isgraph): ditto.
-	  (rb_islower): ditto.
-	  (rb_isprint): ditto.
-	  (rb_ispunct): ditto.
-	  (rb_isspace): ditto.
-	  (rb_isupper): ditto.
-	  (rb_isxdigit): ditto.
-	  (rb_tolower): ditto.
-	  (rb_toupper): ditto.
-
-	* include/ruby/ruby.h: don't include include/ruby/encoding.h.
-	  (rb_isascii): defined.
-	  (rb_isalnum): declared.
-	  (rb_isalpha): ditto.
-	  (rb_isblank): ditto.
-	  (rb_iscntrl): ditto.
-	  (rb_isdigit): ditto.
-	  (rb_isgraph): ditto.
-	  (rb_islower): ditto.
-	  (rb_isprint): ditto.
-	  (rb_ispunct): ditto.
-	  (rb_isspace): ditto.
-	  (rb_isupper): ditto.
-	  (rb_isxdigit): ditto.
-	  (rb_tolower): ditto.
-	  (rb_toupper): ditto.
-	  (ISASCII): simplified.
-	  (ISPRINT): ditto.
-	  (ISSPACE): ditto.
-	  (ISUPPER): ditto.
-	  (ISLOWER): ditto.
-	  (ISALNUM): ditto.
-	  (ISALPHA): ditto.
-	  (ISDIGIT): ditto.
-	  (ISXDIGIT): ditto.
-	  (TOUPPER): ditto.
-	  (TOLOWER): ditto.
-
-	* include/ruby/encoding.h (rb_isascii): removed.
-	  (rb_isalnum): ditto.
-	  (rb_isalpha): ditto.
-	  (rb_isblank): ditto.
-	  (rb_iscntrl): ditto.
-	  (rb_isdigit): ditto.
-	  (rb_isgraph): ditto.
-	  (rb_islower): ditto.
-	  (rb_isprint): ditto.
-	  (rb_ispunct): ditto.
-	  (rb_isspace): ditto.
-	  (rb_isupper): ditto.
-	  (rb_isxdigit): ditto.
-	  (rb_tolower): ditto.
-	  (rb_toupper): ditto.
-
-	* common.mk: dependency updated.
-
-Thu Jan  3 15:10:26 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h (rb_isascii): simplified.
-	  (rb_isalnum): call onigenc_ascii_is_code_ctype without indirect call.
-	  (rb_isalpha): ditto.
-	  (rb_isblank): ditto.
-	  (rb_iscntrl): ditto.
-	  (rb_isdigit): ditto.
-	  (rb_isgraph): ditto.
-	  (rb_islower): ditto.
-	  (rb_isprint): ditto.
-	  (rb_ispunct): ditto.
-	  (rb_isspace): ditto.
-	  (rb_isupper): ditto.
-	  (rb_isxdigit): ditto.
-
-	* include/ruby/oniguruma.h (onigenc_ascii_is_code_ctype): declaration
-	  moved from regenc.h.
-
-Thu Jan  3 14:37:17 2008  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (parser_magic_comment): use STRNCASECMP.
-	  (set_file_encoding): ditto.
-
-Thu Jan  3 11:44:37 2008  Tanaka Akira  <akr@fsij.org>
-
-	* time.c: don't mention an obsolete library, ParseDate.
-
 Thu Jan  3 11:28:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
 
-Thu Jan  3 05:02:36 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/us_ascii.c: add us_ascii_ prefix for functions to ease
-	  setting breakpoint when debugging.
-
-	* enc/euc_jp.c: add eucjp_ prefix.
-
-	* enc/sjis.c: add sjis_ prefix.
-
-	* enc/iso_8859_1.c: add iso_8859_1_ prefix.
-
-	* enc/iso_8859_2.c: add iso_8859_2_ prefix.
-
-	* enc/iso_8859_3.c: add iso_8859_3_ prefix.
-
-	* enc/iso_8859_4.c: add iso_8859_4_ prefix.
-
-	* enc/iso_8859_5.c: add iso_8859_5_ prefix.
-
-	* enc/iso_8859_6.c: add iso_8859_6_ prefix.
-
-	* enc/iso_8859_7.c: add iso_8859_7_ prefix.
-
-Thu Jan  3 02:44:34 2008  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (conv_digit): use ISDIGIT, ISLOWER and ISUPPER.
-
-Wed Jan  2 23:50:15 2008  Tanaka Akira  <akr@fsij.org>
-
-	* util.c (ruby_strtoul): "0x", "+" and "-" is not a valid integer.
-	  end of integer should be just after "0", the beginning, the
-	  beginning respectively.
-
-Wed Jan  2 15:23:15 2008  Tanaka Akira  <akr@fsij.org>
-
-	* util.c (ruby_strtoul): locale independent strtoul is implemented to
-	  avoid "i".to_i(36) cause 0 under tr_TR locale on Debian GNU/Linux
-	  4.0 (Etch).
-	  This is newly implemented, not a copy of missing/strtoul.c.
-
-	* include/ruby/ruby.h (ruby_strtoul): declared.
-	  (STRTOUL): defined to use ruby_strtoul.
-
-	* bignum.c, pack.c, ext/socket/socket.c: use STRTOUL.
-
-	* configure.in (strtoul): don't check.
-
-	* missing/strtoul.c: removed.
-
-	* include/ruby/missing.h (strtoul): removed.
-
-	* common.mk (strtoul.o): removed.
-
-	* LEGAL (missing/strtoul.c): removed.
-
-Wed Jan  2 14:41:08 2008  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (strcasecmp.o): removed.
-	  (strncasecmp.o): removed.
-
-	* include/ruby/missing.h (strcasecmp): removed.
-	  (strncasecmp): removed.
-
-Wed Jan  2 11:34:57 2008  Tanaka Akira  <akr@fsij.org>
-
-	* missing/strcasecmp.c: removed.  Ruby don't use locale dependent
-	  strcasecmp.
-
-	* missing/strncasecmp.c: ditto.
-
-	* configure.in: don't check strcasecmp and strncasecmp.
-
-	* LEGAL: missing/strcasecmp.c and missing/strncasecmp.c removed.
-
-Wed Jan  2 10:13:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jan  2 10:18:56 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* sample/time.rb: use Process.times instead of Time.times.
 
-Wed Jan  2 09:09:53 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jan  2 09:18:11 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* sample/goodfriday.rb: examples for date are enough.  retired.
 
-Wed Jan  2 08:58:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jan  2 09:06:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* sample/cal.rb: just updated with the newest version.
 
-Wed Jan  2 01:19:31 2008  Tanaka Akira  <akr@fsij.org>
-
-	* enc/depend: dependency updated.
-
-Wed Jan  2 00:14:41 2008  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: Update nkf.
-
-	* ext/nkf/nkf.c: fix documents.
-
-	* ext/nkf/lib/kconv.rb: fix documents.
-	  (Kconv.is*): use valid_encoding?.
-	  (Kconv.isjis): defined.
-
-Tue Jan  1 23:17:03 2008  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: dependency updated.
-
-Tue Jan  1 21:11:33 2008  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h (rb_isascii): defined.
-	  (rb_isalnum): ditto.
-	  (rb_isalpha): ditto.
-	  (rb_isblank): ditto.
-	  (rb_iscntrl): ditto.
-	  (rb_isdigit): ditto.
-	  (rb_isgraph): ditto.
-	  (rb_islower): ditto.
-	  (rb_isprint): ditto.
-	  (rb_ispunct): ditto.
-	  (rb_isspace): ditto.
-	  (rb_isupper): ditto.
-	  (rb_isxdigit): ditto.
-	  (rb_tolower): ditto.
-	  (rb_toupper): ditto.
-
-	* include/ruby/st.h (st_strcasecmp): declared.
-	  (st_strncasecmp): ditto.
-
-	* st.c (type_strcasehash): use st_strcasecmp instead of strcasecmp.
-	  (st_strcasecmp): defined.
-	  (st_strncasecmp): ditto.
-
-	* include/ruby/ruby.h: include include/ruby/encoding.h.
-	  (ISASCII): use rb_isascii.
-	  (ISPRINT): use rb_isprint.
-	  (ISSPACE): use rb_isspace.
-	  (ISUPPER): use rb_isupper.
-	  (ISLOWER): use rb_islower.
-	  (ISALNUM): use rb_isalnum.
-	  (ISALPHA): use rb_isalpha.
-	  (ISDIGIT): use rb_isdigit.
-	  (ISXDIGIT): use rb_isxdigit.
-	  (TOUPPER): defined.
-	  (TOLOWER): ditto.
-	  (STRCASECMP): ditto.
-	  (STRNCASECMP): ditto.
-
-	* dir.c, encoding.c, file.c, hash.c, process.c, ruby.c, time.c,
-	  transcode.c, ext/readline/readline.c: use locale insensitive
-	  functions.  [ruby-core:14662]
-
-Tue Jan  1 17:50:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_mode_enc): encoding spec is not allowed in binary mode.
-	  [ruby-dev:32913]
-
-Tue Jan  1 14:41:56 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml: 1.9 patch from Sam Ruby mentioned in his blog:
-	  <http://intertwingly.net/blog/2007/12/31/Porting-REXML-to-Ruby-1-9>
-	  [ruby-core:14639]
-
-Tue Jan  1 14:15:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_substr): offset movement bug.  a patch from
-	  Vincent Isambart <vincent.isambart at gmail.com> in
-	  [ruby-core:14647].  [ruby-core:14644]
-
-Tue Jan  1 01:29:04 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_to_encoding): raises for non-nil, non-encoding,
-	  non-string object.  [ruby-core:14634]
-
-Tue Jan  1 01:04:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): rejects dummy encoding.
-
-Mon Dec 31 23:53:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options, process_options): delays finding encoding
-	  until load_path is set.
-
-Mon Dec 31 23:27:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resize): embeds if ptr is null.  [ruby-dev:32819]
-
-Mon Dec 31 23:17:22 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  call do_XXX which correspond with request method.
-	  (WEBrick::HTTPProxyServer#do_CONNECT,do_GET,do_POST,do_HEAD): added.
-
-	* test/webrick/test_httpproxy.rb: add test for WEBrick::HTTPProxyServer.
-
-Mon Dec 31 22:53:29 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread_pthread.c (native_sleep): timespec tv_sec may overflow on
-	  some platform.  a patch from zunda <zunda616e AT yahoo.co.jp> in
-	  [ruby-dev:32904].
-
-Mon Dec 31 19:35:20 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (IS_7BIT): removed.
-	  (single_byte_optimizable): new function to test optimizationability
-	  using single byte string.
-	  (str_strlen): use single_byte_optimizable instead of
-	  is_ascii_string.
-	  (str_nth): rename argument: asc -> singlebyte.
-	  (str_offset): ditto.
-	  (rb_str_substr): use single_byte_optimizable instead of IS_7BIT.
-	  (rb_str_index): ditto.
-	  (rb_str_rindex): ditto.
-	  (rb_str_splice): ditto.
-	  (rb_str_justify): ditto.
-
-Mon Dec 31 07:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* main.c, goruby.c (RUBY_MAIN_INIT): removed.
-
-	* goruby.c (goruby_run_node): run after ruby_init_loadpath() so that
-	  require works, and protect the call.
-
 Mon Dec 31 06:50:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
+	* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
 	  compiling.
 
 	* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
 	  moved.
 
-Mon Dec 31 06:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped.
-
-	* sprintf.c (rb_enc_sprintf, rb_enc_vsprintf): new functions to format
-	  arguments with encoding.
-
-Sun Dec 30 23:48:00 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (String#/): define / as split, as association of
-	  Array#*.
-
-Sun Dec 30 23:19:06 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* golf_prelude.rb (@@golf_hash): for performance improvement.
-
-Sun Dec 30 22:44:50 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Dec 30 22:48:37 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (_valid_time?): I'm not sure to recommend such an
 	  expression.  but anyway it is acceptable now.  [ruby-core:14580]
 
-Sun Dec 30 21:54:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (program, yycompile0): too early to drop lex_lastline in
-	  rules.
-
-Sun Dec 30 19:23:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bootstraptest/test_knownbug.rb: support DOSISH.
-
-Sun Dec 30 17:43:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (Init_Encoding): registered rb_encoding differs from
-	  ONIG_ENCODINGs.
-
-Sun Dec 30 13:56:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (program): clear input strings after all process.
-
-	* parse.y (parser_nextc, parser_yylex): should not drop lex_lastline
-	  while lex_p is valid.  [ruby-dev:32896]
-
-Sun Dec 30 10:54:49 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: rm largefile.h.
-
-	* common.mk: clean golf, conf*, preludes, and so on.
-
-	* enc/depend: silent and ignore error for rm.
-
-	* enc/Makefile.in: should define prefix and exec_prefix.
-
-Sun Dec 30 06:31:11 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* encoding.c (Init_encoding): register Windows-31J and its alias.
-	  [ruby-dev:32843]
-
-	* ruby.c (proc_options): -Ks options means Windows-31J, not Shift_JIS.
-
-Sun Dec 30 06:27:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (depend_rules): need to convert `/' to `\' for windows
-	  native commands.
-
-Sun Dec 30 01:43:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/Makefile.in (DLDFLAGS): like as extensions.  [ruby-core:14567]
-
-Sat Dec 29 23:48:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_fflush): don't retry when wbuf modified by other threads.
-
-Sat Dec 29 22:44:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_regsub): returns the given string itself if nothing
-	  changed.
-
-	* string.c (rb_str_sub_bang): keeps code-range as possible.
-
-	* string.c (str_gsub): adjusts code-range.  [ruby-core:14566]
-
-Sat Dec 29 21:54:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (clean, distclean, realclean): should include clean-enc
-	  and others.  [ruby-dev:32887]
-
-Sat Dec 29 13:29:29 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/test_knownbug.rb: add a test reported by
-	  Kazuhiro NISHIYAMA.  [ruby-dev:32819].
-	  add a test reported by Frederick Cheung.  [ruby-core:14556].
-
-	* test/ruby/test_m17n.rb (test_gsub): add a test reported by
-	  Sam Ruby.  [ruby-core:14566]
-
-Sat Dec 29 04:46:58 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throws):
-	  throw won't raise NameError nor ThreadError but ArgumentError on 1.9.
-	  (Test::Unit::Assertions#assert_not_throws): ditto.
-
-	* test/testunit/test_assertions.rb: add assertions for throwing some
-	  objects other than Symbol.
-
-Sat Dec 29 03:10:12 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_unread): fix typo.
-
-Sat Dec 29 02:18:45 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_unread): adhoc workaround for non-binary mode of some DOSish
-	  platforms. this is not perfect and safety, but works with most cases.
-
-Fri Dec 28 23:53:18 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ext/strscan/strscan.c (str_new): new function for allocate an string
-	  with encoding propagation.
-	  (extract_range): use str_new.
-	  (extract_beg_len): ditto.
-	  (strscan_peek): ditto.
-	  (strscan_rest): ditto.
-
-Fri Dec 28 20:18:42 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* golf_prelude.rb (Object.say): derived from Perl 5.10.
-
-Fri Dec 28 19:39:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* encoding.c (rb_locale_encoding): should check return value from
-	  rb_locale_charmap().
-
-	* ruby.c (locale_encoding): removed.
-
-	* ruby.c (process_options): use rb_locale_encoding() instead of
-	  locale_encoding().
-
-	* ext/readline/readline.c (readline_readline): use locale encoding
-	  instead of input IO's encoding. [ruby-dev:32872]
-
-Fri Dec 28 19:29:07 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline, readline_s_set_input):
-	  use mReadline directly because self is not always same.
-
-Fri Dec 28 19:11:28 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_locale_encoding): defined.
-
-	* include/ruby/encoding.h (rb_locale_encoding): declared.
-
-Fri Dec 28 18:45:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): set encoding to result.
-
-	* ext/readline/readline.c (readline_s_set_input, Init_readline): save
-	  input IO to hidden instance variable.
-
-Fri Dec 28 01:55:04 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c (transcode_dispatch): reverted some of the changes
-	  in r14746.
-
-	* transcode.c, enc/trans/single_byte.c: Added conversions to/from
-	  US-ASCII and ASCII-8BIT (using data tables).
-
-	* enc/trans/single_byte.c: Some spacing/ordering changes due to
-	  automatic data file generation.
-
-	* transcode_data.h, transcode.c: Preliminary code for using
-	  micro-conversion functions.
-
-	* test/ruby/test_transcode.rb: Added some tests for US-ASCII and
-	  ASCII-8BIT conversions.
-
-Fri Dec 28 17:33:44 2007  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (make_time_t): verify mktime and timegm result.
-
 Fri Dec 28 16:36:33 2007  NARUSE, Yui  <naruse@airemix.com>
 
-	* lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
-
-Fri Dec 28 16:10:00 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/dot/dot.rb: Move to lib/rdoc/dot.rb. Fix namespacing.
-
-	* lib/rdoc/diagram.rb: Update for 1.9.
-
-Fri Dec 28 15:38:29 2007  Eric Hodel  <drbrain@segment7.net>
+       * lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
 
-	* lib/rdoc/markup/sample/: Move to sample/rdoc/markup directory.
+Fri Dec 28 13:21:32 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-Fri Dec 28 15:15:12 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/irb/completion.rb: Remove garbage ("X=1").
-
-Fri Dec 28 15:12:05 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc, test/rdoc: Move RDoc tests out of lib/.
-
-Fri Dec 28 15:10:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (set_base_encoding, enc_base_encoding): renamed
-	  based_encoding as base_encoding.
-
-Fri Dec 28 13:57:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (Integer#each): use alias simply.
-
-Fri Dec 28 13:45:21 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* golf_prelude.rb (Object.const_missing): No need to delegate to
-	  superclass.  Just raise a NameError when none matches.
-
-Fri Dec 28 13:18:47 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.2 -> 0.2.3.
+	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3.
 
 	* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
 	  Reported by Ray Chen. Thanks.
 
-Fri Dec 28 13:07:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (os_obj_of): returns an enumerator if no block given.  based on
-	  a patch from Yugui <yugui AT yugui.sakura.ne.jp>.  [ruby-dev:32828]
-
-Fri Dec 28 11:46:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/ytab.sed: skip yydestruct hack unless yymsg exists, for bison
-	  1.8 series.  [ruby-dev:32825]
-
-Fri Dec 28 11:39:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (Object.quine): need to join because SCRIPT_LINES__[]
-	  returns an array of lines.
-
-Fri Dec 28 11:16:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (Object.quine): get the script itself.
-
-Fri Dec 28 10:06:54 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* golf_prelude.rb (Object.const_missing): Auto-complete constants.
-
-Fri Dec 28 01:55:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_dispatch): allows transcoding from/to
-	  ASCII-8BIT.
-
-Fri Dec 28 01:47:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (Integer): Integer is now enumerable on goruby.
-
-Fri Dec 28 01:27:47 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rdoc/rdoc.rb (parse_files): don't depend on the default external
-	  encoding.
-
-Fri Dec 28 00:01:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (golf_prelude.c): use MINIRUBY instead of BASERUBY because
-	  tool/compile_prelude.rb requires rbconfig.rb.
-
 Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: should not use the libraries under the source directory
 	  at cross compiling.
 
-Thu Dec 27 23:43:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
-	  rubyw.exe.
-
-Thu Dec 27 22:31:37 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rubygems/commands/update_command.rb (do_rubygems_update): use
-	  portable and safely ENV operation. reported in
-	  <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
-
-Thu Dec 27 21:47:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* mkconfig.rb (prefix): archdir is "1.9.0", not "1.9". reported in
-	  <http://slashdot.jp/developers/comments.pl?sid=384937&cid=1273085>.
-
-Thu Dec 27 17:57:30 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y, transcode_data.h, transcode.c, lib/weakref.rb,
-	  lib/irb/ruby-lex.rb, lib/irb/lc/error.rb, enc/trans/japanese.c:
-	  change "illegal" to "invalid" in a context which doesn't against
-	  a law.
-
-Thu Dec 27 16:37:06 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_s_union): show encodings in error message.
-
-Thu Dec 27 15:25:16 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_codelen): show codepoint in error message.
+Thu Dec 27 11:02:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* include/ruby/encoding.h (rb_enc_codelen): comment it returns
-	  positive integer.
+	* intern.h, string.c (rb_str_set_len): added for upgrading path from
+	  1.8 to 1.9. [ruby-dev:32807]
 
-	* string.c (rb_str_concat): rb_enc_codelen doesn't return 0.
+	* string.c (rb_str_lines, rb_str_bytes): ditto.
 
-Thu Dec 27 15:18:44 2007  Tanaka Akira  <akr@fsij.org>
+Thu Dec 27 10:47:32 2007  Technorama Ltd.  <oss-ruby@technorama.net>
 
-	* encoding.c (rb_enc_codelen): error message refined.
-
-Thu Dec 27 15:11:27 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_check): show encodings in error message.
-
-Thu Dec 27 15:02:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_casecmp): fixed using a wrong variable.
-	  [ruby-list:44402]
-
-Thu Dec 27 14:34:38 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_fflush): checks wbuf modification by other threads.
-	  not perfect.  it need locks.
-
-Thu Dec 27 10:44:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: a patch to support IRIX from Andrew
-	  Thompson <andrew@hijacked.us> in [ruby-core:14447].
-
-Thu Dec 27 02:25:45 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/openssl/ossl_ssl.c: Only show a warning if the default
+	  DH callback is actually used.
 
-	* lib/mkmf.rb (create_tmpsrc): retry to create file if Errno::EACCES
-	  occurs. this is a workaround for mswin32.
+	* ext/openssl/ossl_rand.c: New method: random_add().
 
-Wed Dec 26 22:47:31 2007  NARUSE, Yui <naruse@ruby-lang.org>
+Wed Dec 26 22:27:45 2007  NARUSE, Yui <naruse@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
 	  Resolv::DNS::Label::Str.
@@ -10584,2262 +2807,58 @@ Wed Dec 26 22:47:31 2007  NARUSE, Yui <naruse@ruby-lang.org>
 	  is not defined, so replace to_s.
 
 	* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
-	  ip6.arpa.
-
-
-Wed Dec 26 21:27:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (_xmlschema): some improvements.
-
-	* lib/date/format.rb (_parse): a new hint compfunc. [experimental]
-
-Wed Dec 26 17:31:08 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_fflush): check closed fptr after rb_write_internal to avoid
-	  SEGV on MacOS X.
-
-Wed Dec 26 16:10:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (Init_String): defines chars method.
-
-Wed Dec 26 14:38:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb: install goruby if exists.
-
-Wed Dec 26 13:55:02 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb:  Cleaned up some code with Ruby 1.9 idioms.
-
-Wed Dec 26 13:29:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (tmpbuf): use rb_str_tmp_new().
-
-Wed Dec 26 00:57:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/ext/generator/generator.c (Init_generator): requires
-	  json/common.rb for GeneratorError, when static linked.  a patch from
-	  Kenta Murata <muraken AT gmail.com> in [ruby-dev:32789].
-
-Tue Dec 25 23:33:55 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* development version 1.9.0 released.
-
-Tue Dec 25 23:25:29 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
-	  variable.  a patch from Tadayoshi Funaba <tadf AT dotrb.org> in
-	  [ruby-dev:32783].
-
-Tue Dec 25 23:16:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): encoding option in shebang and RUBYOPT did not
-	  work, do not store alloca()ed string in a parent scope struct.
-
-Tue Dec 25 22:56:52 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): keep this file.
-
-Tue Dec 25 22:55:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (TIMEZONE_VOID): typo.
-
-Tue Dec 25 22:45:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns2vm.rb: add encoding option to shebang.
-
-Tue Dec 25 22:13:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/pending.rb: add pending issue.
-
-Tue Dec 25 22:12:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c: remove Thread.critical(=).
-
-Tue Dec 25 21:44:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot: add version number.
-
-Tue Dec 25 21:32:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix stack consistency error
-	  (break is compiled to throw instead of jump insn).
-	  these problems are reported by Yusuke ENDOH <mame AT tsg.ne.jp>
-
-	* bootstraptest/test_knownbug.rb, test_syntax.rb: move fixed test.
-
-Tue Dec 25 21:32:44 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (struct parser_params): make parser_ruby_sourcefile common
-	  field.  it is used by node_newnode.
-	  new field parser_ruby_sourcefile_string for ripper.
-	  (parser_initialize): initialize parser_ruby_sourcefile in ripper.
-	  (ripper_initialize): initialize parser_ruby_sourcefile_string.
-
-Tue Dec 25 21:26:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (parse.c): depends on tool/ytab.sed.
-
-	* tool/ytab.sed: hack for bison 2.1.
-
-Tue Dec 25 20:24:58 2007  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_ssl.c: Only show a warning if the default
-	  DH callback is actually used.
-
-	* ext/openssl/ossl_rand.c: New method: random_add().
-
-Tue Dec 25 20:24:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot: argument check, and cleanup exported directory.
-
-Tue Dec 25 20:07:13 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* tool/make-snapshot: more portable.
-
-Tue Dec 25 19:01:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.h (rb_enc_mbc_to_codepoint): wrapper for
-	  ONIGENC_MBC_TO_CODE().
-
-	* string.c (rb_str_succ): deal with invalid sequence as binary.
-
-Tue Dec 25 18:40:46 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c: all methods need $SAFE < 1.
-
-	 vm.c: comment out debug functions.
-
-Tue Dec 25 18:37:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (appendline): move RS comparison to rb_io_getline_1().
-
-Tue Dec 25 18:27:51 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_each_line): don't call rb_enc_codepoint with empty
-	  string.
-
-Tue Dec 25 18:06:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
-	  string.  fix '#'.inspect.
-
-	* encoding.c (rb_enc_codepoint): raise on empty string.
-
-Tue Dec 25 17:48:28 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm.c (rb_frame_method_id_and_class): new function to get the
-	  method id and class of the current frame.
-
-Tue Dec 25 17:32:04 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb (create_makefile): Add a missing dependency on the
-	  target directory for each .rb file.  This will hopefully fix
-	  parallel make (-jN).  Tested on FreeBSD.
-
-Tue Dec 25 16:51:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/japanese.c (rb_{from,to}_{SHIFT_JIS,EUC_JP}): inversed
-	  from_encoding and to_encoding.
-
-Tue Dec 25 16:41:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* golf_prelude.rb (h): add new method for all golfers.
-
-Tue Dec 25 16:37:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/japanese.c (rb_to_EUC_JP): fixed typo.
-
-Tue Dec 25 16:34:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/depend: add dependencies. [ruby-dev:32760]
-
-Tue Dec 25 16:26:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h, thread.c: rename is_ruby_native_thread() to
-	  ruby_native_thread_p().
-
-	* ext/tk/tcltklib.c: apply it.
-
-Tue Dec 25 16:15:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (clean-enc): clean encoding objects.
-
-Tue Dec 25 16:04:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, goruby.c, golf_prelude.rb: for golfers.
-
-	* main.c (main): hook for embedding applications.
-
-	* tool/compile_prelude.rb: can change initialize function name.
-
-Tue Dec 25 15:59:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_register): do not use based_encoding to check if
-	  dummy encoding.
-
-Tue Dec 25 15:55:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_succ): fix for string with non-alphanumeric chars.
-
-Tue Dec 25 15:42:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_external_encoding): should return nil for
-	  pass-through write IO.  [ruby-dev:32740]
-
-Tue Dec 25 15:24:57 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (appendline): initialize rslen to 1 if rsptr is 0.
-	  rslen is the length of the delimiter.
-	  if only delim is given, it should be 1.
-	  [ruby-dev:32746]
-
-Tue Dec 25 15:21:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_dispatch): fix for multistep transcode.
-
-Tue Dec 25 15:07:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/trans/single_byte.c (Init_single_byte): renamed.
-
-Tue Dec 25 15:00:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_yield): when multiple values yielded from #each
-	  pack them into an array.  [ruby-dev:32708]
-
-	* enum.c: all method but all?, any?, one? and none? passed packed
-	  multiple values to the block.
-
-	* enum.c (collect_all): should pack all values.  [ruby-core:14410]
-
-Tue Dec 25 14:57:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (COMMONOBJS): transcode_data_*.c moved under enc/trans.
-
-	* transcode_data.h (rb_transcoding, rb_transcoder): prefixed.
-
-	* transcode.c (rb_register_transcoder, rb_declare_transcoder): split
-	  declaration and registration.  [ruby-dev:32704]
-
-	* transcode.c (transcode_dispatch): autoload pre-declared transcoder.
-
-	* transcode.c (str_transcode): use rb_define_dummy_encoding().
-
-	* transcode.c (Init_transcode): initialize transcoder tables.
-
-	* enc/trans/single_byte.c, enc/trans/japanese.c: moved from top.
-
-Tue Dec 25 14:20:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mkmf.rb (map_dir): should generate path including $top_srcdir.
-
-Tue Dec 25 14:09:16 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb:  Fixed test failures caused by changes to Ruby.
-
-	* test/csv/tc_serialization, test/csv/tc_csv_parsing, test/csv/tc_features:
-	  Fixed test failures caused by changes to Ruby.
-
-Tue Dec 25 14:11:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_encoding_set): missing return type.
-
-Tue Dec 25 14:03:48 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* test/rinda/test_rinda.rb (MockClock#{_forward, forward, sleep}):
-	  Change default value of n as @reso from nil.  If default value is
-	  nil, n.+ is not defined.
-
-Tue Dec 25 13:54:01 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io_m17n.rb (test_pipe): fixed.
-	  [ruby-dev:32743]
-
-Tue Dec 25 13:44:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_wait_fd_rw): should check EBADF on select().
-
-Tue Dec 25 13:30:03 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c, thread_pthread.h, thread_win32.c,
-	  thread_win32.c: make some functions static functions.
-	  a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
-	  in [ruby-core:14407]
-
-Tue Dec 25 13:23:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io_m17n.rb (test_write_noenc): don't mix text and
-	  binary mode.  [ruby-dev:32743]
-
-Tue Dec 25 13:13:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* README.EXT.ja, dir.c, eval.c, eval_intern.h, lex.c.src,
-	  lex.c.blt, keywords, load.c, thread.c: more ANSI'ize.
-	  a patch from Tadashi Saito <shiba AT mail2.accsnet.ne.jp>
-	  in [ruby-dev:32725]
-
-Tue Dec 25 13:07:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, thread.c, cont.c: add RUBY_VM_SET_INTERRUPT(),
-	  RUBY_VM_SET_TIMER_INTERRUPT(), RUBY_VM_INTERRUPTED().
-
-	* thread.c, thread_pthread.c, thread_win32.c: fix to ignore time slice
-	  event until sleep.
-
-	* bootstraptest/test_thread.rb: add a test for time limited join test.
-
-Tue Dec 25 12:42:59 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (Init_VM): remove unused code.
-	  [ruby-dev:32732]
-
-Tue Dec 25 12:32:32 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c: Moving a static counter from inside register_transcoder()
-	  and register_functional_transcoder() to outside the functions, renaming
-	  from n to next_transcoder_position. Fixes 3) in [ruby-dev:32715].
-
-Tue Dec 25 12:22:17 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* sample/from.rb: follow Ruby 1.9 libraries.
-
-Tue Dec 25 12:21:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (method_inspect): preserve encoding of the method name.
-
-Tue Dec 25 12:07:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (BASERUBY): delayed error until BASERUBY is used.
-
-Tue Dec 25 11:48:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/README: removed obsoleted files: dbmtest.rb,
-	  getopts.test, mrshtest.rb, regx.rb.
-
-Tue Dec 25 11:45:34 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb:  Import the FasterCSV source as the new CSV class.
-
-	* test/csv/*:  Added all applicable tests from FasterCSV.
-
-Tue Dec 25 11:33:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (report_bug): uses ruby_description.
-
-Tue Dec 25 11:20:38 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix stack consistency error.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>  [ruby-dev:32720]
-
-	* bootstraptest/test_syntax.rb: add 2 tests for above.
-
-Tue Dec 25 11:14:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c, vm_core.h: comment out unused fields.
-
-Tue Dec 25 11:02:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: check frame is FINAL when creating env.
-	  [ruby-core:14395]
-
-	* bootstraptest/test_block.rb: add a test for above.
-
-Tue Dec 25 09:12:13 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/:  Enable RDoc debugging only with $DEBUG_RDOC.
-
-Tue Dec 25 08:37:43 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	* lib/csv.rb, test/csv/test_csv.rb:  Removed in preparation for
-	  FasterCSV code import.
-
-Tue Dec 25 08:27:43 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Fix test failures.
-
-	* test/rubygems/test_gem.rb:  Fix test failure.
-
-Tue Dec 25 06:23:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb, test_literal.rb: move fixed test.
-
-Tue Dec 25 06:19:04 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* sample/biorhythm.rb: follow Ruby 1.9 libraries.
-
-Tue Dec 25 06:15:01 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: add dummy toplevel frame.
-
-Tue Dec 25 05:44:56 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Fix uninitialized variable warning.
-	  [ruby-talk:284582]
-
-	* lib/irb/output-method.rb:  Remove unused #foo method.
-	  [ruby-talk:284582]
-
-Tue Dec 25 05:24:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile): clear local table if node == 0.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>  [ruby-dev:32530]
-
-	* vm.c: clear VM stack.
-
-Tue Dec 25 04:23:32 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (rb_id2str): fill klass of returned string as rb_cString.
-	  some strings are allocated before rb_cString is created.
-	  This prevents a "called on terminated object" error by
-	  ObjectSpace.each_object(Module) {|m| p m.name }.
-
-Tue Dec 25 03:51:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix stack consistency bug.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
-
-Tue Dec 25 03:19:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* tool/make-snapshot: must create configure and lex.c.
-
-Tue Dec 25 03:16:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_pipe): now takes up to two arguments.  allow its
-	  external/internal encoding by Encoding objects.
-
-	* io.c (rb_io_set_encoding): new method to set encoding of the IO.
-
-	* io.c (argf_set_encoding): ditto.
-
-Tue Dec 25 03:08:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* pack.c (pack_pack): use NUM2LONG instead of NUM2INT.
-
-	* numeric.c (fix_lshift, fix_aref): use SIZEOF_LONG instead of
-	  SIZEOF_VALUE.
-
-	* bignum.c (big2ulong, rb_big_aref): ditto.
-
-Tue Dec 25 02:55:26 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/rexml/element.rb (REXML::Elements#each): yield in each
-	  should be called with one parameter. [ruby-dev:32708]
-
-Tue Dec 25 02:15:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): add a "pop" insn after break
-	  to fix stack consistency error.  [ruby-core:14385]
-
-	* bootstraptest/test_syntax.rb: add tests for above.
-
-	* bootstraptest/test_knownbug.rb: remove fixed bug.
-
-Tue Dec 25 01:54:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* id.c (Init_id): remove several unused symbols. [ruby-core:14362]
-
-	* compile.c (iseq_specialized_instruction): do not use
-	  VM_CALL_SEND_BANG flag any longer.
-
-Tue Dec 25 01:42:41 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rdoc/rdoc.rb (parse_files): interpret coding cookie.
-
-Tue Dec 25 01:38:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (method_name): preserve Symbol's encoding.
-
-	* numeric.c (fix_id2name): ditto.
-
-Tue Dec 25 01:19:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_left_char_head): new utility macro.
-
-	* include/ruby/encoding.h (rb_enc_right_char_head): ditto.
-
-	* io.c (appendline): does multibyte RS search in the function.
-
-	* io.c (prepare_getline_args): RS may be nil.
-
-	* io.c (rb_io_getc): should process character based on external
-	  encoding, when transcoding required.
-
-Tue Dec 25 01:07:57 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/irb/output-method.rb: translate a comment to English to
-	  avoid mix of EUC-JP comment and UTF-8 Date keyword.
-	  svn substitute Date keyword with UTF-8 weekday on UTF-8 locale.
-
-Tue Dec 25 00:27:28 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservley/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIHandler#do_GET): m17nized.
-
-Mon Dec 24 23:55:29 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/cgi.rb (CGI::escape): m17nized.
-	  (CGI::unescape): ditto.
-	  (CGI::escapeHTML): ditto.
-	  (CGI::unescapeHTML): ditto.
-
-Mon Dec 24 23:32:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* transcode_data_japanese.c (select_iso_2022_mode): '\e' is not valid.
-
-Mon Dec 24 23:13:09 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/rdoc/diagram.rb (RDoc::Diagram#initialize): use fileuitls
-	  instead of ftools.
-
-Mon Dec 24 23:04:57 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/ftools.rb: removed obsoleted lib.  use fileutils instead (by eban).
-
-	* lib/rdoc/rdoc.rb, lib/rdoc/generators/*, lib/rake.rb: let it use
-	  fileutils instead of ftools.
-
-	* lib/shell/command-processor.rb: removed unused references to ftools.
-
-	* lib/parsedate.rb: removed.  see [ruby-core:12535], [ruby-dev:31969].
-
-	* lib/README: updated.
-
-Mon Dec 24 23:01:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI::Buffer): use Meta ===.  [ruby-core:14295]
-
-Mon Dec 24 22:46:42 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* transcode.c: register_functional_transcoder() added.
-	  (init_transcoder_table(: register ISO-2022-JP.
-	  (str_transcode): add preprocessor and postprocessor.
-
-	* transcode_data_japanese.c: add ISO-2022-JP support.
-
-	* transcode_data.h: moved transcoder and transcoding definition from
-	  transcode.c.
-
-Mon Dec 24 20:29:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/io/nonblock/test_flush.rb: fix test for 1.9.
-
-Mon Dec 24 20:23:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/rinda/test_rinda.rb: revert last commit because this test seems
-	  to have timing problem to halt all tests.
-
-Mon Dec 24 20:18:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/rinda/test_rinda.rb: enable rinda test.
-
-Mon Dec 24 20:16:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* instruby.rb: fix rdoc install dir.
-
-Mon Dec 24 18:37:32 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_prepare_re): show regexp encoding in the error message.
-
-Mon Dec 24 18:23:32 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_exc_raise): ANSI style.
-	  (rb_exc_fatal): ditto.
-	  (rb_raise_jump): ditto.
-	  (rb_jump_tag): ditto.
-	  (rb_block_given_p): ditto.
-
-	* variable.c (original_module): ditto.
-
-Mon Dec 24 18:05:09 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (Init_ISeq): disable ISeq.load() because there is no verifier.
-
-	* iseq.c, proc.c: add ISeq.disasm(method).
-
-Mon Dec 24 18:06:03 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval_method.c (Init_eval_method): extracted from Init_eval
-	  for rdoc to find rb_mod_remove_method, rb_mod_undef_method and
-	  rb_mod_alias_method.
-
-	* eval.c (Init_eval): call Init_eval_method.
-
-Mon Dec 24 17:59:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (load_lock): reverted.
-
-	* thread.c (rb_barrier_wait): check for recursive wait.
-
-Mon Dec 24 17:50:54 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (function_call_may_return_twice_jmp_buf): removed.
-	  (function_call_may_return_twice_false): removed.
-	  [ruby-core:14335]
-
-Mon Dec 24 17:40:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (node_name.inc, miniprelude.c, prelude.c): nmake cannot
-	  handle target vpath in other than implicit rules.
-
-Mon Dec 24 17:20:34 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	  int.arpa.
 
-	* lib/{mailread.rb,getopts.rb,parsearg.rb}: removed.
-	  see [ruby-core:12535], [ruby-dev:31969].
+Mon Dec 24 16:18:57 2007  Eric Hodel  <drbrain@segment7.net>
 
-Mon Dec 24 17:12:57 2007  Tanaka Akira  <akr@fsij.org>
+	* lib/rdoc/ri/ri_options.rb:  Fix ri --help listing of gem ri paths.
+	  Merge of r14567 and r14569 from trunk.
 
-	* include/ruby/intern.h, random.c, array.c:
-	  change exported name.
-	  genrand_int32 -> rb_genrand_int32.
-	  genrand_real -> rb_genrand_real.
-	  [ruby-core:14335]
-
-Mon Dec 24 17:06:37 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* {lib,test}/{soap,wsdl,xsd}: removed soap4r along to the discussion
-	  at ruby-core and ruby-dev.  see [ruby-core:12535], [ruby-dev:31969].
-
-Mon Dec 24 17:06:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_feature_p): returns loading path name too.
-
-	* load.c (search_required): returns path too if feature is being
-	  loaded.  [ruby-dev:32048]  [TODO: refactoring]
-
-Mon Dec 24 16:29:12 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* sample/openssl: reviewed and remove dependency on getopts.rb.
-
-Mon Dec 24 16:18:57 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* mkconfig.rb: add teeny to CONFIG['ruby_version'].
-
-Mon Dec 24 15:55:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/compile.rb, getrev.rb, runruby.rb: remove unused tools.
-
-Mon Dec 24 15:42:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, cygwin/GNUmakefile.in, */Makefile.sub,
-	  djgpp/config.hin.: version dependent directory names now contain
-	  teeny.
-
-Mon Dec 24 15:29:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/serb.rb: removed.
-
-Mon Dec 24 13:55:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_proc_new), vm.c (invoke_block): removed u3.state magic.
-	  [ruby-core:14310]
-
-	* test/ruby/test_symbol.rb (test_to_proc): a test from Frederick
-	  Cheung <frederick.cheung AT gmail.com>.
-
-Mon Dec 24 13:43:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork): should not leave living_threads
-	  referring freed table while allocating new table.
-
-Mon Dec 24 12:49:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, configure.in, lib/mkmf.rb, */Makefile.sub: specify
-	  compiled output file name explicitly.
-
-	* enc/Makefile.in, enc/depend: now makes compiler to put generated
-	  files under directories corresponding to the each source.
-	  enc/trans supported.
-
-	* enc/make_encmake.rb: evaluates depend file before Makefile.in so
-	  that the former can influence to CONFIG.
+	* lib/rdoc/ri/ri_paths.rb:  Fix duplication of ri data for multiple
+	  gems.  Merge of r14567 from trunk
 
 Mon Dec 24 12:35:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win{32,ce}/Makefile.sub (MFLAGS): defaulted to -l.
 
-Mon Dec 24 12:08:10 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* /, ext/:  Add svn:ignore for OS X Xcode 3's conftest.dSYM
-	  directories.
-
 Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk: should not pass MAKEFLAGS to recursive make.
-	  + normal make: MFLAGS are set and command line options and macros
-	    are all passed silently.
-	  + GNU make: ditto, and all options and macros in MAKEFLAGS are in
-	    effect.
-	  + nmake: MFLAGS is not set and MAKEFLAGS has only options without
-	    hyphen, no macros exist in any variables.
-	  + Borland make: ditto, and command line macros cannot override
-	    macros in makefile, so passing them is vain.
-
 	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
 	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
 
-Mon Dec 24 11:32:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_comparable): fixed to keep transitivity.
-	  [ruby-dev:32693]
-
-Mon Dec 24 11:20:31 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/ri_options.rb:  Fix display of GEMDIRS, make command
-	  examples match ri's name.
-
-	* lib/rdoc/ri/ri_paths.rb:  Only allow latest ri dirs in ri output.
-
-Mon Dec 24 10:49:04 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/uri/mailto.rb, lib/uri/common.rb:  Fix Regexp warnings.  Patch
-	  #16524 from Kornelius Kalnbach, [ruby-core:14302].
-
-Mon Dec 24 10:37:38 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* gem_prelude.rb:  Remove methods from Gem, not QuickLoader, to fix
-	  warnings.
-
-Mon Dec 24 09:45:45 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c, transcode_data_one_byte.c, transcode_data_japanese.c:
-	  added rb_ prefix to external data symbols.
-
-Mon Dec 24 05:32:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_inject): updated documentation.  a patch from Keita
-	  Yamaguchi <keita.yamaguchi AT gmail.com> in [ruby-dev:32686].
-
-	* README.EXT: updated.  a patch from Tadashi Saito
-	  <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14328].
-
-	* array.c (rb_ary_at): updated documentation. a patch from Tadashi
-	  Saito <shiba AT mail2.accsnet.ne.jp> in [ruby-core:14330].
-
-Mon Dec 24 05:13:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_trans): should associate new encoding if modified.
-
-Mon Dec 24 04:04:12 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/net/http/test_https.rb: should rescue LoadError.
-
-Mon Dec 24 03:57:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c, vm.h: fix to support sparc machine.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
-
-Mon Dec 24 03:35:19 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: remove additional "-".
-
-Mon Dec 24 02:59:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_check_readable): should not fill fptr->enc always.
-	  read-write IO (e.g. socket) does not work.  [ruby-dev:32685]
-
-	* io.c (io_read_encoding): retrieve reading encoding.
-
-	* io.c (prepare_getline_args): convert RS to external encoding.
-
-	* string.c (str_new_shared): was setting embedding flag of wrong
-	  string object.  [ruby-dev:32685]
-
-	* io.c (io_enc_str): should preserve default_external encoding.
-
-	* io.c (appendline): should do multibyte aware RS search.
-
-Mon Dec 24 02:06:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_open): documentation update.
-
-	* io.c (rb_io_s_pipe): ditto.
-
-	* io.c (io_fwrite): wrong encoding destination.
-
-	* io.c (rb_io_external_encoding): should return the encoding of
-	  the file reading.
-
-	* io.c (rb_io_internal_encoding): should return the encoding of
-	  read string.
-
-Mon Dec 24 01:46:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_pipe): allow specifying read-side encoding.
-
-	* io.c (io_enc_str): wrong encoding destination.
-
-Mon Dec 24 01:03:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_comparable): comparison including broken
-	  coderange strings do not consider encoding.
-
-Mon Dec 24 00:57:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (open_key_args): IO direct methods (foreach, readlines,
-	  read) now takes keyword argument: encoding, mode, open_args.
-
-Mon Dec 24 00:52:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_read): encoding argument reverted.
-
-	* io.c (mode_enc): independent function to share code.
-
-	* io.c (rb_io_internal_encoding): new method.
-
-Mon Dec 24 00:47:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_beginendblock.rb (TestBeginEndBlock::test_endblockwarn):
-	  rename endblockwarn.rb to endblockwarn_rb to avoid unnecessary
-	  warning in make test.
-
-Sun Dec 23 23:03:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_codepoint): implemented to raise invalid
-	  encoding.
-
-	* include/ruby/encoding.h (rb_enc_codepoint): macro is replaced as a
-	  declaration.
-
-Sun Dec 23 19:45:22 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.httpdate): fix 2 digits year for 20xx.
-	  reported by Tadayoshi Funaba.  [ruby-dev:32687]
-
-Sun Dec 23 19:33:42 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/open-uri.rb:  Fix method redefined warning.  [ruby-core:14304]
-
-Sun Dec 23 18:31:49 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c (rb_nkf_enc_get): use rb_define_dummy_encoding.
-
-	* ext/nkf/nkf.c (Init_nkf): use rb_nkf_enc_get("ASCII").
-
-	* ext/nkf/nkf-utf8/nkf.c: Update 1.161.
-
-	* ext/nkf/nkf-utf9/config.h: default output encoding is now UTF-8.
-
-	* ext/nkf/lib/kconv.rb (Kconv.kconv): replace Encoding#name by
-	  Encoding#to_s.
-
-Sun Dec 23 18:02:52 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/gem_open_uri.rb:  Fix version check.
-
-Sun Dec 23 17:24:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_init): add eucJP as an alias of EUC-JP.
-
-Sun Dec 23 17:00:23 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.httpdate): use Time.utc for
-	  "day-of-week, dd-mon-yy HH::MM:SS GMT" format.
-
-Sun Dec 23 16:12:40 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Fix 1.9 warnings.
-
-Sun Dec 23 15:28:37 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems, test/rubygems:  Fix new 1.9 warnings.
-
-Sun Dec 23 14:43:10 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* gem_prelude.rb:  Use require to load rubygems.rb so the correct path
-	  is in $LOADED_FEATURES on RubyGems upgrade.
-
-Sun Dec 23 11:26:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_call): use exact argument array interface.
-	  [ruby-core:14279]
-
-Sun Dec 23 11:01:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_binmode_m): removed C99ism.
-
-Sun Dec 23 10:23:23 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode_data_one_byte.c: Better (and more honest) optimization.
-
-	* transcode_data_japanese.c: First optimization step.
-
-Sun Dec 23 09:07:02 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c,
-	  ruby.c, transcode.c, ext/nkf/nkf.c: rename rb_ascii_encoding to
-	  rb_ascii8bit_encoding.  rb_ascii_encoding is ambiguous with
-	  ASCII-8BIT and US-ASCII.
-
-Sun Dec 23 03:35:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* version.h: use patchlevel if revision is not set.
-
-	* {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.
-
-	* common.mk (srcs): new target to generated sources.
-
-	* common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
-
-	* enc/depend, enc/make_encmake.rb: use erb.
-
-Sun Dec 23 01:56:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_mode_enc): do not set encoding unless explicitly
-	  specified.
-
-	* io.c (rb_io_check_readable): fill fptr->enc by default_external
-	  if it's empty.
-
-	* io.c (io_enc_str): fptr->enc is always set for reading IO (by
-	  rb_io_check_readable(fptr)).
-
-Sun Dec 23 01:18:06 2007  David Flanagan  <david@davidflanagan.com>
-
-	* io.c, io.h: temporary patch to partially implement
-	  transcode-on-read and transcode-on-write
-
-Sun Dec 23 00:48:05 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/net/imap/test_imap.rb: added tests for SSL.
-
-Sat Dec 22 21:10:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_genericresolver_node_import): should
-	  not set instance variable "@kind" before initializing it.
-	  [ruby-dev:32677]
-
-Sat Dec 22 19:52:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_objectspace.rb: fix condition.
-
-Sat Dec 22 19:17:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/probeprofiler/: removed.
-
-Sat Dec 22 19:14:38 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* process.c (rb_f_fork): Unsupport Kernel.fork() on NetBSD.
-
-Sat Dec 22 15:54:54 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_transcode.rb: Added simple tests for
-	  EUC-JP and Shift_JIS and tests for ASCII-only range
-
-Sat Dec 22 18:20:13 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (version.o): add dependency. [ruby-dev:32680]
-
-Sat Dec 22 17:45:11 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c (Init_nkf): use rb_ascii_encoding() for
-	  rb_nkf_enc_get("US-ASCII").
-	  * if use rb_nkf_enc_get("US-ASCII"), ruby will crash - this is bug?
-
-Sat Dec 22 17:39:03 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb ($extmk): fixed broken condition.
-
-Sat Dec 22 17:35:59 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8.c: Update nkf.c rev:1.157.
-
-	* ext/nkf/nkf.c (rb_nkf_enc_get): replicate proper based encoding.
-
-	* ext/nkf/kconv.c (Kconv#kconv, to*): use self.encoding as from_enc
-	  when from_enc isn't given.
-
-Sat Dec 22 17:06:50 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext.build): removed.
-
-	* ext/openssl/lib/net/ssl.rb (OpenSSL::SSL::SSLContext#set_params):
-	  new method to set suitable SSL parameters.
-
-	* lib/net/pop.rb, lib/net/http.rb, lib/net/imap.rb,
-	  test/openssl/test_ssl.rb: follow above change.
-
-	* test/net/http/test_https.rb: refine error case.
-
-Sat Dec 22 16:58:49 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (encode_utf7): accept UTF-8 strings.
-
-	* lib/net/imap.rb (decode_utf7): return UTF-8 strings.
-
-Sat Dec 22 15:56:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* transcode_data_japanese: typo.
-
-Sat Dec 22 15:54:54 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* ChangeLog: Information for last patch got lost, fixed
-
-Sat Dec 22 15:45:45 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode_data_one_byte: slightly optimized
-
-	* transcode_data_japanese: new data file for EUC-JP and SHIFT_JIS
-	  (not yet optimized; tests to follow; data from
-	  http://nkf.sourceforge.jp/ucm/{SJIS|eucJP}-nkf.ucm)
-
-	* common.mk, transcode.c: Adjusted for transcode_data_japanese
-
-Sat Dec 22 15:30:13 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* */Makefile.sub (MFLAGS): define unless defined.
-
-Sat Dec 22 15:17:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb ($extmk): set true only when under ext/ or tool/.
-
-Sat Dec 22 15:14:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encs, ext/ripper/ripper.c): needs MFLAGS.
-
-	* configure.in (STRINGIZE): stringizing macro.
-
-	* include/ruby/defines.h (STRINGIZE): fallback.
-
-	* tool/make-snapshot: new file.
-
-	* version.c (ruby_description, ruby_copyright): string constants for
-	  -v option.
-
-Sat Dec 22 15:03:37 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (initialize): fixed documentation.
-
-Sat Dec 22 15:01:16 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/pop.rb (enable_ssl): use OpenSSL::SSL::SSLContext.build
-	  instead of SSLContext.new (default verify mode is now
-	  OpenSSL::SSL::VERIFY_PEER).
-
-Sat Dec 22 14:45:21 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: shouldn't freeze nil. [ruby-dev:32677]
-
-Sat Dec 22 14:27:27 2007  Tanaka Akira  <akr@fsij.org>
-
-	* regenc.c (onigenc_ascii_is_code_ctype): moved from enc/ascii.c.
-
-	* regenc.h (onigenc_ascii_is_code_ctype): declared.
-
-	* enc/ascii.c: use onigenc_ascii_is_code_ctype.
-
-	* enc/us_ascii.c: new file for US-ASCII.
-
-Sat Dec 22 14:30:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_iter): allows non-ascii names and
-	  get rid of reserved word IDs.
-
-Sat Dec 22 14:18:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_float.rb, test_sprintf.rb: fix test place.
-
-Sat Dec 22 14:17:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_objectspace.rb: skip frozen string.
-
-Sat Dec 22 14:02:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c (rb_ary_permutation): add volatile to avoid GC problem.
-
-Sat Dec 22 11:47:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_obj_instance_eval): use class of immediate objects.
-
-	* test/ruby/test_eval.rb: fix a test.
-
-Sat Dec 22 11:37:06 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* encoding.c (rb_locale_charmap): win32 support.
-
-Sat Dec 22 11:31:14 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* gem_prelude.rb:  Place bin dir before lib dir so gem bin stubs work.
-
-Sat Dec 22 11:05:44 2007  Jim Weirich  <jim@tardis.local>
-
-	* lib/rake.rb (Rake): Added Rake and related libraries to the
-	  source code base.
-
-Sat Dec 22 10:30:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/insns2vm.rb: moved from lib/vm/instruction.rb.
-
-Sat Dec 22 10:25:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_iter): captured name should
-	  not be reserved word.  a patch from Keita Yamaguchi
-	  <keita.yamaguchi AT gmail.com> in [ruby-dev:32675].
-
-	* parse.y (reg_named_capture_assign_iter): just ignore the
-	  captures that do not have valid local variable name.
-
-Sat Dec 22 10:19:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_method_name): now __method__ and __callee__ are
-	  aliases.  [ruby-core:14244]
-
-Sat Dec 22 08:29:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_buf_append): improvement for non-broken coded
-	  strings.
-
-Sat Dec 22 06:30:04 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_fork.rb: skip if fork is not unsupported.
-
-	* bootstraptest/test_io.rb: skip if require failed.
-
-Sat Dec 22 06:09:12 2007  David Flanagan  <david@davidflanagan.com>
-
-	* io.c: fix typo in rdoc comment
-
-Sat Dec 22 05:09:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
-
-	* ext/nkf/nkf.c (rb_nkf_putchar): ditto.
-
-Sat Dec 22 03:54:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_ascii_encoding): renamed from previous
-	  rb_default_encoding().
-
-Sat Dec 22 02:49:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (command): block from cmd_brace_block was ignored.
-	  [ruby-dev:32644]
-
-	* re.c (rb_reg_prepare_re): stop ENCODING_NONE warning if the
-	  encoding of the str is ASCII-8BIT.
-
-Sat Dec 22 01:52:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_ungetc): avoid buffer relocation, which might cause
-	  serious problem under concurrent situation.
-
-Sat Dec 22 01:35:41 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (ARG_ENCODING_NONE): defined for /.../n option.
-	  (REG_ENCODING_NONE): ditto.
-	  (rb_char_to_option_kcode): return ARG_ENCODING_NONE for n.
-	  (rb_reg_prepare_re): warn /ascii/n =~ "non-ascii".
-	  (rb_reg_initialize): set REG_ENCODING_NONE from ARG_ENCODING_NONE.
-
-Sat Dec 22 01:23:10 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/json/test_json_addition.rb (test_core): do not use Time.now
-	  because JSON can't hold nsec.
-
-Sat Dec 22 01:10:30 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/sample/tkextlib/vu/canvSticker2.rb,
-	  ext/tk/sample/demos-{en,jp}/bind.rb: fix typo. [ruby-dev:32668]
-
-Sat Dec 22 00:56:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/test.rb (valid_syntax): force_encoding input script.
-
-Fri Dec 21 23:48:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (depend_rules): suffixes list broken. fixed.
-
-Fri Dec 21 20:18:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_mul0): remove unused variable.
-
-	* bignum.c (bigdivrem): ditto.
-
-Fri Dec 21 20:13:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_catch_obj, rb_throw_obj): prototyped.
-
-	* include/ruby/intern.h (rb_fiber_alive_p): prototyped.
-
-Fri Dec 21 20:09:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_succ): retry increasing until valid char is found.
-
-Fri Dec 21 20:00:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_replicate): now creates first class encoding.
-
-	* encoding.c (rb_define_dummy_encoding): always based on the default
-	  encoding.
-
-	* encoding.c (rb_enc_dummy_p): check if dummy.
-
-	* encoding.c (enc_inspect): shows if dummy.
-
-	* encoding.c (Init_Encoding): added dummy? method
-
-	* include/ruby/encoding.h (ENCODING_INLINE_MAX): increased.
-
-Fri Dec 21 18:40:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* io.c: write() should be in blocking region.
-
-	* bootstraptest/test_io.rb, test_knownbug.rb: move a fixed test.
-
-Fri Dec 21 17:56:30 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: provisional support on Ruby-VM.
-
-	* ext/tk/MANUAL_tcltklib.eng, ext/tk/MANUAL_tcltklib.eucj:
-	  modify document about new functions.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/labelframe.rb,
-	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/toplevel.rb,
-	  ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/message.rb,
-	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/text.rb,
-	  ext/tk/lib/tk/scale.rb, ext/tk/lib/tk/entry.rb,
-	  ext/tk/lib/tk/ttk_selector.rb, ext/tk/lib/tk/menu.rb,
-	  ext/tk/lib/tk/label.rb, ext/tk/lib/tk/spinbox.rb,
-	  ext/tk/lib/tk/textmark.rb, ext/tk/lib/tk/winpkg.rb,
-	  ext/tk/lib/tk/checkbutton.rb, ext/tk/lib/tk/panedwindow.rb,
-	  ext/tk/lib/tk/texttag.rb, ext/tk/lib/tk/root.rb,
-	  ext/tk/lib/tk/textimage.rb, ext/tk/lib/tk/radiobutton.rb,
-	  ext/tk/lib/tk/package.rb, ext/tk/lib/tk/macpkg.rb,
-	  ext/tk/lib/tk/composite.rb, ext/tk/lib/tk/autoload.rb,
-	  ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/button.rb,
-	  ext/tk/lib/tk/textwindow.rb,
-	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb,
-	  ext/tk/lib/tkextlib/tile/style.rb,
-	  ext/tk/lib/tkextlib/tile/tscrollbar.rb,
-	  ext/tk/lib/tkextlib/tile/tpaned.rb, ext/tk/lib/tkextlib/tile.rb,
-	  ext/tk/extconf.rb: support Tcl/Tk8.5 (partial, not complete).
-
-	* ext/tk/sample/demos-jp/widget,
-	  ext/tk/sample/demos-jp/pendulum.rb,
-	  ext/tk/sample/demos-jp/bind.rb,
-	  ext/tk/sample/tkextlib/vu/canvSticker2.rb,
-	  ext/tk/sample/demos-en/pendulum.rb,
-	  ext/tk/sample/demos-en/bind.rb: remove $KCODE and minor bug fix.
-
-Fri Dec 21 17:49:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (rb_str_transcode_bang): returns self if no conversion.
-	  [ruby-dev:32662]
-
-Fri Dec 21 17:44:47 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*:  Update to RubyGems 1.0.1, r1581
-
-Fri Dec 21 17:32:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/pending.rb: renamed from featurebug.rb.
-	  This file contains bugs which is known but will not be
-	  fixed in days.
-
-Fri Dec 21 17:31:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE
-	  constants.
-
-	* .gdbinit: use enum constants.
-
-Fri Dec 21 17:28:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/featurebug.rb: added.
-
-	* bootstraptest/test_knownbug.rb: move a feature bug.
-
-Fri Dec 21 17:25:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_atfork): fix to mark thread object.
-	  [ruby-dev:32404]
-
-	* bootstraptest/test_knownbug.rb, test_fork.rb: move a fixed test.
-
-Fri Dec 21 17:07:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.h: extern variable should not be initialized.
-
-	* thread_pthread.c: add a parameter.
-
-Fri Dec 21 16:50:43 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (Init_Encoding): use enc_name as to_s.
-	  (enc_inspect): renamed from enc_to_s.  add "#" at beginning.
-
-Fri Dec 21 16:37:43 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/config.h (MIME_DECODE_DEFAULT, X0201_DEFAULT):
-	 defined as FALSE.  nkf and kconv don't decode MIME encoded string
-	 and don't convert JIS X 0201 Katakana.
-
-	* test/nkf/test_kconv.rb: fix tests.
-
-Fri Dec 21 16:33:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (enumerator_iter_i): adjusted for rb_block_call_func.
-
-	* include/ruby/ruby.h (rb_block_call_func): function to be called back
-	  as block.
-
-Fri Dec 21 16:25:25 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk, transcode_data_iso_8859.c: renamed to
-	  transcode_data_one_byte.c.
-
-Fri Dec 21 16:10:30 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
-
-	* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
-	  pointed by Ryan Platte fixed(Patch to the patch from "NATORI
-	  Shin").  [ruby-talk:273360]
-
-Fri Dec 21 16:06:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (append_utf8): use rb_utf8_encoding() instead of
-	  rb_enc_find("utf-8").
-
-Fri Dec 21 15:59:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_init): use enc_register_at() directly.
-
-	* encoding.c (rb_utf8_encoding): returns utf-8 encoding.
-
-	* include/ruby/encoding.h (rb_utf8_encoding): prototyped.
-
-	* parse.y (UTF8_ENC): uses rb_utf8_encoding().
-
-Fri Dec 21 15:31:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_read): allow specifying encoding explicitly.
-
-	* io.c (rb_io_binmode): specifies encoding to ASCII-8BIT (binary).
-
-	* io.c (rb_io_s_read): IO should be in binary mode when offset is
-	  specified.
-
-	* encoding.c (rb_to_encoding): returns default encoding if no
-	  corresponding encoding found.
-
-Fri Dec 21 15:24:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (initialize): accept service name.  changed
-	  the default value of the old style +verify+ argument to true.
-
-Fri Dec 21 15:15:44 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (rb_garbage_collect): new function for debugging.
-
-Fri Dec 21 15:16:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_to_encoding_index): should return error instead of
-	  exception even if type is incorrect.
-
-Fri Dec 21 14:58:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_init_copy): prohibit cloning of
-	  generators since Fibers cannot be copied.
-
-	* enumerator.c (enumerator_init_copy): typo fixed.
-
-Fri Dec 21 14:46:07 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (Init_IO): define IO::BINARY even if O_BINARY is not exist.
-
-Fri Dec 21 14:01:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_system.rb (TestSystem::valid_syntax): apply
-	  ASCII-8BIT encoding explicitly.
-
-	* re.c (rb_reg_prepare_re): add encoding name in the message.
-
-Fri Dec 21 13:54:05 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c: change "character encodings differ" error messages.
-
-Fri Dec 21 13:46:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_register): set encoding constant.
-
-	* encoding.c (rb_enc_find_index): replace non-alphanumeric chars with
-	  underscores, so that initialize function can be called.
-
-	* encoding.c (rb_enc_find_index): extension libraries have lower case
-	  names conventionally.
-
-	* ruby.c (proc_options, process_options): finds encoding after
-	  load_path is initialized.
-
-Fri Dec 21 13:10:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_external_encoding): new method.
-
-	* encoding.c (rb_enc_from_encoding): returns Qnil for NULL
-	  encoding.
-
-	* io.c (rb_io_external_encoding): should fill delayed
-	  initialization for STDIN.
-
-Fri Dec 21 13:09:11 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_locale_charmap): return nil if no locale information.
-
-Fri Dec 21 12:55:39 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/runit, lib/rubyunit.rb, test/testunit/runit: removed.
-
-Fri Dec 21 12:45:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_chomp_bang): avoid unnecessary loop using
-	  ONIGENC_LEFT_ADJUST_CHAR_HEAD().
-
-Fri Dec 21 12:32:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (Init_File): File.exists? revived.
-
-	* dir.c (Init_Dir): Dir.exists? again.
-
-Fri Dec 21 12:26:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: remove "illegal".
-
-Fri Dec 21 12:22:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* keywords, parse.y (__ENCODING__): represent script encoding.
-
-Fri Dec 21 12:16:50 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_is_ascii_only_p): new method ascii_only?.
-
-Fri Dec 21 12:11:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_mode_enc): set default external encoding if no
-	  encoding specified explicitly.
-
-Fri Dec 21 12:00:34 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: check langinfo.h and locale.h.
-
-	* encoding.c: use langinfo.h only if available.
-
-	* main.c: use locale.h only if available.
-
-Fri Dec 21 11:47:56 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c: include locale.h
-	  (rb_locale_charmap): new method Encoding.locale_charmap for
-	  nl_langinfo(CODESET).
-
-	* include/ruby/encoding.h (rb_locale_charmap): declared.
-
-	* main.c (main): call setlocale with LC_CTYPE.
-
-	* ruby.c (locale_encoding): use rb_locale_charmap.
-
-Fri Dec 21 11:35:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_dump.c: fix typo.  Reported by Yuki Mitsui.
-
-Fri Dec 21 11:28:00 2007  Tanaka Akira  <akr@fsij.org>
-
-	* regerror.c, string.c, io.c, lib/getoptlong.rb, lib/net/imap.rb,
-	  compile.c, sprintf.c, parse.y, ext/win32ole/win32ole.c,
-	  ext/tk/sample/demos-en/entry3.rb, ext/tk/lib/tcltk.rb,
-	  ext/openssl/ossl_bn.c, numeric.c, vm.c,
-	  benchmark/bm_so_meteor_contest.rb, bignum.c, ruby.c: don't "illegal"
-	  for non law violation context.
-
-Fri Dec 21 11:23:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (enc.mk): depends on $(RBCONFIG) instead of rbconfig.rb.
-
-	* encoding.c (Init_Encoding): ISO-8859-1 is no longer a replica.
-
-	* regenc.h (OnigEncodingDefine): names of extension and encoding can
-	  differ.
-
-	* enc/Makefile.in: always shared.
-
-	* enc/depend (deffile): should not upcase.
-
-	* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: fix for Init.
-
-Fri Dec 21 09:26:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: use erb.
-
-Fri Dec 21 08:07:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_next): should call next_init() if fiber
-	  is dead already. [ruby-dev:32459]
-
-Fri Dec 21 01:21:49 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
-	  enable CRL checking by default.
-
-Fri Dec 21 01:20:56 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/http.rb (Net::HTTP#connect): use
-	  OpenSSL::SSL::SSLContext.build instead of SSLContext.new (default
-	  verify mode is now OpenSSL::SSL::VERIFY_PEER).
-
-	* lib/net/https.rb: SSL parameters are defined by attr_accessor.
-
-	* test/net/http/test_https.rb: add test for HTTPS features.
-
-Fri Dec 21 01:11:37 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* io.c (select_internal): should return original value.
-
-Fri Dec 21 00:26:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_trans): wrong encoding check for tree strings.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_tr_s): "invalid mbstring
-	  sequence" is not an error to be tested.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_tr): ditto.
-
-Thu Dec 20 19:29:07 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (initialize): the second argument is an option
-	  hash now.  use SSLContext.build to specify SSL parameters.
-
-Thu Dec 20 19:11:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (native_thread_apply_priority): check
-	  _POSIX_PRIORITY_SCHEDULING for OpenBSD.
-
-Thu Dec 20 18:33:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in: add libthr for FreeBSD.
-
-Thu Dec 20 18:17:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk, *.ci: renamed to *.c.
-
-	* eval_load.c: renamed to load.c.
-
-Thu Dec 20 17:36:01 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*:  Import RubyGems 1.0.0, r1575.
-
-Thu Dec 20 17:18:38 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: support Proc#binding.
-
-	* sample/test.rb: add a test.
-
-Thu Dec 20 17:15:15 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* pack.c: Slight change to documentation ('character' ->
-	  'byte (C char)'). [ruby-core:13126], see also [ruby-core:13998].
-
-Thu Dec 20 17:07:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (enc.mk): depends on rbconfig.rb.
-
-	* regenc.h (OnigEncodingDefine): external encoding definition macro.
-
-	* enc/Makefile.in: fix for linking.
-
-	* enc/depend, enc/make_encmake.rb: fix for Windows.
-
-	* enc/{ascii,euc_jp,sjis,utf8,iso_8859_{1..16}}.c: renamed.
-
-Thu Dec 20 16:42:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (find_line_no): return 0 if not found.
-
-Thu Dec 20 16:04:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci, vm.c, vm_core.h: change interface of
-	  vm_invoke_block() to specify block ptr.  [ruby-talk:266422]
-
-	* cont.c, eval_jump.ci, insns.def, proc.c, signal.c, thread.c:
-	  apply above change.
-
-	* bootstraptest/test_knownbug.rb: move fixed bug.
-
-	* bootstraptest/test_block.rb: ditto. and add a test.
-
-Thu Dec 20 15:47:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/iso_8859_{1..16}.c: renamed.
-
-Thu Dec 20 09:59:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_expandarray): fix sp increase place.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32581].
-
-	* bootstraptest/test_massign.rb: add a test for above.
-
-	* bootstraptest/test_syntax.rb: fix last committed test.
-
-Thu Dec 20 09:47:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_syntax.rb: add a test.
-
-Thu Dec 20 09:40:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each/NODE_RETURN): fix stack consistency.
-
-Thu Dec 20 09:42:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (big2str_orig): access beyond memory region cause crash
-	  on interrupt.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in
-	  [ruby-dev:32651].  [ruby-dev:32641]
-
-Thu Dec 20 09:06:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_index): wrong starting position.
-
-Thu Dec 20 06:34:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): add pop after throw as return.
-
-	* bootstraptest/test_knownbug.rb, test_syntax.rb: move resolved test.
+Sat Dec 22 14:49:46 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* vm_core.h, iseq.c, compile.h: add debug output code.
-
-Thu Dec 20 04:57:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): remove unused retry entry.
-
-Thu Dec 20 04:15:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* */Makefile.sub (DEFS, RM): output to config.status.
-
-Thu Dec 20 02:59:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* common.mk (encs): create encoding directory.
-
-Thu Dec 20 02:50:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/iso8859_{1..16}.c: adjust for ruby.
-
-Thu Dec 20 02:28:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/iso8859_{1..16}.c: imported from Onigiruma 5.9.0.
-
-Thu Dec 20 02:23:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/Makefile.in (RM): added.
-
-	* enc/depend (encs): sort in alpha-numeric order.
-
-	* enc/depend (clean, distclean): added.
-
-Thu Dec 20 01:10:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): should handle upper level eval iseq
-	  from break/next, and COMPILE_ERROR() breaks only one block.
-	  [ruby-dev:31372]
-
-Thu Dec 20 00:07:36 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/drbtest.rb (test_07_public_private_protected_missing):
-	  followed current Ruby specification.
-
-Wed Dec 19 23:57:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
-	  is not needed.  [ruby-dev:32640]
-
-Wed Dec 19 22:59:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_sublen): adjust position if position is not at the
-	  head of a character.
-
-	* string.c (rb_str_chomp_bang): check if match start at the head
-	  of a character.
-
-	* string.c (rb_str_chomp_bang): wrong adjust condition.
-
-	* string.c (rb_str_rindex): comparison length should be based on
-	  bytes, not characters.
-
-	* string.c (rb_str_rindex_m): too much adjustment.
-
-	* re.c (reg_match_pos): pos adjustment should be based on
-	  characters.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_str_insert): test updated
-	  to check negative offset behavior.
-
-	* string.c (rb_str_each_line): should consider rslen.
-
-	* string.c (rb_str_buf_append): should propagate encoding.
-
-	* string.c (rb_str_each_line): ditto.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_str_each_line): should
-	  check encoding as well.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_str_each_line): empty
-	  array can not propagate encoding;  should not check.
-
-Wed Dec 19 21:42:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_regsub): should set checked encoding.
-
-	* string.c (rb_str_sub_bang): applied r14212 too.
-
-Wed Dec 19 20:40:01 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (bigmul1): C99ism.
-
-	* bignum.c (bigdivrem1): need dummy return value.
-
-Wed Dec 19 19:18:06 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Updated.
-
-	* ext/nkf/nkf.c (rb_nkf_enc_get): added.
-	  (find encoding or replicate default encoding)
-
-	* ext/nkf/nkf.c (NKF::<ENCODING>): redefine encoding constant.
-
-	* ext/nkf/lib/kconv.rb (Kconv::<ENCODING>): redefined as Encoding.
-
-	* ext/nkf/lib/kconv.rb: refactoring.
-
-Wed Dec 19 19:11:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_mul0): blocking check for bigger numbers.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32632].
-
-	* bignum.c (bigdivrem): ditto.
-
-Wed Dec 19 17:34:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): remove "retry" in block.
-	  ("iter{retry}" cause syntax error)
-	  Currently, "begin; ...; rescue; iter{retry}; end" cause
-	  syntax error too.
-
-	* bootstraptest/test_jump.rb: ditto.
-
-	* lib/drb/invokemethod.rb: ditto.
-
-	* sample/drb/darrayc.rb: ditto.
-
-	* sample/test.rb: ditto.
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/ruby/test_iterator.rb: ditto.
-
-	* sample/test.rb: add a 'test' directory on the SYSTEM test.
-
-Wed Dec 19 17:12:59 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb, test_block.rb:
-	  move fixed bug.
-
-	* bootstraptest/test_m17n.rb: added.
-
-Wed Dec 19 16:59:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (errinfo_place): skip if error is Fixnum.  [ruby-dev:32608]
-
-	* bootstraptest/test_exception.rb, test_known_bug.rb: move fixed bug.
-
-Wed Dec 19 16:31:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_iter): remove C99 dependency.
-
-	* parse.y (reg_named_capture_assign_iter): get rid of creating
-	  unnecessary ID.
-
-	* parse.y (rb_enc_symname2_p): check for non-nul-terminated string.
-
-Wed Dec 19 15:37:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insnhelper.ci (vm_yield_with_cfunc): call cfunc with
-	   (argv[0], data, argc, argv) to pass all arguments.
-
-	* enumerator.c (enumerator_each_i): adapted to new calling
-	  convention.
-
-Wed Dec 19 15:13:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): should propagate encoding from pad
-	  string too.
+	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
+	  the issue. [ruby-dev:32677]
 
 Wed Dec 19 13:57:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
 	  arguments.  [ruby-dev:32631]
 
-Wed Dec 19 13:22:14 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c (NKF::_ENCODING): removed.
-
-	* ext/nkf/nkf.c (rb_nkf_kconv): renamed to rb_nkf_convert.
-
-	* ext/nkf/nkf.c (rb_nkf_convert): set encoding.
-
-	* ext/nkf/nkf.c (rb_nkf_guess1): removed.
-
-	* ext/nkf/nkf.c (rb_nkf_guess2): renamed to rb_nkf_guess.
-
-	* ext/nkf/nkf.c (rb_nkf_guess):
-	  guess method now returns encoding object.
+Wed Dec 19 12:01:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/nkf/nkf-utf8/nkf.c: Update to nkf 2.0.8 2007-12-19.
+	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
 
 Wed Dec 19 10:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_cstr_to_inum): an underscore succeeding after octal
 	  prefix is allowed.  [ruby-core:14139]
 
-Wed Dec 19 00:09:19 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_cstr_to_inum): wrong radix check.  a patch from
-	  Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-dev:32628].
-
-	* bignum.c (big2str_find_n1): ditto.
-
-Tue Dec 18 23:53:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): fix for segfault.  [ruby-dev:31372]
-
-Tue Dec 18 23:44:32 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/net/http/utils.rb: split TestNetHTTPUtils module from
-	  test/net/http/test_http.rb. and start HTTP server in each test case.
-
-Tue Dec 18 23:27:51 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
-	  should rescue Errno::EINVAL from TCPServer#accept. this exception
-	  might occur if the server socket is not in ready to listen.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
-	  don't call TCPServer#close if the :ShutdownSocketWithoutClose is set.
-
-	* lib/webrick/config.rb (WEBrick::Config::General): add new parameter
-	  :ShutdownSocketWithoutClose.
-
-Tue Dec 18 22:51:47 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#shutdown):
-	  new method which calls TCPSocket#shutdown of the underlying socket.
-
-Tue Dec 18 22:11:50 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/rss/parser.rb, lib/rss/atom.rb, lib/rss/rss.rb,
-	  test/rss/rss-assertions.rb, test/rss/test_atom.rb: use
-	  pack/unpack("m") instead of base64 library.
-
-	* lib/webrick/httpproxy.rb: use delete("\n") instead of chomp/chop
-	  because the result of pack("m") might be multi-line.
-
-Tue Dec 18 22:12:35 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci, vm.c: rewrite sp manipulation around method/block
-	  invocation.  [ruby-dev:32547]
-
-Tue Dec 18 22:11:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/win32/lib/win32/sspi.rb: use pack/unpack("m") instead of
-	  base64 library which was already removed.
-
-Tue Dec 18 21:09:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block): merge 2 stack overflow checks.
-
-Tue Dec 18 20:58:35 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insnhelper.ci, insns.def, object.c, vm.c, vm.h:
-	  optimize !@, != method invocation.
-
-	* id.c, id.h: ditto.
+Mon Dec 17 13:43:15 2007  Tanaka Akira  <akr@fsij.org>
 
-	* bootstraptest/test_syntax.rb: add tests for above.
-
-Tue Dec 18 18:10:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: add issues.
-
-Tue Dec 18 20:22:44 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (arg tMATCH arg): call reg_named_capture_assign_gen if regexp
-	  literal is used.
-	  (reg_named_capture_assign_gen): assign the result of named capture
-	  into local variables.
-	  [ruby-dev:32588]
-
-	* re.c: document the assignment by named captures.
-
-Tue Dec 18 18:09:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_splice): propagate encoding.
-
-	* string.c (rb_str_subpat_set): ditto.
-
-Tue Dec 18 17:27:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_freeze): preserve frozen state of immediate
-	  values in internal hash table, a la generic_ivar.
-
-	* object.c (rb_obj_frozen_p): check immediate values too.
-
-	* variable.c (generic_ivar_set): add frozen check fro immediate
-	  values.
-
-Tue Dec 18 17:04:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (rb_str_transcode_bang, rb_str_transcode): set new
-	  encoding even if no conversion is done because of 7bit only.
-	  [ruby-dev:32591]
-
-Tue Dec 18 15:43:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encs, ext/ripper/ripper.c): other options must come
-	  before MAKEFLAGS in GNU make.
-
-Tue Dec 18 15:19:55 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore.
-
-Tue Dec 18 15:17:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encs, ext/ripper/ripper.c): pass MAKEFLAGS.
-
-Tue Dec 18 14:45:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (op_tbl): remove duplication to avoid symbol aliases.
-
-Tue Dec 18 14:39:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_nth): need not to raise out-of-range exception.
-
-	* test/ruby/test_m17n.rb (TestM17N::test_str_aref_len): removed
-	  debug print.
-
-Tue Dec 18 14:05:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/depend: get rid of target expanded as empty for nmake.
-
-Tue Dec 18 07:56:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (rb_obj_public_method): Object#public_method to retrieve
-	  public method object.
-
-	* proc.c (rb_mod_public_instance_method): Module#public_instance_method
-	  to retrieve public instance method from class / module.
-
-	* proc.c (mnew): visibility check added.
-
-	* eval_error.ci (rb_print_undef): add rb_ prefix.
-
-	* eval_error.ci (rb_print_undef): add visibility in the error
-	  message.
-
-Tue Dec 18 05:54:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/Env.rb, lib/base64.rb, lib/importenv.rb, lib/eregex.rb: removed.
-
-	* lib/ping.rb, lib/readbytes.rb: removed
-
-Tue Dec 18 02:30:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (BUILTIN_ENCS): removed.
-
-	* common.mk (enc.mk): pass BUILTIN_ENCS from command line.
-
-	* enc/depend: ditto.
-
-	* enc/make_encmake.rb: ditto.
-
-Tue Dec 18 01:46:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): need to clear output buffer to avoid
-	  broken encoding compatibility check.
-
-Tue Dec 18 01:40:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (depend_rules): inserts ruby to only headers.
-
-Tue Dec 18 01:21:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_encode_length): chomp eol style modifiers.
-
-	* parse.y (parser_magic_comment): ditto.
-
-	* parse.y (set_file_encoding): ditto.
-
-Tue Dec 18 01:15:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encs): added dependencies.
-
-	* enc/Makefile.in, enc/depend, enc/make_encmake.rb: moved serb code.
-
-	* lib/mkmf.rb (depend_rules): now takes content string, not file name.
-
-	* win32/enc-setup.mak: overrides default target.
-
-Tue Dec 18 00:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): raise error if non-Unicode fixed
-	  encoding option is specified for regexp literals with \u{}
-	  escapes.
-
-	* string.c (rb_str_squeeze_bang): should squeeze multibyte
-	  characters as well.
-
-Mon Dec 17 21:41:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/enc-setup.mak: extracts BUILTIN_ENCOBJS.
-
-	* tool/compile_prelude.rb: needs srcdir.
-
-Mon Dec 17 21:24:04 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* common.mk (miniprelude.c): add -I$(srcdir).
-
-Mon Dec 17 20:53:27 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ssl_version):
-	  new method OpenSSL::SSL::SSLContext#ssl_version to wrap
-	  SSL_CTX_set_ssl_version.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_get_verify_result):
-	  new method OpenSSL::SSL::SSLSocket#verify_result to wrap
-	  SSL_get_verify_result.
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLContext.build):
-	  new method to build OpenSSL::SSL::SSLContext with Hash parameters.
-	  this method provides safety default parameters than SSLContext.new.
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL.verify_certificate_identity):
-	  new module function: pull out identity verification process
-	  from OpenSSL::SSL::SSLSocket#post_connection_check.
-
-Mon Dec 17 18:42:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (scan_once): need no encoding compatibility check.
-	  it's done inside of re_reg_search().
-
-	* string.c (rb_str_split_m): ditto.
-
-	* re.c (rb_reg_regsub): ditto.
-
-Mon Dec 17 17:50:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_index): check if substring is broken.
-
-	* string.c (rb_str_rindex): ditto.
-
-	* string.c (rb_str_succ): should carry over.
-
-Mon Dec 17 17:47:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (encs): new target to compile external encodings.
-
-	* enc/Makefile.in: became a serb template.
-
-	* enc/make_encmake.rb: creates enc.mk from enc/Makefile.in using serb.
-
-	* lib/mkmf.rb (relative_from): moved from ext/extmk.rb.
-
-	* lib/mkmf.rb ($extmk): true if under to top source directory, not
-	  only ext.
-
-	* lib/mkmf.rb (depend_rules): extracted from create_makefile.
-
-	* tool/serb.rb (serb): splitted from tool/compile_prelude.rb.
-
-Mon Dec 17 17:32:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MAKEFILES): removed enc/Makefile.
-
-	* configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
-
-	* enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.
-
-	* enc/depend: splitted from Makefile.in.
-
-	* {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.
-
-Mon Dec 17 17:07:53 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_enc_str_asciionly_p): use rb_enc_str_coderange.
-
-Mon Dec 17 16:39:25 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_enc_str_coderange): set ENC_CODERANGE_BROKEN using
-	  rb_enc_precise_mbclen.
-	  (rb_str_valid_encoding_p): just check coderange is
-	  ENC_CODERANGE_BROKEN or not.
-
-Mon Dec 17 16:04:16 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#gets): added second
-	  optional argument to specify maximum length limit.
-
-Mon Dec 17 16:02:30 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb, lib/webrick/cgi.rb: Request-Line or
-	  header fields should be read with maximum length. [ruby-talk:231745]
-
-Mon Dec 17 14:03:39 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h (ENC_CODERANGE_VALID): rename from
-	  ENC_CODERANGE_8BIT.
-
-	* string.c (rb_enc_str_coderange): follow the renaming.
-
-Mon Dec 17 13:56:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_find): wrong condition fixed.
-
-	* sprintf.c (rb_str_format): check encoding based on result, not
-	  the format string.
-
-	* string.c (rb_str_upto): add encoding check.
+	* gc.c (stack_end_address): use local variable address instead of
+	  __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with
+	  gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
+	  stack_end_address returned a frame address of garbage_collect
+	  since stack_end_address doesn't create its own frame.
+	  So a VALUE stored in a callee saved register, %edi, pushed into
+	  the stack at the beginning of garbage_collect was not marked.
 
 Mon Dec 17 12:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in (RUNRUBY): added RUNRUBYOPT.
 
-Mon Dec 17 11:38:59 2007  Tanaka Akira  <akr@fsij.org>
-
-	* thread_win32.ci (native_thread_create): initialize
-	  th->machine_stack_maxsize as rb_gc_stack_maxsize.
-
-Sun Dec 16 17:07:35 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c (transcode_loop): removed special case (-1)
-	  for undefined conversions.
-
-	* transcode_data_iso_8859.c: Changed from character constants
-	  ('\xC2') to integer constants (0xC2) for shorter files and
-	  better readability; eliminated duplicated tables; changed
-	  from -1 offset to actual UNDEF entry (not yet distinguishing
-	  UNDEF and ILLEGAL correctly).
-
-	* test/ruby/test_transcode.rb: added a test for UNDEF conversion.
-
-Sun Dec 16 14:51:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MAKEFILES): should be enc/Makefile, not GNUmakefile.
-	  [ruby-dev:32609]
-
-	* configure.in (BUILTIN_ENCS): removed escapes for OpenBSD.
-
-Sat Dec 15 23:58:46 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/test_pair.rb (SSLPair#ssl_pair): join the thread, even
-	  on an error.
-
-Sat Dec 15 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/xmlrpc/webrick_testing.rb: join webrick server thread.
-
-Sat Dec 15 22:27:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (BUILTIN_ENCS): splitted command line instead of
-	  semicolons for Solaris.
-
-Sat Dec 15 21:38:24 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/timeout.rb: join the background thread to make sure it is dead.
-
-Sat Dec 15 20:20:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (enc/Makefile): add external encoding objects list.
-
-	* common.mk (BUILTIN_ENCOBJS): renamed from ENCOBJS.
-
-	* configure.in (BUILTIN_ENCS): [] needs to be enclosed because of m4.
-
-	* Makefile.in (BUILTIN_ENCOBJS): substituted by autoconf.
-
-	* enc/Makefile.in: new file to compile external encoding sources.
-
-	* encoding.c (rb_enc_find_index): auto-load external encoding objects
-	  as "ext/ENCODING_NAME".  [ruby-dev:32606]
-
-Sat Dec 15 13:04:30 2007  Tanaka Akira  <akr@fsij.org>
-
-	* vm_core.h (rb_thread_t): new member machine_stack_maxsize and
-	  machine_register_stack_maxsize.
-
-	* gc.c (rb_gc_stack_maxsize): new global variable for the thread size
-	  of the main thread.
-	  (STACK_LEVEL_MAX): use machine_stack_maxsize of current thread.
-	  (ruby_stack_check): check IA64 register stack.
-	  (ruby_set_stack_size): set rb_gc_stack_maxsize.
-	  (Init_stack): set rb_gc_stack_maxsize.
-
-	* thread_pthread.ci (native_thread_create): initialize
-	  th->machine_stack_maxsize and th->machine_register_stack_maxsize.
-
-	* vm.c (Init_BareVM): initialize th->machine_stack_maxsize and
-	  th->machine_register_stack_maxsize.
-
-	* thread_win32.ci (native_thread_create): initialize
-	  th->machine_stack_maxsize.  not tested.  just a guess at all.
-
-	[ruby-dev:32604]
-
-Sat Dec 15 12:58:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_register, rb_enc_replicate, rb_enc_alias): check
-	  if already registered.
-
-Sat Dec 15 01:57:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/options.rb (Options::parse): do not access $KCODE any
-	  longer.  [ruby-core:14079]
-
-	* lib/irb/init.rb (IRB::IRB.parse_opts): ditto.
-
-	* lib/cgi.rb (CGI::CGI): ditto.
-
-Fri Dec 14 18:18:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* thread_pthread.ci (native_thread_create): twice the stack size.
-	  512KB is not enough to complete test-all on Debian GNU/Linux on
-	  IA64.
-
-Fri Dec 14 16:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_p): RDoc update.  a patch from murphy <murphy AT rubychan.de>.
-	  [ruby-core:14010]
-
-Fri Dec 14 16:06:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cmp): encoding aware comparison.
-
-	* string.c (rb_str_casecmp): ditto.
-
-Fri Dec 14 15:25:30 2007  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* transcode.c (encoding_equal): new function.
-
-	* transcode.c (str_transcode, transcode_dispatch): added two-step
-	  conversion logic via UTF-8.
-
-	* transcode.c: some minor formatting fixes
-
-	* transcode_data.h, transcode_data_iso_8859.c: Shortened
-	  extremely frequently used macros to shorten file length.
-
-	* test/ruby/test_transcode.rb: Fixed name of test class;
-	  added setup method to ensure all necessary encodings exist;
-	  split tests into more test methods; added tests; fixed ordering
-	  of arguments in assert_equal to have expected result first.
-
-Fri Dec 14 13:47:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ruby.imp): fix for circular dependency.  a patch from
-	  Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
-
-	* regint.h, st.c, ext/json/ext/generator/generator.c: suppress
-	  warnings on AIX.
-
 Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
@@ -12854,211 +2873,14 @@ Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/readline/extconf.rb: should use have_func for functions instead
 	  of have_var.
 
-Fri Dec 14 10:25:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/e2mmap.rb (Exception2MessageMapper::E2MM.Raise): $! no
-	  longer modifiable in 1.9.
-
-Fri Dec 14 08:17:24 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_protect): restore root_jmpbuf even if proc exits by
-	  break such as dbm.delete_if { break }.
-
-Fri Dec 14 02:55:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_nth): direct jump if string is 7bit only.  great
-	  performance boost for worst case.
-
-	* string.c (str_strlen): direct size if string is 7bit only.
-
-Fri Dec 14 02:29:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_enc_compatible): 1st argument (typically the
-	  receiver) would have higher priority in encoding detection.
-
-Fri Dec 14 02:05:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_synchronized): should check if initialized.
-	  [ruby-dev:32585]
-
-Fri Dec 14 00:54:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): embedded string may override encoding
-	  of the regular expression.
-
-	* re.c (rb_reg_initialize): fix encoding of regular expression if
-	  embedded string has its own encoding specified.
-
-Thu Dec 13 22:16:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_enc_compatible): encoding should never fall back
-	  to ASCII-8BIT unless both encodings are ASCII-8BIT.
-
-Thu Dec 13 20:31:28 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (rb_str_shared_replace): make str noembed after free.
-
-Thu Dec 13 20:09:09 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
-	  'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
-	  on IA64.
-
-Thu Dec 13 17:51:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_split_m): need not to check encoding if regexp
-	  is empty.
-
-	* string.c (rb_str_justify): associate encoding of original to the
-	  result.
-
-	* string.c (rb_str_chomp_bang): need to check encoding of record
-	  separator.
-
-	* string.c (str_gsub): should copy encoding to the result.
-
-	* sprintf.c (rb_str_format): ditto.
-
-	* string.c (rb_str_succ): should not enter infinite loop for
-	  non-ASCII, non-alphanumeric character at the bottom.
-
-Thu Dec 13 17:03:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_compatible): should swap encoding indexes too.
-
-Thu Dec 13 16:41:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_enc_compatible): should not judge compatibility
-	  based on rb_enc_asciicompat().
-
-Thu Dec 13 13:09:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/io.h (MakeOpenFile): fptr->enc should be
-	  initialized to zero.  [ruby-dev:32569]
-
-Thu Dec 13 08:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_getc): use default external encoding if fptr->enc is
-	  not set.  [ruby-dev:32565]
-
-	* lib/rubygems/package.rb (Gem::TarReader::Entry::rewind): typo fixed.
-	  [ruby-dev:32565]
-
-Thu Dec 13 08:24:16 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): should associate default external encoding.
-
-	* io.c (io_read): should NOT associate default external encoding.
-
-Wed Dec 12 23:22:58 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
-	  use capital letter for \xHH notation.  [ruby-dev:32511]
-
-Wed Dec 12 22:21:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_mode_enc): allow specifying external encoding in
-	  open mode, e.g. open(path, "r:utf-8").
-
-Wed Dec 12 21:26:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_method.ci (rb_alias): no need to skip aliasing when new
-	  equals to old.  [ruby-core:13990]
-
-Wed Dec 12 16:34:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_check_readable): set default external encoding to
-	  STDIN.
-
-	* io.c (io_enc_str): associate encoding to output string.
-
-Wed Dec 12 12:44:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (expr): 'not' and '!' should act as conditional
-	  expression.   [ruby-dev:32548]
-
-Wed Dec 12 12:11:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_regsub): should copy encoding.
-
-	* string.c (rb_str_sub_bang, str_gsub): should check and copy encoding
-	  to be replaced.
-
-Tue Dec 11 23:04:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Dec 11 00:04:05 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* pack.c (pack_pack): RDoc update.  a patch from Gary Wright
-	  <radar2002 AT gmail.com>.  [ruby-core:13998]
+	* array.c (rb_ary_slice_bang): If an invalid negative index (<
+	  -size) is given, do not raise an exception but return nil just
+	  like slice() does.
 
-	* pack.c (pack_unpack): ditto.
-
-Tue Dec 11 16:37:47 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_ascget): renamed from rb_enc_get_ascii.
-
-	* include/ruby/encoding.h: follow the renaming.
-
-	* re.c: ditto.
-
-Tue Dec 11 16:19:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, */Makefile.sub (CP, MV): added.
-
-	* common.mk (.y.c): not discard the old target until successfully
-	  created.
-
-Tue Dec 11 15:20:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): singleton_method_{added,removed,undefined}
-	  hooks should be defined for BasicObject.  [ruby-dev:32531]
-
-	* eval.c (Init_eval): method_missing should be defined for all
-	  objects; moved to BasicObject.
-
-Tue Dec 11 14:27:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (transcode_loop): get rid of SEGV at sequence can not be
-	  converted.
-
-	* transcode.c (rb_str_transcode_bang): copy encoding.  [ruby-dev:32532]
-
-	* test/ruby/test_transcode.rb: added tests from Martin Duerst <duerst
-	  AT it.aoyama.ac.jp>.  [ruby-dev:32532]
-
-Tue Dec 11 12:05:51 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_get_ascii): add an argument to provide the
-	  length of the returned character.
-
-	* include/ruby/encoding.h (rb_enc_get_ascii): add the argument.
-
-	* re.c (rb_reg_expr_str): modify rb_enc_get_ascii call.
-	  (rb_reg_quote): ditto.
-	  (rb_reg_regsub): ditto.
-
-Tue Dec 11 09:40:21 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/oniguruma.h (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE):
-	  parenthesize an argument.
-
-Tue Dec 11 02:23:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_method_missing): RDoc update patch from Hugh Sasse
-	  <hgs AT dmu.ac.uk>.  [ruby-core:12932]
-
-Tue Dec 11 01:51:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP::get): now supports gzip
-	  content-encoding.  a patch from Hugh Sasse <hgs AT dmu.ac.uk>.
-	  [ruby-core:13451]
-
-Tue Dec 11 01:21:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (shadowing_lvar_gen): no duplicate error for "_".
-
-Mon Dec 10 22:08:47 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): If an invalid range is given, do
-	  not raise an exception but return nil just like slice() does.
+	* test/ruby/test_array.rb (TestArray::test_slice,
+	  TestArray::test_slice!): Pull in test cases from trunk.
 
 Mon Dec 10 21:47:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -13071,412 +2893,47 @@ Mon Dec 10 21:00:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  of range.  a patch from Akinori MUSHA <knu AT iDaemons.org>.
 	  [ruby-dev:32518]
 
-Mon Dec 10 19:02:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_match): should calculate offset by converted
-	  operand.  [ruby-cvs:21416]
-
 Mon Dec 10 18:28:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
 	  regular expression.  a patch from Ueda Satoshi
 	  <s-ueda AT livedoor.jp>.  [ruby-dev:32514]
 
-Mon Dec 10 17:46:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_tmp_new): creates hidden temporary buffer.
-
-	* transcode.c (transcoding): added a pointer to function to flush.
-
-	* transcode.c (transcode_loop): do not use string internal.
-	  [ruby-dev:32512]
-
-	* transcode.c (str_transcode): allow Encoding objects.
-
-	* transcode_data.h (BYTE_LOOKUP): use actual struct name.
-
-Mon Dec 10 16:52:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_insert): should not add length in bytes to index in
-	  chars.
-
-Mon Dec 10 14:33:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_public_send): rename invoke_method to public_send.
-	  it now invokes public method only no matter how it's called.
-
-Mon Dec 10 14:00:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* transcode.c: new file to provide encoding conversion features.
-	  code contributed by Martin Duerst.
-
-Mon Dec 10 13:50:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_search): return byte offset.  [ruby-dev:32452]
-
-	* re.c (rb_reg_match, rb_reg_match2, rb_reg_match_m): convert byte
-	  offset to char index.
-
-	* string.c (rb_str_index): return byte offset.  [ruby-dev:32472]
-
-	* string.c (rb_str_split_m): calculate in byte offset.
-
-Mon Dec 10 09:56:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm1_neq.rb, bm_vm1_not.rb: added.
-
-Mon Dec 10 07:48:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): wrong token was generated.  [ruby-dev:32498]
-
-	* object.c (rb_obj_not_match): wrong test.
-
-Mon Dec 10 06:44:47 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_expr_str): use \xHH instead of \OOO.
-
-	* regerror.c (to_ascii): ditto.
-	  (onig_snprintf_with_pattern): ditto.
-	  (onig_snprintf_with_pattern): ditto.
-
-	* string.c (rb_str_inspect): ditto.
-	  (rb_str_dump): ditto.
-
-	* parse.y (parser_yylex): ditto.
-
-	* ruby.c (proc_options): ditto.
-
-	* file.c (rb_f_test): ditto.
-
-	[ruby-dev:32495]
-
-Mon Dec 10 06:41:00 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_names): new method Regexp#names.
-	  (rb_reg_named_captures): new method Regexp#named_captures
-	  (match_regexp): new method MatchData#regexp.
-	  (match_names): new method MatchData#names.
-
-	* lib/pp.rb (MatchData#pretty_print): show names of named captures.
-
-	[ruby-dev:32493]
-
-Mon Dec 10 01:35:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (expr): redefinable not (!) operator.
-
-	* parse.y (arg): ditto.
-
-	* object.c (rb_obj_not): new method "!".
-
-	* object.c (rb_obj_not_equal): new method "!=".
-
-	* object.c (rb_obj_not_match): new method "!~".
-
-Sun Dec  9 22:31:36 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_s_last_match): accept named capture's name.
-
-Sun Dec  9 15:57:53 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (match_backref_number): new function for converting a backref
-	  name/number to an integer.
-	  (match_offset): use match_backref_number.
-	  (match_begin): ditto.
-	  (match_end): ditto.
-	  (name_to_backref_number): raise IndexError instead of RuntimeError.
-	  (match_inspect): show capture index.
-
-Sun Dec  9 14:59:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h (CHECK_STACK_OVERFLOW): reserve frame size.
-	  [ruby-dev:32485]
-
-Sun Dec  9 14:38:25 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_thread_mark): use rb_gc_mark_maybe() for
-	  VM stack specified by mark_stack_len.  [ruby-dev:32462]
-
-	* insnhelper.ci: clear vm stack extended by opt value.
-
-Sun Dec  9 14:08:47 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (FilePathStringValue): defined.  similar to
-	  FilePathValue but no taint check.
-
-	* file.c (rb_get_path_no_checksafe): implementation of
-	  FilePathStringValue.
-	  (rb_file_s_basename): use FilePathStringValue.
-	  (rb_file_s_dirname): ditto.
-	  (rb_file_s_extname): ditto.
-	  (rb_file_s_split): ditto.
-	  (rb_file_join): ditto.
-
-	* dir.c (file_s_fnmatch): ditto.
-
-Sun Dec  9 12:49:34 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (append_utf8): check unicode range.
-
 Sun Dec  9 12:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi.rb (read_multipart): exclude blanks from header values.
 	  [ruby-list:44327]
 
-Sun Dec  9 12:18:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_get_path): use the original object if to_path method is
-	  not defined.  [ruby-dev:32473]
-
-	* io.c (rb_f_open): call to_open on non-string objects, instead of
-	  to_str.  [ruby-dev:32473]
-
-Sun Dec  9 12:12:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_find): returns true if no characters to be removed is
-	  specified.
-
-Sun Dec  9 12:03:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_magic_comment): delimits with a semicolon.
-
-Sun Dec  9 11:29:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_trans): get rid of segfaults when has multibytes but
-	  source sets have no multibytes.
-
-Sun Dec  9 04:01:28 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_mbclen): return 1 if underlying implementation
-	  returns a length longer than e-p.
-	  (rb_enc_precise_mbclen): return needmore if underlying
-	  implementation returns a length longer than e-p.
-
-Sat Dec  8 17:59:40 2007  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (posix_signal): return value.
-
-Sat Dec  8 17:22:16 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_pkcs7.rb: Remove redundant module namespace.
-
-Sat Dec  8 17:07:10 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c (proc_options): make rb_raise format as a string literal to
-	  avoid warning.
-
-Sat Dec  8 16:18:16 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_check_preprocess): new function for validating regexp
-	  fragment.
-
-	* parse.y (regexp): invoke reg_fragment_check.
-	  (reg_fragment_check): defined.
-	  (reg_fragment_check_gen): defined.
-
-Sat Dec  8 11:06:29 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_mbclen): make it never fail.
-	  (rb_enc_nth): don't check the return value of rb_enc_mbclen.
-	  (rb_enc_strlen): ditto.
-	  (rb_enc_precise_mbclen): return needmore(1) if e <= p.
-	  (rb_enc_get_ascii): new function for extracting ASCII character.
+Wed Dec  5 23:38:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* include/ruby/encoding.h (rb_enc_get_ascii): declared.
+	* range.c (range_each): followed step_i change.
 
-	* include/ruby/regex.h (ismbchar): removed.
+Wed Dec  5 18:08:45 2007  Tanaka Akira  <akr@fsij.org>
 
-	* re.c (rb_reg_expr_str): use rb_enc_get_ascii.
-	  (unescape_escaped_nonascii): use rb_enc_precise_mbclen to determine
-	  the termination of escaped non-ASCII character.
-	  (unescape_nonascii): use rb_enc_precise_mbclen.
-	  (rb_reg_quote): use rb_enc_get_ascii.
-	  (rb_reg_regsub): use rb_enc_get_ascii.
-
-	* string.c (rb_str_reverse) don't check the return value of
-	  rb_enc_mbclen.
-	  (rb_str_split_m): don't call rb_enc_mbclen with e <= p.
-
-	* parse.y (is_identchar): use ISASCII.
-	  (parser_ismbchar): removed.
-	  (parser_precise_mbclen): new macro.
-	  (parser_isascii): new macro.
-	  (parser_tokadd_mbchar): use parser_precise_mbclen to check invalid
-	  character precisely.
-	  (parser_tokadd_string): use parser_isascii.
-	  (parser_yylex): ditto.
-	  (is_special_global_name): don't call is_identchar with e <= p.
-	  (rb_enc_symname_p): ditto.
-
-	  [ruby-dev:32455]
-
-	* ext/tk/sample/tkextlib/vu/canvSticker2.rb: remove coding cookie
-	  because the encoding is not UTF-8.  [ruby-dev:32475]
-
-Fri Dec  7 20:21:35 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/ftptls.rb, ext/openssl/lib/net/telnets.rb:
-	  half-finished libraries are discontinued.
-
-Fri Dec  7 15:44:40 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb: use Hash for recursion check as inspect.
-
-Fri Dec  7 15:04:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (flatten): some performance improvements, based on a patch
-	  from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13877].
-	  [ruby-core:13851]
-
-	* thread.c (rb_exec_recursive): use Hash instead of Array for
-	  performance improvement.  [ruby-core:13898]
-
-	* thread.c (recursive_pop): use object ID.
-
-Thu Dec  6 19:52:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): typo fixed ("!" -> "|") in the ripper code.
-
-Thu Dec  6 19:48:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): tUPLUS no longer works as identity operation any
-	  more.  inspired by [ruby-talk:265532].
-
-Thu Dec  6 18:22:11 2007  Tanaka Akira  <akr@fsij.org>
-
-	* encoding.c (rb_enc_precise_mbclen): new function for mbclen with
-	  validation.
-
-	* include/ruby/encoding.h (rb_enc_precise_mbclen): declared.
-	  (MBCLEN_CHARFOUND): new macro.
-	  (MBCLEN_INVALID): new macro.
-	  (MBCLEN_NEEDMORE): new macro.
-
-	* include/ruby/oniguruma.h (OnigEncodingTypeST): replace mbc_enc_len
-	  by precise_mbc_enc_len.
-	  (ONIGENC_PRECISE_MBC_ENC_LEN): new macro.
-	  (ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND): new macro.
-	  (ONIGENC_CONSTRUCT_MBCLEN_INVALID): new macro.
-	  (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE): new macro.
-	  (ONIGENC_MBCLEN_CHARFOUND): new macro.
-	  (ONIGENC_MBCLEN_INVALID): new macro.
-	  (ONIGENC_MBCLEN_NEEDMORE): new macro.
-	  (ONIGENC_MBC_ENC_LEN): use ONIGENC_PRECISE_MBC_ENC_LEN.
-
-	* enc/euc_jp.c: validation implemented.
-
-	* enc/sjis.c: ditto.
-
-	* enc/utf8.c: ditto.
-
-	* string.c (rb_str_inspect): use rb_enc_precise_mbclen for invalid
-	  encoding.
-	  (rb_str_valid_encoding_p): new method String#valid_encoding?.
-
-	* io.c (rb_io_getc): use rb_enc_precise_mbclen.
-
-	[ruby-dev:32438]
-
-Thu Dec  6 01:37:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regparse.c (i_apply_case_fold): fix for negative character class.  a
-	  patch from Yusuke ENDOH <mame AT tsg.ne.jp> in [ruby-core:13884].
-
-Thu Dec  6 01:00:38 2007  NARUSE, Yui <naruse@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_s_list): support NetBSD/Citrus iconv.
-
-Wed Dec  5 16:18:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_proc_s_new): call initialize.  [ruby-core:13824]
-
-	* proc.c (rb_proc_location): return file name and line number where
-	  the proc is defined.
-
-	* thread.c (thread_s_new): call initialize.  [ruby-core:13835]
-
-	* thread.c (thread_initialize): split initialize method.
-
-Wed Dec  5 15:25:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_intern3): fix to changing encoding to default, and
-	  uncommented r13835, which is rare but not impossible.
+	* numeric.c (int_odd_p): new method Integer#odd?.
+	  (int_even_p): new method Integer#even?.
+	  (int_pred): new method Integer#pred.
+	  (fix_odd_p): new method Fixnum#odd?.
+	  (fix_even_p): new method Fixnum#even?.
 
 Wed Dec  5 15:15:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* range.c (step_i, range_step): support non-fixnum steps.
 	  [ruby-talk:282100]
 
-Wed Dec  5 14:25:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix typo.
-
-Wed Dec  5 13:41:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yycompile): get rid of tracing while parsing.
-	  [ruby-dev:31351]
-
-	* thread.c (ruby_suppress_tracing): added a new parameter, which
-	  directs to call func always.
-
-Tue Dec  4 19:56:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_convert): should not set encoding unless
-	  the target encoding is supported.  [ruby-dev:32451]
-
-Tue Dec  4 17:34:17 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (tojis, tosjis, toeuc, toutf8):
-	  set encoding. [ruby-dev:32447]
-
-Tue Dec  4 17:07:25 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/json.rb, lib/json/*: moved to ext/json/lib.
-
-Tue Dec  4 16:34:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_create): achieve target encoding.
-
-	* ext/iconv/iconv.c (iconv_convert, iconv_finish, iconv_iconv,
-	  iconv_conv): set result string encoding.  [ruby-dev:32446]
-
-	* ext/iconv/iconv.c (iconv_initialize, iconv_s_open): set encoding to
-	  Iconv instance.
-
-Tue Dec  4 14:34:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): reverted c flag.
-
 Tue Dec  4 11:23:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at squeezing
-	  preceding 0s.  [ruby-core:13873]
-
-Mon Dec  3 11:51:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/Win32API/*: removed or moved to ext/dl/win32.
-
-	* ext/dl/win32/*: new. [ruby-dev:32387]
-
-Sun Dec  2 22:08:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_tokadd_mbchar): fix for ASCII chars.  [ruby-dev:32432]
+	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
+	  preceeding 0s.  [ruby-core:13873]
 
-	* parse.y (parser_parse_string, parser_here_document): prevent false
-	  error messages.
+Sun Dec  2 22:43:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec  2 20:43:22 2007  Tanaka Akira  <akr@fsij.org>
+	* eval.c (error_print): put newline unless multiple line message ends
+	  with a newline.  [ruby-dev:32429]
 
-	* re.c (unescape_escaped_nonascii): fix mbclen argument.
+Sun Dec  2 15:49:20 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Dec  2 15:47:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_tokadd_mbchar): check insufficient multibyte char.
-	  [ruby-dev:32429]
-
-Sun Dec  2 15:42:16 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.1 -> 0.2.2.
+	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
 
 	* lib/rss/maker/itunes.rb: fixed new_itunes_category.
 	* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
@@ -13485,160 +2942,41 @@ Sun Dec  2 15:42:16 2007  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
 	  needless UTF-8 characters.
 
-Sun Dec  2 15:18:37 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_callee_setup_arg): fix error message.
-	  [ruby-dev:32430]
-
-Sun Dec  2 09:12:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (regexp): fix /#{}\xa1\xa2/e to be EUC-JP.
-	  (reg_fragment_setenc_gen): extracted from reg_compile_gen.
-
-Sun Dec  2 01:39:51 2007  Tanaka Akira  <akr@fsij.org>
+Sun Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
-	* include/ruby/intern.h (rb_uv_to_utf8): declared.
-
-	* re.c (rb_reg_preprocess): new function for dynamic regexp with
-	  \u{} such as Regexp.new("\\u{6666}").
-	  (rb_reg_prepare_re): preprocess regexp for recompiling.
-	  (read_escaped_byte): new function.
-	  (unescape_escaped_nonascii): new function.
-	  (append_utf8): new function.
-	  (unescape_unicode_list): new function.
-	  (unescape_unicode_bmp): new function.
-	  (unescape_nonascii): new function.
-	  (rb_reg_initialize): preprocess regexp.
-
-	* pack.c (rb_uv_to_utf8): renamed from uv_to_utf8.
-
-	* parse.y (STR_NEW3): take func instead of has8 and hasmb.
-	  (parser_str_new): use default coderange mechanism except for regexp.
-	  (parser_tokadd_utf8): copy regexp source as-is.
-	  (parser_read_escape): UTF-8 stuff removed.
-	  (parser_tokadd_escape): has8bit and hasmb removed.
-	  (parser_tokadd_string): fix 8-bit single byte character with \u.
-	  (parser_parse_string): has8bit and hasmb removed.
-	  (parser_here_document): has8bit and hasmb removed.
-	  (parser_yylex): call parser_tokadd_utf8 instead of read_escape for
-	  UTF-8 character.
-
-Wed Dec  2 01:00:07 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+	Merged 14070 from trunk.
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
 	  pressing control-c in the controlling terminal or sending SIGTERM stops
 	  the XML-RPC server.
 
-Sat Dec  1 23:04:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c: rename primary_encoding -> default_external (encoding).
-
-Sat Dec  1 19:52:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (Time#to_datetime): use nsec instead of usec.
-
-	* lib/date.rb (DateTime#to_time): second minute as an argument to
-	  Time::utc contains fractional part in rational; hence Time
-	  object may keep resolution at most nanosecond.
-
-Sat Dec  1 14:36:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: move fixed bugs.
-
-	* test/ruby/test_sprintf.rb: ditto.
-
-	* test/yaml/test_yaml.rb: ditto.
-
-Sat Dec  1 13:24:47 2007  Koichi Sasada  <ko1@atdot.net>
+Sat Dec  1 15:13:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* insnhelper.ci (vm_yield_with_cfunc): fix to passing argc on third
-	  parameter of IFUNC.  [ruby-dev:32329]
+	* lib/resolv.rb: documentation update.  backported from 1.9.
+	  [ruby-core:13273]
 
-	* enumerator.c: fix to pass exact number of argument.
+Sat Dec  1 03:30:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_yield_values2): added.
+	* parse.y (newline_node): set line from outermost node before removing
+	  NODE_BEGIN.  [ruby-dev:32406]
 
-	* include/ruby/ruby.h: ditto.
+Fri Nov 30 21:53:28 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-	* bootstraptest/test_knownbug.rb: move a fixed test.
-
-	* bootstraptest/test_block.rb: ditto.
-
-Sat Dec  1 10:45:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_open): use to_open for every non-string object.  path
-	  object may use method_missing.
-
-Sat Dec  1 09:44:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insns.def (concatarray, splatarray): use to_a instead of
-	  to_splat.
-
-	* insnhelper.ci (caller_setup_args): ditto.
-
-Sat Dec  1 03:34:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (newline_node): always remove NODE_BEGIN.
-
-Fri Nov 30 23:48:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (ruby_signal): use SA_SIGINFO if available.
-	  [ ruby-Patches-6418 ]
-
-Fri Nov 30 22:52:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (trap_signm): SIGVTALRM no longer used for green
-	  thread.  [ruby-talk:281318]
-
-	* signal.c (ruby_sig_finalize): do not install SIG_DFL handler if
-	  previous handler is sighandler().
-
-Fri Nov 30 21:02:15 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/json.rb, lib/json/add/{core.rb, rails.rb},
-	  test/json/test_json_rails.rb: additional files of JSON 1.1.2.
-	  [ruby-dev:32405]
-
-Fri Nov 30 19:33:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (rb_syck_mktime): avoid segmentation fault.
-	  [ruby-core:13735]
-
-Fri Nov 30 19:05:55 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_count): precise argument number check.
-
-	* enum.c (enum_count): return Enumerator if no block given.
-
-Fri Nov 30 16:42:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
 
-	* enum.c (enum_take_while): returns Enumerator if no block given.
+	* lib/rss/content.rb, lib/rss/content/1.0.rb,
+	  lib/rss/content/2.0.rb, lib/rss/maker/content.rb,
+	  test/rss/rss-testcase.rb, test/rss/test_content.rb,
+	  test/rss/test_maker_content.rb: supported content:encoded with RSS
+	  2.0.
+	  Suggested by Sam Lown. Thanks.
 
-	* enum.c (enum_drop_while): ditto.
+	* NEWS: added the above changes.
 
 Thu Nov 29 16:59:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
 
-Thu Nov 29 06:45:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_eql): recursive comparison should be based on
-	  eql?  [ruby-core:13803]
-
-Wed Nov 28 18:08:00 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json, lib/json, test/json: Update to JSON 1.1.2.
-	  (RubyForge#15447)
-
-	* math.c: fix typo.
-
-Wed Nov 28 16:29:35 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_invoke_block): should splat args.
-	  [ruby-dev:32392]
-
-	* test/ruby/test_yield.rb: add tests for above.
-
 Wed Nov 28 14:43:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
@@ -13649,459 +2987,29 @@ Wed Nov 28 14:43:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (create_makefile): support for extensions which has no
 	  shared object.
 
-Wed Nov 28 02:42:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (big2str_find_n1): removed extraneous element.
-	  [ruby-dev:32351], [ruby-dev:32365]
+Wed Nov 28 09:51:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bignum.c (big2str_find_n1): returns necessary digits now.
+	* bignum.c (rb_big2str0): do not clobber space for sign.
 
 	* sprintf.c (remove_sign_bits): extends sign bit first.
 
-Tue Nov 27 15:53:43 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): "when *[],1" dumps core.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32350]
-
-	* bootstraptest/test_syntax.rb: add a test for above.
-
-Tue Nov 27 15:40:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): "a[*b] += 1" dumps core.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32354]
-
-	* bootstraptest/test_syntax.rb: add a test for above.
-
-Tue Nov 27 12:47:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def: change return value of "defined?"
-	  for $&, $1, ... .  If such variables are defined,
-	  return "global-variable".
-
-	* test/ruby/test_defined.rb: add tests.
-
-	* bootstraptest/test_syntax.rb: fix a test.
-
-Tue Nov 27 11:54:46 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: fix typo.
-
-Tue Nov 27 11:23:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test_beginendblock.rb: add loop to wait signal.
-	  [ruby-dev:32332]
-
-Tue Nov 27 11:14:57 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h, encoding.c, re.c, string.c, parse.y:
-	  rename ENC_CODERANGE_SINGLE to ENC_CODERANGE_7BIT.
-	  rename ENC_CODERANGE_MULTI to ENC_CODERANGE_8BIT.
-	  Because single byte 8bit character, such as Shift_JIS 1byte katakana,
-	  is represented by ENC_CODERANGE_MULTI even if it is not multi byte.
-
-Tue Nov 27 10:45:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_method_missing): fix stack trace.
-
-	* bootstraptest/test_knownbug.rb: move solved tests.
-
-	* bootstraptest/test_method.rb, test/ruby/test_regexp.rb: ditto.
-
-Tue Nov 27 09:57:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c: fix to allow dsym for alias/undef.
-	  [ruby-dev:32355]
-
-	* bootstraptest/test_method.rb: add tests for above.
-
-Mon Nov 26 23:18:46 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/extserv.rb (initialize, stop_service): synchronize with
-	  ExtServManager.
-
-	* test/drb/test_drb.rb (TestDRbEval): ignored.
-
-Mon Nov 26 17:32:16 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (Init_Regexp): new method Regexp#fixed_encoding?
-	  [ruby-dev:32361]
-
-Mon Nov 26 13:28:14 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/complex.rb: be able to create Complex(0, -0.0). [ruby-list:44268]
-
-Mon Nov 26 11:24:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_fixed_encoding_p): extracted from rb_reg_prepare_re and
-	  rb_reg_s_union.
-	  (rb_reg_s_union): refactored.
-
-Mon Nov 26 10:44:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_read_internal, rb_sysopen_internal): remove C99 dependency.
-
-Sun Nov 25 22:21:35 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h (rb_enc_str_asciionly_p): declared.
-	  (rb_enc_str_asciicompat_p): defined.
-
-	* re.c (rb_reg_initialize_str): use rb_enc_str_asciionly_p.
-	  (rb_reg_quote): return ascii-8bit string if the argument is
-	  ascii-only to generate encoding generic regexp if possible.
-	  (rb_reg_s_union): fix encoding handling.  [ruby-dev:32094]
-
-	* string.c (rb_enc_str_asciionly_p): defined.
-
-Sun Nov 25 12:12:03 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* gem_prelude.rb: Import fast-loading gem_prelude.rb from RubyGems.
-
-	* lib/rubygems*: Import RubyGems r1516.
-
-Sat Nov 24 23:25:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_eval.rb (TestEval::test_instance_eval_cvar):
-	  updated not to modify class variable of Object class.
-
-Fri Nov 23 17:34:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* io.c: add rb_read_internal() as blocking function.
-
-Fri Nov 23 17:33:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: fix comment.
-
-Fri Nov 23 17:26:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: move solved tests.
-
-	* bootstraptest/test_io.rb, test_marshal.rb, test_objectspace.rb:
-	  ditto.
-
-	* test/ruby/test_integer.rb, test_regexp.rb: ditto.
-
-Fri Nov 23 15:59:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* struct.c (rb_struct_alloc_noinit): new function.
-	  (rb_struct_define_without_accessor): add allocator to the arguments.
-
-	* range.c (range_alloc): re-introduced using rb_struct_alloc_noinit.
-
-Fri Nov 23 15:27:43 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (REG_CASESTATE): unused macro removed.
-	  (rb_reg_prepare_re): check encoding difference.
-	  (rb_reg_initialize): check 8bit byte.
-
-	* parse.y (parser_tokadd_escape): fix has8bit.
-
-	  [ruby-dev:32113]
-
-Fri Nov 23 15:16:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_f_global_variables): variable names should not
-	  duplicate.  [ruby-dev:32344]
-
-Fri Nov 23 13:34:08 2007  Tanaka Akira  <akr@fsij.org>
-
-	* struct.c (rb_struct_define_without_accessor): new function.
-
-	* range.c (range_alloc): removed.
-	  (Init_Range): use rb_struct_define_without_accessor.
-
-	  based on [ruby-dev:32327].
-
-Fri Nov 23 11:01:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_begin): should return offset by character.
-	  [ruby-dev:32331]
-
-	* re.c (match_end): ditto.
-
-	* re.c (rb_reg_search): ditto.
-
-Fri Nov 23 10:44:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compile.c (defined_expr): defined(method(x)) dumped core.  a
-	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32335]
-
-Wed Nov 21 18:03:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: fix to recycle thread data (VM stack).
-
-	* thread.c: ditto.
-
-	* benchmark/bm_vm3_thread_create_join.rb: add loop count.
-
-Wed Nov 21 18:02:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: add path to trunk/lib if driver runner is
-	  in build directory.
-
-Wed Nov 21 16:39:21 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/fileutils/fileasserts.rb (assert_equal_timestamp): new assert
-	  to test tv_sec only for filestamp resolution portability.
-	  (assert_same_entry): use assert_same_entry for mtime comparison.
-
-Wed Nov 21 14:55:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c (rb_ary_permutation): add gc guard codes.
-
-Wed Nov 21 11:16:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insnhelper.ci (vm_search_normal_superclass): rename function.
-
-	* insnhelper.ci (vm_search_superclass): ditto.
-
-	* proc.c (struct METHOD): rename rklass -> rclass.
-
-Wed Nov 21 03:12:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): returns nil on execution failure.
-	  [ruby-core:13715]
-
 Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
 
-Tue Nov 20 21:46:46 2007  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_mload): ignore invalid digits in submicro.
-
-Tue Nov 20 20:33:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h: rename RFloat#double_value -> float_value.
-
-	* numeric.c, parse.y: ditto.
-
-Tue Nov 20 19:36:21 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.h, vm_core.h: decl of rb_gc_save_machine_context()
-	  should be at vm_core.h.
-
-	* include/ruby/ruby.h, intern.h: remove type rb_thread_t.
-
-	* include/ruby/intern.h: change rb_unblock_function_t,
-	  rb_unblock_function_t.
-
-	* file.c, process.c: apply above changes.
-
-	* thread.c, thread_pthread.ci, thread_win32.ci: ditto.
-
-	* io.c: support blocking open (2). [ruby-core:13614]
-
-Tue Nov 20 17:10:11 2007  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_io_close_on_exec_p): new method IO#close_on_exec?.
-	  (rb_io_set_close_on_exec): new method IO#close_on_exec=.
-	  [ruby-dev:32323]
-
-Tue Nov 20 16:24:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (gc_mark_children): obj->as.file.fptr may be 0 for T_FILE.
-
-Tue Nov 20 15:09:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_read_escape): has8bit flag may be set with control
-	  escape.  [ruby-core:13722]
-
-	* parse.y (parser_prepare): set begging after BOM if exists.
-	  [ruby-core:13718]
-
-Tue Nov 20 14:55:37 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems*: Update to RubyGems 0.9.5.
-
-Tue Nov 20 13:00:44 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h win32/win32.c (rb_w32_pipe_exec): use dual fd
-	  instead of socketpair when mode is RDWR.
-
-	* io.c (pipe_open): pass &write_fd to rb_w32_pipe_exec().
-
-	* io.c (popen_redirect): define only when HAVE_FORK.
-
-Tue Nov 20 12:12:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/io.h (rb_io_t): add tied_io_for_writing member.
-
-	* io.c: use tied_io_for_writing for duplex popen.
-
-	* gc.c: mark tied_io_for_writing.
-
-	* common.mk: gc.o depends io.h.
-
-	  [ruby-dev:32205]
-
-Tue Nov 20 11:59:33 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/drb/test_drb.rb: rename TestRubyYield to TestDRbRubyYield to
-	  avoid name crash with test/ruby/test_yield.rb.
-	  TestRuby18Yield is renamed to TestDRbRuby18Yield too.
-
-Tue Nov 20 03:24:42 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/extservm.rb: merged from ruby_1_8 branch.
-
-	* lib/drb/acl.rb: ditto.
-
-	* lib/drb/ssl.rb: ditto.
-
-	* lib/drb/unix.rb: ditto.
-
-	* lib/drb/drb.rb: ditto.
-
-	* lib/drb/observer.rb: ditto.
-
-	* lib/drb/invokemethod.rb: ditto.
-
-	* test/drb/test_drbssl.rb: ditto.
-
-	* test/drb/test_drb.rb: ditto.
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/test_drbunix.rb: ditto.
-
-Tue Nov 20 00:52:46 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/fileutils/fileasserts.rb (assert_equal_time): show nsec if
-	  assertion fails but time.to_s equals.
-	  (assert_same_entry): use assert_equal_time.
-
-	* test/fileutils/test_fileutils.rb (test_install): use
-	  assert_equal_time.
-
-Mon Nov 19 18:46:49 2007  Tanaka Akira  <akr@fsij.org>
-
-	* file.c (utime_internal): fallback utimensat to utimes.
-
-Mon Nov 19 17:51:27 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: check struct timespec, clock_gettime, utimensat,
-	  struct stat.st_atim,
-	  struct stat.st_atimespec,
-	  struct stat.st_atimensec,
-	  struct stat.st_mtim,
-	  struct stat.st_mtimespec,
-	  struct stat.st_mtimensec,
-	  struct stat.st_ctim,
-	  struct stat.st_ctimespec,
-	  struct stat.st_ctimensec.
-
-	* include/ruby/missing.h: provide struct timespec if not available.
-
-	* time.c: support nanosecond-resolution using struct timespec.
-	  (time_nsec): new method: Time#nsec and Time#tv_nsec.
-
-	* include/ruby/intern.h: provide rb_time_nano_new.
-
-	* file.c (utime_internal): use utimensat if available.
-	  (rb_file_s_utime): refactored.
-	  (rb_f_test): use stat_atime, stat_mtime, stat_ctime.
-	  (rb_stat_cmp): check tv_nsec.
-	  (stat_atimespec): new function.
-	  (stat_atime): ditto.
-	  (stat_mtimespec): ditto.
-	  (stat_mtime): ditto.
-	  (stat_ctimespec): ditto.
-	  (stat_ctime): ditto.
-	  (rb_stat_atime): use stat_atime.
-	  (rb_file_s_atime): ditto.
-	  (rb_file_atime): ditto.
-	  (rb_stat_mtime): use stat_mtime.
-	  (rb_file_s_mtime): ditto.
-	  (rb_file_mtime): ditto.
-	  (rb_file_ctime): use stat_ctime.
-	  (rb_file_s_ctime): ditto.
-	  (rb_stat_ctime): ditto.
-
-	* variable.c (rb_copy_generic_ivar): clear clone's instance variables
-	  if obj has no instance variable.
-
-	* marshal.c (w_object): dump instance variables of generated string
-	  for TYPE_USERDEF, even if original object has instance variables.
-
-	* lib/time.rb (Time#xmlschema): use nsec instead of usec.
-
-	[ruby-dev:32306]
-
-Mon Nov 19 17:48:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_class_superclass): should not raise exception for
-	  BasicObject.  [ruby-Bugs-15668]
-
-Mon Nov 19 16:04:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_permutation): gives all permutations of elements
-	  if no argument given.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
-	  [ruby-dev:32309]
-
-Mon Nov 19 02:44:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): alias and undef accept dsyms as well
-	  as literals.  [ruby-dev:32308]
-
-Mon Nov 19 02:31:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_method.ci (rb_add_method): no redefinition warning for undef.
-
-Mon Nov 19 01:53:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_read_escape): disallow control and meta modifiers
-	  for non-ASCII characters.  [ruby-core:13685]
-
-Sun Nov 18 20:47:41 2007  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c (mark_dump_arg): it may be called after dump_ensure.
-
-Sun Nov 18 18:27:47 2007  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_minus): fix Time.at(2**60+1) - Time.at(2**60).
-
-Sun Nov 18 17:28:49 2007  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_arg): show actual year in 2-3 digits year warning.
-	  (time_mdump): show actual year in "year too big to marshal" error.
-
 Sun Nov 18 14:03:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval_method.ci (rb_alias): do not call hook functions until
-	  initialization finishes.  [ruby-talk:279538]
+	* eval.c (rb_alias): do not call hook functions until initialization
+	  finishes.  [ruby-talk:279538]
 
 Sun Nov 18 09:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
 
-Sun Nov 18 05:19:46 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/mkmf.rb (have_struct_member): define HAVE_type_member.
-
-Sat Nov 17 23:51:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Nov 17 13:58:11 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
 
-Sat Nov 17 23:21:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): should clear parser->tokp as well.
-	  [ruby-dev:32250]
-
-	* parse.y: remove NEED_ASSOC that break test_parser_events.
-
-	* parse.y (parser_yylex): should not decrement line numbers at the
-	  end of file.
-
-	* file.c (rb_find_file_ext): search .rb files first through in the
-	  loadpath.
-
-Fri Nov 16 23:31:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_odd_p): new method added.  a patch from Tadashi
-	  Saito <shiba AT mail2.accsnet.ne.jp>.  [ruby-dev:32305]
-
-	* bignum.c (rb_big_even_p): ditto.
-
 Fri Nov 16 17:41:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (Document-class): moved the simplest example to
@@ -14113,135 +3021,25 @@ Fri Nov 16 17:41:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
 	  qualified.
 
-Fri Nov 16 16:26:57 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* include/ruby/ruby.h: added some declarations for event hooks.
-
-	* lib/profile.rb: set VM::InstructionSequence.compile_option.
-
 Fri Nov 16 11:16:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
 
-Fri Nov 16 03:36:01 2007  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c: Node#value defined twice.
-
-	* lib/yaml/: several method redefinitions causing warnings.
-
-Fri Nov 16 03:01:00 2007  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit.
-
-Fri Nov 16 02:51:59 2007  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
-	  identify repeated object references, since GC will reuse memory of
-	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698]
-
-Thu Nov 15 19:49:03 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov 15 19:50:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/curses/extconf.rb: check macro if cannot find func.
 	  [ruby-list:44224]
 
-Thu Nov 15 18:04:06 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
-	  environment.
-
-Thu Nov 15 17:28:21 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: absolute path may not start with a slash.
-	  pointed by usa.
-
-Thu Nov 15 17:07:54 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: fix first substitution.
-	  use constant for prefix.
-	  pointed by Richard Kilmer.
-
-Thu Nov 15 14:29:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (prereq): added auto generated sources.  [ruby-dev:32280]
-
-Thu Nov 15 12:31:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: use constant for prefix.
-
-Thu Nov 15 12:24:39 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: use simple template system for source
-	  code generation.
-
 Thu Nov 15 12:19:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
 	  lockfile for exclusive locks.  a patch from <tommy AT tmtm.org>.
 	  [ruby-dev:32296]
 
-Thu Nov 15 12:14:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* tool/compile_prelude.rb (c_esc): need to escape closing brace.
-
-Thu Nov 15 11:52:16 2007  Tanaka Akira  <akr@fsij.org>
-
-	* tool/compile_prelude.rb: adjust RbConfig::CONFIG paths relative
-	  to the installation path.
-
-Thu Nov 15 11:25:20 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c (usage): fix typo on --disable-gems option.
-	  pointed by Richard Kilmer.
-
-Wed Nov 14 16:16:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/net/http/test_https_proxy.rb
-	  (HTTPSProxyTest::test_https_proxy_authentication): initialize
-	  local variable 't' first.  [ruby-dev:32253]
-
-Wed Nov 14 15:39:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/socket/test_socket.rb: update not to use 1.8 assignment to
-	  external local variable in the block parameters.  [ruby-dev:32251]
-
-	* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
-	  String#force_encoding().  [ruby-dev:32251]
-
-Wed Nov 14 14:04:42 2007  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk, Makefile.in: rename prelude.c to miniprelude.c.
-	  rename ext_prelude.c to prelude.c
-
-	* win32/Makefile.sub: ditto.
-
-	* bcc32/Makefile.sub: ditto.
-
-Wed Nov 14 07:09:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
-	  id.c, insnhelper.h, insns.def, thread.c, thread_pthread.ci,
-	  thread_pthread.h, thread_win32.ci, thread_win32.h, vm.h,
-	  vm_dump.c, vm_evalbody.ci, vm_opts.h: fix comments and
-	  copyright year.
-
-Wed Nov 14 07:07:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/makedocs.rb, template/insnstbl.html: removed.
-
-Wed Nov 14 02:50:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (parse.c): dependency also needs vpath.
-
-	* common.mk (node_name.inc, prelude.c): VPATH in nmake does not
-	  work for targets of explicit rules.
-
-Wed Nov 14 02:11:38 2007  Tanaka Akira  <akr@fsij.org>
+Wed Nov 14 01:52:59 2007  Tanaka Akira  <akr@fsij.org>
 
 	* missing/isinf.c (isinf): don't define if the macro is defined.
 
-	* configure.in: no need to set ac_cv_func_isinf=yes on non-gcc
-	  solaris.
-
 Wed Nov 14 01:34:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (round): fallback definition.
@@ -14249,43 +3047,11 @@ Wed Nov 14 01:34:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* numeric.c (flo_divmod, flo_round): use round() always.
 	  [ruby-dev:32269]
 
-Wed Nov 14 00:33:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h: introduce 2 macros:
-	  RFLOAT_VALUE(v), DOUBLE2NUM(dbl).
-	  Rename RFloat#value -> RFloat#double_value.
-	  Do not touch RFloat#double_value directly.
-
-	* bignum.c, insns.def, marshal.c, math.c, numeric.c, object.c,
-	  pack.c, parse.y, process.c, random.c, sprintf.c, string.c,
-	  time.c: apply above changes.
-
-	* ext/dl/mkcallback.rb, ext/json/ext/generator/generator.c:
-	  ditto.
-
-Wed Nov 14 00:15:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/ytab.sed: get rid of GNU sed feature.  a patch from Laurent
-	  Sansonetti <laurent.sansonetti AT gmail.com> in [ruby-core:13470].
-
-Tue Nov 13 21:41:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov 13 22:02:23 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* common.mk (parse.c), ext/ripper/depend (ripper.c): process after
-	  bison with sed.  [ruby-dev:32204]
+	* lib/drb/drb.rb: remove Thread.exclusive.
 
-	* ruby.c (proc_options): use yydebug in cmdline_options.
-
-	* ruby.c (process_options): set yydebug flag of parser.
-
-	* parse.y (yydebug): moved into struct parser_params.
-
-	* parse.y (rb_parser_get_yydebug, rb_parser_set_yydebug): parser
-	  generic methods.
-
-	* */Makefile.sub (parse.c): moved to common.mk.
-
-	* tool/ytab.sed: comment out yydebug definition, and substitute
-	  yyerror with parser_yyerror.
+	* lib/drb/extservm.rb: ditto.
 
 Tue Nov 13 16:33:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -14294,367 +3060,39 @@ Tue Nov 13 16:33:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* numeric.c (flo_divmod): work around for platforms have no round().
 	  [ruby-dev:32247]
 
-Tue Nov 13 15:26:33 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lex.c.blt: moved from lex.c.
-
-	* lex.c.src: copied from keywords.  This is the source of lex.c.blt.
-
-	* Makefile.in (lex.c): use lex.c.blt if keywords is same as lex.c.src.
-
-	* win32/Makefile.sub (lex.c): re-introduce copy rule.
-
-	* bcc32/Makefile.sub (lex.c): ditto.
-
-	* wince/Makefile.sub (lex.c): ditto.
-
-Tue Nov 13 15:21:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_specialized_instruction): check argc.
+Tue Nov 13 13:58:51 2007  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 13 14:44:32 2007  why the lucky stiff  <why@ruby-lang.org>
-
-	* test/yaml/test_yaml.rb: fixed the failing YAML Struct test
-	  at ko1's request.
+	* numeric.c (numeric.c): Integer#ord implemented.  [ruby-dev:32206]
 
 Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
 	* numeric.c (flo_divmod): round to the nearest integer.
 	  [ ruby-Bugs-14540 ]
 
-Tue Nov 13 00:36:16 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb: fixed tests for set_trace_func.
-
-Mon Nov 12 19:47:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (call_trace_proc): should return value.
-
-Mon Nov 12 19:45:18 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT)
-	  instead of $(LIBRUBY_A).
-
-Mon Nov 12 18:32:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc,win}32/Makefile.sub (MINIOBJS): added prelude.$(OBJEXT).
-
-Mon Nov 12 17:13:23 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in, common.mk: add prelude.o to MINIOBJS.
-
 Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
 	  Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
 
-Mon Nov 12 16:48:09 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in, common.mk: add ext_prelude.o to OBJS.
-
-Mon Nov 12 13:57:39 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (MINIDLNOBJS): removed.
-	  (MINIOBJS): set to dln.o if dmydln.o is not used.
-
-	* Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
-
 Mon Nov 12 13:53:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-parse-partial): handle stringified
 	  symbols properly using ruby-forward-string.
 
-Mon Nov 12 12:17:59 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (MINIDLNOBJS): defined.
-
-	* Makefile.in (miniruby): use MINIDLNOBJS and COMMONOBJS instead of
-	  MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
-
-Sun Nov 11 20:32:45 2007  Tanaka Akira  <akr@fsij.org>
-
-	* {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
-
-Sun Nov 11 19:40:52 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (lex.c): simplified.
-
-Sun Nov 11 18:31:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (lex.c): touch lex.c if gperf failed but lex.c exists.
-	  Although this may cause non-updated lex.c,
-	  svn co may generate keywords newer than lex.c especially on
-	  a file system which can record fractional mtime such as XFS.
-
-Sun Nov 11 17:32:46 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* insnhelper.ci (vm_call_method): pass mn->nd_clss to
-	  vm_call_cfunc() instead of klass.
-
-	* vm.c (rb_thread_method_id_and_klass): traverse parent_iseq.
-
-	* thread.c (call_trace_proc): use rb_thread_method_id_and_klass().
-
-Sun Nov 11 16:54:25 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lex.c: renamed from lex.c.blt.
-
-	* Makefile.in (lex.c): use find command to check mtime.
-
-Sun Nov 11 05:34:13 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* bin/gem: Add forgotten gem command.
-
-Sat Nov 10 23:50:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* string.c (tr_trans): cast to unsigned char after dereference
-	  a pointer to a char to avoid SEGV with "\377".tr("a", "b").
-	  on FreeBSD/amd64.
-
-Sat Nov 10 23:08:53 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in, common.mk, Makefile.in: don't generate
-	  libminiruby-static.a.
-
-Sat Nov 10 19:46:54 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in, common.mk, Makefile.in: generate libminiruby-static.a
-	  which contains prelude.o for miniruby.
-
-Sat Nov 10 18:10:07 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gem_prelude.rb: new file for gem libraries.  currently empty.
-
-	* common.mk: generate ext_prelude.c by prelude.rb and gem_prelude.rb.
-	  ruby (not miniruby) is linked with ext_prelude.o instead of
-	  prelude.o.
-
-	* inits.c (rb_call_inits): don't call Init_prelude.
-
-	* ruby.c: support --disable-gems option.
-	  (ruby_init_gems): new function to define Gem::Enable and
-	  invoke Init_prelude.
-	  (process_options): call ruby_init_gems just after
-	  ruby_init_loadpath.
-
-	* tool/compile_prelude.rb: support multiple files.
-
-Sat Nov 10 17:27:55 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* thread.c (call_trace_proc): don't call ID2SYM() for ID_ALLOCATOR
-	  to avoid SEGV.
-
-Sat Nov 10 16:37:07 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems: Import RubyGems revision 1493.
-
-	* lib/rubygems.rb: ditto.
-
-	* lib/ubygems.rb: ditto.
-
-	* lib/rbconfig/datadir.rb: ditto.
-
-	* test/rubygems: ditto.
-
-Sat Nov 10 16:34:21 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/soap/property.rb: Don't override Enumerable#inject for 1.9.
-
-Sat Nov 10 14:43:30 2007  David Flanagan  <davidflanagan@ruby-lang.org>
-
-	* parse.y: use ASCII encoding for string literals that are
-	  7-bit clean, fixing regression from my previous patch
-
-Sat Nov 10 13:18:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win32}/Makefile.sub: vendor_ruby support.
-
-Fri Nov  9 23:33:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_nextc): added single line read forward buffer.
-
-	* parse.y (parser_yylex): adjust line number for fluent interface.
-
-Fri Nov  9 22:04:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.h (FRAME_MAGIC_MASK_BITS): bits of FRAME_MAGIC_MASK.
-
-	* insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): use shift operations.
-
-Fri Nov  9 21:46:28 2007  Koichi Sasada  <ko1@atdot.net>
+Mon Nov 12 12:38:31 2007  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (eval): should be volatile value for GC.
-
-Fri Nov  9 17:48:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (locale_encoding): guesstimate encoding from environment
-	  variables.  [ruby-core:13315]
-
-	* ruby.c (process_options): set primary encoding from environment.
-
-Fri Nov  9 16:51:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for
-	  each iteration.  [ruby-dev:31659][ruby-dev:32192]
-
-	* variable.c (rb_cvar_set): cvar assignment obey same rule to cvar
-	  reference.  [ruby-dev:32192]
-
-Fri Nov  9 15:52:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_check_encoding, rb_set_primary_encoding): ENCODING
-	  is no longer in FL_USERS flags.
-
-Fri Nov  9 15:20:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_squeeze_bang): initialize squeezing table if no
-	  arguments given.
-
-Fri Nov  9 13:57:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (each_with_index_i): use rb_yield_values() for
-	  compatibility with Enumerator#with_index().  a patch from Yusuke
-	  ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32195]
-
-Fri Nov  9 13:45:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_iterator.rb (TestIterator::IterTest::each):
-	  #each_pair is now alias to #each.  [ruby-dev:32192]
-
-	* test/ruby/test_iterator.rb (TestIterator::test_assoc_yield):
-	  ditto
-
-Fri Nov  9 12:56:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_load.c (loaded_feature_path): check with type of given feature.
-
-Fri Nov  9 12:43:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_basicinstructions.rb: updated for new class
-	  behavior.  [ruby-dev:32192]
-
-	* encoding.c (enc_name): Encoding should not rely on ENCODING in
-	  the FL_USERS flags.
-
-	* encoding.c (rb_enc_from_encoding): do not call rb_enc_associate
-	  for encoding itself.
-
-	* encoding.c (enc_register_at): ditto.
-
-	* marshal.c (r_ivar): do not set real instance variable for
-	  encoding data associated.
-
-Fri Nov  9 10:43:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (send_internal): use self in the previous frame to check for
-	  protected methods.  [ruby-core:13254]
-
-	* insnhelper.ci (vm_call_method): send! method has gone.
-
-Fri Nov  9 10:38:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* marshal.c (w_object): should be SPECIAL_CONST_P() instead of
-	  IMMEDIATE_P().
-
-Fri Nov  9 10:29:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_invoke_method): check if invoked in function style.
-	  [ruby-core:13245]
-
-	* insnhelper.ci (vm_call_cfunc, vm_cfunc_flags): stores and returns VM
-	  calling flags.
-
-	* vm.c (rb_vm_cfunc_funcall_p): returns if the current method is
-	  invoked in function style.
-
-Fri Nov  9 10:10:21 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: add rb_context_t#type.
-
-Fri Nov  9 10:05:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ruby.c (set_arg0): fix breaking environ bugs.
+	* Makefile.in (lex.c): don't remove lex.c at first.
 
 Fri Nov  9 07:26:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* random.c: update MT URL.[ruby-core:13305].
 
-Thu Nov  8 17:09:55 2007  David Flanagan  <davidflanagan@ruby-lang.org>
-
-	* object.c: improve docs for Object.tap
-
-	* ChangeLog: fix bogus dates on my previous entries
-
-Thu Nov  8 15:13:56 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
-	* parse.y: fix segfault with \x escapes in regexps
-	  delete unused #if 0 code regions from previous patch
-
-Thu Nov  8 12:12:10 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_read_escape): remove C99/gcc-ism.
-
-Thu Nov  8 07:54:22 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
-	* parse.y: patch, based on Nobu's, work to support \u escapes
-	           also modifications for better coderange detection
-
-	* test/ruby/test_unicode_escapes.rb: test cases
-
-	* test/ruby/test_mixed_unicode_escapes.rb: mixed encoding test cases
-
-Thu Nov  8 07:14:37 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
-	* parse.y (rb_intern3): commented out broken code that prevented
-	  correct interning of multi-byte symbols.  Without this patch
-	  :x==:x is false when x is a multi-byte character.
-
-Thu Nov  8 07:04:31 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
-	* string.c (tr_setup_table, tr_trans): fix test failures
-	  in test/ruby/test_string.rb
-
-Wed Nov  7 15:07:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_each_with_index): make different arrays at each
-	  iteration.  [ruby-dev:32181]
-
-Wed Nov  7 05:17:24 2007  David Flanagan <davidflanagan@ruby-lang.org>
-
-	* eval.c: fix typo in invoke_method documentation
-
-Wed Nov  7 03:52:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_product): core dumped with non array arguments.
-	  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:32180]
-
 Wed Nov  7 03:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
 	  nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
 	  [ruby-dev:32183]
 
-Wed Nov  7 02:59:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_each_index): should return meaningful value.
-
-Tue Nov  6 16:37:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_load.c (loaded_feature_path): need to expand relative paths.
-
-	* eval_load.c (rb_feature_p): check if the feature is loading with
-	  load path.  [ruby-dev:31932]
-
-	* eval_load.c (load_lock): check the result of barrier waiting.
-
-	* thread.c (rb_barrier_wait): check if owned by the current thread.
-
-	* thread.c (rb_barrier_release): ditto.
-
-Mon Nov  5 08:01:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_eval): move #send to Kernel module from BasicObject.
-
 Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
@@ -14668,176 +3106,23 @@ Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  reimplement the parser that is simpler than the current one.
 	  since we abandoned the plan, warning no longer required.
 
-Mon Nov  5 01:02:56 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTPHeader#initialize): provide default
-	  User-Agent to fix 500 error on some corrupted HTTP servers.
-	  [ruby-core:13135]
-
-Mon Nov  5 00:32:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_send): allow send/__send__ to call methods of all
-	  visibility again.  we no longer provide __send, __send!.
-
-	* eval.c (rb_invoke_method): new method to honor private
-	  visibility.  if it's invoked in a function call style, it calls
-	  private methods as well (previous 1.9 send behavior).
-
-Mon Nov  5 00:24:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub: vendor_ruby support.
-
-	* configure.in (RUBY_LIB): duplicated.
-
-Mon Nov  5 00:01:33 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_quote): quote \v as well.
-
-Sun Nov  4 23:51:59 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_initialize_m): use StringValuePtr instead of
-	  StringValueCStr because \0 exists when Regexp.new("\0").
-
-Sun Nov  4 08:11:19 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (count_objects): count TOTAL.
-
-Sun Nov  4 03:58:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_setup_table): use C array for characters that fit
-	  in a byte to gain performance.
-
-	* string.c (rb_str_delete_bang): ditto.
-
-	* string.c (rb_str_squeeze_bang): ditto.
-
-	* string.c (rb_str_count): ditto.
-
-	* string.c (tr_trans): ditto.
-
-Sun Nov  4 00:06:40 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (count_objects): ObjectSpace.count_objects implemented.
-	  [ruby-core:12301]
-
-Sat Nov  3 22:49:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_each_pair): make Hash#each to be alias to
-	  Hash#each_pair for compatibility and clarity.
-
-	* hash.c (env_each_pair): ditto.
-
-Sat Nov  3 22:41:05 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: --with-vendor-hdrdir implemented.
-
-	* lib/mkmf.rb: check --vendor argument.
-
-	* README.EXT: explain --vendor option for extconf.rb
-
-	* README.EXT.ja: ditto.
-
-Sat Nov  3 20:30:48 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: --with-vendordir implemented.
-
-	* mkconfig.rb: add config to vendorlibdir and vendorarchdir.
-
-	* instruby.rb: make vendor library directories.
-
-	* ruby.c: insert vendor library directories into load path.
-
-Fri Nov  2 20:55:49 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/content.rb, lib/rss/content/, lib/rss/maker/content.rb,
-	  test/rss/test_content.rb, test/rss/test_maker_content.rb,
-	  test/rss/rss-testcase.rb (RSS::TestCase): supported
-	  content:encoded with RSS 2.0.
-	  Suggested by Sam Lown. Thanks.
-
-Fri Nov  2 20:47:04 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
-
-Thu Nov  1 21:56:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (Init_Exception): make NameError to be subclass of
-	  StandardError again.
-
-	* error.c (Init_Exception): make SecurityError to be subclass of
-	  Exception, since it's too important to be handled implicitly.
-
-Thu Nov  1 14:51:39 2007 David Flanagan <davidflanagan@ruby-lang.org>
-	* enum.c (take_while_i, drop_while_i) add RTEST to handle nil return
-
-Thu Nov  1 02:12:50 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (prereq): update the path of prelude.c.
-
-	* common.mk (prelude.c): rollback a part of r13675, because it is not
-	  documented and causes build error.
-
-Thu Nov  1 01:52:23 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enum.c (enum_drop): fix typo.
-
-Thu Nov  1 01:51:01 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* vm_core.h (ruby_current_thread): RUBY_EXTERN'ed for probeprofiler.
-
-Thu Nov  1 00:46:30 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/configure.bat, setup.mak: now can recognize OS even if
-	  the ``--target'' option of configure is omitted.
-
-	* win32/README.win32: update the descriptions about compiler.
-
-Wed Oct 31 03:13:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_take_while): separate with-block form.
-
-	* enum.c (drop_while_i): ditto.
-
-	* enum.c (enum_butfirst): abandon butfirst method.  reverted.
-
-Tue Oct 30 10:03:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_butfirst): add a new method to iterates over
-	  elements but first n.  RDoc need to be updated.
-
-	* enumerator.c (Init_Enumerator): remove unnecessary symbol
-	  initialization.
-
-Mon Oct 29 18:42:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (bvar): block-local variable can shadow outer variable.
-	  [ruby-core:13036]
-
-Mon Oct 29 17:58:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_substr): performance improvement.  [ruby-dev:31806]
-
-Mon Oct 29 17:20:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov  2 00:13:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* encoding.c (rb_enc_replicate): new function to replicate encoding.
-
-	* encoding.c (enc_based_encoding): Encoding#base_encoding returns
-	  based encoding of replica.
-
-Mon Oct 29 17:18:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
+	  using #to_ary.
 
-	* encoding.c (rb_enc_compatible): ASCII encoding is compatible with
-	  ASCII-compatible encoding, even for non-string objects.
+	* hash.c (rb_hash_s_create): check and convert argument hash
+	  using #to_hash.
 
-Sun Oct 28 21:50:02 2007  Tanaka Akira  <akr@fsij.org>
+	* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
+	  hash conversion.
 
-	* lib/open-uri.rb: :redirect option implemented to disable redirects.
-	  (OpenURI::HTTPRedirect): new exception class for redirection.
+Thu Nov  1 23:47:43 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Fri Oct 26 17:38:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/drb/drb.rb (DRbTCPSocket): Improving with multiple network
+	  interface.
 
-	* numeric.c (int_chr): take an optional encoding parameter.
-	  [ruby-core:12816]
+	* test/drb/drbtest.rb: ditto.
 
 Fri Oct 26 17:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -14845,344 +3130,107 @@ Fri Oct 26 17:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
 
-Fri Oct 26 15:00:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for
-	  labels inside switch block.
+Wed Oct 25 07:18:09 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
-Fri Oct 26 05:48:57 2007  David Flanagan <davidflanagan@ruby-lang.org>
-	* array.c: raise IndexError for negative length in rb_ary_fill
-
-Wed Oct 25 07:12:03 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+	Merged 13781 from trunk.
 
 	* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
 	  addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
 
-Wed Oct 25 06:34:11 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+Wed Oct 25 06:46:21 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	Merged 13779 from trunk.
 
 	* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
 	  pattern case insensitive. [ruby-Bugs-10746]
 
-Fri Oct 26 04:21:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/pop.rb (Net::POP3::do_start): type fixed.  a patch from
-	  Dan Zwell <dzwell AT zwell.net> in [ruby-core:12941].
-
-Fri Oct 26 01:48:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
-	  using #to_ary.
-
-	* hash.c (rb_hash_s_create): check and convert argument hash
-	  using #to_hash.
-
-	* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
-	  hash conversion.
-
-Thu Oct 25 16:46:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): dot at the head of the line denote line
-	  continuation from previous one to support fluent interface.
-	  [experimental]
-
-	* misc/ruby-mode.el (ruby-calculate-indent): support fluent dot.
-
 Thu Oct 25 14:19:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
 
-Thu Oct 25 13:59:53 2007 David Flanagan <davidflanagan@ruby-lang.org>
-
-	* parse.y (parser_tokspace): increment tokidx
-	  fixes test failure at [test/ruby/test_stringchar.rb:72]
+Wed Oct 25 08:03:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
-Thu Oct 25 09:49:49 2007  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
-	  scheme. [ruby-dev:31896]
-
-Wed Oct 25 06:23:14 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+	Merged 13767, 13768, 13769, and 13770 from trunk.
 
 	* 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]
 
-Wed Oct 25 04:59:28 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
 	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
 
-Wed Oct 25 04:46:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
 	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
 	  message for Content-Type check failures. [ruby-core:12163]
 
-Wed Oct 25 03:45:08 2007  James Edward Gray II  <jeg2@ruby-lang.org>
-
 	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
 	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]
 
-Wed Oct 24 17:09:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_tokspace): make space in token buffer.
-
-	* parse.y (parser_yylex): fix encoding of single character literal.
-
-Tue Oct 23 13:44:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (call_args2): nd_head of NODE_BLOCK_PASS should be a list.
-	  [ruby-core:12850]
-
-Tue Oct 23 10:42:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): encoding set by command line option takes
-	  priority over the encoding in the source, as the primary encoding.
-
-Mon Oct 22 19:24:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (proc_options): allow space after -E (encoding) option.
-
-Mon Oct 22 11:03:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_check_encoding): returns index now.
-
-	* encoding.c (rb_enc_compatible): check if two objects have compatible
-	  encodings.
-
-	* encoding.c (enc_compatible_p): added Encoding.compatible?.
-
-	* include/ruby/encoding.h (rb_enc_compatible): prototype.
-
-Sun Oct 21 18:29:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_default, rb_enc_primary): return pointers to
-	  rb_encoding of default and primary respectively.  [ruby-core:12795]
-
-	* encoding.c (set_primary_encoding): removed primary_encoding setter.
-
-Sat Oct 20 13:17:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_cycle): hide temporary array from ObjectSpace.
-	  [ruby-core:12762]
-
-Sat Oct 20 11:49:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_get_path): returns frozen string.
-
-	* file.c (rb_file_s_chown, rb_file_s_lchown): use uid_t and gid_t.
-
-Fri Oct 19 20:08:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_id_encoding): returns ID "encoding".
-
-	* marshal.c (w_encoding): dump encoding name.
-
-	* marshal.c (r_ivar): load encoding.
-
-Fri Oct 19 16:41:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_regx_options, reg_compile_gen): relaxened encoding
-	  matching rule.
-
-	* re.c (rb_reg_initialize): always set encoding of Regexp.
-
-	* re.c (rb_reg_initialize_str): fix encoding for non 7bit-clean
-	  strings.
-
-	* re.c (rb_reg_initialize_m): use ascii encoding for 'n' option.
-
-Fri Oct 19 11:09:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): set primary encoding from the parser
-	  always.  [ruby-core:12758]
-
-	* ruby.c (load_file): should not discard the parser parameter.
-
-Fri Oct 19 10:55:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_last): removed unused variables.
-
-Thu Oct 18 17:08:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_find_index): update RDoc.  a patch from David Flanagan
-	  <david AT davidflanagan.com> in [ruby-core:12710].
-
-	* enum.c (enum_take, enum_drop): ditto.
-
-	* enum.c (enum_cycle): should not cause infinite loop for empty
-	  arrays.  [ruby-core:12710]
-
-	* range.c (Init_Range): typo fixed.
-
-Thu Oct 18 16:39:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): more
-	  duck typed.  better performance on JRuby.
-	  http://headius.blogspot.com/2007/10/another-performance-discovery-rexml.html
-
-Thu Oct 18 09:33:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_first): takes first n element if argument is
-	  given.  [ruby-core:12697]
+Sun Oct 21 21:16:43 2007  Kouhei Sutou  <kou@cozmixng.org>
 
-	* range.c (range_last): returns last n elements if argument is
-	  given.
-
-	* array.c (rb_ary_subseq, rb_ary_last): export.
-
-Wed Oct 17 17:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): fixed reversed condition.  [ruby-core:12722]
-
-Wed Oct 17 13:54:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_s_union): the last check was not complete.
-
-Wed Oct 17 11:30:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_from_encoding, rb_enc_register): associate index
-	  to self.
-
-	* encoding.c (enc_capable): Encoding objects are encoding capable.
-
-	* re.c (rb_reg_s_union): check if encoding matching by exact encoding
-	  objects.
-
-Wed Oct 17 06:18:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_alias, rb_enc_find_index): changed
-	  enc_table_alias to a name-to-index hash.
-
-	* encoding.c (rb_enc_init): use upper case names for aliases to use as
-	  constant names.
-
-	* encoding.c (enc_find): allow symbols.
-
-	* encoding.c (Init_Encoding): define encoding constants.
-
-	* st.c (strcasehash): fix wrong code range condition.
-
-Wed Oct 17 05:07:18 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_primary_encoding): added Encoding.primary_encoding.
-
-	* parse.y (rb_parser_encoding): added.
-
-	* ruby.c (proc_options): added -E and --encoding options.
-
-	* ruby.c (process_options): set primary encoding from command line
-	  option if set, or source encoding.
-
-	* include/ruby/encoding.h (rb_enc_from_encoding,
-	  rb_get_primary_encoding, rb_set_primary_encoding): prototypes.
-
-	* include/ruby/node.h (rb_parser_encoding): prototype.
-
-Wed Oct 17 03:37:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_desc): set encoding.
-
-	* re.c (rb_reg_s_union): check encodings.
-
-	* enc/utf8.c (utf8_code_to_mbclen): 0xfe and 0xff are valid Unicode to
-	  be encoded to 2bytes in UTF-8.  [ruby-core:12700]
-
-Wed Oct 17 02:50:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_ord): use encoding.
-
-Wed Oct 17 01:57:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_initialize_m): allow binary encoding option.
-	  [ruby-dev:32083]
-
-Tue Oct 16 19:48:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_s_union): check for encoding of original object.
-
-Tue Oct 16 18:28:51 2007  Tanaka Akira  <akr@fsij.org>
-
-	* debug.c: use enum for constants for gdb if possible.
-
-Tue Oct 16 18:20:10 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c, debug.c: move debug enum and constants to debug.c.
-
-Tue Oct 16 18:16:15 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c (RUBY_ENCODING_SHIFT): added as enum.
-
-	* .gdbinit (rp): show encoding and coderange for strings.
-
-Tue Oct 16 14:48:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_regx_options): check if regexp encoding option
-	  matches to current encoding.
-
-	* re.c (char_to_option, rb_char_to_option_kcode): 'n' is not kcode
-	  option now.
-
-	* re.c (rb_reg_to_s, rb_reg_error_desc): copy encoding rather than
-	  append as an option.
-
-	* re.c (make_regexp, rb_reg_prepare_re): use encoding of Regexp and
-	  String instead of kcode.
+	* lib/rss.rb, lib/rss/, test/rss/, sample/rss/: merged from trunk.
+	- 0.1.6 -> 2.0.0.
+	- fixed image module URI. Thanks to Dmitry Borodaenko.
+	- supported Atom.
+	- supported ITunes module.
+	- supported Slash module.
 
-	* re.c (rb_reg_initialize): set fixed option if none is set.
+	* NEWS: added an entry for RSS Parser.
 
-	* re.c (rb_reg_regcomp): ditto.
+Thu Oct 18 10:57:06 2007  Tanaka Akira  <akr@fsij.org>
 
-	* re.c (rb_reg_equal): check if encodings are equal.
+	* ruby.h (RCLASS_IV_TBL): defined.
+	  (RCLASS_M_TBL): ditto.
+	  (RCLASS_SUPER): ditto.
+	  (RMODULE_IV_TBL): ditto.
+	  (RMODULE_M_TBL): ditto.
+	  (RMODULE_SUPER): ditto.
 
-	* re.c (rb_reg_initialize_m): encoding option is obsolete.
+Mon Oct 15 22:08:55 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* re.c (rb_kcode, rb_get_kcode, rb_set_kcode): removed.
+	* NEWS: Merge some of the sub-sections, as the differences were
+	  unclear.
 
-	* re.c (Init_Regexp): removed Regexp#kcode method.
+Mon Oct 15 21:57:07 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ruby.c (proc_options): allow long encoding name.
+	* NEWS: Mention ipaddr enhancements.
 
-Tue Oct 16 14:03:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
+	  code optimization.
 
-	* re.c (rb_reg_s_union): encoding of all regexp objects should
-	  match.  [ruby-dev:32076]
+	* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
+	  comparable.
 
-Tue Oct 16 13:49:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ipaddr.rb (succ): Implement IPAddr#succ.  You can now create
+	  a range between two IPAddr's, which (Range) object is
+	  enumerable.
 
-	* encoding.c (enc_to_s): rename function.
+	* lib/ipaddr.rb (to_range): A new method to create a Range object
+	  for the (network) address.
 
-Tue Oct 16 13:25:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/ipaddr.rb (coerce_other): Support type coercion and make &,
+	  |, == and include? accept a string or an integer instead of an
+	  IPAddr object as the argument.
 
-	* string.c (rb_str_new4): should copy encoding.  a patch from NARUSE,
-	  Yui <naruse AT airemix.com>.  [ruby-dev:32076]
+	* lib/ipaddr.rb (initialize): Give better error messages.
 
-Tue Oct 16 01:31:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ipaddr.rb: Improve documentation.
 
-	* enum.c (enum_inject): RDoc update.  a patch from David Flanagan
-	  <david AT davidflanagan.com> in [ruby-core:12710].
+Mon Oct 15 21:24:25 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Oct 16 01:25:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* NEWS: Mention shellwords and tempfile enhancements.
 
-	* encoding.c (Init_Encoding): define #to_s to show encoding name
-	  in to_s representation as well as #inspect.
+	* NEWS: Move the entry about Tk::X_Scrollable to a better section.
 
-Mon Oct 15 13:24:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 15 17:28:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* numeric.c (flo_round): should be number but not rounding factor.
-	  [ruby-dev:32060]
+	* ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
+	  r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
+	  [ruby-dev:31979]
 
 Mon Oct 15 11:45:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]
 
-Mon Oct 15 10:24:19 2007  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (pst_to_s): returns a string such as "pid 10220 exit 1"
-	  instead of "256".  [ruby-dev:32053]
-	  (pst_inspect): change format
-	  "#<Process::Status: pid=10220,exited(1)>" to
-	  "#<Process::Status: pid 10220 exit 1>".
-
 Mon Oct 15 09:58:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_bytes0): check if source has enough data.
@@ -15193,26 +3241,6 @@ Mon Oct 15 01:15:09 2007  Tanaka Akira  <akr@fsij.org>
 	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
 	  nonblocking.  [ruby-talk:274079]
 
-Sun Oct 14 17:31:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_obj_encoding): rdoc update.  a patch from David
-	  Flanagan <david AT davidflanagan.com>.  [ruby-core:12664]
-
-	* encoding.c (enc_dump, enc_load): marshaling feature.  a patch from
-	  David Flanagan.  [ruby-core:12665]
-
-	* encoding.c (Init_Encoding): undefine allocator of Encoding.
-	  [ruby-core:12665], [ruby-core:12666]
-
-	* test/ruby/test_encoding.rb: tests for Encoding from David Flanagan
-	  [ruby-core:12665]
-
-Sun Oct 14 11:09:09 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb (PP::PPMethods#pp_hash): don't sort keys because hash is
-	  ordered.
-	  (ENV.pretty_print): call pp_hash with sorted hash.
-
 Sun Oct 14 04:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (AC_SYS_LARGEFILE): keep results also in command
@@ -15225,789 +3253,98 @@ Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/mkexports.rb: deal with __fastcall name decorations.
 	  [ruby-list:44111]
 
-Sun Oct 14 02:20:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_cEncoding): new Encoding class.
-
-	* encoding.c (rb_to_encoding, rb_to_encoding_index): helper functions.
-
-	* encoding.c (rb_obj_encoding): return Encoding object now.
-
-	* gc.c (garbage_collect): mark Encoding objects.
-
-	* inits.c (rb_call_inits): call Init_Encoding.
-
-	* string.c (rb_str_force_encoding): accept Encoding object as well as
-	  encoding name.
-
-	* include/ruby/encoding.h (rb_to_encoding_index, rb_to_encoding):
-	  prototypes.
-
-Sun Oct 14 01:03:30 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI.open_http): fix :ssl_ca_cert option.
-
-Sat Oct 13 21:23:21 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (foletype_s_ole_classes,
-	  foletype_s_typelibs): refactoring.
-
-	* test/win32ole/test_win32ole_type.rb: add some test.
-
-	* ext/win32ole/win32ole.c (Init_win32ole): change method name
-	  WIN32OLE_TYPELIB.ole_types from WIN32OLE_TYPELIB.ole_classes.
-
-	* test/win32ole/test_win32ole_typelib.rb: ditto.
-
-	* test/win32ole/test_folderitem2_invokeverb.rb: check create
-	  shortcut string more strictly (This test is invoked in Japanese
-	  Windows environment).
-
-Sat Oct 13 09:11:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (set_file_encoding): case-insensitive search, a patch from
-	  David Flanagan <david AT davidflanagan.com> [ruby-core:12629]
-
 Sat Oct 13 09:02:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
 
-Sat Oct 13 00:17:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/document.rb (REXML::Document::write): leaky
-	  modification trans -> transitive.  [ruby-dev:32040]
-
-Sat Oct 13 00:00:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: encoding specifier should work if the line matches
-	  /coding[:=] ?/, a la Python PEP-263, so that VIM comments like
-	  "# vim: set fileencoding=<encoding name>" should be recognized.
-
-Fri Oct 12 15:04:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (magic_comments): add "encoding" as same as "coding".
-
-	* parse.y (set_file_encoding): special file encoding handling.
-
-	* parse.y (parser_yylex): ditto.
+Sat Oct 13 00:35:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Oct 12 12:44:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_combination): fixed memory corruption due to too
-	  small memory allocation
-
-	* array.c (rb_ary_product): accessing out of memory bounds.
-	  condition fixed.
+	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
+	  fixed.  [ruby-list:44099]
 
 Fri Oct 12 11:22:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (match_values_at): make #select to be alias to #values_at
 	  to adapt RDoc description.  [ruby-core:12588]
 
-Thu Oct 11 21:10:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/node.h (NOEX_LOCAL): remove unused local visibility.
-
-	* class.c (ins_methods_push): ditto.
-
-	* class.c (rb_class_local_methods): method removed.
-
-Thu Oct 11 14:29:31 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* */Makefile.sub (COMMON_MACROS): workaround for old SDK's bug.
-	  [ruby-core:12584]
-
-Thu Oct 11 06:35:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, */Makefile.sub (VPATH): add enc directory.
-
-	* common.mk (ENCOBJS): encoding objects.
-
-	* enc: directory for encodings.
-
-Thu Oct 11 00:04:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/oniguruma.h (OnigEncodingTypeST): add OnigEncoding
-	  parameter to every function members.
+Thu Oct 11 14:32:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* include/ruby/oniguruma.h (OnigEncodingTypeST): add auxiliary
-	  data member to provide user defined data for an encoding.
+	* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
+	  bug. [ruby-core:12584]
 
-Wed Oct 10 23:32:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 10 23:34:45 2007  Tanaka Akira  <akr@fsij.org>
 
-	* re.c (rb_reg_s_quote): no longer takes optional second argument
-	  that has never been documented.
+	* lib/securerandom.rb: new file.  [ruby-dev:31928]
 
-Wed Oct 10 15:39:04 2007  Tanaka Akira  <akr@fsij.org>
+	* lib/cgi/session.rb (create_new_id): use securerandom if available.
 
-	* encoding.c (rb_enc_init): don't alias iso-8859-1 to ascii.
+Tue Oct  9 01:01:55 2007  Tanaka Akira  <akr@fsij.org>
 
-	* ascii.c (OnigEncodingASCII): change the name US-ASCII to ASCII-8BIT.
+	* re.c (rb_reg_s_union_m): Regexp.union accepts single
+	  argument which is an array of patterns.  [ruby-list:44084]
 
-Wed Oct 10 14:31:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct  8 20:06:23 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* string.c (rb_enc_str_coderange): fixed check for non-ascii.
+	* lib/net/http.rb, lib/open-uri.rb: remove
+	  Net::HTTP#enable_post_connection_check.  [ruby-dev:31960]
 
-Tue Oct  9 21:35:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_permutation, rb_ary_combination): missing type
-	  names.
-
-	* array.c (rb_ary_permutation): used buffer should be t1.
-
-	* array.c (rb_ary_permutation): use frozen shared hidden array.
-	  [ruby-dev:31985]
-
-Tue Oct  9 16:58:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c: remove to_a completely.
-
-	* array.c (tmpbuf): keep DRY to clear klass of temporary objects.
-
-Tue Oct  9 16:33:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_permutation, rb_ary_combination, rb_ary_product):
-	  hide internal buffer objects.  [ruby-dev:31982]
-
-Tue Oct  9 16:00:32 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (parser_read_escape, parser_tokadd_escape): check code range.
-	  [ruby-dev:31980]
-
-Tue Oct  9 15:40:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (STR_NEW3): check for if single byte sequence.
-
-Mon Oct  8 20:06:29 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/imap.rb, lib/net/smtp.rb, lib/net/pop.rb: hostname should
-	  be verified against server's identity as presented in the server's
-	  certificate. [ruby-dev:31960]
+	* lib/net/imap.rb: hostname should be verified against server's
+	  indentity as persented in the server's certificate. [ruby-dev:31960]
 
 	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
 
-Sun Oct  7 22:37:47 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_taxonomy.rb, test/rss/test_parser_1.0.rb,
-	  test/rss/test_image.rb, test/rss/rss-testcase.rb: ensured
-	  declaring XML namespaces.
-
-Sun Oct  7 22:00:01 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/node.h: make node flags as VALUE type.
-	  enum ruby_node_flags removed.
-
-	* ruby.c: define RUBY_NODE_* as const for gdb.
-
-Sun Oct  7 18:57:12 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h: enum ruby_value_flags removed.  [ruby-dev:31959]
-
-	* ruby.c: define RUBY_FL_* as const VALUE for gdb.
-
-Sun Oct  7 17:50:14 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/http.rb: remove enable_post_connection_check flag.
-
-	* lib/open-uri.rb: ditto.
-
-Sun Oct  7 15:48:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (opt_eq): fix to use rb_str_equal().
-
 Sat Oct  6 23:14:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_to_i): update RDoc since base can be any value
 	  between 2 and 36.  [ruby-talk:272879]
 
-Sat Oct  6 16:24:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (cont_free): check Fiber or Continuation.
-
-	* bootstraptest/test_knownbug.rb: remove a fixed test.
-
-Sat Oct  6 14:56:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_register): returns new index or -1 if failed.
-
-	* encoding.c (rb_enc_alias): check if original name is registered.
-
-	* encoding.c (rb_enc_init): register in same order as kcode options in
-	  re.c.  added new aliases.
-
-	* string.c (rb_str_force_encoding): check if valid encoding name.
-
-Sat Oct  6 14:32:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (opt_eq): get rid of gcc bug.
-
-Sat Oct  6 02:34:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/defines.h: no longer provide DEFAULT_KCODE.
-
-Fri Oct  5 21:24:59 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (rb_reg_s_union_m): Regexp.union accepts single argument which
-	  is an array of patterns.  [ruby-list:44084]
-
-Fri Oct  5 16:42:27 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_not_match): new method.
-
-Fri Oct  5 16:15:52 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Turn on --enable-pthread by default for FreeBSD
-	  5.2.1-RELEASE and later, and remove pthread support for older
-	  versions which has never worked perfectly.
-
-Fri Oct  5 16:11:50 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* time.c (time_to_s): Fix documentation.  Time format changed.
-
-Fri Oct  5 04:02:39 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
-	  code optimization.
-
-Fri Oct  5 03:25:51 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
-	  comparable.
-
-	* lib/ipaddr.rb (succ): Implement IPAddr#succ.  You can now create
-	  a range between two IPAddr's, which (Range) object is
-	  enumerable.
-
-	* lib/ipaddr.rb (to_range): A new method to create a Range object
-	  for the (network) address.
-
-Fri Oct  5 03:14:45 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/ipaddr.rb (coerce_other): Support type coercion and make &,
-	  |, == and include? accept a string or an integer instead of an
-	  IPAddr object as the argument.
-
-	* lib/ipaddr.rb (initialize): Give better error messages.
-
-	* lib/ipaddr.rb: Improve documentation.
-
-Thu Oct  4 20:45:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (Init_process): win32 has our own WNOHANG definition, so
-	  remove unnecessary #ifdef guard.
-
-Thu Oct  4 20:17:19 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* array.c (rb_ary_permutation, rb_ary_product): support non C99
-	  compilers.
-
-Thu Oct  4 17:33:18 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (kcode_setter): Perl-ish global variable `$=' no longer
-	  effective.
-
-	* io.c (Init_IO): remove obsolete variables: $defout, $deferr.
-
-	* re.c (Init_Regexp): remove obsolete const alias: MatchingData.
-
-	* time.c (Init_Time): remove obsolete Time::times.
-
-	* re.c (ignorecase_setter): change warning message.
-
-	* re.c (ignorecase_getter): now gives warning.
-
-	* string.c (rb_str_cmp_m): update RDoc document.
-
-	* re.c (kcode_setter): restore erroneously removed setter.
-
-Thu Oct  4 16:28:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_obj_encoding): returns encoding of the given object.
-
-	* parse.y (reg_compile_gen): copy encoding from source string if
-	  non-empty.
-
-	* re.c (Init_Regexp): new method Regexp#encoding.
-
-	* string.c (str_encoding): moved to encoding.c
-
-Thu Oct  4 15:49:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_permutation): remove C99 dependency.
-	  [ruby-dev:31934]
-
-	* array.c (rb_ary_product): ditto.
-
-Wed Oct  3 23:37:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/nkf/nkf.c, bin/ri, bin/irb: fixed typos in doc and comments.
-	  a patch from Eugene Ossintsev  <eugoss AT gmail.com>.
-	  [ruby-core:12375]
-
-Wed Oct  3 17:56:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: enable specify label to executable.
-	  (-e "ruby1::/path/to/ruby1; ruby2::/path/to/ruby2; ...")
-
-Wed Oct  3 16:58:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_str_new, parser_yylex, rb_intern3): set code-range
-	  bits.
-
-	* parse.y (parser_tokadd_string): check code-range.
-
-	* parse.y (parser_parse_string, parser_here_document): ditto.
-
-	* parse.y (parser_set_encode): check if valid encoding.
-
-Wed Oct  3 15:43:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_set): check whether class variable is
-	  defined in superclasses.  root classes have higher priority.
-	  removes lower class variable entry from IV_TBL (if it's defined
-	  in classes, not modules).
-
-	* variable.c (rb_cvar_get): ditto.
-
-Wed Oct  3 10:06:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_process_options): push frame with program name.
-	  [ruby-core:12351]
-
-Tue Oct  2 20:16:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (init_env): refactoring. remove unused code.
+Fri Oct  5 15:44:50 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Oct  2 12:30:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_product): generalized product, now takes
-	  arbitrary number of arrays.  a patch from David Flanagan
-	  <david AT davidflanagan.com>.  [ruby-core:12346]
-
-Tue Oct  2 08:25:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_permutation): implementation contributed from
-	  David Flanagan.  [ruby-core:12344]
-
-	* array.c (rb_ary_combination): RDoc update to clarify.  a patch
-	  from David Flanagan.  [ruby-core:12344]
-
-	* array.c (rb_ary_permutation): small dirty hack by Matz to avoid
-	  arrays on stack.
-
-Tue Oct  2 07:01:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_dup): proc->block.proc should be self.
-
-	* bootstraptest/test_knownbug.rb, test_method.rb:
-	  move a fixed test.
-
-Mon Oct  1 16:17:44 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/test_method.rb: use assert_normal_exit to test
-	  [ruby-dev:31818].
-
-Mon Oct  1 15:57:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (id2ref): skip ICLASS.
-
-Mon Oct  1 15:29:35 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_normal_exit): use `` instead of
-	  system.
-
-Mon Oct  1 15:17:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (id2ref): T_VALUES is less than T_BLOCK.  [ruby-dev:31911]
-
-Mon Oct  1 10:58:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (require_libraries): use require method instead of calling
-	  rb_require directly.  [ruby-dev:31322]
-
-Mon Oct  1 10:52:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_options), ruby.c (proc_options, process_options): not
-	  call exit(2) directly.  [ruby-dev:31912]
-
-	* eval.c (ruby_run_node): deal with direct exit code.
-
-Sun Sep 30 17:12:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_append): always set encoding, and coderange
-	  cache bits.
-
-	* include/ruby/encoding.h (ENC_CODERANGE_SET): fixed a bug not to
-	  set cache bits.
-
-Sun Sep 30 11:52:11 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (pretty): don't show beginning empty line.
-
-Sun Sep 30 11:32:34 2007  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c: use #ifdef for test LONG_LONG_VALUE.
-
-Sun Sep 30 04:30:55 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c: use SIZEOF_LONG instead of SIZEOF_ULONG which is not
-	  defined.
-
-Sun Sep 30 04:03:43 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (Init_Regexp): test DEFAULT_KCODE in C code because
-	  KCODE_EUC, etc. are enum.
-
-Sun Sep 30 00:55:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* variable.c (obj_ivar_each): get rid of warning.
-
-Sat Sep 29 17:45:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* main.c (main): use platform-independent per-process initialization.
-	  [ruby-dev:31900]
-
-	* ruby.c (ruby_sysinit): new function for per-process initialization.
-
-	* include/ruby/ruby.h (RUBY_GLOBAL_SETUP): toplevel setup declaration.
-
-	* include/ruby/win32.h, win32/mkexports.rb: alias NtInitialize
-	  ruby_sysinit.
-
-	* win32/win32.c (rb_w32_sysinit): renamed from NtInitialize.
-
-Sat Sep 29 17:31:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_combination): new method to give all combination
-	  of elements from an array.  [ruby-list:42671]
-
-	* array.c (rb_ary_product): a new method to get all combinations
-	  of elements from two arrays.  can be extended to combinations of
-	  n-arrays, e.g. a.product(b,c,d).  anyone volunteer?
-
-	* array.c (rb_ary_permutation): empty function body to calculate
-	  permutations of array elements.  need volunteer.
-
-Sat Sep 29 17:14:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_leave): move proc invocation from r_entry() to
-	  avoid potential crash.
-
-Sat Sep 29 12:28:08 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_normal_exit): new method.
-
-	* bootstraptest/test_knownbug.rb: add test for Marshal.load.
-
-Sat Sep 29 10:12:20 2007  Tanaka Akira  <akr@fsij.org>
-
-	* variable.c (rb_ivar_set): fix class instance variable.
-
-	* object.c (rb_class_real): cl argument may be 0.
-
-Sat Sep 29 09:12:02 2007  Tanaka Akira  <akr@fsij.org>
-
-	* object.c (rb_class_real): use BUILTIN_TYPE instead of TYPE.
-	  access flags directly instead of FL_TEST.
-	  they are enough because cl argument is a class.
-
-Sat Sep 29 08:57:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/win32.h (strcasecmp): needed for type_strcasehash.
-
-Sat Sep 29 06:47:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (struct cmdline_options): static variables packed.
-
-Sat Sep 29 05:29:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_fdopen): create IO object from fd.
-
-	* parse.y (yycompile): use encoding of the source as default.
-
-	* ruby.c (proc_options, load_file): ditto.
-
-Sat Sep 29 04:27:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_alias): allow encodings multiple aliases.
-
-	* encoding.c (rb_enc_find_index): search the encoding which has the
-	  given name and return its index if found, or -1.
-
-	* st.c (type_strcasehash): case-insensitive string hash type.
-
-	* string.c (rb_str_force_encoding): force encoding of self.  this name
-	  comes from [ruby-dev:31894] by Martin Duerst.  [ruby-dev:31744]
-
-	* include/ruby/encoding.h (rb_enc_find_index, rb_enc_associate_index):
-	  prototyped.
-
-	* include/ruby/encoding.h (rb_enc_isctype): direct interface to ctype.
-
-	* include/ruby/st.h (st_init_strcasetable): prototyped.
-
-Sat Sep 29 03:53:26 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: Thread local storage should be fiber local.
-
-	* bootstraptest/test_knownbug.rb, test/ruby/test_fiber.rb:
-	  move a fixed test.
-
-Fri Sep 28 23:15:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insnhelper.ci (vm_call_method): allow send! to call protected
-	  methods as well.  [ruby-core:12280]
-
-Fri Sep 28 22:33:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_so_fasta.rb: added.
-
-	* benchmark/bm_so_k_nucleotide.rb: added.
-
-	* benchmark/bm_so_reverse_complement.rb: added.
-
-	* benchmark/make_fasta_output.rb: added.
-
-	* benchmark/prepare_so_k_nucleotide.rb: added.
-
-	* benchmark/prepare_so_reverse_complement.rb: added.
-
-Fri Sep 28 19:14:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix notations.
-
-	* benchmark/bm_loop_whileloop.rb: ditto.
-
-	* benchmark/bm_loop_whileloop2.rb: ditto.
-
-	* benchmark/bm_app_uri.rb: added.
-
-	* benchmark/bm_vm1_ivar_set.rb: ditto.
-
-	* benchmark/bm_so_binary_trees.rb: added from Computer Language
-	  Benchmarks Game (http://shootout.alioth.debian.org/).
-
-	* benchmark/bm_so_fannkuch.rb: ditto.
-
-	* benchmark/bm_so_mandelbrot.rb: ditto.
-
-	* benchmark/bm_so_meteor_contest.rb: ditto.
-
-	* benchmark/bm_so_nbody.rb: ditto.
-
-	* benchmark/bm_so_nsieve.rb: ditto.
-
-	* benchmark/bm_so_nsieve_bits.rb: ditto.
-
-	* benchmark/bm_so_partial_sums.rb: ditto.
-
-	* benchmark/bm_so_pidigits.rb: ditto.
-
-	* benchmark/bm_so_spectralnorm.rb: ditto.
-
-Fri Sep 28 16:22:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* vm_core.h (rb_vm_struct): fix typo: bufferd -> buffered.
-
-Fri Sep 28 15:47:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix to output benchmark results
-	  to file "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}".
-
-	* benchmark/bm_io_file_create.rb: remove useless codes.
-
-	* benchmark/bm_vm2_eval.rb: added.
-
-Fri Sep 28 15:05:24 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h: export rb_ivar_foreach.
-
-	* include/ruby/ruby.h: modify struct RObject and RClass for optimizing
-	  T_OBJECT space.  [ruby-dev:31853]
-	  (ROBJECT_LEN, ROBJECT_PTR)
-	  (RCLASS_IV_TBL, RCLASS_M_TBL, RCLASS_SUPER, RCLASS_IV_INDEX_TBL)
-	  (RMODULE_IV_TBL, RMODULE_M_TBL, RMODULE_SUPER): abstract accessor
-	  defined.
-
-	* variable.c: support the modified RObject and RClass.
-
-	* object.c: ditto.
-
-	* class.c: ditto.
-
-	* gc.c: ditto.
-
-	* marshal.c: ditto.
-
-	* eval_method.ci: use the abstract accessor.
-
-	* insns.def: ditto.
-
-	* proc.c: ditto.
-
-	* struct.c: ditto.
-
-	* eval.c: ditto.
-
-	* error.c: ditto.
-
-	* vm.c: ditto.
-
-	* insnhelper.ci: ditto.
-
-	* ext/digest/digest.c: ditto.
-
-Fri Sep 28 13:20:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline_fast, rb_io_getline_1): set encoding to the
-	  result string, as well as getc.
-
-Fri Sep 28 12:51:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_erb.rb: added.
-
-	* benchmark/bm_io_file_(create|read|write).rb: added.
-
-Fri Sep 28 12:49:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix file selection algorithm.
-
-Fri Sep 28 02:05:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_comparable): need not to check asciicompat here.
-
-	* encoding.c (rb_enc_check): ditto.
-
-	* string.c (rb_enc_str_coderange): tuned a bit; no broken check.
-
-	* encoding.c (rb_enc_check): new encoding comparison criteria.
-
-Thu Sep 27 17:36:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/REAMDE.win32: follow recent changes.
-
-Thu Sep 27 16:01:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix to output some helpful messages.
-
-Thu Sep 27 15:44:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: added.
-
-	* common.mk: fix to use above driver.
-
-	* benchmark/prepare_so_count_words.rb: added.
-
-	* benchmark/bm_so_count_words.rb: fix benchmark process.
-
-Thu Sep 27 15:42:34 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/fiber/fiber.c: modify prototype declaration.
-	  [ruby-core:12247]
-
-Thu Sep 27 09:42:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (strings, xstring, regexp, dsym): empty strings have
-	  US-ASCII encoding.
-
-Thu Sep 27 07:39:13 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_finish): new method.
-
-	* bootstraptest/test_knownbug.rb: add test for [ruby-dev:31866] using
-	  assert_finish.
-
-Thu Sep 27 04:46:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_associate_index): deal with ASCII compatible
-	  flags.
-
-	* encoding.c (rb_enc_check): allow ASCII compatible strings.
-
-	* parse.y (rb_intern_str): use ASCII encoding for ASCII string.
-
-	* string.c (rb_enc_str_coderange): check for code-range.
-
-	* string.c (rb_str_modify): clear code-range flags.
-
-	* string.c (rb_str_hash, rb_str_eql): ASCII compatible strings are
-	  comparable.
-
-	* include/ruby/encoding.h: added code-range flags.
-
-Thu Sep 27 04:40:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_mark_set): new function to mark keys.
-
-	* marshal.c (struct dump_arg, struct load_arg): added wrappers to mark
-	  data and compat_tbl entries.  [ruby-dev:31870]
-
-Thu Sep 27 03:17:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_waitpid): no needs to poll.  [ruby-dev:31871]
-
-Wed Sep 26 20:11:46 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: remove a fixed test.
-
-Wed Sep 26 20:00:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb: move fixed tests.
-
-	* bootstraptest/test_method.rb: ditto.
-
-	* test/ruby/test_io.rb: ditto.
-
-Wed Sep 26 19:36:26 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (eval): fix to check stack overflow.
-	  [ruby-dev:31850]
-
-	* eval_intern.h, vm.h: move CHECK_STACK_OVERFLOW() macro.
-
-Wed Sep 26 19:27:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_throw): fix to move increment point.
-	  [ruby-dev:31840]
-
-Wed Sep 26 19:23:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: Fiber as SemiCoroutine on default. [ruby-core:12146]
+	* lib/shellwords.rb: Add shellescape() and shelljoin().
 
-	* ext/fiber/fiber.c: enable Fiber#transfer.
+	* lib/shellwords.rb: Rename shellwords() to shellsplit() and make
+	  the former an alias to the latter.
 
-Wed Sep 26 18:38:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/shellwords.rb: Add escape(), split(), join() as class
+	  methods, which are aliases to their respective long names
+	  prefixed with `shell'.
 
-	* encoding.c (rb_enc_check): check for ASCII-compatibilities.
+	* lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
+	  and Array#shelljoin() for convenience.
 
-	* parse.y (parser_tokadd_string, parser_parse_string,
-	  parser_here_document, parser_yylex): set encoding to US-ASCII.
+Fri Oct  5 15:40:04 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* parse.y (rb_enc_symname_p): check if valid with encoding.
+	* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
+	  suffix for a temporary file name.
 
-	* parse.y (rb_intern3): let symbols have encoding.
+	* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
+	  names less predictable by including a random string.
+	  [inspired by: akr]
 
-	* string.c (rb_str_hash): add encoding index.
+Tue Oct  2 21:20:14 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* string.c (rb_str_comparable, rb_str_equal, rb_str_eql): check if
-	  compatible encoding.
+	* win32/win32.c (make_cmdvector): adjust escaped successive
+	  double-quote handling. (merge from trunk)
 
-	* string.c (sym_inspect): made encoding aware.
+Tue Oct  2 20:35:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* insns.def (opt_eq): compare with encoding.
+	* win32/win32.c (init_env): initialize HOME and USER environment
+	  variables unless set. [ruby-core:12328] (merge from trunk)
 
-	* include/ruby/encoding.h (rb_enc_asciicompat): check if ASCII
-	  compatible.
+	* win32/win32.c (NtInitialize, getlogin): ditto.
 
-	* include/ruby/encoding.h (rb_enc_get_index): added prototype.
+	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
+	  library for SH* functions on mswin32 and mingw32.
 
-	* include/ruby/intern.h (rb_str_comparable, rb_str_equal): ditto.
+Mon Oct  1 12:50:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Sep 26 15:01:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
+	  [ruby-dev:31911]
 
-	* eval_method.ci (rb_get_alloc_func): cast to suppress a warning.
+Wed Sep 26 23:54:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval_method.ci (remove_method): local variable to be initialized.
+	* ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
+	  should not prefixed with DESTDIR.
 
 Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -16016,51 +3353,20 @@ Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Sep 26 05:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (parser_yyerror): limit error message length.
-	  [ruby-dev:31848]
-
-Tue Sep 25 15:11:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_ungetc): reallocate internal buffer if pushing data
-	  excess capacity.  [ruby-dev:31650]
-
-Tue Sep 25 13:43:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_method.ci (remove_method): should not remove undef place
-	  holder.  [ruby-dev:31816], [ruby-dev:31817]
+	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
 
-Tue Sep 25 09:51:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
 
-	* eval.c (rb_longjmp): source file information may be NULL.
-	  [ruby-dev:31849]
+Tue Sep 25 13:47:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (ruby_finalize_0): clear trace_func before finalization.
-
-Mon Sep 24 22:36:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_equal): should handle recursive array.
-
-	* hash.c (hash_equal): should handle recursive hash.
-
-Mon Sep 24 22:14:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/weakref.rb (WeakRef): remove debug print.  [ruby-dev:31799]
-
-	* hash.c (hash_i): avoid too frequent hash conflict where key and
-	  value are same.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
-	  [ruby-dev:31802]
-
-Mon Sep 24 17:56:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
-	  encoding of the target string instead of setting to StringScanner
-	  instance.  [ruby-dev:31831]
+	* eval.c (remove_method): should not remove undef place holder.
+	  [ruby-dev:31817]
 
 Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/net/http.rb: fix typo.
 
-Mon Sep 24 06:49:15 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/net/http.rb: an SSL verification (the server hostname should
 	  be matched with its certificate's commonName) is added.
@@ -16081,16 +3387,11 @@ Sun Sep 23 09:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sun Sep 23 08:58:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval_method.ci (rb_attr): should not use alloca for unknown size
-	  input.  [ruby-dev:31818]
+	* eval_method.ci (rb_attr): should not use alloca for unknowen size
+	  input.  [ruby-dev:31816]
 
 	* parse.y (rb_intern_str): prevent str from optimization.
 
-Sun Sep 23 06:16:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_method.ci (remove_method): check for undefined method.
-	  [ruby-dev:31816]
-
 Sun Sep 23 05:42:35 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/rdoc/options.rb (Options::check_diagram): dot -V output
@@ -16106,305 +3407,60 @@ Sat Sep 22 05:19:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
 	  to share with strio_reopen properly.  [ruby-Bugs-13919]
 
-Fri Sep 21 14:51:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_mark_rest): copy just used part.
-
-	* gc.c (gc_mark_children): mark u1 and u2 of NODE_ARGSCAT.
-
-	* gc.c (os_obj_of): hide T_VALUES too.  [ruby-dev:31804]
+Fri Sep 21 15:46:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (run_final): freeze temporary argument array.
+	* process.c (struct rb_exec_arg): proc should be a VALUE.
 
-Fri Sep 21 04:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (rb_f_exec): suppress a warning.
 
-	* misc/ruby-style.el (ruby-style-label-indent): fix for function top
-	  level labels.
+Fri Sep 21 03:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 21 02:11:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* eval.c, intern.h, ext/thread/thread.c: should not free queue while
+	  any live threads are waiting.  [ruby-dev:30653]
 
-	* re.c (rb_reg_match_m): evaluate a block if match.  it would make
-	  condition statement much shorter, if no else clause is needed.
+Thu Sep 20 17:24:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_match_m): ditto.
+	* process.c (rb_detach_process): cast for the platforms where size of
+	  pointer differs from size of int.
 
-Fri Sep 21 02:02:34 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (rb_f_exec, rb_f_system): should not exceptions after
+	  fork.  [ruby-core:08262]
 
-	* hash.c (hash_equal): should call rb_eql when argument eql is set.
+Fri Sep 14 00:34:25 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Thu Sep 20 17:28:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (popen_exec), process.c (rb_spawn): stop other threads before
-	  exec.  [ruby-core:08262]
-
-Tue Sep 18 22:08:42 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/matrix.rb: fix a coerce bug of Vector. [ruby-core: 12190]
-
-Mon Sep 17 21:06:03 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTP::GenericRequest#initialize): check path is
-	  not nil. [ruby-dev:31149]
-
-Mon Sep 17 21:00:51 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (ripper): rename event: arglist_* -> args_*.
-
-	* parse.y (ripper): rename event: restparam -> rest_param.
-
-	* parse.y (ripper): rename event: constpath_* -> const_path_*.
-
-	* parse.y (ripper): rename event: topconst_* -> top_const_*.
-
-	* parse.y (ripper): rename event: iter_block -> method_add_block.
-
-	* parse.y (ripper): support block local parameter declaration.
-
-	* parse.y (ripper): introduce new macro params_new.
-
-	* ext/ripper/lib/ripper/sexp.rb: should not dispose event
-	  arguments whose name ends with "_new" but arity != 0.
-
-Sat Sep 15 23:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct parser_params): common members in the parser and
-	  ripper must be placed at each same location.
-
-Sat Sep 15 18:25:15 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
-
-Sat Sep 15 17:32:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_initialize): set default encoding.  [ruby-dev:31787]
-
-	* ruby.c (load_file): make new parse instance after processing shebang
-	  line options.
-
-Sat Sep 15 17:04:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_associate_index, rb_enc_get_index): check if
-	  object is encoding capable.  [ruby-dev:31780]
-
-	* string.c (rb_str_subpat_set): check for if the argument is a String.
-
-Sat Sep 15 13:31:21 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss.rb, lib/rss/, test/rss/:
-	  - 0.1.9 -> 0.2.0.
-	  - supported Slash module.
-
-Fri Sep 14 22:20:01 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
-	  event handlers.
-
-Fri Sep 14 17:28:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_io.rb: tests which cause SEGV should not be
-	  added.
-
-	* bootstraptest/test_knownbug.rb: add above test to known bug.
-
-Fri Sep 14 16:24:04 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_expandarray): assignment should be placed
-	  after creating new array.
-
-Fri Sep 14 16:17:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: add a stress test (-s).
-
-Fri Sep 14 16:14:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h, eval_intern.h: move some macros to eval_intern.h.
-
-	* eval_jump.ci (rb_f_throw): fix to use NEW_THROW_OBJECT().
-
-	* eval.c (rb_f_loop): remove additional macro.
-
-Fri Sep 14 16:12:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_expandarray): should be volatile value for GC.
-
-Thu Sep 13 15:42:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): inline cache entries are overwritten
-	  in iseq_build_body().
-
-Thu Sep 13 14:00:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (brace_block): should use compstmt.  patch submitted by
-	  Kirill A. Shutemov <k.shutemov AT gmail.com>  [ruby-core:12154].
-
-Thu Sep 13 13:47:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_id2str): fixed typo.
+	* lib/drb/extservm.rb (invoke_service): use Thread.exclusive instead of
+	  Thread.critical
 
 Wed Sep 12 23:12:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.c (proc_options): -W should be allowed in RUBYOPT
 	  environment variable.  [ruby-core:12118]
 
-Wed Sep 12 15:19:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_s_sysopen): should not use alloca for unknown size
-	  input.  [ruby-dev:31775]
-
-	* parse.y (rb_id2str): ditto.
-
-	* marshal.c (w_float): use snprintf instead of sprintf.
-
-Tue Sep 11 17:28:00 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
-	  suffix for a temporary file name.
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
-	  names less predictable by including a random string.
-	  [inspired by: akr]
-
-Tue Sep 11 17:25:59 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb: Add shellescape() and shelljoin().
-
-	* lib/shellwords.rb: Rename shellwords() to shellsplit() and make
-	  the former an alias to the latter.
-
-	* lib/shellwords.rb: Add escape(), split(), join() as class
-	  methods, which are aliases to their respective long names
-	  prefixed with `shell'.
-
-	* lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
-	  and Array#shelljoin() for convenience.
-
-Mon Sep 10 15:48:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* range.c: represent initialized state using EXCL instead of FL_USER3.
-
-	* range.c (range_dumper): make uninitialized range dumpable.
-	  (range_loader): make uninitialized range loadable.
-
-Mon Sep 10 13:44:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_cycle): avoid infinite loop for empty array.
-	  based on a patch from David Flanagan.  [ruby-core:12085]
-
-Mon Sep 10 01:21:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object0): struct allocation first to check if a
-	  class is a struct.  compatibility check should come next.
-
 Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
 
-Sun Sep  9 08:57:27 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (_strptime): now also attaches an element
 	  which denotes leftover substring if exists.
 
-Sun Sep  9 01:59:08 2007  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c (r_object0): check T_STRUCT type for structs.
-
-Sun Sep  9 01:17:05 2007  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c (r_object0): don't call user-defined initialize for
-	  T_STRUCT objects.
-
-	* include/ruby/intern.h (rb_struct_initialize): declared.
-
-	* struct.c (rb_struct_initialize): export.
-
-Sat Sep  8 23:55:56 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval_method.ci (rb_get_alloc_func): new function to get allocation
-	  function.
-
-	* include/ruby/intern.h (rb_alloc_func_t): declared.
-	  (rb_define_alloc_func): declared.
-	  (rb_marshal_define_compat): declared.
-
-	* range.c: use T_STRUCT for Range.
-
-	* inits.c: move Init_marshal() prior to Init_Range() because
-	  Init_Range calls rb_marshal_define_compat which needs
-	  marshal's compat_allocator_tbl initialized.
-
-	* marshal.c: support marshal format compatibility layer designed for
-	  marshaling T_STRUCT Range using T_OBJECT format.
-	  (rb_marshal_define_compat): defined.
-
-	[ruby-dev:31710]
-
-Sat Sep  8 10:05:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_members): check if __members__ is an
-	  array to prevent segmentation fault.  [ruby-dev:31759]
-
-Sat Sep  8 09:33:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): now check specifications more
-	  strictly.
-
-Sat Sep  8 02:56:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw
-	  now raise ArgumentError exception.
-
-Sat Sep  8 02:45:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (rb_struct_s_members): should raise TypeError instead
 	  of call rb_bug().  [ruby-dev:31709]
 
 	* marshal.c (r_object0): no nil check require any more.
 
-Sat Sep  8 01:46:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* regenc.c, regenc.h (onigenc_single_byte_mbc_enc_len): should take
-	  two arguments. [ruby-dev:31754]
-
-Fri Sep  7 00:58:16 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: fix typo.
-
-Fri Sep  7 00:28:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_getc): forgot to commit rb_enc_mbclen() fix.
-
-	* ext/stringio/stringio.c (strio_getc): rb_enc_mbclen() fix.
-
-	* ext/stringio/stringio.c (strio_ungetc): ditto.
+Sat Sep  8 09:38:19 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Thu Sep  6 22:57:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::Entry_::copy): prevent self copy of
-	  directories.
-
-	* lib/fileutils.rb (FileUtils::fu_each_src_dest0): use try_convert.
-
-	* lib/fileutils.rb (FileUtils::fu_update_option): ditto.
-
-Thu Sep  6 21:36:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/oniguruma.h (OnigEncodingTypeST): add end parameter
-	  to mbc_enc_len.
-
-	* euc_jp.c (mbc_enc_len), sjis.c (mbc_enc_len),
-	  utf8.c (utf8_mbc_enc_len): ditto.
-
-	* encoding.c (rb_enc_mbclen): add end parameter.
-
-Thu Sep  6 21:31:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_cycle): typo in rdoc.  a patch from Yugui
-	  <yugui@yugui.sakura.ne.jp>.  [ruby-dev:31748]
+	* lib/date/format.rb (str[fp]time): now check specifications more
+	  strictly.
 
-Thu Sep  6 12:42:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  7 05:36:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* string.c (rb_str_succ, rb_str_chop_bang, rb_str_chop): m17n support.
-	  [ruby-dev:31734]
+	* test/rinda/test_rinda.rb (MockClock): correct synchronous problems
+	  of the MultiThreading. [ruby-dev:31692]
 
 Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -16418,983 +3474,93 @@ Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_splice): integer overflow for length.
 	  [ruby-dev:31739]
 
-Tue Sep  4 20:43:44 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_EVENT#unadvise.
-
-	* test/win32ole/test_win32ole_event.rb: ditto.
-
-Mon Sep  3 15:37:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (vm.o): depends on st.h too.
-
-Sun Sep  2 23:38:29 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/st.h (struct st_table): make num_entries bitfield
-	  instead of num_bins for speed.  num_entries has less access.
-
-Sun Sep  2 00:37:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Sep  2 00:48:15 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
 
 	* lib/date/format.rb (_parse): use named character classes in some
 	  regular expressions.
 
-Sat Sep  1 23:44:26 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_jump.ci (rb_f_throw): wrap tag and TAG_THROW in a NODE_MEMO
-	  node to make throw instruction to work well.
-
-Sat Sep  1 20:56:07 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (struct RBignum): embed digits in RBignum for
-	  small bignums.
-
-	* bignum.c: RBignum embedded digits implemented.
-
-	* include/ruby/intern.h: declare rb_big_resize.
-
-	* gc.c: don't free embedded digits.
-
-	* numeric.c: replace direct bignum field accessor by abstract field
-	  accessor such as RBIGNUM(val)->sign to RBIGNUM_SIGN(val).
-
-	* sprintf.c: ditto.
-
-	* compar.c: ditto.
-
-	* marshal.c: ditto.
-
-	* random.c: ditto.
-
-	* .gdbinit: support embedded small bignums.
-
-	[ruby-dev:31689]
-
-Sat Sep  1 19:59:43 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_event_free): IConnectionPoint should be
-	  released.
-
-	* ext/win32ole/win32ole.c (EVENTSINK_Destructor): ITypeInfo should be
-	  released.
-
-	* ext/win32ole/win32ole.c (fev_initialize): refactoring.
-
-Sat Sep  1 16:26:09 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/socket/test_tcp.rb (test_recvfrom): same as mswin32 on mswin64.
-
-Sat Sep  1 14:24:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c (st_numcmp, st_numhash): use st_data_t instead of long, because
-	  the former may be larger than the latter.
-
-	* include/ruby/st.h (CHAR_BIT): get rid of magic number.
-
-	* include/ruby/st.h (rb_index_t): use st_data_t for the platforms it
-	  is larger than int.
-
-Sat Sep  1 10:43:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_jump.ci (rb_f_catch): generate new tag object if no argument is
-	  given.  backported from MatzRuby.  [ruby-dev:31609]
-
-	* eval_jump.ci (rb_catch): call #catch without arguments if tag
-	  string is NULL.
-
-	* eval_jump.ci (rb_f_throw): allow throwing non-symbol object.
-
-	* eval_jump.ci (rb_catch_obj): new function to wait throw with arbitrary
-	  object.
-
-	* eval_jump.ci (rb_throw_obj): new function to throw arbitrary object.
-
-	* variable.c (check_autoload_table): prevent multiple calls from
-	  RSTRING_PTR().
-
-Fri Aug 31 07:12:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (SQRT_LONG_MAX): use SIZEOF_LONG instead of SIZEOF_VALUE
-	  because SIZEOF_VALUE > SIZEOF_LONG on some platforms.
-
-Fri Aug 31 04:18:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_norm_arg, f_arg_item): not croak already erred names.
-	  [ruby-dev:31687]
+Sat Sep  1 08:13:36 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* parse.y (assignable_gen): ignore already erred names.
+	* ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize.
 
-	* parse.y (shadowing_lvar_gen): always make new block local variable
-	  when shadowing outer local variable.  [ruby-dev:31507]
-
-Thu Aug 30 19:40:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* regenc.h: check RUBY_EXTERN before including config.h and defines.h
-
-	* common.mk: update header dependency.
-
-Thu Aug 30 14:06:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_obj_define_method): reverted.  [ruby-talk:266637]
-
-Thu Aug 30 13:49:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: initialize $top_srcdir always.  [ruby-dev:31682]
+Thu Aug 30 13:13:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (try_const, have_const): check for a const is defined.
 	  [ruby-core:04422]
 
-Thu Aug 30 08:00:12 2007  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h: declare rb_hash_tbl.
-
-	* include/ruby/ruby.h (RHash): delay st_table allocation.
-	  rename tbl field to ntbl to detect direct reference to the st_table
-	  as a compile error.
-	  (RHASH_TBL): abstract accessor defined.
-	  (RHASH_ITER_LEV): ditto.
-	  (RHASH_IFNONE): ditto.
-	  (RHASH_SIZE): ditto.
-	  (RHASH_EMPTY_P): ditto.
-	  (hash_alloc0, hash_alloc): unified because hash_alloc doesn't
-	  allocate st_table now.
-
-	* hash.c: delay st_table allocation.
-
-	* gc.c: replace tbl by ntbl.
-
-	* array.c: replace direct field accessor by abstract field accessor
-	  such as RHASH(hash)->tbl to RHASH_TBL(hash).
-
-	* marshal.c: ditto.
-
-	* insns.def: ditto.
-
-	* ext/iconv/iconv.c: ditto.
-
-	* ext/json/ext/generator/generator.c: ditto.
-
-	* ext/json/ext/parser/parser.c: ditto.
-
-	* ext/json/ext/parser/parser.rl: ditto.
-
-	* ext/syck/rubyext.c: ditto.
-
-	* ext/tk/tkutil/tkutil.c: ditto.
-
-	[ruby-dev:31678]
-
-Wed Aug 29 18:36:06 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: add :ftp_active_mode option.  [ruby-dev:31677]
-
-Wed Aug 29 14:55:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): should not use mbclen2() which has broken API.
-
-	* re.c: remove rb_reg_mbclen2().
+Thu Aug 30 13:10:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 29 12:48:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (aref_args): args may not be a list.  [ruby-dev:31592]
+	* configure.in (group_member): check if presents.
 
-Wed Aug 29 11:30:10 2007  Tanaka Akira  <akr@fsij.org>
+	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
 
-	* include/ruby/st.h (struct st_table): add entries_packed 1-bit
-	  bitfield.  decrease num_bins 1-bit.
+	* file.c (group_member): use system routine if available.
 
-	* st.c: pack numhash which have 5 or less entries in bins.
-	  (st_init_table_with_size): setup entries_packed flag.
-	  (st_clear): support packed mode.
-	  (st_lookup): ditto.
-	  (st_insert): ditto.
-	  (st_add_direct): ditto.
-	  (st_copy): ditto.
-	  (st_delete): ditto.
-	  (st_foreach): ditto.
-	  (st_reverse_foreach): ditto.
-	  (unpack_entries): new function for converting to unpacked mode.
+Thu Aug 30 08:24:18 2007  Tanaka Akira  <akr@fsij.org>
 
-	[ruby-list:43954]
+	* ruby.h (RHASH_TBL): defined for compatibility to 1.9.
+	* (RHASH_ITER_LEV): ditto.
+	* (RHASH_IFNONE): ditto.
+	* (RHASH_SIZE): ditto.
+	* (RHASH_EMPTY_P): ditto.
 
-Wed Aug 29 10:46:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Aug 29 13:05:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
 	  even on Linux/Sparc.  [ruby-dev:31674]
 
-Tue Aug 28 19:16:00 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_type_progid): progid getted by
-	  ProgIDFromCLSID should be freed by CoTaskMemFree. Thanks, arton.
-
-	* test/win32ole/test_win32ole.rb (test_raise_message): set negative
-	  compareMode value to raise WIN32OLERuntimeError.
-
-	* test/win32ole/test_win32ole_type.rb (test_implemented_ole_types):
-	  support some environment which returns IShellDispatch5 instead
-	  of IShellDispatch.
-
-Tue Aug 28 15:42:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_subseq): retrieve substring based on byte offset.
-
-	* string.c (rb_str_rindex_m): was confusing character offset and
-	  byte offset.
-
-Tue Aug 28 14:23:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_splice_0): should check to modify.  [ruby-dev:31665]
-
-Tue Aug 28 14:21:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_prepare): set parser encode too when BOM exists.
-
-Tue Aug 28 00:51:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c: fix Mutex to be interruptable lock.
-
-	* thread_win32.ci, thread_win32.h, thread_pthread.ci, thread_pthread.h:
-	  prepare native_cond_*() which are based on pthread_cond_*() spec.
-
-	* prelude.rb: fix Mutex#synchronize method.
-
-	* vm_core.h, include/ruby/intern.h: change unblock function interface
-	  (to pass some user data).
-
-	* file.c, process.c: ditto.
-
-	* benchmark/bm_vm2_mutex.rb: add a benchmark for mutex.
-
-	* benchmark/bm_vm3_thread_mutex.rb: add a benchmark for mutex
-	  with contention.
-
-	* benchmark/run.rb: fix to remove ENV['RUBYLIB'] for matzruby.
-
-	* test/ruby/test_thread.rb: add a test.
-
-	* common.mk: fix benchmark options.
-
-Mon Aug 27 23:14:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug 28 23:26:12 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* string.c (rb_str_rstrip_bang): wrong strip point.  [ruby-dev:31652]
-
-	* string.c (rb_str_each_line): should swallow sequence of newlines
-	  if rs (optional argument) is an empty string.  [ruby-dev:31652]
-
-Mon Aug 27 22:39:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c (rb_enc_codelen): raises invalid sequence exception
-	  if ONIGENC_CODE_TO_MBCLEN() returns zero.  [ruby-dev:31661]
-
-	* encoding.c (rb_enc_mbclen): check invalid sequence.
-
-Mon Aug 27 20:27:59 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
+	* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
+	  reg_get_val, ole_wc2mb): fix the bug. Thanks, arton.
 	  [ruby-dev:31576]
 
-	* test/win32ole/test_win32ole_type.rb (test_initialize):
-	  remove duplicate assertions.
-
 Mon Aug 27 19:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/etc/etc.c (etc_getlogin): update documentation to note
 	  security issue.  [ruby-Bugs-11821]
 
-Mon Aug 27 15:56:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_encoding): return the encoding of a Symbol.
-
-Mon Aug 27 15:33:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (IEEE_BIG_ENDIAN): use configured value.  [ruby-dev:31623]
-
-	* util.c (Llong): set to LONG_LONG if available.
-
-Mon Aug 27 13:11:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (tr_trans): wrong condition for mbmaxlen==1 strings.
-	  [ruby-dev:31652]
-
-Mon Aug 27 00:41:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_each_byte): caused infinite loop.  [ruby-dev:31652]
-
-	* io.c (rb_io_getc): should return nil at EOF, not EOFError.
-
-	* lib/delegate.rb (SimpleDelegator::__setobj__): use raise
-	  argument to specify backtrace.
-
-	* test/ruby/test_fnmatch.rb (TestFnmatch::bracket_test):
-	  String#include? no longer works for Fixnum.  use #chr.
-	  [ruby-dev:31652]
-
-Sun Aug 26 12:27:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: fix to remove Fiber.new until fiber.so is not loaded.
-
-	* test/ruby/test_continuation.rb: fix to use resume.
-
-Sun Aug 26 06:51:46 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_wc2mb, reg_enum_key): allocate
-	  buffer should be NULL terminated.
-
-Sun Aug 26 06:04:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_setup_method): reorder code for branch prediction.
-
-Sun Aug 26 05:54:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_call_method): fix to relaxant safe level check
-	  ($SAFE > 2).  [ruby-core:11998]
-
-	* bootstraptest/test_method.rb: add tests for above.
-
-Sun Aug 26 05:52:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_fiber.rb: fix to require 'continuation'.
-
-Sat Aug 25 23:52:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_next): message changed.
-
-Sat Aug 25 23:22:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/encoding.h: remove unused rb_enc_ismbchar().
-
-Sat Aug 25 22:50:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_event_free, EVENTSINK_Destructor,
-	  fev_initialize): remove the connection ole_event_free and
-	  EVENTSINK_Destructor.
-
-Sat Aug 25 17:52:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c, include/ruby/intern.h: export rb_str_length().
-
-	* insns.def: use rb_str_length() in opt_length.
-
-Sat Aug 25 17:48:51 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: rename FIBER_STACK_SIZE to FIBER_VM_STACK_SIZE.
-
-Sat Aug 25 17:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (swallow): removed condition using an unset variable.
-
-	* parse.y, re.c: re-applied revision 13092.
-
-	* string.c (rb_str_splice): return from void function.
-
-	* include/ruby/encoding.h (rb_enc_str_new): prototype added.
-
-Sat Aug 25 11:45:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* encoding.c: provide basic features for M17N.
-
-	* parse.y: encoding aware parsing.
-
-	* parse.y (pragma_encoding): encoding specification pragma.
-
-	* parse.y (rb_intern3): encoding specified symbols.
-
-	* string.c (rb_str_length): length based on characters.
-	  for older behavior, bytesize method added.
-
-	* string.c (rb_str_index_m): index based on characters.  rindex as
-	  well.
-
-	* string.c (succ_char): encoding aware succeeding string.
-
-	* string.c (rb_str_reverse): reverse based on characters.
-
-	* string.c (rb_str_inspect): encoding aware string description.
-
-	* string.c (rb_str_upcase_bang): encoding aware case conversion.
-	  downcase, capitalize, swapcase as well.
-
-	* string.c (rb_str_tr_bang): tr based on characters.  delete,
-	  squeeze, tr_s, count as well.
-
-	* string.c (rb_str_split_m): split based on characters.
-
-	* string.c (rb_str_each_line): encoding aware each_line.
-
-	* string.c (rb_str_each_char): added.  iteration based on
-	  characters.
-
-	* string.c (rb_str_strip_bang): encoding aware whitespace
-	  stripping.  lstrip, rstrip as well.
-
-	* string.c (rb_str_justify): encoding aware justifying (ljust,
-	  rjust, center).
-
-	* string.c (str_encoding): get encoding attribute from a string.
-
-	* re.c (rb_reg_initialize): encoding aware regular expression
-
-	* sprintf.c (rb_str_format): formatting (i.e. length count) based
-	  on characters.
-
-	* io.c (rb_io_getc): getc to return one-character string.
-	  for older behavior, getbyte method added.
-
-	* ext/stringio/stringio.c (strio_getc): ditto.
-
-	* io.c (rb_io_ungetc): allow pushing arbitrary string at the
-	  current reading point.
-
-	* ext/stringio/stringio.c (strio_ungetc): ditto.
-
-	* ext/strscan/strscan.c: encoding support.
-
-Sat Aug 25 10:59:19 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: separate Continuation and Fiber from core.
-
-	* ext/continuation/*, ext/fiber/*: ditto.
-
-	* include/ruby/ruby.h: remove rb_cFiber.
-
-	* include/ruby/intern.h: add the rb_fiber_new() declaration.
-
-	* enumerator.c (next_init): fix to use rb_fiber_new().
-
-	* test/ruby/test_enumerator.rb: remove next? tests.
-
-	* test/ruby/test_continuation.rb: add a require 'continuation'.
-
-	* test/ruby/test_fiber.rb: add a require 'fiber'.
-
-Sat Aug 25 10:20:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (prelude.o): depends on vm_core.h now.
-
-	* common.mk (prelude.c): depends on tool/compile_prelude.rb too.
-
-	* common.mk (prereq): updates all auto-generated sources.
-
-	* tool/compile_prelude.rb: separated dynamic and static portions.
-
-Sat Aug 25 10:05:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* prelude.rb: add Thread.exclusive.  This class method
-	  is different from 1.8's.  Thread.exclusive only does
-	  synchronize with VM global mutex.
-
-Sat Aug 25 09:39:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_s_try_convert): more document description.
-
-	* re.c (rb_reg_s_try_convert): typo fixed.
-
-Sat Aug 25 08:54:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* id.h, id.c: remove idFuncall.
-
-	* compile.c (iseq_specialized_instruction): ditto.
-
-Sat Aug 25 08:47:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/compile_prelude.rb: fix to include "vm_core.h".
-
-Sat Aug 25 03:49:14 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/sentence.rb (Sentence): include Enumerable.
-	  (Sentence#each): defined.
-
-	* test/ruby/test_assignment.rb: use Sentence#expand.
-
-Sat Aug 25 03:08:57 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* prelude.rb: fix Mutex#synchronize definition.
-
-Sat Aug 25 02:08:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_s_try_convert): a new class method to convert
-	  object or nil if it's not target-type.  this mechanism is used
-	  to convert types in the C implemented methods.
-
-	* hash.c (rb_hash_s_try_convert): ditto.
-
-	* io.c (rb_io_s_try_convert): ditto.
-
-	* re.c (rb_reg_s_try_convert): ditto.
-
-	* string.c (rb_str_s_try_convert): ditto.
-
-Sat Aug 25 00:49:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_loop_generator.rb: added.
-
-Sat Aug 25 00:22:31 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* prelude.rb: added.  run this script on startup.
-
-	* tool/compile_prelude.rb: compile prelude.rb to C string.
-	  (prelude.rb -> prelude.c)
-
-	* common.mk: fix to build with prelude.c.
-
-	* inits.c (rb_call_inits): ditto.
-
-	* thread.c (Init_Thread): move definition of Mutex#synchronize
-	  to prelude.rb.
-
-Sat Aug 25 00:08:43 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (compile_massign_opt): fix to skip massign optimization
-	  with global variables.
-
-	* bootstraptest/test_massign.rb: add some tests for above.
-
-Fri Aug 24 18:42:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_dir.rb (TestDir::setup): ?c now makes a string.
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
-	  initialize @workdir to stop warning.
-
-Fri Aug 24 18:30:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform_without_block):
-	  replace funcall by send!.  other files in the distribution as well.
-
-Fri Aug 24 17:06:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_send_bang): abandon the name funcall for private
-	  aware method call.
-
-Fri Aug 24 15:27:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_next): stop pre-fetching.
-
-	* enumerator.c (Init_Enumerator): remove next? method.
-
-Fri Aug 24 15:14:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_loop): now handles StopIteration exception.
-
-Thu Aug 23 20:31:31 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: optimize simple massign.
-
-Thu Aug 23 20:02:25 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (reg_get_value): use RegQueryValueEx instead
-	  of RegQueryValueEx.
-
-	* ext/win32ole/win32ole.c (typelib_file_from_clsid): fix the bug
-	  that the function always returns Qnil.
-
-	* test/win32ole/test_win32ole_type.rb (test_initialize): add some test.
-
-Thu Aug 23 17:25:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (group_member): check if presents.
-
-	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
-
-	* file.c (group_member): use system routine if available.
-
-	* process.c: moved _GNU_SOURCE macro to Makefile.
-
-Thu Aug 23 16:59:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_massign), insnhelper.ci (vm_throw): not use C99
-	  comment.
-
-	* cont.c (rb_cont_call, fiber_switch, rb_fiber_resume, rb_fiber_yield):
-	  suppress warnings.
-
-	* cont.c (rb_fiber_start): change on non-volatile variable between
-	  setjmp and longjmp may not has an effect.
-
-	* enumerator.c (sym_call): initialize first.
-
-	* enumerator.c (enum_iter): typedefed.
-
-	* enumerator.c (next_i): suppress a warning.
-
-Thu Aug 23 16:04:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def, parse.y: fix massign order.  This change
-	  causes performance problem.  Try vm1_swap benchmark.
-	  [ruby-dev:31522]
-
-	* insns.def, insnhelper.ci: move process body of expandarray insn to
-	  vm_expandarray().
-
-	* bootstraptest/test_knownbug.rb, bootstraptest/test_massign.rb:
-	  move a solved test.
-
-Thu Aug 23 15:51:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_norm_arg): ripper has no shadowing check.
-
-	* parse.y (f_block_arg): dispatch blkarg_mark.
-
-Thu Aug 23 15:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.
-
-	* compile.c (iseq_translate_threaded_code),
-	  vm_evalbody.ci (get_insns_address_table),
-	  template/vmtc.inc.tmpl (insns_address_table): constified.
-
-	* vm_evalbody.ci (vm_eval),
-	  template/insns_info.inc.tmpl (insn_stack_increase, insn_ret_num):
-	  suppress warnings.
-
-Thu Aug 23 13:19:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_norm_arg): check also nested arguments.  [ruby-dev:31502]
-
-Thu Aug 23 00:06:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c: updated for ANSI C only.  applied a patch from
-	  <snakagawa AT infoteria.co.jp>.  [ruby-dev:31591]
-
-Thu Aug 23 00:04:45 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/strtod.c: removed.  [ruby-dev:31588]
-
-	* LEGAL: updated.
-
-Wed Aug 22 15:59:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knownbug.rb:
-	  fix typo of filename (test_knwonbug.rb).
-
-Wed Aug 22 14:04:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_knwonbug.rb: added.  This file will contain
-	  test cases which point out known bug.  If bug is fixed, tests
-	  should move to the suitable place.
-
-	* bootstraptest/test_massign.rb: move a test which show known bug
-	  to test_knownbug.rb.
-
-Wed Aug 22 13:02:26 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (in_temporary_working_directory):
-	  don't remove the directory specified by --dir.
-
-Wed Aug 22 05:51:23 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): replaced by the implementation by David
-	  M. Gay inspired by William D. Clinger's paper "How to Read Floating
-	  Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
-	  a patch from Satoshi Nakagawa <snakagawa AT infoteria.co.jp>.
-	  [ruby-dev:31582]
-
-	* test/ruby/test_float.rb (TestFloat::test_float): add test for
-	  precision.
-
-Wed Aug 22 03:51:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: add Fiber#resume and Fiber.yield.
-	  and Fiber::Core class to realize Coroutine.
-
-	* include/ruby/intern.h: declare rb_fiber_yield(), rb_fiber_resume().
-
-	* enumerator.c: use above api.
-
-	* test/ruby/test_fiber.rb: fix and add tests for above changes.
-
 Tue Aug 21 21:09:48 2007  Tanaka Akira  <akr@fsij.org>
 
 	* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
-	  suggested by knu.  [ruby-dev:31568]
-
-Tue Aug 21 15:00:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* st.c (st_clear): reset num_entries too.
 
 Tue Aug 21 13:57:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* hash.c (st_foreach_func, rb_foreach_func): typedefed.
 
-	* hash.c (rb_hash_clear): use st_clear() unless iterating.
-
-	* st.c (struct st_table_entry): add new members, fore and back, to
-	  iterate in inserted order.
-
-	* include/ruby/st.h (struct st_table): ditto.
-
-Tue Aug 21 04:09:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm2_case.rb: add a new benchmark.
-	  YARV optimize case/when syntax.  If every conditions
-	  are literal (such as Symbol, Fixnum, String), dispatch
-	  calc order will be O(1).
-
-Tue Aug 21 04:08:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_enumerator.rb: fix last commit.
-
-Tue Aug 21 03:59:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test_enumerator.rb (enum_test): fix to return sorted
-	  array (for Hash test).
-
-Tue Aug 21 03:55:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* enumerator.c (next_i): fix to return with Fiber#yield at
-	  the end of each block.  [ruby-dev:31470]
-
-	* enumerator.c (enumerator_next_p): call init_next if not
-	  initialized.  [ruby-dev:31514]
-
-	* test/ruby/test_enumerator.rb: add tests for Enumerator.
-
-Mon Aug 20 23:28:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (Init_String): remove Symbol.intern and Symbol#dump.
-	  [ruby-dev:31525]
-
-	* dir.c (dir_foreach): return Enumerator if no block given.
-	  [ruby-dev:31525]
-
-	* io.c (rb_io_s_foreach): argument count check before making
-	  Enumerator.  [ruby-dev:31525]
-
-Mon Aug 20 23:17:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (struct rb_thread_struct): removed first_func_arg and
-	  reuse first_args instead.
-
-Sun Aug 19 13:31:40 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c: use VALGRIND_MAKE_MEM_UNDEFINED to detect use of collected
-	  objects if valgrind is available.  It cannot detect first 2 words
-	  because they are used as the free list.
-
-Sun Aug 19 13:13:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each/NODE_RESBODY): fix to add
-	  additional nop to prevent tailcall optimization.
-
-	* vm_opts.h: clean up comments.
-
-Sun Aug 19 12:58:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_call_bmethod): fix to propagate information
-	  that this proc is "from Method".  [ruby-dev:31490]
-
-	* proc.c (method_proc, rb_mod_define_method): ditto.
+Mon Aug 20 17:25:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* vm.c (vm_invoke_proc_core): removed.
+	* eval.c (mnew): should preserve noex as safe_level.
 
-	* vm_core.h: ditto.
+	* eval.c (rb_call0): tighten security check condition..
 
-Sun Aug 19 12:36:11 2007  Tanaka Akira  <akr@fsij.org>
+Sat Aug 18 21:32:20 2007  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/sentence.rb: new method Sentence().
-
-Sun Aug 19 12:32:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_callee_setup_arg): fix to mark enough VM stack.
-	  [ruby-dev:31492]
-
-Sat Aug 18 19:02:34 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_yield.rb (TestYieldGen): relax array size check
-	  in nested parameters.
-	  [ruby-dev:31485]
+	* lib/tmpdir.rb (Dir.mktmpdir): new method.
+	  [ruby-dev:31462]
 
 Sat Aug 18 17:44:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
 
-Sat Aug 18 17:40:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (is_ruby_native_thread): check properly.  [ruby-dev:31166]
-
-Sat Aug 18 16:44:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_call_bmethod),
-	  vm.c (vm_invoke_proc_core): fix to do not restore
-	  $SAFE when proc invoked by bmethod.
-
-	* vm_core.h: ditto.
-
-Sat Aug 18 16:44:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_error.ci (ruby_error_print): call error_print.
-
-	* eval_jump.ci, process.c (rb_exit, rb_f_exit, rb_f_abort): moved.
-
 Sat Aug 18 15:59:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* 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]
 
-Sat Aug 18 15:52:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insnhelper.ci (vm_send_optimize): use MEMMOVE to shift values inside
-	  an array.
-
-Sat Aug 18 15:45:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insnhelper.ci (vm_yield_setup_args): rsize and psize should not be
-	  negative.
-
-Sat Aug 18 14:35:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insnhelper.ci (vm_callee_setup_arg, vm_send_optimize,
-	  vm_yield_setup_args): bulk copy for arguments.
-
-Sat Aug 18 13:55:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix to allow self.x=
-	  if x= is private.
-
-	* bootstraptest/test_method.rb: add a test for above.
-
-Sat Aug 18 14:05:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_compile_gen): obtain error info from errinfo.
-
-	* re.c (rb_reg_error_desc): make RegexpError for initialization error.
-
-	* re.c (rb_reg_compile): return nil and set errinfo if error.
-
-Sat Aug 18 13:23:01 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c: $! should not be writable.
-
-	* eval.c (rb_rubylevel_errinfo): added.  rb_errinfo() returns
-	  rb_thread_t#errinfo.  rb_rubylevel_errinfo() returns $! value.
-
-Sat Aug 18 13:14:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_callee_setup_arg): fix to check arguments
-	  correctly. [ruby-dev:31472]
-
-Sat Aug 18 13:13:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_exception.rb: add escape character ("\") for
-	  editors.
-
-Sat Aug 18 12:42:50 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_yield.rb (TestYieldGen): add test for yielding to
-	  lambda using lambda parameter passing emulator.
-
 Sat Aug 18 12:24:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
 	  comment lines first.
 
-Sat Aug 18 11:44:59 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_set_arguments), insnhelper.ci
-	  (vm_callee_setup_arg, vm_yield_setup_args):
-	  fix to cause raise on "lambda{|a|}.call(1, 2)".
-	  [ruby-dev:31464]
-
-	* bootstraptest/test_block.rb: add tests for above.
-
-Sat Aug 18 01:12:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (frame_func_id): return proper method ID.
-
-Fri Aug 17 22:43:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): massign should return rvalue(s).
-
-Fri Aug 17 22:10:19 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_basicinstructions.rb: fix old tests.
-	  class variables should be inherited.
-
-Fri Aug 17 21:20:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_call), eval_method.ci (rb_add_method, rb_alias),
-	  insnhelper.ci (vm_call_method): fix to save safelevel for
-	  method node.
-
-	* include/ruby/node.h: ditto.
-
-	* bootstraptest/test_method.rb: add a test for above.
-
-Fri Aug 17 16:02:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_terminate_all): fix to ignore
-	  exceptions.
-
-	* thread.c (thread_start_func_2): fix
-	  abort_on_exception process.  [ruby-dev:31394]
-
-Fri Aug 17 14:38:36 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (in_temporary_working_directory): use
-	  Dir.mktmpdir to create and remove temporary directory.
-	  (Dir.mktmpdir): define if not available.
-	  [ruby-dev:31431]
-
-Fri Aug 17 03:07:37 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix throw insn option of next.
-
-Fri Aug 17 01:25:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_set_arguments), insnhelper.ci
-	  (vm_callee_setup_arg, vm_yield_setup_args): fix
-	  block parameter problems. [ruby-dev:31437], [ruby-dev:31440]
-
-	* bootstraptest/test_block.rb: add a test of [ruby-dev:31440].
-
-Fri Aug 17 01:24:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (ruby_iseq_disasm): fix to show arg_simple value.
-
-Fri Aug 17 01:21:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (throw): insert a RUBY_VM_CHECK_INTS(). [ruby-dev:31361]
-
 Thu Aug 16 20:40:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero.  out of bound
 	  access.  [ruby-dev:31404]
 
-	* sprintf.c (rb_str_format): small float should not call
-	  rb_dbl2big().
-
-Thu Aug 16 22:10:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix next/redo stack consistency.
-	  [ruby-dev:31373]
-
-	* bootstraptest/test_syntax.rb: add tests for above.
-
-	* sample/test.rb: fix to use __FILE__ instead of $0 to know basedir.
-
-Thu Aug 16 21:14:06 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (BASERUBY): need AC_SUBST.  [ruby-dev:31438]
-
-Thu Aug 16 19:18:26 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/sentence.rb: Sentence class implemented
-	  based on sentgen.rb
-
-	* test/ruby/sentgen.rb: removed.
-
-	* test/ruby/test_assignment.rb: use sentence.rb.
-
-	* test/ruby/test_yield.rb: block parameter passing emulator
-	  implemented.
-
-Thu Aug 16 16:48:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (BASERUBY): check if base ruby is runnable first.
-	  [ruby-core:11900]
-
 Thu Aug 16 16:46:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): enable shared by default.
@@ -17412,49 +3578,10 @@ Thu Aug 16 13:06:08 2007  Tanaka Akira  <akr@fsij.org>
 	  (big_rshift): ditto.
 	  [ruby-dev:31434]
 
-Thu Aug 16 06:29:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_readpartial): argf_forward needs argc and argv.
-
-Thu Aug 16 02:47:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_fiber_m_yield): added.  use this function
-	  for Fiber#yield instead of rb_fiber_yield.
-
-Thu Aug 16 00:36:52 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb (Dir.mktmpdir): new method.  [ruby-dev:31416]
-
-Wed Aug 15 18:57:30 2007  Koichi Sasada  <ko1@atdot.net>
+Thu Aug 16 04:09:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* gc.c (os_live_obj): fix to skip T_VALUES.
-
-	* sample/test.rb: add an ObjectSpace test.
-
-Wed Aug 15 16:49:04 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* inits.c (rb_call_inits): change initializing order.
-	  [ruby-dev:31420]
-
-Wed Aug 15 16:44:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (ARGF_FORWARD): wrongly compares with current_file with
-	  rb_stdout.  should be rb_stdin.  [ruby-cvs:20177]
-
-Wed Aug 15 14:59:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_initialize, argf_each_line, argf_each_byte): suppress
-	  warnings.
-
-Wed Aug 15 14:22:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: remove "//" type comment.
-
-Wed Aug 15 13:42:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: fix rules around f_margs.  "make test" passes all tests.
-
-	* bootstraptest/test_block.rb: add some tests for above.
+	* lib/rinda/tuplespace.rb (Rinda::TupleSpace#start_keeper): improve
+	  keeper thread.
 
 Wed Aug 15 13:50:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -17465,212 +3592,18 @@ Wed Aug 15 13:50:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
 	  isn't called twice.  [ruby-core:11556]
 
-Wed Aug 15 13:39:25 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* process.c (proc_geteuid): fix strange conversion.  [ruby-dev:31417]
-
-Wed Aug 15 01:05:55 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_check): don't call newtest.
-	  (assert_equal): call newtest.
-	  (assert_match): ditto.
-
-Tue Aug 14 21:43:39 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (assert_check): new method.
-	  (assert_match): new method.
-	  (assert_equal): use assert_check.
-	  (pretty): give failure description as an argument.
-
-	* bootstraptest/test_exception.rb: use assert_match to describe the
-	  test for [ruby-dev:31407].  [ruby-dev:31412]
-
-Tue Aug 14 19:53:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (Init_Proc), eval.c (Init_eval), eval_intern.h: move
-	  init place of exception_error.
-
-	* inits.c: ditto.
-
-	* eval.c (Init_eval): set exception_error#throwed_state as TAG_FATAL.
-	  [ruby-dev:31407]
-
-	* bootstraptest/test_exception.rb: add a test for above.
-
-Tue Aug 14 19:51:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: change test order (test -> btest).
-
-Tue Aug 14 00:04:27 2007  Kouhei Sutou  <kou@cozmixng.org>
+Sun Arg 12 03:56:30 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/rss/rss.rb: 0.1.8 -> 0.1.9.
+	* lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
+	  the thread is started too early. [ruby-talk:264062]
 
-	* test/rss/test_version.rb: followed the above change.
-
-	* lib/rss/parser.rb: fixed a bug that handles unintended elements.
-	  Thanks to Takuo Yonezawa. [ruby-list:43841]
-
-Mon Aug 13 17:23:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_clear_trace_func, rb_thread_stop_timer_thread):
-	  declarations for forward references.
-
-	* eval.c (rb_longjmp, eval): use local variable.
-
-	* eval.c (rb_longjmp): string object not to be optimized.
-
-Mon Aug 13 13:21:58 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: make ftp passive mode to avoid NAT problem.
-	  [ruby-dev:31377]
-
-Mon Aug 13 09:18:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getc): should returns
-	  one-character string.
-
-	* ext/stringio/stringio.c: remove unnecessary prototypes.
-
-	* ext/stringio/stringio.c (strio_getbyte): new method.
-
-	* ext/stringio/stringio.c (strio_readbyte): new method.
-
-	* ext/stringio/stringio.c (strio_ungetc): should take a string as
-	  an input.
-
-Mon Aug 13 08:19:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_close): always close via method.
-
-	* io.c (Init_IO): remove obsolete Kernel#getc.
-
-Mon Aug 13 05:03:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_raise): check if target thread is
-	  thrown by another thread or not.  [ruby-dev:31371]
-
-	* bootstraptest/test_thread.rb: add a test for above.
-
-Mon Aug 13 04:35:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_peephole_optimize): fix peephole optimization
-	  bug. [ruby-dev:31360]
-
-	* bootstraptest/test_syntax.rb: add a test for above.
-
-Mon Aug 13 04:02:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c (debug_print_pre): fix to show control frame count.
-
-	* insns.def (opt_call_c_function): fix operand type.
-
-	* lib/vm/instruction.rb: ditto.
-
-	* insnhelper.ci (vm_push_frame, vm_pop_frame): fix to show
-	  control stack status on if VMDEBUG == 2.
-
-	* vm.h: add a comment about VMDEBUG.
-
-	* iseq.c (find_prev_line_no): fix to skip bug report if
-	  line is not found.
-
-	* lib/vm/instruction.rb: fix to use build_string() on
-	  source code generators.
-
-Mon Aug 13 03:57:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* template/yasmdata.rb.tmpl: fix type and name.
-
-Sat Aug 11 23:27:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_each_line): should use #each_line, not #each.
-
-	* io.c (argf_each_line): simplified.
-
-	* io.c (argf_getline): should handle non T_FILE object in ARGV.
-
-	* io.c (argf_each_byte): each_byte should yield bytes not
-	  one-character strings.  [ruby-dev:31374]
+	* test/rinda/test_rinda.rb: ditto.
 
-Sat Aug 11 07:24:55 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Aug 11 07:34:10 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: reverted some wrongly erased "o" options
 	  (pointed out by nobu).
 
-Sat Aug 11 00:01:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): not re-raise to main thread if it is
-	  joining the current thread.
-
-Fri Aug 10 23:54:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_create_core): inherit the priority of creating
-	  thread.  submitted at [ruby-core:11873] by David Flanagan <david AT
-	  davidflanagan.com>.  [ruby-core:11876]
-
-Fri Aug 10 05:12:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): let abort_on_exception work.
-	  [ruby-core:11873]
-
-Fri Aug 10 04:47:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (internal_id_gen): internal ID must be bigger than
-	  tLAST_TOKEN.
-
-Thu Aug  9 16:04:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt): check if rhs has value before assignment instead
-	  inside node_assign_gen().  [ruby-dev:31293]
-
-	* parse.y (call_bin_op_gen, call_uni_op_gen): split call_op_gen.
-
-Thu Aug  9 14:01:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_marg_list): renamed from f_marg_head.
-
-	* parse.y (f_margs): allow multiple mandatory arguments after a splat.
-	  [ruby-dev:31153]
-
-Thu Aug  9 02:02:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_cycle): typo fixed.  a patch from Kazuhiro
-	  NISHIYAMA <zn AT mbf.nifty.com>.  [ruby-dev:31362]
-
-Wed Aug  8 19:17:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check
-	  HAVE_RB_IO_STDIO_FILE.
-
-Wed Aug  8 15:52:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_next_p): should check correctly even when
-	  e.next has not been called before.
-
-	* enumerator.c (enumerator_next): raise StopIteration (name taken
-	  from Python) instead of IndexError.
-
-	* enum.c (enum_zip): catch StopIteration exception.
-
-	* enumerator.c (enumerator_with_index): return Enumerator if no
-	  block is given.
-
-	* test/ruby/test_iterator.rb (TestIterator::test_enumerator): add
-	  test for enumerators.
-
-Wed Aug  8 11:48:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): should not use RTEST for non-VALUE.
-
-Wed Aug  8 11:25:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): should preserve sign mark.
-
-Wed Aug  8 11:02:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (btest-miniruby, test-sample): split the test target
-	  so that -k option works.
-
 Tue Aug  7 14:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/pty.c (establishShell): handshaking before close slave
@@ -17682,130 +3615,15 @@ Tue Aug  7 14:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/expect_sample.rb: support for autologin.
 
-Tue Aug  7 13:58:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ruby_special_consts): added RUBY_SPECIAL_SHIFT.
-
-	* .gdbinit: some improvements.
-
-Tue Aug  7 13:28:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (node_name.inc): use $? instead of $< for nmake.
-	  [ruby-dev:31356]
-
 Tue Aug  7 12:45:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
 	  [ruby-Bugs-12859]
 
-Tue Aug  7 12:31:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): fix for win32 platforms.
-
-Tue Aug  7 02:58:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): make Bignum#to_s even faster.  a patch
-	  from Kenta Murata <muraken AT gmail.com>.  [ruby-dev:31354]
-
-Tue Aug  7 01:42:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_zip): zip no longer converts arguments into
-	  arrays, uses enumerators.
-
-Tue Aug  7 01:27:47 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* cont.c (rb_fiber_yield): change argument ordering.  export.
-
-	* cont.c (rb_fiber_current): export
-
-	* include/ruby/intern.h: export several functions from cont.c.
-
-	* enumerator.c (enumerator_next): new method to implement external
-	  iterator (generator) using fiber.
-
-	* enumerator.c (enumerator_next_p): new method to check whether
-	  any element is left in the generator sequence.
-
-	* enumerator.c (enumerator_rewind): a new method to rewind the
-	  generator sequence.
-
-Tue Aug  7 01:15:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_cycle): new method to cycle enumerable forever.
-
-Tue Aug  7 00:05:38 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* irb/ruby-lex.rb: support for '\c'. [ruby-talk:263508]
-
-Mon Aug  6 20:29:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci, insns.def: move some statements to functions.
-
-	* vm.c, vm.h, vm_evalbody.ci: fix include/typedef places.
-
-Mon Aug  6 18:41:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/vm/instruction.rb (make_header_analysys): fix last commit.
-
-Mon Aug  6 18:33:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/vm/instruction.rb (make_header_analysys): add to separate
-	  header addition process.
-
 Mon Aug  6 17:36:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
 
-Mon Aug  6 16:57:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* sample/test.rb: fix to output file name if it contains
-	  invalid syntax.
-
-Mon Aug  6 16:41:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (value_expr_gen): fix to cause "void value expression"
-	  when jump expression such as "next" are shown on value_expr().
-	  [ruby-dev:31119]
-
-	* bootstraptest/test_syntax.rb: fix to above change.
-
-Mon Aug  6 14:36:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: fix a f_marg rule. [ruby-dev:31160]
-
-Mon Aug  6 14:29:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb (assert_equal): add additional
-	  message parameter.
-
-Mon Aug  6 13:34:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (INSNS): not chdir to srcdir.
-
-	* common.mk (node_name.inc): auto-generate node name list.
-
-	* iseq.c (ruby_node_name): ditto.
-
-	* iseq.c (iseq_s_compile_option_get, Init_ISeq): added a new
-	  method VM::InstructionSequence::compile_option.
-
-	* lib/vm/instruction.rb (RubyVM::SourceCodeGenerator): --destdir
-	  option.
-
-	* tool/node_name.rb: to auto-generate node name list.
-
-Sun Aug  5 11:51:39 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss, sample/rss, test/rss:
-	- 0.1.7 -> 0.1.8.
-	- supported <itunes:XXX>.
-	- reverted backward incompatibility API changes introduced 0.1.7.
-
-Sun Aug  5 04:56:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open_v, pipe_open_s): separate array and string
-	  cases.  [ruby-dev:31344]
-
 Fri Aug  3 11:05:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): save all CONFIG values.
@@ -17824,47 +3642,11 @@ Fri Aug  3 07:09:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (find_type): new method.
 
-Fri Aug  3 00:00:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (big2str_table): base cannot be 0 or 1.
-
-Thu Aug  2 23:42:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_compile_gen): set error if failed to compile regexp
-	  literal.  [ruby-dev:31336]
-
-	* re.c (option_to_str, arg_kcode, opt_kcode): options conversion
-	  between int and string.
-
-	* re.c (rb_reg_compile): should not use regexp which could not get
-	  initialized.  [ruby-dev:31333]
-	  return error message to let the parser know it.
-
-	* re.c (rb_reg_compile): append regexp options to error message.
-	  [ruby-dev:31334]
-
-Thu Aug  2 22:05:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big2str0): faster Bignum#to_s using Karatsuba
-	  algorithm.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>
-	  in [ruby-dev:31312], slightly modified by Kenta Murata
-	  <muraken AT gmail.com> in [ruby-dev:31339].
-
 Thu Aug  2 13:46:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): should not check positional number as
 	  width.  [ruby-core:11838]
 
-Wed Aug  1 12:40:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* generic.rb (URI::Generic::merge_path): behave as RFC 3986.
-	  [ruby-talk:252052]
-
-Tue Jul 31 23:38:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (_parse): now interprets slashed numerical
-	  dates as a big endian (except dd/mm/yyyy). [experimental]
-
 Mon Jul 30 11:16:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_aref): check for Bignum index range.
@@ -17875,11 +3657,6 @@ Sat Jul 28 09:35:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/digest/lib/digest.rb (Digest::self.const_missing): avoid
 	  infinite recursive const_missing call.  [ruby-talk:262193]
 
-Thu Jul 26 20:40:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_eqq): call_super() in === does not work well
-	  since Enumerable#=== has different behavior.  [ruby-dev:31296]
-
 Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dln.c (load_1, dln_find_1): constified.
@@ -17896,37 +3673,12 @@ Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (ruby_init_loadpath): not convert built-in paths.
 
-Tue Jul 24 10:37:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_f_p): return nil if no argument.  [ruby-dev:31285]
+Sun Jul 22 16:07:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jul 24 01:05:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* intern.h (is_ruby_native_thread): removed since declared as an int
+	  function in ruby.h already.
 
-	* regint.h (USE_MATCH_RANGE_IS_COMPLETE_RANGE): undef to achieve old
-	  rindex behavior.  [ruby-dev:31265]
-
-Mon Jul 23 18:37:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0.  fixes
-	  some memory violation.  [ruby-dev:31070]
-
-Sun Jul 22 20:09:49 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (Date._parse): now accepts some new
-	  hints. [experimental]
-
-	* lib/parsedate.rb: followed the changes on
-	  lib/date/format.rb. [experimental]
-
-Sun Jul 22 16:06:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (is_ruby_native_thread): made an int function as
-	  well as version 1.8.
-
-	* include/ruby/ruby.h (is_ruby_native_thread): moved prototype
-	  from intern.h as well as version 1.8.
-
-Sun Jul 22 14:33:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 22 14:33:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_rename): deleted code to get rid of a bug of
 	  old Cygwin.
@@ -17934,7 +3686,7 @@ Sun Jul 22 14:33:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* file.c (rb_file_truncate): added prototype of GetLastError()
 	  on cygwin.  [ruby-dev:31239]
 
-	* include/ruby/intern.h (is_ruby_native_thread): prototype.
+	* intern.h (is_ruby_native_thread): prototype.
 
 	* missing/strftime.c (strftime): fix printf format and actual
 	  arguments.
@@ -17943,35 +3695,21 @@ Sun Jul 22 14:33:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/tk/tcltklib.c (ip_finalize): ditto.
 
-	* ext/win32ole/win32ole.c (lcid_installed): ditto.
-
-	* ext/socket/getnameinfo.c: include stdio.h always.
+	* ext/dl/ptr.c (rb_dlptr_inspect): ditto.  [ruby-dev:31268]
 
-Sat Jul 21 21:39:12 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/dl/sym.c (rb_dlsym_inspect): ditto.
 
-	* lib/date.rb, lib/date/format.rb (Date._parse): now can take some
-	  hints (its aim must be mainly determination of endianness of
-	  date). [experimental]
-
-	* lib/date.rb, lib/date/format.rb (Date._parse): now completes
-	  truncated year as default action. [experimental]
+	* ext/socket/getnameinfo.c: include stdio.h always.
 
-	* lib/date.rb, lib/date/format.rb: added ::iso8601, ::rfc3339,
-	  ::xmlschema, ::rfc2822, ::httpdate, ::jisx0301, #xmlschema,
-	  #httpdate. [experimental]
+	* ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
+	  folevariable_ole_type, folevariable_ole_type_detail,
+	  folevariable_value, folemethod_visible): missing return value.
 
 Sat Jul 21 17:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk: inverted rules order.
-
-	* thread_win32.ci (w32_create_thread): bcc does not have
-	  _beginthreadex().
-
 	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
 	  only if extconf.h is created.
 
-	* bcc32/Makefile.sub: headers have moved.
-
 	* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
 	  support.
 
@@ -17988,63 +3726,21 @@ Sat Jul 21 12:06:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
 
-Sat Jul 21 01:45:03 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jul 21 01:53:17 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (Date._parse): completes calendar week based year.
 
 	* lib/date/format.rb (Date._parse): detects year of ordinal date in
 	  extended format.
 
-Fri Jul 20 16:30:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_set_sequence): raise SyntaxError instead of rb_bug
-	  since this function can be called from VM::InstructionSequence.load.
-
-	* compile.c (insn_set_sc_state, iseq_set_sequence_stackcaching): ditto.
-
-Fri Jul 20 16:11:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c, compile.h (DECL_ANCHOR, INIT_ANCHOR): split not to
-	  initialize aggregations with dynamic values.  [ruby-talk:259306]
-
-	* eval.c (rb_protect): not to initialize aggregations with dynamic
-	  values.  [ruby-talk:259306]
-
-	* gc.c (mark_current_machine_context): ditto.
-
-	* thread.c (thgroup_list, call_trace_func): ditto.
-
-	* vm.c (vm_init_redefined_flag): ditto.
-
 Fri Jul 20 15:22:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/openssl/ossl_config.c (ossl_config_set_section): do not
 	  initialize aggregations with dynamic values.  [ruby-talk:259306]
 
-Fri Jul 20 10:39:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, mlhs_node, lhs, arg, var_ref): return dummy
-	  NODE_BEGIN after errors.  [ruby-dev:31100], [ruby-dev:31118]
-
-	* parse.y (remove_begin): keep empty NODE_BEGIN, instead of null.
-	  [ruby-dev:31252], [ruby-dev:31263]
-
-Fri Jul 20 09:50:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/runner.rb (get_result_string): check $?.coredump?
-	  first.
-
-	* bootstraptest/runner.rb (cleanup_coredump, check_coredump): see
-	  stackdump file too.
-
-Thu Jul 19 20:39:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (value_expr_gen): warn for empty expression ().
-	  [ruby-dev:31252]
-
 Thu Jul 19 19:24:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval_error.ci (get_backtrace): check the result more.
+	* eval.c (get_backtrace): check the result more.
 	  [ruby-dev:31261] [ruby-bugs-12398]
 
 Thu Jul 19 14:38:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -18059,40 +3755,29 @@ Wed Jul 18 16:57:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
 
-Wed Jul 18 09:19:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_parser_append_print, rb_parser_while_loop): moved check
-	  for node to the head.
-
-	* ruby.c (proc_options): do nothing for -p/-n options if tree is null.
-	  submitted by Yusuke ENDOH <mame AT tsg.ne.jp> at [ruby-dev:31243].
-
 Wed Jul 18 08:47:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_succ): Time#succ should return a time object in the
 	  same timezone mode to the original.  [ruby-talk:260256]
 
+Tue Jul 17 00:50:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* numeric.c (fix_pow): integer power calculation: 0**n => 0,
+	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+
+	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
+	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+
 Mon Jul 16 23:07:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/base64.rb (Base64::b64encode): should not specify /o option
 	  for regular expression.  [ruby-dev:31221]
 
-Mon Jul 16 22:57:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): make %u behave like %d for negative
-	  values, since decimal format does not work with preceding dots.
-	  [ruby-core:11575]
-
 Mon Jul 16 18:29:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_rindex_m): accept string-like object convertible
 	  with #to_str method, as well as rb_str_index_m.  [ruby-core:11692]
 
-Mon Jul 16 07:17:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (getspecial): lfp_svar_get() requires int for special
-	  global variables.
-
 Mon Jul 16 05:45:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): more checks for format argument.
@@ -18103,9 +3788,11 @@ Mon Jul 16 00:26:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_pow): removed invariant variable.  [ruby-dev:31236]
 
-Sun Jul 15 22:24:37 2007  pegacorn  <subscriber.jp AT gmail.com>
+Sun Jul 15 23:59:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/cfunc.c (rb_dlcfunc_call): adjust format.  [ruby-dev:31222]
+	* bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
+
+Sun Jul 15 22:24:49 2007  pegacorn  <subscriber.jp AT gmail.com>
 
 	* ext/digest/digest.c (rb_digest_instance_update,
 	  rb_digest_instance_finish, rb_digest_instance_reset,
@@ -18129,8 +3816,7 @@ Sun Jul 15 22:24:37 2007  pegacorn  <subscriber.jp AT gmail.com>
 
 	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
 
-	* include/ruby/win32.h (rb_w32_getcwd): prototype added.
-	  [ruby-dev:31232]
+	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
 
 Sun Jul 15 21:07:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -18145,67 +3831,33 @@ Sun Jul 15 04:42:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (get2comp): do nothing for empty Bignum.  [ruby-dev:31225]
 
-Sat Jul 14 22:49:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_pow): integer power calculation: 0**n => 0,
-	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
-
-	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
-	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
-
-Sat Jul 14 18:46:35 2007  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: add --with-valgrind.
-
-	* gc.h (SET_MACHINE_STACK_END): new macro to replace
-	  rb_gc_set_stack_end.  it find out accurate stack boundary by
-	  asm using gcc on x86.
-
-	* thread.c (rb_gc_set_stack_end): don't define if asm-version
-	  SET_MACHINE_STACK_END is available.
-
-	* gc.c (mark_current_machine_context): extracted from garbage_collect.
-	  it use SET_MACHINE_STACK_END to not scan out of stack area.
-	  it notify conservative GC information to valgrind if
-	  --with-valgrind.
-
 Sat Jul 14 14:04:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enum.c (sort_by_cmp): check if reentered.  [ruby-dev:24291]
 
-Sat Jul 14 11:08:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/json/ext/generator/generator.c (check_max_nesting): wrong
-	  format specifier.  a patch from pegacorn <subscriber.jp AT gmail.com>.
-	  [ruby-dev:31217]
-
-Sat Jul 14 02:27:43 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_pow): overflow detection using FIT_SQRT_LONG().
-	  [ruby-dev:31215]
-
-Sat Jul 14 02:05:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insns.def (opt_div): LONG2FIX() may not work for corner cases,
-	  use LONG2NUM() instead.  [ruby-dev:31210]
+Sat Jul 14 12:44:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-Sat Jul 14 00:34:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/openssl/test_pkcs7.rb: reverted the previous patch.  it should
+	  be as it was to check interface compatibility.  sorry for bothering
+	  with this.
 
-	* numeric.c (int_round): should not return false, but self.
-	  [ruby-dev:31212]
+Sat Jul 14 12:16:17 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-Fri Jul 13 18:31:27 2007  Koichi Sasada  <ko1@atdot.net>
+	* test/openssl/test_pkcs7.rb: follow the library change.  applied a
+	  patch from <zn at mbf.nifty.com> [ruby-dev:31214].
+	  NOTE: r12496 imports the latest openssl libs from trunk to ruby_1_8
+	  though its's not ChangeLog-ed.  maintainer should aware that.
 
-	* include/ruby/intern.h: remove unused function declarations.
+Sat Jul 14 02:51:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* include/ruby/ruby.h: ditto.
+	* numeric.c (fix_pow): 0**2 should not raise floating point
+	  exception.  [ruby-dev:31216]
 
-Fri Jul 13 17:32:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 14 02:25:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* vm.c (vm_free): clear free'ed living_threads field.
-	  [ruby-dev:31163]
+	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31213]
 
-	* insns.def (opt_succ): use cast to shut a warning up.
+	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31215]
 
 Fri Jul 13 16:10:00 2007  Tanaka Akira  <akr@fsij.org>
 
@@ -18218,319 +3870,30 @@ Fri Jul 13 15:02:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (CreateChild): enclose command line except for
 	  command.com which can not handle quotes.  [ruby-talk:258939]
 
-Fri Jul 13 11:33:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_max, range_min): return nil for empty set as well as
-	  1.8 and Enumerable.  [ruby-dev:31198]
-
-Fri Jul 13 11:28:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (bvar): semicolon was lost for ripper description.
-	  [ruby-dev:31140]
-
-Fri Jul 13 11:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (program, stmt, primary): reduced duplicated code.
-
-	* parse.y (dsym): convert also literals containing NUL to
-	  symbol.
-
-	* parse.y (debug_lines): use rb_hash_lookup() to get rid of
-	  call of Hash#default.
-
-	* parse.y (ripper_warningS): unused in ripper right now.
-
-Fri Jul 13 10:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_flatten_bang): check argument if valid
-	  integer.  [ruby-dev:31197]
-
 Fri Jul 13 10:10:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
 	  ::CONFIG which is an alias of MAKEFILE_CONFIG.
 
-Thu Jul 12 21:38:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* insns.def (opt_succ): use LONG_MAX as maximum Fixnum VALUE.
-	  [ruby-dev:31199]
-
-Thu Jul 12 18:42:18 2007  Tanaka Akira  <akr@fsij.org>
-
-	* range.c (range_max): use FIX2LONG instead of FIX2INT to avoid
-	  RangeError by ((-0x80000001)...(-0x80000001)).max on LP64.
-
-	* insns.def (opt_plus): use FIX2LONG instead of FIX2INT to avoid
-	  RangeError by 0x3fffffffffffffff+1 on LP64.
-
-	* insns.def (opt_succ): don't use 0x80000000 which assumes 32bit VALUE.
-	  use FIX2LONG instead of FIX2INT.
-	  [ruby-dev:31190]
-
 Thu Jul 12 17:03:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* struct.c (rb_struct_init_copy): disallow changing the size.
 	  [ruby-dev:31168]
 
-Thu Jul 12 12:58:21 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c: remove "yarv" prefix.
-
-	* array.c, numeric.c: ditto.
-
-	* insnhelper.ci, insns.def, vm_evalbody.ci: ditto.
-
-	* yarvcore.c: removed.
-
-	* yarvcore.h: renamed to core.h.
-
-	* cont.c, debug.c, error.c, process.c, signal.c : ditto.
-
-	* ext/probeprofiler/probeprofiler.c: ditto.
-
-	* id.c, id.h: added.
-
-	* inits.c: ditto.
-
-	* compile.c: rename internal functions.
-
-	* compile.h: fix debug flag.
-
-	* eval.c, object.c, vm.c: remove ruby_top_self.
-	  use rb_vm_top_self() instead.
-
-	* eval_intern.h, eval_load: ditto.
-
-	* gc.c: rename yarv_machine_stack_mark() to
-	  rb_gc_mark_machine_stack().
-
-	* insnhelper.h: remove unused macros.
-
-	* iseq.c: add iseq_compile() to create iseq object
-	  from source string.
-
-	* proc.c: rename a internal function.
-
-	* template/insns.inc.tmpl: remove YARV prefix.
-
-	* thread.c: use rb_iseq_eval() and rb_str_new2().
-
-	* vm.c (rb_iseq_eval): added.
-
-	* vm.c: move some functions from yarvcore.c.
-
-	* vm_dump.c: fix to remove compiler warning.
-
-Thu Jul 12 12:24:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 11 23:38:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* insns.def (opt_succ): fixed typo.  [ruby-dev:31189]
-
-Thu Jul 12 10:30:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): moved prototye from thread_*.ci.
-
-	* thread_pthread.ci (thread_start_func_2): not use a directive
-	  inside a macro argument.  [ruby-talk:258763]
-
-	* thread.c (thread_join): pthread_t may not be pointer.
-
-	* thread_pthread.ci (ubf_select_each): ditto.
-
-Thu Jul 12 05:32:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (FIX2ULONG): drop sign bit for LLP64 platform.
-
-Tue Jul 10 19:34:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* hash.c (rb_hash_lookup): added.  this function is similar to
-	  rb_hash_aref(), but doesn't call Hash#default when no entry
-	  exists.
-
-	* include/ruby/intern.h: ditto.
-
-	* insnhelper.ci (lfp_svar_get): use rb_hash_lookup().
-
-Tue Jul 10 19:16:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, insnhelper.ci, vm.c: change cref index (-1 -> 2).
-
-Tue Jul 10 18:49:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (exec_under): add proper casts.
-
-Tue Jul 10 16:58:16 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, insnhelper.ci: fix svar interface.
-
-	* compile.c (iseq_compile_each), yarvcore.h: fix to use new
-	  svar interface for flip flop.
-
-	* eval.c: ditto.
-
-	* insns.def: ditto.
-
-	* include/ruby/intern.h: remove "rb_svar()" declaration.
-
-Tue Jul 10 16:52:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (rb_iseq_compile): formatted if/else to switch statement.
-
-Tue Jul 10 15:57:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/test_flip.rb: new test for flip-flop operator.
+	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
+	  not with random_seed.
 
 Tue Jul 10 14:50:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
 
-Mon Jul  9 02:17:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* cont.c (cont_restore_1): workaround for x64-mswin64's SEH.
-
-Sun Jul  8 02:08:53 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/json.rb, lib/json/, ext/json/: import JSON 1.1.1
-
-Sat Jul  7 21:59:29 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb (PP::PPMethods#pp_hash): sort condition changed:
-	  all keys have a same class which is kind of Comparable.
-
-Sat Jul  7 17:12:37 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: use rb_bug() instead of rb_compile_error().
-
-Sat Jul  7 16:12:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: fix node construction (around f_margs).
-	  [ruby-dev:31143]
-
-	* bootstraptest/test_block.rb: add a test for above.
-
-	* insnhelper.ci: fix indent.
-
-Sat Jul  7 15:36:50 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb (PP::PPMethods#pp_hash): sort if
-	  all keys are strings, symbols or integers.
-
-Sat Jul  7 15:30:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_yield_setup_args), vm.c, insns.def:
-	  fix to pass nil as block parameter to yielded block.
-	  [ruby-dev:31147]
-
-	* bootstraptest/test_block.rb: add a test for above.
-
-Fri Jul  6 19:55:10 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb.rb: typo. Thanks, Giles Bowkett.
-
-	* lib/irb/completion.rb: support Ruby1.9 changing return value
-	  String to Symbol for Object#methods, etc. [ruby-dev:31148].
-
-Fri Jul  6 18:20:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: fix load path.
-
-	* common.mk: fix "test" rule to run with "btest".
-
-	* rubytest.rb, sample/test.rb: fix to show tests progress.
-
-Fri Jul  6 15:37:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_iterator.rb: fix test to 1.9 spec.
-
-Fri Jul  6 15:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  6 15:22:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_interrupt): suppress a gcc's officious warning.
 
-Fri Jul  6 14:57:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (keyword_to_name): constified.
-
-	* ext/ripper/eventids2.c (token_to_eventid): ditto.
-
-Fri Jul  6 14:50:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/runner.rb: added --quiet option.
-
-Fri Jul  6 14:35:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_marg): wrap f_norm_arg assignment node with NODE_LIST.
-	  [ruby-dev:31141]
-
-Fri Jul  6 12:15:01 2007  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/sentgen.rb: new file.
-
-	* test/ruby/test_assignment.rb: tests implemented using assignment
-	  generator and emulator.
-
-Fri Jul  6 03:06:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: remove unused code.
-
-	* compile.c (compile_massign): fix to invoke to_splat on
-	  splat rhs (example: *a = *nil). [ruby-dev:31136]
-
-	* bootstraptest/test_massign.rb: add tests for above.
-
-	* compile.c (iseq_compile_each): disable excess optimization.
-	  [ruby-dev:31126]
-
-Fri Jul  6 02:08:25 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: fix to invoke nil.to_splat on NODE_ARGSCAT.
-	  [ruby-dev:31138].
-
-	* bootstraptest/test_literal.rb: add tests for above.
-
-Thu Jul  5 19:45:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h: rename rb_control_frame_t#magic to flag.
-
-	* vm.h: add VM_FRAME_TYPE() and VM_FRAME_FLAG().
-
-	* cont.c, insnhelper.ci, insns.def, vm.c, vm_dump.c,
-	  vm_evalbody.ci, yarvcore.c: apply above changes.
-
-Thu Jul  5 19:16:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_basicinstructions.rb: remove an assertion using
-	  unsupported hash literal (such as {1, 2}).
-
-	* test/ruby/test_hash.rb: ditto.
-
-Thu Jul  5 19:12:22 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c: Qfalse is VALUE, not pointer.
-
-Thu Jul  5 18:42:01 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): add break catch point.
-
-	* insns.def (throw): support correct "break" and "return".
-	  this commit achieve that "make test" passes all tests.
-
-	* vm.c: ditto.
-
-Thu Jul  5 18:44:12 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (mlhs_basic): use mlhs_post after tSTAR.
-	  [ruby-dev:31109]
-
-Thu Jul  5 18:27:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
-	  eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
-	  yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
-	  ruby_nerrs): purge global variables.
-
-	* ruby.c (proc_options): moved do_print and do_loop options
-	  handling from ruby_process_options().
-
-Thu Jul  5 16:37:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jul  5 16:44:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (int_pow): fix previous nubu's commit.
 
@@ -18540,684 +3903,41 @@ Thu Jul  5 15:56:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (int_pow): even number multiplication never be negative.
 
-Thu Jul  5 10:42:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/{node,ruby}.h, ruby.c: added enum constants for gdb
-	  support.  [ruby-dev:31066]
-
-	* .gdbinit: some improvements.
-
-Thu Jul  5 10:13:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (global_symbols.last_id): reduce unused ID numbers.
-
-	* include/ruby/st.h, st.c (st_init_table, st_init_table_with_size):
-	  constified.
-
-Wed Jul  4 23:36:27 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/webrick/httpauth/authenticator.rb
-	  (WEBrick::HTTPAuth::Authenticator#check_scheme): auth-scheme must be
-	  treated as a case-insensitive token according to RFC 2617 section 1.2.
-
-Wed Jul  4 18:30:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (mlhs_inner): new rule.  [ruby-dev:31132]
-
-Wed Jul  4 05:11:57 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (set_relation): added.
-
-Wed Jul  4 04:58:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (caller_setup_args): fix to show correct class
-	  on an error message (ex: m(&1)). [ruby-dev:31101]
-
-Wed Jul  4 04:30:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (compile_array, iseq_compile_each): fix about array
-	  generation in void context. [ruby-dev:31102]
-
-	* bootstraptest/test_literal.rb: add a test for above.
-
-Wed Jul  4 04:07:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (compile_array): ignore NODE_ZARRAY.
-	  [ruby-dev:31110]
-
-	* bootstraptest/test_method.rb: add a test for above.
-
-Wed Jul  4 04:04:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h: fix debug print level.
-
-Wed Jul  4 03:52:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): support v[&b]= type method call.
-	  [ruby-dev:31094]
-
-	* bootstraptest/test_method.rb: add a test for above.
-
-Wed Jul  4 03:43:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (compile_massign): fix massign compilation
-	  (example: a, *v, (*x) = ...).  [ruby-dev:31107]
-
-	* bootstraptest/test_massign.rb: add tests for above.
-
-Tue Jul  3 23:12:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/onigiruma.h (ONIG_EXTERN): use RUBY_EXTERN if defined.
-
-	* regenc.h: include ruby/defines.h.
-
-	* regint.h: x64-mswin64 support.
-
-Tue Jul  3 13:47:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (cont_save_machine_stack): clear saved_thread.machine_stack*.
-
-Mon Jul  2 21:45:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: rename iseq_translate_direct_threaded_code()
-	  to iseq_translate_threaded_code().
-
-	* eval_intern.h, yarvcore.h: mv EXEC_EVENT_HOOK() and
-	  exec_event_hooks() to yarvcore.h.
-
-	* insnhelper.ci, vm.c: mv yarv_finish_insn_seq to vm.c.
-
-	* insns.def (opt_call_c_function): fix to use RESTORE_REGS().
-
-	* iseq.c (rb_iseq_build_for_ruby2cext): fix to allocate iseq.
-
-Mon Jul  2 11:59:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (defineclass): suppress a warning.
-
-	* insns.def (opt_call_c_function): should raise the thrown exception
-	  instead of returning it.
-
-Mon Jul  2 08:53:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h, yarvcore.h: move declaration of sysstack_error
-	  to yarvcore.h.
-
-	* iseq.c: fix symbol name (:toplevel -> :top).
-
-	* lib/vm/instruction.rb, template/vm.inc.tmpl: replaceable
-	  current file name.
+Mon Jul  2 14:34:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jul  2 05:29:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, iseq.c: fix iseq some of load/store process.
-
-Mon Jul  2 03:09:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, compile.c, insnhelper.ci, iseq.c, vm.c:
-	  rename structure names and field names.
-
-	* insnhelper.h, insns.def: add GET_CONST_INLINE_CACHE().
-
-	* iseq.c: add rb_iseq_build_for_ruby2cext().
-
-	* yarvcore.h, vm.h: move declaration of rb_insn_func_t
-	  to yarvcore.h.
-
-Sun Jul  1 03:25:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.h, vm.h: some refactoring.
-	  remove useless comments, etc.
-
-Sun Jul  1 03:02:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h: some refactoring on rb_iseq_t.
-	  rename some variable names, add comments, etc.
-
-	* compile.c, iseq.c, proc.c, vm.c: ditto.
-
-Sun Jul  1 02:57:57 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h: rename insn_func_type to rb_insn_func_type.
+	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
+	  if FPLUS flag is specified.  [ruby-list:39224]
 
-	* vm_evalbody.ci: ditto.
+Sat Jun 30 16:05:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* insns.def: add opt_call_native_compiled instruction
-	  instead of opt_call_native_compiled.
+	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
+	  [ruby-core:11562]
 
 Sat Jun 30 00:17:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (parser_yylex): return non-valid token for an invalid
+	* parse.y (yylex): return non-valid token for an invalid
 	  instance/class variable name.  a patch from Yusuke ENDOH
 	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
 
-Fri Jun 29 23:38:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmts): fix for ripper.
-
-Fri Jun 29 21:55:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: fix to show line number of blank block.
-	  [ruby-dev:31093]
-
-Fri Jun 29 20:51:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/cgi/session.rb (create_new_id): don't cut off md5.hexdigest to
-	  follow Ruby 1.8.
-
-Fri Jun 29 17:10:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* debug.h: constified.
-
-	* debug.c (ruby_set_debug_option): separated from main.c.
-
-	* gc.c (ruby_gc_stress), signal.c (ruby_enable_coredump): prefixed.
-
-Fri Jun 29 16:39:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_new): fix to return a proc object
-	  which block is contained ([ruby-dev:31056]).
-
-Fri Jun 29 15:43:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_pow): get rid of division by zero.  reported by
-	  Yusuke ENDOH <mame AT tsg.ne.jp> [ruby-dev:31040]
-
-	* numeric.c (int_round): do nothing when rounding by zeroth digit.
-	  check underflow.  [ruby-dev:31043]
-
-Fri Jun 29 15:32:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in: add fastcall attribute check.
-
-Fri Jun 29 14:51:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assoc_list): remove expanded hash literal (no splat).
-
-	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::EOFError): adapt
-	  to new syntax.
-
-Fri Jun 29 14:48:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/insns2vm.rb, lib/vm/instruction.rb: move process body
-	  to lib/vm/instruction.rb.
-
-	* common.mk: fix aotc rule.
-	  experimental. bin/ruby2cext is not added yet.
-
 Fri Jun 29 11:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
 	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
 
-Thu Jun 28 23:29:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assoc_list): odd number check only for NODE_ARRAY.
-	  [ruby-dev:31082]
-
-Thu Jun 28 22:24:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* win32/Makefile.sub: define FUNC_FASTCALL macro.
-
-	* vm.h: fix to use FUNC_FASTCALL macro.
-	  TODO: add FUNC_FASTCALL macro by configure.
-
-Thu Jun 28 19:38:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: fix to remove -Wall warnings on gcc.
-
-	* compile.c (make_name_with_str): removed. use rb_sprintf() instead.
-
-Thu Jun 28 18:53:01 2007  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (rb_big_hash): fix hash area.
-
-Thu Jun 28 15:00:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): local variable to be
-	  initialized.  [ruby-dev:31077]
-
-Thu Jun 28 11:30:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c (rb_obj_id): use SIGNED_VALUE instead of long.
-
-Thu Jun 28 05:01:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk (run.gdb): fix to load $(srcdir)/.gdbinit
-
-	* vm.c (rb_vm_set_finish_env): add a cast.
-
-	* vm.h: support __fastcall for MSVC.
-
-Thu Jun 28 02:12:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: fix to untouch $:.
-
-Thu Jun 28 02:03:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (setup_args): change parameter type.
-
-Thu Jun 28 02:03:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (rb_intern2): unconstify cast.
-
-Thu Jun 28 01:44:31 2007  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y (rb_intern2): don't allocate a string object at first.
-	  [ruby-dev:31064]
-
-Thu Jun 28 01:24:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: fix to show file name.
-
-	* bootstraptest/test_*.rb: add bootstrap tests.
-
-Thu Jun 28 01:22:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/node.h, parse.y, gc.c, iseq.c: remove NODE_CREF.
-
-Thu Jun 28 01:19:43 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix popped backref and others.
-	  ([ruby-dev:31068]).
-
-	* compile.c (iseq_compile_each): remove needless statements.
-
-Wed Jun 27 23:51:33 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c: remove unused functions.
-
-Wed Jun 27 20:46:05 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
-	  win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
-	  x64-mswin64 port.
-
-Wed Jun 27 20:31:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_translate_direct_threaded_code): fix prototype
-	  function name.
-
-	* vm.h: add correct cast.
-
-Wed Jun 27 17:08:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_evalbody.ci: support OPT_CALL_THREADED_CODE.
-
-	* insns.def, vm.c, vm.h: ditto.
-
-	* vm.h: add VM_CFP_CNT() and VM_SP_CNT().
-
-Wed Jun 27 04:23:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix type error.
-
-Wed Jun 27 03:26:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (compile_massign), insns.def (expandarray): support
-	  postarg with massign (a, *b, c = ...).
-
-	* bootstraptest/test_massign.rb: add tests for above.
-
-	* compile.h: fix debug macro names.
-
-Wed Jun 27 00:18:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_clear): need to check STR_EMBED_P() before
-	  free()ing memory.  a patch from Yusuke ENDOH <mame AT tsg.ne.jp>.
-	  [ruby-dev:31062]
-
-Tue Jun 26 16:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_getgroups): use GIDT2NUM for rb_gid_t.
-
-Tue Jun 26 16:28:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_wait_fd_rw): terminate fdset.
-
-Tue Jun 26 16:26:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* regint.h: IL32LLP64 support.
-
-Tue Jun 26 16:22:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (ruby_node_name): update node names.
-
-Tue Jun 26 15:21:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h: IL32LLP64 support.
-
-	* bignum.c (bigfixize, rb_cstr_to_inum): ditto.
-
-	* insns.def (opt_plus, opt_minus, opt_mult): ditto.
-
-Tue Jun 26 15:04:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_fiber_s_new): revert initializing VM stack.
-
-	* yarvcore.c (th_init2): ditto.
-
-	* vm.c, vm.h: fix to stop using Qundef on VM stack.  According to
-	  this change, VM stack should not include Qundef value.
-
-	* insns.def (putundef): removed.
-
-	* compile.c (iseq_compile_each): ditto.
-
-	* eval.c (eval): fix spacing.
-
-Tue Jun 26 04:03:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (vm_yield_with_cfunc), proc.c: fix Method#to_proc
-	  to return lambda Proc ([ruby-dev:31021], [ruby-dev:31037]).
-
-Tue Jun 26 03:46:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_fiber_s_new): fix to clear rb_thread_t#tag.
-	  [ruby-dev:30995]
-
-Tue Jun 26 03:38:31 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_fiber_s_new), yarvcore.c (th_init2): fix to clear
-	  VM stack ([ruby-dev:31046]).
-
-Tue Jun 26 03:15:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: rename setup_arg() to setup_args().
-	  fix to use setup_args() at processing NODE_YIELD.
-
-Tue Jun 26 02:50:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (setup_arg): support kind of "m(*ary, x)" method call.
-	  ([ruby-dev:31048]).
-
-Tue Jun 26 00:28:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci, vm.c: complete block parameter support.
-	  post arguments, optional arguments, block argument.
-
-	* compile.c, parse.y: fix {|a|} parameter.
-
-	* insnshelper.ci, insns.def: revert caller_setup_args() option
-	  (need_block_check) parameter.
-
-Mon Jun 25 20:18:44 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c (RVALUE): in RVALUE and RBasic, flags must be the same type.
-
-Mon Jun 25 18:02:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/pty/extconf.rb: skip wince and win64.
-
-Mon Jun 25 17:59:32 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
-	  long carelessly.
-
-Mon Jun 25 11:36:35 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.h: add RUBY_ prefix to debug macros.
-
-	* cont.c, proc.c, yarvcore.c,
-
-	* gc.c: define ruby_gc_debug_indent variable to debug mark/free.
-
-	* vm.c, insnhelper.ci: rename some functions to vm_* or rb_vm_*.
-	  move some functions, definitions, declarations to suitable files.
-
-	* eval.c, yarvcore.h, eval_error.ci, insnhelper.ci: ditto.
-
-Mon Jun 25 09:45:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_error.ci, eval_jump.ci, eval_method.ci, eval_safe.ci: c-mode.
-
-Mon Jun 25 05:27:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c: remove ruby_current_node and change eval() prototype.
-	  fix to use rb_sourcefile/line() instead of ruby_sourcefile/line.
-
-	* error.c, eval_error.ci, eval_load.c, eval_safe.ci, gc.c,
-	  include/ruby/intern.h, parse.y, process.c, ruby.c: ditto.
-
-	* vm.c: fix spaces.
-
-Mon Jun 25 04:20:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_*.h: rename to eval_*.ci.
-
-	* common.mk: ditto.
-
-	* eval_error.ci: remove ruby_set_current_source().
-
-	* error.c, eval.c, ruby.c: ditto.
-
-	* eval_safe.c, proc.c: remove unused macros.
-
-Mon Jun 25 03:37:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.ci (caller_setup_args): add need_block_check option.
-
-	* insns.def: ditto.
-
-	* yarvcore.h: add GetCoreDataFromValue().
-
-Mon Jun 25 02:14:30 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* call_cfunc.ci: removed.
-
-	* insnhelper.ci: added. this function includes all functions that
-	  vm insns need.
-
-	* common.mk: ditto.
-
-	* insnhelper.h, vm.h, vm.c: move some declaration.
-
-	* gc.h: remove GC_CHECK() macro because GC.stress is more useful.
-
-	* compile.c, iseq.c, vm_dump: ditto.
-
-	* gc.h, thread.c: move a prototype declaration.
+Tue Jun 26 16:35:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* debug.c, debug.h: rename some functions.
+	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
+	  clash.
 
-	* compile.h: ditto.
+	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
 
-Mon Jun 25 00:45:02 2007  Koichi Sasada  <ko1@atdot.net>
+Sat Jun 23 00:37:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* insns.def (invokesuper): fix error message.
+	* hash.c (rb_hash_select): remove unnecessary varargs for
+	  rb_hash_select.  a patch from Daniel Berger
+	  <Daniel.Berger at qwest.com>.   [ruby-core:11527]
 
-Mon Jun 25 00:14:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: some refactoring.
-	  * rename th_* to vm_*.
-	  * remove unused variables functions.
-	  * add prototypes.
-
-	* blockinlining.c, compile.c, cont.c, eval.c, eval_intern.h,
-	  eval_jump.h, eval_load.c, inits.c, insns.def, iseq.c, parse.y,
-	  proc.c, process.c, signal.c, thread.c, vm.c, vm_dump.c,
-	  vm_evalbody.ci, yarvcore.c, yarvcore.h: ditto.
-
-Sun Jun 24 22:32:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h (rb_add_method): fix to check 0.
-
-Sun Jun 24 22:00:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insn_send.ci: removed.
-
-	* common.mk: ditto.
-
-	* vm.c (vm_call_bmethod), isnsn.def: added.  fix to use this
-	  function instead of using goto.
-
-	* vm.c (vm_call_bmethod): renamed from th_invoke_bmethod().
-
-	* vm.c (vm_method_missing): renamed from eval_method_missing().
-
-	* vm_evalbody.ci: remove tmp_* variables.
-
-	* insnhelper.h: add some macros.
-
-	* insns.def: forbid zsuper from method defined by define_method().
-
-	* test/ruby/test_super.rb: ditto.
-
-Sun Jun 24 20:01:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_macro.def: removed.
-
-	* insn_send.ci: added.  this file includes send instruction body.
-
-	* common.mk: ditto.
-
-	* insns.def: ditto.
-
-	* tool/insns2vm.rb: ditto.
-
-	* vm.c: ditto.
-
-Sun Jun 24 19:30:37 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.h (RESTORE_REGS): add do/while(0) around macro.
-
-	* vm.c, vm_macro.def: remove macro_eval_invoke_func() and
-	  add vm_setup_method().  use it instead.
-
-Sun Jun 24 19:02:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_macro.def : remove macro_eval_invoke_cfunc() and
-	  add vm_call_cfunc().
-
-Sun Jun 24 17:54:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm.c: add/fix stack overflow check.
-
-Sun Jun 24 17:28:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.h: change CHECK_STACK_OVERFLOW() to throw exception.
-
-	* vm.c (caller_setup_arg), vm_macro.def: remove
-	  macro_eval_setup_send_arguments and add caller_setup_arg().
-
-	* insns.def: ditto.
-
-	* bootstraptest/test_method.rb: add splat arg tests.
-
-Sun Jun 24 16:35:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_to_s): used a variable before initialized.
-
-Sun Jun 24 16:05:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (callee_setup_arg): added.  support correct post arg.
-
-	* vm_macro.def (macro_eval_invoke_func): fix to use
-	  callee_setup_arg.
-
-	* compile.c (set_arguments): adjust for above changes.
-
-	* compile.c (iseq_compile_each): ditto.
-
-	* iseq.c (ruby_iseq_disasm): ditto.
-
-	* yarvcore.h: add rb_iseq_t#post_arg_start and arg_size.
-
-	* bootstraptest/test_method.rb: add post arg tests.
-
-Sun Jun 24 16:10:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_to_s): suppress warning, and reduced duplicated code.
-
-Sun Jun 24 15:33:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/runner.rb: set default directory to
-	  '/tmp/bootstraptest.tmpwd' and add --dir option.
-	  fix to output driver and target information.
-
-	* common.mk: fix to run btest on BASERUBY and
-	  add OPTS to pass option ("make btest OPTS=...").
-
-Sun Jun 24 03:05:00 2007  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_minmax): fix SEGV by [].minmax.
-
-Sat Jun 23 17:18:19 2007  Tanaka Akira  <akr@fsij.org>
-
-	* re.c (match_inspect): MatchData#inspect implemented.
-
-Sat Jun 23 15:00:16 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_minmax): new method to get the minimum and maximum
-	  values from the enumerable at once.
-
-	* enum.c (enum_minmax_by): ditto.
-
-Sat Jun 23 01:25:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_assoc): new method.
-
-	* hash.c (rb_hash_rassoc): ditto.
-
-	* hash.c (rb_hash_flatten): ditto.
-
-Fri Jun 22 23:55:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_upto): add optional argument to specify
-	  exclusiveness.
-
-	* range.c (range_step): use String#upto with optional argument.
-
-	* range.c (range_each): ditto.
-
-Fri Jun 22 19:55:51 2007  Tanaka Akira  <akr@fsij.org>
-
-	* proc.c (proc_to_s): revert the change from %p to %lx at YARV
-	  merge time.
-
-Fri Jun 22 19:33:49 2007  Tanaka Akira  <akr@fsij.org>
-
-	* proc.c (proc_to_s): show is_lambda.
-
-Thu Jun 21 20:36:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_sort): remove hash specific implementation.
-
-Thu Jun 21 20:28:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_select): returns new hash, not assoc array.
-	  [ruby-core:11504]
-
-	* hash.c (env_select): ditto.
-
-Thu Jun 21 23:08:19 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (rb_intern2): ID_JUNK test based on len, not by NUL.
-
-Thu Jun 21 19:42:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* yarvcore.c (rb_thread_mark): mark also thrown_errinfo.
-
-Thu Jun 21 17:13:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_intern2): name may not be NUL-terminated.
-
-Wed Jun 20 08:27:57 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval_error.h (error_print): show full stacktrace on
-	  non-SystemStackError.
-
-Wed Jun 20 04:45:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_intern2): use rb_intern2 to intern without trailing
-	  equal sign.
-
-	* parse.y (rb_intern2, ripper_id2sym): fixed indent.
-
-Tue Jun 19 10:55:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_load.c (load_ext, rb_require_safe): pass VALUE instead of
-	  pointer.  [ruby-Bugs-11659]
+	* hash.c: ditto.
 
 Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
 
@@ -19231,46 +3951,11 @@ Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
 	* ext/openssl/ossl_rand.c
 	  New method Random.status?
 
-	* test/openssl/test_ec.rb
-	  New tests.
-
-Mon Jun 18 17:04:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_load.c (rb_require_safe, ruby_init_ext): load with ruby level
-	  cfp.  [ruby-core:10779]
-
-	* eval_intern.h, vm.c (rb_vm_call_cfunc): new function to call a
-	  function with ruby level cfp.
-
-Mon Jun 18 16:57:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yycompile): disable trace while creating ruby_debug_lines.
-	  [ruby-talk:253586]
-
-	* thread.c (ruby_suppress_tracing): new function to call a function
-	  with suppressing trace.
-
-	* lib/debug.rb, lib/tracer.rb: for YARV.
-
 Mon Jun 18 13:54:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occurred
+	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
 	  in at_exit blocks.  [ruby-core:11263]
 
-Mon Jun 18 02:49:16 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (env_mark): fix to mark block.proc.
-
-	* vm.c (th_make_proc_from_block): set created proc to block->proc.
-
-Mon Jun 18 02:48:12 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c (vm_stack_dump_raw): hide VM stack trace.
-
-Mon Jun 18 02:43:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* signal.c (sigsegv): clear gc_stress flag on SEGV.
-
 Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_path2class): get rid of dangling pointer caused by
@@ -19282,170 +3967,31 @@ Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  rb_free_generic_ivar, rb_copy_generic_ivar,
 	  rb_obj_instance_variables): suppress warnings.
 
-Sun Jun 17 11:11:07 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (rb_method_missing): avoid a warning "too many arguments
-	  for format string" on "./ruby -ve 'def m() super end; m'".
-
-Sat Jun 16 22:24:17 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (garbage_collect): re-introduce ruby_current_node marking code.
-	  [ruby-dev:31005]
-
-Sat Jun 16 21:37:43 2007  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (gc_sweep): re-introduce heap extension strategy change.
-	  [ruby-dev:31005]
-
-Fri Jun 15 22:59:37 2007  Tanaka Akira  <akr@fsij.org>
-
-	* .gdbinit: new file to ease debugging using gdb.
-
-Fri Jun 15 22:33:55 2007  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (default_handler): func argument removed.
-	  (trap_handler): support SYSTEM_DEFAULT.  call default_handler
-	  internally.
-	  (sig_trap): don't call default_handler.
-	  [ruby-dev:30999]
-
 Fri Jun 15 22:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (realclean): separate local and ext.
 
 	* ext/extmk.rb: not remove unrelated directories.
 
-Fri Jun 15 20:50:02 2007  Tanaka Akira  <akr@fsij.org>
-
-	* keywords: enclose C code in declaration section by %{ and %} to
-	  avoid extra semicolon after #ifdef RIPPER.
-	  pointed by eban.
-
-Fri Jun 15 18:56:52 2007  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (trap_handler): trap("SIGSEGV", "DEFAULT") may cause wrong
-	  trap error because SIG_DFL may be zero.
-
-Fri Jun 15 15:55:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (setconstant, toregexp): fix to mark object correctly.
-
-Fri Jun 15 13:24:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* hash.c: exchange semantics of Hash#each and Hash#each_pair.
-	  pointed out by [ruby-dev:30997].
-
-	* test/ruby/test_iterator.rb: ditto.
-
-	* test/ruby/test_yield.rb: ditto.
-
-Fri Jun 15 12:38:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_iterator.rb: remove debug code (GC.stress=true).
-
-Fri Jun 15 12:25:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (th_yield_setup_args): |v| should work as |v,|.
-	  ex) def m;yield 1, 2; end; m{|v| p v} #=> 1
-
-	* parse.y: apply above change for "for" statement.
-
-	* test/ruby/test_assignment.rb: ditto
-
-	* test/ruby/test_basicinstructions.rb: ditto.
-
-	* test/ruby/test_iterator.rb: ditto.
-
-	* test/ruby/test_yield.rb: ditto.
-
-	* compile.c (iseq_compile_each): fix debug.
-
-Fri Jun 15 12:22:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (ruby_finalize_1): rb_thread_t#errinfo should be clear with
-	  Qnil.
-
-Fri Jun 15 12:20:11 2007  Koichi Sasada  <ko1@atdot.net>
+Fri Jun 15 17:01:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* cont.c (rb_cont_call): forbid cross fiber continuation call.
-
-	* test/ruby/test_fiber.rb: ditto.
-
-Fri Jun 15 12:14:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* sample/test.rb: fix to show line information whether test succeeds.
-
-Thu Jun 14 17:16:05 2007  Tanaka Akira  <akr@fsij.org>
-
-	* eval_load.c (Init_load): delay allocating an array for rb_load_path
-	  to avoid GC problem in very early stage.
-	  (RUBY_GC_STRESS causes GC in such stage.)
-
-	* variable.c (rb_gc_mark_global_tbl): rb_global_tbl may be 0 in
-	  very early stage.
-
-	* thread.c (thread_cleanup_func) [IA64]: clear register stack position.
-	  (thread_start_func_2) [IA64]: record the beginning of register
-	  stack using extra argument.
-	  (rb_gc_save_machine_context) [IA64]: record the end of register
-	  stack.
-
-	* gc.c [IA64] (SET_STACK_END): record the end of register stack.
-	  (garbage_collect) [IA64]: use recorded register stack area for
-	  GC marking.
-	  (yarv_machine_stack_mark) [IA64]: GC mark from the register stack
-	  area.
-
-	* yarvcore.c [IA64] (rb_gc_register_stack_start): defined.
-	  (Init_VM): store th->self on stack to fix GC problem.
-	  (Init_yarv) [IA64]: initialize the beginning of register stack.
-
-	* yarvcore.h (struct rb_thread_struct) [IA64]: new members for
-	  register stack area.
-
-	* thread_pthread.ci (thread_start_func_1) [IA64]: call
-	  thread_start_func_2 with the end of register stack.
-
-	* cont.c (struct rb_context_struct) [IA64]: new members for register
-	  stack area.
-	  (cont_mark) [IA64]: GC mark from register stack area.
-	  (cont_free) [IA64]: free saved register stack.
-	  (cont_save_machine_stack) [IA64]: record the position and contents
-	  of the register stack.
-	  (cont_capture): store cont->self on stack to fix GC problem.
-	  (cont_restore_1) [IA64]: restore the register stack.
-	  [IA64] (register_stack_extend): new function.
-	  (cont_restore_0) [IA64]: call register_stack_extend instead of
-	  cont_restore_1.
-
-	[ruby-dev:30982]
+	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
+	  fixed [ruby-bugs:PR#5489].
 
 Thu Jun 14 17:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
 	  extensions.  [ruby-dev:30972]
 
-Thu Jun 14 14:40:42 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: document updated.
-	  suggested by NaHi.  [ruby-dev:30966]
-
-Wed Jun 13 22:42:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (garbage_collect): update IA64 register stack code.
-	  [ruby-dev:30971]
-
 Wed Jun 13 06:05:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (darwin): prohibit loading extension libraries to
 	  miniruby.
 
-Tue Jun 12 21:50:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (call_args): no allow splat after assocs.  takes
-	  consistency over compatibility.
+Wed Jun 13 05:47:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (call_args2): ditto
+	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
+	  with a BeOS system function.  [ruby-core:10830]
 
 Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -19454,408 +4000,66 @@ Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (find_header): use header names in the message.
 
-Sun Jun 10 18:37:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/probeprofiler/probeprofiler.c: clean warnings.
-
-Sun Jun 10 18:32:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/isinf.c, missing/dup2.c, missing/strtod.c, missing/x68.c,
-	  missing/alloca.c: use "ruby/config.h".
-
-Sun Jun 10 17:49:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (install_recursive): should check parent directories of
-	  the destination.  [ruby-dev:30947]
-
-Sun Jun 10 16:59:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (do_block, brace_block): fix line numbers.  [ruby-dev:30831]
-
-Sun Jun 10 16:57:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (install_recursive): add :glob option rather than
-	  using FNM_DOTMACH.
-
-	* instruby.rb (ext-comm): make header directory first.
-
-Sun Jun 10 16:10:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_beginendblock.rb: typo.
-
-Sun Jun 10 16:07:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (install_recursive): skip .svn directories.
-
-Sun Jun 10 15:44:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): rubyhdrdir was missing.
-
-Sun Jun 10 15:26:36 2007  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in: use --output-file for gperf to not leave lex.c.tmp.
-
-Sun Jun 10 15:11:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
-
-	* ext/extmk.rb: prepend also topdir to mflags at last.
-
 Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
 	  get rid of invoking shell.  [ruby-dev:30942]
 
-Sun Jun 10 12:56:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby: moved public headers.
-
-	* instruby.rb (install_recursive): skip backup files.
-
-	* instruby.rb (ext-comm): install only current platform headers.
-
-Sun Jun 10 10:42:04 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: renamed from lib/secrand.rb.
-	  suggested by NaHi.  [ruby-dev:30934]
-
-Sat Jun  9 06:40:05 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/secrand.rb: rename SecRand() to SecRand.random_number.
-	  suggested by NaHi.  [ruby-dev:30934]
-
-Fri Jun  8 16:34:20 2007  Tanaka Akira  <akr@fsij.org>
-
-	* ext/zlib/zlib.c (gzfile_s_open): use FilePathValue to support
-	  to_path.
-
-Fri Jun  8 16:11:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_jump.h: th->errinfo should clear with nil.
-
-Fri Jun  8 14:53:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (call_args): allow splat argument after unpacked
-	  assocs like 1.8 does.
-
-	* parse.y (call_args): ditto.
-
-Fri Jun  8 14:26:18 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lib/secrand.rb: new file for secure random interface.
-
-	* lib/cgi/session.rb: use secrand for generating cookies.
-
-Fri Jun  8 12:44:37 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {win32,wince}/Makefile.sub: add lex.c rule.
-
-Fri Jun  8 11:54:18 2007  Tanaka Akira  <akr@fsij.org>
-
-	* lex.c.blt: moved from lex.c.
-
-	* Makefile.in: use lex.c.blt if gperf is not available.
-	  [ruby-list:8212], [ruby-list:8214], [ruby-list:24667],
-	  [ruby-talk:120857], [ruby-dev:28102]
-
-Thu Jun  7 21:38:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_execute_interrupts): invoke ensure when
-	  main thread exits.
-
 Thu Jun  7 19:02:48 2007  Tanaka Akira  <akr@fsij.org>
 
 	* lib/pp.rb: call original "method" method instead of redefined one.
 
-Thu Jun  7 17:20:57 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (prepare_iseq_build): freeze filename and name string.
-
-	* variable.c: freeze class name string.
-
-Thu Jun  7 12:48:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (cont_restore_1): fix to check root fiber [ruby-dev:30911].
-
-	* test/ruby/test_fiber.rb: add a test.
-
-Thu Jun  7 07:24:36 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/json/common.rb: Ponder offering parse! method.
-
-	* lib/json/editor.rb: be a bit more robust while loading data.
-
-	* ext/json/ext/{generator,parser}/extconf.rb:
-	  add a have_header directive for st.h
-
-	* test/json: fix some tests.
-
-Thu Jun  7 03:29:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test_fiber.rb: add a test (Continuation and Fiber).
-
-Thu Jun  7 03:17:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (cont_new): add debug message.
-
-	* cont.c (cont_restore_1): copy stack information from fiber.
+Mon Jun  4 11:11:12 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* cont.c (rb_fiber_s_new): fix to mark created fiber.
-
-	* test/ruby/test_fiber.rb: add some tests around Thread and Fiber.
-
-	* yarvcore.c (thread_free): fix to skip freeing stack if root fiber
-	  is available.
-
-Thu Jun  7 01:03:20 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h, eval.c (ruby_init): remove POP_TAG_INIT().
-
-	* cont.c (rb_fiber_start): remove zero-clearing tag.
-
-Wed Jun  6 20:23:46 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (invokeblock): fix of splat argument.
-	  (splat same as normal method dispatch)
-
-Wed Jun  6 16:27:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* insns.def: fixed indentation.
-
-Wed Jun  6 10:58:23 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_yield): fix to check Qundef.
-
-Wed Jun  6 10:57:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_continuation.rb: add a test for last commit.
-
-Wed Jun  6 10:55:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_cont_call): forbid calling dead fiber with
-	  Continuation#call.
-
-Wed Jun  6 10:50:01 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix around yield arguments
-	  (with NODE_ARGSCAT).
-
-Wed Jun  6 02:50:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (rb_fiber_start): clear th->tag and check error to fix
-	  [ruby-dev:30888] and [ruby-dev:30889].
-
-	* eval_intern.h: fix rb_fiber_start() prototype.
-
-	* test/ruby/test_fiber.rb: add tests for above.
-
-Wed Jun  6 02:40:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* insnhelper.h, insns.def (DEC_SP): shouldn't use unary minus operator
-	  in pointer operation. some compilers (such as VC++8 x64) cannot deal
-	  it with expected way.
-
-Wed Jun  6 02:19:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (new_yield), compile.c (iseq_compile_each): fix
-	  passing parameter.
-
-	* eval.c, eval_jump.h: simplify rb_yield*.
-
-	* proc.c (proc_mark): fix to mark proc->block.proc.
-
-	* proc.c (Init_Proc): add Proc#lambda?
-
-	* test/ruby/test_lambda.rb: add some tests.
-
-	* vm.c (invoke_block): fix to check lambda block or not.
-
-	* vm.c (th_yield_setup_args): fix to check arguments size
-	  when lambda block.
-
-Tue Jun  5 16:30:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_p): returns arguments to intervene.  [ruby-dev:29736]
-
-Tue Jun  5 14:07:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (invokeblock): check block is created by lambda
-	  or Proc.new.
-
-	* vm.c (block_proc_is_lambda): added.
-
-Tue Jun  5 14:47:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/pp.rb (PP::PPMethods::seplist): revert last change to work
-	  around wrapper bug.  [ruby-dev:30840]
-
-Tue Jun  5 14:11:15 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (kanji_convert): Fix guess fallback.
-
-Tue Jun  5 13:32:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c, dir.c, eval.c, eval_jump.h, eval_method.h, numeric.c,
-	  pack.c, parse.y, re.c, thread.c, vm.c, vm_dump.c, call_cfunc.ci,
-	  thread_pthread.ci, thread_win32.ci: fixed indentation.
-
-	* call_cfunc.ci: protoized.
-
-	* thread_win32.ci: fixed typo.
-
-Tue Jun  5 13:17:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* call_cfunc.ci, compile.c, dir.c, eval.c, eval_jump.h, numeric.c,
-	  pack.c, re.c, thread.c, thread_win32.ci, vm.c, vm_dump.c: fixed
-	  indentation.
-
-Mon Jun  4 21:15:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/json.rb, lib/json, ext/json, test/json:
-	  import JSON library.
-
-	* ext/nkf: import nkf.c rev:1.124
-	  Support CP10001.
-
-Mon Jun  4 20:52:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_round): should not just truncate.
-
-Sat Jun  2 16:48:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (Fiber#pass): rename to Fiber#yield.  Block parameter
-	  of fiber body receive first yield values.
-	  e.g.: Fiber.new{|x| p x}.yield(:ok) #=> :ok
-
-	* cont.c: rename rb_context_t#retval to rb_context_t#value.
-
-	* test/ruby/test_fiber.rb: ditto.
-
-Sat Jun  2 16:45:21 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (Init_Proc): remove a line break.
-
-Sat Jun  2 01:27:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_round): small optimization to handle bignums.
-
-Fri Jun  1 13:02:35 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* insnhelper.h (INC_SP): shouldn't cast ``x'' to unsigned type because
-	  it might be a negative value.
-
-	* insnhelper.h, insns.def: shouldn't use unary minus operator in index
-	  operator. some compilers (such as VC++8 x64) cannot deal it with
-	  expected way.
-
-Fri Jun  1 11:33:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_round): should convert self to Float.
-	  [ruby-dev:30860]
-
-Fri Jun  1 02:01:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_round): now takes optional argument to specify
-	  number of digits, like round() in Python/PHP.
-
-	* numeric.c (num_round): ditto.
-
-Fri Jun  1 01:58:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/imap.rb (ResponseParser#next_token): fixed
+	  error message. (backported from HEAD)
 
-	* enum.c (each_with_index_i): should work well with continuation.
-	  a patch from sheepman <sheepman AT sheepman.sakura.ne.jp>.
-	  [ruby-dev:30846]
+	* lib/net/imap.rb (ResponseParser#parse_error): fixed
+	  the condition not to refer @token.symbol unexpectedly.
+	  Thanks, Dick Monahan. (backported from HEAD)
 
 Thu May 31 17:27:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/benchmark.rb (Benchmark::Job::item): avoid modifying the
 	  argument unintentionally.  [ruby-talk:253676]
 
-Wed May 30 14:43:00 2007  Koichi Sasada  <ko1@atdot.net>
+Thu May 31 02:12:32 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* cont.c (cont_capture): store all local variables in heap
-	  ([ruby-dev:30832]).
+	* lib/rinda/tuplespace.rb (Rinda::TupleBag): create index on tuple bag
+	  by first column.
 
-	* vm.c (th_stack_to_heap): added.
+Wed May 30 13:27:40 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* test/ruby/test_continuation.rb: add a test for above.
+	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+	  responses for some FTP servers. (backported from HEAD)
 
-	* eval_intern.h (th_get_ruby_level_cfp): fix to clean code.
+Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 30 13:32:34 2007  Shugo Maeda  <shugo@ruby-lang.org>
+	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
+	  [ruby-dev:30836]
 
-	* lib/net/imap.rb (ResponseParser#next_token): fixed
-	  error message.
+Wed May 30 04:29:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/imap.rb (ResponseParser#parse_error): fixed
-	  the condition not to refer @token.symbol unexpectedly.
-	  Thanks, Dick Monahan.
-
-Wed May 30 13:24:33 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
-	  responses for some FTP servers.
+	* eval.c (thread_timer): timer thread should not receive any
+	  signals.  submitted by Sylvain Joyeux.  [ruby-core:08546]
 
 Wed May 30 04:18:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_eval_cmd): just return if no exceptions.
 	  [ruby-dev:30820]
 
-Wed May 30 02:14:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (interrupt_init): needs to pass nil for Interrupt.
-	  [ruby-core:11038]
-
-	* signal.c (trap): fixed segfaults.  [ruby-dev:30830]
-
-Wed May 30 00:50:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 29 11:01:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (rb_source_filename, obj_free): suppress warnings.
-
-	* gc.c (garbage_collect, yarv_machine_stack_mark): fixed typo.
-	  http://bugs.debian.org/426267
-
-Wed May 30 00:24:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (open_args, arg_ambiguous, parser_warning): should not use
-	  rb_warning in the parser.
-
-Tue May 29 12:31:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_opendir): removed duplicated code.
-
-Tue May 29 10:55:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: fix bug around Continuation and Fiber.
-
-	* test/ruby/test_continuation.rb: add tests for Continuation.
-
-Tue May 29 10:54:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_opendir): store attributes of the second
+	  entries or later too.
 
 	* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
 	  numbers.
 
-Mon May 28 10:27:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cont.c: fixed a function name.
-
-Mon May 28 03:56:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: support Fiber.  Check test/ruby/test_fiber.rb for detail.
-	  Fiber is known as "Micro Thread", "Coroutine", and other terms.
-	  At this time, only Fiber#pass is supported to change context.
-	  I want to know more suitable method name/API for Fiber (... do you
-	  know more suitable class name instead of Fiber?) as "suspend/resume",
-	  "call", "yield", "start/kick/stop/restart", ....
-
-	* eval.c, eval_intern.h, thread.c, yarvcore.c, yarvcore.h: ditto.
+Mon May 28 02:54:05 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Sat May 26 00:38:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_exec_internal): do nothing if no code.
-
-	* compile.c (rb_iseq_compile): check node if NULL before check
-	  nd_type.  [ruby-talk:252956]
+	* lib/rinda/tuplespace.rb (Rinda::TupleBag#delete): use rindex and
+	  delete_at instead of delete for little improvement.
 
 Sat May 26 00:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -19863,54 +4067,6 @@ Sat May 26 00:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  skip tests for exitstatus and termsig on the platforms where
 	  signals not supported.
 
-Fri May 25 16:04:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* yarvcore.c (Init_VM): wrap already initialized structs to use
-	  it directly.
-
-Fri May 25 11:09:47 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* regint.h (include): on some platform, defines.h redefines
-	  SIZE_OF_LONG_LONG so shouldn't re-include config.h after included
-	  defines.h.
-
-	* regint.h (vsnprintf): ruby on windows already have vsnprintf macro.
-
-Thu May 24 12:07:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: check across trap violation.
-
-	* eval.c, yarvcore.h: ditto.
-
-Thu May 24 11:46:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, yarvcore.c: fix to mark VM structure on startup.
-
-	* yarvcore.h: disable USE_CACHED_VALUE.
-
-Thu May 24 01:54:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c: support callcc which everyone love.
-	  incomplete. please give me bug reports.
-
-	* common.mk, inits.c, thread.c: ditto.
-
-	* yarvcore.c: export thread_mark().
-
-	* yarvcore.h: disable value cache option.
-
-	* eval_intern.h: set th_get_ruby_level_cfp to inline.
-
-Wed May 23 15:39:02 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* common.mk: add a rule for regsyntax.c.
-
-Wed May 23 10:31:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* oniguruma.h: updated to Oniguruma 5.7.0.
-
-	* regsyntax.c, unicode.c: new files along with Oniguruma 5.x.
-
 Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
@@ -19922,148 +4078,50 @@ Wed May 23 05:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  load path to get rid of load pre-installed extensions/libraries.
 	  [ruby-core:11017]
 
-Tue May 22 16:37:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (set_arg0): support RSTRING_LEN on HP-UX.  a patch from
-	  WATANABE Tetsuya <Tetsuya.WATANABE AT nifty.com>.  [ruby-dev:30806]
-
-Mon May 21 13:40:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, vm_macro.def: support tail call optimization
-	  (on default, this feature is not enabled).
-
-	* iseq.c, compile.c, vm_opts.h: add "tailcall_optimization"
-	  option.
-
-	* sample/test.rb (test_ok): fix to adjust tailcall stack layout.
-
-	* insns.def, vm.c, compile.c, yarvcore.c, yarvcore.h:
-	  add opt_gt, opt_le instructions.
-
-Mon May 21 03:34:06 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: CRAM-MD5 authentication did not work.
-	  [ruby-dev:30770]
-
-Sat May 19 10:26:01 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat May 19 10:29:18 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (Date._parse): detects some OFX dates
 	  (Of course not fully).
 
-Sat May 19 03:08:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_inject): minor improvement.  [ruby-dev:30792]
+Fri May 18 23:07:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* enum.c (one_i): no needs to iterate once the result became false.
+	* array.c (rb_ary_first): call rb_ary_subseq() instead of pushing
+	  values by itself.  [ruby-talk:252062]
 
-	* enum.c (enum_one): fix for an example.
+	* array.c (rb_ary_first): add negative length check.
 
-	* enum.c (one_iter_i, none_iter_i): DRY.;
+Fri May 18 17:10:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 19 01:07:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (move_to_next_entry): loc also must move forward.
+	  [ruby-talk:251987]
 
-	* enum.c (enum_inject): it is now can work without block.  you
-	  have to specify two argument method name as the first argument.
+Fri May 18 03:02:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enum.c (Init_Enumerable): reduce is new alias to inject.
-
-Sat May 19 01:05:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (Init_File): method definition mismatch.
-
-Fri May 18 16:44:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (Init_File): add to_path method to File objects.
-
-Fri May 18 11:12:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/mkexports.rb: preserve prefixed underscores for WINAPI
+	  symbols.
 
-	* ruby.c (DllMain, ruby_init_loadpath): use DLL instance handle given
-	  to DllMain instead of VirtualQuery so that loadpath becomes relative
-	  from the DLL on WinCE too.
+	* wince/mkconfig_wce.rb, wince/mkexports.rb: obsolete.
 
 Thu May 17 17:03:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
 
-Thu May 17 13:30:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_arg): remove typo from ripper description.
-
-Thu May 17 13:23:38 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y, compile.c (set_arguments): fix to support in-paren
-	  parameter (ex: def foo((a, b))).
-
-Thu May 17 13:01:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (ruby_iseq_disasm): fix to show post arg info.
-
-Thu May 17 12:56:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* debug.c (ruby_debug_node): fix to show node line.
-
-Wed May 16 21:48:44 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb (Logger::Application): remove meaningless logdev
-	  attribute and added logger attribute instead.  [ruby-core:11143]
-	  also added Logger#formatter rdoc comment.
-
-Tue May 15 16:40:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_beginendblock.rb (test_endblockwarn): now parser
-	  warnings emit source names and line numbers.
-
-Tue May 15 15:01:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue May 15 14:54:07 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (init_stdhandle): stderr should be without buffering,
 	  but mswin32 use buffering when stderr is not connected to tty.
 
-Mon May 14 02:12:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_zip): a.zip(b,c) should return an array, not
-	  enumerator.
-
-	* array.c (rb_ary_zip): a.zip(b,c) should return array with size
-	  truncated to the size of its shortest argument array.
-	  [incompatible]
+Mon May 14 13:28:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon May 14 01:54:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/thread/thread.c (wait_list): supress a warning.
 
-	* array.c (rb_ary_choice): should return nil when the array is
-	  empty.
-
-Sat May 12 18:26:36 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (tokens): forgot to add strip. [ruby-core:11120]
-
-	* test/net/http/test_http.rb: test Net::HTTP.post_form.
-
-Fri May 11 15:27:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (iseq_data_to_ary): internal IDs must not be exposed.
-	  [ruby-core:11073]
-
-	* parse.y (internal_id_gen): now returns scope local ID instead of
-	  global one.
-
-Thu May 10 15:15:53 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_super.rb: add tests.
-
-Thu May 10 15:14:05 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu May 10 15:21:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
 
-Thu May 10 15:09:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (POINTER_P): pointer may be larger than long.
+Thu May 10 10:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (vtable_size, vtable_included, vtable_tblcpy,
-	  vtable_to_tbl): constified.
-
-Thu May 10 10:13:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_priority): rdoc fix; the initial value is
+	* eval.c (rb_thread_priority): rdoc fix; the initial value is
 	  inherited from the creating thread.  [ruby-core:10607]
 
 Wed May  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -20071,163 +4129,49 @@ Wed May  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
 	  aliases of quo.  [ruby-dev:30771]
 
-Tue May  8 23:39:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (Date._parse): revised treatment of
-	  hyphened/separatorless dates.
-
-	* lib/date/format.rb: some trivial adjustments.
-
-Tue May  8 20:23:07 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb: reverted.
-
-Tue May  8 19:32:18 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/rational.rb: fix high-precision Rationals cannot be
-	  converted to Floats. [ruby-Bugs:10502], [ruby-core:11069],
-	  [ruby-dev:30743]
-
-Mon May  7 10:59:55 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/image.rb, test/rss/test_image.rb: fixed Image module
-	  namespace URI. reported by Dmitry Borodaenko. Thanks.
-
-Sun May  6 18:44:11 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (Net::HTTP.post_form): allow an Array of String
-	  for pairs argument. [ruby-Bugs:10340]
-
-	* lib/net/http.rb (Net::HTTP#set_form_data): ditto.
-
-Sun May  6 17:54:36 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: Connection header field might include both of
-	  "keep-alive" token and "close" token. [ruby-core:10818]
-
-Sat May  5 16:26:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/date/format.rb (Format::Bag#method_missing): get rid of
-	  modifying original argument.  [ruby-core:11090]
-
-Thu May  3 22:20:08 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, defines.h, eval_load.c (rb_feature_p, rb_provided,
-	  search_required, rb_require_safe), ext/extmk.rb: Fix
-	  a bug where a statically linked extension cannot be autoloaded.
-	  [ruby-dev:30023] / [ruby-dev:30239]
-
-	* thread.c: added an internal class, Barrier.
-
-	* thread.c: copied rdocs from fastthread.
-
-	* yarvcore.h (struct rb_vm_struct): moved loading_table from global.
-
-Thu May  3 18:10:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_evalbody.ci, insns.def, vm.c, tool/insns2vm.rb (rb_num_t):
-	  renamed to get rid of name clash.  [ruby-dev:30504]
-
-	* yarvcore.c (ruby_thread_init): ditto.
-
-Wed May  2 18:52:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, yarvcore.h, yarvcore.c, insns.def: fix to mark VM stack
-	  in correct range.
-
-Wed May  2 17:13:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  9 11:55:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big_quo): now calculate in integer.  [ruby-dev:30753]
 
-Wed May  2 15:14:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h: add redefine checks ([ruby-dev:30751]).
-
-Wed May  2 11:22:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: use Qtrue instead of 2.
-
-	* vm.c, insns.def: support "lambda" calling convention.
-
-Wed May  2 06:46:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c, parse.y, ruby.h (rb_compile_warn, rb_compile_warning): warn
-	  for compilation.  the parser should no longer use rb_warn() and
-	  rb_warning().  [ruby-dev:30121]
-
-Wed May  2 05:45:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  9 11:51:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (assoc): result of assoc_new needs to be an assoc.
+	* bignum.c (rb_big_pow): reduce multiplying for even number.
 
-Wed May  2 05:40:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
 
 	* bignum.c (rb_big_pow): improvement by calculating from MSB and using
 	  factorization.  <http://yowaken.dip.jp/tdiary/20070426.html#p01>
 
-Tue May  1 18:45:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* sample/test.rb: import matzruby's sample/test.rb.
-
-Tue May  1 17:46:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_choice): a new method to choose an element
-	  randomly from an array.
-
-	* array.c (rb_ary_choice): fixed mistake from RDoc.
-
-Tue May  1 13:59:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_arity): fix an arity bug ([ruby-core:11060]).
-
-Tue May  1 13:12:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, compile.c (set_arguments): support post arguments.
-
-	* test/ruby/test_method.rb: add tests for above.
-
-	* test/ruby/test_proc.rb: ditto.
-
-	* proc.c: fix an arity bug ([ruby-core:11029]).
-
-	* vm.c, vm.h, insns.def, vm_dump.h: fix bmethod process.
-
-	* vm.c: support block argument on block parameter.
-
-Fri Apr 27 17:05:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (int_pow): bugfix of overflow detection.
-
-	* numeric.c (int_pow): rb_big_pow() may return other than Bignum.
-
-Fri Apr 27 01:51:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: support multiple splat (e.g, [a, *b, *c, e, *f]).
+	* numeric.c (int_pow): calculate power in Fixnum as possible.
+	  [ruby-dev:30726]
 
-Fri Apr 27 00:03:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May  8 23:42:51 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+	* lib/date/format.rb (Date._parse): revised treatment of
+	  hyphened/separatorless dates.
 
-Thu Apr 26 17:31:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/date/format.rb: some trivial adjustments.
 
-	* bignum.c (rb_big_pow): reduce multiplying for even number.
+Tue May  8 20:25:05 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* numeric.c (int_pow): calculate power in Fixnum as possible.
-	  [ruby-dev:30726]
+	* lib/date/format.rb: reverted.
 
-Thu Apr 26 17:18:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May  5 16:26:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y: fixes for ripper.
+	* lib/date/format.rb (Format::Bag#method_missing): get rid of
+	  modifying orginal argument.  [ruby-core:11090]
 
-	* parse.y (primary): reduced duplicated code.
+Mon Apr 30 01:17:51 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* parse.y (f_arg_item): should not override by meaningless value.
+	* lib/rinda/tuplespace.rb (TupleSpace#create_entry, TupleBag#push,
+	  delete): extract method, and rename parameter.
 
-	* parse.y (f_arg, assocs): should not use $$ before assigned.
+Fri Apr 27 02:00:17 2007  Ryan Davis  <ryand-ruby@zenspider.com>
 
-	* parse.y (assoc_list): dispatch assoclist_from_args for assocs as
-	  well as args.
+	* signal.c: Fixed backwards compatibility for 'raise Interrupt'.
 
-	* parse.y (assoc): return assoc if dispatched result is $1.
+	* lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
+	  Module. Patch from James Britt
 
 Thu Apr 26 13:54:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -20238,49 +4182,6 @@ Wed Apr 25 19:49:16 2007  Tanaka Akira  <akr@fsij.org>
 	* ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
 	  align file descriptor appropriately.
 
-Wed Apr 25 15:23:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (NtInitialize, exit_handler): add initializing and
-	  cleanup of critical section object for select.
-
-	* win32/win32.c (do_select): block reentrance.
-
-	* win32/win32.c (rb_w32_select): 0 sec polling of socket. this is
-	  workaround because winsock cannot do select at same socket at the
-	  same time by two or more threads.
-
-Wed Apr 25 14:10:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/probeprofiler/probeprofiler.c: fix function name and
-	  return value.
-
-Wed Apr 25 12:42:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h: remove rb_control_frame_t#callee_id.
-
-	* vm_macro.def: ditto.
-
-	* eval_intern.h (exec_event_hooks): fix to check event flags
-
-	* eval_intern.h (EXEC_EVENT_HOOK): fix to re-check event flags.
-
-	* ext/probeprofiler : added.  this profiler is sampling based
-	  profiler.
-
-	* vm.c: add rb_thread_current_status() API for probeprofiler.
-
-	* thread.c (rb_thread_execute_interrupts): add comments.
-
-Wed Apr 25 10:36:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_intern.h (PUSH_TAG): no argument now.
-
-	* eval.c, eval_error.h, eval_jump.h, eval_load.c, proc.c, thread.c:
-	  ditto.
-
-	* thread.c (alloc_event_hook, rb_thread_remove_event_hook): should
-	  return value.
-
 Tue Apr 24 09:33:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
@@ -20308,89 +4209,19 @@ Fri Apr 20 12:27:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb: fix to override conv proc.
 
-Fri Apr 20 12:21:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 20 12:17:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (ruby_cleanup): fixed access to out of bound, and inverted
-	  the order of errinfos.
+	* eval.c (ruby_cleanup): inversed the order of errinfos.
 
-Fri Apr 20 10:33:23 2007  Koichi Sasada  <ko1@atdot.net>
+Thu Apr 19 14:53:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval_intern.h: add prototypes of rb_sourceline() and
-	  rb_sourcefile().
-
-Fri Apr 20 02:37:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
-
-	* eval_error.h (error_handle): no message when exiting by signal.
-
-	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
-
-	* signal.c (esignal_init): takes a signal number and an optional
-	  signal name.
-
-	* signal.c (interrupt_init): pass SIGINT always.
-
-	* signal.c (ruby_default_signal): invoke system default signal
-	  handler.
-
-	* signal.c (rb_f_kill): use NUM2PIDT instead of NUM2INT.
-
-	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
-
-	* thread.c (rb_thread_signal_raise): now takes signal number instead
-	  of signal name.
-
-	* thread.c (rb_thread_signal_exit): since rb_make_exception() calls
-	  #exception method, rb_class_new_instance() is not needed here.
-
-	* yarvcore.h (struct rb_vm_struct), eval_jump.h (terminate_process):
-	  exit_code is no longer stored in VM.
-
-Thu Apr 19 18:37:49 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, node.h, thread.c, yarvcore.[ch], eval_intern.h:
-	  support set_trace_func (incomplete.  id and klass
-	  don't be passed).  And support Thread#set_trace_func
-	  which hook only specified thread and Thread#add_trace_func
-	  which add new trace func instead of replace old one.
-	  C level API was modified.  See thread.c (logic) and
-	  yarvcore.h (data structures).
-
-	* vm.c, vm_macro.def: add hook points.
-
-	* compile.c, insns.def: fix "trace" instruction.
-
-	* iseq.c, vm_macro.h: add compile option "trace_instruction".
-
-	* test/ruby/test_settracefunc.rb: hook "c-return" of set_trace_func.
-
-Thu Apr 19 20:57:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (symbol): symbols should be followed by EXPR_ENDARG.
-
-	* parse.y (dsym): ditto.
-
-	* parse.y (parser_yylex): strings should be followed by
-	  EXPR_ENDARG.
-
-	* parse.y (parser_yylex): ditto for numbers.
-
-	* parse.y (parser_yylex): EXPR_ENDARG after ']' and '}'.
-
-Thu Apr 19 17:46:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/optparse.rb: fix to override conv proc.
+	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
+	  ensures Thread.critical to be false.  [ruby-talk:248300]
 
 Wed Apr 18 10:41:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
 
-Wed Apr 18 02:50:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* yarvcore.c (th_init2): push initial blockptr value for
-	  rb_block_given_p() outside ruby_exec().  [ruby-core:10923]
-
 Wed Apr 18 02:30:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (LDFLAGS): prepend -L. instead appending it to
@@ -20399,6 +4230,14 @@ Wed Apr 18 02:30:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in (Makefile): remove $U for automake from MISSING.
 	  [ruby-talk:248171]
 
+Tue Apr 17 16:46:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
+	  it's invoked from within lambda body.  [ruby-talk:248136]
+
+	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
+	  next in the lambda body as well.
+
 Mon Apr 16 22:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/pty/expect_sample.rb: avoid symbolic link representation for
@@ -20426,124 +4265,23 @@ Mon Apr 16 16:34:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* parse.y (parser_yylex): should set command_start after block
 	  starting "do"s and braces.  [ruby-core:10916]
 
-Mon Apr 16 10:51:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_each_with_index): each_with_index to forward
-	  arguments to each.  [ruby-core:10921]
-
-Mon Apr 16 10:43:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_arg): should allow to specify 24:00.
-	  [ruby-core:10915]
-
-Sun Apr 15 09:12:54 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Apr 15 09:19:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: added some zone names.
 
 	* lib/date/format.rb (_parse): now interprets doted numerical
 	  dates as a big endian (except dd.mm.yyyy).
 
-Thu Apr 12 17:13:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (mutex_try_lock): check and set owner thread.
-
-	* thread_pthread.ci: fix to show error code in error message.
-
-Thu Apr 12 17:11:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_rescue2): restore cfp ([ruby-dev:30582]).
-
-Thu Apr 12 16:06:48 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_protect): restore cfp ([ruby-dev:30671]).
-
-Thu Apr 12 16:04:31 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): check node->nd_state == 1, not !0.
-
-Wed Apr 11 16:35:16 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_enter_critical, rb_w32_leave_critical): no
-	  need to reject reentrance. removed.
-
-	* rubysig.h (RUBY_CRITICAL): follow above changes.
-
-	* rubysig.h (TRAP_BEG, TRAP_END): no need to save errno.
-
-Tue Apr 10 17:02:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Apr 10 17:37:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
 	  before calling original fclose()/close().
 
-Tue Apr 10 16:14:22 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.ci (w32_wait_events): check whether interrupt_event is
-	  valid handle or not.
-
-	* thread_win32.ci (native_thread_destroy): clear interrupt_event when
-	  close it.
-
-Tue Apr 10 15:53:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_pthread.ci (native_thread_create): initialize sleep_cond.
-	  fixed: [ruby-dev:30675]
-
-Mon Apr  9 18:48:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (do_select): ubf_select() is not necessary. interrupt is
-	  checked in the loop.
-
-Mon Apr  9 18:27:26 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (do_select): use ubf_select() as UBF on windows.
-
-	* win32/win32.c (do_select): shouldn't call catch_interrupt() here.
-	  fixed: [ruby-dev:30674], reported by wanabe.
-
-Mon Apr  9 09:24:32 2007  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Apr  9 09:30:44 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (disconnect): call shutdown for
 	  SSLSocket. Thanks, Technorama Ltd.
 
-Sun Apr  8 13:28:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (defined_expr): test arguments of NODE_CALL and so
-	  on as well as NODE_ATTRASGN.  [ruby-core:10886]
-
-Fri Apr  6 10:56:29 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_get_group): get rid of
-	  warning. we are aware of it.
-
-Fri Apr  6 04:00:24 2007  Technorama Ltd.  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_{bn,x509{attr,cert,name,store}}.c:
-	  Add documentation.
-
-Thu Apr  5 17:59:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (defined_expr): support for assignment.
-	  [ruby-core:10867]
-
-	* compile.h (ADD_CATCH_ENTRY): removed temporary variable.
-
-Thu Apr  5 15:13:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_alloc): should
-	  return value.
-
-Thu Apr  5 14:58:49 2007  Technorama Ltd. <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_pkcs5.c: New module.
-
-	* ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c:
-	  Remove redundant module namespace.
-
-	* ext/openssl/lib/openssl/{cipher,digest}.rb
-	  Add backwards compatible classes for rearranged classes.
-
-	* ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation.
-
 Thu Apr  5 00:42:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (rb_notimplement), io.c (pipe_open): removed definite
@@ -20554,258 +4292,153 @@ Wed Apr  4 17:09:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* io.c (pipe_open): refined the message of NotImplementedError.
 	  [ruby-dev:30685]
 
-Wed Apr  4 12:29:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* error.c (rb_notimplement): should show the name of this func,
-	  not callee.
-
 Wed Apr  4 10:18:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (popen_exec): should not close close-on-exec FDs.
-	  [ruby-dev:30679]
-
 	* io.c (pipe_open): raise NotImplementedError for command "-" on
 	  platforms where fork(2) is not available.  [ruby-dev:30681]
 
-Tue Apr  4 04:17:18 2007  Technorama Ltd. <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_ssl.c: Add documentation.
-
-Tue Apr  3 16:22:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: check for functions added in 1.9.
-
-	* ext/openssl/ruby_missing.h: check per features instead by
-	  checking version code.  [ruby-core:10845]
-
-Tue Apr  3 16:02:44 2007  Technorama Ltd. <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_bn.c: More documentation.
-
-	* ext/openssl/lib/ossl_{pkey,pkey_ec}.[ch]: Add elliptic curves.
-
-Tue Apr  3 15:50:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Apr  3 15:45:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* 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]
 
-Tue Apr  3 09:36:55 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ruby_missing.h: need to include version.h to check
-	  RUBY_VERSION_CODE.
+Sat Mar 24 23:40:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr  3 07:10:12 2007  Technorama Ltd. <oss-ruby@technorama.net>
+	* node.h (struct rb_thread.locals): explicit as struct.
+	  [ruby-core:10585]
 
-	* ext/openssl/ossl_{ssl.[ch],ssl_session.c},
-	  ext/openssl/lib/openssl/lib/openssl/ssl.rb:
-	  New SSL::Session class.  Add session cb's, getter/setters,
-	  config, and statistics methods.
+	* eval.c, node.h (enum rb_thread_status, struct rb_thread,
+	  rb_curr_thread, rb_main_thread): prefixed.  [ruby-core:10586]
 
-Mon Apr  3 04:00:23 2007  Technorama Ltd. <oss-ruby@technorama.net>
+	* file.c (chompdirsep): made an unprefixed name static.
 
-	* ext/openssl/{ossl.[ch],ossl_pkey.c} Add documentation.
+	* io.c (io_fread): ditto.
 
-	* ext/openssl/ossl_hmac.c Add reset method.
+Sat Mar 24 01:54:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_cipher.c (Cipher#update) Take additional
-	  buffer argument.
+	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
+	  block.  [ruby-core:10609]
 
-	* ext/openssl/{ossl_bio.c,ossl_ssl.c,ruby_missing.h}
-	  compatibility with 1.8.
+	* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
+	  test for exit in END block.  [ruby-core:10760]
 
-Mon Apr  2 21:55:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (throw), thread.c, yarvcore.h (throwed_errinfo): fixed
-	  typo.
-
-Fri Mar 30 11:46:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_cmdvector): fixed buffer size. reported by
-	  wanabe [ruby-dev:30672]
-
-	* win32/win32.c (init_env, insert, rb_w32_get_environ): use strdup
-	  instead of malloc + strlcpy. suggested by nobu [ruby-dev:30673]
-
-Fri Mar 30 02:29:04 2007  Technorama  <oss-ruby@technorama.net>
-
-	* ext/openssl/ossl_{bn,cipher,digest,hmac,rand,pkey_{dh,dsa,rsa}}.c:
-	  Add Documentation for various methods.
-
-	* ext/openssl/lib/openssl/cipher.rb: Ditto
-
-	* ext/openssl/ossl_bn.c: add lshift! and rshift! methods.
-
-	* ext/openssl/ossl_digest.c: GetDigestPtr() also accept a string.
-
-Fri Mar 23 11:28:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (init_env, insert, cmdglob, rb_w32_cmdvector,
-	  rb_w32_opendir, rb_w32_readdir, rb_w32_strerror, rb_w32_stati64,
-	  rb_w32_get_environ): use strlcpy() and strlcat().
-
-	* win32/win32.c (rb_w32_opendir): use realloc() instead of xrealloc().
-
-	* win32/win32.c (rb_w32_closedir): check NULL before free pointers.
-
-Fri Mar 23 00:24:52 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
-
-	* lib/shell: commit miss(support for ruby 1.9(YARV) thread model).
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  test for signal in END block.
 
-Thu Mar 22 13:32:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 22 23:13:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/Makefile.sub (LIBS): remove an unnecessary library.
+	* eval.c (rb_provided): check for extension library if SOEXT is
+	  explicitly given.  [ruby-dev:30657]
 
-Thu Mar 22 10:27:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 22 10:29:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
 
-Wed Mar 21 20:38:06 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* marshal.c (w_short, w_long, w_object): get rid of VC++ warnings.
-
-Wed Mar 21 20:05:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, parse.y, eval.c, intern.h, iseq.c, lex.c, node.h,
-	  proc.c, vm.c, vm_macro.def, vm_macro.def, yarvcore.c, yarvcore.h,
-	  debug.c, debug.h: merge half-baked-1.9 changes.  The biggest change
-	  is to change node structure around NODE_SCOPE, NODE_ARGS.  Every
-	  scope (method/class/block) has own NODE_SCOPE node and NODE_ARGS
-	  represents more details of arguments information.  I'll write a
-	  document about detail of node structure.
-
 Wed Mar 21 17:04:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bignum.c (rb_big2str0): round up for the most significant digit.
 	  [ruby-core:10686]
 
-Tue Mar 21 08:20:00 2007  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* test/testunit/collector/test_dir.rb: Fixed test/unit tests that
-	  were breaking due to Module#public_instance_methods now
-	  returning a Symbol instead of a String.
+Wed Mar 21 07:21:24 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/testunit/collector/test_objectspace.rb: Ditto.
+	* ext/thread/thread.c (remove_one): Preserve List invariants;
+	  submitted by: MenTaLguY <mental AT rydia.net>
+	  in [ruby-core:10598] and [ruby-bugs:PR#9388].
 
 Tue Mar 20 22:54:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* marshal.c (w_extended): erroneous check condition when dump
 	  method is defined.  [ruby-core:10646]
 
-Tue Mar 20 21:36:47 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
-
-	* lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
-
-Tue Mar 20 16:36:08 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* distruby.rb: Add zip generation.
 
-Tue Mar 20 16:20:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_callee_name): add __method__ and __callee__ again.
-	  __callee__ need to rework to adopt YARV.  [ruby-core:10671]
-
-Tue Mar 20 11:09:00 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Revise rdoc.
-
-	* lib/set.rb (Set#freeze, Set#taint, Set#untaint): Implement
-	  Set#freeze, Set#taint, and Set#untaint; requested by: Dan
-	  Hutchings <dan AT moltoagitato.com> in [ruby-bugs:PR#9359].
-
-Tue Mar 20 09:13:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_fork): flush stdouts always before fork(2).
-	  fixed: [ruby-dev:30612]
-
-Tue Mar 20 01:38:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): store the result of first_func
-	  as well as first_proc.
-
-	* thread.c (thread_create_core): block is not used if first_func
-	  is given.
-
-Mon Mar 19 16:58:52 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/{strlcat,strlcpy}.c, missing.h: new functions.
-
-	* LEGAL: add copyright notice about above files.
-
-	* configure.in: check whether strlcat and strlcpy are exist or not.
-
-	* {bcc32,win32,wince}/Makefile.sub: use above files.
-
-Mon Mar 19 14:12:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Mar 20 11:28:41 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
 	  the Gauss-Jordan algorithm, making it stable.  a patch from
 	  Peter Vanbroekhoven.  [ruby-core:10641]
 
-Mon Mar 19 12:13:36 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Mar 19 11:39:29 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* regparse.c, etc.: K&R to ANSI code cleanup patch from Stefan
-	  Huehner <stefan at huehner.org>.  [ruby-core:10543]
+	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
 
-Mon Mar 19 11:27:13 2007  Minero Aoki  <aamine@loveruby.net>
+Sun Mar 18 04:23:52 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
+	* NEWS: Add a note about the new `date' library defining
+	  Time#to_date and Time#to_datetime private methods.
 
-Sun Mar 18 08:31:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* NEWS: Inform that the old `thread' library is considered to be
+	  stable.
 
-	* win32/dir.h, win32/win32.c (rb_w32_opendir, rb_w32_readdir,
-	  rb_w32_closedir): get rid of possible buffer-overflows.
+	* NEWS: Sort library entries in alphabetical order.
 
-Sat Mar 17 19:10:39 2007  Kouhei Sutou  <kou@cozmixng.org>
+Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rss, test/rss:
-	- supported Atom.
-	- bumped version 0.1.6 to 0.1.7.
-	* sample/rss/convert.rb: added new sample.
+	* 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].
 
-Fri Mar 16 22:32:20 2007  Minero Aoki  <aamine@loveruby.net>
+Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/pop.rb: change default verification mode from
-	  VERIFY_PEER to VERIFY_NONE because most POPS server does not have
-	  true certification.
+	* 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].
 
-Fri Mar 16 22:19:24 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Mar 16 16:33:58 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize,
-	  a little bit supporting ActiveX control. [ruby-talk:241188]
+	* ext/thread/thread.c (unlock_mutex_inner): Make sure that the
+	  given mutex is actually owned by the caller; submitted by:
+	  Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
 
-Fri Mar 16 22:16:58 2007  Minero Aoki  <aamine@loveruby.net>
+Fri Mar 16 16:21:35 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/http.rb: merge Ruby-SSPI patch contributed by Justin
-	  Bailey.
+	* ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
+	  ConditionVariable#wait that occurs when two threads that are
+	  trying to access the condition variable are also in concurrence
+	  for the given mutex; submitted by: Sylvain Joyeux
+	  <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
+	  in [ruby-core:10598].
 
-	* ext/Win32API/lib/win32/sspi.rb: new file.
+Fri Mar 16 16:17:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/thread/test_thread.rb: Add a test script for the `thread'
+	  library.  This should result in failure as of now with
+	  ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
+	  m4x.org> in [ruby-core:10598].
 
 Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
 	  treated as ("-0.31") not as ("0.31").
 
-Tue Mar 13 19:04:30 2007  Keiju Ishitsuka <keiju@ruby-lang.org>
-
-	* lib/sync.rb: support for ruby 1.9(YARV) thread model.
-
 Tue Mar 13 09:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (clear-installed-list): separated from install-prereq.
 
-Tue Mar 13 07:23:20 2007  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Mar 13 06:38:43 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* NEWS: Reword and improve entries.
 
-	* lib/monitor.rb (mon_try_enter): call @mon_muetx.try_lock.
-	  Thanks, Keiju ISHITSUKA. [ruby-dev:30507]
+Tue Mar 13 06:03:46 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Mar 13 02:42:58 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* stable version 1.8.6 released from the ruby_1_8_6 branch.
+
+Tue Mar 13 03:24:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* runruby.rb: added --pure (turned on by default) and --debugger
+	  options.
+
+Tue Mar 13 02:50:28 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* 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].
 
-Mon Mar 12 10:53:28 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Mar 12 11:07:44 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
 	  externally defined modules; submitted by Technorama
@@ -20831,105 +4464,101 @@ Mon Mar 12 10:53:28 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
 
-Sun Mar 11 18:42:01 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/ruby-mode.el (ruby-block-end-re): Support for the
-	  experimental ';;' terminator had been dropped.
+Mon Mar 12 01:05:17 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Mar 11 05:45:46 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
+	  This might not be very right but it is commonly used in other
+	  parts of the code; submitted by sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:30532].
 
-	* 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].
+	* ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
 
-Sat Mar 10 07:20:28 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon Mar 12 00:59:19 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB#library_name,
-	  WIN32OLE_TYPELIB#visible?.
+	* ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
+	  DL::Importable::Internal::callback): Avoid race condition for an
+	  instance variable; submitted by sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:30530].
 
-	* test/win32ole/test_win32ole_typelib.rb: ditto.
+Sun Mar 11 18:57:50 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Mar  8 09:17:59 2007  Minero Aoki  <aamine@loveruby.net>
+	* misc/README: Add a note about ruby-electric.el.
 
-	* compile.c: iseq_compile -> rb_iseq_compile.
+	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
+	  ruby-non-block-do-re. [ruby-core:03719]
 
-	* iseq.c: ditto.
+	* misc/inf-ruby.el: Synchronize the comment section with trunk.
 
-	* intern.h: provide function prototype of Init_jump.
-
-	* eval_jump.h (Init_jump): declare function type.
-
-	* thread.c: platform-dependent functions should be surrounded by #ifdef.
-
-	* iseq.c (iseq_data_to_ary): remove unused variable.
-
-	* compile.c (set_arguments): ditto.
-
-	* thread.c (set_unblock_function): ditto.
-
-	* thread_pthread.ci: reduce printf warning.
+	* 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].
 
-	* vm_dump.c: ditto.
+Sun Mar 11 17:45:51 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Mar  6 16:35:04 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* 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].
 
-	* lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
+Sun Mar 11 12:09:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Mar  6 11:53:25 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (error_handle): no message when exiting by signal.
 
-	* ext/tk/sample/irbtkw.rbw: fails to exit process.
+	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
 
-Tue Mar  6 10:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_interrupt): instantiate SignalException.
 
-	* runruby.rb: added --pure (turned on by default) and --debugger
-	  options.
+	* eval.c (rb_thread_signal_raise): now takes signal number instead
+	  of signal name.
 
-Mon Mar  5 09:19:33 2007  Minero Aoki  <aamine@loveruby.net>
+	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
 
-	* lib/timeout.rb (Timeout.timeout): should return the block value
-	  always.
+	* signal.c (esignal_init): takes a signal number and an optional
+	  signal name.
 
-	* lib/timeout.rb (Timeout.timeout): should yield sec argument
-	  always.
+	* signal.c (interrupt_init): pass SIGINT always.
 
-	* lib/timeout.rb (Timeout.timeout): fix document.
+	* signal.c (ruby_default_signal): invoke system default signal
+	  handler.
 
-Mon Mar  5 09:16:40 2007  Minero Aoki  <aamine@loveruby.net>
+	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
 
-	* lib/net/smtp.rb: support automatic STARTTLS.
+Tue Mar  6 19:08:46 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/smtp.rb: check server advertisement.
+	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
+	  Digest::MD5.
 
-	* lib/net/smtp.rb: introduce new class SMTP::Response.
+	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
 
-	* lib/net/smtp.rb (getok): should not use sprintf.
+Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
-	* lib/net/smtp.rb (get_response): ditto.
+	* lib/shell/process-controller.rb: fix thread synchronization
+	  problem for [ruby-dev:30477].
 
-	* lib/net/protocol.rb: reduce syntax warning on 1.9.
+Tue Mar  6 18:44:26 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Mar  5 07:13:28 2007  Minero Aoki  <aamine@loveruby.net>
+	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
+	  Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
+	  moriq.com> in [ruby-dev:30500].
 
-	* lib/net/smtp.rb: reconstruct SMTPS/STARTTLS interface.  New
-	  interface is incompatible from current 1.9 interface at all.
+	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
 
-	* lib/net/smtp.rb: All SSL-related class methods are removed; use
-	  instance methods instead.
+Tue Mar  6 18:24:19 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/smtp.rb: rename methods: *ssl -> *tls (with alias
-	  "ssl").
+	* time.c (time_to_s): Back out the format changes; discussed
+	  in [ruby-dev:30495].
 
-	* lib/net/smtp.rb: rename methods: *tls -> *starttls.
+Tue Mar  6 11:53:25 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Mon Mar  5 01:36:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/sample/irbtkw.rbw: fails to exit process.
 
-	* parse.y (parser_yylex), win32/win32.c (rb_w32_utime): fixed
-	  indentation broken at YARV merger.
+Mon Mar  5 20:14:49 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Mar  4 23:41:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_to_s): Correct the wrong format which did not
+	  really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
+	  iij.ad.jp> in [ruby-dev:30487].
 
-	* file.c (rb_stat_uid, rb_stat_gid, eaccess): use rb_uid_t and
-	  rb_gid_t instead of int.
+Sun Mar  4 23:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
 	  where utimes() does not exist.
@@ -20940,21 +4569,21 @@ Sun Mar  4 14:46:56 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* util.c (push_element): should return a int value.
 
-Sun Mar  4 01:01:25 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Mar  4 01:05:57 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/set.rb (Set#^, Set#&): Correct documentation.  Those methods
 	  return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
 	  mangabrain.de>.
 
-Sat Mar  3 22:54:33 2007  Minero Aoki  <aamine@loveruby.net>
+Sat Mar  3 23:01:07 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/fileutils.rb (touch): last #touch change causes error when
-	  :mtime option was not given.
+	* lib/fileutils.rb (mv): could not move a directory between
+	  different filesystems. [ruby-dev:30411]
 
-Sat Mar  3 22:51:29 2007  Minero Aoki  <aamine@loveruby.net>
+Sat Mar  3 22:57:11 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/fileutils.rb (mv): could not move directory between
-	  different file systems. [ruby-dev:30411]
+	* lib/fileutils.rb (touch): last commit causes error if :mtime
+	  option was not given.
 
 Sat Mar  3 22:37:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -20963,26 +4592,39 @@ Sat Mar  3 22:37:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
 	  options.  fixed: [ruby-talk:219037]
 
-Sat Mar  3 15:52:26 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sat Mar  3 21:17:35 2007  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
+
+Sat Mar  3 19:05:31 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* object.c (instance_variable_get): Restore rdoc markups lost in
-	  the last commit.
+	* ext/thread/thread.c (push_list): Use ALLOC().
 
-Fri Mar  2 21:17:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* ext/thread/thread.c (rb_mutex_alloc): Ditto.
 
-	* ext/win32ole/win32ole.c (get_ptr_of_variant, ole_set_safe_array,
-	  ole_val2ptr_variant, ole_val2olevariantdata, ole_variant2val,
-	  ): fix some bugs of WIN32OLE_VARIANT.new when variant type is
-	  VT_ARRAY|VT_BSTR or VT_BYREF.
+	* ext/thread/thread.c (rb_condvar_alloc): Ditto.
 
-	* ext/win32ole/win32ole.c (folevariant_s_array, folevariant_initialize):
-	  WIN32OLE_VARIANT#[], WIN32OLE_VARIANT#[]=, WIN32OLE_VARIANT#value=
-	  is defined as instance method of WIN32OLE_VARIANT.
+Sat Mar  3 18:53:11 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/win32ole/test_win32ole_variant.rb: add some test for
-	  VT_ARRAY, VT_BYREF variant type.
+	* NEWS: Add a note for String#intern.
 
-Fri Mar  2 07:58:24 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Mar  3 16:23:13 2007  Akinori MUSHA  <knu@iDaemons.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].
+
+	* eval.c (proc_invoke): Ditto.
+
+	* gc.c (obj_free): Ditto.
+
+	* parse.y (top_local_setup_gen): Ditto.
+
+Sat Mar  3 16:07:02 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* object.c (rb_obj_ivar_set): RDoc updated according to a
 	  suggestion from Brian Candler <B.Candler AT pobox.com>.
@@ -20993,7 +4635,14 @@ Thu Mar  1 21:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
 	  empty.  [ruby-dev:30455]
 
-Thu Mar  1 02:55:25 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Mar  1 08:55:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_feature_p): check loading_tbl if the given ext is
+	  empty.  [ruby-dev:30452]
+
+	* eval.c (rb_feature_p): fix possible buffer overrun.
+
+Thu Mar  1 03:30:21 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
 	  Digest::Base subclasses, which was unintentionally made
@@ -21003,6 +4652,11 @@ Thu Mar  1 02:05:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb (patchlevel): read from version.h.
 
+Thu Mar  1 00:09:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_provided): return true only for features loaded from
+	  .rb files, and not search actual library type.  [ruby-dev:30414]
+
 Wed Feb 28 21:15:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
@@ -21015,31 +4669,29 @@ Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
 	  to fix [ruby-core:10437]
 
-Wed Feb 28 18:31:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb 28 18:59:57 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* NEWS: Add NEWS, a document file to keep user visible feature
+	  changes between releases.
+
+Wed Feb 28 18:35:50 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
 	  they are already checked at configure.
 	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
 
-Wed Feb 28 18:23:43 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb 28 18:34:48 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
 	  should be the first elements of library paths list.
 	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
 
-Wed Feb 28 10:33:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, configure.in, */Makefile.sub (THREAD_MODEL): system
-	  specific thread model.
-
-	* compile.h, regint.h, vm.h, array.c: removed unnecessary #include.
+Wed Feb 28 18:31:32 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Feb 28 04:03:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0.  This is way too old
+	  NEWS.
 
-	* enum.c (take_i): small cosmetic / documentation patch from
-	  Tadashi Saito <shiba AT mail2.accsnet.ne.jp>. [ruby-dev:30446]
-
-Wed Feb 28 01:20:18 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb 28 01:22:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
 	  target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
@@ -21054,7 +4706,7 @@ Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
 Tue Feb 27 22:18:45 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* configure.in (--enable-auto-image-base): avoid the necessity to
+	* configure.in (--enable-auto-image-base): avoid the neccessity to
 	  rebase the shared libs as much as possible;
 	  submitted by Corinna Vinschen <spam at vinschen.de> in
 	  [ruby-talk:240964].
@@ -21067,27 +4719,19 @@ Tue Feb 27 21:33:04 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
 
-Tue Feb 27 20:35:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (error.c, process.c): depend on yarvcore.h and rubysig.h.
-
-Tue Feb 27 19:26:31 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
-	  rb_nkf_guess2): Silence warnings regarding char * vs. unsigned
-	  char * mismatch; submitted by Lyle Johnson
-	  <lyle.johnson@gmail.com> in [ruby-core:10416].
-
-Tue Feb 27 19:15:01 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Feb 27 19:38:52 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
 	  by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
 
-Tue Feb 27 18:59:42 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Feb 27 19:36:57 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* regex.c (calculate_must_string, slow_search, re_search): Silence
+	  warnings regarding char * vs. unsigned char * mismatch;
+	  submitted by Lyle Johnson <lyle.johnson@gmail.com>
+	  in [ruby-core:10416].
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Silence warnings
-	  regarding char * vs. unsigned char * mismatch; submitted by Lyle
-	  Johnson <lyle.johnson@gmail.com> in [ruby-core:10416].
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
 
 	* ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
 
@@ -21096,321 +4740,65 @@ Tue Feb 27 18:59:42 2007  Akinori MUSHA  <knu@iDaemons.org>
 	* ext/digest/digest.c (rb_digest_base_finish,
 	  rb_digest_base_update): Ditto.
 
-Tue Feb 27 18:12:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_take): new method.  [ruby-dev:30407]
-
-	* enum.c (enum_drop): ditto.
-
-Tue Feb 27 07:47:24 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, vm.h: rename th_invoke_yield() to th_yield().
-
-	* blockinlining.c: ditto.
-
-	* eval.c: ditto.
-
-	* vm.c, insns.def: rename th_invoke_yield_cfunc()
-	  to th_yield_with_cfunc().
-
-	* yarvcore.h, yarvcore.c: rename theYarvVM to ruby_current_vm and
-	  yarvCurrentThread to ruby_current_thread.  remove yarvVMArray.
-
-Tue Feb 27 00:45:23 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_optimization.rb: restore method before calling
-	  assert_equal.
-
-Mon Feb 26 00:58:39 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h: add rb_thread_t#top_wrapper, top_self.
-
-	* eval_load.c (rb_load): support eval in wrapper module
-	  (load(file, true)).
-
-	* eval.c: ditto.
-
-	* eval_jump.h: ditto.
-
-	* iseq.c: ditto.
-
-	* vm.c: ditto.
-
-	* yarvcore.c: ditto.
-
-	* insns.def: add a empty line.
-
-Mon Feb 26 00:54:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: change "gdb" rule.  You can debug miniruby with
-	  $(srcdir)/test.rb on gdb by this rule (type "make gdb").
-	  If you write break points to "breakpoints.gdb" on $srcdir,
-	  gdb runs with this file.
-
-Sun Feb 25 11:46:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* win32/Makefile.sub: enable -Zi (debug) option.
-
-Sun Feb 25 11:38:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ruby.h: define RUBY_VM macro and remove NATIVETHREAD* macros.
-
-	* intern.h: ditto.
-
-	* signal.c (posix_signal): remove unused function
-	  posix_nativethread_signal().
-
-Sun Feb 25 11:31:13 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (rb_thread_run): fix to ANSI style.
-
-Sun Feb 25 11:09:16 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/runner.rb: show source code in error message.
-
-Sun Feb 25 09:39:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h:
-	  rename:
-	    rb_iseq_t#file_name -> filename
-	    rb_iseq_t#local_tbl -> local_table
-	  add:
-	    rb_iseq_t#local_table_size
-
-	* compile.c: separate local_table_size and local_size
-	  (local variable size)
-
-	* blockinlining.c: apply above rename.
-
-	* compile.h: ditto.
-
-	* eval.c: ditto.
-
-	* iseq.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm.c: ditto.
-
-	* vm_dump.c: ditto.
-
-Sun Feb 25 10:27:17 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/runner.rb: add lib/ to load path.
-
-Sat Feb 25 10:16:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubyio.h (HAVE_RB_IO_T): macro to tell if rb_io_t is defined.
-
-Sat Feb 24 19:39:16 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* common.mk: new target "btest", to run bootstraptests.
-
-Sat Feb 24 19:30:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c, gc.c, io.c, ruby.h, rubyio.h, win32/win32.h (rb_io_t):
-	  renamed from OpenFile.
-
-	* ext/dl/cptr.c, ext/io/wait/wait.c, ext/openssl/ossl.h,
-	  ext/openssl/ossl_bio.c, ext/openssl/ossl_ssl.c, ext/pty/pty.c,
-	  ext/readline/readline.c, ext/socket/socket.c: ditto.
-
-Sat Feb 24 19:28:23 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/runner.rb: new option -v,--verbose.
-
-Sat Feb 24 18:55:50 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* yarvtest/test_method.rb: removed (merged to bootstraptest).
-
-	* yarvtest/test_class.rb: ditto.
-
-Sat Feb 24 18:44:39 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/test_class.rb: new file.
-
-	* bootstraptest/test_method.rb: add tests.
-
-Sat Feb 24 18:44:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (rb_thread_blocking_region): add prototype.
-
-	* file.c (rb_thread_flock, rb_file_flock): use UBF feature.
-
-	* process.c (rb_waitpid_blocking, rb_waitpid): use UBF feature.
-
-	* thread.c (rb_thread_debug): added runtime debugging flag.
-
-	* thread.c (BLOCKING_REGION): restore previous UBF.
-
-	* thread.c (rb_thread_blocking_region): default UBF to interrupt
-	  in system dependent way by RB_UBF_DFL.
-	  + ubf_select() on posix system
-	  + ubf_handle() on Win32
-	  + none on cygwin
-
-	* thread_win32.ci (rb_w32_wait_events_blocking): blocking version.
-
-	* win32/win32.c (waitpid): use rb_w32_wait_events_blocking().
-
-Sat Feb 24 17:45:48 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (f_arg, opt_f_block_arg): ripper should export VALUE.
-
-Sat Feb 24 16:52:55 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/runner.rb: fix syntax error.
-
-Sat Feb 24 16:51:09 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest/runner.rb: new option --help.
-
-Sat Feb 24 16:47:33 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* bootstraptest: new test suite.
-
-	* bootstraptest/runner.rb: new file.
-
-	* bootstraptest/test_literal.rb: new file.
-
-	* bootstraptest/test_method.rb: new file.
-
-Sat Feb 24 16:29:15 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (StartSocket): remove unnecessary code.
-
-Sat Feb 24 16:04:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (struct local_vars): remove unused nofree member from
-	  struct.
-
-	* parse.y (parser_free): ditto.
-
-Sat Feb 24 15:57:19 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/thread.rb (ConditionVariable#broadcast): use Mutex
-	  instead of Thread.exclusive.
-
-	* lib/monitor.rb (MonitorMixin#mon_exit): unset @mon_owner
-	  before calling Mutex#unlock.
-
-Sat Feb 24 15:51:45 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (program): remove useless assignment to reduce warning.
-
-Sat Feb 24 15:41:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (lambda): remove unused clause from the rule to stop
-	  warning.
-
-Sat Feb 24 15:41:22 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/thread.rb: do not redefine Mutex#synchronize.
-
-Sat Feb 24 15:14:02 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/monitor.rb: rewritten using Mutex/ConditionVariable.
-
-Sat Feb 24 13:25:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/soap/mapping/factory.rb: catch up with spec changes (return
-	  Symbols instead of Strings).
-
-	* lib/soap/mapping/mapping.rb: ditto.
-
-Sat Feb 24 10:49:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y, node.h, compile.c: change node tree structure.  a purpose
-	  of this change is to unify argument structure of method and block.
-	  this change prohibits duplicate block parameter name.
-	  new argument information:
-	    NODE_ARGS	  [m: int, o: NODE_OPT_ARG, ->]
-	    NODE_ARGS_AUX [r: ID, b: ID, ->]
-	    NODE_ARGS_AUX [Pst: id, Plen: int, init: NODE*]
-	  optarg information:
-	    NODE_OPT_ARGS [idx, expr, ->]
+	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
+	  rb_nkf_guess2): Ditto.
 
-	* vm_macro.def: ditto.
+Tue Feb 27 03:40:09 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* gc.c: ditto.
+	* ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
+	  Eliminate rb_thread_critical switching where unnecessary;
+	  implied by shugo in [ruby-dev:30412].
 
-	* iseq.c: ditto.
+	* ext/thread/thread.c (set_critical): Merge in
+	  thread_exclusive_ensure().
 
-	* compile.h: fix debug function name.
+	* ext/thread/thread.c: Consistently use 0 and 1 for
+	  rb_thread_critical values.
 
-	* test/ripper/test_scanner_events.rb: |_,_,foo| -> |_1,_2,foo|
+Mon Feb 26 15:18:23 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_lambda.rb: disable test temporarily.
+	* ext/thread/thread.c: Use xmalloc()/xfree() instead of
+	  malloc()/free(); pointed out by shugo in [ruby-dev:30412].
 
-Sat Feb 24 10:46:28 2007  Koichi Sasada  <ko1@atdot.net>
+Sun Feb 25 23:02:55 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/testunit/test_testcase.rb: catch up with current instance
-	  variable spec.
+	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
+	  Initialize @workdir properly to silence a warning under -w.
+	  Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
 
-Sat Feb 24 10:32:59 2007  Koichi Sasada  <ko1@atdot.net>
+Sun Feb 25 02:47:43 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* common.mk: change vm_macro.def rule.
+	* defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
+	  which is necessary for dir.c to compile on djgpp and emx.
 
-Sat Feb 24 10:38:05 2007  Minero Aoki  <aamine@loveruby.net>
+Sat Feb 24 10:42:01 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
 	  rb_gc_mark.  Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
 
-Sat Feb 24 07:31:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_VARIANT.array,
-	  WIN32OLE_VARIANT#value=, refactoring.
-
-	* test/win32ole/test_win32ole_variant.rb: add some test for
-	  WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
-
-Fri Feb 23 18:37:55 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_yield.rb: new test.
-
-	* yarvtest/test_yield.rb: removed (moved to test_yield.rb).
-
-Fri Feb 23 18:27:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (rb_thread_polling): check interrupts here.
+Fri Feb 23 15:10:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* thread_win32.ci (w32_wait_events): rename from w32_wait_event(), and
-	  now receive multiple event handles.
-
-	* win32/win32.c (wait_events, rb_w32_main_context): removed.
-
-	* thread_win32.ci (rb_w32_wait_events): new function.
-
-	* thread_win32.ci, win32/win32.c (rb_w32_sleep, rb_w32_Sleep): move
-	  from win32/win32.c to thread_win32.ci, and use w32_wait_events().
-
-Fri Feb 23 18:13:22 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_optimization.rb: new test (merges test_opts.rb).
-
-	* yarvtest/test_opts.rb: removed.
-
-Fri Feb 23 16:59:39 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_assignment.rb: merge yarvtest/test_massign.
-
-	* yarvtest/test_massign.rb: removed (merged to
-	  test_assignment.rb).
+	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
+	  workaround. [ruby-core:10259]
 
-Fri Feb 23 15:58:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/win32.c (NtInitialize): call above function.
 
-	* signal.c (sighandler): need to re-install sighandler on some
-	  platforms.
+Fri Feb 23 14:19:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Feb 23 15:05:57 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* signal.c (sighandler): need to tell to be interrupted to main
+	  context when handler is installed.
 
-	* win32/win32.c (set_pioinfo_extra): simplified.
+	* win32/win32.[ch] (rb_win32_interrupted): new function to listen
+	  interrupt.
 
-Fri Feb 23 14:23:20 2007  Minero Aoki  <aamine@loveruby.net>
+Fri Feb 23 13:02:17 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/ruby/test_literal.rb: new test.
+	* numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
+	  suggested in
+	  http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
+	  [ruby-talk:240223]
 
-Fri Feb 23 12:40:12 2007  James Edward Gray II  <james@grayproductions.net>
+Fri Feb 23 12:43:17 2007  James Edward Gray II  <james@grayproductions.net>
 
 	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
 	  Content-Length parameter optional for responses in
@@ -21420,85 +4808,12 @@ Fri Feb 23 12:40:12 2007  James Edward Gray II  <james@grayproductions.net>
 	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
 	  support to xmlrpc; approved by the maintainer.
 
-Fri Feb 23 12:24:46 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (lambda): add ripper event.  This fixes bus error on
-	  "make test-all".
-
-	* ext/ripper/extconf.rb: do not stop build.
-
-Fri Feb 23 12:16:05 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: remove dyna_check_gen() prototype.
-
-Fri Feb 23 11:41:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y, compile.c, gc.c, insns.def, intern.h, iseq.c, node.h,
-	  object.c, string.c, variable.c, vm_macro.def: revert private
-	  instance variable feature, which is postponed until next major
-	  release.
-
-	* marshal.c: TYPE_SYMBOL2 removed; MARSHAL_MINOR reverted back to
-	  8th version.
-
-Fri Feb 23 10:53:21 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* thread_pthread.ci (native_mutex_lock): do not call
-	  pthread_mutex_trylock().
-
-Fri Feb 23 10:31:16 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* dln.c: use dlopen on Mac OS X 10.3 or later.
-
-Fri Feb 23 10:03:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_ord): need not to check string length;  ord
-	  returns a codepoint for the first character in the string.
-
-Wed Feb 21 22:29:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Feb 19 18:22:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (fix_equal): A bit more optimization.
-
-Wed Feb 21 17:40:37 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_equal): remove FIX2LONG() to optimize.  suggested
-	  in http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
-	  [ruby-talk:240223]
-
-	* numeric.c (fix_cmp): ditto.
-
-Wed Feb 21 09:14:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_load.c (rb_require_safe): should restore safe level.
-
-Tue Feb 20 21:19:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (installed_code_page_proc,
-	  ole_variant2val): small refactoring.
-
-Tue Feb 20 15:11:42 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, vm.c, yarvcore.h: move definition of rb_call_super() to
-	  vm.c from eval.c.  change th_call_super() to static function.
-
-Tue Feb 20 15:08:25 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/io/nonblock/test_flush.rb: YARV doesn't raise any errors if
-	  another thread close IO object which current thread is blocking with.
-
-Tue Feb 20 15:03:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (do_select, rb_thread_wait_fd_rw): raise sys error if
-	  errno is not 0 and EBADF.
-
-Mon Feb 19 22:15:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): cache convertible type info.
-
-	* intern.h (rb_detach_process): use rb_pid_t instead of pid_t.
-
-	* ruby.h (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM, NUM2GIDT):
-	  defaulted to conversion using long.
+	* configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
+	  load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
+	  a bug where a statically linked extension cannot be autoloaded.
+	  [ruby-dev:30023] / [ruby-dev:30239]
 
 Mon Feb 19 17:14:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -21506,45 +4821,10 @@ Mon Feb 19 17:14:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  message for #peeraddr. a patch from Sam Roberts
 	  <sroberts at uniserve.com>.  [ruby-core:10366]
 
-Sun Feb 18 22:56:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_getgrgid): missed to replace a macro.
-
-Sun Feb 18 19:33:00 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Feb 18 19:35:21 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: updated based on date2 4.0.3.
 
-Sun Feb 18 13:11:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (pid_t, uid_t, gid_t): check if defined.
-
-	* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
-	  rb_{pid,uid,gid}_t instead of plain int.  [ruby-dev:30376]
-
-	* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
-	  NUM2GIDT): moved to configure.in.
-
-Fri Feb 16 21:34:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* object.c (rb_obj_ivar_set/get/defined): fix to check :@_v/C id.
-
-	* test/testunit/test_testcase.rb: fix to use instance_variable_get()
-	  to access @_result.
-
-Fri Feb 16 20:59:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* intern.h: add a prototype of rb_sym_to_s().
-
-Fri Feb 16 19:24:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (math_log): update document to mention second optional
-	  argument for logarithm base.
-
-Fri Feb 16 19:19:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (mrhs): need to append by arg_append().
-	  [ruby-talk:239385]
-
 Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
@@ -21552,108 +4832,35 @@ Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
 
-Thu Feb 15 20:48:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb 15 20:26:30 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-	  workaround. [ruby-core:10259]
+	* lib/uri/ftp.rb: Revert the previous change pending discussion.
 
-	* win32/win32.c (NtInitialize): call above function.
+Thu Feb 15 18:08:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* dir.c (glob_helper): Fix the function declaration.
+
+Thu Feb 15 17:13:32 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Feb 15 16:25:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* version.h: Welcome to the post-1.8.6 world.  Radical changes are
+	  inhibited in the ruby_1_8 branch until the 1.8.6 final release
+	  goes out of the door.
+
+Thu Feb 15 16:44:14 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
 	  `scheme://user:@...', `scheme://:password@...' and
 	  `scheme://:@...' are parsed, an empty user name or password
 	  should be allowed and represented as it is.
 
-Thu Feb 15 01:52:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.(c|h), yarvcore.(c|h) (yarvGlobalStateVersion): rename to
-	  ruby_vm_global_state_version.
-
-Thu Feb 15 01:50:26 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/fileutils/test_fileutils.rb (check_singleton): fix to use
-	  symbol instead of string.
-
-	* test/io/nonblock/test_flush.rb: enable tests.
-
-	* test/xmlrpc/test_webrick_server.rb: ditto.
-
-Thu Feb 15 01:43:45 2007  Koichi Sasada  <ko1@atdot.net>
+Thu Feb 15 11:46:05 2007  KIMURA Koichi  <hogemuta@gmail.com>
 
-	* lib/delegate.rb: catch up with class local variable (@_v) spec.
+	* dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
+	  encoding aware globbing support in from trunk.  Dir.[] and
+	  Dir.glob() can now take many patterns in an array.  Minor fixes
+	  will follow.
 
-	* lib/singleton.rb: ditto.
-
-Wed Feb 14 22:52:43 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): VC++6 does not
-	  support VT_I8, VT_UI8.
-
-Wed Feb 14 22:10:21 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in: change stack limit to 2MB from 32MB.
-
-	* win32/Makefile.sub: ditto.
-
-Wed Feb 14 21:39:36 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
-	  autoloads for sha2 classes in favor of handling in
-	  const_missing(), to work around a problem exposed on OS X.
-
-Wed Feb 14 21:19:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.ci (native_thread_create): adjust 4KB (page size)
-	  alignment.
-
-Wed Feb 14 21:12:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.ci (CHECK_ERR): call rb_bug()
-	  instead of printf() and exit().
-
-Wed Feb 14 16:48:56 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/date/format.rb (Date::Format::Bag::method_missing): need not
-	  to use instance variables corresponding each method; use Hash
-	  instead.
-
-Wed Feb 14 13:12:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (reg_operand): allow symbols to be operands for regular
-	  expression matches.
-
-	* string.c (Init_String): allow Symbol#===.
-
-	* lib/date/format.rb (Date::Format::Bag::to_hash): string
-	  added prefixes.
-
-Wed Feb 14 12:58:38 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (do_select): fix to iterate select().
-	  on cygwin/mswin32, iterate in unblocking region.
-
-	* thread.c (rb_thread_select): don't iterate on this function.
-	  (iterate in do_select).
-
-Wed Feb 14 11:39:18 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (set_unblock_function): fix function interface.
-
-Wed Feb 14 11:12:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_load.c, yarvcore.h: use rb_vm_t#loaded_features instead of
-	  rb_features (global variable).
-
-	* yarvcore.c: mark rb_vm_t#loaded_features.
-
-Wed Feb 14 08:46:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* compile.c (defined_expr): no longer distinguish ordinary local
-	  variables and in-block local variables in defined? value.
-
-Wed Feb 14 03:14:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Feb 15 11:00:26 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/uri/generic.rb (URI::Generic::userinfo): should support
 	  empty password.  [ruby-core:10290]
@@ -21661,644 +4868,147 @@ Wed Feb 14 03:14:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/uri/generic.rb (URI::Generic::set_password): password can be
 	  cleared by nil.  [ruby-core:10290]
 
-Wed Feb 14 03:10:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/uri/common.rb (escape): regard second string argument as a
+	  character set properly. [ruby-dev:27692]
 
-	* parse.y (struct local_vars): no need to warn out-of-scope
-	  variables; remove dnames member from struct.
+	* lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
+	  relative/absolute paths.
 
-Wed Feb 14 03:04:10 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
 
-	* parse.y: RVarmap no longer used as yytype; removed.
+Thu Feb 15 10:57:38 2007  Tietew  <tietew@tietew.net>>
 
-	* parse.y (dyna_push_gen): no longer need return value.
+	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
+	  unescaped ampersand.  a patch from Tietew
+	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
+	  fixed: [ruby-dev:30289]
 
-	* parse.y (dyna_pop_gen): no longer need argument.
+Thu Feb 15 10:48:40 2007  MenTaLguY  <mental@rydia.net>
 
-	* parse.y (local_push_gen): initialize nofree.
+	* ext/thread/thread.c: Handle interrupted waits correctly.
+	  [ruby-bugs:PR#8663]
 
-Wed Feb 14 00:30:07 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Feb 14 19:22:15 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/socket/socket.c (init_unixsock): path may contain NUL for
-	  abstract unix sockets.  [ruby-core:10288]
+	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
+	  autoloads for sha2 classes in favor of handling in
+	  const_missing(), to work around a problem exposed on OS X.
 
 Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
 
 	* io.c (rb_f_syscall): Fix buffer overflow with syscall
 	  arguments.  [ruby-bugs:PR#8541]
 
-Mon Feb 12 13:57:30 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): support VT_I8, VT_UI8.
+Sun Feb 11 07:46:45 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Feb 12 11:48:52 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
-	  -> dc_rights_list. dc_rightses still exists for backward
-	  compatibility. [ruby-core:8350]
-
-	* test/rss/test_maker_dc.rb: added tests for dc_rights_list.
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
+	  a quoted-string in a Content-Disposition value.
 
-Sun Feb 11 22:40:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Feb 11 06:27:54 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c (ole_ptrtype2val): ole_type, ole_type_detail
-	  should not return "VARIANT,VARIANT".
+	* configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
+	  configure option `--disable-fastthread', to choose the original,
+	  pure ruby version of the "thread" library instead of the new,
+	  much faster implementation in ext/thread.
 
-Sun Feb 11 22:11:05 2007  Kouhei Sutou  <kou@cozmixng.org>
+Sun Feb 11 06:22:20 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
-	  kept backward compatibility.
+	* ext/Setup: Add thread except for platforms without threads
+	  support.
 
-Sun Feb 11 22:10:08 2007  Kouhei Sutou  <kou@cozmixng.org>
+Sun Feb 11 06:15:16 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
-	  const_defined? instead of constants.include?.
+	* ext/thread/lib/thread.rb: Add a replacement of thread.rb that
+	  loads this extension.
 
-Sun Feb 11 18:47:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Feb 11 05:39:47 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata):
-	  WIN32OLE_VARIANT#new accepts nil when variant type is VT_ARRAY.
+	* lib/thread.rb: Remove an ineffective part of the code.
 
-	* test/win32ole/test_win32ole_variant.rb: ditto.
+Sun Feb 11 05:32:54 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/win32ole/win32ole.c: small refactoring.
+	* ext/thread/thread.c (rb_thread_exclusive): Implement
+	  Thread.exclusive.
 
-Sun Feb 11 07:42:25 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Feb 11 05:26:51 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
-	  a quoted-string in a Content-Disposition value.
+	* ext/thread/thread.c: Get rid of use of a dummy function.
 
-Sat Feb 10 20:21:29 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Feb 11 01:45:31 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/win32ole/win32ole.c: add WIN32OLE#ole_query_interface.
-	  thanks to Mikael Pahmp.
+	* ext/thread/thread.c (Init_thread): Define missing aliases:
+	  Queue#enq and SizedQueue#enq.
 
-	* test/win32ole/test_win32ole.rb: ditto.
+Sat Feb 10 09:27:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Sat Feb 10 17:46:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
+	  on VC++.
 
-	* common.mk: targets which depend on yarvcore.h now depend on
-	  rubysig.h too.
+Sat Feb 10 07:41:52 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* yarvcore.h (rb_vm_t): use rb_atomic_t instead of int.
+	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
+	  SAFEARRAY pointer is NULL.
 
 Sat Feb 10 00:13:11 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
 	  __conv_keyonly_opts).
 
-Fri Feb  9 12:33:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_win32.ci (w32_show_error_message): renamed to w32_error.
-	  this function do rb_bug().
-
-	* thread_win32.ci (w32_set_event, w32_reset_event, w32_close_handle,
-	  w32_resume_thread): added. fix to use these functions instead calling
-	  win32api directly.
-
-	* thread_win32.ci (w32_create_thread): create suspend thread
-	  (caller must call w32_resume_thread()).
-
-Fri Feb  9 11:03:40 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_readpartial.rb: tests are working on mswin32/cygwin.
-
-Fri Feb  9 05:08:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, thread_pthread.ci, thread_win32.ci (thread_start_func_1):
-	  move cleanup function to thread_start_func_2().
-
-	* thread.c, thread_pthread.ci, thread_win32.ci:
-	  add more destruct functions.
-	  (native_thread_destroy() and native_mutex_destroy())
-
-	* thread_pthread.ci, thread_pthread.h: make native_mutex_* functions
-	  (check error, etc), it's not macro any more.
-
-	* thread_win32.ci (thread_start_func_1): store some values before
-	  running thread (to release these after running thread).
-
-	* thread_win32.ci (native_thread_create): fix spaces.
-
-Thu Feb  8 22:44:04 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_set_safe_array, ole_variant2val,
-	  ole_val_ary2variant_ary): fix WIN32OLE_VARIANT.new bug when
-	  1st argument is empty array, and when 2nd argument is
-	  VT_ARRAY|VT_BYREF.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-Thu Feb  8 22:39:09 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvtest/yarvtest.rb: check target command names.
-
-Thu Feb  8 22:31:45 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_clone.rb: fix to current spec
-	  (Module should not be occur many times in ancestors).
-
-Thu Feb  8 22:26:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_string.rb: ("foo" == :foo) and ("foo" === :foo)
-	  should be false.
-
-	* ChangeLog: fix last messages.
-
-Thu Feb  8 22:24:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_module.rb: fix to use Symbol instead of String.
-
-	* test/ruby/test_module.rb: remove space before argument parentheses.
-
-Thu Feb  8 22:02:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/marshaltestlib.rb: eval(sym) -> eval(sym.to_s)
-
-Thu Feb  8 21:35:16 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_propertyputref.rb (setup): fix typo.
-
-	* test/win32ole/test_win32ole_event.rb: should not use
-	  InternetExplorer.gohome to test.
-
-Thu Feb  8 21:02:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (GVL_UNLOCK_RANGE): rename to BLOCKING_REGION().
-
-	* thread.c (rb_thread_run_parallel): rename to
-	  rb_thread_blocking_region().
-
-Thu Feb  8 15:48:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, thread.c: fix to use pthread on cygwin.
-
-	* yarvcore.h, thread.c: move GVL_UNLOCK_BEGIN() and GVL_UNLOCK_END()
-	  from yarvcore.h to thread.c.
-
-	* thread.c: change GVL_UNLOCK_RANGE() arguments
-	  (adding ubf as 2nd argument).
-
-	* thread.c: fix to use polling in select on cygwin and mswin32.
-
-	* thread.c, thread_pthread.ci, thread_win32.ci, yarvcore.h:
-	  rename:
-	  * rb_thread_t#interrupt_function -> unblock_function
-	  * rb_interrupt_function_t -> rb_unblock_function
-	  * some interrupt function name -> ubf_*
-	  * yarv_* -> *
-
-Thu Feb  8 16:08:02 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: fix to use RUNRUBY instead of BASERUBY if possible.
-
-	* common.mk ($(INSNS) rule): remove $(PROGRAM) first.
-
-Thu Feb  8 15:43:05 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* process.c: fix to use rb_status_line_set/get/clear().
-
-	* eval_intern.h: fix line break.
-
-Thu Feb  8 15:00:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
-	  eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
-	  thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
-	  vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
-	  fix typo (rb_thead_t -> rb_thread_t).
-
-	* eval_intern.h: remove unused definitions.
-
-	* common.mk: fix around vm_opts.h path
-	  and remove harmful argument passed to insns2vm.rb.
-
-Thu Feb  8 03:11:47 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
-	  unescaped ampersand.  a patch from Tietew
-	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
-	  fixed: [ruby-dev:30289]
-
-Wed Feb  7 23:25:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (specific_eval): suppress warning.
-
-	* thread_win32.h: undefine _WIN32 on cygwin.  [ruby-dev:30303]
-
-Wed Feb  7 22:41:34 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h: remove UNSUPPORTED() macro.
-
-	* thread.c: fix to define Continuation methods
-	  (they only do rb_notimplement()).
-
-Wed Feb  7 22:33:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h, yarvcore.h: remove unused macro definition.
-
-Wed Feb  7 22:30:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c: fixed to use ANSI function style.
-
-Wed Feb  7 09:35:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* this commit is a result of refactoring. only renaming functions,
-	  moving definitions place, add/remove prototypes, deleting
-	  unused variables and removing yarv.h.
-	  This commit doesn't change any behavior of ruby/vm.
+Fri Feb  9 20:44:53 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
+	* ext/thread: Make style fixes (mostly de-K&R'ism) to match the
+	  rest of the source code.
 
-	* error.c, eval_intern.h: include yarvcore.h instead yarv.h
+	* ext/thread: Make USE_MEM_POOLS an extconf option.
 
-	* rename some functions:
-	  * debug.[ch]: debug_*() -> ruby_debug_*()
-	  * iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
-	  * iseq.c: node_name() -> ruby_node_name()
-	  * vm.c: yarv_check_redefinition_opt_method() ->
-	          rb_vm_check_redefinition_opt_method()
+Fri Feb  9 20:43:01 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* some refactoring with checking -Wall.
+	* ext/thread: Import the "fastthread" implementation by MenTaLguY
+	  in the original form.  This module is not hooked into the build
+	  yet since it needs some style fixes and adjustments.
 
-	* array.c: remove rb_ary_ptr() (unused) and remove unused
-	  local variables.
+Fri Feb  9 15:46:09 2007  Akinori MUSHA  <knu@iDaemons.org>
 
-	* object.c: add a prototype of rb_mod_module_exec().
+	* ext/bigdecimal: Synchronize with trunk.  Better function
+	  prototypes, removal of a useless method `!=', and document
+	  updates.
 
-	* eval_intern.h (ruby_cref): set it inline.
-
-	* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
-
-	* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
-
-	* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
-
-	* thread.c: remove raw_gets() function (unused) and fix some format
-	  mismatch (format mismatches have remained yet. this is todo).
-
-	* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
-
-	* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
-
-	* vm.c (rb_svar, rb_backref_get, rb_backref_get,
-	  rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
-
-	* vm.c (yarv_init_redefined_flag): add a prototype and rename
-	  yarv_opt_method_table to vm_opt_method_table.
-
-	* vm.c (rb_thread_eval): moved from yarvcore.c.
-
-	* yarvcore.c: remove unused global variables and fix to use nsdr().
-
-Wed Feb  7 03:39:32 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, compile.c, compile.h, error.c, eval.c,
-	  eval_intern.h, eval_jump.h, eval_load.c, eval_method.h,
-	  eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c,
-	  process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci,
-	  vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def,
-	  yarv.h, yarvcore.h, yarvcore.c: change type and macro names:
-	  * yarv_*_t -> rb_*_t
-	  * yarv_*_struct -> rb_*_struct
-	  * yarv_tag -> rb_vm_tag
-	  * YARV_* -> RUBY_VM_*
-
-	* proc.c, vm.c: move functions about env object creation
-	  from proc.c to vm.c.
-
-	* proc.c, yarvcore.c: fix rb_cVM initialization place.
-
-	* inits.c: change Init_ISeq() order (after Init_VM).
-
-	* ruby.h, proc.c: change declaration place of rb_cEnv
-	  from proc.c to ruby.c.
-
-Tue Feb  6 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Feb 06 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
 	  imported nkf 2007-01-28.
 	  * Fixed: can't decode MIME encode JIS string.
-	  * Fixed: Fullwidth-halfwidth conversion.
+	  * Fixed: Fullwitdh-halfwidth conversion.
 	  * Support DoCoMo's and Softbank's EMOJI
 	  * Support CP932, CP5022x, eucJP-ms UDC
 	  * Support UTF-32 encoding
 	  * Support beyond BMP
 	  [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
 
-Tue Feb  6 20:36:19 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, lib/rss/parser.rb: followed current Ruby
-	  specification. [ruby-dev:30274]
-
-Tue Feb  6 20:29:44 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb, lib/rss/parser.rb: removed needless code for
-	  backward compatibility.
-
-Tue Feb  6 18:43:17 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb: moved fixes for EPIPE to the correct
-	  place. [ruby-core:10204]
-
-Tue Feb  6 16:38:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_opts.h: set properties:
-	  svn:keywords:  Author Date Id Revision
-	  svn:eol-style: native
-
-Tue Feb  6 15:55:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (ivar_i): need to support class local instance
-	  variables.
-
-Tue Feb  6 15:44:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): fix setting is_local flag.
-
-	* yarvtest/test_class.rb: add a test for class local instance variable.
-
-Tue Feb  6 14:15:34 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def: remove (get|set)instancevariable2 and add a
-	  operand is_local to (get|set)instancevariable.
-
-	* yarvtest/test_class.rb: add a test for class local instance variable.
-
-	* parse.y (rb_decompose_ivar2): remove unused variable oid.
-
-	* tool/insns2vm.rb: remove needless require.
-
-Tue Feb  6 11:18:41 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb: check the control connection on EPIPE.
-	  Thanks, Simon Williams. [ruby-core:9547]
-
-Tue Feb  6 11:03:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* complement last commit.
-
-	* common.mk (*.inc): use VPATH.
-
-	* vm_opts.h: renamed from vm_opts.h.base.
-
-Tue Feb  6 10:02:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/insns2vm.rb: use vm_opts.h in VPATH.
-
-Tue Feb  6 03:47:58 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: support Binding#eval.
-
-	* yarvtest/test_eval.rb: add a test for above change.
-
-Tue Feb  6 03:13:33 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: refactoring (remove K&R style, move Binding stuffs from
-	  Init_Proc() to Init_Binding()).
-
-Tue Feb  6 01:07:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* intern.h: prepare rb_last_status_get() and rb_last_status_set().
-	  Use these functions instead of rb_last_status ([ruby-dev:30264]).
-
-	* process.c: define above functions.
-
-	* ext/pty/pty.c: use above functions.
-
-	* io.c (pipe_finalize): ditto.
-
-	* process.c: ditto.
-
-Mon Feb  5 21:26:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ruby.h: add a prototype of rb_id2str().
-
-Mon Feb  5 21:06:50 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_thread.c, common.mk: remove eval_thread.c.
-
-	* yarvcore.c: rename cYarvThread to rb_cThread.
-
-	* gc.c: remove YARV_* prefix.
-
-	* gc.h: add an include guard and prototype of rb_gc_set_stack_end().
-
-	* inits.c: fix to ANSI prototype style and reorder Init_*().
-
-	* io.c (pipe_finalize): TODO: comment out last_status.
-
-	* process.c, yarvcore.h: fix to use yarv_vm_t#last_status instead of
-	  rb_last_status and make last_status_get() to access $?.
-
-	* yarvcore.c (vm_mark): mark yarv_vm_t#last_status.
-
-	* ruby.h: add declarations of rb_cISeq and rb_cVM.
-
-	* thread.c: move eval_thread.c codes to thread.c and remove yarv_*
-	  function prefix.
-
-	* thread.c (thread_start_func_2): use yarv_thread_t#first_func if
-	  it is not null.
-
-	* vm.c: fix copyright year.
-
-	* yarvcore.c (Init_vm): rename to Init_VM().
-
-Mon Feb  5 04:09:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_frame_callee): check if prev_cfp can be accessible.
-	  a patch from Yoshinori Sano <yoshinori.sano at gmail.com> in
-	  [ruby-dev:30252].  solves [ruby-dev:30200] and [ruby-core:9856].
-
-Sun Feb  4 20:34:41 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/rss-assertions.rb: removed needless code for backward
-	  compatibility.
-
-Sun Feb  4 02:22:59 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Remove a debug
-	  print.
-
-Sat Feb  3 23:51:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (rb_compose_ivar2): function to create a new ivar2
-	  symbol from a symbol and a class.  back-ported from matzruby.
-
-	* parse.y (rb_decompose_ivar2): reverse function of
-	  rb_compose_ivar2().
-
-	* marshal.c (w_symbol): support class local instance variables.
-
-	* marshal.c (r_object0): ditto.
-
-	* compile.c (defined_expr): ditto.
-
-	* compile.c (iseq_compile_each): ditto.
-
-	* insns.def: add two new instructions: getinstancevariable2 and
-	  setinstancevariable2.
-
-Sat Feb  3 23:21:13 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insns.def (setclassvariable): remove unnecessary operand.
-
-	* compile.c (iseq_compile_each): ditto.
-
-	* common.mk (insns_info.inc): add dependency for insns_info.inc.
-
-Sat Feb  3 14:32:58 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata, ole_val2variant):
-	  fix the bug of WIN32OLE_VARIANT.new when variant type is
-	  VT_ARRAY.
-
-	* ext/win32ole/sample/excel1.rb: rewrite using WIN32OLE_VARIANT.
-
-	* test/win32ole/test_win32ole.rb: add some test.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-Sat Feb  3 03:35:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, */Makefile.sub, common.mk (vmasm): generalized.
-
-	* common.mk (runruby, benchmark, benchmark-each, tbench): use
-	  PROGRAM for the file to be built.
-
-	* proc.c (yarv_proc_alloc): needs return.
-
-	* call_cfunc.ci, compile.c, compile.h, debug.h, eval.c,
-	  eval_error.h, eval_jump.h, eval_load.c, eval_thread.c, gc.c,
-	  insnhelper.h, insns.def, iseq.c, main.c, numeric.c, parse.y,
-	  range.c, ruby.h, signal.c, thread.c, thread_win32.ci, vm.c,
-	  vm.h, vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
-	  fixed indents and non-C90 comments.
-
-	* regenc.h: revert to before YARV.
-
-	* lib/mkmf.rb (create_makefile): make object files depend on
-	  extconf.h even if depend file exists.
-
-Fri Feb  2 23:39:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* common.mk (bin): add more dependency.  a patch from Tadashi
-	  Saito <shiba at mail2.accsnet.ne.jp>.  [ruby-dev:30245]
-
-Fri Feb  2 18:44:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* insns.def (setclassvariable): remove warn argument.
-
-Fri Feb  2 18:36:40 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* common.mk (compile.$(OBJEXT)): add config.h to vm.c and
-	  compile.c.
-
-Fri Feb  2 18:27:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: remove duplicated global variables rb_cProc and
-	  rb_cBinding.  [ruby-dev:30242]
-
-Fri Feb  2 00:13:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (SYMBOL_P): make Symbol immediate again for performance.
-
-	* string.c: redesign symbol methods.
-
-Thu Feb  1 23:25:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_id2str): store Strings for operator symbols.
-	  [ruby-dev:30235]
-
-Thu Feb  1 21:04:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assignable_gen): no need to generate NODE_CVDECL.
-
-	* compile.c (iseq_compile_each): no NODE_CVDECL.
-
-Thu Feb  1 20:53:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* vm.c (eval_get_cvar_base): destination for class variable access
-	  is now strictly innermost surrounding class or module.  warned
-	  if accessed from toplevel.
-
-	* variable.c (rb_cvar_get): new class variable look-up scheme:
-	  1) look up in the class.  2) if the class is singleton attached
-	  to a class (i.e. metaclass) then start look up in the attached
-	  class and its ancestors. 3) otherwise, look-up in ancestors of
-	  the class.
-
-	* eval.c (cvar_cbase): destination for class variable access is
-	  the class/module that holds the method, or cbase outside of
-	  methods.
-
-Thu Feb  1 20:31:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_set): remove warn argument.
-
 Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* eval.c (rb_iterate): need to PUSH_ITER in proper order.
+	  [ruby-core:10125]
+
 	* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
 	  add new test.  [ruby-core:10125]
 
-Tue Jan 30 17:01:21 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 30 14:58:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* 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)
 
-Tue Jan 30 13:24:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_pred): add Integer#pred corresponding
-	  Integer#succ.  [RCR#5]
-
 Tue Jan 30 12:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
 
-Mon Jan 29 23:52:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* tool/compile.rb: replace YARVCore by VM class.
-
-Mon Jan 29 17:52:44 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/date/format.rb (Date::Format::Bag::method_missing): add
-	  prefix to avoid making t class-local instance variable.
-
-Mon Jan 29 21:32:37 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE.locale=, WIN32OLE.locale,
-	  WIN32OLE_VARIANT#vartype.
-
-	* test/win32ole/test_win32ole.rb: add test for WIN32OLE.locale=,
-	  WIN32OLE.locale.
-
-	* test/win32ole/test_win32ole_variant.rb: add test for
-	  WIN32OLE_VARIANT#vartype.
+Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Jan 29 14:14:35 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (dyna_var_lookup): should not alter dvar->val not to
+	  destroy living value.  [ruby-core:10076]
 
-	* tool/parse.rb: replace YARVCore by VM class.
-	  http://d.hatena.ne.jp/ysano2005/20070128
-
-Sun Jan 28 08:41:49 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: refactoring.
-
-Sat Jan 27 18:36:33 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata): bug fix.
-	  WIN32OLE_VARIANT.new check that 1st argument should T_ARRAY
-	  when variant type is VT_ARRAY.
-
-	* test/win32ole/test_win32ole_variant.rb: add some test.
-
-Fri Jan 26 23:55:56 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: bug fix of WIN32OLE_VARIANT when variant
-	  type is VT_BYREF|VT_VARIANT.
-
-	* test/win32ole/test_win32ole_variant_with_ie.rb: ditto.
+	* parse.y (dyna_init): ditto.
 
 Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -22315,195 +5025,62 @@ Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/scrollable.rb: change primary name of modules
 	  [ruby-dev:30080].
 
-Fri Jan 26 07:48:57 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_init_copy): need to copy internal
-	  structure on clone and dup.  [ruby-dev:30192]
-
-Wed Jan 24 20:34:51 2007  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/ruby/test_iterator.rb: removed a needless workaround.
-
 Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
 	  regexp font-lock bug.  [ruby-talk:235758]
 
+Tue Jan 23 11:02:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
+
 Tue Jan 23 18:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
 	  of ===.  [ruby-dev:30176]
 
-Tue Jan 23 15:39:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 23 10:48:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
-	  setup.mak}: add --with-baseruby configure option.
+	* hash.c: added documentation for Hash about how it uses eql? and
+	  hash methods for the keys.  [ruby-core:09995]
 
 Mon Jan 22 14:57:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: fix errors in socket sample code.
 	  [ruby-core:09992]
 
-Sat Jan 20 21:05:18 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_s_set_code_page): WIN32OLE.codepage=
-	  accepts installed codepage.
-
-	* test/win32ole/test_win32ole.rb (test_s_codepage_changed): ditto.
-
-Sat Jan 20 11:18:49 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke, ole_invoke2, ole_propertyput):
-	  modify WIN32OLERuntimeError message.
-
-	* test/win32ole/test_win32ole.rb: ditto.
-
-Sat Jan 20 06:45:21 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval_proc.c (method_receiver): add new method to get the bound
-	  receiver of the method object.  [ruby-talk:234949]
-
-	* eval_proc.c (method_name): new method to get the name of a
-	  method.
-
-	* eval_proc.c (method_owner): a new method to get the class or
-	  module that defines the method.
-
-Fri Jan 19 17:12:23 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_VARIANT::Empty,
-	  WIN32OLE_VARIANT::Null, WIN32OLE_VARIANT::Nothing.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-	* test/win32ole/test_nil2vtempty.rb(test_openSchema): ditto.
-
-Fri Jan 19 06:53:38 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (olevariant_free): fix memory leak.
-
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata):
-	  WIN32OLE_VARIANT.new accepts nil as first argument for some VARIANT
-	  TYPE.
-
-	* test/win32ole/test_win32ole_variant.rb: ditto.
-
-Wed Jan 17 17:31:28 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* some refactoring around yarvcore and proc.
-
-	* eval_proc.c: renamed to proc.c.
-
-	* common.mk: ditto.
-
-	* yarvcore.h, yarvcore.c: rename or remove some global variables
-	  removed: mYarvCore, mYarvInsns
-	  renamed: cYarvISeq -> rb_cISeq,
-	           cYarvProc -> rb_cProc, cYarvBinding -> rb_cBinding
-	  ::YarvCore module is removed and ::YarvCore::VM class becomes ::VM.
-	  And change/remove some functions which added with YARV.
-
-	* compile.c: ditto.
-
-	* eval.c: ditto.
-
-	* iseq.c: ditto.
-
-	* vm.c: ditto.
-
-	* inits.c: rename Init_yarvcore to Init_vm.
-
-	* yarvcore.c, proc.c: move some functions and initialization
-	  from yarvcore.c to proc.c.
-
-	* intern.h, proc.c: add global function rb_binding_new(void).
-
-Tue Jan 16 17:49:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (eval_search_super_klass): rename to search_super_klass() and
-	  use it by th_call_super().
-
-	* insns.def: ditto.
-
-Tue Jan 16 17:48:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: fix ruby script path.
-
-Tue Jan 16 17:39:44 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block): fix to specify self.
-
-Tue Jan 16 12:12:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* env.h: removed
-
-Tue Jan 16 12:00:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_proc.c (rb_proc_new): added.
-
-	* string.c (sym_to_proc): supported.
-
-	* vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
-	  rb_proc_new.
-
-	* yarvcore.c: add a test code.
-
-Sat Jan 13 23:24:59 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Jan 13 23:54:48 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_free, ole_type_free,
 	  olemethod_free, olevariable_free, oleparam_free,
 	  ole_event_free): fix memory leak.  [ruby-core:09846]
 
-Wed Jan 10 00:10:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_replace): use ptr and len of orig instead of
-	  shared.  fixed: [ruby-dev:30116]
-
-Tue Jan  9 17:48:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_find_file): should not call fpath_check() with NULL.
-	  fixed: [ruby-core:09867]
-
-Tue Jan  9 12:29:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 12 11:13:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
-	  convert uid/gid from VALUE.
-
-	* ext/etc/etc.c (etc_getpwuid): ditto.
-
-Tue Jan  9 03:54:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_upto): String#upto from empty string makes
-	  infinite loop.  [ruby-core:09864]
-
-	* string.c (rb_str_upto): use RSTRING_LEN().
+	  convert uid/gid from VALUE. (backport of r11521)
 
-Sun Jan  7 18:36:05 2007  Koichi Sasada  <ko1@atdot.net>
+Wed Jan 10 18:57:57 2007  Minero Aoki  <aamine@loveruby.net>
 
-	* thread.c (rb_thread_stop_timer_thread(), rb_thread_reset_timer_thread(),
-	  rb_thread_start_timer_thread()): added.
+	* ext/strscan/strscan.c (strscan_do_scan): should set kcode option
+	  before match. [ruby-dev:29914]
 
-	* thread_pthread.ci: add a native_thread_join() and move
-	  rb_thread_reset_timer_thread() definition to thread.c.
+	* test/strscan/test_stringscanner.rb: test it.
 
-	* thread_win32.ci: ditto
+	* re.c: export kcode_set_option and kcode_reset_option (with "rb_"
+	  prefix).
 
-	* process.c: fix before_exec(), after_exec() to stop timer thread
-	  (and restart timer thread if exec failed).  and fix to reset
-	  timer thread information when forked child process starts
-	  (to fix [ruby-core:09822]).
-
-Sun Jan  7 18:28:17 2007  Koichi Sasada  <ko1@atdot.net>
+	* intern.h: ditto.
 
-	* common.mk: add a "compare" rule and fix MATZRUBY variable
+Tue Jan  9 17:45:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sun Jan  7 17:47:16 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* file.c (rb_find_file): should not call fpath_check() with NULL.
+	  fixed: [ruby-core:09867]
 
-	* test/win32ole/test_win32ole.rb: add test for WIN32OLE#[],
-	  WIN32OLE#[]=.
+Tue Jan  9 03:54:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c: update comment for rdoc of
-	  WIN32OLE#[] and WIN32OLE#[]=.
+	* string.c (rb_str_upto): String#upto from empty string makes
+	  inifinite loop.  [ruby-core:09864]
 
 Sun Jan  7 12:13:26 2007  Eric Hodel  <drbrain@segment7.net>
 
@@ -22518,217 +5095,14 @@ Sun Jan  7 10:32:12 2007  Eric Hodel  <drbrain@segment7.net>
 	* test/rdoc/parsers/test_parse_c.rb:
 	  Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
 
-Sun Jan  7 09:31:18 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Jan  7 09:33:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: updated based on date2 4.0.1.
 
-Sat Jan  6 18:46:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline_fast, rb_io_getline): increase lineno
-	  when met the delimiter or EOF.  fixed: [ruby-dev:30081]
-
-	* io.c (prepare_getline_args, rb_io_getline_1): split
-	  preparation of arguments and reading.  [ruby-dev:30085]
-
-Sat Jan  6 13:48:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (send): fix to optimize send() with Symbol.
-
-	* yarvtest/test_method.rb: add another test.
-
-Sat Jan  6 13:43:55 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: add PHONY dependency to some rules
-
-Sat Jan  6 11:50:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_read): fix wrong replacement.  [ruby-dev:30070]
-
-Sat Jan  6 09:10:52 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: support direct method dispatch with "send" or "funcall".
-	  This means that "obj.send :m" skips "BasicObject#send" invocation
-	  (method frame creation, etc) and "obj.m" invokes directly.
-	  If you make backtrace, there are no entries of "send" method.
-
-	* compile.c (iseq_specialized_instruction): fix to support above
-
-	* eval.c: ditto (remove "static" from rb_f_send and rb_f_funcall
-
-	* yarvcore.c: ditto (add a external IDs for compiler)
-
-	* yarvcore.h: ditto (add a VM_CALL_SEND_BIT macro)
-
-	* yarvtest/test_method.rb: add tests for above changes
-
-	* eval.c: remove unused "Kernel#send" declaration
-
-Sat Jan  6 08:29:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (Init_win32ole): add
-	  WIN32OLE::VARIANT::VT_EMPTY, WIN32OLE::VARIANT::VT_NULL
-
-	* test/win32ole/test_win32ole_variant_m.rb (test_variant): ditto.
-
-Sat Jan  6 03:49:22 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb: change option format
-
-	* common.mk: ditto
-
-Fri Jan  5 22:21:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_pentomino.rb: use Array#dup instead of
-	  Array#clone
-
-	* benchmark/bmx_temp.rb: removed
-
-	* benchmark/run.rb: use run.rb instead of run_rite.rb
-
-	* common.mk: ditto
-
-	* benchmark/run_rite.rb: removed
-
-	* common.mk: use $(srcdir)/test.rb to run a test program
-	  with "make run"
-
-	* benchmark/bmx_temp.rb: removed and
-	  set svn:ignore (bmx_*.rb) to benchmark/
-
-	* test.rb: set svn:ignore
-
-Fri Jan  5 21:03:08 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvtest/yarvtest.rb: fix to compare results
-
-Fri Jan  5 20:52:56 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h: add ADD_CALL_RECEIVER() macro.
-
-	* insns.def (send): use GET_SELF() direct if FCALL.
-
-	* eval.c (rb_f_send): check method dispatch type to permit
-	  invoking private method when dispatch type is FCALL/VCALL
-
-	* insns.def (opt_ltlt): remove useless statement.
-
-	* vm.h: remove unused macros.
-
-Fri Jan  5 20:50:31 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run_rite.rb: fix to use readlines instead of
-	  read(...).lines (because 1.8 doesn't have String#lines).
-
-Fri Jan  5 20:28:19 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_win32.ci (rb_thread_reset_timer_thread):
-	  added ([ruby-dev:30086]).
-
-Fri Jan  5 20:20:36 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: add .SUFFIXES rule
-
-Fri Jan  5 15:58:15 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h (rb_alias): fix to check search result
-
-Fri Jan  5 13:59:53 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h (rb_add_method): fix to check old_node
-
-Fri Jan  5 12:03:07 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each, set_block_local_tbl):
-	  support NODE_LAMBDA (partly).
-
-	* sample/test.rb: restore test of NODE_LAMBDA
-
-	* test/ruby/test_lambda.rb: ditto
-
-Fri Jan  5 12:31:23 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* thread_pthread.ci (native_sleep): fix tv_nsec overflow.
-
-Thu Jan  4 20:01:29 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: rename yarv-test-[all/each] to compare-test[/-each].
-	  purpose of "compare-test" rule is to compare ruby (trunk) and
-	  matzruby (branches/matzruby) binary in miniruby level.  MATZRUBY
-	  parameter means an path to miniruby of matzruby binary.  to do this
-	  comparison test, you should build matzruby branch.
-
-	* yarvtest/yarvtest.rb: fix to use command line option as
-	  command names to be compared.
-
-	* yarvtest/runner.rb: remove a debug output.
-
-Thu Jan  4 19:12:27 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: fix to use test.rb script in build directory.
-	  ($(srcdir)/test.rb -> test.rb)
-
-Thu Jan  4 17:28:05 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
-	  Arrays could not be modified in its each block. [ruby-dev:30063]
-
-Thu Jan  4 16:57:14 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv_version.h: removed.
-
-	* common.mk: remove yarv_version.h from rules
-
-	* yarvcore.h (Init_yarvcore): remove useless constants
-
-Thu Jan  4 17:00:06 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (Init_ossl_asn1):
-	  OpenSSL::ASN1::ASN1Data#value,#tag,#tag_class and
-	  OpenSSL::ASN1::BitString#unused_bits should be public.
-
-Thu Jan  4 13:45:10 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.ci: fix last changes around PTHREAD_STACK_MIN.
-
-Thu Jan  4 13:42:47 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: restore changes.
-
-Thu Jan  4 10:33:54 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.ci: fix to skip using PTHREAD_STACK_MIN.
-	  [ruby-dev:30063]
-
-Thu Jan  4 10:30:11 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run_rite.rb (bm): fix to use lines.
-
-Wed Jan  3 18:49:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_getline): lineno update condition was wrong.
-	  [ruby-dev:30065]
-
-	* io.c (rb_io_getline_fast): ditto.
-
 Wed Jan  3 11:36:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (ruby_dup): start GC on ENOMEM as well.
 
-Tue Jan  2 10:29:54 2007  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c: fix to compile on YARV
-	  ruby_errinfo -> rb_errinfo()
-
-Mon Jan  1 08:07:06 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/tk/tcltklib.c: fix to compile on YARV
-	  ruby_errinfo -> rb_errinfo(),
-	  ruby_safe_level -> rb_safe_level().
-
-Mon Jan  1 07:57:17 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* test/drb/test_drbssl.rb: fix to skip drb tests.
-
 Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible.  Update constant
@@ -22741,109 +5115,16 @@ Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
 
 Mon Jan  1 06:05:55 2007  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
 	  Allow RDoc comment to give friendly value for rb_define_const.  Patch
 	  by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants): Fix
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
 	  whitespace handling in constant comments.
 
-Mon Jan  1 00:00:00 2007  Koichi Sasada  <ko1@atdot.net>
-
-	* Merge YARV
-
-Sun Dec 31 16:22:48 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* array.c: Fix Array#reject.
-
-Sun Dec 31 00:46:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date2.rb: removed.
-
-Sun Dec 31 00:15:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Dec 31 00:31:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
 
-Sat Dec 30 04:38:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_each_with_index): reuse array for yield parameters.
-
-	* enum.c (enum_min, enum_max): ditto.
-
-Sat Dec 30 04:25:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_inject): reuse array for yield parameters.
-
-Sat Dec 30 02:54:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_gets): accepts limit argument.
-
-	* ext/stringio/stringio.c (strio_readline, strio_each,
-	  strio_readlines): ditto.
-
-Sat Dec 30 02:22:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): add limit capability.
-
-	* io.c (rb_io_gets_m): accepts limit argument.  [ruby-talk:231563]
-
-	* io.c (rb_io_readline, rb_io_readlines, rb_io_each_line, argf_getline):
-	  ditto.
-
-	* io.c (appendline): add limit capability.
-
-	* io.c (rb_io_getline_fast, rb_io_getline): ditto.
-
-	* io.c (rb_io_getline): small refactoring for DRY.
-
-	* io.c (rb_io_s_foreach, rb_io_s_readlines): small refactoring.
-
-Thu Dec 28 15:27:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie::initialize): use Array() again.
-	  [ruby-core:09781]
-
-Wed Dec 27 20:52:32 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: remove WIN32OLE::PROPERTY class.
-
-	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Wed Dec 27 10:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_Array): returns 1-element array if the argument
-	  does not have to_ary nor to_a.
-
-Tue Dec 26 21:02:14 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_folderitem2_invokeverb.rb: The argument
-	  of Shell.NameSpace should not be file path.
-
-Tue Dec 26 06:13:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/bigdecimal/bigdecimal.c: remove useless method
-	  BigDecimal#!=. [ruby-dev:30050]
-
-Thu Dec 21 15:37:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_slice_bang): rdoc description bug fixed.
-	  [ruby-core:09754]
-
-Wed Dec 20 12:54:31 2006  Koichi Sasada  <ko1@atdot.net>
-
-	* Convert CVS repository to Subversion repository.
-
-Mon Dec 18 08:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie::initialize): Array(string) no longer
-	  works.  [ruby-core:09738]
-
-Fri Dec 15 00:19:53 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (COMPILE_RULES): latter rule has higher priority.
-
-	* lib/mkmf.rb (create_makefile): remove static library before update,
-	  to get rid of sludge of Borland tlib.exe.
-
 Thu Dec 14 18:29:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/readline/readline.c: NetBSD editline does not have
@@ -22856,11 +5137,7 @@ Thu Dec 14 18:20:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/irb/locale.rb (IRB::Locale::puts): typo fixed.  a patch from
 	  NAKAMURA Usaku <usa@ruby-lang.org>.  [ruby-dev:30012]
 
-Tue Dec 12 23:33:53 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures.
-
-Mon Dec 11 11:51:10 2006  Akinori MUSHA  <knu@iDaemons.org>
+Mon Dec 11 11:58:36 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
 	  the superfluous subdirectory digest/.
@@ -22881,132 +5158,83 @@ Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/locale.rb (IRB::Locale::search_file): use File.exist?
+	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
 	  instead of File.exists?.  a patch from Yutaka Kanemoto
 	  <kinpoco at gmail.com> in [ruby-dev:30000].
 
-Fri Dec  8 18:11:18 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/optparse.rb: cannot put :nodoc: before method definition.
-	  put after it.
-
-Fri Dec  8 17:00:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bin/rdoc: use File.exist? instead of File.exists?.
-
-Thu Dec  7 23:50:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): new method Dir.exist?(path).
-	  [ruby-core:09663]
-
-	* file.c (Init_File): remove File.exists?; use File.exist?
-	  instead.
-
-	* file.c: rename functions to test_* to rb_file_*_p.
-
 Thu Dec  7 09:29:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/weakref.rb (WeakRef::__setobj__): should support
 	  marshaling.  [ruby-talk:228508]
 
-Wed Dec  6 23:58:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/delegate.rb (Delegator::marshal_load): need to call
+	  __setobj__.
+
+Wed Dec  6 23:56:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.mk (NULLCMD): moved for platforms that empty
 	  command does not run.  fixed: [ruby-dev:29994]
 
-	* win32/win32.c (init_stdhandle): redirect unopened IOs to NUL.
-	  [ruby-core:09572]
-
-Tue Dec  5 19:01:42 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Dec  6 17:17:26 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* configure.in (SITE_DIR): fixed to empty RUBY_SITE_LIB in config.h on
+	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
 	  NetBSD.  fixed: [ruby-dev:29358]
 
-Tue Dec  5 18:38:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/matrix.rb (Matrix::rank): use quo method to avoid integer
-	  division problem.  [ruby-core:09644]
-
-	* lib/matrix.rb (Matrix::rank_e): ditto.
-
 Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
 	  self assignment operator, not regex.  [ruby-talk:227324]
 
-Tue Dec  5 00:19:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, object.c, variable.c (rb_mod_constants): added an optional
-	  flag to search ancestors, which is defaulted to true, as well as
-	  const_defined? and const_get.  [ruby-dev:29989]
-
-Mon Dec  4 23:49:28 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (install_recursive): get rid of warning.
-
-	* lib/optparse.rb (CompletingHash#match): get rid of splat failure.
-
-Mon Dec  4 19:16:39 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb: Do alias << update.
-
 Mon Dec  4 10:48:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
 	  sizeof(off_t).
 
-Mon Dec  4 08:32:25 2006  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
-	  boundary. JVN#84798830
-
-Sun Dec  3 16:16:53 2006  Akinori MUSHA  <knu@iDaemons.org>
+Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/digest/lib/digest/hmac.rb: Fix problems with update
-	  timing. [Reported by: oss-ruby@technorama.net]
+	* parse.y (dyna_init_gen): dvar initialization only if dvar is
+	  assigned inner block.  [ruby-talk:227402]
 
-Sat Dec  2 07:33:53 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec  4 08:32:49 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::FormData::<<):
-	  HTTPUtils::parse_header() takes a string.  [ruby-dev:29931]
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header):
-	  String does no longer have each method.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_form_data):
-	  ditto.
+	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
+	  boundary. JVN#84798830
 
 Sat Dec  2 07:09:04 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
 	  subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
 
+Fri Dec  1 17:01:49 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
+	  merge from trunk.
+
 Fri Dec  1 16:31:53 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
 	  [ruby-talk: 227408]
 
-Tue Nov 28 17:25:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (ary_iter_check): should check modification (size
-	  change) during iteration.
-
-	* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
-	  rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
-	  rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
-	  rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
-	  rb_ary_shuffle): add iteration check.
+Mon Nov 27 17:18:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov 27 09:00:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_ord): typo fixed.  reported from Kornelius
-	  Kalnbach <murphy@rubychan.de>.  [ruby-core:09621]
+	* sprintf.c (rb_f_sprintf): need not to truncate string if no
+	  width specifier given for %s.  [ruby-dev:29952]
 
 Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* version.h: addition of RUBY_PATCHLEVEL.
 	* version.c: ditto.
 
+Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
+	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
+
+Thu Nov 23 10:38:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_mod_define_method): set implicit visibility only when
+	  it's called for the target class (ruby_cbase).
+
 Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/extconf.rb: support --with-X11/--without-X11 option.
@@ -23017,57 +5245,28 @@ Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/tkutil/extconf.rb: able to be called manually
 	  [ruby-talk:225950].
 
-Sat Nov 18 23:39:20 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_tap): a new method.  [ruby-talk:224013]
-
 Wed Nov 15 23:22:54 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (test_grpowned, rb_stat_grpowned): should honor
 	  supplementary group IDs.  [ruby-core:09546]
 
-Tue Nov  7 18:35:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov  9 03:15:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (formal_assign): need to pack rest arg information in
-	  argc.
+	* eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
+	  ITER_PRE.
 
-Tue Nov  7 18:05:01 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/itemconfig.rb: minor bug fix.
+Tue Nov  7 18:34:34 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Nov  7 17:52:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
+	  until we reach a consensus that HMAC should be put under Digest.
 
-	* class.c (rb_include_module): revert duplicate inclusion of
-	  modules.  [ruby-dev:29793]
-
-Tue Nov  7 17:18:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_missing): update old argument adjustment.
-
-Tue Nov  7 16:41:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (when_check): need to splat for NODE_ARGSCAT as well.
-	  [ruby-dev:29860]
-
-Mon Nov  6 22:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (Init_String): remove duplicated definition of
-	  Symbol#to_s.
-
-Mon Nov  6 18:54:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): need to splat but no error.
-
-	* eval.c: new macros - YIELD_CALL, YIELD_VALUES.
-
-	* eval.c (rb_yield_values): specify YIELD_VALUES.
+Tue Nov  7 18:05:01 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* eval.c (rb_yield_0): use new macros.
+	* ext/tk/lib/tk/itemconfig.rb: minor bug fix.
 
-	* eval.c (proc_invoke): slightly modified to separate YIELD_CALL
-	  and YIELD_VALUES from YIELD_ARY_ARGS.
+Mon Nov  6 20:11:20 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* object.c (Init_Object): add nil.to_splat => [].
+	* lib/rss/0.9.rb (RSS::Rss): removed needless include.
 
 Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -23075,9 +5274,9 @@ Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  fix on 'itemconfiginfo' method, and modify to make it easy to
 	  override 'itemconfiginfo' method.
 
-	* ext/tk/lib/tkextlib/tile/treeview.rb: support Tile 0.7.8.
+	* ext/tk/lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
 
-	* ext/tk/lib/tkextlib/version.rb: [new] add Tk::Tkextlib_RELEASE_DATE
+	* ext/tk/lib/tkextlib/version.rb : [new] add Tk::Tkextlib_RELEASE_DATE
 	  to get the information from scripts.
 
 	* ext/tk/lib/tk.rb: load 'tkextlib/version.rb', and update RELEASE_DATE
@@ -23094,17 +5293,14 @@ Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  real console. IRB works on a text widget without I/O blocking. That
 	  is, thread switching on IRB will work properly, even if on Windows.
 
-Mon Nov  6 00:42:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg_dup_check): vid may be nameless internal id.
-
-Sun Nov  5 19:52:19 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Nov  5 19:53:49 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: updated based on date2 3.9.7.
 
-Sat Nov  4 13:09:31 2006  Shugo Maeda  <shugo@ruby-lang.org>
+Sat Nov  4 13:13:57 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
+	  (backported from HEAD)
 
 Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -23112,49 +5308,17 @@ Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  for AIX.  a patch from Yutaka Kanemoto <kinpoco AT gmail.com>.
 	  [ruby-dev:29744]
 
-Thu Nov  2 14:19:44 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#^): Fix XOR operation against a container that
-	  holds duplicate values. [ruby-core:9372]
-
-Thu Nov  2 10:00:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c: class Symbol is no longer subclass of String. also
-	  covers [ruby-core:09366]
-
-Thu Nov  2 08:21:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
-	  come earlier than String.
-
-	* lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap):
-	  ditto.
-
-	* lib/set.rb (TC_Set::test_s_new): strings are no longer
-	  Enumerable
-
-	* lib/soap/property.rb (Property::load): ditto.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto.
-
-	* lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto.
+Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Nov  2 09:08:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (primary): should set NODE even when compstmt is NULL.
+	  merge from trunk. fixed: [ruby-dev:29732]
 
-	* array.c: revert lfree shift/unshift boost patch to avoid unknown
-	  memory error.
+Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Nov  1 23:24:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (struct RArray): revert embedding ptr in RVALUE.
-
-	* array.c: ditto.
-
-Wed Nov  1 23:01:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (hash): use Bob Jenkins' hash algorithm.
+	* lib/set.rb (Set#^): Fix XOR operation against a container that
+	  holds duplicate values. [issue: #6444]
 
-Wed Nov  1 02:22:31 2006  Akinori MUSHA  <knu@iDaemons.org>
+Wed Nov  1 02:41:38 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
 	  optimization.
@@ -23167,6 +5331,8 @@ Wed Nov  1 01:05:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
 	  fixed: [ruby-list:42928]
 
+	* test/ruby/test_super.rb: add tests to check above bug.
+
 Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_dup): duplicate the class of original time.
@@ -23175,11 +5341,6 @@ Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
 	  should respect subclasses.  [ruby-core:09357]
 
-Tue Oct 31 16:25:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (ary_shared_first): should address offset after
-	  ary_shared_array().  [ruby-core:09358]
-
 Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in (miniruby): add XLDFLAGS.
@@ -23191,7 +5352,7 @@ Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
 	  rb_w32_get_environ): not to use GC before initialization.
 
-Mon Oct 30 19:28:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 30 19:29:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* bignum.c (rb_big2str0): use better approximation.
 
@@ -23204,96 +5365,62 @@ Mon Oct 30 12:34:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_eval): fix commit miss.  [ruby-dev:29707]
 
+Mon Oct 30 12:20:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big2str0): a bug in length adjustment.
+
 Mon Oct 30 11:15:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): should preserve leading zero
 	  information for negative %b and %x.  [ruby-talk:221347]
 
-Sun Oct 29 19:51:31 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* regexec.c: invalid offset value was used in STATE_CHECK_BUFF_INIT().
-
-Sat Oct 28 20:13:18 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* oniguruma.h: Version 4.4.5
-
-	* regint.h: ditto.
-
-	* regerror.c: ditto.
-
-	* regexec.c: ditto.
-
-	* regcomp.c ditto.
-
-	* regparse.c ditto.
-
-Sat Oct 28 07:56:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object0): missing break.  [ruby-core:09345]
-
-Fri Oct 27 17:30:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enum_each_cons): move RETURN_ENUMERATOR() after
-	  argument check.
-
-Thu Oct 26 21:05:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Oct 26 21:05:58 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
 	  (fix http://bugs.debian.org/394336)
 
 	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
 
-Thu Oct 26 15:23:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c: remove by_slice and by_cons.
-
-Thu Oct 26 15:12:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 26 15:21:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/digest/digest.c (Init_digest): typo.
 
-Wed Oct 25 17:16:05 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* test/digest/test_digest_hmac.rb: added.
-
-Wed Oct 25 16:34:31 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/test.sh: make this script work again.
-
-Wed Oct 25 07:59:42 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Oct 25 17:23:28 2006  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest, test/digest/test_digest.rb: Merge from trunk:
+	  - Introduce versioning in Digest::Base API, and prefix C
+	    constants with RUBY_ and C type names with rb_ to avoid name
+	    clash in writing extensions.
+	  - Introduce Digest::Class and Digest::Instance for ease of
+	    implementing subclasses and add-ons.
+	  - Digest::Instance module requires and assumes that any instance
+	    be resettable and clonable.  An instance method #new() is
+	    added so digest instances work just like digest classes.
+	  - The constructor does no longer take an initial string to feed;
+	    digest() and hexdigest() now do, instead.  This allows digest
+	    classes to take their own hashing parameters.
+	  - Make some changes to digest() and hexdigest() class methods,
+	    which now take extra arguments, which are passed through to
+	    the constructor in an internal call.
+	  - Add #digest_length/size/length() and #block_length(),
+	  - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
+	    SHA384 and SHA512, hoping this module would make a decent
+	    example of a digest subclass written in Ruby.
+	  - Rip BubbleBabble support out of the base class and have a
+	    separate module named digest/bubblebabble.
+	  - Remove RD documents in favor of newly written and embedded
+	    RDoc documentation.
+
+Wed Oct 25 08:03:23 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb: updated based on date2 3.9.6.
 	  [ruby-core:09323]
 
-Wed Oct 25 00:58:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/mkexports.rb, win32/resource.rb: use unique variable names.
-
-Tue Oct 24 19:18:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_by_slice): new method added.
-
-	* enumerator.c (enumerator_by_cons): ditto.
-
-Tue Oct 24 18:56:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enum_each_slice, enum_each_cons): returns
-	  Enumerable::Enumerator if no block is given.  [ruby-dev:29246]
-
-	* enumerator.c: remove methods: enum_with_index, enum_slice,
-	  enum_cons.  [ruby-dev:29246]
-
-Tue Oct 24 18:51:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_zip): add RETURN_ENUMERATOR() to zip method.
-
-Mon Oct 23 04:30:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_object0): use return value from proc given as the
-	  second argument to Marshal#load() to allow value replacement in
-	  the restoring data.
-
 Sun Oct 22 14:48:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
+	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+
 	* signal.c (Init_signal): avoid duplicated installation of SIGCHLD
 	  handler.
 
@@ -23302,57 +5429,14 @@ Sun Oct 22 16:47:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_substr): should be infected with only original
 	  string, but not the shared string.  fixed: [ruby-core:09152]
 
-	* string.c (rb_str_new4): keep shared string untainted when original
+	* string.c (rb_str_new4): keep shared string untainted when orignal
 	  string is tainted.  fixed: [ruby-dev:29672]
 
-Sun Oct 22 07:55:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_upcase, rb_str_downcase, rb_str_downcase,
-	  rb_str_upcase_bang, rb_str_downcase_bang, rb_str_swapcase_bang):
-	  add RDoc description that case conversion to be effective only
-	  in ASCII region.
-
 Sun Oct 22 05:20:34 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
 	* configure.in: alloca is broken; use C_ALLOCA instead.
 	  [ruby-dev:29416]
 
-Sat Oct 21 17:50:40 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest.rb: Follow the framework updates.
-
-Fri Oct 20 22:00:43 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb: Complete half-boiled updates.
-
-	* ext/digest/sha2/lib/digest/sha2.rb: Fix #initialize_clone().
-
-Fri Oct 20 20:28:37 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest: Prefix C constants with RUBY_ and C type names with
-	  rb_ to avoid name clash in writing extensions.
-
-	* ext/digest: Introduce Digest::Class and Digest::Instance for
-	  ease of implementing subclasses and add-ons, inspired by
-	  gotoyuzo.
-
-	* ext/digest: The Digest::Instance module now requires and assumes
-	  that any instance be resettable and clonable, and add some
-	  convenient instance methods such as "new()", for creating a new
-	  copy, parameter taking "digest()" and "hexdigest()", for instant
-	  calculation.  These methods make digest instances work just like
-	  digest classes.
-
-	* ext/digest/sha2/lib/digest/sha2.rb:
-	  Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
-	  SHA384 and SHA512, hoping this module would make a decent
-	  example of a digest subclass written in Ruby.
-
-	* ext/digest/lib/digest.rb: Adjust autoload entries for SHA2
-	  classes.
-
-	* ext/digest/lib/digest/hmac.rb: Follow the framework updates.
-
 Fri Oct 20 10:47:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
@@ -23379,39 +5463,10 @@ Wed Oct 18 23:02:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
 	  [ruby-talk:219248]
 
-Wed Oct 18 13:25:50 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_each_line): String#lines now works when a block
-	  is given.  in other words, lines become an alias to each_line.
-	  [ruby-core:09218]
-
-	* string.c (rb_str_each_byte): ditto for bytes in place of lines.
-
 Wed Oct 18 00:55:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_yylex): use particular enums.  [ruby-core:09221]
 
-Tue Oct 17 22:03:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/erb.rb: String#each was removed, use #each_line instead.
-
-Tue Oct 17 12:27:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (ary_shared_array): should set NOEMBED flag for a copied
-	  array.
-
-Tue Oct 17 08:04:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_lines): now takes optional argument for the
-	  line separator.
-
-	* io.c (rb_io_lines, rb_io_bytes): new methods.
-
-Mon Oct 16 23:33:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_unshift_m): a bug in lfree shift length
-	  calculation.
-
 Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: *OBJS are not needed for extension libraries.
@@ -23419,11 +5474,6 @@ Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
 	  missing comma.
 
-Mon Oct 16 00:44:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): execute block if given with unpacked value
-	  instead of creating an array.  an idea from Tim Bray.
-
 Sun Oct 15 01:03:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
@@ -23443,49 +5493,16 @@ Sat Oct 14 23:25:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  contain format specifiers.  a patch from Akinori MUSHA <knu at
 	  iDaemons.org>.  [ruby-dev:29657]
 
-	* regparse.c (onig_rb_warning, onig_rb_warn): ditto.
-
 	* ext/bigdecimal/bigdecimal.c (VpException): ditto.
 
 	* ext/dl/handle.c (rb_dlhandle_initialize): ditto.
 
 	* ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
 
-Sat Oct 14 08:15:42 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c, ext/digest/digest.h,
-	  ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
-	  ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c:
-	  Introduce API versioning.
-
-	* ext/digest/digest.c, ext/digest/digest.h,
-	  ext/digest/md5/md5init.c, ext/digest/rmd160/rmd160init.c,
-	  ext/digest/sha1/sha1init.c, ext/digest/sha2/sha2init.c: Remove
-	  the constants DIGEST_LENGTH and BLOCK_LENGTH and turn them into
-	  instance methods digest_length() and block_length().  Class
-	  methods with the same names are also provided, which take extra
-	  parameters for a digest method.
+Sat Oct 14 08:24:45 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest/lib/digest/hmac.rb: Completely redesign the somewhat
-	  bizarre API, now that Digest classes can take hashing
-	  parameters.
-
-Sat Oct 14 05:54:05 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c: Improve RDoc documentation further more.
-
-Sat Oct 14 04:33:33 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c: Improve RDoc documentation.
-
-	* ext/digest/digest.c (Init_digest, rb_digest_base_s_digest,
-	  rb_digest_base_s_hexdigest): Make Digest::Base::digest() and
-	  Digest::Base::hexdigest() take extra arguments, which are passed
-	  through to the constructor in an internal call.
-
-	* ext/digest/bubblebabble/bubblebabble.c
-	  (rb_digest_base_s_bubblebabble): Ditto for
-	  Digest::Base::bubblebabble().
+	* ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
+	  for now because the API is too premature for a stable branch.
 
 Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -23494,58 +5511,20 @@ Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* bcc32/configure.bat: get rid of a quirk of Borland make, which
 	  sets empty macro in command line to "1".
 
-Fri Oct 13 22:49:02 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Fri Oct 13 22:50:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: updated based on date2 3.9.5.
 
-Fri Oct 13 21:00:01 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest.rb (Digest): Try to auto-load non-standard
-	  digest modules when a specified digest class is missing.
+Fri Oct 13 22:33:28 2006  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/digest/lib/digest.rb: Define Digest(name) for ease of
-	  dynamically selecting a hashing algorithm.
-
-Fri Oct 13 20:53:37 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (Init_digest): Digest::Base.new() does no
-	  longer take an initial string to feed.  This change allows
-	  subclasses to take hashing parameters.  A statement such as
-	  ``md = Digest::MD5.new(s)'' can be easily rewritten as
-	  ``md = Digest::MD5.new << s'' or
-	  ``md = Digest::MD5.new.update(s)''.
-
-Fri Oct 13 20:51:55 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c, ext/digest/md5/md5init.c,
-	  ext/digest/rmd160/rmd160init.c, ext/digest/sha1/sha1init.c,
-	  ext/digest/sha2/sha2init.c: Add RDoc documentation.
-
-	* ext/digest/digest.txt, ext/digest/digest.txt.ja: Removed in
-	  favor of embedded RDoc documentation.
-
-Fri Oct 13 20:38:12 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/bubblebabble, ext/digest/digest.c: Rip BubbleBabble
-	  support out of the base class and have a separate module named
-	  digest/bubblebabble.
-
-Fri Oct 13 19:53:59 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_equal): Again, should call
-	  digest() of a subclass instead of the one defined in the base
-	  class.
+	* lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
+	  default in Ruby 1.8.  This line is wrongly removed in last commit.
 
 Fri Oct 13 18:19:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c: Class#inherited RDoc added.  a patch from Daniel
 	  Berger <djberg96 at gmail.com>  [ruby-core:08942]
 
-Fri Oct 13 02:42:00 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_equal): Should call digest()
-	  of a subclass instead of the one defined in the base class.
-
 Fri Oct 13 02:30:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
@@ -23562,13 +5541,6 @@ Fri Oct 13 01:48:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/date.rb (Date::self.complete_hash): need to check if g is
 	  nil before dereference.  [ruby-core:09116]
 
-Fri Oct 13 01:05:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_partition): RDoc update.  a patch from
-	  Mauricio Fernandez <mfp at acm.org>.  [ruby-core:09160]
-
-	* hash.c (rb_hash_compare_by_id): ditto.
-
 Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_mod_cvar_defined): wrong id check.  a patch from
@@ -23578,102 +5550,29 @@ Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_mod_cvar_set): ditto.
 
-Thu Oct 12 22:58:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_compare_by_id): somehow we lost renaming from
-	  Hash#identical.  [ruby-core:09163]
-
-Thu Oct 12 18:25:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new
-	  character literal (1 char string).
-
-	* lib/mkmf.rb: shut up some warnings from tk's extconf.rb.
-
-Thu Oct 12 02:15:24 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb: Make use of String#bytes.
-
-Thu Oct 12 02:12:31 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (get_digest_base_metadata): Use an instance
-	  variable of a class object instead of a class variable for
-	  metadata.  This change is only crucial for ruby 1.8 because
-	  class variables are inherited to subclasses prior to 1.9, but
-	  applying it also to 1.9 will assure compatibilities.
-
-	* ext/digest/md5/md5init.c (Init_md5): Ditto.
-
-	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
-
-	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
-	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
-Wed Oct 11 21:36:47 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_alloc,
-	  rb_digest_base_equal): Simplify the equality check and just
-	  compare resulted digests since state-level equality should
-	  not be so significant.
-
-	* ext/digest/digest.h: Ditto.
-
-	* ext/digest/*/*.[ch]: Ditto.
-
-Wed Oct 11 17:11:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_define_method): add half boiled RDoc document.
-
-Wed Oct 11 16:57:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_replace): should shift lfree pointer before
-	  calling xfree.
-
-Wed Oct 11 15:07:42 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb: Add digest/hmac, which implements
-	  HMAC keyed-hashing algorithm.
-
-Wed Oct 11 15:03:55 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_base_reset): Do not make
-	  recursive calls, but call initialize() when reset() is not
-	  defined in a subclass.
-
-Wed Oct 11 14:56:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Oct 11 22:21:41 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest/sha1/sha1ossl.h: libssl 0.9.8c-3 defines no
-	  SHA_BLOCK_LENGTH.
+	* ext/digest: Merge from trunk; metadata location changed,
+	  Digest::Base#reset() added, Digest::Base#equal() changed, and
+	  digest/hmac added with some modifications made for ruby 1.8.
 
-Wed Oct 11 14:03:31 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct 10 17:24:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/digest/digest.c (rb_digest_base_reset, Init_digest): Add
-	  Digest::Base#reset.
-
-	* ext/digest/digest.h: Update the header comment.
-
-	* ext/digest/md5/md5ossl.h, ext/digest/md5/md5init.c (Init_md5):
-	  Define DIGEST_LENGTH and BLOCK_LENGTH.
-
-	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
-
-	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
-	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
-	* ext/digest/depend, ext/digest/extconf.rb: Use $INSTALLFILES
-	  rather than adding make targets. [Pointed out by: nobu]
+	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
+	  copy command instead of install. use -run install.
 
-Tue Oct 10 16:39:08 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct 10 16:49:16 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
 	  Perform StringValue() checks properly.
 
-Tue Oct 10 13:21:21 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
+
+Tue Oct 10 13:49:53 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest/sha1/depend, ext/digest/sha2/depend: Remove obsolete
-	  dependencies.
+	* ext/digest: Merge from trunk; apply all changes since the
+	  initial import, except for the removal of compatibility stub
+	  libraries (md5.rb and sha1.rb).
 
 Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -23682,11 +5581,6 @@ Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/open3.rb, lib/ping.rb: ditto.
 
-Mon Oct  9 23:40:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/fileutils.rb, lib/mkmf.rb, lib/optparse.rb,
-	  lib/shellwords.rb: get rid of shadowing outer local variable.
-
 Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/encoding.rb (REXML::Encoding::check_encoding): spaces
@@ -23694,11 +5588,6 @@ Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): ditto.
 
-Mon Oct  9 01:56:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_define_method): add new method
-	  Kernel#define_singleton_method.  [ruby-list:42851]
-
 Sat Oct  7 23:53:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_scan): small documentation fix.
@@ -23709,95 +5598,15 @@ Sat Oct  7 23:44:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_rshift): a bug in right shift of negative
 	  bignums.  [ruby-core:09020]
 
-Sat Oct  7 23:33:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (formal_assign): packed post splat arguments may conflict
-	  with normal arguments.  [ruby-core:09021]
-
-	* eval.c (rb_call0): ditto.
-
-Sat Oct  7 11:53:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_initialize): since module_eval no longer passes
-	  self, use module_exec instead.  fixed: [ruby-dev:29637]
-
 Sat Oct  7 00:27:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* class.c (rb_include_module): remove unnecessary check.
 	  [ruby-talk:218402]
 
-Fri Oct  6 15:19:59 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/depend: Fix header installation when the build
-	  directory is different from srcdir. [Pointed out by: eban]
-
-Fri Oct  6 09:56:31 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
-	  copy command instead of install. use -run install.
-
-Fri Oct  6 06:53:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): small refactoring.
-
-	* parse.y (bparam_item): fixed bugs in handling parenthesized LHS.
-
-Fri Oct  6 04:47:07 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/depend: Install digest.h.
-
-Fri Oct  6 04:27:40 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/md5.rb, ext/digest/lib/sha1.rb: Remove those
-	  compatibility stub libraries.
+Fri Oct  6 04:30:30 2006  Akinori MUSHA  <knu@iDaemons.org>
 
 	* sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
 
-Fri Oct  6 04:09:51 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c: Make hexdigest() always call digest() internally.
-
-	* ext/digest/digest.c: Add bubblebabble().
-
-Fri Oct  6 02:38:42 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c: Allow subclassing in Ruby.
-
-Fri Oct  6 02:06:10 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (hexdigest_str_new): Add a string size check.
-
-Thu Oct  5 19:28:35 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.[ch]: Since the argument order of
-	  hash_final_func_t was inconsistent with others, change it and
-	  rename to hash_finish_func_t to avoid confusion.
-
-	* ext/digest/digest.[ch]: Remove and eliminate the use of
-	  hash_end_func_t.  Implement hexdigest conversion in the base
-	  class.
-
-	* ext/digest/md5/md5.c, ext/digest/md5/md5.h,
-	  ext/digest/md5/md5init.c, ext/digest/md5/md5ossl.c,
-	  ext/digest/md5/md5ossl.h: Remove MD5_End() and change
-	  MD5_Final() to MD5_Finish().
-
-	* ext/digest/rmd160/depend, ext/digest/rmd160/extconf.rb,
-	  ext/digest/rmd160/rmd160.c, ext/digest/rmd160/rmd160.h,
-	  ext/digest/rmd160/rmd160hl.c, ext/digest/rmd160/rmd160init.c,
-	  ext/digest/rmd160/rmd160ossl.c, ext/digest/rmd160/rmd160ossl.h:
-	  Remove unused functions RMD160_End(), RMD160_File(),
-	  RMD160_Data() and change RMD160_Final() to RMD160_Finish().
-
-	* ext/digest/sha1/extconf.rb, ext/digest/sha1/sha1.c,
-	  ext/digest/sha1/sha1.h, ext/digest/sha1/sha1hl.c,
-	  ext/digest/sha1/sha1init.c, ext/digest/sha1/sha1ossl.c,
-	  ext/digest/sha1/sha1ossl.h: Likewise.
-
-	* ext/digest/sha2/extconf.rb, ext/digest/sha2/sha2.c,
-	  ext/digest/sha2/sha2.h, ext/digest/sha2/sha2hl.c,
-	  ext/digest/sha2/sha2init.c: Likewise.
-
 Wed Oct  4 18:47:25 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: bugfix and update
@@ -23808,45 +5617,15 @@ Wed Oct  4 17:25:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_call): check protected visibility based on real self,
 	  not ruby_frame->self.  [ruby-talk:217822]
 
-Wed Oct  4 15:46:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (block_param): should interpret single parenthesized
-	  left hand side expression.
-
 Wed Oct  4 08:52:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/optparse/test_getopts.rb: changed the class name of test case
 	  to get rid of conflict with test_optparse.rb.
 
-Tue Oct  3 21:04:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dyna_in_block): inline using macro.
-
-	* parse.y (mlhs): simplifies the rule a bit.
-
-	* parse.y (block_param): restrict block parameters to be local
-	  variables only.
-
-	* test/ruby/test_iterator.rb (TestIterator::test_nested_iterator):
-	  update test suite to conform the last change.
-
-Tue Oct  3 02:31:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (splat_value): use "to_splat" instead of "to_ary" to
-	  prepare splat values as an array.
-
-	* array.c (Init_Array): define to_splat.
-
-	* range.c (range_to_splat): new method.
+Tue Oct  3 23:32:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c (enumerator_to_splat): ditto.
-
-Tue Oct  3 01:36:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_lines): returns an Enumerator instead of an
-	  array of lines.
-
-	* string.c (rb_str_bytes): a new method.
+	* lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
+	  must be string.  fixed: [ruby-core:08978]
 
 Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -23858,7 +5637,7 @@ Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
 	  load expanded path.  fixed: [ruby-dev:29621]
 
-Mon Oct  2 15:47:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct  2 15:49:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: batfile should be CRLF'ed.
 
@@ -23882,15 +5661,10 @@ Sun Oct  1 23:12:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#make_switch): pass arguments directly.
 
-Sat Sep 30 15:11:26 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Sep 30 15:12:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
 
-Fri Sep 29 13:18:24 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest.rb (Digest): Require digest.so and fix the
-	  breakage.  Point out by NAKAMURA Usaku in [ruby-dev:29619].
-
 Fri Sep 29 12:11:04 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* jcode.rb (succ!): call original succ! if $KCODE == 'n'.
@@ -23915,60 +5689,22 @@ Thu Sep 28 23:59:31 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  win32 regardless if it is implemented.  Provisional fix for
 	  [ruby-core:08917].
 
-Thu Sep 28 20:49:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Sep 28 20:53:16 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/tmpdir.rb: use return value of getdir.call for length.
 
-Wed Sep 27 22:08:16 2006  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/md5/md5init.c (Init_md5): Now that we have digest.rb,
-	  require "digest" rather than "digest.so".
-
-	* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
-
-	* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
-
-	* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
-
-Wed Sep 27 21:21:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_startwith): rename startwith? to start_with?,
-	  endwith? to endwith?, respectively.  [ruby-talk:216685]
-
-Wed Sep 27 13:29:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::TagMaker::nOE_element_def): replace to_s by
-	  join.  some other methods as well.  [ruby-dev:29613]
-
 Wed Sep 27 01:04:49 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (try_func): check function pointer first and macro next.
 
 	* lib/mkmf.rb (have_type): simplified with typedef and sizeof.
 
-Wed Sep 27 00:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_shift): shift/unshift performance boost patch,
-	  based on the patch from Eric Mahurin <eric_mahurin at yahoo.com>.
-	  [ruby-core:05861]
-
-	* array.c (rb_ary_unshift_m): ditto.
-
-	* array.c (ary_make_shared): ditto.
-
-	* array.c (RESIZE_CAPA): ditto.
-
-	* array.c (rb_ary_free): new function to free memory.  code moved
-	  from gc.c.
-
-	* string.c (rb_str_free): ditto.
-
 Tue Sep 26 23:57:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#getopts): use strings as key.
 	  fixed: [ruby-dev:29614]
 
-Tue Sep 26 15:29:55 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Sep 26 15:31:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {win32,wince}/Makefile.sub (CPP): check predefined value.
 
@@ -23978,38 +5714,13 @@ Tue Sep 26 07:55:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  body is shared.  a patch from Kent Sibilev <ksruby at gmail.com>.
 	  [ruby-core:08922]
 
-Mon Sep 25 23:10:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (rb_push_glob): need not to check by FilePathValue().
-	  [ruby-dev:29599]
-
-	* dir.c (dir_globs): ditto.
-
 Mon Sep 25 22:26:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_path_end): skip root directory.  fixed: [ruby-core:08913]
 
-	* lib/mkmf.rb (rm_f): get rid of NUL.
-
 	* lib/mkmf.rb (init_mkmf): set default $LDFLAGS.  Patch by Michal
 	  Suchanek <hramrach at centrum.cz>.  [ruby-talk:216256]
 
-Mon Sep 25 15:06:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/test.rb: "print nil" now prints empty string.
-
-	* test/ruby/test_system.rb (TestSystem::test_system): ditto.
-
-Mon Sep 25 11:26:25 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (recursive_hash): remove unused local variable.
-
-	* parse.y (parser_yylex): ditto.
-
-	* parse.y (rb_gc_mark_symbols): fix unmatched prototype .
-
-	* file.c (rb_get_path): check NUL byte in the path string.
-
 Mon Sep 25 08:14:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_shift): should clear shifting top element.
@@ -24023,25 +5734,19 @@ Mon Sep 25 08:11:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* random.c (rb_f_rand): RDoc typo fix.  a patch from Frederick
 	  Cheung <fred at 82ask.com>.  [ruby-talk:216047]
 
-Sun Sep 24 21:19:24 2006  Guy Decoux  <ts@moulon.inra.fr>
-
-	* gc.c (gc_mark_children): NODE_POSTEXE holds Ruby VALUE.
-	  [ruby-core:08912]
-
 Sun Sep 24 22:28:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* runruby.rb: extension library scripts moved into common directory.
 
-Sun Sep 24 12:10:04 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Sep 24 14:59:50 2006  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+	* node.h (struct thread): ia64 support is broken by sandbox patch.
 
-Sun Sep 24 06:55:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep 24 12:11:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* io.c (rb_io_print): no special handling for nil as well as puts.
-	  fixed: [ruby-dev:29586]
+	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
 
-Sun Sep 24 06:25:53 2006  why the lucky stiff  <why@ruby-lang.org>
+Sat Sep 23 23:24:57 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (rb_thread_save_context, rb_thread_restore_context):
 	  sandbox hook to save and restore sandbox state.
@@ -24050,7 +5755,7 @@ Sun Sep 24 06:25:53 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (rb_thread_kill_bang): Thread#kill! uses the above flag
 	  to circumvent ensure, in order to prevent endless loops.
-	  contributed by MenTaLguY. [ruby-core:08768]
+	  [ruby-core:08768]
 
 	* eval.c (rb_thread_kill): fix Thread#kill docs, which returns
 	  the thread object in all cases.
@@ -24065,40 +5770,14 @@ Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
 	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
 
-Sat Sep 23 20:54:28 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* oniguruma.h: Version 4.4.4
-
-	* regexec.c: ditto.
-
-	* regcomp.c ditto.
-
 Sat Sep 23 08:35:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
 
-Sat Sep 23 01:02:57 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Sep 23 01:04:20 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
 
-Fri Sep 22 18:07:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_partition): no need to call rb_call_super(),
-	  since String is no longer includes Enumerable.
-
-Fri Sep 22 17:33:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_eql): new method to be used by Hash.
-
-	* hash.c (rb_hash_hash): ditto.
-
-Fri Sep 22 06:53:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_hash): use rb_memhash().
-
-	* numeric.c (flo_hash): simplified.  klass need not to affect
-	  resulting hash value.
-
 Fri Sep 22 02:06:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* .cvsignore: ignore timestamp files and installed list file.
@@ -24107,11 +5786,6 @@ Fri Sep 22 01:36:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb: include FileUtils unconditionally.
 
-Fri Sep 22 00:36:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (Init_Numeric): fix_odd_p and fix_even_p are for Fixnum.
-	  patch from Ondrej Bilka <neleai at seznam.cz>.  [ruby-core:08904]
-
 Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (no-install): not install rdoc actually.
@@ -24122,51 +5796,14 @@ Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: expand ruby executable names.
 
-Thu Sep 21 20:19:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_new3): embed shorter strings more eagerly.
-
-Thu Sep 21 17:44:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_startwith): a new method to check if a string
-	  starts with given prefix.
-
-	* string.c (rb_str_endwith): the opposite of String#startwith?.
-
-Thu Sep 21 16:29:02 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* rubytest.rb: use each_line instead of each.
-
-Thu Sep 21 15:06:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_odd_p): a new method to check even or odd.
-	  [RCR#337]
-
-	* numeric.c (int_even_p): ditto.
-
 Thu Sep 21 13:55:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/etc/etc.c (etc_getpwuid): uid integer should be wrapped in
+	* ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
 	  uid_t value.  [ruby-core:08897]
 
 	* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
 	  'int' type.
 
-Thu Sep 21 10:07:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_partition): RDoc typo fixed.  [ruby-core:08898]
-
-	* string.c (rb_str_rpartition): fixed separation seek bug.
-
-Thu Sep 21 09:38:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_lines): new method to split a string into lines.
-
-	* string.c (Init_String): Strings are no longer Enumerable.  use
-	  each_line or lines method explicitly.
-
-	* string.c (Init_String): remove each method. use each_lines.
-
 Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (pre-install-doc): create data directory before install.
@@ -24175,19 +5812,7 @@ Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (install_dirs): remove extra slash.
 
-Wed Sep 20 22:41:45 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_mul): typo again.  patch from Tadashi Saito
-	  <shiba at mail2.accsnet.ne.jp>.  fixed: [ruby-core:08893]
-
-Wed Sep 20 19:32:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_partition): a new method to separate the string
-	  by a separator.  taken from Python 2.5.
-
-	* string.c (rb_str_rpartition): ditto.
-
-Wed Sep 20 09:49:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep 20 09:53:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
 	  this macro to install.
@@ -24195,7 +5820,7 @@ Wed Sep 20 09:49:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 Wed Sep 20 09:43:10 2006  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb: allow extra spaces in responses.
-	  Thanks, Tom Soderlund.
+	  Thanks, Tom Soderlund. (backported from HEAD)
 
 Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -24203,6 +5828,13 @@ Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  Adolphs <futzilogik at users dot sourceforge dot net>.
 	  [ruby-doc:1223]
 
+Tue Sep 19 01:28:00 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: backport from HEAD (rev 1.71).
+
+	* lib/fileutils.rb (FileUtils.cp_r): new option
+	  :remove_destination.
+
 Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
@@ -24214,42 +5846,6 @@ Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  defined.  fixed: [ruby-dev:29554]
 	  -- This didn't fix anything.
 
-Tue Sep 19 00:07:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (sym_eql): fail early to gain performance.
-
-	* string.c (sym_hash): cache hash value in aux.shared if possible.
-
-	* gc.c (rb_obj_id): no need to treat symbols specially.
-
-	* lib/fileutils.rb (FileUtils::FileUtils): singleton_methods() no
-	  longer return an array of strings, but of symbols.
-
-	* lib/delegate.rb (DelegateClass): ditto.
-
-Mon Sep 18 15:29:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_glob): restore GC protection volatile variable.
-	  [ruby-dev:29588]
-
-	* re.c (rb_reg_regcomp): ditto.
-
-Mon Sep 18 12:16:48 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_mul): get rid of shift overflow.
-
-Mon Sep 18 10:47:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_glob): remove unused variable.
-
-	* math.c (math_log): ditto.
-
-	* re.c (rb_reg_regcomp): ditto.
-
-	* eval.c (break_jump): ditto.
-
-	* eval.c (rb_thread_yield_0): remove unused function.
-
 Sun Sep 17 23:44:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified
@@ -24263,18 +5859,11 @@ Sun Sep 17 17:42:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/generators/ri_generator.rb: do not chdir twice.
 
-Sun Sep 17 10:42:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_mul): fixed typo.  fixed: [ruby-core:08885]
-
-Sat Sep 16 19:47:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* README.EXT: should mention new macros: RSTRING_PTR, RSTRING_LEN,
-	  RARRAY_PTR, RARRAY_LEN.
+Sat Sep 16 23:14:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* README.EXT.ja: ditto.
+	* ext/pty/pty.c (establishShell): remove remaining unused line.
 
-Sat Sep 16 16:39:23 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep 16 16:40:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
 	  use instruby.rb to install extensions instead of ext/extmk.rb.
@@ -24289,53 +5878,9 @@ Sat Sep 16 16:39:23 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/pty.c (freeDevice): not used.
 
-	* lib/mkmf.rb (checking_for): improved the messages.
-
-Sat Sep 16 11:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (ary_shared_first): should create embedded copies
-	  instead of sharing memory region for smaller arrays.
-
-Sat Sep 16 09:37:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (inspect_struct): do not display a class name for
-	  anonymous struct.  The member fields are sufficient.
-
-Fri Sep 15 20:22:15 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 rev.110.
-	  * Fix: check_bom cuts \xfe\xff\xXX\xXX of UTF-32LE.
-	  * Add support --ic=UTF-32.
-	  * Fix: can't guess UTF-16 and UTF-32.
-	  * Fix: can't decode beyond BMP of UTF-16LE.
-
-	* ext/nkf/nkf.c (guess): Support UTF-32.
-
-	* ext/nkf/lib/kconv.rb (kconv): Support UTF-32.
+	* ext/pty/pty.c (get_device_once): removed garbage right brace.
 
-	* ext/nkf/lib/kconv.rb (to_utf32): new method.
-
-Fri Sep 15 05:23:24 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-8/nkf.c: imported nkf 2.0.8 2006-09-15.
-	  Add support for U+10000 - U+10FFFF
-	  Add support UTF-32
-
-Fri Sep 15 00:03:07 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/digest/lib/digest.rb (Digest::Base.file): open a file in binary
-	  mode.  suggested by Kazuhiro NISHIYAMA.  [ruby-dev:29579]
-
-Thu Sep 14 17:21:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_mul): avoid bignum multiplication as far as
-	  possible.  a patch from Ondrej Bilka <neleai at seznam.cz>.
-	  [ruby-core:08825]
-
-Thu Sep 14 16:34:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_intern): allow zero length symbols.
-	  [ruby-core:08861]
+	* lib/mkmf.rb (checking_for): improved the messages.
 
 Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -24345,27 +5890,7 @@ Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* parse.y (rb_interned_p): new function to check if a string is
 	  already interned.
 
-	* string.c (str_to_id): use rb_str_intern().
-
-Thu Sep 14 14:37:45 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/digest/lib/digest.rb (Digest::Base.file): new method.
-	  [ruby-dev:29572]
-
-Thu Sep 14 08:30:02 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/digest/digest.c (rb_digest_base_inspect): new method.
-	  [ruby-dev:29573]
-
-Thu Sep 14 01:13:56 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
-	  [ruby-dev:29569]
-
-Thu Sep 14 01:02:25 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/digest/lib/digest.rb: new file.
-	  [ruby-dev:28689]
+	* object.c (str_to_id): use rb_str_intern().
 
 Wed Sep 13 18:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -24382,74 +5907,28 @@ Wed Sep 13 16:43:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_intern): prohibit interning tainted string.
 
-Wed Sep 13 01:14:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep 13 01:14:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#getopts): works with pre-registered
 	  options.  [ruby-core:08826]
 
-Tue Sep 12 03:58:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_compare_by_identity): rename Hash#identical to
-	  Hash#compare_by_identity.
-
-Mon Sep 11 16:52:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_identical): a new method to make a hash to
-	  compare keys by their identity.
-
-	* hash.c (rb_hash_identical_p): new method to tell if a hash is
-	  identical or not.
-
-	* st.c (st_numcmp, st_numhash): export hash type functions.
-
-Mon Sep 11 11:42:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rexml/source.rb (REXML::Source::encoding): should not
-	  convert the body twice.  [ruby-core:08828]
-
-	* lib/rexml/encoding.rb (REXML::Encoding::encoding):
-	  Encoding#encoding= to return boolean value to tell if the body
-	  is really converted or not.
-
-	* lib/rexml/encoding.rb (REXML::Encoding::encoding): Specific
-	  conversion library (e.g. rexml/encodings/UTF-16.rb) to have
-	  higher preceding.
-
-	* lib/rexml/encodings/UTF-16.rb (REXML::Encoding::decode_utf16):
-	  UTF-16#decode_utf16 should work strings without BOM.
-
-Mon Sep 11 07:39:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (sym_equal): "sym == str" should compare them as
-	  strings.  [ruby-dev:29554]
-
-Sun Sep 10 22:59:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (parse_args): remove splat.
-
-Sun Sep 10 20:25:30 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Sep 10 20:27:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
 
-Sun Sep 10 09:41:29 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c: ISPRINT() needs ctype.h
-
-Sun Sep 10 09:19:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: splat parsed arguments.
-
 Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* eval.c (stack_extend): fixed prototype.
+
 	* eval.c (rb_require_safe): prevent extension from loading twice.
 	  fixed: [ruby-dev:29523]
 
-Sat Sep  9 23:55:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep  9 23:50:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (rb_f_test): test(0) should not have any special
-	  meaning.  [ruby-dev:29425]
+	* bignum.c (rb_big_mul0): bignum multiplication without
+	  normalization.
 
-	* file.c (rb_f_test): properer error message.
+	* bignum.c (rb_big_pow): use rb_big_mul0().  [ruby-dev:29547]
 
 Sat Sep  9 14:08:38 2006  Eric Hodel  <drbrain@segment7.net>
 
@@ -24461,29 +5940,18 @@ Sat Sep  9 04:55:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/pstore.rb: open all in binary mode, and get rid of the quirk of
 	  msvcrt.  fixed: [ruby-dev:29518]
 
-Sat Sep  9 04:47:45 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep  9 04:54:42 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
 
 	* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
 	  warnings with $VERBOSE.
 
-	* win32/resource.rb: only file which has more than one icon is DLL.
-
-Fri Sep  8 16:53:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_alloc): should allocate a String object, even when
-	  asked to allocate a Symbol object.  [ruby-dev:29529]
+	* ext/extmk.rb: Proc#call does not pass the block in 1.8.
 
-Fri Sep  8 16:36:27 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/resource.rb: add more info.
 
-	* ext/extmk.rb (extmake): follow Array#to_s.
-
-	* lib/mkmf.rb (create_makefile): ditto.
-
-	* win32/resource.rb: ditto.
-
-Fri Sep  8 10:00:12 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Sep  8 10:03:59 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
 	  method to parse multiple cookies per Set-Cookie header.
@@ -24495,62 +5963,33 @@ Fri Sep  8 08:59:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
 	  name transform.
 
-Fri Sep  8 08:25:39 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: suppress `assigning void value' warning.
-
-Fri Sep  8 01:16:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (Init_Array): #to_s to be an alias to #inspect.
-	  [ruby-dev:29520]
+Fri Sep  8 01:33:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* hash.c (Init_Hash): ditto.
+	* ruby.h (RSTRING_PTR): add migration macro.
 
-	* lib/mkmf.rb (create_makefile): replace "print array" by
-	  "print *array".
-
-	* mkconfig.rb: ditto.
-
-Thu Sep  7 21:02:56 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (nil_to_s): returns the empty string again.
-	  [ruby-dev:29520]
+	* ruby.h (RARRAY_PTR): ditto.
 
 Thu Sep  7 23:27:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (path_check_0, fpath_check): disable path check on cygwin.
 	  [ruby-talk:213074]
 
-Thu Sep  7 02:03:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): adopt new date format using digits
-	  e.g. "2006-09-07 02:03:45 +9000".
-
-Thu Sep  7 01:54:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (sym_equal): override.  check equivalence.
+Wed Sep 06 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Sep  6 13:25:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (symbols_i): need to initialize early-created symbols.
-	  [ruby-dev:29496]
-
-Wed Sep  6 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
+	  [ruby-dev:29344]
 
 	* ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
 
-Tue Sep  5 22:06:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c: use rb_ary_new3() since RARRAY_LEN() is not l-value.
-
-	* ext/tk/tkutil/tkutil.c: use RARRAY_PTR() and RARRAY_LEN() and etc.
-	  fixed: [ruby-dev:29473]
-
 Tue Sep  5 06:47:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_to_s): variable declaration after an execution
 	  statement.
 
+Tue Sep  5 05:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (flo_hash): improve collision.  fixed: [ruby-dev:29352]
+
 Tue Sep  5 05:49:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (path_check_0): check if sticky bit is set on parent
@@ -24577,7 +6016,7 @@ Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/dbm/extconf.rb: create makefile according to the result of check
 	  for dbm header.  fixed: [ruby-dev:29445]
 
-Mon Sep  4 21:39:42 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Sep  4 21:42:35 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
 
@@ -24585,37 +6024,21 @@ Mon Sep  4 21:14:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_strftime): include nul character.  fixed: [ruby-dev:29422]
 
-Mon Sep  4 16:39:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::out): specify -x option for nkf.
-
-	* lib/cgi.rb (CGI::out): should not convert utf-8 implicitly using
-	  NKF.  it is too Japanese centric.
-
-Mon Sep  4 14:23:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/extconf.rb (db_check): remove debug print.
-
-Mon Sep  4 06:46:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (rb_id2sym): intern if id is attrset_id.
-	  [ruby-dev:29420] [ruby-dev:29447]
-
-Mon Sep  4 01:25:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep  4 16:29:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_f_local_variables): list symbols.
+	* lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
+	  [ruby-dev:29284]
 
-	* struct.c (rb_struct_s_members_m): ditto.
+Mon Sep  4 16:13:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* variable.c (ivar_i): ditto.
+	* io.c (pipe_open): command name should not contain null bytes.
+	  [ruby-dev:29421]
 
-	* variable.c (gvar_i): ditto.
+	* process.c (proc_spawn): ditto.
 
-	* variable.c (cv_i): ditto.
+	* process.c (proc_spawn_n): ditto.
 
-Sun Sep  3 20:47:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.h (SYMBOL_P): Qnil and Qfalse are not Symbol.
+	* process.c (rb_f_system): ditto.
 
 Sun Sep  3 15:32:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -24631,286 +6054,95 @@ Sun Sep  3 04:40:42 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/socket.c: include arpa/inet.h if available.
 
-Sat Sep  2 23:59:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (Init_String): undef Symbol#new.
-
-	* struct.c (rb_struct_s_def): wrong symbol detection.
-
-Sat Sep  2 23:59:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep  3 02:34:55 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* string.c (str_to_id): a bug caused by premature optimization.
+	* lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
+	  [ruby-dev:29417]
 
-Sat Sep  2 23:53:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Sep  3 01:45:17 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* object.c (Init_Object): move symbol related code to string.c
-
-	* string.c (Init_String): Symbol as subclass of String.
-
-	* parse.y (rb_intern2): handle symbol as strings.
-
-	* string.c (str_new): substring of symbols are mere strings, not
-	  symbols.
-
-Sat Sep  2 23:37:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (struct RArray): embed small arrays.
-	  (RARRAY_LEN): defined for accessing array members.
-	  (RARRAY_PTR): ditto.
-
-	* array.c: use RARRAY_LEN and RARRAY_PTR.
+	* lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
+	  included before IPAddr.new. [ruby-dev:29406]
 
 Sat Sep  2 13:23:01 2006  Tanaka Akira  <akr@fsij.org>
 
 	* common.mk (ia64.o): use the compiler driver to assemble ia64.s
 	  to use appropriate ABI.
 
-Sat Sep  2 12:06:35 2006  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/generator.rb (SOAP::SOAPGenerator#encode_tag): do not dump
-	  XML attribute which value is nil.  value "" and nil both were dumped
-	  as 'attr="value"'.  [ruby-dev:29395]
-
-Sat Sep  2 11:47:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Sep  2 03:36:22 2006  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_eval): should handle when in else clause.  a patch
-	  from Eric Hodel <drbrain at segment7.net>.  [ruby-core:08662]
-
-	* parse.y (primary): wrap with NODE_CASE.  [ruby-core:08663]
-
-Sat Sep  2 12:00:32 2006  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/csv.rb (CSV::IOReader#initialize): use String#[](pos, len)
-	  instead of String#[](idx) to check utf BOM.  follows String#[](idx)
-	  behavior change of 1.9.
-
-Sat Sep  2 11:47:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should handle when in else clause.  a patch
-	  from Eric Hodel <drbrain at segment7.net>.  [ruby-core:08662]
-
-	* parse.y (primary): wrap with NODE_CASE.  [ruby-core:08663]
-
-Fri Sep  1 22:07:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (RSTRING_EMBED_LEN_MASK): uses 5 bits to support 64bit
-	  environment.  [ruby-dev:29369]
-
-Fri Sep  1 22:02:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_resize): should copy embedded string to
-	  malloc'ed buffer.  a patch from <nobu at ruby-lang.org> in
-	  [ruby-dev:29369].  fixed: [ruby-dev:29368]
-
-	* string.c (rb_str_ord): use %ld specifier since STRING_LEN() is a
-	  long.  [ruby-dev:29369]
-
-Fri Sep  1 21:41:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (socks_init): typo fixed.  a patch from Sven
-	  Klemm <sven at c3d2.de>.  [ruby-core:08770]
-
-Fri Sep  1 14:22:42 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle): RDoc fixed.
+	* common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
+	  numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
 
 Fri Sep  1 13:52:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
 	  on Tcl/Tk8.x.
 
-Fri Sep  1 09:32:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex::getc): should not push nil into
-	  reading buffer (@readed).  reported in
-	  <http://jarp.does.notwork.org/diary/200608c.html#200608311>.
-
-Thu Aug 31 23:59:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): follow nil.to_s.
-
-Thu Aug 31 20:50:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): follow nil.to_s.
-
-	* win32/resource.rb: ditto.
-
-Thu Aug 31 20:21:47 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (search_required): use RSTRING_PTR and RSTRING_STR.
-
-	* file.c (test_identical, rb_file_s_truncate): ditto.
-
-	* io.c (pipe_open, rb_io_reopen): ditto.
-
-	* object.c (nil_plus): ditto.
-
-	* process.c (proc_spawn_n, rb_spawn): ditto.
-
-	* util.c (ruby_add_suffix): ditto.
-
-	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
-
-	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): ditto.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): ditto.
-
-	* ext/tk/stubs.c, ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: ditto.
-
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata): ditto.
-
-Thu Aug 31 18:23:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (struct RString): embed small strings.
-	  (RSTRING_LEN): defined for accessing string members.
-	  (RSTRING_PTR): ditto.
-
-	* string.c: use RSTRING_LEN and RSTRING_PTR.
-
-Thu Aug 31 17:16:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_shuffle_bang): new method.
-
-	* array.c (rb_ary_shuffle): ditto.
-
-	* random.c (genrand_real): ditto.
-
-	* random.c (genrand_int32): export the function.
-
-	* random.c (Init_Random): initialize random seed at the
-	  beginning.
-
-Thu Aug 31 13:12:06 2006  why the lucky stiff  <why@ruby-lang.org>
+Thu Aug 31 12:46:55 2006  why the lucky stiff  <why@ruby-lang.org>
 
 	* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
 	  along with ruby_cref, for use by the sandbox. [ruby-core:08762]
 
 	* node.h: ditto.
 
-Wed Aug 30 12:01:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_hash): improve collision.
-
-	* string.c (rb_memhash): new generic function to calculate hash value
-	  for memory chunk.
-
 Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
 	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
 
-Mon Aug 28 11:29:46 2006  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 28 11:36:02 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c, parse.y: Revert.
-	* ext/.document: Add digest.c.
-	* ext/digest/digest.c: Make RDoc show up.
-	* ext/io/wait.c: Fix call-seq in RDoc.
-
-Mon Aug 28 08:03:20 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/.document: Add C files with RDoc.
-	* ext/digest/digest.c: Convert to RDoc.
-	* ext/io/wait.c: ditto.
 	* lib/rdoc/parsers/parse_rb.rb: Fix typo.  Submitted by
 	  <calamitas at gmail.com>.  [ruby-core:08724]
 
-Mon Aug 28 07:21:47 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
-	  ruby-Bugs-5529.  [ruby-core:08725]
-
-Sun Aug 27 21:41:23 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+Mon Aug 28 07:53:44 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* oniguruma.h: Version 4.4.0
-
-	* regint.h: ditto.
-
-	* regparse.h: ditto.
-
-	* regexec.c: ditto.
+	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
+	  Submitted by Kent Sibilev <ksruby at gmail.com>.  [ruby-core:08392].
 
-	* regcomp.c ditto.
+Mon Aug 28 07:25:45 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* regparse.c: ditto.
+	* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
+	  ruby-Bugs-5529.  [ruby-core:08725]
 
-Sat Aug 26 08:03:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Aug 26 08:07:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
 
-Fri Aug 25 21:15:22 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* common.mk: add regint.h and oniguruma.h to dependence.
+Fri Aug 25 22:32:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/strscan/depend: ditto.
-
-Fri Aug 25 20:35:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
+	  be set with the accessor.  fixed: [ruby-list:42737]
 
-	* test/wsdl/document/echo.rb: removed.
+Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/wsdl/document/test_rpc.rb: remove echo.rb after test.
-	  [ruby-dev:29337]
+	* stable version 1.8.5 released.
 
 Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (gc_sweep): typo fixed.
 
-Fri Aug 25 16:05:50 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (sym_call): check if the receiver is given.
-
-Fri Aug 25 01:10:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_Integer): Integer(nil) should raise TypeError.
-	  [ruby-talk:210205]
-
-	* object.c (nil_to_s): no longer returns empty string but "nil".
-	  [ruby-talk:210205]
-
-	* lib/mkmf.rb: avoid COMMON_HEADERS being nil.
-
-Wed Aug 23 00:25:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
-	  be set with the accessor.  fixed: [ruby-list:42737]
-
-Tue Aug 22 19:21:00 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: parameter `to_addrs' might be an Array,
-	  .flatten is required. [ruby-dev:29316]
-
 Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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 Aug 22 12:35:57 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for
-	  euc-jp [ruby-dev:29344]
-
-Sun Aug 20 11:46:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_step): also return an enumerator object if no block
-	  is given.
-
-Sat Aug 19 16:47:51 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (hash2named_arg): accept hash argument
-	  of symbol key.
-
-	* test/win32ole/test_win32ole.rb
-	  ditto.
+	* win32/Makefile.sub (config.status): include winsock2.h instead of
+	  winsock.h when --with-winsock2 is specified.
+	  fixed: [ruby-dev:29296]
 
 Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_rename): use errno if set properly.
 	  fixed: [ruby-dev:29293]
 
-Fri Aug 18 01:05:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/cgi.rb (CGI::out): specify -m0 to disable MIME decode.  a
-	  patch from Fujioka <fuj at rabbix.jp>.  [ruby-dev:29284]
+	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
 
 Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -24921,98 +6153,30 @@ Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
 
-Wed Aug 16 17:46:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (r_byte): IO#getc returns one byte string now.
-	  fixed: [ruby-dev:29255]
-
-Wed Aug 16 17:22:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* common.mk (pre-install-local): remove unnecessary code.
-	  [ruby-dev:29249]
+	* 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]
 
 Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
 	  get rid of bogus implementations on Mac OS X.
 
+Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
+	  broken class-level documentation.
+
 Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (set_arg0): fill argv other than the first with an empty
 	  string instead of NULL.
 
-Tue Aug 15 11:21:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: support SMTP/SSL.  Thanks Kazuhiro NISHIYAMA.
-
-	* lib/net/smtp.rb: new method SMTP.use_ssl?
-
-	* lib/net/smtp.rb: new method SMTP.enable_ssl.
-
-	* lib/net/smtp.rb: new method SMTP.disable_ssl.
-
-	* lib/net/smtp.rb: new method SMTP.default_ssl_port.
-
-	* lib/net/smtp.rb: new method SMTP.default_tls_port.
-
-	* lib/net/smtp.rb: now SMTP#enable_tls accepts a SSLContext
-	  object, instead of a verity and cert.  [FEATURE CHANGE]
-
-	* lib/net/smtp.rb: new method SMTP.ssl_context.
-
-	* lib/net/smtp.rb: new method SMTP.default_ssl_context.
-
-	* lib/net/smtp.rb: export SMTP.authenticate.
-
-	* lib/net/smtp.rb: export SMTP.auth_plain.
-
-	* lib/net/smtp.rb: export SMTP.auth_login.
-
-	* lib/net/smtp.rb: export SMTP.auth_cram_md5.
-
-	* lib/net/smtp.rb: export SMTP.starttls.
-
-	* lib/net/smtp.rb: export SMTP.helo.
-
-	* lib/net/smtp.rb: export SMTP.ehlo.
-
-	* lib/net/smtp.rb: export SMTP.mailfrom.
-
-	* lib/net/smtp.rb: export SMTP.rcptto.
-
-	* lib/net/smtp.rb: export SMTP.rcptto_list.
-
-	* lib/net/smtp.rb: export SMTP.data.
-
-	* lib/net/smtp.rb: export SMTP.quit.
+Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 12 22:33:06 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* string.c (String#split): Describe grouping behavior.  Patch by Jan
-	  Svitok <jan.svitok at gmail.com>.  [ruby-core:08603]
-
-Sun Aug 13 12:08:02 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c: ANSIfied.  [ruby-core:08601]
-
-Sat Aug 12 15:55:32 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, bcc32/Makefile.sub, win32/Makefile.sub, win32/dir.h,
-	  win32/win32.c, win32/win32.h: large file support for win32.
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* 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.
-
-Wed Aug  9 16:53:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/smtp.rb (Net::SMTP::auth_cram_md5): use ord to retrieve
-	  bytes from strings.  a patch from WATANABE Tetsuya
-	  <Tetsuya.WATANABE at nifty.com>.  [ruby-dev:29240]
+	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
 
 Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -25020,23 +6184,17 @@ Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
 	  [ruby-core:08522]
 
-Tue Aug  8 19:26:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_string):
-	  affected by str[0] returns 1 char string.  [ruby-dev:29223]
-
-	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder::get_labels):
-	  ditto.
+Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Aug  8 12:28:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (arg): allow newlines before ternary colon.  [ruby-dev:29189]
+	* Makefile.in, common.mk, configure.in: fix for platforms without
+	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
+	  [ruby-dev:29215]
 
 Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
 	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
-	  inclusion of config.h to pacify AIX.  a patch from Yutaka
+	  incluion of config.h to pacify AIX.  a patch from Yutaka
 	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
 
 Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -25053,58 +6211,33 @@ Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
-	  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
+	* 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]
 
-Sun Aug  6 20:34:24 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
 
-Sun Aug  6 17:12:12 2006  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_reopen): STDERR.reopen(open("/dev/tty", "w")) should not
-	  clear FMODE_PREP in STDERR.
-
-Sat Aug  5 22:53:41 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* oniguruma.h: Version 4.2.2
-
-	* regint.h: ditto.
-
-	* regparse.h: ditto.
-
-	* regexec.c: ditto.
-
-	* regcomp.c ditto.
-
-	* regerror.c: ditto.
-
-	* regparse.c: ditto.
-
 Sat Aug  5 17:07:43 2006  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]
 
-Sat Aug  5 13:49:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
 
-Fri Aug  4 12:13:22 2006  Eric Hodel  <drbrain@segment7.net>
+Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib: Clean up files for RDoc.
-	* lib/.document: Include most of the standard library in RDoc
-	  generation.
-	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
-	  Submitted by <ksruby at gmail.com>.  [ruby-core:08392].
+	* lib: Merge RDoc and .document from HEAD.
 	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
 
-Fri Aug  4 18:59:49 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-	  [ruby-core: 7122]. and support for ruby1.8.X
+	  [ruby-core: 7122].
 
 Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
 
@@ -25117,22 +6250,15 @@ Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
 	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
 
-Fri Aug  4 02:42:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): a bug in %c type check.
+Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug  4 01:28:19 2006  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_reopen): STDERR.reopen(File.open("/dev/null", "w")) should
-	  not fclose stderr.
+	* win32/win32.c (init_stdhandle): assign standard file handles.
 
-Thu Aug  3 15:16:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* range.c (range_include): should always call Enumerable#include?
-	  (not #===) for non numeric end points.  [ruby-core:08477]
-	  [ruby-core:08496]
+	* eval.c (Init_Binding): fix old commit miss.
 
-Mon Jul 31 16:51:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (exit_handler): new function; release winsock and
 	  environment work area.
@@ -25143,7 +6269,7 @@ Mon Jul 31 16:51:40 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
 	  of GetEnvironmentVariable(), because the latter cannot distinguish
-	  whether a null environment variable exists or not.
+	  wheather a null environment variable exists or not.
 	  fixed: [ruby-talk:205123]
 
 Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
@@ -25152,18 +6278,18 @@ Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
 	  setrlimit may fail with EINVAL.
 	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
 
+Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
+	  for the value of IPv6 address in the Host: header field.
+
 Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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]
 
-Mon Jul 31 13:38:13 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
-	  for the value of IPv6 address in the Host: header field.
-
-Sun Jul 30 23:26:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_call0): trace call/return of method defined from block.
 	  fixed: [ruby-core:08329]
@@ -25185,33 +6311,9 @@ Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  statement back before the comment block.  a patch from Hugh
 	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
 
-Fri Jul 28 17:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/curses/curses.c (NUM2CH, CH2FIX): use single char strings.
-
-Fri Jul 28 14:09:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): fixed typo in cache look-up.  [ruby-dev:29167]
-
-Fri Jul 28 10:41:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): a bug in method cache look-up.
-	  http://www.rubyist.net/~matz/20060720.html#c04
-
-Fri Jul 28 10:19:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): documentation update patch from Jacob
-	  Fugal <lukfugl at gmail.com>.  [ruby-core:08418]
-
-Fri Jul 28 09:41:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): fixed typo.  [ruby-dev:29162]
-
-Fri Jul 28 00:26:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (domain_check): ANSI style function arguments
+Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* math.c (math_log): too few argument to domain_check().
+	* time.c (time_to_s): fixed format mismatch.
 
 Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -25224,10 +6326,6 @@ Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* math.c (math_sqrt): fix documentation flaw.
 
-Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_to_s): fixed format mismatch.
-
 Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* time.c: need to declare time_utc_offset.
@@ -25237,19 +6335,23 @@ Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (io_close): always calls "close" method of the receiver.
 	  [ruby-core:6911] [ruby-core:8112]
 
+Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_to_s): use +0900 style timezone string for local time.
+	  [ruby-dev:29143]
+
 Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
 	  Solaris compiler.  [ruby-core:08114]
 
-	* time.c (time_to_s): use +0900 style timezone string for local time.
-	  [ruby-dev:29143]
-
 Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
 
-Wed Jul 26 21:59:33 2006  Minero Aoki  <aamine@loveruby.net>
+Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: sync with HEAD (rev 1.132).
 
 	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
 	  set Content-Type: x-www-form-urlencoded by default.
@@ -25263,37 +6365,21 @@ Wed Jul 26 21:59:33 2006  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
 	  when there's no Content-Type.
 
-Wed Jul 26 18:38:13 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c (strscan_do_scan): always return nil if
-	  p->curr exceeds string size.
+Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
 
-Wed Jul 26 18:33:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
 
-	* eval.c (Init_eval): rename #invoke_method and
-	  #invoke_functional_method to __send and __send! respectively.
-
-	* eval.c (remove_method): prohibit removing __send and __send!.
-
-	* eval.c (rb_undef): prohibit undef'ing  __send and __send!.
-
-	* eval.c (rb_eval): prohibit redefining  __send and __send!.
-
-	* lib/delegate.rb (Delegator): preserve __send.
+	* ext/strscan/strscan.c (strscan_do_scan):
+	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
 
 Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/pty/pty.c (getDevice): retry once after GC on failure.
 	  [ruby-core:08282]
 
-Wed Jul 26 17:43:20 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c (strscan_do_scan):
-	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
-
 Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* sprintf.c (rb_str_format): prepend ".." to %u for negative bignum,
+	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
 	  but not "-".  fixed: [ruby-core:08167]
 
 Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -25311,7 +6397,11 @@ Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: suppress warnings by automake 1.8 or later.
 
-Tue Jul 25 14:46:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
+
+Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): typo.
 
@@ -25324,6 +6414,13 @@ Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (backtrace): skip frames successive on node and method name.
 
+Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
+
+	* process.c (rb_f_system): move signal right before fork to avoid
+	  signal handler intervention.
+
 Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
@@ -25339,61 +6436,36 @@ Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
 	* test/socket/test_unix.rb: disabled on cygwin.
 	  reported by Kouhei Yanagita.  [ruby-dev:29080]
 
-Fri Jul 21 23:57:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): script is never used while recursing.
-
 Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_call0): include funcalled methods in caller list.
 	  fixed: [ruby-core:08290]
 
-Fri Jul 21 17:52:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): "9_e8" should consider "_e8" as
-	  trailing garbage so that it should return 9.0.  [ruby-dev:29088]
-
 Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
 	  prepending destdir on DOSISH.
 
-Fri Jul 21 04:17:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): try local method look-up first for fcall, then
-	  normal method look-up.  [ruby-talk:202564]
-
-	* eval.c (rb_get_method_body): save local method cache separately.
-
-	* eval.c (search_method): export info whether method is local or
-	  not.
-
-Thu Jul 20 20:27:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_attr): make Module#attr to be an alias to
-	  attr_reader.  [RCR#331]
-
 Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h: export classes/modules to implement sandbox.
 	  [ruby-core:08283]
 
-Wed Jul 19 19:40:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
-	* eval.c (rb_yield_0): should check args_args before lambda
-	  argument check.  [ruby-dev:29029]
+	* lib/irb/completion.rb: support for completion of numeric
+	  number. [ruby-dev: 29038]
 
-Tue Jul 18 23:53:59 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* process.c (rb_f_system): shouldn't block SIGCHLD if it's not
-	  exist.
+	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
 
 Tue Jul 18 22:10:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (rb_f_system): block SIGCHLD during the process
 	  execution, like glibc system(3) does.  [ruby-talk:202361]
 
-Tue Jul 18 23:10:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (open_ifs_socket): should not use plain malloc.
 
@@ -25404,11 +6476,6 @@ Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
 	  conform strtod change.
 
-Tue Jul 18 16:52:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (yield_under_i): argument should be passed in avalue
-	  form.  [ruby-dev:29044]
-
 Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_unpack): propagate association array to copied
@@ -25420,15 +6487,6 @@ Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): taint 'p' packed strings.
 
-Tue Jul 18 15:19:07 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* intern.h (st_foreach_safe): fix prototype.
-
-	* node.h (NODE_LMASK): bigger than long on LLP64.
-
-	* missing/vsnprintf.c (BSD__uqtoa): new function to support LLP64.
-	  all changes are derived from [ruby-dev:29045]
-
 Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
@@ -25444,7 +6502,7 @@ Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* util.c (ruby_strtod): stop at dot not followed by digits.
-	  fixed: [ruby-dev:29036]
+	  fixed: [ruby-dev:29035]
 
 Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -25455,23 +6513,23 @@ Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
 	  bug of cygwin 1.5.20.
 
-Mon Jul 17 22:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/io/wait/wait.c (io_ready_p): protoize.
-
 Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (define_swapx): should not use plain malloc.
 
-	* ext/curses/curses.c (curses_getmouse): ditto.
-
 Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
 
-Mon Jul 17 11:47:35 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* st.c: still need to include config.h on some platforms.
+	* eval.c (rb_require_safe): wait for another thread requiring the same
+	  feature.  fixed: [ruby-core:08229]
+
+Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (has_magic): glob names contain alphabets to enable case fold
+	  search also for directories.  fixed: [ruby-talk:201917]
 
 Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -25479,6 +6537,8 @@ Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  malloc/calloc, to detect memory allocation failure.  see
 	  <http://www.nongnu.org/failmalloc/>.
 
+	* gc.c (rb_memerror): should not raise empty nomem_error.
+
 Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
@@ -25490,6 +6550,10 @@ Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
 	  [ruby-core:08205]
 
+Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (then): error in warning action.
+
 Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
@@ -25501,23 +6565,15 @@ Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
 	  option database for the widget class which includes TkComposite.
 
-Thu Jul 13 00:40:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ruby.h (FIX2LONG): returns integer of size of VALUE.
-	  [ruby-dev:29024]
+	* lib/rss/parser.rb: updated documents by a patch from
+	  Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
 
-	* ruby.h (FIX2ULONG): ditto.
+Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Wed Jul 12 20:05:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_args): allow post mandatory arguments after optional
-	  arguments.  [ruby-dev:29014]
-
-	* parse.y (new_args_gen): allow post_args without rest_args.
-
-	* eval.c (formal_assign): ditto.
-
-	* parse.y (new_args_gen): check post argument duplication.
+	* parse.y (then): we'd like to reserve colon here for the future.
+	  warning added.
 
 Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -25532,42 +6588,10 @@ Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: security fix.
 
-Tue Jul 11 17:28:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_dump): need to extend len for \b.
 
-Tue Jul 11 15:29:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_int2big): use SIGNED_VALUE.  [ruby-dev:29019]
-
-	* bignum.c (rb_int2inum, rb_uint2inum): use VALUE sized integer.
-
-	* bignum.c (rb_big2long, rb_big2ulong): ditto.
-
-	* numeric.c (rb_num2long, rb_num2ulong): ditto.
-
-	* numeric.c (check_int, check_uint): ditto.
-
-	* bignum.c (rb_quad_pack): typo fixed.
-
-Tue Jul 11 13:40:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bignorm): sizeof(long) may be smaller than
-	  sizeof(VALUE).  [ruby-dev:29013]
-
-	* ruby.h (FIXNUM_MAX): fixnum may be bigger than long.
-
-	* ruby.h (SIGNED_VALUE): signed integer of size of VALUE.
-
-Mon Jul 10 23:37:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/soap/rpc/proxy.rb (Proxy::Operation::response_doc): remove
-	  splat star from return statements.
-
-	* lib/soap/rpc/proxy.rb (Proxy::Operation::response_obj): retrieve
-	  the first value from the result array if response has only one
-	  value.
-
 Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
@@ -25611,52 +6635,17 @@ Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/widget: ditto.
 
-Mon Jul 10 17:32:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/test.rb: update test suites.
-
-	* test/ruby/test_assignment.rb (TestAssignment::test_yield): ditto.
+Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* test/ruby/test_iterator.rb (TestIterator::test_itertest): ditto.
+	* 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.
 
-Mon Jul 10 14:43:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
 
-	* eval.c (rb_call): remove erroneously restored prot_tag->blkid
-	  initialization.  [ruby-dev:28997]  [ruby-dev:29000]
-
-Mon Jul 10 13:58:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c (install_nativethread_sighandler): commented out.
-
-Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_for_remove): clear entries for included
-	  module.  fixed: [ruby-core:08180]
+	* eval.c (ruby_native_thread_kill): ditto.
 
-Mon Jul 10 02:22:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should not overwrite block information in
-	  current frame.  [ruby-dev:28957]
-
-	* eval.c (rb_yield_0): retrieve proper block object from the frame
-	  record.
-
-	* eval.c (proc_alloc): return preserved block object if it's
-	  available.
-
-Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.h (st_data_t): use pointer sized integer for st_data_t.
-	  [ruby-dev:28988]
-
-Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
-
-	* lib/mkmf.rb (create_makefile): prevent substitution of macro
-	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
-
-Sun Jul  9 07:58:48 2006  Ryan Davis  <ryand@zenspider.com>
+Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
 
 	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
 	  Morikawa including new file suffixes, function support, public
@@ -25676,33 +6665,44 @@ Sun Jul  9 07:58:48 2006  Ryan Davis  <ryand@zenspider.com>
 
 	* lib/pp.rb: minor clarification on exception.
 
-Sun Jul  9 00:54:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (next_jump): deal with destination of next.
-	  fixed: [ruby-core:08169]
+	* eval.c (rb_clear_cache_for_undef): clear entries for included
+	  module.  fixed: [ruby-core:08180]
 
-Fri Jul  7 17:49:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_ord): extract lower byte.  fixed: [ruby-dev:28980]
+	* st.h (st_data_t): use pointer sized integer for st_data_t.
+	  [ruby-dev:28988]
 
-	* lib/jcode.rb (String#succ!): fix for 1.9.  fixed: [ruby-dev:28979]
+Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  7 14:05:03 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
 
-	* win32/Makefile.sub (config.h): define FUNC_STDCALL/FUNC_CDECL.
-	  from [ruby-dev:28970].
+	* lib/mkmf.rb (create_makefile): prevent substitution of macro
+	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
+
+Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (next_jump): deal with destination of next.
+	  fixed: [ruby-core:08169]
 
 Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_default): should not call default procedure if
 	  no key is given.  [ruby-list:42541]
 
-Thu Jul  6 23:30:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* time.c (time_mload): a patch from Daniel Berger
+	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
+
+Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
 	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
 
-Thu Jul  6 21:50:06 2006  Minero Aoki  <aamine@loveruby.net>
+Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
 
@@ -25712,35 +6712,11 @@ Thu Jul  6 21:50:06 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/racc/parser.rb: update coding style.
 
-Wed Jul  5 05:28:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (block_param): should allow block argument after splat
-	  and post splat args.
-
-Wed Jul  5 01:12:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_lambda.rb (TestLambdaParameters::test_lambda_as_iterator):
-	  -> style block no longer available.  [ruby-dev:28958]
-
-Tue Jul  4 21:48:56 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (proc_options): suppress warning on DOSISH.
-
-Tue Jul  4 15:12:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): should not set prot_tag->blkid since it would
-	  never catch breaks at this level.  [ruby-dev:28922]
-
-Tue Jul  4 04:48:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c: ruby 1.9 HEAD 64 bit warnings clean up from
-	  <ville.mattila at stonesoft.com>.   [ruby-core:08120]
-
 Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* 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 defined some event
+	  However, an embeddable menu may require to be definied some event
 	  bindings for general use.
 
 	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
@@ -25758,15 +6734,6 @@ Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  from int, and sys/types.h needs to be included before grp.h.
 	  fixed: [ruby-dev:28938]
 
-Mon Jul  3 10:44:01 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (popen_exec): close file descriptors other than standard I/Os.
-	  fixed: [ruby-dev:28924]
-
-Mon Jul  3 05:15:29 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_asn1.c: String#[]= doesn't accept Integer.
-
 Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_inspect): encode \b (\010) for escape.
@@ -25774,34 +6741,15 @@ Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_dump): ditto.
 
-Sun Jul  2 19:03:30 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original code, rev 1.7.
-
-	* ext/racc/cparse/cparse.c: must require version.h to get
-	  RUBY_VERSION_CODE.
-
-Sun Jul  2 18:42:27 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original source code, rev
-	  1.6.
-
-	* ext/racc/cparse/cparse.c: do not use rb_iterate to give a block
-	  to the method, use rb_block_call instead. [ruby-dev:28445]
+Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
 
-Sun Jul  2 11:22:03 2006  Tanaka Akira  <akr@m17n.org>
+	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
 
-	* io.c (io_reopen): STDOUT.reopen(filename, "w+") didn't work.
-	  (rb_io_reopen): STDOUT.reopen(File.open(filename, "w+")) didn't work.
-
-Sat Jul  1 23:55:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (PUSH_FRAME): initialize frame->self.  [ruby-dev:28911]
-
-Sat Jul  1 17:00:42 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/webrick/utils.rb: use Proc#yield instead of Proc#call.
-	  [ruby-dev:28914]
+	* 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).
 
 Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
 
@@ -25817,34 +6765,6 @@ Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* configure.in: -shared patch from Andrew Morrow
 	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
 
-Fri Jun 30 19:35:41 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils._escape): should
-	  use String#ord to get ascii code from the one-character string.
-	  [ruby-dev:28901]
-
-Thu Jun 29 23:56:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark_children): a bug in NODE_BLOCK_PASS marking.
-	  [ruby-dev:28908]
-
-Thu Jun 29 23:04:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: use ARGSPUSH instead of ARGSCAT to prevent too much
-	  splat expansion.
-
-	* eval.c (when_check): need to handle ARGSPUSH as well.
-
-	* eval.c (block_orphan): lambda and proc from method are always
-	  orphan.
-
-	* gc.c (gc_mark_children): proper marking for NODE_LAMBDA.
-
-Thu Jun 29 22:47:30 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (SETUP_ARGS0): avoid GC problem.
-	  [ruby-dev:28902]
-
 Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
@@ -25855,51 +6775,16 @@ Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
 	  mathew <meta at pobox.com>.   [ruby-core:07050]
 
-Wed Jun 28 14:53:09 2006  Eric Hodel  <drbrain@segment7.net>
+Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
 	  [ruby-core:08087]
 
-Wed Jun 28 23:23:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): underscores should appear only
-	  between digits.  [ruby-dev:28891]
-
 Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
 
 	* test/socket/test_unix.rb: test_seqpacket_pair removed.
 	  [ruby-dev:28846]
 
-Wed Jun 28 13:51:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (when_check): arbitrary values are allowed after splats.
-	  fixed: [ruby-dev:28879]
-
-Wed Jun 28 09:16:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): remove meaningless else-only case statement
-	  syntax.
-
-Wed Jun 28 08:08:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): problem to handle else part.  [ruby-dev:28873]
-
-Wed Jun 28 01:48:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): support splat in when expression list.
-	  [ruby-dev:28822]
-
-	* eval.c (when_check): a new auxiliary function for case match.
-
-	* eval.c (when_cond): ditto.
-
-Wed Jun 28 01:05:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): should not skip '_' at the beginning
-	  of a string.  [ruby-dev:28830]
-
-	* bignum.c (rb_cstr_to_inum): ditto.
-
 Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c: RDoc update for =~ method.  a patch from Alex Young
@@ -25912,17 +6797,6 @@ Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* 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".
 
-Tue Jun 27 20:05:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (pipe_open): backout unnecessary fix on 2006-06-26.
-	  [ruby-dev:28865]
-
-	* eval.c (rb_yield_0): exact argument number check now done only
-	  for lambda Proc.
-
-	* eval.c (rb_yield_0): add check for number of arguments, if
-	  there's one lambda block parameter.
-
 Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
@@ -25935,246 +6809,297 @@ Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
 	  so on.  [ruby-talk:199102]
 
-Tue Jun 27 10:46:53 2006  Tanaka Akira  <akr@m17n.org>
+Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c (rb_yield_0): avoid core dump.  [ruby-dev:28840]
+	* lib/rdoc: Merge from HEAD.
+	  Add options to limit the ri search path.
 
-Mon Jun 26 11:03:00 2006  Eric Hodel  <drbrain@segment7.net>
+Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/ri: Add options to limit the ri search path.
-
-Tue Jun 27 01:31:59 2006  Tanaka Akira  <akr@m17n.org>
-
-	* 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.
-
-Tue Jun 27 00:52:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/ripper/eventids2.c (token_assoc): added tCHAR, which is not
-	  under 256 now.  fixed: [ruby-dev:28832]
-
-Mon Jun 26 23:42:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (call_trace_func): no check for argument number of the
-	  callback.  fixed: [ruby-dev:28812]
+	* util.c (powersOf10): constified.
 
 Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
 	  deleted on callback.
 
-Mon Jun 26 15:40:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_accept): revert to avoid ambiguity of
-	  argument evaluation order.  [ruby-dev:28861]
-
-	* ext/socket/socket.c (sock_accept_nonblock): ditto.
-
 Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (pipe_open): avoid closing uninitialized file descriptors.
 	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
 
+Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
+
 Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
 
-Sun Jun 25 17:44:16 2006  Tanaka Akira  <akr@m17n.org>
+Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* parse.y (paren_args): wrap $2 by escape_Qundef because it may be
-	  Qundef.  [ruby-dev:28843]
+	* signal.c: revert last change.
 
-Sun Jun 25 17:18:33 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* ruby.h: ditto.
 
-	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
-	  method of word. [ruby-Bugs#3237]
+	* eval.c: ditto.
 
-	* test/win32ole/test_word.rb: ditto.
+Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Sat Jun 24 23:48:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
+	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
 
-	* parse.y: replace terminal token names with more descriptive
-	  name, i.e. kEND to keyword_end.  [ruby-list:42477]
+Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
 
-Sat Jun 24 23:37:41 2006  Tanaka Akira  <akr@m17n.org>
+	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
+	  [ruby-dev:28778]
 
-	* eval.c (rb_eval): use rb_ary_new2 instead of rb_ary_new4 to avoid
-	  GC problem.
-	  (rb_yield_values): use rb_ary_new2 instead of rb_ary_new4.
+Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* array.c (rb_ary_new4): don't set len as n if contents is not
-	  initialized.  make it safe with GC.
+	* lib/date.rb (jd_to_commercial): now works fine even if in
+	  mathn-ized context.
 
-	  [ruby-dev:28826]
+Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Fri Jun 23 23:35:32 2006  Tanaka Akira  <akr@m17n.org>
+	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
+	  sigsend_to_ruby_thread, install_nativethread_sighandler):
+	  nativethread-support on signal handler (backport from 1.9).
 
-	* ruby.h, lib/drb/drb.rb, lib/drb/invokemethod.rb: remove Values class.
-	  [ruby-dev:28805]
+	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
 
-Fri Jun 23 17:27:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (ruby_native_thread_kill): ditto.
 
-	* eval.c (rb_block_pass): removed.
+Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_thread_start_1): use rb_proc_yield() instead of
-	  rb_block_pass().  fixed: [ruby-dev:28794]
+	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
+	  and Time processing.  [ruby-core:08033]
 
-Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
-	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
+	* parse.y (yylex, reswords): modifier token is no longer returned in
+	  fname state.  [ruby-dev:28775]
 
-Thu Jun 22 11:47:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* variable.c (rb_mod_name): returns nil for anonymous modules.
-	  [ruby-talk:198440]
+	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
+	  supported date type.
 
-Thu Jun 22 10:31:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* string.c (rb_str_aref): "abc"[3] should not return an empty
-	  string but nil.  [ruby-dev:28786]
+	* 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.
 
-Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
+Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
-	  [ruby-dev:28778]
+	* lib/rss/rss.rb: provided default RSS::Element#children.
 
-Wed Jun 21 21:20:31 2006  Tadayoshi Funaba  <tadf@dotrb.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.
 
-	* lib/date.rb (jd_to_commercial): now works fine even if in
-	  mathn-ized context.
+Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Jun 21 17:29:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/rss/rss.rb: provided default RSS::Element#_tags.
 
-	* ext/socket/getaddrinfo.c (freeaddrinfo, get_name): fixed typo.
+	* 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.
 
-	* ext/tk/tcltklib.c (tcl_eval, tcl_global_eval): ditto.
+Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/zlib/zlib.c (rscheck): constified.
+	* 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.
 
-Wed Jun 21 17:18:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* lib/pp.rb (PP::PPMethods::seplist): should have preserved
-	  original reference to the array.  [ruby-dev:28747]
+Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Wed Jun 21 14:35:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
 
-	* parse.y (block_param): do not use multiple assignment for a sole
-	  block parameter.  [ruby-dev:28710]
+	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
+	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
 
-	* eval.c (rb_yield_0): pass a raw yielded value to a sole block
-	  parameter if a value is passed by yield.
+	* ext/openssl/lib/openssl/cipher.rb:
+	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
+	  - reimplement without eval()
 
-	* eval.c (proc_invoke): args may not be an array.
+	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
 
-	* eval.c (rb_proc_yield): pass original value without wrapping
-	  it in an array.
+	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
+	  features.
 
-Wed Jun 21 14:06:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* sample/openssl/cipher.rb: rewrite all.
 
-	* parse.y (method_call): remove (fn)(args) style lambda
-	  invocation, add fn.(args) instead.
+Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
 
-Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
 
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
-	  and Time processing.  [ruby-core:08033]
+Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Jun 21 03:01:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* eval.c, file.c, etc.: code-cleanup patch from Stefan Huehner
-	  <stefan at huehner.org>.  [ruby-core:08029]
+	* 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.
 
-Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* parse.y (reswords): modifier token is no longer returned in fname
-	  state.  fixed: [ruby-dev:28775]
+	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
 
-Tue Jun 20 23:28:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
+	  imported nkf 2.0.7.
 
-	* ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
+Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/optparse.rb (OptionParser::List#summarize, OptionParser#order!): ditto.
+	* 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.
 
-Tue Jun 20 11:07:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* eval.c (proc_invoke): intercept break and return from lambda
-	  Proc objects.  [ruby-dev:28742]
+	* lib/rss/2.0.rb: removed #other_element.
 
-	* eval.c (proc_invoke): remove unnecessary YIELD_PROC_CALL flag.
+Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* eval.c (YIELD_EXACT_ARGS): renamed from YIELD_LAMBDA_CALL, which
-	  is no longer related to the behavior turned on by this flag.
+	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
+	  method of word. [ruby-Bugs#3237]
 
-	* eval.c (return_jump): no need to care about PROT_YIELD.
+	* ext/win32ole/tests/test_word.rb: ditto.
 
-	* eval.c (break_jump): no jump to toplevel PROT_THREAD tag.
+	* ext/win32ole/tests/testall.rb: ditto.
 
-	* eval.c (rb_yield_0): fix confusion between lambda (which is a
-	  property of a proc) and pcall (which depends on whether it's
-	  called via yield or call).
+Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* eval.c (rb_thread_yield): no need to specify YIELD_LAMBDA_CALL.
+	* lib/rss/rss.rb: automatically detected attributes.
 
-	* eval.c (rb_block_pass): update blkid in prot_tag.
+	* 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.
 
-Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/rss/parser.rb: followed new internal API.
 
-	  * ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
+Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	  * ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
-	    imported nkf 2.0.7.
+	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
 
-Mon Jun 19 17:02:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* sample/test.rb (proc_return3): return within non lambda block
-	  should terminate surrounding method.  [ruby-dev:28741]
+	* 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.
 
-Mon Jun 19 13:22:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
+	  detect backward compatibility initial arguments.
 
-	* ext/socket/socket.c (unix_sysaccept): typo fixed.
+	* lib/rss/parser.rb: user initial attributes to initialize
+	  RSS::Element.
 
-	* ext/socket/socket.c (sock_connect): remove an unused local
-	  variable tmpaddr.
+Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Mon Jun 19 02:10:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/converter.rb: use NKF for Uconv fallback.
 
-	* ext/socket/socket.c (tcp_accept_nonblock): forgot to remove
-	  abandoned hacks.  [ruby-dev:28740]
+Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/rss/test_image.rb: shared name space configuration.
 
-	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
+Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Jun 18 20:28:43 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* 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.
 
-	* ext/win32ole/win32ole.c (fole_methods): The return value
-	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
+	* test/rss/test_parser.rb: ditto.
 
-	* ext/win32ole/win32ole.c (fole_put_methods): The return value
-	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
+Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/win32ole/test_ole_methods.rb: ditto.
+	* 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.
 
-	* ext/win32ole/win32ole.c (ole_propertyput): support
-	  PROPERTYPUTREF. [ruby-talk:183042]
+Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/win32ole/test_propertyputref.rb: ditto.
+	* lib/rss/parser.rb: removed a guard for requiring open-uri.
 
-Sat Jun 17 23:42:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* eval.c (Init_eval): add aliases invoke_method and
-	  invoke_functional_method corresponding send and funcall
-	  respectively.  [ruby-talk:197512]
+	* 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.
 
-	* parse.y (parser_yylex): returns the most typical keyword token
-	  on EXPR_FNAME.  [ruby-core:7995]
+Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/socket/socket.c: protoize.
+	* 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.
+
+	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
+	* test/rss/test_2.0.rb: ditto.
+
+Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
+
+	* 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.
 
 Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -26183,147 +7108,227 @@ Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/pathname.rb (Kernel#Pathname): new method.
+	* lib/pathname.rb: backport from 1.9.
+	  (Kernel#Pathname): new method.
 
-Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
+Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
-	  string.
+	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
 
-Fri Jun 16 01:41:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
+	  [ruby-talk:197284]
 
-	* eval.c (rb_proc_arity): get rid of segfault for mere splat.
+	  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"))}
 
-	* gc.c (gc_mark_children): NODE_BLOCK_PASS needs u3 to be marked.
+	* test/rss/test_1.0.rb: added #to_xml test.
+	* test/rss/test_2.0.rb: ditto.
 
-Thu Jun 15 22:06:56 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/rss/rss-testcase.rb: added some helper methods that
+	  generates sample RSS 2.0.
 
-	* parse.y (then): remove ':' from 'then' and 'do' rules.
+	* sample/rss/convert.rb: added a sample script to convert RSS format.
 
-Wed Jun 14 18:00:20 2006  Eric Hodel  <drbrain@segment7.net>
+Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-	* enum.c (enum_any): Documentation typo.
+	* lib/rss/rss.rb (Kernel#funcall): removed.
+	* lib/rss/parser.rb (Kernel.URI): removed.
 
-Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
+	* lib/rss/maker/: supported
+	    xxx.new_yyy do |yyy|
+	      yyy.zzz = zzz
+	      ...
+	    end
+	  style and this style became the style of the recommendation.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
-	  warnings when -q is set.
+	  Old style
+	    yyy = xxx.new_yyy
+	    yyy.zzz = zzz
+	    ...
+	  is supported too but this style isn't recommended.
+	  [ruby-talk:197284]
 
-Wed Jun 14 16:11:37 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/rss/test_*maker*.rb: used new recommended style.
 
-	* eval.c (rb_f_method_name, rb_f_callee_name): document typo.
+Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Jun 14 15:19:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
 
-	* hash.c (env_aset): raise TypeError on nil with more descriptive
-	  message.  [ruby-core:07990]
+	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
+	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
 
-Tue Jun 13 17:22:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/trackback.rb: added TrackBack prefix.
+	* lib/rss/maker/trackback.rb: ditto.
 
-	* ext/socket/socket.c (Init_socket): remove obsolete constants:
-	  IPsocket, TCPsocket, SOCKSsocket, TCPserver, UDPsocket,
-	  UNIXsocket, UNIXserver.
+	* lib/rss/rss.rb : removed needless argument 'prefix'.
+	* lib/rss/parser.rb: ditto.
 
-Tue Jun 13 09:07:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rss/1.0.rb: added rdf:Bag.
 
-	* eval.c (formal_assign): post splat arguments should have had
-	  higher priority than optional arguments, since they are
-	  mandatory.  [ruby-dev:28715]
+	* lib/rss/taxonomy.rb: implemented taxonomy module.
+	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
 
-	* eval.c (VIS_MASK): broken. should be 15.  [ruby-dev:28715]
+	* 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.
 
-	* io.c (argf_getc): should return one-character string.
-	  [ruby-dev:28715]
+	* 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.
 
-	* io.c (rb_io_readchar): ditto.
+	* 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.
 
-Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* object.c (sym_call): disallow to call private methods.
+	* 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.
 
-	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
-	  parser.
+	* 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.
 
-Sun Jun 11 09:56:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/rss/rss-testcase.rb: added convenience method for setting
+	  up taxo:topic.
+	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
 
-	* win32/win32.h (write): not need to define on bcc.
+	* sample/rss/blend.rb: followed new API.
 
-Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/taxonomy.rb: changed class or module prefix to
+	  Taxonomy from Taxo.
+	* lib/rss/maker/taxonomy.rb: ditto.
 
-	* lib/optparse.rb (OptionParser#getopts): new methods.
+	* test/rss/test_taxonomy.rb: use #reject directory.
 
-Sun Jun 11 07:27:11 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/rss/: use #__send__ instead of #send.
+	* test/rss/: ditto.
 
-	* lib/rdoc/ri/ri_writer.rb: use String#ord.
+	* lib/rss/parser.rb: added entity handling type predicate.
+	* lib/rss/rexmlparser.rb: ditto.
+	* lib/rss/xmlparser.rb: ditto.
+	* lib/rss/xmlscanner.rb: ditto.
 
-Sun Jun 11 04:38:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/xmlscanner.rb: more robust entity handling.
 
-	* object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
+	* test/rss/test_parser.rb: added an entity handling test.
 
-Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-	  fixed: raize -> raise.  [ruby-talk:196608]
+	* lib/rss/image.rb: added Image prefix.
+	* lib/rss/maker/image.rb: ditto.
 
-Sat Jun 10 17:49:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* 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.
 
-	* string.c (rb_str_ord): new method.
+	* 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.
 
-	* parse.y (rbracket): allow optional newline before closing
-	  brackets.
+	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
 
-Sat Jun 10 15:12:29 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/rss/rss-assertions.rb: improved type conversion assertions.
 
-	* eval.c (rb_f_method_name, rb_f_callee_name): new functions.
-	  new global method `__method__' and `__callee__'.
+	* 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.
 
-Sat Jun 10 10:13:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
 
-	* lib/getoptlong.rb (GetoptLong#set_options): receive arguments
-	  as Array.
+	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+	  string.
 
-	* lib/irb/slex.rb: use Proc#yield.
+Sat Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
-	  of String#[].
+	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
 
-	* lib/rdoc/ri/ri_writer.rb: ditto.
+Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-Sat Jun 10 08:17:23 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/win32ole/win32ole.c (ole_propertyput): support
+	  PROPERTYPUTREF. [ruby-talk:183042]
 
-	* math.c (log2): may be a macro.
+	* ext/win32ole/tests/test_propertyputref.rb: ditto.
 
-	* parse.y (args, block_param, f_args): pass f_post_arg to #params.
+Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* util.c (powersOf10): constified.
+	* ext/win32ole/win32ole.c (fole_methods): The return value
+	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
+
+	* ext/win32ole/win32ole.c (fole_put_methods): The return value
+	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
 
-	* ext/readline/readline.c: include extconf.h first.
+	* ext/win32ole/tests/test_ole_methods.rb: ditto.
 
-	* ext/ripper/eventids2.c: removed tLAMBDA_ARG.
+	* ext/win32ole/tests/testall.rb : ditto.
 
-	* ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
+Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
-	  defined as const now.
+	* enum.c (enum_any): Documentation typo.
 
-	* ext/win32ole/win32ole.c (fole_missing): ditto.
+Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/mkmf.rb (create_makefile): force to create extconf header.
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
+	  warnings when -q is set.
 
-	* lib/optparse.rb (order!): use Proc#yield.
+Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
 
-Sat Jun 10 06:53:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: check sizeof(rlim_t).
+	  check setrlimit.
 
-	* eval.c (CALLARGS): remove last semicolon. C90 compiler doesn't
-	  allow any lines (even if they're empty) within variable
-	  declarations.
+	* process.c (proc_getrlimit): new method Process.getrlimit.
+	  (proc_setrlimit): new method Process.setrlimit.
 
-Fri Jun  9 09:56:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby.h (NUM2ULL): new macro.
 
-	* sprintf.c (rb_str_format): allow %c to print one character
-	  string (e.g. ?x).
+Mon Jun 12 22:25:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Thu Jun  8 14:00:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
+	  splitting multi-byte characters.  [ruby-list:42389]
+
+Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
+	  parser.
+
+Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.h (write): not need to define on bcc.
+
+Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#getopts): new methods.
+
+Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
+	  fixed: raize -> raise.  [ruby-talk:196608]
+
+Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
 	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
@@ -26333,25 +7338,43 @@ Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
 	  basename and pid.  [ruby-talk:196272]
 
-Wed Jun  7 16:16:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* parse.y (do_block): remove -> style block.
+	* win32/win32.c (errmap): add some winsock errors.
 
-	* parse.y (parser_yylex): remove tLAMBDA_ARG.
+Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Jun  7 14:51:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: add new configure option `--with-winsock2' for mingw.
 
-	* win32/win32.c (errmap): add some winsock errors.
+	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
+	  instead of in CPPFLAGS.
+
+	* ext/socket/extconf.rb: determine whether to use winsock2 or not
+	  by using with_config.
+
+Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
+	  new configure option `--with-winsock2'.
+
+	* win32/win32.c (StartSockets): ditto.
+
+	* ext/socket/extconf.rb: ditto.
+
+	* win32/win32.c (open_ifs_socket): new function.
+
+	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
+	  instead of socket().
+	  ifs socket support is backported from trunk.
 
 Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): binding for the return event hook should have
 	  consistent scope.  [ruby-core:07928]
 
-Tue Jun  6 23:25:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): return behavior should depend whether it
-	  is surrounded by a lambda or a mere block.
+	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
+	  event_hooks.	no guarantee for arbitrary hook deletion.
+	  [ruby-dev:28632]
 
 Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
 
@@ -26365,21 +7388,12 @@ Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
 	* ext/socket/socket.c: fix sockaddr_un handling.
 	  [ruby-dev:28677]
 
-Sat Jun  3 23:53:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (formal_assign): handles post splat arguments.
-
-	* eval.c (rb_call0): ditto.
-
-Sat Jun  3 13:10:41 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* st.c (strhash): use FNV-1a hash.
+	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
+	  <jan.svitok at gmail.com>.  [ruby-core:07943]
 
-Fri Jun  2 20:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): removed experimental ';;' terminator.
-
-Fri Jun  2 19:00:40 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: use create_header.
 
@@ -26408,83 +7422,23 @@ Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
 	  no longer has special meanings.  fixed: [ruby-list:42311]
 
-Thu Jun  1 17:55:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_node_arity): should be aware of post splat arguments.
-
-	* eval.c (rb_proc_arity): ditto.
-
-Thu Jun  1 16:17:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* 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]
 
-Thu Jun  1 16:07:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_args): syntax rule enhanced to support arguments
-	  after the splat.
-
-	* parse.y (mlhs_basic): ditto for multiple assignments
-
-	* parse.y (block_param): ditto for block parameters.
-
-	* parse.y (f_post_arg): mandatory formal arguments after the splat
-	  argument.
-
-	* parse.y (new_args_gen): generate nodes for mandatory formal
-	  arguments after the splat argument.
-
-	* eval.c (rb_eval): dispatch mandatory formal arguments after the
-	  splat argument.
-
-Thu Jun  1 11:33:32 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_getcwd): set errno if not set.
 	  fixed [ruby-list:42346]
 
-Thu Jun  1 00:45:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (args): allow more than one splat in the argument list.
-
-Wed May 31 18:38:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (method_call): allow aref [] to accept all kind of
-	  method argument, including assocs, splat, and block argument.
-
-	* eval.c (SETUP_ARGS0): prepare block argument as well.
-
-Tue May 30 18:13:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
-
-Mon May 29 22:40:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_line): print receivers true/false/nil specially.
-
-	* eval.c (rb_proc_yield): handles parameters in yield semantics.
-
-	* eval.c (nil_yield): gives LocalJumpError to denote no block
-	  error.
-
-	* io.c (rb_io_getc): now takes one-character string.
-
-Sat May 27 22:46:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): save and restore block in the current frame.
-	  fixed: [ruby-core:07833], [ruby-talk:191639]
-
-Sat May 27 11:29:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): remove extinit files if no statically linked
 	  extensions.
 
-Fri May 26 19:56:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
-	  hashing algorithm.
-
-Fri May 26 09:05:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
 	  macros moved to extconf.h.
@@ -26499,7 +7453,7 @@ Fri May 26 09:05:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
 
-Thu May 25 01:52:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (pkg_config): particular config commands support.
 
@@ -26513,27 +7467,23 @@ Thu May 25 01:52:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/setup.mak: suffix OS name by runtime version.
 
-Wed May 24 23:52:11 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_install_sh): ignore dummy install-sh.
 	  [ruby-talk:193876]
 
-Wed May 24 17:55:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_aref): str[0] now returns 1 character string,
-	  instead of a fixnum.	[Ruby2]
-
-	* parse.y (parser_yylex): ?c now returns 1 character string,
-	  instead of a fixnum.	[Ruby2]
-
-	* string.c (rb_str_aset): no longer support fixnum insertion.
-
-Wed May 24 03:10:44 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/ssl.rb
 	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
 
-Mon May 22 16:32:03 2006  Tanaka Akira  <akr@m17n.org>
+Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
+	  instead of rb_io_read_pending.
+	  [ruby-dev:28663]
+
+Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
 
 	* rubyio.h (rb_io_set_nonblock): declared.
 
@@ -26542,8 +7492,7 @@ Mon May 22 16:32:03 2006  Tanaka Akira  <akr@m17n.org>
 	  (io_read_nonblock): new method: IO#read_nonblock.
 	  (io_write_nonblock): new method: IO#write_nonblock.
 
-	* ext/socket/socket.c (s_accept): retry for EWOULDBLOCK.
-	  revert [ruby-talk:113807].
+	* 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.
@@ -26560,33 +7509,6 @@ Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (ev_const_get): should support constant access from
 	  within instance_eval().  [ruby-dev:28327]
 
-Sun May 21 09:50:31 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* regexec.c: add STK_NULL_CHECK_END to IS_TO_VOID_TARGET().
-	  [ruby-list:42234]
-
-Thu May 18 22:37:20 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb (WEBrick::Config::HTTP): add new parameters,
-	  :InputBufferSize and :OutputBufferSize.
-
-	* lib/webrick/utils.rb (WEBrick::Utils.timeout): add new timeout
-	  method. this implementation is expected to be compatible with
-	  timeout.rb and faster than timeout.rb.
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#_read_data):
-	  Timeout.timeout is replaced by WEBrick::Utils.timeout.
-
-	* lib/webrick/httprequest.rb: WEBrick::HTTPRequest::BUFSIZE is
-	  replaced by config[:InputBufferSize].
-
-	* lib/webrick/httpresposne.rb: WEBrick::HTTPResponse::BUFSIZE is
-	  replaced by config[:OutputBufferSize].
-
-	* lib/webrick/server.rb: get rid of unnecessary require.
-
-	* test/webrick/test_utils.rb: test for WEBrick::Utils.timeout.
-
 Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_timeval): should round for usec floating
@@ -26594,21 +7516,24 @@ Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* time.c (time_add): ditto.
 
-Thu May 18 00:42:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
+	  <fuj at rabbix.jp>.  [ruby-dev:28649]
+
+Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
 
 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]
+	  rb_sys_warning() indirectly.  [ruby-core:07886]
 
-Tue May 16 17:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
+Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* numeric.c (flo_divmod): the first element of Float#divmod should
-	  be an integer. [ruby-dev:28589]
-
-	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
+	* util.c (ruby_strtod): try to reduce errors using powersOf10
+	  table.  [ruby-dev:28644]
 
 Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -26626,10 +7551,6 @@ Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
 
-Mon May 15 21:37:12 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c (rb_reg_prepare_re): don't use onig_recompile().
-
 Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
@@ -26643,85 +7564,40 @@ Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
 	  (Struct#pretty_print_cycle): ditto.
 	  [ruby-core:7865]
 
-Fri May 12 15:54:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
-	  event_hooks.	no guarantee for arbitrary hook deletion.
-	  [ruby-dev:28632]
-
 Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* util.c (ruby_strtod): differ addition to minimize error.
 	  [ruby-dev:28619]
 
-Thu May 11 18:30:11 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): should return
-	  value. [ruby-dev:28627]
+	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
+	  documented.
 
 Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* util.c (ruby_strtod): should not raise ERANGE when the input
 	  string does not have any digits.  [ruby-dev:28629]
 
-Wed May 10 23:40:21 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* oniguruma.h: Version 4.0.3
-
-	* regexec.c: ditto.
-
-Mon May  8 09:10:31 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
-
-	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
-	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init): refine warning message.
-
-	* ext/openssl/lib/openssl/cipher.rb: reimplement without eval() and
-	  add constants AES128, AES192, AES256. [ruby-dev:28610]
-
-	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
-
-	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
-	  features.
-
-	* sample/openssl/cipher.rb: rewrite all.
-
 Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
 
 	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
 	  Use AF_INET6 for nameservers containing colons.
 
-Sat May  6 23:40:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should restore old ruby_frame->block.
-	  thanks to ts <decoux at moulon.inra.fr>.  [ruby-core:07833]
-	  also fix [ruby-dev:28614] as well.
-
 Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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]
 
-Thu May  4 22:13:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (math_log2): add new method inspired by
-	  [ruby-talk:191237].
-
-	* math.c (math_log): add optional base argument to Math::log().
-	  [ruby-talk:191308]
-
 Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
-	  uninitialized array element.	a patch from Pat Eyler
+	  uninitialized array element.  a patch from Pat Eyler
 	  <rubypate at gmail.com>.  [ruby-core:07809]
 
 	* array.c (rb_ary_fill): initialize local variables first.  a
-	  patch from Pat Eyler <rubypate at gmail.com>.	 [ruby-core:07810]
+	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
 
 	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
 	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
@@ -26733,17 +7609,17 @@ Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  check from Sam Roberts <sroberts at uniserve.com>.
 	  [ruby-core:07691]
 
-Mon May  1 17:58:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
 
-	* ext/win32ole/win32ole.c (add_event_call_back): should not
-	  delete event handler when the event name is not entried.
+	* numeric.c (num_div): use floor rather than rb_Integer().
+	  [ruby-dev:28589]
 
-Mon May  1 08:32:10 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* numeric.c (flo_divmod): the first element of Float#divmod should
+	  be an integer. [ruby-dev:28589]
 
-	* ext/win32ole/win32ole.c (ole_param_ole_type): should return
-	  "unknown type" string when ITypeInfo::GetFuncDesc failed.
+	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
 
-Sat Apr 29 22:43:37 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
 	  flag. [ruby-core:07785]
@@ -26753,6 +7629,8 @@ Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* util.c (ruby_strtod): should not cut off 18 digits for no
 	  reason.  [ruby-core:07796]
 
+	* util.c (ruby_strtod): fixed wrong conversion.
+
 Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_fill): internalize local variable "beg" to
@@ -26761,12 +7639,7 @@ Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
-	  <tommy at tmtm.org>.	[ruby-dev:28601]
-
-Wed Apr 26 16:55:19 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* applied code clean-up patch from Stefan Huehner
-	  <stefan at huehner.org>.  [ruby-core:07764]
+	  <tommy at tmtm.org>.  [ruby-dev:28601]
 
 Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -26779,6 +7652,12 @@ Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  squeezing character sequence (i.e. a character) as well.  thanks
 	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
 
+Tue Apr 25 00:08:24 2006  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]
+
 Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
@@ -26789,11 +7668,6 @@ Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/socket/socket.c: document update patch from Sam Roberts
 	  <sroberts at uniserve.com>.  [ruby-core:07701]
 
-Thu Apr 20 08:43:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Integer): need not to remove gcd2.  a patch from
-	  NARUSE, Yui <naruse at airemix.com>.	[ruby-dev:28570]
-
 Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (arg): too much NEW_LIST()
@@ -26805,6 +7679,8 @@ Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
 	  [ruby-dev:28585]
 
+	* parse.y (list_concat): revert last change.
+
 	* parse.y (arg): use NODE_ARGSCAT for placeholder.
 
 Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -26817,6 +7693,11 @@ Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* variable.c (rb_const_set): raise error when no target klass is
 	  supplied.  [ruby-dev:28582]
 
+Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* parse.y (list_concat): should not modify nodes other than
+	  NODE_ARRAY.  [ruby-dev:28583]
+
 Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
@@ -26827,6 +7708,19 @@ Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
 
+Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c: block_unique should be 1, not frame_unique.
+	  [ruby-dev:28577]
+
+Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* 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.
+
 Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* prec.c (prec_prec_f): documentation patch from
@@ -26841,30 +7735,10 @@ Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* README.EXT: update symbol description.  [ruby-talk:188104]
 
-Sat Apr  8 18:06:28 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_METHOD#inspect,
-	  WIN32OLE_PARAM#inspect.
-
-	* test/win32ole/test_win32ole_method.rb: ditto.
-
-	* add test/win32ole/test_win32ole_param.rb.
-
-Fri Apr  7 22:11:30 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(foletypelib_initialize): WIN32OLE_TYPELIB.new
-	  accepts OLE file.
-
-	* test/win32ole/test_win32ole_typelib.rb(test_initialize): ditto.
-
 Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
 
-Thu Apr  6 16:43:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* intern.h (rb_obj_instance_exec, rb_mod_module_exec): add declaration.
-
 Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
@@ -26888,51 +7762,27 @@ Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
 	  variables.
 
-Wed Apr  5 00:22:54 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: use a subclass for instantiation except
-	  methods take pathname argument.  suggested by Evan Phoenix.
-	  [ruby-core:7618]
-
-Tue Apr  4 22:15:41 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: remove some obsolete syntax rules (unparenthesized
-	  method calls in argument list).
-
-Sat Apr  1 15:11:27 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/win32ole/win32ole.c: add WIN32OLE_TYPE#inspect,
-	  WIN32OLE_VARIABLE#inspect
+	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
+	  multi arguments.
 
-	* remove ext/win32ole/tests/testOLEVARIABLE.rb, testOLETYPE.rb
-	  testOLETYPELIB.rb.
+	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
 
-	* testall.rb: ditto.
-
-	* add test/win32ole
-
-Fri Mar 31 14:24:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (enumerator_with_index): removed suspicious return
-	  statement.
-
-Wed Mar 29 23:06:48 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): change the behavior of
-	  WIN32OLE#[], WIN32OLE#[]=. These methods invoke DISPID_VALUE.
-
-	* ext/win32ole/sample/excel2.rb: ditto.
-
-	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Wed Mar 29 10:11:31 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
 	  e2w_conv): support C90 compiler.
 
-Mon Mar 27 22:45:37 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (backtrace): reports aliased method names in a generated
+	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
+	  [ruby-dev:28471]
 
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c}: imported nkf 2.0.6.
+Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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.
@@ -26943,12 +7793,6 @@ Mon Mar 27 22:45:37 2006  NARUSE, Yui  <naruse@ruby-lang.org>
 	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
 	  Note that Kconv.to* still imply -X.
 
-	* ext/nkf/test.rb: Removed.  Obsolete by test/nkf.
-
-	* ext/.document: enabled documents in nkf and kconv
-
-	* ext/nkf/nkf.c, ext/nkf/lib/kconv.rb: Add rdoc.
-
 Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): insecure calling should be checked for non
@@ -26957,125 +7801,53 @@ Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_alias): should preserve the current safe level as
 	  well as method definition.
 
-Sun Mar 26 22:02:51 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c: refactoring for options.
-
-	* parse.y: ditto.
-
-Fri Mar 24 21:11:02 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c (match_aref): RDoc description updated.
-
-	* string.c (rb_str_sub): ditto.
+Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_gsub): ditto.
+	* eval.c (yield_under_i): pass self again for instance_eval().
+	  [ruby-dev:28466]
 
 Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* process.c (rb_f_sleep): remove RDoc description about SIGALRM
-	  which is not valid on the current implementation. [ruby-dev:28464]
-
-Thu Mar 23 21:40:47 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c (rb_reg_regsub): prohibit \1, \2 ...\9 in replaced string
-	  for named regex pattern.
-
-Thu Mar 23 21:06:23 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* oniguruma.h: Version 4.0.2
-
-	* regparse.c: ditto.
-
-	* regcomp.c ditto.
-
-	* regerror.c: ditto.
+	* process.c (rb_f_sleep): remove description about SIGALRM which
+	  is not valid on the current implementation.  [ruby-dev:28464]
 
 Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (method_missing): should support argument splat in
-	  super.  a bug in combination of super, splat and
-	  method_missing.  [ruby-talk:185438]
-
-Thu Mar 23 00:01:32 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c (rb_reg_regsub): add back reference by name \k<name> in
-	  replace string.
-
-	* re.h: add regexp argument to rb_reg_regsub().
-
-	* string.c (rb_str_sub_bang): ditto.
-
-	* string.c (str_gsub): ditto.
-
-Tue Mar 21 22:14:01 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* re.c (match_alloc): initialize member regexp.
-
-	* re.c (match_aref): add String and Symbol argument. [ruby-dev:28448]
-
-	* re.h: add member regexp to RMatch.
-
-	* gc.c (gc_mark_children): add gc_mark() to regexp member.
+	  super.  [ruby-talk:185438]
 
 Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: Solaris SunPro compiler -rapth patch from
 	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
 
-Mon Mar 20 11:12:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (folevariant_value): could not compile
-	  with C90 compiler.
-
 Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: remove enable_rpath=no for Solaris.
 	  [ruby-dev:28440]
 
-Sun Mar 19 09:46:30 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
-	  of converting	 OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
-	  String object.
+	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
+	  [ruby-core:07571]
 
-	* ext/win32ole/win32ole.c (folevariant_value): ditto.
-
-	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-
-Wed Mar 15 16:51:11 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): support libraries without *.so.
 
-Wed Mar 15 16:39:29 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
 	  "rb_str_new(0, 0)" to make empty string.
 
-Sun Mar 12 17:02:10 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_val2olevariantdata): support VT_ARRAY in
-	  WIN32OLE_VARIANT.new().
-
-	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
-
-	* ext/win32ole/tests/testOLEPARAM.rb: test method name should not be
-	  duplicated.
-
 Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
+	  space before argument parenthesis.  [ruby-talk:183630]
+
 	* ruby.1: a clarification patch from David Lutterkort
 	  <dlutter at redhat.com>.  [ruby-core:7508]
 
-Sun Mar  5 18:40:58 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: do not repeat command options.
-
-Sun Mar  5 18:35:03 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (send_request_with_body): #content_type never
-	  return false, use #main_type instead. [ruby-core:07476]
-
 Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (id2ref): fix symbol test.
@@ -27083,112 +7855,84 @@ Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
 Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
-	  directories.	a patch from Eric Hodel <drbrain at segment7.net>.
+	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
 	  [ruby-core:07423]
 
-Fri Mar  3 17:59:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_by_class): clearing wrong cache.
-
-Fri Mar  3 21:22:42 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/fileutils.rb (FileUtils.cp_r): implement :remove_destination
-	  option.
+Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
 
-	* ext/extmk.rb: use :remove_destination to install extension libraries
-	  to avoid SEGV.  [ruby-dev:28417]
-
-Fri Mar  3 14:41:04 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/dl/.cvsignore: ignore callback.h.
-
-	* ext/ripper/.cvsignore: ignore eventids2table.c.
-
-	* ext/socket/.cvsignore: ignore constants.h.
+	* 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 Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_fd_writable): should not re-schedule output
 	  from KILLED thread (must be error printing).
 
-Thu Mar  2 09:12:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_flatten_bang): allow specifying recursion
-	  level.  [ruby-talk:182170]
-
-	* array.c (rb_ary_flatten): ditto.
-
-Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): a heap_slots may overflow.  a patch from Stefan
-	  Weil <weil at mail.berlios.de>.
-
-Wed Mar  1 17:13:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call): use separate cache for fcall/vcall
-	  invocation.
-
-	* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
-	  functions.
-
-	* eval.c (rb_mod_local): a new method to specify newly added
-	  visibility "local".
-
-	* eval.c (search_method): search for local methods which are
-	  visible only from the current class.
-
-	* class.c (rb_class_local_methods): a method to list local methods.
-
-Thu Mar  2 17:54:45 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
 	  [ruby-core:7474]
 
-Thu Mar  2 14:12:26 2006  Tanaka Akira  <akr@m17n.org>
-
-	* 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 Mar  2 12:55:16 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Wed Mar  1 00:15:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
+	  Weil <weil at mail.berlios.de>.
+
+Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Tue Feb 28 19:32:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* object.c (Init_Object): add BasicObject class as a top level
-	  BlankSlate class.
+	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
+	  if command name is quoted on mswin32. [ruby-dev:28400]
 
 Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (SYM2ID): should not cast to signed long.
 	  [ruby-core:07414]
 
-Fri Feb 24 20:21:38 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* 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]
 
-Fri Feb 24 12:10:07 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
 	  It's for VC++8.
 
-Fri Feb 24 11:17:45 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
+
+Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (time_new_internal): add prototype to tell the compiler
+	  arugments types.
 
 	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
 
+Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test.rb: Removed.  Obsolete by test/nkf.
+
+	* ext/.document: enabled documents in nkf and kconv
+
+	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
+
 Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
@@ -27196,84 +7940,30 @@ Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
 	  [ruby-dev:28230]
 
-Thu Feb 23 13:23:03 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
 
-Wed Feb 22 21:16:55 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#each_filename): use split_names properly.
-
-Wed Feb 22 16:24:05 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/webrick/test_cgi.rb: should support platforms which search
-	  library path from the interpreter's path.
-	  And, support test without install incidentally.
-
-Wed Feb 22 14:21:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* bignum.c (bignorm): x may not be a bignum.  [ruby-dev:28367]
+	* configure.in (mingw): have link.  [ruby-list:41838]
 
-Wed Feb 22 09:22:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_alloc): add proper check for creation of a lambda
-	  without a block.
+	* win32/Makefile.sub (config.h): ditto.
 
 Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (f_arglist): should set command_start = Qtrue for
 	  command body.  [ruby-talk:180648]
 
-Mon Feb 20 22:30:17 2006  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: alias Config to RbConfig for compatibility.
-
-Mon Feb 20 18:21:41 2006  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_reopen): flush before reopening a file.
-	  reported by Mathieu Bouchard.  [ruby-core:7396]
-
-Mon Feb 20 17:29:50 2006  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: generate RbConfig instead of Config.
-
-	* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
-	  ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
-	  lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
-	  lib/webrick/httpservlet/cgihandler.rb,
-	  test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
-	  test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
-	  test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
-	  win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
-	  Config.
+Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
 
-Mon Feb 20 13:46:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/find.rb: should raise ENOENT if root entry does not exist,
-	  without opening it. [ruby-dev:28345]
+	* mkconfig.rb: alias RbConfig for Config.
 
 Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
 
 	* lib/rational.rb (Integer::gcd): small typo fix.
 	  [ruby-core:07395]
 
-Mon Feb 20 10:03:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_get_0): Object should have been the lowest
-	  in const lookup precedence.  [ruby-dev:28343]
-
-Mon Feb 20 09:17:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator): should not delegate "funcall".
-
-Mon Feb 20 09:13:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler):
-	  qualify the access for Config constant.  [ruby-dev:28338]
-
-	* lib/resolv.rb (Resolv::DNS::Resource::IN::A): qualify
-	  ClassValue.  [ruby-dev:28338]
-
 Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
@@ -27284,13 +7974,6 @@ Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
 	  [ruby-dev:28339]
 
-Mon Feb 20 00:13:49 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: add :ssl_verify_mode option.
-	  suggested by Will Glynn.
-
-	* lib/open-uri.rb: add :ssl_ca_cert option.
-
 Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
 
 	* eval.c: initial value for block_unique must be 1.
@@ -27306,44 +7989,17 @@ Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sample/rtags.rb: ditto.
 
-Sat Feb 18 21:16:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_instance_eval): RDoc description updated.  a
-	  patch from Ozgur Murat Homurlu <ozgurmurath at gmail.com>.
-	  [ruby-core:07381]
-
-Sat Feb 18 01:01:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* variable.c (rb_const_get_0): skip ruby_wrapper in const search
-	  to give it lower priority (just above Object).  need not to
-	  change rb_const_defined_0() since it's only a precedence matter;
-	  they are defined anyway.
+	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
+	  private.  [ruby-core:07383]
 
 Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/tracer.rb: merged a minor clarification patch from Daniel
 	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
 
-Fri Feb 17 17:30:20 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): simplified using rb_const_get_fallback().
-
-	* eval.c (ev_const_defined): adopt to ev_const_get() using
-	  rb_const_defined_fallback().
-
-	* variable.c (rb_const_get_fallback): new function to implement
-	  constant search.
-
-	* variable.c (rb_const_defined_fallback): new function to
-	  implement constant definition check.
-
-	* variable.c (rb_const_get_0): adopt to new behavior.  constants
-	  are looked up in the order of: current class, super classes (but
-	  Object), lexically external classes/modules, and Object.
-
-	* variable.c (rb_const_defined_0): ditto.
-
-Fri Feb 17 11:20:53 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
 
@@ -27358,6 +8014,11 @@ Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_thread_wait_for): sleep should always sleep for
 	  specified amount of time.  [ruby-talk:180067]
 
+Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (backtrace): frame->orig_func may not be initialized.
+	  [ruby-core:07367]
+
 Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
@@ -27369,10 +8030,6 @@ Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
 	  OP_ASGN2. [ruby-core:07366]
 
-Wed Feb 15 15:20:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_line): remove void control path.  [ruby-dev:28335]
-
 Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (yield_under_i): should not pass self as an argument to
@@ -27383,32 +8040,17 @@ Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_obj_instance_eval): should be no singleton classes for
 	  true, false, and nil.  [ruby-dev:28186]
 
-Tue Feb 14 20:26:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enumerator.c (enumerator_each): return self if no block is
-	  given.  [yarv-dev:882]
-
 Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
 
 	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
 
-Tue Feb 14 15:15:22 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/zlib/zlib.c: suppress warning on test/zlib. [ruby-dev:28323]
+	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
 
-Tue Feb 14 13:47:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_utime): drop read-only attribute before
-	  changing file time.
-
-Tue Feb 14 13:38:01 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.h): should define HAVE_LONG_LONG with
-	  VC++8.
-
-Tue Feb 14 11:42:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* time.c (search_time_t): support non 32bit time_t environments.
 
@@ -27416,40 +8058,35 @@ Tue Feb 14 11:42:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
 
-Mon Feb 13 18:01:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (copy_node_scope): remove duplicated semicolons at end.
-	  a patch from KIMURA Koichi <kimura.koichi at canon.co.jp>.
-	  [ruby-dev:28332]
-
-	* eval.c (VIS_MODE): remove unnecessary argument.
-	  [ruby-dev:28332]
+	* win32/win32.c (rb_w32_utime): drop read-only attribute before
+	  changing file time.
 
-Mon Feb 13 13:49:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  all changes are backported from CVS HEAD.
 
-	* parse.y (parser_parse_string): mention "regexp" in a error
-	  message.  a patch from Mauricio Fernandez <mfp at acm.org>
-	  [ruby-core:07340]
+Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Feb 13 00:01:32 2006  K.Kosako  <sndgk393 AT ybb.ne.jp>
+	* io.c (argf_forward): should not use frame->argv.
+	  [ruby-core:07358]
 
-	* oniguruma.h: Version 4.0.1
+Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* regparse.c (onig_free_shared_cclass_table): fix memory leaks.
+	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
 
-	* regcomp.c (optimize_node_left): change from IS_POSIXLINE() to IS_MULTILINE().
+	* env.h: remove argv member from struct FRAME.
 
-	* regint.h: rename ANCHOR_ANYCHAR_STAR_PL to ANCHOR_ANYCHAR_STAR_ML.
+Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* regparse.h: ditto.
+	* eval.c (eval): should push class from binding if supplied.
+	  [ruby-core:07347]
 
-	* regexec.c: ditto.
+Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Sat Feb 11 21:57:29 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
+	  change <%='s behavior. (backported 1.15 - 1.16)
 
-	* ext/win32ole/win32ole.c: add WIN32OLE.create_guid.
+Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
+	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
 
 Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -27457,76 +8094,39 @@ Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  instance_eval for objects cannot have singleton classes,
 	  e.g. fixnums and symbols).  [ruby-dev:28178]
 
-Fri Feb 10 12:31:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): should support NODE_ZSUPER in NODE_ITER.
-	  [ruby-dev:28326]
-
-	* eval.c (ZSUPER_ARGS): support macro.
-
-Wed Feb  8 10:26:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
-	  invoking finalizers.
-
-	* gc.c (rb_gc_finalize_deferred): ditto.
-
-Tue Feb  7 23:03:13 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
 	  [ruby-dev:28286]
 
-Tue Feb  7 18:42:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
-	  updated or is already freed.  [ruby-dev:28313]
-
 Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
 	  In such situation, flock() should return 0.
 
-Mon Feb  6 14:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (error_line): include the class name of a surrounding
-	  method in error position description.
-
-Mon Feb  6 00:14:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
 
-	* enum.c (enum_find_index): a new method Enumerable#find_index.
-	  [ruby-talk:178495]
+	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
+	  compatibility with ruby 1.9.
 
-Sun Feb  5 23:29:31 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ruby.h (struct RStruct): embed 3 or less elements structs.
-	  (RSTRUCT_LEN): defined for accessing struct members.
-	  (RSTRUCT_PTR): ditto.
-
-	* struct.c: use RSTRUCT_LEN and RSTRUCT_PTR.
-	  (struct_alloc): allocate small structs in embedded format.
-	  (rb_struct_init_copy): ditto.
-
-	* gc.c (gc_mark_children): use RSTRUCT_LEN and RSTRUCT_PTR.
-	  (obj_free): ditto.
-
-	* marshal.c (w_object): use RSTRUCT_LEN and RSTRUCT_PTR.
-
-Sun Feb  5 21:01:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Sun Feb  5 18:49:00 2006  Minero Aoki  <aamine@loveruby.net>
+Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/net/http.rb: imported from trunk, rev 1.129
 
-	* lib/net/http.rb (add_field, get_fields): keep 1.8.2
-	  compatibility.  This patch is contributed by Rob Pitt.
+	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
+	  compatibility.
 
-Sun Feb  5 16:33:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/https.rb: imported from trunk, rev 1.3.
 
-	* lib/mkmf.rb (create_makefile): Kernel#sub! was removed on HEAD.
+	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
 
-Sun Feb  5 14:26:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/pstore.rb: should return default value if name is not found.
 	  [ruby-core:7304]
@@ -27538,68 +8138,42 @@ Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
 	* eval.c: apply the FreeBSD getcontext/setcontext workaround
 	  only before FreeBSD 7-CURRENT.
 
-Sat Feb  4 21:10:06 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
 	  In such situation, flock() should return 0.
 
-Sat Feb  4 15:52:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
 	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
 
-Sat Feb  4 15:02:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* oniguruma.h: merge Oniguruma 4.0.0  [ruby-dev:28290]
-
-Fri Feb  3 19:25:53 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h: fixed prototype.
-
-	* ext/syck/rubyext.c: defined symbol ID as global variable as others.
-
-Fri Feb  3 17:57:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: unify ruby_class (for method definition) and ruby_cbase
-	  (for constant reference).
-
-Fri Feb  3 15:02:10 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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 + '"'))
 
-Fri Feb  3 00:01:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
-	  emitter's marker. if marker points to the end of buffer, this is
+	  emitter's marker. if marker points to the end of buffer, this causes
 	  buffer overrun. (ex: YAML.dump("." * 12288))
 
-Thu Feb  2 17:13:01 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#get_tk): added
-	  support of :'string' style Symbol.
-
 Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_call0): use TMP_ALLOC() instead of allocating
-	  a temporary array object.
-
 	* eval.c (eval): need not to protect $SAFE value.
 	  [ruby-core:07177]
 
-	* error.c (Init_Exception): change NameError to direct subclass of
-	  Exception so that default rescue do not handle it silently.
-
 Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
 
-	* configure.in: The isinf is not recognized by autoconf
+	* configure.in: The isinf is not regognized by autoconf
 	  library guesser on solaris 10. [ruby-core:7138]
 
 Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
-	  where they are supported. modifying environ variable seems to
+	  where they are supported. modifing environ variable seems to
 	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
 
 	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
@@ -27617,36 +8191,17 @@ Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
 	  last commit. Now it will return a proper object.
 
-Tue Jan 31 08:07:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (int_upto): return an enumerator if no block is
-	  attached to the method.
-
-	* numeric.c (int_downto): ditto.
-
-	* numeric.c (int_dotimes): ditto.
-
-	* enum.c (enum_first): new method Enumerable#first to take first n
-	  elements from an enumerable.
-
-	* enum.c (enum_group_by): new method Enumerable#group_by that
-	  groups enumerable values according to their block values.
-
-Tue Jan 31 00:08:22 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
 	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
 
-Sat Jan 28 07:49:30 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Thu Jan 26 15:55:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: turn on do_not_reverse_lookup by default.
-
 Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
@@ -27670,7 +8225,13 @@ Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
 	  FreeBSD/i386 getcontext/setcontext bug.
 	  [ruby-dev:28263]
 
-Thu Jan 19 22:19:18 2006  Minero Aoki  <aamine@loveruby.net>
+Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
+	  before gcc 4.0.3.
+	  [ruby-dev:28247]
+
+Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (mv): should remove file after copying.
 	  [ruby-dev:28223]
@@ -27684,34 +8245,32 @@ Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
 	  reported by Pav Lucistnik and Marius Strobl.
 	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
 
-Tue Jan 17 23:59:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_const_get, rb_mod_const_defined): added optional
-	  flag to search ancestors, which is defaulted to true.
-	  fixed: [ruby-talk:175899]
-
-	* eval.c (rb_mod_method_defined): ditto.
-
-Tue Jan 17 11:31:47 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/setup.mak (MAKE): workaround for nmake 8.
 
-Tue Jan 17 11:06:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/Makefile.sub: invoke .bat via shell. workaround for nmake 8.
+	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
+	  for nmake 8.
 
-Mon Jan 16 10:13:38 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Sat Jan 14 03:38:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
+	  for DragonFly BSD 1.4.0.
+
+Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
 	  sizeof(void*).
 
-Fri Jan 13 19:26:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/diagram.rb:
 	    - properly quote bare element attributes
@@ -27733,15 +8292,23 @@ Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  [new feature] support 'command' option which is called just before
 	  popping up the balloon help.
 
-Wed Jan 11 00:12:29 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
 
-	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
-	  change <%='s behavior.
+	* 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]
 
 Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (garbage_collect): mark ruby_current_node.
-	  if an exception is raised in a finalizer written in C called by
+	  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.
@@ -27764,68 +8331,37 @@ Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
 	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
 	  Symbols broken. [ruby-Bugs:2535]
 
-Tue Jan 10 07:26:52 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (gc_stress): renamed from always_gc and enabled by default.
-	  (gc_stress_get): new function for GC.stress.
-	  (gc_stress_set): new function for GC.stress=.
-
-Mon Jan  9 19:58:56 2006  arton  <artonx@yahoo.co.jp>
+Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
 
 	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
 	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
 
-Mon Jan  9 14:25:00 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
 	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
 
-Mon Jan  9 14:25:00 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
+Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
 
 	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
 
-Sun Jan  8 14:15:27 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER.
-	  Intel C++ Compiler defines __GNUC__.
-	  http://www.intel.com/software/products/compilers/clin/docs/ug_cpp/lin1077.htm
-
 Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (singleton): get rid of segfault on syntax error.
 	  fixed: [ruby-core:07070]
 
-Sat Jan  7 06:24:18 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (rb_fd_isset): compare the result of FD_ISSET with 0 to
-	  avoid FreeBSD bug.  FreeBSD defines FD_ISSET as just a bitmap of
-	  unsigned long.  So returning the value from rb_fd_isset discards
-	  upper 32bits on LP64 environment.
-	  http://www.freebsd.org/cgi/query-pr.cgi?pr=ia64/91421
-
-Fri Jan  6 02:20:18 2006  Tanaka Akira  <akr@m17n.org>
+Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
 
-	* configure.in: don't force getcontext on IA64.
+	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
+	  [ruby-core:7057]
+	  (READ_DATA_PENDING_COUNT): ditto.
+	  (READ_DATA_PENDING_PTR): ditto.
 
-	* eval.c (ruby_setjmp): add an argument for just before getcontext.
-	  (THREAD_SAVE_CONTEXT): call rb_thread_save_context just
-	  before getcontext.
-	  [ruby-dev:28205]
-
-Sun Jan  1 15:28:46 2006  Tanaka Akira  <akr@m17n.org>
-
-	* missing.h (isinf): avoid macro expansion
-	  "extern int isinf(double);" to
-	  "extern int ((sizeof(double)==sizeof(float))?_Isinff(double):_Isinf(double));" on
-	  HP-UX.
-
-Sun Jan  1 14:42:54 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
-	  the location which rb_w32_telldir didn't return. (and should change
-	  `bits' position) [ruby-core:7035]
-
-	* win32/dir.h: ditto. (stores `loc' instead of `bitpos')
+	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
+	  (I think HEAD implementation is better. but binary compatibility)
 
 	* test/ruby/test_dir.rb: added.
 
@@ -27834,41 +8370,26 @@ Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_save_context): should not recycle scope object used
 	  in a thread.  fixed: [ruby-dev:28177]
 
-Sat Dec 31 19:50:38 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c: attribute name was truncated with Rev1.64.
-
-Sat Dec 31 11:53:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/generator.rb: (Generator#initialize): should kill @loop_thread
-	  before starting new thread. (occurs when called via Generator#rewind)
-	  [ruby-dev:28184]
-
 Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (garbage_collect): mark objects referred from aborting threads.
+	* gc.c (garbage_collect): mark objects refered from aborting threads.
 	  [ruby-dev:28190]
 
 	* win32/Makefile.sub: VC++8 support.
 
-Fri Dec 30 15:17:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/generator.rb (Generator#initialize): ensured to stop @loop_thread.
-	  Mr. Tanaka pointed out one Thread.pass is not enough. [ruby-dev:28185]
+	* dir.c (glob_helper): do not use TRUE for djgpp.
 
-Fri Dec 30 12:20:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/generator.rb (Generator#initialize): fixed dead lock. this occurred
-	  when end? was called before @loop_thread was stopped. [ruby-core:7029]
-
-Fri Dec 30 01:04:52 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* file.c (eaccess): workaround for VC++8 runtime.
 
-	* lib/generator.rb: should work with another thread. (more robust code)
-	  [ruby-dev:28177]
+	* win32/win32.c (ioinfo): VC++8 support.
 
 Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_gc_mark_threads): keep unmarked threads which won't wake
+	* 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]
 
 	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
@@ -27879,87 +8400,23 @@ Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
 	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
 	  "miniruby".  [ruby-dev:28140]
 
-Thu Dec 29 14:35:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_define_method): should save safe_level in the
-	  proc object.  [ruby-dev:28146]
-
-Thu Dec 29 11:22:34 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/generator.rb: reimplemented Generator class with Thread instead of
-	  callcc, in order to fix memory leak. [ruby-dev:28142]
-
-Wed Dec 28 14:10:05 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ia64.s: remove .pred.safe_across_calls directive.
-	  reported by WATANABE Tetsuya.  [ruby-dev:28141]
-
-Wed Dec 28 01:32:39 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (struct thread): add bstr_max.
-	  (rb_thread_save_context): use realloc instead of REALLOC_N
-	  to avoid GC.
-
-Tue Dec 27 23:59:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (CompletingHash#match): fix for 1.9.
-
 Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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 Dec 27 14:17:55 2005  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in: define IA64 for portability.  (HP aC++/ANSI C doesn't
-	  define __ia64__.)
-	  don't check libunwind stuff.
-	  check __libc_ia64_register_backing_store_base.
-
-	* defines.h: declare rb_ia64_bsp and rb_ia64_flushrs.
-	  (flush_register_windows): call rb_ia64_flushrs on IA64.
-
-	* ia64.s: new file for IA64.
-	  it is separated from C program files because
-	  Intel C++ Compiler for IA64 doesn't support inline assembly.
-
-	* common.mk (ia64.$(OBJEXT)): new target.
-
-	* ruby.h (RUBY_INIT_STACK): defined.
-	  (ruby_init_stack): declared for RUBY_INIT_STACK.
-
-	* main.c (main): precedes RUBY_INIT_STACK before ruby_init.
+Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* gc.c (rb_gc_register_stack_start): new global variable on IA64.
-	  (garbage_collect): simplify register stack marking code.
-	  don't use libunwind.
-	  (Init_stack): initialize rb_gc_register_stack_start.
-	  (ruby_init_stack): new function for RUBY_INIT_STACK.
-
-	* eval.c (struct thread): add bstr_pos member for original position of
-	  register stack.
-	  (rb_thread_save_context): simplify register stack saving code.
-	  don't use libunwind.
-	  (rb_thread_restore_context_0): new function.  moved from
-	  rb_thread_restore_context except the stack position checking code.
-	  don't use libunwind for IA64 register stack.
-	  (register_stack_extend): new function.
-	  (stack_extend): make it self-recursive with
-	  the stack position checking code in old rb_thread_restore_context.
-	  (rb_thread_restore_context): just call stack_extend.
-	  (flush_register_windows): removed.
-
-	  [ruby-dev:28127]
-
-Tue Dec 27 14:09:39 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* process.c: new method Process.exec. [ruby-dev:28107]
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
+	  treat wildcard character in commonName. [ruby-dev:28121]
 
-Tue Dec 27 08:22:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_check):
-	  treat wildcard character in commonName. [ruby-dev:28121]
+	* 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]
 
 Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -27972,20 +8429,23 @@ Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  Joel VanderWerf <vjoel at path.berkeley.edu>.
 	  [ruby-talk:165285] [ruby-core:6995]
 
+Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.8.4 released.
+
 Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
 	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
 
-Wed Dec 21 16:47:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): should return handle because FileIndex is
 	  valid only while file is open. [ruby-dev:28088]
 
-Wed Dec 21 12:12:21 2005  Tanaka Akira  <akr@m17n.org>
+Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
 
-	* test/pathname/test_pathname.rb (test_kernel_open): use
-	  File.identical?.
+	* lib/pathname.rb (test_kernel_open): use File.identical?.
 	  [ruby-talk:171804]
 
 Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -27993,102 +8453,36 @@ Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (eval_under_i): evaluate source in caller's frame.
 	  [ruby-dev:28076]
 
-Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
-	  with previous Ruby versions, documents are no longer headless.
+	* eval.c (rb_call_super): use original method name on exception.
+	  [ruby-dev:28078]
 
-Tue Dec 20 12:33:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/syck/rubyext.c (syck_node_transform): ruby object holding
-	  explicitly freed SyckNode caused SEGV. [ruby-dev:28067]
+	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
+	  [ruby-dev:27839]
 
-	... I think syck GC problem was solved now!
-
-Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_f_backquote): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
-
-Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (XCFLAGS): separated as well as win32/Makefile.sub.
-
-	* main.c (always_gc): dllimport is required for VC to import a DLL
-	  symbol.  fixed: [ruby-dev:28051]
-
-	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
-
-Mon Dec 19 23:09:24 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
+	  NULL or not before S_FREE.
 
 	* 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]
 
-	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
-	  NULL or not before S_FREE.
-
-	* ext/syck/rubyext.c (syck_parser_assign_io): rb_check_string_type can
-	  return new RString. if so, it becomes unreachable from GC after
-	  returns syck_parser_assign_io, and can be freed by GC. (dangling
-	  in syck io system) so extends its life time till syck_parse is called.
-
-	* ext/syck/rubyext.c (syck_parser_s_alloc): always allocates bonus,
-	  so no need to check if NULL, and "volatile VALUE hash"
-	  is not needed. (bonus->port was not protected in syck_emitter_reset)
-
-	* ext/syck/rubyext.c (syck_mark_parser): ditto.
-
-	* ext/syck/rubyext.c (syck_parser_load): ditto.
-
-	* ext/syck/rubyext.c (syck_parser_load_documents): ditto.
-
-	* ext/syck/rubyext.c (syck_emitter_s_alloc): ditto.
-
-	* ext/syck/rubyext.c (syck_mark_emitter): ditto.
-
-	* ext/syck/rubyext.c (syck_emitter_reset): ditto.
-
-	* ext/syck/rubyext.c (syck_scalar_value_set): "should set newly
-	  allocated memory instead of RString's internal storage" stuff again.
-	  by this, should call syck_free_node instead of rb_syck_free_node.
-
-	* ext/syck/rubyext.c (syck_node_type_id_set): ditto.
-
-	... I believe syck GC problem was solved by this.
-
-Mon Dec 19 12:20:59 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): activate only
-	  before gcc 4.0.3 on SPARC and IA64.
-
-Mon Dec 19 11:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c: sorry, I reverted my "should set newly
-	  allocated memory instead of RString's internal storage" stuff.
-	  node allocated in rubyext.c seems to be freed by rb_syck_free_node
-	  not syck_free_node, and it won't free data.str->ptr and type_id.
-
-	 (I still think this is unsafe because RString(foo)->ptr becomes
-	  dangling pointer when RString is modified or freed, but anyway
-	  I misunderstood, so go back to original code for now)
-
-Sat Dec 17 21:50:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_emitter_reset): should initialize
-	  emitter->bonus->oid. otherwise rb_gc_mark crashes.
+	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
+	  with previous Ruby versions, documents are no longer headless.
 
-	* ext/syck/rubyext.c (syck_mark_parser): should mark anchor nodes
-	  because they hold ruby objects. (ie: rb_syck_bad_anchor_handler)
+Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
 
-Sat Dec 17 11:00:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_f_backquote): fix a GC problem on
+	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
 
-	* ext/syck/rubyext.c (rb_syck_compile): avoid potential memory
-	  leak.
+Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_set_ivars): avoid potential memory
-	  leak by explicit symbol allocation.
+	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
 
 Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -28100,35 +8494,10 @@ Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
 	* eval.c (bmcall): fix a GC problem by tail call on
 	  IA64 with gcc 4.0.3 20051216 (prerelease).
 
-Fri Dec 16 17:53:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (rb_syck_compile): fixed memory leak.
-
-	* ext/syck/rubyext.c: should protect global variable from GC.
-
-Fri Dec 16 11:44:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (syck_resolver_tagurize): fixed memory leak.
+Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_node_type_id_set): should set newly
-	  allocated memory instead of RString's internal storage.
-
-	* ext/syck/rubyext.c (syck_scalar_value_set): ditto.
-
-	... these fixes won't fix [ruby-dev:27839]. more work is needed.
-
-Fri Dec 16 04:38:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator::method_missing): should delegate
-	  block as well.
-
-Thu Dec 15 19:57:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::MorphingBody): fix criteria to
-	  use Tempfile.  A fix from Zev Blut <rubyzbibd at ubit.com>.
-	  [ruby-core:06076]
-
-	* string.c: remove global functions work on $_.
+	* signal.c (Init_signal): revert C++ style comment.
+	  [ruby-dev:28041]
 
 Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -28140,18 +8509,10 @@ Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
 	* 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)
 
-Wed Dec 14 23:50:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb (find_class_comment): fix for class
-	  document with prototypes.  [ruby-core:06863]
-
-Wed Dec 14 23:39:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (has_magic): glob names contain alphabets to enable case fold
-	  search.  [ruby-dev:27735]
-
-	* dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
-	  [ruby-dev:23296]
+	* test/gdbm/test_gdbm.rb: specify pid for the argument of
+	  Process.wait.  workaround for Cygwin.
 
 Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -28175,18 +8536,11 @@ Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
 	* sprintf.c (rb_str_format): fix a GC problem.
 	  [ruby-dev:28001]
 
-Mon Dec 12 15:51:22 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
 	  unused files. [ruby-dev:27981]
 
-Mon Dec 12 09:58:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_cover): new method Range#cover? added.  the
-	  method name might be changed.  thanks to takano32 at
-	  http://www.rubyist.net/~matz/20051210.html#c08 for name
-	  suggestion.  [ruby-talk:167182]
-
 Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
@@ -28196,38 +8550,11 @@ Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  be called before actual variable initialization.
 	  [ruby-dev:27986]
 
-Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
-	  (see ext/tk/ChangeLog.tkextlib).
-
-	* ext/tk/sample/scrollframe.rb: add a new sample.
-
-Sun Dec 11 22:07:58 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb (test_remote_array_and_hash): pseudo remote
-	  objects are protected against GC. [ruby-dev:27911]
-
-Sat Dec 10 01:06:06 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/matrix.rb: add Matrix#determinant_e, Matrix#rank_e.
-	  [ruby-dev:27820] and related thread.
-
-Sat Dec 10 00:31:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (calling_scope_t): gave names to magic numbers for rb_call().
-	  [ruby-dev:27978]
-
 Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rexml/encoding.rb (encoding=): give priority to particular
 	  conversion to iconv.  [ruby-core:06520]
 
-Fri Dec  9 23:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_include): return false unless included in numeric
-	  range.  fixed: [ruby-dev:27975]
-
 Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (umethod_bind): adjust invoking class for module method.
@@ -28242,15 +8569,6 @@ Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
 
-Wed Dec  7 16:39:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_include): use discrete membership for non Numeric
-	  values, for example, String.
-
-	* numeric.c (num_scalar_p): new method. [ruby-dev:27936]
-
-	* lib/complex.rb (Complex#scalar?): ditto.
-
 Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): integer overflow check added.
@@ -28278,22 +8596,11 @@ Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-en/menu.rb: ditto.
 
-Tue Dec  6 16:48:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (ruby_xmalloc2): change check condition for integer
-	  overflow.  [ruby-dev:27399]
-
-	* gc.c (ruby_xrealloc2): ditto.
-
 Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
 
 	* eval.c (exec_under): avoid accessing ruby_frame->prev.
 	  [ruby-dev:27948]
 
-Fri Dec  2 19:06:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (Compare): should not fold double byte alphabet on win9x.
-
 Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_funcall2): allow to call protected methods.
@@ -28301,9 +8608,6 @@ Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (struct parser_params): fields common to ripper must be
-	  placed at each same offset.
-
 	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
 	  fixed: [ruby-dev:27896]
 
@@ -28312,53 +8616,23 @@ Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
 	  expression.   [ruby-dev:27868]
 
-Mon Nov 28 20:24:22 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP::PPMethods#object_address_group): mask an address with
-	  word size.
-
-Tue Nov 29 23:57:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct parser_params): heap must be placed at same offset
-	  also in ripper.y.  fixed: [ruby-dev:27846]
-
-	* parse.y (yycompile): prevent vparser from tail call optimization.
-	  fixed: [ruby-dev:27851]
-
-	* parse.y (parser_mark): value needs to be marked.
-	  fixed: [ruby-dev:27845]
-
-Tue Nov 29 22:45:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/observer.rb (notify_observers): follow change of observer.rb.
-	  fixed: [ruby-core:6796]
-
-Mon Nov 28 20:24:22 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP::PPMethods#object_address_group): adjust address format.
-
-Mon Nov 28 18:55:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/socket.c (init_inetsock_internal): remove setting
 	  SO_REUSEADDR option on server socket on Cygwin.
 	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
 
-Mon Nov 28 13:11:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
 	  error message on bccwin32 + winsock)
 
-Mon Nov 28 09:15:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/mkmf.rb (create_makefile): should not change sodir with
-	  dir.gsub!. (bccwin32 failed to install third party extensions)
+	  dir.gsub!. (bccwin32 failed to install third party exntesions)
 	  [ruby-dev:27834]
 
-Sun Nov 27 05:37:20 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: use File.basename to decompose pathnames.
-	  experimental Windows support.
-
 Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/wsdl/xmlSchema/complexContent.rb: missing
@@ -28368,103 +8642,23 @@ Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* dln.c (conv_to_posix_path): should initialize posix.
 
-Fri Nov 25 20:34:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/datetime.rb (DateTime::to_a): comparison with non
-	  array-convertible object must return false.
-
-Fri Nov 25 14:34:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_max): treat end exclusion without iteration if
-	  the end value is an integer.  [ruby-talk:167433]
+Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Nov 25 12:52:57 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* configure.in (AC_CHECK_FUNCS): need to check link().
+	  fixed: [ruby-dev:27814]
 
-	* 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.
-
-	* test/rss/test_content.rb: use #__send__ instead of #funcall for
-	  no private method.
-
-Fri Nov 25 12:39:56 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* 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.
-
-	* 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.
-
-	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
-
-	* test/rss/rss-assertions.rb: improved type conversion assertions.
-
-Fri Nov 25 10:38:20 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/image.rb: added Image prefix.
-
-	* lib/rss/maker/image.rb: ditto.
-
-Fri Nov 25 10:33:02 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* 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.
-
-Fri Nov 25 10:29:48 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (range_min): use <=> comparison rather than iteration.
-	  [ruby-talk:167420]
-
-	* range.c (range_max): ditto.
-
-Thu Nov 24 01:31:44 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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...)
 
-Wed Nov 23 23:52:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_div): use floor rather than rb_Integer().
-	  [ruby-dev:27674]
-
-Wed Nov 23 22:34:15 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: added entity handling type predicate.
-	* lib/rss/rexmlparser.rb: ditto.
-	* lib/rss/xmlparser.rb: ditto.
-	* lib/rss/xmlscanner.rb: ditto.
-
-	* lib/rss/xmlscanner.rb: more robust entity handling.
-
-	* test/rss/test_parser.rb: added an entity handling test.
-
 Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
 	  [Tk8.5 feature].
 
-	* ext/tk/lib/tk/text.rb: supports new indices modifiers on a Text
+	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
 	  widget [Tk8.5 feature].
 
 	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
@@ -28474,7 +8668,7 @@ Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
 	  feature].
 
-Wed Nov 23 18:52:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): should not call GetFileInformationByHandle
 	  for pipe.
@@ -28483,61 +8677,15 @@ Wed Nov 23 18:52:45 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* file.c (w32_io_info): now can identify directory on WinNT.
 
-Wed Nov 23 18:46:53 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/: use #__send__ instead of #send.
-	* test/rss/: ditto.
-
-Wed Nov 23 18:32:56 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_taxonomy.rb: use #reject directory.
-
-Wed Nov 23 18:26:00 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/taxonomy.rb: changed class or module prefix to
-	  Taxonomy from Taxo.
-	* lib/rss/maker/taxonomy.rb: ditto.
-
-Wed Nov 23 18:21:11 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* 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.
-
-	* 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.
-
-	* 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.
-
-	* 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.
-
-	* test/rss/rss-testcase.rb: added convenience method for setting
-	  up taxo:topic.
-	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
-
-	* sample/rss/blend.rb: followed new API.
-
-Wed Nov 23 17:42:24 2005  Kouhei Sutou  <kou@cozmixng.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.
-
 Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
 
 	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
 	  [ruby-core:06721]
 
+Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* intern.h, file.c: failed to compile on windows.
+
 Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
@@ -28569,14 +8717,14 @@ Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
 
-Tue Nov 22 14:36:54 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
 
 	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
 	  spec. and add new tests.
 
-Tue Nov 22 13:30:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
 	  p Dir.glob('*') should work on WinNT. (implemented our own
@@ -28605,11 +8753,6 @@ Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* win32/setup.mk: findstr doesn't exist on win9x.
 	  fixed: [ruby-dev:27756]
 
-Sun Nov 20 21:39:27 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* regparse.c (fetch_token_in_cc): tok->escaped should be
-	  initialized.  [ruby-dev:27763]
-
 Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
@@ -28620,10 +8763,6 @@ Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
 	  [ruby-core:06661]
 
-Sat Nov 19 08:19:38 2005  Zach Dennis  <zdennis@mktec.com>
-
-	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-
 Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
@@ -28633,7 +8772,7 @@ Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
 
-Fri Nov 18 18:07:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
 	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
@@ -28654,7 +8793,7 @@ Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/namespace.rb: ditto.
 
-Fri Nov 18 16:47:33 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (rb_file_s_dirname): added checks for some patterns with drive
 	  letter. fixed: [ruby-dev:27738]
@@ -28662,37 +8801,11 @@ Fri Nov 18 16:47:33 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* test/ruby/test_path.rb (test_dirname): added tests for above
 	  patterns.
 
-Fri Nov 18 12:19:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
 	  returns true on VisualC++6.
 
-Thu Nov 17 17:58:00 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* 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.
-
-Thu Nov 17 17:53:30 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/taxonomy.rb: implemented taxonomy module.
-
-	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
-
-Thu Nov 17 17:40:19 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/1.0.rb: added rdf:Bag.
-
-Thu Nov 17 13:52:00 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: removed needless argument 'prefix'.
-
-	* lib/rss/parser.rb: ditto.
-
 Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (static-ruby): overridable.
@@ -28702,24 +8815,12 @@ Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (RUBY, RUBYW): overridable.
 
-Wed Nov 16 01:29:31 2005  Kouhei Sutou  <kou@cozmixng.org>
+Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/rss/trackback.rb: added TrackBack prefix.
-
-	* lib/rss/maker/trackback.rb: ditto.
-
-Wed Nov 16 01:26:13 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-
-	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-
-Tue Nov 15 23:54:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/find.rb (Find::find): should not ignore symbolic links to
+	  non-existing files.  [ruby-talk:165866]
 
-	* file.c (file_load_ok): eaccess() returns 0 on success.
-	  fixed: [ruby-dev:27713]
-
-Tue Nov 15 16:36:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c (rb_ary_fill): previous commit disabled this usage:
 
@@ -28727,17 +8828,9 @@ Tue Nov 15 16:36:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
 
 	  previous commit has the advantage of early garbage collection, but
-	  potentially this would break some script. so I reverted behavior.
-
-Tue Nov 15 16:15:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  potensially this would break some script. so I reverted behavior.
 
-	* file.c (file_load_ok): use eaccess() instead of actually opening
-	  the file.  [ruby-talk:156378]
-
-	* lib/jcode.rb (String::reverse): add new methods.
-	  [ruby-list:41245]
-
-Tue Nov 15 15:49:34 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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])
@@ -28759,71 +8852,33 @@ Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* array.c (rb_ary_first): RDoc update from Daniel Berger
 	  <djberg96@yahoo.com>.  [ruby-core:06577].
 
-Sun Nov 13 10:55:24 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/uri/common.rb (escape): regard second argument as a
-	  character set. [ruby-dev:27692]
+Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
 
-Sat Nov 12 08:36:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, eval.c, intern.h: check fd_mask type.
-
-	* configure.in (socketpair): need to be checked.
-
-Fri Nov 11 19:53:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* eval.c, intern.h: failed to compile where NFDBITS is defined but
-	  howmany() is not defined. [ruby-dev:27680]
-
-	* io.c (is_socket): failed to compile where S_ISSOCK is not defined.
-
-	* io.c (pipe_open): failed to compile where socketpair is not supported.
+	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
 
 Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
 
-	* mkconfig.rb: substitution references added.
+	* mkconfig.rb: substitution refereces added.
 
-Fri Nov 11 07:39:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
 	  EINVAL, and this causes error in test/fileutils.)
 
-	* file.c: override chown(2) and fchown(2) on BeOS. (these functions
+	* 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]
 
-Thu Nov 10 21:05:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/shellwords.rb: fix for blank but not empty string.
-	  fixed: [ruby-dev:27663]
-
-Wed Nov  9 08:39:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/shellwords.rb: refactored.  [ruby-core:06581]
-
-Tue Nov  8 17:35:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* intern.h, eval.c (rb_thread_signal_raise): constified.
-
-	* signal.c: cosmetic change.
+	* file.c (rb_file_s_link): checks HAVE_LINK.
 
 Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
 	  [ruby-dev:27560] [ruby-core:4627]
 
-Mon Nov  7 20:54:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c: iconvctl() support.  [EXPERIMENTAL]
-
-Mon Nov  7 16:23:23 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl.h: need to include winsock2.h before including
-	  windows.h by some openssl headers.
-
 Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
@@ -28834,7 +8889,7 @@ Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil/tkutil.c: ditto.
 
-Mon Nov  7 00:06:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
 
@@ -28843,7 +8898,7 @@ Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
 	  bug of underlying library.
 
-Sun Nov  6 21:43:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
 	  interpreter after initialization is done. [ruby-dev:27638]
@@ -28853,33 +8908,21 @@ Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
 	  buffer size is less than required.  fixed: [ruby-dev:27634]
 
-Sat Nov  5 13:42:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, cygwin/GNUmakefile.in (mingw): use def file to alias
-	  symbols.  [ruby-dev:27532]
-
-	* bcc32/mkexports.rb, win32/mkexports.rb: make aliases in DLL.
-
-	* win32/win32.c, win32/win32.h: replace symbols only when RUBY_EXPORT
-	  is defined.
-
-Thu Nov  3 07:57:39 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/open-uri.rb (open_loop): find_proxy should return nil when
-	  proxy does not exist. [ruby-dev:27630]
-
 Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
 	  for Win32.
 
+Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib: merge into ext/tk and remove.
+
 Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_rbUpdateObjCmd, ip_rb_threadUpdateObjCmd):
-	  passed improper flags to DoOneEvent().
+	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
+	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
 
-	* ext/tk/tkutil/tkutil.c: use rb_obj_respond_to() instead of
-	  rb_respond_to().
+	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
 
 Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -28889,7 +8932,7 @@ Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (exec_under): frame during eval should preserve external
 	  information.
 
-Tue Nov  1 10:48:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
 	  [ruby-dev:27597]
@@ -28901,14 +8944,19 @@ Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* configure.in: use proper option for Sun linker. A patch from
 	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
 
-Mon Oct 31 05:46:08 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
+	  skip on Win32/DOS platforms.
+
+Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
 	  not be empty. [ruby-talk:161220]
 
 	* test/openssl/test_cipher.rb: add test for Cipher#update("").
 
-Mon Oct 31 05:38:26 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpservlet/cgihandler.rb
 	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
@@ -28920,14 +8968,17 @@ Mon Oct 31 05:38:26 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
 	  test/webrick/webrick.cgi: add some test for cookie.
 
-Mon Oct 31 02:33:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_readline): type check.
+	  [ruby-core:6089]
 
 	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
 
 	* util.h (strtod): add #undef for platforms defines strtod()
 	  macro.   [ruby-dev:27563]
 
-Mon Oct 31 02:31:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
 	  [ruby-dev:27575]
@@ -28939,33 +8990,25 @@ Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/fcntl/fcntl.c: ditto.
 
-Sat Oct 29 16:56:03 2005  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: added seven predicates sunday? to saturday?.
-
-	* lib/date.rb: added two methods {prev,next}_month,
-	  that are almost same as << and >>.
-
-Thu Oct 27 20:34:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (enumerator_allocate): allow subclassing.
-
 Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (scan_once): wrong condition to use mbclen2().
 	  [ruby-dev:27535]
 
-Thu Oct 27 11:53:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* missing.h, missing/memcmp.c, missing/memmove.c:
-	  ANSI compatible interface.
-
-Wed Oct 26 09:15:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
+Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* 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]
+
 Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_EXTERN): macro to export symbols in shared
@@ -28976,14 +9019,6 @@ Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
 
-Tue Oct 25 20:06:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* 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]
-
 Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rational.rb: applied documentation patch from Gavin Sinclair
@@ -28992,22 +9027,12 @@ Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
 	  in irb auto-indentation mode.  [ruby-core:06358]
 
-Tue Oct 25 14:21:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* gc.c (garbage_collect): sorry, previous commit was incorrect.
-	  [ruby-core:6386]
-
-Tue Oct 25 13:40:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* gc.c (garbage_collect): return now whether there're rooms for new
-	  objects, rather than whether GC run. fixed: [ruby-core:6376]
-
 Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
 	  reduce redundant backtrack.  [ruby-talk:161771]
 
-Tue Oct 25 00:35:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/*: RDoc documentation from Eric Hodel
 	  <drbrain@segment7.net> added.
@@ -29017,19 +9042,11 @@ Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
 	  [ruby-core:06247]
 
-Mon Oct 24 20:38:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
 	  fixed: [ruby-list:40058], [ruby-dev:27479]
 
-Mon Oct 24 11:01:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
-	  typo fixed.  [ruby-talk:162187]
-
-	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
-	  ditto.  [ruby-core:06359]
-
 Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
@@ -29038,18 +9055,15 @@ Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
 	  ditto.  [ruby-core:06359]
 
-	* lib/matrix.rb (Matrix::initialize): use funcall instead of send
-	  to allow private methods to be called.  A report from
-	  Jean-Claude Arbaut <jcarbaut@laposte.net>.  [ruby-core:06359]
+Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Oct 24 00:41:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_sunday): added predicate methods for the days of the
-	  week.  [ruby-list:41340]
+	* ext/enumerator/enumerator.c: applied documentation patch from
+	  James Edward Gray II <james@grayproductions.net>.
+	  [ruby-core:06348]
 
 Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/extconf.rb: improve messages [ruby-core:06325].
+	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
 
 	* 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,
@@ -29076,16 +9090,6 @@ Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
 	  options.  [ruby-dev:27449]
 
-Sat Oct 22 14:25:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.[hc] (ruby_add_suffix): constified.
-
-	* util.[hc] (ruby_scan_{oct,hex}): fixed typo. (renamed from
-	  scan_{oct,hex})
-
-	* util.c: almostly ANSI styled. (except for functions depending on
-	  macro and K&R technique)
-
 Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
@@ -29096,20 +9100,7 @@ Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* time.c (rb_strftime): removed meaningless volatile modifiers, and
 	  concatenate successive nul characters at once.  [ruby-dev:27472]
 
-	* ext/tk/lib/tk/font.rb, ext/tk/lib/tkextlib/ICONS/icons.rb,
-	  ext/tk/sample/tkextlib/treectrl/demo.rb, lib/net/imap.rb,
-	  lib/rss/parser.rb, test/rss/test_content.rb,
-	  test/rss/test_dublincore.rb, test/rss/test_syndication.rb,
-	  test/rss/test_trackback.rb, test/ruby/test_eval.rb,
-	  test/socket/test_socket.rb, test/socket/test_udp.rb:
-	  Object#fcall was renamed as Object#funcall.
-
-Sat Oct 22 10:08:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* missing.h, missing/*.c: SUSv3 compatible strcasecmp and strncasecmp,
-	  ANSI compatible strtol and strtoul, and ANSI styled other functions.
-
-Fri Oct 21 19:16:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
 
@@ -29117,27 +9108,7 @@ Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
 
-Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* intern.h, struct.c (rb_struct_iv_get): constified.
-
-	* marshal.c: avoid one VC++6 warning for implicit conversion
-	  from int to char.
-
-	* ruby.h: ANSI styled.
-
-	* bcc32/Makefile.sub (HAVE_HYPOT): added.
-
-	* ext/socket/extconf.rb: BeOS is only one platform should call
-	  closesocket, so check __BEOS__ macro directly. (I was worried
-	  accidently HAVE_CLOSESOCKET is defined on windows again because
-	  it has it)
-
-	* ext/socket/{getaddrinfo.c,socket.c}: ditto.
-
-	... these are all cosmetic changes.
-
-Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bignum.c (bignew_1): convertion from `int' to `char' discards
 	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
@@ -29147,26 +9118,7 @@ Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* time.c: should use LONG_LONG instead of `long long'.
 
-Thu Oct 20 22:22:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parser.y (struct parser_params): parser never modify input string.
-
-	* ext/ripper/tools/preproc.rb (prelude): do not append surplus
-	  newlines to fix line numbers.
-
-Thu Oct 20 11:41:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff
-	  protoize generated to ANYARGS.
-
-Thu Oct 20 11:18:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* eval.c, file.c, ruby.c: removed strchr, strrchr, strstr definition
-	  because they are defined in missing.h.
-
-	* missing.h, missing/strchr.c, missing/strstr.c: ANSI styled.
-
-Thu Oct 20 09:36:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
 	  empty dependency list. If this change is not good, please correct
@@ -29177,13 +9129,20 @@ Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (create_makefile): get rid of a restriction
 	  of Borland make.  fixed: [ruby-dev:27460]
 
-	* ext/ripper/depend: ditto.
+Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubysig.h (CHECK_INTS): fix typo.
 
 Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
 	  directories.  fixed: [ruby-dev:27451]
 
+Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
+	  fixed: [ruby-dev:27439]
+
 Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_join): elements may contain null pointer strings.
@@ -29191,33 +9150,27 @@ Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c, eval.c, gc.c, parse.y, regparse.c, sjis.c, time.c:
-	  made internal symbols static.  [ruby-dev:27435]
+	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
 
-Tue Oct 18 10:58:27 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/depend, ext/dl/extconf.rb, ext/socket/depend,
-	  ext/socket/extconf.rb: shouldn't define DESTCLEANFILES in depend,
-	  use $distcleanfiles in extconf.rb.
+	* regex.c (re_compile_pattern): numeric literal inside character class
+	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
 
-	* win32/Makefile.sub (distclean-local): should remove .config.h.time.
+Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Oct 17 09:42:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* parse.y (parser_heap): byacc never free parser stack.
+	  fixed: [ruby-dev:27428]
 
-	* mkconfig.rb: fixup configure_args for mswin32 configure.
+Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/configure.bat (srcdir, target): ditto.
-
-Mon Oct 17 05:01:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* env.h: move struct METHOD and struct BLOCK from eval.c to
-	  support NodeWrap and ParseTree.
+	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
 
 Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: omit non-existing directories.
 
-Sun Oct 16 14:40:54 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
 	  tuple. fixed: [ruby-list:41227]
@@ -29235,48 +9188,20 @@ Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_thread_schedule): clear rb_thread_critical.
 	  [ruby-core:04039]
 
-Sun Oct 16 00:13:14 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/configure.bat: remove unnecessary line which prevents
-	  creating Makefile.
-
-Sat Oct 15 23:52:07 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb: (getbinaryfile): allow nil for localfile, and
-	  returns retrieved data if localfile is nil.
-
-	* lib/net/ftp.rb: (gettextfile): ditto.
-
-Sat Oct 15 19:51:29 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb: typo fixed, again. thanks, Doug Kearns.
 
-Fri Oct 14 23:09:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (MKFILES): update MKFILES if configure files get
-	  changed.
-
-	* win32/configure.bat, win32/setup.mak (configure_args): store
-	  arguments to configure files.
-
-Fri Oct 14 22:05:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (ioctl): should set errno.
 
-Fri Oct 14 16:39:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* 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 Oct 14 04:58:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_instance_exec): create instance_exec and
-	  module_exec which pass arguments to the block.
-
-	* eval.c (rb_f_funcall): rename fcall to funcall to follow
-	  tradition.
-
 Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (HEAPCNT): bison allocates indivisible size.
@@ -29285,7 +9210,7 @@ Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
 	  get rid of warnings.  fixed: [ruby-core:06247]
 
-Wed Oct 12 12:51:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (Init_openssl): should call
 	  OpenSSL_add_ssl_algorithms().
@@ -29296,15 +9221,6 @@ Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (RUBY_FUNC_ATTRIBUTE): check prefixed attribute form
-	  first.  [ruby-dev:27398]
-
-	* array.c, enum.c, eval.c, util.c: safer function pointer usage.
-	  fixed: [ruby-core:06143]
-
-	* util.h (qsort): removed the definition incompatible to ANSI.
-	  fixed: [ruby-core:06147]
-
 	* eval.c (rb_obj_respond_to): check if obj responds to the given
 	  method with the given visibility.  [ruby-dev:27408]
 
@@ -29315,66 +9231,33 @@ Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* st.c (st_free_table): do not call free() but xfree().
 	  [ruby-core:06205]
 
-Sat Oct  8 19:49:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
 
-	* io.c (rb_io_init_copy): clear PREP flag for copied IO.
-	  fixed: [ruby-dev:27371]
-
 	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
 	  heap.  [ruby-list:41199]
 
-	* parse.y (ripper_initialize): use rb_respond_to().
-
-	* ext/ripper/depend (check): get rid of re-generating ripper.y always.
-
 	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
 
-	* ext/nkf/lib/kconv.rb (Kconv.conv): get rid of nil.to_a.
-
-	* lib/scanf.rb (Scanf::FormatSpecifier#letter, #width): use matched
-	  substring directly.
-
-	* test/ruby/test_assignment.rb, test/ruby/test_iterator.rb: followed
-	  change of sample/test.rb.
-
-	* test/net/http/test_http.rb: removed superfluous splatting stars.
-
-Fri Oct  7 16:41:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (splat_value): call rb_Array() to convert svalue to
-	  values.  [ruby-dev:27397]
-
 Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.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]
 
-Thu Oct  6 22:51:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_Array): Array() to raise error for objects without
-	  to_ary, nor to_a.
-
-	* object.c (nil_to_a): revert NilClass#to_a.
-
-Thu Oct  6 20:10:38 2005  Minero Aoki  <aamine@loveruby.net>
+Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/strscan/strscan.c (strscan_free): remove useless code.
 	  [ruby-dev:26368] [ruby-dev:27389]
-
-Thu Oct  6 01:02:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* range.c (rb_range_beg_len): should return Qfalse for non-range
-	  object.
+	  (backported from trunk, rev 1.22)
 
 Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
 	  servlet on "/".
 
-Wed Oct  5 04:06:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
 	  of "join".
@@ -29383,31 +9266,14 @@ Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* pack.c (EXTEND16): [ruby-dev:27383]
 
-Sat Oct  1 23:55:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (do_select, rb_w32_select): brush up.
-
-Sat Oct  1 12:57:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* bignum.c (rb_big_rand): removed.  [ruby-dev:25405]
-
-Sat Oct  1 01:46:51 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_loop): prohibit multiple proxy
-	  options.
-
 Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
 
-	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): abolish sizeof(FILE).
+	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
 	  [ruby-dev:27317]
 
-Thu Sep 29 10:15:14 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (:proxy_http_basic_authentication): new option.
-
 Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_f_send): underscores need to be escaped.
+	* evalc. (rb_f_send): underscores need to be escaped.
 	  fixed by Doug Kearns.  [ruby-core:06053]
 
 Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -29418,11 +9284,23 @@ Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* variable.c (rb_autoload_load): now return true if autoload
 	  succeeded.  fixed: [ruby-dev:27331]
 
-Wed Sep 28 23:40:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (apply2files): add prototype.
 
 	* file.c (rb_stat_inspect): constified.
 
-Wed Sep 28 15:12:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* 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.
+
+Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb: document update from James Edward Gray II
+	  <james@grayproductions.net>.  [ruby-core:06027]
+
+Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
 	  refer the value of QUERY_STRING. [ruby-list:41186]
@@ -29432,7 +9310,12 @@ Wed Sep 28 15:12:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: cannot compile with Tcl/Tk8.0.x [ruby-dev:27335].
+	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
+	  [ruby-dev:27335].
+
+Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
 
 Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -29443,7 +9326,7 @@ Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
 
-Wed Sep 28 03:16:41 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* rubysig.h: fixed build problem with --enable-pthread on platforms
 	  which don't have setitimer().
@@ -29453,38 +9336,15 @@ Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
 	  tracing function.
 
-Mon Sep 26 20:59:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* parse.y: changed to ANSI function style.
-
-Sun Sep 25 12:02:04 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb: typo fixed.
 
-Sun Sep 25 11:54:11 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
-	  up method. Tabs converted to spaces.
-
-Sun Sep 25 09:34:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* parse.y: replaced `foo _((boo))' with `foo(boo)'.
-
-Sun Sep 25 08:19:53 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rss/test_content.rb, test/rss/test_syndication.rb: use fcall
-	  instead of send in order to override visibility.
-
 Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
 	  closing parenthesis at same column as the opening.
 
-Sun Sep 25 01:33:41 2005  Tanaka Akira  <akr@m17n.org>
-
-	* process.c (proc_setrlimit): make the third argument (rlim_max)
-	  optional.
-
 Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
@@ -29494,37 +9354,20 @@ Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  level for continuous line inside parentheses.
 	  http://nabeken.tdiary.net/20050915.html#p02
 
-Sat Sep 24 21:19:39 2005  Minero Aoki  <aamine@loveruby.net>
+Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
 
-	* ext/strscan/strscan.c: document enhancement.
-
-	* ext/strscan/strscan.c: update copyright year.
-
-	* ext/strscan/strscan.c: update coding style.
-
-Sat Sep 24 20:20:05 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/net/http/test_http.rb (teardown): Net::HTTP.version_1_1 breaks
-	  many other tests; ensure that Net::HTTP is version 1.2 after test.
-	  [ruby-dev:27312]
-
-Sat Sep 24 11:44:28 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/net/http/test_http.rb: new file.
+	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
 
-Sat Sep 24 08:54:05 2005  Minero Aoki  <aamine@loveruby.net>
+Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless. [ruby-core:05858] [ruby-Bugs:2494]
+	  code is useless (backported from trunk, rev 1.67).
+	  [ruby-core:05858] [ruby-Bugs:2494]
 
-Sat Sep 24 08:30:00 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#sub): new method.
-
-Sat Sep 24 08:29:36 2005  Minero Aoki  <aamine@loveruby.net>
+Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun. [ruby-core:05954]
+	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
 
 	* test/fileutils/test_nowrite.rb: test it.
 
@@ -29532,163 +9375,32 @@ Sat Sep 24 08:29:36 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_verbose.rb: new file.
 
-Sat Sep 24 07:59:01 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* sample/ripper/colorize.rb: removed (replaced by ruby2html.rb).
-
-	* sample/ripper/ruby2html.rb: added.
-
-Sat Sep 24 06:35:15 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper: no longer generates .rb files.
-
-	* parse.y (Init_ripper): ripper_init_eventids*() takes 1 argument,
-	  self (class Ripper).
-
-	* ext/ripper/depend: target removed: `lib/ripper/core.rb'.
-
-	* ext/ripper/depend: new target `eventids2table.c'.
-
-	* ext/ripper/depend: new target `check'.
-
-	* ext/ripper/eventids2.c: include eventids2table.c.
-
-	* ext/ripper/eventids2.c: initialize SCANNER_EVENT_TABLE.
-
-	* ext/ripper/extconf.rb: update $cleanfiles list.
-
-	* ext/ripper/tools/generate.rb: no longer generate ripper/core.rb.
-
-	* ext/ripper/tools/generate.rb: new mode `check'.
-
-	* ext/ripper/tools/generate.rb: new mode `eventids2table'.
-
-	* ext/ripper/lib/ripper/core.rb.in: removed.
-
-	* ext/ripper/lib/ripper/core.rb: added.
-
-	* ext/ripper/lib/ripper/filter.rb: update copyright year.
-
-	* ext/ripper/lib/ripper/lexer.rb: ditto.
-
-	* ext/ripper/lib/ripper/sexp.rb: ditto.
-
 Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb: document update from James Edward Gray II
 	  <james@grayproductions.net>.  [ruby-core:05942]
 
-Sat Sep 24 02:05:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_daemon): should restrict execution on levels
-	  higher than $SAFE=2.  suggested by URABE Shyouhei
-	  <shyouhei@ice.uec.ac.jp>.
-
-Fri Sep 23 20:10:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/ripper/tools/generate.rb, ext/ripper/tools/preproc.rb: StringIO
-	  is not available for miniruby.  fixed: [ruby-dev:27307]
-
-Fri Sep 23 17:36:48 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
-	  [ruby-dev:27133]
-
-Fri Sep 23 16:27:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/forwardable.rb: replaced by new implementation from
-	  <Daniel.Berger@qwest.com>.  [ruby-core:05899]
-
-Fri Sep 23 07:07:47 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/depend: use --output option instead of redirect;
-	  nmake does not remove a target when the target file is created by
-	  redirect. [ruby-dev:26466]
-
-	* test/ripper/tools/preproc.rb: new option --output.
-
-Fri Sep 23 06:57:52 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/tools/generate.rb: check parser event arity.
-
-	* test/ripper/tools/generate.rb: detect crash of parser-event-IDs
-	  and scanner-event-IDs.
-
-Fri Sep 23 06:01:30 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_file.rb: check File#chown(nil,nil).
-	  [ruby-dev:27140]
-
-Fri Sep 23 05:57:23 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper: refactoring code generation tools. [ruby-dev:27247]
-	  [ruby-dev:27273]
-
-	* ext/ripper/depend: use generate.rb.
-
-	* ext/ripper/lib/ripper/core.rb: removed.
-
-	* ext/ripper/tools/generate-eventids1.rb: removed (code moved to
-	  generate.rb).
-
-	* ext/ripper/tools/generate-ripper_rb.rb: removed (code moved to
-	  generate.rb).
-
-	* ext/ripper/tools/list-parse-event-ids.rb: removed (code moved to
-	  generate.rb).
-
-	* ext/ripper/tools/list-scan-event-ids.rb: removed (code moved to
-	  generate.rb).
-
-	* ext/ripper/lib/ripper/core.rb: removed.
-
-	* ext/ripper: refactoring tests. [ruby-dev:27273]
-
-	* ext/ripper/test/check-event-arity.rb: removed (code moved to
-	  tools/generate.rb).
-
-	* ext/ripper/test/check-event-coverage.rb: removed (code moved to
-	  test/ripper/test_parser_events.rb).
-
-	* ext/ripper/test/check-scanner-event-coverage.rb: removed (code
-	  moved to test/ripper/test_scanner_events.rb).
-
-	* ext/ripper/test/list-called-events.rb: removed.
-
-	* ext/ripper/test/src_rb: removed.
-
-	* ext/ripper/test/validate.rb: removed.
-
-	* test/ripper/test_scanner_events.rb: check event coverage.
-
-	* ext/ripper/lib/ripper/core.rb.in: update copyright year.
-
-Thu Sep 22 23:40:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (find_executable0): default path if environment is not
 	  set.  [ruby-dev:27281]
 
-	* ext/ripper/extconf.rb (have_command): replaced with find_executable.
-
-Thu Sep 22 17:31:48 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/readline/test_readline.rb (TestReadline::replace_stdio):
 	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
-	  (merged from ruby_1_8 branch)
 
 Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): generalized nmake dependent code.
 
-Wed Sep 21 14:16:30 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/ripper/depend (SUFFIXES): no longer needed.
+Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/ripper/depend (c): avoid nmake problem. fixed [ruby-dev:27191]
+	* stable version 1.8.3 released.
 
 Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
 
-	* ext/syck/token.c: correctly compute indentation of a block
+	* ext/syck/token.c: correctly compute identation of a block
 	  scalar's parent node. [ruby-talk:150620]
 
 Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -29705,18 +9417,19 @@ Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* file.c (path_check_0): disallow sticky world writable directory
 	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
 
-Wed Sep 21 00:32:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (fpath_check): typo fixed.
+
+Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* numeric.c (fix_idiv): 1.div(1.0) should return integer value.
-	  [ruby-dev:27235]
+	* 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.
 
-Tue Sep 20 22:25:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
 	  is not available.  fixed: [ruby-dev:27187]
 
-	* file.c (rb_stat_inspect): protoized function pointer.
-
 Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
 
 	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
@@ -29736,23 +9449,28 @@ Tue Sep 20 17:48:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
 
-Tue Sep 20 17:26:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-Tue Sep 20 17:14:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
-	  [ruby-dev:27185]
-
 Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
 	  test_s_open_error test to detect duplicate open.
 	  [ruby-dev:27202]
 
+Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
+	  [ruby-dev:27185]
+
+Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* test/readline/test_readline.rb (TestReadline::replace_stdio):
+	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
+
 Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
@@ -29769,57 +9487,49 @@ Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
 	  emission of plain strings that look like symbols, but which aren't.
 
-Tue Sep 20 05:48:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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.
 
-Tue Sep 20 01:24:45 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (splat_value): use to_a to splat non Array object.
-
-	* object.c (nil_to_a): remove nil.to_a.  [experimental]
-
-Tue Sep 20 01:01:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Fixnum): remove debug print.
-
-	* lib/rational.rb (Rational): ditto.
-
 Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
 	  object.  [ruby-dev:27156]
 
-Mon Sep 19 18:58:10 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
+	  (backport from trunk, rev 1.208)
 
-Mon Sep 19 18:29:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (file_expand_path): allow pathnames to expand.
-	  [ruby-dev:27152]
+	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
+	  [ruby-dev:27151]
 
-Mon Sep 19 15:12:15 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/ripper/depend: do not make ripper/core.rb. [ruby-dev:26462]
+	* ext/syck/emitter.c (syck_emit): passing an int* value to the
+	  long* parameter causes unaligned access on LP64 systems.
+	  [ruby-dev:27161]
 
-Mon Sep 19 14:49:19 2005  Minero Aoki  <aamine@loveruby.net>
+Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/ripper/eventids2.c: add prefix `t' to tLAMBDA-related lexer
-	  events.
+	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
+	  [ruby-dev:27133]
 
-	* ext/ripper/lib/ripper/core.rb: updated.
+Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
 
-Mon Sep 19 14:39:46 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
+	  backward compatibility. [ruby-dev:27145]
 
-	* parse.y (do_block): do_block event dispatches 2 args.
-	  [ruby-dev:26964]
+	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
 
-	* ext/ripper/lib/ripper/core.rb: updated.
+Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/ripper/tools/list-parser-event-ids.rb: check arity mismatch.
+	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+	  (again) [ruby-dev:27145]
 
 Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
@@ -29831,23 +9541,43 @@ Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
 	  key flag.
 
-	* test/openssl/test_pkey_rsa.rb: add test about private detection.
+Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
 
-Mon Sep 19 06:38:03 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/fileutils.rb: backported from trunk (rev 1.65):
 
-	* lib/fileutils.rb: method renaming: collect_methods ->
-	  collect_method.
+	* lib/fileutils.rb (rm_r): new option :secure.
 
-Mon Sep 19 05:58:59 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/fileutils.rb (rm_rf): new option :secure.
 
-	* lib/fileutils.rb: use module_function instead of single extend.
+	* lib/fileutils.rb: new method #remove_entry_secure.
+
+	* lib/fileutils.rb (cd): remove option :noop.
+
+	* lib/fileutils.rb (cp_r): new option :dereference_root.
+
+	* lib/fileutils.rb (cp_r): new option :dereference_root.
 
-	* test/fileutils/test_fileutils.rb: test existence of singleton
-	  methods.
+	* lib/fileutils.rb: new method #remove_entry.
 
-Mon Sep 19 05:32:41 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/fileutils.rb: new method #chmod_R.
 
-	* lib/fileutils.rb (remove_entry_secure): does not use chdir(2).
+	* lib/fileutils.rb: new method #chown.
+
+	* lib/fileutils.rb: new method #chown_R.
+
+	* lib/fileutils.rb: new method .commands.
+
+	* lib/fileutils.rb: new method .options.
+
+	* lib/fileutils.rb: new method .have_option?.
+
+	* lib/fileutils.rb: new method .options_of.
+
+	* lib/fileutils.rb: new method .collect_method.
+
+	* lib/fileutils.rb: use module_function instead of single extend.
+
+	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
 
 Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -29859,24 +9589,13 @@ Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
 	  which is full.  [ruby-dev:27132]
 
 	* io.c (rb_io_syswrite): wrap the write system call by
-	  TRAP_BEG/TRAP_END to run signal hander in syswrite method.
-	  [ruby-dev:27134]
-
-Mon Sep 19 01:07:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (Init_Numeric): should define Fixnum#div.
-	  [ruby-dev:27129]
-
-	* file.c (rb_thread_flock): wrap flock(2) by TRAP_BEG and
-	  TRAP_END.  [ruby-dev:27122]
-
-	* file.c (rb_file_join): call FilePathValue() to all Pathnames to
-	  join.  [ruby-dev:27127]
+	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
+	  full.  [ruby-dev:27134]
 
-	* file.c (rb_get_path): call StringValueCStr() to ensure no nul
-	  bytes in path strings.
+Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
 
-	* gc.c (garbage_collect): need value for return.  [ruby-dev:27127]
+	* 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.
 
 Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -29894,10 +9613,6 @@ Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
 	* test/yaml/test_yaml.rb: remove outdated tests.
 
-Sun Sep 18 01:10:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (garbage_collect): return false if no GC run.
-
 Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
 
 	* lib/mathn.rb (Rational::inspect): should preserve original
@@ -29908,79 +9623,6 @@ Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
 	  cookie name.  [ruby-talk:156140]
 
-	* test/socket/test_tcp.rb (TestTCPSocket::test_recvfrom): typo
-	  fixed.  [ruby-dev:27123]
-
-Sat Sep 17 20:58:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_select): fixed deadlock bug.
-	  because select(2) modifies its fd_set arguments, it must be
-	  restored sometimes.
-
-	* win32/win32.c (rb_w32_select): performance improvement when
-	 'always readable/writable handles' and sockets are passed.
-	  sockets should be polled every time.
-
-	    require "net/http"
-
-	    Thread.new {
-	      loop do
-		STDOUT.write(".") # busy on console (this is worst case though)
-	      end
-	    }
-
-	    # socket operation took long time. (sometimes timed out)
-	    Net::HTTP.start("www.ruby-lang.org") do |http|
-		http.get("/cgi-bin/cvsweb.cgi/ruby/array.c?rev=1.179")
-	    end
-
-Sat Sep 17 14:54:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_readpartial.rb (test_open_pipe, test_with_stdio):
-	  these tests are working now, so turned on. (windows)
-
-Sat Sep 17 14:18:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_select): I hope performance problem was
-	  solved.
-
-Sat Sep 17 13:45:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_select): console support is back.
-	  but still has performance problem because I loosely took 1 second
-	  for wait time. I'll fix it later. (The reason I drastically changed
-	  the code is that I wanted to implement the fileset management as
-	  single function, and I was worried that if pipe or console
-	  was always available, socket may not be processed any time)
-
-Sat Sep 17 11:24:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_select): select for socket didn't work.
-	  this caused deadlock in drb test. this happened because GetFileType
-	  for socket handle returns FILE_TYPE_PIPE. Of course, it's not a
-	  pipe. So socket handle didn't reach winsock's select function.
-
-	* win32/win32.c (rb_w32_select): read for pipe was still blocked
-	  even if writer handle was closed.
-
-	    r,w = IO.pipe
-
-	    Thread.new {
-	      sleep 3; puts "------- 1"
-	      w.puts("foo")
-	      sleep 3; puts "------- 2"
-	      w.puts("boo")
-	      sleep 3; puts "------- 3"
-	      w.close
-	    }
-
-	    until r.eof? # should break by w.close but didn't.
-	      puts r.gets
-	    end
-
-	* win32/win32.c (rb_w32_select): temporary reverted console support
-	  but it'll be back soon.
-
 Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
@@ -30004,14 +9646,14 @@ Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
 
-Sat Sep 17 08:02:53 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* lib/net/imap.rb: supported DIGEST-MD5.  Thanks, Mathieu Arnold.
+	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
+	  in ext/win32ole/sample/ienavi.rb.
 
-	* lib/net/imap.rb: use fcall instead of send.  Thanks, Satoru
-	  Takabayashi.
+	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
 
-Fri Sep 16 22:45:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_extname): empty string for path name ending with a
 	  period.  fixed: [ruby-core:05651]
@@ -30019,19 +9661,6 @@ Fri Sep 16 22:45:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* file.c (rb_file_join): smarter behavior at edge cases.
 	  fixed: [ruby-core:05706]
 
-	* gc.c (rb_memerror, ruby_xmalloc, ruby_xrealloc, rb_newobj): just
-	  abondon if no memory available, when interpreter is not running.
-	  [ruby-dev:27104]
-
-	* gc.c (garbage_collect): return whether GC could run.
-
-	* dir.c (rb_push_glob): fix delimiter bug.  fixed: [ruby-dev:27105]
-
-	* dir.c (dir_s_aref, dir_s_glob): allow multiple patterns.
-	  [ruby-dev:27110]
-
-	* win32/win32.c (cmdglob): enable brace expansion.
-
 Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/syck/node.c (syck_replace_str): was using return from the
@@ -30047,12 +9676,12 @@ Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
 	  comment (//).  [ruby-core:05793]
 
-Fri Sep 16 00:17:03 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/logger/test_logger.rb: unintentionally overwritten changes by
 	  Usa.  reverted.
 
-Fri Sep 16 00:03:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
 	  $stdout.binmode.
@@ -30066,10 +9695,10 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * SOAP
 
 	    * 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 = 'http://www.w3.org/2003/05/soap-envelope'
+	  	@client.options["soap.envelope.requestnamespace"] =
 		  TemporaryNamespace
-		@client.options["soap.envelope.responsenamespace"] =
+	 	@client.options["soap.envelope.responsenamespace"] =
 		  TemporaryNamespace
 		@client.do_proc(...)
 
@@ -30141,62 +9770,45 @@ Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	    * updated deprecated method usage.  (#138)
 
-Thu Sep 15 22:40:27 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* test/ruby/test_signal.rb (test_exit_action): skip the test using
-	  fork on fork-less platforms.
+	* win32/win32.h (rb_w32_stat): added prototype.
 
-Thu Sep 15 13:54:33 2005  Tanaka Akira  <akr@m17n.org>
+Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/open-uri.rb: add :read_timeout option.
-	  [ruby-core:4848]
+	* test/ruby/test_signal.rb (test_exit_action): skip the test using
+	  fork on fork-less platforms.
 
 Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
 	  TkDialogObj#name raises an exception. [ruby-talk:156109]
 
-Thu Sep 15 11:01:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_pipe_exec): remove unnecessary CloseHandle().
+Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* win32/win32.c (extract_console_fd, peek_console): new functions.
-
-	* win32/win32.c (rb_w32_select): check consoles by polling them.
+	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
+	  up method. Tabs converted to spaces.
 
 Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
 	  readpartial.  [ruby-talk:127641]
 
-Wed Sep 14 23:28:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (collect_file_fd): rename from extract_file_fd.
-
-	* win32/win32.c (extract_pipe_fd, peek_pipe): new functions.
-
-	* win32/win32.c (rb_w32_select): check pipes by polling them.
-
 Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (ruby_glob): glob function not using ruby exception system.
 
-Wed Sep 14 17:24:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* dir.c: changed `foo (*bar)_((boo))' to `foo (*bar)(boo)`.
+	* lib/net/https.rb: backported from trunk, rev 1.3.
+	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
+	  [ruby-dev:27062]
 
-	* enumerator.c, eval.c, gc.c, intern.h, io.c, process.c, ruby.c,
-	  ruby.h, signal.c: ditto.
+	* ext/openssl/lib/net/https.rb: removed.
 
-Wed Sep 14 15:06:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/openssl/lib/net/protocols.rb: removed.
 
-	* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
-
-	* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
-	  gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
-	  node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
-	  rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
-	  util.c, util.h, variable.c: ditto.
+	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
 
 Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
@@ -30217,20 +9829,19 @@ Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
 	  fixed: [ruby-dev:26881]
 
-Tue Sep 13 20:24:37 2005  Tanaka Akira  <akr@m17n.org>
+Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
+	* lib/net/http.rb: backported from trunk, rev 1.128.
+	  [ruby-dev:25673] [ruby-dev:26617]
 
-Tue Sep 13 15:41:29 2005  Minero Aoki  <aamine@loveruby.net>
+	* lib/net/protocol.rb: backported from trunk, rev 1.78.
 
-	* lib/net/http.rb: wrote docuemntation of HTTPRequest/HTTPResponse
-	  classes.
+	* lib/net/protocol.rb: new method #old_open to support net/smtp
+	  and net/pop.
 
-Tue Sep 13 14:27:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/net/smtp.rb: use #old_open.
 
-	* string.c, missing.h: failed to build on powerpc-apple-darwin7.9.0
-	  because of crypt argument's constness mismatch. (I hope this works)
-	  (http://mput.dip.jp/autobuild/ruby-trunk/log/20050913T110001.gz)
+	* lib/net/pop.rb: ditto.
 
 Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -30246,12 +9857,12 @@ Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 	  continue support of Object#to_yaml_type.
 
 	* 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,
+	  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.
+	  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.
 
 	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
@@ -30270,28 +9881,6 @@ Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/syck.h: reflect block_styles and new node functions.
 
-Tue Sep 13 08:09:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (new_ostruct_member): Object#send no longer call
-	  private methods.  [ruby-dev:27044]
-
-	* test/rss/test_dublincore.rb, test/rss/test_trackback.rb,
-	  test/ruby/test_eval.rb, test/socket/test_socket.rb: ditto.
-
-	* test/ruby/test_lambda (test_call_with_block): lambda makes new scope
-	  for formal block parameter.
-
-Tue Sep 13 01:17:45 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_save_safe_level): no need to restrict safe level
-	  memoize in $SAFE>=3.  [ruby-dev:27050]
-
-Tue Sep 13 00:02:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): stricter callback definition.
-
-	* file.c (rb_path_check): constified.
-
 Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
@@ -30299,83 +9888,29 @@ Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  compiled with OpenSSL-0.9.7d or earlier versions).
 	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
 
-Mon Sep 12 20:32:00 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[hc] (rb_w32_argv_size, ...): reverted my latest change
-	  to avoid incompatible pointer warning. (mingw32)
-
-Mon Sep 12 19:58:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dln.c: avoid warning of const to non-const convertion.
-	  [ruby-dev:27041]
-
-	* eval.c, io.c, ruby.c: ditto.
-
-Mon Sep 12 19:26:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c: moved to ANSI function style from K&R function style.
-	  (used protoize on windows, so still K&R remains on #ifdef part of
-	   other platforms. And  `foo _((boo))' stuff is still there)
-	   [ruby-dev:26975]
-
-	* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
-	  enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
-	  io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
-	  prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
-	  regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
-	  sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
-	  version.c: ditto.
-
 Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/dbm/test_dbm.rb: remove locking test, which may not be
 	  supported on some platforms.  [ruby-dev:27030]
 
-Sun Sep 11 23:23:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/imap.rb (starttls): supported the STARTTLS command.
+	* 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]
 
-Sun Sep 11 22:18:07 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
 	  when reporting syntax/runtime errors. Tabs converted to spaces.
 
-Sat Sep 10 22:34:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c, bignum.c: protoize.
-
-Sat Sep 10 00:23:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (splat_value): simpler and consistent array conversion
-	  for argument splat.  [yarv-dev:599]
-
-Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_times): make empty strings to keep taintness,
-	  and a little improvement.  [ruby-dev:26900]
-
-	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
-	  characters in command line option.  fixed: [ruby-talk:155369]
-
-	* ext/iconv/iconv.c: protoized.
-
-Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* merged a patch from Takahiro Kambe <taca at back-street.net> to
-	  support DragonFly BSD.  [ruby-dev:26984]
-
-Thu Sep  8 13:14:57 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* missing/strchr.c (strrchr): fixed a bug in detecting NUL in a
-	  string.  [ruby-dev:26985]
-
-Wed Sep  7 17:29:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* 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.
+	  engines. the following code is a sample of loading a key using
+	  OpenSC PKCS #11 module.
 
 		require "openssl"
 		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
@@ -30392,7 +9927,7 @@ Wed Sep  7 17:29:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
 	  OpenSSL::Engine#cmds. it returms engine command definitions.
 
-Wed Sep  7 15:48:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
 
@@ -30405,6 +9940,64 @@ Wed Sep  7 15:48:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_pkcs7.rb: new file.
 
+Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
+	  the argument is a DER string if Base64 decoding failed.
+
+	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+
+	* test/openssl/test_ns_spki.rb: add new file.
+
+Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* 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.
+
+	* test/openssl/test_digest.rb: add test for new digests.
+
+Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.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.
+
+	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
+	  this library.
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+
+	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
+	  of unused variable.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
+	  set @time to avoid warning.
+
+	* 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.
+
+	* test/openssl/test_x509store.rb: add test for errors.
+
+Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (rb_call0): prohibit calling tainted method (>2) when
+	  $SAFE == 0.
+
+Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_times): make empty strings to keep taintness,
+	  and a little improvement.  [ruby-dev:26900]
+
+	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
+	  characters in command line option.  fixed: [ruby-talk:155369]
+
+Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* merged a patch from Takahiro Kambe <taca at back-street.net> to
+	  support DragonFly BSD.  [ruby-dev:26984]
+
 Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
@@ -30418,15 +10011,6 @@ Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_terminated): show backtrace before propagate
 	  exceptions to main thread.
 
-Wed Sep  7 09:21:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[hc] (rb_w32_utime): constified.
-
-	* win32/win32.h (rb_w32_stat): added prototype.
-
-	* win32/win32.[hc] (rb_w32_argv_size,rb_w32_join_argv,rb_w32_aspawn):
-	  changed `char *const *' to `const char *const *'. (constify string)
-
 Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
@@ -30445,62 +10029,37 @@ Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
 	  char*.  fixed: [ruby-core:05470]
 
-Wed Sep  7 08:32:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* string.c (rb_str_times): should taint empty strings as well.
+	* 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]
 
-	* object.c (Init_Object): make class_variable_{get,set} public.
-	  [ruby-dev:26965]
-
-Mon Sep  5 22:28:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
-	  nothing.  fixed: [ruby-dev:26952]
-
-	* ext/ripper/eventids2.c: added new tokens.  fixed: [ruby-dev:26952]
+	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
+	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
 
 Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/find.rb: should raise ENOENT if root entry does not exist.
-	  [ruby-list:41054]
-
 	* 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]
 
-Mon Sep  5 08:20:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/observer.rb: a patch from nornagon <nornagon at gmail.com>
-	  merged to allow arbitrary names for update methods.
-	  [ruby-core:05416]
-
 Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
 	  should clear data from the buffer which already been output.
 
-Sun Sep  4 15:01:35 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (f_arg): Ripper should not do semantic check.
-	  [ruby-dev:26948]
-
-Sat Sep  3 23:52:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_fcall): new method to avoid inefficiency of
-	  obj.instance_eval{send(...)} tricks.
-
-Sat Sep  3 13:59:31 2005  Tanaka Akira  <akr@m17n.org>
+Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend
-	  didn't yield "."
-	  (Pathname#ascend): ditto.
+	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
 
-Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
-	* parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID.
-	  fixed: [ruby-dev:26942]
+	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
+	  [ruby-dev:26872], [ruby-dev: 26920]
 
-	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
+	* lib/irb/locale.rb: support to print help message when OS locale is
+	  ja_JP.utf-8. [ruby-dev:26872]
 
 Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -30515,31 +10074,20 @@ Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  to support '-namespace' option of 'interp invokehidden' command
 	  on Tcl8.5.
 
-Wed Aug 31 14:41:30 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub (OPTFLAGS): default global optimization to
 	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
 
-Wed Aug 31 10:36:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* process.c (proc_detach, proc_setmaxgroups): missing argument type
-	  declaration. (I recommend ANSI-style function)
+Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Aug 31 06:59:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_scan): already String#scan behaves differently
-	  regarding if block is given.
-
-Tue Aug 30 23:49:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c, dir.c, enum.c, hash.c, io.c, range.c, string.c, struct.c:
-	  let enumerable methods return Enumerator.  [ruby-dev:26924]
-
-	* intern.h (RETURN_ENUMERATOR): utility macro for enumerable methods.
+	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
+	  file.
 
-Tue Aug 30 23:25:45 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/debug.rb: no need to restart at exit.
+	* process.c (proc_detach, proc_setmaxgroups): missing argument type
+	  declaration. (I recommend ANSI-style function)
 
 Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -30558,47 +10106,24 @@ Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
 	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
 
-Tue Aug 30 16:19:40 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/init.rb: bug fix. [ruby-dev: 26920]
-
-Tue Aug 30 16:13:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_count): new method.  [ruby-dev:26895]
-
-Tue Aug 30 12:45:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_send): do not call private methods if the receiver
-	  is specified.  [ruby-talk:153672]
-
-Mon Aug 29 19:47:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
 
 	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
 	  shebang. (this is needed when ri.bat is executed on windows)
 
-Mon Aug 29 18:58:05 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
-	  [ruby-dev:26872]
-
-	* lib/irb/locale.rb: support to print help message when OS locale is
-	  ja_JP.utf-8. [ruby-dev:26872]
+	* eval.c (method_arity): should return proper arity value.
+	  [ruby-dev:26390]
 
-Mon Aug 29 01:43:05 2005  Tanaka Akira  <akr@m17n.org>
+Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
 
-	* lib/pathname.rb (Pathname#descend): new method.
-	  (Pathname#ascend): ditto.
+	* lib/time.rb (Time.parse): extract fractional seconds using
+	  Date._parse.  [ruby-talk:153859]
 
-Mon Aug 29 00:35:09 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb: require 'date/format' instead of 'parsedate'.
-	  (Time.parse): extract fractional seconds using Date._parse.
-	  (Time.strptime): extract fractional seconds using Date._strptime.
-	  [ruby-talk:153859]
-
-Sat Aug 27 20:13:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
 	  by Reyn Vlietstra.
@@ -30608,77 +10133,18 @@ Sat Aug 27 20:13:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/curses/view.rb: String =~ String is deprecated.
 
-Thu Aug 25 15:48:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/win32ole/win32ole.c: suppress warnings. (win32)
-
-Wed Aug 24 11:01:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/logger/test_logger.rb (test_shifting_size): should close log
 	  device before unlink, since some platform cannot unlink opened
 	  file.
 
-Tue Aug 23 06:07:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* 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.
-
-	* test/openssl/test_digest.rb: add test for new digests.
-
-Tue Aug 23 05:47:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): try to decode
-	  the argument as a string.
-
-	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
-	  set @time to avoid warning.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
-	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
-	  wrapped functions fails.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
-
-	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
-	  of unused variable.
-
-	* test/openssl/test_ns_spki.rb: add new file.
-
-	* test/openssl/test_x509store.rb: add test for error.
-
-Tue Aug 23 01:11:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* sprintf.c (ruby__sfvwrite): should move `buf' to the end of
-	  `result'. [ruby-dev:26859]
-
-Mon Aug 22 23:51:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: ONIG_OPTION_CAPTURE_GROUP conflicts with
-	  RE_OPTION_ONCE.  [ruby-dev:26852]
-
-Mon Aug 22 20:11:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/vsnprintf.c (BSD__sprint): needs to call vwrite function
-	  pointer.  fixed: [ruby-dev:26854]
-
-Sat Aug 20 23:55:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): update paren_nest for brackets [].
-
-Sun Aug 21 00:10:23 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* 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]
 
-Sat Aug 20 22:05:25 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* regexec.c (code_is_in_cclass_node): check code size.
-	  [ruby-dev:26840]
-
 Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
@@ -30691,25 +10157,23 @@ Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
 	* lib/time.rb (Time.apply_offset): fix a problem with last day of
 	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
 
-Thu Aug 18 11:05:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* win32/win32.c (socketpair_internal): need to call open_ifs_socket()
-	  to create sockets instead of winsock's socket().
-	  fixed: [yarv-dev:581]
+	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
+	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
+	  [ruby-dev:26806]
+
+	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
 
 Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* object.c (rb_to_integer): argument constified.
+
 	* eval.c (terminate_process): take String message.
 
 	* eval.c (rb_thread_switch): propagate the exception caused thread
 	  termination directly.  fixed: [ruby-core:05552]
 
-Wed Aug 17 21:20:05 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb: ensure that symbol_to_option is private_class_method
-	  and all other methods are module_function
-	  fixed: [ruby-dev:26808]
-
 Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_add_method): preserve safe level in the environment
@@ -30718,46 +10182,12 @@ Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_call0): restore preserved safe level in the method
 	  execution.
 
-	* parse.y (lambda): need separate block variable stack
-	  manipulation and lpar_beg maintenance.  based on a patch found
-	  in [ruby-core:05551] from Mauricio Fernandez <mfp at acm.org>.
-
-	* parse.y (parser_yylex): adjust lpar_beg after tLAMBEG and
-	  kDO_LAMBDA. [ruby-core:05551]
-
-Mon Aug 15 07:24:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (rb_check_to_integer): add declaration.
-
-	* object.c (rb_to_integer, rb_check_to_integer): argument constified.
-
 Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
 	  [ruby-dev:26800]
 
-	* range.c (range_check, range_init): reduce uselse exceptions.
-
-Mon Aug 15 00:34:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yycompile): remove unreachable code.  [yarv-dev:570]
-
-Sat Aug 13 22:16:12 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_entry_secure): forgot final chdir.
-
-Sat Aug 13 22:07:49 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_entry_secure): uses chdir(2) and check
-	  if current directory is correct. [ruby-dev:26100] [ruby-dev:26226]
-
-Sat Aug 13 21:11:05 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_VARIANT class.
-
-	* ext/win32ole/tests/testall.rb: ditto.
-
-	* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
+	* range.c (range_check, range_init): reduce useless exceptions.
 
 Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -30767,30 +10197,10 @@ Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_set_string): disallow nil.
 	  http://www.rubyist.net/~nobu/t/20050811.html#c05
 
-Sat Aug 13 08:01:59 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb: Kconv.kconv is now alias of Kconv.conv
-	* ext/nkf/lib/kconv.rb: remove nkf dependend symbols fomr SYMBOL_TO_OPTION
-
-Fri Aug 12 17:06:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_larglist): allow optional arguments even when
-	  parentheses are omitted.  based on Nobu's patch from
-	  http://www.rubyist.net/~nobu/t/20050805.html
-
-	* parse.y (parser_yylex): update & maintain lpar_beg for detect
-	  lambda parameters.
-
 Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c: keep holding string after closed.
 
-Thu Aug 11 20:48:40 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* numeric.c (fix_equal, fix_cmp, fix_gt, fix_ge, fix_lt, fix_le):
-	  reduce coercing when a method knows about a operand type.
-	  [ruby-dev:26789]
-
 Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss: fixed sort bug. [ruby-list:41018]
@@ -30815,33 +10225,6 @@ Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
 	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
 	  tests for RSS::Maker::ItemsBase#do_sort.
 
-Wed Aug 10 12:01:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb: simplifies Delegator classes; SimpleDelegator
-	  now uses method_missing for all methods.
-
-Wed Aug 10 10:38:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_mul0): multiply two numbers (x, y) without
-	  normalizing the result.  x should be a big number.
-	  [ruby-dev:26778]
-
-	* bignum.c (rb_big_pow): use rb_big_mul0() instead of
-	  rb_big_mul().
-
-	* array.c (rb_ary_or, rb_ary_and, rb_ary_plus, rb_ary_diff):
-	  revert the change on 2005-08-03.  Set operation on other item
-	  should have in separate methods.
-
-	* parse.y (shadowing_lvar_gen): warn when arguments shadows
-	  external local variables.
-
-	* parse.y (f_opt): optional arguments should not clobber external
-	  local variables.
-
-	* parse.y (f_rest_arg): rest arguments should not clobber external
-	  local variables.
-
 Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
@@ -30853,19 +10236,9 @@ Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
 
-Tue Aug  9 21:53:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (formal_assign): let default values override
-	  arguments to zsuper.  fixed: [ruby-dev:26743]
-
-Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
-	  [ruby-dev:26778]
-
 Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: remove dangerous 'rb_jump_tag's.
+	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
 
 	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
 	  help to convert option values between ruby and tcl.
@@ -30888,56 +10261,28 @@ Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
 	  configure options.
 
-Tue Aug  9 08:24:05 2005  Mauricio Fernandez  <mfp@acm.org>
-
-	* parse.y (f_block_arg), eval.c (rb_yield_0): deal with dynamic
-	  variable lambda arguments.  [ruby-core:05540]
-
-Mon Aug  8 22:13:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (assign): deal with new block argument.
-	  fixed: [ruby-core:05536]
-
-	* eval.c (rb_node_arity): follow change of NODE_ARGS.
-	  fixed: [ruby-dev:26761]
-
-Mon Aug  8 21:28:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
 
-	* test/ruby/test_fnmatch.rb: separated from test_file.rb.
+	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
+	  [ruby-dev:26778]
 
-Mon Aug  8 20:40:35 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
 
-Mon Aug  8 01:26:37 2005  Mauricio Fernandez  <mfp@acm.org>
-
-	* parse.y (f_larglist): mistake in syntax rule.  [ruby-core:05535]
+Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-Mon Aug  8 05:16:55 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
 
-	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
-	  to get last error on the current thread. And should report
-	  if errors are on the stack while OpenSSL.debug is true.
+Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
-	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
-	  this library.
+	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
+	  only one event handler.
 
-Mon Aug  8 05:15:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
 
-	* lib/webrick/httpproxy.rb (HTTPProxyServer#intialize),
-	  lib/webrick/httpserver.rb (HTTPServer#intialize),
-	  lib/webrick/httpservlet/cgihandler.rb (CGIHandler#initialize),
-	  lib/webrick/httpservlet/erbhandler.rb (ERBHandler#initialize),
-	  lib/webrick/httpservlet/filehandler.rb(DefaultFileHandler#initialize):
-	  super (called with no arguments) takes default value of optional
-	  arguments. [ruby-dev:26743]
-
-	* lib/webrick/httputils.rb: add a media-type "text/html" for .xhtml.
-
-Sun Aug  7 23:52:39 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_super.rb: added optional arg tests.  [ruby-dev:26743]
-	  the tests expects 1.8 behavior at this time.
+	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
+	  test_ole_type_detail method.
 
 Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -30950,58 +10295,33 @@ Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
 
-Fri Aug  5 12:48:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised
+	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
 	  exception. (copies argv into heap in tk_funcall instead of
 	  caller)
 
-Fri Aug  5 12:36:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): need to convert path separetor
 	  before invoking install command.
 
-Fri Aug  5 08:08:05 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (return_jump): fix "can't across thread" error message
-	  when no thread associated.
-	  http://www.namikilab.tuat.ac.jp/~sasada/diary/200507.html#d31
+Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Fri Aug  5 00:25:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/tcltklib.c: refactoring - extract ruby string <->
+	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
 	  tcl object conversion as get_str_from_obj and get_obj_from_str.
 
 Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c (Init_Enumerator): provided features should have
-	  extensions.
-
-	* eval.c (rb_feature_p): returns type of the feature instead of
-	  extension.
-
-	* eval.c (search_required): ruby library should be prior to statically
-	  linked extentions.  fixed: [ruby-dev:26711]
-
-	* eval.c (formal_assign): returns position of rest arguments variable.
-
-	* parse.y (f_rest_arg): use anonymous variable for rest arguments.
-	  fixed: [ruby-dev:26647]
-
 	* extmk.rb (extmake): needs to be wrapped in an Array.
 
-Thu Aug  4 20:03:18 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* numeric.c (Init_Numeric): do not share implementation among
-	  Fixnum#/ and Fixnum#div.  [ruby-core:05531]
-
 Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
 
-	* ext/tk/tcltklib.c: add nativethread consistency check.
+	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
 
-	* ext/tk/stubs.c: ditto.
+	* ext/tcltklib/stubs.c: ditto.
 
 	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
 	  when Tcl is 7.6 or 8.0.
@@ -31015,11 +10335,6 @@ Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
 
-Thu Aug  4 13:30:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_div): should not convert the result into
-	  integer.  [ruby-core:05524]
-
 Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): should not modify $mflags for each
@@ -31034,84 +10349,47 @@ Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
 
-Thu Aug  4 00:24:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c: replacing is no longer needed.
-
 Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
 	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
 
-Wed Aug  3 12:40:28 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* numeric.c (fix_plus): reduce coercing when a method knows about
-	  a operand type.  [ruby-dev:26723]
-
-	* numeric.c (fix_minus, fix_mul, fix_quo, fix_div, fix_mod,
-	  fix_divmod, fix_pow): ditto.
-
-	* bignum.c (rb_big_div, rb_big_modulo): export to reduce
-	  coercing.
-
-Wed Aug  3 10:13:52 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, {bcc32,win32,wince}/Makefile.sub (HAVE_SNPRINTF,
-	  HAVE_VSNPRINTF): use win32/win32.c's implementation instead of
-	  missing/vsnprintf.c's.
-
-	* win32/win32.[ch] (rb_w32_snprintf, rb_w32_vsnprintf): reverted.
-
-Wed Aug  3 10:05:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check vsnprintf() and snprintf().
-
-	* sprintf.c, missing/vsnprintf.c: made vsnprintf() and snprintf()
-	  private.  fixed: [ruby-dev:26651]
-
 Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
 	  changes at 2004-09-07.  [ruby-dev:26656]
 
-Wed Aug  3 06:53:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* array.c (rb_ary_or): wraps the operand in an array if it is not
-	  an array.  [ruby-talk:150495] [EXPERIMENTAL]
-
-	* array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.
-
-Tue Aug  2 10:23:12 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
+	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
 	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
 
-	* ext/tk/tcltklib.c: use ip_{get,set,unset}_variable2_core from
+	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
 	  ip_{get,set,unset}_variable.
 
-	* ext/tk/tcltklib.c: replaced Tcl_Panic with rb_bug.
+	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
 
-Tue Aug  2 01:40:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
 	  [ruby-dev:26677]
 
-Mon Aug  1 19:02:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c: refactoring - replaced rb_ivar_defined &
+	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
 	  rb_ivar_get with single rb_attr_get call.
 
-Mon Aug  1 18:44:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c (Tcl_GetStringResult): refactoring - define
+	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
 	  alternative macro on Tcl7.x or earlier.
 
-Mon Aug  1 13:53:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c (deleted_ip): refactoring - interpreter
+	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
 	  deletion check. [ruby-dev:26664]
 
-Mon Aug  1 01:08:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (check_insecure_method): use private_methods and
 	  protected_methods instead of respond_to? to check method visibility.
@@ -31121,205 +10399,86 @@ Mon Aug  1 01:08:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/ut_drb.rb: ditto.
 
-Sat Jul 30 18:49:44 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_TYPE#ole_typelib,
-	  WIN32OLE_TYPE#implemented_ole_types.
+Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
-	* ext/win32ole/tests/testOLETYPE.rb: ditto.
-
-Fri Jul 29 16:12:02 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/context.rb: fix `irb --readline` option. [ruby-dev:40955]
+	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
 
 Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_call0): fix calling zsuper from a method with anonymous
-	  rest argument.  [ruby-dev:26639]
-
 	* eval.c (rb_yield_0): push yielded node instead of yielding.
 	  fixed: [yarv-dev:549]
 
-Thu Jul 28 21:49:17 2005  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
-
-	* parse.y (rb_parser_end_seen_p): exclude from ripper.
-	  <http://moonrock.jp/~don/d/200507.html#d28_t2>
-
-	* sprintf.c (clearerr): remove standard macro before re-definition.
-	  <http://moonrock.jp/~don/d/200507.html#d28_t3>
-
 Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/stubs.c: When --enable-tcltk-stubs, the initialize
+	* 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.
 
-	* ext/tk/stubs.h: New file. Define prototypes and return codes of
-	  functions on stubs.c.
+	* ext/tcltklib/stubs.h: New file. Define prototypes and return
+	  codes of functions on stubs.c.
 
-	* ext/tk/tcltklib.c: Support delaying initalization of Tk_Stubs
-	  until the script needs Tk.
+	* ext/tcltklib/tcltklib.c: Support delaying initalization of
+	  Tk_Stubs until the script needs Tk.
 
-	* ext/tk/tcltklib.c: Show friendly error messages for errors on
-	  initialization.
+	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
+	  on initialization.
 
-	* ext/tk/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
+	* 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.)
 
-	* ext/tk/tkutil/tkutil.c (ary2list, ary2list2): bug fix on handling
-	  of encoding.
+	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
+	  encoding.
 
 	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
 	  don't work propery.
 
 	* 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.
 
-Thu Jul 28 17:23:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_larglist): allow block argument in lambda parameter
-	  list without parenthesis.
-
-Thu Jul 28 17:14:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (each_i): typo fixed.  [ruby-dev:26622]
-
-Thu Jul 28 15:04:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_arg): better argument name duplication check
-
-	* parse.y (new_args_gen): factored out name duplication check for
-	  optional and rest arguments.
-
-	* parse.y (new_bv_gen): allow shadowing outer local variables;
-	  warning remains.
-
-Thu Jul 28 13:46:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (ripper_warningS): the argument was omitted.
-	  [ruby-dev:26621]
-
-Thu Jul 28 11:30:57 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_larglist): allow bv_decl at the end of lambda
-	  argument list.  [EXPERIMENTAL]
-
-	* parse.y (new_bv_gen): allow local variable shadowing, with
-	  warning in verbose mode.
-
 Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (obj_free): make message format consistent with one from
 	  gc_mark().  [ruby-talk:149668]
 
-	* sprintf.c (quad_t): prepare quad_t as well.  [ruby-talk:149668]
-
 Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin: removed. because the plugin
 	  is imported in the tDiary plugin packages.
 
-Wed Jul 27 19:11:53 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (cd): follow :noop option change. (This patch
-	  is contributed by Doug Kearns)
-
-Wed Jul 27 16:25:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (lambda): Perl6 style -> lambda expression. [NEW]
-	  [VERY EXPERIMENTAL]
-
-Wed Jul 27 10:43:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (id2ref): must not assign pointers to long int.  use
-	  LONG_LONG instead if SIZEOF_LONG < SIZEOF_VOIDP.
-	  [ruby-talk:149645]
-
-	* ruby.h: use LONG_LONG to simplify the change.
-	  [ruby-talk:149645]
-
 Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_each): rewinddir(3) before iteration.
 	  [ruby-talk:149628]
 
-Wed Jul 27 02:34:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_throw): replace all '0x%lx' by '%p'.
-	  [ruby-talk:149553]
-
-	* missing/vsnprintf.c (BSD_vfprintf): '%p' need to handle 64bit
-	  size pointer.  [ruby-talk:149553]
-
-Tue Jul 26 22:41:28 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/sexp.rb: new method Ripper.sexp_raw.
-
-	* ext/ripper/lib/ripper/sexp.rb (Ripper.sexp): returns more
-	  readable tree.  This is suggested by Kirill A. Shutemov.
-
-Tue Jul 26 22:05:12 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: merge a patch contributed by Daniel Berger,
-	  with some modification. (RubyForge #2128)
-
-Tue Jul 26 18:11:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: support LLP64 model.  [ruby-talk:149524]
-
-Tue Jul 26 12:57:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.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.
 
-Mon Jul 25 23:48:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch]: (rb_w32_vsnprintf, rb_w32_snprintf): removed.
-
 Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk: Borland MAKE doesn't look for file names which have paths
-	  from VPATH.  fixed: [ruby-dev:26604]
-
-	* ruby.h (NORETURN, DEPRECATED): moved just after config.h.
-
-	* {win32,wince}/Makefile.sub: vsnprintf() is in missing now.
-
 	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
 	  source to XCFLAGS.
 
-Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
-
 Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
 
 	* io.c: check HAVE_SYS_IOCTL_H before including the header.
 	  [ruby-dev:26610]
 
-Sat Jul 23 16:48:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
-	  OPENSSL_NO_STATIC_ENGINE.
-
-Sat Jul 23 11:46:30 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (rb_fd_select): the all three fd_sets must be long enough for
-	  select.  fixed: [ruby-talk:149059]
+Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-Sat Jul 23 10:01:41 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
 
-	* sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,
-	  using missing/vsnprintf.c.  [ruby-dev:26580]
+Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	*  missing/vsnprintf.c: made the output changeable.
+	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
+	  OPENSSL_NO_STATIC_ENGINE.
 
 Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
 
@@ -31353,12 +10512,12 @@ Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil/tkutil.c (tk_conv_args): forget to revert
-	  thread_critical and gc_disable when raise ArgumentError.
+	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
+	  and gc_disable when raise ArgumentError.
 
 	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
 
-	* ext/tk/tcltklib.c: add TclTkIp#has_mainwindow? method.
+	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
 
 	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
 
@@ -31390,17 +10549,11 @@ Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
 	  runs on the IP.
 
-Thu Jul 21 01:00:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
-	  import 1.76
-	  [ruby-dev:26592] nkf constification
-
-Wed Jul 20 19:18:52 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (S_ISREG): need to define S_ISREG before it is used first.
 
-Wed Jul 20 18:33:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* io.c (wsplit_p): patch for the environment where
 	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
@@ -31416,7 +10569,7 @@ Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* variable.c (rb_class_path): need to adjust snprintf() len for
 	  teminating NUL.  [ruby-dev:26581]
 
-Wed Jul 20 03:58:52 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
 	  so reverted.
@@ -31424,7 +10577,7 @@ Wed Jul 20 03:58:52 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
 	  on windows.
 
-Wed Jul 20 03:12:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/socket.c: should not undef close() on win32.
 	  it's defined to rb_w32_close(), otherwise handle leaks.
@@ -31440,22 +10593,19 @@ Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* error.c (syserr_initialize): add 1 byte for snprintf() size for
 	  NUL at the end.  [ruby-dev:26574]
 
-Tue Jul 19 17:16:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (trap): remove sigexit(); handle "EXIT" via sig_exec().
-	  [ruby-dev:26440]
+Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
 	  over the place by snprintf() to avoid integer overflow.
 
-Tue Jul 19 14:10:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c: rbtk_eventloop_depth is used as int.
+	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
 
-	* ext/tk/tcltklib.c: rbtk_pending_exception is tested with
+	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
 	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
 
-	* ext/tk/tcltklib.c (ip_invoke_real): fixed memory leak when
+	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
 	  ip is deleted.
 
 Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -31464,50 +10614,33 @@ Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  returns a string even if the default value type of the TkVariable
 	  object is not "string".
 
-Mon Jul 18 21:39:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* eval.c (rb_call0): make the pointer to NODE volatile
 	  instead of NODE itself.
 
 Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
 
-	* eval.c (rb_call0): make body volatile to avoid possible optimization
-	  problem.
+	* eval.c (rb_call0): make body volatile to avoid optimization problem.
 	  [ruby-dev:26195]
 
 Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/io/wait/wait.c: wrong backport from trunk, and compile error on
-	  platforms fd_set is not a bit set.  fixed: [ruby-dev:26562]
+	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
 
 Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
 
 	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
 
 	* io.c (wsplit_p): new function.
-	  (io_fflush): split writing data by PIPE_BUF if wsplit_p is true in
+	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
 	  multi-threaded mode.
-	  (io_fwrite): ditto.
 	  [ruby-dev:26540]
 
-Mon Jul 18 05:00:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: import nkf.c 1.73
-	  fix: TestKconv 1F
-
 Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
 
-Sat Jul 16 23:43:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (Init_Enumerator): wrong argument specs.
-	  [ruby-core:05481]
-
-Sat Jul 16 15:52:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[hc]: constified socket functions. [ruby-dev:26553]
-
 Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
@@ -31518,25 +10651,23 @@ Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
 	  in C.  [ruby-core:04572]
 
-Fri Jul 15 23:20:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* enumerator.c (Init_Enumerator): use an internal directly.
+	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
+	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
 
-Fri Jul 15 07:58:10 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
 	  sockets should be non-blocking mode. [ruby-dev:26405]
 
 	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
 
-Fri Jul 15 00:11:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enumeratorize): create new enumerator for current method if
-	  no block is given.
-
-	* enumerator.c: moved from ext/enumerator.
+	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
+	  should call sock.read repeatedly until the preferred size data
+	  is obtained.
 
-Thu Jul 14 18:27:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_strerror): should return correct message
 	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
@@ -31548,11 +10679,7 @@ Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
 
-Wed Jul 13 22:44:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y: remove static variables.  [ruby-dev:26530]
-
-Wed Jul 13 19:36:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
 	  if file or directory already exists. (bcc32) [ruby-dev:26508]
@@ -31565,7 +10692,7 @@ Wed Jul 13 19:36:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: TclTkLib.do_one_event doesn't work.
+	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
 
 	* ext/tk/lib/tk.rb: Tk.thread_update is available.
 
@@ -31573,30 +10700,16 @@ Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: keep curdir unexpanded.
 
-Mon Jul 11 23:50:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
-	  export.
-
-	* ext/enumerator/enumerator.c (enumerator_with_index): [EXPERIMENTAL]
-	  added a new method Enumerator#with_index.  [ruby-talk:147728]
-
 Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regparse.c (fetch_escaped_value): mask values following \c in
+	* regex.c (read_special): fix parsing backslashes following \c in
 	  regexp.  fixed: [ruby-dev:26500]
 
-Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* 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).
-
-Mon Jul 11 02:50:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  mistook to merge the patch of [ruby-dev:26235] at
-	  revision 1.11.
+	  mistook in merging the patch of [ruby-dev:26235] at
+	  revision 1.4.2.6.
 
 Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -31604,12 +10717,18 @@ Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
 	  avoid unlink a directory by root.
 	  cf. [ruby-dev:26237]
 
+Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* 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).
+
 Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): added a deficient format specifier.
 	  fixed: [ruby-core:05419]
 
-Sat Jul  9 22:02:37 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
 	  in Ruby and C by INT2NUM and NUM2INT.
@@ -31634,36 +10753,6 @@ Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
 	  adjusted test case.
 
-Wed Jul  6 18:45:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_pattern_match): now returns nil.
-	  [ruby-core:05391]
-
-Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead.
-
-Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
-	  be public domain.  reverted BSD implementation.
-
-Wed Jul  6 11:15:21 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (open_ifs_socket): new function.
-
-	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
-	  instead of socket().
-	  all changes are derived from [ruby-core:5388].
-
-Wed Jul  6 00:15:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c,config.h}:
-	  imported nkf.c 1.70 (support UTF-8-MAC)
-
-	* ext/nkf/lib/kconv.rb: add :utf8mac and :internalunicode
-
 Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb: expand source library path.
@@ -31680,19 +10769,19 @@ Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil.c: fix typo.
 
-Tue Jul  5 14:52:56 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: bug fix on treating Unicode strings.
+	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
 
-	* ext/tk/tcltklib.c: add methods to treat encoding mode.
+	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
 
-	* ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
+	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
 	  encoding_system, and so on.
 
-	* ext/tk/MANUAL_tcltklib.eucj: ditto.
+	* ext/tcltklib/MANUAL.euc: ditto.
 
-	* ext/tk/tkutil/tkutil.c: fail to create a Tcl's list string from
-	  an array including multiple kind of encoded strings.
+	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
+	  array including multiple kind of encoded strings.
 
 	* ext/tk/lib/tk.rb: ditto.
 
@@ -31718,11 +10807,17 @@ Tue Jul  5 14:52:56 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
 	  should be UTF-8 strings.
 
-Mon Jul  4 19:29:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/set.rb: test change to follow revision 1.28. (duck typing?)
+	* sample/svr.rb: service can be stopped by ill-behaved client; use
+	  tsvr.rb instead.
 
-Mon Jul  4 11:23:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
+	  be public domain.  reverted BSD implementation.
+
+Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
 	  which using fork on fork-less platforms.
@@ -31745,18 +10840,11 @@ Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
 
 	* eval.c (flush_register_windows): new function.
 
-	* ruby.h (NOINLINE): move up to be effective in defines.h.
-
-Sat Jul  2 15:19:41 2005  Tanaka Akira  <akr@m17n.org>
+Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: check select_large_fdset.
-
-	* eval.c: use select_large_fdset to support large file descriptors
-	  on Solaris.  [ruby-dev:26404]
-
-Fri Jul  1 17:55:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_neg): may be accessing bogus pointer value.
+	* bignum.c (get2comp): revert all prior changes, and calculate
+	  proper 2's complement for negative numbers.  backported from
+	  HEAD.
 
 Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -31796,11 +10884,6 @@ Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
 	  destination object.  [ruby-talk:146894]
 
-Thu Jun 30 23:52:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (trap): non-string trap hander was ignored.
-	  fixed: [ruby-dev:26417]
-
 Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
@@ -31816,76 +10899,46 @@ Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_eval): pre-evaluate argument for unambiguous
 	  evaluation order.  [ruby-dev:26383]
 
-Thu Jun 30 14:48:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/net/http.rb (Net::HTTP#connect, Net::HTTP#request): should
-	  not send proxy username and password to origin servers.
-	  [ruby-dev:25673]
-
-	* lib/net/http.rb (Net::HTTP::ProxyDelta#edit_path): should not
-	  send HTTPS scheme URL to origine servers. [ruby-dev:25689]
-
 Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (Delegator::method_missing): forward unknown
 	  method to the destination.  suggested by
 	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
 
-Wed Jun 29 00:03:20 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* regparse.c (fetch_token): avoid warning of unused goto tag.
-	  [ruby-dev:26389]
-
 Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* dir.c, eval.c, parse.y, process.c, ruby.c: avoid warning "unused
+	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
 	  variable" [ruby-dev:26387]
 
-	* dir.c (glob_helper): avoid warning "enumeration value `RECURSIVE'
-	  not handled in switch" [ruby-dev:26392]
-
-Tue Jun 28 01:52:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/nkf/lib/kconv.rb: add Kconv::VERSION
-	* ext/nkf/lib/kconv.rb (conv): can process arrayed options
-	* ext/nkf/nkf-utf8/nkf.c: imported Revision 1.69
-	* ext/nkf/nkf-utf8/utf8tbl.c: imported Revision 1.9
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
+	  discard if key=val pair is empty. patch from Gary Wright.
 
 Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (detach_process_watcher): terminate process watcher
 	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
 
-Sat Jun 25 17:12:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
-	  discard if key=val pair is empty. patch from Gary Wright.
-
 Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore
-	  nil as the first element.
+	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
 
-Sat Jun 25 15:13:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch)
+	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
+	  which contained each elements twice. [ruby-dev:26358]
 
-Sat Jun 25 11:37:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
 
-	* ext/nkf/lib/kconv.rb: remove constants
-	  Iconv_Shift_JIS, Uconv_EUC_JP, Iconv_UTF8
-	* ext/nkf/lib/kconv.rb: add module functions to Kconv
-	  conv, {eucjp, shiftjis, utf8}?, guess_as_symbol
-	* ext/nkf/lib/kconv.rb: add instance methods to String
-	  conv, {eucjp, shiftjis, utf8}?
-	* ext/nkf/lib/kconv.rb: add aliases Kconv.to_* and String#to_*
+	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
 
 Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
 
 	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
 	  (u-tokyo.ac.jp) applied to fix rounding bug.
 
-Fri Jun 24 13:17:45 2005  akira yamada  <akira@ruby-lang.org>
+Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
 	  replaced some existent domain name with "example.com".
@@ -31922,7 +10975,7 @@ Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
 	  because setjmp is not enough to fix getcontext and SPARC register
 	  window problem.
 
-Mon Jun 20 17:15:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
 
@@ -31935,7 +10988,7 @@ Mon Jun 20 17:15:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.{ch} (unlink): hook runtime function to change
 	  file attribute before unlinking.
-	  merge from 1.8, see [ruby-dev:26360]
+	  fixed: [ruby-dev:26360]
 
 Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -31949,17 +11002,6 @@ Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
 	  compiler warnings. suggested by Michal Rokos.
 
-Sun Jun 20 00:22:02 2005  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/utils.rb: Patch by Nobuhiro IMAI fixes the following
-	  problem: Default value modification on
-	  Module#public_instance_methods (false -> true) breaks
-	  s.add_handler(XMLRPC::iPIMethods("sample"), MyHandler.new) style
-	  security protection.
-
-	* lib/xmlrpc/client.rb: Aliased XMLRPC::Client#new2 as
-	  XMLRPC::Client#new_from_uri, and #new3 as #new_from_hash.
-
 Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.c (run_final): reduce unnecessary object allocation during
@@ -31968,30 +11010,15 @@ Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
 	  be cleared before calling them.  fixed: [ruby-talk:145790]
 
-Sat Jun 18 01:15:36 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): do not set
-	  rl_{in,out}stream.
-
-	* ext/readline/readline.c (readline_s_set_input): new method.
-
-	* ext/readline/readline.c (readline_s_set_output): new method.
-
-	* lib/irb/input-method.rb: set Readline.input and Readline.output.
-
 Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/time.rb (Time.parse): fix previous leap seconds support.
 	  (Time.rfc2822): ditto.
 	  (Time.xmlschema): ditto.
 
-Thu Jun 16 15:41:32 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (load_file): '!' is already read. reported by gotoyuzo.
+Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Thu Jun 16 15:09:38 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
+	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
 	  was missing.
 
 Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -32007,14 +11034,10 @@ Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
 	  (Time.rfc2822): ditto.
 	  (Time.xmlschema): ditto.
 
-Thu Jun 16 00:13:41 2005  Tanaka Akira  <akr@m17n.org>
+Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* lib/resolv.rb (Resolv::DNS::Resource#ttl): new attribute.
-	  (Resolv::DNS::Resource#==): ignore @ttl.
-	  (Resolv::DNS::Resource#hash): ditto.
-	  (Resolv::DNS::Message::MessageDecoder#get_rr): save TTL in a
-	  Resource object.
-	  based on [ruby-core:5190] by Eric Hodel.
+	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
+	  fixed memory leak. [ruby-Bugs-2034]
 
 Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -32025,13 +11048,13 @@ Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...)
-	  & _define_attribute_aliases(hash) to get substitution-argument from
+	* 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 ").
 
 	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
 
-Mon Jun 13 13:03:08 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
 
@@ -32054,20 +11077,11 @@ Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
 	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
 	  thread list.  [ruby-dev:26312]
 
-Sat Jun 11 22:34:44 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: missing arg_paren event.  This patch is contributed by
-	  Mitchell N Charity.
-
-Fri Jun 10 23:55:17 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
-
 Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* missing/mkdir.c: remove. [ruby-core:05177]
 
-Fri Jun 10 22:54:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
 
@@ -32091,47 +11105,20 @@ Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
 
-Thu Jun  9 18:24:16 2005  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in, eval.c, gc.c: use libunwind only on HP-UX.
-	  [ruby-dev:26297]
-
-Thu Jun  9 14:46:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (env_aset): do not treat nil as key-removing value.
-	  [ruby-list:40865]
-
-	* parse.y (method_call): allow aref expression ([]) to take a
-	  block.
-
-	* parse.y (block_dup_check): a function to check duplication of
-	  a block argument and an actual block.
-
 Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
 	  recursive delegation.  [ruby-core:04940]
 
-Thu Jun  9 11:50:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb: add underscore aliases CGI::escape_html,
-	  CGI::unescape_html, CGI::escape_element, CGI::unescape_element.
-	  [ruby-core:05058]
-
 Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
 
-Wed Jun  8 12:25:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_nitems): add the block feature to Array#nitems.
-	  suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
-	  [ruby-talk:134083].
-
 Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* bignum.c (get2comp): revert all prior changes, and calculate
-	  proper 2's complement for negative numbers.
+	* bignum.c (get2comp): calculate proper 2's complement for
+	  negative numbers.  a bug in normalizing negative numbers
+	  reported from Honda Hiroki <hhonda@ipflex.com>.
 
 Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -32142,15 +11129,6 @@ Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (backtrace): skip successive frames sharing same node.
 
-Wed Jun  8 01:27:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bignorm): fixed a bug in normalizing negative numbers
-	  reported from Honda Hiroki <hhonda@ipflex.com>.  normalizing
-	  should not trim leading zeros from negative numbers.
-
-	* bignum.c (rb_cstr_to_inum): must remove leading zeros for this
-	  case.
-
 Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
@@ -32176,55 +11154,37 @@ Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/thread.rb: RDoc documentation from Eric Hodel
-	  <drbrain@segment7.net> added.  [ruby-core:05148]
+	  <drbrain at segment7.net> added.  [ruby-core:05148]
 
 Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
 	  fixed: [ruby-dev:26294]
 
-Tue Jun  7 17:20:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): allow ';;' to be block terminator in
-	  place of 'end'.  [highly experimental]
-
-	* misc/ruby-mode.el (ruby-block-end-re): allow ';;' to be a
-	  negative indent trigger.  [highly experimental]
+Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (parser_yylex): small error fixed.
+	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
+	  ported from CVS HEAD.  [ruby-talk:144741]
 
-Tue Jun  7 16:45:49 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): "respond_to?:foo" should be interpreted
-	  as "respond_to? :foo" at the command level.  [ruby-talk:144303]
+	* object.c (rb_mod_cvar_set): Module#class_variable_set().
+	  [ruby-talk:144741]
 
 Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
 	  not verbose mode (-v/-w).  [ruby-core:05123]
 
-	* sprintf.c (rb_f_sprintf): warn always on verbose mode.
-
 Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
 	  delegated by master-ip.
 
-Mon Jun  6 16:35:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/ripper/depend: add .y to .SUFFIXES for nmake.
-
 Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/console.rb: create console when required
 
 	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
 
-Sun Jun  5 10:23:52 2005  Tanaka Akira  <akr@m17n.org>
-
-	* signal.c (ruby_signal): don't set SA_RESTART.
-	  [ruby-dev:26276]
-
 Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
 
 	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
@@ -32234,61 +11194,15 @@ Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
 	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
 	  modification to use test/unit.
 
-Fri Jun  3 23:23:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (rb_fdset_t): deal with fd bit sets over FD_SETSIZE.
-	  fixed: [ruby-dev:26187]
-
-	* eval.c (rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr,
-	  rb_fd_isset, rb_fd_copy): ditto.
-
-	* io.c (rb_io_wait_readable, rb_io_wait_writable, rb_f_select): ditto.
-
-	* ext/io/wait/wait.c (io_wait): ditto.
-
-	* ext/socket/socket.c (wait_connectable, unix_recv_io): ditto.
-
 Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: fix typo.
 
-Thu Jun  2 23:42:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y: pragma support on ripper.  [ruby-dev:26266]
-
-Thu Jun  2 00:02:16 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* struct.c: accessing >10 member caused segmentation fault.
-	  [ruby-dev:26247]
-
-	* test/ruby/test_struct.rb: test it.
-
-Wed Jun  1 11:30:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
 	  [ruby-dev:26205]
 
-	* bcc32/Makefile.sub: Dir.glob in 1.9 doesn't treat \ as path separator.
-	  [ruby-dev:26254]
-
-Wed Jun  1 00:11:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (method_call): new experiment: "(expr)(args...)" to
-	  invoke "expr.call(args...)".  [EXPERIMENTAL]
-
-Tue May 31 23:43:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (command): revert implicit "call" for local variables.
-
-Tue May 31 15:52:45 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
-	  break the loop if the socket reached to EOF. [ruby-talk:142285]
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): send response
-	  without reading the whole request body if keep-alive is diabled.
-	  [experimental]
-
 Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
@@ -32300,12 +11214,12 @@ Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: ditto.
 
-Sat May 28 16:39:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/openssl/test_x509store.rb: add test for expired CRL
 	  and refine some assertions.
 
-Sat May 28 05:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
 	  not set internal flag directry.
@@ -32321,41 +11235,22 @@ Fri May 27 16:32:04 2005  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]
 
-Thu May 26 20:31:21 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_entry_secure): add documentation.
-
-	* lib/fileutils.rb (remove_entry_secure): should not invoke
-	  unlink(2) against a directory.
-
-Thu May 26 08:29:19 2005  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
-	  for VMS port are added.
-
-	* eval.c (ruby_init): change to call VMS private intialization routine.
-
-Thu May 26 07:39:07 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (rm_r): use lchown(2), not chown(2).
-	  [ruby-dev:26226]
+Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* lib/fileutils.rb (cd): remove :noop option. (feature change)
+	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
 
-	* lib/fileutils.rb (cp_r): should copy symlink as symlink, for
-	  also tree root. (feature change)
+Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
+	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
+	  (backported from HEAD)
 
-	* lib/fileutils.rb: new method remove_entry.
+Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/fileutils.rb: new method remove_entry_secure.
+	* ext/readline/readline.c: supported libedit. (backported from HEAD)
 
-	* lib/fileutils.rb: add documentation.
+	* ext/readline/extconf.rb: ditto.
 
-Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+	* test/readline/test_readline.rb: ditto.
 
 Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -32397,10 +11292,6 @@ Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
 
-Wed May 25 19:48:12 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (rm_r): does chown(2). [ruby-dev:26199]
-
 Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
@@ -32416,17 +11307,17 @@ Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ruby.c (require_libraries): caused SEGV when continuation jumped
 	  in to the required library code.
 
-Tue May 24 17:45:59 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* test/readline/test_readline.rb: do not test libedit.
-	  fixed: [ruby-dev:26217]
+	* lib/getopts.rb: should warn only if verbose mode.
+	  fixed: [ruby-dev:26201]
 
 Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
 	  literals to be matched non-greedy.
 
-Tue May 24 00:39:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/soap/calc: method name 'set' was able to crash with a class Set.
 	  [ruby-dev:26210]
@@ -32434,16 +11325,11 @@ Tue May 24 00:39:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
 	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
 
-Mon May 23 16:23:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: Framework support on MacOS X Tiger.
+Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/README.tcltklib: add description of Framework support options.
+	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
 
-Mon May 23 15:07:34 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
-	  [experimental]
+	* ext/tcltklib/README.1st: add description of Framework support options.
 
 Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -32536,79 +11422,41 @@ Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
 
-Sun May 22 12:30:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, parse.y (ruby_pragma): removed.  fixed: [ruby-dev:26198]
-
-	* parse.y (parser_pragma): pragma name was ignored.
-
-Sun May 22 02:39:57 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (rm_r): new option :secure to avoid
-	  time-to-check-to-time-to-use security problem.  [ruby-dev:26100]
-
-	* lib/fileutils.rb (remove_file, remove_dir): try chmod(700) only
-	  on Windows.
-
-	* lib/fileutils.rb: does not depend on find.rb.
-
-	* lib/fileutils.rb: new method chmod_R.
-
-	* lib/fileutils.rb (chown_R): did not work.
-
-Sat May 21 10:23:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
 	  included '\' path delimiter. [ruby-dev:26193]
 
-Fri May 20 15:52:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_attempted_completion_function):
-	  return 2 items if completion_proc returns only 1 item (for libedit).
-
-Fri May 20 01:24:33 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/extconf.rb: check rl_vi_editing_mode() and
-	  rl_emacs_editing_mode().
-
-Thu May 19 23:33:09 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: supported libedit. fixed: [ruby-core:4858]
-
-	* ext/readline/extconf.rb: added new option --enable-libedit.
+Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
 
-	* test/readline/test_readline.rb: added assertions for
-	  Readline::HISTORY.
-
-	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
+	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
+	  swapped. [ruby-core:4772]
 
 Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (exc_exception): reverted to call Exception#initialize
 	  directly.  fixed: [ruby-dev:26177]
 
-Wed May 18 17:38:51 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (glob_helper): check whether path is "" before calling
-	  do_opendir.  [ruby-dev:26183]
-
-Wed May 18 13:40:48 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (NtInitialize): fix typo.
-
-Wed May 18 11:07:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
 
+	* dir.c (push_braces): should skip balanced braces.
+
 	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
 	  intialization back.  [ruby-dev:26180]
 
-Tue May 17 11:49:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
+	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+
+Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
 	  gmtime() when using FileLocalTimeToFileTime().
 
-Mon May 16 22:42:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
 	  to get rid of redefinition warnings on mingw.
@@ -32616,12 +11464,7 @@ Mon May 16 22:42:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
 	  from its definition.  fixed: [ruby-talk:142749]
 
-	* parse.y (pragma_encoding): add prototype to suppress false warning
-	  by VC.
-
-	* process.c (proc_spawn_v): use rb_w32_aspawn on Win32.
-
-Mon May 16 03:29:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.{h,c}: define rb_[pgu]id_t.
 
@@ -32631,7 +11474,7 @@ Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
 	  Errno::EISDIR because EISDIR is not portable.
 	  [ruby-core:5001]
 
-Sun May 15 22:28:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
 	  [ruby-dev:26164]
@@ -32656,7 +11499,7 @@ Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
 	  Execption#initialize.  fixed: [ruby-talk:142593]
 
-Sat May 14 23:56:41 2005  Erik Huelsmann  <ehuels@gmail.com>
+Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
 
 	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
 	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
@@ -32681,16 +11524,6 @@ Sat May 14 23:56:41 2005  Erik Huelsmann  <ehuels@gmail.com>
 
 	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
 
-Sat May 14 11:47:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (ruby_pragma): prototype.  [ruby-core:04881]
-
-	* parse.y (parser_pragma): parse Emacsen hack.
-
-	* parse.y (parser_prepare): deal with specific syntax at the top.
-
-	* ruby.c (load_file): read the first line iff it started with shebang.
-
 Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: keep srcdir unexpanded.
@@ -32702,45 +11535,87 @@ Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  also INSTALL_PROG and INSTALL_DATA system dependent.
 	  fixed: [ruby-core:04931]
 
-Fri May 13 23:32:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (unknown_node): add volatile directive to prototype.
-
-Fri May 13 17:50:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* variable.c (generic_ivar_get): rb_attr_get should not warn.
 	  [ruby-dev:26010]
 
-Thu May 12 17:41:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
 
-Thu May 12 16:50:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/ruby/test_array.rb: add test for find_all.
+
+Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (unknown_node): add volatile directive to prototype.
+
+Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
+	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
+
+	* 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.
+
+Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
 	  progress "c..." and warning message.
 
-Thu May 12 15:50:56 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+
+Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
+
+	* 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]
+
+Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
 	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
 	  [ruby-core:4341]
 
+Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/drb/test_drb{ssl,unix}.rb: can test drb
+	  before install. (backported from HEAD) [ruby-dev:26146]
+
 Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* version.c (ruby_show_version): flush for non-tty stdout.
 
+Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
+	  before install. (backported from HEAD) [ruby-Bugs-1672]
+
 Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+	  parser.  fixed: [ruby-dev:26113]
+
 	* 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.
 
+Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
+	  and WEBrick::CGI#config. (backported from HEAD)
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
+	  not use String#split("/"). (backported from HEAD)
+
 Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (break_jump): break should not cross functions.
 	  [ruby-list:40818]
 
-Wed May 11 10:41:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
 
@@ -32753,12 +11628,7 @@ Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: fix typo.
 
-Sun May  8 21:00:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* hash.c (Init_Hash): remove custom "hash" and "eql?".
-	  (ported from 1.8) [ruby-dev:26132]
-
-Sun May  8 16:50:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
 	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
@@ -32767,54 +11637,11 @@ Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (have_var): no libs argument is given.
 
-Fri May  6 08:08:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c:rb_hash_hash_i() should be static.  [ruby-core:04815]
-
-	* re.c should include regint.h for declarations of oniguruma
-	  functions.  [ruby-core:04815]
-
-Sun May  1 09:15:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (process_sflag): replace '-' in variable names with '_'.
 	  [ruby-dev:26107]
 
-	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
-	  parser.  fixed: [ruby-dev:26113]
-
-Sat Apr 30 11:59:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_FUNC_ATTRIBUTE): check for function attribute.
-	  [ruby-dev:26109]
-
-	* eval.c, gc.c: moved noinline to configure.in.
-
-	* rubyio.h (DEPRECATED): moved to configure.in.
-
-	* ruby.h (DEPRECATED, NOINLINE): default definition.
-
-	* win{32,ce}/Makefile.sub (config.h): deprecated and noinline for
-	  __declspec() are available for VC++7 or later.
-
-Sat Apr 30 06:57:39 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
-	  and WEBrick::CGI#config.  these are necessary to use an instance of
-	  WEBrick::CGI as the first argument of HTTPServlet#get_instance.
-	  (suggested by Tatsuki Sugiura)
-
-	* lib/webrick/cgi.rb
-	  (WEBrick::CGI#initalize): set a dummy to @config[:ServerSoftware]
-	  if SERVER_SOFTWARE environment variable is not given.
-	  (WEBrick::CGI#start): req.path_info must be a String.
-	  (WEBrick::CGI::Socket#request_line): treat REQUEST_METHOD, PATH_INFO
-	  and SCRIPT_NAME to run in console.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
-	  not use String#split("/"). it removes trailing empty path component.
-
-Thu Apr 28 08:21:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
 	* ruby.c (set_arg0): use also environment variable space for setting
 	  $0.  [ruby-core:04774]
 
@@ -32825,46 +11652,23 @@ Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
+	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
 	  command when can't get information of target command.
 
-Mon Apr 25 13:54:55 2005  speakillof  <speakillof@yahoo.co.jp>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
-	  swapped. [ruby-core:4772]
-
 Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
 
-	* oniguruma.h (OnigWarnFunc): add a variadic argument.
-	  [ruby-core:4751]
+	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
 
-Sat Apr 23 19:49:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/tk/tcltklib.c (ip_RubyExitCommand): exit with status code
+	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
 	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
 
-Sat Apr 23 11:45:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* eval.c (rb_provided): should check also path name to be loaded.
-	  fixed: [ruby-dev:26093]
+	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
 
-Fri Apr 22 16:55:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/tcltklib.c (ip_set_exc_message): fixed memory leak.
-
-	* ext/tk/tcltklib.c: eTkCallbackReturn was not initialized.
-
-Thu Apr 21 06:45:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_incpush_expand, proc_options): expand relative path
-	  given with -I option.  [ruby-dev:26090]
-
-	* configure.in, lib/mkmf.rb, {bcc32,win32,wince}/Makefile.sub: improve
-	  C++ support.  [ruby-dev:26089]
-
-Thu Apr 21 01:53:09 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: add rdoc.
+	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
 
 Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -32878,7 +11682,7 @@ Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in, common.mk: miniruby depends on MINIOBJS.
+	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
 
 	* dmydln.c (dln_load): dummy function to raise LoadError.
 
@@ -32889,21 +11693,6 @@ Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/ifchange.bat: delete testing files.
 
-Wed Apr 20 22:54:54 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: new method Net::HTTP.post_form.
-
-	* lib/net/http.rb: new method Net::HTTPHeader#set_form_data and
-	  its alias #form_data=.
-
-	* lib/net/http.rb: Net::HTTPHeader#add_header -> add_field
-	  (adjustted to Ruby 1.8).
-
-Wed Apr 20 10:53:30 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_rb.rb (lex_init): use IRB module.
-	  [ruby-core:04737]
-
 Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
@@ -32911,33 +11700,18 @@ Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* bcc32/setup.mak: make configuration variables overridable.
 
-Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
-
-Tue Apr 19 23:02:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
-	* eval.c (search_required): deal with features with path too.
+	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
 
-	* intern.h (rb_file_expand_path): prototype.  fixed: [ruby-dev:26082]
-
-Tue Apr 19 08:38:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (search_required, rb_require_safe): expand path in
-	  rb_features.  [ruby-dev:26079]
+	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
 
-	* file.c (rb_find_file_ext): return absolute path.
+Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: expand path for ext/**/extconf.rb.
 
-	* eval.c (search_required): handle static linked extensions.
-
-Mon Apr 18 15:37:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_attr): attribute name check added.
-
-	* numeric.c (flo_plus): small typo fix.
-
 Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
@@ -32964,7 +11738,7 @@ Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* mkconfig.rb: purge autoconf value variables.
 
-Sat Apr 16 10:33:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
 	  still have restriction on DESTDIR ("", "/", "e:")
@@ -32975,55 +11749,18 @@ Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/openssl_missing.h: ditto.
 
-Fri Apr 15 22:40:19 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE.codepage=
-
-	* ext/win32ole/tests/testOLETYPELIB.rb: correct expected message.
-
-Fri Apr 15 22:04:07 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
-	  to VT_EMPTY.
-
-Thu Apr 14 19:05:06 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper] (regexp): dispatch regexp option.
-	  [ruby-Bugs:1688]
-
-	* ext/ripper/lib/core.rb: regenerated (interface changed).
-
-Thu Apr 14 18:59:43 2005  Minero Aoki  <aamine@loveruby.net>
+Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_file): ignore exceptions caused by
 	  chmod.
 
 	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
-	  [ruby-Bugs:1502]
-
-Thu Apr 14 18:51:02 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb, lib/irb/slex.rb: bug fix of [ruby-Bugs-1745]
-
-	* lib/irb/ext/loader.rb, lib/irb/ext/save-history.rb:
-	  fix location of @RCS_ID
-
-	* lib/irb/cmd/help.rb: a lost of release IRB 0.9.5.
-
-Thu Apr 14 15:10:30 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
 
-	* lib/irb/notifier.rb, lib/irb/output-method.rb, lib/irb/ext/history.rb
-	  fixed warning of 'ruby -w'
+Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Apr 14 05:35:45 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* doc/irb/irb.rd.ja: a lost  of release IRB 0.9.5.
-
-	* lib/irb/slex.rb: bug fix by [ruby-core:04707].
-
-Thu Apr 14 00:20:31 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
+	* bcc32/Makefile.sub: failed to remove debug information files.
+	  fixed: [ruby-dev:26034]
 
 Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -33032,44 +11769,33 @@ Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
 	  transmission bug.
 
-Wed Apr 13 22:12:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#order!): call handlers iff matches
-	  non-switch.
-
 Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (mingw32): extract msvcr*.dll from objdump result.
 
-Wed Apr 13 19:25:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
 	  name and default load path.
 
 	* win32/Makefile.sub, win32/setup.mak: ditto.
 
-Tue Apr 12 19:30:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#make_switch, OptionParser#order!):
-	  added non-option and end-of-args handler.  [ruby-talk:136878]
-	  [EXPERIMENTAL]
-
 Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_finalize): better modification than the
+	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
 	  previous commit [ruby-dev:26029].
 
 Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
+	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
 	  modifies the argument string to eval.
 
 Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_finalize): add existence check of
+	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
 	  Tcl commands before calling Tcl_GlobalEval().
 
-Mon Apr 11 23:36:04 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
 	  loaded, the object is tainted.
@@ -33082,13 +11808,28 @@ Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit
-	  on Tcl/Tk8.3.x.
+	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
+	  when exit on Tcl/Tk8.3.x.
 
-Mon Apr 11 15:24:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
 
+Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
+	  into correct path. [ruby-dev:26011]
+
+	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+
+Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
+	  to VT_EMPTY.
+
+	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
+	  message string "Unknown" => "unknown".
+
 Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: support to create TkImage object without
@@ -33108,41 +11849,68 @@ Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
 	  via Web browser.
 
-Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
-	  Config::CONFIG.
+	* lib/rss: backoported from HEAD.
 
-	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
-	  macro reference.
+	* lib/rss: refactored.
+	  - gave a name to 'x'.
+	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
 
-Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rss/parser.rb: @@setter -> @@setters.
 
-	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
-	  [ruby-dev:25992]
+	* 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.
 
-Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@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.
 
-	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+	* lib/rss/parser.rb
+	  (RSS::BaseListener.install_setter)
+	  (RSS::BaseListener.register_uri): changed fallback way.
 
-	* lib/mkmf.rb (configuration, create_makefile): ditto.
+	* 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.)
 
-	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
+	* lib/rss/maker/dublincore.rb: ditto.
 
-Thu Apr  7 17:24:17 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/rss/maker/image.rb: supproted new Dublin Core API.
 
-	* eval.c (rb_call0): "return" event hook should be always executed
-	  if event_hooks is set.
+	* lib/rss/maker/base.rb: added default current_element implementation.
 
-Thu Apr  7 14:33:09 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
+	  moved to RSS::Utils.
 
-	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
-	  and #dc_date=.
+	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
+	  moved from RSS::TrackBackUtils.
 
-Thu Apr  7 11:49:53 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* lib/rss/maker/image.rb: fixed invalid argument of
+	  add_need_initialize_variable bug.
+	* lib/rss/maker/trackback.rb: ditto.
 
-	* lib/rss/maker/dublincore.rb: _really_ supported multiple Dublin
-	  Core items.
+	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+
+	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
+	  for date value.
+
+	* test/test_dublincore.rb: added tests for plural accessor and
+	  multiple Dublin Core items.
+
+	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
+	  values.
 
 	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
 	  an assertion for testing multiple Dublin Core items.
@@ -33150,18 +11918,8 @@ Thu Apr  7 11:49:53 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
 	  for making multiple Dublin Core items.
 
-Wed Apr  6 16:06:30 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_env.rb (test_key): should test ENV.key instead of
-	  ENV.index. [ruby-dev:25994]
-
-Tue Apr  5 16:01:12 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/*: refactored.
-	  - gave a name to 'x'.
-	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-
-Tue Apr  5 15:45:33 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
+	  and #dc_date=.
 
 	* sample/rss/tdiary_plugin/rss-recent.rb:
 	  new option: @options['rss-recent.use-image-link']:
@@ -33170,46 +11928,54 @@ Tue Apr  5 15:45:33 2005  Kouhei Sutou  <kou@cozmixng.org>
 	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
 	  0.0.5 -> 0.0.6.
 
-Tue Apr  5 15:15:26 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
+Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@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.)
+	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
+	  Config::CONFIG.
 
-	* lib/rss/maker/base.rb: added default current_element implementation.
+	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
+	  macro reference.
 
-	* lib/rss/maker/dublincore.rb: supported multiple Dublin Core
-	  items.
+Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/rss/maker/image.rb: supproted new Dublin Core API.
+	* 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.
 
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
+	  argument if it's nil.
 
-	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
-	  moved to RSS::Utils.
+	* ext/openssl/ossl_pkey.c
+	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
+	  (DupPrivPKeyPtr): new function.
 
-	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
-	  moved from RSS::TrackBackUtils.
+	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
 
+	* ext/openssl/ossl_pkey.h: ditto.
 
-	* lib/rss/maker/image.rb: fixed invalid argument of
-	  add_need_initialize_variable bug.
+Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* lib/rss/maker/trackback.rb: ditto.
+	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
+	  [ruby-dev:25992]
 
+Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
 
-	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
-	  for date value.
+	* lib/mkmf.rb (configuration, create_makefile): ditto.
 
+	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
 
-	* test/test_dublincore.rb: added tests for plural accessor and
-	  multiple Dublin Core items.
+Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
-	  values.
+	* eval.c (rb_call0): "return" event hook should be always executed
+	  if event_hooks is set.  fixed: [ruby-core:04662]
+	  (backported from HEAD)
 
 Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -33224,6 +11990,11 @@ Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/lib/tk/dialog.rb: fixed typo.
 
+Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
+	  (backported from HEAD)
+
 Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (CP, INSTALL): get rid of less portable options.
@@ -33231,8 +12002,8 @@ Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (configuration, create_makefile): correct configuration
 	  variable.
 
-	* wince/configure.bat, wince/setup.mak: add prefix, extstatic and
-	  rdoc options.
+	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
+	  config.status for backward compatibility.  fixed: [ruby-core:04649]
 
 	* lib/mkmf.rb (create_makefile): ensure library directories get made
 	  before copying libraries there.
@@ -33251,11 +12022,6 @@ Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
 	  'TkWarningObj'
 
-Sat Apr  2 13:23:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* hash.c (env_key): ENV.index is deprecated as well as Hash#index.
-	  use ENV.key instead. [ruby-dev:25974]
-
 Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
@@ -33272,39 +12038,12 @@ Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT, README.EXT.ja (Appendix C): utility functions.
 
-Thu Mar 31 14:08:43 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
 	  value. [ruby-dev:25971]
 
-Thu Mar 31 11:07:50 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: @@setter -> @@setters.
-
-	* 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.
-
-	* 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.
-
-Thu Mar 31 11:00:36 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.install_setter)
-	  (RSS::BaseListener.register_uri): changed fallback way.
-
-Thu Mar 31 08:25:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
 
@@ -33318,10 +12057,21 @@ Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  error even if the specified engine could not be loaded. (Dynamic
 	  engines don't have fixed name to load.)
 
+Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
+
+Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* 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]
+
 Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c: add TclTkIp#_create_console() method to create
-	  a Tcl/Tk's console window.
+	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
+	  create a Tcl/Tk's console window.
 
 	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
 
@@ -33335,12 +12085,12 @@ Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/**: ditto.
 
-Tue Mar 29 22:20:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
 	  [ruby-dev:25961]
 
-Tue Mar 29 00:04:57 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
 	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
@@ -33349,23 +12099,15 @@ Tue Mar 29 00:04:57 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/gw.rb: ditto.
 
-Mon Mar 28 20:53:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extract_makefile): nothing to be removed when no file
-	  was deleted.
+Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb (extmake): restore srcdir.
+	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
 
 Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
 	  arguments.  (pointed out by NaHi)
 
-Sun Mar 27 00:56:58 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_file): ignore Errno::E* if force option
-	  is set. [ruby-dev:25944]
-
 Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
@@ -33421,26 +12163,31 @@ Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (check_sizeof): refine logging messages.
 
-Wed Mar 23 19:08:10 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* 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.
+	  initialized with the port given to the first one.
 
 	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
 	  parameter is 0, it should be updated with the port number which
-	  ectually listened.
+	  actually listened.
 
-Wed Mar 23 16:12:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* parse.y (primary): fix lineno of rescue and ensure.
-
-Wed Mar 23 00:39:05 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/ruby/test_settracefunc.rb (test_event): added tests for
 	  "class" and "end" and "raise".
 
+Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_call0): check event_hooks instead of trace_func.
+
+Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* eval.c (rb_add_event_hook): new function to add a hook function for
+	  interpreter events. (backported form HEAD)
+
 Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
@@ -33466,42 +12213,28 @@ Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (inspect_struct): ditto.
 
-Wed Mar 16 23:39:13 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb: added test for c-return.
-
-Wed Mar 16 22:57:43 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* eval.c (rb_call0): call_cfunc() should be protected.
 
-	* eval.c (rb_add_event_hook): use K&R style.
-
-	* eval.c (rb_remove_event_hook): ditto.
+	* test/ruby/test_settracefunc.rb: added test for c-return.
 
-Wed Mar 16 22:03:15 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* eval.c (rb_add_event_hook): new function to add a hook function for
-	  interpreter events.
+	* object.c (str_to_id): fixed typo.
 
 Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_call0): reorganize "return" event post.
 
-	* eval.c (return_jump): no need to post "return" event here.
-
 Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
 	  Iconv::Failure.
 
-Tue Mar 15 23:12:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* eval.c (recursive_check, recursive_push): more restrictive check.
-	  fixed: [ruby-dev:25916]
-
-Tue Mar 15 16:38:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv()
+	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
 
 Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -33517,8 +12250,7 @@ Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (str_to_id): raise ArgumentError for NUL containing
-	  strings.
+	* object.c (str_to_id): warn for NUL containing strings.
 
 Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -33538,37 +12270,14 @@ Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/tcolor: ditto.
 
-Sun Mar 13 22:19:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (recursive_pop): raise TypeError instead of fatal error.
-	  fixed: [ruby-dev:25843]
-
-Sun Mar 13 10:09:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
 
-Sun Mar 13 02:32:54 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): should get DH
-	  parameter from the current SSL object.
-
-Sun Mar 13 02:09:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/openssl/ossl_pkey_dh.c (ossl_create_dh): fix typo.
-	  patch from IWATSUKI Hiroyuki. [ruby-dev:25867]
-
-	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto.
-	  (ossl_call_tmp_dh_callback): ditto
-
-Fri Mar 11 03:24:59 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): wrong var node was set for NODE_LAMBDA.
-	  [ruby-core:04555]
-
-Thu Mar 10 19:10:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (lib_eventloop_ensure): mis-delete a timer handler
-	  when exit from a recursive called eventloop
+	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
+	  handler when exit from a recursive called eventloop
 
 	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
 	  realtime operation
@@ -33589,48 +12298,18 @@ Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* re.c (make_regexp): need to free internal regexp structure when
 	  compilation fails.  [ruby-talk:133228]
 
-Thu Mar 10 01:08:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (bv_decl): remove initialize rule from block local
-	  variable declaration.
+Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Wed Mar  9 23:55:34 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP::PPMethods#guard_inspect_key): support
-	  __recursive_key__.  [ruby-dev:25821]
-
-Wed Mar  9 19:42:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c: OpenSSL::SSL::SSLContexts suports callbacks:
-	  - SSLContext#client_cert_cb is a Proc. it is called when a client
-	    certificate is requested by a server and no certificate was yet
-	    set for the SSLContext. it must return an Array which includes
-	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
-	  - SSLContext#tmp_dh_callback is called in key exchange with DH
-	    algorithm. it must return an OpenSSL::PKey::DH object.
-
-	* ext/openssl/ossl_ssl.c:
-	  (ossl_sslctx_set_ciphers): ignore the argument if it's nil.
-	  (ossl_start_ssl, ossl_ssl_write): call rb_sys_fail if errno isn't 0.
-	  [ruby-dev:25831]
-
-	* ext/openssl/ossl_pkey.c
-	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
-	  (DupPrivPKeyPtr): new function.
-
-	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
-
-	* ext/openssl/ossl_pkey.h: ditto.
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
+	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
 
 	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
 
-Wed Mar  9 18:09:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (gettable_gen): warns if VCALL name is used as
-	  out-of-scope block local variable.  [EXPERIMENTAL]
+Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* parse.y (opt_bv_decl): add explicit block local variable
-	  declaration.  raises error for name conflicts.  [EXPERIMENTAL]
+	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
+	  restore @token if accept failure. suggested by Dominique Brezinski.
+	  [ruby-core:04518]
 
 Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -33643,10 +12322,9 @@ Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  sample supports to use a text widget as if it is a I/O stream (such
 	  like as StringIO class).
 
-Tue Mar  8 13:39:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/socket/mkconstants.rb: workaround for some of 4.4BSD-Lite
-	  derived OSs.
+	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
 
 Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -33654,275 +12332,159 @@ Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
 	  [ruby-doc:824]
 
-Tue Mar  8 10:48:53 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (rb_exec_recursive): declaration should precede statements
-	  before C99.
-
-Tue Mar  8 10:05:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (errno_missing): Errno.const_missing to allow references
-	  to SyscallError exceptions not defined on the platform.
-	  [ruby-core:04522]
-
-	* error.c (Init_syserr): Errno::NOERROR(0) for fallback exception.
-
-Tue Mar  8 01:19:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
 	  fixed: [ruby-dev:25828]
 
-Mon Mar  7 21:29:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
-	  restore @token if accept failure. suggested by Dominique Brezinski.
-	  [ruby-core:04518]
+Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
 	  Kazuhiko Shiozaki.
 
-Mon Mar  7 21:01:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_require_safe): get actual path string under safe level
-	  when requested.  fixed: [ruby-dev:25815]
-
-Mon Mar  7 16:46:02 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
-	  ossl_ssl_write): need to set errno on Win32 platform.
-
 Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (block_pass): should not push unique number if a block is
 	  not an orphan.  [ruby-dev:25808]
 
-Mon Mar  7 14:13:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
-	  should set @eof and @rbuffer.
-
-Mon Mar  7 10:28:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (inspect_obj): unintended space removal.
-	  [ruby-dev:25810]
-
-	* eval.c (rb_exec_recursive): should not use NODE in disclosed
-	  context.  [ruby-dev:25812]
-
-	* io.c (rb_f_open): need not to check if to_open value is a
-	  T_FILE.  [ruby-dev:25812]
-
-Mon Mar  7 01:21:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil/tkutil.c: follow the change of st.c (committed
-	  at Fri, 4 Mar 2005 15:47:47 +0900 by matz)
-
-Mon Mar  7 00:01:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
-
-Sun Mar  6 13:04:10 2005  Dee Zsombor  <zsombor@ruby-lang.org>
-
-	* misc/ruby-electric.el: added.
-	* misc/Readme: updated.
-
-Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
-
-	* lib/pp.rb: rdoced.  [ruby-core:4490]
-
-Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
-	  may return nil.  [ruby-talk:129826]
-	  reported by Daniel Berger.
-
-Sun Mar  6 06:34:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): 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]
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): ditto.
+	* 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]
 
 	* 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.
 
+	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
+	  underlying IO.
+
 	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
 
 	* text/openssl/test_pair.rb: test for IO like methods.
 
 	* test/ruby/ut_eof.rb: test about empty file.
 
-Sat Mar  5 17:48:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* dir.c (rb_glob): fixed mismatch of argument.
+	* lib/un.rb: should use OptionParser. (backported form HEAD)
 
-	* dir.c (fnmatch): removed unnecessary code. (by string.c 1.219)
+Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.117)
+	* string.c (rb_str_cmp_m): should not return false but nil.
+	  fixed: [ruby-dev:25811]
 
-Sat Mar  5 16:50:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.65
+	* 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.
 
-Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
 
-Sat Mar  5 12:52:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/mkmf.rb (create_makefile): allow putting spaces between target
-	  and colon in depend file.
+	* lib/net/http.rb: HTTPHeader holds its header fields as an array
+	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
 
-Sat Mar  5 02:41:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/net/http/test_httpheader.rb: new file.
 
-	* file.c (eaccess): workaround for VC++8 runtime.
-
-	* win32/win32.c (ioinfo): VC++8 support.
-
-Fri Mar  4 19:39:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
-	  also locally defined modules.
-
-	* ext/iconv/iconv.c: rdocified.
-
-	* ext/strscan/strscan.c: moved misplaced rdoc.
-
-Fri Mar  4 16:11:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (rb_exec_recursive): matched the declaration to prototype.
-
-	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
-	  window_color_set().
+Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
 
-	* ext/tk/tcltklib.c: fixed commit mistakes.
+	* lib/pp.rb: rdoced.  [ruby-core:4490]
 
-Fri Mar  4 12:45:17 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
 
-	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
-	  [ruby-core:4296]
+	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
+	  may return nil.  [ruby-talk:129826]
+	  reported by Daniel Berger.
 
-	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
-	  in the "simple" parser. [ruby-core:4301]
+Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Fri Mar  4 12:45:17 2005  Charles Mills  <cmills@freeshell.org>
+	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
+	  String#clear, so [ruby-dev:24749] didn't affect it)
 
-	* 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]
+	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
 
-Fri Mar  4 12:45:17 2005  Florian Gross  <florgro@gmail.com>
+Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
-	  [ruby-core:4302]
+	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
 
-Fri Mar  4 12:45:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
 
-	* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
-	  rb_exec_recursive() in eval.c.
+Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_exec_recursive): new function.
+	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
+	  also locally defined modules.
 
-	* array.c (rb_ary_join): use rb_exec_recursive().
+	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
 
-	* array.c (rb_ary_inspect, rb_ary_hash): ditto.
+	* ext/strscan/strscan.c: moved misplaced rdoc.
 
-	* file.c (rb_file_join): ditto.
+Fri Mar  4 15:58:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
+	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
+	  getopts.rb, parsearg.rb, importenv.rb as well.
 
-	* io.c (rb_io_puts): ditto.
+Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* object.c (rb_obj_inspect): ditto
+	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
+	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
 
-	* struct.c (rb_struct_inspect): ditto.
+	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
 
 Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
 	  [ruby-talk:132866]
 
-Fri Mar  4 09:37:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (install-nodoc, pre-install-doc, post-install-doc):
-	  fix some omissions.
-
-Fri Mar  4 08:09:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/time.rb (Time::strptime): add new function.  inspired by
-	  [ruby-talk:132815].
-
-	* lib/parsedate.rb (ParseDate::strptime): ditto.
-
 Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
 
-Thu Mar  3 23:24:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
 
-Thu Mar  3 18:47:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (config.h): check if affected
-	  when makefiles are modified.
-
-	* {bcc32,win32,wince}/Makefile.sub (config.status): add variables
-	  for tests.
-
-	* win32/ifchange.bat: try to update a file only if modified.
-
-	* win32/resource.rb: more descriptions.
-
-	* common.mk: add {pre,post}-install targets.
-
-	* instruby.rb (install?): install particular part.
-
-	* bcc32/Makefile.sub (post-install-ext): remove debug information
-	  files after installation.
-
-	* ext/tk/tcltklib.c (ip_rbUpdateCommand, ip_rb_threadUpdateCommand):
-	  get rid of warnings with Tcl/Tk 8.3 or former.
-
 Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
 
-Wed Mar  2 19:53:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb (parse_args): return false if nothing matched.
+	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
+	  already.  fixed: [ruby-dev:25781]
 
-Wed Mar  2 17:15:08 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tcltklib.c (lib_eventloop_core): fix typo
+	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
 
-Wed Mar  2 16:59:50 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* eval.c (ruby_native_thread_kill): call pthread_kill() to send a
-	  signal to ruby's native thread
-
-	* ruby.h: add definition of ruby_native_thread_kill()
-
-	* signal.c (sigsend_to_ruby_thread): send the signal to ruby's
-	  native thread ([ruby-dev:25744], [ruby-dev:25754]), and set
-	  signal mask to the current native thread
-
-Wed Mar  2 16:03:08 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: enforce thread-check and exception-handling to
-	  avoid SEGV trouble.
+	* 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.
 
 	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
 	  to a Tcl's list string.
@@ -33966,58 +12528,17 @@ Wed Mar  2 16:03:08 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-*/widget: add entries of animation demos.
 
-Wed Mar  2 12:21:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval): [EXPERIMENTAL] NODE_LAMBDA implemented.
-	  [ruby-dev:25780]
-
-	* node.h (NODE_LAMBDA): for literal Proc object.
+Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* parse.y (expr): interpret mere do...end block as proc object.
+	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
+	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
 
-	* parse.y (primary): ditto, for brace block.
-
-Tue Mar  1 21:16:54 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* regcomp.c (optimize_node_left): uninitialized member
-	  (OptEnv.backrefed_status) was used. [ruby-dev:25778]
-
-Tue Mar  1 16:50:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regparse.c: move st_*_strend() functions from st.c.  fixed some
-	  potential memory leaks.
-
-Tue Mar  1 00:40:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
 
 	* test/rinda/test_rinda.rb: ditto.
 
-Mon Feb 28 23:10:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/socket/socket.c (Init_socket): IPv6 is not supported although
-	  AF_INET6 is defined on bcc32. (rev1.108 again)
-
-	* ext/socket/mkconstants.rb: ditto.
-
-Mon Feb 28 21:55:49 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* ext/strscan/strscan.c (strscan_s_allocate):
-	  use onig_region_init().
-
-	* ext/strscan/strscan.c (adjust_registers_to_matched):
-	  use onig_region_set().
-
-Mon Feb 28 15:12:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/socket/socket.c (Init_socket): ported more Socket::Constants
-	  from ruby_1_8, and made it easy to add new constants.
-	  [ruby-dev:25771]
-
-	* ext/socket/depend: ditto.
-
-	* ext/socket/mkconstants.rb: ditto. (added)
-
 Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
 
 	* exception error messages updated.  [ruby-core:04497]
@@ -34028,27 +12549,6 @@ Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
 	  [ruby-core:04409]
 
-Sun Feb 27 05:55:38 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: fix typo. [ruby-core:04494]
-
-Sat Feb 26 16:58:20 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* parse.y, re.c, regex.h, LEGAL, ext/strscan/strscan.c:
-	  remove oniggnu.h (GNU regex API).
-
-Wed Feb 23 22:08:16 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* st.c, st.h: imported additional file changes on
-	  Oniguruma 3.7.0.
-
-Wed Feb 23 21:45:29 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
-	  regenc.c, regenc.h, regerror.c, regexec.c, regint.h,
-	  regparse.c, regparse.h, sjis.c, utf8.c: imported Oni Guruma
-	  3.7.0.
-
 Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
@@ -34061,53 +12561,27 @@ Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_unshift_m): ditto.
 
-Wed Feb 23 01:53:29 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
-	  NABEYA Kenichi.
+	  NABEYA Kenichi. (backported from CVS HEAD)
 
-Wed Feb 23 00:37:34 2005  Kouhei Sutou  <kou@cozmixng.org>
+Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (mkmf_failed): fixed typo.
+	* parse.y (parser_yylex): identfier after dot must not be a variable.
 
-Tue Feb 22 23:52:45 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* configure.in, lib/mkmf.rb: use simple commands if available.
-
-	* mkconfig.rb: remove autoconf internal variables from rbconfig.rb.
-
-	* lib/mkmf.rb (create_makefile): substitute implicit rules in depend
-	  file.
-
-	* {bcc32,win32,wince}/Makefile.sub (COMPILE_RULES, RULE_SUBST):
-	  include $(topdir) and $(hdrdir) to search path.
-
-Tue Feb 22 23:51:45 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
-
-Tue Feb 22 23:50:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (ruby_signal, ruby_nativethread_signal): must be valid as
-	  expressions, not only statements.
-
-Tue Feb 22 12:54:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): update curr_thread before raising
-	  TAG_THREAD.  [ruby-dev:25712]
-
-Tue Feb 22 07:24:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
 
-	* parse.y (parser_yylex): identifier after dot must not be a variable.
+	* win32/win32.[ch] (fcntl): ditto.
 
-Mon Feb 21 18:31:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c (rb_w32_connect): support nonblocking mode.
 
-	* signal.c: Standard signal handlers ignore signals on non-Ruby native
-	  threads. When a handler is entried with ruby_signal() (like as the
-	  standard signal handlers), the handler for the signal is marked as
-	  it cannot accept non-Ruby native threads. If a handler can treat all
-	  signals on all native threads, please use ruby_nativethread_signal()
-	  to entry it.
+	* 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].
 
 Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -34115,7 +12589,7 @@ Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
 	  re-implemented according to RFC 1738.
 	  reported by Guillaume Marcais.  [ruby-talk:131650]
 
-Sat Feb 19 18:46:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
 	  [ruby-dev:25722]
@@ -34127,16 +12601,7 @@ Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
 	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
 	  after connection is made.
 
-Sat Feb 19 13:31:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extract_makefile): remove no longer existing installed
-	  files.
-
-	* lib/mkmf.rb (install_dirs): return installation directory list.
-
-	* lib/mkmf.rb (create_makefile): reverted wrongly removed lines.
-
-Sat Feb 19 01:28:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
 	  [ruby-dev:25685]
@@ -34153,42 +12618,16 @@ Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
 	  of StandardError class, not Exception class.  [ruby-core:04429]
 
-Fri Feb 18 04:06:41 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (fcall_gen): lvar(arg) will be evaluated as
-	  lvar.call(arg) when lvar is a defined local variable. [new]
-
-Thu Feb 17 22:15:34 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* ext/strscan/strscan.c: calls Oniguruma API directly.
-
-Thu Feb 17 21:53:12 2005  K.Kosako  <sndgk393 AT ybb.ne.jp>
-
-	* common.mk, LEGAL: remove reggnu.c.
-
-Thu Feb 17 21:53:12 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* gc.c, re.c: now ruby calls Oniguruma API directly, bypassing
-	  GNU compatible APIs.
-
-Thu Feb 17 20:09:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
 
-Thu Feb 17 20:09:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/digest/test_digest.rb: separate test case for each algorithms.
 	  [ruby-dev:25412]
 
-Thu Feb 17 14:31:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_class_initialize): call inherited method before
-	  calling initializing block.
-
-	* eval.c (rb_thread_start_1): initialize newly pushed frame.
-	  fixed: [ruby-dev:25707]
-
-Thu Feb 17 13:46:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/collector.rb (collect_file): now deletes paths added
 	  to $LOAD_PATH instead of restoring it verbatim.
@@ -34206,43 +12645,38 @@ Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
 	  fixed: [ruby-core:04444]
 
-Thu Feb 17 00:31:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/test_drb.rb, ut_safe1.rb: port from 1.8
+Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
+	  [ruby-dev:25238]
 
-	* eval.c (is_defined): NODE_IASGN is an assignment.
+	* test/drb/test_drb.rb: add method DRbService.ext_service, move
+	  TestDRbReusePort to new file [ruby-dev:25238]
 
-Wed Feb 16 23:54:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/drb/test_drb.rb: ditto.
 
-	* eval.c (rb_thread_start_1): outer block variables wasn't linked to
-	  threads.  fixed: [ruby-dev:25700]
+	* test/drb/test_drbssl.rb: ditto.
 
-Wed Feb 16 15:11:43 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/drb/test_drbunix.rb: ditto.
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::Nonblock#initialize):
-	  native win32 platform doesn't have F_GETFL.
+	* test/drb/ut_drb.rb: reduce sleep.
 
-Wed Feb 16 02:47:45 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read, ossl_ssl_write): should
-	  call rb_sys_fail instead of raising SSLError if SSL_ERROR_SYSCALL
-	  occurred.
+	* eval.c (is_defined): NODE_IASGN is an assignment.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#fill_rbuff):
-	  should rescue Errno::EAGAIN.
+Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#each): fix typo.
-	  suggested by Brian Ollenberger.
+	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
 
-	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
-	  underlying IO.
+	* lib/drb/extserv.rb: ditto.
 
-Tue Feb 15 22:14:34 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
+Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/readline/readline.c (Readline.readline): use rl_outstream
-	  and rl_instream.  [ruby-dev:25699]
+	* 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.
 
 Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -34252,14 +12686,13 @@ Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
 Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
 
-Mon Feb 14 00:10:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
-	  config[:safe_level] ([druby-ja:120])
+	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
 
-	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
 
 Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -34272,43 +12705,22 @@ Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/: added tests for the convenient methods.
 
-Sun Feb 13 23:12:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
+	  config[:safe_level] ([druby-ja:120])
 
-	* eval.c (rb_thread_start_0): restore prot_tag before rewinding.
+	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
 
 Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
 	  to the value of status header field. ([ruby-dev:40617])
 
-Sun Feb 13 11:38:40 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regparse.c (type_cclass_hash): (Thanks Nobu) fixed
-	  overrun. ([ruby-dev:25676]).
-
-Sun Feb 13 10:53:08 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* oniggnu.h, oniguruma.h, regcomp.c, st.c: imported
-	  Oni Guruma 3.6.0.
-
-Sun Feb 13 01:33:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/erb.rb (ERB::Util.h, u): make it module_function.
 
-Sat Feb 12 22:17:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (TAG_THREAD): to start a new thread.
-
-	* eval.c (ruby_init, ruby_options, ruby_cleanup, rb_protect,
-	  rb_load_protect, rb_thread_start_0): make thread anchor.
-
-	* eval.c (proc_alloc): clone proc object if klass is not Proc or
-	  created in different thread.
-
-	* eval.c (rb_block_pass): call a function with a block.  [new]
-
-	* eval.c (rb_f_throw): raise NameError in main thread.
-
 Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
@@ -34318,10 +12730,6 @@ Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* random.c (rand_init): suppress warning.
 
-Sat Feb 12 14:10:24 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_http): reject userinfo explicitly.
-
 Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/open-uri.rb: support https if the platform provides CA
@@ -34329,10 +12737,10 @@ Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
 
 Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
 
-	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
+	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
 	  [ruby-dev:25675]
 
-Fri Feb 11 17:37:50 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
 	  new method OpenSSL::X509::Store#set_default_paths.
@@ -34354,108 +12762,68 @@ Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
 	* lib/rdoc/generators/ri_generator.rb: ditto.
 
-Thu Feb 10 13:52:42 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, win32/Makefile.sub (LIBS, COMMON_HEADERS): use
-	  winsock2 on mswin32/mingw.
-
-	* ext/socket/extconf.rb: ditto.
-
-	* win32/win32.c (StartSockets): ditto.
-
-	* win32/win32.h: ditto.
+Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 10 12:09:16 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
 
-	* ext/extmk.rb (extract_makefile): default to true if not compiled
-	  previously.
+	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
+	  mswin32.
 
-	* ext/extmk.rb (extmake): create dummy makefile if extconf failed.
+Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 10 12:07:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (init_stdhandle): assign standard file handles.
-
-	* bcc32/Makefile.sub (COMMON_LIBS): add libraries included in
-	  import32.lib.
-
-	* lib/mkmf.rb (create_makefile): restrict prefixing with srcdir to
-	  rule lines, add search path to implicit rules, and set Borland make
-	  special macros for search path.
-
-	* win32/win32.c, win32/win32.h (read): avoid a BCC runtime bug.
+	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
+	  window_color_set().
 
 Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (make_struct): fixed: [ruby-core:04402]
 
-Wed Feb  9 16:33:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (wait_connectable): fixed wrong condition.
-
-Wed Feb  9 14:42:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* eval.c (scope_dup): add volatile not to optimize tbl.
-
-Wed Feb  9 10:02:02 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/make-tkutil, ext/tk/tkutil/subconf.rb: no longer used.
-
-	* ext/tk/tkutil/extconf.rb: need to compile tkutil. [ruby-dev:25607]
-
 Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
 
 	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
 
-Tue Feb  8 23:48:36 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
 	  [druby-ja:117]
 
-Tue Feb  8 22:38:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* keywords, parse.y: separate EXPR_VALUE from EXPR_BEG.
-	  fixed: [ruby-core:04310], [ruby-core:04368]
-
 Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
 
 	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
 	  [ruby-talk:130092]
 
+Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+
 Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
 	  (Resolv::DNS::Name#inspect): ditto.
 	  Suggested by Sam Roberts.  [ruby-talk:129086]
 
-Mon Feb  7 23:14:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_getc): flush rb_stdout before read from stdin, which is
-	  connected to a tty.  [ruby-core:4378]
-
-	* rubyio.h (FMODE_TTY): renamed from FMODE_LINEBUF.
-
 Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c: [ruby-doc:818]
 
-Mon Feb  7 02:13:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
+	  rbconfig.rb. (backported from CVS HEAD)
 
 	* 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.
 
-Mon Feb  7 01:22:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb (create_makefile): should support header files in
+	  depend file.
 
-	* ext/extmk.rb (extract_makefile): extract previously collected
-	  informations from existing Makefile.
+Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
 	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
 
-	* ext/tk/extconf.rb: separate tkutil configuration.
-
 	* lib/mkmf.rb ($extmk): check if under ext directory.
 
 	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
@@ -34472,25 +12840,31 @@ Mon Feb  7 01:22:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (dir_config): accept arrays of directory names as
 	  default values.
 
-	* lib/mkmf.rb (with_cppflags, with_cflags, with_ldflags): keep flags
-	  modified if the block returned true.
+	* mkconfig.rb: no longer embed srcdir and compile_dir into
+	  rbconfig.rb.
+
+	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
 
-Sun Feb  6 19:20:05 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* eval.c (stack_extend): add prototype because VC++8 doesn't
 	  accept __declspec(noinline) with K&R style function definitions.
+	  (backported from CVS HEAD)
 
-Sun Feb  6 13:56:19 2005  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (new_with_hash): changed messages of exception.
 
 	* lib/date/format.rb (str[fp]time): undocumented conversion
 	  specifications %[1-3] are now deprecated.
 
-Sun Feb  6 11:27:37 2005  Tanaka Akira  <akr@m17n.org>
+Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/dl/dl.c (Init_dl): function declaration should precede
-	  statements before C99.
+	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
+	  to big2ulong().
+
+	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
+	  arguments are passed to rb_reg_initialize().
 
 Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -34502,28 +12876,7 @@ Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
 	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
 	  based on [ruby-talk:129732] by Sam Roberts.
 
-Sat Feb  5 02:24:06 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/test_scanner_events.rb: fix test.
-
-Fri Feb  4 18:44:35 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/lexer.rb: last Lexer fix was incomplete;
-	  test all green.
-
-Fri Feb  4 15:57:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (open_args): fix too verbose warnings for the space
-	  before argument parentheses.  [ruby-dev:25492]
-
-	* parse.y (parser_yylex): ditto.
-
-Fri Feb  4 14:33:25 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/filter.rb: ripper/tokenizer ->
-	  ripper/lexer. [ruby-dev:25632]
-
-Fri Feb  4 00:24:15 2005  Kouhei Sutou  <kou@cozmixng.org>
+Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss: supported Image module.
 	  http://web.resource.org/rss/1.0/modules/image/
@@ -34536,19 +12889,6 @@ Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
 	  extended portion.  [ruby-dev:25626]
 
-Thu Feb  3 16:12:57 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (parser_yylex): the first expression in the parentheses
-	  should not be a command.  [ruby-dev:25492]
-
-Thu Feb  3 03:31:20 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: follow original v 1.57
-
-	* ext/nkf/nkf-utf8/utf8tbl.c: follow original v 1.8
-
-	* ext/nkf/nkf-utf8/config.h: follow original v 1.7
-
 Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
 
 	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
@@ -34568,49 +12908,18 @@ Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/trackback.rb: ditto.
 
-Wed Feb  2 03:30:58 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/tokenizer.rb -> lexer.rb.
-
-	* ext/ripper/lib/ripper/lexer.rb: new method Ripper.slice.
-	  [experimental]
-
-	* ext/ripper/lib/ripper/sexp.rb: new file. [experimental]
-
-	* ext/ripper/lib/ripper.rb: require ripper/lexer and ripper/sexp.
-
-Tue Feb  1 21:49:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
 	  _dump.
 
 Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in, configure.in: made EXTOUT configurable.
-
-	* ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.
-
-	* lib/mkmf.rb: make extensions in depth order.  [ruby-dev:25522]
-
 	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
 
-Mon Jan 31 13:16:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
-
-	* ext/tk/depend: remove the information of tkutil
-
-	* ext/tk/make-tkutil: sub-part of Makefile to compile tkutil
+Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/tkutil/tkutil.c: move tkutil.c to subdirectory
-
-	* ext/tk/tkutil/subconf.rb: configuration file for tkutil.c
-
-	* ext/tk/tkutil/depend: ditto
-
-Mon Jan 31 13:13:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: add invalid namespace check
+	* ext/tcltklib/tcltklib.c: add invalid namespace check
 
 	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
 
@@ -34620,22 +12929,11 @@ Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
 
-Mon Jan 31 09:44:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): remove Object#type.  [ruby-core:04335]
-
 Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
 
 	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
 	  resource record for specifying location of services.
 
-Sat Jan 29 00:10:33 2005  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* ascii.c, euc_jp.c, hash.c, oniggnu.h, oniguruma.h, regcomp.c,
-	  regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c, regint.h,
-	  regparse.c, regparse.h, sjis.c, st.c, st.h, utf8.c: imported
-	  Oni Guruma 3.5.4.
-
 Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
@@ -34645,60 +12943,33 @@ Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
 	  (Resolv::DNS::Config#lazy_initialize): ditto.
 	  Suggested by Sam Roberts.
 
-Thu Jan 27 17:15:03 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/extconf.rb: support new tk scheme on bccwin32.
-	  fixed: [ruby-dev:25546]
-
 Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* st.c (st_foreach): report success/failure by return value.
 	  [ruby-Bugs-1396]
 
-Thu Jan 27 00:12:19 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (setup): support BSD style
-	  directory group inheritance (again).
+Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
 
-Thu Jan 27 00:02:40 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (setup): support BSD style
-	  directory group inheritance. [ruby-dev:25440]
+	* test/fileutils/test_fileutils.rb (setup): support BSD-style
+	  directory group inheritance. (backport from HEAD, rev 1.32)
 
 	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
-	  difference.
-
-Wed Jan 26 17:12:50 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y: forgot to initialize parser struct.  [ruby-dev:25492]
+	  difference. (backport from HEAD, rev 1.4)
 
-	* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
-	  [ruby-talk:127711]
+Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
 
-Wed Jan 26 14:12:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
+	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
 
-	* ext/Setup*: remove tcltklib.
-
-Wed Jan 26 12:45:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/extconf.rb: support new tk scheme on mswin32.
-	 fixed: [ruby-dev:25535]
-
-Wed Jan 26 10:45:19 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
-	  LOCK_NB is specified.
-
-Tue Jan 25 23:10:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	  LOCK_NB is specified. (backported from CVS HEAD)
 
-	* ext/tk: merge tcltklib for Ruby/Tk installation control
+Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tcltklib: remove
-
-Tue Jan 25 17:05:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (proc_options): correct -T option in RUBYOPT.
-	  fixed: [ruby-dev:25512]
+	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
+	  from CVS HEAD)
 
 Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -34737,17 +13008,31 @@ Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
 	  [ruby-dev:25479]
 
-Mon Jan 24 16:00:53 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
 
-	* ext/nkf/lib/kconv.rb (guess_old): not use NKF.guess_old
-	  but NKF.guess1. fixed: [ruby-dev:25491]
+	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
+	  [ruby-core:4296]
+
+	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
+	  in the "simple" parser. [ruby-core:4301]
+
+Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
+
+	* 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]
+
+Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
+
+	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
+	  [ruby-core:4302]
 
 Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* document updates - [ruby-core:04296], [ruby-core:04301],
 	  [ruby-core:04302], [ruby-core:04307]
 
-Sun Jan 23 12:38:01 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.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
@@ -34763,62 +13048,65 @@ Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
 	  GetOCSPReq at first.
 
-Sat Jan 22 22:59:08 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
 
-Sat Jan 22 22:27:28 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
 
+Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
+	  [ruby-talk:127511]
+
 Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
 	  reported by Sam Roberts.  [ruby-talk:127133]
 
-Fri Jan 21 17:09:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (decode_utf7): use pack("U*") to encode UTF-8.
-
-	* lib/net/imap.rb (encode_utf7): use unpack("U*") to decode UTF-8.
-
-	* test/net/imap/test_imap.rb: added tests for Net::IMAP.
-
 Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (rb_push_glob): should work for NUL delimited patterns.
 
-	* dir.c (rb_glob2): should aware of offset in the pattern.
-
 Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
+	  (backported from CVS HEAD)
 
-Fri Jan 21 00:37:09 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
+	  from CVS HEAD)
+
+Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
 	  "local variable 'size' used without having been initialized".
 
+Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
+
+	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
+	  $EXTOBJS.
+	  fixed: [ruby-core:04290] (backported from CVS HEAD)
+
 Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_new4): should propagate taintedness.
 
-	* env.h: rename member names in struct FRAME; last_func -> callee,
-	  orig_func -> this_func, last_class -> this_class.
-
 	* struct.c (rb_struct_set): use original method name, not callee
 	  name, to retrieve member slot.  [ruby-core:04268]
 
 	* time.c (time_strftime): protect from format modification from GC
 	  finalizers.
 
-Thu Jan 20 02:01:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (Init_Object): remove rb_obj_id_obsolete()
-
-Wed Jan 19 18:02:19 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
+	  (backported from CVS HEAD)
 
 Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -34826,6 +13114,32 @@ Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
 	  domain and search directive without an argument.
 	  reported by Sam Roberts.  [ruby-talk:126781]
 
+Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
+	  of :SSLEnable is false.
+
+	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
+	  don't allow changing its mode.
+
+	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
+	  should delete trailing LF from the result of pack("m*").
+
+	* 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.
+
+	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
+	  refine regexp (and change the name of a local variable).
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
+	  new method to escape URI path component.
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
+	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+
+	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
+
 Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): fix typo.  [ruby-talk:126401]
@@ -34854,63 +13168,48 @@ Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@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]
 
-Sat Jan 15 13:44:22 2005  Kouhei Sutou  <kou@cozmixng.org>
+Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
 
 	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
 
-Wed Jan 12 12:29:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_define_method): incomplete subclass check.
-	  [ruby-dev:25464]
+Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
 
-	* class.c (rb_make_metaclass): class of metaclasses should be
-	  plain Class.  [ruby-list:40524]
+	* io.c (io_fread): don't warn nonblocking behavior by default.
 
-Tue Jan 11 20:58:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (remain_size): use buffered data instead of unreading to avoid
-	  inconsistency of text mode.  fixed: [ruby-dev:25446]
+	* object.c (rb_class_superclass): superclass of singleton class also
+	  should be a singleton class.  fixed: [ruby-list:40519]
 
-Tue Jan 11 09:37:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (Init_Numeric): turn off floating point exceptions
 	  on bcc32. "1e300".to_f had crashed by overflow.
 
-Mon Jan 10 15:28:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
-	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
-	  new method to escape URI path component.
+	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
+	  [ruby-talk:125733]
 
-	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
-	  of :SSLEnable is false.
+	* lib/fileutils.rb (copy_stream): use read/write instead of
+	  sysread/syswrite.
 
-	* test/webrick/{test_cgi.rb,webrick.cgi}: new file.
+Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/webrick/utils.rb: require "webrick/https.h".
+	* variable.c (rb_autoload): hide internal data from ruby level.
+	  fixed: [ruby-dev:25435], [ruby-list:40498]
 
 Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (rb_data_object_alloc): klass may be NULL.
 	  [ruby-list:40498]
 
-Sun Jan  9 14:12:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
-
-Sun Jan  9 04:08:40 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/webrick/test_server.rb (test_daemon): delete an assertion
-	  which has possibility to fail by race condition.
-
-Sun Jan  9 03:22:46 2005  Minero Aoki  <aamine@loveruby.net>
+Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
 
-	* test/fileutils/test_fileutils.rb (test_copy_entry): copy_entry
-	  copies only file type, not mtime. [ruby-dev:25383]
+	* io.c (io_fread): warn nonblocking behavior.
+	  (io_readpartial): new method IO#readpartial.
 
 Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
 
@@ -34921,33 +13220,17 @@ Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
 	  [ruby-dev:25426]
 
-Fri Jan  7 20:01:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  should delete trailing LF from the result of pack("m*").
-
-	* 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.
-
-	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
-	  refine regexp (and change the name of a local variable).
-
-	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
-	  don't allow changing its mode.
-
-	* test/webrick/*, sample/webrick/httpproxy.rb: add new files.
-
 Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
 
 	* gc.c (mark_locations_array): avoid core dump with -O3.
 	  [ruby-dev:25424]
 
-Thu Jan  6 20:29:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/zlib/zlib.c (zstream_end): should return value.
+	* ext/zlib/zlib.c (zstream_end): should return value. (backported
+	  from CVS HEAD)
 
-Thu Jan  6 19:59:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.c (rb_w32_close): didn't close socket handle.
 	  [ruby-dev:25414]
@@ -34955,7 +13238,7 @@ Thu Jan  6 19:59:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
 	  never set EMFILE.
 
-Thu Jan  6 17:22:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* random.c (random_seed): O_NONBLOCK isn't defined on some
 	  platforms. [ruby-dev:25417]
@@ -34969,11 +13252,6 @@ Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
 	  in path names on DOS machines. (thanks to Johan Nilsson)
 
-Thu Jan  6 00:02:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb: use MockClock.sleep instead of Kernel.sleep
-	  [ruby-dev:25387]
-
 Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
@@ -34981,20 +13259,22 @@ Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (random_seed): refined.
 
-Wed Jan  5 16:39:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* parse.y (BITSTACK_POP): workaround for bcc32 compiler's bug.
-	  shift assignment operator '>>=' for __int64 in struct may
-	  generate collapsed code. [ruby-dev:25342]
-
-	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
-	  [ruby-dev:25306]
-
 Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
 	  again.  fixed: [ruby-core:04067]
 
+Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
+	  longer. (backported from CVS HEAD)
+
+	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
+	  interface. (backported from CVS HEAD)
+
+	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
+	  HEAD)
+
 Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
 
 	* random.c (init_by_array): imported from mt19937ar-cok.tgz.
@@ -35013,10 +13293,10 @@ Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_rand): should return positive random number.
 	  [ruby-dev:25401]
 
-Tue Jan  4 21:25:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
 
-	* test/drb/{test_drbssl.rb,test_drbunix.rb,ut_drb.rb}: use
-	  DRbService.ext_service. reduce sleep.
+	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
+	  random bignums.  [ruby-dev:25396]
 
 Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
 
@@ -35028,21 +13308,7 @@ Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
 	* random.c (random_seed): use /dev/urandom if available.
 	  [ruby-dev:25392]
 
-Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
-	  random bignums.  [ruby-dev:25396]
-
-Mon Jan  3 11:03:37 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/test_drb.rb: move TestDRbReusePort to new file.
-	  [ruby-dev:25238]
-
-	* test/drb/drbtest.rb: change timeout.
-
-	* test/drb/ignore_test_drb.rb: new file.
-
-Mon Jan  3 07:27:46 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
 	  raise NotImplementedError if password is encrypted by digest
@@ -35058,46 +13324,6 @@ Mon Jan  3 07:27:46 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/webrick/test_httpauth.rb: new file.
 
-Sun Jan  2 15:42:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: add lazy stop_service.
-
-	* lib/drb/extserv.rb: ditto.
-
-Sun Jan  2 01:17:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/drbtest.rb: add method DRbService.ext_service.
-
-	* test/drb/test_drb.rb: ditto.
-
-	* test/drb/test_drbssl.rb: ditto.
-
-Sat Jan  1 20:23:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (argf_readpartial): new method ARGF.readpartial.
-	  (io_getpartial): extracted from io_readpartial.
-	  (io_readpartial): call io_getpartial.
-
-Sat Jan  1 17:44:54 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (each_capitalized): should join header field
-	  value.  This patch is contributed sheepman [ruby-list:40478]
-
-	* test/net/http/test_httpheader.rb: test it.
-
-Sat Jan  1 16:21:29 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (copy_stream): use read/write instead of
-	  sysread/syswrite, which allows duck typing. [ruby-dev:25369]
-
-	* lib/fileutils.rb (copy_stream): does NOT support nonblocking IO.
-	  [ruby-dev:25370]
-
-	* lib/fileutils.rb (copy_entry): could not copy symlink.
-
-	* test/fileutils/test_fileutils.rb: test copy_entry, copy_file,
-	  copy_stream.
-
 Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
@@ -35109,29 +13335,8 @@ Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
-	  Fix problem if heading contains formatting.
-
-Fri Dec 31 00:08:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in (HAVE_RLIM_T): removed because not used.
-
-Thu Dec 30 22:45:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h: don't deprecate rb_read_check.
-
-	* io.c (STDIO_READ_DATA_PENDING): reverted from old READ_DATA_PENDING
-	  to check stdio read buffer.
-	  (rb_read_check): use STDIO_READ_DATA_PENDING.
-	  (rb_read_pending): ditto.
-	  (rb_getc): ditto.
-
-Thu Dec 30 05:39:35 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: eliminate unused members in struct parser_params.
-	  [ruby-dev:25258] (again)
-
-	* parse.y: make parser_new() static.
+	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
+	  if heading contains formatting.
 
 Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -35149,11 +13354,6 @@ Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_justify): create buffer string after argument type
 	  conversion.  fixed: [ruby-dev:25341]
 
-Tue Dec 28 17:18:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/net/telnet.rb (preprocess): remove NULL unless binmode.
-	  fixed: [ruby-list:40320]
-
 Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
@@ -35174,58 +13374,91 @@ Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
 
+Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
+	  install-nodoc, install-doc): rdoc support for mswin32.
+
+	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
+	  ditto.
+
 Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
 
 	* ext/tk/lib/multi-tk.rb: ditto
 
-Mon Dec 27 16:54:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
 	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
 
-Mon Dec 27 15:29:12 2004  Minero Aoki  <aamine@loveruby.net>
+Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* test/fileutils/test_fileutils.rb (cp_r): tested wrong file name.
-	  [ruby-dev:25339]
+	* string.c (rb_str_justify): [ruby-dev:25341]
 
-Mon Dec 27 15:15:18 2004  Minero Aoki  <aamine@loveruby.net>
+Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/fileasserts.rb: sync with HEAD.
+
+	* test/fileutils/test_fileutils.rb: ditto.
+
+	* test/fileutils/test_nowrite.rb: ditto.
+
+Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (mv): should raise error when moving a
 	  directory to the (empty) directory. [ruby-talk:124368]
+	  (backport from HEAD 1.48)
 
 	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
-	  platforms.
+	  platforms. (backport from HEAD 1.48)
+
+Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Dec 27 14:36:20 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* stable version 1.8.2 released.
 
-	* process.c (NUM2RLIM, RLIM2NUM): Without SIZEOF_RLIM_T is not error.
-	  fixed: [ruby-dev:25346]
+Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
 
-Sun Dec 26 16:21:39 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
+	  permission. (backportted from HEAD, 1.47)
 
-	* lib/net/imap.rb (Net::IMAP::PlainAuthenticator): added a new class
-	  to support the PLAIN authentication mechanism. Thanks, Benjamin
-	  Stiglitz.
+	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
+	  objects. (backportted from HEAD, 1.46)
 
 Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_f_select): [ruby-dev:25312]
+	* io.c: cancel io_reopen() change on Dec. 24th.
+
+	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
+
+	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
+
+Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
+	  [ruby-dev:25306]
+
+	* win32/win32.[ch]: ditto.
 
 Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
 
-Fri Dec 24 03:06:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
+	  [ruby-dev:25306]
+
+Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
 	  special IO ports.  [ruby-dev:25225]
 
-	* io.c (next_argv): reduce use of stdio.
-
 Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
+	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+
 	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
 
 	* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
@@ -35245,20 +13478,11 @@ Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
 
-Thu Dec 23 23:43:24 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c (proc_setgroups): check if the argument length is
+	* process.c (proc_setgroups): check if the argument lenght is
 	  modified.  fixed: [ruby-dev:25285]
 
-	* process.c (SIZEOF_RLIM_T): err if size of rlim_t is not set.
-
-Thu Dec 23 19:08:41 2004  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h: rename FMODE_UNSEEKABLE to FMODE_DUPLEX.
-
-	* io.c (io_check_tty): extracted function to set FMODE_LINEBUF and
-	  FMODE_DUPLEX.
-
 Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
@@ -35270,6 +13494,10 @@ Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
 
+Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
+
 Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
@@ -35284,49 +13512,41 @@ Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
 	  all argument conversion.  fixed: [ruby-dev:25271]
 
-Tue Dec 21 16:15:21 2004  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is
-	  nil in proxy methods. nil is default value.
-
-	* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
-	  use threads instead of forking. this should fix issue #1208
-	  (http://rubyforge.org/tracker/?func=detail&atid=1698&aid=1208&group_id=426).
-	  removed testing of SSL enabled servlet as this hangs.
-
-Wed Dec 22 00:05:10 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
 
-Tue Dec 21 22:07:41 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): use rb_str_new4
-	  to avoid SEGV.
+Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
 	  ossl_asn1_decode_all): temporary value should be marked volatile.
 
-Tue Dec 21 12:42:34 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode):
-	  use rb_str_new4 to avoid SEGV. fix [ruby-dev:25261]
+	* 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]
 
 	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
 
+Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_reopen): keep duplex pipe in correct mode for exception
+	  safeness.  fixed: [ruby-dev:25152]
+
 Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
 
-Mon Dec 20 22:52:29 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* added samples for the previous soap4r's commit.
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
 
-Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
 
-	* gc.c (set_stack_end): gcc noinline attribute is available since
-	  gcc-3.1.
+	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
 
-Mon Dec 20 22:40:31 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* added files:
 	  * lib/soap/mapping/wsdl*.rb
@@ -35340,6 +13560,8 @@ Mon Dec 20 22:40:31 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * test/soap/*
 	  * test/wsdl/*
 	  * test/xsd/*
+	  * sample/soap/*
+	  * sample/sdl/*
 
 	* summary
 	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
@@ -35353,14 +13575,12 @@ Mon Dec 20 22:40:31 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * HTTP client/server gzipped content encoding support.
 
 	  * improved WSDL schema definition support; still is far from
-	    complete, but is making step by step improvement.
-
-Mon Dec 20 14:45:19 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	    complete, but is making step by step improovement.
 
-	* lib/net/https.rb: delete descriptions about key_file and cert_file.
-	  fixed: [ruby-dev:25243]
+Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
 
-	* ext/openssl/lib/net/telnets.rb: ditto.
+	* gc.c (stack_end_address): gcc noinline attribute is available since
+	  gcc-3.1.
 
 Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -35372,14 +13592,21 @@ Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/panedwindow.rb: ditto
 
-Mon Dec 20 13:51:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
+	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
+	  doc and code about SSLContext#{key_file,cert_file}.
+	  fixed: [ruby-dev:25243]
 
-Mon Dec 20 10:51:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* parse.y (special_local_set): prevent the parser object from GC.
-	  fixed: [ruby-dev:25252]
+	* io.c (io_fwrite): workaround for MSVCRT's bug.
+	  fixed: [ruby-core:03982]
+
+Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_eof): check if closed before clearerr().
+	  fixed: [ruby-dev:25251]
 
 Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -35390,10 +13617,40 @@ Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* struct.c (make_struct): [ruby-dev:25249]
 
-Mon Dec 20 00:16:54 2004  Kouhei Sutou  <kou@cozmixng.org>
+Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
+
+	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
+
+Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_x509store.c
+	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
+	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+
+	* test/openssl/ossl_x509store.rb: test certificate validity times.
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
+	  second argument to specify the output format (see also
+	  X509_NAME_print_ex).
+
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
+	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
+	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
+	  new module to provide the parse for RFC2253 DN format.
 
-	* lib/rexml/encodings/SHIFT_JIS.rb: fixed LoadError bug.
-	  [ruby-core:3958]
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
+	  new method to parse RFC2253 DN format.
+
+	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
+
+	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
+	  while EADDRINUSE is raised.
+
+	* all changes in this entry are backport from 1.9.
 
 Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -35415,7 +13672,7 @@ Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
 	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
 
-Sat Dec 18 15:09:02 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/webrick/httpauth.rb,
 	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
@@ -35426,12 +13683,10 @@ Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
 
-	* io.c (rb_f_open): add type check for return value from to_open.
-
-Fri Dec 17 16:44:26 2004  Tanaka Akira  <akr@m17n.org>
+Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* configure.in (ac_cv_sizeof_rlim_t): set 8 for BSD/OS.
-	  Reported by OHARA Shigeki.  [ruby-dev:25236]
+	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
+	  fixed: [ruby-dev:25218]
 
 Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -35469,27 +13724,45 @@ Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
 	  embedded window
 
+Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
+
+	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
+	  for VMS port are added.
+
+	* eval.c (ruby_init): change to call VMS private intialization routine.
+
 Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session#initialize): control adding
 	  session_id hidden fields.  fixed: [ruby-talk:123850]
 
-Fri Dec 17 00:01:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* eval.c (rb_proc_arity, rb_node_arity, rb_mod_method_arity,
-	  rb_obj_method_arity): new functions to obtain method arity.
-	  [ruby-dev:25143]
+	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
+	  [druby-ja:101]
 
-Thu Dec 16 23:31:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
+	  CVS HEAD.)
 
-	* lib/mkmf.rb (create_makefile): create RUBYARCHDIR also when no extension
-	  is installed.  fixed: [ruby-dev:25215]
+Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Thu Dec 16 22:36:57 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
+	  for reading request till data arrive. [ruby-talk:121068]
 
-	* test/drb/test_drb.rb: adjust and reduce sleep.
+	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
+	  should log about all accepted socket. [ruby-core:03962]
+
+	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
+	  "%%" and "%u" are supported. [webricken:135]
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#check_filename):
+	  :NondisclosureName is acceptable if it is Enumerable.
+
+	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
+	  default value of :NondisclosureName is [".ht*", "*~"].
 
-Thu Dec 16 18:37:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl.c (ossl_raise): refine message format.
 
@@ -35528,64 +13801,55 @@ Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: ditto
 
-Thu Dec 16 04:02:28 2004  Minero Aoki  <aamine@loveruby.net>
+Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/ripper/extconf.rb: bison is not needed if ripper.c exists.
-	  [ruby-dev:25191]
+	* 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]
 
-Thu Dec 16 03:27:10 2004  Minero Aoki  <aamine@loveruby.net>
+Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/net/http.rb: remove junk.
-
-Thu Dec 16 00:57:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+	* hash.c (Init_Hash): remove custom "hash" and "eql?".
 
-Thu Dec 16 00:43:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* lib/drb/drb.rb: changed default binded address family to use an
-	  available address family of host name. [druby-ja:101]
+	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
 
-	* lib/drb/ssl.rb: ditto
+Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-Wed Dec 15 17:47:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/curses/curses.c (window_subwin): call NUM2INT() before
+	  GetWINDOW(). (backported from CVS HEAD)
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
-	  should log about all accepted socket. [ruby-core:03962]
+Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
-	  "%%" and "%u" are supported. [webricken:135]
+	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
+	  isatty because it never sets errno. (backported from CVS HEAD)
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#check_filename):
-	  :NondisclosureName is acceptable if it is Enumerable.
+Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
-	  default value of :NondisclosureName is [".ht*", "*~"].
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
+	  (rollback the previous commit).
 
 Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_obj_id_obsolete): warn always.
 
+	* eval.c (rb_enable_super): ditto.
+
 Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/set.rb (Set#==): [ruby-dev:25206]
 
-Wed Dec 15 14:32:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
+	  fixed: [ruby-core:03959]
 
 Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
 
-Tue Dec 14 19:17:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* utf8.c (utf8_is_mbc_ambiguous): [ruby-talk:123561]
-
-	* utf8.c (utf8_mbc_to_normalize): ditto.
-
-Tue Dec 14 17:08:15 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_close): need to reset osfhnd().
 
@@ -35599,36 +13863,27 @@ Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/cgi/session.rb (CGI::Session::initialize): generate new
 	  session if given session_id does not exist.  [ruby-list:40368]
 
-Tue Dec 14 08:47:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_eval): should mark ruby_eval_tree.  [ruby-dev:25189]
-
 Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
 
-	* gc.c (set_stack_end): new function to obtain stack end address.
-	  set_stack_end obtains a stack end address by an address of local
-	  variable in the function.
-	  (SET_STACK_END, STACK_END): use set_stack_end.  don't use alloca.
+	* 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 Dec 13 02:45:51 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/curses/curses.c (window_subwin): call NUM2INT() before
-	  GetWINDOW(). fixed: [ruby-dev:25161]
-
 Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (cleanpath_aggressive): make it private.
 	  (cleanpath_conservative): ditto.
 	  Suggested by Daniel Berger.  [ruby-core:3914]
 
-Sun Dec 12 21:32:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* test/ruby/test_super.rb (TestSuper#test_define_method): now methods
-	  from procs can call super.
+	* lib/drb/drb.rb: backported from CVS HEAD.
 
 Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -35640,7 +13895,14 @@ Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
 	  explicitly given on the command line.
 
-Sat Dec 11 21:10:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
+	  (see ext/tk/ChangeLog.tkextlib).
+
+	* ext/tk/sample/scrollframe.rb: add a new sample.
+
+Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
 	  [ruby-list:40390]
@@ -35649,27 +13911,41 @@ Sat Dec 11 21:10:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/ut_drb.rb: ditto.
 
-Sat Dec 11 13:08:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/jcode.rb (String::succ): [ruby-dev:25156]
+
+Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
+
+	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+
+	* win32/win32.c: need to include dln.h.
 
-	* sample/optparse/subcommand.rb: a sample for sub commands like
-	  cvs.  contributed by Minero Aoki.
+Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Dec 10 08:39:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (io_reopen): [ruby-dev:25150]
+
+Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
-	  listen(2).
+	  listen(2).  fixed: [ruby-dev:25149]
 
-Thu Dec  9 16:28:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
 
-	* ext/sdbm/init.c (GetDBM): typo.
+	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+
+Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Dec  9 16:21:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/sdbm/init.c (GetDBM): typo.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI#setup_header): avoid
-	  SecurityError. [ruby-dev:24970]
+Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
-	  for reading request till data arrive. [ruby-talk:121068]
+	* defines.h: change path of vms.h
+	* vms/vms.h: delete reference for snprintf()
+	* vms/config.h: new file
+	* vms/config.h_in: deleted
 
 Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -35678,10 +13954,6 @@ Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_dump): not escape # which isn't a substitution.
 
-Thu Dec  9 12:31:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (pipe_open): should set prog if argc != 0.
-
 Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
@@ -35690,11 +13962,6 @@ Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/gdbm/gdbm.c: ditto.
 
-Thu Dec  9 10:19:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/socket/test_socket.rb (test_setsockopt): use SO_LINGER instead
-	  of SO_BINDTODEVICE.  fixed: [ruby-dev:25133]
-
 Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
@@ -35749,174 +14016,44 @@ Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
 	  meant that h2 tag was invisible.
 
-Wed Dec  8 22:10:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h, io.c, ext/dl/dl.c, ext/pty/pty.c, ext/socket/socket.c:
-	  create FILE object only when required: popen(3) and DL's IO#to_ptr.
-	  [ruby-dev:25122]
-
-	* io.c (rb_io_binmode): use setmode for Human68k.  [ruby-dev:25121]
-
-Wed Dec  8 20:13:06 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* process.c (rb_spawn): support for DJGPP.
-
-	* lib/mkmf.rb (VPATH): specify the implicit path separator for DJGPP.
-
-Wed Dec  8 17:48:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): merge Guy Decoux's argument preserve
-	  patch in [ruby-core:03874].
-
-Wed Dec  8 17:37:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_pipe_exec): need to close original socket
-	  handle.
+	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
 
 Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
-
-Wed Dec  8 13:49:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_pipe_exec): must close original handle
-	  before exec. fixed: [ruby-dev:25112]
-
-Wed Dec  8 11:46:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (string_content): get rid of segfault at empty evstr.
-	  fixed: [ruby-dev:25113]
-
-Wed Dec  8 03:26:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_bio.c (ossl_obj2bio): should not use fptr->f.
-	  [ruby-dev:25101]
-
-Wed Dec  8 03:26:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb.
-
-Wed Dec  8 01:35:44 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (is_socket): reorder of function definitions.
-
-Wed Dec  8 00:44:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (pipe_open): win32 bidirectional pipe support.
-
-	* win32/win32.[ch] (rb_w32_pipe_exec): ditto.
-
-	* win32/win32.[ch] (socketpair): new function. POSIX socketpair
-	  emulation.
+	* io.c (io_fwrite): change dereference for cosmetic reason.
 
-	* win32/win32.c (socketpair_internal): ditto.
-
-Wed Dec  8 00:25:07 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_version.rb: added version check test.
-	  [ruby-dev:25053]
-
-Tue Dec  7 15:40:38 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fwrite): avoid context switch before writing to stderr.
-	  [ruby-dev:25080]
-
-	* rubyio.h: refine deprecated declaration.
-
-	* configure.in, file.c, io.c: remove useless check: fseeko, etc.
-
-Tue Dec  7 13:42:07 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
 
-	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
-	  longer.
+Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
 
-	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
-	  interface.
-
-	* win32/win32.[ch] (rb_w32_rmdir): new function.
+	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
 
 Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* process.c (proc_setgroups): [ruby-dev:25081]
 
-Mon Dec  6 23:07:57 2004  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in: check -lsocket for socketpair and shutdown.
-	  reported by Ville Mattila.  [ruby-core:03903]
-
-Mon Dec  6 23:00:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (ac_cv_sizeof_rlim_t): setup for DJGPP.
-
-	* io.c (is_socket, shutdown): define dummy macros for DJGPP.
-
-	* process.c: use SIZEOF_RLIM_T instead of HAVE_RLIM_T for DJGPP.
-
-Mon Dec  6 21:19:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (is_socket): fix typos. [ruby-core:03900]
-
-Mon Dec  6 20:13:28 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (is_socket): new function.
-
-	* io.c (rb_io_close_read, rb_io_close_write): use is_socket().
-
-	* io.c (rb_io_fptr_finalize): need to check fptr->f before calling
-	  rb_io_fptr_cleanup().
-
-	* io.c (pipe_open): win32 pipe support (experimental).
-
-	* win32/win32.[ch] (rb_w32_pipe_exec): return file descriptors
-	  instead of FILE structure objects.
-
-	* win32/win32.[ch] (rb_w32_is_socket): new function.
-
-Mon Dec  6 19:40:40 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* Makefile.in (.y.c): simplify the rule.
-
 Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
 
-Mon Dec  6 17:49:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (run_trap_eval): add prototype for Microsoft compiler.
-
-Mon Dec  6 17:32:38 2004  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
-	  ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
-	  Use own buffering mechanism instead of stdio.  [ruby-dev:25056]
-
-	* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
-	  EOF flag removed.
-
-Mon Dec  6 17:15:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/socket/test_socket.rb (TestBasicSocket#test_setsockopt):
-	  BasicSocket#setsockopt dumps core.  [ruby-dev:25039]
+	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
+	  (backported from CVS HEAD)  [ruby-dev:24993]
 
-	* test/socket/test_tcp.rb (TestTCPSocket#test_recvfrom):
-	  TCPSocket#recvfrom dumps core.  [ruby-dev:24705]
+Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
 
-	* test/socket/test_udp.rb (TestUDPSocket#test_connect):
-	  UDPSocket#connect dumps core.  [ruby-dev:25045]
-
-	* test/socket/test_udp.rb (TestUDPSocket#test_bind):
-	  UDPSocket#bind dumps core.  [ruby-dev:25057]
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
+	  Oops - 1.8 doesn't have String#clear
 
 Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (io_fread): take VALUE argument.
-
 	* ext/socket/socket.c (sock_connect): use rb_str_new4().
 	  [ruby-dev:25052]
 
-	* eval.c (rb_yield_0): [ruby-dev:25051]
-
-Mon Dec  6 01:32:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
 	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
@@ -35937,11 +14074,6 @@ Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/optparse.rb (OptionParser#order!): ignore case only for long
 	  option.  [ruby-dev:25048]
 
-Sun Dec  5 00:54:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* mkconfig.rb: setup library paths before requiring library.
-	  [ruby-core:03892]
-
 Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
@@ -35965,29 +14097,10 @@ Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
 	  is redefined.  [ruby-talk:122482]
 
-Sat Dec  4 21:29:05 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: (In previous commit) new method chown.
-
-	* lib/fileutils.rb: (In previous commit) new method chown_R.
+Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/fileutils.rb: (In previous commit) new method chmod_R
-	  wrongly added.  Removed now.
-
-Sat Dec  4 20:45:52 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mkdir, mkdir_p): should chmod explicitly.
-	  [ruby-core:03881]
-
-Sat Dec  4 18:54:09 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: removed empty lines from output.
-
-Sat Dec  4 18:49:09 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.1 -> 0.1.2
-
-	* lib/rss/rss.rb: #item=/#set_item and so on are obsolete.
+	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
+	  [ruby-core:03882]
 
 Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -36001,13 +14114,48 @@ Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
 	   The lines before :section: are removed, and identical lines at the end are
 	   also removed if present.
 
+Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
+
+	* test/readline/test_readline.rb: added tests for readline.
+	  (backported from CVS HEAD)
+
+Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf.c: add constant NKF::VERSION
+
+	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
+
+	* ext/nkf/test.rb(mime_out2): add --no-cp932
+
+	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+
 Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
 
-Fri Dec  3 12:25:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/ostruct.rb: 1.9 marshaling support back-ported.
+	  [ruby-core:03871]
+
+Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_invoke): copy arguments to frame.argv.
+	  [ruby-core:03861]
+
+Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.h: fix prototypes.
+
+Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (convert_type): use rb_respond_to() again.
+	  [ruby-dev:25021]
 
-	* st.h: fix prototype for C++.
+	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
+	  [ruby-dev:25021]
 
 Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -36027,25 +14175,6 @@ Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/demos-jp/widget: ditto.
 
-Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): prepare to pass a block from "call" method
-	  to a Proc generated by Method#to_proc.  [ruby-dev:25031]
-
-	* eval.c (rb_yield_0): actually passes a block given to "call".
-
-	* object.c (convert_type): use rb_respond_to() again.  this fix is
-	  based on [ruby-dev:25021]
-
-	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
-	  [ruby-dev:25021]
-
-Thu Dec  2 15:13:53 2004  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* test/xmlrpc/test_parser.rb, test/xmlrpc/data/*.expected: Expected
-	  values are now stored in YAML instead of using #inspect. This fixes
-	  false hash order.
-
 Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_file_initialize): [ruby-dev:25032]
@@ -36058,16 +14187,12 @@ Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
 	  signal contexts.  [ruby-dev:25022]
 
-Thu Dec  2 10:45:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/readline/test_readline.rb: fix for NetBSD.
-
 Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
 	  marshaled again.  [ruby-core:03862]
 
-Thu Dec  2 09:30:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
 
@@ -36077,56 +14202,35 @@ Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_ctl): [ruby-dev:25019]
 
-Wed Dec  1 06:13:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c: add constant NKF::VERSION
-
-	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
-
-	* ext/nkf/test.rb: add --no-cp932
-
-	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
-
 Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* signal.c (sighandler): call handler immediately only for default
 	  handlers.  [ruby-dev:25003]
 
-Tue Nov 30 23:49:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): errno should be preserved for rb_sys_fail() when
-	  fork failed.
-
-Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
 
-	* eval.c (rb_eval): should check previous frame for ZSUPER.
-
 	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]
+	  [ruby-dev:24996]  (backported from CVS HEAD)
 
 	* io.c (io_readpartial): ditto.
 
 	* io.c (io_read): ditto.
 
-Tue Nov 30 14:58:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* instruby.rb (install): add arguments explicitly to "super".
+	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
 
-Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (read_all): remove unnecessary rb_str_resize().
+	  [ruby-dev:24996]
 
-	* eval.c (PUSH_FRAME): flags should have been initialized.
+	* io.c (io_read): ditto.
 
-	* eval.c (rb_eval): [ruby-core:03856]
+Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
 
-Tue Nov 30 00:12:57 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regparse.c: now handles many alternatives (over 500000)
-	  in regexp. [ruby-dev:24773]
-
 Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_write): insufficiently filled string
@@ -36144,19 +14248,10 @@ Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
 	  not supported.
 
-Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): must not use FILE after fclose().
-	  [ruby-dev:24985]
-
-Mon Nov 29 13:13:13 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): push back the last space before next
-	  loop because CharNext() eats it.
-
 Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* object.c (convert_type): [ruby-core:03845]
+	* object.c (convert_type): direct call conversion methods for the
+	  performance.  [ruby-core:03845]
 
 	* eval.c (rb_funcall_rescue): new function.
 
@@ -36164,57 +14259,30 @@ Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_Integer): ditto.
 
-	* eval.c (get_backtrace): no conversion for nil.
-
 	* parse.y (reduce_nodes): empty body should return nil.
 
-Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_check_writable): call io_seek regardless of
-	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
-
-Sun Nov 28 15:57:58 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::Element#tag): not use block_given? for
-	  working with ruby 1.6 again.
+	* string.c (rb_str_aset): the original string should not be
+	  affected by modifying duplicated string.  [ruby-dev:24981]
 
-	* lib/rss/{0.9,2.0,trackback}.rb, lib/rss/maker/base.rb:
-	  undef -> remove_method for working with ruby 1.6 again.
+Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sun Nov 28 15:51:40 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::NotSetError): added.
-
-	* lib/rss/maker/{1.0,0.9,2.0}.rb: changed RSS Maker to raise
-	  RSS::NotSetError if required values of maker.channel are not
-	  set. [ruby-talk:120061]
-
-	* test/rss/test_maker_{1.0,0.9,2.0}.rb: changed tests to check RSS
-	  Maker raises or not.
-
-Sun Nov 28 12:14:47 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regparse.c (fetch_token): fixed test failure on HP-UX ia64
-	  ([ruby-dev:24859]).
-
-Sun Nov 28 12:08:15 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regparse.c, test/ruby/test_regexp.rb: fixed problem with UTF-8
-	  characters that have U+00FE or invalid characters.
+	* win32/win32.c (CreateChild): search executable file if no program
+	  name given. (backported from CVS HEAD)
 
-Sun Nov 28 12:07:04 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regexec.c, test/ruby/test_regexp.rb: fixed segmentation fault
-	  ([ruby-dev:24887]).
+	* io.c (fptr_finalize): must not use FILE after fclose().
+	  [ruby-dev:24985]
 
-Sun Nov 28 12:05:48 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* regcomp.c, regint.h: fixed PLATFORM_UNALIGNED_WORD_ACCESS
-	  problem ([ruby-dev:24802] and [ruby-core:3733])
+	* win32/win32.c (CreateChild): push back the last space before next
+	  loop because CharNext() eats it.
 
-Sat Nov 27 23:43:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
 
-	* io.c (rb_io_initialize): [ruby-dev:24972]
+	* io.c (rb_io_check_writable): call io_seek regardless of
+	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
 
 Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
 
@@ -36226,36 +14294,10 @@ Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
 	  (rb_io_fwrite): wrapper for io_fwrite now.
 	  (io_write): call io_fwrite instead of rb_io_fwrite.
 
-Sat Nov 27 17:43:21 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/{0.9,1.0,2.0,trackback,xml-stylesheet}.rb: added
-	  #setup_maker.
-
-	* test/rss/test_setup_maker_*.rb: added tests for #setup_maker.
-
-	* lib/rss/maker/base.rb(RSS::Maker::Items#max_size=): supported
-	  output item size limitation.
-
-	* sample/rss/blend.rb: added sample for RSS Maker.
-
-Sat Nov 27 17:41:35 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/0.9.rb: supported RSS::Maker.make("0.91"). Now,
-	  "0.9" is just alias of "0.91."
-
-	* test/rss/test_maker_0.9.rb: make("0.9") -> maker("0.91").
-
-	* test/rss/test_to_s.rb: ditto.
-
-Sat Nov 27 17:21:30 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/list_description.rb: untabified.
-
-	* sample/rss/rss_recent.rb: ditto.
-
 Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
 
-	* lib/cgi/session.rb (CGI::Session::initialize): [ruby-core:03832]
+	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
+	  now a instance method.  [ruby-core:03832]
 
 Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -36273,18 +14315,8 @@ Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
 
-Fri Nov 26 14:29:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_initialize): uninitialized fd was checked to see open
-	  mode.  [ruby-dev:24963]
-
-	* io.c (rb_io_initialize): uninitialized fd was used.  [ruby-dev:24962]
-
 Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (rb_io_initialize): should retrieve flags from copying file
-	  descriptor. [ruby-dev:24961]
-
 	* eval.c (method_missing): raise TypeError for classes do not
 	  have allocators.  [ruby-core:03752]
 
@@ -36306,17 +14338,12 @@ Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
 	  threads should be also processed.  [ruby-talk:121320]
 
-Thu Nov 25 18:06:37 2004  Tanaka Akira  <akr@m17n.org>
+Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: AC_CHECK_SIZEOF(rlim_t) to include stdio.h to fix
-	  problem with autoconf 2.52 or earlier.
-	  revert AC_PREREQ to 2.50.
-	  [ruby-core:3809]
+	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
 
 Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: AC_PREREQ(2.53) [ruby-core:03800]
-
 	* io.c (read_all): stringify non-nil buffer argument, and always
 	  taint the result.  [ruby-dev:24955]
 
@@ -36347,12 +14374,13 @@ Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_seek): use NUM2OFFT().
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): [ruby-core:03719]
+	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
+	  start with block keyword and underscore.  [ruby-core:03719]
 
 Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
-	  of variables or constants when parsing 'require'
+	  of variables or constants when oarsing 'require'
 
 Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -36362,7 +14390,7 @@ Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/README (et al): Add a new directive, :section:, and
-	  change the output format to accommodate. :section: allows to to
+	  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.
@@ -36377,25 +14405,9 @@ Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_splice): should place index wrapping after
 	  possible modification.  [ruby-dev:24940]
 
-Sat Nov 20 23:25:12 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* io.c (rb_io_getline): f.gets("") did not work. [ruby-core:03771]
-
-	* test/ruby/test_io.rb (test_gets_rs): test it.
-
-Sat Nov 20 22:55:09 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/runner.rb (CROSS_COMPILING): need to require rbconfig.rb before
-	  using CROSS_COMPILNG.
-
-Sat Nov 20 20:42:42 2004  Minero Aoki  <aamine@loveruby.net>
+Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/ripper/depend: fix ripper.o dependency.
-
-Sat Nov 20 17:48:29 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (io_reopen): work around problem with Cygwin fseeko
-	  returning ESPIPE.
+	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
 
 Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
@@ -36403,11 +14415,6 @@ Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/nkf/test.rb: add test for mime encode/decode
 
-Sat Nov 20 01:45:04 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/xmlrpc/test_webrick_server.rb: move `requrie "webrick/https"'
-	  into #setup_http_server method to avoid soap test errors.
-
 Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
 
 	* eval.c (error_print): nicer traceback at interrupt.
@@ -36418,66 +14425,6 @@ Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (str_gsub): internal buffer should not be listed by
 	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
 
-Fri Nov 19 22:44:43 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/test/unit/collector/dir.rb: better support for -p/-x option.
-
-Fri Nov 19 17:46:56 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values):
-	  changed /rss/channel/image to be optional. [ruby-Bugs:1047]
-
-	* test/rss/test_maker_0.9.rb: added tests for the above.
-
-Fri Nov 19 17:18:17 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.0 -> 0.1.1.
-
-	* lib/rss: #to_s used #tag.
-
-	* test/rss/test_to_s.rb: added.
-
-	* lib/rss/maker.rb (RSS::Maker.make): changed API. It's not
-	  received modules which is used as the second argument.
-
-	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#alternate):
-	  changed return value type which is not String but Boolean.
-
-	* lib/rss/2.0.rb (RSS::Rss::Channel#ttl): changed return value
-	  type which is not String but Integer.
-
-	* lib/rss/0.9.rb (RSS::Rss::Channel): <skipDays> has <day>s and
-	  <skipHours> has <hour>s.
-
-	* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Channel): ditto.
-
-	* lib/rss/0.9.rb (RSS::Rss::Channel::Item): <item> has <category>s.
-
-	* lib/rss/maker/2.0.rb (RSS::Maker::Rss20::Channel::Item): ditto.
-
-	* lib/rss/2.0.rb (RSS::Rss::Channel): <channel> has <category>s.
-
-	* lib/rss/maker/2.0.rb (RSS::Maker::RSS20::Channel): ditto.
-
-	* lib/rss/trackback.rb: parent element has <trackback:about>s.
-
-	* lib/rss/maker/trackback.rb: ditto.
-
-Fri Nov 19 11:10:16 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/test/unit/collector/dir.rb: add support for directory name
-	  with -p/-x options.
-
-	* test/testunit/collector/test_dir.rb: ditto.
-
-	* lib/xmlrpc/datetime.rb (XMLRPC::DateTime#==): should use Array()
-	  instead of to_a.
-
-Fri Nov 19 10:32:36 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_s_set_completion_append_character):
-	  accept nil.  [ruby-core:03765]
-
 Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
@@ -36489,37 +14436,12 @@ Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (str_gsub): internal buffer should not be listed by
 	  ObjectSpace.each_object().  [ruby-dev:24919]
 
-Thu Nov 18 23:42:36 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/depend: Never regenerate lib/ripper/core.rb
-	  automatically. [ruby-dev:24911]
-
-Thu Nov 18 20:47:24 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
-	  isatty because it never sets errno.
-
 Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* test/ruby/test_stringchar.rb (test_bang): added.
 
 	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
-	  (rb_str_swapcase_bang): missing rb_str_modify().
-
-Thu Nov 18 17:05:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_rest_arg): store rest args into invisible local variable
-	  in order to get rid of SEGV at ZSUPER.  [ruby-dev:24913]
-
-Thu Nov 18 15:39:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_f_getenv): prohibit for $SAFE=4. [ruby-dev:24908]
-
-Thu Nov 18 14:58:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: check $SAFE.
-
-	* test/readline/test_readline.rb: added tests for readline.
+	  (rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
 
 Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -36540,15 +14462,10 @@ Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
 	  well as IO.new does.  [ruby-dev:24896]
 
-Wed Nov 17 23:47:30 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
 
-Wed Nov 17 18:59:16 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* process.c (proc_getrlimit, proc_setrlimit): add rb_secure(2) to
-	  methods of Process.{getrlimit,setrlimit}
-
 Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
@@ -36558,65 +14475,28 @@ Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
 	  in nodes.
 
-Wed Nov 17 13:05:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_push_glob): fix overrun.  [ruby-dev:24886]
+Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Nov 17 11:48:17 2004  Michael Neumann  <mneumann@ruby-lang.org>
+	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
+	  before running test. [ruby-core:03756]
 
-	* lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assigning
-	  to constants" warnings
+Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Wed Nov 17 09:38:18 2004  Johan Holmberg  <holmberg@iar.se>
+	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
 
-	* re.c (rb_reg_initialize_m): should raise exception instead of
-	  compile error.  [ruby-core:03755]
+	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
 
 Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_splice): move rb_str_modify() after
 	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
 
-	* error.c (rb_error_frozen): now raise RuntimeError instead of
-	  TypeError.
-
-Tue Nov 16 21:22:47 2004  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/server.rb (CGIServer): fixed bug when client sends
-	  "Content-typ: text/xml; ..."
-
 Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (flo_divmod): protect float values from GC by
 	  assignment to local variables.  [ruby-dev:24873]
 
-Tue Nov 16 14:31:54 2004  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* test/xmlrpc/*: imported and refactored original test cases.
-
-	* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
-	  added test case that starts up a WEBrick XML-RPC server and performs
-	  some tests on it (both http and https servers are started).
-
-	* lib/xmlrpc/create.rb (XMLWriter::each_installed_writer),
-	  lib/xmlrpc/parser.rb (XMLParser::each_installed_parser):
-	  added methods to simply original test cases
-
-	* lib/xmlrpc/parser.rb, lib/xmlrpc/datetime.rb: applied patch by
-	  MoonWolf <moonwolf@moonwolf.com> to allow parsing datetime.iso8601
-	  (e.g. 20041105T01:15:23Z).
-
-	* lib/xmlrpc/server.rb: fixed issue #998
-	  (http://rubyforge.org/tracker/?func=detail&atid=1700&aid=998&group_id=426)
-
-	* lib/xmlrpc/create.rb, lib/xmlrpc/utils.rb: when marshalling/loading
-	  user-defined data structures, use Class#allocate instead of defining
-	  an empty #initialize method. module XMLRPC::Marshallable is now only
-	  used for tagging.
-
-	* lib/xmlrpc/.document, lib/xmlrpc/README.rdoc: added howto
-
-Tue Nov 16 16:26:12 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
 	  config.status to force updating them.
@@ -36626,15 +14506,6 @@ Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.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
 
-Tue Nov 16 13:35:54 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): add
-	  new option --exclude (-x) to skip some tests. [ruby-core:3363],
-	  [ruby-dev:24865]
-
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir.exclude):
-	  ditto.
-
 Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
@@ -36648,72 +14519,32 @@ Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* array.c (rb_ary_update): pedantic check to detect
 	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
 
-Mon Nov 15 18:58:05 2004  Tanaka Akira  <akr@m17n.org>
+Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* configure.in: check rlim_t more portably. [ruby-core:3735]
+	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
 
 Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
 	  operator symbols.  [ruby-talk:120177]
 
-Mon Nov 15 08:58:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_Proc): make proc as an alias to Proc.new.
-	  [ruby-dev:24848]
-
-Mon Nov 15 00:46:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): lambda{}.call(1) should raise exception.
-	  [ruby-talk:120253]
-
-Mon Nov 15 00:33:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_clear): avoid revealing NULL pointer.
-	  [ruby-dev:24766]
-
-	* string.c (str_gsub): add paranoid check. [ruby-dev:24827]
-
-	* string.c (str_mod_check): check frozen status as well.
-	  [ruby-dev:24801]
-
-Sun Nov 14 18:59:03 2004  Tanaka Akira  <akr@m17n.org>
-
-	* process.c (proc_getrlimit): new function for Process.getrlimit.
-	  (proc_setrlimit): new function for Process.setrlimit.
-	  [ruby-dev:24834]
-
-	* configure.in: check rlim_t and its size.  check setrlimit.
-
-	* ruby.h (NUM2ULL): new macro.
-
 Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
 	  prefixed to negative address.
 
-Sun Nov 14 10:48:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Integer::gcd2): faster implementation by
-	  <erlercw@siu.edu>. [ruby-talk:120232]
-
-Sun Nov 14 08:46:33 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@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]
 
-Fri Nov 12 17:32:07 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bcc32/README.bcc32, win32/README.win32: need bison instead of
-	  byacc.
-
-Fri Nov 12 15:15:06 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* eval.c (ruby_options): now we cannot call rb_glob() before
 	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
 
-	* win32/win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
+	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
 	  export it.
 
 Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -36727,15 +14558,21 @@ Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
 	  pointer.  [ruby-dev:24783]
 
-Thu Nov 11 17:58:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* dir.c (rb_glob): should have called rb_glob_caller().
-	  [ruby-dev:24773]
+	* dir.c (rb_globi): also should call back via rb_glob_caller().
+	  [ruby-dev:24775]
 
-Thu Nov 11 16:56:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
-	  only File#truncate, not behavior of seek(2).
+	  only File#truncate, not behaviour of seek(2).
+
+Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (push_braces): was confusing VALUE and char*.
+
+	* dir.c (rb_push_glob): Dir.glob should have called its block.
 
 Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -36749,10 +14586,6 @@ Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (DelegateClass::dup): ditto.
 
-Wed Nov 10 19:47:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): path is a string object now.
-
 Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* README.EXT (Example): extconf.rb is indispensable now.
@@ -36764,22 +14597,10 @@ Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
 
-Tue Nov  9 22:24:07 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf: original nkf.c rev:1.38
-
-	* ext/nkf/nkf.c: fix bug: can't parse long-name options
-
-	* ext/nkf/test.rb: fix bug: mime tests fail
-
 Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
 
-Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
 Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
@@ -36793,7 +14614,15 @@ Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
 
-Tue Nov  9 00:36:26 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* regex.c (slow_match): avoid GCC 3.4.x warnings.
+
+Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
+
+Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
 	  [ruby-dev:24743]
@@ -36824,14 +14653,13 @@ Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib: ditto.
 
-Sat Nov  6 20:40:16 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/win32ole/win32ole.c: rename WIN32OLE#ole_obj_help to
-	  WIN32OLE#ole_type. alias ole_obj_help to ole_type.
+	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
+	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
+	  ruby 1.9 feature)
 
-	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sat Nov  6 11:18:59 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb (_parse): checks whether zone was given.
 
@@ -36840,10 +14668,6 @@ Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
 	  locking.  [ruby-dev:24727]
 
-Fri Nov  5 19:07:16 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf: follow CVS Head of original nkf.
-
 Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
@@ -36870,43 +14694,23 @@ Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (gc_mark): stricter GC stack check.
 
+Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_mark): stricter GC stack check.
+
 Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
 	  [ruby-dev:24708]
 
-	* ext/socket/socket.c (s_recvfrom): buffer modification check.
-	  [ruby-dev:24708]
-
-Thu Nov  4 23:54:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regexec.c, regparse.c, regint.h: fixed conflicts between
-	  vendor branch.
-
-Thu Nov  4 23:41:55 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
-	  regenc.c, regenc.h, regerror.c, regexec.c, reggnu.c,
-	  regint.h, regparse.c, regparse.h, sjis.c, utf8.c:
-	  imported Oni Guruma 3.4.0.
-
-	* parse.y, re.c: Now mbclen() takes unsigned char as
-	  its argument.
-
 Thu Nov  4 21:25:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): string modify check no longer based on
 	  tmplock.  [ruby-dev:24706]
 
-Thu Nov  4 21:13:48 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(typelib_file_from_typelib): search "win16"
-	  entry to get library path.
-
-	* ext/win32ole/win32ole.c(oletypelib_path): ditto.
+Thu Nov  4 19:27:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c(ole_typedesc2val): add VT_LPWSTR, VT_LPSTR,
-	  VT_ERROR case.
+	* io.c (rb_f_open): fix typo.
 
 Thu Nov  4 15:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -36924,6 +14728,10 @@ Thu Nov  4 03:11:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
 	  [ruby-dev:24705]
 
+Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* process.c: On NetBSD don't use setruid() and setrgid().
+
 Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
 
 	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
@@ -36938,7 +14746,11 @@ Wed Nov  3 17:19:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_or): ditto.
 
-Wed Nov  3 17:02:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* io.c (pipe_open): fix compile error
+
+Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: support to use different Tcl commands between
 	  configure and configinfo
@@ -36954,55 +14766,33 @@ Wed Nov  3 17:02:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
 
-Wed Nov  3 15:38:28 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/*.rb: removed tab width configuration headers.
-
-	* test/rss/test_maker_{0.9,1.0}.rb: sort -> do_sort.
+Wed Nov  3 16:30:41 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rss/maker/*.rb: changed API to RSS version independence.
+	* ext/nkf: follow nkf 2.0.4
 
-	* lib/rss/maker/base.rb
-	  (RSS::Maker::XMLStyleSheets::XMLStyleSheet): checked required
-	  (pseudo) attributes.
+Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/rss/maker/base.rb (RSS::Maker::Items): sort -> do_sort.
+	* test/rss/test_maker_*.rb: added tests for RSS Maker.
 
-	* lib/rss/rss.rb (RSS::BaseModel.install_date_element): avoided
-	  warning.
+	* lib/rss/maker.rb: added RSS Maker.
 
-	* lib/rss/0.9.rb (RSS::Rss#textinput): added convenience method.
+	* lib/rss/maker/*.rb: ditto.
 
 Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
 	  internal consequent array.  [ruby-talk:118691]
 
-Tue Nov  2 14:54:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov  2 16:05:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (pipe_open): need to set cmd if argc == 0 (win32).
+	* process.c (rb_f_fork): need to flush stdout and stderr before
+	  fork(2).  [ruby-talk:117715]
 
 Tue Nov  2 01:20:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* io.c (pipe_open): IO.popen should take array as 1st argument for
-	  a command line.  [ruby-dev:24678]
-
 	* eval.c (proc_invoke): nail down dyna_var node when Proc object
 	  or continuation is created.  [ruby-dev:24671]
 
-	* io.c (rb_io_s_popen): do not expand argv array.  [ruby-dev:24670]
-
-Mon Nov  1 22:25:56 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/base.rb: changed xml-stylesheet's API of RSS Maker
-	  like to item's one.
-
-	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#guess_type): fixed
-	  regular expression bug.
-
-	* test/rss/test_maker_xml-stylesheet.rb: updated tests for
-	  xml-stylesheet.
-
 Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
@@ -37014,29 +14804,15 @@ Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* README.EXT, README.EXT.ja: remove MANIFEST stuff.
 
-Mon Nov  1 11:52:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662]
-
-Mon Nov  1 11:46:19 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* process.c (rb_f_exec): should check whether prog is NULL.
-
-Mon Nov  1 09:37:19 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker.rb: added entry point of RSS Maker.
+Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Mon Nov  1 03:14:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
 
-	* eval.c (rb_get_method_body): store ICLASS in the cache.
-	  [ruby-core:03672]
+Mon Nov  1 00:36:48 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* eval.c (rb_provided): should return true for loading library
-	  too for autoloading.  [ruby-core:03655]
+	* main.c (_stklen): move to gc.c.
 
-Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
+Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_locktmp): lock string temporarily.
 
@@ -37049,54 +14825,15 @@ Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (read_all): ditto.
 
-Sun Oct 31 23:37:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c: on NetBSD don't use setruid() and setrgid().
-
-Sun Oct 31 23:12:10 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/*.rb: added RSS Maker.
-
-	* test/rss/test_maker_*.rb: added tests for RSS Maker.
-
-Sun Oct 31 16:58:12 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE.codepage, WIN32OLE.codepage=.
-
-	* ext/win32ole/tests/testWIN32OLE.rb: ditto.
-
-Sun Oct 31 14:35:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: add "\075?UTF-8?Q?" for Gmail.
-
-Sun Oct 31 14:18:56 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: emit lexer-event values to the parser
-	  (still incomplete).
-
-Sat Oct 30 15:24:41 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB class. add
-	  WIN32OLE#ole_typelib method.
-
-	* ext/win32ole/tests/testOLETYPELIB.rb: add WIN32OLE_TYPELIB class.
-
 Sat Oct 30 06:53:24 2004  Peter Vanbroekhoven  <peter.vanbroekhoven@cs.kuleuven.ac.be>
 
 	* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
 
 Sat Oct 30 00:19:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_update): a[n,m]=nil no longer works as element
-	  deletion.
-
 	* enum.c (enum_sort_by): protect continuation jump in.
 	  [ruby-dev:24642]
 
-	* 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.
-
 Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_check_initialized): new function to check uninitialized
@@ -37104,26 +14841,6 @@ Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
 
-Fri Oct 29 19:05:33 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf: follow nkf2.0.
-
-Fri Oct 29 17:18:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (ripper_s_allocate): add prototype for Microsoft compiler.
-
-	* range.c (range_step, range_each): need cast.
-
-Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
-	  line after opening heredoc identifier.  [ruby-dev:24635]
-
-Fri Oct 29 11:35:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_parser_append_print, rb_parser_while_loop): body node
-	  can be empty.  [ruby-dev:24628]
-
 Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_thread_start_0): forget to free some memory chunks.
@@ -37138,20 +14855,32 @@ Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
 	  (argf_read): call argf_forward with argv argument.
 	  [ruby-dev:24624]
 
+Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
+
+	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
+	  z->input isn't nil.
+
+Thu Oct 28 23:19:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
+
+Wed Oct 27 18:49:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
+	  at this version.
+
+Wed Oct 27 17:27:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* gc.c (gc_sweep): recover ruby_in_compile variable.
+
 Wed Oct 27 09:17:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_gsub): use a string object for exception safeness.
 	  [ruby-dev:24601]
 
-Wed Oct 27 07:38:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Oct 26 23:52:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* node.h (NODE_TYPESHIFT): allow 4 more bits for line numbers.
-	  [ruby-talk:117841]
-
-	* ruby.h (FL_ABLE): nodes are not subject for flag operations.
-
-	* io.c (ARGF_FORWARD): should have specified argv explicitly,
-	  since we no longer have frame->argv saved.  [ruby-dev:24602]
+	* io.c (rb_io_getline): rs modification check should not interfere in the loop.
 
 Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -37173,6 +14902,16 @@ Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
 	  arguments, unless (digit)$ style used.
 
+Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
+
+	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
+	  performance.  [ruby-talk:117701]
+
+Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
+	  arguments, unless (digit)$ style used.
+
 Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* win32/win32.c (isUNCRoot): should check NUL after '.'.
@@ -37184,16 +14923,11 @@ Mon Oct 25 08:03:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (get_backtrace): ignore illegal backtrace.  [ruby-dev:24587]
 
-Sun Oct 24 00:40:50 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 24 00:41:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
 	  frozen shared string to avoid outside modification.  [ruby-dev:24580]
 
-Sat Oct 23 23:40:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_fptr_finalize): leave stdin/stdout/stderr open in
-	  interpreter termination.  [ruby-dev:24579]
-
 Sat Oct 23 22:18:32 2004  Guy Decoux  <ts@moulon.inra.fr>
 
 	* eval.c (frame_free): Guy Decoux solved the leak problem.
@@ -37237,10 +14971,6 @@ Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
 	  ensure to close @body. (http://bugs.debian.org/277520)
 
-Thu Oct 21 13:11:31 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (pipe_open): variable name "fpw" is conflicted.
-
 Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_alias): should warn on method discarding.
@@ -37249,21 +14979,11 @@ Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
 	  string buffer by clearing klass.  [ruby-dev:24548]
 
-	* parse.y (lex_getline): should not touch ruby_debug_lines if
-	  RIPPER is defined.  [ruby-dev:24547]
-
 Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
 
-Wed Oct 20 12:42:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline): rs modification check should not interfere
-	  in the loop.
-
-Wed Oct 20 10:31:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (lex_getline): should update ruby_debug_lines.
+	* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]
 
 Wed Oct 20 04:17:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -37285,23 +15005,13 @@ Wed Oct 20 01:37:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (ruby_exec): stack marking position may be higher than
 	  expected.  thanks to Guy Decoux.  [ruby-core:03527]
 
-Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (search_required): required name must not be changed before
-	  loading.  [ruby-dev:24492]
-
-Tue Oct 19 23:59:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_require_safe): provide the feature after loaded.
-	  [ruby-list:40085]
-
 Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
 
 	* 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 Oct 19 20:32:50 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Tue Oct 19 20:41:37 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole.c(ole_invoke): retrieve the result value when
 	  retrying the IDispatch::invoke.
@@ -37321,7 +15031,15 @@ Tue Oct 19 17:24:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
 	  buffer by clearing klass.  [ruby-dev:24510]
 
-Tue Oct 19 08:47:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 19 16:12:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/tkutil.c: backport from CVS HEAD
+
+Tue Oct 19 08:54:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, object.c (rb_class_inherited_p): export.
+
+Tue Oct 19 08:46:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_upto): method result must be checked.  [ruby-dev:24504]
 
@@ -37332,20 +15050,60 @@ Mon Oct 18 23:37:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* marshal.c (r_object0): check inheritance by the internal function.
 	  [ruby-dev:24515]
 
-Mon Oct 18 11:29:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file
-	  not existing is created.  [ruby-dev:24505]
+	* range.c (range_step, range_each): need cast.
+
+Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
+
+	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
+	  line after opening heredoc identifier.  [ruby-dev:24635]
 
 Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_truncate): discard read buffer before truncation.
 	  [ruby-dev:24197]
 
-Mon Oct 18 01:56:03 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Oct 18 02:11:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* 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/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/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
+	  search servlet correspond to the suffix of filename.
+
+	* lib/webrick/httprequest.rb: add attributes access methods: accept,
+	  accept_charset, accept_encoding, accept_language, content_length
+	  and content_type.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#initialize):
-	  initial value of accpet-* should be array.
+	* lib/webrick/httpresponse.rb: add attribute access methods:
+	  content_length, content_length=, content_type and content_type=.
+
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
+	  use the second suffix to detect media type. (the first suffix
+	  may be a language name.)
+
+	* 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.
+
+Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
+	  method to register virtual hosting servers.
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
+	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
+	  is set.  [ruby-core:02357]
 
 Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -37359,7 +15117,7 @@ Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
 
-Sun Oct 17 12:53:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Oct 17 13:05:04 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
 	* ext/win32ole/win32ole.c (fole_get_methods): ditto.
@@ -37382,21 +15140,6 @@ Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss: supported prety print.
 	* test/rss/test_1.0.rb: added test for calculating default indent size.
 
-Sat Oct 16 10:56:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): install-rb is needed for statically
-	  linked extensions.  [ruby-dev:24491]
-
-Fri Oct 15 18:07:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509store.c
-	  (ossl_x509stctx_initialize): setup OpenSSL::X509::StoreContext with
-	  ossl_x509stctx_* functions instead of X509_STORE_CTX_*.
-	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
-	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
-
-	* test/openssl/ossl_x509store.rb: test certificate validity times.
-
 Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
@@ -37407,60 +15150,13 @@ Fri Oct 15 12:43:09 2004  Tanaka Akira  <akr@m17n.org>
 	* eval.c (Init_stack): make prototype declaration consistent with
 	  the definition in gc.c.
 
-Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: added link to Tutorial.
-
-Tue Oct 12 21:22:50 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb:
-	  add WEBrick::Config::FileHandler[:AcceptableLanguages].
-
-	* 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/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
-	  search servlet correspond to the suffix of filename.
-
-	* lib/webrick/httprequest.rb: add attributes access methods: accept,
-	  accept_charset, accept_encoding, accept_language, content_length
-	  and content_type.
-
-	* lib/webrick/httpresponse.rb: add attribute access methods:
-	  content_length, content_length=, content_type and content_type=.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
-	  use the second suffix to detect media type. (the first suffix
-	  may be a language name.)
-
-	* 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.
-
-Tue Oct 12 15:05:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Oct 14 14:34:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
 
-Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
-	  avoid mode string modification.  [ruby-dev:24454]
-
-	* io.c (rb_io_getline_fast): should take delim as unsigned char to
-	  distinguish EOF and '\377'.  [ruby-dev:24460]
-
-	* io.c (rb_io_getline): add check for RS modification.
-	  [ruby-dev:24461]
-
-	* enum.c (enum_sort_by): use qsort() directly instead using
-	  rb_iterate().  [ruby-dev:24462]
+Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.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]
+	* lib/rss/rss.rb: added link to Tutorial.
 
 Mon Oct 11 13:48:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -37471,16 +15167,6 @@ Sun Oct 10 12:32:08 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
 	  to be used as a variable name
 
-Sun Oct 10 02:49:14 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/filter.rb: require ripper/tokenizer.
-
-	* ext/ripper/lib/ripper/filter.rb (parse): argument is optional.
-
-Sun Oct 10 02:43:13 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: \n between two comments disappeared.
-
 Sat Oct  9 21:23:37 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/converter.rb: changed to try to use Iconv for default
@@ -37493,19 +15179,6 @@ Sat Oct  9 19:50:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* io.c (rb_io_getline): should not treat char as negative value.
 	  [ruby-dev:24460]
 
-Sat Oct  9 00:25:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_fread): rb_thread_wait_fd() was lost.
-	  [ruby-dev:24457]
-
-Fri Oct  8 21:36:56 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (fu_traverse): return value of Dir.entries is
-	  reliable. (pass $SAFE=1)
-
-	* lib/fileutils.rb (remove_dir): return value of Dir.foreach is
-	  reliable. (pass $SAFE=1)
-
 Fri Oct  8 09:49:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): pointer modification check before each
@@ -37565,19 +15238,7 @@ Wed Oct  6 09:21:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
 
-Tue Oct  5 09:53:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_fopen): mode string copy at the lowest level.
-
-	* io.c (rb_io_flags_mode): requires output buffer no more.  no
-	  allocation needed.
-
-	* array.c (rb_ary_index): takes a block to compare items in an
-	  array.  [ruby-talk:113069] [Ruby2]
-
-	* array.c (rb_ary_rindex): ditto.
-
-Mon Oct  4 14:03:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct  4 14:04:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
 	  while GC.  [ruby-dev:24408]
@@ -37589,21 +15250,16 @@ Mon Oct  4 12:53:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: bug fix
 
-Sun Oct  3 21:16:05 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Oct  3 21:20:03 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
-	  version of Microsoft Exchange Server.
+	  version of Microsoft Exchange Server. (backported from HEAD)
 
 	* lib/net/imap.rb (RTEXT_REGEXP): ditto.
 
 	* lib/net/imap.rb (CTEXT_REGEXP): ditto.
 
-Sat Oct  2 20:34:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (local_vars): moved to struct parser_params.
-	  [ruby-dev:24391]
-
-	* parser.y (stmts): remove suspicious NODE_BEGIN.  [ruby-dev:24390]
+Sat Oct  2 20:34:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* node.h (NEW_DVAR): extra semicolon.
 
@@ -37625,6 +15281,9 @@ Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (specific_eval): defer pointer retrieval to prevent
 	  unsafe sourcefile string modification.  [ruby-dev:24382]
 
+	* eval.c (specific_eval): defer pointer retrieval to prevent
+	  unsafe sourcefile string modification.  [ruby-dev:24382]
+
 	* string.c (rb_str_sum): wrong cast caused wrong result.
 	  [ruby-dev:24385]
 
@@ -37636,6 +15295,24 @@ Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
 
+Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
+	  avoid mode string modification.  [ruby-dev:24454]
+
+	* io.c (rb_io_getline_fast): should take delim as unsigned char to
+	  distinguish EOF and '\377'.  [ruby-dev:24460]
+
+	* io.c (rb_io_getline): add check for RS modification.
+	  [ruby-dev:24461]
+
+	* enum.c (enum_sort_by): use qsort() directly instead using
+	  rb_iterate().  [ruby-dev:24462]
+
+	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
+	  prevent access to recycled object (via continuation for
+	  example).  [ruby-dev:24463]
+
 Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
@@ -37680,18 +15357,6 @@ Wed Sep 29 10:58:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* enum.c (sort_by_i): internally used object must not be changed
 	  outside.  [ruby-dev:24368]
 
-Mon Sep 27 21:25:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): invoke finalizers periodically.
-
-	* gc.c (gc_sweep): defer running finalizers.  [ruby-dev:24354]
-
-	* gc.c (rb_gc_finalize_deferred): run deferred finalizers.
-
-Mon Sep 27 15:01:59 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: missing ';'.
-
 Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
@@ -37701,34 +15366,9 @@ Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_delete): comparison may change the capacity.
-	  [ruby-dev:24348]
-
-	* array.c (rb_ary_fill): fill should honor length argument.
-	  [ruby-dev:24346]
-
-	* array.c (rb_ary_replace): should not use ptr from shared array.
-	  [ruby-dev:24345]
-
 	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
 	  [ruby-talk:113807]
 
-Sun Sep 26 08:05:10 2004  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: provides {Time,Date,DateTime}#to_{time,date,datetime}.
-
-	* sample/cal.rb: uses getoptlong instead of getopts.
-
-Sat Sep 25 18:39:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (flatten): element size might change during comparison.
-	  [ruby-dev:24343]
-
-Sat Sep 25 01:52:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_members): wrong call of struct_members.
-	  [ruby-dev:24333]
-
 Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
@@ -37736,11 +15376,6 @@ Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (rb_parser_append_print): should handle prelude.
-	  [llama@u01.gate0]
-
-	* parse.y (rb_parser_while_loop): ditto.
-
 	* array.c (rb_ary_subseq): original object might be modified after
 	  sharing data creation.  [ruby-dev:24327]
 
@@ -37751,22 +15386,6 @@ Fri Sep 24 08:29:45 2004  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]
 
-Thu Sep 23 19:48:14 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/Makefile.dev: removed.
-
-	* ext/ripper/ripper.rb.in: moved to lib/ripper/core.rb.in.
-
-	* ext/ripper/lib/ripper/core.rb: new file.
-
-	* ext/ripper/lib/ripper/core.rb.in: new file.
-
-	* ext/ripper/tools/generate-ripper_rb.rb: change comment.
-
-	* test/ripper/*.rb: on__scan event removed.
-
-	* test/ripper/*.rb: event name is changed: on__XXX -> on_XXX.
-
 Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_sub_bang): check if string is not modified
@@ -37775,50 +15394,23 @@ Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_rehash): replace st_foreach() by its deep
 	  checking counterpart.  [ruby-dev:24310]
 
-Wed Sep 22 14:21:54 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: on__scan event removed.
-
-	* parse.y [ripper]: event name is changed: on__XXX -> on_XXX.
-
-	* ext/ripper/eventids2.c: ditto.
-
-	* ext/ripper/ripper.rb.in: ditto.
-
-	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
-	* ext/ripper/lib/ripper/tokenizer: ditto.
-
-	* ext/ripper/lib/ripper/filter: new file.
-
-	* sample/ripper/colorize.rb: new file.
-
-	* sample/ripper/strip-comment.rb: new file.
-
-Wed Sep 22 13:50:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (hash_alloc): was using tbl pointer without
-	  initialization.
-
 Wed Sep 22 13:38:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_rehash): add iteration check.  [ruby-dev:24301]
 
 	* st.c (st_foreach): add deep check.
 
-	* hash.c (rb_hash_fetch): returns KeyError instead of IndexError.
+Wed Sep 22 13:06:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* hash.c (env_fetch): ditto.
+	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+	  merge from HEAD.
 
-Wed Sep 22 13:02:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
 
-	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+	* process.c: Add documentation for fork()
 
 Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y: remove global variables ruby_eval_tree and
-	  ruby_eval_tree_begin.
-
 	* array.c (rb_ary_collect_bang): element size might change during
 	  comparison.  [ruby-dev:24300]
 
@@ -37826,116 +15418,13 @@ Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
 
-Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
-
-	* process.c: Add documentation for fork()
-
 Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
+	* array.c (rb_ary_equal): merge miss.
+
 	* array.c (rb_ary_uniq_bang): element size might change during
 	  comparison.  [ruby-dev:24298]
 
-Mon Sep 20 17:46:51 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/tokenizer.rb: fix typo.
-
-Mon Sep 20 17:38:43 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/test_scanner_events.rb: tokens must be reordered.
-
-	* ext/ripper/lib/ripper/tokenizer.rb: ditto.
-
-Mon Sep 20 16:58:16 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: do not delay dispatching.
-
-	* ext/ripper/lib/ripper/tokenizer.rb: sort tokens by right order.
-
-Mon Sep 20 15:17:47 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/lib/ripper/tokenizer.rb: new file.
-
-Mon Sep 20 15:13:52 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/test_scanner_events.rb: test #lineno and #column.
-
-Mon Sep 20 14:50:17 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: delayed heredocument events should be
-	  dispatched after EOF.
-
-Mon Sep 20 14:39:42 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: adjust lineno and columns for multi-line
-	  strings.
-
-	* parse.y [ripper]: delay heredocument events until seeing
-	  end-of-line.
-
-	* parse.y [ripper]: event on__heredoc_contentn ->
-	  on__tstring_content.
-
-	* ext/ripper/eventids2.c: ditto.
-
-	* ext/ripper/lib/ripper.rb: sync with eventids2.c.
-
-	* test/ripper/test_scanner_events.rb: test it.
-
-	* ext/ripper/tools/generate-ripper_rb.rb: show basename of input.
-
-	* ext/ripper/Makefile.dev: support objdir build.
-
-Mon Sep 20 13:22:55 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: remove Ripper#pos.
-
-	* parse.y [ripper]: Ripper#column should return the column of the
-	  current token.
-
-Mon Sep 20 12:02:41 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: unify old_lex_p and token_head.
-
-	* test/ripper/test_scanner_events.rb: now \r\n is saved correctly.
-
-	* parse.y: new macro lex_goto_eol() for next change.
-
-Mon Sep 20 11:01:55 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: adjust line number for heredoc.  [ruby-dev:24272]
-
-Mon Sep 20 04:49:22 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/ripper.rb.in: new const Ripper::PARSER_EVENT_TABLE.
-
-	* ext/ripper/ripper.rb.in: new const Ripper::SCANNER_EVENT_TABLE.
-
-	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
-Mon Sep 20 04:13:00 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ripper/test_scanner_events.rb: test spaces before heredoc
-	  mark.
-
-Mon Sep 20 03:46:54 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: spaces before heredoc marker was lost.
-	  [ruby-dev:24272]
-
-	* keywords: rb_reserved_word() should be defined only in ruby
-	  core.  [ruby-dev:24272]
-
-	* lex.c: sync with keywords.
-
-	* ext/ripper/ripper.rb.in (parse): fix typo.
-
-	* ext/ripper/lib/ripper.rb: sync with ripper.rb.in.
-
-Mon Sep 20 03:37:59 2004  Tanaka Akira  <akr@m17n.org>
-
-	* ext/zlib/zlib.c (gzfile_read_raw): call readpartial at first.
-	  (Zlib::GzipReader#readpartial): new method.
-
 Mon Sep 20 00:24:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* enum.c (enum_sort_by): do not use qsort directly.  use
@@ -37977,23 +15466,15 @@ Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  direcotry or within block.  thanks to Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:03446]
 
-Fri Sep 17 20:29:33 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y: add prototypes for Microsoft compiler.
-
-	* ext/ripper/depend (parse.obj): lex.c exists at hdrdir.
+Fri Sep 17 20:20:27 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* {bcc32,win32,wince}/Makefile.sub (YACC, YFLAGS, parse.c):
-	  use bison.
+	* lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
 
 Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* array.c (rb_ary_delete): element comparison might change array
 	  size. [ruby-dev:24273]
 
-	* parse.y: make ruby parser reentrant. merge ripper parser to the
-	  real one.  this change makes ruby require bison.
-
 	* file.c (rb_file_truncate): clear stdio buffer before truncating
 	  the file.  [ruby-dev:24191]
 
@@ -38021,7 +15502,7 @@ Fri Sep 17 15:01:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkoptdb-safeTk.rb: ditto
 
-Thu Sep 16 18:12:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Sep 16 18:12:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
 	  to request.user attribute.
@@ -38050,44 +15531,6 @@ Tue Sep 14 23:45:44 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
 	  Add Eric Hodel's simpleformatter.
 
-Tue Sep 14 22:11:08 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: Add rdoc.
-
-Tue Sep 14 20:24:49 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y [ripper]: space event is on__sp, not on__lwsp.
-	  [ruby-dev:24257]
-
-	* ext/ripper/eventids2.c: ditto.
-
-	* ext/ripper/lib/ripper.rb: ditto.
-
-	* ext/ripper/depend (ripper.o): No action is needed.
-	  [ruby-dev:24260]
-
-	* ext/ripper/depend: Borland make does not accept pipes in
-	  Makefile rules. [ruby-dev:24589]
-
-	* ext/ripper/depend: separate rules for developpers.
-
-	* ext/ripper/Makefile.dev: new file.
-
-	* ext/ripper/MANIFEST: add Makefile.dev.
-
-	* ext/ripper/tools/generate-eventids1.rb: read from file, not
-	  stdin.
-
-	* ext/ripper/extconf.rb: clean ripper.E.
-
-	* ext/ripper/tools/generate-ripper_rb.rb: #include ids1/ids2
-	  function was lost.
-
-	* ext/ripper/tools/generate-ripper_rb.rb: SCANNER_EVENTS wrongly
-	  contained parser events.
-
-	* ext/ripper/lib/ripper.rb: ditto.
-
 Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: fix SEGV
@@ -38098,22 +15541,9 @@ Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/safe-tk.rb: new sample script
 
+Tue Sep 14 00:15:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Sep 13 21:33:40 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
-	  second argument to specify the output format (see also
-	   X509_NAME_print_ex).
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
-	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
-	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
-	  new module to provide the parse for RFC2253 DN format.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
-	  new method to parse RFC2253 DN format.
+	* ext/zlib/zlib.c: backported from HEAD.
 
 Mon Sep 13 19:16:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
@@ -38124,92 +15554,10 @@ Mon Sep 13 16:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
 	  safe-level value argument
 
-Mon Sep 13 10:48:37 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getpid): don't need to use _getpid() on
-	  mswin32 and mingw32.
-
-Mon Sep 13 10:22:05 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Sep 13 10:20:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* object.c (nil_inspect): fix typo.
 
-Mon Sep 13 09:29:58 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/depend: (nmake hack) prepend "./" to ripper.c to
-	  avoid {$(srcdir)}.
-
-Mon Sep 13 06:43:42 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper/tools/list-parse-event-ids.rb: does not use getopts.
-
-	* ext/ripper/tools/list-scan-event-ids.rb: ditto.
-
-Mon Sep 13 02:42:28 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/Setup: add ripper.
-
-	* ext/Setup.atheos: ditto.
-
-	* ext/Setup.dj: ditto.
-
-	* ext/Setup.emx: ditto.
-
-	* ext/Setup.nt: ditto.
-
-	* ext/Setup.x68: ditto.
-
-Mon Sep 13 02:26:31 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/ripper: ripper extention added.
-
-	* ext/ripper/MANIFEST: new file.
-
-	* ext/ripper/README: new file.
-
-	* ext/ripper/depend: new file.
-
-	* ext/ripper/extconf.rb: new file.
-
-	* ext/ripper/eventids2.c: new file.
-
-	* ext/ripper/ripper.rb.in: new file.
-
-	* ext/ripper/lib/ripper.rb: new file.
-
-	* ext/ripper/test/check-event-arity.rb: new file.
-
-	* ext/ripper/test/check-event-coverage.sh: new file.
-
-	* ext/ripper/test/check-scanner-event-coverage.rb: new file.
-
-	* ext/ripper/test/list-called-events.rb: new file.
-
-	* ext/ripper/test/src_rb: new file.
-
-	* ext/ripper/test/validate.rb: new file.
-
-	* ext/ripper/tools/generate-eventids1.rb: new file.
-
-	* ext/ripper/tools/generate-param-macros.rb: new file.
-
-	* ext/ripper/tools/generate-ripper_rb.rb: new file.
-
-	* ext/ripper/tools/list-parse-event-ids.rb: new file.
-
-	* ext/ripper/tools/list-scan-event-ids.rb: new file.
-
-	* ext/ripper/tools/preproc.rb: new file.
-
-	* ext/ripper/tools/strip.rb: new file.
-
-	* test/ripper: ripper tests added.
-
-	* test/ripper/dummyparser.rb: new file.
-
-	* test/ripper/test_parser_events.rb: new file.
-
-	* test/ripper/test_scanner_events.rb: new file.
-
 Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
@@ -38218,19 +15566,7 @@ Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/tkutil.c: fix(?) SEGV
 
-Mon Sep 13 00:22:53 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: fix file header.
-
-Mon Sep 13 00:20:39 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: ripper merged.
-
-	* lex.c: ditto.
-
-	* keywords: ditto.
-
-Sun Sep 12 23:53:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
 	  returns NULL.)
@@ -38262,25 +15598,11 @@ Sat Sep 11 16:09:46 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
 
-Fri Sep 10 20:18:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Sep 10 20:20:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
 	  pointer conversion.
 
-Fri Sep 10 19:16:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: bccwin32 port starts to use RTL dll.
-	  (need to rebuild all) [ruby-dev:24138]
-
-	* win32/win32.{h,c}: ditto.
-
-Fri Sep 10 15:55:59 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mkdir_p): should pass mode argument to
-	  Dir.mkdir. [ruby-dev:24242]
-
-	* test/fileutils/test_fileutils.rb: test it.
-
 Fri Sep 10 02:43:54 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/kilmer.rb: James Buck's
@@ -38322,16 +15644,9 @@ Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/socket/socket.c (ruby_connect): break immediately if a
 	  socket is non-blocking.  [ruby-talk:111654]
 
-Tue Sep  7 12:48:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
-
-	* win32/win32.[ch] (fcntl): ditto.
+Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* win32/win32.c (rb_w32_connect): support nonblocking mode.
-
-	* ext/socket/socket.c (wait_connectable, ruby_connect): support
-	  nonblocking connect on various platforms.
+	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
 
 Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -38339,10 +15654,6 @@ Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  exception occurred within a block.  a patch was given from Johan
 	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
 
-Mon Sep  6 10:57:40 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
-
 Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (cvar_cbase): singletons should refer outer cvar scope.
@@ -38376,20 +15687,18 @@ Fri Sep  3 02:12:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb (extmake): extact target prefix from Makefiles.
-
 	* ext/extmk.rb: already built-in libraries satisfy dependencies.
 	  [ruby-dev:24028]
 
-Wed Sep  1 21:16:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/tk/lib/tk/spinbox.rb: fix typo
+	* eval.c (rb_obj_instance_eval): backported from HEAD.
 
-Wed Sep  1 19:28:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* process.c (rb_proc_exec): label cannot precede variable declarations.
+	* ext/tk/lib/tk/spinbox.rb: fix typo
 
-Tue Aug 31 18:20:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Aug 31 18:24:04 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/tkutil.c (cbsubst_init): fix memory leak
 
@@ -38404,10 +15713,6 @@ Tue Aug 31 12:30:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (del_root): fix SEGV
 
-Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* object.c: Add RDoc for Module.included.
-
 Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
@@ -38417,10 +15722,19 @@ Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
 
+Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* object.c: Add RDoc for Module.included.
+
 Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
 
+Mon Aug 30 11:29:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
+	  merge from HEAD.
+
 Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
@@ -38432,49 +15746,27 @@ Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* bignum.c (rb_big_and): protect parameters from GC.
 	  [ruby-talk:110664]
 
-Fri Aug 27 12:13:50 2004  Tanaka Akira  <akr@m17n.org>
-
-	* ext/stringio/stringio.c (Init_stringio): add StringIO#readpartial as
-	  an alias for StringIO#sysread.
-
-Fri Aug 27 10:14:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_proc_exec): strip trailing spaces.  [ruby-dev:24143]
-
-	* win32/win32.c (CreateChild): ditto.
-
 Thu Aug 26 04:38:29 2004  Dave Thomas  <dave@pragprog.com>
 
 	* eval.c (return_jump): Minor typo in error message. Now reads
 	  "return can't jump across threads".
 
-Wed Aug 25 15:18:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_longjmp): Exception#to_str is no longer defined.
-
-Wed Aug 25 11:39:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (exc_equal): exceptions are equal if they share same
-	  class, message and backtrace. [ruby-talk:110354]
-
-	* error.c (name_err_mesg_equal): ditto.
-
-Tue Aug 24 16:41:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Aug 24 17:30:00 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
-	  use a session id as a filename.
+	  use a session id as a filename. (backported from HEAD)
 
 	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
 
 	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
-	  Dir::tmpdir.
+	  Dir::tmpdir. (backported from HEAD)
 
-Tue Aug 24 14:32:17 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Aug 24 14:40:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
-	  session id after check.
+	  session id after check. (backported from HEAD)
 
-Tue Aug 24 08:57:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
 	  functions may replace the pointer indicated by the first argument.
@@ -38483,12 +15775,7 @@ Tue Aug 24 08:57:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
 
-Mon Aug 23 12:43:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/resolv.rb (Config.default_config_hash): when multiple domains
-	  are set, Win32::Resolv.get_resolv_info returns Array.
-
-Sun Aug 22 16:27:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
 	  - should return an empty string if specified length to read is 0.
@@ -38504,7 +15791,12 @@ Sun Aug 22 16:27:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/buffering.rb: should not use select.
 
-Sun Aug 22 01:10:36 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Aug 23 12:40:56 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/resolv.rb (Config.default_config_hash): when multiple domains
+	  are set, Win32::Resolv.get_resolv_info returns Array.
+
+Sun Aug 22 01:15:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
 	  should call :ProxyContentHandler before finishing CONNECT.
@@ -38516,15 +15808,6 @@ Sat Aug 21 06:41:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
 	  uniformly.  [ruby-dev:24118]
 
-Fri Aug 20 14:49:42 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_check_writable): no need to check read buffer if
-	  already changed to write mode.
-
-Fri Aug 20 11:46:43 2004  UENO Katsuhiro  <katsu@blue.sky.or.jp>
-
-	* ext/zlib/zlib.c: GzipReader#ungetc caused crc error.
-
 Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
@@ -38538,15 +15821,17 @@ Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* dir.c (free_dir): fix memory leak.  reported by yamamoto
 	  madoka.
 
-Thu Aug 19 09:19:27 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
 
-	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
-	  library for SH* functions on mswin32 and mingw32.
+	* 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.
 
-	* wince/Makefile.sub (LIBS): need to link ceshell library for SH*
-	  functions on mswince.
+Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
 
-Thu Aug 19 03:07:00 2004  why the lucky stiff  <why@ruby-lang.org>
+	* 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.
 
 	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
 	  fixed problem with extra line feeds at end of folding, whitespace
@@ -38555,9 +15840,9 @@ Thu Aug 19 03:07:00 2004  why the lucky stiff  <why@ruby-lang.org>
 	* lib/yaml/rubytypes.rb: subtelties in handling strings with
 	  non-printable characters and odd whitespace patterns.
 
-Wed Aug 18 23:44:20 2004  Minero Aoki  <aamine@loveruby.net>
+Wed Aug 18 23:41:33 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSLSocket has its own
+	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
 	  buffer, select(2) might not work. [ruby-dev:24072]
 
 Wed Aug 18 17:10:12 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
@@ -38570,17 +15855,6 @@ Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_obj_instance_eval): evaluates under special singleton
 	  classes as for special constants.
 
-Wed Aug 18 11:22:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (init_env): initialize HOME and USER environment
-	  variables unless set.
-
-Wed Aug 18 10:17:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (bind_eval): new method. [RCR 251]
-
-	* string.c (rb_str_clear): new method. [ruby-dev:24104]
-
 Tue Aug 17 17:20:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
@@ -38591,19 +15865,23 @@ Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
 	  parsing so RDoc::usage plays better with OptionParser.
 
+Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+
+	* lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
+	  root.
+
+	* lib/fileutils.rb: new option mv :force.
+
+	* lib/fileutils.rb: new module FileUtils::DryRun.
+
 Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/usage.rb: Added. Allows command line programs
 	  to report usage using their initial RDoc comment.
 
-Sat Aug 14 01:25:48 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* 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.
-
-Fri Aug 13 12:55:20 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
 	  fix regex for range-spec.
@@ -38612,44 +15890,15 @@ Fri Aug 13 12:55:20 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
 	  multipart/byteranges response was broken.
 
-	* lib/xmlrpc/server.rb: refine example code.
-
-Thu Aug 12 10:54:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubyio.h (rb_eof_error): should mark as NORETURN.
-
-	* win32/win32.c (make_cmdvector): adjust escaped successive
-	  double-quote handling.
-
-Thu Aug 12 01:53:10 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (read_buffered_data): extracted from rb_io_fread.
-	  (io_readpartial): new method IO#readpartial.
-	  [ruby-dev:24055]
-
-Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
-
-Mon Aug  9 15:03:20 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
 	* lib/webrick/httpservlet/erbhandler.rb
 	  (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
 	  by suffix of script filename.
 
-Mon Aug  9 12:51:43 2004  Dave Thomas  <dave@pragprog.com>
-
-	* dir.c (dir_s_glob): Roll in Austin Ziegler's Dir.glob and
-	  fnmatch updates.
-
-Mon Aug  9 06:33:06 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (cp_r): copies symlink to symlink, except
-	  root entries of cp_r.
+	* lib/xmlrpc/server.rb: refine example code.
 
-	* lib/fileutils.rb: new method FileUtils.copy_entry.
+Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* test/fileutils/test_fileutils.rb: more cp_r tests.
+	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
 
 Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
 
@@ -38661,38 +15910,21 @@ Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
 	  collections.  plain scalars are trimmed if indentation follows in
 	  an ambiguous flow collection.
 
-Sat Aug  7 03:08:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_daemon): new method.  should be modified for
-	  platforms without /dev/null.
-
 Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
 
-Wed Aug  4 13:26:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_bytes0): optimize out read(0). [ruby-talk:108276]
-
-Tue Aug  3 13:49:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Aug  3 13:49:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/namespace.rb: bug fix
 
 	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
 
-Mon Aug  2 23:33:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_file.rb (test_fnmatch): added more tests.
-
 Mon Aug  2 18:04:21 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* 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.)
 
-Mon Aug  2 17:40:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (blk_free): fixed serious memory leak. [ruby-dev:24013]
-
 Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
@@ -38703,21 +15935,15 @@ Mon Aug  2 11:48:29 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
 	  variable names to support SWIG generated files (Hans Fugal)
 
-Sat Jul 31 23:08:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): stupid mistakes fixed. [ruby-dev:24006]
-
-Sat Jul 31 17:39:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 31 17:40:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* 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.
 
-Sat Jul 31 13:37:51 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
 
-	* eval.c (is_defined): avoid unnecessary method invocations.
-
-Sat Jul 31 05:35:37 2004  why the lucky stiff  <why@ruby-lang.org>
+	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
 
 	* lib/yaml/rubytypes.rb: exceptions were using an older
 	  YAML.object_maker. [ruby-core:03080]
@@ -38726,10 +15952,9 @@ Sat Jul 31 05:35:37 2004  why the lucky stiff  <why@ruby-lang.org>
 	  handline CR-LFs.  "\000" was showing up on folded blocks which
 	  stopped at EOF.
 
-Sat Jul 31 01:25:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): call is_defined() before invoking
-	  rb_eval().  [ruby-talk:107867]
+	* ext/syck/token.c: re2c compiled with bit vectors now.
+	* ext/syck/implicit.c: ditto.
+	* ext/syck/bytecode.c: ditto.
 
 Fri Jul 30 16:10:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -38747,26 +15972,8 @@ Wed Jul 28 18:59:17 2004  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.
 
-Wed Jul 28 15:44:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): should call rb_call_super() directly for
-	  visibility overriding.  [ruby-dev:23989]
-
 Wed Jul 28 01:04:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* env.h: remove argv from ruby_frame.
-
-	* eval.c (rb_eval): no more copy on write.
-
-	* eval.c (assign): ditto.
-
-	* eval.c (rb_call0): can receive *rest by specifying negative
-	  argc.  (-1 means 0 arg and *rest, -2 means 1 arg and *rest...)
-
-	* eval.c (rb_call0): properly set frame's argc counter.
-
-	* gc.c (rb_gc_mark_frame): need not to mark frame's argv
-
 	* gc.c (run_final): wrong order of data. [ruby-dev:23984]
 
 Tue Jul 27 07:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -38787,13 +15994,11 @@ Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
 	  escape space.
 
-Sun Jul 25 10:56:28 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Jul 25 11:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
-	* test/drb/drbtest.rb: fix method duplication.
-
 Sat Jul 24 13:32:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* range.c (rb_range_beg_len): returns Qnil only when "beg" points
@@ -38804,24 +16009,37 @@ Fri Jul 23 16:40:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* gc.c (define_final): should not disclose NODE* to Ruby world.
 	  [ruby-dev:23957]
 
-Fri Jul 23 08:52:22 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Jul 23 09:03:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/net/imap.rb (disconnected?): new method.
+	* lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
 
 Thu Jul 22 16:41:54 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
-	  permission of the session data file to 0600.
+	 permission of the session data file to 0600.
 
 	* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
 	  ditto.
 
-Mon Jul 19 00:53:46 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jul 22 00:02:21 2004  Masahiro Kitajima  <katonbo@katontech.com>
+
+	* process.c (rb_f_system): not need to call last_status_set() any
+	  longer on _WIN32.
+
+Tue Jul 20 09:15:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
+
+Mon Jul 19 01:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpservlet/cgihandler.rb
 	  (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
 	  variable to CGI process on Windows native platforms. [ruby-dev:23936]
 
+	* lib/webrick/httpservlet/cgihandler.rb
+	  (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
+	  refine log message.
+
 Sun Jul 18 16:14:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
@@ -38831,19 +16049,18 @@ Sun Jul 18 08:13:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_f_sprintf): remove extra sign digit.
 
-Sun Jul 18 03:19:14 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (bracket): use NULL instead of 0.
+Sun Jul 18 03:21:42 2004  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jul 18 02:35:30 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* dir.c (range): use NULL instead of 0.
 
-	* lib/net/imap.rb (receive_responses): return if a LOGOUT response
-	  received.
+	* dir.c (range): get rid of a gcc 3.4 warning.
 
-Sat Jul 17 23:59:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Jul 18 03:12:11 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
+	* 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.
+	  requests before sending octet data of literals. (backported from HEAD)
 
 Sat Jul 17 23:54:59 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -38857,14 +16074,6 @@ Sat Jul 17 18:29:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt): not to show same error messages twice.
 
-Sat Jul 17 14:18:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_match_m): String#match should also take
-	  optional argument.  [ruby-core:03205]
-
-	* re.c (rb_reg_match_m): add optional second argugment "pos" to
-	  specify match start point.  [ruby-core:03203]
-
 Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
@@ -38872,7 +16081,7 @@ Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Jul 17 05:26:27 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/diagram.rb: Incorporate Micheal Neumann's
+	* lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
 	  client-side imagemao patch
 
 Sat Jul 17 01:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -38885,6 +16094,24 @@ Fri Jul 16 22:30:28 2004  Michael Neumann  <mneumann@ntecs.de>
 	* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
 	  #dev_minor. [ruby-core:03195]
 
+Fri Jul 16 15:23:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (return_jump, break_jump): raise unexpceted local jump
+	  exception directly.  [ruby-dev:23740]
+
+	* lib/base64.rb (Deprecated): super in bound method calls original
+	  name method in stable version.  [ruby-dev:23916]
+
+Fri Jul 16 11:31:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
+	  garbage (patch from akira yamada) [ruby-dev:23911]
+
+Fri Jul 16 11:20:00 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
+	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
+
 Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
@@ -38904,19 +16131,13 @@ Thu Jul 15 23:53:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 Thu Jul 15 22:59:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* ext/readline/extconf.rb: added dir_config for curses, ncurses,
-	  termcap.
-
-Thu Jul 15 20:44:46 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	  termcap. (backported from HEAD)
 
-	* class.c: rdoc patch
+Thu Jul 15 20:29:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Thu Jul 15 14:12:34 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
-
-	* ext/syck/token.c: re2c compiled with bit vectors now.
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+	* 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)
 
 Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
@@ -38942,13 +16163,7 @@ Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
 
-
-Wed Jul 14 23:49:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_min_by): new method Enum#min_by.  added Enum#max_by
-	  as well.
-
-Wed Jul 14 18:05:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
 	  argument. [ruby-dev:23891]
@@ -38956,14 +16171,14 @@ Wed Jul 14 18:05:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/openssl/test_x509store.rb: prune tests for CRL checking
 	  unless X509::V_FLAG_CRL_CHECK is defined.
 
-Wed Jul 14 12:20:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* 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]
 
 	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
 
-Wed Jul 14 00:33:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c: rdoc patch. merged patch from Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:3170]
@@ -38978,7 +16193,7 @@ Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
 
 	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
 
-Tue Jul 13 15:48:56 2004  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
 	   extmk mode.
@@ -38990,14 +16205,14 @@ Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
 
-Mon Jul 12 21:20:51 2004  Dave Thomas  <dave@pragprog.com>
+Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
 
 	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
 	  as well as stuff[xxx]
 
 Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* test/soap/marshal/test_struct.rb: use qualified built-in class name
+	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
 	  (::Struct) to avoid name crash.
 
 Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
@@ -39012,7 +16227,7 @@ Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	  function of Tk::ValidateConfigure to define validatecommand
 	  methods easier
 
-Fri Jul  9 22:18:59 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jul  9 22:36:36 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
 	  <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
@@ -39032,33 +16247,36 @@ Fri Jul  9 14:28:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Fri Jul  9 01:47:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* 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
+	* 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]
 
-Thu Jul  8 19:27:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in (rb_cv_stack_end_address): detect stack end address
-	  variable supplied by system.  [ruby-core:03115]
-
-	* gc.c (Init_stack): use system provided address if possible.
+	* 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.
 
 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 02:31:41 2004  Kouhei Sutou  <kou@cozmixng.org>
+Wed Jul  7 15:53:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* 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.
+	* 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>
 
@@ -39067,7 +16285,7 @@ Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Tue Jul  6 18:38:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib: improve framework of developping Tcl/Tk extension
+	* ext/tk/lib : improve framework of developping Tcl/Tk extension
 	  wrappers
 
 Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
@@ -39086,7 +16304,7 @@ 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:20:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+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)
@@ -39096,10 +16314,12 @@ Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb: added copyright header.
 
-Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* added files:
-	  * lib/soap/header/*
+	* 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
@@ -39113,29 +16333,36 @@ Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * lib/wsdl/xmlSchema/enumeration.rb
 	  * lib/wsdl/xmlSchema/simpleRestriction.rb
 	  * lib/wsdl/xmlSchema/simpleType.rb
-	  * lib/xsd/codegen/*
+	  * lib/xsd/codegen
 	  * lib/xsd/codegen.rb
-	  * sample/soap/authheader/*
-	  * sample/soap/raa2.4/*
-	  * sample/soap/ssl/*
-	  * sample/soap/swa/*
+	  * sample/soap/authheader
+	  * sample/soap/raa2.4
+	  * sample/soap/ssl
+	  * sample/soap/swa
 	  * sample/soap/whois.rb
-	  * sample/wsdl/raa2.4/*
-	  * test/soap/header/*
-	  * test/soap/ssl/*
-	  * test/soap/struct/*
-	  * test/soap/swa/*
-	  * test/soap/wsdlDriver/*
+	  * 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/simpletype
 	  * test/wsdl/test_multiplefault.rb
 
-	* modified files:
+	* 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
@@ -39150,6 +16377,7 @@ Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * 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
@@ -39166,12 +16394,26 @@ Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  * 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.
@@ -39186,33 +16428,34 @@ Sat Jul  3 22:25:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	  * 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 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jul  1 23:15:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tcltklib: bug fix
+	* lib/pstore.rb (transaction): safer backup scheme.  [ruby-list:39102]
 
-	* ext/tk/lib/tk: bug fix and add Tcl/Tk extension support libraries
+	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
+	  [ruby-dev:23157]
 
-Thu Jul  1 18:31:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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]
 
-Thu Jul  1 00:44:42 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/yaml/store.rb: follow lib/pstore.rb's change.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
-	  re-implemnt (the arguments for this method is ).
+Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
-	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+	* ext/tk/lib/tcltklib : bug fix
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
-	  OpenSSL::Cipher::Cipher#key_len=.
+	* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
 
-Wed Jun 30 19:48:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
 	  EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
@@ -39224,17 +16467,23 @@ Wed Jun 30 19:48:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
 	  OpenSSL 0.9.6.
 
+	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
+	  re-implemnt (the arguments for this method is ).
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
+	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+
 	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
-	  ossl_cipher_copy, ossl_cipher_reset, ossl_cipher_encrypt,
-	  ossl_cipher_decrypt, 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.
+	  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.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_padding): check for
-	  EVP_CIPHER_CTX_set_padding.
+	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
+	  OpenSSL::Cipher::Cipher#key_len=.
 
-	* ext/openssl/ossl_cipher.c (Init_ossl_cipher): Cipher#<< is deprecated.
+	* ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
+	  finction; print warning for Cipher#<<.
 
 	* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
 	  EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
@@ -39252,16 +16501,50 @@ Wed Jun 30 19:48:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
 	  test/openssl/test_hmac.rb: new file.
 
-Wed Jun 30 16:59:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jul  1 04:08:30 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* test/ruby/test_file.rb (test_fnmatch): some tests for File.fnmatch
-	  are added.
+	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
+	  workaround for the versions earlier than OpenSSL-0.9.7.
+
+Thu Jul  1 03:33:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
+	  empty pkey object if no argument is passed. [ruby-talk:103328]
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+
+	* 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=.
+
+	* 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=.
+
+Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
+	  to specify a string to be written.
+
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
+	  take optional second argument to specify a string to be written.
+
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
+	  refine regexp for end-of-line.
+
+	* ext/opnessl/lib/openssl/ssl.rb
+	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
 
 Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
 
 	* parse.y (primary): should not be NULL.  [ruby-core:03098]
 
-Wed Jun 30 02:41:10 2004  why the lucky stiff  <why@ruby-lang.org>
+Wed Jun 30 02:53:24 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
 	  Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
@@ -39281,107 +16564,80 @@ Mon Jun 28 14:57:56 2004  Jeff Mitchell  <quixoticsycophant@yahoo.com>
 	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
 	  DOSISH compilers.  [ruby-core:03107]
 
-Mon Jun 28 00:35:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Jun 28 00:30:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
 
-Sun Jun 27 22:36:47 2004  Kouhei Sutou  <kou@cozmixng.org>
+Sun Jun 27 22:39:51 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
 
-Sat Jun 26 15:17:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 27 12:19:46 2004  Kouhei Sutou  <kou@cozmixng.org>
 
-	* variable.c (rb_mod_class_variables): class variables are no longer
-	  inherited.  [ruby-dev:23808]
+	* {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
 
-Sat Jun 26 11:07:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): -b must come at the start of the command line,
 	  and -e must not appear while testing libraries.  [ruby-talk:104501]
 
-	* lib/mkmf.rb (find_header, dir_config): quote directory names if
-	  necessary.  [ruby-talk:104505]
+	* lib/mkmf.rb (dir_config): quote directory names if necessary.
+	  [ruby-talk:104505]
 
-Sat Jun 26 00:13:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_fopen, rb_fdopen, rb_io_reopen): setvbuf() may return
-	  positive value on failure.  [ruby-dev:23792]
+	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
 
-Fri Jun 25 18:07:15 2004  Michal Rokos  <michal@ruby-lang.org>
+	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
 
-	* gc.c: bring back _stklen for DJGPP [ruby-core:3084]
+Fri Jun 25 08:31:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-Fri Jun 25 15:33:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (rb_thread_atfork): remove "fork terminates thread"
+	  warning.  [ruby-dev:23768]
 
-	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
+	* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
+	  [ruby-core:02786][ruby-core:03067]
 
-Fri Jun 25 01:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
+	  should give us packed address, not struct sockaddr.
+	  [ruby-core:03053]
+
+Fri Jun 25 02:04:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
-	  including version.h. [ruby-talk:104456]
+	  including version.h. [ruby-talk:104456] (backported from HEAD)
 
 Thu Jun 24 14:23:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_fread): return already read data when system call is
 	  interrupted.  [ruby-talk:97206]
 
-Thu Jun 24 01:25:21 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Jun 24 01:32:43 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* version.h: added declarations of ruby_version,
 	  ruby_release_date, ruby_platform.
+	  (backported from HEAD)
 
-Thu Jun 24 01:07:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
-	  should give us packed address, not struct sockaddr.
-	  [ruby-core:03053]
-
-Wed Jun 23 22:19:10 2004  Dave Thomas  <dave@pragprog.com>
+Wed Jun 23 22:23:37 2004  Dave Thomas  <dave@pragprog.com>
 
 	* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
 	  with OS X not returning 'from' parameter to recvfrom for
 	  connection-oriented sockets.
 
-Wed Jun 23 22:16:16 2004  Michal Rokos  <michal@ruby-lang.org>
-
-	* io.c: io_seek()'s retval should be checked [ruby-core:03045]
-
-Wed Jun 23 21:48:27 2004  Michal Rokos  <michal@ruby-lang.org>
-
-	* time.c: Fix indentation.
-
-	* main.c: Remove _stklen, and _CRT_glob. Move _stacksize for
-	  __human68k__ to gc.c where the others are.
-
-	* gc.c: put _stacksize in place and clean the #ifdefs macros.
-
-Wed Jun 23 17:37:54 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: added new option --ssl.
-
 Wed Jun 23 01:45:27 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
 	  Fix problem with the 'r' being dropped from %r{xxx}
 
-Wed Jun 23 00:10:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun 23 00:20:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
 	  CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
 
 Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (return_jump, break_jump): raise unexpected local jump
-	  exception directly.  [ruby-dev:23740]
-
 	* io.c (rb_io_initialize): should check fcntl result.  [ruby-dev:23742]
 
-Tue Jun 22 23:35:43 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): support FZERO and FSPACE with NaN/Inf.
-
-	* test/ruby/test_sprintf.rb (test_nan, test_inf): add tests.
-
 Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
@@ -39392,56 +16648,21 @@ Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
 	  before CR.
 
-Tue Jun 22 19:24:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): unify output of NaN, Inf and -Inf with
-	  "%f" or etc on all platform. [ruby-dev:23704], [ruby-dev:23747]
-
-Tue Jun 22 15:28:12 2004  Michal Rokos  <michal@ruby-lang.org>
+Tue Jun 22 16:47:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* compar.c: Remove explicit NIL_P() checks since rb_cmpint() does it
-	  again in the exactly same manner.
-
-Tue Jun 22 01:32:40 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
-	  empty pkey object if no argument is passed. [ruby-talk:103328]
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
-
-	* 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=.
-
-	* 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=.
-
-Mon Jun 21 09:24:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_opendir): should set errno if error occurs
-	  when calling OS API.
+	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
+	  Thanks, Rutger Nijlunsing.
 
-Sun Jun 20 21:12:54 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Jun 21 10:19:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/net/ftp.rb (binary=): send TYPE commands only once.
+	* win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
+	  FindClose() instead of _findfirst()/_findnext()/_findclose().
+	  merge from HEAD.
 
-Sat Jun 19 13:27:01 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 19 13:24:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (method_call): allow changing $SAFE.  [ruby-dev:23713]
 
-	* eval.c (proc_set_safe_level, proc_invoke, rb_mod_define_method): not
-	  set $SAFE for methods defined from Proc.  [ruby-dev:23697]
-
-Sat Jun 19 01:10:12 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin/rss-recent.rb: added more information.
-
 Fri Jun 18 23:12:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
@@ -39452,27 +16673,10 @@ Wed Jun 16 23:05:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* object.c (rb_mod_freeze): prepare string representation before
 	  freezing. [ruby-talk:103646]
 
-Wed Jun 16 19:57:24 2004  Michal Rokos  <michal@ruby-lang.org>
-
-	* test/ruby/test_array.rb: extend testcase to check #first, #last,
-	  #shift, #unshift, #pop, #push
+Wed Jun 16 16:04:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 16 16:05:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (ary_new): move alloc behind checks.  [ruby-core:02982]
-
-	* array.c (rb_ary_pop_m, rb_ary_shift_m): take arg to behave as push
-	  and unshift.
-
-	* array.c (rb_ary_first, rb_ary_last): make shared array for result
-	  array, and correct doc for Array#first(n) and Array#last(n)
-
-	* array.c (rb_ary_select): not accept any arg.
-
-Wed Jun 16 16:03:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_inherited_p): singleton class inherits Class
-	  rather than its object's class.  [ruby-dev:23690]
+	* object.c (rb_mod_le): singleton class inherits Class rather than its
+	  object's class.  [ruby-dev:23690]
 
 Wed Jun 16 16:01:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -39507,36 +16711,31 @@ Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
 
-Sat Jun 12 14:15:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c: RDOC for File::FNM_CASEFOLD was missed.
-
 Sat Jun 12 11:15:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in (target_os): strip -gnu suffix on Linux.
 
-Fri Jun 11 22:08:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 11 17:08:21 2004  Akinori MUSHA  <knu@iDaemons.org>
 
-	* array.c: remove #indexes, #indices.
+	* config.guess: Restore a wrongly removed hyphen.
 
-	* hash.c: ditto.
+Fri Jun 11 14:30:08 2004  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/dbm/dbm.c: remove #indexes, #indices, "values_at" warning
-	  from #select.
+	* config.guess: Attempt to avoid system name change on
+	  Darwin platforms also.
 
-	* ext/gdbm/gdbm.c: ditto.
+Fri Jun 11 14:22:45 2004  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/sdbm/init.c: ditto.
-
-	* ext/dbm/dbm.c (Init_dbm): set VERSION constant as "unknown" when
-	  DB_VERSION_STRING is not available.
+	* 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.
 
 Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
 	  [ruby-talk:103062]
 
-Wed Jun  9 16:09:01 2004  akira yamada  <akira@ruby-lang.org>
+Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic::merge,
 	  URI::Generic::route_from): accepts non-hierarchical URI.
@@ -39545,18 +16744,12 @@ Wed Jun  9 16:09:01 2004  akira yamada  <akira@ruby-lang.org>
 	* test/uri/test_generic.rb (TestGeneric::test_route,
 	  TestGeneric::test_merge): added tests for above changes.
 
-Wed Jun  9 15:39:55 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Add support for DragonFly BSD.
-
-Wed Jun  9 15:07:06 2004  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jun  9 17:39:37 2004  Akinori MUSHA  <knu@iDaemons.org>
 
 	* config.guess, config.sub: Update to a more recent version as of
 	  2004-01-20.
 
-Wed Jun  9 11:20:05 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c: remove unused functions and variables.
+	* configure.in: Add support for DragonFly BSD.
 
 Wed Jun  2 20:16:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -39574,43 +16767,82 @@ Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
 
-Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
+Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* lib/pathname.rb (Pathname#initialize): fix pathname initialization
-	  by pathname.
-
-Thu May 27 20:02:09 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/logger.rb: leading 0 padding of timestamp usec part.
 
-	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+	* 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']]
 
-Thu May 27 15:54:02 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* 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.
 
-	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
-	  Thanks, Rutger Nijlunsing.
+	      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
 
-Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	    must be just;
 
-	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
-	  add errno checking.  [ruby-dev:23627]
+	      CSV.open("foo.csv", "r") do |row|
+		row.each do |cell|
+		  if cell.nil?
+		    p "(NULL)"
+		  else
+		    p cell
+		  end
+		end
+	      end
 
-	* io.c (rb_io_fwrite): should check if errno == ENOENT, too.
+	* 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.
 
-Thu May 27 11:25:03 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	  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".
 
-	* test/csv/test_csv.rb: illegal require module name (../lib/csv.rb).
+	  setting mode properly is user's responsibility now.
 
-Wed May 26 23:12:13 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/csv.rb: accepts String as a fs (field separator/column separator)
+	  and rs (record separator/row separator)
 
 	* lib/csv.rb (CSV.read, CSV.readlines): added.  works as IO.read and
 	  IO.readlines in CSV format.
 
-	* 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']]
+	* 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?
+
+	* test/csv/test_csv.rb: updated.
+
+	* test/ruby/test_float.rb: added test_strtod to test Float("0").
+
+Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#initialize): refine pathname initialization
+	  by pathname.
 
-	* test/csv/test_csv.rb: follow above changes.
+Thu May 27 20:22:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+
+Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
+	  add errno checking.  [ruby-dev:23627]
 
 Wed May 26 14:19:42 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -39641,33 +16873,16 @@ Wed May 26 00:00:00 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
 
-Tue May 25 11:54:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a block
-	  to a Proc.  [ruby-dev:23533]
-
-	* parse.y (block_par, block_var): ditto.
-
-Tue May 25 01:50:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
-	  workaround for the versions earlier than OpenSSL-0.9.7.
+	* lib/yaml.rb: added rdoc to beginning of lib.
 
 Mon May 24 10:46:26 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
 	  must be absolute URIs
 
-Sun May 23 04:53:50 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/pstore.rb (transaction): allow overriding dump and load.
-	  [ruby-dev:23567]
-
-	* lib/yaml/store.rb: follow lib/pstore.rb's change.
+Sat May 22 12:00:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 22 11:54:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* MANIFEST: add test/openssl/test_x509store.rb.
+	* MANIFEST: add new encodings in rexml.
 
 	* ext/tk/MANIFEST: add recent files.
 
@@ -39681,12 +16896,6 @@ Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
 	  Add ()'s around parameters that don't have them
 
-Fri May 21 02:21:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/csv.rb: fixed a few bugs around multi char record/field separator.
-
-	* test/csv/test_csv.rb: added boundary test for above feature.
-
 Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (check_sizeof): define result size.  [ruby-core:02911]
@@ -39694,6 +16903,10 @@ Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/mkmf.rb (create_header): macro name should not include equal
 	  sign.
 
+Thu May 20 15:59:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+
 Thu May 20 14:35:52 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/socket/socket.c: check SCM_RIGHTS macro addition to
@@ -39714,100 +16927,20 @@ Thu May 20 12:34:39 2004  Dave Thomas  <dave@pragprog.com>
 Thu May 20 12:22:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
-	  which always get compiled.
-	  [ruby-list:39683]
-
-Wed May 19 23:45:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  which always get compiled.  [ruby-list:39683]
 
-	* test/inlinetest.rb (InlineTest::loadtest): requiring library with
-	  replaced $0 can make $0 == __FILE__ block be evaluated twice.
-
-	* test/ruby/envutil.rb (EnvUtil::rubybin): give priority to
-	  environment variable.  [ruby-dev:23538]
-
-Wed May 19 11:08:10 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed May 19 11:09:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
 	  private to public
 
-Wed May 19 02:29:36 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: support TRACE.
-
-Wed May 19 02:21:53 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: do not use class variables.
-
-Tue May 18 21:21:43 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/csv.rb: writes lines with "\n" when row separator is not given.
-	  formerly it was "\r\n".
-
-	* lib/csv.rb: [CAUTION] API change
-
-	  * CSV::Row removed.  a 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.
-
-	  * CSV::Cell removed.  a cell is represented as just a String or
-	    nil(NULL).  this change will cause widespread destruction.
-
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.is_null       # Cell#is_null
-		    p "(NULL)"
-		  else
-		    p cell.data		# Cell#data
-		  end
-		end
-	      end
-
-	    must be just;
-
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.nil?
-		    p "(NULL)"
-		  else
-		    p cell
-		  end
-		end
-	      end
-
-	* 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.
-
-	  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".
-
-	  setting mode properly is user's responsibility now.
-
-	* lib/csv.rb: accepts String as a fs (field separator/column separator)
-	  and rs (record separator/row separator)
-
-	* 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?
-
-	* test/csv/test_csv.rb: updated.
-
-Tue May 18 14:24:20 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: added rdoc to beginning of lib.
-
 Tue May 18 14:00:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* node.h (NEW_DSTR): adjust list length.
 
 	* parse.y (literal_concat): ditto.
 
-Tue May 18 09:30:25 2004  SASADA Koichi  <ko1@atdot.net>
-
-	* eval.c (rb_method_node): search cache entry first.
-
-Mon May 17 16:04:06 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon May 17 16:14:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
 	  instead of "0.0e+00". [ruby-dev:23480]
@@ -39824,43 +16957,13 @@ Mon May 17 10:13:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c (sock_s_getnameinfo): ditto.
 
-Mon May 17 00:36:21 2004  why the lucky stiff  <why@ruby-lang.org>
+Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
+
+	* lib/yaml.rb: removed fallback to pure Ruby parser.
 
 	* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
 	  of zero at times, which kept some blocks from getting indentation.
 
-Mon May 17 00:07:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/drb/drb.rb: Cosmetic documentation changes.
-
-Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
-
-	* 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.
-
-Sat May 15 17:52:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_float.rb(test_strtod): Add test for signed 0.000...1
-
-Sat May 15 14:20:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/syck/depend: add ruby's headers.
-
-Sat May 15 13:38:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/MANIFEST, ext/syck/depend: new file.
-
-	* lib/yaml/rubytypes.rb: range of exponential floats.  [ruby-core:02824]
-
-	* test/yaml/test_yaml.rb: tests for strings start with colon and some
-	  round trip.
-
-Sat May 15 12:04:58 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: removed fallback to pure Ruby parser.
-
 	* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
 
 	* ext/syck/syck.h: reports style of scalars now, be they plain, block
@@ -39877,9 +16980,33 @@ Sat May 15 12:04:58 2004  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
 	  if scalar style is plain.
 
+	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
+	  loaded as symbols.
+
 	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
 	  match new regexp serialization.
 
+Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/drb/drb.rb: Cosmetic documentation changes.
+
+Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
+	  RDoc operation), and added file-level comment.
+
+Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
+
+	* 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.
+
+Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
+	  generating warnings, many were on private methods).
+
 Sat May 15 01:41:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (eval): forgot to restore $SAFE value before evaluating
@@ -39895,27 +17022,18 @@ Fri May 14 22:08:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_new4): should not reuse frozen shared string if
 	  the original is not an instance of String. [ruby-talk:100193]
 
-Fri May 14 21:29:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_mdump): preserve GMT bit in the marshal data.
-	  [ruby-talk:100213]
-
-Fri May 14 18:37:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri May 14 18:39:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* 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')
+	* 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')
 
-Fri May 14 13:30:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_float.rb: Add test for util.c revision 1.42.
-
-Fri May 14 12:13:46 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri May 14 12:11:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
 	 [ruby-dev:23498]
@@ -39925,10 +17043,15 @@ Thu May 13 15:47:30 2004  akira yamada  <akira@ruby-lang.org>
 	* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
 	  regexps for login prompt and/or password prompt.
 
-Thu May 13 14:17:57 2004  why the lucky stiff  <why@ruby-lang.org>
+Thu May 13 14:23:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
-	  loaded as symbols.
+	* hash.c (delete_if_i): use st_delete_safe() (via
+	  rb_hash_delete()) instead of returning ST_DELETE.
+	  backport from HEAD.  [ruby-dev:23487]
+
+Thu May 13 13:01:30 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
 
 Thu May 13 11:04:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -39960,15 +17083,6 @@ Wed May 12 11:51:08 2004  Dave Thomas  <dave@pragprog.com>
 
 	* class.c (rb_obj_singleton_methods): fix rdoc
 
-Tue May 11 07:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): do not protect exception during receiver
-	  evaluation.
-
-Mon May 10 22:28:14 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb (each_crlf_line): remove junk line.
-
 Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/html_generator.rb: Change scheme for
@@ -39987,81 +17101,43 @@ Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb: Hack to search parents
 	  for unqualified constant names.
 
-Mon May 10 01:18:15 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb (logging): append "\n".
-
-Sun May  9 23:38:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/net/ftp.rb: ported documentation improvement from 1.8 branch
-
-	* lib/net/imap.rb:   ditto
+Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/net/pop.rb:    ditto
+	* lib/rdoc/generators/html_generator.rb: Hack to search parents
+	  for unqualified constant names.
 
-	* lib/net/smtp.rb:   ditto
+Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
+	* 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
 
-Sun May  9 23:34:51 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_float.rb: added test_strtod to test Float("0").
-
-Sun May  9 13:24:24 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/yaml/store.rb: use FileUtils::copy.
-
-Sun May  9 12:34:26 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regex.c: removed unused file.
-
-Sat May  8 10:53:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_open): open should not ignore block when "to_open"
-	  method is used.  [ruby-dev:23478]
-
-Fri May  7 22:07:39 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): new option `force'. [ruby-talk:99457]
-
-	* lib/fileutils.rb: new method for command option reflection:
-	  FileUtils.commands, .options, .have_option?, .options_of,
-	  .collect_methods.
-
-	* lib/fileutils.rb: module Verbose, NoWrite, DryRun do not have
-	  option flags @fileutils_verbose and @fileutils_noop, they make no
-	  sense.
-
 Fri May  7 21:50:21 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
 	  multiple arguments to 'include'
 
-Fri May  7 21:03:51 2004  Minero Aoki  <aamine@loveruby.net>
+Fri May  7 21:31:56 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
 	  [ruby-core:02843]
 
-	* test/fileutils/test_fileutils.rb (mkdir): test "\n" in path.
-
-Fri May  7 20:53:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_modify): typo fixed. [ruby-dev:23473]
-
-Fri May  7 11:17:27 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri May  7 11:25:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.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]
 
-Thu May  6 22:27:32 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri May  7 10:00:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
-	  hostname.
+	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
 
-Thu May  6 22:09:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
+	  hostname.
 
 Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
 
@@ -40076,15 +17152,6 @@ Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
 	* ext/syck/gram.c: fixed transfer methods on structs, broke it
 	  last commit.
 
-Thu May  6 14:38:02 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (rb_push_glob): simplified code (not change behavior)
-
-Thu May  6 13:32:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: get rid of side effect of Config.expand, patched by
-	  <tttt01@infoseek.jp>  (ruby-bugs:PR#597)
-
 Thu May  6 11:40:28 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (string): accept NIL.
@@ -40097,13 +17164,16 @@ Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
 	  Don't include the &block parameter if we have explicit
 	  yield parameters.
 
-Wed May  5 03:52:31 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/ring.rb: use recv instead of recvfrom.
 
-Wed May  5 00:38:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/gserver.rb: documented
+
+Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
 	* lib/xmlrpc/README.txt: introduced for documentation purposes
 
 Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
@@ -40111,10 +17181,6 @@ Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
 	  Fix parsing bug if yield called within 1 line block
 
-Sun May  2 21:56:48 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (rm_f, rm_r): test :force flag.
-
 Sun May  2 01:04:38 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib, ext/tk: renewal Ruby/Tk
@@ -40123,26 +17189,11 @@ Fri Apr 30 20:08:41 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
 
-Wed Apr 28 01:26:11 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Tue Apr 27 13:12:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* oniguruma.h, regparse.c: imported Oni Guruma 2.2.8.
+	* eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
 
-Wed Apr 28 01:16:23 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* oniguruma.h, regparse.c: imported Oni Guruma 2.2.7.
-
-Tue Apr 27 14:43:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk: LIBURUBY_A is needed for extconf.rb even when
-	  cross-compiling.
-
-Tue Apr 27 13:33:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (string_content): turn off NODE_NEWLINE flag to avoid
-	  unnecessary line trace for inlined expression.
-	  (ruby-bugs PR#1320)
-
-Tue Apr 27 08:15:13 2004  why the lucky stiff  <why@ruby-lang.org>
+Tue Apr 27 08:41:28 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* lib/yaml/rubytypes.rb: passing Range tests.
 
@@ -40170,33 +17221,32 @@ Mon Apr 26 21:40:09 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
 	  to instance methods.
 
-Sun Apr 25 18:26:23 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (ac_cv_func_fork): set to no on DJGPP.
-
-Sat Apr 24 14:32:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* re.c: applied stack error handling patch. [ruby-dev:23431]
-
 Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
 	  Fix bug where consecutive headings are merged.
 
-Fri Apr 23 23:24:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb: $hdrdir should not contain macros, for backward
+	* lib/mkmf.rb: $hdrdir should not contain macros for backward
 	  compatibility.  [bruby-dev:28]
 
-	* lib/mkmf.rb (create_makefile): in the case of extout, just copy
-	  script files, without comparison.
+	* version.c (ruby_show_copyright): obtain copyright year from
+	  RUBY_RELEASE_YEAR.
+
+	* win32/resource.rb: ditto.
+
+	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
+	  include them.
+
+	* win32/resource.rb: include winver.h for older WindowsCE.
 
 Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb: sync taint/freeze flag between
 	  a pathname object and its internal string object.
 
-Fri Apr 23 14:52:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt, arg, aref_args): should not make sole splat into
 	  array, in aref_args other than aref with op_asgn.
@@ -40206,18 +17256,7 @@ Fri Apr 23 14:14:38 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/resolv.rb: don't use Regexp#source to embed regexps.
 	  [ruby-dev:23432]
 
-Thu Apr 22 18:25:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.
-
-Thu Apr 22 10:07:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* */Makefile.sub (distclean-local): should remove $(RBCONFIG).
-
-Thu Apr 22 04:17:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_mod_define_method): allow binding methods to modules.
-	  [ruby-dev:23410]
+Thu Apr 22 04:15:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (aref_args): should pass expanded list.  [ruby-core:02793]
 
@@ -40229,7 +17268,7 @@ Thu Apr 22 01:12:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
 	  search.  [ruby-talk:97342]
 
-Wed Apr 21 23:04:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Apr 21 22:57:27 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
 
@@ -40238,44 +17277,6 @@ Wed Apr 21 20:05:00 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
 	  [ruby-list:39542]
 
-Wed Apr 21 18:39:46 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: merge SMTP-TLS patch.  This patch is
-	  contributed by Daniel Hob. [ruby-core:02789]
-
-Wed Apr 21 18:23:45 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/smtp.rb: change coding style: def m( a ) -> def m(a).
-
-Wed Apr 21 18:01:47 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: do not use class variables.
-
-	* lib/net/pop.rb (do_start): ensure to clean up connection when
-	  authentication failed.
-
-Wed Apr 21 17:23:59 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTP#connect): CONNECT must precede SSL connect.
-	  [ruby-dev:23379]
-
-	* lib/net/http.rb (HTTP.new): class variables are not inherited
-	  now.
-
-Wed Apr 21 15:56:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/ui/console/testrunner.rb (test_started): restore $0
-	  after changing process title.  [ruby-talk:97426]
-
-Wed Apr 21 10:18:06 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* process.c(rb_spawn): fix SEGV at "p system('command line here')"
-	 (may happen only in bccwin32) [ruby-dev:23380]
-
-Mon Apr 19 20:58:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c: Updated RDocs.
-
 Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* hash.c (rb_hash_equal): returns true if two hashes have same set
@@ -40284,132 +17285,107 @@ Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* hash.c (rb_hash_eql): returns true if two hashes are equal and
 	  have same default values.
 
-Mon Apr 19 08:19:11 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+Mon Apr 19 08:19:58 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
 
-	* dln.c, io.c, pack.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/pop.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.
+	* 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.
 
 Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
 	  #ifdef HAVE_PROTOTYPES
 
+Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+
+	* ext/iconv/iconv.c: nearly finished RDoc comments.
+
 Fri Apr 16 17:04:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_equal): always returns true or false, never
 	  returns nil. [ruby-dev:23404]
 
-Fri Apr 16 12:38:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/drb/drb.rb (DRb::DRbUnknown::initialize): Exception#to_str is
-	  deprecated.
-
-	* lib/drb/drb.rb (DRb::DRbServer::InvokeMethod::perform): multiple
-	  value class changed.
-
-	* lib/drb/invokemethod.rb (DRb::DRbServer::InvokeMethod18Mixin::block_yield):
-	  ditto.
-
-Fri Apr 16 08:27:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 16 08:27:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: skip linking when libraries to be preloaded not
 	  compiled.  [ruby-list:39561]
 
-Thu Apr 15 19:57:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 15 23:21:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (pst_success_p): new method Process::Status#success?.
 	  [ruby-dev:23385]
 
-	* rubytest.rb: do nothing while cross-compiling, return status in
-	  system independent style.
-
-Thu Apr 15 19:26:54 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (rb_push_glob): Dir.glob() should return nil if block is given.
-	  (http://www.ruby-lang.org/ja/man/index.cgi?cmd=view;name=Dir)
-
-	* dir.c (push_braces): Dir.glob() should handle '{ }' nested more than
-	  3 times.
-
-	* dir.c (push_braces, rb_push_glob): Dir.glob() should handle escaped
-	  '{' and '}' and ','.
-
-	  [ruby-dev:23376]
-
 Thu Apr 15 17:12:13 2004  Tanaka Akira  <akr@m17n.org>
 
 	* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
 	  GDBM::WRCREAT and GDBM::NEWDB.
 	  (fgdbm_initialize): use specified read/write flag.
 
-Wed Apr 14 13:06:09 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
-
-	* 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]
-
 Wed Apr 14 11:29:56 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* numeric.c (flo_eq): workaround for bcc32's bug.
 	  (ruby-bugs-ja:PR#594)
 
+Wed Apr 14 13:06:35 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
+
+	* 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]
+
 Wed Apr 14 11:06:38 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
 	  behavior of :enddoc: -- it now unconditionally terminates
 	  processing of the current file.
 
-Wed Apr 14 10:57:40 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Apr 14 11:03:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
 
-Tue Apr 13 23:00:55 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Apr 13 23:06:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: change pattern matching.
 	  a === b -> a == b || a === b. [druby-ja:98]
 
 	* test/rinda/test_rinda.rb: ditto.
 
-Tue Apr 13 21:50:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* bcc32/Makefile.sub (PHONY): Borland make disallows empty command
-	  rules.
+	* lib/net/http.rb: should not overwrite HTTP request header.
+	  [ruby-list:39543]
 
-Tue Apr 13 17:55:16 2004  Minero Aoki  <aamine@loveruby.net>
+Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* lib/net/http.rb (begin_transport): should not overwrite HTTP
-	  request header. [ruby-list:39543]
+	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
+	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
 
-Tue Apr 13 16:48:00 2004  Minero Aoki  <aamine@loveruby.net>
+Mon Apr 12 19:11:29 2004  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/net/pop.rb: merge POP3S patch.  This patch is contributed by
-	  Daniel Hobe.
+	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
 
-Tue Apr 13 02:56:29 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Mon Apr 12 18:52:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* common.mk: changed the order of ascii.c alphabetically.
+	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
+	  a value.
 
-Mon Apr 12 19:11:21 2004  Eric Hodel  <drbrain@segment7.net>
+Mon Apr 12 10:43:47 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
+	* dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
+	  rb_push_glob): fix memory leak. (leaked when block was interrupted)
 
-Mon Apr 12 18:45:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Apr 12 10:27:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
-	  a value.
+	* bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
 
-Mon Apr 12 10:39:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/Makefile.sub: ditto.
 
-	* dir.c (rb_glob2, rb_glob, push_globs, push_braces, rb_push_glob):
-	  fix memory leak. (leaked when block was interrupted)
+	* wince/Makefile.sub: ditto.
 
-Sun Apr 11 19:10:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (require_libraries): restore source file/line after
 	  statically linked extensions initialized.  [ruby-dev:23357]
@@ -40430,73 +17406,7 @@ Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
 	  with \_cat_<b>dog</b>
 
-Fri Apr  9 17:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (has_magic, find_dirsep): incomplete '[' matches no character
-	  in Dir.glob. (follows File.fnmatch's behavior)
-
-	* dir.c (fnmatch_helper): incomplete escape is ignored in File.fnmatch.
-	  (follows Dir.glob's behavior)
-
-	* dir.c (find_dirsep): '/' between '[' and ']' is ignored in Dir.glob.
-	  (follows File.fnmatch with File::FNM_PATHNAME 's behavior)
-
-	* dir.c (find_dirsep): escaped slash '\/' loses its meaning as
-	  directory separator in Dir.glob.
-
-	  [ruby-dev:23291]
-
-Thu Apr  8 20:25:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): skip uncompiled extensions.
-
-	* lib/mkmf.rb (create_makefile): emit no rules for static library if
-	  $static is nil, e.g., outside of ext/.
-
-	* lib/test/unit/ui/console/testrunner.rb (test_started): show test
-	  name via $0.
-
-	* runruby.rb: set environments to use the compiled binary.
-
-	* test/runner.rb: do nothing while cross-compiling.
-
-	* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
-	  know ruby binary, and restore $: after require.
-
-	* test/ruby/envutil.rb: give priority to RUBY environment variable to
-	  use just compiled binary and libraries.
-
-Thu Apr  8 19:03:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_binmode): inverted condition.  [ruby-dev:23349]
-
-Thu Apr  8 18:22:00 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_s_list): return encoding list if no block
-	  is given.  [ruby-dev:23063]
-
-Wed Apr  7 15:29:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): use NUM2INT() instead of num2i32().
-
-Wed Apr  7 12:32:02 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb, lib/rss/1.0.rb: accepted rdf:resource or
-	  resource attribute in rdf:li.
-	* test/rss/test_parser.rb: added test for above change.
-
-	* lib/rss/dublincore.rb: reverted style.
-
-	* lib/rss/xmlparser.rb: normalized XMLParser class hierarchy.
-
-Wed Apr  7 10:43:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, common.mk, */Makefile.sub (ext/extinit.o): OUTFLAG
-	  doesn't work for object files on VC.
-
-	* */Makefile.sub (config.h): need SIZEOF_TIME_T now.
-
-Wed Apr  7 00:24:34 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: fix hash tuple bug.
 
@@ -40506,12 +17416,6 @@ Wed Apr  7 00:24:34 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Tue Apr  6 18:24:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* file.c (rb_get_path): get path string via "to_path" method if
-	  path object is not a string. [Ruby2]
-
-	* gc.c (rb_gc_call_finalizer_at_exit): do not free threads in the
-	  exit finalizers.
-
 	* io.c (rb_io_reopen): should use rb_io_check_io().
 
 Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
@@ -40522,82 +17426,49 @@ Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
 	  (time_plus): use time_add.
 	  (time_minus): use time_add.
 
-Tue Apr  6 13:11:48 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (raise_socket_error): never return.
+Tue Apr  6 13:21:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/socket.c (make_hostent): must return value.
 
-Tue Apr  6 00:14:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (Init_Exception): remove Exception#to_str. [Ruby2]
-
-	* eval.c (error_print): should no call "to_str" anymore use
-	  "message" method instead.
-
-	* io.c (rb_f_open): Kernel#open() calls "to_open" if the first
-	  argument responds to it. [Ruby2]
-
-Tue Apr  6 00:13:43 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Apr  6 00:05:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/rinda.rb: add require 'drb/drb'
 
-Mon Apr  5 22:25:32 2004  Tanaka Akira  <akr@m17n.org>
-
-	* test/zlib/test_zlib.rb: new file.
-	  (TestZlibGzipWriter#test_new_nil): test for [ruby-dev:23228].
-
-Mon Apr  5 22:16:23 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y (assoc_list): {a: 1, b: 2} should be allowed.
-	  [ruby-dev:23328]
-
-Mon Apr  5 19:43:40 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* regexec.c: imported Oni Guruma 2.2.6.
-
-Mon Apr  5 19:39:10 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
 
-	* regparse.c, oniguruma.h: imported Oni Guruma 2.2.6.
+	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
+	  references work properly.
 
-Mon Apr  5 12:12:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Apr  4 20:33:42 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* ext/socket/socket.c (raise_socket_error): some platforms don't have
-	  EAI_SYSTEM.
+	* eval.c (Init_load): make $LOADED_FEATURES built-in.
+	  [ruby-dev:23299]
 
-Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
+	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
 
-	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
-	  references work properly.
+	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
 
 Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to
-	  RDoc. Fix bug where files weren't being excluded properly
+	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
+	  Fix bug where files weren't being excluded properly
 
-Sat Apr  3 09:36:38 2004  why the lucky stiff  <why@ruby-lang.org>
+Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/syck.h: version 0.43.
 
-Sat Apr  3 08:28:47 2004  why the lucky stiff  <why@ruby-lang.org>
-
 	* ext/syck/lib/gram.c: allow root-level inline collections.
-	  [ruby-talk:94922]
+	 [ruby-talk:94922]
 
 	* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
-	  [ruby-talk:94930]
+	 [ruby-talk:94930]
 
-Fri Apr  2 19:28:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bcc32/Makefile.sub (OUTFLAG): needed for static-linked-ext.
-
-Fri Apr  2 18:00:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/syck/bytecode.c: turn off default implicit typing.
 
-	* ext/extmk.rb (extmake): extract necessary variables for static link
-	  from Makefile.
+	* ext/syck/implicit.c: detect base60 integers.
 
-	* lib/mkmf.rb (create_makefile): save preload and libpath for next
-	  compile.
+	* ext/syck/rubyext.c: handle base60, as well as hex and octal
+	  with commas.  implicit typing of ruby symbols.
 
 Fri Apr  2 17:27:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -40616,20 +17487,8 @@ Fri Apr  2 14:35:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (block_pass): should generate unique identifier of the
 	  pushing block.  [ruby-talk:96363]
 
-Fri Apr  2 11:36:20 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (Init_load): make $LOADED_FEATURES built-in.
-	  [ruby-dev:23299]
-
-	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
-
-	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
-
 Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c: mistakingly removed do_not_reverse_lookup.
-	  [ruby-list:39475]
-
 	* ext/socket/socket.c (make_hostent): fix memory leak, based on
 	  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
 
@@ -40654,6 +17513,14 @@ Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  be empty).  Instance of URI have instance_variables but it must be
 	  llowed whenever original mapping is allowed or not.
 
+	* lib/xsd/datatypes.rb: check the smallest positive non-zero
+	  single-precision float exactly instead of packing with "f".
+	  [ruby-talk:88822]
+
+	* 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)
+
 Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
 
 	* time.c (year_leap_p): new function.
@@ -40661,7 +17528,7 @@ Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
 	  (search_time_t): use timegm_noleapsecond instead of
 	  mktime for first guess.
 
-Wed Mar 31 12:05:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/delegate.rb (DelegateClass): define internal methods of the
 	  result class, but not metaclass of the caller.  [ruby-talk:96156]
@@ -40670,44 +17537,12 @@ Wed Mar 31 12:05:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.h: missing.h is now prerequisite to intern.h.
 
-Wed Mar 31 11:17:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): raises RangeError if uv is out of UTF8 value
-	  range.  [ruby-dev:23281]
-
-	* io.c (rb_io_binmode): stdio buffer should be empty when calling
-	  IO#binmode.  [ruby-talk:96155]
-
 Tue Mar 30 20:25:34 2004  Tanaka Akira  <akr@m17n.org>
 
 	* time.c (search_time_t): limit guess range by mktime if it is
 	  available.  [ruby-dev:23274]
 
-Tue Mar 30 18:19:00 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval): fix SEGV at retry in iterator's receiver.
-	  [ruby-dev:23227]
-
-Mon Mar 29 20:17:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_exec): follow older behavior if close-on-exec is not
-	  available.
-
-	* process.c (rb_fork): protect from exceptions while waiting failed
-	  process, if status is given.
-
-Sun Mar 28 16:25:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (clean-local, distclean-local): remove
-	  work files.
-
-	* win32/Makefile.sub (clean-local): ditto.
-
-Sun Mar 28 14:23:02 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb: def m( arg ) -> def m(arg).
-
-Sun Mar 28 14:09:13 2004  Minero Aoki  <aamine@loveruby.net>
+Sun Mar 28 14:16:59 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/pop.rb (auth): failed when account/password include "%".
 	  [ruby-talk:95933]
@@ -40721,46 +17556,16 @@ Sat Mar 27 10:40:48 2004  Tanaka Akira  <akr@m17n.org>
 	* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
 	  instead of PrettyPrint.
 
-Sat Mar 27 01:47:09 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: trim tail space of each line.  no user visible change.
-
-	* lib/rss/dublincore.rb: fixed class definition mismatch.
+Thu Mar 25 23:28:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sample/openssl/gen_csr.rb: fixed wrong usage text.
+	* time.c (time_overflow_p): backport 1.9 usec overflow function.
+	  (ruby-bugs PR#1307)
 
 Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
 	  Add --version option
 
-Thu Mar 25 21:45:00 2004  Shigeo Kobayashi  <shigek@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: Bug in + and - reported by Bret Jolly
-	  fixed.
-
-Thu Mar 25 21:01:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* version.c (ruby_show_copyright): obtain copyright year from
-	  RUBY_RELEASE_YEAR.
-
-	* win32/resource.rb: ditto.
-
-Thu Mar 25 19:37:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
-	  include them.
-
-	* win32/resource.rb: include winver.h for older WindowsCE.
-
-Thu Mar 25 14:01:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, */Makefile.sub (lib, dll): phony targets.
-
-	* configure.in (ruby, miniruby): ditto.
-
-	* cygwin/GNUmakefile.in (rubyw): ditto.
-
 Thu Mar 25 04:16:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
@@ -40777,7 +17582,7 @@ Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
 	  Fix to work with C modules.
 
-Wed Mar 24 20:49:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
 	* lib/uri/common.rb: Ditto.
@@ -40787,13 +17592,17 @@ Wed Mar 24 20:49:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 	* lib/uri/https.rb: Ditto.
 	* lib/uri/ldap.rb: Ditto.
 	* lib/uri/mailto.rb: Ditto.
+	  (All backported from 1.9)
 
-Wed Mar 24 18:48:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 24 18:48:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
 	  DESTDIR after installed.
 
-	* lib/mkmf.rb (dummy_makefile): default file lists to be cleaned.
+	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
+	  nmake/bmake. [ruby-list:39388]
+
+	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
 
 Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -40810,86 +17619,18 @@ Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
 	  Allow non-RDoc templates by putting a slash in the template name
 
-Wed Mar 24 10:05:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::_close): should not clear @tmpname
-	  until the file is really removed. [ruby-core:02684]
-
-Wed Mar 24 04:12:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_cvar_get): new method Module#class_variable_get.
-
-	* object.c (rb_mod_cvar_set): ditto (Module#class_variable_set).
-
-Tue Mar 23 17:45:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_atfork): 1.9 warns no more for thread
-	  termination.  [ruby-dev:23212]
-
-Tue Mar 23 14:46:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
-	  separate files under directories due to directory separator.
-
-	* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
-	  removed.
-
-	* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
-	  rules.
-
-	* cygwin/GNUmakefile.in: some mingw stuffs were missed.
-
-	* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
-	  from command lines.
-
-	* bcc32/Makefile.sub: needs bcc32/mkexports.rb.
+Mon Mar 22 16:19:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-Mon Mar 22 08:21:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, */Makefile.sub, common.mk: extract common portions.
-
-	* Makefile.in, cygwin/GNUmakefile.in, */Makefile.sub (RBCONFIG):
-	  separated time stamp file for rbconfig.rb.
-
-	* configure.in: append common.mk to Makefile.
-
-	* mkconfig.rb: keep mtime of rbconfig.rb if unchanged.
-
-	* win32/rm.bat: remove multiple files.
-
-	* wince/mkconfig_wce.rb: use fake.rb instead.
-
-Sun Mar 21 22:17:35 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host):
-	  sort @virtual_hosts in address, port, host order.
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
-	  hostname should not be match if :ServerAlias is not given.
+	* ruby.1: add -width option to .Bl for old groff.
 
 Sun Mar 21 21:11:16 2004  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
 	* lib/shell/*: bug fix for Shell#system(command_line_string).
 
-Sun Mar 21 21:04:42 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.1: add -width option to .Bl for old groff.
-
-Sun Mar 21 18:57:37 2004  Kouhei Sutou  <kou@cozmixng.org>
+Sat Mar 20 20:57:10 2004  David Black  <dblack@wobblini.net>
 
-	* test/rss/*: Test::Unit::TestCase -> RSS::TestCase and
-	  Test::Unit::Assertions -> RSS::Assertions.
-
-Sun Mar 21 18:48:20 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/{rss,dublincore,syndication}.rb: handled W3CDTF correctly.
-
-Sun Mar 21 18:15:29 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_xml-stylesheet.rb: added tests for xml-stylesheet.
-
-	* lib/rss/xml-stylesheet.rb: added xml-stylesheet parsing
-	  function.
+	* lib/scanf.rb: Backported 1.9 branch
+	  modifications/corrections to 1.8 branch
 
 Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
@@ -40899,164 +17640,58 @@ Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* eval.c (rb_f_raise): should not clear backtrace information if
 	  exception object already have one.
 
-Sat Mar 20 21:21:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb: rm -rf $extout, not extout.
-
 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.
 
-Sat Mar 20 09:33:36 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Mar 20 09:52:33 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
 	  part of second minute that follows a comma or a full stop.
 
-Fri Mar 19 21:06:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (assoc_list): allow {sym: val} style Hash. [Ruby2]
-	  this change is done by Nobuyoshi Nakada <nobu@ruby-lang.org>.
-
-Fri Mar 19 15:15:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_cvar_set): class variables become private to the
-	  particular class/module. [Ruby2]
-
-	* variable.c (rb_cvar_get): ditto.
-
-	* variable.c (rb_cvar_defined): ditto.
-
-Fri Mar 19 11:31:32 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb ($beos, $solaris): add OS flags.
-
-	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
-	   nmake/bmake. [ruby-list:39388]
-
-	* lib/mkmf.rb (CLEANLIBS, CLEANOBJS): should remove *.exp with *.so.
-
 Fri Mar 19 01:55:57 2004  Mauricio Fernandez  <batsman.geo@yahoo.com>
 
 	* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
 
-Thu Mar 18 19:47:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* instruby.rb, rubytest.rb: do not depend on srcdir.
+	* lib/drb/drb.rb: backport drb.rb 1.16.
 
-Thu Mar 18 18:50:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb: no longer embed srcdir and compile_dir into
-	  rbconfig.rb.
+Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
-	  paths.
+	* struct.c (make_struct): allow const_id for accessor names.
+	  [ruby-core:04585]
 
-Thu Mar 18 17:46:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: do not undef :to_a.
+	* eval.c (rb_attr): check if attribute name is local_id or
+	  const_id.
 
 Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_eq): avoid false positive by using scope and
 	  dyna_vars.  no longer use frame.uniq.
 
-	* eval.c (proc_arity): arity is now defined as number of
-	  parameters that would not be ignored. i.e. Proc.new{}.arity
-	  returns zero.  update test suites too.
-
-Thu Mar 18 15:27:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: remove specialized version of rb_Array().  use simple
-	  one defined in object.c.
-
-	* object.c (Init_Object): remove Kernel#to_a.
-
-	* enum.c (enum_zip): use "to_a" instead of "to_ary".
-
-Wed Mar 17 00:22:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+Wed Mar 17 14:44:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* oniguruma.h: imported Oniguruma 2.2.5.
-	* regparse.c: ditto.
-
-Tue Mar 16 11:14:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.
-	  (Rev1.112 lost compatiblity)
-
-	* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
-	  should return true. (Rev1.112 lost compatiblity)
-
-	* dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo',
-	  File::FNM_PATHNAME) should return false because of leading period.
-
-Mon Mar 15 17:01:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (exc_initialize): calling 'to_str' each time just for
-	  type checking is too heavy.  [ruby-core:02661]
-
-Mon Mar 15 10:14:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SocketForwarder):
-	  add do_not_reverse_lookup.
+	* dir.c (range): fix possible "\0" overrun. (in case of "\0-")
 
 Mon Mar 15 07:39:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
 	  yield is not break destination. [ruby-dev:23197]
 
-Sun Mar 14 22:07:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_raise): err at unstarted thread.  (PR#1302)
-
-Sat Mar 13 14:56:32 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
-
-	* test/drb/ut_eval.rb: ditto.
-
-	* test/drb/ut_large.rb: ditto.
-
-	* test/drb/ut_safe1.rb: ditto.
-
-	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
-
-Fri Mar 12 23:52:56 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (fnmatch): directory recursion '**/' can be used with
-	  File::FNM_PATHNAME. [ruby-dev:22901]
-
-	* dir.c (fnmatch, fnmatch_helper): only '/' is accepted as path
-	  separator even in DOSISH environment. [ruby-dev:22974]
-	  [ruby-list:39337]
-
-	* dir.c (fnmatch_helper): faster '*' matching.
-
-Fri Mar 12 20:19:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_noreturn): default for platforms not support
-	  prototypes.
+Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* ruby.c (ruby_init_loadpath): buffer for path name should have
-	  MAXPATHLEN.
+	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
+	  trunk)
 
-	* lib/mkmf.rb (configuration): include topdir and hdrdir in VPATH.
-
-	* lib/mkmf.rb (create_makefile): default dependency rule.
-
-Fri Mar 12 07:35:36 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb (WEBrick::Config::General): add
-	  :DoNotReverseLookup.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
-	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
-	  is set.  [ruby-code:02357]
+	* test/drb/test_drbunix.rb: ditto.
 
-Wed Mar 10 22:26:25 2004  Minero Aoki  <aamine@loveruby.net>
+Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
 	  This patch is contributed by Christian Loew.  [ruby-talk:94635]
+	  (Backport from main trunk)
 
 Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -41067,337 +17702,54 @@ Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): set exit_value for block break.
 
-Wed Mar 10 16:00:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_def): Struct::new executes block with
-	  generated struct class. [ruby-talk:02606]
-
 Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand@zenspider.com>
 
 	* eval.c (eval): Only print backtrace if generating the backtrace
 	  doesn't generate an exception.  [ruby-core:02621]
 
-Wed Mar 10 10:15:16 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (opt_W_getter): get rid of warning.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
-	  fixed dependency.
-
 Tue Mar  9 13:04:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_ungetc): raise IOError instead of calling
 	  rb_sys_fail().  [ruby-talk:23181]
 
-Tue Mar  9 10:03:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
-	  replaced regex.c entry with Oniguruma files.
-
-Tue Mar  9 01:09:46 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* Makefile.in: replaced regex.c entry with Oniguruma files.
-
-Mon Mar  8 23:16:07 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: HTTPHeader did not initialized correctly.
-
-	* lib/net/http.rb (connect): does same debug output.
-
-Mon Mar  8 21:38:18 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (add_header): remove warning. [ruby-dev:23170]
-
-Mon Mar  8 21:09:39 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (range): Cancel change for incomplete '['. More discussion
-	  is needed.
-
-Mon Mar  8 19:35:13 2004  akira yamada  <akira@arika.org>
+Mon Mar  8 19:32:28 2004  akira yamada  <akira@ruby-lang.org>
 
 	* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
 	  -> (?::#{PORT}).  [ruby-dev:23170]
 
-Mon Mar  8 15:03:24 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Mar  8 15:31:41 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (range): treat incomplete '[' as ordinary character (like
-	  has_magic does). fix buffer overrun at incomplete escape like '[\'.
-
-Mon Mar  8 13:35:32 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regparse.c (parse_exp): need to separate initialization for bcc32.
-	  [ruby-dev:23169]
+	  has_magic does).
 
-	* oniguruma.h (ONIG_EXTERN): check __GNUC__ instead of __CYGWIN__.
+	* dir.c (range):  Cancel above change. More discussion is needed.
 
-Mon Mar  8 01:05:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Mar  7 22:37:46 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/webrick/config.rb (WEBrick::Config::HTTP): rename :RequestHander
-	  to :RequestCallback and add new option :ServerAlias.
+	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): use
-	  :RequestCallback and warn if :RequestHandler is in server's option.
+	* test/drb/ut_eval.rb: ditto.
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should print
-	  error message for WEBrick::HTTPSataus::Error.
+	* test/drb/ut_large.rb: ditto.
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server):
-	  lookup for hostname from :ServerAlias if the req.host is not match
-	  to :ServerName.
+	* test/drb/ut_safe1.rb: ditto.
 
-	* lib/webrick/httpservlet.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
-	  use $?.exitstatus and refine log message.
+	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
 
 Sun Mar  7 16:22:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* Makefile.in (lex.c): use $? instead of $<.
 
-	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
-	  [ruby-dev:23157]
-
-Sun Mar  7 05:34:42 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: HTTPHeader keeps its header fields as an array.
-
-	* lib/net/http.rb: new method HTTPHeader#add_header, get_fields.
-
-	* lib/net/http.rb: new method HTTPHeader#content_length=.
-
-	* lib/net/http.rb: new method HTTPHeader#content_type, main_type,
-	  sub_type, type_params, content_type=, set_content_type.
-
-	* lib/net/http.rb (HTTPHeader#basic_encode): result of pack(m) may
-	  contain multiple LFs.
-
-Sun Mar  7 03:11:00 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: new method Net::HTTPRequest#body(=).
-
-	* lib/net/http.rb: new method Net::HTTPRequest#body_stream(=).
-
-Sun Mar  7 02:06:07 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: spin off https code again.
-
-	* lib/net/https.rb: new file.
-
-	* ext/openssl/lib/net/https.rb: removed.  moved to net/https with
-	  slight modifications.
-
-	* ext/openssl/lib/net/protocols.rb: removed.  merged with net/http.
-
-	* lib/net/protocol.rb: new class BufferedIO.
-
-	* lib/net/protocol.rb: InternetMessageIO < BufferedIO.
-
-	* lib/net/protocol.rb: BufferedIO.new takes an IO.
-
-	* lib/net/smtp.rb: follow InternetMessageIO's change.
-
-	* lib/net/pop.rb: ditto.
+Fri Mar  5 00:54:14 2004  Dave Thomas  <dave@pragprog.com>
 
-Sun Mar  7 00:55:03 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: remove method: InternetMessageIO#address,
-	  port, ip_address, read_timeout(=), socket.
-
-	* lib/net/protocol.rb: simplify code.
-
-	* lib/net/protocol.rb: apply latest coding style.
-
-Sat Mar  6 15:15:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/strscan/depend: depends on re.h and regex.h.
-
-	* ext/strscan/strscan.c: no version check needed.
-
-	* ext/strscan/strscan.c (strscan_init_copy): struct re_registers must
-	  not be bitwise copied.
-
-Sat Mar  6 11:14:33 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: refixed the previous fix in IO#block_scanf
-
-Sat Mar  6 10:49:40 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: fixed a logic glitch in IO#block_scanf
-
-Sat Mar  6 02:00:19 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: net/https is merged.
-
-	* ext/openssl/lib/net/https.rb: ditto.
-
-Sat Mar  6 00:39:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
-
-	* oniggnu.h: imported from Oniguruma library.
-	* oniguruma.h: ditto.
-	* regcomp.c: ditto.
-	* regenc.c: ditto.
-	* regenc.h: ditto.
-	* regerror.c: ditto.
-	* regex.c: ditto.
-	* regexec.c: ditto.
-	* reggnu.c: ditto.
-	* regint.h: ditto.
-	* regparse.c: ditto.
-	* regparse.h: ditto.
-	* ascii.c: ditto.
-	* euc_jp.c: ditto.
-	* sjis.c: ditto.
-	* utf8.c: ditto.
-
-	* MANIFEST: added Oniguruma files listed above.
-
-	* LEGAL: added Oniguruma license.
-
-	* regex.h: now includes oniggnu.h.
-
-	* re.c: applied Oniguruma patch.
-
-Fri Mar  5 23:13:08 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: support WebDAV methods, PROPPATCH, LOCK,
-	  UNLOCK, OPTIONS, PROPFIND, DELETE, MOVE, COPY, MKCOL.
-	  This patch is contributed by Tatsuki Sugiura.
-
-Fri Mar  5 20:58:37 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: Net::HTTPResponse#response is obsolete.
-	  [ruby-core:02592]
-
-	* lib/net/http.rb: Net::HTTPResponse#header is obsolete.
-
-	* lib/net/http.rb: Net::HTTPResponse#read_header is obsolete.
-
-Fri Mar  5 20:10:57 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: new method StringScanner#initialize_copy
-	  to allow #dup and #clone.
-
-	* test/strscan/test_strscan.rb: test StringScanner#dup.
-
-Fri Mar  5 19:42:09 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTPResponse#to_ary): should return an object
-	  which does not respond to #to_ary.  It causes infinite loop in
-	  puts. [ruby-core:02578]
-
-Fri Mar  5 00:51:35 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/test/unit.rb: Move RDoc documentation so that you can
+	* lib/test/unit.rb: MOve RDoc documentation so that you can
 	  now say 'ri Test::Unit'
 
-Thu Mar  4 22:31:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in: miniruby is not needed for cross compile.
-
-	* configure.in (PREP): miniruby for native compile.
-
-Thu Mar  4 11:46:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command):
-	  detach server processes to get rid of zombies.
-
-Thu Mar  4 10:41:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (T_MASK): save 1 bit in flags bits by shifting T_xxx
-	  values.
-
-Thu Mar  4 08:08:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c: get rid of warnings.
-
-	* lib/rss/taxonomy.rb: ditto.
-
-	* lib/rdoc/ri/ri_formatter.rb: ditto.
-
-	* test/ruby/test_assignment.rb: ditto.
-
-Thu Mar  4 01:17:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_display.rb (DefaultDisplay::page): wait until the
-	  pager terminates.
-
-Wed Mar  3 13:10:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_hash): new method. [ruby-talk:93968]
-
-	* eval.c (proc_eq): do not compare dyna_vars.
-
-	* eval.c (proc_hash): new method.
-
-	* eval.c (rb_yield_0): protect break/return from within orphan (or
-	  lambda) Proc object.
-
-Wed Mar  3 09:52:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb ($topdir): use compile_dir only when not installed yet.
-	  [ruby-talk:94098]
-
-Wed Mar  3 01:18:52 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/converter.rb: handled Uconv::Error.
-
-	* lib/rss/dublincore.rb: DublincoreModel -> DublinCoreModel
-
-Wed Mar  3 00:59:30 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: soak_up_spaces only ungetc's non-space last
-	  character
-
-	* lib/scanf.rb: IO#block_scanf now returns partial last iteration
-	  array if format string matches partly
-
-Tue Mar  2 16:30:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): erred program name should be reported by
-	  exceptions, instead of the first argument.
-
-	* process.c (rb_spawn): ditto.
-
-	* process.c (proc_spawn_v): use first argument as program name.
-
-	* win32/win32.c (rb_w32_aspawn): ditto.
-
-	* win32/win32.c (CreateChild): search executable file if no program
-	  name given.
-
-	* lib/drb/extservm.rb (invoke_service_command): use Process.spawn.
-	  [ruby-dev:23103]
-
-	* lib/rdoc/ri/ri_display.rb (setup_pager): use IO.popen.
-	  [ruby-dev:23086], [ruby-dev:23103]
-
-	* lib/rdoc/diagram.rb (convert_to_png): ditto.
-
-	* lib/rdoc/generators/chm_generator.rb (compile_project): ditto.
-
-Tue Mar  2 12:24:03 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Mar  2 12:32:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
 	  defined? NORETURN. [ruby-dev:23100]
 
-Tue Mar  2 11:28:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_iterator.rb (test_ljump): cannot use
-	  assert_nothing_raised due to passing block.
-
-Tue Mar  2 06:23:14 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: fixed Kernel#scanf to propagate code block
-
-Mon Mar  1 23:25:40 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: Partial fix so STDIN#scanf works with new
-	 STDIN#pos behavior
-
-Mon Mar  1 19:42:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/setup.mak: configure's default is "--enable-install-doc"
-
-	* win32/setup.mak: ditto.
-
 Mon Mar  1 12:24:10 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
@@ -41408,105 +17760,38 @@ Sun Feb 29 23:14:53 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
 	  Handle :nodoc: on singleton classes.
 
-Sat Feb 28 21:50:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bcc32/Makefile.sub, bcc32/README.bcc32, bcc32/configure.bat,
-	  bcc32/setup.mak: new configure scheme. use ``configure --prefix=dir''
-	  instead of ``make DESTDIR=dir install''.
-	  --with-static-linked-ext support on bccwin32. [ruby-dev:23034]
-
-Sat Feb 28 21:50:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/setup.mak: "configure --disable-install-doc" is now working.
-
-	* win32/setup.mak: ditto.
-
-Sat Feb 28 15:09:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/configure.bat: append missing label ":exit".
-
-	* bcc32/configure.bat: fix typo.
-
-Sat Feb 28 10:31:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 28 10:58:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* MANIFEST: add test_erb.rb
 
 	* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
 	  if both filename and safe_level given. [ruby-dev:23050]
 
-Sat Feb 28 01:08:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (yylex): should not allow symbol for invalid global
-	  variable (e.g. `:$-)`). [ruby-core:02518]
-
-Fri Feb 27 20:37:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): no orphan block check is needed when pcall
-	  is true.
-
-	* eval.c (localjump_destination): update localjump condition.
-
-Fri Feb 27 02:10:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (localjump_destination): lambda should not interfere
-	  return from the yielded block.
-
-Fri Feb 27 00:53:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Feb 27 01:00:09 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
 
-Thu Feb 26 12:15:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (make_cmdvector): adjust successive double-quote
-	  handling.
-
-Thu Feb 26 09:42:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (delete_if_i): use st_delete_safe() (via
-	  rb_hash_delete()) instead of returning ST_DELETE.
-
-Thu Feb 26 02:35:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_f_exec): get rid of SEGV when exec failed for command
-	  in single string.
-
-Wed Feb 25 21:17:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (obj_free), io.c (rb_io_fptr_finalize), rubyio.h (OpenFile):
-	  sharing OpenFile.
-
-	* io.c (rb_io_initialize): accept IO instance.  [ruby-dev:22195]
-
-Wed Feb 25 21:16:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 25 21:16:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (with_destdir): should return the given argument if no
 	  DESTDIR is given.
 
 	* instruby.rb: use path name expansion of cmd.exe.
 
-Wed Feb 25 20:44:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/cgi-lib.rb, lib/getopts.rb, lib/importenv.rb, lib/parsearg.rb:
-	  warn with caller position.
+	* error.c (NameError::Message): new class for lazy evaluation of
+	  message to ensure replaced before marshalling. merge from HEAD.
+	  (ruby-bugs-ja:PR#588)
 
-	* test/rss/test_content.rb, test/rss/test_dublincore.rb,
-	  test/rss/test_syndication.rb, test/rss/test_trackback.rb: use cgi
-	  instead of cgi-lib.
+	* eval.c (rb_method_missing): use NameError::Message. merge from
+	  HEAD. (ruby-bugs-ja:PR#588)
 
-Tue Feb 24 18:42:03 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Tue Feb 24 18:59:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (glob_helper): '**/' should not match leading period
 	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
 
-Tue Feb 24 18:03:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_file.rb (test_fnmatch): test for dir.c:1.108.
-
-Tue Feb 24 17:07:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (fnmatch): File.fnmatch with File::FNM_PATHNAME was broken
-	  for the pattern including '*' followed by '/'.
-
 Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
@@ -41524,6 +17809,11 @@ Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
 	  class variables in code listings
 
+Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
+	  class variables in code listings
+
 Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
@@ -41552,164 +17842,88 @@ Tue Feb 24 03:45:06 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
 
-Mon Feb 23 09:09:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (parse_args): use optparse instead of getopts.
+Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* instruby.rb (DOSISH): embedded path in batch files should not be
 	  prefixed by DESTDIR.  [ruby-core:02186]
 
-Sun Feb 22 14:58:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* ext/extmk.rb: $extstatic is Array or nil now.  [ruby-talk:93383]
+	* re.c: corrected documentation format (again)
 
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: terminate options.
-
-	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
-
-Sun Feb 22 13:05:37 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
-
-Sun Feb 22 12:58:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: use optparse instead of getopts.
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: ditto.
-
-Sun Feb 22 09:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* re.c: corrected documentation format (rb_reg_initialize_m)
 
-Sat Feb 21 22:41:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* ext/zlib/zlib.c: documented, but needs more effort.
 
-Sat Feb 21 14:33:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
-
-Sat Feb 21 11:12:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 21 11:12:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing/os2.c, missing/x68.c: typo fix.  pointed out by greentea.
 
-Fri Feb 20 19:11:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct#initialize_copy): should not share
-	  members.  [ruby-dev:22966]
-
 Fri Feb 20 18:59:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
 	  irb. [ruby-dev:39243]
 
-Fri Feb 20 12:55:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (pipe_open): fix typo.
-
-	* win32/win32.c (CreateChild): first argument to CreateProcess() must
-	  have path, not just basename.
-
 Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
 	  Support visibility modifiers for attributes
 
-Thu Feb 19 22:39:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
 
-	* lib/ostruct.rb: documented
+	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
+	  Support visibility modifiers for attributes
 
 Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
 	  DRb.start_service could handle this.
 
-Thu Feb 19 22:24:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* 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)
+	* lib/ostruct.rb: documented
 
-Thu Feb 19 18:08:18 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* ext/strscan/strscan.c: improved documentation
 
-Thu Feb 19 18:08:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c, win32/win32.h: fixed prototypes.
-
-	* win32/win32.c (wait): same as waitpid() with -1.
+Thu Feb 19 03:10:52 2004  Minero Aoki  <aamine@loveruby.net>
 
-Thu Feb 19 02:34:28 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
 
-	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::include_file):
-	  Only strip comment markers if all lines start with comments.
+Thu Feb 19 02:30:34 2004  Minero Aoki  <aamine@loveruby.net>
 
-Thu Feb 19 03:05:49 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: StringScanner#restsize is obsolete;
-	  use #rest_size instead.
-
-	* ext/strscan/strscan.c: StringScanner#matchedsize is obsolete;
-	  use #matched_size instead.
-
-Thu Feb 19 02:42:19 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: don't use rb_eval_string, it defines
-	  classes under the module when required in module clauses.
-	  [ruby-dev:22951]
-
-Thu Feb 19 02:37:28 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: merge documentation from 1.8 branch.
-	  Thanks Gavin Sinclair.
-
-Thu Feb 19 00:20:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/cgi-lib.rb:   deprecated after 1.8.1
-
-	* lib/getopts.rb:   ditto
-
-	* lib/importenv.rb: ditto
-
-	* lib/parsearg.rb:  ditto
+	* ext/strscan/strscan.c: documentation checked.
 
 Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
 	  Strip extraneous space from filenames in :include:
 
-Wed Feb 18 22:53:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb/unix.rb: remove O_NONBLOCk, thanks \ay
+	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
 
-Wed Feb 18 22:42:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* test/rinda/test_rinda.rb: improt test_rinda.rb
+	* ext/strscan/strscan.c: documented
 
 Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/*: should not depend on $KCODE.
 
-Wed Feb 18 18:07:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_sprintf.rb: added tests.
-
 Wed Feb 18 17:18:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
 
 Wed Feb 18 10:40:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
-	  if FPLUS flag is specified.  [ruby-list:39224]
-
 	* sprintf.c (rb_f_sprintf): do not prepend dots for negative
-	  numbers if FZERO is specified.  [ruby-dev:39218]
-
-Wed Feb 18 10:23:34 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): clean up.
+	  numbers if FZERO is specified.  [ruby-list:39218]
 
 Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
 
@@ -41718,11 +17932,6 @@ Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
 
 Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-	* test/soap/marshal/test_marshal.rb, test/ruby/test_marshal.rb: do $:
-	  trick to share the testcase test/ruby/marshaltestlib.rb.
-
-Tue Feb 17 23:13:23 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
 	* test/ruby/marshaltestlib.rb: common marshal testcase added.
 
 	* test/ruby/test_marshal.rb: use above testsuite.
@@ -41731,282 +17940,108 @@ Tue Feb 17 23:13:23 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/soap/marshal/cmarshal.rb: removed (not used).
 
-Tue Feb 17 19:34:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
-
-	* ext/extmk.rb (extmake): remove compile directory if empty.
-
-	* ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
-	  initialization of $extout_prefix from lib/mkmf.rb.  [ruby-dev:22928]
-
-	* ext/extmk.rb: clear ext and extout directory when cleaning.
-
-	* lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.
-
-Tue Feb 17 18:02:10 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: ScanError may be (wrongly) garbage
-	  collected. (thanks Gavin Sinclair)
+Tue Feb 17 10:51:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/strscan/strscan.c: move ::ScanError to StringScanner::Error.
-	  ::ScanError is also defined for backward compatibility.
-
-	* ext/strscan/strscan.c: #peep is obsolete, use #peek.
-
-	* ext/strscan/strscan.c: #empty? is obsolete, use #eos?.
-
-	* ext/strscan/strscan.c: #clear is obsolete, use #terminate.
-
-	* ext/strscan/strscan.c: #getbyte is obsolete, use #get_byte.
+	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
 
-Tue Feb 17 12:12:47 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
 
-	* ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
-	  make.
+	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
+	  to NODE_LIT.  [ruby-dev:22920]
 
-	* lib/mkmf.rb (CLEANLIBS): should remove files have specific
-	  extensions.
+Tue Feb 17 01:24:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Feb 17 11:33:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
+	  STACK_GROW_DIRECTION. [ruby-dev:22910]
 
-	* lib/rss/rexmlparser.rb: REXML version may be 4 digits.
+	* bcc32/Makefile.sub (config.h): add newer checks.
 
-Tue Feb 17 10:45:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
 
-	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+Tue Feb 17 00:38:10 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Tue Feb 17 07:48:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
 
-	* lib/rexml/encodings/SHIFT_JIS: wrong library name.
+Tue Feb 17 00:18:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
+	* test/rinda/test_rinda.rb: import test_rinda.rb
 
-	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
-	  to NODE_LIT.  [ruby-dev:22920]
+Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-Tue Feb 17 01:20:57 2004  Minero Aoki  <aamine@loveruby.net>
+	* bcc32/Makefile.sub: avoid warning "Redefinition of macro
+	  'HAVE_GETLOGIN'".
 
-	* lib/fileutils.rb: new module FileUtils::DryRun.
+	* vms/config.h_in: ditto.
 
 Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/csv.rb: document reduction.  [ruby-core:02429]
 
-	* test/yaml/test_yaml.rb: added 0..1 test with "0".."1" on display.
-	  it should be defined that the specification about what kind of Range
-	  is supported in ruby's custom type in YAML.
-
-Mon Feb 16 22:22:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/generator.rb: corrected doc format
-
 	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
-
 	* lib/rinda/tuplespace.rb: ditto
 
-	  [Note: rinda files actually committed Wed Feb 18 07:27:00 2004]
-
-Mon Feb 16 20:28:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Feb 16 20:41:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
 
 	* bcc32/setup.mak: ditto.
 
-Mon Feb 16 18:35:58 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): should create *.pdb on ext/,
-	  not .ext/.
-
-	* win32/Makefile.sub (config.status): convert the name of import
-	  library.
-
-	* lib/mkmf.rb (create_makefile): now don't need to remove
-	  $(TARGET).lib.
-
-Mon Feb 16 15:45:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check functions, fork spawnv.
-
-	* io.c (rb_io_s_popen): accept argv not only single command line.
-
-	* process.c (rb_proc_exec_n): export.
-
-	* process.c (rb_check_argv): check if arguments are safe to invoke.
-
-	* process.c (rb_fork): retry to fork.
-
-	* process.c (rb_spawn): spawn child process asynchronously.
-
-	* process.c (rb_f_system): raise an exception if the command could not
-	  execute.
-
-	* win32/win32.c (rb_w32_argv_size): count necessary size for joined
-	  arguments.
-
-	* win32/win32.c (rb_w32_join_argv): join arguments with quoting.
-
-	* win32/win32.c (rb_w32_pipe_exec, rb_w32_spawn, rb_w32_aspawn):
-	  accept program name adding to command line.
-
-Mon Feb 16 15:18:33 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/racc/parser.rb: add note for Racc full package.
-
-Mon Feb 16 15:13:01 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/README: new file.
+Mon Feb 16 13:39:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* ext/racc/cparse/MANIFEST: add README.
+	* dir.c (rb_glob, rb_globi): add const.
 
-Mon Feb 16 12:29:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.h: ditto.
 
-	* ext/iconv/iconv.c (iconv_s_list): new method Iconv.list
-	  (libiconv only).
-
-Mon Feb 16 10:29:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance
-	  in Win32. This is achived by calling downcase() for single-byte
-	  characters. (CharLower() is slower than downcase())
-
-Mon Feb 16 02:14:29 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Feb 16 02:16:33 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: should warn suspicious pointer conversion.
 
 	* bcc32/setup.mak: ditto.
 
-Sun Feb 15 20:56:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (push_braces): remove wrong const. [ruby-dev:22891]
-
-Sun Feb 15 20:41:15 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* sample/soap/calc/httpd.rb, sample/soap/exchange/httpd.rb,
-	  sample/soap/sampleStruct/httpd.rb, sample/wsdl/googleSearch/httpd.rb:
-	  use soap/property instead of getopts for configuring DocumentRoot
-	  and port# of httpd.  see samplehttpd.conf below.
-
-	* sample/soap/calc/samplehttpd.conf,
-	  sample/soap/exchange/samplehttpd.conf,
-	  sample/soap/sampleStruct/samplehttpd.conf,
-	  sample/wsdl/googleSearch/samplehttpd.conf: added.
+Sun Feb 15 19:06:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Sun Feb 15 19:13:33 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
+	  RequestExpiredError if not found.
 
-	* lib/rinda/tuplespace.rb: read(tpl,0), raise RequestExpiredError
-	  if not found.
-
-Sun Feb 15 15:48:57 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Sun Feb 15 15:56:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
 	  Thanks, arton.
 
-Sun Feb 15 15:23:29 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h, dir.c (rb_glob): add const.
-
 Sun Feb 15 01:46:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
 	  [ruby-dev:22870]
 
-Sat Feb 14 23:59:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb: use fileutils.rb instead of ftools.rb.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
-	  STACK_GROW_DIRECTION.
-
-	* bcc32/Makefile.sub (config.h): add newer checks.
-
-	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
-
-Sat Feb 14 23:26:27 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/un.rb: use OptionParser instead of getopts.
-
-Sat Feb 14 11:28:14 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 11:29:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* sample/drb/*: import lib/drb/sample
 
-Sat Feb 14 11:14:12 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Feb 14 11:08:23 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: add pretty_print, thanks gotoken.
 
-Fri Feb 13 21:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/fileutils.rb: slighly improved documentation (sync with 1.8)
-
-Fri Feb 13 19:57:01 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_trackback.rb: added tests for TrackBack with RSS
-	  2.0.
-
-	* test/rss/common.rb: added methods make RSS 2.0.
-
-	* lib/rss/trackback.rb: TrackBack API is decided.
-
-	* lib/rss/rss.rb: RSS::VERSION 0.0.7 -> 0.0.8.
+Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/rss/parser.rb, lib/rss/rss.rb: replaced $DEBUG by RSS::DEBUG.
+	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
+	  EACCES on Windows.
 
-	* lib/rss/2.0.rb: removed RSS 2.0 URI. Because RSS 2.0 doesn't
-	  have URI.
-
-Fri Feb 13 14:41:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: en-bugged at last commit (Feb 11 23:24:22 2004)
-
-Fri Feb 13 12:26:37 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: rescue SystemCallError instead
-	  of EINVAL.  File.link may raise EACCES on network file systems.
-
-Fri Feb 13 05:18:58 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on
-	  Win9x. [ruby-dev:22713]
-
-Thu Feb 12 21:49:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 	* lib/ftools.rb: documented
 
-Thu Feb 12 21:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* lib/base64.rb: added and tidied documentation
+	* lib/base64.rb: backported from HEAD (modularised and documented)
 
-Thu Feb 12 20:45:01 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb (WriteAdapater#puts): must append "\n" to
-	  the string, don't prepend. (ruby-bugs:PR#1280)
-
-Thu Feb 12 20:31:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 12 20:31:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
 	  directives in DOS line-ending files at all.
 
-Thu Feb 12 15:23:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rparen): ignore preceding newlines to right parentheses.
-	  (ruby-bugs:PR#1221) [ruby-dev:22858]
-
-Thu Feb 12 14:17:43 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set ac_cv_func_link to yes to enable link() on MinGW.
-	  [ruby-dev:22241]
-
-Thu Feb 12 13:32:49 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (link): raise NotImplementedError on Win9X.
-	  contributed by Tietew. [ruby-dev:22713]
-
-	* win32/win32.c, win32/win32.h (link): add const.
-
-Thu Feb 12 09:56:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/lib/tk.rb (TkComm::tk_split_list): suppress a warning.
-
 Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb: use assert_raise instead of assert_raises.
@@ -42018,91 +18053,26 @@ Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
 	* lib/tsort.rb: ditto.
 	  use TSortHash and TSortArray instead of Hash and Array in test.
 
-Wed Feb 11 23:24:22 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: properly treat a Tcl/Tk's string with escaping
-	  special characters.
-
-Tue Feb 10 20:49:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (method_proc): return bound Proc object.  [ruby-dev:22854]
-
-	* eval.c (rb_mod_define_method): bind method body itself for Method
-	  object.
-
-	* node.h (NODE_DMETHOD): deprecated.
-
-	* object.c (rb_class_inherited_p): export.
-
-Tue Feb 10 16:43:50 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
-
-Tue Feb 10 14:33:08 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_match): raise TypeError when both arguments are
-	  strings. [ruby-dev:22851]
-
-	* 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.
-
-Mon Feb  9 17:46:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, configure.in,
-	  runruby.rb: run rdoc, test and so on with compiled extension
-	  libraries.  [ruby-dev:22688]
-
-	* ext/extmk.rb, lib/mkmf.rb: make extension libraries in separated
-	  directory, similar to the actual directory structure.
-
-	* lib/fileutils.rb (FileUtils.copy_file): use the mode of the original
-	  file to create new file.
-
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths::SYSDIR): get rid of unexpected
-	  influence by envirionment variable.
-
-	* bcc32/configure.bat, win32/configure.bat: add install-doc options.
-
-	* win32/win32.c, win32/win32.h (rb_w32_fstat): fix Borland C runtime
-	  bug which returns wrong mode.  [ruby-dev:22846]
-
-Mon Feb  9 16:30:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (detach_process_watcher): return the last status.
-	  [ruby-dev:22841]
-
-Sun Feb  8 16:46:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
-	  sign for higher heap areas.
-
-Sun Feb  8 16:18:27 2004  akira yamada  <akira@ruby-lang.org>
-
-	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
-	  added tests.
-
-Sun Feb  8 15:51:57 2004  akira yamada  <akira@ruby-lang.org>
+Wed Feb 11 20:01:12 2004  akira yamada  <akira@ruby-lang.org>
 
 	* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
 	  File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
 
-Sun Feb  8 15:41:45 2004  akira yamada  <akira@ruby-lang.org>
+	* test/ruby/test_proc.rb (TestProc::test_eq): added a
+	  test.  [ruby-dev:22599]
 
-	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_range_cycle):
-	  added tests. [ruby-core:02306] [ruby-core:02311]
+	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
+	   Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
 
-Sun Feb  8 14:24:35 2004  Minero Aoki  <aamine@loveruby.net>
+Tue Feb 10 16:43:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb (HTTP#request): should not overwrite Connection
-	  header. (ruby-bugs:PR#1274)
+	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
 
-Sun Feb  8 10:11:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Feb  9 17:16:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* dir.c (glob_helper): Dir.glob('**/') did not work. [ruby-dev:22832]
+	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
 
-Sun Feb  8 00:29:26 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
 	  [ruby-dev:22815]
@@ -42110,14 +18080,10 @@ Sun Feb  8 00:29:26 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 	* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
 	  [ruby-dev:22819]
 
-	* dir.c: Did some styles (no change to behavior)
+Sun Feb  8 16:46:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Feb  7 19:56:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb/init.rb (IRB.rc_files): yield possible rc file names.
-
-	* lib/irb/input-method.rb (IRB::ReadlineInputMethod::initialize):
-	  load and save history automatically.  [ruby-core:02352]
+	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
+	  sign for higher heap areas.
 
 Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -42134,27 +18100,6 @@ Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
 	  variable which is defined in the test.
 
-Fri Feb  6 18:54:18 2004  akira yamada  <akira@ruby-lang.org>
-
-	* test/ruby/test_proc.rb (TestProc::test_eq): added a
-	  test.  [ruby-dev:22599]
-
-Fri Feb  6 18:26:00 2004  akira yamada  <akira@ruby-lang.org>
-
-	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
-	  Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
-
-Fri Feb  6 10:12:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (bsock_do_not_reverse_lookup): control reverse
-	  lookup for every instance.  [ruby-core:02346]
-
-Fri Feb  6 09:15:11 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb/extend-command.rb: add irb_help command.  [ruby-talk:91610]
-
-	* lib/irb/cmd/help.rb (IRB::ExtendCommand::Help): show RDoc.
-
 Fri Feb  6 00:48:37 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
@@ -42171,10 +18116,6 @@ Thu Feb  5 23:56:55 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/set.rb (Set#pretty_print): use seplist.
 
-Wed Feb  4 22:39:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_stat_mode): should not sign-expand, so backout.
-
 Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
 
 	* file.c (test_l): fix wrong method name in document.
@@ -42185,37 +18126,19 @@ Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
 	  (test_sgid): ditto.
 	  (test_sticky): ditto.
 
-Tue Feb  3 22:36:25 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/2.0.rb, lib/rss/content.rb, lib/rss/dublincore.rb,
-	  lib/rss/rss.rb, lib/rss/syndication.rb: removed warnings.
-
-	* lib/rss/converter.rb: removed handling load error of nkf.
-
-	* test/rss/test_syndication.rb, test/rss/test_trackback.rb,
-	  test/rss/test_dublincore.rb, test/rss/test_content.rb: replaced
-	  'require "rss/parser"' by 'require "rss/1.0"'.
-
-	* test/rss/test_parser.rb, test/rss/test_accessor.rb: removed
-	  'require "rss/parser"'.
-
-Tue Feb  3 11:23:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reduce_nodes): remove tail returns.  [ruby-talk:90934]
-
 Tue Feb  3 08:04:57 2004  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
 
-Mon Feb  2 22:06:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb  2 19:33:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* parse.y (block_append, new_evstr, void_expr0): remove no longer used
-	  labels.
+	* configure.in: backport from 1.9 for Interix.
 
-Mon Feb  2 18:45:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* dln.c (dln_load): ditto.
 
-	* dln.c (dln_load): don't specify RTLD_GLOBAL on Interix,
-	  because it caused SEGV when running runner.rb.
+Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/net/http.rb (canonical_each): fix merge miss.
 
 Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 
@@ -42237,14 +18160,12 @@ Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
 	  4 arguments form.
 
-Sun Feb  1 23:00:00 2004  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* ext/bigdecimal.c: Bug in BigDecimal("1e#{n}").add BigDecimal('.5'),n)
-	  reported and fixed by Javier Goizueta.
+	* lib/net/http.rb: merged coding style changes from HEAD.
 
-Sun Feb  1 18:21:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	  From ruby_1_8 branch:
 	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
 	* lib/matrix.rb: improved documentation.
 	* lib/net/http.rb: slight documentation formatting improvement.
@@ -42255,32 +18176,27 @@ Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
 	 raise an errror on non-http proxy URI.
 	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
 
-Sun Feb  1 00:57:41 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb (RSS::Parser): added @@default_parser. Used
-	  XML parser became selectable.
-	* test/rss/test_parser.rb: added tests for
-	  RSS::Parser.default_parser.
+Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
 
-Sat Jan 31 02:28:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* sample/openssl/gen_csr.rb: wrong usage string.
 
-	* configure.in (RPATHFLAG): set to -Wl,-R like NetBSD on Interix.
+Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-Sat Jan 31 01:09:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: leading 0 padding of timestamp usec part.
+	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
+	  "parts" attribute of soap:body element in WSDL.
 
-Fri Jan 30 18:53:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
+	  simpleType element which is not supported for now.
 
-	* re.c (KR_REHASH): wrong hash value on sizeof(long) > sizeof(int).
+	* lib/soap/mapping/factory.rb: deleted unused methods.
 
-Thu Jan 29 23:11:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
+	  string <-> Ruby class name matching.
 
-	* configure.in (DLEXT2): removed.  Ruby does not treat
-	  ".dll" as a extention library anymore.
+	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
+	  files.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub (DLEXT2):
-	  ditto.
+Thu Jan 29 23:56:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* util.c (mblen): fix overrun.  [ruby-dev:22672]
 
@@ -42289,83 +18205,36 @@ Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
 	  THis means you can write "see f1[link:files/f1_rb.html]".
 
-Thu Jan 29 22:24:47 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* sample/openssl/gen_csr.rb: follow OpenSSL::X509::Name change.
-	  ASN.1 type of subject DN elements were wrong.
-
-Thu Jan 29 22:19:51 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/*: remove $: trick.  [ruby-dev:22763]  use test/runner.rb to
-	  run test.
-
-Thu Jan 29 19:28:16 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (Request#initialize): reject only when a path is
-	  empty. [ruby-dev:22771]
+Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-Thu Jan 29 18:54:08 2004  H.Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (glob_helper): infinite loop bug in win32 code.
-	  [ruby-dev:22770]
-
-Thu Jan 29 17:03:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
-	  [ruby-dev:22761]
-
-Thu Jan 29 11:32:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/rss/test_*: do $: trick while searching a module in the current
-	  directory.
-
-	* test/xsd/test_xmlschemaparser.rb, test/wsdl/test_emptycomplextype.rb,
-	  test/soap/helloworld/test_helloworld.rb,
-	  test/soap/calc/{test_calc.rb,test_calc2.rb}: do File.expand_path
-	  before using __FILE__.
-
-	* test/yaml/test_yaml.rb: assert_equals -> assert_equal.
-
-Thu Jan 29 01:56:02 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c: usec round-tripping skew. [ruby-core:2305]
-
-	* lib/yaml/rubytypes.rb: character Range now round-trips. [ruby-core:2306]
-
-	* test/yaml/test_yaml.rb: add Time and Range tests.
-
-Thu Jan 29 00:00:46 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: rss/parser.rb is always required.
-
-Wed Jan 28 15:09:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
+	  second argument. it expected to be a Hash not an Integer.
 
-	* test/rss/*.rb: remove "test/" prefix.
+	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
+	  function for OpenSSL::X509::Name#add_entry.
 
-Wed Jan 28 13:07:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
+	  tag number to each element of return value.
 
-	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
+	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
 
-Wed Jan 28 12:43:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
+	  second argument takes OBJECT_TYPE_TEMPLATE by default.
 
-	* lib/rss: rss library imported. [ruby-dev:22726]
+	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
 
 Wed Jan 28 04:29:41 2004  Eric Schwartz  <emschwar@fc.hp.com>
 
 	* lib/cgi/session.rb: use LOCK_SH to read, and a few other
 	  improvements.  [ruby-core:02328]
 
-Tue Jan 27 15:00:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el: better support for general delimited
-	  strings.  [ruby-dev:22695]
-
-Tue Jan 27 11:04:40 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
+Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
 
 	* ext/socket/socket.c (s_recvfrom): sending length should be an
 	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
 
-Tue Jan 27 10:31:28 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/win32ole/win32ole.c (set_argv): fix condition.
 
@@ -42374,14 +18243,19 @@ Tue Jan 27 02:26:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
 	  refine regex for header-name.
 
+Tue Jan 27 00:30:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub: rollback.
+
 Mon Jan 26 22:53:04 2004  Dave Thomas  <dave@pragprog.com>
 
 	* io.c: Remove documentation references to $defout.
 
-Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jan 26 15:11:47 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* sample/exyacc.rb: escape '}' to avoid warning.
 
-	* lib/weakref.rb (WeakRef::initialize): set up @__id before
-	  calling "super".
+Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb (Delegator::initialize): preserve
 	  singleton_method_added method [ruby-dev:22685]
@@ -42389,11 +18263,11 @@ Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/delegate.rb (Delegator::initialize): use Kernel::raise
 	  instead of mere raise.  [ruby-dev:22681]
 
-Mon Jan 26 12:45:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jan 26 12:47:17 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
 
-Mon Jan 26 11:30:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
 	  (ruby-bugs:PR#1256)
@@ -42401,112 +18275,18 @@ Mon Jan 26 11:30:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/win32ole/win32ole.c (set_argv): set real arguments to
 	  WIN32OLE::ARGV.  [ruby-list:39073]
 
-Sun Jan 25 18:25:26 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): third
-	  argument become optional.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
-
-	* ext/openssl/ossl_x509name.c (Init_x509name): emailAddress and
-	  domainComponent should be IA5String.
-
-Sun Jan 25 01:45:38 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): support
-	  virtual host.
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): add
-	  new method to register virtual hosting server.
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#lookup_server): add
-	  new method to lookup virtual hosting server.
-
-Sat Jan 24 13:06:26 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
-	  second argument. it expected to be a Hash not an Integer.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
-	  function for OpenSSL::X509::Name#add_entry.
-
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
-	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
-	  second argument takes OBJECT_TYPE_TEMPLATE by default.
-
-Fri Jan 23 02:26:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (num2i32): pack should not raise RangeError.
-	  [ruby-dev:22654]
-
-	* pack.c (pack_pack): do not auto convert nil to zero.
-
 Thu Jan 22 22:54:53 2004  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* 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.
 
-Thu Jan 22 18:35:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/e2mmap.rb (VERSION): remove unnecessary version checking.
-
-Thu Jan 22 16:21:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (string_content): reset lexical states at the beginning of
 	  string contents.  [ruby-list:39061]
 
-Thu Jan 22 08:08:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (opt_rescue): use NODE_ERRINFO() instead of
-	  NODE_GVAR("$!"), to avoid confusion from variable aliasing.
-	  [ruby-talk:90074]
-
-	* version.c (Init_version): remove obsolete constants VERSION
-	  etc.  [ruby-dev:22643]
-
-Thu Jan 22 01:46:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (newline_node): do not use NODE_NEWLINE node anymore,
-	  use NEWLINE flag instead.
-
-Thu Jan 22 01:12:12 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* missing/os2.c (chdir, getcwd):
-	  use _chdir2 and _getcwd2 supporting multiple drives in OS/2 with EMX.
-
-Thu Jan 22 00:33:52 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* configure.in: check availability of link(). [ruby-dev:22237]
-	* file.c (rb_file_s_link): raise an exception when link() is unavailable.
-	* missing/os2.c (link): removed. File#link isn't supported.
-	* bcc32/Makefile.sub: define HAVE_LINK to enable link(). [ruby-dev:22241]
-	* win32/Makefile.sub: ditto.
-
-Thu Jan 22 00:26:25 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* ChangeLog: typo: RUBY_MBCHAR_MAX was RUBY_MBCHAR_MAXSIZE.
-
-Thu Jan 22 00:12:51 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* defines.h: define RUBY_MBCHAR_MAX instead of MB_CUR_MAX.
-	* dir.c (Next, emx_mblen): use RUBY_MBCHAR_MAX for mblen().
-	* file.c (CharNext): ditto.
-	* ruby.c (translate_char): ditto.
-	* util.c (__crt0_glob_function): ditto.
-
-Thu Jan 22 00:10:01 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/base64.rb: :nodoc: the Deprecated module
-
-Wed Jan 21 23:52:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: Interix(SFU) support.
-
-Wed Jan 21 23:03:45 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
 	* lib/drb/extserv.rb: typo
@@ -42519,28 +18299,21 @@ Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
 	* lib/net/imap.rb (ensure_nz_number): show a detailed error
 	  message.
 
-Wed Jan 21 16:44:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
 	  [ruby-dev:22652]
 
-Wed Jan 21 16:10:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/base64.rb: enclosed in a module.  [ruby-core:02285]
-
-Wed Jan 21 16:01:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 21 16:01:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/digest/rmd160/extconf.rb: have_library appends found library.
 
 Wed Jan 21 11:36:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* ext/socket/socket.c (sock_gethostbyname): returns host if
-	  ai_canonname is NULL. (ruby-bugs PR#1243)
-
 	* parse.y (block_append): update nd_end for "real" head node.
 	  [ruby-list:39058]
 
-Tue Jan 20 14:48:28 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jan 20 14:48:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
 	  of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
@@ -42560,57 +18333,25 @@ Tue Jan 20 13:22:39 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/English.rb: Document English.rb.
 
-Tue Jan 20 04:41:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_marshal.rb (MarshalTestLib::test_exception): test
-	  for [ruby-dev:22604].
-
-	* test/ruby/test_marshal.rb (MarshalTestLibtest_singleton): test
-	  for [ruby-dev:22588].
-
-Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_class): should not dump singleton class.
-	  [ruby-dev:22631]
-
 Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/extconf.rb: add check for OpenSSL version.
 	  [ruby-list:39054]
 
-Mon Jan 19 23:56:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_mesg_to_str): inverted condition for result of
-	  inspection.  [ruby-dev:22628]
-
-Mon Jan 19 22:24:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* sample/exyacc.rb: escape '}' to avoid warning.
-
-	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
-
-Mon Jan 19 21:28:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/digest/defs.h, win32/win3.c, win32/win32.h, file.c: remove
-	  useless casts for Borland C.
-
-Mon Jan 19 17:39:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (NameError::message): internal use only.
+Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* eval.c (rb_method_missing): use hidden constant.
+	* marshal.c (w_class): should not dump singleton class.
+	  [ruby-dev:22631]
 
-Mon Jan 19 16:30:53 2004  akira yamada  <akira@ruby-lang.org>
+Tue Jan 20 01:31:36 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* test/ruby/test_time.rb: added tests for [ruby-dev:22614] and
-	  [ruby-dev:22617].
+	* io.c (lineno): typo fix(FIX2INT -> INT2FIX).
 
-Mon Jan 19 13:09:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jan 19 21:53:38 2004  akira yamada  <akira@ruby-lang.org>
 
-	* ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
-	  win32/setup.mak: --with-static-linked-ext support on mswin32.
+	* io.c, re.c, string.c, time.c: fixed up positions of RDocs.
 
-Mon Jan 19 06:49:07 2004  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: zone was wrong when it was behind UTC.
 	  Thanks Mark J. Reed.
@@ -42620,53 +18361,10 @@ Mon Jan 19 06:49:07 2004  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* sample/cal.rb: added a class, anyway.
 
-Mon Jan 19 01:08:39 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* 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]
-
-	* lib/cgi.rb (CGI::QueryExtension): give extended string, not a
-	  delegater object.
-
-Sun Jan 18 23:59:44 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/charset_alias.rb: prefer us_EN locale encodings or
-	  former.  [ruby-dev:22609]
-
-	* ext/iconv/iconv.c (iconv_create): raise InvalidEncoding
-	  exception when EINVAL.
-
-Sun Jan 18 23:16:34 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c, error.c, file.c, io.c, numeric.c, object.c, re.c, struct.c,
-	  time.c: marked init_copy functions nodoc.
-
 Sun Jan 18 20:47:35 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ruby.c: use translate_char() on Cygwin.
 
-Sun Jan 18 20:00:16 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
-	  "parts" attribute of soap:body element in WSDL.
-
-	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
-	  simpleType element which is not supported for now.
-
-	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
-	  files.
-
-Sun Jan 18 16:46:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_overflow_p): should return results.  [ruby-dev:22614]
-
-Sun Jan 18 12:07:24 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* test/ruby/test_time.rb: new test case to test Time#[+-].
-
-	* time.c (time_plus, time_minus): fix RangeError for a negative
-	  argument in environments whose time_t is unsigned. [ruby-dev:22608]
-
 Sun Jan 18 02:33:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
@@ -42676,136 +18374,59 @@ Sun Jan 18 00:23:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* marshal.c (class2path): check anonymous class/module before
 	  checking referable, and allow singleton classes.
 
-Sat Jan 17 23:58:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (NameError::Message): new class for lazy evaluation of
-	  message to ensure replaced before marshalling.  [ruby-dev:22604]
-
-	* eval.c (rb_method_missing): use NameError::Message.
-
-Sat Jan 17 21:49:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/time.rb (test_rfc2822, test_rfc3339, test_encode_xmlschema):
-	  should not expect that all platforms handle negative time_t value.
-
-Fri Jan 16 23:53:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (proc_eq): compare also arguments and environment
-	  (including local variables).  [ruby-dev:22590]
-
 Fri Jan 16 14:33:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (class2path): get class path and check referable.
 	  [ruby-dev:22588]
 
-Thu Jan 15 12:58:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 16 09:52:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (proc_eq): Proc with empty body may not be equal.
+	  [ruby-dev:22590]
+
+Thu Jan 15 13:03:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (argf_read): do not append EOF.  (ruby-bugs-ja:PR#585)
 
 	* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
 	  weird behavior.  [ruby-dev:22424]
 
-Wed Jan 14 21:13:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/inlinetest.rb (InlineTest::eval_part): eval under the top
-	  level environment.
-
-Wed Jan 14 17:54:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/inlinetest.rb (InlineTest::loadtest): require instead of
-	  load, to get rid of multiple loading.
-
-Wed Jan 14 13:30:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
 
-Wed Jan 14 09:32:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* MANIFEST: add test/net/test_httpheader.rb. (commit miss?)
-
-Wed Jan 14 00:58:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (Init_Proc): move SystemStackError from under
-	  StandardError to Exception.  [ruby-talk:89782]
-
-Tue Jan 13 18:03:02 2004  Ian Macdonald  <ian@caliban.org>
-
-	* file.c (rb_stat_wr, rb_stat_ww): New functions
-	  implementing new methods (File::Stat#world_readable?,
-	  File::Stat#world_writable?).
-
-Tue Jan 13 16:53:25 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c: omission of Date library code caused
-	  test suite failure. [ruby-core:2251]
-
-Tue Jan 13 16:50:03 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: use $0 as the default application class name.
-
-Tue Jan 13 14:48:00 2004  Ian Macdonald  <ian@caliban.org>
-
-	* lib/pathname.rb: New methods (Pathname#world_readable?,
-	  Pathname#world_writable?).
+Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-Tue Jan 13 14:48:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (primary): allow no "when" case. [ruby-dev:22578]
+	* 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.
 
-	* ruby.h (rb_class_of): reduce branch. [ruby-dev:22577]
+	* 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.
 
-	* ruby.h (rb_type): ditto.
+	* test/logger/test_logger.rb: follow above change (ArgumentError ->
+	  TypeError.)  follow above commit.
 
-Tue Jan 13 14:26:59 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Jan 13 14:27:13 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
 	  moved run method which allows output level.  [ruby-dev:22554]
 
-Tue Jan 13 13:04:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/test_*.rb: Pathname#parent -> Pathname#dirname.
-
-Tue Jan 13 11:38:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/yaml/test_yaml.rb (YAML_Unit_Tests::test_spec_type_{int,float}):
-	  fix syntax error.
-
-Tue Jan 13 07:52:40 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/bytecode.c: turn off default implicit typing.
-
-	* ext/syck/implicit.c: detect base60 integers.
-
-	* ext/syck/rubyext.c: handle base60, as well as hex and octal
-	  with commas.  implicit typing of ruby symbols.
-
-	* test/yaml/test_yaml.rb: add test.
-
 Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
 	  Show fully-qualified class names in class list.
 
-Tue Jan 13 01:24:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (test_wr): Rdoc fix.  [ruby-core:02225]
-
 Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
 	  incorporating DESTDIR in the rdoc installation.
 
-Mon Jan 12 23:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 12 23:27:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
 
-Mon Jan 12 18:00:11 2004  Ian Macdonald  <ian@caliban.org>
-
-	* file.c (test_wr, test_ww): New functions implementing new
-	  methods (File::world_readable?, File::world_writable?).
-
-	* file.c (S_IRUGO, S_IGUGO): New macros.
-
 Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
@@ -42823,22 +18444,29 @@ Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
 	  HTML formats need explicit line breaks.
 
+Mon Jan 12 11:46:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
+	  quotes.  [ruby-dev:22564]
+
+	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+
+	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+
 Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
 	  generation support to ri (Elliot Hughes)
 
-Sun Jan 11 23:54:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* env.h (ruby_frame, ruby_scope, ruby_in_eval, ruby_class,
-	  ruby_dyna_vars): export.  [ruby-dev:22566]
+Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
 
-Sun Jan 11 02:35:53 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
+	  generation support to ri (Elliot Hughes)
 
-	* ext/socket/socket.c (make_hostent): a bug in brace position.
+Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
 
-	* configure.in: install rdoc by default. if you do not want to
-	  install rdoc, specify --disable-install-doc.
+	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+	  Also accept command line options via the 'RI' environment variable.
 
 Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
 
@@ -42859,49 +18487,7 @@ Sat Jan 10 01:54:50 2004  Eric Sunshine  <sunshine@sunshineco.com>
 	  correctly on Rhapsody when -arch compiler flag was used (via
 	  configure's --enable-fat-binary option).
 
-Sat Jan 10 23:01:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
-	  quotes.  [ruby-dev:22564]
-
-	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
-
-	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
-
-Sat Jan 10 22:46:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_inspect): new method, Dir#inspect.  [ruby-dev:22562]
-
-Fri Jan  9 17:36:51 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (make_hostent): getaddrinfo(3) on BSD do not
-	  fill ai_canonname if serv is not supplied.  (ruby-bugs PR#1243)
-
-Fri Jan  9 13:14:59 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/test/unit/collector/dir.rb: do not ignore exceptions(LoadError
-	  and SystemExitError) while loading a testcase.  smell of bug.
-
-	* test/testunit/collector/test_dir.rb: add new test of the LoadError.
-
-	* test/drb/{test_drbssl.rb,test_drbunix.rb}: do not define testcase if
-	  openssl is not installed.
-
-	* test/testunit/collector/test_dir.rb: assert_raises -> assert_raise.
-
-Fri Jan  9 11:52:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubysig.h: <errno.h> is needed to use errno which may be a macro.
-
-Fri Jan  9 11:20:24 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* ext/extmk.rb (extmake): should not reduce necessary libraries.
-	  [ruby-dev:22440]
-
-	* lib/mkmf.rb (merge_libs): merge libraries according to
-	  dependency.
-
-Fri Jan  9 10:05:23 2004  Siena.  <siena@faculty.chiba-u.jp>
+Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
 
 	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
 
@@ -42911,7 +18497,7 @@ Thu Jan  8 23:49:21 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	  rdoc documentation, you need to run configure with
 	  --enable-install-doc.
 
-Thu Jan  8 21:17:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
 	  public key only.
@@ -42925,10 +18511,6 @@ Thu Jan  8 21:17:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
 	  OpenSSL::PKey::RSA#to_der.
 
-Thu Jan  8 18:25:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): should not recurse in exceptional status.
-
 Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
@@ -42938,58 +18520,15 @@ Thu Jan  8 11:20:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* eval.c, object.c, process.c, re.c: don't use C++ style comments.
 
-Thu Jan  8 08:46:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (yaml_org_handler): lazy-load Date for
-	  static-ext.
-
-Thu Jan  8 07:06:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: preserve order in Setup.  [ruby-dev:22503]
-
-	* ext/extmk.rb: move dependent libraries just after depended
-	  libraries.
-
-	* ext/digest/*/extconf.rb: depend on digest.
-
-Thu Jan  8 04:36:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jan  8 04:36:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
 	  @config[:Logger] if it was not given.
 
-Wed Jan  7 22:28:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): fix memory leak.
-
-Wed Jan  7 21:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
 	* sample/webrick/*: new files.
 
 	* MANIFEST: add sample/webrick/*
 
-Wed Jan  7 20:51:51 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/net/test_httpheader.rb: new file.
-
-	* MANIFEST: add test/net/test_httpheader.rb.
-
-Wed Jan  7 20:42:06 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (HTTPHeader#content_length): should return nil
-	  unless header exists. [ruby-dev:22519]
-
-Wed Jan  7 14:26:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb (TkPanedWindow): use epath for embedded windows.
-
-	* ext/tk/lib/tktext.rb: use epath for embedded windows.
-
-	* ext/tk/lib/tkcanvas.rb: use epath for window items.
-
-Wed Jan  7 14:24:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/{attachment.rb,mimemessage.rb}: added from soap4r/1.5.2.
-
 Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
@@ -43013,71 +18552,16 @@ Tue Jan  6 22:13:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (rb_mod_modfunc): should break if m has no super class.
 	  [ruby-dev:22498]
 
-Tue Jan  6 21:51:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan  6 21:55:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): should save errno just after failure.
 	  [ruby-dev:22492]
 
-Tue Jan  6 20:51:10 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb(Logger#msg2str): no special treatment for the object
-	  which responds to :to_str.
-
-	* lib/logger.rb(LogDevice#initialize): remove type checking if the
-	  given object is a String.  Kernel.open handles it correctly.
-
-	* test/logger/test_logger.rb: follow above change (ArgumentError ->
-	  TypeError.)
-
 Tue Jan  6 14:53:14 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/ri: split out the display side, making it pluggable. Added
 	  new ri_driver and ri_display files in lib/rdoc/ri.
 
-Tue Jan  6 11:29:43 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/inlinetest.rb, test/{test_generator.rb,test_ipaddr.rb,
-	  test_pathname.rb,test_pp.rb,test_prettyprint.rb,test_set.rb,
-	  test_time.rb,test_tsort.rb: added.
-
-Tue Jan  6 09:38:27 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* import soap4r/1.5.2;
-
-	* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
-	  introduce SOAPExternalReference class as a referenct to SOAPEnvelope
-	  external content.
-
-	* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
-	  with Attachments) support code by Jamie Herre.
-
-	* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
-	  streamHandler.rb,wsdlDriver.rb}: SwA support.
-
-	* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
-	  soaplet.rb}: SwA support and refactoring.
-
-	* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
-	  SOAPReference#initialize signature change.
-
-	* lib/soap/mapping/factory.rb: deleted unused methods.
-
-	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
-	  string <-> Ruby class name matching.
-
-	* lib/xsd/datatypes.rb: check the smallest positive non-zero
-	  single-precision float exactly instead of packing with "f".
-	  [ruby-talk:88822]
-
-	* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
-	  1.4e-45.  1.4e-45 is smaller than 2 ** -149...
-
-	* 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".
-
-	* test/soap/test_streamhandler.rb: revert to the previous test that
-	  warns "basic_auth unsupported under net/http".
-
 Tue Jan  6 06:37:53 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/rdoc: Add --ri-system switch
@@ -43098,45 +18582,6 @@ Tue Jan  6 00:04:40 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
 	  fix parsing if there are braces in a method parameter list
 
-Tue Jan  6 01:01:04 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/dir.h, win32/win32.c: fix patch miss.
-
-	* win32/Makefile.sub: fix file dependency.
-
-Mon Jan  5 20:32:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/logger.rb: enhanced documentation.
-
-Mon Jan  5 18:58:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
-	  [ruby-dev:22486]
-
-	* pack.c (pack_unpack): unpack requires big endian offet (OFF16B
-	  and OFF32B).  The patch is from Minero Aoki in [ruby-dev:22489]
-
-	* pack.c (OFF16B): add big-endian offset again.
-
-Mon Jan  5 03:00:53 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_pack.rb: new test test_unpack_N.
-
-Mon Jan  5 01:47:53 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): remove duplicated object files
-	  from $objs on DOSISH platforms.
-
-Sat Jan  3 02:44:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rubysig.h (TRAP_END): preserve errno before switching context.
-	  [ruby-core:02137]
-
-Sat Jan  3 01:18:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
-	  [ruby-dev:22476]
-
 Fri Jan  2 14:54:11 2004  Dave Thomas  <dave@pragprog.com>
 
 	* bin/ri: Add new --classes option, and arrange for
@@ -43155,23 +18600,10 @@ Fri Jan  2 01:50:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (argf_eof): ARGF.eof? should not have any side effect.
 	  [ruby-dev:22469]
 
-Thu Jan  1 09:03:20 2004  Dave Thomas  <dave@pragprog.com>
-
-	* bin/ri (report_class_stuff): Fix problem with ambiguous nested
-	  classes not matching.
-
 Wed Dec 31 17:25:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (argf_each_byte): should return self.  [ruby-dev:22465]
 
-Wed Dec 31 15:05:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/pathname.rb: Corrected small coding error.
-
-Wed Dec 31 15:00:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/pathname.rb: Completed documentation.
-
 Wed Dec 31 11:20:34 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
@@ -43210,20 +18642,16 @@ Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
 Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nsting of yield parameters correctly for:
-
-	    def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
-
-Tue Dec 30 07:30:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	  Handle undoing nesting of yield parameters correctly for:
 
-	* lib/pathname.rb: Added documentation.
+	  def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
 
-Mon Dec 29 20:08:17 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
 
-	* lib/net/http.rb (GenericRequest#initialize): check if path
-	  begins with '/'.
+	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
+	  Handle undoing nesting of yield parameters correctly for:
 
-	* lib/net/http.rb: def m( arg ) -> def m(arg)
+	    def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
 
 Mon Dec 29 12:51:02 2003  Dave Thomas  <dave@pragprog.com>
 
@@ -43237,25 +18665,10 @@ Mon Dec 29 05:05:51 2003  Dave Thomas  <dave@pragprog.com>
 
 	* struct.c, random: Add RDoc comments
 
-Mon Dec 29 02:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/optparse.rb: Improved documentation.
-
 Mon Dec 29 02:20:54 2003  Dave Thomas  <dave@pragprog.com>
 
 	* eval.c: Add RDoc for class Proc, Method, UnboundMethod
 
-Mon Dec 29 02:20:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb: fix install directory if destdir and compile_dir are
-	  not in the same drive.
-
-	* ext/extmk.rb: ditto. [ruby-list:39009]
-
-	* win32/Makefile.sub, win32/README.win32, win32/configure.bat,
-	  win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
-	  instead of ``nmake DESTDIR=dir install''.
-
 Mon Dec 29 00:41:44 2003  Dave Thomas  <dave@pragprog.com>
 
 	* math.c: Add RDoc comments
@@ -43289,7 +18702,7 @@ Sun Dec 28 03:50:05 2003  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
 	  Escape method names used in regexp
 
-Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
 	  Add support for rules in 'ri' output.
@@ -43307,27 +18720,27 @@ Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
 
 	* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
 
-Sun Dec 28 00:46:25 2003  Dave Thomas  <dave@pragprog.com>
+Sun Dec 28 00:48:47 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
-	  Some Ruby source uses lower-case class names for the
-	  Init_Xxx C function name.
+	  Some source files use lower case class or module names
+	  when naming the Init_XXX function in C.
 
 Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* configure.in: fix "test: too many arguments" error.
 
-Sat Dec 27 15:32:40 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+Sat Dec 27 15:32:19 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
 
-	* time.c: Add RDoc comments for Time class.
+	* time.c: RDoc comments added
 
-Sat Dec 27 15:07:26 2003  Dave Thomas  <dave@pragprog.com>
+Sat Dec 27 15:07:57 2003  Dave Thomas  <dave@pragprog.com>
 
 	* object.c: Add RDoc comments for Symbol class.
 
-Sat Dec 27 14:39:53 2003  Dave Thomas  <dave@pragprog.com>
+Sat Dec 27 14:42:30 2003  Dave Thomas  <dave@pragprog.com>
 
-	* numeric.c (Init_Numeric): Add RDoc comments.
+	* numeric.c: Add RDoc comments.
 
 Sat Dec 27 00:44:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -43345,7 +18758,7 @@ Fri Dec 26 23:02:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (rb_io_getline): should return nil when read_all gives
 	  empty string, even when nil rs is specified. [ruby-core:02077]
 
-Fri Dec 26 18:33:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 26 18:50:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in: check if getcontext and setcontext are available.
 
@@ -43355,26 +18768,14 @@ Fri Dec 26 16:40:53 2003  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
 
-Fri Dec 26 14:05:13 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_pack.rb: new test test_pack_N.
-
-Fri Dec 26 12:53:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Dec 26 09:26:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* pack.c (pack_pack): add sign check for 'i', and 'l'.
 	  [ruby-dev:22427]
 
 	* bignum.c (rb_quad_pack): add range check for 'quad int'.
 
-Fri Dec 26 10:58:58 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* MANIFEST: add vms/config.h and remove vms/config.h_in.
-
-Fri Dec 26 10:42:00 2003  AKIYOSHI, Masamichi  <masamichi.akiyoshi@hp.com>
-
-	* io.c: [VMS] "rfm=stmlf" is specified for open() and fopen().
-
-Thu Dec 25 22:29:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Dec 25 22:39:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* string.c (rb_str_update): don't return any value.
 
@@ -45224,10 +20625,10 @@ Wed Nov  5 22:55:16 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
 
-	* ext/tk/lib/tktext.rb: add TkText#text_copy, text_cut, text_paste
+	* 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
 
-	* ext/tk/lib/tk.rb: add TkMenu#set_focus support Tcl/Tk's
+	* ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
 	  tk_menuSetFocus
 
 Wed Nov  5 17:33:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -45639,6 +21040,11 @@ Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): remove debug print.
 
+Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (search_required): required name must not be changed before
+	  loading.  [ruby-dev:24492]
+
 Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
@@ -45796,10 +21202,10 @@ Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
 
 Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb:
+	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
 	  new demo-scripts
 
-	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget:
+	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
 	  add entries for 'entry3.rb'
 
 Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
@@ -46622,6 +22028,35 @@ Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* test/soap/calc/*: give httpd config param "CGIInterpreter".
 	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
 
+Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (r_byte): retrieve pointer from string value for each
+	  time.  [ruby-dev:24404]
+
+	* marshal.c (r_bytes0): ditto.
+
+	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
+
+	* io.c (io_read): should freeze all reading buffer.
+	  [ruby-dev:24400]
+
+	* string.c (rb_str_sum): should use bignums when bits is greater
+	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+
+	* eval.c (specific_eval): defer pointer retrieval to prevent
+	  unsafe sourcefile string modification.  [ruby-dev:24382]
+
+	* string.c (rb_str_sum): wrong cast caused wrong result.
+	  [ruby-dev:24385]
+
+	* enum.c (enum_sort_by): hide temporary array from
+	  ObjectSpace.each_object.  [ruby-dev:24386]
+
+	* string.c (rb_str_sum): check was done with false pointer.
+	  [ruby-dev:24383]
+
+	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
+
 Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* signal.c (ruby_signal_name): adjust to the prototype.
@@ -46785,6 +22220,20 @@ Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_nowrite.rb: ditto.
 
+Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_delete): comparison may change the capacity.
+	  [ruby-dev:24348]
+
+	* array.c (rb_ary_fill): fill should honor length argument.
+	  [ruby-dev:24346]
+
+	* array.c (rb_ary_replace): should not use ptr from shared array.
+	  [ruby-dev:24345]
+
+	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
+	  [ruby-talk:113807]
+
 Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
@@ -47188,7 +22637,7 @@ Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
 
-	* ext/tk/lib/*.rb: Ruby/Tk works at $SAFE == 4
+	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
 
 Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
@@ -47407,7 +22856,7 @@ Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
 
-	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb}:
+	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
 	  bug fix and improvement of font control
 
 Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -47508,17 +22957,17 @@ Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* process.c: deny handling IDs during evaluating the block given to
 	  the Process::{UID,GID}.switch method
 
-	* ext/tcltklib/tcltklib.c: some methods have no effect if on slave-IP
+	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
 
-	* ext/tcltklib/tcltklib.c: can create a interpreter without Tk
+	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
 
-	* ext/tcltklib/tcltklib.c: bug fix on handling exceptions
+	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
 
-	* ext/tcltklib/MANUAL.euc: modify
+	* ext/tcltklib/MANUAL.euc : modify
 
-	* ext/tk/lib/tk.rb: freeze some core modules
+	* ext/tk/lib/tk.rb : freeze some core modules
 
-	* ext/tk/lib/multi-tk.rb: more secure
+	* ext/tk/lib/multi-tk.rb : more secure
 
 	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
 	  Tk's list
@@ -47526,9 +22975,9 @@ Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
 
 	* 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
+	  ext/tk/lib/tktext.rb : fix bug of font handling
 
-	* ext/tk/lib/tkfont.rb: TkFont.new() accepts compound fonts
+	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
 
 Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
deleted file mode 100644
index 39dc6a9b8b..0000000000
--- a/KNOWNBUGS.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# This test file concludes tests which point out known bugs.
-# So all tests will cause failure.
-#
diff --git a/LEGAL b/LEGAL
index 51dfb22de1..908eb270f5 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,27 +5,34 @@ All the files in this distribution are covered under either the Ruby's
 license (see the file COPYING) or public-domain except some files
 mentioned below.
 
-oniguruma.h:
-regcomp.c:
-regenc.[ch]:
-regerror.c:
-regex.c:
-regexec.c:
-regint.h:
-regparse.[ch]:
-ascii.c:
-euc_jp.c:
-sjis.c:
-utf8.c:
-
-Oniguruma  ----   (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
-
-http://www.geocities.jp/kosako3/oniguruma/
-http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
-http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
-
-   When this software is partly used or it is distributed with Ruby, 
-   this of Ruby follows the license of Ruby.
+regex.[ch]:
+
+  These files are under LGPL.  Treat them as LGPL says. (See the file
+  LGPL for details)
+
+    Extended regular expression matching and search library.
+    Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+
+    The GNU C Library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public License as
+    published by the Free Software Foundation; either version 2 of the
+    License, or (at your option) any later version.
+
+    The GNU C Library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with the GNU C Library; see the file LGPL.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
+
+    Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
+    Last change: May 21, 1993 by t^2
+    removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
+    Perl5 extension added by matz <matz@caelum.co.jp>
+    UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
 
 configure:
 
@@ -66,21 +73,6 @@ parse.c:
     the same distribution terms that you use for the rest of that program.
 
 util.c (partly):
-
-    Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
-
-    Permission to use, copy, modify, and distribute this software for any
-    purpose without fee is hereby granted, provided that this entire notice
-    is included in all copies of any software which is or includes a copy
-    or modification of this software and in all copies of the supporting
-    documentation for such software.
-
-    THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
-    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
-    REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
-    OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
-
-util.c (partly):
 win32/win32.[ch]:
 
   You can apply the Artistic License to these files. (or GPL,
@@ -148,18 +140,51 @@ missing/isinf.c:
 missing/isnan.c:
 missing/memcmp.c:
 missing/memmove.c:
+missing/strcasecmp.c:
 missing/strchr.c:
 missing/streror.c:
 missing/strftime.c:
+missing/strncasecmp.c:
 missing/strstr.c:
 missing/strtol.c:
 ext/digest/sha1/sha1.[ch]:
 
   These files are all under public domain.
 
+missing/strtod.c:
+
+  This file will not be used on most platforms depending on how the
+  configure script results.  In any case you must not receive any fee
+  with the file itself.
+
+    Copyright (c) 1988-1993 The Regents of the University of California.
+    Copyright (c) 1994 Sun Microsystems, Inc.
+
+    Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without
+    fee is hereby granted, provided that the above copyright
+    notice appear in all copies.  The University of California
+    makes no representations about the suitability of this
+    software for any purpose.  It is provided "as is" without
+    express or implied warranty.
+
+missing/strtoul.c:
+
+  This file will not be used on most platforms depending on how the
+  configure script results.  In any case you must not receive any fee
+  with the file itself.
+
+    Copyright 1988 Regents of the University of California
+
+    Permission to use, copy, modify, and distribute this
+    software and its documentation for any purpose and without
+    fee is hereby granted, provided that the above copyright
+    notice appear in all copies.  The University of California
+    makes no representations about the suitability of this
+    software for any purpose.  It is provided "as is" without
+    express or implied warranty.
+
 missing/erf.c:
-missing/tgamma.c:
-missing/lgamma_r.c:
 missing/crypt.c:
 missing/vsnprintf.c:
 
@@ -201,36 +226,6 @@ missing/vsnprintf.c:
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
-missing/strlcat.c
-missing/strlcpy.c
-
-  These files are under the new-style BSD license.
-
-   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ext/digest/md5/md5.[ch]:
 
   These files are under the following license.  Ruby uses modified
diff --git a/Makefile.in b/Makefile.in
index ad4f27abd9..a37bcf65fb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,15 +4,14 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-hdrdir = $(srcdir)/include
+VPATH = $(srcdir):$(srcdir)/missing
 
 CC = @CC@
-YACC = bison
+YACC = @YACC@
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
 MKFILES = @MAKEFILES@
-BASERUBY = @BASERUBY@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -32,19 +31,14 @@ RDOCTARGET = @RDOCTARGET@
 
 EXTOUT = @EXTOUT@
 RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
 
 empty =
 OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @ARCH_FLAG@
+CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
-warnflags = @warnflags@
-XCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = 
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -55,8 +49,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-ARCHMINIOBJS = @MINIOBJS@
-BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
+MINIOBJS = @MINIOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -80,16 +73,11 @@ LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 
-THREAD_MODEL  = @THREAD_MODEL@
-
 PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
-SET_LC_MESSAGES = env LC_MESSAGES=C
 
-CP            = cp
-MV            = mv
 RM            = rm -f
 NM            = @NM@
 AR            = @AR@
@@ -97,12 +85,8 @@ ARFLAGS       = rcu
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@
-IFCHANGE      = $(srcdir)/tool/ifchange
-SET_LC_MESSAGES = env LC_MESSAGES=C
 
 OBJEXT        = @OBJEXT@
-ASMEXT        = S
-DLEXT         = @DLEXT@
 MANTYPE	      = @MANTYPE@
 
 INSTALLED_LIST= .installed.list
@@ -117,7 +101,7 @@ all:
 
 miniruby$(EXEEXT):
 		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
@@ -155,7 +139,7 @@ fake.rb:	Makefile
 		end; \
 		' > $@
 
-Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
+Makefile:	$(srcdir)/Makefile.in
 
 $(MKFILES): config.status $(srcdir)/common.mk
 		MAKE=$(MAKE) $(SHELL) ./config.status
@@ -167,42 +151,52 @@ $(MKFILES): config.status $(srcdir)/common.mk
 		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
 		{ echo "Makefile updated, restart."; exit 1; }
 
-config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in
+config.status:	$(srcdir)/configure
 		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
 
 $(srcdir)/configure: $(srcdir)/configure.in
 		cd $(srcdir) && $(AUTOCONF)
 
-# Things which should be considered:
-# * with gperf v.s. without gperf
-# * ./configure v.s. ../ruby/configure
-# * GNU make v.s. HP-UX make	# HP-UX make invokes the action if lex.c and keywords has same mtime.
-# * svn checkout generate a file with mtime as current time
-# * XFS has a mtime with fractional part
 lex.c: keywords
-	if cmp -s $(srcdir)/lex.c.src $?; then \
-	  cp $(srcdir)/lex.c.blt $@; \
+	( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \
+	if test -f $@; then \
+	  touch $@ && echo $@ touched.; \
 	else \
-	  gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
-	  mv $@.tmp $@ && \
-	  cp $? $(srcdir)/lex.c.src && \
-	  cp $@ $(srcdir)/lex.c.blt; \
+	  cp $(srcdir)/lex.c $@ && echo $@ copied.; \
 	fi
 
+.y.c:
+	$(YACC) $<
+	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
+	rm -f y.tab.c
+
 .c.@OBJEXT@:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 .s.@OBJEXT@:
 	$(AS) $(ASFLAGS) -o $@ $<
 
-.c.S:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
-
 clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
+	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
 
 distclean-local::
 	@$(RM) ext/config.cache $(RBCONFIG)
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+
+update-rubyspec: 
+	if [ -d $(srcdir)/rubyspec ]; then \
+	  cd $(srcdir)/rubyspec/mspec; \
+	  git pull; \
+	  cd ../spec/rubyspec; \
+	  git pull; \
+	else \
+	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
+	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec; \
+	fi
+
+test-rubyspec:
+	@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
+	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000000..965ce6de5a
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,638 @@
+= NEWS
+
+This document is a list of user visible feature changes made between
+releases except for bug fixes.
+
+Note that each entry is kept so brief that no reason behind or
+reference information is supplied with.  For a full list of changes
+with all sufficient information, see the ChangeLog file.
+
+* REXML
+
+  * REXML::Document.entity_expansion_limit=
+
+    New method to set the entity expansion limit. By default the limit is
+    set to 10000.  See the following URL for details.
+
+    http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
+
+== Changes since the 1.8.6 release
+
+=== Configuration changes
+
+* vendor_ruby directory
+
+  A new library directory named `vendor_ruby' is introduced in
+  addition to `site_ruby'.  The idea is to separate libraries
+  installed by the package system (`vendor') from manually (`site')
+  installed libraries preventing the former from getting overwritten
+  by the latter, while preserving the user option to override vendor
+  libraries with site libraries. (`site_ruby' takes precedence over
+  `vendor_ruby')
+
+  If you are a package maintainer, make each library package configure
+  the library passing the `--vendor' option to `extconf.rb' so that
+  the library files will get installed under `vendor_ruby'.
+
+  You can change the directory locations using configure options such
+  as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
+
+=== Global constants
+
+* new constants
+
+  * RUBY_COPYRIGHT
+  * RUBY_DESCRIPTION
+
+=== Library updates (outstanding ones only)
+
+* new library
+
+  * securerandom
+
+* builtin classes
+
+  * Array#flatten
+  * Array#flatten!
+
+    Takes an optional argument that determines the level of recursion
+    to flatten.
+
+  * Array#eql?
+  * Array#hash
+  * Array#==
+  * Array#<=>
+
+    Handle recursive data properly.
+
+  * Array#index
+  * Array#rindex
+
+    Take a block instead of an argument.
+
+  * Array#collect!
+  * Array#map!
+  * Array#each
+  * Array#each_index
+  * Array#reverse_each
+  * Array#reject
+  * Array#reject!
+  * Array#delete_if
+
+    Return an enumerator if no block is given.
+
+    Note that #map and #collect still return an array unlike Ruby 1.9
+    to keep compatibility.
+
+  * Array#pop
+  * Array#shift
+
+    Take an optional argument specifying the number of elements to
+    remove.
+
+  * Array#choice
+  * Array#combination
+  * Array#cycle
+  * Array#drop
+  * Array#drop_while
+  * Array#permutation
+  * Array#product
+  * Array#shuffle
+  * Array#shuffle!
+  * Array#take,
+  * Array#take_while
+
+    New methods.
+
+  * Binding#eval
+
+    New method.
+
+  * Dir#each
+  * Dir#foreach
+
+    Return an enumerator if no block is given.
+
+  * Enumerable::Enumerator
+
+    New class for various enumeration defined by the enumerator library.
+
+  * Enumerable#each_slice
+  * Enumerable#each_cons
+  * Object#to_enum
+  * Object#enum_for
+
+    New methods for various enumeration defined by the enumerator library.
+
+  * Enumerable#count
+  * Enumerable#cycle
+  * Enumerable#drop
+  * Enumerable#drop_while
+  * Enumerable#find_index
+  * Enumerable#first
+  * Enumerable#group_by
+  * Enumerable#max_by
+  * Enumerable#min_by
+  * Enumerable#minmax
+  * Enumerable#minmax_by
+  * Enumerable#none?
+  * Enumerable#one?
+  * Enumerable#take
+  * Enumerable#take_while
+
+    New methods.
+
+  * Enumerable#find
+  * Enumerable#find_all
+  * Enumerable#partition
+  * Enumerable#reject
+  * Enumerable#select
+  * Enumerable#sort_by
+
+    Return an enumerator if no block is given.
+
+    Note that #map and #collect still return an array unlike Ruby 1.9
+    to keep compatibility.
+
+  * Enumerable#inject
+
+    Accepts a binary operator instead of a block.
+
+  * Enumerable#reduce
+
+    New alias to #inject.
+
+  * Hash#eql?
+  * Hash#hash
+  * Hash#==
+
+    Handle recursive data properly.
+
+  * Hash#delete_if
+  * Hash#each
+  * Hash#each_key
+  * Hash#each_pair
+  * Hash#each_value
+  * Hash#reject!
+  * Hash#select
+  * ENV.delete_if
+  * ENV.each
+  * ENV.each_key
+  * ENV.each_pair
+  * ENV.each_value
+  * ENV.reject!
+  * ENV.select
+
+    Return an enumerator if no block is given.
+
+  * GC.stress
+  * GC.stress=
+
+    New methods.
+
+  * Integer#ord
+  * Integer#odd?
+  * Integer#even?
+  * Integer#pred
+
+    New methods.
+
+  * Integer#downto
+  * Integer#times
+  * Integer#upto
+
+    Return an enumerator if no block is given.
+
+  * IO#each
+  * IO#each_line
+  * IO#each_byte
+  * IO.foreach
+  * ARGF.each
+  * ARGF.each_line
+  * ARGF.each_byte
+
+    Return an enumerator if no block is given.
+
+  * IO#bytes
+  * IO#chars
+  * IO#each_char
+  * IO#getbyte
+  * IO#lines
+  * IO#readbyte
+  * ARGF.bytes
+  * ARGF.chars
+  * ARGF.each_char
+  * ARGF.getbyte
+  * ARGF.lines
+  * ARGF.readbyte
+
+    New methods. 
+
+  * Method#name
+  * Method#owner
+  * Method#receiver
+  * UnboundMethod#name
+  * UnboundMethod#owner
+
+    New methods.
+
+  * Module#class_exec
+  * Module#module_exec
+
+    New methods.
+
+  * Numeric#step
+
+    Return an enumerator if no block is given.
+
+  * Object#instance_exec
+  * Object#tap
+
+    New methods.
+
+  * ObjectSpace.each_object
+
+    Return an enumerator if no block is given.
+
+  * Process.exec implemented.
+
+  * Range#each
+  * Range#step
+
+    Return an enumerator if no block is given.
+
+  * Regexp.union accepts an array of patterns.
+
+  * String#bytesize
+
+    New method, returning the size in bytes. (alias length and size)
+
+  * String#chars
+  * String#each_char
+  * String#partition
+  * String#rpartition
+  * String#start_with?
+  * String#end_with?
+
+    New methods.  These are $KCODE aware unlike #index, #rindex and
+    #include?.
+
+  * String#each_byte
+  * String#each
+  * String#each_line
+  * String#gsub(pattern)
+
+    Return an enumerator if no block is given.
+
+  * String#upto
+
+    An optional second argument is added to specify if the last value
+    should be included.
+
+  * StopIteration
+
+    New exception class that causes Kernel#loop to stop iteration when
+    raised.
+
+  * Struct#each
+  * Struct#each_pair
+
+    Return an enumerator if no block is given.
+
+  * Symbol#to_proc
+
+    New method.
+
+  * __method__
+
+    New global function that returns the name of the current method as
+    a Symbol.
+
+* enumerator
+
+  * Enumerator is now a built-in module.  The #next and #rewind
+    methods are implemented using the "generator" library.  Use with
+    care and be aware of the performance loss.
+
+* ipaddr
+
+  * New methods
+    * IPAddr#<=>
+    * IPAddr#succ
+
+      IPAddr objects are now comparable and enumerable having these
+      methods.  This also means that it is possible to have a Range
+      object between two IPAddr objects.
+
+    * IPAddr#to_range
+
+      A new method to create a Range object for the (network) address.
+
+  * Type coercion support
+    * IPAddr#&
+    * IPAddr#|
+    * IPAddr#==
+    * IPAddr#include?
+
+      These methods now accept a string or an integer instead of an
+      IPAddr object as the argument.
+
+* net/smtp
+
+  * Support SSL/TLS.
+
+* openssl
+
+  * New classes
+    * OpenSSL::PKey::EC
+    * OpenSSL::PKey::EC::Group
+    * OpenSSL::PKey::EC::Point
+    * OpenSSL::PKey::PKCS5
+    * OpenSSL::SSL::Session
+
+  * Documentation!
+
+  * Various new methods (see documentation).
+
+  * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
+    Compatibility classes are provided which will be removed in Ruby 1.9.
+
+* shellwords
+
+  * Add methods for escaping shell-unsafe characters:
+    * Shellwords.join
+    * Shellwords.escape
+    * Array#shelljoin
+    * String#shellescape
+
+  * Add shorthand methods:
+    * Shellwords.split (alias shellwords)
+    * String#shellsplit
+
+* stringio
+
+  * StringIO#getbyte
+  * StringIO#readbyte
+
+    New methods. (aliases for compatibility with 1.9)
+
+  * StringIO#each_char
+  * StringIO#chars
+
+    New methods.
+
+  * StringIO#each
+  * StringIO#each_line
+  * StringIO#each_byte
+
+    Return an enumerator if no block is given.
+
+* tempfile
+
+  * Tempfile.open and Tempfile.new now accept a suffix for the
+    temporary file to be created.  To specify a suffix, pass an array
+    of [basename, suffix] as the first argument.
+
+      Tempfile.open(['image', 'jpg']) { |tempfile| ... }
+
+* tmpdir
+
+  * New method:
+
+    * Dir.mktmpdir
+
+* uri
+
+  * added LDAPS scheme.
+  * Change for RFC3986:
+    * FTP
+      * URI('ftp://example.com/foo').path #=> 'foo'
+      * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
+      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
+    * URI merge
+      * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
+      * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
+      * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
+
+* rss
+
+  * 0.1.6 -> 0.2.4
+
+  * Fix image module URI
+
+  * Atom support
+
+  * ITunes module support
+
+  * Slash module support
+
+  * content:encoded with RSS 2.0 support
+
+=== Interpreter Implementation
+
+* passing a block to a Proc [experimental]
+
+  This implementation in current shape is known to be buggy/broken,
+  especially with nested block invocation.  Take this as an
+  experimental feature.
+
+* stack trace
+
+  On non-SystemStackError exception, full stack trace is shown.
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* String#slice! had some unintentional bugs and they have been fixed
+  because either they disagreed with documentation or their respective
+  behavior of #slice.  Unfortunately, this causes some
+  incompatibilities in the following (somewhat rare) cases.
+
+  * #slice! no longer expands the array when an out-of-boundary value
+    is given.
+
+      # Ruby 1.8.6
+      a = [1,2]
+      a.slice!(4,0)   #=> nil
+      a               #=> [1,2,nil,nil]
+
+      # Ruby 1.8.7
+      a = [1,2]
+      a.slice!(4,0)   #=> nil
+      a               #=> [1,2]
+
+  * #slice! no longer raises an exception but returns nil when a
+    negative length or out-of-boundary negative position is given.
+
+      # Ruby 1.8.6
+      a = [1,2]
+      a.slice!(1,-1)  #=> (raises IndexError)
+      a.slice!(-5,1)  #=> (raises IndexError)
+
+      # Ruby 1.8.7
+      a = [1,2]
+      a.slice!(1,-1)  #=> nil
+      a.slice!(-5,1)  #=> nil
+
+* String#to_i, String#hex and String#oct no longer accept a sequence
+  of underscores (`__') as part of a number.
+
+    # Ruby 1.8.6
+    '1__0'.to_i     #=> 10
+    '1__0'.to_i(2)  #=> 2  # 0b10
+    '1__0'.oct      #=> 8  # 010
+    '1__0'.hex      #=> 16 # 0x10
+
+    # Ruby 1.8.7
+    '1__0'.to_i     #=> 1
+    '1__0'.to_i(2)  #=> 1
+    '1__0'.oct      #=> 1
+    '1__0'.hex      #=> 1
+
+  The old behavior was inconsistent with Ruby syntax and considered as
+  a bug.
+
+* date
+
+  * Date.parse
+
+    '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
+    instead of 'MM.DD.YY'.  While the change may confuse you, you can
+    always use Date.strptime() when you know what you are dealing
+    with.
+
+* stringio
+
+  * StringIO#each_byte
+
+    The return value changed from nil to self.  This is what the
+    document says and the same as each_line() does.
+
+* tempfile
+
+  * The file name format has changed.  No dots are included by default
+    in temporary file names any more.  See above for how to specify a
+    suffix.
+
+* uri
+
+  * See above for details.
+
+== Changes since the 1.8.5 release
+
+=== New platforms/build tools support
+
+* IA64 HP-UX
+
+* Visual C++ 8 SP1
+
+* autoconf 2.6x
+
+=== Global constants
+
+* RUBY_PATCHLEVEL
+
+  New constant since 1.8.5-p1.
+
+=== Library updates (outstanding ones only)
+
+* builtin classes
+
+  * New method: Kernel#instance_variable_defined?
+
+  * New method: Module#class_variable_defined?
+
+  * New feature: Dir::glob() can now take an array of glob patterns.
+
+* date
+
+  * Updated based on date2 4.0.3.
+
+* digest
+
+  * New internal APIs for C and Ruby.
+
+  * Support for autoloading.
+
+      require 'digest'
+
+      # autoloads digest/md5
+      md = Digest::MD5.digest("string")
+
+  * New digest class methods: file
+
+  * New digest instance methods: clone, reset, new, inspect,
+    digest_length (alias size or length), block_length()
+
+  * New library: digest/bubblebabble
+
+  * New function: Digest(name)
+
+* fileutils
+
+  * New option for FileUtils.cp_r(): :remove_destination
+
+* nkf
+
+  * Updated based on nkf as of 2007-01-28.
+
+* thread
+
+  * Replaced with much faster mutex implementation in C.  The former
+    implementation, which is slow but considered to be stable, is
+    available with a configure option `--disable-fastthread'.
+
+* tk
+
+  * Updated Tile extension support based on Tile 0.7.8.
+
+  * Support --without-X11 configure option for non-X11 versions of
+    Tcl/Tk (e.g. Tcl/Tk Aqua).
+
+  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
+    about STDIN blocking on Windows.
+
+* webrick
+
+  * New method: WEBrick::Cookie.parse_set_cookies()
+
+=== Compatibility issues (excluding feature bug fixes)
+
+* builtin classes
+
+  * String#intern now raises SecurityError when $SAFE level is greater
+    than zero.
+
+* date
+
+  * Time#to_date and Time#to_datetime are added as private methods.
+    They cause name conflict error in ActiveSupport 1.4.1 and prior,
+    which comes with Rails 1.2.2 and prior.  Updating ActiveSupport
+    and/or Rails to the latest versions fixes the problem.
+
+* digest
+
+  * The constructor does no longer take an initial string to feed.
+    The following examples show how to migrate:
+
+      # Before
+      md = Digest::MD5.new("string")
+      # After (works with any version)
+      md = Digest::MD5.new.update("string")
+        
+      # Before
+      hd = Digest::MD5.new("string").hexdigest
+      # After (works with any version)
+      hd = Digest::MD5.hexdigest("string")
+
+* fileutils
+
+  * A minor implementation change breaks Rake <=0.7.1.
+    Updating Rake to 0.7.2 or higher fixes the problem.
+
+* tk
+
+  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+    (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
+    but it is an alias name.
diff --git a/README b/README
index b898003937..1b79781367 100644
--- a/README
+++ b/README
@@ -26,6 +26,11 @@ The Ruby distribution files can be found in the following FTP site:
 
   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:
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
+
 The trunk of the Ruby source tree can be checked out with the
 following command:
 
diff --git a/README.EXT b/README.EXT
index 57a68c0103..637b19d25b 100644
--- a/README.EXT
+++ b/README.EXT
@@ -31,7 +31,7 @@ The Ruby interpreter has the following data types:
 	T_STRING	string
 	T_REGEXP	regular expression
 	T_ARRAY		array
-	T_FIXNUM	Fixnum(31bit or 63bit integer)
+	T_FIXNUM	Fixnum(31bit integer)
 	T_HASH		associative array
 	T_STRUCT	(Ruby) structure
 	T_BIGNUM	multi precision integer
@@ -78,8 +78,7 @@ There is the data-type check function
 
   void Check_Type(VALUE value, int type)
 
-which raises an exception if the VALUE does not have the type
-specified.
+which raises an exception if the VALUE does not have the type specified.
 
 There are also faster check macros for fixnums and nil.
 
@@ -93,48 +92,37 @@ respectively.  They are singletons for the data type.
 
 The T_FIXNUM data is a 31bit length fixed integer (63bit length on
 some machines), which can be converted to a C integer by using the
-FIX2INT() macro or FIX2LONG().  Though you have to check that the
-data is really FIXNUM before using them, they are faster.  FIX2LONG()
-never raises exceptions, but FIX2INT() raises RangeError if the
-result is bigger or smaller than the size of int.
-There are also NUM2INT() and NUM2LONG() which converts any Ruby
-numbers into C integers.  These macros 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 the same way.
+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 the same way.
 
 In version 1.7 or later it is recommended that you use the new macros
 StringValue() and StringValuePtr() to get a char* from a VALUE.
 StringValue(var) replaces var's value with 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 take only the lvalue as their
+representation of var.  These macros will skip the replacement if var is
+a String.  Notice that the macros take only the lvalue as their
 argument, to change the value of var in place.
 
-You can also use the macro named StringValueCStr(). This is just
-like StringValuePtr(), but always add nul character at the end of
-the result. If the result contains nul character, this macro causes
-the ArgumentError exception.
-StringValuePtr() doesn't gurantee to exist nul at the end of the
-result, and the result may contain nul.
-
 In version 1.6 or earlier, STR2CSTR() was used to do the same thing
 but now it is deprecated in version 1.7, because STR2CSTR() has a risk
-of a dangling pointer problem in the to_str() implicit conversion.
+of a dangling pointer problem in the to_str() impliclit conversion.
 
 Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has the corresponding
-structure can be cast to retrieve the pointer to the struct.  The
-casting macro will be of the form RXXXX for each data type; for
-instance, RARRAY(obj).  See "ruby.h".
+for T_ARRAY etc. The VALUE of the type which has the corresponding structure
+can be cast to retrieve the pointer to the struct.  The casting macro
+will be of the form RXXXX for each data type; for instance, RARRAY(obj). 
+See "ruby.h".
 
-There are some accessing macros for structure members, for example
-`RSTRING_LEN(s)' to to get the size of the Ruby String object.  The
-allocated region can be accessed by `RSTRING_PTR(str).  For arrays, use
-`RARRAY_LEN(ary) and `RARRAY_PTR(ary) respectively.
+For example, `RSTRING(str)->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.
 
 Notice: Do not change the value of the structure directly, unless you
-are responsible for the result.  This ends up being the cause of
-interesting bugs.
+are responsible for the result.  This ends up being the cause of interesting
+bugs.
 
 1.4 Convert C data into VALUE
 
@@ -164,10 +152,9 @@ range, but is a bit slower.
 
 1.5 Manipulating Ruby data
 
-As I already mentioned, it is not recommended to modify an object's
-internal structure.  To manipulate objects, use the functions supplied
-by the Ruby interpreter. Some (not all) of the useful functions are
-listed below:
+As I already mentioned, it is not recommended to modify an object's internal
+structure.  To manipulate objects, use the functions supplied by the Ruby
+interpreter. Some (not all) of the useful functions are listed below:
 
  String functions
 
@@ -189,28 +176,10 @@ listed below:
 
     Creates a new tainted Ruby string from a C string.
 
-  rb_sprintf(const char *format, ...)
-  rb_vsprintf(const char *format, va_list ap)
-
-    Creates a new Ruby string with printf(3) format.
-
   rb_str_cat(VALUE str, const char *ptr, long len)
 
     Appends len bytes of data from ptr to the Ruby string.
 
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Appends C string ptr to Ruby string str.  This function is
-    equivalent to rb_str_cat(str, ptr, strlen(ptr)).
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    Appends C string format and successive arguments to Ruby string
-    str according to a printf-like format.  These functions are
-    equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
-    rb_str_cat2(str, rb_vsprintf(format, ap)), respectively.
-
  Array functions
 
   rb_ary_new()
@@ -240,7 +209,7 @@ listed below:
 
 2. Extending Ruby with C
 
-2.1 Adding new features to Ruby
+2.1 Addding new features to Ruby
 
 You can add new features (classes, methods, etc.) to the Ruby
 interpreter.  Ruby provides APIs for defining the following things:
@@ -361,11 +330,10 @@ 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 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:
 
  :Identifier
 
@@ -398,8 +366,8 @@ specified by the symbol mid.
 2.2.4 Accessing the variables and constants
 
 You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both
-environments.  There's no way to access Ruby's local variables.
+functions.  Also, global variables can be shared between both environments.
+There's no way to access Ruby's local variables.
 
 The functions to access/modify instance variables are below:
 
@@ -480,10 +448,6 @@ 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.
 
-These mark / free functions are invoked during GC execution.  No
-object allocations are allowed during it, so do not allocate ruby
-objects inside them.
-
 You can allocate and wrap the structure in one step.
 
   Data_Make_Struct(klass, type, mark, free, sval)
@@ -537,8 +501,7 @@ the library.
 Here's the example of an initializing function.
 
 --
-void
-Init_dbm(void)
+Init_dbm()
 {
     /* define DBM class */
     cDBM = rb_define_class("DBM", rb_cObject);
@@ -572,8 +535,8 @@ struct dbmdata {
 obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
 --
 
-This code wraps the dbmdata structure into a Ruby object.  We avoid
-wrapping DBM* directly, because we want to cache size information.
+This code wraps the dbmdata structure into a Ruby object.  We avoid wrapping
+DBM* directly, because we want to cache size information.
 
 To retrieve the dbmdata structure from a Ruby object, we define the
 following macro:
@@ -593,7 +556,8 @@ methods with a fixed number of arguments receive arguments like this:
 
 --
 static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
 	:
 }
@@ -607,7 +571,10 @@ arguments like this:
 
 --
 static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -630,7 +597,8 @@ by Ruby's array, like this:
 
 --
 static VALUE
-fdbm_indexes(VALUE obj, VALUE args)
+fdbm_indexes(obj, args)
+    VALUE obj, args;
 {
 	:
 }
@@ -831,10 +799,8 @@ void Check_SafeStr(VALUE value)
 ** Data type conversion
 
 FIX2INT(value)
-FIX2LONG(value)
 INT2FIX(i)
 NUM2INT(value)
-NUM2LONG(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
@@ -1159,7 +1125,7 @@ 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 variable PATH
+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.
 
@@ -1188,7 +1154,7 @@ Returns an array of the added directories ([include_dir, lib_dir]).
  pkg_config(pkg)
 
 Obtains the information for pkg by pkg-config command.  The actual
-command name can be overridden by --with-pkg-config command line
+command name can be overriden by --with-pkg-config command line
 option.
 
 /*
diff --git a/README.EXT.ja b/README.EXT.ja
index fe9eabd539..73425c2cdb 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -35,7 +35,7 @@ Ruby�ˤϥ桼�����Ȥ���ǽ���Τ���ʲ��Υ����פ�����ޤ���
 	T_STRING	ʸ����
 	T_REGEXP	����ɽ��
 	T_ARRAY		����
-	T_FIXNUM	Fixnum(31bit�ޤ���63bitĹ����)
+	T_FIXNUM	Fixnum(31bitĹ����)
 	T_HASH		Ϣ������
 	T_STRUCT	(Ruby��)��¤��
 	T_BIGNUM	¿��Ĺ����
@@ -95,42 +95,28 @@ FIXNUM��NIL�˴ؤ��ƤϤ���®��Ƚ�̥ޥ������Ѱդ���Ƥ��ޤ���
 
 1.3 VALUE��C�Υǡ������Ѵ�����
 
-�ǡ��������פ�T_NIL��T_FALSE��T_TRUE�Ǥ�������ǡ����Ϥ��줾
-��nil��false��true�Ǥ������Υǡ��������פΥ��֥������ȤϤҤ�
+�ǡ��������פ�T_NIL, T_FALSE, T_TRUE�Ǥ�������ǡ����Ϥ��줾
+��nil, false, true�Ǥ������Υǡ��������פΥ��֥������ȤϤҤ�
 �Ĥ��Ĥ���¸�ߤ��ޤ���
 
-�ǡ��������פ�T_FIXNUM�λ��������31bit�ޤ���63bit�Υ�������
-���������Ǥ���long�Υ�������32bit�Υץ�åȥե�����Ǥ����
-31bit�ˡ�long�Υ�������64bit�Υץ�åȥե�����Ǥ����63bit
-�ˤʤ�ޤ�. FIXNUM �� C ���������Ѵ����뤿��ˤϥޥ���
-��FIX2INT()�פޤ��ϡ�FIX2LONG()�פ�Ȥ��ޤ��������Υޥ���
-����Ѥ���ݤˤϻ����˥ǡ��������פ�FIXNUM�Ǥ��뤳�Ȥ��ǧ��
-��ɬ�פ�����ޤ��������Ū��®���Ѵ���Ԥ����Ȥ��Ǥ��ޤ�����
-������FIX2LONG()�פ��㳰��ȯ�����ޤ��󤬡���FIX2INT()�פ���
-����̤�int�Υ������˼��ޤ�ʤ����ˤ��㳰��ȯ�����ޤ���
-���줫�顤FIXNUM�˸¤餺Ruby�Υǡ������������Ѵ�����
-��NUM2INT()�פ���ӡ�NUM2LONG()�פȤ����ޥ���������ޤ�����
-���Υޥ����ϥޥ����ϥǡ��������פΥ����å�̵���ǻȤ��ޤ�
-(�������Ѵ��Ǥ��ʤ����ˤ��㳰��ȯ������)��Ʊ�ͤ˥����å�̵
-�ǻȤ����Ѵ��ޥ�����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 ��
-String ���֤������Ƥ��� var �ΥХ�����ɽ�����Ф��� char* ��
-�֤��ޥ����Ǥ���var �����Ƥ�ľ���֤����������������Τǡ�
-var �� lvalue �Ǥ���ɬ�פ�����ޤ���
-�ޤ���StringValuePtr() ��������� StringValueCStr() �Ȥ�����
-�����⤢��ޤ���StringValueCStr(var) �� var �� String ���֤�
-�����Ƥ��� var ��ʸ����ɽ�����Ф��� char* ���֤��ޤ����֤���
-��ʸ����������ˤ� nul ʸ�����ղä���ޤ����ʤ�������� nul
-ʸ�����ޤޤ����� ArgumentError ��ȯ�����ޤ���
-������StringValuePtr() �Ǥϡ������� nul ʸ���������ݾڤϤʤ���
-����� nul ʸ�����ޤޤ�Ƥ����ǽ���⤢��ޤ���
+�ǡ��������פ�T_FIXNUM�λ��������31bit�Υ����������������
+����FIXNUM��C���������Ѵ����뤿��ˤϥޥ�����FIX2INT()�פ��
+���ޤ������줫�顤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 �Ǥ���ɬ�פ�
+����ޤ���
 
 ����ʳ��Υǡ��������פ��б�����C�ι�¤�Τ�����ޤ����б���
 �빽¤�ΤΤ���VALUE�Ϥ��Τޤޥ��㥹��(���Ѵ�)����й�¤�Τ�
@@ -143,11 +129,10 @@ var �� lvalue �Ǥ���ɬ�פ�����ޤ���
 ruby.h�ǤϹ�¤�Τإ��㥹�Ȥ���ޥ������RXXXXX()��(������ʸ
 ���ˤ������)�Ȥ���̾�����󶡤���Ƥ��ޤ�(��: RSTRING())��
 
-��¤�Τ���ǡ�������Ф��ޥ������󶡤���Ƥ��ޤ���ʸ����
-str��Ĺ�������뤿��ˤϡ�RSTRING_LEN(str)�פȤ���ʸ����str��
-char*�Ȥ������뤿��ˤϡ�RSTRING_PTR(str)�פȤ��ޤ��������
-���ˤϡ����줾���RARRAY_LEN(ary)�ס���RARRAY_PTR(ary)�פ�
-�ʤ�ޤ���
+�㤨�С�ʸ����str��Ĺ�������뤿��ˤϡ�RSTRING(str)->len�פ�
+����ʸ����str��char*�Ȥ������뤿��ˤϡ�RSTRING(str)->ptr��
+�Ȥ��ޤ�������ξ��ˤϡ����줾���RARRAY(ary)->len�ס�
+��RARRAY(ary)->ptr�פȤʤ�ޤ���
 
 Ruby�ι�¤�Τ�ľ�ܥ�������������˵���Ĥ��ʤ���Фʤ�ʤ���
 �Ȥϡ������ʸ����ι�¤�Τ���Ȥϻ��Ȥ�������ǡ�ľ���ѹ���
@@ -180,8 +165,7 @@ FIXNUM�˴ؤ��Ƥ��Ѵ��ޥ������ͳ����ɬ�פ�����ޤ���C������
 ����VALUE���Ѵ�����ޥ����ϰʲ��Τ�Τ�����ޤ���ɬ�פ˱���
 �ƻȤ�ʬ���Ƥ���������
 
-  INT2FIX()	��Ȥ�������31bit�ޤ���63bit����˼��ޤ뼫��
-		�������
+  INT2FIX()	��Ȥ�������31bit����˼��ޤ뼫���������
   INT2NUM()	Ǥ�դ���������VALUE��
 
 INT2NUM()��������FIXNUM���ϰϤ˼��ޤ�ʤ���硤Bignum���Ѵ�
@@ -217,29 +201,10 @@ Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
 
     C��ʸ���󤫤�����ޡ������ղä��줿Ruby��ʸ������������롥
 
-  rb_sprintf(const char *format, ...)
-  rb_vsprintf(const char *format, va_list ap)
-
-    C��ʸ����format��³��������printf(3)�Υե����ޥåȤˤ������ä�
-    ��������Ruby��ʸ������������롥
-
   rb_str_cat(VALUE str, const char *ptr, long len)
 
     Ruby��ʸ����str��len�Х��Ȥ�ʸ����ptr���ɲä��롥
 
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Ruby��ʸ����str��C��ʸ����ptr���ɲä��롥���δؿ��ε�ǽ��
-    rb_str_cat(str, ptr, strlen(ptr))��Ʊ���Ǥ��롥
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    C��ʸ����format��³��������printf(3)�Υե����ޥåȤˤ������ä�
-    ��������Ruby��ʸ����str���ɲä��롥���δؿ��ε�ǽ�ϡ����줾��
-    rb_str_cat2(str, rb_sprintf(format, ...)) ��
-    rb_str_cat2(str, rb_vsprintf(format, ap)) ��Ʊ���Ǥ��롥
-
  ������Ф���ؿ�
 
   rb_ary_new()
@@ -362,20 +327,20 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
   void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
 
 
-�᥽�åɤ���̾��������뤿��δؿ��ϰʲ����̤�Ǥ���
+�᥽�åɤ���̾��������뤿��δؿ��ϰʲ����̤�Ǥ���
 
   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�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡥤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
+func�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
+�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡣤��Υ��󥹥��󥹤ϡ�������
+�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
+���褤�Ǥ��礦��
 
 2.1.3 ������
 
@@ -415,7 +380,8 @@ C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
 �����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
 ���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
 
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
+ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
+���֥������ȤȤ��ƥ���ܥ�(Symbol)�����ꡤ
 
  :���̻�
 
@@ -428,6 +394,14 @@ ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
 
   rb_to_id(VALUE symbol)
 
+ID���饷��ܥ�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
+
+  VALUE ID2SYM(ID id)
+
+����ܥ뤫��ID�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
+
+  ID SYM2ID(VALUE symbol)
+
 2.2.3 C����Ruby�Υ᥽�åɤ�ƤӽФ�
 
 C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ�����ˤϰʲ�
@@ -551,11 +525,6 @@ free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
 �ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
 ��˳�������ޤ���
 
-mark�����free�ؿ���GC�¹���˸ƤӽФ���ޤ�.
-�ʤ�, GC�¹����Ruby���֥������ȤΥ������������϶ػߤ����
-��. ��ä�, mark�����free�ؿ���Ruby���֥������ȤΥ���������
-���ϹԤ�ʤ��Ǥ�������.
-
 C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
 ���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
 
@@ -615,8 +584,7 @@ Ruby�ϳ�ĥ�饤�֥�������ɤ�����ˡ�Init_�饤�֥��̾�פ�
 �����Ԥ��ޤ���dbm.c����������Ѥ��ޤ���
 
 --
-void
-Init_dbm(void)
+Init_dbm()
 {
     /* DBM���饹��������� */
     cDBM = rb_define_class("DBM", rb_cObject);
@@ -678,7 +646,8 @@ fdbm_delete()�Ϥ��Τ褦�ˤʤäƤ��ޤ���
 
 --
 static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
 	:
 }
@@ -694,7 +663,10 @@ fdbm_delete(VALUE obj, VALUE keystr)
 
 --
 static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
 	:
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
@@ -723,7 +695,8 @@ Ruby������ǰ������������Τ�indexes������ޤ��������Ϥ�
 
 --
 static VALUE
-fdbm_indexes(VALUE obj, VALUE args)
+fdbm_indexes(obj, args)
+    VALUE obj, args;
 {
 	:
 }
@@ -762,9 +735,9 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
   $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
   $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
 
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
+���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
+�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
+��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
 
 �饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
 �ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
@@ -792,7 +765,7 @@ Makefile��ºݤ��������뤿��ˤ�
 
 �Ȥ��Ƥ���������
 
-site_ruby �ǥ��쥯�ȥ�Ǥʤ���
+site_ruby �ǥ��쥯�ȥ�Ǥʤ���
 vendor_ruby �ǥ��쥯�ȥ�˥��󥹥ȡ��뤹����ˤ�
 �ʲ��Τ褦�� --vendor ���ץ�����ä��Ƥ���������
 
@@ -945,10 +918,8 @@ void Check_SafeStr(VALUE value)
 ** ���Ѵ�
 
 FIX2INT(value)
-FIX2LONG(value)
 INT2FIX(i)
 NUM2INT(value)
-NUM2LONG(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
@@ -1086,12 +1057,12 @@ char *rb_id2name(ID id)
 
 char *rb_class2name(VALUE klass)
 
-  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ�����
-  ��, ������̤ä�̾������ĥ��饹��̾�����֤���
+  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ����ˤ�, 
+  ������̤ä�̾������ĥ��饹��̾�����֤���
 
 int rb_respond_to(VALUE obj, ID id)
 
-  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
+  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
 
 ** ���󥹥����ѿ�
 
@@ -1180,32 +1151,6 @@ void ruby_script(char *name)
 
   Ruby�Υ�����ץ�̾($0)�����ꤹ�롥
 
-** ���󥿥ץ꥿�Υ��٥�ȤΥեå�
-
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
-
-���ꤵ�줿���󥿥ץ꥿�Υ��٥�Ȥ��Ф���եå��ؿ����ɲä��ޤ���
-events�ϰʲ����ͤ�or�Ǥʤ���Фʤ�ޤ���:
-
-	RUBY_EVENT_LINE
-	RUBY_EVENT_CLASS
-	RUBY_EVENT_END
-	RUBY_EVENT_CALL
-	RUBY_EVENT_RETURN
-	RUBY_EVENT_C_CALL
-	RUBY_EVENT_C_RETURN
-	RUBY_EVENT_RAISE
-	RUBY_EVENT_ALL
-
-rb_event_hook_func_t������ϰʲ����̤�Ǥ�:
-
- typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
- 				      VALUE self, ID id, VALUE klass)
-
- int rb_remove_event_hook(rb_event_hook_func_t func)
-
-���ꤵ�줿�եå��ؿ��������ޤ���
-
 
 Appendix C. extconf.rb�ǻȤ���ؿ�����
 
@@ -1230,10 +1175,10 @@ find_library(lib, func, path...)
 
 have_func(func, header)
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ����
-  �å����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�Τ�
-  ������ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ�
-  �������ؿ���¸�ߤ����true���֤���
+  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ������
+  �����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
+  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
+  �����ؿ���¸�ߤ����true���֤���
 
 have_var(var, header)
 
@@ -1284,8 +1229,7 @@ find_executable(command, path)
 
 with_config(withval[, default=nil])
 
-  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ������
-  �����롥
+  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
 
 enable_config(config, *defaults)
 disable_config(config, *defaults)
@@ -1294,9 +1238,8 @@ disable_config(config, *defaults)
   --disable-<config>�ǻ��ꤵ�줿�����ͤ����롥
   --enable-<config>�����ꤵ��Ƥ�������true��
   --disable-<config>�����ꤵ��Ƥ�������false���֤���
-  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ����
-  �������*defaults��yield������̡��֥��å��ʤ��ʤ�
-  *defaults���֤���
+  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ���Ƥ������
+  *defaults��yield������̡��֥��å��ʤ��ʤ�*defaults���֤���
 
 dir_config(target[, default_dir])
 dir_config(target[, default_include, default_lib])
@@ -1305,8 +1248,8 @@ dir_config(target[, default_include, default_lib])
   --with-<target>-lib�Τ����줫�ǻ��ꤵ���ǥ��쥯�ȥ��
   $CFLAGS �� $LDFLAGS ���ɲä��롥--with-<target>-dir=/path��
   --with-<target>-include=/path/include --with-<target>-lib=/path/lib
-  �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ���
-  ���ȥ��������֤��� ([include_dir, lib_dir])
+  �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ��쥯�ȥ��
+  ������֤��� ([include_dir, lib_dir])
 
 pkg_config(pkg)
 
diff --git a/README.ja b/README.ja
index 16dbd9368d..71ce4ee12c 100644
--- a/README.ja
+++ b/README.ja
@@ -34,6 +34,10 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 
 ** Subversion��
 
+�ܥ֥�����Ruby�κǿ��Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
+
+  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
+
 ��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
 
   $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
diff --git a/ToDo b/ToDo
index 7e5ef523a8..b55e399edf 100644
--- a/ToDo
+++ b/ToDo
@@ -2,10 +2,6 @@ Language Spec.
 
 - Class#allocate - basicNew
 - class Foo::Bar<Baz .. end, module Boo::Bar .. end
-- raise exception by `` error
-- a +1 to be a+1, not a(+1).
-- clarify evaluation order of operator argument (=~, .., ...)
-- :symbol => value hash in the form of {symbol: value, ...} ??
 * operator !! for rescue. ???
 * objectify characters
 * ../... outside condition invokes operator method too.
@@ -18,6 +14,7 @@ Language Spec.
 * def Class#method .. end ??
 * def Foo::Bar::baz() .. end ??
 * I18N (or M17N) script/string/regexp
+* Fixnum 0 as false ????
 * discourage use of symbol variables (e.g. $/, etc.) in manual
 * discourage use of Perlish features by giving warnings.
 * non confusing in-block local variable (is it possible?)
@@ -25,9 +22,12 @@ Language Spec.
   + variables appears within block may have independent values.
 * Regexp: make /o thread safe.
 * decide whether begin with rescue or ensure make do..while loop.
+* a +1 to be a+1, not a(+1).
 * unify == and eql? again
 * to_i returns nil if str contains no digit.
+* raise exception by `` error
 * jar like combined library package. -> RubyGems?
+* resumable Exception via Exception#resume.
 * method combination, e.g. before, after, around, etc.
 * .. or something like defadvice in Emacs.
 * property - for methods, or for objects in general.
@@ -35,6 +35,8 @@ Language Spec.
 * selector namespace - something like generic-flet in CLOS, to help RubyBehavior
 * private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
 * warn/error "bare word" method, like "foo",  you should type "foo()"
+* clarify evaluation order of operator argument (=~, .., ...)
+* :symbol => value hash in the form of {symbol: value, ...} ??
 
 Hacking Interpreter
 
@@ -81,7 +83,7 @@ Standard Libraries
 - use Mersenne Twister RNG for random.
 - deprecate Array#indexes, and Array#indices.
 - remove dependency on MAXPATHLEN.
-- String#scanf(?)
+* String#scanf(?)
 * Object#fmt(?)
 * Time::strptime
 * Integer[num], Float[num];  Fixnum[num]?
@@ -115,7 +117,7 @@ Extension Libraries
 
 Ruby Libraries
 
-- urllib.rb, nttplib.rb, etc.
+* urllib.rb, nttplib.rb, etc.
 * format like perl's
 
 Tools
diff --git a/array.c b/array.c
index 2d5b5ace39..7e8c12b683 100644
--- a/array.c
+++ b/array.c
@@ -3,27 +3,29 @@
   array.c -
 
   $Author$
+  $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/util.h"
-#include "ruby/st.h"
+#include "ruby.h"
+#include "util.h"
+#include "st.h"
 
 VALUE rb_cArray;
-
 static ID id_cmp;
 
 #define ARY_DEFAULT_SIZE 16
 #define ARY_MAX_SIZE (LONG_MAX / sizeof(VALUE))
 
 void
-rb_mem_clear(register VALUE *mem, register long size)
+rb_mem_clear(mem, size)
+    register VALUE *mem;
+    register long size;
 {
     while (size--) {
 	*mem++ = Qnil;
@@ -31,50 +33,48 @@ rb_mem_clear(register VALUE *mem, register long size)
 }
 
 static inline void
-memfill(register VALUE *mem, register long size, register VALUE val)
+memfill(mem, size, val)
+    register VALUE *mem;
+    register long size;
+    register VALUE val;
 {
     while (size--) {
 	*mem++ = val;
     }
 }
 
-#define ARY_SHARED_P(a) FL_TEST(a, ELTS_SHARED)
-
-#define ARY_SET_LEN(ary, n) do { \
-    RARRAY(ary)->len = (n);\
-} while (0) 
-
-#define ARY_CAPA(ary) RARRAY(ary)->aux.capa
-#define RESIZE_CAPA(ary,capacity) do {\
-    REALLOC_N(RARRAY(ary)->ptr, VALUE, (capacity));\
-    RARRAY(ary)->aux.capa = (capacity);\
-} while (0)
+#define ARY_TMPLOCK  FL_USER1
 
 static inline void
-rb_ary_modify_check(VALUE ary)
+rb_ary_modify_check(ary)
+    VALUE 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");
     if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
 
 static void
-rb_ary_modify(VALUE ary)
+rb_ary_modify(ary)
+    VALUE ary;
 {
     VALUE *ptr;
 
     rb_ary_modify_check(ary);
-    if (ARY_SHARED_P(ary)) {
-	ptr = ALLOC_N(VALUE, RARRAY_LEN(ary));
+    if (FL_TEST(ary, ELTS_SHARED)) {
+	ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
 	FL_UNSET(ary, ELTS_SHARED);
-	RARRAY(ary)->aux.capa = RARRAY_LEN(ary);
-	MEMCPY(ptr, RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
+	RARRAY(ary)->aux.capa = RARRAY(ary)->len;
+	MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
 	RARRAY(ary)->ptr = ptr;
     }
 }
 
 VALUE
-rb_ary_freeze(VALUE ary)
+rb_ary_freeze(ary)
+    VALUE ary;
 {
     return rb_obj_freeze(ary);
 }
@@ -88,14 +88,18 @@ rb_ary_freeze(VALUE ary)
  */
 
 static VALUE
-rb_ary_frozen_p(VALUE ary)
+rb_ary_frozen_p(ary)
+    VALUE ary;
 {
     if (OBJ_FROZEN(ary)) return Qtrue;
+    if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
     return Qfalse;
 }
 
+static VALUE ary_alloc _((VALUE));
 static VALUE
-ary_alloc(VALUE klass)
+ary_alloc(klass)
+    VALUE klass;
 {
     NEWOBJ(ary, struct RArray);
     OBJSETUP(ary, klass, T_ARRAY);
@@ -108,9 +112,11 @@ ary_alloc(VALUE klass)
 }
 
 static VALUE
-ary_new(VALUE klass, long len)
+ary_new(klass, len)
+    VALUE klass;
+    long len;
 {
-    VALUE ary;
+    VALUE ary = ary_alloc(klass);
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
@@ -118,7 +124,6 @@ ary_new(VALUE klass, long len)
     if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    ary = ary_alloc(klass);
     if (len == 0) len++;
     RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
     RARRAY(ary)->aux.capa = len;
@@ -127,22 +132,35 @@ ary_new(VALUE klass, long len)
 }
 
 VALUE
-rb_ary_new2(long len)
+rb_ary_new2(len)
+    long len;
 {
     return ary_new(rb_cArray, len);
 }
 
 
 VALUE
-rb_ary_new(void)
+rb_ary_new()
 {
     return rb_ary_new2(ARY_DEFAULT_SIZE);
 }
 
+#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_ary_new3(long n, ...)
+#else
+rb_ary_new3(n, va_alist)
+    long n;
+    va_dcl
+#endif
 {
     va_list ar;
     VALUE ary;
@@ -150,9 +168,9 @@ rb_ary_new3(long n, ...)
 
     ary = rb_ary_new2(n);
 
-    va_start(ar, n);
+    va_init_list(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
+	RARRAY(ary)->ptr[i] = va_arg(ar, VALUE);
     }
     va_end(ar);
 
@@ -161,36 +179,30 @@ rb_ary_new3(long n, ...)
 }
 
 VALUE
-rb_ary_new4(long n, const VALUE *elts)
+rb_ary_new4(n, elts)
+    long n;
+    const VALUE *elts;
 {
     VALUE ary;
 
     ary = rb_ary_new2(n);
     if (n > 0 && elts) {
-	MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
-	RARRAY(ary)->len = n;
+	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
     }
 
-    return ary;
-}
+    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
+    RARRAY(ary)->len = n;
 
-void
-rb_ary_free(VALUE ary)
-{
-    if (!ARY_SHARED_P(ary)) {
-	xfree(RARRAY(ary)->ptr);
-    }
+    return ary;
 }
 
 static VALUE
-ary_make_shared(VALUE ary)
+ary_make_shared(ary)
+    VALUE ary;
 {
-    if (ARY_SHARED_P(ary)) {
-	return RARRAY(ary)->aux.shared;
-    }
-    else {
+    if (!FL_TEST(ary, ELTS_SHARED)) {
 	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, 0, T_ARRAY);
+	OBJSETUP(shared, rb_cArray, T_ARRAY);
 
 	shared->len = RARRAY(ary)->len;
 	shared->ptr = RARRAY(ary)->ptr;
@@ -200,51 +212,40 @@ ary_make_shared(VALUE ary)
 	OBJ_FREEZE(shared);
 	return (VALUE)shared;
     }
+    else {
+	return RARRAY(ary)->aux.shared;
+    }
 }
 
 VALUE
-rb_assoc_new(VALUE car, VALUE cdr)
+rb_assoc_new(car, cdr)
+    VALUE car, cdr;
 {
-    return rb_ary_new3(2, car, cdr);
+    VALUE ary;
+
+    ary = rb_ary_new2(2);
+    RARRAY(ary)->ptr[0] = car;
+    RARRAY(ary)->ptr[1] = cdr;
+    RARRAY(ary)->len = 2;
+
+    return ary;
 }
 
 static VALUE
-to_ary(VALUE ary)
+to_ary(ary)
+    VALUE ary;
 {
     return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
 VALUE
-rb_check_array_type(VALUE ary)
+rb_check_array_type(ary)
+    VALUE ary;
 {
     return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
-/*
- *  call-seq:
- *     Array.try_convert(obj) -> array or nil
- *
- *  Try to convert <i>obj</i> into an array, using to_ary method.
- *  Returns converted array or nil if <i>obj</i> cannot be converted
- *  for any reason.  This method is to check if an argument is an
- *  array.  
- *
- *     Array.try_convert([1])   # => [1]
- *     Array.try_convert("1")   # => nil
- *     
- *     if tmp = Array.try_convert(arg)
- *       # the argument is an array
- *     elsif tmp = String.try_convert(arg)
- *       # the argument is a string
- *     end
- *
- */
-
-static VALUE
-rb_ary_s_try_convert(VALUE dummy, VALUE ary)
-{
-    return rb_check_array_type(ary);
-}
+static VALUE rb_ary_replace _((VALUE, VALUE));
 
 /*
  *  call-seq:
@@ -285,23 +286,23 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
  */
 
 static VALUE
-rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
+rb_ary_initialize(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     long len;
     VALUE size, val;
 
     rb_ary_modify(ary);
-    if (argc ==  0) {
-	if (RARRAY_PTR(ary) && !ARY_SHARED_P(ary)) {
-	    xfree(RARRAY(ary)->ptr);
-	}
+    if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
 	RARRAY(ary)->len = 0;
 	if (rb_block_given_p()) {
 	    rb_warning("given block not used");
 	}
 	return ary;
     }
-    rb_scan_args(argc, argv, "02", &size, &val);
+
     if (argc == 1 && !FIXNUM_P(size)) {
 	val = rb_check_array_type(size);
 	if (!NIL_P(val)) {
@@ -317,8 +318,10 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
     if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    rb_ary_modify(ary);
-    RESIZE_CAPA(ary, len);
+    if (len > RARRAY(ary)->aux.capa) {
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+	RARRAY(ary)->aux.capa = len;
+    }
     if (rb_block_given_p()) {
 	long i;
 
@@ -331,9 +334,10 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {
-	memfill(RARRAY_PTR(ary), len, val);
+	memfill(RARRAY(ary)->ptr, len, val);
 	RARRAY(ary)->len = len;
     }
+
     return ary;
 }
 
@@ -347,29 +351,33 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 */
 
 static VALUE
-rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
+rb_ary_s_create(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE ary = ary_alloc(klass);
 
-    if (argc < 0) {
-	rb_raise(rb_eArgError, "negative array size");
+    if (argc > 0) {
+	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
+	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
     }
-    RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
-    RARRAY(ary)->aux.capa = argc;
-    MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
-    RARRAY(ary)->len = argc;
+    RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
 
     return ary;
 }
 
 void
-rb_ary_store(VALUE ary, long idx, VALUE val)
+rb_ary_store(ary, idx, val)
+    VALUE ary;
+    long idx;
+    VALUE val;
 {
     if (idx < 0) {
-	idx += RARRAY_LEN(ary);
+	idx += RARRAY(ary)->len;
 	if (idx < 0) {
 	    rb_raise(rb_eIndexError, "index %ld out of array",
-		     idx - RARRAY_LEN(ary));
+		    idx - RARRAY(ary)->len);
 	}
     }
     else if (idx >= ARY_MAX_SIZE) {
@@ -377,8 +385,8 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
     }
 
     rb_ary_modify(ary);
-    if (idx >= ARY_CAPA(ary)) {
-	long new_capa = ARY_CAPA(ary) / 2;
+    if (idx >= RARRAY(ary)->aux.capa) {
+	long new_capa = RARRAY(ary)->aux.capa / 2;
 
 	if (new_capa < ARY_DEFAULT_SIZE) {
 	    new_capa = ARY_DEFAULT_SIZE;
@@ -387,21 +395,24 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
 	    new_capa = (ARY_MAX_SIZE - idx) / 2;
 	}
 	new_capa += idx;
-	RESIZE_CAPA(ary, new_capa);
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
+	RARRAY(ary)->aux.capa = new_capa;
     }
-    if (idx > RARRAY_LEN(ary)) {
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
-		     idx-RARRAY_LEN(ary) + 1);
+    if (idx > RARRAY(ary)->len) {
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
+		     idx-RARRAY(ary)->len + 1);
     }
 
-    if (idx >= RARRAY_LEN(ary)) {
+    if (idx >= RARRAY(ary)->len) {
 	RARRAY(ary)->len = idx + 1;
     }
-    RARRAY_PTR(ary)[idx] = val;
+    RARRAY(ary)->ptr[idx] = val;
 }
 
 static VALUE
-ary_shared_array(VALUE klass, VALUE ary)
+ary_shared_array(klass, ary)
+    VALUE klass;
+    VALUE ary;
 {
     VALUE val = ary_alloc(klass);
 
@@ -414,7 +425,11 @@ ary_shared_array(VALUE klass, VALUE ary)
 }
 
 static VALUE
-ary_shared_first(int argc, VALUE *argv, VALUE ary, int last)
+ary_shared_first(argc, argv, ary, last)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
+    int last;
 {
     VALUE nv, result;
     long n;
@@ -422,14 +437,14 @@ ary_shared_first(int argc, VALUE *argv, VALUE ary, int last)
 
     rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
-    if (n > RARRAY_LEN(ary)) {
-	n = RARRAY_LEN(ary);
+    if (n > RARRAY(ary)->len) {
+	n = RARRAY(ary)->len;
     }
     else if (n < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (last) {
-	offset = RARRAY_LEN(ary) - n;
+	offset = RARRAY(ary)->len - n;
     }
     result = ary_shared_array(rb_cArray, ary);
     RARRAY(result)->ptr += offset;
@@ -452,9 +467,11 @@ ary_shared_first(int argc, VALUE *argv, VALUE ary, int last)
  */
 
 VALUE
-rb_ary_push(VALUE ary, VALUE item)
+rb_ary_push(ary, item)
+    VALUE ary;
+    VALUE item;
 {
-    rb_ary_store(ary, RARRAY_LEN(ary), item);
+    rb_ary_store(ary, RARRAY(ary)->len, item);
     return ary;
 }
 
@@ -472,7 +489,10 @@ rb_ary_push(VALUE ary, VALUE item)
  */
 
 static VALUE
-rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_push_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     while (argc--) {
 	rb_ary_push(ary, *argv++);
@@ -481,20 +501,18 @@ rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
 }
 
 VALUE
-rb_ary_pop(VALUE ary)
+rb_ary_pop(ary)
+    VALUE ary;
 {
-    long n;
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    if (!ARY_SHARED_P(ary) &&
-	RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
-	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
-    {
-	RESIZE_CAPA(ary, RARRAY_LEN(ary) * 2);
-    }
-    n = RARRAY_LEN(ary)-1;
-    RARRAY(ary)->len = n;
-    return RARRAY_PTR(ary)[n];
+    if (RARRAY(ary)->len == 0) return Qnil;
+    if (!FL_TEST(ary, ELTS_SHARED) &&
+	    RARRAY(ary)->len * 3 < RARRAY(ary)->aux.capa &&
+	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
+	RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    }
+    return RARRAY(ary)->ptr[--RARRAY(ary)->len];
 }
 
 /*
@@ -515,7 +533,10 @@ rb_ary_pop(VALUE ary)
  */
 
 static VALUE
-rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_pop_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE result;
 
@@ -525,25 +546,26 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
 
     rb_ary_modify_check(ary);
     result = ary_shared_first(argc, argv, ary, Qtrue);
-    RARRAY(ary)->len -= RARRAY_LEN(result);
+    RARRAY(ary)->len -= RARRAY(result)->len;
     return result;
 }
 
 VALUE
-rb_ary_shift(VALUE ary)
+rb_ary_shift(ary)
+    VALUE ary;
 {
     VALUE top;
 
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    top = RARRAY_PTR(ary)[0];
-    if (!ARY_SHARED_P(ary)) {
-	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-	    MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
+    if (RARRAY(ary)->len == 0) return Qnil;
+    top = RARRAY(ary)->ptr[0];
+    if (!FL_TEST(ary, ELTS_SHARED)) {
+        if (RARRAY(ary)->len < ARY_DEFAULT_SIZE) {
+            MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len-1);
 	    RARRAY(ary)->len--;
-	    return top;
-	}
-	RARRAY_PTR(ary)[0] = Qnil;
+            return top;
+        }
+        RARRAY(ary)->ptr[0] = Qnil;
 	ary_make_shared(ary);
     }
     RARRAY(ary)->ptr++;		/* shift ptr */
@@ -574,7 +596,10 @@ rb_ary_shift(VALUE ary)
  */
 
 static VALUE
-rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_shift_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE result;
     long n;
@@ -585,19 +610,42 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
 
     rb_ary_modify_check(ary);
     result = ary_shared_first(argc, argv, ary, Qfalse);
-    n = RARRAY_LEN(result);
-    if (ARY_SHARED_P(ary)) {
+    n = RARRAY(result)->len;
+    if (FL_TEST(ary, ELTS_SHARED)) {
 	RARRAY(ary)->ptr += n;
 	RARRAY(ary)->len -= n;
 	}
     else {
-	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
+	MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+n, VALUE, RARRAY(ary)->len-n);
 	RARRAY(ary)->len -= n;
     }
 
     return result;
 }
 
+VALUE
+rb_ary_unshift(ary, item)
+    VALUE ary, item;
+{
+    rb_ary_modify(ary);
+    if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
+	long capa_inc = RARRAY(ary)->aux.capa / 2;
+	if (capa_inc < ARY_DEFAULT_SIZE) {
+	    capa_inc = ARY_DEFAULT_SIZE;
+	}
+	RARRAY(ary)->aux.capa += capa_inc;
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    }
+
+    /* sliding items */
+    MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+
+    RARRAY(ary)->len++;
+    RARRAY(ary)->ptr[0] = item;
+
+    return ary;
+}
+
 /*
  *  call-seq:
  *     array.unshift(obj, ...)  -> array
@@ -611,67 +659,70 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_unshift_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
-    long len;
+    long len = RARRAY(ary)->len;
 
     if (argc == 0) return ary;
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->aux.capa <= (len = RARRAY(ary)->len) + argc) {
-	RESIZE_CAPA(ary, len + argc + ARY_DEFAULT_SIZE);
-    }
+
+    /* make rooms by setting the last item */
+    rb_ary_store(ary, len + argc - 1, Qnil);
 
     /* sliding items */
     MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
     MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
-    RARRAY(ary)->len += argc;
     
     return ary;
 }
 
-VALUE
-rb_ary_unshift(VALUE ary, VALUE item)
-{
-    return rb_ary_unshift_m(1,&item,ary);
-}
-
 /* faster version - use this if you don't need to treat negative offset */
 static inline VALUE
-rb_ary_elt(VALUE ary, long offset)
+rb_ary_elt(ary, offset)
+    VALUE ary;
+    long offset;
 {
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    if (offset < 0 || RARRAY_LEN(ary) <= offset) {
+    if (RARRAY(ary)->len == 0) return Qnil;
+    if (offset < 0 || RARRAY(ary)->len <= offset) {
 	return Qnil;
     }
-    return RARRAY_PTR(ary)[offset];
+    return RARRAY(ary)->ptr[offset];
 }
 
 VALUE
-rb_ary_entry(VALUE ary, long offset)
+rb_ary_entry(ary, offset)
+    VALUE ary;
+    long offset;
 {
     if (offset < 0) {
-	offset += RARRAY_LEN(ary);
+	offset += RARRAY(ary)->len;
     }
     return rb_ary_elt(ary, offset);
 }
 
-VALUE
-rb_ary_subseq(VALUE ary, long beg, long len)
+static VALUE
+rb_ary_subseq(ary, beg, len)
+    VALUE ary;
+    long beg, len;
 {
     VALUE klass, ary2, shared;
     VALUE *ptr;
 
-    if (beg > RARRAY_LEN(ary)) return Qnil;
+    if (beg > RARRAY(ary)->len) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+	len = RARRAY(ary)->len - beg;
+	if (len < 0)
+	    len = 0;
     }
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
 
     shared = ary_make_shared(ary);
-    ptr = RARRAY_PTR(ary);
+    ptr = RARRAY(ary)->ptr;
     ary2 = ary_alloc(klass);
     RARRAY(ary2)->ptr = ptr + beg;
     RARRAY(ary2)->len = len;
@@ -714,16 +765,22 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  */
 
 VALUE
-rb_ary_aref(int argc, VALUE *argv, VALUE ary)
+rb_ary_aref(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE arg;
     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) {
-	    beg += RARRAY_LEN(ary);
+	    beg += RARRAY(ary)->len;
 	}
 	return rb_ary_subseq(ary, beg, len);
     }
@@ -735,8 +792,11 @@ rb_ary_aref(int argc, VALUE *argv, VALUE 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_LEN(ary), 0)) {
+    switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
       case Qfalse:
 	break;
       case Qnil:
@@ -754,6 +814,8 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
  *  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"
@@ -761,31 +823,36 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_at(VALUE ary, VALUE pos)
+rb_ary_at(ary, pos)
+    VALUE ary, pos;
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
 }
 
 /*
  *  call-seq:
- *     array.first     ->   obj or nil
- *     array.first(n)  ->   an_array
- *  
+ *     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(2)  #=> ["q", "r"]
+ *     a.first    #=> "q"
+ *     a.first(1) #=> ["q"]
+ *     a.first(3) #=> ["q", "r", "s"]
  */
 
 static VALUE
-rb_ary_first(int argc, VALUE *argv, VALUE ary)
+rb_ary_first(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     if (argc == 0) {
-	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[0];
+	if (RARRAY(ary)->len == 0) return Qnil;
+	return RARRAY(ary)->ptr[0];
     }
     else {
 	return ary_shared_first(argc, argv, ary, Qfalse);
@@ -800,17 +867,18 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  *  Returns the last element(s) of <i>self</i>. If the array is empty,
  *  the first form returns <code>nil</code>.
  *     
- *     a = [ "w", "x", "y", "z" ]
- *     a.last     #=> "z"
- *     a.last(2)  #=> ["y", "z"]
+ *     [ "w", "x", "y", "z" ].last   #=> "z"
  */
 
-VALUE
-rb_ary_last(int argc, VALUE *argv, VALUE ary)
+static VALUE
+rb_ary_last(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     if (argc == 0) {
-	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
+	if (RARRAY(ary)->len == 0) return Qnil;
+	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
     }
     else {
 	return ary_shared_first(argc, argv, ary, Qtrue);
@@ -838,7 +906,10 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
+rb_ary_fetch(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE pos, ifnone;
     long block_given;
@@ -852,16 +923,16 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
     idx = NUM2LONG(pos);
 
     if (idx < 0) {
-	idx +=  RARRAY_LEN(ary);
+	idx +=  RARRAY(ary)->len;
     }
-    if (idx < 0 || RARRAY_LEN(ary) <= idx) {
+    if (idx < 0 || RARRAY(ary)->len <= idx) {
 	if (block_given) return rb_yield(pos);
 	if (argc == 1) {
 	    rb_raise(rb_eIndexError, "index %ld out of array", idx);
 	}
 	return ifnone;
     }
-    return RARRAY_PTR(ary)[idx];
+    return RARRAY(ary)->ptr[idx];
 }
 
 /*
@@ -883,23 +954,26 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_index(int argc, VALUE *argv, VALUE ary)
+rb_ary_index(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE val;
     long i;
 
     if (argc  == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+	for (i=0; i<RARRAY(ary)->len; i++) {
+	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
 		return LONG2NUM(i);
 	    }
 	}
 	return Qnil;
     }
     rb_scan_args(argc, argv, "01", &val);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], val))
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (rb_equal(RARRAY(ary)->ptr[i], val))
 	    return LONG2NUM(i);
     }
     return Qnil;
@@ -921,103 +995,139 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
+rb_ary_rindex(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE val;
-    long i = RARRAY_LEN(ary);
+    long i = RARRAY(ary)->len;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
 	while (i--) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
+	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i])))
 		return LONG2NUM(i);
-	    if (i > RARRAY_LEN(ary)) {
-		i = RARRAY_LEN(ary);
+	    if (i > RARRAY(ary)->len) {
+		i = RARRAY(ary)->len;
 	    }
 	}
 	return Qnil;
     }
     rb_scan_args(argc, argv, "01", &val);
     while (i--) {
-	if (rb_equal(RARRAY_PTR(ary)[i], val))
+	if (rb_equal(RARRAY(ary)->ptr[i], val))
 	    return LONG2NUM(i);
-	if (i > RARRAY_LEN(ary)) {
-	    i = RARRAY_LEN(ary);
+	if (i > RARRAY(ary)->len) {
+	    i = RARRAY(ary)->len;
 	}
     }
     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;
+    VALUE *argv;
+    VALUE ary;
+{
+    VALUE new_ary;
+    long i;
+
+    rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
+    new_ary = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
+    }
+
+    return new_ary;
+}
+
 VALUE
-rb_ary_to_ary(VALUE obj)
+rb_ary_to_ary(obj)
+    VALUE obj;
 {
     if (TYPE(obj) == T_ARRAY) {
 	return obj;
     }
     if (rb_respond_to(obj, rb_intern("to_ary"))) {
-	return to_ary(obj);
+	return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
     }
     return rb_ary_new3(1, obj);
 }
 
 static void
-rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
+rb_ary_splice(ary, beg, len, rpl)
+    VALUE ary;
+    long beg, len;
+    VALUE rpl;
 {
     long rlen;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
     if (beg < 0) {
-	beg += RARRAY_LEN(ary);
+	beg += RARRAY(ary)->len;
 	if (beg < 0) {
-	    beg -= RARRAY_LEN(ary);
+	    beg -= RARRAY(ary)->len;
 	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
 	}
     }
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+	len = RARRAY(ary)->len - beg;
     }
 
-    if (rpl == Qundef) {
+    if (NIL_P(rpl)) {
 	rlen = 0;
     }
     else {
 	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY_LEN(rpl);
+	rlen = RARRAY(rpl)->len;
     }
     rb_ary_modify(ary);
-    if (beg >= RARRAY_LEN(ary)) {
+
+    if (beg >= RARRAY(ary)->len) {
 	if (beg > ARY_MAX_SIZE - rlen) {
 	    rb_raise(rb_eIndexError, "index %ld too big", beg);
 	}
 	len = beg + rlen;
-	if (len >= ARY_CAPA(ary)) {
-	    RESIZE_CAPA(ary, len);
+	if (len >= RARRAY(ary)->aux.capa) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
+	    RARRAY(ary)->aux.capa = len;
 	}
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
 	if (rlen > 0) {
-	    MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+	    MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
 	}
 	RARRAY(ary)->len = len;
     }
     else {
 	long alen;
 
-	if (beg + len > RARRAY_LEN(ary)) {
-	    len = RARRAY_LEN(ary) - beg;
+	if (beg + len > RARRAY(ary)->len) {
+	    len = RARRAY(ary)->len - beg;
 	}
 
-	alen = RARRAY_LEN(ary) + rlen - len;
-	if (alen >= ARY_CAPA(ary)) {
-	    RESIZE_CAPA(ary, alen);
+	alen = RARRAY(ary)->len + rlen - len;
+	if (alen >= RARRAY(ary)->aux.capa) {
+	    REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
+	    RARRAY(ary)->aux.capa = alen;
 	}
 
 	if (len != rlen) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
-		    VALUE, RARRAY_LEN(ary) - (beg + len));
+	    MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
+		    VALUE, RARRAY(ary)->len - (beg + len));
 	    RARRAY(ary)->len = alen;
 	}
 	if (rlen > 0) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+	    MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
 	}
     }
 }
@@ -1035,8 +1145,9 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
  *  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. An +IndexError+ is raised if a negative index points
- *  past the beginning of the array. See also
+ *  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
@@ -1046,16 +1157,24 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
  *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
  *     a[0..2] = "A"               #=> ["A", "4"]
  *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A", nil]
- *     a[1..-1] = []               #=> ["A"]
+ *     a[1..-1] = nil              #=> ["A"]
  */
 
 static VALUE
-rb_ary_aset(int argc, VALUE *argv, VALUE ary)
+rb_ary_aset(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE 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]);
 	return argv[2];
     }
@@ -1066,7 +1185,10 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 	offset = FIX2LONG(argv[0]);
 	goto fixnum;
     }
-    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
+    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]);
 	return argv[1];
@@ -1091,7 +1213,10 @@ fixnum:
  */
 
 static VALUE
-rb_ary_insert(int argc, VALUE *argv, VALUE ary)
+rb_ary_insert(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     long pos;
 
@@ -1101,7 +1226,7 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
     }
     pos = NUM2LONG(argv[0]);
     if (pos == -1) {
-	pos = RARRAY_LEN(ary);
+	pos = RARRAY(ary)->len;
     }
     if (pos < 0) {
 	pos++;
@@ -1126,13 +1251,14 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_each(VALUE ary)
+rb_ary_each(ary)
+    VALUE ary;
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_PTR(ary)[i]);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	rb_yield(RARRAY(ary)->ptr[i]);
     }
     return ary;
 }
@@ -1153,12 +1279,13 @@ rb_ary_each(VALUE ary)
  */
 
 static VALUE
-rb_ary_each_index(VALUE ary)
+rb_ary_each_index(ary)
+    VALUE ary;
 {
     long i;
-    RETURN_ENUMERATOR(ary, 0, 0);
 
-    for (i=0; i<RARRAY_LEN(ary); i++) {
+    RETURN_ENUMERATOR(ary, 0, 0);
+    for (i=0; i<RARRAY(ary)->len; i++) {
 	rb_yield(LONG2NUM(i));
     }
     return ary;
@@ -1180,16 +1307,17 @@ rb_ary_each_index(VALUE ary)
  */
 
 static VALUE
-rb_ary_reverse_each(VALUE ary)
+rb_ary_reverse_each(ary)
+    VALUE ary;
 {
     long len;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    len = RARRAY_LEN(ary);
+    len = RARRAY(ary)->len;
     while (len--) {
-	rb_yield(RARRAY_PTR(ary)[len]);
-	if (RARRAY_LEN(ary) < len) {
-	    len = RARRAY_LEN(ary);
+	rb_yield(RARRAY(ary)->ptr[len]);
+	if (RARRAY(ary)->len < len) {
+	    len = RARRAY(ary)->len;
 	}
     }
     return ary;
@@ -1205,10 +1333,10 @@ rb_ary_reverse_each(VALUE ary)
  */
 
 static VALUE
-rb_ary_length(VALUE ary)
+rb_ary_length(ary)
+    VALUE ary;
 {
-    long len = RARRAY_LEN(ary);
-    return LONG2NUM(len);
+    return LONG2NUM(RARRAY(ary)->len);
 }
 
 /*
@@ -1221,68 +1349,71 @@ rb_ary_length(VALUE ary)
  */
 
 static VALUE
-rb_ary_empty_p(VALUE ary)
+rb_ary_empty_p(ary)
+    VALUE ary;
 {
-    if (RARRAY_LEN(ary) == 0)
+    if (RARRAY(ary)->len == 0)
 	return Qtrue;
     return Qfalse;
 }
 
 VALUE
-rb_ary_dup(VALUE ary)
+rb_ary_dup(ary)
+    VALUE ary;
 {
-    VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+    VALUE dup = rb_ary_new2(RARRAY(ary)->len);
 
     DUPSETUP(dup, ary);
-    MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
-    RARRAY(dup)->len = RARRAY_LEN(ary);
-
+    MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    RARRAY(dup)->len = RARRAY(ary)->len;
     return dup;
 }
 
 extern VALUE rb_output_fs;
 
 static VALUE
-recursive_join(VALUE ary, VALUE argp, int recur)
+inspect_join(ary, arg)
+    VALUE ary;
+    VALUE *arg;
 {
-    VALUE *arg = (VALUE *)argp;
-    if (recur) {
-	return rb_usascii_str_new2("[...]");
-    }
     return rb_ary_join(arg[0], arg[1]);
 }
 
 VALUE
-rb_ary_join(VALUE ary, VALUE sep)
+rb_ary_join(ary, sep)
+    VALUE ary, sep;
 {
     long len = 1, i;
     int taint = Qfalse;
     VALUE result, tmp;
 
-    if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
     if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
 
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	tmp = rb_check_string_type(RARRAY_PTR(ary)[i]);
-	len += NIL_P(tmp) ? 10 : RSTRING_LEN(tmp);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
+	len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
     }
     if (!NIL_P(sep)) {
 	StringValue(sep);
-	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
+	len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
     }
     result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	tmp = RARRAY_PTR(ary)[i];
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    {
+	    if (rb_inspecting_p(tmp)) {
+		tmp = rb_str_new2("[...]");
+	    }
+	    else {
 		VALUE args[2];
 
 		args[0] = tmp;
 		args[1] = sep;
-		tmp = rb_exec_recursive(recursive_join, ary, (VALUE)args);
+		tmp = rb_protect_inspect(inspect_join, ary, (VALUE)args);
 	    }
 	    break;
 	  default:
@@ -1310,7 +1441,10 @@ rb_ary_join(VALUE ary, VALUE sep)
  */
 
 static VALUE
-rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
+rb_ary_join_m(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE sep;
 
@@ -1320,17 +1454,118 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE 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;
+{
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+    
+    return rb_ary_join(ary, rb_output_fs);
+}
+
+static ID inspect_key;
+
+struct inspect_arg {
+    VALUE (*func)();
+    VALUE arg1, arg2;
+};
+
+static VALUE
+inspect_call(arg)
+    struct inspect_arg *arg;
+{
+    return (*arg->func)(arg->arg1, arg->arg2);
+}
+
 static VALUE
-inspect_ary(VALUE ary, VALUE dummy, int recur)
+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);
+    }
+    return 0;
+}
+
+VALUE
+rb_protect_inspect(func, obj, arg)
+    VALUE (*func)(ANYARGS);
+    VALUE obj, arg;
+{
+    struct inspect_arg iarg;
+    VALUE inspect_tbl;
+    VALUE id;
+
+    inspect_tbl = get_inspect_tbl(Qtrue);
+    id = rb_obj_id(obj);
+    if (rb_ary_includes(inspect_tbl, id)) {
+	return (*func)(obj, arg);
+    }
+    rb_ary_push(inspect_tbl, id);
+    iarg.func = func;
+    iarg.arg1 = obj;
+    iarg.arg2 = arg;
+
+    return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
+}
+
+VALUE
+rb_inspecting_p(obj)
+    VALUE obj;
+{
+    VALUE inspect_tbl;
+
+    inspect_tbl = get_inspect_tbl(Qfalse);
+    if (NIL_P(inspect_tbl)) return Qfalse;
+    return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
+}
+
+static VALUE
+inspect_ary(ary)
+    VALUE ary;
 {
     int tainted = OBJ_TAINTED(ary);
     long i;
     VALUE s, str;
 
-    if (recur) return rb_tainted_str_new2("[...]");
     str = rb_str_buf_new2("[");
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	s = rb_inspect(RARRAY_PTR(ary)[i]);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	s = rb_inspect(RARRAY(ary)->ptr[i]);
 	if (OBJ_TAINTED(s)) tainted = Qtrue;
 	if (i > 0) rb_str_buf_cat2(str, ", ");
 	rb_str_buf_append(str, s);
@@ -1342,23 +1577,18 @@ inspect_ary(VALUE ary, VALUE dummy, int recur)
 
 /*
  *  call-seq:
- *     array.to_s -> string
  *     array.inspect  -> string
  *
  *  Create a printable version of <i>array</i>.
  */
 
 static VALUE
-rb_ary_inspect(VALUE ary)
-{
-    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new2("[]");
-    return rb_exec_recursive(inspect_ary, ary, 0);
-}
-
-VALUE
-rb_ary_to_s(VALUE ary)
+rb_ary_inspect(ary)
+    VALUE ary;
 {
-    return rb_ary_inspect(ary);
+    if (RARRAY(ary)->len == 0) return rb_str_new2("[]");
+    if (rb_inspecting_p(ary)) return rb_str_new2("[...]");
+    return rb_protect_inspect(inspect_ary, ary, 0);
 }
 
 /*
@@ -1370,10 +1600,11 @@ rb_ary_to_s(VALUE ary)
  */
 
 static VALUE
-rb_ary_to_a(VALUE ary)
+rb_ary_to_a(ary)
+    VALUE ary;
 {
     if (rb_obj_class(ary) != rb_cArray) {
-	VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+	VALUE dup = rb_ary_new2(RARRAY(ary)->len);
 	rb_ary_replace(dup, ary);
 	return dup;
     }
@@ -1388,21 +1619,23 @@ rb_ary_to_a(VALUE ary)
  */
 
 static VALUE
-rb_ary_to_ary_m(VALUE ary)
+rb_ary_to_ary_m(ary)
+    VALUE ary;
 {
     return ary;
 }
 
 VALUE
-rb_ary_reverse(VALUE ary)
+rb_ary_reverse(ary)
+    VALUE ary;
 {
     VALUE *p1, *p2;
     VALUE tmp;
 
     rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > 1) {
-	p1 = RARRAY_PTR(ary);
-	p2 = p1 + RARRAY_LEN(ary) - 1;	/* points last item */
+    if (RARRAY(ary)->len > 1) {
+	p1 = RARRAY(ary)->ptr;
+	p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
 
 	while (p1 < p2) {
 	    tmp = *p1;
@@ -1425,7 +1658,8 @@ rb_ary_reverse(VALUE ary)
  */
 
 static VALUE
-rb_ary_reverse_bang(VALUE ary)
+rb_ary_reverse_bang(ary)
+    VALUE ary;
 {
     return rb_ary_reverse(ary);
 }
@@ -1441,38 +1675,47 @@ rb_ary_reverse_bang(VALUE ary)
  */
 
 static VALUE
-rb_ary_reverse_m(VALUE ary)
+rb_ary_reverse_m(ary)
+    VALUE ary;
 {
     return rb_ary_reverse(rb_ary_dup(ary));
 }
 
-static VALUE
-sort_reentered(VALUE *klass)
+struct ary_sort_data {
+    VALUE ary;
+    VALUE *ptr;
+    long len;
+};
+
+static void
+ary_sort_check(data)
+    struct ary_sort_data *data;
 {
-    if (*klass) {
-	rb_raise(rb_eRuntimeError, "sort reentered");
+    if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
+	rb_raise(rb_eArgError, "array modified during sort");
     }
-    return Qnil;
 }
 
 static int
-sort_1(const void *ap, const void *bp, void *dummy)
+sort_1(a, b, data)
+    VALUE *a, *b;
+    struct ary_sort_data *data;
 {
-    VALUE retval = sort_reentered(dummy);
-    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+    VALUE retval = rb_yield_values(2, *a, *b);
     int n;
 
-    retval = rb_yield_values(2, a, b);
-    n = rb_cmpint(retval, a, b);
-    sort_reentered(dummy);
+    n = rb_cmpint(retval, *a, *b);
+    ary_sort_check(data);
     return n;
 }
 
 static int
-sort_2(const void *ap, const void *bp, void *dummy)
+sort_2(ap, bp, data)
+    VALUE *ap, *bp;
+    struct ary_sort_data *data;
 {
-    VALUE retval = sort_reentered(dummy);
-    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
+    VALUE retval;
+    VALUE a = *ap, b = *bp;
     int n;
 
     if (FIXNUM_P(a) && FIXNUM_P(b)) {
@@ -1486,11 +1729,32 @@ sort_2(const void *ap, const void *bp, void *dummy)
 
     retval = rb_funcall(a, id_cmp, 1, b);
     n = rb_cmpint(retval, a, b);
-    sort_reentered(dummy);
+    ary_sort_check(data);
 
     return n;
 }
 
+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);
+    return ary;
+}
+
+static VALUE
+sort_unlock(ary)
+    VALUE ary;
+{
+    FL_UNSET(ary, ARY_TMPLOCK);
+    return ary;
+}
+
 /*
  *  call-seq:
  *     array.sort!                   -> array
@@ -1508,27 +1772,13 @@ sort_2(const void *ap, const void *bp, void *dummy)
  */
 
 VALUE
-rb_ary_sort_bang(VALUE ary)
+rb_ary_sort_bang(ary)
+    VALUE ary;
 {
     rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > 1) {
-	VALUE tmp = ary_make_shared(ary);
-
-	RBASIC(tmp)->klass = 0;
-	ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
-		   rb_block_given_p()?sort_1:sort_2, &RBASIC(tmp)->klass);
-	if (RARRAY(ary)->ptr != RARRAY(tmp)->ptr) {
-	    if (!ARY_SHARED_P(ary)) xfree(RARRAY(ary)->ptr);
-	    RARRAY(ary)->ptr = RARRAY(tmp)->ptr;
-	    RARRAY(ary)->len = RARRAY(tmp)->len;
-	    RARRAY(ary)->aux.capa = RARRAY(tmp)->aux.capa;
-	    FL_SET(ary, ELTS_SHARED);
-	};
-	FL_UNSET(ary, ELTS_SHARED);
-	RARRAY(tmp)->ptr = 0;
-	RARRAY(tmp)->len = 0;
-	RARRAY(tmp)->aux.capa = 0;
-	RBASIC(tmp)->klass = RBASIC(ary)->klass;
+    if (RARRAY(ary)->len > 1) {
+	FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
+	rb_ensure(sort_internal, ary, sort_unlock, ary);
     }
     return ary;
 }
@@ -1550,14 +1800,14 @@ rb_ary_sort_bang(VALUE ary)
  */
 
 VALUE
-rb_ary_sort(VALUE ary)
+rb_ary_sort(ary)
+    VALUE ary;
 {
     ary = rb_ary_dup(ary);
     rb_ary_sort_bang(ary);
     return ary;
 }
 
-
 /*
  *  call-seq:
  *     array.collect {|item| block }  -> an_array
@@ -1573,20 +1823,23 @@ rb_ary_sort(VALUE ary)
  */
 
 static VALUE
-rb_ary_collect(VALUE ary)
+rb_ary_collect(ary)
+    VALUE ary;
 {
     long i;
     VALUE collect;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    collect = rb_ary_new2(RARRAY_LEN(ary));
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
+    if (!rb_block_given_p()) {
+	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
+    }
+
+    collect = rb_ary_new2(RARRAY(ary)->len);
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
     }
     return collect;
 }
 
-
 /* 
  *  call-seq:
  *     array.collect! {|item| block }   ->   array
@@ -1602,20 +1855,26 @@ rb_ary_collect(VALUE ary)
  */
 
 static VALUE
-rb_ary_collect_bang(VALUE ary)
+rb_ary_collect_bang(ary)
+    VALUE ary;
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_modify(ary);
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
     }
     return ary;
 }
 
 VALUE
-rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
+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;
@@ -1659,12 +1918,14 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
  */
 
 static VALUE
-rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
+rb_ary_values_at(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
-    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
+    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
 }
 
-
 /*
  *  call-seq:
  *     array.select {|item| block } -> an_array
@@ -1678,15 +1939,16 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_select(VALUE ary)
+rb_ary_select(ary)
+    VALUE ary;
 {
     VALUE result;
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    result = rb_ary_new2(RARRAY_LEN(ary));
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (RTEST(rb_yield(RARRAY_PTR(ary)[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));
 	}
     }
@@ -1711,12 +1973,14 @@ rb_ary_select(VALUE ary)
  */
 
 VALUE
-rb_ary_delete(VALUE ary, VALUE item)
+rb_ary_delete(ary, item)
+    VALUE ary;
+    VALUE item;
 {
     long i1, i2;
 
-    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE e = RARRAY_PTR(ary)[i1];
+    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+	VALUE e = RARRAY(ary)->ptr[i1];
 
 	if (rb_equal(e, item)) continue;
 	if (i1 != i2) {
@@ -1724,7 +1988,7 @@ rb_ary_delete(VALUE ary, VALUE item)
 	}
 	i2++;
     }
-    if (RARRAY_LEN(ary) == i2) {
+    if (RARRAY(ary)->len == i2) {
 	if (rb_block_given_p()) {
 	    return rb_yield(item);
 	}
@@ -1732,11 +1996,12 @@ rb_ary_delete(VALUE ary, VALUE item)
     }
 
     rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > i2) {
+    if (RARRAY(ary)->len > i2) {
 	RARRAY(ary)->len = i2;
-	if (i2 * 2 < ARY_CAPA(ary) &&
-	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
-	    RESIZE_CAPA(ary, i2*2);
+	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;
 	}
     }
 
@@ -1744,9 +2009,11 @@ rb_ary_delete(VALUE ary, VALUE item)
 }
 
 VALUE
-rb_ary_delete_at(VALUE ary, long pos)
+rb_ary_delete_at(ary, pos)
+    VALUE ary;
+    long pos;
 {
-    long len = RARRAY_LEN(ary);
+    long i, len = RARRAY(ary)->len;
     VALUE del;
 
     if (pos >= len) return Qnil;
@@ -1756,10 +2023,11 @@ rb_ary_delete_at(VALUE ary, long pos)
     }
 
     rb_ary_modify(ary);
-    del = RARRAY_PTR(ary)[pos];
-    MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
-	    RARRAY_LEN(ary)-pos-1);
-    RARRAY(ary)->len--;
+    del = RARRAY(ary)->ptr[pos];
+    for (i = pos + 1; i < len; i++, pos++) {
+	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
+    }
+    RARRAY(ary)->len = pos;
 
     return del;
 }
@@ -1779,7 +2047,8 @@ rb_ary_delete_at(VALUE ary, long pos)
  */
 
 static VALUE
-rb_ary_delete_at_m(VALUE ary, VALUE pos)
+rb_ary_delete_at_m(ary, pos)
+    VALUE ary, pos;
 {
     return rb_ary_delete_at(ary, NUM2LONG(pos));
 }
@@ -1792,7 +2061,13 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
  *  
  *  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.
+ *  <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"
@@ -1804,7 +2079,10 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
  */
 
 static VALUE
-rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_slice_bang(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE arg1, arg2;
     long pos, len, orig_len;
@@ -1827,7 +2105,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 	if (len == 0) return rb_ary_new2(0);
 	arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
 	RBASIC(arg2)->klass = rb_obj_class(ary);
-	rb_ary_splice(ary, pos, len, Qundef);
+	rb_ary_splice(ary, pos, len, Qnil);	/* Qundef in 1.9 */
 	return arg2;
     }
 
@@ -1859,24 +2137,25 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_reject_bang(VALUE ary)
+rb_ary_reject_bang(ary)
+    VALUE ary;
 {
     long i1, i2;
 
     RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_modify(ary);
-    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE v = RARRAY_PTR(ary)[i1];
+    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
+	VALUE v = RARRAY(ary)->ptr[i1];
 	if (RTEST(rb_yield(v))) continue;
 	if (i1 != i2) {
 	    rb_ary_store(ary, i2, v);
 	}
 	i2++;
     }
-
-    if (RARRAY_LEN(ary) == i2) return Qnil;
-    if (i2 < RARRAY_LEN(ary))
+    if (RARRAY(ary)->len == i2) return Qnil;
+    if (i2 < RARRAY(ary)->len)
 	RARRAY(ary)->len = i2;
+
     return ary;
 }
 
@@ -1889,7 +2168,8 @@ rb_ary_reject_bang(VALUE ary)
  */
 
 static VALUE
-rb_ary_reject(VALUE ary)
+rb_ary_reject(ary)
+    VALUE ary;
 {
     RETURN_ENUMERATOR(ary, 0, 0);
     ary = rb_ary_dup(ary);
@@ -1909,34 +2189,14 @@ rb_ary_reject(VALUE ary)
  */
 
 static VALUE
-rb_ary_delete_if(VALUE ary)
+rb_ary_delete_if(ary)
+    VALUE ary;
 {
     RETURN_ENUMERATOR(ary, 0, 0);
     rb_ary_reject_bang(ary);
     return ary;
 }
 
-static VALUE
-take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
-{
-    if (args[1]-- == 0) rb_iter_break();
-    if (argc > 1) val = rb_ary_new4(argc, argv);
-    rb_ary_push(args[0], val);
-    return Qnil;
-}
-
-static VALUE
-take_items(VALUE obj, long n)
-{
-    VALUE result = rb_ary_new2(n);
-    VALUE args[2];
-
-    args[0] = result; args[1] = (VALUE)n;
-    rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
-    return result;
-}
-
-
 /*
  *  call-seq:
  *     array.zip(arg, ...)                   -> an_array
@@ -1953,39 +2213,47 @@ take_items(VALUE obj, long n)
  *     
  *     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(int argc, VALUE *argv, VALUE ary)
+rb_ary_zip(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     int i, j;
     long len;
-    VALUE result = Qnil;
+    VALUE result;
 
-    len = RARRAY_LEN(ary);
     for (i=0; i<argc; i++) {
-	argv[i] = take_items(argv[i], len);
-    }
-    if (!rb_block_given_p()) {
-	result = rb_ary_new2(len);
+	argv[i] = to_ary(argv[i]);
     }
+    if (rb_block_given_p()) {
+	for (i=0; i<RARRAY(ary)->len; i++) {
+	    VALUE tmp = rb_ary_new2(argc+1);
 
-    for (i=0; i<RARRAY_LEN(ary); i++) {
+	    rb_ary_push(tmp, rb_ary_elt(ary, i));
+	    for (j=0; j<argc; j++) {
+		rb_ary_push(tmp, rb_ary_elt(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));
 	for (j=0; j<argc; j++) {
 	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
 	}
-	if (NIL_P(result)) {
-	    rb_yield(tmp);
-	}
-	else {
-	    rb_ary_push(result, tmp);
-	}
+	rb_ary_push(result, tmp);
     }
     return result;
 }
@@ -2002,25 +2270,26 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_transpose(VALUE ary)
+rb_ary_transpose(ary)
+    VALUE ary;
 {
     long elen = -1, alen, i, j;
     VALUE tmp, result = 0;
 
-    alen = RARRAY_LEN(ary);
+    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));
 	if (elen < 0) {		/* first element */
-	    elen = RARRAY_LEN(tmp);
+	    elen = RARRAY(tmp)->len;
 	    result = rb_ary_new2(elen);
 	    for (j=0; j<elen; j++) {
 		rb_ary_store(result, j, rb_ary_new2(alen));
 	    }
 	}
-	else if (elen != RARRAY_LEN(tmp)) {
-	    rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
-		     RARRAY_LEN(tmp), elen);
+	else if (elen != RARRAY(tmp)->len) {
+	    rb_raise(rb_eIndexError, "element size differs (%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));
@@ -2041,20 +2310,18 @@ rb_ary_transpose(VALUE ary)
  *     a                              #=> ["x", "y", "z"]
  */
 
-VALUE
-rb_ary_replace(VALUE copy, VALUE orig)
+static VALUE
+rb_ary_replace(copy, orig)
+    VALUE copy, orig;
 {
     VALUE shared;
-    VALUE *ptr;
 
+    rb_ary_modify(copy);
     orig = to_ary(orig);
-    rb_ary_modify_check(copy);
     if (copy == orig) return copy;
     shared = ary_make_shared(orig);
-    if (!ARY_SHARED_P(copy)) {
-	ptr = RARRAY(copy)->ptr;
-	xfree(ptr);
-    }
+    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;
@@ -2074,12 +2341,14 @@ rb_ary_replace(VALUE copy, VALUE orig)
  */
 
 VALUE
-rb_ary_clear(VALUE ary)
+rb_ary_clear(ary)
+    VALUE ary;
 {
     rb_ary_modify(ary);
     RARRAY(ary)->len = 0;
-    if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	RESIZE_CAPA(ary, ARY_DEFAULT_SIZE * 2);
+    if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
+	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
     }
     return ary;
 }
@@ -2109,7 +2378,10 @@ rb_ary_clear(VALUE ary)
  */
 
 static VALUE
-rb_ary_fill(int argc, VALUE *argv, VALUE ary)
+rb_ary_fill(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE item, arg1, arg2;
     long beg = 0, end = 0, len = 0;
@@ -2127,20 +2399,20 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
     switch (argc) {
       case 1:
 	beg = 0;
-	len = RARRAY_LEN(ary);
+	len = RARRAY(ary)->len;
 	break;
       case 2:
-	if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
+	if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
 	    break;
 	}
 	/* fall through */
       case 3:
 	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
 	if (beg < 0) {
-	    beg = RARRAY_LEN(ary) + beg;
+	    beg = RARRAY(ary)->len + beg;
 	    if (beg < 0) beg = 0;
 	}
-	len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
+	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
 	break;
     }
     rb_ary_modify(ary);
@@ -2151,11 +2423,12 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	rb_raise(rb_eArgError, "argument too big");
     }
     end = beg + len;
-    if (RARRAY_LEN(ary) < end) {
-	if (end >= ARY_CAPA(ary)) {
-	    RESIZE_CAPA(ary, end);
+    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_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
 	RARRAY(ary)->len = end;
     }
 
@@ -2165,12 +2438,12 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY_LEN(ary)) break;
-	    RARRAY_PTR(ary)[i] = v;
+	    if (i>=RARRAY(ary)->len) break;
+	    RARRAY(ary)->ptr[i] = v;
 	}
     }
     else {
-	p = RARRAY_PTR(ary) + beg;
+	p = RARRAY(ary)->ptr + beg;
 	pend = p + len;
 	while (p < pend) {
 	    *p++ = item;
@@ -2190,16 +2463,17 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_plus(VALUE x, VALUE y)
+rb_ary_plus(x, y)
+    VALUE x, y;
 {
     VALUE z;
     long len;
 
     y = to_ary(y);
-    len = RARRAY_LEN(x) + RARRAY_LEN(y);
+    len = RARRAY(x)->len + RARRAY(y)->len;
     z = rb_ary_new2(len);
-    MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
-    MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
+    MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
+    MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
     RARRAY(z)->len = len;
     return z;
 }
@@ -2215,11 +2489,12 @@ rb_ary_plus(VALUE x, VALUE y)
 
 
 VALUE
-rb_ary_concat(VALUE x, VALUE y)
+rb_ary_concat(x, y)
+    VALUE x, y;
 {
     y = to_ary(y);
-    if (RARRAY_LEN(y) > 0) {
-	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
+    if (RARRAY(y)->len > 0) {
+	rb_ary_splice(x, RARRAY(x)->len, 0, y);
     }
     return x;
 }
@@ -2241,7 +2516,8 @@ rb_ary_concat(VALUE x, VALUE y)
  */
 
 static VALUE
-rb_ary_times(VALUE ary, VALUE times)
+rb_ary_times(ary, times)
+    VALUE ary, times;
 {
     VALUE ary2, tmp;
     long i, len;
@@ -2256,16 +2532,16 @@ rb_ary_times(VALUE ary, VALUE times)
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
-    if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
+    if (ARY_MAX_SIZE/len < RARRAY(ary)->len) {
 	rb_raise(rb_eArgError, "argument too big");
     }
-    len *= RARRAY_LEN(ary);
+    len *= RARRAY(ary)->len;
 
     ary2 = ary_new(rb_obj_class(ary), len);
     RARRAY(ary2)->len = len;
 
-    for (i=0; i<len; i+=RARRAY_LEN(ary)) {
-	MEMCPY(RARRAY_PTR(ary2)+i, RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
+    for (i=0; i<len; i+=RARRAY(ary)->len) {
+	MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
     }
     OBJ_INFECT(ary2, ary);
 
@@ -2293,15 +2569,16 @@ rb_ary_times(VALUE ary, VALUE times)
  */
 
 VALUE
-rb_ary_assoc(VALUE ary, VALUE key)
+rb_ary_assoc(ary, key)
+    VALUE ary, key;
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
-	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
-	    rb_equal(RARRAY_PTR(v)[0], key))
+    for (i = 0; i < RARRAY(ary)->len; ++i) {
+	v = rb_check_array_type(RARRAY(ary)->ptr[i]);
+	if (!NIL_P(v) && RARRAY(v)->len > 0 &&
+	    rb_equal(RARRAY(v)->ptr[0], key))
 	    return v;
     }
     return Qnil;
@@ -2309,10 +2586,10 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *     array.rassoc(obj) -> an_array or nil
+ *     array.rassoc(key) -> an_array or nil
  *  
  *  Searches through the array whose elements are also arrays. Compares
- *  _obj_ with the second element of each contained array using
+ *  <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>.
  *     
@@ -2322,28 +2599,32 @@ rb_ary_assoc(VALUE ary, VALUE key)
  */
 
 VALUE
-rb_ary_rassoc(VALUE ary, VALUE value)
+rb_ary_rassoc(ary, value)
+    VALUE ary, value;
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_PTR(ary)[i];
+    for (i = 0; i < RARRAY(ary)->len; ++i) {
+	v = RARRAY(ary)->ptr[i];
 	if (TYPE(v) == T_ARRAY &&
-	    RARRAY_LEN(v) > 1 &&
-	    rb_equal(RARRAY_PTR(v)[1], value))
+	    RARRAY(v)->len > 1 &&
+	    rb_equal(RARRAY(v)->ptr[1], value))
 	    return v;
     }
     return Qnil;
 }
 
+static VALUE recursive_equal _((VALUE, VALUE, int));
 static VALUE
-recursive_equal(VALUE ary1, VALUE ary2, int recur)
+recursive_equal(ary1, ary2, recur)
+    VALUE ary1, ary2;
+    int recur;
 {
     long i;
 
     if (recur) return Qfalse;
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
+    for (i=0; i<RARRAY(ary1)->len; i++) {
 	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
 	    return Qfalse;
     }
@@ -2365,7 +2646,8 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
  */
 
 static VALUE
-rb_ary_equal(VALUE ary1, VALUE ary2)
+rb_ary_equal(ary1, ary2)
+    VALUE ary1, ary2;
 {
     if (ary1 == ary2) return Qtrue;
     if (TYPE(ary2) != T_ARRAY) {
@@ -2374,17 +2656,20 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
 	}
 	return rb_equal(ary2, ary1);
     }
-    if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
     return rb_exec_recursive(recursive_equal, ary1, ary2);
 }
 
+static VALUE recursive_eql _((VALUE, VALUE, int));
 static VALUE
-recursive_eql(VALUE ary1, VALUE ary2, int recur)
+recursive_eql(ary1, ary2, recur)
+    VALUE ary1, ary2;
+    int recur;
 {
     long i;
 
     if (recur) return Qfalse;
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
+    for (i=0; i<RARRAY(ary1)->len; i++) {
 	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
 	    return Qfalse;
     }
@@ -2400,16 +2685,21 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
  */
 
 static VALUE
-rb_ary_eql(VALUE ary1, VALUE ary2)
+rb_ary_eql(ary1, ary2)
+    VALUE ary1, ary2;
 {
     if (ary1 == ary2) return Qtrue;
     if (TYPE(ary2) != T_ARRAY) return Qfalse;
-    if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
     return rb_exec_recursive(recursive_eql, ary1, ary2);
 }
 
+static VALUE recursive_hash _((VALUE, VALUE, int));
 static VALUE
-recursive_hash(VALUE ary, VALUE dummy, int recur)
+recursive_hash(ary, dummy, recur)
+    VALUE ary;
+    VALUE dummy;
+    int recur;
 {
     long i, h;
     VALUE n;
@@ -2417,10 +2707,11 @@ recursive_hash(VALUE ary, VALUE dummy, int recur)
     if (recur) {
 	return LONG2FIX(0);
     }
-    h = RARRAY_LEN(ary);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
+
+    h = RARRAY(ary)->len;
+    for (i=0; i<RARRAY(ary)->len; i++) {
 	h = (h << 1) | (h<0 ? 1 : 0);
-	n = rb_hash(RARRAY_PTR(ary)[i]);
+	n = rb_hash(RARRAY(ary)->ptr[i]);
 	h ^= NUM2LONG(n);
     }
     return LONG2FIX(h);
@@ -2435,7 +2726,8 @@ recursive_hash(VALUE ary, VALUE dummy, int recur)
  */
 
 static VALUE
-rb_ary_hash(VALUE ary)
+rb_ary_hash(ary)
+    VALUE ary;
 {
     return rb_exec_recursive(recursive_hash, ary, 0);
 }
@@ -2454,12 +2746,14 @@ rb_ary_hash(VALUE ary)
  */
 
 VALUE
-rb_ary_includes(VALUE ary, VALUE item)
+rb_ary_includes(ary, item)
+    VALUE ary;
+    VALUE item;
 {
     long i;
     
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], item)) {
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (rb_equal(RARRAY(ary)->ptr[i], item)) {
 	    return Qtrue;
 	}
     }
@@ -2467,15 +2761,19 @@ rb_ary_includes(VALUE ary, VALUE item)
 }
 
 
+static VALUE recursive_cmp _((VALUE, VALUE, int));
 static VALUE
-recursive_cmp(VALUE ary1, VALUE ary2, int recur)
+recursive_cmp(ary1, ary2, recur)
+    VALUE ary1;
+    VALUE ary2;
+    int recur;
 {
     long i, len;
 
     if (recur) return Qnil;
-    len = RARRAY_LEN(ary1);
-    if (len > RARRAY_LEN(ary2)) {
-	len = RARRAY_LEN(ary2);
+    len = RARRAY(ary1)->len;
+    if (len > RARRAY(ary2)->len) {
+	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));
@@ -2507,7 +2805,8 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
  */
 
 VALUE
-rb_ary_cmp(VALUE ary1, VALUE ary2)
+rb_ary_cmp(ary1, ary2)
+    VALUE ary1, ary2;
 {
     long len;
     VALUE v;
@@ -2516,24 +2815,25 @@ rb_ary_cmp(VALUE ary1, VALUE ary2)
     if (ary1 == ary2) return INT2FIX(0);
     v = rb_exec_recursive(recursive_cmp, ary1, ary2);
     if (v != Qundef) return v;
-    len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
+    len = RARRAY(ary1)->len - RARRAY(ary2)->len;
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
     return INT2FIX(-1);
 }
 
 static VALUE
-ary_make_hash(VALUE ary1, VALUE ary2)
+ary_make_hash(ary1, ary2)
+    VALUE ary1, ary2;
 {
     VALUE hash = rb_hash_new();
     long i;
 
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	rb_hash_aset(hash, RARRAY_PTR(ary1)[i], Qtrue);
+    for (i=0; i<RARRAY(ary1)->len; i++) {
+	rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
     }
     if (ary2) {
-	for (i=0; i<RARRAY_LEN(ary2); i++) {
-	    rb_hash_aset(hash, RARRAY_PTR(ary2)[i], Qtrue);
+	for (i=0; i<RARRAY(ary2)->len; i++) {
+	    rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
 	}
     }
     return hash;
@@ -2552,7 +2852,8 @@ ary_make_hash(VALUE ary1, VALUE ary2)
  */
 
 static VALUE
-rb_ary_diff(VALUE ary1, VALUE ary2)
+rb_ary_diff(ary1, ary2)
+    VALUE ary1, ary2;
 {
     VALUE ary3;
     volatile VALUE hash;
@@ -2561,8 +2862,8 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
     hash = ary_make_hash(to_ary(ary2), 0);
     ary3 = rb_ary_new();
 
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue;
+    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));
     }
     return ary3;
@@ -2580,22 +2881,20 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
 
 
 static VALUE
-rb_ary_and(VALUE ary1, VALUE ary2)
+rb_ary_and(ary1, ary2)
+    VALUE ary1, ary2;
 {
     VALUE hash, ary3, v, vv;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
-	    RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
+    ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
+	    RARRAY(ary1)->len : RARRAY(ary2)->len);
     hash = ary_make_hash(ary2, 0);
 
-    if (RHASH_EMPTY_P(hash))
-        return ary3;
-
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
+    for (i=0; i<RARRAY(ary1)->len; i++) {
 	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -2615,25 +2914,26 @@ rb_ary_and(VALUE ary1, VALUE ary2)
  */
 
 static VALUE
-rb_ary_or(VALUE ary1, VALUE ary2)
+rb_ary_or(ary1, ary2)
+    VALUE ary1, ary2;
 {
     VALUE hash, ary3;
     VALUE v, vv;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
+    ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
     hash = ary_make_hash(ary1, ary2);
 
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
+    for (i=0; i<RARRAY(ary1)->len; i++) {
 	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
-    for (i=0; i<RARRAY_LEN(ary2); i++) {
+    for (i=0; i<RARRAY(ary2)->len; i++) {
 	v = vv = rb_ary_elt(ary2, i);
-	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -2655,19 +2955,20 @@ rb_ary_or(VALUE ary1, VALUE ary2)
  */
 
 static VALUE
-rb_ary_uniq_bang(VALUE ary)
+rb_ary_uniq_bang(ary)
+    VALUE ary;
 {
     VALUE hash, v, vv;
     long i, j;
 
     hash = ary_make_hash(ary, 0);
 
-    if (RARRAY_LEN(ary) == RHASH_SIZE(hash)) {
+    if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
 	return Qnil;
     }
-    for (i=j=0; i<RARRAY_LEN(ary); i++) {
+    for (i=j=0; i<RARRAY(ary)->len; i++) {
 	v = vv = rb_ary_elt(ary, i);
-	if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
+	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
 	    rb_ary_store(ary, j++, v);
 	}
     }
@@ -2687,7 +2988,8 @@ rb_ary_uniq_bang(VALUE ary)
  */
 
 static VALUE
-rb_ary_uniq(VALUE ary)
+rb_ary_uniq(ary)
+    VALUE ary;
 {
     ary = rb_ary_dup(ary);
     rb_ary_uniq_bang(ary);
@@ -2706,27 +3008,24 @@ rb_ary_uniq(VALUE ary)
  */
 
 static VALUE
-rb_ary_compact_bang(VALUE ary)
+rb_ary_compact_bang(ary)
+    VALUE ary;
 {
     VALUE *p, *t, *end;
-    long n;
 
     rb_ary_modify(ary);
-    p = t = RARRAY_PTR(ary);
-    end = p + RARRAY_LEN(ary);
+    p = t = RARRAY(ary)->ptr;
+    end = p + RARRAY(ary)->len;
     
     while (t < end) {
 	if (NIL_P(*t)) t++;
 	else *p++ = *t++;
     }
-    n = p - RARRAY_PTR(ary);
-    if (RARRAY_LEN(ary) == n) {
+    if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
 	return Qnil;
     }
-    if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	RESIZE_CAPA(ary, n * 2);
-    }
-    RARRAY(ary)->len = n;
+    RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
+    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
 
     return ary;
 }
@@ -2742,7 +3041,8 @@ rb_ary_compact_bang(VALUE ary)
  */
 
 static VALUE
-rb_ary_compact(VALUE ary)
+rb_ary_compact(ary)
+    VALUE ary;
 {
     ary = rb_ary_dup(ary);
     rb_ary_compact_bang(ary);
@@ -2751,6 +3051,30 @@ rb_ary_compact(VALUE 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;
+{
+    long n = 0;
+    VALUE *p, *pend;
+
+    for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
+	if (!NIL_P(*p)) n++;
+    }
+    return LONG2NUM(n);
+}
+
+/*
+ *  call-seq:
  *     array.count      -> int
  *     array.count(obj) -> int
  *     array.count { |item| block }  -> int
@@ -2767,7 +3091,10 @@ rb_ary_compact(VALUE ary)
  */
 
 static VALUE
-rb_ary_count(int argc, VALUE *argv, VALUE ary)
+rb_ary_count(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     long n = 0;
 
@@ -2797,7 +3124,10 @@ rb_ary_count(int argc, VALUE *argv, VALUE ary)
 }
 
 static VALUE
-flatten(VALUE ary, int level, int *modified)
+flatten(ary, level, modified)
+    VALUE ary;
+    int level;
+    int *modified;
 {
     long i = 0;
     VALUE stack, result, tmp, elt;
@@ -2811,13 +3141,13 @@ flatten(VALUE ary, int level, int *modified)
     *modified = 0;
 
     while (1) {
-	while (i < RARRAY_LEN(ary)) {
-	    elt = RARRAY_PTR(ary)[i++];
+	while (i < RARRAY(ary)->len) {
+	    elt = RARRAY(ary)->ptr[i++];
 	    tmp = rb_check_array_type(elt);
 	    if (RBASIC(result)->klass) {
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
-	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
+	    if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
@@ -2834,7 +3164,7 @@ flatten(VALUE ary, int level, int *modified)
 		i = 0;
 	    }
 	}
-	if (RARRAY_LEN(stack) == 0) {
+	if (RARRAY(stack)->len == 0) {
 	    break;
 	}
 	id = (st_data_t)ary;
@@ -2869,7 +3199,10 @@ flatten(VALUE ary, int level, int *modified)
  */
 
 static VALUE
-rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
+rb_ary_flatten_bang(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     int mod = 0, level = -1;
     VALUE result, lv;
@@ -2904,7 +3237,10 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
+rb_ary_flatten(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     int mod = 0, level = -1;
     VALUE result, lv;
@@ -2921,23 +3257,24 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     array.shuffle!        -> array
+ *     array.shuffle!        -> array or nil
  *  
  *  Shuffles elements in _self_ in place.
  */
 
 
 static VALUE
-rb_ary_shuffle_bang(VALUE ary)
+rb_ary_shuffle_bang(ary)
+    VALUE ary;
 {
-    long i = RARRAY_LEN(ary);
+    long i = RARRAY(ary)->len;
 
     rb_ary_modify(ary);
     while (i) {
 	long j = rb_genrand_real()*i;
-	VALUE tmp = RARRAY_PTR(ary)[--i];
-	RARRAY_PTR(ary)[i] = RARRAY_PTR(ary)[j];
-	RARRAY_PTR(ary)[j] = tmp;
+	VALUE tmp = RARRAY(ary)->ptr[--i];
+	RARRAY(ary)->ptr[i] = RARRAY(ary)->ptr[j];
+	RARRAY(ary)->ptr[j] = tmp;
     }
     return ary;
 }
@@ -2971,14 +3308,15 @@ rb_ary_shuffle(VALUE ary)
 
 
 static VALUE
-rb_ary_choice(VALUE ary)
+rb_ary_choice(ary)
+    VALUE ary;
 {
     long i, j;
 
-    i = RARRAY_LEN(ary);
+    i = RARRAY(ary)->len;
     if (i == 0) return Qnil;
     j = rb_genrand_real()*i;
-    return RARRAY_PTR(ary)[j];
+    return RARRAY(ary)->ptr[j];
 }
 
 
@@ -2999,7 +3337,10 @@ rb_ary_choice(VALUE ary)
  */
 
 static VALUE
-rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
+rb_ary_cycle(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     long n, i;
     VALUE nv = Qnil;
@@ -3015,9 +3356,9 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
         if (n <= 0) return Qnil;
     }
 
-    while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
-        for (i=0; i<RARRAY_LEN(ary); i++) {
-            rb_yield(RARRAY_PTR(ary)[i]);
+    while (RARRAY(ary)->len > 0 && (n < 0 || 0 < n--)) {
+        for (i=0; i<RARRAY(ary)->len; i++) {
+            rb_yield(RARRAY(ary)->ptr[i]);
         }
     }
     return Qnil;
@@ -3038,7 +3379,10 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-permute0(long n, long r, long *p, long index, int *used, VALUE values)
+permute0(n, r, p, index, used, values)
+    long n, r, *p, index;
+    int *used;
+    VALUE values;
 {
     long i,j;
     for (i = 0; i < n; i++) {
@@ -3055,8 +3399,8 @@ permute0(long n, long r, long *p, long index, int *used, VALUE values)
 		/* Build a ruby array of the corresponding values */
 		/* And yield it to the associated block */
 		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY_PTR(result);
-		const VALUE *values_array = RARRAY_PTR(values);
+		VALUE *result_array = RARRAY(result)->ptr;
+		const VALUE *values_array = RARRAY(values)->ptr;
 
 		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
 		RARRAY(result)->len = r;
@@ -3093,12 +3437,15 @@ permute0(long n, long r, long *p, long index, int *used, VALUE values)
  */
 
 static VALUE
-rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
+rb_ary_permutation(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     VALUE num;
     long r, n, i;
 
-    n = RARRAY_LEN(ary);                  /* Array length */
+    n = RARRAY(ary)->len;                  /* Array length */
     RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
     rb_scan_args(argc, argv, "01", &num);
     r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
@@ -3110,15 +3457,15 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 	rb_yield(rb_ary_new2(0));
     }
     else if (r == 1) { /* this is a special, easy case */
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	for (i = 0; i < RARRAY(ary)->len; i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
 	}
     }
     else {             /* this is the general case */
 	volatile VALUE t0 = tmpbuf(n,sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	long *p = (long*)RSTRING(t0)->ptr;
 	volatile VALUE t1 = tmpbuf(n,sizeof(int));
-	int *used = (int*)RSTRING_PTR(t1);
+	int *used = (int*)RSTRING(t1)->ptr;
 	VALUE ary0 = ary_make_shared(ary); /* private defensive copy of ary */
 
 	for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
@@ -3131,7 +3478,8 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 }
 
 static long
-combi_len(long n, long k)
+combi_len(n, k)
+    long n, k;
 {
     long i, val = 1;
 
@@ -3175,13 +3523,15 @@ combi_len(long n, long k)
  */
 
 static VALUE
-rb_ary_combination(VALUE ary, VALUE num)
+rb_ary_combination(ary, num)
+    VALUE ary;
+    VALUE num;
 {
     long n, i, len;
 
     n = NUM2LONG(num);
     RETURN_ENUMERATOR(ary, 1, &num);
-    len = RARRAY_LEN(ary);
+    len = RARRAY(ary)->len;
     if (n < 0 || len < n) {
 	/* yield nothing */
     }
@@ -3190,24 +3540,24 @@ rb_ary_combination(VALUE ary, VALUE num)
     }
     else if (n == 1) {
 	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
 	}
     }
     else {
 	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING_PTR(t0);
+	long *stack = (long*)RSTRING(t0)->ptr;
 	long nlen = combi_len(len, n);
 	volatile VALUE cc = rb_ary_new2(n);
-	VALUE *chosen = RARRAY_PTR(cc);
+	VALUE *chosen = RARRAY(cc)->ptr;
 	long lev = 0;
 
 	RBASIC(cc)->klass = 0;
 	MEMZERO(stack, long, n);
 	stack[0] = -1;
 	for (i = 0; i < nlen; i++) {
-	    chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
+	    chosen[lev] = RARRAY(ary)->ptr[stack[lev+1]];
 	    for (lev++; lev < n; lev++) {
-		chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
+		chosen[lev] = RARRAY(ary)->ptr[stack[lev+1] = stack[lev]+1];
 	    }
 	    rb_yield(rb_ary_new4(n, chosen));
 	    do {
@@ -3235,13 +3585,16 @@ rb_ary_combination(VALUE ary, VALUE num)
  */
 
 static VALUE
-rb_ary_product(int argc, VALUE *argv, VALUE ary)
+rb_ary_product(argc, argv, ary)
+    int argc;
+    VALUE *argv;
+    VALUE ary;
 {
     int n = argc+1;    /* How many arrays we're operating on */
     volatile VALUE t0 = tmpbuf(n, sizeof(VALUE));
     volatile VALUE t1 = tmpbuf(n, sizeof(int));
-    VALUE *arrays = (VALUE*)RSTRING_PTR(t0); /* The arrays we're computing the product of */
-    int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+    VALUE *arrays = (VALUE*)RSTRING(t0)->ptr; /* The arrays we're computing the product of */
+    int *counters = (int*)RSTRING(t1)->ptr; /* The current position in each one */
     VALUE result;      /* The array we'll be returning */
     long i,j;
     long resultlen = 1;
@@ -3258,7 +3611,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 
     /* Compute the length of the result array; return [] if any is empty */
     for (i = 0; i < n; i++) {
-	long k = RARRAY_LEN(arrays[i]), l = resultlen;
+	long k = RARRAY(arrays[i])->len, l = resultlen;
 	if (k == 0) return rb_ary_new2(0);
 	resultlen *= k;
 	if (resultlen < k || resultlen < l || resultlen / k != l) {
@@ -3285,7 +3638,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 	 */
 	m = n-1;
 	counters[m]++;
-	while (m > 0 && counters[m] == RARRAY_LEN(arrays[m])) {
+	while (m > 0 && counters[m] == RARRAY(arrays[m])->len) {
 	    counters[m] = 0;
 	    m--;
 	    counters[m]++;
@@ -3307,12 +3660,15 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
  */
 
 static VALUE
-rb_ary_take(VALUE obj, VALUE n)
+rb_ary_take(obj, n)
+    VALUE obj;
+    VALUE n;
 {
     long len = NUM2LONG(n);
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
+
     return rb_ary_subseq(obj, 0, len);
 }
 
@@ -3329,13 +3685,14 @@ rb_ary_take(VALUE obj, VALUE n)
  */
 
 static VALUE
-rb_ary_take_while(VALUE ary)
+rb_ary_take_while(ary)
+    VALUE ary;
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
     }
     return rb_ary_take(ary, LONG2FIX(i));
 }
@@ -3353,7 +3710,9 @@ rb_ary_take_while(VALUE ary)
  */
 
 static VALUE
-rb_ary_drop(VALUE ary, VALUE n)
+rb_ary_drop(ary, n)
+    VALUE ary;
+    VALUE n;
 {
     VALUE result;
     long pos = NUM2LONG(n);
@@ -3361,7 +3720,7 @@ rb_ary_drop(VALUE ary, VALUE n)
 	rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
-    result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
+    result = rb_ary_subseq(ary, pos, RARRAY(ary)->len);
     if (result == Qnil) result = rb_ary_new();
     return result;
 }
@@ -3380,13 +3739,14 @@ rb_ary_drop(VALUE ary, VALUE n)
  */
 
 static VALUE
-rb_ary_drop_while(VALUE ary)
+rb_ary_drop_while(ary)
+    VALUE ary;
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
     }
     return rb_ary_drop(ary, LONG2FIX(i));
 }
@@ -3401,20 +3761,17 @@ rb_ary_drop_while(VALUE ary)
  */
 
 void
-Init_Array(void)
+Init_Array()
 {
-#undef rb_intern
-
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cArray, ary_alloc);
     rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
-    rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 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_inspect, 0);
+    rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
     rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
     rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
@@ -3446,6 +3803,8 @@ Init_Array(void)
     rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
     rb_define_method(rb_cArray, "index", rb_ary_index, -1);
     rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
+    rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
+    rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
     rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
     rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
     rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
@@ -3489,6 +3848,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
     rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
     rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
+    rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
     rb_define_method(rb_cArray, "count", rb_ary_count, -1);
     rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
     rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
@@ -3504,4 +3864,5 @@ Init_Array(void)
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
 
     id_cmp = rb_intern("<=>");
+    inspect_key = rb_intern("__inspect_key__");
 }
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index b169aea1d1..713b5c69df 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -3,10 +3,6 @@
 SHELL = $(COMSPEC)
 MKFILES = Makefile
 
-!ifndef MFLAGS
-MFLAGS=-
-!endif
-
 #### Start of system configuration section. ####
 !ifndef OS
 OS = bccwin32
@@ -15,8 +11,6 @@ OS = bccwin32
 !error RT not defined.  Retry from configure pass.
 !endif
 
-arch = $(ARCH)-$(OS)
-
 ## variables may be overridden by $(compile_dir)/Makefile
 !ifndef srcdir
 srcdir = ..
@@ -33,7 +27,7 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
 !endif
 !ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
+RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
 !endif
 !ifndef icondirs
 !ifdef ICONDIRS
@@ -46,6 +40,7 @@ iconinc=-I$(icondirs: = -I)
 !endif
 ###############
 
+VPATH = $(srcdir):$(srcdir)/missing
 .SUFFIXES: .y
 
 !ifndef CC
@@ -58,22 +53,15 @@ CPP = cpp32
 RC = brcc32
 !endif
 !ifndef YACC
-YACC = bison
-YFLAGS = -o y.tab.c
+YACC = byacc
 !endif
 !ifndef AR
 AR = tlib
 !endif
-!ifndef BASERUBY
-BASERUBY = ruby
-!endif
 
 PURIFY =
 AUTOCONF = autoconf
-IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
 RM = $(srcdir:/=\)\win32\rm.bat
-CP = copy > nul
-MV = move > nul
 
 !if !defined(PROCESSOR_ARCHITECTURE)
 PROCESSOR_ARCHITECTURE = x86
@@ -110,7 +98,7 @@ exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 !endif
 !if !defined(datadir)
-datadir = $(prefix)/share
+datadir = /share
 !endif
 !ifndef EXTOUT
 EXTOUT = .ext
@@ -125,24 +113,13 @@ TESTUI = console
 TESTS =
 !endif
 !ifndef RDOCTARGET
-RDOCTARGET = install-doc
+RDOCTARGET = install-nodoc
 !endif
 
 OUTFLAG       = -o
-COUTFLAG      = -o
 !ifndef CFLAGS
 CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 !endif
-!ifndef DEFS
-DEFS =
-!endif
-!ifndef CPPFLAGS
-CPPFLAGS =
-!endif
-CPPFLAGS = $(DEFS) $(CPPFLAGS)
-!ifndef CXXFLAGS
-CXXFLAGS = $(CFLAGS)
-!endif
 !ifndef LDFLAGS
 LDFLAGS = -S:$(STACK)
 !endif
@@ -156,13 +133,13 @@ EXTLIBS =
 MEMLIB =
 !endif
 LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
+MISSING = acosh.obj crypt.obj erf.obj win32.obj
 
 !ifndef STACK
 STACK = 0x2000000
 !endif
 
-XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
+XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
 
 ARFLAGS = /a /p32
 LD = ilink32 -q -Gn
@@ -181,7 +158,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
 MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
+RUNRUBY = .\$(PROGRAM) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
 
 ORGLIBPATH = $(LIB)
 
@@ -191,39 +168,32 @@ LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
 LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
-THREAD_MODEL  = win32
 
 PREP          = miniruby$(EXEEXT)
 
 OBJEXT        = obj
-ASMEXT        = asm
 
 INSTALLED_LIST= .installed.list
 
 WINMAINOBJ    = winmain.$(OBJEXT)
-ARCHMINIOBJS  = dmydln.$(OBJEXT)
-
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-hdrdir = $(srcdir)/include
-VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(srcdir)/win32
+MINIOBJS      = dmydln.$(OBJEXT)
 
-.path.c = .;$(srcdir);$(srcdir)/enc;$(srcdir)/win32;$(srcdir)/missing
-.path.ci = $(srcdir)
-.path.inc = .;$(srcdir)
-.path.def = .;$(srcdir)
-.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
+.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) $(COUTFLAG)$@ -c $(<:/=\)
-
-.c.asm:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -S $(<:\=/)
+	$(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
 
 ruby: $(PROGRAM)
@@ -239,9 +209,6 @@ PHONY: nul
 	@exit
 |
 
-PHONY: nul
-
-RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
 CONFIG_H = ./.config.h.time
 
 config: config.status
@@ -249,29 +216,23 @@ config: config.status
 config.status: $(CONFIG_H)
 
 $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
-	@if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
-	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
+	@$(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_LONG_LONG 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 8
+\#define SIZEOF_OFF_T 4
 \#define SIZEOF_VOIDP 4
 \#define SIZEOF_FLOAT 4
 \#define SIZEOF_DOUBLE 8
 \#define SIZEOF_TIME_T 4
-\#define SIZEOF_RLIM_T 0
-\#define SIZEOF_SIZE_T 4
-\#define SIZEOF_PTRDIFF_T 4
 \#define HAVE_PROTOTYPES 1
 \#define TOKEN_PASTE(x,y) x\#\#y
 \#define HAVE_STDARG_PROTOTYPES 1
@@ -287,25 +248,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define rb_pid_t int
 \#define HAVE_STRUCT_STAT_ST_RDEV 1
 \#define HAVE_ST_RDEV 1
-\#define int8_t signed char
-\#define HAVE_UINT8_T 1
-\#define uint8_t unsigned char
-\#define HAVE_INT16_T 1
-\#define int16_t short
-\#define HAVE_UINT16_T 1
-\#define uint16_t unsigned short
-\#define HAVE_INT32_T 1
-\#define int32_t int
-\#define HAVE_UINT32_T 1
-\#define uint32_t unsigned int
-\#define HAVE_INT64_T HAVE_LONG_LONG
-\#define int64_t __int64
-\#define HAVE_UINT64_T HAVE_LONG_LONG
-\#define uint64_t unsigned __int64
-\#define HAVE_INTPTR_T 1
-\#define HAVE_UINTPTR_T 1
-\#define HAVE_SSIZE_T 1
-\#define ssize_t int
 \#define GETGROUPS_T int
 \#define RETSIGTYPE void
 \#define HAVE_ALLOCA 1
@@ -321,7 +263,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define HAVE_STRTOD 1
 \#define HAVE_STRTOL 1
 \#define HAVE_STRTOUL 1
-\#define HAVE_SNPRINTF 1
 \#define HAVE_VSNPRINTF 1
 \#define HAVE_ISNAN 1
 \#define HAVE_FINITE 1
@@ -330,10 +271,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define HAVE_WAITPID 1
 \#define HAVE_FSYNC 1
 \#define HAVE_GETCWD 1
-\#define HAVE_TRUNCATE 1
-\#define HAVE_FTRUNCATE 1
-\#define HAVE_FSEEKO 1
-\#define HAVE_FTELLO 1
+\#define HAVE_CHSIZE 1
 \#define HAVE_TIMES 1
 \#define HAVE_FCNTL 1
 \#define HAVE_LINK 1
@@ -353,17 +291,17 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define STACK_GROW_DIRECTION -1
 \#define DEFAULT_KCODE KCODE_NONE
 \#define DLEXT ".so"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)"
+\#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).$(TEENY)"
+\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
 \#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby"
-\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)"
+\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)"
 \#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
-\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
+\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
+\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 |
-	@exit > $(@:/=\)
+	@exit > $@
 
 config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
 	@echo Creating $@
@@ -373,14 +311,13 @@ s,@SHELL@,$$(COMSPEC),;t t
 s,@BUILD_FILE_SEPARATOR@,\,;t t
 s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
-s,@DEFS@,$(DEFS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
 s,@FFLAGS@,$(FFLAGS),;t t
 s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
 s,@program_transform_name@,s,,,,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
@@ -411,17 +348,14 @@ s,@target_vendor@,pc,;t t
 s,@target_os@,$(OS),;t t
 s,@CC@,$(CC),;t t
 s,@CPP@,cpp32,;t t
-s,@CXX@,$$(CC),;t t
-s,@LD@,$(LD),;t t
 s,@YACC@,$(YACC),;t t
 s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
-s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, $(MISSING),;t t
+s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
 s,@EXEEXT@,.exe,;t t
@@ -461,14 +395,13 @@ s,@SOLIBS@,$(SOLIBS),;t t
 s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
 s,@OUTFLAG@,$(OUTFLAG),;t t
-s,@COUTFLAG@,$(COUTFLAG),;t t
 s,@CPPOUTFILE@,,;t t
 s,@LIBPATHFLAG@, -L"%s",;t t
 s,@RPATHFLAG@,,;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) $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P $(COUTFLAG)$$(@) -c $$(<:/=\),;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
@@ -480,9 +413,6 @@ s,@arch@,$(ARCH)-$(OS),;t t
 s,@sitearch@,$(ARCH)-$(OS),;t t
 s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
 s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
-s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
-s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
-s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
 s,@configure_args@,--enable-shared $(configure_args),;t t
 s,@configure_input@,$$configure_input,;t t
 s,@srcdir@,$(srcdir),;t t
@@ -491,7 +421,7 @@ s,@top_srcdir@,$(srcdir),;t t
 
 miniruby$(EXEEXT):
 		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS:/=\) $(DMYEXT),$@,nul,$(LIBS)
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
 
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
@@ -516,16 +446,13 @@ $(LIBRUBY): $(LIBRUBY_SO)
 $(RUBYDEF):	$(LIBRUBY_A) $(PREP)
 		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
 			-rubyw_name=$(RUBYW_INSTALL_NAME) \
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(srcdir)/win32
 
-lex.c: {$(srcdir)}lex.c.blt
-	copy "$(?:/=\)" $@
-
 post-install-bin::
 	@$(NULLCMD)
 post-install-lib::
@@ -542,17 +469,48 @@ post-install-doc::
 clean-local::
 		@$(RM) $(WINMAINOBJ) 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
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
+		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
 
 distclean-local::
 		@$(RM) ext\config.cache $(RBCONFIG:/=\)
 		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
+update-rubyspec:
+	@echo SPEC_EXISTS=0 > $@.mk
+	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+	@type >> $@.mk &&|
+$()update-rubyspec:
+$()	@del $@.mk
+$()!if $$(SPEC_EXISTS)
+$()	cd $(srcdir:/=\)\rubyspec\mspec
+$()	git pull
+$()	cd ..\spec\rubyspec
+$()	git pull
+$()!else
+$()	git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
+$()	git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
+$()!endif
+|
+	@$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
+
+test-rubyspec:
+	@echo SPEC_EXISTS=0 > $@.mk
+	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
+	@type >> $@.mk &&|
+$()test-rubyspec:
+$()!if $$(SPEC_EXISTS)
+$()	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
+$()!else
+$()	@echo No rubyspec here.  put rubyspec to srcdir first.
+$()	@cd $(srcdir:/=\)\rubyspec
+$()!endif
+|
+	@$(MAKE) -$(MAKEFLAGS) -f $@.mk
+
 ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
 
 main.$(OBJEXT): win32.h
-ascii.$(OBJEXT): win32.h
 array.$(OBJEXT): win32.h
 bignum.$(OBJEXT): win32.h
 class.$(OBJEXT): win32.h
@@ -561,7 +519,6 @@ dir.$(OBJEXT): dir.h win32.h
 dln.$(OBJEXT): win32.h
 enum.$(OBJEXT): win32.h
 error.$(OBJEXT): win32.h
-euc_jp.$(OBJEXT): win32.h
 eval.$(OBJEXT): win32.h
 file.$(OBJEXT): win32.h
 gc.$(OBJEXT): win32.h
@@ -579,21 +536,14 @@ prec.$(OBJEXT): win32.h
 random.$(OBJEXT): win32.h
 range.$(OBJEXT): win32.h
 re.$(OBJEXT): win32.h
-regcomp.$(OBJEXT): win32.h
-regenc.$(OBJEXT): win32.h
-regerror.$(OBJEXT): win32.h
-regexec.$(OBJEXT): win32.h
-reggnu.$(OBJEXT): win32.h
-regparse.$(OBJEXT): win32.h
+regex.$(OBJEXT): win32.h
 ruby.$(OBJEXT): win32.h
 signal.$(OBJEXT): win32.h
-sjis.$(OBJEXT): win32.h
 sprintf.$(OBJEXT): win32.h
 st.$(OBJEXT): win32.h
 string.$(OBJEXT): win32.h
 struct.$(OBJEXT): win32.h
 time.$(OBJEXT): win32.h
-utf_8.$(OBJEXT): win32.h
 util.$(OBJEXT): win32.h
 variable.$(OBJEXT): win32.h
 version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index fb19906c75..c27a1261f1 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -16,7 +16,7 @@
      * ilink32
 
 (3) If you want to build from CVS source, following commands are required.
-     * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>))
+     * 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.
@@ -30,12 +30,7 @@
 == How to compile and install
 
 (1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\src\ruby> bcc32\configure.bat
-    You can specify the target platform as an argument.
-    For example, run `((%configure i686-bccwin32%))'
-    You can also specify the install directory.
-    For example, run `((%configure --prefix=<install_directory>%))'
-    Default of the install directory is /usr .
+     ex. c:\ruby-1.6.7>bcc32\configure.bat
      
 (2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
     if you want to change the name of the executable files. 
@@ -46,7 +41,7 @@
 
 (4) Run `((%make test%))'
 
-(5) Run `((%make install%))'
+(5) Run `((%make DESTDIR=<install_directory> install%))'
 
     This command will create following directories and install files onto them.
       * <install_directory>\bin
@@ -59,7 +54,7 @@
       * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
       * <install_directory>\man\man1
     If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
-    The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
+    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
@@ -95,10 +90,10 @@ in Japanese, but you can download at least.
 
     C:
     cd \ruby
-    bcc32\configure --prefix=/usr/local
+    bcc32\configure
     make
     make test
-    make install
+    make DESTDIR=/usr/local install
 
 * Build on the relative directory from the ruby source directory and CPU type 
   i386.
@@ -113,10 +108,10 @@ in Japanese, but you can download at least.
     cd \ruby
     mkdir bccwin32
     cd bccwin32
-    ..\bcc32\configure --prefix=/usr/local
+    ..\bcc32\configure target i386-bccwin32
     make
     make test
-    make install
+    make DESTDIR=/usr/local install
 
 * Build on the different drive.
 
@@ -127,10 +122,10 @@ in Japanese, but you can download at least.
 
     D:
     cd D:\build\ruby
-    C:\src\ruby\bcc32\configure --prefix=C:/usr/local
+    C:\src\ruby\bcc32\configure
     make
     make test
-    make install
+    make DESTDIR=C:/usr/local install
 
 == Bugs
 
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 8cdfc64b03..95575cbc60 100755
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -30,8 +30,6 @@ if "%1" == "--enable-install-doc" goto :enable-rdoc
 if "%1" == "--disable-install-doc" goto :disable-rdoc
 if "%1" == "--extout" goto :extout
 if "%1" == "EXTOUT" goto :extout
-if "%1" == "--with-baseruby" goto :baseruby
-if "%1" == "BASERUBY" goto :baseruby
 if "%1" == "--path" goto :path
 if "%1" == "-h" goto :help
 if "%1" == "--help" goto :help
@@ -109,14 +107,6 @@ goto :loop
   shift
   shift
 goto :loop
-:baseruby
-  echo>>confargs.mk !ifndef BASERUBY
-  echo>>confargs.mk BASERUBY = %2
-  echo>>confargs.mk !endif
-  echo>>confargs.tmp 	%1=%2 \
-  shift
-  shift
-goto :loop
 :path
   echo>>pathlist.tmp %2;\
   echo>>confargs.tmp 	%1=%2 \
@@ -132,9 +122,8 @@ goto :loop
   echo System types:
   echo   --target=TARGET         configure for TARGET [i386-bccwin32]
   echo Optional Package:
-  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]
   echo   --with-static-linked-ext link external modules statically
-  echo   --enable-install-doc    install rdoc indexes during install
+  echo   --disable-install-doc   install rdoc indexes during install
   del *.tmp
   del ~tmp~.mak
 goto :exit
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index 1b498f8515..dc523e2541 100755
--- a/bcc32/mkexports.rb
+++ b/bcc32/mkexports.rb
@@ -1,24 +1,27 @@
 #!./miniruby -s
 
-$:.unshift(File.expand_path("../..", __FILE__))
-require 'win32/mkexports'
+$name = $library = $description = nil
 
-class Exports::Bcc < Exports
-  Forwards = /^rb_w32_(\w+)/
-
-  def forwarding(internal, export)
-    internal[/\A_?/]+export
+SYM = {}
+STDIN.reopen(open("nul"))
+ARGV.each do |obj|
+  IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
+    next unless /(?:PUBDEF|PUBD32)/ =~ l
+    SYM[$1] = true if /'(.*?)'/ =~ l
   end
+end
 
-  def each_export(objs)
-    objs.each do |obj|
-    opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
-    IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul") do |l|
-      next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
-        yield $1 if /'(.*?)'/ =~ l
-      end
-    end
-    yield "_strcasecmp", "_stricmp"
-    yield "_strncasecmp", "_strnicmp"
-  end
+exports = []
+if $name
+  exports << "Name " + $name
+elsif $library
+  exports << "Library " + $library
+end
+exports << "Description " + $description.dump if $description
+exports << "EXPORTS" << SYM.keys.sort
+
+if $output
+  open($output, 'w') {|f| f.puts exports.join("\n")}
+else
+  puts exports.join("\n")
 end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 1cc87f3e80..483292ed51 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -15,7 +15,7 @@ prefix = /usr
 OS = bccwin32
 RT = $(OS)
 BANG = !
-APPEND = echo.>>$(MAKEFILE)
+APPEND = echo>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -42,15 +42,7 @@ $(BANG)endif
 $(BANG)ifndef prefix
 prefix = $(prefix:\=/)
 $(BANG)endif
-$(BANG)if !defined(BASERUBY)
-!if defined(BASERUBY)
-BASERUBY = $(BASERUBY)
-!endif
 |
-!if !defined(BASERUBY)
-	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
-!endif
-	@$(APPEND) $(BANG)endif
 !if exist(confargs.mk)
 	@type confargs.mk >> $(MAKEFILE)
 	@del confargs.mk
@@ -92,7 +84,6 @@ $(BANG)endif
 
 -version-: nul
 	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#define RUBY_REVISION 0
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
 MINOR = RUBY_VERSION_MINOR
@@ -156,11 +147,6 @@ $(BANG)endif
 	@$(APPEND) PROCESSOR_LEVEL = 6
 	@$(APPEND) !endif
 
--epilogue-: -encs-
-
--encs-: nul
-	@$(MAKE) -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
-
 -epilogue-: nul
 	@type >> $(MAKEFILE) &&|
 
diff --git a/benchmark/bm_app_answer.rb b/benchmark/bm_app_answer.rb
deleted file mode 100644
index 3cd8a8fd37..0000000000
--- a/benchmark/bm_app_answer.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-def ack(m, n)
-  if m == 0 then
-    n + 1
-  elsif n == 0 then
-    ack(m - 1, 1)
-  else
-    ack(m - 1, ack(m, n - 1))
-  end
-end
-
-def the_answer_to_life_the_universe_and_everything
-  (ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
-end
-
-answer = the_answer_to_life_the_universe_and_everything
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
deleted file mode 100644
index e58b7a34a1..0000000000
--- a/benchmark/bm_app_erb.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Create many HTML strings with ERB.
-#
-
-require 'erb'
-
-data = DATA.read
-max = 5_000
-title = "hello world!"
-content = "hello world!\n" * 10
-
-max.times{
-  ERB.new(data).result(binding)
-}
-
-__END__
-
-<html>
-  <head> <%= title %> </head>
-  <body>
-    <h1> <%= title %> </h1>
-    <p>
-      <%= content %>
-    </p>
-  </body>
-</html>
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb
deleted file mode 100644
index a5a5de0426..0000000000
--- a/benchmark/bm_app_factorial.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-def fact(n)
-  if(n > 1)
-    n * fact(n-1)
-  else
-    1
-  end
-end
-
-8.times{
-  fact(5000)
-}
-\ No newline at end of file
diff --git a/benchmark/bm_app_fib.rb b/benchmark/bm_app_fib.rb
deleted file mode 100644
index 34a7b2e725..0000000000
--- a/benchmark/bm_app_fib.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def fib n
-  if n < 3
-    1
-  else
-    fib(n-1) + fib(n-2)
-  end
-end
-
-fib(34)
-
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
deleted file mode 100644
index a0dcf5e874..0000000000
--- a/benchmark/bm_app_mandelbrot.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'complex'
-
-def mandelbrot? z
-  i = 0
-  while i<100
-    i+=1
-    z = z * z
-    return false if z.abs > 2
-  end
-  true
-end
-
-ary = []
-
-(0..100).each{|dx|
-  (0..100).each{|dy|
-    x = dx / 50.0
-    y = dy / 50.0
-    c = Complex(x, y)
-    ary << c if mandelbrot?(c)
-  }
-}
-
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
deleted file mode 100644
index 59c63f358e..0000000000
--- a/benchmark/bm_app_pentomino.rb
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/usr/local/bin/ruby
-# This program is contributed by Shin Nishiyama
-
-
-# modified by K.Sasada
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n, a, nb)
-  nb.each{|x|
-    a[n] = x
-    if n == NP-1
-      $p << [a.sort]
-    else
-      nbc=nb.dup
-      [-ROW, -1, 1, ROW].each{|d|
-        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
-          nbc << x+d
-        end
-      }
-      nbc.delete x
-      piece(n+1,a[0..n],nbc)
-    end
-  }
-end
-
-def kikaku(a)
-  a.collect {|x| x - a[0]}
-end
-def ud(a)
-  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
-  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
-  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
-  piece(0,[],[0])
-  $p.each do |a|
-    a0 = a[0]
-    a[1] = ud(a0)
-    a[2] = rl(a0)
-    a[3] = ud(rl(a0))
-    a[4] = xy(a0)
-    a[5] = ud(xy(a0))
-    a[6] = rl(xy(a0))
-    a[7] = ud(rl(xy(a0)))
-    a.sort!
-    a.uniq!
-  end
-  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
-  (0...ROW*COL).each{|i|
-    if i % ROW >= ROW-NP
-      $b[i] = -2
-    else
-      $b[i] = -1
-    end
-    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
-  }
-end
-
-def pboard
-  return # skip print
-  print "No. #$no\n"
-  (0...COL).each{|i|
-    print "|"
-    (0...ROW-NP).each{|j|
-      x = $b[i*ROW+j]
-      if x < 0
-        print "..|"
-      else
-        printf "%2d|",x+1
-      end
-    }
-    print "\n"
-  }
-  print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
-  if a.length == $p.length then
-    $no += 1
-    pboard
-    return
-  end
-  while $b[pos] != -1
-    pos += 1
-  end
-  ($pnum - a).each do |i|
-    $p[i].each do |x|
-      f = 0
-      x.each{|s|
-        if $b[pos+s] != -1
-          f=1
-          break
-        end
-      }
-      if f == 0 then
-        x.each{|s|
-          $b[pos+s] = i
-        }
-        a << i
-        setpiece(a.dup, pos)
-        a.pop
-        x.each{|s|
-          $b[pos+s] = -1
-        }
-      end
-    end
-  end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
-
-
-__END__
-
-# original
-
-NP = 5
-ROW = 8 + NP
-COL = 8
-
-$p = []
-$b = []
-$no = 0
-
-def piece(n,a,nb)
-  for x in nb
-    a[n] = x
-    if n == NP-1
-      $p << [a.sort]
-    else
-      nbc=nb.dup
-      for d in [-ROW, -1, 1, ROW]
-        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
-          nbc << x+d
-        end
-      end
-      nbc.delete x
-      piece(n+1,a[0..n],nbc)
-    end
-  end
-end
-
-def kikaku(a)
-  a.collect {|x| x - a[0]}
-end
-def ud(a)
-  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
-end
-def rl(a)
-  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
-end
-def xy(a)
-  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
-end
-
-def mkpieces
-  piece(0,[],[0])
-  $p.each do |a|
-    a0 = a[0]
-    a[1] = ud(a0)
-    a[2] = rl(a0)
-    a[3] = ud(rl(a0))
-    a[4] = xy(a0)
-    a[5] = ud(xy(a0))
-    a[6] = rl(xy(a0))
-    a[7] = ud(rl(xy(a0)))
-    a.sort!
-    a.uniq!
-  end
-  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
-end
-
-def mkboard
-  for i in 0...ROW*COL
-    if i % ROW >= ROW-NP
-      $b[i] = -2
-    else
-      $b[i] = -1
-    end
-    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
-  end
-end
-
-def pboard
-  print "No. #$no\n"
-  for i in 0...COL
-    print "|"
-    for j in 0...ROW-NP
-      x = $b[i*ROW+j]
-      if x < 0
-        print "..|"
-      else
-        printf "%2d|",x+1
-      end
-    end
-    print "\n"
-  end
-  print "\n"
-end
-
-$pnum=[]
-def setpiece(a,pos)
-  if a.length == $p.length then
-    $no += 1
-    pboard
-    return
-  end
-  while $b[pos] != -1
-    pos += 1
-  end
-  ($pnum - a).each do |i|
-    $p[i].each do |x|
-      f = 0
-      for s in x do
-        if $b[pos+s] != -1
-          f=1
-          break
-        end
-      end
-      if f == 0 then
-        for s in x do
-          $b[pos+s] = i
-        end
-        a << i
-        setpiece(a.dup, pos)
-        a.pop
-        for s in x do
-          $b[pos+s] = -1
-        end
-      end
-    end
-  end
-end
-
-mkpieces
-mkboard
-$p[4] = [$p[4][0]]
-$pnum = (0...$p.length).to_a
-setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
deleted file mode 100644
index 01d2ae3219..0000000000
--- a/benchmark/bm_app_raise.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i=0
-while i<300000
-  i+=1
-  begin
-    raise
-  rescue
-  end
-end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
deleted file mode 100644
index c6ef817263..0000000000
--- a/benchmark/bm_app_strconcat.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<500000
-  "#{1+1} #{1+1} #{1+1}"
-  i+=1
-end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/bm_app_tak.rb
deleted file mode 100644
index efe5380f4e..0000000000
--- a/benchmark/bm_app_tak.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-def tak x, y, z
-  unless y < x
-    z
-  else
-    tak( tak(x-1, y, z),
-         tak(y-1, z, x),
-         tak(z-1, x, y))
-  end
-end
-
-tak(18, 9, 0)
-
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/bm_app_tarai.rb
deleted file mode 100644
index 4c146f5ccf..0000000000
--- a/benchmark/bm_app_tarai.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def tarai( x, y, z )
-  if x <= y
-  then y
-  else tarai(tarai(x-1, y, z),
-             tarai(y-1, z, x),
-             tarai(z-1, x, y))
-  end
-end
-
-tarai(12, 6, 0)
diff --git a/benchmark/bm_app_uri.rb b/benchmark/bm_app_uri.rb
deleted file mode 100644
index 586edfd5dc..0000000000
--- a/benchmark/bm_app_uri.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'uri'
-
-100_000.times{
-  uri = URI.parse('http://www.ruby-lang.org')
-  uri.scheme
-  uri.host
-  uri.port
-}
diff --git a/benchmark/bm_io_file_create.rb b/benchmark/bm_io_file_create.rb
deleted file mode 100644
index 7adbe9ea5e..0000000000
--- a/benchmark/bm_io_file_create.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Create files
-#
-
-max = 50_000
-file = './tmpfile_of_bm_io_file_create'
-
-max.times{
-  f = open(file, 'w')
-  f.close#(true)
-}
-File.unlink(file)
-
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/bm_io_file_read.rb
deleted file mode 100644
index 2b4212db76..0000000000
--- a/benchmark/bm_io_file_read.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Seek and Read file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world!  " * 1000
-f = Tempfile.new('yarv-benchmark')
-f.write str
-
-max.times{
-  f.seek 0
-  f.read
-}
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/bm_io_file_write.rb
deleted file mode 100644
index 3cec58c6ae..0000000000
--- a/benchmark/bm_io_file_write.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Seek and Write file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world!  " * 1000
-f = Tempfile.new('yarv-benchmark')
-
-max.times{
-  f.seek 0
-  f.write str
-}
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/bm_loop_generator.rb
deleted file mode 100644
index d3375c744c..0000000000
--- a/benchmark/bm_loop_generator.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-max = 600000
-
-if defined? Fiber
-  gen = (1..max).each
-  loop do
-    gen.next
-  end
-else
-  require 'generator'
-  gen = Generator.new((0..max))
-  while gen.next?
-    gen.next
-  end
-end
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb
deleted file mode 100644
index c5317b8228..0000000000
--- a/benchmark/bm_loop_times.rb
+++ /dev/null
@@ -1 +0,0 @@
-30000000.times{|e|}
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
deleted file mode 100644
index 43d35e1131..0000000000
--- a/benchmark/bm_loop_whileloop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i<30_000_000 # benchmark loop 1
-  i+=1
-end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
deleted file mode 100644
index e514989661..0000000000
--- a/benchmark/bm_loop_whileloop2.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i< 6_000_000 # benchmark loop 2
-  i+=1
-end
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb
deleted file mode 100644
index 7db5be9050..0000000000
--- a/benchmark/bm_so_ackermann.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-def ack(m, n)
-    if m == 0 then
-        n + 1
-    elsif n == 0 then
-        ack(m - 1, 1)
-    else
-        ack(m - 1, ack(m, n - 1))
-    end
-end
-
-NUM = 9
-ack(3, NUM)
-
-
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb
deleted file mode 100644
index 2b8fce8f99..0000000000
--- a/benchmark/bm_so_array.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan and Mark Hubbart
-
-n = 9000 # Integer(ARGV.shift || 1)
-
-x = Array.new(n)
-y = Array.new(n, 0)
-
-n.times{|bi|
-  x[bi] = bi + 1
-}
-
-(0 .. 999).each do |e|
-  (n-1).step(0,-1) do |bi|
-    y[bi] += x.at(bi)
-  end
-end
-# puts "#{y.first} #{y.last}"
-
-
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
deleted file mode 100644
index 6a26465578..0000000000
--- a/benchmark/bm_so_binary_trees.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# The Computer Language Shootout Benchmarks
-# http://shootout.alioth.debian.org
-#
-# contributed by Jesse Millikan
-
-# disable output
-def STDOUT.write_ *args
-end
-
-def item_check(tree)
- if tree[0] == nil
-  tree[1]
- else
-  tree[1] + item_check(tree[0]) - item_check(tree[2])
- end
-end
-
-def bottom_up_tree(item, depth)
- if depth > 0
-  item_item = 2 * item
-  depth -= 1
-  [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
- else
-  [nil, item, nil]
- end
-end
-
-max_depth = 12 # 16 # ARGV[0].to_i
-min_depth = 4
-
-max_depth = min_depth + 2 if min_depth + 2 > max_depth
-
-stretch_depth = max_depth + 1
-stretch_tree = bottom_up_tree(0, stretch_depth)
-
-puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
-stretch_tree = nil
-
-long_lived_tree = bottom_up_tree(0, max_depth)
-
-min_depth.step(max_depth + 1, 2) do |depth|
- iterations = 2**(max_depth - depth + min_depth)
-
- check = 0
-
- for i in 1..iterations
-  temp_tree = bottom_up_tree(i, depth)
-  check += item_check(temp_tree)
-
-  temp_tree = bottom_up_tree(-i, depth)
-  check += item_check(temp_tree)
- end
-
- puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
-end
-
-puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
deleted file mode 100644
index 82629688b7..0000000000
--- a/benchmark/bm_so_concatenate.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
-
-STUFF = "hello\n"
-i=0
-while i<10
-  i+=1
-  hello = ''
-  400000.times do |e|
-    hello << STUFF
-  end
-end
-# puts hello.length
-
-
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
deleted file mode 100644
index 65f6337a4a..0000000000
--- a/benchmark/bm_so_count_words.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Paul Brannan
-
-input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
-
-nl = nw = nc = 0
-while true
-  tmp = input.read(4096) or break
-  data = tmp << (input.gets || "")
-  nc += data.length
-  nl += data.count("\n")
-  ((data.strip! || data).tr!("\n", " ") || data).squeeze!
-  nw += data.count(" ") + 1
-end
-# STDERR.puts "#{nl} #{nw} #{nc}"
-
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
deleted file mode 100644
index d8b461290c..0000000000
--- a/benchmark/bm_so_exception.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-$HI = 0
-$LO = 0
-NUM = 250000 # Integer(ARGV[0] || 1)
-
-
-class Lo_Exception < Exception
-  def initialize(num)
-    @value = num
-  end
-end
-
-class Hi_Exception < Exception
-  def initialize(num)
-    @value = num
-  end
-end
-
-def some_function(num)
-  begin
-    hi_function(num)
-  rescue
-    print "We shouldn't get here, exception is: #{$!.type}\n"
-  end
-end
-
-def hi_function(num)
-  begin
-    lo_function(num)
-  rescue Hi_Exception
-    $HI = $HI + 1
-  end
-end
-
-def lo_function(num)
-  begin
-    blowup(num)
-  rescue Lo_Exception
-    $LO = $LO + 1
-  end
-end
-
-def blowup(num)
-  if num % 2 == 0
-    raise Lo_Exception.new(num)
-  else
-    raise Hi_Exception.new(num)
-  end
-end
-
-
-i = 1
-max = NUM+1
-while i < max
-  i+=1
-  some_function(i+1)
-end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
deleted file mode 100644
index a214f2e205..0000000000
--- a/benchmark/bm_so_fannkuch.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-# Modified by Ryan Williams
-
-def fannkuch(n)
-   maxFlips, m, r, check = 0, n-1, n, 0
-   count = (1..n).to_a
-   perm = (1..n).to_a
-
-   while true
-      if check < 30
-         puts "#{perm}"
-         check += 1
-      end
-
-      while r != 1
-         count[r-1] = r
-         r -= 1
-      end
-
-      if perm[0] != 1 and perm[m] != n
-         perml = perm.clone #.dup
-         flips = 0
-         while (k = perml.first ) != 1
-            perml = perml.slice!(0, k).reverse + perml
-            flips += 1
-         end
-         maxFlips = flips if flips > maxFlips
-      end
-      while true
-         if r==n then return maxFlips end
-         perm.insert r,perm.shift
-         break if (count[r] -= 1) > 0
-         r += 1
-      end
-   end
-end
-
-def puts *args
-end
-
-N = 10 # (ARGV[0] || 1).to_i
-puts "Pfannkuchen(#{N}) = #{fannkuch(N)}"
-
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
deleted file mode 100644
index 3f759ba7ae..0000000000
--- a/benchmark/bm_so_fasta.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-
-$last = 42.0
-def gen_random (max,im=139968,ia=3877,ic=29573)
-    (max * ($last = ($last * ia + ic) % im)) / im
-end
-
-alu =
-   "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
-   "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
-   "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
-   "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
-   "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
-   "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
-   "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
-
-iub = [
-    ["a", 0.27],
-    ["c", 0.12],
-    ["g", 0.12],
-    ["t", 0.27],
-
-    ["B", 0.02],
-    ["D", 0.02],
-    ["H", 0.02],
-    ["K", 0.02],
-    ["M", 0.02],
-    ["N", 0.02],
-    ["R", 0.02],
-    ["S", 0.02],
-    ["V", 0.02],
-    ["W", 0.02],
-    ["Y", 0.02],
-]
-homosapiens = [
-    ["a", 0.3029549426680],
-    ["c", 0.1979883004921],
-    ["g", 0.1975473066391],
-    ["t", 0.3015094502008],
-]
-
-def make_repeat_fasta(id, desc, src, n)
-    puts ">#{id} #{desc}"
-    v = nil
-    width = 60
-    l = src.length
-    s = src * ((n / l) + 1)
-    s.slice!(n, l)
-    puts(s.scan(/.{1,#{width}}/).join("\n"))
-end
-
-def make_random_fasta(id, desc, table, n)
-    puts ">#{id} #{desc}"
-    rand, v = nil,nil
-    width = 60
-    chunk = 1 * width
-    prob = 0.0
-    table.each{|v| v[1]= (prob += v[1])}
-    for i in 1..(n/width)
-        puts((1..width).collect{
-            rand = gen_random(1.0)
-            table.find{|v| v[1]>rand}[0]
-        }.join)
-    end
-    if n%width != 0
-        puts((1..(n%width)).collect{
-            rand = gen_random(1.0)
-            table.find{|v| v[1]>rand}[0]
-        }.join)
-    end
-end
-
-
-n = (ARGV[0] or 250_000).to_i
-
-make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
-make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
-make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
-
diff --git a/benchmark/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
deleted file mode 100644
index dadab3e79c..0000000000
--- a/benchmark/bm_so_k_nucleotide.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-#
-# contributed by jose fco. gonzalez
-# modified by Sokolov Yura
-
-seq = String.new
-
-def frecuency( seq,length )
-    n, table = seq.length - length + 1, Hash.new(0)
-    f, i = nil, nil
-    (0 ... length).each do |f|
-        (f ... n).step(length) do |i|
-            table[seq[i,length]] += 1
-        end
-    end
-    [n,table]
-
-end
-
-def sort_by_freq( seq,length )
-    n,table = frecuency( seq,length )
-    a, b, v = nil, nil, nil
-    table.sort{|a,b| b[1] <=> a[1]}.each do |v|
-        puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
-    end
-    puts
-end
-
-def find_seq( seq,s )
-    n,table = frecuency( seq,s.length )
-    puts "#{table[s].to_s}\t#{s.upcase}"
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
-
-line = input.gets while line !~ /^>THREE/
-line = input.gets
-
-while (line !~ /^>/) & line do
-    seq << line.chomp
-    line = input.gets
-end
-
-[1,2].each {|i| sort_by_freq( seq,i ) }
-
-%w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
-
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
deleted file mode 100644
index 3652288881..0000000000
--- a/benchmark/bm_so_lists.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
-
-NUM = 100
-SIZE = 10000
-
-def test_lists()
-  # create a list of integers (Li1) from 1 to SIZE
-  li1 = (1..SIZE).to_a
-  # copy the list to li2 (not by individual items)
-  li2 = li1.dup
-  # remove each individual item from left side of li2 and
-  # append to right side of li3 (preserving order)
-  li3 = Array.new
-  while (not li2.empty?)
-    li3.push(li2.shift)
-  end
-  # li2 must now be empty
-  # remove each individual item from right side of li3 and
-  # append to right side of li2 (reversing list)
-  while (not li3.empty?)
-    li2.push(li3.pop)
-  end
-  # li3 must now be empty
-  # reverse li1 in place
-  li1.reverse!
-  # check that first item is now SIZE
-  if li1[0] != SIZE then
-    p "not SIZE"
-    0
-  else
-    # compare li1 and li2 for equality
-    if li1 != li2 then
-      return(0)
-    else
-      # return the length of the list
-      li1.length
-    end
-  end
-end
-
-i = 0
-while i<NUM
-  i+=1
-  result = test_lists()
-end
-
-result
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
deleted file mode 100644
index 76331c64b8..0000000000
--- a/benchmark/bm_so_mandelbrot.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-#  The Computer Language Benchmarks Game
-#  http://shootout.alioth.debian.org/
-#
-#  contributed by Karl von Laudermann
-#  modified by Jeremy Echols
-
-size = 600 # ARGV[0].to_i
-
-puts "P4\n#{size} #{size}"
-
-ITER = 49                           # Iterations - 1 for easy for..in looping
-LIMIT_SQUARED = 4.0                 # Presquared limit
-
-byte_acc = 0
-bit_num = 0
-
-count_size = size - 1               # Precomputed size for easy for..in looping
-
-# For..in loops are faster than .upto, .downto, .times, etc.
-for y in 0..count_size
-  for x in 0..count_size
-    zr = 0.0
-    zi = 0.0
-    cr = (2.0*x/size)-1.5
-    ci = (2.0*y/size)-1.0
-    escape = false
-
-    # To make use of the for..in code, we use a dummy variable,
-    # like one would in C
-    for dummy in 0..ITER
-      tr = zr*zr - zi*zi + cr
-      ti = 2*zr*zi + ci
-      zr, zi = tr, ti
-
-      if (zr*zr+zi*zi) > LIMIT_SQUARED
-        escape = true
-        break
-      end
-    end
-
-    byte_acc = (byte_acc << 1) | (escape ? 0b0 : 0b1)
-    bit_num += 1
-
-    # Code is very similar for these cases, but using separate blocks
-    # ensures we skip the shifting when it's unnecessary, which is most cases.
-    if (bit_num == 8)
-      print byte_acc.chr
-      byte_acc = 0
-      bit_num = 0
-    elsif (x == count_size)
-      byte_acc <<= (8 - bit_num)
-      print byte_acc.chr
-      byte_acc = 0
-      bit_num = 0
-    end
-  end
-end
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
deleted file mode 100644
index 0f274ad06c..0000000000
--- a/benchmark/bm_so_matrix.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-
-n = 60 #Integer(ARGV.shift || 1)
-
-size = 30
-
-def mkmatrix(rows, cols)
-    count = 1
-    mx = Array.new(rows)
-    (0 .. (rows - 1)).each do |bi|
-        row = Array.new(cols, 0)
-        (0 .. (cols - 1)).each do |j|
-            row[j] = count
-            count += 1
-        end
-        mx[bi] = row
-    end
-    mx
-end
-
-def mmult(rows, cols, m1, m2)
-    m3 = Array.new(rows)
-    (0 .. (rows - 1)).each do |bi|
-        row = Array.new(cols, 0)
-        (0 .. (cols - 1)).each do |j|
-            val = 0
-            (0 .. (cols - 1)).each do |k|
-                val += m1.at(bi).at(k) * m2.at(k).at(j)
-            end
-            row[j] = val
-        end
-        m3[bi] = row
-    end
-    m3
-end
-
-m1 = mkmatrix(size, size)
-m2 = mkmatrix(size, size)
-mm = Array.new
-n.times do
-    mm = mmult(size, size, m1, m2)
-end
-# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
-
-
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
deleted file mode 100644
index 99cf6a91cc..0000000000
--- a/benchmark/bm_so_meteor_contest.rb
+++ /dev/null
@@ -1,564 +0,0 @@
-#!/usr/bin/env ruby
-#
-# The Computer Language Shootout
-#   http://shootout.alioth.debian.org
-#   contributed by Kevin Barnes (Ruby novice)
-
-# PROGRAM:  the main body is at the bottom.
-#   1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-#   2) see how I represent a board as a bitmask by reading the blank_board comments
-#   3) read as your mental paths take you
-
-def print *args
-end
-
-# class to represent all information about a particular rotation of a particular piece
-class Rotation
-  # an array (by location) containing a bit mask for how the piece maps at the given location.
-  # if the rotation is invalid at that location the mask will contain false
-  attr_reader :start_masks
-
-  # maps a direction to a relative location.  these differ depending on whether it is an even or
-  # odd row being mapped from
-  @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
-  @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
-
-  def initialize( directions )
-    @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
-
-    @even_mask = mask_for_offsets( @even_offsets)
-    @odd_mask = mask_for_offsets( @odd_offsets)
-
-    @start_masks = Array.new(60)
-
-    # create the rotational masks by placing the base mask at the location and seeing if
-    # 1) it overlaps the boundries and 2) it produces a prunable board.  if either of these
-    # is true the piece cannot be placed
-    0.upto(59) do | offset |
-      mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
-      if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
-        imask = compute_required( mask, offset)
-        @start_masks[offset] = [ mask, imask, imask | mask ]
-      else
-        @start_masks[offset] = false
-      end
-    end
-  end
-
-  def compute_required( mask, offset )
-    board = blank_board
-    0.upto(offset) { | i | board |= 1 << i }
-    board |= mask
-    return 0 if (!prunable(board | mask, offset))
-    board = flood_fill(board,58)
-    count = 0
-    imask = 0
-    0.upto(59) do | i |
-      if (board[i] == 0) then
-        imask |= (1 << i)
-        count += 1
-      end
-    end
-    (count > 0 && count < 5) ? imask : 0
-  end
-
-  def flood_fill( board, location)
-    return board if (board[location] == 1)
-    board |= 1 << location
-    row, col = location.divmod(6)
-    board = flood_fill( board, location - 1) if (col > 0)
-    board = flood_fill( board, location + 1) if (col < 4)
-    if (row % 2 == 0) then
-      board = flood_fill( board, location - 7) if (col > 0 && row > 0)
-      board = flood_fill( board, location - 6) if (row > 0)
-      board = flood_fill( board, location + 6) if (row < 9)
-      board = flood_fill( board, location + 5) if (col > 0 && row < 9)
-    else
-      board = flood_fill( board, location - 5) if (col < 4 && row > 0)
-      board = flood_fill( board, location - 6) if (row > 0)
-      board = flood_fill( board, location + 6) if (row < 9)
-      board = flood_fill( board, location + 7) if (col < 4 && row < 9)
-    end
-    board
-  end
-
-  # given a location, produces a list of relative locations covered by the piece at this rotation
-  def offsets( location)
-    if is_even( location) then
-      @even_offsets.collect { | value | value + location }
-    else
-      @odd_offsets.collect { | value | value + location }
-    end
-  end
-
-  # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
-  # this is hard to explain. imagine we have this partial board:
-  #   0 0 0 0 0 x        [positions 0-5]
-  #    0 0 1 1 0 x       [positions 6-11]
-  #   0 0 1 0 0 x        [positions 12-17]
-  #    0 1 0 0 0 x       [positions 18-23]
-  #   0 1 0 0 0 x        [positions 24-29]
-  #    0 0 0 0 0 x       [positions 30-35]
-  #       ...
-  # The top-left of the piece is at position 8, the
-  # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
-  # sorted order.  Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
-  # by subtracting 8 from everything.  Now imagine the piece shifted up and to the right so it's on an even row:
-  #   0 0 0 1 1 x        [positions 0-5]
-  #    0 0 1 0 0 x       [positions 6-11]
-  #   0 0 1 0 0 x        [positions 12-17]
-  #    0 1 0 0 0 x       [positions 18-23]
-  #   0 0 0 0 0 x        [positions 24-29]
-  #    0 0 0 0 0 x       [positions 30-35]
-  #       ...
-  # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
-  # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
-  # this function would return
-  def normalize_offsets( values)
-    min = values.min
-    even_min = is_even(min)
-    other_min = even_min ? min + 6 : min + 7
-    other_values = values.collect do | value |
-      if is_even(value) then
-        value + 6 - other_min
-      else
-        value + 7 - other_min
-      end
-    end
-    values.collect! { | value | value - min }
-
-    if even_min then
-      [values, other_values]
-    else
-      [other_values, values]
-    end
-  end
-
-  # produce a bitmask representation of an array of offset locations
-  def mask_for_offsets( offsets )
-    mask = 0
-    offsets.each { | value | mask = mask + ( 1 << value ) }
-    mask
-  end
-
-  # finds a "safe" position that a position as described by a list of directions can be placed
-  # without falling off any edge of the board.  the values returned a location to place the first piece
-  # at so it will fit after making the described moves
-  def start_adjust( directions )
-    south = east = 0;
-    directions.each do | direction |
-      east += 1 if ( direction == :sw || direction == :nw || direction == :west )
-      south += 1 if ( direction == :nw || direction == :ne )
-    end
-    south * 6 + east
-  end
-
-  # given a set of directions places the piece (as defined by a set of directions) on the board at
-  # a location that will not take it off the edge
-  def get_values ( directions )
-    start = start_adjust(directions)
-    values = [ start ]
-    directions.each do | direction |
-      if (start % 12 >= 6) then
-        start += @@rotation_odd_adder[direction]
-      else
-        start += @@rotation_even_adder[direction]
-      end
-      values += [ start ]
-    end
-
-    # some moves take you back to an existing location, we'll strip duplicates
-    values.uniq
-  end
-end
-
-# describes a piece and caches information about its rotations to as to be efficient for iteration
-# ATTRIBUTES:
-#   rotations -- all the rotations of the piece
-#   type -- a numeic "name" of the piece
-#   masks -- an array by location of all legal rotational masks (a n inner array) for that location
-#   placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
-class Piece
-  attr_reader :rotations, :type, :masks
-  attr_accessor :placed
-
-  # transform hashes that change one direction into another when you either flip or rotate a set of directions
-  @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
-  @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
-
-  def initialize( directions, type )
-    @type = type
-    @rotations = Array.new();
-    @map = {}
-
-    generate_rotations( directions )
-    directions.collect! { | value | @@flip_converter[value] }
-    generate_rotations( directions )
-
-    # creates the masks AND a map that returns [location, rotation] for any given mask
-    # this is used when a board is found and we want to draw it, otherwise the map is unused
-    @masks = Array.new();
-    0.upto(59) do | i |
-      even = true
-      @masks[i] = @rotations.collect do | rotation |
-        mask = rotation.start_masks[i]
-        @map[mask[0]] = [ i, rotation ] if (mask)
-        mask || nil
-      end
-      @masks[i].compact!
-    end
-  end
-
-  # rotates a set of directions through all six angles and adds a Rotation to the list for each one
-  def generate_rotations( directions )
-    6.times do
-      rotations.push( Rotation.new(directions))
-      directions.collect! { | value | @@rotate_converter[value] }
-    end
-  end
-
-  # given a board string, adds this piece to the board at whatever location/rotation
-  # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
-  def fill_string( board_string)
-    location, rotation = @map[@placed]
-    rotation.offsets(location).each do | offset |
-      row, col = offset.divmod(6)
-      board_string[ row*5 + col, 1 ] = @type.to_s
-    end
-  end
-end
-
-# a blank bit board having this form:
-#
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    0 0 0 0 0 1
-#     0 0 0 0 0 1
-#    1 1 1 1 1 1
-#
-# where left lest significant bit is the top left and the most significant is the lower right
-# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
-# off the edges or bottom
-def blank_board
-  0b111111100000100000100000100000100000100000100000100000100000100000
-end
-
-def full_board
-  0b111111111111111111111111111111111111111111111111111111111111111111
-end
-
-# determines if a location (bit position) is in an even row
-def is_even( location)
-  (location % 12) < 6
-end
-
-# support function that create three utility maps:
-#  $converter -- for each row an array that maps a five bit row (via array mapping)
-#                to the a a five bit representation of the bits below it
-#  $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
-#  @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
-#                   a region array has three values the first is a mask of bits in the region,
-#                   the second is the count of those bits and the third is identical to the first
-#                   examples:
-#                           0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
-#                           0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
-#                           0b10001 => [ 0b01110, 3, 0b01110 ]
-def create_collector_support
-  odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
-  even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
-
-  all_odds = Array.new(0b100000)
-  all_evens = Array.new(0b100000)
-  bit_counts = Array.new(0b100000)
-  new_regions = Array.new(0b100000)
-  0.upto(0b11111) do | i |
-    bit_count = odd = even = 0
-    0.upto(4) do | bit |
-      if (i[bit] == 1) then
-        bit_count += 1
-        odd |= odd_map[bit]
-        even |= even_map[bit]
-      end
-    end
-    all_odds[i] = odd
-    all_evens[i] = even
-    bit_counts[i] = bit_count
-    new_regions[i] = create_regions( i)
-  end
-
-  $converter = []
-  10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
-  $bit_counts = bit_counts
-  $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
-end
-
-# determines if a board is punable, meaning that there is no possibility that it
-# can be filled up with pieces.  A board is prunable if there is a grouping of unfilled spaces
-# that are not a multiple of five.  The following board is an example of a prunable board:
-#    0 0 1 0 0
-#     0 1 0 0 0
-#    1 1 0 0 0
-#     0 1 0 0 0
-#    0 0 0 0 0
-#       ...
-#
-# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
-# parameters:
-#   board -- an initial bit board (6 bit padded rows, see blank_board for format)
-#   location -- starting location, everything above and to the left is already full
-#   slotting -- set to true only when testing initial pieces, when filling normally
-#               additional assumptions are possible
-#
-# Algorithm:
-#    The algorithm starts at the top row (as determined by location) and iterates a row at a time
-#    maintainng counts of active open areas (kept in the collector array) each collector contains
-#    three values at the start of an iteration:
-#          0: mask of bits that would be adjacent to the collector in this row
-#          1: the number of bits collected so far
-#          2: a scratch space starting as zero, but used during the computation to represent
-#             the empty bits in the new row that are adjacent (position 0)
-#  The exact procedure is described in-code
-def prunable( board, location, slotting = false)
-  collectors = []
-  # loop accross the rows
-  (location / 6).to_i.upto(9) do | row_on |
-    # obtain a set of regions representing the bits of the curent row.
-    regions = $regions[(board >> (row_on * 6)) & 0b11111]
-    converter = $converter[row_on]
-
-    # track the number of collectors at the start of the cycle so that
-    # we don't compute against newly created collectors, only existing collectors
-    initial_collector_count = collectors.length
-
-    # loop against the regions.  For each region of the row
-    # we will see if it connects to one or more existing collectors.
-    # if it connects to 1 collector, the bits from the region are added to the
-    # bits of the collector and the mask is placed in collector[2]
-    # If the region overlaps more than one collector then all the collectors
-    # it overlaps with are merged into the first one (the others are set to nil in the array)
-    # if NO collectors are found then the region is copied as a new collector
-    regions.each do | region |
-      collector_found = nil
-      region_mask = region[2]
-      initial_collector_count.times do | collector_num |
-        collector = collectors[collector_num]
-        if (collector) then
-          collector_mask = collector[0]
-          if (collector_mask & region_mask != 0) then
-            if (collector_found) then
-              collector_found[0] |= collector_mask
-              collector_found[1] += collector[1]
-              collector_found[2] |= collector[2]
-              collectors[collector_num] = nil
-            else
-              collector_found = collector
-              collector[1] += region[1]
-              collector[2] |= region_mask
-            end
-          end
-        end
-      end
-      if (collector_found == nil) then
-        collectors.push(Array.new(region))
-      end
-    end
-
-    # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
-    # be zero.  The size of any such reaason is tested if it is not a muliple of five true is returned since
-    # the board is prunable.  if it is a multiple of five it is removed.
-    # Collector that are still active have a new adjacent value [0] set based n the matched bits
-    # and have [2] cleared out for the next cycle.
-    collectors.length.times do | collector_num |
-      collector = collectors[collector_num]
-      if (collector) then
-        if (collector[2] == 0) then
-          return true if (collector[1] % 5 != 0)
-          collectors[collector_num] = nil
-        else
-          # if a collector matches all bits in the row then we can return unprunable early for the
-          # follwing reasons:
-          #    1) there can be no more unavailable bits bince we fill from the top left downward
-          #    2) all previous regions have been closed or joined so only this region can fail
-          #    3) this region must be good since there can never be only 1 region that is nuot
-          #       a multiple of five
-          # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
-          # in pieces to see what configurations work for them (the only other time this algorithm is used).
-          return false if (collector[2] == 0b11111 && !slotting)
-          collector[0] = converter[collector[2]]
-          collector[2] = 0
-        end
-      end
-    end
-
-    # get rid of all the empty converters for the next round
-    collectors.compact!
-  end
-  return false if (collectors.length <= 1) # 1 collector or less and the region is fine
-  collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
-end
-
-# creates a region given a row mask.  see prunable for what a "region" is
-def create_regions( value )
-  regions = []
-  cur_region = 0
-  5.times do | bit |
-    if (value[bit] == 0) then
-      cur_region |= 1 << bit
-    else
-      if (cur_region != 0 ) then
-        regions.push( cur_region)
-        cur_region = 0;
-      end
-    end
-  end
-  regions.push(cur_region) if (cur_region != 0)
-  regions
-end
-
-# find up to the counted number of solutions (or all solutions) and prints the final result
-def find_all
-  find_top( 1)
-  find_top( 0)
-  print_results
-end
-
-# show the board
-def print_results
-  print "#{@boards_found} solutions found\n\n"
-  print_full_board( @min_board)
-  print "\n"
-  print_full_board( @max_board)
-  print "\n"
-end
-
-# finds solutions.  This special version of the main function is only used for the top level
-# the reason for it is basically to force a particular ordering on how the rotations are tested for
-# the first piece.  It is called twice, first looking for placements of the odd rotations and then
-# looking for placements of the even locations.
-#
-# WHY?
-#   Since any found solution has an inverse we want to maximize finding solutions that are not already found
-#   as an inverse.  The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
-#   (an odd number).  Checking even vs odd then produces a higher probability of finding more pieces earlier
-#   in the cycle.  We still need to keep checking all the permutations, but our probability of finding one will
-#   diminsh over time.  Since we are TOLD how many to search for this lets us exit before checking all pieces
-#   this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
-#   maximum number
-def find_top( rotation_skip)
-  board = blank_board
-  (@pieces.length-1).times do
-    piece = @pieces.shift
-    piece.masks[0].each do | mask, imask, cmask |
-      if ((rotation_skip += 1) % 2 == 0) then
-        piece.placed = mask
-        find( 1, 1, board | mask)
-      end
-    end
-    @pieces.push(piece)
-  end
-  piece = @pieces.shift
-  @pieces.push(piece)
-end
-
-# the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found.  depth is acheived via recursion.  the overall approach is described
-# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
-# parameters:
-#  start_location -- where to start looking for place for the next piece at
-#  placed -- number of pieces placed
-#  board -- current state of the board
-#
-# see in-code comments
-def find( start_location, placed, board)
-  # find the next location to place a piece by looking for an empty bit
-  while board[start_location] == 1
-    start_location += 1
-  end
-
-  @pieces.length.times do
-    piece = @pieces.shift
-    piece.masks[start_location].each do | mask, imask, cmask |
-      if ( board & cmask == imask) then
-        piece.placed = mask
-        if (placed == 9) then
-          add_board
-        else
-          find( start_location + 1, placed + 1, board | mask)
-        end
-      end
-    end
-    @pieces.push(piece)
-  end
-end
-
-# print the board
-def print_full_board( board_string)
-  10.times do | row |
-    print " " if (row % 2 == 1)
-    5.times do | col |
-      print "#{board_string[row*5 + col,1]} "
-    end
-    print "\n"
-  end
-end
-
-# when a board is found we "draw it" into a string and then flip that string, adding both to
-# the list (hash) of solutions if they are unique.
-def add_board
-  board_string = "99999999999999999999999999999999999999999999999999"
-  @all_pieces.each {  | piece | piece.fill_string( board_string ) }
-  save( board_string)
-  save( board_string.reverse)
-end
-
-# adds a board string to the list (if new) and updates the current best/worst board
-def save( board_string)
-  if (@all_boards[board_string] == nil) then
-    @min_board = board_string if (board_string < @min_board)
-    @max_board = board_string if (board_string > @max_board)
-    @all_boards.store(board_string,true)
-    @boards_found += 1
-
-    # the exit motif is a time saver.  Ideally the function should return, but those tests
-    # take noticable time (performance).
-    if (@boards_found == @stop_count) then
-      print_results
-      exit(0)
-    end
-  end
-end
-
-
-##
-## MAIN BODY :)
-##
-create_collector_support
-@pieces = [
-  Piece.new( [ :nw, :ne, :east, :east ], 2),
-  Piece.new( [ :ne, :se, :east, :ne ], 7),
-  Piece.new( [ :ne, :east, :ne, :nw ], 1),
-  Piece.new( [ :east, :sw, :sw, :se ], 6),
-  Piece.new( [ :east, :ne, :se, :ne ], 5),
-  Piece.new( [ :east, :east, :east, :se ], 0),
-  Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
-  Piece.new( [ :se, :se, :se, :west ], 9),
-  Piece.new( [ :se, :se, :east, :se ], 8),
-  Piece.new( [ :east, :east, :sw, :se ], 3)
-  ];
-
-@all_pieces = Array.new( @pieces)
-
-@min_board = "99999999999999999999999999999999999999999999999999"
-@max_board = "00000000000000000000000000000000000000000000000000"
-@stop_count = ARGV[0].to_i || 2089
-@all_boards = {}
-@boards_found = 0
-
-find_all ######## DO IT!!!
-
diff --git a/benchmark/bm_so_nbody.rb b/benchmark/bm_so_nbody.rb
deleted file mode 100644
index d6c5bb9e61..0000000000
--- a/benchmark/bm_so_nbody.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org
-#
-# Optimized for Ruby by Jesse Millikan
-# From version ported by Michael Neumann from the C gcc version,
-# which was written by Christoph Bauer.
-
-SOLAR_MASS = 4 * Math::PI**2
-DAYS_PER_YEAR = 365.24
-
-def _puts *args
-end
-
-class Planet
- attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
-
- def initialize(x, y, z, vx, vy, vz, mass)
-  @x, @y, @z = x, y, z
-  @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
-  @mass = mass * SOLAR_MASS
- end
-
- def move_from_i(bodies, nbodies, dt, i)
-  while i < nbodies
-   b2 = bodies[i]
-   dx = @x - b2.x
-   dy = @y - b2.y
-   dz = @z - b2.z
-
-   distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
-   mag = dt / (distance * distance * distance)
-   b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
-
-   @vx -= dx * b2_mass_mag
-   @vy -= dy * b2_mass_mag
-   @vz -= dz * b2_mass_mag
-   b2.vx += dx * b_mass_mag
-   b2.vy += dy * b_mass_mag
-   b2.vz += dz * b_mass_mag
-   i += 1
-  end
-
-  @x += dt * @vx
-  @y += dt * @vy
-  @z += dt * @vz
- end
-end
-
-def energy(bodies)
-  e = 0.0
-  nbodies = bodies.size
-
-  for i in 0 ... nbodies
-    b = bodies[i]
-    e += 0.5 * b.mass * (b.vx * b.vx + b.vy * b.vy + b.vz * b.vz)
-    for j in (i + 1) ... nbodies
-      b2 = bodies[j]
-      dx = b.x - b2.x
-      dy = b.y - b2.y
-      dz = b.z - b2.z
-      distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
-      e -= (b.mass * b2.mass) / distance
-    end
-  end
-  e
-end
-
-def offset_momentum(bodies)
-  px, py, pz = 0.0, 0.0, 0.0
-
-  for b in bodies
-    m = b.mass
-    px += b.vx * m
-    py += b.vy * m
-    pz += b.vz * m
-  end
-
-  b = bodies[0]
-  b.vx = - px / SOLAR_MASS
-  b.vy = - py / SOLAR_MASS
-  b.vz = - pz / SOLAR_MASS
-end
-
-BODIES = [
-  # sun
-  Planet.new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0),
-
-  # jupiter
-  Planet.new(
-    4.84143144246472090e+00,
-    -1.16032004402742839e+00,
-    -1.03622044471123109e-01,
-    1.66007664274403694e-03,
-    7.69901118419740425e-03,
-    -6.90460016972063023e-05,
-    9.54791938424326609e-04),
-
-  # saturn
-  Planet.new(
-    8.34336671824457987e+00,
-    4.12479856412430479e+00,
-    -4.03523417114321381e-01,
-    -2.76742510726862411e-03,
-    4.99852801234917238e-03,
-    2.30417297573763929e-05,
-    2.85885980666130812e-04),
-
-  # uranus
-  Planet.new(
-    1.28943695621391310e+01,
-    -1.51111514016986312e+01,
-    -2.23307578892655734e-01,
-    2.96460137564761618e-03,
-    2.37847173959480950e-03,
-    -2.96589568540237556e-05,
-    4.36624404335156298e-05),
-
-  # neptune
-  Planet.new(
-    1.53796971148509165e+01,
-    -2.59193146099879641e+01,
-    1.79258772950371181e-01,
-    2.68067772490389322e-03,
-    1.62824170038242295e-03,
-    -9.51592254519715870e-05,
-    5.15138902046611451e-05)
-]
-
-init = 200_000 # ARGV[0]
-n = Integer(init)
-
-offset_momentum(BODIES)
-
-puts "%.9f" % energy(BODIES)
-
-nbodies = BODIES.size
-dt = 0.01
-
-n.times do
-  i = 0
-  while i < nbodies
-    b = BODIES[i]
-    b.move_from_i(BODIES, nbodies, dt, i + 1)
-    i += 1
-  end
-end
-
-puts "%.9f" % energy(BODIES)
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
deleted file mode 100644
index a0513f8c47..0000000000
--- a/benchmark/bm_so_nested_loop.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# from Avi Bryant
-
-n = 16 # Integer(ARGV.shift || 1)
-x = 0
-n.times do
-    n.times do
-        n.times do
-            n.times do
-                n.times do
-                    n.times do
-                        x += 1
-                    end
-                end
-            end
-        end
-    end
-end
-# puts x
-
-
diff --git a/benchmark/bm_so_nsieve.rb b/benchmark/bm_so_nsieve.rb
deleted file mode 100644
index a65cc78233..0000000000
--- a/benchmark/bm_so_nsieve.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# contributed by Glenn Parker, March 2005
-# modified by Evan Phoenix, Sept 2006
-
-def sieve(m)
-  flags = Flags.dup[0,m]
-  count = 0
-  pmax = m - 1
-  p = 2
-  while p <= pmax
-    unless flags[p].zero?
-      count += 1
-      mult = p
-      while mult <= pmax
-        flags[mult] = 0
-        mult += p
-      end
-    end
-    p += 1
-  end
-  count
-end
-
-n = 9 # (ARGV[0] || 2).to_i
-Flags = ("\x1" * ( 2 ** n * 10_000)).unpack("c*")
-
-n.downto(n-2) do |exponent|
-  break if exponent < 0
-  m = (1 << exponent) * 10_000
-  # m = (2 ** exponent) * 10_000
-  count = sieve(m)
-  printf "Primes up to %8d %8d\n", m, count
-end
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
deleted file mode 100644
index 019b8b6382..0000000000
--- a/benchmark/bm_so_nsieve_bits.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/ruby
-#
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# nsieve-bits in Ruby
-# Contributed by Glenn Parker, March 2005
-
-CharExponent = 3
-BitsPerChar = 1 << CharExponent
-LowMask = BitsPerChar - 1
-
-def sieve(m)
-  items = "\xFF" * ((m / BitsPerChar) + 1)
-  masks = ""
-  BitsPerChar.times do |b|
-    masks << (1 << b).chr
-  end
-
-  count = 0
-  pmax = m - 1
-  2.step(pmax, 1) do |p|
-    if items[p >> CharExponent][p & LowMask] == 1
-      count += 1
-      p.step(pmax, p) do |mult|
-	a = mult >> CharExponent
-	b = mult & LowMask
-	items[a] -= masks[b] if items[a][b] != 0
-      end
-    end
-  end
-  count
-end
-
-n = 9 # (ARGV[0] || 2).to_i
-n.step(n - 2, -1) do |exponent|
-  break if exponent < 0
-  m = 2 ** exponent * 10_000
-  count = sieve(m)
-  printf "Primes up to %8d %8d\n", m, count
-end
-
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb
deleted file mode 100644
index e8607c7199..0000000000
--- a/benchmark/bm_so_object.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
-# http://www.bagley.org/~doug/shootout/
-# with help from Aristarkh Zagorodnikov
-
-class Toggle
-    def initialize(start_state)
-        @bool = start_state
-    end
-
-    def value
-        @bool
-    end
-
-    def activate
-        @bool = !@bool
-        self
-    end
-end
-
-class NthToggle < Toggle
-    def initialize(start_state, max_counter)
-        super start_state
-        @count_max = max_counter
-        @counter = 0
-    end
-
-    def activate
-        @counter += 1
-        if @counter >= @count_max
-            @bool = !@bool
-            @counter = 0
-        end
-        self
-    end
-end
-
-n = 1500000 # (ARGV.shift || 1).to_i
-
-toggle = Toggle.new 1
-5.times do
-    toggle.activate.value ? 'true' : 'false'
-end
-n.times do
-    toggle = Toggle.new 1
-end
-
-ntoggle = NthToggle.new 1, 3
-8.times do
-    ntoggle.activate.value ? 'true' : 'false'
-end
-n.times do
-    ntoggle = NthToggle.new 1, 3
-end
-
diff --git a/benchmark/bm_so_partial_sums.rb b/benchmark/bm_so_partial_sums.rb
deleted file mode 100644
index 630b45cb8d..0000000000
--- a/benchmark/bm_so_partial_sums.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-n = 2_500_000 # (ARGV.shift || 1).to_i
-
-alt = 1.0 ; s0 = s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = 0.0
-
-1.upto(n) do |d|
-  d = d.to_f ; d2 = d * d ; d3 = d2 * d ; ds = Math.sin(d) ; dc = Math.cos(d)
-
-  s0 += (2.0 / 3.0) ** (d - 1.0)
-  s1 += 1.0 / Math.sqrt(d)
-  s2 += 1.0 / (d * (d + 1.0))
-  s3 += 1.0 / (d3 * ds * ds)
-  s4 += 1.0 / (d3 * dc * dc)
-  s5 += 1.0 / d
-  s6 += 1.0 / d2
-  s7 += alt / d
-  s8 += alt / (2.0 * d - 1.0)
-
-  alt = -alt
-end
-
-if false
-  printf("%.9f\t(2/3)^k\n", s0)
-  printf("%.9f\tk^-0.5\n", s1)
-  printf("%.9f\t1/k(k+1)\n", s2)
-  printf("%.9f\tFlint Hills\n", s3)
-  printf("%.9f\tCookson Hills\n", s4)
-  printf("%.9f\tHarmonic\n", s5)
-  printf("%.9f\tRiemann Zeta\n", s6)
-  printf("%.9f\tAlternating Harmonic\n", s7)
-  printf("%.9f\tGregory\n", s8)
-end
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
deleted file mode 100644
index c7d6fbfb4d..0000000000
--- a/benchmark/bm_so_pidigits.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# contributed by Gabriele Renzi
-
-class PiDigitSpigot
-
-    def initialize()
-        @z = Transformation.new 1,0,0,1
-        @x = Transformation.new 0,0,0,0
-        @inverse = Transformation.new 0,0,0,0
-    end
-
-    def next!
-        @y = @z.extract(3)
-        if safe? @y
-            @z = produce(@y)
-            @y
-        else
-            @z = consume @x.next!()
-            next!()
-        end
-    end
-
-    def safe?(digit)
-        digit == @z.extract(4)
-    end
-
-    def produce(i)
-        @inverse.qrst(10,-10*i,0,1).compose(@z)
-    end
-
-    def consume(a)
-        @z.compose(a)
-    end
-end
-
-
-class Transformation
-    attr_reader :q, :r, :s, :t
-    def initialize (q, r, s, t)
-        @q,@r,@s,@t,@k = q,r,s,t,0
-    end
-
-    def next!()
-        @q = @k = @k + 1
-        @r = 4 * @k + 2
-        @s = 0
-        @t = 2 * @k + 1
-        self
-    end
-
-    def extract(j)
-        (@q * j + @r) / (@s * j + @t)
-    end
-
-    def compose(a)
-        self.class.new( @q * a.q,
-                        @q * a.r + r * a.t,
-                        @s * a.q + t * a.s,
-                        @s * a.r + t * a.t
-                    )
-    end
-
-    def qrst *args
-        initialize *args
-        self
-    end
-
-
-end
-
-
-WIDTH = 10
-n = 2_500 # Integer(ARGV[0])
-j = 0
-
-digits = PiDigitSpigot.new
-
-while n > 0
-    if n >= WIDTH
-        WIDTH.times {print digits.next!}
-        j += WIDTH
-    else
-        n.times {print digits.next!}
-        (WIDTH-n).times {print " "}
-        j += n
-    end
-    puts "\t:"+j.to_s
-    n -= WIDTH
-end
-
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
deleted file mode 100644
index 83c0d6d380..0000000000
--- a/benchmark/bm_so_random.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
-
-IM = 139968.0
-IA = 3877.0
-IC = 29573.0
-
-$last = 42.0
-
-def gen_random(max)
-  (max * ($last = ($last * IA + IC) % IM)) / IM
-end
-
-N = 1000000
-
-i=0
-while i<N
-  i+=1
-  gen_random(100.0)
-end
-# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
deleted file mode 100644
index 82ea666994..0000000000
--- a/benchmark/bm_so_reverse_complement.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/ruby
-# The Great Computer Language Shootout
-# http://shootout.alioth.debian.org/
-#
-# Contributed by Peter Bjarke Olsen
-# Modified by Doug King
-
-seq=Array.new
-
-def revcomp(seq)
-  seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
-  stringlen=seq.length
-  0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
-end
-
-input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
-
-while input.gets
-  if $_ =~ />/
-    if seq.length != 0
-      revcomp(seq.join)
-      seq=Array.new
-    end
-    puts $_
-  else
-    $_.sub(/\n/,'')
-    seq.push $_
-  end
-end
-revcomp(seq.join)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
deleted file mode 100644
index dbe2bfa63d..0000000000
--- a/benchmark/bm_so_sieve.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
-num = 40
-count = i = j = 0
-flags0 = Array.new(8192,1)
-k = 0
-while k < num
-  k+=1
-  count = 0
-  flags = flags0.dup
-  i = 2
-  while i<8192
-    i+=1
-    if flags[i]
-      # remove all multiples of prime: i
-      j = i*i
-      while j < 8192
-        j += i
-        flags[j] = nil
-      end
-      count += 1
-    end
-  end
-end
-count
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/bm_so_spectralnorm.rb
deleted file mode 100644
index 6b97206689..0000000000
--- a/benchmark/bm_so_spectralnorm.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# The Computer Language Shootout
-# http://shootout.alioth.debian.org/
-# Contributed by Sokolov Yura
-
-def eval_A(i,j)
-	return 1.0/((i+j)*(i+j+1)/2+i+1)
-end
-
-def eval_A_times_u(u)
-        v, i = nil, nil
-	(0..u.length-1).collect { |i|
-                v = 0
-		for j in 0..u.length-1
-			v += eval_A(i,j)*u[j]
-                end
-                v
-        }
-end
-
-def eval_At_times_u(u)
-	v, i = nil, nil
-	(0..u.length-1).collect{|i|
-                v = 0
-		for j in 0..u.length-1
-			v += eval_A(j,i)*u[j]
-                end
-                v
-        }
-end
-
-def eval_AtA_times_u(u)
-	return eval_At_times_u(eval_A_times_u(u))
-end
-
-n = 500 # ARGV[0].to_i
-
-u=[1]*n
-for i in 1..10
-        v=eval_AtA_times_u(u)
-        u=eval_AtA_times_u(v)
-end
-vBv=0
-vv=0
-for i in 0..n-1
-        vBv += u[i]*v[i]
-        vv += v[i]*v[i]
-end
-
-str = "%0.9f" % (Math.sqrt(vBv/vv)), "\n"
-# print str
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
deleted file mode 100644
index 2dc4e72be5..0000000000
--- a/benchmark/bm_vm1_block.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-def m
-  yield
-end
-
-i=0
-while i<30000000 # while loop 1
-  i+=1
-  m{
-  }
-end
-\ No newline at end of file
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
deleted file mode 100644
index 3e395d9478..0000000000
--- a/benchmark/bm_vm1_const.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-Const = 1
-
-i = 0
-while i<30000000 # while loop 1
-  i+= 1
-  j = Const
-  k = Const
-end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
deleted file mode 100644
index c3b71ead5a..0000000000
--- a/benchmark/bm_vm1_ensure.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-i=0
-while i<30000000 # benchmark loop 1
-  i+=1
-  begin
-    begin
-    ensure
-    end
-  ensure
-  end
-end
-
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
deleted file mode 100644
index 4de833a316..0000000000
--- a/benchmark/bm_vm1_ivar.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-@a = 1
-
-i = 0
-while i<30000000 # while loop 1
-  i+= 1
-  j = @a
-  k = @a
-end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
deleted file mode 100644
index c8076c6ab6..0000000000
--- a/benchmark/bm_vm1_ivar_set.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i = 0
-while i<30_000_000 # while loop 1
-  i+= 1
-  @a = 1
-  @b = 2
-end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
deleted file mode 100644
index 2d7d7f0b52..0000000000
--- a/benchmark/bm_vm1_length.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-a = 'abc'
-b = [1, 2, 3]
-i=0
-while i<30000000 # while loop 1
-  i+=1
-  a.length
-  b.length
-end
-
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
deleted file mode 100644
index 212f056c6e..0000000000
--- a/benchmark/bm_vm1_neq.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-obj1 = Object.new
-obj2 = Object.new
-
-while i<30000000 # while loop 1
-  i+= 1
-  obj1 != obj2
-end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
deleted file mode 100644
index f139fed8be..0000000000
--- a/benchmark/bm_vm1_not.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i = 0
-obj = Object.new
-
-while i<30000000 # while loop 1
-  i+= 1
-  !obj
-end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
deleted file mode 100644
index 0c98d00e0d..0000000000
--- a/benchmark/bm_vm1_rescue.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-i=0
-while i<30000000 # while loop 1
-  i+=1
-  begin
-  rescue
-  end
-end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
deleted file mode 100644
index c843ee3d97..0000000000
--- a/benchmark/bm_vm1_simplereturn.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  return 1
-end
-i=0
-while i<30000000 # while loop 1
-  i+=1
-  m
-end
-
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
deleted file mode 100644
index a565b6f6dc..0000000000
--- a/benchmark/bm_vm1_swap.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-a = 1
-b = 2
-i=0
-while i<30000000 # while loop 1
-  i+=1
-  a, b = b, a
-end
-
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
deleted file mode 100644
index e29c11200f..0000000000
--- a/benchmark/bm_vm2_array.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  a = [1,2,3,4,5,6,7,8,9,10]
-end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
deleted file mode 100644
index 1ec34ad692..0000000000
--- a/benchmark/bm_vm2_case.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-i=0
-while i<6000000 # while loop 2
-  case :foo
-  when :bar
-    raise
-  when :baz
-    raise
-  when :boo
-    raise
-  when :foo
-    i+=1
-  end
-end
-
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
deleted file mode 100644
index 375dccc00e..0000000000
--- a/benchmark/bm_vm2_eval.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  eval("1")
-end
-
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
deleted file mode 100644
index cc94b8ab3d..0000000000
--- a/benchmark/bm_vm2_method.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
deleted file mode 100644
index 9ec1a0f136..0000000000
--- a/benchmark/bm_vm2_mutex.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'thread'
-
-m = Mutex.new
-
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  m.synchronize{}
-end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
deleted file mode 100644
index ac9953ce5f..0000000000
--- a/benchmark/bm_vm2_poly_method.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
-  def m
-    1
-  end
-end
-class C2
-  def m
-    2
-  end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-i=0
-while i<6000000 # benchmark loop 2
-  o = (i % 2 == 0) ? o1 : o2
-  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
-  i+=1
-end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
deleted file mode 100644
index 856ba9b161..0000000000
--- a/benchmark/bm_vm2_poly_method_ov.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class C1
-  def m
-    1
-  end
-end
-class C2
-  def m
-    2
-  end
-end
-
-o1 = C1.new
-o2 = C2.new
-
-i=0
-while i<6000000 # benchmark loop 2
-  o = (i % 2 == 0) ? o1 : o2
-#  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
-  i+=1
-end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
deleted file mode 100644
index 0bd05b9544..0000000000
--- a/benchmark/bm_vm2_proc.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-def m &b
-  b
-end
-
-pr = m{
-  a = 1
-}
-
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  pr.call
-end
-
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
deleted file mode 100644
index 44f6ed402e..0000000000
--- a/benchmark/bm_vm2_regexp.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-str = 'xxxhogexxx'
-while i<6000000 # benchmark loop 2
-  /hoge/ =~ str
-  i+=1
-end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
deleted file mode 100644
index c20dbdd26c..0000000000
--- a/benchmark/bm_vm2_send.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class C
-  def m
-  end
-end
-
-o = C.new
-
-i=0
-while i<6000000 # benchmark loop 2
-  i+=1
-  o.__send__ :m
-end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
deleted file mode 100644
index 70c86b376f..0000000000
--- a/benchmark/bm_vm2_super.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-
-class C
-  def m
-    1
-  end
-end
-
-class CC < C
-  def m
-    super()
-  end
-end
-
-obj = CC.new
-
-i = 0
-while i<6000000 # benchmark loop 2
-  obj.m
-  i+=1
-end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
deleted file mode 100644
index e12bd2ade0..0000000000
--- a/benchmark/bm_vm2_unif1.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-i = 0
-def m a, b
-end
-
-while i<6000000 # benchmark loop 2
-  i+=1
-  m 100, 200
-end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
deleted file mode 100644
index 3a75960403..0000000000
--- a/benchmark/bm_vm2_zsuper.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-i = 0
-
-class C
-  def m a
-    1
-  end
-end
-
-class CC < C
-  def m a
-    super
-  end
-end
-
-obj = CC.new
-
-while i<6000000 # benchmark loop 2
-  obj.m 10
-  i+=1
-end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
deleted file mode 100755
index 7db9829d44..0000000000
--- a/benchmark/bm_vm3_gc.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/ruby
-5000.times do
-  100.times do
-    {"xxxx"=>"yyyy"}
-  end
-  GC.start
-end
diff --git a/benchmark/bm_vm3_thread_create_join.rb b/benchmark/bm_vm3_thread_create_join.rb
deleted file mode 100644
index 325a66d587..0000000000
--- a/benchmark/bm_vm3_thread_create_join.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-i=0
-while i<100_000 # benchmark loop 3
-  i+=1
-  Thread.new{
-  }.join
-end
diff --git a/benchmark/bm_vm3_thread_mutex.rb b/benchmark/bm_vm3_thread_mutex.rb
deleted file mode 100644
index 649f1fddac..0000000000
--- a/benchmark/bm_vm3_thread_mutex.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'thread'
-m = Mutex.new
-r = 0
-max = 1000
-(1..max).map{
-  Thread.new{
-    i=0
-    while i<max
-      i+=1
-      m.synchronize{
-        r += 1
-      }
-    end
-  }
-}.each{|e|
-  e.join
-}
-raise r.to_s if r != max * max
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
deleted file mode 100644
index 0b4b219ca2..0000000000
--- a/benchmark/bmx_temp.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i=0
-while i<800000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
deleted file mode 100644
index 4a1afe360b..0000000000
--- a/benchmark/driver.rb
+++ /dev/null
@@ -1,253 +0,0 @@
-#
-# Ruby Benchmark driver
-#
-
-first = true
-
-p RUBY_VERSION
-
-begin
-  require 'optparse'
-rescue LoadError
-  if first
-    first = false
-    $:.unshift File.join(File.dirname(__FILE__), '../lib')
-    retry
-  else
-    raise
-  end
-end
-
-require 'benchmark'
-require 'pp'
-
-class BenchmarkDriver
-  def self.benchmark(opt)
-    driver = self.new(opt[:execs], opt[:dir], opt)
-    begin
-      driver.run
-    ensure
-      driver.show_results
-    end
-  end
-
-  def output *args
-    puts(*args)
-    @output and @output.puts(*args)
-  end
-
-  def message *args
-    output(*args) if @verbose
-  end
-
-  def message_print *args
-    if @verbose
-      print(*args)
-      STDOUT.flush
-      @output and @output.print(*args)
-    end
-  end
-
-  def progress_message *args
-    unless STDOUT.tty?
-      STDERR.print(*args) 
-      STDERR.flush
-    end
-  end
-
-  def initialize execs, dir, opt = {}
-    @execs = execs.map{|e|
-      e.strip!
-      next if e.empty?
-
-      if /(.+)::(.+)/ =~ e
-        # ex) ruby-a::/path/to/ruby-a
-        v = $1.strip
-        e = $2
-      else
-        v =  `#{e} -v`.chomp
-        v.sub!(/ patchlevel \d+/, '')
-      end
-      [e, v]
-    }.compact
-
-    @dir = dir
-    @repeat = opt[:repeat] || 1
-    @repeat = 1 if @repeat < 1
-    @pattern = opt[:pattern] || nil
-    @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
-    @output = opt[:output] ? open(opt[:output], 'w') : nil
-    @loop_wl1 = @loop_wl2 = nil
-    @opt = opt
-
-    # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
-    @results = []
-
-    if @verbose
-      @start_time = Time.now
-      message @start_time
-      @execs.each_with_index{|(e, v), i|
-        message "target #{i}: #{v}"
-      }
-    end
-  end
-
-  def show_results
-    output
-
-    if @verbose
-      message '-----------------------------------------------------------'
-      message 'raw data:'
-      message
-      message PP.pp(@results, "", 79)
-      message
-      message "Elapesed time: #{Time.now - @start_time} (sec)"
-    end
-
-    output '-----------------------------------------------------------'
-    output 'benchmark results:'
-
-    if @verbose and @repeat > 1
-      output "minimum results in each #{@repeat} measurements."
-    end
-
-    output "name\t#{@execs.map{|(e, v)| v}.join("\t")}"
-    @results.each{|v, result|
-      rets = []
-      s = nil
-      result.each_with_index{|e, i|
-        r = e.min
-        case v
-        when /^vm1_/
-          if @loop_wl1
-            r -= @loop_wl1[i]
-            s = '*'
-          end
-        when /^vm2_/
-          if @loop_wl2
-            r -= @loop_wl2[i]
-            s = '*'
-          end
-        end
-        rets << sprintf("%.3f", r)
-      }
-      output "#{v}#{s}\t#{rets.join("\t")}"
-    }
-  end
-
-  def files
-    flag = {}
-    vm1 = vm2 = wl1 = wl2 = false
-    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
-      next if @pattern && /#{@pattern}/ !~ File.basename(file)
-      case file
-      when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
-        flag[$1] = true
-      end
-      file
-    }.compact
-
-    if flag['vm1'] && !flag['whileloop']
-      @files << File.join(@dir, 'bm_loop_whileloop.rb')
-    elsif flag['vm2'] && !flag['whileloop2']
-      @files << File.join(@dir, 'bm_loop_whileloop2.rb')
-    end
-
-    @files.sort!
-    progress_message "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))\n"
-    @files
-  end
-
-  def run
-    files.each_with_index{|file, i|
-      @i = i
-      r = measure_file(file)
-
-      if /bm_loop_whileloop.rb/ =~ file
-        @loop_wl1 = r[1].map{|e| e.min}
-      elsif /bm_loop_whileloop2.rb/ =~ file
-        @loop_wl2 = r[1].map{|e| e.min}
-      end
-    }
-  end
-
-  def measure_file file
-    name = File.basename(file, '.rb').sub(/^bm_/, '')
-    prepare_file = File.join(File.dirname(file), "prepare_#{name}.rb")
-    load prepare_file if FileTest.exist?(prepare_file)
-
-    if @verbose
-      output
-      output '-----------------------------------------------------------'
-      output name
-      output
-      output File.read(file)
-      output
-    end
-
-    result = [name]
-    result << @execs.map{|(e, v)|
-      (0...@repeat).map{
-        message_print "#{v}\t"
-        progress_message '.'
-
-        m = measure(e, file)
-        message "#{m}"
-        m
-      }
-    }
-    @results << result
-    result
-  end
-
-  def measure executable, file
-    cmd = "#{executable} #{file}"
-    m = Benchmark.measure{
-      `#{cmd}`
-    }
-
-    if $? != 0
-      raise "Benchmark process exited with abnormal status (#{$?})"
-    end
-
-    m.real
-  end
-end
-
-if __FILE__ == $0
-  opt = {
-    :execs => ['ruby'],
-    :dir => './',
-    :repeat => 1,
-    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
-  }
-
-  parser = OptionParser.new{|o|
-    o.on('-e', '--executables [EXECS]',
-         "Specify benchmark one or more targets. (exec1; exec2; exec3, ...)"){|e|
-      opt[:execs] = e.split(/;/)
-    }
-    o.on('-d', '--directory [DIRECTORY]', "Benchmark suites directory"){|d|
-      opt[:dir] = d
-    }
-    o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
-      opt[:pattern] = p
-    }
-    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
-      opt[:repeat] = n.to_i
-    }
-    o.on('-o', '--output-file [FILE]', "Output file"){|o|
-      opt[:output] = o
-    }
-    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
-      opt[:quiet] = q
-    }
-    o.on('-v', '--verbose'){|v|
-      opt[:verbose] = v
-    }
-  }
-
-  parser.parse!(ARGV)
-  BenchmarkDriver.benchmark(opt)
-end
-
diff --git a/benchmark/make_fasta_output.rb b/benchmark/make_fasta_output.rb
deleted file mode 100644
index b6d787ae27..0000000000
--- a/benchmark/make_fasta_output.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# prepare 'fasta.output'
-
-def prepare_fasta_output n
-  filebase = File.join(File.dirname($0), 'fasta.output')
-  script = File.join(File.dirname($0), 'bm_so_fasta.rb')
-  file = "#{filebase}.#{n}"
-
-  unless FileTest.exist?(file)
-    STDERR.puts "preparing #{file}"
-
-    open(file, 'w'){|f|
-      ARGV[0] = n
-      $stdout = f
-      load script
-      $stdout = STDOUT
-    }
-  end
-end
-
diff --git a/benchmark/other-lang/ack.pl b/benchmark/other-lang/ack.pl
deleted file mode 100644
index 201e22ddfa..0000000000
--- a/benchmark/other-lang/ack.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-use integer;
-
-sub Ack {
-    return $_[0] ? ($_[1] ? Ack($_[0]-1, Ack($_[0], $_[1]-1))
-		    : Ack($_[0]-1, 1))
-	: $_[1]+1;
-}
-
-my $NUM = 9;
-$NUM = 1 if ($NUM < 1);
-my $ack = Ack(3, $NUM);
diff --git a/benchmark/other-lang/ack.py b/benchmark/other-lang/ack.py
deleted file mode 100644
index 9968e7cfcf..0000000000
--- a/benchmark/other-lang/ack.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import sys
-sys.setrecursionlimit(5000000)
-
-def Ack(M, N):
-    if (not M):
-        return( N + 1 )
-    if (not N):
-        return( Ack(M-1, 1) )
-    return( Ack(M-1, Ack(M, N-1)) )
-
-def main():
-    NUM = 9
-    sys.setrecursionlimit(10000)
-    Ack(3, NUM)
-
-main()
diff --git a/benchmark/other-lang/ack.rb b/benchmark/other-lang/ack.rb
deleted file mode 100644
index 7451bed6c4..0000000000
--- a/benchmark/other-lang/ack.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-def ack(m, n)
-    if m == 0 then
-        n + 1
-    elsif n == 0 then
-        ack(m - 1, 1)
-    else
-        ack(m - 1, ack(m, n - 1))
-    end
-end
-
-NUM = 9
-ack(3, NUM)
diff --git a/benchmark/other-lang/ack.scm b/benchmark/other-lang/ack.scm
deleted file mode 100644
index a80b73ba55..0000000000
--- a/benchmark/other-lang/ack.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(define (ack m n)
-  (cond ((zero? m) (+ n 1))
-	((zero? n) (ack (- m 1) 1))
-	(else      (ack (- m 1) (ack m (- n 1))))))
-
-(ack 3 9)
-
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb
deleted file mode 100644
index 3875927389..0000000000
--- a/benchmark/other-lang/eval.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-
-Bench = %w(
-  loop
-  ack
-  fib
-  tak
-  fact
-)
-
-Lang = <<EOP.map{|l| l.strip}
-  ruby-cyg
-  ../../../test6/miniruby
-  perl
-  python
-  gosh
-EOP
-
-Bench.replace ['loop2']
-Lang.replace ['ruby-cyg']
-
-Ext = %w(
-  .rb
-  .rb
-  .pl
-  .py
-  .scm
-)
-
-p Bench
-p Lang
-
-require 'benchmark'
-
-def bench cmd
-  m = Benchmark.measure{
-    #p cmd
-    system(cmd)
-  }
-  [m.utime, m.real]
-end
-
-Result = []
-Bench.each{|b|
-  r = []
-  Lang.each_with_index{|l, idx|
-    cmd = "#{l} #{b}#{Ext[idx]}"
-    r << bench(cmd)
-  }
-  Result << r
-}
-
-require 'pp'
-# utime
-puts Lang.join("\t")  
-Bench.each_with_index{|b, bi|
-  print b, "\t"
-  puts Result[bi].map{|e| e[0]}.join("\t")
-}
-
-# rtime
-puts Lang.join("\t")  
-Bench.each_with_index{|b, bi|
-  print b, "\t"
-  puts Result[bi].map{|e| e[1]}.join("\t")
-}
-
diff --git a/benchmark/other-lang/fact.pl b/benchmark/other-lang/fact.pl
deleted file mode 100644
index a9b0b69cdf..0000000000
--- a/benchmark/other-lang/fact.pl
+++ /dev/null
@@ -1,13 +0,0 @@
-sub fact{
-  my $n = @_[0];
-  if($n < 2){
-    return 1;
-  }
-  else{
-    return $n * fact($n-1);
-  }
-}
-
-for($i=0; $i<10000; $i++){
-  &fact(100);
-}
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
deleted file mode 100644
index 01593965d9..0000000000
--- a/benchmark/other-lang/fact.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#import sys
-#sys.setrecursionlimit(1000)
-
-def factL(n):
-	r = 1
-	for x in range(2, n):
-		r *= x
-	return r
-
-def factR(n):
-	if n < 2:
-		return 1
-	else:
-		return n * factR(n-1)
-
-for i in range(10000):
-	factR(100)
-
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb
deleted file mode 100644
index 7e97b22b39..0000000000
--- a/benchmark/other-lang/fact.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-def fact(n)
-  if n < 2
-    1
-  else
-    n * fact(n-1)
-  end
-end
-
-i=0
-while i<10000
-  i+=1
-  fact(100)
-end
diff --git a/benchmark/other-lang/fact.scm b/benchmark/other-lang/fact.scm
deleted file mode 100644
index c98a7fedd3..0000000000
--- a/benchmark/other-lang/fact.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(define (fact n)
-        (if (< n 2)
-            1
-          (* n (fact (- n 1)))))
-
-(dotimes (i 10000)
-  (fact 100))
-
diff --git a/benchmark/other-lang/fib.pl b/benchmark/other-lang/fib.pl
deleted file mode 100644
index a46f666d1e..0000000000
--- a/benchmark/other-lang/fib.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-sub fib{
-  my $n = $_[0];
-  if($n < 3){
-    return 1;
-  }
-  else{
-    return fib($n-1) + fib($n-2);
-  }
-};
-
-&fib(34);
diff --git a/benchmark/other-lang/fib.py b/benchmark/other-lang/fib.py
deleted file mode 100644
index 45f2bceb8d..0000000000
--- a/benchmark/other-lang/fib.py
+++ /dev/null
@@ -1,7 +0,0 @@
-def fib(n):
-  if n < 3:
-    return 1
-  else:
-    return fib(n-1) + fib(n-2)
-
-fib(34)
diff --git a/benchmark/other-lang/fib.rb b/benchmark/other-lang/fib.rb
deleted file mode 100644
index ec587eabe0..0000000000
--- a/benchmark/other-lang/fib.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def fib n
-  if n < 3
-    1
-  else
-    fib(n-1) + fib(n-2)
-  end
-end
-
-fib(34)
diff --git a/benchmark/other-lang/fib.scm b/benchmark/other-lang/fib.scm
deleted file mode 100644
index 2fc4e225bd..0000000000
--- a/benchmark/other-lang/fib.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(define (fib n)
-        (if (< n 3)
-            1
-          (+ (fib (- n 1)) (fib (- n 2)))))
-
-(fib 34)
-
diff --git a/benchmark/other-lang/loop.pl b/benchmark/other-lang/loop.pl
deleted file mode 100644
index 2777490aaa..0000000000
--- a/benchmark/other-lang/loop.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-for($i=0; $i<30000000; $i++){
-}
-
diff --git a/benchmark/other-lang/loop.py b/benchmark/other-lang/loop.py
deleted file mode 100644
index 003749bf3a..0000000000
--- a/benchmark/other-lang/loop.py
+++ /dev/null
@@ -1,2 +0,0 @@
-for i in xrange(30000000):
-	pass
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
deleted file mode 100644
index d43cef61f3..0000000000
--- a/benchmark/other-lang/loop.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-i=0
-while i<30000000
-  i+=1
-end
diff --git a/benchmark/other-lang/loop.scm b/benchmark/other-lang/loop.scm
deleted file mode 100644
index 3364f7e679..0000000000
--- a/benchmark/other-lang/loop.scm
+++ /dev/null
@@ -1 +0,0 @@
-(dotimes (x 30000000))
diff --git a/benchmark/other-lang/loop2.rb b/benchmark/other-lang/loop2.rb
deleted file mode 100644
index df8fffc1ff..0000000000
--- a/benchmark/other-lang/loop2.rb
+++ /dev/null
@@ -1 +0,0 @@
-30000000.times{}
diff --git a/benchmark/other-lang/tak.pl b/benchmark/other-lang/tak.pl
deleted file mode 100644
index 7e748a67c6..0000000000
--- a/benchmark/other-lang/tak.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-sub tak {
-    local($x, $y, $z) = @_;
-    if (!($y < $x)) {
-	return $z;
-    } else {
-	return &tak(&tak($x - 1, $y, $z),
-		    &tak($y - 1, $z, $x),
-		    &tak($z - 1, $x, $y));
-    }
-}
-&tak(18, 9, 0);
diff --git a/benchmark/other-lang/tak.py b/benchmark/other-lang/tak.py
deleted file mode 100644
index 04f3f6829c..0000000000
--- a/benchmark/other-lang/tak.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def tak(x, y, z):
-	if not(y<x):
-		return z
-	else:
-		return tak(tak(x-1, y, z),
-		           tak(y-1, z, x),
-		           tak(z-1, x, y))
-tak(18, 9, 0)
diff --git a/benchmark/other-lang/tak.rb b/benchmark/other-lang/tak.rb
deleted file mode 100644
index efe5380f4e..0000000000
--- a/benchmark/other-lang/tak.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-
-def tak x, y, z
-  unless y < x
-    z
-  else
-    tak( tak(x-1, y, z),
-         tak(y-1, z, x),
-         tak(z-1, x, y))
-  end
-end
-
-tak(18, 9, 0)
-
diff --git a/benchmark/other-lang/tak.scm b/benchmark/other-lang/tak.scm
deleted file mode 100644
index 52a7629ee5..0000000000
--- a/benchmark/other-lang/tak.scm
+++ /dev/null
@@ -1,10 +0,0 @@
-(define (tak x y z)
-        (if (not (< y x))
-            z
-          (tak (tak (- x 1) y z)
-               (tak (- y 1) z x)
-               (tak (- z 1) x y))))
-
-(tak 18 9 0)
-
-
diff --git a/benchmark/prepare_so_count_words.rb b/benchmark/prepare_so_count_words.rb
deleted file mode 100644
index ee2138cdb2..0000000000
--- a/benchmark/prepare_so_count_words.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# prepare 'wc.input'
-
-def prepare_wc_input
-  wcinput = File.join(File.dirname($0), 'wc.input')
-  wcbase  = File.join(File.dirname($0), 'wc.input.base')
-  unless FileTest.exist?(wcinput)
-    data = File.read(wcbase)
-    13.times{
-      data << data
-    }
-    open(wcinput, 'w'){|f| f.write data}
-  end
-end
-
-prepare_wc_input
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
deleted file mode 100644
index f28f4460a1..0000000000
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
deleted file mode 100644
index 7f089109de..0000000000
--- a/benchmark/prepare_so_reverse_complement.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
-prepare_fasta_output(2_500_000)
diff --git a/benchmark/report.rb b/benchmark/report.rb
deleted file mode 100644
index 8305330b45..0000000000
--- a/benchmark/report.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# YARV benchmark driver
-#
-
-require 'yarvutil'
-require 'benchmark'
-require 'rbconfig'
-
-def exec_command type, file, w
-  <<-EOP
-  $DRIVER_PATH = '#{File.dirname($0)}'
-  $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
-  require 'benchmark'
-  require 'yarvutil'
-#  print '#{type}'
-  begin
-    puts Benchmark.measure{
-      #{w}('#{file}')
-    }.utime
-  rescue Exception => exec_command_error_variable
-    puts "\t" + exec_command_error_variable.message
-  end
-  EOP
-end
-
-def benchmark cmd
-  rubybin = ENV['RUBY'] || File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"])
-    
-  IO.popen(rubybin, 'r+'){|io|
-    io.write cmd
-    io.close_write
-    return io.gets
-  }
-end
-
-def ruby_exec file
-  prog = exec_command 'ruby', file, 'load'
-  benchmark prog
-end
-
-def yarv_exec file
-  prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
-  benchmark prog
-end
-
-$wr = $wy = nil
-
-def measure bench
-  file = File.dirname($0) + "/bm_#{bench}.rb"
-  r = ruby_exec(file).to_f
-  y = yarv_exec(file).to_f
-  puts "#{bench}\t#{r}\t#{y}"
-end
-
-def measure2
-  r = ruby_exec.to_f
-  y = yarv_exec.to_f
-  puts r/y
-end
-
-if $0 == __FILE__
-  %w{
-    whileloop
-    whileloop2
-    times
-    const
-    method
-    poly_method
-    block
-    rescue
-    rescue2
-  }.each{|bench|
-    measure bench
-  }
-end
-
-
-
-
diff --git a/benchmark/run.rb b/benchmark/run.rb
deleted file mode 100644
index 6ef2943642..0000000000
--- a/benchmark/run.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# Ruby benchmark driver
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$matzrubyonly = false
-$rubyonly = false
-
-$results  = []
-
-# prepare 'wc.input'
-def prepare_wc_input
-  wcinput = File.join(File.dirname($0), 'wc.input')
-  wcbase  = File.join(File.dirname($0), 'wc.input.base')
-  unless FileTest.exist?(wcinput)
-    data = File.read(wcbase)
-    13.times{
-      data << data
-    }
-    open(wcinput, 'w'){|f| f.write data}
-  end
-end
-
-prepare_wc_input
-
-def bm file
-  prog = File.readlines(file).map{|e| e.rstrip}.join("\n")
-  return if prog.empty?
-
-  /[a-z]+_(.+)\.rb/ =~ file
-  bm_name = $1
-  puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
-  puts "#{bm_name}: "
-  
-  
-puts <<EOS unless $matzrubyonly || $rubyonly
-#{prog}
---
-EOS
-  begin
-    result = [bm_name]
-    result << matzruby_exec(file) unless $rubyonly
-    result << ruby_exec(file) unless $matzrubyonly
-    $results << result
-
-  rescue Exception => e
-    puts
-    puts "** benchmark failure: #{e}"
-    puts e.backtrace
-  end
-end
-
-def benchmark file, bin
-  m = Benchmark.measure{
-    `#{bin} #{$opts} #{file}`
-  }
-  sec = '%.3f' % m.real
-  puts " #{sec}"
-  sec
-end
-
-def ruby_exec file
-  print 'ruby'
-  benchmark file, $ruby_program
-end
-
-def matzruby_exec file
-  print 'matz'
-  rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = ''
-  r = benchmark file, $matzruby_program
-  ENV['RUBYLIB'] = rubylib
-  r
-end
-
-if $0 == __FILE__
-  ARGV.each{|arg|
-    case arg
-    when /\A--ruby=(.+)/
-      $ruby_program = $1
-    when /\A--matzruby=(.+)/
-      $matzruby_program = $1
-    when /\A--opts=(.+)/
-      $opts = $1
-    when /\A(-r|--only-ruby)\z/
-      $rubyonly = true
-    when /\A(-m|--only-matzruby)\z/
-      $matzrubyonly = true
-    end
-  }
-  ARGV.delete_if{|arg|
-    /\A-/ =~ arg
-  }
-  
-  puts "MatzRuby:"
-  system("#{$matzruby_program} -v")
-  puts "Ruby:"
-  system("#{$ruby_program} -v")
-  puts
-
-  if ARGV.empty?
-    Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
-      bm file
-    }
-  else
-    ARGV.each{|file|
-      Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
-        # file = "#{File.dirname(__FILE__)}/#{file}.rb"
-        bm ef
-      }
-    }
-  end
-
-  puts
-  puts "-- benchmark summary ---------------------------"
-  $results.each{|res|
-    print res.shift, "\t"
-    (res||[]).each{|result|
-      /([\d\.]+)/ =~ result
-      print $1 + "\t" if $1
-    }
-    puts
-  }
-end
-
diff --git a/benchmark/runc.rb b/benchmark/runc.rb
deleted file mode 100644
index 14ab171c12..0000000000
--- a/benchmark/runc.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#
-#
-
-require 'benchmark'
-require 'rbconfig'
-
-$rubybin = ENV['RUBY'] || File.join(
-  Config::CONFIG["bindir"],
-  Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"])
-
-def runfile file
-  puts file
-  file = File.join(File.dirname($0), 'contrib', file)
-  Benchmark.bm{|x|
-    x.report('ruby'){
-      system("#{$rubybin} #{file}")
-    }
-    x.report('yarv'){
-      system("#{$rubybin} -rite -I.. #{file}")
-    }
-  }
-end
-
-ARGV.each{|file|
-  runfile file
-}
-
-
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base
deleted file mode 100644
index 41143fbac0..0000000000
--- a/benchmark/wc.input.base
+++ /dev/null
@@ -1,25 +0,0 @@
-Subject:      Re: Who was Izchak Miller?
-From:         "Jane D. Anonymous" <nobody@yale.edu>
-Date:         1996/04/28
-Message-Id:   <4lv7bc$oh@news.ycc.yale.edu>
-References:   <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
-To:           75176.2330@compuserve.com
-Content-Type: text/plain; charset=us-ascii
-Organization: Yale University
-X-Url:        news:4lk6vl$gde@ns.oar.net
-Mime-Version: 1.0
-Newsgroups:   rec.games.roguelike.nethack
-X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
-
-Hello there, Izchak Miller was my father.  When I was younger I spent 
-many a night, hunched over the keyboard with a cup of tea, playing 
-nethack with him and my brother.  my dad was a philosopher with a strong 
-weakness for fantasy/sci fi.  I remember when he started to get involved 
-with the Nethack team- my brother's Dungeons and Dragons monster book 
-found a regular place beside my dad's desk. it's nice to see him living 
-on in the game he loved so much :-).  
-                                                                  Tamar Miller
-
-The following is a really long word of 5000 characters:
-
-wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/bignum.c b/bignum.c
index e9b7726dd3..7f14aee709 100644
--- a/bignum.c
+++ b/bignum.c
@@ -3,13 +3,15 @@
   bignum.c -
 
   $Author$
+  $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
+#include "rubysig.h"
 
 #include <math.h>
 #include <float.h>
@@ -24,7 +26,7 @@ VALUE rb_cBignum;
 #define USHORT _USHORT
 #endif
 
-#define BDIGITS(x) (RBIGNUM_DIGITS(x))
+#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
 #define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
 #define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
 #define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
@@ -36,97 +38,33 @@ VALUE rb_cBignum;
 #define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
 #define BDIGMAX ((BDIGIT)-1)
 
-#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
+#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+		      (RBIGNUM(x)->len == 1 || bigzero_p(x))))
 
+static int bigzero_p(VALUE);
 static int
-bigzero_p(VALUE x)
+bigzero_p(x)
+    VALUE x;
 {
     long i;
-    for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
+    for (i = 0; i < RBIGNUM(x)->len; ++i) {
 	if (BDIGITS(x)[i]) return 0;
     }
     return 1;
 }
 
-int
-rb_cmpint(VALUE val, VALUE a, VALUE b)
-{
-    if (NIL_P(val)) {
-	rb_cmperr(a, b);
-    }
-    if (FIXNUM_P(val)) return FIX2INT(val);
-    if (TYPE(val) == T_BIGNUM) {
-	if (BIGZEROP(val)) return 0;
-	if (RBIGNUM_SIGN(val)) return 1;
-	return -1;
-    }
-    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
-    return 0;
-}
-
-#define RBIGNUM_SET_LEN(b,l) \
-  ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
-   (RBASIC(b)->flags = (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
-      ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
-   (RBIGNUM(b)->as.heap.len = (l)))
-
-static void
-rb_big_realloc(VALUE big, long len)
-{
-    BDIGIT *ds;
-    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
-	if (RBIGNUM_EMBED_LEN_MAX < len) {
-	    ds = ALLOC_N(BDIGIT, len);
-	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
-	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
-	    RBIGNUM(big)->as.heap.digits = ds;
-	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
-	}
-    }
-    else {
-	if (len <= RBIGNUM_EMBED_LEN_MAX) {
-	    ds = RBIGNUM(big)->as.heap.digits;
-	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	    RBIGNUM_SET_LEN(big, len);
-	    if (ds) {
-		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
-		xfree(ds);
-	    }
-	}
-	else {
-	    if (RBIGNUM_LEN(big) == 0) {
-		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
-	    }
-	    else {
-		REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
-	    }
-	}
-    }
-}
-
-void
-rb_big_resize(VALUE big, long len)
-{
-    rb_big_realloc(big, len);
-    RBIGNUM_SET_LEN(big, len);
-}
-
 static VALUE
-bignew_1(VALUE klass, long len, int sign)
+bignew_1(klass, len, sign)
+    VALUE klass;
+    long len;
+    int sign;
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    RBIGNUM_SET_SIGN(big, sign?1:0);
-    if (len <= RBIGNUM_EMBED_LEN_MAX) {
-	RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	RBIGNUM_SET_LEN(big, len);
-    }
-    else {
-	rb_big_resize((VALUE)big, len);
-    }
+    big->sign = sign?1:0;
+    big->len = len;
+    big->digits = ALLOC_N(BDIGIT, len);
 
     return (VALUE)big;
 }
@@ -134,19 +72,21 @@ bignew_1(VALUE klass, long len, int sign)
 #define bignew(len,sign) bignew_1(rb_cBignum,len,sign)
 
 VALUE
-rb_big_clone(VALUE x)
+rb_big_clone(x)
+    VALUE x;
 {
-    VALUE z = bignew_1(CLASS_OF(x), RBIGNUM_LEN(x), RBIGNUM_SIGN(x));
+    VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
 
-    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM_LEN(x));
+    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
     return z;
 }
 
 /* modify a bignum by 2's complement */
 static void
-get2comp(VALUE x)
+get2comp(x)
+    VALUE x;
 {
-    long i = RBIGNUM_LEN(x);
+    long i = RBIGNUM(x)->len;
     BDIGIT *ds = BDIGITS(x);
     BDIGIT_DBL num;
 
@@ -157,45 +97,48 @@ get2comp(VALUE x)
 	num += ds[i];
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
-    } while (i < RBIGNUM_LEN(x));
+    } while (i < RBIGNUM(x)->len);
     if (num != 0) {
-	rb_big_resize(x, RBIGNUM_LEN(x)+1);
+	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
 	ds = BDIGITS(x);
-	ds[RBIGNUM_LEN(x)-1] = 1;
+	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
     }
 }
 
 void
-rb_big_2comp(VALUE x)			/* get 2's complement */
+rb_big_2comp(x)			/* get 2's complement */
+    VALUE x;
 {
     get2comp(x);
 }
 
 static VALUE
-bigtrunc(VALUE x)
+bigtrunc(x)
+    VALUE x;
 {
-    long len = RBIGNUM_LEN(x);
+    long len = RBIGNUM(x)->len;
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    rb_big_resize(x, len+1);
+    RBIGNUM(x)->len = ++len;
     return x;
 }
 
 static VALUE
-bigfixize(VALUE x)
+bigfixize(x)
+    VALUE x;
 {
-    long len = RBIGNUM_LEN(x);
+    long len = RBIGNUM(x)->len;
     BDIGIT *ds = BDIGITS(x);
 
-    if (len*SIZEOF_BDIGITS <= sizeof(long)) {
+    if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
 	long num = 0;
 	while (len--) {
 	    num = BIGUP(num) + ds[len];
 	}
 	if (num >= 0) {
-	    if (RBIGNUM_SIGN(x)) {
+	    if (RBIGNUM(x)->sign) {
 		if (POSFIXABLE(num)) return LONG2FIX(num);
 	    }
 	    else {
@@ -207,7 +150,8 @@ bigfixize(VALUE x)
 }
 
 static VALUE
-bignorm(VALUE x)
+bignorm(x)
+    VALUE x;
 {
     if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
 	x = bigfixize(bigtrunc(x));
@@ -216,13 +160,15 @@ bignorm(VALUE x)
 }
 
 VALUE
-rb_big_norm(VALUE x)
+rb_big_norm(x)
+    VALUE x;
 {
     return bignorm(x);
 }
 
 VALUE
-rb_uint2big(VALUE n)
+rb_uint2big(n)
+    unsigned long n;
 {
     BDIGIT_DBL num = n;
     long i = 0;
@@ -238,12 +184,13 @@ rb_uint2big(VALUE n)
 
     i = DIGSPERLONG;
     while (--i && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    RBIGNUM(big)->len = i+1;
     return big;
 }
 
 VALUE
-rb_int2big(SIGNED_VALUE n)
+rb_int2big(n)
+    long n;
 {
     long neg = 0;
     VALUE big;
@@ -254,20 +201,22 @@ rb_int2big(SIGNED_VALUE n)
     }
     big = rb_uint2big(n);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	RBIGNUM(big)->sign = 0;
     }
     return big;
 }
 
 VALUE
-rb_uint2inum(VALUE n)
+rb_uint2inum(n)
+    unsigned long n;
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(SIGNED_VALUE n)
+rb_int2inum(n)
+    long n;
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_int2big(n);
@@ -276,7 +225,9 @@ rb_int2inum(SIGNED_VALUE n)
 #ifdef HAVE_LONG_LONG
 
 void
-rb_quad_pack(char *buf, VALUE val)
+rb_quad_pack(buf, val)
+    char *buf;
+    VALUE val;
 {
     LONG_LONG q;
 
@@ -285,25 +236,26 @@ rb_quad_pack(char *buf, VALUE val)
 	q = FIX2LONG(val);
     }
     else {
-	long len = RBIGNUM_LEN(val);
+	long len = RBIGNUM(val)->len;
 	BDIGIT *ds;
 
-	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
-	    len = SIZEOF_LONG_LONG/SIZEOF_BDIGITS;
-	}
+	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_SIGN(val)) q = -q;
+	if (!RBIGNUM(val)->sign) q = -q;
     }
     memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
 }
 
 VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_quad_unpack(buf, sign)
+    const char *buf;
+    int sign;
 {
     unsigned LONG_LONG q;
     long neg = 0;
@@ -333,10 +285,10 @@ rb_quad_unpack(const char *buf, int sign)
 
     i = DIGSPERLL;
     while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    RBIGNUM(big)->len = i+1;
 
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	RBIGNUM(big)->sign = 0;
     }
     return bignorm(big);
 }
@@ -346,7 +298,9 @@ rb_quad_unpack(const char *buf, int sign)
 #define QUAD_SIZE 8
 
 void
-rb_quad_pack(char *buf, VALUE val)
+rb_quad_pack(buf, val)
+    char *buf;
+    VALUE val;
 {
     long len;
 
@@ -355,12 +309,12 @@ rb_quad_pack(char *buf, VALUE val)
     if (FIXNUM_P(val)) {
 	val = rb_int2big(FIX2LONG(val));
     }
-    len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
+    len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
     if (len > QUAD_SIZE) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
     }
     memcpy(buf, (char*)BDIGITS(val), len);
-    if (!RBIGNUM_SIGN(val)) {
+    if (!RBIGNUM(val)->sign) {
 	len = QUAD_SIZE;
 	while (len--) {
 	    *buf = ~*buf;
@@ -372,7 +326,9 @@ rb_quad_pack(char *buf, VALUE val)
 #define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
 
 VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_quad_unpack(buf, sign)
+    const char *buf;
+    int sign;
 {
     VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
 
@@ -381,7 +337,7 @@ rb_quad_unpack(const char *buf, int sign)
 	long len = QUAD_SIZE;
 	char *tmp = (char*)BDIGITS(big);
 
-	RBIGNUM_SET_SIGN(big, 0);
+	RBIGNUM(big)->sign = 0;
 	while (len--) {
 	    *tmp = ~*tmp;
 	    tmp++;
@@ -394,7 +350,10 @@ rb_quad_unpack(const char *buf, int sign)
 #endif
 
 VALUE
-rb_cstr_to_inum(const char *str, int base, int badcheck)
+rb_cstr_to_inum(str, base, badcheck)
+    const char *str;
+    int base;
+    int badcheck;
 {
     const char *s = str;
     char *end;
@@ -408,16 +367,21 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 
 #define conv_digit(c) \
     (!ISASCII(c) ? -1 : \
-     ISDIGIT(c) ? ((c) - '0') : \
-     ISLOWER(c) ? ((c) - 'a' + 10) : \
-     ISUPPER(c) ? ((c) - 'A' + 10) : \
+     isdigit(c) ? ((c) - '0') : \
+     islower(c) ? ((c) - 'a' + 10) : \
+     isupper(c) ? ((c) - 'A' + 10) : \
      -1)
 
     if (!str) {
 	if (badcheck) goto bad;
 	return INT2FIX(0);
     }
-    while (ISSPACE(*str)) str++;
+    if (badcheck) {
+	while (ISSPACE(*str)) str++;
+    }
+    else {
+	while (ISSPACE(*str) || *str == '_') str++;
+    }
 
     if (str[0] == '+') {
 	str++;
@@ -488,7 +452,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	break;
       default:
 	if (base < 2 || 36 < base) {
-	    rb_raise(rb_eArgError, "invalid radix %d", base);
+	    rb_raise(rb_eArgError, "illegal radix %d", base);
 	}
 	if (base <= 32) {
 	    len = 5;
@@ -498,7 +462,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	}
 	break;
     }
-    if (*str == '0') {		/* squeeze preceding 0s */
+    if (*str == '0') {		/* squeeze preceeding 0s */
 	int us = 0;
 	while ((c = *++str) == '0' || c == '_') {
 	    if (c == '_') {
@@ -517,10 +481,10 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
     }
     len *= strlen(str)*sizeof(char);
 
-    if (len <= (sizeof(long)*CHAR_BIT)) {
-	unsigned long val = STRTOUL(str, &end, base);
+    if (len <= (sizeof(VALUE)*CHAR_BIT)) {
+	unsigned long val = strtoul((char*)str, &end, base);
 
-	if (str < end && *end == '_') goto bigparse;
+	if (*end == '_') goto bigparse;
 	if (badcheck) {
 	    if (end == str) goto bad; /* no number */
 	    while (*end && ISSPACE(*end)) end++;
@@ -536,7 +500,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM_SET_SIGN(big, sign);
+	    RBIGNUM(big)->sign = sign;
 	    return bignorm(big);
 	}
     }
@@ -590,7 +554,10 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 }
 
 VALUE
-rb_str_to_inum(VALUE str, int base, int badcheck)
+rb_str_to_inum(str, base, badcheck)
+    VALUE str;
+    int base;
+    int badcheck;
 {
     char *s;
     long len;
@@ -600,10 +567,10 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
 	s = StringValueCStr(str);
     }
     else {
-	s = RSTRING_PTR(str);
+	s = RSTRING(str)->ptr;
     }
     if (s) {
-	len = RSTRING_LEN(str);
+	len = RSTRING(str)->len;
 	if (s[len]) {		/* no sentinel somehow */
 	    char *p = ALLOCA_N(char, len+1);
 
@@ -617,8 +584,9 @@ rb_str_to_inum(VALUE str, int base, int badcheck)
 
 #if HAVE_LONG_LONG
 
-static VALUE
-rb_ull2big(unsigned LONG_LONG n)
+VALUE
+rb_ull2big(n)
+    unsigned LONG_LONG n;
 {
     BDIGIT_DBL num = n;
     long i = 0;
@@ -634,12 +602,13 @@ rb_ull2big(unsigned LONG_LONG n)
 
     i = DIGSPERLL;
     while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    RBIGNUM(big)->len = i+1;
     return big;
 }
 
-static VALUE
-rb_ll2big(LONG_LONG n)
+VALUE
+rb_ll2big(n)
+    LONG_LONG n;
 {
     long neg = 0;
     VALUE big;
@@ -650,20 +619,22 @@ rb_ll2big(LONG_LONG n)
     }
     big = rb_ull2big(n);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	RBIGNUM(big)->sign = 0;
     }
     return big;
 }
 
 VALUE
-rb_ull2inum(unsigned LONG_LONG n)
+rb_ull2inum(n)
+    unsigned LONG_LONG n;
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_ull2big(n);
 }
 
 VALUE
-rb_ll2inum(LONG_LONG n)
+rb_ll2inum(n)
+    LONG_LONG n;
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_ll2big(n);
@@ -672,199 +643,90 @@ rb_ll2inum(LONG_LONG n)
 #endif  /* HAVE_LONG_LONG */
 
 VALUE
-rb_cstr2inum(const char *str, int base)
+rb_cstr2inum(str, base)
+    const char *str;
+    int base;
 {
     return rb_cstr_to_inum(str, base, base==0);
 }
 
 VALUE
-rb_str2inum(VALUE str, int base)
+rb_str2inum(str, base)
+    VALUE str;
+    int base;
 {
     return rb_str_to_inum(str, base, base==0);
 }
 
 const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-static VALUE bigsqr(VALUE x);
-static void bigdivmod(VALUE x, VALUE y, VALUE *divp, VALUE *modp);
-
-#define POW2_P(x) (((x)&((x)-1))==0)
-
-static inline int
-ones(register unsigned long x)
-{
-#if SIZEOF_LONG == 8
-# define MASK_55 0x5555555555555555UL
-# define MASK_33 0x3333333333333333UL
-# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
-#else
-# define MASK_55 0x55555555UL
-# define MASK_33 0x33333333UL
-# define MASK_0f 0x0f0f0f0fUL
-#endif
-    x -= (x >> 1) & MASK_55;
-    x = ((x >> 2) & MASK_33) + (x & MASK_33);
-    x = ((x >> 4) + x) & MASK_0f;
-    x += (x >> 8);
-    x += (x >> 16);
-#if SIZEOF_LONG == 8
-    x += (x >> 32);
-#endif
-    return (int)(x & 0x7f);
-#undef MASK_0f
-#undef MASK_33
-#undef MASK_55
-}
-
-static inline unsigned long
-next_pow2(register unsigned long x)
-{
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return x + 1;
-}
-
-static inline int
-floor_log2(register unsigned long x)
-{
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return (int)ones(x) - 1;
-}
-
-static inline int
-ceil_log2(register unsigned long x)
-{
-    return floor_log2(x) + !POW2_P(x);
-}
-
-#define LOG2_KARATSUBA_DIGITS 7
-#define KARATSUBA_DIGITS (1L<<LOG2_KARATSUBA_DIGITS)
-#define MAX_BIG2STR_TABLE_ENTRIES 64
-
-static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES];
-
-static void
-power_cache_init(void)
-{
-    int i, j;
-    for (i = 0; i < 35; ++i) {
-	for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) {
-	    big2str_power_cache[i][j] = Qnil;
-	}
-    }
-}
-
-static inline VALUE
-power_cache_get_power0(int base, int i)
-{
-    if (NIL_P(big2str_power_cache[base - 2][i])) {
-	big2str_power_cache[base - 2][i] =
-	    i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS))
-		   : bigsqr(power_cache_get_power0(base, i - 1));
-	rb_global_variable(&big2str_power_cache[base - 2][i]);
-    }
-    return big2str_power_cache[base - 2][i];
-}
-
-static VALUE
-power_cache_get_power(int base, long n1, long* m1)
+VALUE
+rb_big2str0(x, base, trim)
+    VALUE x;
+    int base;
+    int trim;
 {
-    long i, j, m;
-    VALUE t;
-
-    if (n1 <= KARATSUBA_DIGITS)
-	rb_bug("n1 > KARATSUBA_DIGITS");
-
-    m = ceil_log2(n1);
-    if (m1) *m1 = 1 << m;
-    i = m - LOG2_KARATSUBA_DIGITS;
-    if (i >= MAX_BIG2STR_TABLE_ENTRIES)
-	i = MAX_BIG2STR_TABLE_ENTRIES - 1;
-    t = power_cache_get_power0(base, i);
-
-    j = KARATSUBA_DIGITS*(1 << i);
-    while (n1 > j) {
-	t = bigsqr(t);
-	j *= 2;
-    }
-    return t;
-}
-
-/* big2str_muraken_find_n1
- *
- * Let a natural number x is given by:
- * x = 2^0 * x_0 + 2^1 * x_1 + ... + 2^(B*n_0 - 1) * x_{B*n_0 - 1},
- * where B is BITSPERDIG (i.e. BDIGITS*CHAR_BIT) and n_0 is
- * RBIGNUM_LEN(x).
- *
- * Now, we assume n_1 = min_n \{ n | 2^(B*n_0/2) <= b_1^(n_1) \}, so
- * it is realized that 2^(B*n_0) <= {b_1}^{2*n_1}, where b_1 is a
- * given radix number. And then, we have n_1 <= (B*n_0) /
- * (2*log_2(b_1)), therefore n_1 is given by ceil((B*n_0) /
- * (2*log_2(b_1))).
- */
-static long
-big2str_find_n1(VALUE x, int base)
-{
-    static const double log_2[] = {
-	1.0,              1.58496250072116, 2.0,
-	2.32192809488736, 2.58496250072116, 2.8073549220576,
-	3.0,              3.16992500144231, 3.32192809488736,
-	3.4594316186373,  3.58496250072116, 3.70043971814109,
-	3.8073549220576,  3.90689059560852, 4.0,
-	4.08746284125034, 4.16992500144231, 4.24792751344359,
-	4.32192809488736, 4.39231742277876, 4.4594316186373,
-	4.52356195605701, 4.58496250072116, 4.64385618977472,
-	4.70043971814109, 4.75488750216347, 4.8073549220576,
-	4.85798099512757, 4.90689059560852, 4.95419631038688,
-	5.0,              5.04439411935845, 5.08746284125034,
-	5.12928301694497, 5.16992500144231
-    };
-    long bits;
-
-    if (base < 2 || 36 < base)
-	rb_bug("invalid radix %d", base);
+    volatile VALUE t;
+    BDIGIT *ds;
+    long i, j, hbase;
+    VALUE ss;
+    char *s;
 
     if (FIXNUM_P(x)) {
-	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
+	return rb_fix2str(x, base);
     }
-    else if (BIGZEROP(x)) {
-	return 0;
+    i = RBIGNUM(x)->len;
+    if (BIGZEROP(x)) {
+	return rb_str_new2("0");
     }
-    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
+    if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
     }
-    else {
-	bits = BITSPERDIG*RBIGNUM_LEN(x);
+    j = SIZEOF_BDIGITS*CHAR_BIT*i;
+    switch (base) {
+      case 2: break;
+      case 3:
+	j = j * 53L / 84 + 1;
+	break;
+      case 4: case 5: case 6: case 7:
+	j = (j + 1) / 2;
+	break;
+      case 8: case 9:
+	j = (j + 2) / 3;
+	break;
+      case 10: case 11: case 12: case 13: case 14: case 15:
+	j = j * 28L / 93 + 1;
+	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 = (j + 3) / 4;
+	break;
+      case 32: case 33: case 34: case 35: case 36:
+	j = (j + 4) / 5;
+	break;
+      default:
+	rb_raise(rb_eArgError, "illegal radix %d", base);
+	break;
     }
+    j++;			/* space for sign */
 
-    return (long)ceil(bits/log_2[base - 2]);
-}
+    hbase = base * base;
+#if SIZEOF_BDIGITS > 2
+    hbase *= hbase;
+#endif
 
-static long
-big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
-{
-    long i = RBIGNUM_LEN(x), j = len;
-    BDIGIT* ds = BDIGITS(x);
+    t = rb_big_clone(x);
+    ds = BDIGITS(t);
+    ss = rb_str_new(0, j+1);
+    s = RSTRING(ss)->ptr;
 
-    while (i && j > 0) {
+    s[0] = RBIGNUM(x)->sign ? '+' : '-';
+    TRAP_BEG;
+    while (i && j > 1) {
 	long k = i;
 	BDIGIT_DBL num = 0;
 
-	while (k--) {               /* x / hbase */
+	while (k--) {
 	    num = BIGUP(num) + ds[k];
 	    ds[k] = (BDIGIT)(num / hbase);
 	    num %= hbase;
@@ -872,105 +734,24 @@ big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
 	if (trim && ds[i-1] == 0) i--;
 	k = SIZEOF_BDIGITS;
 	while (k--) {
-	    ptr[--j] = ruby_digitmap[num % base];
+	    s[--j] = ruby_digitmap[num % base];
 	    num /= base;
-	    if (j <= 0) break;
+	    if (!trim && j <= 1) break;
 	    if (trim && i == 0 && num == 0) break;
 	}
     }
-    if (trim) {
-	while (j < len && ptr[j] == '0') j++;
-	MEMMOVE(ptr, ptr + j, char, len - j);
-	len -= j;
-    }
-    return len;
-}
-
-static long
-big2str_karatsuba(VALUE x, int base, char* ptr,
-		  long n1, long len, long hbase, int trim)
-{
-    long lh, ll, m1;
-    VALUE b, q, r;
-
-    if (FIXNUM_P(x)) {
-	VALUE str = rb_fix2str(x, base);
-	char* str_ptr = RSTRING_PTR(str);
-	long str_len = RSTRING_LEN(str);
-	if (trim) {
-	    if (FIX2INT(x) == 0) return 0;
-	    MEMCPY(ptr, str_ptr, char, str_len);
-	    return str_len;
-	}
-	else {
-	    memset(ptr, '0', len - str_len);
-	    MEMCPY(ptr + len - str_len, str_ptr, char, str_len);
-	    return len;
-	}
-    }
-    if (BIGZEROP(x)) {
-	if (trim) return 0;
-	else {
-	    memset(ptr, '0', len);
-	    return len;
-	}
-    }
-
-    if (n1 <= KARATSUBA_DIGITS) {
-	return big2str_orig(x, base, ptr, len, hbase, trim);
-    }
-
-    b = power_cache_get_power(base, n1, &m1);
-    bigdivmod(x, b, &q, &r);
-    lh = big2str_karatsuba(q, base, ptr,      (len - m1)/2,
-			   len - m1, hbase, trim);
-    ll = big2str_karatsuba(r, base, ptr + lh, m1/2,
-			   m1,       hbase, !lh && trim);
-
-    return lh + ll;
-}
-
-VALUE
-rb_big2str0(VALUE x, int base, int trim)
-{
-    int off;
-    VALUE ss, xx;
-    long n1, n2, len, hbase;
-    char* ptr;
-
-    if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
-    }
-    if (BIGZEROP(x)) {
-	return rb_usascii_str_new2("0");
-    }
-
-    if (base < 2 || 36 < base)
-	rb_raise(rb_eArgError, "invalid radix %d", base);
-
-    n2 = big2str_find_n1(x, base);
-    n1 = (n2 + 1) / 2;
-    ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */
-    ptr = RSTRING_PTR(ss);
-    ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-';
-
-    hbase = base*base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
-    off = !(trim && RBIGNUM_SIGN(x)); /* erase plus sign if trim */
-    xx = rb_big_clone(x);
-    RBIGNUM_SET_SIGN(xx, 1);
-    if (n1 <= KARATSUBA_DIGITS) {
-	len = off + big2str_orig(xx, base, ptr + off, n2, hbase, trim);
+    if (trim) {while (s[j] == '0') j++;}
+    i = RSTRING(ss)->len - j;
+    if (RBIGNUM(x)->sign) {
+	memmove(s, s+j, i);
+	RSTRING(ss)->len = i-1;
     }
     else {
-	len = off + big2str_karatsuba(xx, base, ptr + off, n1,
-				      n2, hbase, trim);
+	memmove(s+1, s+j, i);
+	RSTRING(ss)->len = i;
     }
-
-    ptr[len] = '\0';
-    rb_str_resize(ss, len);
+    s[RSTRING(ss)->len] = '\0';
+    TRAP_END;
 
     return ss;
 }
@@ -978,7 +759,7 @@ rb_big2str0(VALUE x, int base, int trim)
 VALUE
 rb_big2str(VALUE x, int base)
 {
-    return rb_big2str0(x, base, 1);
+    return rb_big2str0(x, base, Qtrue);
 }
 
 /*
@@ -996,32 +777,31 @@ rb_big2str(VALUE x, int base)
  */
 
 static VALUE
-rb_big_to_s(int argc, VALUE *argv, VALUE x)
+rb_big_to_s(argc, argv, x)
+    int argc;
+    VALUE *argv;
+    VALUE x;
 {
+    VALUE b;
     int base;
 
+    rb_scan_args(argc, argv, "01", &b);
     if (argc == 0) base = 10;
-    else {
-	VALUE b;
-
-	rb_scan_args(argc, argv, "01", &b);
-	base = NUM2INT(b);
-    }
+    else base = NUM2INT(b);
     return rb_big2str(x, base);
 }
 
-static VALUE
-big2ulong(VALUE x, const char *type, int check)
+static unsigned long
+big2ulong(x, type)
+    VALUE x;
+    char *type;
 {
-    long len = RBIGNUM_LEN(x);
+    long len = RBIGNUM(x)->len;
     BDIGIT_DBL num;
     BDIGIT *ds;
 
-    if (len > DIGSPERLONG) {
-	if (check)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-	len = DIGSPERLONG;
-    }
+    if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
+	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
     ds = BDIGITS(x);
     num = 0;
     while (len--) {
@@ -1031,23 +811,25 @@ big2ulong(VALUE x, const char *type, int check)
     return num;
 }
 
-VALUE
-rb_big2ulong_pack(VALUE x)
+unsigned long
+rb_big2ulong_pack(x)
+    VALUE x;
 {
-    VALUE num = big2ulong(x, "unsigned long", Qfalse);
-    if (!RBIGNUM_SIGN(x)) {
+    unsigned long num = big2ulong(x, "unsigned long");
+    if (!RBIGNUM(x)->sign) {
 	return -num;
     }
     return num;
 }
 
-VALUE
-rb_big2ulong(VALUE x)
+unsigned long
+rb_big2ulong(x)
+    VALUE x;
 {
-    VALUE num = big2ulong(x, "unsigned long", Qtrue);
+    unsigned long num = big2ulong(x, "unsigned long");
 
-    if (!RBIGNUM_SIGN(x)) {
-	if ((SIGNED_VALUE)num < 0) {
+    if (!RBIGNUM(x)->sign) {
+	if ((long)num < 0) {
 	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 	}
 	return -num;
@@ -1055,25 +837,27 @@ rb_big2ulong(VALUE x)
     return num;
 }
 
-SIGNED_VALUE
-rb_big2long(VALUE x)
+long
+rb_big2long(x)
+    VALUE x;
 {
-    VALUE num = big2ulong(x, "long", Qtrue);
+    unsigned long num = big2ulong(x, "long");
 
-    if ((SIGNED_VALUE)num < 0 &&
-	(RBIGNUM_SIGN(x) || (SIGNED_VALUE)num != LONG_MIN)) {
+    if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
     }
-    if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
+    if (!RBIGNUM(x)->sign) return -(long)num;
     return num;
 }
 
 #if HAVE_LONG_LONG
 
 static unsigned LONG_LONG
-big2ull(VALUE x, const char *type)
+big2ull(x, type)
+    VALUE x;
+    char *type;
 {
-    long len = RBIGNUM_LEN(x);
+    long len = RBIGNUM(x)->len;
     BDIGIT_DBL num;
     BDIGIT *ds;
 
@@ -1089,31 +873,34 @@ big2ull(VALUE x, const char *type)
 }
 
 unsigned LONG_LONG
-rb_big2ull(VALUE x)
+rb_big2ull(x)
+    VALUE x;
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (!RBIGNUM_SIGN(x)) return -num;
+    if (!RBIGNUM(x)->sign) return -num;
     return num;
 }
 
 LONG_LONG
-rb_big2ll(VALUE x)
+rb_big2ll(x)
+    VALUE x;
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
+    if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
 			       || (LONG_LONG)num != LLONG_MIN)) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
     }
-    if (!RBIGNUM_SIGN(x)) return -(LONG_LONG)num;
+    if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
     return num;
 }
 
 #endif  /* HAVE_LONG_LONG */
 
 static VALUE
-dbl2big(double d)
+dbl2big(d)
+    double d;
 {
     long i = 0;
     BDIGIT c;
@@ -1145,81 +932,35 @@ dbl2big(double d)
 }
 
 VALUE
-rb_dbl2big(double d)
+rb_dbl2big(d)
+    double d;
 {
     return bignorm(dbl2big(d));
 }
 
-static int
-nlz(BDIGIT x)
-{
-    BDIGIT y;
-    int n = BITSPERDIG;
-#if BITSPERDIG > 64
-    y = x >> 64; if (y) {n -= 64; x = y;}
-#endif
-#if BITSPERDIG > 32
-    y = x >> 32; if (y) {n -= 32; x = y;}
-#endif
-#if BITSPERDIG > 16
-    y = x >> 16; if (y) {n -= 16; x = y;}
-#endif
-    y = x >>  8; if (y) {n -=  8; x = y;}
-    y = x >>  4; if (y) {n -=  4; x = y;}
-    y = x >>  2; if (y) {n -=  2; x = y;}
-    y = x >>  1; if (y) {return n - 2;}
-    return n - x;
-}
-
 static double
-big2dbl(VALUE x)
+big2dbl(x)
+    VALUE x;
 {
     double d = 0.0;
-    long i = RBIGNUM_LEN(x), lo = 0, bits;
-    BDIGIT *ds = BDIGITS(x), dl;
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(x);
 
-    if (i) {
-	bits = i * BITSPERDIG - nlz(ds[i-1]);
-	if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
-	    d = HUGE_VAL;
-	}
-	else {
-	    if (bits > DBL_MANT_DIG+1)
-		lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
-	    else
-		bits = 0;
-	    while (--i > lo) {
-		d = ds[i] + BIGRAD*d;
-	    }
-	    dl = ds[i];
-	    if (bits && (dl & (1UL << (bits %= BITSPERDIG)))) {
-		int carry = dl & ~(~0UL << bits);
-		if (!carry) {
-		    while (i-- > 0) {
-			if ((carry = ds[i]) != 0) break;
-		    }
-		}
-		if (carry) {
-		    dl &= ~0UL << bits;
-		    dl += 1UL << bits;
-		    if (!dl) d += 1;
-		}
-	    }
-	    d = dl + BIGRAD*d;
-	    if (lo) d = ldexp(d, lo * BITSPERDIG);
-	}
+    while (i--) {
+	d = ds[i] + BIGRAD*d;
     }
-    if (!RBIGNUM_SIGN(x)) d = -d;
+    if (!RBIGNUM(x)->sign) d = -d;
     return d;
 }
 
 double
-rb_big2dbl(VALUE x)
+rb_big2dbl(x)
+    VALUE x;
 {
     double d = big2dbl(x);
 
     if (isinf(d)) {
-	rb_warning("Bignum out of Float range");
+	rb_warn("Bignum out of Float range");
 	d = HUGE_VAL;
     }
     return d;
@@ -1235,9 +976,10 @@ rb_big2dbl(VALUE x)
  */
 
 static VALUE
-rb_big_to_f(VALUE x)
+rb_big_to_f(x)
+    VALUE x;
 {
-    return DOUBLE2NUM(rb_big2dbl(x));
+    return rb_float_new(rb_big2dbl(x));
 }
 
 /*
@@ -1250,10 +992,11 @@ rb_big_to_f(VALUE x)
  *
  */
 
-VALUE
-rb_big_cmp(VALUE x, VALUE y)
+static VALUE
+rb_big_cmp(x, y)
+    VALUE x, y;
 {
-    long xlen = RBIGNUM_LEN(x);
+    long xlen = RBIGNUM(x)->len;
 
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -1264,24 +1007,24 @@ rb_big_cmp(VALUE x, VALUE y)
 	break;
 
       case T_FLOAT:
-	return rb_dbl_cmp(rb_big2dbl(x), RFLOAT_VALUE(y));
+	return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
 
       default:
-	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
+	return rb_num_coerce_cmp(x, y);
     }
 
-    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
-    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
-    if (xlen < RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(-1) : INT2FIX(1);
-    if (xlen > RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(1) : INT2FIX(-1);
+    if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
+    if (RBIGNUM(x)->sign < RBIGNUM(y)->sign) return INT2FIX(-1);
+    if (xlen < RBIGNUM(y)->len)
+	return (RBIGNUM(x)->sign) ? INT2FIX(-1) : INT2FIX(1);
+    if (xlen > RBIGNUM(y)->len)
+	return (RBIGNUM(x)->sign) ? INT2FIX(1) : INT2FIX(-1);
 
     while(xlen-- && (BDIGITS(x)[xlen]==BDIGITS(y)[xlen]));
     if (-1 == xlen) return INT2FIX(0);
     return (BDIGITS(x)[xlen] > BDIGITS(y)[xlen]) ?
-	(RBIGNUM_SIGN(x) ? INT2FIX(1) : INT2FIX(-1)) :
-	    (RBIGNUM_SIGN(x) ? INT2FIX(-1) : INT2FIX(1));
+	(RBIGNUM(x)->sign ? INT2FIX(1) : INT2FIX(-1)) :
+	    (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
 }
 
 /*
@@ -1295,8 +1038,9 @@ rb_big_cmp(VALUE x, VALUE y)
  *     68719476736 == 68719476736.0   #=> true
  */
 
-VALUE
-rb_big_eq(VALUE x, VALUE y)
+static VALUE
+rb_big_eq(x, y)
+    VALUE x, y;
 {
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -1305,10 +1049,10 @@ rb_big_eq(VALUE x, VALUE y)
       case T_BIGNUM:
 	break;
       case T_FLOAT:
-	{
+        {
 	    volatile double a, b;
 
-	    a = RFLOAT_VALUE(y);
+	    a = RFLOAT(y)->value;
 	    if (isnan(a)) return Qfalse;
 	    b = rb_big2dbl(x);
 	    return (a == b)?Qtrue:Qfalse;
@@ -1316,9 +1060,9 @@ rb_big_eq(VALUE x, VALUE y)
       default:
 	return rb_equal(y, x);
     }
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1334,12 +1078,13 @@ rb_big_eq(VALUE x, VALUE y)
  */
 
 static VALUE
-rb_big_eql(VALUE x, VALUE y)
+rb_big_eql(x, y)
+    VALUE x, y;
 {
     if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
+    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
     return Qtrue;
 }
 
@@ -1351,11 +1096,12 @@ rb_big_eql(VALUE x, VALUE y)
  */
 
 static VALUE
-rb_big_uminus(VALUE x)
+rb_big_uminus(x)
+    VALUE x;
 {
     VALUE z = rb_big_clone(x);
 
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+    RBIGNUM(z)->sign = !RBIGNUM(x)->sign;
 
     return bignorm(z);
 }
@@ -1373,38 +1119,38 @@ rb_big_uminus(VALUE x)
  */
 
 static VALUE
-rb_big_neg(VALUE x)
+rb_big_neg(x)
+    VALUE x;
 {
     VALUE z = rb_big_clone(x);
-    BDIGIT *ds;
     long i;
+    BDIGIT *ds;
 
-    if (!RBIGNUM_SIGN(x)) get2comp(z);
+    if (!RBIGNUM(x)->sign) get2comp(z);
     ds = BDIGITS(z);
-    i = RBIGNUM_LEN(x);
-    if (!i) return INT2FIX(~(SIGNED_VALUE)0);
-    while (i--) {
-	ds[i] = ~ds[i];
-    }
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(z));
-    if (RBIGNUM_SIGN(x)) get2comp(z);
+    i = RBIGNUM(x)->len;
+    if (!i) return INT2FIX(~0);
+    while (i--) ds[i] = ~ds[i];
+    RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
+    if (RBIGNUM(x)->sign) get2comp(z);
 
     return bignorm(z);
 }
 
 static VALUE
-bigsub(VALUE x, VALUE y)
+bigsub(x, y)
+    VALUE x, y;
 {
     VALUE z = 0;
     BDIGIT *zds;
     BDIGIT_DBL_SIGNED num;
-    long i = RBIGNUM_LEN(x);
+    long i = RBIGNUM(x)->len;
 
     /* if x is larger than y, swap */
-    if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
+    if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
 	z = x; x = y; y = z;	/* swap x y */
     }
-    else if (RBIGNUM_LEN(x) == RBIGNUM_LEN(y)) {
+    else if (RBIGNUM(x)->len == RBIGNUM(y)->len) {
 	while (i > 0) {
 	    i--;
 	    if (BDIGITS(x)[i] > BDIGITS(y)[i]) {
@@ -1417,20 +1163,20 @@ bigsub(VALUE x, VALUE y)
 	}
     }
 
-    z = bignew(RBIGNUM_LEN(x), z==0);
+    z = bignew(RBIGNUM(x)->len, z==0);
     zds = BDIGITS(z);
 
-    for (i = 0, num = 0; i < RBIGNUM_LEN(y); i++) {
+    for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) {
 	num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (num && i < RBIGNUM_LEN(x)) {
+    while (num && i < RBIGNUM(x)->len) {
 	num += BDIGITS(x)[i];
 	zds[i++] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < RBIGNUM_LEN(x)) {
+    while (i < RBIGNUM(x)->len) {
 	zds[i] = BDIGITS(x)[i];
 	i++;
     }
@@ -1439,34 +1185,36 @@ bigsub(VALUE x, VALUE y)
 }
 
 static VALUE
-bigadd(VALUE x, VALUE y, int sign)
+bigadd(x, y, sign)
+    VALUE x, y;
+    int sign;
 {
     VALUE z;
     BDIGIT_DBL num;
     long i, len;
 
-    sign = (sign == RBIGNUM_SIGN(y));
-    if (RBIGNUM_SIGN(x) != sign) {
+    sign = (sign == RBIGNUM(y)->sign);
+    if (RBIGNUM(x)->sign != sign) {
 	if (sign) return bigsub(y, x);
 	return bigsub(x, y);
     }
 
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	len = RBIGNUM_LEN(x) + 1;
-	z = x; x = y; y = z;
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	len = RBIGNUM(x)->len + 1;
+        z = x; x = y; y = z;
     }
     else {
-	len = RBIGNUM_LEN(y) + 1;
+	len = RBIGNUM(y)->len + 1;
     }
     z = bignew(len, sign);
 
-    len = RBIGNUM_LEN(x);
+    len = RBIGNUM(x)->len;
     for (i = 0, num = 0; i < len; i++) {
 	num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
 	BDIGITS(z)[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    len = RBIGNUM_LEN(y);
+    len = RBIGNUM(y)->len;
     while (num && i < len) {
 	num += BDIGITS(y)[i];
 	BDIGITS(z)[i++] = BIGLO(num);
@@ -1489,7 +1237,8 @@ bigadd(VALUE x, VALUE y, int sign)
  */
 
 VALUE
-rb_big_plus(VALUE x, VALUE y)
+rb_big_plus(x, y)
+    VALUE x, y;
 {
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -1499,10 +1248,10 @@ rb_big_plus(VALUE x, VALUE y)
 	return bignorm(bigadd(x, y, 1));
 
       case T_FLOAT:
-	return DOUBLE2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
+	return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
 
       default:
-	return rb_num_coerce_bin(x, y, '+');
+	return rb_num_coerce_bin(x, y);
     }
 }
 
@@ -1514,7 +1263,8 @@ rb_big_plus(VALUE x, VALUE y)
  */
 
 VALUE
-rb_big_minus(VALUE x, VALUE y)
+rb_big_minus(x, y)
+    VALUE x, y;
 {
     switch (TYPE(y)) {
       case T_FIXNUM:
@@ -1524,61 +1274,23 @@ rb_big_minus(VALUE x, VALUE y)
 	return bignorm(bigadd(x, y, 0));
 
       case T_FLOAT:
-	return DOUBLE2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
+	return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
 
       default:
-	return rb_num_coerce_bin(x, y, '-');
+	return rb_num_coerce_bin(x, y);
     }
 }
 
-static void
-rb_big_stop(void *ptr)
-{
-    VALUE *stop = (VALUE*)ptr;
-    *stop = Qtrue;
-}
-
-struct big_mul_struct {
-    VALUE x, y, z, stop;
-};
-
-static VALUE
-bigmul1(void *ptr)
+VALUE
+rb_big_mul0(x, y)
+    VALUE x, y;
 {
-    struct big_mul_struct *bms = (struct big_mul_struct*)ptr;
     long i, j;
     BDIGIT_DBL n = 0;
-    VALUE x = bms->x, y = bms->y, z = bms->z;
+    VALUE z;
     BDIGIT *zds;
 
-    j = RBIGNUM_LEN(x) + RBIGNUM_LEN(y) + 1;
-    zds = BDIGITS(z);
-    while (j--) zds[j] = 0;
-    for (i = 0; i < RBIGNUM_LEN(x); i++) {
-	BDIGIT_DBL dd;
-	if (bms->stop) return Qnil;
-	dd = BDIGITS(x)[i];
-	if (dd == 0) continue;
-	n = 0;
-	for (j = 0; j < RBIGNUM_LEN(y); j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
-	    n = zds[i + j] + ee;
-	    if (ee) zds[i + j] = BIGLO(n);
-	    n = BIGDN(n);
-	}
-	if (n) {
-	    zds[i + j] = n;
-	}
-    }
-    return z;
-}
-
-static VALUE
-rb_big_mul0(VALUE x, VALUE y)
-{
-    struct big_mul_struct bms;
-    volatile VALUE z;
-
+    if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
     switch (TYPE(y)) {
       case T_FIXNUM:
 	y = rb_int2big(FIX2LONG(y));
@@ -1588,22 +1300,29 @@ rb_big_mul0(VALUE x, VALUE y)
 	break;
 
       case T_FLOAT:
-	return DOUBLE2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
+	return rb_float_new(rb_big2dbl(x) * RFLOAT(y)->value);
 
       default:
-	return rb_num_coerce_bin(x, y, '*');
+	return rb_num_coerce_bin(x, y);
     }
 
-    bms.x = x;
-    bms.y = y;
-    bms.z = bignew(RBIGNUM_LEN(x) + RBIGNUM_LEN(y) + 1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    bms.stop = Qfalse;
-
-    if (RBIGNUM_LEN(x) + RBIGNUM_LEN(y) > 10000) {
-	z = rb_thread_blocking_region(bigmul1, &bms, rb_big_stop, &bms.stop);
-    }
-    else {
-	z = bigmul1(&bms);
+    j = RBIGNUM(x)->len + RBIGNUM(y)->len + 1;
+    z = bignew(j, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+    zds = BDIGITS(z);
+    while (j--) zds[j] = 0;
+    for (i = 0; i < RBIGNUM(x)->len; i++) {
+	BDIGIT_DBL dd = BDIGITS(x)[i];
+	if (dd == 0) continue;
+	n = 0;
+	for (j = 0; j < RBIGNUM(y)->len; j++) {
+	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
+	    n = zds[i + j] + ee;
+	    if (ee) zds[i + j] = BIGLO(n);
+	    n = BIGDN(n);
+	}
+	if (n) {
+	    zds[i + j] = n;
+	}
     }
 
     return z;
@@ -1617,70 +1336,23 @@ rb_big_mul0(VALUE x, VALUE y)
  */
 
 VALUE
-rb_big_mul(VALUE x, VALUE y)
+rb_big_mul(x, y)
+    VALUE x, y;
 {
     return bignorm(rb_big_mul0(x, y));
 }
 
-struct big_div_struct {
-    long nx, ny;
-    BDIGIT *yds, *zds;
-    VALUE stop;
-};
-
-static VALUE
-bigdivrem1(void *ptr)
-{
-    struct big_div_struct *bds = (struct big_div_struct*)ptr;
-    long nx = bds->nx, ny = bds->ny;
-    long i, j;
-    BDIGIT *yds = bds->yds, *zds = bds->zds;
-    BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
-    BDIGIT q;
-
-    j = nx==ny?nx+1:nx;
-    do {
-	if (bds->stop) return Qnil;
-	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
-	if (q) {
-	    i = 0; num = 0; t2 = 0;
-	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
-		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		if (ee) zds[j - ny + i] = BIGLO(num);
-		num = BIGDN(num);
-		t2 = BIGDN(t2);
-	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
-	    while (num) {		/* "add back" required */
-		i = 0; num = 0; q--;
-		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		    if (ee) zds[j - ny + i] = BIGLO(num);
-		    num = BIGDN(num);
-		} while (++i < ny);
-		num--;
-	    }
-	}
-	zds[j] = q;
-    } while (--j >= ny);
-    return Qnil;
-}
-
-static VALUE
-bigdivrem(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
+static void
+bigdivrem(x, y, divp, modp)
+    VALUE x, y;
+    VALUE *divp, *modp;
 {
-    struct big_div_struct bds;
-    long nx = RBIGNUM_LEN(x), ny = RBIGNUM_LEN(y);
+    long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
     long i, j;
-    volatile VALUE yy, z;
+    VALUE yy, z;
     BDIGIT *xds, *yds, *zds, *tds;
     BDIGIT_DBL t2;
+    BDIGIT_DBL_SIGNED num;
     BDIGIT dd, q;
 
     if (BIGZEROP(y)) rb_num_zerodiv();
@@ -1688,7 +1360,7 @@ bigdivrem(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
     if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
 	if (divp) *divp = rb_int2big(0);
 	if (modp) *modp = x;
-	return Qnil;
+	return;
     }
     xds = BDIGITS(x);
     if (ny == 1) {
@@ -1701,23 +1373,23 @@ bigdivrem(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
 	    zds[i] = (BDIGIT)(t2 / dd);
 	    t2 %= dd;
 	}
-	RBIGNUM_SET_SIGN(z, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+	RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
 	if (modp) {
-	    *modp = rb_uint2big((VALUE)t2);
-	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+	    *modp = rb_uint2big((unsigned long)t2);
+	    RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
 	}
 	if (divp) *divp = z;
-	return Qnil;
+	return;
     }
-    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
     zds = BDIGITS(z);
     if (nx==ny) zds[nx+1] = 0;
     while (!yds[ny-1]) ny--;
 
     dd = 0;
     q = yds[ny-1];
-    while ((q & (1UL<<(BITSPERDIG-1))) == 0) {
-	q <<= 1UL;
+    while ((q & (1U<<(BITSPERDIG-1))) == 0) {
+	q <<= 1;
 	dd++;
     }
     if (dd) {
@@ -1746,24 +1418,41 @@ bigdivrem(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
 	while (j--) zds[j] = xds[j];
     }
 
-    bds.nx = nx;
-    bds.ny = ny;
-    bds.zds = zds;
-    bds.yds = yds;
-    bds.stop = Qfalse;
-    if (RBIGNUM_LEN(x) > 10000 || RBIGNUM_LEN(y) > 10000) {
-	rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
-    }
-    else {
-	bigdivrem1(&bds);
-    }
-
+    j = nx==ny?nx+1:nx;
+    do {
+	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
+	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
+	if (q) {
+	    i = 0; num = 0; t2 = 0;
+	    do {			/* multiply and subtract */
+		BDIGIT_DBL ee;
+		t2 += (BDIGIT_DBL)yds[i] * q;
+		ee = num - BIGLO(t2);
+		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		if (ee) zds[j - ny + i] = BIGLO(num);
+		num = BIGDN(num);
+		t2 = BIGDN(t2);
+	    } while (++i < ny);
+	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
+	    while (num) {		/* "add back" required */
+		i = 0; num = 0; q--;
+		do {
+		    BDIGIT_DBL ee = num + yds[i];
+		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
+		    if (ee) zds[j - ny + i] = BIGLO(num);
+		    num = BIGDN(num);
+		} while (++i < ny);
+		num--;
+	    }
+	}
+	zds[j] = q;
+    } while (--j >= ny);
     if (divp) {			/* move quotient down in z */
 	*divp = rb_big_clone(z);
 	zds = BDIGITS(*divp);
 	j = (nx==ny ? nx+2 : nx+1) - ny;
 	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	RBIGNUM_SET_LEN(*divp, i);
+	RBIGNUM(*divp)->len = i;
     }
     if (modp) {			/* normalize remainder */
 	*modp = rb_big_clone(z);
@@ -1778,19 +1467,20 @@ bigdivrem(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
 		t2 = BIGUP(q);
 	    }
 	}
-	RBIGNUM_SET_LEN(*modp, ny);
-	RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+	RBIGNUM(*modp)->len = ny;
+	RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
     }
-    return z;
 }
 
 static void
-bigdivmod(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
+bigdivmod(x, y, divp, modp)
+    VALUE x, y;
+    VALUE *divp, *modp;
 {
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
+    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
@@ -1800,9 +1490,17 @@ bigdivmod(VALUE x, VALUE y, VALUE *divp, VALUE *modp)
     }
 }
 
+/*
+ *  call-seq:
+ *     big / other     => Numeric
+ *     big.div(other)  => Numeric
+ *
+ *  Divides big by other, returning the result.
+ */
 
 static VALUE
-rb_big_divide(VALUE x, VALUE y, ID op)
+rb_big_div(x, y)
+    VALUE x, y;
 {
     VALUE z;
 
@@ -1814,19 +1512,8 @@ rb_big_divide(VALUE x, VALUE y, ID op)
       case T_BIGNUM:
 	break;
 
-      case T_FLOAT:
-	{
-	    double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
-	    if (op == '/') {
-		return DOUBLE2NUM(div);
-	    }
-	    else {
-		return rb_dbl2big(div);
-	    }
-	}
-
       default:
-	return rb_num_coerce_bin(x, y, op);
+	return rb_num_coerce_bin(x, y);
     }
     bigdivmod(x, y, &z, 0);
 
@@ -1835,25 +1522,6 @@ rb_big_divide(VALUE x, VALUE y, ID op)
 
 /*
  *  call-seq:
- *     big / other     => Numeric
- *
- *  Divides big by other, returning the result.
- */
-
-VALUE
-rb_big_div(VALUE x, VALUE y)
-{
-  return rb_big_divide(x, y, '/');
-}
-
-VALUE
-rb_big_idiv(VALUE x, VALUE y)
-{
-  return rb_big_divide(x, y, rb_intern("div"));
-}
-
-/*
- *  call-seq:
  *     big % other         => Numeric
  *     big.modulo(other)   => Numeric
  *
@@ -1861,8 +1529,9 @@ rb_big_idiv(VALUE x, VALUE y)
  *  information.
  */
 
-VALUE
-rb_big_modulo(VALUE x, VALUE y)
+static VALUE
+rb_big_modulo(x, y)
+    VALUE x, y;
 {
     VALUE z;
 
@@ -1875,7 +1544,7 @@ rb_big_modulo(VALUE x, VALUE y)
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y, '%');
+	return rb_num_coerce_bin(x, y);
     }
     bigdivmod(x, y, 0, &z);
 
@@ -1892,7 +1561,8 @@ rb_big_modulo(VALUE x, VALUE y)
  *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
  */
 static VALUE
-rb_big_remainder(VALUE x, VALUE y)
+rb_big_remainder(x, y)
+    VALUE x, y;
 {
     VALUE z;
 
@@ -1905,41 +1575,13 @@ rb_big_remainder(VALUE x, VALUE y)
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
+	return rb_num_coerce_bin(x, y);
     }
     bigdivrem(x, y, 0, &z);
 
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big.divmod(numeric)   => array
- *
- *  See <code>Numeric#divmod</code>.
- *
- */
-VALUE
-rb_big_divmod(VALUE x, VALUE y)
-{
-    VALUE div, mod;
-
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
-    }
-    bigdivmod(x, y, &div, &mod);
-
-    return rb_assoc_new(bignorm(div), bignorm(mod));
-}
-
 static int
 bdigbitsize(BDIGIT x)
 {
@@ -1961,13 +1603,15 @@ bdigbitsize(BDIGIT x)
     return size;
 }
 
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
+static VALUE big_lshift _((VALUE, unsigned long));
+static VALUE big_rshift _((VALUE, unsigned long));
 
-static VALUE big_shift(VALUE x, int n)
+static VALUE big_shift(x, n)
+    VALUE x;
+    int n;
 {
     if (n < 0)
-	return big_lshift(x, (unsigned int)-n);
+	return big_lshift(x, (unsigned int)n);
     else if (n > 0)
 	return big_rshift(x, (unsigned int)n);
     return x;
@@ -1975,18 +1619,49 @@ static VALUE big_shift(VALUE x, int n)
 
 /*
  *  call-seq:
-  *     big.fdiv(numeric) -> float
+ *     big.divmod(numeric)   => array
+ *
+ *  See <code>Numeric#divmod</code>.
+ *
+ */
+VALUE
+rb_big_divmod(x, y)
+    VALUE x, y;
+{
+    VALUE div, mod;
+
+    switch (TYPE(y)) {
+      case T_FIXNUM:
+	y = rb_int2big(FIX2LONG(y));
+	break;
+
+      case T_BIGNUM:
+	break;
+
+      default:
+	return rb_num_coerce_bin(x, y);
+    }
+    bigdivmod(x, y, &div, &mod);
+
+    return rb_assoc_new(bignorm(div), bignorm(mod));
+}
+
+/*
+ *  call-seq:
+ *     big.quo(numeric) -> float
+ *     big.fdiv(numeric) -> float
  *
  *  Returns the floating point result of dividing <i>big</i> by
  *  <i>numeric</i>.
  *
- *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
- *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
+ *     -1234567890987654321.quo(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.quo(13731.24)   #=> -89909424858035.7
  *
  */
 
 static VALUE
-rb_big_fdiv(VALUE x, VALUE y)
+rb_big_quo(x, y)
+    VALUE x, y;
 {
     double dx = big2dbl(x);
     double dy;
@@ -1996,8 +1671,8 @@ rb_big_fdiv(VALUE x, VALUE y)
 	VALUE z;
 	int ex, ey;
 
-	ex = (RBIGNUM_LEN(bigtrunc(x)) - 1) * BITSPERDIG;
-	ex += bdigbitsize(BDIGITS(x)[RBIGNUM_LEN(x) - 1]);
+	ex = (RBIGNUM(bigtrunc(x))->len - 1) * BITSPERDIG;
+	ex += bdigbitsize(BDIGITS(x)[RBIGNUM(x)->len - 1]);
 	ex -= 2 * DBL_BIGDIG * BITSPERDIG;
 	if (ex) x = big_shift(x, ex);
 
@@ -2005,17 +1680,16 @@ rb_big_fdiv(VALUE x, VALUE y)
 	  case T_FIXNUM:
 	    y = rb_int2big(FIX2LONG(y));
 	  case T_BIGNUM: {
-	    ey = (RBIGNUM_LEN(bigtrunc(y)) - 1) * BITSPERDIG;
-	    ey += bdigbitsize(BDIGITS(y)[RBIGNUM_LEN(y) - 1]);
+	    ey = (RBIGNUM(bigtrunc(y))->len - 1) * BITSPERDIG;
+	    ey += bdigbitsize(BDIGITS(y)[RBIGNUM(y)->len - 1]);
 	    ey -= DBL_BIGDIG * BITSPERDIG;
 	    if (ey) y = big_shift(y, ey);
 	  bignum:
 	    bigdivrem(x, y, &z, 0);
-	    return DOUBLE2NUM(ldexp(big2dbl(z), ex - ey));
+	    return rb_float_new(ldexp(big2dbl(z), ex - ey));
 	  }
 	  case T_FLOAT:
-	    if (isnan(RFLOAT_VALUE(y))) return y;
-	    y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &ey), DBL_MANT_DIG));
+	    y = dbl2big(ldexp(frexp(RFLOAT(y)->value, &ey), DBL_MANT_DIG));
 	    ey -= DBL_MANT_DIG;
 	    goto bignum;
 	}
@@ -2030,24 +1704,25 @@ rb_big_fdiv(VALUE x, VALUE y)
 	break;
 
       case T_FLOAT:
-	dy = RFLOAT_VALUE(y);
+	dy = RFLOAT(y)->value;
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
+	return rb_num_coerce_bin(x, y);
     }
-    return DOUBLE2NUM(dx / dy);
+    return rb_float_new(dx / dy);
 }
 
 static VALUE
-bigsqr(VALUE x)
+bigsqr(x)
+    VALUE x;
 {
-    long len = RBIGNUM_LEN(x), k = len / 2, i;
+    long len = RBIGNUM(x)->len, k = len / 2, i;
     VALUE a, b, a2, z;
     BDIGIT_DBL num;
 
     if (len < 4000 / BITSPERDIG) {
-	return bigtrunc(rb_big_mul0(x, x));
+	return rb_big_mul0(x, x);
     }
 
     a = bignew(len - k, 1);
@@ -2057,30 +1732,28 @@ bigsqr(VALUE x)
 
     a2 = bigtrunc(bigsqr(a));
     z = bigsqr(b);
-    rb_big_realloc(z, (len = 2 * k + RBIGNUM_LEN(a2)) + 1);
-    while (RBIGNUM_LEN(z) < 2 * k) {
-	BDIGITS(z)[RBIGNUM_LEN(z)] = 0;
-	RBIGNUM_SET_LEN(z, RBIGNUM_LEN(z)+1);
-    }
-    MEMCPY(BDIGITS(z) + 2 * k, BDIGITS(a2), BDIGIT, RBIGNUM_LEN(a2));
-    RBIGNUM_SET_LEN(z, len);
+    REALLOC_N(RBIGNUM(z)->digits, BDIGIT, (len = 2 * k + RBIGNUM(a2)->len) + 1);
+    while (RBIGNUM(z)->len < 2 * k) BDIGITS(z)[RBIGNUM(z)->len++] = 0;
+    MEMCPY(BDIGITS(z) + 2 * k, BDIGITS(a2), BDIGIT, RBIGNUM(a2)->len);
+    RBIGNUM(z)->len = len;
     a2 = bigtrunc(rb_big_mul0(a, b));
-    len = RBIGNUM_LEN(a2);
+    len = RBIGNUM(a2)->len;
+    TRAP_BEG;
     for (i = 0, num = 0; i < len; i++) {
 	num += (BDIGIT_DBL)BDIGITS(z)[i + k] + ((BDIGIT_DBL)BDIGITS(a2)[i] << 1);
 	BDIGITS(z)[i + k] = BIGLO(num);
 	num = BIGDN(num);
     }
+    TRAP_END;
     if (num) {
-	len = RBIGNUM_LEN(z);
+	len = RBIGNUM(z)->len;
 	for (i += k; i < len && num; ++i) {
 	    num += (BDIGIT_DBL)BDIGITS(z)[i];
 	    BDIGITS(z)[i] = BIGLO(num);
 	    num = BIGDN(num);
 	}
 	if (num) {
-	    BDIGITS(z)[RBIGNUM_LEN(z)] = BIGLO(num);
-	    RBIGNUM_SET_LEN(z, RBIGNUM_LEN(z)+1);
+	    BDIGITS(z)[RBIGNUM(z)->len++] = BIGLO(num);
 	}
     }
     return bigtrunc(z);
@@ -2088,7 +1761,7 @@ bigsqr(VALUE x)
 
 /*
  *  call-seq:
- *     big ** exponent   => numeric
+ *     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
@@ -2100,37 +1773,32 @@ bigsqr(VALUE x)
  */
 
 VALUE
-rb_big_pow(VALUE x, VALUE y)
+rb_big_pow(x, y)
+    VALUE x, y;
 {
     double d;
-    SIGNED_VALUE yy;
+    long yy;
 
     if (y == INT2FIX(0)) return INT2FIX(1);
     switch (TYPE(y)) {
       case T_FLOAT:
-	d = RFLOAT_VALUE(y);
+	d = RFLOAT(y)->value;
 	break;
 
       case T_BIGNUM:
-	if (rb_funcall(y, '<', 1, INT2FIX(0)))
-	  return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
-
 	rb_warn("in a**b, b may be too big");
 	d = rb_big2dbl(y);
 	break;
 
       case T_FIXNUM:
 	yy = FIX2LONG(y);
-
-	if (yy < 0)
-	  return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
-	else {
+	if (yy > 0) {
 	    VALUE z = 0;
-	    SIGNED_VALUE mask;
+	    long mask;
 	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
 
-	    if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
-		(RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
+	    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;
@@ -2143,25 +1811,13 @@ rb_big_pow(VALUE x, VALUE y)
 	    }
 	    return bignorm(z);
 	}
-	/* NOTREACHED */
+	d = (double)yy;
 	break;
 
       default:
-	return rb_num_coerce_bin(x, y, rb_intern("**"));
-    }
-    return DOUBLE2NUM(pow(rb_big2dbl(x), d));
-}
-
-static VALUE
-bit_coerce(VALUE x)
-{
-    while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
-	if (TYPE(x) == T_FLOAT) {
-	    rb_raise(rb_eTypeError, "can't convert Float into Integer");
-	}
-	x = rb_to_int(x);
+	return rb_num_coerce_bin(x, y);
     }
-    return x;
+    return rb_float_new(pow(rb_big2dbl(x), d));
 }
 
 /*
@@ -2172,7 +1828,8 @@ bit_coerce(VALUE x)
  */
 
 VALUE
-rb_big_and(VALUE xx, VALUE yy)
+rb_big_and(xx, yy)
+    VALUE xx, yy;
 {
     volatile VALUE x, y, z;
     BDIGIT *ds1, *ds2, *zds;
@@ -2180,33 +1837,33 @@ rb_big_and(VALUE xx, VALUE yy)
     char sign;
 
     x = xx;
-    y = bit_coerce(yy);
+    y = rb_to_int(yy);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
-    if (!RBIGNUM_SIGN(y)) {
+    if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
 	get2comp(x);
     }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
+	sign = RBIGNUM(y)->sign;
     }
     else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+	sign = RBIGNUM(x)->sign;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) || RBIGNUM_SIGN(y));
+    z = bignew(l2, RBIGNUM(x)->sign || RBIGNUM(y)->sign);
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
@@ -2215,7 +1872,7 @@ rb_big_and(VALUE xx, VALUE yy)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z);
     return bignorm(z);
 }
 
@@ -2227,7 +1884,8 @@ rb_big_and(VALUE xx, VALUE yy)
  */
 
 VALUE
-rb_big_or(VALUE xx, VALUE yy)
+rb_big_or(xx, yy)
+    VALUE xx, yy;
 {
     volatile VALUE x, y, z;
     BDIGIT *ds1, *ds2, *zds;
@@ -2235,34 +1893,33 @@ rb_big_or(VALUE xx, VALUE yy)
     char sign;
 
     x = xx;
-    y = bit_coerce(yy);
+    y = rb_to_int(yy);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
-
-    if (!RBIGNUM_SIGN(y)) {
+    if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
 	get2comp(x);
     }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
+	sign = RBIGNUM(y)->sign;
     }
     else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+	sign = RBIGNUM(x)->sign;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) && RBIGNUM_SIGN(y));
+    z = bignew(l2, RBIGNUM(x)->sign && RBIGNUM(y)->sign);
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
@@ -2271,7 +1928,7 @@ rb_big_or(VALUE xx, VALUE yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:(BIGRAD-1);
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z);
 
     return bignorm(z);
 }
@@ -2284,7 +1941,8 @@ rb_big_or(VALUE xx, VALUE yy)
  */
 
 VALUE
-rb_big_xor(VALUE xx, VALUE yy)
+rb_big_xor(xx, yy)
+    VALUE xx, yy;
 {
     volatile VALUE x, y;
     VALUE z;
@@ -2293,36 +1951,35 @@ rb_big_xor(VALUE xx, VALUE yy)
     char sign;
 
     x = xx;
-    y = bit_coerce(yy);
+    y = rb_to_int(yy);
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
-
-    if (!RBIGNUM_SIGN(y)) {
+    if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
 	get2comp(y);
     }
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
 	get2comp(x);
     }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
+    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
+	l1 = RBIGNUM(y)->len;
+	l2 = RBIGNUM(x)->len;
 	ds1 = BDIGITS(y);
 	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
+	sign = RBIGNUM(y)->sign;
     }
     else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
+	l1 = RBIGNUM(x)->len;
+	l2 = RBIGNUM(y)->len;
 	ds1 = BDIGITS(x);
 	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+	sign = RBIGNUM(x)->sign;
     }
-    RBIGNUM_SET_SIGN(x, RBIGNUM_SIGN(x)?1:0);
-    RBIGNUM_SET_SIGN(y, RBIGNUM_SIGN(y)?1:0);
-    z = bignew(l2, !(RBIGNUM_SIGN(x) ^ RBIGNUM_SIGN(y)));
+    RBIGNUM(x)->sign = RBIGNUM(x)->sign?1:0;
+    RBIGNUM(y)->sign = RBIGNUM(y)->sign?1:0;
+    z = bignew(l2, !(RBIGNUM(x)->sign ^ RBIGNUM(y)->sign));
     zds = BDIGITS(z);
 
     for (i=0; i<l1; i++) {
@@ -2331,7 +1988,7 @@ rb_big_xor(VALUE xx, VALUE yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z);
 
     return bignorm(z);
 }
@@ -2339,9 +1996,9 @@ rb_big_xor(VALUE xx, VALUE yy)
 static VALUE
 check_shiftdown(VALUE y, VALUE x)
 {
-    if (!RBIGNUM_LEN(x)) return INT2FIX(0);
-    if (RBIGNUM_LEN(y) > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(-1);
+    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;
 }
@@ -2354,7 +2011,8 @@ check_shiftdown(VALUE y, VALUE x)
  */
 
 VALUE
-rb_big_lshift(VALUE x, VALUE y)
+rb_big_lshift(x, y)
+    VALUE x, y;
 {
     long shift;
     int neg = 0;
@@ -2369,12 +2027,12 @@ rb_big_lshift(VALUE x, VALUE y)
 	    break;
 	}
 	else if (TYPE(y) == T_BIGNUM) {
-	    if (!RBIGNUM_SIGN(y)) {
+	    if (!RBIGNUM(y)->sign) {
 		VALUE t = check_shiftdown(y, x);
 		if (!NIL_P(t)) return t;
 		neg = 1;
 	    }
-	    shift = big2ulong(y, "long", Qtrue);
+	    shift = big2ulong(y, "long");
 	    break;
 	}
 	y = rb_to_int(y);
@@ -2385,7 +2043,9 @@ rb_big_lshift(VALUE x, VALUE y)
 }
 
 static VALUE
-big_lshift(VALUE x, unsigned long shift)
+big_lshift(x, shift)
+    VALUE x;
+    unsigned long shift;
 {
     BDIGIT *xds, *zds;
     long s1 = shift/BITSPERDIG;
@@ -2394,8 +2054,8 @@ big_lshift(VALUE x, unsigned long shift)
     BDIGIT_DBL num = 0;
     long len, i;
 
-    len = RBIGNUM_LEN(x);
-    z = bignew(len+s1+1, RBIGNUM_SIGN(x));
+    len = RBIGNUM(x)->len;
+    z = bignew(len+s1+1, RBIGNUM(x)->sign);
     zds = BDIGITS(z);
     for (i=0; i<s1; i++) {
 	*zds++ = 0;
@@ -2418,7 +2078,8 @@ big_lshift(VALUE x, unsigned long shift)
  */
 
 VALUE
-rb_big_rshift(VALUE x, VALUE y)
+rb_big_rshift(x, y)
+    VALUE x, y;
 {
     long shift;
     int neg = 0;
@@ -2433,14 +2094,14 @@ rb_big_rshift(VALUE x, VALUE y)
 	    break;
 	}
 	else if (TYPE(y) == T_BIGNUM) {
-	    if (RBIGNUM_SIGN(y)) {
+	    if (RBIGNUM(y)->sign) {
 		VALUE t = check_shiftdown(y, x);
 		if (!NIL_P(t)) return t;
 	    }
 	    else {
 		neg = 1;
 	    }
-	    shift = big2ulong(y, "long", Qtrue);
+	    shift = big2ulong(y, "long");
 	    break;
 	}
 	y = rb_to_int(y);
@@ -2451,7 +2112,9 @@ rb_big_rshift(VALUE x, VALUE y)
 }
 
 static VALUE
-big_rshift(VALUE x, unsigned long shift)
+big_rshift(x, shift)
+    VALUE x;
+    unsigned long shift;
 {
     BDIGIT *xds, *zds;
     long s1 = shift/BITSPERDIG;
@@ -2461,24 +2124,24 @@ big_rshift(VALUE x, unsigned long shift)
     long i, j;
     volatile VALUE save_x;
 
-    if (s1 > RBIGNUM_LEN(x)) {
-	if (RBIGNUM_SIGN(x))
+    if (s1 > RBIGNUM(x)->len) {
+	if (RBIGNUM(x)->sign)
 	    return INT2FIX(0);
 	else
 	    return INT2FIX(-1);
     }
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	save_x = x = rb_big_clone(x);
 	get2comp(x);
     }
     xds = BDIGITS(x);
-    i = RBIGNUM_LEN(x); j = i - s1;
+    i = RBIGNUM(x)->len; j = i - s1;
     if (j == 0) {
-	if (RBIGNUM_SIGN(x)) return INT2FIX(0);
+	if (RBIGNUM(x)->sign) return INT2FIX(0);
 	else return INT2FIX(-1);
     }
-    z = bignew(j, RBIGNUM_SIGN(x));
-    if (!RBIGNUM_SIGN(x)) {
+    z = bignew(j, RBIGNUM(x)->sign);
+    if (!RBIGNUM(x)->sign) {
 	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
     }
     zds = BDIGITS(z);
@@ -2487,7 +2150,7 @@ big_rshift(VALUE x, unsigned long shift)
 	zds[j] = BIGLO(num);
 	num = BIGUP(xds[i]);
     }
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	get2comp(z);
     }
     return bignorm(z);
@@ -2513,21 +2176,22 @@ big_rshift(VALUE x, unsigned long shift)
  */
 
 static VALUE
-rb_big_aref(VALUE x, VALUE y)
+rb_big_aref(x, y)
+    VALUE x, y;
 {
     BDIGIT *xds;
     BDIGIT_DBL num;
-    VALUE shift;
+    unsigned long shift;
     long i, s1, s2;
 
     if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM_SIGN(y))
+	if (!RBIGNUM(y)->sign)
 	    return INT2FIX(0);
-	if (RBIGNUM_LEN(bigtrunc(y)) > DIGSPERLONG) {
+	if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
 	  out_of_range:
-	    return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
+	    return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
 	}
-	shift = big2ulong(y, "long", Qfalse);
+	shift = big2ulong(y, "long");
     }
     else {
 	i = NUM2LONG(y);
@@ -2537,8 +2201,8 @@ rb_big_aref(VALUE x, VALUE y)
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
 
-    if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
-    if (!RBIGNUM_SIGN(x)) {
+    if (s1 >= RBIGNUM(x)->len) goto out_of_range;
+    if (!RBIGNUM(x)->sign) {
 	xds = BDIGITS(x);
 	i = 0; num = 1;
 	while (num += ~xds[i], ++i <= s1) {
@@ -2561,12 +2225,17 @@ rb_big_aref(VALUE x, VALUE y)
  */
 
 static VALUE
-rb_big_hash(VALUE x)
+rb_big_hash(x)
+    VALUE x;
 {
-    int hash;
+    long i, len, key;
+    BDIGIT *digits;
 
-    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
-    return INT2FIX(hash);
+    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
+    for (i=0; i<len; i++) {
+	key ^= *digits++;
+    }
+    return LONG2FIX(key);
 }
 
 /*
@@ -2574,7 +2243,8 @@ rb_big_hash(VALUE x)
  */
 
 static VALUE
-rb_big_coerce(VALUE x, VALUE y)
+rb_big_coerce(x, y)
+    VALUE x, y;
 {
     if (FIXNUM_P(y)) {
 	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
@@ -2600,15 +2270,37 @@ rb_big_coerce(VALUE x, VALUE y)
  */
 
 static VALUE
-rb_big_abs(VALUE x)
+rb_big_abs(x)
+    VALUE x;
 {
-    if (!RBIGNUM_SIGN(x)) {
+    if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	RBIGNUM_SET_SIGN(x, 1);
+	RBIGNUM(x)->sign = 1;
     }
     return x;
 }
 
+VALUE
+rb_big_rand(max, rand_buf)
+    VALUE max;
+    double *rand_buf;
+{
+    VALUE v;
+    long len = RBIGNUM(max)->len;
+
+    if (BIGZEROP(max)) {
+	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;
+}
+
 /*
  *  call-seq:
  *     big.size -> integer
@@ -2622,41 +2314,10 @@ rb_big_abs(VALUE x)
  */
 
 static VALUE
-rb_big_size(VALUE big)
-{
-    return LONG2FIX(RBIGNUM_LEN(big)*SIZEOF_BDIGITS);
-}
-
-/*
- *  call-seq:
- *     big.odd? -> true or false
- *
- *  Returns <code>true</code> if <i>big</i> is an odd number.
- */
-
-static VALUE
-rb_big_odd_p(VALUE num)
-{
-    if (BDIGITS(num)[0] & 1) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-/*
- *  call-seq:
- *     big.even? -> true or false
- *
- *  Returns <code>true</code> if <i>big</i> is an even number.
- */
-
-static VALUE
-rb_big_even_p(VALUE num)
+rb_big_size(big)
+    VALUE big;
 {
-    if (BDIGITS(num)[0] & 1) {
-	return Qfalse;
-    }
-    return Qtrue;
+    return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
 }
 
 /*
@@ -2678,7 +2339,7 @@ rb_big_even_p(VALUE num)
  */
 
 void
-Init_Bignum(void)
+Init_Bignum()
 {
     rb_cBignum = rb_define_class("Bignum", rb_cInteger);
 
@@ -2690,11 +2351,12 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
-    rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
+    rb_define_method(rb_cBignum, "div", rb_big_div, 1);
     rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
     rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
-    rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1);
+    rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
+    rb_define_method(rb_cBignum, "fdiv", rb_big_quo, 1);
     rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
     rb_define_method(rb_cBignum, "&", rb_big_and, 1);
     rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -2711,8 +2373,4 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
     rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
     rb_define_method(rb_cBignum, "size", rb_big_size, 0);
-    rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0);
-    rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
-
-    power_cache_init();
 }
diff --git a/bin/gem b/bin/gem
deleted file mode 100755
index b5b2b63809..0000000000
--- a/bin/gem
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new "> 1.8.3"
-
-unless required_version.satisfied_by? Gem.ruby_version then
-  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
-end
-
-# We need to preserve the original ARGV to use for passing gem options
-# to source gems.  If there is a -- in the line, strip all options after
-# it...its for the source building process.
-args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
-
-begin
-  Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
-  exit e.exit_code
-end
-
diff --git a/bin/irb b/bin/irb
index b31b43eb7f..f277bc4b69 100644
--- a/bin/irb
+++ b/bin/irb
@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #
-#   irb.rb - interactive ruby
+#   irb.rb - intaractive ruby
 #   	$Release Version: 0.9.5 $
 #   	$Revision$
+#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 
diff --git a/bin/rake b/bin/rake
deleted file mode 100755
index c9e95da611..0000000000
--- a/bin/rake
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-#++
-
-begin
-  require 'rake'
-rescue LoadError
-  require 'rubygems'
-  require 'rake'
-end
-Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index e50285478d..fe619137fd 100644
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -8,15 +8,60 @@
 #
 #  $Revision$
 
+## 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 Interrupt
-  $stderr.puts
-  $stderr.puts "Interrupted"
-rescue RDoc::Error => e
+  r.document(ARGV)
+rescue RDoc::RDocError => e
   $stderr.puts e.message
-  exit 1
+  exit(1)
 end
diff --git a/bin/ri b/bin/ri
index 0d4e3304d8..fb3e00eda3 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,6 +1,49 @@
-#!/usr//bin/env ruby
+#!/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/driver'
 
-RDoc::RI::Driver.run ARGV
+require 'rdoc/ri/ri_driver'
+
+######################################################################
+
+ri = RiDriver.new
+ri.process_args
 
diff --git a/blockinlining.c b/blockinlining.c
deleted file mode 100644
index 3f4aa86fe5..0000000000
--- a/blockinlining.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/**********************************************************************
-
-  blockinlining.c -
-
-  $Author$
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-#include "vm_core.h"
-
-static VALUE
-iseq_special_block(rb_iseq_t *iseq, void *builder)
-{
-#if OPT_BLOCKINLINING
-    VALUE parent = Qfalse;
-    VALUE iseqval;
-
-    if (iseq->argc > 1 || iseq->arg_simple == 0) {
-	/* argument check */
-	return 0;
-    }
-
-    if (iseq->cached_special_block_builder) {
-	if (iseq->cached_special_block_builder == builder) {
-	    return iseq->cached_special_block;
-	}
-	else {
-	    return 0;
-	}
-    }
-    else {
-	iseq->cached_special_block_builder = (void *)1;
-    }
-    
-    if (iseq->parent_iseq) {
-	parent = iseq->parent_iseq->self;
-    }
-    iseqval = rb_iseq_new_with_bopt(iseq->node, iseq->name, iseq->filename,
-				      parent, iseq->type,
-				      GC_GUARDED_PTR(builder));
-    if (0) {
-	printf("%s\n", RSTRING_PTR(ruby_iseq_disasm(iseqval)));
-    }
-    iseq->cached_special_block = iseqval;
-    iseq->cached_special_block_builder = builder;
-    return iseqval;
-#else
-    return 0;
-#endif
-}
-
-static NODE *
-new_block(NODE * head, NODE * tail)
-{
-    head = NEW_BLOCK(head);
-    tail = NEW_BLOCK(tail);
-    head->nd_next = tail;
-    return head;
-}
-
-static NODE *
-new_ary(NODE * head, NODE * tail)
-{
-    head = NEW_ARRAY(head);
-    head->nd_next = tail;
-    return head;
-}
-
-static NODE *
-new_assign(NODE * lnode, NODE * rhs)
-{
-    switch (nd_type(lnode)) {
-      case NODE_LASGN:{
-	  return NEW_NODE(NODE_LASGN, lnode->nd_vid, rhs, lnode->nd_cnt);
-	  /* NEW_LASGN(lnode->nd_vid, rhs); */
-      }
-      case NODE_GASGN:{
-	  return NEW_GASGN(lnode->nd_vid, rhs);
-      }
-      case NODE_DASGN:{
-	  return NEW_DASGN(lnode->nd_vid, rhs);
-      }
-      case NODE_ATTRASGN:{
-	  NODE *args = 0;
-	  if (lnode->nd_args) {
-	      args = NEW_ARRAY(lnode->nd_args->nd_head);
-	      args->nd_next = NEW_ARRAY(rhs);
-	      args->nd_alen = 2;
-	  }
-	  else {
-	      args = NEW_ARRAY(rhs);
-	  }
-
-	  return NEW_ATTRASGN(lnode->nd_recv,
-			      lnode->nd_mid,
-			      args);
-      }
-      default:
-	rb_bug("unimplemented (block inlining): %s", ruby_node_name(nd_type(lnode)));
-    }
-    return 0;
-}
-
-static NODE *
-build_Integer_times_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
-			 VALUE param_vars, VALUE local_vars)
-{
-    /* Special Block for Integer#times
-       {|e, _self|
-       _e = e
-       while(e < _self)
-       e = _e
-       redo_point:
-       BODY
-       next_point:
-       _e = _e.succ
-       end
-       }
-
-       {|e, _self|
-       while(e < _self)
-       BODY
-       next_point:
-       e = e.succ
-       end
-       }
-     */
-    ID _self;
-    CONST_ID(_self, "#_self");
-    if (iseq->argc == 0) {
-	ID e;
-	CONST_ID(e, "#e");
-	rb_ary_push(param_vars, ID2SYM(e));
-	rb_ary_push(param_vars, ID2SYM(_self));
-	iseq->argc += 2;
-
-	node =
-	    NEW_WHILE(NEW_CALL
-		      (NEW_DVAR(e), idLT, new_ary(NEW_DVAR(_self), 0)),
-		      new_block(NEW_OPTBLOCK(node),
-				NEW_DASGN(e,
-					  NEW_CALL(NEW_DVAR(e), idSucc, 0))),
-		      Qundef);
-    }
-    else {
-	ID _e;
-	ID e = SYM2ID(rb_ary_entry(param_vars, 0));
-	NODE *assign;
-
-	CONST_ID(_e, "#_e");
-	rb_ary_push(param_vars, ID2SYM(_self));
-	rb_ary_push(local_vars, ID2SYM(_e));
-	iseq->argc++;
-
-	if (nd_type(lnode) == NODE_DASGN_CURR) {
-	    assign = NEW_DASGN(e, NEW_DVAR(_e));
-	}
-	else {
-	    assign = new_assign(lnode, NEW_DVAR(_e));
-	}
-
-	node =
-	    new_block(NEW_DASGN(_e, NEW_DVAR(e)),
-		      NEW_WHILE(NEW_CALL
-				(NEW_DVAR(_e), idLT,
-				 new_ary(NEW_DVAR(_self), 0)),
-				new_block(assign,
-					  new_block(NEW_OPTBLOCK(node),
-						    NEW_DASGN(_e,
-							      NEW_CALL
-							      (NEW_DVAR(_e),
-							       idSucc, 0)))),
-				Qundef));
-    }
-    return node;
-}
-
-VALUE
-invoke_Integer_times_special_block(VALUE num)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
-    if (orig_block && BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
-	VALUE tsiseqval = iseq_special_block(orig_block->iseq,
-					     build_Integer_times_node);
-	rb_iseq_t *tsiseq;
-	VALUE argv[2], val;
-
-	if (tsiseqval) {
-	    rb_block_t block = *orig_block;
-	    GetISeqPtr(tsiseqval, tsiseq);
-	    block.iseq = tsiseq;
-	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
-	    argv[0] = INT2FIX(0);
-	    argv[1] = num;
-	    val = rb_yield_values(2, argv);
-	    if (val == Qundef) {
-		return num;
-	    }
-	    else {
-		return val;
-	    }
-	}
-    }
-    return Qundef;
-}
-
-static NODE *
-build_Range_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
-		      VALUE param_vars, VALUE local_vars, ID mid)
-{
-    /* Special Block for Range#each
-       {|e, _last|
-       _e = e
-       while _e < _last
-       e = _e
-       next_point:
-       BODY
-       redo_point:
-       _e = _e.succ
-       end
-       }
-       {|e, _last|
-       while e < _last
-       BODY
-       redo_point:
-       e = e.succ
-       end
-       }
-     */
-    ID _last;
-    CONST_ID(_last, "#_last");
-    if (iseq->argc == 0) {
-	ID e;
-	CONST_ID(e, "#e");
-	rb_ary_push(param_vars, ID2SYM(e));
-	rb_ary_push(param_vars, ID2SYM(_last));
-	iseq->argc += 2;
-
-	node =
-	    NEW_WHILE(NEW_CALL(NEW_DVAR(e), mid, new_ary(NEW_DVAR(_last), 0)),
-		      new_block(NEW_OPTBLOCK(node),
-				NEW_DASGN(e,
-					  NEW_CALL(NEW_DVAR(e), idSucc, 0))),
-		      Qundef);
-    }
-    else {
-	ID _e;
-	ID e = SYM2ID(rb_ary_entry(param_vars, 0));
-	NODE *assign;
-
-	CONST_ID(_e, "#_e");
-	rb_ary_push(param_vars, ID2SYM(_last));
-	rb_ary_push(local_vars, ID2SYM(_e));
-	iseq->argc++;
-
-	if (nd_type(lnode) == NODE_DASGN_CURR) {
-	    assign = NEW_DASGN(e, NEW_DVAR(_e));
-	}
-	else {
-	    assign = new_assign(lnode, NEW_DVAR(_e));
-	}
-
-	node =
-	    new_block(NEW_DASGN(_e, NEW_DVAR(e)),
-		      NEW_WHILE(NEW_CALL
-				(NEW_DVAR(_e), mid,
-				 new_ary(NEW_DVAR(_last), 0)),
-				new_block(assign,
-					  new_block(NEW_OPTBLOCK(node),
-						    NEW_DASGN(_e,
-							      NEW_CALL
-							      (NEW_DVAR(_e),
-							       idSucc, 0)))),
-				Qundef));
-    }
-    return node;
-}
-
-static NODE *
-build_Range_each_node_LE(rb_iseq_t *iseq, NODE * node, NODE * lnode,
-			 VALUE param_vars, VALUE local_vars)
-{
-    return build_Range_each_node(iseq, node, lnode,
-				 param_vars, local_vars, idLE);
-}
-
-static NODE *
-build_Range_each_node_LT(rb_iseq_t *iseq, NODE * node, NODE * lnode,
-			 VALUE param_vars, VALUE local_vars)
-{
-    return build_Range_each_node(iseq, node, lnode,
-				 param_vars, local_vars, idLT);
-}
-
-VALUE
-invoke_Range_each_special_block(VALUE range,
-				VALUE beg, VALUE end, int excl)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
-    if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
-	void *builder =
-	    excl ? build_Range_each_node_LT : build_Range_each_node_LE;
-	VALUE tsiseqval = iseq_special_block(orig_block->iseq, builder);
-	rb_iseq_t *tsiseq;
-	VALUE argv[2];
-
-	if (tsiseqval) {
-	    VALUE val;
-	    rb_block_t block = *orig_block;
-	    GetISeqPtr(tsiseqval, tsiseq);
-	    block.iseq = tsiseq;
-	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
-	    argv[0] = beg;
-	    argv[1] = end;
-	    val = rb_yield_values(2, argv);
-	    if (val == Qundef) {
-		return range;
-	    }
-	    else {
-		return val;
-	    }
-	}
-    }
-    return Qundef;
-}
-
-
-static NODE *
-build_Array_each_node(rb_iseq_t *iseq, NODE * node, NODE * lnode,
-		      VALUE param_vars, VALUE local_vars)
-{
-    /* Special block for Array#each
-       ary.each{|e|
-       BODY
-       }
-       =>
-       {|e, _self|
-       _i = 0
-       while _i < _self.length
-       e = _self[_i]
-       redo_point:
-       BODY
-       next_point:
-       _i = _i.succ
-       end
-       }
-
-       ary.each{
-       BODY
-       }
-       =>
-       {|_i, _self|
-       _i = 0
-       while _i < _self.length
-       redo_point:
-       BODY
-       next_point:
-       _i = _i.succ
-       end
-       }
-     */
-
-    ID _self, _i;
-
-    CONST_ID(_self, "#_self");
-    CONST_ID(_i, "#_i");
-    if (iseq->argc == 0) {
-	ID _e;
-	CONST_ID(_e, "#_e");
-	rb_ary_push(param_vars, ID2SYM(_e));
-	rb_ary_push(param_vars, ID2SYM(_self));
-	iseq->argc += 2;
-	rb_ary_push(local_vars, ID2SYM(_i));
-
-	node =
-	    new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
-		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
-					 new_ary(NEW_CALL
-						 (NEW_DVAR(_self), idLength,
-						  0), 0)),
-				new_block(NEW_OPTBLOCK(node),
-					  NEW_DASGN(_i,
-						    NEW_CALL(NEW_DVAR(_i),
-							     idSucc, 0))),
-				Qundef));
-    }
-    else {
-	ID e = SYM2ID(rb_ary_entry(param_vars, 0));
-	NODE *assign;
-
-	rb_ary_push(param_vars, ID2SYM(_self));
-	iseq->argc++;
-	rb_ary_push(local_vars, ID2SYM(_i));
-
-	if (nd_type(lnode) == NODE_DASGN_CURR) {
-	    assign = NEW_DASGN(e,
-			       NEW_CALL(NEW_DVAR(_self), idAREF,
-					new_ary(NEW_DVAR(_i), 0)));
-	}
-	else {
-	    assign = new_assign(lnode,
-				NEW_CALL(NEW_DVAR(_self), idAREF,
-					 new_ary(NEW_DVAR(_i), 0)));
-	}
-
-	node =
-	    new_block(NEW_DASGN(_i, NEW_LIT(INT2FIX(0))),
-		      NEW_WHILE(NEW_CALL(NEW_DVAR(_i), idLT,
-					 new_ary(NEW_CALL
-						 (NEW_DVAR(_self), idLength,
-						  0), 0)), new_block(assign,
-								     new_block
-								     (NEW_OPTBLOCK
-								      (node),
-								      NEW_DASGN
-								      (_i,
-								       NEW_CALL
-								       (NEW_DVAR
-									(_i),
-									idSucc,
-									0)))),
-				Qundef));
-    }
-    return node;
-}
-
-VALUE
-invoke_Array_each_special_block(VALUE ary)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_block_t *orig_block = GC_GUARDED_PTR_REF(th->cfp->lfp[0]);
-
-    if (BUILTIN_TYPE(orig_block->iseq) != T_NODE) {
-	VALUE tsiseqval = iseq_special_block(orig_block->iseq,
-					     build_Array_each_node);
-	rb_iseq_t *tsiseq;
-	VALUE argv[2];
-
-	if (tsiseqval) {
-	    VALUE val;
-	    rb_block_t block = *orig_block;
-	    GetISeqPtr(tsiseqval, tsiseq);
-	    block.iseq = tsiseq;
-	    th->cfp->lfp[0] = GC_GUARDED_PTR(&block);
-	    argv[0] = 0;
-	    argv[1] = ary;
-	    val = rb_yield_values(2, argv);
-	    if (val == Qundef) {
-		return ary;
-	    }
-	    else {
-		return val;
-	    }
-	}
-    }
-    return Qundef;
-}
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
deleted file mode 100644
index 744c0adac1..0000000000
--- a/bootstraptest/pending.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-assert_equal 'A', %q{
-  class A
-    @@a = 'A'
-    def a=(x)
-      @@a = x
-    end
-    def a
-      @@a
-    end
-  end
-
-  B = A.dup
-  B.new.a = 'B'
-  A.new.a
-}, '[ruby-core:17019]'
-
-assert_equal 'ok', %q{
-  def m
-    lambda{
-      proc{
-        return :ng1
-      }
-    }.call.call
-    :ng2
-  end
-
-  begin
-    m()
-  rescue LocalJumpError
-    :ok
-  end
-}
-
-assert_normal_exit %q{
-  r = Range.allocate
-  def r.<=>(o) true end
-  r.instance_eval { initialize r, r }
-  r.inspect
-}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
deleted file mode 100644
index 080e7b111e..0000000000
--- a/bootstraptest/runner.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-# $Id$
-
-# NOTE:
-# Never use optparse in this file.
-# Never use test/unit in this file.
-# Never use Ruby extensions in this file.
-
-begin
-  require 'fileutils'
-  require 'tmpdir'
-rescue LoadError
-  $:.unshift File.join(File.dirname(__FILE__), '../lib')
-  retry
-end
-
-if !Dir.respond_to?(:mktmpdir)
-  # copied from lib/tmpdir.rb
-  def Dir.mktmpdir(prefix="d", tmpdir=nil)
-    tmpdir ||= Dir.tmpdir
-    t = Time.now.strftime("%Y%m%d")
-    n = nil
-    begin
-      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
-      path << "-#{n}" if n
-      Dir.mkdir(path, 0700)
-    rescue Errno::EEXIST
-      n ||= 0
-      n += 1
-      retry
-    end
-
-    if block_given?
-      begin
-        yield path
-      ensure
-        FileUtils.remove_entry_secure path
-      end
-    else
-      path
-    end
-  end
-end
-
-def main
-  @ruby = File.expand_path('miniruby')
-  @verbose = false
-  dir = nil
-  quiet = false
-  tests = nil
-  ARGV.delete_if {|arg|
-    case arg
-    when /\A--ruby=(.*)/
-      @ruby = $1
-      @ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
-      @ruby.gsub!(/(\s+-I\s*)((?!(?:\.\/)*-(?:\s|\z))\S+)/){$1+File.expand_path($2)}
-      @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
-      true
-    when /\A--sets=(.*)/
-      tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
-      puts tests.map {|path| File.basename(path) }.inspect
-      true
-    when /\A--dir=(.*)/
-      dir = $1
-      true
-    when /\A(--stress|-s)/
-      $stress = true
-    when /\A(-q|--q(uiet))\z/
-      quiet = true
-      true
-    when /\A(-v|--v(erbose))\z/
-      @verbose = true
-    when /\A(-h|--h(elp)?)\z/
-      puts(<<-End)
-Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
-        --sets=NAME,NAME,...        Name of test sets.
-        --dir=DIRECTORY             Working directory.
-                                    default: /tmp/bootstraptest.tmpwd
-    -s, --stress                    stress test.
-    -v, --verbose                   Output test name before exec.
-    -q, --quiet                     Don\'t print header message.
-    -h, --help                      Print this message and quit.
-End
-      exit true
-    else
-      false
-    end
-  }
-  if tests and not ARGV.empty?
-    $stderr.puts "--tests and arguments are exclusive"
-    exit false
-  end
-  tests ||= ARGV
-  tests = Dir.glob("#{File.dirname($0)}/test_*.rb") if tests.empty?
-  pathes = tests.map {|path| File.expand_path(path) }
-
-  unless quiet
-    puts Time.now
-    patchlevel = defined?(RUBY_PATCHLEVEL) ? " patchlevel #{RUBY_PATCHLEVEL}" : ''
-    puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{patchlevel}) [#{RUBY_PLATFORM}]"
-    puts "Target is #{`#{@ruby} -v`.chomp}"
-    puts
-    $stdout.flush
-  end
-
-  in_temporary_working_directory(dir) {
-    exec_test pathes
-  }
-end
-
-def exec_test(pathes)
-  @count = 0
-  @error = 0
-  @errbuf = []
-  @location = nil
-  pathes.each do |path|
-    $stderr.print "\n#{File.basename(path)} "
-    load File.expand_path(path)
-  end
-  $stderr.puts
-  if @error == 0
-    $stderr.puts "PASS #{@count} tests"
-    exit true
-  else
-    @errbuf.each do |msg|
-      $stderr.puts msg
-    end
-    $stderr.puts "FAIL #{@error}/#{@count} tests failed"
-    exit false
-  end
-end
-
-def assert_check(testsrc, message = '', opt = '')
-  $stderr.puts "\##{@count} #{@location}" if @verbose
-  result = get_result_string(testsrc, opt)
-  check_coredump
-  faildesc = yield(result)
-  if !faildesc
-    $stderr.print '.'
-  else
-    $stderr.print 'F'
-    error faildesc, message
-  end
-rescue Exception => err
-  $stderr.print 'E'
-  error err.message, message
-end
-
-def assert_equal(expected, testsrc, message = '')
-  newtest
-  assert_check(testsrc, message) {|result|
-    if expected == result
-      nil
-    else
-      desc = "#{result.inspect} (expected #{expected.inspect})"
-      pretty(testsrc, desc, result)
-    end
-  }
-end
-
-def assert_match(expected_pattern, testsrc, message = '')
-  newtest
-  assert_check(testsrc, message) {|result|
-    if expected_pattern =~ result
-      nil
-    else
-      desc = "#{expected_pattern.inspect} expected to be =~\n#{result.inspect}"
-      pretty(testsrc, desc, result)
-    end
-  }
-end
-
-def assert_not_match(unexpected_pattern, testsrc, message = '')
-  newtest
-  assert_check(testsrc, message) {|result|
-    if unexpected_pattern !~ result
-      nil
-    else
-      desc = "#{unexpected_pattern.inspect} expected to be !~\n#{result.inspect}"
-      pretty(testsrc, desc, result)
-    end
-  }
-end
-
-def assert_valid_syntax(testsrc, message = '')
-  newtest
-  assert_check(testsrc, message, '-c') {|result|
-    result if /Syntax OK/ !~ result
-  }
-end
-
-def assert_normal_exit(testsrc, message = '', ignore_signals = nil)
-  newtest
-  $stderr.puts "\##{@count} #{@location}" if @verbose
-  faildesc = nil
-  filename = make_srcfile(testsrc)
-  old_stderr = $stderr.dup
-  begin
-    $stderr.reopen("assert_normal_exit_stderr.log", "w")
-    `#{@ruby} -W0 #{filename}`
-    status = $?
-  ensure
-    $stderr.reopen(old_stderr)
-    old_stderr.close
-  end
-  if status.signaled?
-    signo = status.termsig
-    signame = Signal.list.invert[signo]
-    unless ignore_signals and ignore_signals.include?(signame)
-      sigdesc = "signal #{signo}"
-      if signame
-        sigdesc = "SIG#{signame} (#{sigdesc})"
-      end
-      faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
-      stderr_log = File.read("assert_normal_exit_stderr.log")
-      if !stderr_log.empty?
-        faildesc << "\n" if /\n\z/ !~ faildesc
-        stderr_log << "\n" if /\n\z/ !~ stderr_log
-        stderr_log.gsub!(/^.*\n/) { '| ' + $& }
-        faildesc << stderr_log
-      end
-    end
-  end
-  if !faildesc
-    $stderr.print '.'
-    true
-  else
-    $stderr.print 'F'
-    error faildesc, message
-    false
-  end
-rescue Exception => err
-  $stderr.print 'E'
-  error err.message, message
-  false
-end
-
-def assert_finish(timeout_seconds, testsrc, message = '')
-  newtest
-  $stderr.puts "\##{@count} #{@location}" if @verbose
-  faildesc = nil
-  filename = make_srcfile(testsrc)
-  io = IO.popen("#{@ruby} -W0 #{filename}")
-  pid = io.pid
-  waited = false
-  tlimit = Time.now + timeout_seconds
-  while Time.now < tlimit
-    if Process.waitpid pid, Process::WNOHANG
-      waited = true
-      break
-    end
-    sleep 0.1
-  end
-  if !waited
-    Process.kill(:KILL, pid)
-    Process.waitpid pid
-    faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil)
-  end
-  io.close
-  if !faildesc
-    $stderr.print '.'
-  else
-    $stderr.print 'F'
-    error faildesc, message
-  end
-rescue Exception => err
-  $stderr.print 'E'
-  error err.message, message
-end
-
-def flunk(message = '')
-  newtest
-  $stderr.print 'F'
-  error message, ''
-end
-
-def pretty(src, desc, result)
-  src = src.sub(/\A.*\n/, '')
-  (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
-end
-
-INDENT = 27
-
-def adjust_indent(src)
-  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ')
-end
-
-def untabify(str)
-  str.gsub(/^\t+/) {' ' * (8 * $&.size) }
-end
-
-def make_srcfile(src)
-  filename = 'bootstraptest.tmp.rb'
-  File.open(filename, 'w') {|f|
-    f.puts "GC.stress = true" if $stress
-    f.puts "print(begin; #{src}; end)"
-  }
-  filename
-end
-
-def get_result_string(src, opt = '')
-  if @ruby
-    filename = make_srcfile(src)
-    begin
-      `#{@ruby} -W0 #{opt} #{filename}`
-    ensure
-      raise CoreDumpError, "core dumped" if $? and $?.coredump?
-    end
-  else
-    eval(src).to_s
-  end
-end
-
-def newtest
-  @location = File.basename(caller(2).first)
-  @count += 1
-  cleanup_coredump
-end
-
-def error(msg, additional_message)
-  @errbuf.push "\##{@count} #{@location}: #{msg}  #{additional_message}"
-  @error += 1
-end
-
-def in_temporary_working_directory(dir)
-  if dir
-    Dir.mkdir dir
-    Dir.chdir(dir) {
-      yield
-    }
-  else
-    Dir.mktmpdir("bootstraptest.tmpwd") {|d|
-      Dir.chdir(d) {
-        yield
-      }
-    }
-  end
-end
-
-def cleanup_coredump
-  FileUtils.rm_f 'core'
-  FileUtils.rm_f Dir.glob('core.*')
-  FileUtils.rm_f @ruby+'.stackdump' if @ruby
-end
-
-class CoreDumpError < StandardError; end
-
-def check_coredump
-  if File.file?('core') or not Dir.glob('core.*').empty? or
-      (@ruby and File.exist?(@ruby+'.stackdump'))
-    raise CoreDumpError, "core dumped"
-  end
-end
-
-main
diff --git a/bootstraptest/test_attr.rb b/bootstraptest/test_attr.rb
deleted file mode 100644
index 721a847145..0000000000
--- a/bootstraptest/test_attr.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-assert_equal 'ok', %q{
-  module M
-    class A
-      class << self
-        attr_accessor :at
-        def workflow_rule
-          yield self
-        end
-
-        def eval_str(str)
-          eval(str)
-        end
-      end
-    end
-  end
-  begin
-    M::A.eval_str(<<-END)
-    workflow_rule do |r|
-      r.at 1
-    end
-    END
-  rescue ArgumentError => e
-    print "ok"
-  end
-}, '[ruby-core:14641]'
-
-assert_equal %{ok}, %{
-  class A
-    attr :m
-  end
-  begin
-    A.new.m(3)
-  rescue ArgumentError => e
-    print "ok"
-  end
-}, '[ruby-core:15120]'
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
deleted file mode 100644
index 05376df220..0000000000
--- a/bootstraptest/test_autoload.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  ZZZ.ok
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  require "./zzz.rb"
-  ZZZ.ok
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
-  autoload :ZZZ, "./zzz.rb"
-  require "./zzz.rb"
-  proc{$SAFE=4; ZZZ.ok}.call
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{M.instance_eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{$SAFE=4; M.instance_eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  Thread.new{$SAFE=4; eval('ZZZ.new.hoge')}.value
-}
-
-assert_equal 'ok', %q{
-  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def hoge;:ok;end;end"}
-  autoload :ZZZ, File.join(Dir.pwd, 'zzz.rb')
-  module M; end
-  Thread.new{eval('$SAFE=4; ZZZ.new.hoge')}.value
-}
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
deleted file mode 100644
index 2db149063e..0000000000
--- a/bootstraptest/test_block.rb
+++ /dev/null
@@ -1,549 +0,0 @@
-assert_equal %q{1}, %q{
-  1.times{
-    begin
-      a = 1
-    ensure
-      foo = nil
-    end
-  }
-}
-assert_equal %q{2}, %q{
-  [1,2,3].find{|x| x == 2}
-}
-assert_equal %q{2}, %q{
-  class E
-    include Enumerable
-    def each(&block)
-      [1, 2, 3].each(&block)
-    end
-  end
-  E.new.find {|x| x == 2 }
-}
-assert_equal %q{6}, %q{
-  sum = 0
-  for x in [1, 2, 3]
-    sum += x
-  end
-  sum
-}
-assert_equal %q{15}, %q{
-  sum = 0
-  for x in (1..5)
-    sum += x
-  end
-  sum
-}
-assert_equal %q{0}, %q{
-  sum = 0
-  for x in []
-    sum += x
-  end
-  sum
-}
-assert_equal %q{1}, %q{
-  ans = []
-  1.times{
-    for n in 1..3
-      a = n
-      ans << a
-    end
-  }
-}
-assert_equal %q{1..3}, %q{
-  ans = []
-  for m in 1..3
-    for n in 1..3
-      a = [m, n]
-      ans << a
-    end
-  end
-}
-assert_equal %q{[1, 2, 3]}, %q{
-  (1..3).to_a
-}
-assert_equal %q{[4, 8, 12]}, %q{
-  (1..3).map{|e|
-    e * 4
-  }
-}
-assert_equal %q{[1, 2, 3]}, %q{
-  class C
-    include Enumerable
-    def each
-      [1,2,3].each{|e|
-        yield e
-      }
-    end
-  end
-  
-  C.new.to_a
-}
-assert_equal %q{[4, 5, 6]}, %q{
-  class C
-    include Enumerable
-    def each
-      [1,2,3].each{|e|
-        yield e
-      }
-    end
-  end
-  
-  C.new.map{|e|
-    e + 3
-  }
-}
-assert_equal %q{100}, %q{
-  def m
-    yield
-  end
-  def n
-    yield
-  end
-
-  m{
-    n{
-      100
-    }
-  }
-}
-assert_equal %q{20}, %q{
-  def m
-    yield 1
-  end
-  
-  m{|ib|
-    m{|jb|
-      i = 20
-    }
-  }
-}
-assert_equal %q{2}, %q{
-  def m
-    yield 1
-  end
-  
-  m{|ib|
-    m{|jb|
-      ib = 20
-      kb = 2
-    }
-  }
-}
-assert_equal %q{3}, %q{
-  def iter1
-    iter2{
-      yield
-    }
-  end
-  
-  def iter2
-    yield
-  end
-  
-  iter1{
-    jb = 2
-    iter1{
-      jb = 3
-    }
-    jb
-  }
-}
-assert_equal %q{2}, %q{
-  def iter1
-    iter2{
-      yield
-    }
-  end
-  
-  def iter2
-    yield
-  end
-  
-  iter1{
-    jb = 2
-    iter1{
-      jb
-    }
-    jb
-  }
-}
-assert_equal %q{2}, %q{
-  def m
-    yield 1
-  end
-  m{|ib|
-    ib*2
-  }
-}
-assert_equal %q{92580}, %q{
-  def m
-    yield 12345, 67890
-  end
-  m{|ib,jb|
-    ib*2+jb
-  }
-}
-assert_equal %q{[10, nil]}, %q{
-  def iter
-    yield 10
-  end
-
-  a = nil
-  [iter{|a|
-    a
-  }, a]
-}
-assert_equal %q{21}, %q{
-  def iter
-    yield 10
-  end
-
-  iter{|a|
-    iter{|a|
-      a + 1
-    } + a
-  }
-}
-assert_equal %q{[10, 20, 30, 40, nil, nil, nil, nil]}, %q{
-  def iter
-    yield 10, 20, 30, 40
-  end
-
-  a = b = c = d = nil
-  iter{|a, b, c, d|
-    [a, b, c, d]
-  } + [a, b, c, d]
-}
-assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{
-  def iter
-    yield 10, 20, 30, 40
-  end
-
-  a = b = nil
-  iter{|a, b, c, d|
-    [a, b, c, d]
-  } + [a, b]
-}
-assert_equal %q{[1]}, %q{
-  $a = []
-  
-  def iter
-    yield 1
-  end
-  
-  def m
-    x = iter{|x|
-      $a << x
-      y = 0
-    }
-  end
-  m
-  $a
-}
-assert_equal %q{[1, [2]]}, %q{
-  def iter
-    yield 1, 2
-  end
-
-  iter{|a, *b|
-    [a, b]
-  }
-}
-assert_equal %q{[[1, 2]]}, %q{
-  def iter
-    yield 1, 2
-  end
-
-  iter{|*a|
-    [a]
-  }
-}
-assert_equal %q{[1, 2, []]}, %q{
-  def iter
-    yield 1, 2
-  end
-
-  iter{|a, b, *c|
-    [a, b, c]
-  }
-}
-assert_equal %q{[1, 2, nil, []]}, %q{
-  def iter
-    yield 1, 2
-  end
-
-  iter{|a, b, c, *d|
-    [a, b, c, d]
-  }
-}
-assert_equal %q{1}, %q{
-  def m
-    yield
-  end
-  m{
-    1
-  }
-}
-assert_equal %q{15129}, %q{
-  def m
-    yield 123
-  end
-  m{|ib|
-    m{|jb|
-      ib*jb
-    }
-  }
-}
-assert_equal %q{2}, %q{
-  def m a
-    yield a
-  end
-  m(1){|ib|
-    m(2){|jb|
-      ib*jb
-    }
-  }
-}
-assert_equal %q{9}, %q{
-  sum = 0
-  3.times{|ib|
-    2.times{|jb|
-      sum += ib + jb
-    }}
-  sum
-}
-assert_equal %q{10}, %q{
-  3.times{|bl|
-    break 10
-  }
-}
-assert_equal %q{[1, 2]}, %q{
-  def iter
-    yield 1,2,3
-  end
-
-  iter{|i, j|
-    [i, j]
-  }
-}
-assert_equal %q{[1, nil]}, %q{
-  def iter
-    yield 1
-  end
-
-  iter{|i, j|
-    [i, j]
-  }
-}
-
-assert_equal '0', %q{
-def m()
-end
-m {|(v0,*,(*)),|}
-m {|(*v0,(*)),|}
-m {|(v0,*v1,(*)),|}
-m {|((v0,*v1,v2)),|}
-m {|(v0,*v1,v2),|}
-m {|(v0,*v1,(v2)),|}
-m {|((*),*v0,v1),|}
-m {|((v0),*v1,v2),|}
-m {|(v0,v1,*v2,v3),|}
-m {|v0,(v1,*v2,v3),|}
-m {|(v0,*v1,v2),v3,|}
-m {|(v0,*v1,v2)|}
-m {|(v0,*v1,v2),&v3|}
-m {|(v0,*v1,v2),*|}
-m {|(v0,*v1,v2),*,&v3|}
-m {|*,(v0,*v1,v2)|}
-m {|*,(v0,*v1,v2),&v3|}
-m {|v0,*,(v1,*v2,v3)|}
-m {|v0,*,(v1,*v2,v3),&v4|}
-m {|(v0,*v1,v2),*,v3|}
-m {|(v0,*v1,v2),*,v3,&v4|}
-m {|(v0, *v1, v2)|}
-m {|(*,v)|}
-0
-}, "block parameter (shouldn't SEGV: [ruby-dev:31143])"
-
-assert_equal 'nil', %q{
-  def m
-    yield
-  end
-  m{|&b| b}.inspect
-}, '[ruby-dev:31147]'
-
-assert_equal 'nil', %q{
-  def m()
-    yield
-  end
-  m {|(v,(*))|}.inspect
-}, '[ruby-dev:31160]'
-
-assert_equal 'nil', %q{
-  def m()
-    yield
-  end
-  m {|(*,a,b)|}.inspect
-}, '[ruby-dev:31153]'
-
-assert_equal 'nil', %q{
-  def m()
-    yield
-  end
-  m {|((*))|}.inspect
-}
-
-assert_equal %q{[1, 1, [1, nil], [1, nil], [1, nil], [1, nil], [1, 1], 1, [1, nil], [1, nil], [1, nil], [1, nil], [[1, 1], [1, 1]], [1, 1], [1, 1], [1, 1], [1, nil], [1, nil], [[[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]], [[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]]]}, %q{
-def m(ary = [])
-  yield(ary)
-end
-
-$ans = []
-o = 1
-5.times{
-  v,(*) = o; $ans << o
-  m(o){|(v,(*))| $ans << v}
-  ((x, y)) = o; $ans << [x, y]
-  m(o){|((x, y))| $ans << [x, y]}
-  (((x, y))) = o; $ans << [x, y]
-  m(o){|(((x, y)))| $ans << [x, y]}
-  o = [o, o]
-}; $ans
-}
-
-assert_equal '0', %q{
-  def m()
-    yield [0]
-  end
-  m {|*,v| v}.inspect
-}, '[ruby-dev:31437]'
-assert_equal '[0]', %q{
-  def m
-    yield [0]
-  end
-  m{|v, &b| v}.inspect
-}, '[ruby-dev:31440]'
-assert_equal 'ok', %q{
-  begin
-    lambda{|a|}.call(1, 2)
-  rescue ArgumentError
-    :ok
-  else
-    :ng
-  end
-}, '[ruby-dev:31464]'
-assert_equal 'ok', %q{
-  begin
-    lambda{|&b|}.call(3)
-  rescue ArgumentError
-    :ok
-  else
-    :ng
-  end
-}, '[ruby-dev:31472]'
-assert_equal 'ok', %q{
-  class C
-    def each
-      yield [1,2]
-      yield 1,2
-    end
-  end
-  vs1 = []
-  C.new.each {|*v| vs1 << v }
-  vs2 = []               
-  C.new.to_enum.each {|*v| vs2 << v }
-  vs1 == vs2 ? :ok : :ng
-}, '[ruby-dev:32329]'
-
-assert_normal_exit %q{
-  e = [1,2,3].each
-  10000.times {
-    e = [e].each
-  }
-  Thread.new { GC.start }.join
-}, '[ruby-dev:32604]'
-
-
-assert_equal '[nil, []]', %q{
-  def m() yield nil,[] end
-  l = lambda {|*v| v}
-  GC.stress=true
-  r = m(&l)      
-  GC.stress=false
-  r.inspect             
-}, '[ruby-dev:32567]'
-
-assert_equal NilClass.to_s, %q{
-  r = false; 1.times{|&b| r = b}; r.class
-}
-
-assert_equal 'ok', %q{
-  class C
-    define_method(:foo) do |arg, &block|
-      if block then block.call else arg end
-    end
-  end
-  C.new.foo("ng") {"ok"}
-}, '[ruby-talk:266422]'
-
-assert_equal 'ok', %q{
-  STDERR.reopen(STDOUT)
-  class C
-    define_method(:foo) do |&block|
-      block.call if block
-    end
-    result = "ng"
-    new.foo() {result = "ok"}
-    result
-  end
-}
-
-assert_equal "ok", %q{
-  class Bar
-    def bar; :ok; end
-  end
-  def foo
-    yield(Bar.new) if block_given?
-  end
-  foo(&:bar)
-}, '[ruby-core:14279]'
-
-assert_normal_exit %q{
-  class Controller
-    def respond_to(&block)
-      responder = Responder.new
-      block.call(responder)
-      responder.respond
-    end
-    def test_for_bug
-      respond_to{|format|
-        format.js{
-          puts "in test"
-          render{|obj|
-            puts obj
-          }
-        }
-      }
-    end
-    def render(&block)
-      puts "in render"
-    end
-  end
-
-  class Responder
-    def method_missing(symbol, &block)
-      puts "enter method_missing"
-      @response = Proc.new{
-        puts 'in method missing'
-        block.call
-      }
-      puts "leave method_missing"
-    end
-    def respond
-      @response.call
-    end
-  end
-  t = Controller.new
-  t.test_for_bug
-}, '[ruby-core:14395]'
-
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
deleted file mode 100644
index 1c49b83037..0000000000
--- a/bootstraptest/test_class.rb
+++ /dev/null
@@ -1,132 +0,0 @@
-# class
-assert_equal 'true',    %q( class C; end
-                            Object.const_defined?(:C) )
-assert_equal 'Class',   %q( class C; end
-                            C.class )
-assert_equal 'C',       %q( class C; end
-                            C.name )
-assert_equal 'C',       %q( class C; end
-                            C.new.class )
-assert_equal 'C',       %q( class C; end
-                            C.new.class.name )
-assert_equal 'Class',   %q( class C; end
-                            C.new.class.class )
-
-# inherited class
-assert_equal 'true',    %q( class A; end
-                            class C < A; end
-                            Object.const_defined?(:C) )
-assert_equal 'Class',   %q( class A; end
-                            class C < A; end
-                            C.class )
-assert_equal 'C',       %q( class A; end
-                            class C < A; end
-                            C.name )
-assert_equal 'C',       %q( class A; end
-                            class C < A; end
-                            C.new.class )
-assert_equal 'C',       %q( class A; end
-                            class C < A; end
-                            C.new.class.name )
-assert_equal 'Class',   %q( class A; end
-                            class C < A; end
-                            C.new.class.class )
-
-# module
-assert_equal 'true',    %q( module M; end
-                            Object.const_defined?(:M) )
-assert_equal 'Module',  %q( module M; end
-                            M.class )
-assert_equal 'M',       %q( module M; end
-                            M.name )
-assert_equal 'C',       %q( module M; end
-                            class C; include M; end
-                            C.new.class )
-
-# nested class
-assert_equal 'A::B',    %q( class A; end
-                            class A::B; end
-                            A::B )
-assert_equal 'A::B',    %q( class A; end
-                            class A::B; end
-                            A::B.name )
-assert_equal 'A::B',    %q( class A; end
-                            class A::B; end
-                            A::B.new.class )
-assert_equal 'Class',   %q( class A; end
-                            class A::B; end
-                            A::B.new.class.class )
-assert_equal 'A::B::C', %q( class A; end
-                            class A::B; end
-                            class A::B::C; end
-                            A::B::C )
-assert_equal 'A::B::C', %q( class A; end
-                            class A::B; end
-                            class A::B::C; end
-                            A::B::C.name )
-assert_equal 'Class',   %q( class A; end
-                            class A::B; end
-                            class A::B::C; end
-                            A::B::C.class )
-assert_equal 'A::B::C', %q( class A; end
-                            class A::B; end
-                            class A::B::C; end
-                            A::B::C.new.class )
-assert_equal 'Class',   %q( class A; end
-                            class A::B; end
-                            class A::B::C; end
-                            A::B::C.new.class.class )
-assert_equal 'A::B2',   %q( class A; end
-                            class A::B; end
-                            class A::B2 < A::B; end
-                            A::B2 )
-assert_equal 'Class',   %q( class A; end
-                            class A::B; end
-                            class A::B2 < A::B; end
-                            A::B2.class )
-
-# reopen
-assert_equal 'true',    %q( class C; end;  c1 = ::C
-                            class C; end;  c2 = ::C
-                            c1.equal?(c2) )
-assert_equal '1',       %q( class C; end
-                            class A; end
-                            begin class C < A; end; rescue TypeError; 1 end )
-assert_equal '1',       %q( class C; end
-                            begin module C; end; rescue TypeError; 1 end )
-assert_equal '1',       %q( C = 1   # [yarv-dev:782]
-                            begin class C; end; rescue TypeError; 1 end )
-assert_equal '1',       %q( C = 1   # [yarv-dev:800]
-                            begin module C; end; rescue TypeError; 1 end )
-
-# colon2, colon3
-assert_equal '1',       %q( class A; end;  A::C = 1;  A::C )
-assert_equal '1',       %q( A = 7;  begin A::C = 7; rescue TypeError; 1 end )
-assert_equal '1',       %q( begin 7::C = 7; rescue TypeError; 1 end )
-assert_equal 'C',       %q( class A; class ::C; end end;  C )
-assert_equal 'Class',   %q( class A; class ::C; end end;  C.class )
-assert_equal 'OK',      %q( class A; ::C = "OK"; end;  C )
-assert_equal 'String',  %q( class A; ::C = "OK"; end;  C.class )
-
-# class/module dup
-assert_equal 'Class',   %q( class C; end;  C.dup.class )
-assert_equal 'Module',  %q( module M; end;  M.dup.class )
-
-
-assert_equal "ok", %q{
-  module Foo
-  end
-
-  begin
-    def foo(&b)
-      Foo.module_eval &b
-    end
-    foo{
-      def bar
-      end
-    }
-    bar()
-  rescue NameError
-    :ok
-  end
-}, '[ruby-core:14378]'
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
deleted file mode 100644
index 8b99c7968c..0000000000
--- a/bootstraptest/test_eval.rb
+++ /dev/null
@@ -1,288 +0,0 @@
-assert_equal %q{ok}, %q{
-  def m
-    a = :ok
-    $b = binding
-  end
-  m
-  eval('a', $b)
-}
-assert_equal %q{[:ok, :ok2]}, %q{
-  def m
-    a = :ok
-    $b = binding
-  end
-  m
-  eval('b = :ok2', $b)
-  eval('[a, b]', $b)
-}
-assert_equal %q{[nil, 1]}, %q{
-  $ans = []
-  def m
-    $b = binding
-  end
-  m
-  $ans << eval(%q{
-    $ans << eval(%q{
-      a
-    }, $b)
-    a = 1
-  }, $b)
-  $ans
-}
-assert_equal %q{C}, %q{
-  Const = :top
-  class C
-    Const = :C
-    def m
-      binding
-    end
-  end
-  eval('Const', C.new.m)
-}
-assert_equal %q{top}, %q{
-  Const = :top
-  a = 1
-  class C
-    Const = :C
-    def m
-      eval('Const', TOPLEVEL_BINDING)
-    end
-  end
-  C.new.m
-}
-assert_equal %q{:ok
-ok}, %q{
-  class C
-    $b = binding
-  end
-  eval %q{
-    def m
-      :ok
-    end
-  }, $b
-  p C.new.m
-}
-assert_equal %q{ok}, %q{
-  b = proc{
-    a = :ok
-    binding
-  }.call
-  a = :ng
-  eval("a", b)
-}
-assert_equal %q{C}, %q{
-  class C
-    def foo
-      binding
-    end
-  end
-  C.new.foo.eval("self.class.to_s")
-}
-assert_equal %q{1}, %q{
-  eval('1')
-}
-assert_equal %q{1}, %q{
-  eval('a=1; a')
-}
-assert_equal %q{1}, %q{
-  a = 1
-  eval('a')
-}
-assert_equal %q{ok}, %q{
-  __send__ :eval, %{
-    :ok
-  }
-}
-assert_equal %q{ok}, %q{
-  1.__send__ :instance_eval, %{
-    :ok
-  }
-}
-assert_equal %q{1}, %q{
-  1.instance_eval{
-    self
-  }
-}
-assert_equal %q{foo}, %q{
-  'foo'.instance_eval{
-    self
-  }
-}
-assert_equal %q{1}, %q{
-  class Fixnum
-    Const = 1
-  end
-  1.instance_eval %{
-    Const
-  }
-}
-assert_equal %q{C}, %q{
-  Const = :top
-  class C
-    Const = :C
-  end
-  C.module_eval{
-    Const
-  }
-}
-assert_equal %q{C}, %q{
-  Const = :top
-  class C
-    Const = :C
-  end
-  C.class_eval %{
-    def m
-      Const
-    end
-  }
-  C.new.m
-}
-assert_equal %q{C}, %q{
-  Const = :top
-  class C
-    Const = :C
-  end
-  C.class_eval{
-    def m
-      Const
-    end
-  }
-  C.new.m
-}
-assert_equal %q{[:top, :C, :top, :C]}, %q{
-  Const = :top
-  class C
-    Const = :C
-  end
-  $nest = false
-  $ans = []
-  def m
-    $ans << Const
-    C.module_eval %{
-      $ans << Const
-      Boo = false unless defined? Boo
-      unless $nest
-        $nest = true
-        m
-      end
-    }
-  end
-  m
-  $ans
-}
-assert_equal %q{[10, main]}, %q{
-  $nested = false
-  $ans = []
-  $pr = proc{
-    $ans << self
-    unless $nested
-      $nested = true
-      $pr.call
-    end
-  }
-  class C
-    def initialize &b
-      10.instance_eval(&b)
-    end
-  end
-  C.new(&$pr)
-  $ans
-}
-
-%w[break next redo].each do |keyword|
-  assert_match %r"Can't escape from eval with #{keyword}\z", %{
-    begin
-      eval "0 rescue #{keyword}"
-    rescue SyntaxError => e
-      e.message
-    end
-  }, '[ruby-dev:31372]'
-end
-
-assert_normal_exit %q{
-  STDERR.reopen(STDOUT)
-  class Foo
-     def self.add_method
-       class_eval("def some-bad-name; puts 'hello' unless @some_variable.some_function(''); end")
-     end
-  end
-  Foo.add_method
-}, '[ruby-core:14556] reported by Frederick Cheung'
-
-assert_equal 'ok', %q{
-  class Module
-    def my_module_eval(&block)
-      module_eval(&block)
-    end
-  end
-  class String
-    Integer.my_module_eval do
-      def hoge; end
-    end
-  end
-  if Integer.instance_methods(false).map{|m|m.to_sym}.include?(:hoge) &&
-     !String.instance_methods(false).map{|m|m.to_sym}.include?(:hoge)
-    :ok
-  else
-    :ng
-  end
-}, "[ruby-dev:34236]"
-
-assert_equal 'ok', %q{
-  begin
-    eval("class nil::Foo; end")
-    :ng
-  rescue Exception
-    :ok
-  end
-}
-
-assert_equal 'ok', %q{
-  begin
-    0.instance_eval { def m() :m end }
-    1.m
-    :ng
-  rescue Exception
-    :ok
-  end
-}, '[ruby-dev:34579]'
-
-assert_equal 'ok', %q{
-  begin
-    12.instance_eval { @@a }
-  rescue NameError
-    :ok
-  end
-}, '[ruby-core:16794]'
-
-assert_equal 'ok', %q{
-  begin
-    12.instance_exec { @@a }
-  rescue NameError
-    :ok
-  end
-}, '[ruby-core:16794]'
-
-assert_equal 'ok', %q{
-  begin
-    nil.instance_eval {
-      def a() :a end
-    }
-  rescue TypeError
-    :ok
-  end
-}, '[ruby-core:16796]'
-
-assert_equal 'ok', %q{
-  begin
-    nil.instance_exec {
-      def a() :a end
-    }
-  rescue TypeError
-    :ok
-  end
-}, '[ruby-core:16796]'
-
-assert_normal_exit %q{
-  eval("", method(:proc).call {}.binding)
-}
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
deleted file mode 100644
index bd3d02ade3..0000000000
--- a/bootstraptest/test_exception.rb
+++ /dev/null
@@ -1,404 +0,0 @@
-assert_equal %q{2}, %q{
-  begin
-    1+1
-  ensure
-    2+2
-  end
-}
-assert_equal %q{4}, %q{
-  begin
-    1+1
-    begin
-      2+2
-    ensure
-      3+3
-    end
-  ensure
-    4+4
-  end
-}
-assert_equal %q{4}, %q{
-  begin
-    1+1
-    begin
-      2+2
-    ensure
-      3+3
-    end
-  ensure
-    4+4
-    begin
-      5+5
-    ensure
-      6+6
-    end
-  end
-}
-assert_equal %q{NilClass}, %q{
-  a = nil
-  1.times{|e|
-    begin
-    rescue => err
-    end
-    a = err.class
-  }
-  a
-}
-assert_equal %q{RuntimeError}, %q{
-  a = nil
-  1.times{|e|
-    begin
-      raise
-    rescue => err
-    end
-    a = err.class
-  }
-  a
-}
-assert_equal %q{}, %q{
-  $!
-}
-assert_equal %q{FOO}, %q{
-  begin
-    raise "FOO"
-  rescue
-    $!
-  end
-}
-assert_equal %q{FOO}, %q{
-  def m
-    $!
-  end
-  begin
-    raise "FOO"
-  rescue
-    m()
-  end
-}
-assert_equal %q{[#<RuntimeError: BAR>, #<RuntimeError: FOO>]}, %q{
-  $ans = []
-  def m
-    $!
-  end
-  begin
-    raise "FOO"
-  rescue
-    begin
-      raise "BAR"
-    rescue
-      $ans << m()
-    end
-    $ans << m()
-  end
-  $ans
-}
-assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{
-  $ans = []
-  def m
-    $!
-  end
-  
-  begin
-    begin
-      raise "FOO"
-    ensure
-      $ans << m()
-    end
-  rescue
-    $ans << m()
-  end
-}
-assert_equal %q{[nil]}, %q{
-  $ans = []
-  def m
-    $!
-  end
-  def m2
-    1.times{
-      begin
-        return
-      ensure
-        $ans << m
-      end
-    }
-  end
-  m2
-  $ans
-}
-assert_equal %q{ok}, %q{
-  begin
-    raise
-  rescue
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  begin
-    raise
-  rescue
-    :ok
-  ensure
-    :ng
-  end
-}
-assert_equal %q{RuntimeError}, %q{
-  begin
-    raise
-  rescue => e
-    e.class
-  end
-}
-assert_equal %q{ng}, %q{
-  begin
-    raise
-  rescue StandardError
-    :ng
-  rescue Exception
-    :ok
-  end
-}
-assert_equal %q{c}, %q{
-  begin
-    begin
-      raise "a"
-    rescue
-      raise "b"
-    ensure
-      raise "c"
-    end
-  rescue => e
-    e.message
-  end
-}
-assert_equal %q{33}, %q{
-  def m a, b
-    a + b
-  end
-  m(1, begin
-         raise
-       rescue
-         2
-       end) +
-  m(10, begin
-         raise
-       rescue
-         20
-       ensure
-         30
-       end)
-}
-assert_equal %q{3}, %q{
-  def m a, b
-    a + b
-  end
-  m(begin
-      raise
-    rescue
-      1
-    end,
-    begin
-      raise
-    rescue
-      2
-    end)
-}
-assert_equal %q{ok3}, %q{
-  class E1 < Exception
-  end
-  
-  def m
-    yield
-  end
-  
-  begin
-    begin
-      begin
-        m{
-          raise
-        }
-      rescue E1
-        :ok2
-      ensure
-      end
-    rescue
-      :ok3
-    ensure
-    end
-  rescue E1
-    :ok
-  ensure
-  end
-}
-assert_equal %q{7}, %q{
-  $i = 0
-  def m
-    iter{
-      begin
-        $i += 1
-        begin
-          $i += 2
-          break
-        ensure
-          
-        end
-      ensure
-        $i += 4
-      end
-      $i = 0
-    }
-  end
-  
-  def iter
-    yield
-  end
-  m
-  $i
-}
-assert_equal %q{10}, %q{
-  $i = 0
-  def m
-    begin
-      $i += 1
-      begin
-        $i += 2
-        return
-      ensure
-        $i += 3
-      end
-    ensure
-      $i += 4
-    end
-    p :end
-  end
-  m
-  $i
-}
-assert_equal %q{1}, %q{
-  begin
-    1
-  rescue
-    2
-  end
-}
-assert_equal %q{4}, %q{
-  begin
-    1
-    begin
-      2
-    rescue
-      3
-    end
-    4
-  rescue
-    5
-  end
-}
-assert_equal %q{3}, %q{
-  begin
-    1
-  rescue
-    2
-  else
-    3
-  end
-}
-assert_equal %q{2}, %q{
-  begin
-    1+1
-  rescue
-    2+2
-  ensure
-    3+3
-  end
-   }
-assert_equal %q{2}, %q{
-  begin
-    1+1
-  rescue
-    2+2
-  ensure
-    3+3
-  end
-   }
-assert_equal %q{6}, %q{
-  begin
-    1+1
-  rescue
-    2+2
-  else
-    3+3
-  ensure
-    4+4
-  end
-   }
-assert_equal %q{12}, %q{
- begin
-   1+1
-   begin
-     2+2
-   rescue
-     3+3
-   else
-     4+4
-   end
- rescue
-   5+5
- else
-   6+6
- ensure
-   7+7
- end
-   }
-assert_equal %q{ok}, %q{ # 
-  proc{
-    begin
-      raise
-      break
-    rescue
-      :ok
-    end
-  }.call
-}
-assert_equal %q{}, %q{
-  proc do
-    begin
-      raise StandardError
-      redo
-    rescue StandardError
-    end
-  end.call
-}
-
-##
-assert_match /undefined method `foo\'/, %q{
-  STDERR.reopen(STDOUT)
-  class C
-    def inspect
-      bar {}
-    end
-    
-    def bar
-      raise
-    ensure
-    end
-  end
-  C.new.foo
-}, "[ruby-dev:31407]"
-
-assert_equal 'nil', %q{
-  doit = false
-  exc = nil
-  t = Thread.new {
-    begin
-      doit = true
-      sleep 10
-    ensure
-      exc = $!
-    end
-  }
-  Thread.pass until doit
-  t.kill
-  t.join
-  exc.inspect
-}, '[ruby-dev:32608]'
-
diff --git a/bootstraptest/test_flip.rb b/bootstraptest/test_flip.rb
deleted file mode 100644
index ff194868b2..0000000000
--- a/bootstraptest/test_flip.rb
+++ /dev/null
@@ -1 +0,0 @@
-assert_equal %q{E}, %q{$_ = "E"; eval("nil if true..~/^E/",nil,"-e"); $_}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
deleted file mode 100644
index 9964dfb2ed..0000000000
--- a/bootstraptest/test_flow.rb
+++ /dev/null
@@ -1,491 +0,0 @@
-assert_equal %q{[1, 2, 4, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each{; $a << 2
-    break; $a << 3
-  }; $a << 4
-  begin; $a << 5
-  ensure; $a << 6
-  end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  begin; $a << 2
-    [1,2].each do; $a << 3
-      break; $a << 4
-    end; $a << 5
-  ensure; $a << 6
-  end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{ok}, %q{
-  ["a"].inject("ng"){|x,y|
-    break :ok
-  }
-}
-assert_equal %q{ok}, %q{
-  unless ''.respond_to? :lines
-    class String
-      def lines
-        self
-      end
-    end
-  end
-  
-  ('a').lines.map{|e|
-    break :ok
-  }
-}
-assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
-  ["a"].inject("ng"){|x,y|; $a << 2
-    break :ok; $a << 3
-  }; $a << 4
-; $a << 5
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
-  ('a'..'b').map{|e|; $a << 2
-    break :ok; $a << 3
-  }; $a << 4
-; $a << 5
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      break; $a << 4
-    ensure; $a << 5
-    end; $a << 6
-  end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 9, 10]}, %q{$a = []; begin; ; $a << 1
-  i=0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    begin; $a << 5
-    ensure; $a << 6
-      break; $a << 7
-    end; $a << 8
-  end; $a << 9
-; $a << 10
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
-  i=0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    begin; $a << 5
-      raise; $a << 6
-    ensure; $a << 7
-      break; $a << 8
-    end; $a << 9
-  end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
-  i=0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    begin; $a << 5
-      raise; $a << 6
-    rescue; $a << 7
-      break; $a << 8
-    end; $a << 9
-  end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      raise StandardError; $a << 4
-    ensure; $a << 5
-      break; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      raise StandardError; $a << 4
-    rescue; $a << 5
-      break; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 6, 8, 10, 11]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      begin; $a << 4
-        break; $a << 5
-      ensure; $a << 6
-      end; $a << 7
-    ensure; $a << 8
-    end; $a << 9
-  end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
-  i = 0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    j = 0; $a << 5
-    while j<3; $a << 6
-      j+=1; $a << 7
-      begin; $a << 8
-        raise; $a << 9
-      rescue; $a << 10
-        break; $a << 11
-      end; $a << 12
-    end; $a << 13
-  end; $a << 14
-; $a << 15
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
-  i = 0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    j = 0; $a << 5
-    while j<3; $a << 6
-      j+=1; $a << 7
-      1.times{; $a << 8
-        begin; $a << 9
-          raise; $a << 10
-        rescue; $a << 11
-          break; $a << 12
-        end; $a << 13
-      }; $a << 14
-    end; $a << 15
-  end; $a << 16
-; $a << 17
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
-  i = 0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    j = 0; $a << 5
-    while j<3; $a << 6
-      j+=1; $a << 7
-      begin; $a << 8
-        raise; $a << 9
-      ensure; $a << 10
-        break; $a << 11
-      end; $a << 12
-    end; $a << 13
-  end; $a << 14
-; $a << 15
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
-  i = 0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    j = 0; $a << 5
-    while j<3; $a << 6
-      j+=1; $a << 7
-      1.times{; $a << 8
-        begin; $a << 9
-          raise; $a << 10
-        ensure; $a << 11
-          break; $a << 12
-        end; $a << 13
-      }; $a << 14
-    end; $a << 15
-  end; $a << 16
-; $a << 17
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  while true; $a << 2
-    begin; $a << 3
-      break; $a << 4
-    ensure; $a << 5
-      break; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin; ; $a << 1
-  while true; $a << 2
-    begin; $a << 3
-      break; $a << 4
-    ensure; $a << 5
-      raise; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 6, 8, 9, 10, 11]}, %q{$a = []; begin;  ; $a << 1
-  begin; $a << 2
-    [1,2].each do; $a << 3
-      begin; $a << 4
-        break; $a << 5
-      ensure; $a << 6
-      end; $a << 7
-    end; $a << 8
-  ensure; $a << 9
-  end; $a << 10
-; $a << 11
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 4, 99]}, %q{$a = []; begin; ; $a << 1
-  begin; $a << 2
-    raise StandardError; $a << 3
-  ensure; $a << 4
-  end; $a << 5
-; $a << 6
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4]}, %q{$a = []; begin;  ; $a << 1
-  begin; $a << 2
-  ensure; $a << 3
-  end ; $a << 4
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      break; $a << 4
-    ensure; $a << 5
-      raise StandardError; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{3}, %q{
-  def m a, b
-    a + b
-  end
-  m(1,
-    while true
-      break 2
-    end
-    )
-}
-assert_equal %q{4}, %q{
-  def m a, b
-    a + b
-  end
-  m(1,
-    (i=0; while i<2
-       i+=1
-       class C
-         next 2
-       end
-     end; 3)
-    )
-}
-assert_equal %q{34}, %q{
-  def m a, b
-    a+b
-  end
-  m(1, 1.times{break 3}) +
-  m(10, (1.times{next 3}; 20))
-}
-assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
-  3.times{; $a << 2
-    class C; $a << 3
-      break; $a << 4
-    end; $a << 5
-  }; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  3.times{; $a << 2
-    class A; $a << 3
-      class B; $a << 4
-        break; $a << 5
-      end; $a << 6
-    end; $a << 7
-  }; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 2, 3, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
-  3.times{; $a << 2
-    class C; $a << 3
-      next; $a << 4
-    end; $a << 5
-  }; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 2, 3, 4, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  3.times{; $a << 2
-    class C; $a << 3
-      class D; $a << 4
-        next; $a << 5
-      end; $a << 6
-    end; $a << 7
-  }; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
-  while true; $a << 2
-    class C; $a << 3
-      break; $a << 4
-    end; $a << 5
-  end; $a << 6
-; $a << 7
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  while true; $a << 2
-    class C; $a << 3
-      class D; $a << 4
-        break; $a << 5
-      end; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 3, 4, 5, 3, 4, 5, 3, 4, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  i=0; $a << 2
-  while i<3; $a << 3
-    i+=1; $a << 4
-    class C; $a << 5
-      next 10; $a << 6
-    end; $a << 7
-  end; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{1}, %q{
-  1.times{
-    while true
-      class C
-        begin
-          break
-        ensure
-          break
-        end
-      end
-    end
-  }
-}
-assert_equal %q{[1, 2, 3, 5, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  [1,2].each do; $a << 2
-    begin; $a << 3
-      next; $a << 4
-    ensure; $a << 5
-    end; $a << 6
-  end; $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 2, 6, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
-  o = "test"; $a << 2
-  def o.test(a); $a << 3
-    return a; $a << 4
-  ensure; $a << 5
-  end; $a << 6
-  o.test(123); $a << 7
-; $a << 8
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 4, 7, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
-  def m1 *args; $a << 2
-    ; $a << 3
-  end; $a << 4
-  def m2; $a << 5
-    m1(:a, :b, (return 1; :c)); $a << 6
-  end; $a << 7
-  m2; $a << 8
-; $a << 9
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 8, 2, 3, 4, 5, 9, 10]}, %q{$a = []; begin; ; $a << 1
-  def m(); $a << 2
-    begin; $a << 3
-      2; $a << 4
-    ensure; $a << 5
-      return 3; $a << 6
-    end; $a << 7
-  end; $a << 8
-  m; $a << 9
-; $a << 10
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 3, 11, 4, 5, 6, 7, 12, 13]}, %q{$a = []; begin; ; $a << 1
-  def m2; $a << 2
-  end; $a << 3
-  def m(); $a << 4
-    m2(begin; $a << 5
-         2; $a << 6
-       ensure; $a << 7
-         return 3; $a << 8
-       end); $a << 9
-    4; $a << 10
-  end; $a << 11
-  m(); $a << 12
-; $a << 13
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[1, 16, 2, 3, 4, 5, 6, 7, 10, 11, 17, 18]}, %q{$a = []; begin; ; $a << 1
-  def m; $a << 2
-    1; $a << 3
-    1.times{; $a << 4
-      2; $a << 5
-      begin; $a << 6
-        3; $a << 7
-        return; $a << 8
-        4; $a << 9
-      ensure; $a << 10
-        5; $a << 11
-      end; $a << 12
-      6; $a << 13
-    }; $a << 14
-    7; $a << 15
-  end; $a << 16
-  m(); $a << 17
-; $a << 18
-; rescue Exception; $a << 99; end; $a}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
-  a = []
-  i = 0
-  begin
-    while i < 1
-      i+=1
-      begin
-        begin
-          next
-        ensure
-          a << :ok
-        end
-      ensure
-        a << :ok2
-      end
-    end
-  ensure
-    a << :last
-  end
-  a
-}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
-  a = []
-  i = 0
-  begin
-    while i < 1
-      i+=1
-      begin
-        begin
-          break
-        ensure
-          a << :ok
-        end
-      ensure
-        a << :ok2
-      end
-    end
-  ensure
-    a << :last
-  end
-  a
-}
-assert_equal %q{[:ok, :ok2, :last]}, %q{
-  a = []
-  i = 0
-  begin
-    while i < 1
-      if i>0
-        break
-      end
-      i+=1
-      begin
-        begin
-          redo
-        ensure
-          a << :ok
-        end
-      ensure
-        a << :ok2
-      end
-    end
-  ensure
-    a << :last
-  end
-  a
-   }
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
deleted file mode 100644
index 743c22c250..0000000000
--- a/bootstraptest/test_fork.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-assert_equal '0', %q{
-  begin
-    GC.stress = true
-    pid = fork {}
-    Process.wait pid
-    $?.to_i
-  rescue NotImplementedError
-    0
-  end
-}, '[ruby-dev:32404]'
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
deleted file mode 100644
index c0b906fb4d..0000000000
--- a/bootstraptest/test_io.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-assert_finish 5, %q{
-  r, w = IO.pipe
-  t1 = Thread.new { r.sysread(1) }
-  t2 = Thread.new { r.sysread(1) }
-  sleep 0.1
-  w.write "a"
-  sleep 0.1
-  w.write "a"
-}, '[ruby-dev:31866]'
-
-assert_finish 10, %q{
-  begin
-    require "io/nonblock"
-    r, w = IO.pipe
-    w.nonblock = true
-    w.write_nonblock("a" * 100000)
-    w.nonblock = false
-    t1 = Thread.new { w.write("b" * 4096) }
-    t2 = Thread.new { w.write("c" * 4096) }
-    sleep 0.5
-    r.sysread(4096).length
-    sleep 0.5
-    r.sysread(4096).length
-    t1.join
-    t2.join
-  rescue LoadError
-  end
-}, '[ruby-dev:32566]'
-
-assert_finish 1, %q{
-  r, w = IO.pipe
-  Thread.new {
-  w << "ab"
-  sleep 0.1
-  w << "ab"
-  }
-  r.gets("abab")
-}
-
-assert_equal 'ok', %q{
-  require 'tmpdir'
-  begin
-    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
-    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
-  rescue Errno::EEXIST
-    retry
-  end
-  save = STDIN.dup
-  STDIN.reopen(rw)
-  STDIN.reopen(save)
-  rw.close
-  File.unlink(tmpname)
-  :ok
-}
-
-assert_equal 'ok', %q{
-  require 'tmpdir'
-  begin
-    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
-    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
-  rescue Errno::EEXIST
-    retry
-  end
-  save = STDIN.dup
-  STDIN.reopen(rw)
-  STDIN.print "a"
-  STDIN.reopen(save)
-  rw.close
-  File.unlink(tmpname)
-  :ok
-}
-
-assert_normal_exit %q{
-  ARGF.set_encoding "foo"
-}
-
-50.times do
-  assert_normal_exit %q{
-    at_exit { p :foo }
-
-    megacontent = "abc" * 12345678
-    File.open("megasrc", "w") {|f| f << megacontent }
-
-    Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
-
-    r1, w1 = IO.pipe
-    r2, w2 = IO.pipe
-    t1 = Thread.new { w1 << megacontent; w1.close }
-    t2 = Thread.new { r2.read }
-    IO.copy_stream(r1, w2) rescue nil
-    r2.close; w2.close
-    r1.close; w1.close
-  }, '', ["INT"] or break
-end
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
deleted file mode 100644
index 77467337c2..0000000000
--- a/bootstraptest/test_jump.rb
+++ /dev/null
@@ -1,261 +0,0 @@
-assert_equal %q{ok}, %q{
-  def m
-    :ng1
-    mm{
-      yield
-    }
-    :ng2
-  end
-
-  def mm
-    :ng3
-    yield
-    :ng4
-  end
-
-  m{
-    break :ok
-  }
-}
-assert_equal %q{ok}, %q{
-  3.times{
-    break :ok
-  }
-}
-assert_equal %q{}, %q{
-  catch(:foo){
-    throw :foo
-  }
-}
-assert_equal %q{false}, %q{
-  catch(:foo){
-    throw :foo, false
-  }
-}
-assert_equal %q{}, %q{
-  catch(:foo){
-    throw :foo, nil
-  }
-}
-assert_equal %q{ok}, %q{
-  catch(:foo){
-    throw :foo, :ok
-  }
-}
-assert_equal %q{}, %q{
-  catch(:foo){
-    1.times{
-      throw :foo
-    }
-  }
-}
-assert_equal %q{ok}, %q{
-  catch(:foo){
-    1.times{
-      throw :foo, :ok
-    }
-  }
-}
-assert_equal %q{ok}, %q{
-  catch(:foo){
-    catch(:bar){
-      throw :foo, :ok
-    }
-    :ng
-  }
-}
-assert_equal %q{ok}, %q{
-  catch(:foo){
-    catch(:bar){
-      1.times{
-        throw :foo, :ok
-      }
-    }
-    :ng
-  }
-}
-assert_equal %q{2}, %q{
-  module Enumerable
-    def all_?
-      self.each{|e|
-        unless yield(e)
-          return false
-        end
-      }
-      true
-    end
-  end
-
-  xxx = 0
-  [1,2].each{|bi|
-    [3,4].each{|bj|
-      [true, nil, true].all_?{|be| be}
-      break
-    }
-    xxx += 1
-  }
-  xxx
-}
-assert_equal %q{ok}, %q{
-  def m
-    yield
-  end
-  
-  m{
-    begin
-    ensure
-      break :ok
-    end
-  }
-}
-assert_equal %q{ok}, %q{
-  def m
-    yield
-    :ok
-  end
-  i=0
-  m{
-    if i>10
-      i*i
-    else
-      i+=1
-      next
-    end
-  }
-}
-assert_equal %q{ok}, %q{
-  def m
-    yield
-  end
-
-  m{
-    next :ok
-  }
-}
-assert_equal %q{131}, %q{
-  def m
-    yield + 10
-  end
-  i=0
-  m{
-    if i>10
-      i*i
-    else
-      i+=1
-      redo
-    end
-  }
-}
-assert_equal %q{ok}, %q{
-begin
-  eval %q{
-    1.times{
-      retry
-    }
-  }
-rescue SyntaxError
-  :ok
-end
-}
-assert_equal %q{3}, %q{
-  def m
-    return 3
-  end
-  m
-}
-assert_equal %q{ok}, %q{
-  def m
-    :ng1
-    mm{
-      return :ok
-    }
-    :ng2
-  end
-
-  def mm
-    :ng3
-    yield
-    :ng4
-  end
-  m
-}
-assert_equal %q{100}, %q{
-  $i = 0
-  def m
-    begin
-      iter{
-        return
-      }
-    ensure
-      $i = 100
-    end
-  end
-  
-  def iter
-    yield
-  end
-  m
-  $i
-}
-assert_equal %q{ok}, %q{
-  def m
-    begin
-      raise
-    rescue
-      return :ok
-    end
-    :ng
-  end
-  m
-}
-assert_equal %q{1}, %q{
-  def m
-    begin
-      raise
-    rescue
-      return 1
-    end
-  end
-  
-  m
-}
-assert_equal %q{1}, %q{
-  def m
-    begin
-      #
-    ensure
-      return 1
-    end
-  end
-  
-  m
-}
-assert_equal 'ok', %q{
-  begin
-    catch {|t| throw t, :ok }
-  rescue ArgumentError
-    :ng
-  end
-}, '[ruby-dev:31609]'
-
-assert_equal "1", %q{
-  catch do |t|
-    begin
-      throw t, 1
-      2
-    ensure
-      3
-    end
-  end
-}, "[ruby-dev:31698]"
-
-assert_normal_exit %q{
-  f = 0
-  1.times do
-    begin
-      f += 1
-    ensure
-      redo unless f > 2
-    end
-  end
-}
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
deleted file mode 100644
index 8480c65308..0000000000
--- a/bootstraptest/test_literal.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-# empty program
-assert_equal '',                ''
-assert_equal '',                ' '
-assert_equal '',                "\n"
-
-# special const
-assert_equal 'true',            'true'
-assert_equal 'TrueClass',       'true.class'
-assert_equal 'false',           'false'
-assert_equal 'FalseClass',      'false.class'
-assert_equal '',                'nil'
-assert_equal 'nil',             'nil.inspect'
-assert_equal 'NilClass',        'nil.class'
-assert_equal 'sym',             ':sym'
-assert_equal ':sym',            ':sym.inspect'
-assert_equal 'Symbol',          ':sym.class'
-assert_equal '1234',            '1234'
-assert_equal 'Fixnum',          '1234.class'
-assert_equal '1234',            '1_2_3_4'
-assert_equal 'Fixnum',          '1_2_3_4.class'
-assert_equal '18',              '0x12'
-assert_equal 'Fixnum',          '0x12.class'
-assert_equal '15',              '0o17'
-assert_equal 'Fixnum',          '0o17.class'
-assert_equal '5',               '0b101'
-assert_equal 'Fixnum',          '0b101.class'
-assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
-assert_equal 'Bignum',          '123456789012345678901234567890.class'
-assert_equal '2.0',             '2.0'
-assert_equal 'Float',           '1.3.class'
-
-# self
-assert_equal 'main',            'self'
-assert_equal 'Object',          'self.class'
-
-# string literal
-assert_equal 'a',               '?a'
-assert_equal 'String',          '?a.class'
-assert_equal 'A',               '?A'
-assert_equal 'String',          '?A.class'
-assert_equal "\n",              '?\n'
-assert_equal 'String',          '?\n.class'
-assert_equal ' ',               '?\ '
-assert_equal 'String',          '?\ .class'
-assert_equal 'string',          "'string'"
-assert_equal 'string',          '"string"'
-assert_equal 'string',          '%(string)'
-assert_equal 'string',          '%q(string)'
-assert_equal 'string',          '%Q(string)'
-assert_equal 'string string',   '"string string"'
-assert_equal ' ',               '" "'
-assert_equal "\0",              '"\0"'
-assert_equal "\1",              '"\1"'
-assert_equal "3",               '"\x33"'
-assert_equal "\n",              '"\n"'
-
-# dynamic string literal
-assert_equal '2',               '"#{1 + 1}"'
-assert_equal '16',              '"#{2 ** 4}"'
-assert_equal 'string',          's = "string"; "#{s}"'
-
-# dynamic symbol literal
-assert_equal 'a3c',             ':"a#{1+2}c"'
-assert_equal ':a3c',            ':"a#{1+2}c".inspect'
-assert_equal 'Symbol',          ':"a#{1+2}c".class'
-
-# xstring
-assert_equal "foo\n",           %q(`echo foo`)
-assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
-
-# regexp
-assert_equal '',                '//.source'
-assert_equal 'Regexp',          '//.class'
-assert_equal '0',               '// =~ "a"'
-assert_equal '0',               '// =~ ""'
-assert_equal 'a',               '/a/.source'
-assert_equal 'Regexp',          '/a/.class'
-assert_equal '0',               '/a/ =~ "a"'
-assert_equal '0',               '/test/ =~ "test"'
-assert_equal '',                '/test/ =~ "tes"'
-assert_equal '0',               're = /test/; re =~ "test"'
-assert_equal '0',               'str = "test"; /test/ =~ str'
-assert_equal '0',               're = /test/; str = "test"; re =~ str'
-
-# dynacmi regexp
-assert_equal 'regexp',          %q(/re#{'ge'}xp/.source)
-assert_equal 'Regexp',          %q(/re#{'ge'}xp/.class)
-
-# array
-assert_equal 'Array',           '[].class'
-assert_equal '0',               '[].size'
-assert_equal '0',               '[].length'
-assert_equal '[]',              '[].inspect'
-assert_equal 'Array',           '[0].class'
-assert_equal '1',               '[3].size'
-assert_equal '[3]',             '[3].inspect'
-assert_equal '3',               'a = [3]; a[0]'
-assert_equal 'Array',           '[1,2].class'
-assert_equal '2',               '[1,2].size'
-assert_equal '[1, 2]',           '[1,2].inspect'
-assert_equal 'Array',           '[1,2,3,4,5].class'
-assert_equal '5',               '[1,2,3,4,5].size'
-assert_equal '[1, 2, 3, 4, 5]', '[1,2,3,4,5].inspect'
-assert_equal '1',               'a = [1,2]; a[0]'
-assert_equal '2',               'a = [1,2]; a[1]'
-assert_equal 'Array',           'a = [1 + 2, 3 + 4, 5 + 6]; a.class'
-assert_equal '[3, 7, 11]',      'a = [1 + 2, 3 + 4, 5 + 6]; a.inspect'
-assert_equal '7',               'a = [1 + 2, 3 + 4, 5 + 6]; a[1]'
-assert_equal '1',               '([0][0] += 1)'
-assert_equal '1',               '([2][0] -= 1)'
-assert_equal 'Array',           'a = [obj = Object.new]; a.class'
-assert_equal '1',               'a = [obj = Object.new]; a.size'
-assert_equal 'true',            'a = [obj = Object.new]; a[0] == obj'
-assert_equal '5',               'a = [1,2,3]; a[1] = 5; a[1]'
-assert_equal 'bar',             '[*:foo];:bar'
-assert_equal '[1, 2]',          'def nil.to_a; [2]; end; [1, *nil]'
-assert_equal '[1, 2]',          'def nil.to_a; [1, 2]; end; [*nil]'
-assert_equal '[0, 1, {2=>3}]',  '[0, *[1], 2=>3]', "[ruby-dev:31592]"
-
-
-# hash
-assert_equal 'Hash',            '{}.class'
-assert_equal '{}',              '{}.inspect'
-assert_equal 'Hash',            '{1=>2}.class'
-assert_equal '{1=>2}',          '{1=>2}.inspect'
-assert_equal '2',               'h = {1 => 2}; h[1]'
-assert_equal '0',               'h = {1 => 2}; h.delete(1); h.size'
-assert_equal '',                'h = {1 => 2}; h.delete(1); h[1]'
-assert_equal '2',               'h = {"string" => "literal", "goto" => "hell"}; h.size'
-assert_equal 'literal', 'h = {"string"=>"literal", "goto"=>"hell"}; h["string"]'
-assert_equal 'hell', 'h = {"string"=>"literal", "goto"=>"hell"}; h["goto"]'
-
-# range
-assert_equal 'Range',           '(1..2).class'
-assert_equal '1..2',            '(1..2).inspect'
-assert_equal '1',               '(1..2).begin'
-assert_equal '2',               '(1..2).end'
-assert_equal 'false',           '(1..2).exclude_end?'
-assert_equal 'Range',           'r = 1..2; r.class'
-assert_equal '1..2',            'r = 1..2; r.inspect'
-assert_equal '1',               'r = 1..2; r.begin'
-assert_equal '2',               'r = 1..2; r.end'
-assert_equal 'false',           'r = 1..2; r.exclude_end?'
-assert_equal 'Range',           '(1...3).class'
-assert_equal '1...3',           '(1...3).inspect'
-assert_equal '1',               '(1...3).begin'
-assert_equal '3',               '(1...3).end'
-assert_equal 'true',            '(1...3).exclude_end?'
-assert_equal 'Range',           'r = (1...3); r.class'
-assert_equal '1...3',           'r = (1...3); r.inspect'
-assert_equal '1',               'r = (1...3); r.begin'
-assert_equal '3',               'r = (1...3); r.end'
-assert_equal 'true',            'r = (1...3); r.exclude_end?'
-assert_equal 'Range',           'r = (1+2 .. 3+4); r.class'
-assert_equal '3..7',            'r = (1+2 .. 3+4); r.inspect'
-assert_equal '3',               'r = (1+2 .. 3+4); r.begin'
-assert_equal '7',               'r = (1+2 .. 3+4); r.end'
-assert_equal 'false',           'r = (1+2 .. 3+4); r.exclude_end?'
-assert_equal 'Range',           'r = (1+2 ... 3+4); r.class'
-assert_equal '3...7',           'r = (1+2 ... 3+4); r.inspect'
-assert_equal '3',               'r = (1+2 ... 3+4); r.begin'
-assert_equal '7',               'r = (1+2 ... 3+4); r.end'
-assert_equal 'true',            'r = (1+2 ... 3+4); r.exclude_end?'
-assert_equal 'Range',           'r = ("a".."c"); r.class'
-assert_equal '"a".."c"',        'r = ("a".."c"); r.inspect'
-assert_equal 'a',               'r = ("a".."c"); r.begin'
-assert_equal 'c',               'r = ("a".."c"); r.end'
-
-assert_equal 'String',          '__FILE__.class'
-assert_equal 'Fixnum',          '__LINE__.class'
-
-###
-
-assert_equal 'ok', %q{
-  # this cause "called on terminated object".
-  ObjectSpace.each_object(Module) {|m| m.name.inspect }
-  :ok
-}
-
-assert_normal_exit %q{
-  begin
-    r = 0**-1
-    r + r
-  rescue
-  end
-}, '[ruby-dev:34524]'
-
-assert_normal_exit %q{
-  begin
-    r = Marshal.load("\x04\bU:\rRational[\ai\x06i\x05")
-    r + r
-  rescue
-  end
-}, '[ruby-dev:34536]'
diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb
deleted file mode 100644
index 18e8cc06a4..0000000000
--- a/bootstraptest/test_load.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-assert_equal 'ok', %q{
-  open("require-lock-test.rb", "w") {|f|
-    f.puts "sleep 0.1"
-    f.puts "module M"
-    f.puts "end"
-  }
-  $:.unshift Dir.pwd
-  vs = (1..2).map {|i|
-    Thread.start {
-      require "require-lock-test"
-      M
-    }
-  }.map {|t| t.value }
-  vs[0] == M && vs[1] == M ? :ok : :ng
-}, '[ruby-dev:32048]'
diff --git a/bootstraptest/test_marshal.rb b/bootstraptest/test_marshal.rb
deleted file mode 100644
index 7e34176169..0000000000
--- a/bootstraptest/test_marshal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-assert_normal_exit %q{
-  Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| v})
-}
-
diff --git a/bootstraptest/test_massign.rb b/bootstraptest/test_massign.rb
deleted file mode 100644
index 0f63dd424a..0000000000
--- a/bootstraptest/test_massign.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-assert_equal '[[1], 2, 3]', '*v1, (a, b) = [1,[2, 3]]; [v1, a, b]'
-assert_equal '[[1], 2, 3]', '*v1,(*), (a, b) = [1,:x,[2, 3]]; [v1, a, b]'
-
-assert_equal '[]',          '*a = *nil; a'
-assert_equal '[nil]',       '*a = nil; a'
-assert_equal '2',           'a, a = 1, 2; a', "[ruby-dev:31522]"
-assert_equal '[1, 2]',      'a, b = 1, 2'
-assert_equal '[1, 2]', %q{
-  ans = []
-  trace_var(:$a){|v| ans << v}
-  trace_var(:$b){|v| ans << v}
-  $a, $b = 1, 2
-  ans
-}
-
-assert_equal 'ok', %q{
-  r = :ok
-  :ng.tap {|(r)|}
-  r
-}, '[ruby-dev:31507]'
-
-=begin
-# generated by this script:
-
-3.times{|i|
-  8.times{|e|
-    ary = (0...e).to_a
-    a,b,c,d,e,f = nil
-    vals = %w(a b c d e f)
-    vals[i] = '*' + vals[i]
-    program = "#{vals.join(", ")} = *ary"
-    eval(program)
-    ans = [a,b,c,d,e,f]
-    puts %Q{
-      assert_equal "#{ans.inspect}", %q{
-        ary = #{ary.inspect}
-        #{program}; [a, b, c, d, e, f]
-      }}
-  }
-}
-=end
-
-      assert_equal "[[], nil, nil, nil, nil, nil]", %q{
-        ary = []
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[], 0, nil, nil, nil, nil]", %q{
-        ary = [0]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[], 0, 1, nil, nil, nil]", %q{
-        ary = [0, 1]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[], 0, 1, 2, nil, nil]", %q{
-        ary = [0, 1, 2]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[], 0, 1, 2, 3, nil]", %q{
-        ary = [0, 1, 2, 3]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[], 0, 1, 2, 3, 4]", %q{
-        ary = [0, 1, 2, 3, 4]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[0], 1, 2, 3, 4, 5]", %q{
-        ary = [0, 1, 2, 3, 4, 5]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[[0, 1], 2, 3, 4, 5, 6]", %q{
-        ary = [0, 1, 2, 3, 4, 5, 6]
-        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[nil, [], nil, nil, nil, nil]", %q{
-        ary = []
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [], nil, nil, nil, nil]", %q{
-        ary = [0]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [], 1, nil, nil, nil]", %q{
-        ary = [0, 1]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [], 1, 2, nil, nil]", %q{
-        ary = [0, 1, 2]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [], 1, 2, 3, nil]", %q{
-        ary = [0, 1, 2, 3]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [], 1, 2, 3, 4]", %q{
-        ary = [0, 1, 2, 3, 4]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [1], 2, 3, 4, 5]", %q{
-        ary = [0, 1, 2, 3, 4, 5]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, [1, 2], 3, 4, 5, 6]", %q{
-        ary = [0, 1, 2, 3, 4, 5, 6]
-        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[nil, nil, [], nil, nil, nil]", %q{
-        ary = []
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, nil, [], nil, nil, nil]", %q{
-        ary = [0]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [], nil, nil, nil]", %q{
-        ary = [0, 1]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [], 2, nil, nil]", %q{
-        ary = [0, 1, 2]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [], 2, 3, nil]", %q{
-        ary = [0, 1, 2, 3]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [], 2, 3, 4]", %q{
-        ary = [0, 1, 2, 3, 4]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [2], 3, 4, 5]", %q{
-        ary = [0, 1, 2, 3, 4, 5]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-      assert_equal "[0, 1, [2, 3], 4, 5, 6]", %q{
-        ary = [0, 1, 2, 3, 4, 5, 6]
-        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
-      }
-
-
-#
-assert_equal 'ok', %q{
-  a,s=[],"aaa"
-  300.times { a<<s; s=s.succ }
-  eval <<-END__
-  GC.stress=true
-  Fiber.new do
-    #{ a.join(",") },*zzz=1
-  end.resume
-  END__
-  :ok
-}, '[ruby-dev:32581]'
-
-assert_equal 'ok', %q{
-  while true
-    *, z = 1
-    break
-  end
-  :ok
-}, '[ruby-dev:32892]'
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
deleted file mode 100644
index 28cd2fbaf6..0000000000
--- a/bootstraptest/test_method.rb
+++ /dev/null
@@ -1,1059 +0,0 @@
-# regular argument
-assert_equal '1',       'def m() 1 end; m()'
-assert_equal '1',       'def m(a) a end; m(1)'
-assert_equal '[1, 2]',  'def m(a,b) [a, b] end; m(1,2)'
-assert_equal '[1, 2, 3]', 'def m(a,b,c) [a, b, c] end; m(1,2,3)'
-assert_equal 'wrong number of arguments (1 for 0)', %q{
-  def m; end
-  begin
-    m(1)
-  rescue => e
-    e.message
-  end
-}
-
-assert_equal 'wrong number of arguments (0 for 1)', %q{
-  def m a; end
-  begin
-    m
-  rescue => e
-    e.message
-  end
-}
-
-# default argument
-assert_equal '1',       'def m(x=1) x end; m()'
-assert_equal '1',       'def m(x=7) x end; m(1)'
-assert_equal '1',       'def m(a,x=1) x end; m(7)'
-assert_equal '1',       'def m(a,x=7) x end; m(7,1)'
-assert_equal '1',       'def m(a,b,x=1) x end; m(7,7)'
-assert_equal '1',       'def m(a,b,x=7) x end; m(7,7,1)'
-assert_equal '1',       'def m(a,x=1,y=1) x end; m(7)'
-assert_equal '1',       'def m(a,x=1,y=1) y end; m(7)'
-assert_equal '1',       'def m(a,x=7,y=1) x end; m(7,1)'
-assert_equal '1',       'def m(a,x=7,y=1) y end; m(7,1)'
-assert_equal '1',       'def m(a,x=7,y=7) x end; m(7,1,1)'
-assert_equal '1',       'def m(a,x=7,y=7) y end; m(7,1,1)'
-
-# rest argument
-assert_equal '[]',      'def m(*a) a end; m().inspect'
-assert_equal '[1]',     'def m(*a) a end; m(1).inspect'
-assert_equal '[1, 2]',  'def m(*a) a end; m(1,2).inspect'
-assert_equal '[]',      'def m(x,*a) a end; m(7).inspect'
-assert_equal '[1]',     'def m(x,*a) a end; m(7,1).inspect'
-assert_equal '[1, 2]',  'def m(x,*a) a end; m(7,1,2).inspect'
-assert_equal '[]',      'def m(x,y,*a) a end; m(7,7).inspect'
-assert_equal '[1]',     'def m(x,y,*a) a end; m(7,7,1).inspect'
-assert_equal '[1, 2]',  'def m(x,y,*a) a end; m(7,7,1,2).inspect'
-assert_equal '[]',      'def m(x,y=7,*a) a end; m(7).inspect'
-assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7).inspect'
-assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7,7).inspect'
-assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7).inspect'
-assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7,7).inspect'
-assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
-assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
-assert_equal '1',       'def m(x,y,z=7,zz=7,*a) zz end; m(7,7,7,1).inspect'
-
-# block argument
-assert_equal 'Proc',    'def m(&block) block end; m{}.class'
-assert_equal 'nil',     'def m(&block) block end; m().inspect'
-assert_equal 'Proc',    'def m(a,&block) block end; m(7){}.class'
-assert_equal 'nil',     'def m(a,&block) block end; m(7).inspect'
-assert_equal '1',       'def m(a,&block) a end; m(1){}'
-assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7){}.class'
-assert_equal 'nil',     'def m(a,b=nil,&block) block end; m(7).inspect'
-assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7,7){}.class'
-assert_equal '1',       'def m(a,b=nil,&block) b end; m(7,1){}'
-assert_equal 'Proc',    'def m(a,b=nil,*c,&block) block end; m(7){}.class'
-assert_equal 'nil',     'def m(a,b=nil,*c,&block) block end; m(7).inspect'
-assert_equal '1',       'def m(a,b=nil,*c,&block) a end; m(1).inspect'
-assert_equal '1',       'def m(a,b=1,*c,&block) b end; m(7).inspect'
-assert_equal '1',       'def m(a,b=7,*c,&block) b end; m(7,1).inspect'
-assert_equal '[1]',     'def m(a,b=7,*c,&block) c end; m(7,7,1).inspect'
-
-# splat
-assert_equal '1',       'def m(a) a end; m(*[1])'
-assert_equal '1',       'def m(x,a) a end; m(7,*[1])'
-assert_equal '1',       'def m(x,y,a) a end; m(7,7,*[1])'
-assert_equal '1',       'def m(a,b) a end; m(*[1,7])'
-assert_equal '1',       'def m(a,b) b end; m(*[7,1])'
-assert_equal '1',       'def m(x,a,b) b end; m(7,*[7,1])'
-assert_equal '1',       'def m(x,y,a,b) b end; m(7,7,*[7,1])'
-assert_equal '1',       'def m(a,b,c) a end; m(*[1,7,7])'
-assert_equal '1',       'def m(a,b,c) b end; m(*[7,1,7])'
-assert_equal '1',       'def m(a,b,c) c end; m(*[7,7,1])'
-assert_equal '1',       'def m(x,a,b,c) a end; m(7,*[1,7,7])'
-assert_equal '1',       'def m(x,y,a,b,c) a end; m(7,7,*[1,7,7])'
-
-# hash argument
-assert_equal '1',       'def m(h) h end; m(7=>1)[7]'
-assert_equal '1',       'def m(h) h end; m(7=>1).size'
-assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7)[7]'
-assert_equal '2',       'def m(h) h end; m(7=>1, 8=>7).size'
-assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7, 9=>7)[7]'
-assert_equal '3',       'def m(h) h end; m(7=>1, 8=>7, 9=>7).size'
-assert_equal '1',       'def m(x,h) h end; m(7, 7=>1)[7]'
-assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7)[7]'
-assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7, 9=>7)[7]'
-assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1)[7]'
-assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7)[7]'
-assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7, 9=>7)[7]'
-
-# block argument
-assert_equal '1',       %q(def m(&block) mm(&block) end
-                           def mm() yield 1 end
-                           m {|a| a })
-assert_equal '1',       %q(def m(x,&block) mm(x,&block) end
-                           def mm(x) yield 1 end
-                           m(7) {|a| a })
-assert_equal '1',       %q(def m(x,y,&block) mm(x,y,&block) end
-                           def mm(x,y) yield 1 end
-                           m(7,7) {|a| a })
-
-# recursive call
-assert_equal '1',       %q(def m(n) n == 0 ? 1 : m(n-1) end; m(5))
-
-# instance method
-assert_equal '1',       %q(class C; def m() 1 end end;  C.new.m)
-assert_equal '1',       %q(class C; def m(a) a end end;  C.new.m(1))
-assert_equal '1',       %q(class C; def m(a = 1) a end end;  C.new.m)
-assert_equal '[1]',     %q(class C; def m(*a) a end end;  C.new.m(1).inspect)
-assert_equal '1',       %q( class C
-                              def m() mm() end
-                              def mm() 1 end
-                            end
-                            C.new.m )
-
-# singleton method (const)
-assert_equal '1',       %q(class C; def C.m() 1 end end;  C.m)
-assert_equal '1',       %q(class C; def C.m(a) a end end;  C.m(1))
-assert_equal '1',       %q(class C; def C.m(a = 1) a end end;  C.m)
-assert_equal '[1]',     %q(class C; def C.m(*a) a end end;  C.m(1).inspect)
-assert_equal '1',       %q(class C; end; def C.m() 1 end;  C.m)
-assert_equal '1',       %q(class C; end; def C.m(a) a end;  C.m(1))
-assert_equal '1',       %q(class C; end; def C.m(a = 1) a end;  C.m)
-assert_equal '[1]',     %q(class C; end; def C.m(*a) a end;  C.m(1).inspect)
-assert_equal '1',       %q(class C; def m() 7 end end; def C.m() 1 end;  C.m)
-assert_equal '1',       %q( class C
-                              def C.m() mm() end
-                              def C.mm() 1 end
-                            end
-                            C.m )
-
-# singleton method (lvar)
-assert_equal '1',       %q(obj = Object.new; def obj.m() 1 end;  obj.m)
-assert_equal '1',       %q(obj = Object.new; def obj.m(a) a end;  obj.m(1))
-assert_equal '1',       %q(obj = Object.new; def obj.m(a=1) a end;  obj.m)
-assert_equal '[1]',     %q(obj = Object.new; def obj.m(*a) a end;  obj.m(1))
-assert_equal '1',       %q(class C; def m() 7 end; end
-                           obj = C.new
-                           def obj.m() 1 end
-                           obj.m)
-
-# inheritance
-assert_equal '1',       %q(class A; def m(a) a end end
-                           class B < A; end
-                           B.new.m(1))
-assert_equal '1',       %q(class A; end
-                           class B < A; def m(a) a end end
-                           B.new.m(1))
-assert_equal '1',       %q(class A; def m(a) a end end
-                           class B < A; end
-                           class C < B; end
-                           C.new.m(1))
-
-# include
-assert_equal '1',       %q(class A; def m(a) a end end
-                           module M; end
-                           class B < A; include M; end
-                           B.new.m(1))
-assert_equal '1',       %q(class A; end
-                           module M; def m(a) a end end
-                           class B < A; include M; end
-                           B.new.m(1))
-
-# alias
-assert_equal '1',       %q( def a() 1 end
-                            alias m a
-                            m() )
-assert_equal '1',       %q( class C
-                              def a() 1 end
-                              alias m a
-                            end
-                            C.new.m )
-assert_equal '1',       %q( class C
-                              def a() 1 end
-                              alias :m a
-                            end
-                            C.new.m )
-assert_equal '1',       %q( class C
-                              def a() 1 end
-                              alias m :a
-                            end
-                            C.new.m )
-assert_equal '1',       %q( class C
-                              def a() 1 end
-                              alias :m :a
-                            end
-                            C.new.m )
-assert_equal '1',       %q( class C
-                              def a() 1 end
-                              alias m a
-                              undef a
-                            end
-                            C.new.m )
-
-# undef
-assert_equal '1',       %q( class C
-                              def m() end
-                              undef m
-                            end
-                            begin C.new.m; rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class A
-                              def m() end
-                            end
-                            class C < A
-                              def m() end
-                              undef m
-                            end
-                            begin C.new.m; rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
-                            class B < A
-                              def b() end
-                              undef a, b
-                            end
-                            begin B.new.a; rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
-                            class B < A
-                              def b() end
-                              undef a, b
-                            end
-                            begin B.new.b; rescue NoMethodError; 1 end )
-
-assert_equal '3',  %q{
-  def m1
-    1
-  end
-  alias m2 m1
-  alias :"#{'m3'}" m1
-  m1 + m2 + m3
-}, '[ruby-dev:32308]'
-assert_equal '1', %q{
-  def foobar
-  end
-  undef :"foo#{:bar}"
-  1
-}, '[ruby-dev:32308]'
-assert_equal '1', %q{
-  def foobar
-    1
-  end
-  alias :"bar#{:baz}" :"foo#{:bar}"
-  barbaz
-}, '[ruby-dev:32308]'
-
-# private
-assert_equal '1',       %q( class C
-                              def m() mm() end
-                              def mm() 1 end
-                              private :mm
-                            end
-                            C.new.m )
-assert_equal '1',       %q( class C
-                              def m() 7 end
-                              private :m
-                            end
-                            begin C.m; rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class C
-                              def C.m() mm() end
-                              def C.mm() 1 end
-                              private_class_method :mm
-                            end
-                            C.m )
-assert_equal '1',       %q( class C
-                              def C.m() 7 end
-                              private_class_method :m
-                            end
-                            begin C.m; rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class C; def m() 1 end end
-                            C.new.m   # cache
-                            class C
-                              alias mm m; private :mm
-                            end
-                            C.new.m
-                            begin C.new.mm; 7; rescue NoMethodError; 1 end )
-
-# nested method
-assert_equal '1',       %q( class C
-                              def m
-                                def mm() 1 end
-                              end
-                            end
-                            C.new.m
-                            C.new.mm )
-assert_equal '1',       %q( class C
-                              def m
-                                def mm() 1 end
-                              end
-                            end
-                            instance_eval "C.new.m; C.new.mm" )
-
-# method_missing
-assert_equal ':m',      %q( class C
-                              def method_missing(mid, *args) mid end
-                            end
-                            C.new.m.inspect )
-assert_equal ':mm',     %q( class C
-                              def method_missing(mid, *args) mid end
-                            end
-                            C.new.mm.inspect )
-assert_equal '[1, 2]',  %q( class C
-                              def method_missing(mid, *args) args end
-                            end
-                            C.new.m(1,2).inspect )
-assert_equal '1',       %q( class C
-                              def method_missing(mid, *args) yield 1 end
-                            end
-                            C.new.m {|a| a })
-assert_equal 'nil',     %q( class C
-                              def method_missing(mid, *args, &block) block end
-                            end
-                            C.new.m.inspect )
-
-# send
-assert_equal '1',       %q( class C; def m() 1 end end;
-                            C.new.__send__(:m) )
-assert_equal '1',       %q( class C; def m() 1 end end;
-                            C.new.send(:m) )
-assert_equal '1',       %q( class C; def m(a) a end end;
-                            C.new.send(:m,1) )
-assert_equal '1',       %q( class C; def m(a,b) a end end;
-                            C.new.send(:m,1,7) )
-assert_equal '1',       %q( class C; def m(x,a=1) a end end;
-                            C.new.send(:m,7) )
-assert_equal '1',       %q( class C; def m(x,a=7) a end end;
-                            C.new.send(:m,7,1) )
-assert_equal '[1, 2]',  %q( class C; def m(*a) a end end;
-                            C.new.send(:m,1,2).inspect )
-assert_equal '1',       %q( class C; def m() 7 end; private :m end
-                            begin C.new.public_send(:m); rescue NoMethodError; 1 end )
-assert_equal '1',       %q( class C; def m() 1 end; private :m end
-                            C.new.send(:m) )
-
-# with block
-assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
-%q{
-  class C
-    def [](a)
-      $ary << [yield, a]
-    end
-    def []=(a, b)
-      $ary << [yield, a, b]
-    end
-  end
-
-  $ary = []
-  C.new[:foo, &lambda{:ok1}]
-  C.new[:foo, &lambda{:ok2}] = :bar
-  $ary
-}
-
-# with
-assert_equal '[:ok1, [:ok2, 11]]', %q{
-  class C
-    def []
-      $ary << :ok1
-      10
-    end
-    def []=(a)
-      $ary << [:ok2, a]
-    end
-  end
-  $ary = []
-  C.new[]+=1
-  $ary
-}
-
-# splat and block arguments
-assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
-def m(*args, &b)
-  $result << [args, b.class]
-end
-$result = []
-ary = [:x, :y, :z]
-obj = :obj
-b = Proc.new{}
-
-m(*ary)
-m(1,*ary)
-m(1,2,*ary)
-m(*obj)
-m(1,*obj)
-m(1,2,*obj)
-m(){}
-m(1){}
-m(1,2){}
-m(&b)
-m(1,&b)
-m(1,2,&b)
-m(*ary,&b)
-m(1,*ary,&b)
-m(1,2,*ary,&b)
-$result
-}
-
-# post test
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4)}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5)}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6)}
-
-assert_equal %q{[1, 2, 3, 4, [5], 6, 7, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, NilClass, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)}
-
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4){}}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5){}}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6){}}
-
-assert_equal %q{[1, 2, 3, 4, [5], 6, 7, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10){}}
-
-assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, Proc, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
-end
-; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11){}}
-
-assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4)}
-
-assert_equal %q{[1, 2, 3, :o2, [], 4, 5, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4, 5)}
-
-assert_equal %q{[1, 2, 3, 4, [], 5, 6, nil, nil]}, %q{
-def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
-  x, y = :x, :y if $foo
-  [m1, m2, o1, o2, r, p1, p2, x, y]
-end
-; m(1, 2, 3, 4, 5, 6)}
-
-
-#
-# super
-#
-=begin
-# below programs are generated by this program:
-
-BASE = <<EOS__
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; <TEST>; super; end; end
-EOS__
-
-tests = {
-%q{
-  def m
-} => %q{
-  C1.new.m
-},
-#
-%q{
-  def m a
-} => %q{
-  C1.new.m 1
-},
-%q{
-  def m a
-    a = :a
-} => %q{
-  C1.new.m 1
-},
-#
-%q{
-  def m a, o=:o
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-},
-%q{
-  def m a, o=:o
-    a = :a
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-},
-%q{
-  def m a, o=:o
-    o = :x
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-},
-#
-%q{
-  def m a, *r
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-  C1.new.m 1, 2, 3
-},
-%q{
-  def m a, *r
-    r = [:x, :y]
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-  C1.new.m 1, 2, 3
-},
-#
-%q{
-  def m a, o=:o, *r
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-  C1.new.m 1, 2, 3
-  C1.new.m 1, 2, 3, 4
-},
-#
-%q{
-  def m a, o=:o, *r, &b
-} => %q{
-  C1.new.m 1
-  C1.new.m 1, 2
-  C1.new.m 1, 2, 3
-  C1.new.m 1, 2, 3, 4
-  C1.new.m(1){}
-  C1.new.m(1, 2){}
-  C1.new.m(1, 2, 3){}
-  C1.new.m(1, 2, 3, 4){}
-},
-#
-"def m(m1, m2, o1=:o1, o2=:o2, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-},
-#
-"def m(m1, m2, *r, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-C1.new.m(1,2,3,4,5,6,7)
-C1.new.m(1,2,3,4,5,6,7,8)
-},
-#
-"def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)" =>
-%q{
-C1.new.m(1,2,3,4)
-C1.new.m(1,2,3,4,5)
-C1.new.m(1,2,3,4,5,6)
-C1.new.m(1,2,3,4,5,6,7)
-C1.new.m(1,2,3,4,5,6,7,8)
-C1.new.m(1,2,3,4,5,6,7,8,9)
-},
-
-###
-}
-
-
-tests.each{|setup, methods| setup = setup.dup; setup.strip!
-  setup = BASE.gsub(/<TEST>/){setup}
-  methods.split(/\n/).each{|m| m = m.dup; m.strip!
-    next if m.empty?
-    expr = "#{setup}; #{m}"
-    result = eval(expr)
-    puts "assert_equal %q{#{result.inspect}}, %q{\n#{expr}}"
-    puts
-  }
-}
-
-=end
-
-assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r; super; end; end
-; C1.new.m 1, 2, 3, 4}
-
-assert_equal %q{[:C0_m, [:a]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a
-    a = :a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8)}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m 1, 2, 3, 4}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1){}}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2){}}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2, 3){}}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o, *r, &b; super; end; end
-; C1.new.m(1, 2, 3, 4){}}
-
-assert_equal %q{[:C0_m, [1, :x]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
-    o = :x; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
-    o = :x; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [:a, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
-    a = :a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [:a, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o
-    a = :a; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
-    r = [:x, :y]; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
-    r = [:x, :y]; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r
-    r = [:x, :y]; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8)}
-
-assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8, 9]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
-; C1.new.m(1,2,3,4,5,6,7,8,9)}
-
-assert_equal %q{[:C0_m, [1]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, *r; super; end; end
-; C1.new.m 1, 2, 3}
-
-assert_equal %q{[:C0_m, []]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m; super; end; end
-; C1.new.m}
-
-assert_equal %q{[:C0_m, [1, :o]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o; super; end; end
-; C1.new.m 1}
-
-assert_equal %q{[:C0_m, [1, 2]]}, %q{
-class C0; def m *args; [:C0_m, args]; end; end
-class C1 < C0; def m a, o=:o; super; end; end
-; C1.new.m 1, 2}
-
-assert_equal %q{[:ok, :ok, :ok, :ok, :ok, :ok, :ng, :ng]}, %q{
-  $ans = []
-  class Foo
-    def m
-    end
-  end
-
-  c1 = c2 = nil
-
-  lambda{
-    $SAFE = 4
-    c1 = Class.new{
-      def m
-      end
-    }
-    c2 = Class.new(Foo){
-      alias mm m
-    }
-  }.call
-
-  def test
-    begin
-      yield
-    rescue SecurityError
-      $ans << :ok
-    else
-      $ans << :ng
-    end
-  end
-
-  o1 = c1.new
-  o2 = c2.new
-  
-  test{o1.m}
-  test{o2.mm}
-  test{o1.send :m}
-  test{o2.send :mm}
-  test{o1.public_send :m}
-  test{o2.public_send :mm}
-  test{o1.method(:m).call}
-  test{o2.method(:mm).call}
-  $ans
-}
-
-assert_equal 'ok', %q{
-  class C
-    def x=(n)
-    end
-    def m
-      self.x = :ok
-    end
-  end
-  C.new.m
-}
-
-assert_equal 'ok', %q{
-  proc{
-    $SAFE = 1
-    class C
-      def m
-        :ok
-      end
-    end
-  }.call
-  C.new.m
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
-  proc{
-    $SAFE = 2
-    class C
-      def m
-        :ok
-      end
-    end
-  }.call
-  C.new.m
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
-  proc{
-    $SAFE = 3
-    class C
-      def m
-        :ng
-      end
-    end
-  }.call
-  begin
-    C.new.m
-  rescue SecurityError
-    :ok
-  end
-}, '[ruby-core:11998]'
-
-assert_equal 'ok', %q{
-  class B
-    def m() :fail end
-  end
-  class C < B
-    undef m
-    begin
-      remove_method :m
-    rescue NameError
-    end
-  end
-  begin
-    C.new.m
-  rescue NameError
-    :ok
-  end
-}, '[ruby-dev:31816], [ruby-dev:31817]'
-
-assert_normal_exit %q{
-  begin
-    Process.setrlimit(Process::RLIMIT_STACK, 1024*1024)
-  rescue Exception
-    exit
-  end
-  class C
-    attr "a" * (2*1024*1024)
-  end
-}, '[ruby-dev:31818]'
-
-assert_equal 'ok', %q{
-  class Module
-    def define_method2(name, &block)
-      define_method(name, &block)
-    end
-  end
-  class C
-    define_method2(:m) {|x, y| :fail }
-  end
-  begin
-    C.new.m([1,2])
-  rescue ArgumentError
-    :ok
-  end
-}
-
-assert_not_match /method_missing/, %q{
-  STDERR.reopen(STDOUT)
-  variable_or_mehtod_not_exist
-}
-
-assert_equal '[false, false, false, false, true, true]', %q{
-  class C
-    define_method(:foo) {
-      block_given?
-    }
-  end
-
-  C.new.foo {}
-
-  class D
-    def foo
-      D.module_eval{
-        define_method(:m1){
-          block_given?
-        }
-      }
-    end
-    def bar
-      D.module_eval{
-        define_method(:m2){
-          block_given?
-        }
-      }
-    end
-  end
-
-  D.new.foo
-  D.new.bar{}
-  [C.new.foo, C.new.foo{}, D.new.m1, D.new.m1{}, D.new.m2, D.new.m2{}]
-}, '[ruby-core:14813]'
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
deleted file mode 100644
index 1a43d42017..0000000000
--- a/bootstraptest/test_objectspace.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-assert_normal_exit %q{
-  eval("", TOPLEVEL_BINDING)
-  minobj = ObjectSpace.to_enum(:each_object).min_by {|a| a.object_id }
-  maxobj = ObjectSpace.to_enum(:each_object).max_by {|a| a.object_id }
-  minobj.object_id.upto(maxobj.object_id) {|id|
-    begin
-      o = ObjectSpace._id2ref(id)
-    rescue RangeError
-      next
-    end
-    o.inspect if defined?(o.inspect)
-  }
-}, '[ruby-dev:31911]'
-
-assert_normal_exit %q{
-  ary = (1..10).to_a
-  ary.permutation(2) {|x|
-    if x == [1,2]
-      ObjectSpace.each_object(String) {|s|
-        s.clear if !s.frozen? && (s.length == 40 || s.length == 80)
-      }
-    end
-  }
-}, '[ruby-dev:31982]'
-
-assert_normal_exit %q{
-  ary = (1..100).to_a
-  ary.permutation(2) {|x|
-    if x == [1,2]
-      ObjectSpace.each_object(Array) {|o| o.clear if o == ary && o.object_id != ary.object_id }
-    end
-  }
-}, '[ruby-dev:31985]'
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
deleted file mode 100644
index 1ab9444c31..0000000000
--- a/bootstraptest/test_proc.rb
+++ /dev/null
@@ -1,396 +0,0 @@
-assert_equal %q{[1, 2, 3]}, %q{
-  def getproc &b
-    b
-  end
-  
-  def m
-    yield
-  end
-  
-  m{
-    i = 1
-    m{
-      j = 2
-      m{
-        k = 3
-        getproc{
-          [i, j, k]
-        }
-      }
-    }
-  }.call
-}
-assert_equal %q{7}, %q{
-  def make_proc(&b)
-    b
-  end
-  
-  def make_closure
-    a = 0
-    make_proc{
-      a+=1
-    }
-  end
-  
-  cl = make_closure
-  cl.call + cl.call * cl.call
-}
-assert_equal %q{ok}, %q{
-  class C
-    def foo
-      :ok
-    end
-  end
-  
-  def block
-    C.method(:new).to_proc
-  end
-  b = block()
-  b.call.foo
-}
-assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
-  def proc &b
-    b
-  end
-  
-  pr = []
-  proc{|i_b|
-    p3 = proc{|j_b|
-      pr << proc{|k_b|
-        [i_b, j_b, k_b]
-      }
-    }
-    p3.call(1)
-    p3.call(2)
-  }.call(0)
-  
-  pr[0].call(:last).concat pr[1].call(:last)
-}
-assert_equal %q{12}, %q{
-  def iter
-    yield
-  end
-  
-  def getproc &b
-    b
-  end
-  
-  iter{
-    bvar = 3
-    getproc{
-      bvar2 = 4
-      bvar * bvar2
-    }
-  }.call
-}
-assert_equal %q{200}, %q{
-  def iter
-    yield
-  end
-  
-  def getproc &b
-    b
-  end
-  
-  loc1 = 0
-  pr1 = iter{
-    bl1 = 1
-    getproc{
-      loc1 += 1
-      bl1  += 1
-      loc1 + bl1
-    }
-  }
-  
-  pr2 = iter{
-    bl1 = 1
-    getproc{
-      loc1 += 1
-      bl1  += 1
-      loc1 + bl1
-    }
-  }
-  
-  pr1.call; pr2.call
-  pr1.call; pr2.call
-  pr1.call; pr2.call
-  (pr1.call + pr2.call) * loc1
-}
-assert_equal %q{[1, 2]}, %q{
-  def proc(&pr)
-    pr
-  end
-  
-  def m
-    a = 1
-    m2{
-      a
-    }
-  end
-  
-  def m2
-    b = 2
-    proc{
-      [yield, b]
-    }
-  end
-  
-  pr = m
-  x = ['a', 1,2,3,4,5,6,7,8,9,0,
-            1,2,3,4,5,6,7,8,9,0,
-            1,2,3,4,5,6,7,8,9,0,
-            1,2,3,4,5,6,7,8,9,0,
-            1,2,3,4,5,6,7,8,9,0,]
-  pr.call
-}
-assert_equal %q{1}, %q{
-  def proc(&pr)
-    pr
-  end
-  
-  def m
-    a = 1
-    m2{
-      a
-    }
-  end
-  
-  def m2
-    b = 2
-    proc{
-      [yield, b]
-    }
-    100000.times{|x|
-      "#{x}"
-    }
-    yield
-  end
-  m
-}
-assert_equal %q{[:C, :C]}, %q{
-  Const = :top
-  class C
-    Const = :C
-    $pr = proc{
-      (1..2).map{
-        Const
-      }
-    }
-  end
-  $pr.call
-}
-assert_equal %q{top}, %q{
-  Const = :top
-  class C
-    Const = :C
-  end
-  pr = proc{
-    Const
-  }
-  C.class_eval %q{
-    pr.call
-  }
-}
-assert_equal %q{1}, %q{
-  def m(&b)
-    b
-  end
-
-  m{|e_proctest| e_proctest}.call(1)
-}
-assert_equal %q{12}, %q{
-  def m(&b)
-    b
-  end
-
-  m{|e_proctest1, e_proctest2|
-    a = e_proctest1 * e_proctest2 * 2
-    a * 3
-  }.call(1, 2)
-}
-assert_equal %q{[[], [1], [1, 2], [1, 2, 3]]}, %q{
-  [
-  Proc.new{|*args| args}.call(),
-  Proc.new{|*args| args}.call(1),
-  Proc.new{|*args| args}.call(1, 2),
-  Proc.new{|*args| args}.call(1, 2, 3),
-  ]
-}
-assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
-  [
-  Proc.new{|a, *b| [a, b]}.call(),
-  Proc.new{|a, *b| [a, b]}.call(1),
-  Proc.new{|a, *b| [a, b]}.call(1, 2),
-  Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
-  ]
-}
-assert_equal %q{0}, %q{
-  pr = proc{
-    $SAFE
-  }
-  $SAFE = 1
-  pr.call
-}
-assert_equal %q{[1, 0]}, %q{
-  pr = proc{
-    $SAFE += 1
-  }
-  [pr.call, $SAFE]
-}
-assert_equal %q{1}, %q{
-  def m(&b)
-    b
-  end
-  m{1}.call
-}
-assert_equal %q{3}, %q{
-  def m(&b)
-    b
-  end
-
-  m{
-    a = 1
-    a + 2
-  }.call
-}
-assert_equal %Q{ok\n}, %q{
-  class A; def get_block; proc {puts "ok"} end end
-  block = A.new.get_block
-  GC.start
-  block.call
-}, '[ruby-core:14885]'
-
-assert_equal 'ok', %q{
-  a = lambda {|x, y, &b| b }
-  b = a.curry[1]
-  if b.call(2){} == nil
-    :ng
-  else
-    :ok
-  end
-}, '[ruby-core:15551]'
-
-assert_equal 'ok', %q{
-  lambda {
-    break :ok
-    :ng
-  }.call
-}, '[ruby-dev:34646]'
-
-assert_equal %q{[:bar, :foo]}, %q{
-  def foo
-    klass = Class.new do
-      define_method(:bar) do
-        return :bar
-      end
-    end
-    [klass.new.bar, :foo]
-  end
-  foo
-}, "[ ruby-Bugs-19304 ]"
-
-assert_equal 'ok', %q{
-   $x = :ok
-   def def7(x, y)
-      x[y]
-      $x = :ng
-   end
-   def test_def7
-      def7(lambda {|x| x.call}, Proc.new {return})
-      $x = :ng
-   end
-   test_def7
-   $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-  lambda { a = lambda { return }; $x = :ng; a[]; $x = :ok }.call
-  $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-  lambda { a = lambda { break }; $x = :ng; a[]; $x = :ok }.call
-  $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-  def def8
-    $x = :ng
-    lambda { a = Proc.new { return }; a[]}.call
-    $x = :ok
-  end
-  def8
-  $x
-}, '[ruby-core:17164]'
-
-
-assert_equal 'ok', %q{
-   def def9
-      lambda {|a| $x = :ok; a[]; $x = :ng }.call(Proc.new { return })
-      $x = :ng
-   end
-   def9
-   $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-   def def10
-     $x = :ng
-     lambda { 1.times { return } }.call
-     $x = :ok
-   end
-   $x = :ok
-   def10
-   $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-   def def11
-      yield
-   end
-   begin
-      lambda { def11 { return } }.call
-   rescue LocalJumpError
-      :ng
-   else
-      :ok
-   end
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-   def def12
-      b = Proc.new { $x = :ng; lambda { return }.call; $x = :ok }.call
-   end
-   def12
-   $x
-}, '[ruby-core:17164]'
-
-assert_equal 'ok', %q{
-  def m
-    pr = proc{
-      proc{
-        return :ok
-      }
-    }.call
-    pr.call
-    :ng
-  end
-  m()
-}
-
-assert_equal 'ok', %q{
-  class Foo
-    def call_it
-      p = Proc.new
-      p.call
-    end
-  end
-
-  def give_it
-    proc { :ok }
-  end
-
-  f = Foo.new
-  a_proc = give_it
-  f.call_it(&give_it())
-}, '[ruby-core:15711]'
diff --git a/bootstraptest/test_struct.rb b/bootstraptest/test_struct.rb
deleted file mode 100644
index a65964d5f9..0000000000
--- a/bootstraptest/test_struct.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-assert_equal 'Struct::Foo', %q{
-  Struct.instance_eval { const_set(:Foo, nil) }
-  Struct.new("Foo")
-  Struct::Foo
-}
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
deleted file mode 100644
index a9005a4292..0000000000
--- a/bootstraptest/test_syntax.rb
+++ /dev/null
@@ -1,830 +0,0 @@
-assert_equal %q{4}, %q{1 && 2 && 3 && 4}
-assert_equal %q{}, %q{1 && nil && 3 && 4}
-assert_equal %q{}, %q{1 && 2 && 3 && nil}
-assert_equal %q{false}, %q{1 && 2 && 3 && false}
-assert_equal %q{4}, %q{1 and 2 and 3 and 4}
-assert_equal %q{}, %q{1 and nil and 3 and 4}
-assert_equal %q{}, %q{1 and 2 and 3 and nil}
-assert_equal %q{false}, %q{1 and 2 and 3 and false}
-assert_equal %q{}, %q{nil && true}
-assert_equal %q{false}, %q{false && true}
-assert_equal %q{}, %q{
-  case 1
-  when 2
-    :ng
-  end}
-assert_equal %q{ok}, %q{
-  case 1
-  when 10,20,30
-    :ng1
-  when 1,2,3
-    :ok
-  when 100,200,300
-    :ng2
-  else
-    :elseng
-  end}
-assert_equal %q{elseok}, %q{
-  case 123
-  when 10,20,30
-    :ng1
-  when 1,2,3
-    :ng2
-  when 100,200,300
-    :ng3
-  else
-    :elseok
-  end
-}
-assert_equal %q{ok}, %q{
-  case 'test'
-  when /testx/
-    :ng1
-  when /test/
-    :ok
-  when /tetxx/
-    :ng2
-  else
-    :ng_else
-  end
-}
-assert_equal %q{ok}, %q{
-  case Object.new
-  when Object
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  case Object
-  when Object.new
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  case 'test'
-  when 'tes'
-    :ng
-  when 'te'
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  case 'test'
-  when 'tes'
-    :ng
-  when 'te'
-    :ng
-  when 'test'
-    :ok
-  end
-}
-assert_equal %q{ng}, %q{
-  case 'test'
-  when 'tes'
-    :ng
-  when /te/
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  case 'test'
-  when 'tes'
-    :ng
-  when /test/
-    :ok
-  else
-    :ng
-  end
-}
-assert_equal %q{100}, %q{
-  def test(arg)
-    case 1
-    when 2
-      3
-    end
-    return arg
-  end
-  
-  test(100)
-}
-assert_equal %q{ok}, %q{
-  ary = [1, 2]
-  case 1
-  when *ary
-    :ok
-  else
-    :ng
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [1, 2]
-  case 3
-  when *ary
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [1, 2]
-  case 1
-  when :x, *ary
-    :ok
-  when :z
-    :ng1
-  else
-    :ng2
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [1, 2]
-  case 3
-  when :x, *ary
-    :ng1
-  when :z
-    :ng2
-  else
-    :ok
-  end
-}
-assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep]}, %q{
-
-  def make_perm ary, num
-    if num == 1
-      ary.map{|e| [e]}
-    else
-      base = make_perm(ary, num-1)
-      res  = []
-      base.each{|b|
-        ary.each{|e|
-          res << [e] + b
-        }
-      }
-      res
-    end
-  end
-  
-  def each_test
-    conds = make_perm(['fv', 'tv'], 3)
-    bangs = make_perm(['', '!'], 3)
-    exprs = make_perm(['and', 'or'], 3)
-    ['if', 'unless'].each{|syn|
-      conds.each{|cs|
-        bangs.each{|bs|
-          exprs.each{|es|
-            yield(syn, cs, bs, es)
-          }
-        }
-      }
-    }
-  end
-  
-  fv = false
-  tv = true
-  
-  $ans = []
-  each_test{|syn, conds, bangs, exprs|
-    c1, c2, c3 = conds
-    bang1, bang2, bang3 = bangs
-    e1, e2 = exprs
-    eval %Q{
-      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
-        $ans << :then
-      else
-        $ans << :false
-      end
-    }
-  }
-
-  each_test{|syn, conds, bangs, exprs|
-    c1, c2, c3 = conds
-    bang1, bang2, bang3 = bangs
-    e1, e2 = exprs
-    eval %Q{
-      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
-        $ans << :then
-      end
-      $ans << :sep
-    }
-  }
-  $ans
-}
-assert_equal %q{}, %q{
-  defined?(m)
-}
-assert_equal %q{method}, %q{
-  def m
-  end
-  defined?(m)
-}
-assert_equal %q{}, %q{
-  defined?(a.class)
-}
-assert_equal %q{method}, %q{
-  a = 1
-  defined?(a.class)
-}
-assert_equal %q{["method", "method", "method", "method", nil, nil, "method", "method", "method", nil]}, %q{
-  class C
-    def test
-      [defined?(m1()), defined?(self.m1), defined?(C.new.m1),
-       defined?(m2()), defined?(self.m2), defined?(C.new.m2),
-       defined?(m3()), defined?(self.m3), defined?(C.new.m3)]
-    end
-    def m1
-    end
-    private
-    def m2
-    end
-    protected
-    def m3
-    end
-  end
-  C.new.test + [defined?(C.new.m3)]
-}
-assert_equal %q{[nil, nil, nil, nil, "global-variable", "global-variable", nil, nil]}, %q{
-  $ans = [defined?($1), defined?($2), defined?($3), defined?($4)]
-  /(a)(b)/ =~ 'ab'
-  $ans + [defined?($1), defined?($2), defined?($3), defined?($4)]
-}
-assert_equal %q{nilselftruefalse}, %q{
-  defined?(nil) + defined?(self) +
-    defined?(true) + defined?(false)
-}
-assert_equal %q{}, %q{
-  defined?(@a)
-}
-assert_equal %q{instance-variable}, %q{
-  @a = 1
-  defined?(@a)
-}
-assert_equal %q{}, %q{
-  defined?(@@a)
-}
-assert_equal %q{class variable}, %q{
-  @@a = 1
-  defined?(@@a)
-}
-assert_equal %q{}, %q{
-  defined?($a)
-}
-assert_equal %q{global-variable}, %q{
-  $a = 1
-  defined?($a)
-}
-assert_equal %q{}, %q{
-  defined?(C_definedtest)
-}
-assert_equal %q{constant}, %q{
-  C_definedtest = 1
-  defined?(C_definedtest)
-}
-assert_equal %q{}, %q{
-  defined?(::C_definedtest)
-}
-assert_equal %q{constant}, %q{
-  C_definedtest = 1
-  defined?(::C_definedtest)
-}
-assert_equal %q{}, %q{
-  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
-}
-assert_equal %q{constant}, %q{
-  class C_definedtestA
-    class C_definedtestB
-      C_definedtestC = 1
-    end
-  end
-  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
-}
-assert_equal %q{30}, %q{
-  sum = 0
-  30.times{|ib|
-    if ib % 10 == 0 .. true
-      sum += ib
-    end
-  }
-  sum
-}
-assert_equal %q{63}, %q{
-  sum = 0
-  30.times{|ib|
-    if ib % 10 == 0 ... true
-      sum += ib
-    end
-  }
-  sum
-}
-assert_equal %q{[["NUM", "Type: NUM\n"], ["NUM", "123\n"], ["NUM", "456\n"], ["NUM", "Type: ARP\n"], ["NUM", "aaa\n"], ["NUM", "bbb\n"], ["NUM", "\f\n"], ["ARP", "Type: ARP\n"], ["ARP", "aaa\n"], ["ARP", "bbb\n"]]}, %q{
-  t = nil
-  unless ''.respond_to? :lines
-    class String
-      def lines
-        self
-      end
-    end
-  end
-  ary = []
-"this must not print
-Type: NUM
-123
-456
-Type: ARP
-aaa
-bbb
-\f
-this must not print
-hoge
-Type: ARP
-aaa
-bbb
-".lines.each{|l|
-    if (t = l[/^Type: (.*)/, 1])..(/^\f/ =~ l)
-      ary << [t, l]
-    end
-  }
-  ary
-}
-assert_equal %q{1}, %q{if true  then 1 ; end}
-assert_equal %q{}, %q{if false then 1 ; end}
-assert_equal %q{1}, %q{if true  then 1 ; else; 2; end}
-assert_equal %q{2}, %q{if false then 1 ; else; 2; end}
-assert_equal %q{}, %q{if true  then   ; elsif true then ; 1 ; end}
-assert_equal %q{1}, %q{if false then   ; elsif true then ; 1 ; end}
-assert_equal %q{}, %q{unless true  then 1 ; end}
-assert_equal %q{1}, %q{unless false then 1 ; end}
-assert_equal %q{2}, %q{unless true  then 1 ; else; 2; end}
-assert_equal %q{1}, %q{unless false then 1 ; else; 2; end}
-assert_equal %q{1}, %q{1 if true}
-assert_equal %q{}, %q{1 if false}
-assert_equal %q{}, %q{1 if nil}
-assert_equal %q{}, %q{1 unless true}
-assert_equal %q{1}, %q{1 unless false}
-assert_equal %q{1}, %q{1 unless nil}
-assert_equal %q{1}, %q{1 || 2 || 3 || 4}
-assert_equal %q{1}, %q{1 || false || 3 || 4}
-assert_equal %q{2}, %q{nil || 2 || 3 || 4}
-assert_equal %q{2}, %q{false || 2 || 3 || 4}
-assert_equal %q{false}, %q{nil || false || nil || false}
-assert_equal %q{1}, %q{1 or 2 or 3 or 4}
-assert_equal %q{1}, %q{1 or false or 3 or 4}
-assert_equal %q{2}, %q{nil or 2 or 3 or 4}
-assert_equal %q{2}, %q{false or 2 or 3 or 4}
-assert_equal %q{false}, %q{nil or false or nil or false}
-assert_equal %q{elseng}, %q{
-  case
-  when 1==2, 2==3
-    :ng1
-  when false, 4==5
-    :ok
-  when false
-    :ng2
-  else
-    :elseng
-  end
-}
-assert_equal %q{ok}, %q{
-  case
-  when nil, nil
-    :ng1
-  when 1,2,3
-    :ok
-  when false, false
-    :ng2
-  else
-    :elseng
-  end
-}
-assert_equal %q{elseok}, %q{
-  case
-  when nil
-    :ng1
-  when false
-    :ng2
-  else
-    :elseok
-  end}
-assert_equal %q{}, %q{
-  case
-  when 1
-  end
-}
-assert_equal %q{ok}, %q{
-  r = nil
-  ary = []
-  case
-  when false
-    r = :ng1
-  when false, false
-    r = :ng2
-  when *ary
-    r = :ng3
-  when false, *ary
-    r = :ng4
-  when true, *ary
-    r = :ok
-  end
-  r
-}
-assert_equal %q{ok}, %q{
-  ary = []
-  case
-  when false, *ary
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [false, nil]
-  case
-  when *ary
-    :ng
-  else
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [false, nil]
-  case
-  when *ary
-    :ng
-  when true
-    :ok
-  else
-    :ng2
-  end
-}
-assert_equal %q{ng}, %q{
-  ary = [false, nil]
-  case
-  when *ary
-    :ok
-  else
-    :ng
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [false, true]
-  case
-  when *ary
-    :ok
-  else
-    :ng
-  end
-}
-assert_equal %q{ok}, %q{
-  ary = [false, true]
-  case
-  when false, false
-  when false, *ary
-    :ok
-  else
-    :ng
-  end
-}
-assert_equal %q{}, %q{
-  i = 0
-  while i < 10
-    i+=1
-  end}
-assert_equal %q{10}, %q{
-  i = 0
-  while i < 10
-    i+=1
-  end; i}
-assert_equal %q{}, %q{
-  i = 0
-  until i > 10
-    i+=1
-  end}
-assert_equal %q{11}, %q{
-  i = 0
-  until i > 10
-    i+=1
-  end; i}
-assert_equal %q{1}, %q{
-  i = 0
-  begin
-    i+=1
-  end while false
-  i
-}
-assert_equal %q{1}, %q{
-  i = 0
-  begin
-    i+=1
-  end until true
-  i
-}
-def assert_syntax_error expected, code, message = ''
-  assert_equal "#{expected}",
-    "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message
-end
-assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
-assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
-assert_syntax_error "syntax error, unexpected tSTAR, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
-assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
-assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
-assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
-assert_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]'
-assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
-assert_equal %q{1}, %q{
-  class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
-}, '[ruby-dev:31110]'
-assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
-assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
-assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
-assert_syntax_error %q{syntax error, unexpected $end}, %q{!}, '[ruby-dev:31243]'
-assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
-assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
-assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
-assert_equal 'ok', %q{
-  1.times {
-    begin
-    ensure
-      next
-    end
-  }; :ok
-}, '[ruby-dev:31373]'
-assert_equal 'ok', %q{
-  flag = false
-  1.times {
-    next if flag
-    flag = true
-    begin
-    ensure
-      redo
-    end
-  }; :ok
-}, '[ruby-dev:31373]'
-
-assert_equal 'ok', %q{
-  1.times{
-    p(1, (next; 2))
-  }; :ok
-}
-assert_equal '3', %q{
-  i = 0
-  1 + (while true
-         break 2 if (i+=1) > 1
-         next
-       end)
-}
-assert_equal '3', %q{
-  i = 0
-  1 + (while true
-         break 2 if (i+=1) > 1
-         p(1, (next; 2))
-       end)
-}
-# redo
-assert_equal 'ok', %q{
-  i = 0
-  1.times{
-    break if i>1
-    i+=1
-    p(1, (redo; 2))
-  }; :ok
-}
-assert_equal '3', %q{
-  i = 0
-  1 + (while true
-         break 2 if (i+=1) > 1
-         redo
-       end)
-}
-assert_equal '3', %q{
-  i = 0
-  1 + (while true
-         break 2 if (i+=1) > 1
-         p(1, (redo; 2))
-       end)
-}
-assert_equal '1', %q{
-  a = [0]
-  a[*a]+=1
-}
-assert_equal '2', %q{
-  ary = [0]
-  case 1
-  when *ary, 1
-    1
-  end +
-  case
-  when *ary
-    1
-  end
-}
-
-assert_match /invalid multibyte char/, %q{
-  STDERR.reopen(STDOUT)
-  eval("\"\xf0".force_encoding("utf-8"))
-}, '[ruby-dev:32429]'
-
-# method ! and !=
-assert_equal 'true', %q{!false}
-assert_equal 'true', %q{1 == 1}
-assert_equal 'true', %q{1 != 2}
-assert_equal 'true', %q{
-  class C; def !=(obj); true; end; end
-  C.new != 1
-}
-assert_equal 'true', %q{
-  class C; def !@; true; end; end
-  !C.new
-}
-assert_normal_exit %q{
-  eval "while true; return; end rescue p $!"
-}, '[ruby-dev:31663]'
-assert_equal '1', %q{
-  def bar
-    raise
-  end
-
-  def foo
-    1.times{
-      begin
-        return bar
-      rescue
-        :ok
-      end
-    }
-  end
-
-  foo
-}
-
-assert_equal 'ok', %q{
-  counter = 2
-  while true
-    counter -= 1
-    next if counter != 0
-    break
-  end
-  :ok
-}, '[ruby-core:14385]'
-
-assert_equal 'ok', %q{
-  counter = 2
-  while true
-    counter -= 1
-    next if counter != 0
-    break :ok
-  end # direct
-}, '[ruby-core:14385]'
-
-assert_equal 'ok', %q{
-  counter = 2
-  while true
-    counter -= 1
-    break if counter == 0
-    "#{next}"
-  end
-  :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
-  counter = 2
-  while true
-    counter -= 1
-    break if counter == 0
-    next 
-    redo
-  end
-  :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
-  counter = 2
-  while true
-    counter -= 1
-    break if counter == 0
-    next 
-    "#{ redo }"
-  end
-  :ok
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
-  begin
-    raise
-  rescue
-    counter = 2
-    while true
-      counter -= 1
-      break if counter == 0
-      next
-      retry
-    end
-  end
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
-  counter = 2
-  while true
-    counter -= 1
-    break if counter == 0
-    next
-    "#{ break }"
-  end
-}, 'reported by Yusuke ENDOH'
-
-assert_normal_exit %q{
-  counter = 2
-  while true
-    counter -= 1
-    next if counter != 0
-    "#{ break }"
-  end
-}, 'reported by Yusuke ENDOH'
-
-assert_equal 'ok', %q{
-  1.times do
-    [
-      1, 2, 3, 4, 5, 6, 7, 8,
-      begin
-        false ? next : p
-        break while true
-      end
-    ]
-  end
-  :ok
-}, '[ruby-dev:32882]'
-
-assert_equal "1\n2\n", %q{
-  i = 0
-  while i<2
-    i += 1
-    next p(i)
-  end
-}
-
-assert_valid_syntax('1.times {|i|print (42),1;}', '[ruby-list:44479]')
-
-assert_equal 'ok', %q{
-  def a() end
-  begin
-    if defined?(a(1).a)
-      :ng
-    else
-      :ok
-    end
-  rescue
-    :ng
-  end
-}, '[ruby-core:16010]'
-
-assert_equal 'ok', %q{
-  def a() end
-  begin
-    if defined?(a::B)
-      :ng
-    else
-      :ok
-    end
-  rescue
-    :ng
-  end
-}, '[ruby-core:16010]'
-
-assert_normal_exit %q{
-  defined? C && 0
-}
-
-assert_normal_exit %q{
-  class C
-    def m
-      defined?(super())
-    end
-  end
-  C.new.m
-}
-
-assert_equal 'ok', %q{
-  class X < RuntimeError;end
-  x = [X]
-  begin
-   raise X
-  rescue *x
-   :ok
-  end
-}, '[ruby-core:14537]'
-
-assert_equal 'ok', %q{
-  a = [false]
-  (a[0] &&= true) == false ? :ok : :ng
-}, '[ruby-dev:34679]'
-
-assert_normal_exit %q{
-  a = []
-  100.times {|i| a << i << nil << nil }
-  p a.compact!
-}
-
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
deleted file mode 100644
index ebb60056ce..0000000000
--- a/bootstraptest/test_thread.rb
+++ /dev/null
@@ -1,363 +0,0 @@
-# Thread and Fiber
-
-assert_equal %q{ok}, %q{
-  Thread.new{
-  }.join
-  :ok
-}
-assert_equal %q{ok}, %q{
-  Thread.new{
-    :ok
-  }.value
-}
-assert_equal %q{20100}, %q{
-  v = 0
-  (1..200).map{|i|
-    Thread.new{
-      i
-    }
-  }.each{|t|
-    v += t.value
-  }
-  v
-}
-assert_equal %q{5000}, %q{
-  5000.times{|e|
-    (1..2).map{
-      Thread.new{
-      }
-    }.each{|e|
-      e.join()
-    }
-  }
-}
-assert_equal %q{5000}, %q{
-  5000.times{|e|
-    (1..2).map{
-      Thread.new{
-      }
-    }.each{|e|
-      e.join(1000000000)
-    }
-  }
-}
-assert_equal %q{5000}, %q{
-  5000.times{
-    t = Thread.new{}
-    while t.alive?
-      Thread.pass
-    end
-  }
-}
-assert_equal %q{100}, %q{
-  100.times{
-    Thread.new{loop{Thread.pass}}
-  }
-}
-assert_equal %q{ok}, %q{
-  Thread.new{
-    :ok
-  }.join.value
-}
-assert_equal %q{ok}, %q{
-  begin
-    Thread.new{
-      raise "ok"
-    }.join
-  rescue => e
-    e
-  end
-}
-assert_equal %q{ok}, %q{
-  ans = nil
-  t = Thread.new{
-    begin
-      sleep 0.5
-    ensure
-      ans = :ok
-    end
-  }
-  Thread.pass
-  t.kill
-  t.join
-  ans
-}
-assert_equal %q{ok}, %q{
-  t = Thread.new{
-    sleep
-  }
-  sleep 0.1
-  t.raise
-  begin
-    t.join
-    :ng
-  rescue
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  t = Thread.new{
-    loop{}
-  }
-  Thread.pass
-  t.raise
-  begin
-    t.join
-    :ng
-  rescue
-    :ok
-  end
-}
-assert_equal %q{ok}, %q{
-  t = Thread.new{
-  }
-  Thread.pass
-  t.join
-  t.raise # raise to exited thread
-  begin
-    t.join
-    :ok
-  rescue
-    :ng
-  end
-}
-assert_equal %q{run}, %q{
-  t = Thread.new{
-    loop{}
-  }
-  st = t.status
-  t.kill
-  st
-}
-assert_equal %q{sleep}, %q{
-  t = Thread.new{
-    sleep
-  }
-  sleep 0.1
-  st = t.status
-  t.kill
-  st
-}
-assert_equal %q{false}, %q{
-  t = Thread.new{
-  }
-  t.kill
-  sleep 0.1
-  t.status
-}
-assert_equal %q{[ThreadGroup, true]}, %q{
-  ptg = Thread.current.group
-  Thread.new{
-    ctg = Thread.current.group
-    [ctg.class, ctg == ptg]
-  }.value
-}
-assert_equal %q{[1, 1]}, %q{
-  thg = ThreadGroup.new
-
-  t = Thread.new{
-    thg.add Thread.current
-    sleep
-  }
-  sleep 0.1
-  [thg.list.size, ThreadGroup::Default.list.size]
-}
-assert_equal %q{true}, %q{
-  thg = ThreadGroup.new
-
-  t = Thread.new{sleep 5}
-  thg.add t
-  thg.list.include?(t)
-}
-assert_equal %q{[true, nil, true]}, %q{
-  /a/ =~ 'a'
-  $a = $~
-  Thread.new{
-    $b = $~
-    /a/ =~ 'a'
-    $c = $~
-  }
-  $d = $~
-  [$a == $d, $b, $c != $d]
-}
-assert_equal %q{11}, %q{
-  Thread.current[:a] = 1
-  Thread.new{
-    Thread.current[:a] = 10
-    Thread.pass
-    Thread.current[:a]
-  }.value + Thread.current[:a]
-}
-assert_equal %q{100}, %q{
-begin
-  100.times do |i|
-    begin
-      Thread.start(Thread.current) {|u| u.raise }
-      raise
-    rescue
-    ensure
-    end
-  end
-rescue
-  100
-end
-}, '[ruby-dev:31371]'
-
-assert_equal 'true', %{
-  t = Thread.new { loop {} }
-  begin
-    pid = fork {
-      exit t.status != "run"
-    }
-    Process.wait pid
-    $?.success?
-  rescue NotImplementedError
-    true
-  end
-}
-
-assert_finish 3, %{
-  th = Thread.new {sleep 2}
-  th.join(1)
-  th.join
-}
-
-assert_finish 3, %{
-  require 'timeout'
-  th = Thread.new {sleep 2}
-  begin
-    Timeout.timeout(1) {th.join}
-  rescue Timeout::Error
-  end
-  th.join
-}
-
-assert_normal_exit %q{
-  STDERR.reopen(STDOUT)
-  exec "/"
-}
-
-assert_normal_exit %q{
-  (0..10).map {
-    Thread.new {
-     10000.times {
-        Object.new.to_s
-      }
-    }
-  }.each {|t|
-    t.join
-  }
-}
-
-assert_equal 'ok', %q{
-  def m
-    t = Thread.new { while true do // =~ "" end }
-    sleep 0.1
-    10.times {
-      if /((ab)*(ab)*)*(b)/ =~ "ab"*7
-        return :ng if !$4
-        return :ng if $~.size != 5
-      end
-    }
-    :ok
-  ensure
-    Thread.kill t
-  end
-  m
-}, '[ruby-dev:34492]'
-
-assert_normal_exit %q{
-  at_exit { Fiber.new{}.resume }
-}
-
-assert_normal_exit %q{
-  g = enum_for(:local_variables)
-  loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  g = enum_for(:block_given?)
-  loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  g = enum_for(:binding)
-  loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  g = "abc".enum_for(:scan, /./)
-  loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  g = Module.enum_for(:new)
-  loop { g.next }
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  Fiber.new(&Object.method(:class_eval)).resume("foo")
-}, '[ruby-dev:34128]'
-
-assert_normal_exit %q{
-  Thread.new("foo", &Object.method(:class_eval)).join
-}, '[ruby-dev:34128]'
-
-assert_equal 'ok', %q{
-  begin
-    Thread.new { Thread.stop }
-    Thread.stop
-    :ng
-  rescue Exception
-    :ok
-  end
-}
-
-assert_equal 'ok', %q{
-  begin
-    m1, m2 = Mutex.new, Mutex.new
-    Thread.new { m1.lock; sleep 1; m2.lock }
-    m2.lock; sleep 1; m1.lock
-    :ng
-  rescue Exception
-    :ok
-  end
-}
-
-assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock }; sleep 1; m.lock
-  :ok
-}
-
-assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock }; m.lock
-  :ok
-}
-
-assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock }.join; m.lock
-  :ok
-}
-
-assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock; sleep 2 }
-  sleep 1; m.lock
-  :ok
-}
-
-assert_equal 'ok', %q{
-  m = Mutex.new
-  Thread.new { m.lock; sleep 2; m.unlock }
-  sleep 1; m.lock
-  :ok
-}
-
-assert_equal 'ok', %q{
-  t = Thread.new {`echo`}
-  t.join
-  $? ? :ng : :ok
-}, '[ruby-dev:35414]'
diff --git a/class.c b/class.c
index 0d612a5e87..80f57a1622 100644
--- a/class.c
+++ b/class.c
@@ -3,66 +3,48 @@
   class.c -
 
   $Author$
+  $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/signal.h"
-#include "ruby/node.h"
-#include "ruby/st.h"
+#include "ruby.h"
+#include "rubysig.h"
+#include "node.h"
+#include "st.h"
 #include <ctype.h>
 
 extern st_table *rb_class_tbl;
 
-static VALUE
-class_alloc(VALUE flags, VALUE klass)
-{
-    rb_classext_t *ext = ALLOC(rb_classext_t);
-    NEWOBJ(obj, struct RClass);
-    OBJSETUP(obj, klass, flags);
-    obj->ptr = ext;
-    RCLASS_IV_TBL(obj) = 0;
-    RCLASS_M_TBL(obj) = 0;
-    RCLASS_SUPER(obj) = 0;
-    RCLASS_IV_INDEX_TBL(obj) = 0;
-    return (VALUE)obj;
-}
-
 VALUE
-rb_class_boot(VALUE super)
+rb_class_boot(super)
+    VALUE super;
 {
-    VALUE klass = class_alloc(T_CLASS, rb_cClass);
+    NEWOBJ(klass, struct RClass);
+    OBJSETUP(klass, rb_cClass, T_CLASS);
 
-    RCLASS_SUPER(klass) = super;
-    RCLASS_M_TBL(klass) = st_init_numtable();
+    klass->super = super;
+    klass->iv_tbl = 0;
+    klass->m_tbl = 0;		/* safe GC */
+    klass->m_tbl = st_init_numtable();
 
     OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
-void
-rb_check_inheritable(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 singleton class");
-    }
-}
-
 VALUE
-rb_class_new(VALUE super)
+rb_class_new(super)
+    VALUE super;
 {
     Check_Type(super, T_CLASS);
-    rb_check_inheritable(super);
     if (super == rb_cClass) {
 	rb_raise(rb_eTypeError, "can't make subclass of Class");
     }
+    if (FL_TEST(super, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+    }
     return rb_class_boot(super);
 }
 
@@ -72,47 +54,50 @@ struct clone_method_data {
 };
 
 static int
-clone_method(ID mid, NODE *body, struct clone_method_data *data)
+clone_method(mid, body, data)
+    ID mid;
+    NODE *body;
+    struct clone_method_data *data;
 {
-    if (body == 0) {
-	st_insert(data->tbl, mid, 0);
-    }
-    else {
-	st_insert(data->tbl, mid,
-		  (st_data_t)
-		  NEW_FBODY(
-		      NEW_METHOD(body->nd_body->nd_body,
-				 data->klass, /* TODO */
-				 body->nd_body->nd_noex),
-		      0));
+    NODE *fbody = body->nd_body;
+
+    if (fbody && nd_type(fbody) == NODE_SCOPE) {
+	NODE *cref = (NODE*)fbody->nd_rval;
+
+	if (cref) cref = cref->nd_next;
+	fbody = rb_copy_node_scope(fbody, NEW_CREF(data->klass, cref));
     }
+    st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
     return ST_CONTINUE;
 }
 
 /* :nodoc: */
 VALUE
-rb_mod_init_copy(VALUE clone, VALUE orig)
+rb_mod_init_copy(clone, orig)
+    VALUE clone, orig;
 {
     rb_obj_init_copy(clone, orig);
     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC(clone)->klass = rb_singleton_class_clone(orig);
+	RBASIC(clone)->klass = RBASIC(orig)->klass;
+	RBASIC(clone)->klass = rb_singleton_class_clone(clone);
     }
-    RCLASS_SUPER(clone) = RCLASS_SUPER(orig);
-    if (RCLASS_IV_TBL(orig)) {
+    RCLASS(clone)->super = RCLASS(orig)->super;
+    if (RCLASS(orig)->iv_tbl) {
 	ID id;
 
-	RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(orig));
-	CONST_ID(id, "__classpath__");
-	st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
-	CONST_ID(id, "__classid__");
-	st_delete(RCLASS_IV_TBL(clone), (st_data_t*)&id, 0);
+	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
+	id = rb_intern("__classpath__");
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	id = rb_intern("__classid__");
+	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
     }
-    if (RCLASS_M_TBL(orig)) {
+    if (RCLASS(orig)->m_tbl) {
 	struct clone_method_data data;
-	data.tbl = RCLASS_M_TBL(clone) = st_init_numtable();
-	data.klass = clone;
-	st_foreach(RCLASS_M_TBL(orig), clone_method,
-	  (st_data_t)&data);
+
+	data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
+	data.klass = (VALUE)clone;
+
+	st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
     }
 
     return clone;
@@ -120,9 +105,10 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
 
 /* :nodoc: */
 VALUE
-rb_class_init_copy(VALUE clone, VALUE orig)
+rb_class_init_copy(clone, orig)
+    VALUE clone, orig;
 {
-    if (RCLASS_SUPER(clone) != 0) {
+    if (RCLASS(clone)->super != 0) {
 	rb_raise(rb_eTypeError, "already initialized class");
     }
     if (FL_TEST(orig, FL_SINGLETON)) {
@@ -132,16 +118,17 @@ rb_class_init_copy(VALUE clone, VALUE orig)
 }
 
 VALUE
-rb_singleton_class_clone(VALUE obj)
+rb_singleton_class_clone(obj)
+    VALUE obj;
 {
     VALUE klass = RBASIC(obj)->klass;
 
     if (!FL_TEST(klass, FL_SINGLETON))
 	return klass;
     else {
-	struct clone_method_data data;
 	/* copy singleton(unnamed) class */
-        VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
+	NEWOBJ(clone, struct RClass);
+	OBJSETUP(clone, 0, RBASIC(klass)->flags);
 
 	if (BUILTIN_TYPE(obj) == T_CLASS) {
 	    RBASIC(clone)->klass = (VALUE)clone;
@@ -150,15 +137,28 @@ rb_singleton_class_clone(VALUE obj)
 	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
 	}
 
-	RCLASS_SUPER(clone) = RCLASS_SUPER(klass);
-	if (RCLASS_IV_TBL(klass)) {
-	    RCLASS_IV_TBL(clone) = st_copy(RCLASS_IV_TBL(klass));
+	clone->super = RCLASS(klass)->super;
+	clone->iv_tbl = 0;
+	clone->m_tbl = 0;
+	if (RCLASS(klass)->iv_tbl) {
+	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
+	}
+	{
+	    struct clone_method_data data;
+
+	    data.tbl = clone->m_tbl = st_init_numtable();
+	    switch (TYPE(obj)) {
+	      case T_CLASS:
+	      case T_MODULE:
+		data.klass = obj;
+		break;
+	      default:
+		data.klass = 0;
+		break;
+	    }
+
+	    st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
 	}
-	RCLASS_M_TBL(clone) = st_init_numtable();
-	data.tbl = RCLASS_M_TBL(clone);
-	data.klass = (VALUE)clone;
-	st_foreach(RCLASS_M_TBL(klass), clone_method,
-	  (st_data_t)&data);
 	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
 	FL_SET(clone, FL_SINGLETON);
 	return (VALUE)clone;
@@ -166,43 +166,45 @@ rb_singleton_class_clone(VALUE obj)
 }
 
 void
-rb_singleton_class_attached(VALUE klass, VALUE obj)
+rb_singleton_class_attached(klass, obj)
+    VALUE klass, obj;
 {
     if (FL_TEST(klass, FL_SINGLETON)) {
-	ID attached;
-	if (!RCLASS_IV_TBL(klass)) {
-	    RCLASS_IV_TBL(klass) = st_init_numtable();
+	if (!RCLASS(klass)->iv_tbl) {
+	    RCLASS(klass)->iv_tbl = st_init_numtable();
 	}
-	CONST_ID(attached, "__attached__");
-	st_insert(RCLASS_IV_TBL(klass), attached, obj);
+	st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
     }
 }
 
 VALUE
-rb_make_metaclass(VALUE obj, VALUE super)
+rb_make_metaclass(obj, super)
+    VALUE obj, super;
 {
+    VALUE klass = rb_class_boot(super);
+    FL_SET(klass, FL_SINGLETON);
+    RBASIC(obj)->klass = klass;
+    rb_singleton_class_attached(klass, obj);
     if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
-	return RBASIC(obj)->klass = rb_cClass;
+	RBASIC(klass)->klass = klass;
+	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
     }
     else {
-	VALUE metasuper;
-	VALUE klass = rb_class_boot(super);
-
-	FL_SET(klass, FL_SINGLETON);
-	RBASIC(obj)->klass = klass;
-	rb_singleton_class_attached(klass, obj);
+	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
 
-	metasuper = RBASIC(rb_class_real(super))->klass;
 	/* metaclass of a superclass may be NULL at boot time */
 	if (metasuper) {
 	    RBASIC(klass)->klass = metasuper;
 	}
-	return klass;
     }
+
+    return klass;
 }
 
 VALUE
-rb_define_class_id(ID id, VALUE super)
+rb_define_class_id(id, super)
+    ID id;
+    VALUE super;
 {
     VALUE klass;
 
@@ -213,17 +215,31 @@ rb_define_class_id(ID id, VALUE super)
     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(VALUE super, VALUE klass)
+rb_class_inherited(super, klass)
+    VALUE super, klass;
 {
-    ID inherited;
     if (!super) super = rb_cObject;
-    CONST_ID(inherited, "inherited");
-    return rb_funcall(super, inherited, 1, klass);
+    return rb_funcall(super, rb_intern("inherited"), 1, klass);
 }
 
 VALUE
-rb_define_class(const char *name, VALUE super)
+rb_define_class(name, super)
+    const char *name;
+    VALUE super;
 {
     VALUE klass;
     ID id;
@@ -234,7 +250,7 @@ rb_define_class(const char *name, VALUE super)
 	if (TYPE(klass) != T_CLASS) {
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
-	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	if (rb_class_real(RCLASS(klass)->super) != super) {
 	    rb_name_error(id, "%s is already defined", name);
 	}
 	return klass;
@@ -252,7 +268,10 @@ rb_define_class(const char *name, VALUE super)
 }
 
 VALUE
-rb_define_class_under(VALUE outer, const char *name, VALUE super)
+rb_define_class_under(outer, name, super)
+    VALUE outer;
+    const char *name;
+    VALUE super;
 {
     VALUE klass;
     ID id;
@@ -263,7 +282,7 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super)
 	if (TYPE(klass) != T_CLASS) {
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
-	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	if (rb_class_real(RCLASS(klass)->super) != super) {
 	    rb_name_error(id, "%s is already defined", name);
 	}
 	return klass;
@@ -281,17 +300,22 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super)
 }
 
 VALUE
-rb_module_new(void)
+rb_module_new()
 {
-    VALUE mdl = class_alloc(T_MODULE, rb_cModule);
+    NEWOBJ(mdl, struct RClass);
+    OBJSETUP(mdl, rb_cModule, T_MODULE);
 
-    RCLASS_M_TBL(mdl) = st_init_numtable();
+    mdl->super = 0;
+    mdl->iv_tbl = 0;
+    mdl->m_tbl = 0;
+    mdl->m_tbl = st_init_numtable();
 
     return (VALUE)mdl;
 }
 
 VALUE
-rb_define_module_id(ID id)
+rb_define_module_id(id)
+    ID id;
 {
     VALUE mdl;
 
@@ -302,7 +326,8 @@ rb_define_module_id(ID id)
 }
 
 VALUE
-rb_define_module(const char *name)
+rb_define_module(name)
+    const char *name;
 {
     VALUE module;
     ID id;
@@ -322,7 +347,9 @@ rb_define_module(const char *name)
 }
 
 VALUE
-rb_define_module_under(VALUE outer, const char *name)
+rb_define_module_under(outer, name)
+    VALUE outer;
+    const char *name;
 {
     VALUE module;
     ID id;
@@ -343,19 +370,21 @@ rb_define_module_under(VALUE outer, const char *name)
 }
 
 static VALUE
-include_class_new(VALUE module, VALUE super)
+include_class_new(module, super)
+    VALUE module, super;
 {
-    VALUE klass = class_alloc(T_ICLASS, rb_cClass);
+    NEWOBJ(klass, struct RClass);
+    OBJSETUP(klass, rb_cClass, T_ICLASS);
 
     if (BUILTIN_TYPE(module) == T_ICLASS) {
 	module = RBASIC(module)->klass;
     }
-    if (!RCLASS_IV_TBL(module)) {
-	RCLASS_IV_TBL(module) = st_init_numtable();
+    if (!RCLASS(module)->iv_tbl) {
+	RCLASS(module)->iv_tbl = st_init_numtable();
     }
-    RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
-    RCLASS_M_TBL(klass) = RCLASS_M_TBL(module);
-    RCLASS_SUPER(klass) = super;
+    klass->iv_tbl = RCLASS(module)->iv_tbl;
+    klass->m_tbl = RCLASS(module)->m_tbl;
+    klass->super = super;
     if (TYPE(module) == T_ICLASS) {
 	RBASIC(klass)->klass = RBASIC(module)->klass;
     }
@@ -369,7 +398,8 @@ include_class_new(VALUE module, VALUE super)
 }
 
 void
-rb_include_module(VALUE klass, VALUE module)
+rb_include_module(klass, module)
+    VALUE klass, module;
 {
     VALUE p, c;
     int changed = 0;
@@ -386,30 +416,30 @@ rb_include_module(VALUE klass, VALUE module)
     OBJ_INFECT(klass, module);
     c = klass;
     while (module) {
-       int superclass_seen = Qfalse;
+	int superclass_seen = Qfalse;
 
-	if (RCLASS_M_TBL(klass) == RCLASS_M_TBL(module))
+	if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
 	    rb_raise(rb_eArgError, "cyclic include detected");
-       /* ignore if the module included already in superclasses */
-       for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
-           switch (BUILTIN_TYPE(p)) {
-             case T_ICLASS:
-               if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
-                   if (!superclass_seen) {
-                       c = p;  /* move insertion point */
-                   }
-                   goto skip;
-               }
-               break;
-             case T_CLASS:
-               superclass_seen = Qtrue;
-               break;
-           }
-       }
-       c = RCLASS_SUPER(c) = include_class_new(module, RCLASS_SUPER(c));
+	/* ignore if the module included already in superclasses */
+	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
+	    switch (BUILTIN_TYPE(p)) {
+	      case T_ICLASS:
+		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		    if (!superclass_seen) {
+			c = p;	/* move insertion point */
+		    }
+		    goto skip;
+		}
+		break;
+	      case T_CLASS:
+		superclass_seen = Qtrue;
+		break;
+	    }
+	}
+	c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
 	changed = 1;
       skip:
-	module = RCLASS_SUPER(module);
+	module = RCLASS(module)->super;
     }
     if (changed) rb_clear_cache();
 }
@@ -432,12 +462,13 @@ rb_include_module(VALUE klass, VALUE module)
  */
 
 VALUE
-rb_mod_included_modules(VALUE mod)
+rb_mod_included_modules(mod)
+    VALUE mod;
 {
     VALUE ary = rb_ary_new();
     VALUE p;
 
-    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    rb_ary_push(ary, RBASIC(p)->klass);
 	}
@@ -465,12 +496,14 @@ rb_mod_included_modules(VALUE mod)
  */
 
 VALUE
-rb_mod_include_p(VALUE mod, VALUE mod2)
+rb_mod_include_p(mod, mod2)
+    VALUE mod;
+    VALUE mod2;
 {
     VALUE p;
 
     Check_Type(mod2, T_MODULE);
-    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    if (RBASIC(p)->klass == mod2) return Qtrue;
 	}
@@ -495,11 +528,12 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
  */
 
 VALUE
-rb_mod_ancestors(VALUE mod)
+rb_mod_ancestors(mod)
+    VALUE mod;
 {
     VALUE p, ary = rb_ary_new();
 
-    for (p = mod; p; p = RCLASS_SUPER(p)) {
+    for (p = mod; p; p = RCLASS(p)->super) {
 	if (FL_TEST(p, FL_SINGLETON))
 	    continue;
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
@@ -516,10 +550,13 @@ rb_mod_ancestors(VALUE mod)
 #define VISI_CHECK(x,f) (VISI(x) == (f))
 
 static int
-ins_methods_push(ID name, long type, VALUE ary, long visi)
+ins_methods_push(name, type, ary, visi)
+    ID name;
+    long type;
+    VALUE ary;
+    long visi;
 {
     if (type == -1) return ST_CONTINUE;
-
     switch (visi) {
       case NOEX_PRIVATE:
       case NOEX_PROTECTED:
@@ -531,58 +568,70 @@ ins_methods_push(ID name, long type, VALUE ary, long visi)
 	break;
     }
     if (visi) {
-	rb_ary_push(ary, ID2SYM(name));
+	rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
     }
     return ST_CONTINUE;
 }
 
 static int
-ins_methods_i(ID name, long type, VALUE ary)
+ins_methods_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
 {
     return ins_methods_push(name, type, ary, -1); /* everything but private */
 }
 
 static int
-ins_methods_prot_i(ID name, long type, VALUE ary)
+ins_methods_prot_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
 {
     return ins_methods_push(name, type, ary, NOEX_PROTECTED);
 }
 
 static int
-ins_methods_priv_i(ID name, long type, VALUE ary)
+ins_methods_priv_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
 {
     return ins_methods_push(name, type, ary, NOEX_PRIVATE);
 }
 
 static int
-ins_methods_pub_i(ID name, long type, VALUE ary)
+ins_methods_pub_i(name, type, ary)
+    ID name;
+    long type;
+    VALUE ary;
 {
     return ins_methods_push(name, type, ary, NOEX_PUBLIC);
 }
 
 static int
-method_entry(ID key, NODE *body, st_table *list)
+method_entry(key, body, list)
+    ID key;
+    NODE *body;
+    st_table *list;
 {
     long type;
 
-    if (key == ID_ALLOCATOR) {
-	return ST_CONTINUE;
-    }
-    
+    if (key == ID_ALLOCATOR) return ST_CONTINUE;
     if (!st_lookup(list, key, 0)) {
-	if (body ==0 || !body->nd_body->nd_body) {
-	    type = -1; /* none */
-	}
-	else {
-	    type = VISI(body->nd_body->nd_noex);
-	}
+	if (!body->nd_body) type = -1; /* none */
+	else type = VISI(body->nd_noex);
 	st_add_direct(list, key, type);
     }
     return ST_CONTINUE;
 }
 
 static VALUE
-class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, long, VALUE))
+class_instance_method_list(argc, argv, mod, func)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+    int (*func) _((ID, long, VALUE));
 {
     VALUE ary;
     int recur;
@@ -598,8 +647,8 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
     }
 
     list = st_init_numtable();
-    for (; mod; mod = RCLASS_SUPER(mod)) {
-	st_foreach(RCLASS_M_TBL(mod), method_entry, (st_data_t)list);
+    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;
@@ -632,14 +681,17 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
  *       def method3()  end
  *     end
  *     
- *     A.instance_methods                #=> [:method1]
- *     B.instance_methods(false)         #=> [:method2]
- *     C.instance_methods(false)         #=> [:method3]
+ *     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(int argc, VALUE *argv, VALUE mod)
+rb_class_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
 {
     return class_instance_method_list(argc, argv, mod, ins_methods_i);
 }
@@ -654,7 +706,10 @@ rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
  */
 
 VALUE
-rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_protected_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
 {
     return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
 }
@@ -672,12 +727,15 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
  *       private :method1
  *       def method2()  end
  *     end
- *     Mod.instance_methods           #=> [:method2]
- *     Mod.private_instance_methods   #=> [:method1]
+ *     Mod.instance_methods           #=> ["method2"]
+ *     Mod.private_instance_methods   #=> ["method1"]
  */
 
 VALUE
-rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_private_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
 {
     return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
 }
@@ -692,7 +750,10 @@ rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
  */
 
 VALUE
-rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_public_instance_methods(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
 {
     return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
 }
@@ -724,33 +785,34 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
  *       end
  *     end
  *     
- *     Single.singleton_methods    #=> [:four]
- *     a.singleton_methods(false)  #=> [:two, :one]
- *     a.singleton_methods         #=> [:two, :one, :three]
+ *     Single.singleton_methods    #=> ["four"]
+ *     a.singleton_methods(false)  #=> ["two", "one"]
+ *     a.singleton_methods         #=> ["two", "one", "three"]
  */
 
 VALUE
-rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_singleton_methods(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE recur, ary, klass;
     st_table *list;
 
+    rb_scan_args(argc, argv, "01", &recur);
     if (argc == 0) {
 	recur = Qtrue;
     }
-    else {
-	rb_scan_args(argc, argv, "01", &recur);
-    }
     klass = CLASS_OF(obj);
     list = st_init_numtable();
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
-	klass = RCLASS_SUPER(klass);
+	st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+	klass = RCLASS(klass)->super;
     }
     if (RTEST(recur)) {
 	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
-	    st_foreach(RCLASS_M_TBL(klass), method_entry, (st_data_t)list);
-	    klass = RCLASS_SUPER(klass);
+	    st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+	    klass = RCLASS(klass)->super;
 	}
     }
     ary = rb_ary_new();
@@ -761,31 +823,53 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
 }
 
 void
-rb_define_method_id(VALUE klass, ID name, VALUE (*func)(ANYARGS), int argc)
+rb_define_method_id(klass, name, func, argc)
+    VALUE klass;
+    ID name;
+    VALUE (*func)();
+    int argc;
 {
     rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
 }
 
 void
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PUBLIC);
+    ID id = rb_intern(name);
+    int ex = NOEX_PUBLIC;
+
+
+    rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
 }
 
 void
-rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_protected_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
 }
 
 void
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_private_method(klass, name, func, argc)
+    VALUE klass;
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
 }
 
 void
-rb_undef_method(VALUE klass, const char *name)
+rb_undef_method(klass, name)
+    VALUE klass;
+    const char *name;
 {
     rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
 }
@@ -797,7 +881,8 @@ rb_undef_method(VALUE klass, const char *name)
 } while (0)
 
 VALUE
-rb_singleton_class(VALUE obj)
+rb_singleton_class(obj)
+    VALUE obj;
 {
     VALUE klass;
 
@@ -832,47 +917,77 @@ rb_singleton_class(VALUE obj)
 }
 
 void
-rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_singleton_method(obj, name, func, argc)
+    VALUE obj;
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_define_method(rb_singleton_class(obj), name, func, argc);
 }
 
 void
-rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_module_function(module, name, func, argc)
+    VALUE module;
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_define_private_method(module, name, func, argc);
     rb_define_singleton_method(module, name, func, argc);
 }
 
 void
-rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
+rb_define_global_function(name, func, argc)
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_define_module_function(rb_mKernel, name, func, argc);
 }
 
 void
-rb_define_alias(VALUE klass, const char *name1, const char *name2)
+rb_define_alias(klass, name1, name2)
+    VALUE klass;
+    const char *name1, *name2;
 {
     rb_alias(klass, rb_intern(name1), rb_intern(name2));
 }
 
 void
-rb_define_attr(VALUE klass, const char *name, int read, int write)
+rb_define_attr(klass, name, read, write)
+    VALUE klass;
+    const char *name;
+    int read, write;
 {
     rb_attr(klass, rb_intern(name), read, write, Qfalse);
 }
 
+#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
 
 int
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+#else
+rb_scan_args(argc, argv, fmt, va_alist)
+    int argc;
+    const VALUE *argv;
+    const char *fmt;
+    va_dcl
+#endif
 {
     int n, i = 0;
     const char *p = fmt;
     VALUE *var;
     va_list vargs;
 
-    va_start(vargs, fmt);
+    va_init_list(vargs, fmt);
 
     if (*p == '*') goto rest_arg;
 
diff --git a/common.mk b/common.mk
index 792e455e75..bf49aade4a 100644
--- a/common.mk
+++ b/common.mk
@@ -2,11 +2,13 @@ bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-.SUFFIXES: .inc
-
 RUBYLIB       = -
 RUBYOPT       = -
 
+SPEC_GIT_BASE = git://github.com/rubyspec
+MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
+RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
+
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
@@ -15,24 +17,20 @@ LIBRUBY_EXTS  = ./.libruby-with-ext.time
 RDOCOUT       = $(EXTOUT)/rdoc
 
 DMYEXT	      = dmyext.$(OBJEXT)
-NORMALMAINOBJ = main.$(OBJEXT)
-MAINOBJ       = $(NORMALMAINOBJ)
+MAINOBJ	      = main.$(OBJEXT)
 EXTOBJS	      = 
 DLDOBJS	      = $(DMYEXT)
-MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
 
-COMMONOBJS    = array.$(OBJEXT) \
+OBJS	      = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
-		complex.$(OBJEXT) \
 		dir.$(OBJEXT) \
+		dln.$(OBJEXT) \
 		enum.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
 		eval.$(OBJEXT) \
-		load.$(OBJEXT) \
-		proc.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
 		hash.$(OBJEXT) \
@@ -48,14 +46,8 @@ COMMONOBJS    = array.$(OBJEXT) \
 		prec.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
-		rational.$(OBJEXT) \
 		re.$(OBJEXT) \
-		regcomp.$(OBJEXT) \
-		regenc.$(OBJEXT) \
-		regerror.$(OBJEXT) \
-		regexec.$(OBJEXT) \
-		regparse.$(OBJEXT) \
-		regsyntax.$(OBJEXT) \
+		regex.$(OBJEXT) \
 		ruby.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
@@ -63,32 +55,11 @@ COMMONOBJS    = array.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
 		time.$(OBJEXT) \
-		transcode.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
-		blockinlining.$(OBJEXT) \
-		compile.$(OBJEXT) \
-		debug.$(OBJEXT) \
-		iseq.$(OBJEXT) \
-		vm.$(OBJEXT) \
-		vm_dump.$(OBJEXT) \
-		thread.$(OBJEXT) \
-		cont.$(OBJEXT) \
-		id.$(OBJEXT) \
-		$(BUILTIN_ENCOBJS) \
 		$(MISSING)
 
-OBJS          = dln.$(OBJEXT) \
-		encoding.$(OBJEXT) \
-		prelude.$(OBJEXT) \
-		$(COMMONOBJS)
-
-GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
-
-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
-PRELUDES      = prelude.c miniprelude.c golf_prelude.c
-
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
 		--mflags="$(MFLAGS)" \
@@ -107,34 +78,17 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
 TESTSDIR      = $(srcdir)/test
 TESTWORKDIR   = testwork
 
-BOOTSTRAPRUBY = $(BASERUBY)
-
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb
-
-VCS           = svn
-
-all: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) encs
+all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
 prog: $(PROGRAM) $(WPROGRAM)
 
-loadpath: $(PREP)
-	$(MINIRUBY) -e 'p $$:'
-
-$(PREP): $(MKFILES)
-
-miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
-
-GORUBY = go$(RUBY_INSTALL_NAME)
-golf: $(LIBRUBY) $(GOLFOBJS)
-	$(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
-
-program: $(PROGRAM)
+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) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
 
 $(LIBRUBY_EXTS):
 	@exit > $@
@@ -143,73 +97,76 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(COMMONOBJS)
-	@$(NM) -Pgp $(COMMONOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+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: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: $(PREP)
+do-install-nodoc: 
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
 post-install-nodoc:: post-install-local post-install-ext
 
 install-local: pre-install-local do-install-local post-install-local
 pre-install-local:: pre-install-bin pre-install-lib pre-install-man
-do-install-local: $(PREP)
+do-install-local:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+loadpath: $(PREP)
+	$(MINIRUBY) -e 'p $$:'
+
 post-install-local:: post-install-bin post-install-lib post-install-man
 
 install-ext: pre-install-ext do-install-ext post-install-ext
 pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
-do-install-ext: $(PREP)
+do-install-ext:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-install-ext:: post-install-ext-arch post-install-ext-comm
 
 install-arch: pre-install-arch do-install-arch post-install-arch
 pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch: $(PREP)
+do-install-arch:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-install-arch:: post-install-bin post-install-ext-arch
 
 install-comm: pre-install-comm do-install-comm post-install-comm
 pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm: $(PREP)
+do-install-comm:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-install-comm:: post-install-lib post-install-ext-comm post-install-man
 
 install-bin: pre-install-bin do-install-bin post-install-bin
 pre-install-bin:: install-prereq
-do-install-bin: $(PREP)
+do-install-bin:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-install-bin::
 	@$(NULLCMD)
 
 install-lib: pre-install-lib do-install-lib post-install-lib
 pre-install-lib:: install-prereq
-do-install-lib: $(PREP)
+do-install-lib:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-install-lib::
 	@$(NULLCMD)
 
 install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
 pre-install-ext-comm:: install-prereq
-do-install-ext-comm: $(PREP)
+do-install-ext-comm:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-install-ext-comm::
 	@$(NULLCMD)
 
 install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
 pre-install-ext-arch:: install-prereq
-do-install-ext-arch: $(PREP)
+do-install-ext-arch:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-install-ext-arch::
 	@$(NULLCMD)
 
 install-man: pre-install-man do-install-man post-install-man
 pre-install-man:: install-prereq
-do-install-man: $(PREP)
+do-install-man:
 	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
 post-install-man::
 	@$(NULLCMD)
@@ -222,42 +179,42 @@ no-install-all: no-install-nodoc
 what-where-nodoc: no-install-nodoc
 no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
 pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
-dont-install-nodoc:  $(PREP)
+dont-install-nodoc: 
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
 post-no-install-nodoc:: post-no-install-local post-no-install-ext
 
 what-where-local: no-install-local
 no-install-local: pre-no-install-local dont-install-local post-no-install-local
 pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
-dont-install-local: $(PREP)
+dont-install-local:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
 post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
 
 what-where-ext: no-install-ext
 no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
 pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
-dont-install-ext: $(PREP)
+dont-install-ext:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
 
 what-where-arch: no-install-arch
 no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
 pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
-dont-install-arch: $(PREP)
+dont-install-arch:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
 
 what-where-comm: no-install-comm
 no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
 pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
-dont-install-comm: $(PREP)
+dont-install-comm:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
 
 what-where-bin: no-install-bin
 no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
 pre-no-install-bin:: install-prereq
-dont-install-bin: $(PREP)
+dont-install-bin:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-no-install-bin::
 	@$(NULLCMD)
@@ -265,7 +222,7 @@ post-no-install-bin::
 what-where-lib: no-install-lib
 no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
 pre-no-install-lib:: install-prereq
-dont-install-lib: $(PREP)
+dont-install-lib:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-no-install-lib::
 	@$(NULLCMD)
@@ -273,7 +230,7 @@ post-no-install-lib::
 what-where-ext-comm: no-install-ext-comm
 no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
 pre-no-install-ext-comm:: install-prereq
-dont-install-ext-comm: $(PREP)
+dont-install-ext-comm:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-no-install-ext-comm::
 	@$(NULLCMD)
@@ -281,7 +238,7 @@ post-no-install-ext-comm::
 what-where-ext-arch: no-install-ext-arch
 no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
 pre-no-install-ext-arch:: install-prereq
-dont-install-ext-arch: $(PREP)
+dont-install-ext-arch:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-no-install-ext-arch::
 	@$(NULLCMD)
@@ -289,7 +246,7 @@ post-no-install-ext-arch::
 what-where-man: no-install-man
 no-install-man: pre-no-install-man dont-install-man post-no-install-man
 pre-no-install-man:: install-prereq
-dont-install-man: $(PREP)
+dont-install-man:
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
 post-no-install-man::
 	@$(NULLCMD)
@@ -308,7 +265,7 @@ rdoc: $(PROGRAM) PHONY
 what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
 pre-no-install-doc:: install-prereq
-dont-install-doc:: $(PREP)
+dont-install-doc::
 	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-no-install-doc::
 	@$(NULLCMD)
@@ -320,55 +277,37 @@ install-prereq: $(CLEAR_INSTALLED_LIST)
 clear-installed-list:
 	@exit > $(INSTALLED_LIST)
 
-clean: clean-ext clean-local clean-enc
+clean: clean-ext clean-local
 clean-local::
 	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	@$(RM) *.inc $(GOLFOBJS) y.tab.c y.output encdb.h transdb.h
-clean-ext: $(PREP)
+	@$(RM) y.tab.c y.output
+clean-ext:
 	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
-clean-enc:
-	@-$(MAKE) -f enc.mk $(MFLAGS) clean
 
-distclean: distclean-ext distclean-local distclean-enc
+distclean: distclean-ext distclean-local
 distclean-local:: clean-local
-	@$(RM) $(MKFILES) $(arch_hdrdir)/ruby/config.h rbconfig.rb yasmdata.rb encdb.h
-	@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
+	@$(RM) $(MKFILES) config.h rbconfig.rb
+	@$(RM) config.cache config.log config.status
 	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
-distclean-ext: $(PREP)
+distclean-ext:
 	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean
-#	-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
-#	-rmdir -p $(arch_hdrdir)/ruby
-distclean-enc: clean-enc
-	@-$(MAKE) -f enc.mk $(MFLAGS) distclean
 
-realclean:: realclean-ext realclean-local realclean-enc
+realclean:: realclean-ext realclean-local
 realclean-local:: distclean-local
-	@$(RM) parse.c lex.c revision.h
-realclean-ext:: $(PREP)
+	@$(RM) parse.c lex.c
+realclean-ext::
 	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean
-realclean-enc:: distclean-enc
 
 check: test test-all
 
-btest: miniruby$(EXEEXT) PHONY
-	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
-
-btest-miniruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" -q
-
-test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 	@$(MINIRUBY) $(srcdir)/rubytest.rb
 
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) PHONY
-	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
-
-test: test-sample btest-miniruby test-knownbug
-
 test-all:
 	$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
 
-extconf: $(PREP)
+extconf:
 	$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
@@ -377,30 +316,16 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
-encs: enc.mk $(LIBRUBY) $(PREP)
-	$(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans
-	$(MAKE) -f enc.mk RUBY="$(MINIRUBY)" $(MFLAGS)
-
-enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	$(srcdir)/lib/mkmf.rb $(PREP)
-	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@
-
 .PRECIOUS: $(MKFILES)
 
 .PHONY: test install install-nodoc install-doc dist
 
 PHONY:
 
-{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
-
-{$(srcdir)}.y.c:
-	$(YACC) $(YFLAGS) -o y.tab.c $<
-	sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
-	@$(RM) $@ y.tab.c
-	@$(MV) $@.new $@
+{$(VPATH)}parse.c: parse.y
 
 acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
+alloca.$(OBJEXT): {$(VPATH)}alloca.c
 crypt.$(OBJEXT): {$(VPATH)}crypt.c
 dup2.$(OBJEXT): {$(VPATH)}dup2.c
 erf.$(OBJEXT): {$(VPATH)}erf.c
@@ -409,6 +334,9 @@ 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
@@ -416,6 +344,7 @@ 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
@@ -429,359 +358,111 @@ win32.$(OBJEXT): {$(VPATH)}win32.c
 
 ###
 
-RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
-		  {$(VPATH)}intern.h {$(VPATH)}missing.h
-
-array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h
-compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}dln.h
+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 \
+  {$(VPATH)}rubysig.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 dln.$(OBJEXT)
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c \
-  {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h
-encoding.$(OBJEXT): dmyencoding.$(OBJEXT)
-enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}util.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}debug.h {$(VPATH)}node.h
-error.$(OBJEXT): {$(VPATH)}error.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h {$(VPATH)}node.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h \
-  {$(VPATH)}eval_error.c {$(VPATH)}eval_safe.c \
-  {$(VPATH)}eval_jump.c
-load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}io.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}signal.h {$(VPATH)}util.h {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}re.h \
-  {$(VPATH)}regex.h {$(VPATH)}oniguruma.h {$(VPATH)}io.h \
-  {$(VPATH)}encoding.h {$(VPATH)}vm_core.h {$(VPATH)}debug.h \
-  {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}thread_$(THREAD_MODEL).h \
-  {$(VPATH)}gc.h {$(VPATH)}eval_intern.h
-hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}signal.h
-inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}io.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}signal.h {$(VPATH)}util.h
-main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}io.h {$(VPATH)}encoding.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
-object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}debug.h {$(VPATH)}node.h
-pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}parse.y $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}encoding.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}id.h {$(VPATH)}regenc.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c {$(VPATH)}keywords \
-  {$(VPATH)}debug.h
-prec.$(OBJEXT): {$(VPATH)}prec.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h
-proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}gc.h
-process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}signal.h {$(VPATH)}vm_core.h {$(VPATH)}util.h \
-  {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-re.$(OBJEXT): {$(VPATH)}re.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}encoding.h {$(VPATH)}util.h {$(VPATH)}regint.h \
-  {$(VPATH)}regenc.h
-regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}regparse.h \
-  {$(VPATH)}regint.h {$(VPATH)}config.h {$(VPATH)}defines.h \
-  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-regexec.$(OBJEXT): {$(VPATH)}regexec.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-regparse.$(OBJEXT): {$(VPATH)}regparse.c {$(VPATH)}regparse.h \
-  {$(VPATH)}regint.h {$(VPATH)}config.h {$(VPATH)}defines.h \
-  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}encoding.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \
-  {$(VPATH)}signal.h {$(VPATH)}vm_core.h {$(VPATH)}debug.h \
-  {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}thread_$(THREAD_MODEL).h \
+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
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \
+  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.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
-signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}encoding.h {$(VPATH)}vsnprintf.c
-st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}defines.h \
-  {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}encoding.h
-struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h
-thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
-  $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}vm.h \
-  {$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).c
-transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h {$(VPATH)}transcode_data.h
-cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h {$(VPATH)}node.h \
-  {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}gc.h \
-  {$(VPATH)}eval_intern.h {$(VPATH)}util.h {$(VPATH)}dln.h
-time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}encoding.h 
-util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) \
+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
-variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}node.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}version.h $(srcdir)/revision.h
-
-compile.$(OBJEXT): {$(VPATH)}compile.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}node.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}compile.h \
-  {$(VPATH)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc
-iseq.$(OBJEXT): {$(VPATH)}iseq.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}insns.inc \
-  {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc
-vm.$(OBJEXT): {$(VPATH)}vm.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}encoding.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}gc.h {$(VPATH)}insnhelper.h \
-  {$(VPATH)}eval_intern.h {$(VPATH)}util.h {$(VPATH)}signal.h \
-  {$(VPATH)}vm_core.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}vm.h \
-  {$(VPATH)}vm_insnhelper.c {$(VPATH)}insns.inc {$(VPATH)}vm_evalbody.c \
-  {$(VPATH)}vmtc.inc {$(VPATH)}vm.inc {$(VPATH)}insns.def \
-  {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c
-vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}node.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}vm.h
-debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}debug.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}signal.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \
-  {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}id.h
-miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h \
-  {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \
-  {$(VPATH)}vm_core.h {$(VPATH)}signal.h \
-  {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h \
-  {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h \
-  {$(VPATH)}thread_$(THREAD_MODEL).h
-goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h
-
-ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
-  {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
-  {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \
-  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}st.h
-utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
-  {$(VPATH)}defines.h {$(VPATH)}oniguruma.h
-
-INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
-	  vmtc.inc vm.inc
-
-INSNS2VMOPT = --srcdir="$(srcdir)"
-
-$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
-	$(RM) $(PROGRAM)
-	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
-
-minsns.inc: $(srcdir)/template/minsns.inc.tmpl
-
-opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
-
-optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
-
-optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
-
-insns.inc: $(srcdir)/template/insns.inc.tmpl
-
-insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
-
-vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
-
-vm.inc: $(srcdir)/template/vm.inc.tmpl
-
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c
-
-incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h
-
-insns: $(INSNS)
-
-node_name.inc: {$(VPATH)}node.h
-	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
-
-encdb.h: $(PREP)
-	$(MINIRUBY) $(srcdir)/enc/make_encdb.rb $(srcdir)/enc $@.new
-	$(IFCHANGE) "$@" "$@.new"
-
-transdb.h: $(PREP)
-	$(MINIRUBY) $(srcdir)/enc/trans/make_transdb.rb $(srcdir)/enc/trans $@.new
-	$(IFCHANGE) "$@" "$@.new"
-
-miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
-	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
-
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(PREP)
-	$(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
-
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
-	$(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
-
-prereq: incs srcs preludes
-
-preludes: {$(VPATH)}miniprelude.c
-preludes: {$(srcdir)}golf_prelude.c
-
-docs:
-	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT)
-
-$(srcdir)/revision.h: $(REVISION_FORCE)
-	@set LC_MESSAGES=C
-	-@$(SET_LC_MESSAGES) $(VCS) info "$(@D)" | \
-	sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@.tmp"
-	@$(IFCHANGE) "$@" "$@.tmp"
-
-$(srcdir)/ext/ripper/ripper.c:
-	cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=.
-
-##
-
-run: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(srcdir)/test.rb $(RUNOPT)
-
-runruby: $(PROGRAM) PHONY
-	$(RUNRUBY) $(srcdir)/test.rb
-
-parse: miniruby$(EXEEXT) PHONY
-	$(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb
-
-COMPARE_RUBY = $(BASERUBY)
-ITEM = 
-OPTS = 
-
-benchmark: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
-
-benchmark-each: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
-
-tbench: $(PROGRAM) PHONY
-	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
-	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
-
-aotc: $(PROGRAM) PHONY
-	./$(PROGRAM) -I$(srcdir)/lib $(srcdir)/bin/ruby2cext $(srcdir)/test.rb
-
-vmasm: vm.$(ASMEXT)
-
-# vm.o : CFLAGS += -fno-crossjumping
-
-run.gdb:
-	echo b ruby_debug_breakpoint           > run.gdb
-	echo '# handle SIGINT nostop'         >> run.gdb
-	echo '# handle SIGPIPE nostop'        >> run.gdb
-	echo '# b rb_longjmp'                 >> run.gdb
-	echo source $(srcdir)/breakpoints.gdb >> run.gdb
-	echo source $(srcdir)/.gdbinit        >> run.gdb
-	echo run                              >> run.gdb
-
-gdb: miniruby$(EXEEXT) run.gdb PHONY
-	gdb -x run.gdb --quiet --args $(MINIRUBY) $(srcdir)/test.rb
-
-# Intel VTune
-
-vtune: miniruby$(EXEEXT)
-	vtl activity -c sampling -app ".\miniruby$(EXEEXT)","-I$(srcdir)/lib $(srcdir)/test.rb" run
-	vtl view -hf -mn miniruby$(EXEEXT) -sum -sort -cd
-	vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(RUNRUBY) $(srcdir)/tool/vtlh.rb > ha.lines
-
-dist: $(PREP) $(PROGRAM)
-	$(SHELL) $(srcdir)/tool/make-snapshot . $(TARNAME)
-
-up:
-	@$(VCS) up "$(srcdir)"
-	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
-
-help: PHONY
-	@echo "                Makefile of Ruby"
-	@echo ""
-	@echo "targets:"
-	@echo "  all:           compile ruby and extensions"
-	@echo "  check:         equals make test test-all"
-	@echo "  test:          ruby core tests"
-	@echo "  test-all:      all ruby tests"
-	@echo "  install:       install all ruby distributions"
-	@echo "  install-nodoc: install without rdoc"
-	@echo "  clean:         clean built objects"
-	@echo "  golf:          for golfers"
+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 b028a256ec..1488b2c65d 100644
--- a/compar.c
+++ b/compar.c
@@ -3,20 +3,39 @@
   compar.c -
 
   $Author$
+  $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 
 VALUE rb_mComparable;
 
 static ID cmp;
 
+int
+rb_cmpint(val, a, b)
+    VALUE val, a, b;
+{
+    if (NIL_P(val)) {
+	rb_cmperr(a, b);
+    }
+    if (FIXNUM_P(val)) return FIX2INT(val);
+    if (TYPE(val) == T_BIGNUM) {
+	if (RBIGNUM(val)->sign) return 1;
+	return -1;
+    }
+    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
+    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
+    return 0;
+}
+
 void
-rb_cmperr(VALUE x, VALUE y)
+rb_cmperr(x, y)
+    VALUE x, y;
 {
     const char *classname;
 
@@ -31,20 +50,23 @@ rb_cmperr(VALUE x, VALUE y)
 	     rb_obj_classname(x), classname);
 }
 
+#define cmperr() (rb_cmperr(x, y), Qnil)
+
 static VALUE
-cmp_eq(VALUE *a)
+cmp_eq(a)
+    VALUE *a;
 {
     VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
 
-    if (NIL_P(c)) return Qfalse;
+    if (NIL_P(c)) return Qnil;
     if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-cmp_failed(void)
+cmp_failed()
 {
-    return Qfalse;
+    return Qnil;
 }
 
 /*
@@ -57,7 +79,8 @@ cmp_failed(void)
  */
 
 static VALUE
-cmp_equal(VALUE x, VALUE y)
+cmp_equal(x, y)
+    VALUE x, y;
 {
     VALUE a[2];
 
@@ -76,10 +99,12 @@ cmp_equal(VALUE x, VALUE y)
  */
 
 static VALUE
-cmp_gt(VALUE x, VALUE y)
+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;
     return Qfalse;
 }
@@ -93,10 +118,12 @@ cmp_gt(VALUE x, VALUE y)
  */
 
 static VALUE
-cmp_ge(VALUE x, VALUE y)
+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;
     return Qfalse;
 }
@@ -110,14 +137,17 @@ cmp_ge(VALUE x, VALUE y)
  */
 
 static VALUE
-cmp_lt(VALUE x, VALUE y)
+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;
     return Qfalse;
 }
 
+
 /*
  *  call-seq:
  *     obj <= other    => true or false
@@ -127,10 +157,12 @@ cmp_lt(VALUE x, VALUE y)
  */
 
 static VALUE
-cmp_le(VALUE x, VALUE y)
+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;
     return Qfalse;
 }
@@ -151,7 +183,8 @@ cmp_le(VALUE x, VALUE y)
  */
 
 static VALUE
-cmp_between(VALUE x, VALUE min, VALUE max)
+cmp_between(x, min, max)
+    VALUE x, min, max;
 {
     if (RTEST(cmp_lt(x, min))) return Qfalse;
     if (RTEST(cmp_gt(x, max))) return Qfalse;
@@ -196,10 +229,8 @@ cmp_between(VALUE x, VALUE min, VALUE max)
  */
 
 void
-Init_Comparable(void)
+Init_Comparable()
 {
-#undef rb_intern
-
     rb_mComparable = rb_define_module("Comparable");
     rb_define_method(rb_mComparable, "==", cmp_equal, 1);
     rb_define_method(rb_mComparable, ">", cmp_gt, 1);
diff --git a/compile.c b/compile.c
deleted file mode 100644
index 993ebd082d..0000000000
--- a/compile.c
+++ /dev/null
@@ -1,5075 +0,0 @@
-/**********************************************************************
-
-  compile.c - ruby node tree -> VM instruction sequence
-
-  $Author$
-  created at: 04/01/01 03:42:15 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-
-#define USE_INSN_STACK_INCREASE 1
-#include "vm_core.h"
-#include "compile.h"
-#include "insns.inc"
-#include "insns_info.inc"
-
-#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 iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt);
-
-/* types */
-
-typedef struct iseq_link_element {
-    enum {
-	ISEQ_ELEMENT_NONE   = INT2FIX(0x00),
-	ISEQ_ELEMENT_LABEL  = INT2FIX(0x01),
-	ISEQ_ELEMENT_INSN   = INT2FIX(0x02),
-	ISEQ_ELEMENT_ADJUST = INT2FIX(0x03)
-    } type;
-    struct iseq_link_element *next;
-    struct iseq_link_element *prev;
-} LINK_ELEMENT;
-
-typedef struct iseq_link_anchor {
-    LINK_ELEMENT anchor;
-    LINK_ELEMENT *last;
-} LINK_ANCHOR;
-
-typedef struct iseq_label_data {
-    LINK_ELEMENT link;
-    int label_no;
-    int position;
-    int sc_state;
-    int set;
-    int sp;
-} LABEL;
-
-typedef struct iseq_insn_data {
-    LINK_ELEMENT link;
-    enum ruby_vminsn_type insn_id;
-    int line_no;
-    int operand_size;
-    int sc_state;
-    VALUE *operands;
-} INSN;
-
-typedef struct iseq_adjust_data {
-    LINK_ELEMENT link;
-    LABEL *label;
-    int line_no;
-} ADJUST;
-
-struct ensure_range {
-    LABEL *begin;
-    LABEL *end;
-    struct ensure_range *next;
-};
-
-struct iseq_compile_data_ensure_node_stack {
-    NODE *ensure_node;
-    struct iseq_compile_data_ensure_node_stack *prev;
-    struct ensure_range *erange;
-};
-
-#include "optinsn.inc"
-#if OPT_INSTRUCTIONS_UNIFICATION
-#include "optunifs.inc"
-#endif
-
-/* for debug */
-#if CPDEBUG < 0
-#define ISEQ_ARG iseq,
-#define ISEQ_ARG_DECLARE rb_iseq_t *iseq,
-#else
-#define ISEQ_ARG
-#define ISEQ_ARG_DECLARE
-#endif
-
-#if CPDEBUG
-#define gl_node_level iseq->compile_data->node_level
-#if 0
-static void debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor);
-#endif
-#endif
-
-static void dump_disasm_list(LINK_ELEMENT *elem);
-
-static int insn_data_length(INSN *iobj);
-static int insn_data_line_no(INSN *iobj);
-static int calc_sp_depth(int depth, INSN *iobj);
-
-static void ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem);
-
-static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...);
-static LABEL *new_label_body(rb_iseq_t *iseq, int line);
-static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
-
-static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
-static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-
-static int iseq_set_local_table(rb_iseq_t *iseq, ID *tbl);
-static int iseq_set_exception_local_table(rb_iseq_t *iseq);
-static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
-
-static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
-static int iseq_set_exception_table(rb_iseq_t *iseq);
-static int iseq_set_optargs_table(rb_iseq_t *iseq);
-
-/*
- * To make Array to LinkedList, use link_anchor
- */
-
-static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
-{
-#if CPDEBUG
-    int flag = 0;
-    LINK_ELEMENT *list, *plist;
-
-    if (!compile_debug) return;
-
-    list = anchor->anchor.next;
-    plist = &anchor->anchor;
-    while (list) {
-	if (plist != list->prev) {
-	    flag += 1;
-	}
-	plist = list;
-	list = list->next;
-    }
-
-    if (anchor->last != plist && anchor->last != 0) {
-	flag |= 0x70000;
-    }
-
-    if (flag != 0) {
-	rb_bug("list verify error: %08x (%s)", flag, info);
-    }
-#endif
-}
-#if CPDEBUG < 0
-#define verify_list(info, anchor) verify_list(iseq, info, anchor)
-#endif
-
-/*
- * elem1, elem2 => elem1, elem2, elem
- */
-static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
-{
-    elem->prev = anchor->last;
-    anchor->last->next = elem;
-    anchor->last = elem;
-    verify_list("add", anchor);
-}
-#if CPDEBUG < 0
-#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, anchor, elem)
-#endif
-
-static int
-iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
-{
-    if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(iseq->mark_ary, v);
-    }
-    return COMPILE_OK;
-}
-
-#define ruby_sourcefile		RSTRING_PTR(iseq->filename)
-
-static int
-iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
-{
-    if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(iseq->compile_data->mark_ary, v);
-    }
-    return COMPILE_OK;
-}
-
-VALUE
-iseq_compile(VALUE self, NODE *node)
-{
-    DECL_ANCHOR(ret);
-    rb_iseq_t *iseq;
-    INIT_ANCHOR(ret);
-    GetISeqPtr(self, iseq);
-
-    if (node == 0) {
-	COMPILE(ret, "nil", node);
-	iseq_set_local_table(iseq, 0);
-    }
-    else if (nd_type(node) == NODE_SCOPE) {
-	/* iseq type of top, method, class, block */
-	iseq_set_local_table(iseq, node->nd_tbl);
-	iseq_set_arguments(iseq, ret, node->nd_args);
-
-	switch (iseq->type) {
-	  case ISEQ_TYPE_BLOCK: {
-	    LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
-	    LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
-
-	    ADD_LABEL(ret, start);
-	    COMPILE(ret, "block body", node->nd_body);
-	    ADD_LABEL(ret, end);
-
-	    /* wide range catch handler must put at last */
-	    ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
-	    ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
-	    break;
-	  }
-	  case ISEQ_TYPE_CLASS: {
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_CLASS);
-	    COMPILE(ret, "scoped node", node->nd_body);
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
-	    break;
-	  }
-	  case ISEQ_TYPE_METHOD: {
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_CALL);
-	    COMPILE(ret, "scoped node", node->nd_body);
-	    ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
-	    break;
-	  }
-	  default: {
-	    COMPILE(ret, "scoped node", node->nd_body);
-	    break;
-	  }
-	}
-    }
-    else {
-	switch (iseq->type) {
-	  case ISEQ_TYPE_METHOD:
-	  case ISEQ_TYPE_CLASS:
-	  case ISEQ_TYPE_BLOCK:
-	  case ISEQ_TYPE_EVAL:
-	  case ISEQ_TYPE_TOP:
-	    rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d",
-			     __FILE__, __LINE__);
-	    break;
-	  case ISEQ_TYPE_RESCUE:
-	    iseq_set_exception_local_table(iseq);
-	    COMPILE(ret, "rescue", node);
-	    break;
-	  case ISEQ_TYPE_ENSURE:
-	    iseq_set_exception_local_table(iseq);
-	    COMPILE_POPED(ret, "ensure", node);
-	    break;
-	  case ISEQ_TYPE_DEFINED_GUARD:
-	    iseq_set_local_table(iseq, 0);
-	    COMPILE(ret, "defined guard", node);
-	    break;
-	  default:
-	    rb_bug("unknown scope");
-	}
-    }
-
-    if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
-	ADD_INSN2(ret, 0, getdynamic, INT2FIX(2), INT2FIX(0));
-	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
-    }
-    else {
-	ADD_INSN(ret, iseq->compile_data->last_line, leave);
-    }
-
-    return iseq_setup(iseq, ret);
-}
-
-int
-iseq_translate_threaded_code(rb_iseq_t *iseq)
-{
-#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
-    extern const void **vm_get_insns_address_table(void);
-#if OPT_DIRECT_THREADED_CODE
-    const void * const *table = vm_get_insns_address_table();
-#else
-    const void * const *table = vm_get_insns_address_table();
-#endif
-    int i;
-
-    iseq->iseq_encoded = ALLOC_N(VALUE, iseq->iseq_size);
-    MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->iseq_size);
-
-    for (i = 0; i < iseq->iseq_size; /* */ ) {
-	int insn = iseq->iseq_encoded[i];
-	int len = insn_len(insn);
-	iseq->iseq_encoded[i] = (VALUE)table[insn];
-	i += len;
-    }
-#else
-    iseq->iseq_encoded = iseq->iseq;
-#endif
-    return COMPILE_OK;
-}
-
-/*********************************************/
-/* definition of data structure for compiler */
-/*********************************************/
-
-static void *
-compile_data_alloc(rb_iseq_t *iseq, size_t size)
-{
-    void *ptr = 0;
-    struct iseq_compile_data_storage *storage =
-	iseq->compile_data->storage_current;
-
-    if (storage->pos + size > storage->size) {
-	unsigned long alloc_size = storage->size * 2;
-
-      retry:
-	if (alloc_size < size) {
-	    alloc_size *= 2;
-	    goto retry;
-	}
-	storage->next = (void *)ALLOC_N(char, alloc_size +
-					sizeof(struct
-					       iseq_compile_data_storage));
-	storage = iseq->compile_data->storage_current = storage->next;
-	storage->next = 0;
-	storage->pos = 0;
-	storage->size = alloc_size;
-	storage->buff = (char *)(&storage->buff + 1);
-    }
-
-    ptr = (void *)&storage->buff[storage->pos];
-    storage->pos += size;
-    return ptr;
-}
-
-static INSN *
-compile_data_alloc_insn(rb_iseq_t *iseq)
-{
-    return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
-}
-
-static LABEL *
-compile_data_alloc_label(rb_iseq_t *iseq)
-{
-    return (LABEL *)compile_data_alloc(iseq, sizeof(LABEL));
-}
-
-static ADJUST *
-compile_data_alloc_adjust(rb_iseq_t *iseq)
-{
-    return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
-}
-
-/*
- * elem1, elemX => elem1, elem2, elemX
- */
-static void
-INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
-    elem2->next = elem1->next;
-    elem2->prev = elem1;
-    elem1->next = elem2;
-    if (elem2->next) {
-	elem2->next->prev = elem2;
-    }
-}
-
-#if 0 /* unused */
-/*
- * elemX, elem1 => elemX, elem2, elem1
- */
-static void
-INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
-    elem2->prev = elem1->prev;
-    elem2->next = elem1;
-    elem1->prev = elem2;
-    if (elem2->prev) {
-	elem2->prev->next = elem2;
-    }
-}
-#endif
-
-/*
- * elemX, elem1, elemY => elemX, elem2, elemY
- */
-static void
-REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
-{
-    elem2->prev = elem1->prev;
-    elem2->next = elem1->next;
-    if (elem1->prev) {
-	elem1->prev->next = elem2;
-    }
-    if (elem1->next) {
-	elem1->next->prev = elem2;
-    }
-}
-
-static void
-REMOVE_ELEM(LINK_ELEMENT *elem)
-{
-    elem->prev->next = elem->next;
-    if (elem->next) {
-	elem->next->prev = elem->prev;
-    }
-}
-
-static LINK_ELEMENT *
-FIRST_ELEMENT(LINK_ANCHOR *anchor)
-{
-    return anchor->anchor.next;
-}
-
-#if 0 /* unused */
-static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *anchor)
-{
-  return anchor->last;
-}
-#endif
-
-static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
-{
-    LINK_ELEMENT *elem = anchor->last;
-    anchor->last = anchor->last->prev;
-    anchor->last->next = 0;
-    verify_list("pop", anchor);
-    return elem;
-}
-#if CPDEBUG < 0
-#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, anchor)
-#endif
-
-#if 0 /* unused */
-static LINK_ELEMENT *
-SHIFT_ELEMENT(LINK_ANCHOR *anchor)
-{
-    LINK_ELEMENT *elem = anchor->anchor.next;
-    if (elem) {
-	anchor->anchor.next = elem->next;
-    }
-    return elem;
-}
-#endif
-
-#if 0 /* unused */
-static int
-LIST_SIZE(LINK_ANCHOR *anchor)
-{
-    LINK_ELEMENT *elem = anchor->anchor.next;
-    int size = 0;
-    while (elem) {
-	size += 1;
-	elem = elem->next;
-    }
-    return size;
-}
-#endif
-
-static int
-LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
-{
-    if (anchor->anchor.next == 0) {
-	return 1;
-    }
-    else {
-	return 0;
-    }
-}
-
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e1, e2, e3, e4, e5
- * anc2: e4, e5 (broken)
- */
-static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
-    if (anc2->anchor.next) {
-	anc1->last->next = anc2->anchor.next;
-	anc2->anchor.next->prev = anc1->last;
-	anc1->last = anc2->last;
-    }
-    verify_list("append", anc1);
-}
-#if CPDEBUG < 0
-#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, anc1, anc2)
-#endif
-
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5, e1, e2, e3
- * anc2: e4, e5 (broken)
- */
-static void
-INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
-    if (anc2->anchor.next) {
-	LINK_ELEMENT *first = anc1->anchor.next;
-	anc1->anchor.next = anc2->anchor.next;
-	anc1->anchor.next->prev = &anc1->anchor;
-	anc2->last->next = first;
-	if (first) {
-	    first->prev = anc2->last;
-	}
-	else {
-	    anc1->last = anc2->last;
-	}
-    }
-
-    verify_list("append", anc1);
-}
-#if CPDEBUG < 0
-#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, anc1, anc2)
-#endif
-
-#if 0 /* unused */
-/*
- * anc1: e1, e2, e3
- * anc2: e4, e5
- *#=>
- * anc1: e4, e5
- * anc2: e1, e2, e3
- */
-static void
-SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
-{
-    LINK_ANCHOR tmp = *anc2;
-
-    /* it has bug */
-    *anc2 = *anc1;
-    *anc1 = tmp;
-
-    verify_list("swap1", anc1);
-    verify_list("swap2", anc2);
-}
-#if CPDEBUG < 0
-#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, anc1, anc2)
-#endif
-
-static LINK_ANCHOR *
-REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
-{
-    LINK_ELEMENT *first, *last, *elem, *e;
-    first = &anc->anchor;
-    elem = first->next;
-    last = anc->last;
-
-    if (elem != 0) {
-	anc->anchor.next = last;
-	anc->last = elem;
-    }
-    else {
-	/* null list */
-	return anc;
-    }
-    while (elem) {
-	e = elem->next;
-	elem->next = elem->prev;
-	elem->prev = e;
-	elem = e;
-    }
-
-    first->next = last;
-    last->prev = first;
-    anc->last->next = 0;
-
-    verify_list("reverse", anc);
-    return anc;
-}
-#if CPDEBUG < 0
-#define REVERSE_LIST(anc) REVERSE_LIST(iseq, anc)
-#endif
-#endif
-
-#if CPDEBUG && 0
-static void
-debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
-{
-    LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
-    printf("----\n");
-    printf("anch: %p, frst: %p, last: %p\n", &anchor->anchor,
-	   anchor->anchor.next, anchor->last);
-    while (list) {
-	printf("curr: %p, next: %p, prev: %p, type: %d\n", list, list->next,
-	       list->prev, FIX2INT(list->type));
-	list = list->next;
-    }
-    printf("----\n");
-
-    dump_disasm_list(anchor->anchor.next);
-    verify_list("debug list", anchor);
-}
-#if CPDEBUG < 0
-#define debug_list(anc) debug_list(iseq, anc)
-#endif
-#endif
-
-static LABEL *
-new_label_body(rb_iseq_t *iseq, int line)
-{
-    LABEL *labelobj = compile_data_alloc_label(iseq);
-
-    labelobj->link.type = ISEQ_ELEMENT_LABEL;
-    labelobj->link.next = 0;
-
-    labelobj->label_no = iseq->compile_data->label_no++;
-    labelobj->sc_state = 0;
-    labelobj->sp = -1;
-    return labelobj;
-}
-
-static ADJUST *
-new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
-{
-    ADJUST *adjust = compile_data_alloc_adjust(iseq);
-    adjust->link.type = ISEQ_ELEMENT_ADJUST;
-    adjust->link.next = 0;
-    adjust->label = label;
-    adjust->line_no = line;
-    return adjust;
-}
-
-static INSN *
-new_insn_core(rb_iseq_t *iseq, int line_no,
-	      int insn_id, int argc, VALUE *argv)
-{
-    INSN *iobj = compile_data_alloc_insn(iseq);
-
-    iobj->link.type = ISEQ_ELEMENT_INSN;
-    iobj->link.next = 0;
-    iobj->insn_id = insn_id;
-    iobj->line_no = line_no;
-    iobj->operands = argv;
-    iobj->operand_size = argc;
-    iobj->sc_state = 0;
-    return iobj;
-}
-
-static INSN *
-new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
-{
-    VALUE *operands = 0;
-    va_list argv;
-    if (argc > 0) {
-	int i;
-	va_init_list(argv, argc);
-	operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
-	for (i = 0; i < argc; i++) {
-	    VALUE v = va_arg(argv, VALUE);
-	    operands[i] = v;
-	}
-	va_end(argv);
-    }
-    return new_insn_core(iseq, line_no, insn_id, argc, operands);
-}
-
-static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no,
-	      VALUE id, VALUE argc, VALUE block, VALUE flag)
-{
-    INSN *iobj = 0;
-    VALUE *operands =
-      (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 5);
-    operands[0] = id;
-    operands[1] = argc;
-    operands[2] = block;
-    operands[3] = flag;
-    operands[4] = 0;
-    iobj = new_insn_core(iseq, line_no, BIN(send), 5, operands);
-    return iobj;
-}
-
-static VALUE
-new_child_iseq(rb_iseq_t *iseq, NODE *node,
-	       VALUE name, VALUE parent, VALUE type)
-{
-    VALUE ret;
-
-    debugs("[new_child_iseq]> ---------------------------------------\n");
-    ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self),
-			       parent, type, iseq->compile_data->option);
-    debugs("[new_child_iseq]< ---------------------------------------\n");
-    iseq_add_mark_object(iseq, ret);
-    return ret;
-}
-
-static int
-iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-    /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
-
-    if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
-
-    debugs("[compile step 3.1 (iseq_optimize)]\n");
-    iseq_optimize(iseq, anchor);
-
-    if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
-
-    if (iseq->compile_data->option->instructions_unification) {
-	debugs("[compile step 3.2 (iseq_insns_unification)]\n");
-	iseq_insns_unification(iseq, anchor);
-	if (compile_debug > 5)
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
-    }
-
-    if (iseq->compile_data->option->stack_caching) {
-	debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
-	iseq_set_sequence_stackcaching(iseq, anchor);
-	if (compile_debug > 5)
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
-    }
-
-    debugs("[compile step 4.1 (iseq_set_sequence)]\n");
-    iseq_set_sequence(iseq, anchor);
-    if (compile_debug > 5)
-	dump_disasm_list(FIRST_ELEMENT(anchor));
-
-    debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
-    iseq_set_exception_table(iseq);
-
-    debugs("[compile step 4.3 (set_optargs_table)] \n");
-    iseq_set_optargs_table(iseq);
-
-    debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
-    iseq_translate_threaded_code(iseq);
-
-    if (compile_debug > 1) {
-	VALUE str = ruby_iseq_disasm(iseq->self);
-	printf("%s\n", StringValueCStr(str));
-	fflush(stdout);
-    }
-    debugs("[compile step: finish]\n");
-
-    return 0;
-}
-
-static int
-iseq_set_exception_local_table(rb_iseq_t *iseq)
-{
-    ID id_dollar_bang;
-
-    CONST_ID(id_dollar_bang, "#$!");
-    iseq->local_table = (ID *)ALLOC_N(ID *, 1);
-    iseq->local_table_size = 1;
-    iseq->local_size = iseq->local_table_size + 1;
-    iseq->local_table[0] = id_dollar_bang;
-    return COMPILE_OK;
-}
-
-static int
-get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
-{
-    int i;
-
-    for (i = 0; i < iseq->local_table_size; i++) {
-	if (iseq->local_table[i] == id) {
-	    return i;
-	}
-    }
-    return -1;
-}
-
-static int
-get_local_var_idx(rb_iseq_t *iseq, ID id)
-{
-    int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
-
-    if (idx < 0) {
-	rb_bug("get_local_var_idx: %d", idx);
-    }
-
-    return idx;
-}
-
-static int
-get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
-{
-    int lv = 0, idx = -1;
-
-    while (iseq) {
-	idx = get_dyna_var_idx_at_raw(iseq, id);
-	if (idx >= 0) {
-	    break;
-	}
-	iseq = iseq->parent_iseq;
-	lv++;
-    }
-
-    if (idx < 0) {
-	rb_bug("get_dyna_var_idx: -1");
-    }
-
-    *level = lv;
-    *ls = iseq->local_size;
-    return idx;
-}
-
-static int
-iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
-{
-    debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
-
-    if (node_args) {
-	NODE *node_aux = node_args->nd_next;
-	NODE *node_opt = node_args->nd_opt;
-	ID rest_id = 0;
-	int last_comma = 0;
-	ID block_id = 0;
-	NODE *node_init = 0;
-
-	if (nd_type(node_args) != NODE_ARGS) {
-	    rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s",
-		   ruby_node_name(nd_type(node_args)));
-	}
-
-	/*
-         * new argument infromation:
-         *   NODE_ARGS     [m: int,  o: NODE_OPT_ARG, ->]
-         *   NODE_ARGS_AUX [r: ID,   b: ID,           ->]
-         *   NODE_ARGS_AUX [Pst: id, Plen: int,       init: NODE*]
-         *  optarg information:
-         *   NODE_OPT_ARGS [idx,     expr,            next ->]
-	 *  init arg:
-	 *   NODE_AND(m_init, p_init)
-	 *  if "r" is 1, it's means "{|x,|}" type block parameter.
-	 */
-
-	iseq->argc = node_args->nd_frml;
-	debugs("  - argc: %d\n", iseq->argc);
-
-	if (node_aux) {
-	    rest_id = node_aux->nd_rest;
-	    if (rest_id == 1) {
-		last_comma = 1;
-		rest_id = 0;
-	    }
-	    block_id = (ID)node_aux->nd_body;
-	    node_aux = node_aux->nd_next;
-
-	    if (node_aux) {
-		ID post_start_id = node_aux->nd_pid;
-		iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, post_start_id);
-		iseq->arg_post_len = node_aux->nd_plen;
-		node_init = node_aux->nd_next;
-	    }
-	}
-
-	if (node_opt) {
-	    NODE *node = node_opt;
-	    LABEL *label;
-	    VALUE labels = rb_ary_new();
-	    int i = 0, j;
-
-	    while (node) {
-		label = NEW_LABEL(nd_line(node));
-		rb_ary_push(labels, (VALUE)label | 1);
-		ADD_LABEL(optargs, label);
-		COMPILE_POPED(optargs, "optarg", node->nd_body);
-		node = node->nd_next;
-		i += 1;
-	    }
-
-	    /* last label */
-	    label = NEW_LABEL(nd_line(node_args));
-	    rb_ary_push(labels, (VALUE)label | 1);
-	    ADD_LABEL(optargs, label);
-	    i += 1;
-
-	    iseq->arg_opts = i;
-	    iseq->arg_opt_table = ALLOC_N(VALUE, i);
-	    MEMCPY(iseq->arg_opt_table, RARRAY_PTR(labels), VALUE, i);
-	    for (j = 0; j < i; j++) {
-		iseq->arg_opt_table[j] &= ~1;
-	    }
-	}
-	else {
-	    iseq->arg_opts = 0;
-	}
-
-	if (node_init) {
-	    if (node_init->nd_1st) { /* m_init */
-		COMPILE_POPED(optargs, "init arguments (m)", node_init->nd_1st);
-	    }
-	    if (node_init->nd_2nd) { /* p_init */
-		COMPILE_POPED(optargs, "init arguments (p)", node_init->nd_2nd);
-	    }
-	}
-
-	if (rest_id) {
-	    iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
-
-	    if (iseq->arg_rest == -1) {
-		rb_bug("arg_rest: -1");
-	    }
-
-	    if (iseq->arg_post_start == 0) {
-		iseq->arg_post_start = iseq->arg_rest + 1;
-	    }
-	}
-
-	if (block_id) {
-	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
-	}
-
-	if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
-	    iseq->arg_rest != -1 || iseq->arg_block != -1) {
-	    iseq->arg_simple = 0;
-
-	    /* set arg_size: size of arguments */
-	    if (iseq->arg_block != -1) {
-		iseq->arg_size = iseq->arg_block + 1;
-	    }
-	    else if (iseq->arg_post_len) {
-		iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
-	    }
-	    else if (iseq->arg_rest != -1) {
-		iseq->arg_size = iseq->arg_rest + 1;
-	    }
-	    else if (iseq->arg_opts) {
-		iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
-	    }
-	    else {
-		iseq->arg_size = iseq->argc;
-	    }
-	}
-	else {
-	    iseq->arg_simple = 1;
-	    iseq->arg_size = iseq->argc;
-	}
-
-	if (iseq->type == ISEQ_TYPE_BLOCK) {
-	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 && iseq->arg_rest == -1) {
-		if (iseq->argc == 1 && last_comma == 0) {
-		    /* {|a|} */
-		    iseq->arg_simple |= 0x02;
-		}
-	    }
-	}
-    }
-    else {
-	iseq->arg_simple = 1;
-    }
-
-    return COMPILE_OK;
-}
-
-static int
-iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
-{
-    int size;
-
-    if (tbl) {
-	size = *tbl;
-	tbl++;
-    }
-    else {
-	size = 0;
-    }
-
-    if (size > 0) {
-	iseq->local_table = (ID *)ALLOC_N(ID *, size);
-	MEMCPY(iseq->local_table, tbl, ID *, size);
-    }
-
-    iseq->local_size = iseq->local_table_size = size;
-    iseq->local_size += 1;
-    /*
-      if (lfp == dfp ) { // top, class, method
-	  dfp[-1]: svar
-      else {             // block
-          dfp[-1]: cref
-      }
-     */
-
-    debugs("iseq_set_local_table: %d, %d\n", iseq->local_size, iseq->local_table_size);
-    return COMPILE_OK;
-}
-
-/**
-  ruby insn object array -> raw instruction sequence
- */
-static int
-iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-    LABEL *lobj;
-    INSN *iobj;
-    struct iseq_insn_info_entry *insn_info_table;
-    LINK_ELEMENT *list;
-    VALUE *generated_iseq;
-
-    int k, pos, sp, stack_max = 0, line = 0;
-
-    /* set label position */
-    list = FIRST_ELEMENT(anchor);
-    k = pos = 0;
-    while (list) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		iobj = (INSN *)list;
-		line = iobj->line_no;
-		pos += insn_data_length(iobj);
-		k++;
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		lobj = (LABEL *)list;
-		lobj->position = pos;
-		lobj->set = Qtrue;
-		break;
-	    }
-	  case ISEQ_ELEMENT_NONE:
-	    {
-		/* ignore */
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)list;
-		if (adjust->line_no != -1) {
-		    pos += 2 /* insn + 1 operand */;
-		    k++;
-		}
-		break;
-	    }
-	  default:
-	    dump_disasm_list(FIRST_ELEMENT(anchor));
-	    dump_disasm_list(list);
-	    rb_compile_error(RSTRING_PTR(iseq->filename), line,
-			     "error: set_sequence");
-	    break;
-	}
-	list = list->next;
-    }
-
-    /* make instruction sequence */
-    generated_iseq = ALLOC_N(VALUE, pos);
-    insn_info_table = ALLOC_N(struct iseq_insn_info_entry, k);
-
-    list = FIRST_ELEMENT(anchor);
-    k = pos = sp = 0;
-
-    while (list) {
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		int j, len, insn;
-		const char *types;
-		VALUE *operands;
-
-		iobj = (INSN *)list;
-
-		/* update sp */
-		sp = calc_sp_depth(sp, iobj);
-		if (sp > stack_max) {
-		    stack_max = sp;
-		}
-
-		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
-
-		operands = iobj->operands;
-		insn = iobj->insn_id;
-		generated_iseq[pos] = insn;
-		types = insn_op_types(insn);
-		len = insn_len(insn);
-
-		/* operand check */
-		if (iobj->operand_size != len - 1) {
-		    dump_disasm_list(list);
-		    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-				     "operand size miss! (%d for %d)",
-				     iobj->operand_size, len - 1);
-		    return 0;
-		}
-
-		for (j = 0; types[j]; j++) {
-		    char type = types[j];
-		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
-		    switch (type) {
-		      case TS_OFFSET:
-			{
-			    /* label(destination position) */
-			    lobj = (LABEL *)operands[j];
-			    if (lobj->set != Qtrue) {
-				rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-						 "unknown label");
-			    }
-			    if (lobj->sp == -1) {
-				lobj->sp = sp;
-			    }
-			    generated_iseq[pos + 1 + j] =
-				lobj->position - (pos + len);
-			    break;
-			}
-		      case TS_CDHASH:
-			{
-			    /*
-			     * [obj, label, ...]
-			     */
-			    int i;
-			    VALUE lits = operands[j];
-			    VALUE map = rb_hash_new();
-
-			    for (i=0; i < RARRAY_LEN(lits); i+=2) {
-				VALUE obj = rb_ary_entry(lits, i);
-				VALUE lv  = rb_ary_entry(lits, i+1);
-				lobj = (LABEL *)(lv & ~1);
-
-				if (lobj->set != Qtrue) {
-				    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-						     "unknown label");
-				}
-				rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len)));
-			    }
-			    generated_iseq[pos + 1 + j] = map;
-			    iseq_add_mark_object(iseq, map);
-			    break;
-			}
-		      case TS_LINDEX:
-		      case TS_DINDEX:
-		      case TS_NUM:	/* ulong */
-			generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
-			break;
-		      case TS_ISEQ:	/* iseq */
-			{
-			    VALUE v = operands[j];
-			    rb_iseq_t *block = 0;
-			    if (v) {
-				GetISeqPtr(v, block);
-			    }
-			    generated_iseq[pos + 1 + j] = (VALUE)block;
-			    break;
-			}
-		      case TS_VALUE:	/* VALUE */
-			{
-			    VALUE v = operands[j];
-			    generated_iseq[pos + 1 + j] = v;
-			    /* to mark ruby object */
-			    iseq_add_mark_object(iseq, v);
-			    break;
-			}
-		      case TS_IC: /* inline cache */
-			{
-			    VALUE v = (VALUE)NEW_INLINE_CACHE_ENTRY();
-			    generated_iseq[pos + 1 + j] = v;
-			    iseq_add_mark_object(iseq, v);
-			    break;
-			}
-		      case TS_ID: /* ID */
-			generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
-			break;
-		      case TS_GENTRY:
-			{
-			    struct global_entry *entry =
-				(struct global_entry *)(operands[j] & (~1));
-			    generated_iseq[pos + 1 + j] = (VALUE)entry;
-			}
-			break;
-		      default:
-			rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-					 "unknown operand type: %c", type);
-			return 0;
-		    }
-		}
-		insn_info_table[k].line_no = iobj->line_no;
-		insn_info_table[k].position = pos;
-		insn_info_table[k].sp = sp;
-		pos += len;
-		k++;
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		lobj = (LABEL *)list;
-		if (lobj->sp == -1) {
-		    lobj->sp = sp;
-		}
-		else {
-		    sp = lobj->sp;
-		}
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)list;
-		int orig_sp = sp;
-
-		if (adjust->label) {
-		    sp = adjust->label->sp;
-		}
-		else {
-		    sp = 0;
-		}
-
-		if (adjust->line_no != -1) {
-		    if (orig_sp - sp > 0) {
-			insn_info_table[k].line_no = adjust->line_no;
-			insn_info_table[k].position = pos;
-			insn_info_table[k].sp = sp;
-			k++;
-			generated_iseq[pos++] = BIN(adjuststack);
-			generated_iseq[pos++] = orig_sp - sp;
-		    }
-		    else if (orig_sp - sp == 0) {
-			/* jump to next insn */
-			insn_info_table[k].line_no = adjust->line_no;
-			insn_info_table[k].position = pos;
-			insn_info_table[k].sp = sp;
-			k++;
-			generated_iseq[pos++] = BIN(jump);
-			generated_iseq[pos++] = 0;
-		    }
-		    else {
-			rb_bug("iseq_set_sequence: adjust bug");
-		    }
-		}
-		break;
-	    }
-	  default:
-	    /* ignore */
-	    break;
-	}
-	list = list->next;
-    }
-
-#if 0 /* XXX */
-    /* this check need dead code elimination */
-    if (sp != 1) {
-	rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp);
-    }
-#endif
-
-    iseq->iseq = (void *)generated_iseq;
-    iseq->iseq_size = pos;
-    iseq->insn_info_table = insn_info_table;
-    iseq->insn_info_size = k;
-    iseq->stack_max = stack_max;
-
-    return COMPILE_OK;
-}
-
-static int
-label_get_position(LABEL *lobj)
-{
-    return lobj->position;
-}
-
-static int
-label_get_sp(LABEL *lobj)
-{
-    return lobj->sp;
-}
-
-static int
-iseq_set_exception_table(rb_iseq_t *iseq)
-{
-    VALUE *tptr, *ptr;
-    int tlen, i;
-    struct iseq_catch_table_entry *entry;
-
-    tlen = RARRAY_LEN(iseq->compile_data->catch_table_ary);
-    tptr = RARRAY_PTR(iseq->compile_data->catch_table_ary);
-
-    iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
-    iseq->catch_table_size = tlen;
-
-    for (i = 0; i < tlen; i++) {
-	ptr = RARRAY_PTR(tptr[i]);
-	entry = &iseq->catch_table[i];
-	entry->type = ptr[0] & 0xffff;
-	entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
-	entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
-	entry->iseq = ptr[3];
-
-	/* register iseq as mark object */
-	if (entry->iseq != 0) {
-	    iseq_add_mark_object(iseq, entry->iseq);
-	}
-
-	/* stack depth */
-	if (ptr[4]) {
-	    LABEL *lobj = (LABEL *)(ptr[4] & ~1);
-	    entry->cont = label_get_position(lobj);
-	    entry->sp = label_get_sp(lobj);
-
-	    /* TODO: Dirty Hack!  Fix me */
-	    if (entry->type == CATCH_TYPE_RESCUE ||
-		entry->type == CATCH_TYPE_BREAK ||
-		entry->type == CATCH_TYPE_NEXT) {
-		entry->sp--;
-	    }
-	}
-	else {
-	    entry->cont = 0;
-	}
-    }
-
-    iseq->compile_data->catch_table_ary = 0;	/* free */
-    return COMPILE_OK;
-}
-
-/*
- * set optional argument table
- *   def foo(a, b=expr1, c=expr2)
- *   =>
- *    b:
- *      expr1
- *    c:
- *      expr2
- */
-static int
-iseq_set_optargs_table(rb_iseq_t *iseq)
-{
-    int i;
-
-    if (iseq->arg_opts != 0) {
-	for (i = 0; i < iseq->arg_opts; i++) {
-	    iseq->arg_opt_table[i] =
-		label_get_position((LABEL *)iseq->arg_opt_table[i]);
-	}
-    }
-    return COMPILE_OK;
-}
-
-static LINK_ELEMENT *
-get_destination_insn(INSN *iobj)
-{
-    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
-    LINK_ELEMENT *list;
-
-    list = lobj->link.next;
-    while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
-	    break;
-	}
-	list = list->next;
-    }
-    return list;
-}
-
-static LINK_ELEMENT *
-get_next_insn(INSN *iobj)
-{
-    LINK_ELEMENT *list = iobj->link.next;
-
-    while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
-	    return list;
-	}
-	list = list->next;
-    }
-    return 0;
-}
-
-static LINK_ELEMENT *
-get_prev_insn(INSN *iobj)
-{
-    LINK_ELEMENT *list = iobj->link.prev;
-
-    while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
-	    return list;
-	}
-	list = list->prev;
-    }
-    return 0;
-}
-
-static int
-iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
-{
-    INSN *iobj = (INSN *)list;
-  again:
-    if (iobj->insn_id == BIN(jump)) {
-	INSN *niobj, *diobj, *piobj;
-	/*
-	 *  useless jump elimination:
-	 *     jump LABEL1
-	 *     ...
-	 *   LABEL1:
-	 *     jump LABEL2
-	 *
-	 *   => in this case, first jump instruction should jump tp
-	 *      LABEL2 directly
-	 */
-	diobj = (INSN *)get_destination_insn(iobj);
-	niobj = (INSN *)get_next_insn(iobj);
-
-	if (diobj == niobj) {
-	    /*
-	     *   jump LABEL
-	     *  LABEL:
-	     * =>
-	     *   LABEL:
-	     */
-	    REMOVE_ELEM(&iobj->link);
-	}
-	else if (iobj != diobj && diobj->insn_id == BIN(jump)) {
-	    if (OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
-		OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0);
-		goto again;
-	    }
-	}
-	else if (diobj->insn_id == BIN(leave)) {
-	    /*
-	     *  jump LABEL
-	     *  ...
-	     * LABEL:
-	     *  leave
-	     * =>
-	     *  leave
-	     *  ...
-	     * LABEL:
-	     *  leave
-	     */
-	    INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
-					diobj->operand_size, diobj->operands);
-	    INSN *popiobj = new_insn_core(iseq, iobj->line_no,
-					  BIN(pop), 0, 0);
-	    /* replace */
-	    REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
-	    INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
-	    iobj = popiobj;
-	}
-	/*
-	 * useless jump elimination (if/unless destination):
-	 *   if   L1
-	 *   jump L2
-	 * L1:
-	 *   ...
-	 * L2:
-	 *
-	 * ==>
-	 *   unless L2
-	 * L1:
-	 *   ...
-	 * L2:
-	 */
-	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
-		 (piobj->insn_id == BIN(branchif) ||
-		  piobj->insn_id == BIN(branchunless))) {
-	    if (niobj == (INSN *)get_destination_insn(piobj)) {
-		piobj->insn_id = (piobj->insn_id == BIN(branchif))
-		  ? BIN(branchunless) : BIN(branchif);
-		OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
-		REMOVE_ELEM(&iobj->link);
-	    }
-	}
-    }
-
-    if (iobj->insn_id == BIN(branchif) ||
-	iobj->insn_id == BIN(branchunless)) {
-	/*
-	 *   if L1
-	 *   ...
-	 * L1:
-	 *   jump L2
-	 * =>
-	 *   if L2
-	 */
-	INSN *nobj = (INSN *)get_destination_insn(iobj);
-	if (nobj->insn_id == BIN(jump)) {
-	    OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
-	}
-    }
-
-    if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
-	/*
-	 *  send ...
-	 *  leave
-	 * =>
-	 *  send ..., ... | VM_CALL_TAILCALL_BIT, ...
-	 *  leave # unreachable
-	 */
-	INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
-
-	if (piobj->insn_id == BIN(send) &&
-	    piobj->operands[2] == 0 /* block */
-	    ) {
-	    piobj->operands[3] = INT2FIX(FIX2INT(piobj->operands[3]) | VM_CALL_TAILCALL_BIT);
-	}
-    }
-    return COMPILE_OK;
-}
-
-static int
-insn_set_specialized_instruction(INSN *iobj, int insn_id)
-{
-    iobj->insn_id = insn_id;
-    iobj->operand_size = 0;
-    return COMPILE_OK;
-}
-
-static int
-insn_set_specialized_instruction_with_ic(INSN *iobj, int insn_id, int n)
-{
-    int i;
-    iobj->insn_id = insn_id;
-    iobj->operand_size = n;
-
-    /* max of n is 4 */
-    for (i=0; i<n; i++) {
-	iobj->operands[i] = Qnil;
-    }
-
-    return COMPILE_OK;
-}
-
-
-static int
-iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
-{
-    if (iobj->insn_id == BIN(send)) {
-	ID mid = SYM2ID(OPERAND_AT(iobj, 0));
-	int argc = FIX2INT(OPERAND_AT(iobj, 1));
-	VALUE block = OPERAND_AT(iobj, 2);
-	VALUE flag = OPERAND_AT(iobj, 3);
-
-	/* TODO: should be more sophisticated search */
-	if (block == 0 && flag == INT2FIX(0)) {
-	    if (argc == 0) {
-		if (mid == idLength) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_length));
-		}
-		else if (mid == idSucc) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_succ));
-		}
-		else if (mid == idNot) {
-		    insn_set_specialized_instruction_with_ic(iobj, BIN(opt_not), 1);
-		}
-	    }
-	    else if (argc == 1) {
-		if (0) {
-		}
-		else if (mid == idPLUS) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_plus));
-		}
-		else if (mid == idMINUS) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_minus));
-		}
-		else if (mid == idMULT) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_mult));
-		}
-		else if (mid == idDIV) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_div));
-		}
-		else if (mid == idMOD) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_mod));
-		}
-		else if (mid == idEq) {
-		    insn_set_specialized_instruction_with_ic(iobj, BIN(opt_eq), 1);
-		}
-		else if (mid == idNeq) {
-		    insn_set_specialized_instruction_with_ic(iobj, BIN(opt_neq), 2);
-		}
-		else if (mid == idLT) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_lt));
-		}
-		else if (mid == idLE) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_le));
-		}
-		else if (mid == idGT) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_gt));
-		}
-		else if (mid == idGE) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_ge));
-		}
-		else if (mid == idLTLT) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_ltlt));
-		}
-		else if (mid == idAREF) {
-		    insn_set_specialized_instruction(iobj, BIN(opt_aref));
-		}
-	    }
-	}
-
-	if (argc > 0) {
-	    if (mid == idSend || mid == id__send__ ) {
-		OPERAND_AT(iobj, 3) |= INT2FIX(VM_CALL_SEND_BIT);
-	    }
-	}
-    }
-    return COMPILE_OK;
-}
-
-static int
-iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-    LINK_ELEMENT *list;
-    const int do_peepholeopt = iseq->compile_data->option->peephole_optimization;
-    const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization;
-    const int do_si = iseq->compile_data->option->specialized_instruction;
-    const int do_ou = iseq->compile_data->option->operands_unification;
-    list = FIRST_ELEMENT(anchor);
-
-    while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN) {
-	    if (do_peepholeopt) {
-		iseq_peephole_optimize(iseq, list, do_tailcallopt);
-	    }
-	    if (do_si) {
-		iseq_specialized_instruction(iseq, (INSN *)list);
-	    }
-	    if (do_ou) {
-		insn_operands_unification((INSN *)list);
-	    }
-	}
-	list = list->next;
-    }
-    return COMPILE_OK;
-}
-
-#if OPT_INSTRUCTIONS_UNIFICATION
-static INSN *
-new_unified_insn(rb_iseq_t *iseq,
-		 int insn_id, int size, LINK_ELEMENT *seq_list)
-{
-    INSN *iobj = 0;
-    LINK_ELEMENT *list = seq_list;
-    int i, argc = 0;
-    VALUE *operands = 0, *ptr = 0;
-
-
-    /* count argc */
-    for (i = 0; i < size; i++) {
-	iobj = (INSN *)list;
-	argc += iobj->operand_size;
-	list = list->next;
-    }
-
-    if (argc > 0) {
-	ptr = operands =
-	    (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
-    }
-
-    /* copy operands */
-    list = seq_list;
-    for (i = 0; i < size; i++) {
-	iobj = (INSN *)list;
-	MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
-	ptr += iobj->operand_size;
-	list = list->next;
-    }
-
-    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
-}
-#endif
-
-/*
- * This scheme can get more performance if do this optimize with
- * label address resolving.
- * It's future work (if compile time was bottle neck).
- */
-static int
-iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-#if OPT_INSTRUCTIONS_UNIFICATION
-    LINK_ELEMENT *list;
-    INSN *iobj, *niobj;
-    int id, j, k;
-
-    list = FIRST_ELEMENT(anchor);
-    while (list) {
-	if (list->type == ISEQ_ELEMENT_INSN) {
-	    iobj = (INSN *)list;
-	    id = iobj->insn_id;
-	    if (unified_insns_data[id] != 0) {
-		const int *const *entry = unified_insns_data[id];
-		for (j = 1; j < (int)entry[0]; j++) {
-		    const int *unified = entry[j];
-		    LINK_ELEMENT *li = list->next;
-		    for (k = 2; k < unified[1]; k++) {
-			if (li->type != ISEQ_ELEMENT_INSN ||
-			    ((INSN *)li)->insn_id != unified[k]) {
-			    goto miss;
-			}
-			li = li->next;
-		    }
-		    /* matched */
-		    niobj =
-			new_unified_insn(iseq, unified[0], unified[1] - 1,
-					 list);
-
-		    /* insert to list */
-		    niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
-		    niobj->link.next = li;
-		    if (li) {
-			li->prev = (LINK_ELEMENT *)niobj;
-		    }
-
-		    list->prev->next = (LINK_ELEMENT *)niobj;
-		    list = (LINK_ELEMENT *)niobj;
-		    break;
-		  miss:;
-		}
-	    }
-	}
-	list = list->next;
-    }
-#endif
-    return COMPILE_OK;
-}
-
-#if OPT_STACK_CACHING
-
-#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
-#define SC_NEXT(insn)       sc_insn_next[insn]
-
-#include "opt_sc.inc"
-
-static int
-insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
-{
-    int nstate;
-    int insn_id;
-
-    insn_id = iobj->insn_id;
-    iobj->insn_id = SC_INSN(insn_id, state);
-    nstate = SC_NEXT(iobj->insn_id);
-
-    if (insn_id == BIN(jump) ||
-	insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
-	LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
-
-	if (lobj->sc_state != 0) {
-	    if (lobj->sc_state != nstate) {
-		dump_disasm_list((LINK_ELEMENT *)iobj);
-		dump_disasm_list((LINK_ELEMENT *)lobj);
-		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
-		rb_compile_error(RSTRING_PTR(iseq->filename), iobj->lineno,
-				 "insn_set_sc_state error\n");
-		return 0;
-	    }
-	}
-	else {
-	    lobj->sc_state = nstate;
-	}
-	if (insn_id == BIN(jump)) {
-	    nstate = SCS_XX;
-	}
-    }
-    else if (insn_id == BIN(leave)) {
-	nstate = SCS_XX;
-    }
-
-    return nstate;
-}
-
-static int
-label_set_sc_state(LABEL *lobj, int state)
-{
-    if (lobj->sc_state != 0) {
-	if (lobj->sc_state != state) {
-	    state = lobj->sc_state;
-	}
-    }
-    else {
-	lobj->sc_state = state;
-    }
-
-    return state;
-}
-
-
-#endif
-
-static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
-{
-#if OPT_STACK_CACHING
-    LINK_ELEMENT *list;
-    int state, insn_id;
-
-    /* initialize */
-    state = SCS_XX;
-    list = FIRST_ELEMENT(anchor);
-    /* dump_disasm_list(list); */
-
-    /* for each list element */
-    while (list) {
-      redo_point:
-	switch (list->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		INSN *iobj = (INSN *)list;
-		insn_id = iobj->insn_id;
-
-		/* dump_disasm_list(list); */
-
-		switch (insn_id) {
-		  case BIN(nop):
-		    {
-			/* exception merge point */
-			if (state != SCS_AX) {
-			    INSN *rpobj =
-				new_insn_body(iseq, 0, BIN(reput), 0);
-
-			    /* replace this insn */
-			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
-			    list = (LINK_ELEMENT *)rpobj;
-			    goto redo_point;
-			}
-			break;
-		    }
-		  case BIN(swap):
-		    {
-			if (state == SCS_AB || state == SCS_BA) {
-			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
-
-			    REMOVE_ELEM(list);
-			    list = list->next;
-			    goto redo_point;
-			}
-			break;
-		    }
-		  case BIN(pop):
-		    {
-			switch (state) {
-			  case SCS_AX:
-			  case SCS_BX:
-			    state = SCS_XX;
-			    break;
-			  case SCS_AB:
-			    state = SCS_AX;
-			    break;
-			  case SCS_BA:
-			    state = SCS_BX;
-			    break;
-			  case SCS_XX:
-			    goto normal_insn;
-			  default:
-			    rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no,
-					     "unreachable");
-			}
-			/* remove useless pop */
-			REMOVE_ELEM(list);
-			list = list->next;
-			goto redo_point;
-		    }
-		  default:;
-		    /* none */
-		}		/* end of switch */
-	      normal_insn:
-		state = insn_set_sc_state(iseq, iobj, state);
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		LABEL *lobj;
-		lobj = (LABEL *)list;
-
-		state = label_set_sc_state(lobj, state);
-	    }
-	  default:
-	    break;
-	}
-	list = list->next;
-    }
-#endif
-    return COMPILE_OK;
-}
-
-
-
-static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int *cntp)
-{
-    NODE *list = node->nd_next;
-    VALUE lit = node->nd_lit;
-    int cnt = 1;
-
-    debugp_param("nd_lit", lit);
-    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-
-    while (list) {
-	COMPILE(ret, "each string", list->nd_head);
-	cnt++;
-	list = list->nd_next;
-    }
-    *cntp = cnt;
-
-    return COMPILE_OK;
-}
-
-static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
-{
-    int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
-    ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
-    return COMPILE_OK;
-}
-
-static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
-{
-    int cnt;
-    compile_dstr_fragments(iseq, ret, node, &cnt);
-    ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
-    return COMPILE_OK;
-}
-
-static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
-			 LABEL *then_label, LABEL *else_label)
-{
-    switch (nd_type(cond)) {
-      case NODE_AND:
-	{
-	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    compile_branch_condition(iseq, ret, cond->nd_1st, label,
-				     else_label);
-	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
-	}
-      case NODE_OR:
-	{
-	    LABEL *label = NEW_LABEL(nd_line(cond));
-	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
-				     label);
-	    ADD_LABEL(ret, label);
-	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
-				     else_label);
-	    break;
-	}
-      case NODE_LIT:		/* NODE_LIT is always not true */
-      case NODE_TRUE:
-      case NODE_STR:
-	/* printf("useless conditon eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
-	ADD_INSNL(ret, nd_line(cond), jump, then_label);
-	break;
-      case NODE_FALSE:
-      case NODE_NIL:
-	/* printf("useless conditon eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
-	ADD_INSNL(ret, nd_line(cond), jump, else_label);
-	break;
-      default:
-	COMPILE(ret, "branch condition", cond);
-	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
-	ADD_INSNL(ret, nd_line(cond), jump, then_label);
-	break;
-    }
-    return COMPILE_OK;
-}
-
-static int
-compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
-	       VALUE opt_p, int poped)
-{
-    NODE *node = node_root;
-    int len = node->nd_alen, line = nd_line(node), i=0;
-    DECL_ANCHOR(anchor);
-
-    INIT_ANCHOR(anchor);
-    if (nd_type(node) != NODE_ZARRAY) {
-	while (node) {
-	    if (nd_type(node) != NODE_ARRAY) {
-		rb_bug("compile_array: This node is not NODE_ARRAY, but %s",
-		       ruby_node_name(nd_type(node)));
-	    }
-
-	    i++;
-	    if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
-		opt_p = Qfalse;
-	    }
-	    COMPILE_(anchor, "array element", node->nd_head, poped);
-	    node = node->nd_next;
-	}
-    }
-
-    if (len != i) {
-	if (0) {
-	    rb_bug("node error: compile_array (%d: %d-%d)",
-		   (int)nd_line(node_root), len, i);
-	}
-	len = i;
-    }
-
-    if (opt_p == Qtrue) {
-	if (!poped) {
-	    VALUE ary = rb_ary_new();
-	    node = node_root;
-	    while (node) {
-		rb_ary_push(ary, node->nd_head->nd_lit);
-		node = node->nd_next;
-	    }
-
-	    iseq_add_mark_object_compile_time(iseq, ary);
-	    ADD_INSN1(ret, nd_line(node_root), duparray, ary);
-	}
-    }
-    else {
-	if (!poped) {
-	    ADD_INSN1(anchor, line, newarray, INT2FIX(len));
-	}
-	APPEND_LIST(ret, anchor);
-    }
-    return len;
-}
-
-static VALUE
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, VALUE opt_p)
-{
-    return compile_array_(iseq, ret, node_root, opt_p, 0);
-}
-
-static VALUE
-case_when_optimizable_literal(NODE * node)
-{
-    switch (nd_type(node)) {
-      case NODE_LIT: {
-	VALUE v = node->nd_lit;
-	if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
-	    return v;
-	}
-	break;
-      }
-      case NODE_STR:
-	return node->nd_lit;
-    }
-    return Qfalse;
-}
-
-static VALUE
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, VALUE special_literals)
-{
-    while (vals) {
-	VALUE lit;
-	NODE* val;
-
-	val = vals->nd_head;
-
-	if (special_literals &&
-	    (lit = case_when_optimizable_literal(val)) != Qfalse) {
-	    rb_ary_push(special_literals, lit);
-	    rb_ary_push(special_literals, (VALUE)(l1) | 1);
-	}
-	else {
-	    special_literals = Qfalse;
-	}
-
-	COMPILE(cond_seq, "when cond", val);
-	ADD_INSN1(cond_seq, nd_line(val), topn, INT2FIX(1));
-	ADD_SEND(cond_seq, nd_line(val), ID2SYM(idEqq), INT2FIX(1));
-	ADD_INSNL(cond_seq, nd_line(val), branchif, l1);
-	vals = vals->nd_next;
-    }
-    return special_literals;
-}
-
-static int
-compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
-{
-    switch (nd_type(node)) {
-      case NODE_ATTRASGN: {
-	INSN *iobj;
-	VALUE dupidx;
-
-	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
-	POP_ELEMENT(ret);        /* pop pop insn */
-	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
-
-	dupidx = iobj->operands[1];
-	dupidx = INT2FIX(FIX2INT(dupidx) + 1);
-	iobj->operands[1] = dupidx;
-
-	ADD_INSN1(ret, nd_line(node), topn, dupidx);
-	ADD_ELEM(ret, (LINK_ELEMENT *)iobj);
-	ADD_INSN(ret, nd_line(node), pop);	/* result */
-	ADD_INSN(ret, nd_line(node), pop);	/* rhs    */
-	break;
-      }
-      case NODE_MASGN: {
-	DECL_ANCHOR(anchor);
-	INIT_ANCHOR(anchor);
-	COMPILE_POPED(anchor, "nest masgn lhs", node);
-	REMOVE_ELEM(FIRST_ELEMENT(anchor));
-	ADD_SEQ(ret, anchor);
-	break;
-      }
-      default: {
-	DECL_ANCHOR(anchor);
-	INIT_ANCHOR(anchor);
-	COMPILE_POPED(anchor, "masgn lhs", node);
-	REMOVE_ELEM(FIRST_ELEMENT(anchor));
-	ADD_SEQ(ret, anchor);
-      }
-    }
-
-    return COMPILE_OK;
-}
-
-static void
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
-{
-    if (lhsn) {
-	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
-	compile_massign_lhs(iseq, ret, lhsn->nd_head);
-    }
-}
-
-static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-		    NODE *rhsn, NODE *orig_lhsn)
-{
-    VALUE mem[64];
-    const int memsize = sizeof(mem) / sizeof(mem[0]);
-    int memindex = 0;
-    int llen = 0, rlen = 0;
-    int i;
-    NODE *lhsn = orig_lhsn;
-
-#define MEMORY(v) { \
-    int i; \
-    if (memindex == memsize) return 0; \
-    for (i=0; i<memindex; i++) { \
-	if (mem[i] == (v)) return 0; \
-    } \
-    mem[memindex++] = (v); \
-}
-
-    if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
-	return 0;
-    }
-
-    while (lhsn) {
-	NODE *ln = lhsn->nd_head;
-	switch (nd_type(ln)) {
-	  case NODE_LASGN:
-	    MEMORY(ln->nd_vid);
-	    break;
-	  case NODE_DASGN:
-	  case NODE_DASGN_CURR:
-	  case NODE_IASGN:
-	  case NODE_IASGN2:
-	  case NODE_CVASGN:
-	    MEMORY(ln->nd_vid);
-	    break;
-	  default:
-	    return 0;
-	}
-	lhsn = lhsn->nd_next;
-	llen++;
-    }
-
-    while (rhsn) {
-	if (llen <= rlen) {
-	    COMPILE_POPED(ret, "masgn val (poped)", rhsn->nd_head);
-	}
-	else {
-	    COMPILE(ret, "masgn val", rhsn->nd_head);
-	}
-	rhsn = rhsn->nd_next;
-	rlen++;
-    }
-
-    if (llen > rlen) {
-	for (i=0; i<llen-rlen; i++) {
-	    ADD_INSN(ret, nd_line(orig_lhsn), putnil);
-	}
-    }
-
-    compile_massign_opt_lhs(iseq, ret, orig_lhsn);
-    return 1;
-}
-
-static int
-compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
-{
-    NODE *rhsn = node->nd_value;
-    NODE *splatn = node->nd_args;
-    NODE *lhsn = node->nd_head;
-    int lhs_splat = (splatn && (VALUE)splatn != (VALUE)-1) ? 1 : 0;
-
-    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
-	int llen = 0;
-	DECL_ANCHOR(lhsseq);
-
-	INIT_ANCHOR(lhsseq);
-
-	while (lhsn) {
-	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
-	    llen += 1;
-	    lhsn = lhsn->nd_next;
-	}
-
-	COMPILE(ret, "normal masgn rhs", rhsn);
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-
-	ADD_INSN2(ret, nd_line(node), expandarray,
-		  INT2FIX(llen), INT2FIX(lhs_splat));
-	ADD_SEQ(ret, lhsseq);
-
-	if (lhs_splat) {
-	    if (nd_type(splatn) == NODE_POSTARG) {
-		/*a, b, *r, p1, p2 */
-		NODE *postn = splatn->nd_2nd;
-		NODE *restn = splatn->nd_1st;
-		int num = postn->nd_alen;
-		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
-
-		ADD_INSN2(ret, nd_line(splatn), expandarray,
-			  INT2FIX(num), INT2FIX(flag));
-
-		if ((VALUE)restn != (VALUE)-1) {
-		    compile_massign_lhs(iseq, ret, restn);
-		}
-		while (postn) {
-		    compile_massign_lhs(iseq, ret, postn->nd_head);
-		    postn = postn->nd_next;
-		}
-	    }
-	    else {
-		/* a, b, *r */
-		compile_massign_lhs(iseq, ret, splatn);
-	    }
-	}
-    }
-    return COMPILE_OK;
-}
-
-static int
-compile_colon2(rb_iseq_t *iseq, NODE * node,
-	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
-{
-    switch (nd_type(node)) {
-      case NODE_CONST:
-	debugi("compile_colon2 - colon", node->nd_vid);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
-	break;
-      case NODE_COLON3:
-	debugi("compile_colon2 - colon3", node->nd_mid);
-	ADD_INSN(body, nd_line(node), pop);
-	ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
-	break;
-      case NODE_COLON2:
-	compile_colon2(iseq, node->nd_head, pref, body);
-	debugi("compile_colon2 - colon2", node->nd_mid);
-	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
-	break;
-      default:
-	COMPILE(pref, "const colon2 prefix", node);
-	break;
-    }
-    return COMPILE_OK;
-}
-
-static VALUE
-compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
-{
-    if (nd_type(cpath) == NODE_COLON3) {
-	/* toplevel class ::Foo */
-	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
-	return Qfalse;
-    }
-    else if (cpath->nd_head) {
-	/* Bar::Foo */
-	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
-	return Qfalse;
-    }
-    else {
-	/* class at cbase Foo */
-	ADD_INSN1(ret, nd_line(cpath), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	return Qtrue;
-    }
-}
-
-static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
-	     NODE *node, LABEL **lfinish, VALUE needstr)
-{
-    const char *estr = 0;
-    enum node_type type;
-
-    switch (type = nd_type(node)) {
-
-	/* easy literals */
-      case NODE_NIL:
-	estr = "nil";
-	break;
-      case NODE_SELF:
-	estr = "self";
-	break;
-      case NODE_TRUE:
-	estr = "true";
-	break;
-      case NODE_FALSE:
-	estr = "false";
-	break;
-
-      case NODE_ARRAY:{
-	NODE *vals = node;
-
-	do {
-	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
-
-	    if (!lfinish[1]) {
-		lfinish[1] = NEW_LABEL(nd_line(node));
-	    }
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	} while ((vals = vals->nd_next) != NULL);
-      }
-      case NODE_STR:
-      case NODE_LIT:
-      case NODE_ZARRAY:
-	estr = "expression";
-	break;
-
-	/* variables */
-      case NODE_LVAR:
-      case NODE_DVAR:
-	estr = "local-variable";
-	break;
-
-      case NODE_IVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
-		  ID2SYM(node->nd_vid), needstr);
-	return 1;
-
-      case NODE_GVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
-		  ((VALUE)node->nd_entry) | 1, needstr);
-	return 1;
-
-      case NODE_CVAR:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
-		  ID2SYM(node->nd_vid), needstr);
-	return 1;
-
-      case NODE_CONST:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
-		  ID2SYM(node->nd_vid), needstr);
-	return 1;
-      case NODE_COLON2:
-	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
-	}
-	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
-	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-
-	if (rb_is_const_id(node->nd_mid)) {
-	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	else {
-	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	return 1;
-      case NODE_COLON3:
-	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
-	ADD_INSN3(ret, nd_line(node), defined,
-		  INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
-	return 1;
-
-	/* method dispatch */
-      case NODE_CALL:
-      case NODE_VCALL:
-      case NODE_FCALL:
-      case NODE_ATTRASGN:{
-	int self = Qtrue;
-
-	switch (type) {
-	  case NODE_ATTRASGN:
-	    if (node->nd_recv == (NODE *)1) break;
-	  case NODE_CALL:
-	    self = Qfalse;
-	    break;
-	  default:
-	    /* through */;
-	}
-	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
-	}
-	if (node->nd_args) {
-	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	}
-	if (!self) {
-	    LABEL *lstart = NEW_LABEL(nd_line(node));
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-	    VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
-					     rb_str_concat(rb_str_new2
-							   ("defined guard in "),
-							   iseq->name),
-					     ISEQ_TYPE_DEFINED_GUARD);
-
-	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-
-	    ADD_LABEL(ret, lstart);
-	    COMPILE(ret, "defined/recv", node->nd_recv);
-	    ADD_LABEL(ret, lend);
-	    ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), putself);
-	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC),
-		      ID2SYM(node->nd_mid), needstr);
-	}
-	return 1;
-      }
-
-      case NODE_YIELD:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
-		  needstr);
-	return 1;
-
-      case NODE_BACK_REF:
-      case NODE_NTH_REF:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF),
-		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
-		  needstr);
-	return 1;
-
-      case NODE_SUPER:
-      case NODE_ZSUPER:
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
-		  needstr);
-	return 1;
-
-      case NODE_OP_ASGN1:
-      case NODE_OP_ASGN2:
-      case NODE_OP_ASGN_OR:
-      case NODE_OP_ASGN_AND:
-      case NODE_MASGN:
-      case NODE_LASGN:
-      case NODE_DASGN:
-      case NODE_DASGN_CURR:
-      case NODE_GASGN:
-      case NODE_IASGN:
-      case NODE_CDECL:
-      case NODE_CVDECL:
-      case NODE_CVASGN:
-	estr = "assignment";
-	break;
-
-      default:{
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	VALUE ensure = NEW_CHILD_ISEQVAL(NEW_NIL(),
-					 rb_str_concat(rb_str_new2
-						       ("defined guard in "),
-						       iseq->name),
-					 ISEQ_TYPE_DEFINED_GUARD);
-
-	ADD_LABEL(ret, lstart);
-	COMPILE(ret, "defined expr (others)", node);
-	if (!lfinish[1]) {
-	    lfinish[1] = NEW_LABEL(nd_line(node));
-	}
-	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
-	if (needstr) {
-	    ADD_INSN1(ret, nd_line(node), putstring, rb_str_new2("expression"));
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	ADD_LABEL(ret, lend);
-
-	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, ensure, lfinish[1]);
-	return 1;
-      } /* end of default */
-    }
-
-    if (estr != 0) {
-	if (needstr != Qfalse) {
-	    VALUE str = rb_str_new2(estr);
-	    ADD_INSN1(ret, nd_line(node), putstring, str);
-	    iseq_add_mark_object_compile_time(iseq, str);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	return 1;
-    }
-    return 0;
-}
-
-#define BUFSIZE 0x100
-
-static VALUE
-make_name_for_block(rb_iseq_t *iseq)
-{
-    if (iseq->parent_iseq == 0) {
-	return rb_sprintf("block in %s", RSTRING_PTR(iseq->name));
-    }
-    else {
-	int level = 1;
-	rb_iseq_t *ip = iseq;
-	while (ip->local_iseq != ip) {
-	    ip = ip->parent_iseq;
-	    level++;
-	}
-	return rb_sprintf("block (%d levels) in %s", level, RSTRING_PTR(ip->name));
-    }
-}
-
-static void
-add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
-		 LABEL *lstart, LABEL *lend)
-{
-    struct ensure_range *ne =
-	compile_data_alloc(iseq, sizeof(struct ensure_range));
-
-    while (erange->next != 0) {
-	erange = erange->next;
-    }
-    ne->next = 0;
-    ne->begin = lend;
-    ne->end = erange->end;
-    erange->end = lstart;
-
-    erange->next = ne;
-}
-
-static void
-add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq)
-{
-    struct iseq_compile_data_ensure_node_stack *enlp =
-	iseq->compile_data->ensure_node_stack;
-    struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
-    DECL_ANCHOR(ensure);
-
-    INIT_ANCHOR(ensure);
-    while (enlp) {
-	DECL_ANCHOR(ensure_part);
-	LABEL *lstart = NEW_LABEL(0);
-	LABEL *lend = NEW_LABEL(0);
-
-	INIT_ANCHOR(ensure_part);
-	add_ensure_range(iseq, enlp->erange, lstart, lend);
-
-	iseq->compile_data->ensure_node_stack = enlp->prev;
-	ADD_LABEL(ensure_part, lstart);
-	COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
-	ADD_LABEL(ensure_part, lend);
-
-	ADD_SEQ(ensure, ensure_part);
-	enlp = enlp->prev;
-    }
-    iseq->compile_data->ensure_node_stack = prev_enlp;
-    ADD_SEQ(ret, ensure);
-}
-
-static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned long *flag)
-{
-    VALUE argc = INT2FIX(0);
-    int nsplat = 0;
-    DECL_ANCHOR(arg_block);
-    DECL_ANCHOR(args_splat);
-
-    INIT_ANCHOR(arg_block);
-    INIT_ANCHOR(args_splat);
-    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
-	COMPILE(arg_block, "block", argn->nd_body);
-	*flag |= VM_CALL_ARGS_BLOCKARG_BIT;
-	argn = argn->nd_head;
-    }
-
-  setup_argn:
-    if (argn) {
-	switch (nd_type(argn)) {
-	  case NODE_SPLAT: {
-	    COMPILE(args, "args (splat)", argn->nd_head);
-	    argc = INT2FIX(1);
-	    nsplat++;
-	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
-	    break;
-	  }
-	  case NODE_ARGSCAT:
-	  case NODE_ARGSPUSH: {
-	    int next_is_array = (nd_type(argn->nd_head) == NODE_ARRAY);
-	    DECL_ANCHOR(tmp);
-
-	    INIT_ANCHOR(tmp);
-	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
-	    if (next_is_array && nsplat == 0) {
-		/* none */
-	    }
-	    else {
-		if (nd_type(argn) == NODE_ARGSCAT) {
-		    ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
-		}
-		else {
-		    ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
-		}
-	    }
-	    INSERT_LIST(args_splat, tmp);
-	    nsplat++;
-	    *flag |= VM_CALL_ARGS_SPLAT_BIT;
-
-	    if (next_is_array) {
-		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, Qfalse) + 1);
-		POP_ELEMENT(args);
-	    }
-	    else {
-		argn = argn->nd_head;
-		goto setup_argn;
-	    }
-	    break;
-	  }
-	  case NODE_ARRAY: {
-	    argc = INT2FIX(compile_array(iseq, args, argn, Qfalse));
-	    POP_ELEMENT(args);
-	    break;
-	  }
-	  default: {
-	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
-	  }
-	}
-    }
-
-    if (nsplat > 1) {
-	int i;
-	for (i=1; i<nsplat; i++) {
-	    ADD_INSN(args_splat, nd_line(args), concatarray);
-	}
-    }
-
-    if (!LIST_SIZE_ZERO(args_splat)) {
-	ADD_SEQ(args, args_splat);
-    }
-
-    if (*flag & VM_CALL_ARGS_BLOCKARG_BIT) {
-	ADD_SEQ(args, arg_block);
-    }
-    return argc;
-}
-
-
-/**
-  compile each node
-
-  self:  InstructionSequence
-  node:  Ruby compiled node
-  poped: This node will be poped
- */
-static int
-iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
-{
-    enum node_type type;
-
-    if (node == 0) {
-	if (!poped) {
-	    debugs("node: NODE_NIL(implicit)\n");
-	    ADD_INSN(ret, iseq->compile_data->last_line, putnil);
-	}
-	return COMPILE_OK;
-    }
-
-    iseq->compile_data->last_line = nd_line(node);
-    debug_node_start(node);
-
-    type = nd_type(node);
-
-    if (node->flags & NODE_FL_NEWLINE) {
-	ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
-    }
-
-    switch (type) {
-      case NODE_BLOCK:{
-	while (node && nd_type(node) == NODE_BLOCK) {
-	    COMPILE_(ret, "BLOCK body", node->nd_head,
-		     (node->nd_next == 0 && poped == 0) ? 0 : 1);
-	    node = node->nd_next;
-	}
-	if (node) {
-	    COMPILE_(ret, "BLOCK next", node->nd_next, poped);
-	}
-	break;
-      }
-      case NODE_IF:{
-	DECL_ANCHOR(cond_seq);
-	DECL_ANCHOR(then_seq);
-	DECL_ANCHOR(else_seq);
-	LABEL *then_label, *else_label, *end_label;
-
-	INIT_ANCHOR(cond_seq);
-	INIT_ANCHOR(then_seq);
-	INIT_ANCHOR(else_seq);
-	then_label = NEW_LABEL(nd_line(node));
-	else_label = NEW_LABEL(nd_line(node));
-	end_label = NEW_LABEL(nd_line(node));
-
-	compile_branch_condition(iseq, cond_seq, node->nd_cond,
-				 then_label, else_label);
-	COMPILE_(then_seq, "then", node->nd_body, poped);
-	COMPILE_(else_seq, "else", node->nd_else, poped);
-
-	ADD_SEQ(ret, cond_seq);
-
-	ADD_LABEL(ret, then_label);
-	ADD_SEQ(ret, then_seq);
-	ADD_INSNL(ret, nd_line(node), jump, end_label);
-
-	ADD_LABEL(ret, else_label);
-	ADD_SEQ(ret, else_seq);
-
-	ADD_LABEL(ret, end_label);
-
-	break;
-      }
-      case NODE_CASE:{
-	NODE *vals;
-	NODE *tempnode = node;
-	LABEL *endlabel, *elselabel;
-	DECL_ANCHOR(head);
-	DECL_ANCHOR(body_seq);
-	DECL_ANCHOR(cond_seq);
-	VALUE special_literals = rb_ary_new();
-
-	INIT_ANCHOR(head);
-	INIT_ANCHOR(body_seq);
-	INIT_ANCHOR(cond_seq);
-	if (node->nd_head == 0) {
-	    COMPILE_(ret, "when", node->nd_body, poped);
-	    break;
-	}
-	COMPILE(head, "case base", node->nd_head);
-
-	node = node->nd_body;
-	type = nd_type(node);
-
-	if (type != NODE_WHEN) {
-	    COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
-	}
-
-	endlabel = NEW_LABEL(nd_line(node));
-	elselabel = NEW_LABEL(nd_line(node));
-
-	ADD_SEQ(ret, head);	/* case VAL */
-
-	while (type == NODE_WHEN) {
-	    LABEL *l1;
-
-	    l1 = NEW_LABEL(nd_line(node));
-	    ADD_LABEL(body_seq, l1);
-	    ADD_INSN(body_seq, nd_line(node), pop);
-	    COMPILE_(body_seq, "when body", node->nd_body, poped);
-	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
-
-	    vals = node->nd_head;
-	    if (vals) {
-		switch (nd_type(vals)) {
-		  case NODE_ARRAY:
-		    special_literals = when_vals(iseq, cond_seq, vals, l1, special_literals);
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    special_literals = 0;
-		    COMPILE(cond_seq, "when/cond splat", vals);
-		    ADD_INSN1(cond_seq, nd_line(vals), checkincludearray, Qtrue);
-		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
-		    break;
-		  default:
-		    rb_bug("NODE_CASE: unknown node (%s)",
-			   ruby_node_name(nd_type(vals)));
-		}
-	    }
-	    else {
-		rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
-	    }
-
-	    node = node->nd_next;
-	    if (!node) {
-		break;
-	    }
-	    type = nd_type(node);
-	}
-	/* else */
-	if (node) {
-	    ADD_LABEL(cond_seq, elselabel);
-	    ADD_INSN(cond_seq, nd_line(node), pop);
-	    COMPILE_(cond_seq, "else", node, poped);
-	    ADD_INSNL(cond_seq, nd_line(node), jump, endlabel);
-	}
-	else {
-	    debugs("== else (implicit)\n");
-	    ADD_LABEL(cond_seq, elselabel);
-	    ADD_INSN(cond_seq, nd_line(tempnode), pop);
-	    if (!poped) {
-		ADD_INSN(cond_seq, nd_line(tempnode), putnil);
-	    }
-	    ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
-	}
-
-	if (special_literals) {
-	    ADD_INSN(ret, nd_line(tempnode), dup);
-	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch,
-		      special_literals, elselabel);
-	    iseq_add_mark_object_compile_time(iseq, special_literals);
-	}
-
-	ADD_SEQ(ret, cond_seq);
-	ADD_SEQ(ret, body_seq);
-	ADD_LABEL(ret, endlabel);
-	break;
-      }
-      case NODE_WHEN:{
-	NODE *vals;
-	NODE *val;
-	NODE *orig_node = node;
-	LABEL *endlabel;
-	DECL_ANCHOR(body_seq);
-
-	INIT_ANCHOR(body_seq);
-	endlabel = NEW_LABEL(nd_line(node));
-
-	while (node && nd_type(node) == NODE_WHEN) {
-	    LABEL *l1 = NEW_LABEL(nd_line(node));
-	    ADD_LABEL(body_seq, l1);
-	    COMPILE_(body_seq, "when", node->nd_body, poped);
-	    ADD_INSNL(body_seq, nd_line(node), jump, endlabel);
-
-	    vals = node->nd_head;
-	    if (vals && nd_type(vals) == NODE_ARRAY) {
-		while (vals) {
-		    val = vals->nd_head;
-		    COMPILE(ret, "when2", val);
-		    ADD_INSNL(ret, nd_line(val), branchif, l1);
-		    vals = vals->nd_next;
-		}
-	    }
-	    else if (nd_type(vals) == NODE_SPLAT ||
-		     nd_type(vals) == NODE_ARGSCAT ||
-		     nd_type(vals) == NODE_ARGSPUSH) {
-
-		NODE *val = vals->nd_head;
-
-		if (nd_type(vals) == NODE_ARGSCAT || nd_type(vals) == NODE_ARGSPUSH) {
-		    NODE *vs = vals->nd_head;
-		    val = vals->nd_body;
-
-		    while (vs) {
-			NODE* val = vs->nd_head;
-			COMPILE(ret, "when/argscat", val);
-			ADD_INSNL(ret, nd_line(val), branchif, l1);
-			vs = vs->nd_next;
-		    }
-		}
-
-		ADD_INSN(ret, nd_line(val), putnil);
-		COMPILE(ret, "when2/splat", val);
-		ADD_INSN1(ret, nd_line(val), checkincludearray, Qfalse);
-		ADD_INSN(ret, nd_line(val), pop);
-		ADD_INSNL(ret, nd_line(val), branchif, l1);
-	    }
-	    else {
-		rb_bug("err");
-	    }
-	    node = node->nd_next;
-	}
-	/* else */
-	COMPILE_(ret, "else", node, poped);
-	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
-
-	ADD_SEQ(ret, body_seq);
-	ADD_LABEL(ret, endlabel);
-
-	break;
-      }
-      case NODE_OPT_N:
-      case NODE_WHILE:
-      case NODE_UNTIL:{
-	LABEL *prev_start_label = iseq->compile_data->start_label;
-	LABEL *prev_end_label = iseq->compile_data->end_label;
-	LABEL *prev_redo_label = iseq->compile_data->redo_label;
-	VALUE prev_loopval_popped = iseq->compile_data->loopval_popped;
-
-	struct iseq_compile_data_ensure_node_stack *enlp =
-	    iseq->compile_data->ensure_node_stack;
-
-	LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(nd_line(node));	/* next  */
-	LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(nd_line(node));	/* redo  */
-	LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(nd_line(node));	/* break */
-	LABEL *end_label = NEW_LABEL(nd_line(node));
-
-	LABEL *next_catch_label = NEW_LABEL(nd_line(node));
-	LABEL *tmp_label = NULL;
-
-	iseq->compile_data->loopval_popped = 0;
-	iseq->compile_data->ensure_node_stack = 0;
-
-	if (type == NODE_OPT_N || node->nd_state == 1) {
-	    ADD_INSNL(ret, nd_line(node), jump, next_label);
-	}
-	else {
-	    tmp_label = NEW_LABEL(nd_line(node));
-	    ADD_INSNL(ret, nd_line(node), jump, tmp_label);
-	}
-	ADD_INSN(ret, nd_line(node), putnil);
-	ADD_LABEL(ret, next_catch_label);
-	ADD_INSN(ret, nd_line(node), pop);
-	ADD_INSNL(ret, nd_line(node), jump, next_label);
-	if (tmp_label) ADD_LABEL(ret, tmp_label);
-
-	ADD_LABEL(ret, redo_label);
-	COMPILE_POPED(ret, "while body", node->nd_body);
-	ADD_LABEL(ret, next_label);	/* next */
-
-	if (type == NODE_WHILE) {
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     redo_label, end_label);
-	}
-	else if (type == NODE_UNTIL) {
-	    /* untile */
-	    compile_branch_condition(iseq, ret, node->nd_cond,
-				     end_label, redo_label);
-	}
-	else {
-	    ADD_CALL_RECEIVER(ret, nd_line(node));
-	    ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0));
-	    ADD_INSNL(ret, nd_line(node), branchif, redo_label);
-	    /* opt_n */
-	}
-
-	ADD_LABEL(ret, end_label);
-
-	if (node->nd_state == Qundef) {
-	    /* ADD_INSN(ret, nd_line(node), putundef); */
-	    rb_bug("unsupported: putundef");
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	}
-
-	ADD_LABEL(ret, break_label);	/* break */
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
-			0, break_label);
-	ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0,
-			next_catch_label);
-	ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0,
-			iseq->compile_data->redo_label);
-
-	iseq->compile_data->start_label = prev_start_label;
-	iseq->compile_data->end_label = prev_end_label;
-	iseq->compile_data->redo_label = prev_redo_label;
-	iseq->compile_data->loopval_popped = prev_loopval_popped;
-	iseq->compile_data->ensure_node_stack = enlp;
-	break;
-      }
-      case NODE_ITER:
-      case NODE_FOR:{
-	VALUE prevblock = iseq->compile_data->current_block;
-	LABEL *retry_label = NEW_LABEL(nd_line(node));
-	LABEL *retry_end_l = NEW_LABEL(nd_line(node));
-	ID mid = 0;
-
-	ADD_LABEL(ret, retry_label);
-	if (nd_type(node) == NODE_FOR) {
-	    COMPILE(ret, "iter caller (for)", node->nd_iter);
-
-	    iseq->compile_data->current_block =
-		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
-				  ISEQ_TYPE_BLOCK);
-
-	    mid = idEach;
-	    ADD_SEND_R(ret, nd_line(node), ID2SYM(idEach), INT2FIX(0),
-		       iseq->compile_data->current_block, INT2FIX(0));
-	}
-	else {
-	    iseq->compile_data->current_block =
-		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
-				  ISEQ_TYPE_BLOCK);
-	    COMPILE(ret, "iter caller", node->nd_iter);
-	}
-	ADD_LABEL(ret, retry_end_l);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	iseq->compile_data->current_block = prevblock;
-
-	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
-
-	break;
-      }
-      case NODE_BREAK:{
-	unsigned long level = 0;
-
-	if (iseq->compile_data->redo_label != 0) {
-	    /* while/until */
-	    LABEL *splabel = NEW_LABEL(0);
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped);
-	    add_ensure_iseq(ret, iseq);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
-	    }
-	}
-	else if (iseq->type == ISEQ_TYPE_BLOCK) {
-	  break_by_insn:
-	    /* escape from block */
-	    COMPILE(ret, "break val (block)", node->nd_stts);
-	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
-	    if (poped) {
-		ADD_INSN(ret, nd_line(node), pop);
-	    }
-	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  break_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
-	}
-	else {
-	    rb_iseq_t *ip = iseq->parent_iseq;
-	    while (ip) {
-		level++;
-		if (ip->compile_data->redo_label != 0) {
-		    level = 0x8000;
-		    if (ip->compile_data->loopval_popped == 0) {
-			/* need value */
-			level |= 0x4000;
-		    }
-		    goto break_by_insn;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    level <<= 16;
-		    goto break_by_insn;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto break_in_eval;
-		}
-		ip = ip->parent_iseq;
-	    }
-	    COMPILE_ERROR((ERROR_ARGS "Invalid break"));
-	}
-	break;
-      }
-      case NODE_NEXT:{
-	unsigned long level = 0;
-
-	if (iseq->compile_data->redo_label != 0) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("next in while loop\n");
-	    ADD_LABEL(ret, splabel);
-	    COMPILE(ret, "next val/valid syntax?", node->nd_stts);
-	    add_ensure_iseq(ret, iseq);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	}
-	else if (iseq->compile_data->end_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("next in block\n");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
-	    COMPILE(ret, "next val", node->nd_stts);
-	    add_ensure_iseq(ret, iseq);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->end_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
-	    }
-	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  next_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
-	}
-	else {
-	    rb_iseq_t *ip;
-	    ip = iseq;
-	    while (ip) {
-		level = 0x8000 | 0x4000;
-		if (ip->compile_data->redo_label != 0) {
-		    /* while loop */
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto next_in_eval;
-		}
-		ip = ip->parent_iseq;
-	    }
-	    if (ip != 0) {
-		COMPILE(ret, "next val", node->nd_stts);
-		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
-
-		if (poped) {
-		    ADD_INSN(ret, nd_line(node), pop);
-		}
-	    }
-	    else {
-		COMPILE_ERROR((ERROR_ARGS "Invalid next"));
-	    }
-	}
-	break;
-      }
-      case NODE_REDO:{
-	if (iseq->compile_data->redo_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-	    debugs("redo in while");
-	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->redo_label);
-	    add_ensure_iseq(ret, iseq);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->redo_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-	}
-	else if (iseq->type == ISEQ_TYPE_EVAL) {
-	  redo_in_eval:
-	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
-	}
-	else if (iseq->compile_data->start_label) {
-	    LABEL *splabel = NEW_LABEL(0);
-
-	    debugs("redo in block");
-	    ADD_LABEL(ret, splabel);
-	    add_ensure_iseq(ret, iseq);
-	    ADD_ADJUST(ret, nd_line(node), iseq->compile_data->start_label);
-	    ADD_INSNL(ret, nd_line(node), jump, iseq->compile_data->start_label);
-	    ADD_ADJUST_RESTORE(ret, splabel);
-
-	    if (!poped) {
-		ADD_INSN(ret, nd_line(node), putnil);
-	    }
-	}
-	else {
-	    rb_iseq_t *ip;
-	    unsigned long level;
-	    level = 0x8000 | 0x4000;
-	    ip = iseq;
-	    while (ip) {
-		if (ip->compile_data->redo_label != 0) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_BLOCK) {
-		    break;
-		}
-		else if (ip->type == ISEQ_TYPE_EVAL) {
-		    goto redo_in_eval;
-		}
-		ip = ip->parent_iseq;
-	    }
-	    if (ip != 0) {
-		ADD_INSN(ret, nd_line(node), putnil);
-		ADD_INSN1(ret, nd_line(node), throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
-
-		if (poped) {
-		    ADD_INSN(ret, nd_line(node), pop);
-		}
-	    }
-	    else {
-		COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
-	    }
-	}
-	break;
-      }
-      case NODE_RETRY:{
-	if (iseq->type == ISEQ_TYPE_RESCUE) {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x04) /* TAG_RETRY */ );
-
-	    if (poped) {
-		ADD_INSN(ret, nd_line(node), pop);
-	    }
-	}
-	else {
-	    COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
-	}
-	break;
-      }
-      case NODE_BEGIN:{
-	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
-	break;
-      }
-      case NODE_RESCUE:{
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lcont = NEW_LABEL(nd_line(node));
-	VALUE rescue = NEW_CHILD_ISEQVAL(
-	    node->nd_resq,
-	    rb_str_concat(rb_str_new2("rescue in "), iseq->name),
-	    ISEQ_TYPE_RESCUE);
-
-	ADD_LABEL(ret, lstart);
-	COMPILE(ret, "rescue head", node->nd_head);
-	ADD_LABEL(ret, lend);
-	if (node->nd_else) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE(ret, "rescue else", node->nd_else);
-	}
-	ADD_INSN(ret, nd_line(node), nop);
-	ADD_LABEL(ret, lcont);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	/* resgister catch entry */
-	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
-	ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart);
-	break;
-      }
-      case NODE_RESBODY:{
-	NODE *resq = node;
-	NODE *narg;
-	LABEL *label_miss, *label_hit;
-
-	while (resq) {
-	    label_miss = NEW_LABEL(nd_line(node));
-	    label_hit = NEW_LABEL(nd_line(node));
-
-	    narg = resq->nd_args;
-	    if (narg) {
-		switch (nd_type(narg)) {
-		  case NODE_ARRAY:
-		    while (narg) {
-			COMPILE(ret, "rescue arg", narg->nd_head);
-			ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-			ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
-			ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-			narg = narg->nd_next;
-		    }
-		    break;
-		  case NODE_SPLAT:
-		  case NODE_ARGSCAT:
-		  case NODE_ARGSPUSH:
-		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-		    COMPILE(ret, "rescue/cond splat", narg);
-		    ADD_INSN1(ret, nd_line(node), checkincludearray, Qtrue);
-		    ADD_INSN(ret, nd_line(node), swap);
-		    ADD_INSN(ret, nd_line(node), pop);
-		    ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-		    break;
-		  default:
-		    rb_bug("NODE_RESBODY: unknown node (%s)",
-			   ruby_node_name(nd_type(narg)));
-		}
-	    }
-	    else {
-		ADD_INSN1(ret, nd_line(node), putobject,
-			  rb_eStandardError);
-		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-		ADD_SEND(ret, nd_line(node), ID2SYM(idEqq), INT2FIX(1));
-		ADD_INSNL(ret, nd_line(node), branchif, label_hit);
-	    }
-	    ADD_INSNL(ret, nd_line(node), jump, label_miss);
-	    ADD_LABEL(ret, label_hit);
-	    COMPILE(ret, "resbody body", resq->nd_body);
-	    if (iseq->compile_data->option->tailcall_optimization) {
-		ADD_INSN(ret, nd_line(node), nop);
-	    }
-	    ADD_INSN(ret, nd_line(node), leave);
-	    ADD_LABEL(ret, label_miss);
-	    resq = resq->nd_head;
-	}
-	break;
-      }
-      case NODE_ENSURE:{
-	DECL_ANCHOR(ensr);
-	VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
-					 rb_str_concat(rb_str_new2
-						       ("ensure in "),
-						       iseq->name),
-					 ISEQ_TYPE_ENSURE);
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lcont = NEW_LABEL(nd_line(node));
-	struct ensure_range er = { 0 };
-	struct iseq_compile_data_ensure_node_stack enl;
-	struct ensure_range *erange;
-
-	INIT_ANCHOR(ensr);
-	er.begin = lstart;
-	er.end = lend;
-	enl.ensure_node = node->nd_ensr;
-	enl.prev = iseq->compile_data->ensure_node_stack;	/* prev */
-	enl.erange = &er;
-	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
-
-	iseq->compile_data->ensure_node_stack = &enl;
-
-	ADD_LABEL(ret, lstart);
-	COMPILE_(ret, "ensure head", node->nd_head, poped);
-	ADD_LABEL(ret, lend);
-	if (ensr->anchor.next == 0) {
-	    ADD_INSN(ret, nd_line(node), nop);
-	}
-	else {
-	    ADD_SEQ(ret, ensr);
-	}
-	ADD_LABEL(ret, lcont);
-
-	erange = iseq->compile_data->ensure_node_stack->erange;
-	while (erange) {
-	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
-			    ensure, lcont);
-	    erange = erange->next;
-	}
-	iseq->compile_data->ensure_node_stack = enl.prev;
-	break;
-      }
-
-      case NODE_AND:
-      case NODE_OR:{
-	LABEL *end_label = NEW_LABEL(nd_line(node));
-	COMPILE(ret, "nd_1st", node->nd_1st);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	if (type == NODE_AND) {
-	    ADD_INSNL(ret, nd_line(node), branchunless, end_label);
-	}
-	else {
-	    ADD_INSNL(ret, nd_line(node), branchif, end_label);
-	}
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
-	ADD_LABEL(ret, end_label);
-	break;
-      }
-
-      case NODE_MASGN:{
-	  compile_massign(iseq, ret, node, poped);
-	  break;
-      }
-
-      case NODE_LASGN:{
-	ID id = node->nd_vid;
-	int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
-
-	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
-	COMPILE(ret, "rvalue", node->nd_value);
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	ADD_INSN1(ret, nd_line(node), setlocal, INT2FIX(idx));
-
-	break;
-      }
-      case NODE_DASGN:
-      case NODE_DASGN_CURR:{
-	int idx, lv, ls;
-	COMPILE(ret, "dvalue", node->nd_value);
-	debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-
-	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
-
-	if (idx < 0) {
-	    rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
-	}
-
-	ADD_INSN2(ret, nd_line(node), setdynamic,
-		  INT2FIX(ls - idx), INT2FIX(lv));
-	break;
-      }
-      case NODE_GASGN:{
-	COMPILE(ret, "lvalue", node->nd_value);
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	ADD_INSN1(ret, nd_line(node), setglobal,
-		  (((long)node->nd_entry) | 1));
-	break;
-      }
-      case NODE_IASGN:
-      case NODE_IASGN2:{
-	COMPILE(ret, "lvalue", node->nd_value);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	ADD_INSN1(ret, nd_line(node), setinstancevariable,
-		  ID2SYM(node->nd_vid));
-	break;
-      }
-      case NODE_CDECL:{
-	COMPILE(ret, "lvalue", node->nd_value);
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-
-	if (node->nd_vid) {
-	    ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_vid));
-	}
-	else {
-	    compile_cpath(ret, iseq, node->nd_else);
-	    ADD_INSN1(ret, nd_line(node), setconstant, ID2SYM(node->nd_else->nd_mid));
-	}
-	break;
-      }
-      case NODE_CVASGN:{
-	COMPILE(ret, "cvasgn val", node->nd_value);
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	}
-	ADD_INSN1(ret, nd_line(node), setclassvariable,
-		  ID2SYM(node->nd_vid));
-	break;
-      }
-      case NODE_OP_ASGN1: {
-	  DECL_ANCHOR(args);
-	  VALUE argc;
-	  unsigned long flag = 0;
-	  ID id = node->nd_mid;
-
-	  /*
-	   * a[x] (op)= y
-	   *
-	   * eval a    # a
-	   * eval x    # a x
-	   * dupn 2    # a x a x
-	   * send :[]  # a x a[x]
-	   * eval y    # a x a[x] y
-	   * send op   # a x a[x]+y
-	   * send []=  # ret
-	   */
-
-	  /*
-	   * nd_recv[nd_args->nd_body] (nd_mid)= nd_args->nd_head;
-	   * NODE_OP_ASGN nd_recv
-	   *              nd_args->nd_head
-	   *              nd_args->nd_body
-	   *              nd_mid
-	   */
-
-	  COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
-	  if (nd_type(node->nd_args->nd_body) != NODE_ZARRAY) {
-	      INIT_ANCHOR(args);
-	      argc = setup_args(iseq, args, node->nd_args->nd_body, &flag);
-	      ADD_SEQ(ret, args);
-	  }
-	  else {
-	      argc = INT2FIX(0);
-	  }
-	  ADD_INSN1(ret, nd_line(node), dupn, INT2FIX(FIX2INT(argc)+1));
-	  ADD_SEND_R(ret, nd_line(node), ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
-
-	  if (id == 0 || id == 1) {
-	      /* 0: or, 1: and
-	       a[x] ||= y
-
-	       unless/if a[x]
-	       a[x]= y
-	       else
-	       nil
-	       end
-	       */
-	      LABEL *label = NEW_LABEL(nd_line(node));
-	      LABEL *lfin = NEW_LABEL(nd_line(node));
-
-	      if (id == 0) {
-		  /* or */
-		  ADD_INSN(ret, nd_line(node), dup);
-		  ADD_INSNL(ret, nd_line(node), branchif, label);
-		  ADD_INSN(ret, nd_line(node), pop);
-	      }
-	      else {
-		  /* and */
-		  ADD_INSN(ret, nd_line(node), dup);
-		  ADD_INSNL(ret, nd_line(node), branchunless, label);
-		  ADD_INSN(ret, nd_line(node), pop);
-	      }
-
-	      COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
-	      if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		  ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
-		  ADD_INSN(ret, nd_line(node), concatarray);
-		  ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			     argc, Qfalse, LONG2FIX(flag));
-	      }
-	      else {
-		  ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			     INT2FIX(FIX2INT(argc) + 1), Qfalse, LONG2FIX(flag));
-	      }
-	      ADD_INSNL(ret, nd_line(node), jump, lfin);
-	      ADD_LABEL(ret, label);
-	      if (id == 0 || id == 1) {	/* 0: or, 1: and */
-		  ADD_INSN(ret, nd_line(node), swap);
-		  ADD_INSN(ret, nd_line(node), pop);
-		  ADD_INSN(ret, nd_line(node), swap);
-		  ADD_INSN(ret, nd_line(node), pop);
-	      }
-	      ADD_LABEL(ret, lfin);
-	  }
-	  else {
-	      COMPILE(ret, "NODE_OP_ASGN1 args->head: ", node->nd_args->nd_head);
-	      ADD_SEND(ret, nd_line(node), ID2SYM(id), INT2FIX(1));
-	      if (flag & VM_CALL_ARGS_SPLAT_BIT) {
-		  ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
-		  ADD_INSN(ret, nd_line(node), concatarray);
-		  ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			     argc, Qfalse, LONG2FIX(flag));
-	      }
-	      else {
-		  ADD_SEND_R(ret, nd_line(node), ID2SYM(idASET),
-			     INT2FIX(FIX2INT(argc) + 1), Qfalse, LONG2FIX(flag));
-	      }
-	  }
-
-	  if (poped) {
-	      ADD_INSN(ret, nd_line(node), pop);
-	  }
-
-	  break;
-      }
-      case NODE_OP_ASGN2:{
-	ID atype = node->nd_next->nd_mid;
-	LABEL *lfin = NEW_LABEL(nd_line(node));
-	LABEL *lcfin = NEW_LABEL(nd_line(node));
-	/*
-	  class C; attr_accessor :c; end
-	  r = C.new
-	  r.a &&= v # asgn2
-
-	  eval r    # r
-	  dup       # r r
-	  eval r.a  # r o
-
-	  # or
-	  dup       # r o o
-	  if lcfin  # r o
-	  pop       # r
-	  eval v    # r v
-	  send a=   # v
-	  jump lfin # v
-
-	  lcfin:      # r o
-	  swap      # o r
-	  pop       # o
-
-	  lfin:       # v
-
-	  # and
-	  dup       # r o o
-	  unless lcfin
-	  pop       # r
-	  eval v    # r v
-	  send a=   # v
-	  jump lfin # v
-
-	  # others
-	  eval v    # r o v
-	  send ??   # r w
-	  send a=   # w
-
-	*/
-
-	COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
-	ADD_INSN(ret, nd_line(node), dup);
-	ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_vid),
-		 INT2FIX(0));
-
-	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
-	    ADD_INSN(ret, nd_line(node), dup);
-	    if (atype == 0) {
-		ADD_INSNL(ret, nd_line(node), branchif, lcfin);
-	    }
-	    else {
-		ADD_INSNL(ret, nd_line(node), branchunless, lcfin);
-	    }
-	    ADD_INSN(ret, nd_line(node), pop);
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
-		     INT2FIX(1));
-	    ADD_INSNL(ret, nd_line(node), jump, lfin);
-
-	    ADD_LABEL(ret, lcfin);
-	    ADD_INSN(ret, nd_line(node), swap);
-	    ADD_INSN(ret, nd_line(node), pop);
-
-	    ADD_LABEL(ret, lfin);
-	}
-	else {
-	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_mid),
-		     INT2FIX(1));
-	    ADD_SEND(ret, nd_line(node), ID2SYM(node->nd_next->nd_aid),
-		     INT2FIX(1));
-	}
-
-	if (poped) {
-	    /* we can apply more optimize */
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_OP_ASGN_AND:
-      case NODE_OP_ASGN_OR:{
-	LABEL *lfin = NEW_LABEL(nd_line(node));
-	LABEL *lassign;
-
-	if (nd_type(node) == NODE_OP_ASGN_OR) {
-	    LABEL *lfinish[2];
-	    lfinish[0] = lfin;
-	    lfinish[1] = 0;
-	    defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
-	    lassign = lfinish[1];
-	    if (!lassign) {
-		lassign = NEW_LABEL(nd_line(node));
-	    }
-	    ADD_INSNL(ret, nd_line(node), branchunless, lassign);
-	}
-	else {
-	    lassign = NEW_LABEL(nd_line(node));
-	}
-
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
-	ADD_INSN(ret, nd_line(node), dup);
-
-	if (nd_type(node) == NODE_OP_ASGN_AND) {
-	    ADD_INSNL(ret, nd_line(node), branchunless, lfin);
-	}
-	else {
-	    ADD_INSNL(ret, nd_line(node), branchif, lfin);
-	}
-
-	ADD_INSN(ret, nd_line(node), pop);
-	ADD_LABEL(ret, lassign);
-	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
-	ADD_LABEL(ret, lfin);
-
-	if (poped) {
-	    /* we can apply more optimize */
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_CALL:
-      case NODE_FCALL:
-      case NODE_VCALL:{		/* VCALL: variable or call */
-	/*
-	  call:  obj.method(...)
-	  fcall: func(...)
-	  vcall: func
-	*/
-	DECL_ANCHOR(recv);
-	DECL_ANCHOR(args);
-	ID mid = node->nd_mid;
-	VALUE argc;
-	unsigned long flag = 0;
-	VALUE parent_block = iseq->compile_data->current_block;
-	iseq->compile_data->current_block = Qfalse;
-
-	INIT_ANCHOR(recv);
-	INIT_ANCHOR(args);
-#if SUPPORT_JOKE
-	if (nd_type(node) == NODE_VCALL) {
-	    if (mid == idBitblt) {
-		ADD_INSN(ret, nd_line(node), bitblt);
-		break;
-	    }
-	    else if (mid == idAnswer) {
-		ADD_INSN(ret, nd_line(node), answer);
-		break;
-	    }
-	}
-	/* only joke */
-	{
-	    ID goto_id;
-	    ID label_id;
-	    VALUE label;
-	    VALUE label_sym;
-
-	    
-	    CONST_ID(goto_id, "__goto__");
-	    CONST_ID(label_id, "__label__");
-
-	    if (nd_type(node) == NODE_FCALL &&
-		(mid == goto_id || mid == label_id)) {
-		if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
-		    SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
-
-		    label_sym = label = node->nd_args->nd_head->nd_lit;
-		    if ((label =
-			 rb_hash_aref(iseq->compile_data,
-				      label_sym)) == Qnil) {
-			rb_hash_aset(iseq->compile_data, label_sym,
-				     label = NEW_LABEL(nd_line(node)));
-		    }
-		}
-		else {
-		    rb_bug("invalid goto/label format");
-		}
-
-
-		if (mid == goto_id) {
-		    ADD_INSNL(ret, nd_line(node), jump, label);
-		}
-		else {
-		    ADD_LABEL(ret, label);
-		}
-		break;
-	    }
-	}
-#endif
-	/* reciever */
-	if (type == NODE_CALL) {
-	    COMPILE(recv, "recv", node->nd_recv);
-	}
-	else if (type == NODE_FCALL || type == NODE_VCALL) {
-	    ADD_CALL_RECEIVER(recv, nd_line(node));
-	}
-
-	/* args */
-	if (nd_type(node) != NODE_VCALL) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag);
-	}
-	else {
-	    argc = INT2FIX(0);
-	}
-
-	ADD_SEQ(ret, recv);
-	ADD_SEQ(ret, args);
-
-	debugp_param("call args argc", argc);
-	debugp_param("call method", ID2SYM(mid));
-
-	switch (nd_type(node)) {
-	  case NODE_VCALL:
-	    flag |= VM_CALL_VCALL_BIT;
-	    /* VCALL is funcall, so fall through */
-	  case NODE_FCALL:
-	    flag |= VM_CALL_FCALL_BIT;
-	}
-
-	ADD_SEND_R(ret, nd_line(node), ID2SYM(mid),
-		   argc, parent_block, LONG2FIX(flag));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_SUPER:
-      case NODE_ZSUPER:{
-	DECL_ANCHOR(args);
-	VALUE argc;
-	unsigned long flag = 0;
-	VALUE parent_block = iseq->compile_data->current_block;
-
-	INIT_ANCHOR(args);
-	iseq->compile_data->current_block = Qfalse;
-	if (nd_type(node) == NODE_SUPER) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag);
-	}
-	else {
-	    /* NODE_ZSUPER */
-	    int i;
-	    rb_iseq_t *liseq = iseq->local_iseq;
-
-	    argc = INT2FIX(liseq->argc);
-
-	    /* normal arguments */
-	    for (i = 0; i < liseq->argc; i++) {
-		int idx = liseq->local_size - i;
-		ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-	    }
-
-	    if (!liseq->arg_simple) {
-		if (liseq->arg_opts) {
-		    /* optional arguments */
-		    int j;
-		    for (j = 0; j < liseq->arg_opts - 1; j++) {
-			int idx = liseq->local_size - (i + j);
-			ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-		    }
-		    i += j;
-		    argc = INT2FIX(i);
-		}
-
-		if (liseq->arg_rest != -1) {
-		    /* rest argument */
-		    int idx = liseq->local_size - liseq->arg_rest;
-		    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-		    argc = INT2FIX(liseq->arg_rest + 1);
-		    flag |= VM_CALL_ARGS_SPLAT_BIT;
-		}
-
-		if (liseq->arg_post_len) {
-		    /* post arguments */
-		    int post_len = liseq->arg_post_len;
-		    int post_start = liseq->arg_post_start;
-
-		    if (liseq->arg_rest != -1) {
-			int j;
-			for (j=0; j<post_len; j++) {
-			    int idx = liseq->local_size - (post_start + j);
-			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-			}
-			ADD_INSN1(args, nd_line(node), newarray, INT2FIX(j));
-			ADD_INSN (args, nd_line(node), concatarray);
-			/* argc is setteled at above */
-		    }
-		    else {
-			int j;
-			for (j=0; j<post_len; j++) {
-			    int idx = liseq->local_size - (post_start + j);
-			    ADD_INSN1(args, nd_line(node), getlocal, INT2FIX(idx));
-			}
-			argc = INT2FIX(post_len + post_start);
-		    }
-		}
-	    }
-	}
-
-	/* dummy reciever */
-	ADD_INSN1(ret, nd_line(node), putobject,
-		  nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
-	ADD_SEQ(ret, args);
-	ADD_INSN3(ret, nd_line(node), invokesuper,
-		  argc, parent_block, LONG2FIX(flag));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_ARRAY:{
-	compile_array_(iseq, ret, node, Qtrue, poped);
-	break;
-      }
-      case NODE_ZARRAY:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(0));
-	}
-	break;
-      }
-      case NODE_VALUES:{
-	NODE *n = node;
-	while (n) {
-	    COMPILE(ret, "values item", n->nd_head);
-	    n = n->nd_next;
-	}
-	ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(node->nd_alen));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_HASH:{
-	DECL_ANCHOR(list);
-	VALUE size = 0;
-	int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
-
-	INIT_ANCHOR(list);
-	switch (type) {
-	  case NODE_ARRAY:{
-	    compile_array(iseq, list, node->nd_head, Qfalse);
-	    size = OPERAND_AT(POP_ELEMENT(list), 0);
-	    ADD_SEQ(ret, list);
-	    break;
-	  }
-	  case NODE_ZARRAY:
-	    size = INT2FIX(0);
-	    break;
-
-	  default:
-	    rb_bug("can't make hash with this node: %s", ruby_node_name(type));
-	}
-
-	ADD_INSN1(ret, nd_line(node), newhash, size);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_RETURN:{
-	rb_iseq_t *is = iseq;
-
-	while (is) {
-	    if (is->type == ISEQ_TYPE_TOP || is->type == ISEQ_TYPE_CLASS) {
-		COMPILE_ERROR((ERROR_ARGS "Invalid return"));
-		break;
-	    }
-	    else {
-		LABEL *splabel = 0;
-
-		if (is->type == ISEQ_TYPE_METHOD) {
-		    splabel = NEW_LABEL(0);
-		    ADD_LABEL(ret, splabel);
-		    ADD_ADJUST(ret, nd_line(node), 0);
-		}
-
-		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
-
-		if (is->type == ISEQ_TYPE_METHOD) {
-		    add_ensure_iseq(ret, iseq);
-		    ADD_INSN(ret, nd_line(node), leave);
-		    ADD_ADJUST_RESTORE(ret, splabel);
-
-		    if (!poped) {
-			ADD_INSN(ret, nd_line(node), putnil);
-		    }
-		}
-		else {
-		    ADD_INSN1(ret, nd_line(node), throw, INT2FIX(0x01) /* TAG_RETURN */ );
-		    if (poped) {
-			ADD_INSN(ret, nd_line(node), pop);
-		    }
-		}
-		break;
-	    }
-	}
-	break;
-      }
-      case NODE_YIELD:{
-	DECL_ANCHOR(args);
-	VALUE argc;
-	unsigned long flag = 0;
-
-	INIT_ANCHOR(args);
-	if (iseq->type == ISEQ_TYPE_TOP || iseq->type == ISEQ_TYPE_CLASS) {
-	    COMPILE_ERROR((ERROR_ARGS "Invalid yield"));
-	}
-
-	if (node->nd_head) {
-	    argc = setup_args(iseq, args, node->nd_head, &flag);
-	}
-	else {
-	    argc = INT2FIX(0);
-	}
-
-	ADD_SEQ(ret, args);
-	ADD_INSN2(ret, nd_line(node), invokeblock, argc, LONG2FIX(flag));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_LVAR:{
-	if (!poped) {
-	    ID id = node->nd_vid;
-	    int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
-
-	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
-	    ADD_INSN1(ret, nd_line(node), getlocal, INT2FIX(idx));
-	}
-	break;
-      }
-      case NODE_DVAR:{
-	int lv, idx, ls;
-	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
-	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
-	    if (idx < 0) {
-		rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
-	    }
-	    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(ls - idx), INT2FIX(lv));
-	}
-	break;
-      }
-      case NODE_GVAR:{
-	ADD_INSN1(ret, nd_line(node), getglobal,
-		  (((long)node->nd_entry) | 1));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_IVAR:{
-	debugi("nd_vid", node->nd_vid);
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), getinstancevariable,
-		      ID2SYM(node->nd_vid));
-	}
-	break;
-      }
-      case NODE_CONST:{
-	debugi("nd_vid", node->nd_vid);
-
-	if (iseq->compile_data->option->inline_const_cache) {
-	    LABEL *lstart = NEW_LABEL(nd_line(node));
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-
-	    ADD_LABEL(ret, lstart);
-	    ADD_INSN2(ret, nd_line(node), getinlinecache, 0, lend);
-	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
-	    ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
-	    ADD_LABEL(ret, lend);
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_vid));
-	}
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_CVAR:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), getclassvariable,
-		      ID2SYM(node->nd_vid));
-	}
-	break;
-      }
-      case NODE_NTH_REF:{
-        if (!poped) {
-	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~'  */,
-		      INT2FIX(node->nd_nth << 1));
-	}
-	break;
-      }
-      case NODE_BACK_REF:{
-	if (!poped) {
-	    ADD_INSN2(ret, nd_line(node), getspecial, INT2FIX(1) /* '~' */,
-		      INT2FIX(0x01 | (node->nd_nth << 1)));
-	}
-	break;
-      }
-      case NODE_MATCH:
-      case NODE_MATCH2:
-      case NODE_MATCH3:{
-	DECL_ANCHOR(recv);
-	DECL_ANCHOR(val);
-
-	INIT_ANCHOR(recv);
-	INIT_ANCHOR(val);
-	switch(nd_type(node)) {
-	  case NODE_MATCH:
-	    ADD_INSN1(recv, nd_line(node), putobject, node->nd_lit);
-	    ADD_INSN2(val, nd_line(node), getspecial, INT2FIX(0),
-		      INT2FIX(0));
-	    break;
-	  case NODE_MATCH2:
-	    COMPILE(recv, "reciever", node->nd_recv);
-	    COMPILE(val, "value", node->nd_value);
-	    break;
-	  case NODE_MATCH3:
-	    COMPILE(recv, "reciever", node->nd_value);
-	    COMPILE(val, "value", node->nd_recv);
-	    break;
-	}
-
-	if (iseq->compile_data->option->specialized_instruction) {
-	    /* TODO: detect by node */
-	    if (recv->last == recv->anchor.next &&
-		INSN_OF(recv->last) == BIN(putobject) &&
-		nd_type(node) == NODE_MATCH2) {
-		ADD_SEQ(ret, val);
-		ADD_INSN1(ret, nd_line(node), opt_regexpmatch1,
-			  OPERAND_AT(recv->last, 0));
-	    }
-	    else {
-		ADD_SEQ(ret, recv);
-		ADD_SEQ(ret, val);
-		ADD_INSN(ret, nd_line(node), opt_regexpmatch2);
-	    }
-	}
-	else {
-	    ADD_SEQ(ret, recv);
-	    ADD_SEQ(ret, val);
-	    ADD_SEND(ret, nd_line(node), ID2SYM(idEqTilde), INT2FIX(1));
-	}
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_LIT:{
-	debugp_param("lit", node->nd_lit);
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-	}
-	break;
-      }
-      case NODE_STR:{
-	debugp_param("nd_lit", node->nd_lit);
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putstring, node->nd_lit);
-	}
-	break;
-      }
-      case NODE_DSTR:{
-	compile_dstr(iseq, ret, node);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_XSTR:{
-	ADD_CALL_RECEIVER(ret, nd_line(node));
-	ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_DXSTR:{
-	ADD_CALL_RECEIVER(ret, nd_line(node));
-	compile_dstr(iseq, ret, node);
-	ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_EVSTR:{
-	COMPILE(ret, "nd_body", node->nd_body);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), tostring);
-	}
-	break;
-      }
-      case NODE_DREGX:{
-	compile_dregx(iseq, ret, node);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_DREGX_ONCE:{
-	/* TODO: once? */
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-
-	ADD_LABEL(ret, lstart);
-	ADD_INSN2(ret, nd_line(node), onceinlinecache, 0, lend);
-	ADD_INSN(ret, nd_line(node), pop);
-
-	compile_dregx(iseq, ret, node);
-
-	ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
-	ADD_LABEL(ret, lend);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_ARGSCAT:{
-	COMPILE(ret, "argscat head", node->nd_head);
-	COMPILE(ret, "argscat body", node->nd_body);
-	ADD_INSN(ret, nd_line(node), concatarray);
-	break;
-      }
-      case NODE_ARGSPUSH:{
-	COMPILE(ret, "arsgpush head", node->nd_head);
-	COMPILE(ret, "argspush body", node->nd_body);
-	ADD_INSN1(ret, nd_line(node), newarray, INT2FIX(1));
-	ADD_INSN(ret, nd_line(node), concatarray);
-	break;
-      }
-      case NODE_SPLAT:{
-	  COMPILE(ret, "splat", node->nd_head);
-	  ADD_INSN1(ret, nd_line(node), splatarray, Qfalse);
-
-	  if (poped) {
-	      ADD_INSN(ret, nd_line(node), pop);
-	  }
-	  break;
-      }
-      case NODE_DEFN:{
-	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
-				    rb_str_dup(rb_id2str(node->nd_mid)),
-				    ISEQ_TYPE_METHOD);
-
-	debugp_param("defn/iseq", iseqval);
-
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_method), INT2FIX(3));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	debugp_param("defn", iseqval);
-	break;
-      }
-      case NODE_DEFS:{
-	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
-				    rb_str_dup(rb_id2str(node->nd_mid)),
-				    ISEQ_TYPE_METHOD);
-
-	debugp_param("defs/iseq", iseqval);
-
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	COMPILE(ret, "defs: recv", node->nd_recv);
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, nd_line(node), putiseq, iseqval);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_define_singleton_method), INT2FIX(3));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_ALIAS:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "alias arg1", node->u1.node);
-	COMPILE(ret, "alias arg2", node->u2.node);
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_method_alias), INT2FIX(3));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_VALIAS:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u1.id));
-	ADD_INSN1(ret, nd_line(node), putobject, ID2SYM(node->u2.id));
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_set_variable_alias), INT2FIX(2));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_UNDEF:{
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
-	COMPILE(ret, "undef arg", node->u2.node);
-	ADD_SEND(ret, nd_line(node), ID2SYM(id_core_undef_method), INT2FIX(2));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_CLASS:{
-	VALUE iseqval =
-	    NEW_CHILD_ISEQVAL(
-		node->nd_body,
-		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
-		ISEQ_TYPE_CLASS);
-	compile_cpath(ret, iseq, node->nd_cpath);
-	COMPILE(ret, "super", node->nd_super);
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(0));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_MODULE:{
-	VALUE iseqval = NEW_CHILD_ISEQVAL(
-	    node->nd_body,
-	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
-	    ISEQ_TYPE_CLASS);
-
-	compile_cpath(ret, iseq, node->nd_cpath);
-	ADD_INSN (ret, nd_line(node), putnil); /* dummy */
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(2));
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_SCLASS:{
-	ID singletonclass;
-	VALUE iseqval =
-	    NEW_ISEQVAL(node->nd_body, rb_str_new2("singletonclass"),
-			ISEQ_TYPE_CLASS);
-
-	COMPILE(ret, "sclass#recv", node->nd_recv);
-	ADD_INSN (ret, nd_line(node), putnil);
-	CONST_ID(singletonclass, "singletonclass");
-	ADD_INSN3(ret, nd_line(node), defineclass,
-		  ID2SYM(singletonclass), iseqval, INT2FIX(1));
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_COLON2:{
-	if (rb_is_const_id(node->nd_mid)) {
-	    /* constant */
-	    LABEL *lstart = NEW_LABEL(nd_line(node));
-	    LABEL *lend = NEW_LABEL(nd_line(node));
-	    DECL_ANCHOR(pref);
-	    DECL_ANCHOR(body);
-
-	    INIT_ANCHOR(pref);
-	    INIT_ANCHOR(body);
-	    compile_colon2(iseq, node, pref, body);
-	    if (LIST_SIZE_ZERO(pref)) {
-		if (iseq->compile_data->option->inline_const_cache) {
-		    ADD_LABEL(ret, lstart);
-		    ADD_INSN2(ret, nd_line(node), getinlinecache, 0, lend);
-		}
-		else {
-		    ADD_INSN(ret, nd_line(node), putnil);
-		}
-
-		ADD_SEQ(ret, body);
-
-		if (iseq->compile_data->option->inline_const_cache) {
-		    ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
-		    ADD_LABEL(ret, lend);
-		}
-	    }
-	    else {
-		ADD_SEQ(ret, pref);
-		ADD_SEQ(ret, body);
-	    }
-	}
-	else {
-	    /* function call */
-	    ADD_CALL_RECEIVER(ret, nd_line(node));
-	    COMPILE(ret, "colon2#nd_head", node->nd_head);
-	    ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
-		     INT2FIX(1));
-	}
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_COLON3:{
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	debugi("colon3#nd_mid", node->nd_mid);
-
-	/* add cache insn */
-	if (iseq->compile_data->option->inline_const_cache) {
-	    ADD_LABEL(ret, lstart);
-	    ADD_INSN2(ret, nd_line(node), getinlinecache, 0, lend);
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-
-	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
-	ADD_INSN1(ret, nd_line(node), getconstant, ID2SYM(node->nd_mid));
-
-	if (iseq->compile_data->option->inline_const_cache) {
-	    ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
-	    ADD_LABEL(ret, lend);
-	}
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_DOT2:
-      case NODE_DOT3:{
-	int flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
-	COMPILE(ret, "min", (NODE *) node->nd_beg);
-	COMPILE(ret, "max", (NODE *) node->nd_end);
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), newrange, flag);
-	}
-	break;
-      }
-      case NODE_FLIP2:
-      case NODE_FLIP3:{
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	LABEL *lfin = NEW_LABEL(nd_line(node));
-	LABEL *ltrue = NEW_LABEL(nd_line(node));
-	VALUE key = rb_sprintf("flipflag/%s-%p-%d",
-			       RSTRING_PTR(iseq->name), iseq,
-			       iseq->compile_data->flip_cnt++);
-
-	iseq_add_mark_object_compile_time(iseq, key);
-	ADD_INSN2(ret, nd_line(node), getspecial, key, INT2FIX(0));
-	ADD_INSNL(ret, nd_line(node), branchif, lend);
-
-	/* *flip == 0 */
-	COMPILE(ret, "flip2 beg", node->nd_beg);
-	ADD_INSN(ret, nd_line(node), dup);
-	ADD_INSNL(ret, nd_line(node), branchunless, lfin);
-	if (nd_type(node) == NODE_FLIP3) {
-	    ADD_INSN(ret, nd_line(node), dup);
-	    ADD_INSN1(ret, nd_line(node), setspecial, key);
-	    ADD_INSNL(ret, nd_line(node), jump, lfin);
-	}
-	else {
-	    ADD_INSN1(ret, nd_line(node), setspecial, key);
-	}
-
-	/* *flip == 1 */
-	ADD_LABEL(ret, lend);
-	COMPILE(ret, "flip2 end", node->nd_end);
-	ADD_INSNL(ret, nd_line(node), branchunless, ltrue);
-	ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
-	ADD_INSN1(ret, nd_line(node), setspecial, key);
-
-	ADD_LABEL(ret, ltrue);
-	ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-
-	ADD_LABEL(ret, lfin);
-	break;
-      }
-      case NODE_SELF:{
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putself);
-	}
-	break;
-      }
-      case NODE_NIL:{
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	}
-	break;
-      }
-      case NODE_TRUE:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
-	}
-	break;
-      }
-      case NODE_FALSE:{
-	if (!poped) {
-	    ADD_INSN1(ret, nd_line(node), putobject, Qfalse);
-	}
-	break;
-      }
-      case NODE_ERRINFO:{
-	if (!poped) {
-	    if (iseq->type == ISEQ_TYPE_RESCUE) {
-		ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(0));
-	    }
-	    else {
-		rb_iseq_t *ip = iseq;
-		int level = 0;
-		while (ip) {
-		    if (ip->type == ISEQ_TYPE_RESCUE) {
-			break;
-		    }
-		    ip = ip->parent_iseq;
-		    level++;
-		}
-		if (ip) {
-		    ADD_INSN2(ret, nd_line(node), getdynamic, INT2FIX(2), INT2FIX(level));
-		}
-		else {
-		    ADD_INSN(ret, nd_line(node), putnil);
-		}
-	    }
-	}
-	break;
-      }
-      case NODE_DEFINED:{
-	if (!poped) {
-	    LABEL *lfinish[2];
-	    lfinish[0] = NEW_LABEL(nd_line(node));
-	    lfinish[1] = 0;
-	    defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
-	    if (lfinish[1]) {
-		ADD_INSNL(ret, nd_line(node), jump, lfinish[0]);
-		ADD_LABEL(ret, lfinish[1]);
-		ADD_INSN(ret, nd_line(node), putnil);
-	    }
-	    ADD_LABEL(ret, lfinish[0]);
-	}
-	break;
-      }
-      case NODE_POSTEXE:{
-	LABEL *lstart = NEW_LABEL(nd_line(node));
-	LABEL *lend = NEW_LABEL(nd_line(node));
-	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK);
-
-	ADD_LABEL(ret, lstart);
-	ADD_INSN2(ret, nd_line(node), onceinlinecache, 0, lend);
-	ADD_INSN(ret, nd_line(node), pop);
-
-	ADD_INSN1(ret, nd_line(node), putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
-	ADD_INSN1(ret, nd_line(node), putiseq, block);
-	ADD_SEND (ret, nd_line(node), ID2SYM(id_core_set_postexe), INT2FIX(1));
-
-	ADD_INSN1(ret, nd_line(node), setinlinecache, lstart);
-	ADD_LABEL(ret, lend);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_DSYM:{
-	compile_dstr(iseq, ret, node);
-	if (!poped) {
-	    ADD_SEND(ret, nd_line(node), ID2SYM(idIntern), INT2FIX(0));
-	}
-	else {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      case NODE_ATTRASGN:{
-	DECL_ANCHOR(recv);
-	DECL_ANCHOR(args);
-	unsigned long flag = 0;
-	VALUE argc;
-
-	INIT_ANCHOR(recv);
-	INIT_ANCHOR(args);
-	argc = setup_args(iseq, args, node->nd_args, &flag);
-
-	if (node->nd_recv == (NODE *) 1) {
-	    flag |= VM_CALL_FCALL_BIT;
-	    ADD_INSN(recv, nd_line(node), putself);
-	}
-	else {
-	    COMPILE(recv, "recv", node->nd_recv);
-	}
-
-	debugp_param("argc", argc);
-	debugp_param("nd_mid", ID2SYM(node->nd_mid));
-
-	if (!poped) {
-	    ADD_INSN(ret, nd_line(node), putnil);
-	    ADD_SEQ(ret, recv);
-	    ADD_SEQ(ret, args);
-
-	    if (flag & VM_CALL_ARGS_BLOCKARG_BIT) {
-		ADD_INSN1(ret, nd_line(node), topn, INT2FIX(1));
-		ADD_INSN1(ret, nd_line(node), setn, INT2FIX(FIX2INT(argc) + 3));
-		ADD_INSN (ret, nd_line(node), pop);
-	    }
-	    else {
-	    ADD_INSN1(ret, nd_line(node), setn, INT2FIX(FIX2INT(argc) + 1));
-	}
-	}
-	else {
-	    ADD_SEQ(ret, recv);
-	    ADD_SEQ(ret, args);
-	}
-	ADD_SEND_R(ret, nd_line(node), ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
-	ADD_INSN(ret, nd_line(node), pop);
-
-	break;
-      }
-      case NODE_OPTBLOCK:{
-	/* for optimize */
-	LABEL *redo_label = NEW_LABEL(0);
-	LABEL *next_label = NEW_LABEL(0);
-
-	iseq->compile_data->start_label = next_label;
-	iseq->compile_data->redo_label = redo_label;
-
-	ADD_LABEL(ret, redo_label);
-	COMPILE_(ret, "optblock body", node->nd_head, 1 /* pop */ );
-	ADD_LABEL(ret, next_label);
-	ADD_INSN(ret, 0, opt_checkenv);
-	break;
-      }
-      case NODE_PRELUDE:{
-	COMPILE_POPED(ret, "prelude", node->nd_head);
-	COMPILE_(ret, "body", node->nd_body, poped);
-	break;
-      }
-      case NODE_LAMBDA:{
-	/* compile same as lambda{...} */
-	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK);
-	VALUE argc = INT2FIX(0);
-	ADD_CALL_RECEIVER(ret, nd_line(node));
-	ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
-
-	if (poped) {
-	    ADD_INSN(ret, nd_line(node), pop);
-	}
-	break;
-      }
-      default:
-	rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
-	return Qnil;
-    }
-
-    debug_node_end();
-    return COMPILE_OK;
-}
-
-/***************************/
-/* instruction information */
-/***************************/
-
-static int
-insn_data_length(INSN *iobj)
-{
-    return insn_len(iobj->insn_id);
-}
-
-static int
-calc_sp_depth(int depth, INSN *insn)
-{
-    return insn_stack_increase(depth, insn->insn_id, insn->operands);
-}
-
-static int
-insn_data_line_no(INSN *iobj)
-{
-    return insn_len(iobj->line_no);
-}
-
-static VALUE
-insn_data_to_s_detail(INSN *iobj)
-{
-    VALUE str = rb_str_new(0, 0);
-
-    str = rb_sprintf("%-16s", insn_name(iobj->insn_id));
-    if (iobj->operands) {
-	const char *types = insn_op_types(iobj->insn_id);
-	int j;
-
-	for (j = 0; types[j]; j++) {
-	    char type = types[j];
-
-	    switch (type) {
-	      case TS_OFFSET:	/* label(destination position) */
-		{
-		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
-		    rb_str_catf(str, "<L%03d>", lobj->label_no);
-		    break;
-		}
-		break;
-	      case TS_ISEQ:	/* iseq */
-		{
-		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
-		    VALUE val = Qnil;
-		    if (iseq) {
-			val = iseq->self;
-		    }
-		    rb_str_concat(str, rb_inspect(val));
-		}
-		break;
-	      case TS_LINDEX:
-	      case TS_DINDEX:
-	      case TS_NUM:	/* ulong */
-	      case TS_VALUE:	/* VALUE */
-		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
-		break;
-	      case TS_ID:	/* ID */
-		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
-		break;
-	      case TS_GENTRY:
-		{
-		    struct global_entry *entry = (struct global_entry *)
-		      (OPERAND_AT(iobj, j) & (~1));
-		    rb_str_cat2(str, rb_id2name(entry->id));
-		}
-	      case TS_IC:	/* method cache */
-		rb_str_cat2(str, "<ic>");
-		break;
-	      case TS_CDHASH:	/* case/when condition cache */
-		rb_str_cat2(str, "<ch>");
-		break;
-	      default:{
-		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
-	      }
-	    }
-	    if (types[j + 1]) {
-		rb_str_cat2(str, ", ");
-	    }
-	}
-    }
-    return str;
-}
-
-static void
-dump_disasm_list(struct iseq_link_element *link)
-{
-    int pos = 0;
-    INSN *iobj;
-    LABEL *lobj;
-    VALUE str;
-
-    printf("-- raw disasm--------\n");
-
-    while (link) {
-	switch (link->type) {
-	  case ISEQ_ELEMENT_INSN:
-	    {
-		iobj = (INSN *)link;
-		str = insn_data_to_s_detail(iobj);
-		printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str),
-		       insn_data_line_no(iobj));
-		pos += insn_data_length(iobj);
-		break;
-	    }
-	  case ISEQ_ELEMENT_LABEL:
-	    {
-		lobj = (LABEL *)link;
-		printf("<L%03d>\n", lobj->label_no);
-		break;
-	    }
-	  case ISEQ_ELEMENT_NONE:
-	    {
-		printf("[none]\n");
-		break;
-	    }
-	  case ISEQ_ELEMENT_ADJUST:
-	    {
-		ADJUST *adjust = (ADJUST *)link;
-		printf("adjust: [label: %d]\n", adjust->label->label_no);
-		break;
-	    }
-	  default:
-	    /* ignore */
-	    rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
-	}
-	link = link->next;
-    }
-    printf("---------------------\n");
-}
-
-VALUE
-insns_name_array(void)
-{
-    VALUE ary = rb_ary_new();
-    int i;
-    for (i = 0; i < sizeof(insn_name_info) / sizeof(insn_name_info[0]); i++) {
-	rb_ary_push(ary, rb_str_new2(insn_name_info[i]));
-    }
-    return ary;
-}
-
-static LABEL *
-register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
-{
-    LABEL *label = 0;
-    st_data_t tmp;
-    obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
-
-    if (st_lookup(labels_table, obj, &tmp) == 0) {
-	label = NEW_LABEL(0);
-	st_insert(labels_table, obj, (st_data_t)label);
-    }
-    else {
-	label = (LABEL *)tmp;
-    }
-    return label;
-}
-
-static VALUE
-get_exception_sym2type(VALUE sym)
-{
-#undef rb_intern
-    static VALUE symRescue, symEnsure, symRetry;
-    static VALUE symBreak, symRedo, symNext;
-
-    if (symRescue == 0) {
-	symRescue = ID2SYM(rb_intern("rescue"));
-	symEnsure = ID2SYM(rb_intern("ensure"));
-	symRetry  = ID2SYM(rb_intern("retry"));
-	symBreak  = ID2SYM(rb_intern("break"));
-	symRedo   = ID2SYM(rb_intern("redo"));
-	symNext   = ID2SYM(rb_intern("next"));
-    }
-
-    if (sym == symRescue) return CATCH_TYPE_RESCUE;
-    if (sym == symEnsure) return CATCH_TYPE_ENSURE;
-    if (sym == symRetry)  return CATCH_TYPE_RETRY;
-    if (sym == symBreak)  return CATCH_TYPE_BREAK;
-    if (sym == symRedo)   return  CATCH_TYPE_REDO;
-    if (sym == symNext)   return CATCH_TYPE_NEXT;
-    rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
-	     RSTRING_PTR(rb_inspect(sym)));
-    return 0;
-}
-
-static int
-iseq_build_exception(rb_iseq_t *iseq, struct st_table *labels_table,
-		     VALUE exception)
-{
-    int i;
-
-    for (i=0; i<RARRAY_LEN(exception); i++) {
-	VALUE v, type, *ptr, eiseqval;
-	LABEL *lstart, *lend, *lcont;
-	int sp;
-
-	RB_GC_GUARD(v) = rb_convert_type(RARRAY_PTR(exception)[i], T_ARRAY,
-					 "Array", "to_ary");
-	if (RARRAY_LEN(v) != 6) {
-	    rb_raise(rb_eSyntaxError, "wrong exception entry");
-	}
-	ptr  = RARRAY_PTR(v);
-	type = get_exception_sym2type(ptr[0]);
-	if (ptr[1] == Qnil) {
-	    eiseqval = 0;
-	}
-	else {
-	    eiseqval = iseq_load(0, ptr[1], iseq->self, Qnil);
-	}
-
-	lstart = register_label(iseq, labels_table, ptr[2]);
-	lend   = register_label(iseq, labels_table, ptr[3]);
-	lcont  = register_label(iseq, labels_table, ptr[4]);
-	sp     = NUM2INT(ptr[5]);
-
-	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
-    }
-    return COMPILE_OK;
-}
-
-struct st_table *insn_make_insn_table(void);
-
-static int
-iseq_build_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
-		VALUE body, struct st_table *labels_table)
-{
-    /* TODO: body should be freezed */
-    VALUE *ptr = RARRAY_PTR(body);
-    int len = RARRAY_LEN(body);
-    int i, j;
-    int line_no = 0;
-    /*
-     * index -> LABEL *label
-     */
-    static struct st_table *insn_table;
-
-    if (insn_table == 0) {
-	insn_table = insn_make_insn_table();
-    }
-
-    for (i=0; i<len; i++) {
-	VALUE obj = ptr[i];
-
-	if (SYMBOL_P(obj)) {
-	    LABEL *label = register_label(iseq, labels_table, obj);
-	    ADD_LABEL(anchor, label);
-	}
-	else if (FIXNUM_P(obj)) {
-	    line_no = NUM2INT(obj);
-	}
-	else if (TYPE(obj) == T_ARRAY) {
-	    VALUE *argv = 0;
-	    int argc = RARRAY_LEN(obj) - 1;
-	    VALUE insn_id;
-	    VALUE insn;
-
-	    insn = (argc < 0) ? Qnil : RARRAY_PTR(obj)[0];
-	    if (st_lookup(insn_table, insn, &insn_id) == 0) {
-		/* TODO: exception */
-		RB_GC_GUARD(insn) = rb_inspect(insn);
-		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
-				 "unknown instruction: %s", RSTRING_PTR(insn));
-	    }
-
-	    if (argc != insn_len(insn_id)-1) {
-		rb_compile_error(RSTRING_PTR(iseq->filename), line_no,
-				 "operand size mismatch");
-	    }
-
-	    if (argc > 0) {
-		argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
-		for (j=0; j<argc; j++) {
-		    VALUE op = rb_ary_entry(obj, j+1);
-		    switch (insn_op_type(insn_id, j)) {
-		      case TS_OFFSET: {
-			LABEL *label = register_label(iseq, labels_table, op);
-			argv[j] = (VALUE)label;
-			break;
-		      }
-		      case TS_LINDEX:
-		      case TS_DINDEX:
-		      case TS_NUM:
-			argv[j] = (NUM2INT(op), op);
-			break;
-		      case TS_VALUE:
-			argv[j] = op;
-			iseq_add_mark_object(iseq, op);
-			break;
-		      case TS_ISEQ:
-			{
-			    if (op != Qnil) {
-				if (TYPE(op) == T_ARRAY) {
-				    argv[j] = iseq_load(0, op, iseq->self, Qnil);
-				}
-				else if (CLASS_OF(op) == rb_cISeq) {
-				    argv[j] = op;
-				}
-				else {
-				    rb_raise(rb_eSyntaxError, "ISEQ is required");
-				}
-				iseq_add_mark_object(iseq, argv[j]);
-			    }
-			    else {
-				argv[j] = 0;
-			    }
-			}
-			break;
-		      case TS_GENTRY:
-			op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
-			argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
-			break;
-		      case TS_IC:
-			argv[j] = (VALUE)NEW_INLINE_CACHE_ENTRY();
-			iseq_add_mark_object(iseq, argv[j]);
-			break;
-		      case TS_ID:
-			argv[j] = rb_convert_type(op, T_SYMBOL,
-						  "Symbol", "to_sym");
-			break;
-		      case TS_CDHASH:
-			{
-			    int i;
-			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
-			    op = rb_ary_dup(op);
-			    for (i=0; i<RARRAY_LEN(op); i+=2) {
-				VALUE sym = rb_ary_entry(op, i+1);
-				LABEL *label =
-				  register_label(iseq, labels_table, sym);
-				rb_ary_store(op, i+1, (VALUE)label | 1);
-			    }
-			    argv[j] = op;
-			}
-			break;
-		      default:
-			rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type(insn_id, j));
-		    }
-		}
-	    }
-	    ADD_ELEM(anchor,
-		     (LINK_ELEMENT*)new_insn_core(iseq, line_no,
-						  insn_id, argc, argv));
-	}
-	else {
-	    rb_raise(rb_eTypeError, "unexpected object for instruction");
-	}
-    }
-    st_free_table(labels_table);
-    iseq_setup(iseq, anchor);
-    return COMPILE_OK;
-}
-
-#define CHECK_ARRAY(v)   rb_convert_type(v, T_ARRAY, "Array", "to_ary")
-#define CHECK_STRING(v)  rb_convert_type(v, T_STRING, "String", "to_str")
-#define CHECK_SYMBOL(v)  rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
-static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
-
-VALUE
-iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
-		    VALUE exception, VALUE body)
-{
-    int i;
-    ID *tbl;
-    struct st_table *labels_table = st_init_numtable();
-
-    DECL_ANCHOR(anchor);
-
-    INIT_ANCHOR(anchor);
-
-    iseq->local_table_size = RARRAY_LEN(locals);
-    iseq->local_table = tbl = (ID *)ALLOC_N(ID *, iseq->local_table_size);
-    iseq->local_size = iseq->local_table_size + 1;
-
-    for (i=0; i<RARRAY_LEN(locals); i++) {
-	VALUE lv = RARRAY_PTR(locals)[i];
-	tbl[i] = FIXNUM_P(lv) ? FIX2INT(lv) : SYM2ID(CHECK_SYMBOL(lv));
-    }
-
-    /* args */
-    if (FIXNUM_P(args)) {
-	iseq->arg_size = iseq->argc = FIX2INT(args);
-	iseq->arg_simple = 1;
-    }
-    else {
-	int i = 0;
-	VALUE argc = CHECK_INTEGER(rb_ary_entry(args, i++));
-	VALUE arg_opt_labels = CHECK_ARRAY(rb_ary_entry(args, i++));
-	VALUE arg_post_len = CHECK_INTEGER(rb_ary_entry(args, i++));
-	VALUE arg_post_start = CHECK_INTEGER(rb_ary_entry(args, i++));
-	VALUE arg_rest = CHECK_INTEGER(rb_ary_entry(args, i++));
-	VALUE arg_block = CHECK_INTEGER(rb_ary_entry(args, i++));
-	VALUE arg_simple = CHECK_INTEGER(rb_ary_entry(args, i++));
-
-	iseq->argc = FIX2INT(argc);
-	iseq->arg_rest = FIX2INT(arg_rest);
-	iseq->arg_post_len = FIX2INT(arg_post_len);
-	iseq->arg_post_start = FIX2INT(arg_post_start);
-	iseq->arg_block = FIX2INT(arg_block);
-	iseq->arg_opts = RARRAY_LEN(arg_opt_labels);
-	iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
-
-	if (iseq->arg_block != -1) {
-	    iseq->arg_size = iseq->arg_block + 1;
-	}
-	else if (iseq->arg_post_len) {
-	    iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
-	}
-	else if (iseq->arg_rest != -1) {
-	    iseq->arg_size = iseq->arg_rest + 1;
-	}
-	else {
-	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
-	}
-
-	for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
-	    iseq->arg_opt_table[i] =
-	      (VALUE)register_label(iseq, labels_table,
-				    rb_ary_entry(arg_opt_labels, i));
-	}
-
-	iseq->arg_simple = NUM2INT(arg_simple);
-    }
-
-    /* exception */
-    iseq_build_exception(iseq, labels_table, exception);
-
-    /* body */
-    iseq_build_body(iseq, anchor, body, labels_table);
-    return iseq->self;
-}
diff --git a/compile.h b/compile.h
deleted file mode 100644
index 4bd4e99e2c..0000000000
--- a/compile.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/**********************************************************************
-
-  compile.h -
-
-  $Author$
-  created at: 04/01/01 23:36:57 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_COMPILE_H
-#define RUBY_COMPILE_H
-
-/*  */
-/**
- * debug function(macro) interface depend on CPDEBUG
- * if it is less than 0, runtime option is in effect.
- *
- * debug level:
- *  0: no debug output
- *  1: show node type
- *  2: show node important parameters
- *  ...
- *  5: show other parameters
- * 10: show every AST array
- */
-
-#ifndef CPDEBUG
-#define CPDEBUG 0
-#endif
-
-#if CPDEBUG >= 0
-#define compile_debug CPDEBUG
-#else
-#define compile_debug iseq->compile_data->option->debug_level
-#endif
-
-NORETURN(PRINTF_ARGS(void rb_compile_bug(const char*, int, const char*, ...), 3, 4));
-
-#if CPDEBUG
-
-#define compile_debug_print_indent(level) \
-    ruby_debug_print_indent(level, compile_debug, gl_node_level * 2)
-
-#define debugp(header, value) (void) \
-  (compile_debug_print_indent(1) && \
-   ruby_debug_print_value(1, compile_debug, header, value))
-
-#define debugi(header, id)  (void) \
-  (compile_debug_print_indent(1) && \
-   ruby_debug_print_id(1, compile_debug, header, id))
-
-#define debugp_param(header, value)  (void) \
-  (compile_debug_print_indent(1) && \
-   ruby_debug_print_value(1, compile_debug, header, value))
-
-#define debugp_verbose(header, value)  (void) \
-  (compile_debug_print_indent(2) && \
-   ruby_debug_print_value(2, compile_debug, header, value))
-
-#define debugp_verbose_node(header, value)  (void) \
-  (compile_debug_print_indent(10) && \
-   ruby_debug_print_value(10, compile_debug, header, value))
-
-#define debug_node_start(node)  ((void) \
-  (compile_debug_print_indent(1) && \
-   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)node), gl_node_level)), \
-   gl_node_level++)
-
-#define debug_node_end()  gl_node_level --;
-
-#else
-
-static inline ID
-r_id(ID id)
-{
-    return id;
-}
-
-static inline VALUE
-r_value(VALUE value)
-{
-    return value;
-}
-
-#define debugi(header, id)                 r_id(id)
-#define debugp(header, value)              r_value(value)
-#define debugp_verbose(header, value)      r_value(value)
-#define debugp_verbose_node(header, value) r_value(value)
-#define debugp_param(header, value)        r_value(value)
-#define debug_node_start(node)             ((void)0)
-#define debug_node_end()                   ((void)0)
-#endif
-
-#if CPDEBUG > 1 || CPDEBUG < 0
-PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
-#define debugs if (compile_debug_print_indent(1)) ruby_debug_printf
-#define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs(msg, stderr)), (v))
-#else
-#define debugs                             if(0)printf
-#define debug_compile(msg, v) (v)
-#endif
-
-
-/* create new label */
-#define NEW_LABEL(l) new_label_body(iseq, l)
-
-#define iseq_filename(iseq) \
-  (((rb_iseq_t*)DATA_PTR(iseq))->filename)
-
-#define NEW_ISEQVAL(node, name, type)       \
-  new_child_iseq(iseq, node, name, 0, type)
-
-#define NEW_CHILD_ISEQVAL(node, name, type)       \
-  new_child_iseq(iseq, node, name, iseq->self, type)
-
-#define NEW_SPECIAQL_BLOCK_ISEQVAL(iseq, sym) \
-  new_child_iseq(iseq, iseq->node, iseq->name, iseq->parent_iseq, iseq->type, sym)
-
-/* add instructions */
-#define ADD_SEQ(seq1, seq2) \
-  APPEND_LIST(seq1, seq2)
-
-/* add an instruction */
-#define ADD_INSN(seq, line, insn) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) new_insn_body(iseq, line, BIN(insn), 0))
-
-/* add an instruction with label operand */
-#define ADD_INSNL(seq, line, insn, label) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) \
-           new_insn_body(iseq, line, BIN(insn), 1, (VALUE)label))
-
-/* add an instruction with some operands (1, 2, 3, 5) */
-#define ADD_INSN1(seq, line, insn, op1) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) \
-           new_insn_body(iseq, line, BIN(insn), 1, (VALUE)op1))
-
-#define ADD_INSN2(seq, line, insn, op1, op2) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) \
-           new_insn_body(iseq, line, BIN(insn), 2, (VALUE)op1, (VALUE)op2))
-
-#define ADD_INSN3(seq, line, insn, op1, op2, op3) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) \
-           new_insn_body(iseq, line, BIN(insn), 3, (VALUE)op1, (VALUE)op2, (VALUE)op3))
-
-/* Specific Insn factory */
-#define ADD_SEND(seq, line, id, argc) \
-  ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(0))
-
-#define ADD_CALL_RECEIVER(seq, line) \
-  ADD_INSN(seq, line, putnil)
-
-#define ADD_CALL(seq, line, id, argc) \
-  ADD_SEND_R(seq, line, id, argc, (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
-
-#define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
-  ADD_SEND_R(seq, line, id, argc, block, (VALUE)INT2FIX(VM_CALL_FCALL_BIT))
-
-#define ADD_SEND_R(seq, line, id, argc, block, flag) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) \
-           new_insn_send(iseq, line, \
-                         (VALUE)id, (VALUE)argc, (VALUE)block, (VALUE)flag))
-
-#define ADD_TRACE(seq, line, event) \
-  do { \
-      if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
-	  RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
-	  RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
-	  ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
-      } \
-      if (iseq->compile_data->option->trace_instruction) { \
-	  ADD_INSN1(seq, line, trace, INT2FIX(event)); \
-      } \
-  }while(0);
-
-/* add label */
-#define ADD_LABEL(seq, label) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) label)
-
-#define ADD_ADJUST(seq, line, label) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, line))
-
-#define ADD_ADJUST_RESTORE(seq, label) \
-  ADD_ELEM(seq, (LINK_ELEMENT *) new_adjust_body(iseq, label, -1))
-
-#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc)		\
-    (rb_ary_push(iseq->compile_data->catch_table_ary,		\
-		 rb_ary_new3(5, type,				\
-			     (VALUE)(ls) | 1, (VALUE)(le) | 1,	\
-			     iseqv, (VALUE)(lc) | 1)))
-
-/* compile node */
-#define COMPILE(anchor, desc, node) \
-  (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, anchor, node, 0)))
-
-/* compile node, this node's value will be poped */
-#define COMPILE_POPED(anchor, desc, node)    \
-  (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, anchor, node, 1)))
-
-/* compile node, which is poped when 'poped' is true */
-#define COMPILE_(anchor, desc, node, poped)  \
-  (debug_compile("== " desc "\n", \
-                 iseq_compile_each(iseq, anchor, node, poped)))
-
-#define OPERAND_AT(insn, idx) \
-  (((INSN*)(insn))->operands[idx])
-
-#define INSN_OF(insn) \
-  (((INSN*)(insn))->insn_id)
-
-/* error */
-#define COMPILE_ERROR(strs)                        \
-{                                                  \
-  VALUE tmp = GET_THREAD()->errinfo;               \
-  if (compile_debug) rb_compile_bug strs;          \
-  GET_THREAD()->errinfo = iseq->compile_data->err_info;  \
-  rb_compile_error strs;                           \
-  iseq->compile_data->err_info = GET_THREAD()->errinfo; \
-  GET_THREAD()->errinfo = tmp;                     \
-  ret = 0;                                         \
-  break;                                           \
-}
-
-#define ERROR_ARGS ruby_sourcefile, nd_line(node),
-
-
-#define COMPILE_OK 1
-#define COMPILE_NG 0
-
-
-/* leave name uninitialized so that compiler warn if INIT_ANCHOR is
- * missing */
-#define DECL_ANCHOR(name) \
-  LINK_ANCHOR *name, name##_body__ = {{0,},}
-#define INIT_ANCHOR(name) \
-  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
-
-#endif /* RUBY_COMPILE_H */
diff --git a/complex.c b/complex.c
deleted file mode 100644
index 281cb8c3e7..0000000000
--- a/complex.c
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*
-  complex.c: Coded by Tadayoshi Funaba 2008
-
-  This implementation is based on Keiju Ishitsuka's Complex library
-  which is written in ruby.
-*/
-
-#include "ruby.h"
-#include <math.h>
-
-#define NDEBUG
-#include <assert.h>
-
-#ifndef COMPLEX_NAME
-#define COMPLEX_NAME "Complex"
-#endif
-
-#define ZERO INT2FIX(0)
-#define ONE INT2FIX(1)
-#define TWO INT2FIX(2)
-
-VALUE rb_cComplex;
-
-static ID id_Unify, id_abs, id_abs2, id_arg, id_atan2_bang, id_cmp,
-  id_conjugate, id_convert, id_cos, id_denominator, id_divmod,
-  id_equal_p, id_exact_p, id_exp_bang, id_expt, id_floor, id_format,
-  id_hypot, id_idiv, id_inspect, id_log_bang, id_negate, id_new, id_new_bang,
-  id_numerator, id_polar, id_quo, id_scalar_p, id_sin, id_sqrt, id_to_f,
-  id_to_i, id_to_r, id_to_s, id_truncate;
-
-#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
-
-#define binop(n,op) \
-inline static VALUE \
-f_##n(VALUE x, VALUE y)\
-{\
-    return rb_funcall(x, op, 1, y);\
-}
-
-#define fun1(n) \
-inline static VALUE \
-f_##n(VALUE x)\
-{\
-    return rb_funcall(x, id_##n, 0);\
-}
-
-#define fun2(n) \
-inline static VALUE \
-f_##n(VALUE x, VALUE y)\
-{\
-    return rb_funcall(x, id_##n, 1, y);\
-}
-
-#define math1(n) \
-inline static VALUE \
-m_##n(VALUE x)\
-{\
-    return rb_funcall(rb_mMath, id_##n, 1, x);\
-}
-
-#define math2(n) \
-inline static VALUE \
-m_##n(VALUE x, VALUE y)\
-{\
-    return rb_funcall(rb_mMath, id_##n, 2, x, y);\
-}
-
-inline static VALUE
-f_add(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(y)) {
-	if (FIX2LONG(y) == 0)
-	    return x;
-    }
-    else if (FIXNUM_P(x)) {
-	if (FIX2LONG(x) == 0)
-	    return y;
-    }
-    return rb_funcall(x, '+', 1, y);
-}
-
-inline static VALUE
-f_cmp(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(x) && FIXNUM_P(y)) {
-	long c = FIX2LONG(x) - FIX2LONG(y);
-	if (c > 0)
-	    c = 1;
-	else if (c < 0)
-	    c = -1;
-	return INT2FIX(c);
-    }
-    return rb_funcall(x, id_cmp, 1, y);
-}
-
-inline static VALUE
-f_div(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
-	return x;
-    return rb_funcall(x, '/', 1, y);
-}
-
-inline static VALUE
-f_gt_p(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
-    return rb_funcall(x, '>', 1, y);
-}
-
-inline static VALUE
-f_lt_p(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
-    return rb_funcall(x, '<', 1, y);
-}
-
-binop(mod, '%')
-
-inline static VALUE
-f_mul(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(y)) {
-	long _iy = FIX2LONG(y);
-	if (_iy == 0) {
-	    if (TYPE(x) == T_FLOAT)
-		return rb_float_new(0.0);
-	    else
-		return ZERO;
-	}
-	else if (_iy == 1)
-	    return x;
-    }
-    else if (FIXNUM_P(x)) {
-	long _ix = FIX2LONG(x);
-	if (_ix == 0) {
-	    if (TYPE(y) == T_FLOAT)
-		return rb_float_new(0.0);
-	    else
-		return ZERO;
-	}
-	else if (_ix == 1)
-	    return y;
-    }
-    return rb_funcall(x, '*', 1, y);
-}
-
-inline static VALUE
-f_sub(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(y))
-	if (FIX2LONG(y) == 0)
-	    return x;
-    return rb_funcall(x, '-', 1, y);
-}
-
-binop(xor, '^')
-
-fun1(abs)
-fun1(abs2)
-fun1(arg)
-fun1(conjugate)
-fun1(denominator)
-fun1(exact_p)
-fun1(floor)
-fun1(inspect)
-fun1(negate)
-fun1(numerator)
-fun1(polar)
-fun1(scalar_p)
-fun1(to_f)
-fun1(to_i)
-fun1(to_r)
-fun1(to_s)
-fun1(truncate)
-
-fun2(divmod)
-
-inline static VALUE
-f_equal_p(VALUE x, VALUE y)
-{
-    if (FIXNUM_P(x) && FIXNUM_P(y))
-	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
-    return rb_funcall(x, id_equal_p, 1, y);
-}
-
-fun2(expt)
-fun2(idiv)
-fun2(quo)
-
-inline static VALUE
-f_negative_p(VALUE x)
-{
-    if (FIXNUM_P(x))
-	return f_boolcast(FIX2LONG(x) < 0);
-    return rb_funcall(x, '<', 1, ZERO);
-}
-
-inline static VALUE
-f_zero_p(VALUE x)
-{
-    if (FIXNUM_P(x))
-	return f_boolcast(FIX2LONG(x) == 0);
-    return rb_funcall(x, id_equal_p, 1, ZERO);
-}
-
-inline static VALUE
-f_one_p(VALUE x)
-{
-    if (FIXNUM_P(x))
-	return f_boolcast(FIX2LONG(x) == 1);
-    return rb_funcall(x, id_equal_p, 1, ONE);
-}
-
-inline static VALUE
-f_kind_of_p(VALUE x, VALUE c)
-{
-    return rb_obj_is_kind_of(x, c);
-}
-
-inline static VALUE
-k_numeric_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cNumeric);
-}
-
-inline static VALUE
-k_integer_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cInteger);
-}
-
-inline static VALUE
-k_float_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cFloat);
-}
-
-inline static VALUE
-k_rational_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cRational);
-}
-
-inline static VALUE
-k_complex_p(VALUE x)
-{
-    return f_kind_of_p(x, rb_cComplex);
-}
-
-inline static VALUE
-f_generic_p(VALUE x)
-{
-    switch (TYPE(x)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	return Qtrue;
-      default:
-	return Qfalse;
-    }
-}
-
-static VALUE
-nucomp_s_generic_p(VALUE klass, VALUE x)
-{
-    return f_generic_p(x);
-}
-
-#define get_dat1(x) \
-    struct RComplex *dat;\
-    dat = ((struct RComplex *)(x))
-
-#define get_dat2(x,y) \
-    struct RComplex *adat, *bdat;\
-    adat = ((struct RComplex *)(x));\
-    bdat = ((struct RComplex *)(y))
-
-inline static VALUE
-nucomp_s_new_internal(VALUE klass, VALUE real, VALUE image)
-{
-    NEWOBJ(obj, struct RComplex);
-    OBJSETUP(obj, klass, T_COMPLEX);
-
-    obj->real = real;
-    obj->image = image;
-
-    return (VALUE)obj;
-}
-
-static VALUE
-nucomp_s_alloc(VALUE klass)
-{
-    return nucomp_s_new_internal(klass, ZERO, ZERO);
-}
-
-static VALUE
-nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE real, image;
-
-    switch (rb_scan_args(argc, argv, "11", &real, &image)) {
-      case 1:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	image = ZERO;
-	break;
-      default:
-	if (!k_numeric_p(real))
-	    real = f_to_i(real);
-	if (!k_numeric_p(image))
-	    image = f_to_i(image);
-	break;
-    }
-
-    return nucomp_s_new_internal(klass, real, image);
-}
-
-inline static VALUE
-f_complex_new_bang1(VALUE klass, VALUE x)
-{
-    return nucomp_s_new_internal(klass, x, ZERO);
-}
-
-inline static VALUE
-f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
-{
-    return nucomp_s_new_internal(klass, x, y);
-}
-
-#define f_unify_p(klass) rb_const_defined(klass, id_Unify)
-
-inline static void
-nucomp_real_check(VALUE num)
-{
-    switch (TYPE(num)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	break;
-      default:
-	rb_raise(rb_eArgError, "not a real");
-    }
-}
-
-inline static VALUE
-nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE image)
-{
-#define CL_CANON
-#ifdef CL_CANON
-    if (f_zero_p(image) && f_unify_p(klass) &&
-	!k_float_p(real) && !k_float_p(image))
-	return real;
-#else
-    if (f_zero_p(image) && f_unify_p(klass))
-	return real;
-#endif
-    else if (f_scalar_p(real) && f_scalar_p(image))
-	return nucomp_s_new_internal(klass, real, image);
-    else if (f_scalar_p(real)) {
-	get_dat1(image);
-
-	return nucomp_s_new_internal(klass,
-				     f_sub(real, dat->image),
-				     f_add(ZERO, dat->real));
-    }
-    else if (f_scalar_p(image)) {
-	get_dat1(real);
-
-	return nucomp_s_new_internal(klass,
-				     dat->real,
-				     f_add(dat->image, image));
-    }
-    else {
-	get_dat2(real, image);
-
-	return nucomp_s_new_internal(klass,
-				     f_sub(adat->real, bdat->image),
-				     f_add(adat->image, bdat->real));
-    }
-}
-
-#if 0
-static VALUE
-nucomp_s_canonicalize(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE real, image;
-
-    switch (rb_scan_args(argc, argv, "11", &real, &image)) {
-      case 1:
-	image = ZERO;
-	break;
-    }
-
-    nucomp_real_check(real);
-    nucomp_real_check(image);
-
-    return nucomp_s_canonicalize_internal(klass, real, image);
-}
-#endif
-
-static VALUE
-nucomp_s_new(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE real, image;
-
-    switch (rb_scan_args(argc, argv, "11", &real, &image)) {
-      case 1:
-	image = ZERO;
-	break;
-    }
-
-    nucomp_real_check(real);
-    nucomp_real_check(image);
-
-    return nucomp_s_canonicalize_internal(klass, real, image);
-}
-
-inline static VALUE
-f_complex_new1(VALUE klass, VALUE x)
-{
-    assert(!k_complex_p(x));
-    return nucomp_s_canonicalize_internal(klass, x, ZERO);
-}
-
-inline static VALUE
-f_complex_new2(VALUE klass, VALUE x, VALUE y)
-{
-    assert(!k_complex_p(x));
-    return nucomp_s_canonicalize_internal(klass, x, y);
-}
-
-static VALUE
-nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
-{
-    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
-}
-
-extern VALUE math_atan2(VALUE obj, VALUE x, VALUE y);
-extern VALUE math_cos(VALUE obj, VALUE x);
-extern VALUE math_cosh(VALUE obj, VALUE x);
-extern VALUE math_exp(VALUE obj, VALUE x);
-extern VALUE math_hypot(VALUE obj, VALUE x, VALUE y);
-extern VALUE math_log(int argc, VALUE *argv);
-extern VALUE math_sin(VALUE obj, VALUE x);
-extern VALUE math_sinh(VALUE obj, VALUE x);
-extern VALUE math_sqrt(VALUE obj, VALUE x);
-
-#define m_atan2_bang(x,y) math_atan2(Qnil,x,y)
-#define m_cos_bang(x) math_cos(Qnil,x)
-#define m_cosh_bang(x) math_cosh(Qnil,x)
-#define m_exp_bang(x) math_exp(Qnil,x)
-#define m_hypot(x,y) math_hypot(Qnil,x,y)
-
-static VALUE
-m_log_bang(VALUE x)
-{
-  return math_log(1, &x);
-}
-
-#define m_sin_bang(x) math_sin(Qnil,x)
-#define m_sinh_bang(x) math_sinh(Qnil,x)
-#define m_sqrt_bang(x) math_sqrt(Qnil,x)
-
-static VALUE
-m_cos(VALUE x)
-{
-    get_dat1(x);
-
-    if (f_generic_p(x))
-	return m_cos_bang(x);
-    return f_complex_new2(rb_cComplex,
-			  f_mul(m_cos_bang(dat->real),
-				m_cosh_bang(dat->image)),
-			  f_mul(f_negate(m_sin_bang(dat->real)),
-				m_sinh_bang(dat->image)));
-}
-
-static VALUE
-m_sin(VALUE x)
-{
-    get_dat1(x);
-
-    if (f_generic_p(x))
-	return m_sin_bang(x);
-    return f_complex_new2(rb_cComplex,
-			  f_mul(m_sin_bang(dat->real),
-				m_cosh_bang(dat->image)),
-			  f_mul(m_cos_bang(dat->real),
-				m_sinh_bang(dat->image)));
-}
-
-static VALUE
-m_sqrt(VALUE x)
-{
-    if (f_generic_p(x)) {
-	if (!f_negative_p(x))
-	    return m_sqrt_bang(x);
-	return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
-    }
-    else {
-	get_dat1(x);
-
-	if (f_negative_p(dat->image))
-	    return f_conjugate(m_sqrt(f_conjugate(x)));
-	else {
-	    VALUE a = f_abs(x);
-	    return f_complex_new2(rb_cComplex,
-				  m_sqrt_bang(f_div(f_add(a, dat->real), TWO)),
-				  m_sqrt_bang(f_div(f_sub(a, dat->real), TWO)));
-	}
-    }
-}
-
-static VALUE
-nucomp_s_polar(VALUE klass, VALUE abs, VALUE arg)
-{
-    return f_complex_new2(klass,
-			  f_mul(abs, m_cos(arg)),
-			  f_mul(abs, m_sin(arg)));
-}
-
-static VALUE
-nucomp_real(VALUE self)
-{
-    get_dat1(self);
-    return dat->real;
-}
-
-static VALUE
-nucomp_image(VALUE self)
-{
-    get_dat1(self);
-    return dat->image;
-}
-
-static VALUE
-nucomp_add(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    get_dat1(self);
-
-	    return f_complex_new2(CLASS_OF(self),
-				  f_add(dat->real, other), dat->image);
-	}
-      case T_COMPLEX:
-	{
-	    VALUE real, image;
-
-	    get_dat2(self, other);
-
-	    real = f_add(adat->real, bdat->real);
-	    image = f_add(adat->image, bdat->image);
-
-	    return f_complex_new2(CLASS_OF(self), real, image);
-	}
-      default:
-	return rb_num_coerce_bin(self, other, '+');
-    }
-}
-
-static VALUE
-nucomp_sub(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    get_dat1(self);
-
-	    return f_complex_new2(CLASS_OF(self),
-				  f_sub(dat->real, other), dat->image);
-	}
-      case T_COMPLEX:
-	{
-	    VALUE real, image;
-
-	    get_dat2(self, other);
-
-	    real = f_sub(adat->real, bdat->real);
-	    image = f_sub(adat->image, bdat->image);
-
-	    return f_complex_new2(CLASS_OF(self), real, image);
-	}
-      default:
-	return rb_num_coerce_bin(self, other, '-');
-    }
-}
-
-static VALUE
-nucomp_mul(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    get_dat1(self);
-
-	    return f_complex_new2(CLASS_OF(self),
-				  f_mul(dat->real, other),
-				  f_mul(dat->image, other));
-	}
-      case T_COMPLEX:
-	{
-	    VALUE real, image;
-
-	    get_dat2(self, other);
-
-	    real = f_sub(f_mul(adat->real, bdat->real),
-			 f_mul(adat->image, bdat->image));
-	    image = f_add(f_mul(adat->real, bdat->image),
-			  f_mul(adat->image, bdat->real));
-
-	    return f_complex_new2(CLASS_OF(self), real, image);
-	}
-      default:
-	return rb_num_coerce_bin(self, other, '*');
-    }
-}
-
-static VALUE
-nucomp_div(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    get_dat1(self);
-
-	    return f_complex_new2(CLASS_OF(self),
-				  f_div(dat->real, other),
-				  f_div(dat->image, other));
-	}
-      case T_COMPLEX:
-	{
-	    get_dat2(self, other);
-
-	    if (TYPE(adat->real)  == T_FLOAT ||
-		TYPE(adat->image) == T_FLOAT ||
-		TYPE(bdat->real)  == T_FLOAT ||
-		TYPE(bdat->image) == T_FLOAT) {
-		VALUE magn = m_hypot(bdat->real, bdat->image);
-		VALUE tmp = f_complex_new_bang2(CLASS_OF(self),
-						f_div(bdat->real, magn),
-						f_div(bdat->image, magn));
-		return f_div(f_mul(self, f_conjugate(tmp)), magn);
-	    }
-	    return f_div(f_mul(self, f_conjugate(other)), f_abs2(other));
-	}
-      default:
-	return rb_num_coerce_bin(self, other, '/');
-    }
-}
-
-static VALUE
-nucomp_quo(VALUE self, VALUE other)
-{
-    get_dat1(self);
-
-    return f_div(f_complex_new2(CLASS_OF(self),
-				f_quo(dat->real, ONE),
-				f_quo(dat->image, ONE)), other);
-}
-
-static VALUE
-nucomp_fdiv(VALUE self, VALUE other)
-{
-    get_dat1(self);
-
-    return f_div(f_complex_new2(CLASS_OF(self),
-				f_to_f(dat->real),
-				f_to_f(dat->image)), other);
-}
-
-static VALUE
-nucomp_expt(VALUE self, VALUE other)
-{
-    if (f_zero_p(other))
-	return f_complex_new_bang1(CLASS_OF(self), ONE);
-
-    if (k_rational_p(other) && f_one_p(f_denominator(other)))
-	other = f_numerator(other); /* good? */
-
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-	if (f_gt_p(other, ZERO)) {
-	    VALUE x, z, n;
-
-	    x = self;
-	    z = x;
-	    n = f_sub(other, ONE);
-
-	    while (!f_zero_p(n)) {
-		VALUE a;
-
-		while (a = f_divmod(n, TWO),
-		       f_zero_p(RARRAY_PTR(a)[1])) {
-		    get_dat1(x);
-
-		    x = f_complex_new2(CLASS_OF(self),
-				       f_sub(f_mul(dat->real, dat->real),
-					     f_mul(dat->image, dat->image)),
-				       f_mul(f_mul(TWO, dat->real), dat->image));
-		    n = RARRAY_PTR(a)[0];
-		}
-		z = f_mul(z, x);
-		n = f_sub(n, ONE);
-	    }
-	    return z;
-	}
-	return f_expt(f_div(f_to_r(ONE), self), f_negate(other));
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    VALUE a, r, theta;
-
-	    a = f_polar(self);
-	    r = RARRAY_PTR(a)[0];
-	    theta = RARRAY_PTR(a)[1];
-	    return nucomp_s_polar(CLASS_OF(self), f_expt(r, other),
-				  f_mul(theta, other));
-	}
-      case T_COMPLEX:
-	{
-	    VALUE a, r, theta, ore, oim, nr, ntheta;
-
-	    get_dat1(other);
-
-	    a = f_polar(self);
-	    r = RARRAY_PTR(a)[0];
-	    theta = RARRAY_PTR(a)[1];
-
-	    ore = dat->real;
-	    oim = dat->image;
-	    nr = m_exp_bang(f_sub(f_mul(ore, m_log_bang(r)),
-				  f_mul(oim, theta)));
-	    ntheta = f_add(f_mul(theta, ore), f_mul(oim, m_log_bang(r)));
-	    return nucomp_s_polar(CLASS_OF(self), nr, ntheta);
-	}
-      default:
-	return rb_num_coerce_bin(self, other, id_expt);
-    }
-}
-
-static VALUE
-nucomp_equal_p(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	{
-	    get_dat1(self);
-
-	    return f_boolcast(f_equal_p(dat->real, other) && f_zero_p(dat->image));
-	}
-      case T_COMPLEX:
-	{
-	    get_dat2(self, other);
-
-	    return f_boolcast(f_equal_p(adat->real, bdat->real) &&
-			      f_equal_p(adat->image, bdat->image));
-	}
-      default:
-	return f_equal_p(other, self);
-    }
-}
-
-static VALUE
-nucomp_coerce(VALUE self, VALUE other)
-{
-    switch (TYPE(other)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-      case T_RATIONAL:
-	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
-    }
-
-    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
-	     rb_obj_classname(other), rb_obj_classname(self));
-    return Qnil;
-}
-
-static VALUE
-nucomp_abs(VALUE self)
-{
-    get_dat1(self);
-    return m_hypot(dat->real, dat->image);
-}
-
-static VALUE
-nucomp_abs2(VALUE self)
-{
-    get_dat1(self);
-    return f_add(f_mul(dat->real, dat->real),
-		 f_mul(dat->image, dat->image));
-}
-
-static VALUE
-nucomp_arg(VALUE self)
-{
-    get_dat1(self);
-    return m_atan2_bang(dat->image, dat->real);
-}
-
-static VALUE
-nucomp_polar(VALUE self)
-{
-    return rb_assoc_new(f_abs(self), f_arg(self));
-}
-
-static VALUE
-nucomp_conjugate(VALUE self)
-{
-    get_dat1(self);
-    return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->image));
-}
-
-#if 0
-static VALUE
-nucomp_real_p(VALUE self)
-{
-    return Qfalse;
-}
-
-static VALUE
-nucomp_complex_p(VALUE self)
-{
-    return Qtrue;
-}
-
-static VALUE
-nucomp_exact_p(VALUE self)
-{
-    get_dat1(self);
-    return f_boolcast(f_exact_p(dat->real) && f_exact_p(dat->image));
-}
-
-static VALUE
-nucomp_inexact_p(VALUE self)
-{
-    return f_boolcast(!nucomp_exact_p(self));
-}
-#endif
-
-extern VALUE rb_lcm(VALUE x, VALUE y);
-
-static VALUE
-nucomp_denominator(VALUE self)
-{
-    get_dat1(self);
-    return rb_lcm(f_denominator(dat->real), f_denominator(dat->image));
-}
-
-static VALUE
-nucomp_numerator(VALUE self)
-{
-    VALUE cd;
-
-    get_dat1(self);
-
-    cd = f_denominator(self);
-    return f_complex_new2(CLASS_OF(self),
-			  f_mul(f_numerator(dat->real),
-				f_div(cd, f_denominator(dat->real))),
-			  f_mul(f_numerator(dat->image),
-				f_div(cd, f_denominator(dat->image))));
-}
-
-static VALUE
-nucomp_hash(VALUE self)
-{
-    get_dat1(self);
-    return f_xor(dat->real, dat->image);
-}
-
-#ifndef HAVE_SIGNBIT
-#ifdef signbit
-#define HAVE_SIGNBIT 1
-#endif
-#endif
-
-inline static VALUE
-f_signbit(VALUE x)
-{
-    switch (TYPE(x)) {
-      case T_FLOAT:
-#ifdef HAVE_SIGNBIT
-	return f_boolcast(signbit(RFLOAT_VALUE(x)));
-#else
-	{
-	    char s[2];
-
-	    (void)snprintf(s, sizeof s, "%.0f", RFLOAT_VALUE(x));
-
-	    return f_boolcast(s[0] == '-');
-	}
-#endif
-    }
-    return f_negative_p(x);
-}
-
-inline static VALUE
-f_tzero_p(VALUE x)
-{
-    return f_boolcast(f_zero_p(x) && !f_signbit(x));
-}
-
-inline static VALUE
-f_tpositive_p(VALUE x)
-{
-    return f_boolcast(!f_signbit(x));
-}
-
-static VALUE
-nucomp_to_s(VALUE self)
-{
-    VALUE s, rezero, impos;
-
-    get_dat1(self);
-
-    rezero = f_tzero_p(dat->real);
-    impos = f_tpositive_p(dat->image);
-
-    if (rezero)
-	s = rb_str_new2("");
-    else {
-	s = f_to_s(dat->real);
-	rb_str_cat2(s, !impos ? "-" : "+");
-    }
-
-    if (k_rational_p(dat->image) &&
-	!f_one_p(f_denominator(dat->image))) {
-	rb_str_cat2(s, "(");
-	rb_str_concat(s, f_to_s(rezero ? dat->image : f_abs(dat->image)));
-	rb_str_cat2(s, ")i");
-    }
-    else {
-	rb_str_concat(s, f_to_s(rezero ? dat->image : f_abs(dat->image)));
-	rb_str_cat2(s, "i");
-    }
-
-    return s;
-}
-
-static VALUE
-nucomp_inspect(VALUE self)
-{
-    VALUE s;
-
-    get_dat1(self);
-
-    s = rb_str_new2("Complex(");
-    rb_str_concat(s, f_inspect(dat->real));
-    rb_str_cat2(s, ", ");
-    rb_str_concat(s, f_inspect(dat->image));
-    rb_str_cat2(s, ")");
-
-    return s;
-}
-
-static VALUE
-nucomp_marshal_dump(VALUE self)
-{
-    get_dat1(self);
-    return rb_assoc_new(dat->real, dat->image);
-}
-
-static VALUE
-nucomp_marshal_load(VALUE self, VALUE a)
-{
-    get_dat1(self);
-    dat->real = RARRAY_PTR(a)[0];
-    dat->image = RARRAY_PTR(a)[1];
-    return self;
-}
-
-/* --- */
-
-VALUE
-rb_complex_raw(VALUE x, VALUE y)
-{
-    return nucomp_s_new_internal(rb_cComplex, x, y);
-}
-
-VALUE
-rb_complex_new(VALUE x, VALUE y)
-{
-    return nucomp_s_canonicalize_internal(rb_cComplex, x, y);
-}
-
-static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
-
-VALUE
-rb_Complex(VALUE x, VALUE y)
-{
-    VALUE a[2];
-    a[0] = x;
-    a[1] = y;
-    return nucomp_s_convert(2, a, rb_cComplex);
-}
-
-static VALUE
-nucomp_scalar_p(VALUE self)
-{
-    return Qfalse;
-}
-
-static VALUE
-nucomp_to_i(VALUE self)
-{
-    get_dat1(self);
-
-    if (k_float_p(dat->image) || !f_zero_p(dat->image)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Integer",
-		 StringValuePtr(s));
-    }
-    return f_to_i(dat->real);
-}
-
-static VALUE
-nucomp_to_f(VALUE self)
-{
-    get_dat1(self);
-
-    if (k_float_p(dat->image) || !f_zero_p(dat->image)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Float",
-		 StringValuePtr(s));
-    }
-    return f_to_f(dat->real);
-}
-
-static VALUE
-nucomp_to_r(VALUE self)
-{
-    get_dat1(self);
-
-    if (k_float_p(dat->image) || !f_zero_p(dat->image)) {
-	VALUE s = f_to_s(self);
-	rb_raise(rb_eRangeError, "can't convert %s into Rational",
-		 StringValuePtr(s));
-    }
-    return f_to_r(dat->real);
-}
-
-static VALUE
-nilclass_to_c(VALUE self)
-{
-    return rb_complex_new1(INT2FIX(0));
-}
-
-static VALUE
-numeric_to_c(VALUE self)
-{
-    return rb_complex_new1(self);
-}
-
-static VALUE comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
-    null_string, underscores_pat, an_underscore;
-
-#define DIGITS "(?:\\d(?:_\\d|\\d)*)"
-#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
-#define DENOMINATOR "[-+]?" DIGITS
-#define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?"
-#define PATTERN1 "\\A((" NUMBER ")|\\((" NUMBER ")\\))?[iIjJ]"
-#define PATTERN2 "\\A(" NUMBER ")(([-+])(?:(" NUMBERNOS ")|\\((" NUMBER ")\\))?[iIjJ])?"
-
-static void
-make_patterns(void)
-{
-    static const char comp_pat1_source[] = PATTERN1;
-    static const char comp_pat2_source[] = PATTERN2;
-    static const char underscores_pat_source[] = "_+";
-
-    if (comp_pat1) return;
-
-    comp_pat1 = rb_reg_new(comp_pat1_source, sizeof comp_pat1_source - 1, 0);
-    rb_global_variable(&comp_pat1);
-
-    comp_pat2 = rb_reg_new(comp_pat2_source, sizeof comp_pat2_source - 1, 0);
-    rb_global_variable(&comp_pat2);
-
-    a_slash = rb_str_new2("/");
-    rb_global_variable(&a_slash);
-
-    a_dot_and_an_e = rb_str_new2(".eE");
-    rb_global_variable(&a_dot_and_an_e);
-
-    null_string = rb_str_new2("");
-    rb_global_variable(&null_string);
-
-    underscores_pat = rb_reg_new(underscores_pat_source,
-				 sizeof underscores_pat_source - 1, 0);
-    rb_global_variable(&underscores_pat);
-
-    an_underscore = rb_str_new2("_");
-    rb_global_variable(&an_underscore);
-}
-
-#define id_strip rb_intern("strip")
-#define f_strip(x) rb_funcall(x, id_strip, 0)
-
-#define id_match rb_intern("match")
-#define f_match(x,y) rb_funcall(x, id_match, 1, y)
-
-#define id_aref rb_intern("[]")
-#define f_aref(x,y) rb_funcall(x, id_aref, 1, y)
-
-#define id_post_match rb_intern("post_match")
-#define f_post_match(x) rb_funcall(x, id_post_match, 0)
-
-#define id_split rb_intern("split")
-#define f_split(x,y) rb_funcall(x, id_split, 1, y)
-
-#define id_include_p rb_intern("include?")
-#define f_include_p(x,y) rb_funcall(x, id_include_p, 1, y)
-
-#define id_count rb_intern("count")
-#define f_count(x,y) rb_funcall(x, id_count, 1, y)
-
-#define id_gsub_bang rb_intern("gsub!")
-#define f_gsub_bang(x,y,z) rb_funcall(x, id_gsub_bang, 2, y, z)
-
-static VALUE
-string_to_c_internal(VALUE self)
-{
-    VALUE s;
-
-    s = f_strip(self);
-
-    if (RSTRING_LEN(s) == 0)
-	return rb_assoc_new(Qnil, self);
-
-    {
-	VALUE m, sr, si, re, r, i;
-
-	m = f_match(comp_pat1, s);
-	if (!NIL_P(m)) {
-	    sr = Qnil;
-	    si = f_aref(m, INT2FIX(1));
-	    if (NIL_P(si))
-		si = rb_str_new2("1");
-	    else {
-		si = f_aref(m, INT2FIX(2));
-		if (NIL_P(si))
-		    si = f_aref(m, INT2FIX(3));
-	    }
-	    re = f_post_match(m);
-	}
-	if (NIL_P(m)) {
-	    m = f_match(comp_pat2, s);
-	    if (NIL_P(m)) {
-		return rb_assoc_new(Qnil, self);
-	    }
-	    sr = f_aref(m, INT2FIX(1));
-	    if (NIL_P(f_aref(m, INT2FIX(2))))
-		si = Qnil;
-	    else {
-		VALUE t;
-
-		si = f_aref(m, INT2FIX(3));
-		t = f_aref(m, INT2FIX(4));
-		if (NIL_P(t))
-		    t = f_aref(m, INT2FIX(5));
-		if (NIL_P(t))
-		    t = rb_str_new2("1");
-		rb_str_concat(si, t);
-	    }
-	    re = f_post_match(m);
-	}
-	r = INT2FIX(0);
-	i = INT2FIX(0);
-	if (!NIL_P(sr)) {
-	    if (f_include_p(sr, a_slash))
-		r = f_to_r(sr);
-	    else if (f_gt_p(f_count(sr, a_dot_and_an_e), INT2FIX(0)))
-		r = f_to_f(sr);
-	    else
-		r = f_to_i(sr);
-	}
-	if (!NIL_P(si)) {
-	    if (f_include_p(si, a_slash))
-		i = f_to_r(si);
-	    else if (f_gt_p(f_count(si, a_dot_and_an_e), INT2FIX(0)))
-		i = f_to_f(si);
-	    else
-		i = f_to_i(si);
-	}
-	return rb_assoc_new(rb_complex_new2(r, i), re);
-    }
-}
-
-static VALUE
-string_to_c_strict(VALUE self)
-{
-    VALUE a = string_to_c_internal(self);
-    if (NIL_P(RARRAY_PTR(a)[0]) || RSTRING_LEN(RARRAY_PTR(a)[1]) > 0) {
-	VALUE s = f_inspect(self);
-	rb_raise(rb_eArgError, "invalid value for Complex: %s",
-		 StringValuePtr(s));
-    }
-    return RARRAY_PTR(a)[0];
-}
-
-#define id_gsub rb_intern("gsub")
-#define f_gsub(x,y,z) rb_funcall(x, id_gsub, 2, y, z)
-
-static VALUE
-string_to_c(VALUE self)
-{
-    VALUE s, a, backref;
-
-    backref = rb_backref_get();
-    rb_match_busy(backref);
-
-    s = f_gsub(self, underscores_pat, an_underscore);
-    a = string_to_c_internal(s);
-
-    rb_backref_set(backref);
-
-    if (!NIL_P(RARRAY_PTR(a)[0]))
-	return RARRAY_PTR(a)[0];
-    return rb_complex_new1(INT2FIX(0));
-}
-
-static VALUE
-nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE a1, a2, backref;
-
-    rb_scan_args(argc, argv, "02", &a1, &a2);
-
-    backref = rb_backref_get();
-    rb_match_busy(backref);
-
-    switch (TYPE(a1)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-	break;
-      case T_STRING:
-	a1 = string_to_c_strict(a1);
-	break;
-    }
-
-    switch (TYPE(a2)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
-      case T_FLOAT:
-	break;
-      case T_STRING:
-	a2 = string_to_c_strict(a2);
-	break;
-    }
-
-    rb_backref_set(backref);
-
-    switch (TYPE(a1)) {
-      case T_COMPLEX:
-	{
-	    get_dat1(a1);
-
-	    if (!k_float_p(dat->image) && f_zero_p(dat->image))
-		a1 = dat->real;
-	}
-    }
-
-    switch (TYPE(a2)) {
-      case T_COMPLEX:
-	{
-	    get_dat1(a2);
-
-	    if (!k_float_p(dat->image) && f_zero_p(dat->image))
-		a2 = dat->real;
-	}
-    }
-
-    switch (TYPE(a1)) {
-      case T_COMPLEX:
-	if (NIL_P(a2) || f_zero_p(a2))
-	    return a1;
-    }
-
-    {
-	VALUE argv2[2];
-	argv2[0] = a1;
-	argv2[1] = a2;
-	return nucomp_s_new(argc, argv2, klass);
-    }
-}
-
-/* --- */
-
-#define id_Complex rb_intern("Complex")
-
-static VALUE
-numeric_re(VALUE self)
-{
-    return rb_Complex1(self);
-}
-
-static VALUE
-numeric_im(VALUE self)
-{
-    return rb_Complex2(ZERO, self);
-}
-
-static VALUE
-numeric_real(VALUE self)
-{
-    return self;
-}
-
-static VALUE
-numeric_image(VALUE self)
-{
-    return INT2FIX(0);
-}
-
-#define id_PI rb_intern("PI")
-
-static VALUE
-numeric_arg(VALUE self)
-{
-    if (!f_negative_p(self))
-	return INT2FIX(0);
-    return rb_const_get(rb_mMath, id_PI);
-}
-
-static VALUE
-numeric_polar(VALUE self)
-{
-    return rb_assoc_new(f_abs(self), f_arg(self));
-}
-
-static VALUE
-numeric_conjugate(VALUE self)
-{
-    return self;
-}
-
-void
-Init_Complex(void)
-{
-#undef rb_intern
-
-    assert(fprintf(stderr, "assert() is now active\n"));
-
-    id_Unify = rb_intern("Unify");
-    id_abs = rb_intern("abs");
-    id_abs2 = rb_intern("abs2");
-    id_arg = rb_intern("arg");
-    id_atan2_bang = rb_intern("atan2!");
-    id_cmp = rb_intern("<=>");
-    id_conjugate = rb_intern("conjugate");
-    id_convert = rb_intern("convert");
-    id_cos = rb_intern("cos");
-    id_denominator = rb_intern("denominator");
-    id_divmod = rb_intern("divmod");
-    id_equal_p = rb_intern("==");
-    id_exact_p = rb_intern("exact?");
-    id_exp_bang = rb_intern("exp!");
-    id_expt = rb_intern("**");
-    id_floor = rb_intern("floor");
-    id_format = rb_intern("format");
-    id_hypot = rb_intern("hypot");
-    id_idiv = rb_intern("div");
-    id_inspect = rb_intern("inspect");
-    id_log_bang = rb_intern("log!");
-    id_negate = rb_intern("-@");
-    id_new = rb_intern("new");
-    id_new_bang = rb_intern("new!");
-    id_numerator = rb_intern("numerator");
-    id_polar = rb_intern("polar");
-    id_quo = rb_intern("quo");
-    id_scalar_p = rb_intern("scalar?");
-    id_sin = rb_intern("sin");
-    id_sqrt = rb_intern("sqrt");
-    id_to_f = rb_intern("to_f");
-    id_to_i = rb_intern("to_i");
-    id_to_r = rb_intern("to_r");
-    id_to_s = rb_intern("to_s");
-    id_truncate = rb_intern("truncate");
-
-    rb_cComplex = rb_define_class(COMPLEX_NAME, rb_cNumeric);
-
-    rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
-    rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1,
-	       ID2SYM(rb_intern("allocate")));
-
-    rb_define_singleton_method(rb_cComplex, "generic?", nucomp_s_generic_p, 1);
-
-    rb_define_singleton_method(rb_cComplex, "new!", nucomp_s_new_bang, -1);
-    rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1,
-	       ID2SYM(rb_intern("new!")));
-
-    rb_define_singleton_method(rb_cComplex, "new", nucomp_s_new, -1);
-    rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1,
-	       ID2SYM(rb_intern("new")));
-
-#if 0
-    rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
-    rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
-#endif
-    rb_define_singleton_method(rb_cComplex, "polar", nucomp_s_polar, 2);
-
-    rb_define_global_function(COMPLEX_NAME, nucomp_f_complex, -1);
-
-    rb_undef_method(rb_cComplex, "<");
-    rb_undef_method(rb_cComplex, "<=");
-    rb_undef_method(rb_cComplex, "<=>");
-    rb_undef_method(rb_cComplex, ">");
-    rb_undef_method(rb_cComplex, ">=");
-    rb_undef_method(rb_cComplex, "between?");
-    rb_undef_method(rb_cComplex, "divmod");
-    rb_undef_method(rb_cComplex, "floor");
-    rb_undef_method(rb_cComplex, "ceil");
-    rb_undef_method(rb_cComplex, "modulo");
-    rb_undef_method(rb_cComplex, "round");
-    rb_undef_method(rb_cComplex, "step");
-    rb_undef_method(rb_cComplex, "truncate");
-
-#if NUBY
-    rb_undef_method(rb_cComplex, "//");
-#endif
-
-    rb_define_method(rb_cComplex, "real", nucomp_real, 0);
-    rb_define_method(rb_cComplex, "image", nucomp_image, 0);
-    rb_define_method(rb_cComplex, "imag", nucomp_image, 0);
-
-    rb_define_method(rb_cComplex, "+", nucomp_add, 1);
-    rb_define_method(rb_cComplex, "-", nucomp_sub, 1);
-    rb_define_method(rb_cComplex, "*", nucomp_mul, 1);
-    rb_define_method(rb_cComplex, "/", nucomp_div, 1);
-    rb_define_method(rb_cComplex, "quo", nucomp_quo, 1);
-    rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
-    rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
-
-    rb_define_method(rb_cComplex, "==", nucomp_equal_p, 1);
-    rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
-
-    rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
-#if 0
-    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
-#endif
-    rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0);
-    rb_define_method(rb_cComplex, "arg", nucomp_arg, 0);
-    rb_define_method(rb_cComplex, "angle", nucomp_arg, 0);
-    rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
-    rb_define_method(rb_cComplex, "conjugate", nucomp_conjugate, 0);
-    rb_define_method(rb_cComplex, "conj", nucomp_conjugate, 0);
-#if 0
-    rb_define_method(rb_cComplex, "~", nucomp_conjugate, 0); /* gcc */
-#endif
-
-#if 0
-    rb_define_method(rb_cComplex, "real?", nucomp_real_p, 0);
-    rb_define_method(rb_cComplex, "complex?", nucomp_complex_p, 0);
-    rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0);
-    rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0);
-#endif
-
-    rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0);
-    rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0);
-
-    rb_define_method(rb_cComplex, "hash", nucomp_hash, 0);
-
-    rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
-    rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
-
-    rb_define_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
-    rb_define_method(rb_cComplex, "marshal_load", nucomp_marshal_load, 1);
-
-    /* --- */
-
-    rb_define_method(rb_cComplex, "scalar?", nucomp_scalar_p, 0);
-    rb_define_method(rb_cComplex, "to_i", nucomp_to_i, 0);
-    rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0);
-    rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
-    rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
-    rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
-
-    make_patterns();
-
-    rb_define_method(rb_cString, "to_c", string_to_c, 0);
-
-    rb_define_singleton_method(rb_cComplex, "convert", nucomp_s_convert, -1);
-    rb_funcall(rb_cComplex, rb_intern("private_class_method"), 1,
-	       ID2SYM(rb_intern("convert")));
-
-    /* --- */
-
-    rb_define_method(rb_cNumeric, "re", numeric_re, 0);
-    rb_define_method(rb_cNumeric, "im", numeric_im, 0);
-    rb_define_method(rb_cNumeric, "real", numeric_real, 0);
-    rb_define_method(rb_cNumeric, "image", numeric_image, 0);
-    rb_define_method(rb_cNumeric, "imag", numeric_image, 0);
-    rb_define_method(rb_cNumeric, "arg", numeric_arg, 0);
-    rb_define_method(rb_cNumeric, "angle", numeric_arg, 0);
-    rb_define_method(rb_cNumeric, "polar", numeric_polar, 0);
-    rb_define_method(rb_cNumeric, "conjugate", numeric_conjugate, 0);
-    rb_define_method(rb_cNumeric, "conj", numeric_conjugate, 0);
-
-    rb_define_const(rb_cComplex, "I",
-		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
-}
diff --git a/config.sub b/config.sub
index 463186dbfd..506d3ab77f 100644
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2004-01-05'
+timestamp='2004-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1130,7 +1130,7 @@ case $os in
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		os=`echo $os | sed -e 's|gnu/linux|linux|'`
 		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
@@ -1183,7 +1183,7 @@ case $os in
 		os=-linux-dietlibc
 		;;
 	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		os=-linux
 		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
diff --git a/configure.in b/configure.in
index c799ddab86..d922bd20da 100644
--- a/configure.in
+++ b/configure.in
@@ -1,26 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-AC_PREREQ(2.60)
-
-AC_ARG_WITH(baseruby,
-	[  --with-baseruby=RUBY use RUBY as baseruby; RUBY is the pathname of ruby],
-	[
-		case "$withval" in
-		*ruby*)
-			BASERUBY=$withval
-			;;
-		*)
-			AC_MSG_ERROR(need ruby)
-			;;
-		esac
-	],
-	[
-		BASERUBY="ruby"
-	])
-test "`$BASERUBY -e 'p 42' 2>/dev/null`" = 42 ||
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
-AC_SUBST(BASERUBY)
+AC_PREREQ(2.58)
 
 AC_DEFUN([RUBY_MINGW32],
 [case "$host_os" in
@@ -100,7 +81,6 @@ fi
 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.
@@ -176,34 +156,30 @@ AC_ARG_PROGRAM
 
 dnl Checks for programs.
 
-: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'}
-: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'}
 if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_GCC_TRADITIONAL
-test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
 if test "$GCC" = yes; then
     linker_flag=-Wl,
-    : ${optflags=-O2} ${warnflags="-Wall -Wno-parentheses"}
 else
     linker_flag=
 fi
-CFLAGS="${CFLAGS} `eval echo $cflags`"
-CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
 : ${OUTFLAG='-o '}
-: ${COUTFLAG=${OUTFLAG}}
 AC_SUBST(OUTFLAG)
-AC_SUBST(COUTFLAG)
 
 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
@@ -228,10 +204,19 @@ cygwin*|mingw*)
 	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 |
+				   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}
     ;;
@@ -249,16 +234,16 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
 # checks for UNIX variants that set C preprocessor variables
-AC_USE_SYSTEM_EXTENSIONS
+AC_AIX
+AC_MINIX
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
 if $as_mkdir_p; then
-  MAKEDIRS='mkdir -p'
+  AC_SUBST(MAKEDIRS, ['mkdir -p'])
 else
-  MAKEDIRS='install -d'
+  AC_SUBST(MAKEDIRS, ['install -d'])
 fi
-AC_SUBST(MAKEDIRS)
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
@@ -268,13 +253,6 @@ mv confdefs.h largefile.h
 mv confdefs1.h confdefs.h
 cat largefile.h >> confdefs.h
 
-case "$target_os" in
-mingw*)
-	ac_cv_type_off_t=yes
-	ac_cv_sizeof_off_t=8
-	;;
-esac
-
 AC_CHECK_TYPES([long long, off_t])
 
 AC_CHECK_SIZEOF(int, 4)
@@ -288,40 +266,10 @@ AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(time_t, 0)
 
-dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
-AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
-    AC_CHECK_TYPE([$1],
-	[AC_DEFINE_UNQUOTED(rb_[$1], [$1])],
-	[AC_DEFINE_UNQUOTED(rb_[$1], [$2])],
-	[$4])
-    AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
-	u= t=
-	AC_COMPILE_IFELSE(
-	    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT]
-				      [$4], [(rb_[$1])-1 > 0])],
-	    [u=U])
-	if test x"$t" = x; then
-	    AC_COMPILE_IFELSE(
-		[AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT]
-					  [$4], [sizeof(rb_[$1]) > sizeof(long)])],
-		[t=LL])
-	fi
-	if test x"$t" = x; then
-	    AC_COMPILE_IFELSE(
-		[AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT]
-					  [$4], [sizeof(rb_[$1]) == sizeof(long)])],
-		[t=LONG])
-	fi
-	if test x"$t" = x; then
-	    t=INT
-	fi
-	rb_cv_[$1]_convertible=${u}${t}])
-    AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
-    AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
-])
-RUBY_REPLACE_TYPE(pid_t, int, PIDT)
-RUBY_REPLACE_TYPE(uid_t, int, UIDT)
-RUBY_REPLACE_TYPE(gid_t, int, GIDT)
+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);],
@@ -342,41 +290,6 @@ else
   AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
 fi
 
-AC_CACHE_CHECK(stringization, rb_cv_stringization, [
-  rb_cv_stringization=no
-  for string in "#expr" '"expr"'; do
-    AC_COMPILE_IFELSE([
-      AC_LANG_BOOL_COMPILE_TRY([
-#define STRINGIZE0(expr) $string
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#undef real_test_for_stringization
-#define test_for_stringization -.real_test_for_stringization.-
-const char stringized[[]] = STRINGIZE(test_for_stringization);
-], [sizeof(stringized) == 32])],
-      [rb_cv_stringization="$string"; break],
-      [rb_cv_stringization=no])
-  done]
-)
-AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
-if test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"; then
-  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
-  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
-fi
-
-AC_CACHE_CHECK([string literal concatenation],
-  rb_cv_string_literal_concatenation, [
-  AC_COMPILE_IFELSE([
-    AC_LANG_BOOL_COMPILE_TRY([
-const char concatenated_literal[[]] = "literals" "to"
-  "be" "concatenated.";
-], [sizeof(concatenated_literal) == 26])],
-    [rb_cv_string_literal_concatenation=yes],
-    [rb_cv_string_literal_concatenation=no])]
-)
-if test "$rb_cv_string_literal_concatenation" = no; then
-  AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1)
-fi
-
 AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
   [AC_TRY_COMPILE([
 #include <stdarg.h>
@@ -395,15 +308,6 @@ if test "$rb_cv_stdarg" = yes; then
   AC_DEFINE(HAVE_STDARG_PROTOTYPES)
 fi
 
-AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
-  [AC_TRY_COMPILE([@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)],
-  [FOO(1);FOO(1,2);FOO(1,2,3);],
-  rb_cv_va_args_macro=yes,
-  rb_cv_va_args_macro=no)])
-if test "$rb_cv_va_args_macro" = yes; then
-  AC_DEFINE(HAVE_VA_ARGS_MACRO)
-fi
-
 AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
 m4_ifval([$2], dnl
   [AS_VAR_PUSHDEF([attrib],[$2])], dnl
@@ -439,11 +343,7 @@ AS_VAR_POPDEF([rbcv])
 ])
 
 RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
-RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
 RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
-RUBY_FUNC_ATTRIBUTE(stdcall)
-RUBY_FUNC_ATTRIBUTE(cdecl)
-RUBY_FUNC_ATTRIBUTE(fastcall)
 
 AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
 [rb_cv_ruby_extern=no
@@ -460,31 +360,22 @@ dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
 #include <errno.h>])
 
-case "$target_os" in
-freebsd*)
-  AC_CACHE_CHECK([whether pthread should be enabled by default],
-    rb_cv_enable_pthread_default,
-    [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 502102
-#error pthread should be disabled on this platform
-#endif
-      ],
-      rb_cv_enable_pthread_default=yes,
-      rb_cv_enable_pthread_default=no)])
-  enable_pthread_default=$rb_cv_enable_pthread_default
-  ;;
-mingw*)
-  enable_pthread_default=no
-  ;;
-*)
-  enable_pthread_default=yes
-  ;;
-esac
+dnl whether link libc_r or not
+AC_ARG_WITH(libc_r, 
+	[  --with-libc_r           link libc_r if possible (FreeBSD only)], [
+	case $withval in
+	yes) with_libc_r=yes;;
+	*)   with_libc_r=no;;
+	esac], [with_libc_r=no])
 
 AC_ARG_ENABLE(pthread,
        [  --enable-pthread        use pthread library.],
-       [enable_pthread=$enableval], [enable_pthread=$enable_pthread_default])
+       [enable_pthread=$enableval], [enable_pthread=no])
+
+AC_ARG_ENABLE(fastthread,
+       [  --disable-fastthread    do not use the fastthread mutex], [
+	: handled by ext/thread/extconf.rb
+        ])
 
 dnl Checks for libraries.
 case "$target_os" in
@@ -500,7 +391,7 @@ darwin*)	LIBS="-lobjc $LIBS"
 		    #endif
 		    ],
 		    [
-		    test "x$target_cpu" = xppc && ac_cv_header_ucontext_h=no
+		    test "x$target_cpu" = xpowerpc && ac_cv_header_ucontext_h=no
 		    ],
 		    [
 		    AC_DEFINE(BROKEN_SETREUID, 1)
@@ -514,7 +405,12 @@ human*)		ac_cv_func_getpgrp_void=yes
 		;;
 beos*)		ac_cv_func_link=no;;
 cygwin*)	;;
-mingw*)		LIBS="-lshell32 -lws2_32 $LIBS"
+mingw*)		if test "$with_winsock2" = yes; then
+		  LIBS="-lws2_32 $LIBS"
+		else
+		  LIBS="-lwsock32 $LIBS"
+		fi
+		LIBS="-lshell32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
@@ -527,7 +423,6 @@ mingw*)		LIBS="-lshell32 -lws2_32 $LIBS"
 		ac_cv_func_times=yes
 		ac_cv_func_waitpid=yes
 		ac_cv_func_fsync=yes
-		ac_cv_func_snprintf=yes
 		ac_cv_func_vsnprintf=yes
 		ac_cv_func_seekdir=yes
 		ac_cv_func_telldir=yes
@@ -535,9 +430,6 @@ mingw*)		LIBS="-lshell32 -lws2_32 $LIBS"
 		ac_cv_func_isnan=yes
 		ac_cv_func_finite=yes
 		ac_cv_func_link=yes
-		ac_cv_func_truncate=yes
-		ac_cv_func_fseeko=yes
-		ac_cv_func_ftello=yes
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_getpgrp_void=no
 		ac_cv_func_setpgrp_void=yes
@@ -545,6 +437,7 @@ mingw*)		LIBS="-lshell32 -lws2_32 $LIBS"
 		ac_cv_lib_dl_dlopen=no
 		rb_cv_binary_elf=no
 		rb_cv_negative_time_t=no
+		enable_pthread=no
 		ac_cv_func_fcntl=yes
 		;;
 os2-emx*)	LIBS="-lm $LIBS"
@@ -552,8 +445,7 @@ os2-emx*)	LIBS="-lm $LIBS"
 msdosdjgpp*)	LIBS="-lm $LIBS"
 		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
-		ac_cv_sizeof_rlim_t=4
-		ac_cv_func_fork=no
+                ac_cv_sizeof_rlim_t=4
 		ac_cv_func_setrlimit=no
 		;;
 bsdi*)          LIBS="-lm $LIBS"
@@ -576,6 +468,22 @@ freebsd*)	LIBS="-lm $LIBS"
 		if test "$rb_cv_lib_xpg4_needed" = yes; then
 			AC_CHECK_LIB(xpg4, setlocale)
 		fi
+		if test "$with_libc_r" = yes; then
+			AC_CACHE_CHECK([whether libc_r is supplementary to libc],
+			  rb_cv_supplementary_lib_c_r,
+			  [AC_TRY_CPP([
+#include <osreldate.h>
+#if 500016 <= __FreeBSD_version
+#error libc_r is supplementary to libc
+#endif
+			   ],
+			   rb_cv_supplementary_lib_c_r=no,
+			   rb_cv_supplementary_lib_c_r=yes,
+			   rb_cv_supplementary_lib_c_r=yes)])
+			if test "$rb_cv_supplementary_lib_c_r" = yes; then
+			   MAINLIBS="-lc_r $MAINLIBS"
+			fi
+		fi
 		;;
 dragonfly*)	LIBS="-lm $LIBS"
 		;;
@@ -583,12 +491,16 @@ 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"
+              ;;
 *) 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
-AC_CHECK_LIB(socket, socketpair)	# SunOS/Solaris
 AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
 
 case "$target_cpu" in
@@ -605,8 +517,8 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.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 xti.h netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.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, [
@@ -627,73 +539,9 @@ AC_CHECK_SIZEOF(rlim_t, 0, [
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
-AC_CHECK_SIZEOF(size_t, 0)
-AC_CHECK_SIZEOF(ptrdiff_t, $ac_cv_sizeof_size_t)
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
 AC_STRUCT_ST_RDEV
-AC_CHECK_MEMBERS([struct stat.st_atim])
-AC_CHECK_MEMBERS([struct stat.st_atimespec])
-AC_CHECK_MEMBERS([struct stat.st_atimensec])
-AC_CHECK_MEMBERS([struct stat.st_mtim])
-AC_CHECK_MEMBERS([struct stat.st_mtimespec])
-AC_CHECK_MEMBERS([struct stat.st_mtimensec])
-AC_CHECK_MEMBERS([struct stat.st_ctim])
-AC_CHECK_MEMBERS([struct stat.st_ctimespec])
-AC_CHECK_MEMBERS([struct stat.st_ctimensec])
-
-AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@include <time.h>
-@%:@endif])
-
-AC_CHECK_TYPE(fd_mask, [AC_DEFINE(HAVE_RB_FD_INIT, 1)])
-
-dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
-AC_DEFUN([RUBY_DEFINT], [dnl
-AC_CACHE_CHECK([for $1], [rb_cv_type_$1],
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])
-typedef $1 t; int s = sizeof(t) == 42;])],
-   [rb_cv_type_$1=yes],
-   [case m4_bmatch([$2], [^[1-9][0-9]*$], $2, [$ac_cv_sizeof_]AS_TR_SH($2)) in
-    "1") rb_cv_type_$1="m4_if([$3], [], [signed ], [$3 ])char";;
-    "$ac_cv_sizeof_short") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])short";;
-    "$ac_cv_sizeof_int") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int";;
-    "$ac_cv_sizeof_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long";;
-    "$ac_cv_sizeof_long_long") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long";;
-    "$ac_cv_sizeof___int64") rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64";;
-    *) rb_cv_type_$1=no;;
-    esac])])
-if test "${rb_cv_type_$1}" != no; then
-    AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
-    test "${rb_cv_type_$1}" = yes || AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
-fi
-])
-
-RUBY_DEFINT(int8_t, 1)
-RUBY_DEFINT(uint8_t, 1, unsigned)
-RUBY_DEFINT(int16_t, 2)
-RUBY_DEFINT(uint16_t, 2, unsigned)
-RUBY_DEFINT(int32_t, 4)
-RUBY_DEFINT(uint32_t, 4, unsigned)
-RUBY_DEFINT(int64_t, 8)
-RUBY_DEFINT(uint64_t, 8, unsigned)
-RUBY_DEFINT(int128_t, 16)
-RUBY_DEFINT(uint128_t, 16, unsigned)
-RUBY_DEFINT(intptr_t, void*)
-RUBY_DEFINT(uintptr_t, void*, unsigned)
-RUBY_DEFINT(ssize_t, size_t)	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
-
-AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
-[rb_cv_stack_end_address=no
-for addr in __libc_stack_end _SEND; do
-  AC_TRY_LINK(
-    [extern void *$addr;],
-    [if (!$addr) return 1;],
-    [rb_cv_stack_end_address="$addr"; break])
-done])
-if test $rb_cv_stack_end_address != no; then
-  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
-fi
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
@@ -710,11 +558,13 @@ powerpc-darwin*)
   ;;
 esac
 AC_FUNC_MEMCMP
+AC_FUNC_FSEEKO
+AC_CHECK_FUNCS(ftello)
 
 # http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
 # Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
 # Debian GNU/Linux Lenny's libc6.1 2.7-10 has no problem.
-AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_broken_glibc_ia64_erfc,
+AC_CACHE_CHECK(for broken erfc of glibc-2.3.6 on IA64, rb_cv_broken_glibc_ia64_erfc,
   [AC_TRY_RUN([
 #include <math.h>
 int
@@ -724,29 +574,26 @@ main()
    return 0;
 }
 ],
-	rb_broken_glibc_ia64_erfc=no,
-	rb_broken_glibc_ia64_erfc=yes,
-	rb_broken_glibc_ia64_erfc=no)])
-case $rb_broken_glibc_ia64_erfc in
+	rb_cv_broken_glibc_ia64_erfc=no,
+	rb_cv_broken_glibc_ia64_erfc=yes,
+	rb_cv_broken_glibc_ia64_erfc=no)])
+case $rb_cv_broken_glibc_ia64_erfc in
   yes) ac_cv_func_erf=no;;
 esac
 
-AC_REPLACE_FUNCS(dup2 memmove strerror strftime\
-		 strchr strstr crypt flock vsnprintf\
-		 isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
-                 strlcpy strlcat)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd eaccess\
-	      truncate ftruncate chsize times utimes utimensat fcntl lockf lstat\
-	      link symlink readlink\
-	      setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
-	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
-	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
-	      getpriority getrlimit setrlimit sysconf group_member\
-	      dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp vsnprintf snprintf\
-	      setsid telldir seekdir fchmod cosh sinh tanh log2 round signbit\
-	      setuid setgid daemon select_large_fdset setenv unsetenv\
-              mktime timegm clock_gettime gettimeofday\
-              pread sendfile)
+AC_REPLACE_FUNCS(dup2 memmove 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 ftruncate 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 sigsetjmp _setjmp _longjmp setsid telldir seekdir fchmod\
+	      mktime timegm gettimeofday\
+	      cosh sinh tanh round setuid setgid setenv unsetenv)
 
 AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
 [AC_TRY_LINK([@%:@include <setjmp.h>
@@ -1044,6 +891,69 @@ else
   fi
 fi
 
+AC_DEFUN([RUBY_CHECK_IO_NEED],
+[AC_CACHE_CHECK(whether need to [$1], [$2],
+    [AC_TRY_RUN([
+#include <stdio.h>
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
+#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
+#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
+
+char *fn = "conftest.dat";
+char *wombat = "wombat\n";
+char *koara = "koara\n";
+char *kangaroo = "kangaroo\n";
+
+int main()
+{
+    char buf[BUFSIZ];
+    FILE *f;
+    int r = 1;
+
+    if (!(f = fopen(fn, "w+"))) return 1;
+    fputs(wombat, f);
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    reset_rw(f);
+    fputs(koara, f);
+    fputs(kangaroo, f);
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    reset_rw(f);
+    fputc('X', f);
+    reset_rw(f);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    do_seek(f, SEEK_SET);
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
+    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
+    r = 0;
+  fail:
+    fclose(f);
+    unlink(fn);
+    return r;
+}
+], [$2]=no, [$2]=yes, [$2]=[$3])])])
+RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
+if test "$rb_cv_need_io_seek_between_rw" = yes; then
+  AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
+fi
+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>
@@ -1098,7 +1008,7 @@ int main()
 AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
 
 if test x"$enable_pthread" = xyes; then
-    for pthread_lib in thr pthread pthreads c c_r; do
+    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
@@ -1134,74 +1044,19 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then
     fi
 fi
 
-if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
-    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
-	[AC_TRY_RUN([
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-void *
-thread_func(void *dmy)
-{
-    return dmy;
-}
-
-int
-use_threads(void)
-{
-    pthread_t tid;
-    if (pthread_create(&tid, 0, thread_func, 0) != 0) {
-	return -1;
-    }
-    if (pthread_join(tid, 0) != 0) {
-	return -1;
-    }
-    return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
-    pid_t pid;
-    if (use_threads()) return EXIT_FAILURE;
-    pid = fork();
-
-    if (pid) {
-	int loc;
-	sleep(1);
-	if (waitpid(pid, &loc, WNOHANG) == 0) {
-	    kill(pid, SIGKILL);
-	    return EXIT_FAILURE;
-	}
-    }
-    else {
-	if (use_threads()) return EXIT_FAILURE;
-    }
-
-    return EXIT_SUCCESS;
-}],
-	rb_cv_fork_with_pthread=yes,
-	rb_cv_fork_with_pthread=no,
-	rb_cv_fork_with_pthread=yes)])
-    test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
-fi
-
-AC_CHECK_FUNCS(backtrace)
-
-AC_ARG_WITH(valgrind,
-        [  --with-valgrind         enable valgrind memcheck support.],
-        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+dnl default value for $KANJI
+DEFAULT_KCODE="KCODE_NONE"
+
+AC_ARG_WITH(default-kcode, 
+	[  --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
+	[case $withval in
+	utf8) DEFAULT_KCODE="KCODE_UTF8";;
+	euc)  DEFAULT_KCODE="KCODE_EUC";;
+	sjis) DEFAULT_KCODE="KCODE_SJIS";;
+	none) DEFAULT_KCODE="KCODE_NONE";;
+        *)    AC_MSG_WARN($withval is not valid kcode; ignored);;
+	esac])
+AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
 
 dnl wheather use dln_a_out or not
 AC_ARG_WITH(dln-a-out, 
@@ -1253,7 +1108,6 @@ AC_SUBST(ARCH_FLAG)dnl
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
 AC_SUBST(LDSHARED)dnl
-AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
@@ -1371,11 +1225,11 @@ if test "$with_dln_a_out" != yes; then
 			LDSHARED="$LDSHARED ${linker_flag}-G"
 			DLDFLAGS='-eInit_$(TARGET)'
 			XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
-			: ${ARCHFILE="ruby.imp"}
+                        : ${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 ;;
+                        : ${LIBPATHENV=SHLIB_PATH}
+                        rb_cv_dlopen=yes ;;
 	human*)		: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
 			: ${LDFLAGS=''}
@@ -1398,7 +1252,7 @@ if test "$with_dln_a_out" != yes; then
 			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
 			rb_cv_dlopen=yes;;
 	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000"
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
 			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
 			: ${LIBPATHENV=""}
 			rb_cv_dlopen=yes ;;
@@ -1411,22 +1265,6 @@ if test "$with_dln_a_out" != yes; then
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
 fi
-if test "${LDSHAREDXX}" = ""; then
-    case "${LDSHARED}" in
-	*'$(CC)'*)
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
-	    ;;
-	*'${CC}'*)
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
-	    ;;
-	*$CC*)
-	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
-	    ;;
-	ld" "*)
-	    ;;
-    esac
-fi
-
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
@@ -1463,12 +1301,11 @@ if test "$dln_a_out_works" = yes; then
 else
   case "$target_os" in
     hpux*)	DLEXT=sl;;
-    nextstep*)	DLEXT=bundle;;
-    openstep*)	DLEXT=bundle;;
-    rhapsody*)	DLEXT=bundle;;
-    darwin*)	DLEXT=bundle;;
+    nextstep*|openstep*|rhapsody*|darwin*)
+		DLEXT=bundle;;
     os2-emx*)	DLEXT=dll;;
-    cygwin*|mingw*)	DLEXT=so;;
+    cygwin*|mingw*)
+		DLEXT=so DLEXT2=dll;;
     *)		DLEXT=so;;
   esac
 fi
@@ -1478,7 +1315,6 @@ n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
 AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
 test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
-AC_SUBST(DLEXT)
 
 AC_SUBST(STRIP)dnl
 if test "$with_dln_a_out" = yes; then
@@ -1595,7 +1431,7 @@ fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
 AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
+AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1711,19 +1547,16 @@ AC_SUBST(ARCHFILE)
 dnl build rdoc index if requested
 RDOCTARGET=""
 AC_ARG_ENABLE(install-doc,
-       [  --disable-install-doc    do not install rdoc indexes during install ],
-       [install_doc=$enableval], [install_doc=yes])
+       [  --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)
 
-if test "$rb_with_pthread" = "yes"; then
-    THREAD_MODEL=pthread
-fi
-MINIDLNOBJ=dln.o
 case "$target_os" in
     linux*)
+	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
 	;;
     netbsd*)
     	CFLAGS="$CFLAGS -pipe"
@@ -1744,7 +1577,7 @@ case "$target_os" in
 	;;
     darwin*)
     	CFLAGS="$CFLAGS -pipe -fno-common"
-        MINIDLNOBJ=dmydln.o
+	MINIOBJS=dmydln.o
 	;;
     os2-emx)
     	CFLAGS="$CFLAGS -DOS2 -Zmts"
@@ -1776,37 +1609,35 @@ case "$target_os" in
 	esac
 	;;
     cygwin*|mingw*)
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
 	case "$target_os" in
 	cygwin*)
 	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}${TEENY}.dll
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
+		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
 	    fi
 	    ;;
 	mingw*)
-	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}${TEENY}
+	    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_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+		LIBRUBY='lib$(LIBRUBY_SO).a'
 	    fi
 	    AC_LIBOBJ([win32])
 	    COMMON_LIBS=m
 #	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    COMMON_HEADERS="winsock2.h windows.h"
-	    THREAD_MODEL=win32
+	    COMMON_HEADERS="windows.h winsock.h"
 	    ;;
 	esac
+	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
 	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xyes; then
-	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
-	else
+	if test x"$enable_shared" = xno; then
 	    LIBRUBY_SO=dummy
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-        MINIDLNOBJ=dmydln.o
+	MINIOBJS=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1815,28 +1646,23 @@ case "$target_os" in
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
-        MINIDLNOBJ=dmydln.o
+	MINIOBJS=dmydln.o
 	;;
     *)
 	;;
 esac
-MINIOBJS="$MINIDLNOBJ"
 
 case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
 esac
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
+test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[][|.*]/\\&/g'`
-CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
-cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[][|.*]/\\&/g'`
-CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
 AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl
 AC_SUBST(optflags)dnl
 AC_SUBST(debugflags)dnl
-AC_SUBST(warnflags)dnl
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
@@ -1861,7 +1687,6 @@ AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
 AC_SUBST(MINIOBJS)
-AC_SUBST(THREAD_MODEL)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
@@ -1884,56 +1709,49 @@ case "$target_os" in
 esac
 RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
 
-AC_ARG_WITH(ruby-version,
-	    [  --with-ruby-version=STR ruby version string for version specific directories [[full]] (full|minor|STR)],
-            [ruby_version=$withval],
-            [ruby_version=full])
-case "$ruby_version" in
-  full)
-    ruby_version="${MAJOR}.${MINOR}.${TEENY}"
-    ;;
-  minor)
-    ruby_version="${MAJOR}.${MINOR}"
-    ;;
-esac
-
 AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
             [sitedir=$withval],
             [sitedir='${libdir}/ruby/site_ruby'])
 SITE_DIR=`eval echo \\"${sitedir}\\"`
 
-AC_ARG_WITH(vendordir,
-	    [  --with-vendordir=DIR    vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
-            [vendordir=$withval],
-            [vendordir='${libdir}/ruby/vendor_ruby'])
-VENDOR_DIR=`eval echo \\"${vendordir}\\"`
-
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
     ;;
   *)
     RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
     ;;
 esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${ruby_version}"
-RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${ruby_version}"
-RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${ruby_version}"
+RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
 
 AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+
+AC_ARG_WITH(vendordir,
+	    [  --with-vendordir=DIR    vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
+            [vendordir=$withval],
+            [vendordir='${libdir}/ruby/vendor_ruby'])
+VENDOR_DIR=`eval echo \\"${vendordir}\\"`
+case "$target_os" in
+  cygwin*|mingw*|*djgpp*|os2-emx*)
+    RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
+    ;;
+  *)
+    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
+    ;;
+esac
+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
+
 AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
 AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
 
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
-AC_SUBST(ruby_version)dnl
 AC_SUBST(sitedir)dnl
 AC_SUBST(vendordir)dnl
 
@@ -1972,25 +1790,6 @@ if test "$search_path" != ""; then
     AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
 fi
 
-AC_ARG_WITH(rubyhdrdir,
-	    [  --with-ruby-hdrdir=DIR  core headers in DIR [INCLUDEDIR]],
-	    [rubyhdrdir=$withval],
-	    [rubyhdrdir='${includedir}/ruby-${ruby_version}'])
-
-AC_ARG_WITH(sitehdrdir,
-	    [  --with-site-hdrdir=DIR  core headers in DIR [INCLUDEDIR]],
-	    [sitehdrdir=$withval],
-	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
-
-AC_ARG_WITH(vendorhdrdir,
-	    [  --with-vendor-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
-	    [vendorhdrdir=$withval],
-	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
-
-AC_SUBST(rubyhdrdir)dnl
-AC_SUBST(sitehdrdir)dnl
-AC_SUBST(vendorhdrdir)dnl
-
 AC_ARG_WITH(mantype,
 		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
 		[
@@ -2013,25 +1812,15 @@ if test -z "$MANTYPE"; then
 fi
 AC_SUBST(MANTYPE)
 
-arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
-$MAKEDIRS "${arch_hdrdir}"
-config_h="${arch_hdrdir}/config.h"
-if test -f "${config_h}" && tr -d '\015' < confdefs.h | cmp -s "${config_h}" -; then
+if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
   echo "config.h unchanged"
 else
   echo "creating config.h"
-  tr -d '\015' < confdefs.h > "${config_h}"
+  tr -d '\015' < confdefs.h > config.h
 fi
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 
-BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ 	]*=/{' \
-	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
-	-e '}' "${srcdir}/enc/Makefile.in"`"]
-BUILTIN_ENCOBJS=
-for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
-AC_SUBST(BUILTIN_ENCOBJS)
-
 AC_CONFIG_FILES($FIRSTMAKEFILE)
 AC_CONFIG_FILES(Makefile, [{
 	sed '/^MISSING/s/\$U\././g' Makefile
diff --git a/cont.c b/cont.c
deleted file mode 100644
index ad2c358264..0000000000
--- a/cont.c
+++ /dev/null
@@ -1,780 +0,0 @@
-/**********************************************************************
-
-  cont.c - 
-
-  $Author$
-  created at: Thu May 23 09:03:43 2007
-
-  Copyright (C) 2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "vm_core.h"
-#include "gc.h"
-#include "eval_intern.h"
-
-enum context_type {
-    CONTINUATION_CONTEXT = 0,
-    FIBER_CONTEXT = 1,
-    ROOT_FIBER_CONTEXT = 2
-};
-
-typedef struct rb_context_struct {
-    VALUE self;
-    VALUE value;
-    VALUE *vm_stack;
-    VALUE *machine_stack;
-    VALUE *machine_stack_src;
-#ifdef __ia64
-    VALUE *machine_register_stack;
-    VALUE *machine_register_stack_src;
-    int machine_register_stack_size;
-#endif
-    rb_thread_t saved_thread;
-    rb_jmpbuf_t jmpbuf;
-    int machine_stack_size;
-    VALUE prev;
-    int alive;
-    enum context_type type;
-} rb_context_t;
-
-static VALUE rb_cContinuation;
-static VALUE rb_cFiber;
-static VALUE rb_eFiberError;
-
-#define GetContPtr(obj, ptr)  \
-  Data_Get_Struct(obj, rb_context_t, ptr)
-
-NOINLINE(static VALUE cont_capture(volatile int *stat));
-
-void rb_thread_mark(rb_thread_t *th);
-
-static void
-cont_mark(void *ptr)
-{
-    RUBY_MARK_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	rb_gc_mark(cont->value);
-	rb_gc_mark(cont->prev);
-	rb_thread_mark(&cont->saved_thread);
-
-	if (cont->vm_stack) {
-	    rb_gc_mark_locations(cont->vm_stack,
-				 cont->vm_stack + cont->saved_thread.stack_size);
-	}
-
-	if (cont->machine_stack) {
-	    rb_gc_mark_locations(cont->machine_stack,
-				 cont->machine_stack + cont->machine_stack_size);
-	}
-#ifdef __ia64
-	if (cont->machine_register_stack) {
-	    rb_gc_mark_locations(cont->machine_register_stack,
-				 cont->machine_register_stack + cont->machine_register_stack_size);
-	}
-#endif
-    }
-    RUBY_MARK_LEAVE("cont");
-}
-
-static void
-cont_free(void *ptr)
-{
-    RUBY_FREE_ENTER("cont");
-    if (ptr) {
-	rb_context_t *cont = ptr;
-	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack);
-	RUBY_FREE_UNLESS_NULL(cont->machine_stack);
-#ifdef __ia64
-	RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
-#endif
-	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
-
-	if (cont->type == FIBER_CONTEXT) {
-	    st_free_table(cont->saved_thread.local_storage);
-	}
-
-	ruby_xfree(ptr);
-    }
-    RUBY_FREE_LEAVE("cont");
-}
-
-static void
-cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
-{
-    int size;
-    rb_thread_t *sth = &cont->saved_thread;
-
-    SET_MACHINE_STACK_END(&th->machine_stack_end);
-#ifdef __ia64
-    th->machine_register_stack_end = rb_ia64_bsp();
-#endif
-
-    if (th->machine_stack_start > th->machine_stack_end) {
-	size = cont->machine_stack_size = th->machine_stack_start - th->machine_stack_end;
-	cont->machine_stack_src = th->machine_stack_end;
-    }
-    else {
-	size = cont->machine_stack_size = th->machine_stack_end - th->machine_stack_start;
-	cont->machine_stack_src = th->machine_stack_start;
-    }
-
-    if (cont->machine_stack) {
-	REALLOC_N(cont->machine_stack, VALUE, size);
-    }
-    else {
-	cont->machine_stack = ALLOC_N(VALUE, size);
-    }
-
-    FLUSH_REGISTER_WINDOWS;
-    MEMCPY(cont->machine_stack, cont->machine_stack_src, VALUE, size);
-
-#ifdef __ia64
-    rb_ia64_flushrs();
-    size = cont->machine_register_stack_size = th->machine_register_stack_end - th->machine_register_stack_start;
-    cont->machine_register_stack_src = th->machine_register_stack_start;
-    if (cont->machine_register_stack) {
-	REALLOC_N(cont->machine_register_stack, VALUE, size);
-    }
-    else {
-	cont->machine_register_stack = ALLOC_N(VALUE, size);
-    }
-
-    MEMCPY(cont->machine_register_stack, cont->machine_register_stack_src, VALUE, size);
-#endif
-
-    sth->machine_stack_start = sth->machine_stack_end = 0;
-#ifdef __ia64
-    sth->machine_register_stack_start = sth->machine_register_stack_end = 0;
-#endif
-}
-
-static rb_context_t *
-cont_new(VALUE klass)
-{
-    rb_context_t *cont;
-    volatile VALUE contval;
-    rb_thread_t *th = GET_THREAD();
-
-    contval = Data_Make_Struct(klass, rb_context_t, cont_mark, cont_free, cont);
-
-    cont->self = contval;
-    cont->alive = Qtrue;
-
-    /* save thread context */
-    cont->saved_thread = *th;
-
-    return cont;
-}
-
-void vm_stack_to_heap(rb_thread_t *th);
-
-static VALUE
-cont_capture(volatile int *stat)
-{
-    rb_context_t *cont;
-    rb_thread_t *th = GET_THREAD(), *sth;
-    volatile VALUE contval;
-
-    vm_stack_to_heap(th);
-    cont = cont_new(rb_cContinuation);
-    contval = cont->self;
-    sth = &cont->saved_thread;
-
-    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
-    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
-    sth->stack = 0;
-
-    cont_save_machine_stack(th, cont);
-
-    if (ruby_setjmp(cont->jmpbuf)) {
-	VALUE value;
-
-	value = cont->value;
-	cont->value = Qnil;
-	*stat = 1;
-	return value;
-    }
-    else {
-	*stat = 0;
-	return cont->self;
-    }
-}
-
-NORETURN(static void cont_restore_1(rb_context_t *));
-
-static void
-cont_restore_1(rb_context_t *cont)
-{
-    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
-
-    /* restore thread context */
-    if (cont->type == CONTINUATION_CONTEXT) {
-	/* continuation */
-	VALUE fib;
-
-	th->fiber = sth->fiber;
-	fib = th->fiber ? th->fiber : th->root_fiber;
-
-	if (fib) {
-	    rb_context_t *fcont;
-	    GetContPtr(fib, fcont);
-	    th->stack_size = fcont->saved_thread.stack_size;
-	    th->stack = fcont->saved_thread.stack;
-	}
-	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
-    }
-    else {
-	/* fiber */
-	th->stack = sth->stack;
-	th->stack_size = sth->stack_size;
-	th->local_storage = sth->local_storage;
-	th->fiber = cont->self;
-    }
-
-    th->cfp = sth->cfp;
-    th->safe_level = sth->safe_level;
-    th->raised_flag = sth->raised_flag;
-    th->state = sth->state;
-    th->status = sth->status;
-    th->tag = sth->tag;
-    th->trap_tag = sth->trap_tag;
-    th->errinfo = sth->errinfo;
-    th->first_proc = sth->first_proc;
-
-    /* restore machine stack */
-#ifdef _M_AMD64
-    {
-	/* workaround for x64 SEH */
-	jmp_buf buf;
-	setjmp(buf);
-	((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
-	    ((_JUMP_BUFFER*)(&buf))->Frame;
-    }
-#endif
-    if (cont->machine_stack_src) {
-	FLUSH_REGISTER_WINDOWS;
-	MEMCPY(cont->machine_stack_src, cont->machine_stack,
-	       VALUE, cont->machine_stack_size);
-    }
-
-#ifdef __ia64
-    if (cont->machine_register_stack_src) {
-	MEMCPY(cont->machine_register_stack_src, cont->machine_register_stack,
-	       VALUE, cont->machine_register_stack_size);
-    }
-#endif
-
-    ruby_longjmp(cont->jmpbuf, 1);
-}
-
-NORETURN(NOINLINE(static void cont_restore_0(rb_context_t *, VALUE *)));
-
-#ifdef __ia64
-#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
-#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
-static volatile int C(a), C(b), C(c), C(d), C(e);
-static volatile int C(f), C(g), C(h), C(i), C(j);
-static volatile int C(k), C(l), C(m), C(n), C(o);
-static volatile int C(p), C(q), C(r), C(s), C(t);
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *)));
-static void
-register_stack_extend(rb_context_t *cont, VALUE *curr_bsp)
-{
-    if (rb_dummy_false) {
-        /* use registers as much as possible */
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-        E(a) = E(b) = E(c) = E(d) = E(e) =
-        E(f) = E(g) = E(h) = E(i) = E(j) =
-        E(k) = E(l) = E(m) = E(n) = E(o) =
-        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
-    }
-    if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
-        register_stack_extend(cont, (VALUE*)rb_ia64_bsp());
-    }
-    cont_restore_1(cont);
-}
-#undef C
-#undef E
-#endif
-
-static void
-cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
-{
-    if (cont->machine_stack_src) {
-#define STACK_PAD_SIZE 1024
-	VALUE space[STACK_PAD_SIZE];
-
-#if STACK_GROW_DIRECTION < 0 /* downward */
-	if (addr_in_prev_frame > cont->machine_stack_src) {
-	    cont_restore_0(cont, &space[0]);
-	}
-#elif STACK_GROW_DIRECTION > 0 /* upward */
-	if (addr_in_prev_frame < cont->machine_stack_src + cont->machine_stack_size) {
-	    cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
-	}
-#else
-	if (addr_in_prev_frame > &space[0]) {
-	    /* Stack grows downward */
-	    if (addr_in_prev_frame > cont->machine_stack_src) {
-		cont_restore_0(cont, &space[0]);
-	    }
-	}
-	else {
-	    /* Stack grows upward */
-	    if (addr_in_prev_frame < cont->machine_stack_src + cont->machine_stack_size) {
-		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
-	    }
-	}
-#endif
-    }
-#ifdef __ia64
-    register_stack_extend(cont, (VALUE*)rb_ia64_bsp());
-#else
-    cont_restore_1(cont);
-#endif
-}
-
-/*
- *  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
- */
-
-/*
- *  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_callcc(VALUE self)
-{
-    volatile int called;
-    volatile VALUE val = cont_capture(&called);
-
-    if (called) {
-	return val;
-    }
-    else {
-	return rb_yield(val);
-    }
-}
-
-static VALUE
-make_passing_arg(int argc, VALUE *argv)
-{
-    switch(argc) {
-      case 0:
-	return Qnil;
-      case 1:
-	return argv[0];
-      default:
-	return rb_ary_new4(argc, argv);
-    }
-}
-
-/*
- *  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(int argc, VALUE *argv, VALUE contval)
-{
-    rb_context_t *cont;
-    rb_thread_t *th = GET_THREAD();
-    GetContPtr(contval, cont);
-
-    if (cont->saved_thread.self != th->self) {
-	rb_raise(rb_eRuntimeError, "continuation called across threads");
-    }
-    if (cont->saved_thread.trap_tag != th->trap_tag) {
-	rb_raise(rb_eRuntimeError, "continuation called across trap");
-    }
-    if (cont->saved_thread.fiber) {
-	rb_context_t *fcont;
-	GetContPtr(cont->saved_thread.fiber, fcont);
-
-	if (th->fiber != cont->saved_thread.fiber) {
-	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
-	}
-	
-	if (!fcont->alive) {
-	    rb_raise(rb_eRuntimeError, "continuation called dead fiber");
-	}
-    }
-
-    cont->value = make_passing_arg(argc, argv);
-
-    cont_restore_0(cont, &contval);
-    return Qnil; /* unreachable */
-}
-
-/*********/
-/* fiber */
-/*********/
-
-#define FIBER_VM_STACK_SIZE (4 * 1024)
-
-static rb_context_t *
-fiber_alloc(VALUE klass)
-{
-    rb_context_t *cont = cont_new(klass);
-
-    cont->type = FIBER_CONTEXT;
-    cont->prev = Qnil;
-
-    return cont;
-}
-
-static VALUE
-fiber_new(VALUE klass, VALUE proc)
-{
-    rb_context_t *cont = fiber_alloc(klass);
-    VALUE contval = cont->self;
-    rb_thread_t *th = &cont->saved_thread;
-
-    /* initialize */
-    cont->vm_stack = 0;
-
-    th->stack = 0;
-    th->stack_size = FIBER_VM_STACK_SIZE;
-    th->stack = ALLOC_N(VALUE, th->stack_size);
-
-    th->cfp = (void *)(th->stack + th->stack_size);
-    th->cfp--;
-    th->cfp->pc = 0;
-    th->cfp->sp = th->stack + 1;
-    th->cfp->bp = 0;
-    th->cfp->lfp = th->stack;
-    *th->cfp->lfp = 0;
-    th->cfp->dfp = th->stack;
-    th->cfp->self = Qnil;
-    th->cfp->flag = 0;
-    th->cfp->iseq = 0;
-    th->cfp->proc = 0;
-    th->cfp->block_iseq = 0;
-    th->tag = 0;
-    th->local_storage = st_init_numtable();
-
-    th->first_proc = proc;
-
-    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
-
-    return contval;
-}
-
-VALUE
-rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
-{
-    return fiber_new(rb_cFiber, rb_proc_new(func, obj));
-}
-
-static VALUE
-rb_fiber_s_new(VALUE self)
-{
-    return fiber_new(self, rb_block_proc());
-}
-
-static VALUE
-return_fiber(void)
-{
-    rb_context_t *cont;
-    VALUE curr = rb_fiber_current();
-    GetContPtr(curr, cont);
-
-    if (cont->prev == Qnil) {
-	rb_thread_t *th = GET_THREAD();
-
-	if (th->root_fiber != curr) {
-	    return th->root_fiber;
-	}
-	else {
-	    rb_raise(rb_eFiberError, "can't yield from root fiber");
-	}
-    }
-    else {
-	VALUE prev = cont->prev;
-	cont->prev = Qnil;
-	return prev;
-    }
-}
-
-VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
-
-static void
-rb_fiber_terminate(rb_context_t *cont)
-{
-    VALUE value = cont->value;
-    cont->alive = Qfalse;
-    rb_fiber_transfer(return_fiber(), 1, &value);
-}
-
-void
-rb_fiber_start(void)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_context_t *cont;
-    rb_proc_t *proc;
-    VALUE args;
-    int state;
-
-    GetContPtr(th->fiber, cont);
-    TH_PUSH_TAG(th);
-    if ((state = EXEC_TAG()) == 0) {
-	GetProcPtr(cont->saved_thread.first_proc, proc);
-	args = cont->value;
-	cont->value = Qnil;
-	th->errinfo = Qnil;
-	th->local_lfp = proc->block.lfp;
-	th->local_svar = Qnil;
-
-	cont->value = vm_invoke_proc(th, proc, proc->block.self, 1, &args, 0);
-    }
-    TH_POP_TAG();
-
-    if (state) {
-	if (TAG_RAISE) {
-	    th->thrown_errinfo = th->errinfo;
-	}
-	else {
-	    th->thrown_errinfo =
-	      vm_make_jump_tag_but_local_jump(state, th->errinfo);
-	}
-	RUBY_VM_SET_INTERRUPT(th);
-    }
-
-    rb_fiber_terminate(cont);
-    rb_bug("rb_fiber_start: unreachable");
-}
-
-VALUE
-rb_fiber_current()
-{
-    rb_thread_t *th = GET_THREAD();
-    if (th->fiber == 0) {
-	/* save root */
-	rb_context_t *cont = fiber_alloc(rb_cFiber);
-	cont->type = ROOT_FIBER_CONTEXT;
-	th->root_fiber = th->fiber = cont->self;
-    }
-    return th->fiber;
-}
-
-static VALUE
-fiber_store(rb_context_t *next_cont)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_context_t *cont;
-
-    if (th->fiber) {
-	GetContPtr(th->fiber, cont);
-	cont->saved_thread = *th;
-    }
-    else {
-	/* create current fiber */
-	cont = fiber_alloc(rb_cFiber); /* no need to allocate vm stack */
-	cont->type = ROOT_FIBER_CONTEXT;
-	th->root_fiber = th->fiber = cont->self;
-    }
-
-    cont_save_machine_stack(th, cont);
-
-    if (ruby_setjmp(cont->jmpbuf)) {
-	/* restored */
-	GetContPtr(th->fiber, cont);
-	return cont->value;
-    }
-    else {
-	return Qundef;
-    }
-}
-
-static inline VALUE
-fiber_switch(VALUE fib, int argc, VALUE *argv, int is_resume)
-{
-    VALUE value;
-    rb_context_t *cont;
-    rb_thread_t *th = GET_THREAD();
-
-    GetContPtr(fib, cont);
-
-    if (cont->saved_thread.self != th->self) {
-	rb_raise(rb_eFiberError, "fiber called across threads");
-    }
-    else if (cont->saved_thread.trap_tag != th->trap_tag) {
-	rb_raise(rb_eFiberError, "fiber called across trap");
-    }
-    else if (!cont->alive) {
-	rb_raise(rb_eFiberError, "dead fiber called");
-    }
-
-    if (is_resume) {
-	cont->prev = rb_fiber_current();
-    }
-
-    cont->value = make_passing_arg(argc, argv);
-
-    if ((value = fiber_store(cont)) == Qundef) {
-	cont_restore_0(cont, &value);
-	rb_bug("rb_fiber_resume: unreachable");
-    }
-
-    RUBY_VM_CHECK_INTS();
-
-    return value;
-}
-
-VALUE
-rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
-{
-    return fiber_switch(fib, argc, argv, 0);
-}
-
-VALUE
-rb_fiber_resume(VALUE fib, int argc, VALUE *argv)
-{
-    rb_context_t *cont;
-    GetContPtr(fib, cont);
-
-    if (cont->prev != Qnil) {
-	rb_raise(rb_eFiberError, "double resume");
-    }
-
-    return fiber_switch(fib, argc, argv, 1);
-}
-
-VALUE
-rb_fiber_yield(int argc, VALUE *argv)
-{
-    return rb_fiber_transfer(return_fiber(), argc, argv);
-}
-
-VALUE
-rb_fiber_alive_p(VALUE fib)
-{
-    rb_context_t *cont;
-    GetContPtr(fib, cont);
-    return cont->alive;
-}
-
-static VALUE
-rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
-{
-    return rb_fiber_resume(fib, argc, argv);
-}
-
-static VALUE
-rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fib)
-{
-    return rb_fiber_transfer(fib, argc, argv);
-}
-
-static VALUE
-rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
-{
-    return rb_fiber_yield(argc, argv);
-}
-
-static VALUE
-rb_fiber_s_current(VALUE klass)
-{
-    return rb_fiber_current();
-}
-
-void
-Init_Cont(void)
-{
-    rb_cFiber = rb_define_class("Fiber", rb_cObject);
-    rb_undef_alloc_func(rb_cFiber);
-    rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
-    rb_define_singleton_method(rb_cFiber, "new", rb_fiber_s_new, 0);
-    rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
-    rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
-}
-
-void
-Init_Continuation_body(void)
-{
-    rb_cContinuation = rb_define_class("Continuation", rb_cObject);
-    rb_undef_alloc_func(rb_cContinuation);
-    rb_undef_method(CLASS_OF(rb_cContinuation), "new");
-    rb_define_method(rb_cContinuation, "call", rb_cont_call, -1);
-    rb_define_method(rb_cContinuation, "[]", rb_cont_call, -1);
-    rb_define_global_function("callcc", rb_callcc, 0);
-}
-
-void
-Init_Fiber_as_Coroutine(void)
-{
-    rb_define_method(rb_cFiber, "transfer", rb_fiber_m_transfer, -1);
-    rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
-    rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
-}
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 7995f31cd3..03208df11c 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -26,9 +26,8 @@ endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
-RUBYDEF = $(RUBY_SO_NAME).def
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
@@ -61,21 +60,13 @@ $(RUBY_EXP): $(LIBRUBY_A)
 GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 
 ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32.h
-
-$(LIBRUBY_SO): $(RUBYDEF)
-
-$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
-
-clean-local::
-	@$(RM) $(RUBYDEF)
+$(OBJS) $(MAINOBJ): win32/win32.h
 endif
 
 ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A)
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
 	@NM@ --extern --defined $(LIBRUBY_A) | \
-	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
+	  $(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
diff --git a/debug.c b/debug.c
deleted file mode 100644
index 44b95118c8..0000000000
--- a/debug.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/**********************************************************************
-
-  debug.c -
-
-  $Author$
-  created at: 04/08/25 02:31:54 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-#include "ruby/util.h"
-#include "debug.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-
-/* for gdb */
-static const union {
-    enum ruby_special_consts    special_consts;
-    enum ruby_value_type        value_type;
-    enum ruby_tag_type          tag_type;
-    enum node_type              node_type;
-    enum {
-        RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
-        RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
-        RUBY_ENCODING_MASK  = ENCODING_MASK,
-        RUBY_ENC_CODERANGE_MASK    = ENC_CODERANGE_MASK,
-        RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
-        RUBY_ENC_CODERANGE_7BIT    = ENC_CODERANGE_7BIT,
-        RUBY_ENC_CODERANGE_VALID   = ENC_CODERANGE_VALID,
-        RUBY_ENC_CODERANGE_BROKEN  = ENC_CODERANGE_BROKEN, 
-        RUBY_FL_MARK        = FL_MARK,
-        RUBY_FL_RESERVED    = FL_RESERVED,
-        RUBY_FL_FINALIZE    = FL_FINALIZE,
-        RUBY_FL_TAINT       = FL_TAINT,
-        RUBY_FL_EXIVAR      = FL_EXIVAR,
-        RUBY_FL_FREEZE      = FL_FREEZE,
-        RUBY_FL_SINGLETON   = FL_SINGLETON,
-        RUBY_FL_USER0       = FL_USER0,
-        RUBY_FL_USER1       = FL_USER1,
-        RUBY_FL_USER2       = FL_USER2,
-        RUBY_FL_USER3       = FL_USER3,
-        RUBY_FL_USER4       = FL_USER4,
-        RUBY_FL_USER5       = FL_USER5,
-        RUBY_FL_USER6       = FL_USER6,
-        RUBY_FL_USER7       = FL_USER7,
-        RUBY_FL_USER8       = FL_USER8,
-        RUBY_FL_USER9       = FL_USER9,
-        RUBY_FL_USER10      = FL_USER10,
-        RUBY_FL_USER11      = FL_USER11,
-        RUBY_FL_USER12      = FL_USER12,
-        RUBY_FL_USER13      = FL_USER13,
-        RUBY_FL_USER14      = FL_USER14,
-        RUBY_FL_USER15      = FL_USER15,
-        RUBY_FL_USER16      = FL_USER16,
-        RUBY_FL_USER17      = FL_USER17,
-        RUBY_FL_USER18      = FL_USER18,
-        RUBY_FL_USER19      = FL_USER19,
-        RUBY_FL_USHIFT      = FL_USHIFT,
-        RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
-        RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
-        RUBY_NODE_LSHIFT    = NODE_LSHIFT,
-        RUBY_NODE_LMASK     = NODE_LMASK,
-        RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
-    } various;
-} dummy_gdb_enums;
-
-const VALUE RUBY_FL_USER20    = FL_USER20;
-
-int
-ruby_debug_print_indent(int level, int debug_level, int indent_level)
-{
-    if (level < debug_level) {
-	fprintf(stderr, "%*s", indent_level, "");
-	fflush(stderr);
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
-void
-ruby_debug_printf(const char *format, ...)
-{
-    va_list ap;
-    va_start(ap, format);
-    vfprintf(stderr, format, ap);
-    va_end(ap);
-}
-
-VALUE
-ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
-{
-    if (level < debug_level) {
-	VALUE str;
-	str = rb_inspect(obj);
-	fprintf(stderr, "DBG> %s: %s\n", header,
-		obj == -1 ? "" : StringValueCStr(str));
-	fflush(stderr);
-    }
-    return obj;
-}
-
-void
-ruby_debug_print_v(VALUE v)
-{
-    ruby_debug_print_value(0, 1, "", v);
-}
-
-ID
-ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
-{
-    if (level < debug_level) {
-	fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
-	fflush(stderr);
-    }
-    return id;
-}
-
-NODE *
-ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
-{
-    if (level < debug_level) {
-	fprintf(stderr, "DBG> %s: %s (%lu)\n", header,
-		ruby_node_name(nd_type(node)), nd_line(node));
-    }
-    return (NODE *)node;
-}
-
-void
-ruby_debug_breakpoint(void)
-{
-    /* */
-}
-
-#ifdef RUBY_DEBUG_ENV
-static void
-set_debug_option(const char *str, int len, void *arg)
-{
-#define SET_WHEN(name, var) do {	    \
-	if (len == sizeof(name) - 1 &&	    \
-	    strncmp(str, name, len) == 0) { \
-	    extern int var;	    \
-	    var = 1;		    \
-	    return;			    \
-	}				    \
-    } while (0)
-    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
-    SET_WHEN("core", ruby_enable_coredump);
-    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
-}
-
-void
-ruby_set_debug_option(const char *str)
-{
-    ruby_each_words(str, set_debug_option, 0);
-}
-#endif
diff --git a/debug.h b/debug.h
deleted file mode 100644
index 5c4b19a78b..0000000000
--- a/debug.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**********************************************************************
-
-  debug.h - YARV Debug function interface
-
-  $Author$
-  created at: 04/08/25 02:33:49 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_DEBUG_H
-#define RUBY_DEBUG_H
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-
-#define dpv(h,v) ruby_debug_print_value(-1, 0, h, v)
-#define dp(v)    ruby_debug_print_value(-1, 0, "", v)
-#define dpi(i)   ruby_debug_print_id(-1, 0, "", i)
-#define dpn(n)   ruby_debug_print_node(-1, 0, "", n)
-
-#define bp()     ruby_debug_breakpoint()
-
-VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE v);
-ID    ruby_debug_print_id(int level, int debug_level, const char *header, ID id);
-NODE *ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node);
-int   ruby_debug_print_indent(int level, int debug_level, int indent_level);
-void  ruby_debug_breakpoint(void);
-void  ruby_debug_gc_check_func(void);
-
-#endif /* RUBY_DEBUG_H */
diff --git a/defines.h b/defines.h
new file mode 100644
index 0000000000..f39097fea4
--- /dev/null
+++ b/defines.h
@@ -0,0 +1,273 @@
+/************************************************
+
+  defines.h -
+
+  $Author$
+  $Date$
+  created at: Wed May 18 00:21:44 JST 1994
+
+************************************************/
+#ifndef DEFINES_H
+#define DEFINES_H
+
+#define RUBY
+
+#ifdef __cplusplus
+# ifndef  HAVE_PROTOTYPES
+#  define HAVE_PROTOTYPES 1
+# endif
+# ifndef  HAVE_STDARG_PROTOTYPES
+#  define HAVE_STDARG_PROTOTYPES 1
+# endif
+#endif
+
+#undef _
+#ifdef HAVE_PROTOTYPES
+# define _(args) args
+#else
+# define _(args) ()
+#endif
+
+#undef __
+#ifdef HAVE_STDARG_PROTOTYPES
+# define __(args) args
+#else
+# define __(args) ()
+#endif
+
+#ifdef __cplusplus
+#define ANYARGS ...
+#else
+#define ANYARGS
+#endif
+
+#define xmalloc ruby_xmalloc
+#define xcalloc ruby_xcalloc
+#define xrealloc ruby_xrealloc
+#define xfree ruby_xfree
+
+void *xmalloc _((long));
+void *xcalloc _((long,long));
+void *xrealloc _((void*,long));
+void xfree _((void*));
+
+#if SIZEOF_LONG_LONG > 0
+# define LONG_LONG long long
+#elif SIZEOF___INT64 > 0
+# define HAVE_LONG_LONG 1
+# define LONG_LONG __int64
+# undef SIZEOF_LONG_LONG
+# define SIZEOF_LONG_LONG SIZEOF___INT64
+#endif
+
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned LONG_LONG
+# define BDIGIT_DBL_SIGNED LONG_LONG
+#elif SIZEOF_INT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned int
+# define SIZEOF_BDIGITS SIZEOF_INT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS SIZEOF_SHORT
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#else
+# define BDIGIT unsigned short
+# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
+# define BDIGIT_DBL unsigned long
+# define BDIGIT_DBL_SIGNED long
+#endif
+
+#ifdef __CYGWIN__
+#undef _WIN32
+#endif
+
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
+#define DOSISH 1
+#ifndef _WIN32_WCE
+# define DOSISH_DRIVE_LETTER
+#endif
+#endif
+
+/* define RUBY_USE_EUC/SJIS for default kanji-code */
+#ifndef DEFAULT_KCODE
+#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
+#define DEFAULT_KCODE KCODE_SJIS
+#else
+#define DEFAULT_KCODE KCODE_EUC
+#endif
+#endif
+
+#if defined(__NeXT__) || defined(__APPLE__)
+/* 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
+#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
+#ifndef __APPLE__
+/* NextStep, OpenStep (but not Rhapsody) */
+#ifndef GETPGRP_VOID
+#define GETPGRP_VOID 1
+#endif
+#ifndef WNOHANG
+#define WNOHANG 01
+#endif
+#ifndef WUNTRACED
+#define WUNTRACED 02
+#endif
+#ifndef X_OK
+#define X_OK 1
+#endif
+#endif /* __APPLE__ */
+#endif /* NeXT */
+
+#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 */
+#endif
+
+#ifdef RUBY_EXPORT
+#undef RUBY_EXTERN
+#endif
+
+#ifndef RUBY_EXTERN
+#define RUBY_EXTERN extern
+#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 */
+#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")
+# 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 *rb_ia64_bsp(void);
+void rb_ia64_flushrs(void);
+#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
+#else
+#  define FLUSH_REGISTER_WINDOWS ((void)0)
+#endif
+
+#if defined(DOSISH)
+#define PATH_SEP ";"
+#elif defined(riscos)
+#define PATH_SEP ","
+#else
+#define PATH_SEP ":"
+#endif
+#define PATH_SEP_CHAR PATH_SEP[0]
+
+#if defined(__human68k__)
+#define PATH_ENV "path"
+#else
+#define PATH_ENV "PATH"
+#endif
+
+#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
+#define ENV_IGNORECASE
+#endif
+
+#ifndef CASEFOLD_FILESYSTEM
+# if defined DOSISH || defined __VMS
+#   define CASEFOLD_FILESYSTEM 1
+# else
+#   define CASEFOLD_FILESYSTEM 0
+# endif
+#endif
+
+#ifndef DLEXT_MAXLEN
+#define DLEXT_MAXLEN 4
+#endif
+
+#ifndef RUBY_PLATFORM
+#define RUBY_PLATFORM "unknown-unknown"
+#endif
+
+#endif
diff --git a/dir.c b/dir.c
index ecc0bd5e30..c2c3f9452f 100644
--- a/dir.c
+++ b/dir.c
@@ -3,16 +3,16 @@
   dir.c -
 
   $Author$
+  $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,17 +56,25 @@ char *getenv();
 #endif
 
 #ifndef HAVE_STRING_H
-char *strchr(char*,char);
+char *strchr _((char*,char));
 #endif
 
 #include <ctype.h>
 
-#include "ruby/util.h"
+#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
+#endif
+
 #define FNM_NOESCAPE	0x01
 #define FNM_PATHNAME	0x02
 #define FNM_DOTMATCH	0x04
@@ -80,38 +88,97 @@ char *strchr(char*,char);
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
 
-# define Next(p, e, enc) (p + rb_enc_mbclen(p, e, enc))
-# define Inc(p, e, enc) ((p) = Next(p, e, enc))
+#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
+#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
 
+/* caution: in case *p == '\0'
+   Next(p) == p + 1 in single byte environment
+   Next(p) == p     in multi byte environment
+*/
+#if defined(CharNext)
+# define Next(p) CharNext(p)
+#elif defined(DJGPP)
+# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#elif defined(__EMX__)
+# define Next(p) ((p) + emx_mblen(p))
+static inline int
+emx_mblen(const char *p)
+{
+    int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
+    return (n < 0) ? 1 : n;
+}
+#endif
+
+#ifndef Next /* single byte environment */
+# define Next(p) ((p) + 1)
+# define Inc(p) (++(p))
+# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
+#else /* multi byte environment */
+# define Inc(p) ((p) = Next(p))
+# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
 static int
-char_casecmp(const char *p1, const char *p2, rb_encoding *enc, const int nocase)
+CompareImpl(const char *p1, const char *p2, int nocase)
 {
-    const char *p1end, *p2end;
-    int c1, c2;
-
-    if (!*p1) return *p1;
-    if (!*p2) return -*p2;
-    p1end = p1 + strlen(p1);
-    p2end = p2 + strlen(p2);
-    c1 = rb_enc_codepoint(p1, p1end, enc);
-    c2 = rb_enc_codepoint(p2, p2end, enc);
-
-    if (c1 == c2) return 0;
-    if (nocase) {
-	c1 = rb_enc_toupper(c1, enc);
-	c2 = rb_enc_toupper(c2, enc);
+    const int len1 = Next(p1) - p1;
+    const int len2 = Next(p2) - p2;
+#ifdef _WIN32
+    char buf1[10], buf2[10]; /* large enough? */
+#endif
+
+    if (len1 < 0 || len2 < 0) {
+	rb_fatal("CompareImpl: negative len");
     }
-    return c1 - c2;
+
+    if (len1 == 0) return  len2;
+    if (len2 == 0) return -len1;
+
+#ifdef _WIN32
+    if (nocase && rb_w32_iswinnt()) {
+	if (len1 > 1) {
+	    if (len1 >= sizeof(buf1)) {
+		rb_fatal("CompareImpl: too large len");
+	    }
+	    memcpy(buf1, p1, len1);
+	    buf1[len1] = '\0';
+	    CharLower(buf1);
+	    p1 = buf1; /* trick */
+	}
+	if (len2 > 1) {
+	    if (len2 >= sizeof(buf2)) {
+		rb_fatal("CompareImpl: too large len");
+	    }
+	    memcpy(buf2, p2, len2);
+	    buf2[len2] = '\0';
+	    CharLower(buf2);
+	    p2 = buf2; /* trick */
+	}
+    }
+#endif
+    if (len1 == 1)
+	if (len2 == 1)
+	    return compare(downcase(*p1), downcase(*p2));
+	else {
+	    const int ret = compare(downcase(*p1), *p2);
+	    return ret ? ret : -1;
+	}
+    else
+	if (len2 == 1) {
+	    const int ret = compare(*p1, downcase(*p2));
+	    return ret ? ret : 1;
+	}
+	else {
+	    const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
+	    return ret ? ret : len1 - len2;
+	}
 }
+#endif /* environment */
 
 static char *
-bracket(
-    const char *p, /* pattern (next to '[') */
-    const char *s, /* string */
-    int flags,
-    rb_encoding *enc)
+bracket(p, s, flags)
+    const char *p; /* pattern (next to '[') */
+    const char *s; /* string */
+    int flags;
 {
-    const char *pend = p + strlen(p);
     const int nocase = flags & FNM_CASEFOLD;
     const int escape = !(flags & FNM_NOESCAPE);
 
@@ -128,19 +195,19 @@ bracket(
 	    t1++;
 	if (!*t1)
 	    return NULL;
-	p = Next(t1, pend, enc);
+	p = Next(t1);
 	if (p[0] == '-' && p[1] != ']') {
 	    const char *t2 = p + 1;
 	    if (escape && *t2 == '\\')
 		t2++;
 	    if (!*t2)
 		return NULL;
-	    p = Next(t2, pend, enc);
-	    if (!ok && char_casecmp(t1, s, enc, nocase) <= 0 && char_casecmp(s, t2, enc, nocase) <= 0)
+	    p = Next(t2);
+	    if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
 		ok = 1;
 	}
 	else
-	    if (!ok && char_casecmp(t1, s, enc, nocase) == 0)
+	    if (!ok && Compare(t1, s) == 0)
 		ok = 1;
     }
 
@@ -157,11 +224,10 @@ bracket(
 #define RETURN(val) return *pcur = p, *scur = s, (val);
 
 static int
-fnmatch_helper(
-    const char **pcur, /* pattern */
-    const char **scur, /* string */
-    int flags,
-    rb_encoding *enc)
+fnmatch_helper(pcur, scur, flags)
+    const char **pcur; /* pattern */
+    const char **scur; /* string */
+    int flags;
 {
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
@@ -172,9 +238,7 @@ fnmatch_helper(
     const char *stmp = 0;
 
     const char *p = *pcur;
-    const char *pend = p + strlen(p);
     const char *s = *scur;
-    const char *send = s + strlen(s);
 
     if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
 	RETURN(FNM_NOMATCH);
@@ -197,16 +261,16 @@ fnmatch_helper(
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
 	    p++;
-	    Inc(s, send, enc);
+	    Inc(s);
 	    continue;
 
 	  case '[': {
 	    const char *t;
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
-	    if ((t = bracket(p + 1, s, flags, enc)) != 0) {
+	    if ((t = bracket(p + 1, s, flags)) != 0) {
 		p = t;
-		Inc(s, send, enc);
+		Inc(s);
 		continue;
 	    }
 	    goto failed;
@@ -219,16 +283,16 @@ fnmatch_helper(
 	    RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
 	if (ISEND(p))
 	    goto failed;
-	if (char_casecmp(p, s, enc, nocase) != 0)
+	if (Compare(p, s) != 0)
 	    goto failed;
-	Inc(p, pend, enc);
-	Inc(s, send, enc);
+	Inc(p);
+	Inc(s);
 	continue;
 
       failed: /* try next '*' position */
 	if (ptmp && stmp) {
 	    p = ptmp;
-	    Inc(stmp, send, enc); /* !ISEND(*stmp) */
+	    Inc(stmp); /* !ISEND(*stmp) */
 	    s = stmp;
 	    continue;
 	}
@@ -237,15 +301,11 @@ fnmatch_helper(
 }
 
 static int
-fnmatch(
-    const char *pattern,
-    rb_encoding *enc,
-    const char *string,
-    int flags)
+fnmatch(p, s, flags)
+    const char *p; /* pattern */
+    const char *s; /* string */
+    int flags;
 {
-    const char *p = pattern;
-    const char *s = string;
-    const char *send = s + strlen(string);
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
 
@@ -259,8 +319,8 @@ fnmatch(
 		ptmp = p;
 		stmp = s;
 	    }
-	    if (fnmatch_helper(&p, &s, flags, enc) == 0) {
-		while (*s && *s != '/') Inc(s, send, enc);
+	    if (fnmatch_helper(&p, &s, flags) == 0) {
+		while (*s && *s != '/') Inc(s);
 		if (*p && *s) {
 		    p++;
 		    s++;
@@ -271,7 +331,7 @@ fnmatch(
 	    }
 	    /* failed : try next recursion */
 	    if (ptmp && stmp && !(period && *stmp == '.')) {
-		while (*stmp && *stmp != '/') Inc(stmp, send, enc);
+		while (*stmp && *stmp != '/') Inc(stmp);
 		if (*stmp) {
 		    p = ptmp;
 		    stmp++;
@@ -283,7 +343,7 @@ fnmatch(
 	}
     }
     else
-	return fnmatch_helper(&p, &s, flags, enc);
+	return fnmatch_helper(&p, &s, flags);
 }
 
 VALUE rb_cDir;
@@ -291,32 +351,31 @@ VALUE rb_cDir;
 struct dir_data {
     DIR *dir;
     char *path;
-    rb_encoding *intenc;
-    rb_encoding *extenc;
 };
 
 static void
-free_dir(struct dir_data *dir)
+free_dir(dir)
+    struct dir_data *dir;
 {
     if (dir) {
 	if (dir->dir) closedir(dir->dir);
-	if (dir->path) xfree(dir->path);
+	if (dir->path) free(dir->path);
     }
-    xfree(dir);
+    free(dir);
 }
 
-static VALUE dir_close(VALUE);
+static VALUE dir_close _((VALUE));
 
+static VALUE dir_s_alloc _((VALUE));
 static VALUE
-dir_s_alloc(VALUE klass)
+dir_s_alloc(klass)
+    VALUE klass;
 {
     struct dir_data *dirp;
     VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
 
     dirp->dir = NULL;
     dirp->path = NULL;
-    dirp->intenc = NULL;
-    dirp->extenc = NULL;
 
     return obj;
 }
@@ -328,82 +387,28 @@ dir_s_alloc(VALUE klass)
  *  Returns a new directory object for the named directory.
  */
 static VALUE
-dir_initialize(int argc, VALUE *argv, VALUE dir)
+dir_initialize(dir, dirname)
+    VALUE dir, dirname;
 {
     struct dir_data *dp;
-    static rb_encoding *fs_encoding;
-    rb_encoding  *intencoding, *extencoding;
-    VALUE dirname, opt;
-    static VALUE sym_intenc, sym_extenc;
-
-    if (!sym_intenc) {
-	sym_intenc = ID2SYM(rb_intern("internal_encoding"));
-	sym_extenc = ID2SYM(rb_intern("external_encoding"));
-	fs_encoding = rb_filesystem_encoding();
-    }
-
-    intencoding = NULL;
-    extencoding = fs_encoding;
-    rb_scan_args(argc, argv, "11", &dirname, &opt);
-
-    if (!NIL_P(opt)) {
-        VALUE v, extenc=Qnil, intenc=Qnil;
-        opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
-
-        v = rb_hash_aref(opt, sym_intenc);
-        if (!NIL_P(v)) intenc = v;
-        v = rb_hash_aref(opt, sym_extenc);
-        if (!NIL_P(v)) extenc = v;
-
-	if (!NIL_P(extenc)) {
-	    extencoding = rb_to_encoding(extenc);
-	    if (!NIL_P(intenc)) {
-		intencoding = rb_to_encoding(intenc);
-		if (extencoding == intencoding) {
-		    rb_warn("Ignoring internal encoding '%s': it is identical to external encoding '%s'",
-			    RSTRING_PTR(rb_inspect(intenc)),
-			    RSTRING_PTR(rb_inspect(extenc)));
-		    intencoding = NULL;
-		}
-	    }
-	}
-	else if (!NIL_P(intenc)) {
-	    rb_raise(rb_eArgError, "External encoding must be specified when internal encoding is given");
-	}
-    }
-
-    FilePathValue(dirname);
-    {
-	rb_encoding  *dirname_encoding = rb_enc_get(dirname);
-	if (rb_usascii_encoding() != dirname_encoding
-	    && rb_ascii8bit_encoding() != dirname_encoding
-#if defined __APPLE__
-	    && rb_utf8_encoding() != dirname_encoding
-#endif
-	    && extencoding != dirname_encoding) {
-	    if (!intencoding) intencoding = dirname_encoding;
-	    dirname = rb_str_transcode(dirname, rb_enc_from_encoding(extencoding));
-	}
-    }
 
+    SafeStringValue(dirname);
     Data_Get_Struct(dir, struct dir_data, dp);
     if (dp->dir) closedir(dp->dir);
-    if (dp->path) xfree(dp->path);
+    if (dp->path) free(dp->path);
     dp->dir = NULL;
     dp->path = NULL;
-    dp->intenc = intencoding;
-    dp->extenc = extencoding;
-    dp->dir = opendir(RSTRING_PTR(dirname));
+    dp->dir = opendir(RSTRING(dirname)->ptr);
     if (dp->dir == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    dp->dir = opendir(RSTRING_PTR(dirname));
+	    dp->dir = opendir(RSTRING(dirname)->ptr);
 	}
 	if (dp->dir == NULL) {
-	    rb_sys_fail(RSTRING_PTR(dirname));
+	    rb_sys_fail(RSTRING(dirname)->ptr);
 	}
     }
-    dp->path = strdup(RSTRING_PTR(dirname));
+    dp->path = strdup(RSTRING(dirname)->ptr);
 
     return dir;
 }
@@ -419,13 +424,15 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
  *  the block, and <code>Dir::open</code> returns the value of the
  *  block.
  */
+
 static VALUE
-dir_s_open(int argc, VALUE *argv, VALUE klass)
+dir_s_open(klass, dirname)
+    VALUE klass, dirname;
 {
     struct dir_data *dp;
     VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
 
-    dir_initialize(argc, argv, dir);
+    dir_initialize(dir, dirname);
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, dir, dir_close, dir);
     }
@@ -434,13 +441,14 @@ dir_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 static void
-dir_closed(void)
+dir_closed()
 {
     rb_raise(rb_eIOError, "closed directory");
 }
 
 static void
-dir_check(VALUE dir)
+dir_check(dir)
+    VALUE dir;
 {
     if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
@@ -453,16 +461,6 @@ dir_check(VALUE dir)
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
 
-static VALUE
-dir_enc_str(VALUE str, struct dir_data *dirp)
-{
-    rb_enc_associate(str, dirp->extenc);
-    if (dirp->intenc) {
-        str = rb_str_transcode(str, rb_enc_from_encoding(dirp->intenc));
-    }
-    return str;
-}
-
 /*
  *  call-seq:
  *     dir.inspect => string
@@ -470,14 +468,18 @@ dir_enc_str(VALUE str, struct dir_data *dirp)
  *  Return a string describing this Dir object.
  */
 static VALUE
-dir_inspect(VALUE dir)
+dir_inspect(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
 
     Data_Get_Struct(dir, struct dir_data, dirp);
     if (dirp->path) {
 	const char *c = rb_obj_classname(dir);
-	return rb_sprintf("#<%s:%s>", c, dirp->path);
+	int len = strlen(c) + strlen(dirp->path) + 4;
+	VALUE s = rb_str_new(0, len);
+	snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
+	return s;
     }
     return rb_funcall(dir, rb_intern("to_s"), 0, 0);
 }
@@ -492,13 +494,14 @@ dir_inspect(VALUE dir)
  *     d.path   #=> ".."
  */
 static VALUE
-dir_path(VALUE dir)
+dir_path(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
 
     Data_Get_Struct(dir, struct dir_data, dirp);
     if (!dirp->path) return Qnil;
-    return dir_enc_str(rb_str_new2(dirp->path), dirp);
+    return rb_str_new2(dirp->path);
 }
 
 /*
@@ -514,7 +517,8 @@ dir_path(VALUE dir)
  *     d.read   #=> "config.h"
  */
 static VALUE
-dir_read(VALUE dir)
+dir_read(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
     struct dirent *dp;
@@ -523,7 +527,7 @@ dir_read(VALUE dir)
     errno = 0;
     dp = readdir(dirp->dir);
     if (dp) {
-	return dir_enc_str(rb_tainted_str_new(dp->d_name, NAMLEN(dp)), dirp);
+	return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
     }
     else if (errno == 0) {	/* end of stream */
 	return Qnil;
@@ -552,7 +556,8 @@ dir_read(VALUE dir)
  *     Got main.rb
  */
 static VALUE
-dir_each(VALUE dir)
+dir_each(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
     struct dirent *dp;
@@ -561,7 +566,7 @@ dir_each(VALUE dir)
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
     for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
-	rb_yield(dir_enc_str(rb_tainted_str_new(dp->d_name, NAMLEN(dp)), dirp));
+	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
@@ -581,7 +586,8 @@ dir_each(VALUE dir)
  *     d.tell   #=> 12
  */
 static VALUE
-dir_tell(VALUE dir)
+dir_tell(dir)
+    VALUE dir;
 {
 #ifdef HAVE_TELLDIR
     struct dir_data *dirp;
@@ -610,7 +616,8 @@ dir_tell(VALUE dir)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_seek(VALUE dir, VALUE pos)
+dir_seek(dir, pos)
+    VALUE dir, pos;
 {
     struct dir_data *dirp;
     off_t p = NUM2OFFT(pos);
@@ -639,7 +646,8 @@ dir_seek(VALUE dir, VALUE pos)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_set_pos(VALUE dir, VALUE pos)
+dir_set_pos(dir, pos)
+    VALUE dir, pos;
 {
     dir_seek(dir, pos);
     return pos;
@@ -657,7 +665,8 @@ dir_set_pos(VALUE dir, VALUE pos)
  *     d.read     #=> "."
  */
 static VALUE
-dir_rewind(VALUE dir)
+dir_rewind(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
 
@@ -680,7 +689,8 @@ dir_rewind(VALUE dir)
  *     d.close   #=> nil
  */
 static VALUE
-dir_close(VALUE dir)
+dir_close(dir)
+    VALUE dir;
 {
     struct dir_data *dirp;
 
@@ -692,10 +702,11 @@ dir_close(VALUE dir)
 }
 
 static void
-dir_chdir(VALUE path)
+dir_chdir(path)
+    VALUE path;
 {
-    if (chdir(RSTRING_PTR(path)) < 0)
-	rb_sys_fail(RSTRING_PTR(path));
+    if (chdir(RSTRING(path)->ptr) < 0)
+	rb_sys_fail(RSTRING(path)->ptr);
 }
 
 static int chdir_blocking = 0;
@@ -707,7 +718,8 @@ struct chdir_data {
 };
 
 static VALUE
-chdir_yield(struct chdir_data *args)
+chdir_yield(args)
+    struct chdir_data *args;
 {
     dir_chdir(args->new_path);
     args->done = Qtrue;
@@ -718,7 +730,8 @@ chdir_yield(struct chdir_data *args)
 }
 
 static VALUE
-chdir_restore(struct chdir_data *args)
+chdir_restore(args)
+    struct chdir_data *args;
 {
     if (args->done) {
 	chdir_blocking--;
@@ -769,13 +782,16 @@ chdir_restore(struct chdir_data *args)
  *     /var/spool/mail
  */
 static VALUE
-dir_s_chdir(int argc, VALUE *argv, VALUE obj)
+dir_s_chdir(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE path = Qnil;
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
-	FilePathValue(path);
+	SafeStringValue(path);
     }
     else {
 	const char *dist = getenv("HOME");
@@ -795,7 +811,7 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 	struct chdir_data args;
 	char *cwd = my_getcwd();
 
-	args.old_path = rb_tainted_str_new2(cwd); xfree(cwd);
+	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);
@@ -817,7 +833,8 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
  *     Dir.getwd           #=> "/tmp"
  */
 static VALUE
-dir_s_getwd(VALUE dir)
+dir_s_getwd(dir)
+    VALUE dir;
 {
     char *path;
     VALUE cwd;
@@ -826,18 +843,20 @@ dir_s_getwd(VALUE dir)
     path = my_getcwd();
     cwd = rb_tainted_str_new2(path);
 
-    xfree(path);
+    free(path);
     return cwd;
 }
 
+static void check_dirname _((volatile VALUE *));
 static void
-check_dirname(volatile VALUE *dir)
+check_dirname(dir)
+    volatile VALUE *dir;
 {
     char *path, *pend;
 
+    SafeStringValue(*dir);
     rb_secure(2);
-    FilePathValue(*dir);
-    path = RSTRING_PTR(*dir);
+    path = RSTRING(*dir)->ptr;
     if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
 	*dir = rb_str_new(path, pend - path);
     }
@@ -853,13 +872,14 @@ check_dirname(volatile VALUE *dir)
  *  information.
  */
 static VALUE
-dir_s_chroot(VALUE dir, VALUE path)
+dir_s_chroot(dir, path)
+    VALUE dir, path;
 {
 #if defined(HAVE_CHROOT) && !defined(__CHECKER__)
     check_dirname(&path);
 
-    if (chroot(RSTRING_PTR(path)) == -1)
-	rb_sys_fail(RSTRING_PTR(path));
+    if (chroot(RSTRING(path)->ptr) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
 
     return INT2FIX(0);
 #else
@@ -882,7 +902,10 @@ dir_s_chroot(VALUE dir, VALUE path)
  *
  */
 static VALUE
-dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
+dir_s_mkdir(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE path, vmode;
     int mode;
@@ -895,8 +918,8 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
     }
 
     check_dirname(&path);
-    if (mkdir(RSTRING_PTR(path), mode) == -1)
-	rb_sys_fail(RSTRING_PTR(path));
+    if (mkdir(RSTRING(path)->ptr, mode) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
 
     return INT2FIX(0);
 }
@@ -911,28 +934,29 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
  *  <code>SystemCallError</code> if the directory isn't empty.
  */
 static VALUE
-dir_s_rmdir(VALUE obj, VALUE dir)
+dir_s_rmdir(obj, dir)
+    VALUE obj, dir;
 {
     check_dirname(&dir);
-    if (rmdir(RSTRING_PTR(dir)) < 0)
-	rb_sys_fail(RSTRING_PTR(dir));
+    if (rmdir(RSTRING(dir)->ptr) < 0)
+	rb_sys_fail(RSTRING(dir)->ptr);
 
     return INT2FIX(0);
 }
 
 static void
-sys_warning_1(const char* mesg)
+sys_warning_1(mesg)
+    const char* mesg;
 {
     rb_sys_warning("%s", mesg);
 }
 
 #define GLOB_VERBOSE	(1UL << (sizeof(int) * CHAR_BIT - 1))
 #define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)(VALUE))sys_warning_1, (VALUE)(val), 0))
+    (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_FREE(ptr) free(ptr)
 #define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
 
 /*
@@ -975,13 +999,14 @@ do_opendir(const char *path, int flags)
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
-has_magic(const char *s, int flags, rb_encoding *enc)
+has_magic(s, flags)
+    const char *s;
+    int flags;
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const int nocase = flags & FNM_CASEFOLD;
 
     register const char *p = s;
-    register const char *pend = p + strlen(p);
     register char c;
 
     while ((c = *p++) != 0) {
@@ -1001,7 +1026,7 @@ has_magic(const char *s, int flags, rb_encoding *enc)
 		return 1;
 	}
 
-	p = Next(p-1, pend, enc);
+	p = Next(p-1);
     }
 
     return 0;
@@ -1009,12 +1034,11 @@ has_magic(const char *s, int flags, rb_encoding *enc)
 
 /* Find separator in globbing pattern. */
 static char *
-find_dirsep(const char *s, int flags, rb_encoding *enc)
+find_dirsep(const char *s, int flags)
 {
     const int escape = !(flags & FNM_NOESCAPE);
 
     register const char *p = s;
-    register const char *pend = p + strlen(p);
     register char c;
     int open = 0;
 
@@ -1038,7 +1062,7 @@ find_dirsep(const char *s, int flags, rb_encoding *enc)
 	    continue;
 	}
 
-	p = Next(p-1, pend, enc);
+	p = Next(p-1);
     }
 
     return (char *)p-1;
@@ -1046,9 +1070,9 @@ find_dirsep(const char *s, int flags, rb_encoding *enc)
 
 /* Remove escaping backslashes */
 static void
-remove_backslashes(char *p, rb_encoding *enc)
+remove_backslashes(p)
+    char *p;
 {
-    register const char *pend = p + strlen(p);
     char *t = p;
     char *s = p;
 
@@ -1060,7 +1084,7 @@ remove_backslashes(char *p, rb_encoding *enc)
 	    s = ++p;
 	    if (!*p) break;
 	}
-	Inc(p, pend, enc);
+	Inc(p);
     }
 
     while (*p++);
@@ -1081,7 +1105,7 @@ struct glob_pattern {
 static void glob_free_pattern(struct glob_pattern *list);
 
 static struct glob_pattern *
-glob_make_pattern(const char *p, int flags, rb_encoding *enc)
+glob_make_pattern(const char *p, int flags)
 {
     struct glob_pattern *list, *tmp, **tail = &list;
     int dirsep = 0; /* pattern is terminated with '/' */
@@ -1097,15 +1121,15 @@ glob_make_pattern(const char *p, int flags, rb_encoding *enc)
 	    dirsep = 1;
 	}
 	else {
-	    const char *m = find_dirsep(p, flags, enc);
+	    const char *m = find_dirsep(p, flags);
 	    char *buf = GLOB_ALLOC_N(char, m-p+1);
 	    if (!buf) {
-		GLOB_FREE(tmp);
+		free(tmp);
 		goto error;
 	    }
 	    memcpy(buf, p, m-p);
 	    buf[m-p] = '\0';
-	    tmp->type = has_magic(buf, flags, enc) ? MAGICAL : PLAIN;
+	    tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
 	    tmp->str = buf;
 	    if (*m) {
 		dirsep = 1;
@@ -1142,8 +1166,8 @@ glob_free_pattern(struct glob_pattern *list)
 	struct glob_pattern *tmp = list;
 	list = list->next;
 	if (tmp->str)
-	    GLOB_FREE(tmp->str);
-	GLOB_FREE(tmp);
+	    free(tmp->str);
+	free(tmp);
     }
 }
 
@@ -1165,10 +1189,6 @@ join_path(const char *path, int dirsep, const char *name)
 
 enum answer { YES, NO, UNKNOWN };
 
-#ifndef S_ISDIR
-#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
 #ifndef S_ISLNK
 #  ifndef S_IFLNK
 #    define S_ISLNK(m) (0)
@@ -1177,36 +1197,43 @@ enum answer { YES, NO, UNKNOWN };
 #  endif
 #endif
 
+#ifndef S_ISDIR
+#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#endif
+
 struct glob_args {
-    void (*func)(const char *, VALUE, void *);
-    const char *path;
-    VALUE value;
-    rb_encoding *enc;
+    void (*func) _((const char*, VALUE));
+    const char *c;
+    VALUE v;
 };
 
+static VALUE glob_func_caller _((VALUE));
+
 static VALUE
-glob_func_caller(VALUE val)
+glob_func_caller(val)
+    VALUE val;
 {
     struct glob_args *args = (struct glob_args *)val;
 
-    (*args->func)(args->path, args->value, args->enc);
+    (*args->func)(args->c, args->v);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg, enc) (*func)(path, arg, enc)
+#define glob_call_func(func, path, arg) (*func)(path, arg)
+
+static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
 
 static int
-glob_helper(
-    const char *path,
-    int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
-    enum answer exist, /* Does 'path' indicate an existing entry? */
-    enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
-    struct glob_pattern **beg,
-    struct glob_pattern **end,
-    int flags,
-    ruby_glob_func *func,
-    VALUE arg,
-    rb_encoding *enc)
+glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
+    const char *path;
+    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
+    enum answer exist; /* Does 'path' indicate an existing entry? */
+    enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
+    struct glob_pattern **beg;
+    struct glob_pattern **end;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
     struct stat st;
     int status = 0;
@@ -1221,19 +1248,19 @@ glob_helper(
 	    p = p->next;
 	}
 	switch (p->type) {
-	  case PLAIN:
+	case PLAIN:
 	    plain = 1;
 	    break;
-	  case MAGICAL:
+	case MAGICAL:
 	    magical = 1;
 	    break;
-	  case MATCH_ALL:
+	case MATCH_ALL:
 	    match_all = 1;
 	    break;
-	  case MATCH_DIR:
+	case MATCH_DIR:
 	    match_dir = 1;
 	    break;
-	  case RECURSIVE:
+	case RECURSIVE:
 	    rb_bug("continuous RECURSIVEs");
 	}
     }
@@ -1260,14 +1287,14 @@ glob_helper(
 	    }
 	}
 	if (match_all && exist == YES) {
-	    status = glob_call_func(func, path, arg, enc);
+	    status = glob_call_func(func, path, arg);
 	    if (status) return status;
 	}
 	if (match_dir && isdir == YES) {
 	    char *tmp = join_path(path, dirsep, "");
 	    if (!tmp) return -1;
-	    status = glob_call_func(func, tmp, arg, enc);
-	    GLOB_FREE(tmp);
+	    status = glob_call_func(func, tmp, arg);
+	    free(tmp);
 	    if (status) return status;
 	}
     }
@@ -1288,7 +1315,7 @@ glob_helper(
 		break;
 	    }
 	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
-		&& fnmatch("*", rb_usascii_encoding(), dp->d_name, flags) == 0) {
+		&& fnmatch("*", dp->d_name, flags) == 0) {
 #ifndef _WIN32
 		if (do_lstat(buf, &st, flags) == 0)
 		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
@@ -1301,7 +1328,6 @@ glob_helper(
 
 	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
 	    if (!new_beg) {
-		GLOB_FREE(buf);
 		status = -1;
 		break;
 	    }
@@ -1314,15 +1340,14 @@ glob_helper(
 		    p = p->next; /* 0 times recursion */
 		}
 		if (p->type == PLAIN || p->type == MAGICAL) {
-		    if (fnmatch(p->str, enc, dp->d_name, flags) == 0)
+		    if (fnmatch(p->str, dp->d_name, flags) == 0)
 			*new_end++ = p->next;
 		}
 	    }
 
-	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
-				 flags, func, arg, enc);
-	    GLOB_FREE(buf);
-	    GLOB_FREE(new_beg);
+	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
+	    free(buf);
+	    free(new_beg);
 	    if (status) break;
 	}
 
@@ -1346,45 +1371,48 @@ glob_helper(
 		    break;
 		}
 		strcpy(name, (*cur)->str);
-		if (escape) remove_backslashes(name, enc);
+		if (escape) remove_backslashes(name);
 
 		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 		if (!new_beg) {
-		    GLOB_FREE(name);
+		    free(name);
 		    status = -1;
 		    break;
 		}
 		*new_end++ = (*cur)->next;
 		for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
-		    if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
+		    if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
 			*new_end++ = (*cur2)->next;
 			*cur2 = 0;
 		    }
 		}
 
 		buf = join_path(path, dirsep, name);
-		GLOB_FREE(name);
+		free(name);
 		if (!buf) {
-		    GLOB_FREE(new_beg);
+		    free(new_beg);
 		    status = -1;
 		    break;
 		}
-		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
-				     new_end, flags, func, arg, enc);
-		GLOB_FREE(buf);
-		GLOB_FREE(new_beg);
+		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
+		free(buf);
+		free(new_beg);
 		if (status) break;
 	    }
 	}
 
-	GLOB_FREE(copy_beg);
+	free(copy_beg);
     }
 
     return status;
 }
 
 static int
-ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+ruby_glob0(path, flags, func, arg)
+    const char *path;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
     struct glob_pattern *list;
     const char *root, *start;
@@ -1406,77 +1434,90 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
     MEMCPY(buf, start, char, n);
     buf[n] = '\0';
 
-    list = glob_make_pattern(root, flags, enc);
+    list = glob_make_pattern(root, flags);
     if (!list) {
-	GLOB_FREE(buf);
+	free(buf);
 	return -1;
     }
-    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
+    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
     glob_free_pattern(list);
-    GLOB_FREE(buf);
+    free(buf);
 
     return status;
 }
 
 int
-ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
+ruby_glob(path, flags, func, arg)
+    const char *path;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
-		      rb_ascii8bit_encoding());
+    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
 }
 
+static int rb_glob_caller _((const char *, VALUE));
+
 static int
-rb_glob_caller(const char *path, VALUE a, void *enc)
+rb_glob_caller(path, a)
+    const char *path;
+    VALUE a;
 {
     int status;
     struct glob_args *args = (struct glob_args *)a;
 
-    args->path = path;
+    args->c = path;
     rb_protect(glob_func_caller, a, &status);
     return status;
 }
 
 static int
-rb_glob2(const char *path, int flags,
-	 void (*func)(const char *, VALUE, void *), VALUE arg,
-	 rb_encoding* enc)
+rb_glob2(path, flags, func, arg)
+    const char *path;
+    int flags;
+    void (*func) _((const char *, VALUE));
+    VALUE arg;
 {
     struct glob_args args;
 
     args.func = func;
-    args.value = arg;
-    args.enc = enc;
+    args.v = arg;
 
     if (flags & FNM_SYSCASE) {
 	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
     }
 
-    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
-		      enc);
+    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
 }
 
 void
-rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
+rb_glob(path, func, arg)
+    const char *path;
+    void (*func) _((const char*, VALUE));
+    VALUE arg;
 {
-    int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
+    int status = rb_glob2(path, 0, func, arg);
     if (status) GLOB_JUMP_TAG(status);
 }
 
+static void push_pattern _((const char* path, VALUE ary));
 static void
-push_pattern(const char *path, VALUE ary, void *enc)
+push_pattern(path, ary)
+    const char *path;
+    VALUE ary;
 {
-    VALUE vpath = rb_tainted_str_new2(path);
-    rb_enc_associate(vpath, enc);
-    rb_ary_push(ary, vpath);
+    rb_ary_push(ary, rb_tainted_str_new2(path));
 }
 
-static int
-ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		  rb_encoding *enc)
+int
+ruby_brace_expand(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
-    const char *pend = p + strlen(p);
     const char *s = p;
     const char *lbrace = 0, *rbrace = 0;
     int nest = 0, status = 0;
@@ -1492,7 +1533,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	if (*p == '\\' && escape) {
 	    if (!*++p) break;
 	}
-	Inc(p, pend, enc);
+	Inc(p);
     }
 
     if (lbrace && rbrace) {
@@ -1512,17 +1553,17 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 		if (*p == '\\' && escape) {
 		    if (++p == rbrace) break;
 		}
-		Inc(p, pend, enc);
+		Inc(p);
 	    }
 	    memcpy(buf+shift, t, p-t);
 	    strcpy(buf+shift+(p-t), rbrace+1);
-	    status = ruby_brace_expand(buf, flags, func, arg, enc);
+	    status = ruby_brace_expand(buf, flags, func, arg);
 	    if (status) break;
 	}
-	GLOB_FREE(buf);
+	free(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg, enc);
+	status = (*func)(s, arg);
     }
 
     return status;
@@ -1534,76 +1575,84 @@ struct brace_args {
     int flags;
 };
 
+static int glob_brace _((const char *, VALUE));
 static int
-glob_brace(const char *path, VALUE val, void *enc)
+glob_brace(path, val)
+    const char *path;
+    VALUE val;
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
+    return ruby_glob0(path, arg->flags, arg->func, arg->value);
 }
 
 static int
-ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
-		 rb_encoding* enc)
+ruby_brace_glob0(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
     struct brace_args args;
 
     args.func = func;
     args.value = arg;
     args.flags = flags;
-    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
 }
 
 int
-ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
+ruby_brace_glob(str, flags, func, arg)
+    const char *str;
+    int flags;
+    ruby_glob_func *func;
+    VALUE arg;
 {
-    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
-			    rb_ascii8bit_encoding());
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
 }
 
 static int
-push_glob(VALUE ary, VALUE str, int flags)
+push_glob(VALUE ary, const char *str, int flags)
 {
     struct glob_args args;
-    rb_encoding *enc = rb_enc_get(str);
 
     args.func = push_pattern;
-    args.value = ary;
-    args.enc = enc;
-
-    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
-			    rb_glob_caller, (VALUE)&args, enc);
+    args.v = ary;
+    return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
 }
 
 static VALUE
-rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
+rb_push_glob(str, flags) /* '\0' is delimiter */
+    VALUE str;
+    int flags;
 {
     long offset = 0;
     VALUE ary;
 
-    StringValue(str);
     ary = rb_ary_new();
+    SafeStringValue(str);
 
     while (offset < RSTRING_LEN(str)) {
+	int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
 	char *p, *pend;
-	int status;
-	p = RSTRING_PTR(str) + offset;
-	status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
-			   flags);
 	if (status) GLOB_JUMP_TAG(status);
 	if (offset >= RSTRING_LEN(str)) break;
+	p = RSTRING(str)->ptr + offset;
 	p += strlen(p) + 1;
-	pend = RSTRING_PTR(str) + RSTRING_LEN(str);
+	pend = RSTRING(str)->ptr + RSTRING_LEN(str);
 	while (p < pend && !*p)
 	    p++;
-	offset = p - RSTRING_PTR(str);
+	offset = p - RSTRING(str)->ptr;
     }
 
     return ary;
 }
 
 static VALUE
-dir_globs(long argc, VALUE *argv, int flags)
+dir_globs(argc, argv, flags)
+    long argc;
+    VALUE *argv;
+    int flags;
 {
     VALUE ary = rb_ary_new();
     long i;
@@ -1612,7 +1661,7 @@ dir_globs(long argc, VALUE *argv, int flags)
 	int status;
 	VALUE str = argv[i];
 	StringValue(str);
-	status = push_glob(ary, str, flags);
+	status = push_glob(ary, RSTRING(str)->ptr, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
 
@@ -1625,18 +1674,18 @@ dir_globs(long argc, VALUE *argv, int flags)
  *     Dir[ string [, string ...] ] => array
  *
  *  Equivalent to calling
- *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and
+ *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and 
  *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
  *
  */
 static VALUE
 dir_s_aref(int argc, VALUE *argv, VALUE obj)
-{
+ {
     if (argc == 1) {
 	return rb_push_glob(argv[0], 0);
     }
     return dir_globs(argc, argv, 0);
-}
+ }
 
 /*
  *  call-seq:
@@ -1686,20 +1735,23 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *
  *     rbfiles = File.join("**", "*.rb")
  *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                         #    "lib/song.rb",
- *                                         #    "lib/song/karaoke.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"]
+ *                                              "lib/song/karaoke.rb"]
  *
  *     librbfiles = File.join("**", "lib", "*.rb")
  *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
  */
 static VALUE
-dir_s_glob(int argc, VALUE *argv, VALUE obj)
+dir_s_glob(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE str, rflags, ary;
     int flags;
@@ -1726,9 +1778,10 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-dir_open_dir(int argc, VALUE *argv)
+dir_open_dir(path)
+    VALUE path;
 {
-    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
+    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
 
     if (TYPE(dir) != T_DATA ||
 	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
@@ -1757,12 +1810,13 @@ dir_open_dir(int argc, VALUE *argv)
  *
  */
 static VALUE
-dir_foreach(int argc, VALUE *argv, VALUE io)
+dir_foreach(io, dirname)
+    VALUE io, dirname;
 {
     VALUE dir;
 
-    RETURN_ENUMERATOR(io, argc, argv);
-    dir = dir_open_dir(argc, argv);
+    RETURN_ENUMERATOR(io, 1, &dirname);
+    dir = dir_open_dir(dirname);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
@@ -1779,11 +1833,12 @@ dir_foreach(int argc, VALUE *argv, VALUE io)
  *
  */
 static VALUE
-dir_entries(int argc, VALUE *argv, VALUE io)
+dir_entries(io, dirname)
+    VALUE io, dirname;
 {
     VALUE dir;
 
-    dir = dir_open_dir(argc, argv);
+    dir = dir_open_dir(dirname);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
@@ -1821,31 +1876,31 @@ dir_entries(int argc, VALUE *argv, VALUE io)
  *  parameters. The same glob pattern and flags are used by
  *  <code>Dir::glob</code>.
  *
- *     File.fnmatch('cat',       'cat')        #=> true  # match entire string
- *     File.fnmatch('cat',       'category')   #=> false # only match partial string
- *     File.fnmatch('c{at,ub}s', 'cats')       #=> false # { } isn't supported
+ *     File.fnmatch('cat',       'cat')        #=> true  : match entire string
+ *     File.fnmatch('cat',       'category')   #=> false : only match partial string
+ *     File.fnmatch('c{at,ub}s', 'cats')       #=> false : { } isn't supported
  *
- *     File.fnmatch('c?t',     'cat')          #=> true  # '?' match only 1 character
- *     File.fnmatch('c??t',    'cat')          #=> false # ditto
- *     File.fnmatch('c*',      'cats')         #=> true  # '*' match 0 or more characters
- *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  # ditto
- *     File.fnmatch('ca[a-z]', 'cat')          #=> true  # inclusive bracket expression
- *     File.fnmatch('ca[^t]',  'cat')          #=> false # exclusive bracket expression ('^' or '!')
+ *     File.fnmatch('c?t',     'cat')          #=> true  : '?' match only 1 character
+ *     File.fnmatch('c??t',    'cat')          #=> false : ditto
+ *     File.fnmatch('c*',      'cats')         #=> true  : '*' match 0 or more characters
+ *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  : ditto
+ *     File.fnmatch('ca[a-z]', 'cat')          #=> true  : inclusive bracket expression
+ *     File.fnmatch('ca[^t]',  'cat')          #=> false : exclusive bracket expression ('^' or '!')
  *
- *     File.fnmatch('cat', 'CAT')                     #=> false # case sensitive
- *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  # case insensitive
+ *     File.fnmatch('cat', 'CAT')                     #=> false : case sensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  : case insensitive
  *
- *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false # wildcard doesn't match '/' on FNM_PATHNAME
- *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false # ditto
- *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false # ditto
+ *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false : wildcard doesn't match '/' on FNM_PATHNAME
+ *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false : ditto
+ *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false : ditto
  *
- *     File.fnmatch('\?',   '?')                       #=> true  # escaped wildcard becomes ordinary
- *     File.fnmatch('\a',   'a')                       #=> true  # escaped ordinary remains ordinary
- *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  # FNM_NOESACPE makes '\' ordinary
- *     File.fnmatch('[\?]', '?')                       #=> true  # can escape inside bracket expression
+ *     File.fnmatch('\?',   '?')                       #=> true  : escaped wildcard becomes ordinary
+ *     File.fnmatch('\a',   'a')                       #=> true  : escaped ordinary remains ordinary
+ *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  : FNM_NOESACPE makes '\' ordinary
+ *     File.fnmatch('[\?]', '?')                       #=> true  : can escape inside bracket expression
  *
- *     File.fnmatch('*',   '.profile')                      #=> false # wildcard doesn't match leading
- *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true  # period by default.
+ *     File.fnmatch('*',   '.profile')                      #=> false : wildcard doesn't match leading
+ *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true    period by default.
  *     File.fnmatch('.*',  '.profile')                      #=> true
  *
  *     rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
@@ -1869,7 +1924,10 @@ dir_entries(int argc, VALUE *argv, VALUE io)
  *     File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
  */
 static VALUE
-file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
+file_s_fnmatch(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE pattern, path;
     VALUE rflags;
@@ -1881,10 +1939,9 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
 	flags = 0;
 
     StringValue(pattern);
-    FilePathStringValue(path);
+    StringValue(path);
 
-    if (fnmatch(RSTRING_PTR(pattern), rb_enc_get(pattern), RSTRING_PTR(path),
-		flags) == 0)
+    if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
 	return Qtrue;
 
     return Qfalse;
@@ -1902,18 +1959,18 @@ file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
  *  (<code>.</code>).
  */
 void
-Init_Dir(void)
+Init_Dir()
 {
     rb_cDir = rb_define_class("Dir", rb_cObject);
 
     rb_include_module(rb_cDir, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cDir, dir_s_alloc);
-    rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
-    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
-    rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
+    rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
+    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
+    rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
 
-    rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
+    rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
     rb_define_method(rb_cDir,"path", dir_path, 0);
     rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
@@ -1936,8 +1993,6 @@ Init_Dir(void)
 
     rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
     rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
-    rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1); /* in file.c */
-    rb_define_singleton_method(rb_cDir,"exists?", rb_file_directory_p, 1); /* in file.c */
 
     rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
     rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
diff --git a/djgpp/config.hin b/djgpp/config.hin
index f90f2ed061..8ee427c92f 100644
--- a/djgpp/config.hin
+++ b/djgpp/config.hin
@@ -106,9 +106,9 @@
 #define NEED_IO_FLUSH_BETWEEN_RW 1
 #define DEFAULT_KCODE KCODE_NONE
 #define DLEXT ".so"
-#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@.@TEENY@"
+#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@.@TEENY@"
+#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
 #define RUBY_PLATFORM "i386-msdosdjgpp"
-#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@.@TEENY@/i386-msdosdjgpp"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@.@TEENY@/i386-msdosdjgpp"
+#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
+#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/dln.c b/dln.c
index 219a22dbb8..5ba25b6415 100644
--- a/dln.c
+++ b/dln.c
@@ -3,13 +3,14 @@
   dln.c -
 
   $Author$
+  $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "dln.h"
 
 #ifdef HAVE_STDLIB_H
@@ -42,8 +43,6 @@ void *xcalloc();
 void *xrealloc();
 #endif
 
-#define free(x) xfree(x)
-
 #include <stdio.h>
 #if defined(_WIN32) || defined(__VMS)
 #include "missing/file.h"
@@ -111,7 +110,9 @@ char *getenv();
 #endif
 
 static int
-init_funcname_len(char **buf, const char *file)
+init_funcname_len(buf, file)
+    char **buf;
+    const char *file;
 {
     char *p;
     const char *slash;
@@ -183,8 +184,8 @@ static int dln_init_p = 0;
 
 #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
 
-#include "ruby/util.h"
-#include "ruby/st.h"
+#include "util.h"
+#include "st.h"
 
 static st_table *sym_tbl;
 static st_table *undef_tbl;
@@ -192,7 +193,10 @@ static st_table *undef_tbl;
 static int load_lib();
 
 static int
-load_header(int fd, struct exec *hdrp, long disp)
+load_header(fd, hdrp, disp)
+    int fd;
+    struct exec *hdrp;
+    long disp;
 {
     int size;
 
@@ -262,7 +266,10 @@ static int reloc_r_length[] = {
 #endif
 
 static struct relocation_info *
-load_reloc(int fd, struct exec *hdrp, long disp)
+load_reloc(fd, hdrp, disp)
+     int fd;
+     struct exec *hdrp;
+     long disp;
 {
     struct relocation_info *reloc;
     int size;
@@ -285,7 +292,10 @@ load_reloc(int fd, struct exec *hdrp, long disp)
 }
 
 static struct nlist *
-load_sym(int fd, struct exec *hdrp, long disp)
+load_sym(fd, hdrp, disp)
+    int fd;
+    struct exec *hdrp;
+    long disp;
 {
     struct nlist * buffer;
     struct nlist * sym;
@@ -326,7 +336,9 @@ load_sym(int fd, struct exec *hdrp, long disp)
 }
 
 static st_table *
-sym_hash(struct exec *hdrp, struct nlist *syms)
+sym_hash(hdrp, syms)
+    struct exec *hdrp;
+    struct nlist *syms;
 {
     st_table *tbl;
     struct nlist *sym = syms;
@@ -346,7 +358,8 @@ sym_hash(struct exec *hdrp, struct nlist *syms)
 }
 
 static int
-dln_init(const char *prog)
+dln_init(prog)
+    const char *prog;
 {
     char *file;
     int fd;
@@ -420,7 +433,11 @@ dln_init(const char *prog)
 }
 
 static long
-load_text_data(int fd, struct exec *hdrp, int bss, long disp)
+load_text_data(fd, hdrp, bss, disp)
+    int fd;
+    struct exec *hdrp;
+    int bss;
+    long disp;
 {
     int size;
     unsigned char* addr;
@@ -454,7 +471,8 @@ load_text_data(int fd, struct exec *hdrp, int bss, long disp)
 }
 
 static int
-undef_print(char *key, char *value)
+undef_print(key, value)
+    char *key, *value;
 {
     fprintf(stderr, "  %s\n", key);
     return ST_CONTINUE;
@@ -491,7 +509,10 @@ struct undef {
 
 static st_table *reloc_tbl = NULL;
 static void
-link_undef(const char *name, long base, struct relocation_info *reloc)
+link_undef(name, base, reloc)
+    const char *name;
+    long base;
+    struct relocation_info *reloc;
 {
     static int u_no = 0;
     struct undef *obj;
@@ -524,7 +545,10 @@ struct reloc_arg {
 };
 
 static int
-reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
+reloc_undef(no, undef, arg)
+    int no;
+    struct undef *undef;
+    struct reloc_arg *arg;
 {
     int datum;
     char *address;
@@ -585,7 +609,9 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
 }
 
 static void
-unlink_undef(const char *name, long value)
+unlink_undef(name, value)
+    const char *name;
+    long value;
 {
     struct reloc_arg arg;
 
@@ -600,7 +626,10 @@ struct indr_data {
 };
 
 static int
-reloc_repl(int no, struct undef *undef, struct indr_data *data)
+reloc_repl(no, undef, data)
+    int no;
+    struct undef *undef;
+    struct indr_data *data;
 {
     if (strcmp(data->name0, undef->name) == 0) {
 	free(undef->name);
@@ -611,7 +640,10 @@ reloc_repl(int no, struct undef *undef, struct indr_data *data)
 #endif
 
 static int
-load_1(int fd, long disp, const char *need_init)
+load_1(fd, disp, need_init)
+    int fd;
+    long disp;
+    const char *need_init;
 {
     static const char *libc = LIBC_NAME;
     struct exec hdr;
@@ -892,7 +924,10 @@ load_1(int fd, long disp, const char *need_init)
 
 static int target_offset;
 static int
-search_undef(const char *key, int value, st_table *lib_tbl)
+search_undef(key, value, lib_tbl)
+    const char *key;
+    int value;
+    st_table *lib_tbl;
 {
     long offset;
 
@@ -909,7 +944,8 @@ struct symdef {
 char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
 
 static int
-load_lib(const char *lib)
+load_lib(lib)
+    const char *lib;
 {
     char *path, *file;
     char armagic[SARMAG];
@@ -1046,7 +1082,8 @@ load_lib(const char *lib)
 }
 
 static int
-load(const char *file)
+load(file)
+    const char *file;
 {
     int fd;
     int result;
@@ -1071,7 +1108,8 @@ load(const char *file)
 }
 
 void*
-dln_sym(const char *name)
+dln_sym(name)
+    const char *name;
 {
     struct nlist *sym;
 
@@ -1083,7 +1121,12 @@ dln_sym(const char *name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# include <dlfcn.h>
+# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+#  include <nlist.h>
+#  include <link.h>
+# else
+#  include <dlfcn.h>
+# endif
 #endif
 
 #ifdef __hpux
@@ -1126,7 +1169,7 @@ dln_sym(const char *name)
 #endif
 
 static const char *
-dln_strerror(void)
+dln_strerror()
 {
 #ifdef USE_DLN_A_OUT
     char *strerror();
@@ -1224,10 +1267,24 @@ 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(const char *file)
+dln_load(file)
+    const char *file;
 {
 #ifdef NO_DLN_LOAD
     rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
@@ -1529,9 +1586,16 @@ dln_load(const char *file)
 #if defined(__VMS)
 #define DLN_DEFINED
     {
-	void *handle, (*init_fct)();
+	long status;
+	void (*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,'/'))
@@ -1539,19 +1603,35 @@ dln_load(const char *file)
 	if (p2 = strrchr(fname,'.'))
 	    *p2 = '\0';
 
-	if ((handle = (void*)dlopen(fname, 0)) == NULL) {
+	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) {
 	    error = dln_strerror();
 	    goto failed;
-	}
-
-	if ((init_fct = (void (*)())dlsym(handle, buf)) == NULL) {
+	} else if (!$VMS_STATUS_SUCCESS(status)) {
 	    error = DLN_ERROR();
-	    dlclose(handle);
 	    goto failed;
 	}
+
 	/* Call the init code */
 	(*init_fct)();
-	return handle;
+
+	return 1;
     }
 #endif /* __VMS */
 
@@ -1570,10 +1650,12 @@ dln_load(const char *file)
     return 0;			/* dummy return */
 }
 
-static char *dln_find_1(const char *fname, const char *path, char *buf, int size, int exe_flag);
+static char *dln_find_1();
 
 char *
-dln_find_exe_r(const char *fname, const char *path, char *buf, int size)
+dln_find_exe(fname, path)
+    const char *fname;
+    const char *path;
 {
     if (!path) {
 	path = getenv(PATH_ENV);
@@ -1586,38 +1668,30 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, int size)
 	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
 #endif
     }
-    return dln_find_1(fname, path, buf, size, 1);
+    return dln_find_1(fname, path, 1);
 }
 
 char *
-dln_find_file_r(const char *fname, const char *path, char *buf, int size)
+dln_find_file(fname, path)
+    const char *fname;
+    const char *path;
 {
 #ifndef __MACOS__
     if (!path) path = ".";
-    return dln_find_1(fname, path, buf, size, 0);
+    return dln_find_1(fname, path, 0);
 #else
     if (!path) path = ".";
-    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, buf, size, 0));
+    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
 #endif
 }
 
 static char fbuf[MAXPATHLEN];
 
-char *
-dln_find_exe(const char *fname, const char *path)
-{
-    return dln_find_exe_r(fname, path, fbuf, sizeof(fbuf));
-}
-
-char *
-dln_find_file(const char *fname, const char *path)
-{
-    return dln_find_file_r(fname, path, fbuf, sizeof(fbuf));
-}
-
 static char *
-dln_find_1(const char *fname, const char *path, char *fbuf, int size,
-	   int exe_flag /* non 0 if looking for executable. */)
+dln_find_1(fname, path, exe_flag)
+    const char *fname;
+    const char *path;
+    int exe_flag;		/* non 0 if looking for executable. */
 {
     register const char *dp;
     register const char *ep;
@@ -1627,23 +1701,21 @@ dln_find_1(const char *fname, const char *path, char *fbuf, int size,
     const char* mac_fullpath;
 #endif
 
-#define RETURN_IF(expr) if (expr) return (char *)fname;
-
-    RETURN_IF(!fname);
-    RETURN_IF(fname[0] == '/');
-    RETURN_IF(strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0);
-    RETURN_IF(exe_flag && strchr(fname, '/'));
+    if (!fname) return (char *)fname;
+    if (fname[0] == '/') return (char *)fname;
+    if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
+      return (char *)fname;
+    if (exe_flag && strchr(fname, '/')) return (char *)fname;
 #ifdef DOSISH
-    RETURN_IF(fname[0] == '\\');
+    if (fname[0] == '\\') return (char *)fname;
 # ifdef DOSISH_DRIVE_LETTER
-    RETURN_IF(strlen(fname) > 2 && fname[1] == ':');
+    if (strlen(fname) > 2 && fname[1] == ':') return (char *)fname;
 # endif
-    RETURN_IF(strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0);
-    RETURN_IF(exe_flag && strchr(fname, '\\'));
+    if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
+      return (char *)fname;
+    if (exe_flag && strchr(fname, '\\')) return (char *)fname;
 #endif
 
-#undef RETURN_IF
-
     for (dp = path;; dp = ++ep) {
 	register int l;
 	int i;
@@ -1657,7 +1729,7 @@ dln_find_1(const char *fname, const char *path, char *fbuf, int size,
 	/* find the length of that component */
 	l = ep - dp;
 	bp = fbuf;
-	fspace = size - 2;
+	fspace = sizeof fbuf - 2;
 	if (l > 0) {
 	    /*
 	    **	If the length of the component is zero length,
@@ -1775,3 +1847,24 @@ dln_find_1(const char *fname, const char *path, char *fbuf, int size,
 	/* 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 aee4c8fe43..182cf9f9f4 100644
--- a/dln.h
+++ b/dln.h
@@ -3,9 +3,10 @@
   dln.h -
 
   $Author$
+  $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
@@ -28,14 +29,12 @@
 # define _(args) ()
 #endif
 
-char *dln_find_exe(const char*,const char*);
-char *dln_find_file(const char*,const char*);
-char *dln_find_exe_r(const char*,const char*,char*,int);
-char *dln_find_file_r(const char*,const char*,char*,int);
+char *dln_find_exe _((const char*,const char*));
+char *dln_find_file _((const char*,const char*));
 
 #ifdef USE_DLN_A_OUT
 extern char *dln_argv0;
 #endif
 
-void *dln_load(const char*);
+void *dln_load _((const char*));
 #endif
diff --git a/dmyencoding.c b/dmyencoding.c
deleted file mode 100644
index 1bd1106e69..0000000000
--- a/dmyencoding.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_LOCALE_CHARMAP 1
-#include "encoding.c"
diff --git a/dmyext.c b/dmyext.c
index 4d273f7faf..4120d493c3 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -1,4 +1,4 @@
 void
-Init_ext(void)
+Init_ext()
 {
 }
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
deleted file mode 100644
index c9d32916cf..0000000000
--- a/doc/ChangeLog-YARV
+++ /dev/null
@@ -1,6917 +0,0 @@
-# $Id: ChangeLog 590 2006-12-31 09:02:34Z ko1 $
-#
-# YARV ChangeLog
-#  from Mon, 03 May 2004 01:24:19 +0900
-#
-
-Sun Dec 31 18:01:50 2006  Koichi Sasada  <ko1@atdot.net>
-
-	* bin/* : ruby/trunk/bin 11437
-
-
-Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : remove old Kernel#funcall definition
-
-
-2006-12-30(Sat) 07:59:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* catch up ruby/trunk 11437
-
-	* eval_intern.h : reorder tag initialization
-
-	* eval.c : fix to support __send!, funcall and prohibit funcall as
-	send
-
-	* eval_error.h, eval_jump.h, eval_safe.h : fix prototypes
-
-	* eval_method.h, vm.c : check re-definition at rb_add_method()
-
-	* yarvcore.h : fix typo
-
-	* compile.c : fix white spaces
-
-	* lib/delegate.rb : fix to support __send, ...
-
-	* lib/getoptlong.rb : fix to work on YARV
-
-	* lib/rss/parser.rb : use __send! instead of __send__
-
-	* sample/test.rb : comment out codes which use |&b| type block parameter
-
-	* ext/ripper/extconf.rb : turn off
-
-	* test/ripper/test_files.rb, test_parser_events.rb,
-	test_scanner_events.rb : fix to check it has ripper module
-
-	* vm_dump.c : remove showing file path length limitation
-
-	* yarvtest/test_eval.rb : use __send! instead of __send__
-
-
-2006-12-19(Tue) 11:46:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* doc/* : added
-
-	* ext/openssl : added
-
-	* ext/ripper : added
-
-	* test/openssl : added
-
-	* test/ripper : added
-
-	* misc : added
-
-	* rb/ -> tool/ : renamed
-
-	* common.mk : fixed for above change
-
-	* ruby_doc/* : move to topdir
-
-	* sample/* : added
-
-	* test2.rb : removed
-
-
-2006-12-15(Fri) 09:42:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : remove obsolete codes
-
-	* insns.def : fix a comment of getconstant
-
-
-2006-12-13(Wed) 16:26:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, compile.c, compile.h, debug.c, debug.h,
-	insnhelper.h, insns.def, iseq.c, thread.c, thread_pthread.ci,
-	thread_pthread.h, thread_win32.ci, thread_win32.h, vm.c, vm.h,
-	vm_dump.c, vm_evalbody.ci,  vm_opts.h.base,  yarv.h, 
-	yarv_version.h, yarvcore.c, yarvcore.h :
-	add a header includes copyright
-
-
-2006-12-12(Tue) 13:13:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb : add PREFETCH() statement
-
-	* vm.h : ditto
-
-	* yarvcore.h : fix LIKELY(x) and
-	remove main_thread_val field from yarv_vm_t
-
-	* yarvcore.c : ditto
-
-	* thread.c : support fork
-
-	* eval_thread.c : ditto
-
-	* process.c : ditto
-
-	* signal.c : ditto
-
-	* test/ruby/test_signal.rb : 
-
-	* thread_pthread.ci : rename timer thread functions
-
-	* thread_win32.ci : ditto
-
-
-2006-11-10(Fri) 21:29:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix to compile arguments
-
-	* insns.def : fix to duplicate first array value on concatarray
-	instruction
-
-	* yarvtest/test_bin.rb : add a test for above change
-
-	* sample/test.rb : fix to catch up Ruby HEAD (fix to remove test about
-	module duplicate)
-
-
-2006-11-10(Fri) 12:49:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_macro.def : fix to inherit visibility on
-	NODE_SUPER method invocation
-
-
-2006-11-10(Fri) 09:13:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c : revert module duplicate inclusion
-
-	* parse.y : catch up current Ruby HEAD
-
-	* node.h : ditto
-
-	* compile.c : ditto
-
-	* gc.c : ditto
-
-	* iseq.c : ditto
-
-	* eval_thread.c : define Continuation (null class)
-
-	* vm_dump.c : fix to output backtrae to stderr
-
-	* yarvtest/test_block.rb : remove unsupported test
-
-	* yarvtest/test_class.rb : add a test about super
-
-	* yarvtest/test_syntax.rb : add a test about case/when
-
-
-2006-11-09(Thu) 10:22:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* call_cfunc.h -> call_cfunc.ci : renamed
-
-	* vm_evalbody.h, vm_evalbody.ci : ditto
-
-	* thread_pthread.h, thread_pthread.ci : separate declaration and
-	implementation
-
-	* thread_win32.h, thread_win32.ci : ditto
-
-	* thread.c : use *.ci instead of *.c as implementation
-
-	* vm.c : ditto
-
-	* common.mk : fix rules for above changes
-
-
-2006-11-08(Wed) 17:23:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c : show C level backtrace (pointer only) with
-	backtrace() function (glibc feature)
-
-	* configure.in : ditto
-
-	* yarvcore.c : add NSDR method (show C level backtrace)
-
-	* error.c : fix indent
-
-
-2006-11-07(Tue) 13:17:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_set_errinfo) : added
-
-	* ruby.h : ditto
-
-	* version.h : fix version number
-
-	* lib/webrick/utils.rb : fix to remove Thread.critical
-
-	* ext/dbm, dl, gdbm, iconv, io, pty, sdbm : added
-
-	* test/dbm, gdbm, io, logger, net, readline, sdbm, soap, 
-	  webrick, win32ole, wsdl, xsd : added
-
-
-2006-11-06(Mon) 22:32:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c : import Ruby HEAD
-
-	* ext/socket/extconf.rb : ditto
-
-	* ext/socket/socket.c : ditto
-
-	* gc.c : ditto
-
-	* lib/date.rb : ditto
-
-	* lib/net/imap.rb : ditto
-
-	* lib/rss/0.9.rb : ditto
-
-	* lib/set.rb : ditto
-
-	* lib/soap/mapping/rubytypeFactory.rb : ditto
-
-	* lib/soap/mimemessage.rb : ditto
-
-	* lib/soap/property.rb : ditto
-
-	* lib/webrick/httprequest.rb : ditto
-
-	* lib/webrick/httputils.rb : ditto
-
-	* lib/xmlrpc/create.rb : ditto
-
-	* lib/xsd/codegen/gensupport.rb : ditto
-
-	* object.c : ditto
-
-	* ruby.h : ditto
-
-	* string.c : ditto
-
-	* version.h : ditto
-
-	* rb/ir.rb : fix to use "diffs" directory
-
-	* vm_dump.c : add "const"
-
-
-2006-11-06(Mon) 16:36:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_proc.c : remove "static" from external global variables
-
-	* eval_thread.c : ditto
-
-	* array.c : fix indent
-
-	* insns.def : add a suitable cast
-
-	* vm_macro.def : allow scalar value on splat arguments
-
-	* yarvtest/test_block.rb : fix to synchronize Ruby HEAD
-
-	* rb/insns2vm.rb : remove String#each for 1.9
-
-	* template/vm.inc.tmpl : ditto (remove String#each_with_index)
-
-
-2006-11-06(Mon) 13:22:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c : fixed GC debugging outputs
-
-	* rb/parse.rb : fixed output format
-
-
-2006-11-04(Sat) 09:46:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix to duplicate "#{'foo'}" string
-
-	* yarvtest/test_bin.rb : add a test for above
-
-	* ext/readline/readline.c : import Ruby HEAD
-
-	* keywords : ditto
-
-	* lex.c : ditto
-
-	* parse.y : ditto
-
-	* lib/mkmf.rb : ditto
-
-	* test/ruby/test_hash.rb : fix to current specification
-
-	* test/ruby/test_string.rb : ditto
-
-
-2006-11-03(Fri) 20:58:36 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/nkf/nkf-utf8/utf8tbl.h : missed to add
-
-	* configure.in : import ruby HEAD
-
-	* test/ruby/test_array.rb : ditto
-
-	* test/ruby/test_assignment.rb : ditto
-
-	* test/ruby/test_clone.rb : ditto
-
-	* test/socket/test_socket.rb : ditto
-
-	* test/socket/test_unix.rb : ditto
-
-	* test/strscan/test_stringscanner.rb : ditto
-
-	* test/testunit/collector/test_dir.rb : ditto
-
-
-2006-11-03(Fri) 20:22:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c : import current ruby HEAD and apply API changes
-	This version has some known bugs
-
-	* bignum.c : ditto
-
-	* blockinlining.c : ditto
-
-	* class.c : ditto
-
-	* compile.c : ditto
-
-	* dir.c : ditto
-
-	* dln.c : ditto
-
-	* enum.c : ditto
-
-	* enumerator.c : ditto
-
-	* error.c : ditto
-
-	* eval.c : ditto
-
-	* eval_error.h : ditto
-
-	* eval_jump.h : ditto
-
-	* eval_load.c : ditto
-
-	* eval_proc.c : ditto
-
-	* ext/*
-
-	* file.c : ditto
-
-	* gc.c : ditto
-
-	* hash.c : ditto
-
-	* insns.def : ditto
-
-	* instruby.rb : ditto
-
-	* intern.h : ditto
-
-	* io.c : ditto
-
-	* iseq.c : ditto
-
-	* lib/*
-
-	* marshal.c : ditto
-
-	* math.c : ditto
-
-	* missing/vsnprintf.c : ditto
-
-	* mkconfig.rb : ditto
-
-	* node.h : ditto
-
-	* numeric.c : ditto
-
-	* object.c : ditto
-
-	* oniguruma.h : ditto
-
-	* pack.c : ditto
-
-	* parse.y : ditto
-
-	* prec.c : ditto
-
-	* process.c : ditto
-
-	* random.c : ditto
-
-	* range.c : ditto
-
-	* rb/ir.rb : ditto
-
-	* re.c : ditto
-
-	* regcomp.c : ditto
-
-	* regerror.c : ditto
-
-	* regexec.c : ditto
-
-	* regint.h : ditto
-
-	* regparse.c : ditto
-
-	* regparse.h : ditto
-
-	* ruby.c : ditto
-
-	* ruby.h : ditto
-
-	* rubytest.rb : ditto
-
-	* runruby.rb : ditto
-
-	* sample/test.rb : ditto
-
-	* signal.c : ditto
-
-	* sprintf.c : ditto
-
-	* st.c : ditto
-
-	* st.h : ditto
-
-	* string.c : ditto
-
-	* struct.c : ditto
-
-	* test/*
-
-	* thread.c : ditto
-
-	* time.c : ditto
-
-	* util.c : ditto
-
-	* variable.c : ditto
-
-	* version.h : ditto
-
-	* vm.c : ditto
-
-	* vm_dump.c : ditto
-
-	* vm_macro.def : ditto
-
-	* win32/*
-
-
-2006-10-31(Tue) 22:47:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y : fix NEWHEAP bugs (import HEAD)
-
-	* ruby.c, intern.h, yarvcore.c (rb_load_file) : change to
-	return parsed node pointer
-
-	* rb/ir.rb : add check mode
-
-
-2006-09-01(Fri) 22:05:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix a bug of peephole optimization and enable
-	regexp optimization
-
-
-2006-08-21(Mon) 05:27:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/mathn.rb : remove "remove_method :gcd2"
-
-	* opt_insn_unif.def : unset opt setting
-
-	* opt_operand.def : ditto
-
-
-2006-08-18(Fri) 17:55:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add dependency of yarvcore.h to thread.o
-
-	* gc.c : change comment line
-
-	* thread.c : remove some line break
-
-	* yarvcore.c : reoder initialize sequence to mark main thread
-
-
-2006-08-18(Fri) 16:51:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : add a support for cache values per thread
-
-	* yarvcore.c : ditto
-
-	* gc.c : ditto
-
-	* thread.c : move a expression after acquiring lock
-
-	* compile.c : add a cast to remove warning
-
-
-2006-08-18(Fri) 02:07:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix to return rhs value on ATTRASGIN
-
-	* insns.def (setn) : add insn setn
-
-	* yarvtest/test_bin.rb : add tests for above
-
-
-2006-08-17(Thu) 22:46:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : clear callee_id ([yarv-dev:1073])
-
-
-2006-08-17(Thu) 22:14:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.h : fix error message
-
-
-2006-08-17(Thu) 12:23:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : change initilize routine order ([yarv-dev:1067])
-
-	* yarvcore.c (Init_yarv) : init th->machine_stack_start
-
-	* thread_pthread.h : add malloc value check ([yarv-dev:1066])
-
-	* insns.def (opt_eq) : fix typo ([yarv-dev:1072])
-
-	* yarvtest/test_opts.rb : add a test for above
-
-	* yarvtest/test_class.rb : add a test for last commit
-
-
-2006-08-17(Thu) 11:02:16 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (clone_method) : check undef-ed method ([yarv-dev:1068])
-
-
-2006-08-15(Tue) 15:07:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix opt_plus routine ([yarv-dev-en:149])
-
-	* yarvtest/test_opts.rb : add tests for above
-
-
-2006-08-06(Sun) 06:24:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : fix build rule (build only ruby binary when benchmark)
-
-	* yarvcore.[ch] : fix and add yarv_iseq_new_with_* API
-
-	* blockinlining.c : ditto
-
-	* compile.c : ditto
-
-	* compile.h : ditto
-
-	* iseq.c : ditto
-
-	* eval_method.h : check redefinition for specialized instruction
-
-	* insnhelper.h : ditto
-
-	* insns.def : ditto
-
-	* vm.c : ditto
-
-	* vm.h : ditto
-
-	* numeric.c : add Fixnum#succ
-
-	* thread.c : remove duplicated method Thread#current
-
-	* yarvcore.c : remove duplicated method Proc#clone
-
-	* yarvtest/test_opts.rb : added
-
-
-2006-07-20(Thu) 04:10:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix [yarv-dev:1041] problem (raise TypeError)
-
-	* eval.c : rb_funcall2 send as NOEX_PRIVATE and check scope
-
-
-2006-07-20(Thu) 03:38:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : fix [yarv-dev:1040] bug
-
-
-2006-07-18(Tue) 18:45:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* some files : set property "svn:eol-style" as native
-
-
-2006-07-18(Tue) 18:35:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-        * gc.h : fix a static function name
-
-        * vm.c : remove Japanese comments
-
-        * yarvcore.c : add a comment
-
-	* some files : set property "svn:eol-style" as native
-
-
-2006-07-18(Tue) 16:48:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : remove unused code
-
-	* compile.c : add checking value
-
-	* iseq.c : ditto
-
-	* yarvcore.c : fix yarv_th_eval prototype declaration
-
-	* yarvtest/yarvtest.rb : use compile instead of parse method
-
-
-2006-07-12(Wed) 15:18:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv_version.h : 0.4.1
-
-	* Changes : ditto
-
-
-2006-07-12(Wed) 13:38:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-        * eval.c : fix indent
-
-        * gc.h : fix syntax bug
-
-        * thread_pthread.h : vanish warnning message
-
-        * iseq.c : ditto
-
-        * compile.c : ditto
-
-        * thread.c : ditto
-
-        * vm.c : ditto
-
-        * yarvcore.c : prohibit tail call optimization to mark 
-	iseq object
-
-        * yarvcore.h : add some allocator function declaration
-
-        * yarvtest/test_eval.rb : remove output
-
-
-2006-07-12(Wed) 05:01:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : undef alloc funcs
-
-	* eval_proc.c : ditto (use factory faction)
-
-	* thread.c : ditto
-
-	* vm.c : ditto
-
-	* iseq.c : fix compile option creation
-
-	* rb/allload.rb : use compile_file method
-
-	* rb/compile.rb : ditto
-
-	* rb/parse.rb : ditto
-
-	* template/insnstbl.html : hide mail addr
-
-
-2006-07-11(Tue) 21:34:29 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_dir.rb: new test test_JVN_13947696.
-
-
-2006-07-11(Tue) 21:26:41 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_alias.rb: new test test_JVN_83768862.
-
-
-2006-07-11(Tue) 11:33:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix compile error on C90
-
-
-2006-07-11(Tue) 10:40:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* disasm.c : removed
-
-	* iseq.c : added
-
-	* common.mk : ditto
-
-	* blockinlining.c : Get*Val => Get*Ptr
-
-	* eval.c : ditto
-
-	* yarvcore.c : ditto
-
-	* eval_proc.c : ditto
-
-	* vm_dump.c : ditto
-
-	* vm_macro.def : ditto
-
-	* signal.c : ditto
-
-	* vm.c : ditto
-
-	* thread.c : ditto
-
-	* compile.c : rename local variable insnobj => iobj
-
-	* compile.c : support yarv_compile_option_t
-
-	* gc.h : added
-
-	* insns.def : use OPT_CHECKED_RUN instead of IGNORE_OPTIMIZE
-
-	* rb/compile.rb : use compile option
-
-	* template/optinsn.inc.tmpl : fix function name
-
-	* vm_opts.h.base : change macros
-
-	* rb/insns2vm.rb : ditto
-
-	* yarv.h : fix yarvcore_eval_parsed parameter type
-
-	* yarvcore.c : fix some interfaces (functions)
-
-	* yarvcore.h : add a type yarv_compile_option_t
-
-
-2006-07-06(Thu) 13:45:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/yasm.rb : pass builder object if block arity == 1
-
-
-2006-07-05(Wed) 11:23:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/yasm.rb : fix method name
-
-	* vm.c (th_set_top_stack) : check toplevel or not
-
-
-2006-07-04(Tue) 20:05:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/compile.rb : added
-
-	* yarvtest/yarvtest.rb : disable load/store test
-
-
-2006-07-04(Tue) 18:17:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix some bugs about load iseq data
-
-	* disasm.c : ditto (store)
-
-	* eval.c (rb_f_local_variables) : fix bugs
-
-	* insns.def : fix otp_ltlt condition bug
-
-	* vm.c : ditto
-
-	* yarvcore.c : rename some functions
-
-	* yarvtest/yarvtest.rb : add iseq load/store tests
-	(to enable this, remove comment)
-
-
-2006-07-03(Mon) 01:54:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_thread.c : add parameter "th" to thread_set_raised
-
-	* yarvcore.h : ditto
-
-	* eval_intern.h : ditto
-
-	* eval.c : ditto
-
-	* eval_error.h : declare with ANSI style
-
-	* disasm.c : rename iseq_iseq2simpledata() to iseq_data_to_ary
-
-	* lib/yasm.rb : rename Instruction#to_simpledata to
-	Instruction#to_a
-
-	* yarvcore.c : ditto
-
-	* vm.c : fix bug (Proc.new{|*args| p args}.call(1) #=> 1)
-
-	* yarvtest/test_proc.rb : add a tests for above
-
-
-2006-06-21(Wed) 09:19:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : remove yarv_iseq_t#catch_table_ary and
-	add yarv_iseq_t#compile_data#catch_table_ary
-
-	* compile.h : ditto
-
-	* yarvcore.c : ditto
-
-	* yarvcore.h : ditto
-
-	* eval_thread.c : remove unused code
-
-	* thread.c : add rb_gc_mark_threads() (from eval_thread.c)
-
-
-2006-05-31(Wed) 21:26:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-        * parse.y : prohibit tail call optimization to mark vparsr
-	object
-
-
-2006-05-25(Thu) 15:37:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c : support NEW_ATTRASGN node
-
-	* class.c : skip undefined method to collect ([yarv-dev:999])
-
-	* yarvtest/test_class.rb : add a test for above
-
-	* compile.c : fix opt_regexpmatch1 condition
-
-	* lib/monitor.rb : fix [yarv-dev:1009]
-
-	* rb/insns2vm.rb : fix typo
-
-	* thread.c : prohibit unlock by not mutex owner thread
-
-	* vm_opts.h.base : change default option
-
-
-2006-05-18(Thu) 16:00:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* intern.h : fix prototype declarations for last re.c change
-
-
-2006-05-18(Thu) 12:12:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/runruby.rb : added
-
-	* thread.c (rb_thread_alone) : check if vm->living_threads
-	is available
-
-
-2006-05-18(Thu) 12:05:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* signal.c : not mask SIGSEGV
-
-	* thread.c : fix debug output on Win32
-
-	* thread.c, thread_pthread.h : add some debug prints
-
-	* yarvcore.c : mark machine registers on thread_mark
-
-
-2006-05-17(Wed) 18:09:20 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (sys_warning): should not call a vararg function
-	  rb_sys_warning() indirectly.  [ruby-core:07886]
-
-
-2006-05-17(Wed) 16:41:41 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not allow modifying literal
-	  regexps.  frozen check moved from rb_reg_initialize_m as well.
-
-	* re.c (rb_reg_initialize): should not modify untainted objects in
-	  safe levels higher than 3.
-
-	* re.c (rb_memcmp): type change from char* to const void*.
-
-	* dir.c (dir_close): should not close untainted dir stream.
-
-	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
-
-
-2006-05-07(Sun) 21:06:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : remove Mutex#unlock_and_stop and add Mutex#sleep
-
-	* lib/monitor.rb : ditto
-
-	* lib/thread.rb : ditto
-
-	* thread_pthread.h : fix stack size
-
-	* thread_win32.h : fix sleep
-
-	* yarvcore.h : disable to use get/setcontext
-
-	* lib/webrick/server.rb : add experimental implementation 
-	using thraeds pool
-
-
-2006-05-05(Fri) 13:59:00 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_signal.rb : disable a test
-
-	* thread.c : do trylock before lock on mutex_lock
-
-	* thread_win32.h : use CriticalSection instead of Mutex
-
-
-2006-05-05(Fri) 03:03:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : vtune rule make run test.rb
-
-	* disasm.c : fix syntax errors (on VC)
-
-	* yarvcore.c : ditto
-
-	* lib/thread.rb : Mutex#synchronize is defined here
-
-	* lib/*.rb : ditto
-
-	* signal.c : separate pthread or not
-
-	* thread.c : support lightweight wakeup
-
-	* thread_pthread.h : ditto
-
-	* thread_win32.h : ditto
-
-	* yarvcore.h : ditto
-
-	* yarvtest/test_thread.rb : restore last change
-
-
-2006-05-04(Thu) 18:11:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_thread.c : remove rb_thread_interrupt
-
-	* intern.h : ditto
-
-	* signal.c : change signal transfer route
-
-	* thread.c : ditto
-
-	* thread_pthread.h : ditto
-
-	* thread_win32.h : ditto
-
-	* yarv.h : support GET_VM()
-
-	* yarvcore.h : change yarv_thread_t/yarv_vm_t structure
-
-	* yarvtest/test_thread.rb : decrease threads to test
-
-
-2006-05-04(Thu) 00:26:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.h : experimental support of thread cache
-
-
-2006-04-25(Tue) 22:30:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : remove struct yarv_cmethod_info, add
-	data structure for profiling and extend yarv_control_frame_t
-
-	* vm.c : make pop_frame() and apply above change
-
-	* eval.c : ditto
-
-	* vm_dump.c : ditto
-
-	* vm_macro.def : ditto
-
-	* insns.def (leave): use pop_frame() instead of
-	POP_CONTROL_STACK_FRAME() macro
-
-	* insnhelper.h : remove some macros
-
-	* yarvcore.c : change th_set_top_stack() prototype
-
-
-2006-04-18(Tue) 18:37:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, disasm.c : support export/import exception
-	information
-
-	* yarvcore.h : change "struct catch_table_entry" member variable
-	order
-
-
-2006-04-13(Thu) 17:11:30 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* bignum.c : import ruby 1.9 HEAD (Ruby 1.9.0 2006-04-08)
-
-	* dir.c : ditto
-
-	* enumerator.c : ditto
-
-	* ext/.document : ditto
-
-	* ext/extmk.rb : ditto
-
-	* ext/nkf/lib/kconv.rb : ditto
-
-	* ext/nkf/nkf-utf8/nkf.c : ditto
-
-	* ext/nkf/nkf-utf8/utf8tbl.c : ditto
-
-	* ext/nkf/nkf.c : ditto
-
-	* ext/nkf/test.rb : ditto
-
-	* ext/socket/.cvsignore : ditto
-
-	* ext/win32ole/sample/excel2.rb : ditto
-
-	* ext/win32ole/tests/testOLEMETHOD.rb : ditto
-
-	* ext/win32ole/tests/testOLEPARAM.rb : ditto
-
-	* ext/win32ole/tests/testOLETYPE.rb : ditto
-
-	* ext/win32ole/tests/testOLETYPELIB.rb : ditto
-
-	* ext/win32ole/tests/testOLEVARIABLE.rb : ditto
-
-	* ext/win32ole/tests/testOLEVARIANT.rb : ditto
-
-	* ext/win32ole/tests/testWIN32OLE.rb : ditto
-
-	* ext/win32ole/tests/testall.rb : ditto
-
-	* ext/win32ole/win32ole.c : ditto
-
-	* gc.c : ditto
-
-	* instruby.rb : ditto
-
-	* io.c : ditto
-
-	* lib/delegate.rb : ditto
-
-	* lib/fileutils.rb : ditto
-
-	* lib/find.rb : ditto
-
-	* lib/irb/ruby-lex.rb : ditto
-
-	* lib/mkmf.rb : ditto
-
-	* lib/net/http.rb : ditto
-
-	* lib/open-uri.rb : ditto
-
-	* lib/pathname.rb : ditto
-
-	* lib/rational.rb : ditto
-
-	* lib/rdoc/parsers/parse_rb.rb : ditto
-
-	* lib/rdoc/ri/ri_paths.rb : ditto
-
-	* lib/resolv.rb : ditto
-
-	* lib/test/unit/collector/objectspace.rb : ditto
-
-	* lib/webrick/httpservlet/cgihandler.rb : ditto
-
-	* math.c : ditto
-
-	* mkconfig.rb : ditto
-
-	* object.c : ditto
-
-	* oniguruma.h : ditto
-
-	* pack.c : ditto
-
-	* parse.y : ditto
-
-	* re.c : ditto
-
-	* re.h : ditto
-
-	* regcomp.c : ditto
-
-	* regerror.c : ditto
-
-	* regparse.c : ditto
-
-	* ruby.h : ditto
-
-	* rubytest.rb : ditto
-
-	* runruby.rb : ditto
-
-	* string.c : ditto
-
-	* test/digest/test_digest.rb : ditto
-
-	* test/pathname/test_pathname.rb : ditto
-
-	* test/ruby/envutil.rb : ditto
-
-	* test/ruby/test_float.rb : ditto
-
-	* test/ruby/test_pack.rb : ditto
-
-	* time.c : ditto
-
-	* util.c : ditto
-
-	* version.h : ditto
-
-	* win32/mkexports.rb : ditto
-
-	* win32/resource.rb : ditto
-
-	* win32/win32.c : ditto
-
-
-2006-04-11(Tue) 11:26:53 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/yasm.rb : move to lib/yasm.rb
-
-
-2006-04-09(Sun) 03:04:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : change to accept method iseq object when loading from
-	simple data
-
-	* yarvcore.c : add a debug output
-
-	* rb/yasm.rb : change some interfaces
-
-
-2006-04-07(Fri) 20:25:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix miss about range of catch "next"
-
-	* eval.c : add braces
-
-
-2006-04-07(Fri) 11:09:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : fix some make rules
-
-	* insns.def : rename some instructions name
-
-	* rb/insns2vm.rb : change some operand type name
-
-	* vm_evalbody.h : ditto
-
-	* template/insns.inc.tmpl : add YARV_MAX_INSTRUCTION_SIZE macro
-
-	* compile.c, disasm.c, yarvcore.c : support load/store iseq from/to simple
-	data structure such as array, literals, and so on
-
-	* rb/yasm.rb : supported
-
-	* vm.c : change interface of eval_define_method
-
-	* yarvcore.h : remove unused externals
-
-
-2006-03-08(Wed) 10:31:29 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/delegate.rb (DelegateClass): do not delegate #send and
-	  #funcall.
-
-
-2006-02-27(Mon) 22:39:17 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/thread.rb: last commit causes busy loop, revert it. [yarv-dev:990]
-
-	* lib/thread.rb: non_block=true wrongly caused ThreadError.
-
-
-2006-02-27(Mon) 21:33:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : fix to display command line
-
-	* compile.c : fix comparison between a pointer and 0
-
-	* debug.c : fix to output stder
-
-	* disasm.c : add debug function
-
-	* vm_dump.c : ditto
-
-	* eval_proc.c : fix to skip class definition
-
-	* ruby.h : fix T_VALUE to T_VALUES
-
-	* gc.c : ditto
-
-	* node.h : fix prototypes
-
-	* vm.c : add VM_DEBUG macro
-
-	* vm.c : fix compile error on VC++
-
-	* vm.c : fix to inherit last lfp[0] on th_set_finish_env
-
-	* vm.c : fix to add one svar location for any frame
-
-	* vm_macro.def : ditto
-
-	* yarvcore.h : add YARV_CLASS_SPECIAL_P() and YARV_BLOCK_PTR_P()
-
-	* rdoc/ : removed
-
-	* insns.def : fix to propagete throw state
-
-
-2006-02-27(Mon) 13:54:47 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/syslog: imported from Ruby CVS trunk HEAD.
-
-	* ext/racc: ditto.
-
-
-2006-02-27(Mon) 12:47:10 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* parse.y: follow coding style change.
-
-
-2006-02-27(Mon) 11:53:07 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/README: imported from Ruby CVS trunk HEAD.
-
-	* lib/gserver.rb: ditto.
-
-	* lib/readbytes.rb: ditto.
-
-	* lib/parsearg.rb: ditto.
-
-	* lib/racc: ditto.
-
-	* lib/rinda: ditto.
-
-
-2006-02-27(Mon) 11:27:19 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/thread.rb (Queue#pop): faster code. [yarv-dev:973]
-
-	* lib/thread.rb (Queue#pop): avoid to push same thread in to
-	  @waiting.
-
-
-2006-02-23(Thu) 23:32:53 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/open3.rb: imported from Ruby CVS trunk HEAD (rev 1.12).
-
-
-2006-02-23(Thu) 15:10:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : support rb_frame_self()
-
-	* eval_intern.h (th_get_ruby_level_cfp) : return 0 if no cfp
-
-	* eval_load.c : comment out scope set
-
-	* yarvcore.c : fix to initialize/free process of iseq
-
-	* vm.c (th_invoke_proc) : fix to set special cref always
-
-	* yarvtest/test_proc.rb : add a test for above
-
-
-2006-02-22(Wed) 23:33:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add rule "runruby"
-
-	* eval_thread.c : remove obsolete comment
-
-	* eval.c : remove unused functions
-
-	* signal.c : ditto
-
-	* gc.c : add rb_register_mark_object() and use it
-
-	* eval_load.c : ditto
-
-	* eval_proc.c : ditto
-
-	* ext/etc/etc.c : ditto
-
-	* ext/win32ole/win32ole.c : ditto
-
-	* ruby.h : ditto
-
-	* yarvcore.h : ditto
-
-	* thread.c : add rb_thread_run_parallel()
-
-	* yarvcore.c : change bootstrap
-
-
-2006-02-22(Wed) 19:27:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/win32ole/.cvsignore : removed
-
-	* ext/win32ole/.document : ditto
-
-
-2006-02-22(Wed) 18:17:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : set Binding as YARVCore::VM::Binding
-
-
-2006-02-22(Wed) 12:54:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* ChangeLog : remove needless line
-
-
-2006-02-22(Wed) 12:49:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rubysig.h : remove CHECK_INTS
-
-	* eval.c : ditto
-
-	* eval_load.c : ditto
-
-	* ext/readline/readline.c : ditto
-
-	* thread.c : ditto
-
-	* win32/win32.c : ditto
-
-	* yarv_version.h : 0.4.0
-
-	* Changes : ditto
-
-
-2006-02-22(Wed) 11:36:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test.rb : removed
-
-
-2006-02-22(Wed) 11:12:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* README : renewed
-
-	* version.c : fixed version message
-
-	* yarvext/ : removed
-
-
-2006-02-22(Wed) 10:33:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/.document : imported from Ruby 1.9 HEAD
-
-	* .document : ditto
-
-	* ext/.document : ditto
-
-	* lib/ftools.rb : ditto
-
-	* lib/rdoc/ : ditto
-
-	* eval_thread.c : remove unused functions
-
-	* process.c : ditto
-
-	* rb/insns2vm.rb : compare modified date of vm_opts.h and
-	vm_opts.h.base
-
-	* ruby.h : rename RValue to RValues
-
-	* gc.c : ditto
-
-	* vm.c : ditto
-
-
-2006-02-22(Wed) 06:32:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in : remove last commit
-
-
-2006-02-22(Wed) 06:18:53 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in : add default program prefix "-yarv"
-
-
-2006-02-22(Wed) 06:11:36 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : change default rule (same as HEAD)
-
-	* configure : removed
-
-	* eval.c : remove last commit
-
-	* vm.c : fix stack traverse
-
-	* yarvcore.c : initialize top of control frame
-
-	* version.c : 2.0
-
-	* version.h : ditto
-
-
-2006-02-22(Wed) 04:50:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : change to rewind C level control frame
-
-	* vm.c : change to initialize cfp#proc and fix comparison of
-	cfp and limit_cfp
-
-	* yarvcore.c : remove last commit
-
-
-2006-02-22(Wed) 03:25:56 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : initialize each stack of thread
-
-
-2006-02-22(Wed) 00:02:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : fix synchornize return value ([yarv-dev:957])
-	and some synchornization error
-
-	* thread_pthread.h : add debug helper function
-
-
-2006-02-21(Tue) 20:54:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : fix place of rb_thread_terminate_all()
-
-	* eval_thread.c : remove unused functions
-
-	* yarv.h : remove GET_VM()
-
-	* eval_jump.h : ditto
-
-	* insns.def : ditto
-
-	* vm_dump.c : 
-
-	* intern.h : change rb_thread_signal_raise/exit interface
-
-	* signal.c : ditto
-
-	* thread.c : ditto
-
-	* test/ruby/test_beginendblock.rb : use block with IO.popen
-
-	* thread_pthread.h : fix interrupt process
-
-	* thread_win32.h : ditto
-
-	* yarvcore.c : fix thread free process
-
-	* yarvcore.h : remove yarv_vm_t#thread_critical, etc
-
-
-2006-02-21(Tue) 12:42:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_thread.c : remove unused function rb_thread_schedule()
-
-	* thread.c : rename yarv_thread_schedule to rb_thread_schedule()
-
-	* thread.c, eval.c : fix to terminate all thread and barrier at
-	eval.c#ruby_cleanup()
-
-	* thread_win32.h : remove native_thread_cleanup()
-
-	* thread_pthread.h : ditto
-
-	* yarvcore.c : ditto
-
-	* yarvtest/test_thread.rb : separete assersions to tests
-
-
-2006-02-21(Tue) 02:13:33 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_arglist): should set command_start = Qtrue for
-	  command body.  [ruby-talk:180648]
-
-
-2006-02-20(Mon) 20:41:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : fix to synchronize signal_thread_list access
-	and fix typo
-
-
-2006-02-20(Mon) 17:54:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_proc.c : remove unused Binding functions and
-	set is_lambda of Proc used define_method
-
-	* yarvcore.c : support Proc#dup/clone, Binding#dup/clone
-
-	* sample/test.rb : remove unsupport features (Proc as Binding)
-
-
-2006-02-20(Mon) 16:28:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add a dependency to vm.c on eval_intern.h
-
-	* eval_intern.h : fix to initialize tag->tag
-
-	* yarvtest/test_jump.rb : add tests for above
-
-	* eval_jump.h : use local variable
-
-
-2006-02-20(Mon) 15:13:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_thread_create_join.rb : added
-
-	* test/yaml/test_yaml.rb : imported from Ruby CVS trunk HEAD
-
-
-2006-02-20(Mon) 14:49:46 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/yaml.rb: imported from Ruby CVS trunk HEAD.
-
-	* lib/yaml: ditto.
-
-	* ext/syck: ditto.
-
-
-2006-02-20(Mon) 13:58:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support block parameter which is NODE_ATTRASGN
-
-	* yarvtest/test_block.rb : add tests for above
-
-	* compile.c : fix NODE_DASGN_CURR level check
-
-	* compile.c : fix "||=" (at firtst, check "defined? val")
-
-	* compile.c : fix NODE_MATCH3 (permute receiver and argument)
-
-	* yarvtest/test_bin.rb : add tests for above
-
-	* eval.c : add rb_each()
-
-	* test/ruby/test_signal.rb : increment a timeout value
-
-	* thread.c, yarvcore.h : fix "join" flow
-
-	* thread_pthread.h : ditto
-
-	* thread_win32.h : ditto
-
-	* yarvtest/test_thread.rb : add a test for above
-
-	* vm.h, vm.c, vm_dump.c, insns.def : add FRAME_MAGIC_LAMBDA and
-	support return from lambda (especially retrun from method defined
-	by "define_method")
-
-	* yarvtest/test_method.rb : add a test for above
-
-	* yarvcore.c : remove unused functions
-
-
-2006-02-20(Mon) 11:22:31 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_eval.rb: now Object#funcall is defined.
-
-
-2006-02-20(Mon) 11:04:32 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/irb/lc/ja/CVS: removed.
-
-
-2006-02-20(Mon) 10:55:59 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/mutex_m.rb: imported from Ruby CVS trunk HEAD.
-
-	* lib/observer.rb: ditto.
-
-	* lib/wsdl: ditto.
-
-	* lib/monitor.rb: ditto (removing Thread.critical=).
-
-	* lib/xsd: ditto.
-
-	* lib/soap: ditto.
-
-	* lib/drb.rb: ditto.
-
-	* lib/drb: ditto.
-
-
-2006-02-20(Mon) 10:49:31 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* yarvcore.c (Init_yarvcore): fix typo (duo -> dup).
-
-
-2006-02-19(Sun) 01:27:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : "return" from lambda{} break block
-
-	* eval.c : Unsupport Proc as Binding
-
-	* test/ruby/test_eval.rb : apply above changes
-
-	* yarvcore.c : remove unused function yarv_yield_values()
-
-
-2006-02-18(Sat) 03:19:36 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, insns.def : fix passing value when thread killed
-
-	* yarvtest/test_thread.rb : add tests for above
-
-
-2006-02-19(Sun) 01:19:42 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/thread.rb (SizedQueue): didn't work.  This patch was
-	  contributed by yukimizake. [yarv-dev:916]
-
-
-2006-02-18(Sat) 03:19:36 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, insns.def : fix passing value when thread killed
-
-	* yarvtest/test_thread.rb : add tests for above
-
-
-2006-02-18(Sat) 02:40:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm.c, vm_macro.def : change BMETHOD algorithm
-	([yarv-dev:914])
-
-	* yarvtest/test_class.rb : add a test for above
-
-
-2006-02-17(Fri) 23:59:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, yarv.h : change th_invoke_proc() interface
-
-	* eval_proc.c : ditto
-
-	* signal.c : ditto
-
-	* thread.c : ditto
-
-	* yarvcore.c : ditto
-
-	* vm_macro.def : ditto and fix NODE_BMETHOD call
-
-	* vm.c : change name ("th_set_env()" to "push_frame()") and
-	change interface
-
-	* insns.def : ditto
-
-	* eval.c : remove proc_jump_error()
-
-	* benchmark/bm_app_answer.rb : added
-
-	* vm_opts.h.base : add optimize option
-
-
-2006-02-17(Fri) 13:37:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, ruby.h : add rb_errinfo()
-
-	* eval_error.h (error_pos) : fix process order
-
-	* bin/erb : imported from ruby 1.9
-
-	* bin/irb : ditto
-
-	* bin/rdoc : ditto
-
-	* bin/ri : ditto
-
-	* bin/testrb : ditto
-
-	* ext/curses/.cvsignore : ditto
-
-	* ext/curses/curses.c : ditto
-
-	* ext/curses/depend : ditto
-
-	* ext/curses/extconf.rb : ditto
-
-	* ext/curses/hello.rb : ditto
-
-	* ext/curses/mouse.rb : ditto
-
-	* ext/curses/rain.rb : ditto
-
-	* ext/curses/view.rb : ditto
-
-	* ext/curses/view2.rb : ditto
-
-	* ext/fcntl/.cvsignore : ditto
-
-	* ext/fcntl/depend : ditto
-
-	* ext/fcntl/extconf.rb : ditto
-
-	* ext/fcntl/fcntl.c : ditto
-
-	* ext/readline/README : ditto
-
-	* ext/readline/README.ja : ditto
-
-	* ext/readline/depend : ditto
-
-	* ext/readline/extconf.rb : ditto
-
-	* ext/readline/readline.c : ditto
-
-	* ext/win32ole/.document : ditto
-
-	* ext/zlib/doc/zlib.rd : ditto
-
-	* ext/zlib/extconf.rb : ditto
-
-	* ext/zlib/zlib.c : ditto
-
-	* lib/cgi/.document : ditto
-
-	* lib/cgi/session.rb : ditto
-
-	* lib/cgi/session/pstore.rb : ditto
-
-	* lib/shell/builtin-command.rb : ditto
-
-	* lib/shell/command-processor.rb : ditto
-
-	* lib/shell/error.rb : ditto
-
-	* lib/shell/filter.rb : ditto
-
-	* lib/shell/process-controller.rb : ditto
-
-	* lib/shell/system-command.rb : ditto
-
-	* lib/shell/version.rb : ditto
-
-	* lib/xmlrpc/.document : ditto
-
-	* lib/xmlrpc/README.rdoc : ditto
-
-	* lib/xmlrpc/README.txt : ditto
-
-	* lib/xmlrpc/base64.rb : ditto
-
-	* lib/xmlrpc/client.rb : ditto
-
-	* lib/xmlrpc/config.rb : ditto
-
-	* lib/xmlrpc/create.rb : ditto
-
-	* lib/xmlrpc/datetime.rb : ditto
-
-	* lib/xmlrpc/httpserver.rb : ditto
-
-	* lib/xmlrpc/marshal.rb : ditto
-
-	* lib/xmlrpc/parser.rb : ditto
-
-	* lib/xmlrpc/server.rb : ditto
-
-	* lib/xmlrpc/utils.rb : ditto
-
-	* rdoc/README : ditto
-
-	* rdoc/code_objects.rb : ditto
-
-	* rdoc/diagram.rb : ditto
-
-	* rdoc/dot/dot.rb : ditto
-
-	* rdoc/generators/chm_generator.rb : ditto
-
-	* rdoc/generators/html_generator.rb : ditto
-
-	* rdoc/generators/ri_generator.rb : ditto
-
-	* rdoc/generators/template/chm/chm.rb : ditto
-
-	* rdoc/generators/template/html/hefss.rb : ditto
-
-	* rdoc/generators/template/html/html.rb : ditto
-
-	* rdoc/generators/template/html/kilmer.rb : ditto
-
-	* rdoc/generators/template/html/old_html.rb : ditto
-
-	* rdoc/generators/template/html/one_page_html.rb : ditto
-
-	* rdoc/generators/template/xml/rdf.rb : ditto
-
-	* rdoc/generators/template/xml/xml.rb : ditto
-
-	* rdoc/generators/xml_generator.rb : ditto
-
-	* rdoc/markup/sample/rdoc2latex.rb : ditto
-
-	* rdoc/markup/sample/sample.rb : ditto
-
-	* rdoc/markup/simple_markup.rb : ditto
-
-	* rdoc/markup/simple_markup/fragments.rb : ditto
-
-	* rdoc/markup/simple_markup/inline.rb : ditto
-
-	* rdoc/markup/simple_markup/lines.rb : ditto
-
-	* rdoc/markup/simple_markup/preprocess.rb : ditto
-
-	* rdoc/markup/simple_markup/to_flow.rb : ditto
-
-	* rdoc/markup/simple_markup/to_html.rb : ditto
-
-	* rdoc/markup/simple_markup/to_latex.rb : ditto
-
-	* rdoc/markup/test/AllTests.rb : ditto
-
-	* rdoc/markup/test/TestInline.rb : ditto
-
-	* rdoc/markup/test/TestParse.rb : ditto
-
-	* rdoc/options.rb : ditto
-
-	* rdoc/parsers/parse_c.rb : ditto
-
-	* rdoc/parsers/parse_f95.rb : ditto
-
-	* rdoc/parsers/parse_rb.rb : ditto
-
-	* rdoc/parsers/parse_simple.rb : ditto
-
-	* rdoc/parsers/parserfactory.rb : ditto
-
-	* rdoc/rdoc.rb : ditto
-
-	* rdoc/ri/ri_cache.rb : ditto
-
-	* rdoc/ri/ri_descriptions.rb : ditto
-
-	* rdoc/ri/ri_display.rb : ditto
-
-	* rdoc/ri/ri_driver.rb : ditto
-
-	* rdoc/ri/ri_formatter.rb : ditto
-
-	* rdoc/ri/ri_options.rb : ditto
-
-	* rdoc/ri/ri_paths.rb : ditto
-
-	* rdoc/ri/ri_reader.rb : ditto
-
-	* rdoc/ri/ri_util.rb : ditto
-
-	* rdoc/ri/ri_writer.rb : ditto
-
-	* rdoc/template.rb : ditto
-
-	* rdoc/tokenstream.rb : ditto
-
-	* rdoc/usage.rb : ditto
-
-	* test/xmlrpc/data/bug_bool.expected : ditto
-
-	* test/xmlrpc/data/bug_bool.xml : ditto
-
-	* test/xmlrpc/data/bug_cdata.expected : ditto
-
-	* test/xmlrpc/data/bug_cdata.xml : ditto
-
-	* test/xmlrpc/data/bug_covert.expected : ditto
-
-	* test/xmlrpc/data/bug_covert.xml : ditto
-
-	* test/xmlrpc/data/datetime_iso8601.xml : ditto
-
-	* test/xmlrpc/data/fault.xml : ditto
-
-	* test/xmlrpc/data/value.expected : ditto
-
-	* test/xmlrpc/data/value.xml : ditto
-
-	* test/xmlrpc/data/xml1.expected : ditto
-
-	* test/xmlrpc/data/xml1.xml : ditto
-
-	* test/xmlrpc/test_datetime.rb : ditto
-
-	* test/xmlrpc/test_features.rb : ditto
-
-	* test/xmlrpc/test_marshal.rb : ditto
-
-	* test/xmlrpc/test_parser.rb : ditto
-
-	* test/xmlrpc/test_webrick_server.rb : ditto
-
-	* test/xmlrpc/webrick_testing.rb : ditto
-
-	* test/zlib/test_zlib.rb : ditto
-
-
-2006-02-17(Fri) 09:41:35 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* thread.c (sleep_timeval): sleep should always sleep for
-	  specified amount of time.  [ruby-talk:180067]
-
-
-2006-02-17(Fri) 02:20:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_safe.h, ruby.h : remove ruby_safe_level and add
-	rb_safe_level() and rb_set_safe_level_force()
-
-	* eval.c : use above functions
-
-	* eval_jump.h : ditto
-
-	* eval_load.c : ditto
-
-	* eval_method.h : ditto
-
-	* eval_proc.c : ditto
-
-	* eval_thread.c : ditto
-
-	* gc.c : ditto
-
-	* signal.c : ditto
-
-	* variable.c : ditto
-
-	* ext/win32ole/win32ole.c : ditto
-
-	* vm.c (th_invoke_proc) : save and restore safe level
-
-	* yarvtest/test_proc.rb : add tests for above
-
-	* thread.c : remove unused functions
-
-
-2006-02-17(Fri) 01:08:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : remove a setspecial second unused operand
-
-	* eval_load.c : remove unused variable th
-
-	* eval_proc.c, yarvcore.c : remove some functions from eval_proc.c
-	and move to yarvcore.c
-
-	* insns.def : fix to delete warnings
-
-	* sample/test.rb : comment out Proc#clone tests
-
-	* version.c : add constant RUBY_VM_DATE
-
-	* vm.c : fix some functions
-
-
-2006-02-16(Thu) 22:58:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm.c : use th_yield_setup_args at yield and Proc#call
-
-
-2006-02-16(Thu) 19:51:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix analysis of block parameter
-
-	* disasm.c : remove rb_bug() (temporarily)
-
-	* insns.def, vm.c : fix passing block parameter
-
-	* sample/test.rb : add "Proc = YARVCore::VM::Proc"
-
-	* test/ruby/test_readpartial.rb : disable on mswin32
-
-	* test/socket/test_tcp.rb : ditto
-
-	* thread.c : fix syntax error (for non GCC)
-
-
-2006-02-15(Wed) 22:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h : move rb_clear_cache_by_id position
-
-	* thread.c : fix Thread#kill
-
-	* test/ruby/test_readpartial.rb : enable tests except cygwin version
-
-	* test/ruby/test_signal.rb : ditto and enable timeout
-
-
-2006-02-15(Wed) 22:13:29 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/runit: forgot to commit.
-
-
-2006-02-15(Wed) 22:12:25 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/weakref.rb: do not use Thread.critical=.
-
-	* lib/singleton.rb: ditto.
-
-	* lib/timeout.rb: ditto.
-
-	* lib/thread.rb: ditto.
-
-	* test/inlinetest.rb: forgot to commit.
-
-
-2006-02-15(Wed) 21:34:17 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/test_pp.rb: imported from Ruby CVS trunk HEAD.
-
-	* test/test_shellwords.rb: ditto.
-
-	* test/test_set.rb: ditto.
-
-	* test/test_time.rb: ditto.
-
-	* test/test_ipaddr.rb: ditto.
-
-	* test/test_prettyprint.rb: ditto.
-
-	* test/test_tsort.rb: ditto.
-
-	* test/strscan: ditto.
-
-	* test/testunit: ditto.
-
-
-2006-02-15(Wed) 20:03:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h : duplicate NODE_METHOD at make an alias
-
-	* yarvtest/test_method.rb : add a test for above
-
-
-2006-02-15(Wed) 19:48:59 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/rss: imported from Ruby CVS trunk HEAD.
-
-
-2006-02-15(Wed) 19:47:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c, vm.c : remove methoddef, singletonmethoddef
-	instructions and make new insn definemethod
-
-	* yarvcore.c : set toplevel visibility to private
-
-
-2006-02-15(Wed) 17:39:16 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h : 
-
-	* eval_jump.h, vm.c : localjump_error() and jump_tag_but_local_jump()
-	move to th_localjump_error and th_jump_tag_but_local_jump at vm.c
-
-	* eval.c : ditto
-
-	* eval_load.c : ditto
-
-	* insns.def : ditto
-
-	* vm.c : ditto
-
-	* vm.c (th_make_jump_tag_but_local_jump) : added
-
-	* opt_insn_unif.def : fix indnet (revert change)
-
-	* opt_operand.def : ditto
-
-	* rb/insns2vm.rb : fix error message
-
-	* thread.c : raise exception at join if illegal local jump
-
-
-2006-02-15(Wed) 14:21:45 +900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ChangeLog: add local variables line to support Emacs.
-
-	* eval.c (rb_obj_instance_exec): add new method from 1.9.
-
-	* eval.c (rb_mod_module_exec): ditto.
-
-	* eval.c (yield_under_i): should not pass self as an argument to
-	  the block for instance_eval.  [ruby-core:07364]
-
-	* eval.c (rb_obj_instance_eval): should be no singleton classes for
-	  true, false, and nil.  [ruby-dev:28186]
-
-
-2006-02-14(Tue) 19:30:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c : fix indent
-
-	* eval.c : fix block_given
-
-	* gc.c : add STACK_START and use it as a substitute for
-	rb_gc_stack_start
-
-	* vm.c : fix to raise error if th_yield doesn't have block given
-
-	* yarvcore.c : fix to skip iseq mark array at ObjectSpace.each_object
-
-
-2006-02-14(Tue) 18:15:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* configure.in : enable pthread by deafult
-
-	* ascii.c : import ruby 1.9 HEAD
-
-	* bignum.c : ditto
-
-	* compar.c : ditto
-
-	* configure : ditto
-
-	* defines.h : ditto
-
-	* dln.c : ditto
-
-	* dln.h : ditto
-
-	* enum.c : ditto
-
-	* enumerator.c : ditto
-
-	* euc_jp.c : ditto
-
-	* ext/win32ole/tests/testWIN32OLE.rb : ditto
-
-	* ext/win32ole/win32ole.c : ditto
-
-	* file.c : ditto
-
-	* hash.c : ditto
-
-	* io.c : ditto
-
-	* lex.c : ditto
-
-	* lib/irb/init.rb : ditto
-
-	* lib/rexml/document.rb : ditto
-
-	* main.c : ditto
-
-	* marshal.c : ditto
-
-	* math.c : ditto
-
-	* missing.h : ditto
-
-	* object.c : ditto
-
-	* oniguruma.h : ditto
-
-	* pack.c : ditto
-
-	* process.c : ditto
-
-	* random.c : ditto
-
-	* range.c : ditto
-
-	* rb/ir.rb : ditto
-
-	* re.c : ditto
-
-	* regcomp.c : ditto
-
-	* regenc.c : ditto
-
-	* regenc.h : ditto
-
-	* regerror.c : ditto
-
-	* regexec.c : ditto
-
-	* regint.h : ditto
-
-	* regparse.c : ditto
-
-	* regparse.h : ditto
-
-	* ruby.c : ditto
-
-	* ruby.h : ditto
-
-	* rubyio.h : ditto
-
-	* sjis.c : ditto
-
-	* sprintf.c : ditto
-
-	* st.c : ditto
-
-	* st.h : ditto
-
-	* struct.c : ditto
-
-	* test/ruby/envutil.rb : ditto
-
-	* test/ruby/test_struct.rb : ditto
-
-	* time.c : ditto
-
-	* utf8.c : ditto
-
-	* util.c : ditto
-
-	* util.h : ditto
-
-	* version.h : ditto
-
-	* win32/Makefile.sub : ditto
-
-	* win32/win32.c : ditto
-
-
-2006-02-14(Tue) 16:40:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, eval_proc.c : fix rb_proc_arity
-
-	* eval.c : declare funcall same as send (temporarily)
-
-	* lib/thread.rb : added
-
-	* test/pathname/test_pathname.rb : imported from ruby 1.9
-
-	* test/scanf/data.txt : ditto
-
-	* test/scanf/test_scanf.rb : ditto
-
-	* test/scanf/test_scanfblocks.rb : ditto
-
-	* test/scanf/test_scanfio.rb : ditto
-
-	* test/socket/test_socket.rb : ditto
-
-	* test/socket/test_tcp.rb : ditto
-
-	* test/socket/test_udp.rb : ditto
-
-	* test/socket/test_unix.rb : ditto
-
-	* test/stringio/test_stringio.rb : ditto
-
-	* test/uri/test_common.rb : ditto
-
-	* test/uri/test_ftp.rb : ditto
-
-	* test/uri/test_generic.rb : ditto
-
-	* test/uri/test_http.rb : ditto
-
-	* test/uri/test_ldap.rb : ditto
-
-	* test/uri/test_mailto.rb : ditto
-
-
-2006-02-14(Tue) 15:59:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : Change Thread.critical warnning message
-
-	* lib/webrick.rb : imported from ruby 1.9
-
-	* lib/webrick/accesslog.rb : ditto
-
-	* lib/webrick/cgi.rb : ditto
-
-	* lib/webrick/compat.rb : ditto
-
-	* lib/webrick/config.rb : ditto
-
-	* lib/webrick/cookie.rb : ditto
-
-	* lib/webrick/htmlutils.rb : ditto
-
-	* lib/webrick/httpauth.rb : ditto
-
-	* lib/webrick/httpauth/authenticator.rb : ditto
-
-	* lib/webrick/httpauth/basicauth.rb : ditto
-
-	* lib/webrick/httpauth/digestauth.rb : ditto
-
-	* lib/webrick/httpauth/htdigest.rb : ditto
-
-	* lib/webrick/httpauth/htgroup.rb : ditto
-
-	* lib/webrick/httpauth/htpasswd.rb : ditto
-
-	* lib/webrick/httpauth/userdb.rb : ditto
-
-	* lib/webrick/httpproxy.rb : ditto
-
-	* lib/webrick/httprequest.rb : ditto
-
-	* lib/webrick/httpresponse.rb : ditto
-
-	* lib/webrick/https.rb : ditto
-
-	* lib/webrick/httpserver.rb : ditto
-
-	* lib/webrick/httpservlet.rb : ditto
-
-	* lib/webrick/httpservlet/abstract.rb : ditto
-
-	* lib/webrick/httpservlet/cgi_runner.rb : ditto
-
-	* lib/webrick/httpservlet/cgihandler.rb : ditto
-
-	* lib/webrick/httpservlet/erbhandler.rb : ditto
-
-	* lib/webrick/httpservlet/filehandler.rb : ditto
-
-	* lib/webrick/httpservlet/prochandler.rb : ditto
-
-	* lib/webrick/httpstatus.rb : ditto
-
-	* lib/webrick/httputils.rb : ditto
-
-	* lib/webrick/httpversion.rb : ditto
-
-	* lib/webrick/log.rb : ditto
-
-	* lib/webrick/server.rb : ditto
-
-	* lib/webrick/ssl.rb : ditto
-
-	* lib/webrick/utils.rb : ditto
-
-	* lib/webrick/version.rb : ditto
-
-
-2006-02-14(Tue) 14:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : support "defined?($1)", ...
-
-	* yarvtest/test_syntax.rb : add a test for above
-
-	* rb/makedocs.rb : fix template directory path
-
-	* vm.c : fix to handle break from proc
-
-
-2006-02-14(Tue) 12:42:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : fix rb_iterate hook
-
-	* yarvtest/test_block.rb : add a tests for above
-
-	* vm.c : remove unused comment
-
-
-2006-02-14(Tue) 12:01:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : fix to check passed block at block_given_p
-
-	* eval_proc.c : fix to pass block at Method#call
-
-	* runruby.rb : fix to apply ruby
-
-	* test/runner.rb : GC.stress (comment out)
-
-	* vm.c : fix indnet
-
-
-2006-02-14(Tue) 08:04:33 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/tempfile.rb: use Mutex instead of Thread.critical.
-
-	* lib/rss/dublincore.rb: |x,| -> |x,_| to avoid YARV bug (tmp).
-
-	* lib/rexml: imported from ruby CVS trunk HEAD.
-
-	* test/digest: ditto.
-
-	* test/fileutils: ditto.
-
-	* test/ostruct: ditto.
-
-	* test/erb: ditto.
-
-	* test/optparse: ditto.
-
-	* test/ruby/test_signal.rb: turn off a test to avoid unknown error
-	  (tmp).
-
-
-2006-02-14(Tue) 07:52:03 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/digest: imported from ruby CVS trunk HEAD.
-
-	* test/fileutils: ditto.
-
-	* test/ostruct: ditto.
-
-	* test/erb: ditto.
-
-	* test/optparse: ditto.
-
-
-2006-02-14(Tue) 06:26:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, parse.y : support BEGIN{} (remove local scope)
-
-	* test/ruby/beginmainend.rb : fix to apply YARV's specification
-
-	* test/ruby/test_beginendblock.rb : enable BEGIN{} test
-
-	* signal.c : exit at double segv
-
-	* insns.def (preexe) : remove instruction "preexe"
-
-
-2006-02-14(Tue) 05:53:56 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (ruby_cleanup): th->errinfo contains a NODE while
-	  break'ing, check it before refering klass.
-
-
-2006-02-14(Tue) 05:45:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix stack calc of send
-
-	* sample/test.rb : remove SEGV causing code
-
-
-2006-02-14(Tue) 02:24:21 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_module.rb: list order is not a matter.
-
-	* test/csv: imported from ruby CVS trunk HEAD.
-
-
-2006-02-14(Tue) 02:06:25 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_beginendblock.rb: unlock tests.
-
-	* test/ruby/beginmainend.rb: new file (imported from ruby CVS
-	  trunk HEAD).
-
-	* test/ruby/endblockwarn.rb: new file (imported from ruby CVS
-	  trunk HEAD).
-
-	* test/ruby/test_file.rb: new file (imported from ruby CVS trunk
-	  HEAD).
-
-
-2006-02-14(Tue) 01:42:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* error.c : fix include file positon
-
-	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
-
-
-2006-02-14(Tue) 01:36:57 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_class.rb: new file (imported from rubicon).
-
-
-2006-02-14(Tue) 01:32:23 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_module.rb: ignore PP mixins.
-
-
-2006-02-14(Tue) 01:24:56 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_lambda.rb: removed (->(){...} syntax is
-	  obsolete).
-
-
-2006-02-14(Tue) 01:20:54 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_module.rb: import many tests from rubicon.
-
-
-2006-02-14(Tue) 01:06:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix to avoid stack consistency error
-
-	* yarvtest/test_exception.rb : add a test for above
-
-
-2006-02-14(Tue) 00:42:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, vm_macro.def : rename VM_CALL_SUPER to VM_CALL_SUPER_BIT
-
-	* insns.def (send) : set a flag of super as fcall
-
-	* yarvtest/test_class.rb : add a test for above
-
-
-2006-02-14(Tue) 00:31:24 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_eval.rb: fix typo.
-
-	* test/ruby/test_signal.rb: unlock tests.
-
-
-2006-02-13(Mon) 23:53:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm_macro.def : fix NODE_ZSUPER dispatch and
-	fix error message when super without suitable method ([yarv-dev:846])
-
-	* yarvcore.h : add VM_CALL_SUPER definition
-
-	* yarvtest/test_method.rb : add a test of Module#private_class_method
-
-
-2006-02-13(Mon) 22:49:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : traverse all iseq to find super method ([yarv-dev:859])
-
-	* yarvtest/test_class.rb : add a test for above
-
-	* yarvcore.c : add clear iseq->defined_method_id
-
-	* signal.c : fix to prohibit double segv handler kicked
-
-
-2006-02-13(Mon) 22:09:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_DECL, NODE_CLASS with NODE_CLON3 prefix
-
-	* yarvtest/test_class.rb : add tests for above
-
-
-2006-02-13(Mon) 21:20:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix indent
-
-	* compile.c : fix to prohibit "redo" from eval expression
-
-
-2006-02-13(Mon) 20:36:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : fix constant search bug ([yarv-dev:788])
-
-	* yarvtest/test_class.rb : add a test of [yarv-dev:788]
-
-
-2006-02-13(Mon) 18:09:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_clone.rb : enable tests with Class#clone
-
-	* test/ruby/test_marshal.rb : ditto
-
-
-2006-02-13(Mon) 17:42:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c : support Class#clone
-
-	* compile.c, insns.def : remove popcref
-
-	* yarvcore.h, vm.c, insns.def : remove yarv_thread_t#cref_stack
-
-	* eval.c, eval_intern.h, eval_load.c : ditto
-
-	* yarvtest/test_class.rb : add tests for singleton class
-
-	* gc.c : remove "FRAME *" unused variable
-
-	* insnhelper.h : fix COPY_CREF
-
-	* rb/mklog.rb : add default message
-
-	* vm_macro.def : support NODE_ZSUPER as method type
-
-
-2006-02-13(Mon) 00:11:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c : refoctoring with CFLAGS+=-Wunused
-
-	* eval.c : ditto
-
-	* eval_intern.h : ditto
-
-	* eval_load.c : ditto
-
-	* eval_method.h : ditto
-
-	* eval_proc.c : ditto
-
-	* eval_thread.c : ditto
-
-	* insns.def : ditto
-
-	* parse.y : ditto
-
-	* thread.c : ditto
-
-	* vm.c : ditto
-
-
-2006-02-13(Mon) 02:32:34 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_const.rb: show better message.
-
-	* test/ruby/test_eval.rb: ditto.
-
-	* test/ruby/test_module.rb: new file.
-
-
-2006-02-12(Sun) 22:22:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c : revert last commit
-
-	* ascii.c : ditto 
-
-	* bignum.c : ditto 
-
-	* class.c : ditto 
-
-	* compar.c : ditto 
-
-	* defines.h : ditto 
-
-	* dir.c : ditto 
-
-	* dln.c : ditto 
-
-	* dln.h : ditto 
-
-	* enum.c : ditto 
-
-	* enumerator.c : ditto 
-
-	* error.c : ditto 
-
-	* euc_jp.c : ditto 
-
-	* file.c : ditto 
-
-	* gc.c : ditto 
-
-	* hash.c : ditto 
-
-	* intern.h : ditto 
-
-	* io.c : ditto 
-
-	* lex.c : ditto 
-
-	* main.c : ditto 
-
-	* marshal.c : ditto 
-
-	* math.c : ditto 
-
-	* missing.h : ditto 
-
-	* node.h : ditto 
-
-	* numeric.c : ditto 
-
-	* object.c : ditto 
-
-	* oniguruma.h : ditto 
-
-	* pack.c : ditto 
-
-	* prec.c : ditto 
-
-	* process.c : ditto 
-
-	* random.c : ditto 
-
-	* range.c : ditto 
-
-	* rb/mklog.rb : ditto 
-
-	* re.c : ditto 
-
-	* regcomp.c : ditto 
-
-	* regenc.c : ditto 
-
-	* regenc.h : ditto 
-
-	* regerror.c : ditto 
-
-	* regex.h : ditto 
-
-	* regexec.c : ditto 
-
-	* regint.h : ditto 
-
-	* regparse.c : ditto 
-
-	* regparse.h : ditto 
-
-	* ruby.c : ditto 
-
-	* ruby.h : ditto 
-
-	* rubyio.h : ditto 
-
-	* rubysig.h : ditto 
-
-	* signal.c : ditto 
-
-	* sjis.c : ditto 
-
-	* sprintf.c : ditto 
-
-	* st.c : ditto 
-
-	* st.h : ditto 
-
-	* string.c : ditto 
-
-	* struct.c : ditto 
-
-	* time.c : ditto 
-
-	* utf8.c : ditto 
-
-	* util.c : ditto 
-
-	* util.h : ditto 
-
-	* variable.c : ditto 
-
-	* version.c : ditto 
-
-
-2006-02-12(Sun) 21:33:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c : fix to ruby's indent
-
-	* ascii.c : ditto
-
-	* bignum.c : ditto
-
-	* blockinlining.c : ditto
-
-	* call_cfunc.h : ditto
-
-	* class.c : ditto
-
-	* compar.c : ditto
-
-	* compile.c : ditto
-
-	* compile.h : ditto
-
-	* debug.c : ditto
-
-	* debug.h : ditto
-
-	* defines.h : ditto
-
-	* dir.c : ditto
-
-	* disasm.c : ditto
-
-	* dln.c : ditto
-
-	* dln.h : ditto
-
-	* enum.c : ditto
-
-	* enumerator.c : ditto
-
-	* error.c : ditto
-
-	* euc_jp.c : ditto
-
-	* eval.c : ditto
-
-	* eval_error.h : ditto
-
-	* eval_intern.h : ditto
-
-	* eval_jump.h : ditto
-
-	* eval_load.c : ditto
-
-	* eval_method.h : ditto
-
-	* eval_proc.c : ditto
-
-	* eval_safe.h : ditto
-
-	* eval_thread.c : ditto
-
-	* file.c : ditto
-
-	* gc.c : ditto
-
-	* hash.c : ditto
-
-	* insnhelper.h : ditto
-
-	* insns.def : ditto
-
-	* intern.h : ditto
-
-	* io.c : ditto
-
-	* lex.c : ditto
-
-	* main.c : ditto
-
-	* marshal.c : ditto
-
-	* math.c : ditto
-
-	* missing.h : ditto
-
-	* node.h : ditto
-
-	* numeric.c : ditto
-
-	* object.c : ditto
-
-	* oniguruma.h : ditto
-
-	* opt_insn_unif.def : ditto
-
-	* opt_operand.def : ditto
-
-	* pack.c : ditto
-
-	* prec.c : ditto
-
-	* process.c : ditto
-
-	* random.c : ditto
-
-	* range.c : ditto
-
-	* re.c : ditto
-
-	* re.h : ditto
-
-	* regcomp.c : ditto
-
-	* regenc.c : ditto
-
-	* regenc.h : ditto
-
-	* regerror.c : ditto
-
-	* regex.h : ditto
-
-	* regexec.c : ditto
-
-	* regint.h : ditto
-
-	* regparse.c : ditto
-
-	* regparse.h : ditto
-
-	* ruby.c : ditto
-
-	* ruby.h : ditto
-
-	* rubyio.h : ditto
-
-	* rubysig.h : ditto
-
-	* signal.c : ditto
-
-	* sjis.c : ditto
-
-	* sprintf.c : ditto
-
-	* st.c : ditto
-
-	* st.h : ditto
-
-	* string.c : ditto
-
-	* struct.c : ditto
-
-	* test.rb : ditto
-
-	* thread.c : ditto
-
-	* thread_pthread.h : ditto
-
-	* thread_win32.h : ditto
-
-	* time.c : ditto
-
-	* utf8.c : ditto
-
-	* util.c : ditto
-
-	* util.h : ditto
-
-	* variable.c : ditto
-
-	* version.c : ditto
-
-	* vm.c : ditto
-
-	* vm.h : ditto
-
-	* vm_dump.c : ditto
-
-	* vm_evalbody.h : ditto
-
-	* vm_macro.def : ditto
-
-	* yarv.h : ditto
-
-	* yarv_version.h : ditto
-
-	* yarvcore.c : ditto
-
-	* yarvcore.h : ditto
-
-
-2006-02-12(Sun) 15:53:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/abbrev.rb : added
-
-	* lib/base64.rb : ditto
-
-	* lib/cgi-lib.rb : ditto
-
-	* lib/csv.rb : ditto
-
-	* lib/date2.rb : ditto
-
-	* lib/eregex.rb : ditto
-
-	* lib/ipaddr.rb : ditto
-
-	* lib/irb.rb : ditto
-
-	* lib/irb/cmd/chws.rb : ditto
-
-	* lib/irb/cmd/fork.rb : ditto
-
-	* lib/irb/cmd/help.rb : ditto
-
-	* lib/irb/cmd/load.rb : ditto
-
-	* lib/irb/cmd/nop.rb : ditto
-
-	* lib/irb/cmd/pushws.rb : ditto
-
-	* lib/irb/cmd/subirb.rb : ditto
-
-	* lib/irb/completion.rb : ditto
-
-	* lib/irb/context.rb : ditto
-
-	* lib/irb/ext/change-ws.rb : ditto
-
-	* lib/irb/ext/history.rb : ditto
-
-	* lib/irb/ext/loader.rb : ditto
-
-	* lib/irb/ext/math-mode.rb : ditto
-
-	* lib/irb/ext/multi-irb.rb : ditto
-
-	* lib/irb/ext/save-history.rb : ditto
-
-	* lib/irb/ext/tracer.rb : ditto
-
-	* lib/irb/ext/use-loader.rb : ditto
-
-	* lib/irb/ext/workspaces.rb : ditto
-
-	* lib/irb/extend-command.rb : ditto
-
-	* lib/irb/frame.rb : ditto
-
-	* lib/irb/help.rb : ditto
-
-	* lib/irb/init.rb : ditto
-
-	* lib/irb/input-method.rb : ditto
-
-	* lib/irb/lc/error.rb : ditto
-
-	* lib/irb/lc/help-message : ditto
-
-	* lib/irb/lc/ja/CVS/Entries : ditto
-
-	* lib/irb/lc/ja/CVS/Repository : ditto
-
-	* lib/irb/lc/ja/CVS/Root : ditto
-
-	* lib/irb/lc/ja/error.rb : ditto
-
-	* lib/irb/lc/ja/help-message : ditto
-
-	* lib/irb/locale.rb : ditto
-
-	* lib/irb/notifier.rb : ditto
-
-	* lib/irb/output-method.rb : ditto
-
-	* lib/irb/ruby-lex.rb : ditto
-
-	* lib/irb/ruby-token.rb : ditto
-
-	* lib/irb/slex.rb : ditto
-
-	* lib/irb/version.rb : ditto
-
-	* lib/irb/workspace.rb : ditto
-
-	* lib/irb/ws-for-case-2.rb : ditto
-
-	* lib/irb/xmp.rb : ditto
-
-	* lib/jcode.rb : ditto
-
-	* lib/logger.rb : ditto
-
-	* lib/mailread.rb : ditto
-
-	* lib/mathn.rb : ditto
-
-	* lib/parsedate.rb : ditto
-
-	* lib/pathname.rb : ditto
-
-	* lib/ping.rb : ditto
-
-	* lib/pstore.rb : ditto
-
-	* lib/resolv-replace.rb : ditto
-
-	* lib/resolv.rb : ditto
-
-	* lib/rss.rb : ditto
-
-	* lib/rss/0.9.rb : ditto
-
-	* lib/rss/1.0.rb : ditto
-
-	* lib/rss/2.0.rb : ditto
-
-	* lib/rss/content.rb : ditto
-
-	* lib/rss/converter.rb : ditto
-
-	* lib/rss/dublincore.rb : ditto
-
-	* lib/rss/image.rb : ditto
-
-	* lib/rss/maker.rb : ditto
-
-	* lib/rss/maker/0.9.rb : ditto
-
-	* lib/rss/maker/1.0.rb : ditto
-
-	* lib/rss/maker/2.0.rb : ditto
-
-	* lib/rss/maker/base.rb : ditto
-
-	* lib/rss/maker/content.rb : ditto
-
-	* lib/rss/maker/dublincore.rb : ditto
-
-	* lib/rss/maker/image.rb : ditto
-
-	* lib/rss/maker/syndication.rb : ditto
-
-	* lib/rss/maker/taxonomy.rb : ditto
-
-	* lib/rss/maker/trackback.rb : ditto
-
-	* lib/rss/parser.rb : ditto
-
-	* lib/rss/rexmlparser.rb : ditto
-
-	* lib/rss/rss.rb : ditto
-
-	* lib/rss/syndication.rb : ditto
-
-	* lib/rss/taxonomy.rb : ditto
-
-	* lib/rss/trackback.rb : ditto
-
-	* lib/rss/utils.rb : ditto
-
-	* lib/rss/xml-stylesheet.rb : ditto
-
-	* lib/rss/xmlparser.rb : ditto
-
-	* lib/rss/xmlscanner.rb : ditto
-
-	* lib/rubyunit.rb : ditto
-
-	* lib/scanf.rb : ditto
-
-	* lib/shell.rb : ditto
-
-	* lib/singleton.rb : ditto
-
-	* lib/tsort.rb : ditto
-
-	* lib/weakref.rb : ditto
-
-	* eval_jump.c : removed
-
-
-2006-02-12(Sun) 15:39:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y : fix to remove including env.h
-
-	* yarvtest/test_exception.rb : fix syntax (add 'end')
-
-
-2006-02-12(Sun) 15:14:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* env.h : removed
-
-	* common.mk : remove env.h dependency
-
-	* compile.c, eval_intern.h : remove include env.h
-
-	* vm.c : ditto
-
-	* ruby.h, gc.c, error.c : remove T_SCOPE, T_VARMAP
-
-	* parse.y, eval.c : use rb_parse_in_eval() instead of ruby_in_eval
-
-	* yarvcore.c, yarvcore.h : add a prase_in_eval member to yarv_thread_t
-
-	* insns.def : add push value to throw instruction
-	for stack consistency
-
-	* yarvtest/test_exception.rb : add a test for above
-
-	* test/ruby/test_gc.rb : fix typo
-
-
-2006-02-12(Sun) 05:05:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, eval_intern.h, eval_load.c, eval_proc.c, node.h,
-	insnhelper.h, insns.def, vm.c, yarvcore.c, yarvcore.h : 
-	change cref data structure and unify ruby_class and ruby_cbase
-	and some refoctoring
-
-
-2006-02-11(Sat) 23:41:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (methoddef) : fix method declaration in method
-
-	* thread.c : Thread.critical to show warning (no effect)
-
-
-2006-02-11(Sat) 20:20:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix [yarv-dev:831]
-
-	* yarvtest/test_class.rb : add a test for above
-
-
-2006-02-11(Sat) 14:29:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/mklog.rb : use svk
-
-	* error.c : remove newline
-
-	* eval.c (rb_block_call) : added
-
-	* eval_thread.c : remove some unused functions, comments
-
-	* thread.c : add comments (move from eval_thread.c) and support Mutex
-
-	* thread.c (rb_thread_select) : supported
-
-	* thread_pthread.h (native_mutex_trylock) : added (macro)
-
-	* thread_win32.h (native_mutex_trylock) : added
-
-	* yarvcore.c : remove unused code
-
-	* array.c : import ruby 1.9
-
-	* compar.c : ditto
-
-	* dln.c : ditto
-
-	* enum.c : ditto
-
-	* enumerator.c : ditto
-
-	* ext/digest/digest.c : ditto
-
-	* ext/digest/digest.h : ditto
-
-	* ext/digest/sha2/sha2.c : ditto
-
-	* ext/etc/etc.c : ditto
-
-	* ext/win32ole/win32ole.c : ditto
-
-	* hash.c : ditto
-
-	* intern.h : ditto
-
-	* io.c : ditto
-
-	* main.c : ditto
-
-	* missing.h : ditto
-
-	* missing/flock.c : ditto
-
-	* missing/isinf.c : ditto
-
-	* missing/vsnprintf.c : ditto
-
-	* lib/cgi.rb : ditto
-
-	* lib/complex.rb : ditto
-
-	* lib/delegate.rb : ditto
-
-	* lib/erb.rb : ditto
-
-	* lib/fileutils.rb : ditto
-
-	* lib/matrix.rb : ditto
-
-	* lib/mkmf.rb : ditto
-
-	* lib/optparse.rb : ditto
-
-	* lib/ostruct.rb : ditto
-
-	* lib/pp.rb : ditto
-
-	* lib/timeout.rb : ditto
-
-	* lib/tmpdir.rb : ditto
-
-	* lib/test/unit/autorunner.rb : ditto
-
-	* node.h : ditto
-
-	* object.c : ditto
-
-	* parse.y : ditto
-
-	* ruby.c : ditto
-
-	* sample/test.rb : ditto
-
-	* sprintf.c : ditto
-
-	* st.c : ditto
-
-	* test/ruby/test_whileuntil.rb : ditto
-
-	* test/runner.rb : ditto
-
-	* time.c : ditto
-
-	* lib/net/.document : added
-
-	* lib/net/ftp.rb : ditto
-
-	* lib/net/http.rb : ditto
-
-	* lib/net/https.rb : ditto
-
-	* lib/net/imap.rb : ditto
-
-	* lib/net/pop.rb : ditto
-
-	* lib/net/protocol.rb : ditto
-
-	* lib/net/smtp.rb : ditto
-
-	* lib/net/telnet.rb : ditto
-
-	* lib/open-uri.rb : ditto
-
-
-2006-02-10(Fri) 08:07:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def, yarvcore.h : support defined?(private_method) and
-	defined?(protected_method) (separate DEFINE_METHOD / DEFINE_FUNC)
-
-	* yarvtest/test_syntax.rb : add a test for above
-
-	* compile.c (iseq_compile_each) : fix NODE_RETURN bug
-	(double ensure invoke)
-
-	* yarvtest/test_flow.rb : add a test for above
-
-	* eval.c (get_errinfo) : fix to search $!
-
-	* yarvtest/test_exception.rb : add tests for above
-
-	* eval_safe.h : support $SAFE
-
-	* ext/socket/socket.c : import ruby 1.9
-
-	* gc.c (gc_mark_children) : fix making T_VALUE
-
-	* test/ruby/test_gc.rb : use GC.stress
-
-	* signal.c (sighandler) : send interrupt signal if thread blocked
-
-	* test/ruby/test_proc.rb : remove assert false
-
-	* test/ruby/test_readpartial.rb : change fail message
-
-	* test/ruby/test_signal.rb : remove assert false
-
-	* thread.c (thread_start_func_2) : set local_lfp/local_svar
-	at thread creation
-
-	* thread_pthread.h : export native_thread_interrupt
-
-	* thread_win32.h : export native_thread_interrupt
-
-	* version.h : import ruby 1.9
-
-	* vm.c (lfp_svar), yarvcore.h : fix to use Thread local svar
-
-	* yarvtest/test_thread.rb : add a test for above
-
-	* win32/Makefile.sub : import ruby 1.9
-
-	* win32/dir.h : ditto
-
-	* win32/setup.mak : ditto
-
-	* win32/win32.c : ditto
-
-	* yarvtest/yarvtest.rb : fix to remove using ARGV
-
-
-2006-02-10(Fri) 01:04:58 +0900  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
-	  invoking finalizers.
-
-	* gc.c (rb_gc_finalize_deferred): ditto.
-
-
-2006-02-08(Wed) 23:17:44 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_proc.rb: method names were wrongly duplicated.
-
-
-2006-02-08(Wed) 21:30:01 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/nkf: added (imported from ruby CVS trunk HEAD).
-
-	* ext/nkf/depend: new file (rev 1.5).
-
-	* ext/nkf/extconf.rb: new file (rev 1.2).
-
-	* ext/nkf/nkf.c: new file (rev 1.12).
-
-	* ext/nkf/test.rb: new file (rev 1.7).
-
-	* ext/nkf/nkf-utf8/nkf.c: new file (rev 1.17).
-
-	* ext/nkf/nkf-utf8/config.h: new file (rev 1.4).
-
-	* ext/nkf/nkf-utf8/utf8tbl.c: new file (rev 1.6).
-
-	* ext/nkf/lib/kconv.rb: new file (rev 1.13).
-
-	* test/nkf: added (imported from ruby CVS trunk HEAD).
-
-	* test/nkf/test_kconv.rb: new file (rev 1.1).
-
-	* test/nkf/test_nkf.rb: new file (rev 1.1).
-
-
-2006-02-08(Wed) 21:07:36 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/find.rb: new file (imported from ruby CVS trunk HEAD,
-	  rev 1.15).
-
-
-2006-02-07(Tue) 17:58:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : support BEGIN{} and add preexe instruction
-
-	* insns.def : fix getspecial/setspecial instructions
-	to catch up svar change
-
-	* test/ruby/test_system.rb : remove stopper
-
-	* thread.c (rb_thread_fd_writable) : add a debug output
-
-	* thread.c (rb_thread_wait_fd) : add a debug output
-
-	* vm.c (lfp_svar) : refactoring and fix some problems
-
-	* vm_dump.c (yarv_bug) : add branch
-
-	* yarv.h : remove unused declarations
-
-	* yarvcore.c (vm_free) : VM object should not free by GC
-
-
-2006-02-07(Tue) 14:42:25 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, eval_load.c : remove rb_thread_start_1()
-
-	* eval.c : fix some prototypes and indents
-
-	* eval_thread.c, thread.c : move some functions
-	from eval_thread.c to thread.c
-
-	* signal.c (sighandler) : add line braek in error message
-
-	* yarvcore.c, yarvcore.h, thread.c : support ThreadGroup
-
-	* ruby.h, gc.c, vm.c : make new basic type RValue and T_VALUE.
-	RValue includes three values in itself.  RValue is used as
-	svar
-
-
-2006-02-06(Mon) 23:51:41 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_hash.rb: import many tests from rubicon.
-
-
-2006-02-04(Sat) 18:36:41 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_array.rb: import many tests from rubicon.
-
-
-2006-02-04(Sat) 17:47:44 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_signal.rb (test_exit_action): lib/timeout.rb is
-	  not implemented yet.
-
-
-2006-02-04(Sat) 17:42:31 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_readpartial.rb: lib/timeout.rb is not implemented
-	  yet.
-
-
-2006-02-04(Sat) 16:22:38 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_pipe.rb: remove useless require.
-
-	* test/ruby/test_signal.rb: turn off the test case which causes
-	  segmentation fault (tmp).
-
-
-2006-02-04(Sat) 08:19:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add dependency to yarvcore.h on signal.o
-
-	* compile.c (iseq_compile_each) : fix [yarv-dev:795] problem
-	(prohibit "break", "next" jump from eval)
-
-	* eval.c : fix indent
-
-	* eval_thread.c, thread.c : remove some functions and move to thread.c
-
-	* insns.def, vm.c : fix [yarv-dev:799] and [yarv-dev:800]
-
-	* yarvtest/test_class.rb : add a test for above
-
-	* test/ruby/test_gc.rb : remove GC.debug_flag control
-
-	* test/ruby/test_readpartial.rb : disable
-
-	* test/ruby/test_signal.rb : disable
-
-	* thread.c : fix thread_debug() and many bugs
-
-	* thread.c (yarv_thread_s_new) : move living_threads setting
-
-	* thread.c (yarv_thread_join) : fix
-
-	* thread_pthread.h : add type native_thread_data_t (dummy)
-	and support interrupt blocking thread
-
-	* thread_pthread.h (native_thread_apply_priority) : added
-
-	* thread_win32.h : add type native_thread_data_t (dummy)
-	and support interrupt blocking thread
-
-	* yarvcore.h : use win32 thread system on cygwin and fix
-	some struct members
-
-	* yarvtest/test_thread.rb : added
-
-
-2006-02-03(Fri) 00:08:09 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_string.rb: import many tests from rubicon.
-
-
-2006-02-02(Thu) 23:20:13 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/envutil.rb: new file (imported from ruby trunk HEAD).
-
-	* test/ruby/marshaltestlib.rb: ditto.
-
-	* test/ruby/test_array.rb: ditto.
-
-	* test/ruby/test_beginendblock.rb: ditto.
-
-	* test/ruby/test_clone.rb: ditto.
-
-	* test/ruby/test_dir.rb: ditto.
-
-	* test/ruby/test_env.rb: ditto.
-
-	* test/ruby/test_file.rb: ditto.
-
-	* test/ruby/test_float.rb: ditto.
-
-	* test/ruby/test_fnmatch.rb: ditto.
-
-	* test/ruby/test_hash.rb: ditto.
-
-	* test/ruby/test_io.rb: ditto.
-
-	* test/ruby/test_marshal.rb: ditto.
-
-	* test/ruby/test_math.rb: ditto.
-
-	* test/ruby/test_pack.rb: ditto.
-
-	* test/ruby/test_path.rb: ditto.
-
-	* test/ruby/test_pipe.rb: ditto.
-
-	* test/ruby/test_rand.rb: ditto.
-
-	* test/ruby/test_range.rb: ditto.
-
-	* test/ruby/test_readpartial.rb: ditto.
-
-	* test/ruby/test_regexp.rb: ditto.
-
-	* test/ruby/test_settracefunc.rb: ditto.
-
-	* test/ruby/test_signal.rb: ditto.
-
-	* test/ruby/test_sprintf.rb: ditto.
-
-	* test/ruby/test_string.rb: ditto.
-
-	* test/ruby/test_stringchar.rb: ditto.
-
-	* test/ruby/test_struct.rb: ditto.
-
-	* test/ruby/test_symbol.rb: ditto.
-
-	* test/ruby/test_system.rb: ditto.
-
-	* test/ruby/test_time.rb: ditto.
-
-	* test/ruby/ut_eof.rb: ditto.
-
-
-2006-02-02(Thu) 22:53:44 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_proc.rb: test [yarv-dev:777].
-
-
-2006-02-01(Wed) 03:51:39 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c : add GC.debug_flag= method
-
-	* insns.def : support method definition in method
-
-	* yarvtest/test_method.rb : add tests for above
-
-
-2006-01-29(Sun) 11:40:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_proc.c (proc_alloc) : fix [yarv-dev:777]
-
-	* yarvtest/test_proc.rb : add a test for above
-
-	* insns.def : fix [yarv-dev:782] and add YARV_CHECK_INTS()
-
-	* yarvtest/test_class.rb : add a test for above
-
-	* thread_win32.h : fix [yarv-dev-en:23]
-
-	* vm.c (th_call0) : add YARV_CHECK_INTS()
-
-
-2006-01-09(Mon) 11:56:34 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* yarvcore.h: add prototype (remove warning).
-
-	* vm.c (th_invoke_proc): make save variables volatile.
-
-	* eval.c (eval): initialize local variables (remove warnings).
-
-	* eval_thread.c (rb_exec_recursive): ditto.
-
-	* yarvcore.c (thread_mark): ditto.
-
-	* vm.c (th_invoke_proc): ditto.
-
-	* eval.c: remove useless prototypes.
-
-
-2006-01-09(Mon) 10:25:12 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* eval_thread.c: rb_thread_join is required to build ruby on
-	  Linux.
-
-	* compile.c: unify coding style.
-
-	* yarvcore.c: ditto.
-
-
-2006-01-06(Fri) 09:21:34 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* vm.c: coding style change only.
-
-
-2006-01-04(Wed) 14:12:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (ruby_init), eval_intern.h : use POP_TAG_INIT() at bootstrap
-
-	* eval_thread.c : remove unused functions and comments
-
-	* intern.h : expose rb_make_exception()
-
-	* signal.c : support signal
-
-	* thread.c (yarv_thread_execute_interrupts) : added
-
-	* thread_pthread.h (thread_timer) : set interrupt_flag of
-	current runnning threads
-
-	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
-	occurres
-
-	* yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
-
-	* yarvcore.c : add yarv_segv() and segv() method for test
-
-	* yarvcore.c (Init_yarvcore) : set yarv_thread_t#running_thread
-
-	* yarvcore.h : fix yarv_thread_t members
-
-
-2006-01-03(Tue) 22:25:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* disasm.c (insn_operand_intern) : fix to add child iseq
-
-	* eval.c, gc.c : remove obsolete static variables (ruby_scope,
-	ruby_dyna_vars, ruby_frame)
-
-	* eval.c (rb_mod_s_constants) : use ruby_cref()
-
-	* eval.c (eval) : use th_restore_klass()
-
-	* eval_proc.c (rb_f_binding) : use th_store_klass()
-
-	* insns.def (concatarray) : fix insn ([expr, *nil] => [expr])
-
-	* vm.c (th_set_env), insnhelper.h : remove macro
-
-	* vm.c (eval_get_cvar_base) : use get_cref
-
-	* vm.c (th_make_proc) : use th_store_klass()
-
-	* vm_macro.def (macro_eval_invoke_func) : fix option args size
-
-	* vm_macro.def (macro_eval_invoke_func) : raise stack overflow error
-
-	* yarvcore.h : add yarv_stored_klass_t type
-
-	* yarvcore.c : fix mark functions around yarv_stored_klass_t
-
-
-2006-01-01(Sun) 05:14:26 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/benchmark.rb: new file (imported from original ruby, rev
-	  1.10).
-
-
-2006-01-01(Sun) 03:51:10 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* yarvcore.c: add prototype.
-
-	* re.c: remove warning: long -> unsigned long.
-
-	* debug.c: adjust coding style.
-
-	* yarv.h: ditto.
-
-
-2006-01-01(Sun) 03:43:33 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* variable.c: add prototype.
-
-	* eval.c: ditto.
-
-	* eval_load.c: ditto.
-
-
-2006-01-01(Sun) 02:41:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add address analyse to vtune rule
-
-	* rb/vtlh.rb : added for above
-
-	* rb/insns2vm.rb, template/vm.inc.tmpl : insert #line directive
-	to reference above
-
-	* vm_macro.def (macro_eval_invoke_cfunc) : fix indent
-
-	* yarvtest/test_method.rb : fix indent, spacing
-	and add a test for alias
-
-
-2005-12-31(Sat) 12:42:05 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add Intel VTune rule (make vtune)
-
-	* eval.c, yarvcore.h : fix to remove yarv_thread_t#local_*
-
-	* parse.y (top_local_init_gen) : fix a problem ([yarv-dev:765])
-
-	* yarvtest/test_eval.rb : add a test for above
-
-	* vm.c (thread_eval) :remove unused function
-
-	* yarvcore.c (Init_yarvcore) : remove YARVCore::Thread::eval method
-
-	* yarvcore.c (thread_eval) : remove unused function
-
-
-2005-12-31(Sat) 06:05:00 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (eval_search_super_klass) : pass block to method missing
-
-	* vm_macro.def (macro_eval_invoke_method) : ditto
-
-	* yarvtest/test_method.rb : add a test for above
-
-
-2005-12-31(Sat) 03:11:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (eval), eval_proc.c (rb_f_binding) : save klass, etc to
-	binding and use it at eval
-
-	* eval_intern.h : ditto
-
-	* yarvtest/test_eval.rb : add tests for above
-
-	* yarvcore.c (th_get_special_cref) : added
-
-	* yarvcore.h : add a prototype of above
-
-	* vm.c (th_get_cref) : refactoring
-
-	* vm.c (eval_get_ev_const) : fix SEGV at A::B (A is not class/module)
-	([yarv-dev:758])
-
-	* yarvtest/test_bin.rb : add a test for above
-
-	* rb/mklog.rb : use external diff command and show function name
-
-
-2005-12-30(Fri) 19:07:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, yarvcore.h, eval.c, eval_proc.c : support
-	Ruby's Binding
-
-	* yarvcore.c : support TOPLEVEL_BINDING
-
-	* yarvtest/test_eval.rb : add tests for above
-
-
-2005-12-30(Fri) 13:12:28 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_eval.rb: more tests for
-	  module_eval/instance_eval.
-
-
-2005-12-30(Fri) 05:06:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add dependency (yarvcore.h) for gc.c
-
-	* eval.c, eval_intern.h, eval_load.c, eval_method.h,
-	insns.def, insnhelper.h, vm.c, yarvcore.c, yarvcore.h :
-	re-write class reference
-
-	* yarvtest/test_eval.rb : added
-
-	* yarvtest/test_proc.rb : 
-
-
-2005-12-29(Thu) 12:27:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h :
-	remvoe needless yarv_iseq_t#rewind_frame_size
-
-
-2005-12-29(Thu) 11:17:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add dependency to test-all rule
-
-	* eval.c (rb_sourceline), vm.c (th_get_sourceline) :
-	fix to skip process if iseq is ifunc
-
-	* test/ruby/test_lambda.rb : assert(fail, ...) instead of assert_fail
-
-	* test/ruby/test_proc.rb : ditto
-
-	* vm_dump.c : fix stack dump (iseq name)
-
-	* vm_macro.def : store proc (block proc) to cfp#proc for GC mark
-
-	* yarvcore.c : mark above on thread_mark
-
-	* eval.c (exec_under) : replace block#self ([yarv-dev:751])
-
-
-2005-12-29(Thu) 01:56:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : fix setting of Proc cref ([yarv-dev:741])
-
-	* yarvcore.c : fix indent
-
-
-2005-12-29(Thu) 00:17:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* disasm.c : show (block) local variable simple (not as symbol)
-
-	* gc.c : fix syntax error
-
-
-2005-12-28(Wed) 23:35:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (method_entry) : fixed for undefed method ([yarv-dev:743])
-
-	* compile.c : fix errinfo dvar id (#$!)
-	and fix NODE_ERRINFO compilation
-
-	* eval_proc.c, yarvcore.c : support YARVCore::VM::Proc.new
-
-	* insns.def : remove useless TODO comments
-
-	* insns.def : fix to use strict array conversion on
-	checkarrayinclude
-
-	* insns.def : fix defined?(yield) ([yarv-dev:744])
-
-	* yarvcore.h : change yarv_iseq_t layout
-
-
-2005-12-28(Wed) 16:49:55 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_eval.rb: add TODO comment.
-
-	* test/ruby/test_iterator.rb: rename YARVCore::VM::Proc -> Proc
-	  (tmp).
-
-	* test/ruby/test_lambda.rb: use assert_fail.
-
-	* test/ruby/test_proc.rb: ditto.
-
-
-2005-12-28(Wed) 16:28:35 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_clone.rb: removed (tmp).
-
-	* test/ruby/test_eval.rb: define missing method Object#funcall
-	  (tmp).
-
-	* test/ruby/test_lambda.rb: turn off tests for "->".
-
-	* test/ruby/test_proc.rb: turn off tests for |&b|.
-
-	* test/ruby/test_proc.rb: turn off tests for $SAFE setter.
-
-
-2005-12-28(Wed) 15:31:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix calculation of stack_max
-
-	* eval.c (rb_iter) : fix block/retry handling
-
-	* yarvtest/test_flow.rb : add tests for above
-
-	* insns.def : fix block passing on super (super(&nil))
-
-	* vm_macro.def, insns.def : fix convert method of object to array
-
-	* yarvtest/test_method.rb : fix a test for above
-
-	* vm.c : fix backtrace generate algorithm
-
-
-2005-12-28(Wed) 10:36:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h : refactoring (remove self passing, etc)
-
-	* disasm.c : support showing ID of method/dynamic local variables
-
-	* rb/allload.rb : add verbose version (it's enable by $DEBUG)
-
-	* template/insns.inc.tmpl, template/insns_info.inc.tmpl,
-	template/minsns.inc.tmpl, template/opt_sc.inc.tmpl,
-	template/optinsn.inc.tmpl, template/optunifs.inc.tmpl,
-	template/vmtc.inc.tmpl : fix a comment
-
-	* variable.c (mod_av_set) : fix to clear inline cache ([yarv-dev:720])
-
-	* eval_method.h : fix to clear inline method cache
-
-	* vm.c, rb/insns2vm.rb, template/insns_info.inc.tmpl, compile.c,
-	insns.def, vm_evalbody.h, vm_macro.def :
-	fix operands types (ulong -> num_t, ...)
-
-	* vm_macro.def : fix to check SPECIAL_CONST_P() at splat array
-	([yarv-dev:722])
-
-	* yarvcore.c : fix to throw syntax error
-
-	* yarvcore.h, eval.c, eval_error.h, eval_jump.h :
-	add yarv_vm_t#exit_code to fix problem at cleanup ([yarv-dev:723])
-
-	* insns.def : fix to invoke zsuper in method defined by define_method
-	([yarv-dev:704])
-
-	* yarvtest/test_class.rb : add tests for above
-
-	* yarvtest/test_method.rb : fix comments
-
-
-2005-12-27(Tue) 01:52:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c, intern.h, insns.def : expose rb_ary_replace and use it
-	in insns.def
-
-	* eval.c : fix to use SCOPE_* to NOEX_*
-
-	* eval_intern.h : remove SCOPE_*
-	and fix SCOPE_TEST() and SCOPE_SET(f)
-
-	* eval_load.c : save and store klass and visibility
-	at require and load
-
-	* eval_method.h : fix undefed method node ([yarv-dev-en:8])
-
-	* eval_proc.c : fix define_method ([yarv-dev:704])
-
-	* insnhelper.h, vm.h : remove GET_VM_STATE_VERSION(),
-	INC_VM_STATE_VERSION() and move these to vm.h
-
-	* insns.def : supportintg visibility
-
-	* node.h : remove NOEX_RECV
-
-	* variable.c, vm.c : add rb_vm_change_state() and use it in
-	remove_const
-
-	* vm.c, insns.def, yarvcore.h, yarvcore.c : add eval_push_cref(),
-	eval_pop_cref() and th_cref_init to manage current visibility
-
-	* yarv.h : add a prototype of rb_vm_change_state()
-
-	* yarvcore.h, insns.def : add defined_method_id and support
-	super in define_method scope
-
-	* yarvtest/test_class.rb : add tests for above
-
-
-2005-12-26(Mon) 20:44:38 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_basicinstructions.rb: new file.
-
-
-2005-12-26(Mon) 08:40:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (eval_get_ev_const) : fix to skip nil
-
-
-2005-12-26(Mon) 08:27:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.h : fix GET_CVAR_EV_KLASS [yarv-dev:703]
-
-
-2005-12-26(Mon) 07:51:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : add emptstack insn for all NODE_RETURN
-	and optimize it if it's not needed
-
-	* yarvtest/test_flow.rb : add a test for above
-
-
-2005-12-26(Mon) 07:08:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, gc.c : add "gc_debug_flag" to debug gc
-
-	* insns.def : add emptstack
-
-	* compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl :
-	change interface of insn_stack_increase
-
-	* compile.c : fix return from ensure in method [yarv-dev:702]
-
-	* yarvtest/test_flow.rb : add tests for above
-
-
-2005-12-26(Mon) 02:15:02 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/ruby/test_alias.rb: do not use unimplemented defined?.
-
-
-2005-12-26(Mon) 02:00:11 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* test/runner.rb: new file.
-
-	* test/ruby/test_alias.rb: new file.
-
-	* test/ruby/test_clone.rb: new file.
-
-	* test/ruby/test_eval.rb: new file.
-
-	* test/ruby/test_iterator.rb: new file.
-
-	* test/ruby/test_lambda.rb: new file.
-
-	* test/ruby/test_proc.rb: new file.
-
-	* test/ruby/test_super.rb: new file.
-
-	* test/ruby/test_assignment.rb: new file.
-
-	* test/ruby/test_bignum.rb: new file.
-
-	* test/ruby/test_call.rb: new file.
-
-	* test/ruby/test_case.rb: new file.
-
-	* test/ruby/test_condition.rb: new file.
-
-	* test/ruby/test_const.rb: new file.
-
-	* test/ruby/test_defined.rb: new file.
-
-	* test/ruby/test_exception.rb: new file.
-
-	* test/ruby/test_gc.rb: new file.
-
-	* test/ruby/test_ifunless.rb: new file.
-
-	* test/ruby/test_method.rb: new file.
-
-	* test/ruby/test_trace.rb: new file.
-
-	* test/ruby/test_variable.rb: new file.
-
-	* test/ruby/test_whileuntil.rb: new file.
-
-
-2005-12-25(Sun) 07:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, compile.c : fix block inlining
-
-	* rb/insns2vm.rb : fix to support tracing stack depth
-	with operands unification
-
-	* vm_dump.c : fix to print Qundef on stack dump
-
-
-2005-12-25(Sun) 01:45:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c, rb/insns2vm.rb, template/insns_info.inc.tmpl : 
-	trace stack depth at compile time
-	and use it  as cont_sp for exception handling
-
-	* yarvtest/test_exception.rb : add tests for above
-
-	* yarvtest/test_flow.rb : ditto
-
-	* Merry Xmas :)
-
-
-2005-12-24(Sat) 19:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h : fix ADD_CATCH_ENTRY and add LABEL#sp
-
-	* eval_jump.h : fix catch to remove illegal error
-
-
-2005-12-24(Sat) 09:05:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_method.h : change data structure for RClass#m_tbl
-
-	* class.c, eval.c, eval_proc.c : fix for above changes
-
-	* node.h, gc.c : change NODE_FBODY, NODE_METHOD members
-	for above changes
-
-	* insns.def : support private/protected visibility
-
-	* vm_macro.def : ditto
-
-	* vm.c : ditto
-
-	* thread.c : fix typo
-
-	* thread_pthread.h : fix typo
-
-	* thread_win32.h : fix typo
-
-	* eval.c, yarvcore.h : add yarv_thread_t#method_missing_reason
-	to pass method_missing reason and use it to build error message
-
-	* compile.c : use ADD_CALL instead of ADD_SEND for
-	NODE_X(D)STR, NODE_CONST (func)
-
-
-2005-12-22(Thu) 02:45:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv_version.h, Changes : 0.3.3
-
-
-2005-12-20(Tue) 04:04:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix self::Const access
-
-	* yarvtest/test_bin.rb : add a test for above
-
-
-2005-12-20(Tue) 01:52:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix to expand VALUES value
-
-	* yarvtest/test_massign.rb : add a test for above
-
-
-2005-12-20(Tue) 01:32:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, insnhelper.h : fix cvar in singleton method/class
-
-	* yarvtest/test_bin.rb : add tests for above
-
-
-2005-12-20(Tue) 01:03:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h : support all defined?() syntax
-
-	* compile.c : fix NODE_COLON2 
-
-	* yarvtest/test_bin.rb : add or fix tests for above
-
-	* win32/* : update all
-
-
-2005-12-17(Sat) 10:46:08 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* vm_macro.def: fix printf type mismatch for LP64 system (again).
-
-	* parse.y: introduce descriptive macro for special values of
-	  lvtbl->dvars.
-
-
-2005-12-17(Sat) 09:39:27 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* vm_macro.def (macro_eval_invoke_method): fix printf type mismatch
-	  for LP64 system.
-
-
-2005-12-14(Wed) 03:49:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : change rescue/ensure iseq name
-
-	* eval.c, intern.h : fix a prototype
-
-	* insns.def, yarvcore.h : add trace_function
-
-	* vm.c : fix deadly bug (illegal pointer cast)
-
-	* vm_dump.c : remove unused local variables
-
-	* vm_macro.def : add parameter size check
-
-	* yarvtest/test_bin.rb : comment out 2 assertions
-
-
-2005-12-13(Tue) 03:55:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_proc.c : fix indent
-
-	* insns.def : fix getspecial instruction to return nil
-	if no entry
-
-	* yarvtest/test_syntax.rb : add a test for above
-
-	* lib/un.rb : added
-
-	* template/*.tmpl : fix typo
-
-
-2005-12-13(Mon) 01:38:17 +0900  Minero Aoki  <aamine@loveruby.net>
-
-	* yarv.h: add prototypes.
-
-	* intern.h: ditto.
-
-	* eval.c: ditto.
-
-	* debug.c: ditto.
-
-	* thread_pthread.h: fix printf type mismatch for LP64 system
-	  (Linux/AMD64).
-
-	* variable.c: ditto.
-
-	* object.c: ditto.
-
-	* gc.c: ditto.
-
-	* process.c: ditto.
-
-	* error.c: ditto.
-
-	* vm.c: ditto.
-
-	* vm.h: ditto.
-
-	* vm_dump.c: ditto.
-
-	* disasm.c: ditto.
-
-	* marshal.c: ditto.
-
-	* eval_thread.c: ditto.
-
-
-2005-12-11(Sun) 22:00:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : call "inherited" method when a class is inherited
-
-	* yarvcore.h : fix yarv_iseq_t field layout
-
-	* common.mk : add dependence on yarvcore.h to eval*.o files
-
-	* compile.c : fix NODE_POSTEXE logic
-
-	* insnhelper.h : use GC_GUARDED_PTR_REF instead of magic number
-
-	* eval_proc.c : fix indent
-
-	* configure : re-autoconf
-
-
-2005-12-10(Sat) 03:57:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : fix blockinlining.o build rule
-
-	* insns.def : remove logic for zsuper
-
-	* template/optinsn.inc.tmpl : 
-
-	* vm.c : remove thread_yield_light_prepare, thread_yield_light_invoke
-
-	* compile.c : support NODE_ZSUPER with optargs, restarg
-
-	* yarvtest/test_class.rb : add tests for above
-
-
-2005-12-09(Fri) 01:13:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c, numeric.c, range.c : add prototype of
-	block inlining function
-
-	* blockinlining.c, vm_opts.h.base : add block inlining flag 
-
-	* common.mk, debug.h, debug.c : add debug_breakpoint() for gdb
-
-	* compile.c : fix to use size_t on compile_data_alloc(),
-	fix illegal cast, fix to set arg_simple at compiling block,
-
-	* compile.c, vm.c : fix NODE_NEXT, NODE_BREAK logic
-
-	* yarvtest/test_flow.rb : add a test for above
-
-	* yarvcore.c, yarvcore.h, compile.c, eval.c : remove
-	yarv_iseq_t#root_iseq and add yarv_iseq_t#local_iseq and fix
-	to use this member field
-
-	* eval_method.h : fix indent
-
-	* gc.c : fix indent
-
-	* insns.def, compile.c : remove "zsuper" instruction (use "super"
-	instead).  This is because NODE_ZSUPER represent with only "super"
-	instruction
-
-	* yarvcore.c : add proc_arity
-
-
-2005-12-05(Mon) 03:58:30 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c, blockinlining.c : support block inlining for Array#each
-
-	* disasm.c : fix catch table format
-
-	* insns.def : fix stack consistency error message
-
-	* vm.c : fix to skip pushing value at "next"
-
-	* yarvcore.h : move definision of 
-	"struct iseq_compile_data_ensure_node_stack" to compile.c
-
-	* compile.c : fix ensure catch table creation
-
-	* yarvtest/test_flow.rb : add tests for above
-
-
-2005-12-03(Sat) 22:27:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, compile.c, yarvcore.c, yarvcore.h,
-	numeric.c, range.c : collect block inlining logic to blockinlining.c
-
-
-2005-12-03(Sat) 20:24:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* blockinlining.c, common.mk : add blockinlining.c
-
-	* yarvcore.c, yarvcore.h, blockinlining.c, compile.c, compile.h,
-	gc.c, node.h, numeric.c, range.c :
-	support block inlining for Integer#times, Range#each
-
-	* compile.c : fix to set block redo/next point at last,
-	and fix NODE_OP_ASGN1
-
-	* compile.c, vm.c : add specialized instruction "opt_le"
-
-	* disasm.c : fix to show block, and to show catch type as string
-	and change node_name logic
-
-	* eval_thread.c : fix function type declaration
-
-	* insns.def : add instruction "putundef", "opt_checkenv"
-	to support block inlining and add stack check routine
-
-	* lib/cgi.rb : add global variable $CGI_DONTINPUT
-
-	* opt_operand.def : add some operand unification rules
-
-	* rb/insns2vm.rb : fix operand unification logic for BLOCKISEQ
-
-	* vm.c : fix exception handling routine (collect stack operations)
-
-	* vm_macro.def : fix macro_eval_invoke_bmethod
-
-	* yarvsubst.c : removed
-
-	* yarvtest/test_syn.rb : rename to yarvtest/test_syntax.rb
-
-	* yarvtest/yarvtest.rb : remove tempfile explicitly
-
-
-2005-11-30(Wed) 01:13:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add vm_opts.h rule
-
-	* vm.c, insns.def : fix proc creation under class and block
-	environment
-
-
-2005-11-29(Tue) 16:39:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, eval_proc.c, vm.c, vm_macro.def : 
-	support define_method and invoke NODE_BMETHOD method
-
-
-2005-11-29(Tue) 13:18:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : add iseq_add_mark_object, iseq_add_mark_object_compile_time
-	and use it to mark objects on iseq
-
-	* compile.h, compile.c : remove cast on NEW_CHILD_ISEQVAL, NEW_ISEQVAL
-	and interface
-
-	* compile.c, disasm.c, insns.def, vm_macro.def, rb/insns2vm.rb :
-	add BLOCKISEQ parameter type
-
-	* gc.c : fix garbage_collect to return true if only allocate memory
-
-	* vm.c : fix insertion order of proc/env
-
-	* vm_evalbody.h : add typedef yarv_iseq_t *BLOCKISEQ
-
-	* yarvcore.c, yarvcore.c : add idTimes
-
-	* yarvcore.c : fix proc_mark, env_mark around iseq mark
-
-
-2005-11-28(Mon) 09:02:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def, vm_evalbody.h : support super
-	with splat argument and block (and zsuper with block)
-
-	* yarvtest/test_class.rb : add tests for above
-
-	* compile.c, yarvcore.h, yarvcore.c, insns.def, time.c, string.c :
-	add opt_succ insn
-
-	* eval_method.h : fix indent
-
-	* eval_thread.c : apply cast to vanish a warning
-
-	* lib/tempfile.rb, lib/tmpdir.rb : added
-
-	* vm.c : eval_method_missing added
-
-	* vm_macro.def : refactoring
-
-
-2005-11-21(Mon) 21:21:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h, yarvcore.c : remove "iseqobj"
-	variables and rename to "iseq"
-
-
-2005-11-21(Mon) 07:31:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix block parameter error
-
-	* ext/* : added
-
-	* lib/optparse* : added
-
-	* benchmark/bm_so_sieve.rb : fix parameter
-
-
-
-2005-11-21(Mon) 03:47:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : optimize condition in literal
-
-	* thread_win32.h : fix win32 thread function prototype
-
-
-2005-11-20(Sun) 17:58:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix NODE_AND/OR bug
-
-	* eval.c : support rb_frame_this_func()
-
-
-2005-11-20(Sun) 12:32:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.c, yarvcore.h : support NODE_OPT_N
-
-	* compile.h : add macro ADD_CALL
-
-	* debug.c : add debug_v() and change to use only printf
-	on debug_id()
-
-	* sample/test.rb : 
-
-	* vm.c : fix make_proc_from_block
-
-
-2005-11-19(Sat) 14:55:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* import ruby 1.9.0 (2005-11-18)
-
-
-2005-11-19(Sat) 06:08:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/test : added
-
-
-2005-11-19(Sat) 05:48:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : useless jump elimination (if/unless destination)
-
-	* eval.c : rb_iter_break support,
-	 fix rb_iterate (clear errinfo if break)
-
-	* eval_proc.c : support rb_node_arity (YARV_METHOD_NODE)
-
-	* insns.def : change variable name
-
-	* vm.c : fix th_invoke_yield and add th_iter_break()
-
-	* vm_dump.c : fix yarv_bug()
-
-	* yarvcore.c : fix proc_mark to check IFUNC node and add
-	global ruby method SDR() for debug
-
-	* yarvtest/test_syn.rb : add a test for all condition combination
-
-
-2005-11-15(Tue) 05:52:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/forwardable.rb : added
-
-	* common.mk : remove "vm.o : CFLAGS += -fno-crossjumping" rule
-
-	* compile.c, yarvcore.h, insns.def : add FCALL/VCALL flag
-
-	* compile.c, insns.def : add onceinlinecache instruction
-
-	* eval.c : support $!, $@, raise (== raise $!)
-
-	* opt_operand.def : add some unification rule (send flags)
-
-	* vm.c : fix return process
-
-	* vm_macro.def : fix option prameters
-
-	* yarvtest/test_method.rb : add tests for above
-
-
-2005-11-15(Tue) 00:42:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : support rb_frame_pop() and rb_frame_callee(),
-	add rb_sourcefile(), rb_souceline(),
-	
-
-	* compile.c : support postposition while/until,
-	fix block parameter index
-
-	* yarvtest/test_syn.rb : add tests for above
-
-	* yarvcore.c : fix env_mark
-
-	* vm.h, yarvcore.h : move vm.h#cmethod_info to
-	 yarvcore.h#yarv_cmethod_info
-
-	* vm.c : add th_get_sourceline()
-
-	* eval_intern.h : fix PASS_PASSED_BLOCK()
-
-	* eval_load.c : fix re-enter require (temporalily)
-
-	* insns.def : permit re-open class when superclass is same
-
-
-2005-11-11(Fri) 01:20:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : add "allload" rule
-
-	* compile.c, yarvcore.h, insns.def, vm_macro.def, disasm.c :
-	change arg_rest, arg_block offset (1)
-
-	* insns.def : add postexe instruction
-
-	* insns.def, vm.c : support rest block parameter
-
-	* yarvtest/test_block.rb : add tests for above
-
-	* rb/allload.rb : get path from ARGV
-
-	* vm_opts.h.base : set default off
-
-
-2005-11-01(Tue) 08:28:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/other-lang/eval.rb : fix path
-
-	* lib/English.rb, lib/cgi.rb, lib/complex.rb, lib/delegate.rb : 
-	added
-
-
-2005-11-01(Tue) 08:18:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : push and pop values after checkincludearray for
-	stack caching
-
-
-2005-10-31(Mon) 15:37:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_mandelbrot.rb : added
-
-	* benchmark/bm_app_factorial.rb : fixed parameter
-
-	* benchmark/bm_so_count_words.rb, benchmark/run_rite.rb : use
-	real file
-
-	* common.mk : add "ext" rule, add some dependencies and add option
-	to bench-each rule (renamed from bench-item)
-
-	* compile.c : fix get_root_iseq_object (check iseq type),
-	support splat case/when. support //o (regexp)
-
-	* eval.c : support *_eval, fix rb_obj_call_init to pass block
-
-	* eval_jump.h : support throw/catch
-
-	* eval_load.c : save klass_nest_stack when require
-
-	* eval_method.h : fix ruby_cbase()
-
-	* insnhelper.h : GET_EV_KLASS checks toplevel or not
-
-	* insns.def, yarvcore.c : fix singleton method definition and fix
-	super class's method
-
-	* lib/shellwords.rb : use String() instead of String.new()
-
-	* vm.c : check class iseq or not when making Proc and
-	add eval_search_super_klass function
-
-	* vm.h : CMETHOD_INFO_P to yarvcore.h
-
-	* vm_macro.def : splat if object type is T_ARRAY
-
-	* vm_opts.h, vm_opts.h.base : rename to vm_opts.h.base
-	insns2vm.rb will copy it to build directory
-
-	* yarvcore.c : add Proc#[]
-
-	* yarvcore.h : change INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE
-	to 512
-
-	* yarvtest/test_* : invalidate splat non array code (like: "*1")
-
-	* yarvtest/yarvtest.rb : use tempfile instead of popen
-
-
-2005-10-28(Fri) 09:11:53 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvtest/test_method.rb : fix test
-
-
-2005-10-28(Fri) 08:43:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run_rite.rb : add -I options to run benchmark
-
-	* common.mk : pass options to some rules with RUNOPT
-	and add -I options
-
-	* compile.c : fix massign with constant
-
-	* yarvtest/test_massign.rb : add tests for above
-
-	* eval_load.c : fix load_wait()
-
-	* eval_method.h : support ruby_cbase()
-
-	* lib/*.rb : add or modify libraries to run on yarv
-	* parse.y : change to ANSI C style
-
-	* vm.c : fix making proc process under cfunc/ifunc environment
-
-	* vm_macro.def : fix block pass
-
-	* yarvtest/test_method.rb : add tests for above
-
-	* yarvcore.c : add yarv_obj_is_proc()
-
-	* eval.c : fix rb_obj_is_proc to use yarv_obj_is_proc()
-
-
-2005-10-27(Thu) 11:50:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* some files : import from ruby 1.9.0 (2005-10-12)
-
-
-2005-10-16(Sun) 14:50:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c, yarvcore.h, yarvcore.c : add insns "bitblt" and "answer"
-
-
-2005-10-11(Tue) 17:01:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv_version.h, Changes : 0.3.2
-
-
-2005-10-11(Tue) 13:35:25 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : add YARV_CHECK_INTS()
-
-	* thread.c, thread_pthread.h, thread_win32.h : kick timer thread
-	when another thread kicked
-
-	* vm.c : remove debug print
-
-	* vm_opts.h : add OPT_CALL_THREADED_CODE
-
-	* yarvtest/yarvtest.rb : remove "\r" from answer
-
-
-2005-10-07(Fri) 09:36:36 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : add member variable "interrupt_flag" to yarv_thread_t
-
-
-2005-10-05(Wed) 21:20:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eva.c, eval_thread.c, ruby.h, eval_error.h, eval_jump.h, 
-	eval_load.c, thread.c, error.c, compile.h : remove ruby_errinfo
-
-	* thread_win32.h, thread_pthread.h : set stack size to 4KB
-
-	* vm.c : fix making env routine
-
-	* vm_dump.c, vm.h : support frame type "EVAL" and fix magic number
-
-	* yarvcore.c : fix some mark/free routine
-
-
-2005-10-05(Wed) 09:08:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, eval_intern.h, vm.c, eval_jump.h, yarvcore.h :
-	re-define PUSH/POP/EXEC/JUMP_TAG to use thread local tag
-
-	* inits.c, yarvcore.c : fix boostrap
-
-
-2005-10-03(Mon) 22:28:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix NODE_COLON2 bugs
-
-	* compile.h : fix debug routine
-
-	* disasm.c : add space between insn and operand
-
-	* insns.def : add comment of classdef, singletonclassdef
-
-	* vm.c, yarv.h : fix invoke_light routine
-
-	* yarvcore.c : fix to mark each threads
-
-
-2005-10-02(Sun) 05:55:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.h : add "system_working" global variable
-
-
-2005-10-02(Sun) 01:23:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : add raw gets (for test), and fix indent
-
-
-2005-10-01(Sat) 23:06:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_win32.h, common.mk : add thread_win32.h
-
-	* thread.c : support _WIN32 thread
-
-	* thread.c, thread_pthread.h : fix some interface
-
-	* eval_thread.c : remove debug print
-
-	* gc.c : fix stack region
-
-	* win32/Makefile.sub : add -MD flag to LDFLAGS
-
-	* yarvcore.c : fix mark and sweep debug print
-
-	* yarvcore.h : fix VM#living_threads data type to st_table
-
-
-2005-10-01(Sat) 00:25:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, yarvcore.h : rename GIL (Global Interpreter Lock) to
-	GVL (Global VM Lock)
-
-	* thread_pthread.h : fix pthread mutex initialize
-
-
-2005-09-30(Fri) 20:11:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c : support join with timeout
-
-	* yarvcore.h : use GET_VM()
-
-
-2005-09-30(Fri) 14:59:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c, common.mk : add thread.c
-
-	* thread.c, gc.c, eval_thread.c, yarvcore.c, yarvcore.h : 
-	support native thread (on pthread)
-
-	* insns.def : add YARV_CHECK_INTS() check
-
-	* yarv.h : add GET_VM() macro
-
-
-2005-09-29(Thu) 22:43:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h, eval_thread.c : move thread_status to eval_intern.h
-
-	* yarvcore.c : fix thread/vm value
-
-	* yarvcore.h : add some parameter to yarv_thread_t
-
-
-2005-09-29(Thu) 01:52:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h : add line number on last end instruction
-
-	* vm.c : fix line no detection
-
-
-2005-09-28(Wed) 00:02:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk, eval_load.c, eval.c, eval_intern.h : add eval_load.c
-
-	* disasm.c : fix around block local variables
-
-	* eval_proc.c : fix typo
-
-
-2005-09-27(Tue) 16:45:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : remove debug print
-
-
-2005-09-27(Tue) 16:41:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : support Kernel.local_variables
-
-	* parse.y, yarvcore.c : move some functions
-	(rb_(backref|lastline)_(get|set)) from parse.y to yarvcore.c
-
-	* yarvcore.h : fix typo of YARV_PREVIOUS_CONTROL_FRAME
-
-
-2005-09-26(Mon) 18:51:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c, compile.c, parse.y, vm.c, yarvcore.h :
-	 eval() works with binding (Env)
-
-	* vm.c : add th_set_eval_stack
-
-	* yarvtest/test_syn.rb : remove an assert "defined?(local_var)"
-
-
-2005-09-25(Sun) 19:30:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm2_send.rb : added
-
-	* common.mk : add rule "bench-item"
-
-	* eval_intern.h : add PASS_PASSED_BLOCK()
-
-	* eval_proc.c : support some functions
-
-	* rb/mklog.rb : added
-
-	* vm.c : fix prototype style and coding style
-
-	* yarv.h : add some prototypes of functions
-
-	* yarvcore.c, yarvcore.h, eval.c : yarv_thread_t#ifuncnode -> passed_block,
-	and add yarv_proc_t#safe_level
-
-
-2005-09-25(Sun) 11:01:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* some files : import from ruby 1.9.0 (2005-09-25)
-
-	* eval*, vm.c, vm_macro.def : remove frame, scope, ...
-
-	* yarvcore.c : remove yarv_block_given_p()
-
-	* yarvcore.h, insnhelper.h : move some macro from insnhelper.h to yarvcore.h
-	to use these in eval.c
-
-
-2005-09-24(Sat) 15:51:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval* : remove dependency to ruby_dyna_vars and ruby_class
-
-
-2005-09-23(Fri) 20:39:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_*.[ch] : split eval.c to some files
-
-	* *.[ch] : import ruby 1.9.0 (2004-09-23)
-
-	* parse.y : remove dependency to ruby_dyna_vars and ruby_scope
-
-
-2005-09-15(Thu) 16:51:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h : fix "for" scope
-
-	* yarvtest/test_block.rb : add tests for above
-
-
-2005-09-14(Wed) 06:11:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, vm_evalbody.h, vm.h, vm_dump.c,
-	compile.c, yarvcore.c : use #ifdef insted of #if for recognize
-	vm options
-
-	* vm_opts.h : fix default options
-
-
-2005-09-10(Sat) 14:10:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_opts.h : added
-
-	* yarvcore.h, rb/insns2vm.h : use vm_opts.h
-
-
-2005-09-10(Sat) 04:53:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, insns.def, compile.c : add DEFINED_YIELD
-
-	* yarvtest/test_yield.rb : add test_1_ary_and_1_params
-
-	* insns.def : fix splat and svalue
-
-	* vm.c : fix to perform with proc with ifunc (incomplete)
-
-	* sample/test.rb : added (comment out unsupported features)
-
-	* common.mk : add rule "runtest"
-
-
-2005-09-09(Fri) 19:32:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c : add splatarray
-
-	* yarvtest/test_massign.rb : add tests for above
-
-
-2005-08-31(Wed) 22:55:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c (yarvcore_eval_parsed): fix to return value
-
-	* yarv_version.h, Changes : 0.3.1
-
-
-2005-08-20(Sat) 10:19:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/ir.rb : add some check
-
-	* import today's ruby HEAD
-
-
-2005-08-18(Thu) 23:29:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : fix object file extension
-
-	* rb/ir.rb : added (import ruby script)
-
-	* rb/diff.rb : removed
-
-	* import today's ruby HEAD
-
-
-2005-08-18(Thu) 12:59:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk : rule test -> test2, test1 -> test
-
-	* compile.c : fix when clause bug and splat arugment
-
-
-2005-08-17(Wed) 05:22:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix block local parameter setting routine and support
-	massign in block parameter initialze
-
-	* yarvtest/test_yield.rb : add tests for above
-
-	* insns.def, compile.c : support array concat (ex: "[x, *y]")
-
-	* yarvtest/test_bin.rb : add tests for above
-
-
-2005-08-16(Tue) 19:51:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support nested massign
-
-	* yarvtest/test_massign.rb : add tests for above
-
-
-2005-08-16(Tue) 10:25:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : support rb_yield_0 with 0 args
-
-
-2005-08-16(Tue) 09:09:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* lib/fileutils.rb : imported
-
-	* insns.def : fix yield argument (same as last commit)
-
-	* yarvtest/test_yield.rb : add tests for above
-
-
-2005-08-16(Tue) 08:29:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : fix to support rb_yield_0 with multiple values
-
-	* common.mk : add parse, run1p ruelse
-
-	* compile.c : support yield with ARGSCAT/SPLAT
-
-	* vm.c, insns.def : fix yield arguments to do compatible behaviour
-
-	* yarvtest/test_yield.rb : added for above
-
-
-2005-08-16(Tue) 06:00:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix to set klass_nest_stack on singleton
-	method definition
-
-	* yarvtest/test_method.rb : add a test for above
-
-
-2005-08-16(Tue) 05:34:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test1.rb : added.  gdb and run1 rule run this script
-
-	* compile.c : fix error handled variable access
-
-	* yarvtest/test_exception.rb : add tests for above
-
-
-2005-08-16(Tue) 04:26:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* base ruby : ruby 1.9.0 (2005-08-15)
-
-
-2005-08-16(Tue) 03:54:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk, Makefile.in : move some rules to common.mk
-
-	* rb/diff.rb : added
-
-	* yarvtest/yarvtest.rb : fix to compare output last value
-
-
-2005-08-15(Mon) 18:27:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* Changes : 0.3.0
-
-
-2005-08-15(Mon) 17:56:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : fix to add prototype
-
-	* all files : propset svn:eol-style native
-
-
-2005-08-15(Mon) 10:48:53 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c : support rb_load
-
-
-2005-08-15(Mon) 09:42:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : define SDR()
-
-	* vm_dump.c : stack_dump_raw() -> vm_stack_dump_raw()
-
-	* yarvtest/yarvtest.rb : add rite test scheme
-
-	* benchmark/run_rite.rb : added
-
-	* yarvcore.c, inits.c : add Init_vm()
-
-	* yarv.h : add some prototype declarations, GET_THREAD()
-
-	* eval.c : remove unused functions
-
-	* eval.c : support Kernel.eval, some schemes (same as evalc.patch)
-
-
-2005-08-15(Mon) 00:53:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv_version.h : move configurations to yarvcore.h
-
-	* yarvcore.c : remove VALUE yarv_get_current_running_thread() and
-	add yarv_thread_t *yarv_get_current_running_thread(), ...
-
-	* yarvcore.h : yarv_thread_t#vm -> vm_value
-
-	* compile.c : fix "break from nested classes"
-
-	* yarvext/extconf.rb : use have_func instead of defined?(YARV_PACHED)
-
-	* depend : fix pass
-
-	* eval.c : change to kick VM
-
-	* version.c : fix to show yarv version
-
-	* common.mk : fix dependent
-
-	* inits.c : fix to kick Init_yarvcore
-
-
-2005-08-14(Sun) 02:05:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* README : add description
-
-	* yarvext/depend : move to topdir/depend
-
-2005-08-14(Sun) 01:50:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* merge yarv to ruby (prepare)
-
-	* make yarvext/ to build as extension
-
-
-2005-08-13(Sat) 09:36:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* evalc.patch, insns.def, compile.c : fix to support current
-	ruby HEAD.
-
-	* 0.2.3
-
-
-2005-08-08(Mon) 19:13:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h, Changes : 0.2.2
-
-
-2005-08-08(Mon) 17:17:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h, vm.c, insns.def, yarvcore.h, yarvcore.c :
-	remove yarv_iseq_t#iseq_dt and add yarv_iseq_t#encoded.
-	use yarv_iseq_t#encoded anytime
-
-	* vm_evalbody.h, vm.h, extconf.rb, version.h :
-	support call threaded code (incomplete)
-
-
-2005-08-01(Mon) 05:26:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : support yield with multiple values
-
-	* compile.c : fix dynavars
-
-	* yarvcore.h : fix to mark defined method
-
-
-2005-07-31(Sun) 23:27:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, vm.c, insns.def : fix search object path
-
-	* compile.c : fix "for" statement
-
-	* vm_macro.def : fix rest, opt arguments
-
-
-2005-07-31(Sun) 14:52:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_macro.def : fix block parameter
-
-	* compile.c : fix to unuse compile_data->in_ensure
-
-	* insns.def : add orphan check when return
-
-
-2005-07-31(Sun) 03:25:05 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, compile.c, yarvcore.h, insns.def :
-	support jump from rescue/ensure/class/module
-
-	* test/test_flow.rb : add tests for above fix
-
-
-2005-07-30(Sat) 04:44:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : struct iseq_compile_data_ensure_node_stack is added
-
-	* compile.c : insert ensure clause before break/next/redo
-
-	* vm.c : fix return/break handling
-
-	* yarv.h, vm.c : fix lightweight yield
-
-	* vm.c, insns.def, vm_macro.def : change arguments of th_set_env (add sp)
-
-	* test/test_flow.rb : added
-
-	* test/yarvtest.rb : add ae_flow
-
-	* compile.c, vm_macro.def : add tail-call/tail-recursion optimization
-	(experimental)
-
-
-2005-07-29(Fri) 20:14:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : make_name_for_block and make_name_with_str
-	are added
-
-	* insns.def : fix if unmatched size arg size to yield
-
-	* test/test_block.rb : add test for above fix
-
-	* vm.c : add th_backtrace_each and fix backtrace notation
-
-	* yarvcore.c : set top level iseq name to "<main>"
-
-
-2005-07-29(Fri) 13:20:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : fix yarv_iseq_t to pass VC (cl)
-
-	* vm_dump.c : ditto
-
-	* compile.h : ditto
-
-	* insnhelper.h : ditto
-
-	* vm_evalbody.h : include 'math.h'
-
-	* insns.def, vm.c : raise error when yield without block
-
-	* vm.c : implement thread_backtrace
-
-	* vm.c, yarvsubst.c, yarv.h : implement thread_yield_light_prepare and
-	thread_yield_light_invoke
-
-	* yarvcore.c : Integer#times uses yarv specific version
-
-
-2005-07-28(Thu) 21:35:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : add another mark function for thread/stack
-
-	* vm_evalbody.h : fix register allocation for x86_64
-
-	* vm.h : use asm for tc on x86_64
-
-
-2005-07-28(Thu) 20:17:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : add mark/free message to debug gc
-
-	* insnhelper.h, insns.def, vm_macro.def : remove and
-	add new RESTORE_REGS
-
-	* vm_evalbody.h : fix register allocation
-
-
-2005-07-28(Thu) 02:00:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, etc : change VM stack structure. re-write all
-	vm functions to do it
-
-	* vm_macro.def : added
-
-
-2005-07-08(Fri) 01:36:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : don't use fmod on AMD64
-
-
-2005-07-08(Fri) 00:14:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* Changes : added
-
-
-2005-07-07(Thu) 23:54:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.3.0
-
-
-2005-07-07(Thu) 23:52:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* 0.2.1 : released
-
-
-2005-07-07(Thu) 23:50:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.2.1
-
-
-2005-07-07(Thu) 23:47:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb, extconf.rb : add --[enable|disable]-opt-unify-all-combination
-	and --disable-opts
-
-	* vm.h : DISPATCH_ARCH_DEPEND_WAY is only enabled on GCC 3.x
-
-
-2005-07-06(Wed) 13:20:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* depend, rb/eval.rb : add ITEMS option to benchmark rule
-
-	* benchmark/* : changed
-
-	* benchmark/other-lang/* : added
-
-
-2005-07-04(Mon) 04:02:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h. yarvcore.c : add idDIV, idMOD, idEq, idLength
-
-	* compile.c, insns.def : add specialized insn for above method id
-
-	* test/test_bin.rb : add tests for above
-
-
-2005-07-03(Sun) 20:31:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, yarvcore.h : remove cYarvThrowObject (unused)
-
-	* yarvcore.c, yarvcore.h, insns.def : 
-	thread_object#stack_mark_poinetr
-
-	* depend, rb/eval.rb : BOPT, TOPT -> OPT
-
-
-2005-07-03(Sun) 13:53:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, compile.h : INSN_OBJECT, LABEL_OBJECT -> INSN, LABEL,
-	ISEQ_LINK_ELEMENT, ISEQ_LINK_ANCHOR -> LINK_ELEMENT, LINK_ANCHOR,
-	and some fixes
-
-	* tmpl/optinsn.inc.tmpl : ditto
-
-	* yarvcore.c, yarvcore.h : remove label_object, insn_object
-	prepare_iseq_build, cleanup_iseq_build are added
-
-	* insns.def : remove unused variable from send
-
-
-2005-07-02(Sat) 04:19:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : add GC protect for opt_aset
-
-
-2005-07-02(Sat) 03:49:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : add option -fno-reorder-blocks to vm.asm rule
-
-	* insns.def : fix opt_aset bugs
-
-	* test/test_bin.rb : add tests for aset, aref
-
-
-2005-07-02(Sat) 03:05:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : fix output
-
-	* vm_evalbody.h : add register for x86_64
-
-	* rb/asm_parse.rb : fix to shor size and length
-
-
-2005-07-02(Sat) 02:56:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : move specialized instruction point (new_insn_send)
-
-	* insns.def : add opt_aref, opt_aset
-
-
-2005-07-01(Fri) 11:04:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h : fix to pass VALUE type to new_insn_body
-
-	* insnhelper.h : add cast
-
-	* compile.c : fix getdynamic argument (0 == Qfalse -> I2F(0))
-
-
-2005-06-30(Thu) 23:34:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/eval.rb : add and fix some rules
-
-	* rb/insns2vm.rb : generate all
-
-	* benchmark/run.rb : add -r (ruby only) option
-
-
-2005-06-30(Thu) 23:25:23 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* tmpl/vmtc.inc.tmpl : add const prefix
-
-	* /rb/asm_parse.rb, extconf.rb : added and make assembler analised output 
-
-	* opt_operand.def : add send operands unification
-
-	* insnhelper.h : add HEAP_CLASS_OF(obj)
-
-	* insns.def : fix opt_plus, opt_ltlt
-
-	* vm_evalbody.h : move _tag
-
-	* benchmark/run.rb : fix file select
-
-
-2005-06-30(Thu) 06:07:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : add collect-usage-analysis option
-
-	* opt_operand.def, opt_insn_unif.def : add some rules
-
-
-2005-06-29(Wed) 23:28:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, extconf.rb, vm.h, compile.c :
-	DISPATCH_DIRECT_THREADED_CODE, DISPATCH_THREADED_CODE
-	 -> OPT_DIRECT_THREADED_CODE,  OPT_INDIRECT_THREADED_CODE.
-	if at least one of then is defined, OPT_THREADED_CODE is defined
-
-	* benchmark/* : fix name and parameters
-
-	* rb/eval.rb : added for YARV evaluation
-
-
-2005-06-29(Wed) 16:16:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : fix output format
-
-	* call_cfunc.inc -> call_cfunc.h
-
-	* vm.h : add sign by asm statement
-
-
-2005-06-28(Tue) 22:28:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : fix method search
-
-
-2005-06-28(Tue) 22:26:34 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : fix options
-
-
-2005-06-28(Tue) 21:50:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : fix output format
-
-
-2005-06-28(Tue) 21:34:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* depend : add option TOPT to test rules
-
-	* benchmark/run.rb : fix output format
-
-
-2005-06-28(Tue) 21:15:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix opt_case_dispatch instruction
-
-	* benchmark/run.rb : output all usertimes when exit benchmark
-
-
-2005-06-28(Tue) 20:35:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb, compile.c, tmpl/optinsn.inc.tmpl, vm.c :
-	change extconf options
-
-2005-06-28(Tue) 13:20:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : add -y, --yarv-only option
-
-	* depend : add BOPT to tbench rule
-
-
-2005-06-27(Mon) 23:31:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* depend : add gdb rule
-
-	* vm.h : use inline assembler for x86 (to support gcc 3.4.x)
-
-
-2005-06-27(Mon) 20:04:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, compile.c, disasm.c : remove unused variables
-
-	* vm.h, insnhelper.h, debug.h : fix to reduce warning
-
-	* vm.c, vm_dump.c : move VM state dump (debug) functions to vm_dump.c
-
-	* depend : adde reconf rule
-
-	* insnhelper.h : 
-
-	* vm_evalbody.inc : rename to vm_evalbody.h
-
-
-2005-06-27(Mon) 16:50:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns2vm.rb : fix generating unif insn
-
-	* compile.c : add useless pop/swap insn elimination with stack caching
-
-	* depend : remove compiled.o dependency
-
-
-2005-06-26(Sun) 14:06:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : use tmpfile instead of popen
-
-	* rb/insns2vm.rb : fix generating insn unification logic
-
-	* opt_insn_unif.def : add some unification rules
-
-	* compile.c : add verify_list function and fix unification logic
-
-
-2005-06-22(Wed) 12:58:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c, insns.def,  compile.c : add mult optimization
-
-	* test/test_bin.rb : add test_fact
-
-
-2005-06-21(Tue) 22:34:07 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, compile.[ch], tmpl/optinsn.inc.tmpl, rb/insns2vm.rb :
-	change data structure (don't use Ruby's array to represent a
-	instruction sequence)
-
-	* disasm.c : add separator
-
-
-2005-06-14(Tue) 07:48:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support "for" statement
-
-	* test/test_block.rb : add test for above
-
-	* yarvcore.[ch] : add global id idEach
-
-
-2005-06-08(Wed) 22:30:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : add if/unless(L1) jump (L2) :L1 => unless/if(L2)
-	optimize (condition reversal) and fix typo
-
-
-2005-06-07(Tue) 08:29:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : fix to remove compiler warning
-
-	* version.h : 0.2.1
-
-
-2005-06-07(Tue) 08:16:22 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : iseq_link_element changed to double linked list
-
-	* disasm.c : support dump struct iseq_link_element
-
-	* compile.c : use double linked list instead of array
-	for intermediate representation
-
-
-2005-06-06(Mon) 15:38:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c : add link structure to insn and label object
-
-	* compile.h, compile.c : remove some variables in function top scope
-	of iseq_compile_each and some optimization (now working)
-
-
-2005-06-04(Sat) 16:12:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix previous commit
-
-
-2005-06-04(Sat) 15:56:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix stack caching (after jump state)
-
-
-2005-06-04(Sat) 09:12:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix some point for previous commit
-
-
-2005-06-04(Sat) 07:31:21 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : optimize case/when statement
-	(dispatch on constant time)
-
-	* yarvcore.h, disasm.c, rb/insns2vm.rb : fixed for above
-	(CDHASH)
-
-	* test/test_syn.rb : add test for above
-
-
-2005-06-04(Sat) 03:41:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c : add some temporary variable test
-	(it'll be vanished)
-
-	* compile.c : NODE_CASE optimize (use topn instead of dup/swap)
-
-
-2005-06-03(Fri) 00:54:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : apply flow optimization for while/until statement
-
-
-2005-03-04(Fri) 19:34:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb : fix category (comment)
-
-	* depend : remove space betweeen target name and colon
-
-
-2005-03-04(Fri) 15:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* tmpl/yarvarch.ja : fix typo
-
-
-2005-03-04(Fri) 13:30:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* depend : add a rule for jitcompile.o
-
-	* vm.h : fix a macro argument
-
-	* version.h : 0.2.0
-
-
-2005-03-03(Thu) 08:35:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : remove vm_evalbody.inc call_cfunc.inc from clean target
-
-
-2005-03-03(Thu) 00:54:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* tmpl/insns.inc.tmpl : fixed typo
-
-	* insns.def : store th->pc to current pc
-
-
-2005-03-03(Thu) 00:31:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* tmpl/yarvarch.ja, doc/yarv.rb : write current architecture of yarv
-
-
-2005-03-01(Tue) 13:50:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c (yarvcore_eval_parsed) : added
-	(separeted from yarvcore_eval)
-
-	* yarvcore.c, compile.c : iseq_translate_direct_threaded_code
-	is moved to compile.c
-
-	* depend : add rule for yasmdata.rb
-
-	* rb/yasm.rb : support top-level and method-level assemble
-
-
-2005-02-26(Sat) 08:09:57 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb, compile.c, vm.h : change type long to OFFSET
-
-	* tmpl/yasmdata.rb.tmpl : added
-
-	* rb/insns2vm.rb : add yasmdata_rb method
-
-	* rb/yasm.rb : fix some interface (incomplete)
-
-	* compile.c : iseq_setup added
-
-	* yarvcore.c : YARVCore::InstructionSequence::Instruction#make added
-
-
-2005-02-24(Thu) 07:45:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/yasm.rb : added
-
-
-2005-02-24(Thu) 01:13:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : remove useless statements
-
-
-2005-02-24(Thu) 00:46:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb (InsnInfo) : add @is_sc attr and remove
-	is_sc method
-
-	* compile.c : fix NODE_CASE/NODE_WHEN bug (cond at 'when'
-	must not be popped)
-
-	* compile.c : support NODE_OP_ASGN1 to &&= and ||=
-
-	* test/test_bin.rb : add tests for above
-
-
-2005-02-23(Wed) 09:17:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, yarvcore.c : thread_svar added and fix svar location
-
-
-2005-02-21(Mon) 08:38:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h : make type "struct iseq_compile_data"
-
-	* yarvcore.h : iseq_object#insn_info_ary to iseq_object#insn_info_tbl 
-
-
-2005-02-21(Mon) 05:24:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c (compile_string) : remove null check of node
-
-
-2005-02-19(Sat) 03:52:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.1.1
-
-
-2005-02-18(Fri) 20:57:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c : add idLTLT, idMethodMissing
-
-	* compile.c : suopport lval (or others) block parameter
-
-	* test/test_block.rb : add tests for above
-
-	* insns.def (send) : support method_missing
-
-	* test/test_method.rb : add tests for above
-
-	* insns.def : opt_ltlt and 
-
-
-2005-02-18(Fri) 08:54:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/runc.rb : added
-
-	* benchmark/contrib/pentomino.rb : added opt_ltlt
-	and Float, String plus specialization
-
-
-2005-02-18(Fri) 07:49:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : remove debug print
-
-	* rb/aotcompile.rb : skip if yarvcore.so is not created
-
-
-2005-02-18(Fri) 06:46:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix block passing
-	and block argument
-
-
-2005-02-18(Fri) 05:52:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : thread_get_ev_const, thread_get_ev_defined is added
-	(separated from insns.def)
-
-	* insnhelper.h : GET_EV_KLASS(klass) is added
-	(separated from insns.def)
-
-	* yarvcore.h, insns.def, compile.c : support defined? expression (limited)
-
-	* test/test_syn.rb : tests for above is added 
-
-	* compile.c, insns.def : support block passed method dispatch
-
-	* test/test_method.rb : tests for above is added
-
-	* compile.h : CALL_ARGS_SPLAT is removed
-
-
-2005-02-16(Wed) 13:32:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* disasm.c : fix ID to String method
-
-	* compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
-	and NODE_RETURN check outer type
-	and NODE_DREGX_ONCE supported (temporarily)
-
-	* test/test_syn.rb : add a test
-
-	* test/test_jump.rb : add a test
-
-
-2005-02-16(Wed) 06:07:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.[hc] : use Symbol instead of Fixnum to represent ID
-
-	* rb/insns2vm.rb : add attr_reader :insns, :insn_map
-
-	* vm.h, rb/insns2vm.rb : END_INSN have one arg
-
-	* jitcompile.c : jit compiler framework (experimental)
-
-	* rb/aotcompile.rb : refactoring
-
-	* compiled.c : add constant pool
-
-	* vm_evalbody.inc, call_cfunc.inc, vm.c : separeted from vm.c
-
-	* insns.def : fix return val
-
-	* depend : add rules for compiled.o
-
-
-2005-02-14(Mon) 13:09:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insnhelper.h, yarvcore.h: move YARV_METHOD_NODE to yarvcore.h
-
-	* yarvcore.h : add 2 members jit_compiled and iseq_orig
-	to struct iseq_object
-
-	* yarvcore.c : add yarv_jitcompile and global function jitcompile
-
-	* insns.def : insn opt_call_native_compiled added
-
-	* jitcompile.c : added
-
-
-2005-02-12(Sat) 05:38:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (putstring) : fixed to duplicate string object
-
-	* rb/insns2vm.rb, tmpl/optunifs.inc.tmpl, compile.c : support
-	instructions unification (aka super instruction)
-
-	* opt_insn_unif.def : added for above
-
-	* benchmark/bm_unif1.rb : added to measure efficiency of unification
-
-	* depend : fixed for above
-
-	* extconf.rb : add option --(enable|disalbe)-opt-insns-unification
-
-
-2005-02-11(Fri) 12:14:39 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, vm.c, insns.def : permit to access svar from
-	cfunc environment
-
-	* test/test_method.rb : add tests for above
-
-
-2005-02-09(Wed) 19:31:06 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* ite.rb : added (ruby -rite [script file])
-
-
-2005-02-09(Wed) 02:25:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.[hc] : add member compile_data (hash) to iseq_object
-
-	* compile.c, yarvcore.h : check label is already set
-
-	* compile.c, extconf.rb : support __goto__ and __label__ statement
-
-
-2005-01-25(Tue) 12:49:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_block.rb : add break test to test_times
-
-
-2005-01-25(Tue) 03:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : check ruby version if yarv patch is applied or not
-
-	* evalc.patch : fixed for rb_call_super and above check
-
-
-2005-01-25(Tue) 03:21:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb : refactoring (mainly, make InsnsDef::InsnInfo
-	to represent each instruction information)
-
-	* depend, rb/makedocs.rb : fixed for above
-
-	* yarvcore.c (thread_call_super) : added
-
-	* vm.c (thread_call_super) : added
-
-	* vm.h : add struct cmethod_info
-
-	* insns.def, vm.c : use cmethod_info to represent C method info
-
-	* insns.def : use iseq_object#klass_nest_stack
-	to search super/zsuper's class
-
-	* prosym.rb : removed
-
-	* ToDo : write todo things on wiki
-
-
-
-2005-01-18(Tue) 23:44:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb : check ENV['RUBY'] to use ruby binary
-
-
-2005-01-10(Mon) 08:44:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.1.0
-
-
-2005-01-09(Sun) 22:01:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* repository : svn propset svn:eol-style native *.c *.h tmpl/*.tmpl
-
-
-2005-01-09(Sun) 21:48:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : FREE_UNLESS_NULL, MARK_UNLESS_NULL macros are added
-
-	* yarvcore.c : some insn/label methods are added
-
-	* yarvcore.h : add structure menber "insns_ary" to iseq_object
-
-	* vm.c, insns.def (thread_eval_body) : return values with throw
-
-	* prosym.rb : added
-
-	* insns.def : add YARV_AOT_COMPILED and some procedure
-
-	* depend : add compiled.c
-
-	* compiled.c : added to build compiled Ruby program (C source)
-	by AOT compiler
-
-	* rb/aotcompile.rb : AOT compiler
-
-	* aotct.rb, rb/aotctest.rb : test and benchmark AOT compiler
-
-	* rb/allload.rb : added
-
-
-2005-01-09(Sun) 08:30:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c (yarv_yield_values) : added
-
-	* vm.c (thread_call0) : change interface. substitute rb_call0 in
-	yarv environment
-
-	* yarvcore.c (yarv_call0) : fix for above
-
-	* yarvcore.c (yarv_call0_cfunc) : removed
-
-	* yarvcore.c : change passing items for yarv_setup
-
-	* evalc.patch : fix for above
-
-	* benchmark/bm_lists.rb : fix (unsupport block passing)
-
-	* benchmark/run.rb : use full path to ruby
-
-	* insns.def (yield): raise error if argc > expected argc
-
-
-2005-01-08(Sat) 16:07:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : add descrioptions
-
-	* compile.c : fix bugs (getinlinecache operands)
-
-	* yarvcore.c : initial value of yarvGlobalStateVersion
-	to 1
-
-
-2005-01-08(Sat) 14:39:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, vm.c, evalc.patch : support making backtrace
-	(incompatible with current ruby interpreter)
-
-
-2005-01-08(Sat) 11:25:46 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* evalc.patch : commit for previous commit change
-
-	* yarvcore.h, compile.c, insns.def : MC to IC (inline cache),
-	and changed to using IC by set/getinlinecache
-
-
-2005-01-08(Sat) 10:04:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : add global variable sym[IC]FUNC
-
-	* yarvcore.c (yarv_iterate, yarv_call0_cfunc) : added
-	(each called from rb_iterate, rb_call0 with NODE_CFUNC)
-
-	* vm.c (stack_dump_raw) : fixed to prints more detail
-
-	* vm.c (stack_dump_th, stack_dump_thobj) : added to
-	dumps thread_object states (for VALUE, struct pointer)
-
-	* vm.c (thread_dump_regs) : added
-
-	* vm.c (thread_call0, thread_call0_cfunc, thread_invoke_yield, 
-	thread_invoke_yield_cfunc), insns.def (yield, send) :
-	fixed, added to support IFUNC
-
-	* vm.c, yarvcore.c, insns.def : change type purpose
-	thread_object#block_ptr (it holds IFUNC block information,
-	so this type was changed to 'NODE *')
-
-	* vm.c (stack_dump_each) : fixed for above
-
-	* test/test_block.rb (test_ifunc) : test for above
-
-	* vm.c (get_block_objec, thread_make_env_object) : fixed bugs
-
-	* test/test_bin.rb (test_xstr) : remove `ls` test
-
-
-2005-01-06(Thu) 21:35:18 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarv : trying to support NODE_IFUNC (rb_iterate)
-
-
-2005-01-05(Wed) 06:50:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, insns.def, disasm.c, rb/insns2vm.rb, compile.[ch] :
-	support inline method cache
-
-	* extconf.rb : add -*-inline-method-cache (default: enable)
-
-	* test/test_method.rb : add a test for above
-
-	* benchmark/bm_poly_method.rb : added
-
-	* yarvcore.c : add option string
-
-
-2005-01-04(Tue) 17:15:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c : add compile_array and duparray insn
-	to optimize only literal array creation
-
-	* benchmark/bm_array.rb : added
-
-
-2005-01-04(Tue) 10:02:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* README : fix version
-
-
-2005-01-04(Tue) 09:57:25 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* ToDo : reflect current status
-
-
-2005-01-04(Tue) 09:43:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_VALUES, NODE_ARGSCAT, NODE_SPLAT
-
-	* test/test_massign.rb : add tests for above
-
-	* benchmark/bm_swap.rb : added
-
-
-2005-01-04(Tue) 06:25:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h : COMPILE_ERROR break contol (instead of return)
-
-	* compile.c : support NODE_MASGN
-
-	* insns.def : change expandarray for massign and add topn insn
-
-	* test/test_massign.rb : added
-
-
-2005-01-03(Mon) 21:20:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : store block when create proc
-
-	* test/test_proc.rb : add a test for above change
-
-	* yarvcore.c : add global function "once"
-
-
-2005-01-02(Sun) 00:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_super.rb : fix bug (remove infinite loop)
-
-
-2005-01-01(Sat) 23:45:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_z?super.rb : added
-
-
-2005-01-01(Sat) 23:37:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bmx_so_object.rb : rename to benchmark/bm_so_object.rb
-
-
-2005-01-01(Sat) 23:19:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_OP_ASGN2, NODE_OP_ASGN_AND, NODE_OP_ASGN_OR,
-	NODE_SUPER, NODE_ZSUPER, NODE_MATCH
-
-	* insns.def : support super, zsuper (currently, super can't
-	handle with block)
-
-	* test/test_bin.rb : add test for op_asgin2, op_assgin_and/or
-
-	* test/test_class.rb : add test for super, zsuper
-
-
-2005-01-01(Sat) 20:39:29 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_MATCH
-
-	* yarvcore.c : fix yarv_svar bug (fix condition boundary)
-
-	* insnhelper.h : save cfp/lfp/dfp vars to thread_object (th)
-
-
-2005-01-01(Sat) 20:03:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.0.1
-
-	* yarvcore.h : add idIntern declaration
-
-	* insns.def : add getspecial, setspecial.
-	implement getclassvariable, setclassvariable.
-	store lfp before reg match (opt_regexpmatch1)
-
-	* compile.c : support ditto, flipflop
-
-	* yarvcore.c : support svar
-
-	* test/test_syn.rb : add test for flipflop
-
-	* test/test_bin.rb : add test for dsym, cvar, backref
-
-
-2005-01-01(Sat) 09:09:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : add getspecial insn
-
-	* compile.c : support NODE_NTH_REF, NODE_BACK_REF
-
-
-2005-01-01(Sat) 06:53:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c : support alias, undef
-
-	* test/test_method.rb : test for above
-
-	* rb/insns2vm.rb : fix enbug
-
-
-2005-01-01(Sat) 06:00:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_jump.rb : add test (next with value)
-
-	* yarvcore.h, yarvcore.c, compile.c, compile.h :
-	raise compile error exception instead of rb_bug
-
-	* yarvcore.c, evalc.patch : support "require"
-
-	* test.rb : restore $" after evaluation with ruby
-
-	* rb/insns2vm.rb : remove unnecesary each
-
-
-2004-12-17(Fri) 18:56:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix newhash
-
-
-2004-12-15(Wed) 13:29:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : add version string
-
-	* compile.c : fix rescure clause bug
-
-
-2004-12-14(Tue) 22:46:30 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : add reput insn
-
-	* vm.h : show stack cache registers when stack dump
-
-	* rb/insns2vm.rb, compile.c : fix stack caching bugs
-
-
-2004-12-14(Tue) 00:51:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns2vm.rb, compile.c, tmpl/opt_sc.inc.tmpl : fix bugs
-
-	* rb/mixc-asm.rb : added
-
-
-2004-12-14(Tue) 00:17:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c, compile.c : fix SC bugs
-	(SC state management)
-
-	* extconf.rb : add option -[enable|disable]-opt-stack-caching
-
-	* insns2vm.rb : accept CPPFLAGS options
-
-	* vm.c : support restrore register for pc
-
-
-2004-12-13(Mon) 16:53:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb : add macro INSN_IS_SC()
-
-
-2004-12-11(Sat) 10:51:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, compile.c : support singleton method definition
-
-	* test/test_method.rb : add test for above
-
-
-2004-12-11(Sat) 03:17:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/*.rb : modify
-
-	* extconf.rb : add $cleanfiles
-
-
-2004-12-08(Wed) 13:01:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : change to disable stack caching
-
-
-2004-12-07(Tue) 19:37:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.rb : add default after
-
-	* insns.def : fix to work on stack caching
-
-
-2004-12-07(Tue) 15:07:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* depend : add some dependency to *.inc files
-
-	* vm.c : add "register" and asm("regname") descriptor
-
-	* rb/insns2vm.rb, compile.c : add stack caching support
-
-	* tmpl/opt_sc.inc.tmpl : added to above change
-
-	* rb/makedocs.rb : fix file path
-
-	* extconf.rb : fix option selection
-
-
-2004-12-06(Mon) 11:20:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* extconf.rb : add vm.asm target if compiler is gcc
-
-
-2004-12-06(Mon) 09:56:24 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h : rename method_frame's member block to block_ptr
-
-	* extconf.rb : add "-fno-crossjumping" option when compiler
-	is gcc
-
-	* opt_operand.def : add unification insn send
-
-	* rb/insns2vm.rb : define symbol instead of declare const
-	variable (for more optmize on VC)
-
-	* insns.def : move enter point in send
-
-
-2004-12-06(Mon) 04:53:51 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, opt_operand.def, rb/insns2vm.rb, depend :
-	support operand unification
-
-
-2004-12-05(Sun) 03:16:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, insns.def : speed up throw/catch scheme
-
-
-2004-12-05(Sun) 01:47:05 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : fix catch handler bugs
-
-	* test/test_jump.rb : test_complex_jump added
-
-
-2004-12-03(Fri) 20:39:05 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/contrib/mcq.rb : added
-	(from URABE Syouhei)
-
-
-2004-12-03(Fri) 20:35:28 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : support break in rb_yield block
-
-
-2004-12-03(Fri) 14:26:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support block local variable in current
-	ruby specification (patche from Kent Sibilev)
-
-	* insns.def : support attr_* (patch from Kent Sibilev)
-
-
-2004-12-02(Thu) 21:04:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* opt_operand.def : added
-
-
-2004-12-02(Thu) 13:20:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c, vm.h, vm.c, insns.def, insnhelper.h, yarvutil.rb :
-	add usage analisys framework 
-
-	* disasm.c : insn_operand_intern to separate function
-
-	* benchmark/run.rb : run each benchmark on another process
-
-
-2004-12-01(Wed) 10:26:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : yield check block is given
-
-	* benchmark/bm_lists.rb : rename to bmx_lists.rb
-	(because it's not work ... bug?)
-
-	* insns.def : opt_* support other type calc
-
-
-2004-11-30(Tue) 16:14:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_so_array.rb : added
-
-	* benchmark/bm_so_matrix.rb : added
-
-
-2004-11-30(Tue) 14:11:30 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/getrev.rb : added
-
-	* yarvcore.c : add YARVCore::REV, YARVCore::DATE constant
-
-
-2004-11-30(Tue) 13:05:42 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_OP_ASGN1 (incomplete)
-
-	* insns.def : add dupn
-
-
-2004-11-30(Tue) 08:52:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : 0.0.0.f
-
-
-2004-11-30(Tue) 08:43:59 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_class.rb : add test_initialize and test_to_s
-
-	* yarvsubst.c : use rb_funcall instead of yarv_funcall
-
-	* evalc.patch : fix ruby's patch
-
-	* benchmark/bm_so_*.rb : change naming rule. "bm_so_*" from
-	language shootout
-
-	* depend : tbench target item is ITEM env val (default: bmx_temp)
-
-	* vm.c : show raw address if environment is in heap at dumping stack trace
-
-	* vm.c : thread_call0 added
-
-	* vm.c : fix thread_yield_light_invoke
-
-	* yarv.h, yarvcore.c : remove yarv_funcall
-
-
-2004-11-29(Mon) 11:37:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test/test_proc.rb : add test test_nestproc
-
-	* yarvsubst.c : comment out yarv_Array_each
-
-	* insns.def : restore lfp/dfp after call_cfunc
-
-	* vm.c : fix stack dump routine
-
-	* vm.c : impliment thread_funcall (temporarily)
-
-	* yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
-
-	* yarvcore.c : remove check with yarv_in_work
-
-	* evalc.patch : added
-
-
-2004-11-27(Sat) 00:19:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.c : free -> ruby_xfree
-
-
-2004-11-26(Fri) 02:11:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm,c : fix bug
-
-
-2004-11-22(Mon) 11:19:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_ackermann.rb, bm_proc.rb, bm_simpleiter.rb,
-	bm_so_exception.rb, bm_wc.rb, wc.input added
-
-
-2004-11-22(Mon) 02:31:56 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_proc.rb : add some test
-
-	* yarvcore.c, vm.c : support yield in C method (as rb_yield)
-
-	* vm.c (thread_yield_light_(prepare|invoke)) : support lightweight
-	yield
-
-	* yarv.h : added
-
-	* yarvcore.c, yarv.h : support yarv_is_working, yarv_block_given_p, 
-	yarv_yield, yarv_funcall (only dummy function)
-
-	* vm.c : thread_eval_body changed return value
-
-	* yarvsubst.c : added and add yarv_Integer_times, yarv_Array_each
-
-	* yarvcore.h : block_ptr is added to struct thread_object
-
-	* insns.def : pass block when C method call
-
-	* insnhelper.h : add GET_ISEQOBJ(cfp) macro
-
-
-2004-11-21(Sun) 07:25:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c : support Proc#call
-
-	* test/test_proc.rb : added
-
-
-2004-11-19(Fri) 18:04:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, vm.c : support creating Proc object
-
-
-2004-11-15(Mon) 14:19:27 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (send) : use clear_local_size to specify
-	clear local table vars.
-
-	* insns.def : block represent data shares lfp, dfp with frame data
-
-
-2004-11-13(Sat) 18:19:41 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, insns.def : add VM_CALL_ARGS_SPLAT_BIT and
-	VM_CALL_ARGS_BLOCKARG_BIT
-
-	* compile.c, compile.h : add ADD_SEND, ADD_SEND_R
-
-
-2004-11-10(Wed) 08:26:25 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* add "vm_" prefix to (block_object, proc_object, env_object)
-
-
-2004-11-03(Wed) 15:52:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c, disasm.c, compile.c, insns.def, vm.c :
-	fix to move x86_64 (illegal cast, etc)
-
-
-2004-11-01(Mon) 04:45:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, compile.c, debug.c, version.h : 
-	redesgin gc debug scheme (GC_CHECK())
-
-	* yarvcore.c : mark iseqobj->current_block on GC
-
-	* insns.def, compile.c : last "throw" in ensure/rescue block
-	use operand throwobj and before this insn, use "getdynamic 0, 1"
-
-	* benchmark/bm_temp.rb : move to benchmark bmx_temp.rb
-
-	* depend : change some targets
-
-
-2004-10-25(Mon) 19:57:58 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : push exception iseq to iseqobj->iseq_mark_ary
-	to mark for GC
-
-
-2004-10-10(Sun) 16:25:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : remove $_, $' area from method local frame
-	and provide that's special method local variables pointer(LFP[-1])
-
-	* disasm.c : change environment showing format
-
-	* yarvcore.(h|c) : add YarvProc, YarvEnv
-
-	* yarvcore.h : add arg_block field to iseq_object
-	and init -1 as default value
-
-
-2004-09-30(Thu) 19:50:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : support passing splat argument
-
-	* compile.c, insns.def : support rest argument
-
-	* compile.c, insns.def : support optional argument initializer
-
-	* test/test_method.rb : add tests for above
-
-
-2004-09-29(Wed) 10:50:03 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix rescue clause popped
-
-	* benchmark/bm_random.rb : move to benchmark/bmx_random.rb
-
-
-2004-09-29(Wed) 01:25:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* many many files: change stack frame design
-
-
-2004-09-16(Thu) 08:51:37 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h : support 'return' from method
-	in ensure clause
-
-
-2004-09-13(Mon) 21:56:40 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support inline cache constant access
-	on NODE_COLON2, NODE_COLON3
-
-	* depend : add 'vtest' rule(verbose test)
-
-
-2004-09-13(Mon) 10:58:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, yarvcore.h : support redo/next/break in
-	while/until
-
-
-2004-09-13(Mon) 08:50:19 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_jump.rb : added(correctly)
-
-	* benchamark/bm_(ensure|rescue|simplereturn).rb added
-
-
-2004-09-12(Sun) 23:30:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_jump.rb : added
-
-	* insns.def, compile.c : add 'putnil' insn
-
-	* compile.c : use '===' when rescue check
-
-	* insns.def : remove 'rescuecheck' insn
-
-	* compile.c : support retry in begin/rescue clause
-
-	* ToDo : added
-
-
-2004-09-08(Wed) 12:34:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvcore.h, yarvcore.c : add idThrow*
-
-	* insns.def, compile.c, vm.c : support retry, break,
-	next, redo, return(imcomplete)
-
-
-2004-09-03(Fri) 13:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : add nop after rescue body
-
-	* insns.def, vm.c : support stack rewind when thrown
-
-
-2004-09-01(Wed) 17:31:01 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_exception.rb : added
-
-
-2004-09-01(Wed) 13:15:14 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, insns.def : implementing exception handling
-
-
-2004-09-01(Wed) 00:18:54 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : add 'throw' insn
-
-	* compile.c : support 'rescue' and 'ensure' clause
-
-	* yarvcore.c, yarvcore.h : add 'catch_table' to iseq_struct
-
-
-2004-08-30(Mon) 19:06:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.h : NEW_ISEQOBJ don't pass self as parent
-
-	* compile.c : use NEW_CHILD_ISEQOBJ explicitly
-
-
-2004-08-29(Sun) 21:09:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : trying to implement rescue/ensure
-
-	* insns.def : fix yield bug(lfp, dfp link)
-
-
-2004-08-28(Sat) 13:52:15 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix dvar bug
-
-	* test/test_block.rb : add test
-
-	* insns.def, insnhelper.h : remove unused source code
-
-
-2004-08-28(Sat) 08:51:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_DASGN
-
-	* test/test_block.rb : add test
-
-
-2004-08-28(Sat) 08:13:04 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : support access to instance variable
-
-	* test/test_class.rb : add test of instance variable
-
-	* benchmark/bm_block.rb : added
-
-
-2004-08-28(Sat) 07:48:43 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_block.rb : fix block parameter name
-
-
-2004-08-28(Sat) 07:27:52 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c, insns.def : support method call with block
-	and yield and add some functions
-
-	* compile.c, insns.def : support dynavars accessor
-
-	* test/test_block.rb : added
-
-	* vm.c : fix block parameter stack dump
-
-
-2004-08-27(Fri) 23:56:47 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c(iseq_compile) : remove parameter iseqtype
-	(this information can access via self)
-
-2004-08-27(Fri) 17:13:35 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_bin.rb : add test(absolute path constant)
-
-	* yarvcore.h, compile.c(iseq_compile) : change parameter
-
-	* insns.def(classdef) : fix bug
-
-
-2004-08-27(Fri) 04:53:13 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : support setconstant, getconstant, classdef,
-	moduledef
-
-	* vm.h : fix debug levels and so on
-
-	* vm.h : foo_WORD -> foo_WC
-
-	* test/test_class.rb : added
-
-
-2004-08-25(Wed) 17:51:50 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix getconstant/setconstant/classdef
-
-
-2004-08-25(Wed) 14:27:10 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* debug.[ch] : added
-
-	* compile.c, disasm.c : use debug interface
-
-	* compile.c : support some nodes
-
-	* compile.c, rb/insns2vm.rb : remove TS_CPATH
-
-	* insns.def : modify classdef/moduledef/singletonclassdef
-	and add popcref
-
-	* and others...
-
-
-2004-08-18(Wed) 20:16:45 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix case/when statement with empty else clause
-
-	* insns.def : enable compile
-
-	* yarvcore.h : add class search path scheme
-
-	* test/test_syn.rb : add switch/case test case
-
-	* tmpl/yarvarch.ja : update documents
-
-
-2004-05-22(Sat) 01:30:44 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvutil.rb : add eval_in_wrap
-
-	* test/test_*.rb : change to use eval_in_wrap
-
-
-2004-05-20(Thu) 02:50:32 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* support global variables
-
-	* benchmark/bm_*.rb : add some benchmarks
-
-	* compile.c : support NODE_ATTRASGN
-
-	* compile.c : add debugi(...)
-
-
-2004-05-19(Wed) 23:19:38 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* test/test_method.rb : added
-
-
-2004-05-19(Wed) 22:56:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : fix typo
-
-	* benchmark/run.rb : sort benchmark order by filename
-
-	* extconf.rb : use --enable/disable-xxx
-
-	* version.h : ditto(don't touch to change yarv options)
-
-
-2004-05-19(Wed) 21:18:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* yarvutil.rb : added
-
-	* test.rb, test/*, benchmark/run.rb : use yarvutil.rb
-
-	* version.h : USE_OPTIMIZED_REGEXP_MATCH added
-
-	* yarvcore.h : add idEqTilde
-
-	* yarvcore.c(yarvcore_parse, yarvcore_eval) : require file and line
-	parameter
-
-	* test/test_bin.rb : add regexp test
-
-	* benchmark/bm_regexp.rb : added
-
-
-2004-05-19(Wed) 13:57:31 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : add compile_dstr(self, node)
-
-	* compile.c : support NODE_MATCH2, NODE_MATCH3, NODE_DXSTR
-
-	* insns.def : add toregexp
-
-
-2004-05-18(Tue) 10:12:20 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_XDSTR
-
-	* test/test_bin.rb : add test for above change
-
-
-2004-05-18(Tue) 09:46:33 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def(send) : store regs before call_cfunc
-
-
-2004-05-18(Tue) 08:55:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : support NODE_DSTR, NODE_EVSTR
-
-	* compile.c : support NODE_XSTR
-
-	* insns.def : add tostring operation
-
-	* rb/makedocs.rb : fix directory path
-
-	* depend : add tbench rule
-
-	* yarvcore.h : add 'exten ID idBackquote'
-
-
-2004-05-18(Tue) 00:09:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h : add USE_OPTIMIZED_BASIC_OPERATION
-
-	* yarvcore.h(struct thread_object) : add 'VALUE stat_insn_usage'
-
-
-2004-05-17(Mon) 11:28:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* version.h, insns.def, yarvcore.c : add FAKE_INLINE_METHOD_CACHE
-
-
-2004-05-17(Mon) 09:05:53 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c : fix generating opt_* insn process
-
-
-2004-05-17(Mon) 08:58:49 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/(bm_tarai.rb, bm_fib.rb) : added
-
-
-2004-05-17(Mon) 08:20:12 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/(bm_tak.rb, bm_reccount.rb) : added
-
-	* insns.def : test method cache(incomplete)
-
-	* insns.def : add expandarray insn
-
-	* yarvcore.c(iseq_init) : add parameter 'parent'
-
-
-2004-05-17(Mon) 01:49:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/run.rb, bm_factorial.rb, bm_whileloop.rb : added
-
-	* insns.def(send) : set id to ruby_frame->orig_func
-
-	* check behavior on mswin32 and cygwin
-
-	* insns.def(send) : check stack overflow
-
-
-2004-05-16(Sun) 08:00:55 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* change frame structure(debugging)
-
-
-2004-05-14(Fri) 15:06:02 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns2vm.rb : support file name arguments
-
-
-2004-05-14(Fri) 04:33:09 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def : support (easy) constant
-
-
-2004-05-12(Wed) 01:51:48 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* rb/insns2vm.b : set directory prefix
-
-	* disasm.c : fix bug
-
-
-2004-05-12(Wed) 00:00:17 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h, compiler.h, version.h : move *DEBUG defs to version.h
-
-
-2004-05-11(Tue) 23:00:11 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.h, version.h, yarvcore.h : move gcc ver check to version.h
-	and include version.h from yarvcore.h
-
-
-2004-05-11(Tue) 19:16:26 +0900  Koichi Sasada  <ko1@atdot.net>
-
-	* 0.0.0.d : imported
-
-
-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 "%Y-%m-%d(%a) %H:%M:%S +900"  (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/NEWS b/doc/NEWS
deleted file mode 100644
index db76546fbb..0000000000
--- a/doc/NEWS
+++ /dev/null
@@ -1,164 +0,0 @@
-Changes for 1.9
-
-Incompatible (Severe)
-
-    * New syntax and semantics
-          o Block arguments are always local
-          o Block arguments
-          o New semantics for block arguments
-          o Block local variables
-    * Array
-          o Array#nitems was removed (use count {|i| !i.nil?})
-    * String
-          o No longer an Enumerable
-          o ?c semantics
-          o "One-char-wide" semantics for String#[] and String#[]= [Ruby2]
-          o Encoding-awareness
-    * IO operations
-          o IO#getc
-
-Incompatible (Trivial)
-
-    * New syntax and semantics
-          o Method used for splat arguments: #to_splat
-          o defined? and local variables
-    * Kernel and Object
-          o Kernel#require
-    * Class and Module
-          o Class variables behavior
-          o Module#attr is an alias of attr_reader
-          o Module#instance_methods, #private_instance_methods, #public_instance_methods
-          o Extra subclassing check when binding UnboundMethods
-    * Exceptions
-          o Equality of exceptions
-          o SystemStackError
-          o SecurityError
-          o Removed Exception#to_str [Ruby2]
-    * Array
-          o Array#[m,n] = nil places nil in the array.
-    * Hash
-          o Hash#to_s is equivalent to Hash#inspect
-          o Semantics for Hash#each and Hash#each_pair
-          o Hash#select
-    * Integer
-          o Integer(nil) raises TypeError
-    * Struct
-          o Struct#inspect
-    * File and Dir operations
-          o #to_path in File.path, File.chmod, File.lchmod, File.chown, File.lchown, File.utime, File.unlink... [Ruby2]
-          o Dir.[], Dir.glob
-          o Dir.exist?
-    * IO operations
-          o Non-blocking IO
-          o Kernel#open takes encoding specified
-          o IO#initialize now accepts an IO argument
-          o StringIO#readpartial
-          o IO.try_convert
-          o Limit input in IO#gets, IO#readline, IO#readlines, IO#each_line, IO#lines, IO.foreach, IO.readlines, StringIO#gets, StringIO#readline, StringIO#each, StringIO#readlines
-          o IO#ungetc, StringIO#ungetc
-	  o IO#internal_encoding, IO#external_encoding, IO#set_encoding
-	  o IO.pipe takes encoding option
-    * Time
-          o New format in Time#to_s
-          o Timezone information preserved on Marshal.dump/load
-    * Symbols: restriction on literal symbols
-    * $SAFE and bound methods
-    * Deprecation
-          o VERSION and friends
-          o Kernel.to_a
-          o Kernel#getc
-          o Object#type
-          o Hash#index
-          o ENV.index
-          o Symbol#to_int
-          o Removed Array and Hash #indices, #indexes
-	  o libraries: base64, mailread, getopts, parsearg, soap, wsdl
-
-Compatible
-
-    * New syntax and semantics
-          o New literal hash syntax
-          o New syntax for lambdas
-          o .() and calling Procs without #call/#[]
-          o Mandatory arguments after optional arguments allowed
-          o Multiple splats allowed
-          o Arguments to #[]
-          o printf-style formatted strings (%)
-          o Newlines allowed before ternary colon
-    * Kernel and Object
-          o BasicObject
-          o Object#=~
-          o Kernel#instance_variable_defined?
-          o Kernel#define_singleton_method
-          o Kernel#singleton_methods, Kernel#methods
-    * Class and Module
-          o Module#const_defined?, #const_get and #method_defined?
-          o Module#class_variable_defined?
-          o #class_variable_{set,get}
-          o Class of singleton classes
-    * Binding#eval
-    * Blocks and Procs
-          o Arity of blocks without arguments
-          o proc is now a synonym of Proc.new
-    * Blocks and Procs
-          o Proc#yield
-          o Passing blocks to #[]
-          o Proc#lambda?
-    * Enumerable and Enumerator
-          o Enumerable#map,collect_all called without a block returns
-            an enumerator.
-    * Regexp#match, String#match
-          o Regexp#match, String#match
-    * Fiber: coroutines/micro-threads
-    * Array
-          o Array#to_s is equivalent to Array#inspect
-          o Array.try_convert
-    * Hash
-          o preserving item insertion order
-          o Hash#_compare_by_identity and Hash#compare_by_identity?
-          o Hash.try_convert
-    * Numeric
-          o Numeric#upto, #downto, #times, #step
-          o Numeric#scalar?, Complex#scalar?
-          o Numeric#div
-          o Numeric#fdiv
-    * Range
-          o Range#cover?
-          o Range#include?
-          o Range#min, Range#max
-    * Regexp
-          o Regexp#=== matches symbols
-          o Regexp.try_convert
-    * String
-          o String#clear
-          o String#ord
-          o String#encoding
-          o String#force_encoding
-          o String#unpack with a block
-          o String#hash
-          o String.try_convert
-	  o String.encoding, String#force_encoding, String#encode
-    * Symbol
-          o Zero-length symbols allowed
-          o Symbol#=== matches strings
-          o Symbol#intern
-          o Symbol#encoding
-          o Symbol methods similar to those in String
-    * Math
-          o Math#log and Math#log2
-    * File and Dir operations
-          o New methods
-    * Process
-          o Process.daemon
-    * Misc. new methods
-          o public_send
-          o GC.count
-          o ObjectSpace.count_objects
-          o Method#hash, Proc#hash
-          o __callee__
-
-* Implementation
-    * Memory Diet
-      * Object Compaction - Object, Array, String, Hash, Struct, Class, Module
-      * st_table compaction (inlining small tables)
-    * YARV
diff --git a/doc/NEWS-1.8.0 b/doc/NEWS-1.8.0
new file mode 100644
index 0000000000..b4445fa59f
--- /dev/null
+++ b/doc/NEWS-1.8.0
@@ -0,0 +1,837 @@
+= command line options
+
+: -W option
+
+  new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
+  -W2 for verbose level.  -w equals to -W2.
+
+= language syntax
+
+: arbitrary delimited string array
+
+  %W(...) notation, word list literal like %w(...) with the
+  exception that #{} interpolation is allowed.
+
+: arbitrary delimited symbol literl
+
+  :"foo", :"foo#{bar}", etc.
+
+: expression interpolation in strings
+
+  Now arbitrary statements are allowed inside #{} interpolation
+  without escapes.  In other hand, they can no longer access to
+  variables defined in eval.
+
+: negative number literals
+
+  Digits preceded minus sign is a literal integer.
+
+: array expansion
+
+  Fixed with the following behavior:
+
+    a = *[1]
+    p a #=> [1]
+
+  Now 1-element array in rhs is expanded properly.
+
+    a = *[1]
+    p a #=> 1
+
+: break and next
+
+  Extended to take an optional expression, which is used as a value
+  for termination.
+
+: direct assignment to Foo::Bar is allowed
+
+  also, you can define "class Foo::Bar; end".
+
+= language core
+
+: $stdin, $stdout, $stderr
+
+  can be assignable again.  the original stdio are preserved as STDIN,
+  STDOUT, STDERR.
+
+: $VERBOSE now has 3 levels
+
+  nil - silence, false - medium (default), true - verbose
+
+: allocation framework
+
+  any instance of class can be allocated by class.allocate,
+  (except for a few classes).
+
+: comparison of exception classes in a rescue clause
+
+  changed to use Module#=== for comparing $! with the exception
+  class specified in each rescue clause.
+
+  as the previous behavior was to use kind_of?, the effect is limited
+  to the SystemCallError case.  SystemCallError.=== has been newly
+  defined to return true when the two have the same errno.  With this
+  change, SystemCallError's with the same errno, such as Errno::EAGAIN
+  and Errno::EWOULDBLOCK, can both be rescued by listing just one of
+  them.
+
+: constants lookup
+
+  improved at the performance of searching by using an internal hash
+  table.
+
+  calls const_missing method of the class/module, if constant is not
+  found in the look up path.
+
+: expression parenthesis in the first argument
+
+  altered to get the following code (note the space after p):
+
+    p ("xx"*2).to_i
+
+  Interpreted as:
+
+    p (("xx"*2).to_i)
+
+  Instead of:
+
+    (p("xx"*2)).to_i
+
+: implicit comparison in conditional expressions
+
+  Obsoleted except when it is used in -e.
+
+  : between Range and $.
+      Use explicit comparison instead.
+
+  : between Regexp and $_
+      Use the unary method ~/re/ instead.
+
+: to_str
+
+  added to get objects which define to_str() treated as String's.
+
+  now almost all the built-in methods try each argument with to_str()
+  when they expect it to be a String.
+
+    foo = Object.new
+    class <<foo
+      def to_str
+        "foo"
+      end
+    end
+    p File.open(foo)
+    => -:7:in `open': wrong argument type Object (expected String) (TypeError)
+       ruby 1.6.4 (2001-04-19) [i586-linux]
+    => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
+       ruby 1.7.0 (2001-05-02) [i586-linux]
+
+: multiple assignment behavior
+
+  Fixed so that "*a = nil" results in "a == []".
+
+= changes in core class library
+
+: open
+
+  Extended so that when the third argument is permission flags it
+  calls open(2) instead of fopen(3).
+
+: sprintf
+
+  new format specifier "%p" is available.
+
+: lambda and proc
+
+  Proc object returns from these methods has the following attributes:
+
+  * strict argument number check
+  * break and return terminates the proc execution.
+
+: warn(message)
+
+  a method to give warnings.
+
+: abort()
+
+  takes optional terminate message argument.
+
+: Object#initialize_copy
+
+  copy constructor for clone and dup.
+
+: Object#instance_variable_set, Object#instance_variable_get
+
+  added.
+
+: Object#singleton_method_removed
+: Object#singleton_method_undefined
+
+  Added.
+
+: Array#transpose
+
+  added.
+
+: Array#fetch(index [, default])
+
+  Added.  If a default value isn't given, raises index error if index
+  is out of range.
+
+: Array#insert(n, other, ...)
+
+  Added. [ruby-talk:14289]
+
+  This is much the same as (({ary[n,0] = [other,...]})) except
+  returing self.
+
+    ary = [0,1,2,3]
+    ary[2, 0] = [4, 5, 6]
+    p ary
+
+    ary = [0,1,2,3]
+    ary.insert(2, 4, 5, 6)
+    p ary
+
+: Array#sort!
+
+  Changed to always return self without checking whether the sequence
+  of the elements was modified or not.
+
+  Beware that this behavior is not guaranteed to continue in the
+  future.  Do not rely on its return value. [ruby-dev:12506]
+
+: Array#filter
+
+  Previously deprecated, now removed.  Use Array#collect!.
+
+: Array#pack, String#unpack
+
+  Allows comment in template strings.
+
+: Array#pack, String#unpack
+
+  New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
+
+: Array#new
+
+  Now takes block to fill initial values.  E.g.
+
+	Array.new(10) { |i| i + 1 }
+	=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+
+: Array#fill
+
+  Takes block to get the values to fill.
+
+: Array#fetch
+
+  Takes block to get the default value.
+
+: Array#zip
+
+  added.
+
+: Hash#update
+
+  Takes block to resolve key conflict.
+
+: Hash#merge and Hash#merge!
+
+  update hash.  Hash#merge! is a synonym of Hash#update.
+
+: String#split
+
+  if "sep" argument is a string, regular expression meta characters
+  are escaped internally.
+
+: String#rstrip
+
+  chop off NULs at the end of strings.
+
+: String#to_i
+
+  Now accepts optional base argument.
+
+	"101".to_i(10) => 101
+	"101".to_i(2)  => 5
+	"101".to_i(8)  => 65
+	"101".to_i(16) => 257
+
+  A base argument of 0 guesses at the base.
+
+	"101".to_i(0)   => 101
+	"0b101".to_i(0) => 5
+	"0101".to_i(0)  => 65
+	"0x101".to_i(0) => 257
+
+: String#[regexp, nth]
+
+  Extended to accepts optional second argument.
+
+  It tries match between self and REGEXP, then returns the
+  content of the NTH regexp register.
+
+: String#casecmp
+
+  Added.  This is a case insensitive version of String#<=>.
+
+: String#chomp
+
+  If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
+
+: String#eql?
+
+  Changed to be always case sensitive.
+
+: String#insert(n, other)
+
+  Added.
+
+  This is much the same as (({str[n, 0] = other})) except returing
+  self.
+
+: String#lstrip, rstrip, lstrip!, rstrip!
+
+  Added.  These strip only left or right part of a string.
+
+: String#match
+
+  Added.
+
+: String/Array methods
+
+  Returns an instance of receivers class.
+
+: String.new
+
+  The first argument becomes optional.
+
+: Symbol#intern
+
+  Added.
+
+: Symbol.all_symbols
+
+  Added. [ruby-dev:12921]
+
+: IO
+
+  64bit off_t support by Janathan Baker.
+
+: IO#read
+: IO#sysread
+
+  takes optinal second argument for read buffer.
+
+: IO::sysopen
+
+  New method to get a raw file descriptor.
+
+: IO#sysseek
+
+  Added.
+
+: IO#fsync
+
+  new method that copies all in-memory parts of a file to disk and
+  waits until the device reports that all parts are on stable storage.
+  Implemented with fsync(2) or equivalent.
+
+: IO.open
+
+  Made public.  Can only associate an IO object with a file number
+  like IO.new and IO.for_fd, but can take a block.
+
+: IO.for_fd
+
+  Added as a synonym for IO.new.
+
+: IO.read
+
+  Added.  Like IO.readlines, except it returns the entire file as a
+  string.  [ruby-talk:9460]
+
+: File#fnmatch, File::Constants::FNM_*
+
+  Added.  Refer to the fnmatch(3) manpage for details.
+
+  Localism is FNM_DOTMATCH which has the opposite meaning of the
+  commonly known FNM_PERIOD, which does not exist in Ruby.
+
+  e.g.
+
+    # exclude files matching "*.bak" case-insensitively.
+    files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
+
+: File.lchmod
+: File.lchown
+
+  Added.
+
+: File.open, IO.open
+
+  File mode can be specified by flags like open(2),
+  e.g. File::open(path, File::CREAT|File::WRONLY).
+
+: Regexp#options
+
+  Added.
+
+: Regexp.last_match(n)
+
+  Extended to take an optional argument.
+
+: MatchData#captures
+
+  added.
+
+: Dir#path
+
+  Added.
+
+: Dir.chdir
+
+  Extended to take a block.
+
+: Dir.glob
+
+  Made to support meta-character escaping by a backslash.  Wildcards
+  and spaces may now be escaped using a backslash.
+
+: Dir.open
+
+  Changed to return what the block returns when a block is given, just
+  as File.open does. (It always returned (({nil})) in 1.6 and
+  prior)
+
+: Dir.chdir
+
+  Changed to warn only when invoked from multiple threads or no block
+  is given. [ruby-dev:13823]
+
+    Dir.chdir('foo') {
+      Dir.chdir('bar') {   # previously warned
+        puts Dir.pwd
+      }
+    }
+
+: Dir#pos=
+
+  Returns the new position instead of self.
+
+: Dir::glob
+
+  Now accepts optional FNM_* flags via the second argument, whereas
+  Dir::[] doesn't.
+
+    Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
+
+: Class#inherited
+
+  Method is called when Class is inherited by another class.
+
+	class A; end
+	def A.inherited(by)
+          puts "A inherited by #{by.inspect}"
+        end
+        class B < A; end
+
+        Prints out "A inherited by B"
+
+: Module#include?
+
+  Added. [ruby-dev:13941] 
+
+: Module#included
+
+  Added.  This is a hook called after Module#append_feature.
+
+: Module#method_removed
+: Module#method_undefined
+
+  Added.
+
+: Module.new, Class.new
+
+  Extended to take block.
+
+: Time
+
+  Extended to accept a negative time_t. (Only when the platform
+  supports it)
+
+    p Time.at(-1)
+    => Thu Jan 01 08:59:59 JST 1970
+
+: Time#to_a
+: Time#zone
+
+  Made to return "UTC" under gmtime.  It used to return a platform
+  dependent value, typically "GMT", in 1.6 and prior.
+
+: Marshal to use marshal_dump and marshal_load
+
+  if a dumping object responds to 'marshal_dump', Marshal.dump calls
+  it, and dumps object returned.  Marshal.load allocates a new instance
+  using "allocate", then calls its "marshal_load" with dumped data.
+  Marshal format version is now 4.8 (was 4.6 in 1.6.8).
+
+: Marshal
+
+  Fixed not to dump anonymous classes/modules.
+
+  Fixed with loading modules.
+
+: Thread#group
+
+  new method to get belonging  ThreadGroup.
+
+: Thread#terminate
+
+  synonym of Thread#exit
+
+: Thread#join
+
+  Optional argument limits maximum time to wait the thread in second.
+  And returns nil if timed out.
+
+: ThreagGroup#enclose
+
+  prohibits thread movement from/to enclosed groups.
+
+: Range#step([step=1])
+
+  Added.
+
+: SystemCallError
+
+  SystemCallError's "===" match (used in rescue also) is now based on its errno.
+
+: Interrupt
+
+  Made a subclass of SignalException. (It was a subclass of
+  Exception in 1.6 and prior)
+
+: NameError and NoMethodError
+
+  Moved and now NoMethodError < NameError < StandardError.
+
+: NoMethodError
+
+  Added. [ruby-dev:12763]
+
+: NotImplementError
+
+  Finally obsoleted.  Use NotImplementedError.
+
+: SystemCallError.===
+
+  Added. (See the "Comparison of exception classes in a rescue clause"
+  paragraph above) [ruby-dev:12670]
+
+: SystemExit#status
+
+  Added.
+
+: Proc#==
+
+  Added.
+
+: Method#==
+
+  Added.
+
+: UnboundMethod is no longer subclass of Method
+
+  class hierarchy changed. 
+
+: Enumerable#all?
+: Enumerable#any?
+: Enumerable#inject
+: Enumerable#sort_by
+
+  Added.
+
+: Math.acos(x)
+: Math.asin(x)
+: Math.atan(x)
+: Math.cosh(x)
+: Math.hypot(x,y)
+: Math.sinh(x)
+: Math.tanh(x)
+
+  Added.
+
+: Process.abort
+: Process.exit
+
+  synonym of Kernel#abort, and Kernel#exit respectively.
+
+: Process::detach(pid)
+
+  new method to detach child process.  child process will be "wait"ed
+  automagically.
+
+: Process.times
+
+  Moved from Time.times. (Time.times still remains but emits a
+  warning)
+
+: Process.waitall
+
+  Added.
+
+: Process::Status
+
+  Added.  (({$?})) is now an instance of this class.
+
+: Process::UID, Process::GID, Process::Sys,
+
+  Added.
+
+: Signal
+
+  Added. This module has module functions Signal.trap and Signal.list.
+
+= changes in bundled libraries
+
+: lib/cgi.rb
+
+  cgi[name] returns CGI::QueryExtension::Value that wraps string
+  value, no longer array.
+
+: lib/timeout
+
+  timeout "function" wrapped in Timeout module.
+
+: TCPServer#accept, UNIXServer#accept, Socket#accept
+
+  New methods to return an accepted socket fd.
+
+: Date and DateTime
+
+  lib/date.rb now provides both Date and DateTime.
+
+  Some methods have been renamed.  But the old names are still alive.
+
+  Some new methods have been added (Date::parse, Date#strftime, etc.).
+
+  Date#mjd now returns the chronological modified Julian day number.
+
+  All facilities about tjd have been removed.
+
+: Curses
+
+  Updated.  New methods and constants for using the mouse, character
+  attributes, colors and key codes have been added.
+
+: Net::HTTP
+
+  New version of Net::HTTP has introduced seriously incompatible
+  changes. For details, see document embedded in net/http.rb itself.
+
+: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
+
+  Added.  Utility for direct Socket access.
+
+: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
+
+  Added.  Utility for direct Socket access.
+
+: TCPServer#listen, UNIXServer#listen
+
+  Added.
+
+: TCPSocket.new
+: TCPSocket.open
+
+  Extended to take an address and a port number for the local side in
+  optional 3rd and 4th arguments.
+
+= newly bundled library
+
+: ext/bigdecimal
+
+  variable precision decimal number 
+
+: ext/dl
+
+  an interface to the dynamic linker.
+
+: ext/enumerator
+
+  a helper module for the Enumerable interface.
+
+: ext/io/wait
+
+  IO wait methods.
+
+: ext/iconv
+
+  wrapper library of (({iconv})).
+
+: ext/openssl
+
+  OpenSSL for Ruby
+
+: ext/racc/cparse
+
+  Racc runtime library in C. (Racc is a parser generator for ruby)
+
+: ext/stringio
+
+  Pseudo (({IO})) class from/to (({String})).
+
+: ext/strscan
+
+  Fast string scanner library.
+
+: ext/syck
+
+  fast YAML parser.
+
+: lib/abbrev
+
+  creates an abbreviation table from a list
+
+: lib/benchmark
+
+  Ruby scripts benchmarker
+
+: lib/cgi/session/pstore
+
+  cgi/session back-end using pstore 
+
+: lib/csv
+
+  reads/writes CSV files.
+
+: lib/date/format
+
+  strftime for Date class
+
+: lib/drb
+
+  dRuby or distributed Ruby
+
+: lib/fileutils
+
+  file utility library.
+
+: lib/generator
+
+  converts an internal iterator to an external iterator
+
+: lib/gserver
+
+  generic server used by xmlrpc
+
+: lib/ipaddr
+
+  manipulates IP address.
+
+: lib/multi-tk
+
+  to allow safe Tk, etc.
+
+: lib/open-uri
+
+  easy-to-use wrapper for net/http and net/ftp
+
+: lib/optparse
+
+  command line options utility library
+
+: lib/pathname
+
+  handles pathname in OO manner.
+
+: lib/pp
+
+  prettyprinter for Ruby objects
+
+: lib/prettyprint
+
+  implements prettyprint algorithm.
+
+: lib/profiler
+
+  library to implement -r "profile"
+
+: lib/racc/parser
+
+  RACC parser generator runtime in Ruby.
+
+: lib/scanf
+
+  scan string and retrieve object with format
+
+: lib/set
+
+  Set class
+
+: lib/runit
+
+  RubyUnit compatible layer for test/unit
+
+: lib/test/unit
+
+  unit testing framework for Ruby
+
+: lib/tmpdir
+
+  get temporary directory path.
+
+: lib/tsort
+
+  topological sorting library.
+
+: lib/rexml
+
+  REXML XML library
+
+: lib/webrick
+
+  generic internet server kit
+
+: lib/xmlrpc
+
+  simple RPC via XML
+
+: lib/un
+
+  used like 'ruby -run -e cp -- -p foo bar'.  neat, isn't it?
+
+: lib/win32/registry
+
+  win32/registry is registry accessor
+
+: lib/yaml
+
+  YAML Ain't Mark-up Language
+
+= removed libraries
+
+: lib/ftplib
+
+  use net/ftp instead.
+
+: lib/telnet
+
+  use net/telnet instead.
+
+= new port
+
+: WindowsCE port
+: Win32 BCC
+
+= interpreter implementation
+
+: garbage collector
+
+  faster, but uses more memory for the worst case.
+
+: string concatenation
+
+  faster by avoiding too frequent realloc(3).
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
index 0eca25b90a..7272c374b6 100644
--- a/doc/forwardable.rd
+++ b/doc/forwardable.rd
@@ -2,6 +2,7 @@
 						
                                                 $Release Version: 1.1 $
                                                 $Revision$
+                                                $Date$
 						Original version by Tosh
 
 =begin
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 48186b111f..d928fddc5e 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,6 +1,7 @@
   -- forwatable.rb
                                                 $Release Version: 1.1 $
                                                 $Revision$
+                                                $Date$
 
 =begin
 = Forwardable
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 7711f96e08..64d9ab29c8 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,6 +1,7 @@
 irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
 				$Release Version: 0.7.1 $
 			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
 
 =begin
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index 8468809d2b..a42cd46680 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,6 +1,7 @@
 irb -- interactive ruby
 		$Release Version: 0.9 $
 		$Revision$
+		$Date$
 		by Keiju ISHITSUKA(keiju@ishitsuka.com)
 		by gotoken-san who is original translater from japanese version
 
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 53f76180ec..338dcc644e 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,6 +1,7 @@
 irb -- interactive ruby
 				$Release Version: 0.9.5 $
 			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 =begin
 = irb�Ȥ�?
diff --git a/doc/shell.rd b/doc/shell.rd
index 8a1f7c5a80..02ee1b020a 100644
--- a/doc/shell.rd
+++ b/doc/shell.rd
@@ -1,6 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
 			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index 33e5a9ed9b..073e71ea42 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -1,6 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
 			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/enc/Makefile.in b/enc/Makefile.in
deleted file mode 100644
index 436c0f4e32..0000000000
--- a/enc/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-encsrcdir = @srcdir@
-topdir = .
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-libdir = @libdir@
-top_srcdir = $(encsrcdir:/enc=)
-srcdir = $(top_srcdir)
-arch = @arch@
-EXTOUT = @EXTOUT@
-hdrdir = $(srcdir)/include
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-ENCSODIR = $(EXTOUT)/$(arch)/enc
-TRANSSODIR = $(ENCSODIR)/trans
-DLEXT = @DLEXT@
-OBJEXT = @OBJEXT@
-
-BUILTIN_ENCS	= ascii.c us_ascii.c\
-		  unicode.c utf_8.c
-
-RUBY_SO_NAME = @RUBY_SO_NAME@
-LIBRUBY = @LIBRUBY@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-LIBRUBYARG_STATIC = $(LIBRUBYARG_SHARED)
-
-empty =
-CC = @CC@
-OUTFLAG = @OUTFLAG@$(empty)
-COUTFLAG = @COUTFLAG@$(empty)
-CFLAGS = $(CCDLFLAGS) @CFLAGS@ @ARCH_FLAG@
-cflags = @cflags@
-optflags = @optflags@
-debugflags = @debugflags@
-warnflags = @warnflags@
-CCDLFLAGS = @CCDLFLAGS@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir)
-DEFS = @DEFS@
-CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
-LDSHARED = @LDSHARED@
-ldflags  = $(LDFLAGS)
-dldflags = @DLDFLAGS@
-archflag = @ARCH_FLAG@
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-
-RM = @RM@
-
-all:
-
-clean:
-
-distclean: clean
-	@$(RM) enc.mk
diff --git a/enc/ascii.c b/enc/ascii.c
deleted file mode 100644
index 3d62ec9bf7..0000000000
--- a/enc/ascii.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/**********************************************************************
-  ascii.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-OnigEncodingDefine(ascii, ASCII) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ASCII-8BIT",/* name */
-  1,           /* max byte length */
-  1,           /* min byte length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  onigenc_ascii_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  onigenc_ascii_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("BINARY", "ASCII-8BIT")
-ENC_REPLICATE("IBM437", "ASCII-8BIT")
-ENC_ALIAS("CP437", "IBM437")
-ENC_REPLICATE("IBM737", "ASCII-8BIT")
-ENC_ALIAS("CP737", "IBM737")
-ENC_REPLICATE("IBM775", "ASCII-8BIT")
-ENC_ALIAS("CP775", "IBM775")
-ENC_REPLICATE("CP850", "ASCII-8BIT")
-ENC_ALIAS("IBM850", "CP850")
-ENC_REPLICATE("IBM852", "ASCII-8BIT")
-ENC_REPLICATE("CP852", "IBM852")
-ENC_REPLICATE("IBM855", "ASCII-8BIT")
-ENC_REPLICATE("CP855", "IBM855")
-ENC_REPLICATE("IBM857", "ASCII-8BIT")
-ENC_ALIAS("CP857", "IBM857")
-ENC_REPLICATE("IBM860", "ASCII-8BIT")
-ENC_ALIAS("CP860", "IBM860")
-ENC_REPLICATE("IBM861", "ASCII-8BIT")
-ENC_ALIAS("CP861", "IBM861")
-ENC_REPLICATE("IBM862", "ASCII-8BIT")
-ENC_ALIAS("CP862", "IBM862")
-ENC_REPLICATE("IBM863", "ASCII-8BIT")
-ENC_ALIAS("CP863", "IBM863")
-ENC_REPLICATE("IBM864", "ASCII-8BIT")
-ENC_ALIAS("CP864", "IBM864")
-ENC_REPLICATE("IBM865", "ASCII-8BIT")
-ENC_ALIAS("CP865", "IBM865")
-ENC_REPLICATE("IBM866", "ASCII-8BIT")
-ENC_ALIAS("CP866", "IBM866")
-ENC_REPLICATE("IBM869", "ASCII-8BIT")
-ENC_ALIAS("CP869", "IBM869")
-ENC_REPLICATE("Windows-1258", "ASCII-8BIT")
-ENC_ALIAS("CP1258", "Windows-1258")
-ENC_REPLICATE("GB1988", "ASCII-8BIT")
-ENC_REPLICATE("macCentEuro", "ASCII-8BIT")
-ENC_REPLICATE("macCroatian", "ASCII-8BIT")
-ENC_REPLICATE("macCyrillic", "ASCII-8BIT")
-ENC_REPLICATE("macGreek", "ASCII-8BIT")
-ENC_REPLICATE("macIceland", "ASCII-8BIT")
-ENC_REPLICATE("macRoman", "ASCII-8BIT")
-ENC_REPLICATE("macRomania", "ASCII-8BIT")
-ENC_REPLICATE("macThai", "ASCII-8BIT")
-ENC_REPLICATE("macTurkish", "ASCII-8BIT")
-ENC_REPLICATE("macUkraine", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
deleted file mode 100644
index 70a316ea2c..0000000000
--- a/enc/big5.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/**********************************************************************
-  big5.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_BIG5[] = {
-  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, 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, 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, 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,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_BIG5[firstbyte]-1);
-  s = trans[s][*p++];
-  RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-big5_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-big5_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-big5_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                   UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-big5_is_mbc_ambiguous(OnigCaseFoldType flag,
-		      const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-big5_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static const char BIG5_CAN_BE_TRAIL_TABLE[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define BIG5_ISMB_FIRST(byte)  (EncLen_BIG5[byte] > 1)
-#define BIG5_ISMB_TRAIL(byte)  BIG5_CAN_BE_TRAIL_TABLE[(byte)]
-
-static UChar*
-big5_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  if (BIG5_ISMB_TRAIL(*p)) {
-    while (p > start) {
-      if (! BIG5_ISMB_FIRST(*--p)) {
-	p++;
-	break;
-      }
-    } 
-  }
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-big5_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-
-  return (BIG5_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-OnigEncodingDefine(big5, BIG5) = {
-  big5_mbc_enc_len,
-  "Big5",     /* name */
-  2,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  big5_mbc_to_code,
-  onigenc_mb2_code_to_mbclen,
-  big5_code_to_mbc,
-  big5_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  big5_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
-};
-ENC_ALIAS("CP950", "BIG5")
diff --git a/enc/cp949.c b/enc/cp949.c
deleted file mode 100644
index 0046460625..0000000000
--- a/enc/cp949.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**********************************************************************
-  cp949.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_CP949[] = {
-  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, 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, 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, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-static const char CP949_CAN_BE_TRAIL_TABLE[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define CP949_ISMB_FIRST(byte)  (EncLen_CP949[byte] > 1)
-#define CP949_ISMB_TRAIL(byte)  CP949_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
-    /* 6 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, F, F, F, F, F,
-    /* 8 */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-cp949_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_CP949[firstbyte]-1);
-  s = trans[s][*p++];
-  RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-cp949_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-cp949_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-cp949_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                    UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-cp949_is_mbc_ambiguous(OnigCaseFoldType flag,
-		       const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-cp949_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static UChar*
-cp949_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  if (CP949_ISMB_TRAIL(*p)) {
-    while (p > start) {
-      if (! CP949_ISMB_FIRST(*--p)) {
-	p++;
-	break;
-      }
-    } 
-  }
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-cp949_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  return (CP949_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-OnigEncodingDefine(cp949, CP949) = {
-  cp949_mbc_enc_len,
-  "CP949",      /* name */
-  2,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  cp949_mbc_to_code,
-  onigenc_mb2_code_to_mbclen,
-  cp949_code_to_mbc,
-  cp949_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  cp949_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  cp949_left_adjust_char_head,
-  cp949_is_allowed_reverse_match
-};
-/*
- * Name: CP949
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/949.mspx
- * Link: http://en.wikipedia.org/wiki/EUC-KR#EUC-KR
- */
diff --git a/enc/depend b/enc/depend
deleted file mode 100644
index ff95d8f068..0000000000
--- a/enc/depend
+++ /dev/null
@@ -1,65 +0,0 @@
-% deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
-% encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
-% encs.each {|e| e.chomp!(".c")}
-% alphanumeric_order = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
-% encs = encs.sort_by(&alphanumeric_order)
-% trans = Dir.open($srcdir+"/trans") {|d| d.select {|e| e.chomp!('.c')}}
-% trans = trans.sort_by(&alphanumeric_order)
-% trans.map! {|e| "trans/#{e}"}
-% dependencies = encs + trans
-
-VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
-LIBPATH = <%=libpathflag($DEFLIBPATH)%>
-
-ENCOBJS = <%=encs.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t  ")%><%="\n" if encs.size>1%>
-ENCDEFS = <%=encs.map {|e|"enc/#{e}.def"}.join(" \\\n\t  ") if deffile%><%="\n" if encs.size>1%>
-ENCSOS = <%=encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%>
-
-TRANSOBJS = <%=trans.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t    ")%><%="\n" if trans.size>1%>
-TRANSDEFS = <%=trans.map {|e|"enc/#{e}.def"}.join(" \\\n\t    ") if deffile%><%="\n" if trans.size>1%>
-TRANSSOS = <%=trans.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t   ")%>
-
-all: $(ENCSOS) $(TRANSSOS)
-
-% COMPILE_RULES.each do |rule|
-<%=  rule % %w[c $(OBJEXT)] %>
-	<%=COMPILE_C%>
-
-% end
-% unless encs.empty? or trans.empty?
-
-%   unless encs.empty?
-$(ENCOBJS): regenc.h oniguruma.h config.h defines.h
-%   end
-%   unless trans.empty?
-$(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h
-%   end
-
-% end
-% link_so = LINK_SO.gsub(/\n/, "\n\t")
-% link_so.gsub!(/(-(?:implib|pdb):\S+)-\$\(arch\)\./, '\1.')
-% dependencies.each do |e|
-%   obj = "enc/#{e}.$(OBJEXT)"
-%   df = ("enc/#{e}.def" if deffile)
-$(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
-%   if df
-	echo EXPORTS > <%=df%>
-	echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%>
-%   end
-	<%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%>
-
-% end
-% dependencies.each do |e|
-enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c
-	<%=COMPILE_C.sub(/\$\(<(?:.*)\)/) {"$(srcdir)/enc/#{e}.c"}%>
-% end
-
-enc/encdb.$(OBJEXT): encdb.h
-enc/trans/transdb.$(OBJEXT): transdb.h
-
-clean:
-	@$(RM) $(ENCSOS) $(ENCDEFS) $(ENCOBJS) $(TRANSSOS) $(TRANSDEFS) $(TRANSOBJS)
-% %w[$(ENCSODIR)/trans $(ENCSODIR) enc/trans enc].each do|dir|
-%   dir = dir.gsub('/', File::ALT_SEPARATOR) if File::ALT_SEPARATOR
-	@-rmdir <%=dir%>
-% end
diff --git a/enc/encdb.c b/enc/encdb.c
deleted file mode 100644
index 35f4c93b55..0000000000
--- a/enc/encdb.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/**********************************************************************
-
-  enc/encdb.c -
-
-  $Author$
-  created at: Mon Apr  7 15:51:31 2008
-
-  Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-int rb_encdb_replicate(const char *alias, const char *orig);
-int rb_encdb_alias(const char *alias, const char *orig);
-int rb_encdb_dummy(const char *name);
-void rb_encdb_declare(const char *name);
-#define ENC_REPLICATE(name, orig) rb_encdb_replicate(name, orig)
-#define ENC_ALIAS(name, orig) rb_encdb_alias(name, orig)
-#define ENC_DUMMY(name) rb_encdb_dummy(name)
-#define ENC_DEFINE(name) rb_encdb_declare(name)
-
-void
-Init_encdb(void)
-{
-#include "encdb.h"
-}
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
deleted file mode 100644
index ea073666f5..0000000000
--- a/enc/euc_jp.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/**********************************************************************
-  euc_jp.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-
-#define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
-
-static const int EncLen_EUCJP[] = {
-  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, 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, 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, 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, 2, 3,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 1, 2,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  },
-  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s;
-  s = trans[0][firstbyte];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-1);
-  s = trans[s][*p++];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCJP[firstbyte]-2);
-  s = trans[s][*p++];
-  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
-                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, i, len;
-  OnigCodePoint n;
-
-  len = enclen(enc, p, end);
-  n = (OnigCodePoint )*p++;
-  if (len == 1) return n;
-
-  for (i = 1; i < len; i++) {
-    if (p >= end) break;
-    c = *p++;
-    n <<= 8;  n += c;
-  }
-  return n;
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
-  if (ONIGENC_IS_CODE_ASCII(code)) return 1;
-  else if (code > 0xffffff) return 0;
-  else if ((code & 0xff0000) >= 0x800000) return 3;
-  else if ((code &   0xff00) >= 0x8000) return 2;
-  else
-    return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-#if 0
-static int
-code_to_mbc_first(OnigCodePoint code)
-{
-  int first;
-
-  if ((code & 0xff0000) != 0) {
-    first = (code >> 16) & 0xff;
-  }
-  else if ((code & 0xff00) != 0) {
-    first = (code >> 8) & 0xff;
-  }
-  else {
-    return (int )code;
-  }
-  return first;
-}
-#endif
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  UChar *p = buf;
-
-  if ((code & 0xff0000) != 0) *p++ = (UChar )(((code >> 16) & 0xff));
-  if ((code &   0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
-  *p++ = (UChar )(code & 0xff);
-
-#if 1
-  if (enclen(enc, buf, p) != (p - buf))
-    return ONIGERR_INVALID_CODE_POINT_VALUE;
-#endif  
-  return p - buf;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end, UChar* lower,
-	      OnigEncoding enc)
-{
-  int len;
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_MBC_ASCII(p)) {
-    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    (*pp)++;
-    return 1;
-  }
-  else {
-    int i;
-
-    len = enclen(enc, p, end);
-    for (i = 0; i < len; i++) {
-      *lower++ = *p++;
-    }
-    (*pp) += len;
-    return len; /* return byte length of converted char to lower */
-  }
-}
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  /* In this encoding
-     mb-trail bytes doesn't mix with single bytes.
-  */
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  while (!eucjp_islead(*p) && p > start) p--;
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  if (c <= 0x7e || c == 0x8e || c == 0x8f)
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
-static const OnigCodePoint CR_Hiragana[] = {
-  1,
-  0xa4a1, 0xa4f3
-}; /* CR_Hiragana */
-
-static const OnigCodePoint CR_Katakana[] = {
-  3,
-  0xa5a1, 0xa5f6,
-  0xaaa6, 0xaaaf,
-  0xaab1, 0xaadd
-}; /* CR_Katakana */
-
-static int
-init_property_list(void)
-{
-  int r;
-
-  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
-  PropertyInited = 1;
-
- end:
-  return r;
-}
-
-static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
-{
-  st_data_t ctype;
-
-  PROPERTY_LIST_INIT_CHECK;
-
-  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
-    return onigenc_minimum_property_name_to_ctype(enc, p, end);
-  }
-
-  return ctype;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    if (code < 128)
-      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
-    else {
-      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
-	return (code_to_mbclen(code, enc) > 1 ? TRUE : FALSE);
-      }
-    }
-  }
-  else {
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (unsigned int )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
-  }
-
-  return FALSE;
-}
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    return ONIG_NO_SUPPORT_CONFIG;
-  }
-  else {
-    *sb_out = 0x80;
-
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (OnigCtype )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    *ranges = PropertyList[ctype];
-    return 0;
-  }
-}
-
-
-OnigEncodingDefine(euc_jp, EUC_JP) = {
-  mbc_enc_len,
-  "EUC-JP",   /* name */
-  3,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  mbc_to_code,
-  code_to_mbclen,
-  code_to_mbc,
-  mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  property_name_to_ctype,
-  is_code_ctype,
-  get_ctype_code_range,
-  left_adjust_char_head,
-  is_allowed_reverse_match,
-  0
-};
-/*
- * Name: EUC-JP
- * MIBenum: 18
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://home.m05.itscom.net/numa/cde/sjis-euc/sjis-euc.html
- */
-ENC_ALIAS("eucJP", "EUC-JP") /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */
-
-/*
- * Name: eucJP-ms
- * Link: http://home.m05.itscom.net/numa/cde/ucs-conv/ucs-conv.html
- * Link: http://www2d.biglobe.ne.jp/~msyk/charcode/cp932/eucJP-ms.html
- * Link: http://ja.wikipedia.org/wiki/EUC-JP
- */
-ENC_REPLICATE("eucJP-ms", "EUC-JP") /* TOG/JVC CDE/Motif Technical WG */
-ENC_ALIAS("euc-jp-ms", "EUC-JP")
-
-/*
- * Name: CP51932
- * Link: http://search.cpan.org/src/NARUSE/Encode-EUCJPMS-0.07/ucm/cp51932.ucm
- * Link: http://legacy-encoding.sourceforge.jp/wiki/index.php?cp51932
- * Link: http://msyk.at.webry.info/200511/article_2.html
- */
-ENC_REPLICATE("CP51932", "EUC-JP")
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
deleted file mode 100644
index 1b5ec893c1..0000000000
--- a/enc/euc_kr.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/**********************************************************************
-  euc_kr.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_EUCKR[] = {
-  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, 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, 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, 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,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-euckr_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCKR[firstbyte]-1);
-  s = trans[s][*p++];
-  RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-euckr_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-euckr_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-euckr_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                    UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-euckr_is_mbc_ambiguous(OnigCaseFoldType flag,
-		       const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-euckr_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-#define euckr_islead(c)    ((c) < 0xa1 || (c) == 0xff)
-
-static UChar*
-euckr_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  /* Assumed in this encoding,
-     mb-trail bytes don't mix with single bytes.
-  */
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  while (!euckr_islead(*p) && p > start) p--;
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-euckr_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  if (c <= 0x7e) return TRUE;
-  else           return FALSE;
-}
-
-OnigEncodingDefine(euc_kr, EUC_KR) = {
-  euckr_mbc_enc_len,
-  "EUC-KR",   /* name */
-  2,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  euckr_mbc_to_code,
-  onigenc_mb2_code_to_mbclen,
-  euckr_code_to_mbc,
-  euckr_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  euckr_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  euckr_left_adjust_char_head,
-  euckr_is_allowed_reverse_match
-};
-ENC_ALIAS("eucKR", "EUC-KR")
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
deleted file mode 100644
index ca38983d53..0000000000
--- a/enc/euc_tw.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/**********************************************************************
-  euc_tw.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_EUCTW[] = {
-  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, 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, 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, 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, 4, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, 2, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  },
-  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* b */ 3, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-euctw_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_EUCTW[firstbyte]-1);
-  s = trans[s][*p++];
-  if (s < 0) RETURN(2);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
-  s = trans[s][*p++];
-  if (s < 0) RETURN(3);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
-  s = trans[s][*p++];
-  RETURN(4);
-#undef RETURN
-}
-
-static OnigCodePoint
-euctw_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-euctw_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  return onigenc_mb4_code_to_mbc(enc, code, buf);
-}
-
-static int
-euctw_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                    UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-euctw_is_mbc_ambiguous(OnigCaseFoldType flag,
-		       const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-euctw_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb4_is_code_ctype(enc, code, ctype);
-}
-
-#define euctw_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
-
-static UChar*
-euctw_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  /* Assumed in this encoding,
-     mb-trail bytes don't mix with single bytes.
-  */
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  while (!euctw_islead(*p) && p > start) p--;
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-euctw_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  if (c <= 0x7e) return TRUE;
-  else           return FALSE;
-}
-
-OnigEncodingDefine(euc_tw, EUC_TW) = {
-  euctw_mbc_enc_len,
-  "EUC-TW",   /* name */
-  4,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  euctw_mbc_to_code,
-  onigenc_mb4_code_to_mbclen,
-  euctw_code_to_mbc,
-  euctw_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  euctw_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  euctw_left_adjust_char_head,
-  euctw_is_allowed_reverse_match
-};
-ENC_ALIAS("eucTW", "EUC-TW")
diff --git a/enc/gb18030.c b/enc/gb18030.c
deleted file mode 100644
index 804f3cdc00..0000000000
--- a/enc/gb18030.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/**********************************************************************
-  gb18030.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2005-2007  KUBO Takehiro <kubo AT jiubao DOT org>
- *                          K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#if 1
-#define DEBUG_GB18030(arg)
-#else
-#define DEBUG_GB18030(arg) printf arg
-#endif
-
-enum {
-  C1, /* one-byte char */
-  C2, /* one-byte or second of two-byte char */
-  C4, /* one-byte or second or fourth of four-byte char */
-  CM  /* first of two- or four-byte char or second of two-byte char */
-};
-
-static const char GB18030_MAP[] = {
-  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
-  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
-  C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1, C1,
-  C4, C4, C4, C4, C4, C4, C4, C4, C4, C4, C1, C1, C1, C1, C1, C1,
-  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
-  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
-  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2,
-  C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C2, C1,
-  C2, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM,
-  CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, CM, C1
-};
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1, S2, S3 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, F, F, F, F, F, F,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
-    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  },
-  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* c */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* d */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* e */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* f */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, F 
-  },
-  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-gb18030_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2-1);
-  s = trans[s][*p++];
-  if (s < 0) RETURN(2);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-2);
-  s = trans[s][*p++];
-  if (s < 0) RETURN(3);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-3);
-  s = trans[s][*p++];
-  RETURN(4);
-#undef RETURN
-}
-
-static OnigCodePoint
-gb18030_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, i, len;
-  OnigCodePoint n;
-
-  len = enclen(enc, p, end);
-  n = (OnigCodePoint )(*p++);
-  if (len == 1) return n;
-
-  for (i = 1; i < len; i++) {
-    if (p >= end) break;
-    c = *p++;
-    n <<= 8;  n += c;
-  }
-  n &= 0x7FFFFFFF;
-  return n;
-}
-
-static int
-gb18030_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  if ((code & 0xff000000) != 0) {
-	code |= 0x80000000;
-  }
-  return onigenc_mb4_code_to_mbc(enc, code, buf);
-}
-
-static int
-gb18030_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                      UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-gb18030_is_mbc_ambiguous(OnigCaseFoldType flag,
-			 const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-gb18030_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb4_is_code_ctype(enc, code, ctype);
-}
-
-enum state {
-  S_START,
-  S_one_C2,
-  S_one_C4,
-  S_one_CM,
-
-  S_odd_CM_one_CX,
-  S_even_CM_one_CX,
-
-  /* CMC4 : pair of "CM C4" */
-  S_one_CMC4,
-  S_odd_CMC4,
-  S_one_C4_odd_CMC4,
-  S_even_CMC4,
-  S_one_C4_even_CMC4,
-
-  S_odd_CM_odd_CMC4,
-  S_even_CM_odd_CMC4,
-
-  S_odd_CM_even_CMC4,
-  S_even_CM_even_CMC4,
-
-  /* C4CM : pair of "C4 CM" */
-  S_odd_C4CM,
-  S_one_CM_odd_C4CM,
-  S_even_C4CM,
-  S_one_CM_even_C4CM,
-
-  S_even_CM_odd_C4CM,
-  S_odd_CM_odd_C4CM,
-  S_even_CM_even_C4CM,
-  S_odd_CM_even_C4CM
-};
-
-static UChar*
-gb18030_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  const UChar *p;
-  enum state state = S_START;
-
-  DEBUG_GB18030(("----------------\n"));
-  for (p = s; p >= start; p--) {
-    DEBUG_GB18030(("state %d --(%02x)-->\n", state, *p));
-    switch (state) {
-    case S_START:
-      switch (GB18030_MAP[*p]) {
-      case C1:
-	return (UChar *)s;
-      case C2:
-	state = S_one_C2; /* C2 */
-	break;
-      case C4:
-	state = S_one_C4; /* C4 */
-	break;
-      case CM:
-	state = S_one_CM; /* CM */
-	break;
-      }
-      break;
-    case S_one_C2: /* C2 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)s;
-      case CM:
-	state = S_odd_CM_one_CX; /* CM C2 */
-	break;
-      }
-      break;
-    case S_one_C4: /* C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)s;
-      case CM:
-	state = S_one_CMC4;
-	break;
-      }
-      break;
-    case S_one_CM: /* CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)s;
-      case C4:
-	state = S_odd_C4CM;
-	break;
-      case CM:
-	state = S_odd_CM_one_CX; /* CM CM */
-	break;
-      }
-      break;
-
-    case S_odd_CM_one_CX: /* CM C2 */ /* CM CM */ /* CM CM CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 1);
-      case CM:
-	state = S_even_CM_one_CX;
-	break;
-      }
-      break;
-    case S_even_CM_one_CX: /* CM CM C2 */ /* CM CM CM */ /* CM CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)s;
-      case CM:
-	state = S_odd_CM_one_CX;
-	break;
-      }
-      break;
-
-    case S_one_CMC4: /* CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)(s - 1);
-      case C4:
-	state = S_one_C4_odd_CMC4; /* C4 CM C4 */
-	break;
-      case CM:
-	state = S_even_CM_one_CX; /* CM CM C4 */
-	break;
-      }
-      break;
-    case S_odd_CMC4: /* CM C4 CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)(s - 1);
-      case C4:
-	state = S_one_C4_odd_CMC4;
-	break;
-      case CM:
-	state = S_odd_CM_odd_CMC4;
-	break;
-      }
-      break;
-    case S_one_C4_odd_CMC4: /* C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 1);
-      case CM:
-	state = S_even_CMC4; /* CM C4 CM C4 */
-	break;
-      }
-      break;
-    case S_even_CMC4: /* CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)(s - 3);
-      case C4:
-	state = S_one_C4_even_CMC4;
-	break;
-      case CM:
-	state = S_odd_CM_even_CMC4;
-	break;
-      }
-      break;
-    case S_one_C4_even_CMC4: /* C4 CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 3);
-      case CM:
-	state = S_odd_CMC4;
-	break;
-      }
-      break;
-
-    case S_odd_CM_odd_CMC4: /* CM CM C4 CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 3);
-      case CM:
-	state = S_even_CM_odd_CMC4;
-	break;
-      }
-      break;
-    case S_even_CM_odd_CMC4: /* CM CM CM C4 CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 1);
-      case CM:
-	state = S_odd_CM_odd_CMC4;
-	break;
-      }
-      break;
-
-    case S_odd_CM_even_CMC4: /* CM CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 1);
-      case CM:
-	state = S_even_CM_even_CMC4;
-	break;
-      }
-      break;
-    case S_even_CM_even_CMC4: /* CM CM CM C4 CM C4 */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 3);
-      case CM:
-	state = S_odd_CM_even_CMC4;
-	break;
-      }
-      break;
-
-    case S_odd_C4CM: /* C4 CM */  /* C4 CM C4 CM C4 CM*/
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)s;
-      case CM:
-	state = S_one_CM_odd_C4CM; /* CM C4 CM */
-	break;
-      }
-      break;
-    case S_one_CM_odd_C4CM: /* CM C4 CM */ /* CM C4 CM C4 CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)(s - 2); /* |CM C4 CM */
-      case C4:
-	state = S_even_C4CM;
-	break;
-      case CM:
-	state = S_even_CM_odd_C4CM;
-	break;
-      }
-      break;
-    case S_even_C4CM: /* C4 CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 2);  /* C4|CM C4 CM */
-      case CM:
-	state = S_one_CM_even_C4CM;
-	break;
-      }
-      break;
-    case S_one_CM_even_C4CM: /* CM C4 CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-	return (UChar *)(s - 0);  /*|CM C4 CM C4|CM */
-      case C4:
-	state = S_odd_C4CM;
-	break;
-      case CM:
-	state = S_even_CM_even_C4CM;
-	break;
-      }
-      break;
-
-    case S_even_CM_odd_C4CM: /* CM CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 0); /* |CM CM|C4|CM */
-      case CM:
-	state = S_odd_CM_odd_C4CM;
-	break;
-      }
-      break;
-    case S_odd_CM_odd_C4CM: /* CM CM CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 2); /* |CM CM|CM C4 CM */
-      case CM:
-	state = S_even_CM_odd_C4CM;
-	break;
-      }
-      break;
-
-    case S_even_CM_even_C4CM: /* CM CM C4 CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 2); /* |CM CM|C4|CM C4 CM */
-      case CM:
-	state = S_odd_CM_even_C4CM;
-	break;
-      }
-      break;
-    case S_odd_CM_even_C4CM: /* CM CM CM C4 CM C4 CM */
-      switch (GB18030_MAP[*p]) {
-      case C1:
-      case C2:
-      case C4:
-	return (UChar *)(s - 0);  /* |CM CM|CM C4 CM C4|CM */
-      case CM:
-	state = S_even_CM_even_C4CM;
-	break;
-      }
-      break;
-    }
-  }
-
-  DEBUG_GB18030(("state %d\n", state));
-  switch (state) {
-  case S_START:             return (UChar *)(s - 0);
-  case S_one_C2:            return (UChar *)(s - 0);
-  case S_one_C4:            return (UChar *)(s - 0);
-  case S_one_CM:            return (UChar *)(s - 0);
-
-  case S_odd_CM_one_CX:     return (UChar *)(s - 1);
-  case S_even_CM_one_CX:    return (UChar *)(s - 0);
-
-  case S_one_CMC4:          return (UChar *)(s - 1);
-  case S_odd_CMC4:          return (UChar *)(s - 1);
-  case S_one_C4_odd_CMC4:   return (UChar *)(s - 1);
-  case S_even_CMC4:         return (UChar *)(s - 3);
-  case S_one_C4_even_CMC4:  return (UChar *)(s - 3);
-
-  case S_odd_CM_odd_CMC4:   return (UChar *)(s - 3);
-  case S_even_CM_odd_CMC4:  return (UChar *)(s - 1);
-
-  case S_odd_CM_even_CMC4:  return (UChar *)(s - 1);
-  case S_even_CM_even_CMC4: return (UChar *)(s - 3);
-
-  case S_odd_C4CM:          return (UChar *)(s - 0);
-  case S_one_CM_odd_C4CM:   return (UChar *)(s - 2);
-  case S_even_C4CM:         return (UChar *)(s - 2);
-  case S_one_CM_even_C4CM:  return (UChar *)(s - 0);
-
-  case S_even_CM_odd_C4CM:  return (UChar *)(s - 0);
-  case S_odd_CM_odd_C4CM:   return (UChar *)(s - 2);
-  case S_even_CM_even_C4CM: return (UChar *)(s - 2);
-  case S_odd_CM_even_C4CM:  return (UChar *)(s - 0);
-  }
-
-  return (UChar* )s;  /* never come here. (escape warning) */
-}
-
-static int
-gb18030_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  return GB18030_MAP[*s] == C1 ? TRUE : FALSE;
-}
-
-OnigEncodingDefine(gb18030, GB18030) = {
-  gb18030_mbc_enc_len,
-  "GB18030",   /* name */
-  4,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  gb18030_mbc_to_code,
-  onigenc_mb4_code_to_mbclen,
-  gb18030_code_to_mbc,
-  gb18030_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  gb18030_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  gb18030_left_adjust_char_head,
-  gb18030_is_allowed_reverse_match
-};
-
diff --git a/enc/gb2312.c b/enc/gb2312.c
deleted file mode 100644
index 6fc15735fc..0000000000
--- a/enc/gb2312.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/encoding.h>
-#include "regenc.h"
-
-void
-Init_gb2312(void)
-{
-    rb_enc_register("GB2312", rb_enc_find("EUC-KR"));
-}
-
-ENC_ALIAS("EUC-CN", "GB2312")
-ENC_ALIAS("eucCN", "GB2312")
-ENC_REPLICATE("GB12345", "GB2312")
diff --git a/enc/gbk.c b/enc/gbk.c
deleted file mode 100644
index 8b45ed4dc9..0000000000
--- a/enc/gbk.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/**********************************************************************
-  gbk.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static const int EncLen_GBK[] = {
-  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, 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, 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, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 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
-};
-
-static const char GBK_CAN_BE_TRAIL_TABLE[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-};
-
-#define GBK_ISMB_FIRST(byte)  (EncLen_GBK[byte] > 1)
-#define GBK_ISMB_TRAIL(byte)  GBK_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ A, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
-    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F 
-  }
-};
-#undef A
-#undef F
-
-static int
-gbk_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s = trans[0][firstbyte];
-#define RETURN(n) \
-    return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n) : \
-                         ONIGENC_CONSTRUCT_MBCLEN_INVALID()
-  if (s < 0) RETURN(1);
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_GBK[firstbyte]-1);
-  s = trans[s][*p++];
-  RETURN(2);
-#undef RETURN
-}
-
-static OnigCodePoint
-gbk_mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_to_code(enc, p, end);
-}
-
-static int
-gbk_code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  return onigenc_mb2_code_to_mbc(enc, code, buf);
-}
-
-static int
-gbk_mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end,
-                    UChar* lower, OnigEncoding enc)
-{
-  return onigenc_mbn_mbc_case_fold(enc, flag,
-                                   pp, end, lower);
-}
-
-#if 0
-static int
-gbk_is_mbc_ambiguous(OnigCaseFoldType flag,
-		       const UChar** pp, const UChar* end, OnigEncoding enc)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-}
-#endif
-
-static int
-gbk_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  return onigenc_mb2_is_code_ctype(enc, code, ctype);
-}
-
-static UChar*
-gbk_left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  if (GBK_ISMB_TRAIL(*p)) {
-    while (p > start) {
-      if (! GBK_ISMB_FIRST(*--p)) {
-	p++;
-	break;
-      }
-    } 
-  }
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-gbk_is_allowed_reverse_match(const UChar* s, const UChar* end ARG_UNUSED, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  return (GBK_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-OnigEncodingDefine(gbk, GBK) = {
-  gbk_mbc_enc_len,
-  "GBK",      /* name */
-  2,          /* max enc length */
-  1,          /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  gbk_mbc_to_code,
-  onigenc_mb2_code_to_mbclen,
-  gbk_code_to_mbc,
-  gbk_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  gbk_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  gbk_left_adjust_char_head,
-  gbk_is_allowed_reverse_match
-};
-/*
- * Name: GBK
- * MIBenum: 113
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.iana.org/assignments/charset-reg/GBK
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/936.mspx
- */
-ENC_ALIAS("CP936", "GBK")
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
deleted file mode 100644
index 8155bdcd54..0000000000
--- a/enc/iso_2022_jp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-ENC_DUMMY("ISO-2022-JP");
-ENC_ALIAS("ISO2022-JP", "ISO-2022-JP");
-ENC_REPLICATE("ISO-2022-JP-2", "ISO-2022-JP");
-ENC_ALIAS("ISO2022-JP2", "ISO-2022-JP-2");
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
deleted file mode 100644
index b73f8ca379..0000000000
--- a/enc/iso_8859_1.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/**********************************************************************
-  iso8859_1.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
-  ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_1_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
-  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0xc0, 0xe0 },
-  { 0xc1, 0xe1 },
-  { 0xc2, 0xe2 },
-  { 0xc3, 0xe3 },
-  { 0xc4, 0xe4 },
-  { 0xc5, 0xe5 },
-  { 0xc6, 0xe6 },
-  { 0xc7, 0xe7 },
-  { 0xc8, 0xe8 },
-  { 0xc9, 0xe9 },
-  { 0xca, 0xea },
-  { 0xcb, 0xeb },
-  { 0xcc, 0xec },
-  { 0xcd, 0xed },
-  { 0xce, 0xee },
-  { 0xcf, 0xef },
-
-  { 0xd0, 0xf0 },
-  { 0xd1, 0xf1 },
-  { 0xd2, 0xf2 },
-  { 0xd3, 0xf3 },
-  { 0xd4, 0xf4 },
-  { 0xd5, 0xf5 },
-  { 0xd6, 0xf6 },
-  { 0xd8, 0xf8 },
-  { 0xd9, 0xf9 },
-  { 0xda, 0xfa },
-  { 0xdb, 0xfb },
-  { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
-  { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-            flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  if (0x41 <= *p && *p <= 0x5a) {
-    items[0].byte_len = 1;
-    items[0].code_len = 1;
-    items[0].code[0] = (OnigCodePoint )(*p + 0x20);
-    if (*p == 0x53 && end > p + 1
-	&& (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */
-      items[1].byte_len = 2;
-      items[1].code_len = 1;
-      items[1].code[0] = (OnigCodePoint )0xdf;
-      return 2;
-    }
-    else
-      return 1;
-  }
-  else if (0x61 <= *p && *p <= 0x7a) {
-    items[0].byte_len = 1;
-    items[0].code_len = 1;
-    items[0].code[0] = (OnigCodePoint )(*p - 0x20);
-    if (*p == 0x73 && end > p + 1
-	&& (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */
-      items[1].byte_len = 2;
-      items[1].code_len = 1;
-      items[1].code[0] = (OnigCodePoint )0xdf;
-      return 2;
-    }
-    else
-      return 1;
-  }
-  else if (0xc0 <= *p && *p <= 0xcf) {
-    items[0].byte_len = 1;
-    items[0].code_len = 1;
-    items[0].code[0] = (OnigCodePoint )(*p + 0x20);
-    return 1;
-  }
-  else if (0xd0 <= *p && *p <= 0xdf) {
-    if (*p == 0xdf) {
-      items[0].byte_len = 1;
-      items[0].code_len = 2;
-      items[0].code[0] = (OnigCodePoint )'s';
-      items[0].code[1] = (OnigCodePoint )'s';
-
-      items[1].byte_len = 1;
-      items[1].code_len = 2;
-      items[1].code[0] = (OnigCodePoint )'S';
-      items[1].code[1] = (OnigCodePoint )'S';
-
-      items[2].byte_len = 1;
-      items[2].code_len = 2;
-      items[2].code[0] = (OnigCodePoint )'s';
-      items[2].code[1] = (OnigCodePoint )'S';
-
-      items[3].byte_len = 1;
-      items[3].code_len = 2;
-      items[3].code[0] = (OnigCodePoint )'S';
-      items[3].code[1] = (OnigCodePoint )'s';
-
-      return 4;
-    }
-    else if (*p != 0xd7) {
-      items[0].byte_len = 1;
-      items[0].code_len = 1;
-      items[0].code[0] = (OnigCodePoint )(*p + 0x20);
-      return 1;
-    }
-  }
-  else if (0xe0 <= *p && *p <= 0xef) {
-    items[0].byte_len = 1;
-    items[0].code_len = 1;
-    items[0].code[0] = (OnigCodePoint )(*p - 0x20);
-    return 1;
-  }
-  else if (0xf0 <= *p && *p <= 0xfe) {
-    if (*p != 0xf7) {
-      items[0].byte_len = 1;
-      items[0].code_len = 1;
-      items[0].code[0] = (OnigCodePoint )(*p - 0x20);
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end ARG_UNUSED,
-	      UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ONIGENC_ISO_8859_1_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_1_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    /* 0xdf, 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-    if (*p >= 0xaa && *p <= 0xba)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_1_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-1",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-1", "ISO-8859-1")
-
-/*
- * Name: windows-1252
- * MIBenum: 2252
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1252.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1252
- */
-ENC_REPLICATE("Windows-1252", "ISO-8859-1")
-ENC_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
deleted file mode 100644
index 1643278dfd..0000000000
--- a/enc/iso_8859_10.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/**********************************************************************
-  iso8859_10.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_10_TO_LOWER_CASE(c) EncISO_8859_10_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_10_CTYPE(code,ctype) \
-  ((EncISO_8859_10_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_10_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\261', '\262', '\263', '\264', '\265', '\266', '\247',
-  '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_10_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
-  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-			  const UChar** pp, const UChar* end ARG_UNUSED,
-			  UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_10_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_10_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_10_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa2, 0xb2 },
- { 0xa3, 0xb3 },
- { 0xa4, 0xb4 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa8, 0xb8 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-			       OnigApplyAllCaseFoldFunc f, void* arg,
-			       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-10", /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-10", "ISO-8859-10")
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
deleted file mode 100644
index 257d9d8919..0000000000
--- a/enc/iso_8859_11.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/**********************************************************************
-  iso8859_11.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_11_CTYPE(code,ctype) \
-  ((EncISO_8859_11_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_11_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_11_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-11",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  onigenc_ascii_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-11", "ISO-8859-11")
-
-/*
- * Name: TIS-620
- * MIBenum: 2259
- * Link: http://en.wikipedia.org/wiki/Thai_Industrial_Standard_620-2533
- */
-ENC_REPLICATE("TIS-620", "ISO-8859-11")
-
-/*
- * Name: Windows-874
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/874.mspx
- */
-ENC_REPLICATE("Windows-874", "ISO-8859-11")
-ENC_ALIAS("CP874", "Windows-874")
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
deleted file mode 100644
index f29cb2e281..0000000000
--- a/enc/iso_8859_13.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/**********************************************************************
-  iso8859_13.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_13_TO_LOWER_CASE(c) EncISO_8859_13_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_13_CTYPE(code,ctype) \
-  ((EncISO_8859_13_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_13_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_13_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
-  0x34a2, 0x00a0, 0x34a2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x34a2,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x01a0, 0x30e2, 0x00a0, 0x01a0,
-  0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x01a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-			  const UChar** pp, const UChar* end ARG_UNUSED,
-			  UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_13_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_13_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    /* 0xdf, 0xb5 are lower case letter, but can't convert. */
-    if (*p == 0xb5)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_13_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-				OnigApplyAllCaseFoldFunc f, void* arg,
-				OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-13",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-13", "ISO-8859-13")
-
-/*
- * Name: windows-1257
- * MIBenum: 2257
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1257.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1257
- */
-ENC_REPLICATE("Windows-1257", "ISO-8859-13")
-ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
deleted file mode 100644
index be83f93f80..0000000000
--- a/enc/iso_8859_14.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/**********************************************************************
-  iso8859_14.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_14_TO_LOWER_CASE(c) EncISO_8859_14_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_14_CTYPE(code,ctype) \
-  ((EncISO_8859_14_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_14_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\242', '\242', '\243', '\245', '\245', '\253', '\247',
-  '\270', '\251', '\272', '\253', '\274', '\255', '\256', '\377',
-  '\261', '\261', '\263', '\263', '\265', '\265', '\266', '\271',
-  '\270', '\271', '\272', '\277', '\274', '\276', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_14_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x30e2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x00a0,
-  0x34a2, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x34a2,
-  0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x00a0, 0x34a2,
-  0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-			  const UChar** pp, const UChar* end ARG_UNUSED,
-			  UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_14_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_14_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_14_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xa2 },
- { 0xa4, 0xa5 },
- { 0xa6, 0xab },
- { 0xa8, 0xb8 },
- { 0xaa, 0xba },
- { 0xac, 0xbc },
- { 0xaf, 0xff },
-
- { 0xb0, 0xb1 },
- { 0xb2, 0xb3 },
- { 0xb4, 0xb5 },
- { 0xb7, 0xb9 },
- { 0xbb, 0xbf },
- { 0xbd, 0xbe },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-				OnigApplyAllCaseFoldFunc f, void* arg,
-				OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-14",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-14", "ISO-8859-14")
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
deleted file mode 100644
index 2ec41b66c0..0000000000
--- a/enc/iso_8859_15.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/**********************************************************************
-  iso8859_15.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_15_TO_LOWER_CASE(c) EncISO_8859_15_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_15_CTYPE(code,ctype) \
-  ((EncISO_8859_15_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_15_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\250', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\263', '\270', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_15_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0,
-  0x30e2, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x34a2, 0x30e2, 0x00a0, 0x01a0,
-  0x30e2, 0x10a0, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-			  const UChar** pp, const UChar* end ARG_UNUSED,
-			  UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_15_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_15_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    /* 0xdf etc.. are lower case letter, but can't convert. */
-    if (*p == 0xaa || *p == 0xb5 || *p == 0xba)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_15_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa6, 0xa8 },
-
- { 0xb4, 0xb8 },
- { 0xbc, 0xbd },
- { 0xbe, 0xff },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-				OnigApplyAllCaseFoldFunc f, void* arg,
-				OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-15",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-15", "ISO-8859-15")
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
deleted file mode 100644
index 3ddc1d91c6..0000000000
--- a/enc/iso_8859_16.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/**********************************************************************
-  iso8859_16.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_16_TO_LOWER_CASE(c) EncISO_8859_16_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_16_CTYPE(code,ctype) \
-  ((EncISO_8859_16_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_16_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\242', '\242', '\263', '\245', '\245', '\250', '\247',
-  '\250', '\251', '\272', '\253', '\256', '\255', '\256', '\277',
-  '\260', '\261', '\271', '\263', '\270', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\275', '\275', '\377', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_16_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x01a0, 0x34a2, 0x00a0,
-  0x30e2, 0x00a0, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x30e2, 0x34a2,
-  0x00a0, 0x00a0, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x00a0, 0x01a0,
-  0x30e2, 0x30e2, 0x30e2, 0x01a0, 0x34a2, 0x30e2, 0x34a2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-			  const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-			  OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_16_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_16_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_16_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xa2 },
- { 0xa3, 0xb3 },
- { 0xa6, 0xa8 },
- { 0xaa, 0xba },
- { 0xac, 0xae },
- { 0xaf, 0xbf },
-
- { 0xb2, 0xb9 },
- { 0xb4, 0xb8 },
- { 0xbc, 0xbd },
- { 0xbe, 0xff },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-				OnigApplyAllCaseFoldFunc f, void* arg,
-				OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				       const OnigUChar* p, const OnigUChar* end,
-				       OnigCaseFoldCodeItem items[],
-				       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-16",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-16", "ISO-8859-16")
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
deleted file mode 100644
index 9783f1cd02..0000000000
--- a/enc/iso_8859_2.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/**********************************************************************
-  iso8859_2.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_2_TO_LOWER_CASE(c) EncISO_8859_2_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_2_CTYPE(code,ctype) \
-  ((EncISO_8859_2_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_2_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
-  '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_2_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x00a0, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
-  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
-  0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
-  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_2_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_2_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa3, 0xb3 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-            flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_2_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-2",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-2", "ISO-8859-2")
-
-/*
- * Name: windows-1250
- * MIBenum: 2250
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1250.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1250
- */
-ENC_REPLICATE("Windows-1250", "ISO-8859-2")
-ENC_ALIAS("CP1250", "Windows-1250")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
deleted file mode 100644
index 81c0c742b6..0000000000
--- a/enc/iso_8859_3.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/**********************************************************************
-  iso8859_3.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_3_TO_LOWER_CASE(c) EncISO_8859_3_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_3_CTYPE(code,ctype) \
-  ((EncISO_8859_3_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_3_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\261', '\242', '\243', '\244', '\245', '\266', '\247',
-  '\250', '\271', '\272', '\273', '\274', '\255', '\256', '\277',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\340', '\341', '\342', '\303', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\320', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_3_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x0000, 0x34a2, 0x00a0,
-  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x0000, 0x34a2,
-  0x00a0, 0x30e2, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x30e2, 0x01a0,
-  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x11a0, 0x0000, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x0000, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_3_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_3_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-    if (*p == 0xb5)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_3_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xaf, 0xbf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-3",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-3", "ISO-8859-3")
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
deleted file mode 100644
index ec71c4bcbf..0000000000
--- a/enc/iso_8859_4.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/**********************************************************************
-  iso8859_4.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_4_TO_LOWER_CASE(c) EncISO_8859_4_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_4_CTYPE(code,ctype) \
-  ((EncISO_8859_4_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_4_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\261', '\242', '\263', '\244', '\265', '\266', '\247',
-  '\250', '\271', '\272', '\273', '\274', '\255', '\276', '\257',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\277', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_4_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x30e2, 0x34a2, 0x00a0, 0x34a2, 0x34a2, 0x00a0,
-  0x00a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x00a0,
-  0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x30e2, 0x30e2, 0x00a0,
-  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_4_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1; /* return byte length of converted char to lower */
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_4_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    if (*p == 0xa2)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_4_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xb1 },
- { 0xa3, 0xb3 },
- { 0xa5, 0xb5 },
- { 0xa6, 0xb6 },
- { 0xa9, 0xb9 },
- { 0xaa, 0xba },
- { 0xab, 0xbb },
- { 0xac, 0xbc },
- { 0xae, 0xbe },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb },
- { 0xdc, 0xfc },
- { 0xdd, 0xfd },
- { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-4",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-4", "ISO-8859-4")
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
deleted file mode 100644
index 1550763323..0000000000
--- a/enc/iso_8859_5.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/**********************************************************************
-  iso8859_5.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_5_TO_LOWER_CASE(c) EncISO_8859_5_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_5_CTYPE(code,ctype) \
-  ((EncISO_8859_5_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_5_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\255', '\376', '\377',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_5_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x00a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  *lower = ENC_ISO_8859_5_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  (*pp)++;
-  v = (EncISO_8859_5_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_5_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa1, 0xf1 },
- { 0xa2, 0xf2 },
- { 0xa3, 0xf3 },
- { 0xa4, 0xf4 },
- { 0xa5, 0xf5 },
- { 0xa6, 0xf6 },
- { 0xa7, 0xf7 },
- { 0xa8, 0xf8 },
- { 0xa9, 0xf9 },
- { 0xaa, 0xfa },
- { 0xab, 0xfb },
- { 0xac, 0xfc },
- { 0xae, 0xfe },
- { 0xaf, 0xff },
-
- { 0xb0, 0xd0 },
- { 0xb1, 0xd1 },
- { 0xb2, 0xd2 },
- { 0xb3, 0xd3 },
- { 0xb4, 0xd4 },
- { 0xb5, 0xd5 },
- { 0xb6, 0xd6 },
- { 0xb7, 0xd7 },
- { 0xb8, 0xd8 },
- { 0xb9, 0xd9 },
- { 0xba, 0xda },
- { 0xbb, 0xdb },
- { 0xbc, 0xdc },
- { 0xbd, 0xdd },
- { 0xbe, 0xde },
- { 0xbf, 0xdf },
-
- { 0xc0, 0xe0 },
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-5",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-5", "ISO-8859-5")
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
deleted file mode 100644
index 7384061a1f..0000000000
--- a/enc/iso_8859_6.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/**********************************************************************
-  iso8859_6.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_6_CTYPE(code,ctype) \
-  ((EncISO_8859_6_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_6_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x0000, 0x0000, 0x0000, 0x00a0, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x01a0, 0x01a0, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x01a0, 0x0000, 0x0000, 0x0000, 0x01a0,
-  0x0000, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_6_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-6",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  onigenc_ascii_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-6", "ISO-8859-6")
-
-/*
- * Name: windows-1256
- * MIBenum: 2256
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1256.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1256
- */
-ENC_REPLICATE("Windows-1256", "ISO-8859-6")
-ENC_ALIAS("CP1256", "Windows-1256")
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
deleted file mode 100644
index 2f916171db..0000000000
--- a/enc/iso_8859_7.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/**********************************************************************
-  iso8859_7.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_7_TO_LOWER_CASE(c) EncISO_8859_7_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_7_CTYPE(code,ctype) \
-  ((EncISO_8859_7_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_7_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\334', '\267',
-  '\335', '\336', '\337', '\273', '\374', '\275', '\375', '\376',
-  '\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\322', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\334', '\335', '\336', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_7_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x01a0, 0x00a0, 0x0000, 0x0000, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x0000, 0x01a0, 0x00a0, 0x01a0, 0x0000, 0x01a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x00a0, 0x34a2, 0x01a0,
-  0x34a2, 0x34a2, 0x34a2, 0x01a0, 0x34a2, 0x10a0, 0x34a2, 0x34a2,
-  0x30e2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x0000, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x0000
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  *lower = ENC_ISO_8859_7_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  (*pp)++;
-  v = (EncISO_8859_7_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    if (*p == 0xc0 || *p == 0xe0)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_7_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xb6, 0xdc },
- { 0xb8, 0xdd },
- { 0xb9, 0xde },
- { 0xba, 0xdf },
- { 0xbc, 0xfc },
- { 0xbe, 0xfd },
- { 0xbf, 0xfe },
-
- { 0xc1, 0xe1 },
- { 0xc2, 0xe2 },
- { 0xc3, 0xe3 },
- { 0xc4, 0xe4 },
- { 0xc5, 0xe5 },
- { 0xc6, 0xe6 },
- { 0xc7, 0xe7 },
- { 0xc8, 0xe8 },
- { 0xc9, 0xe9 },
- { 0xca, 0xea },
- { 0xcb, 0xeb },
- { 0xcc, 0xec },
- { 0xcd, 0xed },
- { 0xce, 0xee },
- { 0xcf, 0xef },
-
- { 0xd0, 0xf0 },
- { 0xd1, 0xf1 },
- { 0xd2, 0xf2 },
- { 0xd3, 0xf3 },
- { 0xd4, 0xf4 },
- { 0xd5, 0xf5 },
- { 0xd6, 0xf6 },
- { 0xd7, 0xf7 },
- { 0xd8, 0xf8 },
- { 0xd9, 0xf9 },
- { 0xda, 0xfa },
- { 0xdb, 0xfb }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-		    OnigApplyAllCaseFoldFunc f, void* arg,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-
-OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-7",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-7", "ISO-8859-7")
-
-/*
- * Name: windows-1253
- * MIBenum: 2253
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1253.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1253
- */
-ENC_REPLICATE("Windows-1253", "ISO-8859-7")
-ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/iso_8859_8.c b/enc/iso_8859_8.c
deleted file mode 100644
index bd0754c2b1..0000000000
--- a/enc/iso_8859_8.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/**********************************************************************
-  iso8859_8.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_IS_ISO_8859_8_CTYPE(code,ctype) \
-  ((EncISO_8859_8_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const unsigned short EncISO_8859_8_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x0000, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
-  0x00a0, 0x10a0, 0x00a0, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x01a0,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2, 0x30a2,
-  0x30a2, 0x30a2, 0x30a2, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-};
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_8_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-8",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  onigenc_ascii_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-8", "ISO-8859-8")
-
-/*
- * Name: windows-1255
- * MIBenum: 2255
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1255.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1255
- */
-ENC_REPLICATE("Windows-1255", "ISO-8859-8")
-ENC_ALIAS("CP1255", "Windows-1255")
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
deleted file mode 100644
index 4d46e742e2..0000000000
--- a/enc/iso_8859_9.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/**********************************************************************
-  iso8859_9.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_ISO_8859_9_TO_LOWER_CASE(c) EncISO_8859_9_ToLowerCaseTable[c]
-#define ENC_IS_ISO_8859_9_CTYPE(code,ctype) \
-  ((EncISO_8859_9_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncISO_8859_9_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\327',
-  '\370', '\371', '\372', '\373', '\374', '\335', '\376', '\337',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncISO_8859_9_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
-  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower,
-	      OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_ISO_8859_9_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  int v;
-  const UChar* p = *pp;
-
-  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncISO_8859_9_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  if ((v | BIT_CTYPE_LOWER) != 0) {
-    /* 0xdf etc..  are lower case letter, but can't convert. */
-    if (*p >= 0xaa && *p <= 0xba)
-      return FALSE;
-    else
-      return TRUE;
-  }
-
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_ISO_8859_9_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0xc0, 0xe0 },
-  { 0xc1, 0xe1 },
-  { 0xc2, 0xe2 },
-  { 0xc3, 0xe3 },
-  { 0xc4, 0xe4 },
-  { 0xc5, 0xe5 },
-  { 0xc6, 0xe6 },
-  { 0xc7, 0xe7 },
-  { 0xc8, 0xe8 },
-  { 0xc9, 0xe9 },
-  { 0xca, 0xea },
-  { 0xcb, 0xeb },
-  { 0xcc, 0xec },
-  { 0xcd, 0xed },
-  { 0xce, 0xee },
-  { 0xcf, 0xef },
-
-  { 0xd0, 0xf0 },
-  { 0xd1, 0xf1 },
-  { 0xd2, 0xf2 },
-  { 0xd3, 0xf3 },
-  { 0xd4, 0xf4 },
-  { 0xd5, 0xf5 },
-  { 0xd6, 0xf6 },
-  { 0xd8, 0xf8 },
-  { 0xd9, 0xf9 },
-  { 0xda, 0xfa },
-  { 0xdb, 0xfb },
-  { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
-  { 0xde, 0xfe }
-};
-
-static int
-apply_all_case_fold(OnigCaseFoldType flag,
-			       OnigApplyAllCaseFoldFunc f, void* arg,
-			       OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-             flag, f, arg);
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				      const OnigUChar* p, const OnigUChar* end,
-				      OnigCaseFoldCodeItem items[],
-				      OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
-  onigenc_single_byte_mbc_enc_len,
-  "ISO-8859-9",  /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  mbc_case_fold,
-  apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ISO8859-9", "ISO-8859-9")
-
-/*
- * Name: windows-1254
- * MIBenum: 2254
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1254.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1254
- */
-ENC_REPLICATE("Windows-1254", "ISO-8859-9")
-ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
deleted file mode 100644
index fb6e10eadc..0000000000
--- a/enc/koi8_r.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/**********************************************************************
-  koi8_r.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_KOI8_R_TO_LOWER_CASE(c) EncKOI8_R_ToLowerCaseTable[c]
-#define ENC_IS_KOI8_R_CTYPE(code,ctype) \
-  ((EncKOI8_R_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncKOI8_R_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\243', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
-};
-
-static const unsigned short EncKOI8_R_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
-};
-
-static int
-koi8_r_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
-		     const UChar** pp, const UChar* end ARG_UNUSED,
-		     UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  *lower = ENC_KOI8_R_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-koi8_r_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
-			const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  int v;
-  const UChar* p = *pp;
-
-  (*pp)++;
-  v = (EncKOI8_R_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-koi8_r_is_code_ctype(OnigCodePoint code, unsigned int ctype,
-		     OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_KOI8_R_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0xa3, 0xb3 },
-
-  { 0xc0, 0xe0 },
-  { 0xc1, 0xe1 },
-  { 0xc2, 0xe2 },
-  { 0xc3, 0xe3 },
-  { 0xc4, 0xe4 },
-  { 0xc5, 0xe5 },
-  { 0xc6, 0xe6 },
-  { 0xc7, 0xe7 },
-  { 0xc8, 0xe8 },
-  { 0xc9, 0xe9 },
-  { 0xca, 0xea },
-  { 0xcb, 0xeb },
-  { 0xcc, 0xec },
-  { 0xcd, 0xed },
-  { 0xce, 0xee },
-  { 0xcf, 0xef },
-
-  { 0xd0, 0xf0 },
-  { 0xd1, 0xf1 },
-  { 0xd2, 0xf2 },
-  { 0xd3, 0xf3 },
-  { 0xd4, 0xf4 },
-  { 0xd5, 0xf5 },
-  { 0xd6, 0xf6 },
-  { 0xd7, 0xf7 },
-  { 0xd8, 0xf8 },
-  { 0xd9, 0xf9 },
-  { 0xda, 0xfa },
-  { 0xdb, 0xfb },
-  { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
-  { 0xde, 0xfe },
-  { 0xdf, 0xff }
-};
-
-static int
-koi8_r_apply_all_case_fold(OnigCaseFoldType flag,
-			   OnigApplyAllCaseFoldFunc f,
-			   void* arg, OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-             flag, f, arg);
-}
-
-static int
-koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-		  const OnigUChar* p, const OnigUChar* end,
-		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(koi8_r, KOI8_R) = {
-  onigenc_single_byte_mbc_enc_len,
-  "KOI8-R",       /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  koi8_r_mbc_case_fold,
-  koi8_r_apply_all_case_fold,
-  koi8_r_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  koi8_r_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("CP878", "KOI8-R")
-
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
deleted file mode 100644
index 9bd363df12..0000000000
--- a/enc/koi8_u.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/**********************************************************************
-  koi8_u.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_KOI8_U_TO_LOWER_CASE(c) EncKOI8_U_ToLowerCaseTable[c]
-#define ENC_IS_KOI8_U_CTYPE(code,ctype) \
-  ((EncKOI8_U_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncKOI8_U_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\243', '\244', '\265', '\246', '\247',
-  '\270', '\271', '\272', '\273', '\274', '\255', '\276', '\277',
-  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-  '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-  '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-  '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-  '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337'
-};
-
-static const unsigned short EncKOI8_U_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x0284, 0x00a0, 0x00a0, 0x10a0, 0x01a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x30e2, 0x00a0, 0x30e2, 0x30e2,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x30e2, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x34a2, 0x00a0, 0x34a2, 0x34a2,
-  0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x34a2, 0x00a0, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2
-};
-
-static int
-koi8_u_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
-		     const UChar** pp, const UChar* end ARG_UNUSED,
-		     UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  *lower = ENC_KOI8_U_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-#if 0
-static int
-koi8_u_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
-			const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  int v;
-  const UChar* p = *pp;
-
-  (*pp)++;
-  v = (EncKOI8_U_CtypeTable[*p] & (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-  return (v != 0 ? TRUE : FALSE);
-}
-#endif
-
-static int
-koi8_u_is_code_ctype(OnigCodePoint code, unsigned int ctype,
-		     OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_KOI8_U_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0xa3, 0xb3 },
-  { 0xa4, 0xb4 },
-  { 0xa6, 0xb6 },
-  { 0xa7, 0xb7 },
-  { 0xad, 0xbd },
-
-  { 0xc0, 0xe0 },
-  { 0xc1, 0xe1 },
-  { 0xc2, 0xe2 },
-  { 0xc3, 0xe3 },
-  { 0xc4, 0xe4 },
-  { 0xc5, 0xe5 },
-  { 0xc6, 0xe6 },
-  { 0xc7, 0xe7 },
-  { 0xc8, 0xe8 },
-  { 0xc9, 0xe9 },
-  { 0xca, 0xea },
-  { 0xcb, 0xeb },
-  { 0xcc, 0xec },
-  { 0xcd, 0xed },
-  { 0xce, 0xee },
-  { 0xcf, 0xef },
-
-  { 0xd0, 0xf0 },
-  { 0xd1, 0xf1 },
-  { 0xd2, 0xf2 },
-  { 0xd3, 0xf3 },
-  { 0xd4, 0xf4 },
-  { 0xd5, 0xf5 },
-  { 0xd6, 0xf6 },
-  { 0xd7, 0xf7 },
-  { 0xd8, 0xf8 },
-  { 0xd9, 0xf9 },
-  { 0xda, 0xfa },
-  { 0xdb, 0xfb },
-  { 0xdc, 0xfc },
-  { 0xdd, 0xfd },
-  { 0xde, 0xfe },
-  { 0xdf, 0xff }
-};
-
-static int
-koi8_u_apply_all_case_fold(OnigCaseFoldType flag,
-			   OnigApplyAllCaseFoldFunc f,
-			   void* arg, OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-             flag, f, arg);
-}
-
-static int
-koi8_u_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-		  const OnigUChar* p, const OnigUChar* end,
-		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(koi8_u, KOI8_U) = {
-  onigenc_single_byte_mbc_enc_len,
-  "KOI8-U",       /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  koi8_u_mbc_case_fold,
-  koi8_u_apply_all_case_fold,
-  koi8_u_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  koi8_u_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
diff --git a/enc/make_encdb.rb b/enc/make_encdb.rb
deleted file mode 100755
index 8b5731f548..0000000000
--- a/enc/make_encdb.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# OnigEncodingDefine(foo, Foo) = {
-#   ..
-#   "Shift_JIS", /* Canonical Name */
-#   ..
-# };
-# ENC_ALIAS("SJIS", "Shift_JIS")
-# ENC_REPLICATE("Windows-31J", "Shift_JIS")
-# ENC_ALIAS("CP932", "Windows-31J")
-#
-
-def check_duplication(defs, name, fn, line)
-  if defs[name]
-    raise ArgumentError, "%s:%d: encoding %s is already registered(%s:%d)" %
-      [fn, line, name, *defs[name]]
-  else
-    defs[name.upcase] = [fn,line]
-  end
-end
-
-count = 0
-lines = []
-encodings = []
-defs = {}
-encdir = ARGV[0]
-outhdr = ARGV[1] || 'encdb.h'
-Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
-  e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
-}.each do |fn|
-  open(File.join(encdir,fn)) do |f|
-    orig = nil
-    name = nil
-    f.each_line do |line|
-      if (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line)
-        if $1
-          check_duplication(defs, $1, fn, $.)
-          encodings << $1
-          count += 1
-        end
-      else
-        case line
-        when /^\s*rb_enc_register\(\s*"([^"]+)"/
-          count += 1
-          line = nil
-        when /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
-          raise ArgumentError,
-          '%s:%d: ENC_REPLICATE: %s is not defined yet. (replica %s)' %
-            [fn, $., $2, $1] unless defs[$2.upcase]
-          count += 1
-        when /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
-          raise ArgumentError,
-          '%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' %
-            [fn, $., $2, $1] unless defs[$2.upcase]
-        when /^ENC_DUMMY\(\s*"([^"]+)"/
-          count += 1
-        else
-          next
-        end
-        check_duplication(defs, $1, fn, $.)
-        lines << line.sub(/;.*/m, "").chomp + ";\n" if line
-      end
-    end
-  end
-end
-
-result = encodings.map {|e| %[ENC_DEFINE("#{e}");\n]}.join + lines.join + 
-  "\n#define ENCODING_COUNT #{count}\n"
-open(outhdr, 'wb') do |f|
-  f.print result
-end
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
deleted file mode 100644
index e36723294d..0000000000
--- a/enc/make_encmake.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-#! ./miniruby
-
-dir = File.expand_path("../..", __FILE__)
-$:.unshift(dir)
-$:.unshift(".")
-$" << "mkmf.rb"
-load File.expand_path("lib/mkmf.rb", dir)
-require 'erb'
-
-if /--builtin-encs=/ =~ ARGV[0]
-  BUILTIN_ENCS = $'.split.map {|e| File.basename(e, '.*') << '.c'}
-  ARGV.shift
-else
-  BUILTIN_ENCS = []
-end
-
-if File.exist?(depend = File.join($srcdir, "depend"))
-  erb = ERB.new(File.read(depend), nil, '%')
-  erb.filename = depend
-  tmp = erb.result(binding)
-  dep = "\n#### depend ####\n\n" << depend_rules(tmp).join
-else
-  dep = ""
-end
-mkin = File.read(File.join($srcdir, "Makefile.in"))
-mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]}
-open(ARGV[0], 'wb') {|f|
-  f.puts mkin, dep
-}
diff --git a/enc/prelude.rb b/enc/prelude.rb
deleted file mode 100644
index a5c78b7e64..0000000000
--- a/enc/prelude.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-%w'enc/encdb enc/trans/transdb'.each do |init|
-  begin
-    require(init)
-  rescue LoadError
-  end
-end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
deleted file mode 100644
index f74afffa92..0000000000
--- a/enc/shift_jis.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/**********************************************************************
-  sjis.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-static const int EncLen_SJIS[] = {
-  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, 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, 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, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  1, 2, 2, 2, 2, 2, 2, 2, 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, 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, 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,
-  2, 2, 2, 2, 2, 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, 1, 1
-};
-
-static const char SJIS_CAN_BE_TRAIL_TABLE[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 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, 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, 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, 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, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0
-};
-
-#define SJIS_ISMB_FIRST(byte)  (EncLen_SJIS[byte] > 1)
-#define SJIS_ISMB_TRAIL(byte)  SJIS_CAN_BE_TRAIL_TABLE[(byte)]
-
-typedef enum { FAILURE = -2, ACCEPT = -1, S0 = 0, S1 } state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ F, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, F, F, F
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, F,
-    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* d */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* e */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* f */ A, A, A, A, A, A, A, A, A, A, A, A, A, F, F, F
-  }
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s;
-  s = trans[0][firstbyte];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_SJIS[firstbyte]-1);
-  s = trans[s][*p++];
-  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
-                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256) {
-    if (EncLen_SJIS[(int )code] == 1)
-      return 1;
-    else
-      return 0;
-  }
-  else if (code <= 0xffff) {
-    return 2;
-  }
-  else
-    return ONIGERR_INVALID_CODE_POINT_VALUE;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, i, len;
-  OnigCodePoint n;
-
-  len = enclen(enc, p, end);
-  c = *p++;
-  n = c;
-  if (len == 1) return n;
-
-  for (i = 1; i < len; i++) {
-    if (p >= end) break;
-    c = *p++;
-    n <<= 8;  n += c;
-  }
-  return n;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc)
-{
-  UChar *p = buf;
-
-  if ((code & 0xff00) != 0) *p++ = (UChar )(((code >>  8) & 0xff));
-  *p++ = (UChar )(code & 0xff);
-
-#if 0
-  if (enclen(enc, buf) != (p - buf))
-    return REGERR_INVALID_CODE_POINT_VALUE;
-#endif
-  return p - buf;
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag,
-	      const UChar** pp, const UChar* end, UChar* lower,
-	      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_MBC_ASCII(p)) {
-    *lower = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    (*pp)++;
-    return 1;
-  }
-  else {
-    int i;
-    int len = enclen(enc, p, end);
-
-    for (i = 0; i < len; i++) {
-      *lower++ = *p++;
-    }
-    (*pp) += len;
-    return len; /* return byte length of converted char to lower */
-  }
-}
-
-#if 0
-static int
-is_mbc_ambiguous(OnigCaseFoldType flag,
-		 const UChar** pp, const UChar* end)
-{
-  return onigenc_mbn_is_mbc_ambiguous(enc, flag, pp, end);
-                                      
-}
-#endif
-
-#if 0
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype)
-{
-  if (code < 128)
-    return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
-  else {
-    if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
-      return (code_to_mbclen(code) > 1 ? TRUE : FALSE);
-    }
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc)
-{
-  const UChar *p;
-  int len;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  if (SJIS_ISMB_TRAIL(*p)) {
-    while (p > start) {
-      if (! SJIS_ISMB_FIRST(*--p)) {
-	p++;
-	break;
-      }
-    } 
-  }
-  len = enclen(enc, p, s);
-  if (p + len > s) return (UChar* )p;
-  p += len;
-  return (UChar* )(p + ((s - p) & ~1));
-}
-
-static int
-is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar c = *s;
-  return (SJIS_ISMB_TRAIL(c) ? FALSE : TRUE);
-}
-
-
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
-static const OnigCodePoint CR_Hiragana[] = {
-  1,
-  0x829f, 0x82f1
-}; /* CR_Hiragana */
-
-static const OnigCodePoint CR_Katakana[] = {
-  4,
-  0x00a6, 0x00af,
-  0x00b1, 0x00dd,
-  0x8340, 0x837e,
-  0x8380, 0x8396,
-}; /* CR_Katakana */
-
-static int
-init_property_list(void)
-{
-  int r;
-
-  PROPERTY_LIST_ADD_PROP("Hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("Katakana", CR_Katakana);
-  PropertyInited = 1;
-
- end:
-  return r;
-}
-
-static int
-property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
-{
-  st_data_t ctype;
-
-  PROPERTY_LIST_INIT_CHECK;
-
-  if (onig_st_lookup_strend(PropertyNameTable, p, end, &ctype) == 0) {
-    return onigenc_minimum_property_name_to_ctype(enc, p, end);
-  }
-
-  return ctype;
-}
-
-static int
-is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    if (code < 128)
-      return ONIGENC_IS_ASCII_CODE_CTYPE(code, ctype);
-    else {
-      if (CTYPE_IS_WORD_GRAPH_PRINT(ctype)) {
-	return TRUE;
-      }
-    }
-  }
-  else {
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (unsigned int )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
-  }
-
-  return FALSE;
-}
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-		     const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
-  if (ctype <= ONIGENC_MAX_STD_CTYPE) {
-    return ONIG_NO_SUPPORT_CONFIG;
-  }
-  else {
-    *sb_out = 0x80;
-
-    PROPERTY_LIST_INIT_CHECK;
-
-    ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
-    if (ctype >= (OnigCtype )PropertyListNum)
-      return ONIGERR_TYPE_BUG;
-
-    *ranges = PropertyList[ctype];
-    return 0;
-  }
-}
-
-OnigEncodingDefine(shift_jis, Shift_JIS) = {
-  mbc_enc_len,
-  "Shift_JIS",   /* name */
-  2,             /* max byte length */
-  1,             /* min byte length */
-  onigenc_is_mbc_newline_0x0a,
-  mbc_to_code,
-  code_to_mbclen,
-  code_to_mbc,
-  mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  property_name_to_ctype,
-  is_code_ctype,
-  get_ctype_code_range,
-  left_adjust_char_head,
-  is_allowed_reverse_match,
-  0
-};
-/*
- * Name: Shift_JIS
- * MIBenum: 17
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://ja.wikipedia.org/wiki/Shift_JIS
- */
-ENC_ALIAS("SJIS", "Shift_JIS")
-
-/*
- * Name: Windows-31J
- * MIBenum: 2024
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/dbcs/932.mspx
- * Link: http://ja.wikipedia.org/wiki/Windows-31J
- * Link: http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/windows-932-2000.ucm
- */
-ENC_REPLICATE("Windows-31J", "Shift_JIS")
-ENC_ALIAS("CP932", "Windows-31J")
-ENC_ALIAS("csWindows31J", "Windows-31J") /* IANA.  IE6 don't accept Windows-31J but csWindows31J. */
-
-/*
- * Name: MacJapanese
- * Link: http://unicode.org/Public/MAPPINGS/VENDORS/APPLE/JAPANESE.TXT
- * Link: http://ja.wikipedia.org/wiki/MacJapanese
- */
-ENC_REPLICATE("MacJapanese", "Shift_JIS")
-ENC_ALIAS("MacJapan", "MacJapanese")
diff --git a/enc/trans/japanese.c b/enc/trans/japanese.c
deleted file mode 100644
index 398901d514..0000000000
--- a/enc/trans/japanese.c
+++ /dev/null
@@ -1,23903 +0,0 @@
-#include "transcode_data.h"
-
-static const unsigned char
-from_SHIFT_JIS_81_offsets[256] = {
-    147,147,147,147,147,147,147,147,  147,147,147,147,147,147,147,147,
-    147,147,147,147,147,147,147,147,  147,147,147,147,147,147,147,147,
-    147,147,147,147,147,147,147,147,  147,147,147,147,147,147,147,147,
-    147,147,147,147,147,147,147,147,  147,147,147,147,147,147,147,147,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62,147,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,101,102,  103,104,105,106,107,147,147,147,
-    147,147,147,147,147,147,147,147,  108,109,110,111,112,113,114,115,
-    147,147,147,147,147,147,147,147,  116,117,118,119,120,121,122,147,
-    147,147,147,147,147,147,147,147,  147,147,123,124,125,126,127,128,
-    129,130,131,132,133,134,135,136,  137,147,147,147,147,147,147,147,
-    138,139,140,141,142,143,144,145,  147,147,147,147,146,147,147,147,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_81_infos[148] = {
-     o3(0xE3,0x80,0x80), o3(0xE3,0x80,0x81),
-     o3(0xE3,0x80,0x82), o3(0xEF,0xBC,0x8C),
-     o3(0xEF,0xBC,0x8E), o3(0xE3,0x83,0xBB),
-     o3(0xEF,0xBC,0x9A), o3(0xEF,0xBC,0x9B),
-     o3(0xEF,0xBC,0x9F), o3(0xEF,0xBC,0x81),
-     o3(0xE3,0x82,0x9B), o3(0xE3,0x82,0x9C),
-          o2(0xC2,0xB4), o3(0xEF,0xBD,0x80),
-          o2(0xC2,0xA8), o3(0xEF,0xBC,0xBE),
-     o3(0xEF,0xBF,0xA3), o3(0xEF,0xBC,0xBF),
-     o3(0xE3,0x83,0xBD), o3(0xE3,0x83,0xBE),
-     o3(0xE3,0x82,0x9D), o3(0xE3,0x82,0x9E),
-     o3(0xE3,0x80,0x83), o3(0xE4,0xBB,0x9D),
-     o3(0xE3,0x80,0x85), o3(0xE3,0x80,0x86),
-     o3(0xE3,0x80,0x87), o3(0xE3,0x83,0xBC),
-     o3(0xE2,0x80,0x95), o3(0xE2,0x80,0x90),
-     o3(0xEF,0xBC,0x8F), o3(0xEF,0xBC,0xBC),
-     o3(0xEF,0xBD,0x9E), o3(0xE2,0x88,0xA5),
-     o3(0xEF,0xBD,0x9C), o3(0xE2,0x80,0xA6),
-     o3(0xE2,0x80,0xA5), o3(0xE2,0x80,0x98),
-     o3(0xE2,0x80,0x99), o3(0xE2,0x80,0x9C),
-     o3(0xE2,0x80,0x9D), o3(0xEF,0xBC,0x88),
-     o3(0xEF,0xBC,0x89), o3(0xE3,0x80,0x94),
-     o3(0xE3,0x80,0x95), o3(0xEF,0xBC,0xBB),
-     o3(0xEF,0xBC,0xBD), o3(0xEF,0xBD,0x9B),
-     o3(0xEF,0xBD,0x9D), o3(0xE3,0x80,0x88),
-     o3(0xE3,0x80,0x89), o3(0xE3,0x80,0x8A),
-     o3(0xE3,0x80,0x8B), o3(0xE3,0x80,0x8C),
-     o3(0xE3,0x80,0x8D), o3(0xE3,0x80,0x8E),
-     o3(0xE3,0x80,0x8F), o3(0xE3,0x80,0x90),
-     o3(0xE3,0x80,0x91), o3(0xEF,0xBC,0x8B),
-     o3(0xEF,0xBC,0x8D),      o2(0xC2,0xB1),
-          o2(0xC3,0x97),      o2(0xC3,0xB7),
-     o3(0xEF,0xBC,0x9D), o3(0xE2,0x89,0xA0),
-     o3(0xEF,0xBC,0x9C), o3(0xEF,0xBC,0x9E),
-     o3(0xE2,0x89,0xA6), o3(0xE2,0x89,0xA7),
-     o3(0xE2,0x88,0x9E), o3(0xE2,0x88,0xB4),
-     o3(0xE2,0x99,0x82), o3(0xE2,0x99,0x80),
-          o2(0xC2,0xB0), o3(0xE2,0x80,0xB2),
-     o3(0xE2,0x80,0xB3), o3(0xE2,0x84,0x83),
-     o3(0xEF,0xBF,0xA5), o3(0xEF,0xBC,0x84),
-     o3(0xEF,0xBF,0xA0), o3(0xEF,0xBF,0xA1),
-     o3(0xEF,0xBC,0x85), o3(0xEF,0xBC,0x83),
-     o3(0xEF,0xBC,0x86), o3(0xEF,0xBC,0x8A),
-     o3(0xEF,0xBC,0xA0),      o2(0xC2,0xA7),
-     o3(0xE2,0x98,0x86), o3(0xE2,0x98,0x85),
-     o3(0xE2,0x97,0x8B), o3(0xE2,0x97,0x8F),
-     o3(0xE2,0x97,0x8E), o3(0xE2,0x97,0x87),
-     o3(0xE2,0x97,0x86), o3(0xE2,0x96,0xA1),
-     o3(0xE2,0x96,0xA0), o3(0xE2,0x96,0xB3),
-     o3(0xE2,0x96,0xB2), o3(0xE2,0x96,0xBD),
-     o3(0xE2,0x96,0xBC), o3(0xE2,0x80,0xBB),
-     o3(0xE3,0x80,0x92), o3(0xE2,0x86,0x92),
-     o3(0xE2,0x86,0x90), o3(0xE2,0x86,0x91),
-     o3(0xE2,0x86,0x93), o3(0xE3,0x80,0x93),
-     o3(0xE2,0x88,0x88), o3(0xE2,0x88,0x8B),
-     o3(0xE2,0x8A,0x86), o3(0xE2,0x8A,0x87),
-     o3(0xE2,0x8A,0x82), o3(0xE2,0x8A,0x83),
-     o3(0xE2,0x88,0xAA), o3(0xE2,0x88,0xA9),
-     o3(0xE2,0x88,0xA7), o3(0xE2,0x88,0xA8),
-     o3(0xEF,0xBF,0xA2), o3(0xE2,0x87,0x92),
-     o3(0xE2,0x87,0x94), o3(0xE2,0x88,0x80),
-     o3(0xE2,0x88,0x83), o3(0xE2,0x88,0xA0),
-     o3(0xE2,0x8A,0xA5), o3(0xE2,0x8C,0x92),
-     o3(0xE2,0x88,0x82), o3(0xE2,0x88,0x87),
-     o3(0xE2,0x89,0xA1), o3(0xE2,0x89,0x92),
-     o3(0xE2,0x89,0xAA), o3(0xE2,0x89,0xAB),
-     o3(0xE2,0x88,0x9A), o3(0xE2,0x88,0xBD),
-     o3(0xE2,0x88,0x9D), o3(0xE2,0x88,0xB5),
-     o3(0xE2,0x88,0xAB), o3(0xE2,0x88,0xAC),
-     o3(0xE2,0x84,0xAB), o3(0xE2,0x80,0xB0),
-     o3(0xE2,0x99,0xAF), o3(0xE2,0x99,0xAD),
-     o3(0xE2,0x99,0xAA), o3(0xE2,0x80,0xA0),
-     o3(0xE2,0x80,0xA1),      o2(0xC2,0xB6),
-     o3(0xE2,0x97,0xAF),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_81 = {
-    from_SHIFT_JIS_81_offsets,
-    from_SHIFT_JIS_81_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_82_offsets[256] = {
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9,145,145,145,145,145,145,145,
-     10, 11, 12, 13, 14, 15, 16, 17,   18, 19, 20, 21, 22, 23, 24, 25,
-     26, 27, 28, 29, 30, 31, 32, 33,   34, 35,145,145,145,145,145,145,
-    145, 36, 37, 38, 39, 40, 41, 42,   43, 44, 45, 46, 47, 48, 49, 50,
-     51, 52, 53, 54, 55, 56, 57, 58,   59, 60, 61,145,145,145,145, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,101,102,  103,104,105,106,107,108,109,110,
-    111,112,113,114,115,116,117,118,  119,120,121,122,123,124,125,126,
-    127,128,129,130,131,132,133,134,  135,136,137,138,139,140,141,142,
-    143,144,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_82_infos[146] = {
-     o3(0xEF,0xBC,0x90), o3(0xEF,0xBC,0x91),
-     o3(0xEF,0xBC,0x92), o3(0xEF,0xBC,0x93),
-     o3(0xEF,0xBC,0x94), o3(0xEF,0xBC,0x95),
-     o3(0xEF,0xBC,0x96), o3(0xEF,0xBC,0x97),
-     o3(0xEF,0xBC,0x98), o3(0xEF,0xBC,0x99),
-     o3(0xEF,0xBC,0xA1), o3(0xEF,0xBC,0xA2),
-     o3(0xEF,0xBC,0xA3), o3(0xEF,0xBC,0xA4),
-     o3(0xEF,0xBC,0xA5), o3(0xEF,0xBC,0xA6),
-     o3(0xEF,0xBC,0xA7), o3(0xEF,0xBC,0xA8),
-     o3(0xEF,0xBC,0xA9), o3(0xEF,0xBC,0xAA),
-     o3(0xEF,0xBC,0xAB), o3(0xEF,0xBC,0xAC),
-     o3(0xEF,0xBC,0xAD), o3(0xEF,0xBC,0xAE),
-     o3(0xEF,0xBC,0xAF), o3(0xEF,0xBC,0xB0),
-     o3(0xEF,0xBC,0xB1), o3(0xEF,0xBC,0xB2),
-     o3(0xEF,0xBC,0xB3), o3(0xEF,0xBC,0xB4),
-     o3(0xEF,0xBC,0xB5), o3(0xEF,0xBC,0xB6),
-     o3(0xEF,0xBC,0xB7), o3(0xEF,0xBC,0xB8),
-     o3(0xEF,0xBC,0xB9), o3(0xEF,0xBC,0xBA),
-     o3(0xEF,0xBD,0x81), o3(0xEF,0xBD,0x82),
-     o3(0xEF,0xBD,0x83), o3(0xEF,0xBD,0x84),
-     o3(0xEF,0xBD,0x85), o3(0xEF,0xBD,0x86),
-     o3(0xEF,0xBD,0x87), o3(0xEF,0xBD,0x88),
-     o3(0xEF,0xBD,0x89), o3(0xEF,0xBD,0x8A),
-     o3(0xEF,0xBD,0x8B), o3(0xEF,0xBD,0x8C),
-     o3(0xEF,0xBD,0x8D), o3(0xEF,0xBD,0x8E),
-     o3(0xEF,0xBD,0x8F), o3(0xEF,0xBD,0x90),
-     o3(0xEF,0xBD,0x91), o3(0xEF,0xBD,0x92),
-     o3(0xEF,0xBD,0x93), o3(0xEF,0xBD,0x94),
-     o3(0xEF,0xBD,0x95), o3(0xEF,0xBD,0x96),
-     o3(0xEF,0xBD,0x97), o3(0xEF,0xBD,0x98),
-     o3(0xEF,0xBD,0x99), o3(0xEF,0xBD,0x9A),
-     o3(0xE3,0x81,0x81), o3(0xE3,0x81,0x82),
-     o3(0xE3,0x81,0x83), o3(0xE3,0x81,0x84),
-     o3(0xE3,0x81,0x85), o3(0xE3,0x81,0x86),
-     o3(0xE3,0x81,0x87), o3(0xE3,0x81,0x88),
-     o3(0xE3,0x81,0x89), o3(0xE3,0x81,0x8A),
-     o3(0xE3,0x81,0x8B), o3(0xE3,0x81,0x8C),
-     o3(0xE3,0x81,0x8D), o3(0xE3,0x81,0x8E),
-     o3(0xE3,0x81,0x8F), o3(0xE3,0x81,0x90),
-     o3(0xE3,0x81,0x91), o3(0xE3,0x81,0x92),
-     o3(0xE3,0x81,0x93), o3(0xE3,0x81,0x94),
-     o3(0xE3,0x81,0x95), o3(0xE3,0x81,0x96),
-     o3(0xE3,0x81,0x97), o3(0xE3,0x81,0x98),
-     o3(0xE3,0x81,0x99), o3(0xE3,0x81,0x9A),
-     o3(0xE3,0x81,0x9B), o3(0xE3,0x81,0x9C),
-     o3(0xE3,0x81,0x9D), o3(0xE3,0x81,0x9E),
-     o3(0xE3,0x81,0x9F), o3(0xE3,0x81,0xA0),
-     o3(0xE3,0x81,0xA1), o3(0xE3,0x81,0xA2),
-     o3(0xE3,0x81,0xA3), o3(0xE3,0x81,0xA4),
-     o3(0xE3,0x81,0xA5), o3(0xE3,0x81,0xA6),
-     o3(0xE3,0x81,0xA7), o3(0xE3,0x81,0xA8),
-     o3(0xE3,0x81,0xA9), o3(0xE3,0x81,0xAA),
-     o3(0xE3,0x81,0xAB), o3(0xE3,0x81,0xAC),
-     o3(0xE3,0x81,0xAD), o3(0xE3,0x81,0xAE),
-     o3(0xE3,0x81,0xAF), o3(0xE3,0x81,0xB0),
-     o3(0xE3,0x81,0xB1), o3(0xE3,0x81,0xB2),
-     o3(0xE3,0x81,0xB3), o3(0xE3,0x81,0xB4),
-     o3(0xE3,0x81,0xB5), o3(0xE3,0x81,0xB6),
-     o3(0xE3,0x81,0xB7), o3(0xE3,0x81,0xB8),
-     o3(0xE3,0x81,0xB9), o3(0xE3,0x81,0xBA),
-     o3(0xE3,0x81,0xBB), o3(0xE3,0x81,0xBC),
-     o3(0xE3,0x81,0xBD), o3(0xE3,0x81,0xBE),
-     o3(0xE3,0x81,0xBF), o3(0xE3,0x82,0x80),
-     o3(0xE3,0x82,0x81), o3(0xE3,0x82,0x82),
-     o3(0xE3,0x82,0x83), o3(0xE3,0x82,0x84),
-     o3(0xE3,0x82,0x85), o3(0xE3,0x82,0x86),
-     o3(0xE3,0x82,0x87), o3(0xE3,0x82,0x88),
-     o3(0xE3,0x82,0x89), o3(0xE3,0x82,0x8A),
-     o3(0xE3,0x82,0x8B), o3(0xE3,0x82,0x8C),
-     o3(0xE3,0x82,0x8D), o3(0xE3,0x82,0x8E),
-     o3(0xE3,0x82,0x8F), o3(0xE3,0x82,0x90),
-     o3(0xE3,0x82,0x91), o3(0xE3,0x82,0x92),
-     o3(0xE3,0x82,0x93),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_82 = {
-    from_SHIFT_JIS_82_offsets,
-    from_SHIFT_JIS_82_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_83_offsets[256] = {
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62,134,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85,134,  134,134,134,134,134,134,134, 86,
-     87, 88, 89, 90, 91, 92, 93, 94,   95, 96, 97, 98, 99,100,101,102,
-    103,104,105,106,107,108,109,134,  134,134,134,134,134,134,134,110,
-    111,112,113,114,115,116,117,118,  119,120,121,122,123,124,125,126,
-    127,128,129,130,131,132,133,134,  134,134,134,134,134,134,134,134,
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-    134,134,134,134,134,134,134,134,  134,134,134,134,134,134,134,134,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_83_infos[135] = {
-     o3(0xE3,0x82,0xA1), o3(0xE3,0x82,0xA2),
-     o3(0xE3,0x82,0xA3), o3(0xE3,0x82,0xA4),
-     o3(0xE3,0x82,0xA5), o3(0xE3,0x82,0xA6),
-     o3(0xE3,0x82,0xA7), o3(0xE3,0x82,0xA8),
-     o3(0xE3,0x82,0xA9), o3(0xE3,0x82,0xAA),
-     o3(0xE3,0x82,0xAB), o3(0xE3,0x82,0xAC),
-     o3(0xE3,0x82,0xAD), o3(0xE3,0x82,0xAE),
-     o3(0xE3,0x82,0xAF), o3(0xE3,0x82,0xB0),
-     o3(0xE3,0x82,0xB1), o3(0xE3,0x82,0xB2),
-     o3(0xE3,0x82,0xB3), o3(0xE3,0x82,0xB4),
-     o3(0xE3,0x82,0xB5), o3(0xE3,0x82,0xB6),
-     o3(0xE3,0x82,0xB7), o3(0xE3,0x82,0xB8),
-     o3(0xE3,0x82,0xB9), o3(0xE3,0x82,0xBA),
-     o3(0xE3,0x82,0xBB), o3(0xE3,0x82,0xBC),
-     o3(0xE3,0x82,0xBD), o3(0xE3,0x82,0xBE),
-     o3(0xE3,0x82,0xBF), o3(0xE3,0x83,0x80),
-     o3(0xE3,0x83,0x81), o3(0xE3,0x83,0x82),
-     o3(0xE3,0x83,0x83), o3(0xE3,0x83,0x84),
-     o3(0xE3,0x83,0x85), o3(0xE3,0x83,0x86),
-     o3(0xE3,0x83,0x87), o3(0xE3,0x83,0x88),
-     o3(0xE3,0x83,0x89), o3(0xE3,0x83,0x8A),
-     o3(0xE3,0x83,0x8B), o3(0xE3,0x83,0x8C),
-     o3(0xE3,0x83,0x8D), o3(0xE3,0x83,0x8E),
-     o3(0xE3,0x83,0x8F), o3(0xE3,0x83,0x90),
-     o3(0xE3,0x83,0x91), o3(0xE3,0x83,0x92),
-     o3(0xE3,0x83,0x93), o3(0xE3,0x83,0x94),
-     o3(0xE3,0x83,0x95), o3(0xE3,0x83,0x96),
-     o3(0xE3,0x83,0x97), o3(0xE3,0x83,0x98),
-     o3(0xE3,0x83,0x99), o3(0xE3,0x83,0x9A),
-     o3(0xE3,0x83,0x9B), o3(0xE3,0x83,0x9C),
-     o3(0xE3,0x83,0x9D), o3(0xE3,0x83,0x9E),
-     o3(0xE3,0x83,0x9F), o3(0xE3,0x83,0xA0),
-     o3(0xE3,0x83,0xA1), o3(0xE3,0x83,0xA2),
-     o3(0xE3,0x83,0xA3), o3(0xE3,0x83,0xA4),
-     o3(0xE3,0x83,0xA5), o3(0xE3,0x83,0xA6),
-     o3(0xE3,0x83,0xA7), o3(0xE3,0x83,0xA8),
-     o3(0xE3,0x83,0xA9), o3(0xE3,0x83,0xAA),
-     o3(0xE3,0x83,0xAB), o3(0xE3,0x83,0xAC),
-     o3(0xE3,0x83,0xAD), o3(0xE3,0x83,0xAE),
-     o3(0xE3,0x83,0xAF), o3(0xE3,0x83,0xB0),
-     o3(0xE3,0x83,0xB1), o3(0xE3,0x83,0xB2),
-     o3(0xE3,0x83,0xB3), o3(0xE3,0x83,0xB4),
-     o3(0xE3,0x83,0xB5), o3(0xE3,0x83,0xB6),
-          o2(0xCE,0x91),      o2(0xCE,0x92),
-          o2(0xCE,0x93),      o2(0xCE,0x94),
-          o2(0xCE,0x95),      o2(0xCE,0x96),
-          o2(0xCE,0x97),      o2(0xCE,0x98),
-          o2(0xCE,0x99),      o2(0xCE,0x9A),
-          o2(0xCE,0x9B),      o2(0xCE,0x9C),
-          o2(0xCE,0x9D),      o2(0xCE,0x9E),
-          o2(0xCE,0x9F),      o2(0xCE,0xA0),
-          o2(0xCE,0xA1),      o2(0xCE,0xA3),
-          o2(0xCE,0xA4),      o2(0xCE,0xA5),
-          o2(0xCE,0xA6),      o2(0xCE,0xA7),
-          o2(0xCE,0xA8),      o2(0xCE,0xA9),
-          o2(0xCE,0xB1),      o2(0xCE,0xB2),
-          o2(0xCE,0xB3),      o2(0xCE,0xB4),
-          o2(0xCE,0xB5),      o2(0xCE,0xB6),
-          o2(0xCE,0xB7),      o2(0xCE,0xB8),
-          o2(0xCE,0xB9),      o2(0xCE,0xBA),
-          o2(0xCE,0xBB),      o2(0xCE,0xBC),
-          o2(0xCE,0xBD),      o2(0xCE,0xBE),
-          o2(0xCE,0xBF),      o2(0xCF,0x80),
-          o2(0xCF,0x81),      o2(0xCF,0x83),
-          o2(0xCF,0x84),      o2(0xCF,0x85),
-          o2(0xCF,0x86),      o2(0xCF,0x87),
-          o2(0xCF,0x88),      o2(0xCF,0x89),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_83 = {
-    from_SHIFT_JIS_83_offsets,
-    from_SHIFT_JIS_83_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_84_offsets[256] = {
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47, 98,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,   75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,   91, 92, 93, 94, 95, 96, 97, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-     98, 98, 98, 98, 98, 98, 98, 98,   98, 98, 98, 98, 98, 98, 98, 98,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_84_infos[99] = {
-          o2(0xD0,0x90),      o2(0xD0,0x91),
-          o2(0xD0,0x92),      o2(0xD0,0x93),
-          o2(0xD0,0x94),      o2(0xD0,0x95),
-          o2(0xD0,0x81),      o2(0xD0,0x96),
-          o2(0xD0,0x97),      o2(0xD0,0x98),
-          o2(0xD0,0x99),      o2(0xD0,0x9A),
-          o2(0xD0,0x9B),      o2(0xD0,0x9C),
-          o2(0xD0,0x9D),      o2(0xD0,0x9E),
-          o2(0xD0,0x9F),      o2(0xD0,0xA0),
-          o2(0xD0,0xA1),      o2(0xD0,0xA2),
-          o2(0xD0,0xA3),      o2(0xD0,0xA4),
-          o2(0xD0,0xA5),      o2(0xD0,0xA6),
-          o2(0xD0,0xA7),      o2(0xD0,0xA8),
-          o2(0xD0,0xA9),      o2(0xD0,0xAA),
-          o2(0xD0,0xAB),      o2(0xD0,0xAC),
-          o2(0xD0,0xAD),      o2(0xD0,0xAE),
-          o2(0xD0,0xAF),      o2(0xD0,0xB0),
-          o2(0xD0,0xB1),      o2(0xD0,0xB2),
-          o2(0xD0,0xB3),      o2(0xD0,0xB4),
-          o2(0xD0,0xB5),      o2(0xD1,0x91),
-          o2(0xD0,0xB6),      o2(0xD0,0xB7),
-          o2(0xD0,0xB8),      o2(0xD0,0xB9),
-          o2(0xD0,0xBA),      o2(0xD0,0xBB),
-          o2(0xD0,0xBC),      o2(0xD0,0xBD),
-          o2(0xD0,0xBE),      o2(0xD0,0xBF),
-          o2(0xD1,0x80),      o2(0xD1,0x81),
-          o2(0xD1,0x82),      o2(0xD1,0x83),
-          o2(0xD1,0x84),      o2(0xD1,0x85),
-          o2(0xD1,0x86),      o2(0xD1,0x87),
-          o2(0xD1,0x88),      o2(0xD1,0x89),
-          o2(0xD1,0x8A),      o2(0xD1,0x8B),
-          o2(0xD1,0x8C),      o2(0xD1,0x8D),
-          o2(0xD1,0x8E),      o2(0xD1,0x8F),
-     o3(0xE2,0x94,0x80), o3(0xE2,0x94,0x82),
-     o3(0xE2,0x94,0x8C), o3(0xE2,0x94,0x90),
-     o3(0xE2,0x94,0x98), o3(0xE2,0x94,0x94),
-     o3(0xE2,0x94,0x9C), o3(0xE2,0x94,0xAC),
-     o3(0xE2,0x94,0xA4), o3(0xE2,0x94,0xB4),
-     o3(0xE2,0x94,0xBC), o3(0xE2,0x94,0x81),
-     o3(0xE2,0x94,0x83), o3(0xE2,0x94,0x8F),
-     o3(0xE2,0x94,0x93), o3(0xE2,0x94,0x9B),
-     o3(0xE2,0x94,0x97), o3(0xE2,0x94,0xA3),
-     o3(0xE2,0x94,0xB3), o3(0xE2,0x94,0xAB),
-     o3(0xE2,0x94,0xBB), o3(0xE2,0x95,0x8B),
-     o3(0xE2,0x94,0xA0), o3(0xE2,0x94,0xAF),
-     o3(0xE2,0x94,0xA8), o3(0xE2,0x94,0xB7),
-     o3(0xE2,0x94,0xBF), o3(0xE2,0x94,0x9D),
-     o3(0xE2,0x94,0xB0), o3(0xE2,0x94,0xA5),
-     o3(0xE2,0x94,0xB8), o3(0xE2,0x95,0x82),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_84 = {
-    from_SHIFT_JIS_84_offsets,
-    from_SHIFT_JIS_84_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_87_offsets[256] = {
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 83, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 83, 83,   83, 83, 83, 83, 83, 83, 53, 83,
-     54, 55, 56, 57, 58, 59, 60, 61,   62, 63, 64, 65, 66, 67, 68, 69,
-     70, 71, 72, 73, 74, 75, 76, 77,   78, 79, 80, 81, 82, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_87_infos[84] = {
-  /* used from from_SHIFT_JIS_87 */
-  /* used from from_EUC_JP_AD */
-     o3(0xE2,0x91,0xA0), o3(0xE2,0x91,0xA1),
-     o3(0xE2,0x91,0xA2), o3(0xE2,0x91,0xA3),
-     o3(0xE2,0x91,0xA4), o3(0xE2,0x91,0xA5),
-     o3(0xE2,0x91,0xA6), o3(0xE2,0x91,0xA7),
-     o3(0xE2,0x91,0xA8), o3(0xE2,0x91,0xA9),
-     o3(0xE2,0x91,0xAA), o3(0xE2,0x91,0xAB),
-     o3(0xE2,0x91,0xAC), o3(0xE2,0x91,0xAD),
-     o3(0xE2,0x91,0xAE), o3(0xE2,0x91,0xAF),
-     o3(0xE2,0x91,0xB0), o3(0xE2,0x91,0xB1),
-     o3(0xE2,0x91,0xB2), o3(0xE2,0x91,0xB3),
-     o3(0xE2,0x85,0xA0), o3(0xE2,0x85,0xA1),
-     o3(0xE2,0x85,0xA2), o3(0xE2,0x85,0xA3),
-     o3(0xE2,0x85,0xA4), o3(0xE2,0x85,0xA5),
-     o3(0xE2,0x85,0xA6), o3(0xE2,0x85,0xA7),
-     o3(0xE2,0x85,0xA8), o3(0xE2,0x85,0xA9),
-     o3(0xE3,0x8D,0x89), o3(0xE3,0x8C,0x94),
-     o3(0xE3,0x8C,0xA2), o3(0xE3,0x8D,0x8D),
-     o3(0xE3,0x8C,0x98), o3(0xE3,0x8C,0xA7),
-     o3(0xE3,0x8C,0x83), o3(0xE3,0x8C,0xB6),
-     o3(0xE3,0x8D,0x91), o3(0xE3,0x8D,0x97),
-     o3(0xE3,0x8C,0x8D), o3(0xE3,0x8C,0xA6),
-     o3(0xE3,0x8C,0xA3), o3(0xE3,0x8C,0xAB),
-     o3(0xE3,0x8D,0x8A), o3(0xE3,0x8C,0xBB),
-     o3(0xE3,0x8E,0x9C), o3(0xE3,0x8E,0x9D),
-     o3(0xE3,0x8E,0x9E), o3(0xE3,0x8E,0x8E),
-     o3(0xE3,0x8E,0x8F), o3(0xE3,0x8F,0x84),
-     o3(0xE3,0x8E,0xA1), o3(0xE3,0x8D,0xBB),
-     o3(0xE3,0x80,0x9D), o3(0xE3,0x80,0x9F),
-     o3(0xE2,0x84,0x96), o3(0xE3,0x8F,0x8D),
-     o3(0xE2,0x84,0xA1), o3(0xE3,0x8A,0xA4),
-     o3(0xE3,0x8A,0xA5), o3(0xE3,0x8A,0xA6),
-     o3(0xE3,0x8A,0xA7), o3(0xE3,0x8A,0xA8),
-     o3(0xE3,0x88,0xB1), o3(0xE3,0x88,0xB2),
-     o3(0xE3,0x88,0xB9), o3(0xE3,0x8D,0xBE),
-     o3(0xE3,0x8D,0xBD), o3(0xE3,0x8D,0xBC),
-     o3(0xE2,0x89,0x92), o3(0xE2,0x89,0xA1),
-     o3(0xE2,0x88,0xAB), o3(0xE2,0x88,0xAE),
-     o3(0xE2,0x88,0x91), o3(0xE2,0x88,0x9A),
-     o3(0xE2,0x8A,0xA5), o3(0xE2,0x88,0xA0),
-     o3(0xE2,0x88,0x9F), o3(0xE2,0x8A,0xBF),
-     o3(0xE2,0x88,0xB5), o3(0xE2,0x88,0xA9),
-     o3(0xE2,0x88,0xAA),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_87 = {
-    from_SHIFT_JIS_87_offsets,
-    from_SHIFT_JIS_87_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_88_offsets[256] = {
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47, 48,
-     49, 50, 51, 52, 53, 54, 55, 56,   57, 58, 59, 60, 61, 62, 63, 64,
-     65, 66, 67, 68, 69, 70, 71, 72,   73, 74, 75, 76, 77, 78, 79, 80,
-     81, 82, 83, 84, 85, 86, 87, 88,   89, 90, 91, 92, 93, 94, 94, 94,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_88_infos[95] = {
-  /* used from from_SHIFT_JIS_88 */
-  /* used from from_EUC_JP_B0 */
-     o3(0xE4,0xBA,0x9C), o3(0xE5,0x94,0x96),
-     o3(0xE5,0xA8,0x83), o3(0xE9,0x98,0xBF),
-     o3(0xE5,0x93,0x80), o3(0xE6,0x84,0x9B),
-     o3(0xE6,0x8C,0xA8), o3(0xE5,0xA7,0xB6),
-     o3(0xE9,0x80,0xA2), o3(0xE8,0x91,0xB5),
-     o3(0xE8,0x8C,0x9C), o3(0xE7,0xA9,0x90),
-     o3(0xE6,0x82,0xAA), o3(0xE6,0x8F,0xA1),
-     o3(0xE6,0xB8,0xA5), o3(0xE6,0x97,0xAD),
-     o3(0xE8,0x91,0xA6), o3(0xE8,0x8A,0xA6),
-     o3(0xE9,0xAF,0xB5), o3(0xE6,0xA2,0x93),
-     o3(0xE5,0x9C,0xA7), o3(0xE6,0x96,0xA1),
-     o3(0xE6,0x89,0xB1), o3(0xE5,0xAE,0x9B),
-     o3(0xE5,0xA7,0x90), o3(0xE8,0x99,0xBB),
-     o3(0xE9,0xA3,0xB4), o3(0xE7,0xB5,0xA2),
-     o3(0xE7,0xB6,0xBE), o3(0xE9,0xAE,0x8E),
-     o3(0xE6,0x88,0x96), o3(0xE7,0xB2,0x9F),
-     o3(0xE8,0xA2,0xB7), o3(0xE5,0xAE,0x89),
-     o3(0xE5,0xBA,0xB5), o3(0xE6,0x8C,0x89),
-     o3(0xE6,0x9A,0x97), o3(0xE6,0xA1,0x88),
-     o3(0xE9,0x97,0x87), o3(0xE9,0x9E,0x8D),
-     o3(0xE6,0x9D,0x8F), o3(0xE4,0xBB,0xA5),
-     o3(0xE4,0xBC,0x8A), o3(0xE4,0xBD,0x8D),
-     o3(0xE4,0xBE,0x9D), o3(0xE5,0x81,0x89),
-     o3(0xE5,0x9B,0xB2), o3(0xE5,0xA4,0xB7),
-     o3(0xE5,0xA7,0x94), o3(0xE5,0xA8,0x81),
-     o3(0xE5,0xB0,0x89), o3(0xE6,0x83,0x9F),
-     o3(0xE6,0x84,0x8F), o3(0xE6,0x85,0xB0),
-     o3(0xE6,0x98,0x93), o3(0xE6,0xA4,0x85),
-     o3(0xE7,0x82,0xBA), o3(0xE7,0x95,0x8F),
-     o3(0xE7,0x95,0xB0), o3(0xE7,0xA7,0xBB),
-     o3(0xE7,0xB6,0xAD), o3(0xE7,0xB7,0xAF),
-     o3(0xE8,0x83,0x83), o3(0xE8,0x90,0x8E),
-     o3(0xE8,0xA1,0xA3), o3(0xE8,0xAC,0x82),
-     o3(0xE9,0x81,0x95), o3(0xE9,0x81,0xBA),
-     o3(0xE5,0x8C,0xBB), o3(0xE4,0xBA,0x95),
-     o3(0xE4,0xBA,0xA5), o3(0xE5,0x9F,0x9F),
-     o3(0xE8,0x82,0xB2), o3(0xE9,0x83,0x81),
-     o3(0xE7,0xA3,0xAF), o3(0xE4,0xB8,0x80),
-     o3(0xE5,0xA3,0xB1), o3(0xE6,0xBA,0xA2),
-     o3(0xE9,0x80,0xB8), o3(0xE7,0xA8,0xB2),
-     o3(0xE8,0x8C,0xA8), o3(0xE8,0x8A,0x8B),
-     o3(0xE9,0xB0,0xAF), o3(0xE5,0x85,0x81),
-     o3(0xE5,0x8D,0xB0), o3(0xE5,0x92,0xBD),
-     o3(0xE5,0x93,0xA1), o3(0xE5,0x9B,0xA0),
-     o3(0xE5,0xA7,0xBB), o3(0xE5,0xBC,0x95),
-     o3(0xE9,0xA3,0xB2), o3(0xE6,0xB7,0xAB),
-     o3(0xE8,0x83,0xA4), o3(0xE8,0x94,0xAD),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_88 = {
-    from_SHIFT_JIS_88_offsets,
-    from_SHIFT_JIS_88_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_89_offsets[256] = {
-  /* used from from_SHIFT_JIS_89 */
-  /* used from from_SHIFT_JIS_8A */
-  /* used from from_SHIFT_JIS_8B */
-  /* used from from_SHIFT_JIS_8C */
-  /* used from from_SHIFT_JIS_8D */
-  /* used from from_SHIFT_JIS_8E */
-  /* used from from_SHIFT_JIS_8F */
-  /* used from from_SHIFT_JIS_90 */
-  /* used from from_SHIFT_JIS_91 */
-  /* used from from_SHIFT_JIS_92 */
-  /* used from from_SHIFT_JIS_93 */
-  /* used from from_SHIFT_JIS_94 */
-  /* used from from_SHIFT_JIS_95 */
-  /* used from from_SHIFT_JIS_96 */
-  /* used from from_SHIFT_JIS_97 */
-  /* used from from_SHIFT_JIS_99 */
-  /* used from from_SHIFT_JIS_9A */
-  /* used from from_SHIFT_JIS_9B */
-  /* used from from_SHIFT_JIS_9C */
-  /* used from from_SHIFT_JIS_9D */
-  /* used from from_SHIFT_JIS_9E */
-  /* used from from_SHIFT_JIS_9F */
-  /* used from from_SHIFT_JIS_E0 */
-  /* used from from_SHIFT_JIS_E1 */
-  /* used from from_SHIFT_JIS_E2 */
-  /* used from from_SHIFT_JIS_E3 */
-  /* used from from_SHIFT_JIS_E4 */
-  /* used from from_SHIFT_JIS_E5 */
-  /* used from from_SHIFT_JIS_E6 */
-  /* used from from_SHIFT_JIS_E7 */
-  /* used from from_SHIFT_JIS_E8 */
-  /* used from from_SHIFT_JIS_E9 */
-  /* used from from_SHIFT_JIS_FB */
-    188,188,188,188,188,188,188,188,  188,188,188,188,188,188,188,188,
-    188,188,188,188,188,188,188,188,  188,188,188,188,188,188,188,188,
-    188,188,188,188,188,188,188,188,  188,188,188,188,188,188,188,188,
-    188,188,188,188,188,188,188,188,  188,188,188,188,188,188,188,188,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62,188,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,101,102,  103,104,105,106,107,108,109,110,
-    111,112,113,114,115,116,117,118,  119,120,121,122,123,124,125,126,
-    127,128,129,130,131,132,133,134,  135,136,137,138,139,140,141,142,
-    143,144,145,146,147,148,149,150,  151,152,153,154,155,156,157,158,
-    159,160,161,162,163,164,165,166,  167,168,169,170,171,172,173,174,
-    175,176,177,178,179,180,181,182,  183,184,185,186,187,188,188,188,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_89_infos[189] = {
-     o3(0xE9,0x99,0xA2), o3(0xE9,0x99,0xB0),
-     o3(0xE9,0x9A,0xA0), o3(0xE9,0x9F,0xBB),
-     o3(0xE5,0x90,0x8B), o3(0xE5,0x8F,0xB3),
-     o3(0xE5,0xAE,0x87), o3(0xE7,0x83,0x8F),
-     o3(0xE7,0xBE,0xBD), o3(0xE8,0xBF,0x82),
-     o3(0xE9,0x9B,0xA8), o3(0xE5,0x8D,0xAF),
-     o3(0xE9,0xB5,0x9C), o3(0xE7,0xAA,0xBA),
-     o3(0xE4,0xB8,0x91), o3(0xE7,0xA2,0x93),
-     o3(0xE8,0x87,0xBC), o3(0xE6,0xB8,0xA6),
-     o3(0xE5,0x98,0x98), o3(0xE5,0x94,0x84),
-     o3(0xE6,0xAC,0x9D), o3(0xE8,0x94,0x9A),
-     o3(0xE9,0xB0,0xBB), o3(0xE5,0xA7,0xA5),
-     o3(0xE5,0x8E,0xA9), o3(0xE6,0xB5,0xA6),
-     o3(0xE7,0x93,0x9C), o3(0xE9,0x96,0x8F),
-     o3(0xE5,0x99,0x82), o3(0xE4,0xBA,0x91),
-     o3(0xE9,0x81,0x8B), o3(0xE9,0x9B,0xB2),
-     o3(0xE8,0x8D,0x8F), o3(0xE9,0xA4,0x8C),
-     o3(0xE5,0x8F,0xA1), o3(0xE5,0x96,0xB6),
-     o3(0xE5,0xAC,0xB0), o3(0xE5,0xBD,0xB1),
-     o3(0xE6,0x98,0xA0), o3(0xE6,0x9B,0xB3),
-     o3(0xE6,0xA0,0x84), o3(0xE6,0xB0,0xB8),
-     o3(0xE6,0xB3,0xB3), o3(0xE6,0xB4,0xA9),
-     o3(0xE7,0x91,0x9B), o3(0xE7,0x9B,0x88),
-     o3(0xE7,0xA9,0x8E), o3(0xE9,0xA0,0xB4),
-     o3(0xE8,0x8B,0xB1), o3(0xE8,0xA1,0x9B),
-     o3(0xE8,0xA9,0xA0), o3(0xE9,0x8B,0xAD),
-     o3(0xE6,0xB6,0xB2), o3(0xE7,0x96,0xAB),
-     o3(0xE7,0x9B,0x8A), o3(0xE9,0xA7,0x85),
-     o3(0xE6,0x82,0xA6), o3(0xE8,0xAC,0x81),
-     o3(0xE8,0xB6,0x8A), o3(0xE9,0x96,0xB2),
-     o3(0xE6,0xA6,0x8E), o3(0xE5,0x8E,0xAD),
-     o3(0xE5,0x86,0x86), o3(0xE5,0x9C,0x92),
-     o3(0xE5,0xA0,0xB0), o3(0xE5,0xA5,0x84),
-     o3(0xE5,0xAE,0xB4), o3(0xE5,0xBB,0xB6),
-     o3(0xE6,0x80,0xA8), o3(0xE6,0x8E,0xA9),
-     o3(0xE6,0x8F,0xB4), o3(0xE6,0xB2,0xBF),
-     o3(0xE6,0xBC,0x94), o3(0xE7,0x82,0x8E),
-     o3(0xE7,0x84,0x94), o3(0xE7,0x85,0x99),
-     o3(0xE7,0x87,0x95), o3(0xE7,0x8C,0xBF),
-     o3(0xE7,0xB8,0x81), o3(0xE8,0x89,0xB6),
-     o3(0xE8,0x8B,0x91), o3(0xE8,0x96,0x97),
-     o3(0xE9,0x81,0xA0), o3(0xE9,0x89,0x9B),
-     o3(0xE9,0xB4,0x9B), o3(0xE5,0xA1,0xA9),
-     o3(0xE6,0x96,0xBC), o3(0xE6,0xB1,0x9A),
-     o3(0xE7,0x94,0xA5), o3(0xE5,0x87,0xB9),
-     o3(0xE5,0xA4,0xAE), o3(0xE5,0xA5,0xA5),
-     o3(0xE5,0xBE,0x80), o3(0xE5,0xBF,0x9C),
-     o3(0xE6,0x8A,0xBC), o3(0xE6,0x97,0xBA),
-     o3(0xE6,0xA8,0xAA), o3(0xE6,0xAC,0xA7),
-     o3(0xE6,0xAE,0xB4), o3(0xE7,0x8E,0x8B),
-     o3(0xE7,0xBF,0x81), o3(0xE8,0xA5,0x96),
-     o3(0xE9,0xB4,0xAC), o3(0xE9,0xB4,0x8E),
-     o3(0xE9,0xBB,0x84), o3(0xE5,0xB2,0xA1),
-     o3(0xE6,0xB2,0x96), o3(0xE8,0x8D,0xBB),
-     o3(0xE5,0x84,0x84), o3(0xE5,0xB1,0x8B),
-     o3(0xE6,0x86,0xB6), o3(0xE8,0x87,0x86),
-     o3(0xE6,0xA1,0xB6), o3(0xE7,0x89,0xA1),
-     o3(0xE4,0xB9,0x99), o3(0xE4,0xBF,0xBA),
-     o3(0xE5,0x8D,0xB8), o3(0xE6,0x81,0xA9),
-     o3(0xE6,0xB8,0xA9), o3(0xE7,0xA9,0x8F),
-     o3(0xE9,0x9F,0xB3), o3(0xE4,0xB8,0x8B),
-     o3(0xE5,0x8C,0x96), o3(0xE4,0xBB,0xAE),
-     o3(0xE4,0xBD,0x95), o3(0xE4,0xBC,0xBD),
-     o3(0xE4,0xBE,0xA1), o3(0xE4,0xBD,0xB3),
-     o3(0xE5,0x8A,0xA0), o3(0xE5,0x8F,0xAF),
-     o3(0xE5,0x98,0x89), o3(0xE5,0xA4,0x8F),
-     o3(0xE5,0xAB,0x81), o3(0xE5,0xAE,0xB6),
-     o3(0xE5,0xAF,0xA1), o3(0xE7,0xA7,0x91),
-     o3(0xE6,0x9A,0x87), o3(0xE6,0x9E,0x9C),
-     o3(0xE6,0x9E,0xB6), o3(0xE6,0xAD,0x8C),
-     o3(0xE6,0xB2,0xB3), o3(0xE7,0x81,0xAB),
-     o3(0xE7,0x8F,0x82), o3(0xE7,0xA6,0x8D),
-     o3(0xE7,0xA6,0xBE), o3(0xE7,0xA8,0xBC),
-     o3(0xE7,0xAE,0x87), o3(0xE8,0x8A,0xB1),
-     o3(0xE8,0x8B,0x9B), o3(0xE8,0x8C,0x84),
-     o3(0xE8,0x8D,0xB7), o3(0xE8,0x8F,0xAF),
-     o3(0xE8,0x8F,0x93), o3(0xE8,0x9D,0xA6),
-     o3(0xE8,0xAA,0xB2), o3(0xE5,0x98,0xA9),
-     o3(0xE8,0xB2,0xA8), o3(0xE8,0xBF,0xA6),
-     o3(0xE9,0x81,0x8E), o3(0xE9,0x9C,0x9E),
-     o3(0xE8,0x9A,0x8A), o3(0xE4,0xBF,0x84),
-     o3(0xE5,0xB3,0xA8), o3(0xE6,0x88,0x91),
-     o3(0xE7,0x89,0x99), o3(0xE7,0x94,0xBB),
-     o3(0xE8,0x87,0xA5), o3(0xE8,0x8A,0xBD),
-     o3(0xE8,0x9B,0xBE), o3(0xE8,0xB3,0x80),
-     o3(0xE9,0x9B,0x85), o3(0xE9,0xA4,0x93),
-     o3(0xE9,0xA7,0x95), o3(0xE4,0xBB,0x8B),
-     o3(0xE4,0xBC,0x9A), o3(0xE8,0xA7,0xA3),
-     o3(0xE5,0x9B,0x9E), o3(0xE5,0xA1,0x8A),
-     o3(0xE5,0xA3,0x8A), o3(0xE5,0xBB,0xBB),
-     o3(0xE5,0xBF,0xAB), o3(0xE6,0x80,0xAA),
-     o3(0xE6,0x82,0x94), o3(0xE6,0x81,0xA2),
-     o3(0xE6,0x87,0x90), o3(0xE6,0x88,0x92),
-     o3(0xE6,0x8B,0x90), o3(0xE6,0x94,0xB9),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_89 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_89_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8A_infos[189] = {
-     o3(0xE9,0xAD,0x81), o3(0xE6,0x99,0xA6),
-     o3(0xE6,0xA2,0xB0), o3(0xE6,0xB5,0xB7),
-     o3(0xE7,0x81,0xB0), o3(0xE7,0x95,0x8C),
-     o3(0xE7,0x9A,0x86), o3(0xE7,0xB5,0xB5),
-     o3(0xE8,0x8A,0xA5), o3(0xE8,0x9F,0xB9),
-     o3(0xE9,0x96,0x8B), o3(0xE9,0x9A,0x8E),
-     o3(0xE8,0xB2,0x9D), o3(0xE5,0x87,0xB1),
-     o3(0xE5,0x8A,0xBE), o3(0xE5,0xA4,0x96),
-     o3(0xE5,0x92,0xB3), o3(0xE5,0xAE,0xB3),
-     o3(0xE5,0xB4,0x96), o3(0xE6,0x85,0xA8),
-     o3(0xE6,0xA6,0x82), o3(0xE6,0xB6,0xAF),
-     o3(0xE7,0xA2,0x8D), o3(0xE8,0x93,0x8B),
-     o3(0xE8,0xA1,0x97), o3(0xE8,0xA9,0xB2),
-     o3(0xE9,0x8E,0xA7), o3(0xE9,0xAA,0xB8),
-     o3(0xE6,0xB5,0xAC), o3(0xE9,0xA6,0xA8),
-     o3(0xE8,0x9B,0x99), o3(0xE5,0x9E,0xA3),
-     o3(0xE6,0x9F,0xBF), o3(0xE8,0x9B,0x8E),
-     o3(0xE9,0x88,0x8E), o3(0xE5,0x8A,0x83),
-     o3(0xE5,0x9A,0x87), o3(0xE5,0x90,0x84),
-     o3(0xE5,0xBB,0x93), o3(0xE6,0x8B,0xA1),
-     o3(0xE6,0x92,0xB9), o3(0xE6,0xA0,0xBC),
-     o3(0xE6,0xA0,0xB8), o3(0xE6,0xAE,0xBB),
-     o3(0xE7,0x8D,0xB2), o3(0xE7,0xA2,0xBA),
-     o3(0xE7,0xA9,0xAB), o3(0xE8,0xA6,0x9A),
-     o3(0xE8,0xA7,0x92), o3(0xE8,0xB5,0xAB),
-     o3(0xE8,0xBC,0x83), o3(0xE9,0x83,0xAD),
-     o3(0xE9,0x96,0xA3), o3(0xE9,0x9A,0x94),
-     o3(0xE9,0x9D,0xA9), o3(0xE5,0xAD,0xA6),
-     o3(0xE5,0xB2,0xB3), o3(0xE6,0xA5,0xBD),
-     o3(0xE9,0xA1,0x8D), o3(0xE9,0xA1,0x8E),
-     o3(0xE6,0x8E,0x9B), o3(0xE7,0xAC,0xA0),
-     o3(0xE6,0xA8,0xAB), o3(0xE6,0xA9,0xBF),
-     o3(0xE6,0xA2,0xB6), o3(0xE9,0xB0,0x8D),
-     o3(0xE6,0xBD,0x9F), o3(0xE5,0x89,0xB2),
-     o3(0xE5,0x96,0x9D), o3(0xE6,0x81,0xB0),
-     o3(0xE6,0x8B,0xAC), o3(0xE6,0xB4,0xBB),
-     o3(0xE6,0xB8,0x87), o3(0xE6,0xBB,0x91),
-     o3(0xE8,0x91,0x9B), o3(0xE8,0xA4,0x90),
-     o3(0xE8,0xBD,0x84), o3(0xE4,0xB8,0x94),
-     o3(0xE9,0xB0,0xB9), o3(0xE5,0x8F,0xB6),
-     o3(0xE6,0xA4,0x9B), o3(0xE6,0xA8,0xBA),
-     o3(0xE9,0x9E,0x84), o3(0xE6,0xA0,0xAA),
-     o3(0xE5,0x85,0x9C), o3(0xE7,0xAB,0x83),
-     o3(0xE8,0x92,0xB2), o3(0xE9,0x87,0x9C),
-     o3(0xE9,0x8E,0x8C), o3(0xE5,0x99,0x9B),
-     o3(0xE9,0xB4,0xA8), o3(0xE6,0xA0,0xA2),
-     o3(0xE8,0x8C,0x85), o3(0xE8,0x90,0xB1),
-     o3(0xE7,0xB2,0xA5), o3(0xE5,0x88,0x88),
-     o3(0xE8,0x8B,0x85), o3(0xE7,0x93,0xA6),
-     o3(0xE4,0xB9,0xBE), o3(0xE4,0xBE,0x83),
-     o3(0xE5,0x86,0xA0), o3(0xE5,0xAF,0x92),
-     o3(0xE5,0x88,0x8A), o3(0xE5,0x8B,0x98),
-     o3(0xE5,0x8B,0xA7), o3(0xE5,0xB7,0xBB),
-     o3(0xE5,0x96,0x9A), o3(0xE5,0xA0,0xAA),
-     o3(0xE5,0xA7,0xA6), o3(0xE5,0xAE,0x8C),
-     o3(0xE5,0xAE,0x98), o3(0xE5,0xAF,0x9B),
-     o3(0xE5,0xB9,0xB2), o3(0xE5,0xB9,0xB9),
-     o3(0xE6,0x82,0xA3), o3(0xE6,0x84,0x9F),
-     o3(0xE6,0x85,0xA3), o3(0xE6,0x86,0xBE),
-     o3(0xE6,0x8F,0x9B), o3(0xE6,0x95,0xA2),
-     o3(0xE6,0x9F,0x91), o3(0xE6,0xA1,0x93),
-     o3(0xE6,0xA3,0xBA), o3(0xE6,0xAC,0xBE),
-     o3(0xE6,0xAD,0x93), o3(0xE6,0xB1,0x97),
-     o3(0xE6,0xBC,0xA2), o3(0xE6,0xBE,0x97),
-     o3(0xE6,0xBD,0x85), o3(0xE7,0x92,0xB0),
-     o3(0xE7,0x94,0x98), o3(0xE7,0x9B,0xA3),
-     o3(0xE7,0x9C,0x8B), o3(0xE7,0xAB,0xBF),
-     o3(0xE7,0xAE,0xA1), o3(0xE7,0xB0,0xA1),
-     o3(0xE7,0xB7,0xA9), o3(0xE7,0xBC,0xB6),
-     o3(0xE7,0xBF,0xB0), o3(0xE8,0x82,0x9D),
-     o3(0xE8,0x89,0xA6), o3(0xE8,0x8E,0x9E),
-     o3(0xE8,0xA6,0xB3), o3(0xE8,0xAB,0x8C),
-     o3(0xE8,0xB2,0xAB), o3(0xE9,0x82,0x84),
-     o3(0xE9,0x91,0x91), o3(0xE9,0x96,0x93),
-     o3(0xE9,0x96,0x91), o3(0xE9,0x96,0xA2),
-     o3(0xE9,0x99,0xA5), o3(0xE9,0x9F,0x93),
-     o3(0xE9,0xA4,0xA8), o3(0xE8,0x88,0x98),
-     o3(0xE4,0xB8,0xB8), o3(0xE5,0x90,0xAB),
-     o3(0xE5,0xB2,0xB8), o3(0xE5,0xB7,0x8C),
-     o3(0xE7,0x8E,0xA9), o3(0xE7,0x99,0x8C),
-     o3(0xE7,0x9C,0xBC), o3(0xE5,0xB2,0xA9),
-     o3(0xE7,0xBF,0xAB), o3(0xE8,0xB4,0x8B),
-     o3(0xE9,0x9B,0x81), o3(0xE9,0xA0,0x91),
-     o3(0xE9,0xA1,0x94), o3(0xE9,0xA1,0x98),
-     o3(0xE4,0xBC,0x81), o3(0xE4,0xBC,0x8E),
-     o3(0xE5,0x8D,0xB1), o3(0xE5,0x96,0x9C),
-     o3(0xE5,0x99,0xA8), o3(0xE5,0x9F,0xBA),
-     o3(0xE5,0xA5,0x87), o3(0xE5,0xAC,0x89),
-     o3(0xE5,0xAF,0x84), o3(0xE5,0xB2,0x90),
-     o3(0xE5,0xB8,0x8C), o3(0xE5,0xB9,0xBE),
-     o3(0xE5,0xBF,0x8C), o3(0xE6,0x8F,0xAE),
-     o3(0xE6,0x9C,0xBA), o3(0xE6,0x97,0x97),
-     o3(0xE6,0x97,0xA2), o3(0xE6,0x9C,0x9F),
-     o3(0xE6,0xA3,0x8B), o3(0xE6,0xA3,0x84),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8A = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8A_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8B_infos[189] = {
-     o3(0xE6,0xA9,0x9F), o3(0xE5,0xB8,0xB0),
-     o3(0xE6,0xAF,0x85), o3(0xE6,0xB0,0x97),
-     o3(0xE6,0xB1,0xBD), o3(0xE7,0x95,0xBF),
-     o3(0xE7,0xA5,0x88), o3(0xE5,0xAD,0xA3),
-     o3(0xE7,0xA8,0x80), o3(0xE7,0xB4,0x80),
-     o3(0xE5,0xBE,0xBD), o3(0xE8,0xA6,0x8F),
-     o3(0xE8,0xA8,0x98), o3(0xE8,0xB2,0xB4),
-     o3(0xE8,0xB5,0xB7), o3(0xE8,0xBB,0x8C),
-     o3(0xE8,0xBC,0x9D), o3(0xE9,0xA3,0xA2),
-     o3(0xE9,0xA8,0x8E), o3(0xE9,0xAC,0xBC),
-     o3(0xE4,0xBA,0x80), o3(0xE5,0x81,0xBD),
-     o3(0xE5,0x84,0x80), o3(0xE5,0xA6,0x93),
-     o3(0xE5,0xAE,0x9C), o3(0xE6,0x88,0xAF),
-     o3(0xE6,0x8A,0x80), o3(0xE6,0x93,0xAC),
-     o3(0xE6,0xAC,0xBA), o3(0xE7,0x8A,0xA0),
-     o3(0xE7,0x96,0x91), o3(0xE7,0xA5,0x87),
-     o3(0xE7,0xBE,0xA9), o3(0xE8,0x9F,0xBB),
-     o3(0xE8,0xAA,0xBC), o3(0xE8,0xAD,0xB0),
-     o3(0xE6,0x8E,0xAC), o3(0xE8,0x8F,0x8A),
-     o3(0xE9,0x9E,0xA0), o3(0xE5,0x90,0x89),
-     o3(0xE5,0x90,0x83), o3(0xE5,0x96,0xAB),
-     o3(0xE6,0xA1,0x94), o3(0xE6,0xA9,0x98),
-     o3(0xE8,0xA9,0xB0), o3(0xE7,0xA0,0xA7),
-     o3(0xE6,0x9D,0xB5), o3(0xE9,0xBB,0x8D),
-     o3(0xE5,0x8D,0xB4), o3(0xE5,0xAE,0xA2),
-     o3(0xE8,0x84,0x9A), o3(0xE8,0x99,0x90),
-     o3(0xE9,0x80,0x86), o3(0xE4,0xB8,0x98),
-     o3(0xE4,0xB9,0x85), o3(0xE4,0xBB,0x87),
-     o3(0xE4,0xBC,0x91), o3(0xE5,0x8F,0x8A),
-     o3(0xE5,0x90,0xB8), o3(0xE5,0xAE,0xAE),
-     o3(0xE5,0xBC,0x93), o3(0xE6,0x80,0xA5),
-     o3(0xE6,0x95,0x91), o3(0xE6,0x9C,0xBD),
-     o3(0xE6,0xB1,0x82), o3(0xE6,0xB1,0xB2),
-     o3(0xE6,0xB3,0xA3), o3(0xE7,0x81,0xB8),
-     o3(0xE7,0x90,0x83), o3(0xE7,0xA9,0xB6),
-     o3(0xE7,0xAA,0xAE), o3(0xE7,0xAC,0x88),
-     o3(0xE7,0xB4,0x9A), o3(0xE7,0xB3,0xBE),
-     o3(0xE7,0xB5,0xA6), o3(0xE6,0x97,0xA7),
-     o3(0xE7,0x89,0x9B), o3(0xE5,0x8E,0xBB),
-     o3(0xE5,0xB1,0x85), o3(0xE5,0xB7,0xA8),
-     o3(0xE6,0x8B,0x92), o3(0xE6,0x8B,0xA0),
-     o3(0xE6,0x8C,0x99), o3(0xE6,0xB8,0xA0),
-     o3(0xE8,0x99,0x9A), o3(0xE8,0xA8,0xB1),
-     o3(0xE8,0xB7,0x9D), o3(0xE9,0x8B,0xB8),
-     o3(0xE6,0xBC,0x81), o3(0xE7,0xA6,0xA6),
-     o3(0xE9,0xAD,0x9A), o3(0xE4,0xBA,0xA8),
-     o3(0xE4,0xBA,0xAB), o3(0xE4,0xBA,0xAC),
-     o3(0xE4,0xBE,0x9B), o3(0xE4,0xBE,0xA0),
-     o3(0xE5,0x83,0x91), o3(0xE5,0x85,0x87),
-     o3(0xE7,0xAB,0xB6), o3(0xE5,0x85,0xB1),
-     o3(0xE5,0x87,0xB6), o3(0xE5,0x8D,0x94),
-     o3(0xE5,0x8C,0xA1), o3(0xE5,0x8D,0xBF),
-     o3(0xE5,0x8F,0xAB), o3(0xE5,0x96,0xAC),
-     o3(0xE5,0xA2,0x83), o3(0xE5,0xB3,0xA1),
-     o3(0xE5,0xBC,0xB7), o3(0xE5,0xBD,0x8A),
-     o3(0xE6,0x80,0xAF), o3(0xE6,0x81,0x90),
-     o3(0xE6,0x81,0xAD), o3(0xE6,0x8C,0x9F),
-     o3(0xE6,0x95,0x99), o3(0xE6,0xA9,0x8B),
-     o3(0xE6,0xB3,0x81), o3(0xE7,0x8B,0x82),
-     o3(0xE7,0x8B,0xAD), o3(0xE7,0x9F,0xAF),
-     o3(0xE8,0x83,0xB8), o3(0xE8,0x84,0x85),
-     o3(0xE8,0x88,0x88), o3(0xE8,0x95,0x8E),
-     o3(0xE9,0x83,0xB7), o3(0xE9,0x8F,0xA1),
-     o3(0xE9,0x9F,0xBF), o3(0xE9,0xA5,0x97),
-     o3(0xE9,0xA9,0x9A), o3(0xE4,0xBB,0xB0),
-     o3(0xE5,0x87,0x9D), o3(0xE5,0xB0,0xAD),
-     o3(0xE6,0x9A,0x81), o3(0xE6,0xA5,0xAD),
-     o3(0xE5,0xB1,0x80), o3(0xE6,0x9B,0xB2),
-     o3(0xE6,0xA5,0xB5), o3(0xE7,0x8E,0x89),
-     o3(0xE6,0xA1,0x90), o3(0xE7,0xB2,0x81),
-     o3(0xE5,0x83,0x85), o3(0xE5,0x8B,0xA4),
-     o3(0xE5,0x9D,0x87), o3(0xE5,0xB7,0xBE),
-     o3(0xE9,0x8C,0xA6), o3(0xE6,0x96,0xA4),
-     o3(0xE6,0xAC,0xA3), o3(0xE6,0xAC,0xBD),
-     o3(0xE7,0x90,0xB4), o3(0xE7,0xA6,0x81),
-     o3(0xE7,0xA6,0xBD), o3(0xE7,0xAD,0x8B),
-     o3(0xE7,0xB7,0x8A), o3(0xE8,0x8A,0xB9),
-     o3(0xE8,0x8F,0x8C), o3(0xE8,0xA1,0xBF),
-     o3(0xE8,0xA5,0x9F), o3(0xE8,0xAC,0xB9),
-     o3(0xE8,0xBF,0x91), o3(0xE9,0x87,0x91),
-     o3(0xE5,0x90,0x9F), o3(0xE9,0x8A,0x80),
-     o3(0xE4,0xB9,0x9D), o3(0xE5,0x80,0xB6),
-     o3(0xE5,0x8F,0xA5), o3(0xE5,0x8C,0xBA),
-     o3(0xE7,0x8B,0x97), o3(0xE7,0x8E,0x96),
-     o3(0xE7,0x9F,0xA9), o3(0xE8,0x8B,0xA6),
-     o3(0xE8,0xBA,0xAF), o3(0xE9,0xA7,0x86),
-     o3(0xE9,0xA7,0x88), o3(0xE9,0xA7,0x92),
-     o3(0xE5,0x85,0xB7), o3(0xE6,0x84,0x9A),
-     o3(0xE8,0x99,0x9E), o3(0xE5,0x96,0xB0),
-     o3(0xE7,0xA9,0xBA), o3(0xE5,0x81,0xB6),
-     o3(0xE5,0xAF,0x93), o3(0xE9,0x81,0x87),
-     o3(0xE9,0x9A,0x85), o3(0xE4,0xB8,0xB2),
-     o3(0xE6,0xAB,0x9B), o3(0xE9,0x87,0xA7),
-     o3(0xE5,0xB1,0x91), o3(0xE5,0xB1,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8B = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8B_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8C_infos[189] = {
-     o3(0xE6,0x8E,0x98), o3(0xE7,0xAA,0x9F),
-     o3(0xE6,0xB2,0x93), o3(0xE9,0x9D,0xB4),
-     o3(0xE8,0xBD,0xA1), o3(0xE7,0xAA,0xAA),
-     o3(0xE7,0x86,0x8A), o3(0xE9,0x9A,0x88),
-     o3(0xE7,0xB2,0x82), o3(0xE6,0xA0,0x97),
-     o3(0xE7,0xB9,0xB0), o3(0xE6,0xA1,0x91),
-     o3(0xE9,0x8D,0xAC), o3(0xE5,0x8B,0xB2),
-     o3(0xE5,0x90,0x9B), o3(0xE8,0x96,0xAB),
-     o3(0xE8,0xA8,0x93), o3(0xE7,0xBE,0xA4),
-     o3(0xE8,0xBB,0x8D), o3(0xE9,0x83,0xA1),
-     o3(0xE5,0x8D,0xA6), o3(0xE8,0xA2,0x88),
-     o3(0xE7,0xA5,0x81), o3(0xE4,0xBF,0x82),
-     o3(0xE5,0x82,0xBE), o3(0xE5,0x88,0x91),
-     o3(0xE5,0x85,0x84), o3(0xE5,0x95,0x93),
-     o3(0xE5,0x9C,0xAD), o3(0xE7,0x8F,0xAA),
-     o3(0xE5,0x9E,0x8B), o3(0xE5,0xA5,0x91),
-     o3(0xE5,0xBD,0xA2), o3(0xE5,0xBE,0x84),
-     o3(0xE6,0x81,0xB5), o3(0xE6,0x85,0xB6),
-     o3(0xE6,0x85,0xA7), o3(0xE6,0x86,0xA9),
-     o3(0xE6,0x8E,0xB2), o3(0xE6,0x90,0xBA),
-     o3(0xE6,0x95,0xAC), o3(0xE6,0x99,0xAF),
-     o3(0xE6,0xA1,0x82), o3(0xE6,0xB8,0x93),
-     o3(0xE7,0x95,0xA6), o3(0xE7,0xA8,0xBD),
-     o3(0xE7,0xB3,0xBB), o3(0xE7,0xB5,0x8C),
-     o3(0xE7,0xB6,0x99), o3(0xE7,0xB9,0x8B),
-     o3(0xE7,0xBD,0xAB), o3(0xE8,0x8C,0x8E),
-     o3(0xE8,0x8D,0x8A), o3(0xE8,0x9B,0x8D),
-     o3(0xE8,0xA8,0x88), o3(0xE8,0xA9,0xA3),
-     o3(0xE8,0xAD,0xA6), o3(0xE8,0xBB,0xBD),
-     o3(0xE9,0xA0,0x9A), o3(0xE9,0xB6,0x8F),
-     o3(0xE8,0x8A,0xB8), o3(0xE8,0xBF,0x8E),
-     o3(0xE9,0xAF,0xA8), o3(0xE5,0x8A,0x87),
-     o3(0xE6,0x88,0x9F), o3(0xE6,0x92,0x83),
-     o3(0xE6,0xBF,0x80), o3(0xE9,0x9A,0x99),
-     o3(0xE6,0xA1,0x81), o3(0xE5,0x82,0x91),
-     o3(0xE6,0xAC,0xA0), o3(0xE6,0xB1,0xBA),
-     o3(0xE6,0xBD,0x94), o3(0xE7,0xA9,0xB4),
-     o3(0xE7,0xB5,0x90), o3(0xE8,0xA1,0x80),
-     o3(0xE8,0xA8,0xA3), o3(0xE6,0x9C,0x88),
-     o3(0xE4,0xBB,0xB6), o3(0xE5,0x80,0xB9),
-     o3(0xE5,0x80,0xA6), o3(0xE5,0x81,0xA5),
-     o3(0xE5,0x85,0xBC), o3(0xE5,0x88,0xB8),
-     o3(0xE5,0x89,0xA3), o3(0xE5,0x96,0xA7),
-     o3(0xE5,0x9C,0x8F), o3(0xE5,0xA0,0x85),
-     o3(0xE5,0xAB,0x8C), o3(0xE5,0xBB,0xBA),
-     o3(0xE6,0x86,0xB2), o3(0xE6,0x87,0xB8),
-     o3(0xE6,0x8B,0xB3), o3(0xE6,0x8D,0xB2),
-     o3(0xE6,0xA4,0x9C), o3(0xE6,0xA8,0xA9),
-     o3(0xE7,0x89,0xBD), o3(0xE7,0x8A,0xAC),
-     o3(0xE7,0x8C,0xAE), o3(0xE7,0xA0,0x94),
-     o3(0xE7,0xA1,0xAF), o3(0xE7,0xB5,0xB9),
-     o3(0xE7,0x9C,0x8C), o3(0xE8,0x82,0xA9),
-     o3(0xE8,0xA6,0x8B), o3(0xE8,0xAC,0x99),
-     o3(0xE8,0xB3,0xA2), o3(0xE8,0xBB,0x92),
-     o3(0xE9,0x81,0xA3), o3(0xE9,0x8D,0xB5),
-     o3(0xE9,0x99,0xBA), o3(0xE9,0xA1,0x95),
-     o3(0xE9,0xA8,0x93), o3(0xE9,0xB9,0xB8),
-     o3(0xE5,0x85,0x83), o3(0xE5,0x8E,0x9F),
-     o3(0xE5,0x8E,0xB3), o3(0xE5,0xB9,0xBB),
-     o3(0xE5,0xBC,0xA6), o3(0xE6,0xB8,0x9B),
-     o3(0xE6,0xBA,0x90), o3(0xE7,0x8E,0x84),
-     o3(0xE7,0x8F,0xBE), o3(0xE7,0xB5,0x83),
-     o3(0xE8,0x88,0xB7), o3(0xE8,0xA8,0x80),
-     o3(0xE8,0xAB,0xBA), o3(0xE9,0x99,0x90),
-     o3(0xE4,0xB9,0x8E), o3(0xE5,0x80,0x8B),
-     o3(0xE5,0x8F,0xA4), o3(0xE5,0x91,0xBC),
-     o3(0xE5,0x9B,0xBA), o3(0xE5,0xA7,0x91),
-     o3(0xE5,0xAD,0xA4), o3(0xE5,0xB7,0xB1),
-     o3(0xE5,0xBA,0xAB), o3(0xE5,0xBC,0xA7),
-     o3(0xE6,0x88,0xB8), o3(0xE6,0x95,0x85),
-     o3(0xE6,0x9E,0xAF), o3(0xE6,0xB9,0x96),
-     o3(0xE7,0x8B,0x90), o3(0xE7,0xB3,0x8A),
-     o3(0xE8,0xA2,0xB4), o3(0xE8,0x82,0xA1),
-     o3(0xE8,0x83,0xA1), o3(0xE8,0x8F,0xB0),
-     o3(0xE8,0x99,0x8E), o3(0xE8,0xAA,0x87),
-     o3(0xE8,0xB7,0xA8), o3(0xE9,0x88,0xB7),
-     o3(0xE9,0x9B,0x87), o3(0xE9,0xA1,0xA7),
-     o3(0xE9,0xBC,0x93), o3(0xE4,0xBA,0x94),
-     o3(0xE4,0xBA,0x92), o3(0xE4,0xBC,0x8D),
-     o3(0xE5,0x8D,0x88), o3(0xE5,0x91,0x89),
-     o3(0xE5,0x90,0xBE), o3(0xE5,0xA8,0xAF),
-     o3(0xE5,0xBE,0x8C), o3(0xE5,0xBE,0xA1),
-     o3(0xE6,0x82,0x9F), o3(0xE6,0xA2,0xA7),
-     o3(0xE6,0xAA,0x8E), o3(0xE7,0x91,0x9A),
-     o3(0xE7,0xA2,0x81), o3(0xE8,0xAA,0x9E),
-     o3(0xE8,0xAA,0xA4), o3(0xE8,0xAD,0xB7),
-     o3(0xE9,0x86,0x90), o3(0xE4,0xB9,0x9E),
-     o3(0xE9,0xAF,0x89), o3(0xE4,0xBA,0xA4),
-     o3(0xE4,0xBD,0xBC), o3(0xE4,0xBE,0xAF),
-     o3(0xE5,0x80,0x99), o3(0xE5,0x80,0x96),
-     o3(0xE5,0x85,0x89), o3(0xE5,0x85,0xAC),
-     o3(0xE5,0x8A,0x9F), o3(0xE5,0x8A,0xB9),
-     o3(0xE5,0x8B,0xBE), o3(0xE5,0x8E,0x9A),
-     o3(0xE5,0x8F,0xA3), o3(0xE5,0x90,0x91),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8C = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8C_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8D_infos[189] = {
-     o3(0xE5,0x90,0x8E), o3(0xE5,0x96,0x89),
-     o3(0xE5,0x9D,0x91), o3(0xE5,0x9E,0xA2),
-     o3(0xE5,0xA5,0xBD), o3(0xE5,0xAD,0x94),
-     o3(0xE5,0xAD,0x9D), o3(0xE5,0xAE,0x8F),
-     o3(0xE5,0xB7,0xA5), o3(0xE5,0xB7,0xA7),
-     o3(0xE5,0xB7,0xB7), o3(0xE5,0xB9,0xB8),
-     o3(0xE5,0xBA,0x83), o3(0xE5,0xBA,0x9A),
-     o3(0xE5,0xBA,0xB7), o3(0xE5,0xBC,0x98),
-     o3(0xE6,0x81,0x92), o3(0xE6,0x85,0x8C),
-     o3(0xE6,0x8A,0x97), o3(0xE6,0x8B,0x98),
-     o3(0xE6,0x8E,0xA7), o3(0xE6,0x94,0xBB),
-     o3(0xE6,0x98,0x82), o3(0xE6,0x99,0x83),
-     o3(0xE6,0x9B,0xB4), o3(0xE6,0x9D,0xAD),
-     o3(0xE6,0xA0,0xA1), o3(0xE6,0xA2,0x97),
-     o3(0xE6,0xA7,0x8B), o3(0xE6,0xB1,0x9F),
-     o3(0xE6,0xB4,0xAA), o3(0xE6,0xB5,0xA9),
-     o3(0xE6,0xB8,0xAF), o3(0xE6,0xBA,0x9D),
-     o3(0xE7,0x94,0xB2), o3(0xE7,0x9A,0x87),
-     o3(0xE7,0xA1,0xAC), o3(0xE7,0xA8,0xBF),
-     o3(0xE7,0xB3,0xA0), o3(0xE7,0xB4,0x85),
-     o3(0xE7,0xB4,0x98), o3(0xE7,0xB5,0x9E),
-     o3(0xE7,0xB6,0xB1), o3(0xE8,0x80,0x95),
-     o3(0xE8,0x80,0x83), o3(0xE8,0x82,0xAF),
-     o3(0xE8,0x82,0xB1), o3(0xE8,0x85,0x94),
-     o3(0xE8,0x86,0x8F), o3(0xE8,0x88,0xAA),
-     o3(0xE8,0x8D,0x92), o3(0xE8,0xA1,0x8C),
-     o3(0xE8,0xA1,0xA1), o3(0xE8,0xAC,0x9B),
-     o3(0xE8,0xB2,0xA2), o3(0xE8,0xB3,0xBC),
-     o3(0xE9,0x83,0x8A), o3(0xE9,0x85,0xB5),
-     o3(0xE9,0x89,0xB1), o3(0xE7,0xA0,0xBF),
-     o3(0xE9,0x8B,0xBC), o3(0xE9,0x96,0xA4),
-     o3(0xE9,0x99,0x8D), o3(0xE9,0xA0,0x85),
-     o3(0xE9,0xA6,0x99), o3(0xE9,0xAB,0x98),
-     o3(0xE9,0xB4,0xBB), o3(0xE5,0x89,0x9B),
-     o3(0xE5,0x8A,0xAB), o3(0xE5,0x8F,0xB7),
-     o3(0xE5,0x90,0x88), o3(0xE5,0xA3,0x95),
-     o3(0xE6,0x8B,0xB7), o3(0xE6,0xBF,0xA0),
-     o3(0xE8,0xB1,0xAA), o3(0xE8,0xBD,0x9F),
-     o3(0xE9,0xBA,0xB9), o3(0xE5,0x85,0x8B),
-     o3(0xE5,0x88,0xBB), o3(0xE5,0x91,0x8A),
-     o3(0xE5,0x9B,0xBD), o3(0xE7,0xA9,0x80),
-     o3(0xE9,0x85,0xB7), o3(0xE9,0xB5,0xA0),
-     o3(0xE9,0xBB,0x92), o3(0xE7,0x8D,0x84),
-     o3(0xE6,0xBC,0x89), o3(0xE8,0x85,0xB0),
-     o3(0xE7,0x94,0x91), o3(0xE5,0xBF,0xBD),
-     o3(0xE6,0x83,0x9A), o3(0xE9,0xAA,0xA8),
-     o3(0xE7,0x8B,0x9B), o3(0xE8,0xBE,0xBC),
-     o3(0xE6,0xAD,0xA4), o3(0xE9,0xA0,0x83),
-     o3(0xE4,0xBB,0x8A), o3(0xE5,0x9B,0xB0),
-     o3(0xE5,0x9D,0xA4), o3(0xE5,0xA2,0xBE),
-     o3(0xE5,0xA9,0x9A), o3(0xE6,0x81,0xA8),
-     o3(0xE6,0x87,0x87), o3(0xE6,0x98,0x8F),
-     o3(0xE6,0x98,0x86), o3(0xE6,0xA0,0xB9),
-     o3(0xE6,0xA2,0xB1), o3(0xE6,0xB7,0xB7),
-     o3(0xE7,0x97,0x95), o3(0xE7,0xB4,0xBA),
-     o3(0xE8,0x89,0xAE), o3(0xE9,0xAD,0x82),
-     o3(0xE4,0xBA,0x9B), o3(0xE4,0xBD,0x90),
-     o3(0xE5,0x8F,0x89), o3(0xE5,0x94,0x86),
-     o3(0xE5,0xB5,0xAF), o3(0xE5,0xB7,0xA6),
-     o3(0xE5,0xB7,0xAE), o3(0xE6,0x9F,0xBB),
-     o3(0xE6,0xB2,0x99), o3(0xE7,0x91,0xB3),
-     o3(0xE7,0xA0,0x82), o3(0xE8,0xA9,0x90),
-     o3(0xE9,0x8E,0x96), o3(0xE8,0xA3,0x9F),
-     o3(0xE5,0x9D,0x90), o3(0xE5,0xBA,0xA7),
-     o3(0xE6,0x8C,0xAB), o3(0xE5,0x82,0xB5),
-     o3(0xE5,0x82,0xAC), o3(0xE5,0x86,0x8D),
-     o3(0xE6,0x9C,0x80), o3(0xE5,0x93,0x89),
-     o3(0xE5,0xA1,0x9E), o3(0xE5,0xA6,0xBB),
-     o3(0xE5,0xAE,0xB0), o3(0xE5,0xBD,0xA9),
-     o3(0xE6,0x89,0x8D), o3(0xE6,0x8E,0xA1),
-     o3(0xE6,0xA0,0xBD), o3(0xE6,0xAD,0xB3),
-     o3(0xE6,0xB8,0x88), o3(0xE7,0x81,0xBD),
-     o3(0xE9,0x87,0x87), o3(0xE7,0x8A,0x80),
-     o3(0xE7,0xA0,0x95), o3(0xE7,0xA0,0xA6),
-     o3(0xE7,0xA5,0xAD), o3(0xE6,0x96,0x8E),
-     o3(0xE7,0xB4,0xB0), o3(0xE8,0x8F,0x9C),
-     o3(0xE8,0xA3,0x81), o3(0xE8,0xBC,0x89),
-     o3(0xE9,0x9A,0x9B), o3(0xE5,0x89,0xA4),
-     o3(0xE5,0x9C,0xA8), o3(0xE6,0x9D,0x90),
-     o3(0xE7,0xBD,0xAA), o3(0xE8,0xB2,0xA1),
-     o3(0xE5,0x86,0xB4), o3(0xE5,0x9D,0x82),
-     o3(0xE9,0x98,0xAA), o3(0xE5,0xA0,0xBA),
-     o3(0xE6,0xA6,0x8A), o3(0xE8,0x82,0xB4),
-     o3(0xE5,0x92,0xB2), o3(0xE5,0xB4,0x8E),
-     o3(0xE5,0x9F,0xBC), o3(0xE7,0xA2,0x95),
-     o3(0xE9,0xB7,0xBA), o3(0xE4,0xBD,0x9C),
-     o3(0xE5,0x89,0x8A), o3(0xE5,0x92,0x8B),
-     o3(0xE6,0x90,0xBE), o3(0xE6,0x98,0xA8),
-     o3(0xE6,0x9C,0x94), o3(0xE6,0x9F,0xB5),
-     o3(0xE7,0xAA,0x84), o3(0xE7,0xAD,0x96),
-     o3(0xE7,0xB4,0xA2), o3(0xE9,0x8C,0xAF),
-     o3(0xE6,0xA1,0x9C), o3(0xE9,0xAE,0xAD),
-     o3(0xE7,0xAC,0xB9), o3(0xE5,0x8C,0x99),
-     o3(0xE5,0x86,0x8A), o3(0xE5,0x88,0xB7),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8D = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8D_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8E_infos[189] = {
-     o3(0xE5,0xAF,0x9F), o3(0xE6,0x8B,0xB6),
-     o3(0xE6,0x92,0xAE), o3(0xE6,0x93,0xA6),
-     o3(0xE6,0x9C,0xAD), o3(0xE6,0xAE,0xBA),
-     o3(0xE8,0x96,0xA9), o3(0xE9,0x9B,0x91),
-     o3(0xE7,0x9A,0x90), o3(0xE9,0xAF,0x96),
-     o3(0xE6,0x8D,0x8C), o3(0xE9,0x8C,0x86),
-     o3(0xE9,0xAE,0xAB), o3(0xE7,0x9A,0xBF),
-     o3(0xE6,0x99,0x92), o3(0xE4,0xB8,0x89),
-     o3(0xE5,0x82,0x98), o3(0xE5,0x8F,0x82),
-     o3(0xE5,0xB1,0xB1), o3(0xE6,0x83,0xA8),
-     o3(0xE6,0x92,0x92), o3(0xE6,0x95,0xA3),
-     o3(0xE6,0xA1,0x9F), o3(0xE7,0x87,0xA6),
-     o3(0xE7,0x8F,0x8A), o3(0xE7,0x94,0xA3),
-     o3(0xE7,0xAE,0x97), o3(0xE7,0xBA,0x82),
-     o3(0xE8,0x9A,0x95), o3(0xE8,0xAE,0x83),
-     o3(0xE8,0xB3,0x9B), o3(0xE9,0x85,0xB8),
-     o3(0xE9,0xA4,0x90), o3(0xE6,0x96,0xAC),
-     o3(0xE6,0x9A,0xAB), o3(0xE6,0xAE,0x8B),
-     o3(0xE4,0xBB,0x95), o3(0xE4,0xBB,0x94),
-     o3(0xE4,0xBC,0xBA), o3(0xE4,0xBD,0xBF),
-     o3(0xE5,0x88,0xBA), o3(0xE5,0x8F,0xB8),
-     o3(0xE5,0x8F,0xB2), o3(0xE5,0x97,0xA3),
-     o3(0xE5,0x9B,0x9B), o3(0xE5,0xA3,0xAB),
-     o3(0xE5,0xA7,0x8B), o3(0xE5,0xA7,0x89),
-     o3(0xE5,0xA7,0xBF), o3(0xE5,0xAD,0x90),
-     o3(0xE5,0xB1,0x8D), o3(0xE5,0xB8,0x82),
-     o3(0xE5,0xB8,0xAB), o3(0xE5,0xBF,0x97),
-     o3(0xE6,0x80,0x9D), o3(0xE6,0x8C,0x87),
-     o3(0xE6,0x94,0xAF), o3(0xE5,0xAD,0x9C),
-     o3(0xE6,0x96,0xAF), o3(0xE6,0x96,0xBD),
-     o3(0xE6,0x97,0xA8), o3(0xE6,0x9E,0x9D),
-     o3(0xE6,0xAD,0xA2), o3(0xE6,0xAD,0xBB),
-     o3(0xE6,0xB0,0x8F), o3(0xE7,0x8D,0x85),
-     o3(0xE7,0xA5,0x89), o3(0xE7,0xA7,0x81),
-     o3(0xE7,0xB3,0xB8), o3(0xE7,0xB4,0x99),
-     o3(0xE7,0xB4,0xAB), o3(0xE8,0x82,0xA2),
-     o3(0xE8,0x84,0x82), o3(0xE8,0x87,0xB3),
-     o3(0xE8,0xA6,0x96), o3(0xE8,0xA9,0x9E),
-     o3(0xE8,0xA9,0xA9), o3(0xE8,0xA9,0xA6),
-     o3(0xE8,0xAA,0x8C), o3(0xE8,0xAB,0xAE),
-     o3(0xE8,0xB3,0x87), o3(0xE8,0xB3,0x9C),
-     o3(0xE9,0x9B,0x8C), o3(0xE9,0xA3,0xBC),
-     o3(0xE6,0xAD,0xAF), o3(0xE4,0xBA,0x8B),
-     o3(0xE4,0xBC,0xBC), o3(0xE4,0xBE,0x8D),
-     o3(0xE5,0x85,0x90), o3(0xE5,0xAD,0x97),
-     o3(0xE5,0xAF,0xBA), o3(0xE6,0x85,0x88),
-     o3(0xE6,0x8C,0x81), o3(0xE6,0x99,0x82),
-     o3(0xE6,0xAC,0xA1), o3(0xE6,0xBB,0x8B),
-     o3(0xE6,0xB2,0xBB), o3(0xE7,0x88,0xBE),
-     o3(0xE7,0x92,0xBD), o3(0xE7,0x97,0x94),
-     o3(0xE7,0xA3,0x81), o3(0xE7,0xA4,0xBA),
-     o3(0xE8,0x80,0x8C), o3(0xE8,0x80,0xB3),
-     o3(0xE8,0x87,0xAA), o3(0xE8,0x92,0x94),
-     o3(0xE8,0xBE,0x9E), o3(0xE6,0xB1,0x90),
-     o3(0xE9,0xB9,0xBF), o3(0xE5,0xBC,0x8F),
-     o3(0xE8,0xAD,0x98), o3(0xE9,0xB4,0xAB),
-     o3(0xE7,0xAB,0xBA), o3(0xE8,0xBB,0xB8),
-     o3(0xE5,0xAE,0x8D), o3(0xE9,0x9B,0xAB),
-     o3(0xE4,0xB8,0x83), o3(0xE5,0x8F,0xB1),
-     o3(0xE5,0x9F,0xB7), o3(0xE5,0xA4,0xB1),
-     o3(0xE5,0xAB,0x89), o3(0xE5,0xAE,0xA4),
-     o3(0xE6,0x82,0x89), o3(0xE6,0xB9,0xBF),
-     o3(0xE6,0xBC,0x86), o3(0xE7,0x96,0xBE),
-     o3(0xE8,0xB3,0xAA), o3(0xE5,0xAE,0x9F),
-     o3(0xE8,0x94,0x80), o3(0xE7,0xAF,0xA0),
-     o3(0xE5,0x81,0xB2), o3(0xE6,0x9F,0xB4),
-     o3(0xE8,0x8A,0x9D), o3(0xE5,0xB1,0xA1),
-     o3(0xE8,0x95,0x8A), o3(0xE7,0xB8,0x9E),
-     o3(0xE8,0x88,0x8E), o3(0xE5,0x86,0x99),
-     o3(0xE5,0xB0,0x84), o3(0xE6,0x8D,0xA8),
-     o3(0xE8,0xB5,0xA6), o3(0xE6,0x96,0x9C),
-     o3(0xE7,0x85,0xAE), o3(0xE7,0xA4,0xBE),
-     o3(0xE7,0xB4,0x97), o3(0xE8,0x80,0x85),
-     o3(0xE8,0xAC,0x9D), o3(0xE8,0xBB,0x8A),
-     o3(0xE9,0x81,0xAE), o3(0xE8,0x9B,0x87),
-     o3(0xE9,0x82,0xAA), o3(0xE5,0x80,0x9F),
-     o3(0xE5,0x8B,0xBA), o3(0xE5,0xB0,0xBA),
-     o3(0xE6,0x9D,0x93), o3(0xE7,0x81,0xBC),
-     o3(0xE7,0x88,0xB5), o3(0xE9,0x85,0x8C),
-     o3(0xE9,0x87,0x88), o3(0xE9,0x8C,0xAB),
-     o3(0xE8,0x8B,0xA5), o3(0xE5,0xAF,0x82),
-     o3(0xE5,0xBC,0xB1), o3(0xE6,0x83,0xB9),
-     o3(0xE4,0xB8,0xBB), o3(0xE5,0x8F,0x96),
-     o3(0xE5,0xAE,0x88), o3(0xE6,0x89,0x8B),
-     o3(0xE6,0x9C,0xB1), o3(0xE6,0xAE,0x8A),
-     o3(0xE7,0x8B,0xA9), o3(0xE7,0x8F,0xA0),
-     o3(0xE7,0xA8,0xAE), o3(0xE8,0x85,0xAB),
-     o3(0xE8,0xB6,0xA3), o3(0xE9,0x85,0x92),
-     o3(0xE9,0xA6,0x96), o3(0xE5,0x84,0x92),
-     o3(0xE5,0x8F,0x97), o3(0xE5,0x91,0xAA),
-     o3(0xE5,0xAF,0xBF), o3(0xE6,0x8E,0x88),
-     o3(0xE6,0xA8,0xB9), o3(0xE7,0xB6,0xAC),
-     o3(0xE9,0x9C,0x80), o3(0xE5,0x9B,0x9A),
-     o3(0xE5,0x8F,0x8E), o3(0xE5,0x91,0xA8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8E = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8E_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_8F_infos[189] = {
-     o3(0xE5,0xAE,0x97), o3(0xE5,0xB0,0xB1),
-     o3(0xE5,0xB7,0x9E), o3(0xE4,0xBF,0xAE),
-     o3(0xE6,0x84,0x81), o3(0xE6,0x8B,0xBE),
-     o3(0xE6,0xB4,0xB2), o3(0xE7,0xA7,0x80),
-     o3(0xE7,0xA7,0x8B), o3(0xE7,0xB5,0x82),
-     o3(0xE7,0xB9,0x8D), o3(0xE7,0xBF,0x92),
-     o3(0xE8,0x87,0xAD), o3(0xE8,0x88,0x9F),
-     o3(0xE8,0x92,0x90), o3(0xE8,0xA1,0x86),
-     o3(0xE8,0xA5,0xB2), o3(0xE8,0xAE,0x90),
-     o3(0xE8,0xB9,0xB4), o3(0xE8,0xBC,0xAF),
-     o3(0xE9,0x80,0xB1), o3(0xE9,0x85,0x8B),
-     o3(0xE9,0x85,0xAC), o3(0xE9,0x9B,0x86),
-     o3(0xE9,0x86,0x9C), o3(0xE4,0xBB,0x80),
-     o3(0xE4,0xBD,0x8F), o3(0xE5,0x85,0x85),
-     o3(0xE5,0x8D,0x81), o3(0xE5,0xBE,0x93),
-     o3(0xE6,0x88,0x8E), o3(0xE6,0x9F,0x94),
-     o3(0xE6,0xB1,0x81), o3(0xE6,0xB8,0x8B),
-     o3(0xE7,0x8D,0xA3), o3(0xE7,0xB8,0xA6),
-     o3(0xE9,0x87,0x8D), o3(0xE9,0x8A,0x83),
-     o3(0xE5,0x8F,0x94), o3(0xE5,0xA4,0x99),
-     o3(0xE5,0xAE,0xBF), o3(0xE6,0xB7,0x91),
-     o3(0xE7,0xA5,0x9D), o3(0xE7,0xB8,0xAE),
-     o3(0xE7,0xB2,0x9B), o3(0xE5,0xA1,0xBE),
-     o3(0xE7,0x86,0x9F), o3(0xE5,0x87,0xBA),
-     o3(0xE8,0xA1,0x93), o3(0xE8,0xBF,0xB0),
-     o3(0xE4,0xBF,0x8A), o3(0xE5,0xB3,0xBB),
-     o3(0xE6,0x98,0xA5), o3(0xE7,0x9E,0xAC),
-     o3(0xE7,0xAB,0xA3), o3(0xE8,0x88,0x9C),
-     o3(0xE9,0xA7,0xBF), o3(0xE5,0x87,0x86),
-     o3(0xE5,0xBE,0xAA), o3(0xE6,0x97,0xAC),
-     o3(0xE6,0xA5,0xAF), o3(0xE6,0xAE,0x89),
-     o3(0xE6,0xB7,0xB3), o3(0xE6,0xBA,0x96),
-     o3(0xE6,0xBD,0xA4), o3(0xE7,0x9B,0xBE),
-     o3(0xE7,0xB4,0x94), o3(0xE5,0xB7,0xA1),
-     o3(0xE9,0x81,0xB5), o3(0xE9,0x86,0x87),
-     o3(0xE9,0xA0,0x86), o3(0xE5,0x87,0xA6),
-     o3(0xE5,0x88,0x9D), o3(0xE6,0x89,0x80),
-     o3(0xE6,0x9A,0x91), o3(0xE6,0x9B,0x99),
-     o3(0xE6,0xB8,0x9A), o3(0xE5,0xBA,0xB6),
-     o3(0xE7,0xB7,0x92), o3(0xE7,0xBD,0xB2),
-     o3(0xE6,0x9B,0xB8), o3(0xE8,0x96,0xAF),
-     o3(0xE8,0x97,0xB7), o3(0xE8,0xAB,0xB8),
-     o3(0xE5,0x8A,0xA9), o3(0xE5,0x8F,0x99),
-     o3(0xE5,0xA5,0xB3), o3(0xE5,0xBA,0x8F),
-     o3(0xE5,0xBE,0x90), o3(0xE6,0x81,0x95),
-     o3(0xE9,0x8B,0xA4), o3(0xE9,0x99,0xA4),
-     o3(0xE5,0x82,0xB7), o3(0xE5,0x84,0x9F),
-     o3(0xE5,0x8B,0x9D), o3(0xE5,0x8C,0xA0),
-     o3(0xE5,0x8D,0x87), o3(0xE5,0x8F,0xAC),
-     o3(0xE5,0x93,0xA8), o3(0xE5,0x95,0x86),
-     o3(0xE5,0x94,0xB1), o3(0xE5,0x98,0x97),
-     o3(0xE5,0xA5,0xA8), o3(0xE5,0xA6,0xBE),
-     o3(0xE5,0xA8,0xBC), o3(0xE5,0xAE,0xB5),
-     o3(0xE5,0xB0,0x86), o3(0xE5,0xB0,0x8F),
-     o3(0xE5,0xB0,0x91), o3(0xE5,0xB0,0x9A),
-     o3(0xE5,0xBA,0x84), o3(0xE5,0xBA,0x8A),
-     o3(0xE5,0xBB,0xA0), o3(0xE5,0xBD,0xB0),
-     o3(0xE6,0x89,0xBF), o3(0xE6,0x8A,0x84),
-     o3(0xE6,0x8B,0x9B), o3(0xE6,0x8E,0x8C),
-     o3(0xE6,0x8D,0xB7), o3(0xE6,0x98,0x87),
-     o3(0xE6,0x98,0x8C), o3(0xE6,0x98,0xAD),
-     o3(0xE6,0x99,0xB6), o3(0xE6,0x9D,0xBE),
-     o3(0xE6,0xA2,0xA2), o3(0xE6,0xA8,0x9F),
-     o3(0xE6,0xA8,0xB5), o3(0xE6,0xB2,0xBC),
-     o3(0xE6,0xB6,0x88), o3(0xE6,0xB8,0x89),
-     o3(0xE6,0xB9,0x98), o3(0xE7,0x84,0xBC),
-     o3(0xE7,0x84,0xA6), o3(0xE7,0x85,0xA7),
-     o3(0xE7,0x97,0x87), o3(0xE7,0x9C,0x81),
-     o3(0xE7,0xA1,0x9D), o3(0xE7,0xA4,0x81),
-     o3(0xE7,0xA5,0xA5), o3(0xE7,0xA7,0xB0),
-     o3(0xE7,0xAB,0xA0), o3(0xE7,0xAC,0x91),
-     o3(0xE7,0xB2,0xA7), o3(0xE7,0xB4,0xB9),
-     o3(0xE8,0x82,0x96), o3(0xE8,0x8F,0x96),
-     o3(0xE8,0x92,0x8B), o3(0xE8,0x95,0x89),
-     o3(0xE8,0xA1,0x9D), o3(0xE8,0xA3,0xB3),
-     o3(0xE8,0xA8,0x9F), o3(0xE8,0xA8,0xBC),
-     o3(0xE8,0xA9,0x94), o3(0xE8,0xA9,0xB3),
-     o3(0xE8,0xB1,0xA1), o3(0xE8,0xB3,0x9E),
-     o3(0xE9,0x86,0xA4), o3(0xE9,0x89,0xA6),
-     o3(0xE9,0x8D,0xBE), o3(0xE9,0x90,0x98),
-     o3(0xE9,0x9A,0x9C), o3(0xE9,0x9E,0x98),
-     o3(0xE4,0xB8,0x8A), o3(0xE4,0xB8,0x88),
-     o3(0xE4,0xB8,0x9E), o3(0xE4,0xB9,0x97),
-     o3(0xE5,0x86,0x97), o3(0xE5,0x89,0xB0),
-     o3(0xE5,0x9F,0x8E), o3(0xE5,0xA0,0xB4),
-     o3(0xE5,0xA3,0x8C), o3(0xE5,0xAC,0xA2),
-     o3(0xE5,0xB8,0xB8), o3(0xE6,0x83,0x85),
-     o3(0xE6,0x93,0xBE), o3(0xE6,0x9D,0xA1),
-     o3(0xE6,0x9D,0x96), o3(0xE6,0xB5,0x84),
-     o3(0xE7,0x8A,0xB6), o3(0xE7,0x95,0xB3),
-     o3(0xE7,0xA9,0xA3), o3(0xE8,0x92,0xB8),
-     o3(0xE8,0xAD,0xB2), o3(0xE9,0x86,0xB8),
-     o3(0xE9,0x8C,0xA0), o3(0xE5,0x98,0xB1),
-     o3(0xE5,0x9F,0xB4), o3(0xE9,0xA3,0xBE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_8F = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_8F_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_90_infos[189] = {
-     o3(0xE6,0x8B,0xAD), o3(0xE6,0xA4,0x8D),
-     o3(0xE6,0xAE,0x96), o3(0xE7,0x87,0xAD),
-     o3(0xE7,0xB9,0x94), o3(0xE8,0x81,0xB7),
-     o3(0xE8,0x89,0xB2), o3(0xE8,0xA7,0xA6),
-     o3(0xE9,0xA3,0x9F), o3(0xE8,0x9D,0x95),
-     o3(0xE8,0xBE,0xB1), o3(0xE5,0xB0,0xBB),
-     o3(0xE4,0xBC,0xB8), o3(0xE4,0xBF,0xA1),
-     o3(0xE4,0xBE,0xB5), o3(0xE5,0x94,0x87),
-     o3(0xE5,0xA8,0xA0), o3(0xE5,0xAF,0x9D),
-     o3(0xE5,0xAF,0xA9), o3(0xE5,0xBF,0x83),
-     o3(0xE6,0x85,0x8E), o3(0xE6,0x8C,0xAF),
-     o3(0xE6,0x96,0xB0), o3(0xE6,0x99,0x8B),
-     o3(0xE6,0xA3,0xAE), o3(0xE6,0xA6,0x9B),
-     o3(0xE6,0xB5,0xB8), o3(0xE6,0xB7,0xB1),
-     o3(0xE7,0x94,0xB3), o3(0xE7,0x96,0xB9),
-     o3(0xE7,0x9C,0x9F), o3(0xE7,0xA5,0x9E),
-     o3(0xE7,0xA7,0xA6), o3(0xE7,0xB4,0xB3),
-     o3(0xE8,0x87,0xA3), o3(0xE8,0x8A,0xAF),
-     o3(0xE8,0x96,0xAA), o3(0xE8,0xA6,0xAA),
-     o3(0xE8,0xA8,0xBA), o3(0xE8,0xBA,0xAB),
-     o3(0xE8,0xBE,0x9B), o3(0xE9,0x80,0xB2),
-     o3(0xE9,0x87,0x9D), o3(0xE9,0x9C,0x87),
-     o3(0xE4,0xBA,0xBA), o3(0xE4,0xBB,0x81),
-     o3(0xE5,0x88,0x83), o3(0xE5,0xA1,0xB5),
-     o3(0xE5,0xA3,0xAC), o3(0xE5,0xB0,0x8B),
-     o3(0xE7,0x94,0x9A), o3(0xE5,0xB0,0xBD),
-     o3(0xE8,0x85,0x8E), o3(0xE8,0xA8,0x8A),
-     o3(0xE8,0xBF,0x85), o3(0xE9,0x99,0xA3),
-     o3(0xE9,0x9D,0xAD), o3(0xE7,0xAC,0xA5),
-     o3(0xE8,0xAB,0x8F), o3(0xE9,0xA0,0x88),
-     o3(0xE9,0x85,0xA2), o3(0xE5,0x9B,0xB3),
-     o3(0xE5,0x8E,0xA8), o3(0xE9,0x80,0x97),
-     o3(0xE5,0x90,0xB9), o3(0xE5,0x9E,0x82),
-     o3(0xE5,0xB8,0xA5), o3(0xE6,0x8E,0xA8),
-     o3(0xE6,0xB0,0xB4), o3(0xE7,0x82,0x8A),
-     o3(0xE7,0x9D,0xA1), o3(0xE7,0xB2,0x8B),
-     o3(0xE7,0xBF,0xA0), o3(0xE8,0xA1,0xB0),
-     o3(0xE9,0x81,0x82), o3(0xE9,0x85,0x94),
-     o3(0xE9,0x8C,0x90), o3(0xE9,0x8C,0x98),
-     o3(0xE9,0x9A,0x8F), o3(0xE7,0x91,0x9E),
-     o3(0xE9,0xAB,0x84), o3(0xE5,0xB4,0x87),
-     o3(0xE5,0xB5,0xA9), o3(0xE6,0x95,0xB0),
-     o3(0xE6,0x9E,0xA2), o3(0xE8,0xB6,0xA8),
-     o3(0xE9,0x9B,0x9B), o3(0xE6,0x8D,0xAE),
-     o3(0xE6,0x9D,0x89), o3(0xE6,0xA4,0x99),
-     o3(0xE8,0x8F,0x85), o3(0xE9,0xA0,0x97),
-     o3(0xE9,0x9B,0x80), o3(0xE8,0xA3,0xBE),
-     o3(0xE6,0xBE,0x84), o3(0xE6,0x91,0xBA),
-     o3(0xE5,0xAF,0xB8), o3(0xE4,0xB8,0x96),
-     o3(0xE7,0x80,0xAC), o3(0xE7,0x95,0x9D),
-     o3(0xE6,0x98,0xAF), o3(0xE5,0x87,0x84),
-     o3(0xE5,0x88,0xB6), o3(0xE5,0x8B,0xA2),
-     o3(0xE5,0xA7,0x93), o3(0xE5,0xBE,0x81),
-     o3(0xE6,0x80,0xA7), o3(0xE6,0x88,0x90),
-     o3(0xE6,0x94,0xBF), o3(0xE6,0x95,0xB4),
-     o3(0xE6,0x98,0x9F), o3(0xE6,0x99,0xB4),
-     o3(0xE6,0xA3,0xB2), o3(0xE6,0xA0,0x96),
-     o3(0xE6,0xAD,0xA3), o3(0xE6,0xB8,0x85),
-     o3(0xE7,0x89,0xB2), o3(0xE7,0x94,0x9F),
-     o3(0xE7,0x9B,0x9B), o3(0xE7,0xB2,0xBE),
-     o3(0xE8,0x81,0x96), o3(0xE5,0xA3,0xB0),
-     o3(0xE8,0xA3,0xBD), o3(0xE8,0xA5,0xBF),
-     o3(0xE8,0xAA,0xA0), o3(0xE8,0xAA,0x93),
-     o3(0xE8,0xAB,0x8B), o3(0xE9,0x80,0x9D),
-     o3(0xE9,0x86,0x92), o3(0xE9,0x9D,0x92),
-     o3(0xE9,0x9D,0x99), o3(0xE6,0x96,0x89),
-     o3(0xE7,0xA8,0x8E), o3(0xE8,0x84,0x86),
-     o3(0xE9,0x9A,0xBB), o3(0xE5,0xB8,0xAD),
-     o3(0xE6,0x83,0x9C), o3(0xE6,0x88,0x9A),
-     o3(0xE6,0x96,0xA5), o3(0xE6,0x98,0x94),
-     o3(0xE6,0x9E,0x90), o3(0xE7,0x9F,0xB3),
-     o3(0xE7,0xA9,0x8D), o3(0xE7,0xB1,0x8D),
-     o3(0xE7,0xB8,0xBE), o3(0xE8,0x84,0x8A),
-     o3(0xE8,0xB2,0xAC), o3(0xE8,0xB5,0xA4),
-     o3(0xE8,0xB7,0xA1), o3(0xE8,0xB9,0x9F),
-     o3(0xE7,0xA2,0xA9), o3(0xE5,0x88,0x87),
-     o3(0xE6,0x8B,0x99), o3(0xE6,0x8E,0xA5),
-     o3(0xE6,0x91,0x82), o3(0xE6,0x8A,0x98),
-     o3(0xE8,0xA8,0xAD), o3(0xE7,0xAA,0x83),
-     o3(0xE7,0xAF,0x80), o3(0xE8,0xAA,0xAC),
-     o3(0xE9,0x9B,0xAA), o3(0xE7,0xB5,0xB6),
-     o3(0xE8,0x88,0x8C), o3(0xE8,0x9D,0x89),
-     o3(0xE4,0xBB,0x99), o3(0xE5,0x85,0x88),
-     o3(0xE5,0x8D,0x83), o3(0xE5,0x8D,0xA0),
-     o3(0xE5,0xAE,0xA3), o3(0xE5,0xB0,0x82),
-     o3(0xE5,0xB0,0x96), o3(0xE5,0xB7,0x9D),
-     o3(0xE6,0x88,0xA6), o3(0xE6,0x89,0x87),
-     o3(0xE6,0x92,0xB0), o3(0xE6,0xA0,0x93),
-     o3(0xE6,0xA0,0xB4), o3(0xE6,0xB3,0x89),
-     o3(0xE6,0xB5,0x85), o3(0xE6,0xB4,0x97),
-     o3(0xE6,0x9F,0x93), o3(0xE6,0xBD,0x9C),
-     o3(0xE7,0x85,0x8E), o3(0xE7,0x85,0xBD),
-     o3(0xE6,0x97,0x8B), o3(0xE7,0xA9,0xBF),
-     o3(0xE7,0xAE,0xAD), o3(0xE7,0xB7,0x9A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_90 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_90_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_91_infos[189] = {
-     o3(0xE7,0xB9,0x8A), o3(0xE7,0xBE,0xA8),
-     o3(0xE8,0x85,0xBA), o3(0xE8,0x88,0x9B),
-     o3(0xE8,0x88,0xB9), o3(0xE8,0x96,0xA6),
-     o3(0xE8,0xA9,0xAE), o3(0xE8,0xB3,0x8E),
-     o3(0xE8,0xB7,0xB5), o3(0xE9,0x81,0xB8),
-     o3(0xE9,0x81,0xB7), o3(0xE9,0x8A,0xAD),
-     o3(0xE9,0x8A,0x91), o3(0xE9,0x96,0x83),
-     o3(0xE9,0xAE,0xAE), o3(0xE5,0x89,0x8D),
-     o3(0xE5,0x96,0x84), o3(0xE6,0xBC,0xB8),
-     o3(0xE7,0x84,0xB6), o3(0xE5,0x85,0xA8),
-     o3(0xE7,0xA6,0x85), o3(0xE7,0xB9,0x95),
-     o3(0xE8,0x86,0xB3), o3(0xE7,0xB3,0x8E),
-     o3(0xE5,0x99,0x8C), o3(0xE5,0xA1,0x91),
-     o3(0xE5,0xB2,0xA8), o3(0xE6,0x8E,0xAA),
-     o3(0xE6,0x9B,0xBE), o3(0xE6,0x9B,0xBD),
-     o3(0xE6,0xA5,0x9A), o3(0xE7,0x8B,0x99),
-     o3(0xE7,0x96,0x8F), o3(0xE7,0x96,0x8E),
-     o3(0xE7,0xA4,0x8E), o3(0xE7,0xA5,0x96),
-     o3(0xE7,0xA7,0x9F), o3(0xE7,0xB2,0x97),
-     o3(0xE7,0xB4,0xA0), o3(0xE7,0xB5,0x84),
-     o3(0xE8,0x98,0x87), o3(0xE8,0xA8,0xB4),
-     o3(0xE9,0x98,0xBB), o3(0xE9,0x81,0xA1),
-     o3(0xE9,0xBC,0xA0), o3(0xE5,0x83,0xA7),
-     o3(0xE5,0x89,0xB5), o3(0xE5,0x8F,0x8C),
-     o3(0xE5,0x8F,0xA2), o3(0xE5,0x80,0x89),
-     o3(0xE5,0x96,0xAA), o3(0xE5,0xA3,0xAE),
-     o3(0xE5,0xA5,0x8F), o3(0xE7,0x88,0xBD),
-     o3(0xE5,0xAE,0x8B), o3(0xE5,0xB1,0xA4),
-     o3(0xE5,0x8C,0x9D), o3(0xE6,0x83,0xA3),
-     o3(0xE6,0x83,0xB3), o3(0xE6,0x8D,0x9C),
-     o3(0xE6,0x8E,0x83), o3(0xE6,0x8C,0xBF),
-     o3(0xE6,0x8E,0xBB), o3(0xE6,0x93,0x8D),
-     o3(0xE6,0x97,0xA9), o3(0xE6,0x9B,0xB9),
-     o3(0xE5,0xB7,0xA3), o3(0xE6,0xA7,0x8D),
-     o3(0xE6,0xA7,0xBD), o3(0xE6,0xBC,0x95),
-     o3(0xE7,0x87,0xA5), o3(0xE4,0xBA,0x89),
-     o3(0xE7,0x97,0xA9), o3(0xE7,0x9B,0xB8),
-     o3(0xE7,0xAA,0x93), o3(0xE7,0xB3,0x9F),
-     o3(0xE7,0xB7,0x8F), o3(0xE7,0xB6,0x9C),
-     o3(0xE8,0x81,0xA1), o3(0xE8,0x8D,0x89),
-     o3(0xE8,0x8D,0x98), o3(0xE8,0x91,0xAC),
-     o3(0xE8,0x92,0xBC), o3(0xE8,0x97,0xBB),
-     o3(0xE8,0xA3,0x85), o3(0xE8,0xB5,0xB0),
-     o3(0xE9,0x80,0x81), o3(0xE9,0x81,0xAD),
-     o3(0xE9,0x8E,0x97), o3(0xE9,0x9C,0x9C),
-     o3(0xE9,0xA8,0x92), o3(0xE5,0x83,0x8F),
-     o3(0xE5,0xA2,0x97), o3(0xE6,0x86,0x8E),
-     o3(0xE8,0x87,0x93), o3(0xE8,0x94,0xB5),
-     o3(0xE8,0xB4,0x88), o3(0xE9,0x80,0xA0),
-     o3(0xE4,0xBF,0x83), o3(0xE5,0x81,0xB4),
-     o3(0xE5,0x89,0x87), o3(0xE5,0x8D,0xB3),
-     o3(0xE6,0x81,0xAF), o3(0xE6,0x8D,0x89),
-     o3(0xE6,0x9D,0x9F), o3(0xE6,0xB8,0xAC),
-     o3(0xE8,0xB6,0xB3), o3(0xE9,0x80,0x9F),
-     o3(0xE4,0xBF,0x97), o3(0xE5,0xB1,0x9E),
-     o3(0xE8,0xB3,0x8A), o3(0xE6,0x97,0x8F),
-     o3(0xE7,0xB6,0x9A), o3(0xE5,0x8D,0x92),
-     o3(0xE8,0xA2,0x96), o3(0xE5,0x85,0xB6),
-     o3(0xE6,0x8F,0x83), o3(0xE5,0xAD,0x98),
-     o3(0xE5,0xAD,0xAB), o3(0xE5,0xB0,0x8A),
-     o3(0xE6,0x90,0x8D), o3(0xE6,0x9D,0x91),
-     o3(0xE9,0x81,0x9C), o3(0xE4,0xBB,0x96),
-     o3(0xE5,0xA4,0x9A), o3(0xE5,0xA4,0xAA),
-     o3(0xE6,0xB1,0xB0), o3(0xE8,0xA9,0x91),
-     o3(0xE5,0x94,0xBE), o3(0xE5,0xA0,0x95),
-     o3(0xE5,0xA6,0xA5), o3(0xE6,0x83,0xB0),
-     o3(0xE6,0x89,0x93), o3(0xE6,0x9F,0x81),
-     o3(0xE8,0x88,0xB5), o3(0xE6,0xA5,0x95),
-     o3(0xE9,0x99,0x80), o3(0xE9,0xA7,0x84),
-     o3(0xE9,0xA8,0xA8), o3(0xE4,0xBD,0x93),
-     o3(0xE5,0xA0,0x86), o3(0xE5,0xAF,0xBE),
-     o3(0xE8,0x80,0x90), o3(0xE5,0xB2,0xB1),
-     o3(0xE5,0xB8,0xAF), o3(0xE5,0xBE,0x85),
-     o3(0xE6,0x80,0xA0), o3(0xE6,0x85,0x8B),
-     o3(0xE6,0x88,0xB4), o3(0xE6,0x9B,0xBF),
-     o3(0xE6,0xB3,0xB0), o3(0xE6,0xBB,0x9E),
-     o3(0xE8,0x83,0x8E), o3(0xE8,0x85,0xBF),
-     o3(0xE8,0x8B,0x94), o3(0xE8,0xA2,0x8B),
-     o3(0xE8,0xB2,0xB8), o3(0xE9,0x80,0x80),
-     o3(0xE9,0x80,0xAE), o3(0xE9,0x9A,0x8A),
-     o3(0xE9,0xBB,0x9B), o3(0xE9,0xAF,0x9B),
-     o3(0xE4,0xBB,0xA3), o3(0xE5,0x8F,0xB0),
-     o3(0xE5,0xA4,0xA7), o3(0xE7,0xAC,0xAC),
-     o3(0xE9,0x86,0x8D), o3(0xE9,0xA1,0x8C),
-     o3(0xE9,0xB7,0xB9), o3(0xE6,0xBB,0x9D),
-     o3(0xE7,0x80,0xA7), o3(0xE5,0x8D,0x93),
-     o3(0xE5,0x95,0x84), o3(0xE5,0xAE,0x85),
-     o3(0xE6,0x89,0x98), o3(0xE6,0x8A,0x9E),
-     o3(0xE6,0x8B,0x93), o3(0xE6,0xB2,0xA2),
-     o3(0xE6,0xBF,0xAF), o3(0xE7,0x90,0xA2),
-     o3(0xE8,0xA8,0x97), o3(0xE9,0x90,0xB8),
-     o3(0xE6,0xBF,0x81), o3(0xE8,0xAB,0xBE),
-     o3(0xE8,0x8C,0xB8), o3(0xE5,0x87,0xA7),
-     o3(0xE8,0x9B,0xB8), o3(0xE5,0x8F,0xAA),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_91 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_91_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_92_infos[189] = {
-     o3(0xE5,0x8F,0xA9), o3(0xE4,0xBD,0x86),
-     o3(0xE9,0x81,0x94), o3(0xE8,0xBE,0xB0),
-     o3(0xE5,0xA5,0xAA), o3(0xE8,0x84,0xB1),
-     o3(0xE5,0xB7,0xBD), o3(0xE7,0xAB,0xAA),
-     o3(0xE8,0xBE,0xBF), o3(0xE6,0xA3,0x9A),
-     o3(0xE8,0xB0,0xB7), o3(0xE7,0x8B,0xB8),
-     o3(0xE9,0xB1,0x88), o3(0xE6,0xA8,0xBD),
-     o3(0xE8,0xAA,0xB0), o3(0xE4,0xB8,0xB9),
-     o3(0xE5,0x8D,0x98), o3(0xE5,0x98,0x86),
-     o3(0xE5,0x9D,0xA6), o3(0xE6,0x8B,0x85),
-     o3(0xE6,0x8E,0xA2), o3(0xE6,0x97,0xA6),
-     o3(0xE6,0xAD,0x8E), o3(0xE6,0xB7,0xA1),
-     o3(0xE6,0xB9,0x9B), o3(0xE7,0x82,0xAD),
-     o3(0xE7,0x9F,0xAD), o3(0xE7,0xAB,0xAF),
-     o3(0xE7,0xAE,0xAA), o3(0xE7,0xB6,0xBB),
-     o3(0xE8,0x80,0xBD), o3(0xE8,0x83,0x86),
-     o3(0xE8,0x9B,0x8B), o3(0xE8,0xAA,0x95),
-     o3(0xE9,0x8D,0x9B), o3(0xE5,0x9B,0xA3),
-     o3(0xE5,0xA3,0x87), o3(0xE5,0xBC,0xBE),
-     o3(0xE6,0x96,0xAD), o3(0xE6,0x9A,0x96),
-     o3(0xE6,0xAA,0x80), o3(0xE6,0xAE,0xB5),
-     o3(0xE7,0x94,0xB7), o3(0xE8,0xAB,0x87),
-     o3(0xE5,0x80,0xA4), o3(0xE7,0x9F,0xA5),
-     o3(0xE5,0x9C,0xB0), o3(0xE5,0xBC,0x9B),
-     o3(0xE6,0x81,0xA5), o3(0xE6,0x99,0xBA),
-     o3(0xE6,0xB1,0xA0), o3(0xE7,0x97,0xB4),
-     o3(0xE7,0xA8,0x9A), o3(0xE7,0xBD,0xAE),
-     o3(0xE8,0x87,0xB4), o3(0xE8,0x9C,0x98),
-     o3(0xE9,0x81,0x85), o3(0xE9,0xA6,0xB3),
-     o3(0xE7,0xAF,0x89), o3(0xE7,0x95,0x9C),
-     o3(0xE7,0xAB,0xB9), o3(0xE7,0xAD,0x91),
-     o3(0xE8,0x93,0x84), o3(0xE9,0x80,0x90),
-     o3(0xE7,0xA7,0xA9), o3(0xE7,0xAA,0x92),
-     o3(0xE8,0x8C,0xB6), o3(0xE5,0xAB,0xA1),
-     o3(0xE7,0x9D,0x80), o3(0xE4,0xB8,0xAD),
-     o3(0xE4,0xBB,0xB2), o3(0xE5,0xAE,0x99),
-     o3(0xE5,0xBF,0xA0), o3(0xE6,0x8A,0xBD),
-     o3(0xE6,0x98,0xBC), o3(0xE6,0x9F,0xB1),
-     o3(0xE6,0xB3,0xA8), o3(0xE8,0x99,0xAB),
-     o3(0xE8,0xA1,0xB7), o3(0xE8,0xA8,0xBB),
-     o3(0xE9,0x85,0x8E), o3(0xE9,0x8B,0xB3),
-     o3(0xE9,0xA7,0x90), o3(0xE6,0xA8,0x97),
-     o3(0xE7,0x80,0xA6), o3(0xE7,0x8C,0xAA),
-     o3(0xE8,0x8B,0xA7), o3(0xE8,0x91,0x97),
-     o3(0xE8,0xB2,0xAF), o3(0xE4,0xB8,0x81),
-     o3(0xE5,0x85,0x86), o3(0xE5,0x87,0x8B),
-     o3(0xE5,0x96,0x8B), o3(0xE5,0xAF,0xB5),
-     o3(0xE5,0xB8,0x96), o3(0xE5,0xB8,0xB3),
-     o3(0xE5,0xBA,0x81), o3(0xE5,0xBC,0x94),
-     o3(0xE5,0xBC,0xB5), o3(0xE5,0xBD,0xAB),
-     o3(0xE5,0xBE,0xB4), o3(0xE6,0x87,0xB2),
-     o3(0xE6,0x8C,0x91), o3(0xE6,0x9A,0xA2),
-     o3(0xE6,0x9C,0x9D), o3(0xE6,0xBD,0xAE),
-     o3(0xE7,0x89,0x92), o3(0xE7,0x94,0xBA),
-     o3(0xE7,0x9C,0xBA), o3(0xE8,0x81,0xB4),
-     o3(0xE8,0x84,0xB9), o3(0xE8,0x85,0xB8),
-     o3(0xE8,0x9D,0xB6), o3(0xE8,0xAA,0xBF),
-     o3(0xE8,0xAB,0x9C), o3(0xE8,0xB6,0x85),
-     o3(0xE8,0xB7,0xB3), o3(0xE9,0x8A,0x9A),
-     o3(0xE9,0x95,0xB7), o3(0xE9,0xA0,0x82),
-     o3(0xE9,0xB3,0xA5), o3(0xE5,0x8B,0x85),
-     o3(0xE6,0x8D,0x97), o3(0xE7,0x9B,0xB4),
-     o3(0xE6,0x9C,0x95), o3(0xE6,0xB2,0x88),
-     o3(0xE7,0x8F,0x8D), o3(0xE8,0xB3,0x83),
-     o3(0xE9,0x8E,0xAE), o3(0xE9,0x99,0xB3),
-     o3(0xE6,0xB4,0xA5), o3(0xE5,0xA2,0x9C),
-     o3(0xE6,0xA4,0x8E), o3(0xE6,0xA7,0x8C),
-     o3(0xE8,0xBF,0xBD), o3(0xE9,0x8E,0x9A),
-     o3(0xE7,0x97,0x9B), o3(0xE9,0x80,0x9A),
-     o3(0xE5,0xA1,0x9A), o3(0xE6,0xA0,0x82),
-     o3(0xE6,0x8E,0xB4), o3(0xE6,0xA7,0xBB),
-     o3(0xE4,0xBD,0x83), o3(0xE6,0xBC,0xAC),
-     o3(0xE6,0x9F,0x98), o3(0xE8,0xBE,0xBB),
-     o3(0xE8,0x94,0xA6), o3(0xE7,0xB6,0xB4),
-     o3(0xE9,0x8D,0x94), o3(0xE6,0xA4,0xBF),
-     o3(0xE6,0xBD,0xB0), o3(0xE5,0x9D,0xAA),
-     o3(0xE5,0xA3,0xB7), o3(0xE5,0xAC,0xAC),
-     o3(0xE7,0xB4,0xAC), o3(0xE7,0x88,0xAA),
-     o3(0xE5,0x90,0x8A), o3(0xE9,0x87,0xA3),
-     o3(0xE9,0xB6,0xB4), o3(0xE4,0xBA,0xAD),
-     o3(0xE4,0xBD,0x8E), o3(0xE5,0x81,0x9C),
-     o3(0xE5,0x81,0xB5), o3(0xE5,0x89,0x83),
-     o3(0xE8,0xB2,0x9E), o3(0xE5,0x91,0x88),
-     o3(0xE5,0xA0,0xA4), o3(0xE5,0xAE,0x9A),
-     o3(0xE5,0xB8,0x9D), o3(0xE5,0xBA,0x95),
-     o3(0xE5,0xBA,0xAD), o3(0xE5,0xBB,0xB7),
-     o3(0xE5,0xBC,0x9F), o3(0xE6,0x82,0x8C),
-     o3(0xE6,0x8A,0xB5), o3(0xE6,0x8C,0xBA),
-     o3(0xE6,0x8F,0x90), o3(0xE6,0xA2,0xAF),
-     o3(0xE6,0xB1,0x80), o3(0xE7,0xA2,0x87),
-     o3(0xE7,0xA6,0x8E), o3(0xE7,0xA8,0x8B),
-     o3(0xE7,0xB7,0xA0), o3(0xE8,0x89,0x87),
-     o3(0xE8,0xA8,0x82), o3(0xE8,0xAB,0xA6),
-     o3(0xE8,0xB9,0x84), o3(0xE9,0x80,0x93),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_92 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_92_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_93_infos[189] = {
-     o3(0xE9,0x82,0xB8), o3(0xE9,0x84,0xAD),
-     o3(0xE9,0x87,0x98), o3(0xE9,0xBC,0x8E),
-     o3(0xE6,0xB3,0xA5), o3(0xE6,0x91,0x98),
-     o3(0xE6,0x93,0xA2), o3(0xE6,0x95,0xB5),
-     o3(0xE6,0xBB,0xB4), o3(0xE7,0x9A,0x84),
-     o3(0xE7,0xAC,0x9B), o3(0xE9,0x81,0xA9),
-     o3(0xE9,0x8F,0x91), o3(0xE6,0xBA,0xBA),
-     o3(0xE5,0x93,0xB2), o3(0xE5,0xBE,0xB9),
-     o3(0xE6,0x92,0xA4), o3(0xE8,0xBD,0x8D),
-     o3(0xE8,0xBF,0xAD), o3(0xE9,0x89,0x84),
-     o3(0xE5,0x85,0xB8), o3(0xE5,0xA1,0xAB),
-     o3(0xE5,0xA4,0xA9), o3(0xE5,0xB1,0x95),
-     o3(0xE5,0xBA,0x97), o3(0xE6,0xB7,0xBB),
-     o3(0xE7,0xBA,0x8F), o3(0xE7,0x94,0x9C),
-     o3(0xE8,0xB2,0xBC), o3(0xE8,0xBB,0xA2),
-     o3(0xE9,0xA1,0x9B), o3(0xE7,0x82,0xB9),
-     o3(0xE4,0xBC,0x9D), o3(0xE6,0xAE,0xBF),
-     o3(0xE6,0xBE,0xB1), o3(0xE7,0x94,0xB0),
-     o3(0xE9,0x9B,0xBB), o3(0xE5,0x85,0x8E),
-     o3(0xE5,0x90,0x90), o3(0xE5,0xA0,0xB5),
-     o3(0xE5,0xA1,0x97), o3(0xE5,0xA6,0xAC),
-     o3(0xE5,0xB1,0xA0), o3(0xE5,0xBE,0x92),
-     o3(0xE6,0x96,0x97), o3(0xE6,0x9D,0x9C),
-     o3(0xE6,0xB8,0xA1), o3(0xE7,0x99,0xBB),
-     o3(0xE8,0x8F,0x9F), o3(0xE8,0xB3,0xAD),
-     o3(0xE9,0x80,0x94), o3(0xE9,0x83,0xBD),
-     o3(0xE9,0x8D,0x8D), o3(0xE7,0xA0,0xA5),
-     o3(0xE7,0xA0,0xBA), o3(0xE5,0x8A,0xAA),
-     o3(0xE5,0xBA,0xA6), o3(0xE5,0x9C,0x9F),
-     o3(0xE5,0xA5,0xB4), o3(0xE6,0x80,0x92),
-     o3(0xE5,0x80,0x92), o3(0xE5,0x85,0x9A),
-     o3(0xE5,0x86,0xAC), o3(0xE5,0x87,0x8D),
-     o3(0xE5,0x88,0x80), o3(0xE5,0x94,0x90),
-     o3(0xE5,0xA1,0x94), o3(0xE5,0xA1,0x98),
-     o3(0xE5,0xA5,0x97), o3(0xE5,0xAE,0x95),
-     o3(0xE5,0xB3,0xB6), o3(0xE5,0xB6,0x8B),
-     o3(0xE6,0x82,0xBC), o3(0xE6,0x8A,0x95),
-     o3(0xE6,0x90,0xAD), o3(0xE6,0x9D,0xB1),
-     o3(0xE6,0xA1,0x83), o3(0xE6,0xA2,0xBC),
-     o3(0xE6,0xA3,0x9F), o3(0xE7,0x9B,0x97),
-     o3(0xE6,0xB7,0x98), o3(0xE6,0xB9,0xAF),
-     o3(0xE6,0xB6,0x9B), o3(0xE7,0x81,0xAF),
-     o3(0xE7,0x87,0x88), o3(0xE5,0xBD,0x93),
-     o3(0xE7,0x97,0x98), o3(0xE7,0xA5,0xB7),
-     o3(0xE7,0xAD,0x89), o3(0xE7,0xAD,0x94),
-     o3(0xE7,0xAD,0x92), o3(0xE7,0xB3,0x96),
-     o3(0xE7,0xB5,0xB1), o3(0xE5,0x88,0xB0),
-     o3(0xE8,0x91,0xA3), o3(0xE8,0x95,0xA9),
-     o3(0xE8,0x97,0xA4), o3(0xE8,0xA8,0x8E),
-     o3(0xE8,0xAC,0x84), o3(0xE8,0xB1,0x86),
-     o3(0xE8,0xB8,0x8F), o3(0xE9,0x80,0x83),
-     o3(0xE9,0x80,0x8F), o3(0xE9,0x90,0x99),
-     o3(0xE9,0x99,0xB6), o3(0xE9,0xA0,0xAD),
-     o3(0xE9,0xA8,0xB0), o3(0xE9,0x97,0x98),
-     o3(0xE5,0x83,0x8D), o3(0xE5,0x8B,0x95),
-     o3(0xE5,0x90,0x8C), o3(0xE5,0xA0,0x82),
-     o3(0xE5,0xB0,0x8E), o3(0xE6,0x86,0xA7),
-     o3(0xE6,0x92,0x9E), o3(0xE6,0xB4,0x9E),
-     o3(0xE7,0x9E,0xB3), o3(0xE7,0xAB,0xA5),
-     o3(0xE8,0x83,0xB4), o3(0xE8,0x90,0x84),
-     o3(0xE9,0x81,0x93), o3(0xE9,0x8A,0x85),
-     o3(0xE5,0xB3,0xA0), o3(0xE9,0xB4,0x87),
-     o3(0xE5,0x8C,0xBF), o3(0xE5,0xBE,0x97),
-     o3(0xE5,0xBE,0xB3), o3(0xE6,0xB6,0x9C),
-     o3(0xE7,0x89,0xB9), o3(0xE7,0x9D,0xA3),
-     o3(0xE7,0xA6,0xBF), o3(0xE7,0xAF,0xA4),
-     o3(0xE6,0xAF,0x92), o3(0xE7,0x8B,0xAC),
-     o3(0xE8,0xAA,0xAD), o3(0xE6,0xA0,0x83),
-     o3(0xE6,0xA9,0xA1), o3(0xE5,0x87,0xB8),
-     o3(0xE7,0xAA,0x81), o3(0xE6,0xA4,0xB4),
-     o3(0xE5,0xB1,0x8A), o3(0xE9,0xB3,0xB6),
-     o3(0xE8,0x8B,0xAB), o3(0xE5,0xAF,0x85),
-     o3(0xE9,0x85,0x89), o3(0xE7,0x80,0x9E),
-     o3(0xE5,0x99,0xB8), o3(0xE5,0xB1,0xAF),
-     o3(0xE6,0x83,0x87), o3(0xE6,0x95,0xA6),
-     o3(0xE6,0xB2,0x8C), o3(0xE8,0xB1,0x9A),
-     o3(0xE9,0x81,0x81), o3(0xE9,0xA0,0x93),
-     o3(0xE5,0x91,0x91), o3(0xE6,0x9B,0x87),
-     o3(0xE9,0x88,0x8D), o3(0xE5,0xA5,0x88),
-     o3(0xE9,0x82,0xA3), o3(0xE5,0x86,0x85),
-     o3(0xE4,0xB9,0x8D), o3(0xE5,0x87,0xAA),
-     o3(0xE8,0x96,0x99), o3(0xE8,0xAC,0x8E),
-     o3(0xE7,0x81,0x98), o3(0xE6,0x8D,0xBA),
-     o3(0xE9,0x8D,0x8B), o3(0xE6,0xA5,0xA2),
-     o3(0xE9,0xA6,0xB4), o3(0xE7,0xB8,0x84),
-     o3(0xE7,0x95,0xB7), o3(0xE5,0x8D,0x97),
-     o3(0xE6,0xA5,0xA0), o3(0xE8,0xBB,0x9F),
-     o3(0xE9,0x9B,0xA3), o3(0xE6,0xB1,0x9D),
-     o3(0xE4,0xBA,0x8C), o3(0xE5,0xB0,0xBC),
-     o3(0xE5,0xBC,0x90), o3(0xE8,0xBF,0xA9),
-     o3(0xE5,0x8C,0x82), o3(0xE8,0xB3,0x91),
-     o3(0xE8,0x82,0x89), o3(0xE8,0x99,0xB9),
-     o3(0xE5,0xBB,0xBF), o3(0xE6,0x97,0xA5),
-     o3(0xE4,0xB9,0xB3), o3(0xE5,0x85,0xA5),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_93 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_93_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_94_infos[189] = {
-     o3(0xE5,0xA6,0x82), o3(0xE5,0xB0,0xBF),
-     o3(0xE9,0x9F,0xAE), o3(0xE4,0xBB,0xBB),
-     o3(0xE5,0xA6,0x8A), o3(0xE5,0xBF,0x8D),
-     o3(0xE8,0xAA,0x8D), o3(0xE6,0xBF,0xA1),
-     o3(0xE7,0xA6,0xB0), o3(0xE7,0xA5,0xA2),
-     o3(0xE5,0xAF,0xA7), o3(0xE8,0x91,0xB1),
-     o3(0xE7,0x8C,0xAB), o3(0xE7,0x86,0xB1),
-     o3(0xE5,0xB9,0xB4), o3(0xE5,0xBF,0xB5),
-     o3(0xE6,0x8D,0xBB), o3(0xE6,0x92,0x9A),
-     o3(0xE7,0x87,0x83), o3(0xE7,0xB2,0x98),
-     o3(0xE4,0xB9,0x83), o3(0xE5,0xBB,0xBC),
-     o3(0xE4,0xB9,0x8B), o3(0xE5,0x9F,0x9C),
-     o3(0xE5,0x9A,0xA2), o3(0xE6,0x82,0xA9),
-     o3(0xE6,0xBF,0x83), o3(0xE7,0xB4,0x8D),
-     o3(0xE8,0x83,0xBD), o3(0xE8,0x84,0xB3),
-     o3(0xE8,0x86,0xBF), o3(0xE8,0xBE,0xB2),
-     o3(0xE8,0xA6,0x97), o3(0xE8,0x9A,0xA4),
-     o3(0xE5,0xB7,0xB4), o3(0xE6,0x8A,0x8A),
-     o3(0xE6,0x92,0xAD), o3(0xE8,0xA6,0x87),
-     o3(0xE6,0x9D,0xB7), o3(0xE6,0xB3,0xA2),
-     o3(0xE6,0xB4,0xBE), o3(0xE7,0x90,0xB6),
-     o3(0xE7,0xA0,0xB4), o3(0xE5,0xA9,0x86),
-     o3(0xE7,0xBD,0xB5), o3(0xE8,0x8A,0xAD),
-     o3(0xE9,0xA6,0xAC), o3(0xE4,0xBF,0xB3),
-     o3(0xE5,0xBB,0x83), o3(0xE6,0x8B,0x9D),
-     o3(0xE6,0x8E,0x92), o3(0xE6,0x95,0x97),
-     o3(0xE6,0x9D,0xAF), o3(0xE7,0x9B,0x83),
-     o3(0xE7,0x89,0x8C), o3(0xE8,0x83,0x8C),
-     o3(0xE8,0x82,0xBA), o3(0xE8,0xBC,0xA9),
-     o3(0xE9,0x85,0x8D), o3(0xE5,0x80,0x8D),
-     o3(0xE5,0x9F,0xB9), o3(0xE5,0xAA,0x92),
-     o3(0xE6,0xA2,0x85), o3(0xE6,0xA5,0xB3),
-     o3(0xE7,0x85,0xA4), o3(0xE7,0x8B,0xBD),
-     o3(0xE8,0xB2,0xB7), o3(0xE5,0xA3,0xB2),
-     o3(0xE8,0xB3,0xA0), o3(0xE9,0x99,0xAA),
-     o3(0xE9,0x80,0x99), o3(0xE8,0x9D,0xBF),
-     o3(0xE7,0xA7,0xA4), o3(0xE7,0x9F,0xA7),
-     o3(0xE8,0x90,0xA9), o3(0xE4,0xBC,0xAF),
-     o3(0xE5,0x89,0xA5), o3(0xE5,0x8D,0x9A),
-     o3(0xE6,0x8B,0x8D), o3(0xE6,0x9F,0x8F),
-     o3(0xE6,0xB3,0x8A), o3(0xE7,0x99,0xBD),
-     o3(0xE7,0xAE,0x94), o3(0xE7,0xB2,0x95),
-     o3(0xE8,0x88,0xB6), o3(0xE8,0x96,0x84),
-     o3(0xE8,0xBF,0xAB), o3(0xE6,0x9B,0x9D),
-     o3(0xE6,0xBC,0xA0), o3(0xE7,0x88,0x86),
-     o3(0xE7,0xB8,0x9B), o3(0xE8,0x8E,0xAB),
-     o3(0xE9,0xA7,0x81), o3(0xE9,0xBA,0xA6),
-     o3(0xE5,0x87,0xBD), o3(0xE7,0xAE,0xB1),
-     o3(0xE7,0xA1,0xB2), o3(0xE7,0xAE,0xB8),
-     o3(0xE8,0x82,0x87), o3(0xE7,0xAD,0x88),
-     o3(0xE6,0xAB,0xA8), o3(0xE5,0xB9,0xA1),
-     o3(0xE8,0x82,0x8C), o3(0xE7,0x95,0x91),
-     o3(0xE7,0x95,0xA0), o3(0xE5,0x85,0xAB),
-     o3(0xE9,0x89,0xA2), o3(0xE6,0xBA,0x8C),
-     o3(0xE7,0x99,0xBA), o3(0xE9,0x86,0x97),
-     o3(0xE9,0xAB,0xAA), o3(0xE4,0xBC,0x90),
-     o3(0xE7,0xBD,0xB0), o3(0xE6,0x8A,0x9C),
-     o3(0xE7,0xAD,0x8F), o3(0xE9,0x96,0xA5),
-     o3(0xE9,0xB3,0xA9), o3(0xE5,0x99,0xBA),
-     o3(0xE5,0xA1,0x99), o3(0xE8,0x9B,0xA4),
-     o3(0xE9,0x9A,0xBC), o3(0xE4,0xBC,0xB4),
-     o3(0xE5,0x88,0xA4), o3(0xE5,0x8D,0x8A),
-     o3(0xE5,0x8F,0x8D), o3(0xE5,0x8F,0x9B),
-     o3(0xE5,0xB8,0x86), o3(0xE6,0x90,0xAC),
-     o3(0xE6,0x96,0x91), o3(0xE6,0x9D,0xBF),
-     o3(0xE6,0xB0,0xBE), o3(0xE6,0xB1,0x8E),
-     o3(0xE7,0x89,0x88), o3(0xE7,0x8A,0xAF),
-     o3(0xE7,0x8F,0xAD), o3(0xE7,0x95,0x94),
-     o3(0xE7,0xB9,0x81), o3(0xE8,0x88,0xAC),
-     o3(0xE8,0x97,0xA9), o3(0xE8,0xB2,0xA9),
-     o3(0xE7,0xAF,0x84), o3(0xE9,0x87,0x86),
-     o3(0xE7,0x85,0xA9), o3(0xE9,0xA0,0x92),
-     o3(0xE9,0xA3,0xAF), o3(0xE6,0x8C,0xBD),
-     o3(0xE6,0x99,0xA9), o3(0xE7,0x95,0xAA),
-     o3(0xE7,0x9B,0xA4), o3(0xE7,0xA3,0x90),
-     o3(0xE8,0x95,0x83), o3(0xE8,0x9B,0xAE),
-     o3(0xE5,0x8C,0xAA), o3(0xE5,0x8D,0x91),
-     o3(0xE5,0x90,0xA6), o3(0xE5,0xA6,0x83),
-     o3(0xE5,0xBA,0x87), o3(0xE5,0xBD,0xBC),
-     o3(0xE6,0x82,0xB2), o3(0xE6,0x89,0x89),
-     o3(0xE6,0x89,0xB9), o3(0xE6,0x8A,0xAB),
-     o3(0xE6,0x96,0x90), o3(0xE6,0xAF,0x94),
-     o3(0xE6,0xB3,0x8C), o3(0xE7,0x96,0xB2),
-     o3(0xE7,0x9A,0xAE), o3(0xE7,0xA2,0x91),
-     o3(0xE7,0xA7,0x98), o3(0xE7,0xB7,0x8B),
-     o3(0xE7,0xBD,0xB7), o3(0xE8,0x82,0xA5),
-     o3(0xE8,0xA2,0xAB), o3(0xE8,0xAA,0xB9),
-     o3(0xE8,0xB2,0xBB), o3(0xE9,0x81,0xBF),
-     o3(0xE9,0x9D,0x9E), o3(0xE9,0xA3,0x9B),
-     o3(0xE6,0xA8,0x8B), o3(0xE7,0xB0,0xB8),
-     o3(0xE5,0x82,0x99), o3(0xE5,0xB0,0xBE),
-     o3(0xE5,0xBE,0xAE), o3(0xE6,0x9E,0x87),
-     o3(0xE6,0xAF,0x98), o3(0xE7,0x90,0xB5),
-     o3(0xE7,0x9C,0x89), o3(0xE7,0xBE,0x8E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_94 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_94_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_95_infos[189] = {
-     o3(0xE9,0xBC,0xBB), o3(0xE6,0x9F,0x8A),
-     o3(0xE7,0xA8,0x97), o3(0xE5,0x8C,0xB9),
-     o3(0xE7,0x96,0x8B), o3(0xE9,0xAB,0xAD),
-     o3(0xE5,0xBD,0xA6), o3(0xE8,0x86,0x9D),
-     o3(0xE8,0x8F,0xB1), o3(0xE8,0x82,0x98),
-     o3(0xE5,0xBC,0xBC), o3(0xE5,0xBF,0x85),
-     o3(0xE7,0x95,0xA2), o3(0xE7,0xAD,0x86),
-     o3(0xE9,0x80,0xBC), o3(0xE6,0xA1,0xA7),
-     o3(0xE5,0xA7,0xAB), o3(0xE5,0xAA,0x9B),
-     o3(0xE7,0xB4,0x90), o3(0xE7,0x99,0xBE),
-     o3(0xE8,0xAC,0xAC), o3(0xE4,0xBF,0xB5),
-     o3(0xE5,0xBD,0xAA), o3(0xE6,0xA8,0x99),
-     o3(0xE6,0xB0,0xB7), o3(0xE6,0xBC,0x82),
-     o3(0xE7,0x93,0xA2), o3(0xE7,0xA5,0xA8),
-     o3(0xE8,0xA1,0xA8), o3(0xE8,0xA9,0x95),
-     o3(0xE8,0xB1,0xB9), o3(0xE5,0xBB,0x9F),
-     o3(0xE6,0x8F,0x8F), o3(0xE7,0x97,0x85),
-     o3(0xE7,0xA7,0x92), o3(0xE8,0x8B,0x97),
-     o3(0xE9,0x8C,0xA8), o3(0xE9,0x8B,0xB2),
-     o3(0xE8,0x92,0x9C), o3(0xE8,0x9B,0xAD),
-     o3(0xE9,0xB0,0xAD), o3(0xE5,0x93,0x81),
-     o3(0xE5,0xBD,0xAC), o3(0xE6,0x96,0x8C),
-     o3(0xE6,0xB5,0x9C), o3(0xE7,0x80,0x95),
-     o3(0xE8,0xB2,0xA7), o3(0xE8,0xB3,0x93),
-     o3(0xE9,0xA0,0xBB), o3(0xE6,0x95,0x8F),
-     o3(0xE7,0x93,0xB6), o3(0xE4,0xB8,0x8D),
-     o3(0xE4,0xBB,0x98), o3(0xE5,0x9F,0xA0),
-     o3(0xE5,0xA4,0xAB), o3(0xE5,0xA9,0xA6),
-     o3(0xE5,0xAF,0x8C), o3(0xE5,0x86,0xA8),
-     o3(0xE5,0xB8,0x83), o3(0xE5,0xBA,0x9C),
-     o3(0xE6,0x80,0x96), o3(0xE6,0x89,0xB6),
-     o3(0xE6,0x95,0xB7), o3(0xE6,0x96,0xA7),
-     o3(0xE6,0x99,0xAE), o3(0xE6,0xB5,0xAE),
-     o3(0xE7,0x88,0xB6), o3(0xE7,0xAC,0xA6),
-     o3(0xE8,0x85,0x90), o3(0xE8,0x86,0x9A),
-     o3(0xE8,0x8A,0x99), o3(0xE8,0xAD,0x9C),
-     o3(0xE8,0xB2,0xA0), o3(0xE8,0xB3,0xA6),
-     o3(0xE8,0xB5,0xB4), o3(0xE9,0x98,0x9C),
-     o3(0xE9,0x99,0x84), o3(0xE4,0xBE,0xAE),
-     o3(0xE6,0x92,0xAB), o3(0xE6,0xAD,0xA6),
-     o3(0xE8,0x88,0x9E), o3(0xE8,0x91,0xA1),
-     o3(0xE8,0x95,0xAA), o3(0xE9,0x83,0xA8),
-     o3(0xE5,0xB0,0x81), o3(0xE6,0xA5,0x93),
-     o3(0xE9,0xA2,0xA8), o3(0xE8,0x91,0xBA),
-     o3(0xE8,0x95,0x97), o3(0xE4,0xBC,0x8F),
-     o3(0xE5,0x89,0xAF), o3(0xE5,0xBE,0xA9),
-     o3(0xE5,0xB9,0x85), o3(0xE6,0x9C,0x8D),
-     o3(0xE7,0xA6,0x8F), o3(0xE8,0x85,0xB9),
-     o3(0xE8,0xA4,0x87), o3(0xE8,0xA6,0x86),
-     o3(0xE6,0xB7,0xB5), o3(0xE5,0xBC,0x97),
-     o3(0xE6,0x89,0x95), o3(0xE6,0xB2,0xB8),
-     o3(0xE4,0xBB,0x8F), o3(0xE7,0x89,0xA9),
-     o3(0xE9,0xAE,0x92), o3(0xE5,0x88,0x86),
-     o3(0xE5,0x90,0xBB), o3(0xE5,0x99,0xB4),
-     o3(0xE5,0xA2,0xB3), o3(0xE6,0x86,0xA4),
-     o3(0xE6,0x89,0xAE), o3(0xE7,0x84,0x9A),
-     o3(0xE5,0xA5,0xAE), o3(0xE7,0xB2,0x89),
-     o3(0xE7,0xB3,0x9E), o3(0xE7,0xB4,0x9B),
-     o3(0xE9,0x9B,0xB0), o3(0xE6,0x96,0x87),
-     o3(0xE8,0x81,0x9E), o3(0xE4,0xB8,0x99),
-     o3(0xE4,0xBD,0xB5), o3(0xE5,0x85,0xB5),
-     o3(0xE5,0xA1,0x80), o3(0xE5,0xB9,0xA3),
-     o3(0xE5,0xB9,0xB3), o3(0xE5,0xBC,0x8A),
-     o3(0xE6,0x9F,0x84), o3(0xE4,0xB8,0xA6),
-     o3(0xE8,0x94,0xBD), o3(0xE9,0x96,0x89),
-     o3(0xE9,0x99,0x9B), o3(0xE7,0xB1,0xB3),
-     o3(0xE9,0xA0,0x81), o3(0xE5,0x83,0xBB),
-     o3(0xE5,0xA3,0x81), o3(0xE7,0x99,0x96),
-     o3(0xE7,0xA2,0xA7), o3(0xE5,0x88,0xA5),
-     o3(0xE7,0x9E,0xA5), o3(0xE8,0x94,0x91),
-     o3(0xE7,0xAE,0x86), o3(0xE5,0x81,0x8F),
-     o3(0xE5,0xA4,0x89), o3(0xE7,0x89,0x87),
-     o3(0xE7,0xAF,0x87), o3(0xE7,0xB7,0xA8),
-     o3(0xE8,0xBE,0xBA), o3(0xE8,0xBF,0x94),
-     o3(0xE9,0x81,0x8D), o3(0xE4,0xBE,0xBF),
-     o3(0xE5,0x8B,0x89), o3(0xE5,0xA8,0xA9),
-     o3(0xE5,0xBC,0x81), o3(0xE9,0x9E,0xAD),
-     o3(0xE4,0xBF,0x9D), o3(0xE8,0x88,0x97),
-     o3(0xE9,0x8B,0xAA), o3(0xE5,0x9C,0x83),
-     o3(0xE6,0x8D,0x95), o3(0xE6,0xAD,0xA9),
-     o3(0xE7,0x94,0xAB), o3(0xE8,0xA3,0x9C),
-     o3(0xE8,0xBC,0x94), o3(0xE7,0xA9,0x82),
-     o3(0xE5,0x8B,0x9F), o3(0xE5,0xA2,0x93),
-     o3(0xE6,0x85,0x95), o3(0xE6,0x88,0x8A),
-     o3(0xE6,0x9A,0xAE), o3(0xE6,0xAF,0x8D),
-     o3(0xE7,0xB0,0xBF), o3(0xE8,0x8F,0xA9),
-     o3(0xE5,0x80,0xA3), o3(0xE4,0xBF,0xB8),
-     o3(0xE5,0x8C,0x85), o3(0xE5,0x91,0x86),
-     o3(0xE5,0xA0,0xB1), o3(0xE5,0xA5,0x89),
-     o3(0xE5,0xAE,0x9D), o3(0xE5,0xB3,0xB0),
-     o3(0xE5,0xB3,0xAF), o3(0xE5,0xB4,0xA9),
-     o3(0xE5,0xBA,0x96), o3(0xE6,0x8A,0xB1),
-     o3(0xE6,0x8D,0xA7), o3(0xE6,0x94,0xBE),
-     o3(0xE6,0x96,0xB9), o3(0xE6,0x9C,0x8B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_95 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_95_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_96_infos[189] = {
-     o3(0xE6,0xB3,0x95), o3(0xE6,0xB3,0xA1),
-     o3(0xE7,0x83,0xB9), o3(0xE7,0xA0,0xB2),
-     o3(0xE7,0xB8,0xAB), o3(0xE8,0x83,0x9E),
-     o3(0xE8,0x8A,0xB3), o3(0xE8,0x90,0x8C),
-     o3(0xE8,0x93,0xAC), o3(0xE8,0x9C,0x82),
-     o3(0xE8,0xA4,0x92), o3(0xE8,0xA8,0xAA),
-     o3(0xE8,0xB1,0x8A), o3(0xE9,0x82,0xA6),
-     o3(0xE9,0x8B,0x92), o3(0xE9,0xA3,0xBD),
-     o3(0xE9,0xB3,0xB3), o3(0xE9,0xB5,0xAC),
-     o3(0xE4,0xB9,0x8F), o3(0xE4,0xBA,0xA1),
-     o3(0xE5,0x82,0x8D), o3(0xE5,0x89,0x96),
-     o3(0xE5,0x9D,0x8A), o3(0xE5,0xA6,0xA8),
-     o3(0xE5,0xB8,0xBD), o3(0xE5,0xBF,0x98),
-     o3(0xE5,0xBF,0x99), o3(0xE6,0x88,0xBF),
-     o3(0xE6,0x9A,0xB4), o3(0xE6,0x9C,0x9B),
-     o3(0xE6,0x9F,0x90), o3(0xE6,0xA3,0x92),
-     o3(0xE5,0x86,0x92), o3(0xE7,0xB4,0xA1),
-     o3(0xE8,0x82,0xAA), o3(0xE8,0x86,0xA8),
-     o3(0xE8,0xAC,0x80), o3(0xE8,0xB2,0x8C),
-     o3(0xE8,0xB2,0xBF), o3(0xE9,0x89,0xBE),
-     o3(0xE9,0x98,0xB2), o3(0xE5,0x90,0xA0),
-     o3(0xE9,0xA0,0xAC), o3(0xE5,0x8C,0x97),
-     o3(0xE5,0x83,0x95), o3(0xE5,0x8D,0x9C),
-     o3(0xE5,0xA2,0xA8), o3(0xE6,0x92,0xB2),
-     o3(0xE6,0x9C,0xB4), o3(0xE7,0x89,0xA7),
-     o3(0xE7,0x9D,0xA6), o3(0xE7,0xA9,0x86),
-     o3(0xE9,0x87,0xA6), o3(0xE5,0x8B,0x83),
-     o3(0xE6,0xB2,0xA1), o3(0xE6,0xAE,0x86),
-     o3(0xE5,0xA0,0x80), o3(0xE5,0xB9,0x8C),
-     o3(0xE5,0xA5,0x94), o3(0xE6,0x9C,0xAC),
-     o3(0xE7,0xBF,0xBB), o3(0xE5,0x87,0xA1),
-     o3(0xE7,0x9B,0x86), o3(0xE6,0x91,0xA9),
-     o3(0xE7,0xA3,0xA8), o3(0xE9,0xAD,0x94),
-     o3(0xE9,0xBA,0xBB), o3(0xE5,0x9F,0x8B),
-     o3(0xE5,0xA6,0xB9), o3(0xE6,0x98,0xA7),
-     o3(0xE6,0x9E,0x9A), o3(0xE6,0xAF,0x8E),
-     o3(0xE5,0x93,0xA9), o3(0xE6,0xA7,0x99),
-     o3(0xE5,0xB9,0x95), o3(0xE8,0x86,0x9C),
-     o3(0xE6,0x9E,0x95), o3(0xE9,0xAE,0xAA),
-     o3(0xE6,0x9F,0xBE), o3(0xE9,0xB1,0x92),
-     o3(0xE6,0xA1,0x9D), o3(0xE4,0xBA,0xA6),
-     o3(0xE4,0xBF,0xA3), o3(0xE5,0x8F,0x88),
-     o3(0xE6,0x8A,0xB9), o3(0xE6,0x9C,0xAB),
-     o3(0xE6,0xB2,0xAB), o3(0xE8,0xBF,0x84),
-     o3(0xE4,0xBE,0xAD), o3(0xE7,0xB9,0xAD),
-     o3(0xE9,0xBA,0xBF), o3(0xE4,0xB8,0x87),
-     o3(0xE6,0x85,0xA2), o3(0xE6,0xBA,0x80),
-     o3(0xE6,0xBC,0xAB), o3(0xE8,0x94,0x93),
-     o3(0xE5,0x91,0xB3), o3(0xE6,0x9C,0xAA),
-     o3(0xE9,0xAD,0x85), o3(0xE5,0xB7,0xB3),
-     o3(0xE7,0xAE,0x95), o3(0xE5,0xB2,0xAC),
-     o3(0xE5,0xAF,0x86), o3(0xE8,0x9C,0x9C),
-     o3(0xE6,0xB9,0x8A), o3(0xE8,0x93,0x91),
-     o3(0xE7,0xA8,0x94), o3(0xE8,0x84,0x88),
-     o3(0xE5,0xA6,0x99), o3(0xE7,0xB2,0x8D),
-     o3(0xE6,0xB0,0x91), o3(0xE7,0x9C,0xA0),
-     o3(0xE5,0x8B,0x99), o3(0xE5,0xA4,0xA2),
-     o3(0xE7,0x84,0xA1), o3(0xE7,0x89,0x9F),
-     o3(0xE7,0x9F,0x9B), o3(0xE9,0x9C,0xA7),
-     o3(0xE9,0xB5,0xA1), o3(0xE6,0xA4,0x8B),
-     o3(0xE5,0xA9,0xBF), o3(0xE5,0xA8,0x98),
-     o3(0xE5,0x86,0xA5), o3(0xE5,0x90,0x8D),
-     o3(0xE5,0x91,0xBD), o3(0xE6,0x98,0x8E),
-     o3(0xE7,0x9B,0x9F), o3(0xE8,0xBF,0xB7),
-     o3(0xE9,0x8A,0x98), o3(0xE9,0xB3,0xB4),
-     o3(0xE5,0xA7,0xAA), o3(0xE7,0x89,0x9D),
-     o3(0xE6,0xBB,0x85), o3(0xE5,0x85,0x8D),
-     o3(0xE6,0xA3,0x89), o3(0xE7,0xB6,0xBF),
-     o3(0xE7,0xB7,0xAC), o3(0xE9,0x9D,0xA2),
-     o3(0xE9,0xBA,0xBA), o3(0xE6,0x91,0xB8),
-     o3(0xE6,0xA8,0xA1), o3(0xE8,0x8C,0x82),
-     o3(0xE5,0xA6,0x84), o3(0xE5,0xAD,0x9F),
-     o3(0xE6,0xAF,0x9B), o3(0xE7,0x8C,0x9B),
-     o3(0xE7,0x9B,0xB2), o3(0xE7,0xB6,0xB2),
-     o3(0xE8,0x80,0x97), o3(0xE8,0x92,0x99),
-     o3(0xE5,0x84,0xB2), o3(0xE6,0x9C,0xA8),
-     o3(0xE9,0xBB,0x99), o3(0xE7,0x9B,0xAE),
-     o3(0xE6,0x9D,0xA2), o3(0xE5,0x8B,0xBF),
-     o3(0xE9,0xA4,0x85), o3(0xE5,0xB0,0xA4),
-     o3(0xE6,0x88,0xBB), o3(0xE7,0xB1,0xBE),
-     o3(0xE8,0xB2,0xB0), o3(0xE5,0x95,0x8F),
-     o3(0xE6,0x82,0xB6), o3(0xE7,0xB4,0x8B),
-     o3(0xE9,0x96,0x80), o3(0xE5,0x8C,0x81),
-     o3(0xE4,0xB9,0x9F), o3(0xE5,0x86,0xB6),
-     o3(0xE5,0xA4,0x9C), o3(0xE7,0x88,0xBA),
-     o3(0xE8,0x80,0xB6), o3(0xE9,0x87,0x8E),
-     o3(0xE5,0xBC,0xA5), o3(0xE7,0x9F,0xA2),
-     o3(0xE5,0x8E,0x84), o3(0xE5,0xBD,0xB9),
-     o3(0xE7,0xB4,0x84), o3(0xE8,0x96,0xAC),
-     o3(0xE8,0xA8,0xB3), o3(0xE8,0xBA,0x8D),
-     o3(0xE9,0x9D,0x96), o3(0xE6,0x9F,0xB3),
-     o3(0xE8,0x96,0xAE), o3(0xE9,0x91,0x93),
-     o3(0xE6,0x84,0x89), o3(0xE6,0x84,0x88),
-     o3(0xE6,0xB2,0xB9), o3(0xE7,0x99,0x92),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_96 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_96_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_97_infos[189] = {
-     o3(0xE8,0xAB,0xAD), o3(0xE8,0xBC,0xB8),
-     o3(0xE5,0x94,0xAF), o3(0xE4,0xBD,0x91),
-     o3(0xE5,0x84,0xAA), o3(0xE5,0x8B,0x87),
-     o3(0xE5,0x8F,0x8B), o3(0xE5,0xAE,0xA5),
-     o3(0xE5,0xB9,0xBD), o3(0xE6,0x82,0xA0),
-     o3(0xE6,0x86,0x82), o3(0xE6,0x8F,0x96),
-     o3(0xE6,0x9C,0x89), o3(0xE6,0x9F,0x9A),
-     o3(0xE6,0xB9,0xA7), o3(0xE6,0xB6,0x8C),
-     o3(0xE7,0x8C,0xB6), o3(0xE7,0x8C,0xB7),
-     o3(0xE7,0x94,0xB1), o3(0xE7,0xA5,0x90),
-     o3(0xE8,0xA3,0x95), o3(0xE8,0xAA,0x98),
-     o3(0xE9,0x81,0x8A), o3(0xE9,0x82,0x91),
-     o3(0xE9,0x83,0xB5), o3(0xE9,0x9B,0x84),
-     o3(0xE8,0x9E,0x8D), o3(0xE5,0xA4,0x95),
-     o3(0xE4,0xBA,0x88), o3(0xE4,0xBD,0x99),
-     o3(0xE4,0xB8,0x8E), o3(0xE8,0xAA,0x89),
-     o3(0xE8,0xBC,0xBF), o3(0xE9,0xA0,0x90),
-     o3(0xE5,0x82,0xAD), o3(0xE5,0xB9,0xBC),
-     o3(0xE5,0xA6,0x96), o3(0xE5,0xAE,0xB9),
-     o3(0xE5,0xBA,0xB8), o3(0xE6,0x8F,0x9A),
-     o3(0xE6,0x8F,0xBA), o3(0xE6,0x93,0x81),
-     o3(0xE6,0x9B,0x9C), o3(0xE6,0xA5,0x8A),
-     o3(0xE6,0xA7,0x98), o3(0xE6,0xB4,0x8B),
-     o3(0xE6,0xBA,0xB6), o3(0xE7,0x86,0x94),
-     o3(0xE7,0x94,0xA8), o3(0xE7,0xAA,0xAF),
-     o3(0xE7,0xBE,0x8A), o3(0xE8,0x80,0x80),
-     o3(0xE8,0x91,0x89), o3(0xE8,0x93,0x89),
-     o3(0xE8,0xA6,0x81), o3(0xE8,0xAC,0xA1),
-     o3(0xE8,0xB8,0x8A), o3(0xE9,0x81,0xA5),
-     o3(0xE9,0x99,0xBD), o3(0xE9,0xA4,0x8A),
-     o3(0xE6,0x85,0xBE), o3(0xE6,0x8A,0x91),
-     o3(0xE6,0xAC,0xB2), o3(0xE6,0xB2,0x83),
-     o3(0xE6,0xB5,0xB4), o3(0xE7,0xBF,0x8C),
-     o3(0xE7,0xBF,0xBC), o3(0xE6,0xB7,0x80),
-     o3(0xE7,0xBE,0x85), o3(0xE8,0x9E,0xBA),
-     o3(0xE8,0xA3,0xB8), o3(0xE6,0x9D,0xA5),
-     o3(0xE8,0x8E,0xB1), o3(0xE9,0xA0,0xBC),
-     o3(0xE9,0x9B,0xB7), o3(0xE6,0xB4,0x9B),
-     o3(0xE7,0xB5,0xA1), o3(0xE8,0x90,0xBD),
-     o3(0xE9,0x85,0xAA), o3(0xE4,0xB9,0xB1),
-     o3(0xE5,0x8D,0xB5), o3(0xE5,0xB5,0x90),
-     o3(0xE6,0xAC,0x84), o3(0xE6,0xBF,0xAB),
-     o3(0xE8,0x97,0x8D), o3(0xE8,0x98,0xAD),
-     o3(0xE8,0xA6,0xA7), o3(0xE5,0x88,0xA9),
-     o3(0xE5,0x90,0x8F), o3(0xE5,0xB1,0xA5),
-     o3(0xE6,0x9D,0x8E), o3(0xE6,0xA2,0xA8),
-     o3(0xE7,0x90,0x86), o3(0xE7,0x92,0x83),
-     o3(0xE7,0x97,0xA2), o3(0xE8,0xA3,0x8F),
-     o3(0xE8,0xA3,0xA1), o3(0xE9,0x87,0x8C),
-     o3(0xE9,0x9B,0xA2), o3(0xE9,0x99,0xB8),
-     o3(0xE5,0xBE,0x8B), o3(0xE7,0x8E,0x87),
-     o3(0xE7,0xAB,0x8B), o3(0xE8,0x91,0x8E),
-     o3(0xE6,0x8E,0xA0), o3(0xE7,0x95,0xA5),
-     o3(0xE5,0x8A,0x89), o3(0xE6,0xB5,0x81),
-     o3(0xE6,0xBA,0x9C), o3(0xE7,0x90,0x89),
-     o3(0xE7,0x95,0x99), o3(0xE7,0xA1,0xAB),
-     o3(0xE7,0xB2,0x92), o3(0xE9,0x9A,0x86),
-     o3(0xE7,0xAB,0x9C), o3(0xE9,0xBE,0x8D),
-     o3(0xE4,0xBE,0xB6), o3(0xE6,0x85,0xAE),
-     o3(0xE6,0x97,0x85), o3(0xE8,0x99,0x9C),
-     o3(0xE4,0xBA,0x86), o3(0xE4,0xBA,0xAE),
-     o3(0xE5,0x83,0x9A), o3(0xE4,0xB8,0xA1),
-     o3(0xE5,0x87,0x8C), o3(0xE5,0xAF,0xAE),
-     o3(0xE6,0x96,0x99), o3(0xE6,0xA2,0x81),
-     o3(0xE6,0xB6,0xBC), o3(0xE7,0x8C,0x9F),
-     o3(0xE7,0x99,0x82), o3(0xE7,0x9E,0xAD),
-     o3(0xE7,0xA8,0x9C), o3(0xE7,0xB3,0xA7),
-     o3(0xE8,0x89,0xAF), o3(0xE8,0xAB,0x92),
-     o3(0xE9,0x81,0xBC), o3(0xE9,0x87,0x8F),
-     o3(0xE9,0x99,0xB5), o3(0xE9,0xA0,0x98),
-     o3(0xE5,0x8A,0x9B), o3(0xE7,0xB7,0x91),
-     o3(0xE5,0x80,0xAB), o3(0xE5,0x8E,0x98),
-     o3(0xE6,0x9E,0x97), o3(0xE6,0xB7,0x8B),
-     o3(0xE7,0x87,0x90), o3(0xE7,0x90,0xB3),
-     o3(0xE8,0x87,0xA8), o3(0xE8,0xBC,0xAA),
-     o3(0xE9,0x9A,0xA3), o3(0xE9,0xB1,0x97),
-     o3(0xE9,0xBA,0x9F), o3(0xE7,0x91,0xA0),
-     o3(0xE5,0xA1,0x81), o3(0xE6,0xB6,0x99),
-     o3(0xE7,0xB4,0xAF), o3(0xE9,0xA1,0x9E),
-     o3(0xE4,0xBB,0xA4), o3(0xE4,0xBC,0xB6),
-     o3(0xE4,0xBE,0x8B), o3(0xE5,0x86,0xB7),
-     o3(0xE5,0x8A,0xB1), o3(0xE5,0xB6,0xBA),
-     o3(0xE6,0x80,0x9C), o3(0xE7,0x8E,0xB2),
-     o3(0xE7,0xA4,0xBC), o3(0xE8,0x8B,0x93),
-     o3(0xE9,0x88,0xB4), o3(0xE9,0x9A,0xB7),
-     o3(0xE9,0x9B,0xB6), o3(0xE9,0x9C,0x8A),
-     o3(0xE9,0xBA,0x97), o3(0xE9,0xBD,0xA2),
-     o3(0xE6,0x9A,0xA6), o3(0xE6,0xAD,0xB4),
-     o3(0xE5,0x88,0x97), o3(0xE5,0x8A,0xA3),
-     o3(0xE7,0x83,0x88), o3(0xE8,0xA3,0x82),
-     o3(0xE5,0xBB,0x89), o3(0xE6,0x81,0x8B),
-     o3(0xE6,0x86,0x90), o3(0xE6,0xBC,0xA3),
-     o3(0xE7,0x85,0x89), o3(0xE7,0xB0,0xBE),
-     o3(0xE7,0xB7,0xB4), o3(0xE8,0x81,0xAF),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_97 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_97_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_98_offsets[256] = {
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145,145,
-    145,145,145,145,145,145,145,145,  145,145,145,145,145,145,145, 51,
-     52, 53, 54, 55, 56, 57, 58, 59,   60, 61, 62, 63, 64, 65, 66, 67,
-     68, 69, 70, 71, 72, 73, 74, 75,   76, 77, 78, 79, 80, 81, 82, 83,
-     84, 85, 86, 87, 88, 89, 90, 91,   92, 93, 94, 95, 96, 97, 98, 99,
-    100,101,102,103,104,105,106,107,  108,109,110,111,112,113,114,115,
-    116,117,118,119,120,121,122,123,  124,125,126,127,128,129,130,131,
-    132,133,134,135,136,137,138,139,  140,141,142,143,144,145,145,145,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_98_infos[146] = {
-     o3(0xE8,0x93,0xAE), o3(0xE9,0x80,0xA3),
-     o3(0xE9,0x8C,0xAC), o3(0xE5,0x91,0x82),
-     o3(0xE9,0xAD,0xAF), o3(0xE6,0xAB,0x93),
-     o3(0xE7,0x82,0x89), o3(0xE8,0xB3,0x82),
-     o3(0xE8,0xB7,0xAF), o3(0xE9,0x9C,0xB2),
-     o3(0xE5,0x8A,0xB4), o3(0xE5,0xA9,0x81),
-     o3(0xE5,0xBB,0x8A), o3(0xE5,0xBC,0x84),
-     o3(0xE6,0x9C,0x97), o3(0xE6,0xA5,0xBC),
-     o3(0xE6,0xA6,0x94), o3(0xE6,0xB5,0xAA),
-     o3(0xE6,0xBC,0x8F), o3(0xE7,0x89,0xA2),
-     o3(0xE7,0x8B,0xBC), o3(0xE7,0xAF,0xAD),
-     o3(0xE8,0x80,0x81), o3(0xE8,0x81,0xBE),
-     o3(0xE8,0x9D,0x8B), o3(0xE9,0x83,0x8E),
-     o3(0xE5,0x85,0xAD), o3(0xE9,0xBA,0x93),
-     o3(0xE7,0xA6,0x84), o3(0xE8,0x82,0x8B),
-     o3(0xE9,0x8C,0xB2), o3(0xE8,0xAB,0x96),
-     o3(0xE5,0x80,0xAD), o3(0xE5,0x92,0x8C),
-     o3(0xE8,0xA9,0xB1), o3(0xE6,0xAD,0xAA),
-     o3(0xE8,0xB3,0x84), o3(0xE8,0x84,0x87),
-     o3(0xE6,0x83,0x91), o3(0xE6,0x9E,0xA0),
-     o3(0xE9,0xB7,0xB2), o3(0xE4,0xBA,0x99),
-     o3(0xE4,0xBA,0x98), o3(0xE9,0xB0,0x90),
-     o3(0xE8,0xA9,0xAB), o3(0xE8,0x97,0x81),
-     o3(0xE8,0x95,0xA8), o3(0xE6,0xA4,0x80),
-     o3(0xE6,0xB9,0xBE), o3(0xE7,0xA2,0x97),
-     o3(0xE8,0x85,0x95), o3(0xE5,0xBC,0x8C),
-     o3(0xE4,0xB8,0x90), o3(0xE4,0xB8,0x95),
-     o3(0xE4,0xB8,0xAA), o3(0xE4,0xB8,0xB1),
-     o3(0xE4,0xB8,0xB6), o3(0xE4,0xB8,0xBC),
-     o3(0xE4,0xB8,0xBF), o3(0xE4,0xB9,0x82),
-     o3(0xE4,0xB9,0x96), o3(0xE4,0xB9,0x98),
-     o3(0xE4,0xBA,0x82), o3(0xE4,0xBA,0x85),
-     o3(0xE8,0xB1,0xAB), o3(0xE4,0xBA,0x8A),
-     o3(0xE8,0x88,0x92), o3(0xE5,0xBC,0x8D),
-     o3(0xE4,0xBA,0x8E), o3(0xE4,0xBA,0x9E),
-     o3(0xE4,0xBA,0x9F), o3(0xE4,0xBA,0xA0),
-     o3(0xE4,0xBA,0xA2), o3(0xE4,0xBA,0xB0),
-     o3(0xE4,0xBA,0xB3), o3(0xE4,0xBA,0xB6),
-     o3(0xE4,0xBB,0x8E), o3(0xE4,0xBB,0x8D),
-     o3(0xE4,0xBB,0x84), o3(0xE4,0xBB,0x86),
-     o3(0xE4,0xBB,0x82), o3(0xE4,0xBB,0x97),
-     o3(0xE4,0xBB,0x9E), o3(0xE4,0xBB,0xAD),
-     o3(0xE4,0xBB,0x9F), o3(0xE4,0xBB,0xB7),
-     o3(0xE4,0xBC,0x89), o3(0xE4,0xBD,0x9A),
-     o3(0xE4,0xBC,0xB0), o3(0xE4,0xBD,0x9B),
-     o3(0xE4,0xBD,0x9D), o3(0xE4,0xBD,0x97),
-     o3(0xE4,0xBD,0x87), o3(0xE4,0xBD,0xB6),
-     o3(0xE4,0xBE,0x88), o3(0xE4,0xBE,0x8F),
-     o3(0xE4,0xBE,0x98), o3(0xE4,0xBD,0xBB),
-     o3(0xE4,0xBD,0xA9), o3(0xE4,0xBD,0xB0),
-     o3(0xE4,0xBE,0x91), o3(0xE4,0xBD,0xAF),
-     o3(0xE4,0xBE,0x86), o3(0xE4,0xBE,0x96),
-     o3(0xE5,0x84,0x98), o3(0xE4,0xBF,0x94),
-     o3(0xE4,0xBF,0x9F), o3(0xE4,0xBF,0x8E),
-     o3(0xE4,0xBF,0x98), o3(0xE4,0xBF,0x9B),
-     o3(0xE4,0xBF,0x91), o3(0xE4,0xBF,0x9A),
-     o3(0xE4,0xBF,0x90), o3(0xE4,0xBF,0xA4),
-     o3(0xE4,0xBF,0xA5), o3(0xE5,0x80,0x9A),
-     o3(0xE5,0x80,0xA8), o3(0xE5,0x80,0x94),
-     o3(0xE5,0x80,0xAA), o3(0xE5,0x80,0xA5),
-     o3(0xE5,0x80,0x85), o3(0xE4,0xBC,0x9C),
-     o3(0xE4,0xBF,0xB6), o3(0xE5,0x80,0xA1),
-     o3(0xE5,0x80,0xA9), o3(0xE5,0x80,0xAC),
-     o3(0xE4,0xBF,0xBE), o3(0xE4,0xBF,0xAF),
-     o3(0xE5,0x80,0x91), o3(0xE5,0x80,0x86),
-     o3(0xE5,0x81,0x83), o3(0xE5,0x81,0x87),
-     o3(0xE6,0x9C,0x83), o3(0xE5,0x81,0x95),
-     o3(0xE5,0x81,0x90), o3(0xE5,0x81,0x88),
-     o3(0xE5,0x81,0x9A), o3(0xE5,0x81,0x96),
-     o3(0xE5,0x81,0xAC), o3(0xE5,0x81,0xB8),
-     o3(0xE5,0x82,0x80), o3(0xE5,0x82,0x9A),
-     o3(0xE5,0x82,0x85), o3(0xE5,0x82,0xB4),
-     o3(0xE5,0x82,0xB2),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_98 = {
-    from_SHIFT_JIS_98_offsets,
-    from_SHIFT_JIS_98_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_99_infos[189] = {
-     o3(0xE5,0x83,0x89), o3(0xE5,0x83,0x8A),
-     o3(0xE5,0x82,0xB3), o3(0xE5,0x83,0x82),
-     o3(0xE5,0x83,0x96), o3(0xE5,0x83,0x9E),
-     o3(0xE5,0x83,0xA5), o3(0xE5,0x83,0xAD),
-     o3(0xE5,0x83,0xA3), o3(0xE5,0x83,0xAE),
-     o3(0xE5,0x83,0xB9), o3(0xE5,0x83,0xB5),
-     o3(0xE5,0x84,0x89), o3(0xE5,0x84,0x81),
-     o3(0xE5,0x84,0x82), o3(0xE5,0x84,0x96),
-     o3(0xE5,0x84,0x95), o3(0xE5,0x84,0x94),
-     o3(0xE5,0x84,0x9A), o3(0xE5,0x84,0xA1),
-     o3(0xE5,0x84,0xBA), o3(0xE5,0x84,0xB7),
-     o3(0xE5,0x84,0xBC), o3(0xE5,0x84,0xBB),
-     o3(0xE5,0x84,0xBF), o3(0xE5,0x85,0x80),
-     o3(0xE5,0x85,0x92), o3(0xE5,0x85,0x8C),
-     o3(0xE5,0x85,0x94), o3(0xE5,0x85,0xA2),
-     o3(0xE7,0xAB,0xB8), o3(0xE5,0x85,0xA9),
-     o3(0xE5,0x85,0xAA), o3(0xE5,0x85,0xAE),
-     o3(0xE5,0x86,0x80), o3(0xE5,0x86,0x82),
-     o3(0xE5,0x9B,0x98), o3(0xE5,0x86,0x8C),
-     o3(0xE5,0x86,0x89), o3(0xE5,0x86,0x8F),
-     o3(0xE5,0x86,0x91), o3(0xE5,0x86,0x93),
-     o3(0xE5,0x86,0x95), o3(0xE5,0x86,0x96),
-     o3(0xE5,0x86,0xA4), o3(0xE5,0x86,0xA6),
-     o3(0xE5,0x86,0xA2), o3(0xE5,0x86,0xA9),
-     o3(0xE5,0x86,0xAA), o3(0xE5,0x86,0xAB),
-     o3(0xE5,0x86,0xB3), o3(0xE5,0x86,0xB1),
-     o3(0xE5,0x86,0xB2), o3(0xE5,0x86,0xB0),
-     o3(0xE5,0x86,0xB5), o3(0xE5,0x86,0xBD),
-     o3(0xE5,0x87,0x85), o3(0xE5,0x87,0x89),
-     o3(0xE5,0x87,0x9B), o3(0xE5,0x87,0xA0),
-     o3(0xE8,0x99,0x95), o3(0xE5,0x87,0xA9),
-     o3(0xE5,0x87,0xAD), o3(0xE5,0x87,0xB0),
-     o3(0xE5,0x87,0xB5), o3(0xE5,0x87,0xBE),
-     o3(0xE5,0x88,0x84), o3(0xE5,0x88,0x8B),
-     o3(0xE5,0x88,0x94), o3(0xE5,0x88,0x8E),
-     o3(0xE5,0x88,0xA7), o3(0xE5,0x88,0xAA),
-     o3(0xE5,0x88,0xAE), o3(0xE5,0x88,0xB3),
-     o3(0xE5,0x88,0xB9), o3(0xE5,0x89,0x8F),
-     o3(0xE5,0x89,0x84), o3(0xE5,0x89,0x8B),
-     o3(0xE5,0x89,0x8C), o3(0xE5,0x89,0x9E),
-     o3(0xE5,0x89,0x94), o3(0xE5,0x89,0xAA),
-     o3(0xE5,0x89,0xB4), o3(0xE5,0x89,0xA9),
-     o3(0xE5,0x89,0xB3), o3(0xE5,0x89,0xBF),
-     o3(0xE5,0x89,0xBD), o3(0xE5,0x8A,0x8D),
-     o3(0xE5,0x8A,0x94), o3(0xE5,0x8A,0x92),
-     o3(0xE5,0x89,0xB1), o3(0xE5,0x8A,0x88),
-     o3(0xE5,0x8A,0x91), o3(0xE8,0xBE,0xA8),
-     o3(0xE8,0xBE,0xA7), o3(0xE5,0x8A,0xAC),
-     o3(0xE5,0x8A,0xAD), o3(0xE5,0x8A,0xBC),
-     o3(0xE5,0x8A,0xB5), o3(0xE5,0x8B,0x81),
-     o3(0xE5,0x8B,0x8D), o3(0xE5,0x8B,0x97),
-     o3(0xE5,0x8B,0x9E), o3(0xE5,0x8B,0xA3),
-     o3(0xE5,0x8B,0xA6), o3(0xE9,0xA3,0xAD),
-     o3(0xE5,0x8B,0xA0), o3(0xE5,0x8B,0xB3),
-     o3(0xE5,0x8B,0xB5), o3(0xE5,0x8B,0xB8),
-     o3(0xE5,0x8B,0xB9), o3(0xE5,0x8C,0x86),
-     o3(0xE5,0x8C,0x88), o3(0xE7,0x94,0xB8),
-     o3(0xE5,0x8C,0x8D), o3(0xE5,0x8C,0x90),
-     o3(0xE5,0x8C,0x8F), o3(0xE5,0x8C,0x95),
-     o3(0xE5,0x8C,0x9A), o3(0xE5,0x8C,0xA3),
-     o3(0xE5,0x8C,0xAF), o3(0xE5,0x8C,0xB1),
-     o3(0xE5,0x8C,0xB3), o3(0xE5,0x8C,0xB8),
-     o3(0xE5,0x8D,0x80), o3(0xE5,0x8D,0x86),
-     o3(0xE5,0x8D,0x85), o3(0xE4,0xB8,0x97),
-     o3(0xE5,0x8D,0x89), o3(0xE5,0x8D,0x8D),
-     o3(0xE5,0x87,0x96), o3(0xE5,0x8D,0x9E),
-     o3(0xE5,0x8D,0xA9), o3(0xE5,0x8D,0xAE),
-     o3(0xE5,0xA4,0x98), o3(0xE5,0x8D,0xBB),
-     o3(0xE5,0x8D,0xB7), o3(0xE5,0x8E,0x82),
-     o3(0xE5,0x8E,0x96), o3(0xE5,0x8E,0xA0),
-     o3(0xE5,0x8E,0xA6), o3(0xE5,0x8E,0xA5),
-     o3(0xE5,0x8E,0xAE), o3(0xE5,0x8E,0xB0),
-     o3(0xE5,0x8E,0xB6), o3(0xE5,0x8F,0x83),
-     o3(0xE7,0xB0,0x92), o3(0xE9,0x9B,0x99),
-     o3(0xE5,0x8F,0x9F), o3(0xE6,0x9B,0xBC),
-     o3(0xE7,0x87,0xAE), o3(0xE5,0x8F,0xAE),
-     o3(0xE5,0x8F,0xA8), o3(0xE5,0x8F,0xAD),
-     o3(0xE5,0x8F,0xBA), o3(0xE5,0x90,0x81),
-     o3(0xE5,0x90,0xBD), o3(0xE5,0x91,0x80),
-     o3(0xE5,0x90,0xAC), o3(0xE5,0x90,0xAD),
-     o3(0xE5,0x90,0xBC), o3(0xE5,0x90,0xAE),
-     o3(0xE5,0x90,0xB6), o3(0xE5,0x90,0xA9),
-     o3(0xE5,0x90,0x9D), o3(0xE5,0x91,0x8E),
-     o3(0xE5,0x92,0x8F), o3(0xE5,0x91,0xB5),
-     o3(0xE5,0x92,0x8E), o3(0xE5,0x91,0x9F),
-     o3(0xE5,0x91,0xB1), o3(0xE5,0x91,0xB7),
-     o3(0xE5,0x91,0xB0), o3(0xE5,0x92,0x92),
-     o3(0xE5,0x91,0xBB), o3(0xE5,0x92,0x80),
-     o3(0xE5,0x91,0xB6), o3(0xE5,0x92,0x84),
-     o3(0xE5,0x92,0x90), o3(0xE5,0x92,0x86),
-     o3(0xE5,0x93,0x87), o3(0xE5,0x92,0xA2),
-     o3(0xE5,0x92,0xB8), o3(0xE5,0x92,0xA5),
-     o3(0xE5,0x92,0xAC), o3(0xE5,0x93,0x84),
-     o3(0xE5,0x93,0x88), o3(0xE5,0x92,0xA8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_99 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_99_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9A_infos[189] = {
-     o3(0xE5,0x92,0xAB), o3(0xE5,0x93,0x82),
-     o3(0xE5,0x92,0xA4), o3(0xE5,0x92,0xBE),
-     o3(0xE5,0x92,0xBC), o3(0xE5,0x93,0x98),
-     o3(0xE5,0x93,0xA5), o3(0xE5,0x93,0xA6),
-     o3(0xE5,0x94,0x8F), o3(0xE5,0x94,0x94),
-     o3(0xE5,0x93,0xBD), o3(0xE5,0x93,0xAE),
-     o3(0xE5,0x93,0xAD), o3(0xE5,0x93,0xBA),
-     o3(0xE5,0x93,0xA2), o3(0xE5,0x94,0xB9),
-     o3(0xE5,0x95,0x80), o3(0xE5,0x95,0xA3),
-     o3(0xE5,0x95,0x8C), o3(0xE5,0x94,0xAE),
-     o3(0xE5,0x95,0x9C), o3(0xE5,0x95,0x85),
-     o3(0xE5,0x95,0x96), o3(0xE5,0x95,0x97),
-     o3(0xE5,0x94,0xB8), o3(0xE5,0x94,0xB3),
-     o3(0xE5,0x95,0x9D), o3(0xE5,0x96,0x99),
-     o3(0xE5,0x96,0x80), o3(0xE5,0x92,0xAF),
-     o3(0xE5,0x96,0x8A), o3(0xE5,0x96,0x9F),
-     o3(0xE5,0x95,0xBB), o3(0xE5,0x95,0xBE),
-     o3(0xE5,0x96,0x98), o3(0xE5,0x96,0x9E),
-     o3(0xE5,0x96,0xAE), o3(0xE5,0x95,0xBC),
-     o3(0xE5,0x96,0x83), o3(0xE5,0x96,0xA9),
-     o3(0xE5,0x96,0x87), o3(0xE5,0x96,0xA8),
-     o3(0xE5,0x97,0x9A), o3(0xE5,0x97,0x85),
-     o3(0xE5,0x97,0x9F), o3(0xE5,0x97,0x84),
-     o3(0xE5,0x97,0x9C), o3(0xE5,0x97,0xA4),
-     o3(0xE5,0x97,0x94), o3(0xE5,0x98,0x94),
-     o3(0xE5,0x97,0xB7), o3(0xE5,0x98,0x96),
-     o3(0xE5,0x97,0xBE), o3(0xE5,0x97,0xBD),
-     o3(0xE5,0x98,0x9B), o3(0xE5,0x97,0xB9),
-     o3(0xE5,0x99,0x8E), o3(0xE5,0x99,0x90),
-     o3(0xE7,0x87,0x9F), o3(0xE5,0x98,0xB4),
-     o3(0xE5,0x98,0xB6), o3(0xE5,0x98,0xB2),
-     o3(0xE5,0x98,0xB8), o3(0xE5,0x99,0xAB),
-     o3(0xE5,0x99,0xA4), o3(0xE5,0x98,0xAF),
-     o3(0xE5,0x99,0xAC), o3(0xE5,0x99,0xAA),
-     o3(0xE5,0x9A,0x86), o3(0xE5,0x9A,0x80),
-     o3(0xE5,0x9A,0x8A), o3(0xE5,0x9A,0xA0),
-     o3(0xE5,0x9A,0x94), o3(0xE5,0x9A,0x8F),
-     o3(0xE5,0x9A,0xA5), o3(0xE5,0x9A,0xAE),
-     o3(0xE5,0x9A,0xB6), o3(0xE5,0x9A,0xB4),
-     o3(0xE5,0x9B,0x82), o3(0xE5,0x9A,0xBC),
-     o3(0xE5,0x9B,0x81), o3(0xE5,0x9B,0x83),
-     o3(0xE5,0x9B,0x80), o3(0xE5,0x9B,0x88),
-     o3(0xE5,0x9B,0x8E), o3(0xE5,0x9B,0x91),
-     o3(0xE5,0x9B,0x93), o3(0xE5,0x9B,0x97),
-     o3(0xE5,0x9B,0xAE), o3(0xE5,0x9B,0xB9),
-     o3(0xE5,0x9C,0x80), o3(0xE5,0x9B,0xBF),
-     o3(0xE5,0x9C,0x84), o3(0xE5,0x9C,0x89),
-     o3(0xE5,0x9C,0x88), o3(0xE5,0x9C,0x8B),
-     o3(0xE5,0x9C,0x8D), o3(0xE5,0x9C,0x93),
-     o3(0xE5,0x9C,0x98), o3(0xE5,0x9C,0x96),
-     o3(0xE5,0x97,0x87), o3(0xE5,0x9C,0x9C),
-     o3(0xE5,0x9C,0xA6), o3(0xE5,0x9C,0xB7),
-     o3(0xE5,0x9C,0xB8), o3(0xE5,0x9D,0x8E),
-     o3(0xE5,0x9C,0xBB), o3(0xE5,0x9D,0x80),
-     o3(0xE5,0x9D,0x8F), o3(0xE5,0x9D,0xA9),
-     o3(0xE5,0x9F,0x80), o3(0xE5,0x9E,0x88),
-     o3(0xE5,0x9D,0xA1), o3(0xE5,0x9D,0xBF),
-     o3(0xE5,0x9E,0x89), o3(0xE5,0x9E,0x93),
-     o3(0xE5,0x9E,0xA0), o3(0xE5,0x9E,0xB3),
-     o3(0xE5,0x9E,0xA4), o3(0xE5,0x9E,0xAA),
-     o3(0xE5,0x9E,0xB0), o3(0xE5,0x9F,0x83),
-     o3(0xE5,0x9F,0x86), o3(0xE5,0x9F,0x94),
-     o3(0xE5,0x9F,0x92), o3(0xE5,0x9F,0x93),
-     o3(0xE5,0xA0,0x8A), o3(0xE5,0x9F,0x96),
-     o3(0xE5,0x9F,0xA3), o3(0xE5,0xA0,0x8B),
-     o3(0xE5,0xA0,0x99), o3(0xE5,0xA0,0x9D),
-     o3(0xE5,0xA1,0xB2), o3(0xE5,0xA0,0xA1),
-     o3(0xE5,0xA1,0xA2), o3(0xE5,0xA1,0x8B),
-     o3(0xE5,0xA1,0xB0), o3(0xE6,0xAF,0x80),
-     o3(0xE5,0xA1,0x92), o3(0xE5,0xA0,0xBD),
-     o3(0xE5,0xA1,0xB9), o3(0xE5,0xA2,0x85),
-     o3(0xE5,0xA2,0xB9), o3(0xE5,0xA2,0x9F),
-     o3(0xE5,0xA2,0xAB), o3(0xE5,0xA2,0xBA),
-     o3(0xE5,0xA3,0x9E), o3(0xE5,0xA2,0xBB),
-     o3(0xE5,0xA2,0xB8), o3(0xE5,0xA2,0xAE),
-     o3(0xE5,0xA3,0x85), o3(0xE5,0xA3,0x93),
-     o3(0xE5,0xA3,0x91), o3(0xE5,0xA3,0x97),
-     o3(0xE5,0xA3,0x99), o3(0xE5,0xA3,0x98),
-     o3(0xE5,0xA3,0xA5), o3(0xE5,0xA3,0x9C),
-     o3(0xE5,0xA3,0xA4), o3(0xE5,0xA3,0x9F),
-     o3(0xE5,0xA3,0xAF), o3(0xE5,0xA3,0xBA),
-     o3(0xE5,0xA3,0xB9), o3(0xE5,0xA3,0xBB),
-     o3(0xE5,0xA3,0xBC), o3(0xE5,0xA3,0xBD),
-     o3(0xE5,0xA4,0x82), o3(0xE5,0xA4,0x8A),
-     o3(0xE5,0xA4,0x90), o3(0xE5,0xA4,0x9B),
-     o3(0xE6,0xA2,0xA6), o3(0xE5,0xA4,0xA5),
-     o3(0xE5,0xA4,0xAC), o3(0xE5,0xA4,0xAD),
-     o3(0xE5,0xA4,0xB2), o3(0xE5,0xA4,0xB8),
-     o3(0xE5,0xA4,0xBE), o3(0xE7,0xAB,0x92),
-     o3(0xE5,0xA5,0x95), o3(0xE5,0xA5,0x90),
-     o3(0xE5,0xA5,0x8E), o3(0xE5,0xA5,0x9A),
-     o3(0xE5,0xA5,0x98), o3(0xE5,0xA5,0xA2),
-     o3(0xE5,0xA5,0xA0), o3(0xE5,0xA5,0xA7),
-     o3(0xE5,0xA5,0xAC), o3(0xE5,0xA5,0xA9),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9A = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9A_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9B_infos[189] = {
-     o3(0xE5,0xA5,0xB8), o3(0xE5,0xA6,0x81),
-     o3(0xE5,0xA6,0x9D), o3(0xE4,0xBD,0x9E),
-     o3(0xE4,0xBE,0xAB), o3(0xE5,0xA6,0xA3),
-     o3(0xE5,0xA6,0xB2), o3(0xE5,0xA7,0x86),
-     o3(0xE5,0xA7,0xA8), o3(0xE5,0xA7,0x9C),
-     o3(0xE5,0xA6,0x8D), o3(0xE5,0xA7,0x99),
-     o3(0xE5,0xA7,0x9A), o3(0xE5,0xA8,0xA5),
-     o3(0xE5,0xA8,0x9F), o3(0xE5,0xA8,0x91),
-     o3(0xE5,0xA8,0x9C), o3(0xE5,0xA8,0x89),
-     o3(0xE5,0xA8,0x9A), o3(0xE5,0xA9,0x80),
-     o3(0xE5,0xA9,0xAC), o3(0xE5,0xA9,0x89),
-     o3(0xE5,0xA8,0xB5), o3(0xE5,0xA8,0xB6),
-     o3(0xE5,0xA9,0xA2), o3(0xE5,0xA9,0xAA),
-     o3(0xE5,0xAA,0x9A), o3(0xE5,0xAA,0xBC),
-     o3(0xE5,0xAA,0xBE), o3(0xE5,0xAB,0x8B),
-     o3(0xE5,0xAB,0x82), o3(0xE5,0xAA,0xBD),
-     o3(0xE5,0xAB,0xA3), o3(0xE5,0xAB,0x97),
-     o3(0xE5,0xAB,0xA6), o3(0xE5,0xAB,0xA9),
-     o3(0xE5,0xAB,0x96), o3(0xE5,0xAB,0xBA),
-     o3(0xE5,0xAB,0xBB), o3(0xE5,0xAC,0x8C),
-     o3(0xE5,0xAC,0x8B), o3(0xE5,0xAC,0x96),
-     o3(0xE5,0xAC,0xB2), o3(0xE5,0xAB,0x90),
-     o3(0xE5,0xAC,0xAA), o3(0xE5,0xAC,0xB6),
-     o3(0xE5,0xAC,0xBE), o3(0xE5,0xAD,0x83),
-     o3(0xE5,0xAD,0x85), o3(0xE5,0xAD,0x80),
-     o3(0xE5,0xAD,0x91), o3(0xE5,0xAD,0x95),
-     o3(0xE5,0xAD,0x9A), o3(0xE5,0xAD,0x9B),
-     o3(0xE5,0xAD,0xA5), o3(0xE5,0xAD,0xA9),
-     o3(0xE5,0xAD,0xB0), o3(0xE5,0xAD,0xB3),
-     o3(0xE5,0xAD,0xB5), o3(0xE5,0xAD,0xB8),
-     o3(0xE6,0x96,0x88), o3(0xE5,0xAD,0xBA),
-     o3(0xE5,0xAE,0x80), o3(0xE5,0xAE,0x83),
-     o3(0xE5,0xAE,0xA6), o3(0xE5,0xAE,0xB8),
-     o3(0xE5,0xAF,0x83), o3(0xE5,0xAF,0x87),
-     o3(0xE5,0xAF,0x89), o3(0xE5,0xAF,0x94),
-     o3(0xE5,0xAF,0x90), o3(0xE5,0xAF,0xA4),
-     o3(0xE5,0xAF,0xA6), o3(0xE5,0xAF,0xA2),
-     o3(0xE5,0xAF,0x9E), o3(0xE5,0xAF,0xA5),
-     o3(0xE5,0xAF,0xAB), o3(0xE5,0xAF,0xB0),
-     o3(0xE5,0xAF,0xB6), o3(0xE5,0xAF,0xB3),
-     o3(0xE5,0xB0,0x85), o3(0xE5,0xB0,0x87),
-     o3(0xE5,0xB0,0x88), o3(0xE5,0xB0,0x8D),
-     o3(0xE5,0xB0,0x93), o3(0xE5,0xB0,0xA0),
-     o3(0xE5,0xB0,0xA2), o3(0xE5,0xB0,0xA8),
-     o3(0xE5,0xB0,0xB8), o3(0xE5,0xB0,0xB9),
-     o3(0xE5,0xB1,0x81), o3(0xE5,0xB1,0x86),
-     o3(0xE5,0xB1,0x8E), o3(0xE5,0xB1,0x93),
-     o3(0xE5,0xB1,0x90), o3(0xE5,0xB1,0x8F),
-     o3(0xE5,0xAD,0xB1), o3(0xE5,0xB1,0xAC),
-     o3(0xE5,0xB1,0xAE), o3(0xE4,0xB9,0xA2),
-     o3(0xE5,0xB1,0xB6), o3(0xE5,0xB1,0xB9),
-     o3(0xE5,0xB2,0x8C), o3(0xE5,0xB2,0x91),
-     o3(0xE5,0xB2,0x94), o3(0xE5,0xA6,0x9B),
-     o3(0xE5,0xB2,0xAB), o3(0xE5,0xB2,0xBB),
-     o3(0xE5,0xB2,0xB6), o3(0xE5,0xB2,0xBC),
-     o3(0xE5,0xB2,0xB7), o3(0xE5,0xB3,0x85),
-     o3(0xE5,0xB2,0xBE), o3(0xE5,0xB3,0x87),
-     o3(0xE5,0xB3,0x99), o3(0xE5,0xB3,0xA9),
-     o3(0xE5,0xB3,0xBD), o3(0xE5,0xB3,0xBA),
-     o3(0xE5,0xB3,0xAD), o3(0xE5,0xB6,0x8C),
-     o3(0xE5,0xB3,0xAA), o3(0xE5,0xB4,0x8B),
-     o3(0xE5,0xB4,0x95), o3(0xE5,0xB4,0x97),
-     o3(0xE5,0xB5,0x9C), o3(0xE5,0xB4,0x9F),
-     o3(0xE5,0xB4,0x9B), o3(0xE5,0xB4,0x91),
-     o3(0xE5,0xB4,0x94), o3(0xE5,0xB4,0xA2),
-     o3(0xE5,0xB4,0x9A), o3(0xE5,0xB4,0x99),
-     o3(0xE5,0xB4,0x98), o3(0xE5,0xB5,0x8C),
-     o3(0xE5,0xB5,0x92), o3(0xE5,0xB5,0x8E),
-     o3(0xE5,0xB5,0x8B), o3(0xE5,0xB5,0xAC),
-     o3(0xE5,0xB5,0xB3), o3(0xE5,0xB5,0xB6),
-     o3(0xE5,0xB6,0x87), o3(0xE5,0xB6,0x84),
-     o3(0xE5,0xB6,0x82), o3(0xE5,0xB6,0xA2),
-     o3(0xE5,0xB6,0x9D), o3(0xE5,0xB6,0xAC),
-     o3(0xE5,0xB6,0xAE), o3(0xE5,0xB6,0xBD),
-     o3(0xE5,0xB6,0x90), o3(0xE5,0xB6,0xB7),
-     o3(0xE5,0xB6,0xBC), o3(0xE5,0xB7,0x89),
-     o3(0xE5,0xB7,0x8D), o3(0xE5,0xB7,0x93),
-     o3(0xE5,0xB7,0x92), o3(0xE5,0xB7,0x96),
-     o3(0xE5,0xB7,0x9B), o3(0xE5,0xB7,0xAB),
-     o3(0xE5,0xB7,0xB2), o3(0xE5,0xB7,0xB5),
-     o3(0xE5,0xB8,0x8B), o3(0xE5,0xB8,0x9A),
-     o3(0xE5,0xB8,0x99), o3(0xE5,0xB8,0x91),
-     o3(0xE5,0xB8,0x9B), o3(0xE5,0xB8,0xB6),
-     o3(0xE5,0xB8,0xB7), o3(0xE5,0xB9,0x84),
-     o3(0xE5,0xB9,0x83), o3(0xE5,0xB9,0x80),
-     o3(0xE5,0xB9,0x8E), o3(0xE5,0xB9,0x97),
-     o3(0xE5,0xB9,0x94), o3(0xE5,0xB9,0x9F),
-     o3(0xE5,0xB9,0xA2), o3(0xE5,0xB9,0xA4),
-     o3(0xE5,0xB9,0x87), o3(0xE5,0xB9,0xB5),
-     o3(0xE5,0xB9,0xB6), o3(0xE5,0xB9,0xBA),
-     o3(0xE9,0xBA,0xBC), o3(0xE5,0xB9,0xBF),
-     o3(0xE5,0xBA,0xA0), o3(0xE5,0xBB,0x81),
-     o3(0xE5,0xBB,0x82), o3(0xE5,0xBB,0x88),
-     o3(0xE5,0xBB,0x90), o3(0xE5,0xBB,0x8F),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9B = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9B_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9C_infos[189] = {
-     o3(0xE5,0xBB,0x96), o3(0xE5,0xBB,0xA3),
-     o3(0xE5,0xBB,0x9D), o3(0xE5,0xBB,0x9A),
-     o3(0xE5,0xBB,0x9B), o3(0xE5,0xBB,0xA2),
-     o3(0xE5,0xBB,0xA1), o3(0xE5,0xBB,0xA8),
-     o3(0xE5,0xBB,0xA9), o3(0xE5,0xBB,0xAC),
-     o3(0xE5,0xBB,0xB1), o3(0xE5,0xBB,0xB3),
-     o3(0xE5,0xBB,0xB0), o3(0xE5,0xBB,0xB4),
-     o3(0xE5,0xBB,0xB8), o3(0xE5,0xBB,0xBE),
-     o3(0xE5,0xBC,0x83), o3(0xE5,0xBC,0x89),
-     o3(0xE5,0xBD,0x9D), o3(0xE5,0xBD,0x9C),
-     o3(0xE5,0xBC,0x8B), o3(0xE5,0xBC,0x91),
-     o3(0xE5,0xBC,0x96), o3(0xE5,0xBC,0xA9),
-     o3(0xE5,0xBC,0xAD), o3(0xE5,0xBC,0xB8),
-     o3(0xE5,0xBD,0x81), o3(0xE5,0xBD,0x88),
-     o3(0xE5,0xBD,0x8C), o3(0xE5,0xBD,0x8E),
-     o3(0xE5,0xBC,0xAF), o3(0xE5,0xBD,0x91),
-     o3(0xE5,0xBD,0x96), o3(0xE5,0xBD,0x97),
-     o3(0xE5,0xBD,0x99), o3(0xE5,0xBD,0xA1),
-     o3(0xE5,0xBD,0xAD), o3(0xE5,0xBD,0xB3),
-     o3(0xE5,0xBD,0xB7), o3(0xE5,0xBE,0x83),
-     o3(0xE5,0xBE,0x82), o3(0xE5,0xBD,0xBF),
-     o3(0xE5,0xBE,0x8A), o3(0xE5,0xBE,0x88),
-     o3(0xE5,0xBE,0x91), o3(0xE5,0xBE,0x87),
-     o3(0xE5,0xBE,0x9E), o3(0xE5,0xBE,0x99),
-     o3(0xE5,0xBE,0x98), o3(0xE5,0xBE,0xA0),
-     o3(0xE5,0xBE,0xA8), o3(0xE5,0xBE,0xAD),
-     o3(0xE5,0xBE,0xBC), o3(0xE5,0xBF,0x96),
-     o3(0xE5,0xBF,0xBB), o3(0xE5,0xBF,0xA4),
-     o3(0xE5,0xBF,0xB8), o3(0xE5,0xBF,0xB1),
-     o3(0xE5,0xBF,0x9D), o3(0xE6,0x82,0xB3),
-     o3(0xE5,0xBF,0xBF), o3(0xE6,0x80,0xA1),
-     o3(0xE6,0x81,0xA0), o3(0xE6,0x80,0x99),
-     o3(0xE6,0x80,0x90), o3(0xE6,0x80,0xA9),
-     o3(0xE6,0x80,0x8E), o3(0xE6,0x80,0xB1),
-     o3(0xE6,0x80,0x9B), o3(0xE6,0x80,0x95),
-     o3(0xE6,0x80,0xAB), o3(0xE6,0x80,0xA6),
-     o3(0xE6,0x80,0x8F), o3(0xE6,0x80,0xBA),
-     o3(0xE6,0x81,0x9A), o3(0xE6,0x81,0x81),
-     o3(0xE6,0x81,0xAA), o3(0xE6,0x81,0xB7),
-     o3(0xE6,0x81,0x9F), o3(0xE6,0x81,0x8A),
-     o3(0xE6,0x81,0x86), o3(0xE6,0x81,0x8D),
-     o3(0xE6,0x81,0xA3), o3(0xE6,0x81,0x83),
-     o3(0xE6,0x81,0xA4), o3(0xE6,0x81,0x82),
-     o3(0xE6,0x81,0xAC), o3(0xE6,0x81,0xAB),
-     o3(0xE6,0x81,0x99), o3(0xE6,0x82,0x81),
-     o3(0xE6,0x82,0x8D), o3(0xE6,0x83,0xA7),
-     o3(0xE6,0x82,0x83), o3(0xE6,0x82,0x9A),
-     o3(0xE6,0x82,0x84), o3(0xE6,0x82,0x9B),
-     o3(0xE6,0x82,0x96), o3(0xE6,0x82,0x97),
-     o3(0xE6,0x82,0x92), o3(0xE6,0x82,0xA7),
-     o3(0xE6,0x82,0x8B), o3(0xE6,0x83,0xA1),
-     o3(0xE6,0x82,0xB8), o3(0xE6,0x83,0xA0),
-     o3(0xE6,0x83,0x93), o3(0xE6,0x82,0xB4),
-     o3(0xE5,0xBF,0xB0), o3(0xE6,0x82,0xBD),
-     o3(0xE6,0x83,0x86), o3(0xE6,0x82,0xB5),
-     o3(0xE6,0x83,0x98), o3(0xE6,0x85,0x8D),
-     o3(0xE6,0x84,0x95), o3(0xE6,0x84,0x86),
-     o3(0xE6,0x83,0xB6), o3(0xE6,0x83,0xB7),
-     o3(0xE6,0x84,0x80), o3(0xE6,0x83,0xB4),
-     o3(0xE6,0x83,0xBA), o3(0xE6,0x84,0x83),
-     o3(0xE6,0x84,0xA1), o3(0xE6,0x83,0xBB),
-     o3(0xE6,0x83,0xB1), o3(0xE6,0x84,0x8D),
-     o3(0xE6,0x84,0x8E), o3(0xE6,0x85,0x87),
-     o3(0xE6,0x84,0xBE), o3(0xE6,0x84,0xA8),
-     o3(0xE6,0x84,0xA7), o3(0xE6,0x85,0x8A),
-     o3(0xE6,0x84,0xBF), o3(0xE6,0x84,0xBC),
-     o3(0xE6,0x84,0xAC), o3(0xE6,0x84,0xB4),
-     o3(0xE6,0x84,0xBD), o3(0xE6,0x85,0x82),
-     o3(0xE6,0x85,0x84), o3(0xE6,0x85,0xB3),
-     o3(0xE6,0x85,0xB7), o3(0xE6,0x85,0x98),
-     o3(0xE6,0x85,0x99), o3(0xE6,0x85,0x9A),
-     o3(0xE6,0x85,0xAB), o3(0xE6,0x85,0xB4),
-     o3(0xE6,0x85,0xAF), o3(0xE6,0x85,0xA5),
-     o3(0xE6,0x85,0xB1), o3(0xE6,0x85,0x9F),
-     o3(0xE6,0x85,0x9D), o3(0xE6,0x85,0x93),
-     o3(0xE6,0x85,0xB5), o3(0xE6,0x86,0x99),
-     o3(0xE6,0x86,0x96), o3(0xE6,0x86,0x87),
-     o3(0xE6,0x86,0xAC), o3(0xE6,0x86,0x94),
-     o3(0xE6,0x86,0x9A), o3(0xE6,0x86,0x8A),
-     o3(0xE6,0x86,0x91), o3(0xE6,0x86,0xAB),
-     o3(0xE6,0x86,0xAE), o3(0xE6,0x87,0x8C),
-     o3(0xE6,0x87,0x8A), o3(0xE6,0x87,0x89),
-     o3(0xE6,0x87,0xB7), o3(0xE6,0x87,0x88),
-     o3(0xE6,0x87,0x83), o3(0xE6,0x87,0x86),
-     o3(0xE6,0x86,0xBA), o3(0xE6,0x87,0x8B),
-     o3(0xE7,0xBD,0xB9), o3(0xE6,0x87,0x8D),
-     o3(0xE6,0x87,0xA6), o3(0xE6,0x87,0xA3),
-     o3(0xE6,0x87,0xB6), o3(0xE6,0x87,0xBA),
-     o3(0xE6,0x87,0xB4), o3(0xE6,0x87,0xBF),
-     o3(0xE6,0x87,0xBD), o3(0xE6,0x87,0xBC),
-     o3(0xE6,0x87,0xBE), o3(0xE6,0x88,0x80),
-     o3(0xE6,0x88,0x88), o3(0xE6,0x88,0x89),
-     o3(0xE6,0x88,0x8D), o3(0xE6,0x88,0x8C),
-     o3(0xE6,0x88,0x94), o3(0xE6,0x88,0x9B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9C = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9C_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9D_infos[189] = {
-     o3(0xE6,0x88,0x9E), o3(0xE6,0x88,0xA1),
-     o3(0xE6,0x88,0xAA), o3(0xE6,0x88,0xAE),
-     o3(0xE6,0x88,0xB0), o3(0xE6,0x88,0xB2),
-     o3(0xE6,0x88,0xB3), o3(0xE6,0x89,0x81),
-     o3(0xE6,0x89,0x8E), o3(0xE6,0x89,0x9E),
-     o3(0xE6,0x89,0xA3), o3(0xE6,0x89,0x9B),
-     o3(0xE6,0x89,0xA0), o3(0xE6,0x89,0xA8),
-     o3(0xE6,0x89,0xBC), o3(0xE6,0x8A,0x82),
-     o3(0xE6,0x8A,0x89), o3(0xE6,0x89,0xBE),
-     o3(0xE6,0x8A,0x92), o3(0xE6,0x8A,0x93),
-     o3(0xE6,0x8A,0x96), o3(0xE6,0x8B,0x94),
-     o3(0xE6,0x8A,0x83), o3(0xE6,0x8A,0x94),
-     o3(0xE6,0x8B,0x97), o3(0xE6,0x8B,0x91),
-     o3(0xE6,0x8A,0xBB), o3(0xE6,0x8B,0x8F),
-     o3(0xE6,0x8B,0xBF), o3(0xE6,0x8B,0x86),
-     o3(0xE6,0x93,0x94), o3(0xE6,0x8B,0x88),
-     o3(0xE6,0x8B,0x9C), o3(0xE6,0x8B,0x8C),
-     o3(0xE6,0x8B,0x8A), o3(0xE6,0x8B,0x82),
-     o3(0xE6,0x8B,0x87), o3(0xE6,0x8A,0x9B),
-     o3(0xE6,0x8B,0x89), o3(0xE6,0x8C,0x8C),
-     o3(0xE6,0x8B,0xAE), o3(0xE6,0x8B,0xB1),
-     o3(0xE6,0x8C,0xA7), o3(0xE6,0x8C,0x82),
-     o3(0xE6,0x8C,0x88), o3(0xE6,0x8B,0xAF),
-     o3(0xE6,0x8B,0xB5), o3(0xE6,0x8D,0x90),
-     o3(0xE6,0x8C,0xBE), o3(0xE6,0x8D,0x8D),
-     o3(0xE6,0x90,0x9C), o3(0xE6,0x8D,0x8F),
-     o3(0xE6,0x8E,0x96), o3(0xE6,0x8E,0x8E),
-     o3(0xE6,0x8E,0x80), o3(0xE6,0x8E,0xAB),
-     o3(0xE6,0x8D,0xB6), o3(0xE6,0x8E,0xA3),
-     o3(0xE6,0x8E,0x8F), o3(0xE6,0x8E,0x89),
-     o3(0xE6,0x8E,0x9F), o3(0xE6,0x8E,0xB5),
-     o3(0xE6,0x8D,0xAB), o3(0xE6,0x8D,0xA9),
-     o3(0xE6,0x8E,0xBE), o3(0xE6,0x8F,0xA9),
-     o3(0xE6,0x8F,0x80), o3(0xE6,0x8F,0x86),
-     o3(0xE6,0x8F,0xA3), o3(0xE6,0x8F,0x89),
-     o3(0xE6,0x8F,0x92), o3(0xE6,0x8F,0xB6),
-     o3(0xE6,0x8F,0x84), o3(0xE6,0x90,0x96),
-     o3(0xE6,0x90,0xB4), o3(0xE6,0x90,0x86),
-     o3(0xE6,0x90,0x93), o3(0xE6,0x90,0xA6),
-     o3(0xE6,0x90,0xB6), o3(0xE6,0x94,0x9D),
-     o3(0xE6,0x90,0x97), o3(0xE6,0x90,0xA8),
-     o3(0xE6,0x90,0x8F), o3(0xE6,0x91,0xA7),
-     o3(0xE6,0x91,0xAF), o3(0xE6,0x91,0xB6),
-     o3(0xE6,0x91,0x8E), o3(0xE6,0x94,0xAA),
-     o3(0xE6,0x92,0x95), o3(0xE6,0x92,0x93),
-     o3(0xE6,0x92,0xA5), o3(0xE6,0x92,0xA9),
-     o3(0xE6,0x92,0x88), o3(0xE6,0x92,0xBC),
-     o3(0xE6,0x93,0x9A), o3(0xE6,0x93,0x92),
-     o3(0xE6,0x93,0x85), o3(0xE6,0x93,0x87),
-     o3(0xE6,0x92,0xBB), o3(0xE6,0x93,0x98),
-     o3(0xE6,0x93,0x82), o3(0xE6,0x93,0xB1),
-     o3(0xE6,0x93,0xA7), o3(0xE8,0x88,0x89),
-     o3(0xE6,0x93,0xA0), o3(0xE6,0x93,0xA1),
-     o3(0xE6,0x8A,0xAC), o3(0xE6,0x93,0xA3),
-     o3(0xE6,0x93,0xAF), o3(0xE6,0x94,0xAC),
-     o3(0xE6,0x93,0xB6), o3(0xE6,0x93,0xB4),
-     o3(0xE6,0x93,0xB2), o3(0xE6,0x93,0xBA),
-     o3(0xE6,0x94,0x80), o3(0xE6,0x93,0xBD),
-     o3(0xE6,0x94,0x98), o3(0xE6,0x94,0x9C),
-     o3(0xE6,0x94,0x85), o3(0xE6,0x94,0xA4),
-     o3(0xE6,0x94,0xA3), o3(0xE6,0x94,0xAB),
-     o3(0xE6,0x94,0xB4), o3(0xE6,0x94,0xB5),
-     o3(0xE6,0x94,0xB7), o3(0xE6,0x94,0xB6),
-     o3(0xE6,0x94,0xB8), o3(0xE7,0x95,0x8B),
-     o3(0xE6,0x95,0x88), o3(0xE6,0x95,0x96),
-     o3(0xE6,0x95,0x95), o3(0xE6,0x95,0x8D),
-     o3(0xE6,0x95,0x98), o3(0xE6,0x95,0x9E),
-     o3(0xE6,0x95,0x9D), o3(0xE6,0x95,0xB2),
-     o3(0xE6,0x95,0xB8), o3(0xE6,0x96,0x82),
-     o3(0xE6,0x96,0x83), o3(0xE8,0xAE,0x8A),
-     o3(0xE6,0x96,0x9B), o3(0xE6,0x96,0x9F),
-     o3(0xE6,0x96,0xAB), o3(0xE6,0x96,0xB7),
-     o3(0xE6,0x97,0x83), o3(0xE6,0x97,0x86),
-     o3(0xE6,0x97,0x81), o3(0xE6,0x97,0x84),
-     o3(0xE6,0x97,0x8C), o3(0xE6,0x97,0x92),
-     o3(0xE6,0x97,0x9B), o3(0xE6,0x97,0x99),
-     o3(0xE6,0x97,0xA0), o3(0xE6,0x97,0xA1),
-     o3(0xE6,0x97,0xB1), o3(0xE6,0x9D,0xB2),
-     o3(0xE6,0x98,0x8A), o3(0xE6,0x98,0x83),
-     o3(0xE6,0x97,0xBB), o3(0xE6,0x9D,0xB3),
-     o3(0xE6,0x98,0xB5), o3(0xE6,0x98,0xB6),
-     o3(0xE6,0x98,0xB4), o3(0xE6,0x98,0x9C),
-     o3(0xE6,0x99,0x8F), o3(0xE6,0x99,0x84),
-     o3(0xE6,0x99,0x89), o3(0xE6,0x99,0x81),
-     o3(0xE6,0x99,0x9E), o3(0xE6,0x99,0x9D),
-     o3(0xE6,0x99,0xA4), o3(0xE6,0x99,0xA7),
-     o3(0xE6,0x99,0xA8), o3(0xE6,0x99,0x9F),
-     o3(0xE6,0x99,0xA2), o3(0xE6,0x99,0xB0),
-     o3(0xE6,0x9A,0x83), o3(0xE6,0x9A,0x88),
-     o3(0xE6,0x9A,0x8E), o3(0xE6,0x9A,0x89),
-     o3(0xE6,0x9A,0x84), o3(0xE6,0x9A,0x98),
-     o3(0xE6,0x9A,0x9D), o3(0xE6,0x9B,0x81),
-     o3(0xE6,0x9A,0xB9), o3(0xE6,0x9B,0x89),
-     o3(0xE6,0x9A,0xBE), o3(0xE6,0x9A,0xBC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9D = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9D_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9E_infos[189] = {
-     o3(0xE6,0x9B,0x84), o3(0xE6,0x9A,0xB8),
-     o3(0xE6,0x9B,0x96), o3(0xE6,0x9B,0x9A),
-     o3(0xE6,0x9B,0xA0), o3(0xE6,0x98,0xBF),
-     o3(0xE6,0x9B,0xA6), o3(0xE6,0x9B,0xA9),
-     o3(0xE6,0x9B,0xB0), o3(0xE6,0x9B,0xB5),
-     o3(0xE6,0x9B,0xB7), o3(0xE6,0x9C,0x8F),
-     o3(0xE6,0x9C,0x96), o3(0xE6,0x9C,0x9E),
-     o3(0xE6,0x9C,0xA6), o3(0xE6,0x9C,0xA7),
-     o3(0xE9,0x9C,0xB8), o3(0xE6,0x9C,0xAE),
-     o3(0xE6,0x9C,0xBF), o3(0xE6,0x9C,0xB6),
-     o3(0xE6,0x9D,0x81), o3(0xE6,0x9C,0xB8),
-     o3(0xE6,0x9C,0xB7), o3(0xE6,0x9D,0x86),
-     o3(0xE6,0x9D,0x9E), o3(0xE6,0x9D,0xA0),
-     o3(0xE6,0x9D,0x99), o3(0xE6,0x9D,0xA3),
-     o3(0xE6,0x9D,0xA4), o3(0xE6,0x9E,0x89),
-     o3(0xE6,0x9D,0xB0), o3(0xE6,0x9E,0xA9),
-     o3(0xE6,0x9D,0xBC), o3(0xE6,0x9D,0xAA),
-     o3(0xE6,0x9E,0x8C), o3(0xE6,0x9E,0x8B),
-     o3(0xE6,0x9E,0xA6), o3(0xE6,0x9E,0xA1),
-     o3(0xE6,0x9E,0x85), o3(0xE6,0x9E,0xB7),
-     o3(0xE6,0x9F,0xAF), o3(0xE6,0x9E,0xB4),
-     o3(0xE6,0x9F,0xAC), o3(0xE6,0x9E,0xB3),
-     o3(0xE6,0x9F,0xA9), o3(0xE6,0x9E,0xB8),
-     o3(0xE6,0x9F,0xA4), o3(0xE6,0x9F,0x9E),
-     o3(0xE6,0x9F,0x9D), o3(0xE6,0x9F,0xA2),
-     o3(0xE6,0x9F,0xAE), o3(0xE6,0x9E,0xB9),
-     o3(0xE6,0x9F,0x8E), o3(0xE6,0x9F,0x86),
-     o3(0xE6,0x9F,0xA7), o3(0xE6,0xAA,0x9C),
-     o3(0xE6,0xA0,0x9E), o3(0xE6,0xA1,0x86),
-     o3(0xE6,0xA0,0xA9), o3(0xE6,0xA1,0x80),
-     o3(0xE6,0xA1,0x8D), o3(0xE6,0xA0,0xB2),
-     o3(0xE6,0xA1,0x8E), o3(0xE6,0xA2,0xB3),
-     o3(0xE6,0xA0,0xAB), o3(0xE6,0xA1,0x99),
-     o3(0xE6,0xA1,0xA3), o3(0xE6,0xA1,0xB7),
-     o3(0xE6,0xA1,0xBF), o3(0xE6,0xA2,0x9F),
-     o3(0xE6,0xA2,0x8F), o3(0xE6,0xA2,0xAD),
-     o3(0xE6,0xA2,0x94), o3(0xE6,0xA2,0x9D),
-     o3(0xE6,0xA2,0x9B), o3(0xE6,0xA2,0x83),
-     o3(0xE6,0xAA,0xAE), o3(0xE6,0xA2,0xB9),
-     o3(0xE6,0xA1,0xB4), o3(0xE6,0xA2,0xB5),
-     o3(0xE6,0xA2,0xA0), o3(0xE6,0xA2,0xBA),
-     o3(0xE6,0xA4,0x8F), o3(0xE6,0xA2,0x8D),
-     o3(0xE6,0xA1,0xBE), o3(0xE6,0xA4,0x81),
-     o3(0xE6,0xA3,0x8A), o3(0xE6,0xA4,0x88),
-     o3(0xE6,0xA3,0x98), o3(0xE6,0xA4,0xA2),
-     o3(0xE6,0xA4,0xA6), o3(0xE6,0xA3,0xA1),
-     o3(0xE6,0xA4,0x8C), o3(0xE6,0xA3,0x8D),
-     o3(0xE6,0xA3,0x94), o3(0xE6,0xA3,0xA7),
-     o3(0xE6,0xA3,0x95), o3(0xE6,0xA4,0xB6),
-     o3(0xE6,0xA4,0x92), o3(0xE6,0xA4,0x84),
-     o3(0xE6,0xA3,0x97), o3(0xE6,0xA3,0xA3),
-     o3(0xE6,0xA4,0xA5), o3(0xE6,0xA3,0xB9),
-     o3(0xE6,0xA3,0xA0), o3(0xE6,0xA3,0xAF),
-     o3(0xE6,0xA4,0xA8), o3(0xE6,0xA4,0xAA),
-     o3(0xE6,0xA4,0x9A), o3(0xE6,0xA4,0xA3),
-     o3(0xE6,0xA4,0xA1), o3(0xE6,0xA3,0x86),
-     o3(0xE6,0xA5,0xB9), o3(0xE6,0xA5,0xB7),
-     o3(0xE6,0xA5,0x9C), o3(0xE6,0xA5,0xB8),
-     o3(0xE6,0xA5,0xAB), o3(0xE6,0xA5,0x94),
-     o3(0xE6,0xA5,0xBE), o3(0xE6,0xA5,0xAE),
-     o3(0xE6,0xA4,0xB9), o3(0xE6,0xA5,0xB4),
-     o3(0xE6,0xA4,0xBD), o3(0xE6,0xA5,0x99),
-     o3(0xE6,0xA4,0xB0), o3(0xE6,0xA5,0xA1),
-     o3(0xE6,0xA5,0x9E), o3(0xE6,0xA5,0x9D),
-     o3(0xE6,0xA6,0x81), o3(0xE6,0xA5,0xAA),
-     o3(0xE6,0xA6,0xB2), o3(0xE6,0xA6,0xAE),
-     o3(0xE6,0xA7,0x90), o3(0xE6,0xA6,0xBF),
-     o3(0xE6,0xA7,0x81), o3(0xE6,0xA7,0x93),
-     o3(0xE6,0xA6,0xBE), o3(0xE6,0xA7,0x8E),
-     o3(0xE5,0xAF,0xA8), o3(0xE6,0xA7,0x8A),
-     o3(0xE6,0xA7,0x9D), o3(0xE6,0xA6,0xBB),
-     o3(0xE6,0xA7,0x83), o3(0xE6,0xA6,0xA7),
-     o3(0xE6,0xA8,0xAE), o3(0xE6,0xA6,0x91),
-     o3(0xE6,0xA6,0xA0), o3(0xE6,0xA6,0x9C),
-     o3(0xE6,0xA6,0x95), o3(0xE6,0xA6,0xB4),
-     o3(0xE6,0xA7,0x9E), o3(0xE6,0xA7,0xA8),
-     o3(0xE6,0xA8,0x82), o3(0xE6,0xA8,0x9B),
-     o3(0xE6,0xA7,0xBF), o3(0xE6,0xAC,0x8A),
-     o3(0xE6,0xA7,0xB9), o3(0xE6,0xA7,0xB2),
-     o3(0xE6,0xA7,0xA7), o3(0xE6,0xA8,0x85),
-     o3(0xE6,0xA6,0xB1), o3(0xE6,0xA8,0x9E),
-     o3(0xE6,0xA7,0xAD), o3(0xE6,0xA8,0x94),
-     o3(0xE6,0xA7,0xAB), o3(0xE6,0xA8,0x8A),
-     o3(0xE6,0xA8,0x92), o3(0xE6,0xAB,0x81),
-     o3(0xE6,0xA8,0xA3), o3(0xE6,0xA8,0x93),
-     o3(0xE6,0xA9,0x84), o3(0xE6,0xA8,0x8C),
-     o3(0xE6,0xA9,0xB2), o3(0xE6,0xA8,0xB6),
-     o3(0xE6,0xA9,0xB8), o3(0xE6,0xA9,0x87),
-     o3(0xE6,0xA9,0xA2), o3(0xE6,0xA9,0x99),
-     o3(0xE6,0xA9,0xA6), o3(0xE6,0xA9,0x88),
-     o3(0xE6,0xA8,0xB8), o3(0xE6,0xA8,0xA2),
-     o3(0xE6,0xAA,0x90), o3(0xE6,0xAA,0x8D),
-     o3(0xE6,0xAA,0xA0), o3(0xE6,0xAA,0x84),
-     o3(0xE6,0xAA,0xA2), o3(0xE6,0xAA,0xA3),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9E = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9E_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_9F_infos[189] = {
-     o3(0xE6,0xAA,0x97), o3(0xE8,0x98,0x97),
-     o3(0xE6,0xAA,0xBB), o3(0xE6,0xAB,0x83),
-     o3(0xE6,0xAB,0x82), o3(0xE6,0xAA,0xB8),
-     o3(0xE6,0xAA,0xB3), o3(0xE6,0xAA,0xAC),
-     o3(0xE6,0xAB,0x9E), o3(0xE6,0xAB,0x91),
-     o3(0xE6,0xAB,0x9F), o3(0xE6,0xAA,0xAA),
-     o3(0xE6,0xAB,0x9A), o3(0xE6,0xAB,0xAA),
-     o3(0xE6,0xAB,0xBB), o3(0xE6,0xAC,0x85),
-     o3(0xE8,0x98,0x96), o3(0xE6,0xAB,0xBA),
-     o3(0xE6,0xAC,0x92), o3(0xE6,0xAC,0x96),
-     o3(0xE9,0xAC,0xB1), o3(0xE6,0xAC,0x9F),
-     o3(0xE6,0xAC,0xB8), o3(0xE6,0xAC,0xB7),
-     o3(0xE7,0x9B,0x9C), o3(0xE6,0xAC,0xB9),
-     o3(0xE9,0xA3,0xAE), o3(0xE6,0xAD,0x87),
-     o3(0xE6,0xAD,0x83), o3(0xE6,0xAD,0x89),
-     o3(0xE6,0xAD,0x90), o3(0xE6,0xAD,0x99),
-     o3(0xE6,0xAD,0x94), o3(0xE6,0xAD,0x9B),
-     o3(0xE6,0xAD,0x9F), o3(0xE6,0xAD,0xA1),
-     o3(0xE6,0xAD,0xB8), o3(0xE6,0xAD,0xB9),
-     o3(0xE6,0xAD,0xBF), o3(0xE6,0xAE,0x80),
-     o3(0xE6,0xAE,0x84), o3(0xE6,0xAE,0x83),
-     o3(0xE6,0xAE,0x8D), o3(0xE6,0xAE,0x98),
-     o3(0xE6,0xAE,0x95), o3(0xE6,0xAE,0x9E),
-     o3(0xE6,0xAE,0xA4), o3(0xE6,0xAE,0xAA),
-     o3(0xE6,0xAE,0xAB), o3(0xE6,0xAE,0xAF),
-     o3(0xE6,0xAE,0xB2), o3(0xE6,0xAE,0xB1),
-     o3(0xE6,0xAE,0xB3), o3(0xE6,0xAE,0xB7),
-     o3(0xE6,0xAE,0xBC), o3(0xE6,0xAF,0x86),
-     o3(0xE6,0xAF,0x8B), o3(0xE6,0xAF,0x93),
-     o3(0xE6,0xAF,0x9F), o3(0xE6,0xAF,0xAC),
-     o3(0xE6,0xAF,0xAB), o3(0xE6,0xAF,0xB3),
-     o3(0xE6,0xAF,0xAF), o3(0xE9,0xBA,0xBE),
-     o3(0xE6,0xB0,0x88), o3(0xE6,0xB0,0x93),
-     o3(0xE6,0xB0,0x94), o3(0xE6,0xB0,0x9B),
-     o3(0xE6,0xB0,0xA4), o3(0xE6,0xB0,0xA3),
-     o3(0xE6,0xB1,0x9E), o3(0xE6,0xB1,0x95),
-     o3(0xE6,0xB1,0xA2), o3(0xE6,0xB1,0xAA),
-     o3(0xE6,0xB2,0x82), o3(0xE6,0xB2,0x8D),
-     o3(0xE6,0xB2,0x9A), o3(0xE6,0xB2,0x81),
-     o3(0xE6,0xB2,0x9B), o3(0xE6,0xB1,0xBE),
-     o3(0xE6,0xB1,0xA8), o3(0xE6,0xB1,0xB3),
-     o3(0xE6,0xB2,0x92), o3(0xE6,0xB2,0x90),
-     o3(0xE6,0xB3,0x84), o3(0xE6,0xB3,0xB1),
-     o3(0xE6,0xB3,0x93), o3(0xE6,0xB2,0xBD),
-     o3(0xE6,0xB3,0x97), o3(0xE6,0xB3,0x85),
-     o3(0xE6,0xB3,0x9D), o3(0xE6,0xB2,0xAE),
-     o3(0xE6,0xB2,0xB1), o3(0xE6,0xB2,0xBE),
-     o3(0xE6,0xB2,0xBA), o3(0xE6,0xB3,0x9B),
-     o3(0xE6,0xB3,0xAF), o3(0xE6,0xB3,0x99),
-     o3(0xE6,0xB3,0xAA), o3(0xE6,0xB4,0x9F),
-     o3(0xE8,0xA1,0x8D), o3(0xE6,0xB4,0xB6),
-     o3(0xE6,0xB4,0xAB), o3(0xE6,0xB4,0xBD),
-     o3(0xE6,0xB4,0xB8), o3(0xE6,0xB4,0x99),
-     o3(0xE6,0xB4,0xB5), o3(0xE6,0xB4,0xB3),
-     o3(0xE6,0xB4,0x92), o3(0xE6,0xB4,0x8C),
-     o3(0xE6,0xB5,0xA3), o3(0xE6,0xB6,0x93),
-     o3(0xE6,0xB5,0xA4), o3(0xE6,0xB5,0x9A),
-     o3(0xE6,0xB5,0xB9), o3(0xE6,0xB5,0x99),
-     o3(0xE6,0xB6,0x8E), o3(0xE6,0xB6,0x95),
-     o3(0xE6,0xBF,0xA4), o3(0xE6,0xB6,0x85),
-     o3(0xE6,0xB7,0xB9), o3(0xE6,0xB8,0x95),
-     o3(0xE6,0xB8,0x8A), o3(0xE6,0xB6,0xB5),
-     o3(0xE6,0xB7,0x87), o3(0xE6,0xB7,0xA6),
-     o3(0xE6,0xB6,0xB8), o3(0xE6,0xB7,0x86),
-     o3(0xE6,0xB7,0xAC), o3(0xE6,0xB7,0x9E),
-     o3(0xE6,0xB7,0x8C), o3(0xE6,0xB7,0xA8),
-     o3(0xE6,0xB7,0x92), o3(0xE6,0xB7,0x85),
-     o3(0xE6,0xB7,0xBA), o3(0xE6,0xB7,0x99),
-     o3(0xE6,0xB7,0xA4), o3(0xE6,0xB7,0x95),
-     o3(0xE6,0xB7,0xAA), o3(0xE6,0xB7,0xAE),
-     o3(0xE6,0xB8,0xAD), o3(0xE6,0xB9,0xAE),
-     o3(0xE6,0xB8,0xAE), o3(0xE6,0xB8,0x99),
-     o3(0xE6,0xB9,0xB2), o3(0xE6,0xB9,0x9F),
-     o3(0xE6,0xB8,0xBE), o3(0xE6,0xB8,0xA3),
-     o3(0xE6,0xB9,0xAB), o3(0xE6,0xB8,0xAB),
-     o3(0xE6,0xB9,0xB6), o3(0xE6,0xB9,0x8D),
-     o3(0xE6,0xB8,0x9F), o3(0xE6,0xB9,0x83),
-     o3(0xE6,0xB8,0xBA), o3(0xE6,0xB9,0x8E),
-     o3(0xE6,0xB8,0xA4), o3(0xE6,0xBB,0xBF),
-     o3(0xE6,0xB8,0x9D), o3(0xE6,0xB8,0xB8),
-     o3(0xE6,0xBA,0x82), o3(0xE6,0xBA,0xAA),
-     o3(0xE6,0xBA,0x98), o3(0xE6,0xBB,0x89),
-     o3(0xE6,0xBA,0xB7), o3(0xE6,0xBB,0x93),
-     o3(0xE6,0xBA,0xBD), o3(0xE6,0xBA,0xAF),
-     o3(0xE6,0xBB,0x84), o3(0xE6,0xBA,0xB2),
-     o3(0xE6,0xBB,0x94), o3(0xE6,0xBB,0x95),
-     o3(0xE6,0xBA,0x8F), o3(0xE6,0xBA,0xA5),
-     o3(0xE6,0xBB,0x82), o3(0xE6,0xBA,0x9F),
-     o3(0xE6,0xBD,0x81), o3(0xE6,0xBC,0x91),
-     o3(0xE7,0x81,0x8C), o3(0xE6,0xBB,0xAC),
-     o3(0xE6,0xBB,0xB8), o3(0xE6,0xBB,0xBE),
-     o3(0xE6,0xBC,0xBF), o3(0xE6,0xBB,0xB2),
-     o3(0xE6,0xBC,0xB1), o3(0xE6,0xBB,0xAF),
-     o3(0xE6,0xBC,0xB2), o3(0xE6,0xBB,0x8C),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_9F = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_9F_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E0_infos[189] = {
-     o3(0xE6,0xBC,0xBE), o3(0xE6,0xBC,0x93),
-     o3(0xE6,0xBB,0xB7), o3(0xE6,0xBE,0x86),
-     o3(0xE6,0xBD,0xBA), o3(0xE6,0xBD,0xB8),
-     o3(0xE6,0xBE,0x81), o3(0xE6,0xBE,0x80),
-     o3(0xE6,0xBD,0xAF), o3(0xE6,0xBD,0x9B),
-     o3(0xE6,0xBF,0xB3), o3(0xE6,0xBD,0xAD),
-     o3(0xE6,0xBE,0x82), o3(0xE6,0xBD,0xBC),
-     o3(0xE6,0xBD,0x98), o3(0xE6,0xBE,0x8E),
-     o3(0xE6,0xBE,0x91), o3(0xE6,0xBF,0x82),
-     o3(0xE6,0xBD,0xA6), o3(0xE6,0xBE,0xB3),
-     o3(0xE6,0xBE,0xA3), o3(0xE6,0xBE,0xA1),
-     o3(0xE6,0xBE,0xA4), o3(0xE6,0xBE,0xB9),
-     o3(0xE6,0xBF,0x86), o3(0xE6,0xBE,0xAA),
-     o3(0xE6,0xBF,0x9F), o3(0xE6,0xBF,0x95),
-     o3(0xE6,0xBF,0xAC), o3(0xE6,0xBF,0x94),
-     o3(0xE6,0xBF,0x98), o3(0xE6,0xBF,0xB1),
-     o3(0xE6,0xBF,0xAE), o3(0xE6,0xBF,0x9B),
-     o3(0xE7,0x80,0x89), o3(0xE7,0x80,0x8B),
-     o3(0xE6,0xBF,0xBA), o3(0xE7,0x80,0x91),
-     o3(0xE7,0x80,0x81), o3(0xE7,0x80,0x8F),
-     o3(0xE6,0xBF,0xBE), o3(0xE7,0x80,0x9B),
-     o3(0xE7,0x80,0x9A), o3(0xE6,0xBD,0xB4),
-     o3(0xE7,0x80,0x9D), o3(0xE7,0x80,0x98),
-     o3(0xE7,0x80,0x9F), o3(0xE7,0x80,0xB0),
-     o3(0xE7,0x80,0xBE), o3(0xE7,0x80,0xB2),
-     o3(0xE7,0x81,0x91), o3(0xE7,0x81,0xA3),
-     o3(0xE7,0x82,0x99), o3(0xE7,0x82,0x92),
-     o3(0xE7,0x82,0xAF), o3(0xE7,0x83,0xB1),
-     o3(0xE7,0x82,0xAC), o3(0xE7,0x82,0xB8),
-     o3(0xE7,0x82,0xB3), o3(0xE7,0x82,0xAE),
-     o3(0xE7,0x83,0x9F), o3(0xE7,0x83,0x8B),
-     o3(0xE7,0x83,0x9D), o3(0xE7,0x83,0x99),
-     o3(0xE7,0x84,0x89), o3(0xE7,0x83,0xBD),
-     o3(0xE7,0x84,0x9C), o3(0xE7,0x84,0x99),
-     o3(0xE7,0x85,0xA5), o3(0xE7,0x85,0x95),
-     o3(0xE7,0x86,0x88), o3(0xE7,0x85,0xA6),
-     o3(0xE7,0x85,0xA2), o3(0xE7,0x85,0x8C),
-     o3(0xE7,0x85,0x96), o3(0xE7,0x85,0xAC),
-     o3(0xE7,0x86,0x8F), o3(0xE7,0x87,0xBB),
-     o3(0xE7,0x86,0x84), o3(0xE7,0x86,0x95),
-     o3(0xE7,0x86,0xA8), o3(0xE7,0x86,0xAC),
-     o3(0xE7,0x87,0x97), o3(0xE7,0x86,0xB9),
-     o3(0xE7,0x86,0xBE), o3(0xE7,0x87,0x92),
-     o3(0xE7,0x87,0x89), o3(0xE7,0x87,0x94),
-     o3(0xE7,0x87,0x8E), o3(0xE7,0x87,0xA0),
-     o3(0xE7,0x87,0xAC), o3(0xE7,0x87,0xA7),
-     o3(0xE7,0x87,0xB5), o3(0xE7,0x87,0xBC),
-     o3(0xE7,0x87,0xB9), o3(0xE7,0x87,0xBF),
-     o3(0xE7,0x88,0x8D), o3(0xE7,0x88,0x90),
-     o3(0xE7,0x88,0x9B), o3(0xE7,0x88,0xA8),
-     o3(0xE7,0x88,0xAD), o3(0xE7,0x88,0xAC),
-     o3(0xE7,0x88,0xB0), o3(0xE7,0x88,0xB2),
-     o3(0xE7,0x88,0xBB), o3(0xE7,0x88,0xBC),
-     o3(0xE7,0x88,0xBF), o3(0xE7,0x89,0x80),
-     o3(0xE7,0x89,0x86), o3(0xE7,0x89,0x8B),
-     o3(0xE7,0x89,0x98), o3(0xE7,0x89,0xB4),
-     o3(0xE7,0x89,0xBE), o3(0xE7,0x8A,0x82),
-     o3(0xE7,0x8A,0x81), o3(0xE7,0x8A,0x87),
-     o3(0xE7,0x8A,0x92), o3(0xE7,0x8A,0x96),
-     o3(0xE7,0x8A,0xA2), o3(0xE7,0x8A,0xA7),
-     o3(0xE7,0x8A,0xB9), o3(0xE7,0x8A,0xB2),
-     o3(0xE7,0x8B,0x83), o3(0xE7,0x8B,0x86),
-     o3(0xE7,0x8B,0x84), o3(0xE7,0x8B,0x8E),
-     o3(0xE7,0x8B,0x92), o3(0xE7,0x8B,0xA2),
-     o3(0xE7,0x8B,0xA0), o3(0xE7,0x8B,0xA1),
-     o3(0xE7,0x8B,0xB9), o3(0xE7,0x8B,0xB7),
-     o3(0xE5,0x80,0x8F), o3(0xE7,0x8C,0x97),
-     o3(0xE7,0x8C,0x8A), o3(0xE7,0x8C,0x9C),
-     o3(0xE7,0x8C,0x96), o3(0xE7,0x8C,0x9D),
-     o3(0xE7,0x8C,0xB4), o3(0xE7,0x8C,0xAF),
-     o3(0xE7,0x8C,0xA9), o3(0xE7,0x8C,0xA5),
-     o3(0xE7,0x8C,0xBE), o3(0xE7,0x8D,0x8E),
-     o3(0xE7,0x8D,0x8F), o3(0xE9,0xBB,0x98),
-     o3(0xE7,0x8D,0x97), o3(0xE7,0x8D,0xAA),
-     o3(0xE7,0x8D,0xA8), o3(0xE7,0x8D,0xB0),
-     o3(0xE7,0x8D,0xB8), o3(0xE7,0x8D,0xB5),
-     o3(0xE7,0x8D,0xBB), o3(0xE7,0x8D,0xBA),
-     o3(0xE7,0x8F,0x88), o3(0xE7,0x8E,0xB3),
-     o3(0xE7,0x8F,0x8E), o3(0xE7,0x8E,0xBB),
-     o3(0xE7,0x8F,0x80), o3(0xE7,0x8F,0xA5),
-     o3(0xE7,0x8F,0xAE), o3(0xE7,0x8F,0x9E),
-     o3(0xE7,0x92,0xA2), o3(0xE7,0x90,0x85),
-     o3(0xE7,0x91,0xAF), o3(0xE7,0x90,0xA5),
-     o3(0xE7,0x8F,0xB8), o3(0xE7,0x90,0xB2),
-     o3(0xE7,0x90,0xBA), o3(0xE7,0x91,0x95),
-     o3(0xE7,0x90,0xBF), o3(0xE7,0x91,0x9F),
-     o3(0xE7,0x91,0x99), o3(0xE7,0x91,0x81),
-     o3(0xE7,0x91,0x9C), o3(0xE7,0x91,0xA9),
-     o3(0xE7,0x91,0xB0), o3(0xE7,0x91,0xA3),
-     o3(0xE7,0x91,0xAA), o3(0xE7,0x91,0xB6),
-     o3(0xE7,0x91,0xBE), o3(0xE7,0x92,0x8B),
-     o3(0xE7,0x92,0x9E), o3(0xE7,0x92,0xA7),
-     o3(0xE7,0x93,0x8A), o3(0xE7,0x93,0x8F),
-     o3(0xE7,0x93,0x94), o3(0xE7,0x8F,0xB1),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E0 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E0_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E1_infos[189] = {
-     o3(0xE7,0x93,0xA0), o3(0xE7,0x93,0xA3),
-     o3(0xE7,0x93,0xA7), o3(0xE7,0x93,0xA9),
-     o3(0xE7,0x93,0xAE), o3(0xE7,0x93,0xB2),
-     o3(0xE7,0x93,0xB0), o3(0xE7,0x93,0xB1),
-     o3(0xE7,0x93,0xB8), o3(0xE7,0x93,0xB7),
-     o3(0xE7,0x94,0x84), o3(0xE7,0x94,0x83),
-     o3(0xE7,0x94,0x85), o3(0xE7,0x94,0x8C),
-     o3(0xE7,0x94,0x8E), o3(0xE7,0x94,0x8D),
-     o3(0xE7,0x94,0x95), o3(0xE7,0x94,0x93),
-     o3(0xE7,0x94,0x9E), o3(0xE7,0x94,0xA6),
-     o3(0xE7,0x94,0xAC), o3(0xE7,0x94,0xBC),
-     o3(0xE7,0x95,0x84), o3(0xE7,0x95,0x8D),
-     o3(0xE7,0x95,0x8A), o3(0xE7,0x95,0x89),
-     o3(0xE7,0x95,0x9B), o3(0xE7,0x95,0x86),
-     o3(0xE7,0x95,0x9A), o3(0xE7,0x95,0xA9),
-     o3(0xE7,0x95,0xA4), o3(0xE7,0x95,0xA7),
-     o3(0xE7,0x95,0xAB), o3(0xE7,0x95,0xAD),
-     o3(0xE7,0x95,0xB8), o3(0xE7,0x95,0xB6),
-     o3(0xE7,0x96,0x86), o3(0xE7,0x96,0x87),
-     o3(0xE7,0x95,0xB4), o3(0xE7,0x96,0x8A),
-     o3(0xE7,0x96,0x89), o3(0xE7,0x96,0x82),
-     o3(0xE7,0x96,0x94), o3(0xE7,0x96,0x9A),
-     o3(0xE7,0x96,0x9D), o3(0xE7,0x96,0xA5),
-     o3(0xE7,0x96,0xA3), o3(0xE7,0x97,0x82),
-     o3(0xE7,0x96,0xB3), o3(0xE7,0x97,0x83),
-     o3(0xE7,0x96,0xB5), o3(0xE7,0x96,0xBD),
-     o3(0xE7,0x96,0xB8), o3(0xE7,0x96,0xBC),
-     o3(0xE7,0x96,0xB1), o3(0xE7,0x97,0x8D),
-     o3(0xE7,0x97,0x8A), o3(0xE7,0x97,0x92),
-     o3(0xE7,0x97,0x99), o3(0xE7,0x97,0xA3),
-     o3(0xE7,0x97,0x9E), o3(0xE7,0x97,0xBE),
-     o3(0xE7,0x97,0xBF), o3(0xE7,0x97,0xBC),
-     o3(0xE7,0x98,0x81), o3(0xE7,0x97,0xB0),
-     o3(0xE7,0x97,0xBA), o3(0xE7,0x97,0xB2),
-     o3(0xE7,0x97,0xB3), o3(0xE7,0x98,0x8B),
-     o3(0xE7,0x98,0x8D), o3(0xE7,0x98,0x89),
-     o3(0xE7,0x98,0x9F), o3(0xE7,0x98,0xA7),
-     o3(0xE7,0x98,0xA0), o3(0xE7,0x98,0xA1),
-     o3(0xE7,0x98,0xA2), o3(0xE7,0x98,0xA4),
-     o3(0xE7,0x98,0xB4), o3(0xE7,0x98,0xB0),
-     o3(0xE7,0x98,0xBB), o3(0xE7,0x99,0x87),
-     o3(0xE7,0x99,0x88), o3(0xE7,0x99,0x86),
-     o3(0xE7,0x99,0x9C), o3(0xE7,0x99,0x98),
-     o3(0xE7,0x99,0xA1), o3(0xE7,0x99,0xA2),
-     o3(0xE7,0x99,0xA8), o3(0xE7,0x99,0xA9),
-     o3(0xE7,0x99,0xAA), o3(0xE7,0x99,0xA7),
-     o3(0xE7,0x99,0xAC), o3(0xE7,0x99,0xB0),
-     o3(0xE7,0x99,0xB2), o3(0xE7,0x99,0xB6),
-     o3(0xE7,0x99,0xB8), o3(0xE7,0x99,0xBC),
-     o3(0xE7,0x9A,0x80), o3(0xE7,0x9A,0x83),
-     o3(0xE7,0x9A,0x88), o3(0xE7,0x9A,0x8B),
-     o3(0xE7,0x9A,0x8E), o3(0xE7,0x9A,0x96),
-     o3(0xE7,0x9A,0x93), o3(0xE7,0x9A,0x99),
-     o3(0xE7,0x9A,0x9A), o3(0xE7,0x9A,0xB0),
-     o3(0xE7,0x9A,0xB4), o3(0xE7,0x9A,0xB8),
-     o3(0xE7,0x9A,0xB9), o3(0xE7,0x9A,0xBA),
-     o3(0xE7,0x9B,0x82), o3(0xE7,0x9B,0x8D),
-     o3(0xE7,0x9B,0x96), o3(0xE7,0x9B,0x92),
-     o3(0xE7,0x9B,0x9E), o3(0xE7,0x9B,0xA1),
-     o3(0xE7,0x9B,0xA5), o3(0xE7,0x9B,0xA7),
-     o3(0xE7,0x9B,0xAA), o3(0xE8,0x98,0xAF),
-     o3(0xE7,0x9B,0xBB), o3(0xE7,0x9C,0x88),
-     o3(0xE7,0x9C,0x87), o3(0xE7,0x9C,0x84),
-     o3(0xE7,0x9C,0xA9), o3(0xE7,0x9C,0xA4),
-     o3(0xE7,0x9C,0x9E), o3(0xE7,0x9C,0xA5),
-     o3(0xE7,0x9C,0xA6), o3(0xE7,0x9C,0x9B),
-     o3(0xE7,0x9C,0xB7), o3(0xE7,0x9C,0xB8),
-     o3(0xE7,0x9D,0x87), o3(0xE7,0x9D,0x9A),
-     o3(0xE7,0x9D,0xA8), o3(0xE7,0x9D,0xAB),
-     o3(0xE7,0x9D,0x9B), o3(0xE7,0x9D,0xA5),
-     o3(0xE7,0x9D,0xBF), o3(0xE7,0x9D,0xBE),
-     o3(0xE7,0x9D,0xB9), o3(0xE7,0x9E,0x8E),
-     o3(0xE7,0x9E,0x8B), o3(0xE7,0x9E,0x91),
-     o3(0xE7,0x9E,0xA0), o3(0xE7,0x9E,0x9E),
-     o3(0xE7,0x9E,0xB0), o3(0xE7,0x9E,0xB6),
-     o3(0xE7,0x9E,0xB9), o3(0xE7,0x9E,0xBF),
-     o3(0xE7,0x9E,0xBC), o3(0xE7,0x9E,0xBD),
-     o3(0xE7,0x9E,0xBB), o3(0xE7,0x9F,0x87),
-     o3(0xE7,0x9F,0x8D), o3(0xE7,0x9F,0x97),
-     o3(0xE7,0x9F,0x9A), o3(0xE7,0x9F,0x9C),
-     o3(0xE7,0x9F,0xA3), o3(0xE7,0x9F,0xAE),
-     o3(0xE7,0x9F,0xBC), o3(0xE7,0xA0,0x8C),
-     o3(0xE7,0xA0,0x92), o3(0xE7,0xA4,0xA6),
-     o3(0xE7,0xA0,0xA0), o3(0xE7,0xA4,0xAA),
-     o3(0xE7,0xA1,0x85), o3(0xE7,0xA2,0x8E),
-     o3(0xE7,0xA1,0xB4), o3(0xE7,0xA2,0x86),
-     o3(0xE7,0xA1,0xBC), o3(0xE7,0xA2,0x9A),
-     o3(0xE7,0xA2,0x8C), o3(0xE7,0xA2,0xA3),
-     o3(0xE7,0xA2,0xB5), o3(0xE7,0xA2,0xAA),
-     o3(0xE7,0xA2,0xAF), o3(0xE7,0xA3,0x91),
-     o3(0xE7,0xA3,0x86), o3(0xE7,0xA3,0x8B),
-     o3(0xE7,0xA3,0x94), o3(0xE7,0xA2,0xBE),
-     o3(0xE7,0xA2,0xBC), o3(0xE7,0xA3,0x85),
-     o3(0xE7,0xA3,0x8A), o3(0xE7,0xA3,0xAC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E1 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E1_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E2_infos[189] = {
-     o3(0xE7,0xA3,0xA7), o3(0xE7,0xA3,0x9A),
-     o3(0xE7,0xA3,0xBD), o3(0xE7,0xA3,0xB4),
-     o3(0xE7,0xA4,0x87), o3(0xE7,0xA4,0x92),
-     o3(0xE7,0xA4,0x91), o3(0xE7,0xA4,0x99),
-     o3(0xE7,0xA4,0xAC), o3(0xE7,0xA4,0xAB),
-     o3(0xE7,0xA5,0x80), o3(0xE7,0xA5,0xA0),
-     o3(0xE7,0xA5,0x97), o3(0xE7,0xA5,0x9F),
-     o3(0xE7,0xA5,0x9A), o3(0xE7,0xA5,0x95),
-     o3(0xE7,0xA5,0x93), o3(0xE7,0xA5,0xBA),
-     o3(0xE7,0xA5,0xBF), o3(0xE7,0xA6,0x8A),
-     o3(0xE7,0xA6,0x9D), o3(0xE7,0xA6,0xA7),
-     o3(0xE9,0xBD,0x8B), o3(0xE7,0xA6,0xAA),
-     o3(0xE7,0xA6,0xAE), o3(0xE7,0xA6,0xB3),
-     o3(0xE7,0xA6,0xB9), o3(0xE7,0xA6,0xBA),
-     o3(0xE7,0xA7,0x89), o3(0xE7,0xA7,0x95),
-     o3(0xE7,0xA7,0xA7), o3(0xE7,0xA7,0xAC),
-     o3(0xE7,0xA7,0xA1), o3(0xE7,0xA7,0xA3),
-     o3(0xE7,0xA8,0x88), o3(0xE7,0xA8,0x8D),
-     o3(0xE7,0xA8,0x98), o3(0xE7,0xA8,0x99),
-     o3(0xE7,0xA8,0xA0), o3(0xE7,0xA8,0x9F),
-     o3(0xE7,0xA6,0x80), o3(0xE7,0xA8,0xB1),
-     o3(0xE7,0xA8,0xBB), o3(0xE7,0xA8,0xBE),
-     o3(0xE7,0xA8,0xB7), o3(0xE7,0xA9,0x83),
-     o3(0xE7,0xA9,0x97), o3(0xE7,0xA9,0x89),
-     o3(0xE7,0xA9,0xA1), o3(0xE7,0xA9,0xA2),
-     o3(0xE7,0xA9,0xA9), o3(0xE9,0xBE,0x9D),
-     o3(0xE7,0xA9,0xB0), o3(0xE7,0xA9,0xB9),
-     o3(0xE7,0xA9,0xBD), o3(0xE7,0xAA,0x88),
-     o3(0xE7,0xAA,0x97), o3(0xE7,0xAA,0x95),
-     o3(0xE7,0xAA,0x98), o3(0xE7,0xAA,0x96),
-     o3(0xE7,0xAA,0xA9), o3(0xE7,0xAB,0x88),
-     o3(0xE7,0xAA,0xB0), o3(0xE7,0xAA,0xB6),
-     o3(0xE7,0xAB,0x85), o3(0xE7,0xAB,0x84),
-     o3(0xE7,0xAA,0xBF), o3(0xE9,0x82,0x83),
-     o3(0xE7,0xAB,0x87), o3(0xE7,0xAB,0x8A),
-     o3(0xE7,0xAB,0x8D), o3(0xE7,0xAB,0x8F),
-     o3(0xE7,0xAB,0x95), o3(0xE7,0xAB,0x93),
-     o3(0xE7,0xAB,0x99), o3(0xE7,0xAB,0x9A),
-     o3(0xE7,0xAB,0x9D), o3(0xE7,0xAB,0xA1),
-     o3(0xE7,0xAB,0xA2), o3(0xE7,0xAB,0xA6),
-     o3(0xE7,0xAB,0xAD), o3(0xE7,0xAB,0xB0),
-     o3(0xE7,0xAC,0x82), o3(0xE7,0xAC,0x8F),
-     o3(0xE7,0xAC,0x8A), o3(0xE7,0xAC,0x86),
-     o3(0xE7,0xAC,0xB3), o3(0xE7,0xAC,0x98),
-     o3(0xE7,0xAC,0x99), o3(0xE7,0xAC,0x9E),
-     o3(0xE7,0xAC,0xB5), o3(0xE7,0xAC,0xA8),
-     o3(0xE7,0xAC,0xB6), o3(0xE7,0xAD,0x90),
-     o3(0xE7,0xAD,0xBA), o3(0xE7,0xAC,0x84),
-     o3(0xE7,0xAD,0x8D), o3(0xE7,0xAC,0x8B),
-     o3(0xE7,0xAD,0x8C), o3(0xE7,0xAD,0x85),
-     o3(0xE7,0xAD,0xB5), o3(0xE7,0xAD,0xA5),
-     o3(0xE7,0xAD,0xB4), o3(0xE7,0xAD,0xA7),
-     o3(0xE7,0xAD,0xB0), o3(0xE7,0xAD,0xB1),
-     o3(0xE7,0xAD,0xAC), o3(0xE7,0xAD,0xAE),
-     o3(0xE7,0xAE,0x9D), o3(0xE7,0xAE,0x98),
-     o3(0xE7,0xAE,0x9F), o3(0xE7,0xAE,0x8D),
-     o3(0xE7,0xAE,0x9C), o3(0xE7,0xAE,0x9A),
-     o3(0xE7,0xAE,0x8B), o3(0xE7,0xAE,0x92),
-     o3(0xE7,0xAE,0x8F), o3(0xE7,0xAD,0x9D),
-     o3(0xE7,0xAE,0x99), o3(0xE7,0xAF,0x8B),
-     o3(0xE7,0xAF,0x81), o3(0xE7,0xAF,0x8C),
-     o3(0xE7,0xAF,0x8F), o3(0xE7,0xAE,0xB4),
-     o3(0xE7,0xAF,0x86), o3(0xE7,0xAF,0x9D),
-     o3(0xE7,0xAF,0xA9), o3(0xE7,0xB0,0x91),
-     o3(0xE7,0xB0,0x94), o3(0xE7,0xAF,0xA6),
-     o3(0xE7,0xAF,0xA5), o3(0xE7,0xB1,0xA0),
-     o3(0xE7,0xB0,0x80), o3(0xE7,0xB0,0x87),
-     o3(0xE7,0xB0,0x93), o3(0xE7,0xAF,0xB3),
-     o3(0xE7,0xAF,0xB7), o3(0xE7,0xB0,0x97),
-     o3(0xE7,0xB0,0x8D), o3(0xE7,0xAF,0xB6),
-     o3(0xE7,0xB0,0xA3), o3(0xE7,0xB0,0xA7),
-     o3(0xE7,0xB0,0xAA), o3(0xE7,0xB0,0x9F),
-     o3(0xE7,0xB0,0xB7), o3(0xE7,0xB0,0xAB),
-     o3(0xE7,0xB0,0xBD), o3(0xE7,0xB1,0x8C),
-     o3(0xE7,0xB1,0x83), o3(0xE7,0xB1,0x94),
-     o3(0xE7,0xB1,0x8F), o3(0xE7,0xB1,0x80),
-     o3(0xE7,0xB1,0x90), o3(0xE7,0xB1,0x98),
-     o3(0xE7,0xB1,0x9F), o3(0xE7,0xB1,0xA4),
-     o3(0xE7,0xB1,0x96), o3(0xE7,0xB1,0xA5),
-     o3(0xE7,0xB1,0xAC), o3(0xE7,0xB1,0xB5),
-     o3(0xE7,0xB2,0x83), o3(0xE7,0xB2,0x90),
-     o3(0xE7,0xB2,0xA4), o3(0xE7,0xB2,0xAD),
-     o3(0xE7,0xB2,0xA2), o3(0xE7,0xB2,0xAB),
-     o3(0xE7,0xB2,0xA1), o3(0xE7,0xB2,0xA8),
-     o3(0xE7,0xB2,0xB3), o3(0xE7,0xB2,0xB2),
-     o3(0xE7,0xB2,0xB1), o3(0xE7,0xB2,0xAE),
-     o3(0xE7,0xB2,0xB9), o3(0xE7,0xB2,0xBD),
-     o3(0xE7,0xB3,0x80), o3(0xE7,0xB3,0x85),
-     o3(0xE7,0xB3,0x82), o3(0xE7,0xB3,0x98),
-     o3(0xE7,0xB3,0x92), o3(0xE7,0xB3,0x9C),
-     o3(0xE7,0xB3,0xA2), o3(0xE9,0xAC,0xBB),
-     o3(0xE7,0xB3,0xAF), o3(0xE7,0xB3,0xB2),
-     o3(0xE7,0xB3,0xB4), o3(0xE7,0xB3,0xB6),
-     o3(0xE7,0xB3,0xBA), o3(0xE7,0xB4,0x86),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E2 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E2_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E3_infos[189] = {
-     o3(0xE7,0xB4,0x82), o3(0xE7,0xB4,0x9C),
-     o3(0xE7,0xB4,0x95), o3(0xE7,0xB4,0x8A),
-     o3(0xE7,0xB5,0x85), o3(0xE7,0xB5,0x8B),
-     o3(0xE7,0xB4,0xAE), o3(0xE7,0xB4,0xB2),
-     o3(0xE7,0xB4,0xBF), o3(0xE7,0xB4,0xB5),
-     o3(0xE7,0xB5,0x86), o3(0xE7,0xB5,0xB3),
-     o3(0xE7,0xB5,0x96), o3(0xE7,0xB5,0x8E),
-     o3(0xE7,0xB5,0xB2), o3(0xE7,0xB5,0xA8),
-     o3(0xE7,0xB5,0xAE), o3(0xE7,0xB5,0x8F),
-     o3(0xE7,0xB5,0xA3), o3(0xE7,0xB6,0x93),
-     o3(0xE7,0xB6,0x89), o3(0xE7,0xB5,0x9B),
-     o3(0xE7,0xB6,0x8F), o3(0xE7,0xB5,0xBD),
-     o3(0xE7,0xB6,0x9B), o3(0xE7,0xB6,0xBA),
-     o3(0xE7,0xB6,0xAE), o3(0xE7,0xB6,0xA3),
-     o3(0xE7,0xB6,0xB5), o3(0xE7,0xB7,0x87),
-     o3(0xE7,0xB6,0xBD), o3(0xE7,0xB6,0xAB),
-     o3(0xE7,0xB8,0xBD), o3(0xE7,0xB6,0xA2),
-     o3(0xE7,0xB6,0xAF), o3(0xE7,0xB7,0x9C),
-     o3(0xE7,0xB6,0xB8), o3(0xE7,0xB6,0x9F),
-     o3(0xE7,0xB6,0xB0), o3(0xE7,0xB7,0x98),
-     o3(0xE7,0xB7,0x9D), o3(0xE7,0xB7,0xA4),
-     o3(0xE7,0xB7,0x9E), o3(0xE7,0xB7,0xBB),
-     o3(0xE7,0xB7,0xB2), o3(0xE7,0xB7,0xA1),
-     o3(0xE7,0xB8,0x85), o3(0xE7,0xB8,0x8A),
-     o3(0xE7,0xB8,0xA3), o3(0xE7,0xB8,0xA1),
-     o3(0xE7,0xB8,0x92), o3(0xE7,0xB8,0xB1),
-     o3(0xE7,0xB8,0x9F), o3(0xE7,0xB8,0x89),
-     o3(0xE7,0xB8,0x8B), o3(0xE7,0xB8,0xA2),
-     o3(0xE7,0xB9,0x86), o3(0xE7,0xB9,0xA6),
-     o3(0xE7,0xB8,0xBB), o3(0xE7,0xB8,0xB5),
-     o3(0xE7,0xB8,0xB9), o3(0xE7,0xB9,0x83),
-     o3(0xE7,0xB8,0xB7), o3(0xE7,0xB8,0xB2),
-     o3(0xE7,0xB8,0xBA), o3(0xE7,0xB9,0xA7),
-     o3(0xE7,0xB9,0x9D), o3(0xE7,0xB9,0x96),
-     o3(0xE7,0xB9,0x9E), o3(0xE7,0xB9,0x99),
-     o3(0xE7,0xB9,0x9A), o3(0xE7,0xB9,0xB9),
-     o3(0xE7,0xB9,0xAA), o3(0xE7,0xB9,0xA9),
-     o3(0xE7,0xB9,0xBC), o3(0xE7,0xB9,0xBB),
-     o3(0xE7,0xBA,0x83), o3(0xE7,0xB7,0x95),
-     o3(0xE7,0xB9,0xBD), o3(0xE8,0xBE,0xAE),
-     o3(0xE7,0xB9,0xBF), o3(0xE7,0xBA,0x88),
-     o3(0xE7,0xBA,0x89), o3(0xE7,0xBA,0x8C),
-     o3(0xE7,0xBA,0x92), o3(0xE7,0xBA,0x90),
-     o3(0xE7,0xBA,0x93), o3(0xE7,0xBA,0x94),
-     o3(0xE7,0xBA,0x96), o3(0xE7,0xBA,0x8E),
-     o3(0xE7,0xBA,0x9B), o3(0xE7,0xBA,0x9C),
-     o3(0xE7,0xBC,0xB8), o3(0xE7,0xBC,0xBA),
-     o3(0xE7,0xBD,0x85), o3(0xE7,0xBD,0x8C),
-     o3(0xE7,0xBD,0x8D), o3(0xE7,0xBD,0x8E),
-     o3(0xE7,0xBD,0x90), o3(0xE7,0xBD,0x91),
-     o3(0xE7,0xBD,0x95), o3(0xE7,0xBD,0x94),
-     o3(0xE7,0xBD,0x98), o3(0xE7,0xBD,0x9F),
-     o3(0xE7,0xBD,0xA0), o3(0xE7,0xBD,0xA8),
-     o3(0xE7,0xBD,0xA9), o3(0xE7,0xBD,0xA7),
-     o3(0xE7,0xBD,0xB8), o3(0xE7,0xBE,0x82),
-     o3(0xE7,0xBE,0x86), o3(0xE7,0xBE,0x83),
-     o3(0xE7,0xBE,0x88), o3(0xE7,0xBE,0x87),
-     o3(0xE7,0xBE,0x8C), o3(0xE7,0xBE,0x94),
-     o3(0xE7,0xBE,0x9E), o3(0xE7,0xBE,0x9D),
-     o3(0xE7,0xBE,0x9A), o3(0xE7,0xBE,0xA3),
-     o3(0xE7,0xBE,0xAF), o3(0xE7,0xBE,0xB2),
-     o3(0xE7,0xBE,0xB9), o3(0xE7,0xBE,0xAE),
-     o3(0xE7,0xBE,0xB6), o3(0xE7,0xBE,0xB8),
-     o3(0xE8,0xAD,0xB1), o3(0xE7,0xBF,0x85),
-     o3(0xE7,0xBF,0x86), o3(0xE7,0xBF,0x8A),
-     o3(0xE7,0xBF,0x95), o3(0xE7,0xBF,0x94),
-     o3(0xE7,0xBF,0xA1), o3(0xE7,0xBF,0xA6),
-     o3(0xE7,0xBF,0xA9), o3(0xE7,0xBF,0xB3),
-     o3(0xE7,0xBF,0xB9), o3(0xE9,0xA3,0x9C),
-     o3(0xE8,0x80,0x86), o3(0xE8,0x80,0x84),
-     o3(0xE8,0x80,0x8B), o3(0xE8,0x80,0x92),
-     o3(0xE8,0x80,0x98), o3(0xE8,0x80,0x99),
-     o3(0xE8,0x80,0x9C), o3(0xE8,0x80,0xA1),
-     o3(0xE8,0x80,0xA8), o3(0xE8,0x80,0xBF),
-     o3(0xE8,0x80,0xBB), o3(0xE8,0x81,0x8A),
-     o3(0xE8,0x81,0x86), o3(0xE8,0x81,0x92),
-     o3(0xE8,0x81,0x98), o3(0xE8,0x81,0x9A),
-     o3(0xE8,0x81,0x9F), o3(0xE8,0x81,0xA2),
-     o3(0xE8,0x81,0xA8), o3(0xE8,0x81,0xB3),
-     o3(0xE8,0x81,0xB2), o3(0xE8,0x81,0xB0),
-     o3(0xE8,0x81,0xB6), o3(0xE8,0x81,0xB9),
-     o3(0xE8,0x81,0xBD), o3(0xE8,0x81,0xBF),
-     o3(0xE8,0x82,0x84), o3(0xE8,0x82,0x86),
-     o3(0xE8,0x82,0x85), o3(0xE8,0x82,0x9B),
-     o3(0xE8,0x82,0x93), o3(0xE8,0x82,0x9A),
-     o3(0xE8,0x82,0xAD), o3(0xE5,0x86,0x90),
-     o3(0xE8,0x82,0xAC), o3(0xE8,0x83,0x9B),
-     o3(0xE8,0x83,0xA5), o3(0xE8,0x83,0x99),
-     o3(0xE8,0x83,0x9D), o3(0xE8,0x83,0x84),
-     o3(0xE8,0x83,0x9A), o3(0xE8,0x83,0x96),
-     o3(0xE8,0x84,0x89), o3(0xE8,0x83,0xAF),
-     o3(0xE8,0x83,0xB1), o3(0xE8,0x84,0x9B),
-     o3(0xE8,0x84,0xA9), o3(0xE8,0x84,0xA3),
-     o3(0xE8,0x84,0xAF), o3(0xE8,0x85,0x8B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E3 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E3_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E4_infos[189] = {
-     o3(0xE9,0x9A,0x8B), o3(0xE8,0x85,0x86),
-     o3(0xE8,0x84,0xBE), o3(0xE8,0x85,0x93),
-     o3(0xE8,0x85,0x91), o3(0xE8,0x83,0xBC),
-     o3(0xE8,0x85,0xB1), o3(0xE8,0x85,0xAE),
-     o3(0xE8,0x85,0xA5), o3(0xE8,0x85,0xA6),
-     o3(0xE8,0x85,0xB4), o3(0xE8,0x86,0x83),
-     o3(0xE8,0x86,0x88), o3(0xE8,0x86,0x8A),
-     o3(0xE8,0x86,0x80), o3(0xE8,0x86,0x82),
-     o3(0xE8,0x86,0xA0), o3(0xE8,0x86,0x95),
-     o3(0xE8,0x86,0xA4), o3(0xE8,0x86,0xA3),
-     o3(0xE8,0x85,0x9F), o3(0xE8,0x86,0x93),
-     o3(0xE8,0x86,0xA9), o3(0xE8,0x86,0xB0),
-     o3(0xE8,0x86,0xB5), o3(0xE8,0x86,0xBE),
-     o3(0xE8,0x86,0xB8), o3(0xE8,0x86,0xBD),
-     o3(0xE8,0x87,0x80), o3(0xE8,0x87,0x82),
-     o3(0xE8,0x86,0xBA), o3(0xE8,0x87,0x89),
-     o3(0xE8,0x87,0x8D), o3(0xE8,0x87,0x91),
-     o3(0xE8,0x87,0x99), o3(0xE8,0x87,0x98),
-     o3(0xE8,0x87,0x88), o3(0xE8,0x87,0x9A),
-     o3(0xE8,0x87,0x9F), o3(0xE8,0x87,0xA0),
-     o3(0xE8,0x87,0xA7), o3(0xE8,0x87,0xBA),
-     o3(0xE8,0x87,0xBB), o3(0xE8,0x87,0xBE),
-     o3(0xE8,0x88,0x81), o3(0xE8,0x88,0x82),
-     o3(0xE8,0x88,0x85), o3(0xE8,0x88,0x87),
-     o3(0xE8,0x88,0x8A), o3(0xE8,0x88,0x8D),
-     o3(0xE8,0x88,0x90), o3(0xE8,0x88,0x96),
-     o3(0xE8,0x88,0xA9), o3(0xE8,0x88,0xAB),
-     o3(0xE8,0x88,0xB8), o3(0xE8,0x88,0xB3),
-     o3(0xE8,0x89,0x80), o3(0xE8,0x89,0x99),
-     o3(0xE8,0x89,0x98), o3(0xE8,0x89,0x9D),
-     o3(0xE8,0x89,0x9A), o3(0xE8,0x89,0x9F),
-     o3(0xE8,0x89,0xA4), o3(0xE8,0x89,0xA2),
-     o3(0xE8,0x89,0xA8), o3(0xE8,0x89,0xAA),
-     o3(0xE8,0x89,0xAB), o3(0xE8,0x88,0xAE),
-     o3(0xE8,0x89,0xB1), o3(0xE8,0x89,0xB7),
-     o3(0xE8,0x89,0xB8), o3(0xE8,0x89,0xBE),
-     o3(0xE8,0x8A,0x8D), o3(0xE8,0x8A,0x92),
-     o3(0xE8,0x8A,0xAB), o3(0xE8,0x8A,0x9F),
-     o3(0xE8,0x8A,0xBB), o3(0xE8,0x8A,0xAC),
-     o3(0xE8,0x8B,0xA1), o3(0xE8,0x8B,0xA3),
-     o3(0xE8,0x8B,0x9F), o3(0xE8,0x8B,0x92),
-     o3(0xE8,0x8B,0xB4), o3(0xE8,0x8B,0xB3),
-     o3(0xE8,0x8B,0xBA), o3(0xE8,0x8E,0x93),
-     o3(0xE8,0x8C,0x83), o3(0xE8,0x8B,0xBB),
-     o3(0xE8,0x8B,0xB9), o3(0xE8,0x8B,0x9E),
-     o3(0xE8,0x8C,0x86), o3(0xE8,0x8B,0x9C),
-     o3(0xE8,0x8C,0x89), o3(0xE8,0x8B,0x99),
-     o3(0xE8,0x8C,0xB5), o3(0xE8,0x8C,0xB4),
-     o3(0xE8,0x8C,0x96), o3(0xE8,0x8C,0xB2),
-     o3(0xE8,0x8C,0xB1), o3(0xE8,0x8D,0x80),
-     o3(0xE8,0x8C,0xB9), o3(0xE8,0x8D,0x90),
-     o3(0xE8,0x8D,0x85), o3(0xE8,0x8C,0xAF),
-     o3(0xE8,0x8C,0xAB), o3(0xE8,0x8C,0x97),
-     o3(0xE8,0x8C,0x98), o3(0xE8,0x8E,0x85),
-     o3(0xE8,0x8E,0x9A), o3(0xE8,0x8E,0xAA),
-     o3(0xE8,0x8E,0x9F), o3(0xE8,0x8E,0xA2),
-     o3(0xE8,0x8E,0x96), o3(0xE8,0x8C,0xA3),
-     o3(0xE8,0x8E,0x8E), o3(0xE8,0x8E,0x87),
-     o3(0xE8,0x8E,0x8A), o3(0xE8,0x8D,0xBC),
-     o3(0xE8,0x8E,0xB5), o3(0xE8,0x8D,0xB3),
-     o3(0xE8,0x8D,0xB5), o3(0xE8,0x8E,0xA0),
-     o3(0xE8,0x8E,0x89), o3(0xE8,0x8E,0xA8),
-     o3(0xE8,0x8F,0xB4), o3(0xE8,0x90,0x93),
-     o3(0xE8,0x8F,0xAB), o3(0xE8,0x8F,0x8E),
-     o3(0xE8,0x8F,0xBD), o3(0xE8,0x90,0x83),
-     o3(0xE8,0x8F,0x98), o3(0xE8,0x90,0x8B),
-     o3(0xE8,0x8F,0x81), o3(0xE8,0x8F,0xB7),
-     o3(0xE8,0x90,0x87), o3(0xE8,0x8F,0xA0),
-     o3(0xE8,0x8F,0xB2), o3(0xE8,0x90,0x8D),
-     o3(0xE8,0x90,0xA2), o3(0xE8,0x90,0xA0),
-     o3(0xE8,0x8E,0xBD), o3(0xE8,0x90,0xB8),
-     o3(0xE8,0x94,0x86), o3(0xE8,0x8F,0xBB),
-     o3(0xE8,0x91,0xAD), o3(0xE8,0x90,0xAA),
-     o3(0xE8,0x90,0xBC), o3(0xE8,0x95,0x9A),
-     o3(0xE8,0x92,0x84), o3(0xE8,0x91,0xB7),
-     o3(0xE8,0x91,0xAB), o3(0xE8,0x92,0xAD),
-     o3(0xE8,0x91,0xAE), o3(0xE8,0x92,0x82),
-     o3(0xE8,0x91,0xA9), o3(0xE8,0x91,0x86),
-     o3(0xE8,0x90,0xAC), o3(0xE8,0x91,0xAF),
-     o3(0xE8,0x91,0xB9), o3(0xE8,0x90,0xB5),
-     o3(0xE8,0x93,0x8A), o3(0xE8,0x91,0xA2),
-     o3(0xE8,0x92,0xB9), o3(0xE8,0x92,0xBF),
-     o3(0xE8,0x92,0x9F), o3(0xE8,0x93,0x99),
-     o3(0xE8,0x93,0x8D), o3(0xE8,0x92,0xBB),
-     o3(0xE8,0x93,0x9A), o3(0xE8,0x93,0x90),
-     o3(0xE8,0x93,0x81), o3(0xE8,0x93,0x86),
-     o3(0xE8,0x93,0x96), o3(0xE8,0x92,0xA1),
-     o3(0xE8,0x94,0xA1), o3(0xE8,0x93,0xBF),
-     o3(0xE8,0x93,0xB4), o3(0xE8,0x94,0x97),
-     o3(0xE8,0x94,0x98), o3(0xE8,0x94,0xAC),
-     o3(0xE8,0x94,0x9F), o3(0xE8,0x94,0x95),
-     o3(0xE8,0x94,0x94), o3(0xE8,0x93,0xBC),
-     o3(0xE8,0x95,0x80), o3(0xE8,0x95,0xA3),
-     o3(0xE8,0x95,0x98), o3(0xE8,0x95,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E4 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E4_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E5_infos[189] = {
-     o3(0xE8,0x95,0x81), o3(0xE8,0x98,0x82),
-     o3(0xE8,0x95,0x8B), o3(0xE8,0x95,0x95),
-     o3(0xE8,0x96,0x80), o3(0xE8,0x96,0xA4),
-     o3(0xE8,0x96,0x88), o3(0xE8,0x96,0x91),
-     o3(0xE8,0x96,0x8A), o3(0xE8,0x96,0xA8),
-     o3(0xE8,0x95,0xAD), o3(0xE8,0x96,0x94),
-     o3(0xE8,0x96,0x9B), o3(0xE8,0x97,0xAA),
-     o3(0xE8,0x96,0x87), o3(0xE8,0x96,0x9C),
-     o3(0xE8,0x95,0xB7), o3(0xE8,0x95,0xBE),
-     o3(0xE8,0x96,0x90), o3(0xE8,0x97,0x89),
-     o3(0xE8,0x96,0xBA), o3(0xE8,0x97,0x8F),
-     o3(0xE8,0x96,0xB9), o3(0xE8,0x97,0x90),
-     o3(0xE8,0x97,0x95), o3(0xE8,0x97,0x9D),
-     o3(0xE8,0x97,0xA5), o3(0xE8,0x97,0x9C),
-     o3(0xE8,0x97,0xB9), o3(0xE8,0x98,0x8A),
-     o3(0xE8,0x98,0x93), o3(0xE8,0x98,0x8B),
-     o3(0xE8,0x97,0xBE), o3(0xE8,0x97,0xBA),
-     o3(0xE8,0x98,0x86), o3(0xE8,0x98,0xA2),
-     o3(0xE8,0x98,0x9A), o3(0xE8,0x98,0xB0),
-     o3(0xE8,0x98,0xBF), o3(0xE8,0x99,0x8D),
-     o3(0xE4,0xB9,0x95), o3(0xE8,0x99,0x94),
-     o3(0xE8,0x99,0x9F), o3(0xE8,0x99,0xA7),
-     o3(0xE8,0x99,0xB1), o3(0xE8,0x9A,0x93),
-     o3(0xE8,0x9A,0xA3), o3(0xE8,0x9A,0xA9),
-     o3(0xE8,0x9A,0xAA), o3(0xE8,0x9A,0x8B),
-     o3(0xE8,0x9A,0x8C), o3(0xE8,0x9A,0xB6),
-     o3(0xE8,0x9A,0xAF), o3(0xE8,0x9B,0x84),
-     o3(0xE8,0x9B,0x86), o3(0xE8,0x9A,0xB0),
-     o3(0xE8,0x9B,0x89), o3(0xE8,0xA0,0xA3),
-     o3(0xE8,0x9A,0xAB), o3(0xE8,0x9B,0x94),
-     o3(0xE8,0x9B,0x9E), o3(0xE8,0x9B,0xA9),
-     o3(0xE8,0x9B,0xAC), o3(0xE8,0x9B,0x9F),
-     o3(0xE8,0x9B,0x9B), o3(0xE8,0x9B,0xAF),
-     o3(0xE8,0x9C,0x92), o3(0xE8,0x9C,0x86),
-     o3(0xE8,0x9C,0x88), o3(0xE8,0x9C,0x80),
-     o3(0xE8,0x9C,0x83), o3(0xE8,0x9B,0xBB),
-     o3(0xE8,0x9C,0x91), o3(0xE8,0x9C,0x89),
-     o3(0xE8,0x9C,0x8D), o3(0xE8,0x9B,0xB9),
-     o3(0xE8,0x9C,0x8A), o3(0xE8,0x9C,0xB4),
-     o3(0xE8,0x9C,0xBF), o3(0xE8,0x9C,0xB7),
-     o3(0xE8,0x9C,0xBB), o3(0xE8,0x9C,0xA5),
-     o3(0xE8,0x9C,0xA9), o3(0xE8,0x9C,0x9A),
-     o3(0xE8,0x9D,0xA0), o3(0xE8,0x9D,0x9F),
-     o3(0xE8,0x9D,0xB8), o3(0xE8,0x9D,0x8C),
-     o3(0xE8,0x9D,0x8E), o3(0xE8,0x9D,0xB4),
-     o3(0xE8,0x9D,0x97), o3(0xE8,0x9D,0xA8),
-     o3(0xE8,0x9D,0xAE), o3(0xE8,0x9D,0x99),
-     o3(0xE8,0x9D,0x93), o3(0xE8,0x9D,0xA3),
-     o3(0xE8,0x9D,0xAA), o3(0xE8,0xA0,0x85),
-     o3(0xE8,0x9E,0xA2), o3(0xE8,0x9E,0x9F),
-     o3(0xE8,0x9E,0x82), o3(0xE8,0x9E,0xAF),
-     o3(0xE8,0x9F,0x8B), o3(0xE8,0x9E,0xBD),
-     o3(0xE8,0x9F,0x80), o3(0xE8,0x9F,0x90),
-     o3(0xE9,0x9B,0x96), o3(0xE8,0x9E,0xAB),
-     o3(0xE8,0x9F,0x84), o3(0xE8,0x9E,0xB3),
-     o3(0xE8,0x9F,0x87), o3(0xE8,0x9F,0x86),
-     o3(0xE8,0x9E,0xBB), o3(0xE8,0x9F,0xAF),
-     o3(0xE8,0x9F,0xB2), o3(0xE8,0x9F,0xA0),
-     o3(0xE8,0xA0,0x8F), o3(0xE8,0xA0,0x8D),
-     o3(0xE8,0x9F,0xBE), o3(0xE8,0x9F,0xB6),
-     o3(0xE8,0x9F,0xB7), o3(0xE8,0xA0,0x8E),
-     o3(0xE8,0x9F,0x92), o3(0xE8,0xA0,0x91),
-     o3(0xE8,0xA0,0x96), o3(0xE8,0xA0,0x95),
-     o3(0xE8,0xA0,0xA2), o3(0xE8,0xA0,0xA1),
-     o3(0xE8,0xA0,0xB1), o3(0xE8,0xA0,0xB6),
-     o3(0xE8,0xA0,0xB9), o3(0xE8,0xA0,0xA7),
-     o3(0xE8,0xA0,0xBB), o3(0xE8,0xA1,0x84),
-     o3(0xE8,0xA1,0x82), o3(0xE8,0xA1,0x92),
-     o3(0xE8,0xA1,0x99), o3(0xE8,0xA1,0x9E),
-     o3(0xE8,0xA1,0xA2), o3(0xE8,0xA1,0xAB),
-     o3(0xE8,0xA2,0x81), o3(0xE8,0xA1,0xBE),
-     o3(0xE8,0xA2,0x9E), o3(0xE8,0xA1,0xB5),
-     o3(0xE8,0xA1,0xBD), o3(0xE8,0xA2,0xB5),
-     o3(0xE8,0xA1,0xB2), o3(0xE8,0xA2,0x82),
-     o3(0xE8,0xA2,0x97), o3(0xE8,0xA2,0x92),
-     o3(0xE8,0xA2,0xAE), o3(0xE8,0xA2,0x99),
-     o3(0xE8,0xA2,0xA2), o3(0xE8,0xA2,0x8D),
-     o3(0xE8,0xA2,0xA4), o3(0xE8,0xA2,0xB0),
-     o3(0xE8,0xA2,0xBF), o3(0xE8,0xA2,0xB1),
-     o3(0xE8,0xA3,0x83), o3(0xE8,0xA3,0x84),
-     o3(0xE8,0xA3,0x94), o3(0xE8,0xA3,0x98),
-     o3(0xE8,0xA3,0x99), o3(0xE8,0xA3,0x9D),
-     o3(0xE8,0xA3,0xB9), o3(0xE8,0xA4,0x82),
-     o3(0xE8,0xA3,0xBC), o3(0xE8,0xA3,0xB4),
-     o3(0xE8,0xA3,0xA8), o3(0xE8,0xA3,0xB2),
-     o3(0xE8,0xA4,0x84), o3(0xE8,0xA4,0x8C),
-     o3(0xE8,0xA4,0x8A), o3(0xE8,0xA4,0x93),
-     o3(0xE8,0xA5,0x83), o3(0xE8,0xA4,0x9E),
-     o3(0xE8,0xA4,0xA5), o3(0xE8,0xA4,0xAA),
-     o3(0xE8,0xA4,0xAB), o3(0xE8,0xA5,0x81),
-     o3(0xE8,0xA5,0x84), o3(0xE8,0xA4,0xBB),
-     o3(0xE8,0xA4,0xB6), o3(0xE8,0xA4,0xB8),
-     o3(0xE8,0xA5,0x8C), o3(0xE8,0xA4,0x9D),
-     o3(0xE8,0xA5,0xA0), o3(0xE8,0xA5,0x9E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E5 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E5_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E6_infos[189] = {
-     o3(0xE8,0xA5,0xA6), o3(0xE8,0xA5,0xA4),
-     o3(0xE8,0xA5,0xAD), o3(0xE8,0xA5,0xAA),
-     o3(0xE8,0xA5,0xAF), o3(0xE8,0xA5,0xB4),
-     o3(0xE8,0xA5,0xB7), o3(0xE8,0xA5,0xBE),
-     o3(0xE8,0xA6,0x83), o3(0xE8,0xA6,0x88),
-     o3(0xE8,0xA6,0x8A), o3(0xE8,0xA6,0x93),
-     o3(0xE8,0xA6,0x98), o3(0xE8,0xA6,0xA1),
-     o3(0xE8,0xA6,0xA9), o3(0xE8,0xA6,0xA6),
-     o3(0xE8,0xA6,0xAC), o3(0xE8,0xA6,0xAF),
-     o3(0xE8,0xA6,0xB2), o3(0xE8,0xA6,0xBA),
-     o3(0xE8,0xA6,0xBD), o3(0xE8,0xA6,0xBF),
-     o3(0xE8,0xA7,0x80), o3(0xE8,0xA7,0x9A),
-     o3(0xE8,0xA7,0x9C), o3(0xE8,0xA7,0x9D),
-     o3(0xE8,0xA7,0xA7), o3(0xE8,0xA7,0xB4),
-     o3(0xE8,0xA7,0xB8), o3(0xE8,0xA8,0x83),
-     o3(0xE8,0xA8,0x96), o3(0xE8,0xA8,0x90),
-     o3(0xE8,0xA8,0x8C), o3(0xE8,0xA8,0x9B),
-     o3(0xE8,0xA8,0x9D), o3(0xE8,0xA8,0xA5),
-     o3(0xE8,0xA8,0xB6), o3(0xE8,0xA9,0x81),
-     o3(0xE8,0xA9,0x9B), o3(0xE8,0xA9,0x92),
-     o3(0xE8,0xA9,0x86), o3(0xE8,0xA9,0x88),
-     o3(0xE8,0xA9,0xBC), o3(0xE8,0xA9,0xAD),
-     o3(0xE8,0xA9,0xAC), o3(0xE8,0xA9,0xA2),
-     o3(0xE8,0xAA,0x85), o3(0xE8,0xAA,0x82),
-     o3(0xE8,0xAA,0x84), o3(0xE8,0xAA,0xA8),
-     o3(0xE8,0xAA,0xA1), o3(0xE8,0xAA,0x91),
-     o3(0xE8,0xAA,0xA5), o3(0xE8,0xAA,0xA6),
-     o3(0xE8,0xAA,0x9A), o3(0xE8,0xAA,0xA3),
-     o3(0xE8,0xAB,0x84), o3(0xE8,0xAB,0x8D),
-     o3(0xE8,0xAB,0x82), o3(0xE8,0xAB,0x9A),
-     o3(0xE8,0xAB,0xAB), o3(0xE8,0xAB,0xB3),
-     o3(0xE8,0xAB,0xA7), o3(0xE8,0xAB,0xA4),
-     o3(0xE8,0xAB,0xB1), o3(0xE8,0xAC,0x94),
-     o3(0xE8,0xAB,0xA0), o3(0xE8,0xAB,0xA2),
-     o3(0xE8,0xAB,0xB7), o3(0xE8,0xAB,0x9E),
-     o3(0xE8,0xAB,0x9B), o3(0xE8,0xAC,0x8C),
-     o3(0xE8,0xAC,0x87), o3(0xE8,0xAC,0x9A),
-     o3(0xE8,0xAB,0xA1), o3(0xE8,0xAC,0x96),
-     o3(0xE8,0xAC,0x90), o3(0xE8,0xAC,0x97),
-     o3(0xE8,0xAC,0xA0), o3(0xE8,0xAC,0xB3),
-     o3(0xE9,0x9E,0xAB), o3(0xE8,0xAC,0xA6),
-     o3(0xE8,0xAC,0xAB), o3(0xE8,0xAC,0xBE),
-     o3(0xE8,0xAC,0xA8), o3(0xE8,0xAD,0x81),
-     o3(0xE8,0xAD,0x8C), o3(0xE8,0xAD,0x8F),
-     o3(0xE8,0xAD,0x8E), o3(0xE8,0xAD,0x89),
-     o3(0xE8,0xAD,0x96), o3(0xE8,0xAD,0x9B),
-     o3(0xE8,0xAD,0x9A), o3(0xE8,0xAD,0xAB),
-     o3(0xE8,0xAD,0x9F), o3(0xE8,0xAD,0xAC),
-     o3(0xE8,0xAD,0xAF), o3(0xE8,0xAD,0xB4),
-     o3(0xE8,0xAD,0xBD), o3(0xE8,0xAE,0x80),
-     o3(0xE8,0xAE,0x8C), o3(0xE8,0xAE,0x8E),
-     o3(0xE8,0xAE,0x92), o3(0xE8,0xAE,0x93),
-     o3(0xE8,0xAE,0x96), o3(0xE8,0xAE,0x99),
-     o3(0xE8,0xAE,0x9A), o3(0xE8,0xB0,0xBA),
-     o3(0xE8,0xB1,0x81), o3(0xE8,0xB0,0xBF),
-     o3(0xE8,0xB1,0x88), o3(0xE8,0xB1,0x8C),
-     o3(0xE8,0xB1,0x8E), o3(0xE8,0xB1,0x90),
-     o3(0xE8,0xB1,0x95), o3(0xE8,0xB1,0xA2),
-     o3(0xE8,0xB1,0xAC), o3(0xE8,0xB1,0xB8),
-     o3(0xE8,0xB1,0xBA), o3(0xE8,0xB2,0x82),
-     o3(0xE8,0xB2,0x89), o3(0xE8,0xB2,0x85),
-     o3(0xE8,0xB2,0x8A), o3(0xE8,0xB2,0x8D),
-     o3(0xE8,0xB2,0x8E), o3(0xE8,0xB2,0x94),
-     o3(0xE8,0xB1,0xBC), o3(0xE8,0xB2,0x98),
-     o3(0xE6,0x88,0x9D), o3(0xE8,0xB2,0xAD),
-     o3(0xE8,0xB2,0xAA), o3(0xE8,0xB2,0xBD),
-     o3(0xE8,0xB2,0xB2), o3(0xE8,0xB2,0xB3),
-     o3(0xE8,0xB2,0xAE), o3(0xE8,0xB2,0xB6),
-     o3(0xE8,0xB3,0x88), o3(0xE8,0xB3,0x81),
-     o3(0xE8,0xB3,0xA4), o3(0xE8,0xB3,0xA3),
-     o3(0xE8,0xB3,0x9A), o3(0xE8,0xB3,0xBD),
-     o3(0xE8,0xB3,0xBA), o3(0xE8,0xB3,0xBB),
-     o3(0xE8,0xB4,0x84), o3(0xE8,0xB4,0x85),
-     o3(0xE8,0xB4,0x8A), o3(0xE8,0xB4,0x87),
-     o3(0xE8,0xB4,0x8F), o3(0xE8,0xB4,0x8D),
-     o3(0xE8,0xB4,0x90), o3(0xE9,0xBD,0x8E),
-     o3(0xE8,0xB4,0x93), o3(0xE8,0xB3,0x8D),
-     o3(0xE8,0xB4,0x94), o3(0xE8,0xB4,0x96),
-     o3(0xE8,0xB5,0xA7), o3(0xE8,0xB5,0xAD),
-     o3(0xE8,0xB5,0xB1), o3(0xE8,0xB5,0xB3),
-     o3(0xE8,0xB6,0x81), o3(0xE8,0xB6,0x99),
-     o3(0xE8,0xB7,0x82), o3(0xE8,0xB6,0xBE),
-     o3(0xE8,0xB6,0xBA), o3(0xE8,0xB7,0x8F),
-     o3(0xE8,0xB7,0x9A), o3(0xE8,0xB7,0x96),
-     o3(0xE8,0xB7,0x8C), o3(0xE8,0xB7,0x9B),
-     o3(0xE8,0xB7,0x8B), o3(0xE8,0xB7,0xAA),
-     o3(0xE8,0xB7,0xAB), o3(0xE8,0xB7,0x9F),
-     o3(0xE8,0xB7,0xA3), o3(0xE8,0xB7,0xBC),
-     o3(0xE8,0xB8,0x88), o3(0xE8,0xB8,0x89),
-     o3(0xE8,0xB7,0xBF), o3(0xE8,0xB8,0x9D),
-     o3(0xE8,0xB8,0x9E), o3(0xE8,0xB8,0x90),
-     o3(0xE8,0xB8,0x9F), o3(0xE8,0xB9,0x82),
-     o3(0xE8,0xB8,0xB5), o3(0xE8,0xB8,0xB0),
-     o3(0xE8,0xB8,0xB4), o3(0xE8,0xB9,0x8A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E6 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E6_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E7_infos[189] = {
-     o3(0xE8,0xB9,0x87), o3(0xE8,0xB9,0x89),
-     o3(0xE8,0xB9,0x8C), o3(0xE8,0xB9,0x90),
-     o3(0xE8,0xB9,0x88), o3(0xE8,0xB9,0x99),
-     o3(0xE8,0xB9,0xA4), o3(0xE8,0xB9,0xA0),
-     o3(0xE8,0xB8,0xAA), o3(0xE8,0xB9,0xA3),
-     o3(0xE8,0xB9,0x95), o3(0xE8,0xB9,0xB6),
-     o3(0xE8,0xB9,0xB2), o3(0xE8,0xB9,0xBC),
-     o3(0xE8,0xBA,0x81), o3(0xE8,0xBA,0x87),
-     o3(0xE8,0xBA,0x85), o3(0xE8,0xBA,0x84),
-     o3(0xE8,0xBA,0x8B), o3(0xE8,0xBA,0x8A),
-     o3(0xE8,0xBA,0x93), o3(0xE8,0xBA,0x91),
-     o3(0xE8,0xBA,0x94), o3(0xE8,0xBA,0x99),
-     o3(0xE8,0xBA,0xAA), o3(0xE8,0xBA,0xA1),
-     o3(0xE8,0xBA,0xAC), o3(0xE8,0xBA,0xB0),
-     o3(0xE8,0xBB,0x86), o3(0xE8,0xBA,0xB1),
-     o3(0xE8,0xBA,0xBE), o3(0xE8,0xBB,0x85),
-     o3(0xE8,0xBB,0x88), o3(0xE8,0xBB,0x8B),
-     o3(0xE8,0xBB,0x9B), o3(0xE8,0xBB,0xA3),
-     o3(0xE8,0xBB,0xBC), o3(0xE8,0xBB,0xBB),
-     o3(0xE8,0xBB,0xAB), o3(0xE8,0xBB,0xBE),
-     o3(0xE8,0xBC,0x8A), o3(0xE8,0xBC,0x85),
-     o3(0xE8,0xBC,0x95), o3(0xE8,0xBC,0x92),
-     o3(0xE8,0xBC,0x99), o3(0xE8,0xBC,0x93),
-     o3(0xE8,0xBC,0x9C), o3(0xE8,0xBC,0x9F),
-     o3(0xE8,0xBC,0x9B), o3(0xE8,0xBC,0x8C),
-     o3(0xE8,0xBC,0xA6), o3(0xE8,0xBC,0xB3),
-     o3(0xE8,0xBC,0xBB), o3(0xE8,0xBC,0xB9),
-     o3(0xE8,0xBD,0x85), o3(0xE8,0xBD,0x82),
-     o3(0xE8,0xBC,0xBE), o3(0xE8,0xBD,0x8C),
-     o3(0xE8,0xBD,0x89), o3(0xE8,0xBD,0x86),
-     o3(0xE8,0xBD,0x8E), o3(0xE8,0xBD,0x97),
-     o3(0xE8,0xBD,0x9C), o3(0xE8,0xBD,0xA2),
-     o3(0xE8,0xBD,0xA3), o3(0xE8,0xBD,0xA4),
-     o3(0xE8,0xBE,0x9C), o3(0xE8,0xBE,0x9F),
-     o3(0xE8,0xBE,0xA3), o3(0xE8,0xBE,0xAD),
-     o3(0xE8,0xBE,0xAF), o3(0xE8,0xBE,0xB7),
-     o3(0xE8,0xBF,0x9A), o3(0xE8,0xBF,0xA5),
-     o3(0xE8,0xBF,0xA2), o3(0xE8,0xBF,0xAA),
-     o3(0xE8,0xBF,0xAF), o3(0xE9,0x82,0x87),
-     o3(0xE8,0xBF,0xB4), o3(0xE9,0x80,0x85),
-     o3(0xE8,0xBF,0xB9), o3(0xE8,0xBF,0xBA),
-     o3(0xE9,0x80,0x91), o3(0xE9,0x80,0x95),
-     o3(0xE9,0x80,0xA1), o3(0xE9,0x80,0x8D),
-     o3(0xE9,0x80,0x9E), o3(0xE9,0x80,0x96),
-     o3(0xE9,0x80,0x8B), o3(0xE9,0x80,0xA7),
-     o3(0xE9,0x80,0xB6), o3(0xE9,0x80,0xB5),
-     o3(0xE9,0x80,0xB9), o3(0xE8,0xBF,0xB8),
-     o3(0xE9,0x81,0x8F), o3(0xE9,0x81,0x90),
-     o3(0xE9,0x81,0x91), o3(0xE9,0x81,0x92),
-     o3(0xE9,0x80,0x8E), o3(0xE9,0x81,0x89),
-     o3(0xE9,0x80,0xBE), o3(0xE9,0x81,0x96),
-     o3(0xE9,0x81,0x98), o3(0xE9,0x81,0x9E),
-     o3(0xE9,0x81,0xA8), o3(0xE9,0x81,0xAF),
-     o3(0xE9,0x81,0xB6), o3(0xE9,0x9A,0xA8),
-     o3(0xE9,0x81,0xB2), o3(0xE9,0x82,0x82),
-     o3(0xE9,0x81,0xBD), o3(0xE9,0x82,0x81),
-     o3(0xE9,0x82,0x80), o3(0xE9,0x82,0x8A),
-     o3(0xE9,0x82,0x89), o3(0xE9,0x82,0x8F),
-     o3(0xE9,0x82,0xA8), o3(0xE9,0x82,0xAF),
-     o3(0xE9,0x82,0xB1), o3(0xE9,0x82,0xB5),
-     o3(0xE9,0x83,0xA2), o3(0xE9,0x83,0xA4),
-     o3(0xE6,0x89,0x88), o3(0xE9,0x83,0x9B),
-     o3(0xE9,0x84,0x82), o3(0xE9,0x84,0x92),
-     o3(0xE9,0x84,0x99), o3(0xE9,0x84,0xB2),
-     o3(0xE9,0x84,0xB0), o3(0xE9,0x85,0x8A),
-     o3(0xE9,0x85,0x96), o3(0xE9,0x85,0x98),
-     o3(0xE9,0x85,0xA3), o3(0xE9,0x85,0xA5),
-     o3(0xE9,0x85,0xA9), o3(0xE9,0x85,0xB3),
-     o3(0xE9,0x85,0xB2), o3(0xE9,0x86,0x8B),
-     o3(0xE9,0x86,0x89), o3(0xE9,0x86,0x82),
-     o3(0xE9,0x86,0xA2), o3(0xE9,0x86,0xAB),
-     o3(0xE9,0x86,0xAF), o3(0xE9,0x86,0xAA),
-     o3(0xE9,0x86,0xB5), o3(0xE9,0x86,0xB4),
-     o3(0xE9,0x86,0xBA), o3(0xE9,0x87,0x80),
-     o3(0xE9,0x87,0x81), o3(0xE9,0x87,0x89),
-     o3(0xE9,0x87,0x8B), o3(0xE9,0x87,0x90),
-     o3(0xE9,0x87,0x96), o3(0xE9,0x87,0x9F),
-     o3(0xE9,0x87,0xA1), o3(0xE9,0x87,0x9B),
-     o3(0xE9,0x87,0xBC), o3(0xE9,0x87,0xB5),
-     o3(0xE9,0x87,0xB6), o3(0xE9,0x88,0x9E),
-     o3(0xE9,0x87,0xBF), o3(0xE9,0x88,0x94),
-     o3(0xE9,0x88,0xAC), o3(0xE9,0x88,0x95),
-     o3(0xE9,0x88,0x91), o3(0xE9,0x89,0x9E),
-     o3(0xE9,0x89,0x97), o3(0xE9,0x89,0x85),
-     o3(0xE9,0x89,0x89), o3(0xE9,0x89,0xA4),
-     o3(0xE9,0x89,0x88), o3(0xE9,0x8A,0x95),
-     o3(0xE9,0x88,0xBF), o3(0xE9,0x89,0x8B),
-     o3(0xE9,0x89,0x90), o3(0xE9,0x8A,0x9C),
-     o3(0xE9,0x8A,0x96), o3(0xE9,0x8A,0x93),
-     o3(0xE9,0x8A,0x9B), o3(0xE9,0x89,0x9A),
-     o3(0xE9,0x8B,0x8F), o3(0xE9,0x8A,0xB9),
-     o3(0xE9,0x8A,0xB7), o3(0xE9,0x8B,0xA9),
-     o3(0xE9,0x8C,0x8F), o3(0xE9,0x8B,0xBA),
-     o3(0xE9,0x8D,0x84), o3(0xE9,0x8C,0xAE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E7 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E7_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E8_infos[189] = {
-     o3(0xE9,0x8C,0x99), o3(0xE9,0x8C,0xA2),
-     o3(0xE9,0x8C,0x9A), o3(0xE9,0x8C,0xA3),
-     o3(0xE9,0x8C,0xBA), o3(0xE9,0x8C,0xB5),
-     o3(0xE9,0x8C,0xBB), o3(0xE9,0x8D,0x9C),
-     o3(0xE9,0x8D,0xA0), o3(0xE9,0x8D,0xBC),
-     o3(0xE9,0x8D,0xAE), o3(0xE9,0x8D,0x96),
-     o3(0xE9,0x8E,0xB0), o3(0xE9,0x8E,0xAC),
-     o3(0xE9,0x8E,0xAD), o3(0xE9,0x8E,0x94),
-     o3(0xE9,0x8E,0xB9), o3(0xE9,0x8F,0x96),
-     o3(0xE9,0x8F,0x97), o3(0xE9,0x8F,0xA8),
-     o3(0xE9,0x8F,0xA5), o3(0xE9,0x8F,0x98),
-     o3(0xE9,0x8F,0x83), o3(0xE9,0x8F,0x9D),
-     o3(0xE9,0x8F,0x90), o3(0xE9,0x8F,0x88),
-     o3(0xE9,0x8F,0xA4), o3(0xE9,0x90,0x9A),
-     o3(0xE9,0x90,0x94), o3(0xE9,0x90,0x93),
-     o3(0xE9,0x90,0x83), o3(0xE9,0x90,0x87),
-     o3(0xE9,0x90,0x90), o3(0xE9,0x90,0xB6),
-     o3(0xE9,0x90,0xAB), o3(0xE9,0x90,0xB5),
-     o3(0xE9,0x90,0xA1), o3(0xE9,0x90,0xBA),
-     o3(0xE9,0x91,0x81), o3(0xE9,0x91,0x92),
-     o3(0xE9,0x91,0x84), o3(0xE9,0x91,0x9B),
-     o3(0xE9,0x91,0xA0), o3(0xE9,0x91,0xA2),
-     o3(0xE9,0x91,0x9E), o3(0xE9,0x91,0xAA),
-     o3(0xE9,0x88,0xA9), o3(0xE9,0x91,0xB0),
-     o3(0xE9,0x91,0xB5), o3(0xE9,0x91,0xB7),
-     o3(0xE9,0x91,0xBD), o3(0xE9,0x91,0x9A),
-     o3(0xE9,0x91,0xBC), o3(0xE9,0x91,0xBE),
-     o3(0xE9,0x92,0x81), o3(0xE9,0x91,0xBF),
-     o3(0xE9,0x96,0x82), o3(0xE9,0x96,0x87),
-     o3(0xE9,0x96,0x8A), o3(0xE9,0x96,0x94),
-     o3(0xE9,0x96,0x96), o3(0xE9,0x96,0x98),
-     o3(0xE9,0x96,0x99), o3(0xE9,0x96,0xA0),
-     o3(0xE9,0x96,0xA8), o3(0xE9,0x96,0xA7),
-     o3(0xE9,0x96,0xAD), o3(0xE9,0x96,0xBC),
-     o3(0xE9,0x96,0xBB), o3(0xE9,0x96,0xB9),
-     o3(0xE9,0x96,0xBE), o3(0xE9,0x97,0x8A),
-     o3(0xE6,0xBF,0xB6), o3(0xE9,0x97,0x83),
-     o3(0xE9,0x97,0x8D), o3(0xE9,0x97,0x8C),
-     o3(0xE9,0x97,0x95), o3(0xE9,0x97,0x94),
-     o3(0xE9,0x97,0x96), o3(0xE9,0x97,0x9C),
-     o3(0xE9,0x97,0xA1), o3(0xE9,0x97,0xA5),
-     o3(0xE9,0x97,0xA2), o3(0xE9,0x98,0xA1),
-     o3(0xE9,0x98,0xA8), o3(0xE9,0x98,0xAE),
-     o3(0xE9,0x98,0xAF), o3(0xE9,0x99,0x82),
-     o3(0xE9,0x99,0x8C), o3(0xE9,0x99,0x8F),
-     o3(0xE9,0x99,0x8B), o3(0xE9,0x99,0xB7),
-     o3(0xE9,0x99,0x9C), o3(0xE9,0x99,0x9E),
-     o3(0xE9,0x99,0x9D), o3(0xE9,0x99,0x9F),
-     o3(0xE9,0x99,0xA6), o3(0xE9,0x99,0xB2),
-     o3(0xE9,0x99,0xAC), o3(0xE9,0x9A,0x8D),
-     o3(0xE9,0x9A,0x98), o3(0xE9,0x9A,0x95),
-     o3(0xE9,0x9A,0x97), o3(0xE9,0x9A,0xAA),
-     o3(0xE9,0x9A,0xA7), o3(0xE9,0x9A,0xB1),
-     o3(0xE9,0x9A,0xB2), o3(0xE9,0x9A,0xB0),
-     o3(0xE9,0x9A,0xB4), o3(0xE9,0x9A,0xB6),
-     o3(0xE9,0x9A,0xB8), o3(0xE9,0x9A,0xB9),
-     o3(0xE9,0x9B,0x8E), o3(0xE9,0x9B,0x8B),
-     o3(0xE9,0x9B,0x89), o3(0xE9,0x9B,0x8D),
-     o3(0xE8,0xA5,0x8D), o3(0xE9,0x9B,0x9C),
-     o3(0xE9,0x9C,0x8D), o3(0xE9,0x9B,0x95),
-     o3(0xE9,0x9B,0xB9), o3(0xE9,0x9C,0x84),
-     o3(0xE9,0x9C,0x86), o3(0xE9,0x9C,0x88),
-     o3(0xE9,0x9C,0x93), o3(0xE9,0x9C,0x8E),
-     o3(0xE9,0x9C,0x91), o3(0xE9,0x9C,0x8F),
-     o3(0xE9,0x9C,0x96), o3(0xE9,0x9C,0x99),
-     o3(0xE9,0x9C,0xA4), o3(0xE9,0x9C,0xAA),
-     o3(0xE9,0x9C,0xB0), o3(0xE9,0x9C,0xB9),
-     o3(0xE9,0x9C,0xBD), o3(0xE9,0x9C,0xBE),
-     o3(0xE9,0x9D,0x84), o3(0xE9,0x9D,0x86),
-     o3(0xE9,0x9D,0x88), o3(0xE9,0x9D,0x82),
-     o3(0xE9,0x9D,0x89), o3(0xE9,0x9D,0x9C),
-     o3(0xE9,0x9D,0xA0), o3(0xE9,0x9D,0xA4),
-     o3(0xE9,0x9D,0xA6), o3(0xE9,0x9D,0xA8),
-     o3(0xE5,0x8B,0x92), o3(0xE9,0x9D,0xAB),
-     o3(0xE9,0x9D,0xB1), o3(0xE9,0x9D,0xB9),
-     o3(0xE9,0x9E,0x85), o3(0xE9,0x9D,0xBC),
-     o3(0xE9,0x9E,0x81), o3(0xE9,0x9D,0xBA),
-     o3(0xE9,0x9E,0x86), o3(0xE9,0x9E,0x8B),
-     o3(0xE9,0x9E,0x8F), o3(0xE9,0x9E,0x90),
-     o3(0xE9,0x9E,0x9C), o3(0xE9,0x9E,0xA8),
-     o3(0xE9,0x9E,0xA6), o3(0xE9,0x9E,0xA3),
-     o3(0xE9,0x9E,0xB3), o3(0xE9,0x9E,0xB4),
-     o3(0xE9,0x9F,0x83), o3(0xE9,0x9F,0x86),
-     o3(0xE9,0x9F,0x88), o3(0xE9,0x9F,0x8B),
-     o3(0xE9,0x9F,0x9C), o3(0xE9,0x9F,0xAD),
-     o3(0xE9,0xBD,0x8F), o3(0xE9,0x9F,0xB2),
-     o3(0xE7,0xAB,0x9F), o3(0xE9,0x9F,0xB6),
-     o3(0xE9,0x9F,0xB5), o3(0xE9,0xA0,0x8F),
-     o3(0xE9,0xA0,0x8C), o3(0xE9,0xA0,0xB8),
-     o3(0xE9,0xA0,0xA4), o3(0xE9,0xA0,0xA1),
-     o3(0xE9,0xA0,0xB7), o3(0xE9,0xA0,0xBD),
-     o3(0xE9,0xA1,0x86), o3(0xE9,0xA1,0x8F),
-     o3(0xE9,0xA1,0x8B), o3(0xE9,0xA1,0xAB),
-     o3(0xE9,0xA1,0xAF), o3(0xE9,0xA1,0xB0),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E8 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E8_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_E9_infos[189] = {
-     o3(0xE9,0xA1,0xB1), o3(0xE9,0xA1,0xB4),
-     o3(0xE9,0xA1,0xB3), o3(0xE9,0xA2,0xAA),
-     o3(0xE9,0xA2,0xAF), o3(0xE9,0xA2,0xB1),
-     o3(0xE9,0xA2,0xB6), o3(0xE9,0xA3,0x84),
-     o3(0xE9,0xA3,0x83), o3(0xE9,0xA3,0x86),
-     o3(0xE9,0xA3,0xA9), o3(0xE9,0xA3,0xAB),
-     o3(0xE9,0xA4,0x83), o3(0xE9,0xA4,0x89),
-     o3(0xE9,0xA4,0x92), o3(0xE9,0xA4,0x94),
-     o3(0xE9,0xA4,0x98), o3(0xE9,0xA4,0xA1),
-     o3(0xE9,0xA4,0x9D), o3(0xE9,0xA4,0x9E),
-     o3(0xE9,0xA4,0xA4), o3(0xE9,0xA4,0xA0),
-     o3(0xE9,0xA4,0xAC), o3(0xE9,0xA4,0xAE),
-     o3(0xE9,0xA4,0xBD), o3(0xE9,0xA4,0xBE),
-     o3(0xE9,0xA5,0x82), o3(0xE9,0xA5,0x89),
-     o3(0xE9,0xA5,0x85), o3(0xE9,0xA5,0x90),
-     o3(0xE9,0xA5,0x8B), o3(0xE9,0xA5,0x91),
-     o3(0xE9,0xA5,0x92), o3(0xE9,0xA5,0x8C),
-     o3(0xE9,0xA5,0x95), o3(0xE9,0xA6,0x97),
-     o3(0xE9,0xA6,0x98), o3(0xE9,0xA6,0xA5),
-     o3(0xE9,0xA6,0xAD), o3(0xE9,0xA6,0xAE),
-     o3(0xE9,0xA6,0xBC), o3(0xE9,0xA7,0x9F),
-     o3(0xE9,0xA7,0x9B), o3(0xE9,0xA7,0x9D),
-     o3(0xE9,0xA7,0x98), o3(0xE9,0xA7,0x91),
-     o3(0xE9,0xA7,0xAD), o3(0xE9,0xA7,0xAE),
-     o3(0xE9,0xA7,0xB1), o3(0xE9,0xA7,0xB2),
-     o3(0xE9,0xA7,0xBB), o3(0xE9,0xA7,0xB8),
-     o3(0xE9,0xA8,0x81), o3(0xE9,0xA8,0x8F),
-     o3(0xE9,0xA8,0x85), o3(0xE9,0xA7,0xA2),
-     o3(0xE9,0xA8,0x99), o3(0xE9,0xA8,0xAB),
-     o3(0xE9,0xA8,0xB7), o3(0xE9,0xA9,0x85),
-     o3(0xE9,0xA9,0x82), o3(0xE9,0xA9,0x80),
-     o3(0xE9,0xA9,0x83), o3(0xE9,0xA8,0xBE),
-     o3(0xE9,0xA9,0x95), o3(0xE9,0xA9,0x8D),
-     o3(0xE9,0xA9,0x9B), o3(0xE9,0xA9,0x97),
-     o3(0xE9,0xA9,0x9F), o3(0xE9,0xA9,0xA2),
-     o3(0xE9,0xA9,0xA5), o3(0xE9,0xA9,0xA4),
-     o3(0xE9,0xA9,0xA9), o3(0xE9,0xA9,0xAB),
-     o3(0xE9,0xA9,0xAA), o3(0xE9,0xAA,0xAD),
-     o3(0xE9,0xAA,0xB0), o3(0xE9,0xAA,0xBC),
-     o3(0xE9,0xAB,0x80), o3(0xE9,0xAB,0x8F),
-     o3(0xE9,0xAB,0x91), o3(0xE9,0xAB,0x93),
-     o3(0xE9,0xAB,0x94), o3(0xE9,0xAB,0x9E),
-     o3(0xE9,0xAB,0x9F), o3(0xE9,0xAB,0xA2),
-     o3(0xE9,0xAB,0xA3), o3(0xE9,0xAB,0xA6),
-     o3(0xE9,0xAB,0xAF), o3(0xE9,0xAB,0xAB),
-     o3(0xE9,0xAB,0xAE), o3(0xE9,0xAB,0xB4),
-     o3(0xE9,0xAB,0xB1), o3(0xE9,0xAB,0xB7),
-     o3(0xE9,0xAB,0xBB), o3(0xE9,0xAC,0x86),
-     o3(0xE9,0xAC,0x98), o3(0xE9,0xAC,0x9A),
-     o3(0xE9,0xAC,0x9F), o3(0xE9,0xAC,0xA2),
-     o3(0xE9,0xAC,0xA3), o3(0xE9,0xAC,0xA5),
-     o3(0xE9,0xAC,0xA7), o3(0xE9,0xAC,0xA8),
-     o3(0xE9,0xAC,0xA9), o3(0xE9,0xAC,0xAA),
-     o3(0xE9,0xAC,0xAE), o3(0xE9,0xAC,0xAF),
-     o3(0xE9,0xAC,0xB2), o3(0xE9,0xAD,0x84),
-     o3(0xE9,0xAD,0x83), o3(0xE9,0xAD,0x8F),
-     o3(0xE9,0xAD,0x8D), o3(0xE9,0xAD,0x8E),
-     o3(0xE9,0xAD,0x91), o3(0xE9,0xAD,0x98),
-     o3(0xE9,0xAD,0xB4), o3(0xE9,0xAE,0x93),
-     o3(0xE9,0xAE,0x83), o3(0xE9,0xAE,0x91),
-     o3(0xE9,0xAE,0x96), o3(0xE9,0xAE,0x97),
-     o3(0xE9,0xAE,0x9F), o3(0xE9,0xAE,0xA0),
-     o3(0xE9,0xAE,0xA8), o3(0xE9,0xAE,0xB4),
-     o3(0xE9,0xAF,0x80), o3(0xE9,0xAF,0x8A),
-     o3(0xE9,0xAE,0xB9), o3(0xE9,0xAF,0x86),
-     o3(0xE9,0xAF,0x8F), o3(0xE9,0xAF,0x91),
-     o3(0xE9,0xAF,0x92), o3(0xE9,0xAF,0xA3),
-     o3(0xE9,0xAF,0xA2), o3(0xE9,0xAF,0xA4),
-     o3(0xE9,0xAF,0x94), o3(0xE9,0xAF,0xA1),
-     o3(0xE9,0xB0,0xBA), o3(0xE9,0xAF,0xB2),
-     o3(0xE9,0xAF,0xB1), o3(0xE9,0xAF,0xB0),
-     o3(0xE9,0xB0,0x95), o3(0xE9,0xB0,0x94),
-     o3(0xE9,0xB0,0x89), o3(0xE9,0xB0,0x93),
-     o3(0xE9,0xB0,0x8C), o3(0xE9,0xB0,0x86),
-     o3(0xE9,0xB0,0x88), o3(0xE9,0xB0,0x92),
-     o3(0xE9,0xB0,0x8A), o3(0xE9,0xB0,0x84),
-     o3(0xE9,0xB0,0xAE), o3(0xE9,0xB0,0x9B),
-     o3(0xE9,0xB0,0xA5), o3(0xE9,0xB0,0xA4),
-     o3(0xE9,0xB0,0xA1), o3(0xE9,0xB0,0xB0),
-     o3(0xE9,0xB1,0x87), o3(0xE9,0xB0,0xB2),
-     o3(0xE9,0xB1,0x86), o3(0xE9,0xB0,0xBE),
-     o3(0xE9,0xB1,0x9A), o3(0xE9,0xB1,0xA0),
-     o3(0xE9,0xB1,0xA7), o3(0xE9,0xB1,0xB6),
-     o3(0xE9,0xB1,0xB8), o3(0xE9,0xB3,0xA7),
-     o3(0xE9,0xB3,0xAC), o3(0xE9,0xB3,0xB0),
-     o3(0xE9,0xB4,0x89), o3(0xE9,0xB4,0x88),
-     o3(0xE9,0xB3,0xAB), o3(0xE9,0xB4,0x83),
-     o3(0xE9,0xB4,0x86), o3(0xE9,0xB4,0xAA),
-     o3(0xE9,0xB4,0xA6), o3(0xE9,0xB6,0xAF),
-     o3(0xE9,0xB4,0xA3), o3(0xE9,0xB4,0x9F),
-     o3(0xE9,0xB5,0x84), o3(0xE9,0xB4,0x95),
-     o3(0xE9,0xB4,0x92), o3(0xE9,0xB5,0x81),
-     o3(0xE9,0xB4,0xBF), o3(0xE9,0xB4,0xBE),
-     o3(0xE9,0xB5,0x86), o3(0xE9,0xB5,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_E9 = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_E9_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_EA_offsets[256] = {
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62,100,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-    100,100,100,100,100,100,100,100,  100,100,100,100,100,100,100,100,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_EA_infos[101] = {
-     o3(0xE9,0xB5,0x9D), o3(0xE9,0xB5,0x9E),
-     o3(0xE9,0xB5,0xA4), o3(0xE9,0xB5,0x91),
-     o3(0xE9,0xB5,0x90), o3(0xE9,0xB5,0x99),
-     o3(0xE9,0xB5,0xB2), o3(0xE9,0xB6,0x89),
-     o3(0xE9,0xB6,0x87), o3(0xE9,0xB6,0xAB),
-     o3(0xE9,0xB5,0xAF), o3(0xE9,0xB5,0xBA),
-     o3(0xE9,0xB6,0x9A), o3(0xE9,0xB6,0xA4),
-     o3(0xE9,0xB6,0xA9), o3(0xE9,0xB6,0xB2),
-     o3(0xE9,0xB7,0x84), o3(0xE9,0xB7,0x81),
-     o3(0xE9,0xB6,0xBB), o3(0xE9,0xB6,0xB8),
-     o3(0xE9,0xB6,0xBA), o3(0xE9,0xB7,0x86),
-     o3(0xE9,0xB7,0x8F), o3(0xE9,0xB7,0x82),
-     o3(0xE9,0xB7,0x99), o3(0xE9,0xB7,0x93),
-     o3(0xE9,0xB7,0xB8), o3(0xE9,0xB7,0xA6),
-     o3(0xE9,0xB7,0xAD), o3(0xE9,0xB7,0xAF),
-     o3(0xE9,0xB7,0xBD), o3(0xE9,0xB8,0x9A),
-     o3(0xE9,0xB8,0x9B), o3(0xE9,0xB8,0x9E),
-     o3(0xE9,0xB9,0xB5), o3(0xE9,0xB9,0xB9),
-     o3(0xE9,0xB9,0xBD), o3(0xE9,0xBA,0x81),
-     o3(0xE9,0xBA,0x88), o3(0xE9,0xBA,0x8B),
-     o3(0xE9,0xBA,0x8C), o3(0xE9,0xBA,0x92),
-     o3(0xE9,0xBA,0x95), o3(0xE9,0xBA,0x91),
-     o3(0xE9,0xBA,0x9D), o3(0xE9,0xBA,0xA5),
-     o3(0xE9,0xBA,0xA9), o3(0xE9,0xBA,0xB8),
-     o3(0xE9,0xBA,0xAA), o3(0xE9,0xBA,0xAD),
-     o3(0xE9,0x9D,0xA1), o3(0xE9,0xBB,0x8C),
-     o3(0xE9,0xBB,0x8E), o3(0xE9,0xBB,0x8F),
-     o3(0xE9,0xBB,0x90), o3(0xE9,0xBB,0x94),
-     o3(0xE9,0xBB,0x9C), o3(0xE9,0xBB,0x9E),
-     o3(0xE9,0xBB,0x9D), o3(0xE9,0xBB,0xA0),
-     o3(0xE9,0xBB,0xA5), o3(0xE9,0xBB,0xA8),
-     o3(0xE9,0xBB,0xAF), o3(0xE9,0xBB,0xB4),
-     o3(0xE9,0xBB,0xB6), o3(0xE9,0xBB,0xB7),
-     o3(0xE9,0xBB,0xB9), o3(0xE9,0xBB,0xBB),
-     o3(0xE9,0xBB,0xBC), o3(0xE9,0xBB,0xBD),
-     o3(0xE9,0xBC,0x87), o3(0xE9,0xBC,0x88),
-     o3(0xE7,0x9A,0xB7), o3(0xE9,0xBC,0x95),
-     o3(0xE9,0xBC,0xA1), o3(0xE9,0xBC,0xAC),
-     o3(0xE9,0xBC,0xBE), o3(0xE9,0xBD,0x8A),
-     o3(0xE9,0xBD,0x92), o3(0xE9,0xBD,0x94),
-     o3(0xE9,0xBD,0xA3), o3(0xE9,0xBD,0x9F),
-     o3(0xE9,0xBD,0xA0), o3(0xE9,0xBD,0xA1),
-     o3(0xE9,0xBD,0xA6), o3(0xE9,0xBD,0xA7),
-     o3(0xE9,0xBD,0xAC), o3(0xE9,0xBD,0xAA),
-     o3(0xE9,0xBD,0xB7), o3(0xE9,0xBD,0xB2),
-     o3(0xE9,0xBD,0xB6), o3(0xE9,0xBE,0x95),
-     o3(0xE9,0xBE,0x9C), o3(0xE9,0xBE,0xA0),
-     o3(0xE5,0xA0,0xAF), o3(0xE6,0xA7,0x87),
-     o3(0xE9,0x81,0x99), o3(0xE7,0x91,0xA4),
-     o3(0xE5,0x87,0x9C), o3(0xE7,0x86,0x99),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_EA = {
-    from_SHIFT_JIS_EA_offsets,
-    from_SHIFT_JIS_EA_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_FA_offsets[256] = {
-    173,173,173,173,173,173,173,173,  173,173,173,173,173,173,173,173,
-    173,173,173,173,173,173,173,173,  173,173,173,173,173,173,173,173,
-    173,173,173,173,173,173,173,173,  173,173,173,173,173,173,173,173,
-    173,173,173,173,173,173,173,173,  173,173,173,173,173,173,173,173,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9,173,173,173,173,173,173,
-    173,173,173,173,173, 10, 11, 12,  173,173,173,173, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47,173,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 66, 67, 68, 69, 70, 71,   72, 73, 74, 75, 76, 77, 78, 79,
-     80, 81, 82, 83, 84, 85, 86, 87,   88, 89, 90, 91, 92, 93, 94, 95,
-     96, 97, 98, 99,100,101,102,103,  104,105,106,107,108,109,110,111,
-    112,113,114,115,116,117,118,119,  120,121,122,123,124,125,126,127,
-    128,129,130,131,132,133,134,135,  136,137,138,139,140,141,142,143,
-    144,145,146,147,148,149,150,151,  152,153,154,155,156,157,158,159,
-    160,161,162,163,164,165,166,167,  168,169,170,171,172,173,173,173,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_FA_infos[174] = {
-     o3(0xE2,0x85,0xB0), o3(0xE2,0x85,0xB1),
-     o3(0xE2,0x85,0xB2), o3(0xE2,0x85,0xB3),
-     o3(0xE2,0x85,0xB4), o3(0xE2,0x85,0xB5),
-     o3(0xE2,0x85,0xB6), o3(0xE2,0x85,0xB7),
-     o3(0xE2,0x85,0xB8), o3(0xE2,0x85,0xB9),
-     o3(0xEF,0xBF,0xA4), o3(0xEF,0xBC,0x87),
-     o3(0xEF,0xBC,0x82), o3(0xE7,0xBA,0x8A),
-     o3(0xE8,0xA4,0x9C), o3(0xE9,0x8D,0x88),
-     o3(0xE9,0x8A,0x88), o3(0xE8,0x93,0x9C),
-     o3(0xE4,0xBF,0x89), o3(0xE7,0x82,0xBB),
-     o3(0xE6,0x98,0xB1), o3(0xE6,0xA3,0x88),
-     o3(0xE9,0x8B,0xB9), o3(0xE6,0x9B,0xBB),
-     o3(0xE5,0xBD,0x85), o3(0xE4,0xB8,0xA8),
-     o3(0xE4,0xBB,0xA1), o3(0xE4,0xBB,0xBC),
-     o3(0xE4,0xBC,0x80), o3(0xE4,0xBC,0x83),
-     o3(0xE4,0xBC,0xB9), o3(0xE4,0xBD,0x96),
-     o3(0xE4,0xBE,0x92), o3(0xE4,0xBE,0x8A),
-     o3(0xE4,0xBE,0x9A), o3(0xE4,0xBE,0x94),
-     o3(0xE4,0xBF,0x8D), o3(0xE5,0x81,0x80),
-     o3(0xE5,0x80,0xA2), o3(0xE4,0xBF,0xBF),
-     o3(0xE5,0x80,0x9E), o3(0xE5,0x81,0x86),
-     o3(0xE5,0x81,0xB0), o3(0xE5,0x81,0x82),
-     o3(0xE5,0x82,0x94), o3(0xE5,0x83,0xB4),
-     o3(0xE5,0x83,0x98), o3(0xE5,0x85,0x8A),
-     o3(0xE5,0x85,0xA4), o3(0xE5,0x86,0x9D),
-     o3(0xE5,0x86,0xBE), o3(0xE5,0x87,0xAC),
-     o3(0xE5,0x88,0x95), o3(0xE5,0x8A,0x9C),
-     o3(0xE5,0x8A,0xA6), o3(0xE5,0x8B,0x80),
-     o3(0xE5,0x8B,0x9B), o3(0xE5,0x8C,0x80),
-     o3(0xE5,0x8C,0x87), o3(0xE5,0x8C,0xA4),
-     o3(0xE5,0x8D,0xB2), o3(0xE5,0x8E,0x93),
-     o3(0xE5,0x8E,0xB2), o3(0xE5,0x8F,0x9D),
-     o3(0xEF,0xA8,0x8E), o3(0xE5,0x92,0x9C),
-     o3(0xE5,0x92,0x8A), o3(0xE5,0x92,0xA9),
-     o3(0xE5,0x93,0xBF), o3(0xE5,0x96,0x86),
-     o3(0xE5,0x9D,0x99), o3(0xE5,0x9D,0xA5),
-     o3(0xE5,0x9E,0xAC), o3(0xE5,0x9F,0x88),
-     o3(0xE5,0x9F,0x87), o3(0xEF,0xA8,0x8F),
-     o3(0xEF,0xA8,0x90), o3(0xE5,0xA2,0x9E),
-     o3(0xE5,0xA2,0xB2), o3(0xE5,0xA4,0x8B),
-     o3(0xE5,0xA5,0x93), o3(0xE5,0xA5,0x9B),
-     o3(0xE5,0xA5,0x9D), o3(0xE5,0xA5,0xA3),
-     o3(0xE5,0xA6,0xA4), o3(0xE5,0xA6,0xBA),
-     o3(0xE5,0xAD,0x96), o3(0xE5,0xAF,0x80),
-     o3(0xE7,0x94,0xAF), o3(0xE5,0xAF,0x98),
-     o3(0xE5,0xAF,0xAC), o3(0xE5,0xB0,0x9E),
-     o3(0xE5,0xB2,0xA6), o3(0xE5,0xB2,0xBA),
-     o3(0xE5,0xB3,0xB5), o3(0xE5,0xB4,0xA7),
-     o3(0xE5,0xB5,0x93), o3(0xEF,0xA8,0x91),
-     o3(0xE5,0xB5,0x82), o3(0xE5,0xB5,0xAD),
-     o3(0xE5,0xB6,0xB8), o3(0xE5,0xB6,0xB9),
-     o3(0xE5,0xB7,0x90), o3(0xE5,0xBC,0xA1),
-     o3(0xE5,0xBC,0xB4), o3(0xE5,0xBD,0xA7),
-     o3(0xE5,0xBE,0xB7), o3(0xE5,0xBF,0x9E),
-     o3(0xE6,0x81,0x9D), o3(0xE6,0x82,0x85),
-     o3(0xE6,0x82,0x8A), o3(0xE6,0x83,0x9E),
-     o3(0xE6,0x83,0x95), o3(0xE6,0x84,0xA0),
-     o3(0xE6,0x83,0xB2), o3(0xE6,0x84,0x91),
-     o3(0xE6,0x84,0xB7), o3(0xE6,0x84,0xB0),
-     o3(0xE6,0x86,0x98), o3(0xE6,0x88,0x93),
-     o3(0xE6,0x8A,0xA6), o3(0xE6,0x8F,0xB5),
-     o3(0xE6,0x91,0xA0), o3(0xE6,0x92,0x9D),
-     o3(0xE6,0x93,0x8E), o3(0xE6,0x95,0x8E),
-     o3(0xE6,0x98,0x80), o3(0xE6,0x98,0x95),
-     o3(0xE6,0x98,0xBB), o3(0xE6,0x98,0x89),
-     o3(0xE6,0x98,0xAE), o3(0xE6,0x98,0x9E),
-     o3(0xE6,0x98,0xA4), o3(0xE6,0x99,0xA5),
-     o3(0xE6,0x99,0x97), o3(0xE6,0x99,0x99),
-     o3(0xEF,0xA8,0x92), o3(0xE6,0x99,0xB3),
-     o3(0xE6,0x9A,0x99), o3(0xE6,0x9A,0xA0),
-     o3(0xE6,0x9A,0xB2), o3(0xE6,0x9A,0xBF),
-     o3(0xE6,0x9B,0xBA), o3(0xE6,0x9C,0x8E),
-     o3(0xEF,0xA4,0xA9), o3(0xE6,0x9D,0xA6),
-     o3(0xE6,0x9E,0xBB), o3(0xE6,0xA1,0x92),
-     o3(0xE6,0x9F,0x80), o3(0xE6,0xA0,0x81),
-     o3(0xE6,0xA1,0x84), o3(0xE6,0xA3,0x8F),
-     o3(0xEF,0xA8,0x93), o3(0xE6,0xA5,0xA8),
-     o3(0xEF,0xA8,0x94), o3(0xE6,0xA6,0x98),
-     o3(0xE6,0xA7,0xA2), o3(0xE6,0xA8,0xB0),
-     o3(0xE6,0xA9,0xAB), o3(0xE6,0xA9,0x86),
-     o3(0xE6,0xA9,0xB3), o3(0xE6,0xA9,0xBE),
-     o3(0xE6,0xAB,0xA2), o3(0xE6,0xAB,0xA4),
-     o3(0xE6,0xAF,0x96), o3(0xE6,0xB0,0xBF),
-     o3(0xE6,0xB1,0x9C), o3(0xE6,0xB2,0x86),
-     o3(0xE6,0xB1,0xAF), o3(0xE6,0xB3,0x9A),
-     o3(0xE6,0xB4,0x84), o3(0xE6,0xB6,0x87),
-     o3(0xE6,0xB5,0xAF),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_FA = {
-    from_SHIFT_JIS_FA_offsets,
-    from_SHIFT_JIS_FA_infos
-};
-
-static const struct byte_lookup* const
-from_SHIFT_JIS_FB_infos[189] = {
-     o3(0xE6,0xB6,0x96), o3(0xE6,0xB6,0xAC),
-     o3(0xE6,0xB7,0x8F), o3(0xE6,0xB7,0xB8),
-     o3(0xE6,0xB7,0xB2), o3(0xE6,0xB7,0xBC),
-     o3(0xE6,0xB8,0xB9), o3(0xE6,0xB9,0x9C),
-     o3(0xE6,0xB8,0xA7), o3(0xE6,0xB8,0xBC),
-     o3(0xE6,0xBA,0xBF), o3(0xE6,0xBE,0x88),
-     o3(0xE6,0xBE,0xB5), o3(0xE6,0xBF,0xB5),
-     o3(0xE7,0x80,0x85), o3(0xE7,0x80,0x87),
-     o3(0xE7,0x80,0xA8), o3(0xE7,0x82,0x85),
-     o3(0xE7,0x82,0xAB), o3(0xE7,0x84,0x8F),
-     o3(0xE7,0x84,0x84), o3(0xE7,0x85,0x9C),
-     o3(0xE7,0x85,0x86), o3(0xE7,0x85,0x87),
-     o3(0xEF,0xA8,0x95), o3(0xE7,0x87,0x81),
-     o3(0xE7,0x87,0xBE), o3(0xE7,0x8A,0xB1),
-     o3(0xE7,0x8A,0xBE), o3(0xE7,0x8C,0xA4),
-     o3(0xEF,0xA8,0x96), o3(0xE7,0x8D,0xB7),
-     o3(0xE7,0x8E,0xBD), o3(0xE7,0x8F,0x89),
-     o3(0xE7,0x8F,0x96), o3(0xE7,0x8F,0xA3),
-     o3(0xE7,0x8F,0x92), o3(0xE7,0x90,0x87),
-     o3(0xE7,0x8F,0xB5), o3(0xE7,0x90,0xA6),
-     o3(0xE7,0x90,0xAA), o3(0xE7,0x90,0xA9),
-     o3(0xE7,0x90,0xAE), o3(0xE7,0x91,0xA2),
-     o3(0xE7,0x92,0x89), o3(0xE7,0x92,0x9F),
-     o3(0xE7,0x94,0x81), o3(0xE7,0x95,0xAF),
-     o3(0xE7,0x9A,0x82), o3(0xE7,0x9A,0x9C),
-     o3(0xE7,0x9A,0x9E), o3(0xE7,0x9A,0x9B),
-     o3(0xE7,0x9A,0xA6), o3(0xEF,0xA8,0x97),
-     o3(0xE7,0x9D,0x86), o3(0xE5,0x8A,0xAF),
-     o3(0xE7,0xA0,0xA1), o3(0xE7,0xA1,0x8E),
-     o3(0xE7,0xA1,0xA4), o3(0xE7,0xA1,0xBA),
-     o3(0xE7,0xA4,0xB0), o3(0xEF,0xA8,0x98),
-     o3(0xEF,0xA8,0x99), o3(0xEF,0xA8,0x9A),
-     o3(0xE7,0xA6,0x94), o3(0xEF,0xA8,0x9B),
-     o3(0xE7,0xA6,0x9B), o3(0xE7,0xAB,0x91),
-     o3(0xE7,0xAB,0xA7), o3(0xEF,0xA8,0x9C),
-     o3(0xE7,0xAB,0xAB), o3(0xE7,0xAE,0x9E),
-     o3(0xEF,0xA8,0x9D), o3(0xE7,0xB5,0x88),
-     o3(0xE7,0xB5,0x9C), o3(0xE7,0xB6,0xB7),
-     o3(0xE7,0xB6,0xA0), o3(0xE7,0xB7,0x96),
-     o3(0xE7,0xB9,0x92), o3(0xE7,0xBD,0x87),
-     o3(0xE7,0xBE,0xA1), o3(0xEF,0xA8,0x9E),
-     o3(0xE8,0x8C,0x81), o3(0xE8,0x8D,0xA2),
-     o3(0xE8,0x8D,0xBF), o3(0xE8,0x8F,0x87),
-     o3(0xE8,0x8F,0xB6), o3(0xE8,0x91,0x88),
-     o3(0xE8,0x92,0xB4), o3(0xE8,0x95,0x93),
-     o3(0xE8,0x95,0x99), o3(0xE8,0x95,0xAB),
-     o3(0xEF,0xA8,0x9F), o3(0xE8,0x96,0xB0),
-     o3(0xEF,0xA8,0xA0), o3(0xEF,0xA8,0xA1),
-     o3(0xE8,0xA0,0x87), o3(0xE8,0xA3,0xB5),
-     o3(0xE8,0xA8,0x92), o3(0xE8,0xA8,0xB7),
-     o3(0xE8,0xA9,0xB9), o3(0xE8,0xAA,0xA7),
-     o3(0xE8,0xAA,0xBE), o3(0xE8,0xAB,0x9F),
-     o3(0xEF,0xA8,0xA2), o3(0xE8,0xAB,0xB6),
-     o3(0xE8,0xAD,0x93), o3(0xE8,0xAD,0xBF),
-     o3(0xE8,0xB3,0xB0), o3(0xE8,0xB3,0xB4),
-     o3(0xE8,0xB4,0x92), o3(0xE8,0xB5,0xB6),
-     o3(0xEF,0xA8,0xA3), o3(0xE8,0xBB,0x8F),
-     o3(0xEF,0xA8,0xA4), o3(0xEF,0xA8,0xA5),
-     o3(0xE9,0x81,0xA7), o3(0xE9,0x83,0x9E),
-     o3(0xEF,0xA8,0xA6), o3(0xE9,0x84,0x95),
-     o3(0xE9,0x84,0xA7), o3(0xE9,0x87,0x9A),
-     o3(0xE9,0x87,0x97), o3(0xE9,0x87,0x9E),
-     o3(0xE9,0x87,0xAD), o3(0xE9,0x87,0xAE),
-     o3(0xE9,0x87,0xA4), o3(0xE9,0x87,0xA5),
-     o3(0xE9,0x88,0x86), o3(0xE9,0x88,0x90),
-     o3(0xE9,0x88,0x8A), o3(0xE9,0x88,0xBA),
-     o3(0xE9,0x89,0x80), o3(0xE9,0x88,0xBC),
-     o3(0xE9,0x89,0x8E), o3(0xE9,0x89,0x99),
-     o3(0xE9,0x89,0x91), o3(0xE9,0x88,0xB9),
-     o3(0xE9,0x89,0xA7), o3(0xE9,0x8A,0xA7),
-     o3(0xE9,0x89,0xB7), o3(0xE9,0x89,0xB8),
-     o3(0xE9,0x8B,0xA7), o3(0xE9,0x8B,0x97),
-     o3(0xE9,0x8B,0x99), o3(0xE9,0x8B,0x90),
-     o3(0xEF,0xA8,0xA7), o3(0xE9,0x8B,0x95),
-     o3(0xE9,0x8B,0xA0), o3(0xE9,0x8B,0x93),
-     o3(0xE9,0x8C,0xA5), o3(0xE9,0x8C,0xA1),
-     o3(0xE9,0x8B,0xBB), o3(0xEF,0xA8,0xA8),
-     o3(0xE9,0x8C,0x9E), o3(0xE9,0x8B,0xBF),
-     o3(0xE9,0x8C,0x9D), o3(0xE9,0x8C,0x82),
-     o3(0xE9,0x8D,0xB0), o3(0xE9,0x8D,0x97),
-     o3(0xE9,0x8E,0xA4), o3(0xE9,0x8F,0x86),
-     o3(0xE9,0x8F,0x9E), o3(0xE9,0x8F,0xB8),
-     o3(0xE9,0x90,0xB1), o3(0xE9,0x91,0x85),
-     o3(0xE9,0x91,0x88), o3(0xE9,0x96,0x92),
-     o3(0xEF,0xA7,0x9C), o3(0xEF,0xA8,0xA9),
-     o3(0xE9,0x9A,0x9D), o3(0xE9,0x9A,0xAF),
-     o3(0xE9,0x9C,0xB3), o3(0xE9,0x9C,0xBB),
-     o3(0xE9,0x9D,0x83), o3(0xE9,0x9D,0x8D),
-     o3(0xE9,0x9D,0x8F), o3(0xE9,0x9D,0x91),
-     o3(0xE9,0x9D,0x95), o3(0xE9,0xA1,0x97),
-     o3(0xE9,0xA1,0xA5), o3(0xEF,0xA8,0xAA),
-     o3(0xEF,0xA8,0xAB), o3(0xE9,0xA4,0xA7),
-     o3(0xEF,0xA8,0xAC), o3(0xE9,0xA6,0x9E),
-     o3(0xE9,0xA9,0x8E), o3(0xE9,0xAB,0x99),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_FB = {
-    from_SHIFT_JIS_89_offsets,
-    from_SHIFT_JIS_FB_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_FC_offsets[256] = {
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_FC_infos[13] = {
-     o3(0xE9,0xAB,0x9C), o3(0xE9,0xAD,0xB5),
-     o3(0xE9,0xAD,0xB2), o3(0xE9,0xAE,0x8F),
-     o3(0xE9,0xAE,0xB1), o3(0xE9,0xAE,0xBB),
-     o3(0xE9,0xB0,0x80), o3(0xE9,0xB5,0xB0),
-     o3(0xE9,0xB5,0xAB), o3(0xEF,0xA8,0xAD),
-     o3(0xE9,0xB8,0x99), o3(0xE9,0xBB,0x91),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS_FC = {
-    from_SHIFT_JIS_FC_offsets,
-    from_SHIFT_JIS_FC_infos
-};
-
-static const unsigned char
-from_SHIFT_JIS_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-    107,  1,  2,  3,  4,107,107,  5,    6,  7,  8,  9, 10, 11, 12, 13,
-     14, 15, 16, 17, 18, 19, 20, 21,   22, 23, 24, 25, 26, 27, 28, 29,
-    107, 30, 31, 32, 33, 34, 35, 36,   37, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 47, 48, 49, 50, 51, 52,   53, 54, 55, 56, 57, 58, 59, 60,
-     61, 62, 63, 64, 65, 66, 67, 68,   69, 70, 71, 72, 73, 74, 75, 76,
-     77, 78, 79, 80, 81, 82, 83, 84,   85, 86, 87, 88, 89, 90, 91, 92,
-     93, 94, 95, 96, 97, 98, 99,100,  101,102,103,107,107,107,107,107,
-    107,107,107,107,107,107,107,107,  107,107,104,105,106,107,107,107,
-};
-static const struct byte_lookup* const
-from_SHIFT_JIS_infos[108] = {
-                  NOMAP, &from_SHIFT_JIS_81,
-     &from_SHIFT_JIS_82, &from_SHIFT_JIS_83,
-     &from_SHIFT_JIS_84, &from_SHIFT_JIS_87,
-     &from_SHIFT_JIS_88, &from_SHIFT_JIS_89,
-     &from_SHIFT_JIS_8A, &from_SHIFT_JIS_8B,
-     &from_SHIFT_JIS_8C, &from_SHIFT_JIS_8D,
-     &from_SHIFT_JIS_8E, &from_SHIFT_JIS_8F,
-     &from_SHIFT_JIS_90, &from_SHIFT_JIS_91,
-     &from_SHIFT_JIS_92, &from_SHIFT_JIS_93,
-     &from_SHIFT_JIS_94, &from_SHIFT_JIS_95,
-     &from_SHIFT_JIS_96, &from_SHIFT_JIS_97,
-     &from_SHIFT_JIS_98, &from_SHIFT_JIS_99,
-     &from_SHIFT_JIS_9A, &from_SHIFT_JIS_9B,
-     &from_SHIFT_JIS_9C, &from_SHIFT_JIS_9D,
-     &from_SHIFT_JIS_9E, &from_SHIFT_JIS_9F,
-     o3(0xEF,0xBD,0xA1), o3(0xEF,0xBD,0xA2),
-     o3(0xEF,0xBD,0xA3), o3(0xEF,0xBD,0xA4),
-     o3(0xEF,0xBD,0xA5), o3(0xEF,0xBD,0xA6),
-     o3(0xEF,0xBD,0xA7), o3(0xEF,0xBD,0xA8),
-     o3(0xEF,0xBD,0xA9), o3(0xEF,0xBD,0xAA),
-     o3(0xEF,0xBD,0xAB), o3(0xEF,0xBD,0xAC),
-     o3(0xEF,0xBD,0xAD), o3(0xEF,0xBD,0xAE),
-     o3(0xEF,0xBD,0xAF), o3(0xEF,0xBD,0xB0),
-     o3(0xEF,0xBD,0xB1), o3(0xEF,0xBD,0xB2),
-     o3(0xEF,0xBD,0xB3), o3(0xEF,0xBD,0xB4),
-     o3(0xEF,0xBD,0xB5), o3(0xEF,0xBD,0xB6),
-     o3(0xEF,0xBD,0xB7), o3(0xEF,0xBD,0xB8),
-     o3(0xEF,0xBD,0xB9), o3(0xEF,0xBD,0xBA),
-     o3(0xEF,0xBD,0xBB), o3(0xEF,0xBD,0xBC),
-     o3(0xEF,0xBD,0xBD), o3(0xEF,0xBD,0xBE),
-     o3(0xEF,0xBD,0xBF), o3(0xEF,0xBE,0x80),
-     o3(0xEF,0xBE,0x81), o3(0xEF,0xBE,0x82),
-     o3(0xEF,0xBE,0x83), o3(0xEF,0xBE,0x84),
-     o3(0xEF,0xBE,0x85), o3(0xEF,0xBE,0x86),
-     o3(0xEF,0xBE,0x87), o3(0xEF,0xBE,0x88),
-     o3(0xEF,0xBE,0x89), o3(0xEF,0xBE,0x8A),
-     o3(0xEF,0xBE,0x8B), o3(0xEF,0xBE,0x8C),
-     o3(0xEF,0xBE,0x8D), o3(0xEF,0xBE,0x8E),
-     o3(0xEF,0xBE,0x8F), o3(0xEF,0xBE,0x90),
-     o3(0xEF,0xBE,0x91), o3(0xEF,0xBE,0x92),
-     o3(0xEF,0xBE,0x93), o3(0xEF,0xBE,0x94),
-     o3(0xEF,0xBE,0x95), o3(0xEF,0xBE,0x96),
-     o3(0xEF,0xBE,0x97), o3(0xEF,0xBE,0x98),
-     o3(0xEF,0xBE,0x99), o3(0xEF,0xBE,0x9A),
-     o3(0xEF,0xBE,0x9B), o3(0xEF,0xBE,0x9C),
-     o3(0xEF,0xBE,0x9D), o3(0xEF,0xBE,0x9E),
-     o3(0xEF,0xBE,0x9F), &from_SHIFT_JIS_E0,
-     &from_SHIFT_JIS_E1, &from_SHIFT_JIS_E2,
-     &from_SHIFT_JIS_E3, &from_SHIFT_JIS_E4,
-     &from_SHIFT_JIS_E5, &from_SHIFT_JIS_E6,
-     &from_SHIFT_JIS_E7, &from_SHIFT_JIS_E8,
-     &from_SHIFT_JIS_E9, &from_SHIFT_JIS_EA,
-     &from_SHIFT_JIS_FA, &from_SHIFT_JIS_FB,
-     &from_SHIFT_JIS_FC,              UNDEF,
-};
-static const BYTE_LOOKUP
-from_SHIFT_JIS = {
-    from_SHIFT_JIS_offsets,
-    from_SHIFT_JIS_infos
-};
-static const rb_transcoder
-rb_from_SHIFT_JIS = {
-    "SHIFT_JIS", "UTF-8", &from_SHIFT_JIS, 3, 0,
-    NULL, NULL,
-};
-static const rb_transcoder
-rb_from_Windows_31J = {
-    "Windows-31J", "UTF-8", &from_SHIFT_JIS, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_SHIFT_JIS_C2_offsets[64] = {
-  /* used from to_SHIFT_JIS_C2 */
-  /* used from to_EUC_JP_C2 */
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13,  0,  1, 13,  2,  3,  4,    5, 13, 13, 13,  6, 13, 13,  7,
-      8,  9, 13, 13, 10, 13, 11, 13,   12, 13, 13, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_C2_infos[14] = {
-     o2(0x81,0x91), o2(0x81,0x92), o2(0x81,0x8F), o2(0xFA,0x55),
-     o2(0x81,0x98), o2(0x81,0x4E), o2(0x81,0xCA), o2(0x81,0x50),
-     o2(0x81,0x8B), o2(0x81,0x7D), o2(0x81,0x4C), o2(0x81,0xF7),
-     o2(0x81,0x43),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_C2 = {
-    to_SHIFT_JIS_C2_offsets,
-    to_SHIFT_JIS_C2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_C3_offsets[64] = {
-  /* used from to_SHIFT_JIS_C3 */
-  /* used from to_EUC_JP_C3 */
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  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,  1,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_C3_infos[3] = {
-     o2(0x81,0x7E), o2(0x81,0x80),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_C3 = {
-    to_SHIFT_JIS_C3_offsets,
-    to_SHIFT_JIS_C3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_CE_offsets[64] = {
-  /* used from to_SHIFT_JIS_CE */
-  /* used from to_EUC_JP_CE */
-     39, 39, 39, 39, 39, 39, 39, 39,   39, 39, 39, 39, 39, 39, 39, 39,
-     39,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 39, 17, 18, 19, 20, 21,   22, 23, 39, 39, 39, 39, 39, 39,
-     39, 24, 25, 26, 27, 28, 29, 30,   31, 32, 33, 34, 35, 36, 37, 38,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_CE_infos[40] = {
-     o2(0x83,0x9F), o2(0x83,0xA0), o2(0x83,0xA1), o2(0x83,0xA2),
-     o2(0x83,0xA3), o2(0x83,0xA4), o2(0x83,0xA5), o2(0x83,0xA6),
-     o2(0x83,0xA7), o2(0x83,0xA8), o2(0x83,0xA9), o2(0x83,0xAA),
-     o2(0x83,0xAB), o2(0x83,0xAC), o2(0x83,0xAD), o2(0x83,0xAE),
-     o2(0x83,0xAF), o2(0x83,0xB0), o2(0x83,0xB1), o2(0x83,0xB2),
-     o2(0x83,0xB3), o2(0x83,0xB4), o2(0x83,0xB5), o2(0x83,0xB6),
-     o2(0x83,0xBF), o2(0x83,0xC0), o2(0x83,0xC1), o2(0x83,0xC2),
-     o2(0x83,0xC3), o2(0x83,0xC4), o2(0x83,0xC5), o2(0x83,0xC6),
-     o2(0x83,0xC7), o2(0x83,0xC8), o2(0x83,0xC9), o2(0x83,0xCA),
-     o2(0x83,0xCB), o2(0x83,0xCC), o2(0x83,0xCD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_CE = {
-    to_SHIFT_JIS_CE_offsets,
-    to_SHIFT_JIS_CE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_CF_offsets[64] = {
-  /* used from to_SHIFT_JIS_CF */
-  /* used from to_EUC_JP_CF */
-      0,  1,  9,  2,  3,  4,  5,  6,    7,  8,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_CF_infos[10] = {
-     o2(0x83,0xCE), o2(0x83,0xCF), o2(0x83,0xD0), o2(0x83,0xD1),
-     o2(0x83,0xD2), o2(0x83,0xD3), o2(0x83,0xD4), o2(0x83,0xD5),
-     o2(0x83,0xD6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_CF = {
-    to_SHIFT_JIS_CF_offsets,
-    to_SHIFT_JIS_CF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_D0_offsets[64] = {
-  /* used from to_SHIFT_JIS_D0 */
-  /* used from to_EUC_JP_D0 */
-     49,  0, 49, 49, 49, 49, 49, 49,   49, 49, 49, 49, 49, 49, 49, 49,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47, 48,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_D0_infos[50] = {
-     o2(0x84,0x46), o2(0x84,0x40), o2(0x84,0x41), o2(0x84,0x42),
-     o2(0x84,0x43), o2(0x84,0x44), o2(0x84,0x45), o2(0x84,0x47),
-     o2(0x84,0x48), o2(0x84,0x49), o2(0x84,0x4A), o2(0x84,0x4B),
-     o2(0x84,0x4C), o2(0x84,0x4D), o2(0x84,0x4E), o2(0x84,0x4F),
-     o2(0x84,0x50), o2(0x84,0x51), o2(0x84,0x52), o2(0x84,0x53),
-     o2(0x84,0x54), o2(0x84,0x55), o2(0x84,0x56), o2(0x84,0x57),
-     o2(0x84,0x58), o2(0x84,0x59), o2(0x84,0x5A), o2(0x84,0x5B),
-     o2(0x84,0x5C), o2(0x84,0x5D), o2(0x84,0x5E), o2(0x84,0x5F),
-     o2(0x84,0x60), o2(0x84,0x70), o2(0x84,0x71), o2(0x84,0x72),
-     o2(0x84,0x73), o2(0x84,0x74), o2(0x84,0x75), o2(0x84,0x77),
-     o2(0x84,0x78), o2(0x84,0x79), o2(0x84,0x7A), o2(0x84,0x7B),
-     o2(0x84,0x7C), o2(0x84,0x7D), o2(0x84,0x7E), o2(0x84,0x80),
-     o2(0x84,0x81),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_D0 = {
-    to_SHIFT_JIS_D0_offsets,
-    to_SHIFT_JIS_D0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_D1_offsets[64] = {
-  /* used from to_SHIFT_JIS_D1 */
-  /* used from to_EUC_JP_D1 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     17, 16, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_D1_infos[18] = {
-     o2(0x84,0x82), o2(0x84,0x83), o2(0x84,0x84), o2(0x84,0x85),
-     o2(0x84,0x86), o2(0x84,0x87), o2(0x84,0x88), o2(0x84,0x89),
-     o2(0x84,0x8A), o2(0x84,0x8B), o2(0x84,0x8C), o2(0x84,0x8D),
-     o2(0x84,0x8E), o2(0x84,0x8F), o2(0x84,0x90), o2(0x84,0x91),
-     o2(0x84,0x76),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_D1 = {
-    to_SHIFT_JIS_D1_offsets,
-    to_SHIFT_JIS_D1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_80 */
-  /* used from to_EUC_JP_E2_80 */
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-      0, 15, 15, 15,  1, 16,  2, 15,    3,  4, 15, 15,  5,  6, 15, 15,
-      7,  8, 15, 15, 15,  9, 10, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     11, 15, 12, 13, 15, 15, 15, 15,   15, 15, 15, 14, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_80_infos[17] = {
-     o2(0x81,0x5D), o2(0x81,0x5C), o2(0x81,0x61), o2(0x81,0x65),
-     o2(0x81,0x66), o2(0x81,0x67), o2(0x81,0x68), o2(0x81,0xF5),
-     o2(0x81,0xF6), o2(0x81,0x64), o2(0x81,0x63), o2(0x81,0xF1),
-     o2(0x81,0x8C), o2(0x81,0x8D), o2(0x81,0xA6),         UNDEF,
-     o2(0x81,0x5C),
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_80 = {
-    to_SHIFT_JIS_E2_80_offsets,
-    to_SHIFT_JIS_E2_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_84 */
-  /* used from to_EUC_JP_E2_84 */
-      4,  4,  4,  0,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  1,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  2,  4,  4,  4,  4,  4,  4,    4,  4,  4,  3,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_84_infos[5] = {
-     o2(0x81,0x8E), o2(0x87,0x82), o2(0x87,0x84), o2(0x81,0xF0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_84 = {
-    to_SHIFT_JIS_E2_84_offsets,
-    to_SHIFT_JIS_E2_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_85 */
-  /* used from to_EUC_JP_E2_85 */
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 20, 20, 20, 20, 20, 20,
-     10, 11, 12, 13, 14, 15, 16, 17,   18, 19, 20, 20, 20, 20, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_85_infos[21] = {
-     o2(0x87,0x54), o2(0x87,0x55), o2(0x87,0x56), o2(0x87,0x57),
-     o2(0x87,0x58), o2(0x87,0x59), o2(0x87,0x5A), o2(0x87,0x5B),
-     o2(0x87,0x5C), o2(0x87,0x5D), o2(0xFA,0x40), o2(0xFA,0x41),
-     o2(0xFA,0x42), o2(0xFA,0x43), o2(0xFA,0x44), o2(0xFA,0x45),
-     o2(0xFA,0x46), o2(0xFA,0x47), o2(0xFA,0x48), o2(0xFA,0x49),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_85 = {
-    to_SHIFT_JIS_E2_85_offsets,
-    to_SHIFT_JIS_E2_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_86 */
-  /* used from to_EUC_JP_E2_86 */
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      0,  1,  2,  3,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_86_infos[5] = {
-     o2(0x81,0xA9), o2(0x81,0xAA), o2(0x81,0xA8), o2(0x81,0xAB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_86 = {
-    to_SHIFT_JIS_E2_86_offsets,
-    to_SHIFT_JIS_E2_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_87 */
-  /* used from to_EUC_JP_E2_87 */
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  0,  2,  1,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_87_infos[3] = {
-     o2(0x81,0xCB), o2(0x81,0xCC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_87 = {
-    to_SHIFT_JIS_E2_87_offsets,
-    to_SHIFT_JIS_E2_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_88 */
-  /* used from to_EUC_JP_E2_88 */
-      0, 23,  1,  2, 23, 23, 23,  3,    4, 23, 23,  5, 23, 23, 23, 23,
-     23,  6,  7, 23, 23, 23, 23, 23,   23, 23,  8, 23, 23,  9, 10, 11,
-     12, 23, 23, 23, 23, 24, 23, 13,   14, 15, 16, 17, 18, 23, 19, 23,
-     23, 23, 23, 23, 20, 21, 23, 23,   23, 23, 23, 23, 23, 22, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_88_infos[25] = {
-     o2(0x81,0xCD), o2(0x81,0xDD), o2(0x81,0xCE), o2(0x81,0xDE),
-     o2(0x81,0xB8), o2(0x81,0xB9), o2(0x87,0x94), o2(0x81,0x7C),
-     o2(0x87,0x95), o2(0x81,0xE5), o2(0x81,0x87), o2(0x87,0x98),
-     o2(0x87,0x97), o2(0x81,0xC8), o2(0x81,0xC9), o2(0x87,0x9B),
-     o2(0x87,0x9C), o2(0x87,0x92), o2(0x81,0xE8), o2(0x87,0x93),
-     o2(0x81,0x88), o2(0x87,0x9A), o2(0x81,0xE4),         UNDEF,
-     o2(0x81,0x61),
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_88 = {
-    to_SHIFT_JIS_E2_88_offsets,
-    to_SHIFT_JIS_E2_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_89 */
-  /* used from to_EUC_JP_E2_89 */
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  0,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      1,  2,  7,  7,  7,  7,  3,  4,    7,  7,  5,  6,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_89_infos[8] = {
-     o2(0x87,0x90), o2(0x81,0x82), o2(0x87,0x91), o2(0x81,0x85),
-     o2(0x81,0x86), o2(0x81,0xE1), o2(0x81,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_89 = {
-    to_SHIFT_JIS_E2_89_offsets,
-    to_SHIFT_JIS_E2_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_8A */
-  /* used from to_EUC_JP_E2_8A */
-      6,  6,  0,  1,  6,  6,  2,  3,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  4,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_8A_infos[7] = {
-     o2(0x81,0xBC), o2(0x81,0xBD), o2(0x81,0xBA), o2(0x81,0xBB),
-     o2(0x87,0x96), o2(0x87,0x99),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_8A = {
-    to_SHIFT_JIS_E2_8A_offsets,
-    to_SHIFT_JIS_E2_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_8C */
-  /* used from to_EUC_JP_E2_8C */
-      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,  1,  1,  1,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_8C_infos[2] = {
-     o2(0x81,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_8C = {
-    to_SHIFT_JIS_E2_8C_offsets,
-    to_SHIFT_JIS_E2_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_91 */
-  /* used from to_EUC_JP_E2_91 */
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_91_infos[21] = {
-     o2(0x87,0x40), o2(0x87,0x41), o2(0x87,0x42), o2(0x87,0x43),
-     o2(0x87,0x44), o2(0x87,0x45), o2(0x87,0x46), o2(0x87,0x47),
-     o2(0x87,0x48), o2(0x87,0x49), o2(0x87,0x4A), o2(0x87,0x4B),
-     o2(0x87,0x4C), o2(0x87,0x4D), o2(0x87,0x4E), o2(0x87,0x4F),
-     o2(0x87,0x50), o2(0x87,0x51), o2(0x87,0x52), o2(0x87,0x53),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_91 = {
-    to_SHIFT_JIS_E2_91_offsets,
-    to_SHIFT_JIS_E2_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_94_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_94 */
-  /* used from to_EUC_JP_E2_94 */
-      0,  1,  2,  3, 30, 30, 30, 30,   30, 30, 30, 30,  4, 30, 30,  5,
-      6, 30, 30,  7,  8, 30, 30,  9,   10, 30, 30, 11, 12, 13, 30, 30,
-     14, 30, 30, 15, 16, 17, 30, 30,   18, 30, 30, 19, 20, 30, 30, 21,
-     22, 30, 30, 23, 24, 30, 30, 25,   26, 30, 30, 27, 28, 30, 30, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_94_infos[31] = {
-     o2(0x84,0x9F), o2(0x84,0xAA), o2(0x84,0xA0), o2(0x84,0xAB),
-     o2(0x84,0xA1), o2(0x84,0xAC), o2(0x84,0xA2), o2(0x84,0xAD),
-     o2(0x84,0xA4), o2(0x84,0xAF), o2(0x84,0xA3), o2(0x84,0xAE),
-     o2(0x84,0xA5), o2(0x84,0xBA), o2(0x84,0xB5), o2(0x84,0xB0),
-     o2(0x84,0xA7), o2(0x84,0xBC), o2(0x84,0xB7), o2(0x84,0xB2),
-     o2(0x84,0xA6), o2(0x84,0xB6), o2(0x84,0xBB), o2(0x84,0xB1),
-     o2(0x84,0xA8), o2(0x84,0xB8), o2(0x84,0xBD), o2(0x84,0xB3),
-     o2(0x84,0xA9), o2(0x84,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_94 = {
-    to_SHIFT_JIS_E2_94_offsets,
-    to_SHIFT_JIS_E2_94_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_95 */
-  /* used from to_EUC_JP_E2_95 */
-      2,  2,  0,  2,  2,  2,  2,  2,    2,  2,  2,  1,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_95_infos[3] = {
-     o2(0x84,0xBE), o2(0x84,0xB4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_95 = {
-    to_SHIFT_JIS_E2_95_offsets,
-    to_SHIFT_JIS_E2_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_96 */
-  /* used from to_EUC_JP_E2_96 */
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      0,  1,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  2,  3,  6,  6,  6,  6,    6,  6,  6,  6,  4,  5,  6,  6,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_96_infos[7] = {
-     o2(0x81,0xA1), o2(0x81,0xA0), o2(0x81,0xA3), o2(0x81,0xA2),
-     o2(0x81,0xA5), o2(0x81,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_96 = {
-    to_SHIFT_JIS_E2_96_offsets,
-    to_SHIFT_JIS_E2_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_97 */
-  /* used from to_EUC_JP_E2_97 */
-      6,  6,  6,  6,  6,  6,  0,  1,    6,  6,  6,  2,  6,  6,  3,  4,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  5,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_97_infos[7] = {
-     o2(0x81,0x9F), o2(0x81,0x9E), o2(0x81,0x9B), o2(0x81,0x9D),
-     o2(0x81,0x9C), o2(0x81,0xFC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_97 = {
-    to_SHIFT_JIS_E2_97_offsets,
-    to_SHIFT_JIS_E2_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_98 */
-  /* used from to_EUC_JP_E2_98 */
-      2,  2,  2,  2,  2,  0,  1,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_98_infos[3] = {
-     o2(0x81,0x9A), o2(0x81,0x99),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_98 = {
-    to_SHIFT_JIS_E2_98_offsets,
-    to_SHIFT_JIS_E2_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2_99 */
-  /* used from to_EUC_JP_E2_99 */
-      0,  5,  1,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  2,  5,  5,  3,  5,  4,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_99_infos[6] = {
-     o2(0x81,0x8A), o2(0x81,0x89), o2(0x81,0xF4), o2(0x81,0xF3),
-     o2(0x81,0xF2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2_99 = {
-    to_SHIFT_JIS_E2_99_offsets,
-    to_SHIFT_JIS_E2_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E2 */
-  /* used from to_EUC_JP_E2 */
-      0, 16, 16, 16,  1,  2,  3,  4,    5,  6,  7, 16,  8, 16, 16, 16,
-     16,  9, 16, 16, 10, 11, 12, 13,   14, 15, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E2_infos[17] = {
-     &to_SHIFT_JIS_E2_80, &to_SHIFT_JIS_E2_84,
-     &to_SHIFT_JIS_E2_85, &to_SHIFT_JIS_E2_86,
-     &to_SHIFT_JIS_E2_87, &to_SHIFT_JIS_E2_88,
-     &to_SHIFT_JIS_E2_89, &to_SHIFT_JIS_E2_8A,
-     &to_SHIFT_JIS_E2_8C, &to_SHIFT_JIS_E2_91,
-     &to_SHIFT_JIS_E2_94, &to_SHIFT_JIS_E2_95,
-     &to_SHIFT_JIS_E2_96, &to_SHIFT_JIS_E2_97,
-     &to_SHIFT_JIS_E2_98, &to_SHIFT_JIS_E2_99,
-                   UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E2 = {
-    to_SHIFT_JIS_E2_offsets,
-    to_SHIFT_JIS_E2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_80 */
-  /* used from to_EUC_JP_E3_80 */
-      0,  1,  2,  3, 24,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 24, 24,   24, 24, 24, 24, 21, 22, 24, 23,
-     24, 24, 24, 24, 24, 24, 24, 24,   24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24,   24, 24, 24, 24, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_80_infos[25] = {
-     o2(0x81,0x40), o2(0x81,0x41), o2(0x81,0x42), o2(0x81,0x56),
-     o2(0x81,0x58), o2(0x81,0x59), o2(0x81,0x5A), o2(0x81,0x71),
-     o2(0x81,0x72), o2(0x81,0x73), o2(0x81,0x74), o2(0x81,0x75),
-     o2(0x81,0x76), o2(0x81,0x77), o2(0x81,0x78), o2(0x81,0x79),
-     o2(0x81,0x7A), o2(0x81,0xA7), o2(0x81,0xAC), o2(0x81,0x6B),
-     o2(0x81,0x6C), o2(0x81,0x60), o2(0x87,0x80), o2(0x87,0x81),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_80 = {
-    to_SHIFT_JIS_E3_80_offsets,
-    to_SHIFT_JIS_E3_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_81 */
-  /* used from to_EUC_JP_E3_81 */
-     63,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_81_infos[64] = {
-     o2(0x82,0x9F), o2(0x82,0xA0), o2(0x82,0xA1), o2(0x82,0xA2),
-     o2(0x82,0xA3), o2(0x82,0xA4), o2(0x82,0xA5), o2(0x82,0xA6),
-     o2(0x82,0xA7), o2(0x82,0xA8), o2(0x82,0xA9), o2(0x82,0xAA),
-     o2(0x82,0xAB), o2(0x82,0xAC), o2(0x82,0xAD), o2(0x82,0xAE),
-     o2(0x82,0xAF), o2(0x82,0xB0), o2(0x82,0xB1), o2(0x82,0xB2),
-     o2(0x82,0xB3), o2(0x82,0xB4), o2(0x82,0xB5), o2(0x82,0xB6),
-     o2(0x82,0xB7), o2(0x82,0xB8), o2(0x82,0xB9), o2(0x82,0xBA),
-     o2(0x82,0xBB), o2(0x82,0xBC), o2(0x82,0xBD), o2(0x82,0xBE),
-     o2(0x82,0xBF), o2(0x82,0xC0), o2(0x82,0xC1), o2(0x82,0xC2),
-     o2(0x82,0xC3), o2(0x82,0xC4), o2(0x82,0xC5), o2(0x82,0xC6),
-     o2(0x82,0xC7), o2(0x82,0xC8), o2(0x82,0xC9), o2(0x82,0xCA),
-     o2(0x82,0xCB), o2(0x82,0xCC), o2(0x82,0xCD), o2(0x82,0xCE),
-     o2(0x82,0xCF), o2(0x82,0xD0), o2(0x82,0xD1), o2(0x82,0xD2),
-     o2(0x82,0xD3), o2(0x82,0xD4), o2(0x82,0xD5), o2(0x82,0xD6),
-     o2(0x82,0xD7), o2(0x82,0xD8), o2(0x82,0xD9), o2(0x82,0xDA),
-     o2(0x82,0xDB), o2(0x82,0xDC), o2(0x82,0xDD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_81 = {
-    to_SHIFT_JIS_E3_81_offsets,
-    to_SHIFT_JIS_E3_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_82 */
-  /* used from to_EUC_JP_E3_82 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 55, 55, 55, 55,   55, 55, 55, 20, 21, 22, 23, 55,
-     55, 24, 25, 26, 27, 28, 29, 30,   31, 32, 33, 34, 35, 36, 37, 38,
-     39, 40, 41, 42, 43, 44, 45, 46,   47, 48, 49, 50, 51, 52, 53, 54,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_82_infos[56] = {
-     o2(0x82,0xDE), o2(0x82,0xDF), o2(0x82,0xE0), o2(0x82,0xE1),
-     o2(0x82,0xE2), o2(0x82,0xE3), o2(0x82,0xE4), o2(0x82,0xE5),
-     o2(0x82,0xE6), o2(0x82,0xE7), o2(0x82,0xE8), o2(0x82,0xE9),
-     o2(0x82,0xEA), o2(0x82,0xEB), o2(0x82,0xEC), o2(0x82,0xED),
-     o2(0x82,0xEE), o2(0x82,0xEF), o2(0x82,0xF0), o2(0x82,0xF1),
-     o2(0x81,0x4A), o2(0x81,0x4B), o2(0x81,0x54), o2(0x81,0x55),
-     o2(0x83,0x40), o2(0x83,0x41), o2(0x83,0x42), o2(0x83,0x43),
-     o2(0x83,0x44), o2(0x83,0x45), o2(0x83,0x46), o2(0x83,0x47),
-     o2(0x83,0x48), o2(0x83,0x49), o2(0x83,0x4A), o2(0x83,0x4B),
-     o2(0x83,0x4C), o2(0x83,0x4D), o2(0x83,0x4E), o2(0x83,0x4F),
-     o2(0x83,0x50), o2(0x83,0x51), o2(0x83,0x52), o2(0x83,0x53),
-     o2(0x83,0x54), o2(0x83,0x55), o2(0x83,0x56), o2(0x83,0x57),
-     o2(0x83,0x58), o2(0x83,0x59), o2(0x83,0x5A), o2(0x83,0x5B),
-     o2(0x83,0x5C), o2(0x83,0x5D), o2(0x83,0x5E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_82 = {
-    to_SHIFT_JIS_E3_82_offsets,
-    to_SHIFT_JIS_E3_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_83 */
-  /* used from to_EUC_JP_E3_83 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 59,   59, 59, 59, 55, 56, 57, 58, 59,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_83_infos[60] = {
-     o2(0x83,0x5F), o2(0x83,0x60), o2(0x83,0x61), o2(0x83,0x62),
-     o2(0x83,0x63), o2(0x83,0x64), o2(0x83,0x65), o2(0x83,0x66),
-     o2(0x83,0x67), o2(0x83,0x68), o2(0x83,0x69), o2(0x83,0x6A),
-     o2(0x83,0x6B), o2(0x83,0x6C), o2(0x83,0x6D), o2(0x83,0x6E),
-     o2(0x83,0x6F), o2(0x83,0x70), o2(0x83,0x71), o2(0x83,0x72),
-     o2(0x83,0x73), o2(0x83,0x74), o2(0x83,0x75), o2(0x83,0x76),
-     o2(0x83,0x77), o2(0x83,0x78), o2(0x83,0x79), o2(0x83,0x7A),
-     o2(0x83,0x7B), o2(0x83,0x7C), o2(0x83,0x7D), o2(0x83,0x7E),
-     o2(0x83,0x80), o2(0x83,0x81), o2(0x83,0x82), o2(0x83,0x83),
-     o2(0x83,0x84), o2(0x83,0x85), o2(0x83,0x86), o2(0x83,0x87),
-     o2(0x83,0x88), o2(0x83,0x89), o2(0x83,0x8A), o2(0x83,0x8B),
-     o2(0x83,0x8C), o2(0x83,0x8D), o2(0x83,0x8E), o2(0x83,0x8F),
-     o2(0x83,0x90), o2(0x83,0x91), o2(0x83,0x92), o2(0x83,0x93),
-     o2(0x83,0x94), o2(0x83,0x95), o2(0x83,0x96), o2(0x81,0x45),
-     o2(0x81,0x5B), o2(0x81,0x52), o2(0x81,0x53),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_83 = {
-    to_SHIFT_JIS_E3_83_offsets,
-    to_SHIFT_JIS_E3_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_88 */
-  /* used from to_EUC_JP_E3_88 */
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  0,  1,  3,  3,  3,  3,  3,    3,  2,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_88_infos[4] = {
-     o2(0x87,0x8A), o2(0x87,0x8B), o2(0x87,0x8C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_88 = {
-    to_SHIFT_JIS_E3_88_offsets,
-    to_SHIFT_JIS_E3_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_8A */
-  /* used from to_EUC_JP_E3_8A */
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  0,  1,  2,  3,    4,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_8A_infos[6] = {
-     o2(0x87,0x85), o2(0x87,0x86), o2(0x87,0x87), o2(0x87,0x88),
-     o2(0x87,0x89),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_8A = {
-    to_SHIFT_JIS_E3_8A_offsets,
-    to_SHIFT_JIS_E3_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_8C */
-  /* used from to_EUC_JP_E3_8C */
-     11, 11, 11,  0, 11, 11, 11, 11,   11, 11, 11, 11, 11,  1, 11, 11,
-     11, 11, 11, 11,  2, 11, 11, 11,    3, 11, 11, 11, 11, 11, 11, 11,
-     11, 11,  4,  5, 11, 11,  6,  7,   11, 11, 11,  8, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11,  9, 11,   11, 11, 11, 10, 11, 11, 11, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_8C_infos[12] = {
-     o2(0x87,0x65), o2(0x87,0x69), o2(0x87,0x60), o2(0x87,0x63),
-     o2(0x87,0x61), o2(0x87,0x6B), o2(0x87,0x6A), o2(0x87,0x64),
-     o2(0x87,0x6C), o2(0x87,0x66), o2(0x87,0x6E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_8C = {
-    to_SHIFT_JIS_E3_8C_offsets,
-    to_SHIFT_JIS_E3_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_8D */
-  /* used from to_EUC_JP_E3_8D */
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  0,  1,  9,  9,  2,  9,  9,
-      9,  3,  9,  9,  9,  9,  9,  4,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  5,  6,  7,  8,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_8D_infos[10] = {
-     o2(0x87,0x5F), o2(0x87,0x6D), o2(0x87,0x62), o2(0x87,0x67),
-     o2(0x87,0x68), o2(0x87,0x7E), o2(0x87,0x8F), o2(0x87,0x8E),
-     o2(0x87,0x8D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_8D = {
-    to_SHIFT_JIS_E3_8D_offsets,
-    to_SHIFT_JIS_E3_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_8E */
-  /* used from to_EUC_JP_E3_8E */
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  0,  1,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  2,  3,  4,  6,
-      6,  5,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_8E_infos[7] = {
-     o2(0x87,0x72), o2(0x87,0x73), o2(0x87,0x6F), o2(0x87,0x70),
-     o2(0x87,0x71), o2(0x87,0x75),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_8E = {
-    to_SHIFT_JIS_E3_8E_offsets,
-    to_SHIFT_JIS_E3_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3_8F */
-  /* used from to_EUC_JP_E3_8F */
-      2,  2,  2,  2,  0,  2,  2,  2,    2,  2,  2,  2,  2,  1,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_8F_infos[3] = {
-     o2(0x87,0x74), o2(0x87,0x83),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3_8F = {
-    to_SHIFT_JIS_E3_8F_offsets,
-    to_SHIFT_JIS_E3_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E3 */
-  /* used from to_EUC_JP_E3 */
-      0,  1,  2,  3, 10, 10, 10, 10,    4, 10,  5, 10,  6,  7,  8,  9,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E3_infos[11] = {
-     &to_SHIFT_JIS_E3_80, &to_SHIFT_JIS_E3_81,
-     &to_SHIFT_JIS_E3_82, &to_SHIFT_JIS_E3_83,
-     &to_SHIFT_JIS_E3_88, &to_SHIFT_JIS_E3_8A,
-     &to_SHIFT_JIS_E3_8C, &to_SHIFT_JIS_E3_8D,
-     &to_SHIFT_JIS_E3_8E, &to_SHIFT_JIS_E3_8F,
-                   UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E3 = {
-    to_SHIFT_JIS_E3_offsets,
-    to_SHIFT_JIS_E3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_B8 */
-  /* used from to_EUC_JP_E4_B8 */
-      0,  1, 32,  2, 32, 32, 32,  3,    4,  5,  6,  7, 32,  8,  9, 32,
-     10, 11, 32, 32, 12, 13, 14, 15,   16, 17, 32, 32, 32, 32, 18, 32,
-     32, 19, 32, 32, 32, 32, 20, 32,   21, 32, 22, 32, 32, 23, 32, 32,
-     32, 24, 25, 32, 32, 32, 26, 32,   27, 28, 32, 29, 30, 32, 32, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_B8_infos[33] = {
-     o2(0x88,0xEA), o2(0x92,0x9A), o2(0x8E,0xB5), o2(0x96,0x9C),
-     o2(0x8F,0xE4), o2(0x8E,0x4F), o2(0x8F,0xE3), o2(0x89,0xBA),
-     o2(0x95,0x73), o2(0x97,0x5E), o2(0x98,0xA0), o2(0x89,0x4E),
-     o2(0x8A,0x8E), o2(0x98,0xA1), o2(0x90,0xA2), o2(0x99,0xC0),
-     o2(0x8B,0x75), o2(0x95,0xB8), o2(0x8F,0xE5), o2(0x97,0xBC),
-     o2(0x95,0xC0), o2(0xFA,0x68), o2(0x98,0xA2), o2(0x92,0x86),
-     o2(0x98,0xA3), o2(0x8B,0xF8), o2(0x98,0xA4), o2(0x8A,0xDB),
-     o2(0x92,0x4F), o2(0x8E,0xE5), o2(0x98,0xA5), o2(0x98,0xA6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_B8 = {
-    to_SHIFT_JIS_E4_B8_offsets,
-    to_SHIFT_JIS_E4_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_B9 */
-  /* used from to_EUC_JP_E4_B9 */
-     19, 19,  0,  1, 19,  2, 19, 19,   19, 19, 19,  3, 19,  4,  5,  6,
-     19, 19, 19, 19, 19,  7,  8,  9,   10, 11, 19, 19, 19, 12, 13, 14,
-     19, 19, 15, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 16, 19, 17, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_B9_infos[20] = {
-     o2(0x98,0xA7), o2(0x94,0x54), o2(0x8B,0x76), o2(0x94,0x56),
-     o2(0x93,0xE1), o2(0x8C,0xC1), o2(0x96,0x52), o2(0xE5,0x68),
-     o2(0x98,0xA8), o2(0x8F,0xE6), o2(0x98,0xA9), o2(0x89,0xB3),
-     o2(0x8B,0xE3), o2(0x8C,0xEE), o2(0x96,0xE7), o2(0x9B,0xA4),
-     o2(0x97,0x90), o2(0x93,0xFB), o2(0x8A,0xA3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_B9 = {
-    to_SHIFT_JIS_E4_B9_offsets,
-    to_SHIFT_JIS_E4_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BA */
-  /* used from to_EUC_JP_E4_BA */
-      0, 35,  1, 35, 35,  2,  3, 35,    4,  5,  6,  7,  8, 35,  9, 35,
-     35, 10, 11, 35, 12, 13, 35, 35,   14, 15, 35, 16, 17, 35, 18, 19,
-     20, 21, 22, 35, 23, 24, 25, 35,   26, 35, 35, 27, 28, 29, 30, 35,
-     31, 35, 35, 32, 35, 35, 33, 35,   35, 35, 34, 35, 35, 35, 35, 35,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BA_infos[36] = {
-     o2(0x8B,0x54), o2(0x98,0xAA), o2(0x98,0xAB), o2(0x97,0xB9),
-     o2(0x97,0x5C), o2(0x91,0x88), o2(0x98,0xAD), o2(0x8E,0x96),
-     o2(0x93,0xF1), o2(0x98,0xB0), o2(0x89,0x5D), o2(0x8C,0xDD),
-     o2(0x8C,0xDC), o2(0x88,0xE4), o2(0x98,0x6A), o2(0x98,0x69),
-     o2(0x8D,0xB1), o2(0x88,0x9F), o2(0x98,0xB1), o2(0x98,0xB2),
-     o2(0x98,0xB3), o2(0x96,0x53), o2(0x98,0xB4), o2(0x8C,0xF0),
-     o2(0x88,0xE5), o2(0x96,0x92), o2(0x8B,0x9C), o2(0x8B,0x9D),
-     o2(0x8B,0x9E), o2(0x92,0xE0), o2(0x97,0xBA), o2(0x98,0xB5),
-     o2(0x98,0xB6), o2(0x98,0xB7), o2(0x90,0x6C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BA = {
-    to_SHIFT_JIS_E4_BA_offsets,
-    to_SHIFT_JIS_E4_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BB */
-  /* used from to_EUC_JP_E4_BB */
-      0,  1,  2, 32,  3, 32,  4,  5,   32, 32,  6,  7, 32,  8,  9, 10,
-     32, 32, 32, 32, 11, 12, 13, 14,   15, 16, 32, 32, 32, 17, 18, 19,
-     32, 20, 32, 21, 22, 23, 32, 32,   32, 32, 32, 32, 32, 24, 25, 32,
-     26, 32, 27, 32, 32, 32, 28, 29,   32, 32, 32, 30, 31, 32, 32, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BB_infos[33] = {
-     o2(0x8F,0x59), o2(0x90,0x6D), o2(0x98,0xBC), o2(0x98,0xBA),
-     o2(0x98,0xBB), o2(0x8B,0x77), o2(0x8D,0xA1), o2(0x89,0xEE),
-     o2(0x98,0xB9), o2(0x98,0xB8), o2(0x95,0xA7), o2(0x8E,0x65),
-     o2(0x8E,0x64), o2(0x91,0xBC), o2(0x98,0xBD), o2(0x95,0x74),
-     o2(0x90,0xE5), o2(0x81,0x57), o2(0x98,0xBE), o2(0x98,0xC0),
-     o2(0xFA,0x69), o2(0x91,0xE3), o2(0x97,0xDF), o2(0x88,0xC8),
-     o2(0x98,0xBF), o2(0x89,0xBC), o2(0x8B,0xC2), o2(0x92,0x87),
-     o2(0x8C,0x8F), o2(0x98,0xC1), o2(0x94,0x43), o2(0xFA,0x6A),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BB = {
-    to_SHIFT_JIS_E4_BB_offsets,
-    to_SHIFT_JIS_E4_BB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BC */
-  /* used from to_EUC_JP_E4_BC */
-      0,  1, 22,  2, 22, 22, 22, 22,   22,  3,  4, 22, 22,  5,  6,  7,
-      8,  9, 22, 22, 22, 22, 22, 22,   22, 22, 10, 22, 11, 12, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22,   22, 22, 22, 22, 22, 22, 22, 13,
-     14, 22, 22, 22, 15, 22, 16, 22,   17, 18, 19, 22, 20, 21, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BC_infos[23] = {
-     o2(0xFA,0x6B), o2(0x8A,0xE9), o2(0xFA,0x6C), o2(0x98,0xC2),
-     o2(0x88,0xC9), o2(0x8C,0xDE), o2(0x8A,0xEA), o2(0x95,0x9A),
-     o2(0x94,0xB0), o2(0x8B,0x78), o2(0x89,0xEF), o2(0x98,0xE5),
-     o2(0x93,0x60), o2(0x94,0x8C), o2(0x98,0xC4), o2(0x94,0xBA),
-     o2(0x97,0xE0), o2(0x90,0x4C), o2(0xFA,0x6D), o2(0x8E,0x66),
-     o2(0x8E,0x97), o2(0x89,0xBE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BC = {
-    to_SHIFT_JIS_E4_BC_offsets,
-    to_SHIFT_JIS_E4_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BD */
-  /* used from to_EUC_JP_E4_BD */
-     27, 27, 27,  0, 27, 27,  1,  2,   27, 27, 27, 27, 27,  3,  4,  5,
-      6,  7, 27,  8, 27,  9, 10, 11,   27, 12, 13, 14, 15, 16, 17, 27,
-     27, 27, 27, 27, 27, 27, 27, 27,   27, 18, 27, 27, 27, 27, 27, 19,
-     20, 27, 27, 21, 27, 22, 23, 27,   27, 27, 27, 24, 25, 27, 27, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BD_infos[28] = {
-     o2(0x92,0xCF), o2(0x92,0x41), o2(0x98,0xC8), o2(0x88,0xCA),
-     o2(0x92,0xE1), o2(0x8F,0x5A), o2(0x8D,0xB2), o2(0x97,0x43),
-     o2(0x91,0xCC), o2(0x89,0xBD), o2(0xFA,0x6E), o2(0x98,0xC7),
-     o2(0x97,0x5D), o2(0x98,0xC3), o2(0x98,0xC5), o2(0x8D,0xEC),
-     o2(0x98,0xC6), o2(0x9B,0x43), o2(0x98,0xCE), o2(0x98,0xD1),
-     o2(0x98,0xCF), o2(0x89,0xC0), o2(0x95,0xB9), o2(0x98,0xC9),
-     o2(0x98,0xCD), o2(0x8C,0xF1), o2(0x8E,0x67),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BD = {
-    to_SHIFT_JIS_E4_BD_offsets,
-    to_SHIFT_JIS_E4_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BE */
-  /* used from to_EUC_JP_E4_BE */
-     24, 24, 24,  0, 24, 24,  1, 24,    2, 24,  3,  4, 24,  5, 24,  6,
-     24,  7,  8, 24,  9, 24, 10, 24,   11, 24, 12, 13, 24, 14, 24, 24,
-     15, 16, 24, 24, 24, 24, 24, 24,   24, 24, 24, 17, 24, 18, 19, 20,
-     24, 24, 24, 24, 24, 21, 22, 24,   24, 24, 24, 24, 24, 24, 24, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BE_infos[25] = {
-     o2(0x8A,0xA4), o2(0x98,0xD2), o2(0x98,0xCA), o2(0xFA,0x70),
-     o2(0x97,0xE1), o2(0x8E,0x98), o2(0x98,0xCB), o2(0x98,0xD0),
-     o2(0xFA,0x6F), o2(0xFA,0x72), o2(0x98,0xD3), o2(0x98,0xCC),
-     o2(0xFA,0x71), o2(0x8B,0x9F), o2(0x88,0xCB), o2(0x8B,0xA0),
-     o2(0x89,0xBF), o2(0x9B,0x44), o2(0x96,0x99), o2(0x95,0x8E),
-     o2(0x8C,0xF2), o2(0x90,0x4E), o2(0x97,0xB5), o2(0x95,0xD6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BE = {
-    to_SHIFT_JIS_E4_BE_offsets,
-    to_SHIFT_JIS_E4_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4_BF */
-  /* used from to_EUC_JP_E4_BF */
-     29, 29,  0,  1,  2, 29, 29, 29,   29,  3,  4, 29, 29,  5,  6, 29,
-      7,  8, 29, 29,  9, 29, 29, 10,   11, 29, 12, 13, 29, 14, 29, 15,
-     29, 16, 29, 17, 18, 19, 29, 29,   29, 29, 29, 29, 29, 29, 20, 21,
-     29, 29, 29, 22, 29, 23, 24, 29,   25, 29, 26, 29, 29, 29, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_BF_infos[30] = {
-     o2(0x8C,0x57), o2(0x91,0xA3), o2(0x89,0xE2), o2(0xFA,0x61),
-     o2(0x8F,0x72), o2(0xFA,0x73), o2(0x98,0xD7), o2(0x98,0xDC),
-     o2(0x98,0xDA), o2(0x98,0xD5), o2(0x91,0xAD), o2(0x98,0xD8),
-     o2(0x98,0xDB), o2(0x98,0xD9), o2(0x95,0xDB), o2(0x98,0xD6),
-     o2(0x90,0x4D), o2(0x96,0x93), o2(0x98,0xDD), o2(0x98,0xDE),
-     o2(0x8F,0x43), o2(0x98,0xEB), o2(0x94,0x6F), o2(0x95,0x55),
-     o2(0x98,0xE6), o2(0x95,0xEE), o2(0x89,0xB4), o2(0x98,0xEA),
-     o2(0xFA,0x76),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4_BF = {
-    to_SHIFT_JIS_E4_BF_offsets,
-    to_SHIFT_JIS_E4_BF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E4 */
-  /* used from to_EUC_JP_E4 */
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    0,  1,  2,  3,  4,  5,  6,  7,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E4_infos[9] = {
-     &to_SHIFT_JIS_E4_B8, &to_SHIFT_JIS_E4_B9,
-     &to_SHIFT_JIS_E4_BA, &to_SHIFT_JIS_E4_BB,
-     &to_SHIFT_JIS_E4_BC, &to_SHIFT_JIS_E4_BD,
-     &to_SHIFT_JIS_E4_BE, &to_SHIFT_JIS_E4_BF,
-                   UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E4 = {
-    to_SHIFT_JIS_E4_offsets,
-    to_SHIFT_JIS_E4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_80 */
-  /* used from to_EUC_JP_E5_80 */
-     28, 28, 28, 28, 28,  0,  1, 28,   28,  2, 28,  3, 28,  4, 28,  5,
-     28,  6,  7, 28,  8, 28,  9, 28,   28, 10, 11, 28, 28, 28, 12, 13,
-     28, 14, 15, 16, 17, 18, 19, 28,   20, 21, 22, 23, 24, 25, 28, 28,
-     28, 28, 28, 28, 28, 28, 26, 28,   28, 27, 28, 28, 28, 28, 28, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_80_infos[29] = {
-     o2(0x98,0xE4), o2(0x98,0xED), o2(0x91,0x71), o2(0x8C,0xC2),
-     o2(0x94,0x7B), o2(0xE0,0xC5), o2(0x98,0xEC), o2(0x93,0x7C),
-     o2(0x98,0xE1), o2(0x8C,0xF4), o2(0x8C,0xF3), o2(0x98,0xDF),
-     o2(0xFA,0x77), o2(0x8E,0xD8), o2(0x98,0xE7), o2(0xFA,0x75),
-     o2(0x95,0xED), o2(0x92,0x6C), o2(0x98,0xE3), o2(0x8C,0x91),
-     o2(0x98,0xE0), o2(0x98,0xE8), o2(0x98,0xE2), o2(0x97,0xCF),
-     o2(0x98,0xE9), o2(0x98,0x60), o2(0x8B,0xE4), o2(0x8C,0x90),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_80 = {
-    to_SHIFT_JIS_E5_80_offsets,
-    to_SHIFT_JIS_E5_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_81 */
-  /* used from to_EUC_JP_E5_81 */
-      0, 22,  1,  2, 22, 22,  3,  4,    5,  6, 22, 22, 22, 22, 22,  7,
-      8, 22, 22, 22, 22,  9, 10, 22,   22, 22, 11, 22, 12, 22, 22, 22,
-     22, 22, 22, 22, 22, 13, 22, 22,   22, 22, 22, 22, 14, 22, 22, 22,
-     15, 22, 16, 22, 17, 18, 19, 22,   20, 22, 22, 22, 22, 21, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_81_infos[23] = {
-     o2(0xFA,0x74), o2(0xFA,0x7A), o2(0x98,0xEE), o2(0xFA,0x78),
-     o2(0x98,0xEF), o2(0x98,0xF3), o2(0x88,0xCC), o2(0x95,0xCE),
-     o2(0x98,0xF2), o2(0x98,0xF1), o2(0x98,0xF5), o2(0x98,0xF4),
-     o2(0x92,0xE2), o2(0x8C,0x92), o2(0x98,0xF6), o2(0xFA,0x79),
-     o2(0x8E,0xC3), o2(0x91,0xA4), o2(0x92,0xE3), o2(0x8B,0xF4),
-     o2(0x98,0xF7), o2(0x8B,0x55),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_81 = {
-    to_SHIFT_JIS_E5_81_offsets,
-    to_SHIFT_JIS_E5_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_82 */
-  /* used from to_EUC_JP_E5_82 */
-      0, 16, 16, 16, 16,  1, 16, 16,   16, 16, 16, 16, 16,  2, 16, 16,
-     16,  3, 16, 16,  4, 16, 16, 16,    5,  6,  7, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16,  8,  9, 16, 16,
-     16, 16, 10, 11, 12, 13, 16, 14,   16, 16, 16, 16, 16, 16, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_82_infos[17] = {
-     o2(0x98,0xF8), o2(0x98,0xFA), o2(0x96,0x54), o2(0x8C,0x86),
-     o2(0xFA,0x7B), o2(0x8E,0x50), o2(0x94,0xF5), o2(0x98,0xF9),
-     o2(0x8D,0xC3), o2(0x97,0x62), o2(0x98,0xFC), o2(0x99,0x42),
-     o2(0x98,0xFB), o2(0x8D,0xC2), o2(0x8F,0x9D), o2(0x8C,0x58),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_82 = {
-    to_SHIFT_JIS_E5_82_offsets,
-    to_SHIFT_JIS_E5_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_83 */
-  /* used from to_EUC_JP_E5_83 */
-     21, 21,  0, 21, 21,  1, 21, 21,   21,  2,  3, 21, 21,  4, 21,  5,
-     21,  6, 21, 21, 21,  7,  8, 21,    9, 21, 10, 21, 21, 21, 11, 21,
-     21, 21, 21, 12, 21, 13, 21, 14,   21, 21, 21, 21, 21, 15, 16, 21,
-     21, 21, 21, 21, 17, 18, 21, 21,   21, 19, 21, 20, 21, 21, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_83_infos[22] = {
-     o2(0x99,0x43), o2(0x8B,0xCD), o2(0x99,0x40), o2(0x99,0x41),
-     o2(0x93,0xAD), o2(0x91,0x9C), o2(0x8B,0xA1), o2(0x96,0x6C),
-     o2(0x99,0x44), o2(0xFA,0x7D), o2(0x97,0xBB), o2(0x99,0x45),
-     o2(0x99,0x48), o2(0x99,0x46), o2(0x91,0x6D), o2(0x99,0x47),
-     o2(0x99,0x49), o2(0xFA,0x7C), o2(0x99,0x4B), o2(0x99,0x4A),
-     o2(0x95,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_83 = {
-    to_SHIFT_JIS_E5_83_offsets,
-    to_SHIFT_JIS_E5_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_84 */
-  /* used from to_EUC_JP_E5_84 */
-      0,  1,  2, 20,  3, 20, 20, 20,   20,  4, 20, 20, 20, 20, 20, 20,
-     20, 20,  5, 20,  6,  7,  8, 20,    9, 20, 10, 20, 20, 20, 20, 11,
-     20, 12, 20, 20, 20, 20, 20, 20,   20, 20, 13, 20, 20, 20, 20, 20,
-     20, 20, 14, 20, 20, 20, 20, 15,   20, 20, 16, 17, 18, 20, 20, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_84_infos[21] = {
-     o2(0x8B,0x56), o2(0x99,0x4D), o2(0x99,0x4E), o2(0x89,0xAD),
-     o2(0x99,0x4C), o2(0x8E,0xF2), o2(0x99,0x51), o2(0x99,0x50),
-     o2(0x99,0x4F), o2(0x98,0xD4), o2(0x99,0x52), o2(0x8F,0x9E),
-     o2(0x99,0x53), o2(0x97,0x44), o2(0x96,0xD7), o2(0x99,0x55),
-     o2(0x99,0x54), o2(0x99,0x57), o2(0x99,0x56), o2(0x99,0x58),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_84 = {
-    to_SHIFT_JIS_E5_84_offsets,
-    to_SHIFT_JIS_E5_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_85 */
-  /* used from to_EUC_JP_E5_85 */
-      0,  1, 35,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 35,
-     14, 35, 15, 35, 16, 35, 35, 35,   35, 35, 17, 35, 18, 35, 35, 35,
-     35, 35, 19, 35, 20, 21, 35, 35,   22, 23, 24, 25, 26, 27, 28, 35,
-     35, 29, 35, 35, 35, 30, 31, 32,   33, 35, 35, 35, 34, 35, 35, 35,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_85_infos[36] = {
-     o2(0x99,0x59), o2(0x88,0xF2), o2(0x8C,0xB3), o2(0x8C,0x5A),
-     o2(0x8F,0x5B), o2(0x92,0x9B), o2(0x8B,0xA2), o2(0x90,0xE6),
-     o2(0x8C,0xF5), o2(0xFA,0x7E), o2(0x8D,0x8E), o2(0x99,0x5B),
-     o2(0x96,0xC6), o2(0x93,0x65), o2(0x8E,0x99), o2(0x99,0x5A),
-     o2(0x99,0x5C), o2(0x93,0x7D), o2(0x8A,0x95), o2(0x99,0x5D),
-     o2(0xFA,0x80), o2(0x93,0xFC), o2(0x91,0x53), o2(0x99,0x5F),
-     o2(0x99,0x60), o2(0x94,0xAA), o2(0x8C,0xF6), o2(0x98,0x5A),
-     o2(0x99,0x61), o2(0x8B,0xA4), o2(0x95,0xBA), o2(0x91,0xB4),
-     o2(0x8B,0xEF), o2(0x93,0x54), o2(0x8C,0x93),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_85 = {
-    to_SHIFT_JIS_E5_85_offsets,
-    to_SHIFT_JIS_E5_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_86 */
-  /* used from to_EUC_JP_E5_86 */
-      0, 38,  1, 38, 38,  2,  3, 38,   38,  4,  5, 38,  6,  7, 38,  8,
-      9, 10, 11, 12, 38, 13, 14, 15,   38, 16, 38, 38, 38, 17, 38, 38,
-     18, 38, 19, 38, 20, 21, 22, 38,   23, 24, 25, 26, 27, 38, 38, 38,
-     28, 29, 30, 31, 32, 33, 34, 35,   38, 38, 38, 38, 38, 36, 37, 38,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_86_infos[39] = {
-     o2(0x99,0x62), o2(0x99,0x63), o2(0x93,0xE0), o2(0x89,0x7E),
-     o2(0x99,0x66), o2(0x8D,0xFB), o2(0x99,0x65), o2(0x8D,0xC4),
-     o2(0x99,0x67), o2(0xE3,0xEC), o2(0x99,0x68), o2(0x96,0x60),
-     o2(0x99,0x69), o2(0x99,0x6A), o2(0x99,0x6B), o2(0x8F,0xE7),
-     o2(0x8E,0xCA), o2(0xFA,0x81), o2(0x8A,0xA5), o2(0x99,0x6E),
-     o2(0x99,0x6C), o2(0x96,0xBB), o2(0x99,0x6D), o2(0x95,0x79),
-     o2(0x99,0x6F), o2(0x99,0x70), o2(0x99,0x71), o2(0x93,0x7E),
-     o2(0x99,0x75), o2(0x99,0x73), o2(0x99,0x74), o2(0x99,0x72),
-     o2(0x8D,0xE1), o2(0x99,0x76), o2(0x96,0xE8), o2(0x97,0xE2),
-     o2(0x99,0x77), o2(0xFA,0x82),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_86 = {
-    to_SHIFT_JIS_E5_86_offsets,
-    to_SHIFT_JIS_E5_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_87 */
-  /* used from to_EUC_JP_E5_87 */
-     28, 28, 28, 28,  0,  1,  2, 28,   28,  3, 28,  4,  5,  6, 28, 28,
-     28, 28, 28, 28, 28, 28,  7, 28,   28, 28, 28,  8,  9, 10, 28, 28,
-     11, 12, 28, 28, 28, 28, 13, 14,   28, 15, 16, 28, 17, 18, 28, 28,
-     19, 20, 28, 28, 28, 21, 22, 28,   23, 24, 25, 28, 28, 26, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_87_infos[29] = {
-     o2(0x90,0xA6), o2(0x99,0x78), o2(0x8F,0x79), o2(0x99,0x79),
-     o2(0x92,0x9C), o2(0x97,0xBD), o2(0x93,0x80), o2(0x99,0xC3),
-     o2(0x99,0x7A), o2(0xEA,0xA3), o2(0x8B,0xC3), o2(0x99,0x7B),
-     o2(0x96,0x7D), o2(0x8F,0x88), o2(0x91,0xFA), o2(0x99,0x7D),
-     o2(0x93,0xE2), o2(0xFA,0x83), o2(0x99,0x7E), o2(0x99,0x80),
-     o2(0x8A,0x4D), o2(0x99,0x81), o2(0x8B,0xA5), o2(0x93,0xCA),
-     o2(0x89,0x9A), o2(0x8F,0x6F), o2(0x94,0x9F), o2(0x99,0x82),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_87 = {
-    to_SHIFT_JIS_E5_87_offsets,
-    to_SHIFT_JIS_E5_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_88 */
-  /* used from to_EUC_JP_E5_88 */
-      0, 28, 28,  1,  2, 28,  3,  4,    5, 28,  6,  7, 28, 28,  8, 28,
-     28,  9, 28, 28, 10, 11, 28, 12,   28, 28, 28, 28, 28, 13, 28, 28,
-     28, 28, 28, 28, 14, 15, 28, 16,   28, 17, 18, 28, 28, 28, 19, 28,
-     20, 28, 28, 21, 28, 28, 22, 23,   24, 25, 26, 27, 28, 28, 28, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_88_infos[29] = {
-     o2(0x93,0x81), o2(0x90,0x6E), o2(0x99,0x83), o2(0x95,0xAA),
-     o2(0x90,0xD8), o2(0x8A,0xA0), o2(0x8A,0xA7), o2(0x99,0x84),
-     o2(0x99,0x86), o2(0x8C,0x59), o2(0x99,0x85), o2(0xFA,0x84),
-     o2(0x97,0xF1), o2(0x8F,0x89), o2(0x94,0xBB), o2(0x95,0xCA),
-     o2(0x99,0x87), o2(0x97,0x98), o2(0x99,0x88), o2(0x99,0x89),
-     o2(0x93,0x9E), o2(0x99,0x8A), o2(0x90,0xA7), o2(0x8D,0xFC),
-     o2(0x8C,0x94), o2(0x99,0x8B), o2(0x8E,0x68), o2(0x8D,0x8F),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_88 = {
-    to_SHIFT_JIS_E5_88_offsets,
-    to_SHIFT_JIS_E5_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_89 */
-  /* used from to_EUC_JP_E5_89 */
-     26, 26, 26,  0,  1, 26, 26,  2,   26, 26,  3,  4,  5,  6, 26,  7,
-     26, 26, 26, 26,  8, 26,  9, 26,   26, 26, 26, 10, 26, 26, 11, 26,
-     26, 26, 26, 12, 13, 14, 26, 26,   26, 15, 16, 26, 26, 26, 26, 17,
-     18, 19, 20, 21, 22, 23, 26, 26,   26, 26, 26, 26, 26, 24, 26, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_89_infos[27] = {
-     o2(0x92,0xE4), o2(0x99,0x8D), o2(0x91,0xA5), o2(0x8D,0xED),
-     o2(0x99,0x8E), o2(0x99,0x8F), o2(0x91,0x4F), o2(0x99,0x8C),
-     o2(0x99,0x91), o2(0x96,0x55), o2(0x8D,0x84), o2(0x99,0x90),
-     o2(0x8C,0x95), o2(0x8D,0xDC), o2(0x94,0x8D), o2(0x99,0x94),
-     o2(0x99,0x92), o2(0x95,0x9B), o2(0x8F,0xE8), o2(0x99,0x9B),
-     o2(0x8A,0x84), o2(0x99,0x95), o2(0x99,0x93), o2(0x91,0x6E),
-     o2(0x99,0x97), o2(0x99,0x96),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_89 = {
-    to_SHIFT_JIS_E5_89_offsets,
-    to_SHIFT_JIS_E5_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8A */
-  /* used from to_EUC_JP_E5_8A */
-     26, 26, 26,  0, 26, 26, 26,  1,    2,  3, 26, 26, 26,  4, 26, 26,
-     26,  5,  6, 26,  7, 26, 26, 26,   26, 26, 26,  8,  9, 26, 26, 10,
-     11, 26, 26, 12, 26, 26, 13, 26,   26, 14, 15, 16, 17, 18, 26, 19,
-     26, 20, 26, 26, 21, 22, 26, 26,   26, 23, 26, 26, 24, 26, 25, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8A_infos[27] = {
-     o2(0x8A,0x63), o2(0x8C,0x80), o2(0x99,0x9C), o2(0x97,0xAB),
-     o2(0x99,0x98), o2(0x99,0x9D), o2(0x99,0x9A), o2(0x99,0x99),
-     o2(0x97,0xCD), o2(0xFA,0x85), o2(0x8C,0xF7), o2(0x89,0xC1),
-     o2(0x97,0xF2), o2(0xFA,0x86), o2(0x8F,0x95), o2(0x93,0x77),
-     o2(0x8D,0x85), o2(0x99,0xA0), o2(0x99,0xA1), o2(0xFB,0x77),
-     o2(0x97,0xE3), o2(0x98,0x4A), o2(0x99,0xA3), o2(0x8C,0xF8),
-     o2(0x99,0xA2), o2(0x8A,0x4E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8A = {
-    to_SHIFT_JIS_E5_8A_offsets,
-    to_SHIFT_JIS_E5_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8B */
-  /* used from to_EUC_JP_E5_8B */
-      0,  1, 30,  2, 30,  3, 30,  4,   30,  5, 30, 30, 30,  6, 30, 30,
-     30, 30,  7, 30, 30,  8, 30,  9,   10, 11, 30, 12, 30, 13, 14, 15,
-     16, 30, 17, 18, 19, 30, 20, 21,   30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 22, 23, 30, 24, 30, 30,   25, 26, 27, 30, 30, 30, 28, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8B_infos[31] = {
-     o2(0xFA,0x87), o2(0x99,0xA4), o2(0x96,0x75), o2(0x92,0xBA),
-     o2(0x97,0x45), o2(0x95,0xD7), o2(0x99,0xA5), o2(0xE8,0xD3),
-     o2(0x93,0xAE), o2(0x99,0xA6), o2(0x8A,0xA8), o2(0x96,0xB1),
-     o2(0xFA,0x88), o2(0x8F,0x9F), o2(0x99,0xA7), o2(0x95,0xE5),
-     o2(0x99,0xAB), o2(0x90,0xA8), o2(0x99,0xA8), o2(0x8B,0xCE),
-     o2(0x99,0xA9), o2(0x8A,0xA9), o2(0x8C,0x4D), o2(0x99,0xAC),
-     o2(0x99,0xAD), o2(0x99,0xAE), o2(0x99,0xAF), o2(0x8E,0xD9),
-     o2(0x8C,0xF9), o2(0x96,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8B = {
-    to_SHIFT_JIS_E5_8B_offsets,
-    to_SHIFT_JIS_E5_8B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8C */
-  /* used from to_EUC_JP_E5_8C */
-      0,  1,  2, 29, 29,  3,  4,  5,    6, 29, 29, 29, 29,  7, 29,  8,
-      9, 29, 29, 29, 29, 10, 11, 12,   29, 13, 14, 29, 29, 15, 29, 29,
-     16, 17, 29, 18, 19, 29, 29, 29,   29, 29, 20, 29, 29, 29, 29, 21,
-     29, 22, 29, 23, 29, 29, 29, 29,   24, 25, 26, 27, 29, 29, 29, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8C_infos[30] = {
-     o2(0xFA,0x89), o2(0x96,0xE6), o2(0x93,0xF5), o2(0x95,0xEF),
-     o2(0x99,0xB0), o2(0xFA,0x8A), o2(0x99,0xB1), o2(0x99,0xB3),
-     o2(0x99,0xB5), o2(0x99,0xB4), o2(0x99,0xB6), o2(0x89,0xBB),
-     o2(0x96,0x6B), o2(0x8D,0xFA), o2(0x99,0xB7), o2(0x91,0x78),
-     o2(0x8F,0xA0), o2(0x8B,0xA7), o2(0x99,0xB8), o2(0xFA,0x8B),
-     o2(0x94,0xD9), o2(0x99,0xB9), o2(0x99,0xBA), o2(0x99,0xBB),
-     o2(0x99,0xBC), o2(0x95,0x43), o2(0x8B,0xE6), o2(0x88,0xE3),
-     o2(0x93,0xBD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8C = {
-    to_SHIFT_JIS_E5_8C_offsets,
-    to_SHIFT_JIS_E5_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8D */
-  /* used from to_EUC_JP_E5_8D */
-      0,  1, 34,  2, 34,  3,  4,  5,    6,  7,  8, 34, 34,  9, 34, 34,
-     34, 10, 11, 12, 13, 34, 34, 14,   15, 34, 16, 34, 17, 34, 18, 34,
-     19, 34, 34, 34, 34, 34, 20, 34,   34, 21, 34, 34, 34, 34, 22, 23,
-     24, 25, 26, 27, 28, 29, 34, 30,   31, 34, 34, 32, 34, 34, 34, 33,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8D_infos[35] = {
-     o2(0x99,0xBD), o2(0x8F,0x5C), o2(0x90,0xE7), o2(0x99,0xBF),
-     o2(0x99,0xBE), o2(0x8F,0xA1), o2(0x8C,0xDF), o2(0x99,0xC1),
-     o2(0x94,0xBC), o2(0x99,0xC2), o2(0x94,0xDA), o2(0x91,0xB2),
-     o2(0x91,0xEC), o2(0x8B,0xA6), o2(0x93,0xEC), o2(0x92,0x50),
-     o2(0x94,0x8E), o2(0x96,0x6D), o2(0x99,0xC4), o2(0x90,0xE8),
-     o2(0x8C,0x54), o2(0x99,0xC5), o2(0x99,0xC6), o2(0x89,0x4B),
-     o2(0x88,0xF3), o2(0x8A,0xEB), o2(0xFA,0x8C), o2(0x91,0xA6),
-     o2(0x8B,0x70), o2(0x97,0x91), o2(0x99,0xC9), o2(0x89,0xB5),
-     o2(0x99,0xC8), o2(0x8B,0xA8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8D = {
-    to_SHIFT_JIS_E5_8D_offsets,
-    to_SHIFT_JIS_E5_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8E */
-  /* used from to_EUC_JP_E5_8E */
-     19, 19,  0, 19,  1, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  2, 19, 19,  3, 19,    4, 19,  5, 19, 19, 19, 19,  6,
-      7, 19, 19, 19, 19,  8,  9, 19,   10, 11, 19, 19, 19, 12, 13, 19,
-     14, 19, 15, 16, 19, 19, 17, 19,   19, 19, 19, 18, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8E_infos[20] = {
-     o2(0x99,0xCA), o2(0x96,0xEF), o2(0xFA,0x8D), o2(0x99,0xCB),
-     o2(0x97,0xD0), o2(0x8C,0xFA), o2(0x8C,0xB4), o2(0x99,0xCC),
-     o2(0x99,0xCE), o2(0x99,0xCD), o2(0x90,0x7E), o2(0x89,0x58),
-     o2(0x89,0x7D), o2(0x99,0xCF), o2(0x99,0xD0), o2(0xFA,0x8E),
-     o2(0x8C,0xB5), o2(0x99,0xD1), o2(0x8B,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8E = {
-    to_SHIFT_JIS_E5_8E_offsets,
-    to_SHIFT_JIS_E5_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_8F */
-  /* used from to_EUC_JP_E5_8F */
-     37, 37,  0,  1, 37, 37, 37, 37,    2,  3,  4,  5,  6,  7,  8, 37,
-     37, 37, 37, 37,  9, 37, 10, 11,   37, 12, 37, 13, 37, 14, 37, 15,
-     37, 16, 17, 18, 19, 20, 37, 37,   21, 22, 23, 24, 25, 26, 27, 28,
-     29, 30, 31, 32, 37, 37, 33, 34,   35, 37, 36, 37, 37, 37, 37, 37,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_8F_infos[38] = {
-     o2(0x8E,0x51), o2(0x99,0xD2), o2(0x96,0x94), o2(0x8D,0xB3),
-     o2(0x8B,0x79), o2(0x97,0x46), o2(0x91,0x6F), o2(0x94,0xBD),
-     o2(0x8E,0xFB), o2(0x8F,0x66), o2(0x8E,0xE6), o2(0x8E,0xF3),
-     o2(0x8F,0x96), o2(0x94,0xBE), o2(0xFA,0x8F), o2(0x99,0xD5),
-     o2(0x89,0x62), o2(0x91,0x70), o2(0x8C,0xFB), o2(0x8C,0xC3),
-     o2(0x8B,0xE5), o2(0x99,0xD9), o2(0x92,0x40), o2(0x91,0xFC),
-     o2(0x8B,0xA9), o2(0x8F,0xA2), o2(0x99,0xDA), o2(0x99,0xD8),
-     o2(0x89,0xC2), o2(0x91,0xE4), o2(0x8E,0xB6), o2(0x8E,0x6A),
-     o2(0x89,0x45), o2(0x8A,0x90), o2(0x8D,0x86), o2(0x8E,0x69),
-     o2(0x99,0xDB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_8F = {
-    to_SHIFT_JIS_E5_8F_offsets,
-    to_SHIFT_JIS_E5_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_90_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_90 */
-  /* used from to_EUC_JP_E5_90 */
-     30,  0, 30,  1,  2, 30, 30, 30,    3,  4,  5,  6,  7,  8,  9, 10,
-     11, 12, 30, 30, 30, 30, 30, 30,   30, 30, 30, 13, 30, 14, 30, 15,
-     16, 30, 30, 30, 30, 30, 17, 30,   30, 18, 30, 19, 20, 21, 22, 30,
-     30, 30, 30, 30, 30, 30, 23, 30,   24, 25, 30, 26, 27, 28, 29, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_90_infos[31] = {
-     o2(0x99,0xDC), o2(0x8B,0x68), o2(0x8A,0x65), o2(0x8D,0x87),
-     o2(0x8B,0x67), o2(0x92,0xDD), o2(0x89,0x44), o2(0x93,0xAF),
-     o2(0x96,0xBC), o2(0x8D,0x40), o2(0x97,0x99), o2(0x93,0x66),
-     o2(0x8C,0xFC), o2(0x8C,0x4E), o2(0x99,0xE5), o2(0x8B,0xE1),
-     o2(0x96,0x69), o2(0x94,0xDB), o2(0x99,0xE4), o2(0x8A,0xDC),
-     o2(0x99,0xDF), o2(0x99,0xE0), o2(0x99,0xE2), o2(0x99,0xE3),
-     o2(0x8B,0x7A), o2(0x90,0x81), o2(0x95,0xAB), o2(0x99,0xE1),
-     o2(0x99,0xDD), o2(0x8C,0xE1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_90 = {
-    to_SHIFT_JIS_E5_90_offsets,
-    to_SHIFT_JIS_E5_90_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_91 */
-  /* used from to_EUC_JP_E5_91 */
-      0, 20,  1, 20, 20, 20,  2, 20,    3,  4,  5, 20, 20, 20,  6, 20,
-     20,  7, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20,  8,
-     20, 20, 20, 20, 20, 20, 20, 20,    9, 20, 10, 20, 20, 20, 20, 20,
-     11, 12, 20, 13, 20, 14, 15, 16,   20, 20, 20, 17, 18, 19, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_91_infos[21] = {
-     o2(0x99,0xDE), o2(0x98,0x43), o2(0x95,0xF0), o2(0x92,0xE6),
-     o2(0x8C,0xE0), o2(0x8D,0x90), o2(0x99,0xE6), o2(0x93,0xDB),
-     o2(0x99,0xEA), o2(0x8E,0xFC), o2(0x8E,0xF4), o2(0x99,0xED),
-     o2(0x99,0xEB), o2(0x96,0xA1), o2(0x99,0xE8), o2(0x99,0xF1),
-     o2(0x99,0xEC), o2(0x99,0xEF), o2(0x8C,0xC4), o2(0x96,0xBD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_91 = {
-    to_SHIFT_JIS_E5_91_offsets,
-    to_SHIFT_JIS_E5_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_92_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_92 */
-  /* used from to_EUC_JP_E5_92 */
-      0, 25, 25, 25,  1, 25,  2, 25,   25, 25,  3,  4,  5, 25,  6,  7,
-      8, 25,  9, 25, 25, 25, 25, 25,   25, 25, 25, 25, 10, 25, 25, 25,
-     25, 25, 11, 25, 12, 13, 25, 25,   14, 15, 25, 16, 17, 25, 25, 18,
-     25, 25, 19, 20, 25, 25, 25, 25,   21, 25, 25, 25, 22, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_92_infos[26] = {
-     o2(0x99,0xF0), o2(0x99,0xF2), o2(0x99,0xF4), o2(0xFA,0x92),
-     o2(0x8D,0xEE), o2(0x98,0x61), o2(0x99,0xE9), o2(0x99,0xE7),
-     o2(0x99,0xF3), o2(0x99,0xEE), o2(0xFA,0x91), o2(0x99,0xF6),
-     o2(0x9A,0x42), o2(0x99,0xF8), o2(0x99,0xFC), o2(0xFA,0x93),
-     o2(0x9A,0x40), o2(0x99,0xF9), o2(0x9A,0x5D), o2(0x8D,0xE7),
-     o2(0x8A,0x50), o2(0x99,0xF7), o2(0x9A,0x44), o2(0x88,0xF4),
-     o2(0x9A,0x43),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_92 = {
-    to_SHIFT_JIS_E5_92_offsets,
-    to_SHIFT_JIS_E5_92_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_93_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_93 */
-  /* used from to_EUC_JP_E5_93 */
-      0,  1,  2, 20,  3, 20, 20,  4,    5,  6, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,    7, 20, 20, 20, 20, 20, 20, 20,
-     20,  8,  9, 20, 20, 10, 11, 20,   12, 13, 20, 20, 20, 14, 15, 20,
-     20, 20, 16, 20, 20, 20, 20, 20,   20, 20, 17, 20, 20, 18, 20, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_93_infos[21] = {
-     o2(0x88,0xA3), o2(0x95,0x69), o2(0x9A,0x41), o2(0x99,0xFA),
-     o2(0x99,0xF5), o2(0x99,0xFB), o2(0x8D,0xC6), o2(0x9A,0x45),
-     o2(0x88,0xF5), o2(0x9A,0x4E), o2(0x9A,0x46), o2(0x9A,0x47),
-     o2(0x8F,0xA3), o2(0x96,0x89), o2(0x9A,0x4C), o2(0x9A,0x4B),
-     o2(0x93,0x4E), o2(0x9A,0x4D), o2(0x9A,0x4A), o2(0xFA,0x94),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_93 = {
-    to_SHIFT_JIS_E5_93_offsets,
-    to_SHIFT_JIS_E5_93_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_94_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_94 */
-  /* used from to_EUC_JP_E5_94 */
-     14, 14, 14, 14,  0, 14,  1,  2,   14, 14, 14, 14, 14, 14, 14,  3,
-      4, 14, 14, 14,  5, 14,  6, 14,   14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 14, 14, 14, 14, 14,  7,  8,
-     14,  9, 14, 10, 14, 14, 14, 14,   11, 12, 14, 14, 14, 14, 13, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_94_infos[15] = {
-     o2(0x89,0x53), o2(0x8D,0xB4), o2(0x90,0x4F), o2(0x9A,0x48),
-     o2(0x93,0x82), o2(0x9A,0x49), o2(0x88,0xA0), o2(0x9A,0x53),
-     o2(0x97,0x42), o2(0x8F,0xA5), o2(0x9A,0x59), o2(0x9A,0x58),
-     o2(0x9A,0x4F), o2(0x91,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_94 = {
-    to_SHIFT_JIS_E5_94_offsets,
-    to_SHIFT_JIS_E5_94_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_95 */
-  /* used from to_EUC_JP_E5_95 */
-      0, 15, 15, 15,  1,  2,  3, 15,   15, 15, 15, 15,  4, 15, 15,  5,
-     15, 15, 15,  6, 15, 15,  7,  8,   15, 15, 15, 15,  9, 10, 15, 15,
-     15, 15, 15, 11, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 12, 13, 15, 14, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_95_infos[16] = {
-     o2(0x9A,0x50), o2(0x91,0xED), o2(0x9A,0x55), o2(0x8F,0xA4),
-     o2(0x9A,0x52), o2(0x96,0xE2), o2(0x8C,0x5B), o2(0x9A,0x56),
-     o2(0x9A,0x57), o2(0x9A,0x54), o2(0x9A,0x5A), o2(0x9A,0x51),
-     o2(0x9A,0x60), o2(0x9A,0x65), o2(0x9A,0x61),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_95 = {
-    to_SHIFT_JIS_E5_95_offsets,
-    to_SHIFT_JIS_E5_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_96 */
-  /* used from to_EUC_JP_E5_96 */
-      0, 24, 24,  1,  2, 24,  3,  4,   24,  5,  6,  7, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24,    8,  9, 10, 24, 11, 12, 13, 14,
-     24, 24, 24, 24, 24, 24, 24, 15,   16, 17, 18, 19, 20, 24, 21, 24,
-     22, 24, 24, 24, 24, 24, 23, 24,   24, 24, 24, 24, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_96_infos[25] = {
-     o2(0x9A,0x5C), o2(0x9A,0x66), o2(0x91,0x50), o2(0xFA,0x95),
-     o2(0x9A,0x68), o2(0x8D,0x41), o2(0x9A,0x5E), o2(0x92,0x9D),
-     o2(0x9A,0x62), o2(0x9A,0x5B), o2(0x8A,0xAB), o2(0x8A,0xEC),
-     o2(0x8A,0x85), o2(0x9A,0x63), o2(0x9A,0x5F), o2(0x8C,0x96),
-     o2(0x9A,0x69), o2(0x9A,0x67), o2(0x91,0x72), o2(0x8B,0x69),
-     o2(0x8B,0xAA), o2(0x9A,0x64), o2(0x8B,0xF2), o2(0x89,0x63),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_96 = {
-    to_SHIFT_JIS_E5_96_offsets,
-    to_SHIFT_JIS_E5_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_97 */
-  /* used from to_EUC_JP_E5_97 */
-     13, 13, 13, 13,  0,  1, 13,  2,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13,  3, 13, 13, 13,   13, 13,  4, 13,  5, 13, 13,  6,
-     13, 13, 13,  7,  8, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13,  9,   13, 10, 13, 13, 13, 11, 12, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_97_infos[14] = {
-     o2(0x9A,0x6D), o2(0x9A,0x6B), o2(0x9A,0xA5), o2(0x9A,0x70),
-     o2(0x9A,0x6A), o2(0x9A,0x6E), o2(0x9A,0x6C), o2(0x8E,0x6B),
-     o2(0x9A,0x6F), o2(0x9A,0x72), o2(0x9A,0x77), o2(0x9A,0x75),
-     o2(0x9A,0x74),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_97 = {
-    to_SHIFT_JIS_E5_97_offsets,
-    to_SHIFT_JIS_E5_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_98 */
-  /* used from to_EUC_JP_E5_98 */
-     14, 14, 14, 14, 14, 14,  0, 14,   14,  1, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14,  2, 14,  3,  4,    5, 14, 14,  6, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14,  7, 14, 14, 14, 14, 14,  8,
-     14,  9, 10, 14, 11, 14, 12, 14,   13, 14, 14, 14, 14, 14, 14, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_98_infos[15] = {
-     o2(0x92,0x51), o2(0x89,0xC3), o2(0x9A,0x71), o2(0x9A,0x73),
-     o2(0x8F,0xA6), o2(0x89,0x52), o2(0x9A,0x76), o2(0x89,0xDC),
-     o2(0x9A,0x82), o2(0x8F,0xFA), o2(0x9A,0x7D), o2(0x9A,0x7B),
-     o2(0x9A,0x7C), o2(0x9A,0x7E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_98 = {
-    to_SHIFT_JIS_E5_98_offsets,
-    to_SHIFT_JIS_E5_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_99 */
-  /* used from to_EUC_JP_E5_99 */
-     13, 13,  0, 13, 13, 13, 13, 13,   13, 13, 13, 13,  1, 13,  2, 13,
-      3, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13,  4, 13, 13, 13, 13,
-     13, 13, 13, 13,  5, 13, 13, 13,    6, 13,  7,  8,  9, 13, 13, 13,
-     13, 13, 13, 13, 10, 13, 13, 13,   11, 13, 12, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_99_infos[14] = {
-     o2(0x89,0x5C), o2(0x91,0x58), o2(0x9A,0x78), o2(0x9A,0x79),
-     o2(0x8A,0x9A), o2(0x9A,0x81), o2(0x8A,0xED), o2(0x9A,0x84),
-     o2(0x9A,0x80), o2(0x9A,0x83), o2(0x95,0xAC), o2(0x93,0xD3),
-     o2(0x94,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_99 = {
-    to_SHIFT_JIS_E5_99_offsets,
-    to_SHIFT_JIS_E5_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9A */
-  /* used from to_EUC_JP_E5_9A */
-      0, 13, 13, 13, 13, 13,  1,  2,   13, 13,  3, 13, 13, 13, 13,  4,
-     13, 13, 13, 13,  5, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-      6, 13,  7, 13, 13,  8, 13, 13,   13, 13, 13, 13, 13, 13,  9, 13,
-     13, 13, 13, 13, 10, 13, 11, 13,   13, 13, 13, 13, 12, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9A_infos[14] = {
-     o2(0x9A,0x86), o2(0x9A,0x85), o2(0x8A,0x64), o2(0x9A,0x87),
-     o2(0x9A,0x8A), o2(0x9A,0x89), o2(0x9A,0x88), o2(0x94,0x58),
-     o2(0x9A,0x8B), o2(0x9A,0x8C), o2(0x9A,0x8E), o2(0x9A,0x8D),
-     o2(0x9A,0x90),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9A = {
-    to_SHIFT_JIS_E5_9A_offsets,
-    to_SHIFT_JIS_E5_9A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9B */
-  /* used from to_EUC_JP_E5_9B */
-      0,  1,  2,  3, 23, 23, 23, 23,    4, 23, 23, 23, 23, 23,  5, 23,
-     23,  6, 23,  7, 23, 23, 23,  8,    9, 23, 10, 11, 23, 23, 12, 23,
-     13, 23, 23, 14, 23, 23, 23, 23,   23, 23, 23, 23, 23, 23, 15, 23,
-     16, 23, 17, 18, 23, 23, 23, 23,   23, 19, 20, 23, 23, 21, 23, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9B_infos[24] = {
-     o2(0x9A,0x93), o2(0x9A,0x91), o2(0x9A,0x8F), o2(0x9A,0x92),
-     o2(0x9A,0x94), o2(0x9A,0x95), o2(0x9A,0x96), o2(0x9A,0x97),
-     o2(0x9A,0x98), o2(0x99,0x64), o2(0x8E,0xFA), o2(0x8E,0x6C),
-     o2(0x89,0xF1), o2(0x88,0xF6), o2(0x92,0x63), o2(0x9A,0x99),
-     o2(0x8D,0xA2), o2(0x88,0xCD), o2(0x90,0x7D), o2(0x9A,0x9A),
-     o2(0x8C,0xC5), o2(0x8D,0x91), o2(0x9A,0x9C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9B = {
-    to_SHIFT_JIS_E5_9B_offsets,
-    to_SHIFT_JIS_E5_9B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9C */
-  /* used from to_EUC_JP_E5_9C */
-      0, 22, 22,  1,  2, 22, 22, 22,    3,  4, 22,  5, 22,  6, 22,  7,
-     22, 22,  8,  9, 22, 22, 10, 22,   11, 22, 22, 22, 12, 22, 22, 13,
-     22, 22, 22, 22, 22, 22, 14, 15,   16, 22, 22, 22, 22, 17, 22, 22,
-     18, 22, 22, 22, 22, 22, 22, 19,   20, 22, 22, 21, 22, 22, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9C_infos[23] = {
-     o2(0x9A,0x9B), o2(0x95,0xDE), o2(0x9A,0x9D), o2(0x9A,0x9F),
-     o2(0x9A,0x9E), o2(0x9A,0xA0), o2(0x9A,0xA1), o2(0x8C,0x97),
-     o2(0x89,0x80), o2(0x9A,0xA2), o2(0x9A,0xA4), o2(0x9A,0xA3),
-     o2(0x9A,0xA6), o2(0x93,0x79), o2(0x9A,0xA7), o2(0x88,0xB3),
-     o2(0x8D,0xDD), o2(0x8C,0x5C), o2(0x92,0x6E), o2(0x9A,0xA8),
-     o2(0x9A,0xA9), o2(0x9A,0xAB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9C = {
-    to_SHIFT_JIS_E5_9C_offsets,
-    to_SHIFT_JIS_E5_9C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9D */
-  /* used from to_EUC_JP_E5_9D */
-      0, 16,  1, 16, 16, 16, 16,  2,   16, 16,  3, 16, 16, 16,  4,  5,
-      6,  7, 16, 16, 16, 16, 16, 16,   16,  8, 16, 16, 16, 16, 16, 16,
-     16,  9, 16, 16, 10, 11, 12, 16,   16, 13, 14, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9D_infos[17] = {
-     o2(0x9A,0xAC), o2(0x8D,0xE2), o2(0x8B,0xCF), o2(0x96,0x56),
-     o2(0x9A,0xAA), o2(0x9A,0xAD), o2(0x8D,0xBF), o2(0x8D,0x42),
-     o2(0xFA,0x96), o2(0x9A,0xB1), o2(0x8D,0xA3), o2(0xFA,0x97),
-     o2(0x92,0x52), o2(0x9A,0xAE), o2(0x92,0xD8), o2(0x9A,0xB2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9D = {
-    to_SHIFT_JIS_E5_9D_offsets,
-    to_SHIFT_JIS_E5_9D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9E */
-  /* used from to_EUC_JP_E5_9E */
-     13, 13,  0, 13, 13, 13, 13, 13,    1,  2, 13,  3, 13, 13, 13, 13,
-     13, 13, 13,  4, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-      5, 13,  6,  7,  8, 13, 13, 13,   13, 13,  9, 13, 10, 13, 13, 13,
-     11, 13, 13, 12, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9E_infos[14] = {
-     o2(0x90,0x82), o2(0x9A,0xB0), o2(0x9A,0xB3), o2(0x8C,0x5E),
-     o2(0x9A,0xB4), o2(0x9A,0xB5), o2(0x8D,0x43), o2(0x8A,0x5F),
-     o2(0x9A,0xB7), o2(0x9A,0xB8), o2(0xFA,0x98), o2(0x9A,0xB9),
-     o2(0x9A,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9E = {
-    to_SHIFT_JIS_E5_9E_offsets,
-    to_SHIFT_JIS_E5_9E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_9F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_9F */
-  /* used from to_EUC_JP_E5_9F */
-      0, 20, 20,  1, 20, 20,  2,  3,    4, 20, 20,  5, 20, 20,  6, 20,
-     20, 20,  7,  8,  9, 20, 10, 20,   20, 20, 20, 20, 11, 20, 20, 12,
-     13, 20, 20, 14, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 15, 20, 20, 16,   20, 17, 18, 20, 19, 20, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_9F_infos[21] = {
-     o2(0x9A,0xAF), o2(0x9A,0xBA), o2(0x9A,0xBB), o2(0xFA,0x9A),
-     o2(0xFA,0x99), o2(0x96,0x84), o2(0x8F,0xE9), o2(0x9A,0xBD),
-     o2(0x9A,0xBE), o2(0x9A,0xBC), o2(0x9A,0xC0), o2(0x94,0x57),
-     o2(0x88,0xE6), o2(0x95,0x75), o2(0x9A,0xC1), o2(0x8F,0xFB),
-     o2(0x8E,0xB7), o2(0x94,0x7C), o2(0x8A,0xEE), o2(0x8D,0xE9),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_9F = {
-    to_SHIFT_JIS_E5_9F_offsets,
-    to_SHIFT_JIS_E5_9F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A0 */
-  /* used from to_EUC_JP_E5_A0 */
-      0, 19,  1, 19, 19,  2,  3, 19,   19, 19,  4,  5, 19, 19, 19, 19,
-     19, 19, 19, 19, 19,  6, 19, 19,   19,  7, 19, 19, 19,  8, 19, 19,
-     19,  9, 19, 19, 10, 19, 19, 19,   19, 19, 11, 19, 19, 19, 19, 12,
-     13, 14, 19, 19, 15, 16, 19, 19,   19, 19, 17, 19, 19, 18, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A0_infos[20] = {
-     o2(0x96,0x78), o2(0x93,0xB0), o2(0x8C,0x98), o2(0x91,0xCD),
-     o2(0x9A,0xBF), o2(0x9A,0xC2), o2(0x91,0xC2), o2(0x9A,0xC3),
-     o2(0x9A,0xC4), o2(0x9A,0xC6), o2(0x92,0xE7), o2(0x8A,0xAC),
-     o2(0xEA,0x9F), o2(0x89,0x81), o2(0x95,0xF1), o2(0x8F,0xEA),
-     o2(0x93,0x67), o2(0x8D,0xE4), o2(0x9A,0xCC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A0 = {
-    to_SHIFT_JIS_E5_A0_offsets,
-    to_SHIFT_JIS_E5_A0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A1 */
-  /* used from to_EUC_JP_E5_A1 */
-      0,  1, 20, 20, 20, 20, 20, 20,   20, 20,  2,  3, 20, 20, 20, 20,
-     20,  4,  5, 20,  6, 20, 20,  7,    8,  9, 10, 20, 20, 20, 11, 20,
-     20, 20, 12, 20, 20, 20, 20, 20,   20, 13, 20, 14, 20, 20, 20, 20,
-     15, 20, 16, 20, 20, 17, 20, 20,   20, 18, 20, 20, 20, 20, 19, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A1_infos[21] = {
-     o2(0x95,0xBB), o2(0x97,0xDB), o2(0x89,0xF2), o2(0x9A,0xC8),
-     o2(0x91,0x59), o2(0x9A,0xCB), o2(0x93,0x83), o2(0x93,0x68),
-     o2(0x93,0x84), o2(0x94,0xB7), o2(0x92,0xCB), o2(0x8D,0xC7),
-     o2(0x9A,0xC7), o2(0x89,0x96), o2(0x93,0x55), o2(0x9A,0xC9),
-     o2(0x9A,0xC5), o2(0x90,0x6F), o2(0x9A,0xCD), o2(0x8F,0x6D),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A1 = {
-    to_SHIFT_JIS_E5_A1_offsets,
-    to_SHIFT_JIS_E5_A1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A2 */
-  /* used from to_EUC_JP_E5_A2 */
-     17, 17, 17,  0, 17,  1, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17,  2, 17, 17, 17,  3,   17, 17, 17, 17,  4, 17,  5,  6,
-     17, 17, 17, 17, 17, 17, 17, 17,    7, 17, 17,  8, 17, 17,  9, 17,
-     17, 17, 10, 11, 17, 17, 17, 17,   12, 13, 14, 15, 17, 17, 16, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A2_infos[18] = {
-     o2(0x8B,0xAB), o2(0x9A,0xCE), o2(0x95,0xE6), o2(0x91,0x9D),
-     o2(0x92,0xC4), o2(0xFA,0x9D), o2(0x9A,0xD0), o2(0x96,0x6E),
-     o2(0x9A,0xD1), o2(0x9A,0xD6), o2(0xFA,0x9E), o2(0x95,0xAD),
-     o2(0x9A,0xD5), o2(0x9A,0xCF), o2(0x9A,0xD2), o2(0x9A,0xD4),
-     o2(0x8D,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A2 = {
-    to_SHIFT_JIS_E5_A2_offsets,
-    to_SHIFT_JIS_E5_A2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A3 */
-  /* used from to_EUC_JP_E5_A3 */
-     29,  0, 29, 29, 29,  1, 29,  2,   29, 29,  3, 29,  4, 29, 29, 29,
-     29,  5, 29,  6, 29,  7, 29,  8,    9, 10, 29, 29, 11, 29, 12, 13,
-     29, 29, 29, 29, 14, 15, 29, 29,   29, 29, 29, 16, 17, 29, 18, 19,
-     20, 21, 22, 29, 29, 29, 29, 23,   29, 24, 25, 26, 27, 28, 29, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A3_infos[30] = {
-     o2(0x95,0xC7), o2(0x9A,0xD7), o2(0x92,0x64), o2(0x89,0xF3),
-     o2(0x8F,0xEB), o2(0x9A,0xD9), o2(0x9A,0xD8), o2(0x8D,0x88),
-     o2(0x9A,0xDA), o2(0x9A,0xDC), o2(0x9A,0xDB), o2(0x9A,0xDE),
-     o2(0x9A,0xD3), o2(0x9A,0xE0), o2(0x9A,0xDF), o2(0x9A,0xDD),
-     o2(0x8E,0x6D), o2(0x90,0x70), o2(0x91,0x73), o2(0x9A,0xE1),
-     o2(0x90,0xBA), o2(0x88,0xEB), o2(0x94,0x84), o2(0x92,0xD9),
-     o2(0x9A,0xE3), o2(0x9A,0xE2), o2(0x9A,0xE4), o2(0x9A,0xE5),
-     o2(0x9A,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A3 = {
-    to_SHIFT_JIS_E5_A3_offsets,
-    to_SHIFT_JIS_E5_A3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A4 */
-  /* used from to_EUC_JP_E5_A4 */
-     27, 27,  0, 27, 27, 27, 27, 27,   27,  1,  2,  3, 27, 27, 27,  4,
-      5, 27, 27, 27, 27,  6,  7, 27,    8,  9, 10, 11, 12, 27, 27, 27,
-     27, 27, 13, 27, 27, 14, 27, 15,   27, 16, 17, 18, 19, 20, 21, 27,
-     27, 22, 23, 27, 27, 27, 27, 24,   25, 27, 27, 27, 27, 27, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A4_infos[28] = {
-     o2(0x9A,0xE7), o2(0x95,0xCF), o2(0x9A,0xE8), o2(0xFA,0x9F),
-     o2(0x89,0xC4), o2(0x9A,0xE9), o2(0x97,0x5B), o2(0x8A,0x4F),
-     o2(0x99,0xC7), o2(0x8F,0x67), o2(0x91,0xBD), o2(0x9A,0xEA),
-     o2(0x96,0xE9), o2(0x96,0xB2), o2(0x9A,0xEC), o2(0x91,0xE5),
-     o2(0x93,0x56), o2(0x91,0xBE), o2(0x95,0x76), o2(0x9A,0xED),
-     o2(0x9A,0xEE), o2(0x89,0x9B), o2(0x8E,0xB8), o2(0x9A,0xEF),
-     o2(0x88,0xCE), o2(0x9A,0xF0), o2(0x9A,0xF1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A4 = {
-    to_SHIFT_JIS_E5_A4_offsets,
-    to_SHIFT_JIS_E5_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A5 */
-  /* used from to_EUC_JP_E5_A5 */
-     30, 30, 30, 30,  0, 30, 30,  1,    2,  3, 30, 30, 30, 30,  4,  5,
-      6,  7, 30,  8,  9, 10, 30, 11,   12, 30, 13, 14, 30, 15, 30, 30,
-     16, 30, 17, 18, 30, 19, 30, 20,   21, 22, 23, 30, 24, 30, 25, 30,
-     30, 30, 30, 26, 27, 30, 30, 30,   28, 30, 30, 30, 30, 29, 30, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A5_infos[31] = {
-     o2(0x89,0x82), o2(0x8A,0xEF), o2(0x93,0xDE), o2(0x95,0xF2),
-     o2(0x9A,0xF5), o2(0x91,0x74), o2(0x9A,0xF4), o2(0x8C,0x5F),
-     o2(0xFA,0xA0), o2(0x96,0x7A), o2(0x9A,0xF3), o2(0x93,0x85),
-     o2(0x9A,0xF7), o2(0x9A,0xF6), o2(0xFA,0xA1), o2(0xFA,0xA2),
-     o2(0x9A,0xF9), o2(0x9A,0xF8), o2(0xFA,0xA3), o2(0x89,0x9C),
-     o2(0x9A,0xFA), o2(0x8F,0xA7), o2(0x9A,0xFC), o2(0x92,0x44),
-     o2(0x9A,0xFB), o2(0x95,0xB1), o2(0x8F,0x97), o2(0x93,0x7A),
-     o2(0x9B,0x40), o2(0x8D,0x44),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A5 = {
-    to_SHIFT_JIS_E5_A5_offsets,
-    to_SHIFT_JIS_E5_A5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A6 */
-  /* used from to_EUC_JP_E5_A6 */
-     21,  0,  1,  2,  3, 21, 21, 21,   21, 21,  4, 21, 21,  5, 21, 21,
-     21, 21, 21,  6, 21, 21,  7, 21,   21,  8, 21,  9, 21, 10, 21, 21,
-     21, 21, 21, 11, 12, 13, 21, 21,   14, 21, 21, 21, 15, 21, 21, 21,
-     21, 21, 16, 21, 21, 21, 21, 21,   21, 17, 18, 19, 21, 21, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A6_infos[22] = {
-     o2(0x9B,0x41), o2(0x94,0x40), o2(0x94,0xDC), o2(0x96,0xCF),
-     o2(0x94,0x44), o2(0x9B,0x4A), o2(0x8B,0x57), o2(0x97,0x64),
-     o2(0x96,0xAD), o2(0x9B,0xAA), o2(0x9B,0x42), o2(0x9B,0x45),
-     o2(0xFA,0xA4), o2(0x91,0xC3), o2(0x96,0x57), o2(0x93,0x69),
-     o2(0x9B,0x46), o2(0x96,0x85), o2(0xFA,0xA5), o2(0x8D,0xC8),
-     o2(0x8F,0xA8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A6 = {
-    to_SHIFT_JIS_E5_A6_offsets,
-    to_SHIFT_JIS_E5_A6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A7 */
-  /* used from to_EUC_JP_E5_A7 */
-     18, 18, 18, 18, 18, 18,  0, 18,   18,  1, 18,  2, 18, 18, 18, 18,
-      3,  4, 18,  5,  6, 18, 18, 18,   18,  7,  8, 18,  9, 18, 18, 18,
-     18, 18, 18, 18, 18, 10, 11, 18,   12, 18, 13, 14, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 15, 18,   18, 18, 18, 16, 18, 18, 18, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A7_infos[19] = {
-     o2(0x9B,0x47), o2(0x8E,0x6F), o2(0x8E,0x6E), o2(0x88,0xB7),
-     o2(0x8C,0xC6), o2(0x90,0xA9), o2(0x88,0xCF), o2(0x9B,0x4B),
-     o2(0x9B,0x4C), o2(0x9B,0x49), o2(0x89,0x57), o2(0x8A,0xAD),
-     o2(0x9B,0x48), o2(0x96,0xC3), o2(0x95,0x50), o2(0x88,0xA6),
-     o2(0x88,0xF7), o2(0x8E,0x70),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A7 = {
-    to_SHIFT_JIS_E5_A7_offsets,
-    to_SHIFT_JIS_E5_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A8 */
-  /* used from to_EUC_JP_E5_A8 */
-     15,  0, 15,  1, 15, 15, 15, 15,   15,  2, 15, 15, 15, 15, 15, 15,
-     15,  3, 15, 15, 15, 15, 15, 15,    4, 15,  5, 15,  6, 15, 15,  7,
-      8, 15, 15, 15, 15,  9, 15, 15,   15, 10, 15, 15, 15, 15, 15, 11,
-     15, 15, 15, 15, 15, 12, 13, 15,   15, 15, 15, 15, 14, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A8_infos[16] = {
-     o2(0x88,0xD0), o2(0x88,0xA1), o2(0x9B,0x51), o2(0x9B,0x4F),
-     o2(0x96,0xBA), o2(0x9B,0x52), o2(0x9B,0x50), o2(0x9B,0x4E),
-     o2(0x90,0x50), o2(0x9B,0x4D), o2(0x95,0xD8), o2(0x8C,0xE2),
-     o2(0x9B,0x56), o2(0x9B,0x57), o2(0x8F,0xA9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A8 = {
-    to_SHIFT_JIS_E5_A8_offsets,
-    to_SHIFT_JIS_E5_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_A9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_A9 */
-  /* used from to_EUC_JP_E5_A9 */
-      0,  1, 10, 10, 10, 10,  2, 10,   10,  3, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10,  4, 10, 10, 10, 10, 10,
-     10, 10,  5, 10, 10, 10,  6, 10,   10, 10,  7, 10,  8, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_A9_infos[11] = {
-     o2(0x9B,0x53), o2(0x98,0x4B), o2(0x94,0x6B), o2(0x9B,0x55),
-     o2(0x8D,0xA5), o2(0x9B,0x58), o2(0x95,0x77), o2(0x9B,0x59),
-     o2(0x9B,0x54), o2(0x96,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_A9 = {
-    to_SHIFT_JIS_E5_A9_offsets,
-    to_SHIFT_JIS_E5_A9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AA */
-  /* used from to_EUC_JP_E5_AA */
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  0,  6,  6,  6,  6,  6,    6,  6,  1,  2,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  3,  4,  5,  6,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AA_infos[7] = {
-     o2(0x94,0x7D), o2(0x9B,0x5A), o2(0x95,0x51), o2(0x9B,0x5B),
-     o2(0x9B,0x5F), o2(0x9B,0x5C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AA = {
-    to_SHIFT_JIS_E5_AA_offsets,
-    to_SHIFT_JIS_E5_AA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AB */
-  /* used from to_EUC_JP_E5_AB */
-     14,  0,  1, 14, 14, 14, 14, 14,   14,  2, 14,  3,  4, 14, 14, 14,
-      5, 14, 14, 14, 14, 14,  6,  7,   14, 14, 14, 14, 14, 14, 14, 14,
-     14,  8, 14,  9, 14, 14, 10, 14,   14, 11, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 14, 12, 13, 14, 14, 14, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AB_infos[15] = {
-     o2(0x89,0xC5), o2(0x9B,0x5E), o2(0x8E,0xB9), o2(0x9B,0x5D),
-     o2(0x8C,0x99), o2(0x9B,0x6B), o2(0x9B,0x64), o2(0x9B,0x61),
-     o2(0x92,0x84), o2(0x9B,0x60), o2(0x9B,0x62), o2(0x9B,0x63),
-     o2(0x9B,0x65), o2(0x9B,0x66),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AB = {
-    to_SHIFT_JIS_E5_AB_offsets,
-    to_SHIFT_JIS_E5_AB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AC */
-  /* used from to_EUC_JP_E5_AC */
-     11, 11, 11, 11, 11, 11, 11, 11,   11,  0, 11,  1,  2, 11, 11, 11,
-     11, 11, 11, 11, 11, 11,  3, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11,  4, 11, 11, 11, 11, 11,   11, 11,  5, 11,  6, 11, 11, 11,
-      7, 11,  8, 11, 11, 11,  9, 11,   11, 11, 11, 11, 11, 11, 10, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AC_infos[12] = {
-     o2(0x8A,0xF0), o2(0x9B,0x68), o2(0x9B,0x67), o2(0x9B,0x69),
-     o2(0x8F,0xEC), o2(0x9B,0x6C), o2(0x92,0xDA), o2(0x89,0x64),
-     o2(0x9B,0x6A), o2(0x9B,0x6D), o2(0x9B,0x6E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AC = {
-    to_SHIFT_JIS_E5_AC_offsets,
-    to_SHIFT_JIS_E5_AC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AD */
-  /* used from to_EUC_JP_E5_AD */
-      0, 27, 27,  1, 27,  2, 27, 27,   27, 27, 27, 27, 27, 27, 27, 27,
-      3,  4, 27, 27,  5,  6,  7,  8,    9, 27, 10, 11, 12, 13, 27, 14,
-     27, 27, 27, 15, 16, 17, 18, 27,   27, 19, 27, 20, 27, 27, 27, 27,
-     21, 22, 27, 23, 27, 24, 27, 27,   25, 27, 26, 27, 27, 27, 27, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AD_infos[28] = {
-     o2(0x9B,0x71), o2(0x9B,0x6F), o2(0x9B,0x70), o2(0x8E,0x71),
-     o2(0x9B,0x72), o2(0x8D,0x45), o2(0x9B,0x73), o2(0xFA,0xA6),
-     o2(0x8E,0x9A), o2(0x91,0xB6), o2(0x9B,0x74), o2(0x9B,0x75),
-     o2(0x8E,0x79), o2(0x8D,0x46), o2(0x96,0xD0), o2(0x8B,0x47),
-     o2(0x8C,0xC7), o2(0x9B,0x76), o2(0x8A,0x77), o2(0x9B,0x77),
-     o2(0x91,0xB7), o2(0x9B,0x78), o2(0x9B,0xA1), o2(0x9B,0x79),
-     o2(0x9B,0x7A), o2(0x9B,0x7B), o2(0x9B,0x7D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AD = {
-    to_SHIFT_JIS_E5_AD_offsets,
-    to_SHIFT_JIS_E5_AD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AE */
-  /* used from to_EUC_JP_E5_AE */
-      0, 33, 33,  1, 33,  2, 33,  3,    4,  5, 33,  6,  7,  8, 33,  9,
-     33, 33, 33, 33, 33, 10, 33, 11,   12, 13, 14, 15, 16, 17, 33, 18,
-     33, 33, 19, 20, 21, 22, 23, 33,   33, 33, 33, 33, 33, 33, 24, 33,
-     25, 33, 33, 26, 27, 28, 29, 33,   30, 31, 33, 33, 33, 33, 33, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AE_infos[34] = {
-     o2(0x9B,0x7E), o2(0x9B,0x80), o2(0x91,0xEE), o2(0x89,0x46),
-     o2(0x8E,0xE7), o2(0x88,0xC0), o2(0x91,0x76), o2(0x8A,0xAE),
-     o2(0x8E,0xB3), o2(0x8D,0x47), o2(0x93,0x86), o2(0x8F,0x40),
-     o2(0x8A,0xAF), o2(0x92,0x88), o2(0x92,0xE8), o2(0x88,0xB6),
-     o2(0x8B,0x58), o2(0x95,0xF3), o2(0x8E,0xC0), o2(0x8B,0x71),
-     o2(0x90,0xE9), o2(0x8E,0xBA), o2(0x97,0x47), o2(0x9B,0x81),
-     o2(0x8B,0x7B), o2(0x8D,0xC9), o2(0x8A,0x51), o2(0x89,0x83),
-     o2(0x8F,0xAA), o2(0x89,0xC6), o2(0x9B,0x82), o2(0x97,0x65),
-     o2(0x8F,0x68),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AE = {
-    to_SHIFT_JIS_E5_AE_offsets,
-    to_SHIFT_JIS_E5_AE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_AF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_AF */
-  /* used from to_EUC_JP_E5_AF */
-      0, 37,  1,  2,  3,  4,  5,  6,   37,  7, 37, 37,  8, 37, 37, 37,
-      9, 37, 10, 11, 12, 37, 37, 37,   13, 37, 37, 14, 37, 15, 16, 17,
-     37, 18, 19, 37, 20, 21, 22, 23,   24, 25, 37, 26, 27, 37, 28, 37,
-     29, 37, 37, 30, 37, 31, 32, 37,   33, 37, 34, 37, 37, 37, 35, 36,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_AF_infos[38] = {
-     o2(0xFA,0xA7), o2(0x8E,0xE2), o2(0x9B,0x83), o2(0x8A,0xF1),
-     o2(0x93,0xD0), o2(0x96,0xA7), o2(0x9B,0x84), o2(0x9B,0x85),
-     o2(0x95,0x78), o2(0x9B,0x87), o2(0x8A,0xA6), o2(0x8B,0xF5),
-     o2(0x9B,0x86), o2(0xFA,0xA9), o2(0x8A,0xB0), o2(0x90,0x51),
-     o2(0x9B,0x8B), o2(0x8E,0x40), o2(0x89,0xC7), o2(0x9B,0x8A),
-     o2(0x9B,0x88), o2(0x9B,0x8C), o2(0x9B,0x89), o2(0x94,0x4A),
-     o2(0x9E,0xCB), o2(0x90,0x52), o2(0x9B,0x8D), o2(0xFA,0xAA),
-     o2(0x97,0xBE), o2(0x9B,0x8E), o2(0x9B,0x90), o2(0x92,0x9E),
-     o2(0x9B,0x8F), o2(0x90,0xA1), o2(0x8E,0x9B), o2(0x91,0xCE),
-     o2(0x8E,0xF5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_AF = {
-    to_SHIFT_JIS_E5_AF_offsets,
-    to_SHIFT_JIS_E5_AF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B0 */
-  /* used from to_EUC_JP_E5_B0 */
-     32,  0,  1, 32,  2,  3,  4,  5,    6,  7,  8,  9, 32, 10, 11, 12,
-     32, 13, 32, 14, 32, 32, 15, 32,   32, 32, 16, 32, 32, 32, 17, 32,
-     18, 32, 19, 32, 20, 32, 32, 32,   21, 32, 32, 32, 32, 22, 32, 32,
-     32, 23, 32, 32, 32, 32, 32, 32,   24, 25, 26, 27, 28, 29, 30, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B0_infos[33] = {
-     o2(0x95,0x95), o2(0x90,0xEA), o2(0x8E,0xCB), o2(0x9B,0x91),
-     o2(0x8F,0xAB), o2(0x9B,0x92), o2(0x9B,0x93), o2(0x88,0xD1),
-     o2(0x91,0xB8), o2(0x90,0x71), o2(0x9B,0x94), o2(0x93,0xB1),
-     o2(0x8F,0xAC), o2(0x8F,0xAD), o2(0x9B,0x95), o2(0x90,0xEB),
-     o2(0x8F,0xAE), o2(0xFA,0xAB), o2(0x9B,0x96), o2(0x9B,0x97),
-     o2(0x96,0xDE), o2(0x9B,0x98), o2(0x8B,0xC4), o2(0x8F,0x41),
-     o2(0x9B,0x99), o2(0x9B,0x9A), o2(0x8E,0xDA), o2(0x90,0x4B),
-     o2(0x93,0xF2), o2(0x90,0x73), o2(0x94,0xF6), o2(0x94,0x41),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B0 = {
-    to_SHIFT_JIS_E5_B0_offsets,
-    to_SHIFT_JIS_E5_B0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B1 */
-  /* used from to_EUC_JP_E5_B1 */
-      0,  1, 25, 25, 25,  2,  3, 25,    4, 25,  5,  6, 25,  7,  8,  9,
-     10, 11, 25, 12, 25, 13, 25, 25,   25, 25, 25, 25, 25, 25, 14, 25,
-     15, 16, 25, 25, 17, 18, 25, 25,   25, 25, 25, 25, 19, 25, 20, 21,
-     25, 22, 25, 25, 25, 25, 23, 25,   25, 24, 25, 25, 25, 25, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B1_infos[26] = {
-     o2(0x8B,0xC7), o2(0x9B,0x9B), o2(0x8B,0x8F), o2(0x9B,0x9C),
-     o2(0x8B,0xFC), o2(0x93,0xCD), o2(0x89,0xAE), o2(0x8E,0x72),
-     o2(0x9B,0x9D), o2(0x9B,0xA0), o2(0x9B,0x9F), o2(0x8B,0xFB),
-     o2(0x9B,0x9E), o2(0x93,0x57), o2(0x91,0xAE), o2(0x93,0x6A),
-     o2(0x8E,0xC6), o2(0x91,0x77), o2(0x97,0x9A), o2(0x9B,0xA2),
-     o2(0x9B,0xA3), o2(0x93,0xD4), o2(0x8E,0x52), o2(0x9B,0xA5),
-     o2(0x9B,0xA6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B1 = {
-    to_SHIFT_JIS_E5_B1_offsets,
-    to_SHIFT_JIS_E5_B1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B2 */
-  /* used from to_EUC_JP_E5_B2 */
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19,  0, 19, 19, 19,
-      1,  2, 19, 19,  3, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19,  4, 19, 19, 19, 19,  5, 19,    6,  7, 19,  8,  9, 19, 19, 19,
-     19, 10, 19, 11, 19, 19, 12, 13,   14, 19, 15, 16, 17, 19, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B2_infos[20] = {
-     o2(0x9B,0xA7), o2(0x8A,0xF2), o2(0x9B,0xA8), o2(0x9B,0xA9),
-     o2(0x89,0xAA), o2(0xFA,0xAC), o2(0x91,0x5A), o2(0x8A,0xE2),
-     o2(0x9B,0xAB), o2(0x96,0xA6), o2(0x91,0xD0), o2(0x8A,0x78),
-     o2(0x9B,0xAD), o2(0x9B,0xAF), o2(0x8A,0xDD), o2(0xFA,0xAD),
-     o2(0x9B,0xAC), o2(0x9B,0xAE), o2(0x9B,0xB1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B2 = {
-    to_SHIFT_JIS_E5_B2_offsets,
-    to_SHIFT_JIS_E5_B2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B3 */
-  /* used from to_EUC_JP_E5_B3 */
-     16, 16, 16, 16, 16,  0, 16,  1,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16,  2, 16, 16, 16, 16, 16, 16,
-      3,  4, 16, 16, 16, 16, 16, 16,    5,  6,  7, 16, 16,  8, 16,  9,
-     10, 16, 16, 16, 16, 11, 12, 16,   16, 16, 13, 14, 16, 15, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B3_infos[17] = {
-     o2(0x9B,0xB0), o2(0x9B,0xB2), o2(0x9B,0xB3), o2(0x93,0xBB),
-     o2(0x8B,0xAC), o2(0x89,0xE3), o2(0x9B,0xB4), o2(0x9B,0xB9),
-     o2(0x9B,0xB7), o2(0x95,0xF5), o2(0x95,0xF4), o2(0xFA,0xAE),
-     o2(0x93,0x87), o2(0x9B,0xB6), o2(0x8F,0x73), o2(0x9B,0xB5),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B3 = {
-    to_SHIFT_JIS_E5_B3_offsets,
-    to_SHIFT_JIS_E5_B3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B4 */
-  /* used from to_EUC_JP_E5_B4 */
-     16, 16, 16, 16, 16, 16, 16,  0,   16, 16, 16,  1, 16, 16,  2, 16,
-     16,  3, 16, 16,  4,  5,  6,  7,    8,  9, 10, 11, 16, 16, 16, 12,
-     16, 16, 13, 16, 16, 16, 16, 14,   16, 15, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B4_infos[17] = {
-     o2(0x90,0x92), o2(0x9B,0xBA), o2(0x8D,0xE8), o2(0x9B,0xC0),
-     o2(0x9B,0xC1), o2(0x9B,0xBB), o2(0x8A,0x52), o2(0x9B,0xBC),
-     o2(0x9B,0xC5), o2(0x9B,0xC4), o2(0x9B,0xC3), o2(0x9B,0xBF),
-     o2(0x9B,0xBE), o2(0x9B,0xC2), o2(0xFA,0xAF), o2(0x95,0xF6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B4 = {
-    to_SHIFT_JIS_E5_B4_offsets,
-    to_SHIFT_JIS_E5_B4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B5 */
-  /* used from to_EUC_JP_E5_B5 */
-     14, 14,  0, 14, 14, 14, 14, 14,   14, 14, 14,  1,  2, 14,  3, 14,
-      4, 14,  5,  6, 14, 14, 14, 14,   14, 14, 14, 14,  7, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14,  8, 14, 14,  9, 10, 14, 11,
-     14, 14, 14, 12, 14, 14, 13, 14,   14, 14, 14, 14, 14, 14, 14, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B5_infos[15] = {
-     o2(0xFA,0xB2), o2(0x9B,0xC9), o2(0x9B,0xC6), o2(0x9B,0xC8),
-     o2(0x97,0x92), o2(0x9B,0xC7), o2(0xFA,0xB0), o2(0x9B,0xBD),
-     o2(0x90,0x93), o2(0x9B,0xCA), o2(0xFA,0xB3), o2(0x8D,0xB5),
-     o2(0x9B,0xCB), o2(0x9B,0xCC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B5 = {
-    to_SHIFT_JIS_E5_B5_offsets,
-    to_SHIFT_JIS_E5_B5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B6 */
-  /* used from to_EUC_JP_E5_B6 */
-     16, 16,  0, 16,  1, 16, 16,  2,   16, 16, 16,  3,  4, 16, 16, 16,
-      5, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16,  6, 16, 16,
-     16, 16,  7, 16, 16, 16, 16, 16,   16, 16, 16, 16,  8, 16,  9, 16,
-     16, 16, 16, 16, 16, 16, 16, 10,   11, 12, 13, 16, 14, 15, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B6_infos[17] = {
-     o2(0x9B,0xCF), o2(0x9B,0xCE), o2(0x9B,0xCD), o2(0x93,0x88),
-     o2(0x9B,0xB8), o2(0x9B,0xD5), o2(0x9B,0xD1), o2(0x9B,0xD0),
-     o2(0x9B,0xD2), o2(0x9B,0xD3), o2(0x9B,0xD6), o2(0xFA,0xB4),
-     o2(0xFA,0xB5), o2(0x97,0xE4), o2(0x9B,0xD7), o2(0x9B,0xD4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B6 = {
-    to_SHIFT_JIS_E5_B6_offsets,
-    to_SHIFT_JIS_E5_B6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B7 */
-  /* used from to_EUC_JP_E5_B7 */
-     27, 27, 27, 27, 27, 27, 27, 27,   27,  0, 27, 27,  1,  2, 27, 27,
-      3, 27,  4,  5, 27, 27,  6, 27,   27, 27, 27,  7, 27,  8,  9, 27,
-     27, 10, 27, 11, 27, 12, 13, 14,   15, 27, 27, 16, 27, 27, 17, 27,
-     27, 18, 19, 20, 21, 22, 27, 23,   27, 27, 27, 24, 27, 25, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B7_infos[28] = {
-     o2(0x9B,0xD8), o2(0x8A,0xDE), o2(0x9B,0xD9), o2(0xFA,0xB6),
-     o2(0x9B,0xDB), o2(0x9B,0xDA), o2(0x9B,0xDC), o2(0x9B,0xDD),
-     o2(0x90,0xEC), o2(0x8F,0x42), o2(0x8F,0x84), o2(0x91,0x83),
-     o2(0x8D,0x48), o2(0x8D,0xB6), o2(0x8D,0x49), o2(0x8B,0x90),
-     o2(0x9B,0xDE), o2(0x8D,0xB7), o2(0x8C,0xC8), o2(0x9B,0xDF),
-     o2(0x96,0xA4), o2(0x94,0x62), o2(0x9B,0xE0), o2(0x8D,0x4A),
-     o2(0x8A,0xAA), o2(0x92,0x46), o2(0x8B,0xD0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B7 = {
-    to_SHIFT_JIS_E5_B7_offsets,
-    to_SHIFT_JIS_E5_B7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B8 */
-  /* used from to_EUC_JP_E5_B8 */
-     21, 21,  0,  1, 21, 21,  2, 21,   21, 21, 21,  3,  4, 21, 21, 21,
-     21,  5, 21, 21, 21, 21,  6, 21,   21,  7,  8,  9, 21, 10, 21, 21,
-     21, 21, 21, 21, 21, 11, 21, 21,   21, 21, 21, 12, 21, 13, 21, 14,
-     15, 21, 21, 16, 21, 21, 17, 18,   19, 21, 21, 21, 21, 20, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B8_infos[22] = {
-     o2(0x8E,0x73), o2(0x95,0x7A), o2(0x94,0xBF), o2(0x9B,0xE1),
-     o2(0x8A,0xF3), o2(0x9B,0xE4), o2(0x92,0x9F), o2(0x9B,0xE3),
-     o2(0x9B,0xE2), o2(0x9B,0xE5), o2(0x92,0xE9), o2(0x90,0x83),
-     o2(0x8E,0x74), o2(0x90,0xC8), o2(0x91,0xD1), o2(0x8B,0x41),
-     o2(0x92,0xA0), o2(0x9B,0xE6), o2(0x9B,0xE7), o2(0x8F,0xED),
-     o2(0x96,0x58),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B8 = {
-    to_SHIFT_JIS_E5_B8_offsets,
-    to_SHIFT_JIS_E5_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_B9 */
-  /* used from to_EUC_JP_E5_B9 */
-      0, 28, 28,  1,  2,  3, 28,  4,   28, 28, 28, 28,  5, 28,  6, 28,
-     28, 28, 28, 28,  7,  8, 28,  9,   28, 28, 28, 28, 28, 28, 28, 10,
-     28, 11, 12, 13, 14, 28, 28, 28,   28, 28, 28, 28, 28, 28, 28, 28,
-     28, 28, 15, 16, 17, 18, 19, 28,   20, 21, 22, 23, 24, 25, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_B9_infos[29] = {
-     o2(0x9B,0xEA), o2(0x9B,0xE9), o2(0x9B,0xE8), o2(0x95,0x9D),
-     o2(0x9B,0xF1), o2(0x96,0x79), o2(0x9B,0xEB), o2(0x9B,0xED),
-     o2(0x96,0x8B), o2(0x9B,0xEC), o2(0x9B,0xEE), o2(0x94,0xA6),
-     o2(0x9B,0xEF), o2(0x95,0xBC), o2(0x9B,0xF0), o2(0x8A,0xB1),
-     o2(0x95,0xBD), o2(0x94,0x4E), o2(0x9B,0xF2), o2(0x9B,0xF3),
-     o2(0x8D,0x4B), o2(0x8A,0xB2), o2(0x9B,0xF4), o2(0x8C,0xB6),
-     o2(0x97,0x63), o2(0x97,0x48), o2(0x8A,0xF4), o2(0x9B,0xF6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_B9 = {
-    to_SHIFT_JIS_E5_B9_offsets,
-    to_SHIFT_JIS_E5_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BA */
-  /* used from to_EUC_JP_E5_BA */
-     20,  0, 20,  1,  2, 20, 20,  3,   20, 20,  4, 20, 20, 20, 20,  5,
-     20, 20, 20, 20, 20,  6,  7,  8,   20, 20,  9, 20, 10, 20, 20, 20,
-     11, 20, 20, 20, 20, 20, 12, 13,   20, 20, 20, 14, 20, 15, 20, 20,
-     20, 20, 20, 20, 20, 16, 17, 18,   19, 20, 20, 20, 20, 20, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BA_infos[21] = {
-     o2(0x92,0xA1), o2(0x8D,0x4C), o2(0x8F,0xAF), o2(0x94,0xDD),
-     o2(0x8F,0xB0), o2(0x8F,0x98), o2(0x92,0xEA), o2(0x95,0xF7),
-     o2(0x93,0x58), o2(0x8D,0x4D), o2(0x95,0x7B), o2(0x9B,0xF7),
-     o2(0x93,0x78), o2(0x8D,0xC0), o2(0x8C,0xC9), o2(0x92,0xEB),
-     o2(0x88,0xC1), o2(0x8F,0x8E), o2(0x8D,0x4E), o2(0x97,0x66),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BA = {
-    to_SHIFT_JIS_E5_BA_offsets,
-    to_SHIFT_JIS_E5_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BB */
-  /* used from to_EUC_JP_E5_BB */
-     33,  0,  1,  2, 33, 33, 33, 33,    3,  4,  5, 33, 33, 33, 33,  6,
-      7, 33, 33,  8, 33, 33,  9, 33,   33, 33, 10, 11, 33, 12, 33, 13,
-     14, 15, 16, 17, 33, 33, 33, 33,   18, 19, 33, 33, 20, 33, 33, 33,
-     21, 22, 33, 23, 24, 33, 25, 26,   27, 33, 28, 29, 30, 33, 31, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BB_infos[34] = {
-     o2(0x9B,0xF8), o2(0x9B,0xF9), o2(0x94,0x70), o2(0x9B,0xFA),
-     o2(0x97,0xF5), o2(0x98,0x4C), o2(0x9B,0xFC), o2(0x9B,0xFB),
-     o2(0x8A,0x66), o2(0x9C,0x40), o2(0x9C,0x43), o2(0x9C,0x44),
-     o2(0x9C,0x42), o2(0x95,0x5F), o2(0x8F,0xB1), o2(0x9C,0x46),
-     o2(0x9C,0x45), o2(0x9C,0x41), o2(0x9C,0x47), o2(0x9C,0x48),
-     o2(0x9C,0x49), o2(0x9C,0x4C), o2(0x9C,0x4A), o2(0x9C,0x4B),
-     o2(0x9C,0x4D), o2(0x89,0x84), o2(0x92,0xEC), o2(0x9C,0x4E),
-     o2(0x8C,0x9A), o2(0x89,0xF4), o2(0x94,0x55), o2(0x9C,0x4F),
-     o2(0x93,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BB = {
-    to_SHIFT_JIS_E5_BB_offsets,
-    to_SHIFT_JIS_E5_BB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BC */
-  /* used from to_EUC_JP_E5_BC */
-     33,  0, 33,  1,  2, 33, 33, 33,   33,  3,  4,  5,  6,  7, 33,  8,
-      9, 10, 33, 11, 12, 13, 14, 15,   16, 33, 33, 17, 33, 33, 33, 18,
-     33, 19, 33, 33, 33, 20, 21, 22,   33, 23, 33, 33, 33, 24, 33, 25,
-     33, 26, 33, 33, 27, 28, 33, 29,   30, 33, 33, 33, 31, 33, 32, 33,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BC_infos[34] = {
-     o2(0x95,0xD9), o2(0x9C,0x50), o2(0x98,0x4D), o2(0x9C,0x51),
-     o2(0x95,0xBE), o2(0x9C,0x54), o2(0x98,0x9F), o2(0x98,0xAF),
-     o2(0x8E,0xAE), o2(0x93,0xF3), o2(0x9C,0x55), o2(0x8B,0x7C),
-     o2(0x92,0xA2), o2(0x88,0xF8), o2(0x9C,0x56), o2(0x95,0xA4),
-     o2(0x8D,0x4F), o2(0x92,0x6F), o2(0x92,0xED), o2(0xFA,0xB7),
-     o2(0x96,0xED), o2(0x8C,0xB7), o2(0x8C,0xCA), o2(0x9C,0x57),
-     o2(0x9C,0x58), o2(0x9C,0x5E), o2(0x8E,0xE3), o2(0xFA,0xB8),
-     o2(0x92,0xA3), o2(0x8B,0xAD), o2(0x9C,0x59), o2(0x95,0x4A),
-     o2(0x92,0x65),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BC = {
-    to_SHIFT_JIS_E5_BC_offsets,
-    to_SHIFT_JIS_E5_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BD */
-  /* used from to_EUC_JP_E5_BD */
-     29,  0, 29, 29, 29,  1, 29, 29,    2, 29,  3, 29,  4, 29,  5, 29,
-     29,  6, 29,  7, 29, 29,  8,  9,   29, 10, 29, 29, 11, 12, 29, 29,
-     29, 13, 14, 29, 29, 29, 15, 16,   29, 17, 18, 19, 20, 21, 29, 29,
-     22, 23, 29, 24, 29, 29, 29, 25,   29, 26, 29, 29, 27, 29, 29, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BD_infos[30] = {
-     o2(0x9C,0x5A), o2(0xFA,0x67), o2(0x9C,0x5B), o2(0x8B,0xAE),
-     o2(0x9C,0x5C), o2(0x9C,0x5D), o2(0x9C,0x5F), o2(0x93,0x96),
-     o2(0x9C,0x60), o2(0x9C,0x61), o2(0x9C,0x62), o2(0x9C,0x53),
-     o2(0x9C,0x52), o2(0x9C,0x63), o2(0x8C,0x60), o2(0x95,0x46),
-     o2(0xFA,0xB9), o2(0x8D,0xCA), o2(0x95,0x56), o2(0x92,0xA4),
-     o2(0x95,0x6A), o2(0x9C,0x64), o2(0x8F,0xB2), o2(0x89,0x65),
-     o2(0x9C,0x65), o2(0x9C,0x66), o2(0x96,0xF0), o2(0x94,0xDE),
-     o2(0x9C,0x69),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BD = {
-    to_SHIFT_JIS_E5_BD_offsets,
-    to_SHIFT_JIS_E5_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BE */
-  /* used from to_EUC_JP_E5_BE */
-      0,  1,  2,  3,  4,  5, 32,  6,    7, 32,  8,  9, 10, 32, 32, 32,
-     11, 12, 13, 14, 32, 32, 32, 15,   16, 17, 32, 32, 32, 32, 18, 32,
-     19, 20, 32, 32, 32, 32, 32, 32,   21, 22, 23, 32, 32, 24, 25, 32,
-     32, 32, 32, 26, 27, 32, 32, 28,   32, 29, 32, 32, 30, 31, 32, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BE_infos[33] = {
-     o2(0x89,0x9D), o2(0x90,0xAA), o2(0x9C,0x68), o2(0x9C,0x67),
-     o2(0x8C,0x61), o2(0x91,0xD2), o2(0x9C,0x6D), o2(0x9C,0x6B),
-     o2(0x9C,0x6A), o2(0x97,0xA5), o2(0x8C,0xE3), o2(0x8F,0x99),
-     o2(0x9C,0x6C), o2(0x93,0x6B), o2(0x8F,0x5D), o2(0x93,0xBE),
-     o2(0x9C,0x70), o2(0x9C,0x6F), o2(0x9C,0x6E), o2(0x9C,0x71),
-     o2(0x8C,0xE4), o2(0x9C,0x72), o2(0x95,0x9C), o2(0x8F,0x7A),
-     o2(0x9C,0x73), o2(0x94,0xF7), o2(0x93,0xBF), o2(0x92,0xA5),
-     o2(0xFA,0xBA), o2(0x93,0x4F), o2(0x9C,0x74), o2(0x8B,0x4A),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BE = {
-    to_SHIFT_JIS_E5_BE_offsets,
-    to_SHIFT_JIS_E5_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5_BF */
-  /* used from to_EUC_JP_E5_BF */
-     21, 21, 21,  0, 21,  1, 21, 21,   21, 21, 21, 21,  2,  3, 21, 21,
-     21, 21, 21, 21, 21, 21,  4,  5,    6,  7, 21, 21,  8,  9, 10, 21,
-     11, 21, 21, 21, 12, 21, 21, 21,   21, 21, 21, 13, 21, 21, 21, 21,
-     14, 15, 21, 21, 21, 16, 21, 21,   17, 21, 21, 18, 21, 19, 21, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_BF_infos[22] = {
-     o2(0x90,0x53), o2(0x95,0x4B), o2(0x8A,0xF5), o2(0x94,0x45),
-     o2(0x9C,0x75), o2(0x8E,0x75), o2(0x96,0x59), o2(0x96,0x5A),
-     o2(0x89,0x9E), o2(0x9C,0x7A), o2(0xFA,0xBB), o2(0x92,0x89),
-     o2(0x9C,0x77), o2(0x89,0xF5), o2(0x9C,0xAB), o2(0x9C,0x79),
-     o2(0x94,0x4F), o2(0x9C,0x78), o2(0x9C,0x76), o2(0x8D,0x9A),
-     o2(0x9C,0x7C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5_BF = {
-    to_SHIFT_JIS_E5_BF_offsets,
-    to_SHIFT_JIS_E5_BF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E5 */
-  /* used from to_SHIFT_JIS_E6 */
-  /* used from to_EUC_JP_E5 */
-  /* used from to_EUC_JP_E6 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E5_infos[64] = {
-     &to_SHIFT_JIS_E5_80, &to_SHIFT_JIS_E5_81,
-     &to_SHIFT_JIS_E5_82, &to_SHIFT_JIS_E5_83,
-     &to_SHIFT_JIS_E5_84, &to_SHIFT_JIS_E5_85,
-     &to_SHIFT_JIS_E5_86, &to_SHIFT_JIS_E5_87,
-     &to_SHIFT_JIS_E5_88, &to_SHIFT_JIS_E5_89,
-     &to_SHIFT_JIS_E5_8A, &to_SHIFT_JIS_E5_8B,
-     &to_SHIFT_JIS_E5_8C, &to_SHIFT_JIS_E5_8D,
-     &to_SHIFT_JIS_E5_8E, &to_SHIFT_JIS_E5_8F,
-     &to_SHIFT_JIS_E5_90, &to_SHIFT_JIS_E5_91,
-     &to_SHIFT_JIS_E5_92, &to_SHIFT_JIS_E5_93,
-     &to_SHIFT_JIS_E5_94, &to_SHIFT_JIS_E5_95,
-     &to_SHIFT_JIS_E5_96, &to_SHIFT_JIS_E5_97,
-     &to_SHIFT_JIS_E5_98, &to_SHIFT_JIS_E5_99,
-     &to_SHIFT_JIS_E5_9A, &to_SHIFT_JIS_E5_9B,
-     &to_SHIFT_JIS_E5_9C, &to_SHIFT_JIS_E5_9D,
-     &to_SHIFT_JIS_E5_9E, &to_SHIFT_JIS_E5_9F,
-     &to_SHIFT_JIS_E5_A0, &to_SHIFT_JIS_E5_A1,
-     &to_SHIFT_JIS_E5_A2, &to_SHIFT_JIS_E5_A3,
-     &to_SHIFT_JIS_E5_A4, &to_SHIFT_JIS_E5_A5,
-     &to_SHIFT_JIS_E5_A6, &to_SHIFT_JIS_E5_A7,
-     &to_SHIFT_JIS_E5_A8, &to_SHIFT_JIS_E5_A9,
-     &to_SHIFT_JIS_E5_AA, &to_SHIFT_JIS_E5_AB,
-     &to_SHIFT_JIS_E5_AC, &to_SHIFT_JIS_E5_AD,
-     &to_SHIFT_JIS_E5_AE, &to_SHIFT_JIS_E5_AF,
-     &to_SHIFT_JIS_E5_B0, &to_SHIFT_JIS_E5_B1,
-     &to_SHIFT_JIS_E5_B2, &to_SHIFT_JIS_E5_B3,
-     &to_SHIFT_JIS_E5_B4, &to_SHIFT_JIS_E5_B5,
-     &to_SHIFT_JIS_E5_B6, &to_SHIFT_JIS_E5_B7,
-     &to_SHIFT_JIS_E5_B8, &to_SHIFT_JIS_E5_B9,
-     &to_SHIFT_JIS_E5_BA, &to_SHIFT_JIS_E5_BB,
-     &to_SHIFT_JIS_E5_BC, &to_SHIFT_JIS_E5_BD,
-     &to_SHIFT_JIS_E5_BE, &to_SHIFT_JIS_E5_BF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E5 = {
-    to_SHIFT_JIS_E5_offsets,
-    to_SHIFT_JIS_E5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_80 */
-  /* used from to_EUC_JP_E6_80 */
-     22, 22, 22, 22, 22, 22, 22, 22,   22, 22, 22, 22, 22, 22,  0,  1,
-      2, 22,  3, 22, 22,  4,  5, 22,   22,  6, 22,  7,  8,  9, 22, 22,
-     10, 11, 22, 22, 22, 12, 13, 14,   15, 16, 17, 18, 22, 22, 22, 19,
-     22, 20, 22, 22, 22, 22, 22, 22,   22, 22, 21, 22, 22, 22, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_80_infos[23] = {
-     o2(0x9C,0x83), o2(0x9C,0x89), o2(0x9C,0x81), o2(0x93,0x7B),
-     o2(0x9C,0x86), o2(0x95,0x7C), o2(0x9C,0x80), o2(0x9C,0x85),
-     o2(0x97,0xE5), o2(0x8E,0x76), o2(0x91,0xD3), o2(0x9C,0x7D),
-     o2(0x8B,0x7D), o2(0x9C,0x88), o2(0x90,0xAB), o2(0x89,0x85),
-     o2(0x9C,0x82), o2(0x89,0xF6), o2(0x9C,0x87), o2(0x8B,0xAF),
-     o2(0x9C,0x84), o2(0x9C,0x8A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_80 = {
-    to_SHIFT_JIS_E6_80_offsets,
-    to_SHIFT_JIS_E6_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_81 */
-  /* used from to_EUC_JP_E6_81 */
-     29,  0,  1,  2, 29, 29,  3, 29,   29, 29,  4,  5, 29,  6, 29, 29,
-      7, 29,  8, 29, 29,  9, 29, 29,   29, 10, 11, 29, 29, 12, 29, 13,
-     14, 29, 15, 16, 17, 18, 29, 29,   19, 20, 21, 22, 23, 24, 29, 25,
-     26, 29, 29, 29, 29, 27, 29, 28,   29, 29, 29, 29, 29, 29, 29, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_81_infos[30] = {
-     o2(0x9C,0x8C), o2(0x9C,0x96), o2(0x9C,0x94), o2(0x9C,0x91),
-     o2(0x9C,0x90), o2(0x97,0xF6), o2(0x9C,0x92), o2(0x8B,0xB0),
-     o2(0x8D,0x50), o2(0x8F,0x9A), o2(0x9C,0x99), o2(0x9C,0x8B),
-     o2(0xFA,0xBC), o2(0x9C,0x8F), o2(0x9C,0x7E), o2(0x89,0xF8),
-     o2(0x9C,0x93), o2(0x9C,0x95), o2(0x92,0x70), o2(0x8D,0xA6),
-     o2(0x89,0xB6), o2(0x9C,0x8D), o2(0x9C,0x98), o2(0x9C,0x97),
-     o2(0x8B,0xB1), o2(0x91,0xA7), o2(0x8A,0x86), o2(0x8C,0x62),
-     o2(0x9C,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_81 = {
-    to_SHIFT_JIS_E6_81_offsets,
-    to_SHIFT_JIS_E6_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_82 */
-  /* used from to_EUC_JP_E6_82 */
-     30,  0, 30,  1,  2,  3, 30, 30,   30,  4,  5,  6,  7,  8, 30, 30,
-     30, 30,  9, 30, 10, 30, 11, 12,   30, 30, 13, 14, 30, 30, 30, 15,
-     16, 30, 30, 17, 30, 30, 18, 19,   30, 20, 21, 30, 30, 30, 30, 30,
-     30, 30, 22, 23, 24, 25, 26, 30,   27, 30, 30, 30, 28, 29, 30, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_82_infos[31] = {
-     o2(0x9C,0x9A), o2(0x9C,0x9D), o2(0x9C,0x9F), o2(0xFA,0xBD),
-     o2(0x8E,0xBB), o2(0xFA,0xBE), o2(0x9C,0xA5), o2(0x92,0xEE),
-     o2(0x9C,0x9B), o2(0x9C,0xA3), o2(0x89,0xF7), o2(0x9C,0xA1),
-     o2(0x9C,0xA2), o2(0x9C,0x9E), o2(0x9C,0xA0), o2(0x8C,0xE5),
-     o2(0x97,0x49), o2(0x8A,0xB3), o2(0x89,0x78), o2(0x9C,0xA4),
-     o2(0x94,0x59), o2(0x88,0xAB), o2(0x94,0xDF), o2(0x9C,0x7B),
-     o2(0x9C,0xAA), o2(0x9C,0xAE), o2(0x96,0xE3), o2(0x9C,0xA7),
-     o2(0x93,0x89), o2(0x9C,0xAC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_82 = {
-    to_SHIFT_JIS_E6_82_offsets,
-    to_SHIFT_JIS_E6_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_83 */
-  /* used from to_EUC_JP_E6_83 */
-     26, 26, 26, 26, 26,  0,  1,  2,   26, 26, 26, 26, 26, 26, 26, 26,
-     26,  3, 26,  4, 26,  5, 26, 26,    6, 26,  7, 26,  8, 26,  9, 10,
-     11, 12, 26, 13, 26, 26, 26, 14,   15, 26, 26, 26, 26, 26, 26, 26,
-     16, 17, 18, 19, 20, 26, 21, 22,   26, 23, 24, 25, 26, 26, 26, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_83_infos[27] = {
-     o2(0x8F,0xEE), o2(0x9C,0xAD), o2(0x93,0xD5), o2(0x98,0x66),
-     o2(0x9C,0xA9), o2(0xFA,0xC0), o2(0x9C,0xAF), o2(0x8D,0x9B),
-     o2(0x90,0xC9), o2(0xFA,0xBF), o2(0x88,0xD2), o2(0x9C,0xA8),
-     o2(0x9C,0xA6), o2(0x91,0x79), o2(0x9C,0x9C), o2(0x8E,0x53),
-     o2(0x91,0xC4), o2(0x9C,0xBB), o2(0xFA,0xC2), o2(0x91,0x7A),
-     o2(0x9C,0xB6), o2(0x9C,0xB3), o2(0x9C,0xB4), o2(0x8E,0xE4),
-     o2(0x9C,0xB7), o2(0x9C,0xBA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_83 = {
-    to_SHIFT_JIS_E6_83_offsets,
-    to_SHIFT_JIS_E6_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_84 */
-  /* used from to_EUC_JP_E6_84 */
-      0,  1, 26,  2, 26, 26,  3, 26,    4,  5, 26, 26, 26,  6,  7,  8,
-     26,  9, 26, 26, 26, 10, 26, 26,   26, 26, 11, 12, 26, 26, 26, 13,
-     14, 15, 26, 26, 26, 26, 26, 16,   17, 26, 26, 26, 18, 26, 26, 26,
-     19, 26, 26, 26, 20, 26, 26, 21,   26, 26, 26, 26, 22, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_84_infos[27] = {
-     o2(0x9C,0xB5), o2(0x8F,0x44), o2(0x9C,0xB8), o2(0x9C,0xB2),
-     o2(0x96,0xFA), o2(0x96,0xF9), o2(0x9C,0xBC), o2(0x9C,0xBD),
-     o2(0x88,0xD3), o2(0xFA,0xC3), o2(0x9C,0xB1), o2(0x8B,0xF0),
-     o2(0x88,0xA4), o2(0x8A,0xB4), o2(0xFA,0xC1), o2(0x9C,0xB9),
-     o2(0x9C,0xC1), o2(0x9C,0xC0), o2(0x9C,0xC5), o2(0xFA,0xC5),
-     o2(0x9C,0xC6), o2(0xFA,0xC4), o2(0x9C,0xC4), o2(0x9C,0xC7),
-     o2(0x9C,0xBF), o2(0x9C,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_84 = {
-    to_SHIFT_JIS_E6_84_offsets,
-    to_SHIFT_JIS_E6_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_85 */
-  /* used from to_EUC_JP_E6_85 */
-     32, 32,  0, 32,  1, 32, 32,  2,    3, 32,  4,  5,  6,  7,  8, 32,
-     32, 32, 32,  9, 32, 10, 32, 32,   11, 12, 13, 32, 32, 14, 32, 15,
-     32, 32, 16, 17, 32, 18, 32, 19,   20, 32, 32, 21, 32, 32, 22, 23,
-     24, 25, 32, 26, 27, 28, 29, 30,   32, 32, 32, 32, 32, 32, 31, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_85_infos[33] = {
-     o2(0x9C,0xC8), o2(0x9C,0xC9), o2(0x9C,0xBE), o2(0x8E,0x9C),
-     o2(0x9C,0xC2), o2(0x91,0xD4), o2(0x8D,0x51), o2(0x9C,0xB0),
-     o2(0x90,0x54), o2(0x9C,0xD6), o2(0x95,0xE7), o2(0x9C,0xCC),
-     o2(0x9C,0xCD), o2(0x9C,0xCE), o2(0x9C,0xD5), o2(0x9C,0xD4),
-     o2(0x96,0x9D), o2(0x8A,0xB5), o2(0x9C,0xD2), o2(0x8C,0x64),
-     o2(0x8A,0x53), o2(0x9C,0xCF), o2(0x97,0xB6), o2(0x9C,0xD1),
-     o2(0x88,0xD4), o2(0x9C,0xD3), o2(0x9C,0xCA), o2(0x9C,0xD0),
-     o2(0x9C,0xD7), o2(0x8C,0x63), o2(0x9C,0xCB), o2(0x97,0x7C),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_85 = {
-    to_SHIFT_JIS_E6_85_offsets,
-    to_SHIFT_JIS_E6_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_86 */
-  /* used from to_EUC_JP_E6_86 */
-     21, 21,  0, 21, 21, 21, 21,  1,   21, 21,  2, 21, 21, 21,  3, 21,
-      4,  5, 21, 21,  6, 21,  7, 21,    8,  9, 10, 21, 21, 21, 21, 21,
-     21, 21, 21, 21, 11, 21, 21, 12,   21, 13, 21, 14, 15, 21, 16, 21,
-     21, 21, 17, 21, 21, 21, 18, 21,   21, 21, 19, 21, 21, 21, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_86_infos[22] = {
-     o2(0x97,0x4A), o2(0x9C,0xDA), o2(0x9C,0xDE), o2(0x91,0x9E),
-     o2(0x97,0xF7), o2(0x9C,0xDF), o2(0x9C,0xDC), o2(0x9C,0xD9),
-     o2(0xFA,0xC6), o2(0x9C,0xD8), o2(0x9C,0xDD), o2(0x95,0xAE),
-     o2(0x93,0xB2), o2(0x8C,0x65), o2(0x9C,0xE0), o2(0x9C,0xDB),
-     o2(0x9C,0xE1), o2(0x8C,0x9B), o2(0x89,0xAF), o2(0x9C,0xE9),
-     o2(0x8A,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_86 = {
-    to_SHIFT_JIS_E6_86_offsets,
-    to_SHIFT_JIS_E6_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_87 */
-  /* used from to_EUC_JP_E6_87 */
-     22, 22, 22,  0, 22, 22,  1,  2,    3,  4,  5,  6,  7,  8, 22, 22,
-      9, 22, 22, 22, 22, 22, 22, 22,   22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 10, 22, 22, 11, 22,   22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 12, 22, 13, 22, 14, 15,   16, 22, 17, 22, 18, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_87_infos[23] = {
-     o2(0x9C,0xE7), o2(0x9C,0xE8), o2(0x8D,0xA7), o2(0x9C,0xE6),
-     o2(0x9C,0xE4), o2(0x9C,0xE3), o2(0x9C,0xEA), o2(0x9C,0xE2),
-     o2(0x9C,0xEC), o2(0x89,0xF9), o2(0x9C,0xEE), o2(0x9C,0xED),
-     o2(0x92,0xA6), o2(0x9C,0xF1), o2(0x9C,0xEF), o2(0x9C,0xE5),
-     o2(0x8C,0x9C), o2(0x9C,0xF0), o2(0x9C,0xF4), o2(0x9C,0xF3),
-     o2(0x9C,0xF5), o2(0x9C,0xF2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_87 = {
-    to_SHIFT_JIS_E6_87_offsets,
-    to_SHIFT_JIS_E6_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_88 */
-  /* used from to_EUC_JP_E6_88 */
-      0, 30, 30, 30, 30, 30, 30, 30,    1,  2,  3, 30,  4,  5,  6, 30,
-      7,  8,  9, 10, 11, 30, 12, 30,   30, 30, 13, 14, 30, 15, 16, 17,
-     30, 18, 30, 30, 30, 30, 19, 30,   30, 30, 20, 30, 30, 30, 21, 22,
-     23, 30, 24, 25, 26, 30, 30, 30,   27, 30, 30, 28, 30, 30, 30, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_88_infos[31] = {
-     o2(0x9C,0xF6), o2(0x9C,0xF7), o2(0x9C,0xF8), o2(0x95,0xE8),
-     o2(0x9C,0xFA), o2(0x9C,0xF9), o2(0x8F,0x5E), o2(0x90,0xAC),
-     o2(0x89,0xE4), o2(0x89,0xFA), o2(0xFA,0xC7), o2(0x9C,0xFB),
-     o2(0x88,0xBD), o2(0x90,0xCA), o2(0x9C,0xFC), o2(0xE6,0xC1),
-     o2(0x9D,0x40), o2(0x8C,0x81), o2(0x9D,0x41), o2(0x90,0xED),
-     o2(0x9D,0x42), o2(0x9D,0x43), o2(0x8B,0x59), o2(0x9D,0x44),
-     o2(0x9D,0x45), o2(0x9D,0x46), o2(0x91,0xD5), o2(0x8C,0xCB),
-     o2(0x96,0xDF), o2(0x96,0x5B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_88 = {
-    to_SHIFT_JIS_E6_88_offsets,
-    to_SHIFT_JIS_E6_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_89 */
-  /* used from to_EUC_JP_E6_89 */
-      0,  1, 23, 23, 23, 23, 23,  2,    3,  4, 23,  5, 23,  6,  7, 23,
-     23, 23, 23,  8, 23,  9, 23, 23,   10, 23, 23, 11, 23, 23, 12, 23,
-     13, 23, 23, 14, 23, 23, 23, 23,   15, 23, 23, 23, 23, 23, 16, 23,
-     23, 17, 23, 23, 23, 23, 18, 23,   23, 19, 23, 23, 20, 23, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_89_infos[24] = {
-     o2(0x8F,0x8A), o2(0x9D,0x47), o2(0x90,0xEE), o2(0xE7,0xBB),
-     o2(0x94,0xE0), o2(0x8E,0xE8), o2(0x8D,0xCB), o2(0x9D,0x48),
-     o2(0x91,0xC5), o2(0x95,0xA5), o2(0x91,0xEF), o2(0x9D,0x4B),
-     o2(0x9D,0x49), o2(0x9D,0x4C), o2(0x9D,0x4A), o2(0x9D,0x4D),
-     o2(0x95,0xAF), o2(0x88,0xB5), o2(0x95,0x7D), o2(0x94,0xE1),
-     o2(0x9D,0x4E), o2(0x9D,0x51), o2(0x8F,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_89 = {
-    to_SHIFT_JIS_E6_89_offsets,
-    to_SHIFT_JIS_E6_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8A */
-  /* used from to_EUC_JP_E6_8A */
-      0, 26,  1,  2,  3, 26, 26, 26,   26,  4,  5, 26, 26, 26, 26, 26,
-     26,  6,  7,  8,  9, 10, 11, 12,   13, 26, 26, 14, 15, 26, 16, 26,
-     26, 26, 26, 26, 26, 26, 17, 26,   26, 26, 26, 18, 19, 26, 26, 26,
-     26, 20, 26, 26, 26, 21, 26, 26,   26, 22, 26, 23, 24, 25, 26, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8A_infos[27] = {
-     o2(0x8B,0x5A), o2(0x9D,0x4F), o2(0x9D,0x56), o2(0x8F,0xB4),
-     o2(0x9D,0x50), o2(0x94,0x63), o2(0x97,0x7D), o2(0x9D,0x52),
-     o2(0x9D,0x53), o2(0x9D,0x57), o2(0x93,0x8A), o2(0x9D,0x54),
-     o2(0x8D,0x52), o2(0x90,0xDC), o2(0x9D,0x65), o2(0x94,0xB2),
-     o2(0x91,0xF0), o2(0xFA,0xC8), o2(0x94,0xE2), o2(0x9D,0xAB),
-     o2(0x95,0xF8), o2(0x92,0xEF), o2(0x96,0x95), o2(0x9D,0x5A),
-     o2(0x89,0x9F), o2(0x92,0x8A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8A = {
-    to_SHIFT_JIS_E6_8A_offsets,
-    to_SHIFT_JIS_E6_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8B */
-  /* used from to_EUC_JP_E6_8B */
-     34, 34,  0, 34, 34,  1,  2,  3,    4,  5,  6, 34,  7,  8, 34,  9,
-     10, 11, 12, 13, 14, 34, 34, 15,   16, 17, 34, 18, 19, 20, 34, 34,
-     21, 22, 34, 34, 34, 34, 34, 34,   34, 34, 34, 34, 23, 24, 25, 26,
-     34, 27, 34, 28, 34, 29, 30, 31,   34, 34, 34, 34, 34, 34, 32, 33,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8B_infos[35] = {
-     o2(0x9D,0x63), o2(0x92,0x53), o2(0x9D,0x5D), o2(0x9D,0x64),
-     o2(0x9D,0x5F), o2(0x9D,0x66), o2(0x9D,0x62), o2(0x9D,0x61),
-     o2(0x94,0x8F), o2(0x9D,0x5B), o2(0x89,0xFB), o2(0x9D,0x59),
-     o2(0x8B,0x91), o2(0x91,0xF1), o2(0x9D,0x55), o2(0x9D,0x58),
-     o2(0x8D,0x53), o2(0x90,0xD9), o2(0x8F,0xB5), o2(0x9D,0x60),
-     o2(0x94,0x71), o2(0x8B,0x92), o2(0x8A,0x67), o2(0x8A,0x87),
-     o2(0x90,0x40), o2(0x9D,0x68), o2(0x9D,0x6D), o2(0x9D,0x69),
-     o2(0x8C,0x9D), o2(0x9D,0x6E), o2(0x8E,0x41), o2(0x8D,0x89),
-     o2(0x8F,0x45), o2(0x9D,0x5C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8B = {
-    to_SHIFT_JIS_E6_8B_offsets,
-    to_SHIFT_JIS_E6_8B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8C */
-  /* used from to_EUC_JP_E6_8C */
-     17,  0,  1, 17, 17, 17, 17,  2,    3,  4, 17, 17,  5, 17, 17, 17,
-     17,  6, 17, 17, 17, 17, 17, 17,   17,  7, 17, 17, 17, 17, 17,  8,
-     17, 17, 17, 17, 17, 17, 17,  9,   10, 17, 17, 11, 17, 17, 17, 12,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 13, 17, 17, 14, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8C_infos[18] = {
-     o2(0x8E,0x9D), o2(0x9D,0x6B), o2(0x8E,0x77), o2(0x9D,0x6C),
-     o2(0x88,0xC2), o2(0x9D,0x67), o2(0x92,0xA7), o2(0x8B,0x93),
-     o2(0x8B,0xB2), o2(0x9D,0x6A), o2(0x88,0xA5), o2(0x8D,0xC1),
-     o2(0x90,0x55), o2(0x92,0xF0), o2(0x94,0xD2), o2(0x9D,0x70),
-     o2(0x91,0x7D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8C = {
-    to_SHIFT_JIS_E6_8C_offsets,
-    to_SHIFT_JIS_E6_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8D */
-  /* used from to_EUC_JP_E6_8D */
-     18, 18, 18, 18, 18, 18, 18, 18,   18,  0, 18, 18,  1,  2, 18,  3,
-      4, 18, 18, 18, 18,  5, 18,  6,   18, 18, 18, 18,  7, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18,  8,    9, 10, 18, 11, 18, 18, 12, 18,
-     18, 18, 13, 18, 18, 18, 14, 15,   18, 18, 16, 17, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8D_infos[19] = {
-     o2(0x91,0xA8), o2(0x8E,0x4A), o2(0x9D,0x71), o2(0x9D,0x73),
-     o2(0x9D,0x6F), o2(0x95,0xDF), o2(0x92,0xBB), o2(0x91,0x7B),
-     o2(0x95,0xF9), o2(0x8E,0xCC), o2(0x9D,0x80), o2(0x9D,0x7E),
-     o2(0x90,0x98), o2(0x8C,0x9E), o2(0x9D,0x78), o2(0x8F,0xB7),
-     o2(0x93,0xE6), o2(0x94,0x50),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8D = {
-    to_SHIFT_JIS_E6_8D_offsets,
-    to_SHIFT_JIS_E6_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8E */
-  /* used from to_EUC_JP_E6_8E */
-      0, 28, 28,  1, 28, 28, 28, 28,    2,  3, 28, 28,  4, 28,  5,  6,
-     28, 28,  7, 28, 28, 28,  8, 28,    9, 28, 28, 10, 28, 28, 28, 11,
-     12, 13, 14, 15, 28, 16, 28, 17,   18, 19, 20, 21, 22, 28, 28, 28,
-     28, 28, 23, 28, 24, 25, 28, 28,   28, 28, 28, 26, 28, 28, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8E_infos[29] = {
-     o2(0x9D,0x76), o2(0x91,0x7C), o2(0x8E,0xF6), o2(0x9D,0x7B),
-     o2(0x8F,0xB6), o2(0x9D,0x75), o2(0x9D,0x7A), o2(0x94,0x72),
-     o2(0x9D,0x74), o2(0x8C,0x40), o2(0x8A,0x7C), o2(0x9D,0x7C),
-     o2(0x97,0xA9), o2(0x8D,0xCC), o2(0x92,0x54), o2(0x9D,0x79),
-     o2(0x90,0xDA), o2(0x8D,0x54), o2(0x90,0x84), o2(0x89,0x86),
-     o2(0x91,0x5B), o2(0x9D,0x77), o2(0x8B,0x64), o2(0x8C,0x66),
-     o2(0x92,0xCD), o2(0x9D,0x7D), o2(0x91,0x7E), o2(0x9D,0x81),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8E = {
-    to_SHIFT_JIS_E6_8E_offsets,
-    to_SHIFT_JIS_E6_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_8F */
-  /* used from to_EUC_JP_E6_8F */
-      0, 19, 19,  1,  2, 19,  3, 19,   19,  4, 19, 19, 19, 19, 19,  5,
-      6, 19,  7, 19, 19, 19,  8, 19,   19, 19,  9, 10, 19, 19, 19, 19,
-     19, 11, 19, 12, 19, 19, 19, 19,   19, 13, 19, 19, 19, 19, 14, 19,
-     19, 19, 19, 19, 15, 16, 17, 19,   19, 19, 18, 19, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_8F_infos[20] = {
-     o2(0x9D,0x83), o2(0x91,0xB5), o2(0x9D,0x89), o2(0x9D,0x84),
-     o2(0x9D,0x86), o2(0x95,0x60), o2(0x92,0xF1), o2(0x9D,0x87),
-     o2(0x97,0x4B), o2(0x97,0x67), o2(0x8A,0xB7), o2(0x88,0xAC),
-     o2(0x9D,0x85), o2(0x9D,0x82), o2(0x8A,0xF6), o2(0x89,0x87),
-     o2(0xFA,0xC9), o2(0x9D,0x88), o2(0x97,0x68),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_8F = {
-    to_SHIFT_JIS_E6_8F_offsets,
-    to_SHIFT_JIS_E6_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_90_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_90 */
-  /* used from to_EUC_JP_E6_90 */
-     15, 15, 15, 15, 15, 15,  0, 15,   15, 15, 15, 15, 15,  1, 15,  2,
-     15, 15, 15,  3, 15, 15,  4,  5,   15, 15, 15, 15,  6, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,  7, 15,    8, 15, 15, 15,  9, 10, 15, 15,
-     15, 15, 15, 15, 11, 15, 12, 15,   15, 15, 13, 15, 15, 15, 14, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_90_infos[16] = {
-     o2(0x9D,0x8C), o2(0x91,0xB9), o2(0x9D,0x93), o2(0x9D,0x8D),
-     o2(0x9D,0x8A), o2(0x9D,0x91), o2(0x9D,0x72), o2(0x9D,0x8E),
-     o2(0x9D,0x92), o2(0x94,0xC0), o2(0x93,0x8B), o2(0x9D,0x8B),
-     o2(0x9D,0x8F), o2(0x8C,0x67), o2(0x8D,0xEF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_90 = {
-    to_SHIFT_JIS_E6_90_offsets,
-    to_SHIFT_JIS_E6_90_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_91 */
-  /* used from to_EUC_JP_E6_91 */
-     10, 10,  0, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10,  1, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,    2, 10, 10, 10, 10, 10, 10, 10,
-      3, 10, 10, 10, 10, 10, 10,  4,   10,  5, 10, 10, 10, 10, 10,  6,
-     10, 10, 10, 10, 10, 10,  7, 10,    8, 10,  9, 10, 10, 10, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_91_infos[11] = {
-     o2(0x90,0xDB), o2(0x9D,0x97), o2(0x93,0x45), o2(0xFA,0xCA),
-     o2(0x9D,0x94), o2(0x96,0x80), o2(0x9D,0x95), o2(0x9D,0x96),
-     o2(0x96,0xCC), o2(0x90,0xA0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_91 = {
-    to_SHIFT_JIS_E6_91_offsets,
-    to_SHIFT_JIS_E6_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_92_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_92 */
-  /* used from to_EUC_JP_E6_92 */
-     19, 19, 19,  0, 19, 19, 19, 19,    1, 19, 19, 19, 19, 19, 19, 19,
-     19, 19,  2,  3, 19,  4, 19, 19,   19, 19,  5, 19, 19,  6,  7, 19,
-     19, 19, 19, 19,  8,  9, 19, 19,   19, 10, 19, 11, 19, 12, 13, 19,
-     14, 19, 15, 19, 19, 19, 19, 19,   19, 16, 19, 17, 18, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_92_infos[20] = {
-     o2(0x8C,0x82), o2(0x9D,0x9D), o2(0x8E,0x54), o2(0x9D,0x9A),
-     o2(0x9D,0x99), o2(0x94,0x51), o2(0xFA,0xCB), o2(0x93,0xB3),
-     o2(0x93,0x50), o2(0x9D,0x9B), o2(0x9D,0x9C), o2(0x95,0x8F),
-     o2(0x94,0x64), o2(0x8E,0x42), o2(0x90,0xEF), o2(0x96,0x6F),
-     o2(0x8A,0x68), o2(0x9D,0xA3), o2(0x9D,0x9E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_92 = {
-    to_SHIFT_JIS_E6_92_offsets,
-    to_SHIFT_JIS_E6_92_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_93_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_93 */
-  /* used from to_EUC_JP_E6_93 */
-     25,  0,  1, 25, 25,  2, 25,  3,   25, 25, 25, 25, 25,  4,  5, 25,
-     25, 25,  6, 25,  7, 25, 25, 25,    8, 25,  9, 25, 25, 25, 25, 25,
-     10, 11, 12, 13, 25, 25, 14, 15,   25, 25, 25, 25, 16, 25, 25, 17,
-     25, 18, 19, 25, 20, 25, 21, 25,   25, 25, 22, 25, 25, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_93_infos[26] = {
-     o2(0x97,0x69), o2(0x9D,0xA5), o2(0x9D,0xA1), o2(0x9D,0xA2),
-     o2(0x91,0x80), o2(0xFA,0xCC), o2(0x9D,0xA0), o2(0x9D,0x5E),
-     o2(0x9D,0xA4), o2(0x9D,0x9F), o2(0x9D,0xA9), o2(0x9D,0xAA),
-     o2(0x93,0x46), o2(0x9D,0xAC), o2(0x8E,0x43), o2(0x9D,0xA7),
-     o2(0x8B,0x5B), o2(0x9D,0xAD), o2(0x9D,0xA6), o2(0x9D,0xB1),
-     o2(0x9D,0xB0), o2(0x9D,0xAF), o2(0x9D,0xB2), o2(0x9D,0xB4),
-     o2(0x8F,0xEF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_93 = {
-    to_SHIFT_JIS_E6_93_offsets,
-    to_SHIFT_JIS_E6_93_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_94_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_94 */
-  /* used from to_EUC_JP_E6_94 */
-      0, 20, 20, 20, 20,  1, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,    2, 20, 20, 20,  3,  4, 20, 20,
-     20, 20, 20,  5,  6, 20, 20, 20,   20, 20,  7,  8,  9, 20, 20, 10,
-     20, 20, 20, 20, 11, 12, 13, 14,   15, 16, 20, 17, 20, 20, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_94_infos[21] = {
-     o2(0x9D,0xB3), o2(0x9D,0xB7), o2(0x9D,0xB5), o2(0x9D,0xB6),
-     o2(0x9D,0x90), o2(0x9D,0xB9), o2(0x9D,0xB8), o2(0x9D,0x98),
-     o2(0x9D,0xBA), o2(0x9D,0xAE), o2(0x8E,0x78), o2(0x9D,0xBB),
-     o2(0x9D,0xBC), o2(0x9D,0xBE), o2(0x9D,0xBD), o2(0x9D,0xBF),
-     o2(0x89,0xFC), o2(0x8D,0x55), o2(0x95,0xFA), o2(0x90,0xAD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_94 = {
-    to_SHIFT_JIS_E6_94_offsets,
-    to_SHIFT_JIS_E6_94_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_95 */
-  /* used from to_EUC_JP_E6_95 */
-     23, 23, 23, 23, 23,  0, 23, 23,    1, 23, 23, 23, 23,  2,  3,  4,
-     23,  5, 23, 23, 23,  6,  7,  8,    9, 10, 23, 23, 23, 11, 12, 23,
-     23, 23, 13, 14, 23, 23, 15, 23,   23, 23, 23, 23, 16, 23, 23, 23,
-     17, 23, 18, 23, 19, 20, 23, 21,   22, 23, 23, 23, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_95_infos[24] = {
-     o2(0x8C,0xCC), o2(0x9D,0xC1), o2(0x9D,0xC4), o2(0xFA,0xCD),
-     o2(0x95,0x71), o2(0x8B,0x7E), o2(0x9D,0xC3), o2(0x9D,0xC2),
-     o2(0x94,0x73), o2(0x9D,0xC5), o2(0x8B,0xB3), o2(0x9D,0xC7),
-     o2(0x9D,0xC6), o2(0x8A,0xB8), o2(0x8E,0x55), o2(0x93,0xD6),
-     o2(0x8C,0x68), o2(0x90,0x94), o2(0x9D,0xC8), o2(0x90,0xAE),
-     o2(0x93,0x47), o2(0x95,0x7E), o2(0x9D,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_95 = {
-    to_SHIFT_JIS_E6_95_offsets,
-    to_SHIFT_JIS_E6_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_96 */
-  /* used from to_EUC_JP_E6_96 */
-     27, 27,  0,  1, 27, 27, 27,  2,    3,  4, 27, 27,  5, 27,  6, 27,
-      7,  8, 27, 27, 27, 27, 27,  9,   27, 10, 27, 11, 12, 27, 27, 13,
-     27, 14, 27, 27, 15, 16, 27, 17,   27, 27, 27, 18, 19, 20, 27, 21,
-     22, 27, 27, 27, 27, 27, 27, 23,   27, 24, 27, 27, 25, 26, 27, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_96_infos[28] = {
-     o2(0x9D,0xCA), o2(0x9D,0xCB), o2(0x95,0xB6), o2(0x9B,0x7C),
-     o2(0x90,0xC4), o2(0x95,0x6B), o2(0x8D,0xD6), o2(0x94,0xE3),
-     o2(0x94,0xC1), o2(0x93,0x6C), o2(0x97,0xBF), o2(0x9D,0xCD),
-     o2(0x8E,0xCE), o2(0x9D,0xCE), o2(0x88,0xB4), o2(0x8B,0xD2),
-     o2(0x90,0xCB), o2(0x95,0x80), o2(0x9D,0xCF), o2(0x8E,0x61),
-     o2(0x92,0x66), o2(0x8E,0x7A), o2(0x90,0x56), o2(0x9D,0xD0),
-     o2(0x95,0xFB), o2(0x89,0x97), o2(0x8E,0x7B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_96 = {
-    to_SHIFT_JIS_E6_96_offsets,
-    to_SHIFT_JIS_E6_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_97 */
-  /* used from to_EUC_JP_E6_97 */
-     25,  0, 25,  1,  2,  3,  4, 25,   25, 25, 25,  5,  6, 25, 25,  7,
-     25, 25,  8, 25, 25, 25, 25,  9,   25, 10, 25, 11, 25, 25, 25, 25,
-     12, 13, 14, 25, 25, 15, 16, 17,   18, 19, 25, 25, 20, 21, 25, 25,
-     25, 22, 25, 25, 25, 25, 25, 25,   25, 25, 23, 24, 25, 25, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_97_infos[26] = {
-     o2(0x9D,0xD3), o2(0x9D,0xD1), o2(0x9D,0xD4), o2(0x97,0xB7),
-     o2(0x9D,0xD2), o2(0x90,0xF9), o2(0x9D,0xD5), o2(0x91,0xB0),
-     o2(0x9D,0xD6), o2(0x8A,0xF8), o2(0x9D,0xD8), o2(0x9D,0xD7),
-     o2(0x9D,0xD9), o2(0x9D,0xDA), o2(0x8A,0xF9), o2(0x93,0xFA),
-     o2(0x92,0x55), o2(0x8B,0x8C), o2(0x8E,0x7C), o2(0x91,0x81),
-     o2(0x8F,0x7B), o2(0x88,0xAE), o2(0x9D,0xDB), o2(0x89,0xA0),
-     o2(0x9D,0xDF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_97 = {
-    to_SHIFT_JIS_E6_97_offsets,
-    to_SHIFT_JIS_E6_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_98 */
-  /* used from to_EUC_JP_E6_98 */
-      0, 31,  1,  2, 31, 31,  3,  4,   31,  5,  6, 31,  7, 31,  8,  9,
-     31, 31, 31, 10, 11, 12, 31, 31,   31, 31, 31, 31, 13, 31, 14, 15,
-     16, 31, 31, 31, 17, 18, 31, 19,   20, 31, 31, 31, 31, 21, 22, 23,
-     31, 24, 31, 31, 25, 26, 27, 31,   31, 31, 31, 28, 29, 31, 31, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_98_infos[32] = {
-     o2(0xFA,0xCE), o2(0x8D,0x56), o2(0x9D,0xDE), o2(0x8D,0xA9),
-     o2(0x8F,0xB8), o2(0xFA,0xD1), o2(0x9D,0xDD), o2(0x8F,0xB9),
-     o2(0x96,0xBE), o2(0x8D,0xA8), o2(0x88,0xD5), o2(0x90,0xCC),
-     o2(0xFA,0xCF), o2(0x9D,0xE4), o2(0xFA,0xD3), o2(0x90,0xAF),
-     o2(0x89,0x66), o2(0xFA,0xD4), o2(0x8F,0x74), o2(0x96,0x86),
-     o2(0x8D,0xF0), o2(0x8F,0xBA), o2(0xFA,0xD2), o2(0x90,0xA5),
-     o2(0xFA,0x63), o2(0x9D,0xE3), o2(0x9D,0xE1), o2(0x9D,0xE2),
-     o2(0xFA,0xD0), o2(0x92,0x8B), o2(0x9E,0x45),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_98 = {
-    to_SHIFT_JIS_E6_98_offsets,
-    to_SHIFT_JIS_E6_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_99 */
-  /* used from to_EUC_JP_E6_99 */
-     27,  0,  1,  2,  3, 27, 27, 27,   27,  4, 27,  5, 27, 27, 27,  6,
-     27, 27,  7, 27, 27, 27, 27,  8,   27,  9, 27, 27, 27, 10, 11, 12,
-     27, 27, 13, 27, 14, 15, 16, 17,   18, 19, 27, 27, 27, 27, 20, 21,
-     22, 27, 27, 23, 24, 27, 25, 27,   27, 27, 26, 27, 27, 27, 27, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_99_infos[28] = {
-     o2(0x9D,0xE8), o2(0x8E,0x9E), o2(0x8D,0x57), o2(0x9D,0xE6),
-     o2(0x9D,0xE7), o2(0x90,0x57), o2(0x9D,0xE5), o2(0x8E,0x4E),
-     o2(0xFA,0xD6), o2(0xFA,0xD7), o2(0x9D,0xEA), o2(0x9D,0xE9),
-     o2(0x9D,0xEE), o2(0x9D,0xEF), o2(0x9D,0xEB), o2(0xFA,0xD5),
-     o2(0x8A,0x41), o2(0x9D,0xEC), o2(0x9D,0xED), o2(0x94,0xD3),
-     o2(0x95,0x81), o2(0x8C,0x69), o2(0x9D,0xF0), o2(0xFA,0xD9),
-     o2(0x90,0xB0), o2(0x8F,0xBB), o2(0x92,0x71),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_99 = {
-    to_SHIFT_JIS_E6_99_offsets,
-    to_SHIFT_JIS_E6_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9A */
-  /* used from to_EUC_JP_E6_9A */
-     25,  0, 25,  1,  2, 25, 25,  3,    4,  5, 25, 25, 25, 25,  6, 25,
-     25,  7, 25, 25, 25, 25,  8,  9,   10, 11, 25, 25, 25, 12, 25, 25,
-     13, 25, 14, 25, 25, 25, 15, 25,   25, 25, 25, 16, 25, 25, 17, 25,
-     25, 25, 18, 25, 19, 25, 25, 25,   20, 21, 25, 25, 22, 25, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9A_infos[26] = {
-     o2(0x8B,0xC5), o2(0x9D,0xF1), o2(0x9D,0xF5), o2(0x89,0xC9),
-     o2(0x9D,0xF2), o2(0x9D,0xF4), o2(0x9D,0xF3), o2(0x8F,0x8B),
-     o2(0x92,0x67), o2(0x88,0xC3), o2(0x9D,0xF6), o2(0xFA,0xDA),
-     o2(0x9D,0xF7), o2(0xFA,0xDB), o2(0x92,0xA8), o2(0x97,0xEF),
-     o2(0x8E,0x62), o2(0x95,0xE9), o2(0xFA,0xDC), o2(0x96,0x5C),
-     o2(0x9E,0x41), o2(0x9D,0xF9), o2(0x9D,0xFC), o2(0x9D,0xFB),
-     o2(0xFA,0xDD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9A = {
-    to_SHIFT_JIS_E6_9A_offsets,
-    to_SHIFT_JIS_E6_9A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9B */
-  /* used from to_EUC_JP_E6_9B */
-     26,  0, 26, 26,  1, 26, 26,  2,   26,  3, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26,  4, 26,   26,  5,  6, 26,  7,  8, 26, 26,
-      9, 26, 26, 26, 26, 26, 10, 26,   26, 11, 26, 26, 26, 26, 26, 26,
-     12, 26, 13, 14, 15, 16, 26, 17,   18, 19, 20, 21, 22, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9B_infos[27] = {
-     o2(0x9D,0xF8), o2(0x9E,0x40), o2(0x93,0xDC), o2(0x9D,0xFA),
-     o2(0x9E,0x42), o2(0x8F,0x8C), o2(0x9E,0x43), o2(0x97,0x6A),
-     o2(0x94,0x98), o2(0x9E,0x44), o2(0x9E,0x46), o2(0x9E,0x47),
-     o2(0x9E,0x48), o2(0x8B,0xC8), o2(0x89,0x67), o2(0x8D,0x58),
-     o2(0x9E,0x49), o2(0x9E,0x4A), o2(0x8F,0x91), o2(0x91,0x82),
-     o2(0xFA,0xDE), o2(0xFA,0x66), o2(0x99,0xD6), o2(0x91,0x5D),
-     o2(0x91,0x5C), o2(0x91,0xD6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9B = {
-    to_SHIFT_JIS_E6_9B_offsets,
-    to_SHIFT_JIS_E6_9B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9C */
-  /* used from to_EUC_JP_E6_9C */
-      0, 32, 32,  1, 32, 32, 32, 32,    2,  3, 32,  4, 32,  5,  6,  7,
-     32, 32, 32, 32,  8,  9, 10, 11,   32, 32, 32, 12, 32, 13, 14, 15,
-     32, 32, 32, 32, 32, 32, 16, 17,   18, 32, 19, 20, 21, 22, 23, 32,
-     32, 24, 32, 32, 25, 32, 26, 27,   28, 32, 29, 32, 32, 30, 32, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9C_infos[33] = {
-     o2(0x8D,0xC5), o2(0x98,0xF0), o2(0x8C,0x8E), o2(0x97,0x4C),
-     o2(0x95,0xFC), o2(0x95,0x9E), o2(0xFA,0xDF), o2(0x9E,0x4B),
-     o2(0x8D,0xF1), o2(0x92,0xBD), o2(0x9E,0x4C), o2(0x98,0x4E),
-     o2(0x96,0x5D), o2(0x92,0xA9), o2(0x9E,0x4D), o2(0x8A,0xFA),
-     o2(0x9E,0x4E), o2(0x9E,0x4F), o2(0x96,0xD8), o2(0x96,0xA2),
-     o2(0x96,0x96), o2(0x96,0x7B), o2(0x8E,0x44), o2(0x9E,0x51),
-     o2(0x8E,0xE9), o2(0x96,0x70), o2(0x9E,0x53), o2(0x9E,0x56),
-     o2(0x9E,0x55), o2(0x8A,0xF7), o2(0x8B,0x80), o2(0x9E,0x52),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9C = {
-    to_SHIFT_JIS_E6_9C_offsets,
-    to_SHIFT_JIS_E6_9C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9D */
-  /* used from to_EUC_JP_E6_9D */
-     32,  0, 32, 32, 32, 32,  1, 32,   32,  2, 32, 32, 32, 32,  3,  4,
-      5,  6, 32,  7, 32, 32,  8, 32,   32,  9, 32, 32, 10, 32, 11, 12,
-     13, 14, 15, 16, 17, 18, 19, 32,   32, 32, 20, 32, 32, 21, 32, 22,
-     23, 24, 25, 26, 32, 27, 32, 28,   32, 32, 32, 32, 29, 32, 30, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9D_infos[33] = {
-     o2(0x9E,0x54), o2(0x9E,0x57), o2(0x90,0x99), o2(0x97,0x9B),
-     o2(0x88,0xC7), o2(0x8D,0xDE), o2(0x91,0xBA), o2(0x8E,0xDB),
-     o2(0x8F,0xF1), o2(0x9E,0x5A), o2(0x93,0x6D), o2(0x9E,0x58),
-     o2(0x91,0xA9), o2(0x9E,0x59), o2(0x8F,0xF0), o2(0x96,0xDB),
-     o2(0x9E,0x5B), o2(0x9E,0x5C), o2(0x97,0x88), o2(0xFA,0xE1),
-     o2(0x9E,0x61), o2(0x8D,0x59), o2(0x94,0x74), o2(0x9E,0x5E),
-     o2(0x93,0x8C), o2(0x9D,0xDC), o2(0x9D,0xE0), o2(0x8B,0x6E),
-     o2(0x94,0x66), o2(0x9E,0x60), o2(0x8F,0xBC), o2(0x94,0xC2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9D = {
-    to_SHIFT_JIS_E6_9D_offsets,
-    to_SHIFT_JIS_E6_9D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9E */
-  /* used from to_EUC_JP_E6_9E */
-     24, 24, 24, 24, 24,  0, 24,  1,   24,  2, 24,  3,  4, 24, 24, 24,
-      5, 24, 24, 24, 24,  6, 24,  7,   24, 24,  8, 24,  9, 10, 24, 24,
-     11, 12, 13, 24, 24, 24, 14, 24,   24, 15, 24, 24, 24, 24, 24, 16,
-     24, 24, 24, 17, 18, 24, 19, 20,   21, 22, 24, 23, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9E_infos[25] = {
-     o2(0x9E,0x66), o2(0x94,0xF8), o2(0x9E,0x5D), o2(0x9E,0x63),
-     o2(0x9E,0x62), o2(0x90,0xCD), o2(0x96,0x8D), o2(0x97,0xD1),
-     o2(0x96,0x87), o2(0x89,0xCA), o2(0x8E,0x7D), o2(0x98,0x67),
-     o2(0x9E,0x65), o2(0x90,0x95), o2(0x9E,0x64), o2(0x9E,0x5F),
-     o2(0x8C,0xCD), o2(0x9E,0x6B), o2(0x9E,0x69), o2(0x89,0xCB),
-     o2(0x9E,0x67), o2(0x9E,0x6D), o2(0x9E,0x73), o2(0xFA,0xE2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9E = {
-    to_SHIFT_JIS_E6_9E_offsets,
-    to_SHIFT_JIS_E6_9E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_9F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_9F */
-  /* used from to_EUC_JP_E6_9F */
-      0,  1, 29, 29,  2, 29,  3, 29,   29, 29,  4, 29, 29, 29,  5,  6,
-      7,  8, 29,  9, 10, 29, 29, 29,   11, 29, 12, 29, 29, 13, 14, 29,
-     29, 29, 15, 29, 16, 29, 29, 17,   29, 18, 29, 29, 19, 29, 20, 21,
-     29, 22, 29, 23, 24, 25, 29, 29,   29, 29, 29, 26, 29, 29, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_9F_infos[30] = {
-     o2(0xFA,0xE4), o2(0x91,0xC6), o2(0x95,0xBF), o2(0x9E,0x75),
-     o2(0x95,0x41), o2(0x9E,0x74), o2(0x94,0x90), o2(0x96,0x5E),
-     o2(0x8A,0xB9), o2(0x90,0xF5), o2(0x8F,0x5F), o2(0x92,0xD1),
-     o2(0x97,0x4D), o2(0x9E,0x70), o2(0x9E,0x6F), o2(0x9E,0x71),
-     o2(0x9E,0x6E), o2(0x9E,0x76), o2(0x9E,0x6C), o2(0x9E,0x6A),
-     o2(0x9E,0x72), o2(0x9E,0x68), o2(0x92,0x8C), o2(0x96,0xF6),
-     o2(0x8E,0xC4), o2(0x8D,0xF2), o2(0x8D,0xB8), o2(0x96,0x8F),
-     o2(0x8A,0x60),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_9F = {
-    to_SHIFT_JIS_E6_9F_offsets,
-    to_SHIFT_JIS_E6_9F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A0 */
-  /* used from to_EUC_JP_E6_A0 */
-     19,  0,  1,  2,  3, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  4, 19, 19,  5,  6,   19, 19, 19, 19, 19, 19,  7, 19,
-     19,  8,  9, 19, 19, 19, 19, 19,   19, 10, 11, 12, 19, 19, 19, 19,
-     19, 19, 13, 19, 14, 19, 19, 19,   15, 16, 19, 19, 17, 18, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A0_infos[20] = {
-     o2(0xFA,0xE5), o2(0x92,0xCC), o2(0x93,0xC8), o2(0x89,0x68),
-     o2(0x90,0xF0), o2(0x90,0xB2), o2(0x8C,0x49), o2(0x9E,0x78),
-     o2(0x8D,0x5A), o2(0x8A,0x9C), o2(0x9E,0x7A), o2(0x8A,0x94),
-     o2(0x9E,0x81), o2(0x9E,0x7D), o2(0x90,0xF1), o2(0x8A,0x6A),
-     o2(0x8D,0xAA), o2(0x8A,0x69), o2(0x8D,0xCD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A0 = {
-    to_SHIFT_JIS_E6_A0_offsets,
-    to_SHIFT_JIS_E6_A0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A1 */
-  /* used from to_EUC_JP_E6_A1 */
-      0,  1,  2,  3,  4, 25,  5, 25,    6, 25, 25, 25, 25,  7,  8, 25,
-      9, 10, 11, 12, 13, 25, 25, 25,   25, 14, 25, 25, 15, 16, 25, 17,
-     25, 25, 25, 18, 25, 25, 25, 19,   25, 25, 25, 25, 25, 25, 25, 25,
-     25, 25, 25, 25, 20, 25, 21, 22,   25, 25, 25, 25, 25, 25, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A1_infos[26] = {
-     o2(0x9E,0x7B), o2(0x8C,0x85), o2(0x8C,0x6A), o2(0x93,0x8D),
-     o2(0xFA,0xE6), o2(0x9E,0x79), o2(0x88,0xC4), o2(0x9E,0x7C),
-     o2(0x9E,0x7E), o2(0x8B,0xCB), o2(0x8C,0x4B), o2(0xFA,0xE3),
-     o2(0x8A,0xBA), o2(0x8B,0x6A), o2(0x9E,0x82), o2(0x8D,0xF7),
-     o2(0x96,0x91), o2(0x8E,0x56), o2(0x9E,0x83), o2(0x95,0x4F),
-     o2(0x9E,0x8F), o2(0x89,0xB1), o2(0x9E,0x84), o2(0x9E,0x95),
-     o2(0x9E,0x85),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A1 = {
-    to_SHIFT_JIS_E6_A1_offsets,
-    to_SHIFT_JIS_E6_A1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A2 */
-  /* used from to_EUC_JP_E6_A2 */
-     26,  0, 26,  1, 26,  2, 26, 26,   26, 26, 26, 26, 26,  3, 26,  4,
-     26, 26, 26,  5,  6, 26, 26,  7,   26, 26, 26,  8, 26,  9, 26, 10,
-     11, 26, 12, 26, 26, 26, 13, 14,   15, 26, 26, 26, 26, 16, 26, 17,
-     18, 19, 26, 20, 26, 21, 22, 26,   26, 23, 24, 26, 25, 26, 26, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A2_infos[27] = {
-     o2(0x97,0xC0), o2(0x9E,0x8C), o2(0x94,0x7E), o2(0x9E,0x94),
-     o2(0x9E,0x87), o2(0x88,0xB2), o2(0x9E,0x89), o2(0x8D,0x5B),
-     o2(0x9E,0x8B), o2(0x9E,0x8A), o2(0x9E,0x86), o2(0x9E,0x91),
-     o2(0x8F,0xBD), o2(0x9A,0xEB), o2(0x8C,0xE6), o2(0x97,0x9C),
-     o2(0x9E,0x88), o2(0x92,0xF2), o2(0x8A,0x42), o2(0x8D,0xAB),
-     o2(0x9E,0x80), o2(0x9E,0x90), o2(0x8A,0x81), o2(0x9E,0x8E),
-     o2(0x9E,0x92), o2(0x93,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A2 = {
-    to_SHIFT_JIS_E6_A2_offsets,
-    to_SHIFT_JIS_E6_A2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A3 */
-  /* used from to_EUC_JP_E6_A3 */
-     24, 24, 24, 24,  0, 24,  1, 24,    2,  3,  4,  5, 24,  6, 24,  7,
-     24, 24,  8, 24,  9, 10, 24, 11,   12, 24, 13, 24, 24, 24, 24, 14,
-     15, 16, 24, 17, 24, 24, 24, 18,   24, 24, 24, 24, 24, 24, 19, 20,
-     24, 24, 21, 24, 24, 24, 24, 24,   24, 22, 23, 24, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A3_infos[25] = {
-     o2(0x8A,0xFC), o2(0x9E,0xB0), o2(0xFA,0x64), o2(0x96,0xC7),
-     o2(0x9E,0x97), o2(0x8A,0xFB), o2(0x9E,0x9E), o2(0xFA,0xE7),
-     o2(0x96,0x5F), o2(0x9E,0x9F), o2(0x9E,0xA1), o2(0x9E,0xA5),
-     o2(0x9E,0x99), o2(0x92,0x49), o2(0x93,0x8F), o2(0x9E,0xA9),
-     o2(0x9E,0x9C), o2(0x9E,0xA6), o2(0x9E,0xA0), o2(0x90,0x58),
-     o2(0x9E,0xAA), o2(0x90,0xB1), o2(0x9E,0xA8), o2(0x8A,0xBB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A3 = {
-    to_SHIFT_JIS_E6_A3_offsets,
-    to_SHIFT_JIS_E6_A3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A4 */
-  /* used from to_EUC_JP_E6_A4 */
-      0,  1, 28, 28,  2,  3, 28, 28,    4, 28, 28,  5,  6,  7,  8,  9,
-     28, 28, 10, 28, 28, 28, 28, 28,   28, 11, 12, 13, 14, 28, 28, 28,
-     28, 15, 16, 17, 28, 18, 19, 28,   20, 28, 21, 28, 28, 28, 28, 28,
-     22, 28, 28, 28, 23, 28, 24, 28,   28, 25, 28, 28, 28, 26, 28, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A4_infos[29] = {
-     o2(0x98,0x6F), o2(0x9E,0x96), o2(0x9E,0xA4), o2(0x88,0xD6),
-     o2(0x9E,0x98), o2(0x96,0xB8), o2(0x9E,0x9D), o2(0x90,0x41),
-     o2(0x92,0xC5), o2(0x9E,0x93), o2(0x9E,0xA3), o2(0x90,0x9A),
-     o2(0x9E,0xAD), o2(0x8A,0x91), o2(0x8C,0x9F), o2(0x9E,0xAF),
-     o2(0x9E,0x9A), o2(0x9E,0xAE), o2(0x9E,0xA7), o2(0x9E,0x9B),
-     o2(0x9E,0xAB), o2(0x9E,0xAC), o2(0x9E,0xBD), o2(0x93,0xCC),
-     o2(0x9E,0xA2), o2(0x9E,0xB9), o2(0x9E,0xBB), o2(0x92,0xD6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A4 = {
-    to_SHIFT_JIS_E6_A4_offsets,
-    to_SHIFT_JIS_E6_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A5 */
-  /* used from to_EUC_JP_E6_A5 */
-     27, 27, 27, 27, 27, 27, 27, 27,   27, 27,  0, 27, 27, 27, 27, 27,
-     27, 27, 27,  1,  2,  3, 27, 27,   27,  4,  5, 27,  6,  7,  8, 27,
-      9, 10, 11, 27, 27, 27, 27, 27,   12, 27, 13, 14, 27, 15, 16, 17,
-     27, 27, 27, 18, 19, 20, 27, 21,   22, 23, 27, 27, 24, 25, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A5_infos[28] = {
-     o2(0x97,0x6B), o2(0x95,0x96), o2(0x9E,0xB6), o2(0x91,0xC8),
-     o2(0x9E,0xBC), o2(0x91,0x5E), o2(0x9E,0xB3), o2(0x9E,0xC0),
-     o2(0x9E,0xBF), o2(0x93,0xED), o2(0x9E,0xBE), o2(0x93,0xE8),
-     o2(0xFA,0xE9), o2(0x9E,0xC2), o2(0x9E,0xB5), o2(0x8B,0xC6),
-     o2(0x9E,0xB8), o2(0x8F,0x7C), o2(0x94,0x80), o2(0x9E,0xBA),
-     o2(0x8B,0xC9), o2(0x9E,0xB2), o2(0x9E,0xB4), o2(0x9E,0xB1),
-     o2(0x98,0x4F), o2(0x8A,0x79), o2(0x9E,0xB7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A5 = {
-    to_SHIFT_JIS_E6_A5_offsets,
-    to_SHIFT_JIS_E6_A5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A6 */
-  /* used from to_EUC_JP_E6_A6 */
-     19,  0,  1, 19, 19, 19, 19, 19,   19, 19,  2, 19, 19, 19,  3, 19,
-     19,  4, 19, 19,  5,  6, 19, 19,    7, 19, 19,  8,  9, 19, 19, 19,
-     10, 19, 19, 19, 19, 19, 19, 11,   19, 19, 19, 19, 19, 19, 12, 19,
-     19, 13, 14, 19, 15, 19, 19, 19,   19, 19, 19, 16, 19, 19, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A6_infos[20] = {
-     o2(0x9E,0xC1), o2(0x8A,0x54), o2(0x8D,0xE5), o2(0x89,0x7C),
-     o2(0x9E,0xD2), o2(0x98,0x50), o2(0x9E,0xD5), o2(0xFA,0xEB),
-     o2(0x90,0x59), o2(0x9E,0xD4), o2(0x9E,0xD3), o2(0x9E,0xD0),
-     o2(0x9E,0xC4), o2(0x9E,0xE1), o2(0x9E,0xC3), o2(0x9E,0xD6),
-     o2(0x9E,0xCE), o2(0x9E,0xC9), o2(0x9E,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A6 = {
-    to_SHIFT_JIS_E6_A6_offsets,
-    to_SHIFT_JIS_E6_A6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A7 */
-  /* used from to_EUC_JP_E6_A7 */
-     24,  0, 24,  1, 24, 24, 24,  2,   24, 24,  3,  4,  5,  6,  7, 24,
-      8, 24, 24,  9, 24, 24, 24, 24,   10, 11, 24, 24, 24, 12, 13, 24,
-     24, 24, 14, 24, 24, 24, 24, 15,   16, 24, 24, 17, 24, 18, 24, 24,
-     24, 24, 19, 24, 24, 24, 24, 24,   24, 20, 24, 21, 24, 22, 24, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A7_infos[25] = {
-     o2(0x9E,0xC7), o2(0x9E,0xCF), o2(0xEA,0xA0), o2(0x9E,0xCC),
-     o2(0x8D,0x5C), o2(0x92,0xC6), o2(0x91,0x84), o2(0x9E,0xCA),
-     o2(0x9E,0xC5), o2(0x9E,0xC8), o2(0x97,0x6C), o2(0x96,0x8A),
-     o2(0x9E,0xCD), o2(0x9E,0xD7), o2(0xFA,0xEC), o2(0x9E,0xDF),
-     o2(0x9E,0xD8), o2(0x9E,0xE5), o2(0x9E,0xE3), o2(0x9E,0xDE),
-     o2(0x9E,0xDD), o2(0x92,0xCE), o2(0x91,0x85), o2(0x9E,0xDB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A7 = {
-    to_SHIFT_JIS_E6_A7_offsets,
-    to_SHIFT_JIS_E6_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A8 */
-  /* used from to_EUC_JP_E6_A8 */
-     27, 27,  0, 27, 27,  1, 27, 27,   27, 27,  2,  3,  4, 27, 27, 27,
-     27, 27,  5,  6,  7, 27, 27,  8,   27,  9, 27, 10, 27, 27, 11, 12,
-     27, 13, 14, 15, 27, 27, 27, 27,   27, 16, 17, 18, 27, 27, 19, 27,
-     20, 27, 27, 27, 27, 21, 22, 27,   23, 24, 25, 27, 27, 26, 27, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A8_infos[28] = {
-     o2(0x9E,0xD9), o2(0x9E,0xE0), o2(0x9E,0xE6), o2(0x94,0xF3),
-     o2(0x9E,0xEC), o2(0x9E,0xE7), o2(0x9E,0xEA), o2(0x9E,0xE4),
-     o2(0x92,0x94), o2(0x95,0x57), o2(0x9E,0xDA), o2(0x9E,0xE2),
-     o2(0x8F,0xBE), o2(0x96,0xCD), o2(0x9E,0xF6), o2(0x9E,0xE9),
-     o2(0x8C,0xA0), o2(0x89,0xA1), o2(0x8A,0x7E), o2(0x9E,0xD1),
-     o2(0xFA,0xED), o2(0x8F,0xBF), o2(0x9E,0xEE), o2(0x9E,0xF5),
-     o2(0x8E,0xF7), o2(0x8A,0x92), o2(0x92,0x4D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A8 = {
-    to_SHIFT_JIS_E6_A8_offsets,
-    to_SHIFT_JIS_E6_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_A9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_A9 */
-  /* used from to_EUC_JP_E6_A9 */
-     17, 17, 17, 17,  0, 17,  1,  2,    3, 17, 17,  4, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,    5,  6, 17, 17, 17, 17, 17,  7,
-     17,  8,  9, 17, 17, 17, 10, 17,   17, 17, 17, 11, 17, 17, 17, 17,
-     17, 17, 12, 13, 17, 17, 17, 17,   14, 17, 17, 17, 17, 17, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_A9_infos[18] = {
-     o2(0x9E,0xEB), o2(0xFA,0xEF), o2(0x9E,0xF0), o2(0x9E,0xF4),
-     o2(0x8B,0xB4), o2(0x8B,0x6B), o2(0x9E,0xF2), o2(0x8B,0x40),
-     o2(0x93,0xC9), o2(0x9E,0xF1), o2(0x9E,0xF3), o2(0xFA,0xEE),
-     o2(0x9E,0xED), o2(0xFA,0xF0), o2(0x9E,0xEF), o2(0xFA,0xF1),
-     o2(0x8A,0x80),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_A9 = {
-    to_SHIFT_JIS_E6_A9_offsets,
-    to_SHIFT_JIS_E6_A9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AA */
-  /* used from to_EUC_JP_E6_AA */
-      0, 16, 16, 16,  1, 16, 16, 16,   16, 16, 16, 16, 16,  2,  3, 16,
-      4, 16, 16, 16, 16, 16, 16,  5,   16, 16, 16, 16,  6, 16, 16, 16,
-      7, 16,  8,  9, 16, 16, 16, 16,   16, 16, 10, 16, 11, 16, 12, 16,
-     16, 16, 16, 13, 16, 16, 16, 16,   14, 16, 16, 15, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AA_infos[17] = {
-     o2(0x92,0x68), o2(0x9E,0xFA), o2(0x9E,0xF8), o2(0x8C,0xE7),
-     o2(0x9E,0xF7), o2(0x9F,0x40), o2(0x9E,0x77), o2(0x9E,0xF9),
-     o2(0x9E,0xFB), o2(0x9E,0xFC), o2(0x9F,0x4B), o2(0x9F,0x47),
-     o2(0x9E,0x8D), o2(0x9F,0x46), o2(0x9F,0x45), o2(0x9F,0x42),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AA = {
-    to_SHIFT_JIS_E6_AA_offsets,
-    to_SHIFT_JIS_E6_AA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AB */
-  /* used from to_EUC_JP_E6_AB */
-     15,  0,  1,  2, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15,  3, 15,  4, 15, 15, 15, 15,   15, 15,  5,  6, 15, 15,  7,  8,
-     15, 15,  9, 15, 10, 15, 15, 15,   11, 15, 12, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 13, 14, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AB_infos[16] = {
-     o2(0x9E,0xE8), o2(0x9F,0x44), o2(0x9F,0x43), o2(0x9F,0x49),
-     o2(0x98,0x45), o2(0x9F,0x4C), o2(0x8B,0xF9), o2(0x9F,0x48),
-     o2(0x9F,0x4A), o2(0xFA,0xF2), o2(0xFA,0xF3), o2(0x94,0xA5),
-     o2(0x9F,0x4D), o2(0x9F,0x51), o2(0x9F,0x4E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AB = {
-    to_SHIFT_JIS_E6_AB_offsets,
-    to_SHIFT_JIS_E6_AB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AC */
-  /* used from to_EUC_JP_E6_AC */
-     18, 18, 18, 18,  0,  1, 18, 18,   18, 18,  2, 18, 18, 18, 18, 18,
-     18, 18,  3, 18, 18, 18,  4, 18,   18, 18, 18, 18, 18,  5, 18,  6,
-      7,  8, 18,  9, 18, 18, 18, 10,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 11, 18, 18, 18, 18, 12,   13, 14, 15, 18, 18, 16, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AC_infos[19] = {
-     o2(0x97,0x93), o2(0x9F,0x4F), o2(0x9E,0xDC), o2(0x9F,0x52),
-     o2(0x9F,0x53), o2(0x89,0x54), o2(0x9F,0x55), o2(0x8C,0x87),
-     o2(0x8E,0x9F), o2(0x8B,0xD3), o2(0x89,0xA2), o2(0x97,0x7E),
-     o2(0x9F,0x57), o2(0x9F,0x56), o2(0x9F,0x59), o2(0x8B,0x5C),
-     o2(0x8B,0xD4), o2(0x8A,0xBC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AC = {
-    to_SHIFT_JIS_E6_AC_offsets,
-    to_SHIFT_JIS_E6_AC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AD */
-  /* used from to_EUC_JP_E6_AD */
-     25, 25, 25,  0, 25, 25, 25,  1,   25,  2, 25, 25,  3, 25,  4, 25,
-      5, 25, 25,  6,  7, 25, 25, 25,   25,  8, 25,  9, 25, 25, 25, 10,
-     25, 11, 12, 13, 14, 25, 15, 25,   25, 16, 17, 25, 25, 25, 25, 18,
-     25, 25, 25, 19, 20, 25, 25, 25,   21, 22, 25, 23, 25, 25, 25, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AD_infos[26] = {
-     o2(0x9F,0x5C), o2(0x9F,0x5B), o2(0x9F,0x5D), o2(0x89,0xCC),
-     o2(0x92,0x56), o2(0x9F,0x5E), o2(0x8A,0xBD), o2(0x9F,0x60),
-     o2(0x9F,0x5F), o2(0x9F,0x61), o2(0x9F,0x62), o2(0x9F,0x63),
-     o2(0x8E,0x7E), o2(0x90,0xB3), o2(0x8D,0x9F), o2(0x95,0x90),
-     o2(0x95,0xE0), o2(0x98,0x63), o2(0x8E,0x95), o2(0x8D,0xCE),
-     o2(0x97,0xF0), o2(0x9F,0x64), o2(0x9F,0x65), o2(0x8E,0x80),
-     o2(0x9F,0x66),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AD = {
-    to_SHIFT_JIS_E6_AD_offsets,
-    to_SHIFT_JIS_E6_AD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AE */
-  /* used from to_EUC_JP_E6_AE */
-      0, 26, 26,  1,  2, 26,  3, 26,   26,  4,  5,  6, 26,  7, 26, 26,
-     26, 26, 26, 26, 26,  8,  9, 26,   10, 26, 26, 26, 26, 26, 11, 26,
-     26, 26, 26, 26, 12, 26, 26, 26,   26, 26, 13, 14, 26, 26, 26, 15,
-     26, 16, 17, 18, 19, 20, 26, 21,   26, 26, 22, 23, 24, 26, 26, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AE_infos[27] = {
-     o2(0x9F,0x67), o2(0x9F,0x69), o2(0x9F,0x68), o2(0x96,0x77),
-     o2(0x8F,0x7D), o2(0x8E,0xEA), o2(0x8E,0x63), o2(0x9F,0x6A),
-     o2(0x9F,0x6C), o2(0x90,0x42), o2(0x9F,0x6B), o2(0x9F,0x6D),
-     o2(0x9F,0x6E), o2(0x9F,0x6F), o2(0x9F,0x70), o2(0x9F,0x71),
-     o2(0x9F,0x73), o2(0x9F,0x72), o2(0x9F,0x74), o2(0x89,0xA3),
-     o2(0x92,0x69), o2(0x9F,0x75), o2(0x8E,0x45), o2(0x8A,0x6B),
-     o2(0x9F,0x76), o2(0x93,0x61),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AE = {
-    to_SHIFT_JIS_E6_AE_offsets,
-    to_SHIFT_JIS_E6_AE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_AF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_AF */
-  /* used from to_EUC_JP_E6_AF */
-      0, 17, 17, 17, 17,  1,  2, 17,   17, 17, 17,  3, 17,  4,  5, 17,
-     17, 17,  6,  7,  8, 17,  9, 17,   10, 17, 17, 11, 17, 17, 17, 12,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17, 13, 14, 17, 17, 15,
-     17, 17, 17, 16, 17, 17, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_AF_infos[18] = {
-     o2(0x9A,0xCA), o2(0x8B,0x42), o2(0x9F,0x77), o2(0x9F,0x78),
-     o2(0x95,0xEA), o2(0x96,0x88), o2(0x93,0xC5), o2(0x9F,0x79),
-     o2(0x94,0xE4), o2(0xFA,0xF4), o2(0x94,0xF9), o2(0x96,0xD1),
-     o2(0x9F,0x7A), o2(0x9F,0x7C), o2(0x9F,0x7B), o2(0x9F,0x7E),
-     o2(0x9F,0x7D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_AF = {
-    to_SHIFT_JIS_E6_AF_offsets,
-    to_SHIFT_JIS_E6_AF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B0 */
-  /* used from to_EUC_JP_E6_B0 */
-     14, 14, 14, 14, 14, 14, 14, 14,    0, 14, 14, 14, 14, 14, 14,  1,
-     14,  2, 14,  3,  4, 14, 14,  5,   14, 14, 14,  6, 14, 14, 14, 14,
-     14, 14, 14,  7,  8, 14, 14, 14,   14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14,  9, 14, 14, 10,   11, 14, 14, 14, 14, 14, 12, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B0_infos[15] = {
-     o2(0x9F,0x81), o2(0x8E,0x81), o2(0x96,0xAF), o2(0x9F,0x82),
-     o2(0x9F,0x83), o2(0x8B,0x43), o2(0x9F,0x84), o2(0x9F,0x86),
-     o2(0x9F,0x85), o2(0x90,0x85), o2(0x95,0x58), o2(0x89,0x69),
-     o2(0x94,0xC3), o2(0xFA,0xF5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B0 = {
-    to_SHIFT_JIS_E6_B0_offsets,
-    to_SHIFT_JIS_E6_B0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B1 */
-  /* used from to_EUC_JP_E6_B1 */
-      0,  1,  2, 23, 23, 23, 23, 23,   23, 23, 23, 23, 23, 23,  3, 23,
-      4, 23, 23, 23, 23,  5, 23,  6,   23, 23,  7, 23,  8,  9, 10, 11,
-     12, 23, 13, 23, 23, 23, 23, 23,   14, 23, 15, 23, 23, 23, 23, 16,
-     17, 23, 18, 19, 23, 23, 23, 23,   23, 23, 20, 23, 23, 21, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B1_infos[24] = {
-     o2(0x92,0xF3), o2(0x8F,0x60), o2(0x8B,0x81), o2(0x94,0xC4),
-     o2(0x8E,0xAC), o2(0x9F,0x88), o2(0x8A,0xBE), o2(0x89,0x98),
-     o2(0xFA,0xF6), o2(0x93,0xF0), o2(0x9F,0x87), o2(0x8D,0x5D),
-     o2(0x92,0x72), o2(0x9F,0x89), o2(0x9F,0x91), o2(0x9F,0x8A),
-     o2(0xFA,0xF8), o2(0x91,0xBF), o2(0x8B,0x82), o2(0x9F,0x92),
-     o2(0x8C,0x88), o2(0x8B,0x44), o2(0x9F,0x90),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B1 = {
-    to_SHIFT_JIS_E6_B1_offsets,
-    to_SHIFT_JIS_E6_B1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B2 */
-  /* used from to_EUC_JP_E6_B2 */
-     28,  0,  1,  2, 28, 28,  3, 28,    4, 28, 28, 28,  5,  6, 28, 28,
-      7, 28,  8,  9, 28, 28, 10, 28,   28, 11, 12, 13, 28, 28, 28, 28,
-     28, 14, 15, 28, 28, 28, 28, 28,   28, 28, 28, 16, 28, 28, 17, 28,
-     28, 18, 28, 19, 28, 28, 28, 28,   20, 21, 22, 23, 24, 25, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B2_infos[29] = {
-     o2(0x9F,0x8E), o2(0x9F,0x8B), o2(0x97,0x80), o2(0xFA,0xF7),
-     o2(0x92,0xBE), o2(0x93,0xD7), o2(0x9F,0x8C), o2(0x9F,0x94),
-     o2(0x9F,0x93), o2(0x8C,0x42), o2(0x89,0xAB), o2(0x8D,0xB9),
-     o2(0x9F,0x8D), o2(0x9F,0x8F), o2(0x96,0x76), o2(0x91,0xF2),
-     o2(0x96,0x97), o2(0x9F,0x9C), o2(0x9F,0x9D), o2(0x89,0xCD),
-     o2(0x95,0xA6), o2(0x96,0xFB), o2(0x9F,0x9F), o2(0x8E,0xA1),
-     o2(0x8F,0xC0), o2(0x9F,0x98), o2(0x9F,0x9E), o2(0x89,0x88),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B2 = {
-    to_SHIFT_JIS_E6_B2_offsets,
-    to_SHIFT_JIS_E6_B2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B3 */
-  /* used from to_EUC_JP_E6_B3 */
-     23,  0, 23, 23,  1,  2, 23, 23,   23,  3,  4, 23,  5, 23, 23, 23,
-     23, 23, 23,  6, 23,  7, 23,  8,   23,  9, 10, 11, 23, 12, 23, 23,
-     23, 13, 14, 15, 23, 16, 23, 23,   17, 23, 18, 23, 23, 23, 23, 19,
-     20, 21, 23, 22, 23, 23, 23, 23,   23, 23, 23, 23, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B3_infos[24] = {
-     o2(0x8B,0xB5), o2(0x9F,0x95), o2(0x9F,0x9A), o2(0x90,0xF2),
-     o2(0x94,0x91), o2(0x94,0xE5), o2(0x9F,0x97), o2(0x96,0x40),
-     o2(0x9F,0x99), o2(0x9F,0xA2), o2(0xFA,0xF9), o2(0x9F,0xA0),
-     o2(0x9F,0x9B), o2(0x96,0x41), o2(0x94,0x67), o2(0x8B,0x83),
-     o2(0x93,0x44), o2(0x92,0x8D), o2(0x9F,0xA3), o2(0x9F,0xA1),
-     o2(0x91,0xD7), o2(0x9F,0x96), o2(0x89,0x6A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B3 = {
-    to_SHIFT_JIS_E6_B3_offsets,
-    to_SHIFT_JIS_E6_B3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B4 */
-  /* used from to_EUC_JP_E6_B4 */
-     21, 21, 21, 21,  0, 21, 21, 21,   21, 21, 21,  1,  2, 21, 21, 21,
-     21, 21,  3, 21, 21, 21, 21,  4,   21,  5, 21,  6, 21, 21,  7,  8,
-     21, 21, 21, 21, 21,  9, 21, 21,   21, 10, 11, 12, 21, 21, 21, 21,
-     21, 21, 13, 14, 21, 15, 16, 21,   17, 21, 21, 18, 21, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B4_infos[22] = {
-     o2(0xFA,0xFA), o2(0x97,0x6D), o2(0x9F,0xAE), o2(0x9F,0xAD),
-     o2(0x90,0xF4), o2(0x9F,0xAA), o2(0x97,0x8C), o2(0x93,0xB4),
-     o2(0x9F,0xA4), o2(0x92,0xC3), o2(0x89,0x6B), o2(0x8D,0x5E),
-     o2(0x9F,0xA7), o2(0x8F,0x46), o2(0x9F,0xAC), o2(0x9F,0xAB),
-     o2(0x9F,0xA6), o2(0x9F,0xA9), o2(0x8A,0x88), o2(0x9F,0xA8),
-     o2(0x94,0x68),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B4 = {
-    to_SHIFT_JIS_E6_B4_offsets,
-    to_SHIFT_JIS_E6_B4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B5 */
-  /* used from to_EUC_JP_E6_B5 */
-     18,  0, 18, 18,  1,  2, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18,  3,  4, 18,  5, 18, 18, 18,
-     18, 18, 18,  6,  7, 18,  8, 18,   18,  9, 10, 18, 11, 18, 12, 13,
-     18, 18, 18, 18, 14, 18, 18, 15,   16, 17, 18, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B5_infos[19] = {
-     o2(0x97,0xAC), o2(0x8F,0xF2), o2(0x90,0xF3), o2(0x9F,0xB4),
-     o2(0x9F,0xB2), o2(0x95,0x6C), o2(0x9F,0xAF), o2(0x9F,0xB1),
-     o2(0x89,0x59), o2(0x8D,0x5F), o2(0x98,0x51), o2(0x8A,0x5C),
-     o2(0x95,0x82), o2(0xFA,0xFC), o2(0x97,0x81), o2(0x8A,0x43),
-     o2(0x90,0x5A), o2(0x9F,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B5 = {
-    to_SHIFT_JIS_E6_B5_offsets,
-    to_SHIFT_JIS_E6_B5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B6 */
-  /* used from to_EUC_JP_E6_B6 */
-     17, 17, 17, 17, 17,  0, 17,  1,    2, 17, 17, 17,  3, 17,  4, 17,
-     17, 17, 17,  5, 17,  6,  7, 17,   17,  8, 17,  9, 10, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 11, 17, 17, 12,
-     17, 17, 13, 17, 17, 14, 17, 17,   15, 17, 17, 17, 16, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B6_infos[18] = {
-     o2(0x9F,0xB8), o2(0xFA,0xFB), o2(0x8F,0xC1), o2(0x97,0x4F),
-     o2(0x9F,0xB5), o2(0x9F,0xB0), o2(0x9F,0xB6), o2(0xFB,0x40),
-     o2(0x97,0xDC), o2(0x93,0x93), o2(0x93,0xC0), o2(0xFB,0x41),
-     o2(0x8A,0x55), o2(0x89,0x74), o2(0x9F,0xBC), o2(0x9F,0xBF),
-     o2(0x97,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B6 = {
-    to_SHIFT_JIS_E6_B6_offsets,
-    to_SHIFT_JIS_E6_B6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B7 */
-  /* used from to_EUC_JP_E6_B7 */
-      0, 31, 31, 31, 31,  1,  2,  3,   31, 31, 31,  4,  5, 31, 31,  6,
-     31,  7,  8, 31, 31,  9, 31, 31,   10, 11, 31, 31, 31, 31, 12, 31,
-     31, 13, 31, 31, 14, 31, 15, 31,   16, 31, 17, 18, 19, 31, 20, 31,
-     31, 21, 22, 23, 31, 24, 31, 25,   26, 27, 28, 29, 30, 31, 31, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B7_infos[32] = {
-     o2(0x97,0x84), o2(0x9F,0xC6), o2(0x9F,0xC0), o2(0x9F,0xBD),
-     o2(0x97,0xD2), o2(0x9F,0xC3), o2(0xFB,0x42), o2(0x8F,0x69),
-     o2(0x9F,0xC5), o2(0x9F,0xCA), o2(0x93,0x91), o2(0x9F,0xC8),
-     o2(0x9F,0xC2), o2(0x92,0x57), o2(0x9F,0xC9), o2(0x9F,0xBE),
-     o2(0x9F,0xC4), o2(0x9F,0xCB), o2(0x88,0xFA), o2(0x9F,0xC1),
-     o2(0x9F,0xCC), o2(0x90,0x5B), o2(0xFB,0x44), o2(0x8F,0x7E),
-     o2(0x95,0xA3), o2(0x8D,0xAC), o2(0xFB,0x43), o2(0x9F,0xB9),
-     o2(0x9F,0xC7), o2(0x93,0x59), o2(0xFB,0x45),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B7 = {
-    to_SHIFT_JIS_E6_B7_offsets,
-    to_SHIFT_JIS_E6_B7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B8 */
-  /* used from to_EUC_JP_E6_B8 */
-     31, 31, 31, 31, 31,  0, 31,  1,    2,  3,  4,  5, 31, 31, 31, 31,
-     31, 31, 31,  6, 31,  7, 31, 31,   31,  8,  9, 10, 31, 11, 31, 12,
-     13, 14, 31, 15, 16, 17, 18, 19,   31, 20, 31, 21, 22, 23, 24, 25,
-     31, 31, 31, 31, 31, 31, 31, 31,   26, 27, 28, 31, 29, 31, 30, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B8_infos[32] = {
-     o2(0x90,0xB4), o2(0x8A,0x89), o2(0x8D,0xCF), o2(0x8F,0xC2),
-     o2(0x9F,0xBB), o2(0x8F,0x61), o2(0x8C,0x6B), o2(0x9F,0xBA),
-     o2(0x9F,0xD0), o2(0x8F,0x8D), o2(0x8C,0xB8), o2(0x9F,0xDF),
-     o2(0x9F,0xD9), o2(0x8B,0x94), o2(0x93,0x6E), o2(0x9F,0xD4),
-     o2(0x9F,0xDD), o2(0x88,0xAD), o2(0x89,0x51), o2(0xFB,0x48),
-     o2(0x89,0xB7), o2(0x9F,0xD6), o2(0x91,0xAA), o2(0x9F,0xCD),
-     o2(0x9F,0xCF), o2(0x8D,0x60), o2(0x9F,0xE0), o2(0xFB,0x46),
-     o2(0x9F,0xDB), o2(0xFB,0x49), o2(0x9F,0xD3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B8 = {
-    to_SHIFT_JIS_E6_B8_offsets,
-    to_SHIFT_JIS_E6_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_B9 */
-  /* used from to_EUC_JP_E6_B9 */
-     17, 17, 17,  0, 17, 17, 17, 17,   17, 17,  1, 17, 17,  2,  3, 17,
-     17, 17, 17, 17, 17, 17,  4, 17,    5, 17, 17,  6,  7, 17, 17,  8,
-     17, 17, 17, 17, 17, 17, 17,  9,   17, 17, 17, 10, 17, 17, 11, 12,
-     17, 17, 13, 17, 17, 17, 14, 17,   17, 17, 17, 17, 17, 17, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_B9_infos[18] = {
-     o2(0x9F,0xDA), o2(0x96,0xA9), o2(0x9F,0xD8), o2(0x9F,0xDC),
-     o2(0x8C,0xCE), o2(0x8F,0xC3), o2(0x92,0x58), o2(0xFB,0x47),
-     o2(0x9F,0xD2), o2(0x97,0x4E), o2(0x9F,0xD5), o2(0x9F,0xCE),
-     o2(0x93,0x92), o2(0x9F,0xD1), o2(0x9F,0xD7), o2(0x98,0x70),
-     o2(0x8E,0xBC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_B9 = {
-    to_SHIFT_JIS_E6_B9_offsets,
-    to_SHIFT_JIS_E6_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BA */
-  /* used from to_EUC_JP_E6_BA */
-      0, 20,  1, 20, 20, 20, 20, 20,   20, 20, 20, 20,  2, 20, 20,  3,
-      4, 20, 20, 20, 20, 20,  5, 20,    6, 20, 20, 20,  7,  8, 20,  9,
-     20, 20, 10, 20, 20, 11, 20, 20,   20, 20, 12, 20, 20, 20, 20, 13,
-     20, 20, 14, 20, 20, 20, 15, 16,   20, 20, 17, 20, 20, 18, 20, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BA_infos[21] = {
-     o2(0x96,0x9E), o2(0x9F,0xE1), o2(0x94,0xAC), o2(0x9F,0xED),
-     o2(0x8C,0xB9), o2(0x8F,0x80), o2(0x9F,0xE3), o2(0x97,0xAD),
-     o2(0x8D,0x61), o2(0x9F,0xF0), o2(0x88,0xEC), o2(0x9F,0xEE),
-     o2(0x9F,0xE2), o2(0x9F,0xE8), o2(0x9F,0xEA), o2(0x97,0x6E),
-     o2(0x9F,0xE5), o2(0x93,0x4D), o2(0x9F,0xE7), o2(0xFB,0x4A),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BA = {
-    to_SHIFT_JIS_E6_BA_offsets,
-    to_SHIFT_JIS_E6_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BB */
-  /* used from to_EUC_JP_E6_BB */
-     20, 20,  0, 20,  1,  2, 20, 20,   20,  3, 20,  4,  5, 20, 20, 20,
-     20,  6, 20,  7,  8,  9, 20, 20,   20, 20, 20, 20, 20, 10, 11, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 12, 20, 20, 13,
-     20, 20, 14, 20, 15, 20, 20, 16,   17, 20, 20, 20, 20, 20, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BB_infos[21] = {
-     o2(0x9F,0xEF), o2(0x9F,0xE9), o2(0x96,0xC5), o2(0x9F,0xE4),
-     o2(0x8E,0xA0), o2(0x9F,0xFC), o2(0x8A,0x8A), o2(0x9F,0xE6),
-     o2(0x9F,0xEB), o2(0x9F,0xEC), o2(0x91,0xEA), o2(0x91,0xD8),
-     o2(0x9F,0xF4), o2(0x9F,0xFA), o2(0x9F,0xF8), o2(0x93,0x48),
-     o2(0xE0,0x42), o2(0x9F,0xF5), o2(0x9F,0xF6), o2(0x9F,0xDE),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BB = {
-    to_SHIFT_JIS_E6_BB_offsets,
-    to_SHIFT_JIS_E6_BB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BC */
-  /* used from to_EUC_JP_E6_BC */
-     19,  0,  1, 19, 19, 19,  2, 19,   19,  3, 19, 19, 19, 19, 19,  4,
-     19,  5, 19,  6,  7,  8, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-      9, 19, 10, 11, 19, 19, 19, 19,   19, 19, 19, 12, 13, 19, 19, 19,
-     19, 14, 15, 19, 19, 19, 19, 19,   16, 19, 19, 19, 19, 19, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BC_infos[20] = {
-     o2(0x8B,0x99), o2(0x95,0x59), o2(0x8E,0xBD), o2(0x8D,0x97),
-     o2(0x98,0x52), o2(0x9F,0xF2), o2(0xE0,0x41), o2(0x89,0x89),
-     o2(0x91,0x86), o2(0x94,0x99), o2(0x8A,0xBF), o2(0x97,0xF8),
-     o2(0x96,0x9F), o2(0x92,0xD0), o2(0x9F,0xF9), o2(0x9F,0xFB),
-     o2(0x91,0x51), o2(0xE0,0x40), o2(0x9F,0xF7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BC = {
-    to_SHIFT_JIS_E6_BC_offsets,
-    to_SHIFT_JIS_E6_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BD */
-  /* used from to_EUC_JP_E6_BD */
-     17,  0, 17, 17, 17,  1, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17,  2, 17, 17, 17,    3, 17, 17,  4,  5, 17, 17,  6,
-     17, 17, 17, 17,  7, 17,  8, 17,   17, 17, 17, 17, 17,  9, 10, 11,
-     12, 17, 17, 17, 13, 17, 17, 17,   14, 17, 15, 17, 16, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BD_infos[18] = {
-     o2(0x9F,0xF1), o2(0x8A,0xC1), o2(0x8C,0x89), o2(0xE0,0x4E),
-     o2(0xE0,0x49), o2(0x90,0xF6), o2(0x8A,0x83), o2(0x8F,0x81),
-     o2(0xE0,0x52), o2(0xE0,0x4B), o2(0x92,0xAA), o2(0xE0,0x48),
-     o2(0x92,0xD7), o2(0xE0,0x6B), o2(0xE0,0x45), o2(0xE0,0x44),
-     o2(0xE0,0x4D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BD = {
-    to_SHIFT_JIS_E6_BD_offsets,
-    to_SHIFT_JIS_E6_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BE */
-  /* used from to_EUC_JP_E6_BE */
-      0,  1,  2, 17,  3, 17,  4, 17,    5, 17, 17, 17, 17, 17,  6, 17,
-     17,  7, 17, 17, 17, 17, 17,  8,   17, 17, 17, 17, 17, 17, 17, 17,
-     17,  9, 17, 10, 11, 17, 17, 17,   17, 17, 12, 17, 17, 17, 17, 17,
-     17, 13, 17, 14, 17, 15, 17, 17,   17, 16, 17, 17, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BE_infos[18] = {
-     o2(0xE0,0x47), o2(0xE0,0x46), o2(0xE0,0x4C), o2(0x90,0x9F),
-     o2(0xE0,0x43), o2(0xFB,0x4B), o2(0xE0,0x4F), o2(0xE0,0x50),
-     o2(0x8A,0xC0), o2(0xE0,0x55), o2(0xE0,0x54), o2(0xE0,0x56),
-     o2(0xE0,0x59), o2(0x93,0x62), o2(0xE0,0x53), o2(0xFB,0x4C),
-     o2(0xE0,0x57),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BE = {
-    to_SHIFT_JIS_E6_BE_offsets,
-    to_SHIFT_JIS_E6_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E6_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E6_BF */
-  /* used from to_EUC_JP_E6_BF */
-      0,  1,  2,  3, 23, 23,  4, 23,   23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23,  5,  6, 23, 23,    7, 23, 23,  8, 23, 23, 23,  9,
-     10, 11, 23, 23, 12, 23, 23, 23,   23, 23, 23, 13, 14, 23, 15, 16,
-     23, 17, 23, 18, 23, 19, 20, 23,   23, 23, 21, 23, 23, 23, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_BF_infos[24] = {
-     o2(0x8C,0x83), o2(0x91,0xF7), o2(0xE0,0x51), o2(0x94,0x5A),
-     o2(0xE0,0x58), o2(0xE0,0x5D), o2(0xE0,0x5B), o2(0xE0,0x5E),
-     o2(0xE0,0x61), o2(0xE0,0x5A), o2(0x8D,0x8A), o2(0x94,0x47),
-     o2(0x9F,0xB7), o2(0x97,0x94), o2(0xE0,0x5C), o2(0xE0,0x60),
-     o2(0x91,0xF3), o2(0xE0,0x5F), o2(0xE0,0x4A), o2(0xFB,0x4D),
-     o2(0xE8,0x89), o2(0xE0,0x64), o2(0xE0,0x68),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6_BF = {
-    to_SHIFT_JIS_E6_BF_offsets,
-    to_SHIFT_JIS_E6_BF_infos
-};
-
-static const struct byte_lookup* const
-to_SHIFT_JIS_E6_infos[64] = {
-     &to_SHIFT_JIS_E6_80, &to_SHIFT_JIS_E6_81,
-     &to_SHIFT_JIS_E6_82, &to_SHIFT_JIS_E6_83,
-     &to_SHIFT_JIS_E6_84, &to_SHIFT_JIS_E6_85,
-     &to_SHIFT_JIS_E6_86, &to_SHIFT_JIS_E6_87,
-     &to_SHIFT_JIS_E6_88, &to_SHIFT_JIS_E6_89,
-     &to_SHIFT_JIS_E6_8A, &to_SHIFT_JIS_E6_8B,
-     &to_SHIFT_JIS_E6_8C, &to_SHIFT_JIS_E6_8D,
-     &to_SHIFT_JIS_E6_8E, &to_SHIFT_JIS_E6_8F,
-     &to_SHIFT_JIS_E6_90, &to_SHIFT_JIS_E6_91,
-     &to_SHIFT_JIS_E6_92, &to_SHIFT_JIS_E6_93,
-     &to_SHIFT_JIS_E6_94, &to_SHIFT_JIS_E6_95,
-     &to_SHIFT_JIS_E6_96, &to_SHIFT_JIS_E6_97,
-     &to_SHIFT_JIS_E6_98, &to_SHIFT_JIS_E6_99,
-     &to_SHIFT_JIS_E6_9A, &to_SHIFT_JIS_E6_9B,
-     &to_SHIFT_JIS_E6_9C, &to_SHIFT_JIS_E6_9D,
-     &to_SHIFT_JIS_E6_9E, &to_SHIFT_JIS_E6_9F,
-     &to_SHIFT_JIS_E6_A0, &to_SHIFT_JIS_E6_A1,
-     &to_SHIFT_JIS_E6_A2, &to_SHIFT_JIS_E6_A3,
-     &to_SHIFT_JIS_E6_A4, &to_SHIFT_JIS_E6_A5,
-     &to_SHIFT_JIS_E6_A6, &to_SHIFT_JIS_E6_A7,
-     &to_SHIFT_JIS_E6_A8, &to_SHIFT_JIS_E6_A9,
-     &to_SHIFT_JIS_E6_AA, &to_SHIFT_JIS_E6_AB,
-     &to_SHIFT_JIS_E6_AC, &to_SHIFT_JIS_E6_AD,
-     &to_SHIFT_JIS_E6_AE, &to_SHIFT_JIS_E6_AF,
-     &to_SHIFT_JIS_E6_B0, &to_SHIFT_JIS_E6_B1,
-     &to_SHIFT_JIS_E6_B2, &to_SHIFT_JIS_E6_B3,
-     &to_SHIFT_JIS_E6_B4, &to_SHIFT_JIS_E6_B5,
-     &to_SHIFT_JIS_E6_B6, &to_SHIFT_JIS_E6_B7,
-     &to_SHIFT_JIS_E6_B8, &to_SHIFT_JIS_E6_B9,
-     &to_SHIFT_JIS_E6_BA, &to_SHIFT_JIS_E6_BB,
-     &to_SHIFT_JIS_E6_BC, &to_SHIFT_JIS_E6_BD,
-     &to_SHIFT_JIS_E6_BE, &to_SHIFT_JIS_E6_BF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E6 = {
-    to_SHIFT_JIS_E5_offsets,
-    to_SHIFT_JIS_E6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_80 */
-  /* used from to_EUC_JP_E7_80 */
-     21,  0, 21, 21, 21,  1, 21,  2,   21,  3, 21,  4, 21, 21, 21,  5,
-     21,  6, 21, 21, 21,  7, 21, 21,    8, 21,  9, 10, 21, 11, 12, 13,
-     21, 21, 21, 21, 21, 21, 14, 15,   16, 21, 21, 21, 17, 21, 21, 21,
-     18, 21, 19, 21, 21, 21, 21, 21,   21, 21, 21, 21, 21, 21, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_80_infos[22] = {
-     o2(0xE0,0x66), o2(0xFB,0x4E), o2(0xFB,0x4F), o2(0xE0,0x62),
-     o2(0xE0,0x63), o2(0xE0,0x67), o2(0xE0,0x65), o2(0x95,0x6D),
-     o2(0xE0,0x6D), o2(0xE0,0x6A), o2(0xE0,0x69), o2(0xE0,0x6C),
-     o2(0x93,0xD2), o2(0xE0,0x6E), o2(0x92,0x95), o2(0x91,0xEB),
-     o2(0xFB,0x50), o2(0x90,0xA3), o2(0xE0,0x6F), o2(0xE0,0x71),
-     o2(0xE0,0x70),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_80 = {
-    to_SHIFT_JIS_E7_80_offsets,
-    to_SHIFT_JIS_E7_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_81 */
-  /* used from to_EUC_JP_E7_81 */
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10,  0, 10, 10, 10,
-     10,  1, 10, 10, 10, 10, 10, 10,    2, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10,  3, 10, 10, 10, 10,   10, 10, 10,  4, 10, 10, 10,  5,
-      6, 10, 10, 10, 10, 10, 10, 10,    7, 10, 10, 10,  8,  9, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_81_infos[11] = {
-     o2(0x9F,0xF3), o2(0xE0,0x72), o2(0x93,0xE5), o2(0xE0,0x73),
-     o2(0x89,0xCE), o2(0x93,0x94), o2(0x8A,0x44), o2(0x8B,0x84),
-     o2(0x8E,0xDC), o2(0x8D,0xD0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_81 = {
-    to_SHIFT_JIS_E7_81_offsets,
-    to_SHIFT_JIS_E7_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_82 */
-  /* used from to_EUC_JP_E7_82 */
-     16, 16, 16, 16, 16,  0, 16, 16,   16,  1,  2, 16, 16, 16,  3, 16,
-     16, 16,  4, 16, 16, 16, 16, 16,   16,  5, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16,  6,  7,  8,  9, 10,
-     16, 16, 16, 11, 16, 16, 16, 16,   12, 13, 14, 15, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_82_infos[17] = {
-     o2(0xFB,0x51), o2(0x98,0x46), o2(0x90,0x86), o2(0x89,0x8A),
-     o2(0xE0,0x75), o2(0xE0,0x74), o2(0xFB,0x52), o2(0xE0,0x78),
-     o2(0x92,0x59), o2(0xE0,0x7B), o2(0xE0,0x76), o2(0xE0,0x7A),
-     o2(0xE0,0x79), o2(0x93,0x5F), o2(0x88,0xD7), o2(0xFA,0x62),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_82 = {
-    to_SHIFT_JIS_E7_82_offsets,
-    to_SHIFT_JIS_E7_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_83 */
-  /* used from to_EUC_JP_E7_83 */
-      9,  9,  9,  9,  9,  9,  9,  9,    0,  9,  9,  1,  9,  9,  9,  2,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  3,  9,  9,  9,  4,  9,  5,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  6,  9,  9,  9,  9,  9,  9,    9,  7,  9,  9,  9,  8,  9,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_83_infos[10] = {
-     o2(0x97,0xF3), o2(0xE0,0x7D), o2(0x89,0x47), o2(0xE0,0x80),
-     o2(0xE0,0x7E), o2(0xE0,0x7C), o2(0xE0,0x77), o2(0x96,0x42),
-     o2(0xE0,0x82),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_83 = {
-    to_SHIFT_JIS_E7_83_offsets,
-    to_SHIFT_JIS_E7_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_84 */
-  /* used from to_EUC_JP_E7_84 */
-     11, 11, 11, 11,  0, 11, 11, 11,   11,  1, 11, 11, 11, 11, 11,  2,
-     11, 11, 11, 11,  3, 11, 11, 11,   11,  4,  5, 11,  6, 11, 11, 11,
-     11,  7, 11, 11, 11, 11,  8, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11,  9, 11,   11, 11, 11, 11, 10, 11, 11, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_84_infos[12] = {
-     o2(0xFB,0x54), o2(0xE0,0x81), o2(0xFB,0x53), o2(0x89,0x8B),
-     o2(0xE0,0x84), o2(0x95,0xB0), o2(0xE0,0x83), o2(0x96,0xB3),
-     o2(0x8F,0xC5), o2(0x91,0x52), o2(0x8F,0xC4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_84 = {
-    to_SHIFT_JIS_E7_84_offsets,
-    to_SHIFT_JIS_E7_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_85 */
-  /* used from to_EUC_JP_E7_85 */
-     18, 18, 18, 18, 18, 18,  0,  1,   18,  2, 18, 18,  3, 18,  4, 18,
-     18, 18, 18, 18, 18,  5,  6, 18,   18,  7, 18, 18,  8, 18, 18, 18,
-     18, 18,  9, 18, 10, 11, 12, 13,   18, 14, 18, 18, 15, 18, 16, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 18, 17, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_85_infos[19] = {
-     o2(0xFB,0x56), o2(0xFB,0x57), o2(0x97,0xF9), o2(0xE0,0x8A),
-     o2(0x90,0xF7), o2(0xE0,0x86), o2(0xE0,0x8B), o2(0x89,0x8C),
-     o2(0xFB,0x55), o2(0xE0,0x89), o2(0x94,0x81), o2(0xE0,0x85),
-     o2(0xE0,0x88), o2(0x8F,0xC6), o2(0x94,0xCF), o2(0xE0,0x8C),
-     o2(0x8E,0xCF), o2(0x90,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_85 = {
-    to_SHIFT_JIS_E7_85_offsets,
-    to_SHIFT_JIS_E7_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_86 */
-  /* used from to_EUC_JP_E7_86 */
-     13, 13, 13, 13,  0, 13, 13, 13,    1, 13,  2, 13, 13, 13, 13,  3,
-     13, 13, 13, 13,  4,  5, 13, 13,   13,  6, 13, 13, 13, 13, 13,  7,
-     13, 13, 13, 13, 13, 13, 13, 13,    8, 13, 13, 13,  9, 13, 13, 13,
-     13, 10, 13, 13, 13, 13, 13, 13,   13, 11, 13, 13, 13, 13, 12, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_86_infos[14] = {
-     o2(0xE0,0x8F), o2(0xE0,0x87), o2(0x8C,0x46), o2(0xE0,0x8D),
-     o2(0x97,0x6F), o2(0xE0,0x90), o2(0xEA,0xA4), o2(0x8F,0x6E),
-     o2(0xE0,0x91), o2(0xE0,0x92), o2(0x94,0x4D), o2(0xE0,0x94),
-     o2(0xE0,0x95),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_86 = {
-    to_SHIFT_JIS_E7_86_offsets,
-    to_SHIFT_JIS_E7_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_87 */
-  /* used from to_EUC_JP_E7_87 */
-     24,  0, 24,  1, 24, 24, 24, 24,    2,  3, 24, 24, 24, 24,  4, 24,
-      5, 24,  6, 24,  7,  8, 24,  9,   24, 24, 24, 24, 24, 24, 24, 10,
-     11, 24, 24, 24, 24, 12, 13, 14,   24, 24, 24, 24, 15, 16, 17, 24,
-     24, 24, 24, 24, 24, 18, 24, 24,   24, 19, 24, 20, 21, 24, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_87_infos[25] = {
-     o2(0xFB,0x59), o2(0x94,0x52), o2(0x93,0x95), o2(0xE0,0x97),
-     o2(0xE0,0x99), o2(0x97,0xD3), o2(0xE0,0x96), o2(0xE0,0x98),
-     o2(0x89,0x8D), o2(0xE0,0x93), o2(0x9A,0x7A), o2(0xE0,0x9A),
-     o2(0x91,0x87), o2(0x8E,0x57), o2(0xE0,0x9C), o2(0xE0,0x9B),
-     o2(0x90,0x43), o2(0x99,0xD7), o2(0xE0,0x9D), o2(0xE0,0x9F),
-     o2(0xE0,0x8E), o2(0xE0,0x9E), o2(0xFB,0x5A), o2(0xE0,0xA0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_87 = {
-    to_SHIFT_JIS_E7_87_offsets,
-    to_SHIFT_JIS_E7_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_88 */
-  /* used from to_EUC_JP_E7_88 */
-     18, 18, 18, 18, 18, 18,  0, 18,   18, 18, 18, 18, 18,  1, 18, 18,
-      2, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18,  3, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,    4, 18,  5, 18,  6,  7, 18, 18,
-      8, 18,  9, 18, 18, 10, 11, 18,   18, 18, 12, 13, 14, 15, 16, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_88_infos[19] = {
-     o2(0x94,0x9A), o2(0xE0,0xA1), o2(0xE0,0xA2), o2(0xE0,0xA3),
-     o2(0xE0,0xA4), o2(0x92,0xDC), o2(0xE0,0xA6), o2(0xE0,0xA5),
-     o2(0xE0,0xA7), o2(0xE0,0xA8), o2(0x8E,0xDD), o2(0x95,0x83),
-     o2(0x96,0xEA), o2(0xE0,0xA9), o2(0xE0,0xAA), o2(0x91,0x75),
-     o2(0x8E,0xA2), o2(0xE0,0xAB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_88 = {
-    to_SHIFT_JIS_E7_88_offsets,
-    to_SHIFT_JIS_E7_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_89 */
-  /* used from to_EUC_JP_E7_89 */
-      0, 21, 21, 21, 21, 21,  1,  2,    3, 21, 21,  4,  5, 21, 21, 21,
-     21, 21,  6, 21, 21, 21, 21, 21,    7,  8, 21,  9, 21, 10, 21, 11,
-     21, 12, 13, 21, 21, 21, 21, 14,   21, 15, 21, 21, 21, 21, 21, 21,
-     21, 21, 16, 21, 17, 21, 21, 21,   21, 18, 21, 21, 21, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_89_infos[22] = {
-     o2(0xE0,0xAC), o2(0xE0,0xAD), o2(0x95,0xD0), o2(0x94,0xC5),
-     o2(0xE0,0xAE), o2(0x94,0x76), o2(0x92,0xAB), o2(0xE0,0xAF),
-     o2(0x89,0xE5), o2(0x8B,0x8D), o2(0x96,0xC4), o2(0x96,0xB4),
-     o2(0x89,0xB2), o2(0x98,0x53), o2(0x96,0x71), o2(0x95,0xA8),
-     o2(0x90,0xB5), o2(0xE0,0xB0), o2(0x93,0xC1), o2(0x8C,0xA1),
-     o2(0xE0,0xB1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_89 = {
-    to_SHIFT_JIS_E7_89_offsets,
-    to_SHIFT_JIS_E7_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8A */
-  /* used from to_EUC_JP_E7_8A */
-      0,  1,  2, 16, 16, 16, 16,  3,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  4, 16, 16, 16,  5, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-      6, 16,  7, 16, 16, 16, 16,  8,   16, 16, 16, 16,  9, 16, 16, 10,
-     16, 11, 12, 16, 16, 16, 13, 16,   16, 14, 16, 16, 16, 16, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8A_infos[17] = {
-     o2(0x8D,0xD2), o2(0xE0,0xB3), o2(0xE0,0xB2), o2(0xE0,0xB4),
-     o2(0xE0,0xB5), o2(0xE0,0xB6), o2(0x8B,0x5D), o2(0xE0,0xB7),
-     o2(0xE0,0xB8), o2(0x8C,0xA2), o2(0x94,0xC6), o2(0xFB,0x5B),
-     o2(0xE0,0xBA), o2(0x8F,0xF3), o2(0xE0,0xB9), o2(0xFB,0x5C),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8A = {
-    to_SHIFT_JIS_E7_8A_offsets,
-    to_SHIFT_JIS_E7_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8B */
-  /* used from to_EUC_JP_E7_8B */
-     21, 21,  0,  1,  2, 21,  3, 21,   21, 21, 21, 21, 21, 21,  4, 21,
-      5, 21,  6, 21, 21, 21, 21,  7,   21,  8, 21,  9, 21, 21, 21, 21,
-     10, 11, 12, 21, 21, 21, 21, 21,   21, 13, 21, 21, 14, 15, 21, 21,
-     21, 21, 21, 21, 21, 21, 21, 16,   17, 18, 21, 21, 19, 20, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8B_infos[22] = {
-     o2(0x8B,0xB6), o2(0xE0,0xBB), o2(0xE0,0xBD), o2(0xE0,0xBC),
-     o2(0xE0,0xBE), o2(0x8C,0xCF), o2(0xE0,0xBF), o2(0x8B,0xE7),
-     o2(0x91,0x5F), o2(0x8D,0x9D), o2(0xE0,0xC1), o2(0xE0,0xC2),
-     o2(0xE0,0xC0), o2(0x8E,0xEB), o2(0x93,0xC6), o2(0x8B,0xB7),
-     o2(0xE0,0xC4), o2(0x92,0x4B), o2(0xE0,0xC3), o2(0x98,0x54),
-     o2(0x94,0x82),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8B = {
-    to_SHIFT_JIS_E7_8B_offsets,
-    to_SHIFT_JIS_E7_8B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8C */
-  /* used from to_EUC_JP_E7_8C */
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19,  0, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  1,  2,   19, 19, 19,  3,  4,  5, 19,  6,
-     19, 19, 19, 19,  7,  8, 19, 19,   19,  9, 10, 11, 19, 19, 12, 13,
-     19, 19, 19, 19, 14, 19, 15, 16,   19, 19, 19, 19, 19, 19, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8C_infos[20] = {
-     o2(0xE0,0xC7), o2(0xE0,0xC9), o2(0xE0,0xC6), o2(0x96,0xD2),
-     o2(0xE0,0xC8), o2(0xE0,0xCA), o2(0x97,0xC2), o2(0xFB,0x5D),
-     o2(0xE0,0xCE), o2(0xE0,0xCD), o2(0x92,0x96), o2(0x94,0x4C),
-     o2(0x8C,0xA3), o2(0xE0,0xCC), o2(0xE0,0xCB), o2(0x97,0x50),
-     o2(0x97,0x51), o2(0xE0,0xCF), o2(0x89,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8C = {
-    to_SHIFT_JIS_E7_8C_offsets,
-    to_SHIFT_JIS_E7_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8D */
-  /* used from to_EUC_JP_E7_8D */
-     15, 15, 15, 15,  0,  1, 15, 15,   15, 15, 15, 15, 15, 15,  2,  3,
-     15, 15, 15, 15, 15, 15, 15,  4,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15,  5, 15, 15, 15, 15,    6, 15,  7, 15, 15, 15, 15, 15,
-      8, 15,  9, 15, 15, 10, 15, 11,   12, 15, 13, 14, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8D_infos[16] = {
-     o2(0x8D,0x96), o2(0x8E,0x82), o2(0xE0,0xD0), o2(0xE0,0xD1),
-     o2(0xE0,0xD3), o2(0x8F,0x62), o2(0xE0,0xD5), o2(0xE0,0xD4),
-     o2(0xE0,0xD6), o2(0x8A,0x6C), o2(0xE0,0xD8), o2(0xFB,0x5F),
-     o2(0xE0,0xD7), o2(0xE0,0xDA), o2(0xE0,0xD9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8D = {
-    to_SHIFT_JIS_E7_8D_offsets,
-    to_SHIFT_JIS_E7_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8E */
-  /* used from to_EUC_JP_E7_8E */
-     10, 10, 10, 10,  0, 10, 10,  1,   10,  2, 10,  3, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10,  4, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10,  5, 10, 10, 10, 10, 10, 10,
-     10, 10,  6,  7, 10, 10, 10, 10,   10, 10, 10,  8, 10,  9, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8E_infos[11] = {
-     o2(0x8C,0xBA), o2(0x97,0xA6), o2(0x8B,0xCA), o2(0x89,0xA4),
-     o2(0x8B,0xE8), o2(0x8A,0xDF), o2(0x97,0xE6), o2(0xE0,0xDC),
-     o2(0xE0,0xDE), o2(0xFB,0x60),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8E = {
-    to_SHIFT_JIS_E7_8E_offsets,
-    to_SHIFT_JIS_E7_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_8F */
-  /* used from to_EUC_JP_E7_8F */
-      0, 20,  1, 20, 20, 20, 20, 20,    2,  3,  4, 20, 20,  5,  6, 20,
-     20, 20,  7, 20, 20, 20,  8, 20,   20, 20, 20, 20, 20, 20,  9, 20,
-     10, 20, 20, 11, 20, 12, 20, 20,   20, 20, 13, 20, 20, 14, 15, 20,
-     20, 16, 20, 20, 20, 17, 20, 20,   18, 20, 20, 20, 20, 20, 19, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_8F_infos[21] = {
-     o2(0xE0,0xDF), o2(0x89,0xCF), o2(0xE0,0xDB), o2(0xFB,0x61),
-     o2(0x8E,0x58), o2(0x92,0xBF), o2(0xE0,0xDD), o2(0xFB,0x64),
-     o2(0xFB,0x62), o2(0xE0,0xE2), o2(0x8E,0xEC), o2(0xFB,0x63),
-     o2(0xE0,0xE0), o2(0x8C,0x5D), o2(0x94,0xC7), o2(0xE0,0xE1),
-     o2(0xE0,0xFC), o2(0xFB,0x66), o2(0xE0,0xE7), o2(0x8C,0xBB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_8F = {
-    to_SHIFT_JIS_E7_8F_offsets,
-    to_SHIFT_JIS_E7_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_90_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_90 */
-  /* used from to_EUC_JP_E7_90 */
-     18, 18, 18,  0, 18,  1,  2,  3,   18,  4, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18,  5, 18, 18,  6,  7, 18,   18,  8,  9, 18, 18, 18, 10, 18,
-     18, 18, 11, 12, 13, 14, 15, 18,   18, 18, 16, 18, 18, 18, 18, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_90_infos[19] = {
-     o2(0x8B,0x85), o2(0xE0,0xE4), o2(0x97,0x9D), o2(0xFB,0x65),
-     o2(0x97,0xAE), o2(0x91,0xF4), o2(0xE0,0xE6), o2(0xFB,0x67),
-     o2(0xFB,0x69), o2(0xFB,0x68), o2(0xFB,0x6A), o2(0xE0,0xE8),
-     o2(0x97,0xD4), o2(0x8B,0xD5), o2(0x94,0xFA), o2(0x94,0x69),
-     o2(0xE0,0xE9), o2(0xE0,0xEB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_90 = {
-    to_SHIFT_JIS_E7_90_offsets,
-    to_SHIFT_JIS_E7_90_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_91 */
-  /* used from to_EUC_JP_E7_91 */
-     19,  0, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19,  1, 19, 19,   19,  2,  3,  4,  5, 19,  6,  7,
-      8, 19,  9, 10, 11, 19, 19, 19,   19, 12, 13, 19, 19, 19, 19, 14,
-     15, 19, 19, 16, 19, 19, 17, 19,   19, 19, 19, 19, 19, 19, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_91_infos[20] = {
-     o2(0xE0,0xEE), o2(0xE0,0xEA), o2(0xE0,0xED), o2(0x8C,0xE8),
-     o2(0x89,0x6C), o2(0xE0,0xEF), o2(0x90,0x90), o2(0xE0,0xEC),
-     o2(0x97,0xDA), o2(0xFB,0x6B), o2(0xE0,0xF2), o2(0xEA,0xA2),
-     o2(0xE0,0xF0), o2(0xE0,0xF3), o2(0xE0,0xE5), o2(0xE0,0xF1),
-     o2(0x8D,0xBA), o2(0xE0,0xF4), o2(0xE0,0xF5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_91 = {
-    to_SHIFT_JIS_E7_91_offsets,
-    to_SHIFT_JIS_E7_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_92_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_92 */
-  /* used from to_EUC_JP_E7_92 */
-      9,  9,  9,  0,  9,  9,  9,  9,    9,  1,  9,  2,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  3,  4,
-      9,  9,  5,  9,  9,  9,  9,  6,    9,  9,  9,  9,  9,  9,  9,  9,
-      7,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  8,  9,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_92_infos[10] = {
-     o2(0x97,0x9E), o2(0xFB,0x6C), o2(0xE0,0xF6), o2(0xE0,0xF7),
-     o2(0xFB,0x6D), o2(0xE0,0xE3), o2(0xE0,0xF8), o2(0x8A,0xC2),
-     o2(0x8E,0xA3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_92 = {
-    to_SHIFT_JIS_E7_92_offsets,
-    to_SHIFT_JIS_E7_92_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_93_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_93 */
-  /* used from to_EUC_JP_E7_93 */
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17,  0, 17, 17, 17, 17,  1,
-     17, 17, 17, 17,  2, 17, 17, 17,   17, 17, 17, 17,  3, 17, 17, 17,
-      4, 17,  5,  6, 17, 17,  7,  8,   17,  9, 17, 17, 17, 17, 10, 17,
-     11, 12, 13, 17, 17, 17, 14, 15,   16, 17, 17, 17, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_93_infos[18] = {
-     o2(0xE0,0xF9), o2(0xE0,0xFA), o2(0xE0,0xFB), o2(0x89,0x5A),
-     o2(0xE1,0x40), o2(0x95,0x5A), o2(0xE1,0x41), o2(0x8A,0xA2),
-     o2(0xE1,0x42), o2(0xE1,0x43), o2(0xE1,0x44), o2(0xE1,0x46),
-     o2(0xE1,0x47), o2(0xE1,0x45), o2(0x95,0x72), o2(0xE1,0x49),
-     o2(0xE1,0x48),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_93 = {
-    to_SHIFT_JIS_E7_93_offsets,
-    to_SHIFT_JIS_E7_93_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_94_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_94 */
-  /* used from to_EUC_JP_E7_94 */
-     31,  0, 31,  1,  2,  3, 31, 31,   31, 31, 31, 31,  4,  5,  6, 31,
-     31,  7, 31,  8, 31,  9, 31, 31,   10, 31, 11, 31, 12, 31, 13, 14,
-     31, 31, 31, 15, 31, 16, 17, 31,   18, 31, 31, 19, 20, 31, 31, 21,
-     22, 23, 24, 25, 31, 31, 31, 26,   27, 31, 28, 29, 30, 31, 31, 31,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_94_infos[32] = {
-     o2(0xFB,0x6E), o2(0xE1,0x4B), o2(0xE1,0x4A), o2(0xE1,0x4C),
-     o2(0xE1,0x4D), o2(0xE1,0x4F), o2(0xE1,0x4E), o2(0x8D,0x99),
-     o2(0xE1,0x51), o2(0xE1,0x50), o2(0x8A,0xC3), o2(0x90,0x72),
-     o2(0x93,0x5B), o2(0xE1,0x52), o2(0x90,0xB6), o2(0x8E,0x59),
-     o2(0x89,0x99), o2(0xE1,0x53), o2(0x97,0x70), o2(0x95,0xE1),
-     o2(0xE1,0x54), o2(0xFA,0xA8), o2(0x93,0x63), o2(0x97,0x52),
-     o2(0x8D,0x62), o2(0x90,0x5C), o2(0x92,0x6A), o2(0x99,0xB2),
-     o2(0x92,0xAC), o2(0x89,0xE6), o2(0xE1,0x55),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_94 = {
-    to_SHIFT_JIS_E7_94_offsets,
-    to_SHIFT_JIS_E7_94_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_95 */
-  /* used from to_EUC_JP_E7_95 */
-     33, 33, 33, 33,  0, 33,  1, 33,   33,  2,  3,  4,  5,  6, 33,  7,
-     33,  8, 33, 33,  9, 33, 33, 33,   33, 10, 11, 12, 13, 14, 33, 33,
-     15, 33, 16, 33, 17, 18, 19, 20,   33, 21, 22, 23, 33, 24, 33, 25,
-     26, 33, 33, 27, 28, 33, 29, 30,   31, 33, 33, 33, 33, 33, 33, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_95_infos[34] = {
-     o2(0xE1,0x56), o2(0xE1,0x5B), o2(0xE1,0x59), o2(0xE1,0x58),
-     o2(0x9D,0xC0), o2(0x8A,0x45), o2(0xE1,0x57), o2(0x88,0xD8),
-     o2(0x94,0xA8), o2(0x94,0xC8), o2(0x97,0xAF), o2(0xE1,0x5C),
-     o2(0xE1,0x5A), o2(0x92,0x7B), o2(0x90,0xA4), o2(0x94,0xA9),
-     o2(0x95,0x4C), o2(0xE1,0x5E), o2(0x97,0xAA), o2(0x8C,0x6C),
-     o2(0xE1,0x5F), o2(0xE1,0x5D), o2(0x94,0xD4), o2(0xE1,0x60),
-     o2(0xE1,0x61), o2(0xFB,0x6F), o2(0x88,0xD9), o2(0x8F,0xF4),
-     o2(0xE1,0x66), o2(0xE1,0x63), o2(0x93,0xEB), o2(0xE1,0x62),
-     o2(0x8B,0x45),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_95 = {
-    to_SHIFT_JIS_E7_95_offsets,
-    to_SHIFT_JIS_E7_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_96 */
-  /* used from to_EUC_JP_E7_96 */
-     24, 24,  0, 24, 24, 24,  1,  2,   24,  3,  4,  5, 24, 24,  6,  7,
-     24,  8, 24, 24,  9, 24, 24, 24,   24, 24, 10, 24, 24, 11, 24, 24,
-     24, 24, 24, 12, 24, 13, 24, 24,   24, 24, 24, 14, 24, 24, 24, 24,
-     24, 15, 16, 17, 24, 18, 24, 24,   19, 20, 24, 24, 21, 22, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_96_infos[25] = {
-     o2(0xE1,0x69), o2(0xE1,0x64), o2(0xE1,0x65), o2(0xE1,0x68),
-     o2(0xE1,0x67), o2(0x95,0x44), o2(0x91,0x61), o2(0x91,0x60),
-     o2(0x8B,0x5E), o2(0xE1,0x6A), o2(0xE1,0x6B), o2(0xE1,0x6C),
-     o2(0xE1,0x6E), o2(0xE1,0x6D), o2(0x89,0x75), o2(0xE1,0x76),
-     o2(0x94,0xE6), o2(0xE1,0x70), o2(0xE1,0x72), o2(0xE1,0x74),
-     o2(0x90,0x5D), o2(0xE1,0x75), o2(0xE1,0x73), o2(0x8E,0xBE),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_96 = {
-    to_SHIFT_JIS_E7_96_offsets,
-    to_SHIFT_JIS_E7_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_97 */
-  /* used from to_EUC_JP_E7_97 */
-     24, 24,  0,  1, 24,  2, 24,  3,   24, 24,  4, 24, 24,  5, 24, 24,
-     24, 24,  6, 24,  7,  8, 24, 24,    9, 10, 24, 11, 24, 24, 12, 24,
-     24, 24, 13, 14, 24, 24, 24, 24,   24, 15, 24, 24, 24, 24, 24, 24,
-     16, 24, 17, 18, 19, 24, 24, 24,   24, 24, 20, 24, 21, 24, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_97_infos[25] = {
-     o2(0xE1,0x6F), o2(0xE1,0x71), o2(0x95,0x61), o2(0x8F,0xC7),
-     o2(0xE1,0x78), o2(0xE1,0x77), o2(0xE1,0x79), o2(0x8E,0xA4),
-     o2(0x8D,0xAD), o2(0x93,0x97), o2(0xE1,0x7A), o2(0x92,0xC9),
-     o2(0xE1,0x7C), o2(0x97,0x9F), o2(0xE1,0x7B), o2(0x91,0x89),
-     o2(0xE1,0x82), o2(0xE1,0x84), o2(0xE1,0x85), o2(0x92,0x73),
-     o2(0xE1,0x83), o2(0xE1,0x80), o2(0xE1,0x7D), o2(0xE1,0x7E),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_97 = {
-    to_SHIFT_JIS_E7_97_offsets,
-    to_SHIFT_JIS_E7_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_98 */
-  /* used from to_EUC_JP_E7_98 */
-     13,  0, 13, 13, 13, 13, 13, 13,   13,  1, 13,  2, 13,  3, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13,  4,
-      5,  6,  7, 13,  8, 13, 13,  9,   13, 13, 13, 13, 13, 13, 13, 13,
-     10, 13, 13, 13, 11, 13, 13, 13,   13, 13, 13, 12, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_98_infos[14] = {
-     o2(0xE1,0x81), o2(0xE1,0x88), o2(0xE1,0x86), o2(0xE1,0x87),
-     o2(0xE1,0x89), o2(0xE1,0x8B), o2(0xE1,0x8C), o2(0xE1,0x8D),
-     o2(0xE1,0x8E), o2(0xE1,0x8A), o2(0xE1,0x90), o2(0xE1,0x8F),
-     o2(0xE1,0x91),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_98 = {
-    to_SHIFT_JIS_E7_98_offsets,
-    to_SHIFT_JIS_E7_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_99 */
-  /* used from to_EUC_JP_E7_99 */
-     25, 25,  0, 25, 25, 25,  1,  2,    3, 25, 25, 25,  4, 25, 25, 25,
-     25, 25,  5, 25, 25, 25,  6, 25,    7, 25, 25, 25,  8, 25, 25, 25,
-     25,  9, 10, 25, 25, 25, 25, 11,   12, 13, 14, 25, 15, 25, 25, 25,
-     16, 25, 17, 25, 25, 25, 18, 25,   19, 25, 20, 21, 22, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_99_infos[26] = {
-     o2(0x97,0xC3), o2(0xE1,0x94), o2(0xE1,0x92), o2(0xE1,0x93),
-     o2(0x8A,0xE0), o2(0x96,0xFC), o2(0x95,0xC8), o2(0xE1,0x96),
-     o2(0xE1,0x95), o2(0xE1,0x97), o2(0xE1,0x98), o2(0xE1,0x9C),
-     o2(0xE1,0x99), o2(0xE1,0x9A), o2(0xE1,0x9B), o2(0xE1,0x9D),
-     o2(0xE1,0x9E), o2(0xE1,0x9F), o2(0xE1,0xA0), o2(0xE1,0xA1),
-     o2(0x94,0xAD), o2(0x93,0x6F), o2(0xE1,0xA2), o2(0x94,0x92),
-     o2(0x95,0x53),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_99 = {
-    to_SHIFT_JIS_E7_99_offsets,
-    to_SHIFT_JIS_E7_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9A */
-  /* used from to_EUC_JP_E7_9A */
-      0, 26,  1,  2,  3, 26,  4,  5,    6, 26, 26,  7, 26, 26,  8, 26,
-      9, 26, 26, 10, 26, 26, 11, 26,   26, 12, 13, 14, 15, 26, 16, 26,
-     26, 26, 26, 26, 26, 26, 17, 26,   26, 26, 26, 26, 26, 26, 18, 26,
-     19, 26, 26, 26, 20, 26, 26, 21,   22, 23, 24, 26, 26, 26, 26, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9A_infos[27] = {
-     o2(0xE1,0xA3), o2(0xFB,0x70), o2(0xE1,0xA4), o2(0x93,0x49),
-     o2(0x8A,0x46), o2(0x8D,0x63), o2(0xE1,0xA5), o2(0xE1,0xA6),
-     o2(0xE1,0xA7), o2(0x8E,0x48), o2(0xE1,0xA9), o2(0xE1,0xA8),
-     o2(0xE1,0xAA), o2(0xE1,0xAB), o2(0xFB,0x73), o2(0xFB,0x71),
-     o2(0xFB,0x72), o2(0xFB,0x74), o2(0x94,0xE7), o2(0xE1,0xAC),
-     o2(0xE1,0xAD), o2(0xEA,0x89), o2(0xE1,0xAE), o2(0xE1,0xAF),
-     o2(0xE1,0xB0), o2(0x8E,0x4D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9A = {
-    to_SHIFT_JIS_E7_9A_offsets,
-    to_SHIFT_JIS_E7_9A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9B */
-  /* used from to_EUC_JP_E7_9B */
-     25, 25,  0,  1, 25, 25,  2, 25,    3, 25,  4, 25, 25,  5, 25, 25,
-     25, 25,  6, 25, 25, 25,  7,  8,   25, 25, 25,  9, 10, 25, 11, 12,
-     25, 13, 25, 14, 15, 16, 25, 17,   25, 25, 18, 25, 25, 25, 19, 25,
-     25, 25, 20, 25, 21, 25, 25, 25,   22, 25, 25, 23, 25, 25, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9B_infos[26] = {
-     o2(0xE1,0xB1), o2(0x94,0x75), o2(0x96,0x7E), o2(0x89,0x6D),
-     o2(0x89,0x76), o2(0xE1,0xB2), o2(0xE1,0xB4), o2(0xE1,0xB3),
-     o2(0x93,0x90), o2(0x90,0xB7), o2(0x9F,0x58), o2(0xE1,0xB5),
-     o2(0x96,0xBF), o2(0xE1,0xB6), o2(0x8A,0xC4), o2(0x94,0xD5),
-     o2(0xE1,0xB7), o2(0xE1,0xB8), o2(0xE1,0xB9), o2(0x96,0xDA),
-     o2(0x96,0xD3), o2(0x92,0xBC), o2(0x91,0x8A), o2(0xE1,0xBB),
-     o2(0x8F,0x82),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9B = {
-    to_SHIFT_JIS_E7_9B_offsets,
-    to_SHIFT_JIS_E7_9B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9C */
-  /* used from to_EUC_JP_E7_9C */
-     19,  0, 19, 19,  1, 19, 19,  2,    3,  4, 19,  5,  6, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19,  7, 19, 19,  8,  9,
-     10, 19, 19, 19, 11, 12, 13, 19,   19, 14, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 15,   16, 19, 17, 19, 18, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9C_infos[20] = {
-     o2(0x8F,0xC8), o2(0xE1,0xBE), o2(0xE1,0xBD), o2(0xE1,0xBC),
-     o2(0x94,0xFB), o2(0x8A,0xC5), o2(0x8C,0xA7), o2(0xE1,0xC4),
-     o2(0xE1,0xC1), o2(0x90,0x5E), o2(0x96,0xB0), o2(0xE1,0xC0),
-     o2(0xE1,0xC2), o2(0xE1,0xC3), o2(0xE1,0xBF), o2(0xE1,0xC5),
-     o2(0xE1,0xC6), o2(0x92,0xAD), o2(0x8A,0xE1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9C = {
-    to_SHIFT_JIS_E7_9C_offsets,
-    to_SHIFT_JIS_E7_9C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9D */
-  /* used from to_EUC_JP_E7_9D */
-      0, 14, 14, 14, 14, 14,  1,  2,   14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 14,  3,  4, 14, 14, 14, 14,
-     14,  5, 14,  6, 14,  7,  8, 14,    9, 14, 14, 10, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 11, 14, 14, 14, 14, 12, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9D_infos[15] = {
-     o2(0x92,0x85), o2(0xFB,0x76), o2(0xE1,0xC7), o2(0xE1,0xC8),
-     o2(0xE1,0xCB), o2(0x90,0x87), o2(0x93,0xC2), o2(0xE1,0xCC),
-     o2(0x96,0x72), o2(0xE1,0xC9), o2(0xE1,0xCA), o2(0xE1,0xCF),
-     o2(0xE1,0xCE), o2(0xE1,0xCD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9D = {
-    to_SHIFT_JIS_E7_9D_offsets,
-    to_SHIFT_JIS_E7_9D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9E */
-  /* used from to_EUC_JP_E7_9E */
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16,  0, 16, 16,  1, 16,
-     16,  2, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16,  3, 16,
-      4, 16, 16, 16, 16,  5, 16, 16,   16, 16, 16, 16,  6,  7, 16, 16,
-      8, 16, 16,  9, 16, 16, 10, 16,   16, 11, 16, 12, 13, 14, 16, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9E_infos[17] = {
-     o2(0xE1,0xD1), o2(0xE1,0xD0), o2(0xE1,0xD2), o2(0xE1,0xD4),
-     o2(0xE1,0xD3), o2(0x95,0xCB), o2(0x8F,0x75), o2(0x97,0xC4),
-     o2(0xE1,0xD5), o2(0x93,0xB5), o2(0xE1,0xD6), o2(0xE1,0xD7),
-     o2(0xE1,0xDB), o2(0xE1,0xD9), o2(0xE1,0xDA), o2(0xE1,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9E = {
-    to_SHIFT_JIS_E7_9E_offsets,
-    to_SHIFT_JIS_E7_9E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_9F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_9F */
-  /* used from to_EUC_JP_E7_9F */
-     16, 16, 16, 16, 16, 16, 16,  0,   16, 16, 16, 16, 16,  1, 16, 16,
-     16, 16, 16, 16, 16, 16, 16,  2,   16, 16,  3,  4,  5, 16, 16, 16,
-     16, 16,  6,  7, 16,  8, 16,  9,   16, 10, 16, 16, 16, 11, 12, 13,
-     16, 16, 16, 14, 16, 16, 16, 16,   16, 16, 16, 16, 15, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_9F_infos[17] = {
-     o2(0xE1,0xDC), o2(0xE1,0xDD), o2(0xE1,0xDE), o2(0xE1,0xDF),
-     o2(0x96,0xB5), o2(0xE1,0xE0), o2(0x96,0xEE), o2(0xE1,0xE1),
-     o2(0x92,0x6D), o2(0x94,0x8A), o2(0x8B,0xE9), o2(0x92,0x5A),
-     o2(0xE1,0xE2), o2(0x8B,0xB8), o2(0x90,0xCE), o2(0xE1,0xE3),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_9F = {
-    to_SHIFT_JIS_E7_9F_offsets,
-    to_SHIFT_JIS_E7_9F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A0 */
-  /* used from to_EUC_JP_E7_A0 */
-     14, 14,  0, 14, 14, 14, 14, 14,   14, 14, 14, 14,  1, 14, 14, 14,
-     14, 14,  2, 14,  3,  4, 14, 14,   14, 14, 14, 14, 14, 14, 14, 14,
-      5,  6, 14, 14, 14,  7,  8,  9,   14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 10, 14, 11, 14, 14, 14,   14, 14, 12, 14, 14, 14, 14, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A0_infos[15] = {
-     o2(0x8D,0xBB), o2(0xE1,0xE4), o2(0xE1,0xE5), o2(0x8C,0xA4),
-     o2(0x8D,0xD3), o2(0xE1,0xE7), o2(0xFB,0x78), o2(0x93,0x75),
-     o2(0x8D,0xD4), o2(0x8B,0x6D), o2(0x96,0x43), o2(0x94,0x6A),
-     o2(0x93,0x76), o2(0x8D,0x7B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A0 = {
-    to_SHIFT_JIS_E7_A0_offsets,
-    to_SHIFT_JIS_E7_A0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A1 */
-  /* used from to_EUC_JP_E7_A1 */
-     11, 11, 11, 11, 11,  0, 11, 11,   11, 11, 11, 11, 11, 11,  1, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,   11, 11, 11, 11, 11,  2, 11, 11,
-     11, 11, 11, 11,  3, 11, 11, 11,   11, 11, 11,  4,  5, 11, 11,  6,
-     11, 11,  7, 11,  8, 11, 11, 11,   11, 11,  9, 11, 10, 11, 11, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A1_infos[12] = {
-     o2(0xE1,0xE9), o2(0xFB,0x79), o2(0x8F,0xC9), o2(0xFB,0x7A),
-     o2(0x97,0xB0), o2(0x8D,0x64), o2(0x8C,0xA5), o2(0x94,0xA1),
-     o2(0xE1,0xEB), o2(0xFB,0x7B), o2(0xE1,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A1 = {
-    to_SHIFT_JIS_E7_A1_offsets,
-    to_SHIFT_JIS_E7_A1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A2 */
-  /* used from to_EUC_JP_E7_A2 */
-     20,  0, 20, 20, 20, 20,  1,  2,   20, 20, 20, 20,  3,  4,  5, 20,
-     20,  6, 20,  7, 20,  8, 20,  9,   20, 20, 10, 20, 20, 20, 20, 20,
-     20, 20, 20, 11, 20, 20, 20, 12,   20, 13, 14, 20, 20, 20, 20, 15,
-     20, 20, 20, 20, 20, 16, 20, 20,   20, 20, 17, 20, 18, 20, 19, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A2_infos[21] = {
-     o2(0x8C,0xE9), o2(0xE1,0xEC), o2(0x92,0xF4), o2(0xE1,0xEF),
-     o2(0x8A,0x56), o2(0xE1,0xEA), o2(0x94,0xE8), o2(0x89,0x4F),
-     o2(0x8D,0xEA), o2(0x98,0x71), o2(0xE1,0xEE), o2(0xE1,0xF0),
-     o2(0x95,0xC9), o2(0x90,0xD7), o2(0xE1,0xF2), o2(0xE1,0xF3),
-     o2(0xE1,0xF1), o2(0x8A,0x6D), o2(0xE1,0xF9), o2(0xE1,0xF8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A2 = {
-    to_SHIFT_JIS_E7_A2_offsets,
-    to_SHIFT_JIS_E7_A2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A3 */
-  /* used from to_EUC_JP_E7_A3 */
-     15,  0, 15, 15, 15,  1,  2, 15,   15, 15,  3,  4, 15, 15, 15, 15,
-      5,  6, 15, 15,  7, 15, 15, 15,   15, 15,  8, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15,  9,   10, 15, 15, 15, 11, 15, 15, 12,
-     15, 15, 15, 15, 13, 15, 15, 15,   15, 15, 15, 15, 15, 14, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A3_infos[16] = {
-     o2(0x8E,0xA5), o2(0xE1,0xFA), o2(0xE1,0xF5), o2(0xE1,0xFB),
-     o2(0xE1,0xF6), o2(0x94,0xD6), o2(0xE1,0xF4), o2(0xE1,0xF7),
-     o2(0xE2,0x41), o2(0xE2,0x40), o2(0x96,0x81), o2(0xE1,0xFC),
-     o2(0x88,0xE9), o2(0xE2,0x43), o2(0xE2,0x42),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A3 = {
-    to_SHIFT_JIS_E7_A3_offsets,
-    to_SHIFT_JIS_E7_A3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A4 */
-  /* used from to_EUC_JP_E7_A4 */
-     14,  0, 14, 14, 14, 14, 14,  1,   14, 14, 14, 14, 14, 14,  2, 14,
-     14,  3,  4, 14, 14, 14, 14, 14,   14,  5, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,  6, 14,   14, 14,  7,  8,  9, 14, 14, 14,
-     10, 14, 14, 14, 14, 14, 14, 14,   14, 14, 11, 14, 12, 14, 13, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A4_infos[15] = {
-     o2(0x8F,0xCA), o2(0xE2,0x44), o2(0x91,0x62), o2(0xE2,0x46),
-     o2(0xE2,0x45), o2(0xE2,0x47), o2(0xE1,0xE6), o2(0xE1,0xE8),
-     o2(0xE2,0x49), o2(0xE2,0x48), o2(0xFB,0x7C), o2(0x8E,0xA6),
-     o2(0x97,0xE7), o2(0x8E,0xD0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A4 = {
-    to_SHIFT_JIS_E7_A4_offsets,
-    to_SHIFT_JIS_E7_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A5 */
-  /* used from to_EUC_JP_E7_A5 */
-      0,  1, 22, 22, 22, 22, 22,  2,    3,  4, 22, 22, 22, 22, 22, 22,
-      5, 22, 22,  6, 22,  7,  8,  9,   22, 22, 10, 22, 22, 11, 12, 13,
-     14, 22, 15, 22, 22, 16, 22, 22,   17, 22, 22, 22, 22, 18, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 19,   22, 22, 20, 22, 22, 22, 22, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A5_infos[23] = {
-     o2(0xE2,0x4A), o2(0x8C,0x56), o2(0x8B,0x5F), o2(0x8B,0x46),
-     o2(0x8E,0x83), o2(0x97,0x53), o2(0xE2,0x50), o2(0xE2,0x4F),
-     o2(0x91,0x63), o2(0xE2,0x4C), o2(0xE2,0x4E), o2(0x8F,0x6A),
-     o2(0x90,0x5F), o2(0xE2,0x4D), o2(0xE2,0x4B), o2(0x94,0x49),
-     o2(0x8F,0xCB), o2(0x95,0x5B), o2(0x8D,0xD5), o2(0x93,0x98),
-     o2(0xE2,0x51), o2(0xE2,0x52),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A5 = {
-    to_SHIFT_JIS_E7_A5_offsets,
-    to_SHIFT_JIS_E7_A5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A6 */
-  /* used from to_EUC_JP_E7_A6 */
-      0,  1, 22, 22,  2,  3, 22, 22,   22, 22,  4, 22, 22,  5,  6,  7,
-     22, 22, 22, 22,  8, 22, 22, 22,   22, 22, 22,  9, 22, 10, 22, 22,
-     22, 22, 22, 22, 22, 22, 11, 12,   22, 22, 13, 22, 22, 22, 14, 22,
-     15, 22, 22, 16, 22, 22, 22, 22,   22, 17, 18, 22, 22, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A6_infos[23] = {
-     o2(0xE2,0x68), o2(0x8B,0xD6), o2(0x98,0x5C), o2(0x91,0x54),
-     o2(0xE2,0x53), o2(0x89,0xD0), o2(0x92,0xF5), o2(0x95,0x9F),
-     o2(0xFB,0x81), o2(0xFB,0x83), o2(0xE2,0x54), o2(0x8B,0x9A),
-     o2(0xE2,0x55), o2(0xE2,0x57), o2(0xE2,0x58), o2(0x94,0x48),
-     o2(0xE2,0x59), o2(0xE2,0x5A), o2(0xE2,0x5B), o2(0x8B,0xD7),
-     o2(0x89,0xD1), o2(0x93,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A6 = {
-    to_SHIFT_JIS_E7_A6_offsets,
-    to_SHIFT_JIS_E7_A6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A7 */
-  /* used from to_EUC_JP_E7_A7 */
-      0,  1, 18, 18, 18, 18, 18, 18,   18,  2, 18,  3, 18, 18, 18, 18,
-     18,  4,  5, 18, 18,  6, 18, 18,    7, 18, 18, 18, 18, 18, 18,  8,
-     18,  9, 18, 10, 11, 18, 12, 13,   18, 14, 18, 18, 15, 18, 18, 18,
-     16, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 17, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A7_infos[19] = {
-     o2(0x8F,0x47), o2(0x8E,0x84), o2(0xE2,0x5C), o2(0x8F,0x48),
-     o2(0x89,0xC8), o2(0x95,0x62), o2(0xE2,0x5D), o2(0x94,0xE9),
-     o2(0x91,0x64), o2(0xE2,0x60), o2(0xE2,0x61), o2(0x94,0x89),
-     o2(0x90,0x60), o2(0xE2,0x5E), o2(0x92,0x81), o2(0xE2,0x5F),
-     o2(0x8F,0xCC), o2(0x88,0xDA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A7 = {
-    to_SHIFT_JIS_E7_A7_offsets,
-    to_SHIFT_JIS_E7_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A8 */
-  /* used from to_EUC_JP_E7_A8 */
-      0, 22, 22, 22, 22, 22, 22, 22,    1, 22, 22,  2, 22,  3,  4, 22,
-     22, 22, 22, 22,  5, 22, 22,  6,    7,  8,  9, 22, 10, 22, 22, 11,
-     12, 22, 22, 22, 22, 22, 22, 22,   22, 22, 22, 22, 22, 22, 13, 22,
-     22, 14, 15, 22, 22, 22, 22, 16,   22, 22, 22, 17, 18, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A8_infos[23] = {
-     o2(0x8B,0x48), o2(0xE2,0x62), o2(0x92,0xF6), o2(0xE2,0x63),
-     o2(0x90,0xC5), o2(0x96,0xAB), o2(0x95,0x42), o2(0xE2,0x64),
-     o2(0xE2,0x65), o2(0x92,0x74), o2(0x97,0xC5), o2(0xE2,0x67),
-     o2(0xE2,0x66), o2(0x8E,0xED), o2(0xE2,0x69), o2(0x88,0xEE),
-     o2(0xE2,0x6C), o2(0xE2,0x6A), o2(0x89,0xD2), o2(0x8C,0x6D),
-     o2(0xE2,0x6B), o2(0x8D,0x65),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A8 = {
-    to_SHIFT_JIS_E7_A8_offsets,
-    to_SHIFT_JIS_E7_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_A9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_A9 */
-  /* used from to_EUC_JP_E7_A9 */
-      0, 22,  1,  2, 22, 22,  3, 22,   22,  4, 22, 22, 22,  5,  6,  7,
-      8, 22, 22, 22, 22, 22, 22,  9,   22, 22, 22, 22, 22, 22, 22, 22,
-     22, 10, 11, 12, 22, 22, 22, 22,   22, 13, 22, 14, 22, 22, 22, 22,
-     15, 22, 22, 22, 16, 22, 17, 22,   22, 18, 19, 22, 22, 20, 22, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_A9_infos[23] = {
-     o2(0x8D,0x92), o2(0x95,0xE4), o2(0xE2,0x6D), o2(0x96,0x73),
-     o2(0xE2,0x6F), o2(0x90,0xCF), o2(0x89,0x6E), o2(0x89,0xB8),
-     o2(0x88,0xAA), o2(0xE2,0x6E), o2(0xE2,0x70), o2(0xE2,0x71),
-     o2(0x8F,0xF5), o2(0xE2,0x72), o2(0x8A,0x6E), o2(0xE2,0x74),
-     o2(0x8C,0x8A), o2(0x8B,0x86), o2(0xE2,0x75), o2(0x8B,0xF3),
-     o2(0xE2,0x76), o2(0x90,0xFA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_A9 = {
-    to_SHIFT_JIS_E7_A9_offsets,
-    to_SHIFT_JIS_E7_A9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AA */
-  /* used from to_EUC_JP_E7_AA */
-     19,  0, 19,  1,  2, 19, 19, 19,    3, 19, 19, 19, 19, 19, 19, 19,
-     19, 19,  4,  5, 19,  6,  7,  8,    9, 19, 19, 19, 19, 19, 19, 10,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 11, 12, 19, 19, 19, 13, 14,
-     15, 19, 19, 19, 19, 19, 16, 19,   19, 19, 17, 19, 19, 19, 19, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AA_infos[20] = {
-     o2(0x93,0xCB), o2(0x90,0xDE), o2(0x8D,0xF3), o2(0xE2,0x77),
-     o2(0x92,0x82), o2(0x91,0x8B), o2(0xE2,0x79), o2(0xE2,0x7B),
-     o2(0xE2,0x78), o2(0xE2,0x7A), o2(0x8C,0x41), o2(0xE2,0x7C),
-     o2(0x8C,0x45), o2(0x8B,0x87), o2(0x97,0x71), o2(0xE2,0x7E),
-     o2(0xE2,0x80), o2(0x89,0x4D), o2(0xE2,0x83),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AA = {
-    to_SHIFT_JIS_E7_AA_offsets,
-    to_SHIFT_JIS_E7_AA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AB */
-  /* used from to_EUC_JP_E7_AB */
-     35, 35, 35,  0,  1,  2, 35,  3,    4, 35,  5,  6, 35,  7, 35,  8,
-     35,  9, 10, 11, 35, 12, 35, 35,   35, 13, 14, 35, 15, 16, 35, 17,
-     18, 19, 20, 21, 35, 22, 23, 24,   35, 35, 25, 26, 35, 27, 35, 28,
-     29, 35, 35, 35, 35, 35, 30, 35,   31, 32, 33, 35, 35, 35, 35, 34,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AB_infos[36] = {
-     o2(0x8A,0x96), o2(0xE2,0x82), o2(0xE2,0x81), o2(0xE2,0x85),
-     o2(0xE2,0x7D), o2(0xE2,0x86), o2(0x97,0xA7), o2(0xE2,0x87),
-     o2(0xE2,0x88), o2(0xFB,0x84), o2(0x9A,0xF2), o2(0xE2,0x8A),
-     o2(0xE2,0x89), o2(0xE2,0x8B), o2(0xE2,0x8C), o2(0x97,0xB3),
-     o2(0xE2,0x8D), o2(0xE8,0xED), o2(0x8F,0xCD), o2(0xE2,0x8E),
-     o2(0xE2,0x8F), o2(0x8F,0x76), o2(0x93,0xB6), o2(0xE2,0x90),
-     o2(0xFB,0x85), o2(0x92,0x47), o2(0xFB,0x87), o2(0xE2,0x91),
-     o2(0x92,0x5B), o2(0xE2,0x92), o2(0x8B,0xA3), o2(0x99,0x5E),
-     o2(0x92,0x7C), o2(0x8E,0xB1), o2(0x8A,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AB = {
-    to_SHIFT_JIS_E7_AB_offsets,
-    to_SHIFT_JIS_E7_AB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AC */
-  /* used from to_EUC_JP_E7_AC */
-     21, 21,  0, 21,  1, 21,  2, 21,    3, 21,  4,  5, 21, 21, 21,  6,
-     21,  7, 21, 21, 21, 21, 21, 21,    8,  9, 21, 10, 21, 21, 11, 21,
-     12, 21, 21, 21, 21, 13, 14, 21,   15, 21, 21, 21, 16, 21, 21, 21,
-     21, 21, 21, 17, 21, 18, 19, 21,   21, 20, 21, 21, 21, 21, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AC_infos[22] = {
-     o2(0xE2,0x93), o2(0xE2,0xA0), o2(0xE2,0x96), o2(0x8B,0x88),
-     o2(0xE2,0x95), o2(0xE2,0xA2), o2(0xE2,0x94), o2(0x8F,0xCE),
-     o2(0xE2,0x98), o2(0xE2,0x99), o2(0x93,0x4A), o2(0xE2,0x9A),
-     o2(0x8A,0x7D), o2(0x90,0x79), o2(0x95,0x84), o2(0xE2,0x9C),
-     o2(0x91,0xE6), o2(0xE2,0x97), o2(0xE2,0x9B), o2(0xE2,0x9D),
-     o2(0x8D,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AC = {
-    to_SHIFT_JIS_E7_AC_offsets,
-    to_SHIFT_JIS_E7_AC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AD */
-  /* used from to_EUC_JP_E7_AD */
-     23, 23, 23, 23, 23,  0,  1, 23,    2,  3, 23,  4,  5,  6, 23,  7,
-      8,  9, 10, 23, 11, 23, 12, 23,   23, 23, 23, 23, 23, 13, 23, 23,
-     23, 23, 23, 23, 23, 14, 23, 15,   23, 23, 23, 23, 16, 23, 17, 23,
-     18, 19, 23, 23, 20, 21, 23, 23,   23, 23, 22, 23, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AD_infos[24] = {
-     o2(0xE2,0xA4), o2(0x95,0x4D), o2(0x94,0xA4), o2(0x93,0x99),
-     o2(0x8B,0xD8), o2(0xE2,0xA3), o2(0xE2,0xA1), o2(0x94,0xB3),
-     o2(0xE2,0x9E), o2(0x92,0x7D), o2(0x93,0x9B), o2(0x93,0x9A),
-     o2(0x8D,0xF4), o2(0xE2,0xB6), o2(0xE2,0xA6), o2(0xE2,0xA8),
-     o2(0xE2,0xAB), o2(0xE2,0xAC), o2(0xE2,0xA9), o2(0xE2,0xAA),
-     o2(0xE2,0xA7), o2(0xE2,0xA5), o2(0xE2,0x9F),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AD = {
-    to_SHIFT_JIS_E7_AD_offsets,
-    to_SHIFT_JIS_E7_AD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AE */
-  /* used from to_EUC_JP_E7_AE */
-     22, 22, 22, 22, 22, 22,  0,  1,   22, 22, 22,  2, 22,  3, 22,  4,
-     22, 22,  5, 22,  6,  7, 22,  8,    9, 10, 11, 22, 12, 13, 14, 15,
-     22, 16, 22, 22, 22, 22, 22, 22,   22, 22, 17, 22, 22, 18, 22, 22,
-     22, 19, 22, 22, 20, 22, 22, 22,   21, 22, 22, 22, 22, 22, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AE_infos[23] = {
-     o2(0x95,0xCD), o2(0x89,0xD3), o2(0xE2,0xB3), o2(0xE2,0xB0),
-     o2(0xE2,0xB5), o2(0xE2,0xB4), o2(0x94,0x93), o2(0x96,0xA5),
-     o2(0x8E,0x5A), o2(0xE2,0xAE), o2(0xE2,0xB7), o2(0xE2,0xB2),
-     o2(0xE2,0xB1), o2(0xE2,0xAD), o2(0xFB,0x88), o2(0xE2,0xAF),
-     o2(0x8A,0xC7), o2(0x92,0x5C), o2(0x90,0xFB), o2(0x94,0xA0),
-     o2(0xE2,0xBC), o2(0x94,0xA2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AE = {
-    to_SHIFT_JIS_E7_AE_offsets,
-    to_SHIFT_JIS_E7_AE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_AF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_AF */
-  /* used from to_EUC_JP_E7_AF */
-      0,  1, 19, 19,  2, 19,  3,  4,   19,  5, 19,  6,  7, 19, 19,  8,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19,  9, 19, 19,
-     10, 19, 19, 19, 11, 12, 13, 19,   19, 14, 19, 19, 19, 15, 19, 19,
-     19, 19, 19, 16, 19, 19, 17, 18,   19, 19, 19, 19, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_AF_infos[20] = {
-     o2(0x90,0xDF), o2(0xE2,0xB9), o2(0x94,0xCD), o2(0xE2,0xBD),
-     o2(0x95,0xD1), o2(0x92,0x7A), o2(0xE2,0xB8), o2(0xE2,0xBA),
-     o2(0xE2,0xBB), o2(0xE2,0xBE), o2(0x8E,0xC2), o2(0x93,0xC4),
-     o2(0xE2,0xC3), o2(0xE2,0xC2), o2(0xE2,0xBF), o2(0x98,0x55),
-     o2(0xE2,0xC8), o2(0xE2,0xCC), o2(0xE2,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_AF = {
-    to_SHIFT_JIS_E7_AF_offsets,
-    to_SHIFT_JIS_E7_AF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B0 */
-  /* used from to_EUC_JP_E7_B0 */
-      0, 19, 19, 19, 19, 19, 19,  1,   19, 19, 19, 19, 19,  2, 19, 19,
-     19,  3,  4,  5,  6, 19, 19,  7,   19, 19, 19, 19, 19, 19, 19,  8,
-     19,  9, 19, 10, 19, 19, 19, 11,   19, 19, 12, 13, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 14,   15, 19, 19, 19, 19, 16, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B0_infos[20] = {
-     o2(0xE2,0xC5), o2(0xE2,0xC6), o2(0xE2,0xCB), o2(0xE2,0xC0),
-     o2(0x99,0xD3), o2(0xE2,0xC7), o2(0xE2,0xC1), o2(0xE2,0xCA),
-     o2(0xE2,0xD0), o2(0x8A,0xC8), o2(0xE2,0xCD), o2(0xE2,0xCE),
-     o2(0xE2,0xCF), o2(0xE2,0xD2), o2(0xE2,0xD1), o2(0x94,0xF4),
-     o2(0xE2,0xD3), o2(0x97,0xFA), o2(0x95,0xEB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B0 = {
-    to_SHIFT_JIS_E7_B0_offsets,
-    to_SHIFT_JIS_E7_B0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B1 */
-  /* used from to_EUC_JP_E7_B1 */
-      0, 17, 17,  1, 17, 17, 17, 17,   17, 17, 17, 17,  2,  3, 17,  4,
-      5, 17, 17, 17,  6, 17,  7, 17,    8, 17, 17, 17, 17, 17, 17,  9,
-     10, 17, 17, 17, 11, 12, 17, 17,   17, 17, 17, 17, 13, 17, 17, 17,
-     17, 17, 17, 14, 17, 15, 17, 17,   17, 17, 17, 17, 17, 17, 16, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B1_infos[18] = {
-     o2(0xE2,0xD8), o2(0xE2,0xD5), o2(0xE2,0xD4), o2(0x90,0xD0),
-     o2(0xE2,0xD7), o2(0xE2,0xD9), o2(0xE2,0xD6), o2(0xE2,0xDD),
-     o2(0xE2,0xDA), o2(0xE2,0xDB), o2(0xE2,0xC4), o2(0xE2,0xDC),
-     o2(0xE2,0xDE), o2(0xE2,0xDF), o2(0x95,0xC4), o2(0xE2,0xE0),
-     o2(0x96,0xE0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B1 = {
-    to_SHIFT_JIS_E7_B1_offsets,
-    to_SHIFT_JIS_E7_B1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B2 */
-  /* used from to_EUC_JP_E7_B2 */
-     28,  0,  1,  2, 28, 28, 28, 28,   28,  3, 28,  4, 28,  5, 28, 28,
-      6, 28,  7, 28, 28,  8, 28,  9,   10, 28, 28, 11, 28, 28, 28, 12,
-     28, 13, 14, 28, 15, 16, 28, 17,   18, 28, 28, 19, 28, 20, 21, 28,
-     28, 22, 23, 24, 28, 28, 28, 28,   28, 25, 28, 28, 28, 26, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B2_infos[29] = {
-     o2(0x8B,0xCC), o2(0x8C,0x48), o2(0xE2,0xE1), o2(0x95,0xB2),
-     o2(0x90,0x88), o2(0x96,0xAE), o2(0xE2,0xE2), o2(0x97,0xB1),
-     o2(0x94,0x94), o2(0x91,0x65), o2(0x94,0x53), o2(0x8F,0x6C),
-     o2(0x88,0xBE), o2(0xE2,0xE7), o2(0xE2,0xE5), o2(0xE2,0xE3),
-     o2(0x8A,0x9F), o2(0x8F,0xCF), o2(0xE2,0xE8), o2(0xE2,0xE6),
-     o2(0xE2,0xE4), o2(0xE2,0xEC), o2(0xE2,0xEB), o2(0xE2,0xEA),
-     o2(0xE2,0xE9), o2(0xE2,0xED), o2(0xE2,0xEE), o2(0x90,0xB8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B2 = {
-    to_SHIFT_JIS_E7_B2_offsets,
-    to_SHIFT_JIS_E7_B2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B3 */
-  /* used from to_EUC_JP_E7_B3 */
-      0, 22,  1, 22, 22,  2, 22, 22,   22, 22,  3, 22, 22, 22,  4, 22,
-     22, 22,  5, 22, 22, 22,  6, 22,    7, 22, 22, 22,  8, 22,  9, 10,
-     11, 22, 12, 22, 22, 22, 22, 13,   22, 22, 22, 22, 22, 22, 22, 14,
-     22, 22, 15, 22, 16, 22, 17, 22,   18, 22, 19, 20, 22, 22, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B3_infos[23] = {
-     o2(0xE2,0xEF), o2(0xE2,0xF1), o2(0xE2,0xF0), o2(0x8C,0xD0),
-     o2(0x91,0x57), o2(0xE2,0xF3), o2(0x93,0x9C), o2(0xE2,0xF2),
-     o2(0xE2,0xF4), o2(0x95,0xB3), o2(0x91,0x8C), o2(0x8D,0x66),
-     o2(0xE2,0xF5), o2(0x97,0xC6), o2(0xE2,0xF7), o2(0xE2,0xF8),
-     o2(0xE2,0xF9), o2(0xE2,0xFA), o2(0x8E,0x85), o2(0xE2,0xFB),
-     o2(0x8C,0x6E), o2(0x8B,0x8A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B3 = {
-    to_SHIFT_JIS_E7_B3_offsets,
-    to_SHIFT_JIS_E7_B3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B4 */
-  /* used from to_EUC_JP_E7_B4 */
-      0, 31,  1, 31,  2,  3,  4, 31,   31, 31,  5,  6, 31,  7, 31, 31,
-      8, 31, 31, 31,  9, 10, 31, 11,   12, 13, 14, 15, 16, 31, 31, 31,
-     17, 18, 19, 31, 31, 31, 31, 31,   31, 31, 31, 20, 21, 31, 22, 23,
-     24, 31, 25, 26, 31, 27, 31, 31,   31, 28, 29, 31, 31, 31, 31, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B4_infos[32] = {
-     o2(0x8B,0x49), o2(0xE3,0x40), o2(0x96,0xF1), o2(0x8D,0x67),
-     o2(0xE2,0xFC), o2(0xE3,0x43), o2(0x96,0xE4), o2(0x94,0x5B),
-     o2(0x95,0x52), o2(0x8F,0x83), o2(0xE3,0x42), o2(0x8E,0xD1),
-     o2(0x8D,0x68), o2(0x8E,0x86), o2(0x8B,0x89), o2(0x95,0xB4),
-     o2(0xE3,0x41), o2(0x91,0x66), o2(0x96,0x61), o2(0x8D,0xF5),
-     o2(0x8E,0x87), o2(0x92,0xDB), o2(0xE3,0x46), o2(0x97,0xDD),
-     o2(0x8D,0xD7), o2(0xE3,0x47), o2(0x90,0x61), o2(0xE3,0x49),
-     o2(0x8F,0xD0), o2(0x8D,0xAE), o2(0xE3,0x48),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B4 = {
-    to_SHIFT_JIS_E7_B4_offsets,
-    to_SHIFT_JIS_E7_B4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B5 */
-  /* used from to_EUC_JP_E7_B5 */
-     28, 28,  0,  1,  2,  3,  4, 28,    5, 28, 28,  6,  7, 28,  8,  9,
-     10, 28, 28, 28, 28, 28, 11, 28,   28, 28, 28, 12, 13, 28, 14, 28,
-     28, 15, 16, 17, 28, 28, 18, 28,   19, 28, 28, 28, 28, 28, 20, 28,
-     28, 21, 22, 23, 28, 24, 25, 28,   28, 26, 28, 28, 28, 27, 28, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B5_infos[29] = {
-     o2(0x8F,0x49), o2(0x8C,0xBC), o2(0x91,0x67), o2(0xE3,0x44),
-     o2(0xE3,0x4A), o2(0xFB,0x8A), o2(0xE3,0x45), o2(0x8C,0x6F),
-     o2(0xE3,0x4D), o2(0xE3,0x51), o2(0x8C,0x8B), o2(0xE3,0x4C),
-     o2(0xE3,0x55), o2(0xFB,0x8B), o2(0x8D,0x69), o2(0x97,0x8D),
-     o2(0x88,0xBA), o2(0xE3,0x52), o2(0x8B,0x8B), o2(0xE3,0x4F),
-     o2(0xE3,0x50), o2(0x93,0x9D), o2(0xE3,0x4E), o2(0xE3,0x4B),
-     o2(0x8A,0x47), o2(0x90,0xE2), o2(0x8C,0xA6), o2(0xE3,0x57),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B5 = {
-    to_SHIFT_JIS_E7_B5_offsets,
-    to_SHIFT_JIS_E7_B5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B6 */
-  /* used from to_EUC_JP_E7_B6 */
-     28, 28, 28, 28, 28, 28, 28, 28,   28,  0, 28, 28, 28, 28, 28,  1,
-     28, 28, 28,  2, 28, 28, 28, 28,   28,  3,  4,  5,  6, 28, 28,  7,
-      8, 28,  9, 10, 28, 28, 28, 28,   28, 28, 28, 11, 12, 13, 14, 15,
-     16, 17, 18, 28, 19, 20, 28, 21,   22, 28, 23, 24, 28, 25, 26, 27,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B6_infos[29] = {
-     o2(0xE3,0x54), o2(0xE3,0x56), o2(0xE3,0x53), o2(0x8C,0x70),
-     o2(0x91,0xB1), o2(0xE3,0x58), o2(0x91,0x8E), o2(0xE3,0x65),
-     o2(0xFB,0x8D), o2(0xE3,0x61), o2(0xE3,0x5B), o2(0xE3,0x5F),
-     o2(0x8E,0xF8), o2(0x88,0xDB), o2(0xE3,0x5A), o2(0xE3,0x62),
-     o2(0xE3,0x66), o2(0x8D,0x6A), o2(0x96,0xD4), o2(0x92,0xD4),
-     o2(0xE3,0x5C), o2(0xFB,0x8C), o2(0xE3,0x64), o2(0xE3,0x59),
-     o2(0x92,0x5D), o2(0xE3,0x5E), o2(0x88,0xBB), o2(0x96,0xC8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B6 = {
-    to_SHIFT_JIS_E7_B6_offsets,
-    to_SHIFT_JIS_E7_B6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B7 */
-  /* used from to_EUC_JP_E7_B7 */
-     23, 23, 23, 23, 23, 23, 23,  0,   23, 23,  1,  2, 23, 23, 23,  3,
-     23,  4,  5, 23, 23,  6,  7, 23,    8, 23,  9, 23, 10, 11, 12, 23,
-     13, 14, 23, 23, 15, 23, 23, 23,   16, 17, 23, 23, 18, 23, 23, 19,
-     23, 23, 20, 23, 21, 23, 23, 23,   23, 23, 23, 22, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B7_infos[24] = {
-     o2(0xE3,0x5D), o2(0x8B,0xD9), o2(0x94,0xEA), o2(0x91,0x8D),
-     o2(0x97,0xCE), o2(0x8F,0x8F), o2(0xE3,0x8E), o2(0xFB,0x8E),
-     o2(0xE3,0x67), o2(0x90,0xFC), o2(0xE3,0x63), o2(0xE3,0x68),
-     o2(0xE3,0x6A), o2(0x92,0xF7), o2(0xE3,0x6D), o2(0xE3,0x69),
-     o2(0x95,0xD2), o2(0x8A,0xC9), o2(0x96,0xC9), o2(0x88,0xDC),
-     o2(0xE3,0x6C), o2(0x97,0xFB), o2(0xE3,0x6B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B7 = {
-    to_SHIFT_JIS_E7_B7_offsets,
-    to_SHIFT_JIS_E7_B7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B8 */
-  /* used from to_EUC_JP_E7_B8 */
-     25,  0, 25, 25,  1,  2, 25, 25,   25,  3,  4,  5, 25, 25, 25, 25,
-     25, 25,  6, 25, 25, 25, 25, 25,   25, 25, 25,  7, 25, 25,  8,  9,
-     25, 10, 11, 12, 25, 25, 13, 25,   25, 25, 25, 14, 25, 25, 15, 25,
-     25, 16, 17, 25, 25, 18, 25, 19,   25, 20, 21, 22, 25, 23, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B8_infos[26] = {
-     o2(0x89,0x8F), o2(0x93,0xEA), o2(0xE3,0x6E), o2(0xE3,0x75),
-     o2(0xE3,0x6F), o2(0xE3,0x76), o2(0xE3,0x72), o2(0x94,0x9B),
-     o2(0x8E,0xC8), o2(0xE3,0x74), o2(0xE3,0x71), o2(0xE3,0x77),
-     o2(0xE3,0x70), o2(0x8F,0x63), o2(0x96,0x44), o2(0x8F,0x6B),
-     o2(0xE3,0x73), o2(0xE3,0x80), o2(0xE3,0x7B), o2(0xE3,0x7E),
-     o2(0xE3,0x7C), o2(0xE3,0x81), o2(0xE3,0x7A), o2(0xE3,0x60),
-     o2(0x90,0xD1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B8 = {
-    to_SHIFT_JIS_E7_B8_offsets,
-    to_SHIFT_JIS_E7_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_B9 */
-  /* used from to_EUC_JP_E7_B9 */
-     25,  0, 25,  1, 25, 25,  2, 25,   25, 25,  3,  4, 25,  5, 25, 25,
-     25, 25,  6, 25,  7,  8,  9, 25,   25, 10, 11, 25, 25, 12, 13, 25,
-     25, 25, 25, 25, 25, 25, 14, 15,   25, 16, 17, 25, 25, 18, 25, 25,
-     19, 25, 25, 25, 25, 25, 25, 25,   25, 20, 25, 21, 22, 23, 25, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_B9_infos[26] = {
-     o2(0x94,0xC9), o2(0xE3,0x7D), o2(0xE3,0x78), o2(0x91,0x40),
-     o2(0x8C,0x71), o2(0x8F,0x4A), o2(0xFB,0x8F), o2(0x90,0x44),
-     o2(0x91,0x55), o2(0xE3,0x84), o2(0xE3,0x86), o2(0xE3,0x87),
-     o2(0xE3,0x83), o2(0xE3,0x85), o2(0xE3,0x79), o2(0xE3,0x82),
-     o2(0xE3,0x8A), o2(0xE3,0x89), o2(0x96,0x9A), o2(0x8C,0x4A),
-     o2(0xE3,0x88), o2(0xE3,0x8C), o2(0xE3,0x8B), o2(0xE3,0x8F),
-     o2(0xE3,0x91),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_B9 = {
-    to_SHIFT_JIS_E7_B9_offsets,
-    to_SHIFT_JIS_E7_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_BA */
-  /* used from to_EUC_JP_E7_BA */
-     15, 15,  0,  1, 15, 15, 15, 15,    2,  3,  4, 15,  5, 15,  6,  7,
-      8, 15,  9, 10, 11, 15, 12, 15,   15, 15, 15, 13, 14, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_BA_infos[16] = {
-     o2(0x8E,0x5B), o2(0xE3,0x8D), o2(0xE3,0x92), o2(0xE3,0x93),
-     o2(0xFA,0x5C), o2(0xE3,0x94), o2(0xE3,0x9A), o2(0x93,0x5A),
-     o2(0xE3,0x96), o2(0xE3,0x95), o2(0xE3,0x97), o2(0xE3,0x98),
-     o2(0xE3,0x99), o2(0xE3,0x9B), o2(0xE3,0x9C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_BA = {
-    to_SHIFT_JIS_E7_BA_offsets,
-    to_SHIFT_JIS_E7_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_BC */
-  /* used from to_EUC_JP_E7_BC */
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  0,  3,    1,  3,  2,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_BC_infos[4] = {
-     o2(0x8A,0xCA), o2(0xE3,0x9D), o2(0xE3,0x9E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_BC = {
-    to_SHIFT_JIS_E7_BC_offsets,
-    to_SHIFT_JIS_E7_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_BD */
-  /* used from to_EUC_JP_E7_BD */
-     24, 24, 24, 24, 24,  0, 24,  1,   24, 24, 24, 24,  2,  3,  4, 24,
-      5,  6, 24, 24,  7,  8, 24, 24,    9, 24, 24, 24, 24, 24, 24, 10,
-     11, 24, 24, 24, 24, 24, 24, 12,   13, 14, 15, 16, 24, 24, 17, 24,
-     18, 24, 19, 24, 24, 20, 24, 21,   22, 23, 24, 24, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_BD_infos[25] = {
-     o2(0xE3,0x9F), o2(0xFB,0x90), o2(0xE3,0xA0), o2(0xE3,0xA1),
-     o2(0xE3,0xA2), o2(0xE3,0xA3), o2(0xE3,0xA4), o2(0xE3,0xA6),
-     o2(0xE3,0xA5), o2(0xE3,0xA7), o2(0xE3,0xA8), o2(0xE3,0xA9),
-     o2(0xE3,0xAC), o2(0xE3,0xAA), o2(0xE3,0xAB), o2(0x8D,0xDF),
-     o2(0x8C,0x72), o2(0x92,0x75), o2(0x94,0xB1), o2(0x8F,0x90),
-     o2(0x94,0x6C), o2(0x94,0xEB), o2(0xE3,0xAD), o2(0x9C,0xEB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_BD = {
-    to_SHIFT_JIS_E7_BD_offsets,
-    to_SHIFT_JIS_E7_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_BE */
-  /* used from to_EUC_JP_E7_BE */
-     25, 25,  0,  1, 25,  2,  3,  4,    5, 25,  6, 25,  7, 25,  8, 25,
-     25, 25, 25, 25,  9, 25, 25, 25,   25, 25, 10, 25, 25, 11, 12, 25,
-     25, 13, 25, 14, 15, 25, 25, 25,   16, 17, 25, 25, 25, 25, 18, 19,
-     25, 25, 20, 25, 25, 25, 21, 25,   22, 23, 25, 25, 25, 24, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_BE_infos[26] = {
-     o2(0xE3,0xAE), o2(0xE3,0xB0), o2(0x97,0x85), o2(0xE3,0xAF),
-     o2(0xE3,0xB2), o2(0xE3,0xB1), o2(0x97,0x72), o2(0xE3,0xB3),
-     o2(0x94,0xFC), o2(0xE3,0xB4), o2(0xE3,0xB7), o2(0xE3,0xB6),
-     o2(0xE3,0xB5), o2(0xFB,0x91), o2(0xE3,0xB8), o2(0x8C,0x51),
-     o2(0x91,0x41), o2(0x8B,0x60), o2(0xE3,0xBC), o2(0xE3,0xB9),
-     o2(0xE3,0xBA), o2(0xE3,0xBD), o2(0xE3,0xBE), o2(0xE3,0xBB),
-     o2(0x89,0x48),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_BE = {
-    to_SHIFT_JIS_E7_BE_offsets,
-    to_SHIFT_JIS_E7_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7_BF */
-  /* used from to_EUC_JP_E7_BF */
-     18,  0, 18, 18, 18,  1,  2, 18,   18, 18,  3, 18,  4, 18, 18, 18,
-     18, 18,  5, 18,  6,  7, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-      8,  9, 18, 18, 18, 18, 10, 18,   18, 11, 18, 12, 18, 18, 18, 18,
-     13, 18, 18, 14, 18, 18, 18, 18,   18, 15, 18, 16, 17, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_BF_infos[19] = {
-     o2(0x89,0xA5), o2(0xE3,0xC0), o2(0xE3,0xC1), o2(0xE3,0xC2),
-     o2(0x97,0x82), o2(0x8F,0x4B), o2(0xE3,0xC4), o2(0xE3,0xC3),
-     o2(0x90,0x89), o2(0xE3,0xC5), o2(0xE3,0xC6), o2(0xE3,0xC7),
-     o2(0x8A,0xE3), o2(0x8A,0xCB), o2(0xE3,0xC8), o2(0xE3,0xC9),
-     o2(0x96,0x7C), o2(0x97,0x83),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7_BF = {
-    to_SHIFT_JIS_E7_BF_offsets,
-    to_SHIFT_JIS_E7_BF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E7 */
-  /* used from to_EUC_JP_E7 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 63, 59, 60, 61, 62,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E7_infos[64] = {
-     &to_SHIFT_JIS_E7_80, &to_SHIFT_JIS_E7_81,
-     &to_SHIFT_JIS_E7_82, &to_SHIFT_JIS_E7_83,
-     &to_SHIFT_JIS_E7_84, &to_SHIFT_JIS_E7_85,
-     &to_SHIFT_JIS_E7_86, &to_SHIFT_JIS_E7_87,
-     &to_SHIFT_JIS_E7_88, &to_SHIFT_JIS_E7_89,
-     &to_SHIFT_JIS_E7_8A, &to_SHIFT_JIS_E7_8B,
-     &to_SHIFT_JIS_E7_8C, &to_SHIFT_JIS_E7_8D,
-     &to_SHIFT_JIS_E7_8E, &to_SHIFT_JIS_E7_8F,
-     &to_SHIFT_JIS_E7_90, &to_SHIFT_JIS_E7_91,
-     &to_SHIFT_JIS_E7_92, &to_SHIFT_JIS_E7_93,
-     &to_SHIFT_JIS_E7_94, &to_SHIFT_JIS_E7_95,
-     &to_SHIFT_JIS_E7_96, &to_SHIFT_JIS_E7_97,
-     &to_SHIFT_JIS_E7_98, &to_SHIFT_JIS_E7_99,
-     &to_SHIFT_JIS_E7_9A, &to_SHIFT_JIS_E7_9B,
-     &to_SHIFT_JIS_E7_9C, &to_SHIFT_JIS_E7_9D,
-     &to_SHIFT_JIS_E7_9E, &to_SHIFT_JIS_E7_9F,
-     &to_SHIFT_JIS_E7_A0, &to_SHIFT_JIS_E7_A1,
-     &to_SHIFT_JIS_E7_A2, &to_SHIFT_JIS_E7_A3,
-     &to_SHIFT_JIS_E7_A4, &to_SHIFT_JIS_E7_A5,
-     &to_SHIFT_JIS_E7_A6, &to_SHIFT_JIS_E7_A7,
-     &to_SHIFT_JIS_E7_A8, &to_SHIFT_JIS_E7_A9,
-     &to_SHIFT_JIS_E7_AA, &to_SHIFT_JIS_E7_AB,
-     &to_SHIFT_JIS_E7_AC, &to_SHIFT_JIS_E7_AD,
-     &to_SHIFT_JIS_E7_AE, &to_SHIFT_JIS_E7_AF,
-     &to_SHIFT_JIS_E7_B0, &to_SHIFT_JIS_E7_B1,
-     &to_SHIFT_JIS_E7_B2, &to_SHIFT_JIS_E7_B3,
-     &to_SHIFT_JIS_E7_B4, &to_SHIFT_JIS_E7_B5,
-     &to_SHIFT_JIS_E7_B6, &to_SHIFT_JIS_E7_B7,
-     &to_SHIFT_JIS_E7_B8, &to_SHIFT_JIS_E7_B9,
-     &to_SHIFT_JIS_E7_BA, &to_SHIFT_JIS_E7_BC,
-     &to_SHIFT_JIS_E7_BD, &to_SHIFT_JIS_E7_BE,
-     &to_SHIFT_JIS_E7_BF,               UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E7 = {
-    to_SHIFT_JIS_E7_offsets,
-    to_SHIFT_JIS_E7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_80 */
-  /* used from to_EUC_JP_E8_80 */
-      0,  1, 22,  2,  3,  4,  5, 22,   22, 22, 22,  6,  7, 22, 22, 22,
-      8, 22,  9, 22, 22, 10, 22, 11,   12, 13, 22, 22, 14, 22, 22, 22,
-     22, 15, 22, 22, 22, 22, 22, 22,   16, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 17, 22, 22, 18, 22,   22, 22, 22, 19, 22, 20, 22, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_80_infos[23] = {
-     o2(0x97,0x73), o2(0x98,0x56), o2(0x8D,0x6C), o2(0xE3,0xCC),
-     o2(0x8E,0xD2), o2(0xE3,0xCB), o2(0xE3,0xCD), o2(0x8E,0xA7),
-     o2(0x91,0xCF), o2(0xE3,0xCE), o2(0x8D,0x6B), o2(0x96,0xD5),
-     o2(0xE3,0xCF), o2(0xE3,0xD0), o2(0xE3,0xD1), o2(0xE3,0xD2),
-     o2(0xE3,0xD3), o2(0x8E,0xA8), o2(0x96,0xEB), o2(0xE3,0xD5),
-     o2(0x92,0x5E), o2(0xE3,0xD4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_80 = {
-    to_SHIFT_JIS_E8_80_offsets,
-    to_SHIFT_JIS_E8_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_81 */
-  /* used from to_EUC_JP_E8_81 */
-     22, 22, 22, 22, 22, 22,  0, 22,   22, 22,  1, 22, 22, 22, 22, 22,
-     22, 22,  2, 22, 22, 22,  3, 22,    4, 22,  5, 22, 22, 22,  6,  7,
-     22,  8,  9, 22, 22, 22, 22, 22,   10, 22, 22, 22, 22, 22, 22, 11,
-     12, 22, 13, 14, 15, 22, 16, 17,   22, 18, 22, 22, 22, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_81_infos[23] = {
-     o2(0xE3,0xD7), o2(0xE3,0xD6), o2(0xE3,0xD8), o2(0x90,0xB9),
-     o2(0xE3,0xD9), o2(0xE3,0xDA), o2(0x95,0xB7), o2(0xE3,0xDB),
-     o2(0x91,0x8F), o2(0xE3,0xDC), o2(0xE3,0xDD), o2(0x97,0xFC),
-     o2(0xE3,0xE0), o2(0xE3,0xDF), o2(0xE3,0xDE), o2(0x92,0xAE),
-     o2(0xE3,0xE1), o2(0x90,0x45), o2(0xE3,0xE2), o2(0xE3,0xE3),
-     o2(0x98,0x57), o2(0xE3,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_81 = {
-    to_SHIFT_JIS_E8_81_offsets,
-    to_SHIFT_JIS_E8_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_82 */
-  /* used from to_EUC_JP_E8_82 */
-     25, 25, 25, 25,  0,  1,  2,  3,   25,  4, 25,  5,  6, 25, 25, 25,
-     25, 25, 25,  7, 25, 25,  8, 25,    9, 25, 10, 11, 25, 12, 25, 25,
-     25, 13, 14, 25, 25, 15, 25, 25,   25, 16, 17, 25, 18, 19, 25, 20,
-     25, 21, 22, 25, 23, 25, 25, 25,   25, 25, 24, 25, 25, 25, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_82_infos[26] = {
-     o2(0xE3,0xE5), o2(0xE3,0xE7), o2(0xE3,0xE6), o2(0x94,0xA3),
-     o2(0x93,0xF7), o2(0x98,0x5D), o2(0x94,0xA7), o2(0xE3,0xE9),
-     o2(0x8F,0xD1), o2(0x95,0x49), o2(0xE3,0xEA), o2(0xE3,0xE8),
-     o2(0x8A,0xCC), o2(0x8C,0xD2), o2(0x8E,0x88), o2(0x94,0xEC),
-     o2(0x8C,0xA8), o2(0x96,0x62), o2(0xE3,0xED), o2(0xE3,0xEB),
-     o2(0x8D,0x6D), o2(0x8D,0x6E), o2(0x88,0xE7), o2(0x8D,0xE6),
-     o2(0x94,0x78),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_82 = {
-    to_SHIFT_JIS_E8_82_offsets,
-    to_SHIFT_JIS_E8_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_83 */
-  /* used from to_EUC_JP_E8_83 */
-     20, 20, 20,  0,  1, 20,  2, 20,   20, 20, 20, 20,  3, 20,  4, 20,
-     20, 20, 20, 20, 20, 20,  5, 20,   20,  6,  7,  8, 20,  9, 10, 20,
-     20, 11, 20, 20, 12, 13, 20, 20,   20, 20, 20, 20, 20, 20, 20, 14,
-     20, 15, 20, 20, 16, 20, 20, 20,   17, 20, 20, 20, 18, 19, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_83_infos[21] = {
-     o2(0x88,0xDD), o2(0xE3,0xF2), o2(0x92,0x5F), o2(0x94,0x77),
-     o2(0x91,0xD9), o2(0xE3,0xF4), o2(0xE3,0xF0), o2(0xE3,0xF3),
-     o2(0xE3,0xEE), o2(0xE3,0xF1), o2(0x96,0x45), o2(0x8C,0xD3),
-     o2(0x88,0xFB), o2(0xE3,0xEF), o2(0xE3,0xF6), o2(0xE3,0xF7),
-     o2(0x93,0xB7), o2(0x8B,0xB9), o2(0xE4,0x45), o2(0x94,0x5C),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_83 = {
-    to_SHIFT_JIS_E8_83_offsets,
-    to_SHIFT_JIS_E8_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_84 */
-  /* used from to_EUC_JP_E8_84 */
-     16, 16,  0, 16, 16,  1,  2,  3,    4,  5,  6, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16,  7,  8, 16, 16, 16, 16,
-     16, 16, 16,  9, 16, 16, 16, 16,   16, 10, 16, 16, 16, 16, 16, 11,
-     16, 12, 16, 13, 16, 16, 16, 16,   16, 14, 16, 16, 16, 16, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_84_infos[17] = {
-     o2(0x8E,0x89), o2(0x8B,0xBA), o2(0x90,0xC6), o2(0x98,0x65),
-     o2(0x96,0xAC), o2(0xE3,0xF5), o2(0x90,0xD2), o2(0x8B,0x72),
-     o2(0xE3,0xF8), o2(0xE3,0xFA), o2(0xE3,0xF9), o2(0xE3,0xFB),
-     o2(0x92,0x45), o2(0x94,0x5D), o2(0x92,0xAF), o2(0xE4,0x42),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_84 = {
-    to_SHIFT_JIS_E8_84_offsets,
-    to_SHIFT_JIS_E8_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_85 */
-  /* used from to_EUC_JP_E8_85 */
-     20, 20, 20, 20, 20, 20,  0, 20,   20, 20, 20,  1, 20, 20,  2, 20,
-      3,  4, 20,  5,  6,  7, 20, 20,   20, 20, 20, 20, 20, 20, 20,  8,
-     20, 20, 20, 20, 20,  9, 10, 20,   20, 20, 20, 11, 20, 20, 12, 20,
-     13, 14, 20, 20, 15, 20, 20, 20,   16, 17, 18, 20, 20, 20, 20, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_85_infos[21] = {
-     o2(0xE4,0x41), o2(0xE3,0xFC), o2(0x90,0x74), o2(0x95,0x85),
-     o2(0xE4,0x44), o2(0xE4,0x43), o2(0x8D,0x6F), o2(0x98,0x72),
-     o2(0xE4,0x54), o2(0xE4,0x48), o2(0xE4,0x49), o2(0x8E,0xEE),
-     o2(0xE4,0x47), o2(0x8D,0x98), o2(0xE4,0x46), o2(0xE4,0x4A),
-     o2(0x92,0xB0), o2(0x95,0xA0), o2(0x91,0x42), o2(0x91,0xDA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_85 = {
-    to_SHIFT_JIS_E8_85_offsets,
-    to_SHIFT_JIS_E8_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_86 */
-  /* used from to_EUC_JP_E8_86 */
-      0, 24,  1,  2, 24, 24, 24, 24,    3, 24,  4, 24, 24, 24, 24,  5,
-     24, 24, 24,  6, 24,  7, 24, 24,   24, 24,  8, 24,  9, 10, 24, 24,
-     11, 24, 24, 12, 13, 24, 24, 24,   14, 15, 24, 24, 24, 24, 24, 24,
-     16, 24, 24, 17, 24, 18, 24, 24,   19, 24, 20, 24, 24, 21, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_86_infos[25] = {
-     o2(0xE4,0x4E), o2(0xE4,0x4F), o2(0xE4,0x4B), o2(0xE4,0x4C),
-     o2(0xE4,0x4D), o2(0x8D,0x70), o2(0xE4,0x55), o2(0xE4,0x51),
-     o2(0x95,0x86), o2(0x96,0x8C), o2(0x95,0x47), o2(0xE4,0x50),
-     o2(0xE4,0x53), o2(0xE4,0x52), o2(0x96,0x63), o2(0xE4,0x56),
-     o2(0xE4,0x57), o2(0x91,0x56), o2(0xE4,0x58), o2(0xE4,0x5A),
-     o2(0xE4,0x5E), o2(0xE4,0x5B), o2(0xE4,0x59), o2(0x94,0x5E),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_86 = {
-    to_SHIFT_JIS_E8_86_offsets,
-    to_SHIFT_JIS_E8_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_87 */
-  /* used from to_EUC_JP_E8_87 */
-      0, 25,  1, 25, 25, 25,  2, 25,    3,  4, 25, 25, 25,  5, 25, 25,
-     25,  6, 25,  7, 25, 25, 25, 25,    8,  9, 10, 25, 25, 25, 25, 11,
-     12, 25, 25, 13, 25, 14, 25, 15,   16, 25, 17, 25, 25, 18, 25, 25,
-     25, 25, 25, 19, 20, 25, 25, 25,   25, 25, 21, 22, 23, 25, 24, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_87_infos[26] = {
-     o2(0xE4,0x5C), o2(0xE4,0x5D), o2(0x89,0xB0), o2(0xE4,0x64),
-     o2(0xE4,0x5F), o2(0xE4,0x60), o2(0xE4,0x61), o2(0x91,0x9F),
-     o2(0xE4,0x63), o2(0xE4,0x62), o2(0xE4,0x65), o2(0xE4,0x66),
-     o2(0xE4,0x67), o2(0x90,0x62), o2(0x89,0xE7), o2(0xE4,0x68),
-     o2(0x97,0xD5), o2(0x8E,0xA9), o2(0x8F,0x4C), o2(0x8E,0x8A),
-     o2(0x92,0x76), o2(0xE4,0x69), o2(0xE4,0x6A), o2(0x89,0x50),
-     o2(0xE4,0x6B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_87 = {
-    to_SHIFT_JIS_E8_87_offsets,
-    to_SHIFT_JIS_E8_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_88 */
-  /* used from to_EUC_JP_E8_88 */
-     30,  0,  1, 30, 30,  2, 30,  3,    4,  5,  6, 30,  7,  8,  9, 30,
-     10, 30, 11, 30, 30, 30, 12, 13,   14, 30, 30, 15, 16, 30, 17, 18,
-     30, 30, 30, 30, 30, 30, 30, 30,   30, 19, 20, 21, 22, 30, 23, 30,
-     30, 30, 30, 24, 30, 25, 26, 27,   28, 29, 30, 30, 30, 30, 30, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_88_infos[31] = {
-     o2(0xE4,0x6C), o2(0xE4,0x6D), o2(0xE4,0x6E), o2(0xE4,0x6F),
-     o2(0x8B,0xBB), o2(0x9D,0xA8), o2(0xE4,0x70), o2(0x90,0xE3),
-     o2(0xE4,0x71), o2(0x8E,0xC9), o2(0xE4,0x72), o2(0x98,0xAE),
-     o2(0xE4,0x73), o2(0x95,0xDC), o2(0x8A,0xDA), o2(0x91,0x43),
-     o2(0x8F,0x77), o2(0x95,0x91), o2(0x8F,0x4D), o2(0xE4,0x74),
-     o2(0x8D,0x71), o2(0xE4,0x75), o2(0x94,0xCA), o2(0xE4,0x84),
-     o2(0xE4,0x77), o2(0x91,0xC7), o2(0x94,0x95), o2(0x8C,0xBD),
-     o2(0xE4,0x76), o2(0x91,0x44),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_88 = {
-    to_SHIFT_JIS_E8_88_offsets,
-    to_SHIFT_JIS_E8_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_89 */
-  /* used from to_EUC_JP_E8_89 */
-      0, 21, 21, 21, 21, 21, 21,  1,   21, 21, 21, 21, 21, 21, 21, 21,
-     21, 21, 21, 21, 21, 21, 21, 21,    2,  3,  4, 21, 21,  5, 21,  6,
-     21, 21,  7, 21,  8, 21,  9, 21,   10, 21, 11, 12, 21, 21, 13, 14,
-     21, 15, 16, 21, 21, 21, 17, 18,   19, 21, 21, 21, 21, 21, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_89_infos[22] = {
-     o2(0xE4,0x78), o2(0x92,0xF8), o2(0xE4,0x7A), o2(0xE4,0x79),
-     o2(0xE4,0x7C), o2(0xE4,0x7B), o2(0xE4,0x7D), o2(0xE4,0x80),
-     o2(0xE4,0x7E), o2(0x8A,0xCD), o2(0xE4,0x81), o2(0xE4,0x82),
-     o2(0xE4,0x83), o2(0x8D,0xAF), o2(0x97,0xC7), o2(0xE4,0x85),
-     o2(0x90,0x46), o2(0x89,0x90), o2(0xE4,0x86), o2(0xE4,0x87),
-     o2(0xE4,0x88),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_89 = {
-    to_SHIFT_JIS_E8_89_offsets,
-    to_SHIFT_JIS_E8_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8A */
-  /* used from to_EUC_JP_E8_8A */
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18,  0, 18,  1, 18, 18,
-     18, 18,  2, 18, 18, 18, 18, 18,   18,  3, 18, 18, 18,  4, 18,  5,
-     18, 18, 18, 18, 18,  6,  7, 18,   18, 18, 18,  8,  9, 10, 18, 11,
-     18, 12, 18, 13, 18, 18, 18, 18,   14, 15, 18, 16, 18, 17, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8A_infos[19] = {
-     o2(0x88,0xF0), o2(0xE4,0x89), o2(0xE4,0x8A), o2(0x95,0x87),
-     o2(0x8E,0xC5), o2(0xE4,0x8C), o2(0x8A,0x48), o2(0x88,0xB0),
-     o2(0xE4,0x8B), o2(0xE4,0x8E), o2(0x94,0x6D), o2(0x90,0x63),
-     o2(0x89,0xD4), o2(0x96,0x46), o2(0x8C,0x7C), o2(0x8B,0xDA),
-     o2(0xE4,0x8D), o2(0x89,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8A = {
-    to_SHIFT_JIS_E8_8A_offsets,
-    to_SHIFT_JIS_E8_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8B */
-  /* used from to_EUC_JP_E8_8B */
-     23, 23, 23, 23, 23,  0, 23, 23,   23, 23, 23, 23, 23, 23, 23, 23,
-     23,  1,  2,  3,  4, 23, 23,  5,   23,  6, 23,  7,  8, 23,  9, 10,
-     23, 11, 23, 12, 23, 13, 14, 15,   23, 23, 23, 16, 23, 23, 23, 23,
-     23, 17, 23, 18, 19, 23, 23, 23,   23, 20, 21, 22, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8B_infos[24] = {
-     o2(0x8A,0xA1), o2(0x89,0x91), o2(0xE4,0x92), o2(0x97,0xE8),
-     o2(0x91,0xDB), o2(0x95,0x63), o2(0xE4,0x9E), o2(0x89,0xD5),
-     o2(0xE4,0x9C), o2(0xE4,0x9A), o2(0xE4,0x91), o2(0xE4,0x8F),
-     o2(0xE4,0x90), o2(0x8E,0xE1), o2(0x8B,0xEA), o2(0x92,0x97),
-     o2(0x93,0xCF), o2(0x89,0x70), o2(0xE4,0x94), o2(0xE4,0x93),
-     o2(0xE4,0x99), o2(0xE4,0x95), o2(0xE4,0x98),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8B = {
-    to_SHIFT_JIS_E8_8B_offsets,
-    to_SHIFT_JIS_E8_8B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8C */
-  /* used from to_EUC_JP_E8_8C */
-     23,  0,  1,  2,  3,  4,  5, 23,   23,  6, 23, 23, 23, 23,  7, 23,
-     23, 23, 23, 23, 23, 23,  8,  9,   10, 23, 23, 23, 11, 23, 23, 23,
-     23, 23, 23, 12, 23, 23, 23, 23,   13, 23, 23, 14, 23, 23, 23, 15,
-     23, 16, 17, 23, 18, 19, 20, 23,   21, 22, 23, 23, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8C_infos[24] = {
-     o2(0xFB,0x93), o2(0x96,0xCE), o2(0xE4,0x97), o2(0x89,0xD6),
-     o2(0x8A,0x9D), o2(0xE4,0x9B), o2(0xE4,0x9D), o2(0x8C,0x73),
-     o2(0xE4,0xA1), o2(0xE4,0xAA), o2(0xE4,0xAB), o2(0x88,0xA9),
-     o2(0xE4,0xB2), o2(0x88,0xEF), o2(0xE4,0xA9), o2(0xE4,0xA8),
-     o2(0xE4,0xA3), o2(0xE4,0xA2), o2(0xE4,0xA0), o2(0xE4,0x9F),
-     o2(0x92,0x83), o2(0x91,0xF9), o2(0xE4,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8C = {
-    to_SHIFT_JIS_E8_8C_offsets,
-    to_SHIFT_JIS_E8_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8D */
-  /* used from to_EUC_JP_E8_8D */
-      0, 15, 15, 15, 15,  1, 15, 15,   15,  2,  3, 15, 15, 15, 15,  4,
-      5, 15,  6, 15, 15, 15, 15, 15,    7, 15, 15, 15, 15, 15, 15, 15,
-     15, 15,  8, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15,  9, 15, 10, 15, 11,   15, 15, 15, 12, 13, 15, 15, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8D_infos[16] = {
-     o2(0xE4,0xA4), o2(0xE4,0xA7), o2(0x91,0x90), o2(0x8C,0x74),
-     o2(0x89,0x60), o2(0xE4,0xA6), o2(0x8D,0x72), o2(0x91,0x91),
-     o2(0xFB,0x94), o2(0xE4,0xB8), o2(0xE4,0xB9), o2(0x89,0xD7),
-     o2(0x89,0xAC), o2(0xE4,0xB6), o2(0xFB,0x95),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8D = {
-    to_SHIFT_JIS_E8_8D_offsets,
-    to_SHIFT_JIS_E8_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8E */
-  /* used from to_EUC_JP_E8_8E */
-     18, 18, 18, 18, 18,  0, 18,  1,   18,  2,  3, 18, 18, 18,  4, 18,
-     18, 18, 18,  5, 18, 18,  6, 18,   18, 18,  7, 18, 18, 18,  8,  9,
-     10, 18, 11, 18, 18, 18, 18, 18,   12, 18, 13, 14, 18, 18, 18, 18,
-     18, 15, 18, 18, 18, 16, 18, 18,   18, 18, 18, 18, 18, 17, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8E_infos[19] = {
-     o2(0xE4,0xAC), o2(0xE4,0xB4), o2(0xE4,0xBB), o2(0xE4,0xB5),
-     o2(0xE4,0xB3), o2(0xE4,0x96), o2(0xE4,0xB1), o2(0xE4,0xAD),
-     o2(0x8A,0xCE), o2(0xE4,0xAF), o2(0xE4,0xBA), o2(0xE4,0xB0),
-     o2(0xE4,0xBC), o2(0xE4,0xAE), o2(0x94,0x9C), o2(0x97,0x89),
-     o2(0xE4,0xB7), o2(0xE4,0xCD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8E = {
-    to_SHIFT_JIS_E8_8E_offsets,
-    to_SHIFT_JIS_E8_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_8F */
-  /* used from to_EUC_JP_E8_8F */
-     23,  0, 23, 23, 23,  1, 23,  2,   23, 23,  3, 23,  4, 23,  5, 23,
-     23, 23, 23,  6, 23, 23,  7, 23,    8, 23, 23, 23,  9, 23, 23, 10,
-     11, 23, 23, 23, 23, 23, 23, 23,   23, 12, 23, 13, 23, 23, 23, 14,
-     15, 16, 17, 23, 18, 23, 19, 20,   23, 23, 23, 21, 23, 22, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_8F_infos[24] = {
-     o2(0xE4,0xC5), o2(0x90,0x9B), o2(0xFB,0x96), o2(0x8B,0x65),
-     o2(0x8B,0xDB), o2(0xE4,0xC0), o2(0x89,0xD9), o2(0x8F,0xD2),
-     o2(0xE4,0xC3), o2(0x8D,0xD8), o2(0x93,0x70), o2(0xE4,0xC8),
-     o2(0x95,0xEC), o2(0xE4,0xBF), o2(0x89,0xD8), o2(0x8C,0xD4),
-     o2(0x95,0x48), o2(0xE4,0xC9), o2(0xE4,0xBD), o2(0xFB,0x97),
-     o2(0xE4,0xC6), o2(0xE4,0xD0), o2(0xE4,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_8F = {
-    to_SHIFT_JIS_E8_8F_offsets,
-    to_SHIFT_JIS_E8_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_90_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_90 */
-  /* used from to_EUC_JP_E8_90 */
-     18, 18, 18,  0,  1, 18, 18,  2,   18, 18, 18,  3,  4,  5,  6, 18,
-     18, 18, 18,  7, 18, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-      8, 18,  9, 18, 18, 18, 18, 18,   18, 10, 11, 18, 12, 18, 18, 18,
-     18, 13, 18, 18, 18, 14, 18, 18,   15, 18, 18, 18, 16, 17, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_90_infos[19] = {
-     o2(0xE4,0xC2), o2(0x93,0xB8), o2(0xE4,0xC7), o2(0xE4,0xC4),
-     o2(0x96,0x47), o2(0xE4,0xCA), o2(0x88,0xDE), o2(0xE4,0xBE),
-     o2(0xE4,0xCC), o2(0xE4,0xCB), o2(0x94,0x8B), o2(0xE4,0xD2),
-     o2(0xE4,0xDD), o2(0x8A,0x9E), o2(0xE4,0xE0), o2(0xE4,0xCE),
-     o2(0xE4,0xD3), o2(0x97,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_90 = {
-    to_SHIFT_JIS_E8_90_offsets,
-    to_SHIFT_JIS_E8_90_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_91 */
-  /* used from to_EUC_JP_E8_91 */
-     21, 21, 21, 21, 21, 21,  0, 21,    1,  2, 21, 21, 21, 21,  3, 21,
-     21, 21, 21, 21, 21, 21, 21,  4,   21, 21, 21,  5, 21, 21, 21, 21,
-     21,  6,  7,  8, 21, 21,  9, 21,   21, 10, 21, 11, 12, 13, 14, 15,
-     21, 16, 21, 21, 21, 17, 21, 18,   21, 19, 20, 21, 21, 21, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_91_infos[22] = {
-     o2(0xE4,0xDC), o2(0xFB,0x98), o2(0x97,0x74), o2(0x97,0xA8),
-     o2(0x92,0x98), o2(0x8A,0x8B), o2(0x95,0x92), o2(0xE4,0xE2),
-     o2(0x93,0x9F), o2(0x88,0xAF), o2(0xE4,0xDB), o2(0xE4,0xD7),
-     o2(0x91,0x92), o2(0xE4,0xD1), o2(0xE4,0xD9), o2(0xE4,0xDE),
-     o2(0x94,0x4B), o2(0x88,0xA8), o2(0xE4,0xD6), o2(0xE4,0xDF),
-     o2(0x95,0x98),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_91 = {
-    to_SHIFT_JIS_E8_91_offsets,
-    to_SHIFT_JIS_E8_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_92_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_92 */
-  /* used from to_EUC_JP_E8_92 */
-     17, 17,  0, 17,  1, 17, 17, 17,   17, 17, 17,  2, 17, 17, 17, 17,
-      3, 17, 17, 17,  4, 17, 17, 17,   17,  5, 17, 17,  6, 17, 17,  7,
-     17,  8, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 17,  9, 17, 17,
-     17, 17, 10, 17, 11, 17, 17, 17,   12, 13, 17, 14, 15, 17, 17, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_92_infos[18] = {
-     o2(0xE4,0xDA), o2(0xE4,0xD5), o2(0x8F,0xD3), o2(0x8F,0x4E),
-     o2(0x8E,0xAA), o2(0x96,0xD6), o2(0x95,0x66), o2(0xE4,0xE5),
-     o2(0xE4,0xEE), o2(0xE4,0xD8), o2(0x8A,0x97), o2(0xFB,0x99),
-     o2(0x8F,0xF6), o2(0xE4,0xE3), o2(0xE4,0xE8), o2(0x91,0x93),
-     o2(0xE4,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_92 = {
-    to_SHIFT_JIS_E8_92_offsets,
-    to_SHIFT_JIS_E8_92_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_93_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_93 */
-  /* used from to_EUC_JP_E8_93 */
-     18,  0, 18, 18,  1, 18,  2, 18,   18,  3,  4,  5, 18,  6, 18, 18,
-      7,  8, 18, 18, 18, 18,  9, 18,   18, 10, 11, 18, 12, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 13, 18, 14, 18,
-     18, 18, 18, 18, 15, 18, 18, 18,   18, 18, 18, 18, 16, 18, 18, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_93_infos[19] = {
-     o2(0xE4,0xEB), o2(0x92,0x7E), o2(0xE4,0xEC), o2(0x97,0x75),
-     o2(0xE4,0xE1), o2(0x8A,0x57), o2(0xE4,0xE7), o2(0xE4,0xEA),
-     o2(0x96,0xAA), o2(0xE4,0xED), o2(0xE4,0xE6), o2(0xE4,0xE9),
-     o2(0xFA,0x60), o2(0x96,0x48), o2(0x98,0x40), o2(0xE4,0xF1),
-     o2(0xE4,0xF8), o2(0xE4,0xF0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_93 = {
-    to_SHIFT_JIS_E8_93_offsets,
-    to_SHIFT_JIS_E8_93_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_94_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_94 */
-  /* used from to_EUC_JP_E8_94 */
-      0, 16, 16, 16, 16, 16,  1, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16,  2, 16,  3,  4,  5, 16,  6,    7, 16,  8, 16, 16, 16, 16,  9,
-     16, 10, 16, 16, 16, 16, 11, 16,   16, 16, 16, 16, 12, 13, 16, 16,
-     16, 16, 16, 16, 16, 14, 16, 16,   16, 16, 16, 16, 16, 15, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_94_infos[17] = {
-     o2(0x8E,0xC1), o2(0xE4,0xCF), o2(0x95,0xCC), o2(0x96,0xA0),
-     o2(0xE4,0xF7), o2(0xE4,0xF6), o2(0xE4,0xF2), o2(0xE4,0xF3),
-     o2(0x89,0x55), o2(0xE4,0xF5), o2(0xE4,0xEF), o2(0x92,0xD3),
-     o2(0xE4,0xF4), o2(0x88,0xFC), o2(0x91,0xA0), o2(0x95,0xC1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_94 = {
-    to_SHIFT_JIS_E8_94_offsets,
-    to_SHIFT_JIS_E8_94_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_95 */
-  /* used from to_EUC_JP_E8_95 */
-      0,  1, 22,  2, 22, 22, 22, 22,    3,  4,  5,  6, 22, 22,  7, 22,
-     22, 22, 22,  8, 22,  9, 22, 10,   11, 12, 13, 22, 22, 22, 22, 22,
-     22, 22, 22, 14, 22, 22, 22, 22,   15, 16, 17, 18, 22, 19, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 20,   22, 22, 22, 22, 22, 22, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_95_infos[23] = {
-     o2(0xE4,0xF9), o2(0xE5,0x40), o2(0x94,0xD7), o2(0xE4,0xFC),
-     o2(0x8F,0xD4), o2(0x8E,0xC7), o2(0xE5,0x42), o2(0x8B,0xBC),
-     o2(0xFB,0x9A), o2(0xE5,0x43), o2(0x95,0x99), o2(0xE4,0xFB),
-     o2(0xFB,0x9B), o2(0xE4,0xD4), o2(0xE4,0xFA), o2(0x98,0x6E),
-     o2(0x93,0xA0), o2(0x95,0x93), o2(0xFB,0x9C), o2(0xE5,0x4A),
-     o2(0xE5,0x50), o2(0xE5,0x51),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_95 = {
-    to_SHIFT_JIS_E8_95_offsets,
-    to_SHIFT_JIS_E8_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_96 */
-  /* used from to_EUC_JP_E8_96 */
-      0, 24, 24, 24,  1, 24, 24,  2,    3, 24,  4, 24, 24, 24, 24, 24,
-      5,  6, 24, 24,  7, 24, 24,  8,   24,  9, 24, 10, 11, 24, 24, 24,
-     24, 24, 24, 24, 12, 24, 13, 24,   14, 15, 16, 17, 18, 24, 19, 20,
-     21, 24, 24, 24, 24, 24, 24, 24,   24, 22, 23, 24, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_96_infos[25] = {
-     o2(0xE5,0x44), o2(0x94,0x96), o2(0xE5,0x4E), o2(0xE5,0x46),
-     o2(0xE5,0x48), o2(0xE5,0x52), o2(0xE5,0x47), o2(0xE5,0x4B),
-     o2(0x89,0x92), o2(0x93,0xE3), o2(0xE5,0x4C), o2(0xE5,0x4F),
-     o2(0xE5,0x45), o2(0x91,0x45), o2(0xE5,0x49), o2(0x8E,0x46),
-     o2(0x90,0x64), o2(0x8C,0x4F), o2(0x96,0xF2), o2(0x96,0xF7),
-     o2(0x8F,0x92), o2(0xFB,0x9E), o2(0xE5,0x56), o2(0xE5,0x54),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_96 = {
-    to_SHIFT_JIS_E8_96_offsets,
-    to_SHIFT_JIS_E8_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_97 */
-  /* used from to_EUC_JP_E8_97 */
-     17,  0, 17, 17, 17, 17, 17, 17,   17,  1, 17, 17, 17,  2, 17,  3,
-      4, 17, 17, 17, 17,  5, 17, 17,   17, 17, 17, 17,  6,  7, 17, 17,
-     17, 17, 17, 17,  8,  9, 17, 17,   17, 10, 11, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 12,   17, 13, 14, 15, 17, 17, 16, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_97_infos[18] = {
-     o2(0x98,0x6D), o2(0xE5,0x53), o2(0x97,0x95), o2(0xE5,0x55),
-     o2(0xE5,0x57), o2(0xE5,0x58), o2(0xE5,0x5B), o2(0xE5,0x59),
-     o2(0x93,0xA1), o2(0xE5,0x5A), o2(0x94,0xCB), o2(0xE5,0x4D),
-     o2(0x8F,0x93), o2(0xE5,0x5C), o2(0xE5,0x61), o2(0x91,0x94),
-     o2(0xE5,0x60),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_97 = {
-    to_SHIFT_JIS_E8_97_offsets,
-    to_SHIFT_JIS_E8_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_98 */
-  /* used from to_EUC_JP_E8_98 */
-     14, 14,  0, 14, 14, 14,  1,  2,   14, 14,  3,  4, 14, 14, 14, 14,
-     14, 14, 14,  5, 14, 14,  6,  7,   14, 14,  8, 14, 14, 14, 14, 14,
-     14, 14,  9, 14, 14, 14, 14, 14,   14, 14, 14, 14, 14, 10, 14, 11,
-     12, 14, 14, 14, 14, 14, 14, 14,   14, 14, 14, 14, 14, 14, 14, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_98_infos[15] = {
-     o2(0xE5,0x41), o2(0xE5,0x62), o2(0x91,0x68), o2(0xE5,0x5D),
-     o2(0xE5,0x5F), o2(0xE5,0x5E), o2(0x9F,0x50), o2(0x9F,0x41),
-     o2(0xE5,0x64), o2(0xE5,0x63), o2(0x97,0x96), o2(0xE1,0xBA),
-     o2(0xE5,0x65), o2(0xE5,0x66),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_98 = {
-    to_SHIFT_JIS_E8_98_offsets,
-    to_SHIFT_JIS_E8_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_99 */
-  /* used from to_EUC_JP_E8_99 */
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 14, 14, 14, 14,  0,  1, 14,
-      2, 14, 14, 14,  3,  4, 14, 14,   14, 14,  5, 14,  6, 14,  7,  8,
-     14, 14, 14, 14, 14, 14, 14,  9,   14, 14, 14, 10, 14, 14, 14, 14,
-     14, 11, 14, 14, 14, 14, 14, 14,   14, 12, 14, 13, 14, 14, 14, 14,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_99_infos[15] = {
-     o2(0xE5,0x67), o2(0x8C,0xD5), o2(0x8B,0x73), o2(0xE5,0x69),
-     o2(0x99,0x7C), o2(0x8B,0x95), o2(0x97,0xB8), o2(0x8B,0xF1),
-     o2(0xE5,0x6A), o2(0xE5,0x6B), o2(0x92,0x8E), o2(0xE5,0x6C),
-     o2(0x93,0xF8), o2(0x88,0xB8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_99 = {
-    to_SHIFT_JIS_E8_99_offsets,
-    to_SHIFT_JIS_E8_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9A */
-  /* used from to_EUC_JP_E8_9A */
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13,  0,  1,  2, 13, 13, 13,
-     13, 13, 13,  3, 13,  4, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13,  5,  6, 13, 13, 13,   13,  7,  8,  9, 13, 13, 13, 10,
-     11, 13, 13, 13, 13, 13, 12, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9A_infos[14] = {
-     o2(0x89,0xE1), o2(0xE5,0x71), o2(0xE5,0x72), o2(0xE5,0x6D),
-     o2(0x8E,0x5C), o2(0xE5,0x6E), o2(0x94,0x61), o2(0xE5,0x6F),
-     o2(0xE5,0x70), o2(0xE5,0x7A), o2(0xE5,0x74), o2(0xE5,0x77),
-     o2(0xE5,0x73),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9A = {
-    to_SHIFT_JIS_E8_9A_offsets,
-    to_SHIFT_JIS_E8_9A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9B */
-  /* used from to_EUC_JP_E8_9B */
-     22, 22, 22, 22,  0, 22,  1,  2,   22,  3, 22,  4, 22,  5,  6, 22,
-     22, 22, 22, 22,  7, 22, 22, 22,   22,  8, 22,  9, 22, 22, 10, 11,
-     22, 22, 22, 22, 12, 22, 22, 22,   22, 13, 22, 22, 14, 15, 16, 17,
-     22, 22, 22, 22, 22, 22, 22, 22,   18, 19, 22, 20, 22, 22, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9B_infos[23] = {
-     o2(0xE5,0x75), o2(0xE5,0x76), o2(0x8E,0xD6), o2(0xE5,0x78),
-     o2(0x92,0x60), o2(0x8C,0x75), o2(0x8A,0x61), o2(0xE5,0x7B),
-     o2(0x8A,0x5E), o2(0xE5,0x81), o2(0xE5,0x7C), o2(0xE5,0x80),
-     o2(0x94,0xB8), o2(0xE5,0x7D), o2(0xE5,0x7E), o2(0x95,0x67),
-     o2(0x94,0xD8), o2(0xE5,0x82), o2(0x91,0xFB), o2(0xE5,0x8C),
-     o2(0xE5,0x88), o2(0x89,0xE9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9B = {
-    to_SHIFT_JIS_E8_9B_offsets,
-    to_SHIFT_JIS_E8_9B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9C */
-  /* used from to_EUC_JP_E8_9C */
-      0, 19,  1,  2, 19, 19,  3, 19,    4,  5,  6, 19, 19,  7, 19, 19,
-     19,  8,  9, 19, 19, 19, 19, 19,   10, 19, 11, 19, 12, 19, 19, 19,
-     19, 19, 19, 19, 19, 13, 19, 19,   19, 14, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 15, 19, 19, 16,   19, 19, 19, 17, 19, 19, 19, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9C_infos[20] = {
-     o2(0xE5,0x86), o2(0x96,0x49), o2(0xE5,0x87), o2(0xE5,0x84),
-     o2(0xE5,0x85), o2(0xE5,0x8A), o2(0xE5,0x8D), o2(0xE5,0x8B),
-     o2(0xE5,0x89), o2(0xE5,0x83), o2(0x92,0x77), o2(0xE5,0x94),
-     o2(0x96,0xA8), o2(0xE5,0x92), o2(0xE5,0x93), o2(0xE5,0x8E),
-     o2(0xE5,0x90), o2(0xE5,0x91), o2(0xE5,0x8F),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9C = {
-    to_SHIFT_JIS_E8_9C_offsets,
-    to_SHIFT_JIS_E8_9C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9D */
-  /* used from to_EUC_JP_E8_9D */
-     19, 19, 19, 19, 19, 19, 19, 19,   19,  0, 19,  1,  2, 19,  3, 19,
-     19, 19, 19,  4, 19,  5, 19,  6,   19,  7, 19, 19, 19, 19, 19,  8,
-      9, 19, 19, 10, 19, 19, 11, 19,   12, 19, 13, 19, 19, 19, 14, 19,
-     19, 19, 19, 19, 15, 19, 16, 19,   17, 19, 19, 19, 19, 19, 19, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9D_infos[20] = {
-     o2(0x90,0xE4), o2(0x98,0x58), o2(0xE5,0x98), o2(0xE5,0x99),
-     o2(0xE5,0x9F), o2(0x90,0x49), o2(0xE5,0x9B), o2(0xE5,0x9E),
-     o2(0xE5,0x96), o2(0xE5,0x95), o2(0xE5,0xA0), o2(0x89,0xDA),
-     o2(0xE5,0x9C), o2(0xE5,0xA1), o2(0xE5,0x9D), o2(0xE5,0x9A),
-     o2(0x92,0xB1), o2(0xE5,0x97), o2(0x94,0x88),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9D = {
-    to_SHIFT_JIS_E8_9D_offsets,
-    to_SHIFT_JIS_E8_9D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9E */
-  /* used from to_EUC_JP_E8_9E */
-     10, 10,  0, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10,  1, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10,  2,
-     10, 10,  3, 10, 10, 10, 10, 10,   10, 10, 10,  4, 10, 10, 10,  5,
-     10, 10, 10,  6, 10, 10, 10, 10,   10, 10,  7,  8, 10,  9, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9E_infos[11] = {
-     o2(0xE5,0xA5), o2(0x97,0x5A), o2(0xE5,0xA4), o2(0xE5,0xA3),
-     o2(0xE5,0xAC), o2(0xE5,0xA6), o2(0xE5,0xAE), o2(0x97,0x86),
-     o2(0xE5,0xB1), o2(0xE5,0xA8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9E = {
-    to_SHIFT_JIS_E8_9E_offsets,
-    to_SHIFT_JIS_E8_9E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_9F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_9F */
-  /* used from to_EUC_JP_E8_9F */
-      0, 15, 15, 15,  1, 15,  2,  3,   15, 15, 15,  4, 15, 15, 15, 15,
-      5, 15,  6, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-      7, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15,  8,
-     15, 15,  9, 15, 15, 15, 10, 11,   15, 12, 15, 13, 15, 15, 14, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_9F_infos[16] = {
-     o2(0xE5,0xA9), o2(0xE5,0xAD), o2(0xE5,0xB0), o2(0xE5,0xAF),
-     o2(0xE5,0xA7), o2(0xE5,0xAA), o2(0xE5,0xBB), o2(0xE5,0xB4),
-     o2(0xE5,0xB2), o2(0xE5,0xB3), o2(0xE5,0xB8), o2(0xE5,0xB9),
-     o2(0x8A,0x49), o2(0x8B,0x61), o2(0xE5,0xB7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_9F = {
-    to_SHIFT_JIS_E8_9F_offsets,
-    to_SHIFT_JIS_E8_9F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A0 */
-  /* used from to_EUC_JP_E8_A0 */
-     16, 16, 16, 16, 16,  0, 16,  1,   16, 16, 16, 16, 16,  2,  3,  4,
-     16,  5, 16, 16, 16,  6,  7, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16,  8,  9, 10, 16, 16, 16, 11,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 12, 16, 16, 16, 16, 13, 16,   16, 14, 16, 15, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A0_infos[17] = {
-     o2(0xE5,0xA2), o2(0xFB,0xA1), o2(0xE5,0xB6), o2(0xE5,0xBA),
-     o2(0xE5,0xB5), o2(0xE5,0xBC), o2(0xE5,0xBE), o2(0xE5,0xBD),
-     o2(0xE5,0xC0), o2(0xE5,0xBF), o2(0xE5,0x79), o2(0xE5,0xC4),
-     o2(0xE5,0xC1), o2(0xE5,0xC2), o2(0xE5,0xC3), o2(0xE5,0xC5),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A0 = {
-    to_SHIFT_JIS_E8_A0_offsets,
-    to_SHIFT_JIS_E8_A0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A1 */
-  /* used from to_EUC_JP_E8_A1 */
-      0, 25,  1, 25,  2, 25,  3, 25,   25, 25, 25, 25,  4,  5, 25, 25,
-     25, 25,  6,  7, 25, 25, 25,  8,   25,  9, 25, 10, 25, 11, 12, 25,
-     25, 13, 14, 15, 25, 25, 25, 25,   16, 25, 25, 17, 25, 25, 25, 25,
-     18, 25, 19, 25, 25, 20, 25, 21,   25, 25, 25, 25, 25, 22, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A1_infos[26] = {
-     o2(0x8C,0x8C), o2(0xE5,0xC7), o2(0xE5,0xC6), o2(0x8F,0x4F),
-     o2(0x8D,0x73), o2(0x9F,0xA5), o2(0xE5,0xC8), o2(0x8F,0x70),
-     o2(0x8A,0x58), o2(0xE5,0xC9), o2(0x89,0x71), o2(0x8F,0xD5),
-     o2(0xE5,0xCA), o2(0x8D,0x74), o2(0xE5,0xCB), o2(0x88,0xDF),
-     o2(0x95,0x5C), o2(0xE5,0xCC), o2(0x90,0x8A), o2(0xE5,0xD3),
-     o2(0xE5,0xD0), o2(0x92,0x8F), o2(0xE5,0xD1), o2(0xE5,0xCE),
-     o2(0x8B,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A1 = {
-    to_SHIFT_JIS_E8_A1_offsets,
-    to_SHIFT_JIS_E8_A1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A2 */
-  /* used from to_EUC_JP_E8_A2 */
-     20,  0,  1, 20, 20, 20, 20, 20,    2, 20, 20,  3, 20,  4, 20, 20,
-     20, 20,  5, 20, 20, 20,  6,  7,   20,  8, 20, 20, 20, 20,  9, 20,
-     20, 20, 10, 20, 11, 20, 20, 20,   20, 20, 20, 12, 20, 20, 13, 20,
-     14, 15, 20, 20, 16, 17, 20, 18,   20, 20, 20, 20, 20, 20, 20, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A2_infos[21] = {
-     o2(0xE5,0xCD), o2(0xE5,0xD4), o2(0x8C,0x55), o2(0x91,0xDC),
-     o2(0xE5,0xDA), o2(0xE5,0xD6), o2(0x91,0xB3), o2(0xE5,0xD5),
-     o2(0xE5,0xD8), o2(0xE5,0xCF), o2(0xE5,0xD9), o2(0xE5,0xDB),
-     o2(0x94,0xED), o2(0xE5,0xD7), o2(0xE5,0xDC), o2(0xE5,0xDE),
-     o2(0x8C,0xD1), o2(0xE5,0xD2), o2(0x88,0xBF), o2(0xE5,0xDD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A2 = {
-    to_SHIFT_JIS_E8_A2_offsets,
-    to_SHIFT_JIS_E8_A2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A3 */
-  /* used from to_EUC_JP_E8_A3 */
-     24,  0,  1,  2,  3,  4, 24, 24,   24, 24, 24, 24, 24, 24, 24,  5,
-     24, 24, 24, 24,  6,  7, 24, 24,    8,  9, 24, 24, 10, 11, 24, 12,
-     24, 13, 24, 24, 24, 24, 24, 24,   14, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 15, 16, 17, 18, 24, 24,   19, 20, 24, 24, 21, 22, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A3_infos[25] = {
-     o2(0x8D,0xD9), o2(0x97,0xF4), o2(0xE5,0xDF), o2(0xE5,0xE0),
-     o2(0x91,0x95), o2(0x97,0xA0), o2(0xE5,0xE1), o2(0x97,0x54),
-     o2(0xE5,0xE2), o2(0xE5,0xE3), o2(0x95,0xE2), o2(0xE5,0xE4),
-     o2(0x8D,0xBE), o2(0x97,0xA1), o2(0xE5,0xE9), o2(0xE5,0xEA),
-     o2(0x8F,0xD6), o2(0xE5,0xE8), o2(0xFB,0xA2), o2(0x97,0x87),
-     o2(0xE5,0xE5), o2(0xE5,0xE7), o2(0x90,0xBB), o2(0x90,0x9E),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A3 = {
-    to_SHIFT_JIS_E8_A3_offsets,
-    to_SHIFT_JIS_E8_A3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A4 */
-  /* used from to_EUC_JP_E8_A4 */
-     17, 17,  0, 17,  1, 17, 17,  2,   17, 17,  3, 17,  4, 17, 17, 17,
-      5, 17,  6,  7, 17, 17, 17, 17,   17, 17, 17, 17,  8,  9, 10, 17,
-     17, 17, 17, 17, 17, 11, 17, 17,   17, 17, 12, 13, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 14, 17,   15, 17, 17, 16, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A4_infos[18] = {
-     o2(0xE5,0xE6), o2(0xE5,0xEB), o2(0x95,0xA1), o2(0xE5,0xED),
-     o2(0xE5,0xEC), o2(0x8A,0x8C), o2(0x96,0x4A), o2(0xE5,0xEE),
-     o2(0xFA,0x5D), o2(0xE5,0xFA), o2(0xE5,0xF0), o2(0xE5,0xF1),
-     o2(0xE5,0xF2), o2(0xE5,0xF3), o2(0xE5,0xF7), o2(0xE5,0xF8),
-     o2(0xE5,0xF6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A4 = {
-    to_SHIFT_JIS_E8_A4_offsets,
-    to_SHIFT_JIS_E8_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A5 */
-  /* used from to_EUC_JP_E8_A5 */
-     19,  0, 19,  1,  2, 19, 19, 19,   19, 19, 19, 19,  3,  4, 19, 19,
-     19, 19, 19, 19, 19, 19,  5, 19,   19, 19, 19, 19, 19, 19,  6,  7,
-      8, 19, 19, 19,  9, 19, 10, 19,   19, 19, 11, 19, 19, 12, 19, 13,
-     19, 19, 14, 19, 15, 19, 19, 16,   19, 19, 19, 19, 19, 19, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A5_infos[20] = {
-     o2(0xE5,0xF4), o2(0xE5,0xEF), o2(0xE5,0xF5), o2(0xE5,0xF9),
-     o2(0xE8,0xB5), o2(0x89,0xA6), o2(0xE5,0xFC), o2(0x8B,0xDD),
-     o2(0xE5,0xFB), o2(0xE6,0x41), o2(0xE6,0x40), o2(0xE6,0x43),
-     o2(0xE6,0x42), o2(0xE6,0x44), o2(0x8F,0x50), o2(0xE6,0x45),
-     o2(0xE6,0x46), o2(0xE6,0x47), o2(0x90,0xBC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A5 = {
-    to_SHIFT_JIS_E8_A5_offsets,
-    to_SHIFT_JIS_E8_A5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A6 */
-  /* used from to_EUC_JP_E8_A6 */
-     25,  0, 25,  1, 25, 25,  2,  3,    4, 25,  5,  6, 25, 25, 25,  7,
-     25, 25, 25,  8, 25, 25,  9, 10,   11, 25, 12, 25, 25, 25, 25, 25,
-     25, 13, 25, 25, 25, 25, 14, 15,   25, 16, 17, 25, 18, 25, 25, 19,
-     25, 25, 20, 21, 25, 25, 25, 25,   25, 25, 22, 25, 25, 23, 25, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A6_infos[26] = {
-     o2(0x97,0x76), o2(0xE6,0x48), o2(0x95,0xA2), o2(0x94,0x65),
-     o2(0xE6,0x49), o2(0xE6,0x4A), o2(0x8C,0xA9), o2(0x8B,0x4B),
-     o2(0xE6,0x4B), o2(0x8E,0x8B), o2(0x94,0x60), o2(0xE6,0x4C),
-     o2(0x8A,0x6F), o2(0xE6,0x4D), o2(0xE6,0x4F), o2(0x97,0x97),
-     o2(0xE6,0x4E), o2(0x90,0x65), o2(0xE6,0x50), o2(0xE6,0x51),
-     o2(0xE6,0x52), o2(0x8A,0xCF), o2(0xE6,0x53), o2(0xE6,0x54),
-     o2(0xE6,0x55),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A6 = {
-    to_SHIFT_JIS_E8_A6_offsets,
-    to_SHIFT_JIS_E8_A6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A7 */
-  /* used from to_EUC_JP_E8_A7 */
-      0, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10,  1, 10, 10, 10, 10, 10,   10, 10,  2, 10,  3,  4, 10, 10,
-     10, 10, 10,  5, 10, 10,  6,  7,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10,  8, 10, 10, 10,    9, 10, 10, 10, 10, 10, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A7_infos[11] = {
-     o2(0xE6,0x56), o2(0x8A,0x70), o2(0xE6,0x57), o2(0xE6,0x58),
-     o2(0xE6,0x59), o2(0x89,0xF0), o2(0x90,0x47), o2(0xE6,0x5A),
-     o2(0xE6,0x5B), o2(0xE6,0x5C),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A7 = {
-    to_SHIFT_JIS_E8_A7_offsets,
-    to_SHIFT_JIS_E8_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A8 */
-  /* used from to_EUC_JP_E8_A8 */
-      0, 28,  1,  2, 28, 28, 28, 28,    3, 28,  4, 28,  5, 28,  6, 28,
-      7, 28,  8,  9, 28, 28, 10, 11,   12, 28, 28, 13, 28, 14, 28, 15,
-     28, 28, 28, 16, 28, 17, 28, 28,   28, 28, 18, 28, 28, 19, 28, 28,
-     28, 20, 28, 21, 22, 28, 23, 24,   28, 28, 25, 26, 27, 28, 28, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A8_infos[29] = {
-     o2(0x8C,0xBE), o2(0x92,0xF9), o2(0xE6,0x5D), o2(0x8C,0x76),
-     o2(0x90,0x75), o2(0xE6,0x60), o2(0x93,0xA2), o2(0xE6,0x5F),
-     o2(0xFB,0xA3), o2(0x8C,0x50), o2(0xE6,0x5E), o2(0x91,0xF5),
-     o2(0x8B,0x4C), o2(0xE6,0x61), o2(0xE6,0x62), o2(0x8F,0xD7),
-     o2(0x8C,0x8D), o2(0xE6,0x63), o2(0x96,0x4B), o2(0x90,0xDD),
-     o2(0x8B,0x96), o2(0x96,0xF3), o2(0x91,0x69), o2(0xE6,0x64),
-     o2(0xFB,0xA4), o2(0x90,0x66), o2(0x92,0x90), o2(0x8F,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A8 = {
-    to_SHIFT_JIS_E8_A8_offsets,
-    to_SHIFT_JIS_E8_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_A9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_A9 */
-  /* used from to_EUC_JP_E8_A9 */
-     25,  0, 25, 25, 25, 25,  1, 25,    2, 25, 25, 25, 25, 25, 25, 25,
-      3,  4,  5, 25,  6,  7, 25, 25,   25, 25, 25,  8, 25, 25,  9, 25,
-     10, 25, 11, 12, 25, 25, 13, 25,   25, 14, 25, 15, 16, 17, 18, 25,
-     19, 20, 21, 22, 25, 25, 25, 25,   25, 23, 25, 25, 24, 25, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_A9_infos[26] = {
-     o2(0xE6,0x65), o2(0xE6,0x68), o2(0xE6,0x69), o2(0x8D,0xBC),
-     o2(0x91,0xC0), o2(0xE6,0x67), o2(0x8F,0xD9), o2(0x95,0x5D),
-     o2(0xE6,0x66), o2(0x8E,0x8C), o2(0x89,0x72), o2(0xE6,0x6D),
-     o2(0x8C,0x77), o2(0x8E,0x8E), o2(0x8E,0x8D), o2(0x98,0x6C),
-     o2(0xE6,0x6C), o2(0xE6,0x6B), o2(0x91,0x46), o2(0x8B,0x6C),
-     o2(0x98,0x62), o2(0x8A,0x59), o2(0x8F,0xDA), o2(0xFB,0xA5),
-     o2(0xE6,0x6A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_A9 = {
-    to_SHIFT_JIS_E8_A9_offsets,
-    to_SHIFT_JIS_E8_A9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_AA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_AA */
-  /* used from to_EUC_JP_E8_AA */
-     29, 29,  0, 29,  1,  2, 29,  3,   29,  4, 29, 29,  5,  6, 29, 29,
-     29,  7, 29,  8, 29,  9, 29, 29,   10, 29, 11, 29, 29, 29, 12, 29,
-     13, 14, 29, 15, 16, 17, 18, 19,   20, 29, 29, 29, 21, 22, 29, 29,
-     23, 29, 24, 29, 29, 29, 29, 29,   29, 25, 29, 29, 26, 29, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_AA_infos[30] = {
-     o2(0xE6,0x6F), o2(0xE6,0x70), o2(0xE6,0x6E), o2(0x8C,0xD6),
-     o2(0x97,0x5F), o2(0x8E,0x8F), o2(0x94,0x46), o2(0xE6,0x73),
-     o2(0x90,0xBE), o2(0x92,0x61), o2(0x97,0x55), o2(0xE6,0x76),
-     o2(0x8C,0xEA), o2(0x90,0xBD), o2(0xE6,0x72), o2(0xE6,0x77),
-     o2(0x8C,0xEB), o2(0xE6,0x74), o2(0xE6,0x75), o2(0xFB,0xA6),
-     o2(0xE6,0x71), o2(0x90,0xE0), o2(0x93,0xC7), o2(0x92,0x4E),
-     o2(0x89,0xDB), o2(0x94,0xEE), o2(0x8B,0x62), o2(0xFB,0xA7),
-     o2(0x92,0xB2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_AA = {
-    to_SHIFT_JIS_E8_AA_offsets,
-    to_SHIFT_JIS_E8_AA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_AB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_AB */
-  /* used from to_EUC_JP_E8_AB */
-     30, 30,  0, 30,  1, 30, 30,  2,   30, 30, 30,  3,  4,  5, 30,  6,
-     30, 30,  7, 30, 30, 30,  8, 30,   30, 30,  9, 10, 11, 30, 12, 13,
-     14, 15, 16, 30, 17, 30, 18, 19,   30, 30, 30, 20, 30, 21, 22, 30,
-     30, 23, 30, 24, 30, 30, 25, 26,   27, 30, 28, 30, 30, 30, 29, 30,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_AB_infos[31] = {
-     o2(0xE6,0x7A), o2(0xE6,0x78), o2(0x92,0x6B), o2(0x90,0xBF),
-     o2(0x8A,0xD0), o2(0xE6,0x79), o2(0x90,0x7A), o2(0x97,0xC8),
-     o2(0x98,0x5F), o2(0xE6,0x7B), o2(0xE6,0x87), o2(0x92,0xB3),
-     o2(0xE6,0x86), o2(0xFB,0xA8), o2(0xE6,0x83), o2(0xE6,0x8B),
-     o2(0xE6,0x84), o2(0xE6,0x80), o2(0x92,0xFA), o2(0xE6,0x7E),
-     o2(0xE6,0x7C), o2(0x97,0x40), o2(0x8E,0x90), o2(0xE6,0x81),
-     o2(0xE6,0x7D), o2(0xFB,0xAA), o2(0xE6,0x85), o2(0x8F,0x94),
-     o2(0x8C,0xBF), o2(0x91,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_AB = {
-    to_SHIFT_JIS_E8_AB_offsets,
-    to_SHIFT_JIS_E8_AB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_AC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_AC */
-  /* used from to_EUC_JP_E8_AC */
-      0,  1,  2, 24,  3, 24, 24,  4,   24, 24, 24, 24,  5, 24,  6, 24,
-      7, 24, 24, 24,  8, 24,  9, 10,   24, 11, 12, 13, 24, 14, 24, 24,
-     15, 16, 24, 24, 24, 24, 17, 24,   18, 24, 24, 19, 20, 24, 24, 24,
-     24, 24, 24, 21, 24, 24, 24, 24,   24, 22, 24, 24, 24, 24, 23, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_AC_infos[25] = {
-     o2(0x96,0x64), o2(0x89,0x79), o2(0x88,0xE0), o2(0x93,0xA3),
-     o2(0xE6,0x89), o2(0xE6,0x88), o2(0x93,0xE4), o2(0xE6,0x8D),
-     o2(0xE6,0x82), o2(0xE6,0x8C), o2(0xE6,0x8E), o2(0x8C,0xAA),
-     o2(0xE6,0x8A), o2(0x8D,0x75), o2(0x8E,0xD3), o2(0xE6,0x8F),
-     o2(0x97,0x77), o2(0xE6,0x92), o2(0xE6,0x95), o2(0xE6,0x93),
-     o2(0x95,0x54), o2(0xE6,0x90), o2(0x8B,0xDE), o2(0xE6,0x94),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_AC = {
-    to_SHIFT_JIS_E8_AC_offsets,
-    to_SHIFT_JIS_E8_AC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_AD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_AD */
-  /* used from to_EUC_JP_E8_AD */
-     23,  0, 23, 23, 23, 23, 23, 23,   23,  1, 23, 23,  2, 23,  3,  4,
-     23, 23, 23,  5, 23, 23,  6, 23,    7, 23,  8,  9, 10, 23, 23, 11,
-     23, 23, 23, 23, 23, 23, 12, 23,   23, 23, 23, 13, 14, 23, 23, 15,
-     16, 17, 18, 23, 19, 23, 23, 20,   23, 23, 23, 23, 23, 21, 23, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_AD_infos[24] = {
-     o2(0xE6,0x96), o2(0xE6,0x9A), o2(0xE6,0x97), o2(0xE6,0x99),
-     o2(0xE6,0x98), o2(0xFB,0xAB), o2(0xE6,0x9B), o2(0x8E,0xAF),
-     o2(0xE6,0x9D), o2(0xE6,0x9C), o2(0x95,0x88), o2(0xE6,0x9F),
-     o2(0x8C,0x78), o2(0xE6,0x9E), o2(0xE6,0xA0), o2(0xE6,0xA1),
-     o2(0x8B,0x63), o2(0xE3,0xBF), o2(0x8F,0xF7), o2(0xE6,0xA2),
-     o2(0x8C,0xEC), o2(0xE6,0xA3), o2(0xFB,0xAC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_AD = {
-    to_SHIFT_JIS_E8_AD_offsets,
-    to_SHIFT_JIS_E8_AD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_AE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_AE */
-  /* used from to_EUC_JP_E8_AE */
-      0, 11, 11,  1, 11, 11, 11, 11,   11, 11,  2, 11,  3, 11,  4, 11,
-      5, 11,  6,  7, 11, 11,  8, 11,   11,  9, 10, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_AE_infos[12] = {
-     o2(0xE6,0xA4), o2(0x8E,0x5D), o2(0x9D,0xCC), o2(0xE6,0xA5),
-     o2(0xE6,0xA6), o2(0x8F,0x51), o2(0xE6,0xA7), o2(0xE6,0xA8),
-     o2(0xE6,0xA9), o2(0xE6,0xAA), o2(0xE6,0xAB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_AE = {
-    to_SHIFT_JIS_E8_AE_offsets,
-    to_SHIFT_JIS_E8_AE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B0 */
-  /* used from to_EUC_JP_E8_B0 */
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  0,    3,  3,  1,  3,  3,  3,  3,  2,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B0_infos[4] = {
-     o2(0x92,0x4A), o2(0xE6,0xAC), o2(0xE6,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B0 = {
-    to_SHIFT_JIS_E8_B0_offsets,
-    to_SHIFT_JIS_E8_B0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B1 */
-  /* used from to_EUC_JP_E8_B1 */
-     18,  0, 18, 18, 18, 18,  1, 18,    2, 18,  3, 18,  4, 18,  5, 18,
-      6, 18, 18, 18, 18,  7, 18, 18,   18, 18,  8, 18, 18, 18, 18, 18,
-     18,  9, 10, 18, 18, 18, 18, 18,   18, 18, 11, 12, 13, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   14, 15, 16, 18, 17, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B1_infos[19] = {
-     o2(0xE6,0xAD), o2(0x93,0xA4), o2(0xE6,0xAF), o2(0x96,0x4C),
-     o2(0xE6,0xB0), o2(0xE6,0xB1), o2(0xE6,0xB2), o2(0xE6,0xB3),
-     o2(0x93,0xD8), o2(0x8F,0xDB), o2(0xE6,0xB4), o2(0x8D,0x8B),
-     o2(0x98,0xAC), o2(0xE6,0xB5), o2(0xE6,0xB6), o2(0x95,0x5E),
-     o2(0xE6,0xB7), o2(0xE6,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B1 = {
-    to_SHIFT_JIS_E8_B1_offsets,
-    to_SHIFT_JIS_E8_B1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B2 */
-  /* used from to_EUC_JP_E8_B2 */
-     34, 34,  0, 34, 34,  1, 34, 34,   34,  2,  3, 34,  4,  5,  6, 34,
-     34, 34, 34, 34,  7, 34, 34, 34,    8, 34, 34, 34, 34,  9, 10, 34,
-     11, 12, 13, 34, 34, 34, 34, 14,   15, 16, 17, 18, 19, 20, 21, 22,
-     23, 34, 24, 25, 26, 34, 27, 28,   29, 34, 34, 30, 31, 32, 34, 33,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B2_infos[35] = {
-     o2(0xE6,0xB8), o2(0xE6,0xBA), o2(0xE6,0xB9), o2(0xE6,0xBB),
-     o2(0x96,0x65), o2(0xE6,0xBC), o2(0xE6,0xBD), o2(0xE6,0xBE),
-     o2(0xE6,0xC0), o2(0x8A,0x4C), o2(0x92,0xE5), o2(0x95,0x89),
-     o2(0x8D,0xE0), o2(0x8D,0x76), o2(0x95,0x6E), o2(0x89,0xDD),
-     o2(0x94,0xCC), o2(0xE6,0xC3), o2(0x8A,0xD1), o2(0x90,0xD3),
-     o2(0xE6,0xC2), o2(0xE6,0xC7), o2(0x92,0x99), o2(0x96,0xE1),
-     o2(0xE6,0xC5), o2(0xE6,0xC6), o2(0x8B,0x4D), o2(0xE6,0xC8),
-     o2(0x94,0x83), o2(0x91,0xDD), o2(0x94,0xEF), o2(0x93,0x5C),
-     o2(0xE6,0xC4), o2(0x96,0x66),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B2 = {
-    to_SHIFT_JIS_E8_B2_offsets,
-    to_SHIFT_JIS_E8_B2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B3 */
-  /* used from to_EUC_JP_E8_B3 */
-      0,  1,  2,  3,  4, 29, 29,  5,    6, 29,  7, 29, 29,  8,  9, 29,
-     29, 10, 29, 11, 29, 29, 29, 29,   29, 29, 12, 13, 14, 29, 15, 29,
-     16, 29, 17, 18, 19, 29, 20, 29,   29, 29, 21, 29, 29, 22, 29, 29,
-     23, 29, 29, 29, 24, 29, 29, 29,   29, 29, 25, 26, 27, 28, 29, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B3_infos[30] = {
-     o2(0x89,0xEA), o2(0xE6,0xCA), o2(0x98,0x47), o2(0x92,0xC0),
-     o2(0x98,0x64), o2(0x8E,0x91), o2(0xE6,0xC9), o2(0x91,0xAF),
-     o2(0xE6,0xDA), o2(0x91,0x47), o2(0x93,0xF6), o2(0x95,0x6F),
-     o2(0xE6,0xCD), o2(0x8E,0x5E), o2(0x8E,0x92), o2(0x8F,0xDC),
-     o2(0x94,0x85), o2(0x8C,0xAB), o2(0xE6,0xCC), o2(0xE6,0xCB),
-     o2(0x95,0x8A), o2(0x8E,0xBF), o2(0x93,0x71), o2(0xFB,0xAD),
-     o2(0xFB,0xAE), o2(0xE6,0xCF), o2(0xE6,0xD0), o2(0x8D,0x77),
-     o2(0xE6,0xCE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B3 = {
-    to_SHIFT_JIS_E8_B3_offsets,
-    to_SHIFT_JIS_E8_B3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B4 */
-  /* used from to_EUC_JP_E8_B4 */
-     13, 13, 13, 13,  0,  1, 13,  2,    3, 13,  4,  5, 13,  6, 13,  7,
-      8, 13,  9, 10, 11, 13, 12, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B4_infos[14] = {
-     o2(0xE6,0xD1), o2(0xE6,0xD2), o2(0xE6,0xD4), o2(0x91,0xA1),
-     o2(0xE6,0xD3), o2(0x8A,0xE4), o2(0xE6,0xD6), o2(0xE6,0xD5),
-     o2(0xE6,0xD7), o2(0xFB,0xAF), o2(0xE6,0xD9), o2(0xE6,0xDB),
-     o2(0xE6,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B4 = {
-    to_SHIFT_JIS_E8_B4_offsets,
-    to_SHIFT_JIS_E8_B4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B5 */
-  /* used from to_EUC_JP_E8_B5 */
-     11, 11, 11, 11, 11, 11, 11, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,   11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11,  0, 11,  1,  2,   11, 11, 11,  3, 11,  4, 11, 11,
-      5,  6, 11,  7,  8, 11,  9, 10,   11, 11, 11, 11, 11, 11, 11, 11,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B5_infos[12] = {
-     o2(0x90,0xD4), o2(0x8E,0xCD), o2(0xE6,0xDD), o2(0x8A,0x71),
-     o2(0xE6,0xDE), o2(0x91,0x96), o2(0xE6,0xDF), o2(0xE6,0xE0),
-     o2(0x95,0x8B), o2(0xFB,0xB0), o2(0x8B,0x4E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B5 = {
-    to_SHIFT_JIS_E8_B5_offsets,
-    to_SHIFT_JIS_E8_B5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B6 */
-  /* used from to_EUC_JP_E8_B6 */
-      9,  0,  9,  9,  9,  1,  9,  9,    9,  9,  2,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  3,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  4,  9,  9,  9,  9,    5,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  6,  9,  9,  9,  9,    9,  9,  7,  9,  9,  9,  8,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B6_infos[10] = {
-     o2(0xE6,0xE1), o2(0x92,0xB4), o2(0x89,0x7A), o2(0xE6,0xE2),
-     o2(0x8E,0xEF), o2(0x90,0x96), o2(0x91,0xAB), o2(0xE6,0xE5),
-     o2(0xE6,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B6 = {
-    to_SHIFT_JIS_E8_B6_offsets,
-    to_SHIFT_JIS_E8_B6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B7 */
-  /* used from to_EUC_JP_E8_B7 */
-     19, 19,  0, 19, 19, 19, 19, 19,   19, 19, 19,  1,  2, 19, 19,  3,
-     19, 19, 19, 19, 19, 19,  4, 19,   19, 19,  5,  6, 19,  7, 19,  8,
-     19,  9, 19, 10, 19, 19, 19, 19,   11, 19, 12, 13, 19, 19, 19, 14,
-     19, 19, 19, 15, 19, 16, 19, 19,   19, 19, 19, 19, 17, 19, 19, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B7_infos[20] = {
-     o2(0xE6,0xE3), o2(0xE6,0xEB), o2(0xE6,0xE9), o2(0xE6,0xE6),
-     o2(0xE6,0xE8), o2(0xE6,0xE7), o2(0xE6,0xEA), o2(0x8B,0x97),
-     o2(0xE6,0xEE), o2(0x90,0xD5), o2(0xE6,0xEF), o2(0x8C,0xD7),
-     o2(0xE6,0xEC), o2(0xE6,0xED), o2(0x98,0x48), o2(0x92,0xB5),
-     o2(0x91,0x48), o2(0xE6,0xF0), o2(0xE6,0xF3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B7 = {
-    to_SHIFT_JIS_E8_B7_offsets,
-    to_SHIFT_JIS_E8_B7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B8 */
-  /* used from to_EUC_JP_E8_B8 */
-     12, 12, 12, 12, 12, 12, 12, 12,    0,  1,  2, 12, 12, 12, 12,  3,
-      4, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12, 12,  5,  6,  7,
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12,  8, 12, 12, 12, 12, 12,
-      9, 12, 12, 12, 10, 11, 12, 12,   12, 12, 12, 12, 12, 12, 12, 12,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B8_infos[13] = {
-     o2(0xE6,0xF1), o2(0xE6,0xF2), o2(0x97,0x78), o2(0x93,0xA5),
-     o2(0xE6,0xF6), o2(0xE6,0xF4), o2(0xE6,0xF5), o2(0xE6,0xF7),
-     o2(0xE7,0x48), o2(0xE6,0xFA), o2(0xE6,0xFB), o2(0xE6,0xF9),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B8 = {
-    to_SHIFT_JIS_E8_B8_offsets,
-    to_SHIFT_JIS_E8_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_B9 */
-  /* used from to_EUC_JP_E8_B9 */
-     18, 18,  0, 18,  1, 18, 18,  2,    3,  4,  5, 18,  6, 18, 18, 18,
-      7, 18, 18, 18, 18,  8, 18, 18,   18,  9, 18, 18, 18, 18, 18, 10,
-     11, 18, 18, 12, 13, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 14, 18, 15, 18, 16, 18,   18, 18, 18, 18, 17, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_B9_infos[19] = {
-     o2(0xE6,0xF8), o2(0x92,0xFB), o2(0xE7,0x40), o2(0xE7,0x44),
-     o2(0xE7,0x41), o2(0xE6,0xFC), o2(0xE7,0x42), o2(0xE7,0x43),
-     o2(0xE7,0x4A), o2(0xE7,0x45), o2(0x90,0xD6), o2(0xE7,0x47),
-     o2(0xE7,0x49), o2(0xE7,0x46), o2(0xE7,0x4C), o2(0x8F,0x52),
-     o2(0xE7,0x4B), o2(0xE7,0x4D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_B9 = {
-    to_SHIFT_JIS_E8_B9_offsets,
-    to_SHIFT_JIS_E8_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BA */
-  /* used from to_EUC_JP_E8_BA */
-     19,  0, 19, 19,  1,  2, 19,  3,   19, 19,  4,  5, 19,  6, 19, 19,
-     19,  7, 19,  8,  9, 19, 19, 19,   19, 10, 19, 19, 19, 19, 19, 19,
-     19, 11, 19, 19, 19, 19, 19, 19,   19, 19, 12, 13, 14, 19, 19, 15,
-     16, 17, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BA_infos[20] = {
-     o2(0xE7,0x4E), o2(0xE7,0x51), o2(0xE7,0x50), o2(0xE7,0x4F),
-     o2(0xE7,0x53), o2(0xE7,0x52), o2(0x96,0xF4), o2(0xE7,0x55),
-     o2(0xE7,0x54), o2(0xE7,0x56), o2(0xE7,0x57), o2(0xE7,0x59),
-     o2(0xE7,0x58), o2(0x90,0x67), o2(0xE7,0x5A), o2(0x8B,0xEB),
-     o2(0xE7,0x5B), o2(0xE7,0x5D), o2(0xE7,0x5E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BA = {
-    to_SHIFT_JIS_E8_BA_offsets,
-    to_SHIFT_JIS_E8_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BB */
-  /* used from to_EUC_JP_E8_BB */
-     19, 19, 19, 19, 19,  0,  1, 19,    2, 19,  3,  4,  5,  6, 19,  7,
-     19, 19,  8, 19, 19, 19, 19, 19,   19, 19, 19,  9, 19, 19, 19, 10,
-     19, 19, 11, 12, 19, 19, 19, 19,   19, 19, 19, 13, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,   14, 19, 19, 15, 16, 17, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BB_infos[20] = {
-     o2(0xE7,0x5F), o2(0xE7,0x5C), o2(0xE7,0x60), o2(0x8E,0xD4),
-     o2(0xE7,0x61), o2(0x8B,0x4F), o2(0x8C,0x52), o2(0xFB,0xB2),
-     o2(0x8C,0xAC), o2(0xE7,0x62), o2(0x93,0xEE), o2(0x93,0x5D),
-     o2(0xE7,0x63), o2(0xE7,0x66), o2(0x8E,0xB2), o2(0xE7,0x65),
-     o2(0xE7,0x64), o2(0x8C,0x79), o2(0xE7,0x67),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BB = {
-    to_SHIFT_JIS_E8_BB_offsets,
-    to_SHIFT_JIS_E8_BB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BC */
-  /* used from to_EUC_JP_E8_BC */
-     24, 24, 24,  0, 24,  1, 24, 24,   24,  2,  3, 24,  4, 24, 24, 24,
-     24, 24,  5,  6,  7,  8, 24, 24,   24,  9, 24, 10, 11, 12, 24, 13,
-     24, 24, 24, 24, 24, 24, 14, 24,   24, 15, 16, 24, 24, 24, 24, 17,
-     24, 24, 24, 18, 24, 24, 24, 24,   19, 20, 24, 21, 24, 24, 22, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BC_infos[25] = {
-     o2(0x8A,0x72), o2(0xE7,0x69), o2(0x8D,0xDA), o2(0xE7,0x68),
-     o2(0xE7,0x71), o2(0xE7,0x6B), o2(0xE7,0x6D), o2(0x95,0xE3),
-     o2(0xE7,0x6A), o2(0xE7,0x6C), o2(0xE7,0x70), o2(0xE7,0x6E),
-     o2(0x8B,0x50), o2(0xE7,0x6F), o2(0xE7,0x72), o2(0x94,0x79),
-     o2(0x97,0xD6), o2(0x8F,0x53), o2(0xE7,0x73), o2(0x97,0x41),
-     o2(0xE7,0x75), o2(0xE7,0x74), o2(0xE7,0x78), o2(0x97,0x60),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BC = {
-    to_SHIFT_JIS_E8_BC_offsets,
-    to_SHIFT_JIS_E8_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BD */
-  /* used from to_EUC_JP_E8_BD */
-     15, 15,  0, 15,  1,  2,  3, 15,   15,  4, 15, 15,  5,  6,  7, 15,
-     15, 15, 15, 15, 15, 15, 15,  8,   15, 15, 15, 15,  9, 15, 15, 10,
-     15, 11, 12, 13, 14, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BD_infos[16] = {
-     o2(0xE7,0x77), o2(0x8A,0x8D), o2(0xE7,0x76), o2(0xE7,0x7B),
-     o2(0xE7,0x7A), o2(0xE7,0x79), o2(0x93,0x51), o2(0xE7,0x7C),
-     o2(0xE7,0x7D), o2(0xE7,0x7E), o2(0x8D,0x8C), o2(0x8C,0x44),
-     o2(0xE7,0x80), o2(0xE7,0x81), o2(0xE7,0x82),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BD = {
-    to_SHIFT_JIS_E8_BD_offsets,
-    to_SHIFT_JIS_E8_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BE */
-  /* used from to_EUC_JP_E8_BE */
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18,  0,  1, 18,  2,  3,
-     18, 18, 18,  4, 18, 18, 18,  5,    6, 18, 18, 18, 18,  7,  8,  9,
-     10, 11, 12, 18, 18, 18, 18, 13,   18, 18, 14, 15, 16, 18, 18, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BE_infos[19] = {
-     o2(0x90,0x68), o2(0xE7,0x83), o2(0x8E,0xAB), o2(0xE7,0x84),
-     o2(0xE7,0x85), o2(0x99,0x9F), o2(0x99,0x9E), o2(0xE7,0x86),
-     o2(0xE3,0x90), o2(0xE7,0x87), o2(0x92,0x43), o2(0x90,0x4A),
-     o2(0x94,0x5F), o2(0xE7,0x88), o2(0x95,0xD3), o2(0x92,0xD2),
-     o2(0x8D,0x9E), o2(0x92,0x48),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BE = {
-    to_SHIFT_JIS_E8_BE_offsets,
-    to_SHIFT_JIS_E8_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8_BF */
-  /* used from to_EUC_JP_E8_BF */
-     22, 22,  0, 22,  1,  2, 22, 22,   22, 22, 22, 22, 22, 22,  3, 22,
-     22,  4, 22, 22,  5, 22, 22, 22,   22, 22,  6, 22, 22, 22, 22, 22,
-     22, 22,  7, 22, 22,  8,  9, 22,   22, 10, 11, 12, 22, 13, 22, 14,
-     15, 22, 22, 22, 16, 22, 22, 17,   18, 19, 20, 22, 22, 21, 22, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_BF_infos[23] = {
-     o2(0x89,0x49), o2(0x96,0x98), o2(0x90,0x76), o2(0x8C,0x7D),
-     o2(0x8B,0xDF), o2(0x95,0xD4), o2(0xE7,0x89), o2(0xE7,0x8B),
-     o2(0xE7,0x8A), o2(0x89,0xDE), o2(0x93,0xF4), o2(0xE7,0x8C),
-     o2(0x94,0x97), o2(0x93,0x52), o2(0xE7,0x8D), o2(0x8F,0x71),
-     o2(0xE7,0x8F), o2(0x96,0xC0), o2(0xE7,0x9E), o2(0xE7,0x91),
-     o2(0xE7,0x92), o2(0x92,0xC7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8_BF = {
-    to_SHIFT_JIS_E8_BF_offsets,
-    to_SHIFT_JIS_E8_BF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E8 */
-  /* used from to_EUC_JP_E8 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 63,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E8_infos[64] = {
-     &to_SHIFT_JIS_E8_80, &to_SHIFT_JIS_E8_81,
-     &to_SHIFT_JIS_E8_82, &to_SHIFT_JIS_E8_83,
-     &to_SHIFT_JIS_E8_84, &to_SHIFT_JIS_E8_85,
-     &to_SHIFT_JIS_E8_86, &to_SHIFT_JIS_E8_87,
-     &to_SHIFT_JIS_E8_88, &to_SHIFT_JIS_E8_89,
-     &to_SHIFT_JIS_E8_8A, &to_SHIFT_JIS_E8_8B,
-     &to_SHIFT_JIS_E8_8C, &to_SHIFT_JIS_E8_8D,
-     &to_SHIFT_JIS_E8_8E, &to_SHIFT_JIS_E8_8F,
-     &to_SHIFT_JIS_E8_90, &to_SHIFT_JIS_E8_91,
-     &to_SHIFT_JIS_E8_92, &to_SHIFT_JIS_E8_93,
-     &to_SHIFT_JIS_E8_94, &to_SHIFT_JIS_E8_95,
-     &to_SHIFT_JIS_E8_96, &to_SHIFT_JIS_E8_97,
-     &to_SHIFT_JIS_E8_98, &to_SHIFT_JIS_E8_99,
-     &to_SHIFT_JIS_E8_9A, &to_SHIFT_JIS_E8_9B,
-     &to_SHIFT_JIS_E8_9C, &to_SHIFT_JIS_E8_9D,
-     &to_SHIFT_JIS_E8_9E, &to_SHIFT_JIS_E8_9F,
-     &to_SHIFT_JIS_E8_A0, &to_SHIFT_JIS_E8_A1,
-     &to_SHIFT_JIS_E8_A2, &to_SHIFT_JIS_E8_A3,
-     &to_SHIFT_JIS_E8_A4, &to_SHIFT_JIS_E8_A5,
-     &to_SHIFT_JIS_E8_A6, &to_SHIFT_JIS_E8_A7,
-     &to_SHIFT_JIS_E8_A8, &to_SHIFT_JIS_E8_A9,
-     &to_SHIFT_JIS_E8_AA, &to_SHIFT_JIS_E8_AB,
-     &to_SHIFT_JIS_E8_AC, &to_SHIFT_JIS_E8_AD,
-     &to_SHIFT_JIS_E8_AE, &to_SHIFT_JIS_E8_B0,
-     &to_SHIFT_JIS_E8_B1, &to_SHIFT_JIS_E8_B2,
-     &to_SHIFT_JIS_E8_B3, &to_SHIFT_JIS_E8_B4,
-     &to_SHIFT_JIS_E8_B5, &to_SHIFT_JIS_E8_B6,
-     &to_SHIFT_JIS_E8_B7, &to_SHIFT_JIS_E8_B8,
-     &to_SHIFT_JIS_E8_B9, &to_SHIFT_JIS_E8_BA,
-     &to_SHIFT_JIS_E8_BB, &to_SHIFT_JIS_E8_BC,
-     &to_SHIFT_JIS_E8_BD, &to_SHIFT_JIS_E8_BE,
-     &to_SHIFT_JIS_E8_BF,               UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E8 = {
-    to_SHIFT_JIS_E8_offsets,
-    to_SHIFT_JIS_E8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_80_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_80 */
-  /* used from to_EUC_JP_E9_80 */
-      0,  1, 35,  2, 35,  3,  4, 35,   35, 35, 35,  5, 35,  6,  7,  8,
-      9, 10, 35, 11, 12, 13, 14, 15,   35, 16, 17, 35, 35, 18, 19, 20,
-     21, 22, 23, 24, 35, 35, 35, 25,   35, 35, 35, 35, 35, 35, 26, 35,
-     35, 27, 28, 35, 35, 29, 30, 35,   31, 32, 35, 35, 33, 35, 34, 35,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_80_infos[36] = {
-     o2(0x91,0xDE), o2(0x91,0x97), o2(0x93,0xA6), o2(0xE7,0x90),
-     o2(0x8B,0x74), o2(0xE7,0x99), o2(0xE7,0x96), o2(0xE7,0xA3),
-     o2(0x93,0xA7), o2(0x92,0x80), o2(0xE7,0x93), o2(0x92,0xFC),
-     o2(0x93,0x72), o2(0xE7,0x94), o2(0xE7,0x98), o2(0x90,0x80),
-     o2(0x94,0x87), o2(0x92,0xCA), o2(0x90,0xC0), o2(0xE7,0x97),
-     o2(0x91,0xAC), o2(0x91,0xA2), o2(0xE7,0x95), o2(0x88,0xA7),
-     o2(0x98,0x41), o2(0xE7,0x9A), o2(0x91,0xDF), o2(0x8F,0x54),
-     o2(0x90,0x69), o2(0xE7,0x9C), o2(0xE7,0x9B), o2(0x88,0xED),
-     o2(0xE7,0x9D), o2(0x95,0x4E), o2(0xE7,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_80 = {
-    to_SHIFT_JIS_E9_80_offsets,
-    to_SHIFT_JIS_E9_80_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_81_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_81 */
-  /* used from to_EUC_JP_E9_81 */
-     40,  0,  1, 40, 40,  2, 40,  3,   40,  4,  5,  6, 40,  7,  8,  9,
-     10, 11, 12, 13, 14, 15, 16, 40,   17, 18, 40, 40, 19, 40, 20, 40,
-     21, 22, 40, 23, 40, 24, 40, 25,   26, 27, 40, 40, 40, 28, 29, 30,
-     40, 40, 31, 40, 40, 32, 33, 34,   35, 40, 36, 40, 37, 38, 40, 39,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_81_infos[41] = {
-     o2(0x93,0xD9), o2(0x90,0x8B), o2(0x92,0x78), o2(0x8B,0xF6),
-     o2(0xE7,0xA4), o2(0x97,0x56), o2(0x89,0x5E), o2(0x95,0xD5),
-     o2(0x89,0xDF), o2(0xE7,0x9F), o2(0xE7,0xA0), o2(0xE7,0xA1),
-     o2(0xE7,0xA2), o2(0x93,0xB9), o2(0x92,0x42), o2(0x88,0xE1),
-     o2(0xE7,0xA6), o2(0xE7,0xA7), o2(0xEA,0xA1), o2(0x91,0xBB),
-     o2(0xE7,0xA8), o2(0x89,0x93), o2(0x91,0x6B), o2(0x8C,0xAD),
-     o2(0x97,0x79), o2(0xFB,0xB5), o2(0xE7,0xA9), o2(0x93,0x4B),
-     o2(0x91,0x98), o2(0x8E,0xD5), o2(0xE7,0xAA), o2(0xE7,0xAD),
-     o2(0x8F,0x85), o2(0xE7,0xAB), o2(0x91,0x4A), o2(0x91,0x49),
-     o2(0x88,0xE2), o2(0x97,0xC9), o2(0xE7,0xAF), o2(0x94,0xF0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_81 = {
-    to_SHIFT_JIS_E9_81_offsets,
-    to_SHIFT_JIS_E9_81_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_82_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_82 */
-  /* used from to_EUC_JP_E9_82 */
-      0,  1,  2,  3,  4, 18, 18,  5,   18,  6,  7, 18, 18, 18, 18,  8,
-     18,  9, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 10, 18, 18, 11, 18,   12, 18, 13, 18, 18, 18, 18, 14,
-     18, 15, 18, 18, 18, 16, 18, 18,   17, 18, 18, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_82_infos[19] = {
-     o2(0xE7,0xB1), o2(0xE7,0xB0), o2(0xE7,0xAE), o2(0xE2,0x84),
-     o2(0x8A,0xD2), o2(0xE7,0x8E), o2(0xE7,0xB3), o2(0xE7,0xB2),
-     o2(0xE7,0xB4), o2(0x97,0x57), o2(0x93,0xDF), o2(0x96,0x4D),
-     o2(0xE7,0xB5), o2(0x8E,0xD7), o2(0xE7,0xB6), o2(0xE7,0xB7),
-     o2(0xE7,0xB8), o2(0x93,0x40),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_82 = {
-    to_SHIFT_JIS_E9_82_offsets,
-    to_SHIFT_JIS_E9_82_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_83_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_83 */
-  /* used from to_EUC_JP_E9_83 */
-     13,  0, 13, 13, 13, 13, 13, 13,   13, 13,  1, 13, 13, 13,  2, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13,  3, 13, 13,  4, 13,
-     13,  5,  6, 13,  7, 13, 13, 13,    8, 13, 13, 13, 13,  9, 13, 13,
-     13, 13, 13, 13, 13, 10, 13, 11,   13, 13, 13, 13, 13, 12, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_83_infos[14] = {
-     o2(0x88,0xE8), o2(0x8D,0x78), o2(0x98,0x59), o2(0xE7,0xBC),
-     o2(0xFB,0xB6), o2(0x8C,0x53), o2(0xE7,0xB9), o2(0xE7,0xBA),
-     o2(0x95,0x94), o2(0x8A,0x73), o2(0x97,0x58), o2(0x8B,0xBD),
-     o2(0x93,0x73),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_83 = {
-    to_SHIFT_JIS_E9_83_offsets,
-    to_SHIFT_JIS_E9_83_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_84_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_84 */
-  /* used from to_EUC_JP_E9_84 */
-      8,  8,  0,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  1,  8,  8,  2,  8,  8,    8,  3,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  4,    8,  8,  8,  8,  8,  5,  8,  8,
-      6,  8,  7,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_84_infos[9] = {
-     o2(0xE7,0xBD), o2(0xE7,0xBE), o2(0xFB,0xB8), o2(0xE7,0xBF),
-     o2(0xFB,0xB9), o2(0x93,0x41), o2(0xE7,0xC1), o2(0xE7,0xC0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_84 = {
-    to_SHIFT_JIS_E9_84_offsets,
-    to_SHIFT_JIS_E9_84_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_85_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_85 */
-  /* used from to_EUC_JP_E9_85 */
-     21, 21, 21, 21, 21, 21, 21, 21,   21,  0,  1,  2,  3,  4,  5, 21,
-     21, 21,  6, 21,  7, 21,  8, 21,    9, 21, 21, 21, 21, 21, 21, 21,
-     21, 21, 10, 11, 21, 12, 21, 21,   21, 13, 14, 21, 15, 21, 21, 21,
-     21, 21, 16, 17, 21, 18, 21, 19,   20, 21, 21, 21, 21, 21, 21, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_85_infos[22] = {
-     o2(0x93,0xD1), o2(0xE7,0xC2), o2(0x8F,0x55), o2(0x8E,0xDE),
-     o2(0x94,0x7A), o2(0x92,0x91), o2(0x8E,0xF0), o2(0x90,0x8C),
-     o2(0xE7,0xC3), o2(0xE7,0xC4), o2(0x90,0x7C), o2(0xE7,0xC5),
-     o2(0xE7,0xC6), o2(0xE7,0xC7), o2(0x97,0x8F), o2(0x8F,0x56),
-     o2(0xE7,0xC9), o2(0xE7,0xC8), o2(0x8D,0x79), o2(0x8D,0x93),
-     o2(0x8E,0x5F),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_85 = {
-    to_SHIFT_JIS_E9_85_offsets,
-    to_SHIFT_JIS_E9_85_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_86_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_86 */
-  /* used from to_EUC_JP_E9_86 */
-     18, 18,  0, 18, 18, 18, 18,  1,   18,  2, 18,  3, 18,  4, 18, 18,
-      5, 18,  6, 18, 18, 18, 18,  7,   18, 18, 18, 18,  8, 18, 18, 18,
-     18, 18,  9, 18, 10, 18, 18, 18,   18, 18, 11, 12, 18, 18, 18, 13,
-     18, 18, 18, 18, 14, 15, 18, 18,   16, 18, 17, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_86_infos[19] = {
-     o2(0xE7,0xCC), o2(0x8F,0x86), o2(0xE7,0xCB), o2(0xE7,0xCA),
-     o2(0x91,0xE7), o2(0x8C,0xED), o2(0x90,0xC1), o2(0x94,0xAE),
-     o2(0x8F,0x58), o2(0xE7,0xCD), o2(0x8F,0xDD), o2(0xE7,0xD0),
-     o2(0xE7,0xCE), o2(0xE7,0xCF), o2(0xE7,0xD2), o2(0xE7,0xD1),
-     o2(0x8F,0xF8), o2(0xE7,0xD3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_86 = {
-    to_SHIFT_JIS_E9_86_offsets,
-    to_SHIFT_JIS_E9_86_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_87_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_87 */
-  /* used from to_EUC_JP_E9_87 */
-      0,  1, 34, 34, 34, 34,  2,  3,    4,  5, 34,  6,  7,  8,  9, 10,
-     11, 12, 34, 34, 34, 34, 13, 14,   15, 34, 16, 17, 18, 19, 20, 21,
-     34, 22, 34, 23, 24, 25, 26, 27,   34, 34, 34, 34, 34, 28, 29, 34,
-     34, 34, 34, 34, 34, 30, 31, 34,   34, 34, 34, 34, 32, 34, 34, 33,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_87_infos[35] = {
-     o2(0xE7,0xD4), o2(0xE7,0xD5), o2(0x94,0xCE), o2(0x8D,0xD1),
-     o2(0x8E,0xDF), o2(0xE7,0xD6), o2(0xE7,0xD7), o2(0x97,0xA2),
-     o2(0x8F,0x64), o2(0x96,0xEC), o2(0x97,0xCA), o2(0xE7,0xD8),
-     o2(0x8B,0xE0), o2(0xE7,0xD9), o2(0xFB,0xBB), o2(0x93,0x42),
-     o2(0xFB,0xBA), o2(0xE7,0xDC), o2(0x8A,0x98), o2(0x90,0x6A),
-     o2(0xFB,0xBC), o2(0xE7,0xDA), o2(0xE7,0xDB), o2(0x92,0xDE),
-     o2(0xFB,0xBF), o2(0xFB,0xC0), o2(0x96,0x74), o2(0x8B,0xFA),
-     o2(0xFB,0xBD), o2(0xFB,0xBE), o2(0xE7,0xDE), o2(0xE7,0xDF),
-     o2(0xE7,0xDD), o2(0xE7,0xE1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_87 = {
-    to_SHIFT_JIS_E9_87_offsets,
-    to_SHIFT_JIS_E9_87_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_88_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_88 */
-  /* used from to_EUC_JP_E9_88 */
-     17, 17, 17, 17, 17, 17,  0, 17,   17, 17,  1, 17, 17,  2,  3, 17,
-      4,  5, 17, 17,  6,  7, 17, 17,   17, 17, 17, 17, 17, 17,  8, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17,  9, 17, 17, 10, 17, 17, 17,
-     17, 17, 17, 17, 11, 17, 17, 12,   17, 13, 14, 17, 15, 17, 17, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_88_infos[18] = {
-     o2(0xFB,0xC1), o2(0xFB,0xC3), o2(0x93,0xDD), o2(0x8A,0x62),
-     o2(0xFB,0xC2), o2(0xE7,0xE5), o2(0xE7,0xE2), o2(0xE7,0xE4),
-     o2(0xE7,0xE0), o2(0xE8,0x6E), o2(0xE7,0xE3), o2(0x97,0xE9),
-     o2(0x8C,0xD8), o2(0xFB,0xCA), o2(0xFB,0xC4), o2(0xFB,0xC6),
-     o2(0xE7,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_88 = {
-    to_SHIFT_JIS_E9_88_offsets,
-    to_SHIFT_JIS_E9_88_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_89_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_89 */
-  /* used from to_EUC_JP_E9_89 */
-      0, 22, 22, 22,  1,  2, 22, 22,    3,  4, 22,  5, 22, 22,  6, 22,
-      7,  8, 22, 22, 22, 22, 22,  9,   22, 10, 11, 12, 22, 22, 13, 22,
-     22, 22, 14, 22, 15, 22, 16, 17,   22, 22, 22, 22, 22, 22, 22, 22,
-     22, 18, 22, 22, 22, 22, 22, 19,   20, 22, 22, 22, 22, 22, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_89_infos[23] = {
-     o2(0xFB,0xC5), o2(0x93,0x53), o2(0xE7,0xE8), o2(0xE7,0xEB),
-     o2(0xE7,0xE9), o2(0xE7,0xEE), o2(0xFB,0xC7), o2(0xE7,0xEF),
-     o2(0xFB,0xC9), o2(0xE7,0xE7), o2(0xFB,0xC8), o2(0xE7,0xF4),
-     o2(0x89,0x94), o2(0xE7,0xE6), o2(0x94,0xAB), o2(0xE7,0xEA),
-     o2(0x8F,0xDE), o2(0xFB,0xCB), o2(0x8D,0x7A), o2(0xFB,0xCD),
-     o2(0xFB,0xCE), o2(0x96,0x67),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_89 = {
-    to_SHIFT_JIS_E9_89_offsets,
-    to_SHIFT_JIS_E9_89_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8A */
-  /* used from to_EUC_JP_E9_8A */
-      0, 16, 16,  1, 16,  2, 16, 16,    3, 16, 16, 16, 16, 16, 16, 16,
-     16,  4, 16,  5, 16,  6,  7, 16,    8, 16,  9, 10, 11, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 12,   16, 16, 16, 16, 16, 13, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 14,   16, 15, 16, 16, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8A_infos[17] = {
-     o2(0x8B,0xE2), o2(0x8F,0x65), o2(0x93,0xBA), o2(0xFA,0x5F),
-     o2(0x91,0x4C), o2(0xE7,0xF2), o2(0xE7,0xEC), o2(0xE7,0xF1),
-     o2(0x96,0xC1), o2(0x92,0xB6), o2(0xE7,0xF3), o2(0xE7,0xF0),
-     o2(0xFB,0xCC), o2(0x91,0x4B), o2(0xE7,0xF7), o2(0xE7,0xF6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8A = {
-    to_SHIFT_JIS_E9_8A_offsets,
-    to_SHIFT_JIS_E9_8A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8B */
-  /* used from to_EUC_JP_E9_8B */
-     21, 21, 21, 21, 21, 21, 21, 21,   21, 21, 21, 21, 21, 21, 21,  0,
-      1, 21,  2,  3, 21,  4, 21,  5,   21,  6, 21, 21, 21, 21, 21, 21,
-      7, 21, 21, 21,  8, 21, 21,  9,   21, 10, 11, 21, 21, 12, 21, 21,
-     21, 21, 13, 14, 21, 21, 21, 21,   15, 16, 17, 18, 19, 21, 21, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8B_infos[22] = {
-     o2(0xE7,0xF5), o2(0xFB,0xD2), o2(0x96,0x4E), o2(0xFB,0xD6),
-     o2(0xFB,0xD4), o2(0xFB,0xD0), o2(0xFB,0xD1), o2(0xFB,0xD5),
-     o2(0x8F,0x9B), o2(0xFB,0xCF), o2(0xE7,0xF8), o2(0x95,0xDD),
-     o2(0x89,0x73), o2(0x95,0x65), o2(0x92,0x92), o2(0x8B,0x98),
-     o2(0xFA,0x65), o2(0xE7,0xFA), o2(0xFB,0xD9), o2(0x8D,0x7C),
-     o2(0xFB,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8B = {
-    to_SHIFT_JIS_E9_8B_offsets,
-    to_SHIFT_JIS_E9_8B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8C */
-  /* used from to_EUC_JP_E9_8C */
-     24, 24,  0, 24, 24, 24,  1, 24,   24, 24, 24, 24, 24, 24, 24,  2,
-      3, 24, 24, 24, 24, 24, 24, 24,    4,  5,  6, 24, 24,  7,  8, 24,
-      9, 10, 11, 12, 24, 13, 14, 24,   15, 24, 24, 16, 17, 24, 18, 19,
-     24, 24, 20, 24, 24, 21, 24, 24,   24, 24, 22, 23, 24, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8C_infos[25] = {
-     o2(0xFB,0xDE), o2(0x8E,0x4B), o2(0xE7,0xF9), o2(0x90,0x8D),
-     o2(0x90,0x8E), o2(0xE8,0x40), o2(0xE8,0x42), o2(0xFB,0xDD),
-     o2(0xFB,0xDB), o2(0x8F,0xF9), o2(0xFB,0xD8), o2(0xE8,0x41),
-     o2(0xE8,0x43), o2(0xFB,0xD7), o2(0x8B,0xD1), o2(0x95,0x64),
-     o2(0x8E,0xE0), o2(0x98,0x42), o2(0xE7,0xFC), o2(0x8D,0xF6),
-     o2(0x98,0x5E), o2(0xE8,0x45), o2(0xE8,0x44), o2(0xE8,0x46),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8C = {
-    to_SHIFT_JIS_E9_8C_offsets,
-    to_SHIFT_JIS_E9_8C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8D */
-  /* used from to_EUC_JP_E9_8D */
-     16, 16, 16, 16,  0, 16, 16, 16,    1, 16, 16,  2, 16,  3, 16, 16,
-     16, 16, 16, 16,  4, 16,  5,  6,   16, 16, 16,  7,  8, 16, 16, 16,
-      9, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 10, 16, 11, 16,
-     12, 16, 16, 16, 16, 13, 16, 16,   16, 16, 16, 16, 14, 16, 15, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8D_infos[17] = {
-     o2(0xE7,0xFB), o2(0xFA,0x5E), o2(0x93,0xE7), o2(0x93,0x74),
-     o2(0x92,0xD5), o2(0xE8,0x4B), o2(0xFB,0xE0), o2(0x92,0x62),
-     o2(0xE8,0x47), o2(0xE8,0x48), o2(0x8C,0x4C), o2(0xE8,0x4A),
-     o2(0xFB,0xDF), o2(0x8C,0xAE), o2(0xE8,0x49), o2(0x8F,0xDF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8D = {
-    to_SHIFT_JIS_E9_8D_offsets,
-    to_SHIFT_JIS_E9_8D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8E */
-  /* used from to_EUC_JP_E9_8E */
-     12, 12, 12, 12, 12, 12, 12, 12,   12, 12, 12, 12,  0, 12, 12, 12,
-     12, 12, 12, 12,  1, 12,  2,  3,   12, 12,  4, 12, 12, 12, 12, 12,
-     12, 12, 12, 12,  5, 12, 12,  6,   12, 12, 12, 12,  7,  8,  9, 12,
-     10, 12, 12, 12, 12, 12, 12, 12,   12, 11, 12, 12, 12, 12, 12, 12,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8E_infos[13] = {
-     o2(0x8A,0x99), o2(0xE8,0x4F), o2(0x8D,0xBD), o2(0x91,0x99),
-     o2(0x92,0xC8), o2(0xFB,0xE1), o2(0x8A,0x5A), o2(0xE8,0x4D),
-     o2(0xE8,0x4E), o2(0x92,0xC1), o2(0xE8,0x4C), o2(0xE8,0x50),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8E = {
-    to_SHIFT_JIS_E9_8E_offsets,
-    to_SHIFT_JIS_E9_8E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_8F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_8F */
-  /* used from to_EUC_JP_E9_8F */
-     15, 15, 15,  0, 15, 15,  1, 15,    2, 15, 15, 15, 15, 15, 15, 15,
-      3,  4, 15, 15, 15, 15,  5,  6,    7, 15, 15, 15, 15,  8,  9, 15,
-     15, 10, 15, 15, 11, 12, 15, 15,   13, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   14, 15, 15, 15, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_8F_infos[16] = {
-     o2(0xE8,0x56), o2(0xFB,0xE2), o2(0xE8,0x59), o2(0xE8,0x58),
-     o2(0x93,0x4C), o2(0xE8,0x51), o2(0xE8,0x52), o2(0xE8,0x55),
-     o2(0xE8,0x57), o2(0xFB,0xE3), o2(0x8B,0xBE), o2(0xE8,0x5A),
-     o2(0xE8,0x54), o2(0xE8,0x53), o2(0xFB,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_8F = {
-    to_SHIFT_JIS_E9_8F_offsets,
-    to_SHIFT_JIS_E9_8F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_90_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_90 */
-  /* used from to_EUC_JP_E9_90 */
-     15, 15, 15,  0, 15, 15, 15,  1,   15, 15, 15, 15, 15, 15, 15, 15,
-      2, 15, 15,  3,  4, 15, 15, 15,    5,  6,  7, 15, 15, 15, 15, 15,
-     15,  8, 15, 15, 15, 15, 15, 15,   15, 15, 15,  9, 15, 15, 15, 15,
-     15, 10, 15, 15, 15, 11, 12, 15,   13, 15, 14, 15, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_90_infos[16] = {
-     o2(0xE8,0x5E), o2(0xE8,0x5F), o2(0xE8,0x60), o2(0xE8,0x5D),
-     o2(0xE8,0x5C), o2(0x8F,0xE0), o2(0x93,0xA8), o2(0xE8,0x5B),
-     o2(0xE8,0x64), o2(0xE8,0x62), o2(0xFB,0xE5), o2(0xE8,0x63),
-     o2(0xE8,0x61), o2(0x91,0xF6), o2(0xE8,0x65),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_90 = {
-    to_SHIFT_JIS_E9_90_offsets,
-    to_SHIFT_JIS_E9_90_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_91_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_91 */
-  /* used from to_EUC_JP_E9_91 */
-     20,  0, 20, 20,  1,  2, 20, 20,    3, 20, 20, 20, 20, 20, 20, 20,
-     20,  4,  5,  6, 20, 20, 20, 20,   20, 20,  7,  8, 20, 20,  9, 20,
-     10, 20, 11, 20, 20, 20, 20, 20,   20, 20, 12, 20, 20, 20, 20, 20,
-     13, 20, 20, 20, 20, 14, 20, 15,   20, 20, 20, 20, 16, 17, 18, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_91_infos[21] = {
-     o2(0xE8,0x66), o2(0xE8,0x68), o2(0xFB,0xE6), o2(0xFB,0xE7),
-     o2(0x8A,0xD3), o2(0xE8,0x67), o2(0x96,0xF8), o2(0xE8,0x73),
-     o2(0xE8,0x69), o2(0xE8,0x6C), o2(0xE8,0x6A), o2(0xE8,0x6B),
-     o2(0xE8,0x6D), o2(0xE8,0x6F), o2(0xE8,0x70), o2(0xE8,0x71),
-     o2(0xE8,0x74), o2(0xE8,0x72), o2(0xE8,0x75), o2(0xE8,0x77),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_91 = {
-    to_SHIFT_JIS_E9_91_offsets,
-    to_SHIFT_JIS_E9_91_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_92_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_92 */
-  /* used from to_EUC_JP_E9_92 */
-      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,  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,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_92_infos[2] = {
-     o2(0xE8,0x76),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_92 = {
-    to_SHIFT_JIS_E9_92_offsets,
-    to_SHIFT_JIS_E9_92_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_95_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_95 */
-  /* used from to_EUC_JP_E9_95 */
-      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,  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,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_95_infos[2] = {
-     o2(0x92,0xB7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_95 = {
-    to_SHIFT_JIS_E9_95_offsets,
-    to_SHIFT_JIS_E9_95_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_96_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_96 */
-  /* used from to_EUC_JP_E9_96 */
-      0, 28,  1,  2, 28, 28, 28,  3,   28,  4,  5,  6, 28, 28, 28,  7,
-     28,  8,  9, 10, 11, 28, 12, 28,   13, 14, 28, 28, 28, 28, 28, 28,
-     15, 28, 16, 17, 18, 19, 28, 20,   21, 28, 28, 28, 28, 22, 28, 28,
-     28, 28, 23, 28, 28, 28, 28, 28,   28, 24, 28, 25, 26, 28, 27, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_96_infos[29] = {
-     o2(0x96,0xE5), o2(0xE8,0x78), o2(0x91,0x4D), o2(0xE8,0x79),
-     o2(0x95,0xC2), o2(0xE8,0x7A), o2(0x8A,0x4A), o2(0x89,0x5B),
-     o2(0x8A,0xD5), o2(0xFB,0xE8), o2(0x8A,0xD4), o2(0xE8,0x7B),
-     o2(0xE8,0x7C), o2(0xE8,0x7D), o2(0xE8,0x7E), o2(0xE8,0x80),
-     o2(0x8A,0xD6), o2(0x8A,0x74), o2(0x8D,0x7D), o2(0x94,0xB4),
-     o2(0xE8,0x82), o2(0xE8,0x81), o2(0xE8,0x83), o2(0x89,0x7B),
-     o2(0xE8,0x86), o2(0xE8,0x85), o2(0xE8,0x84), o2(0xE8,0x87),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_96 = {
-    to_SHIFT_JIS_E9_96_offsets,
-    to_SHIFT_JIS_E9_96_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_97_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_97 */
-  /* used from to_EUC_JP_E9_97 */
-     13, 13, 13,  0, 13, 13, 13,  1,   13, 13,  2, 13,  3,  4, 13, 13,
-     13, 13, 13, 13,  5,  6,  7, 13,    8, 13, 13, 13,  9, 13, 13, 13,
-     13, 10, 11, 13, 13, 12, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_97_infos[14] = {
-     o2(0xE8,0x8A), o2(0x88,0xC5), o2(0xE8,0x88), o2(0xE8,0x8C),
-     o2(0xE8,0x8B), o2(0xE8,0x8E), o2(0xE8,0x8D), o2(0xE8,0x8F),
-     o2(0x93,0xAC), o2(0xE8,0x90), o2(0xE8,0x91), o2(0xE8,0x93),
-     o2(0xE8,0x92),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_97 = {
-    to_SHIFT_JIS_E9_97_offsets,
-    to_SHIFT_JIS_E9_97_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_98_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_98 */
-  /* used from to_EUC_JP_E9_98 */
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  0,  9,  9,  9,
-      9,  1,  9,  9,  9,  9,  9,  9,    2,  9,  3,  9,  9,  9,  4,  5,
-      9,  9,  6,  9,  9,  9,  9,  9,    9,  9,  9,  7,  9,  9,  9,  8,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_98_infos[10] = {
-     o2(0x95,0x8C), o2(0xE8,0x94), o2(0xE8,0x95), o2(0x8D,0xE3),
-     o2(0xE8,0x96), o2(0xE8,0x97), o2(0x96,0x68), o2(0x91,0x6A),
-     o2(0x88,0xA2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_98 = {
-    to_SHIFT_JIS_E9_98_offsets,
-    to_SHIFT_JIS_E9_98_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_99_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_99 */
-  /* used from to_EUC_JP_E9_99 */
-      0, 29,  1, 29,  2, 29, 29, 29,   29, 29, 29,  3,  4,  5, 29,  6,
-      7, 29, 29, 29, 29, 29, 29, 29,   29, 29, 29,  8,  9, 10, 11, 12,
-     29, 29, 13, 14, 15, 16, 17, 29,   29, 29, 18, 29, 19, 29, 29, 29,
-     20, 29, 21, 22, 29, 23, 24, 25,   26, 29, 27, 29, 29, 28, 29, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_99_infos[30] = {
-     o2(0x91,0xC9), o2(0xE8,0x98), o2(0x95,0x8D), o2(0xE8,0x9B),
-     o2(0xE8,0x99), o2(0x8D,0x7E), o2(0xE8,0x9A), o2(0x8C,0xC0),
-     o2(0x95,0xC3), o2(0xE8,0x9D), o2(0xE8,0x9F), o2(0xE8,0x9E),
-     o2(0xE8,0xA0), o2(0x89,0x40), o2(0x90,0x77), o2(0x8F,0x9C),
-     o2(0x8A,0xD7), o2(0xE8,0xA1), o2(0x94,0x86), o2(0xE8,0xA3),
-     o2(0x89,0x41), o2(0xE8,0xA2), o2(0x92,0xC2), o2(0x97,0xCB),
-     o2(0x93,0xA9), o2(0xE8,0x9C), o2(0x97,0xA4), o2(0x8C,0xAF),
-     o2(0x97,0x7A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_99 = {
-    to_SHIFT_JIS_E9_99_offsets,
-    to_SHIFT_JIS_E9_99_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9A_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9A */
-  /* used from to_EUC_JP_E9_9A */
-     32, 32, 32, 32, 32,  0,  1, 32,    2, 32,  3,  4, 32,  5,  6,  7,
-     32, 32, 32, 32,  8,  9, 32, 10,   11, 12, 32, 13, 14, 15, 32, 32,
-     16, 32, 32, 17, 32, 32, 32, 18,   19, 32, 20, 32, 32, 32, 32, 21,
-     22, 23, 24, 32, 25, 32, 26, 27,   28, 29, 32, 30, 31, 32, 32, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9A_infos[33] = {
-     o2(0x8B,0xF7), o2(0x97,0xB2), o2(0x8C,0x47), o2(0x91,0xE0),
-     o2(0xE4,0x40), o2(0xE8,0xA4), o2(0x8A,0x4B), o2(0x90,0x8F),
-     o2(0x8A,0x75), o2(0xE8,0xA6), o2(0xE8,0xA7), o2(0xE8,0xA5),
-     o2(0x8C,0x84), o2(0x8D,0xDB), o2(0x8F,0xE1), o2(0xFB,0xEB),
-     o2(0x89,0x42), o2(0x97,0xD7), o2(0xE8,0xA9), o2(0xE7,0xAC),
-     o2(0xE8,0xA8), o2(0xFB,0xEC), o2(0xE8,0xAC), o2(0xE8,0xAA),
-     o2(0xE8,0xAB), o2(0xE8,0xAD), o2(0xE8,0xAE), o2(0x97,0xEA),
-     o2(0xE8,0xAF), o2(0xE8,0xB0), o2(0x90,0xC7), o2(0x94,0xB9),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9A = {
-    to_SHIFT_JIS_E9_9A_offsets,
-    to_SHIFT_JIS_E9_9A_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9B_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9B */
-  /* used from to_EUC_JP_E9_9B */
-      0,  1, 28, 28,  2,  3,  4,  5,   28,  6, 28,  7,  8,  9, 10, 28,
-     28, 11, 28, 28, 28, 12, 13, 28,   28, 14, 28, 15, 16, 28, 28, 28,
-     28, 28, 17, 18, 28, 28, 28, 28,   19, 28, 20, 21, 28, 28, 28, 28,
-     22, 28, 23, 28, 28, 28, 24, 25,   28, 26, 28, 27, 28, 28, 28, 28,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9B_infos[29] = {
-     o2(0x90,0x9D), o2(0x8A,0xE5), o2(0x97,0x59), o2(0x89,0xEB),
-     o2(0x8F,0x57), o2(0x8C,0xD9), o2(0xE8,0xB3), o2(0xE8,0xB2),
-     o2(0x8E,0x93), o2(0xE8,0xB4), o2(0xE8,0xB1), o2(0x8E,0x47),
-     o2(0xE8,0xB8), o2(0xE5,0xAB), o2(0x99,0xD4), o2(0x90,0x97),
-     o2(0xE8,0xB6), o2(0x97,0xA3), o2(0x93,0xEF), o2(0x89,0x4A),
-     o2(0x90,0xE1), o2(0x8E,0xB4), o2(0x95,0xB5), o2(0x89,0x5F),
-     o2(0x97,0xEB), o2(0x97,0x8B), o2(0xE8,0xB9), o2(0x93,0x64),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9B = {
-    to_SHIFT_JIS_E9_9B_offsets,
-    to_SHIFT_JIS_E9_9B_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9C_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9C */
-  /* used from to_EUC_JP_E9_9C */
-      0, 26, 26, 26,  1, 26,  2,  3,    4, 26,  5, 26, 26,  6,  7,  8,
-     26,  9, 26, 10, 26, 26, 11, 26,   26, 12, 26, 26, 13, 26, 14, 26,
-     26, 26, 26, 26, 15, 26, 26, 16,   26, 26, 17, 26, 26, 26, 26, 26,
-     18, 26, 19, 20, 26, 26, 26, 26,   21, 22, 26, 23, 26, 24, 25, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9C_infos[27] = {
-     o2(0x8E,0xF9), o2(0xE8,0xBA), o2(0xE8,0xBB), o2(0x90,0x6B),
-     o2(0xE8,0xBC), o2(0x97,0xEC), o2(0xE8,0xB7), o2(0xE8,0xBE),
-     o2(0xE8,0xC0), o2(0xE8,0xBF), o2(0xE8,0xBD), o2(0xE8,0xC1),
-     o2(0xE8,0xC2), o2(0x91,0x9A), o2(0x89,0xE0), o2(0xE8,0xC3),
-     o2(0x96,0xB6), o2(0xE8,0xC4), o2(0xE8,0xC5), o2(0x98,0x49),
-     o2(0xFB,0xED), o2(0x9E,0x50), o2(0xE8,0xC6), o2(0xFB,0xEE),
-     o2(0xE8,0xC7), o2(0xE8,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9C = {
-    to_SHIFT_JIS_E9_9C_offsets,
-    to_SHIFT_JIS_E9_9C_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9D_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9D */
-  /* used from to_EUC_JP_E9_9D */
-     29, 29,  0,  1,  2, 29,  3, 29,    4,  5, 29, 29, 29,  6, 29,  7,
-     29,  8,  9, 29, 29, 10, 11, 29,   29, 12, 29, 29, 13, 29, 14, 29,
-     15, 16, 17, 29, 18, 29, 19, 29,   20, 21, 29, 22, 29, 23, 29, 29,
-     29, 24, 29, 29, 25, 29, 29, 29,   29, 26, 27, 29, 28, 29, 29, 29,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9D_infos[30] = {
-     o2(0xE8,0xCC), o2(0xFB,0xEF), o2(0xE8,0xC9), o2(0xE8,0xCA),
-     o2(0xE8,0xCB), o2(0xE8,0xCD), o2(0xFB,0xF0), o2(0xFB,0xF1),
-     o2(0xFB,0xF2), o2(0x90,0xC2), o2(0xFB,0xF3), o2(0x96,0xF5),
-     o2(0x90,0xC3), o2(0xE8,0xCE), o2(0x94,0xF1), o2(0xE8,0xCF),
-     o2(0xEA,0x72), o2(0x96,0xCA), o2(0xE8,0xD0), o2(0xE8,0xD1),
-     o2(0xE8,0xD2), o2(0x8A,0x76), o2(0xE8,0xD4), o2(0x90,0x78),
-     o2(0xE8,0xD5), o2(0x8C,0x43), o2(0xE8,0xD6), o2(0xE8,0xDA),
-     o2(0xE8,0xD8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9D = {
-    to_SHIFT_JIS_E9_9D_offsets,
-    to_SHIFT_JIS_E9_9D_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9E_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9E */
-  /* used from to_EUC_JP_E9_9E */
-     18,  0, 18, 18,  1,  2,  3, 18,   18, 18, 18,  4, 18,  5, 18,  6,
-      7, 18, 18, 18, 18, 18, 18, 18,    8, 18, 18, 18,  9, 18, 18, 18,
-     10, 18, 18, 11, 18, 18, 12, 18,   13, 18, 18, 14, 18, 15, 18, 18,
-     18, 18, 18, 16, 17, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9E_infos[19] = {
-     o2(0xE8,0xD9), o2(0x8A,0x93), o2(0xE8,0xD7), o2(0xE8,0xDB),
-     o2(0xE8,0xDC), o2(0x88,0xC6), o2(0xE8,0xDD), o2(0xE8,0xDE),
-     o2(0x8F,0xE2), o2(0xE8,0xDF), o2(0x8B,0x66), o2(0xE8,0xE2),
-     o2(0xE8,0xE1), o2(0xE8,0xE0), o2(0xE6,0x91), o2(0x95,0xDA),
-     o2(0xE8,0xE3), o2(0xE8,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9E = {
-    to_SHIFT_JIS_E9_9E_offsets,
-    to_SHIFT_JIS_E9_9E_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_9F_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_9F */
-  /* used from to_EUC_JP_E9_9F */
-     14, 14, 14,  0, 14, 14,  1, 14,    2, 14, 14,  3, 14, 14, 14, 14,
-     14, 14, 14,  4, 14, 14, 14, 14,   14, 14, 14, 14,  5, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,   14, 14, 14, 14, 14,  6,  7, 14,
-     14, 14,  8,  9, 14, 10, 11, 14,   14, 14, 14, 12, 14, 14, 14, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_9F_infos[15] = {
-     o2(0xE8,0xE5), o2(0xE8,0xE6), o2(0xE8,0xE7), o2(0xE8,0xE8),
-     o2(0x8A,0xD8), o2(0xE8,0xE9), o2(0xE8,0xEA), o2(0x94,0x42),
-     o2(0xE8,0xEC), o2(0x89,0xB9), o2(0xE8,0xEF), o2(0xE8,0xEE),
-     o2(0x89,0x43), o2(0x8B,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_9F = {
-    to_SHIFT_JIS_E9_9F_offsets,
-    to_SHIFT_JIS_E9_9F_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A0 */
-  /* used from to_EUC_JP_E9_A0 */
-     25,  0,  1,  2, 25,  3,  4, 25,    5, 25, 25, 25,  6, 25, 25,  7,
-      8,  9, 10, 11, 25, 25, 25, 12,   13, 25, 14, 25, 25, 25, 25, 25,
-     25, 15, 25, 25, 16, 25, 25, 25,   25, 25, 25, 25, 17, 18, 25, 25,
-     25, 25, 25, 25, 19, 25, 25, 20,   21, 25, 25, 22, 23, 24, 25, 25,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A0_infos[26] = {
-     o2(0x95,0xC5), o2(0x92,0xB8), o2(0x8D,0xA0), o2(0x8D,0x80),
-     o2(0x8F,0x87), o2(0x90,0x7B), o2(0xE8,0xF1), o2(0xE8,0xF0),
-     o2(0x97,0x61), o2(0x8A,0xE6), o2(0x94,0xD0), o2(0x93,0xDA),
-     o2(0x90,0x9C), o2(0x97,0xCC), o2(0x8C,0x7A), o2(0xE8,0xF4),
-     o2(0xE8,0xF3), o2(0x96,0x6A), o2(0x93,0xAA), o2(0x89,0x6F),
-     o2(0xE8,0xF5), o2(0xE8,0xF2), o2(0x95,0x70), o2(0x97,0x8A),
-     o2(0xE8,0xF6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A0 = {
-    to_SHIFT_JIS_E9_A0_offsets,
-    to_SHIFT_JIS_E9_A0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A1 */
-  /* used from to_EUC_JP_E9_A1 */
-     20, 20, 20, 20, 20, 20,  0, 20,   20, 20, 20,  1,  2,  3,  4,  5,
-     20, 20, 20, 20,  6,  7, 20,  8,    9, 20, 20, 10, 20, 20, 11, 20,
-     20, 20, 20, 20, 20, 12, 20, 13,   20, 20, 20, 14, 20, 20, 20, 15,
-     16, 17, 20, 18, 19, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A1_infos[21] = {
-     o2(0xE8,0xF7), o2(0xE8,0xF9), o2(0x91,0xE8), o2(0x8A,0x7A),
-     o2(0x8A,0x7B), o2(0xE8,0xF8), o2(0x8A,0xE7), o2(0x8C,0xB0),
-     o2(0xFB,0xF4), o2(0x8A,0xE8), o2(0x93,0x5E), o2(0x97,0xDE),
-     o2(0xFB,0xF5), o2(0x8C,0xDA), o2(0xE8,0xFA), o2(0xE8,0xFB),
-     o2(0xE8,0xFC), o2(0xE9,0x40), o2(0xE9,0x42), o2(0xE9,0x41),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A1 = {
-    to_SHIFT_JIS_E9_A1_offsets,
-    to_SHIFT_JIS_E9_A1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A2_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A2 */
-  /* used from to_EUC_JP_E9_A2 */
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    0,  5,  1,  5,  5,  5,  5,  2,
-      5,  3,  5,  5,  5,  5,  4,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A2_infos[6] = {
-     o2(0x95,0x97), o2(0xE9,0x43), o2(0xE9,0x44), o2(0xE9,0x45),
-     o2(0xE9,0x46),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A2 = {
-    to_SHIFT_JIS_E9_A2_offsets,
-    to_SHIFT_JIS_E9_A2_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A3 */
-  /* used from to_EUC_JP_E9_A3 */
-     17, 17, 17,  0,  1, 17,  2, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17,  3,  4, 17, 17,  5,
-     17, 17,  6, 17, 17, 17, 17, 17,   17,  7, 17,  8, 17,  9, 10, 11,
-     17, 17, 12, 17, 13, 17, 17, 17,   17, 17, 17, 17, 14, 15, 16, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A3_infos[18] = {
-     o2(0xE9,0x48), o2(0xE9,0x47), o2(0xE9,0x49), o2(0x94,0xF2),
-     o2(0xE3,0xCA), o2(0x90,0x48), o2(0x8B,0x51), o2(0xE9,0x4A),
-     o2(0xE9,0x4B), o2(0x99,0xAA), o2(0x9F,0x5A), o2(0x94,0xD1),
-     o2(0x88,0xF9), o2(0x88,0xB9), o2(0x8E,0x94), o2(0x96,0x4F),
-     o2(0x8F,0xFC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A3 = {
-    to_SHIFT_JIS_E9_A3_offsets,
-    to_SHIFT_JIS_E9_A3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A4 */
-  /* used from to_EUC_JP_E9_A4 */
-     21, 21, 21,  0, 21,  1, 21, 21,   21,  2,  3, 21,  4, 21, 21, 21,
-      5, 21,  6,  7,  8, 21, 21, 21,    9, 21, 21, 21, 21, 10, 11, 21,
-     12, 13, 21, 21, 14, 21, 21, 15,   16, 21, 21, 21, 17, 21, 18, 21,
-     21, 21, 21, 21, 21, 21, 21, 21,   21, 21, 21, 21, 21, 19, 20, 21,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A4_infos[22] = {
-     o2(0xE9,0x4C), o2(0x96,0xDD), o2(0xE9,0x4D), o2(0x97,0x7B),
-     o2(0x89,0x61), o2(0x8E,0x60), o2(0xE9,0x4E), o2(0x89,0xEC),
-     o2(0xE9,0x4F), o2(0xE9,0x50), o2(0xE9,0x52), o2(0xE9,0x53),
-     o2(0xE9,0x55), o2(0xE9,0x51), o2(0xE9,0x54), o2(0xFB,0xF8),
-     o2(0x8A,0xD9), o2(0xE9,0x56), o2(0xE9,0x57), o2(0xE9,0x58),
-     o2(0xE9,0x59),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A4 = {
-    to_SHIFT_JIS_E9_A4_offsets,
-    to_SHIFT_JIS_E9_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A5 */
-  /* used from to_EUC_JP_E9_A5 */
-     10, 10,  0, 10, 10,  1, 10, 10,   10,  2, 10,  3,  4, 10, 10, 10,
-      5,  6,  7, 10, 10,  8, 10,  9,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A5_infos[11] = {
-     o2(0xE9,0x5A), o2(0xE9,0x5C), o2(0xE9,0x5B), o2(0xE9,0x5E),
-     o2(0xE9,0x61), o2(0xE9,0x5D), o2(0xE9,0x5F), o2(0xE9,0x60),
-     o2(0xE9,0x62), o2(0x8B,0xC0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A5 = {
-    to_SHIFT_JIS_E9_A5_offsets,
-    to_SHIFT_JIS_E9_A5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A6 */
-  /* used from to_EUC_JP_E9_A6 */
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13,  0,  1,    2,  3, 13, 13, 13, 13,  4, 13,
-     13, 13, 13, 13, 13,  5, 13, 13,    6, 13, 13, 13,  7,  8,  9, 13,
-     13, 13, 13, 10, 11, 13, 13, 13,   13, 13, 13, 13, 12, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A6_infos[14] = {
-     o2(0x8E,0xF1), o2(0xE9,0x63), o2(0xE9,0x64), o2(0x8D,0x81),
-     o2(0xFB,0xFA), o2(0xE9,0x65), o2(0x8A,0x5D), o2(0x94,0x6E),
-     o2(0xE9,0x66), o2(0xE9,0x67), o2(0x92,0x79), o2(0x93,0xE9),
-     o2(0xE9,0x68),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A6 = {
-    to_SHIFT_JIS_E9_A6_offsets,
-    to_SHIFT_JIS_E9_A6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A7 */
-  /* used from to_EUC_JP_E9_A7 */
-     21,  0, 21, 21,  1,  2,  3, 21,    4, 21, 21, 21, 21, 21, 21, 21,
-      5,  6,  7, 21, 21,  8, 21, 21,    9, 21, 21, 10, 21, 11, 21, 12,
-     21, 21, 13, 21, 21, 21, 21, 21,   21, 21, 21, 21, 21, 14, 15, 21,
-     21, 16, 17, 21, 21, 21, 21, 21,   18, 21, 21, 19, 21, 21, 21, 20,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A7_infos[22] = {
-     o2(0x94,0x9D), o2(0x91,0xCA), o2(0x89,0x77), o2(0x8B,0xEC),
-     o2(0x8B,0xED), o2(0x92,0x93), o2(0xE9,0x6D), o2(0x8B,0xEE),
-     o2(0x89,0xED), o2(0xE9,0x6C), o2(0xE9,0x6A), o2(0xE9,0x6B),
-     o2(0xE9,0x69), o2(0xE9,0x77), o2(0xE9,0x6E), o2(0xE9,0x6F),
-     o2(0xE9,0x70), o2(0xE9,0x71), o2(0xE9,0x73), o2(0xE9,0x72),
-     o2(0x8F,0x78),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A7 = {
-    to_SHIFT_JIS_E9_A7_offsets,
-    to_SHIFT_JIS_E9_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A8 */
-  /* used from to_EUC_JP_E9_A8 */
-     12,  0, 12, 12, 12,  1, 12, 12,   12, 12, 12, 12, 12, 12,  2,  3,
-     12, 12,  4,  5, 12, 12, 12, 12,   12,  6, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,    7, 12, 12,  8, 12, 12, 12, 12,
-      9, 12, 12, 12, 12, 12, 12, 10,   12, 12, 12, 12, 12, 12, 11, 12,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A8_infos[13] = {
-     o2(0xE9,0x74), o2(0xE9,0x76), o2(0x8B,0x52), o2(0xE9,0x75),
-     o2(0x91,0x9B), o2(0x8C,0xB1), o2(0xE9,0x78), o2(0x91,0xCB),
-     o2(0xE9,0x79), o2(0x93,0xAB), o2(0xE9,0x7A), o2(0xE9,0x80),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A8 = {
-    to_SHIFT_JIS_E9_A8_offsets,
-    to_SHIFT_JIS_E9_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_A9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_A9 */
-  /* used from to_EUC_JP_E9_A9 */
-      0, 17,  1,  2, 17,  3, 17, 17,   17, 17, 17, 17, 17,  4,  5, 17,
-     17, 17, 17, 17, 17,  6, 17,  7,   17, 17,  8,  9, 17, 17, 17, 10,
-     17, 17, 11, 17, 12, 13, 17, 17,   17, 14, 15, 16, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_A9_infos[18] = {
-     o2(0xE9,0x7D), o2(0xE9,0x7C), o2(0xE9,0x7E), o2(0xE9,0x7B),
-     o2(0xE9,0x82), o2(0xFB,0xFB), o2(0xE9,0x81), o2(0xE9,0x84),
-     o2(0x8B,0xC1), o2(0xE9,0x83), o2(0xE9,0x85), o2(0xE9,0x86),
-     o2(0xE9,0x88), o2(0xE9,0x87), o2(0xE9,0x89), o2(0xE9,0x8B),
-     o2(0xE9,0x8A),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_A9 = {
-    to_SHIFT_JIS_E9_A9_offsets,
-    to_SHIFT_JIS_E9_A9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AA */
-  /* used from to_EUC_JP_E9_AA */
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    0,  5,  5,  5,  5,  1,  5,  5,
-      2,  5,  5,  5,  5,  5,  5,  5,    3,  5,  5,  5,  4,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AA_infos[6] = {
-     o2(0x8D,0x9C), o2(0xE9,0x8C), o2(0xE9,0x8D), o2(0x8A,0x5B),
-     o2(0xE9,0x8E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AA = {
-    to_SHIFT_JIS_E9_AA_offsets,
-    to_SHIFT_JIS_E9_AA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AB */
-  /* used from to_EUC_JP_E9_AB */
-      0, 23, 23, 23,  1, 23, 23, 23,   23, 23, 23, 23, 23, 23, 23,  2,
-     23,  3, 23,  4,  5, 23, 23, 23,    6,  7, 23, 23,  8, 23,  9, 10,
-     23, 23, 11, 12, 23, 23, 13, 23,   23, 23, 14, 15, 23, 16, 17, 18,
-     23, 19, 23, 23, 20, 23, 23, 21,   23, 23, 23, 22, 23, 23, 23, 23,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AB_infos[24] = {
-     o2(0xE9,0x8F), o2(0x90,0x91), o2(0xE9,0x90), o2(0xE9,0x91),
-     o2(0xE9,0x92), o2(0xE9,0x93), o2(0x8D,0x82), o2(0xFB,0xFC),
-     o2(0xFC,0x40), o2(0xE9,0x94), o2(0xE9,0x95), o2(0xE9,0x96),
-     o2(0xE9,0x97), o2(0xE9,0x98), o2(0x94,0xAF), o2(0xE9,0x9A),
-     o2(0x95,0x45), o2(0xE9,0x9B), o2(0xE9,0x99), o2(0xE9,0x9D),
-     o2(0xE9,0x9C), o2(0xE9,0x9E), o2(0xE9,0x9F),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AB = {
-    to_SHIFT_JIS_E9_AB_offsets,
-    to_SHIFT_JIS_E9_AB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AC */
-  /* used from to_EUC_JP_E9_AC */
-     17, 17, 17, 17, 17, 17,  0, 17,   17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,    1, 17,  2, 17, 17, 17, 17,  3,
-     17, 17,  4,  5, 17,  6, 17,  7,    8,  9, 10, 17, 17, 17, 11, 12,
-     17, 13, 14, 17, 17, 17, 17, 17,   17, 17, 17, 15, 16, 17, 17, 17,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AC_infos[18] = {
-     o2(0xE9,0xA0), o2(0xE9,0xA1), o2(0xE9,0xA2), o2(0xE9,0xA3),
-     o2(0xE9,0xA4), o2(0xE9,0xA5), o2(0xE9,0xA6), o2(0xE9,0xA7),
-     o2(0xE9,0xA8), o2(0xE9,0xA9), o2(0xE9,0xAA), o2(0xE9,0xAB),
-     o2(0xE9,0xAC), o2(0x9F,0x54), o2(0xE9,0xAD), o2(0xE2,0xF6),
-     o2(0x8B,0x53),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AC = {
-    to_SHIFT_JIS_E9_AC_offsets,
-    to_SHIFT_JIS_E9_AC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AD */
-  /* used from to_EUC_JP_E9_AD */
-     16,  0,  1,  2,  3,  4, 16, 16,   16, 16, 16, 16, 16,  5,  6,  7,
-     16,  8, 16, 16,  9, 16, 16, 16,   10, 16, 11, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 12,
-     16, 16, 13, 16, 14, 15, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AD_infos[17] = {
-     o2(0x8A,0x40), o2(0x8D,0xB0), o2(0xE9,0xAF), o2(0xE9,0xAE),
-     o2(0x96,0xA3), o2(0xE9,0xB1), o2(0xE9,0xB2), o2(0xE9,0xB0),
-     o2(0xE9,0xB3), o2(0x96,0x82), o2(0xE9,0xB4), o2(0x8B,0x9B),
-     o2(0x98,0x44), o2(0xFC,0x42), o2(0xE9,0xB5), o2(0xFC,0x41),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AD = {
-    to_SHIFT_JIS_E9_AD_offsets,
-    to_SHIFT_JIS_E9_AD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AE */
-  /* used from to_EUC_JP_E9_AE */
-     19, 19, 19,  0, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19,  1,  2,
-     19,  3,  4,  5, 19, 19,  6,  7,   19, 19, 19, 19, 19, 19, 19,  8,
-      9, 19, 19, 19, 19, 19, 19, 19,   10, 19, 11, 12, 19, 13, 14, 19,
-     19, 15, 19, 19, 16, 19, 19, 19,   19, 17, 19, 18, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AE_infos[20] = {
-     o2(0xE9,0xB7), o2(0x88,0xBC), o2(0xFC,0x43), o2(0xE9,0xB8),
-     o2(0x95,0xA9), o2(0xE9,0xB6), o2(0xE9,0xB9), o2(0xE9,0xBA),
-     o2(0xE9,0xBB), o2(0xE9,0xBC), o2(0xE9,0xBD), o2(0x96,0x8E),
-     o2(0x8E,0x4C), o2(0x8D,0xF8), o2(0x91,0x4E), o2(0xFC,0x44),
-     o2(0xE9,0xBE), o2(0xE9,0xC1), o2(0xFC,0x45),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AE = {
-    to_SHIFT_JIS_E9_AE_offsets,
-    to_SHIFT_JIS_E9_AE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_AF_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_AF */
-  /* used from to_EUC_JP_E9_AF */
-      0, 19, 19, 19, 19, 19,  1, 19,   19,  2,  3, 19, 19, 19, 19,  4,
-     19,  5,  6, 19,  7, 19,  8, 19,   19, 19, 19,  9, 19, 19, 19, 19,
-     19, 10, 11, 12, 13, 19, 19, 19,   14, 19, 19, 19, 19, 19, 19, 19,
-     15, 16, 17, 19, 19, 18, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_AF_infos[20] = {
-     o2(0xE9,0xBF), o2(0xE9,0xC2), o2(0x8C,0xEF), o2(0xE9,0xC0),
-     o2(0xE9,0xC3), o2(0xE9,0xC4), o2(0xE9,0xC5), o2(0xE9,0xC9),
-     o2(0x8E,0x49), o2(0x91,0xE2), o2(0xE9,0xCA), o2(0xE9,0xC7),
-     o2(0xE9,0xC6), o2(0xE9,0xC8), o2(0x8C,0x7E), o2(0xE9,0xCE),
-     o2(0xE9,0xCD), o2(0xE9,0xCC), o2(0x88,0xB1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_AF = {
-    to_SHIFT_JIS_E9_AF_offsets,
-    to_SHIFT_JIS_E9_AF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B0_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B0 */
-  /* used from to_EUC_JP_E9_B0 */
-      0, 26, 26, 26,  1, 26,  2, 26,    3,  4,  5, 26,  6,  7, 26, 26,
-      8, 26,  9, 10, 11, 12, 26, 26,   26, 26, 26, 13, 26, 26, 26, 26,
-     26, 14, 26, 26, 15, 16, 26, 26,   26, 26, 26, 26, 26, 17, 18, 19,
-     20, 26, 21, 26, 26, 26, 26, 26,   26, 22, 23, 24, 26, 26, 25, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B0_infos[27] = {
-     o2(0xFC,0x46), o2(0xE9,0xD8), o2(0xE9,0xD4), o2(0xE9,0xD5),
-     o2(0xE9,0xD1), o2(0xE9,0xD7), o2(0xE9,0xD3), o2(0x8A,0x82),
-     o2(0x98,0x6B), o2(0xE9,0xD6), o2(0xE9,0xD2), o2(0xE9,0xD0),
-     o2(0xE9,0xCF), o2(0xE9,0xDA), o2(0xE9,0xDD), o2(0xE9,0xDC),
-     o2(0xE9,0xDB), o2(0x95,0x68), o2(0xE9,0xD9), o2(0x88,0xF1),
-     o2(0xE9,0xDE), o2(0xE9,0xE0), o2(0x8A,0x8F), o2(0xE9,0xCB),
-     o2(0x89,0x56), o2(0xE9,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B0 = {
-    to_SHIFT_JIS_E9_B0_offsets,
-    to_SHIFT_JIS_E9_B0_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B1_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B1 */
-  /* used from to_EUC_JP_E9_B1 */
-     10, 10, 10, 10, 10, 10,  0,  1,    2, 10, 10, 10, 10, 10, 10, 10,
-     10, 10,  3, 10, 10, 10, 10,  4,   10, 10,  5, 10, 10, 10, 10, 10,
-      6, 10, 10, 10, 10, 10, 10,  7,   10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10,  8, 10,    9, 10, 10, 10, 10, 10, 10, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B1_infos[11] = {
-     o2(0xE9,0xE1), o2(0xE9,0xDF), o2(0x92,0x4C), o2(0x96,0x90),
-     o2(0x97,0xD8), o2(0xE9,0xE3), o2(0xE9,0xE4), o2(0xE9,0xE5),
-     o2(0xE9,0xE6), o2(0xE9,0xE7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B1 = {
-    to_SHIFT_JIS_E9_B1_offsets,
-    to_SHIFT_JIS_E9_B1_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B3_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B3 */
-  /* used from to_EUC_JP_E9_B3 */
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  0,  9,  1,    9,  2,  9,  3,  4,  9,  9,  9,
-      5,  9,  9,  6,  7,  9,  8,  9,    9,  9,  9,  9,  9,  9,  9,  9,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B3_infos[10] = {
-     o2(0x92,0xB9), o2(0xE9,0xE8), o2(0x94,0xB5), o2(0xE9,0xED),
-     o2(0xE9,0xE9), o2(0xE9,0xEA), o2(0x96,0x50), o2(0x96,0xC2),
-     o2(0x93,0xCE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B3 = {
-    to_SHIFT_JIS_E9_B3_offsets,
-    to_SHIFT_JIS_E9_B3_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B4_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B4 */
-  /* used from to_EUC_JP_E9_B4 */
-     19, 19, 19,  0, 19, 19,  1,  2,    3,  4, 19, 19, 19, 19,  5, 19,
-     19, 19,  6, 19, 19,  7, 19, 19,   19, 19, 19,  8, 19, 19, 19,  9,
-     19, 19, 19, 10, 19, 19, 11, 19,   12, 19, 13, 14, 15, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19, 16, 19, 19, 17, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B4_infos[20] = {
-     o2(0xE9,0xEE), o2(0xE9,0xEF), o2(0x93,0xBC), o2(0xE9,0xEC),
-     o2(0xE9,0xEB), o2(0x89,0xA8), o2(0xE9,0xF7), o2(0xE9,0xF6),
-     o2(0x89,0x95), o2(0xE9,0xF4), o2(0xE9,0xF3), o2(0xE9,0xF1),
-     o2(0x8A,0x9B), o2(0xE9,0xF0), o2(0x8E,0xB0), o2(0x89,0xA7),
-     o2(0x8D,0x83), o2(0xE9,0xFA), o2(0xE9,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B4 = {
-    to_SHIFT_JIS_E9_B4_offsets,
-    to_SHIFT_JIS_E9_B4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B5_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B5 */
-  /* used from to_EUC_JP_E9_B5 */
-     19,  0, 19, 19,  1, 19,  2, 19,    3, 19, 19, 19, 19, 19, 19, 19,
-      4,  5, 19, 19, 19, 19, 19, 19,   19,  6, 19, 19,  7,  8,  9, 19,
-     10, 11, 19, 19, 12, 19, 19, 19,   19, 19, 19, 13, 14, 19, 19, 15,
-     16, 19, 17, 19, 19, 19, 19, 19,   19, 19, 18, 19, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B5_infos[20] = {
-     o2(0xE9,0xF8), o2(0xE9,0xF5), o2(0xE9,0xFB), o2(0xE9,0xFC),
-     o2(0xEA,0x44), o2(0xEA,0x43), o2(0xEA,0x45), o2(0x89,0x4C),
-     o2(0xEA,0x40), o2(0xEA,0x41), o2(0x8D,0x94), o2(0x96,0xB7),
-     o2(0xEA,0x42), o2(0xFC,0x48), o2(0x96,0x51), o2(0xEA,0x4A),
-     o2(0xFC,0x47), o2(0xEA,0x46), o2(0xEA,0x4B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B5 = {
-    to_SHIFT_JIS_E9_B5_offsets,
-    to_SHIFT_JIS_E9_B5_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B6_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B6 */
-  /* used from to_EUC_JP_E9_B6 */
-     13, 13, 13, 13, 13, 13, 13,  0,   13,  1, 13, 13, 13, 13, 13,  2,
-     13, 13, 13, 13, 13, 13, 13, 13,   13, 13,  3, 13, 13, 13, 13, 13,
-     13, 13, 13, 13,  4, 13, 13, 13,   13,  5, 13,  6, 13, 13, 13,  7,
-     13, 13,  8, 13,  9, 13, 13, 13,   10, 13, 11, 12, 13, 13, 13, 13,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B6_infos[14] = {
-     o2(0xEA,0x48), o2(0xEA,0x47), o2(0x8C,0x7B), o2(0xEA,0x4C),
-     o2(0xEA,0x4D), o2(0xEA,0x4E), o2(0xEA,0x49), o2(0xE9,0xF2),
-     o2(0xEA,0x4F), o2(0x92,0xDF), o2(0xEA,0x53), o2(0xEA,0x54),
-     o2(0xEA,0x52),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B6 = {
-    to_SHIFT_JIS_E9_B6_offsets,
-    to_SHIFT_JIS_E9_B6_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B7_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B7 */
-  /* used from to_EUC_JP_E9_B7 */
-     15,  0,  1, 15,  2, 15,  3, 15,   15, 15, 15, 15, 15, 15, 15,  4,
-     15, 15, 15,  5, 15, 15, 15, 15,   15,  6, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,  7, 15,   15, 15, 15, 15, 15,  8, 15,  9,
-     15, 15, 10, 15, 15, 15, 15, 15,   11, 12, 13, 15, 15, 14, 15, 15,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B7_infos[16] = {
-     o2(0xEA,0x51), o2(0xEA,0x57), o2(0xEA,0x50), o2(0xEA,0x55),
-     o2(0xEA,0x56), o2(0xEA,0x59), o2(0xEA,0x58), o2(0xEA,0x5B),
-     o2(0xEA,0x5C), o2(0xEA,0x5D), o2(0x98,0x68), o2(0xEA,0x5A),
-     o2(0x91,0xE9), o2(0x8D,0xEB), o2(0xEA,0x5E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B7 = {
-    to_SHIFT_JIS_E9_B7_offsets,
-    to_SHIFT_JIS_E9_B7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B8_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B8 */
-  /* used from to_EUC_JP_E9_B8 */
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  0,  1,  2,  4,  4,  3,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B8_infos[5] = {
-     o2(0xFC,0x4A), o2(0xEA,0x5F), o2(0xEA,0x60), o2(0xEA,0x61),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B8 = {
-    to_SHIFT_JIS_E9_B8_offsets,
-    to_SHIFT_JIS_E9_B8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_B9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_B9 */
-  /* used from to_EUC_JP_E9_B9 */
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  0,  5,  5,    1,  2,  5,  5,  5,  3,  5,  4,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_B9_infos[6] = {
-     o2(0xEA,0x62), o2(0x8C,0xB2), o2(0xEA,0x63), o2(0xEA,0x64),
-     o2(0x8E,0xAD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_B9 = {
-    to_SHIFT_JIS_E9_B9_offsets,
-    to_SHIFT_JIS_E9_B9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_BA_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_BA */
-  /* used from to_EUC_JP_E9_BA */
-     23,  0, 23, 23, 23, 23, 23, 23,    1, 23, 23,  2,  3, 23, 23, 23,
-     23,  4,  5,  6, 23,  7, 23,  8,   23, 23, 23, 23, 23,  9, 23, 10,
-     23, 23, 23, 23, 23, 11, 12, 23,   23, 13, 14, 23, 23, 15, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,   16, 17, 18, 19, 20, 23, 21, 22,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_BA_infos[24] = {
-     o2(0xEA,0x65), o2(0xEA,0x66), o2(0xEA,0x67), o2(0xEA,0x68),
-     o2(0xEA,0x6B), o2(0xEA,0x69), o2(0x98,0x5B), o2(0xEA,0x6A),
-     o2(0x97,0xED), o2(0xEA,0x6C), o2(0x97,0xD9), o2(0xEA,0x6D),
-     o2(0x94,0x9E), o2(0xEA,0x6E), o2(0xEA,0x70), o2(0xEA,0x71),
-     o2(0xEA,0x6F), o2(0x8D,0x8D), o2(0x96,0xCB), o2(0x96,0x83),
-     o2(0x9B,0xF5), o2(0x9F,0x80), o2(0x96,0x9B),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_BA = {
-    to_SHIFT_JIS_E9_BA_offsets,
-    to_SHIFT_JIS_E9_BA_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_BB_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_BB */
-  /* used from to_EUC_JP_E9_BB */
-     26, 26, 26, 26,  0, 26, 26, 26,   26, 26, 26, 26,  1,  2,  3,  4,
-      5,  6,  7, 26,  8, 26, 26, 26,    9, 10, 26, 11, 12, 13, 14, 26,
-     15, 26, 26, 26, 26, 16, 26, 26,   17, 26, 26, 26, 26, 26, 26, 18,
-     26, 26, 26, 26, 19, 26, 20, 21,   26, 22, 26, 23, 24, 25, 26, 26,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_BB_infos[27] = {
-     o2(0x89,0xA9), o2(0xEA,0x73), o2(0x8B,0x6F), o2(0xEA,0x74),
-     o2(0xEA,0x75), o2(0xEA,0x76), o2(0xFC,0x4B), o2(0x8D,0x95),
-     o2(0xEA,0x77), o2(0xE0,0xD2), o2(0x96,0xD9), o2(0x91,0xE1),
-     o2(0xEA,0x78), o2(0xEA,0x7A), o2(0xEA,0x79), o2(0xEA,0x7B),
-     o2(0xEA,0x7C), o2(0xEA,0x7D), o2(0xEA,0x7E), o2(0xEA,0x80),
-     o2(0xEA,0x81), o2(0xEA,0x82), o2(0xEA,0x83), o2(0xEA,0x84),
-     o2(0xEA,0x85), o2(0xEA,0x86),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_BB = {
-    to_SHIFT_JIS_E9_BB_offsets,
-    to_SHIFT_JIS_E9_BB_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_BC */
-  /* used from to_EUC_JP_E9_BC */
-     10, 10, 10, 10, 10, 10, 10,  0,    1, 10, 10, 10, 10, 10,  2, 10,
-     10, 10, 10,  3, 10,  4, 10, 10,   10, 10, 10, 10, 10, 10, 10, 10,
-      5,  6, 10, 10, 10, 10, 10, 10,   10, 10, 10, 10,  7, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,   10, 10, 10,  8, 10, 10,  9, 10,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_BC_infos[11] = {
-     o2(0xEA,0x87), o2(0xEA,0x88), o2(0x93,0x43), o2(0x8C,0xDB),
-     o2(0xEA,0x8A), o2(0x91,0x6C), o2(0xEA,0x8B), o2(0xEA,0x8C),
-     o2(0x95,0x40), o2(0xEA,0x8D),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_BC = {
-    to_SHIFT_JIS_E9_BC_offsets,
-    to_SHIFT_JIS_E9_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_BD */
-  /* used from to_EUC_JP_E9_BD */
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18,  0,  1, 18, 18,  2,  3,
-     18, 18,  4, 18,  5, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18,  6,
-      7,  8,  9, 10, 18, 18, 11, 12,   18, 18, 13, 18, 14, 18, 18, 18,
-     18, 18, 15, 18, 18, 18, 16, 17,   18, 18, 18, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_BD_infos[19] = {
-     o2(0xEA,0x8E), o2(0xE2,0x56), o2(0xE6,0xD8), o2(0xE8,0xEB),
-     o2(0xEA,0x8F), o2(0xEA,0x90), o2(0xEA,0x92), o2(0xEA,0x93),
-     o2(0xEA,0x94), o2(0x97,0xEE), o2(0xEA,0x91), o2(0xEA,0x95),
-     o2(0xEA,0x96), o2(0xEA,0x98), o2(0xEA,0x97), o2(0xEA,0x9A),
-     o2(0xEA,0x9B), o2(0xEA,0x99),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_BD = {
-    to_SHIFT_JIS_E9_BD_offsets,
-    to_SHIFT_JIS_E9_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9_BE */
-  /* used from to_EUC_JP_E9_BE */
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  0,  5,  5,
-      5,  5,  5,  5,  5,  1,  5,  5,    5,  5,  5,  5,  2,  3,  5,  5,
-      4,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_BE_infos[6] = {
-     o2(0x97,0xB4), o2(0xEA,0x9C), o2(0xEA,0x9D), o2(0xE2,0x73),
-     o2(0xEA,0x9E),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9_BE = {
-    to_SHIFT_JIS_E9_BE_offsets,
-    to_SHIFT_JIS_E9_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_E9_offsets[64] = {
-  /* used from to_SHIFT_JIS_E9 */
-  /* used from to_EUC_JP_E9 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 60, 60, 19, 20, 21,   22, 23, 24, 25, 26, 27, 28, 29,
-     30, 31, 32, 33, 34, 35, 36, 37,   38, 39, 40, 41, 42, 43, 44, 45,
-     46, 47, 60, 48, 49, 50, 51, 52,   53, 54, 55, 56, 57, 58, 59, 60,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_E9_infos[61] = {
-     &to_SHIFT_JIS_E9_80, &to_SHIFT_JIS_E9_81,
-     &to_SHIFT_JIS_E9_82, &to_SHIFT_JIS_E9_83,
-     &to_SHIFT_JIS_E9_84, &to_SHIFT_JIS_E9_85,
-     &to_SHIFT_JIS_E9_86, &to_SHIFT_JIS_E9_87,
-     &to_SHIFT_JIS_E9_88, &to_SHIFT_JIS_E9_89,
-     &to_SHIFT_JIS_E9_8A, &to_SHIFT_JIS_E9_8B,
-     &to_SHIFT_JIS_E9_8C, &to_SHIFT_JIS_E9_8D,
-     &to_SHIFT_JIS_E9_8E, &to_SHIFT_JIS_E9_8F,
-     &to_SHIFT_JIS_E9_90, &to_SHIFT_JIS_E9_91,
-     &to_SHIFT_JIS_E9_92, &to_SHIFT_JIS_E9_95,
-     &to_SHIFT_JIS_E9_96, &to_SHIFT_JIS_E9_97,
-     &to_SHIFT_JIS_E9_98, &to_SHIFT_JIS_E9_99,
-     &to_SHIFT_JIS_E9_9A, &to_SHIFT_JIS_E9_9B,
-     &to_SHIFT_JIS_E9_9C, &to_SHIFT_JIS_E9_9D,
-     &to_SHIFT_JIS_E9_9E, &to_SHIFT_JIS_E9_9F,
-     &to_SHIFT_JIS_E9_A0, &to_SHIFT_JIS_E9_A1,
-     &to_SHIFT_JIS_E9_A2, &to_SHIFT_JIS_E9_A3,
-     &to_SHIFT_JIS_E9_A4, &to_SHIFT_JIS_E9_A5,
-     &to_SHIFT_JIS_E9_A6, &to_SHIFT_JIS_E9_A7,
-     &to_SHIFT_JIS_E9_A8, &to_SHIFT_JIS_E9_A9,
-     &to_SHIFT_JIS_E9_AA, &to_SHIFT_JIS_E9_AB,
-     &to_SHIFT_JIS_E9_AC, &to_SHIFT_JIS_E9_AD,
-     &to_SHIFT_JIS_E9_AE, &to_SHIFT_JIS_E9_AF,
-     &to_SHIFT_JIS_E9_B0, &to_SHIFT_JIS_E9_B1,
-     &to_SHIFT_JIS_E9_B3, &to_SHIFT_JIS_E9_B4,
-     &to_SHIFT_JIS_E9_B5, &to_SHIFT_JIS_E9_B6,
-     &to_SHIFT_JIS_E9_B7, &to_SHIFT_JIS_E9_B8,
-     &to_SHIFT_JIS_E9_B9, &to_SHIFT_JIS_E9_BA,
-     &to_SHIFT_JIS_E9_BB, &to_SHIFT_JIS_E9_BC,
-     &to_SHIFT_JIS_E9_BD, &to_SHIFT_JIS_E9_BE,
-                   UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_E9 = {
-    to_SHIFT_JIS_E9_offsets,
-    to_SHIFT_JIS_E9_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_A4_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_A4 */
-  /* used from to_EUC_JP_EF_A4 */
-      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,  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,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_A4_infos[2] = {
-     o2(0xFA,0xE0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_A4 = {
-    to_SHIFT_JIS_EF_A4_offsets,
-    to_SHIFT_JIS_EF_A4_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_A7_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_A7 */
-  /* used from to_EUC_JP_EF_A7 */
-      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,  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,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_A7_infos[2] = {
-     o2(0xFB,0xE9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_A7 = {
-    to_SHIFT_JIS_EF_A7_offsets,
-    to_SHIFT_JIS_EF_A7_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_A8_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_A8 */
-  /* used from to_EUC_JP_EF_A8 */
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32,  0,  1,
-      2,  3,  4,  5,  6,  7,  8,  9,   10, 11, 12, 13, 14, 15, 16, 17,
-     18, 19, 20, 21, 22, 23, 24, 25,   26, 27, 28, 29, 30, 31, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_A8_infos[33] = {
-     o2(0xFA,0x90), o2(0xFA,0x9B), o2(0xFA,0x9C), o2(0xFA,0xB1),
-     o2(0xFA,0xD8), o2(0xFA,0xE8), o2(0xFA,0xEA), o2(0xFB,0x58),
-     o2(0xFB,0x5E), o2(0xFB,0x75), o2(0xFB,0x7D), o2(0xFB,0x7E),
-     o2(0xFB,0x80), o2(0xFB,0x82), o2(0xFB,0x86), o2(0xFB,0x89),
-     o2(0xFB,0x92), o2(0xFB,0x9D), o2(0xFB,0x9F), o2(0xFB,0xA0),
-     o2(0xFB,0xA9), o2(0xFB,0xB1), o2(0xFB,0xB3), o2(0xFB,0xB4),
-     o2(0xFB,0xB7), o2(0xFB,0xD3), o2(0xFB,0xDA), o2(0xFB,0xEA),
-     o2(0xFB,0xF6), o2(0xFB,0xF7), o2(0xFB,0xF9), o2(0xFC,0x49),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_A8 = {
-    to_SHIFT_JIS_EF_A8_offsets,
-    to_SHIFT_JIS_EF_A8_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_BC_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_BC */
-  /* used from to_EUC_JP_EF_BC */
-     61,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 61, 62, 11, 12,
-     13, 14, 15, 16, 17, 18, 19, 20,   21, 22, 23, 24, 25, 26, 27, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,   37, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 47, 48, 49, 50, 51, 52,   53, 54, 55, 56, 57, 58, 59, 60,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_BC_infos[63] = {
-     o2(0x81,0x49), o2(0xFA,0x57), o2(0x81,0x94), o2(0x81,0x90),
-     o2(0x81,0x93), o2(0x81,0x95), o2(0xFA,0x56), o2(0x81,0x69),
-     o2(0x81,0x6A), o2(0x81,0x96), o2(0x81,0x7B), o2(0x81,0x44),
-     o2(0x81,0x5E), o2(0x82,0x4F), o2(0x82,0x50), o2(0x82,0x51),
-     o2(0x82,0x52), o2(0x82,0x53), o2(0x82,0x54), o2(0x82,0x55),
-     o2(0x82,0x56), o2(0x82,0x57), o2(0x82,0x58), o2(0x81,0x46),
-     o2(0x81,0x47), o2(0x81,0x83), o2(0x81,0x81), o2(0x81,0x84),
-     o2(0x81,0x48), o2(0x81,0x97), o2(0x82,0x60), o2(0x82,0x61),
-     o2(0x82,0x62), o2(0x82,0x63), o2(0x82,0x64), o2(0x82,0x65),
-     o2(0x82,0x66), o2(0x82,0x67), o2(0x82,0x68), o2(0x82,0x69),
-     o2(0x82,0x6A), o2(0x82,0x6B), o2(0x82,0x6C), o2(0x82,0x6D),
-     o2(0x82,0x6E), o2(0x82,0x6F), o2(0x82,0x70), o2(0x82,0x71),
-     o2(0x82,0x72), o2(0x82,0x73), o2(0x82,0x74), o2(0x82,0x75),
-     o2(0x82,0x76), o2(0x82,0x77), o2(0x82,0x78), o2(0x82,0x79),
-     o2(0x81,0x6D), o2(0x81,0x5F), o2(0x81,0x6E), o2(0x81,0x4F),
-     o2(0x81,0x51),         UNDEF, o2(0x81,0x7C),
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_BC = {
-    to_SHIFT_JIS_EF_BC_offsets,
-    to_SHIFT_JIS_EF_BC_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_BD_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_BD */
-  /* used from to_EUC_JP_EF_BD */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 62, 61,
-     61, 30, 31, 32, 33, 34, 35, 36,   37, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 47, 48, 49, 50, 51, 52,   53, 54, 55, 56, 57, 58, 59, 60,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_BD_infos[63] = {
-     o2(0x81,0x4D), o2(0x82,0x81), o2(0x82,0x82), o2(0x82,0x83),
-     o2(0x82,0x84), o2(0x82,0x85), o2(0x82,0x86), o2(0x82,0x87),
-     o2(0x82,0x88), o2(0x82,0x89), o2(0x82,0x8A), o2(0x82,0x8B),
-     o2(0x82,0x8C), o2(0x82,0x8D), o2(0x82,0x8E), o2(0x82,0x8F),
-     o2(0x82,0x90), o2(0x82,0x91), o2(0x82,0x92), o2(0x82,0x93),
-     o2(0x82,0x94), o2(0x82,0x95), o2(0x82,0x96), o2(0x82,0x97),
-     o2(0x82,0x98), o2(0x82,0x99), o2(0x82,0x9A), o2(0x81,0x6F),
-     o2(0x81,0x62), o2(0x81,0x70),      o1(0xA1),      o1(0xA2),
-          o1(0xA3),      o1(0xA4),      o1(0xA5),      o1(0xA6),
-          o1(0xA7),      o1(0xA8),      o1(0xA9),      o1(0xAA),
-          o1(0xAB),      o1(0xAC),      o1(0xAD),      o1(0xAE),
-          o1(0xAF),      o1(0xB0),      o1(0xB1),      o1(0xB2),
-          o1(0xB3),      o1(0xB4),      o1(0xB5),      o1(0xB6),
-          o1(0xB7),      o1(0xB8),      o1(0xB9),      o1(0xBA),
-          o1(0xBB),      o1(0xBC),      o1(0xBD),      o1(0xBE),
-          o1(0xBF),         UNDEF, o2(0x81,0x60),
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_BD = {
-    to_SHIFT_JIS_EF_BD_offsets,
-    to_SHIFT_JIS_EF_BD_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_BE_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_BE */
-  /* used from to_EUC_JP_EF_BE */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_BE_infos[33] = {
-     o1(0xC0), o1(0xC1), o1(0xC2), o1(0xC3),
-     o1(0xC4), o1(0xC5), o1(0xC6), o1(0xC7),
-     o1(0xC8), o1(0xC9), o1(0xCA), o1(0xCB),
-     o1(0xCC), o1(0xCD), o1(0xCE), o1(0xCF),
-     o1(0xD0), o1(0xD1), o1(0xD2), o1(0xD3),
-     o1(0xD4), o1(0xD5), o1(0xD6), o1(0xD7),
-     o1(0xD8), o1(0xD9), o1(0xDA), o1(0xDB),
-     o1(0xDC), o1(0xDD), o1(0xDE), o1(0xDF),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_BE = {
-    to_SHIFT_JIS_EF_BE_offsets,
-    to_SHIFT_JIS_EF_BE_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_BF_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF_BF */
-  /* used from to_EUC_JP_EF_BF */
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      0,  1,  2,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_BF_infos[33] = {
-     o2(0x81,0x91), o2(0x81,0x92), o2(0x81,0xCA), UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF_BF = {
-    to_SHIFT_JIS_EF_BF_offsets,
-    to_SHIFT_JIS_EF_BF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_EF_offsets[64] = {
-  /* used from to_SHIFT_JIS_EF */
-  /* used from to_EUC_JP_EF */
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  0,  7,  7,  1,    2,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  3,  4,  5,  6,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_EF_infos[8] = {
-     &to_SHIFT_JIS_EF_A4, &to_SHIFT_JIS_EF_A7,
-     &to_SHIFT_JIS_EF_A8, &to_SHIFT_JIS_EF_BC,
-     &to_SHIFT_JIS_EF_BD, &to_SHIFT_JIS_EF_BE,
-     &to_SHIFT_JIS_EF_BF,               UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS_EF = {
-    to_SHIFT_JIS_EF_offsets,
-    to_SHIFT_JIS_EF_infos
-};
-
-static const unsigned char
-to_SHIFT_JIS_offsets[256] = {
-  /* used from to_SHIFT_JIS */
-  /* used from to_EUC_JP */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  1,  2, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16,  3,  4,
-      5,  6, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  7,  8,  9, 10, 11, 12,   13, 14, 16, 16, 16, 16, 16, 15,
-     16, 16, 16, 16, 16, 16, 16, 16,   16, 16, 16, 16, 16, 16, 16, 16,
-};
-static const struct byte_lookup* const
-to_SHIFT_JIS_infos[17] = {
-                NOMAP, &to_SHIFT_JIS_C2, &to_SHIFT_JIS_C3, &to_SHIFT_JIS_CE,
-     &to_SHIFT_JIS_CF, &to_SHIFT_JIS_D0, &to_SHIFT_JIS_D1, &to_SHIFT_JIS_E2,
-     &to_SHIFT_JIS_E3, &to_SHIFT_JIS_E4, &to_SHIFT_JIS_E5, &to_SHIFT_JIS_E6,
-     &to_SHIFT_JIS_E7, &to_SHIFT_JIS_E8, &to_SHIFT_JIS_E9, &to_SHIFT_JIS_EF,
-                UNDEF,
-};
-static const BYTE_LOOKUP
-to_SHIFT_JIS = {
-    to_SHIFT_JIS_offsets,
-    to_SHIFT_JIS_infos
-};
-static const rb_transcoder
-rb_to_SHIFT_JIS = {
-    "UTF-8", "SHIFT_JIS", &to_SHIFT_JIS, 2, 1,
-    NULL, NULL,
-};
-static const rb_transcoder
-rb_to_Windows_31J = {
-    "UTF-8", "Windows-31J", &to_SHIFT_JIS, 2, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_EUC_JP_8E_offsets[256] = {
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-     63, 63, 63, 63, 63, 63, 63, 63,   63, 63, 63, 63, 63, 63, 63, 63,
-};
-static const struct byte_lookup* const
-from_EUC_JP_8E_infos[64] = {
-     o3(0xEF,0xBD,0xA1), o3(0xEF,0xBD,0xA2),
-     o3(0xEF,0xBD,0xA3), o3(0xEF,0xBD,0xA4),
-     o3(0xEF,0xBD,0xA5), o3(0xEF,0xBD,0xA6),
-     o3(0xEF,0xBD,0xA7), o3(0xEF,0xBD,0xA8),
-     o3(0xEF,0xBD,0xA9), o3(0xEF,0xBD,0xAA),
-     o3(0xEF,0xBD,0xAB), o3(0xEF,0xBD,0xAC),
-     o3(0xEF,0xBD,0xAD), o3(0xEF,0xBD,0xAE),
-     o3(0xEF,0xBD,0xAF), o3(0xEF,0xBD,0xB0),
-     o3(0xEF,0xBD,0xB1), o3(0xEF,0xBD,0xB2),
-     o3(0xEF,0xBD,0xB3), o3(0xEF,0xBD,0xB4),
-     o3(0xEF,0xBD,0xB5), o3(0xEF,0xBD,0xB6),
-     o3(0xEF,0xBD,0xB7), o3(0xEF,0xBD,0xB8),
-     o3(0xEF,0xBD,0xB9), o3(0xEF,0xBD,0xBA),
-     o3(0xEF,0xBD,0xBB), o3(0xEF,0xBD,0xBC),
-     o3(0xEF,0xBD,0xBD), o3(0xEF,0xBD,0xBE),
-     o3(0xEF,0xBD,0xBF), o3(0xEF,0xBE,0x80),
-     o3(0xEF,0xBE,0x81), o3(0xEF,0xBE,0x82),
-     o3(0xEF,0xBE,0x83), o3(0xEF,0xBE,0x84),
-     o3(0xEF,0xBE,0x85), o3(0xEF,0xBE,0x86),
-     o3(0xEF,0xBE,0x87), o3(0xEF,0xBE,0x88),
-     o3(0xEF,0xBE,0x89), o3(0xEF,0xBE,0x8A),
-     o3(0xEF,0xBE,0x8B), o3(0xEF,0xBE,0x8C),
-     o3(0xEF,0xBE,0x8D), o3(0xEF,0xBE,0x8E),
-     o3(0xEF,0xBE,0x8F), o3(0xEF,0xBE,0x90),
-     o3(0xEF,0xBE,0x91), o3(0xEF,0xBE,0x92),
-     o3(0xEF,0xBE,0x93), o3(0xEF,0xBE,0x94),
-     o3(0xEF,0xBE,0x95), o3(0xEF,0xBE,0x96),
-     o3(0xEF,0xBE,0x97), o3(0xEF,0xBE,0x98),
-     o3(0xEF,0xBE,0x99), o3(0xEF,0xBE,0x9A),
-     o3(0xEF,0xBE,0x9B), o3(0xEF,0xBE,0x9C),
-     o3(0xEF,0xBE,0x9D), o3(0xEF,0xBE,0x9E),
-     o3(0xEF,0xBE,0x9F),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_8E = {
-    from_EUC_JP_8E_offsets,
-    from_EUC_JP_8E_infos
-};
-
-static const unsigned char
-from_EUC_JP_A1_offsets[256] = {
-  /* used from from_EUC_JP_A1 */
-  /* used from from_EUC_JP_B0 */
-  /* used from from_EUC_JP_B1 */
-  /* used from from_EUC_JP_B2 */
-  /* used from from_EUC_JP_B3 */
-  /* used from from_EUC_JP_B4 */
-  /* used from from_EUC_JP_B5 */
-  /* used from from_EUC_JP_B6 */
-  /* used from from_EUC_JP_B7 */
-  /* used from from_EUC_JP_B8 */
-  /* used from from_EUC_JP_B9 */
-  /* used from from_EUC_JP_BA */
-  /* used from from_EUC_JP_BB */
-  /* used from from_EUC_JP_BC */
-  /* used from from_EUC_JP_BD */
-  /* used from from_EUC_JP_BE */
-  /* used from from_EUC_JP_BF */
-  /* used from from_EUC_JP_C0 */
-  /* used from from_EUC_JP_C1 */
-  /* used from from_EUC_JP_C2 */
-  /* used from from_EUC_JP_C3 */
-  /* used from from_EUC_JP_C4 */
-  /* used from from_EUC_JP_C5 */
-  /* used from from_EUC_JP_C6 */
-  /* used from from_EUC_JP_C7 */
-  /* used from from_EUC_JP_C8 */
-  /* used from from_EUC_JP_C9 */
-  /* used from from_EUC_JP_CA */
-  /* used from from_EUC_JP_CB */
-  /* used from from_EUC_JP_CC */
-  /* used from from_EUC_JP_CD */
-  /* used from from_EUC_JP_CE */
-  /* used from from_EUC_JP_D0 */
-  /* used from from_EUC_JP_D1 */
-  /* used from from_EUC_JP_D2 */
-  /* used from from_EUC_JP_D3 */
-  /* used from from_EUC_JP_D4 */
-  /* used from from_EUC_JP_D5 */
-  /* used from from_EUC_JP_D6 */
-  /* used from from_EUC_JP_D7 */
-  /* used from from_EUC_JP_D8 */
-  /* used from from_EUC_JP_D9 */
-  /* used from from_EUC_JP_DA */
-  /* used from from_EUC_JP_DB */
-  /* used from from_EUC_JP_DC */
-  /* used from from_EUC_JP_DD */
-  /* used from from_EUC_JP_DE */
-  /* used from from_EUC_JP_DF */
-  /* used from from_EUC_JP_E0 */
-  /* used from from_EUC_JP_E1 */
-  /* used from from_EUC_JP_E2 */
-  /* used from from_EUC_JP_E3 */
-  /* used from from_EUC_JP_E4 */
-  /* used from from_EUC_JP_E5 */
-  /* used from from_EUC_JP_E6 */
-  /* used from from_EUC_JP_E7 */
-  /* used from from_EUC_JP_E8 */
-  /* used from from_EUC_JP_E9 */
-  /* used from from_EUC_JP_EA */
-  /* used from from_EUC_JP_EB */
-  /* used from from_EUC_JP_EC */
-  /* used from from_EUC_JP_ED */
-  /* used from from_EUC_JP_EE */
-  /* used from from_EUC_JP_EF */
-  /* used from from_EUC_JP_F0 */
-  /* used from from_EUC_JP_F1 */
-  /* used from from_EUC_JP_F2 */
-  /* used from from_EUC_JP_F3 */
-  /* used from from_EUC_JP_F9 */
-  /* used from from_EUC_JP_FA */
-  /* used from from_EUC_JP_FB */
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,   94, 94, 94, 94, 94, 94, 94, 94,
-     94,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A1_infos[95] = {
-     o3(0xE3,0x80,0x80), o3(0xE3,0x80,0x81),
-     o3(0xE3,0x80,0x82), o3(0xEF,0xBC,0x8C),
-     o3(0xEF,0xBC,0x8E), o3(0xE3,0x83,0xBB),
-     o3(0xEF,0xBC,0x9A), o3(0xEF,0xBC,0x9B),
-     o3(0xEF,0xBC,0x9F), o3(0xEF,0xBC,0x81),
-     o3(0xE3,0x82,0x9B), o3(0xE3,0x82,0x9C),
-          o2(0xC2,0xB4), o3(0xEF,0xBD,0x80),
-          o2(0xC2,0xA8), o3(0xEF,0xBC,0xBE),
-     o3(0xEF,0xBF,0xA3), o3(0xEF,0xBC,0xBF),
-     o3(0xE3,0x83,0xBD), o3(0xE3,0x83,0xBE),
-     o3(0xE3,0x82,0x9D), o3(0xE3,0x82,0x9E),
-     o3(0xE3,0x80,0x83), o3(0xE4,0xBB,0x9D),
-     o3(0xE3,0x80,0x85), o3(0xE3,0x80,0x86),
-     o3(0xE3,0x80,0x87), o3(0xE3,0x83,0xBC),
-     o3(0xE2,0x80,0x95), o3(0xE2,0x80,0x90),
-     o3(0xEF,0xBC,0x8F), o3(0xEF,0xBC,0xBC),
-     o3(0xEF,0xBD,0x9E), o3(0xE2,0x88,0xA5),
-     o3(0xEF,0xBD,0x9C), o3(0xE2,0x80,0xA6),
-     o3(0xE2,0x80,0xA5), o3(0xE2,0x80,0x98),
-     o3(0xE2,0x80,0x99), o3(0xE2,0x80,0x9C),
-     o3(0xE2,0x80,0x9D), o3(0xEF,0xBC,0x88),
-     o3(0xEF,0xBC,0x89), o3(0xE3,0x80,0x94),
-     o3(0xE3,0x80,0x95), o3(0xEF,0xBC,0xBB),
-     o3(0xEF,0xBC,0xBD), o3(0xEF,0xBD,0x9B),
-     o3(0xEF,0xBD,0x9D), o3(0xE3,0x80,0x88),
-     o3(0xE3,0x80,0x89), o3(0xE3,0x80,0x8A),
-     o3(0xE3,0x80,0x8B), o3(0xE3,0x80,0x8C),
-     o3(0xE3,0x80,0x8D), o3(0xE3,0x80,0x8E),
-     o3(0xE3,0x80,0x8F), o3(0xE3,0x80,0x90),
-     o3(0xE3,0x80,0x91), o3(0xEF,0xBC,0x8B),
-     o3(0xEF,0xBC,0x8D),      o2(0xC2,0xB1),
-          o2(0xC3,0x97),      o2(0xC3,0xB7),
-     o3(0xEF,0xBC,0x9D), o3(0xE2,0x89,0xA0),
-     o3(0xEF,0xBC,0x9C), o3(0xEF,0xBC,0x9E),
-     o3(0xE2,0x89,0xA6), o3(0xE2,0x89,0xA7),
-     o3(0xE2,0x88,0x9E), o3(0xE2,0x88,0xB4),
-     o3(0xE2,0x99,0x82), o3(0xE2,0x99,0x80),
-          o2(0xC2,0xB0), o3(0xE2,0x80,0xB2),
-     o3(0xE2,0x80,0xB3), o3(0xE2,0x84,0x83),
-     o3(0xEF,0xBF,0xA5), o3(0xEF,0xBC,0x84),
-     o3(0xEF,0xBF,0xA0), o3(0xEF,0xBF,0xA1),
-     o3(0xEF,0xBC,0x85), o3(0xEF,0xBC,0x83),
-     o3(0xEF,0xBC,0x86), o3(0xEF,0xBC,0x8A),
-     o3(0xEF,0xBC,0xA0),      o2(0xC2,0xA7),
-     o3(0xE2,0x98,0x86), o3(0xE2,0x98,0x85),
-     o3(0xE2,0x97,0x8B), o3(0xE2,0x97,0x8F),
-     o3(0xE2,0x97,0x8E), o3(0xE2,0x97,0x87),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_A1_infos
-};
-
-static const unsigned char
-from_EUC_JP_A2_offsets[256] = {
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 53, 53, 53, 53,
-     53,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 53,
-     53, 53, 53, 53, 53, 53, 53, 53,   53, 53, 14, 15, 16, 17, 18, 19,
-     20, 21, 53, 53, 53, 53, 53, 53,   53, 53, 22, 23, 24, 25, 26, 27,
-     28, 53, 53, 53, 53, 53, 53, 53,   53, 53, 53, 53, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 53, 53, 53, 53, 53,
-     53, 53, 44, 45, 46, 47, 48, 49,   50, 51, 53, 53, 53, 53, 52, 53,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A2_infos[54] = {
-     o3(0xE2,0x97,0x86), o3(0xE2,0x96,0xA1),
-     o3(0xE2,0x96,0xA0), o3(0xE2,0x96,0xB3),
-     o3(0xE2,0x96,0xB2), o3(0xE2,0x96,0xBD),
-     o3(0xE2,0x96,0xBC), o3(0xE2,0x80,0xBB),
-     o3(0xE3,0x80,0x92), o3(0xE2,0x86,0x92),
-     o3(0xE2,0x86,0x90), o3(0xE2,0x86,0x91),
-     o3(0xE2,0x86,0x93), o3(0xE3,0x80,0x93),
-     o3(0xE2,0x88,0x88), o3(0xE2,0x88,0x8B),
-     o3(0xE2,0x8A,0x86), o3(0xE2,0x8A,0x87),
-     o3(0xE2,0x8A,0x82), o3(0xE2,0x8A,0x83),
-     o3(0xE2,0x88,0xAA), o3(0xE2,0x88,0xA9),
-     o3(0xE2,0x88,0xA7), o3(0xE2,0x88,0xA8),
-     o3(0xEF,0xBF,0xA2), o3(0xE2,0x87,0x92),
-     o3(0xE2,0x87,0x94), o3(0xE2,0x88,0x80),
-     o3(0xE2,0x88,0x83), o3(0xE2,0x88,0xA0),
-     o3(0xE2,0x8A,0xA5), o3(0xE2,0x8C,0x92),
-     o3(0xE2,0x88,0x82), o3(0xE2,0x88,0x87),
-     o3(0xE2,0x89,0xA1), o3(0xE2,0x89,0x92),
-     o3(0xE2,0x89,0xAA), o3(0xE2,0x89,0xAB),
-     o3(0xE2,0x88,0x9A), o3(0xE2,0x88,0xBD),
-     o3(0xE2,0x88,0x9D), o3(0xE2,0x88,0xB5),
-     o3(0xE2,0x88,0xAB), o3(0xE2,0x88,0xAC),
-     o3(0xE2,0x84,0xAB), o3(0xE2,0x80,0xB0),
-     o3(0xE2,0x99,0xAF), o3(0xE2,0x99,0xAD),
-     o3(0xE2,0x99,0xAA), o3(0xE2,0x80,0xA0),
-     o3(0xE2,0x80,0xA1),      o2(0xC2,0xB6),
-     o3(0xE2,0x97,0xAF),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A2 = {
-    from_EUC_JP_A2_offsets,
-    from_EUC_JP_A2_infos
-};
-
-static const unsigned char
-from_EUC_JP_A3_offsets[256] = {
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-     62, 62, 62, 62, 62, 62, 62, 62,   62, 62, 62, 62, 62, 62, 62, 62,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 62, 62, 62, 62, 62, 62,
-     62, 10, 11, 12, 13, 14, 15, 16,   17, 18, 19, 20, 21, 22, 23, 24,
-     25, 26, 27, 28, 29, 30, 31, 32,   33, 34, 35, 62, 62, 62, 62, 62,
-     62, 36, 37, 38, 39, 40, 41, 42,   43, 44, 45, 46, 47, 48, 49, 50,
-     51, 52, 53, 54, 55, 56, 57, 58,   59, 60, 61, 62, 62, 62, 62, 62,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A3_infos[63] = {
-     o3(0xEF,0xBC,0x90), o3(0xEF,0xBC,0x91),
-     o3(0xEF,0xBC,0x92), o3(0xEF,0xBC,0x93),
-     o3(0xEF,0xBC,0x94), o3(0xEF,0xBC,0x95),
-     o3(0xEF,0xBC,0x96), o3(0xEF,0xBC,0x97),
-     o3(0xEF,0xBC,0x98), o3(0xEF,0xBC,0x99),
-     o3(0xEF,0xBC,0xA1), o3(0xEF,0xBC,0xA2),
-     o3(0xEF,0xBC,0xA3), o3(0xEF,0xBC,0xA4),
-     o3(0xEF,0xBC,0xA5), o3(0xEF,0xBC,0xA6),
-     o3(0xEF,0xBC,0xA7), o3(0xEF,0xBC,0xA8),
-     o3(0xEF,0xBC,0xA9), o3(0xEF,0xBC,0xAA),
-     o3(0xEF,0xBC,0xAB), o3(0xEF,0xBC,0xAC),
-     o3(0xEF,0xBC,0xAD), o3(0xEF,0xBC,0xAE),
-     o3(0xEF,0xBC,0xAF), o3(0xEF,0xBC,0xB0),
-     o3(0xEF,0xBC,0xB1), o3(0xEF,0xBC,0xB2),
-     o3(0xEF,0xBC,0xB3), o3(0xEF,0xBC,0xB4),
-     o3(0xEF,0xBC,0xB5), o3(0xEF,0xBC,0xB6),
-     o3(0xEF,0xBC,0xB7), o3(0xEF,0xBC,0xB8),
-     o3(0xEF,0xBC,0xB9), o3(0xEF,0xBC,0xBA),
-     o3(0xEF,0xBD,0x81), o3(0xEF,0xBD,0x82),
-     o3(0xEF,0xBD,0x83), o3(0xEF,0xBD,0x84),
-     o3(0xEF,0xBD,0x85), o3(0xEF,0xBD,0x86),
-     o3(0xEF,0xBD,0x87), o3(0xEF,0xBD,0x88),
-     o3(0xEF,0xBD,0x89), o3(0xEF,0xBD,0x8A),
-     o3(0xEF,0xBD,0x8B), o3(0xEF,0xBD,0x8C),
-     o3(0xEF,0xBD,0x8D), o3(0xEF,0xBD,0x8E),
-     o3(0xEF,0xBD,0x8F), o3(0xEF,0xBD,0x90),
-     o3(0xEF,0xBD,0x91), o3(0xEF,0xBD,0x92),
-     o3(0xEF,0xBD,0x93), o3(0xEF,0xBD,0x94),
-     o3(0xEF,0xBD,0x95), o3(0xEF,0xBD,0x96),
-     o3(0xEF,0xBD,0x97), o3(0xEF,0xBD,0x98),
-     o3(0xEF,0xBD,0x99), o3(0xEF,0xBD,0x9A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A3 = {
-    from_EUC_JP_A3_offsets,
-    from_EUC_JP_A3_infos
-};
-
-static const unsigned char
-from_EUC_JP_A4_offsets[256] = {
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A4_infos[84] = {
-     o3(0xE3,0x81,0x81), o3(0xE3,0x81,0x82),
-     o3(0xE3,0x81,0x83), o3(0xE3,0x81,0x84),
-     o3(0xE3,0x81,0x85), o3(0xE3,0x81,0x86),
-     o3(0xE3,0x81,0x87), o3(0xE3,0x81,0x88),
-     o3(0xE3,0x81,0x89), o3(0xE3,0x81,0x8A),
-     o3(0xE3,0x81,0x8B), o3(0xE3,0x81,0x8C),
-     o3(0xE3,0x81,0x8D), o3(0xE3,0x81,0x8E),
-     o3(0xE3,0x81,0x8F), o3(0xE3,0x81,0x90),
-     o3(0xE3,0x81,0x91), o3(0xE3,0x81,0x92),
-     o3(0xE3,0x81,0x93), o3(0xE3,0x81,0x94),
-     o3(0xE3,0x81,0x95), o3(0xE3,0x81,0x96),
-     o3(0xE3,0x81,0x97), o3(0xE3,0x81,0x98),
-     o3(0xE3,0x81,0x99), o3(0xE3,0x81,0x9A),
-     o3(0xE3,0x81,0x9B), o3(0xE3,0x81,0x9C),
-     o3(0xE3,0x81,0x9D), o3(0xE3,0x81,0x9E),
-     o3(0xE3,0x81,0x9F), o3(0xE3,0x81,0xA0),
-     o3(0xE3,0x81,0xA1), o3(0xE3,0x81,0xA2),
-     o3(0xE3,0x81,0xA3), o3(0xE3,0x81,0xA4),
-     o3(0xE3,0x81,0xA5), o3(0xE3,0x81,0xA6),
-     o3(0xE3,0x81,0xA7), o3(0xE3,0x81,0xA8),
-     o3(0xE3,0x81,0xA9), o3(0xE3,0x81,0xAA),
-     o3(0xE3,0x81,0xAB), o3(0xE3,0x81,0xAC),
-     o3(0xE3,0x81,0xAD), o3(0xE3,0x81,0xAE),
-     o3(0xE3,0x81,0xAF), o3(0xE3,0x81,0xB0),
-     o3(0xE3,0x81,0xB1), o3(0xE3,0x81,0xB2),
-     o3(0xE3,0x81,0xB3), o3(0xE3,0x81,0xB4),
-     o3(0xE3,0x81,0xB5), o3(0xE3,0x81,0xB6),
-     o3(0xE3,0x81,0xB7), o3(0xE3,0x81,0xB8),
-     o3(0xE3,0x81,0xB9), o3(0xE3,0x81,0xBA),
-     o3(0xE3,0x81,0xBB), o3(0xE3,0x81,0xBC),
-     o3(0xE3,0x81,0xBD), o3(0xE3,0x81,0xBE),
-     o3(0xE3,0x81,0xBF), o3(0xE3,0x82,0x80),
-     o3(0xE3,0x82,0x81), o3(0xE3,0x82,0x82),
-     o3(0xE3,0x82,0x83), o3(0xE3,0x82,0x84),
-     o3(0xE3,0x82,0x85), o3(0xE3,0x82,0x86),
-     o3(0xE3,0x82,0x87), o3(0xE3,0x82,0x88),
-     o3(0xE3,0x82,0x89), o3(0xE3,0x82,0x8A),
-     o3(0xE3,0x82,0x8B), o3(0xE3,0x82,0x8C),
-     o3(0xE3,0x82,0x8D), o3(0xE3,0x82,0x8E),
-     o3(0xE3,0x82,0x8F), o3(0xE3,0x82,0x90),
-     o3(0xE3,0x82,0x91), o3(0xE3,0x82,0x92),
-     o3(0xE3,0x82,0x93),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A4 = {
-    from_EUC_JP_A4_offsets,
-    from_EUC_JP_A4_infos
-};
-
-static const unsigned char
-from_EUC_JP_A5_offsets[256] = {
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-     86,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,   86, 86, 86, 86, 86, 86, 86, 86,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A5_infos[87] = {
-     o3(0xE3,0x82,0xA1), o3(0xE3,0x82,0xA2),
-     o3(0xE3,0x82,0xA3), o3(0xE3,0x82,0xA4),
-     o3(0xE3,0x82,0xA5), o3(0xE3,0x82,0xA6),
-     o3(0xE3,0x82,0xA7), o3(0xE3,0x82,0xA8),
-     o3(0xE3,0x82,0xA9), o3(0xE3,0x82,0xAA),
-     o3(0xE3,0x82,0xAB), o3(0xE3,0x82,0xAC),
-     o3(0xE3,0x82,0xAD), o3(0xE3,0x82,0xAE),
-     o3(0xE3,0x82,0xAF), o3(0xE3,0x82,0xB0),
-     o3(0xE3,0x82,0xB1), o3(0xE3,0x82,0xB2),
-     o3(0xE3,0x82,0xB3), o3(0xE3,0x82,0xB4),
-     o3(0xE3,0x82,0xB5), o3(0xE3,0x82,0xB6),
-     o3(0xE3,0x82,0xB7), o3(0xE3,0x82,0xB8),
-     o3(0xE3,0x82,0xB9), o3(0xE3,0x82,0xBA),
-     o3(0xE3,0x82,0xBB), o3(0xE3,0x82,0xBC),
-     o3(0xE3,0x82,0xBD), o3(0xE3,0x82,0xBE),
-     o3(0xE3,0x82,0xBF), o3(0xE3,0x83,0x80),
-     o3(0xE3,0x83,0x81), o3(0xE3,0x83,0x82),
-     o3(0xE3,0x83,0x83), o3(0xE3,0x83,0x84),
-     o3(0xE3,0x83,0x85), o3(0xE3,0x83,0x86),
-     o3(0xE3,0x83,0x87), o3(0xE3,0x83,0x88),
-     o3(0xE3,0x83,0x89), o3(0xE3,0x83,0x8A),
-     o3(0xE3,0x83,0x8B), o3(0xE3,0x83,0x8C),
-     o3(0xE3,0x83,0x8D), o3(0xE3,0x83,0x8E),
-     o3(0xE3,0x83,0x8F), o3(0xE3,0x83,0x90),
-     o3(0xE3,0x83,0x91), o3(0xE3,0x83,0x92),
-     o3(0xE3,0x83,0x93), o3(0xE3,0x83,0x94),
-     o3(0xE3,0x83,0x95), o3(0xE3,0x83,0x96),
-     o3(0xE3,0x83,0x97), o3(0xE3,0x83,0x98),
-     o3(0xE3,0x83,0x99), o3(0xE3,0x83,0x9A),
-     o3(0xE3,0x83,0x9B), o3(0xE3,0x83,0x9C),
-     o3(0xE3,0x83,0x9D), o3(0xE3,0x83,0x9E),
-     o3(0xE3,0x83,0x9F), o3(0xE3,0x83,0xA0),
-     o3(0xE3,0x83,0xA1), o3(0xE3,0x83,0xA2),
-     o3(0xE3,0x83,0xA3), o3(0xE3,0x83,0xA4),
-     o3(0xE3,0x83,0xA5), o3(0xE3,0x83,0xA6),
-     o3(0xE3,0x83,0xA7), o3(0xE3,0x83,0xA8),
-     o3(0xE3,0x83,0xA9), o3(0xE3,0x83,0xAA),
-     o3(0xE3,0x83,0xAB), o3(0xE3,0x83,0xAC),
-     o3(0xE3,0x83,0xAD), o3(0xE3,0x83,0xAE),
-     o3(0xE3,0x83,0xAF), o3(0xE3,0x83,0xB0),
-     o3(0xE3,0x83,0xB1), o3(0xE3,0x83,0xB2),
-     o3(0xE3,0x83,0xB3), o3(0xE3,0x83,0xB4),
-     o3(0xE3,0x83,0xB5), o3(0xE3,0x83,0xB6),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A5 = {
-    from_EUC_JP_A5_offsets,
-    from_EUC_JP_A5_infos
-};
-
-static const unsigned char
-from_EUC_JP_A6_offsets[256] = {
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 48, 48, 48, 48, 48, 48, 48,
-     48, 24, 25, 26, 27, 28, 29, 30,   31, 32, 33, 34, 35, 36, 37, 38,
-     39, 40, 41, 42, 43, 44, 45, 46,   47, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48,   48, 48, 48, 48, 48, 48, 48, 48,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A6_infos[49] = {
-     o2(0xCE,0x91), o2(0xCE,0x92), o2(0xCE,0x93), o2(0xCE,0x94),
-     o2(0xCE,0x95), o2(0xCE,0x96), o2(0xCE,0x97), o2(0xCE,0x98),
-     o2(0xCE,0x99), o2(0xCE,0x9A), o2(0xCE,0x9B), o2(0xCE,0x9C),
-     o2(0xCE,0x9D), o2(0xCE,0x9E), o2(0xCE,0x9F), o2(0xCE,0xA0),
-     o2(0xCE,0xA1), o2(0xCE,0xA3), o2(0xCE,0xA4), o2(0xCE,0xA5),
-     o2(0xCE,0xA6), o2(0xCE,0xA7), o2(0xCE,0xA8), o2(0xCE,0xA9),
-     o2(0xCE,0xB1), o2(0xCE,0xB2), o2(0xCE,0xB3), o2(0xCE,0xB4),
-     o2(0xCE,0xB5), o2(0xCE,0xB6), o2(0xCE,0xB7), o2(0xCE,0xB8),
-     o2(0xCE,0xB9), o2(0xCE,0xBA), o2(0xCE,0xBB), o2(0xCE,0xBC),
-     o2(0xCE,0xBD), o2(0xCE,0xBE), o2(0xCE,0xBF), o2(0xCF,0x80),
-     o2(0xCF,0x81), o2(0xCF,0x83), o2(0xCF,0x84), o2(0xCF,0x85),
-     o2(0xCF,0x86), o2(0xCF,0x87), o2(0xCF,0x88), o2(0xCF,0x89),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A6 = {
-    from_EUC_JP_A6_offsets,
-    from_EUC_JP_A6_infos
-};
-
-static const unsigned char
-from_EUC_JP_A7_offsets[256] = {
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-     66, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 66, 66, 66, 66, 66, 66,   66, 66, 66, 66, 66, 66, 66, 66,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A7_infos[67] = {
-     o2(0xD0,0x90), o2(0xD0,0x91), o2(0xD0,0x92), o2(0xD0,0x93),
-     o2(0xD0,0x94), o2(0xD0,0x95), o2(0xD0,0x81), o2(0xD0,0x96),
-     o2(0xD0,0x97), o2(0xD0,0x98), o2(0xD0,0x99), o2(0xD0,0x9A),
-     o2(0xD0,0x9B), o2(0xD0,0x9C), o2(0xD0,0x9D), o2(0xD0,0x9E),
-     o2(0xD0,0x9F), o2(0xD0,0xA0), o2(0xD0,0xA1), o2(0xD0,0xA2),
-     o2(0xD0,0xA3), o2(0xD0,0xA4), o2(0xD0,0xA5), o2(0xD0,0xA6),
-     o2(0xD0,0xA7), o2(0xD0,0xA8), o2(0xD0,0xA9), o2(0xD0,0xAA),
-     o2(0xD0,0xAB), o2(0xD0,0xAC), o2(0xD0,0xAD), o2(0xD0,0xAE),
-     o2(0xD0,0xAF), o2(0xD0,0xB0), o2(0xD0,0xB1), o2(0xD0,0xB2),
-     o2(0xD0,0xB3), o2(0xD0,0xB4), o2(0xD0,0xB5), o2(0xD1,0x91),
-     o2(0xD0,0xB6), o2(0xD0,0xB7), o2(0xD0,0xB8), o2(0xD0,0xB9),
-     o2(0xD0,0xBA), o2(0xD0,0xBB), o2(0xD0,0xBC), o2(0xD0,0xBD),
-     o2(0xD0,0xBE), o2(0xD0,0xBF), o2(0xD1,0x80), o2(0xD1,0x81),
-     o2(0xD1,0x82), o2(0xD1,0x83), o2(0xD1,0x84), o2(0xD1,0x85),
-     o2(0xD1,0x86), o2(0xD1,0x87), o2(0xD1,0x88), o2(0xD1,0x89),
-     o2(0xD1,0x8A), o2(0xD1,0x8B), o2(0xD1,0x8C), o2(0xD1,0x8D),
-     o2(0xD1,0x8E), o2(0xD1,0x8F),         UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A7 = {
-    from_EUC_JP_A7_offsets,
-    from_EUC_JP_A7_infos
-};
-
-static const unsigned char
-from_EUC_JP_A8_offsets[256] = {
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-     32, 32, 32, 32, 32, 32, 32, 32,   32, 32, 32, 32, 32, 32, 32, 32,
-};
-static const struct byte_lookup* const
-from_EUC_JP_A8_infos[33] = {
-     o3(0xE2,0x94,0x80), o3(0xE2,0x94,0x82),
-     o3(0xE2,0x94,0x8C), o3(0xE2,0x94,0x90),
-     o3(0xE2,0x94,0x98), o3(0xE2,0x94,0x94),
-     o3(0xE2,0x94,0x9C), o3(0xE2,0x94,0xAC),
-     o3(0xE2,0x94,0xA4), o3(0xE2,0x94,0xB4),
-     o3(0xE2,0x94,0xBC), o3(0xE2,0x94,0x81),
-     o3(0xE2,0x94,0x83), o3(0xE2,0x94,0x8F),
-     o3(0xE2,0x94,0x93), o3(0xE2,0x94,0x9B),
-     o3(0xE2,0x94,0x97), o3(0xE2,0x94,0xA3),
-     o3(0xE2,0x94,0xB3), o3(0xE2,0x94,0xAB),
-     o3(0xE2,0x94,0xBB), o3(0xE2,0x95,0x8B),
-     o3(0xE2,0x94,0xA0), o3(0xE2,0x94,0xAF),
-     o3(0xE2,0x94,0xA8), o3(0xE2,0x94,0xB7),
-     o3(0xE2,0x94,0xBF), o3(0xE2,0x94,0x9D),
-     o3(0xE2,0x94,0xB0), o3(0xE2,0x94,0xA5),
-     o3(0xE2,0x94,0xB8), o3(0xE2,0x95,0x82),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_A8 = {
-    from_EUC_JP_A8_offsets,
-    from_EUC_JP_A8_infos
-};
-
-static const unsigned char
-from_EUC_JP_AD_offsets[256] = {
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,   83, 83, 83, 83, 83, 83, 83, 83,
-     83,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 83,
-     30, 31, 32, 33, 34, 35, 36, 37,   38, 39, 40, 41, 42, 43, 44, 45,
-     46, 47, 48, 49, 50, 51, 52, 83,   83, 83, 83, 83, 83, 83, 83, 53,
-     54, 55, 56, 57, 58, 59, 60, 61,   62, 63, 64, 65, 66, 67, 68, 69,
-     70, 71, 72, 73, 74, 75, 76, 77,   78, 79, 80, 81, 82, 83, 83, 83,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_AD = {
-    from_EUC_JP_AD_offsets,
-    from_SHIFT_JIS_87_infos
-};
-
-static const BYTE_LOOKUP
-from_EUC_JP_B0 = {
-    from_EUC_JP_A1_offsets,
-    from_SHIFT_JIS_88_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B1_infos[95] = {
-     o3(0xE9,0x99,0xA2), o3(0xE9,0x99,0xB0),
-     o3(0xE9,0x9A,0xA0), o3(0xE9,0x9F,0xBB),
-     o3(0xE5,0x90,0x8B), o3(0xE5,0x8F,0xB3),
-     o3(0xE5,0xAE,0x87), o3(0xE7,0x83,0x8F),
-     o3(0xE7,0xBE,0xBD), o3(0xE8,0xBF,0x82),
-     o3(0xE9,0x9B,0xA8), o3(0xE5,0x8D,0xAF),
-     o3(0xE9,0xB5,0x9C), o3(0xE7,0xAA,0xBA),
-     o3(0xE4,0xB8,0x91), o3(0xE7,0xA2,0x93),
-     o3(0xE8,0x87,0xBC), o3(0xE6,0xB8,0xA6),
-     o3(0xE5,0x98,0x98), o3(0xE5,0x94,0x84),
-     o3(0xE6,0xAC,0x9D), o3(0xE8,0x94,0x9A),
-     o3(0xE9,0xB0,0xBB), o3(0xE5,0xA7,0xA5),
-     o3(0xE5,0x8E,0xA9), o3(0xE6,0xB5,0xA6),
-     o3(0xE7,0x93,0x9C), o3(0xE9,0x96,0x8F),
-     o3(0xE5,0x99,0x82), o3(0xE4,0xBA,0x91),
-     o3(0xE9,0x81,0x8B), o3(0xE9,0x9B,0xB2),
-     o3(0xE8,0x8D,0x8F), o3(0xE9,0xA4,0x8C),
-     o3(0xE5,0x8F,0xA1), o3(0xE5,0x96,0xB6),
-     o3(0xE5,0xAC,0xB0), o3(0xE5,0xBD,0xB1),
-     o3(0xE6,0x98,0xA0), o3(0xE6,0x9B,0xB3),
-     o3(0xE6,0xA0,0x84), o3(0xE6,0xB0,0xB8),
-     o3(0xE6,0xB3,0xB3), o3(0xE6,0xB4,0xA9),
-     o3(0xE7,0x91,0x9B), o3(0xE7,0x9B,0x88),
-     o3(0xE7,0xA9,0x8E), o3(0xE9,0xA0,0xB4),
-     o3(0xE8,0x8B,0xB1), o3(0xE8,0xA1,0x9B),
-     o3(0xE8,0xA9,0xA0), o3(0xE9,0x8B,0xAD),
-     o3(0xE6,0xB6,0xB2), o3(0xE7,0x96,0xAB),
-     o3(0xE7,0x9B,0x8A), o3(0xE9,0xA7,0x85),
-     o3(0xE6,0x82,0xA6), o3(0xE8,0xAC,0x81),
-     o3(0xE8,0xB6,0x8A), o3(0xE9,0x96,0xB2),
-     o3(0xE6,0xA6,0x8E), o3(0xE5,0x8E,0xAD),
-     o3(0xE5,0x86,0x86), o3(0xE5,0x9C,0x92),
-     o3(0xE5,0xA0,0xB0), o3(0xE5,0xA5,0x84),
-     o3(0xE5,0xAE,0xB4), o3(0xE5,0xBB,0xB6),
-     o3(0xE6,0x80,0xA8), o3(0xE6,0x8E,0xA9),
-     o3(0xE6,0x8F,0xB4), o3(0xE6,0xB2,0xBF),
-     o3(0xE6,0xBC,0x94), o3(0xE7,0x82,0x8E),
-     o3(0xE7,0x84,0x94), o3(0xE7,0x85,0x99),
-     o3(0xE7,0x87,0x95), o3(0xE7,0x8C,0xBF),
-     o3(0xE7,0xB8,0x81), o3(0xE8,0x89,0xB6),
-     o3(0xE8,0x8B,0x91), o3(0xE8,0x96,0x97),
-     o3(0xE9,0x81,0xA0), o3(0xE9,0x89,0x9B),
-     o3(0xE9,0xB4,0x9B), o3(0xE5,0xA1,0xA9),
-     o3(0xE6,0x96,0xBC), o3(0xE6,0xB1,0x9A),
-     o3(0xE7,0x94,0xA5), o3(0xE5,0x87,0xB9),
-     o3(0xE5,0xA4,0xAE), o3(0xE5,0xA5,0xA5),
-     o3(0xE5,0xBE,0x80), o3(0xE5,0xBF,0x9C),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B1_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B2_infos[95] = {
-     o3(0xE6,0x8A,0xBC), o3(0xE6,0x97,0xBA),
-     o3(0xE6,0xA8,0xAA), o3(0xE6,0xAC,0xA7),
-     o3(0xE6,0xAE,0xB4), o3(0xE7,0x8E,0x8B),
-     o3(0xE7,0xBF,0x81), o3(0xE8,0xA5,0x96),
-     o3(0xE9,0xB4,0xAC), o3(0xE9,0xB4,0x8E),
-     o3(0xE9,0xBB,0x84), o3(0xE5,0xB2,0xA1),
-     o3(0xE6,0xB2,0x96), o3(0xE8,0x8D,0xBB),
-     o3(0xE5,0x84,0x84), o3(0xE5,0xB1,0x8B),
-     o3(0xE6,0x86,0xB6), o3(0xE8,0x87,0x86),
-     o3(0xE6,0xA1,0xB6), o3(0xE7,0x89,0xA1),
-     o3(0xE4,0xB9,0x99), o3(0xE4,0xBF,0xBA),
-     o3(0xE5,0x8D,0xB8), o3(0xE6,0x81,0xA9),
-     o3(0xE6,0xB8,0xA9), o3(0xE7,0xA9,0x8F),
-     o3(0xE9,0x9F,0xB3), o3(0xE4,0xB8,0x8B),
-     o3(0xE5,0x8C,0x96), o3(0xE4,0xBB,0xAE),
-     o3(0xE4,0xBD,0x95), o3(0xE4,0xBC,0xBD),
-     o3(0xE4,0xBE,0xA1), o3(0xE4,0xBD,0xB3),
-     o3(0xE5,0x8A,0xA0), o3(0xE5,0x8F,0xAF),
-     o3(0xE5,0x98,0x89), o3(0xE5,0xA4,0x8F),
-     o3(0xE5,0xAB,0x81), o3(0xE5,0xAE,0xB6),
-     o3(0xE5,0xAF,0xA1), o3(0xE7,0xA7,0x91),
-     o3(0xE6,0x9A,0x87), o3(0xE6,0x9E,0x9C),
-     o3(0xE6,0x9E,0xB6), o3(0xE6,0xAD,0x8C),
-     o3(0xE6,0xB2,0xB3), o3(0xE7,0x81,0xAB),
-     o3(0xE7,0x8F,0x82), o3(0xE7,0xA6,0x8D),
-     o3(0xE7,0xA6,0xBE), o3(0xE7,0xA8,0xBC),
-     o3(0xE7,0xAE,0x87), o3(0xE8,0x8A,0xB1),
-     o3(0xE8,0x8B,0x9B), o3(0xE8,0x8C,0x84),
-     o3(0xE8,0x8D,0xB7), o3(0xE8,0x8F,0xAF),
-     o3(0xE8,0x8F,0x93), o3(0xE8,0x9D,0xA6),
-     o3(0xE8,0xAA,0xB2), o3(0xE5,0x98,0xA9),
-     o3(0xE8,0xB2,0xA8), o3(0xE8,0xBF,0xA6),
-     o3(0xE9,0x81,0x8E), o3(0xE9,0x9C,0x9E),
-     o3(0xE8,0x9A,0x8A), o3(0xE4,0xBF,0x84),
-     o3(0xE5,0xB3,0xA8), o3(0xE6,0x88,0x91),
-     o3(0xE7,0x89,0x99), o3(0xE7,0x94,0xBB),
-     o3(0xE8,0x87,0xA5), o3(0xE8,0x8A,0xBD),
-     o3(0xE8,0x9B,0xBE), o3(0xE8,0xB3,0x80),
-     o3(0xE9,0x9B,0x85), o3(0xE9,0xA4,0x93),
-     o3(0xE9,0xA7,0x95), o3(0xE4,0xBB,0x8B),
-     o3(0xE4,0xBC,0x9A), o3(0xE8,0xA7,0xA3),
-     o3(0xE5,0x9B,0x9E), o3(0xE5,0xA1,0x8A),
-     o3(0xE5,0xA3,0x8A), o3(0xE5,0xBB,0xBB),
-     o3(0xE5,0xBF,0xAB), o3(0xE6,0x80,0xAA),
-     o3(0xE6,0x82,0x94), o3(0xE6,0x81,0xA2),
-     o3(0xE6,0x87,0x90), o3(0xE6,0x88,0x92),
-     o3(0xE6,0x8B,0x90), o3(0xE6,0x94,0xB9),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B2 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B2_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B3_infos[95] = {
-     o3(0xE9,0xAD,0x81), o3(0xE6,0x99,0xA6),
-     o3(0xE6,0xA2,0xB0), o3(0xE6,0xB5,0xB7),
-     o3(0xE7,0x81,0xB0), o3(0xE7,0x95,0x8C),
-     o3(0xE7,0x9A,0x86), o3(0xE7,0xB5,0xB5),
-     o3(0xE8,0x8A,0xA5), o3(0xE8,0x9F,0xB9),
-     o3(0xE9,0x96,0x8B), o3(0xE9,0x9A,0x8E),
-     o3(0xE8,0xB2,0x9D), o3(0xE5,0x87,0xB1),
-     o3(0xE5,0x8A,0xBE), o3(0xE5,0xA4,0x96),
-     o3(0xE5,0x92,0xB3), o3(0xE5,0xAE,0xB3),
-     o3(0xE5,0xB4,0x96), o3(0xE6,0x85,0xA8),
-     o3(0xE6,0xA6,0x82), o3(0xE6,0xB6,0xAF),
-     o3(0xE7,0xA2,0x8D), o3(0xE8,0x93,0x8B),
-     o3(0xE8,0xA1,0x97), o3(0xE8,0xA9,0xB2),
-     o3(0xE9,0x8E,0xA7), o3(0xE9,0xAA,0xB8),
-     o3(0xE6,0xB5,0xAC), o3(0xE9,0xA6,0xA8),
-     o3(0xE8,0x9B,0x99), o3(0xE5,0x9E,0xA3),
-     o3(0xE6,0x9F,0xBF), o3(0xE8,0x9B,0x8E),
-     o3(0xE9,0x88,0x8E), o3(0xE5,0x8A,0x83),
-     o3(0xE5,0x9A,0x87), o3(0xE5,0x90,0x84),
-     o3(0xE5,0xBB,0x93), o3(0xE6,0x8B,0xA1),
-     o3(0xE6,0x92,0xB9), o3(0xE6,0xA0,0xBC),
-     o3(0xE6,0xA0,0xB8), o3(0xE6,0xAE,0xBB),
-     o3(0xE7,0x8D,0xB2), o3(0xE7,0xA2,0xBA),
-     o3(0xE7,0xA9,0xAB), o3(0xE8,0xA6,0x9A),
-     o3(0xE8,0xA7,0x92), o3(0xE8,0xB5,0xAB),
-     o3(0xE8,0xBC,0x83), o3(0xE9,0x83,0xAD),
-     o3(0xE9,0x96,0xA3), o3(0xE9,0x9A,0x94),
-     o3(0xE9,0x9D,0xA9), o3(0xE5,0xAD,0xA6),
-     o3(0xE5,0xB2,0xB3), o3(0xE6,0xA5,0xBD),
-     o3(0xE9,0xA1,0x8D), o3(0xE9,0xA1,0x8E),
-     o3(0xE6,0x8E,0x9B), o3(0xE7,0xAC,0xA0),
-     o3(0xE6,0xA8,0xAB), o3(0xE6,0xA9,0xBF),
-     o3(0xE6,0xA2,0xB6), o3(0xE9,0xB0,0x8D),
-     o3(0xE6,0xBD,0x9F), o3(0xE5,0x89,0xB2),
-     o3(0xE5,0x96,0x9D), o3(0xE6,0x81,0xB0),
-     o3(0xE6,0x8B,0xAC), o3(0xE6,0xB4,0xBB),
-     o3(0xE6,0xB8,0x87), o3(0xE6,0xBB,0x91),
-     o3(0xE8,0x91,0x9B), o3(0xE8,0xA4,0x90),
-     o3(0xE8,0xBD,0x84), o3(0xE4,0xB8,0x94),
-     o3(0xE9,0xB0,0xB9), o3(0xE5,0x8F,0xB6),
-     o3(0xE6,0xA4,0x9B), o3(0xE6,0xA8,0xBA),
-     o3(0xE9,0x9E,0x84), o3(0xE6,0xA0,0xAA),
-     o3(0xE5,0x85,0x9C), o3(0xE7,0xAB,0x83),
-     o3(0xE8,0x92,0xB2), o3(0xE9,0x87,0x9C),
-     o3(0xE9,0x8E,0x8C), o3(0xE5,0x99,0x9B),
-     o3(0xE9,0xB4,0xA8), o3(0xE6,0xA0,0xA2),
-     o3(0xE8,0x8C,0x85), o3(0xE8,0x90,0xB1),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B3 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B3_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B4_infos[95] = {
-     o3(0xE7,0xB2,0xA5), o3(0xE5,0x88,0x88),
-     o3(0xE8,0x8B,0x85), o3(0xE7,0x93,0xA6),
-     o3(0xE4,0xB9,0xBE), o3(0xE4,0xBE,0x83),
-     o3(0xE5,0x86,0xA0), o3(0xE5,0xAF,0x92),
-     o3(0xE5,0x88,0x8A), o3(0xE5,0x8B,0x98),
-     o3(0xE5,0x8B,0xA7), o3(0xE5,0xB7,0xBB),
-     o3(0xE5,0x96,0x9A), o3(0xE5,0xA0,0xAA),
-     o3(0xE5,0xA7,0xA6), o3(0xE5,0xAE,0x8C),
-     o3(0xE5,0xAE,0x98), o3(0xE5,0xAF,0x9B),
-     o3(0xE5,0xB9,0xB2), o3(0xE5,0xB9,0xB9),
-     o3(0xE6,0x82,0xA3), o3(0xE6,0x84,0x9F),
-     o3(0xE6,0x85,0xA3), o3(0xE6,0x86,0xBE),
-     o3(0xE6,0x8F,0x9B), o3(0xE6,0x95,0xA2),
-     o3(0xE6,0x9F,0x91), o3(0xE6,0xA1,0x93),
-     o3(0xE6,0xA3,0xBA), o3(0xE6,0xAC,0xBE),
-     o3(0xE6,0xAD,0x93), o3(0xE6,0xB1,0x97),
-     o3(0xE6,0xBC,0xA2), o3(0xE6,0xBE,0x97),
-     o3(0xE6,0xBD,0x85), o3(0xE7,0x92,0xB0),
-     o3(0xE7,0x94,0x98), o3(0xE7,0x9B,0xA3),
-     o3(0xE7,0x9C,0x8B), o3(0xE7,0xAB,0xBF),
-     o3(0xE7,0xAE,0xA1), o3(0xE7,0xB0,0xA1),
-     o3(0xE7,0xB7,0xA9), o3(0xE7,0xBC,0xB6),
-     o3(0xE7,0xBF,0xB0), o3(0xE8,0x82,0x9D),
-     o3(0xE8,0x89,0xA6), o3(0xE8,0x8E,0x9E),
-     o3(0xE8,0xA6,0xB3), o3(0xE8,0xAB,0x8C),
-     o3(0xE8,0xB2,0xAB), o3(0xE9,0x82,0x84),
-     o3(0xE9,0x91,0x91), o3(0xE9,0x96,0x93),
-     o3(0xE9,0x96,0x91), o3(0xE9,0x96,0xA2),
-     o3(0xE9,0x99,0xA5), o3(0xE9,0x9F,0x93),
-     o3(0xE9,0xA4,0xA8), o3(0xE8,0x88,0x98),
-     o3(0xE4,0xB8,0xB8), o3(0xE5,0x90,0xAB),
-     o3(0xE5,0xB2,0xB8), o3(0xE5,0xB7,0x8C),
-     o3(0xE7,0x8E,0xA9), o3(0xE7,0x99,0x8C),
-     o3(0xE7,0x9C,0xBC), o3(0xE5,0xB2,0xA9),
-     o3(0xE7,0xBF,0xAB), o3(0xE8,0xB4,0x8B),
-     o3(0xE9,0x9B,0x81), o3(0xE9,0xA0,0x91),
-     o3(0xE9,0xA1,0x94), o3(0xE9,0xA1,0x98),
-     o3(0xE4,0xBC,0x81), o3(0xE4,0xBC,0x8E),
-     o3(0xE5,0x8D,0xB1), o3(0xE5,0x96,0x9C),
-     o3(0xE5,0x99,0xA8), o3(0xE5,0x9F,0xBA),
-     o3(0xE5,0xA5,0x87), o3(0xE5,0xAC,0x89),
-     o3(0xE5,0xAF,0x84), o3(0xE5,0xB2,0x90),
-     o3(0xE5,0xB8,0x8C), o3(0xE5,0xB9,0xBE),
-     o3(0xE5,0xBF,0x8C), o3(0xE6,0x8F,0xAE),
-     o3(0xE6,0x9C,0xBA), o3(0xE6,0x97,0x97),
-     o3(0xE6,0x97,0xA2), o3(0xE6,0x9C,0x9F),
-     o3(0xE6,0xA3,0x8B), o3(0xE6,0xA3,0x84),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B4 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B4_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B5_infos[95] = {
-     o3(0xE6,0xA9,0x9F), o3(0xE5,0xB8,0xB0),
-     o3(0xE6,0xAF,0x85), o3(0xE6,0xB0,0x97),
-     o3(0xE6,0xB1,0xBD), o3(0xE7,0x95,0xBF),
-     o3(0xE7,0xA5,0x88), o3(0xE5,0xAD,0xA3),
-     o3(0xE7,0xA8,0x80), o3(0xE7,0xB4,0x80),
-     o3(0xE5,0xBE,0xBD), o3(0xE8,0xA6,0x8F),
-     o3(0xE8,0xA8,0x98), o3(0xE8,0xB2,0xB4),
-     o3(0xE8,0xB5,0xB7), o3(0xE8,0xBB,0x8C),
-     o3(0xE8,0xBC,0x9D), o3(0xE9,0xA3,0xA2),
-     o3(0xE9,0xA8,0x8E), o3(0xE9,0xAC,0xBC),
-     o3(0xE4,0xBA,0x80), o3(0xE5,0x81,0xBD),
-     o3(0xE5,0x84,0x80), o3(0xE5,0xA6,0x93),
-     o3(0xE5,0xAE,0x9C), o3(0xE6,0x88,0xAF),
-     o3(0xE6,0x8A,0x80), o3(0xE6,0x93,0xAC),
-     o3(0xE6,0xAC,0xBA), o3(0xE7,0x8A,0xA0),
-     o3(0xE7,0x96,0x91), o3(0xE7,0xA5,0x87),
-     o3(0xE7,0xBE,0xA9), o3(0xE8,0x9F,0xBB),
-     o3(0xE8,0xAA,0xBC), o3(0xE8,0xAD,0xB0),
-     o3(0xE6,0x8E,0xAC), o3(0xE8,0x8F,0x8A),
-     o3(0xE9,0x9E,0xA0), o3(0xE5,0x90,0x89),
-     o3(0xE5,0x90,0x83), o3(0xE5,0x96,0xAB),
-     o3(0xE6,0xA1,0x94), o3(0xE6,0xA9,0x98),
-     o3(0xE8,0xA9,0xB0), o3(0xE7,0xA0,0xA7),
-     o3(0xE6,0x9D,0xB5), o3(0xE9,0xBB,0x8D),
-     o3(0xE5,0x8D,0xB4), o3(0xE5,0xAE,0xA2),
-     o3(0xE8,0x84,0x9A), o3(0xE8,0x99,0x90),
-     o3(0xE9,0x80,0x86), o3(0xE4,0xB8,0x98),
-     o3(0xE4,0xB9,0x85), o3(0xE4,0xBB,0x87),
-     o3(0xE4,0xBC,0x91), o3(0xE5,0x8F,0x8A),
-     o3(0xE5,0x90,0xB8), o3(0xE5,0xAE,0xAE),
-     o3(0xE5,0xBC,0x93), o3(0xE6,0x80,0xA5),
-     o3(0xE6,0x95,0x91), o3(0xE6,0x9C,0xBD),
-     o3(0xE6,0xB1,0x82), o3(0xE6,0xB1,0xB2),
-     o3(0xE6,0xB3,0xA3), o3(0xE7,0x81,0xB8),
-     o3(0xE7,0x90,0x83), o3(0xE7,0xA9,0xB6),
-     o3(0xE7,0xAA,0xAE), o3(0xE7,0xAC,0x88),
-     o3(0xE7,0xB4,0x9A), o3(0xE7,0xB3,0xBE),
-     o3(0xE7,0xB5,0xA6), o3(0xE6,0x97,0xA7),
-     o3(0xE7,0x89,0x9B), o3(0xE5,0x8E,0xBB),
-     o3(0xE5,0xB1,0x85), o3(0xE5,0xB7,0xA8),
-     o3(0xE6,0x8B,0x92), o3(0xE6,0x8B,0xA0),
-     o3(0xE6,0x8C,0x99), o3(0xE6,0xB8,0xA0),
-     o3(0xE8,0x99,0x9A), o3(0xE8,0xA8,0xB1),
-     o3(0xE8,0xB7,0x9D), o3(0xE9,0x8B,0xB8),
-     o3(0xE6,0xBC,0x81), o3(0xE7,0xA6,0xA6),
-     o3(0xE9,0xAD,0x9A), o3(0xE4,0xBA,0xA8),
-     o3(0xE4,0xBA,0xAB), o3(0xE4,0xBA,0xAC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B5 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B5_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B6_infos[95] = {
-     o3(0xE4,0xBE,0x9B), o3(0xE4,0xBE,0xA0),
-     o3(0xE5,0x83,0x91), o3(0xE5,0x85,0x87),
-     o3(0xE7,0xAB,0xB6), o3(0xE5,0x85,0xB1),
-     o3(0xE5,0x87,0xB6), o3(0xE5,0x8D,0x94),
-     o3(0xE5,0x8C,0xA1), o3(0xE5,0x8D,0xBF),
-     o3(0xE5,0x8F,0xAB), o3(0xE5,0x96,0xAC),
-     o3(0xE5,0xA2,0x83), o3(0xE5,0xB3,0xA1),
-     o3(0xE5,0xBC,0xB7), o3(0xE5,0xBD,0x8A),
-     o3(0xE6,0x80,0xAF), o3(0xE6,0x81,0x90),
-     o3(0xE6,0x81,0xAD), o3(0xE6,0x8C,0x9F),
-     o3(0xE6,0x95,0x99), o3(0xE6,0xA9,0x8B),
-     o3(0xE6,0xB3,0x81), o3(0xE7,0x8B,0x82),
-     o3(0xE7,0x8B,0xAD), o3(0xE7,0x9F,0xAF),
-     o3(0xE8,0x83,0xB8), o3(0xE8,0x84,0x85),
-     o3(0xE8,0x88,0x88), o3(0xE8,0x95,0x8E),
-     o3(0xE9,0x83,0xB7), o3(0xE9,0x8F,0xA1),
-     o3(0xE9,0x9F,0xBF), o3(0xE9,0xA5,0x97),
-     o3(0xE9,0xA9,0x9A), o3(0xE4,0xBB,0xB0),
-     o3(0xE5,0x87,0x9D), o3(0xE5,0xB0,0xAD),
-     o3(0xE6,0x9A,0x81), o3(0xE6,0xA5,0xAD),
-     o3(0xE5,0xB1,0x80), o3(0xE6,0x9B,0xB2),
-     o3(0xE6,0xA5,0xB5), o3(0xE7,0x8E,0x89),
-     o3(0xE6,0xA1,0x90), o3(0xE7,0xB2,0x81),
-     o3(0xE5,0x83,0x85), o3(0xE5,0x8B,0xA4),
-     o3(0xE5,0x9D,0x87), o3(0xE5,0xB7,0xBE),
-     o3(0xE9,0x8C,0xA6), o3(0xE6,0x96,0xA4),
-     o3(0xE6,0xAC,0xA3), o3(0xE6,0xAC,0xBD),
-     o3(0xE7,0x90,0xB4), o3(0xE7,0xA6,0x81),
-     o3(0xE7,0xA6,0xBD), o3(0xE7,0xAD,0x8B),
-     o3(0xE7,0xB7,0x8A), o3(0xE8,0x8A,0xB9),
-     o3(0xE8,0x8F,0x8C), o3(0xE8,0xA1,0xBF),
-     o3(0xE8,0xA5,0x9F), o3(0xE8,0xAC,0xB9),
-     o3(0xE8,0xBF,0x91), o3(0xE9,0x87,0x91),
-     o3(0xE5,0x90,0x9F), o3(0xE9,0x8A,0x80),
-     o3(0xE4,0xB9,0x9D), o3(0xE5,0x80,0xB6),
-     o3(0xE5,0x8F,0xA5), o3(0xE5,0x8C,0xBA),
-     o3(0xE7,0x8B,0x97), o3(0xE7,0x8E,0x96),
-     o3(0xE7,0x9F,0xA9), o3(0xE8,0x8B,0xA6),
-     o3(0xE8,0xBA,0xAF), o3(0xE9,0xA7,0x86),
-     o3(0xE9,0xA7,0x88), o3(0xE9,0xA7,0x92),
-     o3(0xE5,0x85,0xB7), o3(0xE6,0x84,0x9A),
-     o3(0xE8,0x99,0x9E), o3(0xE5,0x96,0xB0),
-     o3(0xE7,0xA9,0xBA), o3(0xE5,0x81,0xB6),
-     o3(0xE5,0xAF,0x93), o3(0xE9,0x81,0x87),
-     o3(0xE9,0x9A,0x85), o3(0xE4,0xB8,0xB2),
-     o3(0xE6,0xAB,0x9B), o3(0xE9,0x87,0xA7),
-     o3(0xE5,0xB1,0x91), o3(0xE5,0xB1,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B6 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B6_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B7_infos[95] = {
-     o3(0xE6,0x8E,0x98), o3(0xE7,0xAA,0x9F),
-     o3(0xE6,0xB2,0x93), o3(0xE9,0x9D,0xB4),
-     o3(0xE8,0xBD,0xA1), o3(0xE7,0xAA,0xAA),
-     o3(0xE7,0x86,0x8A), o3(0xE9,0x9A,0x88),
-     o3(0xE7,0xB2,0x82), o3(0xE6,0xA0,0x97),
-     o3(0xE7,0xB9,0xB0), o3(0xE6,0xA1,0x91),
-     o3(0xE9,0x8D,0xAC), o3(0xE5,0x8B,0xB2),
-     o3(0xE5,0x90,0x9B), o3(0xE8,0x96,0xAB),
-     o3(0xE8,0xA8,0x93), o3(0xE7,0xBE,0xA4),
-     o3(0xE8,0xBB,0x8D), o3(0xE9,0x83,0xA1),
-     o3(0xE5,0x8D,0xA6), o3(0xE8,0xA2,0x88),
-     o3(0xE7,0xA5,0x81), o3(0xE4,0xBF,0x82),
-     o3(0xE5,0x82,0xBE), o3(0xE5,0x88,0x91),
-     o3(0xE5,0x85,0x84), o3(0xE5,0x95,0x93),
-     o3(0xE5,0x9C,0xAD), o3(0xE7,0x8F,0xAA),
-     o3(0xE5,0x9E,0x8B), o3(0xE5,0xA5,0x91),
-     o3(0xE5,0xBD,0xA2), o3(0xE5,0xBE,0x84),
-     o3(0xE6,0x81,0xB5), o3(0xE6,0x85,0xB6),
-     o3(0xE6,0x85,0xA7), o3(0xE6,0x86,0xA9),
-     o3(0xE6,0x8E,0xB2), o3(0xE6,0x90,0xBA),
-     o3(0xE6,0x95,0xAC), o3(0xE6,0x99,0xAF),
-     o3(0xE6,0xA1,0x82), o3(0xE6,0xB8,0x93),
-     o3(0xE7,0x95,0xA6), o3(0xE7,0xA8,0xBD),
-     o3(0xE7,0xB3,0xBB), o3(0xE7,0xB5,0x8C),
-     o3(0xE7,0xB6,0x99), o3(0xE7,0xB9,0x8B),
-     o3(0xE7,0xBD,0xAB), o3(0xE8,0x8C,0x8E),
-     o3(0xE8,0x8D,0x8A), o3(0xE8,0x9B,0x8D),
-     o3(0xE8,0xA8,0x88), o3(0xE8,0xA9,0xA3),
-     o3(0xE8,0xAD,0xA6), o3(0xE8,0xBB,0xBD),
-     o3(0xE9,0xA0,0x9A), o3(0xE9,0xB6,0x8F),
-     o3(0xE8,0x8A,0xB8), o3(0xE8,0xBF,0x8E),
-     o3(0xE9,0xAF,0xA8), o3(0xE5,0x8A,0x87),
-     o3(0xE6,0x88,0x9F), o3(0xE6,0x92,0x83),
-     o3(0xE6,0xBF,0x80), o3(0xE9,0x9A,0x99),
-     o3(0xE6,0xA1,0x81), o3(0xE5,0x82,0x91),
-     o3(0xE6,0xAC,0xA0), o3(0xE6,0xB1,0xBA),
-     o3(0xE6,0xBD,0x94), o3(0xE7,0xA9,0xB4),
-     o3(0xE7,0xB5,0x90), o3(0xE8,0xA1,0x80),
-     o3(0xE8,0xA8,0xA3), o3(0xE6,0x9C,0x88),
-     o3(0xE4,0xBB,0xB6), o3(0xE5,0x80,0xB9),
-     o3(0xE5,0x80,0xA6), o3(0xE5,0x81,0xA5),
-     o3(0xE5,0x85,0xBC), o3(0xE5,0x88,0xB8),
-     o3(0xE5,0x89,0xA3), o3(0xE5,0x96,0xA7),
-     o3(0xE5,0x9C,0x8F), o3(0xE5,0xA0,0x85),
-     o3(0xE5,0xAB,0x8C), o3(0xE5,0xBB,0xBA),
-     o3(0xE6,0x86,0xB2), o3(0xE6,0x87,0xB8),
-     o3(0xE6,0x8B,0xB3), o3(0xE6,0x8D,0xB2),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B7 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B7_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B8_infos[95] = {
-     o3(0xE6,0xA4,0x9C), o3(0xE6,0xA8,0xA9),
-     o3(0xE7,0x89,0xBD), o3(0xE7,0x8A,0xAC),
-     o3(0xE7,0x8C,0xAE), o3(0xE7,0xA0,0x94),
-     o3(0xE7,0xA1,0xAF), o3(0xE7,0xB5,0xB9),
-     o3(0xE7,0x9C,0x8C), o3(0xE8,0x82,0xA9),
-     o3(0xE8,0xA6,0x8B), o3(0xE8,0xAC,0x99),
-     o3(0xE8,0xB3,0xA2), o3(0xE8,0xBB,0x92),
-     o3(0xE9,0x81,0xA3), o3(0xE9,0x8D,0xB5),
-     o3(0xE9,0x99,0xBA), o3(0xE9,0xA1,0x95),
-     o3(0xE9,0xA8,0x93), o3(0xE9,0xB9,0xB8),
-     o3(0xE5,0x85,0x83), o3(0xE5,0x8E,0x9F),
-     o3(0xE5,0x8E,0xB3), o3(0xE5,0xB9,0xBB),
-     o3(0xE5,0xBC,0xA6), o3(0xE6,0xB8,0x9B),
-     o3(0xE6,0xBA,0x90), o3(0xE7,0x8E,0x84),
-     o3(0xE7,0x8F,0xBE), o3(0xE7,0xB5,0x83),
-     o3(0xE8,0x88,0xB7), o3(0xE8,0xA8,0x80),
-     o3(0xE8,0xAB,0xBA), o3(0xE9,0x99,0x90),
-     o3(0xE4,0xB9,0x8E), o3(0xE5,0x80,0x8B),
-     o3(0xE5,0x8F,0xA4), o3(0xE5,0x91,0xBC),
-     o3(0xE5,0x9B,0xBA), o3(0xE5,0xA7,0x91),
-     o3(0xE5,0xAD,0xA4), o3(0xE5,0xB7,0xB1),
-     o3(0xE5,0xBA,0xAB), o3(0xE5,0xBC,0xA7),
-     o3(0xE6,0x88,0xB8), o3(0xE6,0x95,0x85),
-     o3(0xE6,0x9E,0xAF), o3(0xE6,0xB9,0x96),
-     o3(0xE7,0x8B,0x90), o3(0xE7,0xB3,0x8A),
-     o3(0xE8,0xA2,0xB4), o3(0xE8,0x82,0xA1),
-     o3(0xE8,0x83,0xA1), o3(0xE8,0x8F,0xB0),
-     o3(0xE8,0x99,0x8E), o3(0xE8,0xAA,0x87),
-     o3(0xE8,0xB7,0xA8), o3(0xE9,0x88,0xB7),
-     o3(0xE9,0x9B,0x87), o3(0xE9,0xA1,0xA7),
-     o3(0xE9,0xBC,0x93), o3(0xE4,0xBA,0x94),
-     o3(0xE4,0xBA,0x92), o3(0xE4,0xBC,0x8D),
-     o3(0xE5,0x8D,0x88), o3(0xE5,0x91,0x89),
-     o3(0xE5,0x90,0xBE), o3(0xE5,0xA8,0xAF),
-     o3(0xE5,0xBE,0x8C), o3(0xE5,0xBE,0xA1),
-     o3(0xE6,0x82,0x9F), o3(0xE6,0xA2,0xA7),
-     o3(0xE6,0xAA,0x8E), o3(0xE7,0x91,0x9A),
-     o3(0xE7,0xA2,0x81), o3(0xE8,0xAA,0x9E),
-     o3(0xE8,0xAA,0xA4), o3(0xE8,0xAD,0xB7),
-     o3(0xE9,0x86,0x90), o3(0xE4,0xB9,0x9E),
-     o3(0xE9,0xAF,0x89), o3(0xE4,0xBA,0xA4),
-     o3(0xE4,0xBD,0xBC), o3(0xE4,0xBE,0xAF),
-     o3(0xE5,0x80,0x99), o3(0xE5,0x80,0x96),
-     o3(0xE5,0x85,0x89), o3(0xE5,0x85,0xAC),
-     o3(0xE5,0x8A,0x9F), o3(0xE5,0x8A,0xB9),
-     o3(0xE5,0x8B,0xBE), o3(0xE5,0x8E,0x9A),
-     o3(0xE5,0x8F,0xA3), o3(0xE5,0x90,0x91),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B8 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B8_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_B9_infos[95] = {
-     o3(0xE5,0x90,0x8E), o3(0xE5,0x96,0x89),
-     o3(0xE5,0x9D,0x91), o3(0xE5,0x9E,0xA2),
-     o3(0xE5,0xA5,0xBD), o3(0xE5,0xAD,0x94),
-     o3(0xE5,0xAD,0x9D), o3(0xE5,0xAE,0x8F),
-     o3(0xE5,0xB7,0xA5), o3(0xE5,0xB7,0xA7),
-     o3(0xE5,0xB7,0xB7), o3(0xE5,0xB9,0xB8),
-     o3(0xE5,0xBA,0x83), o3(0xE5,0xBA,0x9A),
-     o3(0xE5,0xBA,0xB7), o3(0xE5,0xBC,0x98),
-     o3(0xE6,0x81,0x92), o3(0xE6,0x85,0x8C),
-     o3(0xE6,0x8A,0x97), o3(0xE6,0x8B,0x98),
-     o3(0xE6,0x8E,0xA7), o3(0xE6,0x94,0xBB),
-     o3(0xE6,0x98,0x82), o3(0xE6,0x99,0x83),
-     o3(0xE6,0x9B,0xB4), o3(0xE6,0x9D,0xAD),
-     o3(0xE6,0xA0,0xA1), o3(0xE6,0xA2,0x97),
-     o3(0xE6,0xA7,0x8B), o3(0xE6,0xB1,0x9F),
-     o3(0xE6,0xB4,0xAA), o3(0xE6,0xB5,0xA9),
-     o3(0xE6,0xB8,0xAF), o3(0xE6,0xBA,0x9D),
-     o3(0xE7,0x94,0xB2), o3(0xE7,0x9A,0x87),
-     o3(0xE7,0xA1,0xAC), o3(0xE7,0xA8,0xBF),
-     o3(0xE7,0xB3,0xA0), o3(0xE7,0xB4,0x85),
-     o3(0xE7,0xB4,0x98), o3(0xE7,0xB5,0x9E),
-     o3(0xE7,0xB6,0xB1), o3(0xE8,0x80,0x95),
-     o3(0xE8,0x80,0x83), o3(0xE8,0x82,0xAF),
-     o3(0xE8,0x82,0xB1), o3(0xE8,0x85,0x94),
-     o3(0xE8,0x86,0x8F), o3(0xE8,0x88,0xAA),
-     o3(0xE8,0x8D,0x92), o3(0xE8,0xA1,0x8C),
-     o3(0xE8,0xA1,0xA1), o3(0xE8,0xAC,0x9B),
-     o3(0xE8,0xB2,0xA2), o3(0xE8,0xB3,0xBC),
-     o3(0xE9,0x83,0x8A), o3(0xE9,0x85,0xB5),
-     o3(0xE9,0x89,0xB1), o3(0xE7,0xA0,0xBF),
-     o3(0xE9,0x8B,0xBC), o3(0xE9,0x96,0xA4),
-     o3(0xE9,0x99,0x8D), o3(0xE9,0xA0,0x85),
-     o3(0xE9,0xA6,0x99), o3(0xE9,0xAB,0x98),
-     o3(0xE9,0xB4,0xBB), o3(0xE5,0x89,0x9B),
-     o3(0xE5,0x8A,0xAB), o3(0xE5,0x8F,0xB7),
-     o3(0xE5,0x90,0x88), o3(0xE5,0xA3,0x95),
-     o3(0xE6,0x8B,0xB7), o3(0xE6,0xBF,0xA0),
-     o3(0xE8,0xB1,0xAA), o3(0xE8,0xBD,0x9F),
-     o3(0xE9,0xBA,0xB9), o3(0xE5,0x85,0x8B),
-     o3(0xE5,0x88,0xBB), o3(0xE5,0x91,0x8A),
-     o3(0xE5,0x9B,0xBD), o3(0xE7,0xA9,0x80),
-     o3(0xE9,0x85,0xB7), o3(0xE9,0xB5,0xA0),
-     o3(0xE9,0xBB,0x92), o3(0xE7,0x8D,0x84),
-     o3(0xE6,0xBC,0x89), o3(0xE8,0x85,0xB0),
-     o3(0xE7,0x94,0x91), o3(0xE5,0xBF,0xBD),
-     o3(0xE6,0x83,0x9A), o3(0xE9,0xAA,0xA8),
-     o3(0xE7,0x8B,0x9B), o3(0xE8,0xBE,0xBC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_B9 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_B9_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BA_infos[95] = {
-     o3(0xE6,0xAD,0xA4), o3(0xE9,0xA0,0x83),
-     o3(0xE4,0xBB,0x8A), o3(0xE5,0x9B,0xB0),
-     o3(0xE5,0x9D,0xA4), o3(0xE5,0xA2,0xBE),
-     o3(0xE5,0xA9,0x9A), o3(0xE6,0x81,0xA8),
-     o3(0xE6,0x87,0x87), o3(0xE6,0x98,0x8F),
-     o3(0xE6,0x98,0x86), o3(0xE6,0xA0,0xB9),
-     o3(0xE6,0xA2,0xB1), o3(0xE6,0xB7,0xB7),
-     o3(0xE7,0x97,0x95), o3(0xE7,0xB4,0xBA),
-     o3(0xE8,0x89,0xAE), o3(0xE9,0xAD,0x82),
-     o3(0xE4,0xBA,0x9B), o3(0xE4,0xBD,0x90),
-     o3(0xE5,0x8F,0x89), o3(0xE5,0x94,0x86),
-     o3(0xE5,0xB5,0xAF), o3(0xE5,0xB7,0xA6),
-     o3(0xE5,0xB7,0xAE), o3(0xE6,0x9F,0xBB),
-     o3(0xE6,0xB2,0x99), o3(0xE7,0x91,0xB3),
-     o3(0xE7,0xA0,0x82), o3(0xE8,0xA9,0x90),
-     o3(0xE9,0x8E,0x96), o3(0xE8,0xA3,0x9F),
-     o3(0xE5,0x9D,0x90), o3(0xE5,0xBA,0xA7),
-     o3(0xE6,0x8C,0xAB), o3(0xE5,0x82,0xB5),
-     o3(0xE5,0x82,0xAC), o3(0xE5,0x86,0x8D),
-     o3(0xE6,0x9C,0x80), o3(0xE5,0x93,0x89),
-     o3(0xE5,0xA1,0x9E), o3(0xE5,0xA6,0xBB),
-     o3(0xE5,0xAE,0xB0), o3(0xE5,0xBD,0xA9),
-     o3(0xE6,0x89,0x8D), o3(0xE6,0x8E,0xA1),
-     o3(0xE6,0xA0,0xBD), o3(0xE6,0xAD,0xB3),
-     o3(0xE6,0xB8,0x88), o3(0xE7,0x81,0xBD),
-     o3(0xE9,0x87,0x87), o3(0xE7,0x8A,0x80),
-     o3(0xE7,0xA0,0x95), o3(0xE7,0xA0,0xA6),
-     o3(0xE7,0xA5,0xAD), o3(0xE6,0x96,0x8E),
-     o3(0xE7,0xB4,0xB0), o3(0xE8,0x8F,0x9C),
-     o3(0xE8,0xA3,0x81), o3(0xE8,0xBC,0x89),
-     o3(0xE9,0x9A,0x9B), o3(0xE5,0x89,0xA4),
-     o3(0xE5,0x9C,0xA8), o3(0xE6,0x9D,0x90),
-     o3(0xE7,0xBD,0xAA), o3(0xE8,0xB2,0xA1),
-     o3(0xE5,0x86,0xB4), o3(0xE5,0x9D,0x82),
-     o3(0xE9,0x98,0xAA), o3(0xE5,0xA0,0xBA),
-     o3(0xE6,0xA6,0x8A), o3(0xE8,0x82,0xB4),
-     o3(0xE5,0x92,0xB2), o3(0xE5,0xB4,0x8E),
-     o3(0xE5,0x9F,0xBC), o3(0xE7,0xA2,0x95),
-     o3(0xE9,0xB7,0xBA), o3(0xE4,0xBD,0x9C),
-     o3(0xE5,0x89,0x8A), o3(0xE5,0x92,0x8B),
-     o3(0xE6,0x90,0xBE), o3(0xE6,0x98,0xA8),
-     o3(0xE6,0x9C,0x94), o3(0xE6,0x9F,0xB5),
-     o3(0xE7,0xAA,0x84), o3(0xE7,0xAD,0x96),
-     o3(0xE7,0xB4,0xA2), o3(0xE9,0x8C,0xAF),
-     o3(0xE6,0xA1,0x9C), o3(0xE9,0xAE,0xAD),
-     o3(0xE7,0xAC,0xB9), o3(0xE5,0x8C,0x99),
-     o3(0xE5,0x86,0x8A), o3(0xE5,0x88,0xB7),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BA = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BA_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BB_infos[95] = {
-     o3(0xE5,0xAF,0x9F), o3(0xE6,0x8B,0xB6),
-     o3(0xE6,0x92,0xAE), o3(0xE6,0x93,0xA6),
-     o3(0xE6,0x9C,0xAD), o3(0xE6,0xAE,0xBA),
-     o3(0xE8,0x96,0xA9), o3(0xE9,0x9B,0x91),
-     o3(0xE7,0x9A,0x90), o3(0xE9,0xAF,0x96),
-     o3(0xE6,0x8D,0x8C), o3(0xE9,0x8C,0x86),
-     o3(0xE9,0xAE,0xAB), o3(0xE7,0x9A,0xBF),
-     o3(0xE6,0x99,0x92), o3(0xE4,0xB8,0x89),
-     o3(0xE5,0x82,0x98), o3(0xE5,0x8F,0x82),
-     o3(0xE5,0xB1,0xB1), o3(0xE6,0x83,0xA8),
-     o3(0xE6,0x92,0x92), o3(0xE6,0x95,0xA3),
-     o3(0xE6,0xA1,0x9F), o3(0xE7,0x87,0xA6),
-     o3(0xE7,0x8F,0x8A), o3(0xE7,0x94,0xA3),
-     o3(0xE7,0xAE,0x97), o3(0xE7,0xBA,0x82),
-     o3(0xE8,0x9A,0x95), o3(0xE8,0xAE,0x83),
-     o3(0xE8,0xB3,0x9B), o3(0xE9,0x85,0xB8),
-     o3(0xE9,0xA4,0x90), o3(0xE6,0x96,0xAC),
-     o3(0xE6,0x9A,0xAB), o3(0xE6,0xAE,0x8B),
-     o3(0xE4,0xBB,0x95), o3(0xE4,0xBB,0x94),
-     o3(0xE4,0xBC,0xBA), o3(0xE4,0xBD,0xBF),
-     o3(0xE5,0x88,0xBA), o3(0xE5,0x8F,0xB8),
-     o3(0xE5,0x8F,0xB2), o3(0xE5,0x97,0xA3),
-     o3(0xE5,0x9B,0x9B), o3(0xE5,0xA3,0xAB),
-     o3(0xE5,0xA7,0x8B), o3(0xE5,0xA7,0x89),
-     o3(0xE5,0xA7,0xBF), o3(0xE5,0xAD,0x90),
-     o3(0xE5,0xB1,0x8D), o3(0xE5,0xB8,0x82),
-     o3(0xE5,0xB8,0xAB), o3(0xE5,0xBF,0x97),
-     o3(0xE6,0x80,0x9D), o3(0xE6,0x8C,0x87),
-     o3(0xE6,0x94,0xAF), o3(0xE5,0xAD,0x9C),
-     o3(0xE6,0x96,0xAF), o3(0xE6,0x96,0xBD),
-     o3(0xE6,0x97,0xA8), o3(0xE6,0x9E,0x9D),
-     o3(0xE6,0xAD,0xA2), o3(0xE6,0xAD,0xBB),
-     o3(0xE6,0xB0,0x8F), o3(0xE7,0x8D,0x85),
-     o3(0xE7,0xA5,0x89), o3(0xE7,0xA7,0x81),
-     o3(0xE7,0xB3,0xB8), o3(0xE7,0xB4,0x99),
-     o3(0xE7,0xB4,0xAB), o3(0xE8,0x82,0xA2),
-     o3(0xE8,0x84,0x82), o3(0xE8,0x87,0xB3),
-     o3(0xE8,0xA6,0x96), o3(0xE8,0xA9,0x9E),
-     o3(0xE8,0xA9,0xA9), o3(0xE8,0xA9,0xA6),
-     o3(0xE8,0xAA,0x8C), o3(0xE8,0xAB,0xAE),
-     o3(0xE8,0xB3,0x87), o3(0xE8,0xB3,0x9C),
-     o3(0xE9,0x9B,0x8C), o3(0xE9,0xA3,0xBC),
-     o3(0xE6,0xAD,0xAF), o3(0xE4,0xBA,0x8B),
-     o3(0xE4,0xBC,0xBC), o3(0xE4,0xBE,0x8D),
-     o3(0xE5,0x85,0x90), o3(0xE5,0xAD,0x97),
-     o3(0xE5,0xAF,0xBA), o3(0xE6,0x85,0x88),
-     o3(0xE6,0x8C,0x81), o3(0xE6,0x99,0x82),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BB = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BB_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BC_infos[95] = {
-     o3(0xE6,0xAC,0xA1), o3(0xE6,0xBB,0x8B),
-     o3(0xE6,0xB2,0xBB), o3(0xE7,0x88,0xBE),
-     o3(0xE7,0x92,0xBD), o3(0xE7,0x97,0x94),
-     o3(0xE7,0xA3,0x81), o3(0xE7,0xA4,0xBA),
-     o3(0xE8,0x80,0x8C), o3(0xE8,0x80,0xB3),
-     o3(0xE8,0x87,0xAA), o3(0xE8,0x92,0x94),
-     o3(0xE8,0xBE,0x9E), o3(0xE6,0xB1,0x90),
-     o3(0xE9,0xB9,0xBF), o3(0xE5,0xBC,0x8F),
-     o3(0xE8,0xAD,0x98), o3(0xE9,0xB4,0xAB),
-     o3(0xE7,0xAB,0xBA), o3(0xE8,0xBB,0xB8),
-     o3(0xE5,0xAE,0x8D), o3(0xE9,0x9B,0xAB),
-     o3(0xE4,0xB8,0x83), o3(0xE5,0x8F,0xB1),
-     o3(0xE5,0x9F,0xB7), o3(0xE5,0xA4,0xB1),
-     o3(0xE5,0xAB,0x89), o3(0xE5,0xAE,0xA4),
-     o3(0xE6,0x82,0x89), o3(0xE6,0xB9,0xBF),
-     o3(0xE6,0xBC,0x86), o3(0xE7,0x96,0xBE),
-     o3(0xE8,0xB3,0xAA), o3(0xE5,0xAE,0x9F),
-     o3(0xE8,0x94,0x80), o3(0xE7,0xAF,0xA0),
-     o3(0xE5,0x81,0xB2), o3(0xE6,0x9F,0xB4),
-     o3(0xE8,0x8A,0x9D), o3(0xE5,0xB1,0xA1),
-     o3(0xE8,0x95,0x8A), o3(0xE7,0xB8,0x9E),
-     o3(0xE8,0x88,0x8E), o3(0xE5,0x86,0x99),
-     o3(0xE5,0xB0,0x84), o3(0xE6,0x8D,0xA8),
-     o3(0xE8,0xB5,0xA6), o3(0xE6,0x96,0x9C),
-     o3(0xE7,0x85,0xAE), o3(0xE7,0xA4,0xBE),
-     o3(0xE7,0xB4,0x97), o3(0xE8,0x80,0x85),
-     o3(0xE8,0xAC,0x9D), o3(0xE8,0xBB,0x8A),
-     o3(0xE9,0x81,0xAE), o3(0xE8,0x9B,0x87),
-     o3(0xE9,0x82,0xAA), o3(0xE5,0x80,0x9F),
-     o3(0xE5,0x8B,0xBA), o3(0xE5,0xB0,0xBA),
-     o3(0xE6,0x9D,0x93), o3(0xE7,0x81,0xBC),
-     o3(0xE7,0x88,0xB5), o3(0xE9,0x85,0x8C),
-     o3(0xE9,0x87,0x88), o3(0xE9,0x8C,0xAB),
-     o3(0xE8,0x8B,0xA5), o3(0xE5,0xAF,0x82),
-     o3(0xE5,0xBC,0xB1), o3(0xE6,0x83,0xB9),
-     o3(0xE4,0xB8,0xBB), o3(0xE5,0x8F,0x96),
-     o3(0xE5,0xAE,0x88), o3(0xE6,0x89,0x8B),
-     o3(0xE6,0x9C,0xB1), o3(0xE6,0xAE,0x8A),
-     o3(0xE7,0x8B,0xA9), o3(0xE7,0x8F,0xA0),
-     o3(0xE7,0xA8,0xAE), o3(0xE8,0x85,0xAB),
-     o3(0xE8,0xB6,0xA3), o3(0xE9,0x85,0x92),
-     o3(0xE9,0xA6,0x96), o3(0xE5,0x84,0x92),
-     o3(0xE5,0x8F,0x97), o3(0xE5,0x91,0xAA),
-     o3(0xE5,0xAF,0xBF), o3(0xE6,0x8E,0x88),
-     o3(0xE6,0xA8,0xB9), o3(0xE7,0xB6,0xAC),
-     o3(0xE9,0x9C,0x80), o3(0xE5,0x9B,0x9A),
-     o3(0xE5,0x8F,0x8E), o3(0xE5,0x91,0xA8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BC = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BC_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BD_infos[95] = {
-     o3(0xE5,0xAE,0x97), o3(0xE5,0xB0,0xB1),
-     o3(0xE5,0xB7,0x9E), o3(0xE4,0xBF,0xAE),
-     o3(0xE6,0x84,0x81), o3(0xE6,0x8B,0xBE),
-     o3(0xE6,0xB4,0xB2), o3(0xE7,0xA7,0x80),
-     o3(0xE7,0xA7,0x8B), o3(0xE7,0xB5,0x82),
-     o3(0xE7,0xB9,0x8D), o3(0xE7,0xBF,0x92),
-     o3(0xE8,0x87,0xAD), o3(0xE8,0x88,0x9F),
-     o3(0xE8,0x92,0x90), o3(0xE8,0xA1,0x86),
-     o3(0xE8,0xA5,0xB2), o3(0xE8,0xAE,0x90),
-     o3(0xE8,0xB9,0xB4), o3(0xE8,0xBC,0xAF),
-     o3(0xE9,0x80,0xB1), o3(0xE9,0x85,0x8B),
-     o3(0xE9,0x85,0xAC), o3(0xE9,0x9B,0x86),
-     o3(0xE9,0x86,0x9C), o3(0xE4,0xBB,0x80),
-     o3(0xE4,0xBD,0x8F), o3(0xE5,0x85,0x85),
-     o3(0xE5,0x8D,0x81), o3(0xE5,0xBE,0x93),
-     o3(0xE6,0x88,0x8E), o3(0xE6,0x9F,0x94),
-     o3(0xE6,0xB1,0x81), o3(0xE6,0xB8,0x8B),
-     o3(0xE7,0x8D,0xA3), o3(0xE7,0xB8,0xA6),
-     o3(0xE9,0x87,0x8D), o3(0xE9,0x8A,0x83),
-     o3(0xE5,0x8F,0x94), o3(0xE5,0xA4,0x99),
-     o3(0xE5,0xAE,0xBF), o3(0xE6,0xB7,0x91),
-     o3(0xE7,0xA5,0x9D), o3(0xE7,0xB8,0xAE),
-     o3(0xE7,0xB2,0x9B), o3(0xE5,0xA1,0xBE),
-     o3(0xE7,0x86,0x9F), o3(0xE5,0x87,0xBA),
-     o3(0xE8,0xA1,0x93), o3(0xE8,0xBF,0xB0),
-     o3(0xE4,0xBF,0x8A), o3(0xE5,0xB3,0xBB),
-     o3(0xE6,0x98,0xA5), o3(0xE7,0x9E,0xAC),
-     o3(0xE7,0xAB,0xA3), o3(0xE8,0x88,0x9C),
-     o3(0xE9,0xA7,0xBF), o3(0xE5,0x87,0x86),
-     o3(0xE5,0xBE,0xAA), o3(0xE6,0x97,0xAC),
-     o3(0xE6,0xA5,0xAF), o3(0xE6,0xAE,0x89),
-     o3(0xE6,0xB7,0xB3), o3(0xE6,0xBA,0x96),
-     o3(0xE6,0xBD,0xA4), o3(0xE7,0x9B,0xBE),
-     o3(0xE7,0xB4,0x94), o3(0xE5,0xB7,0xA1),
-     o3(0xE9,0x81,0xB5), o3(0xE9,0x86,0x87),
-     o3(0xE9,0xA0,0x86), o3(0xE5,0x87,0xA6),
-     o3(0xE5,0x88,0x9D), o3(0xE6,0x89,0x80),
-     o3(0xE6,0x9A,0x91), o3(0xE6,0x9B,0x99),
-     o3(0xE6,0xB8,0x9A), o3(0xE5,0xBA,0xB6),
-     o3(0xE7,0xB7,0x92), o3(0xE7,0xBD,0xB2),
-     o3(0xE6,0x9B,0xB8), o3(0xE8,0x96,0xAF),
-     o3(0xE8,0x97,0xB7), o3(0xE8,0xAB,0xB8),
-     o3(0xE5,0x8A,0xA9), o3(0xE5,0x8F,0x99),
-     o3(0xE5,0xA5,0xB3), o3(0xE5,0xBA,0x8F),
-     o3(0xE5,0xBE,0x90), o3(0xE6,0x81,0x95),
-     o3(0xE9,0x8B,0xA4), o3(0xE9,0x99,0xA4),
-     o3(0xE5,0x82,0xB7), o3(0xE5,0x84,0x9F),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BD = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BD_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BE_infos[95] = {
-     o3(0xE5,0x8B,0x9D), o3(0xE5,0x8C,0xA0),
-     o3(0xE5,0x8D,0x87), o3(0xE5,0x8F,0xAC),
-     o3(0xE5,0x93,0xA8), o3(0xE5,0x95,0x86),
-     o3(0xE5,0x94,0xB1), o3(0xE5,0x98,0x97),
-     o3(0xE5,0xA5,0xA8), o3(0xE5,0xA6,0xBE),
-     o3(0xE5,0xA8,0xBC), o3(0xE5,0xAE,0xB5),
-     o3(0xE5,0xB0,0x86), o3(0xE5,0xB0,0x8F),
-     o3(0xE5,0xB0,0x91), o3(0xE5,0xB0,0x9A),
-     o3(0xE5,0xBA,0x84), o3(0xE5,0xBA,0x8A),
-     o3(0xE5,0xBB,0xA0), o3(0xE5,0xBD,0xB0),
-     o3(0xE6,0x89,0xBF), o3(0xE6,0x8A,0x84),
-     o3(0xE6,0x8B,0x9B), o3(0xE6,0x8E,0x8C),
-     o3(0xE6,0x8D,0xB7), o3(0xE6,0x98,0x87),
-     o3(0xE6,0x98,0x8C), o3(0xE6,0x98,0xAD),
-     o3(0xE6,0x99,0xB6), o3(0xE6,0x9D,0xBE),
-     o3(0xE6,0xA2,0xA2), o3(0xE6,0xA8,0x9F),
-     o3(0xE6,0xA8,0xB5), o3(0xE6,0xB2,0xBC),
-     o3(0xE6,0xB6,0x88), o3(0xE6,0xB8,0x89),
-     o3(0xE6,0xB9,0x98), o3(0xE7,0x84,0xBC),
-     o3(0xE7,0x84,0xA6), o3(0xE7,0x85,0xA7),
-     o3(0xE7,0x97,0x87), o3(0xE7,0x9C,0x81),
-     o3(0xE7,0xA1,0x9D), o3(0xE7,0xA4,0x81),
-     o3(0xE7,0xA5,0xA5), o3(0xE7,0xA7,0xB0),
-     o3(0xE7,0xAB,0xA0), o3(0xE7,0xAC,0x91),
-     o3(0xE7,0xB2,0xA7), o3(0xE7,0xB4,0xB9),
-     o3(0xE8,0x82,0x96), o3(0xE8,0x8F,0x96),
-     o3(0xE8,0x92,0x8B), o3(0xE8,0x95,0x89),
-     o3(0xE8,0xA1,0x9D), o3(0xE8,0xA3,0xB3),
-     o3(0xE8,0xA8,0x9F), o3(0xE8,0xA8,0xBC),
-     o3(0xE8,0xA9,0x94), o3(0xE8,0xA9,0xB3),
-     o3(0xE8,0xB1,0xA1), o3(0xE8,0xB3,0x9E),
-     o3(0xE9,0x86,0xA4), o3(0xE9,0x89,0xA6),
-     o3(0xE9,0x8D,0xBE), o3(0xE9,0x90,0x98),
-     o3(0xE9,0x9A,0x9C), o3(0xE9,0x9E,0x98),
-     o3(0xE4,0xB8,0x8A), o3(0xE4,0xB8,0x88),
-     o3(0xE4,0xB8,0x9E), o3(0xE4,0xB9,0x97),
-     o3(0xE5,0x86,0x97), o3(0xE5,0x89,0xB0),
-     o3(0xE5,0x9F,0x8E), o3(0xE5,0xA0,0xB4),
-     o3(0xE5,0xA3,0x8C), o3(0xE5,0xAC,0xA2),
-     o3(0xE5,0xB8,0xB8), o3(0xE6,0x83,0x85),
-     o3(0xE6,0x93,0xBE), o3(0xE6,0x9D,0xA1),
-     o3(0xE6,0x9D,0x96), o3(0xE6,0xB5,0x84),
-     o3(0xE7,0x8A,0xB6), o3(0xE7,0x95,0xB3),
-     o3(0xE7,0xA9,0xA3), o3(0xE8,0x92,0xB8),
-     o3(0xE8,0xAD,0xB2), o3(0xE9,0x86,0xB8),
-     o3(0xE9,0x8C,0xA0), o3(0xE5,0x98,0xB1),
-     o3(0xE5,0x9F,0xB4), o3(0xE9,0xA3,0xBE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BE = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BE_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_BF_infos[95] = {
-     o3(0xE6,0x8B,0xAD), o3(0xE6,0xA4,0x8D),
-     o3(0xE6,0xAE,0x96), o3(0xE7,0x87,0xAD),
-     o3(0xE7,0xB9,0x94), o3(0xE8,0x81,0xB7),
-     o3(0xE8,0x89,0xB2), o3(0xE8,0xA7,0xA6),
-     o3(0xE9,0xA3,0x9F), o3(0xE8,0x9D,0x95),
-     o3(0xE8,0xBE,0xB1), o3(0xE5,0xB0,0xBB),
-     o3(0xE4,0xBC,0xB8), o3(0xE4,0xBF,0xA1),
-     o3(0xE4,0xBE,0xB5), o3(0xE5,0x94,0x87),
-     o3(0xE5,0xA8,0xA0), o3(0xE5,0xAF,0x9D),
-     o3(0xE5,0xAF,0xA9), o3(0xE5,0xBF,0x83),
-     o3(0xE6,0x85,0x8E), o3(0xE6,0x8C,0xAF),
-     o3(0xE6,0x96,0xB0), o3(0xE6,0x99,0x8B),
-     o3(0xE6,0xA3,0xAE), o3(0xE6,0xA6,0x9B),
-     o3(0xE6,0xB5,0xB8), o3(0xE6,0xB7,0xB1),
-     o3(0xE7,0x94,0xB3), o3(0xE7,0x96,0xB9),
-     o3(0xE7,0x9C,0x9F), o3(0xE7,0xA5,0x9E),
-     o3(0xE7,0xA7,0xA6), o3(0xE7,0xB4,0xB3),
-     o3(0xE8,0x87,0xA3), o3(0xE8,0x8A,0xAF),
-     o3(0xE8,0x96,0xAA), o3(0xE8,0xA6,0xAA),
-     o3(0xE8,0xA8,0xBA), o3(0xE8,0xBA,0xAB),
-     o3(0xE8,0xBE,0x9B), o3(0xE9,0x80,0xB2),
-     o3(0xE9,0x87,0x9D), o3(0xE9,0x9C,0x87),
-     o3(0xE4,0xBA,0xBA), o3(0xE4,0xBB,0x81),
-     o3(0xE5,0x88,0x83), o3(0xE5,0xA1,0xB5),
-     o3(0xE5,0xA3,0xAC), o3(0xE5,0xB0,0x8B),
-     o3(0xE7,0x94,0x9A), o3(0xE5,0xB0,0xBD),
-     o3(0xE8,0x85,0x8E), o3(0xE8,0xA8,0x8A),
-     o3(0xE8,0xBF,0x85), o3(0xE9,0x99,0xA3),
-     o3(0xE9,0x9D,0xAD), o3(0xE7,0xAC,0xA5),
-     o3(0xE8,0xAB,0x8F), o3(0xE9,0xA0,0x88),
-     o3(0xE9,0x85,0xA2), o3(0xE5,0x9B,0xB3),
-     o3(0xE5,0x8E,0xA8), o3(0xE9,0x80,0x97),
-     o3(0xE5,0x90,0xB9), o3(0xE5,0x9E,0x82),
-     o3(0xE5,0xB8,0xA5), o3(0xE6,0x8E,0xA8),
-     o3(0xE6,0xB0,0xB4), o3(0xE7,0x82,0x8A),
-     o3(0xE7,0x9D,0xA1), o3(0xE7,0xB2,0x8B),
-     o3(0xE7,0xBF,0xA0), o3(0xE8,0xA1,0xB0),
-     o3(0xE9,0x81,0x82), o3(0xE9,0x85,0x94),
-     o3(0xE9,0x8C,0x90), o3(0xE9,0x8C,0x98),
-     o3(0xE9,0x9A,0x8F), o3(0xE7,0x91,0x9E),
-     o3(0xE9,0xAB,0x84), o3(0xE5,0xB4,0x87),
-     o3(0xE5,0xB5,0xA9), o3(0xE6,0x95,0xB0),
-     o3(0xE6,0x9E,0xA2), o3(0xE8,0xB6,0xA8),
-     o3(0xE9,0x9B,0x9B), o3(0xE6,0x8D,0xAE),
-     o3(0xE6,0x9D,0x89), o3(0xE6,0xA4,0x99),
-     o3(0xE8,0x8F,0x85), o3(0xE9,0xA0,0x97),
-     o3(0xE9,0x9B,0x80), o3(0xE8,0xA3,0xBE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_BF = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_BF_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C0_infos[95] = {
-     o3(0xE6,0xBE,0x84), o3(0xE6,0x91,0xBA),
-     o3(0xE5,0xAF,0xB8), o3(0xE4,0xB8,0x96),
-     o3(0xE7,0x80,0xAC), o3(0xE7,0x95,0x9D),
-     o3(0xE6,0x98,0xAF), o3(0xE5,0x87,0x84),
-     o3(0xE5,0x88,0xB6), o3(0xE5,0x8B,0xA2),
-     o3(0xE5,0xA7,0x93), o3(0xE5,0xBE,0x81),
-     o3(0xE6,0x80,0xA7), o3(0xE6,0x88,0x90),
-     o3(0xE6,0x94,0xBF), o3(0xE6,0x95,0xB4),
-     o3(0xE6,0x98,0x9F), o3(0xE6,0x99,0xB4),
-     o3(0xE6,0xA3,0xB2), o3(0xE6,0xA0,0x96),
-     o3(0xE6,0xAD,0xA3), o3(0xE6,0xB8,0x85),
-     o3(0xE7,0x89,0xB2), o3(0xE7,0x94,0x9F),
-     o3(0xE7,0x9B,0x9B), o3(0xE7,0xB2,0xBE),
-     o3(0xE8,0x81,0x96), o3(0xE5,0xA3,0xB0),
-     o3(0xE8,0xA3,0xBD), o3(0xE8,0xA5,0xBF),
-     o3(0xE8,0xAA,0xA0), o3(0xE8,0xAA,0x93),
-     o3(0xE8,0xAB,0x8B), o3(0xE9,0x80,0x9D),
-     o3(0xE9,0x86,0x92), o3(0xE9,0x9D,0x92),
-     o3(0xE9,0x9D,0x99), o3(0xE6,0x96,0x89),
-     o3(0xE7,0xA8,0x8E), o3(0xE8,0x84,0x86),
-     o3(0xE9,0x9A,0xBB), o3(0xE5,0xB8,0xAD),
-     o3(0xE6,0x83,0x9C), o3(0xE6,0x88,0x9A),
-     o3(0xE6,0x96,0xA5), o3(0xE6,0x98,0x94),
-     o3(0xE6,0x9E,0x90), o3(0xE7,0x9F,0xB3),
-     o3(0xE7,0xA9,0x8D), o3(0xE7,0xB1,0x8D),
-     o3(0xE7,0xB8,0xBE), o3(0xE8,0x84,0x8A),
-     o3(0xE8,0xB2,0xAC), o3(0xE8,0xB5,0xA4),
-     o3(0xE8,0xB7,0xA1), o3(0xE8,0xB9,0x9F),
-     o3(0xE7,0xA2,0xA9), o3(0xE5,0x88,0x87),
-     o3(0xE6,0x8B,0x99), o3(0xE6,0x8E,0xA5),
-     o3(0xE6,0x91,0x82), o3(0xE6,0x8A,0x98),
-     o3(0xE8,0xA8,0xAD), o3(0xE7,0xAA,0x83),
-     o3(0xE7,0xAF,0x80), o3(0xE8,0xAA,0xAC),
-     o3(0xE9,0x9B,0xAA), o3(0xE7,0xB5,0xB6),
-     o3(0xE8,0x88,0x8C), o3(0xE8,0x9D,0x89),
-     o3(0xE4,0xBB,0x99), o3(0xE5,0x85,0x88),
-     o3(0xE5,0x8D,0x83), o3(0xE5,0x8D,0xA0),
-     o3(0xE5,0xAE,0xA3), o3(0xE5,0xB0,0x82),
-     o3(0xE5,0xB0,0x96), o3(0xE5,0xB7,0x9D),
-     o3(0xE6,0x88,0xA6), o3(0xE6,0x89,0x87),
-     o3(0xE6,0x92,0xB0), o3(0xE6,0xA0,0x93),
-     o3(0xE6,0xA0,0xB4), o3(0xE6,0xB3,0x89),
-     o3(0xE6,0xB5,0x85), o3(0xE6,0xB4,0x97),
-     o3(0xE6,0x9F,0x93), o3(0xE6,0xBD,0x9C),
-     o3(0xE7,0x85,0x8E), o3(0xE7,0x85,0xBD),
-     o3(0xE6,0x97,0x8B), o3(0xE7,0xA9,0xBF),
-     o3(0xE7,0xAE,0xAD), o3(0xE7,0xB7,0x9A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C0 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C0_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C1_infos[95] = {
-     o3(0xE7,0xB9,0x8A), o3(0xE7,0xBE,0xA8),
-     o3(0xE8,0x85,0xBA), o3(0xE8,0x88,0x9B),
-     o3(0xE8,0x88,0xB9), o3(0xE8,0x96,0xA6),
-     o3(0xE8,0xA9,0xAE), o3(0xE8,0xB3,0x8E),
-     o3(0xE8,0xB7,0xB5), o3(0xE9,0x81,0xB8),
-     o3(0xE9,0x81,0xB7), o3(0xE9,0x8A,0xAD),
-     o3(0xE9,0x8A,0x91), o3(0xE9,0x96,0x83),
-     o3(0xE9,0xAE,0xAE), o3(0xE5,0x89,0x8D),
-     o3(0xE5,0x96,0x84), o3(0xE6,0xBC,0xB8),
-     o3(0xE7,0x84,0xB6), o3(0xE5,0x85,0xA8),
-     o3(0xE7,0xA6,0x85), o3(0xE7,0xB9,0x95),
-     o3(0xE8,0x86,0xB3), o3(0xE7,0xB3,0x8E),
-     o3(0xE5,0x99,0x8C), o3(0xE5,0xA1,0x91),
-     o3(0xE5,0xB2,0xA8), o3(0xE6,0x8E,0xAA),
-     o3(0xE6,0x9B,0xBE), o3(0xE6,0x9B,0xBD),
-     o3(0xE6,0xA5,0x9A), o3(0xE7,0x8B,0x99),
-     o3(0xE7,0x96,0x8F), o3(0xE7,0x96,0x8E),
-     o3(0xE7,0xA4,0x8E), o3(0xE7,0xA5,0x96),
-     o3(0xE7,0xA7,0x9F), o3(0xE7,0xB2,0x97),
-     o3(0xE7,0xB4,0xA0), o3(0xE7,0xB5,0x84),
-     o3(0xE8,0x98,0x87), o3(0xE8,0xA8,0xB4),
-     o3(0xE9,0x98,0xBB), o3(0xE9,0x81,0xA1),
-     o3(0xE9,0xBC,0xA0), o3(0xE5,0x83,0xA7),
-     o3(0xE5,0x89,0xB5), o3(0xE5,0x8F,0x8C),
-     o3(0xE5,0x8F,0xA2), o3(0xE5,0x80,0x89),
-     o3(0xE5,0x96,0xAA), o3(0xE5,0xA3,0xAE),
-     o3(0xE5,0xA5,0x8F), o3(0xE7,0x88,0xBD),
-     o3(0xE5,0xAE,0x8B), o3(0xE5,0xB1,0xA4),
-     o3(0xE5,0x8C,0x9D), o3(0xE6,0x83,0xA3),
-     o3(0xE6,0x83,0xB3), o3(0xE6,0x8D,0x9C),
-     o3(0xE6,0x8E,0x83), o3(0xE6,0x8C,0xBF),
-     o3(0xE6,0x8E,0xBB), o3(0xE6,0x93,0x8D),
-     o3(0xE6,0x97,0xA9), o3(0xE6,0x9B,0xB9),
-     o3(0xE5,0xB7,0xA3), o3(0xE6,0xA7,0x8D),
-     o3(0xE6,0xA7,0xBD), o3(0xE6,0xBC,0x95),
-     o3(0xE7,0x87,0xA5), o3(0xE4,0xBA,0x89),
-     o3(0xE7,0x97,0xA9), o3(0xE7,0x9B,0xB8),
-     o3(0xE7,0xAA,0x93), o3(0xE7,0xB3,0x9F),
-     o3(0xE7,0xB7,0x8F), o3(0xE7,0xB6,0x9C),
-     o3(0xE8,0x81,0xA1), o3(0xE8,0x8D,0x89),
-     o3(0xE8,0x8D,0x98), o3(0xE8,0x91,0xAC),
-     o3(0xE8,0x92,0xBC), o3(0xE8,0x97,0xBB),
-     o3(0xE8,0xA3,0x85), o3(0xE8,0xB5,0xB0),
-     o3(0xE9,0x80,0x81), o3(0xE9,0x81,0xAD),
-     o3(0xE9,0x8E,0x97), o3(0xE9,0x9C,0x9C),
-     o3(0xE9,0xA8,0x92), o3(0xE5,0x83,0x8F),
-     o3(0xE5,0xA2,0x97), o3(0xE6,0x86,0x8E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C1_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C2_infos[95] = {
-     o3(0xE8,0x87,0x93), o3(0xE8,0x94,0xB5),
-     o3(0xE8,0xB4,0x88), o3(0xE9,0x80,0xA0),
-     o3(0xE4,0xBF,0x83), o3(0xE5,0x81,0xB4),
-     o3(0xE5,0x89,0x87), o3(0xE5,0x8D,0xB3),
-     o3(0xE6,0x81,0xAF), o3(0xE6,0x8D,0x89),
-     o3(0xE6,0x9D,0x9F), o3(0xE6,0xB8,0xAC),
-     o3(0xE8,0xB6,0xB3), o3(0xE9,0x80,0x9F),
-     o3(0xE4,0xBF,0x97), o3(0xE5,0xB1,0x9E),
-     o3(0xE8,0xB3,0x8A), o3(0xE6,0x97,0x8F),
-     o3(0xE7,0xB6,0x9A), o3(0xE5,0x8D,0x92),
-     o3(0xE8,0xA2,0x96), o3(0xE5,0x85,0xB6),
-     o3(0xE6,0x8F,0x83), o3(0xE5,0xAD,0x98),
-     o3(0xE5,0xAD,0xAB), o3(0xE5,0xB0,0x8A),
-     o3(0xE6,0x90,0x8D), o3(0xE6,0x9D,0x91),
-     o3(0xE9,0x81,0x9C), o3(0xE4,0xBB,0x96),
-     o3(0xE5,0xA4,0x9A), o3(0xE5,0xA4,0xAA),
-     o3(0xE6,0xB1,0xB0), o3(0xE8,0xA9,0x91),
-     o3(0xE5,0x94,0xBE), o3(0xE5,0xA0,0x95),
-     o3(0xE5,0xA6,0xA5), o3(0xE6,0x83,0xB0),
-     o3(0xE6,0x89,0x93), o3(0xE6,0x9F,0x81),
-     o3(0xE8,0x88,0xB5), o3(0xE6,0xA5,0x95),
-     o3(0xE9,0x99,0x80), o3(0xE9,0xA7,0x84),
-     o3(0xE9,0xA8,0xA8), o3(0xE4,0xBD,0x93),
-     o3(0xE5,0xA0,0x86), o3(0xE5,0xAF,0xBE),
-     o3(0xE8,0x80,0x90), o3(0xE5,0xB2,0xB1),
-     o3(0xE5,0xB8,0xAF), o3(0xE5,0xBE,0x85),
-     o3(0xE6,0x80,0xA0), o3(0xE6,0x85,0x8B),
-     o3(0xE6,0x88,0xB4), o3(0xE6,0x9B,0xBF),
-     o3(0xE6,0xB3,0xB0), o3(0xE6,0xBB,0x9E),
-     o3(0xE8,0x83,0x8E), o3(0xE8,0x85,0xBF),
-     o3(0xE8,0x8B,0x94), o3(0xE8,0xA2,0x8B),
-     o3(0xE8,0xB2,0xB8), o3(0xE9,0x80,0x80),
-     o3(0xE9,0x80,0xAE), o3(0xE9,0x9A,0x8A),
-     o3(0xE9,0xBB,0x9B), o3(0xE9,0xAF,0x9B),
-     o3(0xE4,0xBB,0xA3), o3(0xE5,0x8F,0xB0),
-     o3(0xE5,0xA4,0xA7), o3(0xE7,0xAC,0xAC),
-     o3(0xE9,0x86,0x8D), o3(0xE9,0xA1,0x8C),
-     o3(0xE9,0xB7,0xB9), o3(0xE6,0xBB,0x9D),
-     o3(0xE7,0x80,0xA7), o3(0xE5,0x8D,0x93),
-     o3(0xE5,0x95,0x84), o3(0xE5,0xAE,0x85),
-     o3(0xE6,0x89,0x98), o3(0xE6,0x8A,0x9E),
-     o3(0xE6,0x8B,0x93), o3(0xE6,0xB2,0xA2),
-     o3(0xE6,0xBF,0xAF), o3(0xE7,0x90,0xA2),
-     o3(0xE8,0xA8,0x97), o3(0xE9,0x90,0xB8),
-     o3(0xE6,0xBF,0x81), o3(0xE8,0xAB,0xBE),
-     o3(0xE8,0x8C,0xB8), o3(0xE5,0x87,0xA7),
-     o3(0xE8,0x9B,0xB8), o3(0xE5,0x8F,0xAA),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C2 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C2_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C3_infos[95] = {
-     o3(0xE5,0x8F,0xA9), o3(0xE4,0xBD,0x86),
-     o3(0xE9,0x81,0x94), o3(0xE8,0xBE,0xB0),
-     o3(0xE5,0xA5,0xAA), o3(0xE8,0x84,0xB1),
-     o3(0xE5,0xB7,0xBD), o3(0xE7,0xAB,0xAA),
-     o3(0xE8,0xBE,0xBF), o3(0xE6,0xA3,0x9A),
-     o3(0xE8,0xB0,0xB7), o3(0xE7,0x8B,0xB8),
-     o3(0xE9,0xB1,0x88), o3(0xE6,0xA8,0xBD),
-     o3(0xE8,0xAA,0xB0), o3(0xE4,0xB8,0xB9),
-     o3(0xE5,0x8D,0x98), o3(0xE5,0x98,0x86),
-     o3(0xE5,0x9D,0xA6), o3(0xE6,0x8B,0x85),
-     o3(0xE6,0x8E,0xA2), o3(0xE6,0x97,0xA6),
-     o3(0xE6,0xAD,0x8E), o3(0xE6,0xB7,0xA1),
-     o3(0xE6,0xB9,0x9B), o3(0xE7,0x82,0xAD),
-     o3(0xE7,0x9F,0xAD), o3(0xE7,0xAB,0xAF),
-     o3(0xE7,0xAE,0xAA), o3(0xE7,0xB6,0xBB),
-     o3(0xE8,0x80,0xBD), o3(0xE8,0x83,0x86),
-     o3(0xE8,0x9B,0x8B), o3(0xE8,0xAA,0x95),
-     o3(0xE9,0x8D,0x9B), o3(0xE5,0x9B,0xA3),
-     o3(0xE5,0xA3,0x87), o3(0xE5,0xBC,0xBE),
-     o3(0xE6,0x96,0xAD), o3(0xE6,0x9A,0x96),
-     o3(0xE6,0xAA,0x80), o3(0xE6,0xAE,0xB5),
-     o3(0xE7,0x94,0xB7), o3(0xE8,0xAB,0x87),
-     o3(0xE5,0x80,0xA4), o3(0xE7,0x9F,0xA5),
-     o3(0xE5,0x9C,0xB0), o3(0xE5,0xBC,0x9B),
-     o3(0xE6,0x81,0xA5), o3(0xE6,0x99,0xBA),
-     o3(0xE6,0xB1,0xA0), o3(0xE7,0x97,0xB4),
-     o3(0xE7,0xA8,0x9A), o3(0xE7,0xBD,0xAE),
-     o3(0xE8,0x87,0xB4), o3(0xE8,0x9C,0x98),
-     o3(0xE9,0x81,0x85), o3(0xE9,0xA6,0xB3),
-     o3(0xE7,0xAF,0x89), o3(0xE7,0x95,0x9C),
-     o3(0xE7,0xAB,0xB9), o3(0xE7,0xAD,0x91),
-     o3(0xE8,0x93,0x84), o3(0xE9,0x80,0x90),
-     o3(0xE7,0xA7,0xA9), o3(0xE7,0xAA,0x92),
-     o3(0xE8,0x8C,0xB6), o3(0xE5,0xAB,0xA1),
-     o3(0xE7,0x9D,0x80), o3(0xE4,0xB8,0xAD),
-     o3(0xE4,0xBB,0xB2), o3(0xE5,0xAE,0x99),
-     o3(0xE5,0xBF,0xA0), o3(0xE6,0x8A,0xBD),
-     o3(0xE6,0x98,0xBC), o3(0xE6,0x9F,0xB1),
-     o3(0xE6,0xB3,0xA8), o3(0xE8,0x99,0xAB),
-     o3(0xE8,0xA1,0xB7), o3(0xE8,0xA8,0xBB),
-     o3(0xE9,0x85,0x8E), o3(0xE9,0x8B,0xB3),
-     o3(0xE9,0xA7,0x90), o3(0xE6,0xA8,0x97),
-     o3(0xE7,0x80,0xA6), o3(0xE7,0x8C,0xAA),
-     o3(0xE8,0x8B,0xA7), o3(0xE8,0x91,0x97),
-     o3(0xE8,0xB2,0xAF), o3(0xE4,0xB8,0x81),
-     o3(0xE5,0x85,0x86), o3(0xE5,0x87,0x8B),
-     o3(0xE5,0x96,0x8B), o3(0xE5,0xAF,0xB5),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C3 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C3_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C4_infos[95] = {
-     o3(0xE5,0xB8,0x96), o3(0xE5,0xB8,0xB3),
-     o3(0xE5,0xBA,0x81), o3(0xE5,0xBC,0x94),
-     o3(0xE5,0xBC,0xB5), o3(0xE5,0xBD,0xAB),
-     o3(0xE5,0xBE,0xB4), o3(0xE6,0x87,0xB2),
-     o3(0xE6,0x8C,0x91), o3(0xE6,0x9A,0xA2),
-     o3(0xE6,0x9C,0x9D), o3(0xE6,0xBD,0xAE),
-     o3(0xE7,0x89,0x92), o3(0xE7,0x94,0xBA),
-     o3(0xE7,0x9C,0xBA), o3(0xE8,0x81,0xB4),
-     o3(0xE8,0x84,0xB9), o3(0xE8,0x85,0xB8),
-     o3(0xE8,0x9D,0xB6), o3(0xE8,0xAA,0xBF),
-     o3(0xE8,0xAB,0x9C), o3(0xE8,0xB6,0x85),
-     o3(0xE8,0xB7,0xB3), o3(0xE9,0x8A,0x9A),
-     o3(0xE9,0x95,0xB7), o3(0xE9,0xA0,0x82),
-     o3(0xE9,0xB3,0xA5), o3(0xE5,0x8B,0x85),
-     o3(0xE6,0x8D,0x97), o3(0xE7,0x9B,0xB4),
-     o3(0xE6,0x9C,0x95), o3(0xE6,0xB2,0x88),
-     o3(0xE7,0x8F,0x8D), o3(0xE8,0xB3,0x83),
-     o3(0xE9,0x8E,0xAE), o3(0xE9,0x99,0xB3),
-     o3(0xE6,0xB4,0xA5), o3(0xE5,0xA2,0x9C),
-     o3(0xE6,0xA4,0x8E), o3(0xE6,0xA7,0x8C),
-     o3(0xE8,0xBF,0xBD), o3(0xE9,0x8E,0x9A),
-     o3(0xE7,0x97,0x9B), o3(0xE9,0x80,0x9A),
-     o3(0xE5,0xA1,0x9A), o3(0xE6,0xA0,0x82),
-     o3(0xE6,0x8E,0xB4), o3(0xE6,0xA7,0xBB),
-     o3(0xE4,0xBD,0x83), o3(0xE6,0xBC,0xAC),
-     o3(0xE6,0x9F,0x98), o3(0xE8,0xBE,0xBB),
-     o3(0xE8,0x94,0xA6), o3(0xE7,0xB6,0xB4),
-     o3(0xE9,0x8D,0x94), o3(0xE6,0xA4,0xBF),
-     o3(0xE6,0xBD,0xB0), o3(0xE5,0x9D,0xAA),
-     o3(0xE5,0xA3,0xB7), o3(0xE5,0xAC,0xAC),
-     o3(0xE7,0xB4,0xAC), o3(0xE7,0x88,0xAA),
-     o3(0xE5,0x90,0x8A), o3(0xE9,0x87,0xA3),
-     o3(0xE9,0xB6,0xB4), o3(0xE4,0xBA,0xAD),
-     o3(0xE4,0xBD,0x8E), o3(0xE5,0x81,0x9C),
-     o3(0xE5,0x81,0xB5), o3(0xE5,0x89,0x83),
-     o3(0xE8,0xB2,0x9E), o3(0xE5,0x91,0x88),
-     o3(0xE5,0xA0,0xA4), o3(0xE5,0xAE,0x9A),
-     o3(0xE5,0xB8,0x9D), o3(0xE5,0xBA,0x95),
-     o3(0xE5,0xBA,0xAD), o3(0xE5,0xBB,0xB7),
-     o3(0xE5,0xBC,0x9F), o3(0xE6,0x82,0x8C),
-     o3(0xE6,0x8A,0xB5), o3(0xE6,0x8C,0xBA),
-     o3(0xE6,0x8F,0x90), o3(0xE6,0xA2,0xAF),
-     o3(0xE6,0xB1,0x80), o3(0xE7,0xA2,0x87),
-     o3(0xE7,0xA6,0x8E), o3(0xE7,0xA8,0x8B),
-     o3(0xE7,0xB7,0xA0), o3(0xE8,0x89,0x87),
-     o3(0xE8,0xA8,0x82), o3(0xE8,0xAB,0xA6),
-     o3(0xE8,0xB9,0x84), o3(0xE9,0x80,0x93),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C4 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C4_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C5_infos[95] = {
-     o3(0xE9,0x82,0xB8), o3(0xE9,0x84,0xAD),
-     o3(0xE9,0x87,0x98), o3(0xE9,0xBC,0x8E),
-     o3(0xE6,0xB3,0xA5), o3(0xE6,0x91,0x98),
-     o3(0xE6,0x93,0xA2), o3(0xE6,0x95,0xB5),
-     o3(0xE6,0xBB,0xB4), o3(0xE7,0x9A,0x84),
-     o3(0xE7,0xAC,0x9B), o3(0xE9,0x81,0xA9),
-     o3(0xE9,0x8F,0x91), o3(0xE6,0xBA,0xBA),
-     o3(0xE5,0x93,0xB2), o3(0xE5,0xBE,0xB9),
-     o3(0xE6,0x92,0xA4), o3(0xE8,0xBD,0x8D),
-     o3(0xE8,0xBF,0xAD), o3(0xE9,0x89,0x84),
-     o3(0xE5,0x85,0xB8), o3(0xE5,0xA1,0xAB),
-     o3(0xE5,0xA4,0xA9), o3(0xE5,0xB1,0x95),
-     o3(0xE5,0xBA,0x97), o3(0xE6,0xB7,0xBB),
-     o3(0xE7,0xBA,0x8F), o3(0xE7,0x94,0x9C),
-     o3(0xE8,0xB2,0xBC), o3(0xE8,0xBB,0xA2),
-     o3(0xE9,0xA1,0x9B), o3(0xE7,0x82,0xB9),
-     o3(0xE4,0xBC,0x9D), o3(0xE6,0xAE,0xBF),
-     o3(0xE6,0xBE,0xB1), o3(0xE7,0x94,0xB0),
-     o3(0xE9,0x9B,0xBB), o3(0xE5,0x85,0x8E),
-     o3(0xE5,0x90,0x90), o3(0xE5,0xA0,0xB5),
-     o3(0xE5,0xA1,0x97), o3(0xE5,0xA6,0xAC),
-     o3(0xE5,0xB1,0xA0), o3(0xE5,0xBE,0x92),
-     o3(0xE6,0x96,0x97), o3(0xE6,0x9D,0x9C),
-     o3(0xE6,0xB8,0xA1), o3(0xE7,0x99,0xBB),
-     o3(0xE8,0x8F,0x9F), o3(0xE8,0xB3,0xAD),
-     o3(0xE9,0x80,0x94), o3(0xE9,0x83,0xBD),
-     o3(0xE9,0x8D,0x8D), o3(0xE7,0xA0,0xA5),
-     o3(0xE7,0xA0,0xBA), o3(0xE5,0x8A,0xAA),
-     o3(0xE5,0xBA,0xA6), o3(0xE5,0x9C,0x9F),
-     o3(0xE5,0xA5,0xB4), o3(0xE6,0x80,0x92),
-     o3(0xE5,0x80,0x92), o3(0xE5,0x85,0x9A),
-     o3(0xE5,0x86,0xAC), o3(0xE5,0x87,0x8D),
-     o3(0xE5,0x88,0x80), o3(0xE5,0x94,0x90),
-     o3(0xE5,0xA1,0x94), o3(0xE5,0xA1,0x98),
-     o3(0xE5,0xA5,0x97), o3(0xE5,0xAE,0x95),
-     o3(0xE5,0xB3,0xB6), o3(0xE5,0xB6,0x8B),
-     o3(0xE6,0x82,0xBC), o3(0xE6,0x8A,0x95),
-     o3(0xE6,0x90,0xAD), o3(0xE6,0x9D,0xB1),
-     o3(0xE6,0xA1,0x83), o3(0xE6,0xA2,0xBC),
-     o3(0xE6,0xA3,0x9F), o3(0xE7,0x9B,0x97),
-     o3(0xE6,0xB7,0x98), o3(0xE6,0xB9,0xAF),
-     o3(0xE6,0xB6,0x9B), o3(0xE7,0x81,0xAF),
-     o3(0xE7,0x87,0x88), o3(0xE5,0xBD,0x93),
-     o3(0xE7,0x97,0x98), o3(0xE7,0xA5,0xB7),
-     o3(0xE7,0xAD,0x89), o3(0xE7,0xAD,0x94),
-     o3(0xE7,0xAD,0x92), o3(0xE7,0xB3,0x96),
-     o3(0xE7,0xB5,0xB1), o3(0xE5,0x88,0xB0),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C5 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C5_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C6_infos[95] = {
-     o3(0xE8,0x91,0xA3), o3(0xE8,0x95,0xA9),
-     o3(0xE8,0x97,0xA4), o3(0xE8,0xA8,0x8E),
-     o3(0xE8,0xAC,0x84), o3(0xE8,0xB1,0x86),
-     o3(0xE8,0xB8,0x8F), o3(0xE9,0x80,0x83),
-     o3(0xE9,0x80,0x8F), o3(0xE9,0x90,0x99),
-     o3(0xE9,0x99,0xB6), o3(0xE9,0xA0,0xAD),
-     o3(0xE9,0xA8,0xB0), o3(0xE9,0x97,0x98),
-     o3(0xE5,0x83,0x8D), o3(0xE5,0x8B,0x95),
-     o3(0xE5,0x90,0x8C), o3(0xE5,0xA0,0x82),
-     o3(0xE5,0xB0,0x8E), o3(0xE6,0x86,0xA7),
-     o3(0xE6,0x92,0x9E), o3(0xE6,0xB4,0x9E),
-     o3(0xE7,0x9E,0xB3), o3(0xE7,0xAB,0xA5),
-     o3(0xE8,0x83,0xB4), o3(0xE8,0x90,0x84),
-     o3(0xE9,0x81,0x93), o3(0xE9,0x8A,0x85),
-     o3(0xE5,0xB3,0xA0), o3(0xE9,0xB4,0x87),
-     o3(0xE5,0x8C,0xBF), o3(0xE5,0xBE,0x97),
-     o3(0xE5,0xBE,0xB3), o3(0xE6,0xB6,0x9C),
-     o3(0xE7,0x89,0xB9), o3(0xE7,0x9D,0xA3),
-     o3(0xE7,0xA6,0xBF), o3(0xE7,0xAF,0xA4),
-     o3(0xE6,0xAF,0x92), o3(0xE7,0x8B,0xAC),
-     o3(0xE8,0xAA,0xAD), o3(0xE6,0xA0,0x83),
-     o3(0xE6,0xA9,0xA1), o3(0xE5,0x87,0xB8),
-     o3(0xE7,0xAA,0x81), o3(0xE6,0xA4,0xB4),
-     o3(0xE5,0xB1,0x8A), o3(0xE9,0xB3,0xB6),
-     o3(0xE8,0x8B,0xAB), o3(0xE5,0xAF,0x85),
-     o3(0xE9,0x85,0x89), o3(0xE7,0x80,0x9E),
-     o3(0xE5,0x99,0xB8), o3(0xE5,0xB1,0xAF),
-     o3(0xE6,0x83,0x87), o3(0xE6,0x95,0xA6),
-     o3(0xE6,0xB2,0x8C), o3(0xE8,0xB1,0x9A),
-     o3(0xE9,0x81,0x81), o3(0xE9,0xA0,0x93),
-     o3(0xE5,0x91,0x91), o3(0xE6,0x9B,0x87),
-     o3(0xE9,0x88,0x8D), o3(0xE5,0xA5,0x88),
-     o3(0xE9,0x82,0xA3), o3(0xE5,0x86,0x85),
-     o3(0xE4,0xB9,0x8D), o3(0xE5,0x87,0xAA),
-     o3(0xE8,0x96,0x99), o3(0xE8,0xAC,0x8E),
-     o3(0xE7,0x81,0x98), o3(0xE6,0x8D,0xBA),
-     o3(0xE9,0x8D,0x8B), o3(0xE6,0xA5,0xA2),
-     o3(0xE9,0xA6,0xB4), o3(0xE7,0xB8,0x84),
-     o3(0xE7,0x95,0xB7), o3(0xE5,0x8D,0x97),
-     o3(0xE6,0xA5,0xA0), o3(0xE8,0xBB,0x9F),
-     o3(0xE9,0x9B,0xA3), o3(0xE6,0xB1,0x9D),
-     o3(0xE4,0xBA,0x8C), o3(0xE5,0xB0,0xBC),
-     o3(0xE5,0xBC,0x90), o3(0xE8,0xBF,0xA9),
-     o3(0xE5,0x8C,0x82), o3(0xE8,0xB3,0x91),
-     o3(0xE8,0x82,0x89), o3(0xE8,0x99,0xB9),
-     o3(0xE5,0xBB,0xBF), o3(0xE6,0x97,0xA5),
-     o3(0xE4,0xB9,0xB3), o3(0xE5,0x85,0xA5),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C6 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C6_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C7_infos[95] = {
-     o3(0xE5,0xA6,0x82), o3(0xE5,0xB0,0xBF),
-     o3(0xE9,0x9F,0xAE), o3(0xE4,0xBB,0xBB),
-     o3(0xE5,0xA6,0x8A), o3(0xE5,0xBF,0x8D),
-     o3(0xE8,0xAA,0x8D), o3(0xE6,0xBF,0xA1),
-     o3(0xE7,0xA6,0xB0), o3(0xE7,0xA5,0xA2),
-     o3(0xE5,0xAF,0xA7), o3(0xE8,0x91,0xB1),
-     o3(0xE7,0x8C,0xAB), o3(0xE7,0x86,0xB1),
-     o3(0xE5,0xB9,0xB4), o3(0xE5,0xBF,0xB5),
-     o3(0xE6,0x8D,0xBB), o3(0xE6,0x92,0x9A),
-     o3(0xE7,0x87,0x83), o3(0xE7,0xB2,0x98),
-     o3(0xE4,0xB9,0x83), o3(0xE5,0xBB,0xBC),
-     o3(0xE4,0xB9,0x8B), o3(0xE5,0x9F,0x9C),
-     o3(0xE5,0x9A,0xA2), o3(0xE6,0x82,0xA9),
-     o3(0xE6,0xBF,0x83), o3(0xE7,0xB4,0x8D),
-     o3(0xE8,0x83,0xBD), o3(0xE8,0x84,0xB3),
-     o3(0xE8,0x86,0xBF), o3(0xE8,0xBE,0xB2),
-     o3(0xE8,0xA6,0x97), o3(0xE8,0x9A,0xA4),
-     o3(0xE5,0xB7,0xB4), o3(0xE6,0x8A,0x8A),
-     o3(0xE6,0x92,0xAD), o3(0xE8,0xA6,0x87),
-     o3(0xE6,0x9D,0xB7), o3(0xE6,0xB3,0xA2),
-     o3(0xE6,0xB4,0xBE), o3(0xE7,0x90,0xB6),
-     o3(0xE7,0xA0,0xB4), o3(0xE5,0xA9,0x86),
-     o3(0xE7,0xBD,0xB5), o3(0xE8,0x8A,0xAD),
-     o3(0xE9,0xA6,0xAC), o3(0xE4,0xBF,0xB3),
-     o3(0xE5,0xBB,0x83), o3(0xE6,0x8B,0x9D),
-     o3(0xE6,0x8E,0x92), o3(0xE6,0x95,0x97),
-     o3(0xE6,0x9D,0xAF), o3(0xE7,0x9B,0x83),
-     o3(0xE7,0x89,0x8C), o3(0xE8,0x83,0x8C),
-     o3(0xE8,0x82,0xBA), o3(0xE8,0xBC,0xA9),
-     o3(0xE9,0x85,0x8D), o3(0xE5,0x80,0x8D),
-     o3(0xE5,0x9F,0xB9), o3(0xE5,0xAA,0x92),
-     o3(0xE6,0xA2,0x85), o3(0xE6,0xA5,0xB3),
-     o3(0xE7,0x85,0xA4), o3(0xE7,0x8B,0xBD),
-     o3(0xE8,0xB2,0xB7), o3(0xE5,0xA3,0xB2),
-     o3(0xE8,0xB3,0xA0), o3(0xE9,0x99,0xAA),
-     o3(0xE9,0x80,0x99), o3(0xE8,0x9D,0xBF),
-     o3(0xE7,0xA7,0xA4), o3(0xE7,0x9F,0xA7),
-     o3(0xE8,0x90,0xA9), o3(0xE4,0xBC,0xAF),
-     o3(0xE5,0x89,0xA5), o3(0xE5,0x8D,0x9A),
-     o3(0xE6,0x8B,0x8D), o3(0xE6,0x9F,0x8F),
-     o3(0xE6,0xB3,0x8A), o3(0xE7,0x99,0xBD),
-     o3(0xE7,0xAE,0x94), o3(0xE7,0xB2,0x95),
-     o3(0xE8,0x88,0xB6), o3(0xE8,0x96,0x84),
-     o3(0xE8,0xBF,0xAB), o3(0xE6,0x9B,0x9D),
-     o3(0xE6,0xBC,0xA0), o3(0xE7,0x88,0x86),
-     o3(0xE7,0xB8,0x9B), o3(0xE8,0x8E,0xAB),
-     o3(0xE9,0xA7,0x81), o3(0xE9,0xBA,0xA6),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C7 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C7_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C8_infos[95] = {
-     o3(0xE5,0x87,0xBD), o3(0xE7,0xAE,0xB1),
-     o3(0xE7,0xA1,0xB2), o3(0xE7,0xAE,0xB8),
-     o3(0xE8,0x82,0x87), o3(0xE7,0xAD,0x88),
-     o3(0xE6,0xAB,0xA8), o3(0xE5,0xB9,0xA1),
-     o3(0xE8,0x82,0x8C), o3(0xE7,0x95,0x91),
-     o3(0xE7,0x95,0xA0), o3(0xE5,0x85,0xAB),
-     o3(0xE9,0x89,0xA2), o3(0xE6,0xBA,0x8C),
-     o3(0xE7,0x99,0xBA), o3(0xE9,0x86,0x97),
-     o3(0xE9,0xAB,0xAA), o3(0xE4,0xBC,0x90),
-     o3(0xE7,0xBD,0xB0), o3(0xE6,0x8A,0x9C),
-     o3(0xE7,0xAD,0x8F), o3(0xE9,0x96,0xA5),
-     o3(0xE9,0xB3,0xA9), o3(0xE5,0x99,0xBA),
-     o3(0xE5,0xA1,0x99), o3(0xE8,0x9B,0xA4),
-     o3(0xE9,0x9A,0xBC), o3(0xE4,0xBC,0xB4),
-     o3(0xE5,0x88,0xA4), o3(0xE5,0x8D,0x8A),
-     o3(0xE5,0x8F,0x8D), o3(0xE5,0x8F,0x9B),
-     o3(0xE5,0xB8,0x86), o3(0xE6,0x90,0xAC),
-     o3(0xE6,0x96,0x91), o3(0xE6,0x9D,0xBF),
-     o3(0xE6,0xB0,0xBE), o3(0xE6,0xB1,0x8E),
-     o3(0xE7,0x89,0x88), o3(0xE7,0x8A,0xAF),
-     o3(0xE7,0x8F,0xAD), o3(0xE7,0x95,0x94),
-     o3(0xE7,0xB9,0x81), o3(0xE8,0x88,0xAC),
-     o3(0xE8,0x97,0xA9), o3(0xE8,0xB2,0xA9),
-     o3(0xE7,0xAF,0x84), o3(0xE9,0x87,0x86),
-     o3(0xE7,0x85,0xA9), o3(0xE9,0xA0,0x92),
-     o3(0xE9,0xA3,0xAF), o3(0xE6,0x8C,0xBD),
-     o3(0xE6,0x99,0xA9), o3(0xE7,0x95,0xAA),
-     o3(0xE7,0x9B,0xA4), o3(0xE7,0xA3,0x90),
-     o3(0xE8,0x95,0x83), o3(0xE8,0x9B,0xAE),
-     o3(0xE5,0x8C,0xAA), o3(0xE5,0x8D,0x91),
-     o3(0xE5,0x90,0xA6), o3(0xE5,0xA6,0x83),
-     o3(0xE5,0xBA,0x87), o3(0xE5,0xBD,0xBC),
-     o3(0xE6,0x82,0xB2), o3(0xE6,0x89,0x89),
-     o3(0xE6,0x89,0xB9), o3(0xE6,0x8A,0xAB),
-     o3(0xE6,0x96,0x90), o3(0xE6,0xAF,0x94),
-     o3(0xE6,0xB3,0x8C), o3(0xE7,0x96,0xB2),
-     o3(0xE7,0x9A,0xAE), o3(0xE7,0xA2,0x91),
-     o3(0xE7,0xA7,0x98), o3(0xE7,0xB7,0x8B),
-     o3(0xE7,0xBD,0xB7), o3(0xE8,0x82,0xA5),
-     o3(0xE8,0xA2,0xAB), o3(0xE8,0xAA,0xB9),
-     o3(0xE8,0xB2,0xBB), o3(0xE9,0x81,0xBF),
-     o3(0xE9,0x9D,0x9E), o3(0xE9,0xA3,0x9B),
-     o3(0xE6,0xA8,0x8B), o3(0xE7,0xB0,0xB8),
-     o3(0xE5,0x82,0x99), o3(0xE5,0xB0,0xBE),
-     o3(0xE5,0xBE,0xAE), o3(0xE6,0x9E,0x87),
-     o3(0xE6,0xAF,0x98), o3(0xE7,0x90,0xB5),
-     o3(0xE7,0x9C,0x89), o3(0xE7,0xBE,0x8E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C8 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C8_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_C9_infos[95] = {
-     o3(0xE9,0xBC,0xBB), o3(0xE6,0x9F,0x8A),
-     o3(0xE7,0xA8,0x97), o3(0xE5,0x8C,0xB9),
-     o3(0xE7,0x96,0x8B), o3(0xE9,0xAB,0xAD),
-     o3(0xE5,0xBD,0xA6), o3(0xE8,0x86,0x9D),
-     o3(0xE8,0x8F,0xB1), o3(0xE8,0x82,0x98),
-     o3(0xE5,0xBC,0xBC), o3(0xE5,0xBF,0x85),
-     o3(0xE7,0x95,0xA2), o3(0xE7,0xAD,0x86),
-     o3(0xE9,0x80,0xBC), o3(0xE6,0xA1,0xA7),
-     o3(0xE5,0xA7,0xAB), o3(0xE5,0xAA,0x9B),
-     o3(0xE7,0xB4,0x90), o3(0xE7,0x99,0xBE),
-     o3(0xE8,0xAC,0xAC), o3(0xE4,0xBF,0xB5),
-     o3(0xE5,0xBD,0xAA), o3(0xE6,0xA8,0x99),
-     o3(0xE6,0xB0,0xB7), o3(0xE6,0xBC,0x82),
-     o3(0xE7,0x93,0xA2), o3(0xE7,0xA5,0xA8),
-     o3(0xE8,0xA1,0xA8), o3(0xE8,0xA9,0x95),
-     o3(0xE8,0xB1,0xB9), o3(0xE5,0xBB,0x9F),
-     o3(0xE6,0x8F,0x8F), o3(0xE7,0x97,0x85),
-     o3(0xE7,0xA7,0x92), o3(0xE8,0x8B,0x97),
-     o3(0xE9,0x8C,0xA8), o3(0xE9,0x8B,0xB2),
-     o3(0xE8,0x92,0x9C), o3(0xE8,0x9B,0xAD),
-     o3(0xE9,0xB0,0xAD), o3(0xE5,0x93,0x81),
-     o3(0xE5,0xBD,0xAC), o3(0xE6,0x96,0x8C),
-     o3(0xE6,0xB5,0x9C), o3(0xE7,0x80,0x95),
-     o3(0xE8,0xB2,0xA7), o3(0xE8,0xB3,0x93),
-     o3(0xE9,0xA0,0xBB), o3(0xE6,0x95,0x8F),
-     o3(0xE7,0x93,0xB6), o3(0xE4,0xB8,0x8D),
-     o3(0xE4,0xBB,0x98), o3(0xE5,0x9F,0xA0),
-     o3(0xE5,0xA4,0xAB), o3(0xE5,0xA9,0xA6),
-     o3(0xE5,0xAF,0x8C), o3(0xE5,0x86,0xA8),
-     o3(0xE5,0xB8,0x83), o3(0xE5,0xBA,0x9C),
-     o3(0xE6,0x80,0x96), o3(0xE6,0x89,0xB6),
-     o3(0xE6,0x95,0xB7), o3(0xE6,0x96,0xA7),
-     o3(0xE6,0x99,0xAE), o3(0xE6,0xB5,0xAE),
-     o3(0xE7,0x88,0xB6), o3(0xE7,0xAC,0xA6),
-     o3(0xE8,0x85,0x90), o3(0xE8,0x86,0x9A),
-     o3(0xE8,0x8A,0x99), o3(0xE8,0xAD,0x9C),
-     o3(0xE8,0xB2,0xA0), o3(0xE8,0xB3,0xA6),
-     o3(0xE8,0xB5,0xB4), o3(0xE9,0x98,0x9C),
-     o3(0xE9,0x99,0x84), o3(0xE4,0xBE,0xAE),
-     o3(0xE6,0x92,0xAB), o3(0xE6,0xAD,0xA6),
-     o3(0xE8,0x88,0x9E), o3(0xE8,0x91,0xA1),
-     o3(0xE8,0x95,0xAA), o3(0xE9,0x83,0xA8),
-     o3(0xE5,0xB0,0x81), o3(0xE6,0xA5,0x93),
-     o3(0xE9,0xA2,0xA8), o3(0xE8,0x91,0xBA),
-     o3(0xE8,0x95,0x97), o3(0xE4,0xBC,0x8F),
-     o3(0xE5,0x89,0xAF), o3(0xE5,0xBE,0xA9),
-     o3(0xE5,0xB9,0x85), o3(0xE6,0x9C,0x8D),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_C9 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_C9_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_CA_infos[95] = {
-     o3(0xE7,0xA6,0x8F), o3(0xE8,0x85,0xB9),
-     o3(0xE8,0xA4,0x87), o3(0xE8,0xA6,0x86),
-     o3(0xE6,0xB7,0xB5), o3(0xE5,0xBC,0x97),
-     o3(0xE6,0x89,0x95), o3(0xE6,0xB2,0xB8),
-     o3(0xE4,0xBB,0x8F), o3(0xE7,0x89,0xA9),
-     o3(0xE9,0xAE,0x92), o3(0xE5,0x88,0x86),
-     o3(0xE5,0x90,0xBB), o3(0xE5,0x99,0xB4),
-     o3(0xE5,0xA2,0xB3), o3(0xE6,0x86,0xA4),
-     o3(0xE6,0x89,0xAE), o3(0xE7,0x84,0x9A),
-     o3(0xE5,0xA5,0xAE), o3(0xE7,0xB2,0x89),
-     o3(0xE7,0xB3,0x9E), o3(0xE7,0xB4,0x9B),
-     o3(0xE9,0x9B,0xB0), o3(0xE6,0x96,0x87),
-     o3(0xE8,0x81,0x9E), o3(0xE4,0xB8,0x99),
-     o3(0xE4,0xBD,0xB5), o3(0xE5,0x85,0xB5),
-     o3(0xE5,0xA1,0x80), o3(0xE5,0xB9,0xA3),
-     o3(0xE5,0xB9,0xB3), o3(0xE5,0xBC,0x8A),
-     o3(0xE6,0x9F,0x84), o3(0xE4,0xB8,0xA6),
-     o3(0xE8,0x94,0xBD), o3(0xE9,0x96,0x89),
-     o3(0xE9,0x99,0x9B), o3(0xE7,0xB1,0xB3),
-     o3(0xE9,0xA0,0x81), o3(0xE5,0x83,0xBB),
-     o3(0xE5,0xA3,0x81), o3(0xE7,0x99,0x96),
-     o3(0xE7,0xA2,0xA7), o3(0xE5,0x88,0xA5),
-     o3(0xE7,0x9E,0xA5), o3(0xE8,0x94,0x91),
-     o3(0xE7,0xAE,0x86), o3(0xE5,0x81,0x8F),
-     o3(0xE5,0xA4,0x89), o3(0xE7,0x89,0x87),
-     o3(0xE7,0xAF,0x87), o3(0xE7,0xB7,0xA8),
-     o3(0xE8,0xBE,0xBA), o3(0xE8,0xBF,0x94),
-     o3(0xE9,0x81,0x8D), o3(0xE4,0xBE,0xBF),
-     o3(0xE5,0x8B,0x89), o3(0xE5,0xA8,0xA9),
-     o3(0xE5,0xBC,0x81), o3(0xE9,0x9E,0xAD),
-     o3(0xE4,0xBF,0x9D), o3(0xE8,0x88,0x97),
-     o3(0xE9,0x8B,0xAA), o3(0xE5,0x9C,0x83),
-     o3(0xE6,0x8D,0x95), o3(0xE6,0xAD,0xA9),
-     o3(0xE7,0x94,0xAB), o3(0xE8,0xA3,0x9C),
-     o3(0xE8,0xBC,0x94), o3(0xE7,0xA9,0x82),
-     o3(0xE5,0x8B,0x9F), o3(0xE5,0xA2,0x93),
-     o3(0xE6,0x85,0x95), o3(0xE6,0x88,0x8A),
-     o3(0xE6,0x9A,0xAE), o3(0xE6,0xAF,0x8D),
-     o3(0xE7,0xB0,0xBF), o3(0xE8,0x8F,0xA9),
-     o3(0xE5,0x80,0xA3), o3(0xE4,0xBF,0xB8),
-     o3(0xE5,0x8C,0x85), o3(0xE5,0x91,0x86),
-     o3(0xE5,0xA0,0xB1), o3(0xE5,0xA5,0x89),
-     o3(0xE5,0xAE,0x9D), o3(0xE5,0xB3,0xB0),
-     o3(0xE5,0xB3,0xAF), o3(0xE5,0xB4,0xA9),
-     o3(0xE5,0xBA,0x96), o3(0xE6,0x8A,0xB1),
-     o3(0xE6,0x8D,0xA7), o3(0xE6,0x94,0xBE),
-     o3(0xE6,0x96,0xB9), o3(0xE6,0x9C,0x8B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CA = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_CA_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_CB_infos[95] = {
-     o3(0xE6,0xB3,0x95), o3(0xE6,0xB3,0xA1),
-     o3(0xE7,0x83,0xB9), o3(0xE7,0xA0,0xB2),
-     o3(0xE7,0xB8,0xAB), o3(0xE8,0x83,0x9E),
-     o3(0xE8,0x8A,0xB3), o3(0xE8,0x90,0x8C),
-     o3(0xE8,0x93,0xAC), o3(0xE8,0x9C,0x82),
-     o3(0xE8,0xA4,0x92), o3(0xE8,0xA8,0xAA),
-     o3(0xE8,0xB1,0x8A), o3(0xE9,0x82,0xA6),
-     o3(0xE9,0x8B,0x92), o3(0xE9,0xA3,0xBD),
-     o3(0xE9,0xB3,0xB3), o3(0xE9,0xB5,0xAC),
-     o3(0xE4,0xB9,0x8F), o3(0xE4,0xBA,0xA1),
-     o3(0xE5,0x82,0x8D), o3(0xE5,0x89,0x96),
-     o3(0xE5,0x9D,0x8A), o3(0xE5,0xA6,0xA8),
-     o3(0xE5,0xB8,0xBD), o3(0xE5,0xBF,0x98),
-     o3(0xE5,0xBF,0x99), o3(0xE6,0x88,0xBF),
-     o3(0xE6,0x9A,0xB4), o3(0xE6,0x9C,0x9B),
-     o3(0xE6,0x9F,0x90), o3(0xE6,0xA3,0x92),
-     o3(0xE5,0x86,0x92), o3(0xE7,0xB4,0xA1),
-     o3(0xE8,0x82,0xAA), o3(0xE8,0x86,0xA8),
-     o3(0xE8,0xAC,0x80), o3(0xE8,0xB2,0x8C),
-     o3(0xE8,0xB2,0xBF), o3(0xE9,0x89,0xBE),
-     o3(0xE9,0x98,0xB2), o3(0xE5,0x90,0xA0),
-     o3(0xE9,0xA0,0xAC), o3(0xE5,0x8C,0x97),
-     o3(0xE5,0x83,0x95), o3(0xE5,0x8D,0x9C),
-     o3(0xE5,0xA2,0xA8), o3(0xE6,0x92,0xB2),
-     o3(0xE6,0x9C,0xB4), o3(0xE7,0x89,0xA7),
-     o3(0xE7,0x9D,0xA6), o3(0xE7,0xA9,0x86),
-     o3(0xE9,0x87,0xA6), o3(0xE5,0x8B,0x83),
-     o3(0xE6,0xB2,0xA1), o3(0xE6,0xAE,0x86),
-     o3(0xE5,0xA0,0x80), o3(0xE5,0xB9,0x8C),
-     o3(0xE5,0xA5,0x94), o3(0xE6,0x9C,0xAC),
-     o3(0xE7,0xBF,0xBB), o3(0xE5,0x87,0xA1),
-     o3(0xE7,0x9B,0x86), o3(0xE6,0x91,0xA9),
-     o3(0xE7,0xA3,0xA8), o3(0xE9,0xAD,0x94),
-     o3(0xE9,0xBA,0xBB), o3(0xE5,0x9F,0x8B),
-     o3(0xE5,0xA6,0xB9), o3(0xE6,0x98,0xA7),
-     o3(0xE6,0x9E,0x9A), o3(0xE6,0xAF,0x8E),
-     o3(0xE5,0x93,0xA9), o3(0xE6,0xA7,0x99),
-     o3(0xE5,0xB9,0x95), o3(0xE8,0x86,0x9C),
-     o3(0xE6,0x9E,0x95), o3(0xE9,0xAE,0xAA),
-     o3(0xE6,0x9F,0xBE), o3(0xE9,0xB1,0x92),
-     o3(0xE6,0xA1,0x9D), o3(0xE4,0xBA,0xA6),
-     o3(0xE4,0xBF,0xA3), o3(0xE5,0x8F,0x88),
-     o3(0xE6,0x8A,0xB9), o3(0xE6,0x9C,0xAB),
-     o3(0xE6,0xB2,0xAB), o3(0xE8,0xBF,0x84),
-     o3(0xE4,0xBE,0xAD), o3(0xE7,0xB9,0xAD),
-     o3(0xE9,0xBA,0xBF), o3(0xE4,0xB8,0x87),
-     o3(0xE6,0x85,0xA2), o3(0xE6,0xBA,0x80),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CB = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_CB_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_CC_infos[95] = {
-     o3(0xE6,0xBC,0xAB), o3(0xE8,0x94,0x93),
-     o3(0xE5,0x91,0xB3), o3(0xE6,0x9C,0xAA),
-     o3(0xE9,0xAD,0x85), o3(0xE5,0xB7,0xB3),
-     o3(0xE7,0xAE,0x95), o3(0xE5,0xB2,0xAC),
-     o3(0xE5,0xAF,0x86), o3(0xE8,0x9C,0x9C),
-     o3(0xE6,0xB9,0x8A), o3(0xE8,0x93,0x91),
-     o3(0xE7,0xA8,0x94), o3(0xE8,0x84,0x88),
-     o3(0xE5,0xA6,0x99), o3(0xE7,0xB2,0x8D),
-     o3(0xE6,0xB0,0x91), o3(0xE7,0x9C,0xA0),
-     o3(0xE5,0x8B,0x99), o3(0xE5,0xA4,0xA2),
-     o3(0xE7,0x84,0xA1), o3(0xE7,0x89,0x9F),
-     o3(0xE7,0x9F,0x9B), o3(0xE9,0x9C,0xA7),
-     o3(0xE9,0xB5,0xA1), o3(0xE6,0xA4,0x8B),
-     o3(0xE5,0xA9,0xBF), o3(0xE5,0xA8,0x98),
-     o3(0xE5,0x86,0xA5), o3(0xE5,0x90,0x8D),
-     o3(0xE5,0x91,0xBD), o3(0xE6,0x98,0x8E),
-     o3(0xE7,0x9B,0x9F), o3(0xE8,0xBF,0xB7),
-     o3(0xE9,0x8A,0x98), o3(0xE9,0xB3,0xB4),
-     o3(0xE5,0xA7,0xAA), o3(0xE7,0x89,0x9D),
-     o3(0xE6,0xBB,0x85), o3(0xE5,0x85,0x8D),
-     o3(0xE6,0xA3,0x89), o3(0xE7,0xB6,0xBF),
-     o3(0xE7,0xB7,0xAC), o3(0xE9,0x9D,0xA2),
-     o3(0xE9,0xBA,0xBA), o3(0xE6,0x91,0xB8),
-     o3(0xE6,0xA8,0xA1), o3(0xE8,0x8C,0x82),
-     o3(0xE5,0xA6,0x84), o3(0xE5,0xAD,0x9F),
-     o3(0xE6,0xAF,0x9B), o3(0xE7,0x8C,0x9B),
-     o3(0xE7,0x9B,0xB2), o3(0xE7,0xB6,0xB2),
-     o3(0xE8,0x80,0x97), o3(0xE8,0x92,0x99),
-     o3(0xE5,0x84,0xB2), o3(0xE6,0x9C,0xA8),
-     o3(0xE9,0xBB,0x99), o3(0xE7,0x9B,0xAE),
-     o3(0xE6,0x9D,0xA2), o3(0xE5,0x8B,0xBF),
-     o3(0xE9,0xA4,0x85), o3(0xE5,0xB0,0xA4),
-     o3(0xE6,0x88,0xBB), o3(0xE7,0xB1,0xBE),
-     o3(0xE8,0xB2,0xB0), o3(0xE5,0x95,0x8F),
-     o3(0xE6,0x82,0xB6), o3(0xE7,0xB4,0x8B),
-     o3(0xE9,0x96,0x80), o3(0xE5,0x8C,0x81),
-     o3(0xE4,0xB9,0x9F), o3(0xE5,0x86,0xB6),
-     o3(0xE5,0xA4,0x9C), o3(0xE7,0x88,0xBA),
-     o3(0xE8,0x80,0xB6), o3(0xE9,0x87,0x8E),
-     o3(0xE5,0xBC,0xA5), o3(0xE7,0x9F,0xA2),
-     o3(0xE5,0x8E,0x84), o3(0xE5,0xBD,0xB9),
-     o3(0xE7,0xB4,0x84), o3(0xE8,0x96,0xAC),
-     o3(0xE8,0xA8,0xB3), o3(0xE8,0xBA,0x8D),
-     o3(0xE9,0x9D,0x96), o3(0xE6,0x9F,0xB3),
-     o3(0xE8,0x96,0xAE), o3(0xE9,0x91,0x93),
-     o3(0xE6,0x84,0x89), o3(0xE6,0x84,0x88),
-     o3(0xE6,0xB2,0xB9), o3(0xE7,0x99,0x92),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CC = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_CC_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_CD_infos[95] = {
-     o3(0xE8,0xAB,0xAD), o3(0xE8,0xBC,0xB8),
-     o3(0xE5,0x94,0xAF), o3(0xE4,0xBD,0x91),
-     o3(0xE5,0x84,0xAA), o3(0xE5,0x8B,0x87),
-     o3(0xE5,0x8F,0x8B), o3(0xE5,0xAE,0xA5),
-     o3(0xE5,0xB9,0xBD), o3(0xE6,0x82,0xA0),
-     o3(0xE6,0x86,0x82), o3(0xE6,0x8F,0x96),
-     o3(0xE6,0x9C,0x89), o3(0xE6,0x9F,0x9A),
-     o3(0xE6,0xB9,0xA7), o3(0xE6,0xB6,0x8C),
-     o3(0xE7,0x8C,0xB6), o3(0xE7,0x8C,0xB7),
-     o3(0xE7,0x94,0xB1), o3(0xE7,0xA5,0x90),
-     o3(0xE8,0xA3,0x95), o3(0xE8,0xAA,0x98),
-     o3(0xE9,0x81,0x8A), o3(0xE9,0x82,0x91),
-     o3(0xE9,0x83,0xB5), o3(0xE9,0x9B,0x84),
-     o3(0xE8,0x9E,0x8D), o3(0xE5,0xA4,0x95),
-     o3(0xE4,0xBA,0x88), o3(0xE4,0xBD,0x99),
-     o3(0xE4,0xB8,0x8E), o3(0xE8,0xAA,0x89),
-     o3(0xE8,0xBC,0xBF), o3(0xE9,0xA0,0x90),
-     o3(0xE5,0x82,0xAD), o3(0xE5,0xB9,0xBC),
-     o3(0xE5,0xA6,0x96), o3(0xE5,0xAE,0xB9),
-     o3(0xE5,0xBA,0xB8), o3(0xE6,0x8F,0x9A),
-     o3(0xE6,0x8F,0xBA), o3(0xE6,0x93,0x81),
-     o3(0xE6,0x9B,0x9C), o3(0xE6,0xA5,0x8A),
-     o3(0xE6,0xA7,0x98), o3(0xE6,0xB4,0x8B),
-     o3(0xE6,0xBA,0xB6), o3(0xE7,0x86,0x94),
-     o3(0xE7,0x94,0xA8), o3(0xE7,0xAA,0xAF),
-     o3(0xE7,0xBE,0x8A), o3(0xE8,0x80,0x80),
-     o3(0xE8,0x91,0x89), o3(0xE8,0x93,0x89),
-     o3(0xE8,0xA6,0x81), o3(0xE8,0xAC,0xA1),
-     o3(0xE8,0xB8,0x8A), o3(0xE9,0x81,0xA5),
-     o3(0xE9,0x99,0xBD), o3(0xE9,0xA4,0x8A),
-     o3(0xE6,0x85,0xBE), o3(0xE6,0x8A,0x91),
-     o3(0xE6,0xAC,0xB2), o3(0xE6,0xB2,0x83),
-     o3(0xE6,0xB5,0xB4), o3(0xE7,0xBF,0x8C),
-     o3(0xE7,0xBF,0xBC), o3(0xE6,0xB7,0x80),
-     o3(0xE7,0xBE,0x85), o3(0xE8,0x9E,0xBA),
-     o3(0xE8,0xA3,0xB8), o3(0xE6,0x9D,0xA5),
-     o3(0xE8,0x8E,0xB1), o3(0xE9,0xA0,0xBC),
-     o3(0xE9,0x9B,0xB7), o3(0xE6,0xB4,0x9B),
-     o3(0xE7,0xB5,0xA1), o3(0xE8,0x90,0xBD),
-     o3(0xE9,0x85,0xAA), o3(0xE4,0xB9,0xB1),
-     o3(0xE5,0x8D,0xB5), o3(0xE5,0xB5,0x90),
-     o3(0xE6,0xAC,0x84), o3(0xE6,0xBF,0xAB),
-     o3(0xE8,0x97,0x8D), o3(0xE8,0x98,0xAD),
-     o3(0xE8,0xA6,0xA7), o3(0xE5,0x88,0xA9),
-     o3(0xE5,0x90,0x8F), o3(0xE5,0xB1,0xA5),
-     o3(0xE6,0x9D,0x8E), o3(0xE6,0xA2,0xA8),
-     o3(0xE7,0x90,0x86), o3(0xE7,0x92,0x83),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CD = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_CD_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_CE_infos[95] = {
-     o3(0xE7,0x97,0xA2), o3(0xE8,0xA3,0x8F),
-     o3(0xE8,0xA3,0xA1), o3(0xE9,0x87,0x8C),
-     o3(0xE9,0x9B,0xA2), o3(0xE9,0x99,0xB8),
-     o3(0xE5,0xBE,0x8B), o3(0xE7,0x8E,0x87),
-     o3(0xE7,0xAB,0x8B), o3(0xE8,0x91,0x8E),
-     o3(0xE6,0x8E,0xA0), o3(0xE7,0x95,0xA5),
-     o3(0xE5,0x8A,0x89), o3(0xE6,0xB5,0x81),
-     o3(0xE6,0xBA,0x9C), o3(0xE7,0x90,0x89),
-     o3(0xE7,0x95,0x99), o3(0xE7,0xA1,0xAB),
-     o3(0xE7,0xB2,0x92), o3(0xE9,0x9A,0x86),
-     o3(0xE7,0xAB,0x9C), o3(0xE9,0xBE,0x8D),
-     o3(0xE4,0xBE,0xB6), o3(0xE6,0x85,0xAE),
-     o3(0xE6,0x97,0x85), o3(0xE8,0x99,0x9C),
-     o3(0xE4,0xBA,0x86), o3(0xE4,0xBA,0xAE),
-     o3(0xE5,0x83,0x9A), o3(0xE4,0xB8,0xA1),
-     o3(0xE5,0x87,0x8C), o3(0xE5,0xAF,0xAE),
-     o3(0xE6,0x96,0x99), o3(0xE6,0xA2,0x81),
-     o3(0xE6,0xB6,0xBC), o3(0xE7,0x8C,0x9F),
-     o3(0xE7,0x99,0x82), o3(0xE7,0x9E,0xAD),
-     o3(0xE7,0xA8,0x9C), o3(0xE7,0xB3,0xA7),
-     o3(0xE8,0x89,0xAF), o3(0xE8,0xAB,0x92),
-     o3(0xE9,0x81,0xBC), o3(0xE9,0x87,0x8F),
-     o3(0xE9,0x99,0xB5), o3(0xE9,0xA0,0x98),
-     o3(0xE5,0x8A,0x9B), o3(0xE7,0xB7,0x91),
-     o3(0xE5,0x80,0xAB), o3(0xE5,0x8E,0x98),
-     o3(0xE6,0x9E,0x97), o3(0xE6,0xB7,0x8B),
-     o3(0xE7,0x87,0x90), o3(0xE7,0x90,0xB3),
-     o3(0xE8,0x87,0xA8), o3(0xE8,0xBC,0xAA),
-     o3(0xE9,0x9A,0xA3), o3(0xE9,0xB1,0x97),
-     o3(0xE9,0xBA,0x9F), o3(0xE7,0x91,0xA0),
-     o3(0xE5,0xA1,0x81), o3(0xE6,0xB6,0x99),
-     o3(0xE7,0xB4,0xAF), o3(0xE9,0xA1,0x9E),
-     o3(0xE4,0xBB,0xA4), o3(0xE4,0xBC,0xB6),
-     o3(0xE4,0xBE,0x8B), o3(0xE5,0x86,0xB7),
-     o3(0xE5,0x8A,0xB1), o3(0xE5,0xB6,0xBA),
-     o3(0xE6,0x80,0x9C), o3(0xE7,0x8E,0xB2),
-     o3(0xE7,0xA4,0xBC), o3(0xE8,0x8B,0x93),
-     o3(0xE9,0x88,0xB4), o3(0xE9,0x9A,0xB7),
-     o3(0xE9,0x9B,0xB6), o3(0xE9,0x9C,0x8A),
-     o3(0xE9,0xBA,0x97), o3(0xE9,0xBD,0xA2),
-     o3(0xE6,0x9A,0xA6), o3(0xE6,0xAD,0xB4),
-     o3(0xE5,0x88,0x97), o3(0xE5,0x8A,0xA3),
-     o3(0xE7,0x83,0x88), o3(0xE8,0xA3,0x82),
-     o3(0xE5,0xBB,0x89), o3(0xE6,0x81,0x8B),
-     o3(0xE6,0x86,0x90), o3(0xE6,0xBC,0xA3),
-     o3(0xE7,0x85,0x89), o3(0xE7,0xB0,0xBE),
-     o3(0xE7,0xB7,0xB4), o3(0xE8,0x81,0xAF),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CE = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_CE_infos
-};
-
-static const unsigned char
-from_EUC_JP_CF_offsets[256] = {
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-     51, 51, 51, 51, 51, 51, 51, 51,   51, 51, 51, 51, 51, 51, 51, 51,
-};
-static const struct byte_lookup* const
-from_EUC_JP_CF_infos[52] = {
-     o3(0xE8,0x93,0xAE), o3(0xE9,0x80,0xA3),
-     o3(0xE9,0x8C,0xAC), o3(0xE5,0x91,0x82),
-     o3(0xE9,0xAD,0xAF), o3(0xE6,0xAB,0x93),
-     o3(0xE7,0x82,0x89), o3(0xE8,0xB3,0x82),
-     o3(0xE8,0xB7,0xAF), o3(0xE9,0x9C,0xB2),
-     o3(0xE5,0x8A,0xB4), o3(0xE5,0xA9,0x81),
-     o3(0xE5,0xBB,0x8A), o3(0xE5,0xBC,0x84),
-     o3(0xE6,0x9C,0x97), o3(0xE6,0xA5,0xBC),
-     o3(0xE6,0xA6,0x94), o3(0xE6,0xB5,0xAA),
-     o3(0xE6,0xBC,0x8F), o3(0xE7,0x89,0xA2),
-     o3(0xE7,0x8B,0xBC), o3(0xE7,0xAF,0xAD),
-     o3(0xE8,0x80,0x81), o3(0xE8,0x81,0xBE),
-     o3(0xE8,0x9D,0x8B), o3(0xE9,0x83,0x8E),
-     o3(0xE5,0x85,0xAD), o3(0xE9,0xBA,0x93),
-     o3(0xE7,0xA6,0x84), o3(0xE8,0x82,0x8B),
-     o3(0xE9,0x8C,0xB2), o3(0xE8,0xAB,0x96),
-     o3(0xE5,0x80,0xAD), o3(0xE5,0x92,0x8C),
-     o3(0xE8,0xA9,0xB1), o3(0xE6,0xAD,0xAA),
-     o3(0xE8,0xB3,0x84), o3(0xE8,0x84,0x87),
-     o3(0xE6,0x83,0x91), o3(0xE6,0x9E,0xA0),
-     o3(0xE9,0xB7,0xB2), o3(0xE4,0xBA,0x99),
-     o3(0xE4,0xBA,0x98), o3(0xE9,0xB0,0x90),
-     o3(0xE8,0xA9,0xAB), o3(0xE8,0x97,0x81),
-     o3(0xE8,0x95,0xA8), o3(0xE6,0xA4,0x80),
-     o3(0xE6,0xB9,0xBE), o3(0xE7,0xA2,0x97),
-     o3(0xE8,0x85,0x95),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_CF = {
-    from_EUC_JP_CF_offsets,
-    from_EUC_JP_CF_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D0_infos[95] = {
-     o3(0xE5,0xBC,0x8C), o3(0xE4,0xB8,0x90),
-     o3(0xE4,0xB8,0x95), o3(0xE4,0xB8,0xAA),
-     o3(0xE4,0xB8,0xB1), o3(0xE4,0xB8,0xB6),
-     o3(0xE4,0xB8,0xBC), o3(0xE4,0xB8,0xBF),
-     o3(0xE4,0xB9,0x82), o3(0xE4,0xB9,0x96),
-     o3(0xE4,0xB9,0x98), o3(0xE4,0xBA,0x82),
-     o3(0xE4,0xBA,0x85), o3(0xE8,0xB1,0xAB),
-     o3(0xE4,0xBA,0x8A), o3(0xE8,0x88,0x92),
-     o3(0xE5,0xBC,0x8D), o3(0xE4,0xBA,0x8E),
-     o3(0xE4,0xBA,0x9E), o3(0xE4,0xBA,0x9F),
-     o3(0xE4,0xBA,0xA0), o3(0xE4,0xBA,0xA2),
-     o3(0xE4,0xBA,0xB0), o3(0xE4,0xBA,0xB3),
-     o3(0xE4,0xBA,0xB6), o3(0xE4,0xBB,0x8E),
-     o3(0xE4,0xBB,0x8D), o3(0xE4,0xBB,0x84),
-     o3(0xE4,0xBB,0x86), o3(0xE4,0xBB,0x82),
-     o3(0xE4,0xBB,0x97), o3(0xE4,0xBB,0x9E),
-     o3(0xE4,0xBB,0xAD), o3(0xE4,0xBB,0x9F),
-     o3(0xE4,0xBB,0xB7), o3(0xE4,0xBC,0x89),
-     o3(0xE4,0xBD,0x9A), o3(0xE4,0xBC,0xB0),
-     o3(0xE4,0xBD,0x9B), o3(0xE4,0xBD,0x9D),
-     o3(0xE4,0xBD,0x97), o3(0xE4,0xBD,0x87),
-     o3(0xE4,0xBD,0xB6), o3(0xE4,0xBE,0x88),
-     o3(0xE4,0xBE,0x8F), o3(0xE4,0xBE,0x98),
-     o3(0xE4,0xBD,0xBB), o3(0xE4,0xBD,0xA9),
-     o3(0xE4,0xBD,0xB0), o3(0xE4,0xBE,0x91),
-     o3(0xE4,0xBD,0xAF), o3(0xE4,0xBE,0x86),
-     o3(0xE4,0xBE,0x96), o3(0xE5,0x84,0x98),
-     o3(0xE4,0xBF,0x94), o3(0xE4,0xBF,0x9F),
-     o3(0xE4,0xBF,0x8E), o3(0xE4,0xBF,0x98),
-     o3(0xE4,0xBF,0x9B), o3(0xE4,0xBF,0x91),
-     o3(0xE4,0xBF,0x9A), o3(0xE4,0xBF,0x90),
-     o3(0xE4,0xBF,0xA4), o3(0xE4,0xBF,0xA5),
-     o3(0xE5,0x80,0x9A), o3(0xE5,0x80,0xA8),
-     o3(0xE5,0x80,0x94), o3(0xE5,0x80,0xAA),
-     o3(0xE5,0x80,0xA5), o3(0xE5,0x80,0x85),
-     o3(0xE4,0xBC,0x9C), o3(0xE4,0xBF,0xB6),
-     o3(0xE5,0x80,0xA1), o3(0xE5,0x80,0xA9),
-     o3(0xE5,0x80,0xAC), o3(0xE4,0xBF,0xBE),
-     o3(0xE4,0xBF,0xAF), o3(0xE5,0x80,0x91),
-     o3(0xE5,0x80,0x86), o3(0xE5,0x81,0x83),
-     o3(0xE5,0x81,0x87), o3(0xE6,0x9C,0x83),
-     o3(0xE5,0x81,0x95), o3(0xE5,0x81,0x90),
-     o3(0xE5,0x81,0x88), o3(0xE5,0x81,0x9A),
-     o3(0xE5,0x81,0x96), o3(0xE5,0x81,0xAC),
-     o3(0xE5,0x81,0xB8), o3(0xE5,0x82,0x80),
-     o3(0xE5,0x82,0x9A), o3(0xE5,0x82,0x85),
-     o3(0xE5,0x82,0xB4), o3(0xE5,0x82,0xB2),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D0 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D0_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D1_infos[95] = {
-     o3(0xE5,0x83,0x89), o3(0xE5,0x83,0x8A),
-     o3(0xE5,0x82,0xB3), o3(0xE5,0x83,0x82),
-     o3(0xE5,0x83,0x96), o3(0xE5,0x83,0x9E),
-     o3(0xE5,0x83,0xA5), o3(0xE5,0x83,0xAD),
-     o3(0xE5,0x83,0xA3), o3(0xE5,0x83,0xAE),
-     o3(0xE5,0x83,0xB9), o3(0xE5,0x83,0xB5),
-     o3(0xE5,0x84,0x89), o3(0xE5,0x84,0x81),
-     o3(0xE5,0x84,0x82), o3(0xE5,0x84,0x96),
-     o3(0xE5,0x84,0x95), o3(0xE5,0x84,0x94),
-     o3(0xE5,0x84,0x9A), o3(0xE5,0x84,0xA1),
-     o3(0xE5,0x84,0xBA), o3(0xE5,0x84,0xB7),
-     o3(0xE5,0x84,0xBC), o3(0xE5,0x84,0xBB),
-     o3(0xE5,0x84,0xBF), o3(0xE5,0x85,0x80),
-     o3(0xE5,0x85,0x92), o3(0xE5,0x85,0x8C),
-     o3(0xE5,0x85,0x94), o3(0xE5,0x85,0xA2),
-     o3(0xE7,0xAB,0xB8), o3(0xE5,0x85,0xA9),
-     o3(0xE5,0x85,0xAA), o3(0xE5,0x85,0xAE),
-     o3(0xE5,0x86,0x80), o3(0xE5,0x86,0x82),
-     o3(0xE5,0x9B,0x98), o3(0xE5,0x86,0x8C),
-     o3(0xE5,0x86,0x89), o3(0xE5,0x86,0x8F),
-     o3(0xE5,0x86,0x91), o3(0xE5,0x86,0x93),
-     o3(0xE5,0x86,0x95), o3(0xE5,0x86,0x96),
-     o3(0xE5,0x86,0xA4), o3(0xE5,0x86,0xA6),
-     o3(0xE5,0x86,0xA2), o3(0xE5,0x86,0xA9),
-     o3(0xE5,0x86,0xAA), o3(0xE5,0x86,0xAB),
-     o3(0xE5,0x86,0xB3), o3(0xE5,0x86,0xB1),
-     o3(0xE5,0x86,0xB2), o3(0xE5,0x86,0xB0),
-     o3(0xE5,0x86,0xB5), o3(0xE5,0x86,0xBD),
-     o3(0xE5,0x87,0x85), o3(0xE5,0x87,0x89),
-     o3(0xE5,0x87,0x9B), o3(0xE5,0x87,0xA0),
-     o3(0xE8,0x99,0x95), o3(0xE5,0x87,0xA9),
-     o3(0xE5,0x87,0xAD), o3(0xE5,0x87,0xB0),
-     o3(0xE5,0x87,0xB5), o3(0xE5,0x87,0xBE),
-     o3(0xE5,0x88,0x84), o3(0xE5,0x88,0x8B),
-     o3(0xE5,0x88,0x94), o3(0xE5,0x88,0x8E),
-     o3(0xE5,0x88,0xA7), o3(0xE5,0x88,0xAA),
-     o3(0xE5,0x88,0xAE), o3(0xE5,0x88,0xB3),
-     o3(0xE5,0x88,0xB9), o3(0xE5,0x89,0x8F),
-     o3(0xE5,0x89,0x84), o3(0xE5,0x89,0x8B),
-     o3(0xE5,0x89,0x8C), o3(0xE5,0x89,0x9E),
-     o3(0xE5,0x89,0x94), o3(0xE5,0x89,0xAA),
-     o3(0xE5,0x89,0xB4), o3(0xE5,0x89,0xA9),
-     o3(0xE5,0x89,0xB3), o3(0xE5,0x89,0xBF),
-     o3(0xE5,0x89,0xBD), o3(0xE5,0x8A,0x8D),
-     o3(0xE5,0x8A,0x94), o3(0xE5,0x8A,0x92),
-     o3(0xE5,0x89,0xB1), o3(0xE5,0x8A,0x88),
-     o3(0xE5,0x8A,0x91), o3(0xE8,0xBE,0xA8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D1_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D2_infos[95] = {
-     o3(0xE8,0xBE,0xA7), o3(0xE5,0x8A,0xAC),
-     o3(0xE5,0x8A,0xAD), o3(0xE5,0x8A,0xBC),
-     o3(0xE5,0x8A,0xB5), o3(0xE5,0x8B,0x81),
-     o3(0xE5,0x8B,0x8D), o3(0xE5,0x8B,0x97),
-     o3(0xE5,0x8B,0x9E), o3(0xE5,0x8B,0xA3),
-     o3(0xE5,0x8B,0xA6), o3(0xE9,0xA3,0xAD),
-     o3(0xE5,0x8B,0xA0), o3(0xE5,0x8B,0xB3),
-     o3(0xE5,0x8B,0xB5), o3(0xE5,0x8B,0xB8),
-     o3(0xE5,0x8B,0xB9), o3(0xE5,0x8C,0x86),
-     o3(0xE5,0x8C,0x88), o3(0xE7,0x94,0xB8),
-     o3(0xE5,0x8C,0x8D), o3(0xE5,0x8C,0x90),
-     o3(0xE5,0x8C,0x8F), o3(0xE5,0x8C,0x95),
-     o3(0xE5,0x8C,0x9A), o3(0xE5,0x8C,0xA3),
-     o3(0xE5,0x8C,0xAF), o3(0xE5,0x8C,0xB1),
-     o3(0xE5,0x8C,0xB3), o3(0xE5,0x8C,0xB8),
-     o3(0xE5,0x8D,0x80), o3(0xE5,0x8D,0x86),
-     o3(0xE5,0x8D,0x85), o3(0xE4,0xB8,0x97),
-     o3(0xE5,0x8D,0x89), o3(0xE5,0x8D,0x8D),
-     o3(0xE5,0x87,0x96), o3(0xE5,0x8D,0x9E),
-     o3(0xE5,0x8D,0xA9), o3(0xE5,0x8D,0xAE),
-     o3(0xE5,0xA4,0x98), o3(0xE5,0x8D,0xBB),
-     o3(0xE5,0x8D,0xB7), o3(0xE5,0x8E,0x82),
-     o3(0xE5,0x8E,0x96), o3(0xE5,0x8E,0xA0),
-     o3(0xE5,0x8E,0xA6), o3(0xE5,0x8E,0xA5),
-     o3(0xE5,0x8E,0xAE), o3(0xE5,0x8E,0xB0),
-     o3(0xE5,0x8E,0xB6), o3(0xE5,0x8F,0x83),
-     o3(0xE7,0xB0,0x92), o3(0xE9,0x9B,0x99),
-     o3(0xE5,0x8F,0x9F), o3(0xE6,0x9B,0xBC),
-     o3(0xE7,0x87,0xAE), o3(0xE5,0x8F,0xAE),
-     o3(0xE5,0x8F,0xA8), o3(0xE5,0x8F,0xAD),
-     o3(0xE5,0x8F,0xBA), o3(0xE5,0x90,0x81),
-     o3(0xE5,0x90,0xBD), o3(0xE5,0x91,0x80),
-     o3(0xE5,0x90,0xAC), o3(0xE5,0x90,0xAD),
-     o3(0xE5,0x90,0xBC), o3(0xE5,0x90,0xAE),
-     o3(0xE5,0x90,0xB6), o3(0xE5,0x90,0xA9),
-     o3(0xE5,0x90,0x9D), o3(0xE5,0x91,0x8E),
-     o3(0xE5,0x92,0x8F), o3(0xE5,0x91,0xB5),
-     o3(0xE5,0x92,0x8E), o3(0xE5,0x91,0x9F),
-     o3(0xE5,0x91,0xB1), o3(0xE5,0x91,0xB7),
-     o3(0xE5,0x91,0xB0), o3(0xE5,0x92,0x92),
-     o3(0xE5,0x91,0xBB), o3(0xE5,0x92,0x80),
-     o3(0xE5,0x91,0xB6), o3(0xE5,0x92,0x84),
-     o3(0xE5,0x92,0x90), o3(0xE5,0x92,0x86),
-     o3(0xE5,0x93,0x87), o3(0xE5,0x92,0xA2),
-     o3(0xE5,0x92,0xB8), o3(0xE5,0x92,0xA5),
-     o3(0xE5,0x92,0xAC), o3(0xE5,0x93,0x84),
-     o3(0xE5,0x93,0x88), o3(0xE5,0x92,0xA8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D2 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D2_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D3_infos[95] = {
-     o3(0xE5,0x92,0xAB), o3(0xE5,0x93,0x82),
-     o3(0xE5,0x92,0xA4), o3(0xE5,0x92,0xBE),
-     o3(0xE5,0x92,0xBC), o3(0xE5,0x93,0x98),
-     o3(0xE5,0x93,0xA5), o3(0xE5,0x93,0xA6),
-     o3(0xE5,0x94,0x8F), o3(0xE5,0x94,0x94),
-     o3(0xE5,0x93,0xBD), o3(0xE5,0x93,0xAE),
-     o3(0xE5,0x93,0xAD), o3(0xE5,0x93,0xBA),
-     o3(0xE5,0x93,0xA2), o3(0xE5,0x94,0xB9),
-     o3(0xE5,0x95,0x80), o3(0xE5,0x95,0xA3),
-     o3(0xE5,0x95,0x8C), o3(0xE5,0x94,0xAE),
-     o3(0xE5,0x95,0x9C), o3(0xE5,0x95,0x85),
-     o3(0xE5,0x95,0x96), o3(0xE5,0x95,0x97),
-     o3(0xE5,0x94,0xB8), o3(0xE5,0x94,0xB3),
-     o3(0xE5,0x95,0x9D), o3(0xE5,0x96,0x99),
-     o3(0xE5,0x96,0x80), o3(0xE5,0x92,0xAF),
-     o3(0xE5,0x96,0x8A), o3(0xE5,0x96,0x9F),
-     o3(0xE5,0x95,0xBB), o3(0xE5,0x95,0xBE),
-     o3(0xE5,0x96,0x98), o3(0xE5,0x96,0x9E),
-     o3(0xE5,0x96,0xAE), o3(0xE5,0x95,0xBC),
-     o3(0xE5,0x96,0x83), o3(0xE5,0x96,0xA9),
-     o3(0xE5,0x96,0x87), o3(0xE5,0x96,0xA8),
-     o3(0xE5,0x97,0x9A), o3(0xE5,0x97,0x85),
-     o3(0xE5,0x97,0x9F), o3(0xE5,0x97,0x84),
-     o3(0xE5,0x97,0x9C), o3(0xE5,0x97,0xA4),
-     o3(0xE5,0x97,0x94), o3(0xE5,0x98,0x94),
-     o3(0xE5,0x97,0xB7), o3(0xE5,0x98,0x96),
-     o3(0xE5,0x97,0xBE), o3(0xE5,0x97,0xBD),
-     o3(0xE5,0x98,0x9B), o3(0xE5,0x97,0xB9),
-     o3(0xE5,0x99,0x8E), o3(0xE5,0x99,0x90),
-     o3(0xE7,0x87,0x9F), o3(0xE5,0x98,0xB4),
-     o3(0xE5,0x98,0xB6), o3(0xE5,0x98,0xB2),
-     o3(0xE5,0x98,0xB8), o3(0xE5,0x99,0xAB),
-     o3(0xE5,0x99,0xA4), o3(0xE5,0x98,0xAF),
-     o3(0xE5,0x99,0xAC), o3(0xE5,0x99,0xAA),
-     o3(0xE5,0x9A,0x86), o3(0xE5,0x9A,0x80),
-     o3(0xE5,0x9A,0x8A), o3(0xE5,0x9A,0xA0),
-     o3(0xE5,0x9A,0x94), o3(0xE5,0x9A,0x8F),
-     o3(0xE5,0x9A,0xA5), o3(0xE5,0x9A,0xAE),
-     o3(0xE5,0x9A,0xB6), o3(0xE5,0x9A,0xB4),
-     o3(0xE5,0x9B,0x82), o3(0xE5,0x9A,0xBC),
-     o3(0xE5,0x9B,0x81), o3(0xE5,0x9B,0x83),
-     o3(0xE5,0x9B,0x80), o3(0xE5,0x9B,0x88),
-     o3(0xE5,0x9B,0x8E), o3(0xE5,0x9B,0x91),
-     o3(0xE5,0x9B,0x93), o3(0xE5,0x9B,0x97),
-     o3(0xE5,0x9B,0xAE), o3(0xE5,0x9B,0xB9),
-     o3(0xE5,0x9C,0x80), o3(0xE5,0x9B,0xBF),
-     o3(0xE5,0x9C,0x84), o3(0xE5,0x9C,0x89),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D3 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D3_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D4_infos[95] = {
-     o3(0xE5,0x9C,0x88), o3(0xE5,0x9C,0x8B),
-     o3(0xE5,0x9C,0x8D), o3(0xE5,0x9C,0x93),
-     o3(0xE5,0x9C,0x98), o3(0xE5,0x9C,0x96),
-     o3(0xE5,0x97,0x87), o3(0xE5,0x9C,0x9C),
-     o3(0xE5,0x9C,0xA6), o3(0xE5,0x9C,0xB7),
-     o3(0xE5,0x9C,0xB8), o3(0xE5,0x9D,0x8E),
-     o3(0xE5,0x9C,0xBB), o3(0xE5,0x9D,0x80),
-     o3(0xE5,0x9D,0x8F), o3(0xE5,0x9D,0xA9),
-     o3(0xE5,0x9F,0x80), o3(0xE5,0x9E,0x88),
-     o3(0xE5,0x9D,0xA1), o3(0xE5,0x9D,0xBF),
-     o3(0xE5,0x9E,0x89), o3(0xE5,0x9E,0x93),
-     o3(0xE5,0x9E,0xA0), o3(0xE5,0x9E,0xB3),
-     o3(0xE5,0x9E,0xA4), o3(0xE5,0x9E,0xAA),
-     o3(0xE5,0x9E,0xB0), o3(0xE5,0x9F,0x83),
-     o3(0xE5,0x9F,0x86), o3(0xE5,0x9F,0x94),
-     o3(0xE5,0x9F,0x92), o3(0xE5,0x9F,0x93),
-     o3(0xE5,0xA0,0x8A), o3(0xE5,0x9F,0x96),
-     o3(0xE5,0x9F,0xA3), o3(0xE5,0xA0,0x8B),
-     o3(0xE5,0xA0,0x99), o3(0xE5,0xA0,0x9D),
-     o3(0xE5,0xA1,0xB2), o3(0xE5,0xA0,0xA1),
-     o3(0xE5,0xA1,0xA2), o3(0xE5,0xA1,0x8B),
-     o3(0xE5,0xA1,0xB0), o3(0xE6,0xAF,0x80),
-     o3(0xE5,0xA1,0x92), o3(0xE5,0xA0,0xBD),
-     o3(0xE5,0xA1,0xB9), o3(0xE5,0xA2,0x85),
-     o3(0xE5,0xA2,0xB9), o3(0xE5,0xA2,0x9F),
-     o3(0xE5,0xA2,0xAB), o3(0xE5,0xA2,0xBA),
-     o3(0xE5,0xA3,0x9E), o3(0xE5,0xA2,0xBB),
-     o3(0xE5,0xA2,0xB8), o3(0xE5,0xA2,0xAE),
-     o3(0xE5,0xA3,0x85), o3(0xE5,0xA3,0x93),
-     o3(0xE5,0xA3,0x91), o3(0xE5,0xA3,0x97),
-     o3(0xE5,0xA3,0x99), o3(0xE5,0xA3,0x98),
-     o3(0xE5,0xA3,0xA5), o3(0xE5,0xA3,0x9C),
-     o3(0xE5,0xA3,0xA4), o3(0xE5,0xA3,0x9F),
-     o3(0xE5,0xA3,0xAF), o3(0xE5,0xA3,0xBA),
-     o3(0xE5,0xA3,0xB9), o3(0xE5,0xA3,0xBB),
-     o3(0xE5,0xA3,0xBC), o3(0xE5,0xA3,0xBD),
-     o3(0xE5,0xA4,0x82), o3(0xE5,0xA4,0x8A),
-     o3(0xE5,0xA4,0x90), o3(0xE5,0xA4,0x9B),
-     o3(0xE6,0xA2,0xA6), o3(0xE5,0xA4,0xA5),
-     o3(0xE5,0xA4,0xAC), o3(0xE5,0xA4,0xAD),
-     o3(0xE5,0xA4,0xB2), o3(0xE5,0xA4,0xB8),
-     o3(0xE5,0xA4,0xBE), o3(0xE7,0xAB,0x92),
-     o3(0xE5,0xA5,0x95), o3(0xE5,0xA5,0x90),
-     o3(0xE5,0xA5,0x8E), o3(0xE5,0xA5,0x9A),
-     o3(0xE5,0xA5,0x98), o3(0xE5,0xA5,0xA2),
-     o3(0xE5,0xA5,0xA0), o3(0xE5,0xA5,0xA7),
-     o3(0xE5,0xA5,0xAC), o3(0xE5,0xA5,0xA9),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D4 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D4_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D5_infos[95] = {
-     o3(0xE5,0xA5,0xB8), o3(0xE5,0xA6,0x81),
-     o3(0xE5,0xA6,0x9D), o3(0xE4,0xBD,0x9E),
-     o3(0xE4,0xBE,0xAB), o3(0xE5,0xA6,0xA3),
-     o3(0xE5,0xA6,0xB2), o3(0xE5,0xA7,0x86),
-     o3(0xE5,0xA7,0xA8), o3(0xE5,0xA7,0x9C),
-     o3(0xE5,0xA6,0x8D), o3(0xE5,0xA7,0x99),
-     o3(0xE5,0xA7,0x9A), o3(0xE5,0xA8,0xA5),
-     o3(0xE5,0xA8,0x9F), o3(0xE5,0xA8,0x91),
-     o3(0xE5,0xA8,0x9C), o3(0xE5,0xA8,0x89),
-     o3(0xE5,0xA8,0x9A), o3(0xE5,0xA9,0x80),
-     o3(0xE5,0xA9,0xAC), o3(0xE5,0xA9,0x89),
-     o3(0xE5,0xA8,0xB5), o3(0xE5,0xA8,0xB6),
-     o3(0xE5,0xA9,0xA2), o3(0xE5,0xA9,0xAA),
-     o3(0xE5,0xAA,0x9A), o3(0xE5,0xAA,0xBC),
-     o3(0xE5,0xAA,0xBE), o3(0xE5,0xAB,0x8B),
-     o3(0xE5,0xAB,0x82), o3(0xE5,0xAA,0xBD),
-     o3(0xE5,0xAB,0xA3), o3(0xE5,0xAB,0x97),
-     o3(0xE5,0xAB,0xA6), o3(0xE5,0xAB,0xA9),
-     o3(0xE5,0xAB,0x96), o3(0xE5,0xAB,0xBA),
-     o3(0xE5,0xAB,0xBB), o3(0xE5,0xAC,0x8C),
-     o3(0xE5,0xAC,0x8B), o3(0xE5,0xAC,0x96),
-     o3(0xE5,0xAC,0xB2), o3(0xE5,0xAB,0x90),
-     o3(0xE5,0xAC,0xAA), o3(0xE5,0xAC,0xB6),
-     o3(0xE5,0xAC,0xBE), o3(0xE5,0xAD,0x83),
-     o3(0xE5,0xAD,0x85), o3(0xE5,0xAD,0x80),
-     o3(0xE5,0xAD,0x91), o3(0xE5,0xAD,0x95),
-     o3(0xE5,0xAD,0x9A), o3(0xE5,0xAD,0x9B),
-     o3(0xE5,0xAD,0xA5), o3(0xE5,0xAD,0xA9),
-     o3(0xE5,0xAD,0xB0), o3(0xE5,0xAD,0xB3),
-     o3(0xE5,0xAD,0xB5), o3(0xE5,0xAD,0xB8),
-     o3(0xE6,0x96,0x88), o3(0xE5,0xAD,0xBA),
-     o3(0xE5,0xAE,0x80), o3(0xE5,0xAE,0x83),
-     o3(0xE5,0xAE,0xA6), o3(0xE5,0xAE,0xB8),
-     o3(0xE5,0xAF,0x83), o3(0xE5,0xAF,0x87),
-     o3(0xE5,0xAF,0x89), o3(0xE5,0xAF,0x94),
-     o3(0xE5,0xAF,0x90), o3(0xE5,0xAF,0xA4),
-     o3(0xE5,0xAF,0xA6), o3(0xE5,0xAF,0xA2),
-     o3(0xE5,0xAF,0x9E), o3(0xE5,0xAF,0xA5),
-     o3(0xE5,0xAF,0xAB), o3(0xE5,0xAF,0xB0),
-     o3(0xE5,0xAF,0xB6), o3(0xE5,0xAF,0xB3),
-     o3(0xE5,0xB0,0x85), o3(0xE5,0xB0,0x87),
-     o3(0xE5,0xB0,0x88), o3(0xE5,0xB0,0x8D),
-     o3(0xE5,0xB0,0x93), o3(0xE5,0xB0,0xA0),
-     o3(0xE5,0xB0,0xA2), o3(0xE5,0xB0,0xA8),
-     o3(0xE5,0xB0,0xB8), o3(0xE5,0xB0,0xB9),
-     o3(0xE5,0xB1,0x81), o3(0xE5,0xB1,0x86),
-     o3(0xE5,0xB1,0x8E), o3(0xE5,0xB1,0x93),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D5 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D5_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D6_infos[95] = {
-     o3(0xE5,0xB1,0x90), o3(0xE5,0xB1,0x8F),
-     o3(0xE5,0xAD,0xB1), o3(0xE5,0xB1,0xAC),
-     o3(0xE5,0xB1,0xAE), o3(0xE4,0xB9,0xA2),
-     o3(0xE5,0xB1,0xB6), o3(0xE5,0xB1,0xB9),
-     o3(0xE5,0xB2,0x8C), o3(0xE5,0xB2,0x91),
-     o3(0xE5,0xB2,0x94), o3(0xE5,0xA6,0x9B),
-     o3(0xE5,0xB2,0xAB), o3(0xE5,0xB2,0xBB),
-     o3(0xE5,0xB2,0xB6), o3(0xE5,0xB2,0xBC),
-     o3(0xE5,0xB2,0xB7), o3(0xE5,0xB3,0x85),
-     o3(0xE5,0xB2,0xBE), o3(0xE5,0xB3,0x87),
-     o3(0xE5,0xB3,0x99), o3(0xE5,0xB3,0xA9),
-     o3(0xE5,0xB3,0xBD), o3(0xE5,0xB3,0xBA),
-     o3(0xE5,0xB3,0xAD), o3(0xE5,0xB6,0x8C),
-     o3(0xE5,0xB3,0xAA), o3(0xE5,0xB4,0x8B),
-     o3(0xE5,0xB4,0x95), o3(0xE5,0xB4,0x97),
-     o3(0xE5,0xB5,0x9C), o3(0xE5,0xB4,0x9F),
-     o3(0xE5,0xB4,0x9B), o3(0xE5,0xB4,0x91),
-     o3(0xE5,0xB4,0x94), o3(0xE5,0xB4,0xA2),
-     o3(0xE5,0xB4,0x9A), o3(0xE5,0xB4,0x99),
-     o3(0xE5,0xB4,0x98), o3(0xE5,0xB5,0x8C),
-     o3(0xE5,0xB5,0x92), o3(0xE5,0xB5,0x8E),
-     o3(0xE5,0xB5,0x8B), o3(0xE5,0xB5,0xAC),
-     o3(0xE5,0xB5,0xB3), o3(0xE5,0xB5,0xB6),
-     o3(0xE5,0xB6,0x87), o3(0xE5,0xB6,0x84),
-     o3(0xE5,0xB6,0x82), o3(0xE5,0xB6,0xA2),
-     o3(0xE5,0xB6,0x9D), o3(0xE5,0xB6,0xAC),
-     o3(0xE5,0xB6,0xAE), o3(0xE5,0xB6,0xBD),
-     o3(0xE5,0xB6,0x90), o3(0xE5,0xB6,0xB7),
-     o3(0xE5,0xB6,0xBC), o3(0xE5,0xB7,0x89),
-     o3(0xE5,0xB7,0x8D), o3(0xE5,0xB7,0x93),
-     o3(0xE5,0xB7,0x92), o3(0xE5,0xB7,0x96),
-     o3(0xE5,0xB7,0x9B), o3(0xE5,0xB7,0xAB),
-     o3(0xE5,0xB7,0xB2), o3(0xE5,0xB7,0xB5),
-     o3(0xE5,0xB8,0x8B), o3(0xE5,0xB8,0x9A),
-     o3(0xE5,0xB8,0x99), o3(0xE5,0xB8,0x91),
-     o3(0xE5,0xB8,0x9B), o3(0xE5,0xB8,0xB6),
-     o3(0xE5,0xB8,0xB7), o3(0xE5,0xB9,0x84),
-     o3(0xE5,0xB9,0x83), o3(0xE5,0xB9,0x80),
-     o3(0xE5,0xB9,0x8E), o3(0xE5,0xB9,0x97),
-     o3(0xE5,0xB9,0x94), o3(0xE5,0xB9,0x9F),
-     o3(0xE5,0xB9,0xA2), o3(0xE5,0xB9,0xA4),
-     o3(0xE5,0xB9,0x87), o3(0xE5,0xB9,0xB5),
-     o3(0xE5,0xB9,0xB6), o3(0xE5,0xB9,0xBA),
-     o3(0xE9,0xBA,0xBC), o3(0xE5,0xB9,0xBF),
-     o3(0xE5,0xBA,0xA0), o3(0xE5,0xBB,0x81),
-     o3(0xE5,0xBB,0x82), o3(0xE5,0xBB,0x88),
-     o3(0xE5,0xBB,0x90), o3(0xE5,0xBB,0x8F),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D6 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D6_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D7_infos[95] = {
-     o3(0xE5,0xBB,0x96), o3(0xE5,0xBB,0xA3),
-     o3(0xE5,0xBB,0x9D), o3(0xE5,0xBB,0x9A),
-     o3(0xE5,0xBB,0x9B), o3(0xE5,0xBB,0xA2),
-     o3(0xE5,0xBB,0xA1), o3(0xE5,0xBB,0xA8),
-     o3(0xE5,0xBB,0xA9), o3(0xE5,0xBB,0xAC),
-     o3(0xE5,0xBB,0xB1), o3(0xE5,0xBB,0xB3),
-     o3(0xE5,0xBB,0xB0), o3(0xE5,0xBB,0xB4),
-     o3(0xE5,0xBB,0xB8), o3(0xE5,0xBB,0xBE),
-     o3(0xE5,0xBC,0x83), o3(0xE5,0xBC,0x89),
-     o3(0xE5,0xBD,0x9D), o3(0xE5,0xBD,0x9C),
-     o3(0xE5,0xBC,0x8B), o3(0xE5,0xBC,0x91),
-     o3(0xE5,0xBC,0x96), o3(0xE5,0xBC,0xA9),
-     o3(0xE5,0xBC,0xAD), o3(0xE5,0xBC,0xB8),
-     o3(0xE5,0xBD,0x81), o3(0xE5,0xBD,0x88),
-     o3(0xE5,0xBD,0x8C), o3(0xE5,0xBD,0x8E),
-     o3(0xE5,0xBC,0xAF), o3(0xE5,0xBD,0x91),
-     o3(0xE5,0xBD,0x96), o3(0xE5,0xBD,0x97),
-     o3(0xE5,0xBD,0x99), o3(0xE5,0xBD,0xA1),
-     o3(0xE5,0xBD,0xAD), o3(0xE5,0xBD,0xB3),
-     o3(0xE5,0xBD,0xB7), o3(0xE5,0xBE,0x83),
-     o3(0xE5,0xBE,0x82), o3(0xE5,0xBD,0xBF),
-     o3(0xE5,0xBE,0x8A), o3(0xE5,0xBE,0x88),
-     o3(0xE5,0xBE,0x91), o3(0xE5,0xBE,0x87),
-     o3(0xE5,0xBE,0x9E), o3(0xE5,0xBE,0x99),
-     o3(0xE5,0xBE,0x98), o3(0xE5,0xBE,0xA0),
-     o3(0xE5,0xBE,0xA8), o3(0xE5,0xBE,0xAD),
-     o3(0xE5,0xBE,0xBC), o3(0xE5,0xBF,0x96),
-     o3(0xE5,0xBF,0xBB), o3(0xE5,0xBF,0xA4),
-     o3(0xE5,0xBF,0xB8), o3(0xE5,0xBF,0xB1),
-     o3(0xE5,0xBF,0x9D), o3(0xE6,0x82,0xB3),
-     o3(0xE5,0xBF,0xBF), o3(0xE6,0x80,0xA1),
-     o3(0xE6,0x81,0xA0), o3(0xE6,0x80,0x99),
-     o3(0xE6,0x80,0x90), o3(0xE6,0x80,0xA9),
-     o3(0xE6,0x80,0x8E), o3(0xE6,0x80,0xB1),
-     o3(0xE6,0x80,0x9B), o3(0xE6,0x80,0x95),
-     o3(0xE6,0x80,0xAB), o3(0xE6,0x80,0xA6),
-     o3(0xE6,0x80,0x8F), o3(0xE6,0x80,0xBA),
-     o3(0xE6,0x81,0x9A), o3(0xE6,0x81,0x81),
-     o3(0xE6,0x81,0xAA), o3(0xE6,0x81,0xB7),
-     o3(0xE6,0x81,0x9F), o3(0xE6,0x81,0x8A),
-     o3(0xE6,0x81,0x86), o3(0xE6,0x81,0x8D),
-     o3(0xE6,0x81,0xA3), o3(0xE6,0x81,0x83),
-     o3(0xE6,0x81,0xA4), o3(0xE6,0x81,0x82),
-     o3(0xE6,0x81,0xAC), o3(0xE6,0x81,0xAB),
-     o3(0xE6,0x81,0x99), o3(0xE6,0x82,0x81),
-     o3(0xE6,0x82,0x8D), o3(0xE6,0x83,0xA7),
-     o3(0xE6,0x82,0x83), o3(0xE6,0x82,0x9A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D7 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D7_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D8_infos[95] = {
-     o3(0xE6,0x82,0x84), o3(0xE6,0x82,0x9B),
-     o3(0xE6,0x82,0x96), o3(0xE6,0x82,0x97),
-     o3(0xE6,0x82,0x92), o3(0xE6,0x82,0xA7),
-     o3(0xE6,0x82,0x8B), o3(0xE6,0x83,0xA1),
-     o3(0xE6,0x82,0xB8), o3(0xE6,0x83,0xA0),
-     o3(0xE6,0x83,0x93), o3(0xE6,0x82,0xB4),
-     o3(0xE5,0xBF,0xB0), o3(0xE6,0x82,0xBD),
-     o3(0xE6,0x83,0x86), o3(0xE6,0x82,0xB5),
-     o3(0xE6,0x83,0x98), o3(0xE6,0x85,0x8D),
-     o3(0xE6,0x84,0x95), o3(0xE6,0x84,0x86),
-     o3(0xE6,0x83,0xB6), o3(0xE6,0x83,0xB7),
-     o3(0xE6,0x84,0x80), o3(0xE6,0x83,0xB4),
-     o3(0xE6,0x83,0xBA), o3(0xE6,0x84,0x83),
-     o3(0xE6,0x84,0xA1), o3(0xE6,0x83,0xBB),
-     o3(0xE6,0x83,0xB1), o3(0xE6,0x84,0x8D),
-     o3(0xE6,0x84,0x8E), o3(0xE6,0x85,0x87),
-     o3(0xE6,0x84,0xBE), o3(0xE6,0x84,0xA8),
-     o3(0xE6,0x84,0xA7), o3(0xE6,0x85,0x8A),
-     o3(0xE6,0x84,0xBF), o3(0xE6,0x84,0xBC),
-     o3(0xE6,0x84,0xAC), o3(0xE6,0x84,0xB4),
-     o3(0xE6,0x84,0xBD), o3(0xE6,0x85,0x82),
-     o3(0xE6,0x85,0x84), o3(0xE6,0x85,0xB3),
-     o3(0xE6,0x85,0xB7), o3(0xE6,0x85,0x98),
-     o3(0xE6,0x85,0x99), o3(0xE6,0x85,0x9A),
-     o3(0xE6,0x85,0xAB), o3(0xE6,0x85,0xB4),
-     o3(0xE6,0x85,0xAF), o3(0xE6,0x85,0xA5),
-     o3(0xE6,0x85,0xB1), o3(0xE6,0x85,0x9F),
-     o3(0xE6,0x85,0x9D), o3(0xE6,0x85,0x93),
-     o3(0xE6,0x85,0xB5), o3(0xE6,0x86,0x99),
-     o3(0xE6,0x86,0x96), o3(0xE6,0x86,0x87),
-     o3(0xE6,0x86,0xAC), o3(0xE6,0x86,0x94),
-     o3(0xE6,0x86,0x9A), o3(0xE6,0x86,0x8A),
-     o3(0xE6,0x86,0x91), o3(0xE6,0x86,0xAB),
-     o3(0xE6,0x86,0xAE), o3(0xE6,0x87,0x8C),
-     o3(0xE6,0x87,0x8A), o3(0xE6,0x87,0x89),
-     o3(0xE6,0x87,0xB7), o3(0xE6,0x87,0x88),
-     o3(0xE6,0x87,0x83), o3(0xE6,0x87,0x86),
-     o3(0xE6,0x86,0xBA), o3(0xE6,0x87,0x8B),
-     o3(0xE7,0xBD,0xB9), o3(0xE6,0x87,0x8D),
-     o3(0xE6,0x87,0xA6), o3(0xE6,0x87,0xA3),
-     o3(0xE6,0x87,0xB6), o3(0xE6,0x87,0xBA),
-     o3(0xE6,0x87,0xB4), o3(0xE6,0x87,0xBF),
-     o3(0xE6,0x87,0xBD), o3(0xE6,0x87,0xBC),
-     o3(0xE6,0x87,0xBE), o3(0xE6,0x88,0x80),
-     o3(0xE6,0x88,0x88), o3(0xE6,0x88,0x89),
-     o3(0xE6,0x88,0x8D), o3(0xE6,0x88,0x8C),
-     o3(0xE6,0x88,0x94), o3(0xE6,0x88,0x9B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D8 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D8_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_D9_infos[95] = {
-     o3(0xE6,0x88,0x9E), o3(0xE6,0x88,0xA1),
-     o3(0xE6,0x88,0xAA), o3(0xE6,0x88,0xAE),
-     o3(0xE6,0x88,0xB0), o3(0xE6,0x88,0xB2),
-     o3(0xE6,0x88,0xB3), o3(0xE6,0x89,0x81),
-     o3(0xE6,0x89,0x8E), o3(0xE6,0x89,0x9E),
-     o3(0xE6,0x89,0xA3), o3(0xE6,0x89,0x9B),
-     o3(0xE6,0x89,0xA0), o3(0xE6,0x89,0xA8),
-     o3(0xE6,0x89,0xBC), o3(0xE6,0x8A,0x82),
-     o3(0xE6,0x8A,0x89), o3(0xE6,0x89,0xBE),
-     o3(0xE6,0x8A,0x92), o3(0xE6,0x8A,0x93),
-     o3(0xE6,0x8A,0x96), o3(0xE6,0x8B,0x94),
-     o3(0xE6,0x8A,0x83), o3(0xE6,0x8A,0x94),
-     o3(0xE6,0x8B,0x97), o3(0xE6,0x8B,0x91),
-     o3(0xE6,0x8A,0xBB), o3(0xE6,0x8B,0x8F),
-     o3(0xE6,0x8B,0xBF), o3(0xE6,0x8B,0x86),
-     o3(0xE6,0x93,0x94), o3(0xE6,0x8B,0x88),
-     o3(0xE6,0x8B,0x9C), o3(0xE6,0x8B,0x8C),
-     o3(0xE6,0x8B,0x8A), o3(0xE6,0x8B,0x82),
-     o3(0xE6,0x8B,0x87), o3(0xE6,0x8A,0x9B),
-     o3(0xE6,0x8B,0x89), o3(0xE6,0x8C,0x8C),
-     o3(0xE6,0x8B,0xAE), o3(0xE6,0x8B,0xB1),
-     o3(0xE6,0x8C,0xA7), o3(0xE6,0x8C,0x82),
-     o3(0xE6,0x8C,0x88), o3(0xE6,0x8B,0xAF),
-     o3(0xE6,0x8B,0xB5), o3(0xE6,0x8D,0x90),
-     o3(0xE6,0x8C,0xBE), o3(0xE6,0x8D,0x8D),
-     o3(0xE6,0x90,0x9C), o3(0xE6,0x8D,0x8F),
-     o3(0xE6,0x8E,0x96), o3(0xE6,0x8E,0x8E),
-     o3(0xE6,0x8E,0x80), o3(0xE6,0x8E,0xAB),
-     o3(0xE6,0x8D,0xB6), o3(0xE6,0x8E,0xA3),
-     o3(0xE6,0x8E,0x8F), o3(0xE6,0x8E,0x89),
-     o3(0xE6,0x8E,0x9F), o3(0xE6,0x8E,0xB5),
-     o3(0xE6,0x8D,0xAB), o3(0xE6,0x8D,0xA9),
-     o3(0xE6,0x8E,0xBE), o3(0xE6,0x8F,0xA9),
-     o3(0xE6,0x8F,0x80), o3(0xE6,0x8F,0x86),
-     o3(0xE6,0x8F,0xA3), o3(0xE6,0x8F,0x89),
-     o3(0xE6,0x8F,0x92), o3(0xE6,0x8F,0xB6),
-     o3(0xE6,0x8F,0x84), o3(0xE6,0x90,0x96),
-     o3(0xE6,0x90,0xB4), o3(0xE6,0x90,0x86),
-     o3(0xE6,0x90,0x93), o3(0xE6,0x90,0xA6),
-     o3(0xE6,0x90,0xB6), o3(0xE6,0x94,0x9D),
-     o3(0xE6,0x90,0x97), o3(0xE6,0x90,0xA8),
-     o3(0xE6,0x90,0x8F), o3(0xE6,0x91,0xA7),
-     o3(0xE6,0x91,0xAF), o3(0xE6,0x91,0xB6),
-     o3(0xE6,0x91,0x8E), o3(0xE6,0x94,0xAA),
-     o3(0xE6,0x92,0x95), o3(0xE6,0x92,0x93),
-     o3(0xE6,0x92,0xA5), o3(0xE6,0x92,0xA9),
-     o3(0xE6,0x92,0x88), o3(0xE6,0x92,0xBC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_D9 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_D9_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DA_infos[95] = {
-     o3(0xE6,0x93,0x9A), o3(0xE6,0x93,0x92),
-     o3(0xE6,0x93,0x85), o3(0xE6,0x93,0x87),
-     o3(0xE6,0x92,0xBB), o3(0xE6,0x93,0x98),
-     o3(0xE6,0x93,0x82), o3(0xE6,0x93,0xB1),
-     o3(0xE6,0x93,0xA7), o3(0xE8,0x88,0x89),
-     o3(0xE6,0x93,0xA0), o3(0xE6,0x93,0xA1),
-     o3(0xE6,0x8A,0xAC), o3(0xE6,0x93,0xA3),
-     o3(0xE6,0x93,0xAF), o3(0xE6,0x94,0xAC),
-     o3(0xE6,0x93,0xB6), o3(0xE6,0x93,0xB4),
-     o3(0xE6,0x93,0xB2), o3(0xE6,0x93,0xBA),
-     o3(0xE6,0x94,0x80), o3(0xE6,0x93,0xBD),
-     o3(0xE6,0x94,0x98), o3(0xE6,0x94,0x9C),
-     o3(0xE6,0x94,0x85), o3(0xE6,0x94,0xA4),
-     o3(0xE6,0x94,0xA3), o3(0xE6,0x94,0xAB),
-     o3(0xE6,0x94,0xB4), o3(0xE6,0x94,0xB5),
-     o3(0xE6,0x94,0xB7), o3(0xE6,0x94,0xB6),
-     o3(0xE6,0x94,0xB8), o3(0xE7,0x95,0x8B),
-     o3(0xE6,0x95,0x88), o3(0xE6,0x95,0x96),
-     o3(0xE6,0x95,0x95), o3(0xE6,0x95,0x8D),
-     o3(0xE6,0x95,0x98), o3(0xE6,0x95,0x9E),
-     o3(0xE6,0x95,0x9D), o3(0xE6,0x95,0xB2),
-     o3(0xE6,0x95,0xB8), o3(0xE6,0x96,0x82),
-     o3(0xE6,0x96,0x83), o3(0xE8,0xAE,0x8A),
-     o3(0xE6,0x96,0x9B), o3(0xE6,0x96,0x9F),
-     o3(0xE6,0x96,0xAB), o3(0xE6,0x96,0xB7),
-     o3(0xE6,0x97,0x83), o3(0xE6,0x97,0x86),
-     o3(0xE6,0x97,0x81), o3(0xE6,0x97,0x84),
-     o3(0xE6,0x97,0x8C), o3(0xE6,0x97,0x92),
-     o3(0xE6,0x97,0x9B), o3(0xE6,0x97,0x99),
-     o3(0xE6,0x97,0xA0), o3(0xE6,0x97,0xA1),
-     o3(0xE6,0x97,0xB1), o3(0xE6,0x9D,0xB2),
-     o3(0xE6,0x98,0x8A), o3(0xE6,0x98,0x83),
-     o3(0xE6,0x97,0xBB), o3(0xE6,0x9D,0xB3),
-     o3(0xE6,0x98,0xB5), o3(0xE6,0x98,0xB6),
-     o3(0xE6,0x98,0xB4), o3(0xE6,0x98,0x9C),
-     o3(0xE6,0x99,0x8F), o3(0xE6,0x99,0x84),
-     o3(0xE6,0x99,0x89), o3(0xE6,0x99,0x81),
-     o3(0xE6,0x99,0x9E), o3(0xE6,0x99,0x9D),
-     o3(0xE6,0x99,0xA4), o3(0xE6,0x99,0xA7),
-     o3(0xE6,0x99,0xA8), o3(0xE6,0x99,0x9F),
-     o3(0xE6,0x99,0xA2), o3(0xE6,0x99,0xB0),
-     o3(0xE6,0x9A,0x83), o3(0xE6,0x9A,0x88),
-     o3(0xE6,0x9A,0x8E), o3(0xE6,0x9A,0x89),
-     o3(0xE6,0x9A,0x84), o3(0xE6,0x9A,0x98),
-     o3(0xE6,0x9A,0x9D), o3(0xE6,0x9B,0x81),
-     o3(0xE6,0x9A,0xB9), o3(0xE6,0x9B,0x89),
-     o3(0xE6,0x9A,0xBE), o3(0xE6,0x9A,0xBC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DA = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DA_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DB_infos[95] = {
-     o3(0xE6,0x9B,0x84), o3(0xE6,0x9A,0xB8),
-     o3(0xE6,0x9B,0x96), o3(0xE6,0x9B,0x9A),
-     o3(0xE6,0x9B,0xA0), o3(0xE6,0x98,0xBF),
-     o3(0xE6,0x9B,0xA6), o3(0xE6,0x9B,0xA9),
-     o3(0xE6,0x9B,0xB0), o3(0xE6,0x9B,0xB5),
-     o3(0xE6,0x9B,0xB7), o3(0xE6,0x9C,0x8F),
-     o3(0xE6,0x9C,0x96), o3(0xE6,0x9C,0x9E),
-     o3(0xE6,0x9C,0xA6), o3(0xE6,0x9C,0xA7),
-     o3(0xE9,0x9C,0xB8), o3(0xE6,0x9C,0xAE),
-     o3(0xE6,0x9C,0xBF), o3(0xE6,0x9C,0xB6),
-     o3(0xE6,0x9D,0x81), o3(0xE6,0x9C,0xB8),
-     o3(0xE6,0x9C,0xB7), o3(0xE6,0x9D,0x86),
-     o3(0xE6,0x9D,0x9E), o3(0xE6,0x9D,0xA0),
-     o3(0xE6,0x9D,0x99), o3(0xE6,0x9D,0xA3),
-     o3(0xE6,0x9D,0xA4), o3(0xE6,0x9E,0x89),
-     o3(0xE6,0x9D,0xB0), o3(0xE6,0x9E,0xA9),
-     o3(0xE6,0x9D,0xBC), o3(0xE6,0x9D,0xAA),
-     o3(0xE6,0x9E,0x8C), o3(0xE6,0x9E,0x8B),
-     o3(0xE6,0x9E,0xA6), o3(0xE6,0x9E,0xA1),
-     o3(0xE6,0x9E,0x85), o3(0xE6,0x9E,0xB7),
-     o3(0xE6,0x9F,0xAF), o3(0xE6,0x9E,0xB4),
-     o3(0xE6,0x9F,0xAC), o3(0xE6,0x9E,0xB3),
-     o3(0xE6,0x9F,0xA9), o3(0xE6,0x9E,0xB8),
-     o3(0xE6,0x9F,0xA4), o3(0xE6,0x9F,0x9E),
-     o3(0xE6,0x9F,0x9D), o3(0xE6,0x9F,0xA2),
-     o3(0xE6,0x9F,0xAE), o3(0xE6,0x9E,0xB9),
-     o3(0xE6,0x9F,0x8E), o3(0xE6,0x9F,0x86),
-     o3(0xE6,0x9F,0xA7), o3(0xE6,0xAA,0x9C),
-     o3(0xE6,0xA0,0x9E), o3(0xE6,0xA1,0x86),
-     o3(0xE6,0xA0,0xA9), o3(0xE6,0xA1,0x80),
-     o3(0xE6,0xA1,0x8D), o3(0xE6,0xA0,0xB2),
-     o3(0xE6,0xA1,0x8E), o3(0xE6,0xA2,0xB3),
-     o3(0xE6,0xA0,0xAB), o3(0xE6,0xA1,0x99),
-     o3(0xE6,0xA1,0xA3), o3(0xE6,0xA1,0xB7),
-     o3(0xE6,0xA1,0xBF), o3(0xE6,0xA2,0x9F),
-     o3(0xE6,0xA2,0x8F), o3(0xE6,0xA2,0xAD),
-     o3(0xE6,0xA2,0x94), o3(0xE6,0xA2,0x9D),
-     o3(0xE6,0xA2,0x9B), o3(0xE6,0xA2,0x83),
-     o3(0xE6,0xAA,0xAE), o3(0xE6,0xA2,0xB9),
-     o3(0xE6,0xA1,0xB4), o3(0xE6,0xA2,0xB5),
-     o3(0xE6,0xA2,0xA0), o3(0xE6,0xA2,0xBA),
-     o3(0xE6,0xA4,0x8F), o3(0xE6,0xA2,0x8D),
-     o3(0xE6,0xA1,0xBE), o3(0xE6,0xA4,0x81),
-     o3(0xE6,0xA3,0x8A), o3(0xE6,0xA4,0x88),
-     o3(0xE6,0xA3,0x98), o3(0xE6,0xA4,0xA2),
-     o3(0xE6,0xA4,0xA6), o3(0xE6,0xA3,0xA1),
-     o3(0xE6,0xA4,0x8C), o3(0xE6,0xA3,0x8D),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DB = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DB_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DC_infos[95] = {
-     o3(0xE6,0xA3,0x94), o3(0xE6,0xA3,0xA7),
-     o3(0xE6,0xA3,0x95), o3(0xE6,0xA4,0xB6),
-     o3(0xE6,0xA4,0x92), o3(0xE6,0xA4,0x84),
-     o3(0xE6,0xA3,0x97), o3(0xE6,0xA3,0xA3),
-     o3(0xE6,0xA4,0xA5), o3(0xE6,0xA3,0xB9),
-     o3(0xE6,0xA3,0xA0), o3(0xE6,0xA3,0xAF),
-     o3(0xE6,0xA4,0xA8), o3(0xE6,0xA4,0xAA),
-     o3(0xE6,0xA4,0x9A), o3(0xE6,0xA4,0xA3),
-     o3(0xE6,0xA4,0xA1), o3(0xE6,0xA3,0x86),
-     o3(0xE6,0xA5,0xB9), o3(0xE6,0xA5,0xB7),
-     o3(0xE6,0xA5,0x9C), o3(0xE6,0xA5,0xB8),
-     o3(0xE6,0xA5,0xAB), o3(0xE6,0xA5,0x94),
-     o3(0xE6,0xA5,0xBE), o3(0xE6,0xA5,0xAE),
-     o3(0xE6,0xA4,0xB9), o3(0xE6,0xA5,0xB4),
-     o3(0xE6,0xA4,0xBD), o3(0xE6,0xA5,0x99),
-     o3(0xE6,0xA4,0xB0), o3(0xE6,0xA5,0xA1),
-     o3(0xE6,0xA5,0x9E), o3(0xE6,0xA5,0x9D),
-     o3(0xE6,0xA6,0x81), o3(0xE6,0xA5,0xAA),
-     o3(0xE6,0xA6,0xB2), o3(0xE6,0xA6,0xAE),
-     o3(0xE6,0xA7,0x90), o3(0xE6,0xA6,0xBF),
-     o3(0xE6,0xA7,0x81), o3(0xE6,0xA7,0x93),
-     o3(0xE6,0xA6,0xBE), o3(0xE6,0xA7,0x8E),
-     o3(0xE5,0xAF,0xA8), o3(0xE6,0xA7,0x8A),
-     o3(0xE6,0xA7,0x9D), o3(0xE6,0xA6,0xBB),
-     o3(0xE6,0xA7,0x83), o3(0xE6,0xA6,0xA7),
-     o3(0xE6,0xA8,0xAE), o3(0xE6,0xA6,0x91),
-     o3(0xE6,0xA6,0xA0), o3(0xE6,0xA6,0x9C),
-     o3(0xE6,0xA6,0x95), o3(0xE6,0xA6,0xB4),
-     o3(0xE6,0xA7,0x9E), o3(0xE6,0xA7,0xA8),
-     o3(0xE6,0xA8,0x82), o3(0xE6,0xA8,0x9B),
-     o3(0xE6,0xA7,0xBF), o3(0xE6,0xAC,0x8A),
-     o3(0xE6,0xA7,0xB9), o3(0xE6,0xA7,0xB2),
-     o3(0xE6,0xA7,0xA7), o3(0xE6,0xA8,0x85),
-     o3(0xE6,0xA6,0xB1), o3(0xE6,0xA8,0x9E),
-     o3(0xE6,0xA7,0xAD), o3(0xE6,0xA8,0x94),
-     o3(0xE6,0xA7,0xAB), o3(0xE6,0xA8,0x8A),
-     o3(0xE6,0xA8,0x92), o3(0xE6,0xAB,0x81),
-     o3(0xE6,0xA8,0xA3), o3(0xE6,0xA8,0x93),
-     o3(0xE6,0xA9,0x84), o3(0xE6,0xA8,0x8C),
-     o3(0xE6,0xA9,0xB2), o3(0xE6,0xA8,0xB6),
-     o3(0xE6,0xA9,0xB8), o3(0xE6,0xA9,0x87),
-     o3(0xE6,0xA9,0xA2), o3(0xE6,0xA9,0x99),
-     o3(0xE6,0xA9,0xA6), o3(0xE6,0xA9,0x88),
-     o3(0xE6,0xA8,0xB8), o3(0xE6,0xA8,0xA2),
-     o3(0xE6,0xAA,0x90), o3(0xE6,0xAA,0x8D),
-     o3(0xE6,0xAA,0xA0), o3(0xE6,0xAA,0x84),
-     o3(0xE6,0xAA,0xA2), o3(0xE6,0xAA,0xA3),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DC = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DC_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DD_infos[95] = {
-     o3(0xE6,0xAA,0x97), o3(0xE8,0x98,0x97),
-     o3(0xE6,0xAA,0xBB), o3(0xE6,0xAB,0x83),
-     o3(0xE6,0xAB,0x82), o3(0xE6,0xAA,0xB8),
-     o3(0xE6,0xAA,0xB3), o3(0xE6,0xAA,0xAC),
-     o3(0xE6,0xAB,0x9E), o3(0xE6,0xAB,0x91),
-     o3(0xE6,0xAB,0x9F), o3(0xE6,0xAA,0xAA),
-     o3(0xE6,0xAB,0x9A), o3(0xE6,0xAB,0xAA),
-     o3(0xE6,0xAB,0xBB), o3(0xE6,0xAC,0x85),
-     o3(0xE8,0x98,0x96), o3(0xE6,0xAB,0xBA),
-     o3(0xE6,0xAC,0x92), o3(0xE6,0xAC,0x96),
-     o3(0xE9,0xAC,0xB1), o3(0xE6,0xAC,0x9F),
-     o3(0xE6,0xAC,0xB8), o3(0xE6,0xAC,0xB7),
-     o3(0xE7,0x9B,0x9C), o3(0xE6,0xAC,0xB9),
-     o3(0xE9,0xA3,0xAE), o3(0xE6,0xAD,0x87),
-     o3(0xE6,0xAD,0x83), o3(0xE6,0xAD,0x89),
-     o3(0xE6,0xAD,0x90), o3(0xE6,0xAD,0x99),
-     o3(0xE6,0xAD,0x94), o3(0xE6,0xAD,0x9B),
-     o3(0xE6,0xAD,0x9F), o3(0xE6,0xAD,0xA1),
-     o3(0xE6,0xAD,0xB8), o3(0xE6,0xAD,0xB9),
-     o3(0xE6,0xAD,0xBF), o3(0xE6,0xAE,0x80),
-     o3(0xE6,0xAE,0x84), o3(0xE6,0xAE,0x83),
-     o3(0xE6,0xAE,0x8D), o3(0xE6,0xAE,0x98),
-     o3(0xE6,0xAE,0x95), o3(0xE6,0xAE,0x9E),
-     o3(0xE6,0xAE,0xA4), o3(0xE6,0xAE,0xAA),
-     o3(0xE6,0xAE,0xAB), o3(0xE6,0xAE,0xAF),
-     o3(0xE6,0xAE,0xB2), o3(0xE6,0xAE,0xB1),
-     o3(0xE6,0xAE,0xB3), o3(0xE6,0xAE,0xB7),
-     o3(0xE6,0xAE,0xBC), o3(0xE6,0xAF,0x86),
-     o3(0xE6,0xAF,0x8B), o3(0xE6,0xAF,0x93),
-     o3(0xE6,0xAF,0x9F), o3(0xE6,0xAF,0xAC),
-     o3(0xE6,0xAF,0xAB), o3(0xE6,0xAF,0xB3),
-     o3(0xE6,0xAF,0xAF), o3(0xE9,0xBA,0xBE),
-     o3(0xE6,0xB0,0x88), o3(0xE6,0xB0,0x93),
-     o3(0xE6,0xB0,0x94), o3(0xE6,0xB0,0x9B),
-     o3(0xE6,0xB0,0xA4), o3(0xE6,0xB0,0xA3),
-     o3(0xE6,0xB1,0x9E), o3(0xE6,0xB1,0x95),
-     o3(0xE6,0xB1,0xA2), o3(0xE6,0xB1,0xAA),
-     o3(0xE6,0xB2,0x82), o3(0xE6,0xB2,0x8D),
-     o3(0xE6,0xB2,0x9A), o3(0xE6,0xB2,0x81),
-     o3(0xE6,0xB2,0x9B), o3(0xE6,0xB1,0xBE),
-     o3(0xE6,0xB1,0xA8), o3(0xE6,0xB1,0xB3),
-     o3(0xE6,0xB2,0x92), o3(0xE6,0xB2,0x90),
-     o3(0xE6,0xB3,0x84), o3(0xE6,0xB3,0xB1),
-     o3(0xE6,0xB3,0x93), o3(0xE6,0xB2,0xBD),
-     o3(0xE6,0xB3,0x97), o3(0xE6,0xB3,0x85),
-     o3(0xE6,0xB3,0x9D), o3(0xE6,0xB2,0xAE),
-     o3(0xE6,0xB2,0xB1), o3(0xE6,0xB2,0xBE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DD = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DD_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DE_infos[95] = {
-     o3(0xE6,0xB2,0xBA), o3(0xE6,0xB3,0x9B),
-     o3(0xE6,0xB3,0xAF), o3(0xE6,0xB3,0x99),
-     o3(0xE6,0xB3,0xAA), o3(0xE6,0xB4,0x9F),
-     o3(0xE8,0xA1,0x8D), o3(0xE6,0xB4,0xB6),
-     o3(0xE6,0xB4,0xAB), o3(0xE6,0xB4,0xBD),
-     o3(0xE6,0xB4,0xB8), o3(0xE6,0xB4,0x99),
-     o3(0xE6,0xB4,0xB5), o3(0xE6,0xB4,0xB3),
-     o3(0xE6,0xB4,0x92), o3(0xE6,0xB4,0x8C),
-     o3(0xE6,0xB5,0xA3), o3(0xE6,0xB6,0x93),
-     o3(0xE6,0xB5,0xA4), o3(0xE6,0xB5,0x9A),
-     o3(0xE6,0xB5,0xB9), o3(0xE6,0xB5,0x99),
-     o3(0xE6,0xB6,0x8E), o3(0xE6,0xB6,0x95),
-     o3(0xE6,0xBF,0xA4), o3(0xE6,0xB6,0x85),
-     o3(0xE6,0xB7,0xB9), o3(0xE6,0xB8,0x95),
-     o3(0xE6,0xB8,0x8A), o3(0xE6,0xB6,0xB5),
-     o3(0xE6,0xB7,0x87), o3(0xE6,0xB7,0xA6),
-     o3(0xE6,0xB6,0xB8), o3(0xE6,0xB7,0x86),
-     o3(0xE6,0xB7,0xAC), o3(0xE6,0xB7,0x9E),
-     o3(0xE6,0xB7,0x8C), o3(0xE6,0xB7,0xA8),
-     o3(0xE6,0xB7,0x92), o3(0xE6,0xB7,0x85),
-     o3(0xE6,0xB7,0xBA), o3(0xE6,0xB7,0x99),
-     o3(0xE6,0xB7,0xA4), o3(0xE6,0xB7,0x95),
-     o3(0xE6,0xB7,0xAA), o3(0xE6,0xB7,0xAE),
-     o3(0xE6,0xB8,0xAD), o3(0xE6,0xB9,0xAE),
-     o3(0xE6,0xB8,0xAE), o3(0xE6,0xB8,0x99),
-     o3(0xE6,0xB9,0xB2), o3(0xE6,0xB9,0x9F),
-     o3(0xE6,0xB8,0xBE), o3(0xE6,0xB8,0xA3),
-     o3(0xE6,0xB9,0xAB), o3(0xE6,0xB8,0xAB),
-     o3(0xE6,0xB9,0xB6), o3(0xE6,0xB9,0x8D),
-     o3(0xE6,0xB8,0x9F), o3(0xE6,0xB9,0x83),
-     o3(0xE6,0xB8,0xBA), o3(0xE6,0xB9,0x8E),
-     o3(0xE6,0xB8,0xA4), o3(0xE6,0xBB,0xBF),
-     o3(0xE6,0xB8,0x9D), o3(0xE6,0xB8,0xB8),
-     o3(0xE6,0xBA,0x82), o3(0xE6,0xBA,0xAA),
-     o3(0xE6,0xBA,0x98), o3(0xE6,0xBB,0x89),
-     o3(0xE6,0xBA,0xB7), o3(0xE6,0xBB,0x93),
-     o3(0xE6,0xBA,0xBD), o3(0xE6,0xBA,0xAF),
-     o3(0xE6,0xBB,0x84), o3(0xE6,0xBA,0xB2),
-     o3(0xE6,0xBB,0x94), o3(0xE6,0xBB,0x95),
-     o3(0xE6,0xBA,0x8F), o3(0xE6,0xBA,0xA5),
-     o3(0xE6,0xBB,0x82), o3(0xE6,0xBA,0x9F),
-     o3(0xE6,0xBD,0x81), o3(0xE6,0xBC,0x91),
-     o3(0xE7,0x81,0x8C), o3(0xE6,0xBB,0xAC),
-     o3(0xE6,0xBB,0xB8), o3(0xE6,0xBB,0xBE),
-     o3(0xE6,0xBC,0xBF), o3(0xE6,0xBB,0xB2),
-     o3(0xE6,0xBC,0xB1), o3(0xE6,0xBB,0xAF),
-     o3(0xE6,0xBC,0xB2), o3(0xE6,0xBB,0x8C),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DE = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DE_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_DF_infos[95] = {
-     o3(0xE6,0xBC,0xBE), o3(0xE6,0xBC,0x93),
-     o3(0xE6,0xBB,0xB7), o3(0xE6,0xBE,0x86),
-     o3(0xE6,0xBD,0xBA), o3(0xE6,0xBD,0xB8),
-     o3(0xE6,0xBE,0x81), o3(0xE6,0xBE,0x80),
-     o3(0xE6,0xBD,0xAF), o3(0xE6,0xBD,0x9B),
-     o3(0xE6,0xBF,0xB3), o3(0xE6,0xBD,0xAD),
-     o3(0xE6,0xBE,0x82), o3(0xE6,0xBD,0xBC),
-     o3(0xE6,0xBD,0x98), o3(0xE6,0xBE,0x8E),
-     o3(0xE6,0xBE,0x91), o3(0xE6,0xBF,0x82),
-     o3(0xE6,0xBD,0xA6), o3(0xE6,0xBE,0xB3),
-     o3(0xE6,0xBE,0xA3), o3(0xE6,0xBE,0xA1),
-     o3(0xE6,0xBE,0xA4), o3(0xE6,0xBE,0xB9),
-     o3(0xE6,0xBF,0x86), o3(0xE6,0xBE,0xAA),
-     o3(0xE6,0xBF,0x9F), o3(0xE6,0xBF,0x95),
-     o3(0xE6,0xBF,0xAC), o3(0xE6,0xBF,0x94),
-     o3(0xE6,0xBF,0x98), o3(0xE6,0xBF,0xB1),
-     o3(0xE6,0xBF,0xAE), o3(0xE6,0xBF,0x9B),
-     o3(0xE7,0x80,0x89), o3(0xE7,0x80,0x8B),
-     o3(0xE6,0xBF,0xBA), o3(0xE7,0x80,0x91),
-     o3(0xE7,0x80,0x81), o3(0xE7,0x80,0x8F),
-     o3(0xE6,0xBF,0xBE), o3(0xE7,0x80,0x9B),
-     o3(0xE7,0x80,0x9A), o3(0xE6,0xBD,0xB4),
-     o3(0xE7,0x80,0x9D), o3(0xE7,0x80,0x98),
-     o3(0xE7,0x80,0x9F), o3(0xE7,0x80,0xB0),
-     o3(0xE7,0x80,0xBE), o3(0xE7,0x80,0xB2),
-     o3(0xE7,0x81,0x91), o3(0xE7,0x81,0xA3),
-     o3(0xE7,0x82,0x99), o3(0xE7,0x82,0x92),
-     o3(0xE7,0x82,0xAF), o3(0xE7,0x83,0xB1),
-     o3(0xE7,0x82,0xAC), o3(0xE7,0x82,0xB8),
-     o3(0xE7,0x82,0xB3), o3(0xE7,0x82,0xAE),
-     o3(0xE7,0x83,0x9F), o3(0xE7,0x83,0x8B),
-     o3(0xE7,0x83,0x9D), o3(0xE7,0x83,0x99),
-     o3(0xE7,0x84,0x89), o3(0xE7,0x83,0xBD),
-     o3(0xE7,0x84,0x9C), o3(0xE7,0x84,0x99),
-     o3(0xE7,0x85,0xA5), o3(0xE7,0x85,0x95),
-     o3(0xE7,0x86,0x88), o3(0xE7,0x85,0xA6),
-     o3(0xE7,0x85,0xA2), o3(0xE7,0x85,0x8C),
-     o3(0xE7,0x85,0x96), o3(0xE7,0x85,0xAC),
-     o3(0xE7,0x86,0x8F), o3(0xE7,0x87,0xBB),
-     o3(0xE7,0x86,0x84), o3(0xE7,0x86,0x95),
-     o3(0xE7,0x86,0xA8), o3(0xE7,0x86,0xAC),
-     o3(0xE7,0x87,0x97), o3(0xE7,0x86,0xB9),
-     o3(0xE7,0x86,0xBE), o3(0xE7,0x87,0x92),
-     o3(0xE7,0x87,0x89), o3(0xE7,0x87,0x94),
-     o3(0xE7,0x87,0x8E), o3(0xE7,0x87,0xA0),
-     o3(0xE7,0x87,0xAC), o3(0xE7,0x87,0xA7),
-     o3(0xE7,0x87,0xB5), o3(0xE7,0x87,0xBC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_DF = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_DF_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E0_infos[95] = {
-     o3(0xE7,0x87,0xB9), o3(0xE7,0x87,0xBF),
-     o3(0xE7,0x88,0x8D), o3(0xE7,0x88,0x90),
-     o3(0xE7,0x88,0x9B), o3(0xE7,0x88,0xA8),
-     o3(0xE7,0x88,0xAD), o3(0xE7,0x88,0xAC),
-     o3(0xE7,0x88,0xB0), o3(0xE7,0x88,0xB2),
-     o3(0xE7,0x88,0xBB), o3(0xE7,0x88,0xBC),
-     o3(0xE7,0x88,0xBF), o3(0xE7,0x89,0x80),
-     o3(0xE7,0x89,0x86), o3(0xE7,0x89,0x8B),
-     o3(0xE7,0x89,0x98), o3(0xE7,0x89,0xB4),
-     o3(0xE7,0x89,0xBE), o3(0xE7,0x8A,0x82),
-     o3(0xE7,0x8A,0x81), o3(0xE7,0x8A,0x87),
-     o3(0xE7,0x8A,0x92), o3(0xE7,0x8A,0x96),
-     o3(0xE7,0x8A,0xA2), o3(0xE7,0x8A,0xA7),
-     o3(0xE7,0x8A,0xB9), o3(0xE7,0x8A,0xB2),
-     o3(0xE7,0x8B,0x83), o3(0xE7,0x8B,0x86),
-     o3(0xE7,0x8B,0x84), o3(0xE7,0x8B,0x8E),
-     o3(0xE7,0x8B,0x92), o3(0xE7,0x8B,0xA2),
-     o3(0xE7,0x8B,0xA0), o3(0xE7,0x8B,0xA1),
-     o3(0xE7,0x8B,0xB9), o3(0xE7,0x8B,0xB7),
-     o3(0xE5,0x80,0x8F), o3(0xE7,0x8C,0x97),
-     o3(0xE7,0x8C,0x8A), o3(0xE7,0x8C,0x9C),
-     o3(0xE7,0x8C,0x96), o3(0xE7,0x8C,0x9D),
-     o3(0xE7,0x8C,0xB4), o3(0xE7,0x8C,0xAF),
-     o3(0xE7,0x8C,0xA9), o3(0xE7,0x8C,0xA5),
-     o3(0xE7,0x8C,0xBE), o3(0xE7,0x8D,0x8E),
-     o3(0xE7,0x8D,0x8F), o3(0xE9,0xBB,0x98),
-     o3(0xE7,0x8D,0x97), o3(0xE7,0x8D,0xAA),
-     o3(0xE7,0x8D,0xA8), o3(0xE7,0x8D,0xB0),
-     o3(0xE7,0x8D,0xB8), o3(0xE7,0x8D,0xB5),
-     o3(0xE7,0x8D,0xBB), o3(0xE7,0x8D,0xBA),
-     o3(0xE7,0x8F,0x88), o3(0xE7,0x8E,0xB3),
-     o3(0xE7,0x8F,0x8E), o3(0xE7,0x8E,0xBB),
-     o3(0xE7,0x8F,0x80), o3(0xE7,0x8F,0xA5),
-     o3(0xE7,0x8F,0xAE), o3(0xE7,0x8F,0x9E),
-     o3(0xE7,0x92,0xA2), o3(0xE7,0x90,0x85),
-     o3(0xE7,0x91,0xAF), o3(0xE7,0x90,0xA5),
-     o3(0xE7,0x8F,0xB8), o3(0xE7,0x90,0xB2),
-     o3(0xE7,0x90,0xBA), o3(0xE7,0x91,0x95),
-     o3(0xE7,0x90,0xBF), o3(0xE7,0x91,0x9F),
-     o3(0xE7,0x91,0x99), o3(0xE7,0x91,0x81),
-     o3(0xE7,0x91,0x9C), o3(0xE7,0x91,0xA9),
-     o3(0xE7,0x91,0xB0), o3(0xE7,0x91,0xA3),
-     o3(0xE7,0x91,0xAA), o3(0xE7,0x91,0xB6),
-     o3(0xE7,0x91,0xBE), o3(0xE7,0x92,0x8B),
-     o3(0xE7,0x92,0x9E), o3(0xE7,0x92,0xA7),
-     o3(0xE7,0x93,0x8A), o3(0xE7,0x93,0x8F),
-     o3(0xE7,0x93,0x94), o3(0xE7,0x8F,0xB1),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E0 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E0_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E1_infos[95] = {
-     o3(0xE7,0x93,0xA0), o3(0xE7,0x93,0xA3),
-     o3(0xE7,0x93,0xA7), o3(0xE7,0x93,0xA9),
-     o3(0xE7,0x93,0xAE), o3(0xE7,0x93,0xB2),
-     o3(0xE7,0x93,0xB0), o3(0xE7,0x93,0xB1),
-     o3(0xE7,0x93,0xB8), o3(0xE7,0x93,0xB7),
-     o3(0xE7,0x94,0x84), o3(0xE7,0x94,0x83),
-     o3(0xE7,0x94,0x85), o3(0xE7,0x94,0x8C),
-     o3(0xE7,0x94,0x8E), o3(0xE7,0x94,0x8D),
-     o3(0xE7,0x94,0x95), o3(0xE7,0x94,0x93),
-     o3(0xE7,0x94,0x9E), o3(0xE7,0x94,0xA6),
-     o3(0xE7,0x94,0xAC), o3(0xE7,0x94,0xBC),
-     o3(0xE7,0x95,0x84), o3(0xE7,0x95,0x8D),
-     o3(0xE7,0x95,0x8A), o3(0xE7,0x95,0x89),
-     o3(0xE7,0x95,0x9B), o3(0xE7,0x95,0x86),
-     o3(0xE7,0x95,0x9A), o3(0xE7,0x95,0xA9),
-     o3(0xE7,0x95,0xA4), o3(0xE7,0x95,0xA7),
-     o3(0xE7,0x95,0xAB), o3(0xE7,0x95,0xAD),
-     o3(0xE7,0x95,0xB8), o3(0xE7,0x95,0xB6),
-     o3(0xE7,0x96,0x86), o3(0xE7,0x96,0x87),
-     o3(0xE7,0x95,0xB4), o3(0xE7,0x96,0x8A),
-     o3(0xE7,0x96,0x89), o3(0xE7,0x96,0x82),
-     o3(0xE7,0x96,0x94), o3(0xE7,0x96,0x9A),
-     o3(0xE7,0x96,0x9D), o3(0xE7,0x96,0xA5),
-     o3(0xE7,0x96,0xA3), o3(0xE7,0x97,0x82),
-     o3(0xE7,0x96,0xB3), o3(0xE7,0x97,0x83),
-     o3(0xE7,0x96,0xB5), o3(0xE7,0x96,0xBD),
-     o3(0xE7,0x96,0xB8), o3(0xE7,0x96,0xBC),
-     o3(0xE7,0x96,0xB1), o3(0xE7,0x97,0x8D),
-     o3(0xE7,0x97,0x8A), o3(0xE7,0x97,0x92),
-     o3(0xE7,0x97,0x99), o3(0xE7,0x97,0xA3),
-     o3(0xE7,0x97,0x9E), o3(0xE7,0x97,0xBE),
-     o3(0xE7,0x97,0xBF), o3(0xE7,0x97,0xBC),
-     o3(0xE7,0x98,0x81), o3(0xE7,0x97,0xB0),
-     o3(0xE7,0x97,0xBA), o3(0xE7,0x97,0xB2),
-     o3(0xE7,0x97,0xB3), o3(0xE7,0x98,0x8B),
-     o3(0xE7,0x98,0x8D), o3(0xE7,0x98,0x89),
-     o3(0xE7,0x98,0x9F), o3(0xE7,0x98,0xA7),
-     o3(0xE7,0x98,0xA0), o3(0xE7,0x98,0xA1),
-     o3(0xE7,0x98,0xA2), o3(0xE7,0x98,0xA4),
-     o3(0xE7,0x98,0xB4), o3(0xE7,0x98,0xB0),
-     o3(0xE7,0x98,0xBB), o3(0xE7,0x99,0x87),
-     o3(0xE7,0x99,0x88), o3(0xE7,0x99,0x86),
-     o3(0xE7,0x99,0x9C), o3(0xE7,0x99,0x98),
-     o3(0xE7,0x99,0xA1), o3(0xE7,0x99,0xA2),
-     o3(0xE7,0x99,0xA8), o3(0xE7,0x99,0xA9),
-     o3(0xE7,0x99,0xAA), o3(0xE7,0x99,0xA7),
-     o3(0xE7,0x99,0xAC), o3(0xE7,0x99,0xB0),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E1_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E2_infos[95] = {
-     o3(0xE7,0x99,0xB2), o3(0xE7,0x99,0xB6),
-     o3(0xE7,0x99,0xB8), o3(0xE7,0x99,0xBC),
-     o3(0xE7,0x9A,0x80), o3(0xE7,0x9A,0x83),
-     o3(0xE7,0x9A,0x88), o3(0xE7,0x9A,0x8B),
-     o3(0xE7,0x9A,0x8E), o3(0xE7,0x9A,0x96),
-     o3(0xE7,0x9A,0x93), o3(0xE7,0x9A,0x99),
-     o3(0xE7,0x9A,0x9A), o3(0xE7,0x9A,0xB0),
-     o3(0xE7,0x9A,0xB4), o3(0xE7,0x9A,0xB8),
-     o3(0xE7,0x9A,0xB9), o3(0xE7,0x9A,0xBA),
-     o3(0xE7,0x9B,0x82), o3(0xE7,0x9B,0x8D),
-     o3(0xE7,0x9B,0x96), o3(0xE7,0x9B,0x92),
-     o3(0xE7,0x9B,0x9E), o3(0xE7,0x9B,0xA1),
-     o3(0xE7,0x9B,0xA5), o3(0xE7,0x9B,0xA7),
-     o3(0xE7,0x9B,0xAA), o3(0xE8,0x98,0xAF),
-     o3(0xE7,0x9B,0xBB), o3(0xE7,0x9C,0x88),
-     o3(0xE7,0x9C,0x87), o3(0xE7,0x9C,0x84),
-     o3(0xE7,0x9C,0xA9), o3(0xE7,0x9C,0xA4),
-     o3(0xE7,0x9C,0x9E), o3(0xE7,0x9C,0xA5),
-     o3(0xE7,0x9C,0xA6), o3(0xE7,0x9C,0x9B),
-     o3(0xE7,0x9C,0xB7), o3(0xE7,0x9C,0xB8),
-     o3(0xE7,0x9D,0x87), o3(0xE7,0x9D,0x9A),
-     o3(0xE7,0x9D,0xA8), o3(0xE7,0x9D,0xAB),
-     o3(0xE7,0x9D,0x9B), o3(0xE7,0x9D,0xA5),
-     o3(0xE7,0x9D,0xBF), o3(0xE7,0x9D,0xBE),
-     o3(0xE7,0x9D,0xB9), o3(0xE7,0x9E,0x8E),
-     o3(0xE7,0x9E,0x8B), o3(0xE7,0x9E,0x91),
-     o3(0xE7,0x9E,0xA0), o3(0xE7,0x9E,0x9E),
-     o3(0xE7,0x9E,0xB0), o3(0xE7,0x9E,0xB6),
-     o3(0xE7,0x9E,0xB9), o3(0xE7,0x9E,0xBF),
-     o3(0xE7,0x9E,0xBC), o3(0xE7,0x9E,0xBD),
-     o3(0xE7,0x9E,0xBB), o3(0xE7,0x9F,0x87),
-     o3(0xE7,0x9F,0x8D), o3(0xE7,0x9F,0x97),
-     o3(0xE7,0x9F,0x9A), o3(0xE7,0x9F,0x9C),
-     o3(0xE7,0x9F,0xA3), o3(0xE7,0x9F,0xAE),
-     o3(0xE7,0x9F,0xBC), o3(0xE7,0xA0,0x8C),
-     o3(0xE7,0xA0,0x92), o3(0xE7,0xA4,0xA6),
-     o3(0xE7,0xA0,0xA0), o3(0xE7,0xA4,0xAA),
-     o3(0xE7,0xA1,0x85), o3(0xE7,0xA2,0x8E),
-     o3(0xE7,0xA1,0xB4), o3(0xE7,0xA2,0x86),
-     o3(0xE7,0xA1,0xBC), o3(0xE7,0xA2,0x9A),
-     o3(0xE7,0xA2,0x8C), o3(0xE7,0xA2,0xA3),
-     o3(0xE7,0xA2,0xB5), o3(0xE7,0xA2,0xAA),
-     o3(0xE7,0xA2,0xAF), o3(0xE7,0xA3,0x91),
-     o3(0xE7,0xA3,0x86), o3(0xE7,0xA3,0x8B),
-     o3(0xE7,0xA3,0x94), o3(0xE7,0xA2,0xBE),
-     o3(0xE7,0xA2,0xBC), o3(0xE7,0xA3,0x85),
-     o3(0xE7,0xA3,0x8A), o3(0xE7,0xA3,0xAC),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E2 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E2_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E3_infos[95] = {
-     o3(0xE7,0xA3,0xA7), o3(0xE7,0xA3,0x9A),
-     o3(0xE7,0xA3,0xBD), o3(0xE7,0xA3,0xB4),
-     o3(0xE7,0xA4,0x87), o3(0xE7,0xA4,0x92),
-     o3(0xE7,0xA4,0x91), o3(0xE7,0xA4,0x99),
-     o3(0xE7,0xA4,0xAC), o3(0xE7,0xA4,0xAB),
-     o3(0xE7,0xA5,0x80), o3(0xE7,0xA5,0xA0),
-     o3(0xE7,0xA5,0x97), o3(0xE7,0xA5,0x9F),
-     o3(0xE7,0xA5,0x9A), o3(0xE7,0xA5,0x95),
-     o3(0xE7,0xA5,0x93), o3(0xE7,0xA5,0xBA),
-     o3(0xE7,0xA5,0xBF), o3(0xE7,0xA6,0x8A),
-     o3(0xE7,0xA6,0x9D), o3(0xE7,0xA6,0xA7),
-     o3(0xE9,0xBD,0x8B), o3(0xE7,0xA6,0xAA),
-     o3(0xE7,0xA6,0xAE), o3(0xE7,0xA6,0xB3),
-     o3(0xE7,0xA6,0xB9), o3(0xE7,0xA6,0xBA),
-     o3(0xE7,0xA7,0x89), o3(0xE7,0xA7,0x95),
-     o3(0xE7,0xA7,0xA7), o3(0xE7,0xA7,0xAC),
-     o3(0xE7,0xA7,0xA1), o3(0xE7,0xA7,0xA3),
-     o3(0xE7,0xA8,0x88), o3(0xE7,0xA8,0x8D),
-     o3(0xE7,0xA8,0x98), o3(0xE7,0xA8,0x99),
-     o3(0xE7,0xA8,0xA0), o3(0xE7,0xA8,0x9F),
-     o3(0xE7,0xA6,0x80), o3(0xE7,0xA8,0xB1),
-     o3(0xE7,0xA8,0xBB), o3(0xE7,0xA8,0xBE),
-     o3(0xE7,0xA8,0xB7), o3(0xE7,0xA9,0x83),
-     o3(0xE7,0xA9,0x97), o3(0xE7,0xA9,0x89),
-     o3(0xE7,0xA9,0xA1), o3(0xE7,0xA9,0xA2),
-     o3(0xE7,0xA9,0xA9), o3(0xE9,0xBE,0x9D),
-     o3(0xE7,0xA9,0xB0), o3(0xE7,0xA9,0xB9),
-     o3(0xE7,0xA9,0xBD), o3(0xE7,0xAA,0x88),
-     o3(0xE7,0xAA,0x97), o3(0xE7,0xAA,0x95),
-     o3(0xE7,0xAA,0x98), o3(0xE7,0xAA,0x96),
-     o3(0xE7,0xAA,0xA9), o3(0xE7,0xAB,0x88),
-     o3(0xE7,0xAA,0xB0), o3(0xE7,0xAA,0xB6),
-     o3(0xE7,0xAB,0x85), o3(0xE7,0xAB,0x84),
-     o3(0xE7,0xAA,0xBF), o3(0xE9,0x82,0x83),
-     o3(0xE7,0xAB,0x87), o3(0xE7,0xAB,0x8A),
-     o3(0xE7,0xAB,0x8D), o3(0xE7,0xAB,0x8F),
-     o3(0xE7,0xAB,0x95), o3(0xE7,0xAB,0x93),
-     o3(0xE7,0xAB,0x99), o3(0xE7,0xAB,0x9A),
-     o3(0xE7,0xAB,0x9D), o3(0xE7,0xAB,0xA1),
-     o3(0xE7,0xAB,0xA2), o3(0xE7,0xAB,0xA6),
-     o3(0xE7,0xAB,0xAD), o3(0xE7,0xAB,0xB0),
-     o3(0xE7,0xAC,0x82), o3(0xE7,0xAC,0x8F),
-     o3(0xE7,0xAC,0x8A), o3(0xE7,0xAC,0x86),
-     o3(0xE7,0xAC,0xB3), o3(0xE7,0xAC,0x98),
-     o3(0xE7,0xAC,0x99), o3(0xE7,0xAC,0x9E),
-     o3(0xE7,0xAC,0xB5), o3(0xE7,0xAC,0xA8),
-     o3(0xE7,0xAC,0xB6), o3(0xE7,0xAD,0x90),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E3 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E3_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E4_infos[95] = {
-     o3(0xE7,0xAD,0xBA), o3(0xE7,0xAC,0x84),
-     o3(0xE7,0xAD,0x8D), o3(0xE7,0xAC,0x8B),
-     o3(0xE7,0xAD,0x8C), o3(0xE7,0xAD,0x85),
-     o3(0xE7,0xAD,0xB5), o3(0xE7,0xAD,0xA5),
-     o3(0xE7,0xAD,0xB4), o3(0xE7,0xAD,0xA7),
-     o3(0xE7,0xAD,0xB0), o3(0xE7,0xAD,0xB1),
-     o3(0xE7,0xAD,0xAC), o3(0xE7,0xAD,0xAE),
-     o3(0xE7,0xAE,0x9D), o3(0xE7,0xAE,0x98),
-     o3(0xE7,0xAE,0x9F), o3(0xE7,0xAE,0x8D),
-     o3(0xE7,0xAE,0x9C), o3(0xE7,0xAE,0x9A),
-     o3(0xE7,0xAE,0x8B), o3(0xE7,0xAE,0x92),
-     o3(0xE7,0xAE,0x8F), o3(0xE7,0xAD,0x9D),
-     o3(0xE7,0xAE,0x99), o3(0xE7,0xAF,0x8B),
-     o3(0xE7,0xAF,0x81), o3(0xE7,0xAF,0x8C),
-     o3(0xE7,0xAF,0x8F), o3(0xE7,0xAE,0xB4),
-     o3(0xE7,0xAF,0x86), o3(0xE7,0xAF,0x9D),
-     o3(0xE7,0xAF,0xA9), o3(0xE7,0xB0,0x91),
-     o3(0xE7,0xB0,0x94), o3(0xE7,0xAF,0xA6),
-     o3(0xE7,0xAF,0xA5), o3(0xE7,0xB1,0xA0),
-     o3(0xE7,0xB0,0x80), o3(0xE7,0xB0,0x87),
-     o3(0xE7,0xB0,0x93), o3(0xE7,0xAF,0xB3),
-     o3(0xE7,0xAF,0xB7), o3(0xE7,0xB0,0x97),
-     o3(0xE7,0xB0,0x8D), o3(0xE7,0xAF,0xB6),
-     o3(0xE7,0xB0,0xA3), o3(0xE7,0xB0,0xA7),
-     o3(0xE7,0xB0,0xAA), o3(0xE7,0xB0,0x9F),
-     o3(0xE7,0xB0,0xB7), o3(0xE7,0xB0,0xAB),
-     o3(0xE7,0xB0,0xBD), o3(0xE7,0xB1,0x8C),
-     o3(0xE7,0xB1,0x83), o3(0xE7,0xB1,0x94),
-     o3(0xE7,0xB1,0x8F), o3(0xE7,0xB1,0x80),
-     o3(0xE7,0xB1,0x90), o3(0xE7,0xB1,0x98),
-     o3(0xE7,0xB1,0x9F), o3(0xE7,0xB1,0xA4),
-     o3(0xE7,0xB1,0x96), o3(0xE7,0xB1,0xA5),
-     o3(0xE7,0xB1,0xAC), o3(0xE7,0xB1,0xB5),
-     o3(0xE7,0xB2,0x83), o3(0xE7,0xB2,0x90),
-     o3(0xE7,0xB2,0xA4), o3(0xE7,0xB2,0xAD),
-     o3(0xE7,0xB2,0xA2), o3(0xE7,0xB2,0xAB),
-     o3(0xE7,0xB2,0xA1), o3(0xE7,0xB2,0xA8),
-     o3(0xE7,0xB2,0xB3), o3(0xE7,0xB2,0xB2),
-     o3(0xE7,0xB2,0xB1), o3(0xE7,0xB2,0xAE),
-     o3(0xE7,0xB2,0xB9), o3(0xE7,0xB2,0xBD),
-     o3(0xE7,0xB3,0x80), o3(0xE7,0xB3,0x85),
-     o3(0xE7,0xB3,0x82), o3(0xE7,0xB3,0x98),
-     o3(0xE7,0xB3,0x92), o3(0xE7,0xB3,0x9C),
-     o3(0xE7,0xB3,0xA2), o3(0xE9,0xAC,0xBB),
-     o3(0xE7,0xB3,0xAF), o3(0xE7,0xB3,0xB2),
-     o3(0xE7,0xB3,0xB4), o3(0xE7,0xB3,0xB6),
-     o3(0xE7,0xB3,0xBA), o3(0xE7,0xB4,0x86),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E4 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E4_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E5_infos[95] = {
-     o3(0xE7,0xB4,0x82), o3(0xE7,0xB4,0x9C),
-     o3(0xE7,0xB4,0x95), o3(0xE7,0xB4,0x8A),
-     o3(0xE7,0xB5,0x85), o3(0xE7,0xB5,0x8B),
-     o3(0xE7,0xB4,0xAE), o3(0xE7,0xB4,0xB2),
-     o3(0xE7,0xB4,0xBF), o3(0xE7,0xB4,0xB5),
-     o3(0xE7,0xB5,0x86), o3(0xE7,0xB5,0xB3),
-     o3(0xE7,0xB5,0x96), o3(0xE7,0xB5,0x8E),
-     o3(0xE7,0xB5,0xB2), o3(0xE7,0xB5,0xA8),
-     o3(0xE7,0xB5,0xAE), o3(0xE7,0xB5,0x8F),
-     o3(0xE7,0xB5,0xA3), o3(0xE7,0xB6,0x93),
-     o3(0xE7,0xB6,0x89), o3(0xE7,0xB5,0x9B),
-     o3(0xE7,0xB6,0x8F), o3(0xE7,0xB5,0xBD),
-     o3(0xE7,0xB6,0x9B), o3(0xE7,0xB6,0xBA),
-     o3(0xE7,0xB6,0xAE), o3(0xE7,0xB6,0xA3),
-     o3(0xE7,0xB6,0xB5), o3(0xE7,0xB7,0x87),
-     o3(0xE7,0xB6,0xBD), o3(0xE7,0xB6,0xAB),
-     o3(0xE7,0xB8,0xBD), o3(0xE7,0xB6,0xA2),
-     o3(0xE7,0xB6,0xAF), o3(0xE7,0xB7,0x9C),
-     o3(0xE7,0xB6,0xB8), o3(0xE7,0xB6,0x9F),
-     o3(0xE7,0xB6,0xB0), o3(0xE7,0xB7,0x98),
-     o3(0xE7,0xB7,0x9D), o3(0xE7,0xB7,0xA4),
-     o3(0xE7,0xB7,0x9E), o3(0xE7,0xB7,0xBB),
-     o3(0xE7,0xB7,0xB2), o3(0xE7,0xB7,0xA1),
-     o3(0xE7,0xB8,0x85), o3(0xE7,0xB8,0x8A),
-     o3(0xE7,0xB8,0xA3), o3(0xE7,0xB8,0xA1),
-     o3(0xE7,0xB8,0x92), o3(0xE7,0xB8,0xB1),
-     o3(0xE7,0xB8,0x9F), o3(0xE7,0xB8,0x89),
-     o3(0xE7,0xB8,0x8B), o3(0xE7,0xB8,0xA2),
-     o3(0xE7,0xB9,0x86), o3(0xE7,0xB9,0xA6),
-     o3(0xE7,0xB8,0xBB), o3(0xE7,0xB8,0xB5),
-     o3(0xE7,0xB8,0xB9), o3(0xE7,0xB9,0x83),
-     o3(0xE7,0xB8,0xB7), o3(0xE7,0xB8,0xB2),
-     o3(0xE7,0xB8,0xBA), o3(0xE7,0xB9,0xA7),
-     o3(0xE7,0xB9,0x9D), o3(0xE7,0xB9,0x96),
-     o3(0xE7,0xB9,0x9E), o3(0xE7,0xB9,0x99),
-     o3(0xE7,0xB9,0x9A), o3(0xE7,0xB9,0xB9),
-     o3(0xE7,0xB9,0xAA), o3(0xE7,0xB9,0xA9),
-     o3(0xE7,0xB9,0xBC), o3(0xE7,0xB9,0xBB),
-     o3(0xE7,0xBA,0x83), o3(0xE7,0xB7,0x95),
-     o3(0xE7,0xB9,0xBD), o3(0xE8,0xBE,0xAE),
-     o3(0xE7,0xB9,0xBF), o3(0xE7,0xBA,0x88),
-     o3(0xE7,0xBA,0x89), o3(0xE7,0xBA,0x8C),
-     o3(0xE7,0xBA,0x92), o3(0xE7,0xBA,0x90),
-     o3(0xE7,0xBA,0x93), o3(0xE7,0xBA,0x94),
-     o3(0xE7,0xBA,0x96), o3(0xE7,0xBA,0x8E),
-     o3(0xE7,0xBA,0x9B), o3(0xE7,0xBA,0x9C),
-     o3(0xE7,0xBC,0xB8), o3(0xE7,0xBC,0xBA),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E5 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E5_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E6_infos[95] = {
-     o3(0xE7,0xBD,0x85), o3(0xE7,0xBD,0x8C),
-     o3(0xE7,0xBD,0x8D), o3(0xE7,0xBD,0x8E),
-     o3(0xE7,0xBD,0x90), o3(0xE7,0xBD,0x91),
-     o3(0xE7,0xBD,0x95), o3(0xE7,0xBD,0x94),
-     o3(0xE7,0xBD,0x98), o3(0xE7,0xBD,0x9F),
-     o3(0xE7,0xBD,0xA0), o3(0xE7,0xBD,0xA8),
-     o3(0xE7,0xBD,0xA9), o3(0xE7,0xBD,0xA7),
-     o3(0xE7,0xBD,0xB8), o3(0xE7,0xBE,0x82),
-     o3(0xE7,0xBE,0x86), o3(0xE7,0xBE,0x83),
-     o3(0xE7,0xBE,0x88), o3(0xE7,0xBE,0x87),
-     o3(0xE7,0xBE,0x8C), o3(0xE7,0xBE,0x94),
-     o3(0xE7,0xBE,0x9E), o3(0xE7,0xBE,0x9D),
-     o3(0xE7,0xBE,0x9A), o3(0xE7,0xBE,0xA3),
-     o3(0xE7,0xBE,0xAF), o3(0xE7,0xBE,0xB2),
-     o3(0xE7,0xBE,0xB9), o3(0xE7,0xBE,0xAE),
-     o3(0xE7,0xBE,0xB6), o3(0xE7,0xBE,0xB8),
-     o3(0xE8,0xAD,0xB1), o3(0xE7,0xBF,0x85),
-     o3(0xE7,0xBF,0x86), o3(0xE7,0xBF,0x8A),
-     o3(0xE7,0xBF,0x95), o3(0xE7,0xBF,0x94),
-     o3(0xE7,0xBF,0xA1), o3(0xE7,0xBF,0xA6),
-     o3(0xE7,0xBF,0xA9), o3(0xE7,0xBF,0xB3),
-     o3(0xE7,0xBF,0xB9), o3(0xE9,0xA3,0x9C),
-     o3(0xE8,0x80,0x86), o3(0xE8,0x80,0x84),
-     o3(0xE8,0x80,0x8B), o3(0xE8,0x80,0x92),
-     o3(0xE8,0x80,0x98), o3(0xE8,0x80,0x99),
-     o3(0xE8,0x80,0x9C), o3(0xE8,0x80,0xA1),
-     o3(0xE8,0x80,0xA8), o3(0xE8,0x80,0xBF),
-     o3(0xE8,0x80,0xBB), o3(0xE8,0x81,0x8A),
-     o3(0xE8,0x81,0x86), o3(0xE8,0x81,0x92),
-     o3(0xE8,0x81,0x98), o3(0xE8,0x81,0x9A),
-     o3(0xE8,0x81,0x9F), o3(0xE8,0x81,0xA2),
-     o3(0xE8,0x81,0xA8), o3(0xE8,0x81,0xB3),
-     o3(0xE8,0x81,0xB2), o3(0xE8,0x81,0xB0),
-     o3(0xE8,0x81,0xB6), o3(0xE8,0x81,0xB9),
-     o3(0xE8,0x81,0xBD), o3(0xE8,0x81,0xBF),
-     o3(0xE8,0x82,0x84), o3(0xE8,0x82,0x86),
-     o3(0xE8,0x82,0x85), o3(0xE8,0x82,0x9B),
-     o3(0xE8,0x82,0x93), o3(0xE8,0x82,0x9A),
-     o3(0xE8,0x82,0xAD), o3(0xE5,0x86,0x90),
-     o3(0xE8,0x82,0xAC), o3(0xE8,0x83,0x9B),
-     o3(0xE8,0x83,0xA5), o3(0xE8,0x83,0x99),
-     o3(0xE8,0x83,0x9D), o3(0xE8,0x83,0x84),
-     o3(0xE8,0x83,0x9A), o3(0xE8,0x83,0x96),
-     o3(0xE8,0x84,0x89), o3(0xE8,0x83,0xAF),
-     o3(0xE8,0x83,0xB1), o3(0xE8,0x84,0x9B),
-     o3(0xE8,0x84,0xA9), o3(0xE8,0x84,0xA3),
-     o3(0xE8,0x84,0xAF), o3(0xE8,0x85,0x8B),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E6 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E6_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E7_infos[95] = {
-     o3(0xE9,0x9A,0x8B), o3(0xE8,0x85,0x86),
-     o3(0xE8,0x84,0xBE), o3(0xE8,0x85,0x93),
-     o3(0xE8,0x85,0x91), o3(0xE8,0x83,0xBC),
-     o3(0xE8,0x85,0xB1), o3(0xE8,0x85,0xAE),
-     o3(0xE8,0x85,0xA5), o3(0xE8,0x85,0xA6),
-     o3(0xE8,0x85,0xB4), o3(0xE8,0x86,0x83),
-     o3(0xE8,0x86,0x88), o3(0xE8,0x86,0x8A),
-     o3(0xE8,0x86,0x80), o3(0xE8,0x86,0x82),
-     o3(0xE8,0x86,0xA0), o3(0xE8,0x86,0x95),
-     o3(0xE8,0x86,0xA4), o3(0xE8,0x86,0xA3),
-     o3(0xE8,0x85,0x9F), o3(0xE8,0x86,0x93),
-     o3(0xE8,0x86,0xA9), o3(0xE8,0x86,0xB0),
-     o3(0xE8,0x86,0xB5), o3(0xE8,0x86,0xBE),
-     o3(0xE8,0x86,0xB8), o3(0xE8,0x86,0xBD),
-     o3(0xE8,0x87,0x80), o3(0xE8,0x87,0x82),
-     o3(0xE8,0x86,0xBA), o3(0xE8,0x87,0x89),
-     o3(0xE8,0x87,0x8D), o3(0xE8,0x87,0x91),
-     o3(0xE8,0x87,0x99), o3(0xE8,0x87,0x98),
-     o3(0xE8,0x87,0x88), o3(0xE8,0x87,0x9A),
-     o3(0xE8,0x87,0x9F), o3(0xE8,0x87,0xA0),
-     o3(0xE8,0x87,0xA7), o3(0xE8,0x87,0xBA),
-     o3(0xE8,0x87,0xBB), o3(0xE8,0x87,0xBE),
-     o3(0xE8,0x88,0x81), o3(0xE8,0x88,0x82),
-     o3(0xE8,0x88,0x85), o3(0xE8,0x88,0x87),
-     o3(0xE8,0x88,0x8A), o3(0xE8,0x88,0x8D),
-     o3(0xE8,0x88,0x90), o3(0xE8,0x88,0x96),
-     o3(0xE8,0x88,0xA9), o3(0xE8,0x88,0xAB),
-     o3(0xE8,0x88,0xB8), o3(0xE8,0x88,0xB3),
-     o3(0xE8,0x89,0x80), o3(0xE8,0x89,0x99),
-     o3(0xE8,0x89,0x98), o3(0xE8,0x89,0x9D),
-     o3(0xE8,0x89,0x9A), o3(0xE8,0x89,0x9F),
-     o3(0xE8,0x89,0xA4), o3(0xE8,0x89,0xA2),
-     o3(0xE8,0x89,0xA8), o3(0xE8,0x89,0xAA),
-     o3(0xE8,0x89,0xAB), o3(0xE8,0x88,0xAE),
-     o3(0xE8,0x89,0xB1), o3(0xE8,0x89,0xB7),
-     o3(0xE8,0x89,0xB8), o3(0xE8,0x89,0xBE),
-     o3(0xE8,0x8A,0x8D), o3(0xE8,0x8A,0x92),
-     o3(0xE8,0x8A,0xAB), o3(0xE8,0x8A,0x9F),
-     o3(0xE8,0x8A,0xBB), o3(0xE8,0x8A,0xAC),
-     o3(0xE8,0x8B,0xA1), o3(0xE8,0x8B,0xA3),
-     o3(0xE8,0x8B,0x9F), o3(0xE8,0x8B,0x92),
-     o3(0xE8,0x8B,0xB4), o3(0xE8,0x8B,0xB3),
-     o3(0xE8,0x8B,0xBA), o3(0xE8,0x8E,0x93),
-     o3(0xE8,0x8C,0x83), o3(0xE8,0x8B,0xBB),
-     o3(0xE8,0x8B,0xB9), o3(0xE8,0x8B,0x9E),
-     o3(0xE8,0x8C,0x86), o3(0xE8,0x8B,0x9C),
-     o3(0xE8,0x8C,0x89), o3(0xE8,0x8B,0x99),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E7 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E7_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E8_infos[95] = {
-     o3(0xE8,0x8C,0xB5), o3(0xE8,0x8C,0xB4),
-     o3(0xE8,0x8C,0x96), o3(0xE8,0x8C,0xB2),
-     o3(0xE8,0x8C,0xB1), o3(0xE8,0x8D,0x80),
-     o3(0xE8,0x8C,0xB9), o3(0xE8,0x8D,0x90),
-     o3(0xE8,0x8D,0x85), o3(0xE8,0x8C,0xAF),
-     o3(0xE8,0x8C,0xAB), o3(0xE8,0x8C,0x97),
-     o3(0xE8,0x8C,0x98), o3(0xE8,0x8E,0x85),
-     o3(0xE8,0x8E,0x9A), o3(0xE8,0x8E,0xAA),
-     o3(0xE8,0x8E,0x9F), o3(0xE8,0x8E,0xA2),
-     o3(0xE8,0x8E,0x96), o3(0xE8,0x8C,0xA3),
-     o3(0xE8,0x8E,0x8E), o3(0xE8,0x8E,0x87),
-     o3(0xE8,0x8E,0x8A), o3(0xE8,0x8D,0xBC),
-     o3(0xE8,0x8E,0xB5), o3(0xE8,0x8D,0xB3),
-     o3(0xE8,0x8D,0xB5), o3(0xE8,0x8E,0xA0),
-     o3(0xE8,0x8E,0x89), o3(0xE8,0x8E,0xA8),
-     o3(0xE8,0x8F,0xB4), o3(0xE8,0x90,0x93),
-     o3(0xE8,0x8F,0xAB), o3(0xE8,0x8F,0x8E),
-     o3(0xE8,0x8F,0xBD), o3(0xE8,0x90,0x83),
-     o3(0xE8,0x8F,0x98), o3(0xE8,0x90,0x8B),
-     o3(0xE8,0x8F,0x81), o3(0xE8,0x8F,0xB7),
-     o3(0xE8,0x90,0x87), o3(0xE8,0x8F,0xA0),
-     o3(0xE8,0x8F,0xB2), o3(0xE8,0x90,0x8D),
-     o3(0xE8,0x90,0xA2), o3(0xE8,0x90,0xA0),
-     o3(0xE8,0x8E,0xBD), o3(0xE8,0x90,0xB8),
-     o3(0xE8,0x94,0x86), o3(0xE8,0x8F,0xBB),
-     o3(0xE8,0x91,0xAD), o3(0xE8,0x90,0xAA),
-     o3(0xE8,0x90,0xBC), o3(0xE8,0x95,0x9A),
-     o3(0xE8,0x92,0x84), o3(0xE8,0x91,0xB7),
-     o3(0xE8,0x91,0xAB), o3(0xE8,0x92,0xAD),
-     o3(0xE8,0x91,0xAE), o3(0xE8,0x92,0x82),
-     o3(0xE8,0x91,0xA9), o3(0xE8,0x91,0x86),
-     o3(0xE8,0x90,0xAC), o3(0xE8,0x91,0xAF),
-     o3(0xE8,0x91,0xB9), o3(0xE8,0x90,0xB5),
-     o3(0xE8,0x93,0x8A), o3(0xE8,0x91,0xA2),
-     o3(0xE8,0x92,0xB9), o3(0xE8,0x92,0xBF),
-     o3(0xE8,0x92,0x9F), o3(0xE8,0x93,0x99),
-     o3(0xE8,0x93,0x8D), o3(0xE8,0x92,0xBB),
-     o3(0xE8,0x93,0x9A), o3(0xE8,0x93,0x90),
-     o3(0xE8,0x93,0x81), o3(0xE8,0x93,0x86),
-     o3(0xE8,0x93,0x96), o3(0xE8,0x92,0xA1),
-     o3(0xE8,0x94,0xA1), o3(0xE8,0x93,0xBF),
-     o3(0xE8,0x93,0xB4), o3(0xE8,0x94,0x97),
-     o3(0xE8,0x94,0x98), o3(0xE8,0x94,0xAC),
-     o3(0xE8,0x94,0x9F), o3(0xE8,0x94,0x95),
-     o3(0xE8,0x94,0x94), o3(0xE8,0x93,0xBC),
-     o3(0xE8,0x95,0x80), o3(0xE8,0x95,0xA3),
-     o3(0xE8,0x95,0x98), o3(0xE8,0x95,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E8 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E8_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_E9_infos[95] = {
-     o3(0xE8,0x95,0x81), o3(0xE8,0x98,0x82),
-     o3(0xE8,0x95,0x8B), o3(0xE8,0x95,0x95),
-     o3(0xE8,0x96,0x80), o3(0xE8,0x96,0xA4),
-     o3(0xE8,0x96,0x88), o3(0xE8,0x96,0x91),
-     o3(0xE8,0x96,0x8A), o3(0xE8,0x96,0xA8),
-     o3(0xE8,0x95,0xAD), o3(0xE8,0x96,0x94),
-     o3(0xE8,0x96,0x9B), o3(0xE8,0x97,0xAA),
-     o3(0xE8,0x96,0x87), o3(0xE8,0x96,0x9C),
-     o3(0xE8,0x95,0xB7), o3(0xE8,0x95,0xBE),
-     o3(0xE8,0x96,0x90), o3(0xE8,0x97,0x89),
-     o3(0xE8,0x96,0xBA), o3(0xE8,0x97,0x8F),
-     o3(0xE8,0x96,0xB9), o3(0xE8,0x97,0x90),
-     o3(0xE8,0x97,0x95), o3(0xE8,0x97,0x9D),
-     o3(0xE8,0x97,0xA5), o3(0xE8,0x97,0x9C),
-     o3(0xE8,0x97,0xB9), o3(0xE8,0x98,0x8A),
-     o3(0xE8,0x98,0x93), o3(0xE8,0x98,0x8B),
-     o3(0xE8,0x97,0xBE), o3(0xE8,0x97,0xBA),
-     o3(0xE8,0x98,0x86), o3(0xE8,0x98,0xA2),
-     o3(0xE8,0x98,0x9A), o3(0xE8,0x98,0xB0),
-     o3(0xE8,0x98,0xBF), o3(0xE8,0x99,0x8D),
-     o3(0xE4,0xB9,0x95), o3(0xE8,0x99,0x94),
-     o3(0xE8,0x99,0x9F), o3(0xE8,0x99,0xA7),
-     o3(0xE8,0x99,0xB1), o3(0xE8,0x9A,0x93),
-     o3(0xE8,0x9A,0xA3), o3(0xE8,0x9A,0xA9),
-     o3(0xE8,0x9A,0xAA), o3(0xE8,0x9A,0x8B),
-     o3(0xE8,0x9A,0x8C), o3(0xE8,0x9A,0xB6),
-     o3(0xE8,0x9A,0xAF), o3(0xE8,0x9B,0x84),
-     o3(0xE8,0x9B,0x86), o3(0xE8,0x9A,0xB0),
-     o3(0xE8,0x9B,0x89), o3(0xE8,0xA0,0xA3),
-     o3(0xE8,0x9A,0xAB), o3(0xE8,0x9B,0x94),
-     o3(0xE8,0x9B,0x9E), o3(0xE8,0x9B,0xA9),
-     o3(0xE8,0x9B,0xAC), o3(0xE8,0x9B,0x9F),
-     o3(0xE8,0x9B,0x9B), o3(0xE8,0x9B,0xAF),
-     o3(0xE8,0x9C,0x92), o3(0xE8,0x9C,0x86),
-     o3(0xE8,0x9C,0x88), o3(0xE8,0x9C,0x80),
-     o3(0xE8,0x9C,0x83), o3(0xE8,0x9B,0xBB),
-     o3(0xE8,0x9C,0x91), o3(0xE8,0x9C,0x89),
-     o3(0xE8,0x9C,0x8D), o3(0xE8,0x9B,0xB9),
-     o3(0xE8,0x9C,0x8A), o3(0xE8,0x9C,0xB4),
-     o3(0xE8,0x9C,0xBF), o3(0xE8,0x9C,0xB7),
-     o3(0xE8,0x9C,0xBB), o3(0xE8,0x9C,0xA5),
-     o3(0xE8,0x9C,0xA9), o3(0xE8,0x9C,0x9A),
-     o3(0xE8,0x9D,0xA0), o3(0xE8,0x9D,0x9F),
-     o3(0xE8,0x9D,0xB8), o3(0xE8,0x9D,0x8C),
-     o3(0xE8,0x9D,0x8E), o3(0xE8,0x9D,0xB4),
-     o3(0xE8,0x9D,0x97), o3(0xE8,0x9D,0xA8),
-     o3(0xE8,0x9D,0xAE), o3(0xE8,0x9D,0x99),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_E9 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_E9_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_EA_infos[95] = {
-     o3(0xE8,0x9D,0x93), o3(0xE8,0x9D,0xA3),
-     o3(0xE8,0x9D,0xAA), o3(0xE8,0xA0,0x85),
-     o3(0xE8,0x9E,0xA2), o3(0xE8,0x9E,0x9F),
-     o3(0xE8,0x9E,0x82), o3(0xE8,0x9E,0xAF),
-     o3(0xE8,0x9F,0x8B), o3(0xE8,0x9E,0xBD),
-     o3(0xE8,0x9F,0x80), o3(0xE8,0x9F,0x90),
-     o3(0xE9,0x9B,0x96), o3(0xE8,0x9E,0xAB),
-     o3(0xE8,0x9F,0x84), o3(0xE8,0x9E,0xB3),
-     o3(0xE8,0x9F,0x87), o3(0xE8,0x9F,0x86),
-     o3(0xE8,0x9E,0xBB), o3(0xE8,0x9F,0xAF),
-     o3(0xE8,0x9F,0xB2), o3(0xE8,0x9F,0xA0),
-     o3(0xE8,0xA0,0x8F), o3(0xE8,0xA0,0x8D),
-     o3(0xE8,0x9F,0xBE), o3(0xE8,0x9F,0xB6),
-     o3(0xE8,0x9F,0xB7), o3(0xE8,0xA0,0x8E),
-     o3(0xE8,0x9F,0x92), o3(0xE8,0xA0,0x91),
-     o3(0xE8,0xA0,0x96), o3(0xE8,0xA0,0x95),
-     o3(0xE8,0xA0,0xA2), o3(0xE8,0xA0,0xA1),
-     o3(0xE8,0xA0,0xB1), o3(0xE8,0xA0,0xB6),
-     o3(0xE8,0xA0,0xB9), o3(0xE8,0xA0,0xA7),
-     o3(0xE8,0xA0,0xBB), o3(0xE8,0xA1,0x84),
-     o3(0xE8,0xA1,0x82), o3(0xE8,0xA1,0x92),
-     o3(0xE8,0xA1,0x99), o3(0xE8,0xA1,0x9E),
-     o3(0xE8,0xA1,0xA2), o3(0xE8,0xA1,0xAB),
-     o3(0xE8,0xA2,0x81), o3(0xE8,0xA1,0xBE),
-     o3(0xE8,0xA2,0x9E), o3(0xE8,0xA1,0xB5),
-     o3(0xE8,0xA1,0xBD), o3(0xE8,0xA2,0xB5),
-     o3(0xE8,0xA1,0xB2), o3(0xE8,0xA2,0x82),
-     o3(0xE8,0xA2,0x97), o3(0xE8,0xA2,0x92),
-     o3(0xE8,0xA2,0xAE), o3(0xE8,0xA2,0x99),
-     o3(0xE8,0xA2,0xA2), o3(0xE8,0xA2,0x8D),
-     o3(0xE8,0xA2,0xA4), o3(0xE8,0xA2,0xB0),
-     o3(0xE8,0xA2,0xBF), o3(0xE8,0xA2,0xB1),
-     o3(0xE8,0xA3,0x83), o3(0xE8,0xA3,0x84),
-     o3(0xE8,0xA3,0x94), o3(0xE8,0xA3,0x98),
-     o3(0xE8,0xA3,0x99), o3(0xE8,0xA3,0x9D),
-     o3(0xE8,0xA3,0xB9), o3(0xE8,0xA4,0x82),
-     o3(0xE8,0xA3,0xBC), o3(0xE8,0xA3,0xB4),
-     o3(0xE8,0xA3,0xA8), o3(0xE8,0xA3,0xB2),
-     o3(0xE8,0xA4,0x84), o3(0xE8,0xA4,0x8C),
-     o3(0xE8,0xA4,0x8A), o3(0xE8,0xA4,0x93),
-     o3(0xE8,0xA5,0x83), o3(0xE8,0xA4,0x9E),
-     o3(0xE8,0xA4,0xA5), o3(0xE8,0xA4,0xAA),
-     o3(0xE8,0xA4,0xAB), o3(0xE8,0xA5,0x81),
-     o3(0xE8,0xA5,0x84), o3(0xE8,0xA4,0xBB),
-     o3(0xE8,0xA4,0xB6), o3(0xE8,0xA4,0xB8),
-     o3(0xE8,0xA5,0x8C), o3(0xE8,0xA4,0x9D),
-     o3(0xE8,0xA5,0xA0), o3(0xE8,0xA5,0x9E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_EA = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_EA_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_EB_infos[95] = {
-     o3(0xE8,0xA5,0xA6), o3(0xE8,0xA5,0xA4),
-     o3(0xE8,0xA5,0xAD), o3(0xE8,0xA5,0xAA),
-     o3(0xE8,0xA5,0xAF), o3(0xE8,0xA5,0xB4),
-     o3(0xE8,0xA5,0xB7), o3(0xE8,0xA5,0xBE),
-     o3(0xE8,0xA6,0x83), o3(0xE8,0xA6,0x88),
-     o3(0xE8,0xA6,0x8A), o3(0xE8,0xA6,0x93),
-     o3(0xE8,0xA6,0x98), o3(0xE8,0xA6,0xA1),
-     o3(0xE8,0xA6,0xA9), o3(0xE8,0xA6,0xA6),
-     o3(0xE8,0xA6,0xAC), o3(0xE8,0xA6,0xAF),
-     o3(0xE8,0xA6,0xB2), o3(0xE8,0xA6,0xBA),
-     o3(0xE8,0xA6,0xBD), o3(0xE8,0xA6,0xBF),
-     o3(0xE8,0xA7,0x80), o3(0xE8,0xA7,0x9A),
-     o3(0xE8,0xA7,0x9C), o3(0xE8,0xA7,0x9D),
-     o3(0xE8,0xA7,0xA7), o3(0xE8,0xA7,0xB4),
-     o3(0xE8,0xA7,0xB8), o3(0xE8,0xA8,0x83),
-     o3(0xE8,0xA8,0x96), o3(0xE8,0xA8,0x90),
-     o3(0xE8,0xA8,0x8C), o3(0xE8,0xA8,0x9B),
-     o3(0xE8,0xA8,0x9D), o3(0xE8,0xA8,0xA5),
-     o3(0xE8,0xA8,0xB6), o3(0xE8,0xA9,0x81),
-     o3(0xE8,0xA9,0x9B), o3(0xE8,0xA9,0x92),
-     o3(0xE8,0xA9,0x86), o3(0xE8,0xA9,0x88),
-     o3(0xE8,0xA9,0xBC), o3(0xE8,0xA9,0xAD),
-     o3(0xE8,0xA9,0xAC), o3(0xE8,0xA9,0xA2),
-     o3(0xE8,0xAA,0x85), o3(0xE8,0xAA,0x82),
-     o3(0xE8,0xAA,0x84), o3(0xE8,0xAA,0xA8),
-     o3(0xE8,0xAA,0xA1), o3(0xE8,0xAA,0x91),
-     o3(0xE8,0xAA,0xA5), o3(0xE8,0xAA,0xA6),
-     o3(0xE8,0xAA,0x9A), o3(0xE8,0xAA,0xA3),
-     o3(0xE8,0xAB,0x84), o3(0xE8,0xAB,0x8D),
-     o3(0xE8,0xAB,0x82), o3(0xE8,0xAB,0x9A),
-     o3(0xE8,0xAB,0xAB), o3(0xE8,0xAB,0xB3),
-     o3(0xE8,0xAB,0xA7), o3(0xE8,0xAB,0xA4),
-     o3(0xE8,0xAB,0xB1), o3(0xE8,0xAC,0x94),
-     o3(0xE8,0xAB,0xA0), o3(0xE8,0xAB,0xA2),
-     o3(0xE8,0xAB,0xB7), o3(0xE8,0xAB,0x9E),
-     o3(0xE8,0xAB,0x9B), o3(0xE8,0xAC,0x8C),
-     o3(0xE8,0xAC,0x87), o3(0xE8,0xAC,0x9A),
-     o3(0xE8,0xAB,0xA1), o3(0xE8,0xAC,0x96),
-     o3(0xE8,0xAC,0x90), o3(0xE8,0xAC,0x97),
-     o3(0xE8,0xAC,0xA0), o3(0xE8,0xAC,0xB3),
-     o3(0xE9,0x9E,0xAB), o3(0xE8,0xAC,0xA6),
-     o3(0xE8,0xAC,0xAB), o3(0xE8,0xAC,0xBE),
-     o3(0xE8,0xAC,0xA8), o3(0xE8,0xAD,0x81),
-     o3(0xE8,0xAD,0x8C), o3(0xE8,0xAD,0x8F),
-     o3(0xE8,0xAD,0x8E), o3(0xE8,0xAD,0x89),
-     o3(0xE8,0xAD,0x96), o3(0xE8,0xAD,0x9B),
-     o3(0xE8,0xAD,0x9A), o3(0xE8,0xAD,0xAB),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_EB = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_EB_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_EC_infos[95] = {
-     o3(0xE8,0xAD,0x9F), o3(0xE8,0xAD,0xAC),
-     o3(0xE8,0xAD,0xAF), o3(0xE8,0xAD,0xB4),
-     o3(0xE8,0xAD,0xBD), o3(0xE8,0xAE,0x80),
-     o3(0xE8,0xAE,0x8C), o3(0xE8,0xAE,0x8E),
-     o3(0xE8,0xAE,0x92), o3(0xE8,0xAE,0x93),
-     o3(0xE8,0xAE,0x96), o3(0xE8,0xAE,0x99),
-     o3(0xE8,0xAE,0x9A), o3(0xE8,0xB0,0xBA),
-     o3(0xE8,0xB1,0x81), o3(0xE8,0xB0,0xBF),
-     o3(0xE8,0xB1,0x88), o3(0xE8,0xB1,0x8C),
-     o3(0xE8,0xB1,0x8E), o3(0xE8,0xB1,0x90),
-     o3(0xE8,0xB1,0x95), o3(0xE8,0xB1,0xA2),
-     o3(0xE8,0xB1,0xAC), o3(0xE8,0xB1,0xB8),
-     o3(0xE8,0xB1,0xBA), o3(0xE8,0xB2,0x82),
-     o3(0xE8,0xB2,0x89), o3(0xE8,0xB2,0x85),
-     o3(0xE8,0xB2,0x8A), o3(0xE8,0xB2,0x8D),
-     o3(0xE8,0xB2,0x8E), o3(0xE8,0xB2,0x94),
-     o3(0xE8,0xB1,0xBC), o3(0xE8,0xB2,0x98),
-     o3(0xE6,0x88,0x9D), o3(0xE8,0xB2,0xAD),
-     o3(0xE8,0xB2,0xAA), o3(0xE8,0xB2,0xBD),
-     o3(0xE8,0xB2,0xB2), o3(0xE8,0xB2,0xB3),
-     o3(0xE8,0xB2,0xAE), o3(0xE8,0xB2,0xB6),
-     o3(0xE8,0xB3,0x88), o3(0xE8,0xB3,0x81),
-     o3(0xE8,0xB3,0xA4), o3(0xE8,0xB3,0xA3),
-     o3(0xE8,0xB3,0x9A), o3(0xE8,0xB3,0xBD),
-     o3(0xE8,0xB3,0xBA), o3(0xE8,0xB3,0xBB),
-     o3(0xE8,0xB4,0x84), o3(0xE8,0xB4,0x85),
-     o3(0xE8,0xB4,0x8A), o3(0xE8,0xB4,0x87),
-     o3(0xE8,0xB4,0x8F), o3(0xE8,0xB4,0x8D),
-     o3(0xE8,0xB4,0x90), o3(0xE9,0xBD,0x8E),
-     o3(0xE8,0xB4,0x93), o3(0xE8,0xB3,0x8D),
-     o3(0xE8,0xB4,0x94), o3(0xE8,0xB4,0x96),
-     o3(0xE8,0xB5,0xA7), o3(0xE8,0xB5,0xAD),
-     o3(0xE8,0xB5,0xB1), o3(0xE8,0xB5,0xB3),
-     o3(0xE8,0xB6,0x81), o3(0xE8,0xB6,0x99),
-     o3(0xE8,0xB7,0x82), o3(0xE8,0xB6,0xBE),
-     o3(0xE8,0xB6,0xBA), o3(0xE8,0xB7,0x8F),
-     o3(0xE8,0xB7,0x9A), o3(0xE8,0xB7,0x96),
-     o3(0xE8,0xB7,0x8C), o3(0xE8,0xB7,0x9B),
-     o3(0xE8,0xB7,0x8B), o3(0xE8,0xB7,0xAA),
-     o3(0xE8,0xB7,0xAB), o3(0xE8,0xB7,0x9F),
-     o3(0xE8,0xB7,0xA3), o3(0xE8,0xB7,0xBC),
-     o3(0xE8,0xB8,0x88), o3(0xE8,0xB8,0x89),
-     o3(0xE8,0xB7,0xBF), o3(0xE8,0xB8,0x9D),
-     o3(0xE8,0xB8,0x9E), o3(0xE8,0xB8,0x90),
-     o3(0xE8,0xB8,0x9F), o3(0xE8,0xB9,0x82),
-     o3(0xE8,0xB8,0xB5), o3(0xE8,0xB8,0xB0),
-     o3(0xE8,0xB8,0xB4), o3(0xE8,0xB9,0x8A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_EC = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_EC_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_ED_infos[95] = {
-     o3(0xE8,0xB9,0x87), o3(0xE8,0xB9,0x89),
-     o3(0xE8,0xB9,0x8C), o3(0xE8,0xB9,0x90),
-     o3(0xE8,0xB9,0x88), o3(0xE8,0xB9,0x99),
-     o3(0xE8,0xB9,0xA4), o3(0xE8,0xB9,0xA0),
-     o3(0xE8,0xB8,0xAA), o3(0xE8,0xB9,0xA3),
-     o3(0xE8,0xB9,0x95), o3(0xE8,0xB9,0xB6),
-     o3(0xE8,0xB9,0xB2), o3(0xE8,0xB9,0xBC),
-     o3(0xE8,0xBA,0x81), o3(0xE8,0xBA,0x87),
-     o3(0xE8,0xBA,0x85), o3(0xE8,0xBA,0x84),
-     o3(0xE8,0xBA,0x8B), o3(0xE8,0xBA,0x8A),
-     o3(0xE8,0xBA,0x93), o3(0xE8,0xBA,0x91),
-     o3(0xE8,0xBA,0x94), o3(0xE8,0xBA,0x99),
-     o3(0xE8,0xBA,0xAA), o3(0xE8,0xBA,0xA1),
-     o3(0xE8,0xBA,0xAC), o3(0xE8,0xBA,0xB0),
-     o3(0xE8,0xBB,0x86), o3(0xE8,0xBA,0xB1),
-     o3(0xE8,0xBA,0xBE), o3(0xE8,0xBB,0x85),
-     o3(0xE8,0xBB,0x88), o3(0xE8,0xBB,0x8B),
-     o3(0xE8,0xBB,0x9B), o3(0xE8,0xBB,0xA3),
-     o3(0xE8,0xBB,0xBC), o3(0xE8,0xBB,0xBB),
-     o3(0xE8,0xBB,0xAB), o3(0xE8,0xBB,0xBE),
-     o3(0xE8,0xBC,0x8A), o3(0xE8,0xBC,0x85),
-     o3(0xE8,0xBC,0x95), o3(0xE8,0xBC,0x92),
-     o3(0xE8,0xBC,0x99), o3(0xE8,0xBC,0x93),
-     o3(0xE8,0xBC,0x9C), o3(0xE8,0xBC,0x9F),
-     o3(0xE8,0xBC,0x9B), o3(0xE8,0xBC,0x8C),
-     o3(0xE8,0xBC,0xA6), o3(0xE8,0xBC,0xB3),
-     o3(0xE8,0xBC,0xBB), o3(0xE8,0xBC,0xB9),
-     o3(0xE8,0xBD,0x85), o3(0xE8,0xBD,0x82),
-     o3(0xE8,0xBC,0xBE), o3(0xE8,0xBD,0x8C),
-     o3(0xE8,0xBD,0x89), o3(0xE8,0xBD,0x86),
-     o3(0xE8,0xBD,0x8E), o3(0xE8,0xBD,0x97),
-     o3(0xE8,0xBD,0x9C), o3(0xE8,0xBD,0xA2),
-     o3(0xE8,0xBD,0xA3), o3(0xE8,0xBD,0xA4),
-     o3(0xE8,0xBE,0x9C), o3(0xE8,0xBE,0x9F),
-     o3(0xE8,0xBE,0xA3), o3(0xE8,0xBE,0xAD),
-     o3(0xE8,0xBE,0xAF), o3(0xE8,0xBE,0xB7),
-     o3(0xE8,0xBF,0x9A), o3(0xE8,0xBF,0xA5),
-     o3(0xE8,0xBF,0xA2), o3(0xE8,0xBF,0xAA),
-     o3(0xE8,0xBF,0xAF), o3(0xE9,0x82,0x87),
-     o3(0xE8,0xBF,0xB4), o3(0xE9,0x80,0x85),
-     o3(0xE8,0xBF,0xB9), o3(0xE8,0xBF,0xBA),
-     o3(0xE9,0x80,0x91), o3(0xE9,0x80,0x95),
-     o3(0xE9,0x80,0xA1), o3(0xE9,0x80,0x8D),
-     o3(0xE9,0x80,0x9E), o3(0xE9,0x80,0x96),
-     o3(0xE9,0x80,0x8B), o3(0xE9,0x80,0xA7),
-     o3(0xE9,0x80,0xB6), o3(0xE9,0x80,0xB5),
-     o3(0xE9,0x80,0xB9), o3(0xE8,0xBF,0xB8),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_ED = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_ED_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_EE_infos[95] = {
-     o3(0xE9,0x81,0x8F), o3(0xE9,0x81,0x90),
-     o3(0xE9,0x81,0x91), o3(0xE9,0x81,0x92),
-     o3(0xE9,0x80,0x8E), o3(0xE9,0x81,0x89),
-     o3(0xE9,0x80,0xBE), o3(0xE9,0x81,0x96),
-     o3(0xE9,0x81,0x98), o3(0xE9,0x81,0x9E),
-     o3(0xE9,0x81,0xA8), o3(0xE9,0x81,0xAF),
-     o3(0xE9,0x81,0xB6), o3(0xE9,0x9A,0xA8),
-     o3(0xE9,0x81,0xB2), o3(0xE9,0x82,0x82),
-     o3(0xE9,0x81,0xBD), o3(0xE9,0x82,0x81),
-     o3(0xE9,0x82,0x80), o3(0xE9,0x82,0x8A),
-     o3(0xE9,0x82,0x89), o3(0xE9,0x82,0x8F),
-     o3(0xE9,0x82,0xA8), o3(0xE9,0x82,0xAF),
-     o3(0xE9,0x82,0xB1), o3(0xE9,0x82,0xB5),
-     o3(0xE9,0x83,0xA2), o3(0xE9,0x83,0xA4),
-     o3(0xE6,0x89,0x88), o3(0xE9,0x83,0x9B),
-     o3(0xE9,0x84,0x82), o3(0xE9,0x84,0x92),
-     o3(0xE9,0x84,0x99), o3(0xE9,0x84,0xB2),
-     o3(0xE9,0x84,0xB0), o3(0xE9,0x85,0x8A),
-     o3(0xE9,0x85,0x96), o3(0xE9,0x85,0x98),
-     o3(0xE9,0x85,0xA3), o3(0xE9,0x85,0xA5),
-     o3(0xE9,0x85,0xA9), o3(0xE9,0x85,0xB3),
-     o3(0xE9,0x85,0xB2), o3(0xE9,0x86,0x8B),
-     o3(0xE9,0x86,0x89), o3(0xE9,0x86,0x82),
-     o3(0xE9,0x86,0xA2), o3(0xE9,0x86,0xAB),
-     o3(0xE9,0x86,0xAF), o3(0xE9,0x86,0xAA),
-     o3(0xE9,0x86,0xB5), o3(0xE9,0x86,0xB4),
-     o3(0xE9,0x86,0xBA), o3(0xE9,0x87,0x80),
-     o3(0xE9,0x87,0x81), o3(0xE9,0x87,0x89),
-     o3(0xE9,0x87,0x8B), o3(0xE9,0x87,0x90),
-     o3(0xE9,0x87,0x96), o3(0xE9,0x87,0x9F),
-     o3(0xE9,0x87,0xA1), o3(0xE9,0x87,0x9B),
-     o3(0xE9,0x87,0xBC), o3(0xE9,0x87,0xB5),
-     o3(0xE9,0x87,0xB6), o3(0xE9,0x88,0x9E),
-     o3(0xE9,0x87,0xBF), o3(0xE9,0x88,0x94),
-     o3(0xE9,0x88,0xAC), o3(0xE9,0x88,0x95),
-     o3(0xE9,0x88,0x91), o3(0xE9,0x89,0x9E),
-     o3(0xE9,0x89,0x97), o3(0xE9,0x89,0x85),
-     o3(0xE9,0x89,0x89), o3(0xE9,0x89,0xA4),
-     o3(0xE9,0x89,0x88), o3(0xE9,0x8A,0x95),
-     o3(0xE9,0x88,0xBF), o3(0xE9,0x89,0x8B),
-     o3(0xE9,0x89,0x90), o3(0xE9,0x8A,0x9C),
-     o3(0xE9,0x8A,0x96), o3(0xE9,0x8A,0x93),
-     o3(0xE9,0x8A,0x9B), o3(0xE9,0x89,0x9A),
-     o3(0xE9,0x8B,0x8F), o3(0xE9,0x8A,0xB9),
-     o3(0xE9,0x8A,0xB7), o3(0xE9,0x8B,0xA9),
-     o3(0xE9,0x8C,0x8F), o3(0xE9,0x8B,0xBA),
-     o3(0xE9,0x8D,0x84), o3(0xE9,0x8C,0xAE),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_EE = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_EE_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_EF_infos[95] = {
-     o3(0xE9,0x8C,0x99), o3(0xE9,0x8C,0xA2),
-     o3(0xE9,0x8C,0x9A), o3(0xE9,0x8C,0xA3),
-     o3(0xE9,0x8C,0xBA), o3(0xE9,0x8C,0xB5),
-     o3(0xE9,0x8C,0xBB), o3(0xE9,0x8D,0x9C),
-     o3(0xE9,0x8D,0xA0), o3(0xE9,0x8D,0xBC),
-     o3(0xE9,0x8D,0xAE), o3(0xE9,0x8D,0x96),
-     o3(0xE9,0x8E,0xB0), o3(0xE9,0x8E,0xAC),
-     o3(0xE9,0x8E,0xAD), o3(0xE9,0x8E,0x94),
-     o3(0xE9,0x8E,0xB9), o3(0xE9,0x8F,0x96),
-     o3(0xE9,0x8F,0x97), o3(0xE9,0x8F,0xA8),
-     o3(0xE9,0x8F,0xA5), o3(0xE9,0x8F,0x98),
-     o3(0xE9,0x8F,0x83), o3(0xE9,0x8F,0x9D),
-     o3(0xE9,0x8F,0x90), o3(0xE9,0x8F,0x88),
-     o3(0xE9,0x8F,0xA4), o3(0xE9,0x90,0x9A),
-     o3(0xE9,0x90,0x94), o3(0xE9,0x90,0x93),
-     o3(0xE9,0x90,0x83), o3(0xE9,0x90,0x87),
-     o3(0xE9,0x90,0x90), o3(0xE9,0x90,0xB6),
-     o3(0xE9,0x90,0xAB), o3(0xE9,0x90,0xB5),
-     o3(0xE9,0x90,0xA1), o3(0xE9,0x90,0xBA),
-     o3(0xE9,0x91,0x81), o3(0xE9,0x91,0x92),
-     o3(0xE9,0x91,0x84), o3(0xE9,0x91,0x9B),
-     o3(0xE9,0x91,0xA0), o3(0xE9,0x91,0xA2),
-     o3(0xE9,0x91,0x9E), o3(0xE9,0x91,0xAA),
-     o3(0xE9,0x88,0xA9), o3(0xE9,0x91,0xB0),
-     o3(0xE9,0x91,0xB5), o3(0xE9,0x91,0xB7),
-     o3(0xE9,0x91,0xBD), o3(0xE9,0x91,0x9A),
-     o3(0xE9,0x91,0xBC), o3(0xE9,0x91,0xBE),
-     o3(0xE9,0x92,0x81), o3(0xE9,0x91,0xBF),
-     o3(0xE9,0x96,0x82), o3(0xE9,0x96,0x87),
-     o3(0xE9,0x96,0x8A), o3(0xE9,0x96,0x94),
-     o3(0xE9,0x96,0x96), o3(0xE9,0x96,0x98),
-     o3(0xE9,0x96,0x99), o3(0xE9,0x96,0xA0),
-     o3(0xE9,0x96,0xA8), o3(0xE9,0x96,0xA7),
-     o3(0xE9,0x96,0xAD), o3(0xE9,0x96,0xBC),
-     o3(0xE9,0x96,0xBB), o3(0xE9,0x96,0xB9),
-     o3(0xE9,0x96,0xBE), o3(0xE9,0x97,0x8A),
-     o3(0xE6,0xBF,0xB6), o3(0xE9,0x97,0x83),
-     o3(0xE9,0x97,0x8D), o3(0xE9,0x97,0x8C),
-     o3(0xE9,0x97,0x95), o3(0xE9,0x97,0x94),
-     o3(0xE9,0x97,0x96), o3(0xE9,0x97,0x9C),
-     o3(0xE9,0x97,0xA1), o3(0xE9,0x97,0xA5),
-     o3(0xE9,0x97,0xA2), o3(0xE9,0x98,0xA1),
-     o3(0xE9,0x98,0xA8), o3(0xE9,0x98,0xAE),
-     o3(0xE9,0x98,0xAF), o3(0xE9,0x99,0x82),
-     o3(0xE9,0x99,0x8C), o3(0xE9,0x99,0x8F),
-     o3(0xE9,0x99,0x8B), o3(0xE9,0x99,0xB7),
-     o3(0xE9,0x99,0x9C), o3(0xE9,0x99,0x9E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_EF = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_EF_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_F0_infos[95] = {
-     o3(0xE9,0x99,0x9D), o3(0xE9,0x99,0x9F),
-     o3(0xE9,0x99,0xA6), o3(0xE9,0x99,0xB2),
-     o3(0xE9,0x99,0xAC), o3(0xE9,0x9A,0x8D),
-     o3(0xE9,0x9A,0x98), o3(0xE9,0x9A,0x95),
-     o3(0xE9,0x9A,0x97), o3(0xE9,0x9A,0xAA),
-     o3(0xE9,0x9A,0xA7), o3(0xE9,0x9A,0xB1),
-     o3(0xE9,0x9A,0xB2), o3(0xE9,0x9A,0xB0),
-     o3(0xE9,0x9A,0xB4), o3(0xE9,0x9A,0xB6),
-     o3(0xE9,0x9A,0xB8), o3(0xE9,0x9A,0xB9),
-     o3(0xE9,0x9B,0x8E), o3(0xE9,0x9B,0x8B),
-     o3(0xE9,0x9B,0x89), o3(0xE9,0x9B,0x8D),
-     o3(0xE8,0xA5,0x8D), o3(0xE9,0x9B,0x9C),
-     o3(0xE9,0x9C,0x8D), o3(0xE9,0x9B,0x95),
-     o3(0xE9,0x9B,0xB9), o3(0xE9,0x9C,0x84),
-     o3(0xE9,0x9C,0x86), o3(0xE9,0x9C,0x88),
-     o3(0xE9,0x9C,0x93), o3(0xE9,0x9C,0x8E),
-     o3(0xE9,0x9C,0x91), o3(0xE9,0x9C,0x8F),
-     o3(0xE9,0x9C,0x96), o3(0xE9,0x9C,0x99),
-     o3(0xE9,0x9C,0xA4), o3(0xE9,0x9C,0xAA),
-     o3(0xE9,0x9C,0xB0), o3(0xE9,0x9C,0xB9),
-     o3(0xE9,0x9C,0xBD), o3(0xE9,0x9C,0xBE),
-     o3(0xE9,0x9D,0x84), o3(0xE9,0x9D,0x86),
-     o3(0xE9,0x9D,0x88), o3(0xE9,0x9D,0x82),
-     o3(0xE9,0x9D,0x89), o3(0xE9,0x9D,0x9C),
-     o3(0xE9,0x9D,0xA0), o3(0xE9,0x9D,0xA4),
-     o3(0xE9,0x9D,0xA6), o3(0xE9,0x9D,0xA8),
-     o3(0xE5,0x8B,0x92), o3(0xE9,0x9D,0xAB),
-     o3(0xE9,0x9D,0xB1), o3(0xE9,0x9D,0xB9),
-     o3(0xE9,0x9E,0x85), o3(0xE9,0x9D,0xBC),
-     o3(0xE9,0x9E,0x81), o3(0xE9,0x9D,0xBA),
-     o3(0xE9,0x9E,0x86), o3(0xE9,0x9E,0x8B),
-     o3(0xE9,0x9E,0x8F), o3(0xE9,0x9E,0x90),
-     o3(0xE9,0x9E,0x9C), o3(0xE9,0x9E,0xA8),
-     o3(0xE9,0x9E,0xA6), o3(0xE9,0x9E,0xA3),
-     o3(0xE9,0x9E,0xB3), o3(0xE9,0x9E,0xB4),
-     o3(0xE9,0x9F,0x83), o3(0xE9,0x9F,0x86),
-     o3(0xE9,0x9F,0x88), o3(0xE9,0x9F,0x8B),
-     o3(0xE9,0x9F,0x9C), o3(0xE9,0x9F,0xAD),
-     o3(0xE9,0xBD,0x8F), o3(0xE9,0x9F,0xB2),
-     o3(0xE7,0xAB,0x9F), o3(0xE9,0x9F,0xB6),
-     o3(0xE9,0x9F,0xB5), o3(0xE9,0xA0,0x8F),
-     o3(0xE9,0xA0,0x8C), o3(0xE9,0xA0,0xB8),
-     o3(0xE9,0xA0,0xA4), o3(0xE9,0xA0,0xA1),
-     o3(0xE9,0xA0,0xB7), o3(0xE9,0xA0,0xBD),
-     o3(0xE9,0xA1,0x86), o3(0xE9,0xA1,0x8F),
-     o3(0xE9,0xA1,0x8B), o3(0xE9,0xA1,0xAB),
-     o3(0xE9,0xA1,0xAF), o3(0xE9,0xA1,0xB0),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F0 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_F0_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_F1_infos[95] = {
-     o3(0xE9,0xA1,0xB1), o3(0xE9,0xA1,0xB4),
-     o3(0xE9,0xA1,0xB3), o3(0xE9,0xA2,0xAA),
-     o3(0xE9,0xA2,0xAF), o3(0xE9,0xA2,0xB1),
-     o3(0xE9,0xA2,0xB6), o3(0xE9,0xA3,0x84),
-     o3(0xE9,0xA3,0x83), o3(0xE9,0xA3,0x86),
-     o3(0xE9,0xA3,0xA9), o3(0xE9,0xA3,0xAB),
-     o3(0xE9,0xA4,0x83), o3(0xE9,0xA4,0x89),
-     o3(0xE9,0xA4,0x92), o3(0xE9,0xA4,0x94),
-     o3(0xE9,0xA4,0x98), o3(0xE9,0xA4,0xA1),
-     o3(0xE9,0xA4,0x9D), o3(0xE9,0xA4,0x9E),
-     o3(0xE9,0xA4,0xA4), o3(0xE9,0xA4,0xA0),
-     o3(0xE9,0xA4,0xAC), o3(0xE9,0xA4,0xAE),
-     o3(0xE9,0xA4,0xBD), o3(0xE9,0xA4,0xBE),
-     o3(0xE9,0xA5,0x82), o3(0xE9,0xA5,0x89),
-     o3(0xE9,0xA5,0x85), o3(0xE9,0xA5,0x90),
-     o3(0xE9,0xA5,0x8B), o3(0xE9,0xA5,0x91),
-     o3(0xE9,0xA5,0x92), o3(0xE9,0xA5,0x8C),
-     o3(0xE9,0xA5,0x95), o3(0xE9,0xA6,0x97),
-     o3(0xE9,0xA6,0x98), o3(0xE9,0xA6,0xA5),
-     o3(0xE9,0xA6,0xAD), o3(0xE9,0xA6,0xAE),
-     o3(0xE9,0xA6,0xBC), o3(0xE9,0xA7,0x9F),
-     o3(0xE9,0xA7,0x9B), o3(0xE9,0xA7,0x9D),
-     o3(0xE9,0xA7,0x98), o3(0xE9,0xA7,0x91),
-     o3(0xE9,0xA7,0xAD), o3(0xE9,0xA7,0xAE),
-     o3(0xE9,0xA7,0xB1), o3(0xE9,0xA7,0xB2),
-     o3(0xE9,0xA7,0xBB), o3(0xE9,0xA7,0xB8),
-     o3(0xE9,0xA8,0x81), o3(0xE9,0xA8,0x8F),
-     o3(0xE9,0xA8,0x85), o3(0xE9,0xA7,0xA2),
-     o3(0xE9,0xA8,0x99), o3(0xE9,0xA8,0xAB),
-     o3(0xE9,0xA8,0xB7), o3(0xE9,0xA9,0x85),
-     o3(0xE9,0xA9,0x82), o3(0xE9,0xA9,0x80),
-     o3(0xE9,0xA9,0x83), o3(0xE9,0xA8,0xBE),
-     o3(0xE9,0xA9,0x95), o3(0xE9,0xA9,0x8D),
-     o3(0xE9,0xA9,0x9B), o3(0xE9,0xA9,0x97),
-     o3(0xE9,0xA9,0x9F), o3(0xE9,0xA9,0xA2),
-     o3(0xE9,0xA9,0xA5), o3(0xE9,0xA9,0xA4),
-     o3(0xE9,0xA9,0xA9), o3(0xE9,0xA9,0xAB),
-     o3(0xE9,0xA9,0xAA), o3(0xE9,0xAA,0xAD),
-     o3(0xE9,0xAA,0xB0), o3(0xE9,0xAA,0xBC),
-     o3(0xE9,0xAB,0x80), o3(0xE9,0xAB,0x8F),
-     o3(0xE9,0xAB,0x91), o3(0xE9,0xAB,0x93),
-     o3(0xE9,0xAB,0x94), o3(0xE9,0xAB,0x9E),
-     o3(0xE9,0xAB,0x9F), o3(0xE9,0xAB,0xA2),
-     o3(0xE9,0xAB,0xA3), o3(0xE9,0xAB,0xA6),
-     o3(0xE9,0xAB,0xAF), o3(0xE9,0xAB,0xAB),
-     o3(0xE9,0xAB,0xAE), o3(0xE9,0xAB,0xB4),
-     o3(0xE9,0xAB,0xB1), o3(0xE9,0xAB,0xB7),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F1 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_F1_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_F2_infos[95] = {
-     o3(0xE9,0xAB,0xBB), o3(0xE9,0xAC,0x86),
-     o3(0xE9,0xAC,0x98), o3(0xE9,0xAC,0x9A),
-     o3(0xE9,0xAC,0x9F), o3(0xE9,0xAC,0xA2),
-     o3(0xE9,0xAC,0xA3), o3(0xE9,0xAC,0xA5),
-     o3(0xE9,0xAC,0xA7), o3(0xE9,0xAC,0xA8),
-     o3(0xE9,0xAC,0xA9), o3(0xE9,0xAC,0xAA),
-     o3(0xE9,0xAC,0xAE), o3(0xE9,0xAC,0xAF),
-     o3(0xE9,0xAC,0xB2), o3(0xE9,0xAD,0x84),
-     o3(0xE9,0xAD,0x83), o3(0xE9,0xAD,0x8F),
-     o3(0xE9,0xAD,0x8D), o3(0xE9,0xAD,0x8E),
-     o3(0xE9,0xAD,0x91), o3(0xE9,0xAD,0x98),
-     o3(0xE9,0xAD,0xB4), o3(0xE9,0xAE,0x93),
-     o3(0xE9,0xAE,0x83), o3(0xE9,0xAE,0x91),
-     o3(0xE9,0xAE,0x96), o3(0xE9,0xAE,0x97),
-     o3(0xE9,0xAE,0x9F), o3(0xE9,0xAE,0xA0),
-     o3(0xE9,0xAE,0xA8), o3(0xE9,0xAE,0xB4),
-     o3(0xE9,0xAF,0x80), o3(0xE9,0xAF,0x8A),
-     o3(0xE9,0xAE,0xB9), o3(0xE9,0xAF,0x86),
-     o3(0xE9,0xAF,0x8F), o3(0xE9,0xAF,0x91),
-     o3(0xE9,0xAF,0x92), o3(0xE9,0xAF,0xA3),
-     o3(0xE9,0xAF,0xA2), o3(0xE9,0xAF,0xA4),
-     o3(0xE9,0xAF,0x94), o3(0xE9,0xAF,0xA1),
-     o3(0xE9,0xB0,0xBA), o3(0xE9,0xAF,0xB2),
-     o3(0xE9,0xAF,0xB1), o3(0xE9,0xAF,0xB0),
-     o3(0xE9,0xB0,0x95), o3(0xE9,0xB0,0x94),
-     o3(0xE9,0xB0,0x89), o3(0xE9,0xB0,0x93),
-     o3(0xE9,0xB0,0x8C), o3(0xE9,0xB0,0x86),
-     o3(0xE9,0xB0,0x88), o3(0xE9,0xB0,0x92),
-     o3(0xE9,0xB0,0x8A), o3(0xE9,0xB0,0x84),
-     o3(0xE9,0xB0,0xAE), o3(0xE9,0xB0,0x9B),
-     o3(0xE9,0xB0,0xA5), o3(0xE9,0xB0,0xA4),
-     o3(0xE9,0xB0,0xA1), o3(0xE9,0xB0,0xB0),
-     o3(0xE9,0xB1,0x87), o3(0xE9,0xB0,0xB2),
-     o3(0xE9,0xB1,0x86), o3(0xE9,0xB0,0xBE),
-     o3(0xE9,0xB1,0x9A), o3(0xE9,0xB1,0xA0),
-     o3(0xE9,0xB1,0xA7), o3(0xE9,0xB1,0xB6),
-     o3(0xE9,0xB1,0xB8), o3(0xE9,0xB3,0xA7),
-     o3(0xE9,0xB3,0xAC), o3(0xE9,0xB3,0xB0),
-     o3(0xE9,0xB4,0x89), o3(0xE9,0xB4,0x88),
-     o3(0xE9,0xB3,0xAB), o3(0xE9,0xB4,0x83),
-     o3(0xE9,0xB4,0x86), o3(0xE9,0xB4,0xAA),
-     o3(0xE9,0xB4,0xA6), o3(0xE9,0xB6,0xAF),
-     o3(0xE9,0xB4,0xA3), o3(0xE9,0xB4,0x9F),
-     o3(0xE9,0xB5,0x84), o3(0xE9,0xB4,0x95),
-     o3(0xE9,0xB4,0x92), o3(0xE9,0xB5,0x81),
-     o3(0xE9,0xB4,0xBF), o3(0xE9,0xB4,0xBE),
-     o3(0xE9,0xB5,0x86), o3(0xE9,0xB5,0x88),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F2 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_F2_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_F3_infos[95] = {
-     o3(0xE9,0xB5,0x9D), o3(0xE9,0xB5,0x9E),
-     o3(0xE9,0xB5,0xA4), o3(0xE9,0xB5,0x91),
-     o3(0xE9,0xB5,0x90), o3(0xE9,0xB5,0x99),
-     o3(0xE9,0xB5,0xB2), o3(0xE9,0xB6,0x89),
-     o3(0xE9,0xB6,0x87), o3(0xE9,0xB6,0xAB),
-     o3(0xE9,0xB5,0xAF), o3(0xE9,0xB5,0xBA),
-     o3(0xE9,0xB6,0x9A), o3(0xE9,0xB6,0xA4),
-     o3(0xE9,0xB6,0xA9), o3(0xE9,0xB6,0xB2),
-     o3(0xE9,0xB7,0x84), o3(0xE9,0xB7,0x81),
-     o3(0xE9,0xB6,0xBB), o3(0xE9,0xB6,0xB8),
-     o3(0xE9,0xB6,0xBA), o3(0xE9,0xB7,0x86),
-     o3(0xE9,0xB7,0x8F), o3(0xE9,0xB7,0x82),
-     o3(0xE9,0xB7,0x99), o3(0xE9,0xB7,0x93),
-     o3(0xE9,0xB7,0xB8), o3(0xE9,0xB7,0xA6),
-     o3(0xE9,0xB7,0xAD), o3(0xE9,0xB7,0xAF),
-     o3(0xE9,0xB7,0xBD), o3(0xE9,0xB8,0x9A),
-     o3(0xE9,0xB8,0x9B), o3(0xE9,0xB8,0x9E),
-     o3(0xE9,0xB9,0xB5), o3(0xE9,0xB9,0xB9),
-     o3(0xE9,0xB9,0xBD), o3(0xE9,0xBA,0x81),
-     o3(0xE9,0xBA,0x88), o3(0xE9,0xBA,0x8B),
-     o3(0xE9,0xBA,0x8C), o3(0xE9,0xBA,0x92),
-     o3(0xE9,0xBA,0x95), o3(0xE9,0xBA,0x91),
-     o3(0xE9,0xBA,0x9D), o3(0xE9,0xBA,0xA5),
-     o3(0xE9,0xBA,0xA9), o3(0xE9,0xBA,0xB8),
-     o3(0xE9,0xBA,0xAA), o3(0xE9,0xBA,0xAD),
-     o3(0xE9,0x9D,0xA1), o3(0xE9,0xBB,0x8C),
-     o3(0xE9,0xBB,0x8E), o3(0xE9,0xBB,0x8F),
-     o3(0xE9,0xBB,0x90), o3(0xE9,0xBB,0x94),
-     o3(0xE9,0xBB,0x9C), o3(0xE9,0xBB,0x9E),
-     o3(0xE9,0xBB,0x9D), o3(0xE9,0xBB,0xA0),
-     o3(0xE9,0xBB,0xA5), o3(0xE9,0xBB,0xA8),
-     o3(0xE9,0xBB,0xAF), o3(0xE9,0xBB,0xB4),
-     o3(0xE9,0xBB,0xB6), o3(0xE9,0xBB,0xB7),
-     o3(0xE9,0xBB,0xB9), o3(0xE9,0xBB,0xBB),
-     o3(0xE9,0xBB,0xBC), o3(0xE9,0xBB,0xBD),
-     o3(0xE9,0xBC,0x87), o3(0xE9,0xBC,0x88),
-     o3(0xE7,0x9A,0xB7), o3(0xE9,0xBC,0x95),
-     o3(0xE9,0xBC,0xA1), o3(0xE9,0xBC,0xAC),
-     o3(0xE9,0xBC,0xBE), o3(0xE9,0xBD,0x8A),
-     o3(0xE9,0xBD,0x92), o3(0xE9,0xBD,0x94),
-     o3(0xE9,0xBD,0xA3), o3(0xE9,0xBD,0x9F),
-     o3(0xE9,0xBD,0xA0), o3(0xE9,0xBD,0xA1),
-     o3(0xE9,0xBD,0xA6), o3(0xE9,0xBD,0xA7),
-     o3(0xE9,0xBD,0xAC), o3(0xE9,0xBD,0xAA),
-     o3(0xE9,0xBD,0xB7), o3(0xE9,0xBD,0xB2),
-     o3(0xE9,0xBD,0xB6), o3(0xE9,0xBE,0x95),
-     o3(0xE9,0xBE,0x9C), o3(0xE9,0xBE,0xA0),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F3 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_F3_infos
-};
-
-static const unsigned char
-from_EUC_JP_F4_offsets[256] = {
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  0,  1,  2,  3,  4,  5,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-from_EUC_JP_F4_infos[7] = {
-     o3(0xE5,0xA0,0xAF), o3(0xE6,0xA7,0x87),
-     o3(0xE9,0x81,0x99), o3(0xE7,0x91,0xA4),
-     o3(0xE5,0x87,0x9C), o3(0xE7,0x86,0x99),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F4 = {
-    from_EUC_JP_F4_offsets,
-    from_EUC_JP_F4_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_F9_infos[95] = {
-     o3(0xE7,0xBA,0x8A), o3(0xE8,0xA4,0x9C),
-     o3(0xE9,0x8D,0x88), o3(0xE9,0x8A,0x88),
-     o3(0xE8,0x93,0x9C), o3(0xE4,0xBF,0x89),
-     o3(0xE7,0x82,0xBB), o3(0xE6,0x98,0xB1),
-     o3(0xE6,0xA3,0x88), o3(0xE9,0x8B,0xB9),
-     o3(0xE6,0x9B,0xBB), o3(0xE5,0xBD,0x85),
-     o3(0xE4,0xB8,0xA8), o3(0xE4,0xBB,0xA1),
-     o3(0xE4,0xBB,0xBC), o3(0xE4,0xBC,0x80),
-     o3(0xE4,0xBC,0x83), o3(0xE4,0xBC,0xB9),
-     o3(0xE4,0xBD,0x96), o3(0xE4,0xBE,0x92),
-     o3(0xE4,0xBE,0x8A), o3(0xE4,0xBE,0x9A),
-     o3(0xE4,0xBE,0x94), o3(0xE4,0xBF,0x8D),
-     o3(0xE5,0x81,0x80), o3(0xE5,0x80,0xA2),
-     o3(0xE4,0xBF,0xBF), o3(0xE5,0x80,0x9E),
-     o3(0xE5,0x81,0x86), o3(0xE5,0x81,0xB0),
-     o3(0xE5,0x81,0x82), o3(0xE5,0x82,0x94),
-     o3(0xE5,0x83,0xB4), o3(0xE5,0x83,0x98),
-     o3(0xE5,0x85,0x8A), o3(0xE5,0x85,0xA4),
-     o3(0xE5,0x86,0x9D), o3(0xE5,0x86,0xBE),
-     o3(0xE5,0x87,0xAC), o3(0xE5,0x88,0x95),
-     o3(0xE5,0x8A,0x9C), o3(0xE5,0x8A,0xA6),
-     o3(0xE5,0x8B,0x80), o3(0xE5,0x8B,0x9B),
-     o3(0xE5,0x8C,0x80), o3(0xE5,0x8C,0x87),
-     o3(0xE5,0x8C,0xA4), o3(0xE5,0x8D,0xB2),
-     o3(0xE5,0x8E,0x93), o3(0xE5,0x8E,0xB2),
-     o3(0xE5,0x8F,0x9D), o3(0xEF,0xA8,0x8E),
-     o3(0xE5,0x92,0x9C), o3(0xE5,0x92,0x8A),
-     o3(0xE5,0x92,0xA9), o3(0xE5,0x93,0xBF),
-     o3(0xE5,0x96,0x86), o3(0xE5,0x9D,0x99),
-     o3(0xE5,0x9D,0xA5), o3(0xE5,0x9E,0xAC),
-     o3(0xE5,0x9F,0x88), o3(0xE5,0x9F,0x87),
-     o3(0xEF,0xA8,0x8F), o3(0xEF,0xA8,0x90),
-     o3(0xE5,0xA2,0x9E), o3(0xE5,0xA2,0xB2),
-     o3(0xE5,0xA4,0x8B), o3(0xE5,0xA5,0x93),
-     o3(0xE5,0xA5,0x9B), o3(0xE5,0xA5,0x9D),
-     o3(0xE5,0xA5,0xA3), o3(0xE5,0xA6,0xA4),
-     o3(0xE5,0xA6,0xBA), o3(0xE5,0xAD,0x96),
-     o3(0xE5,0xAF,0x80), o3(0xE7,0x94,0xAF),
-     o3(0xE5,0xAF,0x98), o3(0xE5,0xAF,0xAC),
-     o3(0xE5,0xB0,0x9E), o3(0xE5,0xB2,0xA6),
-     o3(0xE5,0xB2,0xBA), o3(0xE5,0xB3,0xB5),
-     o3(0xE5,0xB4,0xA7), o3(0xE5,0xB5,0x93),
-     o3(0xEF,0xA8,0x91), o3(0xE5,0xB5,0x82),
-     o3(0xE5,0xB5,0xAD), o3(0xE5,0xB6,0xB8),
-     o3(0xE5,0xB6,0xB9), o3(0xE5,0xB7,0x90),
-     o3(0xE5,0xBC,0xA1), o3(0xE5,0xBC,0xB4),
-     o3(0xE5,0xBD,0xA7), o3(0xE5,0xBE,0xB7),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_F9 = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_F9_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_FA_infos[95] = {
-     o3(0xE5,0xBF,0x9E), o3(0xE6,0x81,0x9D),
-     o3(0xE6,0x82,0x85), o3(0xE6,0x82,0x8A),
-     o3(0xE6,0x83,0x9E), o3(0xE6,0x83,0x95),
-     o3(0xE6,0x84,0xA0), o3(0xE6,0x83,0xB2),
-     o3(0xE6,0x84,0x91), o3(0xE6,0x84,0xB7),
-     o3(0xE6,0x84,0xB0), o3(0xE6,0x86,0x98),
-     o3(0xE6,0x88,0x93), o3(0xE6,0x8A,0xA6),
-     o3(0xE6,0x8F,0xB5), o3(0xE6,0x91,0xA0),
-     o3(0xE6,0x92,0x9D), o3(0xE6,0x93,0x8E),
-     o3(0xE6,0x95,0x8E), o3(0xE6,0x98,0x80),
-     o3(0xE6,0x98,0x95), o3(0xE6,0x98,0xBB),
-     o3(0xE6,0x98,0x89), o3(0xE6,0x98,0xAE),
-     o3(0xE6,0x98,0x9E), o3(0xE6,0x98,0xA4),
-     o3(0xE6,0x99,0xA5), o3(0xE6,0x99,0x97),
-     o3(0xE6,0x99,0x99), o3(0xEF,0xA8,0x92),
-     o3(0xE6,0x99,0xB3), o3(0xE6,0x9A,0x99),
-     o3(0xE6,0x9A,0xA0), o3(0xE6,0x9A,0xB2),
-     o3(0xE6,0x9A,0xBF), o3(0xE6,0x9B,0xBA),
-     o3(0xE6,0x9C,0x8E), o3(0xEF,0xA4,0xA9),
-     o3(0xE6,0x9D,0xA6), o3(0xE6,0x9E,0xBB),
-     o3(0xE6,0xA1,0x92), o3(0xE6,0x9F,0x80),
-     o3(0xE6,0xA0,0x81), o3(0xE6,0xA1,0x84),
-     o3(0xE6,0xA3,0x8F), o3(0xEF,0xA8,0x93),
-     o3(0xE6,0xA5,0xA8), o3(0xEF,0xA8,0x94),
-     o3(0xE6,0xA6,0x98), o3(0xE6,0xA7,0xA2),
-     o3(0xE6,0xA8,0xB0), o3(0xE6,0xA9,0xAB),
-     o3(0xE6,0xA9,0x86), o3(0xE6,0xA9,0xB3),
-     o3(0xE6,0xA9,0xBE), o3(0xE6,0xAB,0xA2),
-     o3(0xE6,0xAB,0xA4), o3(0xE6,0xAF,0x96),
-     o3(0xE6,0xB0,0xBF), o3(0xE6,0xB1,0x9C),
-     o3(0xE6,0xB2,0x86), o3(0xE6,0xB1,0xAF),
-     o3(0xE6,0xB3,0x9A), o3(0xE6,0xB4,0x84),
-     o3(0xE6,0xB6,0x87), o3(0xE6,0xB5,0xAF),
-     o3(0xE6,0xB6,0x96), o3(0xE6,0xB6,0xAC),
-     o3(0xE6,0xB7,0x8F), o3(0xE6,0xB7,0xB8),
-     o3(0xE6,0xB7,0xB2), o3(0xE6,0xB7,0xBC),
-     o3(0xE6,0xB8,0xB9), o3(0xE6,0xB9,0x9C),
-     o3(0xE6,0xB8,0xA7), o3(0xE6,0xB8,0xBC),
-     o3(0xE6,0xBA,0xBF), o3(0xE6,0xBE,0x88),
-     o3(0xE6,0xBE,0xB5), o3(0xE6,0xBF,0xB5),
-     o3(0xE7,0x80,0x85), o3(0xE7,0x80,0x87),
-     o3(0xE7,0x80,0xA8), o3(0xE7,0x82,0x85),
-     o3(0xE7,0x82,0xAB), o3(0xE7,0x84,0x8F),
-     o3(0xE7,0x84,0x84), o3(0xE7,0x85,0x9C),
-     o3(0xE7,0x85,0x86), o3(0xE7,0x85,0x87),
-     o3(0xEF,0xA8,0x95), o3(0xE7,0x87,0x81),
-     o3(0xE7,0x87,0xBE), o3(0xE7,0x8A,0xB1),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_FA = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_FA_infos
-};
-
-static const struct byte_lookup* const
-from_EUC_JP_FB_infos[95] = {
-     o3(0xE7,0x8A,0xBE), o3(0xE7,0x8C,0xA4),
-     o3(0xEF,0xA8,0x96), o3(0xE7,0x8D,0xB7),
-     o3(0xE7,0x8E,0xBD), o3(0xE7,0x8F,0x89),
-     o3(0xE7,0x8F,0x96), o3(0xE7,0x8F,0xA3),
-     o3(0xE7,0x8F,0x92), o3(0xE7,0x90,0x87),
-     o3(0xE7,0x8F,0xB5), o3(0xE7,0x90,0xA6),
-     o3(0xE7,0x90,0xAA), o3(0xE7,0x90,0xA9),
-     o3(0xE7,0x90,0xAE), o3(0xE7,0x91,0xA2),
-     o3(0xE7,0x92,0x89), o3(0xE7,0x92,0x9F),
-     o3(0xE7,0x94,0x81), o3(0xE7,0x95,0xAF),
-     o3(0xE7,0x9A,0x82), o3(0xE7,0x9A,0x9C),
-     o3(0xE7,0x9A,0x9E), o3(0xE7,0x9A,0x9B),
-     o3(0xE7,0x9A,0xA6), o3(0xEF,0xA8,0x97),
-     o3(0xE7,0x9D,0x86), o3(0xE5,0x8A,0xAF),
-     o3(0xE7,0xA0,0xA1), o3(0xE7,0xA1,0x8E),
-     o3(0xE7,0xA1,0xA4), o3(0xE7,0xA1,0xBA),
-     o3(0xE7,0xA4,0xB0), o3(0xEF,0xA8,0x98),
-     o3(0xEF,0xA8,0x99), o3(0xEF,0xA8,0x9A),
-     o3(0xE7,0xA6,0x94), o3(0xEF,0xA8,0x9B),
-     o3(0xE7,0xA6,0x9B), o3(0xE7,0xAB,0x91),
-     o3(0xE7,0xAB,0xA7), o3(0xEF,0xA8,0x9C),
-     o3(0xE7,0xAB,0xAB), o3(0xE7,0xAE,0x9E),
-     o3(0xEF,0xA8,0x9D), o3(0xE7,0xB5,0x88),
-     o3(0xE7,0xB5,0x9C), o3(0xE7,0xB6,0xB7),
-     o3(0xE7,0xB6,0xA0), o3(0xE7,0xB7,0x96),
-     o3(0xE7,0xB9,0x92), o3(0xE7,0xBD,0x87),
-     o3(0xE7,0xBE,0xA1), o3(0xEF,0xA8,0x9E),
-     o3(0xE8,0x8C,0x81), o3(0xE8,0x8D,0xA2),
-     o3(0xE8,0x8D,0xBF), o3(0xE8,0x8F,0x87),
-     o3(0xE8,0x8F,0xB6), o3(0xE8,0x91,0x88),
-     o3(0xE8,0x92,0xB4), o3(0xE8,0x95,0x93),
-     o3(0xE8,0x95,0x99), o3(0xE8,0x95,0xAB),
-     o3(0xEF,0xA8,0x9F), o3(0xE8,0x96,0xB0),
-     o3(0xEF,0xA8,0xA0), o3(0xEF,0xA8,0xA1),
-     o3(0xE8,0xA0,0x87), o3(0xE8,0xA3,0xB5),
-     o3(0xE8,0xA8,0x92), o3(0xE8,0xA8,0xB7),
-     o3(0xE8,0xA9,0xB9), o3(0xE8,0xAA,0xA7),
-     o3(0xE8,0xAA,0xBE), o3(0xE8,0xAB,0x9F),
-     o3(0xEF,0xA8,0xA2), o3(0xE8,0xAB,0xB6),
-     o3(0xE8,0xAD,0x93), o3(0xE8,0xAD,0xBF),
-     o3(0xE8,0xB3,0xB0), o3(0xE8,0xB3,0xB4),
-     o3(0xE8,0xB4,0x92), o3(0xE8,0xB5,0xB6),
-     o3(0xEF,0xA8,0xA3), o3(0xE8,0xBB,0x8F),
-     o3(0xEF,0xA8,0xA4), o3(0xEF,0xA8,0xA5),
-     o3(0xE9,0x81,0xA7), o3(0xE9,0x83,0x9E),
-     o3(0xEF,0xA8,0xA6), o3(0xE9,0x84,0x95),
-     o3(0xE9,0x84,0xA7), o3(0xE9,0x87,0x9A),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_FB = {
-    from_EUC_JP_A1_offsets,
-    from_EUC_JP_FB_infos
-};
-
-static const unsigned char
-from_EUC_JP_FC_offsets[256] = {
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,   91, 91, 91, 91, 91, 91, 91, 91,
-     91,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,   71, 72, 73, 74, 75, 76, 77, 91,
-     91, 78, 79, 80, 81, 82, 83, 84,   85, 86, 87, 91, 88, 89, 90, 91,
-};
-static const struct byte_lookup* const
-from_EUC_JP_FC_infos[92] = {
-     o3(0xE9,0x87,0x97), o3(0xE9,0x87,0x9E),
-     o3(0xE9,0x87,0xAD), o3(0xE9,0x87,0xAE),
-     o3(0xE9,0x87,0xA4), o3(0xE9,0x87,0xA5),
-     o3(0xE9,0x88,0x86), o3(0xE9,0x88,0x90),
-     o3(0xE9,0x88,0x8A), o3(0xE9,0x88,0xBA),
-     o3(0xE9,0x89,0x80), o3(0xE9,0x88,0xBC),
-     o3(0xE9,0x89,0x8E), o3(0xE9,0x89,0x99),
-     o3(0xE9,0x89,0x91), o3(0xE9,0x88,0xB9),
-     o3(0xE9,0x89,0xA7), o3(0xE9,0x8A,0xA7),
-     o3(0xE9,0x89,0xB7), o3(0xE9,0x89,0xB8),
-     o3(0xE9,0x8B,0xA7), o3(0xE9,0x8B,0x97),
-     o3(0xE9,0x8B,0x99), o3(0xE9,0x8B,0x90),
-     o3(0xEF,0xA8,0xA7), o3(0xE9,0x8B,0x95),
-     o3(0xE9,0x8B,0xA0), o3(0xE9,0x8B,0x93),
-     o3(0xE9,0x8C,0xA5), o3(0xE9,0x8C,0xA1),
-     o3(0xE9,0x8B,0xBB), o3(0xEF,0xA8,0xA8),
-     o3(0xE9,0x8C,0x9E), o3(0xE9,0x8B,0xBF),
-     o3(0xE9,0x8C,0x9D), o3(0xE9,0x8C,0x82),
-     o3(0xE9,0x8D,0xB0), o3(0xE9,0x8D,0x97),
-     o3(0xE9,0x8E,0xA4), o3(0xE9,0x8F,0x86),
-     o3(0xE9,0x8F,0x9E), o3(0xE9,0x8F,0xB8),
-     o3(0xE9,0x90,0xB1), o3(0xE9,0x91,0x85),
-     o3(0xE9,0x91,0x88), o3(0xE9,0x96,0x92),
-     o3(0xEF,0xA7,0x9C), o3(0xEF,0xA8,0xA9),
-     o3(0xE9,0x9A,0x9D), o3(0xE9,0x9A,0xAF),
-     o3(0xE9,0x9C,0xB3), o3(0xE9,0x9C,0xBB),
-     o3(0xE9,0x9D,0x83), o3(0xE9,0x9D,0x8D),
-     o3(0xE9,0x9D,0x8F), o3(0xE9,0x9D,0x91),
-     o3(0xE9,0x9D,0x95), o3(0xE9,0xA1,0x97),
-     o3(0xE9,0xA1,0xA5), o3(0xEF,0xA8,0xAA),
-     o3(0xEF,0xA8,0xAB), o3(0xE9,0xA4,0xA7),
-     o3(0xEF,0xA8,0xAC), o3(0xE9,0xA6,0x9E),
-     o3(0xE9,0xA9,0x8E), o3(0xE9,0xAB,0x99),
-     o3(0xE9,0xAB,0x9C), o3(0xE9,0xAD,0xB5),
-     o3(0xE9,0xAD,0xB2), o3(0xE9,0xAE,0x8F),
-     o3(0xE9,0xAE,0xB1), o3(0xE9,0xAE,0xBB),
-     o3(0xE9,0xB0,0x80), o3(0xE9,0xB5,0xB0),
-     o3(0xE9,0xB5,0xAB), o3(0xEF,0xA8,0xAD),
-     o3(0xE9,0xB8,0x99), o3(0xE9,0xBB,0x91),
-     o3(0xE2,0x85,0xB0), o3(0xE2,0x85,0xB1),
-     o3(0xE2,0x85,0xB2), o3(0xE2,0x85,0xB3),
-     o3(0xE2,0x85,0xB4), o3(0xE2,0x85,0xB5),
-     o3(0xE2,0x85,0xB6), o3(0xE2,0x85,0xB7),
-     o3(0xE2,0x85,0xB8), o3(0xE2,0x85,0xB9),
-     o3(0xEF,0xBF,0xA4), o3(0xEF,0xBC,0x87),
-     o3(0xEF,0xBC,0x82),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP_FC = {
-    from_EUC_JP_FC_offsets,
-    from_EUC_JP_FC_infos
-};
-
-static const unsigned char
-from_EUC_JP_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-     84, 84, 84, 84, 84, 84, 84, 84,   84, 84, 84, 84, 84, 84,  1, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,   84, 84, 84, 84, 84, 84, 84, 84,
-     84,  2,  3,  4,  5,  6,  7,  8,    9, 84, 84, 84, 84, 10, 84, 84,
-     11, 12, 13, 14, 15, 16, 17, 18,   19, 20, 21, 22, 23, 24, 25, 26,
-     27, 28, 29, 30, 31, 32, 33, 34,   35, 36, 37, 38, 39, 40, 41, 42,
-     43, 44, 45, 46, 47, 48, 49, 50,   51, 52, 53, 54, 55, 56, 57, 58,
-     59, 60, 61, 62, 63, 64, 65, 66,   67, 68, 69, 70, 71, 72, 73, 74,
-     75, 76, 77, 78, 79, 84, 84, 84,   84, 80, 81, 82, 83, 84, 84, 84,
-};
-static const struct byte_lookup* const
-from_EUC_JP_infos[85] = {
-               NOMAP, &from_EUC_JP_8E, &from_EUC_JP_A1, &from_EUC_JP_A2,
-     &from_EUC_JP_A3, &from_EUC_JP_A4, &from_EUC_JP_A5, &from_EUC_JP_A6,
-     &from_EUC_JP_A7, &from_EUC_JP_A8, &from_EUC_JP_AD, &from_EUC_JP_B0,
-     &from_EUC_JP_B1, &from_EUC_JP_B2, &from_EUC_JP_B3, &from_EUC_JP_B4,
-     &from_EUC_JP_B5, &from_EUC_JP_B6, &from_EUC_JP_B7, &from_EUC_JP_B8,
-     &from_EUC_JP_B9, &from_EUC_JP_BA, &from_EUC_JP_BB, &from_EUC_JP_BC,
-     &from_EUC_JP_BD, &from_EUC_JP_BE, &from_EUC_JP_BF, &from_EUC_JP_C0,
-     &from_EUC_JP_C1, &from_EUC_JP_C2, &from_EUC_JP_C3, &from_EUC_JP_C4,
-     &from_EUC_JP_C5, &from_EUC_JP_C6, &from_EUC_JP_C7, &from_EUC_JP_C8,
-     &from_EUC_JP_C9, &from_EUC_JP_CA, &from_EUC_JP_CB, &from_EUC_JP_CC,
-     &from_EUC_JP_CD, &from_EUC_JP_CE, &from_EUC_JP_CF, &from_EUC_JP_D0,
-     &from_EUC_JP_D1, &from_EUC_JP_D2, &from_EUC_JP_D3, &from_EUC_JP_D4,
-     &from_EUC_JP_D5, &from_EUC_JP_D6, &from_EUC_JP_D7, &from_EUC_JP_D8,
-     &from_EUC_JP_D9, &from_EUC_JP_DA, &from_EUC_JP_DB, &from_EUC_JP_DC,
-     &from_EUC_JP_DD, &from_EUC_JP_DE, &from_EUC_JP_DF, &from_EUC_JP_E0,
-     &from_EUC_JP_E1, &from_EUC_JP_E2, &from_EUC_JP_E3, &from_EUC_JP_E4,
-     &from_EUC_JP_E5, &from_EUC_JP_E6, &from_EUC_JP_E7, &from_EUC_JP_E8,
-     &from_EUC_JP_E9, &from_EUC_JP_EA, &from_EUC_JP_EB, &from_EUC_JP_EC,
-     &from_EUC_JP_ED, &from_EUC_JP_EE, &from_EUC_JP_EF, &from_EUC_JP_F0,
-     &from_EUC_JP_F1, &from_EUC_JP_F2, &from_EUC_JP_F3, &from_EUC_JP_F4,
-     &from_EUC_JP_F9, &from_EUC_JP_FA, &from_EUC_JP_FB, &from_EUC_JP_FC,
-               UNDEF,
-};
-static const BYTE_LOOKUP
-from_EUC_JP = {
-    from_EUC_JP_offsets,
-    from_EUC_JP_infos
-};
-static const rb_transcoder
-rb_from_EUC_JP = {
-    "EUC-JP", "UTF-8", &from_EUC_JP, 3, 0,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_C2_infos[14] = {
-     o2(0xA1,0xF1), o2(0xA1,0xF2), o2(0xA1,0xEF), o2(0xFC,0xFC),
-     o2(0xA1,0xF8), o2(0xA1,0xAF), o2(0xA2,0xCC), o2(0xA1,0xB1),
-     o2(0xA1,0xEB), o2(0xA1,0xDE), o2(0xA1,0xAD), o2(0xA2,0xF9),
-     o2(0xA1,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_C2 = {
-    to_SHIFT_JIS_C2_offsets,
-    to_EUC_JP_C2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_C3_infos[3] = {
-     o2(0xA1,0xDF), o2(0xA1,0xE0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_C3 = {
-    to_SHIFT_JIS_C3_offsets,
-    to_EUC_JP_C3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_CE_infos[40] = {
-     o2(0xA6,0xA1), o2(0xA6,0xA2), o2(0xA6,0xA3), o2(0xA6,0xA4),
-     o2(0xA6,0xA5), o2(0xA6,0xA6), o2(0xA6,0xA7), o2(0xA6,0xA8),
-     o2(0xA6,0xA9), o2(0xA6,0xAA), o2(0xA6,0xAB), o2(0xA6,0xAC),
-     o2(0xA6,0xAD), o2(0xA6,0xAE), o2(0xA6,0xAF), o2(0xA6,0xB0),
-     o2(0xA6,0xB1), o2(0xA6,0xB2), o2(0xA6,0xB3), o2(0xA6,0xB4),
-     o2(0xA6,0xB5), o2(0xA6,0xB6), o2(0xA6,0xB7), o2(0xA6,0xB8),
-     o2(0xA6,0xC1), o2(0xA6,0xC2), o2(0xA6,0xC3), o2(0xA6,0xC4),
-     o2(0xA6,0xC5), o2(0xA6,0xC6), o2(0xA6,0xC7), o2(0xA6,0xC8),
-     o2(0xA6,0xC9), o2(0xA6,0xCA), o2(0xA6,0xCB), o2(0xA6,0xCC),
-     o2(0xA6,0xCD), o2(0xA6,0xCE), o2(0xA6,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_CE = {
-    to_SHIFT_JIS_CE_offsets,
-    to_EUC_JP_CE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_CF_infos[10] = {
-     o2(0xA6,0xD0), o2(0xA6,0xD1), o2(0xA6,0xD2), o2(0xA6,0xD3),
-     o2(0xA6,0xD4), o2(0xA6,0xD5), o2(0xA6,0xD6), o2(0xA6,0xD7),
-     o2(0xA6,0xD8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_CF = {
-    to_SHIFT_JIS_CF_offsets,
-    to_EUC_JP_CF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_D0_infos[50] = {
-     o2(0xA7,0xA7), o2(0xA7,0xA1), o2(0xA7,0xA2), o2(0xA7,0xA3),
-     o2(0xA7,0xA4), o2(0xA7,0xA5), o2(0xA7,0xA6), o2(0xA7,0xA8),
-     o2(0xA7,0xA9), o2(0xA7,0xAA), o2(0xA7,0xAB), o2(0xA7,0xAC),
-     o2(0xA7,0xAD), o2(0xA7,0xAE), o2(0xA7,0xAF), o2(0xA7,0xB0),
-     o2(0xA7,0xB1), o2(0xA7,0xB2), o2(0xA7,0xB3), o2(0xA7,0xB4),
-     o2(0xA7,0xB5), o2(0xA7,0xB6), o2(0xA7,0xB7), o2(0xA7,0xB8),
-     o2(0xA7,0xB9), o2(0xA7,0xBA), o2(0xA7,0xBB), o2(0xA7,0xBC),
-     o2(0xA7,0xBD), o2(0xA7,0xBE), o2(0xA7,0xBF), o2(0xA7,0xC0),
-     o2(0xA7,0xC1), o2(0xA7,0xD1), o2(0xA7,0xD2), o2(0xA7,0xD3),
-     o2(0xA7,0xD4), o2(0xA7,0xD5), o2(0xA7,0xD6), o2(0xA7,0xD8),
-     o2(0xA7,0xD9), o2(0xA7,0xDA), o2(0xA7,0xDB), o2(0xA7,0xDC),
-     o2(0xA7,0xDD), o2(0xA7,0xDE), o2(0xA7,0xDF), o2(0xA7,0xE0),
-     o2(0xA7,0xE1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_D0 = {
-    to_SHIFT_JIS_D0_offsets,
-    to_EUC_JP_D0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_D1_infos[18] = {
-     o2(0xA7,0xE2), o2(0xA7,0xE3), o2(0xA7,0xE4), o2(0xA7,0xE5),
-     o2(0xA7,0xE6), o2(0xA7,0xE7), o2(0xA7,0xE8), o2(0xA7,0xE9),
-     o2(0xA7,0xEA), o2(0xA7,0xEB), o2(0xA7,0xEC), o2(0xA7,0xED),
-     o2(0xA7,0xEE), o2(0xA7,0xEF), o2(0xA7,0xF0), o2(0xA7,0xF1),
-     o2(0xA7,0xD7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_D1 = {
-    to_SHIFT_JIS_D1_offsets,
-    to_EUC_JP_D1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_80_infos[16] = {
-     o2(0xA1,0xBE), o2(0xA1,0xBD), o2(0xA1,0xC2), o2(0xA1,0xC6),
-     o2(0xA1,0xC7), o2(0xA1,0xC8), o2(0xA1,0xC9), o2(0xA2,0xF7),
-     o2(0xA2,0xF8), o2(0xA1,0xC5), o2(0xA1,0xC4), o2(0xA2,0xF3),
-     o2(0xA1,0xEC), o2(0xA1,0xED), o2(0xA2,0xA8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_80 = {
-    to_SHIFT_JIS_E2_80_offsets,
-    to_EUC_JP_E2_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_84_infos[5] = {
-     o2(0xA1,0xEE), o2(0xAD,0xE2), o2(0xAD,0xE4), o2(0xA2,0xF2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_84 = {
-    to_SHIFT_JIS_E2_84_offsets,
-    to_EUC_JP_E2_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_85_infos[21] = {
-     o2(0xAD,0xB5), o2(0xAD,0xB6), o2(0xAD,0xB7), o2(0xAD,0xB8),
-     o2(0xAD,0xB9), o2(0xAD,0xBA), o2(0xAD,0xBB), o2(0xAD,0xBC),
-     o2(0xAD,0xBD), o2(0xAD,0xBE), o2(0xFC,0xF1), o2(0xFC,0xF2),
-     o2(0xFC,0xF3), o2(0xFC,0xF4), o2(0xFC,0xF5), o2(0xFC,0xF6),
-     o2(0xFC,0xF7), o2(0xFC,0xF8), o2(0xFC,0xF9), o2(0xFC,0xFA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_85 = {
-    to_SHIFT_JIS_E2_85_offsets,
-    to_EUC_JP_E2_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_86_infos[5] = {
-     o2(0xA2,0xAB), o2(0xA2,0xAC), o2(0xA2,0xAA), o2(0xA2,0xAD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_86 = {
-    to_SHIFT_JIS_E2_86_offsets,
-    to_EUC_JP_E2_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_87_infos[3] = {
-     o2(0xA2,0xCD), o2(0xA2,0xCE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_87 = {
-    to_SHIFT_JIS_E2_87_offsets,
-    to_EUC_JP_E2_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_88_infos[24] = {
-     o2(0xA2,0xCF), o2(0xA2,0xDF), o2(0xA2,0xD0), o2(0xA2,0xE0),
-     o2(0xA2,0xBA), o2(0xA2,0xBB), o2(0xAD,0xF4), o2(0xA1,0xDD),
-     o2(0xAD,0xF5), o2(0xA2,0xE7), o2(0xA1,0xE7), o2(0xAD,0xF8),
-     o2(0xAD,0xF7), o2(0xA2,0xCA), o2(0xA2,0xCB), o2(0xAD,0xFB),
-     o2(0xAD,0xFC), o2(0xAD,0xF2), o2(0xA2,0xEA), o2(0xAD,0xF3),
-     o2(0xA1,0xE8), o2(0xAD,0xFA), o2(0xA2,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_88 = {
-    to_SHIFT_JIS_E2_88_offsets,
-    to_EUC_JP_E2_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_89_infos[8] = {
-     o2(0xAD,0xF0), o2(0xA1,0xE2), o2(0xAD,0xF1), o2(0xA1,0xE5),
-     o2(0xA1,0xE6), o2(0xA2,0xE3), o2(0xA2,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_89 = {
-    to_SHIFT_JIS_E2_89_offsets,
-    to_EUC_JP_E2_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_8A_infos[7] = {
-     o2(0xA2,0xBE), o2(0xA2,0xBF), o2(0xA2,0xBC), o2(0xA2,0xBD),
-     o2(0xAD,0xF6), o2(0xAD,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_8A = {
-    to_SHIFT_JIS_E2_8A_offsets,
-    to_EUC_JP_E2_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_8C_infos[2] = {
-     o2(0xA2,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_8C = {
-    to_SHIFT_JIS_E2_8C_offsets,
-    to_EUC_JP_E2_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_91_infos[21] = {
-     o2(0xAD,0xA1), o2(0xAD,0xA2), o2(0xAD,0xA3), o2(0xAD,0xA4),
-     o2(0xAD,0xA5), o2(0xAD,0xA6), o2(0xAD,0xA7), o2(0xAD,0xA8),
-     o2(0xAD,0xA9), o2(0xAD,0xAA), o2(0xAD,0xAB), o2(0xAD,0xAC),
-     o2(0xAD,0xAD), o2(0xAD,0xAE), o2(0xAD,0xAF), o2(0xAD,0xB0),
-     o2(0xAD,0xB1), o2(0xAD,0xB2), o2(0xAD,0xB3), o2(0xAD,0xB4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_91 = {
-    to_SHIFT_JIS_E2_91_offsets,
-    to_EUC_JP_E2_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_94_infos[31] = {
-     o2(0xA8,0xA1), o2(0xA8,0xAC), o2(0xA8,0xA2), o2(0xA8,0xAD),
-     o2(0xA8,0xA3), o2(0xA8,0xAE), o2(0xA8,0xA4), o2(0xA8,0xAF),
-     o2(0xA8,0xA6), o2(0xA8,0xB1), o2(0xA8,0xA5), o2(0xA8,0xB0),
-     o2(0xA8,0xA7), o2(0xA8,0xBC), o2(0xA8,0xB7), o2(0xA8,0xB2),
-     o2(0xA8,0xA9), o2(0xA8,0xBE), o2(0xA8,0xB9), o2(0xA8,0xB4),
-     o2(0xA8,0xA8), o2(0xA8,0xB8), o2(0xA8,0xBD), o2(0xA8,0xB3),
-     o2(0xA8,0xAA), o2(0xA8,0xBA), o2(0xA8,0xBF), o2(0xA8,0xB5),
-     o2(0xA8,0xAB), o2(0xA8,0xBB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_94 = {
-    to_SHIFT_JIS_E2_94_offsets,
-    to_EUC_JP_E2_94_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_95_infos[3] = {
-     o2(0xA8,0xC0), o2(0xA8,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_95 = {
-    to_SHIFT_JIS_E2_95_offsets,
-    to_EUC_JP_E2_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_96_infos[7] = {
-     o2(0xA2,0xA3), o2(0xA2,0xA2), o2(0xA2,0xA5), o2(0xA2,0xA4),
-     o2(0xA2,0xA7), o2(0xA2,0xA6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_96 = {
-    to_SHIFT_JIS_E2_96_offsets,
-    to_EUC_JP_E2_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_97_infos[7] = {
-     o2(0xA2,0xA1), o2(0xA1,0xFE), o2(0xA1,0xFB), o2(0xA1,0xFD),
-     o2(0xA1,0xFC), o2(0xA2,0xFE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_97 = {
-    to_SHIFT_JIS_E2_97_offsets,
-    to_EUC_JP_E2_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_98_infos[3] = {
-     o2(0xA1,0xFA), o2(0xA1,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_98 = {
-    to_SHIFT_JIS_E2_98_offsets,
-    to_EUC_JP_E2_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_99_infos[6] = {
-     o2(0xA1,0xEA), o2(0xA1,0xE9), o2(0xA2,0xF6), o2(0xA2,0xF5),
-     o2(0xA2,0xF4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2_99 = {
-    to_SHIFT_JIS_E2_99_offsets,
-    to_EUC_JP_E2_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E2_infos[17] = {
-     &to_EUC_JP_E2_80, &to_EUC_JP_E2_84, &to_EUC_JP_E2_85, &to_EUC_JP_E2_86,
-     &to_EUC_JP_E2_87, &to_EUC_JP_E2_88, &to_EUC_JP_E2_89, &to_EUC_JP_E2_8A,
-     &to_EUC_JP_E2_8C, &to_EUC_JP_E2_91, &to_EUC_JP_E2_94, &to_EUC_JP_E2_95,
-     &to_EUC_JP_E2_96, &to_EUC_JP_E2_97, &to_EUC_JP_E2_98, &to_EUC_JP_E2_99,
-                UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E2 = {
-    to_SHIFT_JIS_E2_offsets,
-    to_EUC_JP_E2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_80_infos[25] = {
-     o2(0xA1,0xA1), o2(0xA1,0xA2), o2(0xA1,0xA3), o2(0xA1,0xB7),
-     o2(0xA1,0xB9), o2(0xA1,0xBA), o2(0xA1,0xBB), o2(0xA1,0xD2),
-     o2(0xA1,0xD3), o2(0xA1,0xD4), o2(0xA1,0xD5), o2(0xA1,0xD6),
-     o2(0xA1,0xD7), o2(0xA1,0xD8), o2(0xA1,0xD9), o2(0xA1,0xDA),
-     o2(0xA1,0xDB), o2(0xA2,0xA9), o2(0xA2,0xAE), o2(0xA1,0xCC),
-     o2(0xA1,0xCD), o2(0xA1,0xC1), o2(0xAD,0xE0), o2(0xAD,0xE1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_80 = {
-    to_SHIFT_JIS_E3_80_offsets,
-    to_EUC_JP_E3_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_81_infos[64] = {
-     o2(0xA4,0xA1), o2(0xA4,0xA2), o2(0xA4,0xA3), o2(0xA4,0xA4),
-     o2(0xA4,0xA5), o2(0xA4,0xA6), o2(0xA4,0xA7), o2(0xA4,0xA8),
-     o2(0xA4,0xA9), o2(0xA4,0xAA), o2(0xA4,0xAB), o2(0xA4,0xAC),
-     o2(0xA4,0xAD), o2(0xA4,0xAE), o2(0xA4,0xAF), o2(0xA4,0xB0),
-     o2(0xA4,0xB1), o2(0xA4,0xB2), o2(0xA4,0xB3), o2(0xA4,0xB4),
-     o2(0xA4,0xB5), o2(0xA4,0xB6), o2(0xA4,0xB7), o2(0xA4,0xB8),
-     o2(0xA4,0xB9), o2(0xA4,0xBA), o2(0xA4,0xBB), o2(0xA4,0xBC),
-     o2(0xA4,0xBD), o2(0xA4,0xBE), o2(0xA4,0xBF), o2(0xA4,0xC0),
-     o2(0xA4,0xC1), o2(0xA4,0xC2), o2(0xA4,0xC3), o2(0xA4,0xC4),
-     o2(0xA4,0xC5), o2(0xA4,0xC6), o2(0xA4,0xC7), o2(0xA4,0xC8),
-     o2(0xA4,0xC9), o2(0xA4,0xCA), o2(0xA4,0xCB), o2(0xA4,0xCC),
-     o2(0xA4,0xCD), o2(0xA4,0xCE), o2(0xA4,0xCF), o2(0xA4,0xD0),
-     o2(0xA4,0xD1), o2(0xA4,0xD2), o2(0xA4,0xD3), o2(0xA4,0xD4),
-     o2(0xA4,0xD5), o2(0xA4,0xD6), o2(0xA4,0xD7), o2(0xA4,0xD8),
-     o2(0xA4,0xD9), o2(0xA4,0xDA), o2(0xA4,0xDB), o2(0xA4,0xDC),
-     o2(0xA4,0xDD), o2(0xA4,0xDE), o2(0xA4,0xDF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_81 = {
-    to_SHIFT_JIS_E3_81_offsets,
-    to_EUC_JP_E3_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_82_infos[56] = {
-     o2(0xA4,0xE0), o2(0xA4,0xE1), o2(0xA4,0xE2), o2(0xA4,0xE3),
-     o2(0xA4,0xE4), o2(0xA4,0xE5), o2(0xA4,0xE6), o2(0xA4,0xE7),
-     o2(0xA4,0xE8), o2(0xA4,0xE9), o2(0xA4,0xEA), o2(0xA4,0xEB),
-     o2(0xA4,0xEC), o2(0xA4,0xED), o2(0xA4,0xEE), o2(0xA4,0xEF),
-     o2(0xA4,0xF0), o2(0xA4,0xF1), o2(0xA4,0xF2), o2(0xA4,0xF3),
-     o2(0xA1,0xAB), o2(0xA1,0xAC), o2(0xA1,0xB5), o2(0xA1,0xB6),
-     o2(0xA5,0xA1), o2(0xA5,0xA2), o2(0xA5,0xA3), o2(0xA5,0xA4),
-     o2(0xA5,0xA5), o2(0xA5,0xA6), o2(0xA5,0xA7), o2(0xA5,0xA8),
-     o2(0xA5,0xA9), o2(0xA5,0xAA), o2(0xA5,0xAB), o2(0xA5,0xAC),
-     o2(0xA5,0xAD), o2(0xA5,0xAE), o2(0xA5,0xAF), o2(0xA5,0xB0),
-     o2(0xA5,0xB1), o2(0xA5,0xB2), o2(0xA5,0xB3), o2(0xA5,0xB4),
-     o2(0xA5,0xB5), o2(0xA5,0xB6), o2(0xA5,0xB7), o2(0xA5,0xB8),
-     o2(0xA5,0xB9), o2(0xA5,0xBA), o2(0xA5,0xBB), o2(0xA5,0xBC),
-     o2(0xA5,0xBD), o2(0xA5,0xBE), o2(0xA5,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_82 = {
-    to_SHIFT_JIS_E3_82_offsets,
-    to_EUC_JP_E3_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_83_infos[60] = {
-     o2(0xA5,0xC0), o2(0xA5,0xC1), o2(0xA5,0xC2), o2(0xA5,0xC3),
-     o2(0xA5,0xC4), o2(0xA5,0xC5), o2(0xA5,0xC6), o2(0xA5,0xC7),
-     o2(0xA5,0xC8), o2(0xA5,0xC9), o2(0xA5,0xCA), o2(0xA5,0xCB),
-     o2(0xA5,0xCC), o2(0xA5,0xCD), o2(0xA5,0xCE), o2(0xA5,0xCF),
-     o2(0xA5,0xD0), o2(0xA5,0xD1), o2(0xA5,0xD2), o2(0xA5,0xD3),
-     o2(0xA5,0xD4), o2(0xA5,0xD5), o2(0xA5,0xD6), o2(0xA5,0xD7),
-     o2(0xA5,0xD8), o2(0xA5,0xD9), o2(0xA5,0xDA), o2(0xA5,0xDB),
-     o2(0xA5,0xDC), o2(0xA5,0xDD), o2(0xA5,0xDE), o2(0xA5,0xDF),
-     o2(0xA5,0xE0), o2(0xA5,0xE1), o2(0xA5,0xE2), o2(0xA5,0xE3),
-     o2(0xA5,0xE4), o2(0xA5,0xE5), o2(0xA5,0xE6), o2(0xA5,0xE7),
-     o2(0xA5,0xE8), o2(0xA5,0xE9), o2(0xA5,0xEA), o2(0xA5,0xEB),
-     o2(0xA5,0xEC), o2(0xA5,0xED), o2(0xA5,0xEE), o2(0xA5,0xEF),
-     o2(0xA5,0xF0), o2(0xA5,0xF1), o2(0xA5,0xF2), o2(0xA5,0xF3),
-     o2(0xA5,0xF4), o2(0xA5,0xF5), o2(0xA5,0xF6), o2(0xA1,0xA6),
-     o2(0xA1,0xBC), o2(0xA1,0xB3), o2(0xA1,0xB4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_83 = {
-    to_SHIFT_JIS_E3_83_offsets,
-    to_EUC_JP_E3_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_88_infos[4] = {
-     o2(0xAD,0xEA), o2(0xAD,0xEB), o2(0xAD,0xEC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_88 = {
-    to_SHIFT_JIS_E3_88_offsets,
-    to_EUC_JP_E3_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_8A_infos[6] = {
-     o2(0xAD,0xE5), o2(0xAD,0xE6), o2(0xAD,0xE7), o2(0xAD,0xE8),
-     o2(0xAD,0xE9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_8A = {
-    to_SHIFT_JIS_E3_8A_offsets,
-    to_EUC_JP_E3_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_8C_infos[12] = {
-     o2(0xAD,0xC6), o2(0xAD,0xCA), o2(0xAD,0xC1), o2(0xAD,0xC4),
-     o2(0xAD,0xC2), o2(0xAD,0xCC), o2(0xAD,0xCB), o2(0xAD,0xC5),
-     o2(0xAD,0xCD), o2(0xAD,0xC7), o2(0xAD,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_8C = {
-    to_SHIFT_JIS_E3_8C_offsets,
-    to_EUC_JP_E3_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_8D_infos[10] = {
-     o2(0xAD,0xC0), o2(0xAD,0xCE), o2(0xAD,0xC3), o2(0xAD,0xC8),
-     o2(0xAD,0xC9), o2(0xAD,0xDF), o2(0xAD,0xEF), o2(0xAD,0xEE),
-     o2(0xAD,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_8D = {
-    to_SHIFT_JIS_E3_8D_offsets,
-    to_EUC_JP_E3_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_8E_infos[7] = {
-     o2(0xAD,0xD3), o2(0xAD,0xD4), o2(0xAD,0xD0), o2(0xAD,0xD1),
-     o2(0xAD,0xD2), o2(0xAD,0xD6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_8E = {
-    to_SHIFT_JIS_E3_8E_offsets,
-    to_EUC_JP_E3_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_8F_infos[3] = {
-     o2(0xAD,0xD5), o2(0xAD,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3_8F = {
-    to_SHIFT_JIS_E3_8F_offsets,
-    to_EUC_JP_E3_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E3_infos[11] = {
-     &to_EUC_JP_E3_80, &to_EUC_JP_E3_81, &to_EUC_JP_E3_82, &to_EUC_JP_E3_83,
-     &to_EUC_JP_E3_88, &to_EUC_JP_E3_8A, &to_EUC_JP_E3_8C, &to_EUC_JP_E3_8D,
-     &to_EUC_JP_E3_8E, &to_EUC_JP_E3_8F,            UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E3 = {
-    to_SHIFT_JIS_E3_offsets,
-    to_EUC_JP_E3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_B8_infos[33] = {
-     o2(0xB0,0xEC), o2(0xC3,0xFA), o2(0xBC,0xB7), o2(0xCB,0xFC),
-     o2(0xBE,0xE6), o2(0xBB,0xB0), o2(0xBE,0xE5), o2(0xB2,0xBC),
-     o2(0xC9,0xD4), o2(0xCD,0xBF), o2(0xD0,0xA2), o2(0xB1,0xAF),
-     o2(0xB3,0xEE), o2(0xD0,0xA3), o2(0xC0,0xA4), o2(0xD2,0xC2),
-     o2(0xB5,0xD6), o2(0xCA,0xBA), o2(0xBE,0xE7), o2(0xCE,0xBE),
-     o2(0xCA,0xC2), o2(0xF9,0xAD), o2(0xD0,0xA4), o2(0xC3,0xE6),
-     o2(0xD0,0xA5), o2(0xB6,0xFA), o2(0xD0,0xA6), o2(0xB4,0xDD),
-     o2(0xC3,0xB0), o2(0xBC,0xE7), o2(0xD0,0xA7), o2(0xD0,0xA8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_B8 = {
-    to_SHIFT_JIS_E4_B8_offsets,
-    to_EUC_JP_E4_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_B9_infos[20] = {
-     o2(0xD0,0xA9), o2(0xC7,0xB5), o2(0xB5,0xD7), o2(0xC7,0xB7),
-     o2(0xC6,0xE3), o2(0xB8,0xC3), o2(0xCB,0xB3), o2(0xE9,0xC9),
-     o2(0xD0,0xAA), o2(0xBE,0xE8), o2(0xD0,0xAB), o2(0xB2,0xB5),
-     o2(0xB6,0xE5), o2(0xB8,0xF0), o2(0xCC,0xE9), o2(0xD6,0xA6),
-     o2(0xCD,0xF0), o2(0xC6,0xFD), o2(0xB4,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_B9 = {
-    to_SHIFT_JIS_E4_B9_offsets,
-    to_EUC_JP_E4_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BA_infos[36] = {
-     o2(0xB5,0xB5), o2(0xD0,0xAC), o2(0xD0,0xAD), o2(0xCE,0xBB),
-     o2(0xCD,0xBD), o2(0xC1,0xE8), o2(0xD0,0xAF), o2(0xBB,0xF6),
-     o2(0xC6,0xF3), o2(0xD0,0xB2), o2(0xB1,0xBE), o2(0xB8,0xDF),
-     o2(0xB8,0xDE), o2(0xB0,0xE6), o2(0xCF,0xCB), o2(0xCF,0xCA),
-     o2(0xBA,0xB3), o2(0xB0,0xA1), o2(0xD0,0xB3), o2(0xD0,0xB4),
-     o2(0xD0,0xB5), o2(0xCB,0xB4), o2(0xD0,0xB6), o2(0xB8,0xF2),
-     o2(0xB0,0xE7), o2(0xCB,0xF2), o2(0xB5,0xFC), o2(0xB5,0xFD),
-     o2(0xB5,0xFE), o2(0xC4,0xE2), o2(0xCE,0xBC), o2(0xD0,0xB7),
-     o2(0xD0,0xB8), o2(0xD0,0xB9), o2(0xBF,0xCD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BA = {
-    to_SHIFT_JIS_E4_BA_offsets,
-    to_EUC_JP_E4_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BB_infos[33] = {
-     o2(0xBD,0xBA), o2(0xBF,0xCE), o2(0xD0,0xBE), o2(0xD0,0xBC),
-     o2(0xD0,0xBD), o2(0xB5,0xD8), o2(0xBA,0xA3), o2(0xB2,0xF0),
-     o2(0xD0,0xBB), o2(0xD0,0xBA), o2(0xCA,0xA9), o2(0xBB,0xC6),
-     o2(0xBB,0xC5), o2(0xC2,0xBE), o2(0xD0,0xBF), o2(0xC9,0xD5),
-     o2(0xC0,0xE7), o2(0xA1,0xB8), o2(0xD0,0xC0), o2(0xD0,0xC2),
-     o2(0xF9,0xAE), o2(0xC2,0xE5), o2(0xCE,0xE1), o2(0xB0,0xCA),
-     o2(0xD0,0xC1), o2(0xB2,0xBE), o2(0xB6,0xC4), o2(0xC3,0xE7),
-     o2(0xB7,0xEF), o2(0xD0,0xC3), o2(0xC7,0xA4), o2(0xF9,0xAF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BB = {
-    to_SHIFT_JIS_E4_BB_offsets,
-    to_EUC_JP_E4_BB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BC_infos[23] = {
-     o2(0xF9,0xB0), o2(0xB4,0xEB), o2(0xF9,0xB1), o2(0xD0,0xC4),
-     o2(0xB0,0xCB), o2(0xB8,0xE0), o2(0xB4,0xEC), o2(0xC9,0xFA),
-     o2(0xC8,0xB2), o2(0xB5,0xD9), o2(0xB2,0xF1), o2(0xD0,0xE7),
-     o2(0xC5,0xC1), o2(0xC7,0xEC), o2(0xD0,0xC6), o2(0xC8,0xBC),
-     o2(0xCE,0xE2), o2(0xBF,0xAD), o2(0xF9,0xB2), o2(0xBB,0xC7),
-     o2(0xBB,0xF7), o2(0xB2,0xC0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BC = {
-    to_SHIFT_JIS_E4_BC_offsets,
-    to_EUC_JP_E4_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BD_infos[28] = {
-     o2(0xC4,0xD1), o2(0xC3,0xA2), o2(0xD0,0xCA), o2(0xB0,0xCC),
-     o2(0xC4,0xE3), o2(0xBD,0xBB), o2(0xBA,0xB4), o2(0xCD,0xA4),
-     o2(0xC2,0xCE), o2(0xB2,0xBF), o2(0xF9,0xB3), o2(0xD0,0xC9),
-     o2(0xCD,0xBE), o2(0xD0,0xC5), o2(0xD0,0xC7), o2(0xBA,0xEE),
-     o2(0xD0,0xC8), o2(0xD5,0xA4), o2(0xD0,0xD0), o2(0xD0,0xD3),
-     o2(0xD0,0xD1), o2(0xB2,0xC2), o2(0xCA,0xBB), o2(0xD0,0xCB),
-     o2(0xD0,0xCF), o2(0xB8,0xF3), o2(0xBB,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BD = {
-    to_SHIFT_JIS_E4_BD_offsets,
-    to_EUC_JP_E4_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BE_infos[25] = {
-     o2(0xB4,0xA6), o2(0xD0,0xD4), o2(0xD0,0xCC), o2(0xF9,0xB5),
-     o2(0xCE,0xE3), o2(0xBB,0xF8), o2(0xD0,0xCD), o2(0xD0,0xD2),
-     o2(0xF9,0xB4), o2(0xF9,0xB7), o2(0xD0,0xD5), o2(0xD0,0xCE),
-     o2(0xF9,0xB6), o2(0xB6,0xA1), o2(0xB0,0xCD), o2(0xB6,0xA2),
-     o2(0xB2,0xC1), o2(0xD5,0xA5), o2(0xCB,0xF9), o2(0xC9,0xEE),
-     o2(0xB8,0xF4), o2(0xBF,0xAF), o2(0xCE,0xB7), o2(0xCA,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BE = {
-    to_SHIFT_JIS_E4_BE_offsets,
-    to_EUC_JP_E4_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_BF_infos[30] = {
-     o2(0xB7,0xB8), o2(0xC2,0xA5), o2(0xB2,0xE4), o2(0xF9,0xA6),
-     o2(0xBD,0xD3), o2(0xF9,0xB8), o2(0xD0,0xD9), o2(0xD0,0xDE),
-     o2(0xD0,0xDC), o2(0xD0,0xD7), o2(0xC2,0xAF), o2(0xD0,0xDA),
-     o2(0xD0,0xDD), o2(0xD0,0xDB), o2(0xCA,0xDD), o2(0xD0,0xD8),
-     o2(0xBF,0xAE), o2(0xCB,0xF3), o2(0xD0,0xDF), o2(0xD0,0xE0),
-     o2(0xBD,0xA4), o2(0xD0,0xED), o2(0xC7,0xD0), o2(0xC9,0xB6),
-     o2(0xD0,0xE8), o2(0xCA,0xF0), o2(0xB2,0xB6), o2(0xD0,0xEC),
-     o2(0xF9,0xBB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4_BF = {
-    to_SHIFT_JIS_E4_BF_offsets,
-    to_EUC_JP_E4_BF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E4_infos[9] = {
-     &to_EUC_JP_E4_B8, &to_EUC_JP_E4_B9, &to_EUC_JP_E4_BA, &to_EUC_JP_E4_BB,
-     &to_EUC_JP_E4_BC, &to_EUC_JP_E4_BD, &to_EUC_JP_E4_BE, &to_EUC_JP_E4_BF,
-                UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E4 = {
-    to_SHIFT_JIS_E4_offsets,
-    to_EUC_JP_E4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_80_infos[29] = {
-     o2(0xD0,0xE6), o2(0xD0,0xEF), o2(0xC1,0xD2), o2(0xB8,0xC4),
-     o2(0xC7,0xDC), o2(0xE0,0xC7), o2(0xD0,0xEE), o2(0xC5,0xDD),
-     o2(0xD0,0xE3), o2(0xB8,0xF6), o2(0xB8,0xF5), o2(0xD0,0xE1),
-     o2(0xF9,0xBC), o2(0xBC,0xDA), o2(0xD0,0xE9), o2(0xF9,0xBA),
-     o2(0xCA,0xEF), o2(0xC3,0xCD), o2(0xD0,0xE5), o2(0xB7,0xF1),
-     o2(0xD0,0xE2), o2(0xD0,0xEA), o2(0xD0,0xE4), o2(0xCE,0xD1),
-     o2(0xD0,0xEB), o2(0xCF,0xC1), o2(0xB6,0xE6), o2(0xB7,0xF0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_80 = {
-    to_SHIFT_JIS_E5_80_offsets,
-    to_EUC_JP_E5_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_81_infos[23] = {
-     o2(0xF9,0xB9), o2(0xF9,0xBF), o2(0xD0,0xF0), o2(0xF9,0xBD),
-     o2(0xD0,0xF1), o2(0xD0,0xF5), o2(0xB0,0xCE), o2(0xCA,0xD0),
-     o2(0xD0,0xF4), o2(0xD0,0xF3), o2(0xD0,0xF7), o2(0xD0,0xF6),
-     o2(0xC4,0xE4), o2(0xB7,0xF2), o2(0xD0,0xF8), o2(0xF9,0xBE),
-     o2(0xBC,0xC5), o2(0xC2,0xA6), o2(0xC4,0xE5), o2(0xB6,0xF6),
-     o2(0xD0,0xF9), o2(0xB5,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_81 = {
-    to_SHIFT_JIS_E5_81_offsets,
-    to_EUC_JP_E5_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_82_infos[17] = {
-     o2(0xD0,0xFA), o2(0xD0,0xFC), o2(0xCB,0xB5), o2(0xB7,0xE6),
-     o2(0xF9,0xC0), o2(0xBB,0xB1), o2(0xC8,0xF7), o2(0xD0,0xFB),
-     o2(0xBA,0xC5), o2(0xCD,0xC3), o2(0xD0,0xFE), o2(0xD1,0xA3),
-     o2(0xD0,0xFD), o2(0xBA,0xC4), o2(0xBD,0xFD), o2(0xB7,0xB9),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_82 = {
-    to_SHIFT_JIS_E5_82_offsets,
-    to_EUC_JP_E5_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_83_infos[22] = {
-     o2(0xD1,0xA4), o2(0xB6,0xCF), o2(0xD1,0xA1), o2(0xD1,0xA2),
-     o2(0xC6,0xAF), o2(0xC1,0xFC), o2(0xB6,0xA3), o2(0xCB,0xCD),
-     o2(0xD1,0xA5), o2(0xF9,0xC2), o2(0xCE,0xBD), o2(0xD1,0xA6),
-     o2(0xD1,0xA9), o2(0xD1,0xA7), o2(0xC1,0xCE), o2(0xD1,0xA8),
-     o2(0xD1,0xAA), o2(0xF9,0xC1), o2(0xD1,0xAC), o2(0xD1,0xAB),
-     o2(0xCA,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_83 = {
-    to_SHIFT_JIS_E5_83_offsets,
-    to_EUC_JP_E5_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_84_infos[21] = {
-     o2(0xB5,0xB7), o2(0xD1,0xAE), o2(0xD1,0xAF), o2(0xB2,0xAF),
-     o2(0xD1,0xAD), o2(0xBC,0xF4), o2(0xD1,0xB2), o2(0xD1,0xB1),
-     o2(0xD1,0xB0), o2(0xD0,0xD6), o2(0xD1,0xB3), o2(0xBD,0xFE),
-     o2(0xD1,0xB4), o2(0xCD,0xA5), o2(0xCC,0xD9), o2(0xD1,0xB6),
-     o2(0xD1,0xB5), o2(0xD1,0xB8), o2(0xD1,0xB7), o2(0xD1,0xB9),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_84 = {
-    to_SHIFT_JIS_E5_84_offsets,
-    to_EUC_JP_E5_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_85_infos[36] = {
-     o2(0xD1,0xBA), o2(0xB0,0xF4), o2(0xB8,0xB5), o2(0xB7,0xBB),
-     o2(0xBD,0xBC), o2(0xC3,0xFB), o2(0xB6,0xA4), o2(0xC0,0xE8),
-     o2(0xB8,0xF7), o2(0xF9,0xC3), o2(0xB9,0xEE), o2(0xD1,0xBC),
-     o2(0xCC,0xC8), o2(0xC5,0xC6), o2(0xBB,0xF9), o2(0xD1,0xBB),
-     o2(0xD1,0xBD), o2(0xC5,0xDE), o2(0xB3,0xF5), o2(0xD1,0xBE),
-     o2(0xF9,0xC4), o2(0xC6,0xFE), o2(0xC1,0xB4), o2(0xD1,0xC0),
-     o2(0xD1,0xC1), o2(0xC8,0xAC), o2(0xB8,0xF8), o2(0xCF,0xBB),
-     o2(0xD1,0xC2), o2(0xB6,0xA6), o2(0xCA,0xBC), o2(0xC2,0xB6),
-     o2(0xB6,0xF1), o2(0xC5,0xB5), o2(0xB7,0xF3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_85 = {
-    to_SHIFT_JIS_E5_85_offsets,
-    to_EUC_JP_E5_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_86_infos[39] = {
-     o2(0xD1,0xC3), o2(0xD1,0xC4), o2(0xC6,0xE2), o2(0xB1,0xDF),
-     o2(0xD1,0xC7), o2(0xBA,0xFD), o2(0xD1,0xC6), o2(0xBA,0xC6),
-     o2(0xD1,0xC8), o2(0xE6,0xEE), o2(0xD1,0xC9), o2(0xCB,0xC1),
-     o2(0xD1,0xCA), o2(0xD1,0xCB), o2(0xD1,0xCC), o2(0xBE,0xE9),
-     o2(0xBC,0xCC), o2(0xF9,0xC5), o2(0xB4,0xA7), o2(0xD1,0xCF),
-     o2(0xD1,0xCD), o2(0xCC,0xBD), o2(0xD1,0xCE), o2(0xC9,0xDA),
-     o2(0xD1,0xD0), o2(0xD1,0xD1), o2(0xD1,0xD2), o2(0xC5,0xDF),
-     o2(0xD1,0xD6), o2(0xD1,0xD4), o2(0xD1,0xD5), o2(0xD1,0xD3),
-     o2(0xBA,0xE3), o2(0xD1,0xD7), o2(0xCC,0xEA), o2(0xCE,0xE4),
-     o2(0xD1,0xD8), o2(0xF9,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_86 = {
-    to_SHIFT_JIS_E5_86_offsets,
-    to_EUC_JP_E5_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_87_infos[29] = {
-     o2(0xC0,0xA8), o2(0xD1,0xD9), o2(0xBD,0xDA), o2(0xD1,0xDA),
-     o2(0xC3,0xFC), o2(0xCE,0xBF), o2(0xC5,0xE0), o2(0xD2,0xC5),
-     o2(0xD1,0xDB), o2(0xF4,0xA5), o2(0xB6,0xC5), o2(0xD1,0xDC),
-     o2(0xCB,0xDE), o2(0xBD,0xE8), o2(0xC2,0xFC), o2(0xD1,0xDE),
-     o2(0xC6,0xE4), o2(0xF9,0xC7), o2(0xD1,0xDF), o2(0xD1,0xE0),
-     o2(0xB3,0xAE), o2(0xD1,0xE1), o2(0xB6,0xA7), o2(0xC6,0xCC),
-     o2(0xB1,0xFA), o2(0xBD,0xD0), o2(0xC8,0xA1), o2(0xD1,0xE2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_87 = {
-    to_SHIFT_JIS_E5_87_offsets,
-    to_EUC_JP_E5_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_88_infos[29] = {
-     o2(0xC5,0xE1), o2(0xBF,0xCF), o2(0xD1,0xE3), o2(0xCA,0xAC),
-     o2(0xC0,0xDA), o2(0xB4,0xA2), o2(0xB4,0xA9), o2(0xD1,0xE4),
-     o2(0xD1,0xE6), o2(0xB7,0xBA), o2(0xD1,0xE5), o2(0xF9,0xC8),
-     o2(0xCE,0xF3), o2(0xBD,0xE9), o2(0xC8,0xBD), o2(0xCA,0xCC),
-     o2(0xD1,0xE7), o2(0xCD,0xF8), o2(0xD1,0xE8), o2(0xD1,0xE9),
-     o2(0xC5,0xFE), o2(0xD1,0xEA), o2(0xC0,0xA9), o2(0xBA,0xFE),
-     o2(0xB7,0xF4), o2(0xD1,0xEB), o2(0xBB,0xC9), o2(0xB9,0xEF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_88 = {
-    to_SHIFT_JIS_E5_88_offsets,
-    to_EUC_JP_E5_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_89_infos[27] = {
-     o2(0xC4,0xE6), o2(0xD1,0xED), o2(0xC2,0xA7), o2(0xBA,0xEF),
-     o2(0xD1,0xEE), o2(0xD1,0xEF), o2(0xC1,0xB0), o2(0xD1,0xEC),
-     o2(0xD1,0xF1), o2(0xCB,0xB6), o2(0xB9,0xE4), o2(0xD1,0xF0),
-     o2(0xB7,0xF5), o2(0xBA,0xDE), o2(0xC7,0xED), o2(0xD1,0xF4),
-     o2(0xD1,0xF2), o2(0xC9,0xFB), o2(0xBE,0xEA), o2(0xD1,0xFB),
-     o2(0xB3,0xE4), o2(0xD1,0xF5), o2(0xD1,0xF3), o2(0xC1,0xCF),
-     o2(0xD1,0xF7), o2(0xD1,0xF6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_89 = {
-    to_SHIFT_JIS_E5_89_offsets,
-    to_EUC_JP_E5_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8A_infos[27] = {
-     o2(0xB3,0xC4), o2(0xB7,0xE0), o2(0xD1,0xFC), o2(0xCE,0xAD),
-     o2(0xD1,0xF8), o2(0xD1,0xFD), o2(0xD1,0xFA), o2(0xD1,0xF9),
-     o2(0xCE,0xCF), o2(0xF9,0xC9), o2(0xB8,0xF9), o2(0xB2,0xC3),
-     o2(0xCE,0xF4), o2(0xF9,0xCA), o2(0xBD,0xF5), o2(0xC5,0xD8),
-     o2(0xB9,0xE5), o2(0xD2,0xA2), o2(0xD2,0xA3), o2(0xFB,0xBC),
-     o2(0xCE,0xE5), o2(0xCF,0xAB), o2(0xD2,0xA5), o2(0xB8,0xFA),
-     o2(0xD2,0xA4), o2(0xB3,0xAF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8A = {
-    to_SHIFT_JIS_E5_8A_offsets,
-    to_EUC_JP_E5_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8B_infos[31] = {
-     o2(0xF9,0xCB), o2(0xD2,0xA6), o2(0xCB,0xD6), o2(0xC4,0xBC),
-     o2(0xCD,0xA6), o2(0xCA,0xD9), o2(0xD2,0xA7), o2(0xF0,0xD5),
-     o2(0xC6,0xB0), o2(0xD2,0xA8), o2(0xB4,0xAA), o2(0xCC,0xB3),
-     o2(0xF9,0xCC), o2(0xBE,0xA1), o2(0xD2,0xA9), o2(0xCA,0xE7),
-     o2(0xD2,0xAD), o2(0xC0,0xAA), o2(0xD2,0xAA), o2(0xB6,0xD0),
-     o2(0xD2,0xAB), o2(0xB4,0xAB), o2(0xB7,0xAE), o2(0xD2,0xAE),
-     o2(0xD2,0xAF), o2(0xD2,0xB0), o2(0xD2,0xB1), o2(0xBC,0xDB),
-     o2(0xB8,0xFB), o2(0xCC,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8B = {
-    to_SHIFT_JIS_E5_8B_offsets,
-    to_EUC_JP_E5_8B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8C_infos[30] = {
-     o2(0xF9,0xCD), o2(0xCC,0xE8), o2(0xC6,0xF7), o2(0xCA,0xF1),
-     o2(0xD2,0xB2), o2(0xF9,0xCE), o2(0xD2,0xB3), o2(0xD2,0xB5),
-     o2(0xD2,0xB7), o2(0xD2,0xB6), o2(0xD2,0xB8), o2(0xB2,0xBD),
-     o2(0xCB,0xCC), o2(0xBA,0xFC), o2(0xD2,0xB9), o2(0xC1,0xD9),
-     o2(0xBE,0xA2), o2(0xB6,0xA9), o2(0xD2,0xBA), o2(0xF9,0xCF),
-     o2(0xC8,0xDB), o2(0xD2,0xBB), o2(0xD2,0xBC), o2(0xD2,0xBD),
-     o2(0xD2,0xBE), o2(0xC9,0xA4), o2(0xB6,0xE8), o2(0xB0,0xE5),
-     o2(0xC6,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8C = {
-    to_SHIFT_JIS_E5_8C_offsets,
-    to_EUC_JP_E5_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8D_infos[35] = {
-     o2(0xD2,0xBF), o2(0xBD,0xBD), o2(0xC0,0xE9), o2(0xD2,0xC1),
-     o2(0xD2,0xC0), o2(0xBE,0xA3), o2(0xB8,0xE1), o2(0xD2,0xC3),
-     o2(0xC8,0xBE), o2(0xD2,0xC4), o2(0xC8,0xDC), o2(0xC2,0xB4),
-     o2(0xC2,0xEE), o2(0xB6,0xA8), o2(0xC6,0xEE), o2(0xC3,0xB1),
-     o2(0xC7,0xEE), o2(0xCB,0xCE), o2(0xD2,0xC6), o2(0xC0,0xEA),
-     o2(0xB7,0xB5), o2(0xD2,0xC7), o2(0xD2,0xC8), o2(0xB1,0xAC),
-     o2(0xB0,0xF5), o2(0xB4,0xED), o2(0xF9,0xD0), o2(0xC2,0xA8),
-     o2(0xB5,0xD1), o2(0xCD,0xF1), o2(0xD2,0xCB), o2(0xB2,0xB7),
-     o2(0xD2,0xCA), o2(0xB6,0xAA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8D = {
-    to_SHIFT_JIS_E5_8D_offsets,
-    to_EUC_JP_E5_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8E_infos[20] = {
-     o2(0xD2,0xCC), o2(0xCC,0xF1), o2(0xF9,0xD1), o2(0xD2,0xCD),
-     o2(0xCE,0xD2), o2(0xB8,0xFC), o2(0xB8,0xB6), o2(0xD2,0xCE),
-     o2(0xD2,0xD0), o2(0xD2,0xCF), o2(0xBF,0xDF), o2(0xB1,0xB9),
-     o2(0xB1,0xDE), o2(0xD2,0xD1), o2(0xD2,0xD2), o2(0xF9,0xD2),
-     o2(0xB8,0xB7), o2(0xD2,0xD3), o2(0xB5,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8E = {
-    to_SHIFT_JIS_E5_8E_offsets,
-    to_EUC_JP_E5_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_8F_infos[38] = {
-     o2(0xBB,0xB2), o2(0xD2,0xD4), o2(0xCB,0xF4), o2(0xBA,0xB5),
-     o2(0xB5,0xDA), o2(0xCD,0xA7), o2(0xC1,0xD0), o2(0xC8,0xBF),
-     o2(0xBC,0xFD), o2(0xBD,0xC7), o2(0xBC,0xE8), o2(0xBC,0xF5),
-     o2(0xBD,0xF6), o2(0xC8,0xC0), o2(0xF9,0xD3), o2(0xD2,0xD7),
-     o2(0xB1,0xC3), o2(0xC1,0xD1), o2(0xB8,0xFD), o2(0xB8,0xC5),
-     o2(0xB6,0xE7), o2(0xD2,0xDB), o2(0xC3,0xA1), o2(0xC2,0xFE),
-     o2(0xB6,0xAB), o2(0xBE,0xA4), o2(0xD2,0xDC), o2(0xD2,0xDA),
-     o2(0xB2,0xC4), o2(0xC2,0xE6), o2(0xBC,0xB8), o2(0xBB,0xCB),
-     o2(0xB1,0xA6), o2(0xB3,0xF0), o2(0xB9,0xE6), o2(0xBB,0xCA),
-     o2(0xD2,0xDD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_8F = {
-    to_SHIFT_JIS_E5_8F_offsets,
-    to_EUC_JP_E5_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_90_infos[31] = {
-     o2(0xD2,0xDE), o2(0xB5,0xC9), o2(0xB3,0xC6), o2(0xB9,0xE7),
-     o2(0xB5,0xC8), o2(0xC4,0xDF), o2(0xB1,0xA5), o2(0xC6,0xB1),
-     o2(0xCC,0xBE), o2(0xB9,0xA1), o2(0xCD,0xF9), o2(0xC5,0xC7),
-     o2(0xB8,0xFE), o2(0xB7,0xAF), o2(0xD2,0xE7), o2(0xB6,0xE3),
-     o2(0xCB,0xCA), o2(0xC8,0xDD), o2(0xD2,0xE6), o2(0xB4,0xDE),
-     o2(0xD2,0xE1), o2(0xD2,0xE2), o2(0xD2,0xE4), o2(0xD2,0xE5),
-     o2(0xB5,0xDB), o2(0xBF,0xE1), o2(0xCA,0xAD), o2(0xD2,0xE3),
-     o2(0xD2,0xDF), o2(0xB8,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_90 = {
-    to_SHIFT_JIS_E5_90_offsets,
-    to_EUC_JP_E5_90_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_91_infos[21] = {
-     o2(0xD2,0xE0), o2(0xCF,0xA4), o2(0xCA,0xF2), o2(0xC4,0xE8),
-     o2(0xB8,0xE2), o2(0xB9,0xF0), o2(0xD2,0xE8), o2(0xC6,0xDD),
-     o2(0xD2,0xEC), o2(0xBC,0xFE), o2(0xBC,0xF6), o2(0xD2,0xEF),
-     o2(0xD2,0xED), o2(0xCC,0xA3), o2(0xD2,0xEA), o2(0xD2,0xF3),
-     o2(0xD2,0xEE), o2(0xD2,0xF1), o2(0xB8,0xC6), o2(0xCC,0xBF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_91 = {
-    to_SHIFT_JIS_E5_91_offsets,
-    to_EUC_JP_E5_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_92_infos[26] = {
-     o2(0xD2,0xF2), o2(0xD2,0xF4), o2(0xD2,0xF6), o2(0xF9,0xD6),
-     o2(0xBA,0xF0), o2(0xCF,0xC2), o2(0xD2,0xEB), o2(0xD2,0xE9),
-     o2(0xD2,0xF5), o2(0xD2,0xF0), o2(0xF9,0xD5), o2(0xD2,0xF8),
-     o2(0xD3,0xA3), o2(0xD2,0xFA), o2(0xD2,0xFE), o2(0xF9,0xD7),
-     o2(0xD3,0xA1), o2(0xD2,0xFB), o2(0xD3,0xBE), o2(0xBA,0xE9),
-     o2(0xB3,0xB1), o2(0xD2,0xF9), o2(0xD3,0xA5), o2(0xB0,0xF6),
-     o2(0xD3,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_92 = {
-    to_SHIFT_JIS_E5_92_offsets,
-    to_EUC_JP_E5_92_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_93_infos[21] = {
-     o2(0xB0,0xA5), o2(0xC9,0xCA), o2(0xD3,0xA2), o2(0xD2,0xFC),
-     o2(0xD2,0xF7), o2(0xD2,0xFD), o2(0xBA,0xC8), o2(0xD3,0xA6),
-     o2(0xB0,0xF7), o2(0xD3,0xAF), o2(0xD3,0xA7), o2(0xD3,0xA8),
-     o2(0xBE,0xA5), o2(0xCB,0xE9), o2(0xD3,0xAD), o2(0xD3,0xAC),
-     o2(0xC5,0xAF), o2(0xD3,0xAE), o2(0xD3,0xAB), o2(0xF9,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_93 = {
-    to_SHIFT_JIS_E5_93_offsets,
-    to_EUC_JP_E5_93_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_94_infos[15] = {
-     o2(0xB1,0xB4), o2(0xBA,0xB6), o2(0xBF,0xB0), o2(0xD3,0xA9),
-     o2(0xC5,0xE2), o2(0xD3,0xAA), o2(0xB0,0xA2), o2(0xD3,0xB4),
-     o2(0xCD,0xA3), o2(0xBE,0xA7), o2(0xD3,0xBA), o2(0xD3,0xB9),
-     o2(0xD3,0xB0), o2(0xC2,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_94 = {
-    to_SHIFT_JIS_E5_94_offsets,
-    to_EUC_JP_E5_94_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_95_infos[16] = {
-     o2(0xD3,0xB1), o2(0xC2,0xEF), o2(0xD3,0xB6), o2(0xBE,0xA6),
-     o2(0xD3,0xB3), o2(0xCC,0xE4), o2(0xB7,0xBC), o2(0xD3,0xB7),
-     o2(0xD3,0xB8), o2(0xD3,0xB5), o2(0xD3,0xBB), o2(0xD3,0xB2),
-     o2(0xD3,0xC1), o2(0xD3,0xC6), o2(0xD3,0xC2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_95 = {
-    to_SHIFT_JIS_E5_95_offsets,
-    to_EUC_JP_E5_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_96_infos[25] = {
-     o2(0xD3,0xBD), o2(0xD3,0xC7), o2(0xC1,0xB1), o2(0xF9,0xD9),
-     o2(0xD3,0xC9), o2(0xB9,0xA2), o2(0xD3,0xBF), o2(0xC3,0xFD),
-     o2(0xD3,0xC3), o2(0xD3,0xBC), o2(0xB4,0xAD), o2(0xB4,0xEE),
-     o2(0xB3,0xE5), o2(0xD3,0xC4), o2(0xD3,0xC0), o2(0xB7,0xF6),
-     o2(0xD3,0xCA), o2(0xD3,0xC8), o2(0xC1,0xD3), o2(0xB5,0xCA),
-     o2(0xB6,0xAC), o2(0xD3,0xC5), o2(0xB6,0xF4), o2(0xB1,0xC4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_96 = {
-    to_SHIFT_JIS_E5_96_offsets,
-    to_EUC_JP_E5_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_97_infos[14] = {
-     o2(0xD3,0xCE), o2(0xD3,0xCC), o2(0xD4,0xA7), o2(0xD3,0xD1),
-     o2(0xD3,0xCB), o2(0xD3,0xCF), o2(0xD3,0xCD), o2(0xBB,0xCC),
-     o2(0xD3,0xD0), o2(0xD3,0xD3), o2(0xD3,0xD8), o2(0xD3,0xD6),
-     o2(0xD3,0xD5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_97 = {
-    to_SHIFT_JIS_E5_97_offsets,
-    to_EUC_JP_E5_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_98_infos[15] = {
-     o2(0xC3,0xB2), o2(0xB2,0xC5), o2(0xD3,0xD2), o2(0xD3,0xD4),
-     o2(0xBE,0xA8), o2(0xB1,0xB3), o2(0xD3,0xD7), o2(0xB2,0xDE),
-     o2(0xD3,0xE2), o2(0xBE,0xFC), o2(0xD3,0xDE), o2(0xD3,0xDC),
-     o2(0xD3,0xDD), o2(0xD3,0xDF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_98 = {
-    to_SHIFT_JIS_E5_98_offsets,
-    to_EUC_JP_E5_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_99_infos[14] = {
-     o2(0xB1,0xBD), o2(0xC1,0xB9), o2(0xD3,0xD9), o2(0xD3,0xDA),
-     o2(0xB3,0xFA), o2(0xD3,0xE1), o2(0xB4,0xEF), o2(0xD3,0xE4),
-     o2(0xD3,0xE0), o2(0xD3,0xE3), o2(0xCA,0xAE), o2(0xC6,0xD5),
-     o2(0xC8,0xB8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_99 = {
-    to_SHIFT_JIS_E5_99_offsets,
-    to_EUC_JP_E5_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9A_infos[14] = {
-     o2(0xD3,0xE6), o2(0xD3,0xE5), o2(0xB3,0xC5), o2(0xD3,0xE7),
-     o2(0xD3,0xEA), o2(0xD3,0xE9), o2(0xD3,0xE8), o2(0xC7,0xB9),
-     o2(0xD3,0xEB), o2(0xD3,0xEC), o2(0xD3,0xEE), o2(0xD3,0xED),
-     o2(0xD3,0xF0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9A = {
-    to_SHIFT_JIS_E5_9A_offsets,
-    to_EUC_JP_E5_9A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9B_infos[24] = {
-     o2(0xD3,0xF3), o2(0xD3,0xF1), o2(0xD3,0xEF), o2(0xD3,0xF2),
-     o2(0xD3,0xF4), o2(0xD3,0xF5), o2(0xD3,0xF6), o2(0xD3,0xF7),
-     o2(0xD3,0xF8), o2(0xD1,0xC5), o2(0xBC,0xFC), o2(0xBB,0xCD),
-     o2(0xB2,0xF3), o2(0xB0,0xF8), o2(0xC3,0xC4), o2(0xD3,0xF9),
-     o2(0xBA,0xA4), o2(0xB0,0xCF), o2(0xBF,0xDE), o2(0xD3,0xFA),
-     o2(0xB8,0xC7), o2(0xB9,0xF1), o2(0xD3,0xFC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9B = {
-    to_SHIFT_JIS_E5_9B_offsets,
-    to_EUC_JP_E5_9B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9C_infos[23] = {
-     o2(0xD3,0xFB), o2(0xCA,0xE0), o2(0xD3,0xFD), o2(0xD4,0xA1),
-     o2(0xD3,0xFE), o2(0xD4,0xA2), o2(0xD4,0xA3), o2(0xB7,0xF7),
-     o2(0xB1,0xE0), o2(0xD4,0xA4), o2(0xD4,0xA6), o2(0xD4,0xA5),
-     o2(0xD4,0xA8), o2(0xC5,0xDA), o2(0xD4,0xA9), o2(0xB0,0xB5),
-     o2(0xBA,0xDF), o2(0xB7,0xBD), o2(0xC3,0xCF), o2(0xD4,0xAA),
-     o2(0xD4,0xAB), o2(0xD4,0xAD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9C = {
-    to_SHIFT_JIS_E5_9C_offsets,
-    to_EUC_JP_E5_9C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9D_infos[17] = {
-     o2(0xD4,0xAE), o2(0xBA,0xE4), o2(0xB6,0xD1), o2(0xCB,0xB7),
-     o2(0xD4,0xAC), o2(0xD4,0xAF), o2(0xBA,0xC1), o2(0xB9,0xA3),
-     o2(0xF9,0xDA), o2(0xD4,0xB3), o2(0xBA,0xA5), o2(0xF9,0xDB),
-     o2(0xC3,0xB3), o2(0xD4,0xB0), o2(0xC4,0xDA), o2(0xD4,0xB4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9D = {
-    to_SHIFT_JIS_E5_9D_offsets,
-    to_EUC_JP_E5_9D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9E_infos[14] = {
-     o2(0xBF,0xE2), o2(0xD4,0xB2), o2(0xD4,0xB5), o2(0xB7,0xBF),
-     o2(0xD4,0xB6), o2(0xD4,0xB7), o2(0xB9,0xA4), o2(0xB3,0xC0),
-     o2(0xD4,0xB9), o2(0xD4,0xBA), o2(0xF9,0xDC), o2(0xD4,0xBB),
-     o2(0xD4,0xB8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9E = {
-    to_SHIFT_JIS_E5_9E_offsets,
-    to_EUC_JP_E5_9E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_9F_infos[21] = {
-     o2(0xD4,0xB1), o2(0xD4,0xBC), o2(0xD4,0xBD), o2(0xF9,0xDE),
-     o2(0xF9,0xDD), o2(0xCB,0xE4), o2(0xBE,0xEB), o2(0xD4,0xBF),
-     o2(0xD4,0xC0), o2(0xD4,0xBE), o2(0xD4,0xC2), o2(0xC7,0xB8),
-     o2(0xB0,0xE8), o2(0xC9,0xD6), o2(0xD4,0xC3), o2(0xBE,0xFD),
-     o2(0xBC,0xB9), o2(0xC7,0xDD), o2(0xB4,0xF0), o2(0xBA,0xEB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_9F = {
-    to_SHIFT_JIS_E5_9F_offsets,
-    to_EUC_JP_E5_9F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A0_infos[20] = {
-     o2(0xCB,0xD9), o2(0xC6,0xB2), o2(0xB7,0xF8), o2(0xC2,0xCF),
-     o2(0xD4,0xC1), o2(0xD4,0xC4), o2(0xC2,0xC4), o2(0xD4,0xC5),
-     o2(0xD4,0xC6), o2(0xD4,0xC8), o2(0xC4,0xE9), o2(0xB4,0xAE),
-     o2(0xF4,0xA1), o2(0xB1,0xE1), o2(0xCA,0xF3), o2(0xBE,0xEC),
-     o2(0xC5,0xC8), o2(0xBA,0xE6), o2(0xD4,0xCE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A0 = {
-    to_SHIFT_JIS_E5_A0_offsets,
-    to_EUC_JP_E5_A0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A1_infos[21] = {
-     o2(0xCA,0xBD), o2(0xCE,0xDD), o2(0xB2,0xF4), o2(0xD4,0xCA),
-     o2(0xC1,0xBA), o2(0xD4,0xCD), o2(0xC5,0xE3), o2(0xC5,0xC9),
-     o2(0xC5,0xE4), o2(0xC8,0xB9), o2(0xC4,0xCD), o2(0xBA,0xC9),
-     o2(0xD4,0xC9), o2(0xB1,0xF6), o2(0xC5,0xB6), o2(0xD4,0xCB),
-     o2(0xD4,0xC7), o2(0xBF,0xD0), o2(0xD4,0xCF), o2(0xBD,0xCE),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A1 = {
-    to_SHIFT_JIS_E5_A1_offsets,
-    to_EUC_JP_E5_A1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A2_infos[18] = {
-     o2(0xB6,0xAD), o2(0xD4,0xD0), o2(0xCA,0xE8), o2(0xC1,0xFD),
-     o2(0xC4,0xC6), o2(0xF9,0xE1), o2(0xD4,0xD2), o2(0xCB,0xCF),
-     o2(0xD4,0xD3), o2(0xD4,0xD8), o2(0xF9,0xE2), o2(0xCA,0xAF),
-     o2(0xD4,0xD7), o2(0xD4,0xD1), o2(0xD4,0xD4), o2(0xD4,0xD6),
-     o2(0xBA,0xA6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A2 = {
-    to_SHIFT_JIS_E5_A2_offsets,
-    to_EUC_JP_E5_A2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A3_infos[30] = {
-     o2(0xCA,0xC9), o2(0xD4,0xD9), o2(0xC3,0xC5), o2(0xB2,0xF5),
-     o2(0xBE,0xED), o2(0xD4,0xDB), o2(0xD4,0xDA), o2(0xB9,0xE8),
-     o2(0xD4,0xDC), o2(0xD4,0xDE), o2(0xD4,0xDD), o2(0xD4,0xE0),
-     o2(0xD4,0xD5), o2(0xD4,0xE2), o2(0xD4,0xE1), o2(0xD4,0xDF),
-     o2(0xBB,0xCE), o2(0xBF,0xD1), o2(0xC1,0xD4), o2(0xD4,0xE3),
-     o2(0xC0,0xBC), o2(0xB0,0xED), o2(0xC7,0xE4), o2(0xC4,0xDB),
-     o2(0xD4,0xE5), o2(0xD4,0xE4), o2(0xD4,0xE6), o2(0xD4,0xE7),
-     o2(0xD4,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A3 = {
-    to_SHIFT_JIS_E5_A3_offsets,
-    to_EUC_JP_E5_A3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A4_infos[28] = {
-     o2(0xD4,0xE9), o2(0xCA,0xD1), o2(0xD4,0xEA), o2(0xF9,0xE3),
-     o2(0xB2,0xC6), o2(0xD4,0xEB), o2(0xCD,0xBC), o2(0xB3,0xB0),
-     o2(0xD2,0xC9), o2(0xBD,0xC8), o2(0xC2,0xBF), o2(0xD4,0xEC),
-     o2(0xCC,0xEB), o2(0xCC,0xB4), o2(0xD4,0xEE), o2(0xC2,0xE7),
-     o2(0xC5,0xB7), o2(0xC2,0xC0), o2(0xC9,0xD7), o2(0xD4,0xEF),
-     o2(0xD4,0xF0), o2(0xB1,0xFB), o2(0xBC,0xBA), o2(0xD4,0xF1),
-     o2(0xB0,0xD0), o2(0xD4,0xF2), o2(0xD4,0xF3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A4 = {
-    to_SHIFT_JIS_E5_A4_offsets,
-    to_EUC_JP_E5_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A5_infos[31] = {
-     o2(0xB1,0xE2), o2(0xB4,0xF1), o2(0xC6,0xE0), o2(0xCA,0xF4),
-     o2(0xD4,0xF7), o2(0xC1,0xD5), o2(0xD4,0xF6), o2(0xB7,0xC0),
-     o2(0xF9,0xE4), o2(0xCB,0xDB), o2(0xD4,0xF5), o2(0xC5,0xE5),
-     o2(0xD4,0xF9), o2(0xD4,0xF8), o2(0xF9,0xE5), o2(0xF9,0xE6),
-     o2(0xD4,0xFB), o2(0xD4,0xFA), o2(0xF9,0xE7), o2(0xB1,0xFC),
-     o2(0xD4,0xFC), o2(0xBE,0xA9), o2(0xD4,0xFE), o2(0xC3,0xA5),
-     o2(0xD4,0xFD), o2(0xCA,0xB3), o2(0xBD,0xF7), o2(0xC5,0xDB),
-     o2(0xD5,0xA1), o2(0xB9,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A5 = {
-    to_SHIFT_JIS_E5_A5_offsets,
-    to_EUC_JP_E5_A5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A6_infos[22] = {
-     o2(0xD5,0xA2), o2(0xC7,0xA1), o2(0xC8,0xDE), o2(0xCC,0xD1),
-     o2(0xC7,0xA5), o2(0xD5,0xAB), o2(0xB5,0xB8), o2(0xCD,0xC5),
-     o2(0xCC,0xAF), o2(0xD6,0xAC), o2(0xD5,0xA3), o2(0xD5,0xA6),
-     o2(0xF9,0xE8), o2(0xC2,0xC5), o2(0xCB,0xB8), o2(0xC5,0xCA),
-     o2(0xD5,0xA7), o2(0xCB,0xE5), o2(0xF9,0xE9), o2(0xBA,0xCA),
-     o2(0xBE,0xAA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A6 = {
-    to_SHIFT_JIS_E5_A6_offsets,
-    to_EUC_JP_E5_A6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A7_infos[19] = {
-     o2(0xD5,0xA8), o2(0xBB,0xD0), o2(0xBB,0xCF), o2(0xB0,0xB9),
-     o2(0xB8,0xC8), o2(0xC0,0xAB), o2(0xB0,0xD1), o2(0xD5,0xAC),
-     o2(0xD5,0xAD), o2(0xD5,0xAA), o2(0xB1,0xB8), o2(0xB4,0xAF),
-     o2(0xD5,0xA9), o2(0xCC,0xC5), o2(0xC9,0xB1), o2(0xB0,0xA8),
-     o2(0xB0,0xF9), o2(0xBB,0xD1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A7 = {
-    to_SHIFT_JIS_E5_A7_offsets,
-    to_EUC_JP_E5_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A8_infos[16] = {
-     o2(0xB0,0xD2), o2(0xB0,0xA3), o2(0xD5,0xB2), o2(0xD5,0xB0),
-     o2(0xCC,0xBC), o2(0xD5,0xB3), o2(0xD5,0xB1), o2(0xD5,0xAF),
-     o2(0xBF,0xB1), o2(0xD5,0xAE), o2(0xCA,0xDA), o2(0xB8,0xE4),
-     o2(0xD5,0xB7), o2(0xD5,0xB8), o2(0xBE,0xAB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A8 = {
-    to_SHIFT_JIS_E5_A8_offsets,
-    to_EUC_JP_E5_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_A9_infos[11] = {
-     o2(0xD5,0xB4), o2(0xCF,0xAC), o2(0xC7,0xCC), o2(0xD5,0xB6),
-     o2(0xBA,0xA7), o2(0xD5,0xB9), o2(0xC9,0xD8), o2(0xD5,0xBA),
-     o2(0xD5,0xB5), o2(0xCC,0xBB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_A9 = {
-    to_SHIFT_JIS_E5_A9_offsets,
-    to_EUC_JP_E5_A9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AA_infos[7] = {
-     o2(0xC7,0xDE), o2(0xD5,0xBB), o2(0xC9,0xB2), o2(0xD5,0xBC),
-     o2(0xD5,0xC0), o2(0xD5,0xBD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AA = {
-    to_SHIFT_JIS_E5_AA_offsets,
-    to_EUC_JP_E5_AA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AB_infos[15] = {
-     o2(0xB2,0xC7), o2(0xD5,0xBF), o2(0xBC,0xBB), o2(0xD5,0xBE),
-     o2(0xB7,0xF9), o2(0xD5,0xCC), o2(0xD5,0xC5), o2(0xD5,0xC2),
-     o2(0xC3,0xE4), o2(0xD5,0xC1), o2(0xD5,0xC3), o2(0xD5,0xC4),
-     o2(0xD5,0xC6), o2(0xD5,0xC7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AB = {
-    to_SHIFT_JIS_E5_AB_offsets,
-    to_EUC_JP_E5_AB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AC_infos[12] = {
-     o2(0xB4,0xF2), o2(0xD5,0xC9), o2(0xD5,0xC8), o2(0xD5,0xCA),
-     o2(0xBE,0xEE), o2(0xD5,0xCD), o2(0xC4,0xDC), o2(0xB1,0xC5),
-     o2(0xD5,0xCB), o2(0xD5,0xCE), o2(0xD5,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AC = {
-    to_SHIFT_JIS_E5_AC_offsets,
-    to_EUC_JP_E5_AC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AD_infos[28] = {
-     o2(0xD5,0xD2), o2(0xD5,0xD0), o2(0xD5,0xD1), o2(0xBB,0xD2),
-     o2(0xD5,0xD3), o2(0xB9,0xA6), o2(0xD5,0xD4), o2(0xF9,0xEA),
-     o2(0xBB,0xFA), o2(0xC2,0xB8), o2(0xD5,0xD5), o2(0xD5,0xD6),
-     o2(0xBB,0xDA), o2(0xB9,0xA7), o2(0xCC,0xD2), o2(0xB5,0xA8),
-     o2(0xB8,0xC9), o2(0xD5,0xD7), o2(0xB3,0xD8), o2(0xD5,0xD8),
-     o2(0xC2,0xB9), o2(0xD5,0xD9), o2(0xD6,0xA3), o2(0xD5,0xDA),
-     o2(0xD5,0xDB), o2(0xD5,0xDC), o2(0xD5,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AD = {
-    to_SHIFT_JIS_E5_AD_offsets,
-    to_EUC_JP_E5_AD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AE_infos[34] = {
-     o2(0xD5,0xDF), o2(0xD5,0xE0), o2(0xC2,0xF0), o2(0xB1,0xA7),
-     o2(0xBC,0xE9), o2(0xB0,0xC2), o2(0xC1,0xD7), o2(0xB4,0xB0),
-     o2(0xBC,0xB5), o2(0xB9,0xA8), o2(0xC5,0xE6), o2(0xBD,0xA1),
-     o2(0xB4,0xB1), o2(0xC3,0xE8), o2(0xC4,0xEA), o2(0xB0,0xB8),
-     o2(0xB5,0xB9), o2(0xCA,0xF5), o2(0xBC,0xC2), o2(0xB5,0xD2),
-     o2(0xC0,0xEB), o2(0xBC,0xBC), o2(0xCD,0xA8), o2(0xD5,0xE1),
-     o2(0xB5,0xDC), o2(0xBA,0xCB), o2(0xB3,0xB2), o2(0xB1,0xE3),
-     o2(0xBE,0xAC), o2(0xB2,0xC8), o2(0xD5,0xE2), o2(0xCD,0xC6),
-     o2(0xBD,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AE = {
-    to_SHIFT_JIS_E5_AE_offsets,
-    to_EUC_JP_E5_AE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_AF_infos[38] = {
-     o2(0xF9,0xEB), o2(0xBC,0xE4), o2(0xD5,0xE3), o2(0xB4,0xF3),
-     o2(0xC6,0xD2), o2(0xCC,0xA9), o2(0xD5,0xE4), o2(0xD5,0xE5),
-     o2(0xC9,0xD9), o2(0xD5,0xE7), o2(0xB4,0xA8), o2(0xB6,0xF7),
-     o2(0xD5,0xE6), o2(0xF9,0xED), o2(0xB4,0xB2), o2(0xBF,0xB2),
-     o2(0xD5,0xEB), o2(0xBB,0xA1), o2(0xB2,0xC9), o2(0xD5,0xEA),
-     o2(0xD5,0xE8), o2(0xD5,0xEC), o2(0xD5,0xE9), o2(0xC7,0xAB),
-     o2(0xDC,0xCD), o2(0xBF,0xB3), o2(0xD5,0xED), o2(0xF9,0xEE),
-     o2(0xCE,0xC0), o2(0xD5,0xEE), o2(0xD5,0xF0), o2(0xC3,0xFE),
-     o2(0xD5,0xEF), o2(0xC0,0xA3), o2(0xBB,0xFB), o2(0xC2,0xD0),
-     o2(0xBC,0xF7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_AF = {
-    to_SHIFT_JIS_E5_AF_offsets,
-    to_EUC_JP_E5_AF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B0_infos[33] = {
-     o2(0xC9,0xF5), o2(0xC0,0xEC), o2(0xBC,0xCD), o2(0xD5,0xF1),
-     o2(0xBE,0xAD), o2(0xD5,0xF2), o2(0xD5,0xF3), o2(0xB0,0xD3),
-     o2(0xC2,0xBA), o2(0xBF,0xD2), o2(0xD5,0xF4), o2(0xC6,0xB3),
-     o2(0xBE,0xAE), o2(0xBE,0xAF), o2(0xD5,0xF5), o2(0xC0,0xED),
-     o2(0xBE,0xB0), o2(0xF9,0xEF), o2(0xD5,0xF6), o2(0xD5,0xF7),
-     o2(0xCC,0xE0), o2(0xD5,0xF8), o2(0xB6,0xC6), o2(0xBD,0xA2),
-     o2(0xD5,0xF9), o2(0xD5,0xFA), o2(0xBC,0xDC), o2(0xBF,0xAC),
-     o2(0xC6,0xF4), o2(0xBF,0xD4), o2(0xC8,0xF8), o2(0xC7,0xA2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B0 = {
-    to_SHIFT_JIS_E5_B0_offsets,
-    to_EUC_JP_E5_B0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B1_infos[26] = {
-     o2(0xB6,0xC9), o2(0xD5,0xFB), o2(0xB5,0xEF), o2(0xD5,0xFC),
-     o2(0xB6,0xFE), o2(0xC6,0xCF), o2(0xB2,0xB0), o2(0xBB,0xD3),
-     o2(0xD5,0xFD), o2(0xD6,0xA2), o2(0xD6,0xA1), o2(0xB6,0xFD),
-     o2(0xD5,0xFE), o2(0xC5,0xB8), o2(0xC2,0xB0), o2(0xC5,0xCB),
-     o2(0xBC,0xC8), o2(0xC1,0xD8), o2(0xCD,0xFA), o2(0xD6,0xA4),
-     o2(0xD6,0xA5), o2(0xC6,0xD6), o2(0xBB,0xB3), o2(0xD6,0xA7),
-     o2(0xD6,0xA8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B1 = {
-    to_SHIFT_JIS_E5_B1_offsets,
-    to_EUC_JP_E5_B1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B2_infos[20] = {
-     o2(0xD6,0xA9), o2(0xB4,0xF4), o2(0xD6,0xAA), o2(0xD6,0xAB),
-     o2(0xB2,0xAC), o2(0xF9,0xF0), o2(0xC1,0xBB), o2(0xB4,0xE4),
-     o2(0xD6,0xAD), o2(0xCC,0xA8), o2(0xC2,0xD2), o2(0xB3,0xD9),
-     o2(0xD6,0xAF), o2(0xD6,0xB1), o2(0xB4,0xDF), o2(0xF9,0xF1),
-     o2(0xD6,0xAE), o2(0xD6,0xB0), o2(0xD6,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B2 = {
-    to_SHIFT_JIS_E5_B2_offsets,
-    to_EUC_JP_E5_B2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B3_infos[17] = {
-     o2(0xD6,0xB2), o2(0xD6,0xB4), o2(0xD6,0xB5), o2(0xC6,0xBD),
-     o2(0xB6,0xAE), o2(0xB2,0xE5), o2(0xD6,0xB6), o2(0xD6,0xBB),
-     o2(0xD6,0xB9), o2(0xCA,0xF7), o2(0xCA,0xF6), o2(0xF9,0xF2),
-     o2(0xC5,0xE7), o2(0xD6,0xB8), o2(0xBD,0xD4), o2(0xD6,0xB7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B3 = {
-    to_SHIFT_JIS_E5_B3_offsets,
-    to_EUC_JP_E5_B3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B4_infos[17] = {
-     o2(0xBF,0xF2), o2(0xD6,0xBC), o2(0xBA,0xEA), o2(0xD6,0xC2),
-     o2(0xD6,0xC3), o2(0xD6,0xBD), o2(0xB3,0xB3), o2(0xD6,0xBE),
-     o2(0xD6,0xC7), o2(0xD6,0xC6), o2(0xD6,0xC5), o2(0xD6,0xC1),
-     o2(0xD6,0xC0), o2(0xD6,0xC4), o2(0xF9,0xF3), o2(0xCA,0xF8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B4 = {
-    to_SHIFT_JIS_E5_B4_offsets,
-    to_EUC_JP_E5_B4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B5_infos[15] = {
-     o2(0xF9,0xF6), o2(0xD6,0xCB), o2(0xD6,0xC8), o2(0xD6,0xCA),
-     o2(0xCD,0xF2), o2(0xD6,0xC9), o2(0xF9,0xF4), o2(0xD6,0xBF),
-     o2(0xBF,0xF3), o2(0xD6,0xCC), o2(0xF9,0xF7), o2(0xBA,0xB7),
-     o2(0xD6,0xCD), o2(0xD6,0xCE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B5 = {
-    to_SHIFT_JIS_E5_B5_offsets,
-    to_EUC_JP_E5_B5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B6_infos[17] = {
-     o2(0xD6,0xD1), o2(0xD6,0xD0), o2(0xD6,0xCF), o2(0xC5,0xE8),
-     o2(0xD6,0xBA), o2(0xD6,0xD7), o2(0xD6,0xD3), o2(0xD6,0xD2),
-     o2(0xD6,0xD4), o2(0xD6,0xD5), o2(0xD6,0xD8), o2(0xF9,0xF8),
-     o2(0xF9,0xF9), o2(0xCE,0xE6), o2(0xD6,0xD9), o2(0xD6,0xD6),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B6 = {
-    to_SHIFT_JIS_E5_B6_offsets,
-    to_EUC_JP_E5_B6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B7_infos[28] = {
-     o2(0xD6,0xDA), o2(0xB4,0xE0), o2(0xD6,0xDB), o2(0xF9,0xFA),
-     o2(0xD6,0xDD), o2(0xD6,0xDC), o2(0xD6,0xDE), o2(0xD6,0xDF),
-     o2(0xC0,0xEE), o2(0xBD,0xA3), o2(0xBD,0xE4), o2(0xC1,0xE3),
-     o2(0xB9,0xA9), o2(0xBA,0xB8), o2(0xB9,0xAA), o2(0xB5,0xF0),
-     o2(0xD6,0xE0), o2(0xBA,0xB9), o2(0xB8,0xCA), o2(0xD6,0xE1),
-     o2(0xCC,0xA6), o2(0xC7,0xC3), o2(0xD6,0xE2), o2(0xB9,0xAB),
-     o2(0xB4,0xAC), o2(0xC3,0xA7), o2(0xB6,0xD2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B7 = {
-    to_SHIFT_JIS_E5_B7_offsets,
-    to_EUC_JP_E5_B7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B8_infos[22] = {
-     o2(0xBB,0xD4), o2(0xC9,0xDB), o2(0xC8,0xC1), o2(0xD6,0xE3),
-     o2(0xB4,0xF5), o2(0xD6,0xE6), o2(0xC4,0xA1), o2(0xD6,0xE5),
-     o2(0xD6,0xE4), o2(0xD6,0xE7), o2(0xC4,0xEB), o2(0xBF,0xE3),
-     o2(0xBB,0xD5), o2(0xC0,0xCA), o2(0xC2,0xD3), o2(0xB5,0xA2),
-     o2(0xC4,0xA2), o2(0xD6,0xE8), o2(0xD6,0xE9), o2(0xBE,0xEF),
-     o2(0xCB,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B8 = {
-    to_SHIFT_JIS_E5_B8_offsets,
-    to_EUC_JP_E5_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_B9_infos[29] = {
-     o2(0xD6,0xEC), o2(0xD6,0xEB), o2(0xD6,0xEA), o2(0xC9,0xFD),
-     o2(0xD6,0xF3), o2(0xCB,0xDA), o2(0xD6,0xED), o2(0xD6,0xEF),
-     o2(0xCB,0xEB), o2(0xD6,0xEE), o2(0xD6,0xF0), o2(0xC8,0xA8),
-     o2(0xD6,0xF1), o2(0xCA,0xBE), o2(0xD6,0xF2), o2(0xB4,0xB3),
-     o2(0xCA,0xBF), o2(0xC7,0xAF), o2(0xD6,0xF4), o2(0xD6,0xF5),
-     o2(0xB9,0xAC), o2(0xB4,0xB4), o2(0xD6,0xF6), o2(0xB8,0xB8),
-     o2(0xCD,0xC4), o2(0xCD,0xA9), o2(0xB4,0xF6), o2(0xD6,0xF8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_B9 = {
-    to_SHIFT_JIS_E5_B9_offsets,
-    to_EUC_JP_E5_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BA_infos[21] = {
-     o2(0xC4,0xA3), o2(0xB9,0xAD), o2(0xBE,0xB1), o2(0xC8,0xDF),
-     o2(0xBE,0xB2), o2(0xBD,0xF8), o2(0xC4,0xEC), o2(0xCA,0xF9),
-     o2(0xC5,0xB9), o2(0xB9,0xAE), o2(0xC9,0xDC), o2(0xD6,0xF9),
-     o2(0xC5,0xD9), o2(0xBA,0xC2), o2(0xB8,0xCB), o2(0xC4,0xED),
-     o2(0xB0,0xC3), o2(0xBD,0xEE), o2(0xB9,0xAF), o2(0xCD,0xC7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BA = {
-    to_SHIFT_JIS_E5_BA_offsets,
-    to_EUC_JP_E5_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BB_infos[34] = {
-     o2(0xD6,0xFA), o2(0xD6,0xFB), o2(0xC7,0xD1), o2(0xD6,0xFC),
-     o2(0xCE,0xF7), o2(0xCF,0xAD), o2(0xD6,0xFE), o2(0xD6,0xFD),
-     o2(0xB3,0xC7), o2(0xD7,0xA1), o2(0xD7,0xA4), o2(0xD7,0xA5),
-     o2(0xD7,0xA3), o2(0xC9,0xC0), o2(0xBE,0xB3), o2(0xD7,0xA7),
-     o2(0xD7,0xA6), o2(0xD7,0xA2), o2(0xD7,0xA8), o2(0xD7,0xA9),
-     o2(0xD7,0xAA), o2(0xD7,0xAD), o2(0xD7,0xAB), o2(0xD7,0xAC),
-     o2(0xD7,0xAE), o2(0xB1,0xE4), o2(0xC4,0xEE), o2(0xD7,0xAF),
-     o2(0xB7,0xFA), o2(0xB2,0xF6), o2(0xC7,0xB6), o2(0xD7,0xB0),
-     o2(0xC6,0xFB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BB = {
-    to_SHIFT_JIS_E5_BB_offsets,
-    to_EUC_JP_E5_BB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BC_infos[34] = {
-     o2(0xCA,0xDB), o2(0xD7,0xB1), o2(0xCF,0xAE), o2(0xD7,0xB2),
-     o2(0xCA,0xC0), o2(0xD7,0xB5), o2(0xD0,0xA1), o2(0xD0,0xB1),
-     o2(0xBC,0xB0), o2(0xC6,0xF5), o2(0xD7,0xB6), o2(0xB5,0xDD),
-     o2(0xC4,0xA4), o2(0xB0,0xFA), o2(0xD7,0xB7), o2(0xCA,0xA6),
-     o2(0xB9,0xB0), o2(0xC3,0xD0), o2(0xC4,0xEF), o2(0xF9,0xFB),
-     o2(0xCC,0xEF), o2(0xB8,0xB9), o2(0xB8,0xCC), o2(0xD7,0xB8),
-     o2(0xD7,0xB9), o2(0xD7,0xBF), o2(0xBC,0xE5), o2(0xF9,0xFC),
-     o2(0xC4,0xA5), o2(0xB6,0xAF), o2(0xD7,0xBA), o2(0xC9,0xAB),
-     o2(0xC3,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BC = {
-    to_SHIFT_JIS_E5_BC_offsets,
-    to_EUC_JP_E5_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BD_infos[30] = {
-     o2(0xD7,0xBB), o2(0xF9,0xAC), o2(0xD7,0xBC), o2(0xB6,0xB0),
-     o2(0xD7,0xBD), o2(0xD7,0xBE), o2(0xD7,0xC0), o2(0xC5,0xF6),
-     o2(0xD7,0xC1), o2(0xD7,0xC2), o2(0xD7,0xC3), o2(0xD7,0xB4),
-     o2(0xD7,0xB3), o2(0xD7,0xC4), o2(0xB7,0xC1), o2(0xC9,0xA7),
-     o2(0xF9,0xFD), o2(0xBA,0xCC), o2(0xC9,0xB7), o2(0xC4,0xA6),
-     o2(0xC9,0xCB), o2(0xD7,0xC5), o2(0xBE,0xB4), o2(0xB1,0xC6),
-     o2(0xD7,0xC6), o2(0xD7,0xC7), o2(0xCC,0xF2), o2(0xC8,0xE0),
-     o2(0xD7,0xCA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BD = {
-    to_SHIFT_JIS_E5_BD_offsets,
-    to_EUC_JP_E5_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BE_infos[33] = {
-     o2(0xB1,0xFD), o2(0xC0,0xAC), o2(0xD7,0xC9), o2(0xD7,0xC8),
-     o2(0xB7,0xC2), o2(0xC2,0xD4), o2(0xD7,0xCE), o2(0xD7,0xCC),
-     o2(0xD7,0xCB), o2(0xCE,0xA7), o2(0xB8,0xE5), o2(0xBD,0xF9),
-     o2(0xD7,0xCD), o2(0xC5,0xCC), o2(0xBD,0xBE), o2(0xC6,0xC0),
-     o2(0xD7,0xD1), o2(0xD7,0xD0), o2(0xD7,0xCF), o2(0xD7,0xD2),
-     o2(0xB8,0xE6), o2(0xD7,0xD3), o2(0xC9,0xFC), o2(0xBD,0xDB),
-     o2(0xD7,0xD4), o2(0xC8,0xF9), o2(0xC6,0xC1), o2(0xC4,0xA7),
-     o2(0xF9,0xFE), o2(0xC5,0xB0), o2(0xD7,0xD5), o2(0xB5,0xAB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BE = {
-    to_SHIFT_JIS_E5_BE_offsets,
-    to_EUC_JP_E5_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_BF_infos[22] = {
-     o2(0xBF,0xB4), o2(0xC9,0xAC), o2(0xB4,0xF7), o2(0xC7,0xA6),
-     o2(0xD7,0xD6), o2(0xBB,0xD6), o2(0xCB,0xBA), o2(0xCB,0xBB),
-     o2(0xB1,0xFE), o2(0xD7,0xDB), o2(0xFA,0xA1), o2(0xC3,0xE9),
-     o2(0xD7,0xD8), o2(0xB2,0xF7), o2(0xD8,0xAD), o2(0xD7,0xDA),
-     o2(0xC7,0xB0), o2(0xD7,0xD9), o2(0xD7,0xD7), o2(0xB9,0xFA),
-     o2(0xD7,0xDD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5_BF = {
-    to_SHIFT_JIS_E5_BF_offsets,
-    to_EUC_JP_E5_BF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E5_infos[64] = {
-     &to_EUC_JP_E5_80, &to_EUC_JP_E5_81, &to_EUC_JP_E5_82, &to_EUC_JP_E5_83,
-     &to_EUC_JP_E5_84, &to_EUC_JP_E5_85, &to_EUC_JP_E5_86, &to_EUC_JP_E5_87,
-     &to_EUC_JP_E5_88, &to_EUC_JP_E5_89, &to_EUC_JP_E5_8A, &to_EUC_JP_E5_8B,
-     &to_EUC_JP_E5_8C, &to_EUC_JP_E5_8D, &to_EUC_JP_E5_8E, &to_EUC_JP_E5_8F,
-     &to_EUC_JP_E5_90, &to_EUC_JP_E5_91, &to_EUC_JP_E5_92, &to_EUC_JP_E5_93,
-     &to_EUC_JP_E5_94, &to_EUC_JP_E5_95, &to_EUC_JP_E5_96, &to_EUC_JP_E5_97,
-     &to_EUC_JP_E5_98, &to_EUC_JP_E5_99, &to_EUC_JP_E5_9A, &to_EUC_JP_E5_9B,
-     &to_EUC_JP_E5_9C, &to_EUC_JP_E5_9D, &to_EUC_JP_E5_9E, &to_EUC_JP_E5_9F,
-     &to_EUC_JP_E5_A0, &to_EUC_JP_E5_A1, &to_EUC_JP_E5_A2, &to_EUC_JP_E5_A3,
-     &to_EUC_JP_E5_A4, &to_EUC_JP_E5_A5, &to_EUC_JP_E5_A6, &to_EUC_JP_E5_A7,
-     &to_EUC_JP_E5_A8, &to_EUC_JP_E5_A9, &to_EUC_JP_E5_AA, &to_EUC_JP_E5_AB,
-     &to_EUC_JP_E5_AC, &to_EUC_JP_E5_AD, &to_EUC_JP_E5_AE, &to_EUC_JP_E5_AF,
-     &to_EUC_JP_E5_B0, &to_EUC_JP_E5_B1, &to_EUC_JP_E5_B2, &to_EUC_JP_E5_B3,
-     &to_EUC_JP_E5_B4, &to_EUC_JP_E5_B5, &to_EUC_JP_E5_B6, &to_EUC_JP_E5_B7,
-     &to_EUC_JP_E5_B8, &to_EUC_JP_E5_B9, &to_EUC_JP_E5_BA, &to_EUC_JP_E5_BB,
-     &to_EUC_JP_E5_BC, &to_EUC_JP_E5_BD, &to_EUC_JP_E5_BE, &to_EUC_JP_E5_BF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E5 = {
-    to_SHIFT_JIS_E5_offsets,
-    to_EUC_JP_E5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_80_infos[23] = {
-     o2(0xD7,0xE3), o2(0xD7,0xE9), o2(0xD7,0xE1), o2(0xC5,0xDC),
-     o2(0xD7,0xE6), o2(0xC9,0xDD), o2(0xD7,0xE0), o2(0xD7,0xE5),
-     o2(0xCE,0xE7), o2(0xBB,0xD7), o2(0xC2,0xD5), o2(0xD7,0xDE),
-     o2(0xB5,0xDE), o2(0xD7,0xE8), o2(0xC0,0xAD), o2(0xB1,0xE5),
-     o2(0xD7,0xE2), o2(0xB2,0xF8), o2(0xD7,0xE7), o2(0xB6,0xB1),
-     o2(0xD7,0xE4), o2(0xD7,0xEA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_80 = {
-    to_SHIFT_JIS_E6_80_offsets,
-    to_EUC_JP_E6_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_81_infos[30] = {
-     o2(0xD7,0xEC), o2(0xD7,0xF6), o2(0xD7,0xF4), o2(0xD7,0xF1),
-     o2(0xD7,0xF0), o2(0xCE,0xF8), o2(0xD7,0xF2), o2(0xB6,0xB2),
-     o2(0xB9,0xB1), o2(0xBD,0xFA), o2(0xD7,0xF9), o2(0xD7,0xEB),
-     o2(0xFA,0xA2), o2(0xD7,0xEF), o2(0xD7,0xDF), o2(0xB2,0xFA),
-     o2(0xD7,0xF3), o2(0xD7,0xF5), o2(0xC3,0xD1), o2(0xBA,0xA8),
-     o2(0xB2,0xB8), o2(0xD7,0xED), o2(0xD7,0xF8), o2(0xD7,0xF7),
-     o2(0xB6,0xB3), o2(0xC2,0xA9), o2(0xB3,0xE6), o2(0xB7,0xC3),
-     o2(0xD7,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_81 = {
-    to_SHIFT_JIS_E6_81_offsets,
-    to_EUC_JP_E6_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_82_infos[31] = {
-     o2(0xD7,0xFA), o2(0xD7,0xFD), o2(0xD8,0xA1), o2(0xFA,0xA3),
-     o2(0xBC,0xBD), o2(0xFA,0xA4), o2(0xD8,0xA7), o2(0xC4,0xF0),
-     o2(0xD7,0xFB), o2(0xD8,0xA5), o2(0xB2,0xF9), o2(0xD8,0xA3),
-     o2(0xD8,0xA4), o2(0xD7,0xFE), o2(0xD8,0xA2), o2(0xB8,0xE7),
-     o2(0xCD,0xAA), o2(0xB4,0xB5), o2(0xB1,0xD9), o2(0xD8,0xA6),
-     o2(0xC7,0xBA), o2(0xB0,0xAD), o2(0xC8,0xE1), o2(0xD7,0xDC),
-     o2(0xD8,0xAC), o2(0xD8,0xB0), o2(0xCC,0xE5), o2(0xD8,0xA9),
-     o2(0xC5,0xE9), o2(0xD8,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_82 = {
-    to_SHIFT_JIS_E6_82_offsets,
-    to_EUC_JP_E6_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_83_infos[27] = {
-     o2(0xBE,0xF0), o2(0xD8,0xAF), o2(0xC6,0xD7), o2(0xCF,0xC7),
-     o2(0xD8,0xAB), o2(0xFA,0xA6), o2(0xD8,0xB1), o2(0xB9,0xFB),
-     o2(0xC0,0xCB), o2(0xFA,0xA5), o2(0xB0,0xD4), o2(0xD8,0xAA),
-     o2(0xD8,0xA8), o2(0xC1,0xDA), o2(0xD7,0xFC), o2(0xBB,0xB4),
-     o2(0xC2,0xC6), o2(0xD8,0xBD), o2(0xFA,0xA8), o2(0xC1,0xDB),
-     o2(0xD8,0xB8), o2(0xD8,0xB5), o2(0xD8,0xB6), o2(0xBC,0xE6),
-     o2(0xD8,0xB9), o2(0xD8,0xBC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_83 = {
-    to_SHIFT_JIS_E6_83_offsets,
-    to_EUC_JP_E6_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_84_infos[27] = {
-     o2(0xD8,0xB7), o2(0xBD,0xA5), o2(0xD8,0xBA), o2(0xD8,0xB4),
-     o2(0xCC,0xFC), o2(0xCC,0xFB), o2(0xD8,0xBE), o2(0xD8,0xBF),
-     o2(0xB0,0xD5), o2(0xFA,0xA9), o2(0xD8,0xB3), o2(0xB6,0xF2),
-     o2(0xB0,0xA6), o2(0xB4,0xB6), o2(0xFA,0xA7), o2(0xD8,0xBB),
-     o2(0xD8,0xC3), o2(0xD8,0xC2), o2(0xD8,0xC7), o2(0xFA,0xAB),
-     o2(0xD8,0xC8), o2(0xFA,0xAA), o2(0xD8,0xC6), o2(0xD8,0xC9),
-     o2(0xD8,0xC1), o2(0xD8,0xC5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_84 = {
-    to_SHIFT_JIS_E6_84_offsets,
-    to_EUC_JP_E6_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_85_infos[33] = {
-     o2(0xD8,0xCA), o2(0xD8,0xCB), o2(0xD8,0xC0), o2(0xBB,0xFC),
-     o2(0xD8,0xC4), o2(0xC2,0xD6), o2(0xB9,0xB2), o2(0xD8,0xB2),
-     o2(0xBF,0xB5), o2(0xD8,0xD8), o2(0xCA,0xE9), o2(0xD8,0xCE),
-     o2(0xD8,0xCF), o2(0xD8,0xD0), o2(0xD8,0xD7), o2(0xD8,0xD6),
-     o2(0xCB,0xFD), o2(0xB4,0xB7), o2(0xD8,0xD4), o2(0xB7,0xC5),
-     o2(0xB3,0xB4), o2(0xD8,0xD1), o2(0xCE,0xB8), o2(0xD8,0xD3),
-     o2(0xB0,0xD6), o2(0xD8,0xD5), o2(0xD8,0xCC), o2(0xD8,0xD2),
-     o2(0xD8,0xD9), o2(0xB7,0xC4), o2(0xD8,0xCD), o2(0xCD,0xDD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_85 = {
-    to_SHIFT_JIS_E6_85_offsets,
-    to_EUC_JP_E6_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_86_infos[22] = {
-     o2(0xCD,0xAB), o2(0xD8,0xDC), o2(0xD8,0xE0), o2(0xC1,0xFE),
-     o2(0xCE,0xF9), o2(0xD8,0xE1), o2(0xD8,0xDE), o2(0xD8,0xDB),
-     o2(0xFA,0xAC), o2(0xD8,0xDA), o2(0xD8,0xDF), o2(0xCA,0xB0),
-     o2(0xC6,0xB4), o2(0xB7,0xC6), o2(0xD8,0xE2), o2(0xD8,0xDD),
-     o2(0xD8,0xE3), o2(0xB7,0xFB), o2(0xB2,0xB1), o2(0xD8,0xEB),
-     o2(0xB4,0xB8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_86 = {
-    to_SHIFT_JIS_E6_86_offsets,
-    to_EUC_JP_E6_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_87_infos[23] = {
-     o2(0xD8,0xE9), o2(0xD8,0xEA), o2(0xBA,0xA9), o2(0xD8,0xE8),
-     o2(0xD8,0xE6), o2(0xD8,0xE5), o2(0xD8,0xEC), o2(0xD8,0xE4),
-     o2(0xD8,0xEE), o2(0xB2,0xFB), o2(0xD8,0xF0), o2(0xD8,0xEF),
-     o2(0xC4,0xA8), o2(0xD8,0xF3), o2(0xD8,0xF1), o2(0xD8,0xE7),
-     o2(0xB7,0xFC), o2(0xD8,0xF2), o2(0xD8,0xF6), o2(0xD8,0xF5),
-     o2(0xD8,0xF7), o2(0xD8,0xF4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_87 = {
-    to_SHIFT_JIS_E6_87_offsets,
-    to_EUC_JP_E6_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_88_infos[31] = {
-     o2(0xD8,0xF8), o2(0xD8,0xF9), o2(0xD8,0xFA), o2(0xCA,0xEA),
-     o2(0xD8,0xFC), o2(0xD8,0xFB), o2(0xBD,0xBF), o2(0xC0,0xAE),
-     o2(0xB2,0xE6), o2(0xB2,0xFC), o2(0xFA,0xAD), o2(0xD8,0xFD),
-     o2(0xB0,0xBF), o2(0xC0,0xCC), o2(0xD8,0xFE), o2(0xEC,0xC3),
-     o2(0xD9,0xA1), o2(0xB7,0xE1), o2(0xD9,0xA2), o2(0xC0,0xEF),
-     o2(0xD9,0xA3), o2(0xD9,0xA4), o2(0xB5,0xBA), o2(0xD9,0xA5),
-     o2(0xD9,0xA6), o2(0xD9,0xA7), o2(0xC2,0xD7), o2(0xB8,0xCD),
-     o2(0xCC,0xE1), o2(0xCB,0xBC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_88 = {
-    to_SHIFT_JIS_E6_88_offsets,
-    to_EUC_JP_E6_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_89_infos[24] = {
-     o2(0xBD,0xEA), o2(0xD9,0xA8), o2(0xC0,0xF0), o2(0xEE,0xBD),
-     o2(0xC8,0xE2), o2(0xBC,0xEA), o2(0xBA,0xCD), o2(0xD9,0xA9),
-     o2(0xC2,0xC7), o2(0xCA,0xA7), o2(0xC2,0xF1), o2(0xD9,0xAC),
-     o2(0xD9,0xAA), o2(0xD9,0xAD), o2(0xD9,0xAB), o2(0xD9,0xAE),
-     o2(0xCA,0xB1), o2(0xB0,0xB7), o2(0xC9,0xDE), o2(0xC8,0xE3),
-     o2(0xD9,0xAF), o2(0xD9,0xB2), o2(0xBE,0xB5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_89 = {
-    to_SHIFT_JIS_E6_89_offsets,
-    to_EUC_JP_E6_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8A_infos[27] = {
-     o2(0xB5,0xBB), o2(0xD9,0xB0), o2(0xD9,0xB7), o2(0xBE,0xB6),
-     o2(0xD9,0xB1), o2(0xC7,0xC4), o2(0xCD,0xDE), o2(0xD9,0xB3),
-     o2(0xD9,0xB4), o2(0xD9,0xB8), o2(0xC5,0xEA), o2(0xD9,0xB5),
-     o2(0xB9,0xB3), o2(0xC0,0xDE), o2(0xD9,0xC6), o2(0xC8,0xB4),
-     o2(0xC2,0xF2), o2(0xFA,0xAE), o2(0xC8,0xE4), o2(0xDA,0xAD),
-     o2(0xCA,0xFA), o2(0xC4,0xF1), o2(0xCB,0xF5), o2(0xD9,0xBB),
-     o2(0xB2,0xA1), o2(0xC3,0xEA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8A = {
-    to_SHIFT_JIS_E6_8A_offsets,
-    to_EUC_JP_E6_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8B_infos[35] = {
-     o2(0xD9,0xC4), o2(0xC3,0xB4), o2(0xD9,0xBE), o2(0xD9,0xC5),
-     o2(0xD9,0xC0), o2(0xD9,0xC7), o2(0xD9,0xC3), o2(0xD9,0xC2),
-     o2(0xC7,0xEF), o2(0xD9,0xBC), o2(0xB2,0xFD), o2(0xD9,0xBA),
-     o2(0xB5,0xF1), o2(0xC2,0xF3), o2(0xD9,0xB6), o2(0xD9,0xB9),
-     o2(0xB9,0xB4), o2(0xC0,0xDB), o2(0xBE,0xB7), o2(0xD9,0xC1),
-     o2(0xC7,0xD2), o2(0xB5,0xF2), o2(0xB3,0xC8), o2(0xB3,0xE7),
-     o2(0xBF,0xA1), o2(0xD9,0xC9), o2(0xD9,0xCE), o2(0xD9,0xCA),
-     o2(0xB7,0xFD), o2(0xD9,0xCF), o2(0xBB,0xA2), o2(0xB9,0xE9),
-     o2(0xBD,0xA6), o2(0xD9,0xBD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8B = {
-    to_SHIFT_JIS_E6_8B_offsets,
-    to_EUC_JP_E6_8B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8C_infos[18] = {
-     o2(0xBB,0xFD), o2(0xD9,0xCC), o2(0xBB,0xD8), o2(0xD9,0xCD),
-     o2(0xB0,0xC4), o2(0xD9,0xC8), o2(0xC4,0xA9), o2(0xB5,0xF3),
-     o2(0xB6,0xB4), o2(0xD9,0xCB), o2(0xB0,0xA7), o2(0xBA,0xC3),
-     o2(0xBF,0xB6), o2(0xC4,0xF2), o2(0xC8,0xD4), o2(0xD9,0xD1),
-     o2(0xC1,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8C = {
-    to_SHIFT_JIS_E6_8C_offsets,
-    to_EUC_JP_E6_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8D_infos[19] = {
-     o2(0xC2,0xAA), o2(0xBB,0xAB), o2(0xD9,0xD2), o2(0xD9,0xD4),
-     o2(0xD9,0xD0), o2(0xCA,0xE1), o2(0xC4,0xBD), o2(0xC1,0xDC),
-     o2(0xCA,0xFB), o2(0xBC,0xCE), o2(0xD9,0xE0), o2(0xD9,0xDF),
-     o2(0xBF,0xF8), o2(0xB7,0xFE), o2(0xD9,0xD9), o2(0xBE,0xB9),
-     o2(0xC6,0xE8), o2(0xC7,0xB1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8D = {
-    to_SHIFT_JIS_E6_8D_offsets,
-    to_EUC_JP_E6_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8E_infos[29] = {
-     o2(0xD9,0xD7), o2(0xC1,0xDD), o2(0xBC,0xF8), o2(0xD9,0xDC),
-     o2(0xBE,0xB8), o2(0xD9,0xD6), o2(0xD9,0xDB), o2(0xC7,0xD3),
-     o2(0xD9,0xD5), o2(0xB7,0xA1), o2(0xB3,0xDD), o2(0xD9,0xDD),
-     o2(0xCE,0xAB), o2(0xBA,0xCE), o2(0xC3,0xB5), o2(0xD9,0xDA),
-     o2(0xC0,0xDC), o2(0xB9,0xB5), o2(0xBF,0xE4), o2(0xB1,0xE6),
-     o2(0xC1,0xBC), o2(0xD9,0xD8), o2(0xB5,0xC5), o2(0xB7,0xC7),
-     o2(0xC4,0xCF), o2(0xD9,0xDE), o2(0xC1,0xDF), o2(0xD9,0xE1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8E = {
-    to_SHIFT_JIS_E6_8E_offsets,
-    to_EUC_JP_E6_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_8F_infos[20] = {
-     o2(0xD9,0xE3), o2(0xC2,0xB7), o2(0xD9,0xE9), o2(0xD9,0xE4),
-     o2(0xD9,0xE6), o2(0xC9,0xC1), o2(0xC4,0xF3), o2(0xD9,0xE7),
-     o2(0xCD,0xAC), o2(0xCD,0xC8), o2(0xB4,0xB9), o2(0xB0,0xAE),
-     o2(0xD9,0xE5), o2(0xD9,0xE2), o2(0xB4,0xF8), o2(0xB1,0xE7),
-     o2(0xFA,0xAF), o2(0xD9,0xE8), o2(0xCD,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_8F = {
-    to_SHIFT_JIS_E6_8F_offsets,
-    to_EUC_JP_E6_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_90_infos[16] = {
-     o2(0xD9,0xEC), o2(0xC2,0xBB), o2(0xD9,0xF3), o2(0xD9,0xED),
-     o2(0xD9,0xEA), o2(0xD9,0xF1), o2(0xD9,0xD3), o2(0xD9,0xEE),
-     o2(0xD9,0xF2), o2(0xC8,0xC2), o2(0xC5,0xEB), o2(0xD9,0xEB),
-     o2(0xD9,0xEF), o2(0xB7,0xC8), o2(0xBA,0xF1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_90 = {
-    to_SHIFT_JIS_E6_90_offsets,
-    to_EUC_JP_E6_90_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_91_infos[11] = {
-     o2(0xC0,0xDD), o2(0xD9,0xF7), o2(0xC5,0xA6), o2(0xFA,0xB0),
-     o2(0xD9,0xF4), o2(0xCB,0xE0), o2(0xD9,0xF5), o2(0xD9,0xF6),
-     o2(0xCC,0xCE), o2(0xC0,0xA2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_91 = {
-    to_SHIFT_JIS_E6_91_offsets,
-    to_EUC_JP_E6_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_92_infos[20] = {
-     o2(0xB7,0xE2), o2(0xD9,0xFD), o2(0xBB,0xB5), o2(0xD9,0xFA),
-     o2(0xD9,0xF9), o2(0xC7,0xB2), o2(0xFA,0xB1), o2(0xC6,0xB5),
-     o2(0xC5,0xB1), o2(0xD9,0xFB), o2(0xD9,0xFC), o2(0xC9,0xEF),
-     o2(0xC7,0xC5), o2(0xBB,0xA3), o2(0xC0,0xF1), o2(0xCB,0xD0),
-     o2(0xB3,0xC9), o2(0xDA,0xA5), o2(0xD9,0xFE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_92 = {
-    to_SHIFT_JIS_E6_92_offsets,
-    to_EUC_JP_E6_92_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_93_infos[26] = {
-     o2(0xCD,0xCA), o2(0xDA,0xA7), o2(0xDA,0xA3), o2(0xDA,0xA4),
-     o2(0xC1,0xE0), o2(0xFA,0xB2), o2(0xDA,0xA2), o2(0xD9,0xBF),
-     o2(0xDA,0xA6), o2(0xDA,0xA1), o2(0xDA,0xAB), o2(0xDA,0xAC),
-     o2(0xC5,0xA7), o2(0xDA,0xAE), o2(0xBB,0xA4), o2(0xDA,0xA9),
-     o2(0xB5,0xBC), o2(0xDA,0xAF), o2(0xDA,0xA8), o2(0xDA,0xB3),
-     o2(0xDA,0xB2), o2(0xDA,0xB1), o2(0xDA,0xB4), o2(0xDA,0xB6),
-     o2(0xBE,0xF1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_93 = {
-    to_SHIFT_JIS_E6_93_offsets,
-    to_EUC_JP_E6_93_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_94_infos[21] = {
-     o2(0xDA,0xB5), o2(0xDA,0xB9), o2(0xDA,0xB7), o2(0xDA,0xB8),
-     o2(0xD9,0xF0), o2(0xDA,0xBB), o2(0xDA,0xBA), o2(0xD9,0xF8),
-     o2(0xDA,0xBC), o2(0xDA,0xB0), o2(0xBB,0xD9), o2(0xDA,0xBD),
-     o2(0xDA,0xBE), o2(0xDA,0xC0), o2(0xDA,0xBF), o2(0xDA,0xC1),
-     o2(0xB2,0xFE), o2(0xB9,0xB6), o2(0xCA,0xFC), o2(0xC0,0xAF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_94 = {
-    to_SHIFT_JIS_E6_94_offsets,
-    to_EUC_JP_E6_94_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_95_infos[24] = {
-     o2(0xB8,0xCE), o2(0xDA,0xC3), o2(0xDA,0xC6), o2(0xFA,0xB3),
-     o2(0xC9,0xD2), o2(0xB5,0xDF), o2(0xDA,0xC5), o2(0xDA,0xC4),
-     o2(0xC7,0xD4), o2(0xDA,0xC7), o2(0xB6,0xB5), o2(0xDA,0xC9),
-     o2(0xDA,0xC8), o2(0xB4,0xBA), o2(0xBB,0xB6), o2(0xC6,0xD8),
-     o2(0xB7,0xC9), o2(0xBF,0xF4), o2(0xDA,0xCA), o2(0xC0,0xB0),
-     o2(0xC5,0xA8), o2(0xC9,0xDF), o2(0xDA,0xCB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_95 = {
-    to_SHIFT_JIS_E6_95_offsets,
-    to_EUC_JP_E6_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_96_infos[28] = {
-     o2(0xDA,0xCC), o2(0xDA,0xCD), o2(0xCA,0xB8), o2(0xD5,0xDD),
-     o2(0xC0,0xC6), o2(0xC9,0xCC), o2(0xBA,0xD8), o2(0xC8,0xE5),
-     o2(0xC8,0xC3), o2(0xC5,0xCD), o2(0xCE,0xC1), o2(0xDA,0xCF),
-     o2(0xBC,0xD0), o2(0xDA,0xD0), o2(0xB0,0xB6), o2(0xB6,0xD4),
-     o2(0xC0,0xCD), o2(0xC9,0xE0), o2(0xDA,0xD1), o2(0xBB,0xC2),
-     o2(0xC3,0xC7), o2(0xBB,0xDB), o2(0xBF,0xB7), o2(0xDA,0xD2),
-     o2(0xCA,0xFD), o2(0xB1,0xF7), o2(0xBB,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_96 = {
-    to_SHIFT_JIS_E6_96_offsets,
-    to_EUC_JP_E6_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_97_infos[26] = {
-     o2(0xDA,0xD5), o2(0xDA,0xD3), o2(0xDA,0xD6), o2(0xCE,0xB9),
-     o2(0xDA,0xD4), o2(0xC0,0xFB), o2(0xDA,0xD7), o2(0xC2,0xB2),
-     o2(0xDA,0xD8), o2(0xB4,0xFA), o2(0xDA,0xDA), o2(0xDA,0xD9),
-     o2(0xDA,0xDB), o2(0xDA,0xDC), o2(0xB4,0xFB), o2(0xC6,0xFC),
-     o2(0xC3,0xB6), o2(0xB5,0xEC), o2(0xBB,0xDD), o2(0xC1,0xE1),
-     o2(0xBD,0xDC), o2(0xB0,0xB0), o2(0xDA,0xDD), o2(0xB2,0xA2),
-     o2(0xDA,0xE1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_97 = {
-    to_SHIFT_JIS_E6_97_offsets,
-    to_EUC_JP_E6_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_98_infos[32] = {
-     o2(0xFA,0xB4), o2(0xB9,0xB7), o2(0xDA,0xE0), o2(0xBA,0xAB),
-     o2(0xBE,0xBA), o2(0xFA,0xB7), o2(0xDA,0xDF), o2(0xBE,0xBB),
-     o2(0xCC,0xC0), o2(0xBA,0xAA), o2(0xB0,0xD7), o2(0xC0,0xCE),
-     o2(0xFA,0xB5), o2(0xDA,0xE6), o2(0xFA,0xB9), o2(0xC0,0xB1),
-     o2(0xB1,0xC7), o2(0xFA,0xBA), o2(0xBD,0xD5), o2(0xCB,0xE6),
-     o2(0xBA,0xF2), o2(0xBE,0xBC), o2(0xFA,0xB8), o2(0xC0,0xA7),
-     o2(0xF9,0xA8), o2(0xDA,0xE5), o2(0xDA,0xE3), o2(0xDA,0xE4),
-     o2(0xFA,0xB6), o2(0xC3,0xEB), o2(0xDB,0xA6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_98 = {
-    to_SHIFT_JIS_E6_98_offsets,
-    to_EUC_JP_E6_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_99_infos[28] = {
-     o2(0xDA,0xEA), o2(0xBB,0xFE), o2(0xB9,0xB8), o2(0xDA,0xE8),
-     o2(0xDA,0xE9), o2(0xBF,0xB8), o2(0xDA,0xE7), o2(0xBB,0xAF),
-     o2(0xFA,0xBC), o2(0xFA,0xBD), o2(0xDA,0xEC), o2(0xDA,0xEB),
-     o2(0xDA,0xF0), o2(0xDA,0xF1), o2(0xDA,0xED), o2(0xFA,0xBB),
-     o2(0xB3,0xA2), o2(0xDA,0xEE), o2(0xDA,0xEF), o2(0xC8,0xD5),
-     o2(0xC9,0xE1), o2(0xB7,0xCA), o2(0xDA,0xF2), o2(0xFA,0xBF),
-     o2(0xC0,0xB2), o2(0xBE,0xBD), o2(0xC3,0xD2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_99 = {
-    to_SHIFT_JIS_E6_99_offsets,
-    to_EUC_JP_E6_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9A_infos[26] = {
-     o2(0xB6,0xC7), o2(0xDA,0xF3), o2(0xDA,0xF7), o2(0xB2,0xCB),
-     o2(0xDA,0xF4), o2(0xDA,0xF6), o2(0xDA,0xF5), o2(0xBD,0xEB),
-     o2(0xC3,0xC8), o2(0xB0,0xC5), o2(0xDA,0xF8), o2(0xFA,0xC0),
-     o2(0xDA,0xF9), o2(0xFA,0xC1), o2(0xC4,0xAA), o2(0xCE,0xF1),
-     o2(0xBB,0xC3), o2(0xCA,0xEB), o2(0xFA,0xC2), o2(0xCB,0xBD),
-     o2(0xDB,0xA2), o2(0xDA,0xFB), o2(0xDA,0xFE), o2(0xDA,0xFD),
-     o2(0xFA,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9A = {
-    to_SHIFT_JIS_E6_9A_offsets,
-    to_EUC_JP_E6_9A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9B_infos[27] = {
-     o2(0xDA,0xFA), o2(0xDB,0xA1), o2(0xC6,0xDE), o2(0xDA,0xFC),
-     o2(0xDB,0xA3), o2(0xBD,0xEC), o2(0xDB,0xA4), o2(0xCD,0xCB),
-     o2(0xC7,0xF8), o2(0xDB,0xA5), o2(0xDB,0xA7), o2(0xDB,0xA8),
-     o2(0xDB,0xA9), o2(0xB6,0xCA), o2(0xB1,0xC8), o2(0xB9,0xB9),
-     o2(0xDB,0xAA), o2(0xDB,0xAB), o2(0xBD,0xF1), o2(0xC1,0xE2),
-     o2(0xFA,0xC4), o2(0xF9,0xAB), o2(0xD2,0xD8), o2(0xC1,0xBE),
-     o2(0xC1,0xBD), o2(0xC2,0xD8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9B = {
-    to_SHIFT_JIS_E6_9B_offsets,
-    to_EUC_JP_E6_9B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9C_infos[33] = {
-     o2(0xBA,0xC7), o2(0xD0,0xF2), o2(0xB7,0xEE), o2(0xCD,0xAD),
-     o2(0xCA,0xFE), o2(0xC9,0xFE), o2(0xFA,0xC5), o2(0xDB,0xAC),
-     o2(0xBA,0xF3), o2(0xC4,0xBF), o2(0xDB,0xAD), o2(0xCF,0xAF),
-     o2(0xCB,0xBE), o2(0xC4,0xAB), o2(0xDB,0xAE), o2(0xB4,0xFC),
-     o2(0xDB,0xAF), o2(0xDB,0xB0), o2(0xCC,0xDA), o2(0xCC,0xA4),
-     o2(0xCB,0xF6), o2(0xCB,0xDC), o2(0xBB,0xA5), o2(0xDB,0xB2),
-     o2(0xBC,0xEB), o2(0xCB,0xD1), o2(0xDB,0xB4), o2(0xDB,0xB7),
-     o2(0xDB,0xB6), o2(0xB4,0xF9), o2(0xB5,0xE0), o2(0xDB,0xB3),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9C = {
-    to_SHIFT_JIS_E6_9C_offsets,
-    to_EUC_JP_E6_9C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9D_infos[33] = {
-     o2(0xDB,0xB5), o2(0xDB,0xB8), o2(0xBF,0xF9), o2(0xCD,0xFB),
-     o2(0xB0,0xC9), o2(0xBA,0xE0), o2(0xC2,0xBC), o2(0xBC,0xDD),
-     o2(0xBE,0xF3), o2(0xDB,0xBB), o2(0xC5,0xCE), o2(0xDB,0xB9),
-     o2(0xC2,0xAB), o2(0xDB,0xBA), o2(0xBE,0xF2), o2(0xCC,0xDD),
-     o2(0xDB,0xBC), o2(0xDB,0xBD), o2(0xCD,0xE8), o2(0xFA,0xC7),
-     o2(0xDB,0xC2), o2(0xB9,0xBA), o2(0xC7,0xD5), o2(0xDB,0xBF),
-     o2(0xC5,0xEC), o2(0xDA,0xDE), o2(0xDA,0xE2), o2(0xB5,0xCF),
-     o2(0xC7,0xC7), o2(0xDB,0xC1), o2(0xBE,0xBE), o2(0xC8,0xC4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9D = {
-    to_SHIFT_JIS_E6_9D_offsets,
-    to_EUC_JP_E6_9D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9E_infos[25] = {
-     o2(0xDB,0xC7), o2(0xC8,0xFA), o2(0xDB,0xBE), o2(0xDB,0xC4),
-     o2(0xDB,0xC3), o2(0xC0,0xCF), o2(0xCB,0xED), o2(0xCE,0xD3),
-     o2(0xCB,0xE7), o2(0xB2,0xCC), o2(0xBB,0xDE), o2(0xCF,0xC8),
-     o2(0xDB,0xC6), o2(0xBF,0xF5), o2(0xDB,0xC5), o2(0xDB,0xC0),
-     o2(0xB8,0xCF), o2(0xDB,0xCC), o2(0xDB,0xCA), o2(0xB2,0xCD),
-     o2(0xDB,0xC8), o2(0xDB,0xCE), o2(0xDB,0xD4), o2(0xFA,0xC8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9E = {
-    to_SHIFT_JIS_E6_9E_offsets,
-    to_EUC_JP_E6_9E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_9F_infos[30] = {
-     o2(0xFA,0xCA), o2(0xC2,0xC8), o2(0xCA,0xC1), o2(0xDB,0xD6),
-     o2(0xC9,0xA2), o2(0xDB,0xD5), o2(0xC7,0xF0), o2(0xCB,0xBF),
-     o2(0xB4,0xBB), o2(0xC0,0xF7), o2(0xBD,0xC0), o2(0xC4,0xD3),
-     o2(0xCD,0xAE), o2(0xDB,0xD1), o2(0xDB,0xD0), o2(0xDB,0xD2),
-     o2(0xDB,0xCF), o2(0xDB,0xD7), o2(0xDB,0xCD), o2(0xDB,0xCB),
-     o2(0xDB,0xD3), o2(0xDB,0xC9), o2(0xC3,0xEC), o2(0xCC,0xF8),
-     o2(0xBC,0xC6), o2(0xBA,0xF4), o2(0xBA,0xBA), o2(0xCB,0xEF),
-     o2(0xB3,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_9F = {
-    to_SHIFT_JIS_E6_9F_offsets,
-    to_EUC_JP_E6_9F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A0_infos[20] = {
-     o2(0xFA,0xCB), o2(0xC4,0xCE), o2(0xC6,0xCA), o2(0xB1,0xC9),
-     o2(0xC0,0xF2), o2(0xC0,0xB4), o2(0xB7,0xAA), o2(0xDB,0xD9),
-     o2(0xB9,0xBB), o2(0xB3,0xFC), o2(0xDB,0xDB), o2(0xB3,0xF4),
-     o2(0xDB,0xE1), o2(0xDB,0xDE), o2(0xC0,0xF3), o2(0xB3,0xCB),
-     o2(0xBA,0xAC), o2(0xB3,0xCA), o2(0xBA,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A0 = {
-    to_SHIFT_JIS_E6_A0_offsets,
-    to_EUC_JP_E6_A0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A1_infos[26] = {
-     o2(0xDB,0xDC), o2(0xB7,0xE5), o2(0xB7,0xCB), o2(0xC5,0xED),
-     o2(0xFA,0xCC), o2(0xDB,0xDA), o2(0xB0,0xC6), o2(0xDB,0xDD),
-     o2(0xDB,0xDF), o2(0xB6,0xCD), o2(0xB7,0xAC), o2(0xFA,0xC9),
-     o2(0xB4,0xBC), o2(0xB5,0xCB), o2(0xDB,0xE2), o2(0xBA,0xF9),
-     o2(0xCB,0xF1), o2(0xBB,0xB7), o2(0xDB,0xE3), o2(0xC9,0xB0),
-     o2(0xDB,0xEF), o2(0xB2,0xB3), o2(0xDB,0xE4), o2(0xDB,0xF5),
-     o2(0xDB,0xE5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A1 = {
-    to_SHIFT_JIS_E6_A1_offsets,
-    to_EUC_JP_E6_A1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A2_infos[27] = {
-     o2(0xCE,0xC2), o2(0xDB,0xEC), o2(0xC7,0xDF), o2(0xDB,0xF4),
-     o2(0xDB,0xE7), o2(0xB0,0xB4), o2(0xDB,0xE9), o2(0xB9,0xBC),
-     o2(0xDB,0xEB), o2(0xDB,0xEA), o2(0xDB,0xE6), o2(0xDB,0xF1),
-     o2(0xBE,0xBF), o2(0xD4,0xED), o2(0xB8,0xE8), o2(0xCD,0xFC),
-     o2(0xDB,0xE8), o2(0xC4,0xF4), o2(0xB3,0xA3), o2(0xBA,0xAD),
-     o2(0xDB,0xE0), o2(0xDB,0xF0), o2(0xB3,0xE1), o2(0xDB,0xEE),
-     o2(0xDB,0xF2), o2(0xC5,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A2 = {
-    to_SHIFT_JIS_E6_A2_offsets,
-    to_EUC_JP_E6_A2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A3_infos[25] = {
-     o2(0xB4,0xFE), o2(0xDC,0xB2), o2(0xF9,0xA9), o2(0xCC,0xC9),
-     o2(0xDB,0xF7), o2(0xB4,0xFD), o2(0xDB,0xFE), o2(0xFA,0xCD),
-     o2(0xCB,0xC0), o2(0xDC,0xA1), o2(0xDC,0xA3), o2(0xDC,0xA7),
-     o2(0xDB,0xF9), o2(0xC3,0xAA), o2(0xC5,0xEF), o2(0xDC,0xAB),
-     o2(0xDB,0xFC), o2(0xDC,0xA8), o2(0xDC,0xA2), o2(0xBF,0xB9),
-     o2(0xDC,0xAC), o2(0xC0,0xB3), o2(0xDC,0xAA), o2(0xB4,0xBD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A3 = {
-    to_SHIFT_JIS_E6_A3_offsets,
-    to_EUC_JP_E6_A3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A4_infos[29] = {
-     o2(0xCF,0xD0), o2(0xDB,0xF6), o2(0xDC,0xA6), o2(0xB0,0xD8),
-     o2(0xDB,0xF8), o2(0xCC,0xBA), o2(0xDB,0xFD), o2(0xBF,0xA2),
-     o2(0xC4,0xC7), o2(0xDB,0xF3), o2(0xDC,0xA5), o2(0xBF,0xFA),
-     o2(0xDC,0xAF), o2(0xB3,0xF1), o2(0xB8,0xA1), o2(0xDC,0xB1),
-     o2(0xDB,0xFA), o2(0xDC,0xB0), o2(0xDC,0xA9), o2(0xDB,0xFB),
-     o2(0xDC,0xAD), o2(0xDC,0xAE), o2(0xDC,0xBF), o2(0xC6,0xCE),
-     o2(0xDC,0xA4), o2(0xDC,0xBB), o2(0xDC,0xBD), o2(0xC4,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A4 = {
-    to_SHIFT_JIS_E6_A4_offsets,
-    to_EUC_JP_E6_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A5_infos[28] = {
-     o2(0xCD,0xCC), o2(0xC9,0xF6), o2(0xDC,0xB8), o2(0xC2,0xCA),
-     o2(0xDC,0xBE), o2(0xC1,0xBF), o2(0xDC,0xB5), o2(0xDC,0xC2),
-     o2(0xDC,0xC1), o2(0xC6,0xEF), o2(0xDC,0xC0), o2(0xC6,0xEA),
-     o2(0xFA,0xCF), o2(0xDC,0xC4), o2(0xDC,0xB7), o2(0xB6,0xC8),
-     o2(0xDC,0xBA), o2(0xBD,0xDD), o2(0xC7,0xE0), o2(0xDC,0xBC),
-     o2(0xB6,0xCB), o2(0xDC,0xB4), o2(0xDC,0xB6), o2(0xDC,0xB3),
-     o2(0xCF,0xB0), o2(0xB3,0xDA), o2(0xDC,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A5 = {
-    to_SHIFT_JIS_E6_A5_offsets,
-    to_EUC_JP_E6_A5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A6_infos[20] = {
-     o2(0xDC,0xC3), o2(0xB3,0xB5), o2(0xBA,0xE7), o2(0xB1,0xDD),
-     o2(0xDC,0xD4), o2(0xCF,0xB1), o2(0xDC,0xD7), o2(0xFA,0xD1),
-     o2(0xBF,0xBA), o2(0xDC,0xD6), o2(0xDC,0xD5), o2(0xDC,0xD2),
-     o2(0xDC,0xC6), o2(0xDC,0xE3), o2(0xDC,0xC5), o2(0xDC,0xD8),
-     o2(0xDC,0xD0), o2(0xDC,0xCB), o2(0xDC,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A6 = {
-    to_SHIFT_JIS_E6_A6_offsets,
-    to_EUC_JP_E6_A6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A7_infos[25] = {
-     o2(0xDC,0xC9), o2(0xDC,0xD1), o2(0xF4,0xA2), o2(0xDC,0xCE),
-     o2(0xB9,0xBD), o2(0xC4,0xC8), o2(0xC1,0xE4), o2(0xDC,0xCC),
-     o2(0xDC,0xC7), o2(0xDC,0xCA), o2(0xCD,0xCD), o2(0xCB,0xEA),
-     o2(0xDC,0xCF), o2(0xDC,0xD9), o2(0xFA,0xD2), o2(0xDC,0xE1),
-     o2(0xDC,0xDA), o2(0xDC,0xE7), o2(0xDC,0xE5), o2(0xDC,0xE0),
-     o2(0xDC,0xDF), o2(0xC4,0xD0), o2(0xC1,0xE5), o2(0xDC,0xDD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A7 = {
-    to_SHIFT_JIS_E6_A7_offsets,
-    to_EUC_JP_E6_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A8_infos[28] = {
-     o2(0xDC,0xDB), o2(0xDC,0xE2), o2(0xDC,0xE8), o2(0xC8,0xF5),
-     o2(0xDC,0xEE), o2(0xDC,0xE9), o2(0xDC,0xEC), o2(0xDC,0xE6),
-     o2(0xC3,0xF4), o2(0xC9,0xB8), o2(0xDC,0xDC), o2(0xDC,0xE4),
-     o2(0xBE,0xC0), o2(0xCC,0xCF), o2(0xDC,0xF8), o2(0xDC,0xEB),
-     o2(0xB8,0xA2), o2(0xB2,0xA3), o2(0xB3,0xDF), o2(0xDC,0xD3),
-     o2(0xFA,0xD3), o2(0xBE,0xC1), o2(0xDC,0xF0), o2(0xDC,0xF7),
-     o2(0xBC,0xF9), o2(0xB3,0xF2), o2(0xC3,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A8 = {
-    to_SHIFT_JIS_E6_A8_offsets,
-    to_EUC_JP_E6_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_A9_infos[18] = {
-     o2(0xDC,0xED), o2(0xFA,0xD5), o2(0xDC,0xF2), o2(0xDC,0xF6),
-     o2(0xB6,0xB6), o2(0xB5,0xCC), o2(0xDC,0xF4), o2(0xB5,0xA1),
-     o2(0xC6,0xCB), o2(0xDC,0xF3), o2(0xDC,0xF5), o2(0xFA,0xD4),
-     o2(0xDC,0xEF), o2(0xFA,0xD6), o2(0xDC,0xF1), o2(0xFA,0xD7),
-     o2(0xB3,0xE0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_A9 = {
-    to_SHIFT_JIS_E6_A9_offsets,
-    to_EUC_JP_E6_A9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AA_infos[17] = {
-     o2(0xC3,0xC9), o2(0xDC,0xFC), o2(0xDC,0xFA), o2(0xB8,0xE9),
-     o2(0xDC,0xF9), o2(0xDD,0xA1), o2(0xDB,0xD8), o2(0xDC,0xFB),
-     o2(0xDC,0xFD), o2(0xDC,0xFE), o2(0xDD,0xAC), o2(0xDD,0xA8),
-     o2(0xDB,0xED), o2(0xDD,0xA7), o2(0xDD,0xA6), o2(0xDD,0xA3),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AA = {
-    to_SHIFT_JIS_E6_AA_offsets,
-    to_EUC_JP_E6_AA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AB_infos[16] = {
-     o2(0xDC,0xEA), o2(0xDD,0xA5), o2(0xDD,0xA4), o2(0xDD,0xAA),
-     o2(0xCF,0xA6), o2(0xDD,0xAD), o2(0xB6,0xFB), o2(0xDD,0xA9),
-     o2(0xDD,0xAB), o2(0xFA,0xD8), o2(0xFA,0xD9), o2(0xC8,0xA7),
-     o2(0xDD,0xAE), o2(0xDD,0xB2), o2(0xDD,0xAF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AB = {
-    to_SHIFT_JIS_E6_AB_offsets,
-    to_EUC_JP_E6_AB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AC_infos[19] = {
-     o2(0xCD,0xF3), o2(0xDD,0xB0), o2(0xDC,0xDE), o2(0xDD,0xB3),
-     o2(0xDD,0xB4), o2(0xB1,0xB5), o2(0xDD,0xB6), o2(0xB7,0xE7),
-     o2(0xBC,0xA1), o2(0xB6,0xD5), o2(0xB2,0xA4), o2(0xCD,0xDF),
-     o2(0xDD,0xB8), o2(0xDD,0xB7), o2(0xDD,0xBA), o2(0xB5,0xBD),
-     o2(0xB6,0xD6), o2(0xB4,0xBE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AC = {
-    to_SHIFT_JIS_E6_AC_offsets,
-    to_EUC_JP_E6_AC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AD_infos[26] = {
-     o2(0xDD,0xBD), o2(0xDD,0xBC), o2(0xDD,0xBE), o2(0xB2,0xCE),
-     o2(0xC3,0xB7), o2(0xDD,0xBF), o2(0xB4,0xBF), o2(0xDD,0xC1),
-     o2(0xDD,0xC0), o2(0xDD,0xC2), o2(0xDD,0xC3), o2(0xDD,0xC4),
-     o2(0xBB,0xDF), o2(0xC0,0xB5), o2(0xBA,0xA1), o2(0xC9,0xF0),
-     o2(0xCA,0xE2), o2(0xCF,0xC4), o2(0xBB,0xF5), o2(0xBA,0xD0),
-     o2(0xCE,0xF2), o2(0xDD,0xC5), o2(0xDD,0xC6), o2(0xBB,0xE0),
-     o2(0xDD,0xC7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AD = {
-    to_SHIFT_JIS_E6_AD_offsets,
-    to_EUC_JP_E6_AD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AE_infos[27] = {
-     o2(0xDD,0xC8), o2(0xDD,0xCA), o2(0xDD,0xC9), o2(0xCB,0xD8),
-     o2(0xBD,0xDE), o2(0xBC,0xEC), o2(0xBB,0xC4), o2(0xDD,0xCB),
-     o2(0xDD,0xCD), o2(0xBF,0xA3), o2(0xDD,0xCC), o2(0xDD,0xCE),
-     o2(0xDD,0xCF), o2(0xDD,0xD0), o2(0xDD,0xD1), o2(0xDD,0xD2),
-     o2(0xDD,0xD4), o2(0xDD,0xD3), o2(0xDD,0xD5), o2(0xB2,0xA5),
-     o2(0xC3,0xCA), o2(0xDD,0xD6), o2(0xBB,0xA6), o2(0xB3,0xCC),
-     o2(0xDD,0xD7), o2(0xC5,0xC2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AE = {
-    to_SHIFT_JIS_E6_AE_offsets,
-    to_EUC_JP_E6_AE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_AF_infos[18] = {
-     o2(0xD4,0xCC), o2(0xB5,0xA3), o2(0xDD,0xD8), o2(0xDD,0xD9),
-     o2(0xCA,0xEC), o2(0xCB,0xE8), o2(0xC6,0xC7), o2(0xDD,0xDA),
-     o2(0xC8,0xE6), o2(0xFA,0xDA), o2(0xC8,0xFB), o2(0xCC,0xD3),
-     o2(0xDD,0xDB), o2(0xDD,0xDD), o2(0xDD,0xDC), o2(0xDD,0xDF),
-     o2(0xDD,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_AF = {
-    to_SHIFT_JIS_E6_AF_offsets,
-    to_EUC_JP_E6_AF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B0_infos[15] = {
-     o2(0xDD,0xE1), o2(0xBB,0xE1), o2(0xCC,0xB1), o2(0xDD,0xE2),
-     o2(0xDD,0xE3), o2(0xB5,0xA4), o2(0xDD,0xE4), o2(0xDD,0xE6),
-     o2(0xDD,0xE5), o2(0xBF,0xE5), o2(0xC9,0xB9), o2(0xB1,0xCA),
-     o2(0xC8,0xC5), o2(0xFA,0xDB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B0 = {
-    to_SHIFT_JIS_E6_B0_offsets,
-    to_EUC_JP_E6_B0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B1_infos[24] = {
-     o2(0xC4,0xF5), o2(0xBD,0xC1), o2(0xB5,0xE1), o2(0xC8,0xC6),
-     o2(0xBC,0xAE), o2(0xDD,0xE8), o2(0xB4,0xC0), o2(0xB1,0xF8),
-     o2(0xFA,0xDC), o2(0xC6,0xF2), o2(0xDD,0xE7), o2(0xB9,0xBE),
-     o2(0xC3,0xD3), o2(0xDD,0xE9), o2(0xDD,0xF1), o2(0xDD,0xEA),
-     o2(0xFA,0xDE), o2(0xC2,0xC1), o2(0xB5,0xE2), o2(0xDD,0xF2),
-     o2(0xB7,0xE8), o2(0xB5,0xA5), o2(0xDD,0xF0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B1 = {
-    to_SHIFT_JIS_E6_B1_offsets,
-    to_EUC_JP_E6_B1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B2_infos[29] = {
-     o2(0xDD,0xEE), o2(0xDD,0xEB), o2(0xCD,0xE0), o2(0xFA,0xDD),
-     o2(0xC4,0xC0), o2(0xC6,0xD9), o2(0xDD,0xEC), o2(0xDD,0xF4),
-     o2(0xDD,0xF3), o2(0xB7,0xA3), o2(0xB2,0xAD), o2(0xBA,0xBB),
-     o2(0xDD,0xED), o2(0xDD,0xEF), o2(0xCB,0xD7), o2(0xC2,0xF4),
-     o2(0xCB,0xF7), o2(0xDD,0xFC), o2(0xDD,0xFD), o2(0xB2,0xCF),
-     o2(0xCA,0xA8), o2(0xCC,0xFD), o2(0xDE,0xA1), o2(0xBC,0xA3),
-     o2(0xBE,0xC2), o2(0xDD,0xF8), o2(0xDD,0xFE), o2(0xB1,0xE8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B2 = {
-    to_SHIFT_JIS_E6_B2_offsets,
-    to_EUC_JP_E6_B2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B3_infos[24] = {
-     o2(0xB6,0xB7), o2(0xDD,0xF5), o2(0xDD,0xFA), o2(0xC0,0xF4),
-     o2(0xC7,0xF1), o2(0xC8,0xE7), o2(0xDD,0xF7), o2(0xCB,0xA1),
-     o2(0xDD,0xF9), o2(0xDE,0xA4), o2(0xFA,0xDF), o2(0xDE,0xA2),
-     o2(0xDD,0xFB), o2(0xCB,0xA2), o2(0xC7,0xC8), o2(0xB5,0xE3),
-     o2(0xC5,0xA5), o2(0xC3,0xED), o2(0xDE,0xA5), o2(0xDE,0xA3),
-     o2(0xC2,0xD9), o2(0xDD,0xF6), o2(0xB1,0xCB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B3 = {
-    to_SHIFT_JIS_E6_B3_offsets,
-    to_EUC_JP_E6_B3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B4_infos[22] = {
-     o2(0xFA,0xE0), o2(0xCD,0xCE), o2(0xDE,0xB0), o2(0xDE,0xAF),
-     o2(0xC0,0xF6), o2(0xDE,0xAC), o2(0xCD,0xEC), o2(0xC6,0xB6),
-     o2(0xDE,0xA6), o2(0xC4,0xC5), o2(0xB1,0xCC), o2(0xB9,0xBF),
-     o2(0xDE,0xA9), o2(0xBD,0xA7), o2(0xDE,0xAE), o2(0xDE,0xAD),
-     o2(0xDE,0xA8), o2(0xDE,0xAB), o2(0xB3,0xE8), o2(0xDE,0xAA),
-     o2(0xC7,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B4 = {
-    to_SHIFT_JIS_E6_B4_offsets,
-    to_EUC_JP_E6_B4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B5_infos[19] = {
-     o2(0xCE,0xAE), o2(0xBE,0xF4), o2(0xC0,0xF5), o2(0xDE,0xB6),
-     o2(0xDE,0xB4), o2(0xC9,0xCD), o2(0xDE,0xB1), o2(0xDE,0xB3),
-     o2(0xB1,0xBA), o2(0xB9,0xC0), o2(0xCF,0xB2), o2(0xB3,0xBD),
-     o2(0xC9,0xE2), o2(0xFA,0xE2), o2(0xCD,0xE1), o2(0xB3,0xA4),
-     o2(0xBF,0xBB), o2(0xDE,0xB5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B5 = {
-    to_SHIFT_JIS_E6_B5_offsets,
-    to_EUC_JP_E6_B5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B6_infos[18] = {
-     o2(0xDE,0xBA), o2(0xFA,0xE1), o2(0xBE,0xC3), o2(0xCD,0xB0),
-     o2(0xDE,0xB7), o2(0xDE,0xB2), o2(0xDE,0xB8), o2(0xFA,0xE3),
-     o2(0xCE,0xDE), o2(0xC5,0xF3), o2(0xC6,0xC2), o2(0xFA,0xE4),
-     o2(0xB3,0xB6), o2(0xB1,0xD5), o2(0xDE,0xBE), o2(0xDE,0xC1),
-     o2(0xCE,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B6 = {
-    to_SHIFT_JIS_E6_B6_offsets,
-    to_EUC_JP_E6_B6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B7_infos[32] = {
-     o2(0xCD,0xE4), o2(0xDE,0xC8), o2(0xDE,0xC2), o2(0xDE,0xBF),
-     o2(0xCE,0xD4), o2(0xDE,0xC5), o2(0xFA,0xE5), o2(0xBD,0xCA),
-     o2(0xDE,0xC7), o2(0xDE,0xCC), o2(0xC5,0xF1), o2(0xDE,0xCA),
-     o2(0xDE,0xC4), o2(0xC3,0xB8), o2(0xDE,0xCB), o2(0xDE,0xC0),
-     o2(0xDE,0xC6), o2(0xDE,0xCD), o2(0xB0,0xFC), o2(0xDE,0xC3),
-     o2(0xDE,0xCE), o2(0xBF,0xBC), o2(0xFA,0xE7), o2(0xBD,0xDF),
-     o2(0xCA,0xA5), o2(0xBA,0xAE), o2(0xFA,0xE6), o2(0xDE,0xBB),
-     o2(0xDE,0xC9), o2(0xC5,0xBA), o2(0xFA,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B7 = {
-    to_SHIFT_JIS_E6_B7_offsets,
-    to_EUC_JP_E6_B7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B8_infos[32] = {
-     o2(0xC0,0xB6), o2(0xB3,0xE9), o2(0xBA,0xD1), o2(0xBE,0xC4),
-     o2(0xDE,0xBD), o2(0xBD,0xC2), o2(0xB7,0xCC), o2(0xDE,0xBC),
-     o2(0xDE,0xD2), o2(0xBD,0xED), o2(0xB8,0xBA), o2(0xDE,0xE1),
-     o2(0xDE,0xDB), o2(0xB5,0xF4), o2(0xC5,0xCF), o2(0xDE,0xD6),
-     o2(0xDE,0xDF), o2(0xB0,0xAF), o2(0xB1,0xB2), o2(0xFA,0xEB),
-     o2(0xB2,0xB9), o2(0xDE,0xD8), o2(0xC2,0xAC), o2(0xDE,0xCF),
-     o2(0xDE,0xD1), o2(0xB9,0xC1), o2(0xDE,0xE2), o2(0xFA,0xE9),
-     o2(0xDE,0xDD), o2(0xFA,0xEC), o2(0xDE,0xD5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B8 = {
-    to_SHIFT_JIS_E6_B8_offsets,
-    to_EUC_JP_E6_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_B9_infos[18] = {
-     o2(0xDE,0xDC), o2(0xCC,0xAB), o2(0xDE,0xDA), o2(0xDE,0xDE),
-     o2(0xB8,0xD0), o2(0xBE,0xC5), o2(0xC3,0xB9), o2(0xFA,0xEA),
-     o2(0xDE,0xD4), o2(0xCD,0xAF), o2(0xDE,0xD7), o2(0xDE,0xD0),
-     o2(0xC5,0xF2), o2(0xDE,0xD3), o2(0xDE,0xD9), o2(0xCF,0xD1),
-     o2(0xBC,0xBE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_B9 = {
-    to_SHIFT_JIS_E6_B9_offsets,
-    to_EUC_JP_E6_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BA_infos[21] = {
-     o2(0xCB,0xFE), o2(0xDE,0xE3), o2(0xC8,0xAE), o2(0xDE,0xEF),
-     o2(0xB8,0xBB), o2(0xBD,0xE0), o2(0xDE,0xE5), o2(0xCE,0xAF),
-     o2(0xB9,0xC2), o2(0xDE,0xF2), o2(0xB0,0xEE), o2(0xDE,0xF0),
-     o2(0xDE,0xE4), o2(0xDE,0xEA), o2(0xDE,0xEC), o2(0xCD,0xCF),
-     o2(0xDE,0xE7), o2(0xC5,0xAE), o2(0xDE,0xE9), o2(0xFA,0xED),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BA = {
-    to_SHIFT_JIS_E6_BA_offsets,
-    to_EUC_JP_E6_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BB_infos[21] = {
-     o2(0xDE,0xF1), o2(0xDE,0xEB), o2(0xCC,0xC7), o2(0xDE,0xE6),
-     o2(0xBC,0xA2), o2(0xDE,0xFE), o2(0xB3,0xEA), o2(0xDE,0xE8),
-     o2(0xDE,0xED), o2(0xDE,0xEE), o2(0xC2,0xEC), o2(0xC2,0xDA),
-     o2(0xDE,0xF6), o2(0xDE,0xFC), o2(0xDE,0xFA), o2(0xC5,0xA9),
-     o2(0xDF,0xA3), o2(0xDE,0xF7), o2(0xDE,0xF8), o2(0xDE,0xE0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BB = {
-    to_SHIFT_JIS_E6_BB_offsets,
-    to_EUC_JP_E6_BB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BC_infos[20] = {
-     o2(0xB5,0xF9), o2(0xC9,0xBA), o2(0xBC,0xBF), o2(0xB9,0xF7),
-     o2(0xCF,0xB3), o2(0xDE,0xF4), o2(0xDF,0xA2), o2(0xB1,0xE9),
-     o2(0xC1,0xE6), o2(0xC7,0xF9), o2(0xB4,0xC1), o2(0xCE,0xFA),
-     o2(0xCC,0xA1), o2(0xC4,0xD2), o2(0xDE,0xFB), o2(0xDE,0xFD),
-     o2(0xC1,0xB2), o2(0xDF,0xA1), o2(0xDE,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BC = {
-    to_SHIFT_JIS_E6_BC_offsets,
-    to_EUC_JP_E6_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BD_infos[18] = {
-     o2(0xDE,0xF3), o2(0xB4,0xC3), o2(0xB7,0xE9), o2(0xDF,0xAF),
-     o2(0xDF,0xAA), o2(0xC0,0xF8), o2(0xB3,0xE3), o2(0xBD,0xE1),
-     o2(0xDF,0xB3), o2(0xDF,0xAC), o2(0xC4,0xAC), o2(0xDF,0xA9),
-     o2(0xC4,0xD9), o2(0xDF,0xCC), o2(0xDF,0xA6), o2(0xDF,0xA5),
-     o2(0xDF,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BD = {
-    to_SHIFT_JIS_E6_BD_offsets,
-    to_EUC_JP_E6_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BE_infos[18] = {
-     o2(0xDF,0xA8), o2(0xDF,0xA7), o2(0xDF,0xAD), o2(0xC0,0xA1),
-     o2(0xDF,0xA4), o2(0xFA,0xEE), o2(0xDF,0xB0), o2(0xDF,0xB1),
-     o2(0xB4,0xC2), o2(0xDF,0xB6), o2(0xDF,0xB5), o2(0xDF,0xB7),
-     o2(0xDF,0xBA), o2(0xC5,0xC3), o2(0xDF,0xB4), o2(0xFA,0xEF),
-     o2(0xDF,0xB8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BE = {
-    to_SHIFT_JIS_E6_BE_offsets,
-    to_EUC_JP_E6_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_BF_infos[24] = {
-     o2(0xB7,0xE3), o2(0xC2,0xF9), o2(0xDF,0xB2), o2(0xC7,0xBB),
-     o2(0xDF,0xB9), o2(0xDF,0xBE), o2(0xDF,0xBC), o2(0xDF,0xBF),
-     o2(0xDF,0xC2), o2(0xDF,0xBB), o2(0xB9,0xEA), o2(0xC7,0xA8),
-     o2(0xDE,0xB9), o2(0xCD,0xF4), o2(0xDF,0xBD), o2(0xDF,0xC1),
-     o2(0xC2,0xF5), o2(0xDF,0xC0), o2(0xDF,0xAB), o2(0xFA,0xF0),
-     o2(0xEF,0xE9), o2(0xDF,0xC5), o2(0xDF,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6_BF = {
-    to_SHIFT_JIS_E6_BF_offsets,
-    to_EUC_JP_E6_BF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E6_infos[64] = {
-     &to_EUC_JP_E6_80, &to_EUC_JP_E6_81, &to_EUC_JP_E6_82, &to_EUC_JP_E6_83,
-     &to_EUC_JP_E6_84, &to_EUC_JP_E6_85, &to_EUC_JP_E6_86, &to_EUC_JP_E6_87,
-     &to_EUC_JP_E6_88, &to_EUC_JP_E6_89, &to_EUC_JP_E6_8A, &to_EUC_JP_E6_8B,
-     &to_EUC_JP_E6_8C, &to_EUC_JP_E6_8D, &to_EUC_JP_E6_8E, &to_EUC_JP_E6_8F,
-     &to_EUC_JP_E6_90, &to_EUC_JP_E6_91, &to_EUC_JP_E6_92, &to_EUC_JP_E6_93,
-     &to_EUC_JP_E6_94, &to_EUC_JP_E6_95, &to_EUC_JP_E6_96, &to_EUC_JP_E6_97,
-     &to_EUC_JP_E6_98, &to_EUC_JP_E6_99, &to_EUC_JP_E6_9A, &to_EUC_JP_E6_9B,
-     &to_EUC_JP_E6_9C, &to_EUC_JP_E6_9D, &to_EUC_JP_E6_9E, &to_EUC_JP_E6_9F,
-     &to_EUC_JP_E6_A0, &to_EUC_JP_E6_A1, &to_EUC_JP_E6_A2, &to_EUC_JP_E6_A3,
-     &to_EUC_JP_E6_A4, &to_EUC_JP_E6_A5, &to_EUC_JP_E6_A6, &to_EUC_JP_E6_A7,
-     &to_EUC_JP_E6_A8, &to_EUC_JP_E6_A9, &to_EUC_JP_E6_AA, &to_EUC_JP_E6_AB,
-     &to_EUC_JP_E6_AC, &to_EUC_JP_E6_AD, &to_EUC_JP_E6_AE, &to_EUC_JP_E6_AF,
-     &to_EUC_JP_E6_B0, &to_EUC_JP_E6_B1, &to_EUC_JP_E6_B2, &to_EUC_JP_E6_B3,
-     &to_EUC_JP_E6_B4, &to_EUC_JP_E6_B5, &to_EUC_JP_E6_B6, &to_EUC_JP_E6_B7,
-     &to_EUC_JP_E6_B8, &to_EUC_JP_E6_B9, &to_EUC_JP_E6_BA, &to_EUC_JP_E6_BB,
-     &to_EUC_JP_E6_BC, &to_EUC_JP_E6_BD, &to_EUC_JP_E6_BE, &to_EUC_JP_E6_BF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E6 = {
-    to_SHIFT_JIS_E5_offsets,
-    to_EUC_JP_E6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_80_infos[22] = {
-     o2(0xDF,0xC7), o2(0xFA,0xF1), o2(0xFA,0xF2), o2(0xDF,0xC3),
-     o2(0xDF,0xC4), o2(0xDF,0xC8), o2(0xDF,0xC6), o2(0xC9,0xCE),
-     o2(0xDF,0xCE), o2(0xDF,0xCB), o2(0xDF,0xCA), o2(0xDF,0xCD),
-     o2(0xC6,0xD4), o2(0xDF,0xCF), o2(0xC3,0xF5), o2(0xC2,0xED),
-     o2(0xFA,0xF3), o2(0xC0,0xA5), o2(0xDF,0xD0), o2(0xDF,0xD2),
-     o2(0xDF,0xD1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_80 = {
-    to_SHIFT_JIS_E7_80_offsets,
-    to_EUC_JP_E7_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_81_infos[11] = {
-     o2(0xDE,0xF5), o2(0xDF,0xD3), o2(0xC6,0xE7), o2(0xDF,0xD4),
-     o2(0xB2,0xD0), o2(0xC5,0xF4), o2(0xB3,0xA5), o2(0xB5,0xE4),
-     o2(0xBC,0xDE), o2(0xBA,0xD2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_81 = {
-    to_SHIFT_JIS_E7_81_offsets,
-    to_EUC_JP_E7_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_82_infos[17] = {
-     o2(0xFA,0xF4), o2(0xCF,0xA7), o2(0xBF,0xE6), o2(0xB1,0xEA),
-     o2(0xDF,0xD6), o2(0xDF,0xD5), o2(0xFA,0xF5), o2(0xDF,0xD9),
-     o2(0xC3,0xBA), o2(0xDF,0xDC), o2(0xDF,0xD7), o2(0xDF,0xDB),
-     o2(0xDF,0xDA), o2(0xC5,0xC0), o2(0xB0,0xD9), o2(0xF9,0xA7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_82 = {
-    to_SHIFT_JIS_E7_82_offsets,
-    to_EUC_JP_E7_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_83_infos[10] = {
-     o2(0xCE,0xF5), o2(0xDF,0xDE), o2(0xB1,0xA8), o2(0xDF,0xE0),
-     o2(0xDF,0xDF), o2(0xDF,0xDD), o2(0xDF,0xD8), o2(0xCB,0xA3),
-     o2(0xDF,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_83 = {
-    to_SHIFT_JIS_E7_83_offsets,
-    to_EUC_JP_E7_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_84_infos[12] = {
-     o2(0xFA,0xF7), o2(0xDF,0xE1), o2(0xFA,0xF6), o2(0xB1,0xEB),
-     o2(0xDF,0xE4), o2(0xCA,0xB2), o2(0xDF,0xE3), o2(0xCC,0xB5),
-     o2(0xBE,0xC7), o2(0xC1,0xB3), o2(0xBE,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_84 = {
-    to_SHIFT_JIS_E7_84_offsets,
-    to_EUC_JP_E7_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_85_infos[19] = {
-     o2(0xFA,0xF9), o2(0xFA,0xFA), o2(0xCE,0xFB), o2(0xDF,0xEA),
-     o2(0xC0,0xF9), o2(0xDF,0xE6), o2(0xDF,0xEB), o2(0xB1,0xEC),
-     o2(0xFA,0xF8), o2(0xDF,0xE9), o2(0xC7,0xE1), o2(0xDF,0xE5),
-     o2(0xDF,0xE8), o2(0xBE,0xC8), o2(0xC8,0xD1), o2(0xDF,0xEC),
-     o2(0xBC,0xD1), o2(0xC0,0xFA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_85 = {
-    to_SHIFT_JIS_E7_85_offsets,
-    to_EUC_JP_E7_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_86_infos[14] = {
-     o2(0xDF,0xEF), o2(0xDF,0xE7), o2(0xB7,0xA7), o2(0xDF,0xED),
-     o2(0xCD,0xD0), o2(0xDF,0xF0), o2(0xF4,0xA6), o2(0xBD,0xCF),
-     o2(0xDF,0xF1), o2(0xDF,0xF2), o2(0xC7,0xAE), o2(0xDF,0xF4),
-     o2(0xDF,0xF5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_86 = {
-    to_SHIFT_JIS_E7_86_offsets,
-    to_EUC_JP_E7_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_87_infos[25] = {
-     o2(0xFA,0xFC), o2(0xC7,0xB3), o2(0xC5,0xF5), o2(0xDF,0xF7),
-     o2(0xDF,0xF9), o2(0xCE,0xD5), o2(0xDF,0xF6), o2(0xDF,0xF8),
-     o2(0xB1,0xED), o2(0xDF,0xF3), o2(0xD3,0xDB), o2(0xDF,0xFA),
-     o2(0xC1,0xE7), o2(0xBB,0xB8), o2(0xDF,0xFC), o2(0xDF,0xFB),
-     o2(0xBF,0xA4), o2(0xD2,0xD9), o2(0xDF,0xFD), o2(0xE0,0xA1),
-     o2(0xDF,0xEE), o2(0xDF,0xFE), o2(0xFA,0xFD), o2(0xE0,0xA2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_87 = {
-    to_SHIFT_JIS_E7_87_offsets,
-    to_EUC_JP_E7_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_88_infos[19] = {
-     o2(0xC7,0xFA), o2(0xE0,0xA3), o2(0xE0,0xA4), o2(0xE0,0xA5),
-     o2(0xE0,0xA6), o2(0xC4,0xDE), o2(0xE0,0xA8), o2(0xE0,0xA7),
-     o2(0xE0,0xA9), o2(0xE0,0xAA), o2(0xBC,0xDF), o2(0xC9,0xE3),
-     o2(0xCC,0xEC), o2(0xE0,0xAB), o2(0xE0,0xAC), o2(0xC1,0xD6),
-     o2(0xBC,0xA4), o2(0xE0,0xAD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_88 = {
-    to_SHIFT_JIS_E7_88_offsets,
-    to_EUC_JP_E7_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_89_infos[22] = {
-     o2(0xE0,0xAE), o2(0xE0,0xAF), o2(0xCA,0xD2), o2(0xC8,0xC7),
-     o2(0xE0,0xB0), o2(0xC7,0xD7), o2(0xC4,0xAD), o2(0xE0,0xB1),
-     o2(0xB2,0xE7), o2(0xB5,0xED), o2(0xCC,0xC6), o2(0xCC,0xB6),
-     o2(0xB2,0xB4), o2(0xCF,0xB4), o2(0xCB,0xD2), o2(0xCA,0xAA),
-     o2(0xC0,0xB7), o2(0xE0,0xB2), o2(0xC6,0xC3), o2(0xB8,0xA3),
-     o2(0xE0,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_89 = {
-    to_SHIFT_JIS_E7_89_offsets,
-    to_EUC_JP_E7_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8A_infos[17] = {
-     o2(0xBA,0xD4), o2(0xE0,0xB5), o2(0xE0,0xB4), o2(0xE0,0xB6),
-     o2(0xE0,0xB7), o2(0xE0,0xB8), o2(0xB5,0xBE), o2(0xE0,0xB9),
-     o2(0xE0,0xBA), o2(0xB8,0xA4), o2(0xC8,0xC8), o2(0xFA,0xFE),
-     o2(0xE0,0xBC), o2(0xBE,0xF5), o2(0xE0,0xBB), o2(0xFB,0xA1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8A = {
-    to_SHIFT_JIS_E7_8A_offsets,
-    to_EUC_JP_E7_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8B_infos[22] = {
-     o2(0xB6,0xB8), o2(0xE0,0xBD), o2(0xE0,0xBF), o2(0xE0,0xBE),
-     o2(0xE0,0xC0), o2(0xB8,0xD1), o2(0xE0,0xC1), o2(0xB6,0xE9),
-     o2(0xC1,0xC0), o2(0xB9,0xFD), o2(0xE0,0xC3), o2(0xE0,0xC4),
-     o2(0xE0,0xC2), o2(0xBC,0xED), o2(0xC6,0xC8), o2(0xB6,0xB9),
-     o2(0xE0,0xC6), o2(0xC3,0xAC), o2(0xE0,0xC5), o2(0xCF,0xB5),
-     o2(0xC7,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8B = {
-    to_SHIFT_JIS_E7_8B_offsets,
-    to_EUC_JP_E7_8B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8C_infos[20] = {
-     o2(0xE0,0xC9), o2(0xE0,0xCB), o2(0xE0,0xC8), o2(0xCC,0xD4),
-     o2(0xE0,0xCA), o2(0xE0,0xCC), o2(0xCE,0xC4), o2(0xFB,0xA2),
-     o2(0xE0,0xD0), o2(0xE0,0xCF), o2(0xC3,0xF6), o2(0xC7,0xAD),
-     o2(0xB8,0xA5), o2(0xE0,0xCE), o2(0xE0,0xCD), o2(0xCD,0xB1),
-     o2(0xCD,0xB2), o2(0xE0,0xD1), o2(0xB1,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8C = {
-    to_SHIFT_JIS_E7_8C_offsets,
-    to_EUC_JP_E7_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8D_infos[16] = {
-     o2(0xB9,0xF6), o2(0xBB,0xE2), o2(0xE0,0xD2), o2(0xE0,0xD3),
-     o2(0xE0,0xD5), o2(0xBD,0xC3), o2(0xE0,0xD7), o2(0xE0,0xD6),
-     o2(0xE0,0xD8), o2(0xB3,0xCD), o2(0xE0,0xDA), o2(0xFB,0xA4),
-     o2(0xE0,0xD9), o2(0xE0,0xDC), o2(0xE0,0xDB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8D = {
-    to_SHIFT_JIS_E7_8D_offsets,
-    to_EUC_JP_E7_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8E_infos[11] = {
-     o2(0xB8,0xBC), o2(0xCE,0xA8), o2(0xB6,0xCC), o2(0xB2,0xA6),
-     o2(0xB6,0xEA), o2(0xB4,0xE1), o2(0xCE,0xE8), o2(0xE0,0xDE),
-     o2(0xE0,0xE0), o2(0xFB,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8E = {
-    to_SHIFT_JIS_E7_8E_offsets,
-    to_EUC_JP_E7_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_8F_infos[21] = {
-     o2(0xE0,0xE1), o2(0xB2,0xD1), o2(0xE0,0xDD), o2(0xFB,0xA6),
-     o2(0xBB,0xB9), o2(0xC4,0xC1), o2(0xE0,0xDF), o2(0xFB,0xA9),
-     o2(0xFB,0xA7), o2(0xE0,0xE4), o2(0xBC,0xEE), o2(0xFB,0xA8),
-     o2(0xE0,0xE2), o2(0xB7,0xBE), o2(0xC8,0xC9), o2(0xE0,0xE3),
-     o2(0xE0,0xFE), o2(0xFB,0xAB), o2(0xE0,0xE9), o2(0xB8,0xBD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_8F = {
-    to_SHIFT_JIS_E7_8F_offsets,
-    to_EUC_JP_E7_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_90_infos[19] = {
-     o2(0xB5,0xE5), o2(0xE0,0xE6), o2(0xCD,0xFD), o2(0xFB,0xAA),
-     o2(0xCE,0xB0), o2(0xC2,0xF6), o2(0xE0,0xE8), o2(0xFB,0xAC),
-     o2(0xFB,0xAE), o2(0xFB,0xAD), o2(0xFB,0xAF), o2(0xE0,0xEA),
-     o2(0xCE,0xD6), o2(0xB6,0xD7), o2(0xC8,0xFC), o2(0xC7,0xCA),
-     o2(0xE0,0xEB), o2(0xE0,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_90 = {
-    to_SHIFT_JIS_E7_90_offsets,
-    to_EUC_JP_E7_90_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_91_infos[20] = {
-     o2(0xE0,0xF0), o2(0xE0,0xEC), o2(0xE0,0xEF), o2(0xB8,0xEA),
-     o2(0xB1,0xCD), o2(0xE0,0xF1), o2(0xBF,0xF0), o2(0xE0,0xEE),
-     o2(0xCE,0xDC), o2(0xFB,0xB0), o2(0xE0,0xF4), o2(0xF4,0xA4),
-     o2(0xE0,0xF2), o2(0xE0,0xF5), o2(0xE0,0xE7), o2(0xE0,0xF3),
-     o2(0xBA,0xBC), o2(0xE0,0xF6), o2(0xE0,0xF7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_91 = {
-    to_SHIFT_JIS_E7_91_offsets,
-    to_EUC_JP_E7_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_92_infos[10] = {
-     o2(0xCD,0xFE), o2(0xFB,0xB1), o2(0xE0,0xF8), o2(0xE0,0xF9),
-     o2(0xFB,0xB2), o2(0xE0,0xE5), o2(0xE0,0xFA), o2(0xB4,0xC4),
-     o2(0xBC,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_92 = {
-    to_SHIFT_JIS_E7_92_offsets,
-    to_EUC_JP_E7_92_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_93_infos[18] = {
-     o2(0xE0,0xFB), o2(0xE0,0xFC), o2(0xE0,0xFD), o2(0xB1,0xBB),
-     o2(0xE1,0xA1), o2(0xC9,0xBB), o2(0xE1,0xA2), o2(0xB4,0xA4),
-     o2(0xE1,0xA3), o2(0xE1,0xA4), o2(0xE1,0xA5), o2(0xE1,0xA7),
-     o2(0xE1,0xA8), o2(0xE1,0xA6), o2(0xC9,0xD3), o2(0xE1,0xAA),
-     o2(0xE1,0xA9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_93 = {
-    to_SHIFT_JIS_E7_93_offsets,
-    to_EUC_JP_E7_93_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_94_infos[32] = {
-     o2(0xFB,0xB3), o2(0xE1,0xAC), o2(0xE1,0xAB), o2(0xE1,0xAD),
-     o2(0xE1,0xAE), o2(0xE1,0xB0), o2(0xE1,0xAF), o2(0xB9,0xF9),
-     o2(0xE1,0xB2), o2(0xE1,0xB1), o2(0xB4,0xC5), o2(0xBF,0xD3),
-     o2(0xC5,0xBC), o2(0xE1,0xB3), o2(0xC0,0xB8), o2(0xBB,0xBA),
-     o2(0xB1,0xF9), o2(0xE1,0xB4), o2(0xCD,0xD1), o2(0xCA,0xE3),
-     o2(0xE1,0xB5), o2(0xF9,0xEC), o2(0xC5,0xC4), o2(0xCD,0xB3),
-     o2(0xB9,0xC3), o2(0xBF,0xBD), o2(0xC3,0xCB), o2(0xD2,0xB4),
-     o2(0xC4,0xAE), o2(0xB2,0xE8), o2(0xE1,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_94 = {
-    to_SHIFT_JIS_E7_94_offsets,
-    to_EUC_JP_E7_94_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_95_infos[34] = {
-     o2(0xE1,0xB7), o2(0xE1,0xBC), o2(0xE1,0xBA), o2(0xE1,0xB9),
-     o2(0xDA,0xC2), o2(0xB3,0xA6), o2(0xE1,0xB8), o2(0xB0,0xDA),
-     o2(0xC8,0xAA), o2(0xC8,0xCA), o2(0xCE,0xB1), o2(0xE1,0xBD),
-     o2(0xE1,0xBB), o2(0xC3,0xDC), o2(0xC0,0xA6), o2(0xC8,0xAB),
-     o2(0xC9,0xAD), o2(0xE1,0xBF), o2(0xCE,0xAC), o2(0xB7,0xCD),
-     o2(0xE1,0xC0), o2(0xE1,0xBE), o2(0xC8,0xD6), o2(0xE1,0xC1),
-     o2(0xE1,0xC2), o2(0xFB,0xB4), o2(0xB0,0xDB), o2(0xBE,0xF6),
-     o2(0xE1,0xC7), o2(0xE1,0xC4), o2(0xC6,0xED), o2(0xE1,0xC3),
-     o2(0xB5,0xA6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_95 = {
-    to_SHIFT_JIS_E7_95_offsets,
-    to_EUC_JP_E7_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_96_infos[25] = {
-     o2(0xE1,0xCA), o2(0xE1,0xC5), o2(0xE1,0xC6), o2(0xE1,0xC9),
-     o2(0xE1,0xC8), o2(0xC9,0xA5), o2(0xC1,0xC2), o2(0xC1,0xC1),
-     o2(0xB5,0xBF), o2(0xE1,0xCB), o2(0xE1,0xCC), o2(0xE1,0xCD),
-     o2(0xE1,0xCF), o2(0xE1,0xCE), o2(0xB1,0xD6), o2(0xE1,0xD7),
-     o2(0xC8,0xE8), o2(0xE1,0xD1), o2(0xE1,0xD3), o2(0xE1,0xD5),
-     o2(0xBF,0xBE), o2(0xE1,0xD6), o2(0xE1,0xD4), o2(0xBC,0xC0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_96 = {
-    to_SHIFT_JIS_E7_96_offsets,
-    to_EUC_JP_E7_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_97_infos[25] = {
-     o2(0xE1,0xD0), o2(0xE1,0xD2), o2(0xC9,0xC2), o2(0xBE,0xC9),
-     o2(0xE1,0xD9), o2(0xE1,0xD8), o2(0xE1,0xDA), o2(0xBC,0xA6),
-     o2(0xBA,0xAF), o2(0xC5,0xF7), o2(0xE1,0xDB), o2(0xC4,0xCB),
-     o2(0xE1,0xDD), o2(0xCE,0xA1), o2(0xE1,0xDC), o2(0xC1,0xE9),
-     o2(0xE1,0xE2), o2(0xE1,0xE4), o2(0xE1,0xE5), o2(0xC3,0xD4),
-     o2(0xE1,0xE3), o2(0xE1,0xE0), o2(0xE1,0xDE), o2(0xE1,0xDF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_97 = {
-    to_SHIFT_JIS_E7_97_offsets,
-    to_EUC_JP_E7_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_98_infos[14] = {
-     o2(0xE1,0xE1), o2(0xE1,0xE8), o2(0xE1,0xE6), o2(0xE1,0xE7),
-     o2(0xE1,0xE9), o2(0xE1,0xEB), o2(0xE1,0xEC), o2(0xE1,0xED),
-     o2(0xE1,0xEE), o2(0xE1,0xEA), o2(0xE1,0xF0), o2(0xE1,0xEF),
-     o2(0xE1,0xF1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_98 = {
-    to_SHIFT_JIS_E7_98_offsets,
-    to_EUC_JP_E7_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_99_infos[26] = {
-     o2(0xCE,0xC5), o2(0xE1,0xF4), o2(0xE1,0xF2), o2(0xE1,0xF3),
-     o2(0xB4,0xE2), o2(0xCC,0xFE), o2(0xCA,0xCA), o2(0xE1,0xF6),
-     o2(0xE1,0xF5), o2(0xE1,0xF7), o2(0xE1,0xF8), o2(0xE1,0xFC),
-     o2(0xE1,0xF9), o2(0xE1,0xFA), o2(0xE1,0xFB), o2(0xE1,0xFD),
-     o2(0xE1,0xFE), o2(0xE2,0xA1), o2(0xE2,0xA2), o2(0xE2,0xA3),
-     o2(0xC8,0xAF), o2(0xC5,0xD0), o2(0xE2,0xA4), o2(0xC7,0xF2),
-     o2(0xC9,0xB4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_99 = {
-    to_SHIFT_JIS_E7_99_offsets,
-    to_EUC_JP_E7_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9A_infos[27] = {
-     o2(0xE2,0xA5), o2(0xFB,0xB5), o2(0xE2,0xA6), o2(0xC5,0xAA),
-     o2(0xB3,0xA7), o2(0xB9,0xC4), o2(0xE2,0xA7), o2(0xE2,0xA8),
-     o2(0xE2,0xA9), o2(0xBB,0xA9), o2(0xE2,0xAB), o2(0xE2,0xAA),
-     o2(0xE2,0xAC), o2(0xE2,0xAD), o2(0xFB,0xB8), o2(0xFB,0xB6),
-     o2(0xFB,0xB7), o2(0xFB,0xB9), o2(0xC8,0xE9), o2(0xE2,0xAE),
-     o2(0xE2,0xAF), o2(0xF3,0xE9), o2(0xE2,0xB0), o2(0xE2,0xB1),
-     o2(0xE2,0xB2), o2(0xBB,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9A = {
-    to_SHIFT_JIS_E7_9A_offsets,
-    to_EUC_JP_E7_9A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9B_infos[26] = {
-     o2(0xE2,0xB3), o2(0xC7,0xD6), o2(0xCB,0xDF), o2(0xB1,0xCE),
-     o2(0xB1,0xD7), o2(0xE2,0xB4), o2(0xE2,0xB6), o2(0xE2,0xB5),
-     o2(0xC5,0xF0), o2(0xC0,0xB9), o2(0xDD,0xB9), o2(0xE2,0xB7),
-     o2(0xCC,0xC1), o2(0xE2,0xB8), o2(0xB4,0xC6), o2(0xC8,0xD7),
-     o2(0xE2,0xB9), o2(0xE2,0xBA), o2(0xE2,0xBB), o2(0xCC,0xDC),
-     o2(0xCC,0xD5), o2(0xC4,0xBE), o2(0xC1,0xEA), o2(0xE2,0xBD),
-     o2(0xBD,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9B = {
-    to_SHIFT_JIS_E7_9B_offsets,
-    to_EUC_JP_E7_9B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9C_infos[20] = {
-     o2(0xBE,0xCA), o2(0xE2,0xC0), o2(0xE2,0xBF), o2(0xE2,0xBE),
-     o2(0xC8,0xFD), o2(0xB4,0xC7), o2(0xB8,0xA9), o2(0xE2,0xC6),
-     o2(0xE2,0xC3), o2(0xBF,0xBF), o2(0xCC,0xB2), o2(0xE2,0xC2),
-     o2(0xE2,0xC4), o2(0xE2,0xC5), o2(0xE2,0xC1), o2(0xE2,0xC7),
-     o2(0xE2,0xC8), o2(0xC4,0xAF), o2(0xB4,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9C = {
-    to_SHIFT_JIS_E7_9C_offsets,
-    to_EUC_JP_E7_9C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9D_infos[15] = {
-     o2(0xC3,0xE5), o2(0xFB,0xBB), o2(0xE2,0xC9), o2(0xE2,0xCA),
-     o2(0xE2,0xCD), o2(0xBF,0xE7), o2(0xC6,0xC4), o2(0xE2,0xCE),
-     o2(0xCB,0xD3), o2(0xE2,0xCB), o2(0xE2,0xCC), o2(0xE2,0xD1),
-     o2(0xE2,0xD0), o2(0xE2,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9D = {
-    to_SHIFT_JIS_E7_9D_offsets,
-    to_EUC_JP_E7_9D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9E_infos[17] = {
-     o2(0xE2,0xD3), o2(0xE2,0xD2), o2(0xE2,0xD4), o2(0xE2,0xD6),
-     o2(0xE2,0xD5), o2(0xCA,0xCD), o2(0xBD,0xD6), o2(0xCE,0xC6),
-     o2(0xE2,0xD7), o2(0xC6,0xB7), o2(0xE2,0xD8), o2(0xE2,0xD9),
-     o2(0xE2,0xDD), o2(0xE2,0xDB), o2(0xE2,0xDC), o2(0xE2,0xDA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9E = {
-    to_SHIFT_JIS_E7_9E_offsets,
-    to_EUC_JP_E7_9E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_9F_infos[17] = {
-     o2(0xE2,0xDE), o2(0xE2,0xDF), o2(0xE2,0xE0), o2(0xE2,0xE1),
-     o2(0xCC,0xB7), o2(0xE2,0xE2), o2(0xCC,0xF0), o2(0xE2,0xE3),
-     o2(0xC3,0xCE), o2(0xC7,0xEA), o2(0xB6,0xEB), o2(0xC3,0xBB),
-     o2(0xE2,0xE4), o2(0xB6,0xBA), o2(0xC0,0xD0), o2(0xE2,0xE5),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_9F = {
-    to_SHIFT_JIS_E7_9F_offsets,
-    to_EUC_JP_E7_9F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A0_infos[15] = {
-     o2(0xBA,0xBD), o2(0xE2,0xE6), o2(0xE2,0xE7), o2(0xB8,0xA6),
-     o2(0xBA,0xD5), o2(0xE2,0xE9), o2(0xFB,0xBD), o2(0xC5,0xD6),
-     o2(0xBA,0xD6), o2(0xB5,0xCE), o2(0xCB,0xA4), o2(0xC7,0xCB),
-     o2(0xC5,0xD7), o2(0xB9,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A0 = {
-    to_SHIFT_JIS_E7_A0_offsets,
-    to_EUC_JP_E7_A0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A1_infos[12] = {
-     o2(0xE2,0xEB), o2(0xFB,0xBE), o2(0xBE,0xCB), o2(0xFB,0xBF),
-     o2(0xCE,0xB2), o2(0xB9,0xC5), o2(0xB8,0xA7), o2(0xC8,0xA3),
-     o2(0xE2,0xED), o2(0xFB,0xC0), o2(0xE2,0xEF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A1 = {
-    to_SHIFT_JIS_E7_A1_offsets,
-    to_EUC_JP_E7_A1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A2_infos[21] = {
-     o2(0xB8,0xEB), o2(0xE2,0xEE), o2(0xC4,0xF6), o2(0xE2,0xF1),
-     o2(0xB3,0xB7), o2(0xE2,0xEC), o2(0xC8,0xEA), o2(0xB1,0xB0),
-     o2(0xBA,0xEC), o2(0xCF,0xD2), o2(0xE2,0xF0), o2(0xE2,0xF2),
-     o2(0xCA,0xCB), o2(0xC0,0xD9), o2(0xE2,0xF4), o2(0xE2,0xF5),
-     o2(0xE2,0xF3), o2(0xB3,0xCE), o2(0xE2,0xFB), o2(0xE2,0xFA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A2 = {
-    to_SHIFT_JIS_E7_A2_offsets,
-    to_EUC_JP_E7_A2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A3_infos[16] = {
-     o2(0xBC,0xA7), o2(0xE2,0xFC), o2(0xE2,0xF7), o2(0xE2,0xFD),
-     o2(0xE2,0xF8), o2(0xC8,0xD8), o2(0xE2,0xF6), o2(0xE2,0xF9),
-     o2(0xE3,0xA2), o2(0xE3,0xA1), o2(0xCB,0xE1), o2(0xE2,0xFE),
-     o2(0xB0,0xEB), o2(0xE3,0xA4), o2(0xE3,0xA3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A3 = {
-    to_SHIFT_JIS_E7_A3_offsets,
-    to_EUC_JP_E7_A3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A4_infos[15] = {
-     o2(0xBE,0xCC), o2(0xE3,0xA5), o2(0xC1,0xC3), o2(0xE3,0xA7),
-     o2(0xE3,0xA6), o2(0xE3,0xA8), o2(0xE2,0xE8), o2(0xE2,0xEA),
-     o2(0xE3,0xAA), o2(0xE3,0xA9), o2(0xFB,0xC1), o2(0xBC,0xA8),
-     o2(0xCE,0xE9), o2(0xBC,0xD2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A4 = {
-    to_SHIFT_JIS_E7_A4_offsets,
-    to_EUC_JP_E7_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A5_infos[23] = {
-     o2(0xE3,0xAB), o2(0xB7,0xB7), o2(0xB5,0xC0), o2(0xB5,0xA7),
-     o2(0xBB,0xE3), o2(0xCD,0xB4), o2(0xE3,0xB1), o2(0xE3,0xB0),
-     o2(0xC1,0xC4), o2(0xE3,0xAD), o2(0xE3,0xAF), o2(0xBD,0xCB),
-     o2(0xBF,0xC0), o2(0xE3,0xAE), o2(0xE3,0xAC), o2(0xC7,0xAA),
-     o2(0xBE,0xCD), o2(0xC9,0xBC), o2(0xBA,0xD7), o2(0xC5,0xF8),
-     o2(0xE3,0xB2), o2(0xE3,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A5 = {
-    to_SHIFT_JIS_E7_A5_offsets,
-    to_EUC_JP_E7_A5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A6_infos[23] = {
-     o2(0xE3,0xC9), o2(0xB6,0xD8), o2(0xCF,0xBD), o2(0xC1,0xB5),
-     o2(0xE3,0xB4), o2(0xB2,0xD2), o2(0xC4,0xF7), o2(0xCA,0xA1),
-     o2(0xFB,0xC5), o2(0xFB,0xC7), o2(0xE3,0xB5), o2(0xB5,0xFA),
-     o2(0xE3,0xB6), o2(0xE3,0xB8), o2(0xE3,0xB9), o2(0xC7,0xA9),
-     o2(0xE3,0xBA), o2(0xE3,0xBB), o2(0xE3,0xBC), o2(0xB6,0xD9),
-     o2(0xB2,0xD3), o2(0xC6,0xC5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A6 = {
-    to_SHIFT_JIS_E7_A6_offsets,
-    to_EUC_JP_E7_A6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A7_infos[19] = {
-     o2(0xBD,0xA8), o2(0xBB,0xE4), o2(0xE3,0xBD), o2(0xBD,0xA9),
-     o2(0xB2,0xCA), o2(0xC9,0xC3), o2(0xE3,0xBE), o2(0xC8,0xEB),
-     o2(0xC1,0xC5), o2(0xE3,0xC1), o2(0xE3,0xC2), o2(0xC7,0xE9),
-     o2(0xBF,0xC1), o2(0xE3,0xBF), o2(0xC3,0xE1), o2(0xE3,0xC0),
-     o2(0xBE,0xCE), o2(0xB0,0xDC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A7 = {
-    to_SHIFT_JIS_E7_A7_offsets,
-    to_EUC_JP_E7_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A8_infos[23] = {
-     o2(0xB5,0xA9), o2(0xE3,0xC3), o2(0xC4,0xF8), o2(0xE3,0xC4),
-     o2(0xC0,0xC7), o2(0xCC,0xAD), o2(0xC9,0xA3), o2(0xE3,0xC5),
-     o2(0xE3,0xC6), o2(0xC3,0xD5), o2(0xCE,0xC7), o2(0xE3,0xC8),
-     o2(0xE3,0xC7), o2(0xBC,0xEF), o2(0xE3,0xCA), o2(0xB0,0xF0),
-     o2(0xE3,0xCD), o2(0xE3,0xCB), o2(0xB2,0xD4), o2(0xB7,0xCE),
-     o2(0xE3,0xCC), o2(0xB9,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A8 = {
-    to_SHIFT_JIS_E7_A8_offsets,
-    to_EUC_JP_E7_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_A9_infos[23] = {
-     o2(0xB9,0xF2), o2(0xCA,0xE6), o2(0xE3,0xCE), o2(0xCB,0xD4),
-     o2(0xE3,0xD0), o2(0xC0,0xD1), o2(0xB1,0xCF), o2(0xB2,0xBA),
-     o2(0xB0,0xAC), o2(0xE3,0xCF), o2(0xE3,0xD1), o2(0xE3,0xD2),
-     o2(0xBE,0xF7), o2(0xE3,0xD3), o2(0xB3,0xCF), o2(0xE3,0xD5),
-     o2(0xB7,0xEA), o2(0xB5,0xE6), o2(0xE3,0xD6), o2(0xB6,0xF5),
-     o2(0xE3,0xD7), o2(0xC0,0xFC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_A9 = {
-    to_SHIFT_JIS_E7_A9_offsets,
-    to_EUC_JP_E7_A9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AA_infos[20] = {
-     o2(0xC6,0xCD), o2(0xC0,0xE0), o2(0xBA,0xF5), o2(0xE3,0xD8),
-     o2(0xC3,0xE2), o2(0xC1,0xEB), o2(0xE3,0xDA), o2(0xE3,0xDC),
-     o2(0xE3,0xD9), o2(0xE3,0xDB), o2(0xB7,0xA2), o2(0xE3,0xDD),
-     o2(0xB7,0xA6), o2(0xB5,0xE7), o2(0xCD,0xD2), o2(0xE3,0xDF),
-     o2(0xE3,0xE0), o2(0xB1,0xAE), o2(0xE3,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AA = {
-    to_SHIFT_JIS_E7_AA_offsets,
-    to_EUC_JP_E7_AA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AB_infos[36] = {
-     o2(0xB3,0xF6), o2(0xE3,0xE2), o2(0xE3,0xE1), o2(0xE3,0xE5),
-     o2(0xE3,0xDE), o2(0xE3,0xE6), o2(0xCE,0xA9), o2(0xE3,0xE7),
-     o2(0xE3,0xE8), o2(0xFB,0xC8), o2(0xD4,0xF4), o2(0xE3,0xEA),
-     o2(0xE3,0xE9), o2(0xE3,0xEB), o2(0xE3,0xEC), o2(0xCE,0xB5),
-     o2(0xE3,0xED), o2(0xF0,0xEF), o2(0xBE,0xCF), o2(0xE3,0xEE),
-     o2(0xE3,0xEF), o2(0xBD,0xD7), o2(0xC6,0xB8), o2(0xE3,0xF0),
-     o2(0xFB,0xC9), o2(0xC3,0xA8), o2(0xFB,0xCB), o2(0xE3,0xF1),
-     o2(0xC3,0xBC), o2(0xE3,0xF2), o2(0xB6,0xA5), o2(0xD1,0xBF),
-     o2(0xC3,0xDD), o2(0xBC,0xB3), o2(0xB4,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AB = {
-    to_SHIFT_JIS_E7_AB_offsets,
-    to_EUC_JP_E7_AB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AC_infos[22] = {
-     o2(0xE3,0xF3), o2(0xE4,0xA2), o2(0xE3,0xF6), o2(0xB5,0xE8),
-     o2(0xE3,0xF5), o2(0xE4,0xA4), o2(0xE3,0xF4), o2(0xBE,0xD0),
-     o2(0xE3,0xF8), o2(0xE3,0xF9), o2(0xC5,0xAB), o2(0xE3,0xFA),
-     o2(0xB3,0xDE), o2(0xBF,0xDA), o2(0xC9,0xE4), o2(0xE3,0xFC),
-     o2(0xC2,0xE8), o2(0xE3,0xF7), o2(0xE3,0xFB), o2(0xE3,0xFD),
-     o2(0xBA,0xFB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AC = {
-    to_SHIFT_JIS_E7_AC_offsets,
-    to_EUC_JP_E7_AC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AD_infos[24] = {
-     o2(0xE4,0xA6), o2(0xC9,0xAE), o2(0xC8,0xA6), o2(0xC5,0xF9),
-     o2(0xB6,0xDA), o2(0xE4,0xA5), o2(0xE4,0xA3), o2(0xC8,0xB5),
-     o2(0xE3,0xFE), o2(0xC3,0xDE), o2(0xC5,0xFB), o2(0xC5,0xFA),
-     o2(0xBA,0xF6), o2(0xE4,0xB8), o2(0xE4,0xA8), o2(0xE4,0xAA),
-     o2(0xE4,0xAD), o2(0xE4,0xAE), o2(0xE4,0xAB), o2(0xE4,0xAC),
-     o2(0xE4,0xA9), o2(0xE4,0xA7), o2(0xE4,0xA1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AD = {
-    to_SHIFT_JIS_E7_AD_offsets,
-    to_EUC_JP_E7_AD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AE_infos[23] = {
-     o2(0xCA,0xCF), o2(0xB2,0xD5), o2(0xE4,0xB5), o2(0xE4,0xB2),
-     o2(0xE4,0xB7), o2(0xE4,0xB6), o2(0xC7,0xF3), o2(0xCC,0xA7),
-     o2(0xBB,0xBB), o2(0xE4,0xB0), o2(0xE4,0xB9), o2(0xE4,0xB4),
-     o2(0xE4,0xB3), o2(0xE4,0xAF), o2(0xFB,0xCC), o2(0xE4,0xB1),
-     o2(0xB4,0xC9), o2(0xC3,0xBD), o2(0xC0,0xFD), o2(0xC8,0xA2),
-     o2(0xE4,0xBE), o2(0xC8,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AE = {
-    to_SHIFT_JIS_E7_AE_offsets,
-    to_EUC_JP_E7_AE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_AF_infos[20] = {
-     o2(0xC0,0xE1), o2(0xE4,0xBB), o2(0xC8,0xCF), o2(0xE4,0xBF),
-     o2(0xCA,0xD3), o2(0xC3,0xDB), o2(0xE4,0xBA), o2(0xE4,0xBC),
-     o2(0xE4,0xBD), o2(0xE4,0xC0), o2(0xBC,0xC4), o2(0xC6,0xC6),
-     o2(0xE4,0xC5), o2(0xE4,0xC4), o2(0xE4,0xC1), o2(0xCF,0xB6),
-     o2(0xE4,0xCA), o2(0xE4,0xCE), o2(0xE4,0xCB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_AF = {
-    to_SHIFT_JIS_E7_AF_offsets,
-    to_EUC_JP_E7_AF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B0_infos[20] = {
-     o2(0xE4,0xC7), o2(0xE4,0xC8), o2(0xE4,0xCD), o2(0xE4,0xC2),
-     o2(0xD2,0xD5), o2(0xE4,0xC9), o2(0xE4,0xC3), o2(0xE4,0xCC),
-     o2(0xE4,0xD2), o2(0xB4,0xCA), o2(0xE4,0xCF), o2(0xE4,0xD0),
-     o2(0xE4,0xD1), o2(0xE4,0xD4), o2(0xE4,0xD3), o2(0xC8,0xF6),
-     o2(0xE4,0xD5), o2(0xCE,0xFC), o2(0xCA,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B0 = {
-    to_SHIFT_JIS_E7_B0_offsets,
-    to_EUC_JP_E7_B0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B1_infos[18] = {
-     o2(0xE4,0xDA), o2(0xE4,0xD7), o2(0xE4,0xD6), o2(0xC0,0xD2),
-     o2(0xE4,0xD9), o2(0xE4,0xDB), o2(0xE4,0xD8), o2(0xE4,0xDF),
-     o2(0xE4,0xDC), o2(0xE4,0xDD), o2(0xE4,0xC6), o2(0xE4,0xDE),
-     o2(0xE4,0xE0), o2(0xE4,0xE1), o2(0xCA,0xC6), o2(0xE4,0xE2),
-     o2(0xCC,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B1 = {
-    to_SHIFT_JIS_E7_B1_offsets,
-    to_EUC_JP_E7_B1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B2_infos[29] = {
-     o2(0xB6,0xCE), o2(0xB7,0xA9), o2(0xE4,0xE3), o2(0xCA,0xB4),
-     o2(0xBF,0xE8), o2(0xCC,0xB0), o2(0xE4,0xE4), o2(0xCE,0xB3),
-     o2(0xC7,0xF4), o2(0xC1,0xC6), o2(0xC7,0xB4), o2(0xBD,0xCD),
-     o2(0xB0,0xC0), o2(0xE4,0xE9), o2(0xE4,0xE7), o2(0xE4,0xE5),
-     o2(0xB4,0xA1), o2(0xBE,0xD1), o2(0xE4,0xEA), o2(0xE4,0xE8),
-     o2(0xE4,0xE6), o2(0xE4,0xEE), o2(0xE4,0xED), o2(0xE4,0xEC),
-     o2(0xE4,0xEB), o2(0xE4,0xEF), o2(0xE4,0xF0), o2(0xC0,0xBA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B2 = {
-    to_SHIFT_JIS_E7_B2_offsets,
-    to_EUC_JP_E7_B2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B3_infos[23] = {
-     o2(0xE4,0xF1), o2(0xE4,0xF3), o2(0xE4,0xF2), o2(0xB8,0xD2),
-     o2(0xC1,0xB8), o2(0xE4,0xF5), o2(0xC5,0xFC), o2(0xE4,0xF4),
-     o2(0xE4,0xF6), o2(0xCA,0xB5), o2(0xC1,0xEC), o2(0xB9,0xC7),
-     o2(0xE4,0xF7), o2(0xCE,0xC8), o2(0xE4,0xF9), o2(0xE4,0xFA),
-     o2(0xE4,0xFB), o2(0xE4,0xFC), o2(0xBB,0xE5), o2(0xE4,0xFD),
-     o2(0xB7,0xCF), o2(0xB5,0xEA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B3 = {
-    to_SHIFT_JIS_E7_B3_offsets,
-    to_EUC_JP_E7_B3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B4_infos[32] = {
-     o2(0xB5,0xAA), o2(0xE5,0xA1), o2(0xCC,0xF3), o2(0xB9,0xC8),
-     o2(0xE4,0xFE), o2(0xE5,0xA4), o2(0xCC,0xE6), o2(0xC7,0xBC),
-     o2(0xC9,0xB3), o2(0xBD,0xE3), o2(0xE5,0xA3), o2(0xBC,0xD3),
-     o2(0xB9,0xC9), o2(0xBB,0xE6), o2(0xB5,0xE9), o2(0xCA,0xB6),
-     o2(0xE5,0xA2), o2(0xC1,0xC7), o2(0xCB,0xC2), o2(0xBA,0xF7),
-     o2(0xBB,0xE7), o2(0xC4,0xDD), o2(0xE5,0xA7), o2(0xCE,0xDF),
-     o2(0xBA,0xD9), o2(0xE5,0xA8), o2(0xBF,0xC2), o2(0xE5,0xAA),
-     o2(0xBE,0xD2), o2(0xBA,0xB0), o2(0xE5,0xA9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B4 = {
-    to_SHIFT_JIS_E7_B4_offsets,
-    to_EUC_JP_E7_B4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B5_infos[29] = {
-     o2(0xBD,0xAA), o2(0xB8,0xBE), o2(0xC1,0xC8), o2(0xE5,0xA5),
-     o2(0xE5,0xAB), o2(0xFB,0xCE), o2(0xE5,0xA6), o2(0xB7,0xD0),
-     o2(0xE5,0xAE), o2(0xE5,0xB2), o2(0xB7,0xEB), o2(0xE5,0xAD),
-     o2(0xE5,0xB6), o2(0xFB,0xCF), o2(0xB9,0xCA), o2(0xCD,0xED),
-     o2(0xB0,0xBC), o2(0xE5,0xB3), o2(0xB5,0xEB), o2(0xE5,0xB0),
-     o2(0xE5,0xB1), o2(0xC5,0xFD), o2(0xE5,0xAF), o2(0xE5,0xAC),
-     o2(0xB3,0xA8), o2(0xC0,0xE4), o2(0xB8,0xA8), o2(0xE5,0xB8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B5 = {
-    to_SHIFT_JIS_E7_B5_offsets,
-    to_EUC_JP_E7_B5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B6_infos[29] = {
-     o2(0xE5,0xB5), o2(0xE5,0xB7), o2(0xE5,0xB4), o2(0xB7,0xD1),
-     o2(0xC2,0xB3), o2(0xE5,0xB9), o2(0xC1,0xEE), o2(0xE5,0xC6),
-     o2(0xFB,0xD1), o2(0xE5,0xC2), o2(0xE5,0xBC), o2(0xE5,0xC0),
-     o2(0xBC,0xFA), o2(0xB0,0xDD), o2(0xE5,0xBB), o2(0xE5,0xC3),
-     o2(0xE5,0xC7), o2(0xB9,0xCB), o2(0xCC,0xD6), o2(0xC4,0xD6),
-     o2(0xE5,0xBD), o2(0xFB,0xD0), o2(0xE5,0xC5), o2(0xE5,0xBA),
-     o2(0xC3,0xBE), o2(0xE5,0xBF), o2(0xB0,0xBD), o2(0xCC,0xCA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B6 = {
-    to_SHIFT_JIS_E7_B6_offsets,
-    to_EUC_JP_E7_B6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B7_infos[24] = {
-     o2(0xE5,0xBE), o2(0xB6,0xDB), o2(0xC8,0xEC), o2(0xC1,0xED),
-     o2(0xCE,0xD0), o2(0xBD,0xEF), o2(0xE5,0xEE), o2(0xFB,0xD2),
-     o2(0xE5,0xC8), o2(0xC0,0xFE), o2(0xE5,0xC4), o2(0xE5,0xC9),
-     o2(0xE5,0xCB), o2(0xC4,0xF9), o2(0xE5,0xCE), o2(0xE5,0xCA),
-     o2(0xCA,0xD4), o2(0xB4,0xCB), o2(0xCC,0xCB), o2(0xB0,0xDE),
-     o2(0xE5,0xCD), o2(0xCE,0xFD), o2(0xE5,0xCC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B7 = {
-    to_SHIFT_JIS_E7_B7_offsets,
-    to_EUC_JP_E7_B7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B8_infos[26] = {
-     o2(0xB1,0xEF), o2(0xC6,0xEC), o2(0xE5,0xCF), o2(0xE5,0xD6),
-     o2(0xE5,0xD0), o2(0xE5,0xD7), o2(0xE5,0xD3), o2(0xC7,0xFB),
-     o2(0xBC,0xCA), o2(0xE5,0xD5), o2(0xE5,0xD2), o2(0xE5,0xD8),
-     o2(0xE5,0xD1), o2(0xBD,0xC4), o2(0xCB,0xA5), o2(0xBD,0xCC),
-     o2(0xE5,0xD4), o2(0xE5,0xE0), o2(0xE5,0xDC), o2(0xE5,0xDF),
-     o2(0xE5,0xDD), o2(0xE5,0xE1), o2(0xE5,0xDB), o2(0xE5,0xC1),
-     o2(0xC0,0xD3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B8 = {
-    to_SHIFT_JIS_E7_B8_offsets,
-    to_EUC_JP_E7_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_B9_infos[26] = {
-     o2(0xC8,0xCB), o2(0xE5,0xDE), o2(0xE5,0xD9), o2(0xC1,0xA1),
-     o2(0xB7,0xD2), o2(0xBD,0xAB), o2(0xFB,0xD3), o2(0xBF,0xA5),
-     o2(0xC1,0xB6), o2(0xE5,0xE4), o2(0xE5,0xE6), o2(0xE5,0xE7),
-     o2(0xE5,0xE3), o2(0xE5,0xE5), o2(0xE5,0xDA), o2(0xE5,0xE2),
-     o2(0xE5,0xEA), o2(0xE5,0xE9), o2(0xCB,0xFA), o2(0xB7,0xAB),
-     o2(0xE5,0xE8), o2(0xE5,0xEC), o2(0xE5,0xEB), o2(0xE5,0xEF),
-     o2(0xE5,0xF1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_B9 = {
-    to_SHIFT_JIS_E7_B9_offsets,
-    to_EUC_JP_E7_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_BA_infos[16] = {
-     o2(0xBB,0xBC), o2(0xE5,0xED), o2(0xE5,0xF2), o2(0xE5,0xF3),
-     o2(0xF9,0xA1), o2(0xE5,0xF4), o2(0xE5,0xFA), o2(0xC5,0xBB),
-     o2(0xE5,0xF6), o2(0xE5,0xF5), o2(0xE5,0xF7), o2(0xE5,0xF8),
-     o2(0xE5,0xF9), o2(0xE5,0xFB), o2(0xE5,0xFC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_BA = {
-    to_SHIFT_JIS_E7_BA_offsets,
-    to_EUC_JP_E7_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_BC_infos[4] = {
-     o2(0xB4,0xCC), o2(0xE5,0xFD), o2(0xE5,0xFE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_BC = {
-    to_SHIFT_JIS_E7_BC_offsets,
-    to_EUC_JP_E7_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_BD_infos[25] = {
-     o2(0xE6,0xA1), o2(0xFB,0xD4), o2(0xE6,0xA2), o2(0xE6,0xA3),
-     o2(0xE6,0xA4), o2(0xE6,0xA5), o2(0xE6,0xA6), o2(0xE6,0xA8),
-     o2(0xE6,0xA7), o2(0xE6,0xA9), o2(0xE6,0xAA), o2(0xE6,0xAB),
-     o2(0xE6,0xAE), o2(0xE6,0xAC), o2(0xE6,0xAD), o2(0xBA,0xE1),
-     o2(0xB7,0xD3), o2(0xC3,0xD6), o2(0xC8,0xB3), o2(0xBD,0xF0),
-     o2(0xC7,0xCD), o2(0xC8,0xED), o2(0xE6,0xAF), o2(0xD8,0xED),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_BD = {
-    to_SHIFT_JIS_E7_BD_offsets,
-    to_EUC_JP_E7_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_BE_infos[26] = {
-     o2(0xE6,0xB0), o2(0xE6,0xB2), o2(0xCD,0xE5), o2(0xE6,0xB1),
-     o2(0xE6,0xB4), o2(0xE6,0xB3), o2(0xCD,0xD3), o2(0xE6,0xB5),
-     o2(0xC8,0xFE), o2(0xE6,0xB6), o2(0xE6,0xB9), o2(0xE6,0xB8),
-     o2(0xE6,0xB7), o2(0xFB,0xD5), o2(0xE6,0xBA), o2(0xB7,0xB2),
-     o2(0xC1,0xA2), o2(0xB5,0xC1), o2(0xE6,0xBE), o2(0xE6,0xBB),
-     o2(0xE6,0xBC), o2(0xE6,0xBF), o2(0xE6,0xC0), o2(0xE6,0xBD),
-     o2(0xB1,0xA9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_BE = {
-    to_SHIFT_JIS_E7_BE_offsets,
-    to_EUC_JP_E7_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_BF_infos[19] = {
-     o2(0xB2,0xA7), o2(0xE6,0xC2), o2(0xE6,0xC3), o2(0xE6,0xC4),
-     o2(0xCD,0xE2), o2(0xBD,0xAC), o2(0xE6,0xC6), o2(0xE6,0xC5),
-     o2(0xBF,0xE9), o2(0xE6,0xC7), o2(0xE6,0xC8), o2(0xE6,0xC9),
-     o2(0xB4,0xE5), o2(0xB4,0xCD), o2(0xE6,0xCA), o2(0xE6,0xCB),
-     o2(0xCB,0xDD), o2(0xCD,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7_BF = {
-    to_SHIFT_JIS_E7_BF_offsets,
-    to_EUC_JP_E7_BF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E7_infos[64] = {
-     &to_EUC_JP_E7_80, &to_EUC_JP_E7_81, &to_EUC_JP_E7_82, &to_EUC_JP_E7_83,
-     &to_EUC_JP_E7_84, &to_EUC_JP_E7_85, &to_EUC_JP_E7_86, &to_EUC_JP_E7_87,
-     &to_EUC_JP_E7_88, &to_EUC_JP_E7_89, &to_EUC_JP_E7_8A, &to_EUC_JP_E7_8B,
-     &to_EUC_JP_E7_8C, &to_EUC_JP_E7_8D, &to_EUC_JP_E7_8E, &to_EUC_JP_E7_8F,
-     &to_EUC_JP_E7_90, &to_EUC_JP_E7_91, &to_EUC_JP_E7_92, &to_EUC_JP_E7_93,
-     &to_EUC_JP_E7_94, &to_EUC_JP_E7_95, &to_EUC_JP_E7_96, &to_EUC_JP_E7_97,
-     &to_EUC_JP_E7_98, &to_EUC_JP_E7_99, &to_EUC_JP_E7_9A, &to_EUC_JP_E7_9B,
-     &to_EUC_JP_E7_9C, &to_EUC_JP_E7_9D, &to_EUC_JP_E7_9E, &to_EUC_JP_E7_9F,
-     &to_EUC_JP_E7_A0, &to_EUC_JP_E7_A1, &to_EUC_JP_E7_A2, &to_EUC_JP_E7_A3,
-     &to_EUC_JP_E7_A4, &to_EUC_JP_E7_A5, &to_EUC_JP_E7_A6, &to_EUC_JP_E7_A7,
-     &to_EUC_JP_E7_A8, &to_EUC_JP_E7_A9, &to_EUC_JP_E7_AA, &to_EUC_JP_E7_AB,
-     &to_EUC_JP_E7_AC, &to_EUC_JP_E7_AD, &to_EUC_JP_E7_AE, &to_EUC_JP_E7_AF,
-     &to_EUC_JP_E7_B0, &to_EUC_JP_E7_B1, &to_EUC_JP_E7_B2, &to_EUC_JP_E7_B3,
-     &to_EUC_JP_E7_B4, &to_EUC_JP_E7_B5, &to_EUC_JP_E7_B6, &to_EUC_JP_E7_B7,
-     &to_EUC_JP_E7_B8, &to_EUC_JP_E7_B9, &to_EUC_JP_E7_BA, &to_EUC_JP_E7_BC,
-     &to_EUC_JP_E7_BD, &to_EUC_JP_E7_BE, &to_EUC_JP_E7_BF,            UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E7 = {
-    to_SHIFT_JIS_E7_offsets,
-    to_EUC_JP_E7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_80_infos[23] = {
-     o2(0xCD,0xD4), o2(0xCF,0xB7), o2(0xB9,0xCD), o2(0xE6,0xCE),
-     o2(0xBC,0xD4), o2(0xE6,0xCD), o2(0xE6,0xCF), o2(0xBC,0xA9),
-     o2(0xC2,0xD1), o2(0xE6,0xD0), o2(0xB9,0xCC), o2(0xCC,0xD7),
-     o2(0xE6,0xD1), o2(0xE6,0xD2), o2(0xE6,0xD3), o2(0xE6,0xD4),
-     o2(0xE6,0xD5), o2(0xBC,0xAA), o2(0xCC,0xED), o2(0xE6,0xD7),
-     o2(0xC3,0xBF), o2(0xE6,0xD6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_80 = {
-    to_SHIFT_JIS_E8_80_offsets,
-    to_EUC_JP_E8_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_81_infos[23] = {
-     o2(0xE6,0xD9), o2(0xE6,0xD8), o2(0xE6,0xDA), o2(0xC0,0xBB),
-     o2(0xE6,0xDB), o2(0xE6,0xDC), o2(0xCA,0xB9), o2(0xE6,0xDD),
-     o2(0xC1,0xEF), o2(0xE6,0xDE), o2(0xE6,0xDF), o2(0xCE,0xFE),
-     o2(0xE6,0xE2), o2(0xE6,0xE1), o2(0xE6,0xE0), o2(0xC4,0xB0),
-     o2(0xE6,0xE3), o2(0xBF,0xA6), o2(0xE6,0xE4), o2(0xE6,0xE5),
-     o2(0xCF,0xB8), o2(0xE6,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_81 = {
-    to_SHIFT_JIS_E8_81_offsets,
-    to_EUC_JP_E8_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_82_infos[26] = {
-     o2(0xE6,0xE7), o2(0xE6,0xE9), o2(0xE6,0xE8), o2(0xC8,0xA5),
-     o2(0xC6,0xF9), o2(0xCF,0xBE), o2(0xC8,0xA9), o2(0xE6,0xEB),
-     o2(0xBE,0xD3), o2(0xC9,0xAA), o2(0xE6,0xEC), o2(0xE6,0xEA),
-     o2(0xB4,0xCE), o2(0xB8,0xD4), o2(0xBB,0xE8), o2(0xC8,0xEE),
-     o2(0xB8,0xAA), o2(0xCB,0xC3), o2(0xE6,0xEF), o2(0xE6,0xED),
-     o2(0xB9,0xCE), o2(0xB9,0xCF), o2(0xB0,0xE9), o2(0xBA,0xE8),
-     o2(0xC7,0xD9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_82 = {
-    to_SHIFT_JIS_E8_82_offsets,
-    to_EUC_JP_E8_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_83_infos[21] = {
-     o2(0xB0,0xDF), o2(0xE6,0xF4), o2(0xC3,0xC0), o2(0xC7,0xD8),
-     o2(0xC2,0xDB), o2(0xE6,0xF6), o2(0xE6,0xF2), o2(0xE6,0xF5),
-     o2(0xE6,0xF0), o2(0xE6,0xF3), o2(0xCB,0xA6), o2(0xB8,0xD5),
-     o2(0xB0,0xFD), o2(0xE6,0xF1), o2(0xE6,0xF8), o2(0xE6,0xF9),
-     o2(0xC6,0xB9), o2(0xB6,0xBB), o2(0xE7,0xA6), o2(0xC7,0xBD),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_83 = {
-    to_SHIFT_JIS_E8_83_offsets,
-    to_EUC_JP_E8_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_84_infos[17] = {
-     o2(0xBB,0xE9), o2(0xB6,0xBC), o2(0xC0,0xC8), o2(0xCF,0xC6),
-     o2(0xCC,0xAE), o2(0xE6,0xF7), o2(0xC0,0xD4), o2(0xB5,0xD3),
-     o2(0xE6,0xFA), o2(0xE6,0xFC), o2(0xE6,0xFB), o2(0xE6,0xFD),
-     o2(0xC3,0xA6), o2(0xC7,0xBE), o2(0xC4,0xB1), o2(0xE7,0xA3),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_84 = {
-    to_SHIFT_JIS_E8_84_offsets,
-    to_EUC_JP_E8_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_85_infos[21] = {
-     o2(0xE7,0xA2), o2(0xE6,0xFE), o2(0xBF,0xD5), o2(0xC9,0xE5),
-     o2(0xE7,0xA5), o2(0xE7,0xA4), o2(0xB9,0xD0), o2(0xCF,0xD3),
-     o2(0xE7,0xB5), o2(0xE7,0xA9), o2(0xE7,0xAA), o2(0xBC,0xF0),
-     o2(0xE7,0xA8), o2(0xB9,0xF8), o2(0xE7,0xA7), o2(0xE7,0xAB),
-     o2(0xC4,0xB2), o2(0xCA,0xA2), o2(0xC1,0xA3), o2(0xC2,0xDC),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_85 = {
-    to_SHIFT_JIS_E8_85_offsets,
-    to_EUC_JP_E8_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_86_infos[25] = {
-     o2(0xE7,0xAF), o2(0xE7,0xB0), o2(0xE7,0xAC), o2(0xE7,0xAD),
-     o2(0xE7,0xAE), o2(0xB9,0xD1), o2(0xE7,0xB6), o2(0xE7,0xB2),
-     o2(0xC9,0xE6), o2(0xCB,0xEC), o2(0xC9,0xA8), o2(0xE7,0xB1),
-     o2(0xE7,0xB4), o2(0xE7,0xB3), o2(0xCB,0xC4), o2(0xE7,0xB7),
-     o2(0xE7,0xB8), o2(0xC1,0xB7), o2(0xE7,0xB9), o2(0xE7,0xBB),
-     o2(0xE7,0xBF), o2(0xE7,0xBC), o2(0xE7,0xBA), o2(0xC7,0xBF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_86 = {
-    to_SHIFT_JIS_E8_86_offsets,
-    to_EUC_JP_E8_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_87_infos[26] = {
-     o2(0xE7,0xBD), o2(0xE7,0xBE), o2(0xB2,0xB2), o2(0xE7,0xC5),
-     o2(0xE7,0xC0), o2(0xE7,0xC1), o2(0xE7,0xC2), o2(0xC2,0xA1),
-     o2(0xE7,0xC4), o2(0xE7,0xC3), o2(0xE7,0xC6), o2(0xE7,0xC7),
-     o2(0xE7,0xC8), o2(0xBF,0xC3), o2(0xB2,0xE9), o2(0xE7,0xC9),
-     o2(0xCE,0xD7), o2(0xBC,0xAB), o2(0xBD,0xAD), o2(0xBB,0xEA),
-     o2(0xC3,0xD7), o2(0xE7,0xCA), o2(0xE7,0xCB), o2(0xB1,0xB1),
-     o2(0xE7,0xCC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_87 = {
-    to_SHIFT_JIS_E8_87_offsets,
-    to_EUC_JP_E8_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_88_infos[31] = {
-     o2(0xE7,0xCD), o2(0xE7,0xCE), o2(0xE7,0xCF), o2(0xE7,0xD0),
-     o2(0xB6,0xBD), o2(0xDA,0xAA), o2(0xE7,0xD1), o2(0xC0,0xE5),
-     o2(0xE7,0xD2), o2(0xBC,0xCB), o2(0xE7,0xD3), o2(0xD0,0xB0),
-     o2(0xE7,0xD4), o2(0xCA,0xDE), o2(0xB4,0xDC), o2(0xC1,0xA4),
-     o2(0xBD,0xD8), o2(0xC9,0xF1), o2(0xBD,0xAE), o2(0xE7,0xD5),
-     o2(0xB9,0xD2), o2(0xE7,0xD6), o2(0xC8,0xCC), o2(0xE7,0xE4),
-     o2(0xE7,0xD8), o2(0xC2,0xC9), o2(0xC7,0xF5), o2(0xB8,0xBF),
-     o2(0xE7,0xD7), o2(0xC1,0xA5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_88 = {
-    to_SHIFT_JIS_E8_88_offsets,
-    to_EUC_JP_E8_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_89_infos[22] = {
-     o2(0xE7,0xD9), o2(0xC4,0xFA), o2(0xE7,0xDB), o2(0xE7,0xDA),
-     o2(0xE7,0xDD), o2(0xE7,0xDC), o2(0xE7,0xDE), o2(0xE7,0xE0),
-     o2(0xE7,0xDF), o2(0xB4,0xCF), o2(0xE7,0xE1), o2(0xE7,0xE2),
-     o2(0xE7,0xE3), o2(0xBA,0xB1), o2(0xCE,0xC9), o2(0xE7,0xE5),
-     o2(0xBF,0xA7), o2(0xB1,0xF0), o2(0xE7,0xE6), o2(0xE7,0xE7),
-     o2(0xE7,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_89 = {
-    to_SHIFT_JIS_E8_89_offsets,
-    to_EUC_JP_E8_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8A_infos[19] = {
-     o2(0xB0,0xF2), o2(0xE7,0xE9), o2(0xE7,0xEA), o2(0xC9,0xE7),
-     o2(0xBC,0xC7), o2(0xE7,0xEC), o2(0xB3,0xA9), o2(0xB0,0xB2),
-     o2(0xE7,0xEB), o2(0xE7,0xEE), o2(0xC7,0xCE), o2(0xBF,0xC4),
-     o2(0xB2,0xD6), o2(0xCB,0xA7), o2(0xB7,0xDD), o2(0xB6,0xDC),
-     o2(0xE7,0xED), o2(0xB2,0xEA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8A = {
-    to_SHIFT_JIS_E8_8A_offsets,
-    to_EUC_JP_E8_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8B_infos[24] = {
-     o2(0xB4,0xA3), o2(0xB1,0xF1), o2(0xE7,0xF2), o2(0xCE,0xEA),
-     o2(0xC2,0xDD), o2(0xC9,0xC4), o2(0xE7,0xFE), o2(0xB2,0xD7),
-     o2(0xE7,0xFC), o2(0xE7,0xFA), o2(0xE7,0xF1), o2(0xE7,0xEF),
-     o2(0xE7,0xF0), o2(0xBC,0xE3), o2(0xB6,0xEC), o2(0xC3,0xF7),
-     o2(0xC6,0xD1), o2(0xB1,0xD1), o2(0xE7,0xF4), o2(0xE7,0xF3),
-     o2(0xE7,0xF9), o2(0xE7,0xF5), o2(0xE7,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8B = {
-    to_SHIFT_JIS_E8_8B_offsets,
-    to_EUC_JP_E8_8B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8C_infos[24] = {
-     o2(0xFB,0xD7), o2(0xCC,0xD0), o2(0xE7,0xF7), o2(0xB2,0xD8),
-     o2(0xB3,0xFD), o2(0xE7,0xFB), o2(0xE7,0xFD), o2(0xB7,0xD4),
-     o2(0xE8,0xA3), o2(0xE8,0xAC), o2(0xE8,0xAD), o2(0xB0,0xAB),
-     o2(0xE8,0xB4), o2(0xB0,0xF1), o2(0xE8,0xAB), o2(0xE8,0xAA),
-     o2(0xE8,0xA5), o2(0xE8,0xA4), o2(0xE8,0xA2), o2(0xE8,0xA1),
-     o2(0xC3,0xE3), o2(0xC2,0xFB), o2(0xE8,0xA7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8C = {
-    to_SHIFT_JIS_E8_8C_offsets,
-    to_EUC_JP_E8_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8D_infos[16] = {
-     o2(0xE8,0xA6), o2(0xE8,0xA9), o2(0xC1,0xF0), o2(0xB7,0xD5),
-     o2(0xB1,0xC1), o2(0xE8,0xA8), o2(0xB9,0xD3), o2(0xC1,0xF1),
-     o2(0xFB,0xD8), o2(0xE8,0xBA), o2(0xE8,0xBB), o2(0xB2,0xD9),
-     o2(0xB2,0xAE), o2(0xE8,0xB8), o2(0xFB,0xD9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8D = {
-    to_SHIFT_JIS_E8_8D_offsets,
-    to_EUC_JP_E8_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8E_infos[19] = {
-     o2(0xE8,0xAE), o2(0xE8,0xB6), o2(0xE8,0xBD), o2(0xE8,0xB7),
-     o2(0xE8,0xB5), o2(0xE7,0xF6), o2(0xE8,0xB3), o2(0xE8,0xAF),
-     o2(0xB4,0xD0), o2(0xE8,0xB1), o2(0xE8,0xBC), o2(0xE8,0xB2),
-     o2(0xE8,0xBE), o2(0xE8,0xB0), o2(0xC7,0xFC), o2(0xCD,0xE9),
-     o2(0xE8,0xB9), o2(0xE8,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8E = {
-    to_SHIFT_JIS_E8_8E_offsets,
-    to_EUC_JP_E8_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_8F_infos[24] = {
-     o2(0xE8,0xC7), o2(0xBF,0xFB), o2(0xFB,0xDA), o2(0xB5,0xC6),
-     o2(0xB6,0xDD), o2(0xE8,0xC2), o2(0xB2,0xDB), o2(0xBE,0xD4),
-     o2(0xE8,0xC5), o2(0xBA,0xDA), o2(0xC5,0xD1), o2(0xE8,0xCA),
-     o2(0xCA,0xEE), o2(0xE8,0xC1), o2(0xB2,0xDA), o2(0xB8,0xD6),
-     o2(0xC9,0xA9), o2(0xE8,0xCB), o2(0xE8,0xBF), o2(0xFB,0xDB),
-     o2(0xE8,0xC8), o2(0xE8,0xD2), o2(0xE8,0xC3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_8F = {
-    to_SHIFT_JIS_E8_8F_offsets,
-    to_EUC_JP_E8_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_90_infos[19] = {
-     o2(0xE8,0xC4), o2(0xC6,0xBA), o2(0xE8,0xC9), o2(0xE8,0xC6),
-     o2(0xCB,0xA8), o2(0xE8,0xCC), o2(0xB0,0xE0), o2(0xE8,0xC0),
-     o2(0xE8,0xCE), o2(0xE8,0xCD), o2(0xC7,0xEB), o2(0xE8,0xD4),
-     o2(0xE8,0xDF), o2(0xB3,0xFE), o2(0xE8,0xE2), o2(0xE8,0xD0),
-     o2(0xE8,0xD5), o2(0xCD,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_90 = {
-    to_SHIFT_JIS_E8_90_offsets,
-    to_EUC_JP_E8_90_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_91_infos[22] = {
-     o2(0xE8,0xDE), o2(0xFB,0xDC), o2(0xCD,0xD5), o2(0xCE,0xAA),
-     o2(0xC3,0xF8), o2(0xB3,0xEB), o2(0xC9,0xF2), o2(0xE8,0xE4),
-     o2(0xC6,0xA1), o2(0xB0,0xB1), o2(0xE8,0xDD), o2(0xE8,0xD9),
-     o2(0xC1,0xF2), o2(0xE8,0xD3), o2(0xE8,0xDB), o2(0xE8,0xE0),
-     o2(0xC7,0xAC), o2(0xB0,0xAA), o2(0xE8,0xD8), o2(0xE8,0xE1),
-     o2(0xC9,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_91 = {
-    to_SHIFT_JIS_E8_91_offsets,
-    to_EUC_JP_E8_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_92_infos[18] = {
-     o2(0xE8,0xDC), o2(0xE8,0xD7), o2(0xBE,0xD5), o2(0xBD,0xAF),
-     o2(0xBC,0xAC), o2(0xCC,0xD8), o2(0xC9,0xC7), o2(0xE8,0xE7),
-     o2(0xE8,0xF0), o2(0xE8,0xDA), o2(0xB3,0xF7), o2(0xFB,0xDD),
-     o2(0xBE,0xF8), o2(0xE8,0xE5), o2(0xE8,0xEA), o2(0xC1,0xF3),
-     o2(0xE8,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_92 = {
-    to_SHIFT_JIS_E8_92_offsets,
-    to_EUC_JP_E8_92_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_93_infos[19] = {
-     o2(0xE8,0xED), o2(0xC3,0xDF), o2(0xE8,0xEE), o2(0xCD,0xD6),
-     o2(0xE8,0xE3), o2(0xB3,0xB8), o2(0xE8,0xE9), o2(0xE8,0xEC),
-     o2(0xCC,0xAC), o2(0xE8,0xEF), o2(0xE8,0xE8), o2(0xE8,0xEB),
-     o2(0xF9,0xA5), o2(0xCB,0xA9), o2(0xCF,0xA1), o2(0xE8,0xF3),
-     o2(0xE8,0xFA), o2(0xE8,0xF2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_93 = {
-    to_SHIFT_JIS_E8_93_offsets,
-    to_EUC_JP_E8_93_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_94_infos[17] = {
-     o2(0xBC,0xC3), o2(0xE8,0xD1), o2(0xCA,0xCE), o2(0xCC,0xA2),
-     o2(0xE8,0xF9), o2(0xE8,0xF8), o2(0xE8,0xF4), o2(0xE8,0xF5),
-     o2(0xB1,0xB6), o2(0xE8,0xF7), o2(0xE8,0xF1), o2(0xC4,0xD5),
-     o2(0xE8,0xF6), o2(0xB0,0xFE), o2(0xC2,0xA2), o2(0xCA,0xC3),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_94 = {
-    to_SHIFT_JIS_E8_94_offsets,
-    to_EUC_JP_E8_94_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_95_infos[23] = {
-     o2(0xE8,0xFB), o2(0xE9,0xA1), o2(0xC8,0xD9), o2(0xE8,0xFE),
-     o2(0xBE,0xD6), o2(0xBC,0xC9), o2(0xE9,0xA3), o2(0xB6,0xBE),
-     o2(0xFB,0xDE), o2(0xE9,0xA4), o2(0xC9,0xF9), o2(0xE8,0xFD),
-     o2(0xFB,0xDF), o2(0xE8,0xD6), o2(0xE8,0xFC), o2(0xCF,0xCF),
-     o2(0xC6,0xA2), o2(0xC9,0xF3), o2(0xFB,0xE0), o2(0xE9,0xAB),
-     o2(0xE9,0xB1), o2(0xE9,0xB2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_95 = {
-    to_SHIFT_JIS_E8_95_offsets,
-    to_EUC_JP_E8_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_96_infos[25] = {
-     o2(0xE9,0xA5), o2(0xC7,0xF6), o2(0xE9,0xAF), o2(0xE9,0xA7),
-     o2(0xE9,0xA9), o2(0xE9,0xB3), o2(0xE9,0xA8), o2(0xE9,0xAC),
-     o2(0xB1,0xF2), o2(0xC6,0xE5), o2(0xE9,0xAD), o2(0xE9,0xB0),
-     o2(0xE9,0xA6), o2(0xC1,0xA6), o2(0xE9,0xAA), o2(0xBB,0xA7),
-     o2(0xBF,0xC5), o2(0xB7,0xB0), o2(0xCC,0xF4), o2(0xCC,0xF9),
-     o2(0xBD,0xF2), o2(0xFB,0xE2), o2(0xE9,0xB7), o2(0xE9,0xB5),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_96 = {
-    to_SHIFT_JIS_E8_96_offsets,
-    to_EUC_JP_E8_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_97_infos[18] = {
-     o2(0xCF,0xCE), o2(0xE9,0xB4), o2(0xCD,0xF5), o2(0xE9,0xB6),
-     o2(0xE9,0xB8), o2(0xE9,0xB9), o2(0xE9,0xBC), o2(0xE9,0xBA),
-     o2(0xC6,0xA3), o2(0xE9,0xBB), o2(0xC8,0xCD), o2(0xE9,0xAE),
-     o2(0xBD,0xF3), o2(0xE9,0xBD), o2(0xE9,0xC2), o2(0xC1,0xF4),
-     o2(0xE9,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_97 = {
-    to_SHIFT_JIS_E8_97_offsets,
-    to_EUC_JP_E8_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_98_infos[15] = {
-     o2(0xE9,0xA2), o2(0xE9,0xC3), o2(0xC1,0xC9), o2(0xE9,0xBE),
-     o2(0xE9,0xC0), o2(0xE9,0xBF), o2(0xDD,0xB1), o2(0xDD,0xA2),
-     o2(0xE9,0xC5), o2(0xE9,0xC4), o2(0xCD,0xF6), o2(0xE2,0xBC),
-     o2(0xE9,0xC6), o2(0xE9,0xC7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_98 = {
-    to_SHIFT_JIS_E8_98_offsets,
-    to_EUC_JP_E8_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_99_infos[15] = {
-     o2(0xE9,0xC8), o2(0xB8,0xD7), o2(0xB5,0xD4), o2(0xE9,0xCA),
-     o2(0xD1,0xDD), o2(0xB5,0xF5), o2(0xCE,0xBA), o2(0xB6,0xF3),
-     o2(0xE9,0xCB), o2(0xE9,0xCC), o2(0xC3,0xEE), o2(0xE9,0xCD),
-     o2(0xC6,0xFA), o2(0xB0,0xBA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_99 = {
-    to_SHIFT_JIS_E8_99_offsets,
-    to_EUC_JP_E8_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9A_infos[14] = {
-     o2(0xB2,0xE3), o2(0xE9,0xD2), o2(0xE9,0xD3), o2(0xE9,0xCE),
-     o2(0xBB,0xBD), o2(0xE9,0xCF), o2(0xC7,0xC2), o2(0xE9,0xD0),
-     o2(0xE9,0xD1), o2(0xE9,0xDB), o2(0xE9,0xD5), o2(0xE9,0xD8),
-     o2(0xE9,0xD4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9A = {
-    to_SHIFT_JIS_E8_9A_offsets,
-    to_EUC_JP_E8_9A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9B_infos[23] = {
-     o2(0xE9,0xD6), o2(0xE9,0xD7), o2(0xBC,0xD8), o2(0xE9,0xD9),
-     o2(0xC3,0xC1), o2(0xB7,0xD6), o2(0xB3,0xC2), o2(0xE9,0xDC),
-     o2(0xB3,0xBF), o2(0xE9,0xE1), o2(0xE9,0xDD), o2(0xE9,0xE0),
-     o2(0xC8,0xBA), o2(0xE9,0xDE), o2(0xE9,0xDF), o2(0xC9,0xC8),
-     o2(0xC8,0xDA), o2(0xE9,0xE2), o2(0xC2,0xFD), o2(0xE9,0xEC),
-     o2(0xE9,0xE8), o2(0xB2,0xEB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9B = {
-    to_SHIFT_JIS_E8_9B_offsets,
-    to_EUC_JP_E8_9B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9C_infos[20] = {
-     o2(0xE9,0xE6), o2(0xCB,0xAA), o2(0xE9,0xE7), o2(0xE9,0xE4),
-     o2(0xE9,0xE5), o2(0xE9,0xEA), o2(0xE9,0xED), o2(0xE9,0xEB),
-     o2(0xE9,0xE9), o2(0xE9,0xE3), o2(0xC3,0xD8), o2(0xE9,0xF4),
-     o2(0xCC,0xAA), o2(0xE9,0xF2), o2(0xE9,0xF3), o2(0xE9,0xEE),
-     o2(0xE9,0xF0), o2(0xE9,0xF1), o2(0xE9,0xEF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9C = {
-    to_SHIFT_JIS_E8_9C_offsets,
-    to_EUC_JP_E8_9C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9D_infos[20] = {
-     o2(0xC0,0xE6), o2(0xCF,0xB9), o2(0xE9,0xF8), o2(0xE9,0xF9),
-     o2(0xEA,0xA1), o2(0xBF,0xAA), o2(0xE9,0xFB), o2(0xE9,0xFE),
-     o2(0xE9,0xF6), o2(0xE9,0xF5), o2(0xEA,0xA2), o2(0xB2,0xDC),
-     o2(0xE9,0xFC), o2(0xEA,0xA3), o2(0xE9,0xFD), o2(0xE9,0xFA),
-     o2(0xC4,0xB3), o2(0xE9,0xF7), o2(0xC7,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9D = {
-    to_SHIFT_JIS_E8_9D_offsets,
-    to_EUC_JP_E8_9D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9E_infos[11] = {
-     o2(0xEA,0xA7), o2(0xCD,0xBB), o2(0xEA,0xA6), o2(0xEA,0xA5),
-     o2(0xEA,0xAE), o2(0xEA,0xA8), o2(0xEA,0xB0), o2(0xCD,0xE6),
-     o2(0xEA,0xB3), o2(0xEA,0xAA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9E = {
-    to_SHIFT_JIS_E8_9E_offsets,
-    to_EUC_JP_E8_9E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_9F_infos[16] = {
-     o2(0xEA,0xAB), o2(0xEA,0xAF), o2(0xEA,0xB2), o2(0xEA,0xB1),
-     o2(0xEA,0xA9), o2(0xEA,0xAC), o2(0xEA,0xBD), o2(0xEA,0xB6),
-     o2(0xEA,0xB4), o2(0xEA,0xB5), o2(0xEA,0xBA), o2(0xEA,0xBB),
-     o2(0xB3,0xAA), o2(0xB5,0xC2), o2(0xEA,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_9F = {
-    to_SHIFT_JIS_E8_9F_offsets,
-    to_EUC_JP_E8_9F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A0_infos[17] = {
-     o2(0xEA,0xA4), o2(0xFB,0xE5), o2(0xEA,0xB8), o2(0xEA,0xBC),
-     o2(0xEA,0xB7), o2(0xEA,0xBE), o2(0xEA,0xC0), o2(0xEA,0xBF),
-     o2(0xEA,0xC2), o2(0xEA,0xC1), o2(0xE9,0xDA), o2(0xEA,0xC6),
-     o2(0xEA,0xC3), o2(0xEA,0xC4), o2(0xEA,0xC5), o2(0xEA,0xC7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A0 = {
-    to_SHIFT_JIS_E8_A0_offsets,
-    to_EUC_JP_E8_A0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A1_infos[26] = {
-     o2(0xB7,0xEC), o2(0xEA,0xC9), o2(0xEA,0xC8), o2(0xBD,0xB0),
-     o2(0xB9,0xD4), o2(0xDE,0xA7), o2(0xEA,0xCA), o2(0xBD,0xD1),
-     o2(0xB3,0xB9), o2(0xEA,0xCB), o2(0xB1,0xD2), o2(0xBE,0xD7),
-     o2(0xEA,0xCC), o2(0xB9,0xD5), o2(0xEA,0xCD), o2(0xB0,0xE1),
-     o2(0xC9,0xBD), o2(0xEA,0xCE), o2(0xBF,0xEA), o2(0xEA,0xD5),
-     o2(0xEA,0xD2), o2(0xC3,0xEF), o2(0xEA,0xD3), o2(0xEA,0xD0),
-     o2(0xB6,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A1 = {
-    to_SHIFT_JIS_E8_A1_offsets,
-    to_EUC_JP_E8_A1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A2_infos[21] = {
-     o2(0xEA,0xCF), o2(0xEA,0xD6), o2(0xB7,0xB6), o2(0xC2,0xDE),
-     o2(0xEA,0xDC), o2(0xEA,0xD8), o2(0xC2,0xB5), o2(0xEA,0xD7),
-     o2(0xEA,0xDA), o2(0xEA,0xD1), o2(0xEA,0xDB), o2(0xEA,0xDD),
-     o2(0xC8,0xEF), o2(0xEA,0xD9), o2(0xEA,0xDE), o2(0xEA,0xE0),
-     o2(0xB8,0xD3), o2(0xEA,0xD4), o2(0xB0,0xC1), o2(0xEA,0xDF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A2 = {
-    to_SHIFT_JIS_E8_A2_offsets,
-    to_EUC_JP_E8_A2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A3_infos[25] = {
-     o2(0xBA,0xDB), o2(0xCE,0xF6), o2(0xEA,0xE1), o2(0xEA,0xE2),
-     o2(0xC1,0xF5), o2(0xCE,0xA2), o2(0xEA,0xE3), o2(0xCD,0xB5),
-     o2(0xEA,0xE4), o2(0xEA,0xE5), o2(0xCA,0xE4), o2(0xEA,0xE6),
-     o2(0xBA,0xC0), o2(0xCE,0xA3), o2(0xEA,0xEB), o2(0xEA,0xEC),
-     o2(0xBE,0xD8), o2(0xEA,0xEA), o2(0xFB,0xE6), o2(0xCD,0xE7),
-     o2(0xEA,0xE7), o2(0xEA,0xE9), o2(0xC0,0xBD), o2(0xBF,0xFE),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A3 = {
-    to_SHIFT_JIS_E8_A3_offsets,
-    to_EUC_JP_E8_A3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A4_infos[18] = {
-     o2(0xEA,0xE8), o2(0xEA,0xED), o2(0xCA,0xA3), o2(0xEA,0xEF),
-     o2(0xEA,0xEE), o2(0xB3,0xEC), o2(0xCB,0xAB), o2(0xEA,0xF0),
-     o2(0xF9,0xA2), o2(0xEA,0xFC), o2(0xEA,0xF2), o2(0xEA,0xF3),
-     o2(0xEA,0xF4), o2(0xEA,0xF5), o2(0xEA,0xF9), o2(0xEA,0xFA),
-     o2(0xEA,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A4 = {
-    to_SHIFT_JIS_E8_A4_offsets,
-    to_EUC_JP_E8_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A5_infos[20] = {
-     o2(0xEA,0xF6), o2(0xEA,0xF1), o2(0xEA,0xF7), o2(0xEA,0xFB),
-     o2(0xF0,0xB7), o2(0xB2,0xA8), o2(0xEA,0xFE), o2(0xB6,0xDF),
-     o2(0xEA,0xFD), o2(0xEB,0xA2), o2(0xEB,0xA1), o2(0xEB,0xA4),
-     o2(0xEB,0xA3), o2(0xEB,0xA5), o2(0xBD,0xB1), o2(0xEB,0xA6),
-     o2(0xEB,0xA7), o2(0xEB,0xA8), o2(0xC0,0xBE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A5 = {
-    to_SHIFT_JIS_E8_A5_offsets,
-    to_EUC_JP_E8_A5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A6_infos[26] = {
-     o2(0xCD,0xD7), o2(0xEB,0xA9), o2(0xCA,0xA4), o2(0xC7,0xC6),
-     o2(0xEB,0xAA), o2(0xEB,0xAB), o2(0xB8,0xAB), o2(0xB5,0xAC),
-     o2(0xEB,0xAC), o2(0xBB,0xEB), o2(0xC7,0xC1), o2(0xEB,0xAD),
-     o2(0xB3,0xD0), o2(0xEB,0xAE), o2(0xEB,0xB0), o2(0xCD,0xF7),
-     o2(0xEB,0xAF), o2(0xBF,0xC6), o2(0xEB,0xB1), o2(0xEB,0xB2),
-     o2(0xEB,0xB3), o2(0xB4,0xD1), o2(0xEB,0xB4), o2(0xEB,0xB5),
-     o2(0xEB,0xB6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A6 = {
-    to_SHIFT_JIS_E8_A6_offsets,
-    to_EUC_JP_E8_A6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A7_infos[11] = {
-     o2(0xEB,0xB7), o2(0xB3,0xD1), o2(0xEB,0xB8), o2(0xEB,0xB9),
-     o2(0xEB,0xBA), o2(0xB2,0xF2), o2(0xBF,0xA8), o2(0xEB,0xBB),
-     o2(0xEB,0xBC), o2(0xEB,0xBD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A7 = {
-    to_SHIFT_JIS_E8_A7_offsets,
-    to_EUC_JP_E8_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A8_infos[29] = {
-     o2(0xB8,0xC0), o2(0xC4,0xFB), o2(0xEB,0xBE), o2(0xB7,0xD7),
-     o2(0xBF,0xD6), o2(0xEB,0xC1), o2(0xC6,0xA4), o2(0xEB,0xC0),
-     o2(0xFB,0xE7), o2(0xB7,0xB1), o2(0xEB,0xBF), o2(0xC2,0xF7),
-     o2(0xB5,0xAD), o2(0xEB,0xC2), o2(0xEB,0xC3), o2(0xBE,0xD9),
-     o2(0xB7,0xED), o2(0xEB,0xC4), o2(0xCB,0xAC), o2(0xC0,0xDF),
-     o2(0xB5,0xF6), o2(0xCC,0xF5), o2(0xC1,0xCA), o2(0xEB,0xC5),
-     o2(0xFB,0xE8), o2(0xBF,0xC7), o2(0xC3,0xF0), o2(0xBE,0xDA),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A8 = {
-    to_SHIFT_JIS_E8_A8_offsets,
-    to_EUC_JP_E8_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_A9_infos[26] = {
-     o2(0xEB,0xC6), o2(0xEB,0xC9), o2(0xEB,0xCA), o2(0xBA,0xBE),
-     o2(0xC2,0xC2), o2(0xEB,0xC8), o2(0xBE,0xDB), o2(0xC9,0xBE),
-     o2(0xEB,0xC7), o2(0xBB,0xEC), o2(0xB1,0xD3), o2(0xEB,0xCE),
-     o2(0xB7,0xD8), o2(0xBB,0xEE), o2(0xBB,0xED), o2(0xCF,0xCD),
-     o2(0xEB,0xCD), o2(0xEB,0xCC), o2(0xC1,0xA7), o2(0xB5,0xCD),
-     o2(0xCF,0xC3), o2(0xB3,0xBA), o2(0xBE,0xDC), o2(0xFB,0xE9),
-     o2(0xEB,0xCB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_A9 = {
-    to_SHIFT_JIS_E8_A9_offsets,
-    to_EUC_JP_E8_A9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_AA_infos[30] = {
-     o2(0xEB,0xD0), o2(0xEB,0xD1), o2(0xEB,0xCF), o2(0xB8,0xD8),
-     o2(0xCD,0xC0), o2(0xBB,0xEF), o2(0xC7,0xA7), o2(0xEB,0xD4),
-     o2(0xC0,0xC0), o2(0xC3,0xC2), o2(0xCD,0xB6), o2(0xEB,0xD7),
-     o2(0xB8,0xEC), o2(0xC0,0xBF), o2(0xEB,0xD3), o2(0xEB,0xD8),
-     o2(0xB8,0xED), o2(0xEB,0xD5), o2(0xEB,0xD6), o2(0xFB,0xEA),
-     o2(0xEB,0xD2), o2(0xC0,0xE2), o2(0xC6,0xC9), o2(0xC3,0xAF),
-     o2(0xB2,0xDD), o2(0xC8,0xF0), o2(0xB5,0xC3), o2(0xFB,0xEB),
-     o2(0xC4,0xB4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_AA = {
-    to_SHIFT_JIS_E8_AA_offsets,
-    to_EUC_JP_E8_AA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_AB_infos[31] = {
-     o2(0xEB,0xDB), o2(0xEB,0xD9), o2(0xC3,0xCC), o2(0xC0,0xC1),
-     o2(0xB4,0xD2), o2(0xEB,0xDA), o2(0xBF,0xDB), o2(0xCE,0xCA),
-     o2(0xCF,0xC0), o2(0xEB,0xDC), o2(0xEB,0xE7), o2(0xC4,0xB5),
-     o2(0xEB,0xE6), o2(0xFB,0xEC), o2(0xEB,0xE3), o2(0xEB,0xEB),
-     o2(0xEB,0xE4), o2(0xEB,0xE0), o2(0xC4,0xFC), o2(0xEB,0xDF),
-     o2(0xEB,0xDD), o2(0xCD,0xA1), o2(0xBB,0xF0), o2(0xEB,0xE1),
-     o2(0xEB,0xDE), o2(0xFB,0xEE), o2(0xEB,0xE5), o2(0xBD,0xF4),
-     o2(0xB8,0xC1), o2(0xC2,0xFA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_AB = {
-    to_SHIFT_JIS_E8_AB_offsets,
-    to_EUC_JP_E8_AB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_AC_infos[25] = {
-     o2(0xCB,0xC5), o2(0xB1,0xDA), o2(0xB0,0xE2), o2(0xC6,0xA5),
-     o2(0xEB,0xE9), o2(0xEB,0xE8), o2(0xC6,0xE6), o2(0xEB,0xED),
-     o2(0xEB,0xE2), o2(0xEB,0xEC), o2(0xEB,0xEE), o2(0xB8,0xAC),
-     o2(0xEB,0xEA), o2(0xB9,0xD6), o2(0xBC,0xD5), o2(0xEB,0xEF),
-     o2(0xCD,0xD8), o2(0xEB,0xF2), o2(0xEB,0xF5), o2(0xEB,0xF3),
-     o2(0xC9,0xB5), o2(0xEB,0xF0), o2(0xB6,0xE0), o2(0xEB,0xF4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_AC = {
-    to_SHIFT_JIS_E8_AC_offsets,
-    to_EUC_JP_E8_AC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_AD_infos[24] = {
-     o2(0xEB,0xF6), o2(0xEB,0xFA), o2(0xEB,0xF7), o2(0xEB,0xF9),
-     o2(0xEB,0xF8), o2(0xFB,0xEF), o2(0xEB,0xFB), o2(0xBC,0xB1),
-     o2(0xEB,0xFD), o2(0xEB,0xFC), o2(0xC9,0xE8), o2(0xEC,0xA1),
-     o2(0xB7,0xD9), o2(0xEB,0xFE), o2(0xEC,0xA2), o2(0xEC,0xA3),
-     o2(0xB5,0xC4), o2(0xE6,0xC1), o2(0xBE,0xF9), o2(0xEC,0xA4),
-     o2(0xB8,0xEE), o2(0xEC,0xA5), o2(0xFB,0xF0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_AD = {
-    to_SHIFT_JIS_E8_AD_offsets,
-    to_EUC_JP_E8_AD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_AE_infos[12] = {
-     o2(0xEC,0xA6), o2(0xBB,0xBE), o2(0xDA,0xCE), o2(0xEC,0xA7),
-     o2(0xEC,0xA8), o2(0xBD,0xB2), o2(0xEC,0xA9), o2(0xEC,0xAA),
-     o2(0xEC,0xAB), o2(0xEC,0xAC), o2(0xEC,0xAD),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_AE = {
-    to_SHIFT_JIS_E8_AE_offsets,
-    to_EUC_JP_E8_AE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B0_infos[4] = {
-     o2(0xC3,0xAB), o2(0xEC,0xAE), o2(0xEC,0xB0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B0 = {
-    to_SHIFT_JIS_E8_B0_offsets,
-    to_EUC_JP_E8_B0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B1_infos[19] = {
-     o2(0xEC,0xAF), o2(0xC6,0xA6), o2(0xEC,0xB1), o2(0xCB,0xAD),
-     o2(0xEC,0xB2), o2(0xEC,0xB3), o2(0xEC,0xB4), o2(0xEC,0xB5),
-     o2(0xC6,0xDA), o2(0xBE,0xDD), o2(0xEC,0xB6), o2(0xB9,0xEB),
-     o2(0xD0,0xAE), o2(0xEC,0xB7), o2(0xEC,0xB8), o2(0xC9,0xBF),
-     o2(0xEC,0xB9), o2(0xEC,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B1 = {
-    to_SHIFT_JIS_E8_B1_offsets,
-    to_EUC_JP_E8_B1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B2_infos[35] = {
-     o2(0xEC,0xBA), o2(0xEC,0xBC), o2(0xEC,0xBB), o2(0xEC,0xBD),
-     o2(0xCB,0xC6), o2(0xEC,0xBE), o2(0xEC,0xBF), o2(0xEC,0xC0),
-     o2(0xEC,0xC2), o2(0xB3,0xAD), o2(0xC4,0xE7), o2(0xC9,0xE9),
-     o2(0xBA,0xE2), o2(0xB9,0xD7), o2(0xC9,0xCF), o2(0xB2,0xDF),
-     o2(0xC8,0xCE), o2(0xEC,0xC5), o2(0xB4,0xD3), o2(0xC0,0xD5),
-     o2(0xEC,0xC4), o2(0xEC,0xC9), o2(0xC3,0xF9), o2(0xCC,0xE3),
-     o2(0xEC,0xC7), o2(0xEC,0xC8), o2(0xB5,0xAE), o2(0xEC,0xCA),
-     o2(0xC7,0xE3), o2(0xC2,0xDF), o2(0xC8,0xF1), o2(0xC5,0xBD),
-     o2(0xEC,0xC6), o2(0xCB,0xC7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B2 = {
-    to_SHIFT_JIS_E8_B2_offsets,
-    to_EUC_JP_E8_B2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B3_infos[30] = {
-     o2(0xB2,0xEC), o2(0xEC,0xCC), o2(0xCF,0xA8), o2(0xC4,0xC2),
-     o2(0xCF,0xC5), o2(0xBB,0xF1), o2(0xEC,0xCB), o2(0xC2,0xB1),
-     o2(0xEC,0xDC), o2(0xC1,0xA8), o2(0xC6,0xF8), o2(0xC9,0xD0),
-     o2(0xEC,0xCF), o2(0xBB,0xBF), o2(0xBB,0xF2), o2(0xBE,0xDE),
-     o2(0xC7,0xE5), o2(0xB8,0xAD), o2(0xEC,0xCE), o2(0xEC,0xCD),
-     o2(0xC9,0xEA), o2(0xBC,0xC1), o2(0xC5,0xD2), o2(0xFB,0xF1),
-     o2(0xFB,0xF2), o2(0xEC,0xD1), o2(0xEC,0xD2), o2(0xB9,0xD8),
-     o2(0xEC,0xD0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B3 = {
-    to_SHIFT_JIS_E8_B3_offsets,
-    to_EUC_JP_E8_B3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B4_infos[14] = {
-     o2(0xEC,0xD3), o2(0xEC,0xD4), o2(0xEC,0xD6), o2(0xC2,0xA3),
-     o2(0xEC,0xD5), o2(0xB4,0xE6), o2(0xEC,0xD8), o2(0xEC,0xD7),
-     o2(0xEC,0xD9), o2(0xFB,0xF3), o2(0xEC,0xDB), o2(0xEC,0xDD),
-     o2(0xEC,0xDE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B4 = {
-    to_SHIFT_JIS_E8_B4_offsets,
-    to_EUC_JP_E8_B4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B5_infos[12] = {
-     o2(0xC0,0xD6), o2(0xBC,0xCF), o2(0xEC,0xDF), o2(0xB3,0xD2),
-     o2(0xEC,0xE0), o2(0xC1,0xF6), o2(0xEC,0xE1), o2(0xEC,0xE2),
-     o2(0xC9,0xEB), o2(0xFB,0xF4), o2(0xB5,0xAF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B5 = {
-    to_SHIFT_JIS_E8_B5_offsets,
-    to_EUC_JP_E8_B5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B6_infos[10] = {
-     o2(0xEC,0xE3), o2(0xC4,0xB6), o2(0xB1,0xDB), o2(0xEC,0xE4),
-     o2(0xBC,0xF1), o2(0xBF,0xF6), o2(0xC2,0xAD), o2(0xEC,0xE7),
-     o2(0xEC,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B6 = {
-    to_SHIFT_JIS_E8_B6_offsets,
-    to_EUC_JP_E8_B6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B7_infos[20] = {
-     o2(0xEC,0xE5), o2(0xEC,0xED), o2(0xEC,0xEB), o2(0xEC,0xE8),
-     o2(0xEC,0xEA), o2(0xEC,0xE9), o2(0xEC,0xEC), o2(0xB5,0xF7),
-     o2(0xEC,0xF0), o2(0xC0,0xD7), o2(0xEC,0xF1), o2(0xB8,0xD9),
-     o2(0xEC,0xEE), o2(0xEC,0xEF), o2(0xCF,0xA9), o2(0xC4,0xB7),
-     o2(0xC1,0xA9), o2(0xEC,0xF2), o2(0xEC,0xF5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B7 = {
-    to_SHIFT_JIS_E8_B7_offsets,
-    to_EUC_JP_E8_B7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B8_infos[13] = {
-     o2(0xEC,0xF3), o2(0xEC,0xF4), o2(0xCD,0xD9), o2(0xC6,0xA7),
-     o2(0xEC,0xF8), o2(0xEC,0xF6), o2(0xEC,0xF7), o2(0xEC,0xF9),
-     o2(0xED,0xA9), o2(0xEC,0xFC), o2(0xEC,0xFD), o2(0xEC,0xFB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B8 = {
-    to_SHIFT_JIS_E8_B8_offsets,
-    to_EUC_JP_E8_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_B9_infos[19] = {
-     o2(0xEC,0xFA), o2(0xC4,0xFD), o2(0xED,0xA1), o2(0xED,0xA5),
-     o2(0xED,0xA2), o2(0xEC,0xFE), o2(0xED,0xA3), o2(0xED,0xA4),
-     o2(0xED,0xAB), o2(0xED,0xA6), o2(0xC0,0xD8), o2(0xED,0xA8),
-     o2(0xED,0xAA), o2(0xED,0xA7), o2(0xED,0xAD), o2(0xBD,0xB3),
-     o2(0xED,0xAC), o2(0xED,0xAE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_B9 = {
-    to_SHIFT_JIS_E8_B9_offsets,
-    to_EUC_JP_E8_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BA_infos[20] = {
-     o2(0xED,0xAF), o2(0xED,0xB2), o2(0xED,0xB1), o2(0xED,0xB0),
-     o2(0xED,0xB4), o2(0xED,0xB3), o2(0xCC,0xF6), o2(0xED,0xB6),
-     o2(0xED,0xB5), o2(0xED,0xB7), o2(0xED,0xB8), o2(0xED,0xBA),
-     o2(0xED,0xB9), o2(0xBF,0xC8), o2(0xED,0xBB), o2(0xB6,0xED),
-     o2(0xED,0xBC), o2(0xED,0xBE), o2(0xED,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BA = {
-    to_SHIFT_JIS_E8_BA_offsets,
-    to_EUC_JP_E8_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BB_infos[20] = {
-     o2(0xED,0xC0), o2(0xED,0xBD), o2(0xED,0xC1), o2(0xBC,0xD6),
-     o2(0xED,0xC2), o2(0xB5,0xB0), o2(0xB7,0xB3), o2(0xFB,0xF6),
-     o2(0xB8,0xAE), o2(0xED,0xC3), o2(0xC6,0xF0), o2(0xC5,0xBE),
-     o2(0xED,0xC4), o2(0xED,0xC7), o2(0xBC,0xB4), o2(0xED,0xC6),
-     o2(0xED,0xC5), o2(0xB7,0xDA), o2(0xED,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BB = {
-    to_SHIFT_JIS_E8_BB_offsets,
-    to_EUC_JP_E8_BB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BC_infos[25] = {
-     o2(0xB3,0xD3), o2(0xED,0xCA), o2(0xBA,0xDC), o2(0xED,0xC9),
-     o2(0xED,0xD2), o2(0xED,0xCC), o2(0xED,0xCE), o2(0xCA,0xE5),
-     o2(0xED,0xCB), o2(0xED,0xCD), o2(0xED,0xD1), o2(0xED,0xCF),
-     o2(0xB5,0xB1), o2(0xED,0xD0), o2(0xED,0xD3), o2(0xC7,0xDA),
-     o2(0xCE,0xD8), o2(0xBD,0xB4), o2(0xED,0xD4), o2(0xCD,0xA2),
-     o2(0xED,0xD6), o2(0xED,0xD5), o2(0xED,0xD9), o2(0xCD,0xC1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BC = {
-    to_SHIFT_JIS_E8_BC_offsets,
-    to_EUC_JP_E8_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BD_infos[16] = {
-     o2(0xED,0xD8), o2(0xB3,0xED), o2(0xED,0xD7), o2(0xED,0xDC),
-     o2(0xED,0xDB), o2(0xED,0xDA), o2(0xC5,0xB2), o2(0xED,0xDD),
-     o2(0xED,0xDE), o2(0xED,0xDF), o2(0xB9,0xEC), o2(0xB7,0xA5),
-     o2(0xED,0xE0), o2(0xED,0xE1), o2(0xED,0xE2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BD = {
-    to_SHIFT_JIS_E8_BD_offsets,
-    to_EUC_JP_E8_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BE_infos[19] = {
-     o2(0xBF,0xC9), o2(0xED,0xE3), o2(0xBC,0xAD), o2(0xED,0xE4),
-     o2(0xED,0xE5), o2(0xD2,0xA1), o2(0xD1,0xFE), o2(0xED,0xE6),
-     o2(0xE5,0xF0), o2(0xED,0xE7), o2(0xC3,0xA4), o2(0xBF,0xAB),
-     o2(0xC7,0xC0), o2(0xED,0xE8), o2(0xCA,0xD5), o2(0xC4,0xD4),
-     o2(0xB9,0xFE), o2(0xC3,0xA9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BE = {
-    to_SHIFT_JIS_E8_BE_offsets,
-    to_EUC_JP_E8_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_BF_infos[23] = {
-     o2(0xB1,0xAA), o2(0xCB,0xF8), o2(0xBF,0xD7), o2(0xB7,0xDE),
-     o2(0xB6,0xE1), o2(0xCA,0xD6), o2(0xED,0xE9), o2(0xED,0xEB),
-     o2(0xED,0xEA), o2(0xB2,0xE0), o2(0xC6,0xF6), o2(0xED,0xEC),
-     o2(0xC7,0xF7), o2(0xC5,0xB3), o2(0xED,0xED), o2(0xBD,0xD2),
-     o2(0xED,0xEF), o2(0xCC,0xC2), o2(0xED,0xFE), o2(0xED,0xF1),
-     o2(0xED,0xF2), o2(0xC4,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8_BF = {
-    to_SHIFT_JIS_E8_BF_offsets,
-    to_EUC_JP_E8_BF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E8_infos[64] = {
-     &to_EUC_JP_E8_80, &to_EUC_JP_E8_81, &to_EUC_JP_E8_82, &to_EUC_JP_E8_83,
-     &to_EUC_JP_E8_84, &to_EUC_JP_E8_85, &to_EUC_JP_E8_86, &to_EUC_JP_E8_87,
-     &to_EUC_JP_E8_88, &to_EUC_JP_E8_89, &to_EUC_JP_E8_8A, &to_EUC_JP_E8_8B,
-     &to_EUC_JP_E8_8C, &to_EUC_JP_E8_8D, &to_EUC_JP_E8_8E, &to_EUC_JP_E8_8F,
-     &to_EUC_JP_E8_90, &to_EUC_JP_E8_91, &to_EUC_JP_E8_92, &to_EUC_JP_E8_93,
-     &to_EUC_JP_E8_94, &to_EUC_JP_E8_95, &to_EUC_JP_E8_96, &to_EUC_JP_E8_97,
-     &to_EUC_JP_E8_98, &to_EUC_JP_E8_99, &to_EUC_JP_E8_9A, &to_EUC_JP_E8_9B,
-     &to_EUC_JP_E8_9C, &to_EUC_JP_E8_9D, &to_EUC_JP_E8_9E, &to_EUC_JP_E8_9F,
-     &to_EUC_JP_E8_A0, &to_EUC_JP_E8_A1, &to_EUC_JP_E8_A2, &to_EUC_JP_E8_A3,
-     &to_EUC_JP_E8_A4, &to_EUC_JP_E8_A5, &to_EUC_JP_E8_A6, &to_EUC_JP_E8_A7,
-     &to_EUC_JP_E8_A8, &to_EUC_JP_E8_A9, &to_EUC_JP_E8_AA, &to_EUC_JP_E8_AB,
-     &to_EUC_JP_E8_AC, &to_EUC_JP_E8_AD, &to_EUC_JP_E8_AE, &to_EUC_JP_E8_B0,
-     &to_EUC_JP_E8_B1, &to_EUC_JP_E8_B2, &to_EUC_JP_E8_B3, &to_EUC_JP_E8_B4,
-     &to_EUC_JP_E8_B5, &to_EUC_JP_E8_B6, &to_EUC_JP_E8_B7, &to_EUC_JP_E8_B8,
-     &to_EUC_JP_E8_B9, &to_EUC_JP_E8_BA, &to_EUC_JP_E8_BB, &to_EUC_JP_E8_BC,
-     &to_EUC_JP_E8_BD, &to_EUC_JP_E8_BE, &to_EUC_JP_E8_BF,            UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E8 = {
-    to_SHIFT_JIS_E8_offsets,
-    to_EUC_JP_E8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_80_infos[36] = {
-     o2(0xC2,0xE0), o2(0xC1,0xF7), o2(0xC6,0xA8), o2(0xED,0xF0),
-     o2(0xB5,0xD5), o2(0xED,0xF9), o2(0xED,0xF6), o2(0xEE,0xA5),
-     o2(0xC6,0xA9), o2(0xC3,0xE0), o2(0xED,0xF3), o2(0xC4,0xFE),
-     o2(0xC5,0xD3), o2(0xED,0xF4), o2(0xED,0xF8), o2(0xBF,0xE0),
-     o2(0xC7,0xE7), o2(0xC4,0xCC), o2(0xC0,0xC2), o2(0xED,0xF7),
-     o2(0xC2,0xAE), o2(0xC2,0xA4), o2(0xED,0xF5), o2(0xB0,0xA9),
-     o2(0xCF,0xA2), o2(0xED,0xFA), o2(0xC2,0xE1), o2(0xBD,0xB5),
-     o2(0xBF,0xCA), o2(0xED,0xFC), o2(0xED,0xFB), o2(0xB0,0xEF),
-     o2(0xED,0xFD), o2(0xC9,0xAF), o2(0xEE,0xA7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_80 = {
-    to_SHIFT_JIS_E9_80_offsets,
-    to_EUC_JP_E9_80_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_81_infos[41] = {
-     o2(0xC6,0xDB), o2(0xBF,0xEB), o2(0xC3,0xD9), o2(0xB6,0xF8),
-     o2(0xEE,0xA6), o2(0xCD,0xB7), o2(0xB1,0xBF), o2(0xCA,0xD7),
-     o2(0xB2,0xE1), o2(0xEE,0xA1), o2(0xEE,0xA2), o2(0xEE,0xA3),
-     o2(0xEE,0xA4), o2(0xC6,0xBB), o2(0xC3,0xA3), o2(0xB0,0xE3),
-     o2(0xEE,0xA8), o2(0xEE,0xA9), o2(0xF4,0xA3), o2(0xC2,0xBD),
-     o2(0xEE,0xAA), o2(0xB1,0xF3), o2(0xC1,0xCC), o2(0xB8,0xAF),
-     o2(0xCD,0xDA), o2(0xFB,0xF9), o2(0xEE,0xAB), o2(0xC5,0xAC),
-     o2(0xC1,0xF8), o2(0xBC,0xD7), o2(0xEE,0xAC), o2(0xEE,0xAF),
-     o2(0xBD,0xE5), o2(0xEE,0xAD), o2(0xC1,0xAB), o2(0xC1,0xAA),
-     o2(0xB0,0xE4), o2(0xCE,0xCB), o2(0xEE,0xB1), o2(0xC8,0xF2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_81 = {
-    to_SHIFT_JIS_E9_81_offsets,
-    to_EUC_JP_E9_81_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_82_infos[19] = {
-     o2(0xEE,0xB3), o2(0xEE,0xB2), o2(0xEE,0xB0), o2(0xE3,0xE4),
-     o2(0xB4,0xD4), o2(0xED,0xEE), o2(0xEE,0xB5), o2(0xEE,0xB4),
-     o2(0xEE,0xB6), o2(0xCD,0xB8), o2(0xC6,0xE1), o2(0xCB,0xAE),
-     o2(0xEE,0xB7), o2(0xBC,0xD9), o2(0xEE,0xB8), o2(0xEE,0xB9),
-     o2(0xEE,0xBA), o2(0xC5,0xA1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_82 = {
-    to_SHIFT_JIS_E9_82_offsets,
-    to_EUC_JP_E9_82_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_83_infos[14] = {
-     o2(0xB0,0xEA), o2(0xB9,0xD9), o2(0xCF,0xBA), o2(0xEE,0xBE),
-     o2(0xFB,0xFA), o2(0xB7,0xB4), o2(0xEE,0xBB), o2(0xEE,0xBC),
-     o2(0xC9,0xF4), o2(0xB3,0xD4), o2(0xCD,0xB9), o2(0xB6,0xBF),
-     o2(0xC5,0xD4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_83 = {
-    to_SHIFT_JIS_E9_83_offsets,
-    to_EUC_JP_E9_83_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_84_infos[9] = {
-     o2(0xEE,0xBF), o2(0xEE,0xC0), o2(0xFB,0xFC), o2(0xEE,0xC1),
-     o2(0xFB,0xFD), o2(0xC5,0xA2), o2(0xEE,0xC3), o2(0xEE,0xC2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_84 = {
-    to_SHIFT_JIS_E9_84_offsets,
-    to_EUC_JP_E9_84_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_85_infos[22] = {
-     o2(0xC6,0xD3), o2(0xEE,0xC4), o2(0xBD,0xB6), o2(0xBC,0xE0),
-     o2(0xC7,0xDB), o2(0xC3,0xF1), o2(0xBC,0xF2), o2(0xBF,0xEC),
-     o2(0xEE,0xC5), o2(0xEE,0xC6), o2(0xBF,0xDD), o2(0xEE,0xC7),
-     o2(0xEE,0xC8), o2(0xEE,0xC9), o2(0xCD,0xEF), o2(0xBD,0xB7),
-     o2(0xEE,0xCB), o2(0xEE,0xCA), o2(0xB9,0xDA), o2(0xB9,0xF3),
-     o2(0xBB,0xC0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_85 = {
-    to_SHIFT_JIS_E9_85_offsets,
-    to_EUC_JP_E9_85_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_86_infos[19] = {
-     o2(0xEE,0xCE), o2(0xBD,0xE6), o2(0xEE,0xCD), o2(0xEE,0xCC),
-     o2(0xC2,0xE9), o2(0xB8,0xEF), o2(0xC0,0xC3), o2(0xC8,0xB0),
-     o2(0xBD,0xB9), o2(0xEE,0xCF), o2(0xBE,0xDF), o2(0xEE,0xD2),
-     o2(0xEE,0xD0), o2(0xEE,0xD1), o2(0xEE,0xD4), o2(0xEE,0xD3),
-     o2(0xBE,0xFA), o2(0xEE,0xD5),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_86 = {
-    to_SHIFT_JIS_E9_86_offsets,
-    to_EUC_JP_E9_86_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_87_infos[35] = {
-     o2(0xEE,0xD6), o2(0xEE,0xD7), o2(0xC8,0xD0), o2(0xBA,0xD3),
-     o2(0xBC,0xE1), o2(0xEE,0xD8), o2(0xEE,0xD9), o2(0xCE,0xA4),
-     o2(0xBD,0xC5), o2(0xCC,0xEE), o2(0xCE,0xCC), o2(0xEE,0xDA),
-     o2(0xB6,0xE2), o2(0xEE,0xDB), o2(0xFC,0xA1), o2(0xC5,0xA3),
-     o2(0xFB,0xFE), o2(0xEE,0xDE), o2(0xB3,0xF8), o2(0xBF,0xCB),
-     o2(0xFC,0xA2), o2(0xEE,0xDC), o2(0xEE,0xDD), o2(0xC4,0xE0),
-     o2(0xFC,0xA5), o2(0xFC,0xA6), o2(0xCB,0xD5), o2(0xB6,0xFC),
-     o2(0xFC,0xA3), o2(0xFC,0xA4), o2(0xEE,0xE0), o2(0xEE,0xE1),
-     o2(0xEE,0xDF), o2(0xEE,0xE3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_87 = {
-    to_SHIFT_JIS_E9_87_offsets,
-    to_EUC_JP_E9_87_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_88_infos[18] = {
-     o2(0xFC,0xA7), o2(0xFC,0xA9), o2(0xC6,0xDF), o2(0xB3,0xC3),
-     o2(0xFC,0xA8), o2(0xEE,0xE7), o2(0xEE,0xE4), o2(0xEE,0xE6),
-     o2(0xEE,0xE2), o2(0xEF,0xCF), o2(0xEE,0xE5), o2(0xCE,0xEB),
-     o2(0xB8,0xDA), o2(0xFC,0xB0), o2(0xFC,0xAA), o2(0xFC,0xAC),
-     o2(0xEE,0xEF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_88 = {
-    to_SHIFT_JIS_E9_88_offsets,
-    to_EUC_JP_E9_88_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_89_infos[23] = {
-     o2(0xFC,0xAB), o2(0xC5,0xB4), o2(0xEE,0xEA), o2(0xEE,0xED),
-     o2(0xEE,0xEB), o2(0xEE,0xF0), o2(0xFC,0xAD), o2(0xEE,0xF1),
-     o2(0xFC,0xAF), o2(0xEE,0xE9), o2(0xFC,0xAE), o2(0xEE,0xF6),
-     o2(0xB1,0xF4), o2(0xEE,0xE8), o2(0xC8,0xAD), o2(0xEE,0xEC),
-     o2(0xBE,0xE0), o2(0xFC,0xB1), o2(0xB9,0xDB), o2(0xFC,0xB3),
-     o2(0xFC,0xB4), o2(0xCB,0xC8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_89 = {
-    to_SHIFT_JIS_E9_89_offsets,
-    to_EUC_JP_E9_89_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8A_infos[17] = {
-     o2(0xB6,0xE4), o2(0xBD,0xC6), o2(0xC6,0xBC), o2(0xF9,0xA4),
-     o2(0xC1,0xAD), o2(0xEE,0xF4), o2(0xEE,0xEE), o2(0xEE,0xF3),
-     o2(0xCC,0xC3), o2(0xC4,0xB8), o2(0xEE,0xF5), o2(0xEE,0xF2),
-     o2(0xFC,0xB2), o2(0xC1,0xAC), o2(0xEE,0xF9), o2(0xEE,0xF8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8A = {
-    to_SHIFT_JIS_E9_8A_offsets,
-    to_EUC_JP_E9_8A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8B_infos[22] = {
-     o2(0xEE,0xF7), o2(0xFC,0xB8), o2(0xCB,0xAF), o2(0xFC,0xBC),
-     o2(0xFC,0xBA), o2(0xFC,0xB6), o2(0xFC,0xB7), o2(0xFC,0xBB),
-     o2(0xBD,0xFB), o2(0xFC,0xB5), o2(0xEE,0xFA), o2(0xCA,0xDF),
-     o2(0xB1,0xD4), o2(0xC9,0xC6), o2(0xC3,0xF2), o2(0xB5,0xF8),
-     o2(0xF9,0xAA), o2(0xEE,0xFC), o2(0xFC,0xBF), o2(0xB9,0xDD),
-     o2(0xFC,0xC2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8B = {
-    to_SHIFT_JIS_E9_8B_offsets,
-    to_EUC_JP_E9_8B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8C_infos[25] = {
-     o2(0xFC,0xC4), o2(0xBB,0xAC), o2(0xEE,0xFB), o2(0xBF,0xED),
-     o2(0xBF,0xEE), o2(0xEF,0xA1), o2(0xEF,0xA3), o2(0xFC,0xC3),
-     o2(0xFC,0xC1), o2(0xBE,0xFB), o2(0xFC,0xBE), o2(0xEF,0xA2),
-     o2(0xEF,0xA4), o2(0xFC,0xBD), o2(0xB6,0xD3), o2(0xC9,0xC5),
-     o2(0xBC,0xE2), o2(0xCF,0xA3), o2(0xEE,0xFE), o2(0xBA,0xF8),
-     o2(0xCF,0xBF), o2(0xEF,0xA6), o2(0xEF,0xA5), o2(0xEF,0xA7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8C = {
-    to_SHIFT_JIS_E9_8C_offsets,
-    to_EUC_JP_E9_8C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8D_infos[17] = {
-     o2(0xEE,0xFD), o2(0xF9,0xA3), o2(0xC6,0xE9), o2(0xC5,0xD5),
-     o2(0xC4,0xD7), o2(0xEF,0xAC), o2(0xFC,0xC6), o2(0xC3,0xC3),
-     o2(0xEF,0xA8), o2(0xEF,0xA9), o2(0xB7,0xAD), o2(0xEF,0xAB),
-     o2(0xFC,0xC5), o2(0xB8,0xB0), o2(0xEF,0xAA), o2(0xBE,0xE1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8D = {
-    to_SHIFT_JIS_E9_8D_offsets,
-    to_EUC_JP_E9_8D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8E_infos[13] = {
-     o2(0xB3,0xF9), o2(0xEF,0xB0), o2(0xBA,0xBF), o2(0xC1,0xF9),
-     o2(0xC4,0xCA), o2(0xFC,0xC7), o2(0xB3,0xBB), o2(0xEF,0xAE),
-     o2(0xEF,0xAF), o2(0xC4,0xC3), o2(0xEF,0xAD), o2(0xEF,0xB1),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8E = {
-    to_SHIFT_JIS_E9_8E_offsets,
-    to_EUC_JP_E9_8E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_8F_infos[16] = {
-     o2(0xEF,0xB7), o2(0xFC,0xC8), o2(0xEF,0xBA), o2(0xEF,0xB9),
-     o2(0xC5,0xAD), o2(0xEF,0xB2), o2(0xEF,0xB3), o2(0xEF,0xB6),
-     o2(0xEF,0xB8), o2(0xFC,0xC9), o2(0xB6,0xC0), o2(0xEF,0xBB),
-     o2(0xEF,0xB5), o2(0xEF,0xB4), o2(0xFC,0xCA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_8F = {
-    to_SHIFT_JIS_E9_8F_offsets,
-    to_EUC_JP_E9_8F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_90_infos[16] = {
-     o2(0xEF,0xBF), o2(0xEF,0xC0), o2(0xEF,0xC1), o2(0xEF,0xBE),
-     o2(0xEF,0xBD), o2(0xBE,0xE2), o2(0xC6,0xAA), o2(0xEF,0xBC),
-     o2(0xEF,0xC5), o2(0xEF,0xC3), o2(0xFC,0xCB), o2(0xEF,0xC4),
-     o2(0xEF,0xC2), o2(0xC2,0xF8), o2(0xEF,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_90 = {
-    to_SHIFT_JIS_E9_90_offsets,
-    to_EUC_JP_E9_90_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_91_infos[21] = {
-     o2(0xEF,0xC7), o2(0xEF,0xC9), o2(0xFC,0xCC), o2(0xFC,0xCD),
-     o2(0xB4,0xD5), o2(0xEF,0xC8), o2(0xCC,0xFA), o2(0xEF,0xD4),
-     o2(0xEF,0xCA), o2(0xEF,0xCD), o2(0xEF,0xCB), o2(0xEF,0xCC),
-     o2(0xEF,0xCE), o2(0xEF,0xD0), o2(0xEF,0xD1), o2(0xEF,0xD2),
-     o2(0xEF,0xD5), o2(0xEF,0xD3), o2(0xEF,0xD6), o2(0xEF,0xD8),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_91 = {
-    to_SHIFT_JIS_E9_91_offsets,
-    to_EUC_JP_E9_91_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_92_infos[2] = {
-     o2(0xEF,0xD7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_92 = {
-    to_SHIFT_JIS_E9_92_offsets,
-    to_EUC_JP_E9_92_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_95_infos[2] = {
-     o2(0xC4,0xB9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_95 = {
-    to_SHIFT_JIS_E9_95_offsets,
-    to_EUC_JP_E9_95_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_96_infos[29] = {
-     o2(0xCC,0xE7), o2(0xEF,0xD9), o2(0xC1,0xAE), o2(0xEF,0xDA),
-     o2(0xCA,0xC4), o2(0xEF,0xDB), o2(0xB3,0xAB), o2(0xB1,0xBC),
-     o2(0xB4,0xD7), o2(0xFC,0xCE), o2(0xB4,0xD6), o2(0xEF,0xDC),
-     o2(0xEF,0xDD), o2(0xEF,0xDE), o2(0xEF,0xDF), o2(0xEF,0xE0),
-     o2(0xB4,0xD8), o2(0xB3,0xD5), o2(0xB9,0xDE), o2(0xC8,0xB6),
-     o2(0xEF,0xE2), o2(0xEF,0xE1), o2(0xEF,0xE3), o2(0xB1,0xDC),
-     o2(0xEF,0xE6), o2(0xEF,0xE5), o2(0xEF,0xE4), o2(0xEF,0xE7),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_96 = {
-    to_SHIFT_JIS_E9_96_offsets,
-    to_EUC_JP_E9_96_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_97_infos[14] = {
-     o2(0xEF,0xEA), o2(0xB0,0xC7), o2(0xEF,0xE8), o2(0xEF,0xEC),
-     o2(0xEF,0xEB), o2(0xEF,0xEE), o2(0xEF,0xED), o2(0xEF,0xEF),
-     o2(0xC6,0xAE), o2(0xEF,0xF0), o2(0xEF,0xF1), o2(0xEF,0xF3),
-     o2(0xEF,0xF2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_97 = {
-    to_SHIFT_JIS_E9_97_offsets,
-    to_EUC_JP_E9_97_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_98_infos[10] = {
-     o2(0xC9,0xEC), o2(0xEF,0xF4), o2(0xEF,0xF5), o2(0xBA,0xE5),
-     o2(0xEF,0xF6), o2(0xEF,0xF7), o2(0xCB,0xC9), o2(0xC1,0xCB),
-     o2(0xB0,0xA4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_98 = {
-    to_SHIFT_JIS_E9_98_offsets,
-    to_EUC_JP_E9_98_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_99_infos[30] = {
-     o2(0xC2,0xCB), o2(0xEF,0xF8), o2(0xC9,0xED), o2(0xEF,0xFB),
-     o2(0xEF,0xF9), o2(0xB9,0xDF), o2(0xEF,0xFA), o2(0xB8,0xC2),
-     o2(0xCA,0xC5), o2(0xEF,0xFD), o2(0xF0,0xA1), o2(0xEF,0xFE),
-     o2(0xF0,0xA2), o2(0xB1,0xA1), o2(0xBF,0xD8), o2(0xBD,0xFC),
-     o2(0xB4,0xD9), o2(0xF0,0xA3), o2(0xC7,0xE6), o2(0xF0,0xA5),
-     o2(0xB1,0xA2), o2(0xF0,0xA4), o2(0xC4,0xC4), o2(0xCE,0xCD),
-     o2(0xC6,0xAB), o2(0xEF,0xFC), o2(0xCE,0xA6), o2(0xB8,0xB1),
-     o2(0xCD,0xDB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_99 = {
-    to_SHIFT_JIS_E9_99_offsets,
-    to_EUC_JP_E9_99_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9A_infos[33] = {
-     o2(0xB6,0xF9), o2(0xCE,0xB4), o2(0xB7,0xA8), o2(0xC2,0xE2),
-     o2(0xE7,0xA1), o2(0xF0,0xA6), o2(0xB3,0xAC), o2(0xBF,0xEF),
-     o2(0xB3,0xD6), o2(0xF0,0xA8), o2(0xF0,0xA9), o2(0xF0,0xA7),
-     o2(0xB7,0xE4), o2(0xBA,0xDD), o2(0xBE,0xE3), o2(0xFC,0xD1),
-     o2(0xB1,0xA3), o2(0xCE,0xD9), o2(0xF0,0xAB), o2(0xEE,0xAE),
-     o2(0xF0,0xAA), o2(0xFC,0xD2), o2(0xF0,0xAE), o2(0xF0,0xAC),
-     o2(0xF0,0xAD), o2(0xF0,0xAF), o2(0xF0,0xB0), o2(0xCE,0xEC),
-     o2(0xF0,0xB1), o2(0xF0,0xB2), o2(0xC0,0xC9), o2(0xC8,0xBB),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9A = {
-    to_SHIFT_JIS_E9_9A_offsets,
-    to_EUC_JP_E9_9A_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9B_infos[29] = {
-     o2(0xBF,0xFD), o2(0xB4,0xE7), o2(0xCD,0xBA), o2(0xB2,0xED),
-     o2(0xBD,0xB8), o2(0xB8,0xDB), o2(0xF0,0xB5), o2(0xF0,0xB4),
-     o2(0xBB,0xF3), o2(0xF0,0xB6), o2(0xF0,0xB3), o2(0xBB,0xA8),
-     o2(0xF0,0xBA), o2(0xEA,0xAD), o2(0xD2,0xD6), o2(0xBF,0xF7),
-     o2(0xF0,0xB8), o2(0xCE,0xA5), o2(0xC6,0xF1), o2(0xB1,0xAB),
-     o2(0xC0,0xE3), o2(0xBC,0xB6), o2(0xCA,0xB7), o2(0xB1,0xC0),
-     o2(0xCE,0xED), o2(0xCD,0xEB), o2(0xF0,0xBB), o2(0xC5,0xC5),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9B = {
-    to_SHIFT_JIS_E9_9B_offsets,
-    to_EUC_JP_E9_9B_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9C_infos[27] = {
-     o2(0xBC,0xFB), o2(0xF0,0xBC), o2(0xF0,0xBD), o2(0xBF,0xCC),
-     o2(0xF0,0xBE), o2(0xCE,0xEE), o2(0xF0,0xB9), o2(0xF0,0xC0),
-     o2(0xF0,0xC2), o2(0xF0,0xC1), o2(0xF0,0xBF), o2(0xF0,0xC3),
-     o2(0xF0,0xC4), o2(0xC1,0xFA), o2(0xB2,0xE2), o2(0xF0,0xC5),
-     o2(0xCC,0xB8), o2(0xF0,0xC6), o2(0xF0,0xC7), o2(0xCF,0xAA),
-     o2(0xFC,0xD3), o2(0xDB,0xB1), o2(0xF0,0xC8), o2(0xFC,0xD4),
-     o2(0xF0,0xC9), o2(0xF0,0xCA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9C = {
-    to_SHIFT_JIS_E9_9C_offsets,
-    to_EUC_JP_E9_9C_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9D_infos[30] = {
-     o2(0xF0,0xCE), o2(0xFC,0xD5), o2(0xF0,0xCB), o2(0xF0,0xCC),
-     o2(0xF0,0xCD), o2(0xF0,0xCF), o2(0xFC,0xD6), o2(0xFC,0xD7),
-     o2(0xFC,0xD8), o2(0xC0,0xC4), o2(0xFC,0xD9), o2(0xCC,0xF7),
-     o2(0xC0,0xC5), o2(0xF0,0xD0), o2(0xC8,0xF3), o2(0xF0,0xD1),
-     o2(0xF3,0xD3), o2(0xCC,0xCC), o2(0xF0,0xD2), o2(0xF0,0xD3),
-     o2(0xF0,0xD4), o2(0xB3,0xD7), o2(0xF0,0xD6), o2(0xBF,0xD9),
-     o2(0xF0,0xD7), o2(0xB7,0xA4), o2(0xF0,0xD8), o2(0xF0,0xDC),
-     o2(0xF0,0xDA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9D = {
-    to_SHIFT_JIS_E9_9D_offsets,
-    to_EUC_JP_E9_9D_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9E_infos[19] = {
-     o2(0xF0,0xDB), o2(0xB3,0xF3), o2(0xF0,0xD9), o2(0xF0,0xDD),
-     o2(0xF0,0xDE), o2(0xB0,0xC8), o2(0xF0,0xDF), o2(0xF0,0xE0),
-     o2(0xBE,0xE4), o2(0xF0,0xE1), o2(0xB5,0xC7), o2(0xF0,0xE4),
-     o2(0xF0,0xE3), o2(0xF0,0xE2), o2(0xEB,0xF1), o2(0xCA,0xDC),
-     o2(0xF0,0xE5), o2(0xF0,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9E = {
-    to_SHIFT_JIS_E9_9E_offsets,
-    to_EUC_JP_E9_9E_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_9F_infos[15] = {
-     o2(0xF0,0xE7), o2(0xF0,0xE8), o2(0xF0,0xE9), o2(0xF0,0xEA),
-     o2(0xB4,0xDA), o2(0xF0,0xEB), o2(0xF0,0xEC), o2(0xC7,0xA3),
-     o2(0xF0,0xEE), o2(0xB2,0xBB), o2(0xF0,0xF1), o2(0xF0,0xF0),
-     o2(0xB1,0xA4), o2(0xB6,0xC1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_9F = {
-    to_SHIFT_JIS_E9_9F_offsets,
-    to_EUC_JP_E9_9F_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A0_infos[26] = {
-     o2(0xCA,0xC7), o2(0xC4,0xBA), o2(0xBA,0xA2), o2(0xB9,0xE0),
-     o2(0xBD,0xE7), o2(0xBF,0xDC), o2(0xF0,0xF3), o2(0xF0,0xF2),
-     o2(0xCD,0xC2), o2(0xB4,0xE8), o2(0xC8,0xD2), o2(0xC6,0xDC),
-     o2(0xBF,0xFC), o2(0xCE,0xCE), o2(0xB7,0xDB), o2(0xF0,0xF6),
-     o2(0xF0,0xF5), o2(0xCB,0xCB), o2(0xC6,0xAC), o2(0xB1,0xD0),
-     o2(0xF0,0xF7), o2(0xF0,0xF4), o2(0xC9,0xD1), o2(0xCD,0xEA),
-     o2(0xF0,0xF8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A0 = {
-    to_SHIFT_JIS_E9_A0_offsets,
-    to_EUC_JP_E9_A0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A1_infos[21] = {
-     o2(0xF0,0xF9), o2(0xF0,0xFB), o2(0xC2,0xEA), o2(0xB3,0xDB),
-     o2(0xB3,0xDC), o2(0xF0,0xFA), o2(0xB4,0xE9), o2(0xB8,0xB2),
-     o2(0xFC,0xDA), o2(0xB4,0xEA), o2(0xC5,0xBF), o2(0xCE,0xE0),
-     o2(0xFC,0xDB), o2(0xB8,0xDC), o2(0xF0,0xFC), o2(0xF0,0xFD),
-     o2(0xF0,0xFE), o2(0xF1,0xA1), o2(0xF1,0xA3), o2(0xF1,0xA2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A1 = {
-    to_SHIFT_JIS_E9_A1_offsets,
-    to_EUC_JP_E9_A1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A2_infos[6] = {
-     o2(0xC9,0xF7), o2(0xF1,0xA4), o2(0xF1,0xA5), o2(0xF1,0xA6),
-     o2(0xF1,0xA7),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A2 = {
-    to_SHIFT_JIS_E9_A2_offsets,
-    to_EUC_JP_E9_A2_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A3_infos[18] = {
-     o2(0xF1,0xA9), o2(0xF1,0xA8), o2(0xF1,0xAA), o2(0xC8,0xF4),
-     o2(0xE6,0xCC), o2(0xBF,0xA9), o2(0xB5,0xB2), o2(0xF1,0xAB),
-     o2(0xF1,0xAC), o2(0xD2,0xAC), o2(0xDD,0xBB), o2(0xC8,0xD3),
-     o2(0xB0,0xFB), o2(0xB0,0xBB), o2(0xBB,0xF4), o2(0xCB,0xB0),
-     o2(0xBE,0xFE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A3 = {
-    to_SHIFT_JIS_E9_A3_offsets,
-    to_EUC_JP_E9_A3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A4_infos[22] = {
-     o2(0xF1,0xAD), o2(0xCC,0xDF), o2(0xF1,0xAE), o2(0xCD,0xDC),
-     o2(0xB1,0xC2), o2(0xBB,0xC1), o2(0xF1,0xAF), o2(0xB2,0xEE),
-     o2(0xF1,0xB0), o2(0xF1,0xB1), o2(0xF1,0xB3), o2(0xF1,0xB4),
-     o2(0xF1,0xB6), o2(0xF1,0xB2), o2(0xF1,0xB5), o2(0xFC,0xDE),
-     o2(0xB4,0xDB), o2(0xF1,0xB7), o2(0xF1,0xB8), o2(0xF1,0xB9),
-     o2(0xF1,0xBA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A4 = {
-    to_SHIFT_JIS_E9_A4_offsets,
-    to_EUC_JP_E9_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A5_infos[11] = {
-     o2(0xF1,0xBB), o2(0xF1,0xBD), o2(0xF1,0xBC), o2(0xF1,0xBF),
-     o2(0xF1,0xC2), o2(0xF1,0xBE), o2(0xF1,0xC0), o2(0xF1,0xC1),
-     o2(0xF1,0xC3), o2(0xB6,0xC2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A5 = {
-    to_SHIFT_JIS_E9_A5_offsets,
-    to_EUC_JP_E9_A5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A6_infos[14] = {
-     o2(0xBC,0xF3), o2(0xF1,0xC4), o2(0xF1,0xC5), o2(0xB9,0xE1),
-     o2(0xFC,0xE0), o2(0xF1,0xC6), o2(0xB3,0xBE), o2(0xC7,0xCF),
-     o2(0xF1,0xC7), o2(0xF1,0xC8), o2(0xC3,0xDA), o2(0xC6,0xEB),
-     o2(0xF1,0xC9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A6 = {
-    to_SHIFT_JIS_E9_A6_offsets,
-    to_EUC_JP_E9_A6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A7_infos[22] = {
-     o2(0xC7,0xFD), o2(0xC2,0xCC), o2(0xB1,0xD8), o2(0xB6,0xEE),
-     o2(0xB6,0xEF), o2(0xC3,0xF3), o2(0xF1,0xCE), o2(0xB6,0xF0),
-     o2(0xB2,0xEF), o2(0xF1,0xCD), o2(0xF1,0xCB), o2(0xF1,0xCC),
-     o2(0xF1,0xCA), o2(0xF1,0xD8), o2(0xF1,0xCF), o2(0xF1,0xD0),
-     o2(0xF1,0xD1), o2(0xF1,0xD2), o2(0xF1,0xD4), o2(0xF1,0xD3),
-     o2(0xBD,0xD9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A7 = {
-    to_SHIFT_JIS_E9_A7_offsets,
-    to_EUC_JP_E9_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A8_infos[13] = {
-     o2(0xF1,0xD5), o2(0xF1,0xD7), o2(0xB5,0xB3), o2(0xF1,0xD6),
-     o2(0xC1,0xFB), o2(0xB8,0xB3), o2(0xF1,0xD9), o2(0xC2,0xCD),
-     o2(0xF1,0xDA), o2(0xC6,0xAD), o2(0xF1,0xDB), o2(0xF1,0xE0),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A8 = {
-    to_SHIFT_JIS_E9_A8_offsets,
-    to_EUC_JP_E9_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_A9_infos[18] = {
-     o2(0xF1,0xDE), o2(0xF1,0xDD), o2(0xF1,0xDF), o2(0xF1,0xDC),
-     o2(0xF1,0xE2), o2(0xFC,0xE1), o2(0xF1,0xE1), o2(0xF1,0xE4),
-     o2(0xB6,0xC3), o2(0xF1,0xE3), o2(0xF1,0xE5), o2(0xF1,0xE6),
-     o2(0xF1,0xE8), o2(0xF1,0xE7), o2(0xF1,0xE9), o2(0xF1,0xEB),
-     o2(0xF1,0xEA),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_A9 = {
-    to_SHIFT_JIS_E9_A9_offsets,
-    to_EUC_JP_E9_A9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AA_infos[6] = {
-     o2(0xB9,0xFC), o2(0xF1,0xEC), o2(0xF1,0xED), o2(0xB3,0xBC),
-     o2(0xF1,0xEE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AA = {
-    to_SHIFT_JIS_E9_AA_offsets,
-    to_EUC_JP_E9_AA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AB_infos[24] = {
-     o2(0xF1,0xEF), o2(0xBF,0xF1), o2(0xF1,0xF0), o2(0xF1,0xF1),
-     o2(0xF1,0xF2), o2(0xF1,0xF3), o2(0xB9,0xE2), o2(0xFC,0xE2),
-     o2(0xFC,0xE3), o2(0xF1,0xF4), o2(0xF1,0xF5), o2(0xF1,0xF6),
-     o2(0xF1,0xF7), o2(0xF1,0xF8), o2(0xC8,0xB1), o2(0xF1,0xFA),
-     o2(0xC9,0xA6), o2(0xF1,0xFB), o2(0xF1,0xF9), o2(0xF1,0xFD),
-     o2(0xF1,0xFC), o2(0xF1,0xFE), o2(0xF2,0xA1),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AB = {
-    to_SHIFT_JIS_E9_AB_offsets,
-    to_EUC_JP_E9_AB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AC_infos[18] = {
-     o2(0xF2,0xA2), o2(0xF2,0xA3), o2(0xF2,0xA4), o2(0xF2,0xA5),
-     o2(0xF2,0xA6), o2(0xF2,0xA7), o2(0xF2,0xA8), o2(0xF2,0xA9),
-     o2(0xF2,0xAA), o2(0xF2,0xAB), o2(0xF2,0xAC), o2(0xF2,0xAD),
-     o2(0xF2,0xAE), o2(0xDD,0xB5), o2(0xF2,0xAF), o2(0xE4,0xF8),
-     o2(0xB5,0xB4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AC = {
-    to_SHIFT_JIS_E9_AC_offsets,
-    to_EUC_JP_E9_AC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AD_infos[17] = {
-     o2(0xB3,0xA1), o2(0xBA,0xB2), o2(0xF2,0xB1), o2(0xF2,0xB0),
-     o2(0xCC,0xA5), o2(0xF2,0xB3), o2(0xF2,0xB4), o2(0xF2,0xB2),
-     o2(0xF2,0xB5), o2(0xCB,0xE2), o2(0xF2,0xB6), o2(0xB5,0xFB),
-     o2(0xCF,0xA5), o2(0xFC,0xE5), o2(0xF2,0xB7), o2(0xFC,0xE4),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AD = {
-    to_SHIFT_JIS_E9_AD_offsets,
-    to_EUC_JP_E9_AD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AE_infos[20] = {
-     o2(0xF2,0xB9), o2(0xB0,0xBE), o2(0xFC,0xE6), o2(0xF2,0xBA),
-     o2(0xCA,0xAB), o2(0xF2,0xB8), o2(0xF2,0xBB), o2(0xF2,0xBC),
-     o2(0xF2,0xBD), o2(0xF2,0xBE), o2(0xF2,0xBF), o2(0xCB,0xEE),
-     o2(0xBB,0xAD), o2(0xBA,0xFA), o2(0xC1,0xAF), o2(0xFC,0xE7),
-     o2(0xF2,0xC0), o2(0xF2,0xC3), o2(0xFC,0xE8),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AE = {
-    to_SHIFT_JIS_E9_AE_offsets,
-    to_EUC_JP_E9_AE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_AF_infos[20] = {
-     o2(0xF2,0xC1), o2(0xF2,0xC4), o2(0xB8,0xF1), o2(0xF2,0xC2),
-     o2(0xF2,0xC5), o2(0xF2,0xC6), o2(0xF2,0xC7), o2(0xF2,0xCB),
-     o2(0xBB,0xAA), o2(0xC2,0xE4), o2(0xF2,0xCC), o2(0xF2,0xC9),
-     o2(0xF2,0xC8), o2(0xF2,0xCA), o2(0xB7,0xDF), o2(0xF2,0xD0),
-     o2(0xF2,0xCF), o2(0xF2,0xCE), o2(0xB0,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_AF = {
-    to_SHIFT_JIS_E9_AF_offsets,
-    to_EUC_JP_E9_AF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B0_infos[27] = {
-     o2(0xFC,0xE9), o2(0xF2,0xDA), o2(0xF2,0xD6), o2(0xF2,0xD7),
-     o2(0xF2,0xD3), o2(0xF2,0xD9), o2(0xF2,0xD5), o2(0xB3,0xE2),
-     o2(0xCF,0xCC), o2(0xF2,0xD8), o2(0xF2,0xD4), o2(0xF2,0xD2),
-     o2(0xF2,0xD1), o2(0xF2,0xDC), o2(0xF2,0xDF), o2(0xF2,0xDE),
-     o2(0xF2,0xDD), o2(0xC9,0xC9), o2(0xF2,0xDB), o2(0xB0,0xF3),
-     o2(0xF2,0xE0), o2(0xF2,0xE2), o2(0xB3,0xEF), o2(0xF2,0xCD),
-     o2(0xB1,0xB7), o2(0xF2,0xE4),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B0 = {
-    to_SHIFT_JIS_E9_B0_offsets,
-    to_EUC_JP_E9_B0_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B1_infos[11] = {
-     o2(0xF2,0xE3), o2(0xF2,0xE1), o2(0xC3,0xAD), o2(0xCB,0xF0),
-     o2(0xCE,0xDA), o2(0xF2,0xE5), o2(0xF2,0xE6), o2(0xF2,0xE7),
-     o2(0xF2,0xE8), o2(0xF2,0xE9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B1 = {
-    to_SHIFT_JIS_E9_B1_offsets,
-    to_EUC_JP_E9_B1_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B3_infos[10] = {
-     o2(0xC4,0xBB), o2(0xF2,0xEA), o2(0xC8,0xB7), o2(0xF2,0xEF),
-     o2(0xF2,0xEB), o2(0xF2,0xEC), o2(0xCB,0xB1), o2(0xCC,0xC4),
-     o2(0xC6,0xD0),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B3 = {
-    to_SHIFT_JIS_E9_B3_offsets,
-    to_EUC_JP_E9_B3_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B4_infos[20] = {
-     o2(0xF2,0xF0), o2(0xF2,0xF1), o2(0xC6,0xBE), o2(0xF2,0xEE),
-     o2(0xF2,0xED), o2(0xB2,0xAA), o2(0xF2,0xF9), o2(0xF2,0xF8),
-     o2(0xB1,0xF5), o2(0xF2,0xF6), o2(0xF2,0xF5), o2(0xF2,0xF3),
-     o2(0xB3,0xFB), o2(0xF2,0xF2), o2(0xBC,0xB2), o2(0xB2,0xA9),
-     o2(0xB9,0xE3), o2(0xF2,0xFC), o2(0xF2,0xFB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B4 = {
-    to_SHIFT_JIS_E9_B4_offsets,
-    to_EUC_JP_E9_B4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B5_infos[20] = {
-     o2(0xF2,0xFA), o2(0xF2,0xF7), o2(0xF2,0xFD), o2(0xF2,0xFE),
-     o2(0xF3,0xA5), o2(0xF3,0xA4), o2(0xF3,0xA6), o2(0xB1,0xAD),
-     o2(0xF3,0xA1), o2(0xF3,0xA2), o2(0xB9,0xF4), o2(0xCC,0xB9),
-     o2(0xF3,0xA3), o2(0xFC,0xEB), o2(0xCB,0xB2), o2(0xF3,0xAB),
-     o2(0xFC,0xEA), o2(0xF3,0xA7), o2(0xF3,0xAC),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B5 = {
-    to_SHIFT_JIS_E9_B5_offsets,
-    to_EUC_JP_E9_B5_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B6_infos[14] = {
-     o2(0xF3,0xA9), o2(0xF3,0xA8), o2(0xB7,0xDC), o2(0xF3,0xAD),
-     o2(0xF3,0xAE), o2(0xF3,0xAF), o2(0xF3,0xAA), o2(0xF2,0xF4),
-     o2(0xF3,0xB0), o2(0xC4,0xE1), o2(0xF3,0xB4), o2(0xF3,0xB5),
-     o2(0xF3,0xB3),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B6 = {
-    to_SHIFT_JIS_E9_B6_offsets,
-    to_EUC_JP_E9_B6_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B7_infos[16] = {
-     o2(0xF3,0xB2), o2(0xF3,0xB8), o2(0xF3,0xB1), o2(0xF3,0xB6),
-     o2(0xF3,0xB7), o2(0xF3,0xBA), o2(0xF3,0xB9), o2(0xF3,0xBC),
-     o2(0xF3,0xBD), o2(0xF3,0xBE), o2(0xCF,0xC9), o2(0xF3,0xBB),
-     o2(0xC2,0xEB), o2(0xBA,0xED), o2(0xF3,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B7 = {
-    to_SHIFT_JIS_E9_B7_offsets,
-    to_EUC_JP_E9_B7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B8_infos[5] = {
-     o2(0xFC,0xED), o2(0xF3,0xC0), o2(0xF3,0xC1), o2(0xF3,0xC2),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B8 = {
-    to_SHIFT_JIS_E9_B8_offsets,
-    to_EUC_JP_E9_B8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_B9_infos[6] = {
-     o2(0xF3,0xC3), o2(0xB8,0xB4), o2(0xF3,0xC4), o2(0xF3,0xC5),
-     o2(0xBC,0xAF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_B9 = {
-    to_SHIFT_JIS_E9_B9_offsets,
-    to_EUC_JP_E9_B9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_BA_infos[24] = {
-     o2(0xF3,0xC6), o2(0xF3,0xC7), o2(0xF3,0xC8), o2(0xF3,0xC9),
-     o2(0xF3,0xCC), o2(0xF3,0xCA), o2(0xCF,0xBC), o2(0xF3,0xCB),
-     o2(0xCE,0xEF), o2(0xF3,0xCD), o2(0xCE,0xDB), o2(0xF3,0xCE),
-     o2(0xC7,0xFE), o2(0xF3,0xCF), o2(0xF3,0xD1), o2(0xF3,0xD2),
-     o2(0xF3,0xD0), o2(0xB9,0xED), o2(0xCC,0xCD), o2(0xCB,0xE3),
-     o2(0xD6,0xF7), o2(0xDD,0xE0), o2(0xCB,0xFB),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_BA = {
-    to_SHIFT_JIS_E9_BA_offsets,
-    to_EUC_JP_E9_BA_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_BB_infos[27] = {
-     o2(0xB2,0xAB), o2(0xF3,0xD4), o2(0xB5,0xD0), o2(0xF3,0xD5),
-     o2(0xF3,0xD6), o2(0xF3,0xD7), o2(0xFC,0xEE), o2(0xB9,0xF5),
-     o2(0xF3,0xD8), o2(0xE0,0xD4), o2(0xCC,0xDB), o2(0xC2,0xE3),
-     o2(0xF3,0xD9), o2(0xF3,0xDB), o2(0xF3,0xDA), o2(0xF3,0xDC),
-     o2(0xF3,0xDD), o2(0xF3,0xDE), o2(0xF3,0xDF), o2(0xF3,0xE0),
-     o2(0xF3,0xE1), o2(0xF3,0xE2), o2(0xF3,0xE3), o2(0xF3,0xE4),
-     o2(0xF3,0xE5), o2(0xF3,0xE6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_BB = {
-    to_SHIFT_JIS_E9_BB_offsets,
-    to_EUC_JP_E9_BB_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_BC_infos[11] = {
-     o2(0xF3,0xE7), o2(0xF3,0xE8), o2(0xC5,0xA4), o2(0xB8,0xDD),
-     o2(0xF3,0xEA), o2(0xC1,0xCD), o2(0xF3,0xEB), o2(0xF3,0xEC),
-     o2(0xC9,0xA1), o2(0xF3,0xED),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_BC = {
-    to_SHIFT_JIS_E9_BC_offsets,
-    to_EUC_JP_E9_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_BD_infos[19] = {
-     o2(0xF3,0xEE), o2(0xE3,0xB7), o2(0xEC,0xDA), o2(0xF0,0xED),
-     o2(0xF3,0xEF), o2(0xF3,0xF0), o2(0xF3,0xF2), o2(0xF3,0xF3),
-     o2(0xF3,0xF4), o2(0xCE,0xF0), o2(0xF3,0xF1), o2(0xF3,0xF5),
-     o2(0xF3,0xF6), o2(0xF3,0xF8), o2(0xF3,0xF7), o2(0xF3,0xFA),
-     o2(0xF3,0xFB), o2(0xF3,0xF9),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_BD = {
-    to_SHIFT_JIS_E9_BD_offsets,
-    to_EUC_JP_E9_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_BE_infos[6] = {
-     o2(0xCE,0xB6), o2(0xF3,0xFC), o2(0xF3,0xFD), o2(0xE3,0xD4),
-     o2(0xF3,0xFE),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9_BE = {
-    to_SHIFT_JIS_E9_BE_offsets,
-    to_EUC_JP_E9_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_E9_infos[61] = {
-     &to_EUC_JP_E9_80, &to_EUC_JP_E9_81, &to_EUC_JP_E9_82, &to_EUC_JP_E9_83,
-     &to_EUC_JP_E9_84, &to_EUC_JP_E9_85, &to_EUC_JP_E9_86, &to_EUC_JP_E9_87,
-     &to_EUC_JP_E9_88, &to_EUC_JP_E9_89, &to_EUC_JP_E9_8A, &to_EUC_JP_E9_8B,
-     &to_EUC_JP_E9_8C, &to_EUC_JP_E9_8D, &to_EUC_JP_E9_8E, &to_EUC_JP_E9_8F,
-     &to_EUC_JP_E9_90, &to_EUC_JP_E9_91, &to_EUC_JP_E9_92, &to_EUC_JP_E9_95,
-     &to_EUC_JP_E9_96, &to_EUC_JP_E9_97, &to_EUC_JP_E9_98, &to_EUC_JP_E9_99,
-     &to_EUC_JP_E9_9A, &to_EUC_JP_E9_9B, &to_EUC_JP_E9_9C, &to_EUC_JP_E9_9D,
-     &to_EUC_JP_E9_9E, &to_EUC_JP_E9_9F, &to_EUC_JP_E9_A0, &to_EUC_JP_E9_A1,
-     &to_EUC_JP_E9_A2, &to_EUC_JP_E9_A3, &to_EUC_JP_E9_A4, &to_EUC_JP_E9_A5,
-     &to_EUC_JP_E9_A6, &to_EUC_JP_E9_A7, &to_EUC_JP_E9_A8, &to_EUC_JP_E9_A9,
-     &to_EUC_JP_E9_AA, &to_EUC_JP_E9_AB, &to_EUC_JP_E9_AC, &to_EUC_JP_E9_AD,
-     &to_EUC_JP_E9_AE, &to_EUC_JP_E9_AF, &to_EUC_JP_E9_B0, &to_EUC_JP_E9_B1,
-     &to_EUC_JP_E9_B3, &to_EUC_JP_E9_B4, &to_EUC_JP_E9_B5, &to_EUC_JP_E9_B6,
-     &to_EUC_JP_E9_B7, &to_EUC_JP_E9_B8, &to_EUC_JP_E9_B9, &to_EUC_JP_E9_BA,
-     &to_EUC_JP_E9_BB, &to_EUC_JP_E9_BC, &to_EUC_JP_E9_BD, &to_EUC_JP_E9_BE,
-                UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_E9 = {
-    to_SHIFT_JIS_E9_offsets,
-    to_EUC_JP_E9_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_A4_infos[2] = {
-     o2(0xFA,0xC6),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_A4 = {
-    to_SHIFT_JIS_EF_A4_offsets,
-    to_EUC_JP_EF_A4_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_A7_infos[2] = {
-     o2(0xFC,0xCF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_A7 = {
-    to_SHIFT_JIS_EF_A7_offsets,
-    to_EUC_JP_EF_A7_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_A8_infos[33] = {
-     o2(0xF9,0xD4), o2(0xF9,0xDF), o2(0xF9,0xE0), o2(0xF9,0xF5),
-     o2(0xFA,0xBE), o2(0xFA,0xCE), o2(0xFA,0xD0), o2(0xFA,0xFB),
-     o2(0xFB,0xA3), o2(0xFB,0xBA), o2(0xFB,0xC2), o2(0xFB,0xC3),
-     o2(0xFB,0xC4), o2(0xFB,0xC6), o2(0xFB,0xCA), o2(0xFB,0xCD),
-     o2(0xFB,0xD6), o2(0xFB,0xE1), o2(0xFB,0xE3), o2(0xFB,0xE4),
-     o2(0xFB,0xED), o2(0xFB,0xF5), o2(0xFB,0xF7), o2(0xFB,0xF8),
-     o2(0xFB,0xFB), o2(0xFC,0xB9), o2(0xFC,0xC0), o2(0xFC,0xD0),
-     o2(0xFC,0xDC), o2(0xFC,0xDD), o2(0xFC,0xDF), o2(0xFC,0xEC),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_A8 = {
-    to_SHIFT_JIS_EF_A8_offsets,
-    to_EUC_JP_EF_A8_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_BC_infos[62] = {
-     o2(0xA1,0xAA), o2(0xFC,0xFE), o2(0xA1,0xF4), o2(0xA1,0xF0),
-     o2(0xA1,0xF3), o2(0xA1,0xF5), o2(0xFC,0xFD), o2(0xA1,0xCA),
-     o2(0xA1,0xCB), o2(0xA1,0xF6), o2(0xA1,0xDC), o2(0xA1,0xA5),
-     o2(0xA1,0xBF), o2(0xA3,0xB0), o2(0xA3,0xB1), o2(0xA3,0xB2),
-     o2(0xA3,0xB3), o2(0xA3,0xB4), o2(0xA3,0xB5), o2(0xA3,0xB6),
-     o2(0xA3,0xB7), o2(0xA3,0xB8), o2(0xA3,0xB9), o2(0xA1,0xA7),
-     o2(0xA1,0xA8), o2(0xA1,0xE3), o2(0xA1,0xE1), o2(0xA1,0xE4),
-     o2(0xA1,0xA9), o2(0xA1,0xF7), o2(0xA3,0xC1), o2(0xA3,0xC2),
-     o2(0xA3,0xC3), o2(0xA3,0xC4), o2(0xA3,0xC5), o2(0xA3,0xC6),
-     o2(0xA3,0xC7), o2(0xA3,0xC8), o2(0xA3,0xC9), o2(0xA3,0xCA),
-     o2(0xA3,0xCB), o2(0xA3,0xCC), o2(0xA3,0xCD), o2(0xA3,0xCE),
-     o2(0xA3,0xCF), o2(0xA3,0xD0), o2(0xA3,0xD1), o2(0xA3,0xD2),
-     o2(0xA3,0xD3), o2(0xA3,0xD4), o2(0xA3,0xD5), o2(0xA3,0xD6),
-     o2(0xA3,0xD7), o2(0xA3,0xD8), o2(0xA3,0xD9), o2(0xA3,0xDA),
-     o2(0xA1,0xCE), o2(0xA1,0xC0), o2(0xA1,0xCF), o2(0xA1,0xB0),
-     o2(0xA1,0xB2),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_BC = {
-    to_SHIFT_JIS_EF_BC_offsets,
-    to_EUC_JP_EF_BC_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_BD_infos[62] = {
-     o2(0xA1,0xAE), o2(0xA3,0xE1), o2(0xA3,0xE2), o2(0xA3,0xE3),
-     o2(0xA3,0xE4), o2(0xA3,0xE5), o2(0xA3,0xE6), o2(0xA3,0xE7),
-     o2(0xA3,0xE8), o2(0xA3,0xE9), o2(0xA3,0xEA), o2(0xA3,0xEB),
-     o2(0xA3,0xEC), o2(0xA3,0xED), o2(0xA3,0xEE), o2(0xA3,0xEF),
-     o2(0xA3,0xF0), o2(0xA3,0xF1), o2(0xA3,0xF2), o2(0xA3,0xF3),
-     o2(0xA3,0xF4), o2(0xA3,0xF5), o2(0xA3,0xF6), o2(0xA3,0xF7),
-     o2(0xA3,0xF8), o2(0xA3,0xF9), o2(0xA3,0xFA), o2(0xA1,0xD0),
-     o2(0xA1,0xC3), o2(0xA1,0xD1), o2(0x8E,0xA1), o2(0x8E,0xA2),
-     o2(0x8E,0xA3), o2(0x8E,0xA4), o2(0x8E,0xA5), o2(0x8E,0xA6),
-     o2(0x8E,0xA7), o2(0x8E,0xA8), o2(0x8E,0xA9), o2(0x8E,0xAA),
-     o2(0x8E,0xAB), o2(0x8E,0xAC), o2(0x8E,0xAD), o2(0x8E,0xAE),
-     o2(0x8E,0xAF), o2(0x8E,0xB0), o2(0x8E,0xB1), o2(0x8E,0xB2),
-     o2(0x8E,0xB3), o2(0x8E,0xB4), o2(0x8E,0xB5), o2(0x8E,0xB6),
-     o2(0x8E,0xB7), o2(0x8E,0xB8), o2(0x8E,0xB9), o2(0x8E,0xBA),
-     o2(0x8E,0xBB), o2(0x8E,0xBC), o2(0x8E,0xBD), o2(0x8E,0xBE),
-     o2(0x8E,0xBF),         UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_BD = {
-    to_SHIFT_JIS_EF_BD_offsets,
-    to_EUC_JP_EF_BD_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_BE_infos[33] = {
-     o2(0x8E,0xC0), o2(0x8E,0xC1), o2(0x8E,0xC2), o2(0x8E,0xC3),
-     o2(0x8E,0xC4), o2(0x8E,0xC5), o2(0x8E,0xC6), o2(0x8E,0xC7),
-     o2(0x8E,0xC8), o2(0x8E,0xC9), o2(0x8E,0xCA), o2(0x8E,0xCB),
-     o2(0x8E,0xCC), o2(0x8E,0xCD), o2(0x8E,0xCE), o2(0x8E,0xCF),
-     o2(0x8E,0xD0), o2(0x8E,0xD1), o2(0x8E,0xD2), o2(0x8E,0xD3),
-     o2(0x8E,0xD4), o2(0x8E,0xD5), o2(0x8E,0xD6), o2(0x8E,0xD7),
-     o2(0x8E,0xD8), o2(0x8E,0xD9), o2(0x8E,0xDA), o2(0x8E,0xDB),
-     o2(0x8E,0xDC), o2(0x8E,0xDD), o2(0x8E,0xDE), o2(0x8E,0xDF),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF_BE = {
-    to_SHIFT_JIS_EF_BE_offsets,
-    to_EUC_JP_EF_BE_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_EF_infos[7] = {
-     &to_EUC_JP_EF_A4, &to_EUC_JP_EF_A7, &to_EUC_JP_EF_A8, &to_EUC_JP_EF_BC,
-     &to_EUC_JP_EF_BD, &to_EUC_JP_EF_BE,            UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP_EF = {
-    to_SHIFT_JIS_EF_offsets,
-    to_EUC_JP_EF_infos
-};
-
-static const struct byte_lookup* const
-to_EUC_JP_infos[17] = {
-             NOMAP, &to_EUC_JP_C2, &to_EUC_JP_C3, &to_EUC_JP_CE,
-     &to_EUC_JP_CF, &to_EUC_JP_D0, &to_EUC_JP_D1, &to_EUC_JP_E2,
-     &to_EUC_JP_E3, &to_EUC_JP_E4, &to_EUC_JP_E5, &to_EUC_JP_E6,
-     &to_EUC_JP_E7, &to_EUC_JP_E8, &to_EUC_JP_E9, &to_EUC_JP_EF,
-             UNDEF,
-};
-static const BYTE_LOOKUP
-to_EUC_JP = {
-    to_SHIFT_JIS_offsets,
-    to_EUC_JP_infos
-};
-static const rb_transcoder
-rb_to_EUC_JP = {
-    "UTF-8", "EUC-JP", &to_EUC_JP, 2, 1,
-    NULL, NULL,
-};
-
-#define ISO_2022_ENCODING(escseq, byte) ((escseq<<8)|byte)
-enum ISO_2022_ESCSEQ {
-    ISO_2022_CZD   = '!',
-    ISO_2022_C1D   = '"',
-    ISO_2022_GZD4  = '(',
-    ISO_2022_G1D4  = ')',
-    ISO_2022_G2D4  = '*',
-    ISO_2022_G3D4  = '+',
-    ISO_2022_G1D6  = '-',
-    ISO_2022_G2D6  = '.',
-    ISO_2022_G3D6  = '/',
-    ISO_2022_GZDM4 = ISO_2022_ENCODING('$','('),
-    ISO_2022_G1DM4 = ISO_2022_ENCODING('$',')'),
-    ISO_2022_G2DM4 = ISO_2022_ENCODING('$','*'),
-    ISO_2022_G3DM4 = ISO_2022_ENCODING('$','+'),
-    ISO_2022_G1DM6 = ISO_2022_ENCODING('$','-'),
-    ISO_2022_G2DM6 = ISO_2022_ENCODING('$','.'),
-    ISO_2022_G3DM6 = ISO_2022_ENCODING('$','/'),
-    ISO_2022_DOCS  = ISO_2022_ENCODING('%','I'),
-    ISO_2022_IRR   = '&'
-};
-
-
-#define ISO_2022_GZ_ASCII                       ISO_2022_ENCODING(ISO_2022_GZD4, 'B')
-#define ISO_2022_GZ_JIS_X_0201_Katakana         ISO_2022_ENCODING(ISO_2022_GZD4, 'I')
-#define ISO_2022_GZ_JIS_X_0201_Roman            ISO_2022_ENCODING(ISO_2022_GZD4, 'J')
-#define ISO_2022_GZ_JIS_C_6226_1978             ISO_2022_ENCODING(ISO_2022_GZDM4,'@')
-#define ISO_2022_GZ_JIS_X_0208_1983             ISO_2022_ENCODING(ISO_2022_GZDM4,'B')
-#define ISO_2022_GZ_JIS_X_0212_1990             ISO_2022_ENCODING(ISO_2022_GZDM4,'D')
-#define ISO_2022_GZ_JIS_X_0213_2000_1           ISO_2022_ENCODING(ISO_2022_GZDM4,'O')
-#define ISO_2022_GZ_JIS_X_0213_2000_2           ISO_2022_ENCODING(ISO_2022_GZDM4,'P')
-#define ISO_2022_GZ_JIS_X_0213_2004_1           ISO_2022_ENCODING(ISO_2022_GZDM4,'Q')
-
-static int
-get_iso_2022_mode(const unsigned char **in_pos)
-{
-    int new_mode;
-    const unsigned char *in_p = *in_pos;
-    switch (*in_p++)
-    {
-    case '(':
-	switch (*in_p++)
-	{
-	case 'B': case 'I': case 'J':
-	    new_mode = ISO_2022_ENCODING(ISO_2022_GZD4, *(in_p-1));
-	    break;
-	default:
-	    rb_raise(rb_eRuntimeError /*change exception*/, "this mode is not supported (ESC ( %c)", *(in_p-1));
-	    break;
-	}
-	break;
-    case '$':
-	switch (*in_p++)
-	{
-	case '@': case 'A': case 'B':
-	    new_mode = ISO_2022_ENCODING(ISO_2022_GZDM4, *(in_p-1));
-	    break;
-	case '(':
-	    switch (*in_p++)
-	    {
-	    case 'D': case 'O': case 'P': case 'Q':
-		new_mode = ISO_2022_ENCODING(ISO_2022_GZDM4, *(in_p-1));
-		break;
-	    default:
-		rb_raise(rb_eRuntimeError /*change exception*/, "this mode is not supported (ESC $ ( %c)", *(in_p-1));
-		break;
-	    }
-	    break;
-	default:
-	    rb_raise(rb_eRuntimeError /*change exception*/, "this mode is not supported (ESC $ %c)", *(in_p-1));
-	    break;
-	}
-	break;
-    default:
-	    rb_raise(rb_eRuntimeError /*change exception*/, "this mode is not supported (ESC %c)", *(in_p-1));
-	break;
-    }
-    *in_pos = in_p;
-    return new_mode;
-}
-
-static void
-from_iso_2022_jp_transcoder_preprocessor(const unsigned char **in_pos, unsigned char **out_pos,
-					 const unsigned char *in_stop, unsigned char *out_stop,
-					 rb_transcoding *my_transcoding)
-{
-    const rb_transcoder *my_transcoder = my_transcoding->transcoder;
-    const unsigned char *in_p = *in_pos;
-    unsigned char *out_p = *out_pos;
-    int cur_mode = ISO_2022_GZ_ASCII;
-    unsigned char c1;
-    unsigned char *out_s = out_stop - my_transcoder->max_output + 1;
-    while (in_p < in_stop) {
-	if (out_p >= out_s) {
-	    int len = (out_p - *out_pos);
-	    int new_len = (len + my_transcoder->max_output) * 2;
-	    *out_pos = (*my_transcoding->flush_func)(my_transcoding, len, new_len);
-	    out_p = *out_pos + len;
-	    out_s = *out_pos + new_len - my_transcoder->max_output;
-	}
-	c1 = *in_p++;
-	if (c1 == 0x1B) {
-	    cur_mode = get_iso_2022_mode(&in_p);
-	} else if (c1 == 0x1E || c1 == 0x1F) {
-	    /* SHIFT */
-	    rb_raise(rb_eRuntimeError /*change exception*/, "shift is not supported");
-	} else if (c1 >= 0x80) {
-	    rb_raise(rb_eRuntimeError /*change exception*/, "invalid byte sequence");
-	} else {
-	    switch (cur_mode) {
-	    case ISO_2022_GZ_ASCII:
-	    case ISO_2022_GZ_JIS_X_0201_Roman:
-		*out_p++ = c1;
-		break;
-	    case ISO_2022_GZ_JIS_X_0201_Katakana:
-		*out_p++ = 0x8E;
-		*out_p++ = c1 | 0x80;
-		break;
-	    case ISO_2022_GZ_JIS_X_0212_1990:
-		*out_p++ = 0x8F;
-	    case ISO_2022_GZ_JIS_C_6226_1978:
-	    case ISO_2022_GZ_JIS_X_0208_1983:
-		*out_p++ = c1 | 0x80;
-		*out_p++ = *in_p++ | 0x80;
-		break;
-	    }
-	}
-    }
-    /* cleanup */
-    *in_pos  = in_p;
-    *out_pos = out_p;
-}
-
-static int
-select_iso_2022_mode(unsigned char **out_pos, int new_mode)
-{
-    unsigned char *out_p = *out_pos;
-    *out_p++ = '\x1b';
-    switch (new_mode>>8)
-    {
-    case ISO_2022_GZD4:
-	*out_p++ = new_mode >> 8;
-	*out_p++ = new_mode & 0x7F;
-	break;
-    case ISO_2022_GZDM4:
-	*out_p++ = new_mode >> 16;
-	if ((new_mode & 0x7F) != '@' &&
-	    (new_mode & 0x7F) != 'A' &&
-	    (new_mode & 0x7F) != 'B')
-	{
-	    *out_p++ = (new_mode>>8) & 0x7F;
-	}
-	*out_p++ = new_mode & 0x7F;
-	break;
-    default:
-	rb_raise(rb_eRuntimeError /*change exception*/, "this mode is not supported.");
-	break;
-    }
-    *out_pos = out_p;
-    return new_mode;
-}
-
-static void
-to_iso_2022_jp_transcoder_postprocessor(const unsigned char **in_pos, unsigned char **out_pos,
-					const unsigned char *in_stop, unsigned char *out_stop,
-					rb_transcoding *my_transcoding)
-{
-    const rb_transcoder *my_transcoder = my_transcoding->transcoder;
-    const unsigned char *in_p = *in_pos;
-    unsigned char *out_p = *out_pos;
-    int cur_mode = ISO_2022_GZ_ASCII, new_mode = 0;
-    unsigned char next_byte;
-    unsigned char *out_s = out_stop - my_transcoder->max_output + 1;
-    while (in_p < in_stop) {
-	if (out_p >= out_s) {
-	    int len = (out_p - *out_pos);
-	    int new_len = (len + my_transcoder->max_output) * 2;
-	    *out_pos = (*my_transcoding->flush_func)(my_transcoding, len, new_len);
-	    out_p = *out_pos + len;
-	    out_s = *out_pos + new_len - my_transcoder->max_output;
-	}
-	next_byte = *in_p++;
-	if (next_byte < 0x80) {
-	    new_mode = ISO_2022_GZ_ASCII;
-	} else if (next_byte == 0x8E) {
-	    new_mode = ISO_2022_GZ_JIS_X_0201_Katakana;
-	    next_byte = *in_p++;
-	} else if (next_byte == 0x8F) {
-	    new_mode = ISO_2022_GZ_JIS_X_0212_1990;
-	    next_byte = *in_p++;
-	} else {
-	    new_mode = ISO_2022_GZ_JIS_X_0208_1983;
-	}
-	if (cur_mode != new_mode)
-	    cur_mode = select_iso_2022_mode(&out_p, new_mode);
-	if (cur_mode < 0xFFFF) {
-	    *out_p++ = next_byte & 0x7F;
-	} else {
-	    *out_p++ = next_byte & 0x7F;
-	    *out_p++ = *in_p++ & 0x7F;
-	}
-    }
-    if (cur_mode != ISO_2022_GZ_ASCII)
-	cur_mode = select_iso_2022_mode(&out_p, ISO_2022_GZ_ASCII);
-    /* cleanup */
-    *in_pos  = in_p;
-    *out_pos = out_p;
-}
-
-static const rb_transcoder
-rb_from_ISO_2022_JP = {
-    "ISO-2022-JP", "UTF-8", &from_EUC_JP, 8, 0,
-    &from_iso_2022_jp_transcoder_preprocessor, NULL,
-};
-
-static const rb_transcoder
-rb_to_ISO_2022_JP = {
-    "UTF-8", "ISO-2022-JP", &to_EUC_JP, 8, 1,
-    NULL, &to_iso_2022_jp_transcoder_postprocessor,
-};
-
-void
-Init_japanese(void)
-{
-    rb_register_transcoder(&rb_from_SHIFT_JIS);
-    rb_register_transcoder(&rb_from_Windows_31J);
-    rb_register_transcoder(&rb_from_EUC_JP);
-    rb_register_transcoder(&rb_to_SHIFT_JIS);
-    rb_register_transcoder(&rb_to_Windows_31J);
-    rb_register_transcoder(&rb_to_EUC_JP);
-    rb_register_transcoder(&rb_from_ISO_2022_JP);
-    rb_register_transcoder(&rb_to_ISO_2022_JP);
-}
diff --git a/enc/trans/korean.c b/enc/trans/korean.c
deleted file mode 100644
index da0c4edc07..0000000000
--- a/enc/trans/korean.c
+++ /dev/null
@@ -1,46012 +0,0 @@
-#include "transcode_data.h"
-
-static const unsigned char
-to_EUC_KR_C2_offsets[64] = {
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-     20,  0, 20, 20,  1, 20, 20,  2,      3, 20,  4, 20, 20,  5, 20, 20,
-      6,  7,  8,  9, 10, 20, 11, 12,     13, 14, 15, 20, 16, 17, 18, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_C2_infos[21] = {
-          o2(0xA2,0xAE),      o2(0xA2,0xB4),
-          o2(0xA1,0xD7),      o2(0xA1,0xA7),
-          o2(0xA8,0xA3),      o2(0xA1,0xA9),
-          o2(0xA1,0xC6),      o2(0xA1,0xBE),
-          o2(0xA9,0xF7),      o2(0xA9,0xF8),
-          o2(0xA2,0xA5),      o2(0xA2,0xD2),
-          o2(0xA1,0xA4),      o2(0xA2,0xAC),
-          o2(0xA9,0xF6),      o2(0xA8,0xAC),
-          o2(0xA8,0xF9),      o2(0xA8,0xF6),
-          o2(0xA8,0xFA),      o2(0xA2,0xAF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_C2 = {
-    to_EUC_KR_C2_offsets,
-    to_EUC_KR_C2_infos
-};
-
-static const unsigned char
-to_EUC_KR_C3_offsets[64] = {
-     11, 11, 11, 11, 11, 11,  0, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-      1, 11, 11, 11, 11, 11, 11,  2,      3, 11, 11, 11, 11, 11,  4,  5,
-     11, 11, 11, 11, 11, 11,  6, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-      7, 11, 11, 11, 11, 11, 11,  8,      9, 11, 11, 11, 11, 11, 10, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_C3_infos[12] = {
-          o2(0xA8,0xA1),      o2(0xA8,0xA2),
-          o2(0xA1,0xBF),      o2(0xA8,0xAA),
-          o2(0xA8,0xAD),      o2(0xA9,0xAC),
-          o2(0xA9,0xA1),      o2(0xA9,0xA3),
-          o2(0xA1,0xC0),      o2(0xA9,0xAA),
-          o2(0xA9,0xAD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_C3 = {
-    to_EUC_KR_C3_offsets,
-    to_EUC_KR_C3_infos
-};
-
-static const unsigned char
-to_EUC_KR_C4_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  0,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  1,  2,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  3,  4,  5,  8,  8,  8,  8,      6,  8,  8,  8,  8,  8,  8,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_C4_infos[9] = {
-          o2(0xA9,0xA2),      o2(0xA8,0xA4),
-          o2(0xA9,0xA4),      o2(0xA9,0xA5),
-          o2(0xA8,0xA6),      o2(0xA9,0xA6),
-          o2(0xA9,0xA7),      o2(0xA8,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_C4 = {
-    to_EUC_KR_C4_offsets,
-    to_EUC_KR_C4_infos
-};
-
-static const unsigned char
-to_EUC_KR_C5_offsets[64] = {
-      0,  1,  2, 10, 10, 10, 10, 10,     10,  3,  4,  5, 10, 10, 10, 10,
-     10, 10,  6,  7, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10,  8,  9,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_C5_infos[11] = {
-          o2(0xA9,0xA8),      o2(0xA8,0xA9),
-          o2(0xA9,0xA9),      o2(0xA9,0xB0),
-          o2(0xA8,0xAF),      o2(0xA9,0xAF),
-          o2(0xA8,0xAB),      o2(0xA9,0xAB),
-          o2(0xA8,0xAE),      o2(0xA9,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_C5 = {
-    to_EUC_KR_C5_offsets,
-    to_EUC_KR_C5_infos
-};
-
-static const unsigned char
-to_EUC_KR_CB_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  0,      7,  7,  7,  7,  7,  7,  7,  7,
-      1,  7,  7,  7,  7,  7,  7,  7,      2,  3,  4,  5,  7,  6,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_CB_infos[8] = {
-          o2(0xA2,0xA7),      o2(0xA2,0xB0),
-          o2(0xA2,0xA8),      o2(0xA2,0xAB),
-          o2(0xA2,0xAA),      o2(0xA2,0xAD),
-          o2(0xA2,0xA9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_CB = {
-    to_EUC_KR_CB_offsets,
-    to_EUC_KR_CB_infos
-};
-
-static const unsigned char
-to_EUC_KR_CE_offsets[64] = {
-     39, 39, 39, 39, 39, 39, 39, 39,     39, 39, 39, 39, 39, 39, 39, 39,
-     39,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 39, 17, 18, 19, 20, 21,     22, 23, 39, 39, 39, 39, 39, 39,
-     39, 24, 25, 26, 27, 28, 29, 30,     31, 32, 33, 34, 35, 36, 37, 38,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_CE_infos[40] = {
-          o2(0xA5,0xC1),      o2(0xA5,0xC2),
-          o2(0xA5,0xC3),      o2(0xA5,0xC4),
-          o2(0xA5,0xC5),      o2(0xA5,0xC6),
-          o2(0xA5,0xC7),      o2(0xA5,0xC8),
-          o2(0xA5,0xC9),      o2(0xA5,0xCA),
-          o2(0xA5,0xCB),      o2(0xA5,0xCC),
-          o2(0xA5,0xCD),      o2(0xA5,0xCE),
-          o2(0xA5,0xCF),      o2(0xA5,0xD0),
-          o2(0xA5,0xD1),      o2(0xA5,0xD2),
-          o2(0xA5,0xD3),      o2(0xA5,0xD4),
-          o2(0xA5,0xD5),      o2(0xA5,0xD6),
-          o2(0xA5,0xD7),      o2(0xA5,0xD8),
-          o2(0xA5,0xE1),      o2(0xA5,0xE2),
-          o2(0xA5,0xE3),      o2(0xA5,0xE4),
-          o2(0xA5,0xE5),      o2(0xA5,0xE6),
-          o2(0xA5,0xE7),      o2(0xA5,0xE8),
-          o2(0xA5,0xE9),      o2(0xA5,0xEA),
-          o2(0xA5,0xEB),      o2(0xA5,0xEC),
-          o2(0xA5,0xED),      o2(0xA5,0xEE),
-          o2(0xA5,0xEF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_CE = {
-    to_EUC_KR_CE_offsets,
-    to_EUC_KR_CE_infos
-};
-
-static const unsigned char
-to_EUC_KR_CF_offsets[64] = {
-      0,  1,  9,  2,  3,  4,  5,  6,      7,  8,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_CF_infos[10] = {
-          o2(0xA5,0xF0),      o2(0xA5,0xF1),
-          o2(0xA5,0xF2),      o2(0xA5,0xF3),
-          o2(0xA5,0xF4),      o2(0xA5,0xF5),
-          o2(0xA5,0xF6),      o2(0xA5,0xF7),
-          o2(0xA5,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_CF = {
-    to_EUC_KR_CF_offsets,
-    to_EUC_KR_CF_infos
-};
-
-static const unsigned char
-to_EUC_KR_D0_offsets[64] = {
-     49,  0, 49, 49, 49, 49, 49, 49,     49, 49, 49, 49, 49, 49, 49, 49,
-      1,  2,  3,  4,  5,  6,  7,  8,      9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,     25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,     41, 42, 43, 44, 45, 46, 47, 48,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_D0_infos[50] = {
-          o2(0xAC,0xA7),      o2(0xAC,0xA1),
-          o2(0xAC,0xA2),      o2(0xAC,0xA3),
-          o2(0xAC,0xA4),      o2(0xAC,0xA5),
-          o2(0xAC,0xA6),      o2(0xAC,0xA8),
-          o2(0xAC,0xA9),      o2(0xAC,0xAA),
-          o2(0xAC,0xAB),      o2(0xAC,0xAC),
-          o2(0xAC,0xAD),      o2(0xAC,0xAE),
-          o2(0xAC,0xAF),      o2(0xAC,0xB0),
-          o2(0xAC,0xB1),      o2(0xAC,0xB2),
-          o2(0xAC,0xB3),      o2(0xAC,0xB4),
-          o2(0xAC,0xB5),      o2(0xAC,0xB6),
-          o2(0xAC,0xB7),      o2(0xAC,0xB8),
-          o2(0xAC,0xB9),      o2(0xAC,0xBA),
-          o2(0xAC,0xBB),      o2(0xAC,0xBC),
-          o2(0xAC,0xBD),      o2(0xAC,0xBE),
-          o2(0xAC,0xBF),      o2(0xAC,0xC0),
-          o2(0xAC,0xC1),      o2(0xAC,0xD1),
-          o2(0xAC,0xD2),      o2(0xAC,0xD3),
-          o2(0xAC,0xD4),      o2(0xAC,0xD5),
-          o2(0xAC,0xD6),      o2(0xAC,0xD8),
-          o2(0xAC,0xD9),      o2(0xAC,0xDA),
-          o2(0xAC,0xDB),      o2(0xAC,0xDC),
-          o2(0xAC,0xDD),      o2(0xAC,0xDE),
-          o2(0xAC,0xDF),      o2(0xAC,0xE0),
-          o2(0xAC,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_D0 = {
-    to_EUC_KR_D0_offsets,
-    to_EUC_KR_D0_infos
-};
-
-static const unsigned char
-to_EUC_KR_D1_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     17, 16, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_D1_infos[18] = {
-          o2(0xAC,0xE2),      o2(0xAC,0xE3),
-          o2(0xAC,0xE4),      o2(0xAC,0xE5),
-          o2(0xAC,0xE6),      o2(0xAC,0xE7),
-          o2(0xAC,0xE8),      o2(0xAC,0xE9),
-          o2(0xAC,0xEA),      o2(0xAC,0xEB),
-          o2(0xAC,0xEC),      o2(0xAC,0xED),
-          o2(0xAC,0xEE),      o2(0xAC,0xEF),
-          o2(0xAC,0xF0),      o2(0xAC,0xF1),
-          o2(0xAC,0xD7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_D1 = {
-    to_EUC_KR_D1_offsets,
-    to_EUC_KR_D1_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_00_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13,  0, 13, 13,      1,  2, 13, 13,  3,  4, 13, 13,
-      5,  6, 13, 13, 13,  7,  8, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      9, 13, 10, 11, 13, 13, 13, 13,     13, 13, 13, 12, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_00_infos[14] = {
-          o2(0xA1,0xAA),      o2(0xA1,0xAE),
-          o2(0xA1,0xAF),      o2(0xA1,0xB0),
-          o2(0xA1,0xB1),      o2(0xA2,0xD3),
-          o2(0xA2,0xD4),      o2(0xA1,0xA5),
-          o2(0xA1,0xA6),      o2(0xA2,0xB6),
-          o2(0xA1,0xC7),      o2(0xA1,0xC8),
-          o2(0xA1,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_00 = {
-    to_EUC_KR_E2_00_offsets,
-    to_EUC_KR_E2_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_01_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  0,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  1,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_01_infos[3] = {
-          o2(0xA9,0xF9),      o2(0xA9,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_01 = {
-    to_EUC_KR_E2_01_offsets,
-    to_EUC_KR_E2_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_02_offsets[64] = {
-      4,  0,  1,  2,  3,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_02_infos[5] = {
-          o2(0xA9,0xFB),      o2(0xA9,0xFC),
-          o2(0xA9,0xFD),      o2(0xA9,0xFE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_02 = {
-    to_EUC_KR_E2_02_offsets,
-    to_EUC_KR_E2_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_04_offsets[64] = {
-      8,  8,  8,  0,  8,  8,  8,  8,      8,  1,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  2,  8,  8,  3,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  4,  5,  8,  8,  8,  6,  8,      8,  8,  8,  7,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_04_infos[9] = {
-          o2(0xA1,0xC9),      o2(0xA2,0xB5),
-          o2(0xA7,0xA4),      o2(0xA2,0xE0),
-          o2(0xA2,0xE5),      o2(0xA2,0xE2),
-          o2(0xA7,0xD9),      o2(0xA1,0xCA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_04 = {
-    to_EUC_KR_E2_04_offsets,
-    to_EUC_KR_E2_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_05_offsets[64] = {
-     26, 26, 26, 26, 26, 26, 26, 26,     26, 26, 26, 26, 26, 26, 26, 26,
-     26, 26, 26,  0,  1, 26, 26, 26,     26, 26, 26,  2,  3,  4,  5, 26,
-      6,  7,  8,  9, 10, 11, 12, 13,     14, 15, 26, 26, 26, 26, 26, 26,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 26, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_05_infos[27] = {
-          o2(0xA8,0xF7),      o2(0xA8,0xF8),
-          o2(0xA8,0xFB),      o2(0xA8,0xFC),
-          o2(0xA8,0xFD),      o2(0xA8,0xFE),
-          o2(0xA5,0xB0),      o2(0xA5,0xB1),
-          o2(0xA5,0xB2),      o2(0xA5,0xB3),
-          o2(0xA5,0xB4),      o2(0xA5,0xB5),
-          o2(0xA5,0xB6),      o2(0xA5,0xB7),
-          o2(0xA5,0xB8),      o2(0xA5,0xB9),
-          o2(0xA5,0xA1),      o2(0xA5,0xA2),
-          o2(0xA5,0xA3),      o2(0xA5,0xA4),
-          o2(0xA5,0xA5),      o2(0xA5,0xA6),
-          o2(0xA5,0xA7),      o2(0xA5,0xA8),
-          o2(0xA5,0xA9),      o2(0xA5,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_05 = {
-    to_EUC_KR_E2_05_offsets,
-    to_EUC_KR_E2_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_06_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_06_infos[11] = {
-          o2(0xA1,0xE7),      o2(0xA1,0xE8),
-          o2(0xA1,0xE6),      o2(0xA1,0xE9),
-          o2(0xA1,0xEA),      o2(0xA2,0xD5),
-          o2(0xA2,0xD8),      o2(0xA2,0xD6),
-          o2(0xA2,0xD9),      o2(0xA2,0xD7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_06 = {
-    to_EUC_KR_E2_06_offsets,
-    to_EUC_KR_E2_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_07_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  0,  2,  1,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_07_infos[3] = {
-          o2(0xA2,0xA1),      o2(0xA2,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_07 = {
-    to_EUC_KR_E2_07_offsets,
-    to_EUC_KR_E2_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_08_offsets[64] = {
-      0, 24,  1,  2, 24, 24, 24,  3,      4, 24, 24,  5, 24, 24, 24,  6,
-     24,  7, 24, 24, 24, 24, 24, 24,     24, 24,  8, 24, 24,  9, 10, 24,
-     11, 24, 24, 24, 24, 12, 24, 13,     14, 15, 16, 17, 18, 24, 19, 24,
-     24, 24, 24, 24, 20, 21, 24, 24,     24, 24, 24, 24, 22, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_08_infos[25] = {
-          o2(0xA2,0xA3),      o2(0xA1,0xD3),
-          o2(0xA2,0xA4),      o2(0xA1,0xD4),
-          o2(0xA1,0xF4),      o2(0xA1,0xF5),
-          o2(0xA2,0xB3),      o2(0xA2,0xB2),
-          o2(0xA1,0xEE),      o2(0xA1,0xF0),
-          o2(0xA1,0xC4),      o2(0xA1,0xD0),
-          o2(0xA1,0xAB),      o2(0xA1,0xFC),
-          o2(0xA1,0xFD),      o2(0xA1,0xFB),
-          o2(0xA1,0xFA),      o2(0xA1,0xF2),
-          o2(0xA1,0xF3),      o2(0xA2,0xB1),
-          o2(0xA1,0xC5),      o2(0xA1,0xF1),
-          o2(0xA1,0xAD),      o2(0xA1,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_08 = {
-    to_EUC_KR_E2_08_offsets,
-    to_EUC_KR_E2_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_09_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  0,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      1,  2,  7,  7,  3,  4,  7,  7,      7,  7,  5,  6,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_09_infos[8] = {
-          o2(0xA1,0xD6),      o2(0xA1,0xC1),
-          o2(0xA1,0xD5),      o2(0xA1,0xC2),
-          o2(0xA1,0xC3),      o2(0xA1,0xEC),
-          o2(0xA1,0xED),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_09 = {
-    to_EUC_KR_E2_09_offsets,
-    to_EUC_KR_E2_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_0A_offsets[64] = {
-      6,  6,  0,  1,  6,  6,  2,  3,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  4,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  5,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_0A_infos[7] = {
-          o2(0xA1,0xF8),      o2(0xA1,0xF9),
-          o2(0xA1,0xF6),      o2(0xA1,0xF7),
-          o2(0xA2,0xC1),      o2(0xA1,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_0A = {
-    to_EUC_KR_E2_0A_offsets,
-    to_EUC_KR_E2_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_0C_offsets[64] = {
-      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,  1,  1,  1,  1,  1,  1,      1,  1,  1,  1,  1,  1,  1,  1,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_0C_infos[2] = {
-          o2(0xA1,0xD2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_0C = {
-    to_EUC_KR_E2_0C_offsets,
-    to_EUC_KR_E2_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_11_offsets[64] = {
-     27, 27, 27, 27, 27, 27, 27, 27,     27, 27, 27, 27, 27, 27, 27, 27,
-     27, 27, 27, 27, 27, 27, 27, 27,     27, 27, 27, 27, 27, 27, 27, 27,
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 27,
-     27, 27, 27, 27, 15, 16, 17, 18,     19, 20, 21, 22, 23, 24, 25, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_11_infos[28] = {
-          o2(0xA8,0xE7),      o2(0xA8,0xE8),
-          o2(0xA8,0xE9),      o2(0xA8,0xEA),
-          o2(0xA8,0xEB),      o2(0xA8,0xEC),
-          o2(0xA8,0xED),      o2(0xA8,0xEE),
-          o2(0xA8,0xEF),      o2(0xA8,0xF0),
-          o2(0xA8,0xF1),      o2(0xA8,0xF2),
-          o2(0xA8,0xF3),      o2(0xA8,0xF4),
-          o2(0xA8,0xF5),      o2(0xA9,0xE7),
-          o2(0xA9,0xE8),      o2(0xA9,0xE9),
-          o2(0xA9,0xEA),      o2(0xA9,0xEB),
-          o2(0xA9,0xEC),      o2(0xA9,0xED),
-          o2(0xA9,0xEE),      o2(0xA9,0xEF),
-          o2(0xA9,0xF0),      o2(0xA9,0xF1),
-          o2(0xA9,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_11 = {
-    to_EUC_KR_E2_11_offsets,
-    to_EUC_KR_E2_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_12_offsets[64] = {
-      0,  1,  2, 29, 29, 29, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,     29, 29, 29, 29,  3,  4,  5,  6,
-      7,  8,  9, 10, 11, 12, 13, 14,     15, 16, 17, 18, 19, 20, 21, 22,
-     23, 24, 25, 26, 27, 28, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_12_infos[30] = {
-          o2(0xA9,0xF3),      o2(0xA9,0xF4),
-          o2(0xA9,0xF5),      o2(0xA9,0xCD),
-          o2(0xA9,0xCE),      o2(0xA9,0xCF),
-          o2(0xA9,0xD0),      o2(0xA9,0xD1),
-          o2(0xA9,0xD2),      o2(0xA9,0xD3),
-          o2(0xA9,0xD4),      o2(0xA9,0xD5),
-          o2(0xA9,0xD6),      o2(0xA9,0xD7),
-          o2(0xA9,0xD8),      o2(0xA9,0xD9),
-          o2(0xA9,0xDA),      o2(0xA9,0xDB),
-          o2(0xA9,0xDC),      o2(0xA9,0xDD),
-          o2(0xA9,0xDE),      o2(0xA9,0xDF),
-          o2(0xA9,0xE0),      o2(0xA9,0xE1),
-          o2(0xA9,0xE2),      o2(0xA9,0xE3),
-          o2(0xA9,0xE4),      o2(0xA9,0xE5),
-          o2(0xA9,0xE6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_12 = {
-    to_EUC_KR_E2_12_offsets,
-    to_EUC_KR_E2_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_13_offsets[64] = {
-     26, 26, 26, 26, 26, 26, 26, 26,     26, 26, 26, 26, 26, 26, 26, 26,
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 26, 26, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26,     26, 26, 26, 26, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_13_infos[27] = {
-          o2(0xA8,0xCD),      o2(0xA8,0xCE),
-          o2(0xA8,0xCF),      o2(0xA8,0xD0),
-          o2(0xA8,0xD1),      o2(0xA8,0xD2),
-          o2(0xA8,0xD3),      o2(0xA8,0xD4),
-          o2(0xA8,0xD5),      o2(0xA8,0xD6),
-          o2(0xA8,0xD7),      o2(0xA8,0xD8),
-          o2(0xA8,0xD9),      o2(0xA8,0xDA),
-          o2(0xA8,0xDB),      o2(0xA8,0xDC),
-          o2(0xA8,0xDD),      o2(0xA8,0xDE),
-          o2(0xA8,0xDF),      o2(0xA8,0xE0),
-          o2(0xA8,0xE1),      o2(0xA8,0xE2),
-          o2(0xA8,0xE3),      o2(0xA8,0xE4),
-          o2(0xA8,0xE5),      o2(0xA8,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_13 = {
-    to_EUC_KR_E2_13_offsets,
-    to_EUC_KR_E2_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_14_offsets[64] = {
-      0,  1,  2,  3, 56, 56, 56, 56,     56, 56, 56, 56,  4,  5,  6,  7,
-      8,  9, 10, 11, 12, 13, 14, 15,     16, 17, 18, 19, 20, 21, 22, 23,
-     24, 25, 26, 27, 28, 29, 30, 31,     32, 33, 34, 35, 36, 37, 38, 39,
-     40, 41, 42, 43, 44, 45, 46, 47,     48, 49, 50, 51, 52, 53, 54, 55,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_14_infos[57] = {
-          o2(0xA6,0xA1),      o2(0xA6,0xAC),
-          o2(0xA6,0xA2),      o2(0xA6,0xAD),
-          o2(0xA6,0xA3),      o2(0xA6,0xC8),
-          o2(0xA6,0xC7),      o2(0xA6,0xAE),
-          o2(0xA6,0xA4),      o2(0xA6,0xC2),
-          o2(0xA6,0xC1),      o2(0xA6,0xAF),
-          o2(0xA6,0xA6),      o2(0xA6,0xC6),
-          o2(0xA6,0xC5),      o2(0xA6,0xB1),
-          o2(0xA6,0xA5),      o2(0xA6,0xC4),
-          o2(0xA6,0xC3),      o2(0xA6,0xB0),
-          o2(0xA6,0xA7),      o2(0xA6,0xBC),
-          o2(0xA6,0xC9),      o2(0xA6,0xCA),
-          o2(0xA6,0xB7),      o2(0xA6,0xCB),
-          o2(0xA6,0xCC),      o2(0xA6,0xB2),
-          o2(0xA6,0xA9),      o2(0xA6,0xBE),
-          o2(0xA6,0xCD),      o2(0xA6,0xCE),
-          o2(0xA6,0xB9),      o2(0xA6,0xCF),
-          o2(0xA6,0xD0),      o2(0xA6,0xB4),
-          o2(0xA6,0xA8),      o2(0xA6,0xD1),
-          o2(0xA6,0xD2),      o2(0xA6,0xB8),
-          o2(0xA6,0xBD),      o2(0xA6,0xD3),
-          o2(0xA6,0xD4),      o2(0xA6,0xB3),
-          o2(0xA6,0xAA),      o2(0xA6,0xD5),
-          o2(0xA6,0xD6),      o2(0xA6,0xBA),
-          o2(0xA6,0xBF),      o2(0xA6,0xD7),
-          o2(0xA6,0xD8),      o2(0xA6,0xB5),
-          o2(0xA6,0xAB),      o2(0xA6,0xD9),
-          o2(0xA6,0xDA),      o2(0xA6,0xBB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_14 = {
-    to_EUC_KR_E2_14_offsets,
-    to_EUC_KR_E2_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_15_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_15_infos[13] = {
-          o2(0xA6,0xDB),      o2(0xA6,0xDC),
-          o2(0xA6,0xC0),      o2(0xA6,0xDD),
-          o2(0xA6,0xDE),      o2(0xA6,0xDF),
-          o2(0xA6,0xE0),      o2(0xA6,0xE1),
-          o2(0xA6,0xE2),      o2(0xA6,0xE3),
-          o2(0xA6,0xE4),      o2(0xA6,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_15 = {
-    to_EUC_KR_E2_15_offsets,
-    to_EUC_KR_E2_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_16_offsets[64] = {
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  0, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-      1,  2, 16,  3,  4,  5,  6,  7,      8,  9, 16, 16, 16, 16, 16, 16,
-     16, 16, 10, 11, 16, 16, 12, 13,     16, 16, 16, 16, 14, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_16_infos[17] = {
-          o2(0xA2,0xC6),      o2(0xA1,0xE1),
-          o2(0xA1,0xE0),      o2(0xA2,0xC3),
-          o2(0xA2,0xC7),      o2(0xA2,0xC8),
-          o2(0xA2,0xCB),      o2(0xA2,0xCA),
-          o2(0xA2,0xC9),      o2(0xA2,0xCC),
-          o2(0xA1,0xE3),      o2(0xA1,0xE2),
-          o2(0xA2,0xBA),      o2(0xA2,0xB9),
-          o2(0xA1,0xE5),      o2(0xA1,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_16 = {
-    to_EUC_KR_E2_16_offsets,
-    to_EUC_KR_E2_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_17_offsets[64] = {
-      0,  1, 10, 10, 10, 10,  2,  3,      4, 10, 10,  5, 10, 10,  6,  7,
-      8,  9, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_17_infos[11] = {
-          o2(0xA2,0xB8),      o2(0xA2,0xB7),
-          o2(0xA1,0xDF),      o2(0xA1,0xDE),
-          o2(0xA2,0xC2),      o2(0xA1,0xDB),
-          o2(0xA1,0xDD),      o2(0xA1,0xDC),
-          o2(0xA2,0xC4),      o2(0xA2,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_17 = {
-    to_EUC_KR_E2_17_offsets,
-    to_EUC_KR_E2_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_18_offsets[64] = {
-      6,  6,  6,  6,  6,  0,  1,  6,      6,  6,  6,  6,  6,  6,  2,  3,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  4,  6,  5,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_18_infos[7] = {
-          o2(0xA1,0xDA),      o2(0xA1,0xD9),
-          o2(0xA2,0xCF),      o2(0xA2,0xCE),
-          o2(0xA2,0xD0),      o2(0xA2,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_18 = {
-    to_EUC_KR_E2_18_offsets,
-    to_EUC_KR_E2_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_19_offsets[64] = {
-      0, 13,  1, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      2,  3, 13,  4,  5,  6, 13,  7,      8,  9, 10, 13, 11, 12, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_19_infos[14] = {
-          o2(0xA1,0xCF),      o2(0xA1,0xCE),
-          o2(0xA2,0xBC),      o2(0xA2,0xBD),
-          o2(0xA2,0xC0),      o2(0xA2,0xBB),
-          o2(0xA2,0xBE),      o2(0xA2,0xBF),
-          o2(0xA2,0xCD),      o2(0xA2,0xDB),
-          o2(0xA2,0xDC),      o2(0xA2,0xDD),
-          o2(0xA2,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2_19 = {
-    to_EUC_KR_E2_19_offsets,
-    to_EUC_KR_E2_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E2_offsets[64] = {
-      0,  1,  2, 20,  3,  4,  5,  6,      7,  8,  9, 20, 10, 20, 20, 20,
-     20, 11, 12, 13, 14, 15, 16, 17,     18, 19, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E2_infos[21] = {
-       &to_EUC_KR_E2_00,   &to_EUC_KR_E2_01,
-       &to_EUC_KR_E2_02,   &to_EUC_KR_E2_04,
-       &to_EUC_KR_E2_05,   &to_EUC_KR_E2_06,
-       &to_EUC_KR_E2_07,   &to_EUC_KR_E2_08,
-       &to_EUC_KR_E2_09,   &to_EUC_KR_E2_0A,
-       &to_EUC_KR_E2_0C,   &to_EUC_KR_E2_11,
-       &to_EUC_KR_E2_12,   &to_EUC_KR_E2_13,
-       &to_EUC_KR_E2_14,   &to_EUC_KR_E2_15,
-       &to_EUC_KR_E2_16,   &to_EUC_KR_E2_17,
-       &to_EUC_KR_E2_18,   &to_EUC_KR_E2_19,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E2 = {
-    to_EUC_KR_E2_offsets,
-    to_EUC_KR_E2_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_00_offsets[64] = {
-      0,  1,  2,  3, 17, 17, 17, 17,      4,  5,  6,  7,  8,  9, 10, 11,
-     12, 13, 17, 14, 15, 16, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_00_infos[18] = {
-          o2(0xA1,0xA1),      o2(0xA1,0xA2),
-          o2(0xA1,0xA3),      o2(0xA1,0xA8),
-          o2(0xA1,0xB4),      o2(0xA1,0xB5),
-          o2(0xA1,0xB6),      o2(0xA1,0xB7),
-          o2(0xA1,0xB8),      o2(0xA1,0xB9),
-          o2(0xA1,0xBA),      o2(0xA1,0xBB),
-          o2(0xA1,0xBC),      o2(0xA1,0xBD),
-          o2(0xA1,0xEB),      o2(0xA1,0xB2),
-          o2(0xA1,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_00 = {
-    to_EUC_KR_E3_00_offsets,
-    to_EUC_KR_E3_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_01_offsets[64] = {
-     63,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_01_infos[64] = {
-          o2(0xAA,0xA1),      o2(0xAA,0xA2),
-          o2(0xAA,0xA3),      o2(0xAA,0xA4),
-          o2(0xAA,0xA5),      o2(0xAA,0xA6),
-          o2(0xAA,0xA7),      o2(0xAA,0xA8),
-          o2(0xAA,0xA9),      o2(0xAA,0xAA),
-          o2(0xAA,0xAB),      o2(0xAA,0xAC),
-          o2(0xAA,0xAD),      o2(0xAA,0xAE),
-          o2(0xAA,0xAF),      o2(0xAA,0xB0),
-          o2(0xAA,0xB1),      o2(0xAA,0xB2),
-          o2(0xAA,0xB3),      o2(0xAA,0xB4),
-          o2(0xAA,0xB5),      o2(0xAA,0xB6),
-          o2(0xAA,0xB7),      o2(0xAA,0xB8),
-          o2(0xAA,0xB9),      o2(0xAA,0xBA),
-          o2(0xAA,0xBB),      o2(0xAA,0xBC),
-          o2(0xAA,0xBD),      o2(0xAA,0xBE),
-          o2(0xAA,0xBF),      o2(0xAA,0xC0),
-          o2(0xAA,0xC1),      o2(0xAA,0xC2),
-          o2(0xAA,0xC3),      o2(0xAA,0xC4),
-          o2(0xAA,0xC5),      o2(0xAA,0xC6),
-          o2(0xAA,0xC7),      o2(0xAA,0xC8),
-          o2(0xAA,0xC9),      o2(0xAA,0xCA),
-          o2(0xAA,0xCB),      o2(0xAA,0xCC),
-          o2(0xAA,0xCD),      o2(0xAA,0xCE),
-          o2(0xAA,0xCF),      o2(0xAA,0xD0),
-          o2(0xAA,0xD1),      o2(0xAA,0xD2),
-          o2(0xAA,0xD3),      o2(0xAA,0xD4),
-          o2(0xAA,0xD5),      o2(0xAA,0xD6),
-          o2(0xAA,0xD7),      o2(0xAA,0xD8),
-          o2(0xAA,0xD9),      o2(0xAA,0xDA),
-          o2(0xAA,0xDB),      o2(0xAA,0xDC),
-          o2(0xAA,0xDD),      o2(0xAA,0xDE),
-          o2(0xAA,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_01 = {
-    to_EUC_KR_E3_01_offsets,
-    to_EUC_KR_E3_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_02_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 51, 51, 51, 51,     51, 51, 51, 51, 51, 51, 51, 51,
-     51, 20, 21, 22, 23, 24, 25, 26,     27, 28, 29, 30, 31, 32, 33, 34,
-     35, 36, 37, 38, 39, 40, 41, 42,     43, 44, 45, 46, 47, 48, 49, 50,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_02_infos[52] = {
-          o2(0xAA,0xE0),      o2(0xAA,0xE1),
-          o2(0xAA,0xE2),      o2(0xAA,0xE3),
-          o2(0xAA,0xE4),      o2(0xAA,0xE5),
-          o2(0xAA,0xE6),      o2(0xAA,0xE7),
-          o2(0xAA,0xE8),      o2(0xAA,0xE9),
-          o2(0xAA,0xEA),      o2(0xAA,0xEB),
-          o2(0xAA,0xEC),      o2(0xAA,0xED),
-          o2(0xAA,0xEE),      o2(0xAA,0xEF),
-          o2(0xAA,0xF0),      o2(0xAA,0xF1),
-          o2(0xAA,0xF2),      o2(0xAA,0xF3),
-          o2(0xAB,0xA1),      o2(0xAB,0xA2),
-          o2(0xAB,0xA3),      o2(0xAB,0xA4),
-          o2(0xAB,0xA5),      o2(0xAB,0xA6),
-          o2(0xAB,0xA7),      o2(0xAB,0xA8),
-          o2(0xAB,0xA9),      o2(0xAB,0xAA),
-          o2(0xAB,0xAB),      o2(0xAB,0xAC),
-          o2(0xAB,0xAD),      o2(0xAB,0xAE),
-          o2(0xAB,0xAF),      o2(0xAB,0xB0),
-          o2(0xAB,0xB1),      o2(0xAB,0xB2),
-          o2(0xAB,0xB3),      o2(0xAB,0xB4),
-          o2(0xAB,0xB5),      o2(0xAB,0xB6),
-          o2(0xAB,0xB7),      o2(0xAB,0xB8),
-          o2(0xAB,0xB9),      o2(0xAB,0xBA),
-          o2(0xAB,0xBB),      o2(0xAB,0xBC),
-          o2(0xAB,0xBD),      o2(0xAB,0xBE),
-          o2(0xAB,0xBF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_02 = {
-    to_EUC_KR_E3_02_offsets,
-    to_EUC_KR_E3_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_03_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,     55, 55, 55, 55, 55, 55, 55, 55,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_03_infos[56] = {
-          o2(0xAB,0xC0),      o2(0xAB,0xC1),
-          o2(0xAB,0xC2),      o2(0xAB,0xC3),
-          o2(0xAB,0xC4),      o2(0xAB,0xC5),
-          o2(0xAB,0xC6),      o2(0xAB,0xC7),
-          o2(0xAB,0xC8),      o2(0xAB,0xC9),
-          o2(0xAB,0xCA),      o2(0xAB,0xCB),
-          o2(0xAB,0xCC),      o2(0xAB,0xCD),
-          o2(0xAB,0xCE),      o2(0xAB,0xCF),
-          o2(0xAB,0xD0),      o2(0xAB,0xD1),
-          o2(0xAB,0xD2),      o2(0xAB,0xD3),
-          o2(0xAB,0xD4),      o2(0xAB,0xD5),
-          o2(0xAB,0xD6),      o2(0xAB,0xD7),
-          o2(0xAB,0xD8),      o2(0xAB,0xD9),
-          o2(0xAB,0xDA),      o2(0xAB,0xDB),
-          o2(0xAB,0xDC),      o2(0xAB,0xDD),
-          o2(0xAB,0xDE),      o2(0xAB,0xDF),
-          o2(0xAB,0xE0),      o2(0xAB,0xE1),
-          o2(0xAB,0xE2),      o2(0xAB,0xE3),
-          o2(0xAB,0xE4),      o2(0xAB,0xE5),
-          o2(0xAB,0xE6),      o2(0xAB,0xE7),
-          o2(0xAB,0xE8),      o2(0xAB,0xE9),
-          o2(0xAB,0xEA),      o2(0xAB,0xEB),
-          o2(0xAB,0xEC),      o2(0xAB,0xED),
-          o2(0xAB,0xEE),      o2(0xAB,0xEF),
-          o2(0xAB,0xF0),      o2(0xAB,0xF1),
-          o2(0xAB,0xF2),      o2(0xAB,0xF3),
-          o2(0xAB,0xF4),      o2(0xAB,0xF5),
-          o2(0xAB,0xF6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_03 = {
-    to_EUC_KR_E3_03_offsets,
-    to_EUC_KR_E3_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_04_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_04_infos[16] = {
-          o2(0xA4,0xA1),      o2(0xA4,0xA2),
-          o2(0xA4,0xA3),      o2(0xA4,0xA4),
-          o2(0xA4,0xA5),      o2(0xA4,0xA6),
-          o2(0xA4,0xA7),      o2(0xA4,0xA8),
-          o2(0xA4,0xA9),      o2(0xA4,0xAA),
-          o2(0xA4,0xAB),      o2(0xA4,0xAC),
-          o2(0xA4,0xAD),      o2(0xA4,0xAE),
-          o2(0xA4,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_04 = {
-    to_EUC_KR_E3_04_offsets,
-    to_EUC_KR_E3_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_05_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,     56, 57, 58, 59, 60, 61, 62, 63,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_05_infos[65] = {
-          o2(0xA4,0xB0),      o2(0xA4,0xB1),
-          o2(0xA4,0xB2),      o2(0xA4,0xB3),
-          o2(0xA4,0xB4),      o2(0xA4,0xB5),
-          o2(0xA4,0xB6),      o2(0xA4,0xB7),
-          o2(0xA4,0xB8),      o2(0xA4,0xB9),
-          o2(0xA4,0xBA),      o2(0xA4,0xBB),
-          o2(0xA4,0xBC),      o2(0xA4,0xBD),
-          o2(0xA4,0xBE),      o2(0xA4,0xBF),
-          o2(0xA4,0xC0),      o2(0xA4,0xC1),
-          o2(0xA4,0xC2),      o2(0xA4,0xC3),
-          o2(0xA4,0xC4),      o2(0xA4,0xC5),
-          o2(0xA4,0xC6),      o2(0xA4,0xC7),
-          o2(0xA4,0xC8),      o2(0xA4,0xC9),
-          o2(0xA4,0xCA),      o2(0xA4,0xCB),
-          o2(0xA4,0xCC),      o2(0xA4,0xCD),
-          o2(0xA4,0xCE),      o2(0xA4,0xCF),
-          o2(0xA4,0xD0),      o2(0xA4,0xD1),
-          o2(0xA4,0xD2),      o2(0xA4,0xD3),
-          o2(0xA4,0xD4),      o2(0xA4,0xD5),
-          o2(0xA4,0xD6),      o2(0xA4,0xD7),
-          o2(0xA4,0xD8),      o2(0xA4,0xD9),
-          o2(0xA4,0xDA),      o2(0xA4,0xDB),
-          o2(0xA4,0xDC),      o2(0xA4,0xDD),
-          o2(0xA4,0xDE),      o2(0xA4,0xDF),
-          o2(0xA4,0xE0),      o2(0xA4,0xE1),
-          o2(0xA4,0xE2),      o2(0xA4,0xE3),
-          o2(0xA4,0xE4),      o2(0xA4,0xE5),
-          o2(0xA4,0xE6),      o2(0xA4,0xE7),
-          o2(0xA4,0xE8),      o2(0xA4,0xE9),
-          o2(0xA4,0xEA),      o2(0xA4,0xEB),
-          o2(0xA4,0xEC),      o2(0xA4,0xED),
-          o2(0xA4,0xEE),      o2(0xA4,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_05 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_E3_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_06_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_06_infos[16] = {
-          o2(0xA4,0xF0),      o2(0xA4,0xF1),
-          o2(0xA4,0xF2),      o2(0xA4,0xF3),
-          o2(0xA4,0xF4),      o2(0xA4,0xF5),
-          o2(0xA4,0xF6),      o2(0xA4,0xF7),
-          o2(0xA4,0xF8),      o2(0xA4,0xF9),
-          o2(0xA4,0xFA),      o2(0xA4,0xFB),
-          o2(0xA4,0xFC),      o2(0xA4,0xFD),
-          o2(0xA4,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_06 = {
-    to_EUC_KR_E3_06_offsets,
-    to_EUC_KR_E3_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_08_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_08_infos[30] = {
-          o2(0xA9,0xB1),      o2(0xA9,0xB2),
-          o2(0xA9,0xB3),      o2(0xA9,0xB4),
-          o2(0xA9,0xB5),      o2(0xA9,0xB6),
-          o2(0xA9,0xB7),      o2(0xA9,0xB8),
-          o2(0xA9,0xB9),      o2(0xA9,0xBA),
-          o2(0xA9,0xBB),      o2(0xA9,0xBC),
-          o2(0xA9,0xBD),      o2(0xA9,0xBE),
-          o2(0xA9,0xBF),      o2(0xA9,0xC0),
-          o2(0xA9,0xC1),      o2(0xA9,0xC2),
-          o2(0xA9,0xC3),      o2(0xA9,0xC4),
-          o2(0xA9,0xC5),      o2(0xA9,0xC6),
-          o2(0xA9,0xC7),      o2(0xA9,0xC8),
-          o2(0xA9,0xC9),      o2(0xA9,0xCA),
-          o2(0xA9,0xCB),      o2(0xA9,0xCC),
-          o2(0xA2,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_08 = {
-    to_EUC_KR_E3_08_offsets,
-    to_EUC_KR_E3_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_09_offsets[64] = {
-     29, 29, 29, 29, 29, 29, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,     29, 29, 29, 29, 29, 29, 29, 29,
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 29, 29, 29, 28,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_09_infos[30] = {
-          o2(0xA8,0xB1),      o2(0xA8,0xB2),
-          o2(0xA8,0xB3),      o2(0xA8,0xB4),
-          o2(0xA8,0xB5),      o2(0xA8,0xB6),
-          o2(0xA8,0xB7),      o2(0xA8,0xB8),
-          o2(0xA8,0xB9),      o2(0xA8,0xBA),
-          o2(0xA8,0xBB),      o2(0xA8,0xBC),
-          o2(0xA8,0xBD),      o2(0xA8,0xBE),
-          o2(0xA8,0xBF),      o2(0xA8,0xC0),
-          o2(0xA8,0xC1),      o2(0xA8,0xC2),
-          o2(0xA8,0xC3),      o2(0xA8,0xC4),
-          o2(0xA8,0xC5),      o2(0xA8,0xC6),
-          o2(0xA8,0xC7),      o2(0xA8,0xC8),
-          o2(0xA8,0xC9),      o2(0xA8,0xCA),
-          o2(0xA8,0xCB),      o2(0xA8,0xCC),
-          o2(0xA2,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_09 = {
-    to_EUC_KR_E3_09_offsets,
-    to_EUC_KR_E3_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_0E_offsets[64] = {
-      0,  1,  2,  3,  4, 61, 61, 61,      5,  6,  7,  8,  9, 10, 11, 12,
-     13, 14, 15, 16, 17, 18, 19, 20,     21, 22, 23, 24, 25, 26, 27, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,     37, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 47, 48, 49, 50, 51, 52,     53, 54, 55, 56, 57, 58, 59, 60,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_0E_infos[62] = {
-          o2(0xA7,0xC9),      o2(0xA7,0xCA),
-          o2(0xA7,0xCB),      o2(0xA7,0xCC),
-          o2(0xA7,0xCD),      o2(0xA7,0xBA),
-          o2(0xA7,0xBB),      o2(0xA7,0xDC),
-          o2(0xA7,0xDD),      o2(0xA7,0xDE),
-          o2(0xA7,0xB6),      o2(0xA7,0xB7),
-          o2(0xA7,0xB8),      o2(0xA7,0xD4),
-          o2(0xA7,0xD5),      o2(0xA7,0xD6),
-          o2(0xA7,0xD7),      o2(0xA7,0xD8),
-          o2(0xA7,0xA1),      o2(0xA7,0xA2),
-          o2(0xA7,0xA3),      o2(0xA7,0xA5),
-          o2(0xA7,0xAB),      o2(0xA7,0xAC),
-          o2(0xA7,0xAD),      o2(0xA7,0xAE),
-          o2(0xA7,0xAF),      o2(0xA7,0xB0),
-          o2(0xA7,0xB1),      o2(0xA7,0xB2),
-          o2(0xA7,0xB3),      o2(0xA7,0xB4),
-          o2(0xA7,0xA7),      o2(0xA7,0xA8),
-          o2(0xA7,0xA9),      o2(0xA7,0xAA),
-          o2(0xA7,0xBD),      o2(0xA7,0xBE),
-          o2(0xA7,0xE5),      o2(0xA7,0xE6),
-          o2(0xA7,0xE7),      o2(0xA7,0xE8),
-          o2(0xA7,0xE1),      o2(0xA7,0xE2),
-          o2(0xA7,0xE3),      o2(0xA7,0xBF),
-          o2(0xA7,0xC0),      o2(0xA7,0xC1),
-          o2(0xA7,0xC2),      o2(0xA7,0xC3),
-          o2(0xA7,0xC4),      o2(0xA7,0xC5),
-          o2(0xA7,0xC6),      o2(0xA7,0xC7),
-          o2(0xA7,0xC8),      o2(0xA7,0xCE),
-          o2(0xA7,0xCF),      o2(0xA7,0xD0),
-          o2(0xA7,0xD1),      o2(0xA7,0xD2),
-          o2(0xA7,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_0E = {
-    to_EUC_KR_E3_0E_offsets,
-    to_EUC_KR_E3_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_0F_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 19, 19, 19, 19, 11,
-     12, 19, 19, 13, 19, 19, 14, 19,     15, 19, 19, 16, 17, 18, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_0F_infos[20] = {
-          o2(0xA7,0xDA),      o2(0xA7,0xDB),
-          o2(0xA2,0xE3),      o2(0xA7,0xEC),
-          o2(0xA7,0xA6),      o2(0xA7,0xE0),
-          o2(0xA7,0xEF),      o2(0xA2,0xE1),
-          o2(0xA7,0xBC),      o2(0xA7,0xED),
-          o2(0xA7,0xB5),      o2(0xA7,0xB9),
-          o2(0xA7,0xEA),      o2(0xA7,0xEB),
-          o2(0xA7,0xDF),      o2(0xA2,0xE4),
-          o2(0xA7,0xE4),      o2(0xA7,0xEE),
-          o2(0xA7,0xE9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3_0F = {
-    to_EUC_KR_E3_0F_offsets,
-    to_EUC_KR_E3_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E3_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6, 11,      7,  8, 11, 11, 11, 11,  9, 10,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E3_infos[12] = {
-       &to_EUC_KR_E3_00,   &to_EUC_KR_E3_01,
-       &to_EUC_KR_E3_02,   &to_EUC_KR_E3_03,
-       &to_EUC_KR_E3_04,   &to_EUC_KR_E3_05,
-       &to_EUC_KR_E3_06,   &to_EUC_KR_E3_08,
-       &to_EUC_KR_E3_09,   &to_EUC_KR_E3_0E,
-       &to_EUC_KR_E3_0F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E3 = {
-    to_EUC_KR_E3_offsets,
-    to_EUC_KR_E3_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_38_offsets[64] = {
-      0,  1, 21,  2, 21, 21, 21,  3,      4,  5,  6,  7, 21,  8, 21, 21,
-     21,  9, 21, 21, 10, 11, 12, 21,     13, 14, 21, 21, 21, 21, 15, 21,
-     21, 21, 21, 21, 21, 21, 21, 21,     21, 21, 21, 21, 21, 16, 21, 21,
-     21, 21, 17, 21, 21, 21, 21, 21,     18, 19, 21, 20, 21, 21, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_38_infos[22] = {
-          o2(0xEC,0xE9),      o2(0xEF,0xCB),
-          o2(0xF6,0xD2),      o2(0xD8,0xB2),
-          o2(0xED,0xDB),      o2(0xDF,0xB2),
-          o2(0xDF,0xBE),      o2(0xF9,0xBB),
-          o2(0xDC,0xF4),      o2(0xF5,0xE4),
-          o2(0xF3,0xA6),      o2(0xDD,0xE0),
-          o2(0xE1,0xA6),      o2(0xCE,0xF8),
-          o2(0xDC,0xB0),      o2(0xE3,0xAA),
-          o2(0xF1,0xE9),      o2(0xCD,0xFA),
-          o2(0xFC,0xAF),      o2(0xD3,0xA1),
-          o2(0xF1,0xAB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_38 = {
-    to_EUC_KR_E4_38_offsets,
-    to_EUC_KR_E4_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_39_offsets[64] = {
-     19, 19,  0,  1, 19,  2, 19, 19,     19, 19, 19,  3, 19,  4,  5,  6,
-     19, 19, 19, 19, 19, 19,  7, 19,      8,  9, 19, 19, 19, 10, 11, 12,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 13, 19, 14, 19, 19,
-     19, 19, 19, 15, 19, 19, 16, 17,     19, 19, 19, 19, 19, 19, 18, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_39_infos[20] = {
-          o2(0xE7,0xD1),      o2(0xD2,0xAC),
-          o2(0xCE,0xF9),      o2(0xF1,0xFD),
-          o2(0xDE,0xBF),      o2(0xFB,0xBA),
-          o2(0xF9,0xB9),      o2(0xCE,0xD2),
-          o2(0xE3,0xAB),      o2(0xEB,0xE0),
-          o2(0xCE,0xFA),      o2(0xCB,0xF7),
-          o2(0xE5,0xA5),      o2(0xCA,0xE1),
-          o2(0xD4,0xCC),      o2(0xEA,0xE1),
-          o2(0xDC,0xE3),      o2(0xDF,0xAD),
-          o2(0xCB,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_39 = {
-    to_EUC_KR_E4_39_offsets,
-    to_EUC_KR_E4_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3A_offsets[64] = {
-     26, 26,  0, 26, 26, 26,  1, 26,      2, 26, 26,  3,  4, 26,  5, 26,
-      6,  7,  8, 26,  9, 10, 26, 26,     11, 26, 26, 12, 26, 26, 13, 26,
-     26, 14, 15, 26, 16, 17, 18, 26,     19, 26, 26, 20, 21, 22, 23, 26,
-     26, 26, 26, 26, 26, 26, 24, 26,     26, 26, 25, 26, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3A_infos[27] = {
-          o2(0xD5,0xAF),      o2(0xD6,0xF5),
-          o2(0xE5,0xF8),      o2(0xDE,0xC0),
-          o2(0xEC,0xA3),      o2(0xE9,0xCD),
-          o2(0xEA,0xA7),      o2(0xE9,0xF6),
-          o2(0xFB,0xBB),      o2(0xE7,0xE9),
-          o2(0xEF,0xCC),      o2(0xD0,0xE6),
-          o2(0xDE,0xC1),      o2(0xE4,0xAC),
-          o2(0xD8,0xCC),      o2(0xF9,0xF1),
-          o2(0xCE,0xDF),      o2(0xFA,0xA4),
-          o2(0xE6,0xB2),      o2(0xFA,0xFB),
-          o2(0xFA,0xBD),      o2(0xCC,0xC8),
-          o2(0xEF,0xCD),      o2(0xD5,0xD5),
-          o2(0xD3,0xA2),      o2(0xEC,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3A = {
-    to_EUC_KR_E4_3A_offsets,
-    to_EUC_KR_E4_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3B_offsets[64] = {
-      0,  1, 23, 23,  2, 23, 23,  3,     23, 23,  4,  5, 23,  6, 23, 23,
-     23, 23, 23, 23,  7,  8,  9, 10,     11, 12, 23, 23, 23, 13, 23, 14,
-     23, 23, 23, 15, 16, 17, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     18, 23, 19, 23, 23, 23, 20, 21,     23, 23, 23, 22, 23, 23, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3B_infos[24] = {
-          o2(0xE4,0xA7),      o2(0xEC,0xD2),
-          o2(0xF6,0xB1),      o2(0xCE,0xFB),
-          o2(0xD0,0xD1),      o2(0xCB,0xBF),
-          o2(0xED,0xA4),      o2(0xED,0xA8),
-          o2(0xDE,0xC2),      o2(0xF6,0xE2),
-          o2(0xED,0xDC),      o2(0xDC,0xF5),
-          o2(0xE0,0xB9),      o2(0xD4,0xCE),
-          o2(0xF4,0xB5),      o2(0xD3,0xDB),
-          o2(0xD6,0xB5),      o2(0xEC,0xA4),
-          o2(0xE4,0xE6),      o2(0xF1,0xEA),
-          o2(0xCB,0xEC),      o2(0xCB,0xC0),
-          o2(0xEC,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3B = {
-    to_EUC_KR_E4_3B_offsets,
-    to_EUC_KR_E4_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3C_offsets[64] = {
-     16,  0, 16, 16, 16, 16, 16, 16,     16,  1,  2,  3, 16,  4,  5,  6,
-      7,  8, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16,  9,
-     16, 16, 16, 16, 10, 16, 11, 16,     12, 16, 13, 16, 14, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3C_infos[17] = {
-          o2(0xD0,0xEA),      o2(0xF9,0xF2),
-          o2(0xEC,0xA5),      o2(0xD0,0xDF),
-          o2(0xE7,0xEA),      o2(0xD0,0xEB),
-          o2(0xDC,0xD1),      o2(0xDB,0xE9),
-          o2(0xFD,0xCC),      o2(0xDB,0xD7),
-          o2(0xDA,0xE1),      o2(0xD6,0xB6),
-          o2(0xE3,0xDF),      o2(0xDE,0xC3),
-          o2(0xDE,0xC4),      o2(0xCA,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3C = {
-    to_EUC_KR_E4_3C_offsets,
-    to_EUC_KR_E4_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3D_offsets[64] = {
-     22, 22, 22,  0, 22, 22,  1,  2,      3, 22, 22, 22, 22,  4,  5,  6,
-      7,  8, 22, 22, 22,  9, 22, 22,     22, 10, 11, 12, 13, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22,     22, 14, 22, 22, 22, 22, 22, 15,
-     16, 22, 22, 17, 22, 22, 18, 22,     22, 22, 19, 22, 22, 22, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3D_infos[23] = {
-          o2(0xEE,0xEC),      o2(0xD3,0xA3),
-          o2(0xEE,0xB7),      o2(0xF8,0xCF),
-          o2(0xEA,0xC8),      o2(0xEE,0xB8),
-          o2(0xF1,0xAC),      o2(0xF1,0xA5),
-          o2(0xE9,0xCE),      o2(0xF9,0xBC),
-          o2(0xE5,0xF9),      o2(0xEC,0xEA),
-          o2(0xDD,0xD6),      o2(0xED,0xC2),
-          o2(0xF8,0xA5),      o2(0xE5,0xBA),
-          o2(0xDB,0xD8),      o2(0xCA,0xA2),
-          o2(0xD1,0xCD),      o2(0xEE,0xED),
-          o2(0xEC,0xEB),      o2(0xDE,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3D = {
-    to_EUC_KR_E4_3D_offsets,
-    to_EUC_KR_E4_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3E_offsets[64] = {
-     19,  0, 19,  1,  2, 19,  3, 19,      4, 19,  5,  6, 19,  7, 19,  8,
-     19,  9, 19, 19, 19, 19, 10, 19,     11, 19, 19, 12, 19, 13, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19, 19, 14, 15,
-     19, 19, 19, 19, 19, 16, 17, 19,     19, 19, 19, 19, 19, 19, 19, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3E_infos[20] = {
-          o2(0xE3,0xE0),      o2(0xCA,0xC9),
-          o2(0xF2,0xE9),      o2(0xD5,0xCE),
-          o2(0xF6,0xB6),      o2(0xCE,0xC2),
-          o2(0xD6,0xC7),      o2(0xE3,0xB4),
-          o2(0xF1,0xAD),      o2(0xEA,0xE2),
-          o2(0xD7,0xC2),      o2(0xF3,0xA7),
-          o2(0xCD,0xEA),      o2(0xEB,0xEE),
-          o2(0xD9,0xB2),      o2(0xFD,0xA5),
-          o2(0xF6,0xD5),      o2(0xD5,0xE2),
-          o2(0xF8,0xB5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3E = {
-    to_EUC_KR_E4_3E_offsets,
-    to_EUC_KR_E4_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_3F_offsets[64] = {
-     22, 22,  0,  1,  2, 22, 22, 22,     22,  3,  4, 22, 22, 22,  5, 22,
-     22,  6, 22,  7,  8, 22, 22,  9,     22, 22, 10, 22, 22, 11, 22, 12,
-     13, 14, 22, 22, 22, 22, 22, 22,     22, 22, 22, 22, 22, 22, 15, 16,
-     22, 17, 22, 18, 22, 19, 22, 22,     20, 22, 21, 22, 22, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_3F_infos[23] = {
-          o2(0xCC,0xF5),      o2(0xF5,0xB5),
-          o2(0xE4,0xAD),      o2(0xE7,0xEB),
-          o2(0xF1,0xD5),      o2(0xF0,0xBB),
-          o2(0xE9,0xB5),      o2(0xCC,0xC9),
-          o2(0xFA,0xD5),      o2(0xE1,0xD4),
-          o2(0xD7,0xD6),      o2(0xDC,0xC1),
-          o2(0xDE,0xC6),      o2(0xFA,0xEF),
-          o2(0xE3,0xE1),      o2(0xE1,0xF3),
-          o2(0xDC,0xF6),      o2(0xCE,0xFC),
-          o2(0xDB,0xC4),      o2(0xF8,0xF1),
-          o2(0xDC,0xE4),      o2(0xE5,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4_3F = {
-    to_EUC_KR_E4_3F_offsets,
-    to_EUC_KR_E4_3F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E4_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  1,  2,  3,  4,  5,  6,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E4_infos[9] = {
-       &to_EUC_KR_E4_38,   &to_EUC_KR_E4_39,
-       &to_EUC_KR_E4_3A,   &to_EUC_KR_E4_3B,
-       &to_EUC_KR_E4_3C,   &to_EUC_KR_E4_3D,
-       &to_EUC_KR_E4_3E,   &to_EUC_KR_E4_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E4 = {
-    to_EUC_KR_E4_offsets,
-    to_EUC_KR_E4_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_00_offsets[64] = {
-     24, 24,  0, 24, 24, 24,  1, 24,     24,  2, 24,  3, 24,  4, 24, 24,
-     24,  5,  6, 24, 24, 24,  7, 24,     24,  8,  9, 24, 10, 24, 11, 12,
-     24, 13, 24, 14, 15, 24, 16, 17,     18, 24, 19, 20, 21, 22, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24,     24, 24, 24, 23, 24, 24, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_00_infos[25] = {
-          o2(0xDC,0xB1),      o2(0xD5,0xD6),
-          o2(0xF3,0xDA),      o2(0xCB,0xC1),
-          o2(0xDB,0xC3),      o2(0xD9,0xFA),
-          o2(0xD3,0xEE),      o2(0xFA,0xB8),
-          o2(0xFD,0xA6),      o2(0xEB,0xEF),
-          o2(0xF4,0xA6),      o2(0xCC,0xCA),
-          o2(0xF3,0xA8),      o2(0xF3,0xDB),
-          o2(0xDB,0xA7),      o2(0xF6,0xB7),
-          o2(0xCF,0xE6),      o2(0xF0,0xF2),
-          o2(0xCB,0xDA),      o2(0xE7,0xD2),
-          o2(0xD7,0xC3),      o2(0xF6,0xF0),
-          o2(0xE8,0xDE),      o2(0xE5,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_00 = {
-    to_EUC_KR_E5_00_offsets,
-    to_EUC_KR_E5_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_01_offsets[64] = {
-     13, 13, 13,  0, 13, 13, 13,  1,      2,  3, 13, 13, 13, 13, 13,  4,
-     13, 13, 13, 13, 13,  5, 13, 13,     13, 13,  6, 13,  7, 13, 13, 13,
-     13, 13, 13, 13, 13,  8, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13,  9, 10, 11, 13,     12, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_01_infos[14] = {
-          o2(0xE5,0xE7),      o2(0xCA,0xA3),
-          o2(0xCC,0xA7),      o2(0xEA,0xC9),
-          o2(0xF8,0xB6),      o2(0xFA,0xA5),
-          o2(0xF1,0xAE),      o2(0xEF,0xCE),
-          o2(0xCB,0xED),      o2(0xF6,0xB0),
-          o2(0xEF,0xCF),      o2(0xE9,0xCF),
-          o2(0xF7,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_01 = {
-    to_EUC_KR_E5_01_offsets,
-    to_EUC_KR_E5_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_02_offsets[64] = {
-      0, 13, 13, 13, 13,  1, 13, 13,     13, 13, 13, 13, 13,  2, 13, 13,
-     13,  3, 13, 13, 13, 13, 13, 13,      4,  5, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13,  6,  7, 13, 13,
-     13, 13,  8,  9, 13, 10, 13, 11,     13, 13, 13, 13, 13, 13, 12, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_02_infos[14] = {
-          o2(0xCE,0xD3),      o2(0xDC,0xF7),
-          o2(0xDB,0xA8),      o2(0xCB,0xF8),
-          o2(0xDF,0xA1),      o2(0xDD,0xE1),
-          o2(0xF5,0xCA),      o2(0xE9,0xB6),
-          o2(0xE7,0xEC),      o2(0xEE,0xEE),
-          o2(0xF3,0xF0),      o2(0xDF,0xBF),
-          o2(0xCC,0xCB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_02 = {
-    to_EUC_KR_E5_02_offsets,
-    to_EUC_KR_E5_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_03_offsets[64] = {
-     15, 15, 15, 15, 15,  0, 15, 15,     15,  1,  2, 15, 15, 15, 15,  3,
-     15,  4, 15, 15, 15,  5,  6, 15,     15, 15,  7, 15, 15, 15,  8, 15,
-     15, 15, 15, 15, 15,  9, 15, 10,     15, 15, 15, 15, 15, 11, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 12, 15, 13, 15, 15, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_03_infos[16] = {
-          o2(0xD0,0xC1),      o2(0xF4,0xD2),
-          o2(0xE0,0xBA),      o2(0xDF,0xC0),
-          o2(0xCE,0xE0),      o2(0xDC,0xD2),
-          o2(0xFD,0xEA),      o2(0xD6,0xF6),
-          o2(0xEA,0xCA),      o2(0xE8,0xE9),
-          o2(0xE3,0xAC),      o2(0xF3,0xD0),
-          o2(0xCA,0xA4),      o2(0xDB,0xF8),
-          o2(0xDE,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_03 = {
-    to_EUC_KR_E5_03_offsets,
-    to_EUC_KR_E5_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_04_offsets[64] = {
-      0,  1, 13, 13,  2, 13,  3, 13,     13,  4, 13, 13, 13, 13, 13, 13,
-     13, 13,  5, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13,  6,
-     13,  7, 13, 13, 13, 13, 13, 13,     13, 13,  8, 13, 13, 13, 13, 13,
-     13, 13,  9, 13, 13, 13, 13, 10,     13, 13, 11, 13, 12, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_04_infos[14] = {
-          o2(0xEB,0xF0),      o2(0xF1,0xD6),
-          o2(0xE5,0xE2),      o2(0xCC,0xCC),
-          o2(0xCB,0xFB),      o2(0xEA,0xE3),
-          o2(0xDF,0xC1),      o2(0xD6,0xED),
-          o2(0xE9,0xD0),      o2(0xEE,0xB9),
-          o2(0xD5,0xE3),      o2(0xD1,0xD3),
-          o2(0xE5,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_04 = {
-    to_EUC_KR_E5_04_offsets,
-    to_EUC_KR_E5_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_05_offsets[64] = {
-      0,  1, 31,  2,  3,  4,  5,  6,      7,  8, 31,  9, 10, 11, 12, 31,
-     31, 31, 13, 31, 31, 31, 31, 31,     31, 31, 31, 31, 14, 31, 31, 31,
-     31, 31, 15, 31, 31, 16, 31, 17,     18, 19, 20, 21, 22, 23, 24, 31,
-     31, 25, 31, 31, 31, 26, 27, 28,     29, 31, 31, 31, 30, 31, 31, 31,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_05_infos[32] = {
-          o2(0xE8,0xB4),      o2(0xEB,0xC3),
-          o2(0xEA,0xAA),      o2(0xFA,0xFC),
-          o2(0xF5,0xF6),      o2(0xF0,0xBC),
-          o2(0xFD,0xD4),      o2(0xE0,0xBB),
-          o2(0xCE,0xC3),      o2(0xD0,0xBA),
-          o2(0xF7,0xBA),      o2(0xD8,0xF3),
-          o2(0xF7,0xCD),      o2(0xE4,0xAE),
-          o2(0xD4,0xDF),      o2(0xD0,0xE7),
-          o2(0xEC,0xFD),      o2(0xD2,0xAE),
-          o2(0xEE,0xEF),      o2(0xD5,0xD7),
-          o2(0xEA,0xE4),      o2(0xF8,0xA2),
-          o2(0xCD,0xEB),      o2(0xD7,0xBF),
-          o2(0xFB,0xB1),      o2(0xCD,0xEC),
-          o2(0xDC,0xB2),      o2(0xD0,0xEC),
-          o2(0xCE,0xFD),      o2(0xEE,0xF0),
-          o2(0xCC,0xC2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_05 = {
-    to_EUC_KR_E5_05_offsets,
-    to_EUC_KR_E5_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_06_offsets[64] = {
-      0, 14, 14, 14, 14, 14,  1, 14,     14, 14,  2, 14, 14,  3, 14, 14,
-     14, 14,  4, 14, 14,  5, 14,  6,     14, 14, 14, 14, 14, 14, 14, 14,
-      7, 14, 14, 14, 14,  8, 14, 14,     14, 14,  9, 14, 10, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 11, 12,     14, 14, 14, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_06_infos[15] = {
-          o2(0xD0,0xED),      o2(0xE5,0xF7),
-          o2(0xF3,0xFC),      o2(0xEE,0xA2),
-          o2(0xD9,0xB3),      o2(0xD8,0xF4),
-          o2(0xE9,0xB7),      o2(0xCE,0xAE),
-          o2(0xD9,0xA2),      o2(0xD8,0xF1),
-          o2(0xD4,0xCF),      o2(0xE5,0xA7),
-          o2(0xD5,0xD2),      o2(0xD6,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_06 = {
-    to_EUC_KR_E5_06_offsets,
-    to_EUC_KR_E5_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_07_offsets[64] = {
-     17, 17, 17, 17,  0, 17,  1, 17,     17,  2, 17,  3,  4,  5, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17,  6,  7,  8, 17,
-     17,  9, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     10, 11, 17, 17, 17, 17, 12, 17,     13, 14, 15, 17, 17, 16, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_07_infos[18] = {
-          o2(0xF4,0xA2),      o2(0xF1,0xD7),
-          o2(0xD5,0xD8),      o2(0xF0,0xBD),
-          o2(0xD7,0xD0),      o2(0xD4,0xD0),
-          o2(0xD7,0xCF),      o2(0xEB,0xEA),
-          o2(0xFD,0xEB),      o2(0xDB,0xED),
-          o2(0xFC,0xC5),      o2(0xCB,0xC2),
-          o2(0xFD,0xD5),      o2(0xF4,0xC8),
-          o2(0xE8,0xEA),      o2(0xF5,0xF3),
-          o2(0xF9,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_07 = {
-    to_EUC_KR_E5_07_offsets,
-    to_EUC_KR_E5_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_08_offsets[64] = {
-      0, 22, 22,  1, 22, 22,  2,  3,      4, 22,  5, 22, 22, 22,  6, 22,
-     22,  7, 22, 22, 22, 22, 22,  8,     22, 22, 22, 22, 22,  9, 22, 22,
-     22, 22, 22, 22, 10, 11, 22, 22,     22, 12, 13, 22, 22, 22, 14, 22,
-     15, 22, 22, 22, 22, 22, 16, 17,     18, 19, 20, 21, 22, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_08_infos[23] = {
-          o2(0xD3,0xEF),      o2(0xEC,0xD3),
-          o2(0xDD,0xC2),      o2(0xEF,0xB7),
-          o2(0xE7,0xD4),      o2(0xCA,0xCA),
-          o2(0xD9,0xFB),      o2(0xFA,0xFD),
-          o2(0xD6,0xAA),      o2(0xF4,0xF8),
-          o2(0xF7,0xF7),      o2(0xDC,0xAC),
-          o2(0xD7,0xD7),      o2(0xDF,0xA2),
-          o2(0xCE,0xBE),      o2(0xD3,0xF0),
-          o2(0xF0,0xA4),      o2(0xE1,0xEC),
-          o2(0xCF,0xE7),      o2(0xF3,0xCB),
-          o2(0xED,0xA9),      o2(0xCA,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_08 = {
-    to_EUC_KR_E5_08_offsets,
-    to_EUC_KR_E5_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_09_offsets[64] = {
-     18, 18, 18,  0, 18, 18, 18,  1,     18, 18,  2,  3,  4,  5, 18, 18,
-     18, 18, 18, 18,  6, 18,  7, 18,     18, 18, 18,  8, 18,  9, 18, 18,
-     18, 10, 18, 18, 18, 18, 18, 18,     18, 11, 12, 18, 18, 18, 18, 13,
-     18, 18, 14, 18, 18, 15, 18, 18,     18, 18, 18, 18, 18, 16, 18, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_09_infos[19] = {
-          o2(0xF4,0xEF),      o2(0xF6,0xCE),
-          o2(0xDE,0xFB),      o2(0xD0,0xBB),
-          o2(0xD5,0xB7),      o2(0xEE,0xF1),
-          o2(0xF4,0xA8),      o2(0xDC,0xF8),
-          o2(0xCB,0xA7),      o2(0xDA,0xCE),
-          o2(0xE0,0xE6),      o2(0xED,0xA5),
-          o2(0xEE,0xF2),      o2(0xDC,0xF9),
-          o2(0xF9,0xDC),      o2(0xF3,0xDC),
-          o2(0xF8,0xF2),      o2(0xF4,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_09 = {
-    to_EUC_KR_E5_09_offsets,
-    to_EUC_KR_E5_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0A_offsets[64] = {
-     16, 16, 16,  0, 16, 16, 16,  1,      2,  3, 16, 16, 16,  4, 16, 16,
-     16,  5,  6, 16, 16, 16, 16, 16,     16, 16, 16,  7, 16, 16, 16,  8,
-      9, 16, 16, 10, 11, 16, 16, 16,     16, 12, 13, 14, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 15, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0A_infos[17] = {
-          o2(0xFC,0xF1),      o2(0xD0,0xBC),
-          o2(0xDB,0xF9),      o2(0xD7,0xB1),
-          o2(0xCB,0xFC),      o2(0xF0,0xA5),
-          o2(0xCB,0xFD),      o2(0xD5,0xF4),
-          o2(0xCD,0xED),      o2(0xCA,0xA5),
-          o2(0xD6,0xAB),      o2(0xD0,0xC2),
-          o2(0xF0,0xBE),      o2(0xD2,0xBD),
-          o2(0xCC,0xA4),      o2(0xFA,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0A = {
-    to_EUC_KR_E5_0A_offsets,
-    to_EUC_KR_E5_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0B_offsets[64] = {
-     25,  0, 25,  1, 25,  2, 25,  3,     25,  4, 25, 25, 25,  5, 25, 25,
-     25, 25,  6, 25, 25,  7,  8, 25,      9, 10, 25, 11, 25, 12, 13, 14,
-     25, 25, 15, 16, 17, 25, 25, 25,     25, 25, 25, 25, 25, 25, 25, 25,
-     25, 25, 25, 18, 25, 19, 25, 25,     20, 25, 21, 22, 25, 25, 23, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0B_infos[26] = {
-          o2(0xCC,0xCD),      o2(0xDA,0xFA),
-          o2(0xF6,0xCF),      o2(0xE9,0xB8),
-          o2(0xD8,0xF5),      o2(0xCC,0xCE),
-          o2(0xD7,0xCD),      o2(0xD4,0xD1),
-          o2(0xE9,0xED),      o2(0xCA,0xEB),
-          o2(0xD9,0xE2),      o2(0xFD,0xB2),
-          o2(0xE3,0xAD),      o2(0xD6,0xCC),
-          o2(0xD9,0xB4),      o2(0xE1,0xA7),
-          o2(0xEE,0xD3),      o2(0xD0,0xC3),
-          o2(0xFD,0xB3),      o2(0xD5,0xE4),
-          o2(0xCF,0xE8),      o2(0xED,0xC3),
-          o2(0xD0,0xB2),      o2(0xCE,0xFE),
-          o2(0xDA,0xA8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0B = {
-    to_EUC_KR_E5_0B_offsets,
-    to_EUC_KR_E5_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0C_offsets[64] = {
-     16, 16, 16, 16, 16,  0, 16, 16,      1, 16, 16, 16, 16,  2, 16,  3,
-      4, 16, 16, 16, 16,  5,  6,  7,     16,  8, 16, 16, 16, 16, 16, 16,
-      9, 10, 16, 11, 16, 16, 16, 16,     16, 16, 12, 16, 16, 16, 16, 13,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 14, 16, 16, 16, 16, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0C_infos[17] = {
-          o2(0xF8,0xD0),      o2(0xFD,0xD6),
-          o2(0xF8,0xD1),      o2(0xF8,0xD2),
-          o2(0xDC,0xD3),      o2(0xDD,0xE2),
-          o2(0xFB,0xF9),      o2(0xDD,0xC1),
-          o2(0xE3,0xB5),      o2(0xED,0xDD),
-          o2(0xCE,0xC4),      o2(0xCB,0xA1),
-          o2(0xDD,0xE3),      o2(0xFC,0xDD),
-          o2(0xF9,0xAF),      o2(0xD2,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0C = {
-    to_EUC_KR_E5_0C_offsets,
-    to_EUC_KR_E5_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0D_offsets[64] = {
-      0,  1, 28,  2,  3, 28, 28,  4,      5,  6,  7, 28, 28,  8, 28, 28,
-     28,  9, 10, 11, 12, 28, 28, 13,     28, 28, 14, 28, 15, 28, 16, 28,
-     17, 28, 28, 28, 28, 28, 18, 28,     19, 28, 28, 28, 28, 28, 28, 20,
-     21, 22, 28, 28, 23, 24, 28, 25,     28, 28, 28, 28, 28, 26, 28, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0D_infos[29] = {
-          o2(0xCF,0xA1),      o2(0xE4,0xA8),
-          o2(0xF4,0xB6),      o2(0xEC,0xFE),
-          o2(0xE3,0xAE),      o2(0xE7,0xED),
-          o2(0xFD,0xC1),      o2(0xDA,0xE2),
-          o2(0xD8,0xB3),      o2(0xDD,0xE4),
-          o2(0xF0,0xEF),      o2(0xF6,0xF1),
-          o2(0xFA,0xF0),      o2(0xD1,0xF5),
-          o2(0xDA,0xCF),      o2(0xDC,0xD4),
-          o2(0xDC,0xA6),      o2(0xEF,0xBF),
-          o2(0xCE,0xCF),      o2(0xE0,0xD9),
-          o2(0xD9,0xD6),      o2(0xEC,0xD4),
-          o2(0xEA,0xCB),      o2(0xCA,0xBF),
-          o2(0xD5,0xB0),      o2(0xCF,0xE9),
-          o2(0xF1,0xED),      o2(0xCC,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0D = {
-    to_EUC_KR_E5_0D_offsets,
-    to_EUC_KR_E5_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0E_offsets[64] = {
-     10, 10, 10, 10,  0, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10,  1, 10, 10, 10, 10,      2, 10,  3, 10, 10, 10, 10,  4,
-      5, 10, 10, 10, 10,  6,  7, 10,     10, 10, 10, 10, 10,  8, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10,  9, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0E_infos[11] = {
-          o2(0xE4,0xF8),      o2(0xE4,0xED),
-          o2(0xD7,0xD8),      o2(0xFD,0xA7),
-          o2(0xEA,0xAB),      o2(0xF6,0xB2),
-          o2(0xCF,0xF0),      o2(0xF9,0xBD),
-          o2(0xE6,0xF4),      o2(0xCB,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0E = {
-    to_EUC_KR_E5_0E_offsets,
-    to_EUC_KR_E5_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_0F_offsets[64] = {
-     26, 26, 26,  0, 26, 26, 26, 26,      1,  2,  3,  4, 26,  5, 26, 26,
-     26, 26, 26, 26,  6, 26,  7,  8,     26, 26, 26,  9, 26, 26, 26, 26,
-     26, 10, 11, 12, 13, 14, 26, 26,     26, 15, 16, 17, 18, 19, 26, 20,
-     21, 22, 23, 24, 26, 26, 26, 26,     25, 26, 26, 26, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_0F_infos[27] = {
-          o2(0xF3,0xD1),      o2(0xE9,0xD1),
-          o2(0xF3,0xA9),      o2(0xD0,0xE0),
-          o2(0xE9,0xD2),      o2(0xDA,0xE3),
-          o2(0xE2,0xD2),      o2(0xF6,0xA2),
-          o2(0xE1,0xF4),      o2(0xDA,0xE4),
-          o2(0xE7,0xD5),      o2(0xF5,0xBF),
-          o2(0xCF,0xA2),      o2(0xCD,0xAF),
-          o2(0xCF,0xA3),      o2(0xCD,0xB0),
-          o2(0xF1,0xFE),      o2(0xD0,0xA3),
-          o2(0xE1,0xAF),      o2(0xF8,0xA3),
-          o2(0xCA,0xA6),      o2(0xF7,0xBB),
-          o2(0xF2,0xEA),      o2(0xDE,0xC8),
-          o2(0xE9,0xD3),      o2(0xDE,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_0F = {
-    to_EUC_KR_E5_0F_offsets,
-    to_EUC_KR_E5_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_10_offsets[64] = {
-     24, 24, 24,  0,  1, 24, 24, 24,      2,  3,  4, 24,  5,  6,  7,  8,
-      9, 10, 24, 24, 24, 24, 24, 24,     24, 24, 24, 11, 24, 12, 24, 13,
-     14, 24, 24, 24, 24, 24, 15, 24,     24, 16, 24, 17, 24, 24, 24, 24,
-     24, 24, 24, 18, 24, 24, 24, 24,     19, 20, 24, 21, 22, 24, 23, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_10_infos[25] = {
-          o2(0xFD,0xDE),      o2(0xCA,0xC0),
-          o2(0xF9,0xEA),      o2(0xD1,0xCE),
-          o2(0xEE,0xD4),      o2(0xD4,0xD2),
-          o2(0xD9,0xA3),      o2(0xFD,0xA8),
-          o2(0xD7,0xD9),      o2(0xF7,0xCE),
-          o2(0xFA,0xBE),      o2(0xCF,0xD6),
-          o2(0xD7,0xF0),      o2(0xEB,0xE1),
-          o2(0xF8,0xC5),      o2(0xDC,0xFA),
-          o2(0xDD,0xC3),      o2(0xF9,0xDF),
-          o2(0xE7,0xEF),      o2(0xFD,0xE5),
-          o2(0xF6,0xA3),      o2(0xD9,0xFC),
-          o2(0xFD,0xA9),      o2(0xE7,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_10 = {
-    to_EUC_KR_E5_10_offsets,
-    to_EUC_KR_E5_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_11_offsets[64] = {
-     12, 12,  0, 12, 12, 12, 12, 12,      1, 12,  2, 12, 12, 12, 12, 12,
-     12,  3, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,      4, 12,  5, 12, 12, 12, 12, 12,
-     12,  6, 12,  7, 12,  8, 12, 12,     12, 12, 12,  9, 10, 11, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_11_infos[13] = {
-          o2(0xD5,0xE5),      o2(0xEF,0xD0),
-          o2(0xCD,0xB1),      o2(0xF7,0xA2),
-          o2(0xF1,0xB2),      o2(0xF1,0xB1),
-          o2(0xCD,0xB2),      o2(0xDA,0xAB),
-          o2(0xCA,0xA7),      o2(0xE3,0xE2),
-          o2(0xFB,0xBC),      o2(0xD9,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_11 = {
-    to_EUC_KR_E5_11_offsets,
-    to_EUC_KR_E5_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_12_offsets[64] = {
-      0, 12, 12, 12, 12, 12,  1, 12,     12, 12, 12, 12,  2, 12,  3, 12,
-      4, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12,  5, 12, 12, 12,      6, 12, 12,  7,  8, 12, 12, 12,
-     12, 12, 12,  9, 12, 12, 12, 12,     10, 12, 12, 12, 12, 11, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_12_infos[13] = {
-          o2(0xEE,0xBA),      o2(0xF8,0xD3),
-          o2(0xFB,0xFA),      o2(0xCF,0xA4),
-          o2(0xDC,0xFB),      o2(0xF6,0xE3),
-          o2(0xED,0xAA),      o2(0xF2,0xA1),
-          o2(0xCE,0xE1),      o2(0xFA,0xA6),
-          o2(0xF9,0xE0),      o2(0xEC,0xD6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_12 = {
-    to_EUC_KR_E5_12_offsets,
-    to_EUC_KR_E5_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_13_offsets[64] = {
-      0,  1, 12, 12,  2, 12, 12, 12,      3,  4, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12,  5, 12, 12, 12,  6, 12, 12,      7, 12, 12, 12, 12,  8,  9, 12,
-     12, 12, 10, 12, 12, 12, 12, 12,     12, 12, 11, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_13_infos[13] = {
-          o2(0xE4,0xEE),      o2(0xF9,0xA1),
-          o2(0xFB,0xEF),      o2(0xF9,0xEB),
-          o2(0xEE,0xA3),      o2(0xEA,0xAC),
-          o2(0xCA,0xA8),      o2(0xF4,0xFA),
-          o2(0xCD,0xD6),      o2(0xFC,0xF6),
-          o2(0xF4,0xC9),      o2(0xF8,0xD4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_13 = {
-    to_EUC_KR_E5_13_offsets,
-    to_EUC_KR_E5_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_14_offsets[64] = {
-     10, 10, 10, 10,  0, 10,  1,  2,     10, 10, 10, 10, 10, 10,  3, 10,
-      4, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10,  5, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10,  6,
-     10,  7, 10, 10, 10,  8, 10, 10,     10, 10, 10, 10, 10, 10,  9, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_14_infos[11] = {
-          o2(0xF8,0xA6),      o2(0xDE,0xCA),
-          o2(0xF2,0xC6),      o2(0xD7,0xDA),
-          o2(0xD3,0xD0),      o2(0xD8,0xC5),
-          o2(0xEA,0xE6),      o2(0xF3,0xDD),
-          o2(0xE4,0xDA),      o2(0xF6,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_14 = {
-    to_EUC_KR_E5_14_offsets,
-    to_EUC_KR_E5_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_15_offsets[64] = {
-      8,  8,  8,  8,  0,  8,  1,  8,      8,  8,  8,  8,  8,  8,  8,  2,
-      8,  8,  8,  3,  8,  8,  4,  8,      8,  8,  8,  8,  8,  8,  5,  8,
-      8,  8,  8,  6,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  7,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_15_infos[9] = {
-          o2(0xF6,0xF2),      o2(0xDF,0xC2),
-          o2(0xD9,0xFD),      o2(0xCC,0xF6),
-          o2(0xD3,0xBA),      o2(0xE4,0xAF),
-          o2(0xF9,0xE1),      o2(0xF0,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_15 = {
-    to_EUC_KR_E5_15_offsets,
-    to_EUC_KR_E5_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_16_offsets[64] = {
-      0, 17, 17, 17,  1, 17,  2,  3,     17,  4,  5, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,      6,  7,  8, 17,  9, 10, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 11,     17, 12, 13, 14, 15, 17, 16, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_16_infos[18] = {
-          o2(0xCB,0xD3),      o2(0xE0,0xBC),
-          o2(0xF4,0xCA),      o2(0xD4,0xFA),
-          o2(0xFD,0xAA),      o2(0xF9,0xE2),
-          o2(0xF4,0xB7),      o2(0xFD,0xC2),
-          o2(0xFC,0xB0),      o2(0xFD,0xEC),
-          o2(0xCA,0xE2),      o2(0xFD,0xBD),
-          o2(0xEA,0xE7),      o2(0xDF,0xC3),
-          o2(0xD1,0xD2),      o2(0xCE,0xE2),
-          o2(0xD3,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_16 = {
-    to_EUC_KR_E5_16_offsets,
-    to_EUC_KR_E5_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_17_offsets[64] = {
-     10, 10, 10, 10, 10,  0, 10,  1,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10,  2, 10, 10, 10,     10, 10,  3, 10,  4, 10, 10,  5,
-     10, 10, 10,  6,  7, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  8,  9, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_17_infos[11] = {
-          o2(0xFD,0xAB),      o2(0xDF,0xE0),
-          o2(0xF2,0xC7),      o2(0xE7,0xF0),
-          o2(0xD0,0xEE),      o2(0xF3,0xAA),
-          o2(0xDE,0xCB),      o2(0xF6,0xB8),
-          o2(0xE1,0xF5),      o2(0xF1,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_17 = {
-    to_EUC_KR_E5_17_offsets,
-    to_EUC_KR_E5_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_18_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  0,  8,      8,  1,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  2,  8,  8,  3,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  4,
-      8,  8,  5,  8,  6,  8,  7,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_18_infos[9] = {
-          o2(0xF7,0xA3),      o2(0xCA,0xA9),
-          o2(0xCF,0xA5),      o2(0xDF,0xC4),
-          o2(0xE1,0xB0),      o2(0xF0,0xBF),
-          o2(0xF6,0xA4),      o2(0xE3,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_18 = {
-    to_EUC_KR_E5_18_offsets,
-    to_EUC_KR_E5_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_19_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  0,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      1,  4,  4,  2,  4,  4,  4,  4,
-      4,  4,  4,  4,  3,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_19_infos[5] = {
-          o2(0xFA,0xC6),      o2(0xD0,0xEF),
-          o2(0xFD,0xED),      o2(0xDD,0xC4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_19 = {
-    to_EUC_KR_E5_19_offsets,
-    to_EUC_KR_E5_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1A_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  0,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  1,  6,  6,      6,  6,  6,  6,  2,  6,  3,  6,
-      6,  6,  6,  6,  4,  6,  6,  6,      6,  6,  6,  6,  5,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1A_infos[7] = {
-          o2(0xFC,0xF7),      o2(0xE6,0xBF),
-          o2(0xDE,0xAD),      o2(0xFA,0xBF),
-          o2(0xE5,0xF1),      o2(0xED,0xC4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1A = {
-    to_EUC_KR_E5_1A_offsets,
-    to_EUC_KR_E5_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1B_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10,  0, 10, 10,  1, 10, 10,
-     10,  2, 10, 10, 10, 10, 10, 10,     10, 10,  3,  4, 10, 10,  5, 10,
-      6, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      7, 10, 10, 10, 10, 10, 10, 10,     10,  8,  9, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1B_infos[11] = {
-          o2(0xD2,0xA5),      o2(0xFD,0xEE),
-          o2(0xF5,0xB6),      o2(0xE1,0xF6),
-          o2(0xDE,0xCC),      o2(0xFC,0xDE),
-          o2(0xEC,0xD7),      o2(0xCD,0xDD),
-          o2(0xD6,0xB7),      o2(0xCD,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1B = {
-    to_EUC_KR_E5_1B_offsets,
-    to_EUC_KR_E5_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1C_offsets[64] = {
-     14, 14, 14,  0,  1, 14, 14, 14,      2, 14, 14,  3, 14,  4, 14, 14,
-     14, 14,  5,  6, 14, 14,  7, 14,      8, 14, 14, 14, 14, 14, 14,  9,
-     14, 14, 14, 14, 14, 14, 14, 14,     10, 14, 14, 14, 14, 11, 14, 14,
-     12, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 13, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1C_infos[15] = {
-          o2(0xF8,0xD5),      o2(0xE5,0xD8),
-          o2(0xCF,0xEA),      o2(0xCF,0xD0),
-          o2(0xEA,0xCC),      o2(0xEA,0xAE),
-          o2(0xEA,0xAD),      o2(0xD3,0xF1),
-          o2(0xD3,0xA5),      o2(0xF7,0xCF),
-          o2(0xEE,0xA4),      o2(0xD0,0xA4),
-          o2(0xF2,0xA2),      o2(0xD0,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1C = {
-    to_EUC_KR_E5_1C_offsets,
-    to_EUC_KR_E5_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1D_offsets[64] = {
-      0, 16,  1, 16, 16, 16, 16,  2,     16, 16,  3, 16, 16,  4,  5, 16,
-      6,  7, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16,  8, 16, 16,  9, 16, 10, 16,     16, 16, 11, 16, 16, 16, 12, 16,
-     13, 16, 16, 16, 16, 14, 16, 16,     16, 16, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1D_infos[17] = {
-          o2(0xF2,0xA3),      o2(0xF7,0xF8),
-          o2(0xD0,0xB3),      o2(0xDB,0xA9),
-          o2(0xD3,0xBB),      o2(0xCA,0xEC),
-          o2(0xF1,0xA6),      o2(0xCB,0xD5),
-          o2(0xF7,0xE7),      o2(0xCD,0xDE),
-          o2(0xF7,0xA4),      o2(0xF8,0xC0),
-          o2(0xD3,0xDD),      o2(0xCC,0xD0),
-          o2(0xCF,0xA6),      o2(0xF6,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1D = {
-    to_EUC_KR_E5_1D_offsets,
-    to_EUC_KR_E5_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1E_offsets[64] = {
-      7,  7,  0,  7,  7,  7,  7,  7,      1,  7,  7,  2,  7,  7,  7,  7,
-      7,  7,  7,  3,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      4,  7,  5,  6,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1E_infos[8] = {
-          o2(0xE1,0xF7),      o2(0xD3,0xDC),
-          o2(0xFA,0xFE),      o2(0xFA,0xA7),
-          o2(0xEB,0xD9),      o2(0xCF,0xA7),
-          o2(0xEA,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1E = {
-    to_EUC_KR_E5_1E_offsets,
-    to_EUC_KR_E5_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_1F_offsets[64] = {
-     13, 13, 13,  0, 13, 13, 13,  1,      2, 13, 13,  3, 13, 13,  4, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13,  5,
-      6, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      7, 13, 13, 13,  8, 13, 13,  9,     13, 10, 11, 13, 12, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_1F_infos[14] = {
-          o2(0xE4,0xEF),      o2(0xE9,0xB9),
-          o2(0xF1,0xD8),      o2(0xD8,0xD8),
-          o2(0xE0,0xF2),      o2(0xE6,0xB4),
-          o2(0xDC,0xFC),      o2(0xF3,0xF1),
-          o2(0xE3,0xD0),      o2(0xF2,0xFB),
-          o2(0xDB,0xC6),      o2(0xD0,0xF1),
-          o2(0xD0,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_1F = {
-    to_EUC_KR_E5_1F_offsets,
-    to_EUC_KR_E5_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_20_offsets[64] = {
-      0, 18,  1, 18, 18,  2,  3, 18,      4,  5,  6, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18,  7, 18,
-     18,  8, 18, 18,  9, 18, 18, 10,     18, 18, 11, 18, 18, 18, 18, 12,
-     13, 14, 18, 18, 15, 16, 18, 18,     18, 18, 17, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_20_infos[19] = {
-          o2(0xCF,0xDC),      o2(0xD3,0xD1),
-          o2(0xCC,0xB1),      o2(0xF7,0xD8),
-          o2(0xCB,0xA8),      o2(0xEB,0xBC),
-          o2(0xE4,0xBE),      o2(0xF4,0xDC),
-          o2(0xDC,0xC2),      o2(0xF0,0xA7),
-          o2(0xE6,0xC0),      o2(0xCA,0xED),
-          o2(0xE8,0xEB),      o2(0xE5,0xE8),
-          o2(0xDC,0xC3),      o2(0xED,0xDE),
-          o2(0xD3,0xF2),      o2(0xCC,0xF7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_20 = {
-    to_EUC_KR_E5_20_offsets,
-    to_EUC_KR_E5_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_21_offsets[64] = {
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16,  0,  1, 16, 16, 16,  2,
-     16,  3, 16, 16,  4, 16, 16,  5,      6, 16,  7, 16, 16, 16,  8, 16,
-     16,  9, 10, 16, 11, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 12, 16, 16,     16, 13, 16, 16, 14, 16, 15, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_21_infos[17] = {
-          o2(0xCE,0xD4),      o2(0xE7,0xAB),
-          o2(0xCB,0xC3),      o2(0xE1,0xB1),
-          o2(0xF7,0xB2),      o2(0xD3,0xF3),
-          o2(0xD3,0xD2),      o2(0xF5,0xC0),
-          o2(0xDF,0xDD),      o2(0xEE,0xF3),
-          o2(0xE7,0xF1),      o2(0xFD,0xB4),
-          o2(0xF2,0xC8),      o2(0xF3,0xD2),
-          o2(0xEE,0xF4),      o2(0xE2,0xD3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_21 = {
-    to_EUC_KR_E5_21_offsets,
-    to_EUC_KR_E5_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_22_offsets[64] = {
-     14, 14, 14,  0, 14,  1, 14, 14,     14,  2, 14, 14, 14, 14, 14, 14,
-     14, 14, 14,  3, 14, 14, 14, 14,     14, 14, 14, 14,  4, 14,  5,  6,
-     14, 14, 14, 14, 14, 14, 14, 14,      7,  8, 14, 14, 14, 14,  9, 14,
-     14, 14, 14, 10, 14, 14, 14, 14,     14, 14, 11, 12, 14, 14, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_22_infos[15] = {
-          o2(0xCC,0xD1),      o2(0xDF,0xEA),
-          o2(0xE9,0xBA),      o2(0xD9,0xD7),
-          o2(0xF5,0xCD),      o2(0xF1,0xF2),
-          o2(0xFA,0xC7),      o2(0xD9,0xF8),
-          o2(0xD4,0xC2),      o2(0xF6,0xE5),
-          o2(0xDD,0xC5),      o2(0xE7,0xF2),
-          o2(0xED,0xDF),      o2(0xCA,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_22 = {
-    to_EUC_KR_E5_22_offsets,
-    to_EUC_KR_E5_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_23_offsets[64] = {
-     19,  0, 19, 19, 19,  1, 19,  2,     19, 19, 19, 19, 19, 19,  3, 19,
-     19,  4, 19,  5, 19,  6, 19, 19,      7,  8, 19, 19, 19, 19,  9, 10,
-     19, 19, 19, 19, 11, 19, 19, 19,     19, 19, 19, 12, 13, 19, 19, 14,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 15, 16, 17, 19, 18, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_23_infos[20] = {
-          o2(0xDB,0xFA),      o2(0xE8,0xB5),
-          o2(0xD3,0xA6),      o2(0xFD,0xB5),
-          o2(0xF9,0xC9),      o2(0xE4,0xE2),
-          o2(0xFB,0xBD),      o2(0xD7,0xA4),
-          o2(0xCE,0xC5),      o2(0xCE,0xD5),
-          o2(0xD6,0xE6),      o2(0xE5,0xBD),
-          o2(0xDE,0xCD),      o2(0xEC,0xF3),
-          o2(0xED,0xE0),      o2(0xEC,0xEC),
-          o2(0xFB,0xBE),      o2(0xDF,0xEB),
-          o2(0xE1,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_23 = {
-    to_EUC_KR_E5_23_offsets,
-    to_EUC_KR_E5_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_24_offsets[64] = {
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17,  0,
-     17, 17, 17, 17,  1,  2,  3, 17,     17,  4,  5, 17,  6, 17, 17, 17,
-     17, 17,  7, 17, 17, 17, 17,  8,     17,  9, 10, 11, 17, 12, 13, 17,
-     17, 14, 17, 17, 17, 17, 17, 15,     17, 17, 17, 17, 17, 17, 16, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_24_infos[18] = {
-          o2(0xF9,0xBE),      o2(0xD0,0xF3),
-          o2(0xE0,0xAA),      o2(0xE8,0xE2),
-          o2(0xE2,0xD4),      o2(0xD2,0xFD),
-          o2(0xE5,0xA8),      o2(0xD9,0xD3),
-          o2(0xD3,0xDE),      o2(0xF4,0xB8),
-          o2(0xF7,0xBC),      o2(0xDC,0xFD),
-          o2(0xE8,0xEC),      o2(0xE4,0xE7),
-          o2(0xE3,0xF7),      o2(0xEC,0xA8),
-          o2(0xFA,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_24 = {
-    to_EUC_KR_E5_24_offsets,
-    to_EUC_KR_E5_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_25_offsets[64] = {
-     24, 24, 24, 24,  0, 24, 24,  1,      2,  3, 24, 24, 24, 24,  4,  5,
-      6,  7, 24, 24,  8,  9, 24, 10,     24, 24, 11, 24, 24, 24, 24, 24,
-     12, 24, 13, 24, 24, 24, 24, 14,     24, 24, 15, 16, 17, 18, 19, 24,
-     24, 24, 24, 20, 21, 24, 24, 24,     22, 24, 24, 24, 24, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_25_infos[25] = {
-          o2(0xE5,0xF2),      o2(0xD0,0xF4),
-          o2(0xD2,0xAF),      o2(0xDC,0xE5),
-          o2(0xD0,0xA5),      o2(0xF1,0xB4),
-          o2(0xFC,0xB1),      o2(0xCC,0xF8),
-          o2(0xDD,0xC6),      o2(0xFA,0xD1),
-          o2(0xF7,0xDF),      o2(0xFA,0xA8),
-          o2(0xEE,0xF5),      o2(0xDE,0xCE),
-          o2(0xE7,0xF3),      o2(0xF7,0xAC),
-          o2(0xEB,0xC4),      o2(0xED,0xE1),
-          o2(0xE0,0xAB),      o2(0xDD,0xC7),
-          o2(0xD2,0xB3),      o2(0xD2,0xBF),
-          o2(0xCA,0xCC),      o2(0xFB,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_25 = {
-    to_EUC_KR_E5_25_offsets,
-    to_EUC_KR_E5_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_26_offsets[64] = {
-     14, 14,  0,  1,  2, 14, 14, 14,     14, 14,  3, 14, 14, 14, 14, 14,
-     14, 14, 14,  4, 14, 14,  5,  6,     14,  7, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14,  8, 14, 14,      9, 14, 14, 14, 10, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 11, 14, 12, 14, 14, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_26_infos[15] = {
-          o2(0xE5,0xFD),      o2(0xDD,0xE5),
-          o2(0xD8,0xCD),      o2(0xEC,0xF4),
-          o2(0xD0,0xF5),      o2(0xE8,0xED),
-          o2(0xD0,0xD2),      o2(0xD9,0xD8),
-          o2(0xF6,0xE6),      o2(0xDB,0xAA),
-          o2(0xF7,0xE0),      o2(0xD8,0xD9),
-          o2(0xF4,0xA3),      o2(0xF4,0xDD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_26 = {
-    to_EUC_KR_E5_26_offsets,
-    to_EUC_KR_E5_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_27_offsets[64] = {
-     20, 20, 20,  0, 20, 20,  1, 20,     20,  2, 20,  3, 20, 20, 20, 20,
-      4,  5, 20,  6,  7, 20, 20, 20,     20,  8,  9, 20, 10, 11, 20, 20,
-     20, 20, 20, 20, 20, 20, 12, 20,     13, 20, 14, 20, 15, 20, 16, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     17, 20, 20, 18, 20, 20, 20, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_27_infos[21] = {
-          o2(0xEF,0xD1),      o2(0xD9,0xB5),
-          o2(0xED,0xAB),      o2(0xE3,0xB7),
-          o2(0xEE,0xBB),      o2(0xCD,0xB4),
-          o2(0xE0,0xF3),      o2(0xEA,0xCD),
-          o2(0xEC,0xF5),      o2(0xE8,0xEE),
-          o2(0xCB,0xA9),      o2(0xF1,0xAF),
-          o2(0xCA,0xCD),      o2(0xEC,0xA9),
-          o2(0xF2,0xEB),      o2(0xFD,0xEF),
-          o2(0xF9,0xF3),      o2(0xE6,0xC1),
-          o2(0xEC,0xD8),      o2(0xED,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_27 = {
-    to_EUC_KR_E5_27_offsets,
-    to_EUC_KR_E5_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_28_offsets[64] = {
-     12,  0, 12,  1, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12,  2, 12, 12, 12, 12, 12, 12,      3, 12, 12,  4,  5, 12, 12,  6,
-      7, 12, 12, 12, 12,  8, 12, 12,     12,  9, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 10, 12,     12, 12, 12, 12, 11, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_28_infos[13] = {
-          o2(0xEA,0xCE),      o2(0xE8,0xDF),
-          o2(0xDE,0xCF),      o2(0xD2,0xA6),
-          o2(0xE7,0xF4),      o2(0xD1,0xD6),
-          o2(0xE6,0xC2),      o2(0xE3,0xE3),
-          o2(0xE4,0xB0),      o2(0xD8,0xB4),
-          o2(0xF6,0xA5),      o2(0xF3,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_28 = {
-    to_EUC_KR_E5_28_offsets,
-    to_EUC_KR_E5_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_29_offsets[64] = {
-      6,  0,  6,  6,  6,  6,  1,  6,      6,  2,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  3,  6,  6,  6,  6,  6,
-      6,  6,  4,  6,  6,  6,  5,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_29_infos[7] = {
-          o2(0xD7,0xA5),      o2(0xF7,0xE8),
-          o2(0xE8,0xC6),      o2(0xFB,0xE6),
-          o2(0xDD,0xE6),      o2(0xDC,0xFE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_29 = {
-    to_EUC_KR_E5_29_offsets,
-    to_EUC_KR_E5_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2A_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  0,  4,  4,  4,  4,  4,      4,  4,  1,  2,  4,  4,  4,  4,
-      4,  4,  4,  4,  3,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2A_infos[5] = {
-          o2(0xD8,0xDA),      o2(0xDA,0xAC),
-          o2(0xEA,0xB0),      o2(0xE3,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2A = {
-    to_EUC_KR_E5_2A_offsets,
-    to_EUC_KR_E5_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2B_offsets[64] = {
-      8,  0,  1,  8,  2,  8,  8,  8,      8,  3,  8,  8,  4,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  5,  8,  8,  8,  8,  6,  8,      8,  7,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2B_infos[9] = {
-          o2(0xCA,0xAA),      o2(0xE1,0xF9),
-          o2(0xEA,0xB1),      o2(0xF2,0xEC),
-          o2(0xFA,0xEE),      o2(0xEE,0xD5),
-          o2(0xF9,0xF4),      o2(0xD2,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2B = {
-    to_EUC_KR_E5_2B_offsets,
-    to_EUC_KR_E5_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2C_offsets[64] = {
-      6,  6,  6,  6,  6,  0,  6,  6,      6,  1,  6,  2,  3,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  4,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  5,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2C_infos[7] = {
-          o2(0xFB,0xFB),      o2(0xFD,0xF0),
-          o2(0xE0,0xBD),      o2(0xCE,0xE3),
-          o2(0xF8,0xC6),      o2(0xDE,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2C = {
-    to_EUC_KR_E5_2C_offsets,
-    to_EUC_KR_E5_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2D_offsets[64] = {
-      0, 22, 22,  1, 22, 22, 22, 22,     22, 22, 22, 22, 22, 22, 22, 22,
-      2,  3, 22, 22,  4,  5, 22,  6,      7, 22,  8, 22,  9, 10, 22, 11,
-     22, 22, 22, 12, 13, 22, 22, 22,     22, 14, 22, 15, 22, 22, 22, 22,
-     16, 17, 22, 22, 22, 18, 22, 22,     19, 22, 20, 22, 21, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2D_infos[23] = {
-          o2(0xDF,0xC5),      o2(0xE5,0xBE),
-          o2(0xED,0xAD),      o2(0xFA,0xEA),
-          o2(0xCD,0xEE),      o2(0xED,0xA6),
-          o2(0xED,0xAE),      o2(0xF0,0xED),
-          o2(0xDD,0xA1),      o2(0xED,0xAF),
-          o2(0xFC,0xF8),      o2(0xD8,0xEB),
-          o2(0xCC,0xF9),      o2(0xCD,0xB5),
-          o2(0xFA,0xA9),      o2(0xE1,0xDD),
-          o2(0xE2,0xD5),      o2(0xED,0xCF),
-          o2(0xDD,0xA2),      o2(0xF9,0xCA),
-          o2(0xEA,0xE8),      o2(0xE5,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2D = {
-    to_EUC_KR_E5_2D_offsets,
-    to_EUC_KR_E5_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2E_offsets[64] = {
-     31, 31, 31, 31, 31,  0, 31,  1,      2,  3, 31,  4,  5, 31, 31,  6,
-     31, 31, 31,  7, 31,  8,  9, 10,     11, 12, 13, 14, 15, 31, 31, 31,
-     31, 31, 16, 17, 18, 19, 20, 31,     31, 31, 31, 31, 21, 31, 22, 31,
-     23, 31, 31, 24, 25, 26, 27, 31,     28, 29, 31, 31, 31, 31, 31, 30,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2E_infos[32] = {
-          o2(0xD3,0xEB),      o2(0xE9,0xD4),
-          o2(0xE1,0xFA),      o2(0xE4,0xCC),
-          o2(0xE1,0xE4),      o2(0xE8,0xC7),
-          o2(0xCE,0xDB),      o2(0xDC,0xD5),
-          o2(0xF7,0xB5),      o2(0xFC,0xF3),
-          o2(0xF0,0xF3),      o2(0xCE,0xAF),
-          o2(0xF1,0xB5),      o2(0xEF,0xD2),
-          o2(0xE8,0xC8),      o2(0xEB,0xF1),
-          o2(0xCB,0xD4),      o2(0xE0,0xBE),
-          o2(0xE3,0xF8),      o2(0xEA,0xE9),
-          o2(0xFC,0xB2),      o2(0xE0,0xF4),
-          o2(0xCF,0xE0),      o2(0xEE,0xA5),
-          o2(0xFA,0xAA),      o2(0xE6,0xC3),
-          o2(0xE1,0xB2),      o2(0xCA,0xAB),
-          o2(0xE3,0xE4),      o2(0xE9,0xBB),
-          o2(0xE2,0xD6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2E = {
-    to_EUC_KR_E5_2E_offsets,
-    to_EUC_KR_E5_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_2F_offsets[64] = {
-      0, 31,  1,  2,  3,  4,  5,  6,     31, 31, 31, 31,  7, 31, 31, 31,
-      8, 31,  9, 10, 11, 31, 31, 12,     31, 31, 31, 31, 31, 31, 13, 14,
-     31, 15, 16, 31, 17, 18, 19, 20,     21, 22, 31, 23, 24, 31, 25, 26,
-     31, 31, 31, 31, 31, 27, 28, 31,     29, 31, 30, 31, 31, 31, 31, 31,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_2F_infos[32] = {
-          o2(0xF3,0xF2),      o2(0xEE,0xD6),
-          o2(0xEA,0xB2),      o2(0xD0,0xF6),
-          o2(0xEC,0xD9),      o2(0xDA,0xCB),
-          o2(0xCF,0xA8),      o2(0xDD,0xA3),
-          o2(0xD8,0xDB),      o2(0xF9,0xCE),
-          o2(0xE9,0xD5),      o2(0xE3,0xD1),
-          o2(0xD2,0xBC),      o2(0xD8,0xAC),
-          o2(0xF3,0xCC),      o2(0xCD,0xFB),
-          o2(0xF6,0xD6),      o2(0xE7,0xF5),
-          o2(0xE8,0xEF),      o2(0xE3,0xF9),
-          o2(0xD2,0xBB),      o2(0xF3,0xF3),
-          o2(0xE3,0xFB),      o2(0xDE,0xD0),
-          o2(0xCE,0xB0),      o2(0xD6,0xF7),
-          o2(0xF1,0xD9),      o2(0xF5,0xC1),
-          o2(0xDC,0xC4),      o2(0xF5,0xBB),
-          o2(0xDE,0xD1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_2F = {
-    to_EUC_KR_E5_2F_offsets,
-    to_EUC_KR_E5_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_30_offsets[64] = {
-     23,  0, 23, 23,  1, 23, 23,  2,      3,  4,  5,  6, 23,  7,  8,  9,
-     23, 10, 23, 23, 23, 23, 11, 23,     23, 12, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 13, 23, 23, 23,     14, 23, 23, 23, 23, 23, 23, 23,
-     23, 15, 23, 23, 23, 23, 23, 23,     16, 17, 18, 19, 20, 23, 21, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_30_infos[24] = {
-          o2(0xDC,0xE6),      o2(0xDE,0xD2),
-          o2(0xED,0xE2),      o2(0xEE,0xF6),
-          o2(0xEA,0xCF),      o2(0xF0,0xEE),
-          o2(0xE3,0xFC),      o2(0xD3,0xDF),
-          o2(0xD3,0xF4),      o2(0xE1,0xB3),
-          o2(0xE1,0xB4),      o2(0xF4,0xD3),
-          o2(0xDF,0xC6),      o2(0xE9,0xD6),
-          o2(0xDB,0xAB),      o2(0xF6,0xA6),
-          o2(0xE3,0xB9),      o2(0xEB,0xC5),
-          o2(0xF4,0xA9),      o2(0xCD,0xB6),
-          o2(0xD2,0xF9),      o2(0xDA,0xAD),
-          o2(0xD2,0xE3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_30 = {
-    to_EUC_KR_E5_30_offsets,
-    to_EUC_KR_E5_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_31_offsets[64] = {
-      0, 18, 18, 18, 18,  1,  2, 18,      3, 18, 18,  4, 18,  5,  6, 18,
-     18,  7, 18, 18, 18,  8, 18, 18,     18, 18, 18,  9, 18, 18, 18, 18,
-     10, 18, 11, 18, 12, 13, 18, 18,     18, 18, 18, 18, 14, 18, 18, 15,
-     18, 16, 18, 18, 18, 18, 18, 18,     18, 17, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_31_infos[19] = {
-          o2(0xCF,0xD1),      o2(0xCB,0xDC),
-          o2(0xCC,0xFA),      o2(0xCF,0xDD),
-          o2(0xE8,0xA9),      o2(0xE3,0xBB),
-          o2(0xE3,0xBA),      o2(0xE0,0xDA),
-          o2(0xEE,0xF7),      o2(0xDC,0xB3),
-          o2(0xD3,0xF5),      o2(0xD7,0xA6),
-          o2(0xF6,0xB5),      o2(0xD7,0xDB),
-          o2(0xE1,0xD5),      o2(0xD4,0xEA),
-          o2(0xDF,0xA3),      o2(0xFD,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_31 = {
-    to_EUC_KR_E5_31_offsets,
-    to_EUC_KR_E5_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_32_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      0,  1, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13,  2, 13, 13, 13, 13, 13, 13,     13,  3, 13,  4,  5, 13, 13, 13,
-     13,  6, 13,  7, 13,  8, 13,  9,     10, 13, 11, 13, 13, 13, 12, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_32_infos[14] = {
-          o2(0xD0,0xF7),      o2(0xED,0xD4),
-          o2(0xCB,0xAA),      o2(0xE4,0xDB),
-          o2(0xE1,0xFB),      o2(0xCB,0xA2),
-          o2(0xD3,0xE0),      o2(0xE4,0xBF),
-          o2(0xFB,0xC0),      o2(0xDA,0xBE),
-          o2(0xE4,0xCD),      o2(0xD6,0xB9),
-          o2(0xEF,0xC0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_32 = {
-    to_EUC_KR_E5_32_offsets,
-    to_EUC_KR_E5_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_33_offsets[64] = {
-      0, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  1, 10, 10, 10, 10, 10, 10,
-      2, 10, 10, 10, 10, 10, 10, 10,      3, 10, 10, 10, 10, 10, 10,  4,
-      5, 10, 10, 10,  6, 10,  7, 10,     10, 10, 10,  8, 10,  9, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_33_infos[11] = {
-          o2(0xE1,0xFC),      o2(0xF6,0xB9),
-          o2(0xDF,0xC7),      o2(0xE4,0xB1),
-          o2(0xDC,0xE7),      o2(0xDC,0xE8),
-          o2(0xFA,0xD6),      o2(0xD3,0xF6),
-          o2(0xF1,0xDA),      o2(0xFA,0xF2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_33 = {
-    to_EUC_KR_E5_33_offsets,
-    to_EUC_KR_E5_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_34_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10,  0,     10, 10, 10, 10, 10,  1,  2, 10,
-     10,  3, 10, 10,  4, 10,  5,  6,     10,  7, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10,  8,     10,  9, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_34_infos[11] = {
-          o2(0xE2,0xFD),      o2(0xD5,0xCF),
-          o2(0xD0,0xF8),      o2(0xCD,0xDF),
-          o2(0xF5,0xCB),      o2(0xE4,0xF0),
-          o2(0xCB,0xAB),      o2(0xD7,0xC4),
-          o2(0xE2,0xFE),      o2(0xDD,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_34 = {
-    to_EUC_KR_E5_34_offsets,
-    to_EUC_KR_E5_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_35_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  0,  1,  6,  6,  6,
-      2,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  3,  6,  6,  4,  6,  6,  5,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_35_infos[7] = {
-          o2(0xDA,0xAE),      o2(0xCA,0xEE),
-          o2(0xD5,0xB9),      o2(0xE3,0xA1),
-          o2(0xE8,0xE3),      o2(0xF3,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_35 = {
-    to_EUC_KR_E5_35_offsets,
-    to_EUC_KR_E5_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_36_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10,  0,     10, 10, 10,  1, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  2, 10, 10,
-      3, 10,  4, 10, 10, 10, 10, 10,     10, 10,  5, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,      6, 10,  7, 10,  8,  9, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_36_infos[11] = {
-          o2(0xCF,0xA9),      o2(0xD3,0xF7),
-          o2(0xD4,0xF1),      o2(0xCE,0xE4),
-          o2(0xE8,0xF2),      o2(0xE5,0xF5),
-          o2(0xE7,0xAE),      o2(0xD6,0xBA),
-          o2(0xDF,0xEC),      o2(0xE4,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_36 = {
-    to_EUC_KR_E5_36_offsets,
-    to_EUC_KR_E5_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_37_offsets[64] = {
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20,  0, 20, 20,
-     20, 20,  1, 20, 20, 20,  2, 20,     20, 20, 20, 20, 20,  3,  4, 20,
-     20,  5,  6, 20, 20,  7,  8,  9,     10, 20, 20, 11, 20, 20, 12, 20,
-     20, 13, 14, 15, 16, 20, 20, 17,     20, 20, 20, 20, 20, 18, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_37_infos[21] = {
-          o2(0xE8,0xE4),      o2(0xD8,0xB5),
-          o2(0xE4,0xDC),      o2(0xF4,0xB9),
-          o2(0xF1,0xB6),      o2(0xE2,0xDE),
-          o2(0xE1,0xB5),      o2(0xCD,0xEF),
-          o2(0xF1,0xA7),      o2(0xCE,0xE5),
-          o2(0xCB,0xDD),      o2(0xD9,0xE3),
-          o2(0xF3,0xAC),      o2(0xD0,0xF9),
-          o2(0xEC,0xAB),      o2(0xDE,0xD3),
-          o2(0xF7,0xE9),      o2(0xF9,0xF5),
-          o2(0xE1,0xDE),      o2(0xCB,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_37 = {
-    to_EUC_KR_E5_37_offsets,
-    to_EUC_KR_E5_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_38_offsets[64] = {
-     17, 17,  0,  1, 17, 17,  2, 17,     17, 17, 17, 17,  3, 17, 17, 17,
-     17,  4, 17, 17, 17, 17,  5, 17,     17,  6, 17,  7, 17,  8, 17, 17,
-     17, 17, 17, 17, 17,  9, 17, 17,     17, 17, 17, 10, 17, 11, 17, 17,
-     17, 17, 17, 12, 17, 17, 13, 17,     14, 17, 17, 17, 17, 15, 17, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_38_infos[18] = {
-          o2(0xE3,0xBC),      o2(0xF8,0xD6),
-          o2(0xDB,0xEE),      o2(0xFD,0xF1),
-          o2(0xF7,0xB6),      o2(0xF4,0xDE),
-          o2(0xF2,0xED),      o2(0xDB,0xD9),
-          o2(0xF0,0xA8),      o2(0xE1,0xFD),
-          o2(0xDE,0xD4),      o2(0xE0,0xAC),
-          o2(0xED,0xE3),      o2(0xD3,0xE1),
-          o2(0xDF,0xC8),      o2(0xD9,0xB6),
-          o2(0xFD,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_38 = {
-    to_EUC_KR_E5_38_offsets,
-    to_EUC_KR_E5_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_39_offsets[64] = {
-      0, 20, 20, 20,  1,  2, 20,  3,     20, 20, 20, 20,  4, 20, 20, 20,
-     20, 20, 20, 20, 20,  5, 20, 20,     20, 20, 20, 20, 20, 20, 20,  6,
-     20,  7,  8,  9, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 10, 11, 12, 20, 20, 13,     14, 15, 20, 16, 17, 18, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_39_infos[21] = {
-          o2(0xEF,0xD3),      o2(0xE4,0xC1),
-          o2(0xF8,0xEB),      o2(0xDB,0xAC),
-          o2(0xFC,0xC6),      o2(0xD8,0xAD),
-          o2(0xF6,0xBA),      o2(0xDB,0xDF),
-          o2(0xD3,0xD3),      o2(0xF8,0xC7),
-          o2(0xCA,0xCE),      o2(0xF8,0xC1),
-          o2(0xD2,0xB4),      o2(0xDC,0xB4),
-          o2(0xFA,0xB9),      o2(0xCA,0xCF),
-          o2(0xFC,0xB3),      o2(0xEA,0xEA),
-          o2(0xEA,0xEB),      o2(0xD0,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_39 = {
-    to_EUC_KR_E5_39_offsets,
-    to_EUC_KR_E5_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3A_offsets[64] = {
-     18, 18, 18, 18,  0, 18, 18,  1,     18, 18,  2, 18, 18, 18, 18,  3,
-     18, 18, 18, 18, 18,  4, 18,  5,     18, 18,  6, 18,  7, 18, 18, 18,
-      8, 18, 18, 18, 18, 18,  9, 10,     18, 18, 18, 11, 18, 12, 18, 18,
-     18, 18, 18, 18, 18, 13, 14, 15,     16, 18, 18, 18, 18, 18, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3A_infos[19] = {
-          o2(0xED,0xE4),      o2(0xDD,0xE7),
-          o2(0xDF,0xC9),      o2(0xDF,0xED),
-          o2(0xEE,0xBC),      o2(0xEF,0xC1),
-          o2(0xCC,0xD2),      o2(0xDD,0xA4),
-          o2(0xDF,0xCA),      o2(0xD3,0xF8),
-          o2(0xF1,0xA8),      o2(0xCD,0xB7),
-          o2(0xEF,0xD4),      o2(0xE4,0xDD),
-          o2(0xDF,0xEE),      o2(0xCB,0xAC),
-          o2(0xE9,0xBC),      o2(0xEA,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3A = {
-    to_EUC_KR_E5_3A_offsets,
-    to_EUC_KR_E5_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3B_offsets[64] = {
-     19, 19,  0, 19, 19, 19, 19, 19,      1,  2,  3, 19, 19, 19, 19, 19,
-      4, 19, 19,  5, 19, 19,  6, 19,     19, 19,  7,  8, 19, 19, 19,  9,
-     10, 19, 11, 12, 19, 19, 19, 19,     19, 19, 19, 19, 13, 19, 19, 19,
-     19, 19, 19, 14, 19, 19, 15, 16,     19, 19, 17, 18, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3B_infos[20] = {
-          o2(0xDF,0xCB),      o2(0xF9,0xBF),
-          o2(0xD6,0xAF),      o2(0xD5,0xC6),
-          o2(0xCF,0xAA),      o2(0xCE,0xA9),
-          o2(0xD6,0xF8),      o2(0xF1,0xB7),
-          o2(0xEE,0xF8),      o2(0xD9,0xD9),
-          o2(0xF3,0xDF),      o2(0xF8,0xC8),
-          o2(0xCE,0xC6),      o2(0xD5,0xE6),
-          o2(0xF4,0xE6),      o2(0xE6,0xC5),
-          o2(0xEF,0xD5),      o2(0xCB,0xEF),
-          o2(0xFC,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3B = {
-    to_EUC_KR_E5_3B_offsets,
-    to_EUC_KR_E5_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3C_offsets[64] = {
-     19,  0, 19, 19,  1, 19, 19, 19,     19, 19,  2, 19, 19, 19, 19,  3,
-     19,  4, 19,  5,  6,  7, 19,  8,      9, 19, 19, 10, 19, 19, 19, 11,
-     19, 19, 19, 19, 19, 19, 12, 13,     19, 14, 19, 19, 19, 19, 19, 19,
-     19, 15, 19, 19, 19, 16, 19, 19,     19, 19, 17, 19, 18, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3C_infos[20] = {
-          o2(0xDC,0xA7),      o2(0xD6,0xE7),
-          o2(0xF8,0xC9),      o2(0xE3,0xD2),
-          o2(0xE3,0xBD),      o2(0xCF,0xE1),
-          o2(0xF0,0xC0),      o2(0xEC,0xDA),
-          o2(0xDD,0xD7),      o2(0xFB,0xF0),
-          o2(0xEC,0xAC),      o2(0xF0,0xA9),
-          o2(0xFA,0xD7),      o2(0xFB,0xC1),
-          o2(0xD2,0xC0),      o2(0xE5,0xB0),
-          o2(0xED,0xE5),      o2(0xCB,0xAD),
-          o2(0xF9,0xB0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3C = {
-    to_EUC_KR_E5_3C_offsets,
-    to_EUC_KR_E5_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3D_offsets[64] = {
-     22, 22, 22, 22, 22, 22, 22, 22,      0, 22,  1, 22,  2, 22,  3, 22,
-     22, 22, 22, 22, 22, 22,  4,  5,     22,  6, 22,  7, 22, 22, 22, 22,
-     22, 22,  8, 22, 22, 22,  9, 10,     22, 11, 12, 13, 14, 15, 22, 22,
-     16, 17, 22, 22, 22, 22, 22, 18,     22, 19, 22, 22, 20, 22, 22, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3D_infos[23] = {
-          o2(0xF7,0xA5),      o2(0xCB,0xAE),
-          o2(0xDA,0xAF),      o2(0xD8,0xB6),
-          o2(0xD3,0xA7),      o2(0xFB,0xB2),
-          o2(0xFD,0xC4),      o2(0xEC,0xAD),
-          o2(0xFB,0xA1),      o2(0xE5,0xE9),
-          o2(0xE9,0xEE),      o2(0xF3,0xF4),
-          o2(0xF8,0xF3),      o2(0xF0,0xC1),
-          o2(0xDE,0xAF),      o2(0xF8,0xB0),
-          o2(0xF3,0xE0),      o2(0xE7,0xAF),
-          o2(0xDB,0xAD),      o2(0xE6,0xB5),
-          o2(0xF9,0xA8),      o2(0xDD,0xD8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3D = {
-    to_EUC_KR_E5_3D_offsets,
-    to_EUC_KR_E5_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3E_offsets[64] = {
-      0,  1, 24, 24, 24,  2, 24,  3,     24, 24,  4,  5,  6, 24, 24, 24,
-      7,  8,  9, 24, 24, 24, 24, 10,     11, 12, 24, 24, 24, 24, 13, 24,
-     14, 15, 24, 24, 24, 24, 24, 24,     16, 17, 18, 24, 24, 24, 19, 24,
-     24, 24, 24, 24, 24, 20, 24, 21,     24, 22, 24, 24, 24, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3E_infos[25] = {
-          o2(0xE8,0xD9),      o2(0xEF,0xD6),
-          o2(0xD3,0xE2),      o2(0xE2,0xDF),
-          o2(0xFC,0xE0),      o2(0xD7,0xC8),
-          o2(0xFD,0xAD),      o2(0xDF,0xEF),
-          o2(0xCC,0xD3),      o2(0xD3,0xF9),
-          o2(0xD4,0xF0),      o2(0xDB,0xC7),
-          o2(0xDE,0xD5),      o2(0xF0,0xF4),
-          o2(0xD5,0xD0),      o2(0xE5,0xD9),
-          o2(0xFC,0xC7),      o2(0xDC,0xD6),
-          o2(0xE2,0xE0),      o2(0xDA,0xB0),
-          o2(0xF3,0xA3),      o2(0xD3,0xEC),
-          o2(0xF4,0xCB),      o2(0xFD,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3E = {
-    to_EUC_KR_E5_3E_offsets,
-    to_EUC_KR_E5_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E5_3F_offsets[64] = {
-     13, 13, 13,  0, 13,  1, 13, 13,     13, 13, 13, 13,  2,  3, 13, 13,
-     13, 13, 13, 13, 13, 13,  4,  5,      6,  7, 13, 13, 13, 13, 13, 13,
-      8, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13,  9, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 10, 13, 13,     13, 13, 13, 13, 13, 11, 13, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_3F_infos[14] = {
-          o2(0xE3,0xFD),      o2(0xF9,0xB1),
-          o2(0xD0,0xFB),      o2(0xEC,0xDB),
-          o2(0xF5,0xBC),      o2(0xF2,0xA4),
-          o2(0xD8,0xCE),      o2(0xD8,0xCF),
-          o2(0xF5,0xF7),      o2(0xF6,0xE1),
-          o2(0xD2,0xB7),      o2(0xFB,0xEC),
-          o2(0xDD,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5_3F = {
-    to_EUC_KR_E5_3F_offsets,
-    to_EUC_KR_E5_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_E5_infos[65] = {
-       &to_EUC_KR_E5_00,   &to_EUC_KR_E5_01,
-       &to_EUC_KR_E5_02,   &to_EUC_KR_E5_03,
-       &to_EUC_KR_E5_04,   &to_EUC_KR_E5_05,
-       &to_EUC_KR_E5_06,   &to_EUC_KR_E5_07,
-       &to_EUC_KR_E5_08,   &to_EUC_KR_E5_09,
-       &to_EUC_KR_E5_0A,   &to_EUC_KR_E5_0B,
-       &to_EUC_KR_E5_0C,   &to_EUC_KR_E5_0D,
-       &to_EUC_KR_E5_0E,   &to_EUC_KR_E5_0F,
-       &to_EUC_KR_E5_10,   &to_EUC_KR_E5_11,
-       &to_EUC_KR_E5_12,   &to_EUC_KR_E5_13,
-       &to_EUC_KR_E5_14,   &to_EUC_KR_E5_15,
-       &to_EUC_KR_E5_16,   &to_EUC_KR_E5_17,
-       &to_EUC_KR_E5_18,   &to_EUC_KR_E5_19,
-       &to_EUC_KR_E5_1A,   &to_EUC_KR_E5_1B,
-       &to_EUC_KR_E5_1C,   &to_EUC_KR_E5_1D,
-       &to_EUC_KR_E5_1E,   &to_EUC_KR_E5_1F,
-       &to_EUC_KR_E5_20,   &to_EUC_KR_E5_21,
-       &to_EUC_KR_E5_22,   &to_EUC_KR_E5_23,
-       &to_EUC_KR_E5_24,   &to_EUC_KR_E5_25,
-       &to_EUC_KR_E5_26,   &to_EUC_KR_E5_27,
-       &to_EUC_KR_E5_28,   &to_EUC_KR_E5_29,
-       &to_EUC_KR_E5_2A,   &to_EUC_KR_E5_2B,
-       &to_EUC_KR_E5_2C,   &to_EUC_KR_E5_2D,
-       &to_EUC_KR_E5_2E,   &to_EUC_KR_E5_2F,
-       &to_EUC_KR_E5_30,   &to_EUC_KR_E5_31,
-       &to_EUC_KR_E5_32,   &to_EUC_KR_E5_33,
-       &to_EUC_KR_E5_34,   &to_EUC_KR_E5_35,
-       &to_EUC_KR_E5_36,   &to_EUC_KR_E5_37,
-       &to_EUC_KR_E5_38,   &to_EUC_KR_E5_39,
-       &to_EUC_KR_E5_3A,   &to_EUC_KR_E5_3B,
-       &to_EUC_KR_E5_3C,   &to_EUC_KR_E5_3D,
-       &to_EUC_KR_E5_3E,   &to_EUC_KR_E5_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E5 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_E5_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_00_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12,  0,
-     12, 12,  1, 12, 12, 12,  2, 12,     12, 12, 12, 12,  3,  4, 12, 12,
-      5,  6, 12, 12, 12,  7, 12,  8,      9, 12, 10, 12, 12, 12, 12, 11,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_00_infos[13] = {
-          o2(0xE4,0xE8),      o2(0xD2,0xC1),
-          o2(0xF8,0xD7),      o2(0xD6,0xBB),
-          o2(0xDE,0xD6),      o2(0xF7,0xBD),
-          o2(0xEC,0xAE),      o2(0xD0,0xE1),
-          o2(0xE0,0xF5),      o2(0xEA,0xB3),
-          o2(0xCE,0xD6),      o2(0xCC,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_00 = {
-    to_EUC_KR_E6_00_offsets,
-    to_EUC_KR_E6_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_01_offsets[64] = {
-     20,  0,  1,  2, 20, 20, 20, 20,     20, 20, 20, 20, 20,  3, 20, 20,
-      4, 20,  5, 20, 20,  6, 20, 20,     20,  7, 20, 20, 20,  8, 20, 20,
-     20, 20,  9, 10, 11, 12, 20, 20,     13, 14, 15, 20, 16, 17, 20, 18,
-     19, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_01_infos[21] = {
-          o2(0xEC,0xF6),      o2(0xE2,0xE1),
-          o2(0xE3,0xBE),      o2(0xFC,0xC8),
-          o2(0xCD,0xF0),      o2(0xF9,0xF6),
-          o2(0xDF,0xF0),      o2(0xE5,0xBF),
-          o2(0xCE,0xBF),      o2(0xFC,0xE1),
-          o2(0xED,0xB0),      o2(0xFD,0xD1),
-          o2(0xF6,0xBB),      o2(0xF9,0xCF),
-          o2(0xEB,0xDA),      o2(0xCA,0xC1),
-          o2(0xD2,0xB8),      o2(0xCD,0xF1),
-          o2(0xE3,0xD3),      o2(0xFD,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_01 = {
-    to_EUC_KR_E6_01_offsets,
-    to_EUC_KR_E6_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_02_offsets[64] = {
-     21, 21, 21, 21, 21,  0, 21, 21,     21,  1, 21, 21,  2,  3, 21, 21,
-     21, 21, 21, 21,  4, 21,  5, 21,     21, 21,  6,  7, 21, 21, 21,  8,
-      9, 21, 21, 10, 11, 21, 21, 12,     21, 21, 21, 21, 21, 21, 21, 21,
-     13, 21, 14, 15, 16, 21, 17, 21,     18, 21, 21, 21, 19, 20, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_02_infos[22] = {
-          o2(0xE6,0xED),      o2(0xE3,0xFA),
-          o2(0xF0,0xAA),      o2(0xF9,0xD0),
-          o2(0xFC,0xE2),      o2(0xF8,0xA7),
-          o2(0xE1,0xE5),      o2(0xEE,0xF9),
-          o2(0xE7,0xF6),      o2(0xEA,0xED),
-          o2(0xFC,0xB4),      o2(0xF5,0xC2),
-          o2(0xD7,0xDC),      o2(0xF0,0xF5),
-          o2(0xDD,0xE8),      o2(0xD3,0xED),
-          o2(0xF5,0xFC),      o2(0xDA,0xBF),
-          o2(0xCC,0xFB),      o2(0xD3,0xFA),
-          o2(0xF4,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_02 = {
-    to_EUC_KR_E6_02_offsets,
-    to_EUC_KR_E6_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_03_offsets[64] = {
-     15, 15, 15, 15, 15,  0, 15,  1,     15, 15, 15, 15, 15, 15, 15, 15,
-     15,  2, 15, 15, 15, 15, 15, 15,     15, 15,  3, 15,  4, 15, 15,  5,
-      6,  7, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-      8,  9, 15, 10, 15, 15, 11, 15,     15, 12, 13, 14, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_03_infos[16] = {
-          o2(0xEF,0xD7),      o2(0xD4,0xC3),
-          o2(0xFB,0xE3),      o2(0xFB,0xED),
-          o2(0xE0,0xAD),      o2(0xEA,0xEE),
-          o2(0xFB,0xB3),      o2(0xE4,0xC2),
-          o2(0xF6,0xE7),      o2(0xD2,0xDD),
-          o2(0xDF,0xCC),      o2(0xFC,0xC9),
-          o2(0xE5,0xA9),      o2(0xE0,0xF6),
-          o2(0xF6,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_03 = {
-    to_EUC_KR_E6_03_offsets,
-    to_EUC_KR_E6_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_04_offsets[64] = {
-     18,  0, 18, 18, 18, 18,  1, 18,      2,  3, 18, 18, 18,  4,  5,  6,
-     18, 18, 18, 18, 18,  7, 18, 18,     18, 18,  8,  9, 18, 18, 18, 10,
-     18, 18, 18, 18, 18, 18, 18, 11,     18, 18, 18, 18, 18, 18, 18, 18,
-     12, 18, 18, 18, 13, 18, 18, 14,     18, 18, 18, 18, 15, 18, 16, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_04_infos[19] = {
-          o2(0xE1,0xFE),      o2(0xCB,0xF0),
-          o2(0xEA,0xEF),      o2(0xEA,0xF0),
-          o2(0xDA,0xC0),      o2(0xF8,0xB4),
-          o2(0xEB,0xF2),      o2(0xE4,0xC3),
-          o2(0xE9,0xD7),      o2(0xE4,0xF1),
-          o2(0xCA,0xEF),      o2(0xCE,0xD7),
-          o2(0xFC,0xCA),      o2(0xF3,0xE1),
-          o2(0xCB,0xC4),      o2(0xE3,0xE5),
-          o2(0xCB,0xC5),      o2(0xEA,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_04 = {
-    to_EUC_KR_E6_04_offsets,
-    to_EUC_KR_E6_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_05_offsets[64] = {
-     25, 25,  0, 25,  1, 25, 25,  2,      3, 25,  4,  5,  6, 25, 25, 25,
-     25, 25, 25,  7, 25,  8, 25, 25,      9, 10, 25, 25, 25, 11, 25, 12,
-     25, 25, 13, 14, 15, 25, 25, 16,     17, 25, 25, 18, 25, 25, 19, 25,
-     20, 25, 25, 25, 25, 25, 21, 22,     25, 25, 25, 25, 25, 23, 24, 25,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_05_infos[26] = {
-          o2(0xE9,0xBD),      o2(0xD7,0xC9),
-          o2(0xEB,0xDB),      o2(0xED,0xB1),
-          o2(0xCC,0xC3),      o2(0xF7,0xBE),
-          o2(0xFC,0xCB),      o2(0xF8,0xF4),
-          o2(0xD9,0xB7),      o2(0xF3,0xD3),
-          o2(0xF3,0xD4),      o2(0xF7,0xE4),
-          o2(0xF7,0xD1),      o2(0xD8,0xB7),
-          o2(0xCE,0xB1),      o2(0xCA,0xC2),
-          o2(0xFB,0xB4),      o2(0xCB,0xC6),
-          o2(0xF0,0xF6),      o2(0xD5,0xE7),
-          o2(0xEA,0xD0),      o2(0xCC,0xD4),
-          o2(0xCB,0xAF),      o2(0xF4,0xAA),
-          o2(0xE9,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_05 = {
-    to_EUC_KR_E6_05_offsets,
-    to_EUC_KR_E6_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_06_offsets[64] = {
-     20,  0,  1, 20, 20, 20, 20, 20,     20, 20,  2, 20, 20, 20,  3, 20,
-      4,  5, 20, 20,  6, 20, 20, 20,      7,  8,  9, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 10, 20, 20, 11,     20, 12, 20, 13, 14, 20, 15, 20,
-     20, 20, 16, 20, 20, 20, 17, 20,     20, 20, 18, 20, 20, 20, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_06_infos[21] = {
-          o2(0xF5,0xC3),      o2(0xE9,0xD8),
-          o2(0xDD,0xE9),      o2(0xF1,0xF3),
-          o2(0xD5,0xFB),      o2(0xDE,0xBB),
-          o2(0xF4,0xFB),      o2(0xFD,0xF3),
-          o2(0xFD,0xF2),      o2(0xF7,0xA6),
-          o2(0xDD,0xC9),      o2(0xD4,0xD3),
-          o2(0xCC,0xA8),      o2(0xDA,0xC1),
-          o2(0xCC,0xD5),      o2(0xD9,0xE4),
-          o2(0xFA,0xCA),      o2(0xE5,0xE3),
-          o2(0xD3,0xBC),      o2(0xCA,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_06 = {
-    to_EUC_KR_E6_06_offsets,
-    to_EUC_KR_E6_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_07_offsets[64] = {
-     14, 14, 14,  0, 14, 14, 14,  1,      2,  3,  4,  5, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,  6, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14,  7, 14, 14, 14,  8,  9,     10, 14, 11, 14, 12, 14, 14, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_07_infos[15] = {
-          o2(0xD0,0xC4),      o2(0xCA,0xD0),
-          o2(0xFA,0xAB),      o2(0xEB,0xEB),
-          o2(0xE7,0xF8),      o2(0xD9,0xE5),
-          o2(0xD1,0xD7),      o2(0xF3,0xA4),
-          o2(0xD4,0xFB),      o2(0xFC,0xE3),
-          o2(0xFA,0xD8),      o2(0xF3,0xD5),
-          o2(0xCF,0xAB),      o2(0xEB,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_07 = {
-    to_EUC_KR_E6_07_offsets,
-    to_EUC_KR_E6_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_08_offsets[64] = {
-      0, 22, 22, 22, 22, 22, 22,  1,      2, 22,  3, 22,  4,  5,  6, 22,
-      7,  8,  9, 22, 22, 22, 10, 22,     22, 22, 11, 22, 22, 22, 22, 12,
-     22, 13, 22, 22, 22, 22, 22, 22,     22, 22, 14, 22, 22, 22, 15, 22,
-     16, 17, 22, 22, 18, 22, 19, 22,     22, 22, 22, 22, 22, 22, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_08_infos[23] = {
-          o2(0xD5,0xFC),      o2(0xD3,0xD4),
-          o2(0xCD,0xFC),      o2(0xD9,0xE6),
-          o2(0xE2,0xF9),      o2(0xE2,0xA1),
-          o2(0xEB,0xD4),      o2(0xE0,0xF7),
-          o2(0xE4,0xB2),      o2(0xCC,0xFC),
-          o2(0xFB,0xE4),      o2(0xF4,0xAB),
-          o2(0xD0,0xBD),      o2(0xCA,0xF1),
-          o2(0xEF,0xB8),      o2(0xD7,0xC0),
-          o2(0xEE,0xFA),      o2(0xFD,0xF4),
-          o2(0xD3,0xE3),      o2(0xFB,0xC2),
-          o2(0xD5,0xE8),      o2(0xDB,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_08 = {
-    to_EUC_KR_E6_08_offsets,
-    to_EUC_KR_E6_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_09_offsets[64] = {
-      0,  1, 15, 15, 15, 15, 15,  2,      3,  4, 15,  5, 15,  6, 15, 15,
-     15, 15, 15,  7, 15, 15, 15, 15,      8, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15,  9, 15,
-     15, 10, 15, 15, 15, 15, 11, 15,     15, 12, 15, 15, 13, 15, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_09_infos[16] = {
-          o2(0xE1,0xB6),      o2(0xF8,0xB7),
-          o2(0xE0,0xBF),      o2(0xFB,0xC3),
-          o2(0xDD,0xEA),      o2(0xE2,0xA2),
-          o2(0xEE,0xA6),      o2(0xF6,0xE8),
-          o2(0xF6,0xF5),      o2(0xDD,0xCA),
-          o2(0xD0,0xE2),      o2(0xDD,0xA6),
-          o2(0xDD,0xEB),      o2(0xE4,0xF9),
-          o2(0xE3,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_09 = {
-    to_EUC_KR_E6_09_offsets,
-    to_EUC_KR_E6_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0A_offsets[64] = {
-      0, 16, 16, 16,  1, 16, 16, 16,     16,  2,  3, 16, 16, 16, 16, 16,
-     16,  4,  5, 16, 16,  6, 16,  7,      8, 16, 16,  9, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 10, 16, 16, 16, 16,
-     16, 11, 16, 16, 16, 12, 16, 16,     16, 13, 16, 16, 14, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0A_infos[17] = {
-          o2(0xD0,0xFC),      o2(0xF4,0xFC),
-          o2(0xCC,0xBC),      o2(0xF7,0xEA),
-          o2(0xE5,0xE4),      o2(0xDF,0xF1),
-          o2(0xF7,0xE1),      o2(0xF9,0xF7),
-          o2(0xEF,0xB9),      o2(0xF8,0xD8),
-          o2(0xF9,0xA9),      o2(0xF8,0xD9),
-          o2(0xEE,0xBD),      o2(0xD8,0xC6),
-          o2(0xE4,0xE3),      o2(0xF5,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0A = {
-    to_EUC_KR_E6_0A_offsets,
-    to_EUC_KR_E6_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0B_offsets[64] = {
-     26, 26,  0, 26, 26, 26, 26,  1,      2,  3, 26, 26,  4,  5, 26,  6,
-      7, 26,  8,  9, 10, 26, 11, 12,     13, 14, 26, 15, 16, 26, 26, 26,
-     26, 26, 26, 26, 26, 26, 26, 26,     26, 26, 26, 26, 17, 18, 19, 20,
-     26, 21, 26, 22, 26, 26, 26, 23,     26, 26, 26, 26, 26, 26, 24, 25,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0B_infos[27] = {
-          o2(0xDD,0xD9),      o2(0xD9,0xE7),
-          o2(0xD2,0xB9),      o2(0xD5,0xC3),
-          o2(0xDA,0xE5),      o2(0xDA,0xD0),
-          o2(0xD1,0xD9),      o2(0xCE,0xD8),
-          o2(0xCB,0xDE),      o2(0xF4,0xAC),
-          o2(0xDA,0xFB),      o2(0xF6,0xE9),
-          o2(0xE8,0xF3),      o2(0xCF,0xAC),
-          o2(0xF0,0xF0),      o2(0xF4,0xFD),
-          o2(0xDB,0xC8),      o2(0xCE,0xC0),
-          o2(0xE3,0xD4),      o2(0xD1,0xCF),
-          o2(0xF1,0xF5),      o2(0xCD,0xF2),
-          o2(0xCF,0xEB),      o2(0xCD,0xB8),
-          o2(0xE3,0xA6),      o2(0xD1,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0B = {
-    to_EUC_KR_E6_0B_offsets,
-    to_EUC_KR_E6_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0C_offsets[64] = {
-     10,  0, 10, 10, 10, 10, 10,  1,     10,  2, 10, 10, 10, 10, 10, 10,
-     10,  3, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10,  4, 10, 10, 10,  5,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10,  6,  7, 10,  8,  9, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0C_infos[11] = {
-          o2(0xF2,0xA5),      o2(0xF2,0xA6),
-          o2(0xE4,0xCE),      o2(0xD3,0xFB),
-          o2(0xF1,0xA9),      o2(0xF2,0xC9),
-          o2(0xEF,0xD8),      o2(0xE6,0xC9),
-          o2(0xD8,0xB8),      o2(0xFA,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0C = {
-    to_EUC_KR_E6_0C_offsets,
-    to_EUC_KR_E6_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0D_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13,  0, 13, 13,  1, 13, 13,  2,
-      3, 13, 13, 13, 13,  4, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13,  5,      6, 13, 13, 13, 13, 13,  7, 13,
-     13, 13,  8, 13, 13, 13, 13,  9,     13, 13, 10, 11, 13, 13, 13, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0D_infos[14] = {
-          o2(0xF3,0xB5),      o2(0xF8,0xA4),
-          o2(0xD1,0xF3),      o2(0xE6,0xC8),
-          o2(0xF8,0xDA),      o2(0xDC,0xE9),
-          o2(0xDE,0xD7),      o2(0xCB,0xDF),
-          o2(0xCF,0xEC),      o2(0xF4,0xDF),
-          o2(0xD1,0xF4),      o2(0xD2,0xBA),
-          o2(0xDF,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0D = {
-    to_EUC_KR_E6_0D_offsets,
-    to_EUC_KR_E6_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0E_offsets[64] = {
-     16, 16, 16,  0, 16, 16, 16, 16,      1,  2, 16, 16,  3, 16, 16, 16,
-     16, 16,  4, 16, 16, 16,  5, 16,      6, 16, 16,  7, 16, 16, 16, 16,
-      8,  9, 10, 16, 16, 11, 16, 12,     13, 14, 15, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0E_infos[17] = {
-          o2(0xE1,0xB7),      o2(0xE2,0xA3),
-          o2(0xD3,0xFC),      o2(0xED,0xE6),
-          o2(0xDB,0xC9),      o2(0xE4,0xFA),
-          o2(0xCF,0xDE),      o2(0xCE,0xD0),
-          o2(0xD5,0xD3),      o2(0xF3,0xF5),
-          o2(0xF7,0xAE),      o2(0xEF,0xC8),
-          o2(0xCD,0xF3),      o2(0xF5,0xCF),
-          o2(0xE5,0xF3),      o2(0xF0,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0E = {
-    to_EUC_KR_E6_0E_offsets,
-    to_EUC_KR_E6_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_0F_offsets[64] = {
-      0, 14, 14, 14,  1, 14,  2, 14,     14, 14, 14, 14, 14, 14, 14,  3,
-      4, 14, 14, 14, 14, 14,  5, 14,     14, 14,  6,  7, 14, 14, 14, 14,
-     14,  8, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14,  9, 10, 14,
-     14, 14, 14, 14, 11, 14, 12, 13,     14, 14, 14, 14, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_0F_infos[15] = {
-          o2(0xCA,0xD1),      o2(0xEA,0xF1),
-          o2(0xD0,0xA6),      o2(0xD9,0xDA),
-          o2(0xF0,0xAB),      o2(0xEB,0xE7),
-          o2(0xE5,0xC0),      o2(0xFC,0xB5),
-          o2(0xE4,0xC4),      o2(0xCC,0xA9),
-          o2(0xFD,0xC6),      o2(0xEA,0xB5),
-          o2(0xE5,0xAA),      o2(0xDF,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_0F = {
-    to_EUC_KR_E6_0F_offsets,
-    to_EUC_KR_E6_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_10_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11,  0, 11,  1,
-     11, 11, 11, 11,  2, 11,  3,  4,     11, 11, 11, 11,  5, 11, 11, 11,
-     11, 11,  6, 11, 11, 11, 11, 11,     11, 11, 11, 11,  7,  8, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11,  9, 11, 11, 11, 10, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_10_infos[12] = {
-          o2(0xE1,0xDF),      o2(0xDA,0xD1),
-          o2(0xE1,0xB8),      o2(0xE8,0xF4),
-          o2(0xD3,0xFD),      o2(0xE2,0xA4),
-          o2(0xF2,0xCA),      o2(0xDA,0xE6),
-          o2(0xF7,0xB3),      o2(0xFD,0xCD),
-          o2(0xF3,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_10 = {
-    to_EUC_KR_E6_10_offsets,
-    to_EUC_KR_E6_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_11_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      0,  7,  7,  7,  7,  7,  7,  7,
-      1,  7,  7,  7,  7,  7,  7,  7,      7,  2,  7,  7,  7,  7,  7,  3,
-      7,  7,  7,  7,  7,  7,  7,  7,      4,  5,  6,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_11_infos[8] = {
-          o2(0xEE,0xD7),      o2(0xF5,0xC4),
-          o2(0xD8,0xA4),      o2(0xF2,0xA7),
-          o2(0xD9,0xB8),      o2(0xD9,0xB9),
-          o2(0xEF,0xC9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_11 = {
-    to_EUC_KR_E6_11_offsets,
-    to_EUC_KR_E6_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_12_offsets[64] = {
-     14, 14, 14, 14, 14, 14, 14, 14,      0, 14, 14, 14, 14, 14, 14, 14,
-     14,  1,  2,  3, 14, 14, 14, 14,     14, 14,  4, 14, 14, 14,  5, 14,
-     14, 14, 14, 14,  6,  7, 14, 14,     14, 14, 14,  8, 14,  9, 10, 14,
-     11, 14, 12, 14, 14, 14, 14, 14,     14, 14, 14, 13, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_12_infos[15] = {
-          o2(0xD6,0xCE),      o2(0xF7,0xCB),
-          o2(0xDF,0xAE),      o2(0xE8,0xF5),
-          o2(0xD2,0xB5),      o2(0xD3,0xD5),
-          o2(0xF4,0xCC),      o2(0xDA,0xFC),
-          o2(0xD9,0xE8),      o2(0xF7,0xEB),
-          o2(0xF5,0xC9),      o2(0xF3,0xBC),
-          o2(0xDA,0xD2),      o2(0xD3,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_12 = {
-    to_EUC_KR_E6_12_offsets,
-    to_EUC_KR_E6_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_13_offsets[64] = {
-     21,  0, 21, 21,  1,  2, 21,  3,     21, 21,  4, 21, 21,  5,  6, 21,
-     21, 21,  7, 21,  8, 21, 21, 21,      9, 21, 10, 21, 21, 21, 21, 21,
-     21, 11, 12, 21, 21, 13, 14, 15,     21, 21, 21, 21, 16, 21, 21, 21,
-     21, 21, 17, 21, 18, 21, 21, 21,     21, 21, 19, 21, 21, 21, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_13_infos[22] = {
-          o2(0xE8,0xB6),      o2(0xD6,0xCF),
-          o2(0xF4,0xBA),      o2(0xF7,0xC9),
-          o2(0xCC,0xAA),      o2(0xF0,0xC3),
-          o2(0xCC,0xD6),      o2(0xD0,0xD3),
-          o2(0xD3,0xBD),      o2(0xDB,0xFB),
-          o2(0xCB,0xE0),      o2(0xD3,0xE4),
-          o2(0xF6,0xF7),      o2(0xD5,0xBA),
-          o2(0xF3,0xCD),      o2(0xCB,0xE1),
-          o2(0xEB,0xF4),      o2(0xF4,0xAD),
-          o2(0xFC,0xAA),      o2(0xF7,0xEC),
-          o2(0xE8,0xF6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_13 = {
-    to_EUC_KR_E6_13_offsets,
-    to_EUC_KR_E6_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_14_offsets[64] = {
-      0, 16, 16, 16,  1, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,      2, 16, 16, 16, 16,  3, 16, 16,
-     16, 16, 16,  4, 16, 16, 16, 16,     16, 16,  5,  6,  7, 16, 16,  8,
-     16, 16, 16, 16, 16, 16,  9, 10,     11, 12, 16, 13, 16, 16, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_14_infos[17] = {
-          o2(0xDA,0xE7),      o2(0xF7,0xCC),
-          o2(0xE5,0xC1),      o2(0xE0,0xEE),
-          o2(0xD5,0xFD),      o2(0xCE,0xE6),
-          o2(0xFC,0xAB),      o2(0xD5,0xBB),
-          o2(0xF2,0xA8),      o2(0xE2,0xA5),
-          o2(0xCD,0xB9),      o2(0xEA,0xF2),
-          o2(0xCB,0xC7),      o2(0xCD,0xF4),
-          o2(0xDB,0xAF),      o2(0xEF,0xD9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_14 = {
-    to_EUC_KR_E6_14_offsets,
-    to_EUC_KR_E6_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_15_offsets[64] = {
-     20, 20, 20, 20, 20,  0, 20, 20,      1, 20, 20, 20, 20,  2,  3,  4,
-     20,  5, 20, 20, 20, 20,  6,  7,     20, 20, 20, 20, 20, 20,  8, 20,
-     20, 20,  9, 10, 20, 20, 11, 20,     20, 20, 20, 20, 12, 13, 20, 20,
-     20, 20, 14, 20, 15, 16, 20, 17,     18, 20, 20, 20, 20, 20, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_15_infos[21] = {
-          o2(0xCD,0xBA),      o2(0xFC,0xF9),
-          o2(0xDF,0xF3),      o2(0xCE,0xE7),
-          o2(0xDA,0xC2),      o2(0xCF,0xAD),
-          o2(0xE7,0xF9),      o2(0xF8,0xA8),
-          o2(0xF3,0xE2),      o2(0xCA,0xF2),
-          o2(0xDF,0xA4),      o2(0xD4,0xC4),
-          o2(0xCC,0xD7),      o2(0xE5,0xC2),
-          o2(0xCD,0xBB),      o2(0xEF,0xDA),
-          o2(0xEE,0xD8),      o2(0xDD,0xA7),
-          o2(0xE2,0xA6),      o2(0xE0,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_15 = {
-    to_EUC_KR_E6_15_offsets,
-    to_EUC_KR_E6_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_16_offsets[64] = {
-     24, 24,  0,  1, 24,  2, 24,  3,     24, 24, 24, 24,  4, 24, 24, 24,
-      5,  6, 24, 24, 24, 24, 24,  7,     24,  8, 24,  9, 10, 24, 24, 11,
-     24, 12, 24, 24, 13, 14, 24, 15,     24, 24, 24, 16, 17, 24, 24, 18,
-     19, 24, 24, 24, 24, 24, 24, 20,     24, 21, 24, 24, 22, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_16_infos[25] = {
-          o2(0xD6,0xB0),      o2(0xF8,0xCA),
-          o2(0xFC,0xFA),      o2(0xD9,0xFE),
-          o2(0xDE,0xB0),      o2(0xDD,0xEC),
-          o2(0xDA,0xE8),      o2(0xD4,0xE0),
-          o2(0xD6,0xF9),      o2(0xCD,0xD7),
-          o2(0xDE,0xD8),      o2(0xF2,0xF8),
-          o2(0xE4,0xD6),      o2(0xD0,0xC5),
-          o2(0xF4,0xAE),      o2(0xDD,0xA8),
-          o2(0xED,0xC5),      o2(0xF3,0xD6),
-          o2(0xDE,0xD9),      o2(0xE3,0xE6),
-          o2(0xD3,0xA8),      o2(0xDB,0xB0),
-          o2(0xE5,0xDA),      o2(0xE3,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_16 = {
-    to_EUC_KR_E6_16_offsets,
-    to_EUC_KR_E6_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_17_offsets[64] = {
-     22,  0, 22, 22, 22,  1, 22, 22,     22, 22, 22,  2,  3, 22, 22,  4,
-     22, 22,  5, 22, 22, 22, 22,  6,     22, 22, 22, 22, 22, 22, 22, 22,
-      7, 22, 22,  8, 22,  9, 10, 22,     11, 12, 22, 22, 13, 14, 22, 22,
-     22, 15, 22, 22, 16, 22, 22, 22,     22, 22, 17, 18, 19, 20, 22, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_17_infos[23] = {
-          o2(0xDB,0xB1),      o2(0xD5,0xE9),
-          o2(0xE0,0xC1),      o2(0xEF,0xDB),
-          o2(0xF0,0xE9),      o2(0xD7,0xB2),
-          o2(0xD0,0xFD),      o2(0xD9,0xE9),
-          o2(0xD0,0xFE),      o2(0xEC,0xED),
-          o2(0xD3,0xA9),      o2(0xF2,0xA9),
-          o2(0xF0,0xC4),      o2(0xE2,0xE2),
-          o2(0xE9,0xEF),      o2(0xF9,0xD1),
-          o2(0xE9,0xD9),      o2(0xE8,0xDA),
-          o2(0xDA,0xC3),      o2(0xDA,0xC4),
-          o2(0xD4,0xC5),      o2(0xE7,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_17 = {
-    to_EUC_KR_E6_17_offsets,
-    to_EUC_KR_E6_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_18_offsets[64] = {
-     26, 26, 26, 26, 26, 26,  0,  1,     26,  2,  3, 26,  4, 26,  5,  6,
-      7,  8, 26,  9, 10, 11, 26, 26,     26, 26, 26, 26, 26, 26, 12, 13,
-     14, 26, 26, 26, 26, 15, 26, 16,     17, 26, 26, 26, 26, 18, 26, 19,
-     20, 21, 26, 26, 22, 26, 23, 26,     26, 26, 24, 25, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_18_infos[27] = {
-          o2(0xCD,0xE0),      o2(0xE3,0xB0),
-          o2(0xDB,0xB2),      o2(0xFB,0xC4),
-          o2(0xF3,0xE3),      o2(0xD9,0xA5),
-          o2(0xFB,0xE7),      o2(0xDD,0xCB),
-          o2(0xD0,0xD4),      o2(0xE6,0xB6),
-          o2(0xE0,0xAE),      o2(0xFD,0xDA),
-          o2(0xDC,0xB5),      o2(0xE0,0xF8),
-          o2(0xE7,0xB1),      o2(0xF5,0xF0),
-          o2(0xD8,0xDC),      o2(0xED,0xC6),
-          o2(0xE1,0xB9),      o2(0xE3,0xC0),
-          o2(0xF9,0xC0),      o2(0xE9,0xF0),
-          o2(0xD9,0xDB),      o2(0xF3,0xE4),
-          o2(0xDC,0xB6),      o2(0xE4,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_18 = {
-    to_EUC_KR_E6_18_offsets,
-    to_EUC_KR_E6_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_19_offsets[64] = {
-     27,  0,  1,  2,  3, 27, 27, 27,     27,  4, 27,  5, 27, 27, 27,  6,
-     27, 27, 27, 27, 27, 27, 27, 27,     27,  7, 27,  8, 27,  9, 10, 11,
-     27, 27, 27, 27, 12, 13, 14, 15,     16, 17, 27, 18, 27, 27, 19, 20,
-     27, 27, 27, 21, 22, 27, 23, 24,     25, 27, 26, 27, 27, 27, 27, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_19_infos[28] = {
-          o2(0xF0,0xC5),      o2(0xE3,0xC1),
-          o2(0xFC,0xCC),      o2(0xFC,0xCD),
-          o2(0xF2,0xCB),      o2(0xF2,0xCC),
-          o2(0xE4,0xCF),      o2(0xF1,0xDB),
-          o2(0xFA,0xD9),      o2(0xF1,0xB8),
-          o2(0xFD,0xF5),      o2(0xE0,0xF9),
-          o2(0xE7,0xFB),      o2(0xFC,0xB7),
-          o2(0xFC,0xE4),      o2(0xFB,0xC5),
-          o2(0xE3,0xE7),      o2(0xD8,0xB9),
-          o2(0xF6,0xF8),      o2(0xDC,0xC5),
-          o2(0xCC,0xD8),      o2(0xE0,0xAF),
-          o2(0xF4,0xE7),      o2(0xEF,0xDC),
-          o2(0xCF,0xFC),      o2(0xEF,0xDD),
-          o2(0xF2,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_19 = {
-    to_EUC_KR_E6_19_offsets,
-    to_EUC_KR_E6_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1A_offsets[64] = {
-     21, 21, 21, 21,  0, 21, 21,  1,      2,  3, 21, 21, 21, 21,  4, 21,
-      5,  6, 21, 21, 21, 21,  7,  8,      9, 21, 21, 21, 21, 10, 21, 21,
-     11, 21, 12, 21, 21, 21, 21, 21,     21, 21, 21, 13, 21, 21, 14, 21,
-     21, 21, 15, 16, 17, 21, 21, 21,     21, 18, 21, 19, 21, 21, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1A_infos[22] = {
-          o2(0xFD,0xBE),      o2(0xCA,0xAC),
-          o2(0xFD,0xBB),      o2(0xFD,0xC7),
-          o2(0xE7,0xB2),      o2(0xEA,0xD1),
-          o2(0xDF,0xF4),      o2(0xD1,0xEC),
-          o2(0xE4,0xDE),      o2(0xE5,0xC3),
-          o2(0xD9,0xA6),      o2(0xCD,0xBC),
-          o2(0xF3,0xE5),      o2(0xED,0xD5),
-          o2(0xD9,0xBA),      o2(0xED,0xE7),
-          o2(0xFB,0xB5),      o2(0xF8,0xEC),
-          o2(0xE0,0xE7),      o2(0xCC,0xD9),
-          o2(0xD4,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1A = {
-    to_EUC_KR_E6_1A_offsets,
-    to_EUC_KR_E6_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1B_offsets[64] = {
-     21, 21, 21, 21,  0, 21,  1,  2,     21,  3, 21, 21, 21, 21, 21, 21,
-     21, 21, 21, 21, 21, 21,  4, 21,     21,  5, 21, 21,  6,  7, 21, 21,
-      8, 21, 21, 21, 21, 21,  9, 21,     21, 21, 21, 21, 21, 21, 21, 21,
-     10, 21, 11, 12, 13, 21, 21, 14,     15, 16, 17, 21, 18, 21, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1B_infos[22] = {
-          o2(0xE7,0xA5),      o2(0xD5,0xF5),
-          o2(0xD3,0xBE),      o2(0xFC,0xFB),
-          o2(0xE4,0xF2),      o2(0xDF,0xF5),
-          o2(0xE8,0xF8),      o2(0xF8,0xED),
-          o2(0xCE,0xC7),      o2(0xFD,0xF6),
-          o2(0xE8,0xD8),      o2(0xCD,0xD8),
-          o2(0xE7,0xD6),      o2(0xCC,0xDA),
-          o2(0xCA,0xE3),      o2(0xDF,0xF6),
-          o2(0xF0,0xC7),      o2(0xF0,0xC6),
-          o2(0xD8,0xBA),      o2(0xF1,0xF4),
-          o2(0xF4,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1B = {
-    to_EUC_KR_E6_1B_offsets,
-    to_EUC_KR_E6_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1C_offsets[64] = {
-      0, 26, 26,  1, 26, 26, 26, 26,      2,  3, 26,  4, 26,  5, 26, 26,
-     26, 26, 26, 26,  6,  7, 26,  8,     26, 26, 26,  9, 26, 10, 11, 12,
-     26, 26, 26, 26, 26, 26, 13, 14,     15, 26, 16, 17, 18, 19, 20, 26,
-     26, 21, 26, 26, 22, 26, 23, 26,     26, 26, 24, 26, 26, 25, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1C_infos[27] = {
-          o2(0xF5,0xCC),      o2(0xFC,0xE5),
-          o2(0xEA,0xC5),      o2(0xEA,0xF3),
-          o2(0xDD,0xDB),      o2(0xDC,0xD7),
-          o2(0xDE,0xFD),      o2(0xF2,0xF9),
-          o2(0xD5,0xC7),      o2(0xD8,0xD0),
-          o2(0xF0,0xC8),      o2(0xD1,0xA1),
-          o2(0xD1,0xA2),      o2(0xD9,0xD4),
-          o2(0xD6,0xE8),      o2(0xD9,0xCA),
-          o2(0xDA,0xB1),      o2(0xD8,0xC7),
-          o2(0xDC,0xE2),      o2(0xF3,0xCE),
-          o2(0xF5,0xF4),      o2(0xF1,0xB9),
-          o2(0xDA,0xD3),      o2(0xF6,0xEA),
-          o2(0xCF,0xF5),      o2(0xFD,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1C = {
-    to_EUC_KR_E6_1C_offsets,
-    to_EUC_KR_E6_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1D_offsets[64] = {
-     21, 21, 21, 21, 21, 21,  0, 21,     21,  1, 21, 21, 21, 21,  2,  3,
-      4,  5, 21,  6, 21, 21,  7, 21,     21, 21, 21, 21,  8, 21,  9, 10,
-     21, 21, 21, 21, 21, 21, 21, 21,     21, 21, 21, 21, 21, 11, 21, 12,
-     13, 14, 21, 15, 21, 16, 21, 17,     21, 21, 21, 18, 21, 21, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1D_infos[22] = {
-          o2(0xCA,0xD2),      o2(0xDF,0xB4),
-          o2(0xD7,0xDD),      o2(0xFA,0xBA),
-          o2(0xEE,0xA7),      o2(0xF5,0xBD),
-          o2(0xF8,0xF5),      o2(0xED,0xE8),
-          o2(0xD4,0xE1),      o2(0xD1,0xA3),
-          o2(0xE1,0xD6),      o2(0xF9,0xF8),
-          o2(0xDB,0xCA),      o2(0xCB,0xF9),
-          o2(0xD4,0xD4),      o2(0xD9,0xDC),
-          o2(0xEE,0xBE),      o2(0xF7,0xED),
-          o2(0xD2,0xEE),      o2(0xE1,0xE6),
-          o2(0xF7,0xF9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1D = {
-    to_EUC_KR_E6_1D_offsets,
-    to_EUC_KR_E6_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1E_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18,  0,     18,  1, 18,  2, 18, 18, 18,  3,
-      4, 18, 18,  5, 18,  6, 18,  7,     18, 18,  8, 18,  9, 10, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18, 11,
-     12, 18, 18, 13, 18, 18, 14, 15,     16, 18, 18, 18, 18, 18, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1E_infos[19] = {
-          o2(0xDD,0xED),      o2(0xE8,0xDB),
-          o2(0xDB,0xB3),      o2(0xD1,0xF7),
-          o2(0xE0,0xB0),      o2(0xD4,0xE2),
-          o2(0xF6,0xD7),      o2(0xD7,0xF9),
-          o2(0xD8,0xDD),      o2(0xCD,0xFD),
-          o2(0xF2,0xAB),      o2(0xCD,0xBD),
-          o2(0xF8,0xC2),      o2(0xF2,0xAC),
-          o2(0xCA,0xAD),      o2(0xCA,0xAE),
-          o2(0xCF,0xAE),      o2(0xE3,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1E = {
-    to_EUC_KR_E6_1E_offsets,
-    to_EUC_KR_E6_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_1F_offsets[64] = {
-     20, 20, 20, 20,  0, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20,  1,
-      2,  3,  4,  5,  6, 20, 20, 20,     20, 20,  7, 20, 20,  8, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     20,  9, 20, 20, 10, 20, 20, 11,
-     12, 13, 20, 14, 15, 16, 17, 20,     20, 20, 20, 18, 20, 20, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_1F_infos[21] = {
-          o2(0xDC,0xB7),      o2(0xDB,0xDA),
-          o2(0xD9,0xBB),      o2(0xCA,0xF3),
-          o2(0xF6,0xD3),      o2(0xE6,0xF8),
-          o2(0xEA,0xF5),      o2(0xEA,0xF6),
-          o2(0xF6,0xF9),      o2(0xCF,0xAF),
-          o2(0xCA,0xD3),      o2(0xCA,0xAF),
-          o2(0xD2,0xB0),      o2(0xF1,0xBA),
-          o2(0xD7,0xB3),      o2(0xE3,0xC3),
-          o2(0xF3,0xFD),      o2(0xDE,0xDA),
-          o2(0xDE,0xDB),      o2(0xEF,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_1F = {
-    to_EUC_KR_E6_1F_offsets,
-    to_EUC_KR_E6_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_20_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12,  0,  1, 12, 12,  2,  3,     12, 12, 12, 12, 12, 12, 12, 12,
-     12,  4,  5, 12, 12, 12, 12, 12,     12, 12,  6, 12, 12, 12, 12,  7,
-     12, 12, 12, 12, 12, 12, 12, 12,      8,  9, 12, 12, 10, 11, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_20_infos[13] = {
-          o2(0xE2,0xE3),      o2(0xEE,0xFB),
-          o2(0xDF,0xF7),      o2(0xD7,0xCA),
-          o2(0xCE,0xE8),      o2(0xDB,0xDB),
-          o2(0xF1,0xBB),      o2(0xE9,0xF1),
-          o2(0xFA,0xB7),      o2(0xD0,0xC6),
-          o2(0xCC,0xAB),      o2(0xEE,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_20 = {
-    to_EUC_KR_E6_20_offsets,
-    to_EUC_KR_E6_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_21_offsets[64] = {
-      0,  1,  2,  3, 13, 13, 13, 13,      4, 13, 13, 13, 13, 13,  5, 13,
-      6,  7, 13,  8,  9, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 10, 13, 13,
-     13, 13, 13, 13, 13, 13, 11, 13,     13, 13, 13, 13, 13, 13, 13, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_21_infos[14] = {
-          o2(0xCB,0xFA),      o2(0xF9,0xF9),
-          o2(0xCC,0xFD),      o2(0xD3,0xFE),
-          o2(0xE4,0xD0),      o2(0xF2,0xEE),
-          o2(0xD4,0xD5),      o2(0xDF,0xCD),
-          o2(0xFC,0xB8),      o2(0xD1,0xD0),
-          o2(0xF2,0xCD),      o2(0xF7,0xD2),
-          o2(0xCA,0xD4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_21 = {
-    to_EUC_KR_E6_21_offsets,
-    to_EUC_KR_E6_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_22_offsets[64] = {
-     19,  0, 19, 19, 19,  1, 19, 19,     19, 19, 19, 19, 19, 19, 19,  2,
-     19, 19, 19,  3,  4, 19, 19,  5,     19, 19, 19, 19, 19,  6, 19,  7,
-     19,  8,  9, 19, 19, 19, 19, 10,     11, 19, 19, 19, 19, 12, 19, 13,
-     14, 15, 19, 16, 19, 17, 18, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_22_infos[20] = {
-          o2(0xD5,0xD9),      o2(0xD8,0xDE),
-          o2(0xCD,0xD9),      o2(0xEE,0xA9),
-          o2(0xF6,0xBC),      o2(0xCC,0xDB),
-          o2(0xF0,0xC9),      o2(0xFC,0xFC),
-          o2(0xE8,0xC9),      o2(0xF4,0xFE),
-          o2(0xE7,0xFC),      o2(0xD7,0xDE),
-          o2(0xDE,0xDC),      o2(0xF0,0xAC),
-          o2(0xCC,0xFE),      o2(0xCD,0xE1),
-          o2(0xE1,0xBA),      o2(0xDB,0xEF),
-          o2(0xDA,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_22 = {
-    to_EUC_KR_E6_22_offsets,
-    to_EUC_KR_E6_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_23_offsets[64] = {
-     18, 18, 18, 18,  0,  1, 18, 18,     18,  2, 18,  3, 18,  4, 18, 18,
-     18, 18,  5, 18, 18,  6, 18,  7,      8, 18,  9, 18, 18, 18, 18, 10,
-     11, 18, 18, 18, 18, 18, 18, 12,     13, 18, 18, 18, 18, 18, 14, 18,
-     18, 18, 15, 18, 18, 18, 18, 18,     18, 16, 17, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_23_infos[19] = {
-          o2(0xD1,0xA5),      o2(0xDC,0xB8),
-          o2(0xD8,0xF6),      o2(0xD1,0xA4),
-          o2(0xCD,0xE2),      o2(0xDC,0xEA),
-          o2(0xF0,0xF7),      o2(0xF0,0xCA),
-          o2(0xD0,0xBE),      o2(0xDD,0xDC),
-          o2(0xD4,0xD6),      o2(0xD3,0xD6),
-          o2(0xED,0xD0),      o2(0xCD,0xA1),
-          o2(0xDF,0xB5),      o2(0xDF,0xF8),
-          o2(0xD4,0xA1),      o2(0xCE,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_23 = {
-    to_EUC_KR_E6_23_offsets,
-    to_EUC_KR_E6_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_24_offsets[64] = {
-      0,  9,  9,  9,  9,  1,  9,  9,      9,  9,  9,  9,  9,  2,  3,  9,
-      9,  9,  4,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  5,      9,  9,  9,  9,  9,  9,  9,  9,
-      6,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  7,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_24_infos[10] = {
-          o2(0xE8,0xCA),      o2(0xEB,0xF5),
-          o2(0xE3,0xD5),      o2(0xF5,0xD0),
-          o2(0xF5,0xA1),      o2(0xD9,0xA7),
-          o2(0xE5,0xAB),      o2(0xE6,0xCB),
-          o2(0xF5,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_24 = {
-    to_EUC_KR_E6_24_offsets,
-    to_EUC_KR_E6_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_25_offsets[64] = {
-     21, 21, 21, 21, 21, 21, 21, 21,     21, 21,  0, 21, 21, 21, 21, 21,
-     21, 21, 21,  1,  2,  3, 21,  4,     21,  5,  6, 21, 21, 21,  7, 21,
-      8,  9, 10, 11, 21, 21, 21, 21,     12, 21, 21, 13, 21, 14, 15, 16,
-     21, 21, 21, 21, 21, 17, 21, 18,     19, 20, 21, 21, 21, 21, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_25_infos[22] = {
-          o2(0xE5,0xC5),      o2(0xF9,0xA3),
-          o2(0xE0,0xDB),      o2(0xF6,0xEB),
-          o2(0xCB,0xF1),      o2(0xD9,0xEA),
-          o2(0xF5,0xA2),      o2(0xD7,0xD1),
-          o2(0xD1,0xF8),      o2(0xEA,0xF8),
-          o2(0xEA,0xF9),      o2(0xDA,0xB3),
-          o2(0xEF,0xDF),      o2(0xF1,0xEF),
-          o2(0xE5,0xF6),      o2(0xEE,0xBF),
-          o2(0xE2,0xE4),      o2(0xD0,0xBF),
-          o2(0xFA,0xAC),      o2(0xF5,0xD1),
-          o2(0xE7,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_25 = {
-    to_EUC_KR_E6_25_offsets,
-    to_EUC_KR_E6_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_26_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  0,  8,  8,      8,  8,  8,  1,  2,  8,  8,  8,
-      8,  8,  8,  8,  8,  3,  8,  4,      8,  8,  8,  8,  8,  8,  5,  8,
-      8,  8,  8,  8,  6,  8,  8,  8,      8,  8,  8,  7,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_26_infos[9] = {
-          o2(0xE9,0xBE),      o2(0xF2,0xCE),
-          o2(0xDB,0xB4),      o2(0xFC,0xCE),
-          o2(0xDD,0xEE),      o2(0xE7,0xB4),
-          o2(0xD7,0xB4),      o2(0xF7,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_26 = {
-    to_EUC_KR_E6_26_offsets,
-    to_EUC_KR_E6_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_27_offsets[64] = {
-     11,  0, 11,  1, 11, 11, 11, 11,     11, 11, 11,  2,  3,  4, 11, 11,
-      5, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      6, 11,  7, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11,  8, 11,  9, 11, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_27_infos[12] = {
-          o2(0xCD,0xBE),      o2(0xDA,0xE9),
-          o2(0xCF,0xB0),      o2(0xF7,0xD9),
-          o2(0xF3,0xE6),      o2(0xCE,0xD9),
-          o2(0xCE,0xAA),      o2(0xCB,0xC8),
-          o2(0xD0,0xA7),      o2(0xF0,0xCB),
-          o2(0xD0,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_27 = {
-    to_EUC_KR_E6_27_offsets,
-    to_EUC_KR_E6_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_28_offsets[64] = {
-     15, 15,  0, 15, 15, 15, 15, 15,     15, 15,  1, 15, 15, 15, 15, 15,
-     15,  2, 15,  3, 15, 15, 15,  4,     15,  5, 15, 15, 15, 15,  6,  7,
-     15,  8, 15,  9, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 10, 15, 15,     11, 12, 13, 15, 15, 14, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_28_infos[16] = {
-          o2(0xE4,0xC5),      o2(0xDB,0xE0),
-          o2(0xD5,0xDA),      o2(0xD7,0xA7),
-          o2(0xEE,0xC0),      o2(0xF8,0xF6),
-          o2(0xF5,0xD2),      o2(0xED,0xE9),
-          o2(0xD9,0xBC),      o2(0xE5,0xC6),
-          o2(0xF5,0xA3),      o2(0xDA,0xD4),
-          o2(0xE2,0xA7),      o2(0xFB,0xFC),
-          o2(0xF1,0xDC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_28 = {
-    to_EUC_KR_E6_28_offsets,
-    to_EUC_KR_E6_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_29_offsets[64] = {
-     10, 10, 10, 10,  0, 10, 10, 10,      1, 10, 10,  2, 10, 10, 10, 10,
-     10, 10,  3,  4, 10, 10, 10, 10,      5,  6, 10, 10, 10, 10, 10,  7,
-     10,  8, 10, 10, 10, 10, 10, 10,     10, 10, 10,  9, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_29_infos[11] = {
-          o2(0xCA,0xF4),      o2(0xE8,0xFA),
-          o2(0xCE,0xE9),      o2(0xE9,0xF8),
-          o2(0xE2,0xE5),      o2(0xD0,0xB9),
-          o2(0xD4,0xF2),      o2(0xD1,0xA6),
-          o2(0xDF,0xCE),      o2(0xFC,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_29 = {
-    to_EUC_KR_E6_29_offsets,
-    to_EUC_KR_E6_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2A_offsets[64] = {
-      0, 11, 11, 11,  1, 11, 11, 11,     11,  2, 11, 11, 11,  3,  4, 11,
-     11, 11, 11, 11, 11, 11, 11,  5,     11, 11, 11, 11,  6, 11, 11, 11,
-     11, 11,  7,  8, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11,  9, 11, 11, 11, 11,     11, 11, 11, 10, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2A_infos[12] = {
-          o2(0xD3,0xAA),      o2(0xCC,0xAC),
-          o2(0xEF,0xE0),      o2(0xE5,0xE5),
-          o2(0xD0,0xD5),      o2(0xDB,0xFC),
-          o2(0xFC,0xE6),      o2(0xCB,0xFE),
-          o2(0xED,0xEA),      o2(0xDE,0xB1),
-          o2(0xF9,0xE3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2A = {
-    to_EUC_KR_E6_2A_offsets,
-    to_EUC_KR_E6_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2B_offsets[64] = {
-      7,  7,  0,  1,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  2,  7,  7,  7,  7,      7,  7,  3,  4,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  5,  7,      7,  7,  7,  6,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2B_infos[8] = {
-          o2(0xD4,0xA2),      o2(0xCF,0xF6),
-          o2(0xD6,0xD0),      o2(0xD5,0xEA),
-          o2(0xF1,0xEE),      o2(0xFA,0xCB),
-          o2(0xE5,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2B = {
-    to_EUC_KR_E6_2B_offsets,
-    to_EUC_KR_E6_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2C_offsets[64] = {
-     12, 12, 12, 12,  0, 12, 12, 12,     12, 12,  1, 12,  2, 12, 12, 12,
-     12, 12,  3, 12, 12, 12,  4, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-      5,  6, 12,  7, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12,  8, 12, 12, 12, 12, 12,     12, 12,  9, 12, 12, 10, 11, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2C_infos[13] = {
-          o2(0xD5,0xB1),      o2(0xCF,0xED),
-          o2(0xED,0xEB),      o2(0xD5,0xB2),
-          o2(0xD5,0xBC),      o2(0xFD,0xE2),
-          o2(0xF3,0xAD),      o2(0xFD,0xDB),
-          o2(0xE9,0xB0),      o2(0xD1,0xA7),
-          o2(0xFD,0xE3),      o2(0xCE,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2C = {
-    to_EUC_KR_E6_2C_offsets,
-    to_EUC_KR_E6_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2D_offsets[64] = {
-     18, 18, 18, 18, 18, 18,  0,  1,     18, 18, 18, 18,  2, 18,  3, 18,
-      4, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18,  5,
-     18,  6,  7,  8,  9, 10, 11, 18,     18, 18, 12, 18, 18, 18, 18, 18,
-     18, 18, 13, 18, 18, 18, 18, 14,     15, 18, 18, 16, 18, 18, 18, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2D_infos[19] = {
-          o2(0xFD,0xE4),      o2(0xFA,0xCE),
-          o2(0xCA,0xB0),      o2(0xF7,0xA7),
-          o2(0xCF,0xB1),      o2(0xE6,0xA2),
-          o2(0xFC,0xB6),      o2(0xF2,0xAD),
-          o2(0xEF,0xE1),      o2(0xF3,0xAE),
-          o2(0xDC,0xC6),      o2(0xD9,0xEB),
-          o2(0xE8,0xE0),      o2(0xE1,0xA8),
-          o2(0xD5,0xF6),      o2(0xCF,0xFD),
-          o2(0xDE,0xDD),      o2(0xD9,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2D = {
-    to_EUC_KR_E6_2D_offsets,
-    to_EUC_KR_E6_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2E_offsets[64] = {
-     16, 16, 16,  0,  1, 16,  2, 16,     16,  3,  4, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16,  5, 16,      6, 16, 16, 16, 16, 16,  7, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16,  8,  9,
-     16, 16, 10, 16, 16, 11, 16, 12,     16, 16, 13, 16, 14, 16, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2E_infos[17] = {
-          o2(0xE4,0xEA),      o2(0xF2,0xCF),
-          o2(0xF7,0xBF),      o2(0xE2,0xE6),
-          o2(0xE2,0xA8),      o2(0xE3,0xD6),
-          o2(0xED,0xD1),      o2(0xE9,0xF9),
-          o2(0xD6,0xB1),      o2(0xDE,0xB2),
-          o2(0xE0,0xE8),      o2(0xD3,0xAB),
-          o2(0xEB,0xDC),      o2(0xDF,0xAF),
-          o2(0xCA,0xC3),      o2(0xEE,0xFC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2E = {
-    to_EUC_KR_E6_2E_offsets,
-    to_EUC_KR_E6_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_2F_offsets[64] = {
-     15,  0, 15, 15, 15,  1,  2, 15,     15, 15, 15,  3, 15,  4, 15,  5,
-     15, 15,  6,  7,  8, 15,  9, 10,     11, 15, 15, 12, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 13, 14, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_2F_infos[16] = {
-          o2(0xFD,0xC3),      o2(0xEB,0xF6),
-          o2(0xCF,0xB2),      o2(0xD9,0xEC),
-          o2(0xD9,0xBD),      o2(0xD8,0xDF),
-          o2(0xD4,0xB8),      o2(0xEB,0xBE),
-          o2(0xDD,0xEF),      o2(0xDD,0xF0),
-          o2(0xDD,0xF1),      o2(0xDD,0xF2),
-          o2(0xD9,0xBE),      o2(0xFB,0xC6),
-          o2(0xCF,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_2F = {
-    to_EUC_KR_E6_2F_offsets,
-    to_EUC_KR_E6_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_30_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  9,      0,  9,  9,  9,  9,  9,  9,  1,
-      9,  2,  9,  3,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  4,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  5,  9,  9,  6,      7,  9,  9,  9,  9,  9,  8,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_30_infos[10] = {
-          o2(0xEE,0xFD),      o2(0xE4,0xAB),
-          o2(0xDA,0xC5),      o2(0xD8,0xEC),
-          o2(0xD1,0xA8),      o2(0xE2,0xA9),
-          o2(0xDE,0xBC),      o2(0xE7,0xB5),
-          o2(0xDB,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_30 = {
-    to_EUC_KR_E6_30_offsets,
-    to_EUC_KR_E6_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_31_offsets[64] = {
-      0,  1,  2, 21, 21, 21, 21, 21,     21, 21, 21, 21, 21, 21,  3, 21,
-      4, 21, 21, 21, 21,  5, 21,  6,     21, 21,  7, 21, 21,  8,  9, 10,
-     11, 21, 21, 21, 21, 21, 21, 21,     12, 21, 13, 21, 21, 14, 21, 21,
-     15, 21, 16, 21, 21, 21, 17, 21,     21, 21, 18, 21, 21, 19, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_31_infos[22] = {
-          o2(0xEF,0xE2),      o2(0xF1,0xF0),
-          o2(0xCF,0xB4),      o2(0xDB,0xF1),
-          o2(0xE0,0xB1),      o2(0xDF,0xA5),
-          o2(0xF9,0xD2),      o2(0xE7,0xFD),
-          o2(0xE6,0xA3),      o2(0xFB,0xF1),
-          o2(0xCB,0xB0),      o2(0xF2,0xAE),
-          o2(0xCD,0xE7),      o2(0xE8,0xDC),
-          o2(0xE7,0xD7),      o2(0xF7,0xC0),
-          o2(0xD0,0xE3),      o2(0xDA,0xA1),
-          o2(0xCC,0xBD),      o2(0xD1,0xA9),
-          o2(0xDD,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_31 = {
-    to_EUC_KR_E6_31_offsets,
-    to_EUC_KR_E6_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_32_offsets[64] = {
-     27,  0,  1,  2, 27,  3,  4,  5,      6, 27, 27, 27,  7, 27, 27, 27,
-      8, 27,  9, 10, 11, 12, 13, 27,     27, 14, 15, 16, 27, 27, 27, 27,
-     27, 27, 27, 27, 27, 27, 27, 27,     27, 27, 27, 17, 27, 27, 18, 27,
-     27, 27, 27, 19, 27, 27, 27, 27,     20, 21, 27, 22, 23, 24, 25, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_32_infos[28] = {
-          o2(0xE3,0xFE),      o2(0xD1,0xAA),
-          o2(0xE8,0xAA),      o2(0xEA,0xB6),
-          o2(0xF9,0xFA),      o2(0xE6,0xCC),
-          o2(0xF6,0xD8),      o2(0xD4,0xC7),
-          o2(0xD9,0xCB),      o2(0xD9,0xD2),
-          o2(0xD3,0xCB),      o2(0xD8,0xF7),
-          o2(0xDA,0xA9),      o2(0xF5,0xF8),
-          o2(0xDE,0xDE),      o2(0xF2,0xAF),
-          o2(0xF8,0xA9),      o2(0xD8,0xC8),
-          o2(0xEE,0xC1),      o2(0xF9,0xC1),
-          o2(0xDD,0xF3),      o2(0xEA,0xFA),
-          o2(0xF6,0xBD),      o2(0xE1,0xBB),
-          o2(0xCD,0xBF),      o2(0xF4,0xD4),
-          o2(0xE6,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_32 = {
-    to_EUC_KR_E6_32_offsets,
-    to_EUC_KR_E6_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_33_offsets[64] = {
-     20,  0,  1, 20,  2, 20, 20, 20,     20,  3,  4, 20,  5, 20, 20, 20,
-     20, 20, 20,  6, 20,  7, 20,  8,     20, 20, 20,  9, 20, 20, 20, 20,
-     20, 10, 11, 12, 20, 13, 20, 20,     14, 20, 20, 15, 20, 20, 16, 17,
-     18, 20, 20, 19, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_33_infos[21] = {
-          o2(0xFC,0xCF),      o2(0xFB,0xA2),
-          o2(0xE0,0xDC),      o2(0xF4,0xBB),
-          o2(0xDA,0xD5),      o2(0xF9,0xB2),
-          o2(0xFB,0xF2),      o2(0xDB,0xF6),
-          o2(0xDE,0xDF),      o2(0xDB,0xF2),
-          o2(0xF8,0xDC),      o2(0xF7,0xEE),
-          o2(0xEB,0xE8),      o2(0xD2,0xFA),
-          o2(0xF1,0xBC),      o2(0xFA,0xDA),
-          o2(0xDA,0xEA),      o2(0xDA,0xC6),
-          o2(0xF7,0xC1),      o2(0xE7,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_33 = {
-    to_EUC_KR_E6_33_offsets,
-    to_EUC_KR_E6_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_34_offsets[64] = {
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19,  0,  1, 19, 19, 19,
-     19,  2, 19, 19, 19, 19, 19,  3,     19,  4, 19,  5, 19, 19,  6, 19,
-     19, 19, 19, 19, 19,  7, 19,  8,     19,  9, 10, 19, 19, 19, 19, 19,
-     19, 19, 11, 19, 19, 12, 13, 19,     14, 15, 19, 16, 19, 17, 18, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_34_infos[20] = {
-          o2(0xE5,0xC7),      o2(0xD6,0xAC),
-          o2(0xDC,0xC7),      o2(0xE1,0xA9),
-          o2(0xE2,0xAA),      o2(0xD5,0xA6),
-          o2(0xD4,0xD7),      o2(0xF2,0xD0),
-          o2(0xEA,0xFB),      o2(0xE0,0xDD),
-          o2(0xFB,0xF3),      o2(0xF1,0xBD),
-          o2(0xE2,0xE7),      o2(0xFD,0xD7),
-          o2(0xCE,0xC8),      o2(0xEA,0xB7),
-          o2(0xFC,0xC0),      o2(0xFD,0xE7),
-          o2(0xF7,0xEF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_34 = {
-    to_EUC_KR_E6_34_offsets,
-    to_EUC_KR_E6_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_35_offsets[64] = {
-     15,  0, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15,  1,  2, 15,  3, 15, 15, 15,
-     15, 15, 15,  4, 15, 15,  5, 15,     15,  6,  7, 15,  8, 15,  9, 15,
-     15, 15, 15, 15, 10, 15, 15, 11,     12, 13, 15, 15, 15, 15, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_35_infos[16] = {
-          o2(0xD7,0xB5),      o2(0xEF,0xBA),
-          o2(0xF1,0xDD),      o2(0xDE,0xB3),
-          o2(0xE8,0xCB),      o2(0xF8,0xDD),
-          o2(0xFB,0xC7),      o2(0xD5,0xC8),
-          o2(0xD7,0xDF),      o2(0xDD,0xA9),
-          o2(0xE9,0xB1),      o2(0xFA,0xAD),
-          o2(0xF6,0xD9),      o2(0xFA,0xF4),
-          o2(0xF8,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_35 = {
-    to_EUC_KR_E6_35_offsets,
-    to_EUC_KR_E6_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_36_offsets[64] = {
-     13, 13, 13, 13, 13,  0, 13,  1,      2,  3, 13, 13,  4,  5,  6, 13,
-     13,  7, 13,  8, 13,  9, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 10,
-     13, 13, 11, 13, 13, 12, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_36_infos[14] = {
-          o2(0xE6,0xEE),      o2(0xCC,0xDC),
-          o2(0xE1,0xBC),      o2(0xE0,0xEF),
-          o2(0xE9,0xBF),      o2(0xFC,0xFD),
-          o2(0xE6,0xCE),      o2(0xE1,0xD7),
-          o2(0xE6,0xCF),      o2(0xF4,0xF1),
-          o2(0xE4,0xF3),      o2(0xE4,0xFB),
-          o2(0xF9,0xE4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_36 = {
-    to_EUC_KR_E6_36_offsets,
-    to_EUC_KR_E6_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_37_offsets[64] = {
-      0, 26, 26,  1,  2,  3,  4,  5,     26, 26, 26,  6, 26, 26, 26,  7,
-     26,  8, 26, 26, 26, 26, 26, 26,      9, 10, 11, 26, 26, 26, 12, 26,
-     26, 13, 26, 26, 26, 26, 26, 26,     14, 26, 15, 16, 26, 26, 17, 26,
-     26, 18, 26, 19, 26, 20, 26, 21,     22, 23, 24, 25, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_37_infos[27] = {
-          o2(0xEF,0xE3),      o2(0xCF,0xEE),
-          o2(0xF6,0xBE),      o2(0xE0,0xB2),
-          o2(0xFC,0xFE),      o2(0xD1,0xAB),
-          o2(0xD7,0xFA),      o2(0xFB,0xC8),
-          o2(0xE2,0xD7),      o2(0xD4,0xA3),
-          o2(0xF0,0xF8),      o2(0xD7,0xA8),
-          o2(0xE1,0xE7),      o2(0xD3,0xBF),
-          o2(0xEF,0xE4),      o2(0xD7,0xC5),
-          o2(0xEB,0xE2),      o2(0xFC,0xE7),
-          o2(0xE4,0xA2),      o2(0xE2,0xE8),
-          o2(0xE6,0xD0),      o2(0xFB,0xE8),
-          o2(0xF4,0xE8),      o2(0xE5,0xF4),
-          o2(0xF4,0xBC),      o2(0xF4,0xD5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_37 = {
-    to_EUC_KR_E6_37_offsets,
-    to_EUC_KR_E6_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_38_offsets[64] = {
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23,  0,     23,  1,  2,  3, 23, 23, 23,  4,
-      5,  6, 23,  7,  8,  9, 10, 23,     23, 23, 23, 11, 12, 13, 23, 14,
-     23, 23, 15, 23, 16, 23, 17, 23,     18, 23, 19, 23, 20, 21, 22, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_38_infos[24] = {
-          o2(0xDF,0xB6),      o2(0xFC,0xB9),
-          o2(0xEE,0xC2),      o2(0xCA,0xF5),
-          o2(0xEF,0xE5),      o2(0xCB,0xE2),
-          o2(0xD4,0xA4),      o2(0xDE,0xE0),
-          o2(0xDA,0xFD),      o2(0xE4,0xC6),
-          o2(0xE8,0xBE),      o2(0xE0,0xDE),
-          o2(0xF6,0xB4),      o2(0xEA,0xD2),
-          o2(0xF9,0xFB),      o2(0xE0,0xC2),
-          o2(0xCA,0xE4),      o2(0xE7,0xB7),
-          o2(0xEA,0xFD),      o2(0xD9,0xDD),
-          o2(0xDA,0xB4),      o2(0xEE,0xAA),
-          o2(0xFB,0xE9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_38 = {
-    to_EUC_KR_E6_38_offsets,
-    to_EUC_KR_E6_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_39_offsets[64] = {
-     17, 17, 17,  0,  1, 17, 17, 17,     17, 17,  2, 17, 17,  3, 17, 17,
-     17, 17, 17, 17, 17, 17,  4, 17,      5, 17, 17,  6,  7, 17,  8,  9,
-     17, 17, 17, 17, 17, 17, 17, 10,     17, 17, 17, 11, 17, 17, 12, 13,
-     17, 17, 14, 15, 17, 17, 17, 17,     17, 17, 16, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_39_infos[18] = {
-          o2(0xDB,0xCB),      o2(0xDA,0xB5),
-          o2(0xF1,0xBE),      o2(0xD3,0xAC),
-          o2(0xFB,0xC9),      o2(0xDF,0xCF),
-          o2(0xD3,0xC0),      o2(0xE3,0xD7),
-          o2(0xEF,0xE6),      o2(0xFC,0xD0),
-          o2(0xE9,0xC0),      o2(0xF5,0xD3),
-          o2(0xEC,0xDC),      o2(0xF7,0xB7),
-          o2(0xEA,0xB8),      o2(0xD1,0xF9),
-          o2(0xDC,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_39 = {
-    to_EUC_KR_E6_39_offsets,
-    to_EUC_KR_E6_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3A_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      0, 13, 13, 13, 13, 13,  1, 13,     13, 13, 13, 13,  2,  3, 13,  4,
-     13, 13,  5, 13, 13,  6, 13, 13,     13, 13,  7,  8, 13, 13, 13,  9,
-     13, 10, 13, 13, 13, 13, 11, 13,     13, 13, 12, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3A_infos[14] = {
-          o2(0xEA,0xB9),      o2(0xF1,0xDE),
-          o2(0xD7,0xB6),      o2(0xCF,0xB5),
-          o2(0xD9,0xA8),      o2(0xEC,0xEE),
-          o2(0xDD,0xAA),      o2(0xCD,0xA2),
-          o2(0xE8,0xAE),      o2(0xE1,0xBD),
-          o2(0xF2,0xD1),      o2(0xE9,0xC1),
-          o2(0xD2,0xFC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3A = {
-    to_EUC_KR_E6_3A_offsets,
-    to_EUC_KR_E6_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3B_offsets[64] = {
-     15, 15,  0, 15,  1,  2, 15, 15,     15,  3, 15,  4,  5, 15,  6, 15,
-     15,  7, 15,  8,  9, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 10,
-     15, 15, 15, 15, 11, 15, 15, 15,     12, 15, 15, 15, 15, 15, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3B_infos[16] = {
-          o2(0xDB,0xB5),      o2(0xF3,0xE7),
-          o2(0xD8,0xFE),      o2(0xFC,0xD1),
-          o2(0xED,0xB2),      o2(0xF4,0xAF),
-          o2(0xFB,0xA3),      o2(0xFC,0xC1),
-          o2(0xEE,0xAB),      o2(0xD4,0xA5),
-          o2(0xF4,0xF2),      o2(0xEE,0xD9),
-          o2(0xFB,0xCA),      o2(0xCD,0xE3),
-          o2(0xD8,0xBB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3B = {
-    to_EUC_KR_E6_3B_offsets,
-    to_EUC_KR_E6_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3C_offsets[64] = {
-     16,  0,  1, 16, 16, 16,  2, 16,     16, 16, 16, 16, 16, 16, 16,  3,
-     16,  4, 16, 16,  5,  6, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-      7, 16,  8,  9, 16, 16, 16, 16,     16, 16, 16, 10, 11, 16, 16, 16,
-     16, 12, 13, 16, 16, 16, 16, 16,     14, 16, 16, 16, 16, 16, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3C_infos[17] = {
-          o2(0xE5,0xDB),      o2(0xF8,0xF7),
-          o2(0xF6,0xD4),      o2(0xD7,0xA9),
-          o2(0xCB,0xC9),      o2(0xE6,0xD1),
-          o2(0xF0,0xCC),      o2(0xD8,0xAE),
-          o2(0xF9,0xD3),      o2(0xD5,0xFE),
-          o2(0xD8,0xBC),      o2(0xF2,0xB0),
-          o2(0xE2,0xAB),      o2(0xF3,0xE8),
-          o2(0xEF,0xC2),      o2(0xED,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3C = {
-    to_EUC_KR_E6_3C_offsets,
-    to_EUC_KR_E6_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3D_offsets[64] = {
-     18,  0, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18, 18,
-     18,  1, 18, 18,  2, 18, 18,  3,      4, 18,  5,  6, 18, 18,  7,  8,
-     18, 18,  9, 18, 10, 18, 18, 18,     18, 18, 18, 18, 18, 11, 12, 18,
-     13, 18, 18, 18, 18, 18, 18, 18,     18, 18, 14, 18, 15, 16, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3D_infos[19] = {
-          o2(0xE7,0xB8),      o2(0xDA,0xFE),
-          o2(0xCC,0xBE),      o2(0xF2,0xFC),
-          o2(0xDA,0xEB),      o2(0xE2,0xD8),
-          o2(0xED,0xD6),      o2(0xD6,0xD1),
-          o2(0xE0,0xB3),      o2(0xFC,0xD2),
-          o2(0xEB,0xC8),      o2(0xD3,0xC1),
-          o2(0xF0,0xCD),      o2(0xCF,0xF7),
-          o2(0xED,0xD2),      o2(0xD4,0xD8),
-          o2(0xDC,0xC9),      o2(0xD7,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3D = {
-    to_EUC_KR_E6_3D_offsets,
-    to_EUC_KR_E6_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3E_offsets[64] = {
-     17,  0, 17, 17,  1, 17, 17, 17,      2, 17, 17, 17, 17,  3,  4, 17,
-      5, 17, 17, 17,  6, 17, 17,  7,     17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17,  8,  9, 17, 17, 10,     17, 17, 17, 17, 17, 17, 11, 12,
-     17, 13, 17, 14, 17, 17, 17, 17,     17, 15, 17, 17, 17, 17, 16, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3E_infos[18] = {
-          o2(0xDF,0xBB),      o2(0xF3,0xA5),
-          o2(0xF4,0xCD),      o2(0xF1,0xBF),
-          o2(0xF8,0xB1),      o2(0xE9,0xFA),
-          o2(0xFB,0xCB),      o2(0xCA,0xD5),
-          o2(0xF9,0xD4),      o2(0xF7,0xCA),
-          o2(0xD6,0xC8),      o2(0xFC,0xE8),
-          o2(0xF3,0xBD),      o2(0xEE,0xFE),
-          o2(0xE7,0xFE),      o2(0xD3,0xC2),
-          o2(0xD3,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3E = {
-    to_EUC_KR_E6_3E_offsets,
-    to_EUC_KR_E6_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E6_3F_offsets[64] = {
-      0,  1,  2,  3, 17, 17, 17, 17,     17, 17,  4, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  5, 17, 17,     17, 17,  6, 17, 17, 17, 17,  7,
-      8,  9, 17, 17, 10, 17, 17, 17,     17, 11, 17, 12, 13, 17, 17, 14,
-     17, 15, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 17, 16, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_3F_infos[18] = {
-          o2(0xCC,0xAD),      o2(0xF6,0xFA),
-          o2(0xD6,0xB2),      o2(0xD2,0xD8),
-          o2(0xE7,0xD8),      o2(0xE3,0xA5),
-          o2(0xE7,0xB9),      o2(0xF0,0xAD),
-          o2(0xFB,0xCC),      o2(0xEB,0xA1),
-          o2(0xD4,0xA6),      o2(0xFB,0xCD),
-          o2(0xD5,0xBD),      o2(0xF1,0xDF),
-          o2(0xF6,0xFB),      o2(0xDE,0xB4),
-          o2(0xD5,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6_3F = {
-    to_EUC_KR_E6_3F_offsets,
-    to_EUC_KR_E6_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_E6_infos[65] = {
-       &to_EUC_KR_E6_00,   &to_EUC_KR_E6_01,
-       &to_EUC_KR_E6_02,   &to_EUC_KR_E6_03,
-       &to_EUC_KR_E6_04,   &to_EUC_KR_E6_05,
-       &to_EUC_KR_E6_06,   &to_EUC_KR_E6_07,
-       &to_EUC_KR_E6_08,   &to_EUC_KR_E6_09,
-       &to_EUC_KR_E6_0A,   &to_EUC_KR_E6_0B,
-       &to_EUC_KR_E6_0C,   &to_EUC_KR_E6_0D,
-       &to_EUC_KR_E6_0E,   &to_EUC_KR_E6_0F,
-       &to_EUC_KR_E6_10,   &to_EUC_KR_E6_11,
-       &to_EUC_KR_E6_12,   &to_EUC_KR_E6_13,
-       &to_EUC_KR_E6_14,   &to_EUC_KR_E6_15,
-       &to_EUC_KR_E6_16,   &to_EUC_KR_E6_17,
-       &to_EUC_KR_E6_18,   &to_EUC_KR_E6_19,
-       &to_EUC_KR_E6_1A,   &to_EUC_KR_E6_1B,
-       &to_EUC_KR_E6_1C,   &to_EUC_KR_E6_1D,
-       &to_EUC_KR_E6_1E,   &to_EUC_KR_E6_1F,
-       &to_EUC_KR_E6_20,   &to_EUC_KR_E6_21,
-       &to_EUC_KR_E6_22,   &to_EUC_KR_E6_23,
-       &to_EUC_KR_E6_24,   &to_EUC_KR_E6_25,
-       &to_EUC_KR_E6_26,   &to_EUC_KR_E6_27,
-       &to_EUC_KR_E6_28,   &to_EUC_KR_E6_29,
-       &to_EUC_KR_E6_2A,   &to_EUC_KR_E6_2B,
-       &to_EUC_KR_E6_2C,   &to_EUC_KR_E6_2D,
-       &to_EUC_KR_E6_2E,   &to_EUC_KR_E6_2F,
-       &to_EUC_KR_E6_30,   &to_EUC_KR_E6_31,
-       &to_EUC_KR_E6_32,   &to_EUC_KR_E6_33,
-       &to_EUC_KR_E6_34,   &to_EUC_KR_E6_35,
-       &to_EUC_KR_E6_36,   &to_EUC_KR_E6_37,
-       &to_EUC_KR_E6_38,   &to_EUC_KR_E6_39,
-       &to_EUC_KR_E6_3A,   &to_EUC_KR_E6_3B,
-       &to_EUC_KR_E6_3C,   &to_EUC_KR_E6_3D,
-       &to_EUC_KR_E6_3E,   &to_EUC_KR_E6_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E6 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_E6_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_00_offsets[64] = {
-     21,  0, 21, 21, 21,  1,  2, 21,     21,  3, 21,  4, 21, 21, 21,  5,
-     21,  6, 21, 21, 21,  7, 21, 21,      8, 21,  9, 10, 11, 12, 13, 14,
-     21, 21, 21, 15, 21, 21, 21, 16,     17, 21, 21, 21, 21, 21, 21, 18,
-     21, 21, 21, 21, 21, 21, 21, 19,     21, 21, 21, 21, 21, 21, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_00_infos[22] = {
-          o2(0xE5,0xC8),      o2(0xFB,0xA4),
-          o2(0xD4,0xB9),      o2(0xDE,0xE1),
-          o2(0xE4,0xA3),      o2(0xD7,0xB7),
-          o2(0xF8,0xEE),      o2(0xDE,0xB5),
-          o2(0xD6,0xD2),      o2(0xF9,0xD5),
-          o2(0xE7,0xBA),      o2(0xEB,0xD5),
-          o2(0xD5,0xF7),      o2(0xEF,0xE7),
-          o2(0xE1,0xBE),      o2(0xFA,0xAE),
-          o2(0xD6,0xE9),      o2(0xD6,0xEE),
-          o2(0xE7,0xBB),      o2(0xEC,0xCB),
-          o2(0xD5,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_00 = {
-    to_EUC_KR_E7_00_offsets,
-    to_EUC_KR_E7_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_01_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  0, 11, 11, 11,
-      1,  2, 11, 11, 11, 11, 11, 11,      3, 11, 11, 11, 11,  4, 11, 11,
-     11, 11, 11,  5, 11, 11, 11, 11,     11, 11, 11,  6, 11, 11, 11, 11,
-      7, 11, 11, 11, 11, 11, 11, 11,      8, 11, 11, 11,  9, 10, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_01_infos[12] = {
-          o2(0xCE,0xB4),      o2(0xFB,0xA5),
-          o2(0xE1,0xEE),      o2(0xF7,0xA8),
-          o2(0xFB,0xCE),      o2(0xD8,0xBD),
-          o2(0xFB,0xFD),      o2(0xFC,0xE9),
-          o2(0xCF,0xB6),      o2(0xED,0xC7),
-          o2(0xEE,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_01 = {
-    to_EUC_KR_E7_01_offsets,
-    to_EUC_KR_E7_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_02_offsets[64] = {
-     17, 17, 17, 17, 17,  0, 17, 17,     17, 17,  1, 17, 17, 17,  2, 17,
-     17, 17,  3, 17, 17, 17, 17, 17,      4,  5,  6, 17, 17, 17, 17, 17,
-     17,  7, 17, 17,  8, 17, 17, 17,     17, 17, 17,  9, 10, 11, 17, 12,
-     17, 17, 17, 13, 17, 17, 17, 14,     15, 16, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_02_infos[18] = {
-          o2(0xCC,0xDD),      o2(0xF6,0xA7),
-          o2(0xE6,0xFA),      o2(0xF5,0xA4),
-          o2(0xFD,0xDC),      o2(0xED,0xB3),
-          o2(0xCE,0xC9),      o2(0xEF,0xE8),
-          o2(0xE1,0xBF),      o2(0xFA,0xDB),
-          o2(0xCB,0xE3),      o2(0xF7,0xA9),
-          o2(0xFB,0xA6),      o2(0xDC,0xB9),
-          o2(0xF1,0xC0),      o2(0xED,0xC8),
-          o2(0xEF,0xC3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_02 = {
-    to_EUC_KR_E7_02_offsets,
-    to_EUC_KR_E7_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_03_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,      0, 10, 10,  1, 10, 10, 10,  2,
-     10, 10, 10, 10, 10, 10, 10, 10,      3,  4, 10, 10, 10,  5, 10,  6,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10,  7, 10, 10, 10, 10, 10, 10,     10,  8, 10, 10, 10,  9, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_03_infos[11] = {
-          o2(0xD6,0xAD),      o2(0xFD,0xCE),
-          o2(0xE8,0xA1),      o2(0xFB,0xF4),
-          o2(0xD5,0xA7),      o2(0xF1,0xF6),
-          o2(0xE6,0xD3),      o2(0xCC,0xDE),
-          o2(0xF8,0xB2),      o2(0xDC,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_03 = {
-    to_EUC_KR_E7_03_offsets,
-    to_EUC_KR_E7_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_04_offsets[64] = {
-     10, 10, 10, 10,  0, 10, 10, 10,     10,  1, 10, 10,  2, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  3,  4, 10, 10, 10,  5, 10,
-     10,  6, 10, 10, 10, 10,  7, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      8, 10, 10, 10, 10, 10,  9, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_04_infos[11] = {
-          o2(0xFD,0xB6),      o2(0xE5,0xEA),
-          o2(0xF1,0xE0),      o2(0xDB,0xCC),
-          o2(0xDD,0xCD),      o2(0xD4,0xC8),
-          o2(0xD9,0xED),      o2(0xF5,0xA5),
-          o2(0xE6,0xFB),      o2(0xE6,0xD4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_04 = {
-    to_EUC_KR_E7_04_offsets,
-    to_EUC_KR_E7_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_05_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18,  0,     18,  1,  2, 18,  3, 18,  4, 18,
-      5, 18, 18, 18, 18, 18,  6, 18,     18,  7, 18, 18,  8, 18,  9, 18,
-     18, 18, 18, 18, 10, 11, 12, 13,     18, 14, 18, 18, 15, 18, 16, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 17, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_05_infos[19] = {
-          o2(0xFD,0xC8),      o2(0xD6,0xA1),
-          o2(0xFD,0xBF),      o2(0xFC,0xD3),
-          o2(0xEF,0xA1),      o2(0xE7,0xBC),
-          o2(0xD1,0xEE),      o2(0xE6,0xD5),
-          o2(0xE9,0xF2),      o2(0xDF,0xB0),
-          o2(0xD8,0xE0),      o2(0xFC,0xBA),
-          o2(0xFD,0xAF),      o2(0xF0,0xCE),
-          o2(0xDB,0xE1),      o2(0xE5,0xC9),
-          o2(0xED,0xB4),      o2(0xE0,0xC3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_05 = {
-    to_EUC_KR_E7_05_offsets,
-    to_EUC_KR_E7_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_06_offsets[64] = {
-     14, 14, 14, 14,  0, 14, 14, 14,     14,  1,  2, 14, 14, 14, 14,  3,
-     14, 14,  4, 14,  5, 14, 14, 14,     14,  6, 14, 14, 14, 14, 14,  7,
-     14, 14,  8, 14, 14, 14, 14, 14,     14, 14, 14, 14,  9, 14, 14, 14,
-     14, 10, 14, 14, 14, 14, 14, 14,     14, 11, 12, 14, 14, 14, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_06_infos[15] = {
-          o2(0xE3,0xD8),      o2(0xE9,0xFB),
-          o2(0xEA,0xA8),      o2(0xFD,0xB7),
-          o2(0xFB,0xA7),      o2(0xE9,0xC2),
-          o2(0xFD,0xF7),      o2(0xE2,0xD9),
-          o2(0xDC,0xEC),      o2(0xE8,0xA2),
-          o2(0xE6,0xF0),      o2(0xFD,0xF8),
-          o2(0xFD,0xF9),      o2(0xF6,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_06 = {
-    to_EUC_KR_E7_06_offsets,
-    to_EUC_KR_E7_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_07_offsets[64] = {
-     19,  0, 19,  1, 19, 19, 19, 19,      2,  3, 19, 19, 19, 19,  4, 19,
-      5, 19,  6, 19,  7,  8, 19, 19,     19, 19, 19, 19, 19, 19, 19,  9,
-     19, 19, 19, 19, 19, 10, 11, 12,     19, 19, 19, 19, 19, 13, 14, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 15, 16, 19, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_07_infos[20] = {
-          o2(0xE7,0xA7),      o2(0xE6,0xD7),
-          o2(0xD4,0xF3),      o2(0xD4,0xC9),
-          o2(0xD6,0xFA),      o2(0xD7,0xF2),
-          o2(0xE1,0xC0),      o2(0xDB,0xE2),
-          o2(0xE6,0xD8),      o2(0xE7,0xBD),
-          o2(0xF0,0xCF),      o2(0xF3,0xBE),
-          o2(0xE2,0xAC),      o2(0xF5,0xB7),
-          o2(0xE0,0xF0),      o2(0xFD,0xB8),
-          o2(0xE3,0xE8),      o2(0xD4,0xA7),
-          o2(0xE8,0xFC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_07 = {
-    to_EUC_KR_E7_07_offsets,
-    to_EUC_KR_E7_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_08_offsets[64] = {
-      0, 15, 15, 15, 15, 15,  1, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-      2, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15,  3, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15,  4, 15,  5,  6, 15, 15,
-      7, 15,  8, 15, 15,  9, 10, 15,     15, 15, 11, 12, 15, 13, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_08_infos[16] = {
-          o2(0xFA,0xD2),      o2(0xF8,0xEF),
-          o2(0xD6,0xD3),      o2(0xD5,0xB4),
-          o2(0xF0,0xD0),      o2(0xF7,0xF0),
-          o2(0xEE,0xB3),      o2(0xEA,0xBA),
-          o2(0xEA,0xD3),      o2(0xED,0xC9),
-          o2(0xDD,0xAB),      o2(0xE5,0xAC),
-          o2(0xFD,0xA1),      o2(0xDF,0xD0),
-          o2(0xEC,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_08 = {
-    to_EUC_KR_E7_08_offsets,
-    to_EUC_KR_E7_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_09_offsets[64] = {
-      0, 18, 18, 18, 18, 18,  1,  2,      3, 18, 18, 18,  4, 18, 18, 18,
-     18, 18,  5, 18, 18, 18, 18, 18,      6,  7, 18,  8, 18,  9, 18, 10,
-     18, 11, 12, 18, 18, 18, 18, 13,     18, 14, 18, 18, 18, 18, 18, 18,
-     18, 18, 15, 18, 18, 18, 18, 18,     18, 16, 18, 18, 18, 17, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_09_infos[19] = {
-          o2(0xDF,0xD1),      o2(0xED,0xED),
-          o2(0xF8,0xB8),      o2(0xF7,0xFA),
-          o2(0xF8,0xAB),      o2(0xF4,0xE0),
-          o2(0xD4,0xBA),      o2(0xE4,0xB3),
-          o2(0xE9,0xDA),      o2(0xDE,0xB6),
-          o2(0xD9,0xBF),      o2(0xD9,0xC0),
-          o2(0xD6,0xEF),      o2(0xD9,0xCC),
-          o2(0xDA,0xAA),      o2(0xDF,0xE5),
-          o2(0xF7,0xE5),      o2(0xCC,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_09 = {
-    to_EUC_KR_E7_09_offsets,
-    to_EUC_KR_E7_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0A_offsets[64] = {
-      0,  1,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  2,  6,  6,  6,  6,  3,      6,  6,  6,  6,  4,  6,  6,  5,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0A_infos[7] = {
-          o2(0xDF,0xF9),      o2(0xD7,0xE0),
-          o2(0xD4,0xBB),      o2(0xFD,0xFA),
-          o2(0xCC,0xB3),      o2(0xDB,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0A = {
-    to_EUC_KR_E7_0A_offsets,
-    to_EUC_KR_E7_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0B_offsets[64] = {
-      0, 13,  1, 13,  2, 13, 13, 13,     13, 13, 13, 13, 13, 13,  3, 13,
-      4, 13, 13, 13, 13, 13, 13,  5,     13,  6, 13, 13, 13, 13, 13, 13,
-     13,  7, 13, 13, 13, 13, 13, 13,     13,  8, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,      9, 10, 13, 13, 11, 12, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0B_infos[14] = {
-          o2(0xDF,0xD2),      o2(0xCE,0xCA),
-          o2(0xEE,0xDA),      o2(0xE4,0xE4),
-          o2(0xFB,0xCF),      o2(0xCF,0xB7),
-          o2(0xEE,0xC3),      o2(0xCE,0xEA),
-          o2(0xE2,0xAD),      o2(0xD7,0xE1),
-          o2(0xFA,0xF5),      o2(0xD5,0xC9),
-          o2(0xF8,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0B = {
-    to_EUC_KR_E7_0B_offsets,
-    to_EUC_KR_E7_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0C_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13,  0, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13,  1, 13,     13, 13, 13,  2,  3,  4, 13, 13,
-     13, 13, 13, 13, 13,  5, 13, 13,     13,  6,  7,  8, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13,  9, 10,     13, 13, 13, 13, 13, 13, 11, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0C_infos[14] = {
-          o2(0xE7,0xD9),      o2(0xF3,0xE9),
-          o2(0xD8,0xED),      o2(0xE3,0xC4),
-          o2(0xF0,0xF1),      o2(0xE8,0xE5),
-          o2(0xE0,0xFA),      o2(0xEE,0xC4),
-          o2(0xD9,0xDE),      o2(0xEB,0xA2),
-          o2(0xEB,0xA3),      o2(0xFC,0xC2),
-          o2(0xEA,0xBB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0C = {
-    to_EUC_KR_E7_0C_offsets,
-    to_EUC_KR_E7_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0D_offsets[64] = {
-     13, 13, 13, 13,  0,  1, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      2, 13,  3, 13, 13, 13, 13,  4,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,      5, 13,  6, 13, 13, 13, 13, 13,
-      7, 13,  8, 13, 13,  9, 13, 13,     10, 13, 11, 12, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0D_infos[14] = {
-          o2(0xE8,0xAB),      o2(0xDE,0xE2),
-          o2(0xED,0xEF),      o2(0xE8,0xA3),
-          o2(0xCF,0xF1),      o2(0xD4,0xBC),
-          o2(0xFC,0xEA),      o2(0xE7,0xBE),
-          o2(0xFC,0xF2),      o2(0xD6,0xB4),
-          o2(0xE2,0xAE),      o2(0xD3,0xB7),
-          o2(0xFA,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0D = {
-    to_EUC_KR_E7_0D_offsets,
-    to_EUC_KR_E7_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0E_offsets[64] = {
-     17, 17, 17, 17,  0, 17,  1,  2,     17,  3, 17,  4, 17, 17,  5, 17,
-     17, 17, 17, 17,  6, 17,  7,  8,      9, 17, 17, 17, 17, 17, 17, 10,
-     17, 17, 17, 17, 17, 17, 17, 11,     17, 12, 17, 17, 17, 13, 17, 17,
-     17, 17, 14, 15, 17, 17, 17, 17,     17, 16, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0E_infos[18] = {
-          o2(0xFA,0xDC),      o2(0xED,0xB5),
-          o2(0xE1,0xE3),      o2(0xE8,0xAC),
-          o2(0xE8,0xDD),      o2(0xEF,0xE9),
-          o2(0xF4,0xBD),      o2(0xCF,0xB8),
-          o2(0xE9,0xDB),      o2(0xD1,0xAC),
-          o2(0xDA,0xC7),      o2(0xEB,0xC9),
-          o2(0xE8,0xCC),      o2(0xDE,0xB7),
-          o2(0xD6,0xBC),      o2(0xD3,0xE5),
-          o2(0xFA,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0E = {
-    to_EUC_KR_E7_0E_offsets,
-    to_EUC_KR_E7_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_0F_offsets[64] = {
-      0, 23,  1, 23, 23, 23, 23, 23,     23,  2,  3, 23,  4,  5, 23,  6,
-     23, 23, 23, 23, 23, 23,  7, 23,     23,  8, 23, 23, 23,  9, 10, 23,
-     11, 23, 23, 12, 13, 14, 15, 23,     23, 16, 17, 23, 23, 18, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 19,     23, 20, 23, 23, 23, 21, 22, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_0F_infos[24] = {
-          o2(0xDA,0xD6),      o2(0xCA,0xB1),
-          o2(0xDA,0xC8),      o2(0xDF,0xA6),
-          o2(0xF9,0xB3),      o2(0xF2,0xD2),
-          o2(0xCA,0xC4),      o2(0xCE,0xCB),
-          o2(0xCD,0xF5),      o2(0xFD,0xB0),
-          o2(0xD5,0xA8),      o2(0xF1,0xC1),
-          o2(0xE2,0xE9),      o2(0xDC,0xCA),
-          o2(0xEC,0xB4),      o2(0xFA,0xC0),
-          o2(0xFB,0xA8),      o2(0xD0,0xA8),
-          o2(0xDA,0xEC),      o2(0xD9,0xEE),
-          o2(0xE0,0xFB),      o2(0xEF,0xEA),
-          o2(0xFA,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_0F = {
-    to_EUC_KR_E7_0F_offsets,
-    to_EUC_KR_E7_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_10_offsets[64] = {
-     27,  0, 27,  1, 27,  2,  3,  4,     27,  5, 27, 27, 27, 27, 27, 27,
-     27, 27, 27,  6, 27, 27, 27, 27,     27, 27, 27,  7, 27, 27, 27, 27,
-      8,  9, 10, 27, 27, 11, 12, 27,     13, 27, 14, 15, 16, 27, 17, 18,
-     19, 27, 27, 20, 21, 22, 23, 27,     24, 27, 25, 27, 27, 27, 27, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_10_infos[28] = {
-          o2(0xE0,0xC4),      o2(0xCF,0xB9),
-          o2(0xD5,0xCA),      o2(0xD7,0xE2),
-          o2(0xE2,0xAF),      o2(0xD7,0xB8),
-          o2(0xE8,0xCD),      o2(0xF6,0xDA),
-          o2(0xEF,0xA2),      o2(0xE2,0xDA),
-          o2(0xF6,0xFC),      o2(0xFB,0xD0),
-          o2(0xD1,0xAD),      o2(0xCD,0xE4),
-          o2(0xD1,0xAE),      o2(0xDC,0xED),
-          o2(0xE8,0xCE),      o2(0xF0,0xF9),
-          o2(0xCE,0xB5),      o2(0xE6,0xFC),
-          o2(0xD7,0xFB),      o2(0xD0,0xD6),
-          o2(0xDD,0xF5),      o2(0xF7,0xF1),
-          o2(0xF6,0xFD),      o2(0xDB,0xF7),
-          o2(0xFB,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_10 = {
-    to_EUC_KR_E7_10_offsets,
-    to_EUC_KR_E7_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_11_offsets[64] = {
-      0,  1, 22,  2,  3, 22, 22, 22,     22, 22, 22,  4, 22, 22, 22, 22,
-     22, 22, 22, 22, 22,  5, 22,  6,     22,  7,  8,  9, 10, 22, 11, 12,
-     13, 22, 14, 22, 15, 16, 22, 22,     17, 18, 19, 22, 22, 22, 22, 20,
-     22, 22, 22, 22, 22, 22, 22, 22,     22, 22, 22, 22, 22, 22, 21, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_11_infos[23] = {
-          o2(0xE9,0xDC),      o2(0xD9,0xC1),
-          o2(0xF5,0xF2),      o2(0xE0,0xC5),
-          o2(0xEA,0xD4),      o2(0xF9,0xC2),
-          o2(0xEA,0xBC),      o2(0xD2,0xC5),
-          o2(0xFB,0xD1),      o2(0xE7,0xC0),
-          o2(0xEB,0xA5),      o2(0xDF,0xFA),
-          o2(0xE3,0xA2),      o2(0xD7,0xB9),
-          o2(0xE9,0xC3),      o2(0xE8,0xFD),
-          o2(0xE8,0xAF),      o2(0xF2,0xD3),
-          o2(0xFB,0xA9),      o2(0xD8,0xA5),
-          o2(0xD5,0xCB),      o2(0xD0,0xC8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_11 = {
-    to_EUC_KR_E7_11_offsets,
-    to_EUC_KR_E7_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_12_offsets[64] = {
-     21, 21,  0,  1, 21, 21, 21,  2,     21,  3, 21,  4, 21, 21, 21, 21,
-     21, 21, 21, 21, 21, 21, 21, 21,      5, 21, 21, 21,  6, 21,  7,  8,
-     21,  9, 21, 10, 21, 11, 21, 12,     13, 21, 14, 21, 21, 21, 21, 21,
-     15, 21, 16, 21, 21, 17, 21, 21,     21, 18, 21, 21, 21, 19, 21, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_12_infos[22] = {
-          o2(0xD1,0xAF),      o2(0xD7,0xE3),
-          o2(0xE0,0xC6),      o2(0xD6,0xA2),
-          o2(0xED,0xF0),      o2(0xD7,0xF3),
-          o2(0xFC,0xD4),      o2(0xDA,0xD7),
-          o2(0xCC,0xDF),      o2(0xF2,0xD4),
-          o2(0xD1,0xB0),      o2(0xCC,0xE0),
-          o2(0xDB,0xFD),      o2(0xF3,0xBF),
-          o2(0xF0,0xD1),      o2(0xFC,0xBB),
-          o2(0xE2,0xB0),      o2(0xE6,0xA5),
-          o2(0xE2,0xDB),      o2(0xDF,0xDE),
-          o2(0xE0,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_12 = {
-    to_EUC_KR_E7_12_offsets,
-    to_EUC_KR_E7_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_13_offsets[64] = {
-     13, 13, 13, 13, 13, 13,  0, 13,     13, 13,  1, 13, 13, 13, 13,  2,
-     13, 13, 13, 13,  3, 13, 13, 13,      4, 13,  5, 13,  6, 13, 13, 13,
-      7, 13,  8,  9, 13, 13, 10, 13,     13, 13, 13, 13, 13, 13, 11, 13,
-     13, 13, 13, 13, 13, 13, 13, 12,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_13_infos[14] = {
-          o2(0xF2,0xEF),      o2(0xCC,0xE1),
-          o2(0xD6,0xEA),      o2(0xE7,0xC2),
-          o2(0xCE,0xB6),      o2(0xF3,0xC0),
-          o2(0xCD,0xFE),      o2(0xFB,0xD2),
-          o2(0xF8,0xF8),      o2(0xF7,0xFB),
-          o2(0xE8,0xBF),      o2(0xE8,0xB7),
-          o2(0xED,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_13 = {
-    to_EUC_KR_E7_13_offsets,
-    to_EUC_KR_E7_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_14_offsets[64] = {
-     21,  0, 21, 21,  1, 21, 21, 21,     21, 21, 21, 21, 21, 21, 21, 21,
-     21,  2, 21, 21, 21,  3, 21, 21,      4, 21,  5,  6, 21, 21, 21,  7,
-     21, 21, 21,  8, 21,  9, 10, 21,     11, 21, 21, 12, 13, 21, 21, 21,
-     14, 15, 16, 17, 21, 21, 21, 18,     19, 21, 20, 21, 21, 21, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_14_infos[22] = {
-          o2(0xDC,0xBA),      o2(0xCC,0xB4),
-          o2(0xF1,0xF7),      o2(0xE8,0xB8),
-          o2(0xCA,0xF6),      o2(0xE4,0xA4),
-          o2(0xF4,0xD6),      o2(0xDF,0xE6),
-          o2(0xDF,0xA7),      o2(0xDF,0xE7),
-          o2(0xE1,0xC1),      o2(0xE9,0xC4),
-          o2(0xDC,0xCB),      o2(0xE9,0xC5),
-          o2(0xEF,0xA3),      o2(0xEB,0xA6),
-          o2(0xCB,0xA3),      o2(0xE3,0xE9),
-          o2(0xD1,0xFB),      o2(0xEF,0xA4),
-          o2(0xEF,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_14 = {
-    to_EUC_KR_E7_14_offsets,
-    to_EUC_KR_E7_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_15_offsets[64] = {
-     21, 21, 21, 21, 21, 21, 21,  0,     21, 21, 21, 21,  1, 21, 21,  2,
-     21,  3, 21,  4,  5, 21, 21, 21,     21,  6, 21,  7,  8,  9, 21, 21,
-     21, 21, 10, 21, 21, 11, 12, 21,     21, 21, 13, 21, 21, 21, 21, 14,
-     15, 21, 21, 21, 21, 16, 17, 21,     18, 21, 19, 21, 21, 21, 21, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_15_infos[22] = {
-          o2(0xD0,0xB4),      o2(0xCD,0xA3),
-          o2(0xE8,0xE6),      o2(0xEF,0xA5),
-          o2(0xD3,0xCC),      o2(0xDA,0xED),
-          o2(0xD7,0xBA),      o2(0xF2,0xD5),
-          o2(0xF5,0xE5),      o2(0xD9,0xEF),
-          o2(0xF9,0xB4),      o2(0xD5,0xD4),
-          o2(0xFD,0xCF),      o2(0xDB,0xE3),
-          o2(0xF1,0xE1),      o2(0xEC,0xB6),
-          o2(0xFB,0xFE),      o2(0xD3,0xD7),
-          o2(0xD1,0xB1),      o2(0xCB,0xB1),
-          o2(0xD1,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_15 = {
-    to_EUC_KR_E7_15_offsets,
-    to_EUC_KR_E7_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_16_offsets[64] = {
-     19, 19, 19, 19, 19, 19,  0,  1,     19, 19,  2,  3, 19, 19,  4,  5,
-     19,  6, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19,  7, 19, 19,
-     19, 19, 19, 19, 19,  8, 19, 19,     19, 19, 19,  9, 19, 19, 19, 19,
-     19, 10, 11, 12, 19, 13, 19, 19,     14, 15, 19, 19, 16, 17, 18, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_16_infos[20] = {
-          o2(0xCB,0xB2),      o2(0xF1,0xC2),
-          o2(0xF4,0xE1),      o2(0xF9,0xB5),
-          o2(0xE1,0xC3),      o2(0xE1,0xC2),
-          o2(0xEB,0xF7),      o2(0xDF,0xA8),
-          o2(0xCB,0xCA),      o2(0xE6,0xB9),
-          o2(0xF8,0xDE),      o2(0xF9,0xAA),
-          o2(0xCA,0xF7),      o2(0xED,0xB7),
-          o2(0xD3,0xB8),      o2(0xF2,0xD6),
-          o2(0xD4,0xD9),      o2(0xEE,0xC5),
-          o2(0xF2,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_16 = {
-    to_EUC_KR_E7_16_offsets,
-    to_EUC_KR_E7_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_17_offsets[64] = {
-     16, 16,  0, 16, 16,  1, 16,  2,     16, 16, 16, 16, 16,  3, 16, 16,
-     16, 16,  4, 16,  5,  6, 16, 16,      7,  8, 16,  9, 16, 16, 16, 16,
-     16, 16, 10, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     11, 16, 12, 16, 13, 16, 16, 16,     16, 16, 14, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_17_infos[17] = {
-          o2(0xCA,0xB2),      o2(0xDC,0xBB),
-          o2(0xF1,0xF8),      o2(0xEC,0xB7),
-          o2(0xE5,0xCA),      o2(0xF6,0xC0),
-          o2(0xFD,0xDD),      o2(0xD4,0xE3),
-          o2(0xCC,0xE2),      o2(0xF7,0xD4),
-          o2(0xD7,0xE5),      o2(0xD3,0xC3),
-          o2(0xD8,0xA6),      o2(0xF6,0xC1),
-          o2(0xDD,0xF6),      o2(0xCD,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_17 = {
-    to_EUC_KR_E7_17_offsets,
-    to_EUC_KR_E7_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_18_offsets[64] = {
-      0, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  1, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  2, 10, 10, 10, 10, 10,  3,
-      4,  5,  6, 10,  7, 10,  8, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10,  9, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_18_infos[11] = {
-          o2(0xE5,0xDC),      o2(0xE5,0xCB),
-          o2(0xE1,0xC4),      o2(0xE8,0xB0),
-          o2(0xF4,0xB0),      o2(0xF3,0xEA),
-          o2(0xDA,0xEE),      o2(0xD7,0xBB),
-          o2(0xE2,0xB1),      o2(0xD7,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_18 = {
-    to_EUC_KR_E7_18_offsets,
-    to_EUC_KR_E7_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_19_offsets[64] = {
-     16, 16,  0, 16, 16, 16, 16, 16,     16, 16, 16, 16,  1, 16,  2, 16,
-     16, 16,  3, 16, 16, 16,  4, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16,  5, 16, 16,  6, 16, 16, 16,     16,  7, 16, 16,  8, 16, 16, 16,
-      9, 16, 10, 16, 16, 16, 16, 16,     11, 16, 16, 12, 13, 14, 15, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_19_infos[17] = {
-          o2(0xD6,0xFB),      o2(0xE4,0xDF),
-          o2(0xCA,0xD6),      o2(0xEB,0xA8),
-          o2(0xDB,0xFE),      o2(0xF6,0xC2),
-          o2(0xEF,0xBB),      o2(0xD4,0xFD),
-          o2(0xE0,0xC8),      o2(0xE8,0xB9),
-          o2(0xEF,0xA6),      o2(0xCD,0xA4),
-          o2(0xD4,0xF4),      o2(0xDB,0xA1),
-          o2(0xDB,0xDC),      o2(0xDB,0xDD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_19 = {
-    to_EUC_KR_E7_19_offsets,
-    to_EUC_KR_E7_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1A_offsets[64] = {
-      9,  9,  9,  9,  0,  9,  1,  2,      9,  9,  9,  9,  9,  9,  3,  9,
-      4,  9,  9,  5,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  6,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  7,  9,  9,  9,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1A_infos[10] = {
-          o2(0xEE,0xDC),      o2(0xCB,0xCB),
-          o2(0xFC,0xD5),      o2(0xCE,0xEB),
-          o2(0xCD,0xC1),      o2(0xFB,0xD3),
-          o2(0xF9,0xAB),      o2(0xF5,0xD4),
-          o2(0xD9,0xA9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1A = {
-    to_EUC_KR_E7_1A_offsets,
-    to_EUC_KR_E7_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1B_offsets[64] = {
-     21, 21,  0,  1, 21, 21,  2, 21,      3, 21,  4, 21, 21, 21, 21, 21,
-     21, 21,  5, 21, 21, 21,  6, 21,     21, 21, 21,  7,  8, 21,  9, 10,
-     21, 11, 21, 12, 13, 21, 21, 14,     21, 21, 21, 21, 21, 21, 15, 21,
-     21, 21, 16, 21, 17, 21, 21, 21,     18, 21, 21, 21, 19, 21, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1B_infos[22] = {
-          o2(0xE9,0xDD),      o2(0xDB,0xCD),
-          o2(0xDD,0xCE),      o2(0xE7,0xC3),
-          o2(0xEC,0xCC),      o2(0xF9,0xEC),
-          o2(0xCB,0xCC),      o2(0xE0,0xFC),
-          o2(0xD4,0xA8),      o2(0xED,0xD3),
-          o2(0xD8,0xEF),      o2(0xF2,0xD7),
-          o2(0xCA,0xF8),      o2(0xDA,0xEF),
-          o2(0xD6,0xD4),      o2(0xD9,0xCD),
-          o2(0xD8,0xEE),      o2(0xF2,0xC1),
-          o2(0xDF,0xD3),      o2(0xDA,0xF0),
-          o2(0xE2,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1B = {
-    to_EUC_KR_E7_1B_offsets,
-    to_EUC_KR_E7_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1C_offsets[64] = {
-     12,  0, 12, 12,  1, 12, 12, 12,      2,  3, 12,  4, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12,  5, 12,
-      6, 12, 12, 12, 12, 12, 12, 12,     12,  7, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12,  8,      9, 12, 10, 12, 11, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1C_infos[13] = {
-          o2(0xE0,0xFD),      o2(0xD8,0xF8),
-          o2(0xF7,0xAF),      o2(0xDA,0xB6),
-          o2(0xCA,0xD7),      o2(0xF2,0xD8),
-          o2(0xD8,0xF9),      o2(0xFA,0xDF),
-          o2(0xCF,0xEF),      o2(0xD9,0xC2),
-          o2(0xF0,0xD2),      o2(0xE4,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1C = {
-    to_EUC_KR_E7_1C_offsets,
-    to_EUC_KR_E7_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1D_offsets[64] = {
-      0, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  1, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10,  2, 10, 10, 10, 10,
-     10,  3, 10,  4, 10, 10,  5, 10,     10, 10, 10,  6, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  7, 10, 10, 10, 10,  8,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1D_infos[11] = {
-          o2(0xF3,0xB7),      o2(0xFA,0xE0),
-          o2(0xEF,0xEC),      o2(0xE2,0xB2),
-          o2(0xD4,0xBD),      o2(0xD9,0xCE),
-          o2(0xF4,0xE2),      o2(0xD4,0xA9),
-          o2(0xCD,0xC2),      o2(0xE7,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1D = {
-    to_EUC_KR_E7_1D_offsets,
-    to_EUC_KR_E7_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1E_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11,  0, 11, 11, 11, 11,
-     11,  1, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11,  2, 11,
-     11, 11, 11, 11, 11,  3, 11, 11,     11, 11, 11, 11,  4,  5, 11, 11,
-      6, 11, 11,  7, 11, 11, 11, 11,     11, 11, 11,  8,  9, 11, 11, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1E_infos[12] = {
-          o2(0xF2,0xD9),      o2(0xD9,0xAA),
-          o2(0xD8,0xBE),      o2(0xDC,0xAD),
-          o2(0xE2,0xEB),      o2(0xD6,0xFC),
-          o2(0xCA,0xF9),      o2(0xD4,0xDA),
-          o2(0xF4,0xD7),      o2(0xCC,0xA1),
-          o2(0xCF,0xBA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1E = {
-    to_EUC_KR_E7_1E_offsets,
-    to_EUC_KR_E7_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_1F_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11,  0,     11, 11, 11,  1,  2, 11, 11, 11,
-     11, 11,  3,  4, 11,  5, 11, 11,     11,  6, 11, 11, 11,  7,  8,  9,
-     11, 11, 11, 10, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_1F_infos[12] = {
-          o2(0xF5,0xB8),      o2(0xD9,0xC3),
-          o2(0xD0,0xE8),      o2(0xE3,0xC5),
-          o2(0xEB,0xF8),      o2(0xF2,0xB1),
-          o2(0xCF,0xBB),      o2(0xD3,0xAD),
-          o2(0xE8,0xE1),      o2(0xCE,0xEC),
-          o2(0xE0,0xB4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_1F = {
-    to_EUC_KR_E7_1F_offsets,
-    to_EUC_KR_E7_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_20_offsets[64] = {
-      8,  8,  0,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  1,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  2,  3,  4,      8,  8,  8,  8,  5,  8,  8,  8,
-      8,  8,  6,  8,  7,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_20_infos[9] = {
-          o2(0xDE,0xE3),      o2(0xDD,0xF7),
-          o2(0xF2,0xB2),      o2(0xF3,0xF6),
-          o2(0xF6,0xDB),      o2(0xD7,0xFE),
-          o2(0xF8,0xDF),      o2(0xF7,0xF2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_20 = {
-    to_EUC_KR_E7_20_offsets,
-    to_EUC_KR_E7_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_21_offsets[64] = {
-      7,  7,  7,  7,  7,  0,  7,  7,      7,  7,  7,  7,  7,  7,  7,  1,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  2,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  3,  4,  7,  7,  5,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  6,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_21_infos[8] = {
-          o2(0xD0,0xA9),      o2(0xE6,0xDA),
-          o2(0xF5,0xA6),      o2(0xD7,0xBC),
-          o2(0xCC,0xE3),      o2(0xE6,0xDB),
-          o2(0xDD,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_21 = {
-    to_EUC_KR_E7_21_offsets,
-    to_EUC_KR_E7_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_22_offsets[64] = {
-     13,  0, 13, 13, 13, 13, 13,  1,     13, 13, 13, 13,  2,  3,  4, 13,
-     13,  5, 13, 13, 13, 13, 13,  6,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13,  7, 13, 13, 13,  8,     13,  9, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 10, 11, 12, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_22_infos[14] = {
-          o2(0xD1,0xB3),      o2(0xEF,0xED),
-          o2(0xD6,0xDE),      o2(0xE4,0xF4),
-          o2(0xE1,0xEF),      o2(0xDD,0xF8),
-          o2(0xE8,0xCF),      o2(0xCA,0xE5),
-          o2(0xDC,0xA1),      o2(0xE0,0xB5),
-          o2(0xFC,0xAC),      o2(0xFC,0xAD),
-          o2(0xD8,0xA7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_22 = {
-    to_EUC_KR_E7_22_offsets,
-    to_EUC_KR_E7_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_23_offsets[64] = {
-     11,  0, 11, 11, 11,  1, 11, 11,     11, 11,  2,  3, 11, 11,  4, 11,
-      5, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      6, 11, 11, 11,  7, 11, 11,  8,
-     11, 11, 11, 11, 11,  9, 11, 11,     11, 11, 11, 10, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_23_infos[12] = {
-          o2(0xED,0xB8),      o2(0xDB,0xB6),
-          o2(0xD6,0xF0),      o2(0xF3,0xAF),
-          o2(0xCD,0xA5),      o2(0xDA,0xF1),
-          o2(0xD8,0xA8),      o2(0xCC,0xE4),
-          o2(0xD1,0xB4),      o2(0xCA,0xD8),
-          o2(0xDA,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_23 = {
-    to_EUC_KR_E7_23_offsets,
-    to_EUC_KR_E7_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_24_offsets[64] = {
-      8,  0,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  1,  8,
-      8,  8,  8,  8,  8,  8,  2,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  3,  4,  5,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  6,  8,  8,  8,  7,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_24_infos[9] = {
-          o2(0xF5,0xA7),      o2(0xF5,0xA8),
-          o2(0xE6,0xA6),      o2(0xD5,0xEC),
-          o2(0xD5,0xF8),      o2(0xDA,0xF3),
-          o2(0xE3,0xC6),      o2(0xDE,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_24 = {
-    to_EUC_KR_E7_24_offsets,
-    to_EUC_KR_E7_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_25_offsets[64] = {
-      0,  1, 19, 19, 19, 19, 19,  2,      3,  4, 19, 19, 19, 19, 19, 19,
-      5, 19, 19, 19, 19, 19,  6,  7,     19, 19,  8,  9, 10, 11, 12, 19,
-     13, 19, 19, 19, 19, 14, 19, 19,     15, 19, 19, 19, 19, 16, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 17, 19, 19, 19, 19, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_25_infos[20] = {
-          o2(0xDE,0xE5),      o2(0xD1,0xB5),
-          o2(0xD1,0xB6),      o2(0xD1,0xB7),
-          o2(0xF2,0xB3),      o2(0xE9,0xDE),
-          o2(0xF0,0xD3),      o2(0xF2,0xB4),
-          o2(0xF0,0xD4),      o2(0xCB,0xE4),
-          o2(0xFB,0xD4),      o2(0xF5,0xE6),
-          o2(0xE3,0xEA),      o2(0xDE,0xE6),
-          o2(0xDF,0xD4),      o2(0xF8,0xF9),
-          o2(0xF0,0xAE),      o2(0xD1,0xB8),
-          o2(0xD6,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_25 = {
-    to_EUC_KR_E7_25_offsets,
-    to_EUC_KR_E7_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_26_offsets[64] = {
-     15,  0, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15,  1,  2,  3,
-     15,  4, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,  5,  6,     15, 15,  7, 15, 15, 15,  8, 15,
-     15,  9, 15, 10, 15, 15, 15, 15,     15, 11, 15, 15, 15, 12, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_26_infos[16] = {
-          o2(0xD0,0xD7),      o2(0xFC,0xA1),
-          o2(0xEF,0xEE),      o2(0xDC,0xD8),
-          o2(0xE9,0xDF),      o2(0xE5,0xDD),
-          o2(0xFD,0xFB),      o2(0xE0,0xC9),
-          o2(0xD6,0xC9),      o2(0xD4,0xAA),
-          o2(0xE5,0xCC),      o2(0xE9,0xE0),
-          o2(0xD0,0xD8),      o2(0xFC,0xA2),
-          o2(0xD4,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_26 = {
-    to_EUC_KR_E7_26_offsets,
-    to_EUC_KR_E7_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_27_offsets[64] = {
-      0,  1, 15, 15, 15, 15, 15, 15,     15,  2,  3,  4, 15, 15, 15, 15,
-     15,  5,  6, 15, 15,  7, 15, 15,      8, 15, 15, 15, 15, 15, 15,  9,
-     15, 15, 15, 15, 10, 15, 11, 12,     15, 13, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 14, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_27_infos[16] = {
-          o2(0xE2,0xB3),      o2(0xDE,0xE7),
-          o2(0xDC,0xBC),      o2(0xD2,0xB6),
-          o2(0xF5,0xD5),      o2(0xCE,0xA1),
-          o2(0xF5,0xA9),      o2(0xDD,0xF9),
-          o2(0xDD,0xFA),      o2(0xF0,0xD5),
-          o2(0xF6,0xDF),      o2(0xF2,0xDA),
-          o2(0xE4,0xEB),      o2(0xF2,0xF1),
-          o2(0xEC,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_27 = {
-    to_EUC_KR_E7_27_offsets,
-    to_EUC_KR_E7_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_28_offsets[64] = {
-      0, 20, 20, 20, 20,  1, 20, 20,      2, 20, 20,  3, 20,  4, 20, 20,
-     20, 20, 20, 20,  5, 20, 20,  6,     20,  7,  8, 20,  9, 20, 20, 10,
-     11, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 20, 12, 20,
-     20, 13, 20, 20, 20, 20, 14, 15,     20, 20, 20, 16, 17, 18, 20, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_28_infos[21] = {
-          o2(0xFD,0xFC),      o2(0xE1,0xAA),
-          o2(0xCA,0xD9),      o2(0xEF,0xEF),
-          o2(0xF5,0xAA),      o2(0xEC,0xF9),
-          o2(0xF8,0xAD),      o2(0xF2,0xC2),
-          o2(0xF6,0xC3),      o2(0xD7,0xD2),
-          o2(0xF9,0xA2),      o2(0xF0,0xD6),
-          o2(0xF0,0xFA),      o2(0xF6,0xE0),
-          o2(0xE9,0xF3),      o2(0xF2,0xC3),
-          o2(0xD4,0xAB),      o2(0xCA,0xB3),
-          o2(0xCD,0xA6),      o2(0xCD,0xC3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_28 = {
-    to_EUC_KR_E7_28_offsets,
-    to_EUC_KR_E7_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_29_offsets[64] = {
-      0, 17, 17, 17, 17, 17,  1, 17,     17,  2, 17, 17, 17,  3,  4, 17,
-     17, 17, 17, 17, 17, 17, 17,  5,     17, 17, 17, 17, 17, 17, 17, 17,
-     17,  6,  7, 17, 17, 17, 17, 17,     17,  8, 17,  9, 17, 17, 17, 17,
-     10, 17, 17, 17, 11, 17, 12, 17,     17, 13, 14, 17, 17, 15, 17, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_29_infos[18] = {
-          o2(0xCD,0xDA),      o2(0xD9,0xCF),
-          o2(0xF6,0xC4),      o2(0xEE,0xDD),
-          o2(0xE7,0xC4),      o2(0xE2,0xB4),
-          o2(0xDF,0xE2),      o2(0xE7,0xDB),
-          o2(0xE8,0xB1),      o2(0xFC,0xAE),
-          o2(0xE5,0xCD),      o2(0xFA,0xEB),
-          o2(0xCF,0xBC),      o2(0xCF,0xE2),
-          o2(0xCD,0xF6),      o2(0xEF,0xF0),
-          o2(0xF4,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_29 = {
-    to_EUC_KR_E7_29_offsets,
-    to_EUC_KR_E7_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2A_offsets[64] = {
-     13,  0, 13, 13,  1, 13, 13, 13,      2, 13, 13, 13, 13, 13, 13, 13,
-     13, 13,  3,  4, 13,  5, 13, 13,      6, 13, 13, 13, 13, 13, 13,  7,
-     13, 13, 13, 13, 13, 13, 13, 13,     13,  8,  9, 13, 13, 13, 10, 11,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 12, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2A_infos[14] = {
-          o2(0xD4,0xCD),      o2(0xF3,0xB8),
-          o2(0xE9,0xA1),      o2(0xF2,0xF2),
-          o2(0xF3,0xEB),      o2(0xF0,0xD7),
-          o2(0xCF,0xD7),      o2(0xCF,0xDF),
-          o2(0xE8,0xC0),      o2(0xE8,0xC1),
-          o2(0xCF,0xE3),      o2(0xE9,0xA2),
-          o2(0xD0,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2A = {
-    to_EUC_KR_E7_2A_offsets,
-    to_EUC_KR_E7_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2B_offsets[64] = {
-     19, 19, 19, 19,  0,  1, 19,  2,     19, 19,  3,  4, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19,  5,     19,  6, 19, 19, 19,  7, 19,  8,
-      9, 19, 19, 10, 19, 11, 19, 19,     19, 19, 12, 19, 19, 13, 19, 14,
-     19, 19, 19, 19, 19, 19, 15, 19,     19, 16, 17, 19, 19, 19, 19, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2B_infos[20] = {
-          o2(0xF3,0xC1),      o2(0xD0,0xAB),
-          o2(0xD4,0xE4),      o2(0xEF,0xBC),
-          o2(0xD8,0xA1),      o2(0xD9,0xDF),
-          o2(0xF3,0xD7),      o2(0xDC,0xBD),
-          o2(0xCC,0xE5),      o2(0xED,0xF1),
-          o2(0xF1,0xE2),      o2(0xD4,0xDB),
-          o2(0xE2,0xB5),      o2(0xCA,0xE6),
-          o2(0xD3,0xAE),      o2(0xCC,0xE6),
-          o2(0xF1,0xD3),      o2(0xF5,0xE7),
-          o2(0xCA,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2B = {
-    to_EUC_KR_E7_2B_offsets,
-    to_EUC_KR_E7_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2C_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10,  0,
-     10,  1, 10, 10, 10, 10, 10, 10,     10,  2, 10,  3, 10, 10,  4, 10,
-      5, 10, 10, 10, 10, 10,  6, 10,     10, 10, 10, 10,  7,  8, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  9, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2C_infos[11] = {
-          o2(0xFB,0xEE),      o2(0xE1,0xC5),
-          o2(0xDF,0xE9),      o2(0xEE,0xDE),
-          o2(0xF7,0xC2),      o2(0xD8,0xA2),
-          o2(0xDD,0xAC),      o2(0xF0,0xAF),
-          o2(0xD6,0xBD),      o2(0xE1,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2C = {
-    to_EUC_KR_E7_2C_offsets,
-    to_EUC_KR_E7_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2D_offsets[64] = {
-     16, 16, 16, 16, 16, 16,  0, 16,     16,  1, 16,  2,  3,  4, 16,  5,
-      6,  7,  8, 16,  9, 16, 10, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     11, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 12, 16, 13, 16,
-     16, 16, 16, 16, 16, 14, 16, 16,     16, 16, 16, 16, 16, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2D_infos[17] = {
-          o2(0xF9,0xB6),      o2(0xD4,0xF5),
-          o2(0xD0,0xC9),      o2(0xEF,0xA7),
-          o2(0xE2,0xEC),      o2(0xDB,0xEA),
-          o2(0xCE,0xCC),      o2(0xF5,0xE8),
-          o2(0xF7,0xD5),      o2(0xD3,0xCD),
-          o2(0xF3,0xFE),      o2(0xD0,0xB5),
-          o2(0xE0,0xFE),      o2(0xDF,0xFB),
-          o2(0xE6,0xDD),      o2(0xE8,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2D = {
-    to_EUC_KR_E7_2D_offsets,
-    to_EUC_KR_E7_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2E_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13,  0,     13, 13, 13,  1, 13, 13, 13,  2,
-     13, 13, 13, 13,  3,  4, 13,  5,     13, 13,  6, 13, 13,  7, 13, 13,
-     13,  8, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13,  9, 13, 13,
-     13, 10, 13, 13, 11, 13, 13, 13,     12, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2E_infos[14] = {
-          o2(0xCB,0xCD),      o2(0xEF,0xA8),
-          o2(0xEE,0xB4),      o2(0xDA,0xD8),
-          o2(0xD1,0xB9),      o2(0xDF,0xA9),
-          o2(0xF3,0xB0),      o2(0xCC,0xC4),
-          o2(0xCE,0xB7),      o2(0xEF,0xA9),
-          o2(0xDF,0xD5),      o2(0xED,0xD7),
-          o2(0xEE,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2E = {
-    to_EUC_KR_E7_2E_offsets,
-    to_EUC_KR_E7_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_2F_offsets[64] = {
-      0,  1, 10, 10,  2, 10,  3,  4,     10,  5, 10, 10, 10, 10, 10, 10,
-     10, 10,  6, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      7, 10, 10, 10,  8, 10, 10, 10,     10,  9, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_2F_infos[11] = {
-          o2(0xEF,0xBD),      o2(0xFC,0xD6),
-          o2(0xDB,0xF4),      o2(0xEF,0xAA),
-          o2(0xF8,0xB9),      o2(0xF5,0xE9),
-          o2(0xE3,0xD9),      o2(0xE1,0xC6),
-          o2(0xD4,0xBF),      o2(0xDE,0xE8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_2F = {
-    to_EUC_KR_E7_2F_offsets,
-    to_EUC_KR_E7_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_30_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10,  0,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10,  1, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10,  2, 10,
-     10,  3, 10, 10, 10, 10, 10,  4,     10, 10,  5,  6, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  7,  8,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_30_infos[11] = {
-          o2(0xF0,0xEA),      o2(0xF3,0xC2),
-          o2(0xD3,0xAF),      o2(0xCA,0xDB),
-          o2(0xFC,0xD7),      o2(0xED,0xD8),
-          o2(0xE1,0xC7),      o2(0xF4,0xD8),
-          o2(0xD6,0xB3),      o2(0xDD,0xAD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_30 = {
-    to_EUC_KR_E7_30_offsets,
-    to_EUC_KR_E7_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_31_offsets[64] = {
-      7,  7,  7,  0,  7,  7,  7,  7,      7,  7,  7,  7,  1,  2,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      3,  7,  7,  7,  4,  7,  7,  7,      7,  7,  7,  7,  5,  7,  7,  7,
-      7,  7,  7,  6,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_31_infos[8] = {
-          o2(0xD5,0xBE),      o2(0xF1,0xC3),
-          o2(0xEE,0xDF),      o2(0xD6,0xEB),
-          o2(0xF4,0xD9),      o2(0xD7,0xE6),
-          o2(0xDA,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_31 = {
-    to_EUC_KR_E7_31_offsets,
-    to_EUC_KR_E7_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_32_offsets[64] = {
-     15, 15, 15,  0, 15, 15, 15, 15,     15,  1, 15, 15, 15, 15, 15, 15,
-     15, 15,  2, 15, 15,  3, 15,  4,      5, 15, 15, 15, 15, 15, 15,  6,
-     15, 15, 15, 15, 15,  7, 15,  8,     15, 15, 15, 15, 15, 15,  9, 15,
-     15, 10, 11, 12, 15, 15, 15, 15,     15, 13, 15, 15, 15, 15, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_32_infos[16] = {
-          o2(0xDD,0xFB),      o2(0xDD,0xCF),
-          o2(0xD8,0xA3),      o2(0xDA,0xD9),
-          o2(0xF0,0xD8),      o2(0xEF,0xC4),
-          o2(0xE1,0xD8),      o2(0xF1,0xD4),
-          o2(0xED,0xF2),      o2(0xD5,0xDB),
-          o2(0xD5,0xDC),      o2(0xF3,0xC4),
-          o2(0xCB,0xD7),      o2(0xE2,0xB6),
-          o2(0xEF,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_32 = {
-    to_EUC_KR_E7_32_offsets,
-    to_EUC_KR_E7_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_33_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  0,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  1,  8,      8,  8,  8,  8,  8,  8,  2,  3,
-      4,  8,  8,  8,  8,  8,  8,  5,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  6,  8,  8,  7,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_33_infos[9] = {
-          o2(0xFB,0xD5),      o2(0xD3,0xD8),
-          o2(0xDD,0xD0),      o2(0xF0,0xD9),
-          o2(0xCB,0xB3),      o2(0xD5,0xDD),
-          o2(0xCD,0xA7),      o2(0xD0,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_33 = {
-    to_EUC_KR_E7_33_offsets,
-    to_EUC_KR_E7_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_34_offsets[64] = {
-      0, 29,  1, 29,  2,  3,  4,  5,      6, 29,  7,  8, 29,  9, 29, 29,
-     10, 29, 29, 29, 11, 29, 29, 12,     13, 14, 15, 16, 29, 29, 29, 29,
-     17, 18, 19, 29, 29, 29, 29, 29,     29, 29, 29, 20, 21, 29, 22, 23,
-     24, 29, 29, 25, 29, 26, 29, 29,     29, 27, 28, 29, 29, 29, 29, 29,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_34_infos[30] = {
-          o2(0xD1,0xBA),      o2(0xF1,0xC4),
-          o2(0xE5,0xB3),      o2(0xFB,0xF5),
-          o2(0xE9,0xE1),      o2(0xFD,0xE0),
-          o2(0xFC,0xBC),      o2(0xDA,0xA2),
-          o2(0xDA,0xA3),      o2(0xD2,0xA1),
-          o2(0xD2,0xEF),      o2(0xE2,0xED),
-          o2(0xDE,0xE9),      o2(0xCE,0xDC),
-          o2(0xF2,0xB5),      o2(0xD0,0xE4),
-          o2(0xDD,0xD1),      o2(0xE1,0xC8),
-          o2(0xDB,0xB7),      o2(0xDF,0xE3),
-          o2(0xED,0xB9),      o2(0xF1,0xC5),
-          o2(0xF3,0xCF),      o2(0xD7,0xAB),
-          o2(0xE1,0xAC),      o2(0xE3,0xEB),
-          o2(0xEE,0xC7),      o2(0xE1,0xC9),
-          o2(0xCA,0xFA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_34 = {
-    to_EUC_KR_E7_34_offsets,
-    to_EUC_KR_E7_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_35_offsets[64] = {
-     19, 19,  0,  1,  2,  3,  4, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-      5, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19, 19,  6, 19,
-     19,  7,  8, 19, 19, 19,  9, 19,     10, 19, 11, 19, 19, 19, 12, 19,
-     19, 13, 14, 15, 19, 19, 16, 19,     19, 17, 19, 19, 19, 19, 19, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_35_infos[20] = {
-          o2(0xF0,0xFB),      o2(0xFA,0xE1),
-          o2(0xF0,0xDA),      o2(0xCC,0xE7),
-          o2(0xDA,0xF4),      o2(0xCC,0xBF),
-          o2(0xCE,0xED),      o2(0xD5,0xA9),
-          o2(0xFA,0xE2),      o2(0xD0,0xE5),
-          o2(0xEB,0xD6),      o2(0xEC,0xDF),
-          o2(0xDF,0xFC),      o2(0xF7,0xD6),
-          o2(0xDE,0xEA),      o2(0xCB,0xB4),
-          o2(0xEF,0xBE),      o2(0xCC,0xB5),
-          o2(0xCF,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_35 = {
-    to_EUC_KR_E7_35_offsets,
-    to_EUC_KR_E7_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_36_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18,  0,  1,
-     18, 18, 18,  2, 18, 18, 18, 18,     18, 18, 18, 18,  3, 18, 18, 18,
-      4, 18,  5, 18, 18, 18, 18, 18,     18, 18, 18, 18,  6,  7, 18, 18,
-     18,  8,  9, 18, 10, 11, 18, 18,     12, 18, 13, 14, 18, 15, 16, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_36_infos[19] = {
-          o2(0xEF,0xF2),      o2(0xE2,0xB7),
-          o2(0xCC,0xE8),      o2(0xF0,0xFC),
-          o2(0xD6,0xE0),      o2(0xF1,0xC6),
-          o2(0xE2,0xB8),      o2(0xEB,0xAB),
-          o2(0xCB,0xB5),      o2(0xD8,0xD1),
-          o2(0xF4,0xCE),      o2(0xF3,0xF7),
-          o2(0xD7,0xC6),      o2(0xD1,0xBB),
-          o2(0xF7,0xAA),      o2(0xED,0xCA),
-          o2(0xD7,0xD3),      o2(0xD8,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_36 = {
-    to_EUC_KR_E7_36_offsets,
-    to_EUC_KR_E7_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_37_offsets[64] = {
-     17, 17, 17, 17, 17, 17, 17,  0,     17, 17,  1,  2, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  3, 17,      4, 17,  5, 17, 17,  6,  7, 17,
-      8,  9, 17, 10, 17, 17, 17, 17,     11, 12, 17, 17, 13, 17, 17, 14,
-     17, 17, 17, 17, 15, 17, 17, 17,     17, 17, 17, 16, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_37_infos[18] = {
-          o2(0xF6,0xC5),      o2(0xD1,0xCC),
-          o2(0xDD,0xFC),      o2(0xDF,0xFD),
-          o2(0xF9,0xE5),      o2(0xE0,0xCA),
-          o2(0xF2,0xFD),      o2(0xD3,0xB0),
-          o2(0xF4,0xF3),      o2(0xDA,0xC9),
-          o2(0xE6,0xDE),      o2(0xF8,0xBA),
-          o2(0xE8,0xD0),      o2(0xD8,0xFB),
-          o2(0xEA,0xD5),      o2(0xD6,0xA3),
-          o2(0xF6,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_37 = {
-    to_EUC_KR_E7_37_offsets,
-    to_EUC_KR_E7_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_38_offsets[64] = {
-     16, 16, 16, 16, 16, 16, 16, 16,     16,  0,  1, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16,  2, 16, 16,     16, 16, 16,  3, 16,  4,  5,  6,
-     16,  7, 16,  8, 16, 16, 16, 16,     16, 16, 16,  9, 16, 16, 10, 11,
-     16, 12, 16, 16, 16, 16, 16, 13,     16, 16, 16, 16, 16, 14, 15, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_38_infos[17] = {
-          o2(0xF2,0xDB),      o2(0xE4,0xFC),
-          o2(0xE8,0xB2),      o2(0xDA,0xDA),
-          o2(0xF2,0xDC),      o2(0xFB,0xD6),
-          o2(0xE9,0xB2),      o2(0xEE,0xAD),
-          o2(0xFA,0xE3),      o2(0xDC,0xEE),
-          o2(0xF5,0xEA),      o2(0xE6,0xE0),
-          o2(0xF0,0xFD),      o2(0xD7,0xAC),
-          o2(0xF5,0xC5),      o2(0xEE,0xE0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_38 = {
-    to_EUC_KR_E7_38_offsets,
-    to_EUC_KR_E7_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_39_offsets[64] = {
-     16,  0, 16,  1, 16, 16,  2,  3,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  4, 16,  5,  6, 16, 16,     16, 16, 16, 16, 16, 16,  7, 16,
-     16,  8, 16, 16, 16, 16, 16, 16,     16,  9, 10, 11, 16, 12, 16, 16,
-     13, 16, 16, 16, 16, 16, 16, 16,     16, 14, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_39_infos[17] = {
-          o2(0xDB,0xE5),      o2(0xDD,0xDE),
-          o2(0xD9,0xF0),      o2(0xE9,0xA3),
-          o2(0xF1,0xF9),      o2(0xF2,0xC4),
-          o2(0xE0,0xCB),      o2(0xE9,0xA4),
-          o2(0xE2,0xB9),      o2(0xE3,0xB1),
-          o2(0xFC,0xEB),      o2(0xCD,0xA8),
-          o2(0xCC,0xB6),      o2(0xF0,0xDB),
-          o2(0xE6,0xBA),      o2(0xCD,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_39 = {
-    to_EUC_KR_E7_39_offsets,
-    to_EUC_KR_E7_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_3A_offsets[64] = {
-      8,  8,  0,  8,  8,  8,  8,  8,      8,  8,  8,  8,  1,  8,  8,  2,
-      8,  8,  8,  3,  8,  8,  4,  8,      5,  8,  8,  6,  7,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_3A_infos[9] = {
-          o2(0xF3,0xC3),      o2(0xE1,0xD9),
-          o2(0xEF,0xAB),      o2(0xE7,0xC5),
-          o2(0xE0,0xE9),      o2(0xF3,0xC5),
-          o2(0xD4,0xC0),      o2(0xD5,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_3A = {
-    to_EUC_KR_E7_3A_offsets,
-    to_EUC_KR_E7_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_3C_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  0,  3,      1,  3,  2,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_3C_infos[4] = {
-          o2(0xDD,0xAE),      o2(0xF9,0xFC),
-          o2(0xCC,0xC0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_3C = {
-    to_EUC_KR_E7_3C_offsets,
-    to_EUC_KR_E7_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_3D_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12,  0, 12, 12, 12,
-      1, 12, 12, 12,  2,  3, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12,  4,  5, 12, 12,  6, 12,
-      7, 12,  8, 12, 12,  9, 12, 10,     12, 11, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_3D_infos[13] = {
-          o2(0xE5,0xA2),      o2(0xCE,0xB8),
-          o2(0xD8,0xD2),      o2(0xF9,0xD6),
-          o2(0xF1,0xAA),      o2(0xCE,0xD1),
-          o2(0xF6,0xC7),      o2(0xDB,0xEB),
-          o2(0xDF,0xFE),      o2(0xD8,0xE1),
-          o2(0xF7,0xF3),      o2(0xD7,0xE7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_3D = {
-    to_EUC_KR_E7_3D_offsets,
-    to_EUC_KR_E7_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_3E_offsets[64] = {
-     15, 15, 15, 15, 15,  0, 15, 15,      1, 15,  2, 15,  3, 15,  4, 15,
-     15, 15, 15, 15,  5, 15, 15, 15,     15, 15,  6, 15, 15, 15,  7, 15,
-     15, 15, 15, 15,  8, 15, 15, 15,      9, 10, 15, 15, 15, 15, 15, 15,
-     15, 15, 11, 15, 15, 15, 15, 15,     12, 13, 15, 15, 15, 14, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_3E_infos[16] = {
-          o2(0xD4,0xFE),      o2(0xD1,0xBC),
-          o2(0xE5,0xCF),      o2(0xCB,0xB6),
-          o2(0xDA,0xB8),      o2(0xCD,0xC4),
-          o2(0xD6,0xBE),      o2(0xE2,0xBA),
-          o2(0xCF,0xD8),      o2(0xE0,0xCC),
-          o2(0xEB,0xF9),      o2(0xFD,0xFD),
-          o2(0xD7,0xE8),      o2(0xCB,0xD8),
-          o2(0xE9,0xE2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_3E = {
-    to_EUC_KR_E7_3E_offsets,
-    to_EUC_KR_E7_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_3F_offsets[64] = {
-     16,  0, 16, 16, 16,  1, 16, 16,     16, 16,  2, 16,  3, 16,  4, 16,
-     16, 16,  5, 16,  6,  7, 16, 16,     16, 16, 16, 16, 16, 16, 16,  8,
-      9, 10, 16, 16, 16, 16, 16, 16,     16, 11, 16, 12, 16, 16, 16, 16,
-     13, 16, 16, 16, 16, 16, 16, 16,     16, 14, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_3F_infos[17] = {
-          o2(0xE8,0xBA),      o2(0xE3,0xC7),
-          o2(0xEC,0xCD),      o2(0xEC,0xCE),
-          o2(0xD6,0xBF),      o2(0xE3,0xA7),
-          o2(0xDF,0xD6),      o2(0xFD,0xE8),
-          o2(0xEE,0xE1),      o2(0xF6,0xA8),
-          o2(0xDD,0xFD),      o2(0xF8,0xBB),
-          o2(0xE8,0xD1),      o2(0xF9,0xD7),
-          o2(0xCE,0xEE),      o2(0xEC,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7_3F = {
-    to_EUC_KR_E7_3F_offsets,
-    to_EUC_KR_E7_3F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E7_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,     56, 57, 58, 63, 59, 60, 61, 62,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E7_infos[64] = {
-       &to_EUC_KR_E7_00,   &to_EUC_KR_E7_01,
-       &to_EUC_KR_E7_02,   &to_EUC_KR_E7_03,
-       &to_EUC_KR_E7_04,   &to_EUC_KR_E7_05,
-       &to_EUC_KR_E7_06,   &to_EUC_KR_E7_07,
-       &to_EUC_KR_E7_08,   &to_EUC_KR_E7_09,
-       &to_EUC_KR_E7_0A,   &to_EUC_KR_E7_0B,
-       &to_EUC_KR_E7_0C,   &to_EUC_KR_E7_0D,
-       &to_EUC_KR_E7_0E,   &to_EUC_KR_E7_0F,
-       &to_EUC_KR_E7_10,   &to_EUC_KR_E7_11,
-       &to_EUC_KR_E7_12,   &to_EUC_KR_E7_13,
-       &to_EUC_KR_E7_14,   &to_EUC_KR_E7_15,
-       &to_EUC_KR_E7_16,   &to_EUC_KR_E7_17,
-       &to_EUC_KR_E7_18,   &to_EUC_KR_E7_19,
-       &to_EUC_KR_E7_1A,   &to_EUC_KR_E7_1B,
-       &to_EUC_KR_E7_1C,   &to_EUC_KR_E7_1D,
-       &to_EUC_KR_E7_1E,   &to_EUC_KR_E7_1F,
-       &to_EUC_KR_E7_20,   &to_EUC_KR_E7_21,
-       &to_EUC_KR_E7_22,   &to_EUC_KR_E7_23,
-       &to_EUC_KR_E7_24,   &to_EUC_KR_E7_25,
-       &to_EUC_KR_E7_26,   &to_EUC_KR_E7_27,
-       &to_EUC_KR_E7_28,   &to_EUC_KR_E7_29,
-       &to_EUC_KR_E7_2A,   &to_EUC_KR_E7_2B,
-       &to_EUC_KR_E7_2C,   &to_EUC_KR_E7_2D,
-       &to_EUC_KR_E7_2E,   &to_EUC_KR_E7_2F,
-       &to_EUC_KR_E7_30,   &to_EUC_KR_E7_31,
-       &to_EUC_KR_E7_32,   &to_EUC_KR_E7_33,
-       &to_EUC_KR_E7_34,   &to_EUC_KR_E7_35,
-       &to_EUC_KR_E7_36,   &to_EUC_KR_E7_37,
-       &to_EUC_KR_E7_38,   &to_EUC_KR_E7_39,
-       &to_EUC_KR_E7_3A,   &to_EUC_KR_E7_3C,
-       &to_EUC_KR_E7_3D,   &to_EUC_KR_E7_3E,
-       &to_EUC_KR_E7_3F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E7 = {
-    to_EUC_KR_E7_offsets,
-    to_EUC_KR_E7_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_00_offsets[64] = {
-      0,  1, 16,  2, 16,  3,  4, 16,     16,  5, 16, 16,  6, 16, 16, 16,
-      7, 16, 16, 16, 16,  8, 16,  9,     10, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 11, 16, 16,
-     16, 16, 16, 12, 16, 16, 13, 16,     16, 16, 16, 16, 16, 14, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_00_infos[17] = {
-          o2(0xE9,0xA5),      o2(0xD6,0xD5),
-          o2(0xCD,0xC5),      o2(0xED,0xBA),
-          o2(0xD1,0xBD),      o2(0xCF,0xBE),
-          o2(0xEC,0xBB),      o2(0xD2,0xB1),
-          o2(0xCC,0xE9),      o2(0xD9,0xC4),
-          o2(0xE9,0xFC),      o2(0xD1,0xBE),
-          o2(0xEC,0xBC),      o2(0xE5,0xAD),
-          o2(0xF7,0xB0),      o2(0xCC,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_00 = {
-    to_EUC_KR_E8_00_offsets,
-    to_EUC_KR_E8_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_01_offsets[64] = {
-     15, 15, 15,  0, 15, 15,  1, 15,     15, 15,  2, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,  3, 15,      4, 15,  5, 15, 15, 15,  6, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15,  7,
-      8, 15,  9, 10, 15, 15, 15, 11,     15, 15, 15, 15, 15, 12, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_01_infos[16] = {
-          o2(0xD3,0xC4),      o2(0xD6,0xC0),
-          o2(0xD6,0xFD),      o2(0xE1,0xA1),
-          o2(0xDE,0xBD),      o2(0xF6,0xA9),
-          o2(0xDA,0xA4),      o2(0xD6,0xA4),
-          o2(0xF5,0xC6),      o2(0xE1,0xA2),
-          o2(0xE9,0xC6),      o2(0xF2,0xC5),
-          o2(0xF4,0xE9),      o2(0xD6,0xEC),
-          o2(0xEB,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_01 = {
-    to_EUC_KR_E8_01_offsets,
-    to_EUC_KR_E8_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_02_offsets[64] = {
-     20, 20, 20, 20,  0,  1,  2,  3,     20,  4, 20,  5,  6, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,  7, 20,     20, 20, 20,  8, 20,  9, 20, 20,
-     20, 10, 11, 20, 20, 12, 20, 20,     20, 13, 14, 20, 20, 20, 20, 15,
-     20, 16, 17, 20, 18, 20, 20, 20,     20, 20, 19, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_02_infos[21] = {
-          o2(0xEC,0xBD),      o2(0xE2,0xDC),
-          o2(0xDE,0xEB),      o2(0xF0,0xDC),
-          o2(0xEB,0xBF),      o2(0xD7,0xCE),
-          o2(0xD1,0xBF),      o2(0xF5,0xAB),
-          o2(0xF9,0xFD),      o2(0xCA,0xDC),
-          o2(0xCD,0xC6),      o2(0xF2,0xB6),
-          o2(0xDD,0xFE),      o2(0xCC,0xB7),
-          o2(0xDB,0xB8),      o2(0xD0,0xE9),
-          o2(0xCE,0xDD),      o2(0xEB,0xC0),
-          o2(0xFD,0xA2),      o2(0xF8,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_02 = {
-    to_EUC_KR_E8_02_offsets,
-    to_EUC_KR_E8_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_03_offsets[64] = {
-     14, 14, 14,  0,  1, 14, 14, 14,     14, 14, 14, 14,  2, 14,  3, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14,  4,  5, 14, 14,  6, 14,
-     14,  7, 14, 14,  8,  9, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 10, 14, 14, 11, 14, 14, 14,     12, 14, 14, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_03_infos[15] = {
-          o2(0xEA,0xD6),      o2(0xF1,0xB0),
-          o2(0xDB,0xCE),      o2(0xF7,0xC3),
-          o2(0xDB,0xCF),      o2(0xCB,0xA4),
-          o2(0xF8,0xE0),      o2(0xFB,0xD7),
-          o2(0xEB,0xCA),      o2(0xE0,0xA1),
-          o2(0xCE,0xCD),      o2(0xD4,0xDC),
-          o2(0xFD,0xD8),      o2(0xD2,0xF6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_03 = {
-    to_EUC_KR_E8_03_offsets,
-    to_EUC_KR_E8_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_04_offsets[64] = {
-     15, 15,  0, 15, 15,  1,  2,  3,      4, 15,  5, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,      6, 15,  7,  8, 15, 15, 15, 15,
-     15, 15, 15,  9, 15, 15, 15, 15,     15, 10, 15, 11, 15, 15, 15, 12,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 13, 15, 15, 15, 15, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_04_infos[16] = {
-          o2(0xF2,0xB7),      o2(0xFA,0xF6),
-          o2(0xF6,0xAA),      o2(0xFA,0xF7),
-          o2(0xD8,0xE6),      o2(0xF4,0xB1),
-          o2(0xE8,0xD2),      o2(0xCA,0xC5),
-          o2(0xCC,0xEB),      o2(0xE2,0xEE),
-          o2(0xE2,0xBB),      o2(0xF7,0xAD),
-          o2(0xF8,0xE1),      o2(0xF3,0xEC),
-          o2(0xDE,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_04 = {
-    to_EUC_KR_E8_04_offsets,
-    to_EUC_KR_E8_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_05_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15,  0, 15, 15,  1, 15,
-      2,  3, 15, 15,  4,  5, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15,  6,  7, 15,     15, 15, 15,  8, 15, 15, 15, 15,
-      9, 10, 15, 15, 15, 15, 15, 15,     11, 12, 13, 15, 15, 15, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_05_infos[16] = {
-          o2(0xE4,0xFD),      o2(0xE3,0xEC),
-          o2(0xDD,0xAF),      o2(0xDD,0xB0),
-          o2(0xCB,0xB7),      o2(0xE8,0xD3),
-          o2(0xE1,0xA3),      o2(0xD2,0xE0),
-          o2(0xF0,0xFE),      o2(0xE9,0xA6),
-          o2(0xCB,0xF2),      o2(0xED,0xF3),
-          o2(0xDC,0xD9),      o2(0xE0,0xCD),
-          o2(0xF7,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_05 = {
-    to_EUC_KR_E8_05_offsets,
-    to_EUC_KR_E8_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_06_offsets[64] = {
-      0, 16, 16, 16, 16, 16, 16, 16,      1, 16,  2, 16, 16, 16, 16,  3,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16,  4, 16,  5,  6, 16, 16,
-      7, 16, 16,  8, 16, 16, 16, 16,      9, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 10, 16, 11, 16, 16,     16, 16, 12, 16, 16, 13, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_06_infos[17] = {
-          o2(0xDB,0xB9),      o2(0xCC,0xAE),
-          o2(0xDA,0xDB),      o2(0xCD,0xC7),
-          o2(0xDD,0xB1),      o2(0xD8,0xAF),
-          o2(0xE3,0xA3),      o2(0xCE,0xEF),
-          o2(0xF2,0xF3),      o2(0xF8,0xB3),
-          o2(0xE0,0xCE),      o2(0xF5,0xFD),
-          o2(0xEB,0xEC),      o2(0xD3,0xC5),
-          o2(0xFC,0xEC),      o2(0xD2,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_06 = {
-    to_EUC_KR_E8_06_offsets,
-    to_EUC_KR_E8_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_07_offsets[64] = {
-      0, 18,  1, 18, 18, 18,  2, 18,     18, 18, 18, 18, 18,  3, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,      4, 18, 18, 18, 18, 18, 18,  5,
-     18, 18, 18,  6, 18,  7, 18,  8,      9, 18, 10, 18, 18, 11, 18, 18,
-     18, 18, 18, 12, 13, 18, 18, 18,     18, 18, 14, 15, 16, 18, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_07_infos[19] = {
-          o2(0xD4,0xEB),      o2(0xDE,0xA2),
-          o2(0xE5,0xE6),      o2(0xF0,0xB0),
-          o2(0xD5,0xC4),      o2(0xED,0xF4),
-          o2(0xE3,0xED),      o2(0xE8,0xC2),
-          o2(0xED,0xF5),      o2(0xD7,0xFC),
-          o2(0xED,0xBB),      o2(0xF6,0xAB),
-          o2(0xF2,0xB8),      o2(0xF6,0xC8),
-          o2(0xD3,0xE6),      o2(0xF2,0xDD),
-          o2(0xCF,0xBF),      o2(0xEB,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_07 = {
-    to_EUC_KR_E8_07_offsets,
-    to_EUC_KR_E8_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_08_offsets[64] = {
-     19, 19, 19, 19, 19,  0, 19,  1,      2, 19,  3, 19,  4,  5, 19, 19,
-     19, 19,  6, 19, 19, 19, 19, 19,     19, 19, 19,  7,  8, 19,  9, 10,
-     19, 11, 19, 19, 19, 19, 19, 19,     19, 19, 12, 13, 14, 19, 19, 19,
-     19, 19, 19, 19, 19, 15, 16, 17,     19, 18, 19, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_08_infos[20] = {
-          o2(0xCF,0xC0),      o2(0xE6,0xA8),
-          o2(0xFD,0xE9),      o2(0xCF,0xC1),
-          o2(0xE0,0xDF),      o2(0xDE,0xEC),
-          o2(0xE0,0xA2),      o2(0xF4,0xBF),
-          o2(0xE2,0xEF),      o2(0xD9,0xF1),
-          o2(0xF1,0xC7),      o2(0xCB,0xB8),
-          o2(0xF9,0xFE),      o2(0xDB,0xBA),
-          o2(0xDA,0xF5),      o2(0xF6,0xEC),
-          o2(0xDA,0xDC),      o2(0xFA,0xE4),
-          o2(0xE0,0xCF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_08 = {
-    to_EUC_KR_E8_08_offsets,
-    to_EUC_KR_E8_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_09_offsets[64] = {
-      0, 13, 13, 13, 13,  1, 13,  2,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13,  3, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13,  4, 13,  5, 13,     13, 13, 13, 13, 13, 13,  6,  7,
-     13,  8,  9, 13, 13, 13, 10, 13,     11, 13, 13, 13, 13, 13, 12, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_09_infos[14] = {
-          o2(0xDD,0xB2),      o2(0xE6,0xA9),
-          o2(0xEF,0xF3),      o2(0xF3,0xED),
-          o2(0xEB,0xFA),      o2(0xF9,0xE6),
-          o2(0xCA,0xDD),      o2(0xD5,0xDE),
-          o2(0xCA,0xDE),      o2(0xDF,0xE4),
-          o2(0xE6,0xFD),      o2(0xF5,0xAC),
-          o2(0xE4,0xF5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_09 = {
-    to_EUC_KR_E8_09_offsets,
-    to_EUC_KR_E8_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0A_offsets[64] = {
-     24, 24, 24, 24, 24, 24, 24, 24,     24, 24, 24,  0, 24,  1,  2, 24,
-     24, 24,  3, 24, 24, 24, 24, 24,     24,  4,  5, 24, 24,  6, 24,  7,
-     24, 24, 24, 24, 24,  8,  9, 24,     24, 10, 24, 24, 11, 12, 13, 14,
-     24, 15, 24, 16, 24, 24, 24, 17,     18, 19, 24, 20, 21, 22, 24, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0A_infos[25] = {
-          o2(0xE9,0xE3),      o2(0xED,0xCB),
-          o2(0xCF,0xE4),      o2(0xD8,0xD3),
-          o2(0xDD,0xB3),      o2(0xD4,0xEC),
-          o2(0xF2,0xB9),      o2(0xDF,0xB7),
-          o2(0xCB,0xCE),      o2(0xFB,0xD8),
-          o2(0xD0,0xD9),      o2(0xDD,0xD2),
-          o2(0xF7,0xF4),      o2(0xE7,0xDC),
-          o2(0xE4,0xA5),      o2(0xFC,0xA3),
-          o2(0xDB,0xBB),      o2(0xF2,0xBA),
-          o2(0xE9,0xFD),      o2(0xD0,0xCA),
-          o2(0xF5,0xD6),      o2(0xD9,0xC5),
-          o2(0xE4,0xB4),      o2(0xED,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0A = {
-    to_EUC_KR_E8_0A_offsets,
-    to_EUC_KR_E8_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0B_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15,  0,  1, 15,  2,  3, 15,  4,     15, 15, 15,  5, 15, 15,  6,  7,
-     15,  8, 15, 15, 15,  9, 10, 11,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 12, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 13, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0B_infos[16] = {
-          o2(0xEA,0xBD),      o2(0xE6,0xFE),
-          o2(0xF7,0xC4),      o2(0xF5,0xAD),
-          o2(0xD9,0xE0),      o2(0xCA,0xB4),
-          o2(0xF8,0xE2),      o2(0xCF,0xC2),
-          o2(0xEC,0xBE),      o2(0xE5,0xB4),
-          o2(0xCD,0xC8),      o2(0xEE,0xC8),
-          o2(0xE7,0xC8),      o2(0xCD,0xC9),
-          o2(0xF9,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0B = {
-    to_EUC_KR_E8_0B_offsets,
-    to_EUC_KR_E8_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0C_offsets[64] = {
-     16,  0,  1,  2,  3,  4, 16, 16,     16,  5, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16,  6,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,      7, 16, 16,  8, 16, 16, 16,  9,
-     16, 10, 16, 16, 11, 12, 13, 16,     14, 15, 16, 16, 16, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0C_infos[17] = {
-          o2(0xF1,0xE8),      o2(0xD9,0xF2),
-          o2(0xDB,0xF5),      o2(0xCA,0xB5),
-          o2(0xD9,0xC6),      o2(0xD8,0xC9),
-          o2(0xD9,0xAB),      o2(0xED,0xBC),
-          o2(0xD8,0xD4),      o2(0xDC,0xDA),
-          o2(0xE2,0xBC),      o2(0xFC,0xED),
-          o2(0xEC,0xE0),      o2(0xD2,0xFE),
-          o2(0xE9,0xC7),      o2(0xE6,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0C = {
-    to_EUC_KR_E8_0C_offsets,
-    to_EUC_KR_E8_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0D_offsets[64] = {
-      0, 10, 10, 10, 10, 10, 10,  1,     10,  2,  3, 10, 10, 10, 10,  4,
-     10,  5,  6, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10,  7, 10, 10, 10,  8,     10, 10, 10,  9, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0D_infos[11] = {
-          o2(0xE2,0xF0),      o2(0xFA,0xBB),
-          o2(0xF5,0xAE),      o2(0xFB,0xAA),
-          o2(0xEC,0xFB),      o2(0xEC,0xBF),
-          o2(0xFC,0xD8),      o2(0xD4,0xE5),
-          o2(0xF9,0xC3),      o2(0xEE,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0D = {
-    to_EUC_KR_E8_0D_offsets,
-    to_EUC_KR_E8_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0E_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11,  0,  1, 11, 11, 11,  2, 11,
-     11, 11, 11, 11, 11, 11,  3, 11,      4, 11, 11, 11, 11, 11,  5, 11,
-     11, 11,  6, 11, 11, 11, 11, 11,     11,  7,  8,  9, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 10, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0E_infos[12] = {
-          o2(0xD7,0xE9),      o2(0xED,0xF6),
-          o2(0xDE,0xED),      o2(0xCC,0xEC),
-          o2(0xE3,0xEE),      o2(0xE8,0xD4),
-          o2(0xFA,0xF8),      o2(0xDD,0xB4),
-          o2(0xE4,0xB5),      o2(0xD8,0xB0),
-          o2(0xD8,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0E = {
-    to_EUC_KR_E8_0E_offsets,
-    to_EUC_KR_E8_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_0F_offsets[64] = {
-     17,  0, 17, 17, 17,  1, 17, 17,     17,  2,  3, 17,  4, 17, 17, 17,
-     17, 17, 17,  5, 17, 17,  6, 17,     17, 17, 17, 17,  7, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17,  8, 17,  9, 17, 17, 17, 10,
-     11, 12, 13, 17, 14, 17, 17, 17,     17, 15, 17, 17, 17, 16, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_0F_infos[18] = {
-          o2(0xF4,0xEA),      o2(0xCE,0xB9),
-          o2(0xD6,0xE1),      o2(0xCF,0xD2),
-          o2(0xD0,0xB6),      o2(0xCE,0xA2),
-          o2(0xF3,0xEE),      o2(0xF3,0xF8),
-          o2(0xDC,0xCC),      o2(0xD0,0xCB),
-          o2(0xFC,0xA4),      o2(0xCD,0xCA),
-          o2(0xD7,0xD4),      o2(0xDE,0xA3),
-          o2(0xE4,0xE0),      o2(0xEE,0xC9),
-          o2(0xE2,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_0F = {
-    to_EUC_KR_E8_0F_offsets,
-    to_EUC_KR_E8_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_10_offsets[64] = {
-     11, 11, 11,  0,  1, 11, 11, 11,     11, 11,  2, 11,  3,  4,  5, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11,  6, 11, 11,  7, 11, 11, 11,
-     11,  8, 11, 11, 11, 11, 11, 11,      9, 11, 11, 11, 11, 10, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_10_infos[12] = {
-          o2(0xF5,0xFE),      o2(0xD4,0xAC),
-          o2(0xD5,0xD1),      o2(0xD8,0xF0),
-          o2(0xF8,0xC3),      o2(0xEA,0xD7),
-          o2(0xF5,0xD7),      o2(0xD8,0xBF),
-          o2(0xFD,0xC0),      o2(0xEB,0xAD),
-          o2(0xD5,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_10 = {
-    to_EUC_KR_E8_10_offsets,
-    to_EUC_KR_E8_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_11_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11,  0, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11,  1,     11, 11, 11,  2, 11, 11, 11, 11,
-     11,  3, 11,  4, 11, 11,  5, 11,     11, 11, 11,  6,  7, 11, 11,  8,
-     11, 11, 11, 11, 11,  9, 11, 11,     11, 11, 10, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_11_infos[12] = {
-          o2(0xE7,0xA8),      o2(0xEE,0xCA),
-          o2(0xCA,0xE7),      o2(0xF8,0xE3),
-          o2(0xD4,0xDD),      o2(0xEA,0xD8),
-          o2(0xFB,0xD9),      o2(0xED,0xF7),
-          o2(0xE5,0xB5),      o2(0xD0,0xAD),
-          o2(0xF1,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_11 = {
-    to_EUC_KR_E8_11_offsets,
-    to_EUC_KR_E8_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_12_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      0, 10, 10, 10,  1, 10, 10, 10,     10,  2, 10, 10,  3, 10, 10, 10,
-     10,  4, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10,  5, 10, 10, 10, 10, 10,      6, 10, 10,  7,  8, 10, 10,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_12_infos[11] = {
-          o2(0xE2,0xBD),      o2(0xE3,0xC8),
-          o2(0xD9,0xD5),      o2(0xDF,0xAA),
-          o2(0xDB,0xBC),      o2(0xF8,0xE4),
-          o2(0xF1,0xFA),      o2(0xE5,0xB6),
-          o2(0xF3,0xEF),      o2(0xFB,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_12 = {
-    to_EUC_KR_E8_12_offsets,
-    to_EUC_KR_E8_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_13_offsets[64] = {
-      0, 13,  1, 13,  2, 13,  3, 13,     13,  4, 13,  5, 13,  6, 13, 13,
-     13,  7, 13, 13, 13, 13, 13, 13,     13, 13,  8, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13,  9, 13, 10, 13,
-     13, 13, 13, 13, 11, 13, 13, 13,     13, 13, 13, 13, 12, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_13_infos[14] = {
-          o2(0xE1,0xE0),      o2(0xD9,0xAC),
-          o2(0xF5,0xEB),      o2(0xE0,0xB6),
-          o2(0xE9,0xC8),      o2(0xCB,0xCF),
-          o2(0xE3,0xC9),      o2(0xDE,0xEE),
-          o2(0xE2,0xBE),      o2(0xDC,0xEF),
-          o2(0xD6,0xA5),      o2(0xE2,0xF1),
-          o2(0xD6,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_13 = {
-    to_EUC_KR_E8_13_offsets,
-    to_EUC_KR_E8_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_14_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15,  0, 15,  1,  2, 15, 15,  3,      4, 15,  5, 15, 15, 15,  6, 15,
-     15,  7, 15,  8, 15,  9, 15, 15,     15, 15, 15, 15, 10, 11, 15, 12,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 13, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_14_infos[16] = {
-          o2(0xD9,0xA1),      o2(0xD8,0xC0),
-          o2(0xDC,0xDB),      o2(0xED,0xBD),
-          o2(0xDF,0xB8),      o2(0xEA,0xA5),
-          o2(0xD7,0xAD),      o2(0xF3,0xF9),
-          o2(0xED,0xF8),      o2(0xF5,0xC7),
-          o2(0xE1,0xCA),      o2(0xEB,0xE3),
-          o2(0xF2,0xDE),      o2(0xF8,0xCC),
-          o2(0xEA,0xD9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_14 = {
-    to_EUC_KR_E8_14_offsets,
-    to_EUC_KR_E8_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_15_offsets[64] = {
-     11,  0, 11,  1, 11, 11, 11, 11,     11,  2, 11, 11, 11, 11,  3, 11,
-     11, 11, 11,  4, 11, 11, 11, 11,     11,  5, 11, 11, 11, 11, 11, 11,
-     11, 11, 11,  6, 11, 11, 11, 11,      7,  8,  9, 11, 11, 10, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_15_infos[12] = {
-          o2(0xD3,0xC6),      o2(0xDB,0xE6),
-          o2(0xF5,0xAF),      o2(0xCE,0xF0),
-          o2(0xE9,0xFE),      o2(0xFB,0xB6),
-          o2(0xE2,0xF2),      o2(0xCF,0xF2),
-          o2(0xF7,0xB9),      o2(0xD9,0xF3),
-          o2(0xE1,0xCB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_15 = {
-    to_EUC_KR_E8_15_offsets,
-    to_EUC_KR_E8_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_16_offsets[64] = {
-     13, 13, 13, 13,  0, 13, 13,  1,     13, 13, 13, 13, 13, 13, 13,  2,
-     13,  3, 13, 13,  4, 13, 13, 13,     13, 13, 13,  5, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13,  6, 13,      7,  8,  9, 13, 13, 13, 13, 10,
-     11, 13, 13, 13, 13, 13, 13, 13,     13, 13, 12, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_16_infos[14] = {
-          o2(0xDA,0xDD),      o2(0xDA,0xB9),
-          o2(0xEB,0xFB),      o2(0xCB,0xB9),
-          o2(0xED,0xF9),      o2(0xE0,0xE0),
-          o2(0xF4,0xC0),      o2(0xFD,0xBC),
-          o2(0xDF,0xB1),      o2(0xE3,0xEF),
-          o2(0xE0,0xA3),      o2(0xFD,0xB9),
-          o2(0xF0,0xB1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_16 = {
-    to_EUC_KR_E8_16_offsets,
-    to_EUC_KR_E8_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_17_offsets[64] = {
-     16,  0, 16, 16, 16, 16, 16, 16,     16,  1, 16, 16, 16,  2,  3,  4,
-     16, 16, 16, 16, 16,  5, 16, 16,     16, 16, 16, 16,  6,  7, 16, 16,
-     16, 16, 16, 16,  8,  9, 16, 16,     16, 10, 11, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 12,     16, 16, 13, 14, 16, 16, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_17_infos[17] = {
-          o2(0xCD,0xCB),      o2(0xED,0xBE),
-          o2(0xD5,0xC0),      o2(0xE3,0xF0),
-          o2(0xED,0xFA),      o2(0xE9,0xE4),
-          o2(0xD5,0xED),      o2(0xE7,0xDD),
-          o2(0xD4,0xF6),      o2(0xE5,0xB7),
-          o2(0xDB,0xE7),      o2(0xE2,0xBF),
-          o2(0xEE,0xCB),      o2(0xD7,0xF4),
-          o2(0xF0,0xDD),      o2(0xCE,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_17 = {
-    to_EUC_KR_E8_17_offsets,
-    to_EUC_KR_E8_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_18_offsets[64] = {
-      9,  9,  0,  9,  9,  9,  1,  2,      9,  9,  3,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  4,  5,      9,  9,  6,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  7,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_18_infos[10] = {
-          o2(0xE7,0xDE),      o2(0xD6,0xD6),
-          o2(0xE1,0xCC),      o2(0xE8,0xB3),
-          o2(0xE5,0xEE),      o2(0xDC,0xA2),
-          o2(0xE0,0xD0),      o2(0xD5,0xB5),
-          o2(0xD5,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_18 = {
-    to_EUC_KR_E8_18_offsets,
-    to_EUC_KR_E8_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_19_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10,  0, 10,
-      1, 10, 10, 10,  2,  3, 10, 10,     10, 10, 10,  4,  5, 10,  6,  7,
-     10, 10, 10, 10, 10, 10, 10,  8,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10,  9, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_19_infos[11] = {
-          o2(0xFB,0xDB),      o2(0xF9,0xCB),
-          o2(0xCB,0xF3),      o2(0xF4,0xA5),
-          o2(0xFA,0xC8),      o2(0xD6,0xD7),
-          o2(0xE9,0xE5),      o2(0xFB,0xDC),
-          o2(0xFD,0xD0),      o2(0xFB,0xF6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_19 = {
-    to_EUC_KR_E8_19_offsets,
-    to_EUC_KR_E8_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1A_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  0,  6,  1,  6,  6,  6,
-      6,  6,  6,  2,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  3,  4,  6,  6,  6,      6,  5,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1A_infos[7] = {
-          o2(0xDA,0xA5),      o2(0xDB,0xBD),
-          o2(0xEC,0xE2),      o2(0xCD,0xF7),
-          o2(0xF0,0xDE),      o2(0xF6,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1A = {
-    to_EUC_KR_E8_1A_offsets,
-    to_EUC_KR_E8_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1B_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  0,      9,  9,  9,  1,  9,  9,  9,  9,
-      9,  9,  9,  9,  2,  9,  9,  9,      9,  3,  9,  4,  9,  9,  9,  5,
-      9,  9,  9,  9,  6,  9,  9,  9,      9,  9,  9,  9,  9,  7,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  8,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1B_infos[10] = {
-          o2(0xDE,0xEF),      o2(0xD3,0xB1),
-          o2(0xFC,0xEE),      o2(0xE8,0xC3),
-          o2(0xF1,0xC8),      o2(0xCE,0xF1),
-          o2(0xF9,0xED),      o2(0xF2,0xF4),
-          o2(0xE4,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1B = {
-    to_EUC_KR_E8_1B_offsets,
-    to_EUC_KR_E8_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1C_offsets[64] = {
-      0,  7,  1,  2,  7,  7,  7,  7,      3,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      4,  7,  5,  7,  6,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1C_infos[8] = {
-          o2(0xF5,0xB9),      o2(0xDC,0xF0),
-          o2(0xE3,0xF1),      o2(0xE8,0xA5),
-          o2(0xF2,0xBB),      o2(0xDE,0xA4),
-          o2(0xDA,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1C = {
-    to_EUC_KR_E8_1C_offsets,
-    to_EUC_KR_E8_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1D_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  0,  9,
-      9,  9,  9,  9,  9,  1,  9,  2,      9,  9,  9,  9,  9,  9,  9,  3,
-      9,  9,  9,  9,  9,  9,  4,  9,      5,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  6,  9,  7,  9,      8,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1D_infos[10] = {
-          o2(0xCA,0xE9),      o2(0xE3,0xDA),
-          o2(0xFC,0xD9),      o2(0xEA,0xDA),
-          o2(0xF9,0xC4),      o2(0xE3,0xA4),
-          o2(0xFB,0xDD),      o2(0xEF,0xCA),
-          o2(0xE8,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1D = {
-    to_EUC_KR_E8_1D_offsets,
-    to_EUC_KR_E8_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1E_offsets[64] = {
-      6,  6,  0,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  1,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  2,
-      6,  6,  3,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  4,  6,  6,  6,  6,      6,  6,  5,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1E_infos[7] = {
-          o2(0xD5,0xCC),      o2(0xEB,0xD7),
-          o2(0xD9,0xAD),      o2(0xFB,0xAB),
-          o2(0xD3,0xD9),      o2(0xD5,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1E = {
-    to_EUC_KR_E8_1E_offsets,
-    to_EUC_KR_E8_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_1F_offsets[64] = {
-      8,  8,  8,  8,  0,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      1,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  2,  8,  8,  3,
-      8,  8,  4,  8,  8,  8,  8,  8,      8,  5,  8,  6,  8,  8,  7,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_1F_infos[9] = {
-          o2(0xF6,0xDE),      o2(0xDA,0xF6),
-          o2(0xE0,0xD1),      o2(0xE9,0xA8),
-          o2(0xF5,0xF9),      o2(0xFA,0xAF),
-          o2(0xEB,0xFC),      o2(0xE0,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_1F = {
-    to_EUC_KR_E8_1F_offsets,
-    to_EUC_KR_E8_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_20_offsets[64] = {
-      7,  7,  7,  7,  7,  0,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  1,
-      7,  7,  2,  3,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  4,  7,  7,  7,  7,  5,  7,      7,  7,  7,  6,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_20_infos[8] = {
-          o2(0xE3,0xB2),      o2(0xD5,0xC5),
-          o2(0xF1,0xE3),      o2(0xD5,0xEE),
-          o2(0xCD,0xCC),      o2(0xED,0xD9),
-          o2(0xD8,0xC1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_20 = {
-    to_EUC_KR_E8_20_offsets,
-    to_EUC_KR_E8_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_21_offsets[64] = {
-      0, 20, 20, 20, 20, 20,  1, 20,     20, 20, 20, 20,  2,  3, 20, 20,
-     20, 20,  4,  5, 20, 20, 20,  6,     20,  7, 20,  8, 20,  9, 20, 20,
-     20, 10, 11, 12, 20, 20, 20, 20,     13, 20, 20, 14, 20, 20, 20, 20,
-     15, 20, 16, 20, 20, 20, 20, 17,     20, 20, 20, 20, 20, 20, 18, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_21_infos[21] = {
-          o2(0xFA,0xEC),      o2(0xF1,0xEB),
-          o2(0xFA,0xBC),      o2(0xE6,0xE2),
-          o2(0xFA,0xE5),      o2(0xE2,0xFA),
-          o2(0xCA,0xB6),      o2(0xE4,0xB7),
-          o2(0xEA,0xDB),      o2(0xF5,0xFA),
-          o2(0xFB,0xAC),      o2(0xCF,0xC3),
-          o2(0xEB,0xFD),      o2(0xF8,0xFA),
-          o2(0xDF,0xB9),      o2(0xE1,0xF1),
-          o2(0xD2,0xA4),      o2(0xF5,0xFB),
-          o2(0xD0,0xDA),      o2(0xD0,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_21 = {
-    to_EUC_KR_E8_21_offsets,
-    to_EUC_KR_E8_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_22_offsets[64] = {
-     11,  0,  1, 11, 11, 11, 11, 11,      2, 11, 11,  3, 11,  4, 11, 11,
-     11, 11,  5, 11, 11, 11,  6,  7,     11, 11, 11, 11, 11, 11,  8, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11,  9, 11, 11, 11, 11,
-     11, 11, 11, 11, 10, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_22_infos[12] = {
-          o2(0xEA,0xBE),      o2(0xD9,0xB1),
-          o2(0xCA,0xB7),      o2(0xD3,0xE7),
-          o2(0xF8,0xE5),      o2(0xD3,0xB2),
-          o2(0xE2,0xC0),      o2(0xF2,0xDF),
-          o2(0xCD,0xE5),      o2(0xF9,0xAC),
-          o2(0xCD,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_22 = {
-    to_EUC_KR_E8_22_offsets,
-    to_EUC_KR_E8_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_23_offsets[64] = {
-     16,  0,  1, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16,  2,
-     16, 16, 16, 16,  3,  4, 16, 16,     16,  5, 16, 16,  6,  7, 16,  8,
-     16,  9, 16, 16, 16, 16, 16, 16,     10, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 11, 12, 13, 16, 16,     14, 16, 16, 16, 16, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_23_infos[17] = {
-          o2(0xEE,0xAE),      o2(0xD6,0xAE),
-          o2(0xD7,0xEA),      o2(0xE7,0xE0),
-          o2(0xEB,0xAE),      o2(0xCF,0xD9),
-          o2(0xDC,0xCD),      o2(0xED,0xFB),
-          o2(0xDE,0xF0),      o2(0xD7,0xEB),
-          o2(0xDE,0xA5),      o2(0xDF,0xD7),
-          o2(0xDB,0xD0),      o2(0xDB,0xD1),
-          o2(0xD5,0xA3),      o2(0xF0,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_23 = {
-    to_EUC_KR_E8_23_offsets,
-    to_EUC_KR_E8_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_24_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11,  0,     11, 11, 11, 11, 11, 11, 11, 11,
-      1, 11,  2,  3, 11, 11, 11, 11,      4,  5, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11,  6, 11, 11,     11, 11,  7, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11,  8, 11,      9, 11, 11, 10, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_24_infos[12] = {
-          o2(0xDC,0xDC),      o2(0xCA,0xE8),
-          o2(0xF8,0xE6),      o2(0xDC,0xCE),
-          o2(0xEA,0xDC),      o2(0xDB,0xD2),
-          o2(0xE9,0xB3),      o2(0xF7,0xDB),
-          o2(0xE3,0xA8),      o2(0xD7,0xAE),
-          o2(0xE0,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_24 = {
-    to_EUC_KR_E8_24_offsets,
-    to_EUC_KR_E8_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_25_offsets[64] = {
-      7,  0,  7,  7,  1,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  2,
-      7,  7,  7,  7,  3,  7,  7,  7,      7,  7,  4,  7,  7,  7,  7,  7,
-      7,  7,  5,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_25_infos[8] = {
-          o2(0xCB,0xBA),      o2(0xE5,0xD1),
-          o2(0xD0,0xDC),      o2(0xD5,0xC1),
-          o2(0xD8,0xCA),      o2(0xE3,0xA9),
-          o2(0xE0,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_25 = {
-    to_EUC_KR_E8_25_offsets,
-    to_EUC_KR_E8_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_26_offsets[64] = {
-     14,  0, 14,  1, 14, 14,  2,  3,     14, 14, 14,  4, 14, 14, 14,  5,
-     14, 14, 14,  6, 14, 14,  7, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14,  8, 14, 14, 14, 14, 14, 14,     14,  9, 10, 14, 14, 14, 14, 14,
-     14, 14, 11, 14, 14, 14, 14, 14,     14, 14, 12, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_26_infos[15] = {
-          o2(0xE9,0xA9),      o2(0xD3,0xC7),
-          o2(0xDC,0xDD),      o2(0xF8,0xAE),
-          o2(0xCC,0xB8),      o2(0xD0,0xAE),
-          o2(0xD8,0xF2),      o2(0xE3,0xCA),
-          o2(0xCC,0xAF),      o2(0xD4,0xAD),
-          o2(0xF6,0xD1),      o2(0xD0,0xCC),
-          o2(0xCA,0xC6),      o2(0xD5,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_26 = {
-    to_EUC_KR_E8_26_offsets,
-    to_EUC_KR_E8_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_27_offsets[64] = {
-      0,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  1,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  2,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  3,  5,  5,  5,      4,  5,  5,  5,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_27_infos[6] = {
-          o2(0xCE,0xBA),      o2(0xCA,0xC7),
-          o2(0xFA,0xB0),      o2(0xDF,0xD8),
-          o2(0xF5,0xBA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_27 = {
-    to_EUC_KR_E8_27_offsets,
-    to_EUC_KR_E8_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_28_offsets[64] = {
-      0, 23,  1,  2, 23, 23, 23, 23,      3, 23,  4, 23,  5, 23,  6, 23,
-     23, 23, 23,  7, 23, 23,  8,  9,     10, 23, 23, 11, 23, 12, 23, 13,
-     23, 23, 23, 14, 23, 15, 23, 23,     23, 23, 16, 23, 23, 17, 23, 23,
-     23, 18, 23, 23, 19, 23, 20, 23,     23, 23, 21, 22, 23, 23, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_28_infos[24] = {
-          o2(0xE5,0xEB),      o2(0xEF,0xF4),
-          o2(0xDD,0xB5),      o2(0xCD,0xAA),
-          o2(0xE3,0xF2),      o2(0xFB,0xF7),
-          o2(0xF7,0xD0),      o2(0xFD,0xBA),
-          o2(0xFD,0xE1),      o2(0xF6,0xFE),
-          o2(0xD1,0xC0),      o2(0xE8,0xC5),
-          o2(0xE4,0xB8),      o2(0xE1,0xE8),
-          o2(0xCC,0xC1),      o2(0xD2,0xED),
-          o2(0xDB,0xBE),      o2(0xE0,0xE2),
-          o2(0xFA,0xC9),      o2(0xE1,0xCD),
-          o2(0xCA,0xB8),      o2(0xF2,0xE0),
-          o2(0xF1,0xC9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_28 = {
-    to_EUC_KR_E8_28_offsets,
-    to_EUC_KR_E8_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_29_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18, 18,
-      0, 18, 18, 18,  1,  2, 18, 18,     18, 18, 18,  3, 18, 18,  4, 18,
-      5, 18,  6,  7, 18, 18,  8, 18,     18,  9, 18, 18, 18, 10, 11, 18,
-     12, 13, 14, 15, 18, 16, 18, 18,     18, 17, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_29_infos[19] = {
-          o2(0xDE,0xF1),      o2(0xF0,0xDF),
-          o2(0xF8,0xC4),      o2(0xEE,0xCC),
-          o2(0xDE,0xF2),      o2(0xE7,0xC9),
-          o2(0xE2,0xF3),      o2(0xE7,0xE1),
-          o2(0xE3,0xCB),      o2(0xE3,0xCC),
-          o2(0xCF,0xF8),      o2(0xEF,0xAC),
-          o2(0xFD,0xFE),      o2(0xFC,0xA5),
-          o2(0xFA,0xB1),      o2(0xDF,0xD9),
-          o2(0xE0,0xD2),      o2(0xF4,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_29 = {
-    to_EUC_KR_E8_29_offsets,
-    to_EUC_KR_E8_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_2A_offsets[64] = {
-     22, 22, 22, 22, 22,  0, 22,  1,     22, 22, 22, 22,  2,  3, 22, 22,
-     22, 22, 22,  4, 22,  5, 22, 22,      6, 22, 22, 22, 22, 22,  7, 22,
-      8,  9, 22, 10, 11, 12, 13, 22,     14, 22, 15, 22, 22, 22, 22, 22,
-     16, 22, 17, 22, 22, 22, 22, 22,     22, 18, 22, 22, 19, 22, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_2A_infos[23] = {
-          o2(0xF1,0xCA),      o2(0xCE,0xA3),
-          o2(0xF2,0xBC),      o2(0xEC,0xE3),
-          o2(0xE0,0xA5),      o2(0xF7,0xAB),
-          o2(0xEB,0xAF),      o2(0xE5,0xDE),
-          o2(0xE1,0xA4),      o2(0xCD,0xAB),
-          o2(0xD9,0xF4),      o2(0xE8,0xA6),
-          o2(0xCD,0xCE),      o2(0xE1,0xE9),
-          o2(0xFC,0xEF),      o2(0xE0,0xE3),
-          o2(0xE2,0xC1),      o2(0xCE,0xA4),
-          o2(0xDE,0xA6),      o2(0xEB,0xFE),
-          o2(0xEB,0xDD),      o2(0xF0,0xE0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_2A = {
-    to_EUC_KR_E8_2A_offsets,
-    to_EUC_KR_E8_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_2B_offsets[64] = {
-     23, 23,  0, 23,  1, 23, 23,  2,     23, 23, 23,  3, 23,  4, 23,  5,
-     23, 23,  6, 23, 23, 23,  7, 23,     23, 23, 23,  8,  9, 23, 23, 23,
-     23, 10, 23, 23, 23, 23, 11, 12,     23, 23, 13, 14, 23, 15, 16, 23,
-     23, 17, 23, 23, 23, 23, 18, 19,     20, 23, 21, 23, 23, 23, 22, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_2B_infos[24] = {
-          o2(0xF4,0xDB),      o2(0xE2,0xF4),
-          o2(0xD3,0xC8),      o2(0xF4,0xEB),
-          o2(0xEE,0xB5),      o2(0xF5,0xD8),
-          o2(0xD5,0xDF),      o2(0xD6,0xE5),
-          o2(0xEB,0xB0),      o2(0xF4,0xE3),
-          o2(0xE3,0xCD),      o2(0xF4,0xF4),
-          o2(0xFA,0xB2),      o2(0xEF,0xF5),
-          o2(0xCA,0xDF),      o2(0xEB,0xB1),
-          o2(0xED,0xBF),      o2(0xFD,0xC9),
-          o2(0xE4,0xA6),      o2(0xF9,0xA4),
-          o2(0xF0,0xB3),      o2(0xE5,0xEC),
-          o2(0xD1,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_2B = {
-    to_EUC_KR_E8_2B_offsets,
-    to_EUC_KR_E8_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_2C_offsets[64] = {
-      0,  1,  2, 19,  3, 19, 19, 19,     19, 19, 19, 19, 19, 19,  4, 19,
-      5, 19, 19, 19,  6, 19,  7,  8,     19,  9, 10, 11, 19, 12, 19, 19,
-     13, 19, 19, 19, 19, 19, 19, 19,     14, 19, 19, 15, 16, 19, 19, 19,
-     19, 19, 19, 17, 19, 19, 19, 19,     19, 18, 19, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_2C_infos[20] = {
-          o2(0xD9,0xC7),      o2(0xE4,0xD7),
-          o2(0xEA,0xDD),      o2(0xD4,0xF7),
-          o2(0xDA,0xBA),      o2(0xDA,0xCD),
-          o2(0xF9,0xCC),      o2(0xE1,0xDA),
-          o2(0xDB,0xBF),      o2(0xCC,0xC5),
-          o2(0xEC,0xD0),      o2(0xCB,0xBB),
-          o2(0xDE,0xF3),      o2(0xE9,0xAA),
-          o2(0xD9,0xC8),      o2(0xEE,0xE3),
-          o2(0xD7,0xBD),      o2(0xCF,0xC4),
-          o2(0xD0,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_2C = {
-    to_EUC_KR_E8_2C_offsets,
-    to_EUC_KR_E8_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_2D_offsets[64] = {
-     14,  0, 14, 14, 14, 14, 14, 14,     14,  1, 14, 14, 14, 14,  2,  3,
-     14, 14, 14, 14, 14, 14, 14, 14,      4, 14,  5, 14,  6, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,  7, 14,     14, 14, 14, 14,  8, 14, 14,  9,
-     10, 14, 14, 14, 11, 14, 14, 12,     14, 14, 14, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_2D_infos[15] = {
-          o2(0xFC,0xA6),      o2(0xF1,0xFB),
-          o2(0xFD,0xD2),      o2(0xD1,0xC1),
-          o2(0xE3,0xDB),      o2(0xD3,0xC9),
-          o2(0xDC,0xCF),      o2(0xCC,0xED),
-          o2(0xDE,0xA7),      o2(0xE6,0xBB),
-          o2(0xEC,0xA1),      o2(0xCC,0xB9),
-          o2(0xFB,0xDE),      o2(0xE7,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_2D = {
-    to_EUC_KR_E8_2D_offsets,
-    to_EUC_KR_E8_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_2E_offsets[64] = {
-      0,  7,  7,  7,  7,  7,  7,  7,      7,  7,  1,  7,  7,  7,  7,  7,
-      2,  7,  3,  4,  7,  7,  5,  7,      7,  7,  6,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_2E_infos[8] = {
-          o2(0xD4,0xC1),      o2(0xDC,0xA8),
-          o2(0xE2,0xC2),      o2(0xF3,0xD8),
-          o2(0xE5,0xD3),      o2(0xF3,0xD9),
-          o2(0xF3,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_2E = {
-    to_EUC_KR_E8_2E_offsets,
-    to_EUC_KR_E8_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_30_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  0,      2,  2,  2,  2,  2,  2,  2,  1,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_30_infos[3] = {
-          o2(0xCD,0xDB),      o2(0xCD,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_30 = {
-    to_EUC_KR_E8_30_offsets,
-    to_EUC_KR_E8_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_31_offsets[64] = {
-     12,  0, 12, 12, 12, 12,  1, 12,      2, 12,  3, 12,  4, 12, 12, 12,
-     12, 12, 12, 12, 12,  5, 12, 12,     12, 12,  6, 12, 12, 12, 12, 12,
-     12,  7, 12, 12, 12, 12, 12, 12,     12, 12,  8,  9, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 10, 11, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_31_infos[13] = {
-          o2(0xFC,0xC3),      o2(0xD4,0xE7),
-          o2(0xD1,0xC2),      o2(0xF9,0xA5),
-          o2(0xE8,0xD5),      o2(0xE3,0xCE),
-          o2(0xD4,0xCA),      o2(0xDF,0xDA),
-          o2(0xFB,0xDF),      o2(0xE7,0xE3),
-          o2(0xF8,0xFB),      o2(0xE3,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_31 = {
-    to_EUC_KR_E8_31_offsets,
-    to_EUC_KR_E8_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_32_offsets[64] = {
-     25, 25,  0, 25, 25, 25, 25, 25,     25, 25,  1, 25,  2, 25, 25, 25,
-     25, 25, 25, 25, 25, 25, 25, 25,     25, 25, 25, 25, 25,  3,  4, 25,
-      5,  6,  7, 25, 25, 25, 25,  8,      9, 10, 11, 12, 13, 25, 25, 14,
-     15, 25, 25, 16, 17, 25, 18, 19,     20, 25, 25, 21, 22, 23, 25, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_32_infos[26] = {
-          o2(0xF5,0xB0),      o2(0xD8,0xE7),
-          o2(0xD9,0xC9),      o2(0xF8,0xAF),
-          o2(0xEF,0xF6),      o2(0xDD,0xB6),
-          o2(0xEE,0xAF),      o2(0xCD,0xF8),
-          o2(0xDE,0xB8),      o2(0xFC,0xA7),
-          o2(0xF7,0xFC),      o2(0xF7,0xB1),
-          o2(0xCE,0xBB),      o2(0xF4,0xA1),
-          o2(0xEE,0xCD),      o2(0xE1,0xAE),
-          o2(0xEC,0xC3),      o2(0xCF,0xFE),
-          o2(0xF8,0xBF),      o2(0xD8,0xE2),
-          o2(0xD3,0xE8),      o2(0xDE,0xA8),
-          o2(0xF4,0xE4),      o2(0xEC,0xC2),
-          o2(0xD9,0xF5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_32 = {
-    to_EUC_KR_E8_32_offsets,
-    to_EUC_KR_E8_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_33_offsets[64] = {
-      0,  1,  2,  3,  4, 24, 24,  5,      6, 24,  7, 24, 24, 24, 24, 24,
-     24,  8, 24,  9, 24, 24, 24, 24,     24, 24, 10, 24, 11, 24, 12, 24,
-     13, 24, 14, 15, 16, 24, 17, 24,     24, 24, 18, 24, 24, 19, 24, 24,
-     24, 24, 24, 24, 20, 24, 24, 24,     24, 24, 24, 21, 22, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_33_infos[25] = {
-          o2(0xF9,0xC5),      o2(0xDD,0xD3),
-          o2(0xD6,0xF1),      o2(0xEC,0xFC),
-          o2(0xFC,0xF0),      o2(0xED,0xC0),
-          o2(0xCA,0xB9),      o2(0xEE,0xE4),
-          o2(0xF2,0xE1),      o2(0xDE,0xB9),
-          o2(0xD6,0xF2),      o2(0xDE,0xF4),
-          o2(0xDF,0xDB),      o2(0xDB,0xD3),
-          o2(0xFA,0xE7),      o2(0xD8,0xE3),
-          o2(0xF4,0xC1),      o2(0xDD,0xB7),
-          o2(0xF2,0xF5),      o2(0xD4,0xAE),
-          o2(0xD6,0xF3),      o2(0xDD,0xB8),
-          o2(0xCF,0xC5),      o2(0xDF,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_33 = {
-    to_EUC_KR_E8_33_offsets,
-    to_EUC_KR_E8_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_34_offsets[64] = {
-      8,  8,  8,  8,  0,  1,  8,  2,      3,  8,  4,  8,  8,  5,  8,  8,
-      8,  8,  8,  6,  8,  8,  7,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_34_infos[9] = {
-          o2(0xF2,0xBE),      o2(0xF6,0xA1),
-          o2(0xEB,0xCB),      o2(0xF1,0xFC),
-          o2(0xF3,0xC7),      o2(0xE0,0xEB),
-          o2(0xED,0xFC),      o2(0xE1,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_34 = {
-    to_EUC_KR_E8_34_offsets,
-    to_EUC_KR_E8_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_35_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  0,  7,  1,  7,      7,  7,  7,  2,  7,  7,  7,  7,
-      3,  7,  7,  4,  5,  7,  7,  6,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_35_infos[8] = {
-          o2(0xEE,0xE5),      o2(0xDE,0xF5),
-          o2(0xFA,0xD3),      o2(0xF1,0xCB),
-          o2(0xD0,0xAF),      o2(0xDD,0xB9),
-          o2(0xD1,0xC3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_35 = {
-    to_EUC_KR_E8_35_offsets,
-    to_EUC_KR_E8_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_36_offsets[64] = {
-      8,  8,  8,  8,  8,  0,  8,  8,      8,  8,  1,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  2,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  3,  8,  8,  8,  8,      4,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  5,  8,  8,  8,  8,      8,  8,  6,  8,  8,  8,  7,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_36_infos[9] = {
-          o2(0xF5,0xB1),      o2(0xEA,0xC6),
-          o2(0xF0,0xE1),      o2(0xF6,0xAC),
-          o2(0xF5,0xD9),      o2(0xF0,0xEB),
-          o2(0xDD,0xBA),      o2(0xF2,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_36 = {
-    to_EUC_KR_E8_36_offsets,
-    to_EUC_KR_E8_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_37_offsets[64] = {
-     11, 11, 11, 11, 11, 11,  0, 11,     11, 11, 11,  1,  2, 11, 11,  3,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11,  4, 11,  5, 11, 11,
-     11,  6, 11,  7, 11, 11, 11, 11,      8, 11, 11, 11, 11, 11, 11,  9,
-     11, 11, 11, 10, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_37_infos[12] = {
-          o2(0xF7,0xC5),      o2(0xDB,0xA2),
-          o2(0xF2,0xF6),      o2(0xCA,0xBA),
-          o2(0xF7,0xF5),      o2(0xCB,0xE5),
-          o2(0xEE,0xE6),      o2(0xE0,0xD3),
-          o2(0xCE,0xA5),      o2(0xD6,0xD8),
-          o2(0xD4,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_37 = {
-    to_EUC_KR_E8_37_offsets,
-    to_EUC_KR_E8_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_38_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  0,  7,  7,  7,  7,  1,
-      2,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  3,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  4,  7,  7,  7,  7,  7,
-      5,  7,  7,  7,  7,  6,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_38_infos[8] = {
-          o2(0xE9,0xC9),      o2(0xD3,0xCE),
-          o2(0xF4,0xC2),      o2(0xCB,0xE6),
-          o2(0xF1,0xA1),      o2(0xEB,0xB2),
-          o2(0xF1,0xA2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_38 = {
-    to_EUC_KR_E8_38_offsets,
-    to_EUC_KR_E8_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_39_offsets[64] = {
-     11, 11,  0, 11,  1, 11, 11,  2,      3,  4,  5, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11,  6, 11, 11, 11, 11, 11,  7,
-      8, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11,  9, 11, 10, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_39_infos[12] = {
-          o2(0xEB,0xB3),      o2(0xF0,0xB4),
-          o2(0xCB,0xF4),      o2(0xD4,0xB0),
-          o2(0xF3,0xB2),      o2(0xFB,0xB7),
-          o2(0xF5,0xEC),      o2(0xEE,0xE7),
-          o2(0xF4,0xB2),      o2(0xF5,0xED),
-          o2(0xCF,0xF3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_39 = {
-    to_EUC_KR_E8_39_offsets,
-    to_EUC_KR_E8_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3A_offsets[64] = {
-      7,  0,  7,  7,  7,  7,  7,  1,      7,  7,  2,  7,  7,  3,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  4,  5,  6,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3A_infos[8] = {
-          o2(0xF0,0xE2),      o2(0xEE,0xCE),
-          o2(0xF1,0xCC),      o2(0xE5,0xB8),
-          o2(0xD7,0xF5),      o2(0xE3,0xF3),
-          o2(0xCF,0xE5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3A = {
-    to_EUC_KR_E8_3A_offsets,
-    to_EUC_KR_E8_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3B_offsets[64] = {
-      0, 11, 11, 11, 11, 11, 11, 11,     11, 11,  1,  2,  3,  4, 11, 11,
-     11, 11,  5, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11,  6,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11,  7, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      8, 11, 11,  9, 11, 11, 10, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3B_infos[12] = {
-          o2(0xCF,0xC6),      o2(0xF3,0xB3),
-          o2(0xE4,0xD8),      o2(0xCF,0xF9),
-          o2(0xCF,0xDA),      o2(0xFA,0xCD),
-          o2(0xE6,0xE3),      o2(0xF2,0xE2),
-          o2(0xF5,0xEE),      o2(0xCA,0xBB),
-          o2(0xE3,0xDC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3B = {
-    to_EUC_KR_E8_3B_offsets,
-    to_EUC_KR_E8_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3C_offsets[64] = {
-     23, 23, 23,  0, 23,  1, 23, 23,     23,  2, 23, 23, 23, 23, 23, 23,
-     23, 23,  3,  4,  5,  6, 23, 23,     23, 23, 23,  7,  8,  9, 10, 11,
-     23, 23, 23, 23, 23, 23, 12, 13,     23, 14, 15, 23, 23, 23, 23, 16,
-     23, 23, 23, 17, 23, 23, 23, 23,     18, 19, 23, 20, 23, 23, 21, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3C_infos[24] = {
-          o2(0xCE,0xF2),      o2(0xD6,0xD9),
-          o2(0xEE,0xB0),      o2(0xF4,0xE5),
-          o2(0xD8,0xC2),      o2(0xDC,0xD0),
-          o2(0xCC,0xEE),      o2(0xD5,0xE0),
-          o2(0xF6,0xCA),      o2(0xFD,0xCA),
-          o2(0xD8,0xD6),      o2(0xF4,0xCF),
-          o2(0xD6,0xA6),      o2(0xDC,0xBE),
-          o2(0xDB,0xD4),      o2(0xD7,0xC7),
-          o2(0xF2,0xFE),      o2(0xF1,0xCD),
-          o2(0xE2,0xC3),      o2(0xDC,0xDE),
-          o2(0xDC,0xDF),      o2(0xEF,0xAD),
-          o2(0xE6,0xAB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3C = {
-    to_EUC_KR_E8_3C_offsets,
-    to_EUC_KR_E8_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3D_offsets[64] = {
-      8,  8,  8,  8,  0,  1,  8,  8,      8,  2,  8,  8,  8,  3,  4,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  5,  8,  6,
-      8,  8,  7,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3D_infos[9] = {
-          o2(0xF9,0xDD),      o2(0xEA,0xBF),
-          o2(0xEF,0xAE),      o2(0xF4,0xD0),
-          o2(0xCE,0xF3),      o2(0xE6,0xAC),
-          o2(0xCE,0xDE),      o2(0xD5,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3D = {
-    to_EUC_KR_E8_3D_offsets,
-    to_EUC_KR_E8_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3E_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10,  0,  1, 10, 10, 10,
-     10, 10, 10,  2, 10, 10,  3, 10,      4, 10, 10, 10, 10,  5, 10,  6,
-      7,  8,  9, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3E_infos[11] = {
-          o2(0xE3,0xF4),      o2(0xCD,0xD0),
-          o2(0xD5,0xB8),      o2(0xF7,0xFD),
-          o2(0xDC,0xA9),      o2(0xDE,0xF6),
-          o2(0xDC,0xAA),      o2(0xF2,0xE3),
-          o2(0xE9,0xB4),      o2(0xD2,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3E = {
-    to_EUC_KR_E8_3E_offsets,
-    to_EUC_KR_E8_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_3F_offsets[64] = {
-     14, 14,  0, 14, 14,  1, 14, 14,     14, 14, 14, 14, 14, 14,  2, 14,
-     14,  3, 14, 14,  4, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14,  5, 14,     14, 14,  6,  7, 14,  8, 14, 14,
-      9, 14, 10, 14, 14, 14, 14, 11,     14, 12, 14, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_3F_infos[15] = {
-          o2(0xE9,0xE6),      o2(0xE3,0xF6),
-          o2(0xE7,0xCA),      o2(0xD0,0xCE),
-          o2(0xDA,0xF7),      o2(0xCA,0xBC),
-          o2(0xEE,0xE8),      o2(0xDA,0xDE),
-          o2(0xF2,0xF7),      o2(0xE2,0xFB),
-          o2(0xCC,0xA6),      o2(0xDA,0xBB),
-          o2(0xEE,0xE9),      o2(0xF5,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8_3F = {
-    to_EUC_KR_E8_3F_offsets,
-    to_EUC_KR_E8_3F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E8_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 63,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E8_infos[64] = {
-       &to_EUC_KR_E8_00,   &to_EUC_KR_E8_01,
-       &to_EUC_KR_E8_02,   &to_EUC_KR_E8_03,
-       &to_EUC_KR_E8_04,   &to_EUC_KR_E8_05,
-       &to_EUC_KR_E8_06,   &to_EUC_KR_E8_07,
-       &to_EUC_KR_E8_08,   &to_EUC_KR_E8_09,
-       &to_EUC_KR_E8_0A,   &to_EUC_KR_E8_0B,
-       &to_EUC_KR_E8_0C,   &to_EUC_KR_E8_0D,
-       &to_EUC_KR_E8_0E,   &to_EUC_KR_E8_0F,
-       &to_EUC_KR_E8_10,   &to_EUC_KR_E8_11,
-       &to_EUC_KR_E8_12,   &to_EUC_KR_E8_13,
-       &to_EUC_KR_E8_14,   &to_EUC_KR_E8_15,
-       &to_EUC_KR_E8_16,   &to_EUC_KR_E8_17,
-       &to_EUC_KR_E8_18,   &to_EUC_KR_E8_19,
-       &to_EUC_KR_E8_1A,   &to_EUC_KR_E8_1B,
-       &to_EUC_KR_E8_1C,   &to_EUC_KR_E8_1D,
-       &to_EUC_KR_E8_1E,   &to_EUC_KR_E8_1F,
-       &to_EUC_KR_E8_20,   &to_EUC_KR_E8_21,
-       &to_EUC_KR_E8_22,   &to_EUC_KR_E8_23,
-       &to_EUC_KR_E8_24,   &to_EUC_KR_E8_25,
-       &to_EUC_KR_E8_26,   &to_EUC_KR_E8_27,
-       &to_EUC_KR_E8_28,   &to_EUC_KR_E8_29,
-       &to_EUC_KR_E8_2A,   &to_EUC_KR_E8_2B,
-       &to_EUC_KR_E8_2C,   &to_EUC_KR_E8_2D,
-       &to_EUC_KR_E8_2E,   &to_EUC_KR_E8_30,
-       &to_EUC_KR_E8_31,   &to_EUC_KR_E8_32,
-       &to_EUC_KR_E8_33,   &to_EUC_KR_E8_34,
-       &to_EUC_KR_E8_35,   &to_EUC_KR_E8_36,
-       &to_EUC_KR_E8_37,   &to_EUC_KR_E8_38,
-       &to_EUC_KR_E8_39,   &to_EUC_KR_E8_3A,
-       &to_EUC_KR_E8_3B,   &to_EUC_KR_E8_3C,
-       &to_EUC_KR_E8_3D,   &to_EUC_KR_E8_3E,
-       &to_EUC_KR_E8_3F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E8 = {
-    to_EUC_KR_E8_offsets,
-    to_EUC_KR_E8_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_00_offsets[64] = {
-      0,  1,  2,  3, 31,  4,  5, 31,      6, 31, 31,  7, 31,  8, 31,  9,
-     10, 11, 31, 31, 12, 13, 31, 14,     31, 15, 16, 31, 31, 17, 18, 19,
-     20, 21, 22, 23, 31, 31, 31, 31,     31, 31, 31, 31, 31, 31, 24, 31,
-     31, 25, 26, 31, 31, 27, 31, 31,     28, 31, 31, 31, 29, 31, 30, 31,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_00_infos[32] = {
-          o2(0xF7,0xDC),      o2(0xE1,0xEA),
-          o2(0xCE,0xC1),      o2(0xD4,0xB1),
-          o2(0xFD,0xB1),      o2(0xE6,0xBD),
-          o2(0xFB,0xAD),      o2(0xF8,0xE7),
-          o2(0xE1,0xCE),      o2(0xF7,0xE2),
-          o2(0xF5,0xEF),      o2(0xCF,0xC7),
-          o2(0xD4,0xB2),      o2(0xCC,0xEF),
-          o2(0xD4,0xE8),      o2(0xEE,0xCF),
-          o2(0xF7,0xD7),      o2(0xE0,0xA6),
-          o2(0xD6,0xC1),      o2(0xE1,0xDC),
-          o2(0xF0,0xE3),      o2(0xF1,0xE4),
-          o2(0xDC,0xF1),      o2(0xD6,0xA7),
-          o2(0xF4,0xF5),      o2(0xF1,0xCE),
-          o2(0xF2,0xE4),      o2(0xD0,0xB0),
-          o2(0xEC,0xEF),      o2(0xF9,0xBA),
-          o2(0xEB,0xB5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_00 = {
-    to_EUC_KR_E9_00_offsets,
-    to_EUC_KR_E9_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_01_offsets[64] = {
-     31,  0,  1, 31, 31, 31, 31,  2,     31, 31,  3,  4, 31,  5,  6, 31,
-      7,  8, 31,  9, 10, 11, 31, 31,     31, 12, 31, 31, 13, 14, 15, 31,
-     16, 17, 31, 18, 31, 31, 31, 31,     31, 19, 31, 31, 31, 20, 21, 22,
-     31, 31, 23, 31, 31, 24, 31, 25,     26, 31, 27, 31, 28, 29, 31, 30,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_01_infos[32] = {
-          o2(0xD4,0xED),      o2(0xE2,0xC4),
-          o2(0xE9,0xE7),      o2(0xEB,0xB4),
-          o2(0xEA,0xA1),      o2(0xF8,0xBC),
-          o2(0xCE,0xA6),      o2(0xF9,0xC6),
-          o2(0xFC,0xDA),      o2(0xD4,0xB3),
-          o2(0xD3,0xB9),      o2(0xEA,0xDE),
-          o2(0xE9,0xAB),      o2(0xE1,0xE1),
-          o2(0xD3,0xCF),      o2(0xF4,0xF6),
-          o2(0xEA,0xC0),      o2(0xE1,0xCF),
-          o2(0xCC,0xBA),      o2(0xEE,0xEA),
-          o2(0xF0,0xE4),      o2(0xF3,0xB4),
-          o2(0xD4,0xEE),      o2(0xF2,0xC0),
-          o2(0xF1,0xE5),      o2(0xF4,0xC3),
-          o2(0xE0,0xD4),      o2(0xEB,0xB6),
-          o2(0xD7,0xA1),      o2(0xCB,0xE8),
-          o2(0xF9,0xAD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_01 = {
-    to_EUC_KR_E9_01_offsets,
-    to_EUC_KR_E9_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_02_offsets[64] = {
-      0,  1,  2,  3,  4, 22, 22,  5,      6, 22,  7, 22, 22, 22, 22,  8,
-     22,  9, 22, 22, 22, 10, 22, 22,     22, 11, 22, 22, 22, 22, 22, 22,
-     22, 22, 12, 13, 22, 22, 14, 22,     15, 22, 16, 22, 22, 22, 22, 17,
-     18, 19, 22, 22, 22, 20, 22, 22,     21, 22, 22, 22, 22, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_02_infos[23] = {
-          o2(0xE9,0xAD),      o2(0xD8,0xE4),
-          o2(0xFA,0xB3),      o2(0xE2,0xC5),
-          o2(0xFC,0xBD),      o2(0xEC,0xC4),
-          o2(0xD8,0xB1),      o2(0xDC,0xAB),
-          o2(0xD5,0xA4),      o2(0xEB,0xE9),
-          o2(0xE8,0xBB),      o2(0xD8,0xD7),
-          o2(0xFB,0xAE),      o2(0xD1,0xE1),
-          o2(0xDB,0xC0),      o2(0xF5,0xBE),
-          o2(0xDE,0xF7),      o2(0xCA,0xFB),
-          o2(0xF7,0xC6),      o2(0xCF,0xC8),
-          o2(0xE1,0xD0),      o2(0xEE,0xD0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_02 = {
-    to_EUC_KR_E9_02_offsets,
-    to_EUC_KR_E9_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_03_offsets[64] = {
-      8,  0,  8,  8,  8,  8,  8,  8,      8,  8,  1,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  2,  8,
-      8,  3,  8,  8,  8,  8,  8,  8,      4,  8,  8,  8,  8,  5,  8,  8,
-      8,  8,  8,  8,  8,  6,  8,  8,      8,  8,  8,  8,  8,  7,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_03_infos[9] = {
-          o2(0xE9,0xF4),      o2(0xCE,0xF4),
-          o2(0xD5,0xCD),      o2(0xCF,0xDB),
-          o2(0xDD,0xBB),      o2(0xCE,0xAC),
-          o2(0xE9,0xE8),      o2(0xD4,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_03 = {
-    to_EUC_KR_E9_03_offsets,
-    to_EUC_KR_E9_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_04_offsets[64] = {
-      7,  7,  0,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  1,  7,  7,  2,  7,  7,      7,  3,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  4,      7,  7,  7,  7,  7,  5,  7,  7,
-      7,  7,  6,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_04_infos[8] = {
-          o2(0xE4,0xC7),      o2(0xF5,0xDB),
-          o2(0xFA,0xC1),      o2(0xDE,0xA9),
-          o2(0xD4,0xF8),      o2(0xEF,0xF7),
-          o2(0xD3,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_04 = {
-    to_EUC_KR_E9_04_offsets,
-    to_EUC_KR_E9_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_05_offsets[64] = {
-     14, 14, 14, 14, 14, 14, 14, 14,     14,  0,  1,  2,  3,  4,  5, 14,
-     14, 14,  6, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14,  7, 14, 14, 14, 14, 14,     14,  8,  9, 14, 10, 14, 14, 14,
-     14, 14, 14, 14, 14, 11, 14, 12,     13, 14, 14, 14, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_05_infos[15] = {
-          o2(0xEB,0xB7),      o2(0xEF,0xF8),
-          o2(0xF5,0xDC),      o2(0xED,0xCC),
-          o2(0xDB,0xD5),      o2(0xF1,0xCF),
-          o2(0xF1,0xD0),      o2(0xF5,0xB2),
-          o2(0xD9,0xAE),      o2(0xD5,0xAC),
-          o2(0xE2,0xC6),      o2(0xFD,0xA3),
-          o2(0xFB,0xE5),      o2(0xDF,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_05 = {
-    to_EUC_KR_E9_05_offsets,
-    to_EUC_KR_E9_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_06_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13,  0,     13,  1, 13,  2, 13,  3, 13, 13,
-     13, 13,  4, 13, 13, 13, 13, 13,     13, 13, 13, 13,  5, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13,  6,  7, 13,  8,  9,
-     13, 10, 13, 13, 11, 12, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_06_infos[14] = {
-          o2(0xE2,0xF5),      o2(0xF6,0xAD),
-          o2(0xF5,0xB3),      o2(0xF0,0xB5),
-          o2(0xE1,0xA5),      o2(0xF5,0xDD),
-          o2(0xEC,0xA2),      o2(0xED,0xFD),
-          o2(0xF5,0xB4),      o2(0xFB,0xB8),
-          o2(0xDB,0xA3),      o2(0xD6,0xCA),
-          o2(0xCB,0xD9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_06 = {
-    to_EUC_KR_E9_06_offsets,
-    to_EUC_KR_E9_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_07_offsets[64] = {
-      0, 18, 18, 18, 18, 18, 18,  1,     18,  2, 18,  3,  4,  5,  6,  7,
-      8,  9, 18, 18, 18, 18, 18, 10,     11, 18, 18, 18, 12, 13, 18, 18,
-     18, 18, 18, 14, 18, 18, 18, 15,     18, 18, 16, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 17, 18, 18,     18, 18, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_07_infos[19] = {
-          o2(0xE5,0xD4),      o2(0xF3,0xFA),
-          o2(0xEB,0xB8),      o2(0xE0,0xB7),
-          o2(0xD7,0xEC),      o2(0xF1,0xEC),
-          o2(0xE5,0xAF),      o2(0xD5,0xE1),
-          o2(0xD7,0xED),      o2(0xD1,0xD1),
-          o2(0xE1,0xF2),      o2(0xEF,0xF9),
-          o2(0xDD,0xBC),      o2(0xF6,0xDC),
-          o2(0xF0,0xE5),      o2(0xF4,0xC4),
-          o2(0xE9,0xE9),      o2(0xF3,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_07 = {
-    to_EUC_KR_E9_07_offsets,
-    to_EUC_KR_E9_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_08_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  0,  9,  9,
-      1,  2,  3,  9,  9,  9,  9,  4,      9,  9,  9,  9,  9,  9,  5,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  6,  9,  9,  9,      9,  9,  7,  9,  9,  9,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_08_infos[10] = {
-          o2(0xD4,0xEF),      o2(0xCC,0xA2),
-          o2(0xF7,0xFE),      o2(0xDF,0xBC),
-          o2(0xEB,0xCD),      o2(0xD0,0xB7),
-          o2(0xD6,0xC2),      o2(0xE8,0xAD),
-          o2(0xEF,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_08 = {
-    to_EUC_KR_E9_08_offsets,
-    to_EUC_KR_E9_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_09_offsets[64] = {
-      0, 10, 10, 10, 10,  1, 10, 10,     10,  2, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10,  3,     10, 10, 10,  4, 10, 10,  5, 10,
-     10, 10,  6, 10,  7,  8,  9, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_09_infos[11] = {
-          o2(0xCB,0xA5),      o2(0xCB,0xE9),
-          o2(0xFA,0xE8),      o2(0xCC,0xC6),
-          o2(0xE6,0xE7),      o2(0xEA,0xC7),
-          o2(0xDB,0xA4),      o2(0xCF,0xC9),
-          o2(0xE2,0xFC),      o2(0xEF,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_09 = {
-    to_EUC_KR_E9_09_offsets,
-    to_EUC_KR_E9_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0A_offsets[64] = {
-      0, 12, 12,  1, 12,  2, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12,  3, 12,  4, 12, 12,  5, 12,      6, 12, 12, 12,  7, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12,  8, 12, 12,  9, 10,     12, 11, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0A_infos[13] = {
-          o2(0xEB,0xDE),      o2(0xF5,0xC8),
-          o2(0xD4,0xDE),      o2(0xE0,0xD5),
-          o2(0xEF,0xB0),      o2(0xE2,0xC7),
-          o2(0xD9,0xAF),      o2(0xF9,0xE7),
-          o2(0xE7,0xE5),      o2(0xCF,0xCA),
-          o2(0xE1,0xD1),      o2(0xE2,0xC8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0A = {
-    to_EUC_KR_E9_0A_offsets,
-    to_EUC_KR_E9_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0B_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  0,  7,  7,  1,
-      7,  7,  2,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  3,  7,  7,  7,      7,  7,  4,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      5,  7,  7,  7,  6,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0B_infos[8] = {
-          o2(0xEF,0xFB),      o2(0xFA,0xF9),
-          o2(0xDC,0xF2),      o2(0xE0,0xA7),
-          o2(0xF8,0xE8),      o2(0xCB,0xEA),
-          o2(0xCB,0xBC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0B = {
-    to_EUC_KR_E9_0B_offsets,
-    to_EUC_KR_E9_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0C_offsets[64] = {
-     15, 15, 15, 15,  0, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-      1, 15, 15, 15, 15, 15, 15, 15,      2, 15,  3, 15, 15, 15,  4,  5,
-      6,  7,  8, 15,  9, 15, 10, 15,     11, 15, 15, 12, 15, 15, 13, 14,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0C_infos[16] = {
-          o2(0xD6,0xE2),      o2(0xF5,0xDE),
-          o2(0xF5,0xDF),      o2(0xEE,0xB6),
-          o2(0xE2,0xF6),      o2(0xD3,0xCA),
-          o2(0xEF,0xFC),      o2(0xD1,0xC4),
-          o2(0xEF,0xB1),      o2(0xD1,0xC5),
-          o2(0xD0,0xDE),      o2(0xD9,0xE1),
-          o2(0xE0,0xB8),      o2(0xCD,0xD1),
-          o2(0xF3,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0C = {
-    to_EUC_KR_E9_0C_offsets,
-    to_EUC_KR_E9_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0D_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,      0, 10,  1,  2, 10,  3, 10, 10,
-     10, 10, 10, 10,  4, 10, 10, 10,     10, 10, 10,  5, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10,  6, 10,
-     10, 10, 10, 10, 10,  7, 10, 10,     10, 10, 10, 10,  8, 10,  9, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0D_infos[11] = {
-          o2(0xE7,0xCC),      o2(0xD6,0xA8),
-          o2(0xCE,0xA7),      o2(0xD4,0xB5),
-          o2(0xE4,0xC8),      o2(0xD3,0xB4),
-          o2(0xEB,0xB9),      o2(0xCB,0xF5),
-          o2(0xF6,0xDD),      o2(0xF1,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0D = {
-    to_EUC_KR_E9_0D_offsets,
-    to_EUC_KR_E9_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0E_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  0,  9,  9,  9,
-      9,  9,  9,  9,  1,  9,  2,  9,      9,  9,  3,  9,  9,  9,  9,  9,
-      9,  9,  9,  4,  9,  9,  9,  5,      9,  9,  9,  9,  6,  7,  9,  9,
-      8,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0E_infos[10] = {
-          o2(0xCC,0xC7),      o2(0xE9,0xCA),
-          o2(0xE1,0xF0),      o2(0xF5,0xE0),
-          o2(0xFB,0xAF),      o2(0xCB,0xD1),
-          o2(0xFB,0xE0),      o2(0xF2,0xE5),
-          o2(0xEC,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0E = {
-    to_EUC_KR_E9_0E_offsets,
-    to_EUC_KR_E9_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_0F_offsets[64] = {
-      6,  6,  6,  0,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  1,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  2,  6,
-      6,  3,  6,  6,  4,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  5,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_0F_infos[7] = {
-          o2(0xF0,0xEC),      o2(0xEE,0xEB),
-          o2(0xE9,0xCB),      o2(0xCC,0xF0),
-          o2(0xD7,0xAF),      o2(0xF3,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_0F = {
-    to_EUC_KR_E9_0F_offsets,
-    to_EUC_KR_E9_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_10_offsets[64] = {
-      6,  6,  6,  6,  0,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      1,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  2,  6,  6,      6,  6,  6,  3,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  4,  6,  6,      5,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_10_infos[7] = {
-          o2(0xFC,0xF5),      o2(0xF1,0xA4),
-          o2(0xE0,0xD6),      o2(0xEF,0xB2),
-          o2(0xF4,0xD1),      o2(0xF7,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_10 = {
-    to_EUC_KR_E9_10_offsets,
-    to_EUC_KR_E9_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_11_offsets[64] = {
-      6,  6,  6,  6,  0,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  1,  2,  6,  6,  6,  6,  6,      6,  6,  6,  3,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  4,  6,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_11_infos[7] = {
-          o2(0xF1,0xD1),      o2(0xCA,0xFC),
-          o2(0xCA,0xFD),      o2(0xCE,0xCE),
-          o2(0xF3,0xC8),      o2(0xF3,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_11 = {
-    to_EUC_KR_E9_11_offsets,
-    to_EUC_KR_E9_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_15_offsets[64] = {
-      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,  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,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_15_infos[2] = {
-          o2(0xED,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_15 = {
-    to_EUC_KR_E9_15_offsets,
-    to_EUC_KR_E9_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_16_offsets[64] = {
-      0, 18, 18,  1, 18, 18, 18, 18,     18,  2, 18,  3, 18, 18, 18,  4,
-     18,  5,  6,  7,  8, 18, 18, 18,      9, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 10, 11, 12, 18, 18,     13, 18, 18, 18, 18, 14, 18, 18,
-     18, 15, 18, 18, 18, 18, 18, 18,     18, 18, 18, 16, 17, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_16_infos[19] = {
-          o2(0xDA,0xA6),      o2(0xE0,0xEC),
-          o2(0xF8,0xCD),      o2(0xCB,0xD2),
-          o2(0xEB,0xCE),      o2(0xF9,0xD8),
-          o2(0xF9,0xD9),      o2(0xCA,0xE0),
-          o2(0xDA,0xCA),      o2(0xCB,0xA6),
-          o2(0xCA,0xC8),      o2(0xF9,0xEE),
-          o2(0xDB,0xEC),      o2(0xD0,0xB1),
-          o2(0xD5,0xEF),      o2(0xE6,0xF3),
-          o2(0xE7,0xA2),      o2(0xE4,0xD9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_16 = {
-    to_EUC_KR_E9_16_offsets,
-    to_EUC_KR_E9_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_17_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  0,      8,  8,  1,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  2,  3,  4,  8,      8,  8,  8,  8,  5,  8,  8,  8,
-      8,  6,  7,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_17_infos[9] = {
-          o2(0xE4,0xE1),      o2(0xFC,0xC4),
-          o2(0xF9,0xEF),      o2(0xCF,0xF4),
-          o2(0xF7,0xE6),      o2(0xCE,0xBC),
-          o2(0xF4,0xC5),      o2(0xDC,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_17 = {
-    to_EUC_KR_E9_17_offsets,
-    to_EUC_KR_E9_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_18_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  0,  7,  7,  7,
-      7,  1,  7,  7,  7,  7,  7,  7,      7,  7,  2,  7,  7,  7,  3,  7,
-      7,  7,  4,  7,  7,  7,  7,  7,      7,  7,  7,  5,  7,  7,  7,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_18_infos[8] = {
-          o2(0xDD,0xBD),      o2(0xF4,0xC6),
-          o2(0xF8,0xA1),      o2(0xE8,0xD6),
-          o2(0xDB,0xC1),      o2(0xF0,0xE6),
-          o2(0xE4,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_18 = {
-    to_EUC_KR_E9_18_offsets,
-    to_EUC_KR_E9_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_19_offsets[64] = {
-      0, 23,  1, 23,  2, 23, 23, 23,     23, 23, 23,  3,  4,  5, 23, 23,
-      6, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23,  7,  8,  9, 10, 11,
-     23, 23, 12, 13, 14, 23, 23, 23,     23, 23, 15, 23, 23, 23, 23, 23,
-     16, 23, 23, 17, 23, 18, 19, 20,     21, 23, 23, 23, 23, 22, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_19_infos[24] = {
-          o2(0xF6,0xED),      o2(0xF9,0xAE),
-          o2(0xDD,0xBE),      o2(0xD7,0xB0),
-          o2(0xD8,0xE8),      o2(0xCB,0xBD),
-          o2(0xF9,0xDA),      o2(0xF8,0xCE),
-          o2(0xF9,0xF0),      o2(0xE0,0xED),
-          o2(0xE3,0xB3),      o2(0xF4,0xB3),
-          o2(0xEA,0xC2),      o2(0xF2,0xE6),
-          o2(0xF0,0xB6),      o2(0xDB,0xD6),
-          o2(0xEB,0xE4),      o2(0xF2,0xE7),
-          o2(0xD7,0xD5),      o2(0xD4,0xB6),
-          o2(0xF9,0xE8),      o2(0xD7,0xC1),
-          o2(0xE5,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_19 = {
-    to_EUC_KR_E9_19_offsets,
-    to_EUC_KR_E9_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1A_offsets[64] = {
-     19, 19, 19, 19, 19,  0,  1, 19,     19, 19,  2,  3, 19,  4,  5, 19,
-     19, 19, 19, 19,  6,  7, 19, 19,      8,  9, 19, 10, 11, 19, 19, 19,
-     19, 19, 19, 12, 19, 19, 19, 13,     14, 19, 15, 19, 19, 19, 19, 19,
-     19, 16, 19, 19, 19, 19, 19, 17,     19, 19, 19, 18, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1A_infos[20] = {
-          o2(0xE9,0xEA),      o2(0xD7,0xCC),
-          o2(0xD3,0xE9),      o2(0xE2,0xC9),
-          o2(0xFC,0xDB),      o2(0xCD,0xAD),
-          o2(0xCC,0xB0),      o2(0xEA,0xA2),
-          o2(0xE4,0xF6),      o2(0xD0,0xC0),
-          o2(0xF0,0xB7),      o2(0xEE,0xA1),
-          o2(0xD7,0xF6),      o2(0xE2,0xCA),
-          o2(0xE2,0xCB),      o2(0xFA,0xCF),
-          o2(0xEB,0xDF),      o2(0xD6,0xCB),
-          o2(0xF4,0xB4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1A = {
-    to_EUC_KR_E9_1A_offsets,
-    to_EUC_KR_E9_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1B_offsets[64] = {
-      0,  1, 28, 28,  2,  3,  4,  5,     28,  6, 28,  7,  8,  9, 10, 28,
-     28, 28, 28, 28, 28, 11, 12, 28,     28, 13, 28, 14, 15, 28, 28, 28,
-     28, 28, 16, 17, 28, 28, 28, 28,     18, 19, 20, 28, 28, 28, 28, 21,
-     22, 28, 23, 28, 28, 28, 24, 25,     28, 26, 28, 27, 28, 28, 28, 28,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1B_infos[29] = {
-          o2(0xED,0xCD),      o2(0xE4,0xD2),
-          o2(0xEA,0xA9),      o2(0xE4,0xBA),
-          o2(0xF3,0xA2),      o2(0xCD,0xD2),
-          o2(0xF6,0xCB),      o2(0xF1,0xE6),
-          o2(0xED,0xC1),      o2(0xE8,0xBC),
-          o2(0xEE,0xD1),      o2(0xF0,0xE7),
-          o2(0xE2,0xCC),      o2(0xE4,0xAA),
-          o2(0xF5,0xE1),      o2(0xED,0xDA),
-          o2(0xD7,0xEE),      o2(0xD1,0xF1),
-          o2(0xE9,0xEB),      o2(0xE9,0xEC),
-          o2(0xE0,0xE4),      o2(0xDA,0xA7),
-          o2(0xDD,0xD4),      o2(0xEA,0xA3),
-          o2(0xD6,0xC3),      o2(0xD6,0xF4),
-          o2(0xDA,0xDF),      o2(0xEF,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1B = {
-    to_EUC_KR_E9_1B_offsets,
-    to_EUC_KR_E9_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1C_offsets[64] = {
-      0, 14, 14, 14, 14, 14,  1,  2,     14, 14, 14, 14, 14, 14, 14, 14,
-     14,  3, 14,  4, 14, 14,  5, 14,     14,  6, 14, 14,  7, 14,  8, 14,
-     14, 14, 14, 14, 14, 14, 14,  9,     14, 14, 14, 14, 14, 14, 14, 14,
-     10, 14, 11, 14, 14, 14, 14, 14,     14, 12, 14, 14, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1C_infos[15] = {
-          o2(0xE2,0xCD),      o2(0xEF,0xFD),
-          o2(0xF2,0xE8),      o2(0xEF,0xC5),
-          o2(0xE7,0xE7),      o2(0xD7,0xFD),
-          o2(0xE7,0xCE),      o2(0xDF,0xDC),
-          o2(0xF9,0xC7),      o2(0xD9,0xF6),
-          o2(0xDF,0xAC),      o2(0xD6,0xDA),
-          o2(0xDC,0xA4),      o2(0xF0,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1C = {
-    to_EUC_KR_E9_1C_offsets,
-    to_EUC_KR_E9_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1D_offsets[64] = {
-     14, 14,  0, 14,  1, 14, 14, 14,      2, 14, 14, 14, 14, 14, 14, 14,
-     14,  3, 14, 14, 14, 14,  4, 14,     14, 14, 14, 14,  5, 14,  6, 14,
-     14,  7,  8, 14, 14, 14, 14, 14,     14,  9, 14, 14, 14, 10, 14, 14,
-     14, 14, 14, 14, 11, 14, 14, 12,     14, 14, 13, 14, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1D_infos[15] = {
-          o2(0xD5,0xFA),      o2(0xE4,0xF7),
-          o2(0xD6,0xC4),      o2(0xF4,0xEC),
-          o2(0xEF,0xFE),      o2(0xF0,0xA1),
-          o2(0xDE,0xAA),      o2(0xDA,0xBC),
-          o2(0xD8,0xFC),      o2(0xFA,0xD4),
-          o2(0xEC,0xE5),      o2(0xFC,0xA8),
-          o2(0xEC,0xE6),      o2(0xD8,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1D = {
-    to_EUC_KR_E9_1D_offsets,
-    to_EUC_KR_E9_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1E_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  0,  7,  1,  7,  2,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      3,  7,  7,  7,  7,  7,  7,  7,      4,  7,  7,  5,  7,  6,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1E_infos[8] = {
-          o2(0xFB,0xB9),      o2(0xE4,0xD3),
-          o2(0xCD,0xF9),      o2(0xCF,0xD3),
-          o2(0xCA,0xEA),      o2(0xCF,0xD4),
-          o2(0xF8,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1E = {
-    to_EUC_KR_E9_1E_offsets,
-    to_EUC_KR_E9_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_1F_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  0,  8,      8,  8,  8,  1,  8,  8,  8,  8,
-      8,  8,  8,  2,  8,  8,  8,  8,      8,  8,  8,  8,  3,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  4,  8,  8,  5,  8,      8,  8,  8,  6,  8,  8,  8,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_1F_infos[9] = {
-          o2(0xF4,0xC7),      o2(0xEA,0xDF),
-          o2(0xF9,0xDB),      o2(0xD4,0xB7),
-          o2(0xEB,0xE5),      o2(0xE1,0xD2),
-          o2(0xEA,0xA4),      o2(0xFA,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_1F = {
-    to_EUC_KR_E9_1F_offsets,
-    to_EUC_KR_E9_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_20_offsets[64] = {
-      0,  1,  2,  3, 20,  4,  5, 20,      6, 20,  7, 20,  8, 20, 20, 20,
-      9, 10, 11, 12, 20, 20, 20, 13,     14, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20, 20, 15, 20, 20,
-     16, 20, 20, 20, 20, 20, 20, 20,     17, 18, 20, 19, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_20_infos[21] = {
-          o2(0xFB,0xE1),      o2(0xFA,0xED),
-          o2(0xF0,0xA2),      o2(0xCC,0xF1),
-          o2(0xFA,0xA3),      o2(0xE2,0xF7),
-          o2(0xE2,0xCE),      o2(0xE9,0xF5),
-          o2(0xE1,0xEB),      o2(0xE7,0xE8),
-          o2(0xE8,0xD7),      o2(0xDA,0xF8),
-          o2(0xD4,0xCB),      o2(0xF7,0xF6),
-          o2(0xD6,0xC5),      o2(0xD4,0xE9),
-          o2(0xFA,0xFA),      o2(0xCC,0xF2),
-          o2(0xF7,0xDD),      o2(0xDE,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_20 = {
-    to_EUC_KR_E9_20_offsets,
-    to_EUC_KR_E9_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_21_offsets[64] = {
-     12, 12, 12, 12, 12, 12,  0, 12,     12, 12, 12, 12,  1,  2,  3, 12,
-     12, 12, 12, 12,  4, 12, 12, 12,      5, 12,  6, 12, 12, 12,  7, 12,
-     12, 12, 12, 12, 12,  8, 12,  9,     12, 12, 12, 10, 12, 12, 12, 11,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_21_infos[13] = {
-          o2(0xCE,0xA8),      o2(0xF0,0xB9),
-          o2(0xE4,0xFE),      o2(0xE4,0xC9),
-          o2(0xE4,0xD4),      o2(0xEA,0xC3),
-          o2(0xEF,0xB4),      o2(0xD7,0xBE),
-          o2(0xFB,0xE2),      o2(0xCD,0xD3),
-          o2(0xEF,0xB5),      o2(0xFA,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_21 = {
-    to_EUC_KR_E9_21_offsets,
-    to_EUC_KR_E9_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_22_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      0,  3,  3,  3,  3,  3,  3,  1,
-      3,  2,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_22_infos[4] = {
-          o2(0xF9,0xA6),      o2(0xDF,0xBD),
-          o2(0xF7,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_22 = {
-    to_EUC_KR_E9_22_offsets,
-    to_EUC_KR_E9_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_23_offsets[64] = {
-     14, 14, 14, 14,  0, 14, 14,  1,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14,  2,  3, 14, 14,  4,
-     14,  5,  6, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14,  7,  8,  9,
-     14, 14, 14, 14, 10, 14, 14, 14,     14, 14, 14, 14, 11, 12, 13, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_23_infos[15] = {
-          o2(0xF8,0xFD),      o2(0xF8,0xFC),
-          o2(0xDE,0xAB),      o2(0xDB,0xE8),
-          o2(0xE3,0xDD),      o2(0xE1,0xE2),
-          o2(0xD1,0xC6),      o2(0xF6,0xD0),
-          o2(0xEB,0xE6),      o2(0xDA,0xF9),
-          o2(0xEC,0xC7),      o2(0xDE,0xF8),
-          o2(0xF8,0xE9),      o2(0xE3,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_23 = {
-    to_EUC_KR_E9_23_offsets,
-    to_EUC_KR_E9_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_24_offsets[64] = {
-     10, 10, 10,  0, 10, 10, 10, 10,     10,  1,  2, 10,  3, 10, 10, 10,
-      4, 10, 10,  5, 10, 10, 10, 10,      6, 10, 10, 10, 10, 10,  7, 10,
-      8, 10, 10, 10, 10, 10, 10, 10,      9, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_24_infos[11] = {
-          o2(0xCE,0xF5),      o2(0xFA,0xC3),
-          o2(0xE5,0xD7),      o2(0xEC,0xC8),
-          o2(0xF3,0xC9),      o2(0xE4,0xBB),
-          o2(0xE6,0xAE),      o2(0xEF,0xB6),
-          o2(0xDC,0xBF),      o2(0xCE,0xBD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_24 = {
-    to_EUC_KR_E9_24_offsets,
-    to_EUC_KR_E9_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_25_offsets[64] = {
-      9,  9,  9,  9,  9,  0,  9,  9,      9,  1,  9,  2,  3,  4,  9,  9,
-      9,  5,  6,  9,  7,  9,  9,  8,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_25_infos[10] = {
-          o2(0xD8,0xC3),      o2(0xD0,0xCF),
-          o2(0xCF,0xFA),      o2(0xF3,0xCA),
-          o2(0xE0,0xD7),      o2(0xD1,0xC7),
-          o2(0xE9,0xAE),      o2(0xE8,0xBD),
-          o2(0xFA,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_25 = {
-    to_EUC_KR_E9_25_offsets,
-    to_EUC_KR_E9_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_26_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12,  0, 12,     12,  1, 12, 12, 12,  2, 12, 12,
-     12, 12, 12, 12, 12,  3, 12, 12,      4, 12, 12, 12,  5,  6,  7, 12,
-     12,  8, 12,  9, 10, 12, 12, 12,     12, 11, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_26_infos[13] = {
-          o2(0xE2,0xCF),      o2(0xFA,0xC5),
-          o2(0xF9,0xB8),      o2(0xDC,0xE0),
-          o2(0xFB,0xB0),      o2(0xD8,0xA9),
-          o2(0xE5,0xDF),      o2(0xF9,0xA7),
-          o2(0xF6,0xEE),      o2(0xF6,0xCC),
-          o2(0xE2,0xF8),      o2(0xEC,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_26 = {
-    to_EUC_KR_E9_26_offsets,
-    to_EUC_KR_E9_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_27_offsets[64] = {
-     11,  0, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-      1,  2,  3, 11, 11,  4, 11, 11,     11,  5, 11, 11, 11,  6, 11,  7,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11,  8, 11, 11,
-     11,  9, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_27_infos[12] = {
-          o2(0xDA,0xE0),      o2(0xF1,0xD2),
-          o2(0xD2,0xCC),      o2(0xCF,0xCB),
-          o2(0xCA,0xBD),      o2(0xDD,0xBF),
-          o2(0xF6,0xEF),      o2(0xDE,0xF9),
-          o2(0xFA,0xB4),      o2(0xD5,0xAD),
-          o2(0xF1,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_27 = {
-    to_EUC_KR_E9_27_offsets,
-    to_EUC_KR_E9_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_28_offsets[64] = {
-      9,  0,  9,  9,  9,  9,  9,  9,      1,  9,  9,  9,  9,  9,  2,  3,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  4,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  5,  9,  9,  9,  9,
-      6,  9,  9,  9,  9,  9,  7,  8,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_28_infos[10] = {
-          o2(0xDE,0xBE),      o2(0xDC,0xC0),
-          o2(0xD1,0xC8),      o2(0xD1,0xC9),
-          o2(0xF8,0xBE),      o2(0xCB,0xF6),
-          o2(0xD4,0xF9),      o2(0xF5,0xE2),
-          o2(0xE1,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_28 = {
-    to_EUC_KR_E9_28_offsets,
-    to_EUC_KR_E9_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_29_offsets[64] = {
-      0, 13, 13,  1, 13,  2, 13, 13,     13, 13, 13, 13, 13,  3, 13, 13,
-     13, 13, 13, 13, 13,  4, 13,  5,     13, 13,  6,  7, 13, 13, 13,  8,
-     13, 13,  9, 13, 13, 10, 13, 13,     13, 11, 12, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_29_infos[14] = {
-          o2(0xD8,0xE9),      o2(0xF8,0xFE),
-          o2(0xCF,0xCC),      o2(0xFD,0xA4),
-          o2(0xCE,0xF6),      o2(0xFA,0xD0),
-          o2(0xCC,0xF3),      o2(0xE6,0xBE),
-          o2(0xF6,0xAE),      o2(0xD5,0xF0),
-          o2(0xD1,0xCA),      o2(0xFC,0xBE),
-          o2(0xD5,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_29 = {
-    to_EUC_KR_E9_29_offsets,
-    to_EUC_KR_E9_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2A_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      0,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      1,  2,  2,  2,  2,  2,  2,  2,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2A_infos[3] = {
-          o2(0xCD,0xE9),      o2(0xFA,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2A = {
-    to_EUC_KR_E9_2A_offsets,
-    to_EUC_KR_E9_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2B_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  0,  1,  5,  5,  5,      2,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  3,  5,  5,      5,  5,  5,  5,  5,  5,  4,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2B_infos[6] = {
-          o2(0xE2,0xD0),      o2(0xF4,0xF7),
-          o2(0xCD,0xD4),      o2(0xE7,0xA3),
-          o2(0xDB,0xA5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2B = {
-    to_EUC_KR_E9_2B_offsets,
-    to_EUC_KR_E9_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2C_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  0,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  1,      5,  5,  2,  5,  5,  5,  5,  5,
-      5,  3,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  4,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2C_infos[6] = {
-          o2(0xE2,0xD1),      o2(0xD7,0xA2),
-          o2(0xF7,0xE3),      o2(0xEA,0xA6),
-          o2(0xD0,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2C = {
-    to_EUC_KR_E9_2C_offsets,
-    to_EUC_KR_E9_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2D_offsets[64] = {
-      9,  0,  1,  2,  3,  4,  9,  9,      9,  9,  9,  9,  9,  9,  9,  5,
-      9,  9,  9,  9,  6,  9,  9,  9,      9,  9,  7,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  8,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2D_infos[10] = {
-          o2(0xCE,0xDA),      o2(0xFB,0xEB),
-          o2(0xDB,0xA6),      o2(0xDB,0xDE),
-          o2(0xD8,0xE5),      o2(0xEA,0xE0),
-          o2(0xD8,0xAA),      o2(0xE5,0xE0),
-          o2(0xD6,0xDB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2D = {
-    to_EUC_KR_E9_2D_offsets,
-    to_EUC_KR_E9_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2E_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  0,  5,
-      5,  1,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  2,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  3,  5,  5,  4,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2E_infos[6] = {
-          o2(0xEF,0xC6),      o2(0xF8,0xEA),
-          o2(0xE4,0xD5),      o2(0xCE,0xF7),
-          o2(0xE0,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2E = {
-    to_EUC_KR_E9_2E_offsets,
-    to_EUC_KR_E9_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_2F_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  0,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  1,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  2,  4,  4,  4,      3,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_2F_infos[5] = {
-          o2(0xD7,0xEF),      o2(0xF4,0xED),
-          o2(0xCD,0xE6),      o2(0xCC,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_2F = {
-    to_EUC_KR_E9_2F_offsets,
-    to_EUC_KR_E9_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_30_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  0,  7,  7,
-      1,  7,  2,  7,  7,  3,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  4,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  5,  7,  7,  7,  7,  7,      7,  7,  7,  6,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_30_infos[8] = {
-          o2(0xF5,0xE3),      o2(0xE4,0xCA),
-          o2(0xDC,0xE1),      o2(0xF9,0xC8),
-          o2(0xFC,0xBF),      o2(0xE8,0xA7),
-          o2(0xD8,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_30 = {
-    to_EUC_KR_E9_30_offsets,
-    to_EUC_KR_E9_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_31_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  0,      3,  1,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  2,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_31_infos[4] = {
-          o2(0xCB,0xBE),      o2(0xDC,0xAE),
-          o2(0xD7,0xF7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_31 = {
-    to_EUC_KR_E9_31_offsets,
-    to_EUC_KR_E9_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_33_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  0,  6,  1,      6,  2,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  3,  4,  6,  5,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_33_infos[7] = {
-          o2(0xF0,0xE8),      o2(0xDD,0xC0),
-          o2(0xCF,0xCD),      o2(0xDC,0xF3),
-          o2(0xD9,0xB0),      o2(0xE6,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_33 = {
-    to_EUC_KR_E9_33_offsets,
-    to_EUC_KR_E9_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_34_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  0,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  1,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  2,  5,      3,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  4,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_34_infos[6] = {
-          o2(0xE4,0xBC),      o2(0xEA,0xC4),
-          o2(0xE4,0xEC),      o2(0xE4,0xE5),
-          o2(0xFB,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_34 = {
-    to_EUC_KR_E9_34_offsets,
-    to_EUC_KR_E9_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_35_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  0,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  1,  6,  6,
-      2,  3,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  4,  6,  6,  6,
-      6,  6,  5,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_35_infos[7] = {
-          o2(0xCC,0xBB),      o2(0xE4,0xBD),
-          o2(0xCD,0xDC),      o2(0xD9,0xF7),
-          o2(0xDD,0xDF),      o2(0xED,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_35 = {
-    to_EUC_KR_E9_35_offsets,
-    to_EUC_KR_E9_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_36_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  0,  3,  3,  3,  3,  3,  1,
-      3,  3,  3,  3,  2,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_36_infos[4] = {
-          o2(0xD9,0xD0),      o2(0xE5,0xA3),
-          o2(0xF9,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_36 = {
-    to_EUC_KR_E9_36_offsets,
-    to_EUC_KR_E9_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_37_offsets[64] = {
-      6,  6,  6,  6,  0,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  1,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  2,  6,  6,  6,  6,  6,      3,  4,  5,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_37_infos[7] = {
-          o2(0xCD,0xAE),      o2(0xCF,0xCE),
-          o2(0xF6,0xAF),      o2(0xFD,0xD3),
-          o2(0xEB,0xED),      o2(0xD6,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_37 = {
-    to_EUC_KR_E9_37_offsets,
-    to_EUC_KR_E9_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_38_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  0,  2,  2,  2,  1,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_38_infos[3] = {
-          o2(0xE5,0xA4),      o2(0xD5,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_38 = {
-    to_EUC_KR_E9_38_offsets,
-    to_EUC_KR_E9_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_39_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  0,  4,  4,      4,  1,  4,  4,  4,  2,  4,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_39_infos[5] = {
-          o2(0xD6,0xDD),      o2(0xF9,0xE9),
-          o2(0xE7,0xA4),      o2(0xD6,0xE3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_39 = {
-    to_EUC_KR_E9_39_offsets,
-    to_EUC_KR_E9_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_3A_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10,  0,  1, 10, 10, 10,  2,     10, 10, 10, 10, 10,  3, 10,  4,
-     10, 10, 10, 10, 10,  5, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10,  6,  7, 10, 10,     10, 10, 10,  8, 10, 10,  9, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_3A_infos[11] = {
-          o2(0xD1,0xCB),      o2(0xD6,0xE4),
-          o2(0xD5,0xF2),      o2(0xDE,0xFA),
-          o2(0xD7,0xF8),      o2(0xD8,0xEA),
-          o2(0xCF,0xD5),      o2(0xD8,0xFD),
-          o2(0xD8,0xAB),      o2(0xFD,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_3A = {
-    to_EUC_KR_E9_3A_offsets,
-    to_EUC_KR_E9_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_3B_offsets[64] = {
-     11, 11, 11,  0, 11, 11, 11, 11,     11, 11, 11, 11, 11,  1,  2, 11,
-     11,  3, 11, 11,  4, 11, 11, 11,      5, 11, 11,  6,  7, 11,  8, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      9, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 10, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_3B_infos[12] = {
-          o2(0xFC,0xDC),      o2(0xE0,0xA8),
-          o2(0xD5,0xF3),      o2(0xFD,0xD9),
-          o2(0xCC,0xA3),      o2(0xD9,0xF9),
-          o2(0xD3,0xEA),      o2(0xF5,0xF5),
-          o2(0xEF,0xC7),      o2(0xD3,0xDA),
-          o2(0xDA,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_3B = {
-    to_EUC_KR_E9_3B_offsets,
-    to_EUC_KR_E9_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_3C_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  0,      1,  6,  6,  6,  6,  6,  2,  6,
-      6,  6,  6,  3,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      4,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  5,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_3C_infos[7] = {
-          o2(0xE8,0xA8),      o2(0xDC,0xAF),
-          o2(0xF0,0xA3),      o2(0xCD,0xD5),
-          o2(0xE0,0xA9),      o2(0xDE,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_3C = {
-    to_EUC_KR_E9_3C_offsets,
-    to_EUC_KR_E9_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_3D_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10,  0,  1, 10, 10,  2, 10,
-     10, 10,  3, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10,  4,
-     10,  5, 10, 10, 10, 10, 10,  6,     10, 10,  7, 10,  8, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10,  9,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_3D_infos[11] = {
-          o2(0xF0,0xBA),      o2(0xEE,0xB1),
-          o2(0xEE,0xB2),      o2(0xF6,0xCD),
-          o2(0xEE,0xD2),      o2(0xD6,0xC6),
-          o2(0xE0,0xE5),      o2(0xF3,0xBB),
-          o2(0xE5,0xE1),      o2(0xE4,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_3D = {
-    to_EUC_KR_E9_3D_offsets,
-    to_EUC_KR_E9_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_3E_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  0,  4,  4,
-      1,  4,  4,  4,  4,  2,  4,  4,      4,  4,  4,  4,  3,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_3E_infos[5] = {
-          o2(0xD7,0xA3),      o2(0xDB,0xC2),
-          o2(0xCA,0xFE),      o2(0xCF,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9_3E = {
-    to_EUC_KR_E9_3E_offsets,
-    to_EUC_KR_E9_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_E9_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 59, 59, 59, 18, 19, 20,     21, 22, 23, 24, 25, 26, 27, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,     37, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 59, 47, 48, 49, 50, 51,     52, 53, 54, 55, 56, 57, 58, 59,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_E9_infos[60] = {
-       &to_EUC_KR_E9_00,   &to_EUC_KR_E9_01,
-       &to_EUC_KR_E9_02,   &to_EUC_KR_E9_03,
-       &to_EUC_KR_E9_04,   &to_EUC_KR_E9_05,
-       &to_EUC_KR_E9_06,   &to_EUC_KR_E9_07,
-       &to_EUC_KR_E9_08,   &to_EUC_KR_E9_09,
-       &to_EUC_KR_E9_0A,   &to_EUC_KR_E9_0B,
-       &to_EUC_KR_E9_0C,   &to_EUC_KR_E9_0D,
-       &to_EUC_KR_E9_0E,   &to_EUC_KR_E9_0F,
-       &to_EUC_KR_E9_10,   &to_EUC_KR_E9_11,
-       &to_EUC_KR_E9_15,   &to_EUC_KR_E9_16,
-       &to_EUC_KR_E9_17,   &to_EUC_KR_E9_18,
-       &to_EUC_KR_E9_19,   &to_EUC_KR_E9_1A,
-       &to_EUC_KR_E9_1B,   &to_EUC_KR_E9_1C,
-       &to_EUC_KR_E9_1D,   &to_EUC_KR_E9_1E,
-       &to_EUC_KR_E9_1F,   &to_EUC_KR_E9_20,
-       &to_EUC_KR_E9_21,   &to_EUC_KR_E9_22,
-       &to_EUC_KR_E9_23,   &to_EUC_KR_E9_24,
-       &to_EUC_KR_E9_25,   &to_EUC_KR_E9_26,
-       &to_EUC_KR_E9_27,   &to_EUC_KR_E9_28,
-       &to_EUC_KR_E9_29,   &to_EUC_KR_E9_2A,
-       &to_EUC_KR_E9_2B,   &to_EUC_KR_E9_2C,
-       &to_EUC_KR_E9_2D,   &to_EUC_KR_E9_2E,
-       &to_EUC_KR_E9_2F,   &to_EUC_KR_E9_30,
-       &to_EUC_KR_E9_31,   &to_EUC_KR_E9_33,
-       &to_EUC_KR_E9_34,   &to_EUC_KR_E9_35,
-       &to_EUC_KR_E9_36,   &to_EUC_KR_E9_37,
-       &to_EUC_KR_E9_38,   &to_EUC_KR_E9_39,
-       &to_EUC_KR_E9_3A,   &to_EUC_KR_E9_3B,
-       &to_EUC_KR_E9_3C,   &to_EUC_KR_E9_3D,
-       &to_EUC_KR_E9_3E,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_E9 = {
-    to_EUC_KR_E9_offsets,
-    to_EUC_KR_E9_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_30_offsets[64] = {
-      0,  1, 30, 30,  2, 30, 30,  3,      4,  5,  6, 30, 30, 30, 30, 30,
-      7,  8,  9, 10, 11, 12, 13, 14,     30, 15, 16, 17, 18, 19, 30, 30,
-     20, 30, 30, 30, 21, 30, 30, 30,     30, 30, 30, 30, 22, 23, 30, 24,
-     25, 26, 30, 30, 30, 30, 30, 30,     27, 28, 30, 30, 29, 30, 30, 30,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_30_infos[31] = {
-          o2(0xB0,0xA1),      o2(0xB0,0xA2),
-          o2(0xB0,0xA3),      o2(0xB0,0xA4),
-          o2(0xB0,0xA5),      o2(0xB0,0xA6),
-          o2(0xB0,0xA7),      o2(0xB0,0xA8),
-          o2(0xB0,0xA9),      o2(0xB0,0xAA),
-          o2(0xB0,0xAB),      o2(0xB0,0xAC),
-          o2(0xB0,0xAD),      o2(0xB0,0xAE),
-          o2(0xB0,0xAF),      o2(0xB0,0xB0),
-          o2(0xB0,0xB1),      o2(0xB0,0xB2),
-          o2(0xB0,0xB3),      o2(0xB0,0xB4),
-          o2(0xB0,0xB5),      o2(0xB0,0xB6),
-          o2(0xB0,0xB7),      o2(0xB0,0xB8),
-          o2(0xB0,0xB9),      o2(0xB0,0xBA),
-          o2(0xB0,0xBB),      o2(0xB0,0xBC),
-          o2(0xB0,0xBD),      o2(0xB0,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_30 = {
-    to_EUC_KR_EA_30_offsets,
-    to_EUC_KR_EA_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_31_offsets[64] = {
-      0, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12,  1, 12,  2, 12, 12,
-     12, 12, 12, 12,  3, 12, 12, 12,      4, 12, 12, 12,  5, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-      6,  7, 12, 12,  8, 12, 12,  9,     10, 12, 11, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_31_infos[13] = {
-          o2(0xB0,0xBF),      o2(0xB0,0xC0),
-          o2(0xB0,0xC1),      o2(0xB0,0xC2),
-          o2(0xB0,0xC3),      o2(0xB0,0xC4),
-          o2(0xB0,0xC5),      o2(0xB0,0xC6),
-          o2(0xB0,0xC7),      o2(0xB0,0xC8),
-          o2(0xB0,0xC9),      o2(0xB0,0xCA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_31 = {
-    to_EUC_KR_EA_31_offsets,
-    to_EUC_KR_EA_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_32_offsets[64] = {
-      0,  1, 28,  2,  3,  4,  5, 28,     28,  6,  7,  8,  9, 28, 28, 28,
-     10, 28, 28, 28, 11, 28, 28, 28,     28, 28, 28, 28, 12, 13, 28, 14,
-     15, 16, 28, 28, 28, 28, 28, 28,     17, 18, 19, 28, 20, 28, 28, 21,
-     22, 28, 28, 28, 28, 28, 28, 28,     23, 24, 28, 25, 26, 27, 28, 28,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_32_infos[29] = {
-          o2(0xB0,0xCB),      o2(0xB0,0xCC),
-          o2(0xB0,0xCD),      o2(0xB0,0xCE),
-          o2(0xB0,0xCF),      o2(0xB0,0xD0),
-          o2(0xB0,0xD1),      o2(0xB0,0xD2),
-          o2(0xB0,0xD3),      o2(0xB0,0xD4),
-          o2(0xB0,0xD5),      o2(0xB0,0xD6),
-          o2(0xB0,0xD7),      o2(0xB0,0xD8),
-          o2(0xB0,0xD9),      o2(0xB0,0xDA),
-          o2(0xB0,0xDB),      o2(0xB0,0xDC),
-          o2(0xB0,0xDD),      o2(0xB0,0xDE),
-          o2(0xB0,0xDF),      o2(0xB0,0xE0),
-          o2(0xB0,0xE1),      o2(0xB0,0xE2),
-          o2(0xB0,0xE3),      o2(0xB0,0xE4),
-          o2(0xB0,0xE5),      o2(0xB0,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_32 = {
-    to_EUC_KR_EA_32_offsets,
-    to_EUC_KR_EA_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_33_offsets[64] = {
-     21,  0, 21, 21,  1, 21, 21, 21,      2, 21, 21, 21,  3, 21, 21, 21,
-     21, 21, 21, 21, 21,  4, 21,  5,     21, 21, 21, 21, 21, 21, 21, 21,
-      6,  7, 21, 21,  8, 21, 21,  9,     10, 21, 11, 21, 12, 21, 21, 13,
-     14, 15, 21, 16, 21, 17, 18, 21,     21, 21, 21, 21, 19, 20, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_33_infos[22] = {
-          o2(0xB0,0xE7),      o2(0xB0,0xE8),
-          o2(0xB0,0xE9),      o2(0xB0,0xEA),
-          o2(0xB0,0xEB),      o2(0xB0,0xEC),
-          o2(0xB0,0xED),      o2(0xB0,0xEE),
-          o2(0xB0,0xEF),      o2(0xB0,0xF0),
-          o2(0xB0,0xF1),      o2(0xB0,0xF2),
-          o2(0xB0,0xF3),      o2(0xB0,0xF4),
-          o2(0xB0,0xF5),      o2(0xB0,0xF6),
-          o2(0xB0,0xF7),      o2(0xB0,0xF8),
-          o2(0xB0,0xF9),      o2(0xB0,0xFA),
-          o2(0xB0,0xFB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_33 = {
-    to_EUC_KR_EA_33_offsets,
-    to_EUC_KR_EA_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_34_offsets[64] = {
-      0, 17, 17, 17,  1, 17,  2, 17,     17, 17, 17, 17,  3,  4, 17,  5,
-     17,  6, 17, 17, 17, 17, 17, 17,      7, 17, 17, 17,  8, 17, 17, 17,
-      9, 17, 17, 17, 17, 17, 17, 17,     17, 10, 17, 17, 11, 12, 17, 17,
-     17, 17, 17, 17, 13, 14, 17, 17,     15, 17, 17, 17, 16, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_34_infos[18] = {
-          o2(0xB0,0xFC),      o2(0xB0,0xFD),
-          o2(0xB0,0xFE),      o2(0xB1,0xA1),
-          o2(0xB1,0xA2),      o2(0xB1,0xA3),
-          o2(0xB1,0xA4),      o2(0xB1,0xA5),
-          o2(0xB1,0xA6),      o2(0xB1,0xA7),
-          o2(0xB1,0xA8),      o2(0xB1,0xA9),
-          o2(0xB1,0xAA),      o2(0xB1,0xAB),
-          o2(0xB1,0xAC),      o2(0xB1,0xAD),
-          o2(0xB1,0xAE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_34 = {
-    to_EUC_KR_EA_34_offsets,
-    to_EUC_KR_EA_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_35_offsets[64] = {
-     20, 20, 20, 20,  0,  1, 20,  2,     20,  3, 20, 20, 20, 20, 20, 20,
-      4, 20, 20, 20,  5, 20, 20, 20,      6, 20, 20, 20, 20, 20, 20, 20,
-     20,  7, 20,  8, 20, 20, 20, 20,     20, 20, 20, 20,  9, 10, 20, 20,
-     11, 20, 20, 12, 13, 14, 15, 20,     20, 20, 20, 16, 17, 18, 20, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_35_infos[21] = {
-          o2(0xB1,0xAF),      o2(0xB1,0xB0),
-          o2(0xB1,0xB1),      o2(0xB1,0xB2),
-          o2(0xB1,0xB3),      o2(0xB1,0xB4),
-          o2(0xB1,0xB5),      o2(0xB1,0xB6),
-          o2(0xB1,0xB7),      o2(0xB1,0xB8),
-          o2(0xB1,0xB9),      o2(0xB1,0xBA),
-          o2(0xB1,0xBB),      o2(0xB1,0xBC),
-          o2(0xB1,0xBD),      o2(0xB1,0xBE),
-          o2(0xB1,0xBF),      o2(0xB1,0xC0),
-          o2(0xB1,0xC1),      o2(0xB1,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_35 = {
-    to_EUC_KR_EA_35_offsets,
-    to_EUC_KR_EA_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_36_offsets[64] = {
-     10,  0,  1, 10, 10, 10, 10, 10,      2,  3, 10, 10,  4, 10, 10, 10,
-      5, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10,  6,  7, 10, 10,
-     10, 10, 10, 10,  8, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10,  9,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_36_infos[11] = {
-          o2(0xB1,0xC3),      o2(0xB1,0xC4),
-          o2(0xB1,0xC5),      o2(0xB1,0xC6),
-          o2(0xB1,0xC7),      o2(0xB1,0xC8),
-          o2(0xB1,0xC9),      o2(0xB1,0xCA),
-          o2(0xB1,0xCB),      o2(0xB1,0xCC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_36 = {
-    to_EUC_KR_EA_36_offsets,
-    to_EUC_KR_EA_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_37_offsets[64] = {
-      0,  1, 14, 14,  2, 14, 14, 14,      3, 14, 14, 14, 14, 14, 14, 14,
-      4,  5, 14,  6, 14, 14, 14, 14,     14, 14, 14, 14,  7, 14, 14, 14,
-      8, 14, 14, 14,  9, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     10, 11, 14, 14, 12, 14, 14, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_37_infos[15] = {
-          o2(0xB1,0xCD),      o2(0xB1,0xCE),
-          o2(0xB1,0xCF),      o2(0xB1,0xD0),
-          o2(0xB1,0xD1),      o2(0xB1,0xD2),
-          o2(0xB1,0xD3),      o2(0xB1,0xD4),
-          o2(0xB1,0xD5),      o2(0xB1,0xD6),
-          o2(0xB1,0xD7),      o2(0xB1,0xD8),
-          o2(0xB1,0xD9),      o2(0xB1,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_37 = {
-    to_EUC_KR_EA_37_offsets,
-    to_EUC_KR_EA_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_38_offsets[64] = {
-      0,  1, 13, 13, 13, 13, 13, 13,      2,  3, 13,  4, 13,  5, 13, 13,
-     13, 13, 13, 13,  6, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-      7,  8, 13, 13,  9, 13, 13, 10,     11, 13, 12, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_38_infos[14] = {
-          o2(0xB1,0xDB),      o2(0xB1,0xDC),
-          o2(0xB1,0xDD),      o2(0xB1,0xDE),
-          o2(0xB1,0xDF),      o2(0xB1,0xE0),
-          o2(0xB1,0xE1),      o2(0xB1,0xE2),
-          o2(0xB1,0xE3),      o2(0xB1,0xE4),
-          o2(0xB1,0xE5),      o2(0xB1,0xE6),
-          o2(0xB1,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_38 = {
-    to_EUC_KR_EA_38_offsets,
-    to_EUC_KR_EA_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_39_offsets[64] = {
-      0,  1, 27,  2, 27,  3,  4, 27,     27, 27,  5, 27,  6,  7,  8, 27,
-      9, 27, 27, 27, 10, 27, 11, 27,     27, 27, 27, 27, 12, 13, 27, 14,
-     15, 16, 27, 27, 27, 17, 27, 27,     18, 19, 27, 27, 20, 27, 27, 27,
-     21, 27, 27, 27, 27, 27, 27, 27,     22, 23, 27, 24, 25, 26, 27, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_39_infos[28] = {
-          o2(0xB1,0xE8),      o2(0xB1,0xE9),
-          o2(0xB1,0xEA),      o2(0xB1,0xEB),
-          o2(0xB1,0xEC),      o2(0xB1,0xED),
-          o2(0xB1,0xEE),      o2(0xB1,0xEF),
-          o2(0xB1,0xF0),      o2(0xB1,0xF1),
-          o2(0xB1,0xF2),      o2(0xB1,0xF3),
-          o2(0xB1,0xF4),      o2(0xB1,0xF5),
-          o2(0xB1,0xF6),      o2(0xB1,0xF7),
-          o2(0xB1,0xF8),      o2(0xB1,0xF9),
-          o2(0xB1,0xFA),      o2(0xB1,0xFB),
-          o2(0xB1,0xFC),      o2(0xB1,0xFD),
-          o2(0xB1,0xFE),      o2(0xB2,0xA1),
-          o2(0xB2,0xA2),      o2(0xB2,0xA3),
-          o2(0xB2,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_39 = {
-    to_EUC_KR_EA_39_offsets,
-    to_EUC_KR_EA_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3A_offsets[64] = {
-      6,  6,  6,  6,  0,  1,  6,  6,      6,  6,  6,  6,  2,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  3,  4,  5,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3A_infos[7] = {
-          o2(0xB2,0xA5),      o2(0xB2,0xA6),
-          o2(0xB2,0xA7),      o2(0xB2,0xA8),
-          o2(0xB2,0xA9),      o2(0xB2,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3A = {
-    to_EUC_KR_EA_3A_offsets,
-    to_EUC_KR_EA_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3B_offsets[64] = {
-      0, 16, 16, 16,  1, 16, 16, 16,     16, 16, 16, 16,  2,  3, 16,  4,
-      5,  6, 16, 16, 16, 16, 16, 16,      7,  8, 16, 16,  9, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     10, 16, 16, 11, 16, 12, 16, 16,
-     16, 16, 16, 16, 13, 16, 16, 16,     14, 16, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3B_infos[17] = {
-          o2(0xB2,0xAB),      o2(0xB2,0xAC),
-          o2(0xB2,0xAD),      o2(0xB2,0xAE),
-          o2(0xB2,0xAF),      o2(0xB2,0xB0),
-          o2(0xB2,0xB1),      o2(0xB2,0xB2),
-          o2(0xB2,0xB3),      o2(0xB2,0xB4),
-          o2(0xB2,0xB5),      o2(0xB2,0xB6),
-          o2(0xB2,0xB7),      o2(0xB2,0xB8),
-          o2(0xB2,0xB9),      o2(0xB2,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3B = {
-    to_EUC_KR_EA_3B_offsets,
-    to_EUC_KR_EA_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3C_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12,  0,      1, 12, 12, 12, 12,  2, 12, 12,
-      3, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12,  4,  5, 12, 12,
-      6, 12,  7, 12,  8, 12, 12, 12,     12, 12, 12, 12,  9, 10, 12, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3C_infos[13] = {
-          o2(0xB2,0xBB),      o2(0xB2,0xBC),
-          o2(0xB2,0xBD),      o2(0xB2,0xBE),
-          o2(0xB2,0xBF),      o2(0xB2,0xC0),
-          o2(0xB2,0xC1),      o2(0xB2,0xC2),
-          o2(0xB2,0xC3),      o2(0xB2,0xC4),
-          o2(0xB2,0xC5),      o2(0xB2,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3C = {
-    to_EUC_KR_EA_3C_offsets,
-    to_EUC_KR_EA_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3D_offsets[64] = {
-     11,  0,  1,  2, 11, 11, 11, 11,      3,  4, 11, 11, 11, 11, 11, 11,
-      5, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  6,  7, 11, 11,
-     11, 11, 11, 11,  8,  9, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 10, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3D_infos[12] = {
-          o2(0xB2,0xC7),      o2(0xB2,0xC8),
-          o2(0xB2,0xC9),      o2(0xB2,0xCA),
-          o2(0xB2,0xCB),      o2(0xB2,0xCC),
-          o2(0xB2,0xCD),      o2(0xB2,0xCE),
-          o2(0xB2,0xCF),      o2(0xB2,0xD0),
-          o2(0xB2,0xD1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3D = {
-    to_EUC_KR_EA_3D_offsets,
-    to_EUC_KR_EA_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3E_offsets[64] = {
-      0, 10, 10, 10,  1, 10, 10, 10,      2, 10, 10, 10, 10, 10, 10, 10,
-      3,  4, 10, 10, 10,  5, 10, 10,     10, 10, 10, 10,  6, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,      7,  8, 10, 10,  9, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3E_infos[11] = {
-          o2(0xB2,0xD2),      o2(0xB2,0xD3),
-          o2(0xB2,0xD4),      o2(0xB2,0xD5),
-          o2(0xB2,0xD6),      o2(0xB2,0xD7),
-          o2(0xB2,0xD8),      o2(0xB2,0xD9),
-          o2(0xB2,0xDA),      o2(0xB2,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3E = {
-    to_EUC_KR_EA_3E_offsets,
-    to_EUC_KR_EA_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_3F_offsets[64] = {
-      0, 15, 15, 15, 15, 15, 15,  1,      2,  3, 15,  4, 15,  5,  6, 15,
-     15, 15, 15, 15,  7, 15, 15, 15,     15, 15, 15, 15,  8, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,      9, 10, 15, 15, 15, 15, 15, 15,
-     11, 12, 15, 15, 13, 15, 15, 15,     14, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_3F_infos[16] = {
-          o2(0xB2,0xDC),      o2(0xB2,0xDD),
-          o2(0xB2,0xDE),      o2(0xB2,0xDF),
-          o2(0xB2,0xE0),      o2(0xB2,0xE1),
-          o2(0xB2,0xE2),      o2(0xB2,0xE3),
-          o2(0xB2,0xE4),      o2(0xB2,0xE5),
-          o2(0xB2,0xE6),      o2(0xB2,0xE7),
-          o2(0xB2,0xE8),      o2(0xB2,0xE9),
-          o2(0xB2,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA_3F = {
-    to_EUC_KR_EA_3F_offsets,
-    to_EUC_KR_EA_3F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EA_offsets[64] = {
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EA_infos[17] = {
-       &to_EUC_KR_EA_30,   &to_EUC_KR_EA_31,
-       &to_EUC_KR_EA_32,   &to_EUC_KR_EA_33,
-       &to_EUC_KR_EA_34,   &to_EUC_KR_EA_35,
-       &to_EUC_KR_EA_36,   &to_EUC_KR_EA_37,
-       &to_EUC_KR_EA_38,   &to_EUC_KR_EA_39,
-       &to_EUC_KR_EA_3A,   &to_EUC_KR_EA_3B,
-       &to_EUC_KR_EA_3C,   &to_EUC_KR_EA_3D,
-       &to_EUC_KR_EA_3E,   &to_EUC_KR_EA_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EA = {
-    to_EUC_KR_EA_offsets,
-    to_EUC_KR_EA_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_00_offsets[64] = {
-      0,  1,  9,  9,  2,  9,  9,  9,      9,  9,  9,  9,  3,  9,  9,  9,
-      4,  9,  9,  9,  5,  9,  9,  9,      9,  9,  9,  9,  6,  7,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      8,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_00_infos[10] = {
-          o2(0xB2,0xEB),      o2(0xB2,0xEC),
-          o2(0xB2,0xED),      o2(0xB2,0xEE),
-          o2(0xB2,0xEF),      o2(0xB2,0xF0),
-          o2(0xB2,0xF1),      o2(0xB2,0xF2),
-          o2(0xB2,0xF3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_00 = {
-    to_EUC_KR_EB_00_offsets,
-    to_EUC_KR_EB_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_01_offsets[64] = {
-     14, 14, 14, 14,  0,  1, 14, 14,      2, 14,  3, 14,  4, 14,  5, 14,
-     14, 14, 14,  6,  7,  8, 14,  9,     14, 10, 14, 14, 14, 11, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 12, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_01_infos[15] = {
-          o2(0xB2,0xF4),      o2(0xB2,0xF5),
-          o2(0xB2,0xF6),      o2(0xB2,0xF7),
-          o2(0xB2,0xF8),      o2(0xB2,0xF9),
-          o2(0xB2,0xFA),      o2(0xB2,0xFB),
-          o2(0xB2,0xFC),      o2(0xB2,0xFD),
-          o2(0xB2,0xFE),      o2(0xB3,0xA1),
-          o2(0xB3,0xA2),      o2(0xB3,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_01 = {
-    to_EUC_KR_EB_01_offsets,
-    to_EUC_KR_EB_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_02_offsets[64] = {
-      0, 27, 27, 27,  1, 27, 27, 27,     27, 27, 27, 27,  2,  3, 27,  4,
-     27,  5, 27, 27, 27, 27, 27, 27,      6,  7,  8, 27,  9, 27, 27, 10,
-     11, 12, 13, 27, 27, 27, 27, 27,     14, 15, 27, 16, 17, 18, 19, 20,
-     27, 21, 27, 22, 23, 24, 27, 27,     25, 27, 27, 27, 26, 27, 27, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_02_infos[28] = {
-          o2(0xB3,0xA4),      o2(0xB3,0xA5),
-          o2(0xB3,0xA6),      o2(0xB3,0xA7),
-          o2(0xB3,0xA8),      o2(0xB3,0xA9),
-          o2(0xB3,0xAA),      o2(0xB3,0xAB),
-          o2(0xB3,0xAC),      o2(0xB3,0xAD),
-          o2(0xB3,0xAE),      o2(0xB3,0xAF),
-          o2(0xB3,0xB0),      o2(0xB3,0xB1),
-          o2(0xB3,0xB2),      o2(0xB3,0xB3),
-          o2(0xB3,0xB4),      o2(0xB3,0xB5),
-          o2(0xB3,0xB6),      o2(0xB3,0xB7),
-          o2(0xB3,0xB8),      o2(0xB3,0xB9),
-          o2(0xB3,0xBA),      o2(0xB3,0xBB),
-          o2(0xB3,0xBC),      o2(0xB3,0xBD),
-          o2(0xB3,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_02 = {
-    to_EUC_KR_EB_02_offsets,
-    to_EUC_KR_EB_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_03_offsets[64] = {
-     11, 11, 11, 11,  0,  1, 11,  2,      3,  4, 11, 11, 11, 11, 11, 11,
-      5,  6, 11, 11,  7, 11, 11, 11,      8, 11, 11, 11, 11, 11, 11, 11,
-      9, 11, 11, 11, 11, 10, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_03_infos[12] = {
-          o2(0xB3,0xBF),      o2(0xB3,0xC0),
-          o2(0xB3,0xC1),      o2(0xB3,0xC2),
-          o2(0xB3,0xC3),      o2(0xB3,0xC4),
-          o2(0xB3,0xC5),      o2(0xB3,0xC6),
-          o2(0xB3,0xC7),      o2(0xB3,0xC8),
-          o2(0xB3,0xC9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_03 = {
-    to_EUC_KR_EB_03_offsets,
-    to_EUC_KR_EB_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_04_offsets[64] = {
-     22, 22, 22, 22, 22, 22, 22, 22,      0,  1, 22,  2,  3, 22, 22, 22,
-      4, 22,  5,  6, 22, 22, 22, 22,      7,  8, 22,  9, 10, 11, 22, 22,
-     22, 22, 22, 12, 13, 14, 22, 22,     15, 22, 22, 22, 16, 22, 22, 22,
-     22, 22, 22, 22, 17, 18, 22, 19,     20, 21, 22, 22, 22, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_04_infos[23] = {
-          o2(0xB3,0xCA),      o2(0xB3,0xCB),
-          o2(0xB3,0xCC),      o2(0xB3,0xCD),
-          o2(0xB3,0xCE),      o2(0xB3,0xCF),
-          o2(0xB3,0xD0),      o2(0xB3,0xD1),
-          o2(0xB3,0xD2),      o2(0xB3,0xD3),
-          o2(0xB3,0xD4),      o2(0xB3,0xD5),
-          o2(0xB3,0xD6),      o2(0xB3,0xD7),
-          o2(0xB3,0xD8),      o2(0xB3,0xD9),
-          o2(0xB3,0xDA),      o2(0xB3,0xDB),
-          o2(0xB3,0xDC),      o2(0xB3,0xDD),
-          o2(0xB3,0xDE),      o2(0xB3,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_04 = {
-    to_EUC_KR_EB_04_offsets,
-    to_EUC_KR_EB_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_05_offsets[64] = {
-      0,  1, 14, 14,  2, 14, 14, 14,      3, 14, 14, 14, 14, 14, 14, 14,
-      4,  5, 14, 14,  6,  7, 14, 14,      8, 14, 14, 14,  9, 14, 14, 14,
-     10, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     11, 12, 14, 14, 13, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_05_infos[15] = {
-          o2(0xB3,0xE0),      o2(0xB3,0xE1),
-          o2(0xB3,0xE2),      o2(0xB3,0xE3),
-          o2(0xB3,0xE4),      o2(0xB3,0xE5),
-          o2(0xB3,0xE6),      o2(0xB3,0xE7),
-          o2(0xB3,0xE8),      o2(0xB3,0xE9),
-          o2(0xB3,0xEA),      o2(0xB3,0xEB),
-          o2(0xB3,0xEC),      o2(0xB3,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_05 = {
-    to_EUC_KR_EB_05_offsets,
-    to_EUC_KR_EB_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_06_offsets[64] = {
-      0, 12,  1, 12, 12, 12, 12, 12,      2,  3, 12,  4, 12,  5, 12, 12,
-     12, 12,  6,  7,  8, 12, 12, 12,      9, 12, 12, 12, 10, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     11, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_06_infos[13] = {
-          o2(0xB3,0xEE),      o2(0xB3,0xEF),
-          o2(0xB3,0xF0),      o2(0xB3,0xF1),
-          o2(0xB3,0xF2),      o2(0xB3,0xF3),
-          o2(0xB3,0xF4),      o2(0xB3,0xF5),
-          o2(0xB3,0xF6),      o2(0xB3,0xF7),
-          o2(0xB3,0xF8),      o2(0xB3,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_06 = {
-    to_EUC_KR_EB_06_offsets,
-    to_EUC_KR_EB_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_07_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13,  0, 13, 13, 13,
-      1, 13, 13, 13,  2, 13, 13, 13,     13, 13, 13, 13,  3,  4, 13,  5,
-     13, 13, 13, 13, 13, 13, 13, 13,      6,  7, 13, 13,  8, 13, 13, 13,
-      9, 13, 13, 13, 13, 13, 13, 13,     13, 10, 13, 11, 13, 12, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_07_infos[14] = {
-          o2(0xB3,0xFA),      o2(0xB3,0xFB),
-          o2(0xB3,0xFC),      o2(0xB3,0xFD),
-          o2(0xB3,0xFE),      o2(0xB4,0xA1),
-          o2(0xB4,0xA2),      o2(0xB4,0xA3),
-          o2(0xB4,0xA4),      o2(0xB4,0xA5),
-          o2(0xB4,0xA6),      o2(0xB4,0xA7),
-          o2(0xB4,0xA8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_07 = {
-    to_EUC_KR_EB_07_offsets,
-    to_EUC_KR_EB_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_08_offsets[64] = {
-     12, 12, 12, 12,  0,  1, 12, 12,      2, 12, 12,  3,  4, 12, 12, 12,
-     12, 12, 12, 12,  5,  6, 12,  7,     12,  8, 12, 12, 12, 12, 12, 12,
-      9, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 10, 12, 12, 12,     12, 12, 12, 12, 11, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_08_infos[13] = {
-          o2(0xB4,0xA9),      o2(0xB4,0xAA),
-          o2(0xB4,0xAB),      o2(0xB4,0xAC),
-          o2(0xB4,0xAD),      o2(0xB4,0xAE),
-          o2(0xB4,0xAF),      o2(0xB4,0xB0),
-          o2(0xB4,0xB1),      o2(0xB4,0xB2),
-          o2(0xB4,0xB3),      o2(0xB4,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_08 = {
-    to_EUC_KR_EB_08_offsets,
-    to_EUC_KR_EB_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_09_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  8,  8,  8,  1,  8,  8,  8,
-      2,  8,  8,  8,  8,  8,  8,  8,      3,  4,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  5,  6,  8,  8,      8,  8,  8,  8,  7,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_09_infos[9] = {
-          o2(0xB4,0xB5),      o2(0xB4,0xB6),
-          o2(0xB4,0xB7),      o2(0xB4,0xB8),
-          o2(0xB4,0xB9),      o2(0xB4,0xBA),
-          o2(0xB4,0xBB),      o2(0xB4,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_09 = {
-    to_EUC_KR_EB_09_offsets,
-    to_EUC_KR_EB_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0A_offsets[64] = {
-     18, 18, 18, 18,  0,  1, 18, 18,     18,  2, 18, 18, 18, 18, 18, 18,
-      3,  4, 18, 18,  5, 18, 18, 18,      6,  7,  8, 18, 18, 18, 18, 18,
-      9, 10, 18, 11, 18, 12, 13, 18,     18, 18, 14, 18, 15, 18, 18, 18,
-     16, 18, 18, 18, 17, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0A_infos[19] = {
-          o2(0xB4,0xBD),      o2(0xB4,0xBE),
-          o2(0xB4,0xBF),      o2(0xB4,0xC0),
-          o2(0xB4,0xC1),      o2(0xB4,0xC2),
-          o2(0xB4,0xC3),      o2(0xB4,0xC4),
-          o2(0xB4,0xC5),      o2(0xB4,0xC6),
-          o2(0xB4,0xC7),      o2(0xB4,0xC8),
-          o2(0xB4,0xC9),      o2(0xB4,0xCA),
-          o2(0xB4,0xCB),      o2(0xB4,0xCC),
-          o2(0xB4,0xCD),      o2(0xB4,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0A = {
-    to_EUC_KR_EB_0A_offsets,
-    to_EUC_KR_EB_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0B_offsets[64] = {
-     28, 28, 28, 28, 28, 28, 28, 28,      0,  1, 28, 28,  2, 28, 28, 28,
-      3, 28,  4, 28, 28, 28, 28, 28,      5,  6, 28,  7, 28,  8, 28, 28,
-     28, 28,  9, 28, 10, 11, 12, 28,     13, 28, 28, 14, 15, 16, 17, 18,
-     28, 28, 28, 19, 20, 21, 28, 22,     23, 24, 25, 26, 28, 28, 28, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0B_infos[29] = {
-          o2(0xB4,0xCF),      o2(0xB4,0xD0),
-          o2(0xB4,0xD1),      o2(0xB4,0xD2),
-          o2(0xB4,0xD3),      o2(0xB4,0xD4),
-          o2(0xB4,0xD5),      o2(0xB4,0xD6),
-          o2(0xB4,0xD7),      o2(0xB4,0xD8),
-          o2(0xB4,0xD9),      o2(0xB4,0xDA),
-          o2(0xB4,0xDB),      o2(0xB4,0xDC),
-          o2(0xB4,0xDD),      o2(0xB4,0xDE),
-          o2(0xB4,0xDF),      o2(0xB4,0xE0),
-          o2(0xB4,0xE1),      o2(0xB4,0xE2),
-          o2(0xB4,0xE3),      o2(0xB4,0xE4),
-          o2(0xB4,0xE5),      o2(0xB4,0xE6),
-          o2(0xB4,0xE7),      o2(0xB4,0xE8),
-          o2(0xB4,0xE9),      o2(0xB4,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0B = {
-    to_EUC_KR_EB_0B_offsets,
-    to_EUC_KR_EB_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0C_offsets[64] = {
-      0,  1, 10, 10,  2, 10, 10, 10,      3, 10, 10, 10, 10, 10, 10, 10,
-      4,  5, 10,  6,  7,  8, 10, 10,     10, 10, 10, 10,  9, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0C_infos[11] = {
-          o2(0xB4,0xEB),      o2(0xB4,0xEC),
-          o2(0xB4,0xED),      o2(0xB4,0xEE),
-          o2(0xB4,0xEF),      o2(0xB4,0xF0),
-          o2(0xB4,0xF1),      o2(0xB4,0xF2),
-          o2(0xB4,0xF3),      o2(0xB4,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0C = {
-    to_EUC_KR_EB_0C_offsets,
-    to_EUC_KR_EB_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0D_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18,  0,  1,  2, 18,      3, 18, 18,  4,  5, 18,  6,  7,
-     18, 18, 18, 18,  8,  9, 18, 10,     18, 11, 18, 12, 18, 18, 13, 18,
-     14, 15, 18, 18, 16, 18, 18, 18,     17, 18, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0D_infos[19] = {
-          o2(0xB4,0xF5),      o2(0xB4,0xF6),
-          o2(0xB4,0xF7),      o2(0xB4,0xF8),
-          o2(0xB4,0xF9),      o2(0xB4,0xFA),
-          o2(0xB4,0xFB),      o2(0xB4,0xFC),
-          o2(0xB4,0xFD),      o2(0xB4,0xFE),
-          o2(0xB5,0xA1),      o2(0xB5,0xA2),
-          o2(0xB5,0xA3),      o2(0xB5,0xA4),
-          o2(0xB5,0xA5),      o2(0xB5,0xA6),
-          o2(0xB5,0xA7),      o2(0xB5,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0D = {
-    to_EUC_KR_EB_0D_offsets,
-    to_EUC_KR_EB_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0E_offsets[64] = {
-      0,  1, 12,  2,  3,  4, 12, 12,     12, 12, 12, 12,  5, 12, 12, 12,
-      6, 12, 12, 12,  7, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-      8,  9, 12, 12, 12, 12, 12, 12,     10, 12, 12, 12, 11, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0E_infos[13] = {
-          o2(0xB5,0xA9),      o2(0xB5,0xAA),
-          o2(0xB5,0xAB),      o2(0xB5,0xAC),
-          o2(0xB5,0xAD),      o2(0xB5,0xAE),
-          o2(0xB5,0xAF),      o2(0xB5,0xB0),
-          o2(0xB5,0xB1),      o2(0xB5,0xB2),
-          o2(0xB5,0xB3),      o2(0xB5,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0E = {
-    to_EUC_KR_EB_0E_offsets,
-    to_EUC_KR_EB_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_0F_offsets[64] = {
-     17, 17, 17, 17,  0,  1, 17, 17,      2, 17, 17,  3,  4, 17,  5, 17,
-      6, 17, 17, 17,  7,  8, 17,  9,     17, 10, 17, 11, 17, 12, 17, 17,
-     13, 17, 17, 17, 14, 17, 17, 17,     15, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 16, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_0F_infos[18] = {
-          o2(0xB5,0xB5),      o2(0xB5,0xB6),
-          o2(0xB5,0xB7),      o2(0xB5,0xB8),
-          o2(0xB5,0xB9),      o2(0xB5,0xBA),
-          o2(0xB5,0xBB),      o2(0xB5,0xBC),
-          o2(0xB5,0xBD),      o2(0xB5,0xBE),
-          o2(0xB5,0xBF),      o2(0xB5,0xC0),
-          o2(0xB5,0xC1),      o2(0xB5,0xC2),
-          o2(0xB5,0xC3),      o2(0xB5,0xC4),
-          o2(0xB5,0xC5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_0F = {
-    to_EUC_KR_EB_0F_offsets,
-    to_EUC_KR_EB_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_10_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      0,  8,  8,  8,  8,  8,  8,  8,      1,  8,  8,  8,  2,  8,  8,  8,
-      3,  8,  8,  8,  8,  8,  8,  8,      4,  5,  8,  6,  8,  8,  8,  8,
-      8,  8,  8,  8,  7,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_10_infos[9] = {
-          o2(0xB5,0xC6),      o2(0xB5,0xC7),
-          o2(0xB5,0xC8),      o2(0xB5,0xC9),
-          o2(0xB5,0xCA),      o2(0xB5,0xCB),
-          o2(0xB5,0xCC),      o2(0xB5,0xCD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_10 = {
-    to_EUC_KR_EB_10_offsets,
-    to_EUC_KR_EB_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_11_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      0,  1,  9,  9,  2,  9,  9,  9,      3,  9,  9,  9,  9,  9,  9,  9,
-      4,  5,  9,  6,  9,  7,  9,  9,      9,  9,  9,  9,  8,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_11_infos[10] = {
-          o2(0xB5,0xCE),      o2(0xB5,0xCF),
-          o2(0xB5,0xD0),      o2(0xB5,0xD1),
-          o2(0xB5,0xD2),      o2(0xB5,0xD3),
-          o2(0xB5,0xD4),      o2(0xB5,0xD5),
-          o2(0xB5,0xD6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_11 = {
-    to_EUC_KR_EB_11_offsets,
-    to_EUC_KR_EB_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_12_offsets[64] = {
-      0,  9,  9,  9,  9,  9,  9,  9,      1,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  2,  9,  9,
-      9,  9,  9,  9,  3,  9,  9,  9,      4,  9,  9,  9,  5,  9,  9,  9,
-      9,  9,  9,  9,  9,  6,  9,  7,      9,  8,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_12_infos[10] = {
-          o2(0xB5,0xD7),      o2(0xB5,0xD8),
-          o2(0xB5,0xD9),      o2(0xB5,0xDA),
-          o2(0xB5,0xDB),      o2(0xB5,0xDC),
-          o2(0xB5,0xDD),      o2(0xB5,0xDE),
-          o2(0xB5,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_12 = {
-    to_EUC_KR_EB_12_offsets,
-    to_EUC_KR_EB_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_13_offsets[64] = {
-      0, 16, 16, 16,  1, 16, 16, 16,      2, 16, 16, 16, 16, 16, 16, 16,
-      3, 16, 16, 16, 16,  4, 16, 16,     16, 16, 16, 16,  5,  6, 16, 16,
-      7, 16, 16,  8,  9, 16, 10, 16,     16, 16, 16, 16, 11, 12, 16, 13,
-     16, 14, 16, 16, 16, 16, 16, 16,     15, 16, 16, 16, 16, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_13_infos[17] = {
-          o2(0xB5,0xE0),      o2(0xB5,0xE1),
-          o2(0xB5,0xE2),      o2(0xB5,0xE3),
-          o2(0xB5,0xE4),      o2(0xB5,0xE5),
-          o2(0xB5,0xE6),      o2(0xB5,0xE7),
-          o2(0xB5,0xE8),      o2(0xB5,0xE9),
-          o2(0xB5,0xEA),      o2(0xB5,0xEB),
-          o2(0xB5,0xEC),      o2(0xB5,0xED),
-          o2(0xB5,0xEE),      o2(0xB5,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_13 = {
-    to_EUC_KR_EB_13_offsets,
-    to_EUC_KR_EB_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_14_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15,  0,  1, 15, 15,      2, 15, 15,  3,  4, 15, 15, 15,
-     15, 15, 15, 15,  5,  6, 15,  7,      8,  9, 10, 15, 15, 15, 15, 15,
-     11, 12, 15, 15, 13, 15, 15, 15,     14, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_14_infos[16] = {
-          o2(0xB5,0xF0),      o2(0xB5,0xF1),
-          o2(0xB5,0xF2),      o2(0xB5,0xF3),
-          o2(0xB5,0xF4),      o2(0xB5,0xF5),
-          o2(0xB5,0xF6),      o2(0xB5,0xF7),
-          o2(0xB5,0xF8),      o2(0xB5,0xF9),
-          o2(0xB5,0xFA),      o2(0xB5,0xFB),
-          o2(0xB5,0xFC),      o2(0xB5,0xFD),
-          o2(0xB5,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_14 = {
-    to_EUC_KR_EB_14_offsets,
-    to_EUC_KR_EB_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_15_offsets[64] = {
-      0,  1, 15,  2,  3,  4, 15, 15,     15, 15, 15,  5,  6,  7, 15, 15,
-      8, 15, 15, 15,  9, 15, 15, 15,     15, 15, 15, 15, 10, 11, 15, 12,
-     13, 14, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_15_infos[16] = {
-          o2(0xB6,0xA1),      o2(0xB6,0xA2),
-          o2(0xB6,0xA3),      o2(0xB6,0xA4),
-          o2(0xB6,0xA5),      o2(0xB6,0xA6),
-          o2(0xB6,0xA7),      o2(0xB6,0xA8),
-          o2(0xB6,0xA9),      o2(0xB6,0xAA),
-          o2(0xB6,0xAB),      o2(0xB6,0xAC),
-          o2(0xB6,0xAD),      o2(0xB6,0xAE),
-          o2(0xB6,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_15 = {
-    to_EUC_KR_EB_15_offsets,
-    to_EUC_KR_EB_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_16_offsets[64] = {
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-      0,  1, 14, 14,  2, 14, 14, 14,      3, 14,  4,  5, 14, 14, 14, 14,
-      6,  7, 14,  8,  9, 10, 14, 14,     14, 14, 14, 11, 12, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_16_infos[15] = {
-          o2(0xB6,0xB0),      o2(0xB6,0xB1),
-          o2(0xB6,0xB2),      o2(0xB6,0xB3),
-          o2(0xB6,0xB4),      o2(0xB6,0xB5),
-          o2(0xB6,0xB6),      o2(0xB6,0xB7),
-          o2(0xB6,0xB8),      o2(0xB6,0xB9),
-          o2(0xB6,0xBA),      o2(0xB6,0xBB),
-          o2(0xB6,0xBC),      o2(0xB6,0xBD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_16 = {
-    to_EUC_KR_EB_16_offsets,
-    to_EUC_KR_EB_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_17_offsets[64] = {
-      0,  9,  9,  9,  1,  9,  9,  9,      9,  9,  9,  9,  2,  3,  9,  4,
-      5,  6,  9,  9,  9,  9,  9,  9,      7,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  8,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_17_infos[10] = {
-          o2(0xB6,0xBE),      o2(0xB6,0xBF),
-          o2(0xB6,0xC0),      o2(0xB6,0xC1),
-          o2(0xB6,0xC2),      o2(0xB6,0xC3),
-          o2(0xB6,0xC4),      o2(0xB6,0xC5),
-          o2(0xB6,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_17 = {
-    to_EUC_KR_EB_17_offsets,
-    to_EUC_KR_EB_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_18_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      0,  1,  7,  7,  2,  7,  7,  7,      3,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  4,  7,  7,      7,  7,  7,  7,  5,  7,  7,  7,
-      7,  7,  7,  7,  6,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_18_infos[8] = {
-          o2(0xB6,0xC7),      o2(0xB6,0xC8),
-          o2(0xB6,0xC9),      o2(0xB6,0xCA),
-          o2(0xB6,0xCB),      o2(0xB6,0xCC),
-          o2(0xB6,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_18 = {
-    to_EUC_KR_EB_18_offsets,
-    to_EUC_KR_EB_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_19_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,      0,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  1,  3,  3,  3,      2,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_19_infos[4] = {
-          o2(0xB6,0xCE),      o2(0xB6,0xCF),
-          o2(0xB6,0xD0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_19 = {
-    to_EUC_KR_EB_19_offsets,
-    to_EUC_KR_EB_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1A_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  0,  1,  7,  7,
-      2,  7,  7,  7,  3,  7,  7,  7,      7,  7,  7,  4,  5,  7,  7,  7,
-      7,  6,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1A_infos[8] = {
-          o2(0xB6,0xD1),      o2(0xB6,0xD2),
-          o2(0xB6,0xD3),      o2(0xB6,0xD4),
-          o2(0xB6,0xD5),      o2(0xB6,0xD6),
-          o2(0xB6,0xD7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1A = {
-    to_EUC_KR_EB_1A_offsets,
-    to_EUC_KR_EB_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1B_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  0,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      1,  4,  4,  4,  2,  4,  4,  4,      3,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1B_infos[5] = {
-          o2(0xB6,0xD8),      o2(0xB6,0xD9),
-          o2(0xB6,0xDA),      o2(0xB6,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1B = {
-    to_EUC_KR_EB_1B_offsets,
-    to_EUC_KR_EB_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1C_offsets[64] = {
-      0,  1, 11, 11, 11,  2, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      3,  4, 11, 11,  5, 11, 11,  6,
-      7, 11, 11, 11, 11, 11, 11, 11,      8,  9, 11, 10, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1C_infos[12] = {
-          o2(0xB6,0xDC),      o2(0xB6,0xDD),
-          o2(0xB6,0xDE),      o2(0xB6,0xDF),
-          o2(0xB6,0xE0),      o2(0xB6,0xE1),
-          o2(0xB6,0xE2),      o2(0xB6,0xE3),
-          o2(0xB6,0xE4),      o2(0xB6,0xE5),
-          o2(0xB6,0xE6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1C = {
-    to_EUC_KR_EB_1C_offsets,
-    to_EUC_KR_EB_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1D_offsets[64] = {
-     14, 14, 14, 14,  0, 14, 14, 14,      1, 14, 14, 14,  2, 14, 14, 14,
-     14, 14, 14, 14,  3,  4, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-      5, 14, 14, 14,  6, 14, 14, 14,      7, 14, 14, 14, 14, 14, 14, 14,
-      8,  9, 14, 10, 14, 11, 14, 14,     14, 14, 14, 14, 12, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1D_infos[15] = {
-          o2(0xB6,0xE7),      o2(0xB6,0xE8),
-          o2(0xB6,0xE9),      o2(0xB6,0xEA),
-          o2(0xB6,0xEB),      o2(0xB6,0xEC),
-          o2(0xB6,0xED),      o2(0xB6,0xEE),
-          o2(0xB6,0xEF),      o2(0xB6,0xF0),
-          o2(0xB6,0xF1),      o2(0xB6,0xF2),
-          o2(0xB6,0xF3),      o2(0xB6,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1D = {
-    to_EUC_KR_EB_1D_offsets,
-    to_EUC_KR_EB_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1E_offsets[64] = {
-      0, 22, 22, 22,  1, 22, 22, 22,     22, 22, 22, 22,  2,  3, 22,  4,
-      5,  6,  7, 22, 22, 22,  8,  9,     10, 11, 22, 22, 12, 22, 22, 22,
-     13, 22, 22, 22, 22, 22, 22, 22,     14, 15, 22, 16, 17, 18, 22, 22,
-     22, 22, 22, 22, 19, 20, 22, 22,     21, 22, 22, 22, 22, 22, 22, 22,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1E_infos[23] = {
-          o2(0xB6,0xF5),      o2(0xB6,0xF6),
-          o2(0xB6,0xF7),      o2(0xB6,0xF8),
-          o2(0xB6,0xF9),      o2(0xB6,0xFA),
-          o2(0xB6,0xFB),      o2(0xB6,0xFC),
-          o2(0xB6,0xFD),      o2(0xB6,0xFE),
-          o2(0xB7,0xA1),      o2(0xB7,0xA2),
-          o2(0xB7,0xA3),      o2(0xB7,0xA4),
-          o2(0xB7,0xA5),      o2(0xB7,0xA6),
-          o2(0xB7,0xA7),      o2(0xB7,0xA8),
-          o2(0xB7,0xA9),      o2(0xB7,0xAA),
-          o2(0xB7,0xAB),      o2(0xB7,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1E = {
-    to_EUC_KR_EB_1E_offsets,
-    to_EUC_KR_EB_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_1F_offsets[64] = {
-      9,  9,  9,  9,  9,  9,  9,  0,      9,  1,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  2,  3,  9,  9,
-      4,  9,  9,  9,  5,  9,  9,  9,      9,  9,  9,  9,  6,  7,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_1F_infos[10] = {
-          o2(0xB7,0xAD),      o2(0xB7,0xAE),
-          o2(0xB7,0xAF),      o2(0xB7,0xB0),
-          o2(0xB7,0xB1),      o2(0xB7,0xB2),
-          o2(0xB7,0xB3),      o2(0xB7,0xB4),
-          o2(0xB7,0xB5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_1F = {
-    to_EUC_KR_EB_1F_offsets,
-    to_EUC_KR_EB_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_20_offsets[64] = {
-      0,  1, 20, 20, 20, 20, 20,  2,      3,  4, 20, 20,  5, 20, 20, 20,
-      6, 20, 20, 20, 20, 20, 20, 20,      7,  8, 20,  9, 20, 10, 20, 20,
-     20, 20, 20, 20, 11, 12, 20, 20,     13, 20, 20, 20, 14, 20, 20, 20,
-     20, 20, 20, 20, 15, 16, 20, 17,     18, 19, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_20_infos[21] = {
-          o2(0xB7,0xB6),      o2(0xB7,0xB7),
-          o2(0xB7,0xB8),      o2(0xB7,0xB9),
-          o2(0xB7,0xBA),      o2(0xB7,0xBB),
-          o2(0xB7,0xBC),      o2(0xB7,0xBD),
-          o2(0xB7,0xBE),      o2(0xB7,0xBF),
-          o2(0xB7,0xC0),      o2(0xB7,0xC1),
-          o2(0xB7,0xC2),      o2(0xB7,0xC3),
-          o2(0xB7,0xC4),      o2(0xB7,0xC5),
-          o2(0xB7,0xC6),      o2(0xB7,0xC7),
-          o2(0xB7,0xC8),      o2(0xB7,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_20 = {
-    to_EUC_KR_EB_20_offsets,
-    to_EUC_KR_EB_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_21_offsets[64] = {
-      0, 14, 14, 14,  1, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14,  2, 14,  3, 14, 14, 14, 14,     14, 14, 14, 14,  4,  5, 14, 14,
-      6, 14, 14, 14,  7, 14, 14, 14,     14, 14, 14, 14,  8,  9, 14, 10,
-     14, 11, 14, 14, 14, 14, 14, 14,     12, 14, 14, 14, 13, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_21_infos[15] = {
-          o2(0xB7,0xCA),      o2(0xB7,0xCB),
-          o2(0xB7,0xCC),      o2(0xB7,0xCD),
-          o2(0xB7,0xCE),      o2(0xB7,0xCF),
-          o2(0xB7,0xD0),      o2(0xB7,0xD1),
-          o2(0xB7,0xD2),      o2(0xB7,0xD3),
-          o2(0xB7,0xD4),      o2(0xB7,0xD5),
-          o2(0xB7,0xD6),      o2(0xB7,0xD7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_21 = {
-    to_EUC_KR_EB_21_offsets,
-    to_EUC_KR_EB_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_22_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  0,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      1,  5,  5,  5,  5,  5,  5,  5,
-      2,  5,  5,  5,  3,  5,  5,  5,      4,  5,  5,  5,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_22_infos[6] = {
-          o2(0xB7,0xD8),      o2(0xB7,0xD9),
-          o2(0xB7,0xDA),      o2(0xB7,0xDB),
-          o2(0xB7,0xDC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_22 = {
-    to_EUC_KR_EB_22_offsets,
-    to_EUC_KR_EB_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_23_offsets[64] = {
-      0,  1, 18,  2, 18,  3, 18, 18,     18, 18, 18, 18,  4, 18, 18, 18,
-      5, 18, 18, 18,  6, 18, 18, 18,     18, 18, 18, 18, 18,  7, 18,  8,
-     18,  9, 18, 18, 18, 18, 18, 18,     10, 11, 18, 18, 12, 18, 18, 18,
-     13, 18, 18, 18, 18, 18, 18, 18,     14, 15, 18, 16, 18, 17, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_23_infos[19] = {
-          o2(0xB7,0xDD),      o2(0xB7,0xDE),
-          o2(0xB7,0xDF),      o2(0xB7,0xE0),
-          o2(0xB7,0xE1),      o2(0xB7,0xE2),
-          o2(0xB7,0xE3),      o2(0xB7,0xE4),
-          o2(0xB7,0xE5),      o2(0xB7,0xE6),
-          o2(0xB7,0xE7),      o2(0xB7,0xE8),
-          o2(0xB7,0xE9),      o2(0xB7,0xEA),
-          o2(0xB7,0xEB),      o2(0xB7,0xEC),
-          o2(0xB7,0xED),      o2(0xB7,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_23 = {
-    to_EUC_KR_EB_23_offsets,
-    to_EUC_KR_EB_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_24_offsets[64] = {
-      5,  5,  5,  5,  0,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      1,  5,  5,  5,  5,  5,  5,  5,
-      2,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  3,  4,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_24_infos[6] = {
-          o2(0xB7,0xEF),      o2(0xB7,0xF0),
-          o2(0xB7,0xF1),      o2(0xB7,0xF2),
-          o2(0xB7,0xF3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_24 = {
-    to_EUC_KR_EB_24_offsets,
-    to_EUC_KR_EB_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_25_offsets[64] = {
-      0, 17, 17, 17,  1, 17, 17, 17,     17, 17, 17, 17,  2, 17, 17,  3,
-     17,  4, 17, 17, 17, 17, 17, 17,      5,  6, 17, 17,  7, 17, 17, 17,
-      8, 17, 17, 17, 17, 17, 17, 17,      9, 10, 17, 11, 17, 12, 17, 17,
-     17, 17, 17, 17, 13, 14, 17, 17,     15, 17, 17, 17, 16, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_25_infos[18] = {
-          o2(0xB7,0xF4),      o2(0xB7,0xF5),
-          o2(0xB7,0xF6),      o2(0xB7,0xF7),
-          o2(0xB7,0xF8),      o2(0xB7,0xF9),
-          o2(0xB7,0xFA),      o2(0xB7,0xFB),
-          o2(0xB7,0xFC),      o2(0xB7,0xFD),
-          o2(0xB7,0xFE),      o2(0xB8,0xA1),
-          o2(0xB8,0xA2),      o2(0xB8,0xA3),
-          o2(0xB8,0xA4),      o2(0xB8,0xA5),
-          o2(0xB8,0xA6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_25 = {
-    to_EUC_KR_EB_25_offsets,
-    to_EUC_KR_EB_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_26_offsets[64] = {
-     14, 14, 14, 14,  0,  1, 14,  2,     14,  3,  4, 14, 14,  5,  6, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14,  7,  8, 14, 14,
-      9, 14, 14, 14, 10, 14, 14, 14,     14, 14, 14, 14, 11, 12, 14, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_26_infos[15] = {
-          o2(0xB8,0xA7),      o2(0xB8,0xA8),
-          o2(0xB8,0xA9),      o2(0xB8,0xAA),
-          o2(0xB8,0xAB),      o2(0xB8,0xAC),
-          o2(0xB8,0xAD),      o2(0xB8,0xAE),
-          o2(0xB8,0xAF),      o2(0xB8,0xB0),
-          o2(0xB8,0xB1),      o2(0xB8,0xB2),
-          o2(0xB8,0xB3),      o2(0xB8,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_26 = {
-    to_EUC_KR_EB_26_offsets,
-    to_EUC_KR_EB_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_27_offsets[64] = {
-     26,  0, 26, 26, 26, 26, 26, 26,      1,  2, 26, 26,  3, 26,  4,  5,
-      6,  7,  8, 26, 26, 26, 26, 26,      9, 10, 26, 11, 26, 12, 13, 26,
-     26, 14, 26, 15, 16, 17, 26, 26,     18, 26, 26, 26, 19, 26, 26, 26,
-     26, 26, 26, 26, 20, 21, 26, 22,     23, 24, 25, 26, 26, 26, 26, 26,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_27_infos[27] = {
-          o2(0xB8,0xB5),      o2(0xB8,0xB6),
-          o2(0xB8,0xB7),      o2(0xB8,0xB8),
-          o2(0xB8,0xB9),      o2(0xB8,0xBA),
-          o2(0xB8,0xBB),      o2(0xB8,0xBC),
-          o2(0xB8,0xBD),      o2(0xB8,0xBE),
-          o2(0xB8,0xBF),      o2(0xB8,0xC0),
-          o2(0xB8,0xC1),      o2(0xB8,0xC2),
-          o2(0xB8,0xC3),      o2(0xB8,0xC4),
-          o2(0xB8,0xC5),      o2(0xB8,0xC6),
-          o2(0xB8,0xC7),      o2(0xB8,0xC8),
-          o2(0xB8,0xC9),      o2(0xB8,0xCA),
-          o2(0xB8,0xCB),      o2(0xB8,0xCC),
-          o2(0xB8,0xCD),      o2(0xB8,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_27 = {
-    to_EUC_KR_EB_27_offsets,
-    to_EUC_KR_EB_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_28_offsets[64] = {
-      0,  1,  7,  7,  7,  7,  7,  7,      2,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  3,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      4,  5,  7,  7,  6,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_28_infos[8] = {
-          o2(0xB8,0xCF),      o2(0xB8,0xD0),
-          o2(0xB8,0xD1),      o2(0xB8,0xD2),
-          o2(0xB8,0xD3),      o2(0xB8,0xD4),
-          o2(0xB8,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_28 = {
-    to_EUC_KR_EB_28_offsets,
-    to_EUC_KR_EB_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_29_offsets[64] = {
-      0, 21,  1, 21, 21, 21, 21, 21,      2,  3, 21,  4, 21,  5,  6, 21,
-     21, 21, 21,  7,  8,  9, 21, 21,     10, 21, 21, 21, 11, 21, 21, 21,
-     21, 21, 21, 21, 12, 13, 21, 14,     15, 16, 21, 21, 21, 21, 21, 21,
-     17, 18, 21, 21, 19, 21, 21, 21,     20, 21, 21, 21, 21, 21, 21, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_29_infos[22] = {
-          o2(0xB8,0xD6),      o2(0xB8,0xD7),
-          o2(0xB8,0xD8),      o2(0xB8,0xD9),
-          o2(0xB8,0xDA),      o2(0xB8,0xDB),
-          o2(0xB8,0xDC),      o2(0xB8,0xDD),
-          o2(0xB8,0xDE),      o2(0xB8,0xDF),
-          o2(0xB8,0xE0),      o2(0xB8,0xE1),
-          o2(0xB8,0xE2),      o2(0xB8,0xE3),
-          o2(0xB8,0xE4),      o2(0xB8,0xE5),
-          o2(0xB8,0xE6),      o2(0xB8,0xE7),
-          o2(0xB8,0xE8),      o2(0xB8,0xE9),
-          o2(0xB8,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_29 = {
-    to_EUC_KR_EB_29_offsets,
-    to_EUC_KR_EB_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2A_offsets[64] = {
-     15, 15, 15,  0,  1,  2, 15,  3,     15, 15, 15, 15,  4, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,      5,  6, 15,  7,  8, 15, 15, 15,
-      9, 15, 10, 15, 15, 15, 15, 15,     11, 12, 15, 13, 15, 14, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2A_infos[16] = {
-          o2(0xB8,0xEB),      o2(0xB8,0xEC),
-          o2(0xB8,0xED),      o2(0xB8,0xEE),
-          o2(0xB8,0xEF),      o2(0xB8,0xF0),
-          o2(0xB8,0xF1),      o2(0xB8,0xF2),
-          o2(0xB8,0xF3),      o2(0xB8,0xF4),
-          o2(0xB8,0xF5),      o2(0xB8,0xF6),
-          o2(0xB8,0xF7),      o2(0xB8,0xF8),
-          o2(0xB8,0xF9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2A = {
-    to_EUC_KR_EB_2A_offsets,
-    to_EUC_KR_EB_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2B_offsets[64] = {
-      5,  5,  5,  5,  0,  5,  5,  5,      1,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      2,  3,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  4,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2B_infos[6] = {
-          o2(0xB8,0xFA),      o2(0xB8,0xFB),
-          o2(0xB8,0xFC),      o2(0xB8,0xFD),
-          o2(0xB8,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2B = {
-    to_EUC_KR_EB_2B_offsets,
-    to_EUC_KR_EB_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2C_offsets[64] = {
-      0, 18, 18, 18,  1, 18, 18, 18,     18, 18, 18, 18, 18,  2, 18,  3,
-     18,  4, 18, 18, 18, 18, 18, 18,      5, 18, 18, 18,  6, 18, 18, 18,
-      7, 18, 18, 18, 18, 18, 18, 18,     18,  8, 18,  9, 18, 18, 18, 18,
-     18, 18, 18, 18, 10, 11, 12, 18,     13, 18, 18, 14, 15, 16, 17, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2C_infos[19] = {
-          o2(0xB9,0xA1),      o2(0xB9,0xA2),
-          o2(0xB9,0xA3),      o2(0xB9,0xA4),
-          o2(0xB9,0xA5),      o2(0xB9,0xA6),
-          o2(0xB9,0xA7),      o2(0xB9,0xA8),
-          o2(0xB9,0xA9),      o2(0xB9,0xAA),
-          o2(0xB9,0xAB),      o2(0xB9,0xAC),
-          o2(0xB9,0xAD),      o2(0xB9,0xAE),
-          o2(0xB9,0xAF),      o2(0xB9,0xB0),
-          o2(0xB9,0xB1),      o2(0xB9,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2C = {
-    to_EUC_KR_EB_2C_offsets,
-    to_EUC_KR_EB_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2D_offsets[64] = {
-     12, 12, 12, 12,  0,  1, 12,  2,     12,  3, 12, 12, 12,  4, 12,  5,
-      6, 12, 12, 12,  7, 12, 12, 12,      8, 12, 12, 12, 12, 12, 12, 12,
-     12,  9, 12, 10, 12, 12, 12, 12,     12, 12, 12, 12, 11, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2D_infos[13] = {
-          o2(0xB9,0xB3),      o2(0xB9,0xB4),
-          o2(0xB9,0xB5),      o2(0xB9,0xB6),
-          o2(0xB9,0xB7),      o2(0xB9,0xB8),
-          o2(0xB9,0xB9),      o2(0xB9,0xBA),
-          o2(0xB9,0xBB),      o2(0xB9,0xBC),
-          o2(0xB9,0xBD),      o2(0xB9,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2D = {
-    to_EUC_KR_EB_2D_offsets,
-    to_EUC_KR_EB_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2E_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  8,  8,  8,  1,  8,  8,  8,
-      2,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  3,  8,  8,  8,      4,  8,  8,  8,  5,  8,  8,  8,
-      8,  8,  8,  8,  6,  8,  8,  7,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2E_infos[9] = {
-          o2(0xB9,0xBF),      o2(0xB9,0xC0),
-          o2(0xB9,0xC1),      o2(0xB9,0xC2),
-          o2(0xB9,0xC3),      o2(0xB9,0xC4),
-          o2(0xB9,0xC5),      o2(0xB9,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2E = {
-    to_EUC_KR_EB_2E_offsets,
-    to_EUC_KR_EB_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_2F_offsets[64] = {
-      0,  9,  9,  9,  1,  9,  9,  9,      2,  9,  9,  9,  9,  9,  9,  9,
-      3,  9,  9,  4,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      5,  6,  9,  9,  7,  9,  9,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_2F_infos[10] = {
-          o2(0xB9,0xC7),      o2(0xB9,0xC8),
-          o2(0xB9,0xC9),      o2(0xB9,0xCA),
-          o2(0xB9,0xCB),      o2(0xB9,0xCC),
-          o2(0xB9,0xCD),      o2(0xB9,0xCE),
-          o2(0xB9,0xCF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_2F = {
-    to_EUC_KR_EB_2F_offsets,
-    to_EUC_KR_EB_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_30_offsets[64] = {
-      0, 28,  1, 28, 28, 28, 28, 28,      2,  3, 28,  4,  5,  6, 28,  7,
-     28,  8, 28, 28,  9, 10, 11, 12,     13, 28, 28, 14, 15, 16, 17, 18,
-     28, 28, 28, 28, 19, 20, 28, 21,     28, 22, 28, 28, 28, 23, 28, 28,
-     24, 25, 28, 28, 26, 28, 28, 28,     27, 28, 28, 28, 28, 28, 28, 28,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_30_infos[29] = {
-          o2(0xB9,0xD0),      o2(0xB9,0xD1),
-          o2(0xB9,0xD2),      o2(0xB9,0xD3),
-          o2(0xB9,0xD4),      o2(0xB9,0xD5),
-          o2(0xB9,0xD6),      o2(0xB9,0xD7),
-          o2(0xB9,0xD8),      o2(0xB9,0xD9),
-          o2(0xB9,0xDA),      o2(0xB9,0xDB),
-          o2(0xB9,0xDC),      o2(0xB9,0xDD),
-          o2(0xB9,0xDE),      o2(0xB9,0xDF),
-          o2(0xB9,0xE0),      o2(0xB9,0xE1),
-          o2(0xB9,0xE2),      o2(0xB9,0xE3),
-          o2(0xB9,0xE4),      o2(0xB9,0xE5),
-          o2(0xB9,0xE6),      o2(0xB9,0xE7),
-          o2(0xB9,0xE8),      o2(0xB9,0xE9),
-          o2(0xB9,0xEA),      o2(0xB9,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_30 = {
-    to_EUC_KR_EB_30_offsets,
-    to_EUC_KR_EB_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_31_offsets[64] = {
-      0,  1, 10,  2,  3,  4, 10, 10,     10,  5, 10, 10,  6,  7, 10, 10,
-      8, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10,  9, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_31_infos[11] = {
-          o2(0xB9,0xEC),      o2(0xB9,0xED),
-          o2(0xB9,0xEE),      o2(0xB9,0xEF),
-          o2(0xB9,0xF0),      o2(0xB9,0xF1),
-          o2(0xB9,0xF2),      o2(0xB9,0xF3),
-          o2(0xB9,0xF4),      o2(0xB9,0xF5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_31 = {
-    to_EUC_KR_EB_31_offsets,
-    to_EUC_KR_EB_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_32_offsets[64] = {
-     23, 23, 23, 23,  0,  1, 23, 23,      2, 23, 23,  3,  4, 23,  5, 23,
-     23, 23, 23, 23,  6,  7, 23,  8,     23,  9, 10, 23, 23, 23, 23, 23,
-     11, 12, 23, 23, 13, 23, 23, 14,     15, 23, 23, 23, 23, 23, 23, 23,
-     16, 17, 23, 18, 19, 20, 23, 23,     23, 23, 23, 23, 21, 22, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_32_infos[24] = {
-          o2(0xB9,0xF6),      o2(0xB9,0xF7),
-          o2(0xB9,0xF8),      o2(0xB9,0xF9),
-          o2(0xB9,0xFA),      o2(0xB9,0xFB),
-          o2(0xB9,0xFC),      o2(0xB9,0xFD),
-          o2(0xB9,0xFE),      o2(0xBA,0xA1),
-          o2(0xBA,0xA2),      o2(0xBA,0xA3),
-          o2(0xBA,0xA4),      o2(0xBA,0xA5),
-          o2(0xBA,0xA6),      o2(0xBA,0xA7),
-          o2(0xBA,0xA8),      o2(0xBA,0xA9),
-          o2(0xBA,0xAA),      o2(0xBA,0xAB),
-          o2(0xBA,0xAC),      o2(0xBA,0xAD),
-          o2(0xBA,0xAE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_32 = {
-    to_EUC_KR_EB_32_offsets,
-    to_EUC_KR_EB_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_33_offsets[64] = {
-      0, 14, 14, 14,  1, 14, 14, 14,     14, 14, 14, 14, 14,  2, 14,  3,
-      4,  5, 14, 14, 14,  6, 14, 14,      7, 14, 14, 14,  8, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14,  9, 10, 11, 14,     12, 14, 14, 14, 13, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_33_infos[15] = {
-          o2(0xBA,0xAF),      o2(0xBA,0xB0),
-          o2(0xBA,0xB1),      o2(0xBA,0xB2),
-          o2(0xBA,0xB3),      o2(0xBA,0xB4),
-          o2(0xBA,0xB5),      o2(0xBA,0xB6),
-          o2(0xBA,0xB7),      o2(0xBA,0xB8),
-          o2(0xBA,0xB9),      o2(0xBA,0xBA),
-          o2(0xBA,0xBB),      o2(0xBA,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_33 = {
-    to_EUC_KR_EB_33_offsets,
-    to_EUC_KR_EB_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_34_offsets[64] = {
-      8,  8,  8,  8,  0,  1,  8,  2,      8,  3,  8,  8,  8,  8,  8,  8,
-      4,  8,  8,  8,  5,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  6,  8,  8,  8,      8,  8,  8,  8,  7,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_34_infos[9] = {
-          o2(0xBA,0xBD),      o2(0xBA,0xBE),
-          o2(0xBA,0xBF),      o2(0xBA,0xC0),
-          o2(0xBA,0xC1),      o2(0xBA,0xC2),
-          o2(0xBA,0xC3),      o2(0xBA,0xC4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_34 = {
-    to_EUC_KR_EB_34_offsets,
-    to_EUC_KR_EB_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_35_offsets[64] = {
-      0,  9,  9,  9,  9,  9,  9,  9,      1,  2,  9,  9,  3,  9,  9,  9,
-      4,  9,  9,  9,  9,  9,  9,  9,      5,  6,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  7,  9,  9,  9,      8,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_35_infos[10] = {
-          o2(0xBA,0xC5),      o2(0xBA,0xC6),
-          o2(0xBA,0xC7),      o2(0xBA,0xC8),
-          o2(0xBA,0xC9),      o2(0xBA,0xCA),
-          o2(0xBA,0xCB),      o2(0xBA,0xCC),
-          o2(0xBA,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_35 = {
-    to_EUC_KR_EB_35_offsets,
-    to_EUC_KR_EB_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_36_offsets[64] = {
-      0,  1, 17, 17,  2, 17, 17,  3,      4,  5,  6, 17, 17, 17, 17, 17,
-      7,  8, 17,  9, 17, 10, 17, 17,     17, 11, 12, 17, 13, 17, 17, 17,
-     17, 17, 17, 17, 14, 17, 17, 17,     17, 17, 17, 17, 17, 17, 17, 17,
-     15, 17, 17, 17, 17, 17, 17, 17,     16, 17, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_36_infos[18] = {
-          o2(0xBA,0xCE),      o2(0xBA,0xCF),
-          o2(0xBA,0xD0),      o2(0xBA,0xD1),
-          o2(0xBA,0xD2),      o2(0xBA,0xD3),
-          o2(0xBA,0xD4),      o2(0xBA,0xD5),
-          o2(0xBA,0xD6),      o2(0xBA,0xD7),
-          o2(0xBA,0xD8),      o2(0xBA,0xD9),
-          o2(0xBA,0xDA),      o2(0xBA,0xDB),
-          o2(0xBA,0xDC),      o2(0xBA,0xDD),
-          o2(0xBA,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_36 = {
-    to_EUC_KR_EB_36_offsets,
-    to_EUC_KR_EB_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_37_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  0,  1,  8,  8,      2,  8,  8,  8,  3,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  4,  8,  8,  8,  8,  8,  8,
-      5,  8,  8,  8,  6,  8,  8,  8,      7,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_37_infos[9] = {
-          o2(0xBA,0xDF),      o2(0xBA,0xE0),
-          o2(0xBA,0xE1),      o2(0xBA,0xE2),
-          o2(0xBA,0xE3),      o2(0xBA,0xE4),
-          o2(0xBA,0xE5),      o2(0xBA,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_37 = {
-    to_EUC_KR_EB_37_offsets,
-    to_EUC_KR_EB_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_38_offsets[64] = {
-      0, 10, 10,  1, 10,  2, 10, 10,     10, 10, 10, 10,  3,  4, 10, 10,
-      5, 10, 10, 10,  6, 10, 10, 10,     10, 10, 10, 10,  7,  8, 10,  9,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_38_infos[11] = {
-          o2(0xBA,0xE7),      o2(0xBA,0xE8),
-          o2(0xBA,0xE9),      o2(0xBA,0xEA),
-          o2(0xBA,0xEB),      o2(0xBA,0xEC),
-          o2(0xBA,0xED),      o2(0xBA,0xEE),
-          o2(0xBA,0xEF),      o2(0xBA,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_38 = {
-    to_EUC_KR_EB_38_offsets,
-    to_EUC_KR_EB_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_39_offsets[64] = {
-     24, 24, 24, 24,  0,  1, 24, 24,      2, 24, 24, 24,  3, 24,  4, 24,
-     24, 24, 24, 24,  5,  6, 24,  7,     24,  8,  9, 10, 24, 24, 24, 24,
-     11, 12, 24, 24, 13, 24, 24, 24,     14, 24, 15, 24, 24, 24, 24, 24,
-     16, 17, 24, 18, 19, 20, 24, 24,     24, 24, 24, 21, 22, 23, 24, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_39_infos[25] = {
-          o2(0xBA,0xF1),      o2(0xBA,0xF2),
-          o2(0xBA,0xF3),      o2(0xBA,0xF4),
-          o2(0xBA,0xF5),      o2(0xBA,0xF6),
-          o2(0xBA,0xF7),      o2(0xBA,0xF8),
-          o2(0xBA,0xF9),      o2(0xBA,0xFA),
-          o2(0xBA,0xFB),      o2(0xBA,0xFC),
-          o2(0xBA,0xFD),      o2(0xBA,0xFE),
-          o2(0xBB,0xA1),      o2(0xBB,0xA2),
-          o2(0xBB,0xA3),      o2(0xBB,0xA4),
-          o2(0xBB,0xA5),      o2(0xBB,0xA6),
-          o2(0xBB,0xA7),      o2(0xBB,0xA8),
-          o2(0xBB,0xA9),      o2(0xBB,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_39 = {
-    to_EUC_KR_EB_39_offsets,
-    to_EUC_KR_EB_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3A_offsets[64] = {
-      0, 10, 10, 10,  1, 10, 10, 10,     10, 10, 10, 10,  2,  3, 10,  4,
-      5,  6, 10, 10, 10, 10, 10, 10,      7,  8, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,      9, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3A_infos[11] = {
-          o2(0xBB,0xAB),      o2(0xBB,0xAC),
-          o2(0xBB,0xAD),      o2(0xBB,0xAE),
-          o2(0xBB,0xAF),      o2(0xBB,0xB0),
-          o2(0xBB,0xB1),      o2(0xBB,0xB2),
-          o2(0xBB,0xB3),      o2(0xBB,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3A = {
-    to_EUC_KR_EB_3A_offsets,
-    to_EUC_KR_EB_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3B_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      0,  1, 10, 10,  2, 10, 10,  3,      4, 10, 10, 10, 10, 10, 10, 10,
-      5, 10, 10,  6,  7,  8, 10, 10,     10, 10, 10, 10,  9, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3B_infos[11] = {
-          o2(0xBB,0xB5),      o2(0xBB,0xB6),
-          o2(0xBB,0xB7),      o2(0xBB,0xB8),
-          o2(0xBB,0xB9),      o2(0xBB,0xBA),
-          o2(0xBB,0xBB),      o2(0xBB,0xBC),
-          o2(0xBB,0xBD),      o2(0xBB,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3B = {
-    to_EUC_KR_EB_3B_offsets,
-    to_EUC_KR_EB_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3C_offsets[64] = {
-      8,  0,  8,  8,  8,  8,  8,  8,      1,  2,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      3,  4,  8,  5,  6,  7,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3C_infos[9] = {
-          o2(0xBB,0xBF),      o2(0xBB,0xC0),
-          o2(0xBB,0xC1),      o2(0xBB,0xC2),
-          o2(0xBB,0xC3),      o2(0xBB,0xC4),
-          o2(0xBB,0xC5),      o2(0xBB,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3C = {
-    to_EUC_KR_EB_3C_offsets,
-    to_EUC_KR_EB_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3D_offsets[64] = {
-      0,  1,  7,  7,  2,  7,  7,  7,      3,  7,  7,  7,  7,  7,  7,  7,
-      4,  5,  7,  7,  7,  6,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3D_infos[8] = {
-          o2(0xBB,0xC7),      o2(0xBB,0xC8),
-          o2(0xBB,0xC9),      o2(0xBB,0xCA),
-          o2(0xBB,0xCB),      o2(0xBB,0xCC),
-          o2(0xBB,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3D = {
-    to_EUC_KR_EB_3D_offsets,
-    to_EUC_KR_EB_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3E_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  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,
-      1,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3E_infos[3] = {
-          o2(0xBB,0xCE),      o2(0xBB,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3E = {
-    to_EUC_KR_EB_3E_offsets,
-    to_EUC_KR_EB_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EB_3F_offsets[64] = {
-      8,  8,  8,  8,  8,  0,  8,  8,      8,  8,  8,  8,  1,  2,  8,  8,
-      3,  8,  8,  8,  4,  8,  8,  8,      8,  8,  8,  8,  5,  8,  8,  6,
-      8,  7,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_3F_infos[9] = {
-          o2(0xBB,0xD0),      o2(0xBB,0xD1),
-          o2(0xBB,0xD2),      o2(0xBB,0xD3),
-          o2(0xBB,0xD4),      o2(0xBB,0xD5),
-          o2(0xBB,0xD6),      o2(0xBB,0xD7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB_3F = {
-    to_EUC_KR_EB_3F_offsets,
-    to_EUC_KR_EB_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EB_infos[65] = {
-       &to_EUC_KR_EB_00,   &to_EUC_KR_EB_01,
-       &to_EUC_KR_EB_02,   &to_EUC_KR_EB_03,
-       &to_EUC_KR_EB_04,   &to_EUC_KR_EB_05,
-       &to_EUC_KR_EB_06,   &to_EUC_KR_EB_07,
-       &to_EUC_KR_EB_08,   &to_EUC_KR_EB_09,
-       &to_EUC_KR_EB_0A,   &to_EUC_KR_EB_0B,
-       &to_EUC_KR_EB_0C,   &to_EUC_KR_EB_0D,
-       &to_EUC_KR_EB_0E,   &to_EUC_KR_EB_0F,
-       &to_EUC_KR_EB_10,   &to_EUC_KR_EB_11,
-       &to_EUC_KR_EB_12,   &to_EUC_KR_EB_13,
-       &to_EUC_KR_EB_14,   &to_EUC_KR_EB_15,
-       &to_EUC_KR_EB_16,   &to_EUC_KR_EB_17,
-       &to_EUC_KR_EB_18,   &to_EUC_KR_EB_19,
-       &to_EUC_KR_EB_1A,   &to_EUC_KR_EB_1B,
-       &to_EUC_KR_EB_1C,   &to_EUC_KR_EB_1D,
-       &to_EUC_KR_EB_1E,   &to_EUC_KR_EB_1F,
-       &to_EUC_KR_EB_20,   &to_EUC_KR_EB_21,
-       &to_EUC_KR_EB_22,   &to_EUC_KR_EB_23,
-       &to_EUC_KR_EB_24,   &to_EUC_KR_EB_25,
-       &to_EUC_KR_EB_26,   &to_EUC_KR_EB_27,
-       &to_EUC_KR_EB_28,   &to_EUC_KR_EB_29,
-       &to_EUC_KR_EB_2A,   &to_EUC_KR_EB_2B,
-       &to_EUC_KR_EB_2C,   &to_EUC_KR_EB_2D,
-       &to_EUC_KR_EB_2E,   &to_EUC_KR_EB_2F,
-       &to_EUC_KR_EB_30,   &to_EUC_KR_EB_31,
-       &to_EUC_KR_EB_32,   &to_EUC_KR_EB_33,
-       &to_EUC_KR_EB_34,   &to_EUC_KR_EB_35,
-       &to_EUC_KR_EB_36,   &to_EUC_KR_EB_37,
-       &to_EUC_KR_EB_38,   &to_EUC_KR_EB_39,
-       &to_EUC_KR_EB_3A,   &to_EUC_KR_EB_3B,
-       &to_EUC_KR_EB_3C,   &to_EUC_KR_EB_3D,
-       &to_EUC_KR_EB_3E,   &to_EUC_KR_EB_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EB = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EB_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_00_offsets[64] = {
-      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,  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,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_00_infos[2] = {
-          o2(0xBB,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_00 = {
-    to_EUC_KR_EC_00_offsets,
-    to_EUC_KR_EC_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_01_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  0,  6,  6,  6,  6,  6,  6,      1,  6,  6,  6,  2,  6,  6,  6,
-      3,  6,  6,  6,  6,  6,  6,  6,      4,  5,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_01_infos[7] = {
-          o2(0xBB,0xD9),      o2(0xBB,0xDA),
-          o2(0xBB,0xDB),      o2(0xBB,0xDC),
-          o2(0xBB,0xDD),      o2(0xBB,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_01 = {
-    to_EUC_KR_EC_01_offsets,
-    to_EUC_KR_EC_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_02_offsets[64] = {
-     19, 19, 19, 19, 19, 19, 19, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-      0,  1, 19, 19,  2, 19, 19, 19,      3, 19, 19, 19, 19, 19, 19, 19,
-      4,  5, 19,  6, 19,  7, 19, 19,     19, 19, 19, 19,  8,  9, 19, 10,
-     11, 19, 19, 12, 13, 14, 15, 19,     19, 19, 19, 19, 16, 17, 19, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_02_infos[20] = {
-          o2(0xBB,0xDF),      o2(0xBB,0xE0),
-          o2(0xBB,0xE1),      o2(0xBB,0xE2),
-          o2(0xBB,0xE3),      o2(0xBB,0xE4),
-          o2(0xBB,0xE5),      o2(0xBB,0xE6),
-          o2(0xBB,0xE7),      o2(0xBB,0xE8),
-          o2(0xBB,0xE9),      o2(0xBB,0xEA),
-          o2(0xBB,0xEB),      o2(0xBB,0xEC),
-          o2(0xBB,0xED),      o2(0xBB,0xEE),
-          o2(0xBB,0xEF),      o2(0xBB,0xF0),
-          o2(0xBB,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_02 = {
-    to_EUC_KR_EC_02_offsets,
-    to_EUC_KR_EC_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_03_offsets[64] = {
-      0,  1, 20, 20, 20,  2, 20, 20,      3,  4, 20, 20,  5, 20, 20, 20,
-      6, 20, 20, 20, 20, 20, 20, 20,      7,  8, 20,  9, 10, 11, 20, 20,
-     20, 20, 20, 20, 12, 13, 20, 20,     14, 20, 20, 20, 15, 20, 20, 20,
-     20, 20, 20, 20, 16, 17, 20, 18,     20, 19, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_03_infos[21] = {
-          o2(0xBB,0xF2),      o2(0xBB,0xF3),
-          o2(0xBB,0xF4),      o2(0xBB,0xF5),
-          o2(0xBB,0xF6),      o2(0xBB,0xF7),
-          o2(0xBB,0xF8),      o2(0xBB,0xF9),
-          o2(0xBB,0xFA),      o2(0xBB,0xFB),
-          o2(0xBB,0xFC),      o2(0xBB,0xFD),
-          o2(0xBB,0xFE),      o2(0xBC,0xA1),
-          o2(0xBC,0xA2),      o2(0xBC,0xA3),
-          o2(0xBC,0xA4),      o2(0xBC,0xA5),
-          o2(0xBC,0xA6),      o2(0xBC,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_03 = {
-    to_EUC_KR_EC_03_offsets,
-    to_EUC_KR_EC_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_04_offsets[64] = {
-      0, 23, 23, 23,  1, 23, 23, 23,      2, 23, 23, 23, 23, 23, 23, 23,
-      3, 23, 23, 23, 23,  4, 23, 23,     23, 23, 23, 23,  5,  6,  7,  8,
-      9, 23, 23, 10, 11, 23, 12, 13,     23, 23, 23, 23, 14, 15, 23, 16,
-     17, 18, 23, 23, 23, 23, 19, 23,     20, 21, 23, 23, 22, 23, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_04_infos[24] = {
-          o2(0xBC,0xA8),      o2(0xBC,0xA9),
-          o2(0xBC,0xAA),      o2(0xBC,0xAB),
-          o2(0xBC,0xAC),      o2(0xBC,0xAD),
-          o2(0xBC,0xAE),      o2(0xBC,0xAF),
-          o2(0xBC,0xB0),      o2(0xBC,0xB1),
-          o2(0xBC,0xB2),      o2(0xBC,0xB3),
-          o2(0xBC,0xB4),      o2(0xBC,0xB5),
-          o2(0xBC,0xB6),      o2(0xBC,0xB7),
-          o2(0xBC,0xB8),      o2(0xBC,0xB9),
-          o2(0xBC,0xBA),      o2(0xBC,0xBB),
-          o2(0xBC,0xBC),      o2(0xBC,0xBD),
-          o2(0xBC,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_04 = {
-    to_EUC_KR_EC_04_offsets,
-    to_EUC_KR_EC_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_05_offsets[64] = {
-      0, 18, 18, 18, 18, 18, 18, 18,      1,  2, 18,  3,  4,  5, 18, 18,
-     18, 18, 18, 18,  6,  7, 18, 18,      8, 18, 18, 18,  9, 18, 18, 18,
-     18, 18, 18, 18, 10, 11, 18, 12,     13, 14, 18, 18, 18, 18, 18, 18,
-     15, 18, 18, 18, 16, 18, 18, 18,     17, 18, 18, 18, 18, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_05_infos[19] = {
-          o2(0xBC,0xBF),      o2(0xBC,0xC0),
-          o2(0xBC,0xC1),      o2(0xBC,0xC2),
-          o2(0xBC,0xC3),      o2(0xBC,0xC4),
-          o2(0xBC,0xC5),      o2(0xBC,0xC6),
-          o2(0xBC,0xC7),      o2(0xBC,0xC8),
-          o2(0xBC,0xC9),      o2(0xBC,0xCA),
-          o2(0xBC,0xCB),      o2(0xBC,0xCC),
-          o2(0xBC,0xCD),      o2(0xBC,0xCE),
-          o2(0xBC,0xCF),      o2(0xBC,0xD0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_05 = {
-    to_EUC_KR_EC_05_offsets,
-    to_EUC_KR_EC_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_06_offsets[64] = {
-     17, 17, 17, 17, 17,  0, 17, 17,     17, 17, 17, 17,  1,  2,  3, 17,
-      4, 17, 17, 17,  5, 17,  6, 17,     17, 17, 17, 17,  7,  8, 17,  9,
-     17, 10, 17, 17, 17, 11, 17, 17,     12, 13, 17, 17, 14, 17, 17, 17,
-     15, 17, 17, 17, 17, 17, 17, 17,     17, 17, 17, 17, 17, 16, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_06_infos[18] = {
-          o2(0xBC,0xD1),      o2(0xBC,0xD2),
-          o2(0xBC,0xD3),      o2(0xBC,0xD4),
-          o2(0xBC,0xD5),      o2(0xBC,0xD6),
-          o2(0xBC,0xD7),      o2(0xBC,0xD8),
-          o2(0xBC,0xD9),      o2(0xBC,0xDA),
-          o2(0xBC,0xDB),      o2(0xBC,0xDC),
-          o2(0xBC,0xDD),      o2(0xBC,0xDE),
-          o2(0xBC,0xDF),      o2(0xBC,0xE0),
-          o2(0xBC,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_06 = {
-    to_EUC_KR_EC_06_offsets,
-    to_EUC_KR_EC_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_07_offsets[64] = {
-     14, 14, 14, 14,  0, 14, 14, 14,      1, 14, 14, 14,  2, 14, 14, 14,
-     14, 14, 14, 14,  3, 14, 14,  4,      5, 14, 14, 14, 14, 14, 14, 14,
-      6, 14, 14, 14,  7, 14, 14, 14,      8, 14, 14, 14, 14, 14, 14, 14,
-      9, 10, 14, 11, 14, 14, 14, 14,     14, 14, 14, 14, 12, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_07_infos[15] = {
-          o2(0xBC,0xE2),      o2(0xBC,0xE3),
-          o2(0xBC,0xE4),      o2(0xBC,0xE5),
-          o2(0xBC,0xE6),      o2(0xBC,0xE7),
-          o2(0xBC,0xE8),      o2(0xBC,0xE9),
-          o2(0xBC,0xEA),      o2(0xBC,0xEB),
-          o2(0xBC,0xEC),      o2(0xBC,0xED),
-          o2(0xBC,0xEE),      o2(0xBC,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_07 = {
-    to_EUC_KR_EC_07_offsets,
-    to_EUC_KR_EC_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_08_offsets[64] = {
-      0, 19, 19, 19,  1, 19, 19, 19,     19, 19, 19, 19,  2,  3, 19,  4,
-     19,  5, 19, 19, 19, 19, 19, 19,      6,  7, 19, 19,  8, 19, 19,  9,
-     10, 19, 19, 19, 19, 19, 19, 19,     11, 12, 19, 13, 19, 14, 19, 15,
-     19, 16, 17, 19, 18, 19, 19, 19,     19, 19, 19, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_08_infos[20] = {
-          o2(0xBC,0xF0),      o2(0xBC,0xF1),
-          o2(0xBC,0xF2),      o2(0xBC,0xF3),
-          o2(0xBC,0xF4),      o2(0xBC,0xF5),
-          o2(0xBC,0xF6),      o2(0xBC,0xF7),
-          o2(0xBC,0xF8),      o2(0xBC,0xF9),
-          o2(0xBC,0xFA),      o2(0xBC,0xFB),
-          o2(0xBC,0xFC),      o2(0xBC,0xFD),
-          o2(0xBC,0xFE),      o2(0xBD,0xA1),
-          o2(0xBD,0xA2),      o2(0xBD,0xA3),
-          o2(0xBD,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_08 = {
-    to_EUC_KR_EC_08_offsets,
-    to_EUC_KR_EC_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_09_offsets[64] = {
-     14, 14, 14, 14, 14, 14, 14, 14,      0, 14, 14, 14, 14, 14, 14, 14,
-      1,  2, 14, 14,  3, 14, 14, 14,      4, 14, 14, 14, 14, 14, 14, 14,
-      5, 14, 14, 14, 14,  6, 14, 14,     14, 14, 14, 14,  7,  8, 14, 14,
-      9, 14, 14, 14, 10, 14, 14, 14,     14, 14, 14, 14, 11, 12, 14, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_09_infos[15] = {
-          o2(0xBD,0xA5),      o2(0xBD,0xA6),
-          o2(0xBD,0xA7),      o2(0xBD,0xA8),
-          o2(0xBD,0xA9),      o2(0xBD,0xAA),
-          o2(0xBD,0xAB),      o2(0xBD,0xAC),
-          o2(0xBD,0xAD),      o2(0xBD,0xAE),
-          o2(0xBD,0xAF),      o2(0xBD,0xB0),
-          o2(0xBD,0xB1),      o2(0xBD,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_09 = {
-    to_EUC_KR_EC_09_offsets,
-    to_EUC_KR_EC_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0A_offsets[64] = {
-     16,  0, 16, 16, 16, 16, 16, 16,      1,  2, 16, 16, 16, 16, 16, 16,
-      3, 16, 16, 16, 16, 16, 16, 16,      4, 16, 16,  5, 16,  6, 16, 16,
-     16, 16, 16, 16,  7,  8, 16, 16,      9, 16, 16, 16, 10, 11, 16, 16,
-     16, 16, 16, 16, 12, 13, 16, 14,     16, 15, 16, 16, 16, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0A_infos[17] = {
-          o2(0xBD,0xB3),      o2(0xBD,0xB4),
-          o2(0xBD,0xB5),      o2(0xBD,0xB6),
-          o2(0xBD,0xB7),      o2(0xBD,0xB8),
-          o2(0xBD,0xB9),      o2(0xBD,0xBA),
-          o2(0xBD,0xBB),      o2(0xBD,0xBC),
-          o2(0xBD,0xBD),      o2(0xBD,0xBE),
-          o2(0xBD,0xBF),      o2(0xBD,0xC0),
-          o2(0xBD,0xC1),      o2(0xBD,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0A = {
-    to_EUC_KR_EC_0A_offsets,
-    to_EUC_KR_EC_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0B_offsets[64] = {
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15,  0,  1, 15, 15,
-      2, 15, 15,  3,  4, 15, 15, 15,     15, 15, 15,  5,  6,  7, 15,  8,
-     15,  9, 15, 15, 15, 15, 10, 15,     11, 12, 15, 13, 14, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0B_infos[16] = {
-          o2(0xBD,0xC3),      o2(0xBD,0xC4),
-          o2(0xBD,0xC5),      o2(0xBD,0xC6),
-          o2(0xBD,0xC7),      o2(0xBD,0xC8),
-          o2(0xBD,0xC9),      o2(0xBD,0xCA),
-          o2(0xBD,0xCB),      o2(0xBD,0xCC),
-          o2(0xBD,0xCD),      o2(0xBD,0xCE),
-          o2(0xBD,0xCF),      o2(0xBD,0xD0),
-          o2(0xBD,0xD1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0B = {
-    to_EUC_KR_EC_0B_offsets,
-    to_EUC_KR_EC_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0C_offsets[64] = {
-      0, 14, 14, 14, 14, 14, 14, 14,      1,  2, 14, 14,  3,  4, 14, 14,
-     14, 14, 14,  5,  6,  7, 14, 14,      8, 14, 14, 14,  9, 14, 14, 14,
-     14, 14, 14, 14, 10, 11, 14, 14,     12, 13, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0C_infos[15] = {
-          o2(0xBD,0xD2),      o2(0xBD,0xD3),
-          o2(0xBD,0xD4),      o2(0xBD,0xD5),
-          o2(0xBD,0xD6),      o2(0xBD,0xD7),
-          o2(0xBD,0xD8),      o2(0xBD,0xD9),
-          o2(0xBD,0xDA),      o2(0xBD,0xDB),
-          o2(0xBD,0xDC),      o2(0xBD,0xDD),
-          o2(0xBD,0xDE),      o2(0xBD,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0C = {
-    to_EUC_KR_EC_0C_offsets,
-    to_EUC_KR_EC_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0D_offsets[64] = {
-     10, 10, 10, 10, 10,  0, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,      1,  2, 10, 10,  3, 10, 10, 10,
-      4, 10,  5, 10, 10, 10, 10, 10,      6,  7, 10, 10,  8,  9, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0D_infos[11] = {
-          o2(0xBD,0xE0),      o2(0xBD,0xE1),
-          o2(0xBD,0xE2),      o2(0xBD,0xE3),
-          o2(0xBD,0xE4),      o2(0xBD,0xE5),
-          o2(0xBD,0xE6),      o2(0xBD,0xE7),
-          o2(0xBD,0xE8),      o2(0xBD,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0D = {
-    to_EUC_KR_EC_0D_offsets,
-    to_EUC_KR_EC_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0E_offsets[64] = {
-      3,  3,  3,  3,  0,  3,  3,  3,      1,  3,  3,  3,  2,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0E_infos[4] = {
-          o2(0xBD,0xEA),      o2(0xBD,0xEB),
-          o2(0xBD,0xEC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0E = {
-    to_EUC_KR_EC_0E_offsets,
-    to_EUC_KR_EC_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_0F_offsets[64] = {
-      0, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,      1,  2, 13, 13,  3, 13, 13,  4,
-      5, 13,  6, 13, 13, 13, 13, 13,      7,  8, 13, 13, 13,  9, 13, 13,
-     13, 13, 13, 13, 10, 11, 13, 13,     12, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_0F_infos[14] = {
-          o2(0xBD,0xED),      o2(0xBD,0xEE),
-          o2(0xBD,0xEF),      o2(0xBD,0xF0),
-          o2(0xBD,0xF1),      o2(0xBD,0xF2),
-          o2(0xBD,0xF3),      o2(0xBD,0xF4),
-          o2(0xBD,0xF5),      o2(0xBD,0xF6),
-          o2(0xBD,0xF7),      o2(0xBD,0xF8),
-          o2(0xBD,0xF9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_0F = {
-    to_EUC_KR_EC_0F_offsets,
-    to_EUC_KR_EC_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_10_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  8,  8,  8,  8,  8,  8,  8,
-      1,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  2,  8,  8,  8,      8,  8,  8,  8,  3,  8,  8,  8,
-      4,  8,  8,  8,  5,  8,  8,  8,      8,  8,  8,  8,  6,  7,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_10_infos[9] = {
-          o2(0xBD,0xFA),      o2(0xBD,0xFB),
-          o2(0xBD,0xFC),      o2(0xBD,0xFD),
-          o2(0xBD,0xFE),      o2(0xBE,0xA1),
-          o2(0xBE,0xA2),      o2(0xBE,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_10 = {
-    to_EUC_KR_EC_10_offsets,
-    to_EUC_KR_EC_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_11_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  1,  2,  8,  8,      3,  8,  8,  8,  4,  8,  8,  8,
-      8,  8,  8,  8,  5,  6,  8,  8,      8,  7,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_11_infos[9] = {
-          o2(0xBE,0xA4),      o2(0xBE,0xA5),
-          o2(0xBE,0xA6),      o2(0xBE,0xA7),
-          o2(0xBE,0xA8),      o2(0xBE,0xA9),
-          o2(0xBE,0xAA),      o2(0xBE,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_11 = {
-    to_EUC_KR_EC_11_offsets,
-    to_EUC_KR_EC_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_12_offsets[64] = {
-      0,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  1,  5,  5,  5,      5,  5,  5,  5,  2,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      3,  5,  5,  5,  4,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_12_infos[6] = {
-          o2(0xBE,0xAC),      o2(0xBE,0xAD),
-          o2(0xBE,0xAE),      o2(0xBE,0xAF),
-          o2(0xBE,0xB0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_12 = {
-    to_EUC_KR_EC_12_offsets,
-    to_EUC_KR_EC_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_13_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  0,  7,  7,  7,  7,  7,  7,
-      1,  2,  7,  7,  3,  7,  7,  7,      4,  7,  5,  7,  7,  7,  7,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_13_infos[8] = {
-          o2(0xBE,0xB1),      o2(0xBE,0xB2),
-          o2(0xBE,0xB3),      o2(0xBE,0xB4),
-          o2(0xBE,0xB5),      o2(0xBE,0xB6),
-          o2(0xBE,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_13 = {
-    to_EUC_KR_EC_13_offsets,
-    to_EUC_KR_EC_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_14_offsets[64] = {
-      0,  1, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14,  2, 14, 14, 14,
-      3, 14, 14, 14,  4, 14, 14, 14,     14, 14, 14, 14,  5, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,      6,  7, 14, 14,  8, 14, 14, 14,
-      9, 14, 14, 14, 14, 14, 14, 14,     10, 11, 14, 12, 14, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_14_infos[15] = {
-          o2(0xBE,0xB8),      o2(0xBE,0xB9),
-          o2(0xBE,0xBA),      o2(0xBE,0xBB),
-          o2(0xBE,0xBC),      o2(0xBE,0xBD),
-          o2(0xBE,0xBE),      o2(0xBE,0xBF),
-          o2(0xBE,0xC0),      o2(0xBE,0xC1),
-          o2(0xBE,0xC2),      o2(0xBE,0xC3),
-          o2(0xBE,0xC4),      o2(0xBE,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_14 = {
-    to_EUC_KR_EC_14_offsets,
-    to_EUC_KR_EC_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_15_offsets[64] = {
-     27, 27, 27, 27,  0,  1, 27, 27,      2,  3,  4, 27,  5,  6,  7, 27,
-     27, 27, 27,  8,  9, 10, 27, 11,     12, 13, 27, 27, 27, 14, 15, 27,
-     16, 17, 27, 27, 18, 27, 27, 27,     19, 27, 27, 27, 27, 27, 27, 27,
-     20, 21, 27, 22, 23, 24, 27, 27,     27, 27, 27, 27, 25, 26, 27, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_15_infos[28] = {
-          o2(0xBE,0xC6),      o2(0xBE,0xC7),
-          o2(0xBE,0xC8),      o2(0xBE,0xC9),
-          o2(0xBE,0xCA),      o2(0xBE,0xCB),
-          o2(0xBE,0xCC),      o2(0xBE,0xCD),
-          o2(0xBE,0xCE),      o2(0xBE,0xCF),
-          o2(0xBE,0xD0),      o2(0xBE,0xD1),
-          o2(0xBE,0xD2),      o2(0xBE,0xD3),
-          o2(0xBE,0xD4),      o2(0xBE,0xD5),
-          o2(0xBE,0xD6),      o2(0xBE,0xD7),
-          o2(0xBE,0xD8),      o2(0xBE,0xD9),
-          o2(0xBE,0xDA),      o2(0xBE,0xDB),
-          o2(0xBE,0xDC),      o2(0xBE,0xDD),
-          o2(0xBE,0xDE),      o2(0xBE,0xDF),
-          o2(0xBE,0xE0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_15 = {
-    to_EUC_KR_EC_15_offsets,
-    to_EUC_KR_EC_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_16_offsets[64] = {
-      0, 21, 21, 21,  1, 21, 21,  2,     21, 21, 21, 21,  3,  4, 21,  5,
-     21,  6, 21, 21, 21,  7, 21,  8,      9, 21, 21, 21, 10, 21, 21, 21,
-     11, 21, 21, 21, 21, 21, 21, 21,     21, 12, 21, 21, 21, 21, 21, 21,
-     21, 21, 21, 21, 13, 14, 21, 21,     15, 16, 21, 17, 18, 19, 20, 21,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_16_infos[22] = {
-          o2(0xBE,0xE1),      o2(0xBE,0xE2),
-          o2(0xBE,0xE3),      o2(0xBE,0xE4),
-          o2(0xBE,0xE5),      o2(0xBE,0xE6),
-          o2(0xBE,0xE7),      o2(0xBE,0xE8),
-          o2(0xBE,0xE9),      o2(0xBE,0xEA),
-          o2(0xBE,0xEB),      o2(0xBE,0xEC),
-          o2(0xBE,0xED),      o2(0xBE,0xEE),
-          o2(0xBE,0xEF),      o2(0xBE,0xF0),
-          o2(0xBE,0xF1),      o2(0xBE,0xF2),
-          o2(0xBE,0xF3),      o2(0xBE,0xF4),
-          o2(0xBE,0xF5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_16 = {
-    to_EUC_KR_EC_16_offsets,
-    to_EUC_KR_EC_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_17_offsets[64] = {
-     28, 28, 28, 28,  0,  1,  2,  3,      4,  5,  6, 28,  7, 28,  8, 28,
-      9, 10, 28, 28, 11, 28, 28, 28,     12, 28, 28, 28, 28, 28, 28, 28,
-     13, 14, 28, 15, 28, 16, 28, 28,     28, 28, 28, 28, 17, 18, 19, 28,
-     20, 28, 28, 28, 21, 28, 22, 23,     28, 28, 28, 28, 24, 25, 26, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_17_infos[29] = {
-          o2(0xBE,0xF6),      o2(0xBE,0xF7),
-          o2(0xBE,0xF8),      o2(0xBE,0xF9),
-          o2(0xBE,0xFA),      o2(0xBE,0xFB),
-          o2(0xBE,0xFC),      o2(0xBE,0xFD),
-          o2(0xBE,0xFE),      o2(0xBF,0xA1),
-          o2(0xBF,0xA2),      o2(0xBF,0xA3),
-          o2(0xBF,0xA4),      o2(0xBF,0xA5),
-          o2(0xBF,0xA6),      o2(0xBF,0xA7),
-          o2(0xBF,0xA8),      o2(0xBF,0xA9),
-          o2(0xBF,0xAA),      o2(0xBF,0xAB),
-          o2(0xBF,0xAC),      o2(0xBF,0xAD),
-          o2(0xBF,0xAE),      o2(0xBF,0xAF),
-          o2(0xBF,0xB0),      o2(0xBF,0xB1),
-          o2(0xBF,0xB2),      o2(0xBF,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_17 = {
-    to_EUC_KR_EC_17_offsets,
-    to_EUC_KR_EC_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_18_offsets[64] = {
-      0,  1, 25, 25, 25,  2,  3,  4,      5, 25, 25, 25,  6, 25, 25, 25,
-      7, 25, 25, 25, 25, 25, 25, 25,      8,  9, 25, 10, 11, 25, 25, 25,
-     25, 25, 25, 25, 12, 13, 25, 25,     14, 25, 25, 25, 15, 16, 17, 25,
-     18, 25, 25, 19, 20, 21, 25, 22,     25, 23, 25, 24, 25, 25, 25, 25,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_18_infos[26] = {
-          o2(0xBF,0xB4),      o2(0xBF,0xB5),
-          o2(0xBF,0xB6),      o2(0xBF,0xB7),
-          o2(0xBF,0xB8),      o2(0xBF,0xB9),
-          o2(0xBF,0xBA),      o2(0xBF,0xBB),
-          o2(0xBF,0xBC),      o2(0xBF,0xBD),
-          o2(0xBF,0xBE),      o2(0xBF,0xBF),
-          o2(0xBF,0xC0),      o2(0xBF,0xC1),
-          o2(0xBF,0xC2),      o2(0xBF,0xC3),
-          o2(0xBF,0xC4),      o2(0xBF,0xC5),
-          o2(0xBF,0xC6),      o2(0xBF,0xC7),
-          o2(0xBF,0xC8),      o2(0xBF,0xC9),
-          o2(0xBF,0xCA),      o2(0xBF,0xCB),
-          o2(0xBF,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_18 = {
-    to_EUC_KR_EC_18_offsets,
-    to_EUC_KR_EC_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_19_offsets[64] = {
-      0,  1, 18, 18,  2, 18, 18, 18,      3, 18, 18, 18, 18, 18, 18, 18,
-      4,  5, 18,  6,  7,  8, 18, 18,     18, 18, 18, 18,  9, 10, 18, 18,
-     11, 18, 18, 18, 18, 18, 18, 18,     18, 18, 18, 18, 12, 18, 18, 13,
-     18, 14, 18, 18, 18, 18, 18, 18,     15, 16, 18, 18, 17, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_19_infos[19] = {
-          o2(0xBF,0xCD),      o2(0xBF,0xCE),
-          o2(0xBF,0xCF),      o2(0xBF,0xD0),
-          o2(0xBF,0xD1),      o2(0xBF,0xD2),
-          o2(0xBF,0xD3),      o2(0xBF,0xD4),
-          o2(0xBF,0xD5),      o2(0xBF,0xD6),
-          o2(0xBF,0xD7),      o2(0xBF,0xD8),
-          o2(0xBF,0xD9),      o2(0xBF,0xDA),
-          o2(0xBF,0xDB),      o2(0xBF,0xDC),
-          o2(0xBF,0xDD),      o2(0xBF,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_19 = {
-    to_EUC_KR_EC_19_offsets,
-    to_EUC_KR_EC_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1A_offsets[64] = {
-      0, 19, 19, 19, 19, 19, 19, 19,      1,  2, 19,  3, 19,  4, 19, 19,
-     19, 19, 19, 19,  5,  6, 19, 19,      7, 19, 19, 19,  8, 19, 19, 19,
-     19, 19, 19, 19,  9, 10, 19, 11,     19, 12, 19, 19, 19, 19, 19, 19,
-     13, 14, 19, 19, 15, 19, 19, 19,     16, 17, 18, 19, 19, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1A_infos[20] = {
-          o2(0xBF,0xDF),      o2(0xBF,0xE0),
-          o2(0xBF,0xE1),      o2(0xBF,0xE2),
-          o2(0xBF,0xE3),      o2(0xBF,0xE4),
-          o2(0xBF,0xE5),      o2(0xBF,0xE6),
-          o2(0xBF,0xE7),      o2(0xBF,0xE8),
-          o2(0xBF,0xE9),      o2(0xBF,0xEA),
-          o2(0xBF,0xEB),      o2(0xBF,0xEC),
-          o2(0xBF,0xED),      o2(0xBF,0xEE),
-          o2(0xBF,0xEF),      o2(0xBF,0xF0),
-          o2(0xBF,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1A = {
-    to_EUC_KR_EC_1A_offsets,
-    to_EUC_KR_EC_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1B_offsets[64] = {
-      0,  1, 19,  2, 19,  3, 19, 19,     19, 19, 19, 19,  4,  5, 19, 19,
-      6, 19, 19, 19,  7, 19, 19, 19,     19, 19, 19, 19,  8,  9, 19, 19,
-     10, 11, 19, 19, 19, 19, 19, 19,     12, 13, 19, 19, 14, 19, 19, 19,
-     15, 19, 19, 19, 19, 19, 19, 19,     16, 17, 19, 19, 19, 18, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1B_infos[20] = {
-          o2(0xBF,0xF2),      o2(0xBF,0xF3),
-          o2(0xBF,0xF4),      o2(0xBF,0xF5),
-          o2(0xBF,0xF6),      o2(0xBF,0xF7),
-          o2(0xBF,0xF8),      o2(0xBF,0xF9),
-          o2(0xBF,0xFA),      o2(0xBF,0xFB),
-          o2(0xBF,0xFC),      o2(0xBF,0xFD),
-          o2(0xBF,0xFE),      o2(0xC0,0xA1),
-          o2(0xC0,0xA2),      o2(0xC0,0xA3),
-          o2(0xC0,0xA4),      o2(0xC0,0xA5),
-          o2(0xC0,0xA6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1B = {
-    to_EUC_KR_EC_1B_offsets,
-    to_EUC_KR_EC_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1C_offsets[64] = {
-     19, 19, 19, 19,  0,  1, 19, 19,      2, 19, 19, 19,  3, 19, 19, 19,
-     19, 19, 19, 19,  4,  5, 19,  6,     19,  7, 19, 19, 19, 19, 19, 19,
-      8,  9, 19, 19, 10, 19, 19, 19,     11, 19, 19, 19, 19, 19, 19, 19,
-     12, 13, 19, 14, 19, 15, 19, 16,     19, 19, 19, 19, 17, 18, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1C_infos[20] = {
-          o2(0xC0,0xA7),      o2(0xC0,0xA8),
-          o2(0xC0,0xA9),      o2(0xC0,0xAA),
-          o2(0xC0,0xAB),      o2(0xC0,0xAC),
-          o2(0xC0,0xAD),      o2(0xC0,0xAE),
-          o2(0xC0,0xAF),      o2(0xC0,0xB0),
-          o2(0xC0,0xB1),      o2(0xC0,0xB2),
-          o2(0xC0,0xB3),      o2(0xC0,0xB4),
-          o2(0xC0,0xB5),      o2(0xC0,0xB6),
-          o2(0xC0,0xB7),      o2(0xC0,0xB8),
-          o2(0xC0,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1C = {
-    to_EUC_KR_EC_1C_offsets,
-    to_EUC_KR_EC_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1D_offsets[64] = {
-      0, 24, 24, 24,  1, 24, 24, 24,     24, 24,  2, 24,  3,  4, 24,  5,
-     24,  6,  7,  8,  9, 10, 11, 12,     13, 24, 24, 24, 14, 24, 24, 24,
-     15, 24, 24, 24, 24, 24, 24, 24,     16, 24, 24, 17, 24, 24, 24, 24,
-     24, 24, 24, 24, 18, 19, 24, 24,     20, 24, 24, 24, 21, 22, 23, 24,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1D_infos[25] = {
-          o2(0xC0,0xBA),      o2(0xC0,0xBB),
-          o2(0xC0,0xBC),      o2(0xC0,0xBD),
-          o2(0xC0,0xBE),      o2(0xC0,0xBF),
-          o2(0xC0,0xC0),      o2(0xC0,0xC1),
-          o2(0xC0,0xC2),      o2(0xC0,0xC3),
-          o2(0xC0,0xC4),      o2(0xC0,0xC5),
-          o2(0xC0,0xC6),      o2(0xC0,0xC7),
-          o2(0xC0,0xC8),      o2(0xC0,0xC9),
-          o2(0xC0,0xCA),      o2(0xC0,0xCB),
-          o2(0xC0,0xCC),      o2(0xC0,0xCD),
-          o2(0xC0,0xCE),      o2(0xC0,0xCF),
-          o2(0xC0,0xD0),      o2(0xC0,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1D = {
-    to_EUC_KR_EC_1D_offsets,
-    to_EUC_KR_EC_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1E_offsets[64] = {
-     28, 28, 28,  0,  1,  2, 28,  3,      4,  5,  6, 28, 28, 28,  7, 28,
-      8,  9, 28, 28, 10, 28, 11, 12,     13, 28, 14, 28, 28, 28, 28, 28,
-     15, 16, 28, 17, 18, 19, 20, 28,     28, 28, 28, 28, 21, 22, 28, 28,
-     23, 28, 28, 28, 24, 28, 28, 28,     28, 28, 28, 28, 25, 26, 28, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1E_infos[29] = {
-          o2(0xC0,0xD2),      o2(0xC0,0xD3),
-          o2(0xC0,0xD4),      o2(0xC0,0xD5),
-          o2(0xC0,0xD6),      o2(0xC0,0xD7),
-          o2(0xC0,0xD8),      o2(0xC0,0xD9),
-          o2(0xC0,0xDA),      o2(0xC0,0xDB),
-          o2(0xC0,0xDC),      o2(0xC0,0xDD),
-          o2(0xC0,0xDE),      o2(0xC0,0xDF),
-          o2(0xC0,0xE0),      o2(0xC0,0xE1),
-          o2(0xC0,0xE2),      o2(0xC0,0xE3),
-          o2(0xC0,0xE4),      o2(0xC0,0xE5),
-          o2(0xC0,0xE6),      o2(0xC0,0xE7),
-          o2(0xC0,0xE8),      o2(0xC0,0xE9),
-          o2(0xC0,0xEA),      o2(0xC0,0xEB),
-          o2(0xC0,0xEC),      o2(0xC0,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1E = {
-    to_EUC_KR_EC_1E_offsets,
-    to_EUC_KR_EC_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_1F_offsets[64] = {
-      0,  1, 12, 12, 12, 12, 12, 12,      2,  3, 12, 12,  4, 12,  5, 12,
-      6, 12, 12, 12, 12, 12, 12, 12,      7, 12, 12, 12, 12,  8, 12, 12,
-     12, 12, 12, 12,  9, 12, 12, 12,     10, 12, 12, 12, 11, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_1F_infos[13] = {
-          o2(0xC0,0xEE),      o2(0xC0,0xEF),
-          o2(0xC0,0xF0),      o2(0xC0,0xF1),
-          o2(0xC0,0xF2),      o2(0xC0,0xF3),
-          o2(0xC0,0xF4),      o2(0xC0,0xF5),
-          o2(0xC0,0xF6),      o2(0xC0,0xF7),
-          o2(0xC0,0xF8),      o2(0xC0,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_1F = {
-    to_EUC_KR_EC_1F_offsets,
-    to_EUC_KR_EC_1F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_20_offsets[64] = {
-      0,  1, 20, 20,  2, 20, 20, 20,      3, 20,  4, 20, 20, 20, 20, 20,
-      5,  6, 20,  7, 20,  8,  9, 20,     20, 20, 20, 20, 10, 11, 20, 20,
-     12, 20, 20, 20, 13, 20, 20, 20,     20, 20, 20, 20, 14, 15, 20, 16,
-     20, 17, 20, 20, 20, 20, 20, 20,     18, 20, 20, 20, 19, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_20_infos[21] = {
-          o2(0xC0,0xFA),      o2(0xC0,0xFB),
-          o2(0xC0,0xFC),      o2(0xC0,0xFD),
-          o2(0xC0,0xFE),      o2(0xC1,0xA1),
-          o2(0xC1,0xA2),      o2(0xC1,0xA3),
-          o2(0xC1,0xA4),      o2(0xC1,0xA5),
-          o2(0xC1,0xA6),      o2(0xC1,0xA7),
-          o2(0xC1,0xA8),      o2(0xC1,0xA9),
-          o2(0xC1,0xAA),      o2(0xC1,0xAB),
-          o2(0xC1,0xAC),      o2(0xC1,0xAD),
-          o2(0xC1,0xAE),      o2(0xC1,0xAF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_20 = {
-    to_EUC_KR_EC_20_offsets,
-    to_EUC_KR_EC_20_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_21_offsets[64] = {
-      0, 11, 11, 11, 11, 11, 11, 11,      1,  2, 11, 11,  3,  4, 11, 11,
-     11, 11, 11, 11,  5, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-      6,  7, 11, 11,  8, 11, 11, 11,      9, 11, 10, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_21_infos[12] = {
-          o2(0xC1,0xB0),      o2(0xC1,0xB1),
-          o2(0xC1,0xB2),      o2(0xC1,0xB3),
-          o2(0xC1,0xB4),      o2(0xC1,0xB5),
-          o2(0xC1,0xB6),      o2(0xC1,0xB7),
-          o2(0xC1,0xB8),      o2(0xC1,0xB9),
-          o2(0xC1,0xBA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_21 = {
-    to_EUC_KR_EC_21_offsets,
-    to_EUC_KR_EC_21_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_22_offsets[64] = {
-      0,  1, 16,  2, 16,  3,  4,  5,     16, 16, 16,  6,  7,  8, 16, 16,
-     16, 16, 16, 16,  9, 16, 16, 16,     16, 16, 16, 16, 16, 10, 16, 11,
-     16, 12, 16, 16, 16, 16, 16, 16,     13, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 14, 15, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_22_infos[17] = {
-          o2(0xC1,0xBB),      o2(0xC1,0xBC),
-          o2(0xC1,0xBD),      o2(0xC1,0xBE),
-          o2(0xC1,0xBF),      o2(0xC1,0xC0),
-          o2(0xC1,0xC1),      o2(0xC1,0xC2),
-          o2(0xC1,0xC3),      o2(0xC1,0xC4),
-          o2(0xC1,0xC5),      o2(0xC1,0xC6),
-          o2(0xC1,0xC7),      o2(0xC1,0xC8),
-          o2(0xC1,0xC9),      o2(0xC1,0xCA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_22 = {
-    to_EUC_KR_EC_22_offsets,
-    to_EUC_KR_EC_22_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_23_offsets[64] = {
-     13, 13, 13, 13,  0, 13, 13, 13,      1, 13, 13, 13,  2, 13, 13, 13,
-     13, 13, 13, 13,  3,  4, 13,  5,     13,  6, 13, 13, 13, 13, 13, 13,
-      7,  8, 13, 13,  9, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 10, 13, 13,     13, 13, 13, 13, 11, 12, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_23_infos[14] = {
-          o2(0xC1,0xCB),      o2(0xC1,0xCC),
-          o2(0xC1,0xCD),      o2(0xC1,0xCE),
-          o2(0xC1,0xCF),      o2(0xC1,0xD0),
-          o2(0xC1,0xD1),      o2(0xC1,0xD2),
-          o2(0xC1,0xD3),      o2(0xC1,0xD4),
-          o2(0xC1,0xD5),      o2(0xC1,0xD6),
-          o2(0xC1,0xD7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_23 = {
-    to_EUC_KR_EC_23_offsets,
-    to_EUC_KR_EC_23_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_24_offsets[64] = {
-      0, 11, 11, 11,  1,  2,  3, 11,     11, 11, 11, 11,  4,  5, 11,  6,
-     11,  7, 11, 11, 11, 11, 11, 11,      8, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  9, 11, 11, 11,
-     11, 11, 11, 11, 10, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_24_infos[12] = {
-          o2(0xC1,0xD8),      o2(0xC1,0xD9),
-          o2(0xC1,0xDA),      o2(0xC1,0xDB),
-          o2(0xC1,0xDC),      o2(0xC1,0xDD),
-          o2(0xC1,0xDE),      o2(0xC1,0xDF),
-          o2(0xC1,0xE0),      o2(0xC1,0xE1),
-          o2(0xC1,0xE2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_24 = {
-    to_EUC_KR_EC_24_offsets,
-    to_EUC_KR_EC_24_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_25_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-      0,  1, 11, 11,  2, 11, 11, 11,      3, 11, 11, 11, 11, 11, 11, 11,
-      4,  5, 11,  6, 11, 11, 11, 11,     11, 11, 11, 11,  7, 11, 11, 11,
-      8, 11, 11, 11,  9, 11, 11, 11,     11, 11, 11, 11, 10, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_25_infos[12] = {
-          o2(0xC1,0xE3),      o2(0xC1,0xE4),
-          o2(0xC1,0xE5),      o2(0xC1,0xE6),
-          o2(0xC1,0xE7),      o2(0xC1,0xE8),
-          o2(0xC1,0xE9),      o2(0xC1,0xEA),
-          o2(0xC1,0xEB),      o2(0xC1,0xEC),
-          o2(0xC1,0xED),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_25 = {
-    to_EUC_KR_EC_25_offsets,
-    to_EUC_KR_EC_25_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_26_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      0,  1,  8,  8,  2,  8,  8,  8,
-      3,  8,  8,  8,  8,  8,  8,  8,      4,  5,  8,  6,  8,  7,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_26_infos[9] = {
-          o2(0xC1,0xEE),      o2(0xC1,0xEF),
-          o2(0xC1,0xF0),      o2(0xC1,0xF1),
-          o2(0xC1,0xF2),      o2(0xC1,0xF3),
-          o2(0xC1,0xF4),      o2(0xC1,0xF5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_26 = {
-    to_EUC_KR_EC_26_offsets,
-    to_EUC_KR_EC_26_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_27_offsets[64] = {
-      0,  1, 27, 27,  2, 27, 27,  3,      4, 27,  5, 27, 27, 27, 27, 27,
-      6,  7, 27,  8, 27,  9, 10, 27,     27, 11, 12, 27, 13, 14, 27, 27,
-     15, 27, 16, 27, 17, 27, 27, 18,     27, 27, 27, 27, 19, 20, 27, 21,
-     22, 23, 27, 27, 27, 27, 27, 27,     24, 25, 27, 27, 26, 27, 27, 27,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_27_infos[28] = {
-          o2(0xC1,0xF6),      o2(0xC1,0xF7),
-          o2(0xC1,0xF8),      o2(0xC1,0xF9),
-          o2(0xC1,0xFA),      o2(0xC1,0xFB),
-          o2(0xC1,0xFC),      o2(0xC1,0xFD),
-          o2(0xC1,0xFE),      o2(0xC2,0xA1),
-          o2(0xC2,0xA2),      o2(0xC2,0xA3),
-          o2(0xC2,0xA4),      o2(0xC2,0xA5),
-          o2(0xC2,0xA6),      o2(0xC2,0xA7),
-          o2(0xC2,0xA8),      o2(0xC2,0xA9),
-          o2(0xC2,0xAA),      o2(0xC2,0xAB),
-          o2(0xC2,0xAC),      o2(0xC2,0xAD),
-          o2(0xC2,0xAE),      o2(0xC2,0xAF),
-          o2(0xC2,0xB0),      o2(0xC2,0xB1),
-          o2(0xC2,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_27 = {
-    to_EUC_KR_EC_27_offsets,
-    to_EUC_KR_EC_27_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_28_offsets[64] = {
-      0,  9,  9,  9,  9,  9,  9,  9,      1,  2,  9,  3,  4,  5,  9,  9,
-      9,  9,  9,  9,  6,  9,  9,  9,      7,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  8,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_28_infos[10] = {
-          o2(0xC2,0xB3),      o2(0xC2,0xB4),
-          o2(0xC2,0xB5),      o2(0xC2,0xB6),
-          o2(0xC2,0xB7),      o2(0xC2,0xB8),
-          o2(0xC2,0xB9),      o2(0xC2,0xBA),
-          o2(0xC2,0xBB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_28 = {
-    to_EUC_KR_EC_28_offsets,
-    to_EUC_KR_EC_28_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_29_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  0,  1, 11, 11,
-      2, 11, 11, 11,  3, 11, 11, 11,     11, 11, 11, 11,  4,  5, 11,  6,
-      7,  8, 11, 11, 11, 11, 11, 11,      9, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 10, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_29_infos[12] = {
-          o2(0xC2,0xBC),      o2(0xC2,0xBD),
-          o2(0xC2,0xBE),      o2(0xC2,0xBF),
-          o2(0xC2,0xC0),      o2(0xC2,0xC1),
-          o2(0xC2,0xC2),      o2(0xC2,0xC3),
-          o2(0xC2,0xC4),      o2(0xC2,0xC5),
-          o2(0xC2,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_29 = {
-    to_EUC_KR_EC_29_offsets,
-    to_EUC_KR_EC_29_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2A_offsets[64] = {
-      4,  4,  4,  4,  0,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      1,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  2,  3,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2A_infos[5] = {
-          o2(0xC2,0xC7),      o2(0xC2,0xC8),
-          o2(0xC2,0xC9),      o2(0xC2,0xCA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2A = {
-    to_EUC_KR_EC_2A_offsets,
-    to_EUC_KR_EC_2A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2B_offsets[64] = {
-      0, 12, 12, 12,  1, 12, 12, 12,     12, 12, 12, 12,  2,  3, 12,  4,
-     12,  5, 12,  6, 12, 12, 12, 12,      7,  8, 12, 12, 12, 12, 12, 12,
-      9, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 10, 12, 12, 12,
-     12, 12, 12, 12, 11, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2B_infos[13] = {
-          o2(0xC2,0xCB),      o2(0xC2,0xCC),
-          o2(0xC2,0xCD),      o2(0xC2,0xCE),
-          o2(0xC2,0xCF),      o2(0xC2,0xD0),
-          o2(0xC2,0xD1),      o2(0xC2,0xD2),
-          o2(0xC2,0xD3),      o2(0xC2,0xD4),
-          o2(0xC2,0xD5),      o2(0xC2,0xD6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2B = {
-    to_EUC_KR_EC_2B_offsets,
-    to_EUC_KR_EC_2B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2C_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      0,  6,  6,  6,  6,  6,  6,  6,
-      1,  6,  6,  6,  2,  6,  6,  6,      3,  6,  6,  6,  6,  6,  6,  6,
-      4,  5,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2C_infos[7] = {
-          o2(0xC2,0xD7),      o2(0xC2,0xD8),
-          o2(0xC2,0xD9),      o2(0xC2,0xDA),
-          o2(0xC2,0xDB),      o2(0xC2,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2C = {
-    to_EUC_KR_EC_2C_offsets,
-    to_EUC_KR_EC_2C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2D_offsets[64] = {
-     11,  0, 11, 11, 11, 11, 11, 11,      1,  2, 11, 11,  3, 11, 11, 11,
-      4, 11, 11, 11, 11, 11, 11, 11,      5,  6, 11, 11, 11,  7, 11, 11,
-     11, 11, 11, 11,  8, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,      9, 10, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2D_infos[12] = {
-          o2(0xC2,0xDD),      o2(0xC2,0xDE),
-          o2(0xC2,0xDF),      o2(0xC2,0xE0),
-          o2(0xC2,0xE1),      o2(0xC2,0xE2),
-          o2(0xC2,0xE3),      o2(0xC2,0xE4),
-          o2(0xC2,0xE5),      o2(0xC2,0xE6),
-          o2(0xC2,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2D = {
-    to_EUC_KR_EC_2D_offsets,
-    to_EUC_KR_EC_2D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2E_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,      2,  2,  2,  2,  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,      1,  2,  2,  2,  2,  2,  2,  2,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2E_infos[3] = {
-          o2(0xC2,0xE8),      o2(0xC2,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2E = {
-    to_EUC_KR_EC_2E_offsets,
-    to_EUC_KR_EC_2E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_2F_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  0,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  1,  4,  4,  2,      4,  3,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_2F_infos[5] = {
-          o2(0xC2,0xEA),      o2(0xC2,0xEB),
-          o2(0xC2,0xEC),      o2(0xC2,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_2F = {
-    to_EUC_KR_EC_2F_offsets,
-    to_EUC_KR_EC_2F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_30_offsets[64] = {
-     20, 20, 20, 20, 20, 20, 20, 20,     20, 20, 20, 20,  0,  1, 20, 20,
-      2, 20, 20, 20,  3, 20, 20, 20,     20, 20, 20, 20,  4,  5, 20, 20,
-     20,  6,  7, 20, 20, 20, 20,  8,      9, 10, 20, 20, 11, 20, 12, 20,
-     13, 20, 20, 20, 20, 20, 20, 20,     14, 15, 20, 16, 17, 18, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_30_infos[21] = {
-          o2(0xC2,0xEE),      o2(0xC2,0xEF),
-          o2(0xC2,0xF0),      o2(0xC2,0xF1),
-          o2(0xC2,0xF2),      o2(0xC2,0xF3),
-          o2(0xC2,0xF4),      o2(0xC2,0xF5),
-          o2(0xC2,0xF6),      o2(0xC2,0xF7),
-          o2(0xC2,0xF8),      o2(0xC2,0xF9),
-          o2(0xC2,0xFA),      o2(0xC2,0xFB),
-          o2(0xC2,0xFC),      o2(0xC2,0xFD),
-          o2(0xC2,0xFE),      o2(0xC3,0xA1),
-          o2(0xC3,0xA2),      o2(0xC3,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_30 = {
-    to_EUC_KR_EC_30_offsets,
-    to_EUC_KR_EC_30_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_31_offsets[64] = {
-     15, 15, 15, 15,  0,  1, 15, 15,      2, 15, 15, 15,  3, 15, 15, 15,
-     15, 15, 15, 15,  4,  5, 15,  6,      7,  8, 15, 15, 15, 15, 15, 15,
-      9, 15, 15, 15, 10, 15, 11, 15,     12, 15, 15, 15, 15, 15, 15, 15,
-     13, 15, 15, 15, 15, 14, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_31_infos[16] = {
-          o2(0xC3,0xA4),      o2(0xC3,0xA5),
-          o2(0xC3,0xA6),      o2(0xC3,0xA7),
-          o2(0xC3,0xA8),      o2(0xC3,0xA9),
-          o2(0xC3,0xAA),      o2(0xC3,0xAB),
-          o2(0xC3,0xAC),      o2(0xC3,0xAD),
-          o2(0xC3,0xAE),      o2(0xC3,0xAF),
-          o2(0xC3,0xB0),      o2(0xC3,0xB1),
-          o2(0xC3,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_31 = {
-    to_EUC_KR_EC_31_offsets,
-    to_EUC_KR_EC_31_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_32_offsets[64] = {
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,      0,  1, 13, 13,  2, 13, 13, 13,
-      3, 13, 13, 13, 13, 13, 13, 13,      4,  5, 13,  6,  7,  8, 13, 13,
-     13, 13, 13, 13,  9, 10, 13, 13,     11, 13, 13, 13, 12, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_32_infos[14] = {
-          o2(0xC3,0xB3),      o2(0xC3,0xB4),
-          o2(0xC3,0xB5),      o2(0xC3,0xB6),
-          o2(0xC3,0xB7),      o2(0xC3,0xB8),
-          o2(0xC3,0xB9),      o2(0xC3,0xBA),
-          o2(0xC3,0xBB),      o2(0xC3,0xBC),
-          o2(0xC3,0xBD),      o2(0xC3,0xBE),
-          o2(0xC3,0xBF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_32 = {
-    to_EUC_KR_EC_32_offsets,
-    to_EUC_KR_EC_32_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_33_offsets[64] = {
-      9,  9,  9,  9,  0,  1,  9,  2,      9,  3,  9,  9,  9,  9,  9,  9,
-      4,  9,  9,  9,  5,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  6,  9,  9,  9,      9,  9,  9,  9,  7,  9,  9,  9,
-      8,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_33_infos[10] = {
-          o2(0xC3,0xC0),      o2(0xC3,0xC1),
-          o2(0xC3,0xC2),      o2(0xC3,0xC3),
-          o2(0xC3,0xC4),      o2(0xC3,0xC5),
-          o2(0xC3,0xC6),      o2(0xC3,0xC7),
-          o2(0xC3,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_33 = {
-    to_EUC_KR_EC_33_offsets,
-    to_EUC_KR_EC_33_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_34_offsets[64] = {
-     13,  0, 13, 13, 13, 13, 13, 13,      1,  2, 13, 13,  3, 13, 13, 13,
-      4, 13, 13, 13, 13, 13, 13, 13,      5,  6, 13,  7, 13,  8, 13, 13,
-     13, 13, 13, 13,  9, 13, 13, 13,     10, 13, 13, 13, 11, 13, 13, 13,
-     13, 13, 13, 13, 13, 13, 13, 13,     13, 12, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_34_infos[14] = {
-          o2(0xC3,0xC9),      o2(0xC3,0xCA),
-          o2(0xC3,0xCB),      o2(0xC3,0xCC),
-          o2(0xC3,0xCD),      o2(0xC3,0xCE),
-          o2(0xC3,0xCF),      o2(0xC3,0xD0),
-          o2(0xC3,0xD1),      o2(0xC3,0xD2),
-          o2(0xC3,0xD3),      o2(0xC3,0xD4),
-          o2(0xC3,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_34 = {
-    to_EUC_KR_EC_34_offsets,
-    to_EUC_KR_EC_34_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_35_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  0,  8,  8,  8,
-      1,  8,  8,  8,  2,  8,  8,  8,      8,  8,  8,  8,  3,  4,  8,  5,
-      8,  6,  8,  8,  8,  8,  8,  8,      7,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_35_infos[9] = {
-          o2(0xC3,0xD6),      o2(0xC3,0xD7),
-          o2(0xC3,0xD8),      o2(0xC3,0xD9),
-          o2(0xC3,0xDA),      o2(0xC3,0xDB),
-          o2(0xC3,0xDC),      o2(0xC3,0xDD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_35 = {
-    to_EUC_KR_EC_35_offsets,
-    to_EUC_KR_EC_35_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_36_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10, 10,      0, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10,  1,  2, 10, 10,      3, 10, 10, 10,  4, 10, 10, 10,
-     10, 10, 10, 10,  5,  6, 10,  7,     10,  8, 10, 10, 10, 10, 10, 10,
-      9, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_36_infos[11] = {
-          o2(0xC3,0xDE),      o2(0xC3,0xDF),
-          o2(0xC3,0xE0),      o2(0xC3,0xE1),
-          o2(0xC3,0xE2),      o2(0xC3,0xE3),
-          o2(0xC3,0xE4),      o2(0xC3,0xE5),
-          o2(0xC3,0xE6),      o2(0xC3,0xE7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_36 = {
-    to_EUC_KR_EC_36_offsets,
-    to_EUC_KR_EC_36_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_37_offsets[64] = {
-     10, 10, 10, 10,  0, 10, 10, 10,     10, 10, 10, 10,  1, 10, 10, 10,
-      2, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,      3, 10, 10, 10,  4, 10, 10, 10,
-      5, 10, 10, 10, 10, 10, 10, 10,      6,  7, 10,  8, 10,  9, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_37_infos[11] = {
-          o2(0xC3,0xE8),      o2(0xC3,0xE9),
-          o2(0xC3,0xEA),      o2(0xC3,0xEB),
-          o2(0xC3,0xEC),      o2(0xC3,0xED),
-          o2(0xC3,0xEE),      o2(0xC3,0xEF),
-          o2(0xC3,0xF0),      o2(0xC3,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_37 = {
-    to_EUC_KR_EC_37_offsets,
-    to_EUC_KR_EC_37_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_38_offsets[64] = {
-     13, 13, 13, 13,  0, 13, 13, 13,      1, 13, 13, 13,  2, 13, 13, 13,
-     13, 13, 13, 13,  3, 13, 13, 13,     13,  4, 13, 13, 13, 13, 13, 13,
-      5,  6, 13, 13,  7, 13, 13, 13,      8, 13, 13, 13, 13, 13, 13, 13,
-      9, 10, 13, 11, 13, 12, 13, 13,     13, 13, 13, 13, 13, 13, 13, 13,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_38_infos[14] = {
-          o2(0xC3,0xF2),      o2(0xC3,0xF3),
-          o2(0xC3,0xF4),      o2(0xC3,0xF5),
-          o2(0xC3,0xF6),      o2(0xC3,0xF7),
-          o2(0xC3,0xF8),      o2(0xC3,0xF9),
-          o2(0xC3,0xFA),      o2(0xC3,0xFB),
-          o2(0xC3,0xFC),      o2(0xC3,0xFD),
-          o2(0xC3,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_38 = {
-    to_EUC_KR_EC_38_offsets,
-    to_EUC_KR_EC_38_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_39_offsets[64] = {
-     14, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     14, 14, 14, 14, 14, 14, 14, 14,      0,  1, 14, 14,  2, 14, 14,  3,
-      4,  5, 14, 14, 14, 14, 14, 14,      6,  7, 14,  8, 14,  9, 14, 14,
-     14, 14, 14, 14, 10, 11, 14, 14,     12, 14, 14, 14, 13, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_39_infos[15] = {
-          o2(0xC4,0xA1),      o2(0xC4,0xA2),
-          o2(0xC4,0xA3),      o2(0xC4,0xA4),
-          o2(0xC4,0xA5),      o2(0xC4,0xA6),
-          o2(0xC4,0xA7),      o2(0xC4,0xA8),
-          o2(0xC4,0xA9),      o2(0xC4,0xAA),
-          o2(0xC4,0xAB),      o2(0xC4,0xAC),
-          o2(0xC4,0xAD),      o2(0xC4,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_39 = {
-    to_EUC_KR_EC_39_offsets,
-    to_EUC_KR_EC_39_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3A_offsets[64] = {
-     15, 15, 15, 15,  0,  1, 15,  2,     15,  3, 15, 15, 15, 15, 15, 15,
-      4,  5, 15, 15,  6, 15, 15, 15,      7, 15, 15, 15, 15, 15, 15, 15,
-      8,  9, 15, 10, 11, 12, 15, 15,     15, 15, 15, 15, 13, 14, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3A_infos[16] = {
-          o2(0xC4,0xAF),      o2(0xC4,0xB0),
-          o2(0xC4,0xB1),      o2(0xC4,0xB2),
-          o2(0xC4,0xB3),      o2(0xC4,0xB4),
-          o2(0xC4,0xB5),      o2(0xC4,0xB6),
-          o2(0xC4,0xB7),      o2(0xC4,0xB8),
-          o2(0xC4,0xB9),      o2(0xC4,0xBA),
-          o2(0xC4,0xBB),      o2(0xC4,0xBC),
-          o2(0xC4,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3A = {
-    to_EUC_KR_EC_3A_offsets,
-    to_EUC_KR_EC_3A_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3B_offsets[64] = {
-     11,  0, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11,  1,  2, 11, 11,      3, 11, 11,  4,  5, 11, 11, 11,
-     11, 11, 11, 11,  6,  7, 11,  8,      9, 10, 11, 11, 11, 11, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3B_infos[12] = {
-          o2(0xC4,0xBE),      o2(0xC4,0xBF),
-          o2(0xC4,0xC0),      o2(0xC4,0xC1),
-          o2(0xC4,0xC2),      o2(0xC4,0xC3),
-          o2(0xC4,0xC4),      o2(0xC4,0xC5),
-          o2(0xC4,0xC6),      o2(0xC4,0xC7),
-          o2(0xC4,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3B = {
-    to_EUC_KR_EC_3B_offsets,
-    to_EUC_KR_EC_3B_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3C_offsets[64] = {
-      0,  1, 17, 17,  2, 17, 17, 17,      3, 17, 17, 17, 17, 17, 17, 17,
-      4,  5, 17,  6, 17,  7, 17, 17,     17, 17, 17, 17,  8, 17, 17, 17,
-      9, 17, 17, 17, 10, 17, 17, 17,     17, 17, 17, 17, 11, 12, 17, 13,
-     14, 15, 17, 17, 17, 17, 17, 17,     16, 17, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3C_infos[18] = {
-          o2(0xC4,0xC9),      o2(0xC4,0xCA),
-          o2(0xC4,0xCB),      o2(0xC4,0xCC),
-          o2(0xC4,0xCD),      o2(0xC4,0xCE),
-          o2(0xC4,0xCF),      o2(0xC4,0xD0),
-          o2(0xC4,0xD1),      o2(0xC4,0xD2),
-          o2(0xC4,0xD3),      o2(0xC4,0xD4),
-          o2(0xC4,0xD5),      o2(0xC4,0xD6),
-          o2(0xC4,0xD7),      o2(0xC4,0xD8),
-          o2(0xC4,0xD9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3C = {
-    to_EUC_KR_EC_3C_offsets,
-    to_EUC_KR_EC_3C_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3D_offsets[64] = {
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12,  0,  1, 12, 12,      2, 12, 12, 12,  3, 12, 12, 12,
-     12, 12, 12, 12,  4,  5, 12,  6,     12,  7, 12, 12, 12, 12, 12, 12,
-      8,  9, 12, 12, 10, 12, 12, 12,     11, 12, 12, 12, 12, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3D_infos[13] = {
-          o2(0xC4,0xDA),      o2(0xC4,0xDB),
-          o2(0xC4,0xDC),      o2(0xC4,0xDD),
-          o2(0xC4,0xDE),      o2(0xC4,0xDF),
-          o2(0xC4,0xE0),      o2(0xC4,0xE1),
-          o2(0xC4,0xE2),      o2(0xC4,0xE3),
-          o2(0xC4,0xE4),      o2(0xC4,0xE5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3D = {
-    to_EUC_KR_EC_3D_offsets,
-    to_EUC_KR_EC_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3E_offsets[64] = {
-      0,  6,  6,  6,  6,  1,  6,  6,      6,  6,  6,  6,  2,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  3,  6,  6,  6,  6,  6,  6,      4,  6,  6,  6,  6,  6,  6,  6,
-      5,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3E_infos[7] = {
-          o2(0xC4,0xE6),      o2(0xC4,0xE7),
-          o2(0xC4,0xE8),      o2(0xC4,0xE9),
-          o2(0xC4,0xEA),      o2(0xC4,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3E = {
-    to_EUC_KR_EC_3E_offsets,
-    to_EUC_KR_EC_3E_infos
-};
-
-static const unsigned char
-to_EUC_KR_EC_3F_offsets[64] = {
-     10, 10, 10, 10,  0, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-      1,  2, 10, 10,  3, 10, 10, 10,      4, 10, 10, 10, 10, 10, 10, 10,
-      5,  6, 10,  7, 10,  8, 10, 10,     10, 10, 10, 10,  9, 10, 10, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_3F_infos[11] = {
-          o2(0xC4,0xEC),      o2(0xC4,0xED),
-          o2(0xC4,0xEE),      o2(0xC4,0xEF),
-          o2(0xC4,0xF0),      o2(0xC4,0xF1),
-          o2(0xC4,0xF2),      o2(0xC4,0xF3),
-          o2(0xC4,0xF4),      o2(0xC4,0xF5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC_3F = {
-    to_EUC_KR_EC_3F_offsets,
-    to_EUC_KR_EC_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EC_infos[65] = {
-       &to_EUC_KR_EC_00,   &to_EUC_KR_EC_01,
-       &to_EUC_KR_EC_02,   &to_EUC_KR_EC_03,
-       &to_EUC_KR_EC_04,   &to_EUC_KR_EC_05,
-       &to_EUC_KR_EC_06,   &to_EUC_KR_EC_07,
-       &to_EUC_KR_EC_08,   &to_EUC_KR_EC_09,
-       &to_EUC_KR_EC_0A,   &to_EUC_KR_EC_0B,
-       &to_EUC_KR_EC_0C,   &to_EUC_KR_EC_0D,
-       &to_EUC_KR_EC_0E,   &to_EUC_KR_EC_0F,
-       &to_EUC_KR_EC_10,   &to_EUC_KR_EC_11,
-       &to_EUC_KR_EC_12,   &to_EUC_KR_EC_13,
-       &to_EUC_KR_EC_14,   &to_EUC_KR_EC_15,
-       &to_EUC_KR_EC_16,   &to_EUC_KR_EC_17,
-       &to_EUC_KR_EC_18,   &to_EUC_KR_EC_19,
-       &to_EUC_KR_EC_1A,   &to_EUC_KR_EC_1B,
-       &to_EUC_KR_EC_1C,   &to_EUC_KR_EC_1D,
-       &to_EUC_KR_EC_1E,   &to_EUC_KR_EC_1F,
-       &to_EUC_KR_EC_20,   &to_EUC_KR_EC_21,
-       &to_EUC_KR_EC_22,   &to_EUC_KR_EC_23,
-       &to_EUC_KR_EC_24,   &to_EUC_KR_EC_25,
-       &to_EUC_KR_EC_26,   &to_EUC_KR_EC_27,
-       &to_EUC_KR_EC_28,   &to_EUC_KR_EC_29,
-       &to_EUC_KR_EC_2A,   &to_EUC_KR_EC_2B,
-       &to_EUC_KR_EC_2C,   &to_EUC_KR_EC_2D,
-       &to_EUC_KR_EC_2E,   &to_EUC_KR_EC_2F,
-       &to_EUC_KR_EC_30,   &to_EUC_KR_EC_31,
-       &to_EUC_KR_EC_32,   &to_EUC_KR_EC_33,
-       &to_EUC_KR_EC_34,   &to_EUC_KR_EC_35,
-       &to_EUC_KR_EC_36,   &to_EUC_KR_EC_37,
-       &to_EUC_KR_EC_38,   &to_EUC_KR_EC_39,
-       &to_EUC_KR_EC_3A,   &to_EUC_KR_EC_3B,
-       &to_EUC_KR_EC_3C,   &to_EUC_KR_EC_3D,
-       &to_EUC_KR_EC_3E,   &to_EUC_KR_EC_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EC = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EC_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_00_offsets[64] = {
-      0,  9,  9,  9,  1,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  2,  9,  9,  9,  9,  9,  9,      3,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  4,  9,  9,
-      9,  9,  9,  9,  5,  6,  9,  9,      7,  9,  9,  9,  8,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_00_infos[10] = {
-          o2(0xC4,0xF6),      o2(0xC4,0xF7),
-          o2(0xC4,0xF8),      o2(0xC4,0xF9),
-          o2(0xC4,0xFA),      o2(0xC4,0xFB),
-          o2(0xC4,0xFC),      o2(0xC4,0xFD),
-          o2(0xC4,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_00 = {
-    to_EUC_KR_ED_00_offsets,
-    to_EUC_KR_ED_00_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_01_offsets[64] = {
-     14, 14, 14, 14,  0,  1, 14,  2,     14,  3, 14, 14, 14, 14, 14, 14,
-      4, 14, 14, 14,  5, 14, 14, 14,      6, 14, 14, 14, 14, 14, 14, 14,
-      7, 14, 14, 14, 14, 14, 14, 14,     14, 14, 14, 14,  8,  9, 14, 14,
-     10, 14, 14, 14, 11, 14, 14, 14,     14, 14, 14, 14, 12, 13, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_01_infos[15] = {
-          o2(0xC5,0xA1),      o2(0xC5,0xA2),
-          o2(0xC5,0xA3),      o2(0xC5,0xA4),
-          o2(0xC5,0xA5),      o2(0xC5,0xA6),
-          o2(0xC5,0xA7),      o2(0xC5,0xA8),
-          o2(0xC5,0xA9),      o2(0xC5,0xAA),
-          o2(0xC5,0xAB),      o2(0xC5,0xAC),
-          o2(0xC5,0xAD),      o2(0xC5,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_01 = {
-    to_EUC_KR_ED_01_offsets,
-    to_EUC_KR_ED_01_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_02_offsets[64] = {
-      9,  0,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  1,  2,  9,  9,      3,  9,  9,  9,  4,  9,  9,  9,
-      9,  9,  9,  9,  5,  6,  9,  7,      9,  8,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_02_infos[10] = {
-          o2(0xC5,0xAF),      o2(0xC5,0xB0),
-          o2(0xC5,0xB1),      o2(0xC5,0xB2),
-          o2(0xC5,0xB3),      o2(0xC5,0xB4),
-          o2(0xC5,0xB5),      o2(0xC5,0xB6),
-          o2(0xC5,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_02 = {
-    to_EUC_KR_ED_02_offsets,
-    to_EUC_KR_ED_02_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_03_offsets[64] = {
-      0,  1, 20, 20,  2, 20, 20, 20,      3,  4, 20, 20, 20, 20, 20, 20,
-      5,  6, 20,  7,  8,  9, 20, 20,     20, 20, 20, 20, 10, 11, 20, 20,
-     12, 20, 20, 20, 13, 20, 20, 20,     20, 20, 20, 20, 14, 15, 20, 16,
-     17, 18, 20, 20, 20, 20, 20, 20,     19, 20, 20, 20, 20, 20, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_03_infos[21] = {
-          o2(0xC5,0xB8),      o2(0xC5,0xB9),
-          o2(0xC5,0xBA),      o2(0xC5,0xBB),
-          o2(0xC5,0xBC),      o2(0xC5,0xBD),
-          o2(0xC5,0xBE),      o2(0xC5,0xBF),
-          o2(0xC5,0xC0),      o2(0xC5,0xC1),
-          o2(0xC5,0xC2),      o2(0xC5,0xC3),
-          o2(0xC5,0xC4),      o2(0xC5,0xC5),
-          o2(0xC5,0xC6),      o2(0xC5,0xC7),
-          o2(0xC5,0xC8),      o2(0xC5,0xC9),
-          o2(0xC5,0xCA),      o2(0xC5,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_03 = {
-    to_EUC_KR_ED_03_offsets,
-    to_EUC_KR_ED_03_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_04_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  0,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      1,  2,  6,  6,  3,  6,  6,  6,      4,  6,  5,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_04_infos[7] = {
-          o2(0xC5,0xCC),      o2(0xC5,0xCD),
-          o2(0xC5,0xCE),      o2(0xC5,0xCF),
-          o2(0xC5,0xD0),      o2(0xC5,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_04 = {
-    to_EUC_KR_ED_04_offsets,
-    to_EUC_KR_ED_04_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_05_offsets[64] = {
-      0,  1, 16,  2,  3,  4, 16, 16,     16, 16, 16, 16,  5,  6, 16, 16,
-      7, 16, 16, 16,  8, 16, 16, 16,     16, 16, 16, 16,  9, 10, 16, 11,
-     16, 12, 16, 16, 16, 16, 16, 16,     13, 16, 16, 16, 14, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     16, 16, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_05_infos[17] = {
-          o2(0xC5,0xD2),      o2(0xC5,0xD3),
-          o2(0xC5,0xD4),      o2(0xC5,0xD5),
-          o2(0xC5,0xD6),      o2(0xC5,0xD7),
-          o2(0xC5,0xD8),      o2(0xC5,0xD9),
-          o2(0xC5,0xDA),      o2(0xC5,0xDB),
-          o2(0xC5,0xDC),      o2(0xC5,0xDD),
-          o2(0xC5,0xDE),      o2(0xC5,0xDF),
-          o2(0xC5,0xE0),      o2(0xC5,0xE1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_05 = {
-    to_EUC_KR_ED_05_offsets,
-    to_EUC_KR_ED_05_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_06_offsets[64] = {
-     12, 12, 12, 12,  0, 12, 12, 12,      1, 12, 12, 12, 12, 12, 12, 12,
-     12, 12, 12, 12, 12, 12, 12, 12,     12, 12, 12, 12, 12, 12, 12, 12,
-      2,  3, 12, 12,  4, 12, 12, 12,      5, 12, 12, 12, 12, 12, 12, 12,
-      6,  7, 12,  8, 12,  9, 12, 12,     12, 12, 10, 12, 11, 12, 12, 12,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_06_infos[13] = {
-          o2(0xC5,0xE2),      o2(0xC5,0xE3),
-          o2(0xC5,0xE4),      o2(0xC5,0xE5),
-          o2(0xC5,0xE6),      o2(0xC5,0xE7),
-          o2(0xC5,0xE8),      o2(0xC5,0xE9),
-          o2(0xC5,0xEA),      o2(0xC5,0xEB),
-          o2(0xC5,0xEC),      o2(0xC5,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_06 = {
-    to_EUC_KR_ED_06_offsets,
-    to_EUC_KR_ED_06_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_07_offsets[64] = {
-      0,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      1,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  2,  4,  4,  4,      3,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_07_infos[5] = {
-          o2(0xC5,0xEE),      o2(0xC5,0xEF),
-          o2(0xC5,0xF0),      o2(0xC5,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_07 = {
-    to_EUC_KR_ED_07_offsets,
-    to_EUC_KR_ED_07_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_08_offsets[64] = {
-     10, 10, 10, 10, 10, 10, 10,  0,     10,  1, 10, 10, 10, 10, 10, 10,
-      2, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10, 10, 10, 10, 10,
-     10, 10, 10, 10, 10, 10, 10, 10,     10, 10, 10, 10,  3,  4, 10, 10,
-      5, 10, 10, 10,  6, 10, 10, 10,     10, 10, 10, 10,  7,  8, 10,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_08_infos[11] = {
-          o2(0xC5,0xF2),      o2(0xC5,0xF3),
-          o2(0xC5,0xF4),      o2(0xC5,0xF5),
-          o2(0xC5,0xF6),      o2(0xC5,0xF7),
-          o2(0xC5,0xF8),      o2(0xC5,0xF9),
-          o2(0xC5,0xFA),      o2(0xC5,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_08 = {
-    to_EUC_KR_ED_08_offsets,
-    to_EUC_KR_ED_08_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_09_offsets[64] = {
-      4,  0,  4,  4,  4,  4,  4,  4,      1,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  2,  4,  4,  4,
-      4,  4,  4,  4,  3,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_09_infos[5] = {
-          o2(0xC5,0xFC),      o2(0xC5,0xFD),
-          o2(0xC5,0xFE),      o2(0xC6,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_09 = {
-    to_EUC_KR_ED_09_offsets,
-    to_EUC_KR_ED_09_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0A_offsets[64] = {
-      0,  1, 16, 16,  2, 16, 16, 16,      3, 16, 16, 16, 16, 16, 16, 16,
-      4,  5, 16, 16, 16,  6, 16, 16,     16, 16, 16, 16,  7, 16, 16, 16,
-      8, 16, 16, 16,  9, 16, 16, 16,     16, 16, 16, 16, 10, 16, 16, 16,
-     16, 11, 16, 16, 16, 16, 16, 16,     12, 13, 16, 16, 14, 16, 16, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0A_infos[17] = {
-          o2(0xC6,0xA2),      o2(0xC6,0xA3),
-          o2(0xC6,0xA4),      o2(0xC6,0xA5),
-          o2(0xC6,0xA6),      o2(0xC6,0xA7),
-          o2(0xC6,0xA8),      o2(0xC6,0xA9),
-          o2(0xC6,0xAA),      o2(0xC6,0xAB),
-          o2(0xC6,0xAC),      o2(0xC6,0xAD),
-          o2(0xC6,0xAE),      o2(0xC6,0xAF),
-          o2(0xC6,0xB0),      o2(0xC6,0xB1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0A = {
-    to_EUC_KR_ED_0A_offsets,
-    to_EUC_KR_ED_0A_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0B_offsets[64] = {
-      0, 14,  1, 14, 14, 14, 14, 14,      2,  3, 14,  4, 14, 14, 14, 14,
-     14, 14, 14, 14,  5, 14, 14, 14,      6, 14, 14, 14,  7, 14, 14, 14,
-     14, 14, 14, 14,  8,  9, 14, 14,     14, 14, 14, 14, 14, 14, 14, 14,
-     10, 11, 14, 14, 12, 14, 14, 14,     13, 14, 14, 14, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0B_infos[15] = {
-          o2(0xC6,0xB2),      o2(0xC6,0xB3),
-          o2(0xC6,0xB4),      o2(0xC6,0xB5),
-          o2(0xC6,0xB6),      o2(0xC6,0xB7),
-          o2(0xC6,0xB8),      o2(0xC6,0xB9),
-          o2(0xC6,0xBA),      o2(0xC6,0xBB),
-          o2(0xC6,0xBC),      o2(0xC6,0xBD),
-          o2(0xC6,0xBE),      o2(0xC6,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0B = {
-    to_EUC_KR_ED_0B_offsets,
-    to_EUC_KR_ED_0B_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0C_offsets[64] = {
-      0,  1, 25,  2, 25,  3, 25, 25,     25, 25, 25, 25,  4,  5,  6, 25,
-      7, 25, 25, 25,  8, 25,  9, 25,     25, 25, 25, 25, 10, 11, 25, 12,
-     13, 14, 25, 25, 25, 15, 25, 25,     16, 17, 25, 25, 18, 25, 25, 25,
-     19, 25, 25, 25, 25, 25, 25, 25,     20, 21, 25, 22, 23, 24, 25, 25,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0C_infos[26] = {
-          o2(0xC6,0xC0),      o2(0xC6,0xC1),
-          o2(0xC6,0xC2),      o2(0xC6,0xC3),
-          o2(0xC6,0xC4),      o2(0xC6,0xC5),
-          o2(0xC6,0xC6),      o2(0xC6,0xC7),
-          o2(0xC6,0xC8),      o2(0xC6,0xC9),
-          o2(0xC6,0xCA),      o2(0xC6,0xCB),
-          o2(0xC6,0xCC),      o2(0xC6,0xCD),
-          o2(0xC6,0xCE),      o2(0xC6,0xCF),
-          o2(0xC6,0xD0),      o2(0xC6,0xD1),
-          o2(0xC6,0xD2),      o2(0xC6,0xD3),
-          o2(0xC6,0xD4),      o2(0xC6,0xD5),
-          o2(0xC6,0xD6),      o2(0xC6,0xD7),
-          o2(0xC6,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0C = {
-    to_EUC_KR_ED_0C_offsets,
-    to_EUC_KR_ED_0C_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0D_offsets[64] = {
-      4,  4,  4,  4,  0,  1,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,      4,  4,  4,  4,  2,  3,  4,  4,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0D_infos[5] = {
-          o2(0xC6,0xD9),      o2(0xC6,0xDA),
-          o2(0xC6,0xDB),      o2(0xC6,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0D = {
-    to_EUC_KR_ED_0D_offsets,
-    to_EUC_KR_ED_0D_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0E_offsets[64] = {
-      0, 18, 18, 18,  1, 18, 18, 18,     18, 18, 18, 18,  2,  3, 18,  4,
-      5,  6, 18, 18, 18, 18, 18, 18,      7,  8, 18, 18,  9, 18, 18, 18,
-     10, 18, 18, 18, 18, 18, 18, 18,     11, 12, 18, 13, 18, 14, 18, 18,
-     18, 18, 18, 18, 15, 18, 18, 18,     16, 18, 18, 18, 17, 18, 18, 18,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0E_infos[19] = {
-          o2(0xC6,0xDD),      o2(0xC6,0xDE),
-          o2(0xC6,0xDF),      o2(0xC6,0xE0),
-          o2(0xC6,0xE1),      o2(0xC6,0xE2),
-          o2(0xC6,0xE3),      o2(0xC6,0xE4),
-          o2(0xC6,0xE5),      o2(0xC6,0xE6),
-          o2(0xC6,0xE7),      o2(0xC6,0xE8),
-          o2(0xC6,0xE9),      o2(0xC6,0xEA),
-          o2(0xC6,0xEB),      o2(0xC6,0xEC),
-          o2(0xC6,0xED),      o2(0xC6,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0E = {
-    to_EUC_KR_ED_0E_offsets,
-    to_EUC_KR_ED_0E_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_0F_offsets[64] = {
-     15, 15, 15, 15,  0,  1, 15, 15,      2,  3, 15, 15, 15, 15, 15, 15,
-      4, 15, 15, 15, 15, 15, 15, 15,      5, 15, 15, 15, 15, 15, 15, 15,
-     15,  6, 15,  7, 15, 15, 15, 15,     15, 15, 15, 15,  8,  9, 15, 15,
-     10, 15, 15, 15, 11, 15, 15, 15,     15, 15, 15, 15, 12, 13, 15, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_0F_infos[16] = {
-          o2(0xC6,0xEF),      o2(0xC6,0xF0),
-          o2(0xC6,0xF1),      o2(0xC6,0xF2),
-          o2(0xC6,0xF3),      o2(0xC6,0xF4),
-          o2(0xC6,0xF5),      o2(0xC6,0xF6),
-          o2(0xC6,0xF7),      o2(0xC6,0xF8),
-          o2(0xC6,0xF9),      o2(0xC6,0xFA),
-          o2(0xC6,0xFB),      o2(0xC6,0xFC),
-          o2(0xC6,0xFD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_0F = {
-    to_EUC_KR_ED_0F_offsets,
-    to_EUC_KR_ED_0F_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_10_offsets[64] = {
-      3,  0,  3,  3,  3,  3,  3,  3,      1,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  2,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,      3,  3,  3,  3,  3,  3,  3,  3,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_10_infos[4] = {
-          o2(0xC6,0xFE),      o2(0xC7,0xA1),
-          o2(0xC7,0xA2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_10 = {
-    to_EUC_KR_ED_10_offsets,
-    to_EUC_KR_ED_10_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_11_offsets[64] = {
-      0, 11, 11, 11,  1, 11, 11, 11,     11, 11, 11, 11, 11, 11, 11, 11,
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  2, 11, 11, 11,
-      3, 11, 11, 11,  4, 11, 11, 11,     11, 11, 11, 11, 11,  5, 11,  6,
-     11, 11, 11, 11, 11, 11, 11, 11,      7,  8, 11, 11,  9, 11, 11, 10,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_11_infos[12] = {
-          o2(0xC7,0xA3),      o2(0xC7,0xA4),
-          o2(0xC7,0xA5),      o2(0xC7,0xA6),
-          o2(0xC7,0xA7),      o2(0xC7,0xA8),
-          o2(0xC7,0xA9),      o2(0xC7,0xAA),
-          o2(0xC7,0xAB),      o2(0xC7,0xAC),
-          o2(0xC7,0xAD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_11 = {
-    to_EUC_KR_ED_11_offsets,
-    to_EUC_KR_ED_11_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_12_offsets[64] = {
-      0,  8,  1,  8,  8,  8,  8,  8,      2,  3,  8,  4,  8,  5,  8,  8,
-      8,  8,  8,  8,  6,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  7,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_12_infos[9] = {
-          o2(0xC7,0xAE),      o2(0xC7,0xAF),
-          o2(0xC7,0xB0),      o2(0xC7,0xB1),
-          o2(0xC7,0xB2),      o2(0xC7,0xB3),
-          o2(0xC7,0xB4),      o2(0xC7,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_12 = {
-    to_EUC_KR_ED_12_offsets,
-    to_EUC_KR_ED_12_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_13_offsets[64] = {
-     11, 11, 11, 11, 11, 11, 11, 11,     11, 11, 11, 11,  0, 11, 11, 11,
-      1, 11, 11, 11,  2, 11, 11, 11,     11, 11, 11, 11,  3, 11, 11,  4,
-     11, 11, 11, 11, 11, 11, 11, 11,      5, 11, 11, 11,  6, 11, 11, 11,
-      7, 11, 11, 11, 11, 11, 11, 11,      8, 11, 11,  9, 11, 10, 11, 11,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_13_infos[12] = {
-          o2(0xC7,0xB6),      o2(0xC7,0xB7),
-          o2(0xC7,0xB8),      o2(0xC7,0xB9),
-          o2(0xC7,0xBA),      o2(0xC7,0xBB),
-          o2(0xC7,0xBC),      o2(0xC7,0xBD),
-          o2(0xC7,0xBE),      o2(0xC7,0xBF),
-          o2(0xC7,0xC0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_13 = {
-    to_EUC_KR_ED_13_offsets,
-    to_EUC_KR_ED_13_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_14_offsets[64] = {
-      8,  8,  8,  8,  0,  8,  8,  8,      1,  8,  8,  8,  2,  8,  8,  8,
-      8,  8,  8,  8,  3,  4,  8,  5,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  6,  7,  8,  8,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_14_infos[9] = {
-          o2(0xC7,0xC1),      o2(0xC7,0xC2),
-          o2(0xC7,0xC3),      o2(0xC7,0xC4),
-          o2(0xC7,0xC5),      o2(0xC7,0xC6),
-          o2(0xC7,0xC7),      o2(0xC7,0xC8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_14 = {
-    to_EUC_KR_ED_14_offsets,
-    to_EUC_KR_ED_14_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_15_offsets[64] = {
-      0, 19, 19, 19,  1, 19, 19, 19,     19, 19, 19, 19,  2,  3, 19,  4,
-     19,  5, 19, 19, 19, 19, 19, 19,      6,  7, 19, 19,  8, 19, 19, 19,
-      9, 19, 19, 19, 19, 10, 19, 19,     11, 12, 19, 13, 19, 14, 19, 19,
-     19, 19, 19, 19, 15, 16, 19, 19,     17, 19, 19, 19, 18, 19, 19, 19,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_15_infos[20] = {
-          o2(0xC7,0xC9),      o2(0xC7,0xCA),
-          o2(0xC7,0xCB),      o2(0xC7,0xCC),
-          o2(0xC7,0xCD),      o2(0xC7,0xCE),
-          o2(0xC7,0xCF),      o2(0xC7,0xD0),
-          o2(0xC7,0xD1),      o2(0xC7,0xD2),
-          o2(0xC7,0xD3),      o2(0xC7,0xD4),
-          o2(0xC7,0xD5),      o2(0xC7,0xD6),
-          o2(0xC7,0xD7),      o2(0xC7,0xD8),
-          o2(0xC7,0xD9),      o2(0xC7,0xDA),
-          o2(0xC7,0xDB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_15 = {
-    to_EUC_KR_ED_15_offsets,
-    to_EUC_KR_ED_15_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_16_offsets[64] = {
-      7,  7,  7,  7,  0,  1,  7,  2,      3,  4,  7,  7,  7,  7,  7,  7,
-      5,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  6,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,      7,  7,  7,  7,  7,  7,  7,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_16_infos[8] = {
-          o2(0xC7,0xDC),      o2(0xC7,0xDD),
-          o2(0xC7,0xDE),      o2(0xC7,0xDF),
-          o2(0xC7,0xE0),      o2(0xC7,0xE1),
-          o2(0xC7,0xE2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_16 = {
-    to_EUC_KR_ED_16_offsets,
-    to_EUC_KR_ED_16_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_17_offsets[64] = {
-     17, 17, 17, 17, 17, 17, 17, 17,      0,  1, 17, 17,  2, 17, 17, 17,
-      3, 17,  4, 17, 17, 17, 17, 17,      5,  6, 17,  7, 17,  8, 17, 17,
-     17, 17, 17, 17,  9, 10, 17, 17,     11, 17, 17, 17, 12, 17, 17, 17,
-     17, 17, 17, 17, 13, 14, 17, 15,     17, 16, 17, 17, 17, 17, 17, 17,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_17_infos[18] = {
-          o2(0xC7,0xE3),      o2(0xC7,0xE4),
-          o2(0xC7,0xE5),      o2(0xC7,0xE6),
-          o2(0xC7,0xE7),      o2(0xC7,0xE8),
-          o2(0xC7,0xE9),      o2(0xC7,0xEA),
-          o2(0xC7,0xEB),      o2(0xC7,0xEC),
-          o2(0xC7,0xED),      o2(0xC7,0xEE),
-          o2(0xC7,0xEF),      o2(0xC7,0xF0),
-          o2(0xC7,0xF1),      o2(0xC7,0xF2),
-          o2(0xC7,0xF3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_17 = {
-    to_EUC_KR_ED_17_offsets,
-    to_EUC_KR_ED_17_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_18_offsets[64] = {
-      0,  1, 16, 16,  2, 16, 16, 16,      3, 16, 16, 16, 16, 16, 16, 16,
-      4,  5, 16,  6,  7,  8, 16, 16,     16, 16, 16, 16,  9, 16, 16, 16,
-     10, 16, 16, 16, 11, 16, 16, 16,     16, 16, 16, 16, 16, 12, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,     13, 14, 16, 16, 15, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_18_infos[17] = {
-          o2(0xC7,0xF4),      o2(0xC7,0xF5),
-          o2(0xC7,0xF6),      o2(0xC7,0xF7),
-          o2(0xC7,0xF8),      o2(0xC7,0xF9),
-          o2(0xC7,0xFA),      o2(0xC7,0xFB),
-          o2(0xC7,0xFC),      o2(0xC7,0xFD),
-          o2(0xC7,0xFE),      o2(0xC8,0xA1),
-          o2(0xC8,0xA2),      o2(0xC8,0xA3),
-          o2(0xC8,0xA4),      o2(0xC8,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_18 = {
-    to_EUC_KR_ED_18_offsets,
-    to_EUC_KR_ED_18_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_19_offsets[64] = {
-      0, 16, 16, 16, 16,  1, 16, 16,      2,  3, 16,  4, 16,  5, 16, 16,
-     16,  6, 16, 16,  7,  8, 16, 16,      9, 16, 16, 16, 10, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 11,     16, 12, 16, 16, 16, 16, 16, 16,
-     13, 14, 16, 16, 15, 16, 16, 16,     16, 16, 16, 16, 16, 16, 16, 16,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_19_infos[17] = {
-          o2(0xC8,0xA6),      o2(0xC8,0xA7),
-          o2(0xC8,0xA8),      o2(0xC8,0xA9),
-          o2(0xC8,0xAA),      o2(0xC8,0xAB),
-          o2(0xC8,0xAC),      o2(0xC8,0xAD),
-          o2(0xC8,0xAE),      o2(0xC8,0xAF),
-          o2(0xC8,0xB0),      o2(0xC8,0xB1),
-          o2(0xC8,0xB2),      o2(0xC8,0xB3),
-          o2(0xC8,0xB4),      o2(0xC8,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_19 = {
-    to_EUC_KR_ED_19_offsets,
-    to_EUC_KR_ED_19_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_1A_offsets[64] = {
-     14, 14, 14,  0, 14,  1, 14, 14,     14, 14, 14, 14,  2,  3, 14, 14,
-      4, 14, 14, 14,  5, 14, 14, 14,     14, 14, 14, 14, 14,  6, 14,  7,
-     14,  8, 14, 14, 14, 14, 14, 14,      9, 14, 14, 14, 10, 14, 14, 14,
-     11, 14, 14, 14, 14, 14, 14, 14,     14, 12, 14, 13, 14, 14, 14, 14,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_1A_infos[15] = {
-          o2(0xC8,0xB6),      o2(0xC8,0xB7),
-          o2(0xC8,0xB8),      o2(0xC8,0xB9),
-          o2(0xC8,0xBA),      o2(0xC8,0xBB),
-          o2(0xC8,0xBC),      o2(0xC8,0xBD),
-          o2(0xC8,0xBE),      o2(0xC8,0xBF),
-          o2(0xC8,0xC0),      o2(0xC8,0xC1),
-          o2(0xC8,0xC2),      o2(0xC8,0xC3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_1A = {
-    to_EUC_KR_ED_1A_offsets,
-    to_EUC_KR_ED_1A_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_1B_offsets[64] = {
-     15, 15, 15, 15,  0,  1, 15, 15,      2, 15, 15, 15,  3, 15, 15, 15,
-     15,  4, 15, 15,  5, 15, 15,  6,     15,  7, 15, 15, 15, 15, 15, 15,
-      8, 15, 15, 15,  9, 15, 15, 15,     10, 15, 15, 15, 15, 15, 15, 15,
-     11, 15, 15, 15, 15, 12, 15, 15,     15, 15, 15, 15, 13, 14, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_1B_infos[16] = {
-          o2(0xC8,0xC4),      o2(0xC8,0xC5),
-          o2(0xC8,0xC6),      o2(0xC8,0xC7),
-          o2(0xC8,0xC8),      o2(0xC8,0xC9),
-          o2(0xC8,0xCA),      o2(0xC8,0xCB),
-          o2(0xC8,0xCC),      o2(0xC8,0xCD),
-          o2(0xC8,0xCE),      o2(0xC8,0xCF),
-          o2(0xC8,0xD0),      o2(0xC8,0xD1),
-          o2(0xC8,0xD2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_1B = {
-    to_EUC_KR_ED_1B_offsets,
-    to_EUC_KR_ED_1B_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_1C_offsets[64] = {
-      0, 15, 15, 15,  1, 15, 15, 15,     15, 15, 15, 15, 15, 15, 15, 15,
-     15,  2, 15, 15, 15, 15, 15, 15,      3,  4, 15, 15,  5, 15, 15, 15,
-      6, 15, 15, 15, 15, 15, 15, 15,      7,  8, 15,  9, 15, 10, 15, 15,
-     15, 15, 15, 15, 11, 12, 15, 15,     13, 15, 15, 15, 14, 15, 15, 15,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_1C_infos[16] = {
-          o2(0xC8,0xD3),      o2(0xC8,0xD4),
-          o2(0xC8,0xD5),      o2(0xC8,0xD6),
-          o2(0xC8,0xD7),      o2(0xC8,0xD8),
-          o2(0xC8,0xD9),      o2(0xC8,0xDA),
-          o2(0xC8,0xDB),      o2(0xC8,0xDC),
-          o2(0xC8,0xDD),      o2(0xC8,0xDE),
-          o2(0xC8,0xDF),      o2(0xC8,0xE0),
-          o2(0xC8,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_1C = {
-    to_EUC_KR_ED_1C_offsets,
-    to_EUC_KR_ED_1C_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_1D_offsets[64] = {
-     20, 20, 20, 20,  0, 20, 20,  1,     20,  2, 20, 20, 20, 20, 20, 20,
-      3,  4, 20, 20,  5, 20,  6,  7,      8,  9, 20, 20, 20, 20, 20, 20,
-     10, 11, 20, 12, 20, 13, 20, 20,     20, 14, 20, 20, 15, 20, 20, 20,
-     16, 20, 20, 20, 17, 20, 20, 20,     20, 20, 20, 20, 18, 19, 20, 20,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_1D_infos[21] = {
-          o2(0xC8,0xE2),      o2(0xC8,0xE3),
-          o2(0xC8,0xE4),      o2(0xC8,0xE5),
-          o2(0xC8,0xE6),      o2(0xC8,0xE7),
-          o2(0xC8,0xE8),      o2(0xC8,0xE9),
-          o2(0xC8,0xEA),      o2(0xC8,0xEB),
-          o2(0xC8,0xEC),      o2(0xC8,0xED),
-          o2(0xC8,0xEE),      o2(0xC8,0xEF),
-          o2(0xC8,0xF0),      o2(0xC8,0xF1),
-          o2(0xC8,0xF2),      o2(0xC8,0xF3),
-          o2(0xC8,0xF4),      o2(0xC8,0xF5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_1D = {
-    to_EUC_KR_ED_1D_offsets,
-    to_EUC_KR_ED_1D_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_1E_offsets[64] = {
-      9,  0,  9,  9,  9,  9,  9,  9,      1,  2,  9,  9,  3,  9,  9,  9,
-      4,  9,  9,  9,  9,  9,  9,  9,      5,  6,  9,  7,  9,  8,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-      9,  9,  9,  9,  9,  9,  9,  9,      9,  9,  9,  9,  9,  9,  9,  9,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_1E_infos[10] = {
-          o2(0xC8,0xF6),      o2(0xC8,0xF7),
-          o2(0xC8,0xF8),      o2(0xC8,0xF9),
-          o2(0xC8,0xFA),      o2(0xC8,0xFB),
-          o2(0xC8,0xFC),      o2(0xC8,0xFD),
-          o2(0xC8,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED_1E = {
-    to_EUC_KR_ED_1E_offsets,
-    to_EUC_KR_ED_1E_infos
-};
-
-static const unsigned char
-to_EUC_KR_ED_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     31, 31, 31, 31, 31, 31, 31, 31,     31, 31, 31, 31, 31, 31, 31, 31,
-     31, 31, 31, 31, 31, 31, 31, 31,     31, 31, 31, 31, 31, 31, 31, 31,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_ED_infos[32] = {
-       &to_EUC_KR_ED_00,   &to_EUC_KR_ED_01,
-       &to_EUC_KR_ED_02,   &to_EUC_KR_ED_03,
-       &to_EUC_KR_ED_04,   &to_EUC_KR_ED_05,
-       &to_EUC_KR_ED_06,   &to_EUC_KR_ED_07,
-       &to_EUC_KR_ED_08,   &to_EUC_KR_ED_09,
-       &to_EUC_KR_ED_0A,   &to_EUC_KR_ED_0B,
-       &to_EUC_KR_ED_0C,   &to_EUC_KR_ED_0D,
-       &to_EUC_KR_ED_0E,   &to_EUC_KR_ED_0F,
-       &to_EUC_KR_ED_10,   &to_EUC_KR_ED_11,
-       &to_EUC_KR_ED_12,   &to_EUC_KR_ED_13,
-       &to_EUC_KR_ED_14,   &to_EUC_KR_ED_15,
-       &to_EUC_KR_ED_16,   &to_EUC_KR_ED_17,
-       &to_EUC_KR_ED_18,   &to_EUC_KR_ED_19,
-       &to_EUC_KR_ED_1A,   &to_EUC_KR_ED_1B,
-       &to_EUC_KR_ED_1C,   &to_EUC_KR_ED_1D,
-       &to_EUC_KR_ED_1E,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_ED = {
-    to_EUC_KR_ED_offsets,
-    to_EUC_KR_ED_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_24_infos[65] = {
-          o2(0xCB,0xD0),      o2(0xCB,0xD6),
-          o2(0xCB,0xE7),      o2(0xCD,0xCF),
-          o2(0xCD,0xE8),      o2(0xCE,0xAD),
-          o2(0xCF,0xFB),      o2(0xD0,0xA2),
-          o2(0xD0,0xB8),      o2(0xD0,0xD0),
-          o2(0xD0,0xDD),      o2(0xD1,0xD4),
-          o2(0xD1,0xD5),      o2(0xD1,0xD8),
-          o2(0xD1,0xDB),      o2(0xD1,0xDC),
-          o2(0xD1,0xDD),      o2(0xD1,0xDE),
-          o2(0xD1,0xDF),      o2(0xD1,0xE0),
-          o2(0xD1,0xE2),      o2(0xD1,0xE3),
-          o2(0xD1,0xE4),      o2(0xD1,0xE5),
-          o2(0xD1,0xE6),      o2(0xD1,0xE8),
-          o2(0xD1,0xE9),      o2(0xD1,0xEA),
-          o2(0xD1,0xEB),      o2(0xD1,0xED),
-          o2(0xD1,0xEF),      o2(0xD1,0xF0),
-          o2(0xD1,0xF2),      o2(0xD1,0xF6),
-          o2(0xD1,0xFA),      o2(0xD1,0xFC),
-          o2(0xD1,0xFD),      o2(0xD1,0xFE),
-          o2(0xD2,0xA2),      o2(0xD2,0xA3),
-          o2(0xD2,0xA7),      o2(0xD2,0xA8),
-          o2(0xD2,0xA9),      o2(0xD2,0xAA),
-          o2(0xD2,0xAB),      o2(0xD2,0xAD),
-          o2(0xD2,0xB2),      o2(0xD2,0xBE),
-          o2(0xD2,0xC2),      o2(0xD2,0xC3),
-          o2(0xD2,0xC4),      o2(0xD2,0xC6),
-          o2(0xD2,0xC7),      o2(0xD2,0xC8),
-          o2(0xD2,0xC9),      o2(0xD2,0xCA),
-          o2(0xD2,0xCB),      o2(0xD2,0xCD),
-          o2(0xD2,0xCE),      o2(0xD2,0xCF),
-          o2(0xD2,0xD0),      o2(0xD2,0xD1),
-          o2(0xD2,0xD2),      o2(0xD2,0xD3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_24 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EF_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_25_infos[65] = {
-          o2(0xD2,0xD4),      o2(0xD2,0xD5),
-          o2(0xD2,0xD6),      o2(0xD2,0xD7),
-          o2(0xD2,0xD9),      o2(0xD2,0xDA),
-          o2(0xD2,0xDE),      o2(0xD2,0xDF),
-          o2(0xD2,0xE1),      o2(0xD2,0xE2),
-          o2(0xD2,0xE4),      o2(0xD2,0xE5),
-          o2(0xD2,0xE6),      o2(0xD2,0xE7),
-          o2(0xD2,0xE8),      o2(0xD2,0xE9),
-          o2(0xD2,0xEA),      o2(0xD2,0xEB),
-          o2(0xD2,0xF0),      o2(0xD2,0xF1),
-          o2(0xD2,0xF2),      o2(0xD2,0xF3),
-          o2(0xD2,0xF4),      o2(0xD2,0xF5),
-          o2(0xD2,0xF7),      o2(0xD2,0xF8),
-          o2(0xD4,0xE6),      o2(0xD4,0xFC),
-          o2(0xD5,0xA5),      o2(0xD5,0xAB),
-          o2(0xD5,0xAE),      o2(0xD6,0xB8),
-          o2(0xD6,0xCD),      o2(0xD7,0xCB),
-          o2(0xD7,0xE4),      o2(0xDB,0xC5),
-          o2(0xDB,0xE4),      o2(0xDC,0xA5),
-          o2(0xDD,0xA5),      o2(0xDD,0xD5),
-          o2(0xDD,0xF4),      o2(0xDE,0xFC),
-          o2(0xDE,0xFE),      o2(0xDF,0xB3),
-          o2(0xDF,0xE1),      o2(0xDF,0xE8),
-          o2(0xE0,0xF1),      o2(0xE1,0xAD),
-          o2(0xE1,0xED),      o2(0xE3,0xF5),
-          o2(0xE4,0xA1),      o2(0xE4,0xA9),
-          o2(0xE5,0xAE),      o2(0xE5,0xB1),
-          o2(0xE5,0xB2),      o2(0xE5,0xB9),
-          o2(0xE5,0xBB),      o2(0xE5,0xBC),
-          o2(0xE5,0xC4),      o2(0xE5,0xCE),
-          o2(0xE5,0xD0),      o2(0xE5,0xD2),
-          o2(0xE5,0xD6),      o2(0xE5,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_25 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EF_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_26_infos[65] = {
-          o2(0xE5,0xFB),      o2(0xE5,0xFC),
-          o2(0xE5,0xFE),      o2(0xE6,0xA1),
-          o2(0xE6,0xA4),      o2(0xE6,0xA7),
-          o2(0xE6,0xAD),      o2(0xE6,0xAF),
-          o2(0xE6,0xB0),      o2(0xE6,0xB1),
-          o2(0xE6,0xB3),      o2(0xE6,0xB7),
-          o2(0xE6,0xB8),      o2(0xE6,0xBC),
-          o2(0xE6,0xC4),      o2(0xE6,0xC6),
-          o2(0xE6,0xC7),      o2(0xE6,0xCA),
-          o2(0xE6,0xD2),      o2(0xE6,0xD6),
-          o2(0xE6,0xD9),      o2(0xE6,0xDC),
-          o2(0xE6,0xDF),      o2(0xE6,0xE1),
-          o2(0xE6,0xE4),      o2(0xE6,0xE5),
-          o2(0xE6,0xE6),      o2(0xE6,0xE8),
-          o2(0xE6,0xEA),      o2(0xE6,0xEB),
-          o2(0xE6,0xEC),      o2(0xE6,0xEF),
-          o2(0xE6,0xF1),      o2(0xE6,0xF2),
-          o2(0xE6,0xF5),      o2(0xE6,0xF6),
-          o2(0xE6,0xF7),      o2(0xE6,0xF9),
-          o2(0xE7,0xA1),      o2(0xE7,0xA6),
-          o2(0xE7,0xA9),      o2(0xE7,0xAA),
-          o2(0xE7,0xAC),      o2(0xE7,0xAD),
-          o2(0xE7,0xB0),      o2(0xE7,0xBF),
-          o2(0xE7,0xC1),      o2(0xE7,0xC6),
-          o2(0xE7,0xC7),      o2(0xE7,0xCB),
-          o2(0xE7,0xCD),      o2(0xE7,0xCF),
-          o2(0xE7,0xD0),      o2(0xE7,0xD3),
-          o2(0xE7,0xDF),      o2(0xE7,0xE4),
-          o2(0xE7,0xE6),      o2(0xE7,0xF7),
-          o2(0xE8,0xE7),      o2(0xE8,0xE8),
-          o2(0xE8,0xF0),      o2(0xE8,0xF1),
-          o2(0xE8,0xF7),      o2(0xE8,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_26 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EF_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_27_infos[65] = {
-          o2(0xE8,0xFB),      o2(0xE8,0xFE),
-          o2(0xE9,0xA7),      o2(0xE9,0xAC),
-          o2(0xE9,0xCC),      o2(0xE9,0xF7),
-          o2(0xEA,0xC1),      o2(0xEA,0xE5),
-          o2(0xEA,0xF4),      o2(0xEA,0xF7),
-          o2(0xEA,0xFC),      o2(0xEA,0xFE),
-          o2(0xEB,0xA4),      o2(0xEB,0xA7),
-          o2(0xEB,0xA9),      o2(0xEB,0xAA),
-          o2(0xEB,0xBA),      o2(0xEB,0xBB),
-          o2(0xEB,0xBD),      o2(0xEB,0xC1),
-          o2(0xEB,0xC2),      o2(0xEB,0xC6),
-          o2(0xEB,0xC7),      o2(0xEB,0xCC),
-          o2(0xEB,0xCF),      o2(0xEB,0xD0),
-          o2(0xEB,0xD1),      o2(0xEB,0xD2),
-          o2(0xEB,0xD8),      o2(0xEC,0xA6),
-          o2(0xEC,0xA7),      o2(0xEC,0xAA),
-          o2(0xEC,0xAF),      o2(0xEC,0xB0),
-          o2(0xEC,0xB1),      o2(0xEC,0xB2),
-          o2(0xEC,0xB5),      o2(0xEC,0xB8),
-          o2(0xEC,0xBA),      o2(0xEC,0xC0),
-          o2(0xEC,0xC1),      o2(0xEC,0xC5),
-          o2(0xEC,0xC6),      o2(0xEC,0xC9),
-          o2(0xEC,0xCA),      o2(0xEC,0xD5),
-          o2(0xEC,0xDD),      o2(0xEC,0xDE),
-          o2(0xEC,0xE1),      o2(0xEC,0xE4),
-          o2(0xEC,0xE7),      o2(0xEC,0xE8),
-          o2(0xEC,0xF7),      o2(0xEC,0xF8),
-          o2(0xEC,0xFA),      o2(0xED,0xA1),
-          o2(0xED,0xA2),      o2(0xED,0xA3),
-          o2(0xED,0xEE),      o2(0xEE,0xDB),
-          o2(0xF2,0xBD),      o2(0xF2,0xFA),
-          o2(0xF3,0xB1),      o2(0xF4,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_27 = {
-    to_EUC_KR_E3_05_offsets,
-    to_EUC_KR_EF_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_28_infos[13] = {
-          o2(0xF4,0xEE),      o2(0xF6,0xF4),
-          o2(0xF6,0xF6),      o2(0xF7,0xB8),
-          o2(0xF7,0xC8),      o2(0xF7,0xD3),
-          o2(0xF8,0xDB),      o2(0xF8,0xF0),
-          o2(0xFA,0xA1),      o2(0xFA,0xA2),
-          o2(0xFA,0xE6),      o2(0xFC,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_28 = {
-    to_EUC_KR_E2_15_offsets,
-    to_EUC_KR_EF_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_3C_infos[64] = {
-          o2(0xA3,0xA1),      o2(0xA3,0xA2),
-          o2(0xA3,0xA3),      o2(0xA3,0xA4),
-          o2(0xA3,0xA5),      o2(0xA3,0xA6),
-          o2(0xA3,0xA7),      o2(0xA3,0xA8),
-          o2(0xA3,0xA9),      o2(0xA3,0xAA),
-          o2(0xA3,0xAB),      o2(0xA3,0xAC),
-          o2(0xA3,0xAD),      o2(0xA3,0xAE),
-          o2(0xA3,0xAF),      o2(0xA3,0xB0),
-          o2(0xA3,0xB1),      o2(0xA3,0xB2),
-          o2(0xA3,0xB3),      o2(0xA3,0xB4),
-          o2(0xA3,0xB5),      o2(0xA3,0xB6),
-          o2(0xA3,0xB7),      o2(0xA3,0xB8),
-          o2(0xA3,0xB9),      o2(0xA3,0xBA),
-          o2(0xA3,0xBB),      o2(0xA3,0xBC),
-          o2(0xA3,0xBD),      o2(0xA3,0xBE),
-          o2(0xA3,0xBF),      o2(0xA3,0xC0),
-          o2(0xA3,0xC1),      o2(0xA3,0xC2),
-          o2(0xA3,0xC3),      o2(0xA3,0xC4),
-          o2(0xA3,0xC5),      o2(0xA3,0xC6),
-          o2(0xA3,0xC7),      o2(0xA3,0xC8),
-          o2(0xA3,0xC9),      o2(0xA3,0xCA),
-          o2(0xA3,0xCB),      o2(0xA3,0xCC),
-          o2(0xA3,0xCD),      o2(0xA3,0xCE),
-          o2(0xA3,0xCF),      o2(0xA3,0xD0),
-          o2(0xA3,0xD1),      o2(0xA3,0xD2),
-          o2(0xA3,0xD3),      o2(0xA3,0xD4),
-          o2(0xA3,0xD5),      o2(0xA3,0xD6),
-          o2(0xA3,0xD7),      o2(0xA3,0xD8),
-          o2(0xA3,0xD9),      o2(0xA3,0xDA),
-          o2(0xA3,0xDB),      o2(0xA1,0xAC),
-          o2(0xA3,0xDD),      o2(0xA3,0xDE),
-          o2(0xA3,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_3C = {
-    to_EUC_KR_E3_01_offsets,
-    to_EUC_KR_EF_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_3D_infos[32] = {
-          o2(0xA3,0xE0),      o2(0xA3,0xE1),
-          o2(0xA3,0xE2),      o2(0xA3,0xE3),
-          o2(0xA3,0xE4),      o2(0xA3,0xE5),
-          o2(0xA3,0xE6),      o2(0xA3,0xE7),
-          o2(0xA3,0xE8),      o2(0xA3,0xE9),
-          o2(0xA3,0xEA),      o2(0xA3,0xEB),
-          o2(0xA3,0xEC),      o2(0xA3,0xED),
-          o2(0xA3,0xEE),      o2(0xA3,0xEF),
-          o2(0xA3,0xF0),      o2(0xA3,0xF1),
-          o2(0xA3,0xF2),      o2(0xA3,0xF3),
-          o2(0xA3,0xF4),      o2(0xA3,0xF5),
-          o2(0xA3,0xF6),      o2(0xA3,0xF7),
-          o2(0xA3,0xF8),      o2(0xA3,0xF9),
-          o2(0xA3,0xFA),      o2(0xA3,0xFB),
-          o2(0xA3,0xFC),      o2(0xA3,0xFD),
-          o2(0xA2,0xA6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_3D = {
-    to_EUC_KR_ED_offsets,
-    to_EUC_KR_EF_3D_infos
-};
-
-static const unsigned char
-to_EUC_KR_EF_3F_offsets[64] = {
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      0,  1,  2,  3,  6,  4,  5,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,      6,  6,  6,  6,  6,  6,  6,  6,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_3F_infos[7] = {
-          o2(0xA1,0xCB),      o2(0xA1,0xCC),
-          o2(0xA1,0xFE),      o2(0xA3,0xFE),
-          o2(0xA1,0xCD),      o2(0xA3,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF_3F = {
-    to_EUC_KR_EF_3F_offsets,
-    to_EUC_KR_EF_3F_infos
-};
-
-static const unsigned char
-to_EUC_KR_EF_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  0,  1,  2,  3,      4,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,      8,  8,  8,  8,  5,  6,  8,  7,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_EF_infos[9] = {
-       &to_EUC_KR_EF_24,   &to_EUC_KR_EF_25,
-       &to_EUC_KR_EF_26,   &to_EUC_KR_EF_27,
-       &to_EUC_KR_EF_28,   &to_EUC_KR_EF_3C,
-       &to_EUC_KR_EF_3D,   &to_EUC_KR_EF_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR_EF = {
-    to_EUC_KR_EF_offsets,
-    to_EUC_KR_EF_infos
-};
-
-static const unsigned char
-to_EUC_KR_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23,  1,  2,  3,  4, 23, 23,     23, 23, 23,  5, 23, 23,  6,  7,
-      8,  9, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 10, 11, 12, 13, 14, 15,     16, 17, 18, 19, 20, 21, 23, 22,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_EUC_KR_infos[24] = {
-                  NOMAP,      &to_EUC_KR_C2,
-          &to_EUC_KR_C3,      &to_EUC_KR_C4,
-          &to_EUC_KR_C5,      &to_EUC_KR_CB,
-          &to_EUC_KR_CE,      &to_EUC_KR_CF,
-          &to_EUC_KR_D0,      &to_EUC_KR_D1,
-          &to_EUC_KR_E2,      &to_EUC_KR_E3,
-          &to_EUC_KR_E4,      &to_EUC_KR_E5,
-          &to_EUC_KR_E6,      &to_EUC_KR_E7,
-          &to_EUC_KR_E8,      &to_EUC_KR_E9,
-          &to_EUC_KR_EA,      &to_EUC_KR_EB,
-          &to_EUC_KR_EC,      &to_EUC_KR_ED,
-          &to_EUC_KR_EF,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_EUC_KR = {
-    to_EUC_KR_offsets,
-    to_EUC_KR_infos
-};
-
-static const unsigned char
-from_EUC_KR_A1_offsets[256] = {
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94, 94, 94, 94, 94, 94, 94, 94,     94, 94, 94, 94, 94, 94, 94, 94,
-     94,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,     71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,     87, 88, 89, 90, 91, 92, 93, 94,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A1_infos[95] = {
-     o3(0xE3,0x80,0x80), o3(0xE3,0x80,0x81),
-     o3(0xE3,0x80,0x82),      o2(0xC2,0xB7),
-     o3(0xE2,0x80,0xA5), o3(0xE2,0x80,0xA6),
-          o2(0xC2,0xA8), o3(0xE3,0x80,0x83),
-          o2(0xC2,0xAD), o3(0xE2,0x80,0x95),
-     o3(0xE2,0x88,0xA5), o3(0xEF,0xBC,0xBC),
-     o3(0xE2,0x88,0xBC), o3(0xE2,0x80,0x98),
-     o3(0xE2,0x80,0x99), o3(0xE2,0x80,0x9C),
-     o3(0xE2,0x80,0x9D), o3(0xE3,0x80,0x94),
-     o3(0xE3,0x80,0x95), o3(0xE3,0x80,0x88),
-     o3(0xE3,0x80,0x89), o3(0xE3,0x80,0x8A),
-     o3(0xE3,0x80,0x8B), o3(0xE3,0x80,0x8C),
-     o3(0xE3,0x80,0x8D), o3(0xE3,0x80,0x8E),
-     o3(0xE3,0x80,0x8F), o3(0xE3,0x80,0x90),
-     o3(0xE3,0x80,0x91),      o2(0xC2,0xB1),
-          o2(0xC3,0x97),      o2(0xC3,0xB7),
-     o3(0xE2,0x89,0xA0), o3(0xE2,0x89,0xA4),
-     o3(0xE2,0x89,0xA5), o3(0xE2,0x88,0x9E),
-     o3(0xE2,0x88,0xB4),      o2(0xC2,0xB0),
-     o3(0xE2,0x80,0xB2), o3(0xE2,0x80,0xB3),
-     o3(0xE2,0x84,0x83), o3(0xE2,0x84,0xAB),
-     o3(0xEF,0xBF,0xA0), o3(0xEF,0xBF,0xA1),
-     o3(0xEF,0xBF,0xA5), o3(0xE2,0x99,0x82),
-     o3(0xE2,0x99,0x80), o3(0xE2,0x88,0xA0),
-     o3(0xE2,0x8A,0xA5), o3(0xE2,0x8C,0x92),
-     o3(0xE2,0x88,0x82), o3(0xE2,0x88,0x87),
-     o3(0xE2,0x89,0xA1), o3(0xE2,0x89,0x92),
-          o2(0xC2,0xA7), o3(0xE2,0x80,0xBB),
-     o3(0xE2,0x98,0x86), o3(0xE2,0x98,0x85),
-     o3(0xE2,0x97,0x8B), o3(0xE2,0x97,0x8F),
-     o3(0xE2,0x97,0x8E), o3(0xE2,0x97,0x87),
-     o3(0xE2,0x97,0x86), o3(0xE2,0x96,0xA1),
-     o3(0xE2,0x96,0xA0), o3(0xE2,0x96,0xB3),
-     o3(0xE2,0x96,0xB2), o3(0xE2,0x96,0xBD),
-     o3(0xE2,0x96,0xBC), o3(0xE2,0x86,0x92),
-     o3(0xE2,0x86,0x90), o3(0xE2,0x86,0x91),
-     o3(0xE2,0x86,0x93), o3(0xE2,0x86,0x94),
-     o3(0xE3,0x80,0x93), o3(0xE2,0x89,0xAA),
-     o3(0xE2,0x89,0xAB), o3(0xE2,0x88,0x9A),
-     o3(0xE2,0x88,0xBD), o3(0xE2,0x88,0x9D),
-     o3(0xE2,0x88,0xB5), o3(0xE2,0x88,0xAB),
-     o3(0xE2,0x88,0xAC), o3(0xE2,0x88,0x88),
-     o3(0xE2,0x88,0x8B), o3(0xE2,0x8A,0x86),
-     o3(0xE2,0x8A,0x87), o3(0xE2,0x8A,0x82),
-     o3(0xE2,0x8A,0x83), o3(0xE2,0x88,0xAA),
-     o3(0xE2,0x88,0xA9), o3(0xE2,0x88,0xA7),
-     o3(0xE2,0x88,0xA8), o3(0xEF,0xBF,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_A1_infos
-};
-
-static const unsigned char
-from_EUC_KR_A2_offsets[256] = {
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-     69, 69, 69, 69, 69, 69, 69, 69,     69, 69, 69, 69, 69, 69, 69, 69,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A2_infos[70] = {
-     o3(0xE2,0x87,0x92), o3(0xE2,0x87,0x94),
-     o3(0xE2,0x88,0x80), o3(0xE2,0x88,0x83),
-          o2(0xC2,0xB4), o3(0xEF,0xBD,0x9E),
-          o2(0xCB,0x87),      o2(0xCB,0x98),
-          o2(0xCB,0x9D),      o2(0xCB,0x9A),
-          o2(0xCB,0x99),      o2(0xC2,0xB8),
-          o2(0xCB,0x9B),      o2(0xC2,0xA1),
-          o2(0xC2,0xBF),      o2(0xCB,0x90),
-     o3(0xE2,0x88,0xAE), o3(0xE2,0x88,0x91),
-     o3(0xE2,0x88,0x8F),      o2(0xC2,0xA4),
-     o3(0xE2,0x84,0x89), o3(0xE2,0x80,0xB0),
-     o3(0xE2,0x97,0x81), o3(0xE2,0x97,0x80),
-     o3(0xE2,0x96,0xB7), o3(0xE2,0x96,0xB6),
-     o3(0xE2,0x99,0xA4), o3(0xE2,0x99,0xA0),
-     o3(0xE2,0x99,0xA1), o3(0xE2,0x99,0xA5),
-     o3(0xE2,0x99,0xA7), o3(0xE2,0x99,0xA3),
-     o3(0xE2,0x8A,0x99), o3(0xE2,0x97,0x88),
-     o3(0xE2,0x96,0xA3), o3(0xE2,0x97,0x90),
-     o3(0xE2,0x97,0x91), o3(0xE2,0x96,0x92),
-     o3(0xE2,0x96,0xA4), o3(0xE2,0x96,0xA5),
-     o3(0xE2,0x96,0xA8), o3(0xE2,0x96,0xA7),
-     o3(0xE2,0x96,0xA6), o3(0xE2,0x96,0xA9),
-     o3(0xE2,0x99,0xA8), o3(0xE2,0x98,0x8F),
-     o3(0xE2,0x98,0x8E), o3(0xE2,0x98,0x9C),
-     o3(0xE2,0x98,0x9E),      o2(0xC2,0xB6),
-     o3(0xE2,0x80,0xA0), o3(0xE2,0x80,0xA1),
-     o3(0xE2,0x86,0x95), o3(0xE2,0x86,0x97),
-     o3(0xE2,0x86,0x99), o3(0xE2,0x86,0x96),
-     o3(0xE2,0x86,0x98), o3(0xE2,0x99,0xAD),
-     o3(0xE2,0x99,0xA9), o3(0xE2,0x99,0xAA),
-     o3(0xE2,0x99,0xAC), o3(0xE3,0x89,0xBF),
-     o3(0xE3,0x88,0x9C), o3(0xE2,0x84,0x96),
-     o3(0xE3,0x8F,0x87), o3(0xE2,0x84,0xA2),
-     o3(0xE3,0x8F,0x82), o3(0xE3,0x8F,0x98),
-     o3(0xE2,0x84,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A2 = {
-    from_EUC_KR_A2_offsets,
-    from_EUC_KR_A2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_A3_infos[95] = {
-     o3(0xEF,0xBC,0x81), o3(0xEF,0xBC,0x82),
-     o3(0xEF,0xBC,0x83), o3(0xEF,0xBC,0x84),
-     o3(0xEF,0xBC,0x85), o3(0xEF,0xBC,0x86),
-     o3(0xEF,0xBC,0x87), o3(0xEF,0xBC,0x88),
-     o3(0xEF,0xBC,0x89), o3(0xEF,0xBC,0x8A),
-     o3(0xEF,0xBC,0x8B), o3(0xEF,0xBC,0x8C),
-     o3(0xEF,0xBC,0x8D), o3(0xEF,0xBC,0x8E),
-     o3(0xEF,0xBC,0x8F), o3(0xEF,0xBC,0x90),
-     o3(0xEF,0xBC,0x91), o3(0xEF,0xBC,0x92),
-     o3(0xEF,0xBC,0x93), o3(0xEF,0xBC,0x94),
-     o3(0xEF,0xBC,0x95), o3(0xEF,0xBC,0x96),
-     o3(0xEF,0xBC,0x97), o3(0xEF,0xBC,0x98),
-     o3(0xEF,0xBC,0x99), o3(0xEF,0xBC,0x9A),
-     o3(0xEF,0xBC,0x9B), o3(0xEF,0xBC,0x9C),
-     o3(0xEF,0xBC,0x9D), o3(0xEF,0xBC,0x9E),
-     o3(0xEF,0xBC,0x9F), o3(0xEF,0xBC,0xA0),
-     o3(0xEF,0xBC,0xA1), o3(0xEF,0xBC,0xA2),
-     o3(0xEF,0xBC,0xA3), o3(0xEF,0xBC,0xA4),
-     o3(0xEF,0xBC,0xA5), o3(0xEF,0xBC,0xA6),
-     o3(0xEF,0xBC,0xA7), o3(0xEF,0xBC,0xA8),
-     o3(0xEF,0xBC,0xA9), o3(0xEF,0xBC,0xAA),
-     o3(0xEF,0xBC,0xAB), o3(0xEF,0xBC,0xAC),
-     o3(0xEF,0xBC,0xAD), o3(0xEF,0xBC,0xAE),
-     o3(0xEF,0xBC,0xAF), o3(0xEF,0xBC,0xB0),
-     o3(0xEF,0xBC,0xB1), o3(0xEF,0xBC,0xB2),
-     o3(0xEF,0xBC,0xB3), o3(0xEF,0xBC,0xB4),
-     o3(0xEF,0xBC,0xB5), o3(0xEF,0xBC,0xB6),
-     o3(0xEF,0xBC,0xB7), o3(0xEF,0xBC,0xB8),
-     o3(0xEF,0xBC,0xB9), o3(0xEF,0xBC,0xBA),
-     o3(0xEF,0xBC,0xBB), o3(0xEF,0xBF,0xA6),
-     o3(0xEF,0xBC,0xBD), o3(0xEF,0xBC,0xBE),
-     o3(0xEF,0xBC,0xBF), o3(0xEF,0xBD,0x80),
-     o3(0xEF,0xBD,0x81), o3(0xEF,0xBD,0x82),
-     o3(0xEF,0xBD,0x83), o3(0xEF,0xBD,0x84),
-     o3(0xEF,0xBD,0x85), o3(0xEF,0xBD,0x86),
-     o3(0xEF,0xBD,0x87), o3(0xEF,0xBD,0x88),
-     o3(0xEF,0xBD,0x89), o3(0xEF,0xBD,0x8A),
-     o3(0xEF,0xBD,0x8B), o3(0xEF,0xBD,0x8C),
-     o3(0xEF,0xBD,0x8D), o3(0xEF,0xBD,0x8E),
-     o3(0xEF,0xBD,0x8F), o3(0xEF,0xBD,0x90),
-     o3(0xEF,0xBD,0x91), o3(0xEF,0xBD,0x92),
-     o3(0xEF,0xBD,0x93), o3(0xEF,0xBD,0x94),
-     o3(0xEF,0xBD,0x95), o3(0xEF,0xBD,0x96),
-     o3(0xEF,0xBD,0x97), o3(0xEF,0xBD,0x98),
-     o3(0xEF,0xBD,0x99), o3(0xEF,0xBD,0x9A),
-     o3(0xEF,0xBD,0x9B), o3(0xEF,0xBD,0x9C),
-     o3(0xEF,0xBD,0x9D), o3(0xEF,0xBF,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_A3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_A4_infos[95] = {
-     o3(0xE3,0x84,0xB1), o3(0xE3,0x84,0xB2),
-     o3(0xE3,0x84,0xB3), o3(0xE3,0x84,0xB4),
-     o3(0xE3,0x84,0xB5), o3(0xE3,0x84,0xB6),
-     o3(0xE3,0x84,0xB7), o3(0xE3,0x84,0xB8),
-     o3(0xE3,0x84,0xB9), o3(0xE3,0x84,0xBA),
-     o3(0xE3,0x84,0xBB), o3(0xE3,0x84,0xBC),
-     o3(0xE3,0x84,0xBD), o3(0xE3,0x84,0xBE),
-     o3(0xE3,0x84,0xBF), o3(0xE3,0x85,0x80),
-     o3(0xE3,0x85,0x81), o3(0xE3,0x85,0x82),
-     o3(0xE3,0x85,0x83), o3(0xE3,0x85,0x84),
-     o3(0xE3,0x85,0x85), o3(0xE3,0x85,0x86),
-     o3(0xE3,0x85,0x87), o3(0xE3,0x85,0x88),
-     o3(0xE3,0x85,0x89), o3(0xE3,0x85,0x8A),
-     o3(0xE3,0x85,0x8B), o3(0xE3,0x85,0x8C),
-     o3(0xE3,0x85,0x8D), o3(0xE3,0x85,0x8E),
-     o3(0xE3,0x85,0x8F), o3(0xE3,0x85,0x90),
-     o3(0xE3,0x85,0x91), o3(0xE3,0x85,0x92),
-     o3(0xE3,0x85,0x93), o3(0xE3,0x85,0x94),
-     o3(0xE3,0x85,0x95), o3(0xE3,0x85,0x96),
-     o3(0xE3,0x85,0x97), o3(0xE3,0x85,0x98),
-     o3(0xE3,0x85,0x99), o3(0xE3,0x85,0x9A),
-     o3(0xE3,0x85,0x9B), o3(0xE3,0x85,0x9C),
-     o3(0xE3,0x85,0x9D), o3(0xE3,0x85,0x9E),
-     o3(0xE3,0x85,0x9F), o3(0xE3,0x85,0xA0),
-     o3(0xE3,0x85,0xA1), o3(0xE3,0x85,0xA2),
-     o3(0xE3,0x85,0xA3), o3(0xE3,0x85,0xA4),
-     o3(0xE3,0x85,0xA5), o3(0xE3,0x85,0xA6),
-     o3(0xE3,0x85,0xA7), o3(0xE3,0x85,0xA8),
-     o3(0xE3,0x85,0xA9), o3(0xE3,0x85,0xAA),
-     o3(0xE3,0x85,0xAB), o3(0xE3,0x85,0xAC),
-     o3(0xE3,0x85,0xAD), o3(0xE3,0x85,0xAE),
-     o3(0xE3,0x85,0xAF), o3(0xE3,0x85,0xB0),
-     o3(0xE3,0x85,0xB1), o3(0xE3,0x85,0xB2),
-     o3(0xE3,0x85,0xB3), o3(0xE3,0x85,0xB4),
-     o3(0xE3,0x85,0xB5), o3(0xE3,0x85,0xB6),
-     o3(0xE3,0x85,0xB7), o3(0xE3,0x85,0xB8),
-     o3(0xE3,0x85,0xB9), o3(0xE3,0x85,0xBA),
-     o3(0xE3,0x85,0xBB), o3(0xE3,0x85,0xBC),
-     o3(0xE3,0x85,0xBD), o3(0xE3,0x85,0xBE),
-     o3(0xE3,0x85,0xBF), o3(0xE3,0x86,0x80),
-     o3(0xE3,0x86,0x81), o3(0xE3,0x86,0x82),
-     o3(0xE3,0x86,0x83), o3(0xE3,0x86,0x84),
-     o3(0xE3,0x86,0x85), o3(0xE3,0x86,0x86),
-     o3(0xE3,0x86,0x87), o3(0xE3,0x86,0x88),
-     o3(0xE3,0x86,0x89), o3(0xE3,0x86,0x8A),
-     o3(0xE3,0x86,0x8B), o3(0xE3,0x86,0x8C),
-     o3(0xE3,0x86,0x8D), o3(0xE3,0x86,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_A4_infos
-};
-
-static const unsigned char
-from_EUC_KR_A5_offsets[256] = {
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 68, 68, 68, 68, 68,
-     10, 11, 12, 13, 14, 15, 16, 17,     18, 19, 68, 68, 68, 68, 68, 68,
-     68, 20, 21, 22, 23, 24, 25, 26,     27, 28, 29, 30, 31, 32, 33, 34,
-     35, 36, 37, 38, 39, 40, 41, 42,     43, 68, 68, 68, 68, 68, 68, 68,
-     68, 44, 45, 46, 47, 48, 49, 50,     51, 52, 53, 54, 55, 56, 57, 58,
-     59, 60, 61, 62, 63, 64, 65, 66,     67, 68, 68, 68, 68, 68, 68, 68,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A5_infos[69] = {
-     o3(0xE2,0x85,0xB0), o3(0xE2,0x85,0xB1),
-     o3(0xE2,0x85,0xB2), o3(0xE2,0x85,0xB3),
-     o3(0xE2,0x85,0xB4), o3(0xE2,0x85,0xB5),
-     o3(0xE2,0x85,0xB6), o3(0xE2,0x85,0xB7),
-     o3(0xE2,0x85,0xB8), o3(0xE2,0x85,0xB9),
-     o3(0xE2,0x85,0xA0), o3(0xE2,0x85,0xA1),
-     o3(0xE2,0x85,0xA2), o3(0xE2,0x85,0xA3),
-     o3(0xE2,0x85,0xA4), o3(0xE2,0x85,0xA5),
-     o3(0xE2,0x85,0xA6), o3(0xE2,0x85,0xA7),
-     o3(0xE2,0x85,0xA8), o3(0xE2,0x85,0xA9),
-          o2(0xCE,0x91),      o2(0xCE,0x92),
-          o2(0xCE,0x93),      o2(0xCE,0x94),
-          o2(0xCE,0x95),      o2(0xCE,0x96),
-          o2(0xCE,0x97),      o2(0xCE,0x98),
-          o2(0xCE,0x99),      o2(0xCE,0x9A),
-          o2(0xCE,0x9B),      o2(0xCE,0x9C),
-          o2(0xCE,0x9D),      o2(0xCE,0x9E),
-          o2(0xCE,0x9F),      o2(0xCE,0xA0),
-          o2(0xCE,0xA1),      o2(0xCE,0xA3),
-          o2(0xCE,0xA4),      o2(0xCE,0xA5),
-          o2(0xCE,0xA6),      o2(0xCE,0xA7),
-          o2(0xCE,0xA8),      o2(0xCE,0xA9),
-          o2(0xCE,0xB1),      o2(0xCE,0xB2),
-          o2(0xCE,0xB3),      o2(0xCE,0xB4),
-          o2(0xCE,0xB5),      o2(0xCE,0xB6),
-          o2(0xCE,0xB7),      o2(0xCE,0xB8),
-          o2(0xCE,0xB9),      o2(0xCE,0xBA),
-          o2(0xCE,0xBB),      o2(0xCE,0xBC),
-          o2(0xCE,0xBD),      o2(0xCE,0xBE),
-          o2(0xCE,0xBF),      o2(0xCF,0x80),
-          o2(0xCF,0x81),      o2(0xCF,0x83),
-          o2(0xCF,0x84),      o2(0xCF,0x85),
-          o2(0xCF,0x86),      o2(0xCF,0x87),
-          o2(0xCF,0x88),      o2(0xCF,0x89),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A5 = {
-    from_EUC_KR_A5_offsets,
-    from_EUC_KR_A5_infos
-};
-
-static const unsigned char
-from_EUC_KR_A6_offsets[256] = {
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-     68, 68, 68, 68, 68, 68, 68, 68,     68, 68, 68, 68, 68, 68, 68, 68,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A6_infos[69] = {
-     o3(0xE2,0x94,0x80), o3(0xE2,0x94,0x82),
-     o3(0xE2,0x94,0x8C), o3(0xE2,0x94,0x90),
-     o3(0xE2,0x94,0x98), o3(0xE2,0x94,0x94),
-     o3(0xE2,0x94,0x9C), o3(0xE2,0x94,0xAC),
-     o3(0xE2,0x94,0xA4), o3(0xE2,0x94,0xB4),
-     o3(0xE2,0x94,0xBC), o3(0xE2,0x94,0x81),
-     o3(0xE2,0x94,0x83), o3(0xE2,0x94,0x8F),
-     o3(0xE2,0x94,0x93), o3(0xE2,0x94,0x9B),
-     o3(0xE2,0x94,0x97), o3(0xE2,0x94,0xA3),
-     o3(0xE2,0x94,0xB3), o3(0xE2,0x94,0xAB),
-     o3(0xE2,0x94,0xBB), o3(0xE2,0x95,0x8B),
-     o3(0xE2,0x94,0xA0), o3(0xE2,0x94,0xAF),
-     o3(0xE2,0x94,0xA8), o3(0xE2,0x94,0xB7),
-     o3(0xE2,0x94,0xBF), o3(0xE2,0x94,0x9D),
-     o3(0xE2,0x94,0xB0), o3(0xE2,0x94,0xA5),
-     o3(0xE2,0x94,0xB8), o3(0xE2,0x95,0x82),
-     o3(0xE2,0x94,0x92), o3(0xE2,0x94,0x91),
-     o3(0xE2,0x94,0x9A), o3(0xE2,0x94,0x99),
-     o3(0xE2,0x94,0x96), o3(0xE2,0x94,0x95),
-     o3(0xE2,0x94,0x8E), o3(0xE2,0x94,0x8D),
-     o3(0xE2,0x94,0x9E), o3(0xE2,0x94,0x9F),
-     o3(0xE2,0x94,0xA1), o3(0xE2,0x94,0xA2),
-     o3(0xE2,0x94,0xA6), o3(0xE2,0x94,0xA7),
-     o3(0xE2,0x94,0xA9), o3(0xE2,0x94,0xAA),
-     o3(0xE2,0x94,0xAD), o3(0xE2,0x94,0xAE),
-     o3(0xE2,0x94,0xB1), o3(0xE2,0x94,0xB2),
-     o3(0xE2,0x94,0xB5), o3(0xE2,0x94,0xB6),
-     o3(0xE2,0x94,0xB9), o3(0xE2,0x94,0xBA),
-     o3(0xE2,0x94,0xBD), o3(0xE2,0x94,0xBE),
-     o3(0xE2,0x95,0x80), o3(0xE2,0x95,0x81),
-     o3(0xE2,0x95,0x83), o3(0xE2,0x95,0x84),
-     o3(0xE2,0x95,0x85), o3(0xE2,0x95,0x86),
-     o3(0xE2,0x95,0x87), o3(0xE2,0x95,0x88),
-     o3(0xE2,0x95,0x89), o3(0xE2,0x95,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A6 = {
-    from_EUC_KR_A6_offsets,
-    from_EUC_KR_A6_infos
-};
-
-static const unsigned char
-from_EUC_KR_A7_offsets[256] = {
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-     79,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,     71, 72, 73, 74, 75, 76, 77, 78,
-     79, 79, 79, 79, 79, 79, 79, 79,     79, 79, 79, 79, 79, 79, 79, 79,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A7_infos[80] = {
-     o3(0xE3,0x8E,0x95), o3(0xE3,0x8E,0x96),
-     o3(0xE3,0x8E,0x97), o3(0xE2,0x84,0x93),
-     o3(0xE3,0x8E,0x98), o3(0xE3,0x8F,0x84),
-     o3(0xE3,0x8E,0xA3), o3(0xE3,0x8E,0xA4),
-     o3(0xE3,0x8E,0xA5), o3(0xE3,0x8E,0xA6),
-     o3(0xE3,0x8E,0x99), o3(0xE3,0x8E,0x9A),
-     o3(0xE3,0x8E,0x9B), o3(0xE3,0x8E,0x9C),
-     o3(0xE3,0x8E,0x9D), o3(0xE3,0x8E,0x9E),
-     o3(0xE3,0x8E,0x9F), o3(0xE3,0x8E,0xA0),
-     o3(0xE3,0x8E,0xA1), o3(0xE3,0x8E,0xA2),
-     o3(0xE3,0x8F,0x8A), o3(0xE3,0x8E,0x8D),
-     o3(0xE3,0x8E,0x8E), o3(0xE3,0x8E,0x8F),
-     o3(0xE3,0x8F,0x8F), o3(0xE3,0x8E,0x88),
-     o3(0xE3,0x8E,0x89), o3(0xE3,0x8F,0x88),
-     o3(0xE3,0x8E,0xA7), o3(0xE3,0x8E,0xA8),
-     o3(0xE3,0x8E,0xB0), o3(0xE3,0x8E,0xB1),
-     o3(0xE3,0x8E,0xB2), o3(0xE3,0x8E,0xB3),
-     o3(0xE3,0x8E,0xB4), o3(0xE3,0x8E,0xB5),
-     o3(0xE3,0x8E,0xB6), o3(0xE3,0x8E,0xB7),
-     o3(0xE3,0x8E,0xB8), o3(0xE3,0x8E,0xB9),
-     o3(0xE3,0x8E,0x80), o3(0xE3,0x8E,0x81),
-     o3(0xE3,0x8E,0x82), o3(0xE3,0x8E,0x83),
-     o3(0xE3,0x8E,0x84), o3(0xE3,0x8E,0xBA),
-     o3(0xE3,0x8E,0xBB), o3(0xE3,0x8E,0xBC),
-     o3(0xE3,0x8E,0xBD), o3(0xE3,0x8E,0xBE),
-     o3(0xE3,0x8E,0xBF), o3(0xE3,0x8E,0x90),
-     o3(0xE3,0x8E,0x91), o3(0xE3,0x8E,0x92),
-     o3(0xE3,0x8E,0x93), o3(0xE3,0x8E,0x94),
-     o3(0xE2,0x84,0xA6), o3(0xE3,0x8F,0x80),
-     o3(0xE3,0x8F,0x81), o3(0xE3,0x8E,0x8A),
-     o3(0xE3,0x8E,0x8B), o3(0xE3,0x8E,0x8C),
-     o3(0xE3,0x8F,0x96), o3(0xE3,0x8F,0x85),
-     o3(0xE3,0x8E,0xAD), o3(0xE3,0x8E,0xAE),
-     o3(0xE3,0x8E,0xAF), o3(0xE3,0x8F,0x9B),
-     o3(0xE3,0x8E,0xA9), o3(0xE3,0x8E,0xAA),
-     o3(0xE3,0x8E,0xAB), o3(0xE3,0x8E,0xAC),
-     o3(0xE3,0x8F,0x9D), o3(0xE3,0x8F,0x90),
-     o3(0xE3,0x8F,0x93), o3(0xE3,0x8F,0x83),
-     o3(0xE3,0x8F,0x89), o3(0xE3,0x8F,0x9C),
-     o3(0xE3,0x8F,0x86),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A7 = {
-    from_EUC_KR_A7_offsets,
-    from_EUC_KR_A7_infos
-};
-
-static const unsigned char
-from_EUC_KR_A8_offsets[256] = {
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91, 91, 91, 91, 91, 91, 91, 91,     91, 91, 91, 91, 91, 91, 91, 91,
-     91,  0,  1,  2,  3, 91,  4, 91,      5,  6,  7,  8,  9, 10, 11, 12,
-     91, 13, 14, 15, 16, 17, 18, 19,     20, 21, 22, 23, 24, 25, 26, 27,
-     28, 29, 30, 31, 32, 33, 34, 35,     36, 37, 38, 39, 40, 41, 42, 43,
-     44, 45, 46, 47, 48, 49, 50, 51,     52, 53, 54, 55, 56, 57, 58, 59,
-     60, 61, 62, 63, 64, 65, 66, 67,     68, 69, 70, 71, 72, 73, 74, 75,
-     76, 77, 78, 79, 80, 81, 82, 83,     84, 85, 86, 87, 88, 89, 90, 91,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_A8_infos[92] = {
-          o2(0xC3,0x86),      o2(0xC3,0x90),
-          o2(0xC2,0xAA),      o2(0xC4,0xA6),
-          o2(0xC4,0xB2),      o2(0xC4,0xBF),
-          o2(0xC5,0x81),      o2(0xC3,0x98),
-          o2(0xC5,0x92),      o2(0xC2,0xBA),
-          o2(0xC3,0x9E),      o2(0xC5,0xA6),
-          o2(0xC5,0x8A), o3(0xE3,0x89,0xA0),
-     o3(0xE3,0x89,0xA1), o3(0xE3,0x89,0xA2),
-     o3(0xE3,0x89,0xA3), o3(0xE3,0x89,0xA4),
-     o3(0xE3,0x89,0xA5), o3(0xE3,0x89,0xA6),
-     o3(0xE3,0x89,0xA7), o3(0xE3,0x89,0xA8),
-     o3(0xE3,0x89,0xA9), o3(0xE3,0x89,0xAA),
-     o3(0xE3,0x89,0xAB), o3(0xE3,0x89,0xAC),
-     o3(0xE3,0x89,0xAD), o3(0xE3,0x89,0xAE),
-     o3(0xE3,0x89,0xAF), o3(0xE3,0x89,0xB0),
-     o3(0xE3,0x89,0xB1), o3(0xE3,0x89,0xB2),
-     o3(0xE3,0x89,0xB3), o3(0xE3,0x89,0xB4),
-     o3(0xE3,0x89,0xB5), o3(0xE3,0x89,0xB6),
-     o3(0xE3,0x89,0xB7), o3(0xE3,0x89,0xB8),
-     o3(0xE3,0x89,0xB9), o3(0xE3,0x89,0xBA),
-     o3(0xE3,0x89,0xBB), o3(0xE2,0x93,0x90),
-     o3(0xE2,0x93,0x91), o3(0xE2,0x93,0x92),
-     o3(0xE2,0x93,0x93), o3(0xE2,0x93,0x94),
-     o3(0xE2,0x93,0x95), o3(0xE2,0x93,0x96),
-     o3(0xE2,0x93,0x97), o3(0xE2,0x93,0x98),
-     o3(0xE2,0x93,0x99), o3(0xE2,0x93,0x9A),
-     o3(0xE2,0x93,0x9B), o3(0xE2,0x93,0x9C),
-     o3(0xE2,0x93,0x9D), o3(0xE2,0x93,0x9E),
-     o3(0xE2,0x93,0x9F), o3(0xE2,0x93,0xA0),
-     o3(0xE2,0x93,0xA1), o3(0xE2,0x93,0xA2),
-     o3(0xE2,0x93,0xA3), o3(0xE2,0x93,0xA4),
-     o3(0xE2,0x93,0xA5), o3(0xE2,0x93,0xA6),
-     o3(0xE2,0x93,0xA7), o3(0xE2,0x93,0xA8),
-     o3(0xE2,0x93,0xA9), o3(0xE2,0x91,0xA0),
-     o3(0xE2,0x91,0xA1), o3(0xE2,0x91,0xA2),
-     o3(0xE2,0x91,0xA3), o3(0xE2,0x91,0xA4),
-     o3(0xE2,0x91,0xA5), o3(0xE2,0x91,0xA6),
-     o3(0xE2,0x91,0xA7), o3(0xE2,0x91,0xA8),
-     o3(0xE2,0x91,0xA9), o3(0xE2,0x91,0xAA),
-     o3(0xE2,0x91,0xAB), o3(0xE2,0x91,0xAC),
-     o3(0xE2,0x91,0xAD), o3(0xE2,0x91,0xAE),
-          o2(0xC2,0xBD), o3(0xE2,0x85,0x93),
-     o3(0xE2,0x85,0x94),      o2(0xC2,0xBC),
-          o2(0xC2,0xBE), o3(0xE2,0x85,0x9B),
-     o3(0xE2,0x85,0x9C), o3(0xE2,0x85,0x9D),
-     o3(0xE2,0x85,0x9E),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A8 = {
-    from_EUC_KR_A8_offsets,
-    from_EUC_KR_A8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_A9_infos[95] = {
-          o2(0xC3,0xA6),      o2(0xC4,0x91),
-          o2(0xC3,0xB0),      o2(0xC4,0xA7),
-          o2(0xC4,0xB1),      o2(0xC4,0xB3),
-          o2(0xC4,0xB8),      o2(0xC5,0x80),
-          o2(0xC5,0x82),      o2(0xC3,0xB8),
-          o2(0xC5,0x93),      o2(0xC3,0x9F),
-          o2(0xC3,0xBE),      o2(0xC5,0xA7),
-          o2(0xC5,0x8B),      o2(0xC5,0x89),
-     o3(0xE3,0x88,0x80), o3(0xE3,0x88,0x81),
-     o3(0xE3,0x88,0x82), o3(0xE3,0x88,0x83),
-     o3(0xE3,0x88,0x84), o3(0xE3,0x88,0x85),
-     o3(0xE3,0x88,0x86), o3(0xE3,0x88,0x87),
-     o3(0xE3,0x88,0x88), o3(0xE3,0x88,0x89),
-     o3(0xE3,0x88,0x8A), o3(0xE3,0x88,0x8B),
-     o3(0xE3,0x88,0x8C), o3(0xE3,0x88,0x8D),
-     o3(0xE3,0x88,0x8E), o3(0xE3,0x88,0x8F),
-     o3(0xE3,0x88,0x90), o3(0xE3,0x88,0x91),
-     o3(0xE3,0x88,0x92), o3(0xE3,0x88,0x93),
-     o3(0xE3,0x88,0x94), o3(0xE3,0x88,0x95),
-     o3(0xE3,0x88,0x96), o3(0xE3,0x88,0x97),
-     o3(0xE3,0x88,0x98), o3(0xE3,0x88,0x99),
-     o3(0xE3,0x88,0x9A), o3(0xE3,0x88,0x9B),
-     o3(0xE2,0x92,0x9C), o3(0xE2,0x92,0x9D),
-     o3(0xE2,0x92,0x9E), o3(0xE2,0x92,0x9F),
-     o3(0xE2,0x92,0xA0), o3(0xE2,0x92,0xA1),
-     o3(0xE2,0x92,0xA2), o3(0xE2,0x92,0xA3),
-     o3(0xE2,0x92,0xA4), o3(0xE2,0x92,0xA5),
-     o3(0xE2,0x92,0xA6), o3(0xE2,0x92,0xA7),
-     o3(0xE2,0x92,0xA8), o3(0xE2,0x92,0xA9),
-     o3(0xE2,0x92,0xAA), o3(0xE2,0x92,0xAB),
-     o3(0xE2,0x92,0xAC), o3(0xE2,0x92,0xAD),
-     o3(0xE2,0x92,0xAE), o3(0xE2,0x92,0xAF),
-     o3(0xE2,0x92,0xB0), o3(0xE2,0x92,0xB1),
-     o3(0xE2,0x92,0xB2), o3(0xE2,0x92,0xB3),
-     o3(0xE2,0x92,0xB4), o3(0xE2,0x92,0xB5),
-     o3(0xE2,0x91,0xB4), o3(0xE2,0x91,0xB5),
-     o3(0xE2,0x91,0xB6), o3(0xE2,0x91,0xB7),
-     o3(0xE2,0x91,0xB8), o3(0xE2,0x91,0xB9),
-     o3(0xE2,0x91,0xBA), o3(0xE2,0x91,0xBB),
-     o3(0xE2,0x91,0xBC), o3(0xE2,0x91,0xBD),
-     o3(0xE2,0x91,0xBE), o3(0xE2,0x91,0xBF),
-     o3(0xE2,0x92,0x80), o3(0xE2,0x92,0x81),
-     o3(0xE2,0x92,0x82),      o2(0xC2,0xB9),
-          o2(0xC2,0xB2),      o2(0xC2,0xB3),
-     o3(0xE2,0x81,0xB4), o3(0xE2,0x81,0xBF),
-     o3(0xE2,0x82,0x81), o3(0xE2,0x82,0x82),
-     o3(0xE2,0x82,0x83), o3(0xE2,0x82,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_A9 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_A9_infos
-};
-
-static const unsigned char
-from_EUC_KR_AA_offsets[256] = {
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83, 83, 83, 83, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-     83,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,     71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 83, 83, 83,     83, 83, 83, 83, 83, 83, 83, 83,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_AA_infos[84] = {
-     o3(0xE3,0x81,0x81), o3(0xE3,0x81,0x82),
-     o3(0xE3,0x81,0x83), o3(0xE3,0x81,0x84),
-     o3(0xE3,0x81,0x85), o3(0xE3,0x81,0x86),
-     o3(0xE3,0x81,0x87), o3(0xE3,0x81,0x88),
-     o3(0xE3,0x81,0x89), o3(0xE3,0x81,0x8A),
-     o3(0xE3,0x81,0x8B), o3(0xE3,0x81,0x8C),
-     o3(0xE3,0x81,0x8D), o3(0xE3,0x81,0x8E),
-     o3(0xE3,0x81,0x8F), o3(0xE3,0x81,0x90),
-     o3(0xE3,0x81,0x91), o3(0xE3,0x81,0x92),
-     o3(0xE3,0x81,0x93), o3(0xE3,0x81,0x94),
-     o3(0xE3,0x81,0x95), o3(0xE3,0x81,0x96),
-     o3(0xE3,0x81,0x97), o3(0xE3,0x81,0x98),
-     o3(0xE3,0x81,0x99), o3(0xE3,0x81,0x9A),
-     o3(0xE3,0x81,0x9B), o3(0xE3,0x81,0x9C),
-     o3(0xE3,0x81,0x9D), o3(0xE3,0x81,0x9E),
-     o3(0xE3,0x81,0x9F), o3(0xE3,0x81,0xA0),
-     o3(0xE3,0x81,0xA1), o3(0xE3,0x81,0xA2),
-     o3(0xE3,0x81,0xA3), o3(0xE3,0x81,0xA4),
-     o3(0xE3,0x81,0xA5), o3(0xE3,0x81,0xA6),
-     o3(0xE3,0x81,0xA7), o3(0xE3,0x81,0xA8),
-     o3(0xE3,0x81,0xA9), o3(0xE3,0x81,0xAA),
-     o3(0xE3,0x81,0xAB), o3(0xE3,0x81,0xAC),
-     o3(0xE3,0x81,0xAD), o3(0xE3,0x81,0xAE),
-     o3(0xE3,0x81,0xAF), o3(0xE3,0x81,0xB0),
-     o3(0xE3,0x81,0xB1), o3(0xE3,0x81,0xB2),
-     o3(0xE3,0x81,0xB3), o3(0xE3,0x81,0xB4),
-     o3(0xE3,0x81,0xB5), o3(0xE3,0x81,0xB6),
-     o3(0xE3,0x81,0xB7), o3(0xE3,0x81,0xB8),
-     o3(0xE3,0x81,0xB9), o3(0xE3,0x81,0xBA),
-     o3(0xE3,0x81,0xBB), o3(0xE3,0x81,0xBC),
-     o3(0xE3,0x81,0xBD), o3(0xE3,0x81,0xBE),
-     o3(0xE3,0x81,0xBF), o3(0xE3,0x82,0x80),
-     o3(0xE3,0x82,0x81), o3(0xE3,0x82,0x82),
-     o3(0xE3,0x82,0x83), o3(0xE3,0x82,0x84),
-     o3(0xE3,0x82,0x85), o3(0xE3,0x82,0x86),
-     o3(0xE3,0x82,0x87), o3(0xE3,0x82,0x88),
-     o3(0xE3,0x82,0x89), o3(0xE3,0x82,0x8A),
-     o3(0xE3,0x82,0x8B), o3(0xE3,0x82,0x8C),
-     o3(0xE3,0x82,0x8D), o3(0xE3,0x82,0x8E),
-     o3(0xE3,0x82,0x8F), o3(0xE3,0x82,0x90),
-     o3(0xE3,0x82,0x91), o3(0xE3,0x82,0x92),
-     o3(0xE3,0x82,0x93),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_AA = {
-    from_EUC_KR_AA_offsets,
-    from_EUC_KR_AA_infos
-};
-
-static const unsigned char
-from_EUC_KR_AB_offsets[256] = {
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86, 86, 86, 86, 86, 86, 86, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-     86,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,     39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,     55, 56, 57, 58, 59, 60, 61, 62,
-     63, 64, 65, 66, 67, 68, 69, 70,     71, 72, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,     86, 86, 86, 86, 86, 86, 86, 86,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_AB_infos[87] = {
-     o3(0xE3,0x82,0xA1), o3(0xE3,0x82,0xA2),
-     o3(0xE3,0x82,0xA3), o3(0xE3,0x82,0xA4),
-     o3(0xE3,0x82,0xA5), o3(0xE3,0x82,0xA6),
-     o3(0xE3,0x82,0xA7), o3(0xE3,0x82,0xA8),
-     o3(0xE3,0x82,0xA9), o3(0xE3,0x82,0xAA),
-     o3(0xE3,0x82,0xAB), o3(0xE3,0x82,0xAC),
-     o3(0xE3,0x82,0xAD), o3(0xE3,0x82,0xAE),
-     o3(0xE3,0x82,0xAF), o3(0xE3,0x82,0xB0),
-     o3(0xE3,0x82,0xB1), o3(0xE3,0x82,0xB2),
-     o3(0xE3,0x82,0xB3), o3(0xE3,0x82,0xB4),
-     o3(0xE3,0x82,0xB5), o3(0xE3,0x82,0xB6),
-     o3(0xE3,0x82,0xB7), o3(0xE3,0x82,0xB8),
-     o3(0xE3,0x82,0xB9), o3(0xE3,0x82,0xBA),
-     o3(0xE3,0x82,0xBB), o3(0xE3,0x82,0xBC),
-     o3(0xE3,0x82,0xBD), o3(0xE3,0x82,0xBE),
-     o3(0xE3,0x82,0xBF), o3(0xE3,0x83,0x80),
-     o3(0xE3,0x83,0x81), o3(0xE3,0x83,0x82),
-     o3(0xE3,0x83,0x83), o3(0xE3,0x83,0x84),
-     o3(0xE3,0x83,0x85), o3(0xE3,0x83,0x86),
-     o3(0xE3,0x83,0x87), o3(0xE3,0x83,0x88),
-     o3(0xE3,0x83,0x89), o3(0xE3,0x83,0x8A),
-     o3(0xE3,0x83,0x8B), o3(0xE3,0x83,0x8C),
-     o3(0xE3,0x83,0x8D), o3(0xE3,0x83,0x8E),
-     o3(0xE3,0x83,0x8F), o3(0xE3,0x83,0x90),
-     o3(0xE3,0x83,0x91), o3(0xE3,0x83,0x92),
-     o3(0xE3,0x83,0x93), o3(0xE3,0x83,0x94),
-     o3(0xE3,0x83,0x95), o3(0xE3,0x83,0x96),
-     o3(0xE3,0x83,0x97), o3(0xE3,0x83,0x98),
-     o3(0xE3,0x83,0x99), o3(0xE3,0x83,0x9A),
-     o3(0xE3,0x83,0x9B), o3(0xE3,0x83,0x9C),
-     o3(0xE3,0x83,0x9D), o3(0xE3,0x83,0x9E),
-     o3(0xE3,0x83,0x9F), o3(0xE3,0x83,0xA0),
-     o3(0xE3,0x83,0xA1), o3(0xE3,0x83,0xA2),
-     o3(0xE3,0x83,0xA3), o3(0xE3,0x83,0xA4),
-     o3(0xE3,0x83,0xA5), o3(0xE3,0x83,0xA6),
-     o3(0xE3,0x83,0xA7), o3(0xE3,0x83,0xA8),
-     o3(0xE3,0x83,0xA9), o3(0xE3,0x83,0xAA),
-     o3(0xE3,0x83,0xAB), o3(0xE3,0x83,0xAC),
-     o3(0xE3,0x83,0xAD), o3(0xE3,0x83,0xAE),
-     o3(0xE3,0x83,0xAF), o3(0xE3,0x83,0xB0),
-     o3(0xE3,0x83,0xB1), o3(0xE3,0x83,0xB2),
-     o3(0xE3,0x83,0xB3), o3(0xE3,0x83,0xB4),
-     o3(0xE3,0x83,0xB5), o3(0xE3,0x83,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_AB = {
-    from_EUC_KR_AB_offsets,
-    from_EUC_KR_AB_infos
-};
-
-static const unsigned char
-from_EUC_KR_AC_offsets[256] = {
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 66, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-     66, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,     56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 66, 66, 66, 66, 66, 66,     66, 66, 66, 66, 66, 66, 66, 66,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_AC_infos[67] = {
-          o2(0xD0,0x90),      o2(0xD0,0x91),
-          o2(0xD0,0x92),      o2(0xD0,0x93),
-          o2(0xD0,0x94),      o2(0xD0,0x95),
-          o2(0xD0,0x81),      o2(0xD0,0x96),
-          o2(0xD0,0x97),      o2(0xD0,0x98),
-          o2(0xD0,0x99),      o2(0xD0,0x9A),
-          o2(0xD0,0x9B),      o2(0xD0,0x9C),
-          o2(0xD0,0x9D),      o2(0xD0,0x9E),
-          o2(0xD0,0x9F),      o2(0xD0,0xA0),
-          o2(0xD0,0xA1),      o2(0xD0,0xA2),
-          o2(0xD0,0xA3),      o2(0xD0,0xA4),
-          o2(0xD0,0xA5),      o2(0xD0,0xA6),
-          o2(0xD0,0xA7),      o2(0xD0,0xA8),
-          o2(0xD0,0xA9),      o2(0xD0,0xAA),
-          o2(0xD0,0xAB),      o2(0xD0,0xAC),
-          o2(0xD0,0xAD),      o2(0xD0,0xAE),
-          o2(0xD0,0xAF),      o2(0xD0,0xB0),
-          o2(0xD0,0xB1),      o2(0xD0,0xB2),
-          o2(0xD0,0xB3),      o2(0xD0,0xB4),
-          o2(0xD0,0xB5),      o2(0xD1,0x91),
-          o2(0xD0,0xB6),      o2(0xD0,0xB7),
-          o2(0xD0,0xB8),      o2(0xD0,0xB9),
-          o2(0xD0,0xBA),      o2(0xD0,0xBB),
-          o2(0xD0,0xBC),      o2(0xD0,0xBD),
-          o2(0xD0,0xBE),      o2(0xD0,0xBF),
-          o2(0xD1,0x80),      o2(0xD1,0x81),
-          o2(0xD1,0x82),      o2(0xD1,0x83),
-          o2(0xD1,0x84),      o2(0xD1,0x85),
-          o2(0xD1,0x86),      o2(0xD1,0x87),
-          o2(0xD1,0x88),      o2(0xD1,0x89),
-          o2(0xD1,0x8A),      o2(0xD1,0x8B),
-          o2(0xD1,0x8C),      o2(0xD1,0x8D),
-          o2(0xD1,0x8E),      o2(0xD1,0x8F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_AC = {
-    from_EUC_KR_AC_offsets,
-    from_EUC_KR_AC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B0_infos[95] = {
-     o3(0xEA,0xB0,0x80), o3(0xEA,0xB0,0x81),
-     o3(0xEA,0xB0,0x84), o3(0xEA,0xB0,0x87),
-     o3(0xEA,0xB0,0x88), o3(0xEA,0xB0,0x89),
-     o3(0xEA,0xB0,0x8A), o3(0xEA,0xB0,0x90),
-     o3(0xEA,0xB0,0x91), o3(0xEA,0xB0,0x92),
-     o3(0xEA,0xB0,0x93), o3(0xEA,0xB0,0x94),
-     o3(0xEA,0xB0,0x95), o3(0xEA,0xB0,0x96),
-     o3(0xEA,0xB0,0x97), o3(0xEA,0xB0,0x99),
-     o3(0xEA,0xB0,0x9A), o3(0xEA,0xB0,0x9B),
-     o3(0xEA,0xB0,0x9C), o3(0xEA,0xB0,0x9D),
-     o3(0xEA,0xB0,0xA0), o3(0xEA,0xB0,0xA4),
-     o3(0xEA,0xB0,0xAC), o3(0xEA,0xB0,0xAD),
-     o3(0xEA,0xB0,0xAF), o3(0xEA,0xB0,0xB0),
-     o3(0xEA,0xB0,0xB1), o3(0xEA,0xB0,0xB8),
-     o3(0xEA,0xB0,0xB9), o3(0xEA,0xB0,0xBC),
-     o3(0xEA,0xB1,0x80), o3(0xEA,0xB1,0x8B),
-     o3(0xEA,0xB1,0x8D), o3(0xEA,0xB1,0x94),
-     o3(0xEA,0xB1,0x98), o3(0xEA,0xB1,0x9C),
-     o3(0xEA,0xB1,0xB0), o3(0xEA,0xB1,0xB1),
-     o3(0xEA,0xB1,0xB4), o3(0xEA,0xB1,0xB7),
-     o3(0xEA,0xB1,0xB8), o3(0xEA,0xB1,0xBA),
-     o3(0xEA,0xB2,0x80), o3(0xEA,0xB2,0x81),
-     o3(0xEA,0xB2,0x83), o3(0xEA,0xB2,0x84),
-     o3(0xEA,0xB2,0x85), o3(0xEA,0xB2,0x86),
-     o3(0xEA,0xB2,0x89), o3(0xEA,0xB2,0x8A),
-     o3(0xEA,0xB2,0x8B), o3(0xEA,0xB2,0x8C),
-     o3(0xEA,0xB2,0x90), o3(0xEA,0xB2,0x94),
-     o3(0xEA,0xB2,0x9C), o3(0xEA,0xB2,0x9D),
-     o3(0xEA,0xB2,0x9F), o3(0xEA,0xB2,0xA0),
-     o3(0xEA,0xB2,0xA1), o3(0xEA,0xB2,0xA8),
-     o3(0xEA,0xB2,0xA9), o3(0xEA,0xB2,0xAA),
-     o3(0xEA,0xB2,0xAC), o3(0xEA,0xB2,0xAF),
-     o3(0xEA,0xB2,0xB0), o3(0xEA,0xB2,0xB8),
-     o3(0xEA,0xB2,0xB9), o3(0xEA,0xB2,0xBB),
-     o3(0xEA,0xB2,0xBC), o3(0xEA,0xB2,0xBD),
-     o3(0xEA,0xB3,0x81), o3(0xEA,0xB3,0x84),
-     o3(0xEA,0xB3,0x88), o3(0xEA,0xB3,0x8C),
-     o3(0xEA,0xB3,0x95), o3(0xEA,0xB3,0x97),
-     o3(0xEA,0xB3,0xA0), o3(0xEA,0xB3,0xA1),
-     o3(0xEA,0xB3,0xA4), o3(0xEA,0xB3,0xA7),
-     o3(0xEA,0xB3,0xA8), o3(0xEA,0xB3,0xAA),
-     o3(0xEA,0xB3,0xAC), o3(0xEA,0xB3,0xAF),
-     o3(0xEA,0xB3,0xB0), o3(0xEA,0xB3,0xB1),
-     o3(0xEA,0xB3,0xB3), o3(0xEA,0xB3,0xB5),
-     o3(0xEA,0xB3,0xB6), o3(0xEA,0xB3,0xBC),
-     o3(0xEA,0xB3,0xBD), o3(0xEA,0xB4,0x80),
-     o3(0xEA,0xB4,0x84), o3(0xEA,0xB4,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B0 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B0_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B1_infos[95] = {
-     o3(0xEA,0xB4,0x8C), o3(0xEA,0xB4,0x8D),
-     o3(0xEA,0xB4,0x8F), o3(0xEA,0xB4,0x91),
-     o3(0xEA,0xB4,0x98), o3(0xEA,0xB4,0x9C),
-     o3(0xEA,0xB4,0xA0), o3(0xEA,0xB4,0xA9),
-     o3(0xEA,0xB4,0xAC), o3(0xEA,0xB4,0xAD),
-     o3(0xEA,0xB4,0xB4), o3(0xEA,0xB4,0xB5),
-     o3(0xEA,0xB4,0xB8), o3(0xEA,0xB4,0xBC),
-     o3(0xEA,0xB5,0x84), o3(0xEA,0xB5,0x85),
-     o3(0xEA,0xB5,0x87), o3(0xEA,0xB5,0x89),
-     o3(0xEA,0xB5,0x90), o3(0xEA,0xB5,0x94),
-     o3(0xEA,0xB5,0x98), o3(0xEA,0xB5,0xA1),
-     o3(0xEA,0xB5,0xA3), o3(0xEA,0xB5,0xAC),
-     o3(0xEA,0xB5,0xAD), o3(0xEA,0xB5,0xB0),
-     o3(0xEA,0xB5,0xB3), o3(0xEA,0xB5,0xB4),
-     o3(0xEA,0xB5,0xB5), o3(0xEA,0xB5,0xB6),
-     o3(0xEA,0xB5,0xBB), o3(0xEA,0xB5,0xBC),
-     o3(0xEA,0xB5,0xBD), o3(0xEA,0xB5,0xBF),
-     o3(0xEA,0xB6,0x81), o3(0xEA,0xB6,0x82),
-     o3(0xEA,0xB6,0x88), o3(0xEA,0xB6,0x89),
-     o3(0xEA,0xB6,0x8C), o3(0xEA,0xB6,0x90),
-     o3(0xEA,0xB6,0x9C), o3(0xEA,0xB6,0x9D),
-     o3(0xEA,0xB6,0xA4), o3(0xEA,0xB6,0xB7),
-     o3(0xEA,0xB7,0x80), o3(0xEA,0xB7,0x81),
-     o3(0xEA,0xB7,0x84), o3(0xEA,0xB7,0x88),
-     o3(0xEA,0xB7,0x90), o3(0xEA,0xB7,0x91),
-     o3(0xEA,0xB7,0x93), o3(0xEA,0xB7,0x9C),
-     o3(0xEA,0xB7,0xA0), o3(0xEA,0xB7,0xA4),
-     o3(0xEA,0xB7,0xB8), o3(0xEA,0xB7,0xB9),
-     o3(0xEA,0xB7,0xBC), o3(0xEA,0xB7,0xBF),
-     o3(0xEA,0xB8,0x80), o3(0xEA,0xB8,0x81),
-     o3(0xEA,0xB8,0x88), o3(0xEA,0xB8,0x89),
-     o3(0xEA,0xB8,0x8B), o3(0xEA,0xB8,0x8D),
-     o3(0xEA,0xB8,0x94), o3(0xEA,0xB8,0xB0),
-     o3(0xEA,0xB8,0xB1), o3(0xEA,0xB8,0xB4),
-     o3(0xEA,0xB8,0xB7), o3(0xEA,0xB8,0xB8),
-     o3(0xEA,0xB8,0xBA), o3(0xEA,0xB9,0x80),
-     o3(0xEA,0xB9,0x81), o3(0xEA,0xB9,0x83),
-     o3(0xEA,0xB9,0x85), o3(0xEA,0xB9,0x86),
-     o3(0xEA,0xB9,0x8A), o3(0xEA,0xB9,0x8C),
-     o3(0xEA,0xB9,0x8D), o3(0xEA,0xB9,0x8E),
-     o3(0xEA,0xB9,0x90), o3(0xEA,0xB9,0x94),
-     o3(0xEA,0xB9,0x96), o3(0xEA,0xB9,0x9C),
-     o3(0xEA,0xB9,0x9D), o3(0xEA,0xB9,0x9F),
-     o3(0xEA,0xB9,0xA0), o3(0xEA,0xB9,0xA1),
-     o3(0xEA,0xB9,0xA5), o3(0xEA,0xB9,0xA8),
-     o3(0xEA,0xB9,0xA9), o3(0xEA,0xB9,0xAC),
-     o3(0xEA,0xB9,0xB0), o3(0xEA,0xB9,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B1_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B2_infos[95] = {
-     o3(0xEA,0xB9,0xB9), o3(0xEA,0xB9,0xBB),
-     o3(0xEA,0xB9,0xBC), o3(0xEA,0xB9,0xBD),
-     o3(0xEA,0xBA,0x84), o3(0xEA,0xBA,0x85),
-     o3(0xEA,0xBA,0x8C), o3(0xEA,0xBA,0xBC),
-     o3(0xEA,0xBA,0xBD), o3(0xEA,0xBA,0xBE),
-     o3(0xEA,0xBB,0x80), o3(0xEA,0xBB,0x84),
-     o3(0xEA,0xBB,0x8C), o3(0xEA,0xBB,0x8D),
-     o3(0xEA,0xBB,0x8F), o3(0xEA,0xBB,0x90),
-     o3(0xEA,0xBB,0x91), o3(0xEA,0xBB,0x98),
-     o3(0xEA,0xBB,0x99), o3(0xEA,0xBB,0x9C),
-     o3(0xEA,0xBB,0xA8), o3(0xEA,0xBB,0xAB),
-     o3(0xEA,0xBB,0xAD), o3(0xEA,0xBB,0xB4),
-     o3(0xEA,0xBB,0xB8), o3(0xEA,0xBB,0xBC),
-     o3(0xEA,0xBC,0x87), o3(0xEA,0xBC,0x88),
-     o3(0xEA,0xBC,0x8D), o3(0xEA,0xBC,0x90),
-     o3(0xEA,0xBC,0xAC), o3(0xEA,0xBC,0xAD),
-     o3(0xEA,0xBC,0xB0), o3(0xEA,0xBC,0xB2),
-     o3(0xEA,0xBC,0xB4), o3(0xEA,0xBC,0xBC),
-     o3(0xEA,0xBC,0xBD), o3(0xEA,0xBC,0xBF),
-     o3(0xEA,0xBD,0x81), o3(0xEA,0xBD,0x82),
-     o3(0xEA,0xBD,0x83), o3(0xEA,0xBD,0x88),
-     o3(0xEA,0xBD,0x89), o3(0xEA,0xBD,0x90),
-     o3(0xEA,0xBD,0x9C), o3(0xEA,0xBD,0x9D),
-     o3(0xEA,0xBD,0xA4), o3(0xEA,0xBD,0xA5),
-     o3(0xEA,0xBD,0xB9), o3(0xEA,0xBE,0x80),
-     o3(0xEA,0xBE,0x84), o3(0xEA,0xBE,0x88),
-     o3(0xEA,0xBE,0x90), o3(0xEA,0xBE,0x91),
-     o3(0xEA,0xBE,0x95), o3(0xEA,0xBE,0x9C),
-     o3(0xEA,0xBE,0xB8), o3(0xEA,0xBE,0xB9),
-     o3(0xEA,0xBE,0xBC), o3(0xEA,0xBF,0x80),
-     o3(0xEA,0xBF,0x87), o3(0xEA,0xBF,0x88),
-     o3(0xEA,0xBF,0x89), o3(0xEA,0xBF,0x8B),
-     o3(0xEA,0xBF,0x8D), o3(0xEA,0xBF,0x8E),
-     o3(0xEA,0xBF,0x94), o3(0xEA,0xBF,0x9C),
-     o3(0xEA,0xBF,0xA8), o3(0xEA,0xBF,0xA9),
-     o3(0xEA,0xBF,0xB0), o3(0xEA,0xBF,0xB1),
-     o3(0xEA,0xBF,0xB4), o3(0xEA,0xBF,0xB8),
-     o3(0xEB,0x80,0x80), o3(0xEB,0x80,0x81),
-     o3(0xEB,0x80,0x84), o3(0xEB,0x80,0x8C),
-     o3(0xEB,0x80,0x90), o3(0xEB,0x80,0x94),
-     o3(0xEB,0x80,0x9C), o3(0xEB,0x80,0x9D),
-     o3(0xEB,0x80,0xA8), o3(0xEB,0x81,0x84),
-     o3(0xEB,0x81,0x85), o3(0xEB,0x81,0x88),
-     o3(0xEB,0x81,0x8A), o3(0xEB,0x81,0x8C),
-     o3(0xEB,0x81,0x8E), o3(0xEB,0x81,0x93),
-     o3(0xEB,0x81,0x94), o3(0xEB,0x81,0x95),
-     o3(0xEB,0x81,0x97), o3(0xEB,0x81,0x99),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B2 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B3_infos[95] = {
-     o3(0xEB,0x81,0x9D), o3(0xEB,0x81,0xBC),
-     o3(0xEB,0x81,0xBD), o3(0xEB,0x82,0x80),
-     o3(0xEB,0x82,0x84), o3(0xEB,0x82,0x8C),
-     o3(0xEB,0x82,0x8D), o3(0xEB,0x82,0x8F),
-     o3(0xEB,0x82,0x91), o3(0xEB,0x82,0x98),
-     o3(0xEB,0x82,0x99), o3(0xEB,0x82,0x9A),
-     o3(0xEB,0x82,0x9C), o3(0xEB,0x82,0x9F),
-     o3(0xEB,0x82,0xA0), o3(0xEB,0x82,0xA1),
-     o3(0xEB,0x82,0xA2), o3(0xEB,0x82,0xA8),
-     o3(0xEB,0x82,0xA9), o3(0xEB,0x82,0xAB),
-     o3(0xEB,0x82,0xAC), o3(0xEB,0x82,0xAD),
-     o3(0xEB,0x82,0xAE), o3(0xEB,0x82,0xAF),
-     o3(0xEB,0x82,0xB1), o3(0xEB,0x82,0xB3),
-     o3(0xEB,0x82,0xB4), o3(0xEB,0x82,0xB5),
-     o3(0xEB,0x82,0xB8), o3(0xEB,0x82,0xBC),
-     o3(0xEB,0x83,0x84), o3(0xEB,0x83,0x85),
-     o3(0xEB,0x83,0x87), o3(0xEB,0x83,0x88),
-     o3(0xEB,0x83,0x89), o3(0xEB,0x83,0x90),
-     o3(0xEB,0x83,0x91), o3(0xEB,0x83,0x94),
-     o3(0xEB,0x83,0x98), o3(0xEB,0x83,0xA0),
-     o3(0xEB,0x83,0xA5), o3(0xEB,0x84,0x88),
-     o3(0xEB,0x84,0x89), o3(0xEB,0x84,0x8B),
-     o3(0xEB,0x84,0x8C), o3(0xEB,0x84,0x90),
-     o3(0xEB,0x84,0x92), o3(0xEB,0x84,0x93),
-     o3(0xEB,0x84,0x98), o3(0xEB,0x84,0x99),
-     o3(0xEB,0x84,0x9B), o3(0xEB,0x84,0x9C),
-     o3(0xEB,0x84,0x9D), o3(0xEB,0x84,0xA3),
-     o3(0xEB,0x84,0xA4), o3(0xEB,0x84,0xA5),
-     o3(0xEB,0x84,0xA8), o3(0xEB,0x84,0xAC),
-     o3(0xEB,0x84,0xB4), o3(0xEB,0x84,0xB5),
-     o3(0xEB,0x84,0xB7), o3(0xEB,0x84,0xB8),
-     o3(0xEB,0x84,0xB9), o3(0xEB,0x85,0x80),
-     o3(0xEB,0x85,0x81), o3(0xEB,0x85,0x84),
-     o3(0xEB,0x85,0x88), o3(0xEB,0x85,0x90),
-     o3(0xEB,0x85,0x91), o3(0xEB,0x85,0x94),
-     o3(0xEB,0x85,0x95), o3(0xEB,0x85,0x98),
-     o3(0xEB,0x85,0x9C), o3(0xEB,0x85,0xA0),
-     o3(0xEB,0x85,0xB8), o3(0xEB,0x85,0xB9),
-     o3(0xEB,0x85,0xBC), o3(0xEB,0x86,0x80),
-     o3(0xEB,0x86,0x82), o3(0xEB,0x86,0x88),
-     o3(0xEB,0x86,0x89), o3(0xEB,0x86,0x8B),
-     o3(0xEB,0x86,0x8D), o3(0xEB,0x86,0x92),
-     o3(0xEB,0x86,0x93), o3(0xEB,0x86,0x94),
-     o3(0xEB,0x86,0x98), o3(0xEB,0x86,0x9C),
-     o3(0xEB,0x86,0xA8), o3(0xEB,0x87,0x8C),
-     o3(0xEB,0x87,0x90), o3(0xEB,0x87,0x94),
-     o3(0xEB,0x87,0x9C), o3(0xEB,0x87,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B4_infos[95] = {
-     o3(0xEB,0x87,0x9F), o3(0xEB,0x87,0xA8),
-     o3(0xEB,0x87,0xA9), o3(0xEB,0x87,0xAC),
-     o3(0xEB,0x87,0xB0), o3(0xEB,0x87,0xB9),
-     o3(0xEB,0x87,0xBB), o3(0xEB,0x87,0xBD),
-     o3(0xEB,0x88,0x84), o3(0xEB,0x88,0x85),
-     o3(0xEB,0x88,0x88), o3(0xEB,0x88,0x8B),
-     o3(0xEB,0x88,0x8C), o3(0xEB,0x88,0x94),
-     o3(0xEB,0x88,0x95), o3(0xEB,0x88,0x97),
-     o3(0xEB,0x88,0x99), o3(0xEB,0x88,0xA0),
-     o3(0xEB,0x88,0xB4), o3(0xEB,0x88,0xBC),
-     o3(0xEB,0x89,0x98), o3(0xEB,0x89,0x9C),
-     o3(0xEB,0x89,0xA0), o3(0xEB,0x89,0xA8),
-     o3(0xEB,0x89,0xA9), o3(0xEB,0x89,0xB4),
-     o3(0xEB,0x89,0xB5), o3(0xEB,0x89,0xBC),
-     o3(0xEB,0x8A,0x84), o3(0xEB,0x8A,0x85),
-     o3(0xEB,0x8A,0x89), o3(0xEB,0x8A,0x90),
-     o3(0xEB,0x8A,0x91), o3(0xEB,0x8A,0x94),
-     o3(0xEB,0x8A,0x98), o3(0xEB,0x8A,0x99),
-     o3(0xEB,0x8A,0x9A), o3(0xEB,0x8A,0xA0),
-     o3(0xEB,0x8A,0xA1), o3(0xEB,0x8A,0xA3),
-     o3(0xEB,0x8A,0xA5), o3(0xEB,0x8A,0xA6),
-     o3(0xEB,0x8A,0xAA), o3(0xEB,0x8A,0xAC),
-     o3(0xEB,0x8A,0xB0), o3(0xEB,0x8A,0xB4),
-     o3(0xEB,0x8B,0x88), o3(0xEB,0x8B,0x89),
-     o3(0xEB,0x8B,0x8C), o3(0xEB,0x8B,0x90),
-     o3(0xEB,0x8B,0x92), o3(0xEB,0x8B,0x98),
-     o3(0xEB,0x8B,0x99), o3(0xEB,0x8B,0x9B),
-     o3(0xEB,0x8B,0x9D), o3(0xEB,0x8B,0xA2),
-     o3(0xEB,0x8B,0xA4), o3(0xEB,0x8B,0xA5),
-     o3(0xEB,0x8B,0xA6), o3(0xEB,0x8B,0xA8),
-     o3(0xEB,0x8B,0xAB), o3(0xEB,0x8B,0xAC),
-     o3(0xEB,0x8B,0xAD), o3(0xEB,0x8B,0xAE),
-     o3(0xEB,0x8B,0xAF), o3(0xEB,0x8B,0xB3),
-     o3(0xEB,0x8B,0xB4), o3(0xEB,0x8B,0xB5),
-     o3(0xEB,0x8B,0xB7), o3(0xEB,0x8B,0xB8),
-     o3(0xEB,0x8B,0xB9), o3(0xEB,0x8B,0xBA),
-     o3(0xEB,0x8B,0xBB), o3(0xEB,0x8B,0xBF),
-     o3(0xEB,0x8C,0x80), o3(0xEB,0x8C,0x81),
-     o3(0xEB,0x8C,0x84), o3(0xEB,0x8C,0x88),
-     o3(0xEB,0x8C,0x90), o3(0xEB,0x8C,0x91),
-     o3(0xEB,0x8C,0x93), o3(0xEB,0x8C,0x94),
-     o3(0xEB,0x8C,0x95), o3(0xEB,0x8C,0x9C),
-     o3(0xEB,0x8D,0x94), o3(0xEB,0x8D,0x95),
-     o3(0xEB,0x8D,0x96), o3(0xEB,0x8D,0x98),
-     o3(0xEB,0x8D,0x9B), o3(0xEB,0x8D,0x9C),
-     o3(0xEB,0x8D,0x9E), o3(0xEB,0x8D,0x9F),
-     o3(0xEB,0x8D,0xA4), o3(0xEB,0x8D,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B4_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B5_infos[95] = {
-     o3(0xEB,0x8D,0xA7), o3(0xEB,0x8D,0xA9),
-     o3(0xEB,0x8D,0xAB), o3(0xEB,0x8D,0xAE),
-     o3(0xEB,0x8D,0xB0), o3(0xEB,0x8D,0xB1),
-     o3(0xEB,0x8D,0xB4), o3(0xEB,0x8D,0xB8),
-     o3(0xEB,0x8E,0x80), o3(0xEB,0x8E,0x81),
-     o3(0xEB,0x8E,0x83), o3(0xEB,0x8E,0x84),
-     o3(0xEB,0x8E,0x85), o3(0xEB,0x8E,0x8C),
-     o3(0xEB,0x8E,0x90), o3(0xEB,0x8E,0x94),
-     o3(0xEB,0x8E,0xA0), o3(0xEB,0x8E,0xA1),
-     o3(0xEB,0x8E,0xA8), o3(0xEB,0x8E,0xAC),
-     o3(0xEB,0x8F,0x84), o3(0xEB,0x8F,0x85),
-     o3(0xEB,0x8F,0x88), o3(0xEB,0x8F,0x8B),
-     o3(0xEB,0x8F,0x8C), o3(0xEB,0x8F,0x8E),
-     o3(0xEB,0x8F,0x90), o3(0xEB,0x8F,0x94),
-     o3(0xEB,0x8F,0x95), o3(0xEB,0x8F,0x97),
-     o3(0xEB,0x8F,0x99), o3(0xEB,0x8F,0x9B),
-     o3(0xEB,0x8F,0x9D), o3(0xEB,0x8F,0xA0),
-     o3(0xEB,0x8F,0xA4), o3(0xEB,0x8F,0xA8),
-     o3(0xEB,0x8F,0xBC), o3(0xEB,0x90,0x90),
-     o3(0xEB,0x90,0x98), o3(0xEB,0x90,0x9C),
-     o3(0xEB,0x90,0xA0), o3(0xEB,0x90,0xA8),
-     o3(0xEB,0x90,0xA9), o3(0xEB,0x90,0xAB),
-     o3(0xEB,0x90,0xB4), o3(0xEB,0x91,0x90),
-     o3(0xEB,0x91,0x91), o3(0xEB,0x91,0x94),
-     o3(0xEB,0x91,0x98), o3(0xEB,0x91,0xA0),
-     o3(0xEB,0x91,0xA1), o3(0xEB,0x91,0xA3),
-     o3(0xEB,0x91,0xA5), o3(0xEB,0x91,0xAC),
-     o3(0xEB,0x92,0x80), o3(0xEB,0x92,0x88),
-     o3(0xEB,0x92,0x9D), o3(0xEB,0x92,0xA4),
-     o3(0xEB,0x92,0xA8), o3(0xEB,0x92,0xAC),
-     o3(0xEB,0x92,0xB5), o3(0xEB,0x92,0xB7),
-     o3(0xEB,0x92,0xB9), o3(0xEB,0x93,0x80),
-     o3(0xEB,0x93,0x84), o3(0xEB,0x93,0x88),
-     o3(0xEB,0x93,0x90), o3(0xEB,0x93,0x95),
-     o3(0xEB,0x93,0x9C), o3(0xEB,0x93,0x9D),
-     o3(0xEB,0x93,0xA0), o3(0xEB,0x93,0xA3),
-     o3(0xEB,0x93,0xA4), o3(0xEB,0x93,0xA6),
-     o3(0xEB,0x93,0xAC), o3(0xEB,0x93,0xAD),
-     o3(0xEB,0x93,0xAF), o3(0xEB,0x93,0xB1),
-     o3(0xEB,0x93,0xB8), o3(0xEB,0x94,0x94),
-     o3(0xEB,0x94,0x95), o3(0xEB,0x94,0x98),
-     o3(0xEB,0x94,0x9B), o3(0xEB,0x94,0x9C),
-     o3(0xEB,0x94,0xA4), o3(0xEB,0x94,0xA5),
-     o3(0xEB,0x94,0xA7), o3(0xEB,0x94,0xA8),
-     o3(0xEB,0x94,0xA9), o3(0xEB,0x94,0xAA),
-     o3(0xEB,0x94,0xB0), o3(0xEB,0x94,0xB1),
-     o3(0xEB,0x94,0xB4), o3(0xEB,0x94,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B5 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B5_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B6_infos[95] = {
-     o3(0xEB,0x95,0x80), o3(0xEB,0x95,0x81),
-     o3(0xEB,0x95,0x83), o3(0xEB,0x95,0x84),
-     o3(0xEB,0x95,0x85), o3(0xEB,0x95,0x8B),
-     o3(0xEB,0x95,0x8C), o3(0xEB,0x95,0x8D),
-     o3(0xEB,0x95,0x90), o3(0xEB,0x95,0x94),
-     o3(0xEB,0x95,0x9C), o3(0xEB,0x95,0x9D),
-     o3(0xEB,0x95,0x9F), o3(0xEB,0x95,0xA0),
-     o3(0xEB,0x95,0xA1), o3(0xEB,0x96,0xA0),
-     o3(0xEB,0x96,0xA1), o3(0xEB,0x96,0xA4),
-     o3(0xEB,0x96,0xA8), o3(0xEB,0x96,0xAA),
-     o3(0xEB,0x96,0xAB), o3(0xEB,0x96,0xB0),
-     o3(0xEB,0x96,0xB1), o3(0xEB,0x96,0xB3),
-     o3(0xEB,0x96,0xB4), o3(0xEB,0x96,0xB5),
-     o3(0xEB,0x96,0xBB), o3(0xEB,0x96,0xBC),
-     o3(0xEB,0x96,0xBD), o3(0xEB,0x97,0x80),
-     o3(0xEB,0x97,0x84), o3(0xEB,0x97,0x8C),
-     o3(0xEB,0x97,0x8D), o3(0xEB,0x97,0x8F),
-     o3(0xEB,0x97,0x90), o3(0xEB,0x97,0x91),
-     o3(0xEB,0x97,0x98), o3(0xEB,0x97,0xAC),
-     o3(0xEB,0x98,0x90), o3(0xEB,0x98,0x91),
-     o3(0xEB,0x98,0x94), o3(0xEB,0x98,0x98),
-     o3(0xEB,0x98,0xA5), o3(0xEB,0x98,0xAC),
-     o3(0xEB,0x98,0xB4), o3(0xEB,0x99,0x88),
-     o3(0xEB,0x99,0xA4), o3(0xEB,0x99,0xA8),
-     o3(0xEB,0x9A,0x9C), o3(0xEB,0x9A,0x9D),
-     o3(0xEB,0x9A,0xA0), o3(0xEB,0x9A,0xA4),
-     o3(0xEB,0x9A,0xAB), o3(0xEB,0x9A,0xAC),
-     o3(0xEB,0x9A,0xB1), o3(0xEB,0x9B,0x94),
-     o3(0xEB,0x9B,0xB0), o3(0xEB,0x9B,0xB4),
-     o3(0xEB,0x9B,0xB8), o3(0xEB,0x9C,0x80),
-     o3(0xEB,0x9C,0x81), o3(0xEB,0x9C,0x85),
-     o3(0xEB,0x9C,0xA8), o3(0xEB,0x9C,0xA9),
-     o3(0xEB,0x9C,0xAC), o3(0xEB,0x9C,0xAF),
-     o3(0xEB,0x9C,0xB0), o3(0xEB,0x9C,0xB8),
-     o3(0xEB,0x9C,0xB9), o3(0xEB,0x9C,0xBB),
-     o3(0xEB,0x9D,0x84), o3(0xEB,0x9D,0x88),
-     o3(0xEB,0x9D,0x8C), o3(0xEB,0x9D,0x94),
-     o3(0xEB,0x9D,0x95), o3(0xEB,0x9D,0xA0),
-     o3(0xEB,0x9D,0xA4), o3(0xEB,0x9D,0xA8),
-     o3(0xEB,0x9D,0xB0), o3(0xEB,0x9D,0xB1),
-     o3(0xEB,0x9D,0xB3), o3(0xEB,0x9D,0xB5),
-     o3(0xEB,0x9D,0xBC), o3(0xEB,0x9D,0xBD),
-     o3(0xEB,0x9E,0x80), o3(0xEB,0x9E,0x84),
-     o3(0xEB,0x9E,0x8C), o3(0xEB,0x9E,0x8D),
-     o3(0xEB,0x9E,0x8F), o3(0xEB,0x9E,0x90),
-     o3(0xEB,0x9E,0x91), o3(0xEB,0x9E,0x92),
-     o3(0xEB,0x9E,0x96), o3(0xEB,0x9E,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B6 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B6_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B7_infos[95] = {
-     o3(0xEB,0x9E,0x98), o3(0xEB,0x9E,0x99),
-     o3(0xEB,0x9E,0x9C), o3(0xEB,0x9E,0xA0),
-     o3(0xEB,0x9E,0xA8), o3(0xEB,0x9E,0xA9),
-     o3(0xEB,0x9E,0xAB), o3(0xEB,0x9E,0xAC),
-     o3(0xEB,0x9E,0xAD), o3(0xEB,0x9E,0xB4),
-     o3(0xEB,0x9E,0xB5), o3(0xEB,0x9E,0xB8),
-     o3(0xEB,0x9F,0x87), o3(0xEB,0x9F,0x89),
-     o3(0xEB,0x9F,0xAC), o3(0xEB,0x9F,0xAD),
-     o3(0xEB,0x9F,0xB0), o3(0xEB,0x9F,0xB4),
-     o3(0xEB,0x9F,0xBC), o3(0xEB,0x9F,0xBD),
-     o3(0xEB,0x9F,0xBF), o3(0xEB,0xA0,0x80),
-     o3(0xEB,0xA0,0x81), o3(0xEB,0xA0,0x87),
-     o3(0xEB,0xA0,0x88), o3(0xEB,0xA0,0x89),
-     o3(0xEB,0xA0,0x8C), o3(0xEB,0xA0,0x90),
-     o3(0xEB,0xA0,0x98), o3(0xEB,0xA0,0x99),
-     o3(0xEB,0xA0,0x9B), o3(0xEB,0xA0,0x9D),
-     o3(0xEB,0xA0,0xA4), o3(0xEB,0xA0,0xA5),
-     o3(0xEB,0xA0,0xA8), o3(0xEB,0xA0,0xAC),
-     o3(0xEB,0xA0,0xB4), o3(0xEB,0xA0,0xB5),
-     o3(0xEB,0xA0,0xB7), o3(0xEB,0xA0,0xB8),
-     o3(0xEB,0xA0,0xB9), o3(0xEB,0xA1,0x80),
-     o3(0xEB,0xA1,0x84), o3(0xEB,0xA1,0x91),
-     o3(0xEB,0xA1,0x93), o3(0xEB,0xA1,0x9C),
-     o3(0xEB,0xA1,0x9D), o3(0xEB,0xA1,0xA0),
-     o3(0xEB,0xA1,0xA4), o3(0xEB,0xA1,0xAC),
-     o3(0xEB,0xA1,0xAD), o3(0xEB,0xA1,0xAF),
-     o3(0xEB,0xA1,0xB1), o3(0xEB,0xA1,0xB8),
-     o3(0xEB,0xA1,0xBC), o3(0xEB,0xA2,0x8D),
-     o3(0xEB,0xA2,0xA8), o3(0xEB,0xA2,0xB0),
-     o3(0xEB,0xA2,0xB4), o3(0xEB,0xA2,0xB8),
-     o3(0xEB,0xA3,0x80), o3(0xEB,0xA3,0x81),
-     o3(0xEB,0xA3,0x83), o3(0xEB,0xA3,0x85),
-     o3(0xEB,0xA3,0x8C), o3(0xEB,0xA3,0x90),
-     o3(0xEB,0xA3,0x94), o3(0xEB,0xA3,0x9D),
-     o3(0xEB,0xA3,0x9F), o3(0xEB,0xA3,0xA1),
-     o3(0xEB,0xA3,0xA8), o3(0xEB,0xA3,0xA9),
-     o3(0xEB,0xA3,0xAC), o3(0xEB,0xA3,0xB0),
-     o3(0xEB,0xA3,0xB8), o3(0xEB,0xA3,0xB9),
-     o3(0xEB,0xA3,0xBB), o3(0xEB,0xA3,0xBD),
-     o3(0xEB,0xA4,0x84), o3(0xEB,0xA4,0x98),
-     o3(0xEB,0xA4,0xA0), o3(0xEB,0xA4,0xBC),
-     o3(0xEB,0xA4,0xBD), o3(0xEB,0xA5,0x80),
-     o3(0xEB,0xA5,0x84), o3(0xEB,0xA5,0x8C),
-     o3(0xEB,0xA5,0x8F), o3(0xEB,0xA5,0x91),
-     o3(0xEB,0xA5,0x98), o3(0xEB,0xA5,0x99),
-     o3(0xEB,0xA5,0x9C), o3(0xEB,0xA5,0xA0),
-     o3(0xEB,0xA5,0xA8), o3(0xEB,0xA5,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B7 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B7_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B8_infos[95] = {
-     o3(0xEB,0xA5,0xAB), o3(0xEB,0xA5,0xAD),
-     o3(0xEB,0xA5,0xB4), o3(0xEB,0xA5,0xB5),
-     o3(0xEB,0xA5,0xB8), o3(0xEB,0xA5,0xBC),
-     o3(0xEB,0xA6,0x84), o3(0xEB,0xA6,0x85),
-     o3(0xEB,0xA6,0x87), o3(0xEB,0xA6,0x89),
-     o3(0xEB,0xA6,0x8A), o3(0xEB,0xA6,0x8D),
-     o3(0xEB,0xA6,0x8E), o3(0xEB,0xA6,0xAC),
-     o3(0xEB,0xA6,0xAD), o3(0xEB,0xA6,0xB0),
-     o3(0xEB,0xA6,0xB4), o3(0xEB,0xA6,0xBC),
-     o3(0xEB,0xA6,0xBD), o3(0xEB,0xA6,0xBF),
-     o3(0xEB,0xA7,0x81), o3(0xEB,0xA7,0x88),
-     o3(0xEB,0xA7,0x89), o3(0xEB,0xA7,0x8C),
-     o3(0xEB,0xA7,0x8E), o3(0xEB,0xA7,0x8F),
-     o3(0xEB,0xA7,0x90), o3(0xEB,0xA7,0x91),
-     o3(0xEB,0xA7,0x92), o3(0xEB,0xA7,0x98),
-     o3(0xEB,0xA7,0x99), o3(0xEB,0xA7,0x9B),
-     o3(0xEB,0xA7,0x9D), o3(0xEB,0xA7,0x9E),
-     o3(0xEB,0xA7,0xA1), o3(0xEB,0xA7,0xA3),
-     o3(0xEB,0xA7,0xA4), o3(0xEB,0xA7,0xA5),
-     o3(0xEB,0xA7,0xA8), o3(0xEB,0xA7,0xAC),
-     o3(0xEB,0xA7,0xB4), o3(0xEB,0xA7,0xB5),
-     o3(0xEB,0xA7,0xB7), o3(0xEB,0xA7,0xB8),
-     o3(0xEB,0xA7,0xB9), o3(0xEB,0xA7,0xBA),
-     o3(0xEB,0xA8,0x80), o3(0xEB,0xA8,0x81),
-     o3(0xEB,0xA8,0x88), o3(0xEB,0xA8,0x95),
-     o3(0xEB,0xA8,0xB8), o3(0xEB,0xA8,0xB9),
-     o3(0xEB,0xA8,0xBC), o3(0xEB,0xA9,0x80),
-     o3(0xEB,0xA9,0x82), o3(0xEB,0xA9,0x88),
-     o3(0xEB,0xA9,0x89), o3(0xEB,0xA9,0x8B),
-     o3(0xEB,0xA9,0x8D), o3(0xEB,0xA9,0x8E),
-     o3(0xEB,0xA9,0x93), o3(0xEB,0xA9,0x94),
-     o3(0xEB,0xA9,0x95), o3(0xEB,0xA9,0x98),
-     o3(0xEB,0xA9,0x9C), o3(0xEB,0xA9,0xA4),
-     o3(0xEB,0xA9,0xA5), o3(0xEB,0xA9,0xA7),
-     o3(0xEB,0xA9,0xA8), o3(0xEB,0xA9,0xA9),
-     o3(0xEB,0xA9,0xB0), o3(0xEB,0xA9,0xB1),
-     o3(0xEB,0xA9,0xB4), o3(0xEB,0xA9,0xB8),
-     o3(0xEB,0xAA,0x83), o3(0xEB,0xAA,0x84),
-     o3(0xEB,0xAA,0x85), o3(0xEB,0xAA,0x87),
-     o3(0xEB,0xAA,0x8C), o3(0xEB,0xAA,0xA8),
-     o3(0xEB,0xAA,0xA9), o3(0xEB,0xAA,0xAB),
-     o3(0xEB,0xAA,0xAC), o3(0xEB,0xAA,0xB0),
-     o3(0xEB,0xAA,0xB2), o3(0xEB,0xAA,0xB8),
-     o3(0xEB,0xAA,0xB9), o3(0xEB,0xAA,0xBB),
-     o3(0xEB,0xAA,0xBD), o3(0xEB,0xAB,0x84),
-     o3(0xEB,0xAB,0x88), o3(0xEB,0xAB,0x98),
-     o3(0xEB,0xAB,0x99), o3(0xEB,0xAB,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B8 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_B9_infos[95] = {
-     o3(0xEB,0xAC,0x80), o3(0xEB,0xAC,0x84),
-     o3(0xEB,0xAC,0x8D), o3(0xEB,0xAC,0x8F),
-     o3(0xEB,0xAC,0x91), o3(0xEB,0xAC,0x98),
-     o3(0xEB,0xAC,0x9C), o3(0xEB,0xAC,0xA0),
-     o3(0xEB,0xAC,0xA9), o3(0xEB,0xAC,0xAB),
-     o3(0xEB,0xAC,0xB4), o3(0xEB,0xAC,0xB5),
-     o3(0xEB,0xAC,0xB6), o3(0xEB,0xAC,0xB8),
-     o3(0xEB,0xAC,0xBB), o3(0xEB,0xAC,0xBC),
-     o3(0xEB,0xAC,0xBD), o3(0xEB,0xAC,0xBE),
-     o3(0xEB,0xAD,0x84), o3(0xEB,0xAD,0x85),
-     o3(0xEB,0xAD,0x87), o3(0xEB,0xAD,0x89),
-     o3(0xEB,0xAD,0x8D), o3(0xEB,0xAD,0x8F),
-     o3(0xEB,0xAD,0x90), o3(0xEB,0xAD,0x94),
-     o3(0xEB,0xAD,0x98), o3(0xEB,0xAD,0xA1),
-     o3(0xEB,0xAD,0xA3), o3(0xEB,0xAD,0xAC),
-     o3(0xEB,0xAE,0x88), o3(0xEB,0xAE,0x8C),
-     o3(0xEB,0xAE,0x90), o3(0xEB,0xAE,0xA4),
-     o3(0xEB,0xAE,0xA8), o3(0xEB,0xAE,0xAC),
-     o3(0xEB,0xAE,0xB4), o3(0xEB,0xAE,0xB7),
-     o3(0xEB,0xAF,0x80), o3(0xEB,0xAF,0x84),
-     o3(0xEB,0xAF,0x88), o3(0xEB,0xAF,0x90),
-     o3(0xEB,0xAF,0x93), o3(0xEB,0xAF,0xB8),
-     o3(0xEB,0xAF,0xB9), o3(0xEB,0xAF,0xBC),
-     o3(0xEB,0xAF,0xBF), o3(0xEB,0xB0,0x80),
-     o3(0xEB,0xB0,0x82), o3(0xEB,0xB0,0x88),
-     o3(0xEB,0xB0,0x89), o3(0xEB,0xB0,0x8B),
-     o3(0xEB,0xB0,0x8C), o3(0xEB,0xB0,0x8D),
-     o3(0xEB,0xB0,0x8F), o3(0xEB,0xB0,0x91),
-     o3(0xEB,0xB0,0x94), o3(0xEB,0xB0,0x95),
-     o3(0xEB,0xB0,0x96), o3(0xEB,0xB0,0x97),
-     o3(0xEB,0xB0,0x98), o3(0xEB,0xB0,0x9B),
-     o3(0xEB,0xB0,0x9C), o3(0xEB,0xB0,0x9D),
-     o3(0xEB,0xB0,0x9E), o3(0xEB,0xB0,0x9F),
-     o3(0xEB,0xB0,0xA4), o3(0xEB,0xB0,0xA5),
-     o3(0xEB,0xB0,0xA7), o3(0xEB,0xB0,0xA9),
-     o3(0xEB,0xB0,0xAD), o3(0xEB,0xB0,0xB0),
-     o3(0xEB,0xB0,0xB1), o3(0xEB,0xB0,0xB4),
-     o3(0xEB,0xB0,0xB8), o3(0xEB,0xB1,0x80),
-     o3(0xEB,0xB1,0x81), o3(0xEB,0xB1,0x83),
-     o3(0xEB,0xB1,0x84), o3(0xEB,0xB1,0x85),
-     o3(0xEB,0xB1,0x89), o3(0xEB,0xB1,0x8C),
-     o3(0xEB,0xB1,0x8D), o3(0xEB,0xB1,0x90),
-     o3(0xEB,0xB1,0x9D), o3(0xEB,0xB2,0x84),
-     o3(0xEB,0xB2,0x85), o3(0xEB,0xB2,0x88),
-     o3(0xEB,0xB2,0x8B), o3(0xEB,0xB2,0x8C),
-     o3(0xEB,0xB2,0x8E), o3(0xEB,0xB2,0x94),
-     o3(0xEB,0xB2,0x95), o3(0xEB,0xB2,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_B9 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_B9_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BA_infos[95] = {
-     o3(0xEB,0xB2,0x99), o3(0xEB,0xB2,0x9A),
-     o3(0xEB,0xB2,0xA0), o3(0xEB,0xB2,0xA1),
-     o3(0xEB,0xB2,0xA4), o3(0xEB,0xB2,0xA7),
-     o3(0xEB,0xB2,0xA8), o3(0xEB,0xB2,0xB0),
-     o3(0xEB,0xB2,0xB1), o3(0xEB,0xB2,0xB3),
-     o3(0xEB,0xB2,0xB4), o3(0xEB,0xB2,0xB5),
-     o3(0xEB,0xB2,0xBC), o3(0xEB,0xB2,0xBD),
-     o3(0xEB,0xB3,0x80), o3(0xEB,0xB3,0x84),
-     o3(0xEB,0xB3,0x8D), o3(0xEB,0xB3,0x8F),
-     o3(0xEB,0xB3,0x90), o3(0xEB,0xB3,0x91),
-     o3(0xEB,0xB3,0x95), o3(0xEB,0xB3,0x98),
-     o3(0xEB,0xB3,0x9C), o3(0xEB,0xB3,0xB4),
-     o3(0xEB,0xB3,0xB5), o3(0xEB,0xB3,0xB6),
-     o3(0xEB,0xB3,0xB8), o3(0xEB,0xB3,0xBC),
-     o3(0xEB,0xB4,0x84), o3(0xEB,0xB4,0x85),
-     o3(0xEB,0xB4,0x87), o3(0xEB,0xB4,0x89),
-     o3(0xEB,0xB4,0x90), o3(0xEB,0xB4,0x94),
-     o3(0xEB,0xB4,0xA4), o3(0xEB,0xB4,0xAC),
-     o3(0xEB,0xB5,0x80), o3(0xEB,0xB5,0x88),
-     o3(0xEB,0xB5,0x89), o3(0xEB,0xB5,0x8C),
-     o3(0xEB,0xB5,0x90), o3(0xEB,0xB5,0x98),
-     o3(0xEB,0xB5,0x99), o3(0xEB,0xB5,0xA4),
-     o3(0xEB,0xB5,0xA8), o3(0xEB,0xB6,0x80),
-     o3(0xEB,0xB6,0x81), o3(0xEB,0xB6,0x84),
-     o3(0xEB,0xB6,0x87), o3(0xEB,0xB6,0x88),
-     o3(0xEB,0xB6,0x89), o3(0xEB,0xB6,0x8A),
-     o3(0xEB,0xB6,0x90), o3(0xEB,0xB6,0x91),
-     o3(0xEB,0xB6,0x93), o3(0xEB,0xB6,0x95),
-     o3(0xEB,0xB6,0x99), o3(0xEB,0xB6,0x9A),
-     o3(0xEB,0xB6,0x9C), o3(0xEB,0xB6,0xA4),
-     o3(0xEB,0xB6,0xB0), o3(0xEB,0xB6,0xB8),
-     o3(0xEB,0xB7,0x94), o3(0xEB,0xB7,0x95),
-     o3(0xEB,0xB7,0x98), o3(0xEB,0xB7,0x9C),
-     o3(0xEB,0xB7,0xA9), o3(0xEB,0xB7,0xB0),
-     o3(0xEB,0xB7,0xB4), o3(0xEB,0xB7,0xB8),
-     o3(0xEB,0xB8,0x80), o3(0xEB,0xB8,0x83),
-     o3(0xEB,0xB8,0x85), o3(0xEB,0xB8,0x8C),
-     o3(0xEB,0xB8,0x8D), o3(0xEB,0xB8,0x90),
-     o3(0xEB,0xB8,0x94), o3(0xEB,0xB8,0x9C),
-     o3(0xEB,0xB8,0x9D), o3(0xEB,0xB8,0x9F),
-     o3(0xEB,0xB9,0x84), o3(0xEB,0xB9,0x85),
-     o3(0xEB,0xB9,0x88), o3(0xEB,0xB9,0x8C),
-     o3(0xEB,0xB9,0x8E), o3(0xEB,0xB9,0x94),
-     o3(0xEB,0xB9,0x95), o3(0xEB,0xB9,0x97),
-     o3(0xEB,0xB9,0x99), o3(0xEB,0xB9,0x9A),
-     o3(0xEB,0xB9,0x9B), o3(0xEB,0xB9,0xA0),
-     o3(0xEB,0xB9,0xA1), o3(0xEB,0xB9,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BA = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BA_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BB_infos[95] = {
-     o3(0xEB,0xB9,0xA8), o3(0xEB,0xB9,0xAA),
-     o3(0xEB,0xB9,0xB0), o3(0xEB,0xB9,0xB1),
-     o3(0xEB,0xB9,0xB3), o3(0xEB,0xB9,0xB4),
-     o3(0xEB,0xB9,0xB5), o3(0xEB,0xB9,0xBB),
-     o3(0xEB,0xB9,0xBC), o3(0xEB,0xB9,0xBD),
-     o3(0xEB,0xBA,0x80), o3(0xEB,0xBA,0x84),
-     o3(0xEB,0xBA,0x8C), o3(0xEB,0xBA,0x8D),
-     o3(0xEB,0xBA,0x8F), o3(0xEB,0xBA,0x90),
-     o3(0xEB,0xBA,0x91), o3(0xEB,0xBA,0x98),
-     o3(0xEB,0xBA,0x99), o3(0xEB,0xBA,0xA8),
-     o3(0xEB,0xBB,0x90), o3(0xEB,0xBB,0x91),
-     o3(0xEB,0xBB,0x94), o3(0xEB,0xBB,0x97),
-     o3(0xEB,0xBB,0x98), o3(0xEB,0xBB,0xA0),
-     o3(0xEB,0xBB,0xA3), o3(0xEB,0xBB,0xA4),
-     o3(0xEB,0xBB,0xA5), o3(0xEB,0xBB,0xAC),
-     o3(0xEB,0xBC,0x81), o3(0xEB,0xBC,0x88),
-     o3(0xEB,0xBC,0x89), o3(0xEB,0xBC,0x98),
-     o3(0xEB,0xBC,0x99), o3(0xEB,0xBC,0x9B),
-     o3(0xEB,0xBC,0x9C), o3(0xEB,0xBC,0x9D),
-     o3(0xEB,0xBD,0x80), o3(0xEB,0xBD,0x81),
-     o3(0xEB,0xBD,0x84), o3(0xEB,0xBD,0x88),
-     o3(0xEB,0xBD,0x90), o3(0xEB,0xBD,0x91),
-     o3(0xEB,0xBD,0x95), o3(0xEB,0xBE,0x94),
-     o3(0xEB,0xBE,0xB0), o3(0xEB,0xBF,0x85),
-     o3(0xEB,0xBF,0x8C), o3(0xEB,0xBF,0x8D),
-     o3(0xEB,0xBF,0x90), o3(0xEB,0xBF,0x94),
-     o3(0xEB,0xBF,0x9C), o3(0xEB,0xBF,0x9F),
-     o3(0xEB,0xBF,0xA1), o3(0xEC,0x80,0xBC),
-     o3(0xEC,0x81,0x91), o3(0xEC,0x81,0x98),
-     o3(0xEC,0x81,0x9C), o3(0xEC,0x81,0xA0),
-     o3(0xEC,0x81,0xA8), o3(0xEC,0x81,0xA9),
-     o3(0xEC,0x82,0x90), o3(0xEC,0x82,0x91),
-     o3(0xEC,0x82,0x94), o3(0xEC,0x82,0x98),
-     o3(0xEC,0x82,0xA0), o3(0xEC,0x82,0xA1),
-     o3(0xEC,0x82,0xA3), o3(0xEC,0x82,0xA5),
-     o3(0xEC,0x82,0xAC), o3(0xEC,0x82,0xAD),
-     o3(0xEC,0x82,0xAF), o3(0xEC,0x82,0xB0),
-     o3(0xEC,0x82,0xB3), o3(0xEC,0x82,0xB4),
-     o3(0xEC,0x82,0xB5), o3(0xEC,0x82,0xB6),
-     o3(0xEC,0x82,0xBC), o3(0xEC,0x82,0xBD),
-     o3(0xEC,0x82,0xBF), o3(0xEC,0x83,0x80),
-     o3(0xEC,0x83,0x81), o3(0xEC,0x83,0x85),
-     o3(0xEC,0x83,0x88), o3(0xEC,0x83,0x89),
-     o3(0xEC,0x83,0x8C), o3(0xEC,0x83,0x90),
-     o3(0xEC,0x83,0x98), o3(0xEC,0x83,0x99),
-     o3(0xEC,0x83,0x9B), o3(0xEC,0x83,0x9C),
-     o3(0xEC,0x83,0x9D), o3(0xEC,0x83,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BB = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BB_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BC_infos[95] = {
-     o3(0xEC,0x83,0xA5), o3(0xEC,0x83,0xA8),
-     o3(0xEC,0x83,0xAC), o3(0xEC,0x83,0xB4),
-     o3(0xEC,0x83,0xB5), o3(0xEC,0x83,0xB7),
-     o3(0xEC,0x83,0xB9), o3(0xEC,0x84,0x80),
-     o3(0xEC,0x84,0x84), o3(0xEC,0x84,0x88),
-     o3(0xEC,0x84,0x90), o3(0xEC,0x84,0x95),
-     o3(0xEC,0x84,0x9C), o3(0xEC,0x84,0x9D),
-     o3(0xEC,0x84,0x9E), o3(0xEC,0x84,0x9F),
-     o3(0xEC,0x84,0xA0), o3(0xEC,0x84,0xA3),
-     o3(0xEC,0x84,0xA4), o3(0xEC,0x84,0xA6),
-     o3(0xEC,0x84,0xA7), o3(0xEC,0x84,0xAC),
-     o3(0xEC,0x84,0xAD), o3(0xEC,0x84,0xAF),
-     o3(0xEC,0x84,0xB0), o3(0xEC,0x84,0xB1),
-     o3(0xEC,0x84,0xB6), o3(0xEC,0x84,0xB8),
-     o3(0xEC,0x84,0xB9), o3(0xEC,0x84,0xBC),
-     o3(0xEC,0x85,0x80), o3(0xEC,0x85,0x88),
-     o3(0xEC,0x85,0x89), o3(0xEC,0x85,0x8B),
-     o3(0xEC,0x85,0x8C), o3(0xEC,0x85,0x8D),
-     o3(0xEC,0x85,0x94), o3(0xEC,0x85,0x95),
-     o3(0xEC,0x85,0x98), o3(0xEC,0x85,0x9C),
-     o3(0xEC,0x85,0xA4), o3(0xEC,0x85,0xA5),
-     o3(0xEC,0x85,0xA7), o3(0xEC,0x85,0xA8),
-     o3(0xEC,0x85,0xA9), o3(0xEC,0x85,0xB0),
-     o3(0xEC,0x85,0xB4), o3(0xEC,0x85,0xB8),
-     o3(0xEC,0x86,0x85), o3(0xEC,0x86,0x8C),
-     o3(0xEC,0x86,0x8D), o3(0xEC,0x86,0x8E),
-     o3(0xEC,0x86,0x90), o3(0xEC,0x86,0x94),
-     o3(0xEC,0x86,0x96), o3(0xEC,0x86,0x9C),
-     o3(0xEC,0x86,0x9D), o3(0xEC,0x86,0x9F),
-     o3(0xEC,0x86,0xA1), o3(0xEC,0x86,0xA5),
-     o3(0xEC,0x86,0xA8), o3(0xEC,0x86,0xA9),
-     o3(0xEC,0x86,0xAC), o3(0xEC,0x86,0xB0),
-     o3(0xEC,0x86,0xBD), o3(0xEC,0x87,0x84),
-     o3(0xEC,0x87,0x88), o3(0xEC,0x87,0x8C),
-     o3(0xEC,0x87,0x94), o3(0xEC,0x87,0x97),
-     o3(0xEC,0x87,0x98), o3(0xEC,0x87,0xA0),
-     o3(0xEC,0x87,0xA4), o3(0xEC,0x87,0xA8),
-     o3(0xEC,0x87,0xB0), o3(0xEC,0x87,0xB1),
-     o3(0xEC,0x87,0xB3), o3(0xEC,0x87,0xBC),
-     o3(0xEC,0x87,0xBD), o3(0xEC,0x88,0x80),
-     o3(0xEC,0x88,0x84), o3(0xEC,0x88,0x8C),
-     o3(0xEC,0x88,0x8D), o3(0xEC,0x88,0x8F),
-     o3(0xEC,0x88,0x91), o3(0xEC,0x88,0x98),
-     o3(0xEC,0x88,0x99), o3(0xEC,0x88,0x9C),
-     o3(0xEC,0x88,0x9F), o3(0xEC,0x88,0xA0),
-     o3(0xEC,0x88,0xA8), o3(0xEC,0x88,0xA9),
-     o3(0xEC,0x88,0xAB), o3(0xEC,0x88,0xAD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BC = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BD_infos[95] = {
-     o3(0xEC,0x88,0xAF), o3(0xEC,0x88,0xB1),
-     o3(0xEC,0x88,0xB2), o3(0xEC,0x88,0xB4),
-     o3(0xEC,0x89,0x88), o3(0xEC,0x89,0x90),
-     o3(0xEC,0x89,0x91), o3(0xEC,0x89,0x94),
-     o3(0xEC,0x89,0x98), o3(0xEC,0x89,0xA0),
-     o3(0xEC,0x89,0xA5), o3(0xEC,0x89,0xAC),
-     o3(0xEC,0x89,0xAD), o3(0xEC,0x89,0xB0),
-     o3(0xEC,0x89,0xB4), o3(0xEC,0x89,0xBC),
-     o3(0xEC,0x89,0xBD), o3(0xEC,0x89,0xBF),
-     o3(0xEC,0x8A,0x81), o3(0xEC,0x8A,0x88),
-     o3(0xEC,0x8A,0x89), o3(0xEC,0x8A,0x90),
-     o3(0xEC,0x8A,0x98), o3(0xEC,0x8A,0x9B),
-     o3(0xEC,0x8A,0x9D), o3(0xEC,0x8A,0xA4),
-     o3(0xEC,0x8A,0xA5), o3(0xEC,0x8A,0xA8),
-     o3(0xEC,0x8A,0xAC), o3(0xEC,0x8A,0xAD),
-     o3(0xEC,0x8A,0xB4), o3(0xEC,0x8A,0xB5),
-     o3(0xEC,0x8A,0xB7), o3(0xEC,0x8A,0xB9),
-     o3(0xEC,0x8B,0x9C), o3(0xEC,0x8B,0x9D),
-     o3(0xEC,0x8B,0xA0), o3(0xEC,0x8B,0xA3),
-     o3(0xEC,0x8B,0xA4), o3(0xEC,0x8B,0xAB),
-     o3(0xEC,0x8B,0xAC), o3(0xEC,0x8B,0xAD),
-     o3(0xEC,0x8B,0xAF), o3(0xEC,0x8B,0xB1),
-     o3(0xEC,0x8B,0xB6), o3(0xEC,0x8B,0xB8),
-     o3(0xEC,0x8B,0xB9), o3(0xEC,0x8B,0xBB),
-     o3(0xEC,0x8B,0xBC), o3(0xEC,0x8C,0x80),
-     o3(0xEC,0x8C,0x88), o3(0xEC,0x8C,0x89),
-     o3(0xEC,0x8C,0x8C), o3(0xEC,0x8C,0x8D),
-     o3(0xEC,0x8C,0x93), o3(0xEC,0x8C,0x94),
-     o3(0xEC,0x8C,0x95), o3(0xEC,0x8C,0x98),
-     o3(0xEC,0x8C,0x9C), o3(0xEC,0x8C,0xA4),
-     o3(0xEC,0x8C,0xA5), o3(0xEC,0x8C,0xA8),
-     o3(0xEC,0x8C,0xA9), o3(0xEC,0x8D,0x85),
-     o3(0xEC,0x8D,0xA8), o3(0xEC,0x8D,0xA9),
-     o3(0xEC,0x8D,0xAC), o3(0xEC,0x8D,0xB0),
-     o3(0xEC,0x8D,0xB2), o3(0xEC,0x8D,0xB8),
-     o3(0xEC,0x8D,0xB9), o3(0xEC,0x8D,0xBC),
-     o3(0xEC,0x8D,0xBD), o3(0xEC,0x8E,0x84),
-     o3(0xEC,0x8E,0x88), o3(0xEC,0x8E,0x8C),
-     o3(0xEC,0x8F,0x80), o3(0xEC,0x8F,0x98),
-     o3(0xEC,0x8F,0x99), o3(0xEC,0x8F,0x9C),
-     o3(0xEC,0x8F,0x9F), o3(0xEC,0x8F,0xA0),
-     o3(0xEC,0x8F,0xA2), o3(0xEC,0x8F,0xA8),
-     o3(0xEC,0x8F,0xA9), o3(0xEC,0x8F,0xAD),
-     o3(0xEC,0x8F,0xB4), o3(0xEC,0x8F,0xB5),
-     o3(0xEC,0x8F,0xB8), o3(0xEC,0x90,0x88),
-     o3(0xEC,0x90,0x90), o3(0xEC,0x90,0xA4),
-     o3(0xEC,0x90,0xAC), o3(0xEC,0x90,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BD = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BD_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BE_infos[95] = {
-     o3(0xEC,0x90,0xB4), o3(0xEC,0x90,0xBC),
-     o3(0xEC,0x90,0xBD), o3(0xEC,0x91,0x88),
-     o3(0xEC,0x91,0xA4), o3(0xEC,0x91,0xA5),
-     o3(0xEC,0x91,0xA8), o3(0xEC,0x91,0xAC),
-     o3(0xEC,0x91,0xB4), o3(0xEC,0x91,0xB5),
-     o3(0xEC,0x91,0xB9), o3(0xEC,0x92,0x80),
-     o3(0xEC,0x92,0x94), o3(0xEC,0x92,0x9C),
-     o3(0xEC,0x92,0xB8), o3(0xEC,0x92,0xBC),
-     o3(0xEC,0x93,0xA9), o3(0xEC,0x93,0xB0),
-     o3(0xEC,0x93,0xB1), o3(0xEC,0x93,0xB4),
-     o3(0xEC,0x93,0xB8), o3(0xEC,0x93,0xBA),
-     o3(0xEC,0x93,0xBF), o3(0xEC,0x94,0x80),
-     o3(0xEC,0x94,0x81), o3(0xEC,0x94,0x8C),
-     o3(0xEC,0x94,0x90), o3(0xEC,0x94,0x94),
-     o3(0xEC,0x94,0x9C), o3(0xEC,0x94,0xA8),
-     o3(0xEC,0x94,0xA9), o3(0xEC,0x94,0xAC),
-     o3(0xEC,0x94,0xB0), o3(0xEC,0x94,0xB8),
-     o3(0xEC,0x94,0xB9), o3(0xEC,0x94,0xBB),
-     o3(0xEC,0x94,0xBD), o3(0xEC,0x95,0x84),
-     o3(0xEC,0x95,0x85), o3(0xEC,0x95,0x88),
-     o3(0xEC,0x95,0x89), o3(0xEC,0x95,0x8A),
-     o3(0xEC,0x95,0x8C), o3(0xEC,0x95,0x8D),
-     o3(0xEC,0x95,0x8E), o3(0xEC,0x95,0x93),
-     o3(0xEC,0x95,0x94), o3(0xEC,0x95,0x95),
-     o3(0xEC,0x95,0x97), o3(0xEC,0x95,0x98),
-     o3(0xEC,0x95,0x99), o3(0xEC,0x95,0x9D),
-     o3(0xEC,0x95,0x9E), o3(0xEC,0x95,0xA0),
-     o3(0xEC,0x95,0xA1), o3(0xEC,0x95,0xA4),
-     o3(0xEC,0x95,0xA8), o3(0xEC,0x95,0xB0),
-     o3(0xEC,0x95,0xB1), o3(0xEC,0x95,0xB3),
-     o3(0xEC,0x95,0xB4), o3(0xEC,0x95,0xB5),
-     o3(0xEC,0x95,0xBC), o3(0xEC,0x95,0xBD),
-     o3(0xEC,0x96,0x80), o3(0xEC,0x96,0x84),
-     o3(0xEC,0x96,0x87), o3(0xEC,0x96,0x8C),
-     o3(0xEC,0x96,0x8D), o3(0xEC,0x96,0x8F),
-     o3(0xEC,0x96,0x91), o3(0xEC,0x96,0x95),
-     o3(0xEC,0x96,0x97), o3(0xEC,0x96,0x98),
-     o3(0xEC,0x96,0x9C), o3(0xEC,0x96,0xA0),
-     o3(0xEC,0x96,0xA9), o3(0xEC,0x96,0xB4),
-     o3(0xEC,0x96,0xB5), o3(0xEC,0x96,0xB8),
-     o3(0xEC,0x96,0xB9), o3(0xEC,0x96,0xBB),
-     o3(0xEC,0x96,0xBC), o3(0xEC,0x96,0xBD),
-     o3(0xEC,0x96,0xBE), o3(0xEC,0x97,0x84),
-     o3(0xEC,0x97,0x85), o3(0xEC,0x97,0x86),
-     o3(0xEC,0x97,0x87), o3(0xEC,0x97,0x88),
-     o3(0xEC,0x97,0x89), o3(0xEC,0x97,0x8A),
-     o3(0xEC,0x97,0x8C), o3(0xEC,0x97,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BE = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BE_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_BF_infos[95] = {
-     o3(0xEC,0x97,0x90), o3(0xEC,0x97,0x91),
-     o3(0xEC,0x97,0x94), o3(0xEC,0x97,0x98),
-     o3(0xEC,0x97,0xA0), o3(0xEC,0x97,0xA1),
-     o3(0xEC,0x97,0xA3), o3(0xEC,0x97,0xA5),
-     o3(0xEC,0x97,0xAC), o3(0xEC,0x97,0xAD),
-     o3(0xEC,0x97,0xAE), o3(0xEC,0x97,0xB0),
-     o3(0xEC,0x97,0xB4), o3(0xEC,0x97,0xB6),
-     o3(0xEC,0x97,0xB7), o3(0xEC,0x97,0xBC),
-     o3(0xEC,0x97,0xBD), o3(0xEC,0x97,0xBE),
-     o3(0xEC,0x97,0xBF), o3(0xEC,0x98,0x80),
-     o3(0xEC,0x98,0x81), o3(0xEC,0x98,0x85),
-     o3(0xEC,0x98,0x86), o3(0xEC,0x98,0x87),
-     o3(0xEC,0x98,0x88), o3(0xEC,0x98,0x8C),
-     o3(0xEC,0x98,0x90), o3(0xEC,0x98,0x98),
-     o3(0xEC,0x98,0x99), o3(0xEC,0x98,0x9B),
-     o3(0xEC,0x98,0x9C), o3(0xEC,0x98,0xA4),
-     o3(0xEC,0x98,0xA5), o3(0xEC,0x98,0xA8),
-     o3(0xEC,0x98,0xAC), o3(0xEC,0x98,0xAD),
-     o3(0xEC,0x98,0xAE), o3(0xEC,0x98,0xB0),
-     o3(0xEC,0x98,0xB3), o3(0xEC,0x98,0xB4),
-     o3(0xEC,0x98,0xB5), o3(0xEC,0x98,0xB7),
-     o3(0xEC,0x98,0xB9), o3(0xEC,0x98,0xBB),
-     o3(0xEC,0x99,0x80), o3(0xEC,0x99,0x81),
-     o3(0xEC,0x99,0x84), o3(0xEC,0x99,0x88),
-     o3(0xEC,0x99,0x90), o3(0xEC,0x99,0x91),
-     o3(0xEC,0x99,0x93), o3(0xEC,0x99,0x94),
-     o3(0xEC,0x99,0x95), o3(0xEC,0x99,0x9C),
-     o3(0xEC,0x99,0x9D), o3(0xEC,0x99,0xA0),
-     o3(0xEC,0x99,0xAC), o3(0xEC,0x99,0xAF),
-     o3(0xEC,0x99,0xB1), o3(0xEC,0x99,0xB8),
-     o3(0xEC,0x99,0xB9), o3(0xEC,0x99,0xBC),
-     o3(0xEC,0x9A,0x80), o3(0xEC,0x9A,0x88),
-     o3(0xEC,0x9A,0x89), o3(0xEC,0x9A,0x8B),
-     o3(0xEC,0x9A,0x8D), o3(0xEC,0x9A,0x94),
-     o3(0xEC,0x9A,0x95), o3(0xEC,0x9A,0x98),
-     o3(0xEC,0x9A,0x9C), o3(0xEC,0x9A,0xA4),
-     o3(0xEC,0x9A,0xA5), o3(0xEC,0x9A,0xA7),
-     o3(0xEC,0x9A,0xA9), o3(0xEC,0x9A,0xB0),
-     o3(0xEC,0x9A,0xB1), o3(0xEC,0x9A,0xB4),
-     o3(0xEC,0x9A,0xB8), o3(0xEC,0x9A,0xB9),
-     o3(0xEC,0x9A,0xBA), o3(0xEC,0x9B,0x80),
-     o3(0xEC,0x9B,0x81), o3(0xEC,0x9B,0x83),
-     o3(0xEC,0x9B,0x85), o3(0xEC,0x9B,0x8C),
-     o3(0xEC,0x9B,0x8D), o3(0xEC,0x9B,0x90),
-     o3(0xEC,0x9B,0x94), o3(0xEC,0x9B,0x9C),
-     o3(0xEC,0x9B,0x9D), o3(0xEC,0x9B,0xA0),
-     o3(0xEC,0x9B,0xA1), o3(0xEC,0x9B,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_BF = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_BF_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C0_infos[95] = {
-     o3(0xEC,0x9B,0xA9), o3(0xEC,0x9B,0xAC),
-     o3(0xEC,0x9B,0xB0), o3(0xEC,0x9B,0xB8),
-     o3(0xEC,0x9B,0xB9), o3(0xEC,0x9B,0xBD),
-     o3(0xEC,0x9C,0x84), o3(0xEC,0x9C,0x85),
-     o3(0xEC,0x9C,0x88), o3(0xEC,0x9C,0x8C),
-     o3(0xEC,0x9C,0x94), o3(0xEC,0x9C,0x95),
-     o3(0xEC,0x9C,0x97), o3(0xEC,0x9C,0x99),
-     o3(0xEC,0x9C,0xA0), o3(0xEC,0x9C,0xA1),
-     o3(0xEC,0x9C,0xA4), o3(0xEC,0x9C,0xA8),
-     o3(0xEC,0x9C,0xB0), o3(0xEC,0x9C,0xB1),
-     o3(0xEC,0x9C,0xB3), o3(0xEC,0x9C,0xB5),
-     o3(0xEC,0x9C,0xB7), o3(0xEC,0x9C,0xBC),
-     o3(0xEC,0x9C,0xBD), o3(0xEC,0x9D,0x80),
-     o3(0xEC,0x9D,0x84), o3(0xEC,0x9D,0x8A),
-     o3(0xEC,0x9D,0x8C), o3(0xEC,0x9D,0x8D),
-     o3(0xEC,0x9D,0x8F), o3(0xEC,0x9D,0x91),
-     o3(0xEC,0x9D,0x92), o3(0xEC,0x9D,0x93),
-     o3(0xEC,0x9D,0x94), o3(0xEC,0x9D,0x95),
-     o3(0xEC,0x9D,0x96), o3(0xEC,0x9D,0x97),
-     o3(0xEC,0x9D,0x98), o3(0xEC,0x9D,0x9C),
-     o3(0xEC,0x9D,0xA0), o3(0xEC,0x9D,0xA8),
-     o3(0xEC,0x9D,0xAB), o3(0xEC,0x9D,0xB4),
-     o3(0xEC,0x9D,0xB5), o3(0xEC,0x9D,0xB8),
-     o3(0xEC,0x9D,0xBC), o3(0xEC,0x9D,0xBD),
-     o3(0xEC,0x9D,0xBE), o3(0xEC,0x9E,0x83),
-     o3(0xEC,0x9E,0x84), o3(0xEC,0x9E,0x85),
-     o3(0xEC,0x9E,0x87), o3(0xEC,0x9E,0x88),
-     o3(0xEC,0x9E,0x89), o3(0xEC,0x9E,0x8A),
-     o3(0xEC,0x9E,0x8E), o3(0xEC,0x9E,0x90),
-     o3(0xEC,0x9E,0x91), o3(0xEC,0x9E,0x94),
-     o3(0xEC,0x9E,0x96), o3(0xEC,0x9E,0x97),
-     o3(0xEC,0x9E,0x98), o3(0xEC,0x9E,0x9A),
-     o3(0xEC,0x9E,0xA0), o3(0xEC,0x9E,0xA1),
-     o3(0xEC,0x9E,0xA3), o3(0xEC,0x9E,0xA4),
-     o3(0xEC,0x9E,0xA5), o3(0xEC,0x9E,0xA6),
-     o3(0xEC,0x9E,0xAC), o3(0xEC,0x9E,0xAD),
-     o3(0xEC,0x9E,0xB0), o3(0xEC,0x9E,0xB4),
-     o3(0xEC,0x9E,0xBC), o3(0xEC,0x9E,0xBD),
-     o3(0xEC,0x9E,0xBF), o3(0xEC,0x9F,0x80),
-     o3(0xEC,0x9F,0x81), o3(0xEC,0x9F,0x88),
-     o3(0xEC,0x9F,0x89), o3(0xEC,0x9F,0x8C),
-     o3(0xEC,0x9F,0x8E), o3(0xEC,0x9F,0x90),
-     o3(0xEC,0x9F,0x98), o3(0xEC,0x9F,0x9D),
-     o3(0xEC,0x9F,0xA4), o3(0xEC,0x9F,0xA8),
-     o3(0xEC,0x9F,0xAC), o3(0xEC,0xA0,0x80),
-     o3(0xEC,0xA0,0x81), o3(0xEC,0xA0,0x84),
-     o3(0xEC,0xA0,0x88), o3(0xEC,0xA0,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C0 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C0_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C1_infos[95] = {
-     o3(0xEC,0xA0,0x90), o3(0xEC,0xA0,0x91),
-     o3(0xEC,0xA0,0x93), o3(0xEC,0xA0,0x95),
-     o3(0xEC,0xA0,0x96), o3(0xEC,0xA0,0x9C),
-     o3(0xEC,0xA0,0x9D), o3(0xEC,0xA0,0xA0),
-     o3(0xEC,0xA0,0xA4), o3(0xEC,0xA0,0xAC),
-     o3(0xEC,0xA0,0xAD), o3(0xEC,0xA0,0xAF),
-     o3(0xEC,0xA0,0xB1), o3(0xEC,0xA0,0xB8),
-     o3(0xEC,0xA0,0xBC), o3(0xEC,0xA1,0x80),
-     o3(0xEC,0xA1,0x88), o3(0xEC,0xA1,0x89),
-     o3(0xEC,0xA1,0x8C), o3(0xEC,0xA1,0x8D),
-     o3(0xEC,0xA1,0x94), o3(0xEC,0xA1,0xB0),
-     o3(0xEC,0xA1,0xB1), o3(0xEC,0xA1,0xB4),
-     o3(0xEC,0xA1,0xB8), o3(0xEC,0xA1,0xBA),
-     o3(0xEC,0xA2,0x80), o3(0xEC,0xA2,0x81),
-     o3(0xEC,0xA2,0x83), o3(0xEC,0xA2,0x85),
-     o3(0xEC,0xA2,0x86), o3(0xEC,0xA2,0x87),
-     o3(0xEC,0xA2,0x8B), o3(0xEC,0xA2,0x8C),
-     o3(0xEC,0xA2,0x8D), o3(0xEC,0xA2,0x94),
-     o3(0xEC,0xA2,0x9D), o3(0xEC,0xA2,0x9F),
-     o3(0xEC,0xA2,0xA1), o3(0xEC,0xA2,0xA8),
-     o3(0xEC,0xA2,0xBC), o3(0xEC,0xA2,0xBD),
-     o3(0xEC,0xA3,0x84), o3(0xEC,0xA3,0x88),
-     o3(0xEC,0xA3,0x8C), o3(0xEC,0xA3,0x94),
-     o3(0xEC,0xA3,0x95), o3(0xEC,0xA3,0x97),
-     o3(0xEC,0xA3,0x99), o3(0xEC,0xA3,0xA0),
-     o3(0xEC,0xA3,0xA1), o3(0xEC,0xA3,0xA4),
-     o3(0xEC,0xA3,0xB5), o3(0xEC,0xA3,0xBC),
-     o3(0xEC,0xA3,0xBD), o3(0xEC,0xA4,0x80),
-     o3(0xEC,0xA4,0x84), o3(0xEC,0xA4,0x85),
-     o3(0xEC,0xA4,0x86), o3(0xEC,0xA4,0x8C),
-     o3(0xEC,0xA4,0x8D), o3(0xEC,0xA4,0x8F),
-     o3(0xEC,0xA4,0x91), o3(0xEC,0xA4,0x98),
-     o3(0xEC,0xA4,0xAC), o3(0xEC,0xA4,0xB4),
-     o3(0xEC,0xA5,0x90), o3(0xEC,0xA5,0x91),
-     o3(0xEC,0xA5,0x94), o3(0xEC,0xA5,0x98),
-     o3(0xEC,0xA5,0xA0), o3(0xEC,0xA5,0xA1),
-     o3(0xEC,0xA5,0xA3), o3(0xEC,0xA5,0xAC),
-     o3(0xEC,0xA5,0xB0), o3(0xEC,0xA5,0xB4),
-     o3(0xEC,0xA5,0xBC), o3(0xEC,0xA6,0x88),
-     o3(0xEC,0xA6,0x89), o3(0xEC,0xA6,0x8C),
-     o3(0xEC,0xA6,0x90), o3(0xEC,0xA6,0x98),
-     o3(0xEC,0xA6,0x99), o3(0xEC,0xA6,0x9B),
-     o3(0xEC,0xA6,0x9D), o3(0xEC,0xA7,0x80),
-     o3(0xEC,0xA7,0x81), o3(0xEC,0xA7,0x84),
-     o3(0xEC,0xA7,0x87), o3(0xEC,0xA7,0x88),
-     o3(0xEC,0xA7,0x8A), o3(0xEC,0xA7,0x90),
-     o3(0xEC,0xA7,0x91), o3(0xEC,0xA7,0x93),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C1_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C2_infos[95] = {
-     o3(0xEC,0xA7,0x95), o3(0xEC,0xA7,0x96),
-     o3(0xEC,0xA7,0x99), o3(0xEC,0xA7,0x9A),
-     o3(0xEC,0xA7,0x9C), o3(0xEC,0xA7,0x9D),
-     o3(0xEC,0xA7,0xA0), o3(0xEC,0xA7,0xA2),
-     o3(0xEC,0xA7,0xA4), o3(0xEC,0xA7,0xA7),
-     o3(0xEC,0xA7,0xAC), o3(0xEC,0xA7,0xAD),
-     o3(0xEC,0xA7,0xAF), o3(0xEC,0xA7,0xB0),
-     o3(0xEC,0xA7,0xB1), o3(0xEC,0xA7,0xB8),
-     o3(0xEC,0xA7,0xB9), o3(0xEC,0xA7,0xBC),
-     o3(0xEC,0xA8,0x80), o3(0xEC,0xA8,0x88),
-     o3(0xEC,0xA8,0x89), o3(0xEC,0xA8,0x8B),
-     o3(0xEC,0xA8,0x8C), o3(0xEC,0xA8,0x8D),
-     o3(0xEC,0xA8,0x94), o3(0xEC,0xA8,0x98),
-     o3(0xEC,0xA8,0xA9), o3(0xEC,0xA9,0x8C),
-     o3(0xEC,0xA9,0x8D), o3(0xEC,0xA9,0x90),
-     o3(0xEC,0xA9,0x94), o3(0xEC,0xA9,0x9C),
-     o3(0xEC,0xA9,0x9D), o3(0xEC,0xA9,0x9F),
-     o3(0xEC,0xA9,0xA0), o3(0xEC,0xA9,0xA1),
-     o3(0xEC,0xA9,0xA8), o3(0xEC,0xA9,0xBD),
-     o3(0xEC,0xAA,0x84), o3(0xEC,0xAA,0x98),
-     o3(0xEC,0xAA,0xBC), o3(0xEC,0xAA,0xBD),
-     o3(0xEC,0xAB,0x80), o3(0xEC,0xAB,0x84),
-     o3(0xEC,0xAB,0x8C), o3(0xEC,0xAB,0x8D),
-     o3(0xEC,0xAB,0x8F), o3(0xEC,0xAB,0x91),
-     o3(0xEC,0xAB,0x93), o3(0xEC,0xAB,0x98),
-     o3(0xEC,0xAB,0x99), o3(0xEC,0xAB,0xA0),
-     o3(0xEC,0xAB,0xAC), o3(0xEC,0xAB,0xB4),
-     o3(0xEC,0xAC,0x88), o3(0xEC,0xAC,0x90),
-     o3(0xEC,0xAC,0x94), o3(0xEC,0xAC,0x98),
-     o3(0xEC,0xAC,0xA0), o3(0xEC,0xAC,0xA1),
-     o3(0xEC,0xAD,0x81), o3(0xEC,0xAD,0x88),
-     o3(0xEC,0xAD,0x89), o3(0xEC,0xAD,0x8C),
-     o3(0xEC,0xAD,0x90), o3(0xEC,0xAD,0x98),
-     o3(0xEC,0xAD,0x99), o3(0xEC,0xAD,0x9D),
-     o3(0xEC,0xAD,0xA4), o3(0xEC,0xAD,0xB8),
-     o3(0xEC,0xAD,0xB9), o3(0xEC,0xAE,0x9C),
-     o3(0xEC,0xAE,0xB8), o3(0xEC,0xAF,0x94),
-     o3(0xEC,0xAF,0xA4), o3(0xEC,0xAF,0xA7),
-     o3(0xEC,0xAF,0xA9), o3(0xEC,0xB0,0x8C),
-     o3(0xEC,0xB0,0x8D), o3(0xEC,0xB0,0x90),
-     o3(0xEC,0xB0,0x94), o3(0xEC,0xB0,0x9C),
-     o3(0xEC,0xB0,0x9D), o3(0xEC,0xB0,0xA1),
-     o3(0xEC,0xB0,0xA2), o3(0xEC,0xB0,0xA7),
-     o3(0xEC,0xB0,0xA8), o3(0xEC,0xB0,0xA9),
-     o3(0xEC,0xB0,0xAC), o3(0xEC,0xB0,0xAE),
-     o3(0xEC,0xB0,0xB0), o3(0xEC,0xB0,0xB8),
-     o3(0xEC,0xB0,0xB9), o3(0xEC,0xB0,0xBB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C2 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C3_infos[95] = {
-     o3(0xEC,0xB0,0xBC), o3(0xEC,0xB0,0xBD),
-     o3(0xEC,0xB0,0xBE), o3(0xEC,0xB1,0x84),
-     o3(0xEC,0xB1,0x85), o3(0xEC,0xB1,0x88),
-     o3(0xEC,0xB1,0x8C), o3(0xEC,0xB1,0x94),
-     o3(0xEC,0xB1,0x95), o3(0xEC,0xB1,0x97),
-     o3(0xEC,0xB1,0x98), o3(0xEC,0xB1,0x99),
-     o3(0xEC,0xB1,0xA0), o3(0xEC,0xB1,0xA4),
-     o3(0xEC,0xB1,0xA6), o3(0xEC,0xB1,0xA8),
-     o3(0xEC,0xB1,0xB0), o3(0xEC,0xB1,0xB5),
-     o3(0xEC,0xB2,0x98), o3(0xEC,0xB2,0x99),
-     o3(0xEC,0xB2,0x9C), o3(0xEC,0xB2,0xA0),
-     o3(0xEC,0xB2,0xA8), o3(0xEC,0xB2,0xA9),
-     o3(0xEC,0xB2,0xAB), o3(0xEC,0xB2,0xAC),
-     o3(0xEC,0xB2,0xAD), o3(0xEC,0xB2,0xB4),
-     o3(0xEC,0xB2,0xB5), o3(0xEC,0xB2,0xB8),
-     o3(0xEC,0xB2,0xBC), o3(0xEC,0xB3,0x84),
-     o3(0xEC,0xB3,0x85), o3(0xEC,0xB3,0x87),
-     o3(0xEC,0xB3,0x89), o3(0xEC,0xB3,0x90),
-     o3(0xEC,0xB3,0x94), o3(0xEC,0xB3,0xA4),
-     o3(0xEC,0xB3,0xAC), o3(0xEC,0xB3,0xB0),
-     o3(0xEC,0xB4,0x81), o3(0xEC,0xB4,0x88),
-     o3(0xEC,0xB4,0x89), o3(0xEC,0xB4,0x8C),
-     o3(0xEC,0xB4,0x90), o3(0xEC,0xB4,0x98),
-     o3(0xEC,0xB4,0x99), o3(0xEC,0xB4,0x9B),
-     o3(0xEC,0xB4,0x9D), o3(0xEC,0xB4,0xA4),
-     o3(0xEC,0xB4,0xA8), o3(0xEC,0xB4,0xAC),
-     o3(0xEC,0xB4,0xB9), o3(0xEC,0xB5,0x9C),
-     o3(0xEC,0xB5,0xA0), o3(0xEC,0xB5,0xA4),
-     o3(0xEC,0xB5,0xAC), o3(0xEC,0xB5,0xAD),
-     o3(0xEC,0xB5,0xAF), o3(0xEC,0xB5,0xB1),
-     o3(0xEC,0xB5,0xB8), o3(0xEC,0xB6,0x88),
-     o3(0xEC,0xB6,0x94), o3(0xEC,0xB6,0x95),
-     o3(0xEC,0xB6,0x98), o3(0xEC,0xB6,0x9C),
-     o3(0xEC,0xB6,0xA4), o3(0xEC,0xB6,0xA5),
-     o3(0xEC,0xB6,0xA7), o3(0xEC,0xB6,0xA9),
-     o3(0xEC,0xB6,0xB0), o3(0xEC,0xB7,0x84),
-     o3(0xEC,0xB7,0x8C), o3(0xEC,0xB7,0x90),
-     o3(0xEC,0xB7,0xA8), o3(0xEC,0xB7,0xAC),
-     o3(0xEC,0xB7,0xB0), o3(0xEC,0xB7,0xB8),
-     o3(0xEC,0xB7,0xB9), o3(0xEC,0xB7,0xBB),
-     o3(0xEC,0xB7,0xBD), o3(0xEC,0xB8,0x84),
-     o3(0xEC,0xB8,0x88), o3(0xEC,0xB8,0x8C),
-     o3(0xEC,0xB8,0x94), o3(0xEC,0xB8,0x99),
-     o3(0xEC,0xB8,0xA0), o3(0xEC,0xB8,0xA1),
-     o3(0xEC,0xB8,0xA4), o3(0xEC,0xB8,0xA8),
-     o3(0xEC,0xB8,0xB0), o3(0xEC,0xB8,0xB1),
-     o3(0xEC,0xB8,0xB3), o3(0xEC,0xB8,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C4_infos[95] = {
-     o3(0xEC,0xB9,0x98), o3(0xEC,0xB9,0x99),
-     o3(0xEC,0xB9,0x9C), o3(0xEC,0xB9,0x9F),
-     o3(0xEC,0xB9,0xA0), o3(0xEC,0xB9,0xA1),
-     o3(0xEC,0xB9,0xA8), o3(0xEC,0xB9,0xA9),
-     o3(0xEC,0xB9,0xAB), o3(0xEC,0xB9,0xAD),
-     o3(0xEC,0xB9,0xB4), o3(0xEC,0xB9,0xB5),
-     o3(0xEC,0xB9,0xB8), o3(0xEC,0xB9,0xBC),
-     o3(0xEC,0xBA,0x84), o3(0xEC,0xBA,0x85),
-     o3(0xEC,0xBA,0x87), o3(0xEC,0xBA,0x89),
-     o3(0xEC,0xBA,0x90), o3(0xEC,0xBA,0x91),
-     o3(0xEC,0xBA,0x94), o3(0xEC,0xBA,0x98),
-     o3(0xEC,0xBA,0xA0), o3(0xEC,0xBA,0xA1),
-     o3(0xEC,0xBA,0xA3), o3(0xEC,0xBA,0xA4),
-     o3(0xEC,0xBA,0xA5), o3(0xEC,0xBA,0xAC),
-     o3(0xEC,0xBA,0xAD), o3(0xEC,0xBB,0x81),
-     o3(0xEC,0xBB,0xA4), o3(0xEC,0xBB,0xA5),
-     o3(0xEC,0xBB,0xA8), o3(0xEC,0xBB,0xAB),
-     o3(0xEC,0xBB,0xAC), o3(0xEC,0xBB,0xB4),
-     o3(0xEC,0xBB,0xB5), o3(0xEC,0xBB,0xB7),
-     o3(0xEC,0xBB,0xB8), o3(0xEC,0xBB,0xB9),
-     o3(0xEC,0xBC,0x80), o3(0xEC,0xBC,0x81),
-     o3(0xEC,0xBC,0x84), o3(0xEC,0xBC,0x88),
-     o3(0xEC,0xBC,0x90), o3(0xEC,0xBC,0x91),
-     o3(0xEC,0xBC,0x93), o3(0xEC,0xBC,0x95),
-     o3(0xEC,0xBC,0x9C), o3(0xEC,0xBC,0xA0),
-     o3(0xEC,0xBC,0xA4), o3(0xEC,0xBC,0xAC),
-     o3(0xEC,0xBC,0xAD), o3(0xEC,0xBC,0xAF),
-     o3(0xEC,0xBC,0xB0), o3(0xEC,0xBC,0xB1),
-     o3(0xEC,0xBC,0xB8), o3(0xEC,0xBD,0x94),
-     o3(0xEC,0xBD,0x95), o3(0xEC,0xBD,0x98),
-     o3(0xEC,0xBD,0x9C), o3(0xEC,0xBD,0xA4),
-     o3(0xEC,0xBD,0xA5), o3(0xEC,0xBD,0xA7),
-     o3(0xEC,0xBD,0xA9), o3(0xEC,0xBD,0xB0),
-     o3(0xEC,0xBD,0xB1), o3(0xEC,0xBD,0xB4),
-     o3(0xEC,0xBD,0xB8), o3(0xEC,0xBE,0x80),
-     o3(0xEC,0xBE,0x85), o3(0xEC,0xBE,0x8C),
-     o3(0xEC,0xBE,0xA1), o3(0xEC,0xBE,0xA8),
-     o3(0xEC,0xBE,0xB0), o3(0xEC,0xBF,0x84),
-     o3(0xEC,0xBF,0xA0), o3(0xEC,0xBF,0xA1),
-     o3(0xEC,0xBF,0xA4), o3(0xEC,0xBF,0xA8),
-     o3(0xEC,0xBF,0xB0), o3(0xEC,0xBF,0xB1),
-     o3(0xEC,0xBF,0xB3), o3(0xEC,0xBF,0xB5),
-     o3(0xEC,0xBF,0xBC), o3(0xED,0x80,0x80),
-     o3(0xED,0x80,0x84), o3(0xED,0x80,0x91),
-     o3(0xED,0x80,0x98), o3(0xED,0x80,0xAD),
-     o3(0xED,0x80,0xB4), o3(0xED,0x80,0xB5),
-     o3(0xED,0x80,0xB8), o3(0xED,0x80,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C4_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C5_infos[95] = {
-     o3(0xED,0x81,0x84), o3(0xED,0x81,0x85),
-     o3(0xED,0x81,0x87), o3(0xED,0x81,0x89),
-     o3(0xED,0x81,0x90), o3(0xED,0x81,0x94),
-     o3(0xED,0x81,0x98), o3(0xED,0x81,0xA0),
-     o3(0xED,0x81,0xAC), o3(0xED,0x81,0xAD),
-     o3(0xED,0x81,0xB0), o3(0xED,0x81,0xB4),
-     o3(0xED,0x81,0xBC), o3(0xED,0x81,0xBD),
-     o3(0xED,0x82,0x81), o3(0xED,0x82,0xA4),
-     o3(0xED,0x82,0xA5), o3(0xED,0x82,0xA8),
-     o3(0xED,0x82,0xAC), o3(0xED,0x82,0xB4),
-     o3(0xED,0x82,0xB5), o3(0xED,0x82,0xB7),
-     o3(0xED,0x82,0xB9), o3(0xED,0x83,0x80),
-     o3(0xED,0x83,0x81), o3(0xED,0x83,0x84),
-     o3(0xED,0x83,0x88), o3(0xED,0x83,0x89),
-     o3(0xED,0x83,0x90), o3(0xED,0x83,0x91),
-     o3(0xED,0x83,0x93), o3(0xED,0x83,0x94),
-     o3(0xED,0x83,0x95), o3(0xED,0x83,0x9C),
-     o3(0xED,0x83,0x9D), o3(0xED,0x83,0xA0),
-     o3(0xED,0x83,0xA4), o3(0xED,0x83,0xAC),
-     o3(0xED,0x83,0xAD), o3(0xED,0x83,0xAF),
-     o3(0xED,0x83,0xB0), o3(0xED,0x83,0xB1),
-     o3(0xED,0x83,0xB8), o3(0xED,0x84,0x8D),
-     o3(0xED,0x84,0xB0), o3(0xED,0x84,0xB1),
-     o3(0xED,0x84,0xB4), o3(0xED,0x84,0xB8),
-     o3(0xED,0x84,0xBA), o3(0xED,0x85,0x80),
-     o3(0xED,0x85,0x81), o3(0xED,0x85,0x83),
-     o3(0xED,0x85,0x84), o3(0xED,0x85,0x85),
-     o3(0xED,0x85,0x8C), o3(0xED,0x85,0x8D),
-     o3(0xED,0x85,0x90), o3(0xED,0x85,0x94),
-     o3(0xED,0x85,0x9C), o3(0xED,0x85,0x9D),
-     o3(0xED,0x85,0x9F), o3(0xED,0x85,0xA1),
-     o3(0xED,0x85,0xA8), o3(0xED,0x85,0xAC),
-     o3(0xED,0x85,0xBC), o3(0xED,0x86,0x84),
-     o3(0xED,0x86,0x88), o3(0xED,0x86,0xA0),
-     o3(0xED,0x86,0xA1), o3(0xED,0x86,0xA4),
-     o3(0xED,0x86,0xA8), o3(0xED,0x86,0xB0),
-     o3(0xED,0x86,0xB1), o3(0xED,0x86,0xB3),
-     o3(0xED,0x86,0xB5), o3(0xED,0x86,0xBA),
-     o3(0xED,0x86,0xBC), o3(0xED,0x87,0x80),
-     o3(0xED,0x87,0x98), o3(0xED,0x87,0xB4),
-     o3(0xED,0x87,0xB8), o3(0xED,0x88,0x87),
-     o3(0xED,0x88,0x89), o3(0xED,0x88,0x90),
-     o3(0xED,0x88,0xAC), o3(0xED,0x88,0xAD),
-     o3(0xED,0x88,0xB0), o3(0xED,0x88,0xB4),
-     o3(0xED,0x88,0xBC), o3(0xED,0x88,0xBD),
-     o3(0xED,0x88,0xBF), o3(0xED,0x89,0x81),
-     o3(0xED,0x89,0x88), o3(0xED,0x89,0x9C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C5 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C5_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C6_infos[95] = {
-     o3(0xED,0x89,0xA4), o3(0xED,0x8A,0x80),
-     o3(0xED,0x8A,0x81), o3(0xED,0x8A,0x84),
-     o3(0xED,0x8A,0x88), o3(0xED,0x8A,0x90),
-     o3(0xED,0x8A,0x91), o3(0xED,0x8A,0x95),
-     o3(0xED,0x8A,0x9C), o3(0xED,0x8A,0xA0),
-     o3(0xED,0x8A,0xA4), o3(0xED,0x8A,0xAC),
-     o3(0xED,0x8A,0xB1), o3(0xED,0x8A,0xB8),
-     o3(0xED,0x8A,0xB9), o3(0xED,0x8A,0xBC),
-     o3(0xED,0x8A,0xBF), o3(0xED,0x8B,0x80),
-     o3(0xED,0x8B,0x82), o3(0xED,0x8B,0x88),
-     o3(0xED,0x8B,0x89), o3(0xED,0x8B,0x8B),
-     o3(0xED,0x8B,0x94), o3(0xED,0x8B,0x98),
-     o3(0xED,0x8B,0x9C), o3(0xED,0x8B,0xA4),
-     o3(0xED,0x8B,0xA5), o3(0xED,0x8B,0xB0),
-     o3(0xED,0x8B,0xB1), o3(0xED,0x8B,0xB4),
-     o3(0xED,0x8B,0xB8), o3(0xED,0x8C,0x80),
-     o3(0xED,0x8C,0x81), o3(0xED,0x8C,0x83),
-     o3(0xED,0x8C,0x85), o3(0xED,0x8C,0x8C),
-     o3(0xED,0x8C,0x8D), o3(0xED,0x8C,0x8E),
-     o3(0xED,0x8C,0x90), o3(0xED,0x8C,0x94),
-     o3(0xED,0x8C,0x96), o3(0xED,0x8C,0x9C),
-     o3(0xED,0x8C,0x9D), o3(0xED,0x8C,0x9F),
-     o3(0xED,0x8C,0xA0), o3(0xED,0x8C,0xA1),
-     o3(0xED,0x8C,0xA5), o3(0xED,0x8C,0xA8),
-     o3(0xED,0x8C,0xA9), o3(0xED,0x8C,0xAC),
-     o3(0xED,0x8C,0xB0), o3(0xED,0x8C,0xB8),
-     o3(0xED,0x8C,0xB9), o3(0xED,0x8C,0xBB),
-     o3(0xED,0x8C,0xBC), o3(0xED,0x8C,0xBD),
-     o3(0xED,0x8D,0x84), o3(0xED,0x8D,0x85),
-     o3(0xED,0x8D,0xBC), o3(0xED,0x8D,0xBD),
-     o3(0xED,0x8E,0x80), o3(0xED,0x8E,0x84),
-     o3(0xED,0x8E,0x8C), o3(0xED,0x8E,0x8D),
-     o3(0xED,0x8E,0x8F), o3(0xED,0x8E,0x90),
-     o3(0xED,0x8E,0x91), o3(0xED,0x8E,0x98),
-     o3(0xED,0x8E,0x99), o3(0xED,0x8E,0x9C),
-     o3(0xED,0x8E,0xA0), o3(0xED,0x8E,0xA8),
-     o3(0xED,0x8E,0xA9), o3(0xED,0x8E,0xAB),
-     o3(0xED,0x8E,0xAD), o3(0xED,0x8E,0xB4),
-     o3(0xED,0x8E,0xB8), o3(0xED,0x8E,0xBC),
-     o3(0xED,0x8F,0x84), o3(0xED,0x8F,0x85),
-     o3(0xED,0x8F,0x88), o3(0xED,0x8F,0x89),
-     o3(0xED,0x8F,0x90), o3(0xED,0x8F,0x98),
-     o3(0xED,0x8F,0xA1), o3(0xED,0x8F,0xA3),
-     o3(0xED,0x8F,0xAC), o3(0xED,0x8F,0xAD),
-     o3(0xED,0x8F,0xB0), o3(0xED,0x8F,0xB4),
-     o3(0xED,0x8F,0xBC), o3(0xED,0x8F,0xBD),
-     o3(0xED,0x8F,0xBF), o3(0xED,0x90,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C6 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C6_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C7_infos[95] = {
-     o3(0xED,0x90,0x88), o3(0xED,0x90,0x9D),
-     o3(0xED,0x91,0x80), o3(0xED,0x91,0x84),
-     o3(0xED,0x91,0x9C), o3(0xED,0x91,0xA0),
-     o3(0xED,0x91,0xA4), o3(0xED,0x91,0xAD),
-     o3(0xED,0x91,0xAF), o3(0xED,0x91,0xB8),
-     o3(0xED,0x91,0xB9), o3(0xED,0x91,0xBC),
-     o3(0xED,0x91,0xBF), o3(0xED,0x92,0x80),
-     o3(0xED,0x92,0x82), o3(0xED,0x92,0x88),
-     o3(0xED,0x92,0x89), o3(0xED,0x92,0x8B),
-     o3(0xED,0x92,0x8D), o3(0xED,0x92,0x94),
-     o3(0xED,0x92,0xA9), o3(0xED,0x93,0x8C),
-     o3(0xED,0x93,0x90), o3(0xED,0x93,0x94),
-     o3(0xED,0x93,0x9C), o3(0xED,0x93,0x9F),
-     o3(0xED,0x93,0xA8), o3(0xED,0x93,0xAC),
-     o3(0xED,0x93,0xB0), o3(0xED,0x93,0xB8),
-     o3(0xED,0x93,0xBB), o3(0xED,0x93,0xBD),
-     o3(0xED,0x94,0x84), o3(0xED,0x94,0x88),
-     o3(0xED,0x94,0x8C), o3(0xED,0x94,0x94),
-     o3(0xED,0x94,0x95), o3(0xED,0x94,0x97),
-     o3(0xED,0x94,0xBC), o3(0xED,0x94,0xBD),
-     o3(0xED,0x95,0x80), o3(0xED,0x95,0x84),
-     o3(0xED,0x95,0x8C), o3(0xED,0x95,0x8D),
-     o3(0xED,0x95,0x8F), o3(0xED,0x95,0x91),
-     o3(0xED,0x95,0x98), o3(0xED,0x95,0x99),
-     o3(0xED,0x95,0x9C), o3(0xED,0x95,0xA0),
-     o3(0xED,0x95,0xA5), o3(0xED,0x95,0xA8),
-     o3(0xED,0x95,0xA9), o3(0xED,0x95,0xAB),
-     o3(0xED,0x95,0xAD), o3(0xED,0x95,0xB4),
-     o3(0xED,0x95,0xB5), o3(0xED,0x95,0xB8),
-     o3(0xED,0x95,0xBC), o3(0xED,0x96,0x84),
-     o3(0xED,0x96,0x85), o3(0xED,0x96,0x87),
-     o3(0xED,0x96,0x88), o3(0xED,0x96,0x89),
-     o3(0xED,0x96,0x90), o3(0xED,0x96,0xA5),
-     o3(0xED,0x97,0x88), o3(0xED,0x97,0x89),
-     o3(0xED,0x97,0x8C), o3(0xED,0x97,0x90),
-     o3(0xED,0x97,0x92), o3(0xED,0x97,0x98),
-     o3(0xED,0x97,0x99), o3(0xED,0x97,0x9B),
-     o3(0xED,0x97,0x9D), o3(0xED,0x97,0xA4),
-     o3(0xED,0x97,0xA5), o3(0xED,0x97,0xA8),
-     o3(0xED,0x97,0xAC), o3(0xED,0x97,0xB4),
-     o3(0xED,0x97,0xB5), o3(0xED,0x97,0xB7),
-     o3(0xED,0x97,0xB9), o3(0xED,0x98,0x80),
-     o3(0xED,0x98,0x81), o3(0xED,0x98,0x84),
-     o3(0xED,0x98,0x88), o3(0xED,0x98,0x90),
-     o3(0xED,0x98,0x91), o3(0xED,0x98,0x93),
-     o3(0xED,0x98,0x94), o3(0xED,0x98,0x95),
-     o3(0xED,0x98,0x9C), o3(0xED,0x98,0xA0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C7 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C7_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_C8_infos[95] = {
-     o3(0xED,0x98,0xA4), o3(0xED,0x98,0xAD),
-     o3(0xED,0x98,0xB8), o3(0xED,0x98,0xB9),
-     o3(0xED,0x98,0xBC), o3(0xED,0x99,0x80),
-     o3(0xED,0x99,0x85), o3(0xED,0x99,0x88),
-     o3(0xED,0x99,0x89), o3(0xED,0x99,0x8B),
-     o3(0xED,0x99,0x8D), o3(0xED,0x99,0x91),
-     o3(0xED,0x99,0x94), o3(0xED,0x99,0x95),
-     o3(0xED,0x99,0x98), o3(0xED,0x99,0x9C),
-     o3(0xED,0x99,0xA7), o3(0xED,0x99,0xA9),
-     o3(0xED,0x99,0xB0), o3(0xED,0x99,0xB1),
-     o3(0xED,0x99,0xB4), o3(0xED,0x9A,0x83),
-     o3(0xED,0x9A,0x85), o3(0xED,0x9A,0x8C),
-     o3(0xED,0x9A,0x8D), o3(0xED,0x9A,0x90),
-     o3(0xED,0x9A,0x94), o3(0xED,0x9A,0x9D),
-     o3(0xED,0x9A,0x9F), o3(0xED,0x9A,0xA1),
-     o3(0xED,0x9A,0xA8), o3(0xED,0x9A,0xAC),
-     o3(0xED,0x9A,0xB0), o3(0xED,0x9A,0xB9),
-     o3(0xED,0x9A,0xBB), o3(0xED,0x9B,0x84),
-     o3(0xED,0x9B,0x85), o3(0xED,0x9B,0x88),
-     o3(0xED,0x9B,0x8C), o3(0xED,0x9B,0x91),
-     o3(0xED,0x9B,0x94), o3(0xED,0x9B,0x97),
-     o3(0xED,0x9B,0x99), o3(0xED,0x9B,0xA0),
-     o3(0xED,0x9B,0xA4), o3(0xED,0x9B,0xA8),
-     o3(0xED,0x9B,0xB0), o3(0xED,0x9B,0xB5),
-     o3(0xED,0x9B,0xBC), o3(0xED,0x9B,0xBD),
-     o3(0xED,0x9C,0x80), o3(0xED,0x9C,0x84),
-     o3(0xED,0x9C,0x91), o3(0xED,0x9C,0x98),
-     o3(0xED,0x9C,0x99), o3(0xED,0x9C,0x9C),
-     o3(0xED,0x9C,0xA0), o3(0xED,0x9C,0xA8),
-     o3(0xED,0x9C,0xA9), o3(0xED,0x9C,0xAB),
-     o3(0xED,0x9C,0xAD), o3(0xED,0x9C,0xB4),
-     o3(0xED,0x9C,0xB5), o3(0xED,0x9C,0xB8),
-     o3(0xED,0x9C,0xBC), o3(0xED,0x9D,0x84),
-     o3(0xED,0x9D,0x87), o3(0xED,0x9D,0x89),
-     o3(0xED,0x9D,0x90), o3(0xED,0x9D,0x91),
-     o3(0xED,0x9D,0x94), o3(0xED,0x9D,0x96),
-     o3(0xED,0x9D,0x97), o3(0xED,0x9D,0x98),
-     o3(0xED,0x9D,0x99), o3(0xED,0x9D,0xA0),
-     o3(0xED,0x9D,0xA1), o3(0xED,0x9D,0xA3),
-     o3(0xED,0x9D,0xA5), o3(0xED,0x9D,0xA9),
-     o3(0xED,0x9D,0xAC), o3(0xED,0x9D,0xB0),
-     o3(0xED,0x9D,0xB4), o3(0xED,0x9D,0xBC),
-     o3(0xED,0x9D,0xBD), o3(0xED,0x9E,0x81),
-     o3(0xED,0x9E,0x88), o3(0xED,0x9E,0x89),
-     o3(0xED,0x9E,0x8C), o3(0xED,0x9E,0x90),
-     o3(0xED,0x9E,0x98), o3(0xED,0x9E,0x99),
-     o3(0xED,0x9E,0x9B), o3(0xED,0x9E,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_C8 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_C8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CA_infos[95] = {
-     o3(0xE4,0xBC,0xBD), o3(0xE4,0xBD,0xB3),
-     o3(0xE5,0x81,0x87), o3(0xE5,0x83,0xB9),
-     o3(0xE5,0x8A,0xA0), o3(0xE5,0x8F,0xAF),
-     o3(0xE5,0x91,0xB5), o3(0xE5,0x93,0xA5),
-     o3(0xE5,0x98,0x89), o3(0xE5,0xAB,0x81),
-     o3(0xE5,0xAE,0xB6), o3(0xE6,0x9A,0x87),
-     o3(0xE6,0x9E,0xB6), o3(0xE6,0x9E,0xB7),
-     o3(0xE6,0x9F,0xAF), o3(0xE6,0xAD,0x8C),
-     o3(0xE7,0x8F,0x82), o3(0xE7,0x97,0x82),
-     o3(0xE7,0xA8,0xBC), o3(0xE8,0x8B,0x9B),
-     o3(0xE8,0x8C,0x84), o3(0xE8,0xA1,0x97),
-     o3(0xE8,0xA2,0x88), o3(0xE8,0xA8,0xB6),
-     o3(0xE8,0xB3,0x88), o3(0xE8,0xB7,0x8F),
-     o3(0xE8,0xBB,0xBB), o3(0xE8,0xBF,0xA6),
-     o3(0xE9,0xA7,0x95), o3(0xE5,0x88,0xBB),
-     o3(0xE5,0x8D,0xB4), o3(0xE5,0x90,0x84),
-     o3(0xE6,0x81,0xAA), o3(0xE6,0x85,0xA4),
-     o3(0xE6,0xAE,0xBC), o3(0xE7,0x8F,0x8F),
-     o3(0xE8,0x84,0x9A), o3(0xE8,0xA6,0xBA),
-     o3(0xE8,0xA7,0x92), o3(0xE9,0x96,0xA3),
-     o3(0xE4,0xBE,0x83), o3(0xE5,0x88,0x8A),
-     o3(0xE5,0xA2,0xBE), o3(0xE5,0xA5,0xB8),
-     o3(0xE5,0xA7,0xA6), o3(0xE5,0xB9,0xB2),
-     o3(0xE5,0xB9,0xB9), o3(0xE6,0x87,0x87),
-     o3(0xE6,0x8F,0x80), o3(0xE6,0x9D,0x86),
-     o3(0xE6,0x9F,0xAC), o3(0xE6,0xA1,0xBF),
-     o3(0xE6,0xBE,0x97), o3(0xE7,0x99,0x8E),
-     o3(0xE7,0x9C,0x8B), o3(0xE7,0xA3,0xB5),
-     o3(0xE7,0xA8,0x88), o3(0xE7,0xAB,0xBF),
-     o3(0xE7,0xB0,0xA1), o3(0xE8,0x82,0x9D),
-     o3(0xE8,0x89,0xAE), o3(0xE8,0x89,0xB1),
-     o3(0xE8,0xAB,0xAB), o3(0xE9,0x96,0x93),
-     o3(0xE4,0xB9,0xAB), o3(0xE5,0x96,0x9D),
-     o3(0xE6,0x9B,0xB7), o3(0xE6,0xB8,0xB4),
-     o3(0xE7,0xA2,0xA3), o3(0xE7,0xAB,0xAD),
-     o3(0xE8,0x91,0x9B), o3(0xE8,0xA4,0x90),
-     o3(0xE8,0x9D,0x8E), o3(0xE9,0x9E,0xA8),
-     o3(0xE5,0x8B,0x98), o3(0xE5,0x9D,0x8E),
-     o3(0xE5,0xA0,0xAA), o3(0xE5,0xB5,0x8C),
-     o3(0xE6,0x84,0x9F), o3(0xE6,0x86,0xBE),
-     o3(0xE6,0x88,0xA1), o3(0xE6,0x95,0xA2),
-     o3(0xE6,0x9F,0x91), o3(0xE6,0xA9,0x84),
-     o3(0xE6,0xB8,0x9B), o3(0xE7,0x94,0x98),
-     o3(0xE7,0x96,0xB3), o3(0xE7,0x9B,0xA3),
-     o3(0xE7,0x9E,0xB0), o3(0xE7,0xB4,0xBA),
-     o3(0xE9,0x82,0xAF), o3(0xE9,0x91,0x91),
-     o3(0xE9,0x91,0x92), o3(0xE9,0xBE,0x95),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CA = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CA_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CB_infos[95] = {
-     o3(0xE5,0x8C,0xA3), o3(0xE5,0xB2,0xAC),
-     o3(0xE7,0x94,0xB2), o3(0xE8,0x83,0x9B),
-     o3(0xE9,0x89,0x80), o3(0xE9,0x96,0x98),
-     o3(0xE5,0x89,0x9B), o3(0xE5,0xA0,0x88),
-     o3(0xE5,0xA7,0x9C), o3(0xE5,0xB2,0xA1),
-     o3(0xE5,0xB4,0x97), o3(0xE5,0xBA,0xB7),
-     o3(0xE5,0xBC,0xBA), o3(0xE5,0xBD,0x8A),
-     o3(0xE6,0x85,0xB7), o3(0xE6,0xB1,0x9F),
-     o3(0xE7,0x95,0xBA), o3(0xE7,0x96,0x86),
-     o3(0xE7,0xB3,0xA0), o3(0xE7,0xB5,0xB3),
-     o3(0xE7,0xB6,0xB1), o3(0xE7,0xBE,0x8C),
-     o3(0xE8,0x85,0x94), o3(0xE8,0x88,0xA1),
-     o3(0xE8,0x96,0x91), o3(0xE8,0xA5,0x81),
-     o3(0xE8,0xAC,0x9B), o3(0xE9,0x8B,0xBC),
-     o3(0xE9,0x99,0x8D), o3(0xE9,0xB1,0x87),
-     o3(0xE4,0xBB,0x8B), o3(0xE4,0xBB,0xB7),
-     o3(0xE5,0x80,0x8B), o3(0xE5,0x87,0xB1),
-     o3(0xE5,0xA1,0x8F), o3(0xE6,0x84,0xB7),
-     o3(0xE6,0x84,0xBE), o3(0xE6,0x85,0xA8),
-     o3(0xE6,0x94,0xB9), o3(0xE6,0xA7,0xAA),
-     o3(0xE6,0xBC,0x91), o3(0xE7,0x96,0xA5),
-     o3(0xE7,0x9A,0x86), o3(0xE7,0x9B,0x96),
-     o3(0xE7,0xAE,0x87), o3(0xE8,0x8A,0xA5),
-     o3(0xE8,0x93,0x8B), o3(0xEF,0xA4,0x80),
-     o3(0xE9,0x8E,0xA7), o3(0xE9,0x96,0x8B),
-     o3(0xE5,0x96,0x80), o3(0xE5,0xAE,0xA2),
-     o3(0xE5,0x9D,0x91), o3(0xEF,0xA4,0x81),
-     o3(0xE7,0xB2,0xB3), o3(0xE7,0xBE,0xB9),
-     o3(0xE9,0x86,0xB5), o3(0xE5,0x80,0xA8),
-     o3(0xE5,0x8E,0xBB), o3(0xE5,0xB1,0x85),
-     o3(0xE5,0xB7,0xA8), o3(0xE6,0x8B,0x92),
-     o3(0xE6,0x8D,0xAE), o3(0xE6,0x93,0x9A),
-     o3(0xE6,0x93,0xA7), o3(0xE6,0xB8,0xA0),
-     o3(0xE7,0x82,0xAC), o3(0xE7,0xA5,0x9B),
-     o3(0xE8,0xB7,0x9D), o3(0xE8,0xB8,0x9E),
-     o3(0xEF,0xA4,0x82), o3(0xE9,0x81,0xBD),
-     o3(0xE9,0x89,0x85), o3(0xE9,0x8B,0xB8),
-     o3(0xE4,0xB9,0xBE), o3(0xE4,0xBB,0xB6),
-     o3(0xE5,0x81,0xA5), o3(0xE5,0xB7,0xBE),
-     o3(0xE5,0xBB,0xBA), o3(0xE6,0x84,0x86),
-     o3(0xE6,0xA5,0x97), o3(0xE8,0x85,0xB1),
-     o3(0xE8,0x99,0x94), o3(0xE8,0xB9,0x87),
-     o3(0xE9,0x8D,0xB5), o3(0xE9,0xA8,0xAB),
-     o3(0xE4,0xB9,0x9E), o3(0xE5,0x82,0x91),
-     o3(0xE6,0x9D,0xB0), o3(0xE6,0xA1,0x80),
-     o3(0xE5,0x84,0x89), o3(0xE5,0x8A,0x8D),
-     o3(0xE5,0x8A,0x92), o3(0xE6,0xAA,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CB = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CB_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CC_infos[95] = {
-     o3(0xE7,0x9E,0xBC), o3(0xE9,0x88,0x90),
-     o3(0xE9,0xBB,0x94), o3(0xE5,0x8A,0xAB),
-     o3(0xE6,0x80,0xAF), o3(0xE8,0xBF,0xB2),
-     o3(0xE5,0x81,0x88), o3(0xE6,0x86,0xA9),
-     o3(0xE6,0x8F,0xAD), o3(0xE6,0x93,0x8A),
-     o3(0xE6,0xA0,0xBC), o3(0xE6,0xAA,0x84),
-     o3(0xE6,0xBF,0x80), o3(0xE8,0x86,0x88),
-     o3(0xE8,0xA6,0xA1), o3(0xE9,0x9A,0x94),
-     o3(0xE5,0xA0,0x85), o3(0xE7,0x89,0xBD),
-     o3(0xE7,0x8A,0xAC), o3(0xE7,0x94,0x84),
-     o3(0xE7,0xB5,0xB9), o3(0xE7,0xB9,0xAD),
-     o3(0xE8,0x82,0xA9), o3(0xE8,0xA6,0x8B),
-     o3(0xE8,0xAD,0xB4), o3(0xE9,0x81,0xA3),
-     o3(0xE9,0xB5,0x91), o3(0xE6,0x8A,0x89),
-     o3(0xE6,0xB1,0xBA), o3(0xE6,0xBD,0x94),
-     o3(0xE7,0xB5,0x90), o3(0xE7,0xBC,0xBA),
-     o3(0xE8,0xA8,0xA3), o3(0xE5,0x85,0xBC),
-     o3(0xE6,0x85,0x8A), o3(0xE7,0xAE,0x9D),
-     o3(0xE8,0xAC,0x99), o3(0xE9,0x89,0x97),
-     o3(0xE9,0x8E,0x8C), o3(0xE4,0xBA,0xAC),
-     o3(0xE4,0xBF,0x93), o3(0xE5,0x80,0x9E),
-     o3(0xE5,0x82,0xBE), o3(0xE5,0x84,0x86),
-     o3(0xE5,0x8B,0x81), o3(0xE5,0x8B,0x8D),
-     o3(0xE5,0x8D,0xBF), o3(0xE5,0x9D,0xB0),
-     o3(0xE5,0xA2,0x83), o3(0xE5,0xBA,0x9A),
-     o3(0xE5,0xBE,0x91), o3(0xE6,0x85,0xB6),
-     o3(0xE6,0x86,0xAC), o3(0xE6,0x93,0x8E),
-     o3(0xE6,0x95,0xAC), o3(0xE6,0x99,0xAF),
-     o3(0xE6,0x9A,0xBB), o3(0xE6,0x9B,0xB4),
-     o3(0xE6,0xA2,0x97), o3(0xE6,0xB6,0x87),
-     o3(0xE7,0x82,0x85), o3(0xE7,0x83,0xB1),
-     o3(0xE7,0x92,0x9F), o3(0xE7,0x92,0xA5),
-     o3(0xE7,0x93,0x8A), o3(0xE7,0x97,0x99),
-     o3(0xE7,0xA1,0xAC), o3(0xE7,0xA3,0xAC),
-     o3(0xE7,0xAB,0x9F), o3(0xE7,0xAB,0xB6),
-     o3(0xE7,0xB5,0x85), o3(0xE7,0xB6,0x93),
-     o3(0xE8,0x80,0x95), o3(0xE8,0x80,0xBF),
-     o3(0xE8,0x84,0x9B), o3(0xE8,0x8E,0x96),
-     o3(0xE8,0xAD,0xA6), o3(0xE8,0xBC,0x95),
-     o3(0xE9,0x80,0x95), o3(0xE9,0x8F,0xA1),
-     o3(0xE9,0xA0,0x83), o3(0xE9,0xA0,0xB8),
-     o3(0xE9,0xA9,0x9A), o3(0xE9,0xAF,0xA8),
-     o3(0xE4,0xBF,0x82), o3(0xE5,0x95,0x93),
-     o3(0xE5,0xA0,0xBA), o3(0xE5,0xA5,0x91),
-     o3(0xE5,0xAD,0xA3), o3(0xE5,0xB1,0x86),
-     o3(0xE6,0x82,0xB8), o3(0xE6,0x88,0x92),
-     o3(0xE6,0xA1,0x82), o3(0xE6,0xA2,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CC = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CD_infos[95] = {
-     o3(0xE6,0xA3,0xA8), o3(0xE6,0xBA,0xAA),
-     o3(0xE7,0x95,0x8C), o3(0xE7,0x99,0xB8),
-     o3(0xE7,0xA3,0x8E), o3(0xE7,0xA8,0xBD),
-     o3(0xE7,0xB3,0xBB), o3(0xE7,0xB9,0xAB),
-     o3(0xE7,0xB9,0xBC), o3(0xE8,0xA8,0x88),
-     o3(0xE8,0xAA,0xA1), o3(0xE8,0xB0,0xBF),
-     o3(0xE9,0x9A,0x8E), o3(0xE9,0xB7,0x84),
-     o3(0xE5,0x8F,0xA4), o3(0xE5,0x8F,0xA9),
-     o3(0xE5,0x91,0x8A), o3(0xE5,0x91,0xB1),
-     o3(0xE5,0x9B,0xBA), o3(0xE5,0xA7,0x91),
-     o3(0xE5,0xAD,0xA4), o3(0xE5,0xB0,0xBB),
-     o3(0xE5,0xBA,0xAB), o3(0xE6,0x8B,0xB7),
-     o3(0xE6,0x94,0xB7), o3(0xE6,0x95,0x85),
-     o3(0xE6,0x95,0xB2), o3(0xE6,0x9A,0xA0),
-     o3(0xE6,0x9E,0xAF), o3(0xE6,0xA7,0x81),
-     o3(0xE6,0xB2,0xBD), o3(0xE7,0x97,0xBC),
-     o3(0xE7,0x9A,0x90), o3(0xE7,0x9D,0xBE),
-     o3(0xE7,0xA8,0xBF), o3(0xE7,0xBE,0x94),
-     o3(0xE8,0x80,0x83), o3(0xE8,0x82,0xA1),
-     o3(0xE8,0x86,0x8F), o3(0xE8,0x8B,0xA6),
-     o3(0xE8,0x8B,0xBD), o3(0xE8,0x8F,0xB0),
-     o3(0xE8,0x97,0x81), o3(0xE8,0xA0,0xB1),
-     o3(0xE8,0xA2,0xB4), o3(0xE8,0xAA,0xA5),
-     o3(0xEF,0xA4,0x83), o3(0xE8,0xBE,0x9C),
-     o3(0xE9,0x8C,0xAE), o3(0xE9,0x9B,0x87),
-     o3(0xE9,0xA1,0xA7), o3(0xE9,0xAB,0x98),
-     o3(0xE9,0xBC,0x93), o3(0xE5,0x93,0xAD),
-     o3(0xE6,0x96,0x9B), o3(0xE6,0x9B,0xB2),
-     o3(0xE6,0xA2,0x8F), o3(0xE7,0xA9,0x80),
-     o3(0xE8,0xB0,0xB7), o3(0xE9,0xB5,0xA0),
-     o3(0xE5,0x9B,0xB0), o3(0xE5,0x9D,0xA4),
-     o3(0xE5,0xB4,0x91), o3(0xE6,0x98,0x86),
-     o3(0xE6,0xA2,0xB1), o3(0xE6,0xA3,0x8D),
-     o3(0xE6,0xBB,0xBE), o3(0xE7,0x90,0xA8),
-     o3(0xE8,0xA2,0x9E), o3(0xE9,0xAF,0xA4),
-     o3(0xE6,0xB1,0xA8), o3(0xEF,0xA4,0x84),
-     o3(0xE9,0xAA,0xA8), o3(0xE4,0xBE,0x9B),
-     o3(0xE5,0x85,0xAC), o3(0xE5,0x85,0xB1),
-     o3(0xE5,0x8A,0x9F), o3(0xE5,0xAD,0x94),
-     o3(0xE5,0xB7,0xA5), o3(0xE6,0x81,0x90),
-     o3(0xE6,0x81,0xAD), o3(0xE6,0x8B,0xB1),
-     o3(0xE6,0x8E,0xA7), o3(0xE6,0x94,0xBB),
-     o3(0xE7,0x8F,0x99), o3(0xE7,0xA9,0xBA),
-     o3(0xE8,0x9A,0xA3), o3(0xE8,0xB2,0xA2),
-     o3(0xE9,0x9E,0x8F), o3(0xE4,0xB8,0xB2),
-     o3(0xE5,0xAF,0xA1), o3(0xE6,0x88,0x88),
-     o3(0xE6,0x9E,0x9C), o3(0xE7,0x93,0x9C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CD = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CD_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CE_infos[95] = {
-     o3(0xE7,0xA7,0x91), o3(0xE8,0x8F,0x93),
-     o3(0xE8,0xAA,0x87), o3(0xE8,0xAA,0xB2),
-     o3(0xE8,0xB7,0xA8), o3(0xE9,0x81,0x8E),
-     o3(0xE9,0x8D,0x8B), o3(0xE9,0xA1,0x86),
-     o3(0xE5,0xBB,0x93), o3(0xE6,0xA7,0xA8),
-     o3(0xE8,0x97,0xBF), o3(0xE9,0x83,0xAD),
-     o3(0xEF,0xA4,0x85), o3(0xE5,0x86,0xA0),
-     o3(0xE5,0xAE,0x98), o3(0xE5,0xAF,0xAC),
-     o3(0xE6,0x85,0xA3), o3(0xE6,0xA3,0xBA),
-     o3(0xE6,0xAC,0xBE), o3(0xE7,0x81,0x8C),
-     o3(0xE7,0x90,0xAF), o3(0xE7,0x93,0x98),
-     o3(0xE7,0xAE,0xA1), o3(0xE7,0xBD,0x90),
-     o3(0xE8,0x8F,0x85), o3(0xE8,0xA7,0x80),
-     o3(0xE8,0xB2,0xAB), o3(0xE9,0x97,0x9C),
-     o3(0xE9,0xA4,0xA8), o3(0xE5,0x88,0xAE),
-     o3(0xE6,0x81,0x9D), o3(0xE6,0x8B,0xAC),
-     o3(0xE9,0x80,0x82), o3(0xE4,0xBE,0x8A),
-     o3(0xE5,0x85,0x89), o3(0xE5,0x8C,0xA1),
-     o3(0xE5,0xA3,0x99), o3(0xE5,0xBB,0xA3),
-     o3(0xE6,0x9B,0xA0), o3(0xE6,0xB4,0xB8),
-     o3(0xE7,0x82,0x9A), o3(0xE7,0x8B,0x82),
-     o3(0xE7,0x8F,0x96), o3(0xE7,0xAD,0x90),
-     o3(0xE8,0x83,0xB1), o3(0xE9,0x91,0x9B),
-     o3(0xE5,0x8D,0xA6), o3(0xE6,0x8E,0x9B),
-     o3(0xE7,0xBD,0xAB), o3(0xE4,0xB9,0x96),
-     o3(0xE5,0x82,0x80), o3(0xE5,0xA1,0x8A),
-     o3(0xE5,0xA3,0x9E), o3(0xE6,0x80,0xAA),
-     o3(0xE6,0x84,0xA7), o3(0xE6,0x8B,0x90),
-     o3(0xE6,0xA7,0x90), o3(0xE9,0xAD,0x81),
-     o3(0xE5,0xAE,0x8F), o3(0xE7,0xB4,0x98),
-     o3(0xE8,0x82,0xB1), o3(0xE8,0xBD,0x9F),
-     o3(0xE4,0xBA,0xA4), o3(0xE5,0x83,0x91),
-     o3(0xE5,0x92,0xAC), o3(0xE5,0x96,0xAC),
-     o3(0xE5,0xAC,0x8C), o3(0xE5,0xB6,0xA0),
-     o3(0xE5,0xB7,0xA7), o3(0xE6,0x94,0xAA),
-     o3(0xE6,0x95,0x8E), o3(0xE6,0xA0,0xA1),
-     o3(0xE6,0xA9,0x8B), o3(0xE7,0x8B,0xA1),
-     o3(0xE7,0x9A,0x8E), o3(0xE7,0x9F,0xAF),
-     o3(0xE7,0xB5,0x9E), o3(0xE7,0xBF,0xB9),
-     o3(0xE8,0x86,0xA0), o3(0xE8,0x95,0x8E),
-     o3(0xE8,0x9B,0x9F), o3(0xE8,0xBC,0x83),
-     o3(0xE8,0xBD,0x8E), o3(0xE9,0x83,0x8A),
-     o3(0xE9,0xA4,0x83), o3(0xE9,0xA9,0x95),
-     o3(0xE9,0xAE,0xAB), o3(0xE4,0xB8,0x98),
-     o3(0xE4,0xB9,0x85), o3(0xE4,0xB9,0x9D),
-     o3(0xE4,0xBB,0x87), o3(0xE4,0xBF,0xB1),
-     o3(0xE5,0x85,0xB7), o3(0xE5,0x8B,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CE = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CE_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_CF_infos[95] = {
-     o3(0xE5,0x8D,0x80), o3(0xE5,0x8F,0xA3),
-     o3(0xE5,0x8F,0xA5), o3(0xE5,0x92,0x8E),
-     o3(0xE5,0x98,0x94), o3(0xE5,0x9D,0xB5),
-     o3(0xE5,0x9E,0xA2), o3(0xE5,0xAF,0x87),
-     o3(0xE5,0xB6,0x87), o3(0xE5,0xBB,0x90),
-     o3(0xE6,0x87,0xBC), o3(0xE6,0x8B,0x98),
-     o3(0xE6,0x95,0x91), o3(0xE6,0x9E,0xB8),
-     o3(0xE6,0x9F,0xA9), o3(0xE6,0xA7,0x8B),
-     o3(0xE6,0xAD,0x90), o3(0xE6,0xAF,0x86),
-     o3(0xE6,0xAF,0xAC), o3(0xE6,0xB1,0x82),
-     o3(0xE6,0xBA,0x9D), o3(0xE7,0x81,0xB8),
-     o3(0xE7,0x8B,0x97), o3(0xE7,0x8E,0x96),
-     o3(0xE7,0x90,0x83), o3(0xE7,0x9E,0xBF),
-     o3(0xE7,0x9F,0xA9), o3(0xE7,0xA9,0xB6),
-     o3(0xE7,0xB5,0xBF), o3(0xE8,0x80,0x89),
-     o3(0xE8,0x87,0xBC), o3(0xE8,0x88,0x85),
-     o3(0xE8,0x88,0x8A), o3(0xE8,0x8B,0x9F),
-     o3(0xE8,0xA1,0xA2), o3(0xE8,0xAC,0xB3),
-     o3(0xE8,0xB3,0xBC), o3(0xE8,0xBB,0x80),
-     o3(0xE9,0x80,0x91), o3(0xE9,0x82,0xB1),
-     o3(0xE9,0x89,0xA4), o3(0xE9,0x8A,0xB6),
-     o3(0xE9,0xA7,0x92), o3(0xE9,0xA9,0x85),
-     o3(0xE9,0xB3,0xA9), o3(0xE9,0xB7,0x97),
-     o3(0xE9,0xBE,0x9C), o3(0xE5,0x9C,0x8B),
-     o3(0xE5,0xB1,0x80), o3(0xE8,0x8F,0x8A),
-     o3(0xE9,0x9E,0xA0), o3(0xE9,0x9E,0xAB),
-     o3(0xE9,0xBA,0xB4), o3(0xE5,0x90,0x9B),
-     o3(0xE7,0xAA,0x98), o3(0xE7,0xBE,0xA4),
-     o3(0xE8,0xA3,0x99), o3(0xE8,0xBB,0x8D),
-     o3(0xE9,0x83,0xA1), o3(0xE5,0xA0,0x80),
-     o3(0xE5,0xB1,0x88), o3(0xE6,0x8E,0x98),
-     o3(0xE7,0xAA,0x9F), o3(0xE5,0xAE,0xAE),
-     o3(0xE5,0xBC,0x93), o3(0xE7,0xA9,0xB9),
-     o3(0xE7,0xAA,0xAE), o3(0xE8,0x8A,0x8E),
-     o3(0xE8,0xBA,0xAC), o3(0xE5,0x80,0xA6),
-     o3(0xE5,0x88,0xB8), o3(0xE5,0x8B,0xB8),
-     o3(0xE5,0x8D,0xB7), o3(0xE5,0x9C,0x88),
-     o3(0xE6,0x8B,0xB3), o3(0xE6,0x8D,0xB2),
-     o3(0xE6,0xAC,0x8A), o3(0xE6,0xB7,0x83),
-     o3(0xE7,0x9C,0xB7), o3(0xE5,0x8E,0xA5),
-     o3(0xE7,0x8D,0x97), o3(0xE8,0x95,0xA8),
-     o3(0xE8,0xB9,0xB6), o3(0xE9,0x97,0x95),
-     o3(0xE6,0x9C,0xBA), o3(0xE6,0xAB,0x83),
-     o3(0xE6,0xBD,0xB0), o3(0xE8,0xA9,0xAD),
-     o3(0xE8,0xBB,0x8C), o3(0xE9,0xA5,0x8B),
-     o3(0xEF,0xA4,0x86), o3(0xE6,0x99,0xB7),
-     o3(0xE6,0xAD,0xB8), o3(0xE8,0xB2,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_CF = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_CF_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D0_infos[95] = {
-     o3(0xE9,0xAC,0xBC), o3(0xEF,0xA4,0x87),
-     o3(0xE5,0x8F,0xAB), o3(0xE5,0x9C,0xAD),
-     o3(0xE5,0xA5,0x8E), o3(0xE6,0x8F,0x86),
-     o3(0xE6,0xA7,0xBB), o3(0xE7,0x8F,0xAA),
-     o3(0xE7,0xA1,0x85), o3(0xE7,0xAA,0xBA),
-     o3(0xE7,0xAB,0x85), o3(0xE7,0xB3,0xBE),
-     o3(0xE8,0x91,0xB5), o3(0xE8,0xA6,0x8F),
-     o3(0xE8,0xB5,0xB3), o3(0xE9,0x80,0xB5),
-     o3(0xE9,0x96,0xA8), o3(0xE5,0x8B,0xBB),
-     o3(0xE5,0x9D,0x87), o3(0xE7,0x95,0x87),
-     o3(0xE7,0xAD,0xA0), o3(0xE8,0x8F,0x8C),
-     o3(0xE9,0x88,0x9E), o3(0xEF,0xA4,0x88),
-     o3(0xE6,0xA9,0x98), o3(0xE5,0x85,0x8B),
-     o3(0xE5,0x89,0x8B), o3(0xE5,0x8A,0x87),
-     o3(0xE6,0x88,0x9F), o3(0xE6,0xA3,0x98),
-     o3(0xE6,0xA5,0xB5), o3(0xE9,0x9A,0x99),
-     o3(0xE5,0x83,0x85), o3(0xE5,0x8A,0xA4),
-     o3(0xE5,0x8B,0xA4), o3(0xE6,0x87,0x83),
-     o3(0xE6,0x96,0xA4), o3(0xE6,0xA0,0xB9),
-     o3(0xE6,0xA7,0xBF), o3(0xE7,0x91,0xBE),
-     o3(0xE7,0xAD,0x8B), o3(0xE8,0x8A,0xB9),
-     o3(0xE8,0x8F,0xAB), o3(0xE8,0xA6,0xB2),
-     o3(0xE8,0xAC,0xB9), o3(0xE8,0xBF,0x91),
-     o3(0xE9,0xA5,0x89), o3(0xEF,0xA4,0x89),
-     o3(0xE4,0xBB,0x8A), o3(0xE5,0xA6,0x97),
-     o3(0xE6,0x93,0x92), o3(0xE6,0x98,0x91),
-     o3(0xE6,0xAA,0x8E), o3(0xE7,0x90,0xB4),
-     o3(0xE7,0xA6,0x81), o3(0xE7,0xA6,0xBD),
-     o3(0xE8,0x8A,0xA9), o3(0xE8,0xA1,0xBE),
-     o3(0xE8,0xA1,0xBF), o3(0xE8,0xA5,0x9F),
-     o3(0xEF,0xA4,0x8A), o3(0xE9,0x8C,0xA6),
-     o3(0xE4,0xBC,0x8B), o3(0xE5,0x8F,0x8A),
-     o3(0xE6,0x80,0xA5), o3(0xE6,0x89,0xB1),
-     o3(0xE6,0xB1,0xB2), o3(0xE7,0xB4,0x9A),
-     o3(0xE7,0xB5,0xA6), o3(0xE4,0xBA,0x98),
-     o3(0xE5,0x85,0xA2), o3(0xE7,0x9F,0x9C),
-     o3(0xE8,0x82,0xAF), o3(0xE4,0xBC,0x81),
-     o3(0xE4,0xBC,0x8E), o3(0xE5,0x85,0xB6),
-     o3(0xE5,0x86,0x80), o3(0xE5,0x97,0x9C),
-     o3(0xE5,0x99,0xA8), o3(0xE5,0x9C,0xBB),
-     o3(0xE5,0x9F,0xBA), o3(0xE5,0x9F,0xBC),
-     o3(0xE5,0xA4,0x94), o3(0xE5,0xA5,0x87),
-     o3(0xE5,0xA6,0x93), o3(0xE5,0xAF,0x84),
-     o3(0xE5,0xB2,0x90), o3(0xE5,0xB4,0x8E),
-     o3(0xE5,0xB7,0xB1), o3(0xE5,0xB9,0xBE),
-     o3(0xE5,0xBF,0x8C), o3(0xE6,0x8A,0x80),
-     o3(0xE6,0x97,0x97), o3(0xE6,0x97,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D0 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D0_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D1_infos[95] = {
-     o3(0xE6,0x9C,0x9E), o3(0xE6,0x9C,0x9F),
-     o3(0xE6,0x9D,0x9E), o3(0xE6,0xA3,0x8B),
-     o3(0xE6,0xA3,0x84), o3(0xE6,0xA9,0x9F),
-     o3(0xE6,0xAC,0xBA), o3(0xE6,0xB0,0xA3),
-     o3(0xE6,0xB1,0xBD), o3(0xE6,0xB2,0x82),
-     o3(0xE6,0xB7,0x87), o3(0xE7,0x8E,0x98),
-     o3(0xE7,0x90,0xA6), o3(0xE7,0x90,0xAA),
-     o3(0xE7,0x92,0x82), o3(0xE7,0x92,0xA3),
-     o3(0xE7,0x95,0xB8), o3(0xE7,0x95,0xBF),
-     o3(0xE7,0xA2,0x81), o3(0xE7,0xA3,0xAF),
-     o3(0xE7,0xA5,0x81), o3(0xE7,0xA5,0x87),
-     o3(0xE7,0xA5,0x88), o3(0xE7,0xA5,0xBA),
-     o3(0xE7,0xAE,0x95), o3(0xE7,0xB4,0x80),
-     o3(0xE7,0xB6,0xBA), o3(0xE7,0xBE,0x88),
-     o3(0xE8,0x80,0x86), o3(0xE8,0x80,0xAD),
-     o3(0xE8,0x82,0x8C), o3(0xE8,0xA8,0x98),
-     o3(0xE8,0xAD,0x8F), o3(0xE8,0xB1,0x88),
-     o3(0xE8,0xB5,0xB7), o3(0xE9,0x8C,0xA1),
-     o3(0xE9,0x8C,0xA4), o3(0xE9,0xA3,0xA2),
-     o3(0xE9,0xA5,0x91), o3(0xE9,0xA8,0x8E),
-     o3(0xE9,0xA8,0x8F), o3(0xE9,0xA9,0xA5),
-     o3(0xE9,0xBA,0x92), o3(0xE7,0xB7,0x8A),
-     o3(0xE4,0xBD,0xB6), o3(0xE5,0x90,0x89),
-     o3(0xE6,0x8B,0xAE), o3(0xE6,0xA1,0x94),
-     o3(0xE9,0x87,0x91), o3(0xE5,0x96,0xAB),
-     o3(0xE5,0x84,0xBA), o3(0xEF,0xA4,0x8B),
-     o3(0xEF,0xA4,0x8C), o3(0xE5,0xA8,0x9C),
-     o3(0xE6,0x87,0xA6), o3(0xEF,0xA4,0x8D),
-     o3(0xE6,0x8B,0x8F), o3(0xE6,0x8B,0xBF),
-     o3(0xEF,0xA4,0x8E), o3(0xEF,0xA4,0x8F),
-     o3(0xEF,0xA4,0x90), o3(0xEF,0xA4,0x91),
-     o3(0xEF,0xA4,0x92), o3(0xEF,0xA4,0x93),
-     o3(0xE9,0x82,0xA3), o3(0xEF,0xA4,0x94),
-     o3(0xEF,0xA4,0x95), o3(0xEF,0xA4,0x96),
-     o3(0xEF,0xA4,0x97), o3(0xEF,0xA4,0x98),
-     o3(0xE8,0xAB,0xBE), o3(0xEF,0xA4,0x99),
-     o3(0xEF,0xA4,0x9A), o3(0xEF,0xA4,0x9B),
-     o3(0xEF,0xA4,0x9C), o3(0xE6,0x9A,0x96),
-     o3(0xEF,0xA4,0x9D), o3(0xE7,0x85,0x96),
-     o3(0xEF,0xA4,0x9E), o3(0xEF,0xA4,0x9F),
-     o3(0xE9,0x9B,0xA3), o3(0xEF,0xA4,0xA0),
-     o3(0xE6,0x8D,0x8F), o3(0xE6,0x8D,0xBA),
-     o3(0xE5,0x8D,0x97), o3(0xEF,0xA4,0xA1),
-     o3(0xE6,0x9E,0x8F), o3(0xE6,0xA5,0xA0),
-     o3(0xE6,0xB9,0xB3), o3(0xEF,0xA4,0xA2),
-     o3(0xE7,0x94,0xB7), o3(0xEF,0xA4,0xA3),
-     o3(0xEF,0xA4,0xA4), o3(0xEF,0xA4,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D1_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D2_infos[95] = {
-     o3(0xE7,0xB4,0x8D), o3(0xEF,0xA4,0xA6),
-     o3(0xEF,0xA4,0xA7), o3(0xE8,0xA1,0xB2),
-     o3(0xE5,0x9B,0x8A), o3(0xE5,0xA8,0x98),
-     o3(0xEF,0xA4,0xA8), o3(0xEF,0xA4,0xA9),
-     o3(0xEF,0xA4,0xAA), o3(0xEF,0xA4,0xAB),
-     o3(0xEF,0xA4,0xAC), o3(0xE4,0xB9,0x83),
-     o3(0xEF,0xA4,0xAD), o3(0xE5,0x85,0xA7),
-     o3(0xE5,0xA5,0x88), o3(0xE6,0x9F,0xB0),
-     o3(0xE8,0x80,0x90), o3(0xEF,0xA4,0xAE),
-     o3(0xE5,0xA5,0xB3), o3(0xE5,0xB9,0xB4),
-     o3(0xE6,0x92,0x9A), o3(0xE7,0xA7,0x8A),
-     o3(0xE5,0xBF,0xB5), o3(0xE6,0x81,0xAC),
-     o3(0xE6,0x8B,0x88), o3(0xE6,0x8D,0xBB),
-     o3(0xE5,0xAF,0xA7), o3(0xE5,0xAF,0x97),
-     o3(0xE5,0x8A,0xAA), o3(0xEF,0xA4,0xAF),
-     o3(0xE5,0xA5,0xB4), o3(0xE5,0xBC,0xA9),
-     o3(0xE6,0x80,0x92), o3(0xEF,0xA4,0xB0),
-     o3(0xEF,0xA4,0xB1), o3(0xEF,0xA4,0xB2),
-     o3(0xE7,0x91,0x99), o3(0xEF,0xA4,0xB3),
-     o3(0xEF,0xA4,0xB4), o3(0xEF,0xA4,0xB5),
-     o3(0xEF,0xA4,0xB6), o3(0xEF,0xA4,0xB7),
-     o3(0xEF,0xA4,0xB8), o3(0xE9,0xA7,0x91),
-     o3(0xEF,0xA4,0xB9), o3(0xEF,0xA4,0xBA),
-     o3(0xEF,0xA4,0xBB), o3(0xEF,0xA4,0xBC),
-     o3(0xEF,0xA4,0xBD), o3(0xEF,0xA4,0xBE),
-     o3(0xEF,0xA4,0xBF), o3(0xEF,0xA5,0x80),
-     o3(0xEF,0xA5,0x81), o3(0xEF,0xA5,0x82),
-     o3(0xEF,0xA5,0x83), o3(0xE6,0xBF,0x83),
-     o3(0xEF,0xA5,0x84), o3(0xEF,0xA5,0x85),
-     o3(0xE8,0x86,0xBF), o3(0xE8,0xBE,0xB2),
-     o3(0xE6,0x83,0xB1), o3(0xEF,0xA5,0x86),
-     o3(0xEF,0xA5,0x87), o3(0xE8,0x85,0xA6),
-     o3(0xEF,0xA5,0x88), o3(0xEF,0xA5,0x89),
-     o3(0xE5,0xB0,0xBF), o3(0xEF,0xA5,0x8A),
-     o3(0xEF,0xA5,0x8B), o3(0xEF,0xA5,0x8C),
-     o3(0xEF,0xA5,0x8D), o3(0xEF,0xA5,0x8E),
-     o3(0xEF,0xA5,0x8F), o3(0xEF,0xA5,0x90),
-     o3(0xEF,0xA5,0x91), o3(0xE5,0xAB,0xA9),
-     o3(0xE8,0xA8,0xA5), o3(0xE6,0x9D,0xBB),
-     o3(0xE7,0xB4,0x90), o3(0xEF,0xA5,0x92),
-     o3(0xEF,0xA5,0x93), o3(0xEF,0xA5,0x94),
-     o3(0xEF,0xA5,0x95), o3(0xEF,0xA5,0x96),
-     o3(0xEF,0xA5,0x97), o3(0xE8,0x83,0xBD),
-     o3(0xEF,0xA5,0x98), o3(0xEF,0xA5,0x99),
-     o3(0xE5,0xB0,0xBC), o3(0xE6,0xB3,0xA5),
-     o3(0xE5,0x8C,0xBF), o3(0xE6,0xBA,0xBA),
-     o3(0xE5,0xA4,0x9A), o3(0xE8,0x8C,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D2 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D3_infos[95] = {
-     o3(0xE4,0xB8,0xB9), o3(0xE4,0xBA,0xB6),
-     o3(0xE4,0xBD,0x86), o3(0xE5,0x96,0xAE),
-     o3(0xE5,0x9C,0x98), o3(0xE5,0xA3,0x87),
-     o3(0xE5,0xBD,0x96), o3(0xE6,0x96,0xB7),
-     o3(0xE6,0x97,0xA6), o3(0xE6,0xAA,0x80),
-     o3(0xE6,0xAE,0xB5), o3(0xE6,0xB9,0x8D),
-     o3(0xE7,0x9F,0xAD), o3(0xE7,0xAB,0xAF),
-     o3(0xE7,0xB0,0x9E), o3(0xE7,0xB7,0x9E),
-     o3(0xE8,0x9B,0x8B), o3(0xE8,0xA2,0x92),
-     o3(0xE9,0x84,0xB2), o3(0xE9,0x8D,0x9B),
-     o3(0xE6,0x92,0xBB), o3(0xE6,0xBE,0xBE),
-     o3(0xE7,0x8D,0xBA), o3(0xE7,0x96,0xB8),
-     o3(0xE9,0x81,0x94), o3(0xE5,0x95,0x96),
-     o3(0xE5,0x9D,0x8D), o3(0xE6,0x86,0xBA),
-     o3(0xE6,0x93,0x94), o3(0xE6,0x9B,0x87),
-     o3(0xE6,0xB7,0xA1), o3(0xE6,0xB9,0x9B),
-     o3(0xE6,0xBD,0xAD), o3(0xE6,0xBE,0xB9),
-     o3(0xE7,0x97,0xB0), o3(0xE8,0x81,0x83),
-     o3(0xE8,0x86,0xBD), o3(0xE8,0x95,0x81),
-     o3(0xE8,0xA6,0x83), o3(0xE8,0xAB,0x87),
-     o3(0xE8,0xAD,0x9A), o3(0xE9,0x8C,0x9F),
-     o3(0xE6,0xB2,0x93), o3(0xE7,0x95,0x93),
-     o3(0xE7,0xAD,0x94), o3(0xE8,0xB8,0x8F),
-     o3(0xE9,0x81,0x9D), o3(0xE5,0x94,0x90),
-     o3(0xE5,0xA0,0x82), o3(0xE5,0xA1,0x98),
-     o3(0xE5,0xB9,0xA2), o3(0xE6,0x88,0x87),
-     o3(0xE6,0x92,0x9E), o3(0xE6,0xA3,0xA0),
-     o3(0xE7,0x95,0xB6), o3(0xE7,0xB3,0x96),
-     o3(0xE8,0x9E,0xB3), o3(0xE9,0xBB,0xA8),
-     o3(0xE4,0xBB,0xA3), o3(0xE5,0x9E,0x88),
-     o3(0xE5,0x9D,0xAE), o3(0xE5,0xA4,0xA7),
-     o3(0xE5,0xB0,0x8D), o3(0xE5,0xB2,0xB1),
-     o3(0xE5,0xB8,0xB6), o3(0xE5,0xBE,0x85),
-     o3(0xE6,0x88,0xB4), o3(0xE6,0x93,0xA1),
-     o3(0xE7,0x8E,0xB3), o3(0xE8,0x87,0xBA),
-     o3(0xE8,0xA2,0x8B), o3(0xE8,0xB2,0xB8),
-     o3(0xE9,0x9A,0x8A), o3(0xE9,0xBB,0x9B),
-     o3(0xE5,0xAE,0x85), o3(0xE5,0xBE,0xB7),
-     o3(0xE6,0x82,0xB3), o3(0xE5,0x80,0x92),
-     o3(0xE5,0x88,0x80), o3(0xE5,0x88,0xB0),
-     o3(0xE5,0x9C,0x96), o3(0xE5,0xA0,0xB5),
-     o3(0xE5,0xA1,0x97), o3(0xE5,0xB0,0x8E),
-     o3(0xE5,0xB1,0xA0), o3(0xE5,0xB3,0xB6),
-     o3(0xE5,0xB6,0x8B), o3(0xE5,0xBA,0xA6),
-     o3(0xE5,0xBE,0x92), o3(0xE6,0x82,0xBC),
-     o3(0xE6,0x8C,0x91), o3(0xE6,0x8E,0x89),
-     o3(0xE6,0x90,0x97), o3(0xE6,0xA1,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D4_infos[95] = {
-     o3(0xE6,0xA3,0xB9), o3(0xE6,0xAB,0x82),
-     o3(0xE6,0xB7,0x98), o3(0xE6,0xB8,0xA1),
-     o3(0xE6,0xBB,0x94), o3(0xE6,0xBF,0xA4),
-     o3(0xE7,0x87,0xBE), o3(0xE7,0x9B,0x9C),
-     o3(0xE7,0x9D,0xB9), o3(0xE7,0xA6,0xB1),
-     o3(0xE7,0xA8,0xBB), o3(0xE8,0x90,0x84),
-     o3(0xE8,0xA6,0xA9), o3(0xE8,0xB3,0xAD),
-     o3(0xE8,0xB7,0xB3), o3(0xE8,0xB9,0x88),
-     o3(0xE9,0x80,0x83), o3(0xE9,0x80,0x94),
-     o3(0xE9,0x81,0x93), o3(0xE9,0x83,0xBD),
-     o3(0xE9,0x8D,0x8D), o3(0xE9,0x99,0xB6),
-     o3(0xE9,0x9F,0x9C), o3(0xE6,0xAF,0x92),
-     o3(0xE7,0x80,0x86), o3(0xE7,0x89,0x98),
-     o3(0xE7,0x8A,0xA2), o3(0xE7,0x8D,0xA8),
-     o3(0xE7,0x9D,0xA3), o3(0xE7,0xA6,0xBF),
-     o3(0xE7,0xAF,0xA4), o3(0xE7,0xBA,0x9B),
-     o3(0xE8,0xAE,0x80), o3(0xE5,0xA2,0xA9),
-     o3(0xE6,0x83,0x87), o3(0xE6,0x95,0xA6),
-     o3(0xE6,0x97,0xBD), o3(0xE6,0x9A,0xBE),
-     o3(0xE6,0xB2,0x8C), o3(0xE7,0x84,0x9E),
-     o3(0xE7,0x87,0x89), o3(0xE8,0xB1,0x9A),
-     o3(0xE9,0xA0,0x93), o3(0xE4,0xB9,0xAD),
-     o3(0xE7,0xAA,0x81), o3(0xE4,0xBB,0x9D),
-     o3(0xE5,0x86,0xAC), o3(0xE5,0x87,0x8D),
-     o3(0xE5,0x8B,0x95), o3(0xE5,0x90,0x8C),
-     o3(0xE6,0x86,0xA7), o3(0xE6,0x9D,0xB1),
-     o3(0xE6,0xA1,0x90), o3(0xE6,0xA3,0x9F),
-     o3(0xE6,0xB4,0x9E), o3(0xE6,0xBD,0xBC),
-     o3(0xE7,0x96,0xBC), o3(0xE7,0x9E,0xB3),
-     o3(0xE7,0xAB,0xA5), o3(0xE8,0x83,0xB4),
-     o3(0xE8,0x91,0xA3), o3(0xE9,0x8A,0x85),
-     o3(0xE5,0x85,0x9C), o3(0xE6,0x96,0x97),
-     o3(0xE6,0x9D,0x9C), o3(0xE6,0x9E,0x93),
-     o3(0xE7,0x97,0x98), o3(0xE7,0xAB,0x87),
-     o3(0xE8,0x8D,0xB3), o3(0xEF,0xA5,0x9A),
-     o3(0xE8,0xB1,0x86), o3(0xE9,0x80,0x97),
-     o3(0xE9,0xA0,0xAD), o3(0xE5,0xB1,0xAF),
-     o3(0xE8,0x87,0x80), o3(0xE8,0x8A,0x9A),
-     o3(0xE9,0x81,0x81), o3(0xE9,0x81,0xAF),
-     o3(0xE9,0x88,0x8D), o3(0xE5,0xBE,0x97),
-     o3(0xE5,0xB6,0x9D), o3(0xE6,0xA9,0x99),
-     o3(0xE7,0x87,0x88), o3(0xE7,0x99,0xBB),
-     o3(0xE7,0xAD,0x89), o3(0xE8,0x97,0xA4),
-     o3(0xE8,0xAC,0x84), o3(0xE9,0x84,0xA7),
-     o3(0xE9,0xA8,0xB0), o3(0xE5,0x96,0x87),
-     o3(0xE6,0x87,0xB6), o3(0xEF,0xA5,0x9B),
-     o3(0xE7,0x99,0xA9), o3(0xE7,0xBE,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D4_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D5_infos[95] = {
-     o3(0xE8,0x98,0xBF), o3(0xE8,0x9E,0xBA),
-     o3(0xE8,0xA3,0xB8), o3(0xE9,0x82,0x8F),
-     o3(0xEF,0xA5,0x9C), o3(0xE6,0xB4,0x9B),
-     o3(0xE7,0x83,0x99), o3(0xE7,0x8F,0x9E),
-     o3(0xE7,0xB5,0xA1), o3(0xE8,0x90,0xBD),
-     o3(0xEF,0xA5,0x9D), o3(0xE9,0x85,0xAA),
-     o3(0xE9,0xA7,0xB1), o3(0xEF,0xA5,0x9E),
-     o3(0xE4,0xBA,0x82), o3(0xE5,0x8D,0xB5),
-     o3(0xE6,0xAC,0x84), o3(0xE6,0xAC,0x92),
-     o3(0xE7,0x80,0xBE), o3(0xE7,0x88,0x9B),
-     o3(0xE8,0x98,0xAD), o3(0xE9,0xB8,0x9E),
-     o3(0xE5,0x89,0x8C), o3(0xE8,0xBE,0xA3),
-     o3(0xE5,0xB5,0x90), o3(0xE6,0x93,0xA5),
-     o3(0xE6,0x94,0xAC), o3(0xE6,0xAC,0x96),
-     o3(0xE6,0xBF,0xAB), o3(0xE7,0xB1,0x83),
-     o3(0xE7,0xBA,0x9C), o3(0xE8,0x97,0x8D),
-     o3(0xE8,0xA5,0xA4), o3(0xE8,0xA6,0xBD),
-     o3(0xE6,0x8B,0x89), o3(0xE8,0x87,0x98),
-     o3(0xE8,0xA0,0x9F), o3(0xE5,0xBB,0x8A),
-     o3(0xE6,0x9C,0x97), o3(0xE6,0xB5,0xAA),
-     o3(0xE7,0x8B,0xBC), o3(0xE7,0x90,0x85),
-     o3(0xE7,0x91,0xAF), o3(0xE8,0x9E,0x82),
-     o3(0xE9,0x83,0x9E), o3(0xE4,0xBE,0x86),
-     o3(0xE5,0xB4,0x8D), o3(0xE5,0xBE,0xA0),
-     o3(0xE8,0x90,0x8A), o3(0xE5,0x86,0xB7),
-     o3(0xE6,0x8E,0xA0), o3(0xE7,0x95,0xA5),
-     o3(0xE4,0xBA,0xAE), o3(0xE5,0x80,0x86),
-     o3(0xE5,0x85,0xA9), o3(0xE5,0x87,0x89),
-     o3(0xE6,0xA2,0x81), o3(0xE6,0xA8,0x91),
-     o3(0xE7,0xB2,0xAE), o3(0xE7,0xB2,0xB1),
-     o3(0xE7,0xB3,0xA7), o3(0xE8,0x89,0xAF),
-     o3(0xE8,0xAB,0x92), o3(0xE8,0xBC,0x9B),
-     o3(0xE9,0x87,0x8F), o3(0xE4,0xBE,0xB6),
-     o3(0xE5,0x84,0xB7), o3(0xE5,0x8B,0xB5),
-     o3(0xE5,0x91,0x82), o3(0xE5,0xBB,0xAC),
-     o3(0xE6,0x85,0xAE), o3(0xE6,0x88,0xBE),
-     o3(0xE6,0x97,0x85), o3(0xE6,0xAB,0x9A),
-     o3(0xE6,0xBF,0xBE), o3(0xE7,0xA4,0xAA),
-     o3(0xE8,0x97,0x9C), o3(0xE8,0xA0,0xA3),
-     o3(0xE9,0x96,0xAD), o3(0xE9,0xA9,0xA2),
-     o3(0xE9,0xA9,0xAA), o3(0xE9,0xBA,0x97),
-     o3(0xE9,0xBB,0x8E), o3(0xE5,0x8A,0x9B),
-     o3(0xE6,0x9B,0x86), o3(0xE6,0xAD,0xB7),
-     o3(0xE7,0x80,0x9D), o3(0xE7,0xA4,0xAB),
-     o3(0xE8,0xBD,0xA2), o3(0xE9,0x9D,0x82),
-     o3(0xE6,0x86,0x90), o3(0xE6,0x88,0x80),
-     o3(0xE6,0x94,0xA3), o3(0xE6,0xBC,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D5 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D5_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D6_infos[95] = {
-     o3(0xE7,0x85,0x89), o3(0xE7,0x92,0x89),
-     o3(0xE7,0xB7,0xB4), o3(0xE8,0x81,0xAF),
-     o3(0xE8,0x93,0xAE), o3(0xE8,0xBC,0xA6),
-     o3(0xE9,0x80,0xA3), o3(0xE9,0x8D,0x8A),
-     o3(0xE5,0x86,0xBD), o3(0xE5,0x88,0x97),
-     o3(0xE5,0x8A,0xA3), o3(0xE6,0xB4,0x8C),
-     o3(0xE7,0x83,0x88), o3(0xE8,0xA3,0x82),
-     o3(0xE5,0xBB,0x89), o3(0xE6,0x96,0x82),
-     o3(0xE6,0xAE,0xAE), o3(0xE6,0xBF,0x82),
-     o3(0xE7,0xB0,0xBE), o3(0xE7,0x8D,0xB5),
-     o3(0xE4,0xBB,0xA4), o3(0xE4,0xBC,0xB6),
-     o3(0xE5,0x9B,0xB9), o3(0xEF,0xA5,0x9F),
-     o3(0xE5,0xB2,0xBA), o3(0xE5,0xB6,0xBA),
-     o3(0xE6,0x80,0x9C), o3(0xE7,0x8E,0xB2),
-     o3(0xE7,0xAC,0xAD), o3(0xE7,0xBE,0x9A),
-     o3(0xE7,0xBF,0x8E), o3(0xE8,0x81,0x86),
-     o3(0xE9,0x80,0x9E), o3(0xE9,0x88,0xB4),
-     o3(0xE9,0x9B,0xB6), o3(0xE9,0x9D,0x88),
-     o3(0xE9,0xA0,0x98), o3(0xE9,0xBD,0xA1),
-     o3(0xE4,0xBE,0x8B), o3(0xE6,0xBE,0xA7),
-     o3(0xE7,0xA6,0xAE), o3(0xE9,0x86,0xB4),
-     o3(0xE9,0x9A,0xB7), o3(0xE5,0x8B,0x9E),
-     o3(0xEF,0xA5,0xA0), o3(0xE6,0x92,0x88),
-     o3(0xE6,0x93,0x84), o3(0xE6,0xAB,0x93),
-     o3(0xE6,0xBD,0x9E), o3(0xE7,0x80,0x98),
-     o3(0xE7,0x88,0x90), o3(0xE7,0x9B,0xA7),
-     o3(0xE8,0x80,0x81), o3(0xE8,0x98,0x86),
-     o3(0xE8,0x99,0x9C), o3(0xE8,0xB7,0xAF),
-     o3(0xE8,0xBC,0x85), o3(0xE9,0x9C,0xB2),
-     o3(0xE9,0xAD,0xAF), o3(0xE9,0xB7,0xBA),
-     o3(0xE9,0xB9,0xB5), o3(0xE7,0xA2,0x8C),
-     o3(0xE7,0xA5,0xBF), o3(0xE7,0xB6,0xA0),
-     o3(0xE8,0x8F,0x89), o3(0xE9,0x8C,0x84),
-     o3(0xE9,0xB9,0xBF), o3(0xE9,0xBA,0x93),
-     o3(0xE8,0xAB,0x96), o3(0xE5,0xA3,0x9F),
-     o3(0xE5,0xBC,0x84), o3(0xE6,0x9C,0xA7),
-     o3(0xE7,0x80,0xA7), o3(0xE7,0x93,0x8F),
-     o3(0xE7,0xB1,0xA0), o3(0xE8,0x81,0xBE),
-     o3(0xE5,0x84,0xA1), o3(0xE7,0x80,0xA8),
-     o3(0xE7,0x89,0xA2), o3(0xE7,0xA3,0x8A),
-     o3(0xE8,0xB3,0x82), o3(0xE8,0xB3,0x9A),
-     o3(0xE8,0xB3,0xB4), o3(0xE9,0x9B,0xB7),
-     o3(0xE4,0xBA,0x86), o3(0xE5,0x83,0x9A),
-     o3(0xE5,0xAF,0xAE), o3(0xE5,0xBB,0x96),
-     o3(0xE6,0x96,0x99), o3(0xE7,0x87,0x8E),
-     o3(0xE7,0x99,0x82), o3(0xE7,0x9E,0xAD),
-     o3(0xE8,0x81,0x8A), o3(0xE8,0x93,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D6 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D6_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D7_infos[95] = {
-     o3(0xE9,0x81,0xBC), o3(0xE9,0xAC,0xA7),
-     o3(0xE9,0xBE,0x8D), o3(0xE5,0xA3,0x98),
-     o3(0xE5,0xA9,0x81), o3(0xE5,0xB1,0xA2),
-     o3(0xE6,0xA8,0x93), o3(0xE6,0xB7,0x9A),
-     o3(0xE6,0xBC,0x8F), o3(0xE7,0x98,0xBB),
-     o3(0xE7,0xB4,0xAF), o3(0xE7,0xB8,0xB7),
-     o3(0xE8,0x94,0x9E), o3(0xE8,0xA4,0xB8),
-     o3(0xE9,0x8F,0xA4), o3(0xE9,0x99,0x8B),
-     o3(0xE5,0x8A,0x89), o3(0xE6,0x97,0x92),
-     o3(0xE6,0x9F,0xB3), o3(0xE6,0xA6,0xB4),
-     o3(0xE6,0xB5,0x81), o3(0xE6,0xBA,0x9C),
-     o3(0xE7,0x80,0x8F), o3(0xE7,0x90,0x89),
-     o3(0xE7,0x91,0xA0), o3(0xE7,0x95,0x99),
-     o3(0xE7,0x98,0xA4), o3(0xE7,0xA1,0xAB),
-     o3(0xE8,0xAC,0xAC), o3(0xE9,0xA1,0x9E),
-     o3(0xE5,0x85,0xAD), o3(0xE6,0x88,0xAE),
-     o3(0xE9,0x99,0xB8), o3(0xE4,0xBE,0x96),
-     o3(0xE5,0x80,0xAB), o3(0xE5,0xB4,0x99),
-     o3(0xE6,0xB7,0xAA), o3(0xE7,0xB6,0xB8),
-     o3(0xE8,0xBC,0xAA), o3(0xE5,0xBE,0x8B),
-     o3(0xE6,0x85,0x84), o3(0xE6,0xA0,0x97),
-     o3(0xEF,0xA5,0xA1), o3(0xE9,0x9A,0x86),
-     o3(0xE5,0x8B,0x92), o3(0xE8,0x82,0x8B),
-     o3(0xE5,0x87,0x9C), o3(0xE5,0x87,0x8C),
-     o3(0xE6,0xA5,0x9E), o3(0xE7,0xA8,0x9C),
-     o3(0xE7,0xB6,0xBE), o3(0xE8,0x8F,0xB1),
-     o3(0xE9,0x99,0xB5), o3(0xE4,0xBF,0x9A),
-     o3(0xE5,0x88,0xA9), o3(0xE5,0x8E,0x98),
-     o3(0xE5,0x90,0x8F), o3(0xE5,0x94,0x8E),
-     o3(0xE5,0xB1,0xA5), o3(0xE6,0x82,0xA7),
-     o3(0xE6,0x9D,0x8E), o3(0xE6,0xA2,0xA8),
-     o3(0xE6,0xB5,0xAC), o3(0xE7,0x8A,0x81),
-     o3(0xE7,0x8B,0xB8), o3(0xE7,0x90,0x86),
-     o3(0xE7,0x92,0x83), o3(0xEF,0xA5,0xA2),
-     o3(0xE7,0x97,0xA2), o3(0xE7,0xB1,0xAC),
-     o3(0xE7,0xBD,0xB9), o3(0xE7,0xBE,0xB8),
-     o3(0xE8,0x8E,0x89), o3(0xE8,0xA3,0x8F),
-     o3(0xE8,0xA3,0xA1), o3(0xE9,0x87,0x8C),
-     o3(0xE9,0x87,0x90), o3(0xE9,0x9B,0xA2),
-     o3(0xE9,0xAF,0x89), o3(0xE5,0x90,0x9D),
-     o3(0xE6,0xBD,0xBE), o3(0xE7,0x87,0x90),
-     o3(0xE7,0x92,0x98), o3(0xE8,0x97,0xBA),
-     o3(0xE8,0xBA,0xAA), o3(0xE9,0x9A,0xA3),
-     o3(0xE9,0xB1,0x97), o3(0xE9,0xBA,0x9F),
-     o3(0xE6,0x9E,0x97), o3(0xE6,0xB7,0x8B),
-     o3(0xE7,0x90,0xB3), o3(0xE8,0x87,0xA8),
-     o3(0xE9,0x9C,0x96), o3(0xE7,0xA0,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D7 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D7_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D8_infos[95] = {
-     o3(0xE7,0xAB,0x8B), o3(0xE7,0xAC,0xA0),
-     o3(0xE7,0xB2,0x92), o3(0xE6,0x91,0xA9),
-     o3(0xE7,0x91,0xAA), o3(0xE7,0x97,0xB2),
-     o3(0xE7,0xA2,0xBC), o3(0xE7,0xA3,0xA8),
-     o3(0xE9,0xA6,0xAC), o3(0xE9,0xAD,0x94),
-     o3(0xE9,0xBA,0xBB), o3(0xE5,0xAF,0x9E),
-     o3(0xE5,0xB9,0x95), o3(0xE6,0xBC,0xA0),
-     o3(0xE8,0x86,0x9C), o3(0xE8,0x8E,0xAB),
-     o3(0xE9,0x82,0x88), o3(0xE4,0xB8,0x87),
-     o3(0xE5,0x8D,0x8D), o3(0xE5,0xA8,0xA9),
-     o3(0xE5,0xB7,0x92), o3(0xE5,0xBD,0x8E),
-     o3(0xE6,0x85,0xA2), o3(0xE6,0x8C,0xBD),
-     o3(0xE6,0x99,0xA9), o3(0xE6,0x9B,0xBC),
-     o3(0xE6,0xBB,0xBF), o3(0xE6,0xBC,0xAB),
-     o3(0xE7,0x81,0xA3), o3(0xE7,0x9E,0x9E),
-     o3(0xE8,0x90,0xAC), o3(0xE8,0x94,0x93),
-     o3(0xE8,0xA0,0xBB), o3(0xE8,0xBC,0x93),
-     o3(0xE9,0xA5,0x85), o3(0xE9,0xB0,0xBB),
-     o3(0xE5,0x94,0x9C), o3(0xE6,0x8A,0xB9),
-     o3(0xE6,0x9C,0xAB), o3(0xE6,0xB2,0xAB),
-     o3(0xE8,0x8C,0x89), o3(0xE8,0xA5,0xAA),
-     o3(0xE9,0x9D,0xBA), o3(0xE4,0xBA,0xA1),
-     o3(0xE5,0xA6,0x84), o3(0xE5,0xBF,0x98),
-     o3(0xE5,0xBF,0x99), o3(0xE6,0x9C,0x9B),
-     o3(0xE7,0xB6,0xB2), o3(0xE7,0xBD,0x94),
-     o3(0xE8,0x8A,0x92), o3(0xE8,0x8C,0xAB),
-     o3(0xE8,0x8E,0xBD), o3(0xE8,0xBC,0x9E),
-     o3(0xE9,0x82,0x99), o3(0xE5,0x9F,0x8B),
-     o3(0xE5,0xA6,0xB9), o3(0xE5,0xAA,0x92),
-     o3(0xE5,0xAF,0x90), o3(0xE6,0x98,0xA7),
-     o3(0xE6,0x9E,0x9A), o3(0xE6,0xA2,0x85),
-     o3(0xE6,0xAF,0x8F), o3(0xE7,0x85,0xA4),
-     o3(0xE7,0xBD,0xB5), o3(0xE8,0xB2,0xB7),
-     o3(0xE8,0xB3,0xA3), o3(0xE9,0x82,0x81),
-     o3(0xE9,0xAD,0x85), o3(0xE8,0x84,0x88),
-     o3(0xE8,0xB2,0x8A), o3(0xE9,0x99,0x8C),
-     o3(0xE9,0xA9,0x80), o3(0xE9,0xBA,0xA5),
-     o3(0xE5,0xAD,0x9F), o3(0xE6,0xB0,0x93),
-     o3(0xE7,0x8C,0x9B), o3(0xE7,0x9B,0xB2),
-     o3(0xE7,0x9B,0x9F), o3(0xE8,0x90,0x8C),
-     o3(0xE5,0x86,0xAA), o3(0xE8,0xA6,0x93),
-     o3(0xE5,0x85,0x8D), o3(0xE5,0x86,0x95),
-     o3(0xE5,0x8B,0x89), o3(0xE6,0xA3,0x89),
-     o3(0xE6,0xB2,0x94), o3(0xE7,0x9C,0x84),
-     o3(0xE7,0x9C,0xA0), o3(0xE7,0xB6,0xBF),
-     o3(0xE7,0xB7,0xAC), o3(0xE9,0x9D,0xA2),
-     o3(0xE9,0xBA,0xB5), o3(0xE6,0xBB,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D8 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_D9_infos[95] = {
-     o3(0xE8,0x94,0x91), o3(0xE5,0x86,0xA5),
-     o3(0xE5,0x90,0x8D), o3(0xE5,0x91,0xBD),
-     o3(0xE6,0x98,0x8E), o3(0xE6,0x9A,0x9D),
-     o3(0xE6,0xA4,0xA7), o3(0xE6,0xBA,0x9F),
-     o3(0xE7,0x9A,0xBF), o3(0xE7,0x9E,0x91),
-     o3(0xE8,0x8C,0x97), o3(0xE8,0x93,0x82),
-     o3(0xE8,0x9E,0x9F), o3(0xE9,0x85,0xA9),
-     o3(0xE9,0x8A,0x98), o3(0xE9,0xB3,0xB4),
-     o3(0xE8,0xA2,0x82), o3(0xE4,0xBE,0xAE),
-     o3(0xE5,0x86,0x92), o3(0xE5,0x8B,0x9F),
-     o3(0xE5,0xA7,0x86), o3(0xE5,0xB8,0xBD),
-     o3(0xE6,0x85,0x95), o3(0xE6,0x91,0xB8),
-     o3(0xE6,0x91,0xB9), o3(0xE6,0x9A,0xAE),
-     o3(0xE6,0x9F,0x90), o3(0xE6,0xA8,0xA1),
-     o3(0xE6,0xAF,0x8D), o3(0xE6,0xAF,0x9B),
-     o3(0xE7,0x89,0x9F), o3(0xE7,0x89,0xA1),
-     o3(0xE7,0x91,0x81), o3(0xE7,0x9C,0xB8),
-     o3(0xE7,0x9F,0x9B), o3(0xE8,0x80,0x97),
-     o3(0xE8,0x8A,0xBC), o3(0xE8,0x8C,0x85),
-     o3(0xE8,0xAC,0x80), o3(0xE8,0xAC,0xA8),
-     o3(0xE8,0xB2,0x8C), o3(0xE6,0x9C,0xA8),
-     o3(0xE6,0xB2,0x90), o3(0xE7,0x89,0xA7),
-     o3(0xE7,0x9B,0xAE), o3(0xE7,0x9D,0xA6),
-     o3(0xE7,0xA9,0x86), o3(0xE9,0xB6,0xA9),
-     o3(0xE6,0xAD,0xBF), o3(0xE6,0xB2,0x92),
-     o3(0xE5,0xA4,0xA2), o3(0xE6,0x9C,0xA6),
-     o3(0xE8,0x92,0x99), o3(0xE5,0x8D,0xAF),
-     o3(0xE5,0xA2,0x93), o3(0xE5,0xA6,0x99),
-     o3(0xE5,0xBB,0x9F), o3(0xE6,0x8F,0x8F),
-     o3(0xE6,0x98,0xB4), o3(0xE6,0x9D,0xB3),
-     o3(0xE6,0xB8,0xBA), o3(0xE7,0x8C,0xAB),
-     o3(0xE7,0xAB,0x97), o3(0xE8,0x8B,0x97),
-     o3(0xE9,0x8C,0xA8), o3(0xE5,0x8B,0x99),
-     o3(0xE5,0xB7,0xAB), o3(0xE6,0x86,0xAE),
-     o3(0xE6,0x87,0x8B), o3(0xE6,0x88,0x8A),
-     o3(0xE6,0x8B,0x87), o3(0xE6,0x92,0xAB),
-     o3(0xE6,0x97,0xA0), o3(0xE6,0xA5,0x99),
-     o3(0xE6,0xAD,0xA6), o3(0xE6,0xAF,0x8B),
-     o3(0xE7,0x84,0xA1), o3(0xE7,0x8F,0xB7),
-     o3(0xE7,0x95,0x9D), o3(0xE7,0xB9,0x86),
-     o3(0xE8,0x88,0x9E), o3(0xE8,0x8C,0x82),
-     o3(0xE8,0x95,0xAA), o3(0xE8,0xAA,0xA3),
-     o3(0xE8,0xB2,0xBF), o3(0xE9,0x9C,0xA7),
-     o3(0xE9,0xB5,0xA1), o3(0xE5,0xA2,0xA8),
-     o3(0xE9,0xBB,0x98), o3(0xE5,0x80,0x91),
-     o3(0xE5,0x88,0x8E), o3(0xE5,0x90,0xBB),
-     o3(0xE5,0x95,0x8F), o3(0xE6,0x96,0x87),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_D9 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_D9_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DA_infos[95] = {
-     o3(0xE6,0xB1,0xB6), o3(0xE7,0xB4,0x8A),
-     o3(0xE7,0xB4,0x8B), o3(0xE8,0x81,0x9E),
-     o3(0xE8,0x9A,0x8A), o3(0xE9,0x96,0x80),
-     o3(0xE9,0x9B,0xAF), o3(0xE5,0x8B,0xBF),
-     o3(0xE6,0xB2,0x95), o3(0xE7,0x89,0xA9),
-     o3(0xE5,0x91,0xB3), o3(0xE5,0xAA,0x9A),
-     o3(0xE5,0xB0,0xBE), o3(0xE5,0xB5,0x8B),
-     o3(0xE5,0xBD,0x8C), o3(0xE5,0xBE,0xAE),
-     o3(0xE6,0x9C,0xAA), o3(0xE6,0xA2,0xB6),
-     o3(0xE6,0xA5,0xA3), o3(0xE6,0xB8,0xBC),
-     o3(0xE6,0xB9,0x84), o3(0xE7,0x9C,0x89),
-     o3(0xE7,0xB1,0xB3), o3(0xE7,0xBE,0x8E),
-     o3(0xE8,0x96,0x87), o3(0xE8,0xAC,0x8E),
-     o3(0xE8,0xBF,0xB7), o3(0xE9,0x9D,0xA1),
-     o3(0xE9,0xBB,0xB4), o3(0xE5,0xB2,0xB7),
-     o3(0xE6,0x82,0xB6), o3(0xE6,0x84,0x8D),
-     o3(0xE6,0x86,0xAB), o3(0xE6,0x95,0x8F),
-     o3(0xE6,0x97,0xBB), o3(0xE6,0x97,0xBC),
-     o3(0xE6,0xB0,0x91), o3(0xE6,0xB3,0xAF),
-     o3(0xE7,0x8E,0x9F), o3(0xE7,0x8F,0x89),
-     o3(0xE7,0xB7,0xA1), o3(0xE9,0x96,0x94),
-     o3(0xE5,0xAF,0x86), o3(0xE8,0x9C,0x9C),
-     o3(0xE8,0xAC,0x90), o3(0xE5,0x89,0x9D),
-     o3(0xE5,0x8D,0x9A), o3(0xE6,0x8B,0x8D),
-     o3(0xE6,0x90,0x8F), o3(0xE6,0x92,0xB2),
-     o3(0xE6,0x9C,0xB4), o3(0xE6,0xA8,0xB8),
-     o3(0xE6,0xB3,0x8A), o3(0xE7,0x8F,0x80),
-     o3(0xE7,0x92,0x9E), o3(0xE7,0xAE,0x94),
-     o3(0xE7,0xB2,0x95), o3(0xE7,0xB8,0x9B),
-     o3(0xE8,0x86,0x8A), o3(0xE8,0x88,0xB6),
-     o3(0xE8,0x96,0x84), o3(0xE8,0xBF,0xAB),
-     o3(0xE9,0x9B,0xB9), o3(0xE9,0xA7,0x81),
-     o3(0xE4,0xBC,0xB4), o3(0xE5,0x8D,0x8A),
-     o3(0xE5,0x8F,0x8D), o3(0xE5,0x8F,0x9B),
-     o3(0xE6,0x8B,0x8C), o3(0xE6,0x90,0xAC),
-     o3(0xE6,0x94,0x80), o3(0xE6,0x96,0x91),
-     o3(0xE6,0xA7,0x83), o3(0xE6,0xB3,0xAE),
-     o3(0xE6,0xBD,0x98), o3(0xE7,0x8F,0xAD),
-     o3(0xE7,0x95,0x94), o3(0xE7,0x98,0xA2),
-     o3(0xE7,0x9B,0xA4), o3(0xE7,0x9B,0xBC),
-     o3(0xE7,0xA3,0x90), o3(0xE7,0xA3,0xBB),
-     o3(0xE7,0xA4,0xAC), o3(0xE7,0xB5,0x86),
-     o3(0xE8,0x88,0xAC), o3(0xE8,0x9F,0xA0),
-     o3(0xE8,0xBF,0x94), o3(0xE9,0xA0,0x92),
-     o3(0xE9,0xA3,0xAF), o3(0xE5,0x8B,0x83),
-     o3(0xE6,0x8B,0x94), o3(0xE6,0x92,0xA5),
-     o3(0xE6,0xB8,0xA4), o3(0xE6,0xBD,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DA = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DA_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DB_infos[95] = {
-     o3(0xE7,0x99,0xBC), o3(0xE8,0xB7,0x8B),
-     o3(0xE9,0x86,0xB1), o3(0xE9,0x89,0xA2),
-     o3(0xE9,0xAB,0xAE), o3(0xE9,0xAD,0x83),
-     o3(0xE5,0x80,0xA3), o3(0xE5,0x82,0x8D),
-     o3(0xE5,0x9D,0x8A), o3(0xE5,0xA6,0xA8),
-     o3(0xE5,0xB0,0xA8), o3(0xE5,0xB9,0x87),
-     o3(0xE5,0xBD,0xB7), o3(0xE6,0x88,0xBF),
-     o3(0xE6,0x94,0xBE), o3(0xE6,0x96,0xB9),
-     o3(0xE6,0x97,0x81), o3(0xE6,0x98,0x89),
-     o3(0xE6,0x9E,0x8B), o3(0xE6,0xA6,0x9C),
-     o3(0xE6,0xBB,0x82), o3(0xE7,0xA3,0x85),
-     o3(0xE7,0xB4,0xA1), o3(0xE8,0x82,0xAA),
-     o3(0xE8,0x86,0x80), o3(0xE8,0x88,0xAB),
-     o3(0xE8,0x8A,0xB3), o3(0xE8,0x92,0xA1),
-     o3(0xE8,0x9A,0x8C), o3(0xE8,0xA8,0xAA),
-     o3(0xE8,0xAC,0x97), o3(0xE9,0x82,0xA6),
-     o3(0xE9,0x98,0xB2), o3(0xE9,0xBE,0x90),
-     o3(0xE5,0x80,0x8D), o3(0xE4,0xBF,0xB3),
-     o3(0xEF,0xA5,0xA3), o3(0xE5,0x9F,0xB9),
-     o3(0xE5,0xBE,0x98), o3(0xE6,0x8B,0x9C),
-     o3(0xE6,0x8E,0x92), o3(0xE6,0x9D,0xAF),
-     o3(0xE6,0xB9,0x83), o3(0xE7,0x84,0x99),
-     o3(0xE7,0x9B,0x83), o3(0xE8,0x83,0x8C),
-     o3(0xE8,0x83,0x9A), o3(0xE8,0xA3,0xB4),
-     o3(0xE8,0xA3,0xB5), o3(0xE8,0xA4,0x99),
-     o3(0xE8,0xB3,0xA0), o3(0xE8,0xBC,0xA9),
-     o3(0xE9,0x85,0x8D), o3(0xE9,0x99,0xAA),
-     o3(0xE4,0xBC,0xAF), o3(0xE4,0xBD,0xB0),
-     o3(0xE5,0xB8,0x9B), o3(0xE6,0x9F,0x8F),
-     o3(0xE6,0xA0,0xA2), o3(0xE7,0x99,0xBD),
-     o3(0xE7,0x99,0xBE), o3(0xE9,0xAD,0x84),
-     o3(0xE5,0xB9,0xA1), o3(0xE6,0xA8,0x8A),
-     o3(0xE7,0x85,0xA9), o3(0xE7,0x87,0x94),
-     o3(0xE7,0x95,0xAA), o3(0xEF,0xA5,0xA4),
-     o3(0xE7,0xB9,0x81), o3(0xE8,0x95,0x83),
-     o3(0xE8,0x97,0xA9), o3(0xE9,0xA3,0x9C),
-     o3(0xE4,0xBC,0x90), o3(0xE7,0xAD,0x8F),
-     o3(0xE7,0xBD,0xB0), o3(0xE9,0x96,0xA5),
-     o3(0xE5,0x87,0xA1), o3(0xE5,0xB8,0x86),
-     o3(0xE6,0xA2,0xB5), o3(0xE6,0xB0,0xBE),
-     o3(0xE6,0xB1,0x8E), o3(0xE6,0xB3,0x9B),
-     o3(0xE7,0x8A,0xAF), o3(0xE7,0xAF,0x84),
-     o3(0xE8,0x8C,0x83), o3(0xE6,0xB3,0x95),
-     o3(0xE7,0x90,0xBA), o3(0xE5,0x83,0xBB),
-     o3(0xE5,0x8A,0x88), o3(0xE5,0xA3,0x81),
-     o3(0xE6,0x93,0x98), o3(0xE6,0xAA,0x97),
-     o3(0xE7,0x92,0xA7), o3(0xE7,0x99,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DB = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DB_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DC_infos[95] = {
-     o3(0xE7,0xA2,0xA7), o3(0xE8,0x98,0x97),
-     o3(0xE9,0x97,0xA2), o3(0xE9,0x9C,0xB9),
-     o3(0xEF,0xA5,0xA5), o3(0xE5,0x8D,0x9E),
-     o3(0xE5,0xBC,0x81), o3(0xE8,0xAE,0x8A),
-     o3(0xE8,0xBE,0xA8), o3(0xE8,0xBE,0xAF),
-     o3(0xE9,0x82,0x8A), o3(0xE5,0x88,0xA5),
-     o3(0xE7,0x9E,0xA5), o3(0xE9,0xB1,0x89),
-     o3(0xE9,0xBC,0x88), o3(0xE4,0xB8,0x99),
-     o3(0xE5,0x80,0x82), o3(0xE5,0x85,0xB5),
-     o3(0xE5,0xB1,0x9B), o3(0xE5,0xB9,0xB7),
-     o3(0xE6,0x98,0x9E), o3(0xE6,0x98,0xBA),
-     o3(0xE6,0x9F,0x84), o3(0xE6,0xA3,0x85),
-     o3(0xE7,0x82,0xB3), o3(0xE7,0x94,0x81),
-     o3(0xE7,0x97,0x85), o3(0xE7,0xA7,0x89),
-     o3(0xE7,0xAB,0x9D), o3(0xE8,0xBC,0xA7),
-     o3(0xE9,0xA4,0xA0), o3(0xE9,0xA8,0x88),
-     o3(0xE4,0xBF,0x9D), o3(0xE5,0xA0,0xA1),
-     o3(0xE5,0xA0,0xB1), o3(0xE5,0xAF,0xB6),
-     o3(0xE6,0x99,0xAE), o3(0xE6,0xAD,0xA5),
-     o3(0xE6,0xB4,0x91), o3(0xE6,0xB9,0xBA),
-     o3(0xE6,0xBD,0xBD), o3(0xE7,0x8F,0xA4),
-     o3(0xE7,0x94,0xAB), o3(0xE8,0x8F,0xA9),
-     o3(0xE8,0xA3,0x9C), o3(0xE8,0xA4,0x93),
-     o3(0xE8,0xAD,0x9C), o3(0xE8,0xBC,0x94),
-     o3(0xE4,0xBC,0x8F), o3(0xE5,0x83,0x95),
-     o3(0xE5,0x8C,0x90), o3(0xE5,0x8D,0x9C),
-     o3(0xE5,0xAE,0x93), o3(0xE5,0xBE,0xA9),
-     o3(0xE6,0x9C,0x8D), o3(0xE7,0xA6,0x8F),
-     o3(0xE8,0x85,0xB9), o3(0xE8,0x8C,0xAF),
-     o3(0xE8,0x94,0x94), o3(0xE8,0xA4,0x87),
-     o3(0xE8,0xA6,0x86), o3(0xE8,0xBC,0xB9),
-     o3(0xE8,0xBC,0xBB), o3(0xE9,0xA6,0xA5),
-     o3(0xE9,0xB0,0x92), o3(0xE6,0x9C,0xAC),
-     o3(0xE4,0xB9,0xB6), o3(0xE4,0xBF,0xB8),
-     o3(0xE5,0xA5,0x89), o3(0xE5,0xB0,0x81),
-     o3(0xE5,0xB3,0xAF), o3(0xE5,0xB3,0xB0),
-     o3(0xE6,0x8D,0xA7), o3(0xE6,0xA3,0x92),
-     o3(0xE7,0x83,0xBD), o3(0xE7,0x86,0xA2),
-     o3(0xE7,0x90,0xAB), o3(0xE7,0xB8,0xAB),
-     o3(0xE8,0x93,0xAC), o3(0xE8,0x9C,0x82),
-     o3(0xE9,0x80,0xA2), o3(0xE9,0x8B,0x92),
-     o3(0xE9,0xB3,0xB3), o3(0xE4,0xB8,0x8D),
-     o3(0xE4,0xBB,0x98), o3(0xE4,0xBF,0xAF),
-     o3(0xE5,0x82,0x85), o3(0xE5,0x89,0x96),
-     o3(0xE5,0x89,0xAF), o3(0xE5,0x90,0xA6),
-     o3(0xE5,0x92,0x90), o3(0xE5,0x9F,0xA0),
-     o3(0xE5,0xA4,0xAB), o3(0xE5,0xA9,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DC = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DD_infos[95] = {
-     o3(0xE5,0xAD,0x9A), o3(0xE5,0xAD,0xB5),
-     o3(0xE5,0xAF,0x8C), o3(0xE5,0xBA,0x9C),
-     o3(0xEF,0xA5,0xA6), o3(0xE6,0x89,0xB6),
-     o3(0xE6,0x95,0xB7), o3(0xE6,0x96,0xA7),
-     o3(0xE6,0xB5,0xAE), o3(0xE6,0xBA,0xA5),
-     o3(0xE7,0x88,0xB6), o3(0xE7,0xAC,0xA6),
-     o3(0xE7,0xB0,0xBF), o3(0xE7,0xBC,0xB6),
-     o3(0xE8,0x85,0x90), o3(0xE8,0x85,0x91),
-     o3(0xE8,0x86,0x9A), o3(0xE8,0x89,0x80),
-     o3(0xE8,0x8A,0x99), o3(0xE8,0x8E,0xA9),
-     o3(0xE8,0xA8,0x83), o3(0xE8,0xB2,0xA0),
-     o3(0xE8,0xB3,0xA6), o3(0xE8,0xB3,0xBB),
-     o3(0xE8,0xB5,0xB4), o3(0xE8,0xB6,0xBA),
-     o3(0xE9,0x83,0xA8), o3(0xE9,0x87,0x9C),
-     o3(0xE9,0x98,0x9C), o3(0xE9,0x99,0x84),
-     o3(0xE9,0xA7,0x99), o3(0xE9,0xB3,0xA7),
-     o3(0xE5,0x8C,0x97), o3(0xE5,0x88,0x86),
-     o3(0xE5,0x90,0xA9), o3(0xE5,0x99,0xB4),
-     o3(0xE5,0xA2,0xB3), o3(0xE5,0xA5,0x94),
-     o3(0xE5,0xA5,0xAE), o3(0xE5,0xBF,0xBF),
-     o3(0xE6,0x86,0xA4), o3(0xE6,0x89,0xAE),
-     o3(0xE6,0x98,0x90), o3(0xE6,0xB1,0xBE),
-     o3(0xE7,0x84,0x9A), o3(0xE7,0x9B,0x86),
-     o3(0xE7,0xB2,0x89), o3(0xE7,0xB3,0x9E),
-     o3(0xE7,0xB4,0x9B), o3(0xE8,0x8A,0xAC),
-     o3(0xE8,0xB3,0x81), o3(0xE9,0x9B,0xB0),
-     o3(0xEF,0xA5,0xA7), o3(0xE4,0xBD,0x9B),
-     o3(0xE5,0xBC,0x97), o3(0xE5,0xBD,0xBF),
-     o3(0xE6,0x8B,0x82), o3(0xE5,0xB4,0xA9),
-     o3(0xE6,0x9C,0x8B), o3(0xE6,0xA3,0x9A),
-     o3(0xE7,0xA1,0xBC), o3(0xE7,0xB9,0x83),
-     o3(0xE9,0xB5,0xAC), o3(0xE4,0xB8,0x95),
-     o3(0xE5,0x82,0x99), o3(0xE5,0x8C,0x95),
-     o3(0xE5,0x8C,0xAA), o3(0xE5,0x8D,0x91),
-     o3(0xE5,0xA6,0x83), o3(0xE5,0xA9,0xA2),
-     o3(0xE5,0xBA,0x87), o3(0xE6,0x82,0xB2),
-     o3(0xE6,0x86,0x8A), o3(0xE6,0x89,0x89),
-     o3(0xE6,0x89,0xB9), o3(0xE6,0x96,0x90),
-     o3(0xE6,0x9E,0x87), o3(0xE6,0xA6,0xA7),
-     o3(0xE6,0xAF,0x94), o3(0xE6,0xAF,0x96),
-     o3(0xE6,0xAF,0x97), o3(0xE6,0xAF,0x98),
-     o3(0xE6,0xB2,0xB8), o3(0xEF,0xA5,0xA8),
-     o3(0xE7,0x90,0xB5), o3(0xE7,0x97,0xBA),
-     o3(0xE7,0xA0,0x92), o3(0xE7,0xA2,0x91),
-     o3(0xE7,0xA7,0x95), o3(0xE7,0xA7,0x98),
-     o3(0xE7,0xB2,0x83), o3(0xE7,0xB7,0x8B),
-     o3(0xE7,0xBF,0xA1), o3(0xE8,0x82,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DD = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DD_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DE_infos[95] = {
-     o3(0xE8,0x84,0xBE), o3(0xE8,0x87,0x82),
-     o3(0xE8,0x8F,0xB2), o3(0xE8,0x9C,0x9A),
-     o3(0xE8,0xA3,0xA8), o3(0xE8,0xAA,0xB9),
-     o3(0xE8,0xAD,0xAC), o3(0xE8,0xB2,0xBB),
-     o3(0xE9,0x84,0x99), o3(0xE9,0x9D,0x9E),
-     o3(0xE9,0xA3,0x9B), o3(0xE9,0xBC,0xBB),
-     o3(0xE5,0x9A,0xAC), o3(0xE5,0xAC,0xAA),
-     o3(0xE5,0xBD,0xAC), o3(0xE6,0x96,0x8C),
-     o3(0xE6,0xAA,0xB3), o3(0xE6,0xAE,0xAF),
-     o3(0xE6,0xB5,0x9C), o3(0xE6,0xBF,0xB1),
-     o3(0xE7,0x80,0x95), o3(0xE7,0x89,0x9D),
-     o3(0xE7,0x8E,0xAD), o3(0xE8,0xB2,0xA7),
-     o3(0xE8,0xB3,0x93), o3(0xE9,0xA0,0xBB),
-     o3(0xE6,0x86,0x91), o3(0xE6,0xB0,0xB7),
-     o3(0xE8,0x81,0x98), o3(0xE9,0xA8,0x81),
-     o3(0xE4,0xB9,0x8D), o3(0xE4,0xBA,0x8B),
-     o3(0xE4,0xBA,0x9B), o3(0xE4,0xBB,0x95),
-     o3(0xE4,0xBC,0xBA), o3(0xE4,0xBC,0xBC),
-     o3(0xE4,0xBD,0xBF), o3(0xE4,0xBF,0x9F),
-     o3(0xE5,0x83,0xBF), o3(0xE5,0x8F,0xB2),
-     o3(0xE5,0x8F,0xB8), o3(0xE5,0x94,0x86),
-     o3(0xE5,0x97,0xA3), o3(0xE5,0x9B,0x9B),
-     o3(0xE5,0xA3,0xAB), o3(0xE5,0xA5,0xA2),
-     o3(0xE5,0xA8,0x91), o3(0xE5,0xAF,0xAB),
-     o3(0xE5,0xAF,0xBA), o3(0xE5,0xB0,0x84),
-     o3(0xE5,0xB7,0xB3), o3(0xE5,0xB8,0xAB),
-     o3(0xE5,0xBE,0x99), o3(0xE6,0x80,0x9D),
-     o3(0xE6,0x8D,0xA8), o3(0xE6,0x96,0x9C),
-     o3(0xE6,0x96,0xAF), o3(0xE6,0x9F,0xB6),
-     o3(0xE6,0x9F,0xBB), o3(0xE6,0xA2,0xAD),
-     o3(0xE6,0xAD,0xBB), o3(0xE6,0xB2,0x99),
-     o3(0xE6,0xB3,0x97), o3(0xE6,0xB8,0xA3),
-     o3(0xE7,0x80,0x89), o3(0xE7,0x8D,0x85),
-     o3(0xE7,0xA0,0x82), o3(0xE7,0xA4,0xBE),
-     o3(0xE7,0xA5,0x80), o3(0xE7,0xA5,0xA0),
-     o3(0xE7,0xA7,0x81), o3(0xE7,0xAF,0xA9),
-     o3(0xE7,0xB4,0x97), o3(0xE7,0xB5,0xB2),
-     o3(0xE8,0x82,0x86), o3(0xE8,0x88,0x8D),
-     o3(0xE8,0x8E,0x8E), o3(0xE8,0x93,0x91),
-     o3(0xE8,0x9B,0x87), o3(0xE8,0xA3,0x9F),
-     o3(0xE8,0xA9,0x90), o3(0xE8,0xA9,0x9E),
-     o3(0xE8,0xAC,0x9D), o3(0xE8,0xB3,0x9C),
-     o3(0xE8,0xB5,0xA6), o3(0xE8,0xBE,0xAD),
-     o3(0xE9,0x82,0xAA), o3(0xE9,0xA3,0xBC),
-     o3(0xE9,0xA7,0x9F), o3(0xE9,0xBA,0x9D),
-     o3(0xE5,0x89,0x8A), o3(0xEF,0xA5,0xA9),
-     o3(0xE6,0x9C,0x94), o3(0xEF,0xA5,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DE = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DE_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_DF_infos[95] = {
-     o3(0xE5,0x82,0x98), o3(0xE5,0x88,0xAA),
-     o3(0xE5,0xB1,0xB1), o3(0xE6,0x95,0xA3),
-     o3(0xE6,0xB1,0x95), o3(0xE7,0x8F,0x8A),
-     o3(0xE7,0x94,0xA3), o3(0xE7,0x96,0x9D),
-     o3(0xE7,0xAE,0x97), o3(0xE8,0x92,0x9C),
-     o3(0xE9,0x85,0xB8), o3(0xE9,0x9C,0xB0),
-     o3(0xE4,0xB9,0xB7), o3(0xE6,0x92,0x92),
-     o3(0xE6,0xAE,0xBA), o3(0xE7,0x85,0x9E),
-     o3(0xE8,0x96,0xA9), o3(0xE4,0xB8,0x89),
-     o3(0xEF,0xA5,0xAB), o3(0xE6,0x9D,0x89),
-     o3(0xE6,0xA3,0xAE), o3(0xE6,0xB8,0x97),
-     o3(0xE8,0x8A,0x9F), o3(0xE8,0x94,0x98),
-     o3(0xE8,0xA1,0xAB), o3(0xE6,0x8F,0xB7),
-     o3(0xE6,0xBE,0x81), o3(0xE9,0x88,0x92),
-     o3(0xE9,0xA2,0xAF), o3(0xE4,0xB8,0x8A),
-     o3(0xE5,0x82,0xB7), o3(0xE5,0x83,0x8F),
-     o3(0xE5,0x84,0x9F), o3(0xE5,0x95,0x86),
-     o3(0xE5,0x96,0xAA), o3(0xE5,0x98,0x97),
-     o3(0xE5,0xAD,0x80), o3(0xE5,0xB0,0x99),
-     o3(0xE5,0xB3,0xA0), o3(0xE5,0xB8,0xB8),
-     o3(0xE5,0xBA,0x8A), o3(0xE5,0xBA,0xA0),
-     o3(0xE5,0xBB,0x82), o3(0xE6,0x83,0xB3),
-     o3(0xE6,0xA1,0x91), o3(0xE6,0xA9,0xA1),
-     o3(0xE6,0xB9,0x98), o3(0xE7,0x88,0xBD),
-     o3(0xE7,0x89,0x80), o3(0xE7,0x8B,0x80),
-     o3(0xE7,0x9B,0xB8), o3(0xE7,0xA5,0xA5),
-     o3(0xE7,0xAE,0xB1), o3(0xE7,0xBF,0x94),
-     o3(0xE8,0xA3,0xB3), o3(0xE8,0xA7,0xB4),
-     o3(0xE8,0xA9,0xB3), o3(0xE8,0xB1,0xA1),
-     o3(0xE8,0xB3,0x9E), o3(0xE9,0x9C,0x9C),
-     o3(0xE5,0xA1,0x9E), o3(0xE7,0x92,0xBD),
-     o3(0xE8,0xB3,0xBD), o3(0xE5,0x97,0x87),
-     o3(0xEF,0xA5,0xAC), o3(0xE7,0xA9,0xA1),
-     o3(0xE7,0xB4,0xA2), o3(0xE8,0x89,0xB2),
-     o3(0xE7,0x89,0xB2), o3(0xE7,0x94,0x9F),
-     o3(0xE7,0x94,0xA5), o3(0xEF,0xA5,0xAD),
-     o3(0xE7,0xAC,0x99), o3(0xE5,0xA2,0x85),
-     o3(0xE5,0xA3,0xBB), o3(0xE5,0xB6,0xBC),
-     o3(0xE5,0xBA,0x8F), o3(0xE5,0xBA,0xB6),
-     o3(0xE5,0xBE,0x90), o3(0xE6,0x81,0x95),
-     o3(0xE6,0x8A,0x92), o3(0xE6,0x8D,0xBF),
-     o3(0xE6,0x95,0x8D), o3(0xE6,0x9A,0x91),
-     o3(0xE6,0x9B,0x99), o3(0xE6,0x9B,0xB8),
-     o3(0xE6,0xA0,0x96), o3(0xE6,0xA3,0xB2),
-     o3(0xE7,0x8A,0x80), o3(0xE7,0x91,0x9E),
-     o3(0xE7,0xAD,0xAE), o3(0xE7,0xB5,0xAE),
-     o3(0xE7,0xB7,0x96), o3(0xE7,0xBD,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_DF = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_DF_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E0_infos[95] = {
-     o3(0xE8,0x83,0xA5), o3(0xE8,0x88,0x92),
-     o3(0xE8,0x96,0xAF), o3(0xE8,0xA5,0xBF),
-     o3(0xE8,0xAA,0x93), o3(0xE9,0x80,0x9D),
-     o3(0xE9,0x8B,0xA4), o3(0xE9,0xBB,0x8D),
-     o3(0xE9,0xBC,0xA0), o3(0xE5,0xA4,0x95),
-     o3(0xE5,0xA5,0xAD), o3(0xE5,0xB8,0xAD),
-     o3(0xE6,0x83,0x9C), o3(0xE6,0x98,0x94),
-     o3(0xE6,0x99,0xB3), o3(0xE6,0x9E,0x90),
-     o3(0xE6,0xB1,0x90), o3(0xE6,0xB7,0x85),
-     o3(0xE6,0xBD,0x9F), o3(0xE7,0x9F,0xB3),
-     o3(0xE7,0xA2,0xA9), o3(0xE8,0x93,0x86),
-     o3(0xE9,0x87,0x8B), o3(0xE9,0x8C,0xAB),
-     o3(0xE4,0xBB,0x99), o3(0xE5,0x83,0x8A),
-     o3(0xE5,0x85,0x88), o3(0xE5,0x96,0x84),
-     o3(0xE5,0xAC,0x8B), o3(0xE5,0xAE,0xA3),
-     o3(0xE6,0x89,0x87), o3(0xE6,0x95,0xBE),
-     o3(0xE6,0x97,0x8B), o3(0xE6,0xB8,0xB2),
-     o3(0xE7,0x85,0xBD), o3(0xE7,0x90,0x81),
-     o3(0xE7,0x91,0x84), o3(0xE7,0x92,0x87),
-     o3(0xE7,0x92,0xBF), o3(0xE7,0x99,0xAC),
-     o3(0xE7,0xA6,0xAA), o3(0xE7,0xB7,0x9A),
-     o3(0xE7,0xB9,0x95), o3(0xE7,0xBE,0xA8),
-     o3(0xE8,0x85,0xBA), o3(0xE8,0x86,0xB3),
-     o3(0xE8,0x88,0xB9), o3(0xE8,0x98,0x9A),
-     o3(0xE8,0x9F,0xAC), o3(0xE8,0xA9,0xB5),
-     o3(0xE8,0xB7,0xA3), o3(0xE9,0x81,0xB8),
-     o3(0xE9,0x8A,0x91), o3(0xE9,0x90,0xA5),
-     o3(0xE9,0xA5,0x8D), o3(0xE9,0xAE,0xAE),
-     o3(0xE5,0x8D,0xA8), o3(0xE5,0xB1,0x91),
-     o3(0xE6,0xA5,0x94), o3(0xE6,0xB3,0x84),
-     o3(0xE6,0xB4,0xA9), o3(0xE6,0xB8,0xAB),
-     o3(0xE8,0x88,0x8C), o3(0xE8,0x96,0x9B),
-     o3(0xE8,0xA4,0xBB), o3(0xE8,0xA8,0xAD),
-     o3(0xE8,0xAA,0xAA), o3(0xE9,0x9B,0xAA),
-     o3(0xE9,0xBD,0xA7), o3(0xE5,0x89,0xA1),
-     o3(0xE6,0x9A,0xB9), o3(0xE6,0xAE,0xB2),
-     o3(0xE7,0xBA,0x96), o3(0xE8,0x9F,0xBE),
-     o3(0xE8,0xB4,0x8D), o3(0xE9,0x96,0x83),
-     o3(0xE9,0x99,0x9D), o3(0xE6,0x94,0x9D),
-     o3(0xE6,0xB6,0x89), o3(0xE7,0x87,0xAE),
-     o3(0xEF,0xA5,0xAE), o3(0xE5,0x9F,0x8E),
-     o3(0xE5,0xA7,0x93), o3(0xE5,0xAE,0xAC),
-     o3(0xE6,0x80,0xA7), o3(0xE6,0x83,0xBA),
-     o3(0xE6,0x88,0x90), o3(0xE6,0x98,0x9F),
-     o3(0xE6,0x99,0x9F), o3(0xE7,0x8C,0xA9),
-     o3(0xE7,0x8F,0xB9), o3(0xE7,0x9B,0x9B),
-     o3(0xE7,0x9C,0x81), o3(0xE7,0xAD,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E0 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E0_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E1_infos[95] = {
-     o3(0xE8,0x81,0x96), o3(0xE8,0x81,0xB2),
-     o3(0xE8,0x85,0xA5), o3(0xE8,0xAA,0xA0),
-     o3(0xE9,0x86,0x92), o3(0xE4,0xB8,0x96),
-     o3(0xE5,0x8B,0xA2), o3(0xE6,0xAD,0xB2),
-     o3(0xE6,0xB4,0x97), o3(0xE7,0xA8,0x85),
-     o3(0xE7,0xAC,0xB9), o3(0xE7,0xB4,0xB0),
-     o3(0xEF,0xA5,0xAF), o3(0xE8,0xB2,0xB0),
-     o3(0xE5,0x8F,0xAC), o3(0xE5,0x98,0xAF),
-     o3(0xE5,0xA1,0x91), o3(0xE5,0xAE,0xB5),
-     o3(0xE5,0xB0,0x8F), o3(0xE5,0xB0,0x91),
-     o3(0xE5,0xB7,0xA2), o3(0xE6,0x89,0x80),
-     o3(0xE6,0x8E,0x83), o3(0xE6,0x90,0x94),
-     o3(0xE6,0x98,0xAD), o3(0xE6,0xA2,0xB3),
-     o3(0xE6,0xB2,0xBC), o3(0xE6,0xB6,0x88),
-     o3(0xE6,0xBA,0xAF), o3(0xE7,0x80,0x9F),
-     o3(0xE7,0x82,0xA4), o3(0xE7,0x87,0x92),
-     o3(0xE7,0x94,0xA6), o3(0xE7,0x96,0x8F),
-     o3(0xE7,0x96,0x8E), o3(0xE7,0x98,0x99),
-     o3(0xE7,0xAC,0x91), o3(0xE7,0xAF,0xA0),
-     o3(0xE7,0xB0,0xAB), o3(0xE7,0xB4,0xA0),
-     o3(0xE7,0xB4,0xB9), o3(0xE8,0x94,0xAC),
-     o3(0xE8,0x95,0xAD), o3(0xE8,0x98,0x87),
-     o3(0xE8,0xA8,0xB4), o3(0xE9,0x80,0x8D),
-     o3(0xE9,0x81,0xA1), o3(0xE9,0x82,0xB5),
-     o3(0xE9,0x8A,0xB7), o3(0xE9,0x9F,0xB6),
-     o3(0xE9,0xA8,0xB7), o3(0xE4,0xBF,0x97),
-     o3(0xE5,0xB1,0xAC), o3(0xE6,0x9D,0x9F),
-     o3(0xE6,0xB6,0x91), o3(0xE7,0xB2,0x9F),
-     o3(0xE7,0xBA,0x8C), o3(0xE8,0xAC,0x96),
-     o3(0xE8,0xB4,0x96), o3(0xE9,0x80,0x9F),
-     o3(0xE5,0xAD,0xAB), o3(0xE5,0xB7,0xBD),
-     o3(0xE6,0x90,0x8D), o3(0xE8,0x93,0x80),
-     o3(0xE9,0x81,0x9C), o3(0xE9,0xA3,0xA1),
-     o3(0xE7,0x8E,0x87), o3(0xE5,0xAE,0x8B),
-     o3(0xE6,0x82,0x9A), o3(0xE6,0x9D,0xBE),
-     o3(0xE6,0xB7,0x9E), o3(0xE8,0xA8,0x9F),
-     o3(0xE8,0xAA,0xA6), o3(0xE9,0x80,0x81),
-     o3(0xE9,0xA0,0x8C), o3(0xE5,0x88,0xB7),
-     o3(0xEF,0xA5,0xB0), o3(0xE7,0x81,0x91),
-     o3(0xE7,0xA2,0x8E), o3(0xE9,0x8E,0x96),
-     o3(0xE8,0xA1,0xB0), o3(0xE9,0x87,0x97),
-     o3(0xE4,0xBF,0xAE), o3(0xE5,0x8F,0x97),
-     o3(0xE5,0x97,0xBD), o3(0xE5,0x9B,0x9A),
-     o3(0xE5,0x9E,0x82), o3(0xE5,0xA3,0xBD),
-     o3(0xE5,0xAB,0x82), o3(0xE5,0xAE,0x88),
-     o3(0xE5,0xB2,0xAB), o3(0xE5,0xB3,0x80),
-     o3(0xE5,0xB8,0xA5), o3(0xE6,0x84,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E1_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E2_infos[95] = {
-     o3(0xE6,0x88,0x8D), o3(0xE6,0x89,0x8B),
-     o3(0xE6,0x8E,0x88), o3(0xE6,0x90,0x9C),
-     o3(0xE6,0x94,0xB6), o3(0xE6,0x95,0xB8),
-     o3(0xE6,0xA8,0xB9), o3(0xE6,0xAE,0x8A),
-     o3(0xE6,0xB0,0xB4), o3(0xE6,0xB4,0x99),
-     o3(0xE6,0xBC,0xB1), o3(0xE7,0x87,0xA7),
-     o3(0xE7,0x8B,0xA9), o3(0xE7,0x8D,0xB8),
-     o3(0xE7,0x90,0x87), o3(0xE7,0x92,0xB2),
-     o3(0xE7,0x98,0xA6), o3(0xE7,0x9D,0xA1),
-     o3(0xE7,0xA7,0x80), o3(0xE7,0xA9,0x97),
-     o3(0xE7,0xAB,0xAA), o3(0xE7,0xB2,0xB9),
-     o3(0xE7,0xB6,0x8F), o3(0xE7,0xB6,0xAC),
-     o3(0xE7,0xB9,0xA1), o3(0xE7,0xBE,0x9E),
-     o3(0xE8,0x84,0xA9), o3(0xE8,0x8C,0xB1),
-     o3(0xE8,0x92,0x90), o3(0xE8,0x93,0x9A),
-     o3(0xE8,0x97,0xAA), o3(0xE8,0xA2,0x96),
-     o3(0xE8,0xAA,0xB0), o3(0xE8,0xAE,0x90),
-     o3(0xE8,0xBC,0xB8), o3(0xE9,0x81,0x82),
-     o3(0xE9,0x82,0x83), o3(0xE9,0x85,0xAC),
-     o3(0xE9,0x8A,0x96), o3(0xE9,0x8A,0xB9),
-     o3(0xE9,0x9A,0x8B), o3(0xE9,0x9A,0xA7),
-     o3(0xE9,0x9A,0xA8), o3(0xE9,0x9B,0x96),
-     o3(0xE9,0x9C,0x80), o3(0xE9,0xA0,0x88),
-     o3(0xE9,0xA6,0x96), o3(0xE9,0xAB,0x93),
-     o3(0xE9,0xAC,0x9A), o3(0xE5,0x8F,0x94),
-     o3(0xE5,0xA1,0xBE), o3(0xE5,0xA4,0x99),
-     o3(0xE5,0xAD,0xB0), o3(0xE5,0xAE,0xBF),
-     o3(0xE6,0xB7,0x91), o3(0xE6,0xBD,0x9A),
-     o3(0xE7,0x86,0x9F), o3(0xE7,0x90,0xA1),
-     o3(0xE7,0x92,0xB9), o3(0xE8,0x82,0x85),
-     o3(0xE8,0x8F,0xBD), o3(0xE5,0xB7,0xA1),
-     o3(0xE5,0xBE,0x87), o3(0xE5,0xBE,0xAA),
-     o3(0xE6,0x81,0x82), o3(0xE6,0x97,0xAC),
-     o3(0xE6,0xA0,0x92), o3(0xE6,0xA5,0xAF),
-     o3(0xE6,0xA9,0x93), o3(0xE6,0xAE,0x89),
-     o3(0xE6,0xB4,0xB5), o3(0xE6,0xB7,0xB3),
-     o3(0xE7,0x8F,0xA3), o3(0xE7,0x9B,0xBE),
-     o3(0xE7,0x9E,0xAC), o3(0xE7,0xAD,0x8D),
-     o3(0xE7,0xB4,0x94), o3(0xE8,0x84,0xA3),
-     o3(0xE8,0x88,0x9C), o3(0xE8,0x8D,0x80),
-     o3(0xE8,0x93,0xB4), o3(0xE8,0x95,0xA3),
-     o3(0xE8,0xA9,0xA2), o3(0xE8,0xAB,0x84),
-     o3(0xE9,0x86,0x87), o3(0xE9,0x8C,0x9E),
-     o3(0xE9,0xA0,0x86), o3(0xE9,0xA6,0xB4),
-     o3(0xE6,0x88,0x8C), o3(0xE8,0xA1,0x93),
-     o3(0xE8,0xBF,0xB0), o3(0xE9,0x89,0xA5),
-     o3(0xE5,0xB4,0x87), o3(0xE5,0xB4,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E2 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E3_infos[95] = {
-     o3(0xE5,0xB5,0xA9), o3(0xE7,0x91,0x9F),
-     o3(0xE8,0x86,0x9D), o3(0xE8,0x9D,0xA8),
-     o3(0xE6,0xBF,0x95), o3(0xE6,0x8B,0xBE),
-     o3(0xE7,0xBF,0x92), o3(0xE8,0xA4,0xB6),
-     o3(0xE8,0xA5,0xB2), o3(0xE4,0xB8,0x9E),
-     o3(0xE4,0xB9,0x98), o3(0xE5,0x83,0xA7),
-     o3(0xE5,0x8B,0x9D), o3(0xE5,0x8D,0x87),
-     o3(0xE6,0x89,0xBF), o3(0xE6,0x98,0x87),
-     o3(0xE7,0xB9,0xA9), o3(0xE8,0xA0,0x85),
-     o3(0xE9,0x99,0x9E), o3(0xE4,0xBE,0x8D),
-     o3(0xE5,0x8C,0x99), o3(0xE5,0x98,0xB6),
-     o3(0xE5,0xA7,0x8B), o3(0xE5,0xAA,0xA4),
-     o3(0xE5,0xB0,0xB8), o3(0xE5,0xB1,0x8E),
-     o3(0xE5,0xB1,0x8D), o3(0xE5,0xB8,0x82),
-     o3(0xE5,0xBC,0x91), o3(0xE6,0x81,0x83),
-     o3(0xE6,0x96,0xBD), o3(0xE6,0x98,0xAF),
-     o3(0xE6,0x99,0x82), o3(0xE6,0x9E,0xBE),
-     o3(0xE6,0x9F,0xB4), o3(0xE7,0x8C,0x9C),
-     o3(0xE7,0x9F,0xA2), o3(0xE7,0xA4,0xBA),
-     o3(0xE7,0xBF,0x85), o3(0xE8,0x92,0x94),
-     o3(0xE8,0x93,0x8D), o3(0xE8,0xA6,0x96),
-     o3(0xE8,0xA9,0xA6), o3(0xE8,0xA9,0xA9),
-     o3(0xE8,0xAB,0xA1), o3(0xE8,0xB1,0x95),
-     o3(0xE8,0xB1,0xBA), o3(0xE5,0x9F,0xB4),
-     o3(0xE5,0xAF,0x94), o3(0xE5,0xBC,0x8F),
-     o3(0xE6,0x81,0xAF), o3(0xE6,0x8B,0xAD),
-     o3(0xE6,0xA4,0x8D), o3(0xE6,0xAE,0x96),
-     o3(0xE6,0xB9,0x9C), o3(0xE7,0x86,0x84),
-     o3(0xE7,0xAF,0x92), o3(0xE8,0x9D,0x95),
-     o3(0xE8,0xAD,0x98), o3(0xE8,0xBB,0xBE),
-     o3(0xE9,0xA3,0x9F), o3(0xE9,0xA3,0xBE),
-     o3(0xE4,0xBC,0xB8), o3(0xE4,0xBE,0x81),
-     o3(0xE4,0xBF,0xA1), o3(0xE5,0x91,0xBB),
-     o3(0xE5,0xA8,0xA0), o3(0xE5,0xAE,0xB8),
-     o3(0xE6,0x84,0xBC), o3(0xE6,0x96,0xB0),
-     o3(0xE6,0x99,0xA8), o3(0xE7,0x87,0xBC),
-     o3(0xE7,0x94,0xB3), o3(0xE7,0xA5,0x9E),
-     o3(0xE7,0xB4,0xB3), o3(0xE8,0x85,0x8E),
-     o3(0xE8,0x87,0xA3), o3(0xE8,0x8E,0x98),
-     o3(0xE8,0x96,0xAA), o3(0xE8,0x97,0x8E),
-     o3(0xE8,0x9C,0x83), o3(0xE8,0xA8,0x8A),
-     o3(0xE8,0xBA,0xAB), o3(0xE8,0xBE,0x9B),
-     o3(0xEF,0xA5,0xB1), o3(0xE8,0xBF,0x85),
-     o3(0xE5,0xA4,0xB1), o3(0xE5,0xAE,0xA4),
-     o3(0xE5,0xAF,0xA6), o3(0xE6,0x82,0x89),
-     o3(0xE5,0xAF,0xA9), o3(0xE5,0xB0,0x8B),
-     o3(0xE5,0xBF,0x83), o3(0xE6,0xB2,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E4_infos[95] = {
-     o3(0xEF,0xA5,0xB2), o3(0xE6,0xB7,0xB1),
-     o3(0xE7,0x80,0x8B), o3(0xE7,0x94,0x9A),
-     o3(0xE8,0x8A,0xAF), o3(0xE8,0xAB,0xB6),
-     o3(0xE4,0xBB,0x80), o3(0xE5,0x8D,0x81),
-     o3(0xEF,0xA5,0xB3), o3(0xE9,0x9B,0x99),
-     o3(0xE6,0xB0,0x8F), o3(0xE4,0xBA,0x9E),
-     o3(0xE4,0xBF,0x84), o3(0xE5,0x85,0x92),
-     o3(0xE5,0x95,0x9E), o3(0xE5,0xA8,0xA5),
-     o3(0xE5,0xB3,0xA8), o3(0xE6,0x88,0x91),
-     o3(0xE7,0x89,0x99), o3(0xE8,0x8A,0xBD),
-     o3(0xE8,0x8E,0xAA), o3(0xE8,0x9B,0xBE),
-     o3(0xE8,0xA1,0x99), o3(0xE8,0xA8,0x9D),
-     o3(0xE9,0x98,0xBF), o3(0xE9,0x9B,0x85),
-     o3(0xE9,0xA4,0x93), o3(0xE9,0xB4,0x89),
-     o3(0xE9,0xB5,0x9D), o3(0xE5,0xA0,0x8A),
-     o3(0xE5,0xB2,0xB3), o3(0xE5,0xB6,0xBD),
-     o3(0xE5,0xB9,0x84), o3(0xE6,0x83,0xA1),
-     o3(0xE6,0x84,0x95), o3(0xE6,0x8F,0xA1),
-     o3(0xE6,0xA8,0x82), o3(0xE6,0xB8,0xA5),
-     o3(0xE9,0x84,0x82), o3(0xE9,0x8D,0x94),
-     o3(0xE9,0xA1,0x8E), o3(0xE9,0xB0,0x90),
-     o3(0xE9,0xBD,0xB7), o3(0xE5,0xAE,0x89),
-     o3(0xE5,0xB2,0xB8), o3(0xE6,0x8C,0x89),
-     o3(0xE6,0x99,0x8F), o3(0xE6,0xA1,0x88),
-     o3(0xE7,0x9C,0xBC), o3(0xE9,0x9B,0x81),
-     o3(0xE9,0x9E,0x8D), o3(0xE9,0xA1,0x94),
-     o3(0xE9,0xAE,0x9F), o3(0xE6,0x96,0xA1),
-     o3(0xE8,0xAC,0x81), o3(0xE8,0xBB,0x8B),
-     o3(0xE9,0x96,0xBC), o3(0xE5,0x94,0xB5),
-     o3(0xE5,0xB2,0xA9), o3(0xE5,0xB7,0x96),
-     o3(0xE5,0xBA,0xB5), o3(0xE6,0x9A,0x97),
-     o3(0xE7,0x99,0x8C), o3(0xE8,0x8F,0xB4),
-     o3(0xE9,0x97,0x87), o3(0xE5,0xA3,0x93),
-     o3(0xE6,0x8A,0xBC), o3(0xE7,0x8B,0x8E),
-     o3(0xE9,0xB4,0xA8), o3(0xE4,0xBB,0xB0),
-     o3(0xE5,0xA4,0xAE), o3(0xE6,0x80,0x8F),
-     o3(0xE6,0x98,0xBB), o3(0xE6,0xAE,0x83),
-     o3(0xE7,0xA7,0xA7), o3(0xE9,0xB4,0xA6),
-     o3(0xE5,0x8E,0x93), o3(0xE5,0x93,0x80),
-     o3(0xE5,0x9F,0x83), o3(0xE5,0xB4,0x96),
-     o3(0xE6,0x84,0x9B), o3(0xE6,0x9B,0x96),
-     o3(0xE6,0xB6,0xAF), o3(0xE7,0xA2,0x8D),
-     o3(0xE8,0x89,0xBE), o3(0xE9,0x9A,0x98),
-     o3(0xE9,0x9D,0x84), o3(0xE5,0x8E,0x84),
-     o3(0xE6,0x89,0xBC), o3(0xE6,0x8E,0x96),
-     o3(0xE6,0xB6,0xB2), o3(0xE7,0xB8,0x8A),
-     o3(0xE8,0x85,0x8B), o3(0xE9,0xA1,0x8D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E4_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E5_infos[95] = {
-     o3(0xE6,0xAB,0xBB), o3(0xE7,0xBD,0x8C),
-     o3(0xE9,0xB6,0xAF), o3(0xE9,0xB8,0x9A),
-     o3(0xE4,0xB9,0x9F), o3(0xE5,0x80,0xBB),
-     o3(0xE5,0x86,0xB6), o3(0xE5,0xA4,0x9C),
-     o3(0xE6,0x83,0xB9), o3(0xE6,0x8F,0xB6),
-     o3(0xE6,0xA4,0xB0), o3(0xE7,0x88,0xBA),
-     o3(0xE8,0x80,0xB6), o3(0xEF,0xA5,0xB4),
-     o3(0xE9,0x87,0x8E), o3(0xE5,0xBC,0xB1),
-     o3(0xEF,0xA5,0xB5), o3(0xEF,0xA5,0xB6),
-     o3(0xE7,0xB4,0x84), o3(0xE8,0x8B,0xA5),
-     o3(0xE8,0x91,0xAF), o3(0xE8,0x92,0xBB),
-     o3(0xE8,0x97,0xA5), o3(0xE8,0xBA,0x8D),
-     o3(0xEF,0xA5,0xB7), o3(0xE4,0xBD,0xAF),
-     o3(0xEF,0xA5,0xB8), o3(0xEF,0xA5,0xB9),
-     o3(0xE5,0xA3,0xA4), o3(0xE5,0xAD,0x83),
-     o3(0xE6,0x81,0x99), o3(0xE6,0x8F,0x9A),
-     o3(0xE6,0x94,0x98), o3(0xE6,0x95,0xAD),
-     o3(0xE6,0x9A,0x98), o3(0xEF,0xA5,0xBA),
-     o3(0xE6,0xA5,0x8A), o3(0xE6,0xA8,0xA3),
-     o3(0xE6,0xB4,0x8B), o3(0xE7,0x80,0x81),
-     o3(0xE7,0x85,0xAC), o3(0xE7,0x97,0x92),
-     o3(0xE7,0x98,0x8D), o3(0xE7,0xA6,0xB3),
-     o3(0xE7,0xA9,0xB0), o3(0xEF,0xA5,0xBB),
-     o3(0xE7,0xBE,0x8A), o3(0xEF,0xA5,0xBC),
-     o3(0xE8,0xA5,0x84), o3(0xEF,0xA5,0xBD),
-     o3(0xE8,0xAE,0x93), o3(0xE9,0x87,0x80),
-     o3(0xE9,0x99,0xBD), o3(0xEF,0xA5,0xBE),
-     o3(0xE9,0xA4,0x8A), o3(0xE5,0x9C,0x84),
-     o3(0xE5,0xBE,0xA1), o3(0xE6,0x96,0xBC),
-     o3(0xE6,0xBC,0x81), o3(0xE7,0x98,0x80),
-     o3(0xE7,0xA6,0xA6), o3(0xE8,0xAA,0x9E),
-     o3(0xE9,0xA6,0xAD), o3(0xE9,0xAD,0x9A),
-     o3(0xE9,0xBD,0xAC), o3(0xE5,0x84,0x84),
-     o3(0xE6,0x86,0xB6), o3(0xE6,0x8A,0x91),
-     o3(0xE6,0xAA,0x8D), o3(0xE8,0x87,0x86),
-     o3(0xE5,0x81,0x83), o3(0xE5,0xA0,0xB0),
-     o3(0xE5,0xBD,0xA6), o3(0xE7,0x84,0x89),
-     o3(0xE8,0xA8,0x80), o3(0xE8,0xAB,0xBA),
-     o3(0xE5,0xAD,0xBC), o3(0xE8,0x98,0x96),
-     o3(0xE4,0xBF,0xBA), o3(0xE5,0x84,0xBC),
-     o3(0xE5,0x9A,0xB4), o3(0xE5,0xA5,0x84),
-     o3(0xE6,0x8E,0xA9), o3(0xE6,0xB7,0xB9),
-     o3(0xE5,0xB6,0xAA), o3(0xE6,0xA5,0xAD),
-     o3(0xE5,0x86,0x86), o3(0xE4,0xBA,0x88),
-     o3(0xE4,0xBD,0x99), o3(0xEF,0xA5,0xBF),
-     o3(0xEF,0xA6,0x80), o3(0xEF,0xA6,0x81),
-     o3(0xE5,0xA6,0x82), o3(0xEF,0xA6,0x82),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E5 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E5_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E6_infos[95] = {
-     o3(0xEF,0xA6,0x83), o3(0xE6,0xAD,0x9F),
-     o3(0xE6,0xB1,0x9D), o3(0xEF,0xA6,0x84),
-     o3(0xE7,0x92,0xB5), o3(0xE7,0xA4,0x96),
-     o3(0xEF,0xA6,0x85), o3(0xE8,0x88,0x87),
-     o3(0xE8,0x89,0x85), o3(0xE8,0x8C,0xB9),
-     o3(0xE8,0xBC,0xBF), o3(0xE8,0xBD,0x9D),
-     o3(0xEF,0xA6,0x86), o3(0xE9,0xA4,0x98),
-     o3(0xEF,0xA6,0x87), o3(0xEF,0xA6,0x88),
-     o3(0xEF,0xA6,0x89), o3(0xE4,0xBA,0xA6),
-     o3(0xEF,0xA6,0x8A), o3(0xE5,0x9F,0x9F),
-     o3(0xE5,0xBD,0xB9), o3(0xE6,0x98,0x93),
-     o3(0xEF,0xA6,0x8B), o3(0xEF,0xA6,0x8C),
-     o3(0xE7,0x96,0xAB), o3(0xE7,0xB9,0xB9),
-     o3(0xE8,0xAD,0xAF), o3(0xEF,0xA6,0x8D),
-     o3(0xE9,0x80,0x86), o3(0xE9,0xA9,0x9B),
-     o3(0xE5,0x9A,0xA5), o3(0xE5,0xA0,0xA7),
-     o3(0xE5,0xA7,0xB8), o3(0xE5,0xA8,0x9F),
-     o3(0xE5,0xAE,0xB4), o3(0xEF,0xA6,0x8E),
-     o3(0xE5,0xBB,0xB6), o3(0xEF,0xA6,0x8F),
-     o3(0xEF,0xA6,0x90), o3(0xE6,0x8D,0x90),
-     o3(0xE6,0x8C,0xBB), o3(0xEF,0xA6,0x91),
-     o3(0xE6,0xA4,0xBD), o3(0xE6,0xB2,0x87),
-     o3(0xE6,0xB2,0xBF), o3(0xE6,0xB6,0x8E),
-     o3(0xE6,0xB6,0x93), o3(0xE6,0xB7,0xB5),
-     o3(0xE6,0xBC,0x94), o3(0xEF,0xA6,0x92),
-     o3(0xE7,0x83,0x9F), o3(0xE7,0x84,0xB6),
-     o3(0xE7,0x85,0x99), o3(0xEF,0xA6,0x93),
-     o3(0xE7,0x87,0x83), o3(0xE7,0x87,0x95),
-     o3(0xEF,0xA6,0x94), o3(0xE7,0xA1,0x8F),
-     o3(0xE7,0xA1,0xAF), o3(0xEF,0xA6,0x95),
-     o3(0xE7,0xAD,0xB5), o3(0xE7,0xB7,0xA3),
-     o3(0xEF,0xA6,0x96), o3(0xE7,0xB8,0xAF),
-     o3(0xEF,0xA6,0x97), o3(0xE8,0xA1,0x8D),
-     o3(0xE8,0xBB,0x9F), o3(0xEF,0xA6,0x98),
-     o3(0xEF,0xA6,0x99), o3(0xEF,0xA6,0x9A),
-     o3(0xE9,0x89,0x9B), o3(0xEF,0xA6,0x9B),
-     o3(0xE9,0xB3,0xB6), o3(0xEF,0xA6,0x9C),
-     o3(0xEF,0xA6,0x9D), o3(0xEF,0xA6,0x9E),
-     o3(0xE6,0x82,0x85), o3(0xE6,0xB6,0x85),
-     o3(0xEF,0xA6,0x9F), o3(0xE7,0x86,0xB1),
-     o3(0xEF,0xA6,0xA0), o3(0xEF,0xA6,0xA1),
-     o3(0xE9,0x96,0xB1), o3(0xE5,0x8E,0xAD),
-     o3(0xEF,0xA6,0xA2), o3(0xEF,0xA6,0xA3),
-     o3(0xEF,0xA6,0xA4), o3(0xE6,0x9F,0x93),
-     o3(0xEF,0xA6,0xA5), o3(0xE7,0x82,0x8E),
-     o3(0xE7,0x84,0xB0), o3(0xE7,0x90,0xB0),
-     o3(0xE8,0x89,0xB6), o3(0xE8,0x8B,0x92),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E6 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E6_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E7_infos[95] = {
-     o3(0xEF,0xA6,0xA6), o3(0xE9,0x96,0xBB),
-     o3(0xE9,0xAB,0xA5), o3(0xE9,0xB9,0xBD),
-     o3(0xE6,0x9B,0x84), o3(0xEF,0xA6,0xA7),
-     o3(0xE7,0x87,0x81), o3(0xE8,0x91,0x89),
-     o3(0xEF,0xA6,0xA8), o3(0xEF,0xA6,0xA9),
-     o3(0xE5,0xA1,0x8B), o3(0xEF,0xA6,0xAA),
-     o3(0xEF,0xA6,0xAB), o3(0xE5,0xB6,0xB8),
-     o3(0xE5,0xBD,0xB1), o3(0xEF,0xA6,0xAC),
-     o3(0xE6,0x98,0xA0), o3(0xE6,0x9A,0x8E),
-     o3(0xE6,0xA5,0xB9), o3(0xE6,0xA6,0xAE),
-     o3(0xE6,0xB0,0xB8), o3(0xE6,0xB3,0xB3),
-     o3(0xE6,0xB8,0xB6), o3(0xE6,0xBD,0x81),
-     o3(0xE6,0xBF,0x9A), o3(0xE7,0x80,0x9B),
-     o3(0xE7,0x80,0xAF), o3(0xE7,0x85,0x90),
-     o3(0xE7,0x87,0x9F), o3(0xE7,0x8D,0xB0),
-     o3(0xEF,0xA6,0xAD), o3(0xE7,0x91,0x9B),
-     o3(0xEF,0xA6,0xAE), o3(0xE7,0x93,0x94),
-     o3(0xE7,0x9B,0x88), o3(0xE7,0xA9,0x8E),
-     o3(0xE7,0xBA,0x93), o3(0xEF,0xA6,0xAF),
-     o3(0xEF,0xA6,0xB0), o3(0xE8,0x8B,0xB1),
-     o3(0xE8,0xA9,0xA0), o3(0xE8,0xBF,0x8E),
-     o3(0xEF,0xA6,0xB1), o3(0xE9,0x8D,0x88),
-     o3(0xEF,0xA6,0xB2), o3(0xE9,0x9C,0x99),
-     o3(0xEF,0xA6,0xB3), o3(0xEF,0xA6,0xB4),
-     o3(0xE4,0xB9,0x82), o3(0xE5,0x80,0xAA),
-     o3(0xEF,0xA6,0xB5), o3(0xE5,0x88,0x88),
-     o3(0xE5,0x8F,0xA1), o3(0xE6,0x9B,0xB3),
-     o3(0xE6,0xB1,0xAD), o3(0xE6,0xBF,0x8A),
-     o3(0xE7,0x8C,0x8A), o3(0xE7,0x9D,0xBF),
-     o3(0xE7,0xA9,0xA2), o3(0xE8,0x8A,0xAE),
-     o3(0xE8,0x97,0x9D), o3(0xE8,0x98,0x82),
-     o3(0xEF,0xA6,0xB6), o3(0xE8,0xA3,0x94),
-     o3(0xE8,0xA9,0xA3), o3(0xE8,0xAD,0xBD),
-     o3(0xE8,0xB1,0xAB), o3(0xEF,0xA6,0xB7),
-     o3(0xE9,0x8A,0xB3), o3(0xEF,0xA6,0xB8),
-     o3(0xE9,0x9C,0x93), o3(0xE9,0xA0,0x90),
-     o3(0xE4,0xBA,0x94), o3(0xE4,0xBC,0x8D),
-     o3(0xE4,0xBF,0x89), o3(0xE5,0x82,0xB2),
-     o3(0xE5,0x8D,0x88), o3(0xE5,0x90,0xBE),
-     o3(0xE5,0x90,0xB3), o3(0xE5,0x97,0x9A),
-     o3(0xE5,0xA1,0xA2), o3(0xE5,0xA2,0xBA),
-     o3(0xE5,0xA5,0xA7), o3(0xE5,0xA8,0x9B),
-     o3(0xE5,0xAF,0xA4), o3(0xE6,0x82,0x9F),
-     o3(0xEF,0xA6,0xB9), o3(0xE6,0x87,0x8A),
-     o3(0xE6,0x95,0x96), o3(0xE6,0x97,0xBF),
-     o3(0xE6,0x99,0xA4), o3(0xE6,0xA2,0xA7),
-     o3(0xE6,0xB1,0x9A), o3(0xE6,0xBE,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E7 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E7_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E8_infos[95] = {
-     o3(0xE7,0x83,0x8F), o3(0xE7,0x86,0xAC),
-     o3(0xE7,0x8D,0x92), o3(0xE7,0xAD,0xBD),
-     o3(0xE8,0x9C,0x88), o3(0xE8,0xAA,0xA4),
-     o3(0xE9,0xB0,0xB2), o3(0xE9,0xBC,0x87),
-     o3(0xE5,0xB1,0x8B), o3(0xE6,0xB2,0x83),
-     o3(0xE7,0x8D,0x84), o3(0xE7,0x8E,0x89),
-     o3(0xE9,0x88,0xBA), o3(0xE6,0xBA,0xAB),
-     o3(0xE7,0x91,0xA5), o3(0xE7,0x98,0x9F),
-     o3(0xE7,0xA9,0xA9), o3(0xE7,0xB8,0x95),
-     o3(0xE8,0x98,0x8A), o3(0xE5,0x85,0x80),
-     o3(0xE5,0xA3,0x85), o3(0xE6,0x93,0x81),
-     o3(0xE7,0x93,0xAE), o3(0xE7,0x94,0x95),
-     o3(0xE7,0x99,0xB0), o3(0xE7,0xBF,0x81),
-     o3(0xE9,0x82,0x95), o3(0xE9,0x9B,0x8D),
-     o3(0xE9,0xA5,0x94), o3(0xE6,0xB8,0xA6),
-     o3(0xE7,0x93,0xA6), o3(0xE7,0xAA,0xA9),
-     o3(0xE7,0xAA,0xAA), o3(0xE8,0x87,0xA5),
-     o3(0xE8,0x9B,0x99), o3(0xE8,0x9D,0xB8),
-     o3(0xE8,0xA8,0x9B), o3(0xE5,0xA9,0x89),
-     o3(0xE5,0xAE,0x8C), o3(0xE5,0xAE,0x9B),
-     o3(0xE6,0xA2,0xA1), o3(0xE6,0xA4,0x80),
-     o3(0xE6,0xB5,0xA3), o3(0xE7,0x8E,0xA9),
-     o3(0xE7,0x90,0x93), o3(0xE7,0x90,0xAC),
-     o3(0xE7,0xA2,0x97), o3(0xE7,0xB7,0xA9),
-     o3(0xE7,0xBF,0xAB), o3(0xE8,0x84,0x98),
-     o3(0xE8,0x85,0x95), o3(0xE8,0x8E,0x9E),
-     o3(0xE8,0xB1,0x8C), o3(0xE9,0x98,0xAE),
-     o3(0xE9,0xA0,0x91), o3(0xE6,0x9B,0xB0),
-     o3(0xE5,0xBE,0x80), o3(0xE6,0x97,0xBA),
-     o3(0xE6,0x9E,0x89), o3(0xE6,0xB1,0xAA),
-     o3(0xE7,0x8E,0x8B), o3(0xE5,0x80,0xAD),
-     o3(0xE5,0xA8,0x83), o3(0xE6,0xAD,0xAA),
-     o3(0xE7,0x9F,0xAE), o3(0xE5,0xA4,0x96),
-     o3(0xE5,0xB5,0xAC), o3(0xE5,0xB7,0x8D),
-     o3(0xE7,0x8C,0xA5), o3(0xE7,0x95,0x8F),
-     o3(0xEF,0xA6,0xBA), o3(0xEF,0xA6,0xBB),
-     o3(0xE5,0x83,0xA5), o3(0xE5,0x87,0xB9),
-     o3(0xE5,0xA0,0xAF), o3(0xE5,0xA4,0xAD),
-     o3(0xE5,0xA6,0x96), o3(0xE5,0xA7,0x9A),
-     o3(0xE5,0xAF,0xA5), o3(0xEF,0xA6,0xBC),
-     o3(0xEF,0xA6,0xBD), o3(0xE5,0xB6,0xA2),
-     o3(0xE6,0x8B,0x97), o3(0xE6,0x90,0x96),
-     o3(0xE6,0x92,0x93), o3(0xE6,0x93,0xBE),
-     o3(0xEF,0xA6,0xBE), o3(0xE6,0x9B,0x9C),
-     o3(0xEF,0xA6,0xBF), o3(0xE6,0xA9,0x88),
-     o3(0xEF,0xA7,0x80), o3(0xE7,0x87,0xBF),
-     o3(0xE7,0x91,0xA4), o3(0xEF,0xA7,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E8 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_E9_infos[95] = {
-     o3(0xE7,0xAA,0x88), o3(0xE7,0xAA,0xAF),
-     o3(0xE7,0xB9,0x87), o3(0xE7,0xB9,0x9E),
-     o3(0xE8,0x80,0x80), o3(0xE8,0x85,0xB0),
-     o3(0xEF,0xA7,0x82), o3(0xE8,0x9F,0xAF),
-     o3(0xE8,0xA6,0x81), o3(0xE8,0xAC,0xA0),
-     o3(0xE9,0x81,0x99), o3(0xEF,0xA7,0x83),
-     o3(0xE9,0x82,0x80), o3(0xE9,0xA5,0x92),
-     o3(0xE6,0x85,0xBE), o3(0xE6,0xAC,0xB2),
-     o3(0xE6,0xB5,0xB4), o3(0xE7,0xB8,0x9F),
-     o3(0xE8,0xA4,0xA5), o3(0xE8,0xBE,0xB1),
-     o3(0xE4,0xBF,0x91), o3(0xE5,0x82,0xAD),
-     o3(0xE5,0x86,0x97), o3(0xE5,0x8B,0x87),
-     o3(0xE5,0x9F,0x87), o3(0xE5,0xA2,0x89),
-     o3(0xE5,0xAE,0xB9), o3(0xE5,0xBA,0xB8),
-     o3(0xE6,0x85,0x82), o3(0xE6,0xA6,0x95),
-     o3(0xE6,0xB6,0x8C), o3(0xE6,0xB9,0xA7),
-     o3(0xE6,0xBA,0xB6), o3(0xE7,0x86,0x94),
-     o3(0xE7,0x91,0xA2), o3(0xE7,0x94,0xA8),
-     o3(0xE7,0x94,0xAC), o3(0xE8,0x81,0xB3),
-     o3(0xE8,0x8C,0xB8), o3(0xE8,0x93,0x89),
-     o3(0xE8,0xB8,0x8A), o3(0xE9,0x8E,0x94),
-     o3(0xE9,0x8F,0x9E), o3(0xEF,0xA7,0x84),
-     o3(0xE4,0xBA,0x8E), o3(0xE4,0xBD,0x91),
-     o3(0xE5,0x81,0xB6), o3(0xE5,0x84,0xAA),
-     o3(0xE5,0x8F,0x88), o3(0xE5,0x8F,0x8B),
-     o3(0xE5,0x8F,0xB3), o3(0xE5,0xAE,0x87),
-     o3(0xE5,0xAF,0x93), o3(0xE5,0xB0,0xA4),
-     o3(0xE6,0x84,0x9A), o3(0xE6,0x86,0x82),
-     o3(0xE6,0x97,0xB4), o3(0xE7,0x89,0x9B),
-     o3(0xE7,0x8E,0x97), o3(0xE7,0x91,0x80),
-     o3(0xE7,0x9B,0x82), o3(0xE7,0xA5,0x90),
-     o3(0xE7,0xA6,0x91), o3(0xE7,0xA6,0xB9),
-     o3(0xE7,0xB4,0x86), o3(0xE7,0xBE,0xBD),
-     o3(0xE8,0x8A,0x8B), o3(0xE8,0x97,0x95),
-     o3(0xE8,0x99,0x9E), o3(0xE8,0xBF,0x82),
-     o3(0xE9,0x81,0x87), o3(0xE9,0x83,0xB5),
-     o3(0xE9,0x87,0xAA), o3(0xE9,0x9A,0x85),
-     o3(0xE9,0x9B,0xA8), o3(0xE9,0x9B,0xA9),
-     o3(0xE5,0x8B,0x96), o3(0xE5,0xBD,0xA7),
-     o3(0xE6,0x97,0xAD), o3(0xE6,0x98,0xB1),
-     o3(0xE6,0xA0,0xAF), o3(0xE7,0x85,0x9C),
-     o3(0xE7,0xA8,0xB6), o3(0xE9,0x83,0x81),
-     o3(0xE9,0xA0,0x8A), o3(0xE4,0xBA,0x91),
-     o3(0xEF,0xA7,0x85), o3(0xE6,0xA9,0x92),
-     o3(0xE6,0xAE,0x9E), o3(0xE6,0xBE,0x90),
-     o3(0xE7,0x86,0x89), o3(0xE8,0x80,0x98),
-     o3(0xE8,0x8A,0xB8), o3(0xE8,0x95,0x93),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_E9 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_E9_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_EA_infos[95] = {
-     o3(0xE9,0x81,0x8B), o3(0xE9,0x9A,0x95),
-     o3(0xE9,0x9B,0xB2), o3(0xE9,0x9F,0xBB),
-     o3(0xE8,0x94,0x9A), o3(0xE9,0xAC,0xB1),
-     o3(0xE4,0xBA,0x90), o3(0xE7,0x86,0x8A),
-     o3(0xE9,0x9B,0x84), o3(0xE5,0x85,0x83),
-     o3(0xE5,0x8E,0x9F), o3(0xE5,0x93,0xA1),
-     o3(0xE5,0x9C,0x93), o3(0xE5,0x9C,0x92),
-     o3(0xE5,0x9E,0xA3), o3(0xE5,0xAA,0x9B),
-     o3(0xE5,0xAB,0x84), o3(0xE5,0xAF,0x83),
-     o3(0xE6,0x80,0xA8), o3(0xE6,0x84,0xBF),
-     o3(0xE6,0x8F,0xB4), o3(0xE6,0xB2,0x85),
-     o3(0xE6,0xB4,0xB9), o3(0xE6,0xB9,0xB2),
-     o3(0xE6,0xBA,0x90), o3(0xE7,0x88,0xB0),
-     o3(0xE7,0x8C,0xBF), o3(0xE7,0x91,0x97),
-     o3(0xE8,0x8B,0x91), o3(0xE8,0xA2,0x81),
-     o3(0xE8,0xBD,0x85), o3(0xE9,0x81,0xA0),
-     o3(0xEF,0xA7,0x86), o3(0xE9,0x99,0xA2),
-     o3(0xE9,0xA1,0x98), o3(0xE9,0xB4,0x9B),
-     o3(0xE6,0x9C,0x88), o3(0xE8,0xB6,0x8A),
-     o3(0xE9,0x89,0x9E), o3(0xE4,0xBD,0x8D),
-     o3(0xE5,0x81,0x89), o3(0xE5,0x83,0x9E),
-     o3(0xE5,0x8D,0xB1), o3(0xE5,0x9C,0x8D),
-     o3(0xE5,0xA7,0x94), o3(0xE5,0xA8,0x81),
-     o3(0xE5,0xB0,0x89), o3(0xE6,0x85,0xB0),
-     o3(0xE6,0x9A,0x90), o3(0xE6,0xB8,0xAD),
-     o3(0xE7,0x88,0xB2), o3(0xE7,0x91,0x8B),
-     o3(0xE7,0xB7,0xAF), o3(0xE8,0x83,0x83),
-     o3(0xE8,0x90,0x8E), o3(0xE8,0x91,0xA6),
-     o3(0xE8,0x94,0xBF), o3(0xE8,0x9D,0x9F),
-     o3(0xE8,0xA1,0x9B), o3(0xE8,0xA4,0x98),
-     o3(0xE8,0xAC,0x82), o3(0xE9,0x81,0x95),
-     o3(0xE9,0x9F,0x8B), o3(0xE9,0xAD,0x8F),
-     o3(0xE4,0xB9,0xB3), o3(0xE4,0xBE,0x91),
-     o3(0xE5,0x84,0x92), o3(0xE5,0x85,0xAA),
-     o3(0xEF,0xA7,0x87), o3(0xE5,0x94,0xAF),
-     o3(0xE5,0x96,0xA9), o3(0xE5,0xAD,0xBA),
-     o3(0xE5,0xAE,0xA5), o3(0xE5,0xB9,0xBC),
-     o3(0xE5,0xB9,0xBD), o3(0xE5,0xBA,0xBE),
-     o3(0xE6,0x82,0xA0), o3(0xE6,0x83,0x9F),
-     o3(0xE6,0x84,0x88), o3(0xE6,0x84,0x89),
-     o3(0xE6,0x8F,0x84), o3(0xE6,0x94,0xB8),
-     o3(0xE6,0x9C,0x89), o3(0xEF,0xA7,0x88),
-     o3(0xE6,0x9F,0x94), o3(0xE6,0x9F,0x9A),
-     o3(0xEF,0xA7,0x89), o3(0xE6,0xA5,0xA1),
-     o3(0xE6,0xA5,0xA2), o3(0xE6,0xB2,0xB9),
-     o3(0xE6,0xB4,0xA7), o3(0xEF,0xA7,0x8A),
-     o3(0xE6,0xB8,0xB8), o3(0xEF,0xA7,0x8B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_EA = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_EA_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_EB_infos[95] = {
-     o3(0xE6,0xBF,0xA1), o3(0xE7,0x8C,0xB6),
-     o3(0xE7,0x8C,0xB7), o3(0xEF,0xA7,0x8C),
-     o3(0xE7,0x91,0x9C), o3(0xE7,0x94,0xB1),
-     o3(0xEF,0xA7,0x8D), o3(0xE7,0x99,0x92),
-     o3(0xEF,0xA7,0x8E), o3(0xEF,0xA7,0x8F),
-     o3(0xE7,0xB6,0xAD), o3(0xE8,0x87,0xBE),
-     o3(0xE8,0x90,0xB8), o3(0xE8,0xA3,0x95),
-     o3(0xE8,0xAA,0x98), o3(0xE8,0xAB,0x9B),
-     o3(0xE8,0xAB,0xAD), o3(0xE8,0xB8,0xB0),
-     o3(0xE8,0xB9,0x82), o3(0xE9,0x81,0x8A),
-     o3(0xE9,0x80,0xBE), o3(0xE9,0x81,0xBA),
-     o3(0xE9,0x85,0x89), o3(0xE9,0x87,0x89),
-     o3(0xE9,0x8D,0xAE), o3(0xEF,0xA7,0x90),
-     o3(0xEF,0xA7,0x91), o3(0xE5,0xA0,0x89),
-     o3(0xEF,0xA7,0x92), o3(0xE6,0xAF,0x93),
-     o3(0xE8,0x82,0x89), o3(0xE8,0x82,0xB2),
-     o3(0xEF,0xA7,0x93), o3(0xEF,0xA7,0x94),
-     o3(0xE5,0x85,0x81), o3(0xE5,0xA5,0xAB),
-     o3(0xE5,0xB0,0xB9), o3(0xEF,0xA7,0x95),
-     o3(0xEF,0xA7,0x96), o3(0xE6,0xBD,0xA4),
-     o3(0xE7,0x8E,0xA7), o3(0xE8,0x83,0xA4),
-     o3(0xE8,0xB4,0x87), o3(0xEF,0xA7,0x97),
-     o3(0xE9,0x88,0x97), o3(0xE9,0x96,0x8F),
-     o3(0xEF,0xA7,0x98), o3(0xEF,0xA7,0x99),
-     o3(0xEF,0xA7,0x9A), o3(0xEF,0xA7,0x9B),
-     o3(0xE8,0x81,0xBF), o3(0xE6,0x88,0x8E),
-     o3(0xE7,0x80,0x9C), o3(0xE7,0xB5,0xA8),
-     o3(0xE8,0x9E,0x8D), o3(0xEF,0xA7,0x9C),
-     o3(0xE5,0x9E,0xA0), o3(0xE6,0x81,0xA9),
-     o3(0xE6,0x85,0x87), o3(0xE6,0xAE,0xB7),
-     o3(0xE8,0xAA,0xBE), o3(0xE9,0x8A,0x80),
-     o3(0xE9,0x9A,0xB1), o3(0xE4,0xB9,0x99),
-     o3(0xE5,0x90,0x9F), o3(0xE6,0xB7,0xAB),
-     o3(0xE8,0x94,0xAD), o3(0xE9,0x99,0xB0),
-     o3(0xE9,0x9F,0xB3), o3(0xE9,0xA3,0xAE),
-     o3(0xE6,0x8F,0x96), o3(0xE6,0xB3,0xA3),
-     o3(0xE9,0x82,0x91), o3(0xE5,0x87,0x9D),
-     o3(0xE6,0x87,0x89), o3(0xE8,0x86,0xBA),
-     o3(0xE9,0xB7,0xB9), o3(0xE4,0xBE,0x9D),
-     o3(0xE5,0x80,0x9A), o3(0xE5,0x84,0x80),
-     o3(0xE5,0xAE,0x9C), o3(0xE6,0x84,0x8F),
-     o3(0xE6,0x87,0xBF), o3(0xE6,0x93,0xAC),
-     o3(0xE6,0xA4,0x85), o3(0xE6,0xAF,0x85),
-     o3(0xE7,0x96,0x91), o3(0xE7,0x9F,0xA3),
-     o3(0xE7,0xBE,0xA9), o3(0xE8,0x89,0xA4),
-     o3(0xE8,0x96,0x8F), o3(0xE8,0x9F,0xBB),
-     o3(0xE8,0xA1,0xA3), o3(0xE8,0xAA,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_EB = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_EB_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_EC_infos[95] = {
-     o3(0xE8,0xAD,0xB0), o3(0xE9,0x86,0xAB),
-     o3(0xE4,0xBA,0x8C), o3(0xE4,0xBB,0xA5),
-     o3(0xE4,0xBC,0x8A), o3(0xEF,0xA7,0x9D),
-     o3(0xEF,0xA7,0x9E), o3(0xE5,0xA4,0xB7),
-     o3(0xE5,0xA7,0xA8), o3(0xEF,0xA7,0x9F),
-     o3(0xE5,0xB7,0xB2), o3(0xE5,0xBC,0x9B),
-     o3(0xE5,0xBD,0x9B), o3(0xE6,0x80,0xA1),
-     o3(0xEF,0xA7,0xA0), o3(0xEF,0xA7,0xA1),
-     o3(0xEF,0xA7,0xA2), o3(0xEF,0xA7,0xA3),
-     o3(0xE7,0x88,0xBE), o3(0xE7,0x8F,0xA5),
-     o3(0xEF,0xA7,0xA4), o3(0xE7,0x95,0xB0),
-     o3(0xE7,0x97,0x8D), o3(0xEF,0xA7,0xA5),
-     o3(0xE7,0xA7,0xBB), o3(0xEF,0xA7,0xA6),
-     o3(0xE8,0x80,0x8C), o3(0xE8,0x80,0xB3),
-     o3(0xE8,0x82,0x84), o3(0xE8,0x8B,0xA1),
-     o3(0xE8,0x8D,0x91), o3(0xEF,0xA7,0xA7),
-     o3(0xEF,0xA7,0xA8), o3(0xE8,0xB2,0xBD),
-     o3(0xE8,0xB2,0xB3), o3(0xE9,0x82,0x87),
-     o3(0xEF,0xA7,0xA9), o3(0xEF,0xA7,0xAA),
-     o3(0xE9,0xA3,0xB4), o3(0xE9,0xA4,0x8C),
-     o3(0xEF,0xA7,0xAB), o3(0xEF,0xA7,0xAC),
-     o3(0xE7,0x80,0xB7), o3(0xE7,0x9B,0x8A),
-     o3(0xE7,0xBF,0x8A), o3(0xE7,0xBF,0x8C),
-     o3(0xE7,0xBF,0xBC), o3(0xE8,0xAC,0x9A),
-     o3(0xE4,0xBA,0xBA), o3(0xE4,0xBB,0x81),
-     o3(0xE5,0x88,0x83), o3(0xE5,0x8D,0xB0),
-     o3(0xEF,0xA7,0xAD), o3(0xE5,0x92,0xBD),
-     o3(0xE5,0x9B,0xA0), o3(0xE5,0xA7,0xBB),
-     o3(0xE5,0xAF,0x85), o3(0xE5,0xBC,0x95),
-     o3(0xE5,0xBF,0x8D), o3(0xE6,0xB9,0xAE),
-     o3(0xEF,0xA7,0xAE), o3(0xEF,0xA7,0xAF),
-     o3(0xE7,0xB5,0xAA), o3(0xE8,0x8C,0xB5),
-     o3(0xEF,0xA7,0xB0), o3(0xE8,0x9A,0x93),
-     o3(0xE8,0xAA,0x8D), o3(0xEF,0xA7,0xB1),
-     o3(0xE9,0x9D,0xAD), o3(0xE9,0x9D,0xB7),
-     o3(0xEF,0xA7,0xB2), o3(0xEF,0xA7,0xB3),
-     o3(0xE4,0xB8,0x80), o3(0xE4,0xBD,0x9A),
-     o3(0xE4,0xBD,0xBE), o3(0xE5,0xA3,0xB9),
-     o3(0xE6,0x97,0xA5), o3(0xE6,0xBA,0xA2),
-     o3(0xE9,0x80,0xB8), o3(0xE9,0x8E,0xB0),
-     o3(0xE9,0xA6,0xB9), o3(0xE4,0xBB,0xBB),
-     o3(0xE5,0xA3,0xAC), o3(0xE5,0xA6,0x8A),
-     o3(0xE5,0xA7,0x99), o3(0xE6,0x81,0x81),
-     o3(0xEF,0xA7,0xB4), o3(0xEF,0xA7,0xB5),
-     o3(0xE7,0xA8,0x94), o3(0xEF,0xA7,0xB6),
-     o3(0xE8,0x8D,0x8F), o3(0xE8,0xB3,0x83),
-     o3(0xE5,0x85,0xA5), o3(0xE5,0x8D,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_EC = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_EC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_ED_infos[95] = {
-     o3(0xEF,0xA7,0xB7), o3(0xEF,0xA7,0xB8),
-     o3(0xEF,0xA7,0xB9), o3(0xE4,0xBB,0x8D),
-     o3(0xE5,0x89,0xA9), o3(0xE5,0xAD,0x95),
-     o3(0xE8,0x8A,0xBF), o3(0xE4,0xBB,0x94),
-     o3(0xE5,0x88,0xBA), o3(0xE5,0x92,0xA8),
-     o3(0xE5,0xA7,0x89), o3(0xE5,0xA7,0xBF),
-     o3(0xE5,0xAD,0x90), o3(0xE5,0xAD,0x97),
-     o3(0xE5,0xAD,0x9C), o3(0xE6,0x81,0xA3),
-     o3(0xE6,0x85,0x88), o3(0xE6,0xBB,0x8B),
-     o3(0xE7,0x82,0x99), o3(0xE7,0x85,0xAE),
-     o3(0xE7,0x8E,0x86), o3(0xE7,0x93,0xB7),
-     o3(0xE7,0x96,0xB5), o3(0xE7,0xA3,0x81),
-     o3(0xE7,0xB4,0xAB), o3(0xE8,0x80,0x85),
-     o3(0xE8,0x87,0xAA), o3(0xE8,0x8C,0xA8),
-     o3(0xE8,0x94,0x97), o3(0xE8,0x97,0x89),
-     o3(0xE8,0xAB,0xAE), o3(0xE8,0xB3,0x87),
-     o3(0xE9,0x9B,0x8C), o3(0xE4,0xBD,0x9C),
-     o3(0xE5,0x8B,0xBA), o3(0xE5,0x9A,0xBC),
-     o3(0xE6,0x96,0xAB), o3(0xE6,0x98,0xA8),
-     o3(0xE7,0x81,0xBC), o3(0xE7,0x82,0xB8),
-     o3(0xE7,0x88,0xB5), o3(0xE7,0xB6,0xBD),
-     o3(0xE8,0x8A,0x8D), o3(0xE9,0x85,0x8C),
-     o3(0xE9,0x9B,0x80), o3(0xE9,0xB5,0xB2),
-     o3(0xE5,0xAD,0xB1), o3(0xE6,0xA3,0xA7),
-     o3(0xE6,0xAE,0x98), o3(0xE6,0xBD,0xBA),
-     o3(0xE7,0x9B,0x9E), o3(0xE5,0xB2,0x91),
-     o3(0xE6,0x9A,0xAB), o3(0xE6,0xBD,0x9B),
-     o3(0xE7,0xAE,0xB4), o3(0xE7,0xB0,0xAA),
-     o3(0xE8,0xA0,0xB6), o3(0xE9,0x9B,0x9C),
-     o3(0xE4,0xB8,0x88), o3(0xE4,0xBB,0x97),
-     o3(0xE5,0x8C,0xA0), o3(0xE5,0xA0,0xB4),
-     o3(0xE5,0xA2,0xBB), o3(0xE5,0xA3,0xAF),
-     o3(0xE5,0xA5,0xAC), o3(0xE5,0xB0,0x87),
-     o3(0xE5,0xB8,0xB3), o3(0xE5,0xBA,0x84),
-     o3(0xE5,0xBC,0xB5), o3(0xE6,0x8E,0x8C),
-     o3(0xE6,0x9A,0xB2), o3(0xE6,0x9D,0x96),
-     o3(0xE6,0xA8,0x9F), o3(0xE6,0xAA,0xA3),
-     o3(0xE6,0xAC,0x8C), o3(0xE6,0xBC,0xBF),
-     o3(0xE7,0x89,0x86), o3(0xEF,0xA7,0xBA),
-     o3(0xE7,0x8D,0x90), o3(0xE7,0x92,0x8B),
-     o3(0xE7,0xAB,0xA0), o3(0xE7,0xB2,0xA7),
-     o3(0xE8,0x85,0xB8), o3(0xE8,0x87,0x9F),
-     o3(0xE8,0x87,0xA7), o3(0xE8,0x8E,0x8A),
-     o3(0xE8,0x91,0xAC), o3(0xE8,0x94,0xA3),
-     o3(0xE8,0x96,0x94), o3(0xE8,0x97,0x8F),
-     o3(0xE8,0xA3,0x9D), o3(0xE8,0xB4,0x93),
-     o3(0xE9,0x86,0xAC), o3(0xE9,0x95,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_ED = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_ED_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_EE_infos[95] = {
-     o3(0xE9,0x9A,0x9C), o3(0xE5,0x86,0x8D),
-     o3(0xE5,0x93,0x89), o3(0xE5,0x9C,0xA8),
-     o3(0xE5,0xAE,0xB0), o3(0xE6,0x89,0x8D),
-     o3(0xE6,0x9D,0x90), o3(0xE6,0xA0,0xBD),
-     o3(0xE6,0xA2,0x93), o3(0xE6,0xB8,0xBD),
-     o3(0xE6,0xBB,0x93), o3(0xE7,0x81,0xBD),
-     o3(0xE7,0xB8,0xA1), o3(0xE8,0xA3,0x81),
-     o3(0xE8,0xB2,0xA1), o3(0xE8,0xBC,0x89),
-     o3(0xE9,0xBD,0x8B), o3(0xE9,0xBD,0x8E),
-     o3(0xE7,0x88,0xAD), o3(0xE7,0xAE,0x8F),
-     o3(0xE8,0xAB,0x8D), o3(0xE9,0x8C,0x9A),
-     o3(0xE4,0xBD,0x87), o3(0xE4,0xBD,0x8E),
-     o3(0xE5,0x84,0xB2), o3(0xE5,0x92,0x80),
-     o3(0xE5,0xA7,0x90), o3(0xE5,0xBA,0x95),
-     o3(0xE6,0x8A,0xB5), o3(0xE6,0x9D,0xB5),
-     o3(0xE6,0xA5,0xAE), o3(0xE6,0xA8,0x97),
-     o3(0xE6,0xB2,0xAE), o3(0xE6,0xB8,0x9A),
-     o3(0xE7,0x8B,0x99), o3(0xE7,0x8C,0xAA),
-     o3(0xE7,0x96,0xBD), o3(0xE7,0xAE,0xB8),
-     o3(0xE7,0xB4,0xB5), o3(0xE8,0x8B,0xA7),
-     o3(0xE8,0x8F,0xB9), o3(0xE8,0x91,0x97),
-     o3(0xE8,0x97,0xB7), o3(0xE8,0xA9,0x9B),
-     o3(0xE8,0xB2,0xAF), o3(0xE8,0xBA,0x87),
-     o3(0xE9,0x80,0x99), o3(0xE9,0x82,0xB8),
-     o3(0xE9,0x9B,0x8E), o3(0xE9,0xBD,0x9F),
-     o3(0xE5,0x8B,0xA3), o3(0xE5,0x90,0x8A),
-     o3(0xE5,0xAB,0xA1), o3(0xE5,0xAF,0x82),
-     o3(0xE6,0x91,0x98), o3(0xE6,0x95,0xB5),
-     o3(0xE6,0xBB,0xB4), o3(0xE7,0x8B,0x84),
-     o3(0xEF,0xA7,0xBB), o3(0xE7,0x9A,0x84),
-     o3(0xE7,0xA9,0x8D), o3(0xE7,0xAC,0x9B),
-     o3(0xE7,0xB1,0x8D), o3(0xE7,0xB8,0xBE),
-     o3(0xE7,0xBF,0x9F), o3(0xE8,0x8D,0xBB),
-     o3(0xE8,0xAC,0xAB), o3(0xE8,0xB3,0x8A),
-     o3(0xE8,0xB5,0xA4), o3(0xE8,0xB7,0xA1),
-     o3(0xE8,0xB9,0x9F), o3(0xE8,0xBF,0xAA),
-     o3(0xE8,0xBF,0xB9), o3(0xE9,0x81,0xA9),
-     o3(0xE9,0x8F,0x91), o3(0xE4,0xBD,0x83),
-     o3(0xE4,0xBD,0xBA), o3(0xE5,0x82,0xB3),
-     o3(0xE5,0x85,0xA8), o3(0xE5,0x85,0xB8),
-     o3(0xE5,0x89,0x8D), o3(0xE5,0x89,0xAA),
-     o3(0xE5,0xA1,0xA1), o3(0xE5,0xA1,0xBC),
-     o3(0xE5,0xA5,0xA0), o3(0xE5,0xB0,0x88),
-     o3(0xE5,0xB1,0x95), o3(0xE5,0xBB,0x9B),
-     o3(0xE6,0x82,0x9B), o3(0xE6,0x88,0xB0),
-     o3(0xE6,0xA0,0x93), o3(0xE6,0xAE,0xBF),
-     o3(0xE6,0xB0,0x88), o3(0xE6,0xBE,0xB1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_EE = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_EE_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_EF_infos[95] = {
-     o3(0xE7,0x85,0x8E), o3(0xE7,0x90,0xA0),
-     o3(0xE7,0x94,0xB0), o3(0xE7,0x94,0xB8),
-     o3(0xE7,0x95,0x91), o3(0xE7,0x99,0xB2),
-     o3(0xE7,0xAD,0x8C), o3(0xE7,0xAE,0x8B),
-     o3(0xE7,0xAE,0xAD), o3(0xE7,0xAF,0x86),
-     o3(0xE7,0xBA,0x8F), o3(0xE8,0xA9,0xAE),
-     o3(0xE8,0xBC,0xBE), o3(0xE8,0xBD,0x89),
-     o3(0xE9,0x88,0xBF), o3(0xE9,0x8A,0x93),
-     o3(0xE9,0x8C,0xA2), o3(0xE9,0x90,0xAB),
-     o3(0xE9,0x9B,0xBB), o3(0xE9,0xA1,0x9A),
-     o3(0xE9,0xA1,0xAB), o3(0xE9,0xA4,0x9E),
-     o3(0xE5,0x88,0x87), o3(0xE6,0x88,0xAA),
-     o3(0xE6,0x8A,0x98), o3(0xE6,0xB5,0x99),
-     o3(0xE7,0x99,0xA4), o3(0xE7,0xAB,0x8A),
-     o3(0xE7,0xAF,0x80), o3(0xE7,0xB5,0xB6),
-     o3(0xE5,0x8D,0xA0), o3(0xE5,0xB2,0xBE),
-     o3(0xE5,0xBA,0x97), o3(0xE6,0xBC,0xB8),
-     o3(0xE7,0x82,0xB9), o3(0xE7,0xB2,0x98),
-     o3(0xE9,0x9C,0x91), o3(0xE9,0xAE,0x8E),
-     o3(0xE9,0xBB,0x9E), o3(0xE6,0x8E,0xA5),
-     o3(0xE6,0x91,0xBA), o3(0xE8,0x9D,0xB6),
-     o3(0xE4,0xB8,0x81), o3(0xE4,0xBA,0x95),
-     o3(0xE4,0xBA,0xAD), o3(0xE5,0x81,0x9C),
-     o3(0xE5,0x81,0xB5), o3(0xE5,0x91,0x88),
-     o3(0xE5,0xA7,0x83), o3(0xE5,0xAE,0x9A),
-     o3(0xE5,0xB9,0x80), o3(0xE5,0xBA,0xAD),
-     o3(0xE5,0xBB,0xB7), o3(0xE5,0xBE,0x81),
-     o3(0xE6,0x83,0x85), o3(0xE6,0x8C,0xBA),
-     o3(0xE6,0x94,0xBF), o3(0xE6,0x95,0xB4),
-     o3(0xE6,0x97,0x8C), o3(0xE6,0x99,0xB6),
-     o3(0xE6,0x99,0xB8), o3(0xE6,0x9F,0xBE),
-     o3(0xE6,0xA5,0xA8), o3(0xE6,0xAA,0x89),
-     o3(0xE6,0xAD,0xA3), o3(0xE6,0xB1,0x80),
-     o3(0xE6,0xB7,0x80), o3(0xE6,0xB7,0xA8),
-     o3(0xE6,0xB8,0x9F), o3(0xE6,0xB9,0x9E),
-     o3(0xE7,0x80,0x9E), o3(0xE7,0x82,0xA1),
-     o3(0xE7,0x8E,0x8E), o3(0xE7,0x8F,0xBD),
-     o3(0xE7,0x94,0xBA), o3(0xE7,0x9D,0x9B),
-     o3(0xE7,0xA2,0x87), o3(0xE7,0xA6,0x8E),
-     o3(0xE7,0xA8,0x8B), o3(0xE7,0xA9,0xBD),
-     o3(0xE7,0xB2,0xBE), o3(0xE7,0xB6,0x8E),
-     o3(0xE8,0x89,0x87), o3(0xE8,0xA8,0x82),
-     o3(0xE8,0xAB,0xAA), o3(0xE8,0xB2,0x9E),
-     o3(0xE9,0x84,0xAD), o3(0xE9,0x85,0x8A),
-     o3(0xE9,0x87,0x98), o3(0xE9,0x89,0xA6),
-     o3(0xE9,0x8B,0x8C), o3(0xE9,0x8C,0xA0),
-     o3(0xE9,0x9C,0x86), o3(0xE9,0x9D,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_EF = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_EF_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F0_infos[95] = {
-     o3(0xE9,0x9D,0x9C), o3(0xE9,0xA0,0x82),
-     o3(0xE9,0xBC,0x8E), o3(0xE5,0x88,0xB6),
-     o3(0xE5,0x8A,0x91), o3(0xE5,0x95,0xBC),
-     o3(0xE5,0xA0,0xA4), o3(0xE5,0xB8,0x9D),
-     o3(0xE5,0xBC,0x9F), o3(0xE6,0x82,0x8C),
-     o3(0xE6,0x8F,0x90), o3(0xE6,0xA2,0xAF),
-     o3(0xE6,0xBF,0x9F), o3(0xE7,0xA5,0xAD),
-     o3(0xE7,0xAC,0xAC), o3(0xE8,0x87,0x8D),
-     o3(0xE8,0x96,0xBA), o3(0xE8,0xA3,0xBD),
-     o3(0xE8,0xAB,0xB8), o3(0xE8,0xB9,0x84),
-     o3(0xE9,0x86,0x8D), o3(0xE9,0x99,0xA4),
-     o3(0xE9,0x9A,0x9B), o3(0xE9,0x9C,0xBD),
-     o3(0xE9,0xA1,0x8C), o3(0xE9,0xBD,0x8A),
-     o3(0xE4,0xBF,0x8E), o3(0xE5,0x85,0x86),
-     o3(0xE5,0x87,0x8B), o3(0xE5,0x8A,0xA9),
-     o3(0xE5,0x98,0xB2), o3(0xE5,0xBC,0x94),
-     o3(0xE5,0xBD,0xAB), o3(0xE6,0x8E,0xAA),
-     o3(0xE6,0x93,0x8D), o3(0xE6,0x97,0xA9),
-     o3(0xE6,0x99,0x81), o3(0xE6,0x9B,0xBA),
-     o3(0xE6,0x9B,0xB9), o3(0xE6,0x9C,0x9D),
-     o3(0xE6,0xA2,0x9D), o3(0xE6,0xA3,0x97),
-     o3(0xE6,0xA7,0xBD), o3(0xE6,0xBC,0x95),
-     o3(0xE6,0xBD,0xAE), o3(0xE7,0x85,0xA7),
-     o3(0xE7,0x87,0xA5), o3(0xE7,0x88,0xAA),
-     o3(0xE7,0x92,0xAA), o3(0xE7,0x9C,0xBA),
-     o3(0xE7,0xA5,0x96), o3(0xE7,0xA5,0x9A),
-     o3(0xE7,0xA7,0x9F), o3(0xE7,0xA8,0xA0),
-     o3(0xE7,0xAA,0x95), o3(0xE7,0xB2,0x97),
-     o3(0xE7,0xB3,0x9F), o3(0xE7,0xB5,0x84),
-     o3(0xE7,0xB9,0xB0), o3(0xE8,0x82,0x87),
-     o3(0xE8,0x97,0xBB), o3(0xE8,0x9A,0xA4),
-     o3(0xE8,0xA9,0x94), o3(0xE8,0xAA,0xBF),
-     o3(0xE8,0xB6,0x99), o3(0xE8,0xBA,0x81),
-     o3(0xE9,0x80,0xA0), o3(0xE9,0x81,0xAD),
-     o3(0xE9,0x87,0xA3), o3(0xE9,0x98,0xBB),
-     o3(0xE9,0x9B,0x95), o3(0xE9,0xB3,0xA5),
-     o3(0xE6,0x97,0x8F), o3(0xE7,0xB0,0x87),
-     o3(0xE8,0xB6,0xB3), o3(0xE9,0x8F,0x83),
-     o3(0xE5,0xAD,0x98), o3(0xE5,0xB0,0x8A),
-     o3(0xE5,0x8D,0x92), o3(0xE6,0x8B,0x99),
-     o3(0xE7,0x8C,0x9D), o3(0xE5,0x80,0xA7),
-     o3(0xE5,0xAE,0x97), o3(0xE5,0xBE,0x9E),
-     o3(0xE6,0x82,0xB0), o3(0xE6,0x85,0xAB),
-     o3(0xE6,0xA3,0x95), o3(0xE6,0xB7,0x99),
-     o3(0xE7,0x90,0xAE), o3(0xE7,0xA8,0xAE),
-     o3(0xE7,0xB5,0x82), o3(0xE7,0xB6,0x9C),
-     o3(0xE7,0xB8,0xB1), o3(0xE8,0x85,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F0 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F0_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F1_infos[95] = {
-     o3(0xE8,0xB8,0xAA), o3(0xE8,0xB8,0xB5),
-     o3(0xE9,0x8D,0xBE), o3(0xE9,0x90,0x98),
-     o3(0xE4,0xBD,0x90), o3(0xE5,0x9D,0x90),
-     o3(0xE5,0xB7,0xA6), o3(0xE5,0xBA,0xA7),
-     o3(0xE6,0x8C,0xAB), o3(0xE7,0xBD,0xAA),
-     o3(0xE4,0xB8,0xBB), o3(0xE4,0xBD,0x8F),
-     o3(0xE4,0xBE,0x8F), o3(0xE5,0x81,0x9A),
-     o3(0xE5,0xA7,0x9D), o3(0xE8,0x83,0x84),
-     o3(0xE5,0x91,0xAA), o3(0xE5,0x91,0xA8),
-     o3(0xE5,0x97,0xBE), o3(0xE5,0xA5,0x8F),
-     o3(0xE5,0xAE,0x99), o3(0xE5,0xB7,0x9E),
-     o3(0xE5,0xBB,0x9A), o3(0xE6,0x99,0x9D),
-     o3(0xE6,0x9C,0xB1), o3(0xE6,0x9F,0xB1),
-     o3(0xE6,0xA0,0xAA), o3(0xE6,0xB3,0xA8),
-     o3(0xE6,0xB4,0xB2), o3(0xE6,0xB9,0x8A),
-     o3(0xE6,0xBE,0x8D), o3(0xE7,0x82,0xB7),
-     o3(0xE7,0x8F,0xA0), o3(0xE7,0x96,0x87),
-     o3(0xE7,0xB1,0x8C), o3(0xE7,0xB4,0x82),
-     o3(0xE7,0xB4,0xAC), o3(0xE7,0xB6,0xA2),
-     o3(0xE8,0x88,0x9F), o3(0xE8,0x9B,0x9B),
-     o3(0xE8,0xA8,0xBB), o3(0xE8,0xAA,0x85),
-     o3(0xE8,0xB5,0xB0), o3(0xE8,0xBA,0x8A),
-     o3(0xE8,0xBC,0xB3), o3(0xE9,0x80,0xB1),
-     o3(0xE9,0x85,0x8E), o3(0xE9,0x85,0x92),
-     o3(0xE9,0x91,0x84), o3(0xE9,0xA7,0x90),
-     o3(0xE7,0xAB,0xB9), o3(0xE7,0xB2,0xA5),
-     o3(0xE4,0xBF,0x8A), o3(0xE5,0x84,0x81),
-     o3(0xE5,0x87,0x86), o3(0xE5,0x9F,0x88),
-     o3(0xE5,0xAF,0xAF), o3(0xE5,0xB3,0xBB),
-     o3(0xE6,0x99,0x99), o3(0xE6,0xA8,0xBD),
-     o3(0xE6,0xB5,0x9A), o3(0xE6,0xBA,0x96),
-     o3(0xE6,0xBF,0xAC), o3(0xE7,0x84,0x8C),
-     o3(0xE7,0x95,0xAF), o3(0xE7,0xAB,0xA3),
-     o3(0xE8,0xA0,0xA2), o3(0xE9,0x80,0xA1),
-     o3(0xE9,0x81,0xB5), o3(0xE9,0x9B,0x8B),
-     o3(0xE9,0xA7,0xBF), o3(0xE8,0x8C,0x81),
-     o3(0xE4,0xB8,0xAD), o3(0xE4,0xBB,0xB2),
-     o3(0xE8,0xA1,0x86), o3(0xE9,0x87,0x8D),
-     o3(0xE5,0x8D,0xBD), o3(0xE6,0xAB,0x9B),
-     o3(0xE6,0xA5,0xAB), o3(0xE6,0xB1,0x81),
-     o3(0xE8,0x91,0xBA), o3(0xE5,0xA2,0x9E),
-     o3(0xE6,0x86,0x8E), o3(0xE6,0x9B,0xBE),
-     o3(0xE6,0x8B,0xAF), o3(0xE7,0x83,0x9D),
-     o3(0xE7,0x94,0x91), o3(0xE7,0x97,0x87),
-     o3(0xE7,0xB9,0x92), o3(0xE8,0x92,0xB8),
-     o3(0xE8,0xAD,0x89), o3(0xE8,0xB4,0x88),
-     o3(0xE4,0xB9,0x8B), o3(0xE5,0x8F,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F1 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F1_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F2_infos[95] = {
-     o3(0xE5,0x92,0xAB), o3(0xE5,0x9C,0xB0),
-     o3(0xE5,0x9D,0x80), o3(0xE5,0xBF,0x97),
-     o3(0xE6,0x8C,0x81), o3(0xE6,0x8C,0x87),
-     o3(0xE6,0x91,0xAF), o3(0xE6,0x94,0xAF),
-     o3(0xE6,0x97,0xA8), o3(0xE6,0x99,0xBA),
-     o3(0xE6,0x9E,0x9D), o3(0xE6,0x9E,0xB3),
-     o3(0xE6,0xAD,0xA2), o3(0xE6,0xB1,0xA0),
-     o3(0xE6,0xB2,0x9A), o3(0xE6,0xBC,0xAC),
-     o3(0xE7,0x9F,0xA5), o3(0xE7,0xA0,0xA5),
-     o3(0xE7,0xA5,0x89), o3(0xE7,0xA5,0x97),
-     o3(0xE7,0xB4,0x99), o3(0xE8,0x82,0xA2),
-     o3(0xE8,0x84,0x82), o3(0xE8,0x87,0xB3),
-     o3(0xE8,0x8A,0x9D), o3(0xE8,0x8A,0xB7),
-     o3(0xE8,0x9C,0x98), o3(0xE8,0xAA,0x8C),
-     o3(0xEF,0xA7,0xBC), o3(0xE8,0xB4,0x84),
-     o3(0xE8,0xB6,0xBE), o3(0xE9,0x81,0xB2),
-     o3(0xE7,0x9B,0xB4), o3(0xE7,0xA8,0x99),
-     o3(0xE7,0xA8,0xB7), o3(0xE7,0xB9,0x94),
-     o3(0xE8,0x81,0xB7), o3(0xE5,0x94,0x87),
-     o3(0xE5,0x97,0x94), o3(0xE5,0xA1,0xB5),
-     o3(0xE6,0x8C,0xAF), o3(0xE6,0x90,0xA2),
-     o3(0xE6,0x99,0x89), o3(0xE6,0x99,0x8B),
-     o3(0xE6,0xA1,0xAD), o3(0xE6,0xA6,0x9B),
-     o3(0xE6,0xAE,0x84), o3(0xE6,0xB4,0xA5),
-     o3(0xE6,0xBA,0xB1), o3(0xE7,0x8F,0x8D),
-     o3(0xE7,0x91,0xA8), o3(0xE7,0x92,0xA1),
-     o3(0xE7,0x95,0x9B), o3(0xE7,0x96,0xB9),
-     o3(0xE7,0x9B,0xA1), o3(0xE7,0x9C,0x9E),
-     o3(0xE7,0x9E,0x8B), o3(0xE7,0xA7,0xA6),
-     o3(0xE7,0xB8,0x89), o3(0xE7,0xB8,0x9D),
-     o3(0xE8,0x87,0xBB), o3(0xE8,0x94,0xAF),
-     o3(0xE8,0xA2,0x97), o3(0xE8,0xA8,0xBA),
-     o3(0xE8,0xB3,0x91), o3(0xE8,0xBB,0xAB),
-     o3(0xE8,0xBE,0xB0), o3(0xE9,0x80,0xB2),
-     o3(0xE9,0x8E,0xAD), o3(0xE9,0x99,0xA3),
-     o3(0xE9,0x99,0xB3), o3(0xE9,0x9C,0x87),
-     o3(0xE4,0xBE,0x84), o3(0xE5,0x8F,0xB1),
-     o3(0xE5,0xA7,0xAA), o3(0xE5,0xAB,0x89),
-     o3(0xE5,0xB8,0x99), o3(0xE6,0xA1,0x8E),
-     o3(0xE7,0x93,0x86), o3(0xE7,0x96,0xBE),
-     o3(0xE7,0xA7,0xA9), o3(0xE7,0xAA,0x92),
-     o3(0xE8,0x86,0xA3), o3(0xE8,0x9B,0xAD),
-     o3(0xE8,0xB3,0xAA), o3(0xE8,0xB7,0x8C),
-     o3(0xE8,0xBF,0xAD), o3(0xE6,0x96,0x9F),
-     o3(0xE6,0x9C,0x95), o3(0xEF,0xA7,0xBD),
-     o3(0xE5,0x9F,0xB7), o3(0xE6,0xBD,0x97),
-     o3(0xE7,0xB7,0x9D), o3(0xE8,0xBC,0xAF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F2 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F2_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F3_infos[95] = {
-     o3(0xE9,0x8F,0xB6), o3(0xE9,0x9B,0x86),
-     o3(0xE5,0xBE,0xB5), o3(0xE6,0x87,0xB2),
-     o3(0xE6,0xBE,0x84), o3(0xE4,0xB8,0x94),
-     o3(0xE4,0xBE,0x98), o3(0xE5,0x80,0x9F),
-     o3(0xE5,0x8F,0x89), o3(0xE5,0x97,0x9F),
-     o3(0xE5,0xB5,0xAF), o3(0xE5,0xB7,0xAE),
-     o3(0xE6,0xAC,0xA1), o3(0xE6,0xAD,0xA4),
-     o3(0xE7,0xA3,0x8B), o3(0xE7,0xAE,0x9A),
-     o3(0xEF,0xA7,0xBE), o3(0xE8,0xB9,0x89),
-     o3(0xE8,0xBB,0x8A), o3(0xE9,0x81,0xAE),
-     o3(0xE6,0x8D,0x89), o3(0xE6,0x90,0xBE),
-     o3(0xE7,0x9D,0x80), o3(0xE7,0xAA,0x84),
-     o3(0xE9,0x8C,0xAF), o3(0xE9,0x91,0xBF),
-     o3(0xE9,0xBD,0xAA), o3(0xE6,0x92,0xB0),
-     o3(0xE6,0xBE,0xAF), o3(0xE7,0x87,0xA6),
-     o3(0xE7,0x92,0xA8), o3(0xE7,0x93,0x9A),
-     o3(0xE7,0xAB,0x84), o3(0xE7,0xB0,0x92),
-     o3(0xE7,0xBA,0x82), o3(0xE7,0xB2,0xB2),
-     o3(0xE7,0xBA,0x98), o3(0xE8,0xAE,0x9A),
-     o3(0xE8,0xB4,0x8A), o3(0xE9,0x91,0xBD),
-     o3(0xE9,0xA4,0x90), o3(0xE9,0xA5,0x8C),
-     o3(0xE5,0x88,0xB9), o3(0xE5,0xAF,0x9F),
-     o3(0xE6,0x93,0xA6), o3(0xE6,0x9C,0xAD),
-     o3(0xE7,0xB4,0xAE), o3(0xE5,0x83,0xAD),
-     o3(0xE5,0x8F,0x83), o3(0xE5,0xA1,0xB9),
-     o3(0xE6,0x85,0x98), o3(0xE6,0x85,0x99),
-     o3(0xE6,0x87,0xBA), o3(0xE6,0x96,0xAC),
-     o3(0xE7,0xAB,0x99), o3(0xE8,0xAE,0x92),
-     o3(0xE8,0xAE,0x96), o3(0xE5,0x80,0x89),
-     o3(0xE5,0x80,0xA1), o3(0xE5,0x89,0xB5),
-     o3(0xE5,0x94,0xB1), o3(0xE5,0xA8,0xBC),
-     o3(0xE5,0xBB,0xA0), o3(0xE5,0xBD,0xB0),
-     o3(0xE6,0x84,0xB4), o3(0xE6,0x95,0x9E),
-     o3(0xE6,0x98,0x8C), o3(0xE6,0x98,0xB6),
-     o3(0xE6,0x9A,0xA2), o3(0xE6,0xA7,0x8D),
-     o3(0xE6,0xBB,0x84), o3(0xE6,0xBC,0xB2),
-     o3(0xE7,0x8C,0x96), o3(0xE7,0x98,0xA1),
-     o3(0xE7,0xAA,0x93), o3(0xE8,0x84,0xB9),
-     o3(0xE8,0x89,0x99), o3(0xE8,0x8F,0x96),
-     o3(0xE8,0x92,0xBC), o3(0xE5,0x82,0xB5),
-     o3(0xE5,0x9F,0xB0), o3(0xE5,0xAF,0x80),
-     o3(0xE5,0xAF,0xA8), o3(0xE5,0xBD,0xA9),
-     o3(0xE6,0x8E,0xA1), o3(0xE7,0xA0,0xA6),
-     o3(0xE7,0xB6,0xB5), o3(0xE8,0x8F,0x9C),
-     o3(0xE8,0x94,0xA1), o3(0xE9,0x87,0x87),
-     o3(0xE9,0x87,0xB5), o3(0xE5,0x86,0x8A),
-     o3(0xE6,0x9F,0xB5), o3(0xE7,0xAD,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F3 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F3_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F4_infos[95] = {
-     o3(0xE8,0xB2,0xAC), o3(0xE5,0x87,0x84),
-     o3(0xE5,0xA6,0xBB), o3(0xE6,0x82,0xBD),
-     o3(0xE8,0x99,0x95), o3(0xE5,0x80,0x9C),
-     o3(0xEF,0xA7,0xBF), o3(0xE5,0x89,0x94),
-     o3(0xE5,0xB0,0xBA), o3(0xE6,0x85,0xBD),
-     o3(0xE6,0x88,0x9A), o3(0xE6,0x8B,0x93),
-     o3(0xE6,0x93,0xB2), o3(0xE6,0x96,0xA5),
-     o3(0xE6,0xBB,0x8C), o3(0xE7,0x98,0xA0),
-     o3(0xE8,0x84,0x8A), o3(0xE8,0xB9,0xA0),
-     o3(0xE9,0x99,0x9F), o3(0xE9,0x9A,0xBB),
-     o3(0xE4,0xBB,0x9F), o3(0xE5,0x8D,0x83),
-     o3(0xE5,0x96,0x98), o3(0xE5,0xA4,0xA9),
-     o3(0xE5,0xB7,0x9D), o3(0xE6,0x93,0x85),
-     o3(0xE6,0xB3,0x89), o3(0xE6,0xB7,0xBA),
-     o3(0xE7,0x8E,0x94), o3(0xE7,0xA9,0xBF),
-     o3(0xE8,0x88,0x9B), o3(0xE8,0x96,0xA6),
-     o3(0xE8,0xB3,0xA4), o3(0xE8,0xB8,0x90),
-     o3(0xE9,0x81,0xB7), o3(0xE9,0x87,0xA7),
-     o3(0xE9,0x97,0xA1), o3(0xE9,0x98,0xA1),
-     o3(0xE9,0x9F,0x86), o3(0xE5,0x87,0xB8),
-     o3(0xE5,0x93,0xB2), o3(0xE5,0x96,0x86),
-     o3(0xE5,0xBE,0xB9), o3(0xE6,0x92,0xA4),
-     o3(0xE6,0xBE,0x88), o3(0xE7,0xB6,0xB4),
-     o3(0xE8,0xBC,0x9F), o3(0xE8,0xBD,0x8D),
-     o3(0xE9,0x90,0xB5), o3(0xE5,0x83,0x89),
-     o3(0xE5,0xB0,0x96), o3(0xE6,0xB2,0xBE),
-     o3(0xE6,0xB7,0xBB), o3(0xE7,0x94,0x9B),
-     o3(0xE7,0x9E,0xBB), o3(0xE7,0xB0,0xBD),
-     o3(0xE7,0xB1,0xA4), o3(0xE8,0xA9,0xB9),
-     o3(0xE8,0xAB,0x82), o3(0xE5,0xA0,0x9E),
-     o3(0xE5,0xA6,0xBE), o3(0xE5,0xB8,0x96),
-     o3(0xE6,0x8D,0xB7), o3(0xE7,0x89,0x92),
-     o3(0xE7,0x96,0x8A), o3(0xE7,0x9D,0xAB),
-     o3(0xE8,0xAB,0x9C), o3(0xE8,0xB2,0xBC),
-     o3(0xE8,0xBC,0x92), o3(0xE5,0xBB,0xB3),
-     o3(0xE6,0x99,0xB4), o3(0xE6,0xB7,0xB8),
-     o3(0xE8,0x81,0xBD), o3(0xE8,0x8F,0x81),
-     o3(0xE8,0xAB,0x8B), o3(0xE9,0x9D,0x91),
-     o3(0xE9,0xAF,0x96), o3(0xEF,0xA8,0x80),
-     o3(0xE5,0x89,0x83), o3(0xE6,0x9B,0xBF),
-     o3(0xE6,0xB6,0x95), o3(0xE6,0xBB,0xAF),
-     o3(0xE7,0xB7,0xA0), o3(0xE8,0xAB,0xA6),
-     o3(0xE9,0x80,0xAE), o3(0xE9,0x81,0x9E),
-     o3(0xE9,0xAB,0x94), o3(0xE5,0x88,0x9D),
-     o3(0xE5,0x89,0xBF), o3(0xE5,0x93,0xA8),
-     o3(0xE6,0x86,0x94), o3(0xE6,0x8A,0x84),
-     o3(0xE6,0x8B,0x9B), o3(0xE6,0xA2,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F4 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F4_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F5_infos[95] = {
-     o3(0xE6,0xA4,0x92), o3(0xE6,0xA5,0x9A),
-     o3(0xE6,0xA8,0xB5), o3(0xE7,0x82,0x92),
-     o3(0xE7,0x84,0xA6), o3(0xE7,0xA1,0x9D),
-     o3(0xE7,0xA4,0x81), o3(0xE7,0xA4,0x8E),
-     o3(0xE7,0xA7,0x92), o3(0xE7,0xA8,0x8D),
-     o3(0xE8,0x82,0x96), o3(0xE8,0x89,0xB8),
-     o3(0xE8,0x8B,0x95), o3(0xE8,0x8D,0x89),
-     o3(0xE8,0x95,0x89), o3(0xE8,0xB2,0x82),
-     o3(0xE8,0xB6,0x85), o3(0xE9,0x85,0xA2),
-     o3(0xE9,0x86,0x8B), o3(0xE9,0x86,0xAE),
-     o3(0xE4,0xBF,0x83), o3(0xE5,0x9B,0x91),
-     o3(0xE7,0x87,0xAD), o3(0xE7,0x9F,0x97),
-     o3(0xE8,0x9C,0x80), o3(0xE8,0xA7,0xB8),
-     o3(0xE5,0xAF,0xB8), o3(0xE5,0xBF,0x96),
-     o3(0xE6,0x9D,0x91), o3(0xE9,0x82,0xA8),
-     o3(0xE5,0x8F,0xA2), o3(0xE5,0xA1,0x9A),
-     o3(0xE5,0xAF,0xB5), o3(0xE6,0x82,0xA4),
-     o3(0xE6,0x86,0x81), o3(0xE6,0x91,0xA0),
-     o3(0xE7,0xB8,0xBD), o3(0xE8,0x81,0xB0),
-     o3(0xE8,0x94,0xA5), o3(0xE9,0x8A,0x83),
-     o3(0xE6,0x92,0xAE), o3(0xE5,0x82,0xAC),
-     o3(0xE5,0xB4,0x94), o3(0xE6,0x9C,0x80),
-     o3(0xE5,0xA2,0x9C), o3(0xE6,0x8A,0xBD),
-     o3(0xE6,0x8E,0xA8), o3(0xE6,0xA4,0x8E),
-     o3(0xE6,0xA5,0xB8), o3(0xE6,0xA8,0x9E),
-     o3(0xE6,0xB9,0xAB), o3(0xE7,0x9A,0xBA),
-     o3(0xE7,0xA7,0x8B), o3(0xE8,0x8A,0xBB),
-     o3(0xE8,0x90,0xA9), o3(0xE8,0xAB,0x8F),
-     o3(0xE8,0xB6,0xA8), o3(0xE8,0xBF,0xBD),
-     o3(0xE9,0x84,0x92), o3(0xE9,0x85,0x8B),
-     o3(0xE9,0x86,0x9C), o3(0xE9,0x8C,0x90),
-     o3(0xE9,0x8C,0x98), o3(0xE9,0x8E,0x9A),
-     o3(0xE9,0x9B,0x9B), o3(0xE9,0xA8,0xB6),
-     o3(0xE9,0xB0,0x8D), o3(0xE4,0xB8,0x91),
-     o3(0xE7,0x95,0x9C), o3(0xE7,0xA5,0x9D),
-     o3(0xE7,0xAB,0xBA), o3(0xE7,0xAD,0x91),
-     o3(0xE7,0xAF,0x89), o3(0xE7,0xB8,0xAE),
-     o3(0xE8,0x93,0x84), o3(0xE8,0xB9,0x99),
-     o3(0xE8,0xB9,0xB4), o3(0xE8,0xBB,0xB8),
-     o3(0xE9,0x80,0x90), o3(0xE6,0x98,0xA5),
-     o3(0xE6,0xA4,0xBF), o3(0xE7,0x91,0x83),
-     o3(0xE5,0x87,0xBA), o3(0xE6,0x9C,0xAE),
-     o3(0xE9,0xBB,0x9C), o3(0xE5,0x85,0x85),
-     o3(0xE5,0xBF,0xA0), o3(0xE6,0xB2,0x96),
-     o3(0xE8,0x9F,0xB2), o3(0xE8,0xA1,0x9D),
-     o3(0xE8,0xA1,0xB7), o3(0xE6,0x82,0xB4),
-     o3(0xE8,0x86,0xB5), o3(0xE8,0x90,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F5 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F5_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F6_infos[95] = {
-     o3(0xE8,0xB4,0x85), o3(0xE5,0x8F,0x96),
-     o3(0xE5,0x90,0xB9), o3(0xE5,0x98,0xB4),
-     o3(0xE5,0xA8,0xB6), o3(0xE5,0xB0,0xB1),
-     o3(0xE7,0x82,0x8A), o3(0xE7,0xBF,0xA0),
-     o3(0xE8,0x81,0x9A), o3(0xE8,0x84,0x86),
-     o3(0xE8,0x87,0xAD), o3(0xE8,0xB6,0xA3),
-     o3(0xE9,0x86,0x89), o3(0xE9,0xA9,0x9F),
-     o3(0xE9,0xB7,0xB2), o3(0xE5,0x81,0xB4),
-     o3(0xE4,0xBB,0x84), o3(0xE5,0x8E,0xA0),
-     o3(0xE6,0x83,0xBB), o3(0xE6,0xB8,0xAC),
-     o3(0xE5,0xB1,0xA4), o3(0xE4,0xBE,0x88),
-     o3(0xE5,0x80,0xA4), o3(0xE5,0x97,0xA4),
-     o3(0xE5,0xB3,0x99), o3(0xE5,0xB9,0x9F),
-     o3(0xE6,0x81,0xA5), o3(0xE6,0xA2,0x94),
-     o3(0xE6,0xB2,0xBB), o3(0xE6,0xB7,0x84),
-     o3(0xE7,0x86,0xBE), o3(0xE7,0x97,0x94),
-     o3(0xE7,0x97,0xB4), o3(0xE7,0x99,0xA1),
-     o3(0xE7,0xA8,0x9A), o3(0xE7,0xA9,0x89),
-     o3(0xE7,0xB7,0x87), o3(0xE7,0xB7,0xBB),
-     o3(0xE7,0xBD,0xAE), o3(0xE8,0x87,0xB4),
-     o3(0xE8,0x9A,0xA9), o3(0xE8,0xBC,0x9C),
-     o3(0xE9,0x9B,0x89), o3(0xE9,0xA6,0xB3),
-     o3(0xE9,0xBD,0x92), o3(0xE5,0x89,0x87),
-     o3(0xE5,0x8B,0x85), o3(0xE9,0xA3,0xAD),
-     o3(0xE8,0xA6,0xAA), o3(0xE4,0xB8,0x83),
-     o3(0xE6,0x9F,0x92), o3(0xE6,0xBC,0x86),
-     o3(0xE4,0xBE,0xB5), o3(0xE5,0xAF,0xA2),
-     o3(0xE6,0x9E,0x95), o3(0xE6,0xB2,0x88),
-     o3(0xE6,0xB5,0xB8), o3(0xE7,0x90,0x9B),
-     o3(0xE7,0xA0,0xA7), o3(0xE9,0x87,0x9D),
-     o3(0xE9,0x8D,0xBC), o3(0xE8,0x9F,0x84),
-     o3(0xE7,0xA7,0xA4), o3(0xE7,0xA8,0xB1),
-     o3(0xE5,0xBF,0xAB), o3(0xE4,0xBB,0x96),
-     o3(0xE5,0x92,0xA4), o3(0xE5,0x94,0xBE),
-     o3(0xE5,0xA2,0xAE), o3(0xE5,0xA6,0xA5),
-     o3(0xE6,0x83,0xB0), o3(0xE6,0x89,0x93),
-     o3(0xE6,0x8B,0x96), o3(0xE6,0x9C,0xB6),
-     o3(0xE6,0xA5,0x95), o3(0xE8,0x88,0xB5),
-     o3(0xE9,0x99,0x80), o3(0xE9,0xA6,0xB1),
-     o3(0xE9,0xA7,0x9D), o3(0xE5,0x80,0xAC),
-     o3(0xE5,0x8D,0x93), o3(0xE5,0x95,0x84),
-     o3(0xE5,0x9D,0xBC), o3(0xEF,0xA8,0x81),
-     o3(0xE6,0x89,0x98), o3(0xEF,0xA8,0x82),
-     o3(0xE6,0x93,0xA2), o3(0xE6,0x99,0xAB),
-     o3(0xE6,0x9F,0x9D), o3(0xE6,0xBF,0x81),
-     o3(0xE6,0xBF,0xAF), o3(0xE7,0x90,0xA2),
-     o3(0xE7,0x90,0xB8), o3(0xE8,0xA8,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F6 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F6_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F7_infos[95] = {
-     o3(0xE9,0x90,0xB8), o3(0xE5,0x91,0x91),
-     o3(0xE5,0x98,0x86), o3(0xE5,0x9D,0xA6),
-     o3(0xE5,0xBD,0x88), o3(0xE6,0x86,0x9A),
-     o3(0xE6,0xAD,0x8E), o3(0xE7,0x81,0x98),
-     o3(0xE7,0x82,0xAD), o3(0xE7,0xB6,0xBB),
-     o3(0xE8,0xAA,0x95), o3(0xE5,0xA5,0xAA),
-     o3(0xE8,0x84,0xAB), o3(0xE6,0x8E,0xA2),
-     o3(0xE7,0x9C,0x88), o3(0xE8,0x80,0xBD),
-     o3(0xE8,0xB2,0xAA), o3(0xE5,0xA1,0x94),
-     o3(0xE6,0x90,0xAD), o3(0xE6,0xA6,0xBB),
-     o3(0xE5,0xAE,0x95), o3(0xE5,0xB8,0x91),
-     o3(0xE6,0xB9,0xAF), o3(0xEF,0xA8,0x83),
-     o3(0xE8,0x95,0xA9), o3(0xE5,0x85,0x8C),
-     o3(0xE5,0x8F,0xB0), o3(0xE5,0xA4,0xAA),
-     o3(0xE6,0x80,0xA0), o3(0xE6,0x85,0x8B),
-     o3(0xE6,0xAE,0x86), o3(0xE6,0xB1,0xB0),
-     o3(0xE6,0xB3,0xB0), o3(0xE7,0xAC,0x9E),
-     o3(0xE8,0x83,0x8E), o3(0xE8,0x8B,0x94),
-     o3(0xE8,0xB7,0x86), o3(0xE9,0x82,0xB0),
-     o3(0xE9,0xA2,0xB1), o3(0xEF,0xA8,0x84),
-     o3(0xE6,0x93,0x87), o3(0xE6,0xBE,0xA4),
-     o3(0xE6,0x92,0x91), o3(0xE6,0x94,0x84),
-     o3(0xE5,0x85,0x8E), o3(0xE5,0x90,0x90),
-     o3(0xE5,0x9C,0x9F), o3(0xE8,0xA8,0x8E),
-     o3(0xE6,0x85,0x9F), o3(0xE6,0xA1,0xB6),
-     o3(0xEF,0xA8,0x85), o3(0xE7,0x97,0x9B),
-     o3(0xE7,0xAD,0x92), o3(0xE7,0xB5,0xB1),
-     o3(0xE9,0x80,0x9A), o3(0xE5,0xA0,0x86),
-     o3(0xE6,0xA7,0x8C), o3(0xE8,0x85,0xBF),
-     o3(0xE8,0xA4,0xAA), o3(0xE9,0x80,0x80),
-     o3(0xE9,0xA0,0xB9), o3(0xE5,0x81,0xB8),
-     o3(0xE5,0xA5,0x97), o3(0xE5,0xA6,0xAC),
-     o3(0xE6,0x8A,0x95), o3(0xE9,0x80,0x8F),
-     o3(0xE9,0xAC,0xAA), o3(0xE6,0x85,0x9D),
-     o3(0xE7,0x89,0xB9), o3(0xE9,0x97,0x96),
-     o3(0xE5,0x9D,0xA1), o3(0xE5,0xA9,0x86),
-     o3(0xE5,0xB7,0xB4), o3(0xE6,0x8A,0x8A),
-     o3(0xE6,0x92,0xAD), o3(0xE6,0x93,0xBA),
-     o3(0xE6,0x9D,0xB7), o3(0xE6,0xB3,0xA2),
-     o3(0xE6,0xB4,0xBE), o3(0xE7,0x88,0xAC),
-     o3(0xE7,0x90,0xB6), o3(0xE7,0xA0,0xB4),
-     o3(0xE7,0xBD,0xB7), o3(0xE8,0x8A,0xAD),
-     o3(0xE8,0xB7,0x9B), o3(0xE9,0xA0,0x97),
-     o3(0xE5,0x88,0xA4), o3(0xE5,0x9D,0x82),
-     o3(0xE6,0x9D,0xBF), o3(0xE7,0x89,0x88),
-     o3(0xE7,0x93,0xA3), o3(0xE8,0xB2,0xA9),
-     o3(0xE8,0xBE,0xA6), o3(0xE9,0x88,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F7 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F7_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F8_infos[95] = {
-     o3(0xE9,0x98,0xAA), o3(0xE5,0x85,0xAB),
-     o3(0xE5,0x8F,0xAD), o3(0xE6,0x8D,0x8C),
-     o3(0xE4,0xBD,0xA9), o3(0xE5,0x94,0x84),
-     o3(0xE6,0x82,0x96), o3(0xE6,0x95,0x97),
-     o3(0xE6,0xB2,0x9B), o3(0xE6,0xB5,0xBF),
-     o3(0xE7,0x89,0x8C), o3(0xE7,0x8B,0xBD),
-     o3(0xE7,0xA8,0x97), o3(0xE8,0xA6,0x87),
-     o3(0xE8,0xB2,0x9D), o3(0xE5,0xBD,0xAD),
-     o3(0xE6,0xBE,0x8E), o3(0xE7,0x83,0xB9),
-     o3(0xE8,0x86,0xA8), o3(0xE6,0x84,0x8E),
-     o3(0xE4,0xBE,0xBF), o3(0xE5,0x81,0x8F),
-     o3(0xE6,0x89,0x81), o3(0xE7,0x89,0x87),
-     o3(0xE7,0xAF,0x87), o3(0xE7,0xB7,0xA8),
-     o3(0xE7,0xBF,0xA9), o3(0xE9,0x81,0x8D),
-     o3(0xE9,0x9E,0xAD), o3(0xE9,0xA8,0x99),
-     o3(0xE8,0xB2,0xB6), o3(0xE5,0x9D,0xAA),
-     o3(0xE5,0xB9,0xB3), o3(0xE6,0x9E,0xB0),
-     o3(0xE8,0x90,0x8D), o3(0xE8,0xA9,0x95),
-     o3(0xE5,0x90,0xA0), o3(0xE5,0xAC,0x96),
-     o3(0xE5,0xB9,0xA3), o3(0xE5,0xBB,0xA2),
-     o3(0xE5,0xBC,0x8A), o3(0xE6,0x96,0x83),
-     o3(0xE8,0x82,0xBA), o3(0xE8,0x94,0xBD),
-     o3(0xE9,0x96,0x89), o3(0xE9,0x99,0x9B),
-     o3(0xE4,0xBD,0x88), o3(0xE5,0x8C,0x85),
-     o3(0xE5,0x8C,0x8D), o3(0xE5,0x8C,0x8F),
-     o3(0xE5,0x92,0x86), o3(0xE5,0x93,0xBA),
-     o3(0xE5,0x9C,0x83), o3(0xE5,0xB8,0x83),
-     o3(0xE6,0x80,0x96), o3(0xE6,0x8A,0x9B),
-     o3(0xE6,0x8A,0xB1), o3(0xE6,0x8D,0x95),
-     o3(0xEF,0xA8,0x86), o3(0xE6,0xB3,0xA1),
-     o3(0xE6,0xB5,0xA6), o3(0xE7,0x96,0xB1),
-     o3(0xE7,0xA0,0xB2), o3(0xE8,0x83,0x9E),
-     o3(0xE8,0x84,0xAF), o3(0xE8,0x8B,0x9E),
-     o3(0xE8,0x91,0xA1), o3(0xE8,0x92,0xB2),
-     o3(0xE8,0xA2,0x8D), o3(0xE8,0xA4,0x92),
-     o3(0xE9,0x80,0x8B), o3(0xE9,0x8B,0xAA),
-     o3(0xE9,0xA3,0xBD), o3(0xE9,0xAE,0x91),
-     o3(0xE5,0xB9,0x85), o3(0xE6,0x9A,0xB4),
-     o3(0xE6,0x9B,0x9D), o3(0xE7,0x80,0x91),
-     o3(0xE7,0x88,0x86), o3(0xEF,0xA8,0x87),
-     o3(0xE4,0xBF,0xB5), o3(0xE5,0x89,0xBD),
-     o3(0xE5,0xBD,0xAA), o3(0xE6,0x85,0x93),
-     o3(0xE6,0x9D,0x93), o3(0xE6,0xA8,0x99),
-     o3(0xE6,0xBC,0x82), o3(0xE7,0x93,0xA2),
-     o3(0xE7,0xA5,0xA8), o3(0xE8,0xA1,0xA8),
-     o3(0xE8,0xB1,0xB9), o3(0xE9,0xA3,0x87),
-     o3(0xE9,0xA3,0x84), o3(0xE9,0xA9,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F8 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F8_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_F9_infos[95] = {
-     o3(0xE5,0x93,0x81), o3(0xE7,0xA8,0x9F),
-     o3(0xE6,0xA5,0x93), o3(0xE8,0xAB,0xB7),
-     o3(0xE8,0xB1,0x8A), o3(0xE9,0xA2,0xA8),
-     o3(0xE9,0xA6,0xAE), o3(0xE5,0xBD,0xBC),
-     o3(0xE6,0x8A,0xAB), o3(0xE7,0x96,0xB2),
-     o3(0xE7,0x9A,0xAE), o3(0xE8,0xA2,0xAB),
-     o3(0xE9,0x81,0xBF), o3(0xE9,0x99,0x82),
-     o3(0xE5,0x8C,0xB9), o3(0xE5,0xBC,0xBC),
-     o3(0xE5,0xBF,0x85), o3(0xE6,0xB3,0x8C),
-     o3(0xE7,0x8F,0x8C), o3(0xE7,0x95,0xA2),
-     o3(0xE7,0x96,0x8B), o3(0xE7,0xAD,0x86),
-     o3(0xE8,0x8B,0xBE), o3(0xE9,0xA6,0x9D),
-     o3(0xE4,0xB9,0x8F), o3(0xE9,0x80,0xBC),
-     o3(0xE4,0xB8,0x8B), o3(0xE4,0xBD,0x95),
-     o3(0xE5,0x8E,0xA6), o3(0xE5,0xA4,0x8F),
-     o3(0xE5,0xBB,0x88), o3(0xE6,0x98,0xB0),
-     o3(0xE6,0xB2,0xB3), o3(0xE7,0x91,0x95),
-     o3(0xE8,0x8D,0xB7), o3(0xE8,0x9D,0xA6),
-     o3(0xE8,0xB3,0x80), o3(0xE9,0x81,0x90),
-     o3(0xE9,0x9C,0x9E), o3(0xE9,0xB0,0x95),
-     o3(0xE5,0xA3,0x91), o3(0xE5,0xAD,0xB8),
-     o3(0xE8,0x99,0x90), o3(0xE8,0xAC,0x94),
-     o3(0xE9,0xB6,0xB4), o3(0xE5,0xAF,0x92),
-     o3(0xE6,0x81,0xA8), o3(0xE6,0x82,0x8D),
-     o3(0xE6,0x97,0xB1), o3(0xE6,0xB1,0x97),
-     o3(0xE6,0xBC,0xA2), o3(0xE6,0xBE,0xA3),
-     o3(0xE7,0x80,0x9A), o3(0xE7,0xBD,0x95),
-     o3(0xE7,0xBF,0xB0), o3(0xE9,0x96,0x91),
-     o3(0xE9,0x96,0x92), o3(0xE9,0x99,0x90),
-     o3(0xE9,0x9F,0x93), o3(0xE5,0x89,0xB2),
-     o3(0xE8,0xBD,0x84), o3(0xE5,0x87,0xBD),
-     o3(0xE5,0x90,0xAB), o3(0xE5,0x92,0xB8),
-     o3(0xE5,0x95,0xA3), o3(0xE5,0x96,0x8A),
-     o3(0xE6,0xAA,0xBB), o3(0xE6,0xB6,0xB5),
-     o3(0xE7,0xB7,0x98), o3(0xE8,0x89,0xA6),
-     o3(0xE9,0x8A,0x9C), o3(0xE9,0x99,0xB7),
-     o3(0xE9,0xB9,0xB9), o3(0xE5,0x90,0x88),
-     o3(0xE5,0x93,0x88), o3(0xE7,0x9B,0x92),
-     o3(0xE8,0x9B,0xA4), o3(0xE9,0x96,0xA4),
-     o3(0xE9,0x97,0x94), o3(0xE9,0x99,0x9C),
-     o3(0xE4,0xBA,0xA2), o3(0xE4,0xBC,0x89),
-     o3(0xE5,0xA7,0xAE), o3(0xE5,0xAB,0xA6),
-     o3(0xE5,0xB7,0xB7), o3(0xE6,0x81,0x92),
-     o3(0xE6,0x8A,0x97), o3(0xE6,0x9D,0xAD),
-     o3(0xE6,0xA1,0x81), o3(0xE6,0xB2,0x86),
-     o3(0xE6,0xB8,0xAF), o3(0xE7,0xBC,0xB8),
-     o3(0xE8,0x82,0x9B), o3(0xE8,0x88,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_F9 = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_F9_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_FA_infos[95] = {
-     o3(0xEF,0xA8,0x88), o3(0xEF,0xA8,0x89),
-     o3(0xE9,0xA0,0x85), o3(0xE4,0xBA,0xA5),
-     o3(0xE5,0x81,0x95), o3(0xE5,0x92,0xB3),
-     o3(0xE5,0x9E,0x93), o3(0xE5,0xA5,0x9A),
-     o3(0xE5,0xAD,0xA9), o3(0xE5,0xAE,0xB3),
-     o3(0xE6,0x87,0x88), o3(0xE6,0xA5,0xB7),
-     o3(0xE6,0xB5,0xB7), o3(0xE7,0x80,0xA3),
-     o3(0xE8,0x9F,0xB9), o3(0xE8,0xA7,0xA3),
-     o3(0xE8,0xA9,0xB2), o3(0xE8,0xAB,0xA7),
-     o3(0xE9,0x82,0x82), o3(0xE9,0xA7,0xAD),
-     o3(0xE9,0xAA,0xB8), o3(0xE5,0x8A,0xBE),
-     o3(0xE6,0xA0,0xB8), o3(0xE5,0x80,0x96),
-     o3(0xE5,0xB9,0xB8), o3(0xE6,0x9D,0x8F),
-     o3(0xE8,0x8D,0x87), o3(0xE8,0xA1,0x8C),
-     o3(0xE4,0xBA,0xAB), o3(0xE5,0x90,0x91),
-     o3(0xE5,0x9A,0xAE), o3(0xE7,0x8F,0xA6),
-     o3(0xE9,0x84,0x95), o3(0xE9,0x9F,0xBF),
-     o3(0xE9,0xA4,0x89), o3(0xE9,0xA5,0x97),
-     o3(0xE9,0xA6,0x99), o3(0xE5,0x99,0x93),
-     o3(0xE5,0xA2,0x9F), o3(0xE8,0x99,0x9B),
-     o3(0xE8,0xA8,0xB1), o3(0xE6,0x86,0xB2),
-     o3(0xE6,0xAB,0xB6), o3(0xE7,0x8D,0xBB),
-     o3(0xE8,0xBB,0x92), o3(0xE6,0xAD,0x87),
-     o3(0xE9,0x9A,0xAA), o3(0xE9,0xA9,0x97),
-     o3(0xE5,0xA5,0x95), o3(0xE7,0x88,0x80),
-     o3(0xE8,0xB5,0xAB), o3(0xE9,0x9D,0xA9),
-     o3(0xE4,0xBF,0x94), o3(0xE5,0xB3,0xB4),
-     o3(0xE5,0xBC,0xA6), o3(0xE6,0x87,0xB8),
-     o3(0xE6,0x99,0x9B), o3(0xE6,0xB3,0xAB),
-     o3(0xE7,0x82,0xAB), o3(0xE7,0x8E,0x84),
-     o3(0xE7,0x8E,0xB9), o3(0xE7,0x8F,0xBE),
-     o3(0xE7,0x9C,0xA9), o3(0xE7,0x9D,0x8D),
-     o3(0xE7,0xB5,0x83), o3(0xE7,0xB5,0xA2),
-     o3(0xE7,0xB8,0xA3), o3(0xE8,0x88,0xB7),
-     o3(0xE8,0xA1,0x92), o3(0xEF,0xA8,0x8A),
-     o3(0xE8,0xB3,0xA2), o3(0xE9,0x89,0x89),
-     o3(0xE9,0xA1,0xAF), o3(0xE5,0xAD,0x91),
-     o3(0xE7,0xA9,0xB4), o3(0xE8,0xA1,0x80),
-     o3(0xE9,0xA0,0x81), o3(0xE5,0xAB,0x8C),
-     o3(0xE4,0xBF,0xA0), o3(0xE5,0x8D,0x94),
-     o3(0xE5,0xA4,0xBE), o3(0xE5,0xB3,0xBD),
-     o3(0xE6,0x8C,0xBE), o3(0xE6,0xB5,0xB9),
-     o3(0xE7,0x8B,0xB9), o3(0xE8,0x84,0x85),
-     o3(0xE8,0x84,0x87), o3(0xE8,0x8E,0xA2),
-     o3(0xE9,0x8B,0x8F), o3(0xE9,0xA0,0xB0),
-     o3(0xE4,0xBA,0xA8), o3(0xE5,0x85,0x84),
-     o3(0xE5,0x88,0x91), o3(0xE5,0x9E,0x8B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_FA = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_FA_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_FB_infos[95] = {
-     o3(0xE5,0xBD,0xA2), o3(0xE6,0xB3,0x82),
-     o3(0xE6,0xBB,0x8E), o3(0xE7,0x80,0x85),
-     o3(0xE7,0x81,0x90), o3(0xE7,0x82,0xAF),
-     o3(0xE7,0x86,0x92), o3(0xE7,0x8F,0xA9),
-     o3(0xE7,0x91,0xA9), o3(0xE8,0x8D,0x8A),
-     o3(0xE8,0x9E,0xA2), o3(0xE8,0xA1,0xA1),
-     o3(0xE9,0x80,0x88), o3(0xE9,0x82,0xA2),
-     o3(0xE9,0x8E,0xA3), o3(0xE9,0xA6,0xA8),
-     o3(0xE5,0x85,0xAE), o3(0xE5,0xBD,0x97),
-     o3(0xE6,0x83,0xA0), o3(0xE6,0x85,0xA7),
-     o3(0xE6,0x9A,0xB3), o3(0xE8,0x95,0x99),
-     o3(0xE8,0xB9,0x8A), o3(0xE9,0x86,0xAF),
-     o3(0xE9,0x9E,0x8B), o3(0xE4,0xB9,0x8E),
-     o3(0xE4,0xBA,0x92), o3(0xE5,0x91,0xBC),
-     o3(0xE5,0xA3,0x95), o3(0xE5,0xA3,0xBA),
-     o3(0xE5,0xA5,0xBD), o3(0xE5,0xB2,0xB5),
-     o3(0xE5,0xBC,0xA7), o3(0xE6,0x88,0xB6),
-     o3(0xE6,0x89,0x88), o3(0xE6,0x98,0x8A),
-     o3(0xE6,0x99,0xA7), o3(0xE6,0xAF,0xAB),
-     o3(0xE6,0xB5,0xA9), o3(0xE6,0xB7,0x8F),
-     o3(0xE6,0xB9,0x96), o3(0xE6,0xBB,0xB8),
-     o3(0xE6,0xBE,0x94), o3(0xE6,0xBF,0xA0),
-     o3(0xE6,0xBF,0xA9), o3(0xE7,0x81,0x9D),
-     o3(0xE7,0x8B,0x90), o3(0xE7,0x90,0xA5),
-     o3(0xE7,0x91,0x9A), o3(0xE7,0x93,0xA0),
-     o3(0xE7,0x9A,0x93), o3(0xE7,0xA5,0x9C),
-     o3(0xE7,0xB3,0x8A), o3(0xE7,0xB8,0x9E),
-     o3(0xE8,0x83,0xA1), o3(0xE8,0x8A,0xA6),
-     o3(0xE8,0x91,0xAB), o3(0xE8,0x92,0xBF),
-     o3(0xE8,0x99,0x8E), o3(0xE8,0x99,0x9F),
-     o3(0xE8,0x9D,0xB4), o3(0xE8,0xAD,0xB7),
-     o3(0xE8,0xB1,0xAA), o3(0xE9,0x8E,0xAC),
-     o3(0xE9,0xA0,0x80), o3(0xE9,0xA1,0xA5),
-     o3(0xE6,0x83,0x91), o3(0xE6,0x88,0x96),
-     o3(0xE9,0x85,0xB7), o3(0xE5,0xA9,0x9A),
-     o3(0xE6,0x98,0x8F), o3(0xE6,0xB7,0xB7),
-     o3(0xE6,0xB8,0xBE), o3(0xE7,0x90,0xBF),
-     o3(0xE9,0xAD,0x82), o3(0xE5,0xBF,0xBD),
-     o3(0xE6,0x83,0x9A), o3(0xE7,0xAC,0x8F),
-     o3(0xE5,0x93,0x84), o3(0xE5,0xBC,0x98),
-     o3(0xE6,0xB1,0x9E), o3(0xE6,0xB3,0x93),
-     o3(0xE6,0xB4,0xAA), o3(0xE7,0x83,0x98),
-     o3(0xE7,0xB4,0x85), o3(0xE8,0x99,0xB9),
-     o3(0xE8,0xA8,0x8C), o3(0xE9,0xB4,0xBB),
-     o3(0xE5,0x8C,0x96), o3(0xE5,0x92,0x8C),
-     o3(0xE5,0xAC,0x85), o3(0xE6,0xA8,0xBA),
-     o3(0xE7,0x81,0xAB), o3(0xE7,0x95,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_FB = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_FB_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_FC_infos[95] = {
-     o3(0xE7,0xA6,0x8D), o3(0xE7,0xA6,0xBE),
-     o3(0xE8,0x8A,0xB1), o3(0xE8,0x8F,0xAF),
-     o3(0xE8,0xA9,0xB1), o3(0xE8,0xAD,0x81),
-     o3(0xE8,0xB2,0xA8), o3(0xE9,0x9D,0xB4),
-     o3(0xEF,0xA8,0x8B), o3(0xE6,0x93,0xB4),
-     o3(0xE6,0x94,0xAB), o3(0xE7,0xA2,0xBA),
-     o3(0xE7,0xA2,0xBB), o3(0xE7,0xA9,0xAB),
-     o3(0xE4,0xB8,0xB8), o3(0xE5,0x96,0x9A),
-     o3(0xE5,0xA5,0x90), o3(0xE5,0xAE,0xA6),
-     o3(0xE5,0xB9,0xBB), o3(0xE6,0x82,0xA3),
-     o3(0xE6,0x8F,0x9B), o3(0xE6,0xAD,0xA1),
-     o3(0xE6,0x99,0xA5), o3(0xE6,0xA1,0x93),
-     o3(0xE6,0xB8,0x99), o3(0xE7,0x85,0xA5),
-     o3(0xE7,0x92,0xB0), o3(0xE7,0xB4,0x88),
-     o3(0xE9,0x82,0x84), o3(0xE9,0xA9,0xA9),
-     o3(0xE9,0xB0,0xA5), o3(0xE6,0xB4,0xBB),
-     o3(0xE6,0xBB,0x91), o3(0xE7,0x8C,0xBE),
-     o3(0xE8,0xB1,0x81), o3(0xE9,0x97,0x8A),
-     o3(0xE5,0x87,0xB0), o3(0xE5,0xB9,0x8C),
-     o3(0xE5,0xBE,0xA8), o3(0xE6,0x81,0x8D),
-     o3(0xE6,0x83,0xB6), o3(0xE6,0x84,0xB0),
-     o3(0xE6,0x85,0x8C), o3(0xE6,0x99,0x83),
-     o3(0xE6,0x99,0x84), o3(0xE6,0xA6,0xA5),
-     o3(0xE6,0xB3,0x81), o3(0xE6,0xB9,0x9F),
-     o3(0xE6,0xBB,0x89), o3(0xE6,0xBD,0xA2),
-     o3(0xE7,0x85,0x8C), o3(0xE7,0x92,0x9C),
-     o3(0xE7,0x9A,0x87), o3(0xE7,0xAF,0x81),
-     o3(0xE7,0xB0,0xA7), o3(0xE8,0x8D,0x92),
-     o3(0xE8,0x9D,0x97), o3(0xE9,0x81,0x91),
-     o3(0xE9,0x9A,0x8D), o3(0xE9,0xBB,0x83),
-     o3(0xE5,0x8C,0xAF), o3(0xE5,0x9B,0x9E),
-     o3(0xE5,0xBB,0xBB), o3(0xE5,0xBE,0x8A),
-     o3(0xE6,0x81,0xA2), o3(0xE6,0x82,0x94),
-     o3(0xE6,0x87,0xB7), o3(0xE6,0x99,0xA6),
-     o3(0xE6,0x9C,0x83), o3(0xE6,0xAA,0x9C),
-     o3(0xE6,0xB7,0xAE), o3(0xE6,0xBE,0xAE),
-     o3(0xE7,0x81,0xB0), o3(0xE7,0x8D,0xAA),
-     o3(0xE7,0xB9,0xAA), o3(0xE8,0x86,0xBE),
-     o3(0xE8,0x8C,0xB4), o3(0xE8,0x9B,0x94),
-     o3(0xE8,0xAA,0xA8), o3(0xE8,0xB3,0x84),
-     o3(0xE5,0x8A,0x83), o3(0xE7,0x8D,0xB2),
-     o3(0xE5,0xAE,0x96), o3(0xE6,0xA9,0xAB),
-     o3(0xE9,0x90,0x84), o3(0xE5,0x93,0xAE),
-     o3(0xE5,0x9A,0x86), o3(0xE5,0xAD,0x9D),
-     o3(0xE6,0x95,0x88), o3(0xE6,0x96,0x85),
-     o3(0xE6,0x9B,0x89), o3(0xE6,0xA2,0x9F),
-     o3(0xE6,0xB6,0x8D), o3(0xE6,0xB7,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_FC = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_FC_infos
-};
-
-
-static const struct byte_lookup* const
-from_EUC_KR_FD_infos[95] = {
-     o3(0xE7,0x88,0xBB), o3(0xE8,0x82,0xB4),
-     o3(0xE9,0x85,0xB5), o3(0xE9,0xA9,0x8D),
-     o3(0xE4,0xBE,0xAF), o3(0xE5,0x80,0x99),
-     o3(0xE5,0x8E,0x9A), o3(0xE5,0x90,0x8E),
-     o3(0xE5,0x90,0xBC), o3(0xE5,0x96,0x89),
-     o3(0xE5,0x97,0x85), o3(0xE5,0xB8,0xBF),
-     o3(0xE5,0xBE,0x8C), o3(0xE6,0x9C,0xBD),
-     o3(0xE7,0x85,0xA6), o3(0xE7,0x8F,0x9D),
-     o3(0xE9,0x80,0x85), o3(0xE5,0x8B,0x9B),
-     o3(0xE5,0x8B,0xB3), o3(0xE5,0xA1,0xA4),
-     o3(0xE5,0xA3,0x8E), o3(0xE7,0x84,0x84),
-     o3(0xE7,0x86,0x8F), o3(0xE7,0x87,0xBB),
-     o3(0xE8,0x96,0xB0), o3(0xE8,0xA8,0x93),
-     o3(0xE6,0x9A,0x88), o3(0xE8,0x96,0xA8),
-     o3(0xE5,0x96,0xA7), o3(0xE6,0x9A,0x84),
-     o3(0xE7,0x85,0x8A), o3(0xE8,0x90,0xB1),
-     o3(0xE5,0x8D,0x89), o3(0xE5,0x96,0x99),
-     o3(0xE6,0xAF,0x81), o3(0xE5,0xBD,0x99),
-     o3(0xE5,0xBE,0xBD), o3(0xE6,0x8F,0xAE),
-     o3(0xE6,0x9A,0x89), o3(0xE7,0x85,0x87),
-     o3(0xE8,0xAB,0xB1), o3(0xE8,0xBC,0x9D),
-     o3(0xE9,0xBA,0xBE), o3(0xE4,0xBC,0x91),
-     o3(0xE6,0x90,0xBA), o3(0xE7,0x83,0x8B),
-     o3(0xE7,0x95,0xA6), o3(0xE8,0x99,0xA7),
-     o3(0xE6,0x81,0xA4), o3(0xE8,0xAD,0x8E),
-     o3(0xE9,0xB7,0xB8), o3(0xE5,0x85,0x87),
-     o3(0xE5,0x87,0xB6), o3(0xE5,0x8C,0x88),
-     o3(0xE6,0xB4,0xB6), o3(0xE8,0x83,0xB8),
-     o3(0xE9,0xBB,0x91), o3(0xE6,0x98,0x95),
-     o3(0xE6,0xAC,0xA3), o3(0xE7,0x82,0x98),
-     o3(0xE7,0x97,0x95), o3(0xE5,0x90,0x83),
-     o3(0xE5,0xB1,0xB9), o3(0xE7,0xB4,0x87),
-     o3(0xE8,0xA8,0x96), o3(0xE6,0xAC,0xA0),
-     o3(0xE6,0xAC,0xBD), o3(0xE6,0xAD,0x86),
-     o3(0xE5,0x90,0xB8), o3(0xE6,0x81,0xB0),
-     o3(0xE6,0xB4,0xBD), o3(0xE7,0xBF,0x95),
-     o3(0xE8,0x88,0x88), o3(0xE5,0x83,0x96),
-     o3(0xE5,0x87,0x9E), o3(0xE5,0x96,0x9C),
-     o3(0xE5,0x99,0xAB), o3(0xE5,0x9B,0x8D),
-     o3(0xE5,0xA7,0xAC), o3(0xE5,0xAC,0x89),
-     o3(0xE5,0xB8,0x8C), o3(0xE6,0x86,0x99),
-     o3(0xE6,0x86,0x98), o3(0xE6,0x88,0xB1),
-     o3(0xE6,0x99,0x9E), o3(0xE6,0x9B,0xA6),
-     o3(0xE7,0x86,0x99), o3(0xE7,0x86,0xB9),
-     o3(0xE7,0x86,0xBA), o3(0xE7,0x8A,0xA7),
-     o3(0xE7,0xA6,0xA7), o3(0xE7,0xA8,0x80),
-     o3(0xE7,0xBE,0xB2), o3(0xE8,0xA9,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR_FD = {
-    from_EUC_KR_A1_offsets,
-    from_EUC_KR_FD_infos
-};
-
-static const unsigned char
-from_EUC_KR_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-     90, 90, 90, 90, 90, 90, 90, 90,     90, 90, 90, 90, 90, 90, 90, 90,
-     90, 90, 90, 90, 90, 90, 90, 90,     90, 90, 90, 90, 90, 90, 90, 90,
-     90,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 90, 90, 90,
-     13, 14, 15, 16, 17, 18, 19, 20,     21, 22, 23, 24, 25, 26, 27, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,     37, 90, 38, 39, 40, 41, 42, 43,
-     44, 45, 46, 47, 48, 49, 50, 51,     52, 53, 54, 55, 56, 57, 58, 59,
-     60, 61, 62, 63, 64, 65, 66, 67,     68, 69, 70, 71, 72, 73, 74, 75,
-     76, 77, 78, 79, 80, 81, 82, 83,     84, 85, 86, 87, 88, 89, 90, 90,
-};
-
-static const struct byte_lookup* const
-from_EUC_KR_infos[91] = {
-                  NOMAP,    &from_EUC_KR_A1,
-        &from_EUC_KR_A2,    &from_EUC_KR_A3,
-        &from_EUC_KR_A4,    &from_EUC_KR_A5,
-        &from_EUC_KR_A6,    &from_EUC_KR_A7,
-        &from_EUC_KR_A8,    &from_EUC_KR_A9,
-        &from_EUC_KR_AA,    &from_EUC_KR_AB,
-        &from_EUC_KR_AC,    &from_EUC_KR_B0,
-        &from_EUC_KR_B1,    &from_EUC_KR_B2,
-        &from_EUC_KR_B3,    &from_EUC_KR_B4,
-        &from_EUC_KR_B5,    &from_EUC_KR_B6,
-        &from_EUC_KR_B7,    &from_EUC_KR_B8,
-        &from_EUC_KR_B9,    &from_EUC_KR_BA,
-        &from_EUC_KR_BB,    &from_EUC_KR_BC,
-        &from_EUC_KR_BD,    &from_EUC_KR_BE,
-        &from_EUC_KR_BF,    &from_EUC_KR_C0,
-        &from_EUC_KR_C1,    &from_EUC_KR_C2,
-        &from_EUC_KR_C3,    &from_EUC_KR_C4,
-        &from_EUC_KR_C5,    &from_EUC_KR_C6,
-        &from_EUC_KR_C7,    &from_EUC_KR_C8,
-        &from_EUC_KR_CA,    &from_EUC_KR_CB,
-        &from_EUC_KR_CC,    &from_EUC_KR_CD,
-        &from_EUC_KR_CE,    &from_EUC_KR_CF,
-        &from_EUC_KR_D0,    &from_EUC_KR_D1,
-        &from_EUC_KR_D2,    &from_EUC_KR_D3,
-        &from_EUC_KR_D4,    &from_EUC_KR_D5,
-        &from_EUC_KR_D6,    &from_EUC_KR_D7,
-        &from_EUC_KR_D8,    &from_EUC_KR_D9,
-        &from_EUC_KR_DA,    &from_EUC_KR_DB,
-        &from_EUC_KR_DC,    &from_EUC_KR_DD,
-        &from_EUC_KR_DE,    &from_EUC_KR_DF,
-        &from_EUC_KR_E0,    &from_EUC_KR_E1,
-        &from_EUC_KR_E2,    &from_EUC_KR_E3,
-        &from_EUC_KR_E4,    &from_EUC_KR_E5,
-        &from_EUC_KR_E6,    &from_EUC_KR_E7,
-        &from_EUC_KR_E8,    &from_EUC_KR_E9,
-        &from_EUC_KR_EA,    &from_EUC_KR_EB,
-        &from_EUC_KR_EC,    &from_EUC_KR_ED,
-        &from_EUC_KR_EE,    &from_EUC_KR_EF,
-        &from_EUC_KR_F0,    &from_EUC_KR_F1,
-        &from_EUC_KR_F2,    &from_EUC_KR_F3,
-        &from_EUC_KR_F4,    &from_EUC_KR_F5,
-        &from_EUC_KR_F6,    &from_EUC_KR_F7,
-        &from_EUC_KR_F8,    &from_EUC_KR_F9,
-        &from_EUC_KR_FA,    &from_EUC_KR_FB,
-        &from_EUC_KR_FC,    &from_EUC_KR_FD,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_EUC_KR = {
-    from_EUC_KR_offsets,
-    from_EUC_KR_infos
-};
-
-static const unsigned char
-to_CP949_C2_offsets[64] = {
-     21, 21, 21, 21, 21, 21, 21, 21,     21, 21, 21, 21, 21, 21, 21, 21,
-     21, 21, 21, 21, 21, 21, 21, 21,     21, 21, 21, 21, 21, 21, 21, 21,
-     21,  0, 21, 21,  1, 21, 21,  2,      3, 21,  4, 21, 21,  5,  6, 21,
-      7,  8,  9, 10, 11, 21, 12, 13,     14, 15, 16, 21, 17, 18, 19, 20,
-};
-
-static const struct byte_lookup* const
-to_CP949_C2_infos[22] = {
-          o2(0xA2,0xAE),      o2(0xA2,0xB4),
-          o2(0xA1,0xD7),      o2(0xA1,0xA7),
-          o2(0xA8,0xA3),      o2(0xA1,0xA9),
-          o2(0xA2,0xE7),      o2(0xA1,0xC6),
-          o2(0xA1,0xBE),      o2(0xA9,0xF7),
-          o2(0xA9,0xF8),      o2(0xA2,0xA5),
-          o2(0xA2,0xD2),      o2(0xA1,0xA4),
-          o2(0xA2,0xAC),      o2(0xA9,0xF6),
-          o2(0xA8,0xAC),      o2(0xA8,0xF9),
-          o2(0xA8,0xF6),      o2(0xA8,0xFA),
-          o2(0xA2,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_C2 = {
-    to_CP949_C2_offsets,
-    to_CP949_C2_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_C3_infos[12] = {
-          o2(0xA8,0xA1),      o2(0xA8,0xA2),
-          o2(0xA1,0xBF),      o2(0xA8,0xAA),
-          o2(0xA8,0xAD),      o2(0xA9,0xAC),
-          o2(0xA9,0xA1),      o2(0xA9,0xA3),
-          o2(0xA1,0xC0),      o2(0xA9,0xAA),
-          o2(0xA9,0xAD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_C3 = {
-    to_EUC_KR_C3_offsets,
-    to_CP949_C3_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_C4_infos[9] = {
-          o2(0xA9,0xA2),      o2(0xA8,0xA4),
-          o2(0xA9,0xA4),      o2(0xA9,0xA5),
-          o2(0xA8,0xA6),      o2(0xA9,0xA6),
-          o2(0xA9,0xA7),      o2(0xA8,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_C4 = {
-    to_EUC_KR_C4_offsets,
-    to_CP949_C4_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_C5_infos[11] = {
-          o2(0xA9,0xA8),      o2(0xA8,0xA9),
-          o2(0xA9,0xA9),      o2(0xA9,0xB0),
-          o2(0xA8,0xAF),      o2(0xA9,0xAF),
-          o2(0xA8,0xAB),      o2(0xA9,0xAB),
-          o2(0xA8,0xAE),      o2(0xA9,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_C5 = {
-    to_EUC_KR_C5_offsets,
-    to_CP949_C5_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_CB_infos[8] = {
-          o2(0xA2,0xA7),      o2(0xA2,0xB0),
-          o2(0xA2,0xA8),      o2(0xA2,0xAB),
-          o2(0xA2,0xAA),      o2(0xA2,0xAD),
-          o2(0xA2,0xA9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_CB = {
-    to_EUC_KR_CB_offsets,
-    to_CP949_CB_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_CE_infos[40] = {
-          o2(0xA5,0xC1),      o2(0xA5,0xC2),
-          o2(0xA5,0xC3),      o2(0xA5,0xC4),
-          o2(0xA5,0xC5),      o2(0xA5,0xC6),
-          o2(0xA5,0xC7),      o2(0xA5,0xC8),
-          o2(0xA5,0xC9),      o2(0xA5,0xCA),
-          o2(0xA5,0xCB),      o2(0xA5,0xCC),
-          o2(0xA5,0xCD),      o2(0xA5,0xCE),
-          o2(0xA5,0xCF),      o2(0xA5,0xD0),
-          o2(0xA5,0xD1),      o2(0xA5,0xD2),
-          o2(0xA5,0xD3),      o2(0xA5,0xD4),
-          o2(0xA5,0xD5),      o2(0xA5,0xD6),
-          o2(0xA5,0xD7),      o2(0xA5,0xD8),
-          o2(0xA5,0xE1),      o2(0xA5,0xE2),
-          o2(0xA5,0xE3),      o2(0xA5,0xE4),
-          o2(0xA5,0xE5),      o2(0xA5,0xE6),
-          o2(0xA5,0xE7),      o2(0xA5,0xE8),
-          o2(0xA5,0xE9),      o2(0xA5,0xEA),
-          o2(0xA5,0xEB),      o2(0xA5,0xEC),
-          o2(0xA5,0xED),      o2(0xA5,0xEE),
-          o2(0xA5,0xEF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_CE = {
-    to_EUC_KR_CE_offsets,
-    to_CP949_CE_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_CF_infos[10] = {
-          o2(0xA5,0xF0),      o2(0xA5,0xF1),
-          o2(0xA5,0xF2),      o2(0xA5,0xF3),
-          o2(0xA5,0xF4),      o2(0xA5,0xF5),
-          o2(0xA5,0xF6),      o2(0xA5,0xF7),
-          o2(0xA5,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_CF = {
-    to_EUC_KR_CF_offsets,
-    to_CP949_CF_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_D0_infos[50] = {
-          o2(0xAC,0xA7),      o2(0xAC,0xA1),
-          o2(0xAC,0xA2),      o2(0xAC,0xA3),
-          o2(0xAC,0xA4),      o2(0xAC,0xA5),
-          o2(0xAC,0xA6),      o2(0xAC,0xA8),
-          o2(0xAC,0xA9),      o2(0xAC,0xAA),
-          o2(0xAC,0xAB),      o2(0xAC,0xAC),
-          o2(0xAC,0xAD),      o2(0xAC,0xAE),
-          o2(0xAC,0xAF),      o2(0xAC,0xB0),
-          o2(0xAC,0xB1),      o2(0xAC,0xB2),
-          o2(0xAC,0xB3),      o2(0xAC,0xB4),
-          o2(0xAC,0xB5),      o2(0xAC,0xB6),
-          o2(0xAC,0xB7),      o2(0xAC,0xB8),
-          o2(0xAC,0xB9),      o2(0xAC,0xBA),
-          o2(0xAC,0xBB),      o2(0xAC,0xBC),
-          o2(0xAC,0xBD),      o2(0xAC,0xBE),
-          o2(0xAC,0xBF),      o2(0xAC,0xC0),
-          o2(0xAC,0xC1),      o2(0xAC,0xD1),
-          o2(0xAC,0xD2),      o2(0xAC,0xD3),
-          o2(0xAC,0xD4),      o2(0xAC,0xD5),
-          o2(0xAC,0xD6),      o2(0xAC,0xD8),
-          o2(0xAC,0xD9),      o2(0xAC,0xDA),
-          o2(0xAC,0xDB),      o2(0xAC,0xDC),
-          o2(0xAC,0xDD),      o2(0xAC,0xDE),
-          o2(0xAC,0xDF),      o2(0xAC,0xE0),
-          o2(0xAC,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_D0 = {
-    to_EUC_KR_D0_offsets,
-    to_CP949_D0_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_D1_infos[18] = {
-          o2(0xAC,0xE2),      o2(0xAC,0xE3),
-          o2(0xAC,0xE4),      o2(0xAC,0xE5),
-          o2(0xAC,0xE6),      o2(0xAC,0xE7),
-          o2(0xAC,0xE8),      o2(0xAC,0xE9),
-          o2(0xAC,0xEA),      o2(0xAC,0xEB),
-          o2(0xAC,0xEC),      o2(0xAC,0xED),
-          o2(0xAC,0xEE),      o2(0xAC,0xEF),
-          o2(0xAC,0xF0),      o2(0xAC,0xF1),
-          o2(0xAC,0xD7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_D1 = {
-    to_EUC_KR_D1_offsets,
-    to_CP949_D1_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_00_infos[14] = {
-          o2(0xA1,0xAA),      o2(0xA1,0xAE),
-          o2(0xA1,0xAF),      o2(0xA1,0xB0),
-          o2(0xA1,0xB1),      o2(0xA2,0xD3),
-          o2(0xA2,0xD4),      o2(0xA1,0xA5),
-          o2(0xA1,0xA6),      o2(0xA2,0xB6),
-          o2(0xA1,0xC7),      o2(0xA1,0xC8),
-          o2(0xA1,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_00 = {
-    to_EUC_KR_E2_00_offsets,
-    to_CP949_E2_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_01_infos[3] = {
-          o2(0xA9,0xF9),      o2(0xA9,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_01 = {
-    to_EUC_KR_E2_01_offsets,
-    to_CP949_E2_01_infos
-};
-
-static const unsigned char
-to_CP949_E2_02_offsets[64] = {
-      5,  0,  1,  2,  3,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  4,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,      5,  5,  5,  5,  5,  5,  5,  5,
-};
-
-static const struct byte_lookup* const
-to_CP949_E2_02_infos[6] = {
-          o2(0xA9,0xFB),      o2(0xA9,0xFC),
-          o2(0xA9,0xFD),      o2(0xA9,0xFE),
-          o2(0xA2,0xE6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_02 = {
-    to_CP949_E2_02_offsets,
-    to_CP949_E2_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_04_infos[9] = {
-          o2(0xA1,0xC9),      o2(0xA2,0xB5),
-          o2(0xA7,0xA4),      o2(0xA2,0xE0),
-          o2(0xA2,0xE5),      o2(0xA2,0xE2),
-          o2(0xA7,0xD9),      o2(0xA1,0xCA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_04 = {
-    to_EUC_KR_E2_04_offsets,
-    to_CP949_E2_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_05_infos[27] = {
-          o2(0xA8,0xF7),      o2(0xA8,0xF8),
-          o2(0xA8,0xFB),      o2(0xA8,0xFC),
-          o2(0xA8,0xFD),      o2(0xA8,0xFE),
-          o2(0xA5,0xB0),      o2(0xA5,0xB1),
-          o2(0xA5,0xB2),      o2(0xA5,0xB3),
-          o2(0xA5,0xB4),      o2(0xA5,0xB5),
-          o2(0xA5,0xB6),      o2(0xA5,0xB7),
-          o2(0xA5,0xB8),      o2(0xA5,0xB9),
-          o2(0xA5,0xA1),      o2(0xA5,0xA2),
-          o2(0xA5,0xA3),      o2(0xA5,0xA4),
-          o2(0xA5,0xA5),      o2(0xA5,0xA6),
-          o2(0xA5,0xA7),      o2(0xA5,0xA8),
-          o2(0xA5,0xA9),      o2(0xA5,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_05 = {
-    to_EUC_KR_E2_05_offsets,
-    to_CP949_E2_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_06_infos[11] = {
-          o2(0xA1,0xE7),      o2(0xA1,0xE8),
-          o2(0xA1,0xE6),      o2(0xA1,0xE9),
-          o2(0xA1,0xEA),      o2(0xA2,0xD5),
-          o2(0xA2,0xD8),      o2(0xA2,0xD6),
-          o2(0xA2,0xD9),      o2(0xA2,0xD7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_06 = {
-    to_EUC_KR_E2_06_offsets,
-    to_CP949_E2_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_07_infos[3] = {
-          o2(0xA2,0xA1),      o2(0xA2,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_07 = {
-    to_EUC_KR_E2_07_offsets,
-    to_CP949_E2_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_08_infos[25] = {
-          o2(0xA2,0xA3),      o2(0xA1,0xD3),
-          o2(0xA2,0xA4),      o2(0xA1,0xD4),
-          o2(0xA1,0xF4),      o2(0xA1,0xF5),
-          o2(0xA2,0xB3),      o2(0xA2,0xB2),
-          o2(0xA1,0xEE),      o2(0xA1,0xF0),
-          o2(0xA1,0xC4),      o2(0xA1,0xD0),
-          o2(0xA1,0xAB),      o2(0xA1,0xFC),
-          o2(0xA1,0xFD),      o2(0xA1,0xFB),
-          o2(0xA1,0xFA),      o2(0xA1,0xF2),
-          o2(0xA1,0xF3),      o2(0xA2,0xB1),
-          o2(0xA1,0xC5),      o2(0xA1,0xF1),
-          o2(0xA1,0xAD),      o2(0xA1,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_08 = {
-    to_EUC_KR_E2_08_offsets,
-    to_CP949_E2_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_09_infos[8] = {
-          o2(0xA1,0xD6),      o2(0xA1,0xC1),
-          o2(0xA1,0xD5),      o2(0xA1,0xC2),
-          o2(0xA1,0xC3),      o2(0xA1,0xEC),
-          o2(0xA1,0xED),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_09 = {
-    to_EUC_KR_E2_09_offsets,
-    to_CP949_E2_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_0A_infos[7] = {
-          o2(0xA1,0xF8),      o2(0xA1,0xF9),
-          o2(0xA1,0xF6),      o2(0xA1,0xF7),
-          o2(0xA2,0xC1),      o2(0xA1,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_0A = {
-    to_EUC_KR_E2_0A_offsets,
-    to_CP949_E2_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_0C_infos[2] = {
-          o2(0xA1,0xD2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_0C = {
-    to_EUC_KR_E2_0C_offsets,
-    to_CP949_E2_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_11_infos[28] = {
-          o2(0xA8,0xE7),      o2(0xA8,0xE8),
-          o2(0xA8,0xE9),      o2(0xA8,0xEA),
-          o2(0xA8,0xEB),      o2(0xA8,0xEC),
-          o2(0xA8,0xED),      o2(0xA8,0xEE),
-          o2(0xA8,0xEF),      o2(0xA8,0xF0),
-          o2(0xA8,0xF1),      o2(0xA8,0xF2),
-          o2(0xA8,0xF3),      o2(0xA8,0xF4),
-          o2(0xA8,0xF5),      o2(0xA9,0xE7),
-          o2(0xA9,0xE8),      o2(0xA9,0xE9),
-          o2(0xA9,0xEA),      o2(0xA9,0xEB),
-          o2(0xA9,0xEC),      o2(0xA9,0xED),
-          o2(0xA9,0xEE),      o2(0xA9,0xEF),
-          o2(0xA9,0xF0),      o2(0xA9,0xF1),
-          o2(0xA9,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_11 = {
-    to_EUC_KR_E2_11_offsets,
-    to_CP949_E2_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_12_infos[30] = {
-          o2(0xA9,0xF3),      o2(0xA9,0xF4),
-          o2(0xA9,0xF5),      o2(0xA9,0xCD),
-          o2(0xA9,0xCE),      o2(0xA9,0xCF),
-          o2(0xA9,0xD0),      o2(0xA9,0xD1),
-          o2(0xA9,0xD2),      o2(0xA9,0xD3),
-          o2(0xA9,0xD4),      o2(0xA9,0xD5),
-          o2(0xA9,0xD6),      o2(0xA9,0xD7),
-          o2(0xA9,0xD8),      o2(0xA9,0xD9),
-          o2(0xA9,0xDA),      o2(0xA9,0xDB),
-          o2(0xA9,0xDC),      o2(0xA9,0xDD),
-          o2(0xA9,0xDE),      o2(0xA9,0xDF),
-          o2(0xA9,0xE0),      o2(0xA9,0xE1),
-          o2(0xA9,0xE2),      o2(0xA9,0xE3),
-          o2(0xA9,0xE4),      o2(0xA9,0xE5),
-          o2(0xA9,0xE6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_12 = {
-    to_EUC_KR_E2_12_offsets,
-    to_CP949_E2_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_13_infos[27] = {
-          o2(0xA8,0xCD),      o2(0xA8,0xCE),
-          o2(0xA8,0xCF),      o2(0xA8,0xD0),
-          o2(0xA8,0xD1),      o2(0xA8,0xD2),
-          o2(0xA8,0xD3),      o2(0xA8,0xD4),
-          o2(0xA8,0xD5),      o2(0xA8,0xD6),
-          o2(0xA8,0xD7),      o2(0xA8,0xD8),
-          o2(0xA8,0xD9),      o2(0xA8,0xDA),
-          o2(0xA8,0xDB),      o2(0xA8,0xDC),
-          o2(0xA8,0xDD),      o2(0xA8,0xDE),
-          o2(0xA8,0xDF),      o2(0xA8,0xE0),
-          o2(0xA8,0xE1),      o2(0xA8,0xE2),
-          o2(0xA8,0xE3),      o2(0xA8,0xE4),
-          o2(0xA8,0xE5),      o2(0xA8,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_13 = {
-    to_EUC_KR_E2_13_offsets,
-    to_CP949_E2_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_14_infos[57] = {
-          o2(0xA6,0xA1),      o2(0xA6,0xAC),
-          o2(0xA6,0xA2),      o2(0xA6,0xAD),
-          o2(0xA6,0xA3),      o2(0xA6,0xC8),
-          o2(0xA6,0xC7),      o2(0xA6,0xAE),
-          o2(0xA6,0xA4),      o2(0xA6,0xC2),
-          o2(0xA6,0xC1),      o2(0xA6,0xAF),
-          o2(0xA6,0xA6),      o2(0xA6,0xC6),
-          o2(0xA6,0xC5),      o2(0xA6,0xB1),
-          o2(0xA6,0xA5),      o2(0xA6,0xC4),
-          o2(0xA6,0xC3),      o2(0xA6,0xB0),
-          o2(0xA6,0xA7),      o2(0xA6,0xBC),
-          o2(0xA6,0xC9),      o2(0xA6,0xCA),
-          o2(0xA6,0xB7),      o2(0xA6,0xCB),
-          o2(0xA6,0xCC),      o2(0xA6,0xB2),
-          o2(0xA6,0xA9),      o2(0xA6,0xBE),
-          o2(0xA6,0xCD),      o2(0xA6,0xCE),
-          o2(0xA6,0xB9),      o2(0xA6,0xCF),
-          o2(0xA6,0xD0),      o2(0xA6,0xB4),
-          o2(0xA6,0xA8),      o2(0xA6,0xD1),
-          o2(0xA6,0xD2),      o2(0xA6,0xB8),
-          o2(0xA6,0xBD),      o2(0xA6,0xD3),
-          o2(0xA6,0xD4),      o2(0xA6,0xB3),
-          o2(0xA6,0xAA),      o2(0xA6,0xD5),
-          o2(0xA6,0xD6),      o2(0xA6,0xBA),
-          o2(0xA6,0xBF),      o2(0xA6,0xD7),
-          o2(0xA6,0xD8),      o2(0xA6,0xB5),
-          o2(0xA6,0xAB),      o2(0xA6,0xD9),
-          o2(0xA6,0xDA),      o2(0xA6,0xBB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_14 = {
-    to_EUC_KR_E2_14_offsets,
-    to_CP949_E2_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_15_infos[13] = {
-          o2(0xA6,0xDB),      o2(0xA6,0xDC),
-          o2(0xA6,0xC0),      o2(0xA6,0xDD),
-          o2(0xA6,0xDE),      o2(0xA6,0xDF),
-          o2(0xA6,0xE0),      o2(0xA6,0xE1),
-          o2(0xA6,0xE2),      o2(0xA6,0xE3),
-          o2(0xA6,0xE4),      o2(0xA6,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_15 = {
-    to_EUC_KR_E2_15_offsets,
-    to_CP949_E2_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_16_infos[17] = {
-          o2(0xA2,0xC6),      o2(0xA1,0xE1),
-          o2(0xA1,0xE0),      o2(0xA2,0xC3),
-          o2(0xA2,0xC7),      o2(0xA2,0xC8),
-          o2(0xA2,0xCB),      o2(0xA2,0xCA),
-          o2(0xA2,0xC9),      o2(0xA2,0xCC),
-          o2(0xA1,0xE3),      o2(0xA1,0xE2),
-          o2(0xA2,0xBA),      o2(0xA2,0xB9),
-          o2(0xA1,0xE5),      o2(0xA1,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_16 = {
-    to_EUC_KR_E2_16_offsets,
-    to_CP949_E2_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_17_infos[11] = {
-          o2(0xA2,0xB8),      o2(0xA2,0xB7),
-          o2(0xA1,0xDF),      o2(0xA1,0xDE),
-          o2(0xA2,0xC2),      o2(0xA1,0xDB),
-          o2(0xA1,0xDD),      o2(0xA1,0xDC),
-          o2(0xA2,0xC4),      o2(0xA2,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_17 = {
-    to_EUC_KR_E2_17_offsets,
-    to_CP949_E2_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_18_infos[7] = {
-          o2(0xA1,0xDA),      o2(0xA1,0xD9),
-          o2(0xA2,0xCF),      o2(0xA2,0xCE),
-          o2(0xA2,0xD0),      o2(0xA2,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_18 = {
-    to_EUC_KR_E2_18_offsets,
-    to_CP949_E2_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_19_infos[14] = {
-          o2(0xA1,0xCF),      o2(0xA1,0xCE),
-          o2(0xA2,0xBC),      o2(0xA2,0xBD),
-          o2(0xA2,0xC0),      o2(0xA2,0xBB),
-          o2(0xA2,0xBE),      o2(0xA2,0xBF),
-          o2(0xA2,0xCD),      o2(0xA2,0xDB),
-          o2(0xA2,0xDC),      o2(0xA2,0xDD),
-          o2(0xA2,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2_19 = {
-    to_EUC_KR_E2_19_offsets,
-    to_CP949_E2_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E2_infos[21] = {
-        &to_CP949_E2_00,    &to_CP949_E2_01,
-        &to_CP949_E2_02,    &to_CP949_E2_04,
-        &to_CP949_E2_05,    &to_CP949_E2_06,
-        &to_CP949_E2_07,    &to_CP949_E2_08,
-        &to_CP949_E2_09,    &to_CP949_E2_0A,
-        &to_CP949_E2_0C,    &to_CP949_E2_11,
-        &to_CP949_E2_12,    &to_CP949_E2_13,
-        &to_CP949_E2_14,    &to_CP949_E2_15,
-        &to_CP949_E2_16,    &to_CP949_E2_17,
-        &to_CP949_E2_18,    &to_CP949_E2_19,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E2 = {
-    to_EUC_KR_E2_offsets,
-    to_CP949_E2_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_00_infos[18] = {
-          o2(0xA1,0xA1),      o2(0xA1,0xA2),
-          o2(0xA1,0xA3),      o2(0xA1,0xA8),
-          o2(0xA1,0xB4),      o2(0xA1,0xB5),
-          o2(0xA1,0xB6),      o2(0xA1,0xB7),
-          o2(0xA1,0xB8),      o2(0xA1,0xB9),
-          o2(0xA1,0xBA),      o2(0xA1,0xBB),
-          o2(0xA1,0xBC),      o2(0xA1,0xBD),
-          o2(0xA1,0xEB),      o2(0xA1,0xB2),
-          o2(0xA1,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_00 = {
-    to_EUC_KR_E3_00_offsets,
-    to_CP949_E3_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_01_infos[64] = {
-          o2(0xAA,0xA1),      o2(0xAA,0xA2),
-          o2(0xAA,0xA3),      o2(0xAA,0xA4),
-          o2(0xAA,0xA5),      o2(0xAA,0xA6),
-          o2(0xAA,0xA7),      o2(0xAA,0xA8),
-          o2(0xAA,0xA9),      o2(0xAA,0xAA),
-          o2(0xAA,0xAB),      o2(0xAA,0xAC),
-          o2(0xAA,0xAD),      o2(0xAA,0xAE),
-          o2(0xAA,0xAF),      o2(0xAA,0xB0),
-          o2(0xAA,0xB1),      o2(0xAA,0xB2),
-          o2(0xAA,0xB3),      o2(0xAA,0xB4),
-          o2(0xAA,0xB5),      o2(0xAA,0xB6),
-          o2(0xAA,0xB7),      o2(0xAA,0xB8),
-          o2(0xAA,0xB9),      o2(0xAA,0xBA),
-          o2(0xAA,0xBB),      o2(0xAA,0xBC),
-          o2(0xAA,0xBD),      o2(0xAA,0xBE),
-          o2(0xAA,0xBF),      o2(0xAA,0xC0),
-          o2(0xAA,0xC1),      o2(0xAA,0xC2),
-          o2(0xAA,0xC3),      o2(0xAA,0xC4),
-          o2(0xAA,0xC5),      o2(0xAA,0xC6),
-          o2(0xAA,0xC7),      o2(0xAA,0xC8),
-          o2(0xAA,0xC9),      o2(0xAA,0xCA),
-          o2(0xAA,0xCB),      o2(0xAA,0xCC),
-          o2(0xAA,0xCD),      o2(0xAA,0xCE),
-          o2(0xAA,0xCF),      o2(0xAA,0xD0),
-          o2(0xAA,0xD1),      o2(0xAA,0xD2),
-          o2(0xAA,0xD3),      o2(0xAA,0xD4),
-          o2(0xAA,0xD5),      o2(0xAA,0xD6),
-          o2(0xAA,0xD7),      o2(0xAA,0xD8),
-          o2(0xAA,0xD9),      o2(0xAA,0xDA),
-          o2(0xAA,0xDB),      o2(0xAA,0xDC),
-          o2(0xAA,0xDD),      o2(0xAA,0xDE),
-          o2(0xAA,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_01 = {
-    to_EUC_KR_E3_01_offsets,
-    to_CP949_E3_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_02_infos[52] = {
-          o2(0xAA,0xE0),      o2(0xAA,0xE1),
-          o2(0xAA,0xE2),      o2(0xAA,0xE3),
-          o2(0xAA,0xE4),      o2(0xAA,0xE5),
-          o2(0xAA,0xE6),      o2(0xAA,0xE7),
-          o2(0xAA,0xE8),      o2(0xAA,0xE9),
-          o2(0xAA,0xEA),      o2(0xAA,0xEB),
-          o2(0xAA,0xEC),      o2(0xAA,0xED),
-          o2(0xAA,0xEE),      o2(0xAA,0xEF),
-          o2(0xAA,0xF0),      o2(0xAA,0xF1),
-          o2(0xAA,0xF2),      o2(0xAA,0xF3),
-          o2(0xAB,0xA1),      o2(0xAB,0xA2),
-          o2(0xAB,0xA3),      o2(0xAB,0xA4),
-          o2(0xAB,0xA5),      o2(0xAB,0xA6),
-          o2(0xAB,0xA7),      o2(0xAB,0xA8),
-          o2(0xAB,0xA9),      o2(0xAB,0xAA),
-          o2(0xAB,0xAB),      o2(0xAB,0xAC),
-          o2(0xAB,0xAD),      o2(0xAB,0xAE),
-          o2(0xAB,0xAF),      o2(0xAB,0xB0),
-          o2(0xAB,0xB1),      o2(0xAB,0xB2),
-          o2(0xAB,0xB3),      o2(0xAB,0xB4),
-          o2(0xAB,0xB5),      o2(0xAB,0xB6),
-          o2(0xAB,0xB7),      o2(0xAB,0xB8),
-          o2(0xAB,0xB9),      o2(0xAB,0xBA),
-          o2(0xAB,0xBB),      o2(0xAB,0xBC),
-          o2(0xAB,0xBD),      o2(0xAB,0xBE),
-          o2(0xAB,0xBF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_02 = {
-    to_EUC_KR_E3_02_offsets,
-    to_CP949_E3_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_03_infos[56] = {
-          o2(0xAB,0xC0),      o2(0xAB,0xC1),
-          o2(0xAB,0xC2),      o2(0xAB,0xC3),
-          o2(0xAB,0xC4),      o2(0xAB,0xC5),
-          o2(0xAB,0xC6),      o2(0xAB,0xC7),
-          o2(0xAB,0xC8),      o2(0xAB,0xC9),
-          o2(0xAB,0xCA),      o2(0xAB,0xCB),
-          o2(0xAB,0xCC),      o2(0xAB,0xCD),
-          o2(0xAB,0xCE),      o2(0xAB,0xCF),
-          o2(0xAB,0xD0),      o2(0xAB,0xD1),
-          o2(0xAB,0xD2),      o2(0xAB,0xD3),
-          o2(0xAB,0xD4),      o2(0xAB,0xD5),
-          o2(0xAB,0xD6),      o2(0xAB,0xD7),
-          o2(0xAB,0xD8),      o2(0xAB,0xD9),
-          o2(0xAB,0xDA),      o2(0xAB,0xDB),
-          o2(0xAB,0xDC),      o2(0xAB,0xDD),
-          o2(0xAB,0xDE),      o2(0xAB,0xDF),
-          o2(0xAB,0xE0),      o2(0xAB,0xE1),
-          o2(0xAB,0xE2),      o2(0xAB,0xE3),
-          o2(0xAB,0xE4),      o2(0xAB,0xE5),
-          o2(0xAB,0xE6),      o2(0xAB,0xE7),
-          o2(0xAB,0xE8),      o2(0xAB,0xE9),
-          o2(0xAB,0xEA),      o2(0xAB,0xEB),
-          o2(0xAB,0xEC),      o2(0xAB,0xED),
-          o2(0xAB,0xEE),      o2(0xAB,0xEF),
-          o2(0xAB,0xF0),      o2(0xAB,0xF1),
-          o2(0xAB,0xF2),      o2(0xAB,0xF3),
-          o2(0xAB,0xF4),      o2(0xAB,0xF5),
-          o2(0xAB,0xF6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_03 = {
-    to_EUC_KR_E3_03_offsets,
-    to_CP949_E3_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_04_infos[16] = {
-          o2(0xA4,0xA1),      o2(0xA4,0xA2),
-          o2(0xA4,0xA3),      o2(0xA4,0xA4),
-          o2(0xA4,0xA5),      o2(0xA4,0xA6),
-          o2(0xA4,0xA7),      o2(0xA4,0xA8),
-          o2(0xA4,0xA9),      o2(0xA4,0xAA),
-          o2(0xA4,0xAB),      o2(0xA4,0xAC),
-          o2(0xA4,0xAD),      o2(0xA4,0xAE),
-          o2(0xA4,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_04 = {
-    to_EUC_KR_E3_04_offsets,
-    to_CP949_E3_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_05_infos[65] = {
-          o2(0xA4,0xB0),      o2(0xA4,0xB1),
-          o2(0xA4,0xB2),      o2(0xA4,0xB3),
-          o2(0xA4,0xB4),      o2(0xA4,0xB5),
-          o2(0xA4,0xB6),      o2(0xA4,0xB7),
-          o2(0xA4,0xB8),      o2(0xA4,0xB9),
-          o2(0xA4,0xBA),      o2(0xA4,0xBB),
-          o2(0xA4,0xBC),      o2(0xA4,0xBD),
-          o2(0xA4,0xBE),      o2(0xA4,0xBF),
-          o2(0xA4,0xC0),      o2(0xA4,0xC1),
-          o2(0xA4,0xC2),      o2(0xA4,0xC3),
-          o2(0xA4,0xC4),      o2(0xA4,0xC5),
-          o2(0xA4,0xC6),      o2(0xA4,0xC7),
-          o2(0xA4,0xC8),      o2(0xA4,0xC9),
-          o2(0xA4,0xCA),      o2(0xA4,0xCB),
-          o2(0xA4,0xCC),      o2(0xA4,0xCD),
-          o2(0xA4,0xCE),      o2(0xA4,0xCF),
-          o2(0xA4,0xD0),      o2(0xA4,0xD1),
-          o2(0xA4,0xD2),      o2(0xA4,0xD3),
-          o2(0xA4,0xD4),      o2(0xA4,0xD5),
-          o2(0xA4,0xD6),      o2(0xA4,0xD7),
-          o2(0xA4,0xD8),      o2(0xA4,0xD9),
-          o2(0xA4,0xDA),      o2(0xA4,0xDB),
-          o2(0xA4,0xDC),      o2(0xA4,0xDD),
-          o2(0xA4,0xDE),      o2(0xA4,0xDF),
-          o2(0xA4,0xE0),      o2(0xA4,0xE1),
-          o2(0xA4,0xE2),      o2(0xA4,0xE3),
-          o2(0xA4,0xE4),      o2(0xA4,0xE5),
-          o2(0xA4,0xE6),      o2(0xA4,0xE7),
-          o2(0xA4,0xE8),      o2(0xA4,0xE9),
-          o2(0xA4,0xEA),      o2(0xA4,0xEB),
-          o2(0xA4,0xEC),      o2(0xA4,0xED),
-          o2(0xA4,0xEE),      o2(0xA4,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_05 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_E3_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_06_infos[16] = {
-          o2(0xA4,0xF0),      o2(0xA4,0xF1),
-          o2(0xA4,0xF2),      o2(0xA4,0xF3),
-          o2(0xA4,0xF4),      o2(0xA4,0xF5),
-          o2(0xA4,0xF6),      o2(0xA4,0xF7),
-          o2(0xA4,0xF8),      o2(0xA4,0xF9),
-          o2(0xA4,0xFA),      o2(0xA4,0xFB),
-          o2(0xA4,0xFC),      o2(0xA4,0xFD),
-          o2(0xA4,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_06 = {
-    to_EUC_KR_E3_06_offsets,
-    to_CP949_E3_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_08_infos[30] = {
-          o2(0xA9,0xB1),      o2(0xA9,0xB2),
-          o2(0xA9,0xB3),      o2(0xA9,0xB4),
-          o2(0xA9,0xB5),      o2(0xA9,0xB6),
-          o2(0xA9,0xB7),      o2(0xA9,0xB8),
-          o2(0xA9,0xB9),      o2(0xA9,0xBA),
-          o2(0xA9,0xBB),      o2(0xA9,0xBC),
-          o2(0xA9,0xBD),      o2(0xA9,0xBE),
-          o2(0xA9,0xBF),      o2(0xA9,0xC0),
-          o2(0xA9,0xC1),      o2(0xA9,0xC2),
-          o2(0xA9,0xC3),      o2(0xA9,0xC4),
-          o2(0xA9,0xC5),      o2(0xA9,0xC6),
-          o2(0xA9,0xC7),      o2(0xA9,0xC8),
-          o2(0xA9,0xC9),      o2(0xA9,0xCA),
-          o2(0xA9,0xCB),      o2(0xA9,0xCC),
-          o2(0xA2,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_08 = {
-    to_EUC_KR_E3_08_offsets,
-    to_CP949_E3_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_09_infos[30] = {
-          o2(0xA8,0xB1),      o2(0xA8,0xB2),
-          o2(0xA8,0xB3),      o2(0xA8,0xB4),
-          o2(0xA8,0xB5),      o2(0xA8,0xB6),
-          o2(0xA8,0xB7),      o2(0xA8,0xB8),
-          o2(0xA8,0xB9),      o2(0xA8,0xBA),
-          o2(0xA8,0xBB),      o2(0xA8,0xBC),
-          o2(0xA8,0xBD),      o2(0xA8,0xBE),
-          o2(0xA8,0xBF),      o2(0xA8,0xC0),
-          o2(0xA8,0xC1),      o2(0xA8,0xC2),
-          o2(0xA8,0xC3),      o2(0xA8,0xC4),
-          o2(0xA8,0xC5),      o2(0xA8,0xC6),
-          o2(0xA8,0xC7),      o2(0xA8,0xC8),
-          o2(0xA8,0xC9),      o2(0xA8,0xCA),
-          o2(0xA8,0xCB),      o2(0xA8,0xCC),
-          o2(0xA2,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_09 = {
-    to_EUC_KR_E3_09_offsets,
-    to_CP949_E3_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_0E_infos[62] = {
-          o2(0xA7,0xC9),      o2(0xA7,0xCA),
-          o2(0xA7,0xCB),      o2(0xA7,0xCC),
-          o2(0xA7,0xCD),      o2(0xA7,0xBA),
-          o2(0xA7,0xBB),      o2(0xA7,0xDC),
-          o2(0xA7,0xDD),      o2(0xA7,0xDE),
-          o2(0xA7,0xB6),      o2(0xA7,0xB7),
-          o2(0xA7,0xB8),      o2(0xA7,0xD4),
-          o2(0xA7,0xD5),      o2(0xA7,0xD6),
-          o2(0xA7,0xD7),      o2(0xA7,0xD8),
-          o2(0xA7,0xA1),      o2(0xA7,0xA2),
-          o2(0xA7,0xA3),      o2(0xA7,0xA5),
-          o2(0xA7,0xAB),      o2(0xA7,0xAC),
-          o2(0xA7,0xAD),      o2(0xA7,0xAE),
-          o2(0xA7,0xAF),      o2(0xA7,0xB0),
-          o2(0xA7,0xB1),      o2(0xA7,0xB2),
-          o2(0xA7,0xB3),      o2(0xA7,0xB4),
-          o2(0xA7,0xA7),      o2(0xA7,0xA8),
-          o2(0xA7,0xA9),      o2(0xA7,0xAA),
-          o2(0xA7,0xBD),      o2(0xA7,0xBE),
-          o2(0xA7,0xE5),      o2(0xA7,0xE6),
-          o2(0xA7,0xE7),      o2(0xA7,0xE8),
-          o2(0xA7,0xE1),      o2(0xA7,0xE2),
-          o2(0xA7,0xE3),      o2(0xA7,0xBF),
-          o2(0xA7,0xC0),      o2(0xA7,0xC1),
-          o2(0xA7,0xC2),      o2(0xA7,0xC3),
-          o2(0xA7,0xC4),      o2(0xA7,0xC5),
-          o2(0xA7,0xC6),      o2(0xA7,0xC7),
-          o2(0xA7,0xC8),      o2(0xA7,0xCE),
-          o2(0xA7,0xCF),      o2(0xA7,0xD0),
-          o2(0xA7,0xD1),      o2(0xA7,0xD2),
-          o2(0xA7,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_0E = {
-    to_EUC_KR_E3_0E_offsets,
-    to_CP949_E3_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_0F_infos[20] = {
-          o2(0xA7,0xDA),      o2(0xA7,0xDB),
-          o2(0xA2,0xE3),      o2(0xA7,0xEC),
-          o2(0xA7,0xA6),      o2(0xA7,0xE0),
-          o2(0xA7,0xEF),      o2(0xA2,0xE1),
-          o2(0xA7,0xBC),      o2(0xA7,0xED),
-          o2(0xA7,0xB5),      o2(0xA7,0xB9),
-          o2(0xA7,0xEA),      o2(0xA7,0xEB),
-          o2(0xA7,0xDF),      o2(0xA2,0xE4),
-          o2(0xA7,0xE4),      o2(0xA7,0xEE),
-          o2(0xA7,0xE9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3_0F = {
-    to_EUC_KR_E3_0F_offsets,
-    to_CP949_E3_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E3_infos[12] = {
-        &to_CP949_E3_00,    &to_CP949_E3_01,
-        &to_CP949_E3_02,    &to_CP949_E3_03,
-        &to_CP949_E3_04,    &to_CP949_E3_05,
-        &to_CP949_E3_06,    &to_CP949_E3_08,
-        &to_CP949_E3_09,    &to_CP949_E3_0E,
-        &to_CP949_E3_0F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E3 = {
-    to_EUC_KR_E3_offsets,
-    to_CP949_E3_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_38_infos[22] = {
-          o2(0xEC,0xE9),      o2(0xEF,0xCB),
-          o2(0xF6,0xD2),      o2(0xD8,0xB2),
-          o2(0xED,0xDB),      o2(0xDF,0xB2),
-          o2(0xDF,0xBE),      o2(0xF9,0xBB),
-          o2(0xDC,0xF4),      o2(0xF5,0xE4),
-          o2(0xF3,0xA6),      o2(0xDD,0xE0),
-          o2(0xE1,0xA6),      o2(0xCE,0xF8),
-          o2(0xDC,0xB0),      o2(0xE3,0xAA),
-          o2(0xF1,0xE9),      o2(0xCD,0xFA),
-          o2(0xFC,0xAF),      o2(0xD3,0xA1),
-          o2(0xF1,0xAB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_38 = {
-    to_EUC_KR_E4_38_offsets,
-    to_CP949_E4_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_39_infos[20] = {
-          o2(0xE7,0xD1),      o2(0xD2,0xAC),
-          o2(0xCE,0xF9),      o2(0xF1,0xFD),
-          o2(0xDE,0xBF),      o2(0xFB,0xBA),
-          o2(0xF9,0xB9),      o2(0xCE,0xD2),
-          o2(0xE3,0xAB),      o2(0xEB,0xE0),
-          o2(0xCE,0xFA),      o2(0xCB,0xF7),
-          o2(0xE5,0xA5),      o2(0xCA,0xE1),
-          o2(0xD4,0xCC),      o2(0xEA,0xE1),
-          o2(0xDC,0xE3),      o2(0xDF,0xAD),
-          o2(0xCB,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_39 = {
-    to_EUC_KR_E4_39_offsets,
-    to_CP949_E4_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3A_infos[27] = {
-          o2(0xD5,0xAF),      o2(0xD6,0xF5),
-          o2(0xE5,0xF8),      o2(0xDE,0xC0),
-          o2(0xEC,0xA3),      o2(0xE9,0xCD),
-          o2(0xEA,0xA7),      o2(0xE9,0xF6),
-          o2(0xFB,0xBB),      o2(0xE7,0xE9),
-          o2(0xEF,0xCC),      o2(0xD0,0xE6),
-          o2(0xDE,0xC1),      o2(0xE4,0xAC),
-          o2(0xD8,0xCC),      o2(0xF9,0xF1),
-          o2(0xCE,0xDF),      o2(0xFA,0xA4),
-          o2(0xE6,0xB2),      o2(0xFA,0xFB),
-          o2(0xFA,0xBD),      o2(0xCC,0xC8),
-          o2(0xEF,0xCD),      o2(0xD5,0xD5),
-          o2(0xD3,0xA2),      o2(0xEC,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3A = {
-    to_EUC_KR_E4_3A_offsets,
-    to_CP949_E4_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3B_infos[24] = {
-          o2(0xE4,0xA7),      o2(0xEC,0xD2),
-          o2(0xF6,0xB1),      o2(0xCE,0xFB),
-          o2(0xD0,0xD1),      o2(0xCB,0xBF),
-          o2(0xED,0xA4),      o2(0xED,0xA8),
-          o2(0xDE,0xC2),      o2(0xF6,0xE2),
-          o2(0xED,0xDC),      o2(0xDC,0xF5),
-          o2(0xE0,0xB9),      o2(0xD4,0xCE),
-          o2(0xF4,0xB5),      o2(0xD3,0xDB),
-          o2(0xD6,0xB5),      o2(0xEC,0xA4),
-          o2(0xE4,0xE6),      o2(0xF1,0xEA),
-          o2(0xCB,0xEC),      o2(0xCB,0xC0),
-          o2(0xEC,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3B = {
-    to_EUC_KR_E4_3B_offsets,
-    to_CP949_E4_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3C_infos[17] = {
-          o2(0xD0,0xEA),      o2(0xF9,0xF2),
-          o2(0xEC,0xA5),      o2(0xD0,0xDF),
-          o2(0xE7,0xEA),      o2(0xD0,0xEB),
-          o2(0xDC,0xD1),      o2(0xDB,0xE9),
-          o2(0xFD,0xCC),      o2(0xDB,0xD7),
-          o2(0xDA,0xE1),      o2(0xD6,0xB6),
-          o2(0xE3,0xDF),      o2(0xDE,0xC3),
-          o2(0xDE,0xC4),      o2(0xCA,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3C = {
-    to_EUC_KR_E4_3C_offsets,
-    to_CP949_E4_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3D_infos[23] = {
-          o2(0xEE,0xEC),      o2(0xD3,0xA3),
-          o2(0xEE,0xB7),      o2(0xF8,0xCF),
-          o2(0xEA,0xC8),      o2(0xEE,0xB8),
-          o2(0xF1,0xAC),      o2(0xF1,0xA5),
-          o2(0xE9,0xCE),      o2(0xF9,0xBC),
-          o2(0xE5,0xF9),      o2(0xEC,0xEA),
-          o2(0xDD,0xD6),      o2(0xED,0xC2),
-          o2(0xF8,0xA5),      o2(0xE5,0xBA),
-          o2(0xDB,0xD8),      o2(0xCA,0xA2),
-          o2(0xD1,0xCD),      o2(0xEE,0xED),
-          o2(0xEC,0xEB),      o2(0xDE,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3D = {
-    to_EUC_KR_E4_3D_offsets,
-    to_CP949_E4_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3E_infos[20] = {
-          o2(0xE3,0xE0),      o2(0xCA,0xC9),
-          o2(0xF2,0xE9),      o2(0xD5,0xCE),
-          o2(0xF6,0xB6),      o2(0xCE,0xC2),
-          o2(0xD6,0xC7),      o2(0xE3,0xB4),
-          o2(0xF1,0xAD),      o2(0xEA,0xE2),
-          o2(0xD7,0xC2),      o2(0xF3,0xA7),
-          o2(0xCD,0xEA),      o2(0xEB,0xEE),
-          o2(0xD9,0xB2),      o2(0xFD,0xA5),
-          o2(0xF6,0xD5),      o2(0xD5,0xE2),
-          o2(0xF8,0xB5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3E = {
-    to_EUC_KR_E4_3E_offsets,
-    to_CP949_E4_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_3F_infos[23] = {
-          o2(0xCC,0xF5),      o2(0xF5,0xB5),
-          o2(0xE4,0xAD),      o2(0xE7,0xEB),
-          o2(0xF1,0xD5),      o2(0xF0,0xBB),
-          o2(0xE9,0xB5),      o2(0xCC,0xC9),
-          o2(0xFA,0xD5),      o2(0xE1,0xD4),
-          o2(0xD7,0xD6),      o2(0xDC,0xC1),
-          o2(0xDE,0xC6),      o2(0xFA,0xEF),
-          o2(0xE3,0xE1),      o2(0xE1,0xF3),
-          o2(0xDC,0xF6),      o2(0xCE,0xFC),
-          o2(0xDB,0xC4),      o2(0xF8,0xF1),
-          o2(0xDC,0xE4),      o2(0xE5,0xEF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4_3F = {
-    to_EUC_KR_E4_3F_offsets,
-    to_CP949_E4_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E4_infos[9] = {
-        &to_CP949_E4_38,    &to_CP949_E4_39,
-        &to_CP949_E4_3A,    &to_CP949_E4_3B,
-        &to_CP949_E4_3C,    &to_CP949_E4_3D,
-        &to_CP949_E4_3E,    &to_CP949_E4_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E4 = {
-    to_EUC_KR_E4_offsets,
-    to_CP949_E4_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_00_infos[25] = {
-          o2(0xDC,0xB1),      o2(0xD5,0xD6),
-          o2(0xF3,0xDA),      o2(0xCB,0xC1),
-          o2(0xDB,0xC3),      o2(0xD9,0xFA),
-          o2(0xD3,0xEE),      o2(0xFA,0xB8),
-          o2(0xFD,0xA6),      o2(0xEB,0xEF),
-          o2(0xF4,0xA6),      o2(0xCC,0xCA),
-          o2(0xF3,0xA8),      o2(0xF3,0xDB),
-          o2(0xDB,0xA7),      o2(0xF6,0xB7),
-          o2(0xCF,0xE6),      o2(0xF0,0xF2),
-          o2(0xCB,0xDA),      o2(0xE7,0xD2),
-          o2(0xD7,0xC3),      o2(0xF6,0xF0),
-          o2(0xE8,0xDE),      o2(0xE5,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_00 = {
-    to_EUC_KR_E5_00_offsets,
-    to_CP949_E5_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_01_infos[14] = {
-          o2(0xE5,0xE7),      o2(0xCA,0xA3),
-          o2(0xCC,0xA7),      o2(0xEA,0xC9),
-          o2(0xF8,0xB6),      o2(0xFA,0xA5),
-          o2(0xF1,0xAE),      o2(0xEF,0xCE),
-          o2(0xCB,0xED),      o2(0xF6,0xB0),
-          o2(0xEF,0xCF),      o2(0xE9,0xCF),
-          o2(0xF7,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_01 = {
-    to_EUC_KR_E5_01_offsets,
-    to_CP949_E5_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_02_infos[14] = {
-          o2(0xCE,0xD3),      o2(0xDC,0xF7),
-          o2(0xDB,0xA8),      o2(0xCB,0xF8),
-          o2(0xDF,0xA1),      o2(0xDD,0xE1),
-          o2(0xF5,0xCA),      o2(0xE9,0xB6),
-          o2(0xE7,0xEC),      o2(0xEE,0xEE),
-          o2(0xF3,0xF0),      o2(0xDF,0xBF),
-          o2(0xCC,0xCB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_02 = {
-    to_EUC_KR_E5_02_offsets,
-    to_CP949_E5_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_03_infos[16] = {
-          o2(0xD0,0xC1),      o2(0xF4,0xD2),
-          o2(0xE0,0xBA),      o2(0xDF,0xC0),
-          o2(0xCE,0xE0),      o2(0xDC,0xD2),
-          o2(0xFD,0xEA),      o2(0xD6,0xF6),
-          o2(0xEA,0xCA),      o2(0xE8,0xE9),
-          o2(0xE3,0xAC),      o2(0xF3,0xD0),
-          o2(0xCA,0xA4),      o2(0xDB,0xF8),
-          o2(0xDE,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_03 = {
-    to_EUC_KR_E5_03_offsets,
-    to_CP949_E5_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_04_infos[14] = {
-          o2(0xEB,0xF0),      o2(0xF1,0xD6),
-          o2(0xE5,0xE2),      o2(0xCC,0xCC),
-          o2(0xCB,0xFB),      o2(0xEA,0xE3),
-          o2(0xDF,0xC1),      o2(0xD6,0xED),
-          o2(0xE9,0xD0),      o2(0xEE,0xB9),
-          o2(0xD5,0xE3),      o2(0xD1,0xD3),
-          o2(0xE5,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_04 = {
-    to_EUC_KR_E5_04_offsets,
-    to_CP949_E5_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_05_infos[32] = {
-          o2(0xE8,0xB4),      o2(0xEB,0xC3),
-          o2(0xEA,0xAA),      o2(0xFA,0xFC),
-          o2(0xF5,0xF6),      o2(0xF0,0xBC),
-          o2(0xFD,0xD4),      o2(0xE0,0xBB),
-          o2(0xCE,0xC3),      o2(0xD0,0xBA),
-          o2(0xF7,0xBA),      o2(0xD8,0xF3),
-          o2(0xF7,0xCD),      o2(0xE4,0xAE),
-          o2(0xD4,0xDF),      o2(0xD0,0xE7),
-          o2(0xEC,0xFD),      o2(0xD2,0xAE),
-          o2(0xEE,0xEF),      o2(0xD5,0xD7),
-          o2(0xEA,0xE4),      o2(0xF8,0xA2),
-          o2(0xCD,0xEB),      o2(0xD7,0xBF),
-          o2(0xFB,0xB1),      o2(0xCD,0xEC),
-          o2(0xDC,0xB2),      o2(0xD0,0xEC),
-          o2(0xCE,0xFD),      o2(0xEE,0xF0),
-          o2(0xCC,0xC2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_05 = {
-    to_EUC_KR_E5_05_offsets,
-    to_CP949_E5_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_06_infos[15] = {
-          o2(0xD0,0xED),      o2(0xE5,0xF7),
-          o2(0xF3,0xFC),      o2(0xEE,0xA2),
-          o2(0xD9,0xB3),      o2(0xD8,0xF4),
-          o2(0xE9,0xB7),      o2(0xCE,0xAE),
-          o2(0xD9,0xA2),      o2(0xD8,0xF1),
-          o2(0xD4,0xCF),      o2(0xE5,0xA7),
-          o2(0xD5,0xD2),      o2(0xD6,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_06 = {
-    to_EUC_KR_E5_06_offsets,
-    to_CP949_E5_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_07_infos[18] = {
-          o2(0xF4,0xA2),      o2(0xF1,0xD7),
-          o2(0xD5,0xD8),      o2(0xF0,0xBD),
-          o2(0xD7,0xD0),      o2(0xD4,0xD0),
-          o2(0xD7,0xCF),      o2(0xEB,0xEA),
-          o2(0xFD,0xEB),      o2(0xDB,0xED),
-          o2(0xFC,0xC5),      o2(0xCB,0xC2),
-          o2(0xFD,0xD5),      o2(0xF4,0xC8),
-          o2(0xE8,0xEA),      o2(0xF5,0xF3),
-          o2(0xF9,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_07 = {
-    to_EUC_KR_E5_07_offsets,
-    to_CP949_E5_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_08_infos[23] = {
-          o2(0xD3,0xEF),      o2(0xEC,0xD3),
-          o2(0xDD,0xC2),      o2(0xEF,0xB7),
-          o2(0xE7,0xD4),      o2(0xCA,0xCA),
-          o2(0xD9,0xFB),      o2(0xFA,0xFD),
-          o2(0xD6,0xAA),      o2(0xF4,0xF8),
-          o2(0xF7,0xF7),      o2(0xDC,0xAC),
-          o2(0xD7,0xD7),      o2(0xDF,0xA2),
-          o2(0xCE,0xBE),      o2(0xD3,0xF0),
-          o2(0xF0,0xA4),      o2(0xE1,0xEC),
-          o2(0xCF,0xE7),      o2(0xF3,0xCB),
-          o2(0xED,0xA9),      o2(0xCA,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_08 = {
-    to_EUC_KR_E5_08_offsets,
-    to_CP949_E5_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_09_infos[19] = {
-          o2(0xF4,0xEF),      o2(0xF6,0xCE),
-          o2(0xDE,0xFB),      o2(0xD0,0xBB),
-          o2(0xD5,0xB7),      o2(0xEE,0xF1),
-          o2(0xF4,0xA8),      o2(0xDC,0xF8),
-          o2(0xCB,0xA7),      o2(0xDA,0xCE),
-          o2(0xE0,0xE6),      o2(0xED,0xA5),
-          o2(0xEE,0xF2),      o2(0xDC,0xF9),
-          o2(0xF9,0xDC),      o2(0xF3,0xDC),
-          o2(0xF8,0xF2),      o2(0xF4,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_09 = {
-    to_EUC_KR_E5_09_offsets,
-    to_CP949_E5_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0A_infos[17] = {
-          o2(0xFC,0xF1),      o2(0xD0,0xBC),
-          o2(0xDB,0xF9),      o2(0xD7,0xB1),
-          o2(0xCB,0xFC),      o2(0xF0,0xA5),
-          o2(0xCB,0xFD),      o2(0xD5,0xF4),
-          o2(0xCD,0xED),      o2(0xCA,0xA5),
-          o2(0xD6,0xAB),      o2(0xD0,0xC2),
-          o2(0xF0,0xBE),      o2(0xD2,0xBD),
-          o2(0xCC,0xA4),      o2(0xFA,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0A = {
-    to_EUC_KR_E5_0A_offsets,
-    to_CP949_E5_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0B_infos[26] = {
-          o2(0xCC,0xCD),      o2(0xDA,0xFA),
-          o2(0xF6,0xCF),      o2(0xE9,0xB8),
-          o2(0xD8,0xF5),      o2(0xCC,0xCE),
-          o2(0xD7,0xCD),      o2(0xD4,0xD1),
-          o2(0xE9,0xED),      o2(0xCA,0xEB),
-          o2(0xD9,0xE2),      o2(0xFD,0xB2),
-          o2(0xE3,0xAD),      o2(0xD6,0xCC),
-          o2(0xD9,0xB4),      o2(0xE1,0xA7),
-          o2(0xEE,0xD3),      o2(0xD0,0xC3),
-          o2(0xFD,0xB3),      o2(0xD5,0xE4),
-          o2(0xCF,0xE8),      o2(0xED,0xC3),
-          o2(0xD0,0xB2),      o2(0xCE,0xFE),
-          o2(0xDA,0xA8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0B = {
-    to_EUC_KR_E5_0B_offsets,
-    to_CP949_E5_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0C_infos[17] = {
-          o2(0xF8,0xD0),      o2(0xFD,0xD6),
-          o2(0xF8,0xD1),      o2(0xF8,0xD2),
-          o2(0xDC,0xD3),      o2(0xDD,0xE2),
-          o2(0xFB,0xF9),      o2(0xDD,0xC1),
-          o2(0xE3,0xB5),      o2(0xED,0xDD),
-          o2(0xCE,0xC4),      o2(0xCB,0xA1),
-          o2(0xDD,0xE3),      o2(0xFC,0xDD),
-          o2(0xF9,0xAF),      o2(0xD2,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0C = {
-    to_EUC_KR_E5_0C_offsets,
-    to_CP949_E5_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0D_infos[29] = {
-          o2(0xCF,0xA1),      o2(0xE4,0xA8),
-          o2(0xF4,0xB6),      o2(0xEC,0xFE),
-          o2(0xE3,0xAE),      o2(0xE7,0xED),
-          o2(0xFD,0xC1),      o2(0xDA,0xE2),
-          o2(0xD8,0xB3),      o2(0xDD,0xE4),
-          o2(0xF0,0xEF),      o2(0xF6,0xF1),
-          o2(0xFA,0xF0),      o2(0xD1,0xF5),
-          o2(0xDA,0xCF),      o2(0xDC,0xD4),
-          o2(0xDC,0xA6),      o2(0xEF,0xBF),
-          o2(0xCE,0xCF),      o2(0xE0,0xD9),
-          o2(0xD9,0xD6),      o2(0xEC,0xD4),
-          o2(0xEA,0xCB),      o2(0xCA,0xBF),
-          o2(0xD5,0xB0),      o2(0xCF,0xE9),
-          o2(0xF1,0xED),      o2(0xCC,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0D = {
-    to_EUC_KR_E5_0D_offsets,
-    to_CP949_E5_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0E_infos[11] = {
-          o2(0xE4,0xF8),      o2(0xE4,0xED),
-          o2(0xD7,0xD8),      o2(0xFD,0xA7),
-          o2(0xEA,0xAB),      o2(0xF6,0xB2),
-          o2(0xCF,0xF0),      o2(0xF9,0xBD),
-          o2(0xE6,0xF4),      o2(0xCB,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0E = {
-    to_EUC_KR_E5_0E_offsets,
-    to_CP949_E5_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_0F_infos[27] = {
-          o2(0xF3,0xD1),      o2(0xE9,0xD1),
-          o2(0xF3,0xA9),      o2(0xD0,0xE0),
-          o2(0xE9,0xD2),      o2(0xDA,0xE3),
-          o2(0xE2,0xD2),      o2(0xF6,0xA2),
-          o2(0xE1,0xF4),      o2(0xDA,0xE4),
-          o2(0xE7,0xD5),      o2(0xF5,0xBF),
-          o2(0xCF,0xA2),      o2(0xCD,0xAF),
-          o2(0xCF,0xA3),      o2(0xCD,0xB0),
-          o2(0xF1,0xFE),      o2(0xD0,0xA3),
-          o2(0xE1,0xAF),      o2(0xF8,0xA3),
-          o2(0xCA,0xA6),      o2(0xF7,0xBB),
-          o2(0xF2,0xEA),      o2(0xDE,0xC8),
-          o2(0xE9,0xD3),      o2(0xDE,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_0F = {
-    to_EUC_KR_E5_0F_offsets,
-    to_CP949_E5_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_10_infos[25] = {
-          o2(0xFD,0xDE),      o2(0xCA,0xC0),
-          o2(0xF9,0xEA),      o2(0xD1,0xCE),
-          o2(0xEE,0xD4),      o2(0xD4,0xD2),
-          o2(0xD9,0xA3),      o2(0xFD,0xA8),
-          o2(0xD7,0xD9),      o2(0xF7,0xCE),
-          o2(0xFA,0xBE),      o2(0xCF,0xD6),
-          o2(0xD7,0xF0),      o2(0xEB,0xE1),
-          o2(0xF8,0xC5),      o2(0xDC,0xFA),
-          o2(0xDD,0xC3),      o2(0xF9,0xDF),
-          o2(0xE7,0xEF),      o2(0xFD,0xE5),
-          o2(0xF6,0xA3),      o2(0xD9,0xFC),
-          o2(0xFD,0xA9),      o2(0xE7,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_10 = {
-    to_EUC_KR_E5_10_offsets,
-    to_CP949_E5_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_11_infos[13] = {
-          o2(0xD5,0xE5),      o2(0xEF,0xD0),
-          o2(0xCD,0xB1),      o2(0xF7,0xA2),
-          o2(0xF1,0xB2),      o2(0xF1,0xB1),
-          o2(0xCD,0xB2),      o2(0xDA,0xAB),
-          o2(0xCA,0xA7),      o2(0xE3,0xE2),
-          o2(0xFB,0xBC),      o2(0xD9,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_11 = {
-    to_EUC_KR_E5_11_offsets,
-    to_CP949_E5_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_12_infos[13] = {
-          o2(0xEE,0xBA),      o2(0xF8,0xD3),
-          o2(0xFB,0xFA),      o2(0xCF,0xA4),
-          o2(0xDC,0xFB),      o2(0xF6,0xE3),
-          o2(0xED,0xAA),      o2(0xF2,0xA1),
-          o2(0xCE,0xE1),      o2(0xFA,0xA6),
-          o2(0xF9,0xE0),      o2(0xEC,0xD6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_12 = {
-    to_EUC_KR_E5_12_offsets,
-    to_CP949_E5_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_13_infos[13] = {
-          o2(0xE4,0xEE),      o2(0xF9,0xA1),
-          o2(0xFB,0xEF),      o2(0xF9,0xEB),
-          o2(0xEE,0xA3),      o2(0xEA,0xAC),
-          o2(0xCA,0xA8),      o2(0xF4,0xFA),
-          o2(0xCD,0xD6),      o2(0xFC,0xF6),
-          o2(0xF4,0xC9),      o2(0xF8,0xD4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_13 = {
-    to_EUC_KR_E5_13_offsets,
-    to_CP949_E5_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_14_infos[11] = {
-          o2(0xF8,0xA6),      o2(0xDE,0xCA),
-          o2(0xF2,0xC6),      o2(0xD7,0xDA),
-          o2(0xD3,0xD0),      o2(0xD8,0xC5),
-          o2(0xEA,0xE6),      o2(0xF3,0xDD),
-          o2(0xE4,0xDA),      o2(0xF6,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_14 = {
-    to_EUC_KR_E5_14_offsets,
-    to_CP949_E5_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_15_infos[9] = {
-          o2(0xF6,0xF2),      o2(0xDF,0xC2),
-          o2(0xD9,0xFD),      o2(0xCC,0xF6),
-          o2(0xD3,0xBA),      o2(0xE4,0xAF),
-          o2(0xF9,0xE1),      o2(0xF0,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_15 = {
-    to_EUC_KR_E5_15_offsets,
-    to_CP949_E5_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_16_infos[18] = {
-          o2(0xCB,0xD3),      o2(0xE0,0xBC),
-          o2(0xF4,0xCA),      o2(0xD4,0xFA),
-          o2(0xFD,0xAA),      o2(0xF9,0xE2),
-          o2(0xF4,0xB7),      o2(0xFD,0xC2),
-          o2(0xFC,0xB0),      o2(0xFD,0xEC),
-          o2(0xCA,0xE2),      o2(0xFD,0xBD),
-          o2(0xEA,0xE7),      o2(0xDF,0xC3),
-          o2(0xD1,0xD2),      o2(0xCE,0xE2),
-          o2(0xD3,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_16 = {
-    to_EUC_KR_E5_16_offsets,
-    to_CP949_E5_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_17_infos[11] = {
-          o2(0xFD,0xAB),      o2(0xDF,0xE0),
-          o2(0xF2,0xC7),      o2(0xE7,0xF0),
-          o2(0xD0,0xEE),      o2(0xF3,0xAA),
-          o2(0xDE,0xCB),      o2(0xF6,0xB8),
-          o2(0xE1,0xF5),      o2(0xF1,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_17 = {
-    to_EUC_KR_E5_17_offsets,
-    to_CP949_E5_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_18_infos[9] = {
-          o2(0xF7,0xA3),      o2(0xCA,0xA9),
-          o2(0xCF,0xA5),      o2(0xDF,0xC4),
-          o2(0xE1,0xB0),      o2(0xF0,0xBF),
-          o2(0xF6,0xA4),      o2(0xE3,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_18 = {
-    to_EUC_KR_E5_18_offsets,
-    to_CP949_E5_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_19_infos[5] = {
-          o2(0xFA,0xC6),      o2(0xD0,0xEF),
-          o2(0xFD,0xED),      o2(0xDD,0xC4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_19 = {
-    to_EUC_KR_E5_19_offsets,
-    to_CP949_E5_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1A_infos[7] = {
-          o2(0xFC,0xF7),      o2(0xE6,0xBF),
-          o2(0xDE,0xAD),      o2(0xFA,0xBF),
-          o2(0xE5,0xF1),      o2(0xED,0xC4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1A = {
-    to_EUC_KR_E5_1A_offsets,
-    to_CP949_E5_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1B_infos[11] = {
-          o2(0xD2,0xA5),      o2(0xFD,0xEE),
-          o2(0xF5,0xB6),      o2(0xE1,0xF6),
-          o2(0xDE,0xCC),      o2(0xFC,0xDE),
-          o2(0xEC,0xD7),      o2(0xCD,0xDD),
-          o2(0xD6,0xB7),      o2(0xCD,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1B = {
-    to_EUC_KR_E5_1B_offsets,
-    to_CP949_E5_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1C_infos[15] = {
-          o2(0xF8,0xD5),      o2(0xE5,0xD8),
-          o2(0xCF,0xEA),      o2(0xCF,0xD0),
-          o2(0xEA,0xCC),      o2(0xEA,0xAE),
-          o2(0xEA,0xAD),      o2(0xD3,0xF1),
-          o2(0xD3,0xA5),      o2(0xF7,0xCF),
-          o2(0xEE,0xA4),      o2(0xD0,0xA4),
-          o2(0xF2,0xA2),      o2(0xD0,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1C = {
-    to_EUC_KR_E5_1C_offsets,
-    to_CP949_E5_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1D_infos[17] = {
-          o2(0xF2,0xA3),      o2(0xF7,0xF8),
-          o2(0xD0,0xB3),      o2(0xDB,0xA9),
-          o2(0xD3,0xBB),      o2(0xCA,0xEC),
-          o2(0xF1,0xA6),      o2(0xCB,0xD5),
-          o2(0xF7,0xE7),      o2(0xCD,0xDE),
-          o2(0xF7,0xA4),      o2(0xF8,0xC0),
-          o2(0xD3,0xDD),      o2(0xCC,0xD0),
-          o2(0xCF,0xA6),      o2(0xF6,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1D = {
-    to_EUC_KR_E5_1D_offsets,
-    to_CP949_E5_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1E_infos[8] = {
-          o2(0xE1,0xF7),      o2(0xD3,0xDC),
-          o2(0xFA,0xFE),      o2(0xFA,0xA7),
-          o2(0xEB,0xD9),      o2(0xCF,0xA7),
-          o2(0xEA,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1E = {
-    to_EUC_KR_E5_1E_offsets,
-    to_CP949_E5_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_1F_infos[14] = {
-          o2(0xE4,0xEF),      o2(0xE9,0xB9),
-          o2(0xF1,0xD8),      o2(0xD8,0xD8),
-          o2(0xE0,0xF2),      o2(0xE6,0xB4),
-          o2(0xDC,0xFC),      o2(0xF3,0xF1),
-          o2(0xE3,0xD0),      o2(0xF2,0xFB),
-          o2(0xDB,0xC6),      o2(0xD0,0xF1),
-          o2(0xD0,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_1F = {
-    to_EUC_KR_E5_1F_offsets,
-    to_CP949_E5_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_20_infos[19] = {
-          o2(0xCF,0xDC),      o2(0xD3,0xD1),
-          o2(0xCC,0xB1),      o2(0xF7,0xD8),
-          o2(0xCB,0xA8),      o2(0xEB,0xBC),
-          o2(0xE4,0xBE),      o2(0xF4,0xDC),
-          o2(0xDC,0xC2),      o2(0xF0,0xA7),
-          o2(0xE6,0xC0),      o2(0xCA,0xED),
-          o2(0xE8,0xEB),      o2(0xE5,0xE8),
-          o2(0xDC,0xC3),      o2(0xED,0xDE),
-          o2(0xD3,0xF2),      o2(0xCC,0xF7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_20 = {
-    to_EUC_KR_E5_20_offsets,
-    to_CP949_E5_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_21_infos[17] = {
-          o2(0xCE,0xD4),      o2(0xE7,0xAB),
-          o2(0xCB,0xC3),      o2(0xE1,0xB1),
-          o2(0xF7,0xB2),      o2(0xD3,0xF3),
-          o2(0xD3,0xD2),      o2(0xF5,0xC0),
-          o2(0xDF,0xDD),      o2(0xEE,0xF3),
-          o2(0xE7,0xF1),      o2(0xFD,0xB4),
-          o2(0xF2,0xC8),      o2(0xF3,0xD2),
-          o2(0xEE,0xF4),      o2(0xE2,0xD3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_21 = {
-    to_EUC_KR_E5_21_offsets,
-    to_CP949_E5_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_22_infos[15] = {
-          o2(0xCC,0xD1),      o2(0xDF,0xEA),
-          o2(0xE9,0xBA),      o2(0xD9,0xD7),
-          o2(0xF5,0xCD),      o2(0xF1,0xF2),
-          o2(0xFA,0xC7),      o2(0xD9,0xF8),
-          o2(0xD4,0xC2),      o2(0xF6,0xE5),
-          o2(0xDD,0xC5),      o2(0xE7,0xF2),
-          o2(0xED,0xDF),      o2(0xCA,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_22 = {
-    to_EUC_KR_E5_22_offsets,
-    to_CP949_E5_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_23_infos[20] = {
-          o2(0xDB,0xFA),      o2(0xE8,0xB5),
-          o2(0xD3,0xA6),      o2(0xFD,0xB5),
-          o2(0xF9,0xC9),      o2(0xE4,0xE2),
-          o2(0xFB,0xBD),      o2(0xD7,0xA4),
-          o2(0xCE,0xC5),      o2(0xCE,0xD5),
-          o2(0xD6,0xE6),      o2(0xE5,0xBD),
-          o2(0xDE,0xCD),      o2(0xEC,0xF3),
-          o2(0xED,0xE0),      o2(0xEC,0xEC),
-          o2(0xFB,0xBE),      o2(0xDF,0xEB),
-          o2(0xE1,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_23 = {
-    to_EUC_KR_E5_23_offsets,
-    to_CP949_E5_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_24_infos[18] = {
-          o2(0xF9,0xBE),      o2(0xD0,0xF3),
-          o2(0xE0,0xAA),      o2(0xE8,0xE2),
-          o2(0xE2,0xD4),      o2(0xD2,0xFD),
-          o2(0xE5,0xA8),      o2(0xD9,0xD3),
-          o2(0xD3,0xDE),      o2(0xF4,0xB8),
-          o2(0xF7,0xBC),      o2(0xDC,0xFD),
-          o2(0xE8,0xEC),      o2(0xE4,0xE7),
-          o2(0xE3,0xF7),      o2(0xEC,0xA8),
-          o2(0xFA,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_24 = {
-    to_EUC_KR_E5_24_offsets,
-    to_CP949_E5_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_25_infos[25] = {
-          o2(0xE5,0xF2),      o2(0xD0,0xF4),
-          o2(0xD2,0xAF),      o2(0xDC,0xE5),
-          o2(0xD0,0xA5),      o2(0xF1,0xB4),
-          o2(0xFC,0xB1),      o2(0xCC,0xF8),
-          o2(0xDD,0xC6),      o2(0xFA,0xD1),
-          o2(0xF7,0xDF),      o2(0xFA,0xA8),
-          o2(0xEE,0xF5),      o2(0xDE,0xCE),
-          o2(0xE7,0xF3),      o2(0xF7,0xAC),
-          o2(0xEB,0xC4),      o2(0xED,0xE1),
-          o2(0xE0,0xAB),      o2(0xDD,0xC7),
-          o2(0xD2,0xB3),      o2(0xD2,0xBF),
-          o2(0xCA,0xCC),      o2(0xFB,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_25 = {
-    to_EUC_KR_E5_25_offsets,
-    to_CP949_E5_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_26_infos[15] = {
-          o2(0xE5,0xFD),      o2(0xDD,0xE5),
-          o2(0xD8,0xCD),      o2(0xEC,0xF4),
-          o2(0xD0,0xF5),      o2(0xE8,0xED),
-          o2(0xD0,0xD2),      o2(0xD9,0xD8),
-          o2(0xF6,0xE6),      o2(0xDB,0xAA),
-          o2(0xF7,0xE0),      o2(0xD8,0xD9),
-          o2(0xF4,0xA3),      o2(0xF4,0xDD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_26 = {
-    to_EUC_KR_E5_26_offsets,
-    to_CP949_E5_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_27_infos[21] = {
-          o2(0xEF,0xD1),      o2(0xD9,0xB5),
-          o2(0xED,0xAB),      o2(0xE3,0xB7),
-          o2(0xEE,0xBB),      o2(0xCD,0xB4),
-          o2(0xE0,0xF3),      o2(0xEA,0xCD),
-          o2(0xEC,0xF5),      o2(0xE8,0xEE),
-          o2(0xCB,0xA9),      o2(0xF1,0xAF),
-          o2(0xCA,0xCD),      o2(0xEC,0xA9),
-          o2(0xF2,0xEB),      o2(0xFD,0xEF),
-          o2(0xF9,0xF3),      o2(0xE6,0xC1),
-          o2(0xEC,0xD8),      o2(0xED,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_27 = {
-    to_EUC_KR_E5_27_offsets,
-    to_CP949_E5_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_28_infos[13] = {
-          o2(0xEA,0xCE),      o2(0xE8,0xDF),
-          o2(0xDE,0xCF),      o2(0xD2,0xA6),
-          o2(0xE7,0xF4),      o2(0xD1,0xD6),
-          o2(0xE6,0xC2),      o2(0xE3,0xE3),
-          o2(0xE4,0xB0),      o2(0xD8,0xB4),
-          o2(0xF6,0xA5),      o2(0xF3,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_28 = {
-    to_EUC_KR_E5_28_offsets,
-    to_CP949_E5_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_29_infos[7] = {
-          o2(0xD7,0xA5),      o2(0xF7,0xE8),
-          o2(0xE8,0xC6),      o2(0xFB,0xE6),
-          o2(0xDD,0xE6),      o2(0xDC,0xFE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_29 = {
-    to_EUC_KR_E5_29_offsets,
-    to_CP949_E5_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2A_infos[5] = {
-          o2(0xD8,0xDA),      o2(0xDA,0xAC),
-          o2(0xEA,0xB0),      o2(0xE3,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2A = {
-    to_EUC_KR_E5_2A_offsets,
-    to_CP949_E5_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2B_infos[9] = {
-          o2(0xCA,0xAA),      o2(0xE1,0xF9),
-          o2(0xEA,0xB1),      o2(0xF2,0xEC),
-          o2(0xFA,0xEE),      o2(0xEE,0xD5),
-          o2(0xF9,0xF4),      o2(0xD2,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2B = {
-    to_EUC_KR_E5_2B_offsets,
-    to_CP949_E5_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2C_infos[7] = {
-          o2(0xFB,0xFB),      o2(0xFD,0xF0),
-          o2(0xE0,0xBD),      o2(0xCE,0xE3),
-          o2(0xF8,0xC6),      o2(0xDE,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2C = {
-    to_EUC_KR_E5_2C_offsets,
-    to_CP949_E5_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2D_infos[23] = {
-          o2(0xDF,0xC5),      o2(0xE5,0xBE),
-          o2(0xED,0xAD),      o2(0xFA,0xEA),
-          o2(0xCD,0xEE),      o2(0xED,0xA6),
-          o2(0xED,0xAE),      o2(0xF0,0xED),
-          o2(0xDD,0xA1),      o2(0xED,0xAF),
-          o2(0xFC,0xF8),      o2(0xD8,0xEB),
-          o2(0xCC,0xF9),      o2(0xCD,0xB5),
-          o2(0xFA,0xA9),      o2(0xE1,0xDD),
-          o2(0xE2,0xD5),      o2(0xED,0xCF),
-          o2(0xDD,0xA2),      o2(0xF9,0xCA),
-          o2(0xEA,0xE8),      o2(0xE5,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2D = {
-    to_EUC_KR_E5_2D_offsets,
-    to_CP949_E5_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2E_infos[32] = {
-          o2(0xD3,0xEB),      o2(0xE9,0xD4),
-          o2(0xE1,0xFA),      o2(0xE4,0xCC),
-          o2(0xE1,0xE4),      o2(0xE8,0xC7),
-          o2(0xCE,0xDB),      o2(0xDC,0xD5),
-          o2(0xF7,0xB5),      o2(0xFC,0xF3),
-          o2(0xF0,0xF3),      o2(0xCE,0xAF),
-          o2(0xF1,0xB5),      o2(0xEF,0xD2),
-          o2(0xE8,0xC8),      o2(0xEB,0xF1),
-          o2(0xCB,0xD4),      o2(0xE0,0xBE),
-          o2(0xE3,0xF8),      o2(0xEA,0xE9),
-          o2(0xFC,0xB2),      o2(0xE0,0xF4),
-          o2(0xCF,0xE0),      o2(0xEE,0xA5),
-          o2(0xFA,0xAA),      o2(0xE6,0xC3),
-          o2(0xE1,0xB2),      o2(0xCA,0xAB),
-          o2(0xE3,0xE4),      o2(0xE9,0xBB),
-          o2(0xE2,0xD6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2E = {
-    to_EUC_KR_E5_2E_offsets,
-    to_CP949_E5_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_2F_infos[32] = {
-          o2(0xF3,0xF2),      o2(0xEE,0xD6),
-          o2(0xEA,0xB2),      o2(0xD0,0xF6),
-          o2(0xEC,0xD9),      o2(0xDA,0xCB),
-          o2(0xCF,0xA8),      o2(0xDD,0xA3),
-          o2(0xD8,0xDB),      o2(0xF9,0xCE),
-          o2(0xE9,0xD5),      o2(0xE3,0xD1),
-          o2(0xD2,0xBC),      o2(0xD8,0xAC),
-          o2(0xF3,0xCC),      o2(0xCD,0xFB),
-          o2(0xF6,0xD6),      o2(0xE7,0xF5),
-          o2(0xE8,0xEF),      o2(0xE3,0xF9),
-          o2(0xD2,0xBB),      o2(0xF3,0xF3),
-          o2(0xE3,0xFB),      o2(0xDE,0xD0),
-          o2(0xCE,0xB0),      o2(0xD6,0xF7),
-          o2(0xF1,0xD9),      o2(0xF5,0xC1),
-          o2(0xDC,0xC4),      o2(0xF5,0xBB),
-          o2(0xDE,0xD1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_2F = {
-    to_EUC_KR_E5_2F_offsets,
-    to_CP949_E5_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_30_infos[24] = {
-          o2(0xDC,0xE6),      o2(0xDE,0xD2),
-          o2(0xED,0xE2),      o2(0xEE,0xF6),
-          o2(0xEA,0xCF),      o2(0xF0,0xEE),
-          o2(0xE3,0xFC),      o2(0xD3,0xDF),
-          o2(0xD3,0xF4),      o2(0xE1,0xB3),
-          o2(0xE1,0xB4),      o2(0xF4,0xD3),
-          o2(0xDF,0xC6),      o2(0xE9,0xD6),
-          o2(0xDB,0xAB),      o2(0xF6,0xA6),
-          o2(0xE3,0xB9),      o2(0xEB,0xC5),
-          o2(0xF4,0xA9),      o2(0xCD,0xB6),
-          o2(0xD2,0xF9),      o2(0xDA,0xAD),
-          o2(0xD2,0xE3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_30 = {
-    to_EUC_KR_E5_30_offsets,
-    to_CP949_E5_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_31_infos[19] = {
-          o2(0xCF,0xD1),      o2(0xCB,0xDC),
-          o2(0xCC,0xFA),      o2(0xCF,0xDD),
-          o2(0xE8,0xA9),      o2(0xE3,0xBB),
-          o2(0xE3,0xBA),      o2(0xE0,0xDA),
-          o2(0xEE,0xF7),      o2(0xDC,0xB3),
-          o2(0xD3,0xF5),      o2(0xD7,0xA6),
-          o2(0xF6,0xB5),      o2(0xD7,0xDB),
-          o2(0xE1,0xD5),      o2(0xD4,0xEA),
-          o2(0xDF,0xA3),      o2(0xFD,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_31 = {
-    to_EUC_KR_E5_31_offsets,
-    to_CP949_E5_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_32_infos[14] = {
-          o2(0xD0,0xF7),      o2(0xED,0xD4),
-          o2(0xCB,0xAA),      o2(0xE4,0xDB),
-          o2(0xE1,0xFB),      o2(0xCB,0xA2),
-          o2(0xD3,0xE0),      o2(0xE4,0xBF),
-          o2(0xFB,0xC0),      o2(0xDA,0xBE),
-          o2(0xE4,0xCD),      o2(0xD6,0xB9),
-          o2(0xEF,0xC0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_32 = {
-    to_EUC_KR_E5_32_offsets,
-    to_CP949_E5_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_33_infos[11] = {
-          o2(0xE1,0xFC),      o2(0xF6,0xB9),
-          o2(0xDF,0xC7),      o2(0xE4,0xB1),
-          o2(0xDC,0xE7),      o2(0xDC,0xE8),
-          o2(0xFA,0xD6),      o2(0xD3,0xF6),
-          o2(0xF1,0xDA),      o2(0xFA,0xF2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_33 = {
-    to_EUC_KR_E5_33_offsets,
-    to_CP949_E5_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_34_infos[11] = {
-          o2(0xE2,0xFD),      o2(0xD5,0xCF),
-          o2(0xD0,0xF8),      o2(0xCD,0xDF),
-          o2(0xF5,0xCB),      o2(0xE4,0xF0),
-          o2(0xCB,0xAB),      o2(0xD7,0xC4),
-          o2(0xE2,0xFE),      o2(0xDD,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_34 = {
-    to_EUC_KR_E5_34_offsets,
-    to_CP949_E5_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_35_infos[7] = {
-          o2(0xDA,0xAE),      o2(0xCA,0xEE),
-          o2(0xD5,0xB9),      o2(0xE3,0xA1),
-          o2(0xE8,0xE3),      o2(0xF3,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_35 = {
-    to_EUC_KR_E5_35_offsets,
-    to_CP949_E5_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_36_infos[11] = {
-          o2(0xCF,0xA9),      o2(0xD3,0xF7),
-          o2(0xD4,0xF1),      o2(0xCE,0xE4),
-          o2(0xE8,0xF2),      o2(0xE5,0xF5),
-          o2(0xE7,0xAE),      o2(0xD6,0xBA),
-          o2(0xDF,0xEC),      o2(0xE4,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_36 = {
-    to_EUC_KR_E5_36_offsets,
-    to_CP949_E5_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_37_infos[21] = {
-          o2(0xE8,0xE4),      o2(0xD8,0xB5),
-          o2(0xE4,0xDC),      o2(0xF4,0xB9),
-          o2(0xF1,0xB6),      o2(0xE2,0xDE),
-          o2(0xE1,0xB5),      o2(0xCD,0xEF),
-          o2(0xF1,0xA7),      o2(0xCE,0xE5),
-          o2(0xCB,0xDD),      o2(0xD9,0xE3),
-          o2(0xF3,0xAC),      o2(0xD0,0xF9),
-          o2(0xEC,0xAB),      o2(0xDE,0xD3),
-          o2(0xF7,0xE9),      o2(0xF9,0xF5),
-          o2(0xE1,0xDE),      o2(0xCB,0xEE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_37 = {
-    to_EUC_KR_E5_37_offsets,
-    to_CP949_E5_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_38_infos[18] = {
-          o2(0xE3,0xBC),      o2(0xF8,0xD6),
-          o2(0xDB,0xEE),      o2(0xFD,0xF1),
-          o2(0xF7,0xB6),      o2(0xF4,0xDE),
-          o2(0xF2,0xED),      o2(0xDB,0xD9),
-          o2(0xF0,0xA8),      o2(0xE1,0xFD),
-          o2(0xDE,0xD4),      o2(0xE0,0xAC),
-          o2(0xED,0xE3),      o2(0xD3,0xE1),
-          o2(0xDF,0xC8),      o2(0xD9,0xB6),
-          o2(0xFD,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_38 = {
-    to_EUC_KR_E5_38_offsets,
-    to_CP949_E5_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_39_infos[21] = {
-          o2(0xEF,0xD3),      o2(0xE4,0xC1),
-          o2(0xF8,0xEB),      o2(0xDB,0xAC),
-          o2(0xFC,0xC6),      o2(0xD8,0xAD),
-          o2(0xF6,0xBA),      o2(0xDB,0xDF),
-          o2(0xD3,0xD3),      o2(0xF8,0xC7),
-          o2(0xCA,0xCE),      o2(0xF8,0xC1),
-          o2(0xD2,0xB4),      o2(0xDC,0xB4),
-          o2(0xFA,0xB9),      o2(0xCA,0xCF),
-          o2(0xFC,0xB3),      o2(0xEA,0xEA),
-          o2(0xEA,0xEB),      o2(0xD0,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_39 = {
-    to_EUC_KR_E5_39_offsets,
-    to_CP949_E5_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3A_infos[19] = {
-          o2(0xED,0xE4),      o2(0xDD,0xE7),
-          o2(0xDF,0xC9),      o2(0xDF,0xED),
-          o2(0xEE,0xBC),      o2(0xEF,0xC1),
-          o2(0xCC,0xD2),      o2(0xDD,0xA4),
-          o2(0xDF,0xCA),      o2(0xD3,0xF8),
-          o2(0xF1,0xA8),      o2(0xCD,0xB7),
-          o2(0xEF,0xD4),      o2(0xE4,0xDD),
-          o2(0xDF,0xEE),      o2(0xCB,0xAC),
-          o2(0xE9,0xBC),      o2(0xEA,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3A = {
-    to_EUC_KR_E5_3A_offsets,
-    to_CP949_E5_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3B_infos[20] = {
-          o2(0xDF,0xCB),      o2(0xF9,0xBF),
-          o2(0xD6,0xAF),      o2(0xD5,0xC6),
-          o2(0xCF,0xAA),      o2(0xCE,0xA9),
-          o2(0xD6,0xF8),      o2(0xF1,0xB7),
-          o2(0xEE,0xF8),      o2(0xD9,0xD9),
-          o2(0xF3,0xDF),      o2(0xF8,0xC8),
-          o2(0xCE,0xC6),      o2(0xD5,0xE6),
-          o2(0xF4,0xE6),      o2(0xE6,0xC5),
-          o2(0xEF,0xD5),      o2(0xCB,0xEF),
-          o2(0xFC,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3B = {
-    to_EUC_KR_E5_3B_offsets,
-    to_CP949_E5_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3C_infos[20] = {
-          o2(0xDC,0xA7),      o2(0xD6,0xE7),
-          o2(0xF8,0xC9),      o2(0xE3,0xD2),
-          o2(0xE3,0xBD),      o2(0xCF,0xE1),
-          o2(0xF0,0xC0),      o2(0xEC,0xDA),
-          o2(0xDD,0xD7),      o2(0xFB,0xF0),
-          o2(0xEC,0xAC),      o2(0xF0,0xA9),
-          o2(0xFA,0xD7),      o2(0xFB,0xC1),
-          o2(0xD2,0xC0),      o2(0xE5,0xB0),
-          o2(0xED,0xE5),      o2(0xCB,0xAD),
-          o2(0xF9,0xB0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3C = {
-    to_EUC_KR_E5_3C_offsets,
-    to_CP949_E5_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3D_infos[23] = {
-          o2(0xF7,0xA5),      o2(0xCB,0xAE),
-          o2(0xDA,0xAF),      o2(0xD8,0xB6),
-          o2(0xD3,0xA7),      o2(0xFB,0xB2),
-          o2(0xFD,0xC4),      o2(0xEC,0xAD),
-          o2(0xFB,0xA1),      o2(0xE5,0xE9),
-          o2(0xE9,0xEE),      o2(0xF3,0xF4),
-          o2(0xF8,0xF3),      o2(0xF0,0xC1),
-          o2(0xDE,0xAF),      o2(0xF8,0xB0),
-          o2(0xF3,0xE0),      o2(0xE7,0xAF),
-          o2(0xDB,0xAD),      o2(0xE6,0xB5),
-          o2(0xF9,0xA8),      o2(0xDD,0xD8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3D = {
-    to_EUC_KR_E5_3D_offsets,
-    to_CP949_E5_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3E_infos[25] = {
-          o2(0xE8,0xD9),      o2(0xEF,0xD6),
-          o2(0xD3,0xE2),      o2(0xE2,0xDF),
-          o2(0xFC,0xE0),      o2(0xD7,0xC8),
-          o2(0xFD,0xAD),      o2(0xDF,0xEF),
-          o2(0xCC,0xD3),      o2(0xD3,0xF9),
-          o2(0xD4,0xF0),      o2(0xDB,0xC7),
-          o2(0xDE,0xD5),      o2(0xF0,0xF4),
-          o2(0xD5,0xD0),      o2(0xE5,0xD9),
-          o2(0xFC,0xC7),      o2(0xDC,0xD6),
-          o2(0xE2,0xE0),      o2(0xDA,0xB0),
-          o2(0xF3,0xA3),      o2(0xD3,0xEC),
-          o2(0xF4,0xCB),      o2(0xFD,0xC5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3E = {
-    to_EUC_KR_E5_3E_offsets,
-    to_CP949_E5_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_3F_infos[14] = {
-          o2(0xE3,0xFD),      o2(0xF9,0xB1),
-          o2(0xD0,0xFB),      o2(0xEC,0xDB),
-          o2(0xF5,0xBC),      o2(0xF2,0xA4),
-          o2(0xD8,0xCE),      o2(0xD8,0xCF),
-          o2(0xF5,0xF7),      o2(0xF6,0xE1),
-          o2(0xD2,0xB7),      o2(0xFB,0xEC),
-          o2(0xDD,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5_3F = {
-    to_EUC_KR_E5_3F_offsets,
-    to_CP949_E5_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E5_infos[65] = {
-        &to_CP949_E5_00,    &to_CP949_E5_01,
-        &to_CP949_E5_02,    &to_CP949_E5_03,
-        &to_CP949_E5_04,    &to_CP949_E5_05,
-        &to_CP949_E5_06,    &to_CP949_E5_07,
-        &to_CP949_E5_08,    &to_CP949_E5_09,
-        &to_CP949_E5_0A,    &to_CP949_E5_0B,
-        &to_CP949_E5_0C,    &to_CP949_E5_0D,
-        &to_CP949_E5_0E,    &to_CP949_E5_0F,
-        &to_CP949_E5_10,    &to_CP949_E5_11,
-        &to_CP949_E5_12,    &to_CP949_E5_13,
-        &to_CP949_E5_14,    &to_CP949_E5_15,
-        &to_CP949_E5_16,    &to_CP949_E5_17,
-        &to_CP949_E5_18,    &to_CP949_E5_19,
-        &to_CP949_E5_1A,    &to_CP949_E5_1B,
-        &to_CP949_E5_1C,    &to_CP949_E5_1D,
-        &to_CP949_E5_1E,    &to_CP949_E5_1F,
-        &to_CP949_E5_20,    &to_CP949_E5_21,
-        &to_CP949_E5_22,    &to_CP949_E5_23,
-        &to_CP949_E5_24,    &to_CP949_E5_25,
-        &to_CP949_E5_26,    &to_CP949_E5_27,
-        &to_CP949_E5_28,    &to_CP949_E5_29,
-        &to_CP949_E5_2A,    &to_CP949_E5_2B,
-        &to_CP949_E5_2C,    &to_CP949_E5_2D,
-        &to_CP949_E5_2E,    &to_CP949_E5_2F,
-        &to_CP949_E5_30,    &to_CP949_E5_31,
-        &to_CP949_E5_32,    &to_CP949_E5_33,
-        &to_CP949_E5_34,    &to_CP949_E5_35,
-        &to_CP949_E5_36,    &to_CP949_E5_37,
-        &to_CP949_E5_38,    &to_CP949_E5_39,
-        &to_CP949_E5_3A,    &to_CP949_E5_3B,
-        &to_CP949_E5_3C,    &to_CP949_E5_3D,
-        &to_CP949_E5_3E,    &to_CP949_E5_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E5 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_E5_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_00_infos[13] = {
-          o2(0xE4,0xE8),      o2(0xD2,0xC1),
-          o2(0xF8,0xD7),      o2(0xD6,0xBB),
-          o2(0xDE,0xD6),      o2(0xF7,0xBD),
-          o2(0xEC,0xAE),      o2(0xD0,0xE1),
-          o2(0xE0,0xF5),      o2(0xEA,0xB3),
-          o2(0xCE,0xD6),      o2(0xCC,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_00 = {
-    to_EUC_KR_E6_00_offsets,
-    to_CP949_E6_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_01_infos[21] = {
-          o2(0xEC,0xF6),      o2(0xE2,0xE1),
-          o2(0xE3,0xBE),      o2(0xFC,0xC8),
-          o2(0xCD,0xF0),      o2(0xF9,0xF6),
-          o2(0xDF,0xF0),      o2(0xE5,0xBF),
-          o2(0xCE,0xBF),      o2(0xFC,0xE1),
-          o2(0xED,0xB0),      o2(0xFD,0xD1),
-          o2(0xF6,0xBB),      o2(0xF9,0xCF),
-          o2(0xEB,0xDA),      o2(0xCA,0xC1),
-          o2(0xD2,0xB8),      o2(0xCD,0xF1),
-          o2(0xE3,0xD3),      o2(0xFD,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_01 = {
-    to_EUC_KR_E6_01_offsets,
-    to_CP949_E6_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_02_infos[22] = {
-          o2(0xE6,0xED),      o2(0xE3,0xFA),
-          o2(0xF0,0xAA),      o2(0xF9,0xD0),
-          o2(0xFC,0xE2),      o2(0xF8,0xA7),
-          o2(0xE1,0xE5),      o2(0xEE,0xF9),
-          o2(0xE7,0xF6),      o2(0xEA,0xED),
-          o2(0xFC,0xB4),      o2(0xF5,0xC2),
-          o2(0xD7,0xDC),      o2(0xF0,0xF5),
-          o2(0xDD,0xE8),      o2(0xD3,0xED),
-          o2(0xF5,0xFC),      o2(0xDA,0xBF),
-          o2(0xCC,0xFB),      o2(0xD3,0xFA),
-          o2(0xF4,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_02 = {
-    to_EUC_KR_E6_02_offsets,
-    to_CP949_E6_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_03_infos[16] = {
-          o2(0xEF,0xD7),      o2(0xD4,0xC3),
-          o2(0xFB,0xE3),      o2(0xFB,0xED),
-          o2(0xE0,0xAD),      o2(0xEA,0xEE),
-          o2(0xFB,0xB3),      o2(0xE4,0xC2),
-          o2(0xF6,0xE7),      o2(0xD2,0xDD),
-          o2(0xDF,0xCC),      o2(0xFC,0xC9),
-          o2(0xE5,0xA9),      o2(0xE0,0xF6),
-          o2(0xF6,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_03 = {
-    to_EUC_KR_E6_03_offsets,
-    to_CP949_E6_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_04_infos[19] = {
-          o2(0xE1,0xFE),      o2(0xCB,0xF0),
-          o2(0xEA,0xEF),      o2(0xEA,0xF0),
-          o2(0xDA,0xC0),      o2(0xF8,0xB4),
-          o2(0xEB,0xF2),      o2(0xE4,0xC3),
-          o2(0xE9,0xD7),      o2(0xE4,0xF1),
-          o2(0xCA,0xEF),      o2(0xCE,0xD7),
-          o2(0xFC,0xCA),      o2(0xF3,0xE1),
-          o2(0xCB,0xC4),      o2(0xE3,0xE5),
-          o2(0xCB,0xC5),      o2(0xEA,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_04 = {
-    to_EUC_KR_E6_04_offsets,
-    to_CP949_E6_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_05_infos[26] = {
-          o2(0xE9,0xBD),      o2(0xD7,0xC9),
-          o2(0xEB,0xDB),      o2(0xED,0xB1),
-          o2(0xCC,0xC3),      o2(0xF7,0xBE),
-          o2(0xFC,0xCB),      o2(0xF8,0xF4),
-          o2(0xD9,0xB7),      o2(0xF3,0xD3),
-          o2(0xF3,0xD4),      o2(0xF7,0xE4),
-          o2(0xF7,0xD1),      o2(0xD8,0xB7),
-          o2(0xCE,0xB1),      o2(0xCA,0xC2),
-          o2(0xFB,0xB4),      o2(0xCB,0xC6),
-          o2(0xF0,0xF6),      o2(0xD5,0xE7),
-          o2(0xEA,0xD0),      o2(0xCC,0xD4),
-          o2(0xCB,0xAF),      o2(0xF4,0xAA),
-          o2(0xE9,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_05 = {
-    to_EUC_KR_E6_05_offsets,
-    to_CP949_E6_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_06_infos[21] = {
-          o2(0xF5,0xC3),      o2(0xE9,0xD8),
-          o2(0xDD,0xE9),      o2(0xF1,0xF3),
-          o2(0xD5,0xFB),      o2(0xDE,0xBB),
-          o2(0xF4,0xFB),      o2(0xFD,0xF3),
-          o2(0xFD,0xF2),      o2(0xF7,0xA6),
-          o2(0xDD,0xC9),      o2(0xD4,0xD3),
-          o2(0xCC,0xA8),      o2(0xDA,0xC1),
-          o2(0xCC,0xD5),      o2(0xD9,0xE4),
-          o2(0xFA,0xCA),      o2(0xE5,0xE3),
-          o2(0xD3,0xBC),      o2(0xCA,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_06 = {
-    to_EUC_KR_E6_06_offsets,
-    to_CP949_E6_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_07_infos[15] = {
-          o2(0xD0,0xC4),      o2(0xCA,0xD0),
-          o2(0xFA,0xAB),      o2(0xEB,0xEB),
-          o2(0xE7,0xF8),      o2(0xD9,0xE5),
-          o2(0xD1,0xD7),      o2(0xF3,0xA4),
-          o2(0xD4,0xFB),      o2(0xFC,0xE3),
-          o2(0xFA,0xD8),      o2(0xF3,0xD5),
-          o2(0xCF,0xAB),      o2(0xEB,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_07 = {
-    to_EUC_KR_E6_07_offsets,
-    to_CP949_E6_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_08_infos[23] = {
-          o2(0xD5,0xFC),      o2(0xD3,0xD4),
-          o2(0xCD,0xFC),      o2(0xD9,0xE6),
-          o2(0xE2,0xF9),      o2(0xE2,0xA1),
-          o2(0xEB,0xD4),      o2(0xE0,0xF7),
-          o2(0xE4,0xB2),      o2(0xCC,0xFC),
-          o2(0xFB,0xE4),      o2(0xF4,0xAB),
-          o2(0xD0,0xBD),      o2(0xCA,0xF1),
-          o2(0xEF,0xB8),      o2(0xD7,0xC0),
-          o2(0xEE,0xFA),      o2(0xFD,0xF4),
-          o2(0xD3,0xE3),      o2(0xFB,0xC2),
-          o2(0xD5,0xE8),      o2(0xDB,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_08 = {
-    to_EUC_KR_E6_08_offsets,
-    to_CP949_E6_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_09_infos[16] = {
-          o2(0xE1,0xB6),      o2(0xF8,0xB7),
-          o2(0xE0,0xBF),      o2(0xFB,0xC3),
-          o2(0xDD,0xEA),      o2(0xE2,0xA2),
-          o2(0xEE,0xA6),      o2(0xF6,0xE8),
-          o2(0xF6,0xF5),      o2(0xDD,0xCA),
-          o2(0xD0,0xE2),      o2(0xDD,0xA6),
-          o2(0xDD,0xEB),      o2(0xE4,0xF9),
-          o2(0xE3,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_09 = {
-    to_EUC_KR_E6_09_offsets,
-    to_CP949_E6_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0A_infos[17] = {
-          o2(0xD0,0xFC),      o2(0xF4,0xFC),
-          o2(0xCC,0xBC),      o2(0xF7,0xEA),
-          o2(0xE5,0xE4),      o2(0xDF,0xF1),
-          o2(0xF7,0xE1),      o2(0xF9,0xF7),
-          o2(0xEF,0xB9),      o2(0xF8,0xD8),
-          o2(0xF9,0xA9),      o2(0xF8,0xD9),
-          o2(0xEE,0xBD),      o2(0xD8,0xC6),
-          o2(0xE4,0xE3),      o2(0xF5,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0A = {
-    to_EUC_KR_E6_0A_offsets,
-    to_CP949_E6_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0B_infos[27] = {
-          o2(0xDD,0xD9),      o2(0xD9,0xE7),
-          o2(0xD2,0xB9),      o2(0xD5,0xC3),
-          o2(0xDA,0xE5),      o2(0xDA,0xD0),
-          o2(0xD1,0xD9),      o2(0xCE,0xD8),
-          o2(0xCB,0xDE),      o2(0xF4,0xAC),
-          o2(0xDA,0xFB),      o2(0xF6,0xE9),
-          o2(0xE8,0xF3),      o2(0xCF,0xAC),
-          o2(0xF0,0xF0),      o2(0xF4,0xFD),
-          o2(0xDB,0xC8),      o2(0xCE,0xC0),
-          o2(0xE3,0xD4),      o2(0xD1,0xCF),
-          o2(0xF1,0xF5),      o2(0xCD,0xF2),
-          o2(0xCF,0xEB),      o2(0xCD,0xB8),
-          o2(0xE3,0xA6),      o2(0xD1,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0B = {
-    to_EUC_KR_E6_0B_offsets,
-    to_CP949_E6_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0C_infos[11] = {
-          o2(0xF2,0xA5),      o2(0xF2,0xA6),
-          o2(0xE4,0xCE),      o2(0xD3,0xFB),
-          o2(0xF1,0xA9),      o2(0xF2,0xC9),
-          o2(0xEF,0xD8),      o2(0xE6,0xC9),
-          o2(0xD8,0xB8),      o2(0xFA,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0C = {
-    to_EUC_KR_E6_0C_offsets,
-    to_CP949_E6_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0D_infos[14] = {
-          o2(0xF3,0xB5),      o2(0xF8,0xA4),
-          o2(0xD1,0xF3),      o2(0xE6,0xC8),
-          o2(0xF8,0xDA),      o2(0xDC,0xE9),
-          o2(0xDE,0xD7),      o2(0xCB,0xDF),
-          o2(0xCF,0xEC),      o2(0xF4,0xDF),
-          o2(0xD1,0xF4),      o2(0xD2,0xBA),
-          o2(0xDF,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0D = {
-    to_EUC_KR_E6_0D_offsets,
-    to_CP949_E6_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0E_infos[17] = {
-          o2(0xE1,0xB7),      o2(0xE2,0xA3),
-          o2(0xD3,0xFC),      o2(0xED,0xE6),
-          o2(0xDB,0xC9),      o2(0xE4,0xFA),
-          o2(0xCF,0xDE),      o2(0xCE,0xD0),
-          o2(0xD5,0xD3),      o2(0xF3,0xF5),
-          o2(0xF7,0xAE),      o2(0xEF,0xC8),
-          o2(0xCD,0xF3),      o2(0xF5,0xCF),
-          o2(0xE5,0xF3),      o2(0xF0,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0E = {
-    to_EUC_KR_E6_0E_offsets,
-    to_CP949_E6_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_0F_infos[15] = {
-          o2(0xCA,0xD1),      o2(0xEA,0xF1),
-          o2(0xD0,0xA6),      o2(0xD9,0xDA),
-          o2(0xF0,0xAB),      o2(0xEB,0xE7),
-          o2(0xE5,0xC0),      o2(0xFC,0xB5),
-          o2(0xE4,0xC4),      o2(0xCC,0xA9),
-          o2(0xFD,0xC6),      o2(0xEA,0xB5),
-          o2(0xE5,0xAA),      o2(0xDF,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_0F = {
-    to_EUC_KR_E6_0F_offsets,
-    to_CP949_E6_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_10_infos[12] = {
-          o2(0xE1,0xDF),      o2(0xDA,0xD1),
-          o2(0xE1,0xB8),      o2(0xE8,0xF4),
-          o2(0xD3,0xFD),      o2(0xE2,0xA4),
-          o2(0xF2,0xCA),      o2(0xDA,0xE6),
-          o2(0xF7,0xB3),      o2(0xFD,0xCD),
-          o2(0xF3,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_10 = {
-    to_EUC_KR_E6_10_offsets,
-    to_CP949_E6_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_11_infos[8] = {
-          o2(0xEE,0xD7),      o2(0xF5,0xC4),
-          o2(0xD8,0xA4),      o2(0xF2,0xA7),
-          o2(0xD9,0xB8),      o2(0xD9,0xB9),
-          o2(0xEF,0xC9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_11 = {
-    to_EUC_KR_E6_11_offsets,
-    to_CP949_E6_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_12_infos[15] = {
-          o2(0xD6,0xCE),      o2(0xF7,0xCB),
-          o2(0xDF,0xAE),      o2(0xE8,0xF5),
-          o2(0xD2,0xB5),      o2(0xD3,0xD5),
-          o2(0xF4,0xCC),      o2(0xDA,0xFC),
-          o2(0xD9,0xE8),      o2(0xF7,0xEB),
-          o2(0xF5,0xC9),      o2(0xF3,0xBC),
-          o2(0xDA,0xD2),      o2(0xD3,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_12 = {
-    to_EUC_KR_E6_12_offsets,
-    to_CP949_E6_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_13_infos[22] = {
-          o2(0xE8,0xB6),      o2(0xD6,0xCF),
-          o2(0xF4,0xBA),      o2(0xF7,0xC9),
-          o2(0xCC,0xAA),      o2(0xF0,0xC3),
-          o2(0xCC,0xD6),      o2(0xD0,0xD3),
-          o2(0xD3,0xBD),      o2(0xDB,0xFB),
-          o2(0xCB,0xE0),      o2(0xD3,0xE4),
-          o2(0xF6,0xF7),      o2(0xD5,0xBA),
-          o2(0xF3,0xCD),      o2(0xCB,0xE1),
-          o2(0xEB,0xF4),      o2(0xF4,0xAD),
-          o2(0xFC,0xAA),      o2(0xF7,0xEC),
-          o2(0xE8,0xF6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_13 = {
-    to_EUC_KR_E6_13_offsets,
-    to_CP949_E6_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_14_infos[17] = {
-          o2(0xDA,0xE7),      o2(0xF7,0xCC),
-          o2(0xE5,0xC1),      o2(0xE0,0xEE),
-          o2(0xD5,0xFD),      o2(0xCE,0xE6),
-          o2(0xFC,0xAB),      o2(0xD5,0xBB),
-          o2(0xF2,0xA8),      o2(0xE2,0xA5),
-          o2(0xCD,0xB9),      o2(0xEA,0xF2),
-          o2(0xCB,0xC7),      o2(0xCD,0xF4),
-          o2(0xDB,0xAF),      o2(0xEF,0xD9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_14 = {
-    to_EUC_KR_E6_14_offsets,
-    to_CP949_E6_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_15_infos[21] = {
-          o2(0xCD,0xBA),      o2(0xFC,0xF9),
-          o2(0xDF,0xF3),      o2(0xCE,0xE7),
-          o2(0xDA,0xC2),      o2(0xCF,0xAD),
-          o2(0xE7,0xF9),      o2(0xF8,0xA8),
-          o2(0xF3,0xE2),      o2(0xCA,0xF2),
-          o2(0xDF,0xA4),      o2(0xD4,0xC4),
-          o2(0xCC,0xD7),      o2(0xE5,0xC2),
-          o2(0xCD,0xBB),      o2(0xEF,0xDA),
-          o2(0xEE,0xD8),      o2(0xDD,0xA7),
-          o2(0xE2,0xA6),      o2(0xE0,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_15 = {
-    to_EUC_KR_E6_15_offsets,
-    to_CP949_E6_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_16_infos[25] = {
-          o2(0xD6,0xB0),      o2(0xF8,0xCA),
-          o2(0xFC,0xFA),      o2(0xD9,0xFE),
-          o2(0xDE,0xB0),      o2(0xDD,0xEC),
-          o2(0xDA,0xE8),      o2(0xD4,0xE0),
-          o2(0xD6,0xF9),      o2(0xCD,0xD7),
-          o2(0xDE,0xD8),      o2(0xF2,0xF8),
-          o2(0xE4,0xD6),      o2(0xD0,0xC5),
-          o2(0xF4,0xAE),      o2(0xDD,0xA8),
-          o2(0xED,0xC5),      o2(0xF3,0xD6),
-          o2(0xDE,0xD9),      o2(0xE3,0xE6),
-          o2(0xD3,0xA8),      o2(0xDB,0xB0),
-          o2(0xE5,0xDA),      o2(0xE3,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_16 = {
-    to_EUC_KR_E6_16_offsets,
-    to_CP949_E6_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_17_infos[23] = {
-          o2(0xDB,0xB1),      o2(0xD5,0xE9),
-          o2(0xE0,0xC1),      o2(0xEF,0xDB),
-          o2(0xF0,0xE9),      o2(0xD7,0xB2),
-          o2(0xD0,0xFD),      o2(0xD9,0xE9),
-          o2(0xD0,0xFE),      o2(0xEC,0xED),
-          o2(0xD3,0xA9),      o2(0xF2,0xA9),
-          o2(0xF0,0xC4),      o2(0xE2,0xE2),
-          o2(0xE9,0xEF),      o2(0xF9,0xD1),
-          o2(0xE9,0xD9),      o2(0xE8,0xDA),
-          o2(0xDA,0xC3),      o2(0xDA,0xC4),
-          o2(0xD4,0xC5),      o2(0xE7,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_17 = {
-    to_EUC_KR_E6_17_offsets,
-    to_CP949_E6_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_18_infos[27] = {
-          o2(0xCD,0xE0),      o2(0xE3,0xB0),
-          o2(0xDB,0xB2),      o2(0xFB,0xC4),
-          o2(0xF3,0xE3),      o2(0xD9,0xA5),
-          o2(0xFB,0xE7),      o2(0xDD,0xCB),
-          o2(0xD0,0xD4),      o2(0xE6,0xB6),
-          o2(0xE0,0xAE),      o2(0xFD,0xDA),
-          o2(0xDC,0xB5),      o2(0xE0,0xF8),
-          o2(0xE7,0xB1),      o2(0xF5,0xF0),
-          o2(0xD8,0xDC),      o2(0xED,0xC6),
-          o2(0xE1,0xB9),      o2(0xE3,0xC0),
-          o2(0xF9,0xC0),      o2(0xE9,0xF0),
-          o2(0xD9,0xDB),      o2(0xF3,0xE4),
-          o2(0xDC,0xB6),      o2(0xE4,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_18 = {
-    to_EUC_KR_E6_18_offsets,
-    to_CP949_E6_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_19_infos[28] = {
-          o2(0xF0,0xC5),      o2(0xE3,0xC1),
-          o2(0xFC,0xCC),      o2(0xFC,0xCD),
-          o2(0xF2,0xCB),      o2(0xF2,0xCC),
-          o2(0xE4,0xCF),      o2(0xF1,0xDB),
-          o2(0xFA,0xD9),      o2(0xF1,0xB8),
-          o2(0xFD,0xF5),      o2(0xE0,0xF9),
-          o2(0xE7,0xFB),      o2(0xFC,0xB7),
-          o2(0xFC,0xE4),      o2(0xFB,0xC5),
-          o2(0xE3,0xE7),      o2(0xD8,0xB9),
-          o2(0xF6,0xF8),      o2(0xDC,0xC5),
-          o2(0xCC,0xD8),      o2(0xE0,0xAF),
-          o2(0xF4,0xE7),      o2(0xEF,0xDC),
-          o2(0xCF,0xFC),      o2(0xEF,0xDD),
-          o2(0xF2,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_19 = {
-    to_EUC_KR_E6_19_offsets,
-    to_CP949_E6_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1A_infos[22] = {
-          o2(0xFD,0xBE),      o2(0xCA,0xAC),
-          o2(0xFD,0xBB),      o2(0xFD,0xC7),
-          o2(0xE7,0xB2),      o2(0xEA,0xD1),
-          o2(0xDF,0xF4),      o2(0xD1,0xEC),
-          o2(0xE4,0xDE),      o2(0xE5,0xC3),
-          o2(0xD9,0xA6),      o2(0xCD,0xBC),
-          o2(0xF3,0xE5),      o2(0xED,0xD5),
-          o2(0xD9,0xBA),      o2(0xED,0xE7),
-          o2(0xFB,0xB5),      o2(0xF8,0xEC),
-          o2(0xE0,0xE7),      o2(0xCC,0xD9),
-          o2(0xD4,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1A = {
-    to_EUC_KR_E6_1A_offsets,
-    to_CP949_E6_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1B_infos[22] = {
-          o2(0xE7,0xA5),      o2(0xD5,0xF5),
-          o2(0xD3,0xBE),      o2(0xFC,0xFB),
-          o2(0xE4,0xF2),      o2(0xDF,0xF5),
-          o2(0xE8,0xF8),      o2(0xF8,0xED),
-          o2(0xCE,0xC7),      o2(0xFD,0xF6),
-          o2(0xE8,0xD8),      o2(0xCD,0xD8),
-          o2(0xE7,0xD6),      o2(0xCC,0xDA),
-          o2(0xCA,0xE3),      o2(0xDF,0xF6),
-          o2(0xF0,0xC7),      o2(0xF0,0xC6),
-          o2(0xD8,0xBA),      o2(0xF1,0xF4),
-          o2(0xF4,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1B = {
-    to_EUC_KR_E6_1B_offsets,
-    to_CP949_E6_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1C_infos[27] = {
-          o2(0xF5,0xCC),      o2(0xFC,0xE5),
-          o2(0xEA,0xC5),      o2(0xEA,0xF3),
-          o2(0xDD,0xDB),      o2(0xDC,0xD7),
-          o2(0xDE,0xFD),      o2(0xF2,0xF9),
-          o2(0xD5,0xC7),      o2(0xD8,0xD0),
-          o2(0xF0,0xC8),      o2(0xD1,0xA1),
-          o2(0xD1,0xA2),      o2(0xD9,0xD4),
-          o2(0xD6,0xE8),      o2(0xD9,0xCA),
-          o2(0xDA,0xB1),      o2(0xD8,0xC7),
-          o2(0xDC,0xE2),      o2(0xF3,0xCE),
-          o2(0xF5,0xF4),      o2(0xF1,0xB9),
-          o2(0xDA,0xD3),      o2(0xF6,0xEA),
-          o2(0xCF,0xF5),      o2(0xFD,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1C = {
-    to_EUC_KR_E6_1C_offsets,
-    to_CP949_E6_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1D_infos[22] = {
-          o2(0xCA,0xD2),      o2(0xDF,0xB4),
-          o2(0xD7,0xDD),      o2(0xFA,0xBA),
-          o2(0xEE,0xA7),      o2(0xF5,0xBD),
-          o2(0xF8,0xF5),      o2(0xED,0xE8),
-          o2(0xD4,0xE1),      o2(0xD1,0xA3),
-          o2(0xE1,0xD6),      o2(0xF9,0xF8),
-          o2(0xDB,0xCA),      o2(0xCB,0xF9),
-          o2(0xD4,0xD4),      o2(0xD9,0xDC),
-          o2(0xEE,0xBE),      o2(0xF7,0xED),
-          o2(0xD2,0xEE),      o2(0xE1,0xE6),
-          o2(0xF7,0xF9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1D = {
-    to_EUC_KR_E6_1D_offsets,
-    to_CP949_E6_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1E_infos[19] = {
-          o2(0xDD,0xED),      o2(0xE8,0xDB),
-          o2(0xDB,0xB3),      o2(0xD1,0xF7),
-          o2(0xE0,0xB0),      o2(0xD4,0xE2),
-          o2(0xF6,0xD7),      o2(0xD7,0xF9),
-          o2(0xD8,0xDD),      o2(0xCD,0xFD),
-          o2(0xF2,0xAB),      o2(0xCD,0xBD),
-          o2(0xF8,0xC2),      o2(0xF2,0xAC),
-          o2(0xCA,0xAD),      o2(0xCA,0xAE),
-          o2(0xCF,0xAE),      o2(0xE3,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1E = {
-    to_EUC_KR_E6_1E_offsets,
-    to_CP949_E6_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_1F_infos[21] = {
-          o2(0xDC,0xB7),      o2(0xDB,0xDA),
-          o2(0xD9,0xBB),      o2(0xCA,0xF3),
-          o2(0xF6,0xD3),      o2(0xE6,0xF8),
-          o2(0xEA,0xF5),      o2(0xEA,0xF6),
-          o2(0xF6,0xF9),      o2(0xCF,0xAF),
-          o2(0xCA,0xD3),      o2(0xCA,0xAF),
-          o2(0xD2,0xB0),      o2(0xF1,0xBA),
-          o2(0xD7,0xB3),      o2(0xE3,0xC3),
-          o2(0xF3,0xFD),      o2(0xDE,0xDA),
-          o2(0xDE,0xDB),      o2(0xEF,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_1F = {
-    to_EUC_KR_E6_1F_offsets,
-    to_CP949_E6_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_20_infos[13] = {
-          o2(0xE2,0xE3),      o2(0xEE,0xFB),
-          o2(0xDF,0xF7),      o2(0xD7,0xCA),
-          o2(0xCE,0xE8),      o2(0xDB,0xDB),
-          o2(0xF1,0xBB),      o2(0xE9,0xF1),
-          o2(0xFA,0xB7),      o2(0xD0,0xC6),
-          o2(0xCC,0xAB),      o2(0xEE,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_20 = {
-    to_EUC_KR_E6_20_offsets,
-    to_CP949_E6_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_21_infos[14] = {
-          o2(0xCB,0xFA),      o2(0xF9,0xF9),
-          o2(0xCC,0xFD),      o2(0xD3,0xFE),
-          o2(0xE4,0xD0),      o2(0xF2,0xEE),
-          o2(0xD4,0xD5),      o2(0xDF,0xCD),
-          o2(0xFC,0xB8),      o2(0xD1,0xD0),
-          o2(0xF2,0xCD),      o2(0xF7,0xD2),
-          o2(0xCA,0xD4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_21 = {
-    to_EUC_KR_E6_21_offsets,
-    to_CP949_E6_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_22_infos[20] = {
-          o2(0xD5,0xD9),      o2(0xD8,0xDE),
-          o2(0xCD,0xD9),      o2(0xEE,0xA9),
-          o2(0xF6,0xBC),      o2(0xCC,0xDB),
-          o2(0xF0,0xC9),      o2(0xFC,0xFC),
-          o2(0xE8,0xC9),      o2(0xF4,0xFE),
-          o2(0xE7,0xFC),      o2(0xD7,0xDE),
-          o2(0xDE,0xDC),      o2(0xF0,0xAC),
-          o2(0xCC,0xFE),      o2(0xCD,0xE1),
-          o2(0xE1,0xBA),      o2(0xDB,0xEF),
-          o2(0xDA,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_22 = {
-    to_EUC_KR_E6_22_offsets,
-    to_CP949_E6_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_23_infos[19] = {
-          o2(0xD1,0xA5),      o2(0xDC,0xB8),
-          o2(0xD8,0xF6),      o2(0xD1,0xA4),
-          o2(0xCD,0xE2),      o2(0xDC,0xEA),
-          o2(0xF0,0xF7),      o2(0xF0,0xCA),
-          o2(0xD0,0xBE),      o2(0xDD,0xDC),
-          o2(0xD4,0xD6),      o2(0xD3,0xD6),
-          o2(0xED,0xD0),      o2(0xCD,0xA1),
-          o2(0xDF,0xB5),      o2(0xDF,0xF8),
-          o2(0xD4,0xA1),      o2(0xCE,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_23 = {
-    to_EUC_KR_E6_23_offsets,
-    to_CP949_E6_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_24_infos[10] = {
-          o2(0xE8,0xCA),      o2(0xEB,0xF5),
-          o2(0xE3,0xD5),      o2(0xF5,0xD0),
-          o2(0xF5,0xA1),      o2(0xD9,0xA7),
-          o2(0xE5,0xAB),      o2(0xE6,0xCB),
-          o2(0xF5,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_24 = {
-    to_EUC_KR_E6_24_offsets,
-    to_CP949_E6_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_25_infos[22] = {
-          o2(0xE5,0xC5),      o2(0xF9,0xA3),
-          o2(0xE0,0xDB),      o2(0xF6,0xEB),
-          o2(0xCB,0xF1),      o2(0xD9,0xEA),
-          o2(0xF5,0xA2),      o2(0xD7,0xD1),
-          o2(0xD1,0xF8),      o2(0xEA,0xF8),
-          o2(0xEA,0xF9),      o2(0xDA,0xB3),
-          o2(0xEF,0xDF),      o2(0xF1,0xEF),
-          o2(0xE5,0xF6),      o2(0xEE,0xBF),
-          o2(0xE2,0xE4),      o2(0xD0,0xBF),
-          o2(0xFA,0xAC),      o2(0xF5,0xD1),
-          o2(0xE7,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_25 = {
-    to_EUC_KR_E6_25_offsets,
-    to_CP949_E6_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_26_infos[9] = {
-          o2(0xE9,0xBE),      o2(0xF2,0xCE),
-          o2(0xDB,0xB4),      o2(0xFC,0xCE),
-          o2(0xDD,0xEE),      o2(0xE7,0xB4),
-          o2(0xD7,0xB4),      o2(0xF7,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_26 = {
-    to_EUC_KR_E6_26_offsets,
-    to_CP949_E6_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_27_infos[12] = {
-          o2(0xCD,0xBE),      o2(0xDA,0xE9),
-          o2(0xCF,0xB0),      o2(0xF7,0xD9),
-          o2(0xF3,0xE6),      o2(0xCE,0xD9),
-          o2(0xCE,0xAA),      o2(0xCB,0xC8),
-          o2(0xD0,0xA7),      o2(0xF0,0xCB),
-          o2(0xD0,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_27 = {
-    to_EUC_KR_E6_27_offsets,
-    to_CP949_E6_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_28_infos[16] = {
-          o2(0xE4,0xC5),      o2(0xDB,0xE0),
-          o2(0xD5,0xDA),      o2(0xD7,0xA7),
-          o2(0xEE,0xC0),      o2(0xF8,0xF6),
-          o2(0xF5,0xD2),      o2(0xED,0xE9),
-          o2(0xD9,0xBC),      o2(0xE5,0xC6),
-          o2(0xF5,0xA3),      o2(0xDA,0xD4),
-          o2(0xE2,0xA7),      o2(0xFB,0xFC),
-          o2(0xF1,0xDC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_28 = {
-    to_EUC_KR_E6_28_offsets,
-    to_CP949_E6_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_29_infos[11] = {
-          o2(0xCA,0xF4),      o2(0xE8,0xFA),
-          o2(0xCE,0xE9),      o2(0xE9,0xF8),
-          o2(0xE2,0xE5),      o2(0xD0,0xB9),
-          o2(0xD4,0xF2),      o2(0xD1,0xA6),
-          o2(0xDF,0xCE),      o2(0xFC,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_29 = {
-    to_EUC_KR_E6_29_offsets,
-    to_CP949_E6_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2A_infos[12] = {
-          o2(0xD3,0xAA),      o2(0xCC,0xAC),
-          o2(0xEF,0xE0),      o2(0xE5,0xE5),
-          o2(0xD0,0xD5),      o2(0xDB,0xFC),
-          o2(0xFC,0xE6),      o2(0xCB,0xFE),
-          o2(0xED,0xEA),      o2(0xDE,0xB1),
-          o2(0xF9,0xE3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2A = {
-    to_EUC_KR_E6_2A_offsets,
-    to_CP949_E6_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2B_infos[8] = {
-          o2(0xD4,0xA2),      o2(0xCF,0xF6),
-          o2(0xD6,0xD0),      o2(0xD5,0xEA),
-          o2(0xF1,0xEE),      o2(0xFA,0xCB),
-          o2(0xE5,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2B = {
-    to_EUC_KR_E6_2B_offsets,
-    to_CP949_E6_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2C_infos[13] = {
-          o2(0xD5,0xB1),      o2(0xCF,0xED),
-          o2(0xED,0xEB),      o2(0xD5,0xB2),
-          o2(0xD5,0xBC),      o2(0xFD,0xE2),
-          o2(0xF3,0xAD),      o2(0xFD,0xDB),
-          o2(0xE9,0xB0),      o2(0xD1,0xA7),
-          o2(0xFD,0xE3),      o2(0xCE,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2C = {
-    to_EUC_KR_E6_2C_offsets,
-    to_CP949_E6_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2D_infos[19] = {
-          o2(0xFD,0xE4),      o2(0xFA,0xCE),
-          o2(0xCA,0xB0),      o2(0xF7,0xA7),
-          o2(0xCF,0xB1),      o2(0xE6,0xA2),
-          o2(0xFC,0xB6),      o2(0xF2,0xAD),
-          o2(0xEF,0xE1),      o2(0xF3,0xAE),
-          o2(0xDC,0xC6),      o2(0xD9,0xEB),
-          o2(0xE8,0xE0),      o2(0xE1,0xA8),
-          o2(0xD5,0xF6),      o2(0xCF,0xFD),
-          o2(0xDE,0xDD),      o2(0xD9,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2D = {
-    to_EUC_KR_E6_2D_offsets,
-    to_CP949_E6_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2E_infos[17] = {
-          o2(0xE4,0xEA),      o2(0xF2,0xCF),
-          o2(0xF7,0xBF),      o2(0xE2,0xE6),
-          o2(0xE2,0xA8),      o2(0xE3,0xD6),
-          o2(0xED,0xD1),      o2(0xE9,0xF9),
-          o2(0xD6,0xB1),      o2(0xDE,0xB2),
-          o2(0xE0,0xE8),      o2(0xD3,0xAB),
-          o2(0xEB,0xDC),      o2(0xDF,0xAF),
-          o2(0xCA,0xC3),      o2(0xEE,0xFC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2E = {
-    to_EUC_KR_E6_2E_offsets,
-    to_CP949_E6_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_2F_infos[16] = {
-          o2(0xFD,0xC3),      o2(0xEB,0xF6),
-          o2(0xCF,0xB2),      o2(0xD9,0xEC),
-          o2(0xD9,0xBD),      o2(0xD8,0xDF),
-          o2(0xD4,0xB8),      o2(0xEB,0xBE),
-          o2(0xDD,0xEF),      o2(0xDD,0xF0),
-          o2(0xDD,0xF1),      o2(0xDD,0xF2),
-          o2(0xD9,0xBE),      o2(0xFB,0xC6),
-          o2(0xCF,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_2F = {
-    to_EUC_KR_E6_2F_offsets,
-    to_CP949_E6_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_30_infos[10] = {
-          o2(0xEE,0xFD),      o2(0xE4,0xAB),
-          o2(0xDA,0xC5),      o2(0xD8,0xEC),
-          o2(0xD1,0xA8),      o2(0xE2,0xA9),
-          o2(0xDE,0xBC),      o2(0xE7,0xB5),
-          o2(0xDB,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_30 = {
-    to_EUC_KR_E6_30_offsets,
-    to_CP949_E6_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_31_infos[22] = {
-          o2(0xEF,0xE2),      o2(0xF1,0xF0),
-          o2(0xCF,0xB4),      o2(0xDB,0xF1),
-          o2(0xE0,0xB1),      o2(0xDF,0xA5),
-          o2(0xF9,0xD2),      o2(0xE7,0xFD),
-          o2(0xE6,0xA3),      o2(0xFB,0xF1),
-          o2(0xCB,0xB0),      o2(0xF2,0xAE),
-          o2(0xCD,0xE7),      o2(0xE8,0xDC),
-          o2(0xE7,0xD7),      o2(0xF7,0xC0),
-          o2(0xD0,0xE3),      o2(0xDA,0xA1),
-          o2(0xCC,0xBD),      o2(0xD1,0xA9),
-          o2(0xDD,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_31 = {
-    to_EUC_KR_E6_31_offsets,
-    to_CP949_E6_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_32_infos[28] = {
-          o2(0xE3,0xFE),      o2(0xD1,0xAA),
-          o2(0xE8,0xAA),      o2(0xEA,0xB6),
-          o2(0xF9,0xFA),      o2(0xE6,0xCC),
-          o2(0xF6,0xD8),      o2(0xD4,0xC7),
-          o2(0xD9,0xCB),      o2(0xD9,0xD2),
-          o2(0xD3,0xCB),      o2(0xD8,0xF7),
-          o2(0xDA,0xA9),      o2(0xF5,0xF8),
-          o2(0xDE,0xDE),      o2(0xF2,0xAF),
-          o2(0xF8,0xA9),      o2(0xD8,0xC8),
-          o2(0xEE,0xC1),      o2(0xF9,0xC1),
-          o2(0xDD,0xF3),      o2(0xEA,0xFA),
-          o2(0xF6,0xBD),      o2(0xE1,0xBB),
-          o2(0xCD,0xBF),      o2(0xF4,0xD4),
-          o2(0xE6,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_32 = {
-    to_EUC_KR_E6_32_offsets,
-    to_CP949_E6_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_33_infos[21] = {
-          o2(0xFC,0xCF),      o2(0xFB,0xA2),
-          o2(0xE0,0xDC),      o2(0xF4,0xBB),
-          o2(0xDA,0xD5),      o2(0xF9,0xB2),
-          o2(0xFB,0xF2),      o2(0xDB,0xF6),
-          o2(0xDE,0xDF),      o2(0xDB,0xF2),
-          o2(0xF8,0xDC),      o2(0xF7,0xEE),
-          o2(0xEB,0xE8),      o2(0xD2,0xFA),
-          o2(0xF1,0xBC),      o2(0xFA,0xDA),
-          o2(0xDA,0xEA),      o2(0xDA,0xC6),
-          o2(0xF7,0xC1),      o2(0xE7,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_33 = {
-    to_EUC_KR_E6_33_offsets,
-    to_CP949_E6_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_34_infos[20] = {
-          o2(0xE5,0xC7),      o2(0xD6,0xAC),
-          o2(0xDC,0xC7),      o2(0xE1,0xA9),
-          o2(0xE2,0xAA),      o2(0xD5,0xA6),
-          o2(0xD4,0xD7),      o2(0xF2,0xD0),
-          o2(0xEA,0xFB),      o2(0xE0,0xDD),
-          o2(0xFB,0xF3),      o2(0xF1,0xBD),
-          o2(0xE2,0xE7),      o2(0xFD,0xD7),
-          o2(0xCE,0xC8),      o2(0xEA,0xB7),
-          o2(0xFC,0xC0),      o2(0xFD,0xE7),
-          o2(0xF7,0xEF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_34 = {
-    to_EUC_KR_E6_34_offsets,
-    to_CP949_E6_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_35_infos[16] = {
-          o2(0xD7,0xB5),      o2(0xEF,0xBA),
-          o2(0xF1,0xDD),      o2(0xDE,0xB3),
-          o2(0xE8,0xCB),      o2(0xF8,0xDD),
-          o2(0xFB,0xC7),      o2(0xD5,0xC8),
-          o2(0xD7,0xDF),      o2(0xDD,0xA9),
-          o2(0xE9,0xB1),      o2(0xFA,0xAD),
-          o2(0xF6,0xD9),      o2(0xFA,0xF4),
-          o2(0xF8,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_35 = {
-    to_EUC_KR_E6_35_offsets,
-    to_CP949_E6_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_36_infos[14] = {
-          o2(0xE6,0xEE),      o2(0xCC,0xDC),
-          o2(0xE1,0xBC),      o2(0xE0,0xEF),
-          o2(0xE9,0xBF),      o2(0xFC,0xFD),
-          o2(0xE6,0xCE),      o2(0xE1,0xD7),
-          o2(0xE6,0xCF),      o2(0xF4,0xF1),
-          o2(0xE4,0xF3),      o2(0xE4,0xFB),
-          o2(0xF9,0xE4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_36 = {
-    to_EUC_KR_E6_36_offsets,
-    to_CP949_E6_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_37_infos[27] = {
-          o2(0xEF,0xE3),      o2(0xCF,0xEE),
-          o2(0xF6,0xBE),      o2(0xE0,0xB2),
-          o2(0xFC,0xFE),      o2(0xD1,0xAB),
-          o2(0xD7,0xFA),      o2(0xFB,0xC8),
-          o2(0xE2,0xD7),      o2(0xD4,0xA3),
-          o2(0xF0,0xF8),      o2(0xD7,0xA8),
-          o2(0xE1,0xE7),      o2(0xD3,0xBF),
-          o2(0xEF,0xE4),      o2(0xD7,0xC5),
-          o2(0xEB,0xE2),      o2(0xFC,0xE7),
-          o2(0xE4,0xA2),      o2(0xE2,0xE8),
-          o2(0xE6,0xD0),      o2(0xFB,0xE8),
-          o2(0xF4,0xE8),      o2(0xE5,0xF4),
-          o2(0xF4,0xBC),      o2(0xF4,0xD5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_37 = {
-    to_EUC_KR_E6_37_offsets,
-    to_CP949_E6_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_38_infos[24] = {
-          o2(0xDF,0xB6),      o2(0xFC,0xB9),
-          o2(0xEE,0xC2),      o2(0xCA,0xF5),
-          o2(0xEF,0xE5),      o2(0xCB,0xE2),
-          o2(0xD4,0xA4),      o2(0xDE,0xE0),
-          o2(0xDA,0xFD),      o2(0xE4,0xC6),
-          o2(0xE8,0xBE),      o2(0xE0,0xDE),
-          o2(0xF6,0xB4),      o2(0xEA,0xD2),
-          o2(0xF9,0xFB),      o2(0xE0,0xC2),
-          o2(0xCA,0xE4),      o2(0xE7,0xB7),
-          o2(0xEA,0xFD),      o2(0xD9,0xDD),
-          o2(0xDA,0xB4),      o2(0xEE,0xAA),
-          o2(0xFB,0xE9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_38 = {
-    to_EUC_KR_E6_38_offsets,
-    to_CP949_E6_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_39_infos[18] = {
-          o2(0xDB,0xCB),      o2(0xDA,0xB5),
-          o2(0xF1,0xBE),      o2(0xD3,0xAC),
-          o2(0xFB,0xC9),      o2(0xDF,0xCF),
-          o2(0xD3,0xC0),      o2(0xE3,0xD7),
-          o2(0xEF,0xE6),      o2(0xFC,0xD0),
-          o2(0xE9,0xC0),      o2(0xF5,0xD3),
-          o2(0xEC,0xDC),      o2(0xF7,0xB7),
-          o2(0xEA,0xB8),      o2(0xD1,0xF9),
-          o2(0xDC,0xC8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_39 = {
-    to_EUC_KR_E6_39_offsets,
-    to_CP949_E6_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3A_infos[14] = {
-          o2(0xEA,0xB9),      o2(0xF1,0xDE),
-          o2(0xD7,0xB6),      o2(0xCF,0xB5),
-          o2(0xD9,0xA8),      o2(0xEC,0xEE),
-          o2(0xDD,0xAA),      o2(0xCD,0xA2),
-          o2(0xE8,0xAE),      o2(0xE1,0xBD),
-          o2(0xF2,0xD1),      o2(0xE9,0xC1),
-          o2(0xD2,0xFC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3A = {
-    to_EUC_KR_E6_3A_offsets,
-    to_CP949_E6_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3B_infos[16] = {
-          o2(0xDB,0xB5),      o2(0xF3,0xE7),
-          o2(0xD8,0xFE),      o2(0xFC,0xD1),
-          o2(0xED,0xB2),      o2(0xF4,0xAF),
-          o2(0xFB,0xA3),      o2(0xFC,0xC1),
-          o2(0xEE,0xAB),      o2(0xD4,0xA5),
-          o2(0xF4,0xF2),      o2(0xEE,0xD9),
-          o2(0xFB,0xCA),      o2(0xCD,0xE3),
-          o2(0xD8,0xBB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3B = {
-    to_EUC_KR_E6_3B_offsets,
-    to_CP949_E6_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3C_infos[17] = {
-          o2(0xE5,0xDB),      o2(0xF8,0xF7),
-          o2(0xF6,0xD4),      o2(0xD7,0xA9),
-          o2(0xCB,0xC9),      o2(0xE6,0xD1),
-          o2(0xF0,0xCC),      o2(0xD8,0xAE),
-          o2(0xF9,0xD3),      o2(0xD5,0xFE),
-          o2(0xD8,0xBC),      o2(0xF2,0xB0),
-          o2(0xE2,0xAB),      o2(0xF3,0xE8),
-          o2(0xEF,0xC2),      o2(0xED,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3C = {
-    to_EUC_KR_E6_3C_offsets,
-    to_CP949_E6_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3D_infos[19] = {
-          o2(0xE7,0xB8),      o2(0xDA,0xFE),
-          o2(0xCC,0xBE),      o2(0xF2,0xFC),
-          o2(0xDA,0xEB),      o2(0xE2,0xD8),
-          o2(0xED,0xD6),      o2(0xD6,0xD1),
-          o2(0xE0,0xB3),      o2(0xFC,0xD2),
-          o2(0xEB,0xC8),      o2(0xD3,0xC1),
-          o2(0xF0,0xCD),      o2(0xCF,0xF7),
-          o2(0xED,0xD2),      o2(0xD4,0xD8),
-          o2(0xDC,0xC9),      o2(0xD7,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3D = {
-    to_EUC_KR_E6_3D_offsets,
-    to_CP949_E6_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3E_infos[18] = {
-          o2(0xDF,0xBB),      o2(0xF3,0xA5),
-          o2(0xF4,0xCD),      o2(0xF1,0xBF),
-          o2(0xF8,0xB1),      o2(0xE9,0xFA),
-          o2(0xFB,0xCB),      o2(0xCA,0xD5),
-          o2(0xF9,0xD4),      o2(0xF7,0xCA),
-          o2(0xD6,0xC8),      o2(0xFC,0xE8),
-          o2(0xF3,0xBD),      o2(0xEE,0xFE),
-          o2(0xE7,0xFE),      o2(0xD3,0xC2),
-          o2(0xD3,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3E = {
-    to_EUC_KR_E6_3E_offsets,
-    to_CP949_E6_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_3F_infos[18] = {
-          o2(0xCC,0xAD),      o2(0xF6,0xFA),
-          o2(0xD6,0xB2),      o2(0xD2,0xD8),
-          o2(0xE7,0xD8),      o2(0xE3,0xA5),
-          o2(0xE7,0xB9),      o2(0xF0,0xAD),
-          o2(0xFB,0xCC),      o2(0xEB,0xA1),
-          o2(0xD4,0xA6),      o2(0xFB,0xCD),
-          o2(0xD5,0xBD),      o2(0xF1,0xDF),
-          o2(0xF6,0xFB),      o2(0xDE,0xB4),
-          o2(0xD5,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6_3F = {
-    to_EUC_KR_E6_3F_offsets,
-    to_CP949_E6_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E6_infos[65] = {
-        &to_CP949_E6_00,    &to_CP949_E6_01,
-        &to_CP949_E6_02,    &to_CP949_E6_03,
-        &to_CP949_E6_04,    &to_CP949_E6_05,
-        &to_CP949_E6_06,    &to_CP949_E6_07,
-        &to_CP949_E6_08,    &to_CP949_E6_09,
-        &to_CP949_E6_0A,    &to_CP949_E6_0B,
-        &to_CP949_E6_0C,    &to_CP949_E6_0D,
-        &to_CP949_E6_0E,    &to_CP949_E6_0F,
-        &to_CP949_E6_10,    &to_CP949_E6_11,
-        &to_CP949_E6_12,    &to_CP949_E6_13,
-        &to_CP949_E6_14,    &to_CP949_E6_15,
-        &to_CP949_E6_16,    &to_CP949_E6_17,
-        &to_CP949_E6_18,    &to_CP949_E6_19,
-        &to_CP949_E6_1A,    &to_CP949_E6_1B,
-        &to_CP949_E6_1C,    &to_CP949_E6_1D,
-        &to_CP949_E6_1E,    &to_CP949_E6_1F,
-        &to_CP949_E6_20,    &to_CP949_E6_21,
-        &to_CP949_E6_22,    &to_CP949_E6_23,
-        &to_CP949_E6_24,    &to_CP949_E6_25,
-        &to_CP949_E6_26,    &to_CP949_E6_27,
-        &to_CP949_E6_28,    &to_CP949_E6_29,
-        &to_CP949_E6_2A,    &to_CP949_E6_2B,
-        &to_CP949_E6_2C,    &to_CP949_E6_2D,
-        &to_CP949_E6_2E,    &to_CP949_E6_2F,
-        &to_CP949_E6_30,    &to_CP949_E6_31,
-        &to_CP949_E6_32,    &to_CP949_E6_33,
-        &to_CP949_E6_34,    &to_CP949_E6_35,
-        &to_CP949_E6_36,    &to_CP949_E6_37,
-        &to_CP949_E6_38,    &to_CP949_E6_39,
-        &to_CP949_E6_3A,    &to_CP949_E6_3B,
-        &to_CP949_E6_3C,    &to_CP949_E6_3D,
-        &to_CP949_E6_3E,    &to_CP949_E6_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E6 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_E6_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_00_infos[22] = {
-          o2(0xE5,0xC8),      o2(0xFB,0xA4),
-          o2(0xD4,0xB9),      o2(0xDE,0xE1),
-          o2(0xE4,0xA3),      o2(0xD7,0xB7),
-          o2(0xF8,0xEE),      o2(0xDE,0xB5),
-          o2(0xD6,0xD2),      o2(0xF9,0xD5),
-          o2(0xE7,0xBA),      o2(0xEB,0xD5),
-          o2(0xD5,0xF7),      o2(0xEF,0xE7),
-          o2(0xE1,0xBE),      o2(0xFA,0xAE),
-          o2(0xD6,0xE9),      o2(0xD6,0xEE),
-          o2(0xE7,0xBB),      o2(0xEC,0xCB),
-          o2(0xD5,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_00 = {
-    to_EUC_KR_E7_00_offsets,
-    to_CP949_E7_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_01_infos[12] = {
-          o2(0xCE,0xB4),      o2(0xFB,0xA5),
-          o2(0xE1,0xEE),      o2(0xF7,0xA8),
-          o2(0xFB,0xCE),      o2(0xD8,0xBD),
-          o2(0xFB,0xFD),      o2(0xFC,0xE9),
-          o2(0xCF,0xB6),      o2(0xED,0xC7),
-          o2(0xEE,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_01 = {
-    to_EUC_KR_E7_01_offsets,
-    to_CP949_E7_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_02_infos[18] = {
-          o2(0xCC,0xDD),      o2(0xF6,0xA7),
-          o2(0xE6,0xFA),      o2(0xF5,0xA4),
-          o2(0xFD,0xDC),      o2(0xED,0xB3),
-          o2(0xCE,0xC9),      o2(0xEF,0xE8),
-          o2(0xE1,0xBF),      o2(0xFA,0xDB),
-          o2(0xCB,0xE3),      o2(0xF7,0xA9),
-          o2(0xFB,0xA6),      o2(0xDC,0xB9),
-          o2(0xF1,0xC0),      o2(0xED,0xC8),
-          o2(0xEF,0xC3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_02 = {
-    to_EUC_KR_E7_02_offsets,
-    to_CP949_E7_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_03_infos[11] = {
-          o2(0xD6,0xAD),      o2(0xFD,0xCE),
-          o2(0xE8,0xA1),      o2(0xFB,0xF4),
-          o2(0xD5,0xA7),      o2(0xF1,0xF6),
-          o2(0xE6,0xD3),      o2(0xCC,0xDE),
-          o2(0xF8,0xB2),      o2(0xDC,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_03 = {
-    to_EUC_KR_E7_03_offsets,
-    to_CP949_E7_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_04_infos[11] = {
-          o2(0xFD,0xB6),      o2(0xE5,0xEA),
-          o2(0xF1,0xE0),      o2(0xDB,0xCC),
-          o2(0xDD,0xCD),      o2(0xD4,0xC8),
-          o2(0xD9,0xED),      o2(0xF5,0xA5),
-          o2(0xE6,0xFB),      o2(0xE6,0xD4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_04 = {
-    to_EUC_KR_E7_04_offsets,
-    to_CP949_E7_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_05_infos[19] = {
-          o2(0xFD,0xC8),      o2(0xD6,0xA1),
-          o2(0xFD,0xBF),      o2(0xFC,0xD3),
-          o2(0xEF,0xA1),      o2(0xE7,0xBC),
-          o2(0xD1,0xEE),      o2(0xE6,0xD5),
-          o2(0xE9,0xF2),      o2(0xDF,0xB0),
-          o2(0xD8,0xE0),      o2(0xFC,0xBA),
-          o2(0xFD,0xAF),      o2(0xF0,0xCE),
-          o2(0xDB,0xE1),      o2(0xE5,0xC9),
-          o2(0xED,0xB4),      o2(0xE0,0xC3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_05 = {
-    to_EUC_KR_E7_05_offsets,
-    to_CP949_E7_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_06_infos[15] = {
-          o2(0xE3,0xD8),      o2(0xE9,0xFB),
-          o2(0xEA,0xA8),      o2(0xFD,0xB7),
-          o2(0xFB,0xA7),      o2(0xE9,0xC2),
-          o2(0xFD,0xF7),      o2(0xE2,0xD9),
-          o2(0xDC,0xEC),      o2(0xE8,0xA2),
-          o2(0xE6,0xF0),      o2(0xFD,0xF8),
-          o2(0xFD,0xF9),      o2(0xF6,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_06 = {
-    to_EUC_KR_E7_06_offsets,
-    to_CP949_E7_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_07_infos[20] = {
-          o2(0xE7,0xA7),      o2(0xE6,0xD7),
-          o2(0xD4,0xF3),      o2(0xD4,0xC9),
-          o2(0xD6,0xFA),      o2(0xD7,0xF2),
-          o2(0xE1,0xC0),      o2(0xDB,0xE2),
-          o2(0xE6,0xD8),      o2(0xE7,0xBD),
-          o2(0xF0,0xCF),      o2(0xF3,0xBE),
-          o2(0xE2,0xAC),      o2(0xF5,0xB7),
-          o2(0xE0,0xF0),      o2(0xFD,0xB8),
-          o2(0xE3,0xE8),      o2(0xD4,0xA7),
-          o2(0xE8,0xFC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_07 = {
-    to_EUC_KR_E7_07_offsets,
-    to_CP949_E7_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_08_infos[16] = {
-          o2(0xFA,0xD2),      o2(0xF8,0xEF),
-          o2(0xD6,0xD3),      o2(0xD5,0xB4),
-          o2(0xF0,0xD0),      o2(0xF7,0xF0),
-          o2(0xEE,0xB3),      o2(0xEA,0xBA),
-          o2(0xEA,0xD3),      o2(0xED,0xC9),
-          o2(0xDD,0xAB),      o2(0xE5,0xAC),
-          o2(0xFD,0xA1),      o2(0xDF,0xD0),
-          o2(0xEC,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_08 = {
-    to_EUC_KR_E7_08_offsets,
-    to_CP949_E7_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_09_infos[19] = {
-          o2(0xDF,0xD1),      o2(0xED,0xED),
-          o2(0xF8,0xB8),      o2(0xF7,0xFA),
-          o2(0xF8,0xAB),      o2(0xF4,0xE0),
-          o2(0xD4,0xBA),      o2(0xE4,0xB3),
-          o2(0xE9,0xDA),      o2(0xDE,0xB6),
-          o2(0xD9,0xBF),      o2(0xD9,0xC0),
-          o2(0xD6,0xEF),      o2(0xD9,0xCC),
-          o2(0xDA,0xAA),      o2(0xDF,0xE5),
-          o2(0xF7,0xE5),      o2(0xCC,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_09 = {
-    to_EUC_KR_E7_09_offsets,
-    to_CP949_E7_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0A_infos[7] = {
-          o2(0xDF,0xF9),      o2(0xD7,0xE0),
-          o2(0xD4,0xBB),      o2(0xFD,0xFA),
-          o2(0xCC,0xB3),      o2(0xDB,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0A = {
-    to_EUC_KR_E7_0A_offsets,
-    to_CP949_E7_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0B_infos[14] = {
-          o2(0xDF,0xD2),      o2(0xCE,0xCA),
-          o2(0xEE,0xDA),      o2(0xE4,0xE4),
-          o2(0xFB,0xCF),      o2(0xCF,0xB7),
-          o2(0xEE,0xC3),      o2(0xCE,0xEA),
-          o2(0xE2,0xAD),      o2(0xD7,0xE1),
-          o2(0xFA,0xF5),      o2(0xD5,0xC9),
-          o2(0xF8,0xAC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0B = {
-    to_EUC_KR_E7_0B_offsets,
-    to_CP949_E7_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0C_infos[14] = {
-          o2(0xE7,0xD9),      o2(0xF3,0xE9),
-          o2(0xD8,0xED),      o2(0xE3,0xC4),
-          o2(0xF0,0xF1),      o2(0xE8,0xE5),
-          o2(0xE0,0xFA),      o2(0xEE,0xC4),
-          o2(0xD9,0xDE),      o2(0xEB,0xA2),
-          o2(0xEB,0xA3),      o2(0xFC,0xC2),
-          o2(0xEA,0xBB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0C = {
-    to_EUC_KR_E7_0C_offsets,
-    to_CP949_E7_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0D_infos[14] = {
-          o2(0xE8,0xAB),      o2(0xDE,0xE2),
-          o2(0xED,0xEF),      o2(0xE8,0xA3),
-          o2(0xCF,0xF1),      o2(0xD4,0xBC),
-          o2(0xFC,0xEA),      o2(0xE7,0xBE),
-          o2(0xFC,0xF2),      o2(0xD6,0xB4),
-          o2(0xE2,0xAE),      o2(0xD3,0xB7),
-          o2(0xFA,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0D = {
-    to_EUC_KR_E7_0D_offsets,
-    to_CP949_E7_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0E_infos[18] = {
-          o2(0xFA,0xDC),      o2(0xED,0xB5),
-          o2(0xE1,0xE3),      o2(0xE8,0xAC),
-          o2(0xE8,0xDD),      o2(0xEF,0xE9),
-          o2(0xF4,0xBD),      o2(0xCF,0xB8),
-          o2(0xE9,0xDB),      o2(0xD1,0xAC),
-          o2(0xDA,0xC7),      o2(0xEB,0xC9),
-          o2(0xE8,0xCC),      o2(0xDE,0xB7),
-          o2(0xD6,0xBC),      o2(0xD3,0xE5),
-          o2(0xFA,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0E = {
-    to_EUC_KR_E7_0E_offsets,
-    to_CP949_E7_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_0F_infos[24] = {
-          o2(0xDA,0xD6),      o2(0xCA,0xB1),
-          o2(0xDA,0xC8),      o2(0xDF,0xA6),
-          o2(0xF9,0xB3),      o2(0xF2,0xD2),
-          o2(0xCA,0xC4),      o2(0xCE,0xCB),
-          o2(0xCD,0xF5),      o2(0xFD,0xB0),
-          o2(0xD5,0xA8),      o2(0xF1,0xC1),
-          o2(0xE2,0xE9),      o2(0xDC,0xCA),
-          o2(0xEC,0xB4),      o2(0xFA,0xC0),
-          o2(0xFB,0xA8),      o2(0xD0,0xA8),
-          o2(0xDA,0xEC),      o2(0xD9,0xEE),
-          o2(0xE0,0xFB),      o2(0xEF,0xEA),
-          o2(0xFA,0xDE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_0F = {
-    to_EUC_KR_E7_0F_offsets,
-    to_CP949_E7_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_10_infos[28] = {
-          o2(0xE0,0xC4),      o2(0xCF,0xB9),
-          o2(0xD5,0xCA),      o2(0xD7,0xE2),
-          o2(0xE2,0xAF),      o2(0xD7,0xB8),
-          o2(0xE8,0xCD),      o2(0xF6,0xDA),
-          o2(0xEF,0xA2),      o2(0xE2,0xDA),
-          o2(0xF6,0xFC),      o2(0xFB,0xD0),
-          o2(0xD1,0xAD),      o2(0xCD,0xE4),
-          o2(0xD1,0xAE),      o2(0xDC,0xED),
-          o2(0xE8,0xCE),      o2(0xF0,0xF9),
-          o2(0xCE,0xB5),      o2(0xE6,0xFC),
-          o2(0xD7,0xFB),      o2(0xD0,0xD6),
-          o2(0xDD,0xF5),      o2(0xF7,0xF1),
-          o2(0xF6,0xFD),      o2(0xDB,0xF7),
-          o2(0xFB,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_10 = {
-    to_EUC_KR_E7_10_offsets,
-    to_CP949_E7_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_11_infos[23] = {
-          o2(0xE9,0xDC),      o2(0xD9,0xC1),
-          o2(0xF5,0xF2),      o2(0xE0,0xC5),
-          o2(0xEA,0xD4),      o2(0xF9,0xC2),
-          o2(0xEA,0xBC),      o2(0xD2,0xC5),
-          o2(0xFB,0xD1),      o2(0xE7,0xC0),
-          o2(0xEB,0xA5),      o2(0xDF,0xFA),
-          o2(0xE3,0xA2),      o2(0xD7,0xB9),
-          o2(0xE9,0xC3),      o2(0xE8,0xFD),
-          o2(0xE8,0xAF),      o2(0xF2,0xD3),
-          o2(0xFB,0xA9),      o2(0xD8,0xA5),
-          o2(0xD5,0xCB),      o2(0xD0,0xC8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_11 = {
-    to_EUC_KR_E7_11_offsets,
-    to_CP949_E7_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_12_infos[22] = {
-          o2(0xD1,0xAF),      o2(0xD7,0xE3),
-          o2(0xE0,0xC6),      o2(0xD6,0xA2),
-          o2(0xED,0xF0),      o2(0xD7,0xF3),
-          o2(0xFC,0xD4),      o2(0xDA,0xD7),
-          o2(0xCC,0xDF),      o2(0xF2,0xD4),
-          o2(0xD1,0xB0),      o2(0xCC,0xE0),
-          o2(0xDB,0xFD),      o2(0xF3,0xBF),
-          o2(0xF0,0xD1),      o2(0xFC,0xBB),
-          o2(0xE2,0xB0),      o2(0xE6,0xA5),
-          o2(0xE2,0xDB),      o2(0xDF,0xDE),
-          o2(0xE0,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_12 = {
-    to_EUC_KR_E7_12_offsets,
-    to_CP949_E7_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_13_infos[14] = {
-          o2(0xF2,0xEF),      o2(0xCC,0xE1),
-          o2(0xD6,0xEA),      o2(0xE7,0xC2),
-          o2(0xCE,0xB6),      o2(0xF3,0xC0),
-          o2(0xCD,0xFE),      o2(0xFB,0xD2),
-          o2(0xF8,0xF8),      o2(0xF7,0xFB),
-          o2(0xE8,0xBF),      o2(0xE8,0xB7),
-          o2(0xED,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_13 = {
-    to_EUC_KR_E7_13_offsets,
-    to_CP949_E7_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_14_infos[22] = {
-          o2(0xDC,0xBA),      o2(0xCC,0xB4),
-          o2(0xF1,0xF7),      o2(0xE8,0xB8),
-          o2(0xCA,0xF6),      o2(0xE4,0xA4),
-          o2(0xF4,0xD6),      o2(0xDF,0xE6),
-          o2(0xDF,0xA7),      o2(0xDF,0xE7),
-          o2(0xE1,0xC1),      o2(0xE9,0xC4),
-          o2(0xDC,0xCB),      o2(0xE9,0xC5),
-          o2(0xEF,0xA3),      o2(0xEB,0xA6),
-          o2(0xCB,0xA3),      o2(0xE3,0xE9),
-          o2(0xD1,0xFB),      o2(0xEF,0xA4),
-          o2(0xEF,0xEB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_14 = {
-    to_EUC_KR_E7_14_offsets,
-    to_CP949_E7_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_15_infos[22] = {
-          o2(0xD0,0xB4),      o2(0xCD,0xA3),
-          o2(0xE8,0xE6),      o2(0xEF,0xA5),
-          o2(0xD3,0xCC),      o2(0xDA,0xED),
-          o2(0xD7,0xBA),      o2(0xF2,0xD5),
-          o2(0xF5,0xE5),      o2(0xD9,0xEF),
-          o2(0xF9,0xB4),      o2(0xD5,0xD4),
-          o2(0xFD,0xCF),      o2(0xDB,0xE3),
-          o2(0xF1,0xE1),      o2(0xEC,0xB6),
-          o2(0xFB,0xFE),      o2(0xD3,0xD7),
-          o2(0xD1,0xB1),      o2(0xCB,0xB1),
-          o2(0xD1,0xB2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_15 = {
-    to_EUC_KR_E7_15_offsets,
-    to_CP949_E7_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_16_infos[20] = {
-          o2(0xCB,0xB2),      o2(0xF1,0xC2),
-          o2(0xF4,0xE1),      o2(0xF9,0xB5),
-          o2(0xE1,0xC3),      o2(0xE1,0xC2),
-          o2(0xEB,0xF7),      o2(0xDF,0xA8),
-          o2(0xCB,0xCA),      o2(0xE6,0xB9),
-          o2(0xF8,0xDE),      o2(0xF9,0xAA),
-          o2(0xCA,0xF7),      o2(0xED,0xB7),
-          o2(0xD3,0xB8),      o2(0xF2,0xD6),
-          o2(0xD4,0xD9),      o2(0xEE,0xC5),
-          o2(0xF2,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_16 = {
-    to_EUC_KR_E7_16_offsets,
-    to_CP949_E7_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_17_infos[17] = {
-          o2(0xCA,0xB2),      o2(0xDC,0xBB),
-          o2(0xF1,0xF8),      o2(0xEC,0xB7),
-          o2(0xE5,0xCA),      o2(0xF6,0xC0),
-          o2(0xFD,0xDD),      o2(0xD4,0xE3),
-          o2(0xCC,0xE2),      o2(0xF7,0xD4),
-          o2(0xD7,0xE5),      o2(0xD3,0xC3),
-          o2(0xD8,0xA6),      o2(0xF6,0xC1),
-          o2(0xDD,0xF6),      o2(0xCD,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_17 = {
-    to_EUC_KR_E7_17_offsets,
-    to_CP949_E7_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_18_infos[11] = {
-          o2(0xE5,0xDC),      o2(0xE5,0xCB),
-          o2(0xE1,0xC4),      o2(0xE8,0xB0),
-          o2(0xF4,0xB0),      o2(0xF3,0xEA),
-          o2(0xDA,0xEE),      o2(0xD7,0xBB),
-          o2(0xE2,0xB1),      o2(0xD7,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_18 = {
-    to_EUC_KR_E7_18_offsets,
-    to_CP949_E7_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_19_infos[17] = {
-          o2(0xD6,0xFB),      o2(0xE4,0xDF),
-          o2(0xCA,0xD6),      o2(0xEB,0xA8),
-          o2(0xDB,0xFE),      o2(0xF6,0xC2),
-          o2(0xEF,0xBB),      o2(0xD4,0xFD),
-          o2(0xE0,0xC8),      o2(0xE8,0xB9),
-          o2(0xEF,0xA6),      o2(0xCD,0xA4),
-          o2(0xD4,0xF4),      o2(0xDB,0xA1),
-          o2(0xDB,0xDC),      o2(0xDB,0xDD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_19 = {
-    to_EUC_KR_E7_19_offsets,
-    to_CP949_E7_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1A_infos[10] = {
-          o2(0xEE,0xDC),      o2(0xCB,0xCB),
-          o2(0xFC,0xD5),      o2(0xCE,0xEB),
-          o2(0xCD,0xC1),      o2(0xFB,0xD3),
-          o2(0xF9,0xAB),      o2(0xF5,0xD4),
-          o2(0xD9,0xA9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1A = {
-    to_EUC_KR_E7_1A_offsets,
-    to_CP949_E7_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1B_infos[22] = {
-          o2(0xE9,0xDD),      o2(0xDB,0xCD),
-          o2(0xDD,0xCE),      o2(0xE7,0xC3),
-          o2(0xEC,0xCC),      o2(0xF9,0xEC),
-          o2(0xCB,0xCC),      o2(0xE0,0xFC),
-          o2(0xD4,0xA8),      o2(0xED,0xD3),
-          o2(0xD8,0xEF),      o2(0xF2,0xD7),
-          o2(0xCA,0xF8),      o2(0xDA,0xEF),
-          o2(0xD6,0xD4),      o2(0xD9,0xCD),
-          o2(0xD8,0xEE),      o2(0xF2,0xC1),
-          o2(0xDF,0xD3),      o2(0xDA,0xF0),
-          o2(0xE2,0xEA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1B = {
-    to_EUC_KR_E7_1B_offsets,
-    to_CP949_E7_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1C_infos[13] = {
-          o2(0xE0,0xFD),      o2(0xD8,0xF8),
-          o2(0xF7,0xAF),      o2(0xDA,0xB6),
-          o2(0xCA,0xD7),      o2(0xF2,0xD8),
-          o2(0xD8,0xF9),      o2(0xFA,0xDF),
-          o2(0xCF,0xEF),      o2(0xD9,0xC2),
-          o2(0xF0,0xD2),      o2(0xE4,0xD1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1C = {
-    to_EUC_KR_E7_1C_offsets,
-    to_CP949_E7_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1D_infos[11] = {
-          o2(0xF3,0xB7),      o2(0xFA,0xE0),
-          o2(0xEF,0xEC),      o2(0xE2,0xB2),
-          o2(0xD4,0xBD),      o2(0xD9,0xCE),
-          o2(0xF4,0xE2),      o2(0xD4,0xA9),
-          o2(0xCD,0xC2),      o2(0xE7,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1D = {
-    to_EUC_KR_E7_1D_offsets,
-    to_CP949_E7_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1E_infos[12] = {
-          o2(0xF2,0xD9),      o2(0xD9,0xAA),
-          o2(0xD8,0xBE),      o2(0xDC,0xAD),
-          o2(0xE2,0xEB),      o2(0xD6,0xFC),
-          o2(0xCA,0xF9),      o2(0xD4,0xDA),
-          o2(0xF4,0xD7),      o2(0xCC,0xA1),
-          o2(0xCF,0xBA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1E = {
-    to_EUC_KR_E7_1E_offsets,
-    to_CP949_E7_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_1F_infos[12] = {
-          o2(0xF5,0xB8),      o2(0xD9,0xC3),
-          o2(0xD0,0xE8),      o2(0xE3,0xC5),
-          o2(0xEB,0xF8),      o2(0xF2,0xB1),
-          o2(0xCF,0xBB),      o2(0xD3,0xAD),
-          o2(0xE8,0xE1),      o2(0xCE,0xEC),
-          o2(0xE0,0xB4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_1F = {
-    to_EUC_KR_E7_1F_offsets,
-    to_CP949_E7_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_20_infos[9] = {
-          o2(0xDE,0xE3),      o2(0xDD,0xF7),
-          o2(0xF2,0xB2),      o2(0xF3,0xF6),
-          o2(0xF6,0xDB),      o2(0xD7,0xFE),
-          o2(0xF8,0xDF),      o2(0xF7,0xF2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_20 = {
-    to_EUC_KR_E7_20_offsets,
-    to_CP949_E7_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_21_infos[8] = {
-          o2(0xD0,0xA9),      o2(0xE6,0xDA),
-          o2(0xF5,0xA6),      o2(0xD7,0xBC),
-          o2(0xCC,0xE3),      o2(0xE6,0xDB),
-          o2(0xDD,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_21 = {
-    to_EUC_KR_E7_21_offsets,
-    to_CP949_E7_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_22_infos[14] = {
-          o2(0xD1,0xB3),      o2(0xEF,0xED),
-          o2(0xD6,0xDE),      o2(0xE4,0xF4),
-          o2(0xE1,0xEF),      o2(0xDD,0xF8),
-          o2(0xE8,0xCF),      o2(0xCA,0xE5),
-          o2(0xDC,0xA1),      o2(0xE0,0xB5),
-          o2(0xFC,0xAC),      o2(0xFC,0xAD),
-          o2(0xD8,0xA7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_22 = {
-    to_EUC_KR_E7_22_offsets,
-    to_CP949_E7_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_23_infos[12] = {
-          o2(0xED,0xB8),      o2(0xDB,0xB6),
-          o2(0xD6,0xF0),      o2(0xF3,0xAF),
-          o2(0xCD,0xA5),      o2(0xDA,0xF1),
-          o2(0xD8,0xA8),      o2(0xCC,0xE4),
-          o2(0xD1,0xB4),      o2(0xCA,0xD8),
-          o2(0xDA,0xF2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_23 = {
-    to_EUC_KR_E7_23_offsets,
-    to_CP949_E7_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_24_infos[9] = {
-          o2(0xF5,0xA7),      o2(0xF5,0xA8),
-          o2(0xE6,0xA6),      o2(0xD5,0xEC),
-          o2(0xD5,0xF8),      o2(0xDA,0xF3),
-          o2(0xE3,0xC6),      o2(0xDE,0xE4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_24 = {
-    to_EUC_KR_E7_24_offsets,
-    to_CP949_E7_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_25_infos[20] = {
-          o2(0xDE,0xE5),      o2(0xD1,0xB5),
-          o2(0xD1,0xB6),      o2(0xD1,0xB7),
-          o2(0xF2,0xB3),      o2(0xE9,0xDE),
-          o2(0xF0,0xD3),      o2(0xF2,0xB4),
-          o2(0xF0,0xD4),      o2(0xCB,0xE4),
-          o2(0xFB,0xD4),      o2(0xF5,0xE6),
-          o2(0xE3,0xEA),      o2(0xDE,0xE6),
-          o2(0xDF,0xD4),      o2(0xF8,0xF9),
-          o2(0xF0,0xAE),      o2(0xD1,0xB8),
-          o2(0xD6,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_25 = {
-    to_EUC_KR_E7_25_offsets,
-    to_CP949_E7_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_26_infos[16] = {
-          o2(0xD0,0xD7),      o2(0xFC,0xA1),
-          o2(0xEF,0xEE),      o2(0xDC,0xD8),
-          o2(0xE9,0xDF),      o2(0xE5,0xDD),
-          o2(0xFD,0xFB),      o2(0xE0,0xC9),
-          o2(0xD6,0xC9),      o2(0xD4,0xAA),
-          o2(0xE5,0xCC),      o2(0xE9,0xE0),
-          o2(0xD0,0xD8),      o2(0xFC,0xA2),
-          o2(0xD4,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_26 = {
-    to_EUC_KR_E7_26_offsets,
-    to_CP949_E7_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_27_infos[16] = {
-          o2(0xE2,0xB3),      o2(0xDE,0xE7),
-          o2(0xDC,0xBC),      o2(0xD2,0xB6),
-          o2(0xF5,0xD5),      o2(0xCE,0xA1),
-          o2(0xF5,0xA9),      o2(0xDD,0xF9),
-          o2(0xDD,0xFA),      o2(0xF0,0xD5),
-          o2(0xF6,0xDF),      o2(0xF2,0xDA),
-          o2(0xE4,0xEB),      o2(0xF2,0xF1),
-          o2(0xEC,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_27 = {
-    to_EUC_KR_E7_27_offsets,
-    to_CP949_E7_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_28_infos[21] = {
-          o2(0xFD,0xFC),      o2(0xE1,0xAA),
-          o2(0xCA,0xD9),      o2(0xEF,0xEF),
-          o2(0xF5,0xAA),      o2(0xEC,0xF9),
-          o2(0xF8,0xAD),      o2(0xF2,0xC2),
-          o2(0xF6,0xC3),      o2(0xD7,0xD2),
-          o2(0xF9,0xA2),      o2(0xF0,0xD6),
-          o2(0xF0,0xFA),      o2(0xF6,0xE0),
-          o2(0xE9,0xF3),      o2(0xF2,0xC3),
-          o2(0xD4,0xAB),      o2(0xCA,0xB3),
-          o2(0xCD,0xA6),      o2(0xCD,0xC3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_28 = {
-    to_EUC_KR_E7_28_offsets,
-    to_CP949_E7_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_29_infos[18] = {
-          o2(0xCD,0xDA),      o2(0xD9,0xCF),
-          o2(0xF6,0xC4),      o2(0xEE,0xDD),
-          o2(0xE7,0xC4),      o2(0xE2,0xB4),
-          o2(0xDF,0xE2),      o2(0xE7,0xDB),
-          o2(0xE8,0xB1),      o2(0xFC,0xAE),
-          o2(0xE5,0xCD),      o2(0xFA,0xEB),
-          o2(0xCF,0xBC),      o2(0xCF,0xE2),
-          o2(0xCD,0xF6),      o2(0xEF,0xF0),
-          o2(0xF4,0xBE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_29 = {
-    to_EUC_KR_E7_29_offsets,
-    to_CP949_E7_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2A_infos[14] = {
-          o2(0xD4,0xCD),      o2(0xF3,0xB8),
-          o2(0xE9,0xA1),      o2(0xF2,0xF2),
-          o2(0xF3,0xEB),      o2(0xF0,0xD7),
-          o2(0xCF,0xD7),      o2(0xCF,0xDF),
-          o2(0xE8,0xC0),      o2(0xE8,0xC1),
-          o2(0xCF,0xE3),      o2(0xE9,0xA2),
-          o2(0xD0,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2A = {
-    to_EUC_KR_E7_2A_offsets,
-    to_CP949_E7_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2B_infos[20] = {
-          o2(0xF3,0xC1),      o2(0xD0,0xAB),
-          o2(0xD4,0xE4),      o2(0xEF,0xBC),
-          o2(0xD8,0xA1),      o2(0xD9,0xDF),
-          o2(0xF3,0xD7),      o2(0xDC,0xBD),
-          o2(0xCC,0xE5),      o2(0xED,0xF1),
-          o2(0xF1,0xE2),      o2(0xD4,0xDB),
-          o2(0xE2,0xB5),      o2(0xCA,0xE6),
-          o2(0xD3,0xAE),      o2(0xCC,0xE6),
-          o2(0xF1,0xD3),      o2(0xF5,0xE7),
-          o2(0xCA,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2B = {
-    to_EUC_KR_E7_2B_offsets,
-    to_CP949_E7_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2C_infos[11] = {
-          o2(0xFB,0xEE),      o2(0xE1,0xC5),
-          o2(0xDF,0xE9),      o2(0xEE,0xDE),
-          o2(0xF7,0xC2),      o2(0xD8,0xA2),
-          o2(0xDD,0xAC),      o2(0xF0,0xAF),
-          o2(0xD6,0xBD),      o2(0xE1,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2C = {
-    to_EUC_KR_E7_2C_offsets,
-    to_CP949_E7_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2D_infos[17] = {
-          o2(0xF9,0xB6),      o2(0xD4,0xF5),
-          o2(0xD0,0xC9),      o2(0xEF,0xA7),
-          o2(0xE2,0xEC),      o2(0xDB,0xEA),
-          o2(0xCE,0xCC),      o2(0xF5,0xE8),
-          o2(0xF7,0xD5),      o2(0xD3,0xCD),
-          o2(0xF3,0xFE),      o2(0xD0,0xB5),
-          o2(0xE0,0xFE),      o2(0xDF,0xFB),
-          o2(0xE6,0xDD),      o2(0xE8,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2D = {
-    to_EUC_KR_E7_2D_offsets,
-    to_CP949_E7_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2E_infos[14] = {
-          o2(0xCB,0xCD),      o2(0xEF,0xA8),
-          o2(0xEE,0xB4),      o2(0xDA,0xD8),
-          o2(0xD1,0xB9),      o2(0xDF,0xA9),
-          o2(0xF3,0xB0),      o2(0xCC,0xC4),
-          o2(0xCE,0xB7),      o2(0xEF,0xA9),
-          o2(0xDF,0xD5),      o2(0xED,0xD7),
-          o2(0xEE,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2E = {
-    to_EUC_KR_E7_2E_offsets,
-    to_CP949_E7_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_2F_infos[11] = {
-          o2(0xEF,0xBD),      o2(0xFC,0xD6),
-          o2(0xDB,0xF4),      o2(0xEF,0xAA),
-          o2(0xF8,0xB9),      o2(0xF5,0xE9),
-          o2(0xE3,0xD9),      o2(0xE1,0xC6),
-          o2(0xD4,0xBF),      o2(0xDE,0xE8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_2F = {
-    to_EUC_KR_E7_2F_offsets,
-    to_CP949_E7_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_30_infos[11] = {
-          o2(0xF0,0xEA),      o2(0xF3,0xC2),
-          o2(0xD3,0xAF),      o2(0xCA,0xDB),
-          o2(0xFC,0xD7),      o2(0xED,0xD8),
-          o2(0xE1,0xC7),      o2(0xF4,0xD8),
-          o2(0xD6,0xB3),      o2(0xDD,0xAD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_30 = {
-    to_EUC_KR_E7_30_offsets,
-    to_CP949_E7_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_31_infos[8] = {
-          o2(0xD5,0xBE),      o2(0xF1,0xC3),
-          o2(0xEE,0xDF),      o2(0xD6,0xEB),
-          o2(0xF4,0xD9),      o2(0xD7,0xE6),
-          o2(0xDA,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_31 = {
-    to_EUC_KR_E7_31_offsets,
-    to_CP949_E7_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_32_infos[16] = {
-          o2(0xDD,0xFB),      o2(0xDD,0xCF),
-          o2(0xD8,0xA3),      o2(0xDA,0xD9),
-          o2(0xF0,0xD8),      o2(0xEF,0xC4),
-          o2(0xE1,0xD8),      o2(0xF1,0xD4),
-          o2(0xED,0xF2),      o2(0xD5,0xDB),
-          o2(0xD5,0xDC),      o2(0xF3,0xC4),
-          o2(0xCB,0xD7),      o2(0xE2,0xB6),
-          o2(0xEF,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_32 = {
-    to_EUC_KR_E7_32_offsets,
-    to_CP949_E7_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_33_infos[9] = {
-          o2(0xFB,0xD5),      o2(0xD3,0xD8),
-          o2(0xDD,0xD0),      o2(0xF0,0xD9),
-          o2(0xCB,0xB3),      o2(0xD5,0xDD),
-          o2(0xCD,0xA7),      o2(0xD0,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_33 = {
-    to_EUC_KR_E7_33_offsets,
-    to_CP949_E7_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_34_infos[30] = {
-          o2(0xD1,0xBA),      o2(0xF1,0xC4),
-          o2(0xE5,0xB3),      o2(0xFB,0xF5),
-          o2(0xE9,0xE1),      o2(0xFD,0xE0),
-          o2(0xFC,0xBC),      o2(0xDA,0xA2),
-          o2(0xDA,0xA3),      o2(0xD2,0xA1),
-          o2(0xD2,0xEF),      o2(0xE2,0xED),
-          o2(0xDE,0xE9),      o2(0xCE,0xDC),
-          o2(0xF2,0xB5),      o2(0xD0,0xE4),
-          o2(0xDD,0xD1),      o2(0xE1,0xC8),
-          o2(0xDB,0xB7),      o2(0xDF,0xE3),
-          o2(0xED,0xB9),      o2(0xF1,0xC5),
-          o2(0xF3,0xCF),      o2(0xD7,0xAB),
-          o2(0xE1,0xAC),      o2(0xE3,0xEB),
-          o2(0xEE,0xC7),      o2(0xE1,0xC9),
-          o2(0xCA,0xFA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_34 = {
-    to_EUC_KR_E7_34_offsets,
-    to_CP949_E7_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_35_infos[20] = {
-          o2(0xF0,0xFB),      o2(0xFA,0xE1),
-          o2(0xF0,0xDA),      o2(0xCC,0xE7),
-          o2(0xDA,0xF4),      o2(0xCC,0xBF),
-          o2(0xCE,0xED),      o2(0xD5,0xA9),
-          o2(0xFA,0xE2),      o2(0xD0,0xE5),
-          o2(0xEB,0xD6),      o2(0xEC,0xDF),
-          o2(0xDF,0xFC),      o2(0xF7,0xD6),
-          o2(0xDE,0xEA),      o2(0xCB,0xB4),
-          o2(0xEF,0xBE),      o2(0xCC,0xB5),
-          o2(0xCF,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_35 = {
-    to_EUC_KR_E7_35_offsets,
-    to_CP949_E7_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_36_infos[19] = {
-          o2(0xEF,0xF2),      o2(0xE2,0xB7),
-          o2(0xCC,0xE8),      o2(0xF0,0xFC),
-          o2(0xD6,0xE0),      o2(0xF1,0xC6),
-          o2(0xE2,0xB8),      o2(0xEB,0xAB),
-          o2(0xCB,0xB5),      o2(0xD8,0xD1),
-          o2(0xF4,0xCE),      o2(0xF3,0xF7),
-          o2(0xD7,0xC6),      o2(0xD1,0xBB),
-          o2(0xF7,0xAA),      o2(0xED,0xCA),
-          o2(0xD7,0xD3),      o2(0xD8,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_36 = {
-    to_EUC_KR_E7_36_offsets,
-    to_CP949_E7_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_37_infos[18] = {
-          o2(0xF6,0xC5),      o2(0xD1,0xCC),
-          o2(0xDD,0xFC),      o2(0xDF,0xFD),
-          o2(0xF9,0xE5),      o2(0xE0,0xCA),
-          o2(0xF2,0xFD),      o2(0xD3,0xB0),
-          o2(0xF4,0xF3),      o2(0xDA,0xC9),
-          o2(0xE6,0xDE),      o2(0xF8,0xBA),
-          o2(0xE8,0xD0),      o2(0xD8,0xFB),
-          o2(0xEA,0xD5),      o2(0xD6,0xA3),
-          o2(0xF6,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_37 = {
-    to_EUC_KR_E7_37_offsets,
-    to_CP949_E7_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_38_infos[17] = {
-          o2(0xF2,0xDB),      o2(0xE4,0xFC),
-          o2(0xE8,0xB2),      o2(0xDA,0xDA),
-          o2(0xF2,0xDC),      o2(0xFB,0xD6),
-          o2(0xE9,0xB2),      o2(0xEE,0xAD),
-          o2(0xFA,0xE3),      o2(0xDC,0xEE),
-          o2(0xF5,0xEA),      o2(0xE6,0xE0),
-          o2(0xF0,0xFD),      o2(0xD7,0xAC),
-          o2(0xF5,0xC5),      o2(0xEE,0xE0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_38 = {
-    to_EUC_KR_E7_38_offsets,
-    to_CP949_E7_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_39_infos[17] = {
-          o2(0xDB,0xE5),      o2(0xDD,0xDE),
-          o2(0xD9,0xF0),      o2(0xE9,0xA3),
-          o2(0xF1,0xF9),      o2(0xF2,0xC4),
-          o2(0xE0,0xCB),      o2(0xE9,0xA4),
-          o2(0xE2,0xB9),      o2(0xE3,0xB1),
-          o2(0xFC,0xEB),      o2(0xCD,0xA8),
-          o2(0xCC,0xB6),      o2(0xF0,0xDB),
-          o2(0xE6,0xBA),      o2(0xCD,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_39 = {
-    to_EUC_KR_E7_39_offsets,
-    to_CP949_E7_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_3A_infos[9] = {
-          o2(0xF3,0xC3),      o2(0xE1,0xD9),
-          o2(0xEF,0xAB),      o2(0xE7,0xC5),
-          o2(0xE0,0xE9),      o2(0xF3,0xC5),
-          o2(0xD4,0xC0),      o2(0xD5,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_3A = {
-    to_EUC_KR_E7_3A_offsets,
-    to_CP949_E7_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_3C_infos[4] = {
-          o2(0xDD,0xAE),      o2(0xF9,0xFC),
-          o2(0xCC,0xC0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_3C = {
-    to_EUC_KR_E7_3C_offsets,
-    to_CP949_E7_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_3D_infos[13] = {
-          o2(0xE5,0xA2),      o2(0xCE,0xB8),
-          o2(0xD8,0xD2),      o2(0xF9,0xD6),
-          o2(0xF1,0xAA),      o2(0xCE,0xD1),
-          o2(0xF6,0xC7),      o2(0xDB,0xEB),
-          o2(0xDF,0xFE),      o2(0xD8,0xE1),
-          o2(0xF7,0xF3),      o2(0xD7,0xE7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_3D = {
-    to_EUC_KR_E7_3D_offsets,
-    to_CP949_E7_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_3E_infos[16] = {
-          o2(0xD4,0xFE),      o2(0xD1,0xBC),
-          o2(0xE5,0xCF),      o2(0xCB,0xB6),
-          o2(0xDA,0xB8),      o2(0xCD,0xC4),
-          o2(0xD6,0xBE),      o2(0xE2,0xBA),
-          o2(0xCF,0xD8),      o2(0xE0,0xCC),
-          o2(0xEB,0xF9),      o2(0xFD,0xFD),
-          o2(0xD7,0xE8),      o2(0xCB,0xD8),
-          o2(0xE9,0xE2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_3E = {
-    to_EUC_KR_E7_3E_offsets,
-    to_CP949_E7_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_3F_infos[17] = {
-          o2(0xE8,0xBA),      o2(0xE3,0xC7),
-          o2(0xEC,0xCD),      o2(0xEC,0xCE),
-          o2(0xD6,0xBF),      o2(0xE3,0xA7),
-          o2(0xDF,0xD6),      o2(0xFD,0xE8),
-          o2(0xEE,0xE1),      o2(0xF6,0xA8),
-          o2(0xDD,0xFD),      o2(0xF8,0xBB),
-          o2(0xE8,0xD1),      o2(0xF9,0xD7),
-          o2(0xCE,0xEE),      o2(0xEC,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7_3F = {
-    to_EUC_KR_E7_3F_offsets,
-    to_CP949_E7_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E7_infos[64] = {
-        &to_CP949_E7_00,    &to_CP949_E7_01,
-        &to_CP949_E7_02,    &to_CP949_E7_03,
-        &to_CP949_E7_04,    &to_CP949_E7_05,
-        &to_CP949_E7_06,    &to_CP949_E7_07,
-        &to_CP949_E7_08,    &to_CP949_E7_09,
-        &to_CP949_E7_0A,    &to_CP949_E7_0B,
-        &to_CP949_E7_0C,    &to_CP949_E7_0D,
-        &to_CP949_E7_0E,    &to_CP949_E7_0F,
-        &to_CP949_E7_10,    &to_CP949_E7_11,
-        &to_CP949_E7_12,    &to_CP949_E7_13,
-        &to_CP949_E7_14,    &to_CP949_E7_15,
-        &to_CP949_E7_16,    &to_CP949_E7_17,
-        &to_CP949_E7_18,    &to_CP949_E7_19,
-        &to_CP949_E7_1A,    &to_CP949_E7_1B,
-        &to_CP949_E7_1C,    &to_CP949_E7_1D,
-        &to_CP949_E7_1E,    &to_CP949_E7_1F,
-        &to_CP949_E7_20,    &to_CP949_E7_21,
-        &to_CP949_E7_22,    &to_CP949_E7_23,
-        &to_CP949_E7_24,    &to_CP949_E7_25,
-        &to_CP949_E7_26,    &to_CP949_E7_27,
-        &to_CP949_E7_28,    &to_CP949_E7_29,
-        &to_CP949_E7_2A,    &to_CP949_E7_2B,
-        &to_CP949_E7_2C,    &to_CP949_E7_2D,
-        &to_CP949_E7_2E,    &to_CP949_E7_2F,
-        &to_CP949_E7_30,    &to_CP949_E7_31,
-        &to_CP949_E7_32,    &to_CP949_E7_33,
-        &to_CP949_E7_34,    &to_CP949_E7_35,
-        &to_CP949_E7_36,    &to_CP949_E7_37,
-        &to_CP949_E7_38,    &to_CP949_E7_39,
-        &to_CP949_E7_3A,    &to_CP949_E7_3C,
-        &to_CP949_E7_3D,    &to_CP949_E7_3E,
-        &to_CP949_E7_3F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E7 = {
-    to_EUC_KR_E7_offsets,
-    to_CP949_E7_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_00_infos[17] = {
-          o2(0xE9,0xA5),      o2(0xD6,0xD5),
-          o2(0xCD,0xC5),      o2(0xED,0xBA),
-          o2(0xD1,0xBD),      o2(0xCF,0xBE),
-          o2(0xEC,0xBB),      o2(0xD2,0xB1),
-          o2(0xCC,0xE9),      o2(0xD9,0xC4),
-          o2(0xE9,0xFC),      o2(0xD1,0xBE),
-          o2(0xEC,0xBC),      o2(0xE5,0xAD),
-          o2(0xF7,0xB0),      o2(0xCC,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_00 = {
-    to_EUC_KR_E8_00_offsets,
-    to_CP949_E8_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_01_infos[16] = {
-          o2(0xD3,0xC4),      o2(0xD6,0xC0),
-          o2(0xD6,0xFD),      o2(0xE1,0xA1),
-          o2(0xDE,0xBD),      o2(0xF6,0xA9),
-          o2(0xDA,0xA4),      o2(0xD6,0xA4),
-          o2(0xF5,0xC6),      o2(0xE1,0xA2),
-          o2(0xE9,0xC6),      o2(0xF2,0xC5),
-          o2(0xF4,0xE9),      o2(0xD6,0xEC),
-          o2(0xEB,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_01 = {
-    to_EUC_KR_E8_01_offsets,
-    to_CP949_E8_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_02_infos[21] = {
-          o2(0xEC,0xBD),      o2(0xE2,0xDC),
-          o2(0xDE,0xEB),      o2(0xF0,0xDC),
-          o2(0xEB,0xBF),      o2(0xD7,0xCE),
-          o2(0xD1,0xBF),      o2(0xF5,0xAB),
-          o2(0xF9,0xFD),      o2(0xCA,0xDC),
-          o2(0xCD,0xC6),      o2(0xF2,0xB6),
-          o2(0xDD,0xFE),      o2(0xCC,0xB7),
-          o2(0xDB,0xB8),      o2(0xD0,0xE9),
-          o2(0xCE,0xDD),      o2(0xEB,0xC0),
-          o2(0xFD,0xA2),      o2(0xF8,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_02 = {
-    to_EUC_KR_E8_02_offsets,
-    to_CP949_E8_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_03_infos[15] = {
-          o2(0xEA,0xD6),      o2(0xF1,0xB0),
-          o2(0xDB,0xCE),      o2(0xF7,0xC3),
-          o2(0xDB,0xCF),      o2(0xCB,0xA4),
-          o2(0xF8,0xE0),      o2(0xFB,0xD7),
-          o2(0xEB,0xCA),      o2(0xE0,0xA1),
-          o2(0xCE,0xCD),      o2(0xD4,0xDC),
-          o2(0xFD,0xD8),      o2(0xD2,0xF6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_03 = {
-    to_EUC_KR_E8_03_offsets,
-    to_CP949_E8_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_04_infos[16] = {
-          o2(0xF2,0xB7),      o2(0xFA,0xF6),
-          o2(0xF6,0xAA),      o2(0xFA,0xF7),
-          o2(0xD8,0xE6),      o2(0xF4,0xB1),
-          o2(0xE8,0xD2),      o2(0xCA,0xC5),
-          o2(0xCC,0xEB),      o2(0xE2,0xEE),
-          o2(0xE2,0xBB),      o2(0xF7,0xAD),
-          o2(0xF8,0xE1),      o2(0xF3,0xEC),
-          o2(0xDE,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_04 = {
-    to_EUC_KR_E8_04_offsets,
-    to_CP949_E8_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_05_infos[16] = {
-          o2(0xE4,0xFD),      o2(0xE3,0xEC),
-          o2(0xDD,0xAF),      o2(0xDD,0xB0),
-          o2(0xCB,0xB7),      o2(0xE8,0xD3),
-          o2(0xE1,0xA3),      o2(0xD2,0xE0),
-          o2(0xF0,0xFE),      o2(0xE9,0xA6),
-          o2(0xCB,0xF2),      o2(0xED,0xF3),
-          o2(0xDC,0xD9),      o2(0xE0,0xCD),
-          o2(0xF7,0xDA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_05 = {
-    to_EUC_KR_E8_05_offsets,
-    to_CP949_E8_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_06_infos[17] = {
-          o2(0xDB,0xB9),      o2(0xCC,0xAE),
-          o2(0xDA,0xDB),      o2(0xCD,0xC7),
-          o2(0xDD,0xB1),      o2(0xD8,0xAF),
-          o2(0xE3,0xA3),      o2(0xCE,0xEF),
-          o2(0xF2,0xF3),      o2(0xF8,0xB3),
-          o2(0xE0,0xCE),      o2(0xF5,0xFD),
-          o2(0xEB,0xEC),      o2(0xD3,0xC5),
-          o2(0xFC,0xEC),      o2(0xD2,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_06 = {
-    to_EUC_KR_E8_06_offsets,
-    to_CP949_E8_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_07_infos[19] = {
-          o2(0xD4,0xEB),      o2(0xDE,0xA2),
-          o2(0xE5,0xE6),      o2(0xF0,0xB0),
-          o2(0xD5,0xC4),      o2(0xED,0xF4),
-          o2(0xE3,0xED),      o2(0xE8,0xC2),
-          o2(0xED,0xF5),      o2(0xD7,0xFC),
-          o2(0xED,0xBB),      o2(0xF6,0xAB),
-          o2(0xF2,0xB8),      o2(0xF6,0xC8),
-          o2(0xD3,0xE6),      o2(0xF2,0xDD),
-          o2(0xCF,0xBF),      o2(0xEB,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_07 = {
-    to_EUC_KR_E8_07_offsets,
-    to_CP949_E8_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_08_infos[20] = {
-          o2(0xCF,0xC0),      o2(0xE6,0xA8),
-          o2(0xFD,0xE9),      o2(0xCF,0xC1),
-          o2(0xE0,0xDF),      o2(0xDE,0xEC),
-          o2(0xE0,0xA2),      o2(0xF4,0xBF),
-          o2(0xE2,0xEF),      o2(0xD9,0xF1),
-          o2(0xF1,0xC7),      o2(0xCB,0xB8),
-          o2(0xF9,0xFE),      o2(0xDB,0xBA),
-          o2(0xDA,0xF5),      o2(0xF6,0xEC),
-          o2(0xDA,0xDC),      o2(0xFA,0xE4),
-          o2(0xE0,0xCF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_08 = {
-    to_EUC_KR_E8_08_offsets,
-    to_CP949_E8_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_09_infos[14] = {
-          o2(0xDD,0xB2),      o2(0xE6,0xA9),
-          o2(0xEF,0xF3),      o2(0xF3,0xED),
-          o2(0xEB,0xFA),      o2(0xF9,0xE6),
-          o2(0xCA,0xDD),      o2(0xD5,0xDE),
-          o2(0xCA,0xDE),      o2(0xDF,0xE4),
-          o2(0xE6,0xFD),      o2(0xF5,0xAC),
-          o2(0xE4,0xF5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_09 = {
-    to_EUC_KR_E8_09_offsets,
-    to_CP949_E8_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0A_infos[25] = {
-          o2(0xE9,0xE3),      o2(0xED,0xCB),
-          o2(0xCF,0xE4),      o2(0xD8,0xD3),
-          o2(0xDD,0xB3),      o2(0xD4,0xEC),
-          o2(0xF2,0xB9),      o2(0xDF,0xB7),
-          o2(0xCB,0xCE),      o2(0xFB,0xD8),
-          o2(0xD0,0xD9),      o2(0xDD,0xD2),
-          o2(0xF7,0xF4),      o2(0xE7,0xDC),
-          o2(0xE4,0xA5),      o2(0xFC,0xA3),
-          o2(0xDB,0xBB),      o2(0xF2,0xBA),
-          o2(0xE9,0xFD),      o2(0xD0,0xCA),
-          o2(0xF5,0xD6),      o2(0xD9,0xC5),
-          o2(0xE4,0xB4),      o2(0xED,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0A = {
-    to_EUC_KR_E8_0A_offsets,
-    to_CP949_E8_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0B_infos[16] = {
-          o2(0xEA,0xBD),      o2(0xE6,0xFE),
-          o2(0xF7,0xC4),      o2(0xF5,0xAD),
-          o2(0xD9,0xE0),      o2(0xCA,0xB4),
-          o2(0xF8,0xE2),      o2(0xCF,0xC2),
-          o2(0xEC,0xBE),      o2(0xE5,0xB4),
-          o2(0xCD,0xC8),      o2(0xEE,0xC8),
-          o2(0xE7,0xC8),      o2(0xCD,0xC9),
-          o2(0xF9,0xB7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0B = {
-    to_EUC_KR_E8_0B_offsets,
-    to_CP949_E8_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0C_infos[17] = {
-          o2(0xF1,0xE8),      o2(0xD9,0xF2),
-          o2(0xDB,0xF5),      o2(0xCA,0xB5),
-          o2(0xD9,0xC6),      o2(0xD8,0xC9),
-          o2(0xD9,0xAB),      o2(0xED,0xBC),
-          o2(0xD8,0xD4),      o2(0xDC,0xDA),
-          o2(0xE2,0xBC),      o2(0xFC,0xED),
-          o2(0xEC,0xE0),      o2(0xD2,0xFE),
-          o2(0xE9,0xC7),      o2(0xE6,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0C = {
-    to_EUC_KR_E8_0C_offsets,
-    to_CP949_E8_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0D_infos[11] = {
-          o2(0xE2,0xF0),      o2(0xFA,0xBB),
-          o2(0xF5,0xAE),      o2(0xFB,0xAA),
-          o2(0xEC,0xFB),      o2(0xEC,0xBF),
-          o2(0xFC,0xD8),      o2(0xD4,0xE5),
-          o2(0xF9,0xC3),      o2(0xEE,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0D = {
-    to_EUC_KR_E8_0D_offsets,
-    to_CP949_E8_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0E_infos[12] = {
-          o2(0xD7,0xE9),      o2(0xED,0xF6),
-          o2(0xDE,0xED),      o2(0xCC,0xEC),
-          o2(0xE3,0xEE),      o2(0xE8,0xD4),
-          o2(0xFA,0xF8),      o2(0xDD,0xB4),
-          o2(0xE4,0xB5),      o2(0xD8,0xB0),
-          o2(0xD8,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0E = {
-    to_EUC_KR_E8_0E_offsets,
-    to_CP949_E8_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_0F_infos[18] = {
-          o2(0xF4,0xEA),      o2(0xCE,0xB9),
-          o2(0xD6,0xE1),      o2(0xCF,0xD2),
-          o2(0xD0,0xB6),      o2(0xCE,0xA2),
-          o2(0xF3,0xEE),      o2(0xF3,0xF8),
-          o2(0xDC,0xCC),      o2(0xD0,0xCB),
-          o2(0xFC,0xA4),      o2(0xCD,0xCA),
-          o2(0xD7,0xD4),      o2(0xDE,0xA3),
-          o2(0xE4,0xE0),      o2(0xEE,0xC9),
-          o2(0xE2,0xDD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_0F = {
-    to_EUC_KR_E8_0F_offsets,
-    to_CP949_E8_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_10_infos[12] = {
-          o2(0xF5,0xFE),      o2(0xD4,0xAC),
-          o2(0xD5,0xD1),      o2(0xD8,0xF0),
-          o2(0xF8,0xC3),      o2(0xEA,0xD7),
-          o2(0xF5,0xD7),      o2(0xD8,0xBF),
-          o2(0xFD,0xC0),      o2(0xEB,0xAD),
-          o2(0xD5,0xAA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_10 = {
-    to_EUC_KR_E8_10_offsets,
-    to_CP949_E8_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_11_infos[12] = {
-          o2(0xE7,0xA8),      o2(0xEE,0xCA),
-          o2(0xCA,0xE7),      o2(0xF8,0xE3),
-          o2(0xD4,0xDD),      o2(0xEA,0xD8),
-          o2(0xFB,0xD9),      o2(0xED,0xF7),
-          o2(0xE5,0xB5),      o2(0xD0,0xAD),
-          o2(0xF1,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_11 = {
-    to_EUC_KR_E8_11_offsets,
-    to_CP949_E8_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_12_infos[11] = {
-          o2(0xE2,0xBD),      o2(0xE3,0xC8),
-          o2(0xD9,0xD5),      o2(0xDF,0xAA),
-          o2(0xDB,0xBC),      o2(0xF8,0xE4),
-          o2(0xF1,0xFA),      o2(0xE5,0xB6),
-          o2(0xF3,0xEF),      o2(0xFB,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_12 = {
-    to_EUC_KR_E8_12_offsets,
-    to_CP949_E8_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_13_infos[14] = {
-          o2(0xE1,0xE0),      o2(0xD9,0xAC),
-          o2(0xF5,0xEB),      o2(0xE0,0xB6),
-          o2(0xE9,0xC8),      o2(0xCB,0xCF),
-          o2(0xE3,0xC9),      o2(0xDE,0xEE),
-          o2(0xE2,0xBE),      o2(0xDC,0xEF),
-          o2(0xD6,0xA5),      o2(0xE2,0xF1),
-          o2(0xD6,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_13 = {
-    to_EUC_KR_E8_13_offsets,
-    to_CP949_E8_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_14_infos[16] = {
-          o2(0xD9,0xA1),      o2(0xD8,0xC0),
-          o2(0xDC,0xDB),      o2(0xED,0xBD),
-          o2(0xDF,0xB8),      o2(0xEA,0xA5),
-          o2(0xD7,0xAD),      o2(0xF3,0xF9),
-          o2(0xED,0xF8),      o2(0xF5,0xC7),
-          o2(0xE1,0xCA),      o2(0xEB,0xE3),
-          o2(0xF2,0xDE),      o2(0xF8,0xCC),
-          o2(0xEA,0xD9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_14 = {
-    to_EUC_KR_E8_14_offsets,
-    to_CP949_E8_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_15_infos[12] = {
-          o2(0xD3,0xC6),      o2(0xDB,0xE6),
-          o2(0xF5,0xAF),      o2(0xCE,0xF0),
-          o2(0xE9,0xFE),      o2(0xFB,0xB6),
-          o2(0xE2,0xF2),      o2(0xCF,0xF2),
-          o2(0xF7,0xB9),      o2(0xD9,0xF3),
-          o2(0xE1,0xCB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_15 = {
-    to_EUC_KR_E8_15_offsets,
-    to_CP949_E8_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_16_infos[14] = {
-          o2(0xDA,0xDD),      o2(0xDA,0xB9),
-          o2(0xEB,0xFB),      o2(0xCB,0xB9),
-          o2(0xED,0xF9),      o2(0xE0,0xE0),
-          o2(0xF4,0xC0),      o2(0xFD,0xBC),
-          o2(0xDF,0xB1),      o2(0xE3,0xEF),
-          o2(0xE0,0xA3),      o2(0xFD,0xB9),
-          o2(0xF0,0xB1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_16 = {
-    to_EUC_KR_E8_16_offsets,
-    to_CP949_E8_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_17_infos[17] = {
-          o2(0xCD,0xCB),      o2(0xED,0xBE),
-          o2(0xD5,0xC0),      o2(0xE3,0xF0),
-          o2(0xED,0xFA),      o2(0xE9,0xE4),
-          o2(0xD5,0xED),      o2(0xE7,0xDD),
-          o2(0xD4,0xF6),      o2(0xE5,0xB7),
-          o2(0xDB,0xE7),      o2(0xE2,0xBF),
-          o2(0xEE,0xCB),      o2(0xD7,0xF4),
-          o2(0xF0,0xDD),      o2(0xCE,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_17 = {
-    to_EUC_KR_E8_17_offsets,
-    to_CP949_E8_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_18_infos[10] = {
-          o2(0xE7,0xDE),      o2(0xD6,0xD6),
-          o2(0xE1,0xCC),      o2(0xE8,0xB3),
-          o2(0xE5,0xEE),      o2(0xDC,0xA2),
-          o2(0xE0,0xD0),      o2(0xD5,0xB5),
-          o2(0xD5,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_18 = {
-    to_EUC_KR_E8_18_offsets,
-    to_CP949_E8_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_19_infos[11] = {
-          o2(0xFB,0xDB),      o2(0xF9,0xCB),
-          o2(0xCB,0xF3),      o2(0xF4,0xA5),
-          o2(0xFA,0xC8),      o2(0xD6,0xD7),
-          o2(0xE9,0xE5),      o2(0xFB,0xDC),
-          o2(0xFD,0xD0),      o2(0xFB,0xF6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_19 = {
-    to_EUC_KR_E8_19_offsets,
-    to_CP949_E8_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1A_infos[7] = {
-          o2(0xDA,0xA5),      o2(0xDB,0xBD),
-          o2(0xEC,0xE2),      o2(0xCD,0xF7),
-          o2(0xF0,0xDE),      o2(0xF6,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1A = {
-    to_EUC_KR_E8_1A_offsets,
-    to_CP949_E8_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1B_infos[10] = {
-          o2(0xDE,0xEF),      o2(0xD3,0xB1),
-          o2(0xFC,0xEE),      o2(0xE8,0xC3),
-          o2(0xF1,0xC8),      o2(0xCE,0xF1),
-          o2(0xF9,0xED),      o2(0xF2,0xF4),
-          o2(0xE4,0xB6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1B = {
-    to_EUC_KR_E8_1B_offsets,
-    to_CP949_E8_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1C_infos[8] = {
-          o2(0xF5,0xB9),      o2(0xDC,0xF0),
-          o2(0xE3,0xF1),      o2(0xE8,0xA5),
-          o2(0xF2,0xBB),      o2(0xDE,0xA4),
-          o2(0xDA,0xCC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1C = {
-    to_EUC_KR_E8_1C_offsets,
-    to_CP949_E8_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1D_infos[10] = {
-          o2(0xCA,0xE9),      o2(0xE3,0xDA),
-          o2(0xFC,0xD9),      o2(0xEA,0xDA),
-          o2(0xF9,0xC4),      o2(0xE3,0xA4),
-          o2(0xFB,0xDD),      o2(0xEF,0xCA),
-          o2(0xE8,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1D = {
-    to_EUC_KR_E8_1D_offsets,
-    to_CP949_E8_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1E_infos[7] = {
-          o2(0xD5,0xCC),      o2(0xEB,0xD7),
-          o2(0xD9,0xAD),      o2(0xFB,0xAB),
-          o2(0xD3,0xD9),      o2(0xD5,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1E = {
-    to_EUC_KR_E8_1E_offsets,
-    to_CP949_E8_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_1F_infos[9] = {
-          o2(0xF6,0xDE),      o2(0xDA,0xF6),
-          o2(0xE0,0xD1),      o2(0xE9,0xA8),
-          o2(0xF5,0xF9),      o2(0xFA,0xAF),
-          o2(0xEB,0xFC),      o2(0xE0,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_1F = {
-    to_EUC_KR_E8_1F_offsets,
-    to_CP949_E8_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_20_infos[8] = {
-          o2(0xE3,0xB2),      o2(0xD5,0xC5),
-          o2(0xF1,0xE3),      o2(0xD5,0xEE),
-          o2(0xCD,0xCC),      o2(0xED,0xD9),
-          o2(0xD8,0xC1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_20 = {
-    to_EUC_KR_E8_20_offsets,
-    to_CP949_E8_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_21_infos[21] = {
-          o2(0xFA,0xEC),      o2(0xF1,0xEB),
-          o2(0xFA,0xBC),      o2(0xE6,0xE2),
-          o2(0xFA,0xE5),      o2(0xE2,0xFA),
-          o2(0xCA,0xB6),      o2(0xE4,0xB7),
-          o2(0xEA,0xDB),      o2(0xF5,0xFA),
-          o2(0xFB,0xAC),      o2(0xCF,0xC3),
-          o2(0xEB,0xFD),      o2(0xF8,0xFA),
-          o2(0xDF,0xB9),      o2(0xE1,0xF1),
-          o2(0xD2,0xA4),      o2(0xF5,0xFB),
-          o2(0xD0,0xDA),      o2(0xD0,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_21 = {
-    to_EUC_KR_E8_21_offsets,
-    to_CP949_E8_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_22_infos[12] = {
-          o2(0xEA,0xBE),      o2(0xD9,0xB1),
-          o2(0xCA,0xB7),      o2(0xD3,0xE7),
-          o2(0xF8,0xE5),      o2(0xD3,0xB2),
-          o2(0xE2,0xC0),      o2(0xF2,0xDF),
-          o2(0xCD,0xE5),      o2(0xF9,0xAC),
-          o2(0xCD,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_22 = {
-    to_EUC_KR_E8_22_offsets,
-    to_CP949_E8_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_23_infos[17] = {
-          o2(0xEE,0xAE),      o2(0xD6,0xAE),
-          o2(0xD7,0xEA),      o2(0xE7,0xE0),
-          o2(0xEB,0xAE),      o2(0xCF,0xD9),
-          o2(0xDC,0xCD),      o2(0xED,0xFB),
-          o2(0xDE,0xF0),      o2(0xD7,0xEB),
-          o2(0xDE,0xA5),      o2(0xDF,0xD7),
-          o2(0xDB,0xD0),      o2(0xDB,0xD1),
-          o2(0xD5,0xA3),      o2(0xF0,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_23 = {
-    to_EUC_KR_E8_23_offsets,
-    to_CP949_E8_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_24_infos[12] = {
-          o2(0xDC,0xDC),      o2(0xCA,0xE8),
-          o2(0xF8,0xE6),      o2(0xDC,0xCE),
-          o2(0xEA,0xDC),      o2(0xDB,0xD2),
-          o2(0xE9,0xB3),      o2(0xF7,0xDB),
-          o2(0xE3,0xA8),      o2(0xD7,0xAE),
-          o2(0xE0,0xE1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_24 = {
-    to_EUC_KR_E8_24_offsets,
-    to_CP949_E8_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_25_infos[8] = {
-          o2(0xCB,0xBA),      o2(0xE5,0xD1),
-          o2(0xD0,0xDC),      o2(0xD5,0xC1),
-          o2(0xD8,0xCA),      o2(0xE3,0xA9),
-          o2(0xE0,0xA4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_25 = {
-    to_EUC_KR_E8_25_offsets,
-    to_CP949_E8_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_26_infos[15] = {
-          o2(0xE9,0xA9),      o2(0xD3,0xC7),
-          o2(0xDC,0xDD),      o2(0xF8,0xAE),
-          o2(0xCC,0xB8),      o2(0xD0,0xAE),
-          o2(0xD8,0xF2),      o2(0xE3,0xCA),
-          o2(0xCC,0xAF),      o2(0xD4,0xAD),
-          o2(0xF6,0xD1),      o2(0xD0,0xCC),
-          o2(0xCA,0xC6),      o2(0xD5,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_26 = {
-    to_EUC_KR_E8_26_offsets,
-    to_CP949_E8_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_27_infos[6] = {
-          o2(0xCE,0xBA),      o2(0xCA,0xC7),
-          o2(0xFA,0xB0),      o2(0xDF,0xD8),
-          o2(0xF5,0xBA),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_27 = {
-    to_EUC_KR_E8_27_offsets,
-    to_CP949_E8_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_28_infos[24] = {
-          o2(0xE5,0xEB),      o2(0xEF,0xF4),
-          o2(0xDD,0xB5),      o2(0xCD,0xAA),
-          o2(0xE3,0xF2),      o2(0xFB,0xF7),
-          o2(0xF7,0xD0),      o2(0xFD,0xBA),
-          o2(0xFD,0xE1),      o2(0xF6,0xFE),
-          o2(0xD1,0xC0),      o2(0xE8,0xC5),
-          o2(0xE4,0xB8),      o2(0xE1,0xE8),
-          o2(0xCC,0xC1),      o2(0xD2,0xED),
-          o2(0xDB,0xBE),      o2(0xE0,0xE2),
-          o2(0xFA,0xC9),      o2(0xE1,0xCD),
-          o2(0xCA,0xB8),      o2(0xF2,0xE0),
-          o2(0xF1,0xC9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_28 = {
-    to_EUC_KR_E8_28_offsets,
-    to_CP949_E8_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_29_infos[19] = {
-          o2(0xDE,0xF1),      o2(0xF0,0xDF),
-          o2(0xF8,0xC4),      o2(0xEE,0xCC),
-          o2(0xDE,0xF2),      o2(0xE7,0xC9),
-          o2(0xE2,0xF3),      o2(0xE7,0xE1),
-          o2(0xE3,0xCB),      o2(0xE3,0xCC),
-          o2(0xCF,0xF8),      o2(0xEF,0xAC),
-          o2(0xFD,0xFE),      o2(0xFC,0xA5),
-          o2(0xFA,0xB1),      o2(0xDF,0xD9),
-          o2(0xE0,0xD2),      o2(0xF4,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_29 = {
-    to_EUC_KR_E8_29_offsets,
-    to_CP949_E8_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_2A_infos[23] = {
-          o2(0xF1,0xCA),      o2(0xCE,0xA3),
-          o2(0xF2,0xBC),      o2(0xEC,0xE3),
-          o2(0xE0,0xA5),      o2(0xF7,0xAB),
-          o2(0xEB,0xAF),      o2(0xE5,0xDE),
-          o2(0xE1,0xA4),      o2(0xCD,0xAB),
-          o2(0xD9,0xF4),      o2(0xE8,0xA6),
-          o2(0xCD,0xCE),      o2(0xE1,0xE9),
-          o2(0xFC,0xEF),      o2(0xE0,0xE3),
-          o2(0xE2,0xC1),      o2(0xCE,0xA4),
-          o2(0xDE,0xA6),      o2(0xEB,0xFE),
-          o2(0xEB,0xDD),      o2(0xF0,0xE0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_2A = {
-    to_EUC_KR_E8_2A_offsets,
-    to_CP949_E8_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_2B_infos[24] = {
-          o2(0xF4,0xDB),      o2(0xE2,0xF4),
-          o2(0xD3,0xC8),      o2(0xF4,0xEB),
-          o2(0xEE,0xB5),      o2(0xF5,0xD8),
-          o2(0xD5,0xDF),      o2(0xD6,0xE5),
-          o2(0xEB,0xB0),      o2(0xF4,0xE3),
-          o2(0xE3,0xCD),      o2(0xF4,0xF4),
-          o2(0xFA,0xB2),      o2(0xEF,0xF5),
-          o2(0xCA,0xDF),      o2(0xEB,0xB1),
-          o2(0xED,0xBF),      o2(0xFD,0xC9),
-          o2(0xE4,0xA6),      o2(0xF9,0xA4),
-          o2(0xF0,0xB3),      o2(0xE5,0xEC),
-          o2(0xD1,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_2B = {
-    to_EUC_KR_E8_2B_offsets,
-    to_CP949_E8_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_2C_infos[20] = {
-          o2(0xD9,0xC7),      o2(0xE4,0xD7),
-          o2(0xEA,0xDD),      o2(0xD4,0xF7),
-          o2(0xDA,0xBA),      o2(0xDA,0xCD),
-          o2(0xF9,0xCC),      o2(0xE1,0xDA),
-          o2(0xDB,0xBF),      o2(0xCC,0xC5),
-          o2(0xEC,0xD0),      o2(0xCB,0xBB),
-          o2(0xDE,0xF3),      o2(0xE9,0xAA),
-          o2(0xD9,0xC8),      o2(0xEE,0xE3),
-          o2(0xD7,0xBD),      o2(0xCF,0xC4),
-          o2(0xD0,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_2C = {
-    to_EUC_KR_E8_2C_offsets,
-    to_CP949_E8_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_2D_infos[15] = {
-          o2(0xFC,0xA6),      o2(0xF1,0xFB),
-          o2(0xFD,0xD2),      o2(0xD1,0xC1),
-          o2(0xE3,0xDB),      o2(0xD3,0xC9),
-          o2(0xDC,0xCF),      o2(0xCC,0xED),
-          o2(0xDE,0xA7),      o2(0xE6,0xBB),
-          o2(0xEC,0xA1),      o2(0xCC,0xB9),
-          o2(0xFB,0xDE),      o2(0xE7,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_2D = {
-    to_EUC_KR_E8_2D_offsets,
-    to_CP949_E8_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_2E_infos[8] = {
-          o2(0xD4,0xC1),      o2(0xDC,0xA8),
-          o2(0xE2,0xC2),      o2(0xF3,0xD8),
-          o2(0xE5,0xD3),      o2(0xF3,0xD9),
-          o2(0xF3,0xC6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_2E = {
-    to_EUC_KR_E8_2E_offsets,
-    to_CP949_E8_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_30_infos[3] = {
-          o2(0xCD,0xDB),      o2(0xCD,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_30 = {
-    to_EUC_KR_E8_30_offsets,
-    to_CP949_E8_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_31_infos[13] = {
-          o2(0xFC,0xC3),      o2(0xD4,0xE7),
-          o2(0xD1,0xC2),      o2(0xF9,0xA5),
-          o2(0xE8,0xD5),      o2(0xE3,0xCE),
-          o2(0xD4,0xCA),      o2(0xDF,0xDA),
-          o2(0xFB,0xDF),      o2(0xE7,0xE3),
-          o2(0xF8,0xFB),      o2(0xE3,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_31 = {
-    to_EUC_KR_E8_31_offsets,
-    to_CP949_E8_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_32_infos[26] = {
-          o2(0xF5,0xB0),      o2(0xD8,0xE7),
-          o2(0xD9,0xC9),      o2(0xF8,0xAF),
-          o2(0xEF,0xF6),      o2(0xDD,0xB6),
-          o2(0xEE,0xAF),      o2(0xCD,0xF8),
-          o2(0xDE,0xB8),      o2(0xFC,0xA7),
-          o2(0xF7,0xFC),      o2(0xF7,0xB1),
-          o2(0xCE,0xBB),      o2(0xF4,0xA1),
-          o2(0xEE,0xCD),      o2(0xE1,0xAE),
-          o2(0xEC,0xC3),      o2(0xCF,0xFE),
-          o2(0xF8,0xBF),      o2(0xD8,0xE2),
-          o2(0xD3,0xE8),      o2(0xDE,0xA8),
-          o2(0xF4,0xE4),      o2(0xEC,0xC2),
-          o2(0xD9,0xF5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_32 = {
-    to_EUC_KR_E8_32_offsets,
-    to_CP949_E8_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_33_infos[25] = {
-          o2(0xF9,0xC5),      o2(0xDD,0xD3),
-          o2(0xD6,0xF1),      o2(0xEC,0xFC),
-          o2(0xFC,0xF0),      o2(0xED,0xC0),
-          o2(0xCA,0xB9),      o2(0xEE,0xE4),
-          o2(0xF2,0xE1),      o2(0xDE,0xB9),
-          o2(0xD6,0xF2),      o2(0xDE,0xF4),
-          o2(0xDF,0xDB),      o2(0xDB,0xD3),
-          o2(0xFA,0xE7),      o2(0xD8,0xE3),
-          o2(0xF4,0xC1),      o2(0xDD,0xB7),
-          o2(0xF2,0xF5),      o2(0xD4,0xAE),
-          o2(0xD6,0xF3),      o2(0xDD,0xB8),
-          o2(0xCF,0xC5),      o2(0xDF,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_33 = {
-    to_EUC_KR_E8_33_offsets,
-    to_CP949_E8_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_34_infos[9] = {
-          o2(0xF2,0xBE),      o2(0xF6,0xA1),
-          o2(0xEB,0xCB),      o2(0xF1,0xFC),
-          o2(0xF3,0xC7),      o2(0xE0,0xEB),
-          o2(0xED,0xFC),      o2(0xE1,0xDB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_34 = {
-    to_EUC_KR_E8_34_offsets,
-    to_CP949_E8_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_35_infos[8] = {
-          o2(0xEE,0xE5),      o2(0xDE,0xF5),
-          o2(0xFA,0xD3),      o2(0xF1,0xCB),
-          o2(0xD0,0xAF),      o2(0xDD,0xB9),
-          o2(0xD1,0xC3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_35 = {
-    to_EUC_KR_E8_35_offsets,
-    to_CP949_E8_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_36_infos[9] = {
-          o2(0xF5,0xB1),      o2(0xEA,0xC6),
-          o2(0xF0,0xE1),      o2(0xF6,0xAC),
-          o2(0xF5,0xD9),      o2(0xF0,0xEB),
-          o2(0xDD,0xBA),      o2(0xF2,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_36 = {
-    to_EUC_KR_E8_36_offsets,
-    to_CP949_E8_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_37_infos[12] = {
-          o2(0xF7,0xC5),      o2(0xDB,0xA2),
-          o2(0xF2,0xF6),      o2(0xCA,0xBA),
-          o2(0xF7,0xF5),      o2(0xCB,0xE5),
-          o2(0xEE,0xE6),      o2(0xE0,0xD3),
-          o2(0xCE,0xA5),      o2(0xD6,0xD8),
-          o2(0xD4,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_37 = {
-    to_EUC_KR_E8_37_offsets,
-    to_CP949_E8_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_38_infos[8] = {
-          o2(0xE9,0xC9),      o2(0xD3,0xCE),
-          o2(0xF4,0xC2),      o2(0xCB,0xE6),
-          o2(0xF1,0xA1),      o2(0xEB,0xB2),
-          o2(0xF1,0xA2),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_38 = {
-    to_EUC_KR_E8_38_offsets,
-    to_CP949_E8_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_39_infos[12] = {
-          o2(0xEB,0xB3),      o2(0xF0,0xB4),
-          o2(0xCB,0xF4),      o2(0xD4,0xB0),
-          o2(0xF3,0xB2),      o2(0xFB,0xB7),
-          o2(0xF5,0xEC),      o2(0xEE,0xE7),
-          o2(0xF4,0xB2),      o2(0xF5,0xED),
-          o2(0xCF,0xF3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_39 = {
-    to_EUC_KR_E8_39_offsets,
-    to_CP949_E8_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3A_infos[8] = {
-          o2(0xF0,0xE2),      o2(0xEE,0xCE),
-          o2(0xF1,0xCC),      o2(0xE5,0xB8),
-          o2(0xD7,0xF5),      o2(0xE3,0xF3),
-          o2(0xCF,0xE5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3A = {
-    to_EUC_KR_E8_3A_offsets,
-    to_CP949_E8_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3B_infos[12] = {
-          o2(0xCF,0xC6),      o2(0xF3,0xB3),
-          o2(0xE4,0xD8),      o2(0xCF,0xF9),
-          o2(0xCF,0xDA),      o2(0xFA,0xCD),
-          o2(0xE6,0xE3),      o2(0xF2,0xE2),
-          o2(0xF5,0xEE),      o2(0xCA,0xBB),
-          o2(0xE3,0xDC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3B = {
-    to_EUC_KR_E8_3B_offsets,
-    to_CP949_E8_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3C_infos[24] = {
-          o2(0xCE,0xF2),      o2(0xD6,0xD9),
-          o2(0xEE,0xB0),      o2(0xF4,0xE5),
-          o2(0xD8,0xC2),      o2(0xDC,0xD0),
-          o2(0xCC,0xEE),      o2(0xD5,0xE0),
-          o2(0xF6,0xCA),      o2(0xFD,0xCA),
-          o2(0xD8,0xD6),      o2(0xF4,0xCF),
-          o2(0xD6,0xA6),      o2(0xDC,0xBE),
-          o2(0xDB,0xD4),      o2(0xD7,0xC7),
-          o2(0xF2,0xFE),      o2(0xF1,0xCD),
-          o2(0xE2,0xC3),      o2(0xDC,0xDE),
-          o2(0xDC,0xDF),      o2(0xEF,0xAD),
-          o2(0xE6,0xAB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3C = {
-    to_EUC_KR_E8_3C_offsets,
-    to_CP949_E8_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3D_infos[9] = {
-          o2(0xF9,0xDD),      o2(0xEA,0xBF),
-          o2(0xEF,0xAE),      o2(0xF4,0xD0),
-          o2(0xCE,0xF3),      o2(0xE6,0xAC),
-          o2(0xCE,0xDE),      o2(0xD5,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3D = {
-    to_EUC_KR_E8_3D_offsets,
-    to_CP949_E8_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3E_infos[11] = {
-          o2(0xE3,0xF4),      o2(0xCD,0xD0),
-          o2(0xD5,0xB8),      o2(0xF7,0xFD),
-          o2(0xDC,0xA9),      o2(0xDE,0xF6),
-          o2(0xDC,0xAA),      o2(0xF2,0xE3),
-          o2(0xE9,0xB4),      o2(0xD2,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3E = {
-    to_EUC_KR_E8_3E_offsets,
-    to_CP949_E8_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_3F_infos[15] = {
-          o2(0xE9,0xE6),      o2(0xE3,0xF6),
-          o2(0xE7,0xCA),      o2(0xD0,0xCE),
-          o2(0xDA,0xF7),      o2(0xCA,0xBC),
-          o2(0xEE,0xE8),      o2(0xDA,0xDE),
-          o2(0xF2,0xF7),      o2(0xE2,0xFB),
-          o2(0xCC,0xA6),      o2(0xDA,0xBB),
-          o2(0xEE,0xE9),      o2(0xF5,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8_3F = {
-    to_EUC_KR_E8_3F_offsets,
-    to_CP949_E8_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E8_infos[64] = {
-        &to_CP949_E8_00,    &to_CP949_E8_01,
-        &to_CP949_E8_02,    &to_CP949_E8_03,
-        &to_CP949_E8_04,    &to_CP949_E8_05,
-        &to_CP949_E8_06,    &to_CP949_E8_07,
-        &to_CP949_E8_08,    &to_CP949_E8_09,
-        &to_CP949_E8_0A,    &to_CP949_E8_0B,
-        &to_CP949_E8_0C,    &to_CP949_E8_0D,
-        &to_CP949_E8_0E,    &to_CP949_E8_0F,
-        &to_CP949_E8_10,    &to_CP949_E8_11,
-        &to_CP949_E8_12,    &to_CP949_E8_13,
-        &to_CP949_E8_14,    &to_CP949_E8_15,
-        &to_CP949_E8_16,    &to_CP949_E8_17,
-        &to_CP949_E8_18,    &to_CP949_E8_19,
-        &to_CP949_E8_1A,    &to_CP949_E8_1B,
-        &to_CP949_E8_1C,    &to_CP949_E8_1D,
-        &to_CP949_E8_1E,    &to_CP949_E8_1F,
-        &to_CP949_E8_20,    &to_CP949_E8_21,
-        &to_CP949_E8_22,    &to_CP949_E8_23,
-        &to_CP949_E8_24,    &to_CP949_E8_25,
-        &to_CP949_E8_26,    &to_CP949_E8_27,
-        &to_CP949_E8_28,    &to_CP949_E8_29,
-        &to_CP949_E8_2A,    &to_CP949_E8_2B,
-        &to_CP949_E8_2C,    &to_CP949_E8_2D,
-        &to_CP949_E8_2E,    &to_CP949_E8_30,
-        &to_CP949_E8_31,    &to_CP949_E8_32,
-        &to_CP949_E8_33,    &to_CP949_E8_34,
-        &to_CP949_E8_35,    &to_CP949_E8_36,
-        &to_CP949_E8_37,    &to_CP949_E8_38,
-        &to_CP949_E8_39,    &to_CP949_E8_3A,
-        &to_CP949_E8_3B,    &to_CP949_E8_3C,
-        &to_CP949_E8_3D,    &to_CP949_E8_3E,
-        &to_CP949_E8_3F,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E8 = {
-    to_EUC_KR_E8_offsets,
-    to_CP949_E8_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_00_infos[32] = {
-          o2(0xF7,0xDC),      o2(0xE1,0xEA),
-          o2(0xCE,0xC1),      o2(0xD4,0xB1),
-          o2(0xFD,0xB1),      o2(0xE6,0xBD),
-          o2(0xFB,0xAD),      o2(0xF8,0xE7),
-          o2(0xE1,0xCE),      o2(0xF7,0xE2),
-          o2(0xF5,0xEF),      o2(0xCF,0xC7),
-          o2(0xD4,0xB2),      o2(0xCC,0xEF),
-          o2(0xD4,0xE8),      o2(0xEE,0xCF),
-          o2(0xF7,0xD7),      o2(0xE0,0xA6),
-          o2(0xD6,0xC1),      o2(0xE1,0xDC),
-          o2(0xF0,0xE3),      o2(0xF1,0xE4),
-          o2(0xDC,0xF1),      o2(0xD6,0xA7),
-          o2(0xF4,0xF5),      o2(0xF1,0xCE),
-          o2(0xF2,0xE4),      o2(0xD0,0xB0),
-          o2(0xEC,0xEF),      o2(0xF9,0xBA),
-          o2(0xEB,0xB5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_00 = {
-    to_EUC_KR_E9_00_offsets,
-    to_CP949_E9_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_01_infos[32] = {
-          o2(0xD4,0xED),      o2(0xE2,0xC4),
-          o2(0xE9,0xE7),      o2(0xEB,0xB4),
-          o2(0xEA,0xA1),      o2(0xF8,0xBC),
-          o2(0xCE,0xA6),      o2(0xF9,0xC6),
-          o2(0xFC,0xDA),      o2(0xD4,0xB3),
-          o2(0xD3,0xB9),      o2(0xEA,0xDE),
-          o2(0xE9,0xAB),      o2(0xE1,0xE1),
-          o2(0xD3,0xCF),      o2(0xF4,0xF6),
-          o2(0xEA,0xC0),      o2(0xE1,0xCF),
-          o2(0xCC,0xBA),      o2(0xEE,0xEA),
-          o2(0xF0,0xE4),      o2(0xF3,0xB4),
-          o2(0xD4,0xEE),      o2(0xF2,0xC0),
-          o2(0xF1,0xE5),      o2(0xF4,0xC3),
-          o2(0xE0,0xD4),      o2(0xEB,0xB6),
-          o2(0xD7,0xA1),      o2(0xCB,0xE8),
-          o2(0xF9,0xAD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_01 = {
-    to_EUC_KR_E9_01_offsets,
-    to_CP949_E9_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_02_infos[23] = {
-          o2(0xE9,0xAD),      o2(0xD8,0xE4),
-          o2(0xFA,0xB3),      o2(0xE2,0xC5),
-          o2(0xFC,0xBD),      o2(0xEC,0xC4),
-          o2(0xD8,0xB1),      o2(0xDC,0xAB),
-          o2(0xD5,0xA4),      o2(0xEB,0xE9),
-          o2(0xE8,0xBB),      o2(0xD8,0xD7),
-          o2(0xFB,0xAE),      o2(0xD1,0xE1),
-          o2(0xDB,0xC0),      o2(0xF5,0xBE),
-          o2(0xDE,0xF7),      o2(0xCA,0xFB),
-          o2(0xF7,0xC6),      o2(0xCF,0xC8),
-          o2(0xE1,0xD0),      o2(0xEE,0xD0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_02 = {
-    to_EUC_KR_E9_02_offsets,
-    to_CP949_E9_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_03_infos[9] = {
-          o2(0xE9,0xF4),      o2(0xCE,0xF4),
-          o2(0xD5,0xCD),      o2(0xCF,0xDB),
-          o2(0xDD,0xBB),      o2(0xCE,0xAC),
-          o2(0xE9,0xE8),      o2(0xD4,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_03 = {
-    to_EUC_KR_E9_03_offsets,
-    to_CP949_E9_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_04_infos[8] = {
-          o2(0xE4,0xC7),      o2(0xF5,0xDB),
-          o2(0xFA,0xC1),      o2(0xDE,0xA9),
-          o2(0xD4,0xF8),      o2(0xEF,0xF7),
-          o2(0xD3,0xB3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_04 = {
-    to_EUC_KR_E9_04_offsets,
-    to_CP949_E9_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_05_infos[15] = {
-          o2(0xEB,0xB7),      o2(0xEF,0xF8),
-          o2(0xF5,0xDC),      o2(0xED,0xCC),
-          o2(0xDB,0xD5),      o2(0xF1,0xCF),
-          o2(0xF1,0xD0),      o2(0xF5,0xB2),
-          o2(0xD9,0xAE),      o2(0xD5,0xAC),
-          o2(0xE2,0xC6),      o2(0xFD,0xA3),
-          o2(0xFB,0xE5),      o2(0xDF,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_05 = {
-    to_EUC_KR_E9_05_offsets,
-    to_CP949_E9_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_06_infos[14] = {
-          o2(0xE2,0xF5),      o2(0xF6,0xAD),
-          o2(0xF5,0xB3),      o2(0xF0,0xB5),
-          o2(0xE1,0xA5),      o2(0xF5,0xDD),
-          o2(0xEC,0xA2),      o2(0xED,0xFD),
-          o2(0xF5,0xB4),      o2(0xFB,0xB8),
-          o2(0xDB,0xA3),      o2(0xD6,0xCA),
-          o2(0xCB,0xD9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_06 = {
-    to_EUC_KR_E9_06_offsets,
-    to_CP949_E9_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_07_infos[19] = {
-          o2(0xE5,0xD4),      o2(0xF3,0xFA),
-          o2(0xEB,0xB8),      o2(0xE0,0xB7),
-          o2(0xD7,0xEC),      o2(0xF1,0xEC),
-          o2(0xE5,0xAF),      o2(0xD5,0xE1),
-          o2(0xD7,0xED),      o2(0xD1,0xD1),
-          o2(0xE1,0xF2),      o2(0xEF,0xF9),
-          o2(0xDD,0xBC),      o2(0xF6,0xDC),
-          o2(0xF0,0xE5),      o2(0xF4,0xC4),
-          o2(0xE9,0xE9),      o2(0xF3,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_07 = {
-    to_EUC_KR_E9_07_offsets,
-    to_CP949_E9_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_08_infos[10] = {
-          o2(0xD4,0xEF),      o2(0xCC,0xA2),
-          o2(0xF7,0xFE),      o2(0xDF,0xBC),
-          o2(0xEB,0xCD),      o2(0xD0,0xB7),
-          o2(0xD6,0xC2),      o2(0xE8,0xAD),
-          o2(0xEF,0xAF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_08 = {
-    to_EUC_KR_E9_08_offsets,
-    to_CP949_E9_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_09_infos[11] = {
-          o2(0xCB,0xA5),      o2(0xCB,0xE9),
-          o2(0xFA,0xE8),      o2(0xCC,0xC6),
-          o2(0xE6,0xE7),      o2(0xEA,0xC7),
-          o2(0xDB,0xA4),      o2(0xCF,0xC9),
-          o2(0xE2,0xFC),      o2(0xEF,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_09 = {
-    to_EUC_KR_E9_09_offsets,
-    to_CP949_E9_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0A_infos[13] = {
-          o2(0xEB,0xDE),      o2(0xF5,0xC8),
-          o2(0xD4,0xDE),      o2(0xE0,0xD5),
-          o2(0xEF,0xB0),      o2(0xE2,0xC7),
-          o2(0xD9,0xAF),      o2(0xF9,0xE7),
-          o2(0xE7,0xE5),      o2(0xCF,0xCA),
-          o2(0xE1,0xD1),      o2(0xE2,0xC8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0A = {
-    to_EUC_KR_E9_0A_offsets,
-    to_CP949_E9_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0B_infos[8] = {
-          o2(0xEF,0xFB),      o2(0xFA,0xF9),
-          o2(0xDC,0xF2),      o2(0xE0,0xA7),
-          o2(0xF8,0xE8),      o2(0xCB,0xEA),
-          o2(0xCB,0xBC),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0B = {
-    to_EUC_KR_E9_0B_offsets,
-    to_CP949_E9_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0C_infos[16] = {
-          o2(0xD6,0xE2),      o2(0xF5,0xDE),
-          o2(0xF5,0xDF),      o2(0xEE,0xB6),
-          o2(0xE2,0xF6),      o2(0xD3,0xCA),
-          o2(0xEF,0xFC),      o2(0xD1,0xC4),
-          o2(0xEF,0xB1),      o2(0xD1,0xC5),
-          o2(0xD0,0xDE),      o2(0xD9,0xE1),
-          o2(0xE0,0xB8),      o2(0xCD,0xD1),
-          o2(0xF3,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0C = {
-    to_EUC_KR_E9_0C_offsets,
-    to_CP949_E9_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0D_infos[11] = {
-          o2(0xE7,0xCC),      o2(0xD6,0xA8),
-          o2(0xCE,0xA7),      o2(0xD4,0xB5),
-          o2(0xE4,0xC8),      o2(0xD3,0xB4),
-          o2(0xEB,0xB9),      o2(0xCB,0xF5),
-          o2(0xF6,0xDD),      o2(0xF1,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0D = {
-    to_EUC_KR_E9_0D_offsets,
-    to_CP949_E9_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0E_infos[10] = {
-          o2(0xCC,0xC7),      o2(0xE9,0xCA),
-          o2(0xE1,0xF0),      o2(0xF5,0xE0),
-          o2(0xFB,0xAF),      o2(0xCB,0xD1),
-          o2(0xFB,0xE0),      o2(0xF2,0xE5),
-          o2(0xEC,0xF0),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0E = {
-    to_EUC_KR_E9_0E_offsets,
-    to_CP949_E9_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_0F_infos[7] = {
-          o2(0xF0,0xEC),      o2(0xEE,0xEB),
-          o2(0xE9,0xCB),      o2(0xCC,0xF0),
-          o2(0xD7,0xAF),      o2(0xF3,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_0F = {
-    to_EUC_KR_E9_0F_offsets,
-    to_CP949_E9_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_10_infos[7] = {
-          o2(0xFC,0xF5),      o2(0xF1,0xA4),
-          o2(0xE0,0xD6),      o2(0xEF,0xB2),
-          o2(0xF4,0xD1),      o2(0xF7,0xA1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_10 = {
-    to_EUC_KR_E9_10_offsets,
-    to_CP949_E9_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_11_infos[7] = {
-          o2(0xF1,0xD1),      o2(0xCA,0xFC),
-          o2(0xCA,0xFD),      o2(0xCE,0xCE),
-          o2(0xF3,0xC8),      o2(0xF3,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_11 = {
-    to_EUC_KR_E9_11_offsets,
-    to_CP949_E9_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_15_infos[2] = {
-          o2(0xED,0xFE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_15 = {
-    to_EUC_KR_E9_15_offsets,
-    to_CP949_E9_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_16_infos[19] = {
-          o2(0xDA,0xA6),      o2(0xE0,0xEC),
-          o2(0xF8,0xCD),      o2(0xCB,0xD2),
-          o2(0xEB,0xCE),      o2(0xF9,0xD8),
-          o2(0xF9,0xD9),      o2(0xCA,0xE0),
-          o2(0xDA,0xCA),      o2(0xCB,0xA6),
-          o2(0xCA,0xC8),      o2(0xF9,0xEE),
-          o2(0xDB,0xEC),      o2(0xD0,0xB1),
-          o2(0xD5,0xEF),      o2(0xE6,0xF3),
-          o2(0xE7,0xA2),      o2(0xE4,0xD9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_16 = {
-    to_EUC_KR_E9_16_offsets,
-    to_CP949_E9_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_17_infos[9] = {
-          o2(0xE4,0xE1),      o2(0xFC,0xC4),
-          o2(0xF9,0xEF),      o2(0xCF,0xF4),
-          o2(0xF7,0xE6),      o2(0xCE,0xBC),
-          o2(0xF4,0xC5),      o2(0xDC,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_17 = {
-    to_EUC_KR_E9_17_offsets,
-    to_CP949_E9_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_18_infos[8] = {
-          o2(0xDD,0xBD),      o2(0xF4,0xC6),
-          o2(0xF8,0xA1),      o2(0xE8,0xD6),
-          o2(0xDB,0xC1),      o2(0xF0,0xE6),
-          o2(0xE4,0xB9),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_18 = {
-    to_EUC_KR_E9_18_offsets,
-    to_CP949_E9_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_19_infos[24] = {
-          o2(0xF6,0xED),      o2(0xF9,0xAE),
-          o2(0xDD,0xBE),      o2(0xD7,0xB0),
-          o2(0xD8,0xE8),      o2(0xCB,0xBD),
-          o2(0xF9,0xDA),      o2(0xF8,0xCE),
-          o2(0xF9,0xF0),      o2(0xE0,0xED),
-          o2(0xE3,0xB3),      o2(0xF4,0xB3),
-          o2(0xEA,0xC2),      o2(0xF2,0xE6),
-          o2(0xF0,0xB6),      o2(0xDB,0xD6),
-          o2(0xEB,0xE4),      o2(0xF2,0xE7),
-          o2(0xD7,0xD5),      o2(0xD4,0xB6),
-          o2(0xF9,0xE8),      o2(0xD7,0xC1),
-          o2(0xE5,0xD5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_19 = {
-    to_EUC_KR_E9_19_offsets,
-    to_CP949_E9_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1A_infos[20] = {
-          o2(0xE9,0xEA),      o2(0xD7,0xCC),
-          o2(0xD3,0xE9),      o2(0xE2,0xC9),
-          o2(0xFC,0xDB),      o2(0xCD,0xAD),
-          o2(0xCC,0xB0),      o2(0xEA,0xA2),
-          o2(0xE4,0xF6),      o2(0xD0,0xC0),
-          o2(0xF0,0xB7),      o2(0xEE,0xA1),
-          o2(0xD7,0xF6),      o2(0xE2,0xCA),
-          o2(0xE2,0xCB),      o2(0xFA,0xCF),
-          o2(0xEB,0xDF),      o2(0xD6,0xCB),
-          o2(0xF4,0xB4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1A = {
-    to_EUC_KR_E9_1A_offsets,
-    to_CP949_E9_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1B_infos[29] = {
-          o2(0xED,0xCD),      o2(0xE4,0xD2),
-          o2(0xEA,0xA9),      o2(0xE4,0xBA),
-          o2(0xF3,0xA2),      o2(0xCD,0xD2),
-          o2(0xF6,0xCB),      o2(0xF1,0xE6),
-          o2(0xED,0xC1),      o2(0xE8,0xBC),
-          o2(0xEE,0xD1),      o2(0xF0,0xE7),
-          o2(0xE2,0xCC),      o2(0xE4,0xAA),
-          o2(0xF5,0xE1),      o2(0xED,0xDA),
-          o2(0xD7,0xEE),      o2(0xD1,0xF1),
-          o2(0xE9,0xEB),      o2(0xE9,0xEC),
-          o2(0xE0,0xE4),      o2(0xDA,0xA7),
-          o2(0xDD,0xD4),      o2(0xEA,0xA3),
-          o2(0xD6,0xC3),      o2(0xD6,0xF4),
-          o2(0xDA,0xDF),      o2(0xEF,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1B = {
-    to_EUC_KR_E9_1B_offsets,
-    to_CP949_E9_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1C_infos[15] = {
-          o2(0xE2,0xCD),      o2(0xEF,0xFD),
-          o2(0xF2,0xE8),      o2(0xEF,0xC5),
-          o2(0xE7,0xE7),      o2(0xD7,0xFD),
-          o2(0xE7,0xCE),      o2(0xDF,0xDC),
-          o2(0xF9,0xC7),      o2(0xD9,0xF6),
-          o2(0xDF,0xAC),      o2(0xD6,0xDA),
-          o2(0xDC,0xA4),      o2(0xF0,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1C = {
-    to_EUC_KR_E9_1C_offsets,
-    to_CP949_E9_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1D_infos[15] = {
-          o2(0xD5,0xFA),      o2(0xE4,0xF7),
-          o2(0xD6,0xC4),      o2(0xF4,0xEC),
-          o2(0xEF,0xFE),      o2(0xF0,0xA1),
-          o2(0xDE,0xAA),      o2(0xDA,0xBC),
-          o2(0xD8,0xFC),      o2(0xFA,0xD4),
-          o2(0xEC,0xE5),      o2(0xFC,0xA8),
-          o2(0xEC,0xE6),      o2(0xD8,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1D = {
-    to_EUC_KR_E9_1D_offsets,
-    to_CP949_E9_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1E_infos[8] = {
-          o2(0xFB,0xB9),      o2(0xE4,0xD3),
-          o2(0xCD,0xF9),      o2(0xCF,0xD3),
-          o2(0xCA,0xEA),      o2(0xCF,0xD4),
-          o2(0xF8,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1E = {
-    to_EUC_KR_E9_1E_offsets,
-    to_CP949_E9_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_1F_infos[9] = {
-          o2(0xF4,0xC7),      o2(0xEA,0xDF),
-          o2(0xF9,0xDB),      o2(0xD4,0xB7),
-          o2(0xEB,0xE5),      o2(0xE1,0xD2),
-          o2(0xEA,0xA4),      o2(0xFA,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_1F = {
-    to_EUC_KR_E9_1F_offsets,
-    to_CP949_E9_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_20_infos[21] = {
-          o2(0xFB,0xE1),      o2(0xFA,0xED),
-          o2(0xF0,0xA2),      o2(0xCC,0xF1),
-          o2(0xFA,0xA3),      o2(0xE2,0xF7),
-          o2(0xE2,0xCE),      o2(0xE9,0xF5),
-          o2(0xE1,0xEB),      o2(0xE7,0xE8),
-          o2(0xE8,0xD7),      o2(0xDA,0xF8),
-          o2(0xD4,0xCB),      o2(0xF7,0xF6),
-          o2(0xD6,0xC5),      o2(0xD4,0xE9),
-          o2(0xFA,0xFA),      o2(0xCC,0xF2),
-          o2(0xF7,0xDD),      o2(0xDE,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_20 = {
-    to_EUC_KR_E9_20_offsets,
-    to_CP949_E9_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_21_infos[13] = {
-          o2(0xCE,0xA8),      o2(0xF0,0xB9),
-          o2(0xE4,0xFE),      o2(0xE4,0xC9),
-          o2(0xE4,0xD4),      o2(0xEA,0xC3),
-          o2(0xEF,0xB4),      o2(0xD7,0xBE),
-          o2(0xFB,0xE2),      o2(0xCD,0xD3),
-          o2(0xEF,0xB5),      o2(0xFA,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_21 = {
-    to_EUC_KR_E9_21_offsets,
-    to_CP949_E9_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_22_infos[4] = {
-          o2(0xF9,0xA6),      o2(0xDF,0xBD),
-          o2(0xF7,0xC7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_22 = {
-    to_EUC_KR_E9_22_offsets,
-    to_CP949_E9_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_23_infos[15] = {
-          o2(0xF8,0xFD),      o2(0xF8,0xFC),
-          o2(0xDE,0xAB),      o2(0xDB,0xE8),
-          o2(0xE3,0xDD),      o2(0xE1,0xE2),
-          o2(0xD1,0xC6),      o2(0xF6,0xD0),
-          o2(0xEB,0xE6),      o2(0xDA,0xF9),
-          o2(0xEC,0xC7),      o2(0xDE,0xF8),
-          o2(0xF8,0xE9),      o2(0xE3,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_23 = {
-    to_EUC_KR_E9_23_offsets,
-    to_CP949_E9_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_24_infos[11] = {
-          o2(0xCE,0xF5),      o2(0xFA,0xC3),
-          o2(0xE5,0xD7),      o2(0xEC,0xC8),
-          o2(0xF3,0xC9),      o2(0xE4,0xBB),
-          o2(0xE6,0xAE),      o2(0xEF,0xB6),
-          o2(0xDC,0xBF),      o2(0xCE,0xBD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_24 = {
-    to_EUC_KR_E9_24_offsets,
-    to_CP949_E9_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_25_infos[10] = {
-          o2(0xD8,0xC3),      o2(0xD0,0xCF),
-          o2(0xCF,0xFA),      o2(0xF3,0xCA),
-          o2(0xE0,0xD7),      o2(0xD1,0xC7),
-          o2(0xE9,0xAE),      o2(0xE8,0xBD),
-          o2(0xFA,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_25 = {
-    to_EUC_KR_E9_25_offsets,
-    to_CP949_E9_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_26_infos[13] = {
-          o2(0xE2,0xCF),      o2(0xFA,0xC5),
-          o2(0xF9,0xB8),      o2(0xDC,0xE0),
-          o2(0xFB,0xB0),      o2(0xD8,0xA9),
-          o2(0xE5,0xDF),      o2(0xF9,0xA7),
-          o2(0xF6,0xEE),      o2(0xF6,0xCC),
-          o2(0xE2,0xF8),      o2(0xEC,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_26 = {
-    to_EUC_KR_E9_26_offsets,
-    to_CP949_E9_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_27_infos[12] = {
-          o2(0xDA,0xE0),      o2(0xF1,0xD2),
-          o2(0xD2,0xCC),      o2(0xCF,0xCB),
-          o2(0xCA,0xBD),      o2(0xDD,0xBF),
-          o2(0xF6,0xEF),      o2(0xDE,0xF9),
-          o2(0xFA,0xB4),      o2(0xD5,0xAD),
-          o2(0xF1,0xE7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_27 = {
-    to_EUC_KR_E9_27_offsets,
-    to_CP949_E9_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_28_infos[10] = {
-          o2(0xDE,0xBE),      o2(0xDC,0xC0),
-          o2(0xD1,0xC8),      o2(0xD1,0xC9),
-          o2(0xF8,0xBE),      o2(0xCB,0xF6),
-          o2(0xD4,0xF9),      o2(0xF5,0xE2),
-          o2(0xE1,0xD3),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_28 = {
-    to_EUC_KR_E9_28_offsets,
-    to_CP949_E9_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_29_infos[14] = {
-          o2(0xD8,0xE9),      o2(0xF8,0xFE),
-          o2(0xCF,0xCC),      o2(0xFD,0xA4),
-          o2(0xCE,0xF6),      o2(0xFA,0xD0),
-          o2(0xCC,0xF3),      o2(0xE6,0xBE),
-          o2(0xF6,0xAE),      o2(0xD5,0xF0),
-          o2(0xD1,0xCA),      o2(0xFC,0xBE),
-          o2(0xD5,0xF1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_29 = {
-    to_EUC_KR_E9_29_offsets,
-    to_CP949_E9_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2A_infos[3] = {
-          o2(0xCD,0xE9),      o2(0xFA,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2A = {
-    to_EUC_KR_E9_2A_offsets,
-    to_CP949_E9_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2B_infos[6] = {
-          o2(0xE2,0xD0),      o2(0xF4,0xF7),
-          o2(0xCD,0xD4),      o2(0xE7,0xA3),
-          o2(0xDB,0xA5),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2B = {
-    to_EUC_KR_E9_2B_offsets,
-    to_CP949_E9_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2C_infos[6] = {
-          o2(0xE2,0xD1),      o2(0xD7,0xA2),
-          o2(0xF7,0xE3),      o2(0xEA,0xA6),
-          o2(0xD0,0xA1),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2C = {
-    to_EUC_KR_E9_2C_offsets,
-    to_CP949_E9_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2D_infos[10] = {
-          o2(0xCE,0xDA),      o2(0xFB,0xEB),
-          o2(0xDB,0xA6),      o2(0xDB,0xDE),
-          o2(0xD8,0xE5),      o2(0xEA,0xE0),
-          o2(0xD8,0xAA),      o2(0xE5,0xE0),
-          o2(0xD6,0xDB),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2D = {
-    to_EUC_KR_E9_2D_offsets,
-    to_CP949_E9_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2E_infos[6] = {
-          o2(0xEF,0xC6),      o2(0xF8,0xEA),
-          o2(0xE4,0xD5),      o2(0xCE,0xF7),
-          o2(0xE0,0xD8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2E = {
-    to_EUC_KR_E9_2E_offsets,
-    to_CP949_E9_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_2F_infos[5] = {
-          o2(0xD7,0xEF),      o2(0xF4,0xED),
-          o2(0xCD,0xE6),      o2(0xCC,0xF4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_2F = {
-    to_EUC_KR_E9_2F_offsets,
-    to_CP949_E9_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_30_infos[8] = {
-          o2(0xF5,0xE3),      o2(0xE4,0xCA),
-          o2(0xDC,0xE1),      o2(0xF9,0xC8),
-          o2(0xFC,0xBF),      o2(0xE8,0xA7),
-          o2(0xD8,0xC4),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_30 = {
-    to_EUC_KR_E9_30_offsets,
-    to_CP949_E9_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_31_infos[4] = {
-          o2(0xCB,0xBE),      o2(0xDC,0xAE),
-          o2(0xD7,0xF7),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_31 = {
-    to_EUC_KR_E9_31_offsets,
-    to_CP949_E9_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_33_infos[7] = {
-          o2(0xF0,0xE8),      o2(0xDD,0xC0),
-          o2(0xCF,0xCD),      o2(0xDC,0xF3),
-          o2(0xD9,0xB0),      o2(0xE6,0xE9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_33 = {
-    to_EUC_KR_E9_33_offsets,
-    to_CP949_E9_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_34_infos[6] = {
-          o2(0xE4,0xBC),      o2(0xEA,0xC4),
-          o2(0xE4,0xEC),      o2(0xE4,0xE5),
-          o2(0xFB,0xF8),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_34 = {
-    to_EUC_KR_E9_34_offsets,
-    to_CP949_E9_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_35_infos[7] = {
-          o2(0xCC,0xBB),      o2(0xE4,0xBD),
-          o2(0xCD,0xDC),      o2(0xD9,0xF7),
-          o2(0xDD,0xDF),      o2(0xED,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_35 = {
-    to_EUC_KR_E9_35_offsets,
-    to_CP949_E9_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_36_infos[4] = {
-          o2(0xD9,0xD0),      o2(0xE5,0xA3),
-          o2(0xF9,0xCD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_36 = {
-    to_EUC_KR_E9_36_offsets,
-    to_CP949_E9_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_37_infos[7] = {
-          o2(0xCD,0xAE),      o2(0xCF,0xCE),
-          o2(0xF6,0xAF),      o2(0xFD,0xD3),
-          o2(0xEB,0xED),      o2(0xD6,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_37 = {
-    to_EUC_KR_E9_37_offsets,
-    to_CP949_E9_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_38_infos[3] = {
-          o2(0xE5,0xA4),      o2(0xD5,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_38 = {
-    to_EUC_KR_E9_38_offsets,
-    to_CP949_E9_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_39_infos[5] = {
-          o2(0xD6,0xDD),      o2(0xF9,0xE9),
-          o2(0xE7,0xA4),      o2(0xD6,0xE3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_39 = {
-    to_EUC_KR_E9_39_offsets,
-    to_CP949_E9_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_3A_infos[11] = {
-          o2(0xD1,0xCB),      o2(0xD6,0xE4),
-          o2(0xD5,0xF2),      o2(0xDE,0xFA),
-          o2(0xD7,0xF8),      o2(0xD8,0xEA),
-          o2(0xCF,0xD5),      o2(0xD8,0xFD),
-          o2(0xD8,0xAB),      o2(0xFD,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_3A = {
-    to_EUC_KR_E9_3A_offsets,
-    to_CP949_E9_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_3B_infos[12] = {
-          o2(0xFC,0xDC),      o2(0xE0,0xA8),
-          o2(0xD5,0xF3),      o2(0xFD,0xD9),
-          o2(0xCC,0xA3),      o2(0xD9,0xF9),
-          o2(0xD3,0xEA),      o2(0xF5,0xF5),
-          o2(0xEF,0xC7),      o2(0xD3,0xDA),
-          o2(0xDA,0xBD),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_3B = {
-    to_EUC_KR_E9_3B_offsets,
-    to_CP949_E9_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_3C_infos[7] = {
-          o2(0xE8,0xA8),      o2(0xDC,0xAF),
-          o2(0xF0,0xA3),      o2(0xCD,0xD5),
-          o2(0xE0,0xA9),      o2(0xDE,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_3C = {
-    to_EUC_KR_E9_3C_offsets,
-    to_CP949_E9_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_3D_infos[11] = {
-          o2(0xF0,0xBA),      o2(0xEE,0xB1),
-          o2(0xEE,0xB2),      o2(0xF6,0xCD),
-          o2(0xEE,0xD2),      o2(0xD6,0xC6),
-          o2(0xE0,0xE5),      o2(0xF3,0xBB),
-          o2(0xE5,0xE1),      o2(0xE4,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_3D = {
-    to_EUC_KR_E9_3D_offsets,
-    to_CP949_E9_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_3E_infos[5] = {
-          o2(0xD7,0xA3),      o2(0xDB,0xC2),
-          o2(0xCA,0xFE),      o2(0xCF,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9_3E = {
-    to_EUC_KR_E9_3E_offsets,
-    to_CP949_E9_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_E9_infos[60] = {
-        &to_CP949_E9_00,    &to_CP949_E9_01,
-        &to_CP949_E9_02,    &to_CP949_E9_03,
-        &to_CP949_E9_04,    &to_CP949_E9_05,
-        &to_CP949_E9_06,    &to_CP949_E9_07,
-        &to_CP949_E9_08,    &to_CP949_E9_09,
-        &to_CP949_E9_0A,    &to_CP949_E9_0B,
-        &to_CP949_E9_0C,    &to_CP949_E9_0D,
-        &to_CP949_E9_0E,    &to_CP949_E9_0F,
-        &to_CP949_E9_10,    &to_CP949_E9_11,
-        &to_CP949_E9_15,    &to_CP949_E9_16,
-        &to_CP949_E9_17,    &to_CP949_E9_18,
-        &to_CP949_E9_19,    &to_CP949_E9_1A,
-        &to_CP949_E9_1B,    &to_CP949_E9_1C,
-        &to_CP949_E9_1D,    &to_CP949_E9_1E,
-        &to_CP949_E9_1F,    &to_CP949_E9_20,
-        &to_CP949_E9_21,    &to_CP949_E9_22,
-        &to_CP949_E9_23,    &to_CP949_E9_24,
-        &to_CP949_E9_25,    &to_CP949_E9_26,
-        &to_CP949_E9_27,    &to_CP949_E9_28,
-        &to_CP949_E9_29,    &to_CP949_E9_2A,
-        &to_CP949_E9_2B,    &to_CP949_E9_2C,
-        &to_CP949_E9_2D,    &to_CP949_E9_2E,
-        &to_CP949_E9_2F,    &to_CP949_E9_30,
-        &to_CP949_E9_31,    &to_CP949_E9_33,
-        &to_CP949_E9_34,    &to_CP949_E9_35,
-        &to_CP949_E9_36,    &to_CP949_E9_37,
-        &to_CP949_E9_38,    &to_CP949_E9_39,
-        &to_CP949_E9_3A,    &to_CP949_E9_3B,
-        &to_CP949_E9_3C,    &to_CP949_E9_3D,
-        &to_CP949_E9_3E,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_E9 = {
-    to_EUC_KR_E9_offsets,
-    to_CP949_E9_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_30_infos[65] = {
-          o2(0xB0,0xA1),      o2(0xB0,0xA2),
-          o2(0x81,0x41),      o2(0x81,0x42),
-          o2(0xB0,0xA3),      o2(0x81,0x43),
-          o2(0x81,0x44),      o2(0xB0,0xA4),
-          o2(0xB0,0xA5),      o2(0xB0,0xA6),
-          o2(0xB0,0xA7),      o2(0x81,0x45),
-          o2(0x81,0x46),      o2(0x81,0x47),
-          o2(0x81,0x48),      o2(0x81,0x49),
-          o2(0xB0,0xA8),      o2(0xB0,0xA9),
-          o2(0xB0,0xAA),      o2(0xB0,0xAB),
-          o2(0xB0,0xAC),      o2(0xB0,0xAD),
-          o2(0xB0,0xAE),      o2(0xB0,0xAF),
-          o2(0x81,0x4A),      o2(0xB0,0xB0),
-          o2(0xB0,0xB1),      o2(0xB0,0xB2),
-          o2(0xB0,0xB3),      o2(0xB0,0xB4),
-          o2(0x81,0x4B),      o2(0x81,0x4C),
-          o2(0xB0,0xB5),      o2(0x81,0x4D),
-          o2(0x81,0x4E),      o2(0x81,0x4F),
-          o2(0xB0,0xB6),      o2(0x81,0x50),
-          o2(0x81,0x51),      o2(0x81,0x52),
-          o2(0x81,0x53),      o2(0x81,0x54),
-          o2(0x81,0x55),      o2(0x81,0x56),
-          o2(0xB0,0xB7),      o2(0xB0,0xB8),
-          o2(0x81,0x57),      o2(0xB0,0xB9),
-          o2(0xB0,0xBA),      o2(0xB0,0xBB),
-          o2(0x81,0x58),      o2(0x81,0x59),
-          o2(0x81,0x5A),      o2(0x81,0x61),
-          o2(0x81,0x62),      o2(0x81,0x63),
-          o2(0xB0,0xBC),      o2(0xB0,0xBD),
-          o2(0x81,0x64),      o2(0x81,0x65),
-          o2(0xB0,0xBE),      o2(0x81,0x66),
-          o2(0x81,0x67),      o2(0x81,0x68),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_30 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_31_infos[65] = {
-          o2(0xB0,0xBF),      o2(0x81,0x69),
-          o2(0x81,0x6A),      o2(0x81,0x6B),
-          o2(0x81,0x6C),      o2(0x81,0x6D),
-          o2(0x81,0x6E),      o2(0x81,0x6F),
-          o2(0x81,0x70),      o2(0x81,0x71),
-          o2(0x81,0x72),      o2(0xB0,0xC0),
-          o2(0x81,0x73),      o2(0xB0,0xC1),
-          o2(0x81,0x74),      o2(0x81,0x75),
-          o2(0x81,0x76),      o2(0x81,0x77),
-          o2(0x81,0x78),      o2(0x81,0x79),
-          o2(0xB0,0xC2),      o2(0x81,0x7A),
-          o2(0x81,0x81),      o2(0x81,0x82),
-          o2(0xB0,0xC3),      o2(0x81,0x83),
-          o2(0x81,0x84),      o2(0x81,0x85),
-          o2(0xB0,0xC4),      o2(0x81,0x86),
-          o2(0x81,0x87),      o2(0x81,0x88),
-          o2(0x81,0x89),      o2(0x81,0x8A),
-          o2(0x81,0x8B),      o2(0x81,0x8C),
-          o2(0x81,0x8D),      o2(0x81,0x8E),
-          o2(0x81,0x8F),      o2(0x81,0x90),
-          o2(0x81,0x91),      o2(0x81,0x92),
-          o2(0x81,0x93),      o2(0x81,0x94),
-          o2(0x81,0x95),      o2(0x81,0x96),
-          o2(0x81,0x97),      o2(0x81,0x98),
-          o2(0xB0,0xC5),      o2(0xB0,0xC6),
-          o2(0x81,0x99),      o2(0x81,0x9A),
-          o2(0xB0,0xC7),      o2(0x81,0x9B),
-          o2(0x81,0x9C),      o2(0xB0,0xC8),
-          o2(0xB0,0xC9),      o2(0x81,0x9D),
-          o2(0xB0,0xCA),      o2(0x81,0x9E),
-          o2(0x81,0x9F),      o2(0x81,0xA0),
-          o2(0x81,0xA1),      o2(0x81,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_31 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_32_infos[65] = {
-          o2(0xB0,0xCB),      o2(0xB0,0xCC),
-          o2(0x81,0xA3),      o2(0xB0,0xCD),
-          o2(0xB0,0xCE),      o2(0xB0,0xCF),
-          o2(0xB0,0xD0),      o2(0x81,0xA4),
-          o2(0x81,0xA5),      o2(0xB0,0xD1),
-          o2(0xB0,0xD2),      o2(0xB0,0xD3),
-          o2(0xB0,0xD4),      o2(0x81,0xA6),
-          o2(0x81,0xA7),      o2(0x81,0xA8),
-          o2(0xB0,0xD5),      o2(0x81,0xA9),
-          o2(0x81,0xAA),      o2(0x81,0xAB),
-          o2(0xB0,0xD6),      o2(0x81,0xAC),
-          o2(0x81,0xAD),      o2(0x81,0xAE),
-          o2(0x81,0xAF),      o2(0x81,0xB0),
-          o2(0x81,0xB1),      o2(0x81,0xB2),
-          o2(0xB0,0xD7),      o2(0xB0,0xD8),
-          o2(0x81,0xB3),      o2(0xB0,0xD9),
-          o2(0xB0,0xDA),      o2(0xB0,0xDB),
-          o2(0x81,0xB4),      o2(0x81,0xB5),
-          o2(0x81,0xB6),      o2(0x81,0xB7),
-          o2(0x81,0xB8),      o2(0x81,0xB9),
-          o2(0xB0,0xDC),      o2(0xB0,0xDD),
-          o2(0xB0,0xDE),      o2(0x81,0xBA),
-          o2(0xB0,0xDF),      o2(0x81,0xBB),
-          o2(0x81,0xBC),      o2(0xB0,0xE0),
-          o2(0xB0,0xE1),      o2(0x81,0xBD),
-          o2(0x81,0xBE),      o2(0x81,0xBF),
-          o2(0x81,0xC0),      o2(0x81,0xC1),
-          o2(0x81,0xC2),      o2(0x81,0xC3),
-          o2(0xB0,0xE2),      o2(0xB0,0xE3),
-          o2(0x81,0xC4),      o2(0xB0,0xE4),
-          o2(0xB0,0xE5),      o2(0xB0,0xE6),
-          o2(0x81,0xC5),      o2(0x81,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_32 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_33_infos[65] = {
-          o2(0x81,0xC7),      o2(0xB0,0xE7),
-          o2(0x81,0xC8),      o2(0x81,0xC9),
-          o2(0xB0,0xE8),      o2(0x81,0xCA),
-          o2(0x81,0xCB),      o2(0x81,0xCC),
-          o2(0xB0,0xE9),      o2(0x81,0xCD),
-          o2(0x81,0xCE),      o2(0x81,0xCF),
-          o2(0xB0,0xEA),      o2(0x81,0xD0),
-          o2(0x81,0xD1),      o2(0x81,0xD2),
-          o2(0x81,0xD3),      o2(0x81,0xD4),
-          o2(0x81,0xD5),      o2(0x81,0xD6),
-          o2(0x81,0xD7),      o2(0xB0,0xEB),
-          o2(0x81,0xD8),      o2(0xB0,0xEC),
-          o2(0x81,0xD9),      o2(0x81,0xDA),
-          o2(0x81,0xDB),      o2(0x81,0xDC),
-          o2(0x81,0xDD),      o2(0x81,0xDE),
-          o2(0x81,0xDF),      o2(0x81,0xE0),
-          o2(0xB0,0xED),      o2(0xB0,0xEE),
-          o2(0x81,0xE1),      o2(0x81,0xE2),
-          o2(0xB0,0xEF),      o2(0x81,0xE3),
-          o2(0x81,0xE4),      o2(0xB0,0xF0),
-          o2(0xB0,0xF1),      o2(0x81,0xE5),
-          o2(0xB0,0xF2),      o2(0x81,0xE6),
-          o2(0xB0,0xF3),      o2(0x81,0xE7),
-          o2(0x81,0xE8),      o2(0xB0,0xF4),
-          o2(0xB0,0xF5),      o2(0xB0,0xF6),
-          o2(0x81,0xE9),      o2(0xB0,0xF7),
-          o2(0x81,0xEA),      o2(0xB0,0xF8),
-          o2(0xB0,0xF9),      o2(0x81,0xEB),
-          o2(0x81,0xEC),      o2(0x81,0xED),
-          o2(0x81,0xEE),      o2(0x81,0xEF),
-          o2(0xB0,0xFA),      o2(0xB0,0xFB),
-          o2(0x81,0xF0),      o2(0x81,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_33 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_34_infos[65] = {
-          o2(0xB0,0xFC),      o2(0x81,0xF2),
-          o2(0x81,0xF3),      o2(0x81,0xF4),
-          o2(0xB0,0xFD),      o2(0x81,0xF5),
-          o2(0xB0,0xFE),      o2(0x81,0xF6),
-          o2(0x81,0xF7),      o2(0x81,0xF8),
-          o2(0x81,0xF9),      o2(0x81,0xFA),
-          o2(0xB1,0xA1),      o2(0xB1,0xA2),
-          o2(0x81,0xFB),      o2(0xB1,0xA3),
-          o2(0x81,0xFC),      o2(0xB1,0xA4),
-          o2(0x81,0xFD),      o2(0x81,0xFE),
-          o2(0x82,0x41),      o2(0x82,0x42),
-          o2(0x82,0x43),      o2(0x82,0x44),
-          o2(0xB1,0xA5),      o2(0x82,0x45),
-          o2(0x82,0x46),      o2(0x82,0x47),
-          o2(0xB1,0xA6),      o2(0x82,0x48),
-          o2(0x82,0x49),      o2(0x82,0x4A),
-          o2(0xB1,0xA7),      o2(0x82,0x4B),
-          o2(0x82,0x4C),      o2(0x82,0x4D),
-          o2(0x82,0x4E),      o2(0x82,0x4F),
-          o2(0x82,0x50),      o2(0x82,0x51),
-          o2(0x82,0x52),      o2(0xB1,0xA8),
-          o2(0x82,0x53),      o2(0x82,0x54),
-          o2(0xB1,0xA9),      o2(0xB1,0xAA),
-          o2(0x82,0x55),      o2(0x82,0x56),
-          o2(0x82,0x57),      o2(0x82,0x58),
-          o2(0x82,0x59),      o2(0x82,0x5A),
-          o2(0xB1,0xAB),      o2(0xB1,0xAC),
-          o2(0x82,0x61),      o2(0x82,0x62),
-          o2(0xB1,0xAD),      o2(0x82,0x63),
-          o2(0x82,0x64),      o2(0x82,0x65),
-          o2(0xB1,0xAE),      o2(0x82,0x66),
-          o2(0x82,0x67),      o2(0x82,0x68),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_34 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_35_infos[65] = {
-          o2(0x82,0x69),      o2(0x82,0x6A),
-          o2(0x82,0x6B),      o2(0x82,0x6C),
-          o2(0xB1,0xAF),      o2(0xB1,0xB0),
-          o2(0x82,0x6D),      o2(0xB1,0xB1),
-          o2(0x82,0x6E),      o2(0xB1,0xB2),
-          o2(0x82,0x6F),      o2(0x82,0x70),
-          o2(0x82,0x71),      o2(0x82,0x72),
-          o2(0x82,0x73),      o2(0x82,0x74),
-          o2(0xB1,0xB3),      o2(0x82,0x75),
-          o2(0x82,0x76),      o2(0x82,0x77),
-          o2(0xB1,0xB4),      o2(0x82,0x78),
-          o2(0x82,0x79),      o2(0x82,0x7A),
-          o2(0xB1,0xB5),      o2(0x82,0x81),
-          o2(0x82,0x82),      o2(0x82,0x83),
-          o2(0x82,0x84),      o2(0x82,0x85),
-          o2(0x82,0x86),      o2(0x82,0x87),
-          o2(0x82,0x88),      o2(0xB1,0xB6),
-          o2(0x82,0x89),      o2(0xB1,0xB7),
-          o2(0x82,0x8A),      o2(0x82,0x8B),
-          o2(0x82,0x8C),      o2(0x82,0x8D),
-          o2(0x82,0x8E),      o2(0x82,0x8F),
-          o2(0x82,0x90),      o2(0x82,0x91),
-          o2(0xB1,0xB8),      o2(0xB1,0xB9),
-          o2(0x82,0x92),      o2(0x82,0x93),
-          o2(0xB1,0xBA),      o2(0x82,0x94),
-          o2(0x82,0x95),      o2(0xB1,0xBB),
-          o2(0xB1,0xBC),      o2(0xB1,0xBD),
-          o2(0xB1,0xBE),      o2(0x82,0x96),
-          o2(0x82,0x97),      o2(0x82,0x98),
-          o2(0x82,0x99),      o2(0xB1,0xBF),
-          o2(0xB1,0xC0),      o2(0xB1,0xC1),
-          o2(0x82,0x9A),      o2(0xB1,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_35 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_36_infos[65] = {
-          o2(0x82,0x9B),      o2(0xB1,0xC3),
-          o2(0xB1,0xC4),      o2(0x82,0x9C),
-          o2(0x82,0x9D),      o2(0x82,0x9E),
-          o2(0x82,0x9F),      o2(0x82,0xA0),
-          o2(0xB1,0xC5),      o2(0xB1,0xC6),
-          o2(0x82,0xA1),      o2(0x82,0xA2),
-          o2(0xB1,0xC7),      o2(0x82,0xA3),
-          o2(0x82,0xA4),      o2(0x82,0xA5),
-          o2(0xB1,0xC8),      o2(0x82,0xA6),
-          o2(0x82,0xA7),      o2(0x82,0xA8),
-          o2(0x82,0xA9),      o2(0x82,0xAA),
-          o2(0x82,0xAB),      o2(0x82,0xAC),
-          o2(0x82,0xAD),      o2(0x82,0xAE),
-          o2(0x82,0xAF),      o2(0x82,0xB0),
-          o2(0xB1,0xC9),      o2(0xB1,0xCA),
-          o2(0x82,0xB1),      o2(0x82,0xB2),
-          o2(0x82,0xB3),      o2(0x82,0xB4),
-          o2(0x82,0xB5),      o2(0x82,0xB6),
-          o2(0xB1,0xCB),      o2(0x82,0xB7),
-          o2(0x82,0xB8),      o2(0x82,0xB9),
-          o2(0x82,0xBA),      o2(0x82,0xBB),
-          o2(0x82,0xBC),      o2(0x82,0xBD),
-          o2(0x82,0xBE),      o2(0x82,0xBF),
-          o2(0x82,0xC0),      o2(0x82,0xC1),
-          o2(0x82,0xC2),      o2(0x82,0xC3),
-          o2(0x82,0xC4),      o2(0x82,0xC5),
-          o2(0x82,0xC6),      o2(0x82,0xC7),
-          o2(0x82,0xC8),      o2(0xB1,0xCC),
-          o2(0x82,0xC9),      o2(0x82,0xCA),
-          o2(0x82,0xCB),      o2(0x82,0xCC),
-          o2(0x82,0xCD),      o2(0x82,0xCE),
-          o2(0x82,0xCF),      o2(0x82,0xD0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_36 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_37_infos[65] = {
-          o2(0xB1,0xCD),      o2(0xB1,0xCE),
-          o2(0x82,0xD1),      o2(0x82,0xD2),
-          o2(0xB1,0xCF),      o2(0x82,0xD3),
-          o2(0x82,0xD4),      o2(0x82,0xD5),
-          o2(0xB1,0xD0),      o2(0x82,0xD6),
-          o2(0x82,0xD7),      o2(0x82,0xD8),
-          o2(0x82,0xD9),      o2(0x82,0xDA),
-          o2(0x82,0xDB),      o2(0x82,0xDC),
-          o2(0xB1,0xD1),      o2(0xB1,0xD2),
-          o2(0x82,0xDD),      o2(0xB1,0xD3),
-          o2(0x82,0xDE),      o2(0x82,0xDF),
-          o2(0x82,0xE0),      o2(0x82,0xE1),
-          o2(0x82,0xE2),      o2(0x82,0xE3),
-          o2(0x82,0xE4),      o2(0x82,0xE5),
-          o2(0xB1,0xD4),      o2(0x82,0xE6),
-          o2(0x82,0xE7),      o2(0x82,0xE8),
-          o2(0xB1,0xD5),      o2(0x82,0xE9),
-          o2(0x82,0xEA),      o2(0x82,0xEB),
-          o2(0xB1,0xD6),      o2(0x82,0xEC),
-          o2(0x82,0xED),      o2(0x82,0xEE),
-          o2(0x82,0xEF),      o2(0x82,0xF0),
-          o2(0x82,0xF1),      o2(0x82,0xF2),
-          o2(0x82,0xF3),      o2(0x82,0xF4),
-          o2(0x82,0xF5),      o2(0x82,0xF6),
-          o2(0x82,0xF7),      o2(0x82,0xF8),
-          o2(0x82,0xF9),      o2(0x82,0xFA),
-          o2(0x82,0xFB),      o2(0x82,0xFC),
-          o2(0x82,0xFD),      o2(0x82,0xFE),
-          o2(0xB1,0xD7),      o2(0xB1,0xD8),
-          o2(0x83,0x41),      o2(0x83,0x42),
-          o2(0xB1,0xD9),      o2(0x83,0x43),
-          o2(0x83,0x44),      o2(0xB1,0xDA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_37 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_38_infos[65] = {
-          o2(0xB1,0xDB),      o2(0xB1,0xDC),
-          o2(0x83,0x45),      o2(0x83,0x46),
-          o2(0x83,0x47),      o2(0x83,0x48),
-          o2(0x83,0x49),      o2(0x83,0x4A),
-          o2(0xB1,0xDD),      o2(0xB1,0xDE),
-          o2(0x83,0x4B),      o2(0xB1,0xDF),
-          o2(0x83,0x4C),      o2(0xB1,0xE0),
-          o2(0x83,0x4D),      o2(0x83,0x4E),
-          o2(0x83,0x4F),      o2(0x83,0x50),
-          o2(0x83,0x51),      o2(0x83,0x52),
-          o2(0xB1,0xE1),      o2(0x83,0x53),
-          o2(0x83,0x54),      o2(0x83,0x55),
-          o2(0x83,0x56),      o2(0x83,0x57),
-          o2(0x83,0x58),      o2(0x83,0x59),
-          o2(0x83,0x5A),      o2(0x83,0x61),
-          o2(0x83,0x62),      o2(0x83,0x63),
-          o2(0x83,0x64),      o2(0x83,0x65),
-          o2(0x83,0x66),      o2(0x83,0x67),
-          o2(0x83,0x68),      o2(0x83,0x69),
-          o2(0x83,0x6A),      o2(0x83,0x6B),
-          o2(0x83,0x6C),      o2(0x83,0x6D),
-          o2(0x83,0x6E),      o2(0x83,0x6F),
-          o2(0x83,0x70),      o2(0x83,0x71),
-          o2(0x83,0x72),      o2(0x83,0x73),
-          o2(0xB1,0xE2),      o2(0xB1,0xE3),
-          o2(0x83,0x74),      o2(0x83,0x75),
-          o2(0xB1,0xE4),      o2(0x83,0x76),
-          o2(0x83,0x77),      o2(0xB1,0xE5),
-          o2(0xB1,0xE6),      o2(0x83,0x78),
-          o2(0xB1,0xE7),      o2(0x83,0x79),
-          o2(0x83,0x7A),      o2(0x83,0x81),
-          o2(0x83,0x82),      o2(0x83,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_38 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_39_infos[65] = {
-          o2(0xB1,0xE8),      o2(0xB1,0xE9),
-          o2(0x83,0x84),      o2(0xB1,0xEA),
-          o2(0x83,0x85),      o2(0xB1,0xEB),
-          o2(0xB1,0xEC),      o2(0x83,0x86),
-          o2(0x83,0x87),      o2(0x83,0x88),
-          o2(0xB1,0xED),      o2(0x83,0x89),
-          o2(0xB1,0xEE),      o2(0xB1,0xEF),
-          o2(0xB1,0xF0),      o2(0x83,0x8A),
-          o2(0xB1,0xF1),      o2(0x83,0x8B),
-          o2(0x83,0x8C),      o2(0x83,0x8D),
-          o2(0xB1,0xF2),      o2(0x83,0x8E),
-          o2(0xB1,0xF3),      o2(0x83,0x8F),
-          o2(0x83,0x90),      o2(0x83,0x91),
-          o2(0x83,0x92),      o2(0x83,0x93),
-          o2(0xB1,0xF4),      o2(0xB1,0xF5),
-          o2(0x83,0x94),      o2(0xB1,0xF6),
-          o2(0xB1,0xF7),      o2(0xB1,0xF8),
-          o2(0x83,0x95),      o2(0x83,0x96),
-          o2(0x83,0x97),      o2(0xB1,0xF9),
-          o2(0x83,0x98),      o2(0x83,0x99),
-          o2(0xB1,0xFA),      o2(0xB1,0xFB),
-          o2(0x83,0x9A),      o2(0x83,0x9B),
-          o2(0xB1,0xFC),      o2(0x83,0x9C),
-          o2(0x83,0x9D),      o2(0x83,0x9E),
-          o2(0xB1,0xFD),      o2(0x83,0x9F),
-          o2(0x83,0xA0),      o2(0x83,0xA1),
-          o2(0x83,0xA2),      o2(0x83,0xA3),
-          o2(0x83,0xA4),      o2(0x83,0xA5),
-          o2(0xB1,0xFE),      o2(0xB2,0xA1),
-          o2(0x83,0xA6),      o2(0xB2,0xA2),
-          o2(0xB2,0xA3),      o2(0xB2,0xA4),
-          o2(0x83,0xA7),      o2(0x83,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_39 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3A_infos[65] = {
-          o2(0x83,0xA9),      o2(0x83,0xAA),
-          o2(0x83,0xAB),      o2(0x83,0xAC),
-          o2(0xB2,0xA5),      o2(0xB2,0xA6),
-          o2(0x83,0xAD),      o2(0x83,0xAE),
-          o2(0x83,0xAF),      o2(0x83,0xB0),
-          o2(0x83,0xB1),      o2(0x83,0xB2),
-          o2(0xB2,0xA7),      o2(0x83,0xB3),
-          o2(0x83,0xB4),      o2(0x83,0xB5),
-          o2(0x83,0xB6),      o2(0x83,0xB7),
-          o2(0x83,0xB8),      o2(0x83,0xB9),
-          o2(0x83,0xBA),      o2(0x83,0xBB),
-          o2(0x83,0xBC),      o2(0x83,0xBD),
-          o2(0x83,0xBE),      o2(0x83,0xBF),
-          o2(0x83,0xC0),      o2(0x83,0xC1),
-          o2(0x83,0xC2),      o2(0x83,0xC3),
-          o2(0x83,0xC4),      o2(0x83,0xC5),
-          o2(0x83,0xC6),      o2(0x83,0xC7),
-          o2(0x83,0xC8),      o2(0x83,0xC9),
-          o2(0x83,0xCA),      o2(0x83,0xCB),
-          o2(0x83,0xCC),      o2(0x83,0xCD),
-          o2(0x83,0xCE),      o2(0x83,0xCF),
-          o2(0x83,0xD0),      o2(0x83,0xD1),
-          o2(0x83,0xD2),      o2(0x83,0xD3),
-          o2(0x83,0xD4),      o2(0x83,0xD5),
-          o2(0x83,0xD6),      o2(0x83,0xD7),
-          o2(0x83,0xD8),      o2(0x83,0xD9),
-          o2(0x83,0xDA),      o2(0x83,0xDB),
-          o2(0x83,0xDC),      o2(0x83,0xDD),
-          o2(0x83,0xDE),      o2(0x83,0xDF),
-          o2(0x83,0xE0),      o2(0x83,0xE1),
-          o2(0xB2,0xA8),      o2(0xB2,0xA9),
-          o2(0xB2,0xAA),      o2(0x83,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3B_infos[65] = {
-          o2(0xB2,0xAB),      o2(0x83,0xE3),
-          o2(0x83,0xE4),      o2(0x83,0xE5),
-          o2(0xB2,0xAC),      o2(0x83,0xE6),
-          o2(0x83,0xE7),      o2(0x83,0xE8),
-          o2(0x83,0xE9),      o2(0x83,0xEA),
-          o2(0x83,0xEB),      o2(0x83,0xEC),
-          o2(0xB2,0xAD),      o2(0xB2,0xAE),
-          o2(0x83,0xED),      o2(0xB2,0xAF),
-          o2(0xB2,0xB0),      o2(0xB2,0xB1),
-          o2(0x83,0xEE),      o2(0x83,0xEF),
-          o2(0x83,0xF0),      o2(0x83,0xF1),
-          o2(0x83,0xF2),      o2(0x83,0xF3),
-          o2(0xB2,0xB2),      o2(0xB2,0xB3),
-          o2(0x83,0xF4),      o2(0x83,0xF5),
-          o2(0xB2,0xB4),      o2(0x83,0xF6),
-          o2(0x83,0xF7),      o2(0x83,0xF8),
-          o2(0x83,0xF9),      o2(0x83,0xFA),
-          o2(0x83,0xFB),      o2(0x83,0xFC),
-          o2(0x83,0xFD),      o2(0x83,0xFE),
-          o2(0x84,0x41),      o2(0x84,0x42),
-          o2(0xB2,0xB5),      o2(0x84,0x43),
-          o2(0x84,0x44),      o2(0xB2,0xB6),
-          o2(0x84,0x45),      o2(0xB2,0xB7),
-          o2(0x84,0x46),      o2(0x84,0x47),
-          o2(0x84,0x48),      o2(0x84,0x49),
-          o2(0x84,0x4A),      o2(0x84,0x4B),
-          o2(0xB2,0xB8),      o2(0x84,0x4C),
-          o2(0x84,0x4D),      o2(0x84,0x4E),
-          o2(0xB2,0xB9),      o2(0x84,0x4F),
-          o2(0x84,0x50),      o2(0x84,0x51),
-          o2(0xB2,0xBA),      o2(0x84,0x52),
-          o2(0x84,0x53),      o2(0x84,0x54),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3C_infos[65] = {
-          o2(0x84,0x55),      o2(0x84,0x56),
-          o2(0x84,0x57),      o2(0x84,0x58),
-          o2(0x84,0x59),      o2(0x84,0x5A),
-          o2(0x84,0x61),      o2(0xB2,0xBB),
-          o2(0xB2,0xBC),      o2(0x84,0x62),
-          o2(0x84,0x63),      o2(0x84,0x64),
-          o2(0x84,0x65),      o2(0xB2,0xBD),
-          o2(0x84,0x66),      o2(0x84,0x67),
-          o2(0xB2,0xBE),      o2(0x84,0x68),
-          o2(0x84,0x69),      o2(0x84,0x6A),
-          o2(0x84,0x6B),      o2(0x84,0x6C),
-          o2(0x84,0x6D),      o2(0x84,0x6E),
-          o2(0x84,0x6F),      o2(0x84,0x70),
-          o2(0x84,0x71),      o2(0x84,0x72),
-          o2(0x84,0x73),      o2(0x84,0x74),
-          o2(0x84,0x75),      o2(0x84,0x76),
-          o2(0x84,0x77),      o2(0x84,0x78),
-          o2(0x84,0x79),      o2(0x84,0x7A),
-          o2(0x84,0x81),      o2(0x84,0x82),
-          o2(0x84,0x83),      o2(0x84,0x84),
-          o2(0x84,0x85),      o2(0x84,0x86),
-          o2(0x84,0x87),      o2(0x84,0x88),
-          o2(0xB2,0xBF),      o2(0xB2,0xC0),
-          o2(0x84,0x89),      o2(0x84,0x8A),
-          o2(0xB2,0xC1),      o2(0x84,0x8B),
-          o2(0xB2,0xC2),      o2(0x84,0x8C),
-          o2(0xB2,0xC3),      o2(0x84,0x8D),
-          o2(0x84,0x8E),      o2(0x84,0x8F),
-          o2(0x84,0x90),      o2(0x84,0x91),
-          o2(0x84,0x92),      o2(0x84,0x93),
-          o2(0xB2,0xC4),      o2(0xB2,0xC5),
-          o2(0x84,0x94),      o2(0xB2,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3D_infos[65] = {
-          o2(0x84,0x95),      o2(0xB2,0xC7),
-          o2(0xB2,0xC8),      o2(0xB2,0xC9),
-          o2(0x84,0x96),      o2(0x84,0x97),
-          o2(0x84,0x98),      o2(0x84,0x99),
-          o2(0xB2,0xCA),      o2(0xB2,0xCB),
-          o2(0x84,0x9A),      o2(0x84,0x9B),
-          o2(0x84,0x9C),      o2(0x84,0x9D),
-          o2(0x84,0x9E),      o2(0x84,0x9F),
-          o2(0xB2,0xCC),      o2(0x84,0xA0),
-          o2(0x84,0xA1),      o2(0x84,0xA2),
-          o2(0x84,0xA3),      o2(0x84,0xA4),
-          o2(0x84,0xA5),      o2(0x84,0xA6),
-          o2(0x84,0xA7),      o2(0x84,0xA8),
-          o2(0x84,0xA9),      o2(0x84,0xAA),
-          o2(0xB2,0xCD),      o2(0xB2,0xCE),
-          o2(0x84,0xAB),      o2(0x84,0xAC),
-          o2(0x84,0xAD),      o2(0x84,0xAE),
-          o2(0x84,0xAF),      o2(0x84,0xB0),
-          o2(0xB2,0xCF),      o2(0xB2,0xD0),
-          o2(0x84,0xB1),      o2(0x84,0xB2),
-          o2(0x84,0xB3),      o2(0x84,0xB4),
-          o2(0x84,0xB5),      o2(0x84,0xB6),
-          o2(0x84,0xB7),      o2(0x84,0xB8),
-          o2(0x84,0xB9),      o2(0x84,0xBA),
-          o2(0x84,0xBB),      o2(0x84,0xBC),
-          o2(0x84,0xBD),      o2(0x84,0xBE),
-          o2(0x84,0xBF),      o2(0x84,0xC0),
-          o2(0x84,0xC1),      o2(0x84,0xC2),
-          o2(0x84,0xC3),      o2(0xB2,0xD1),
-          o2(0x84,0xC4),      o2(0x84,0xC5),
-          o2(0x84,0xC6),      o2(0x84,0xC7),
-          o2(0x84,0xC8),      o2(0x84,0xC9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3E_infos[65] = {
-          o2(0xB2,0xD2),      o2(0x84,0xCA),
-          o2(0x84,0xCB),      o2(0x84,0xCC),
-          o2(0xB2,0xD3),      o2(0x84,0xCD),
-          o2(0x84,0xCE),      o2(0x84,0xCF),
-          o2(0xB2,0xD4),      o2(0x84,0xD0),
-          o2(0x84,0xD1),      o2(0x84,0xD2),
-          o2(0x84,0xD3),      o2(0x84,0xD4),
-          o2(0x84,0xD5),      o2(0x84,0xD6),
-          o2(0xB2,0xD5),      o2(0xB2,0xD6),
-          o2(0x84,0xD7),      o2(0x84,0xD8),
-          o2(0x84,0xD9),      o2(0xB2,0xD7),
-          o2(0x84,0xDA),      o2(0x84,0xDB),
-          o2(0x84,0xDC),      o2(0x84,0xDD),
-          o2(0x84,0xDE),      o2(0x84,0xDF),
-          o2(0xB2,0xD8),      o2(0x84,0xE0),
-          o2(0x84,0xE1),      o2(0x84,0xE2),
-          o2(0x84,0xE3),      o2(0x84,0xE4),
-          o2(0x84,0xE5),      o2(0x84,0xE6),
-          o2(0x84,0xE7),      o2(0x84,0xE8),
-          o2(0x84,0xE9),      o2(0x84,0xEA),
-          o2(0x84,0xEB),      o2(0x84,0xEC),
-          o2(0x84,0xED),      o2(0x84,0xEE),
-          o2(0x84,0xEF),      o2(0x84,0xF0),
-          o2(0x84,0xF1),      o2(0x84,0xF2),
-          o2(0x84,0xF3),      o2(0x84,0xF4),
-          o2(0x84,0xF5),      o2(0x84,0xF6),
-          o2(0x84,0xF7),      o2(0x84,0xF8),
-          o2(0x84,0xF9),      o2(0x84,0xFA),
-          o2(0xB2,0xD9),      o2(0xB2,0xDA),
-          o2(0x84,0xFB),      o2(0x84,0xFC),
-          o2(0xB2,0xDB),      o2(0x84,0xFD),
-          o2(0x84,0xFE),      o2(0x85,0x41),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_3F_infos[65] = {
-          o2(0xB2,0xDC),      o2(0x85,0x42),
-          o2(0x85,0x43),      o2(0x85,0x44),
-          o2(0x85,0x45),      o2(0x85,0x46),
-          o2(0x85,0x47),      o2(0xB2,0xDD),
-          o2(0xB2,0xDE),      o2(0xB2,0xDF),
-          o2(0x85,0x48),      o2(0xB2,0xE0),
-          o2(0x85,0x49),      o2(0xB2,0xE1),
-          o2(0xB2,0xE2),      o2(0x85,0x4A),
-          o2(0x85,0x4B),      o2(0x85,0x4C),
-          o2(0x85,0x4D),      o2(0x85,0x4E),
-          o2(0xB2,0xE3),      o2(0x85,0x4F),
-          o2(0x85,0x50),      o2(0x85,0x51),
-          o2(0x85,0x52),      o2(0x85,0x53),
-          o2(0x85,0x54),      o2(0x85,0x55),
-          o2(0xB2,0xE4),      o2(0x85,0x56),
-          o2(0x85,0x57),      o2(0x85,0x58),
-          o2(0x85,0x59),      o2(0x85,0x5A),
-          o2(0x85,0x61),      o2(0x85,0x62),
-          o2(0x85,0x63),      o2(0x85,0x64),
-          o2(0x85,0x65),      o2(0x85,0x66),
-          o2(0xB2,0xE5),      o2(0xB2,0xE6),
-          o2(0x85,0x67),      o2(0x85,0x68),
-          o2(0x85,0x69),      o2(0x85,0x6A),
-          o2(0x85,0x6B),      o2(0x85,0x6C),
-          o2(0xB2,0xE7),      o2(0xB2,0xE8),
-          o2(0x85,0x6D),      o2(0x85,0x6E),
-          o2(0xB2,0xE9),      o2(0x85,0x6F),
-          o2(0x85,0x70),      o2(0x85,0x71),
-          o2(0xB2,0xEA),      o2(0x85,0x72),
-          o2(0x85,0x73),      o2(0x85,0x74),
-          o2(0x85,0x75),      o2(0x85,0x76),
-          o2(0x85,0x77),      o2(0x85,0x78),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA_3F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EA_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EA_infos[17] = {
-        &to_CP949_EA_30,    &to_CP949_EA_31,
-        &to_CP949_EA_32,    &to_CP949_EA_33,
-        &to_CP949_EA_34,    &to_CP949_EA_35,
-        &to_CP949_EA_36,    &to_CP949_EA_37,
-        &to_CP949_EA_38,    &to_CP949_EA_39,
-        &to_CP949_EA_3A,    &to_CP949_EA_3B,
-        &to_CP949_EA_3C,    &to_CP949_EA_3D,
-        &to_CP949_EA_3E,    &to_CP949_EA_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EA = {
-    to_EUC_KR_EA_offsets,
-    to_CP949_EA_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_00_infos[65] = {
-          o2(0xB2,0xEB),      o2(0xB2,0xEC),
-          o2(0x85,0x79),      o2(0x85,0x7A),
-          o2(0xB2,0xED),      o2(0x85,0x81),
-          o2(0x85,0x82),      o2(0x85,0x83),
-          o2(0x85,0x84),      o2(0x85,0x85),
-          o2(0x85,0x86),      o2(0x85,0x87),
-          o2(0xB2,0xEE),      o2(0x85,0x88),
-          o2(0x85,0x89),      o2(0x85,0x8A),
-          o2(0xB2,0xEF),      o2(0x85,0x8B),
-          o2(0x85,0x8C),      o2(0x85,0x8D),
-          o2(0xB2,0xF0),      o2(0x85,0x8E),
-          o2(0x85,0x8F),      o2(0x85,0x90),
-          o2(0x85,0x91),      o2(0x85,0x92),
-          o2(0x85,0x93),      o2(0x85,0x94),
-          o2(0xB2,0xF1),      o2(0xB2,0xF2),
-          o2(0x85,0x95),      o2(0x85,0x96),
-          o2(0x85,0x97),      o2(0x85,0x98),
-          o2(0x85,0x99),      o2(0x85,0x9A),
-          o2(0x85,0x9B),      o2(0x85,0x9C),
-          o2(0x85,0x9D),      o2(0x85,0x9E),
-          o2(0xB2,0xF3),      o2(0x85,0x9F),
-          o2(0x85,0xA0),      o2(0x85,0xA1),
-          o2(0x85,0xA2),      o2(0x85,0xA3),
-          o2(0x85,0xA4),      o2(0x85,0xA5),
-          o2(0x85,0xA6),      o2(0x85,0xA7),
-          o2(0x85,0xA8),      o2(0x85,0xA9),
-          o2(0x85,0xAA),      o2(0x85,0xAB),
-          o2(0x85,0xAC),      o2(0x85,0xAD),
-          o2(0x85,0xAE),      o2(0x85,0xAF),
-          o2(0x85,0xB0),      o2(0x85,0xB1),
-          o2(0x85,0xB2),      o2(0x85,0xB3),
-          o2(0x85,0xB4),      o2(0x85,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_00 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_01_infos[65] = {
-          o2(0x85,0xB6),      o2(0x85,0xB7),
-          o2(0x85,0xB8),      o2(0x85,0xB9),
-          o2(0xB2,0xF4),      o2(0xB2,0xF5),
-          o2(0x85,0xBA),      o2(0x85,0xBB),
-          o2(0xB2,0xF6),      o2(0x85,0xBC),
-          o2(0xB2,0xF7),      o2(0x85,0xBD),
-          o2(0xB2,0xF8),      o2(0x85,0xBE),
-          o2(0xB2,0xF9),      o2(0x85,0xBF),
-          o2(0x85,0xC0),      o2(0x85,0xC1),
-          o2(0x85,0xC2),      o2(0xB2,0xFA),
-          o2(0xB2,0xFB),      o2(0xB2,0xFC),
-          o2(0x85,0xC3),      o2(0xB2,0xFD),
-          o2(0x85,0xC4),      o2(0xB2,0xFE),
-          o2(0x85,0xC5),      o2(0x85,0xC6),
-          o2(0x85,0xC7),      o2(0xB3,0xA1),
-          o2(0x85,0xC8),      o2(0x85,0xC9),
-          o2(0x85,0xCA),      o2(0x85,0xCB),
-          o2(0x85,0xCC),      o2(0x85,0xCD),
-          o2(0x85,0xCE),      o2(0x85,0xCF),
-          o2(0x85,0xD0),      o2(0x85,0xD1),
-          o2(0x85,0xD2),      o2(0x85,0xD3),
-          o2(0x85,0xD4),      o2(0x85,0xD5),
-          o2(0x85,0xD6),      o2(0x85,0xD7),
-          o2(0x85,0xD8),      o2(0x85,0xD9),
-          o2(0x85,0xDA),      o2(0x85,0xDB),
-          o2(0x85,0xDC),      o2(0x85,0xDD),
-          o2(0x85,0xDE),      o2(0x85,0xDF),
-          o2(0x85,0xE0),      o2(0x85,0xE1),
-          o2(0x85,0xE2),      o2(0x85,0xE3),
-          o2(0x85,0xE4),      o2(0x85,0xE5),
-          o2(0xB3,0xA2),      o2(0xB3,0xA3),
-          o2(0x85,0xE6),      o2(0x85,0xE7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_01 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_02_infos[65] = {
-          o2(0xB3,0xA4),      o2(0x85,0xE8),
-          o2(0x85,0xE9),      o2(0x85,0xEA),
-          o2(0xB3,0xA5),      o2(0x85,0xEB),
-          o2(0x85,0xEC),      o2(0x85,0xED),
-          o2(0x85,0xEE),      o2(0x85,0xEF),
-          o2(0x85,0xF0),      o2(0x85,0xF1),
-          o2(0xB3,0xA6),      o2(0xB3,0xA7),
-          o2(0x85,0xF2),      o2(0xB3,0xA8),
-          o2(0x85,0xF3),      o2(0xB3,0xA9),
-          o2(0x85,0xF4),      o2(0x85,0xF5),
-          o2(0x85,0xF6),      o2(0x85,0xF7),
-          o2(0x85,0xF8),      o2(0x85,0xF9),
-          o2(0xB3,0xAA),      o2(0xB3,0xAB),
-          o2(0xB3,0xAC),      o2(0x85,0xFA),
-          o2(0xB3,0xAD),      o2(0x85,0xFB),
-          o2(0x85,0xFC),      o2(0xB3,0xAE),
-          o2(0xB3,0xAF),      o2(0xB3,0xB0),
-          o2(0xB3,0xB1),      o2(0x85,0xFD),
-          o2(0x85,0xFE),      o2(0x86,0x41),
-          o2(0x86,0x42),      o2(0x86,0x43),
-          o2(0xB3,0xB2),      o2(0xB3,0xB3),
-          o2(0x86,0x44),      o2(0xB3,0xB4),
-          o2(0xB3,0xB5),      o2(0xB3,0xB6),
-          o2(0xB3,0xB7),      o2(0xB3,0xB8),
-          o2(0x86,0x45),      o2(0xB3,0xB9),
-          o2(0x86,0x46),      o2(0xB3,0xBA),
-          o2(0xB3,0xBB),      o2(0xB3,0xBC),
-          o2(0x86,0x47),      o2(0x86,0x48),
-          o2(0xB3,0xBD),      o2(0x86,0x49),
-          o2(0x86,0x4A),      o2(0x86,0x4B),
-          o2(0xB3,0xBE),      o2(0x86,0x4C),
-          o2(0x86,0x4D),      o2(0x86,0x4E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_02 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_03_infos[65] = {
-          o2(0x86,0x4F),      o2(0x86,0x50),
-          o2(0x86,0x51),      o2(0x86,0x52),
-          o2(0xB3,0xBF),      o2(0xB3,0xC0),
-          o2(0x86,0x53),      o2(0xB3,0xC1),
-          o2(0xB3,0xC2),      o2(0xB3,0xC3),
-          o2(0x86,0x54),      o2(0x86,0x55),
-          o2(0x86,0x56),      o2(0x86,0x57),
-          o2(0x86,0x58),      o2(0x86,0x59),
-          o2(0xB3,0xC4),      o2(0xB3,0xC5),
-          o2(0x86,0x5A),      o2(0x86,0x61),
-          o2(0xB3,0xC6),      o2(0x86,0x62),
-          o2(0x86,0x63),      o2(0x86,0x64),
-          o2(0xB3,0xC7),      o2(0x86,0x65),
-          o2(0x86,0x66),      o2(0x86,0x67),
-          o2(0x86,0x68),      o2(0x86,0x69),
-          o2(0x86,0x6A),      o2(0x86,0x6B),
-          o2(0xB3,0xC8),      o2(0x86,0x6C),
-          o2(0x86,0x6D),      o2(0x86,0x6E),
-          o2(0x86,0x6F),      o2(0xB3,0xC9),
-          o2(0x86,0x70),      o2(0x86,0x71),
-          o2(0x86,0x72),      o2(0x86,0x73),
-          o2(0x86,0x74),      o2(0x86,0x75),
-          o2(0x86,0x76),      o2(0x86,0x77),
-          o2(0x86,0x78),      o2(0x86,0x79),
-          o2(0x86,0x7A),      o2(0x86,0x81),
-          o2(0x86,0x82),      o2(0x86,0x83),
-          o2(0x86,0x84),      o2(0x86,0x85),
-          o2(0x86,0x86),      o2(0x86,0x87),
-          o2(0x86,0x88),      o2(0x86,0x89),
-          o2(0x86,0x8A),      o2(0x86,0x8B),
-          o2(0x86,0x8C),      o2(0x86,0x8D),
-          o2(0x86,0x8E),      o2(0x86,0x8F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_03 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_04_infos[65] = {
-          o2(0x86,0x90),      o2(0x86,0x91),
-          o2(0x86,0x92),      o2(0x86,0x93),
-          o2(0x86,0x94),      o2(0x86,0x95),
-          o2(0x86,0x96),      o2(0x86,0x97),
-          o2(0xB3,0xCA),      o2(0xB3,0xCB),
-          o2(0x86,0x98),      o2(0xB3,0xCC),
-          o2(0xB3,0xCD),      o2(0x86,0x99),
-          o2(0x86,0x9A),      o2(0x86,0x9B),
-          o2(0xB3,0xCE),      o2(0x86,0x9C),
-          o2(0xB3,0xCF),      o2(0xB3,0xD0),
-          o2(0x86,0x9D),      o2(0x86,0x9E),
-          o2(0x86,0x9F),      o2(0x86,0xA0),
-          o2(0xB3,0xD1),      o2(0xB3,0xD2),
-          o2(0x86,0xA1),      o2(0xB3,0xD3),
-          o2(0xB3,0xD4),      o2(0xB3,0xD5),
-          o2(0x86,0xA2),      o2(0x86,0xA3),
-          o2(0x86,0xA4),      o2(0x86,0xA5),
-          o2(0x86,0xA6),      o2(0xB3,0xD6),
-          o2(0xB3,0xD7),      o2(0xB3,0xD8),
-          o2(0x86,0xA7),      o2(0x86,0xA8),
-          o2(0xB3,0xD9),      o2(0x86,0xA9),
-          o2(0x86,0xAA),      o2(0x86,0xAB),
-          o2(0xB3,0xDA),      o2(0x86,0xAC),
-          o2(0x86,0xAD),      o2(0x86,0xAE),
-          o2(0x86,0xAF),      o2(0x86,0xB0),
-          o2(0x86,0xB1),      o2(0x86,0xB2),
-          o2(0xB3,0xDB),      o2(0xB3,0xDC),
-          o2(0x86,0xB3),      o2(0xB3,0xDD),
-          o2(0xB3,0xDE),      o2(0xB3,0xDF),
-          o2(0x86,0xB4),      o2(0x86,0xB5),
-          o2(0x86,0xB6),      o2(0x86,0xB7),
-          o2(0x86,0xB8),      o2(0x86,0xB9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_04 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_05_infos[65] = {
-          o2(0xB3,0xE0),      o2(0xB3,0xE1),
-          o2(0x86,0xBA),      o2(0x86,0xBB),
-          o2(0xB3,0xE2),      o2(0x86,0xBC),
-          o2(0x86,0xBD),      o2(0x86,0xBE),
-          o2(0xB3,0xE3),      o2(0x86,0xBF),
-          o2(0x86,0xC0),      o2(0x86,0xC1),
-          o2(0x86,0xC2),      o2(0x86,0xC3),
-          o2(0x86,0xC4),      o2(0x86,0xC5),
-          o2(0xB3,0xE4),      o2(0xB3,0xE5),
-          o2(0x86,0xC6),      o2(0x86,0xC7),
-          o2(0xB3,0xE6),      o2(0xB3,0xE7),
-          o2(0x86,0xC8),      o2(0x86,0xC9),
-          o2(0xB3,0xE8),      o2(0x86,0xCA),
-          o2(0x86,0xCB),      o2(0x86,0xCC),
-          o2(0xB3,0xE9),      o2(0x86,0xCD),
-          o2(0x86,0xCE),      o2(0x86,0xCF),
-          o2(0xB3,0xEA),      o2(0x86,0xD0),
-          o2(0x86,0xD1),      o2(0x86,0xD2),
-          o2(0x86,0xD3),      o2(0x86,0xD4),
-          o2(0x86,0xD5),      o2(0x86,0xD6),
-          o2(0x86,0xD7),      o2(0x86,0xD8),
-          o2(0x86,0xD9),      o2(0x86,0xDA),
-          o2(0x86,0xDB),      o2(0x86,0xDC),
-          o2(0x86,0xDD),      o2(0x86,0xDE),
-          o2(0x86,0xDF),      o2(0x86,0xE0),
-          o2(0x86,0xE1),      o2(0x86,0xE2),
-          o2(0x86,0xE3),      o2(0x86,0xE4),
-          o2(0x86,0xE5),      o2(0x86,0xE6),
-          o2(0xB3,0xEB),      o2(0xB3,0xEC),
-          o2(0x86,0xE7),      o2(0x86,0xE8),
-          o2(0xB3,0xED),      o2(0x86,0xE9),
-          o2(0x86,0xEA),      o2(0x86,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_05 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_06_infos[65] = {
-          o2(0xB3,0xEE),      o2(0x86,0xEC),
-          o2(0xB3,0xEF),      o2(0x86,0xED),
-          o2(0x86,0xEE),      o2(0x86,0xEF),
-          o2(0x86,0xF0),      o2(0x86,0xF1),
-          o2(0xB3,0xF0),      o2(0xB3,0xF1),
-          o2(0x86,0xF2),      o2(0xB3,0xF2),
-          o2(0x86,0xF3),      o2(0xB3,0xF3),
-          o2(0x86,0xF4),      o2(0x86,0xF5),
-          o2(0x86,0xF6),      o2(0x86,0xF7),
-          o2(0xB3,0xF4),      o2(0xB3,0xF5),
-          o2(0xB3,0xF6),      o2(0x86,0xF8),
-          o2(0x86,0xF9),      o2(0x86,0xFA),
-          o2(0xB3,0xF7),      o2(0x86,0xFB),
-          o2(0x86,0xFC),      o2(0x86,0xFD),
-          o2(0xB3,0xF8),      o2(0x86,0xFE),
-          o2(0x87,0x41),      o2(0x87,0x42),
-          o2(0x87,0x43),      o2(0x87,0x44),
-          o2(0x87,0x45),      o2(0x87,0x46),
-          o2(0x87,0x47),      o2(0x87,0x48),
-          o2(0x87,0x49),      o2(0x87,0x4A),
-          o2(0xB3,0xF9),      o2(0x87,0x4B),
-          o2(0x87,0x4C),      o2(0x87,0x4D),
-          o2(0x87,0x4E),      o2(0x87,0x4F),
-          o2(0x87,0x50),      o2(0x87,0x51),
-          o2(0x87,0x52),      o2(0x87,0x53),
-          o2(0x87,0x54),      o2(0x87,0x55),
-          o2(0x87,0x56),      o2(0x87,0x57),
-          o2(0x87,0x58),      o2(0x87,0x59),
-          o2(0x87,0x5A),      o2(0x87,0x61),
-          o2(0x87,0x62),      o2(0x87,0x63),
-          o2(0x87,0x64),      o2(0x87,0x65),
-          o2(0x87,0x66),      o2(0x87,0x67),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_06 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_07_infos[65] = {
-          o2(0x87,0x68),      o2(0x87,0x69),
-          o2(0x87,0x6A),      o2(0x87,0x6B),
-          o2(0x87,0x6C),      o2(0x87,0x6D),
-          o2(0x87,0x6E),      o2(0x87,0x6F),
-          o2(0x87,0x70),      o2(0x87,0x71),
-          o2(0x87,0x72),      o2(0x87,0x73),
-          o2(0xB3,0xFA),      o2(0x87,0x74),
-          o2(0x87,0x75),      o2(0x87,0x76),
-          o2(0xB3,0xFB),      o2(0x87,0x77),
-          o2(0x87,0x78),      o2(0x87,0x79),
-          o2(0xB3,0xFC),      o2(0x87,0x7A),
-          o2(0x87,0x81),      o2(0x87,0x82),
-          o2(0x87,0x83),      o2(0x87,0x84),
-          o2(0x87,0x85),      o2(0x87,0x86),
-          o2(0xB3,0xFD),      o2(0xB3,0xFE),
-          o2(0x87,0x87),      o2(0xB4,0xA1),
-          o2(0x87,0x88),      o2(0x87,0x89),
-          o2(0x87,0x8A),      o2(0x87,0x8B),
-          o2(0x87,0x8C),      o2(0x87,0x8D),
-          o2(0x87,0x8E),      o2(0x87,0x8F),
-          o2(0xB4,0xA2),      o2(0xB4,0xA3),
-          o2(0x87,0x90),      o2(0x87,0x91),
-          o2(0xB4,0xA4),      o2(0x87,0x92),
-          o2(0x87,0x93),      o2(0x87,0x94),
-          o2(0xB4,0xA5),      o2(0x87,0x95),
-          o2(0x87,0x96),      o2(0x87,0x97),
-          o2(0x87,0x98),      o2(0x87,0x99),
-          o2(0x87,0x9A),      o2(0x87,0x9B),
-          o2(0x87,0x9C),      o2(0xB4,0xA6),
-          o2(0x87,0x9D),      o2(0xB4,0xA7),
-          o2(0x87,0x9E),      o2(0xB4,0xA8),
-          o2(0x87,0x9F),      o2(0x87,0xA0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_07 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_08_infos[65] = {
-          o2(0x87,0xA1),      o2(0x87,0xA2),
-          o2(0x87,0xA3),      o2(0x87,0xA4),
-          o2(0xB4,0xA9),      o2(0xB4,0xAA),
-          o2(0x87,0xA5),      o2(0x87,0xA6),
-          o2(0xB4,0xAB),      o2(0x87,0xA7),
-          o2(0x87,0xA8),      o2(0xB4,0xAC),
-          o2(0xB4,0xAD),      o2(0x87,0xA9),
-          o2(0x87,0xAA),      o2(0x87,0xAB),
-          o2(0x87,0xAC),      o2(0x87,0xAD),
-          o2(0x87,0xAE),      o2(0x87,0xAF),
-          o2(0xB4,0xAE),      o2(0xB4,0xAF),
-          o2(0x87,0xB0),      o2(0xB4,0xB0),
-          o2(0x87,0xB1),      o2(0xB4,0xB1),
-          o2(0x87,0xB2),      o2(0x87,0xB3),
-          o2(0x87,0xB4),      o2(0x87,0xB5),
-          o2(0x87,0xB6),      o2(0x87,0xB7),
-          o2(0xB4,0xB2),      o2(0x87,0xB8),
-          o2(0x87,0xB9),      o2(0x87,0xBA),
-          o2(0x87,0xBB),      o2(0x87,0xBC),
-          o2(0x87,0xBD),      o2(0x87,0xBE),
-          o2(0x87,0xBF),      o2(0x87,0xC0),
-          o2(0x87,0xC1),      o2(0x87,0xC2),
-          o2(0x87,0xC3),      o2(0x87,0xC4),
-          o2(0x87,0xC5),      o2(0x87,0xC6),
-          o2(0x87,0xC7),      o2(0x87,0xC8),
-          o2(0x87,0xC9),      o2(0x87,0xCA),
-          o2(0xB4,0xB3),      o2(0x87,0xCB),
-          o2(0x87,0xCC),      o2(0x87,0xCD),
-          o2(0x87,0xCE),      o2(0x87,0xCF),
-          o2(0x87,0xD0),      o2(0x87,0xD1),
-          o2(0xB4,0xB4),      o2(0x87,0xD2),
-          o2(0x87,0xD3),      o2(0x87,0xD4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_08 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_09_infos[65] = {
-          o2(0x87,0xD5),      o2(0x87,0xD6),
-          o2(0x87,0xD7),      o2(0x87,0xD8),
-          o2(0x87,0xD9),      o2(0x87,0xDA),
-          o2(0x87,0xDB),      o2(0x87,0xDC),
-          o2(0x87,0xDD),      o2(0x87,0xDE),
-          o2(0x87,0xDF),      o2(0x87,0xE0),
-          o2(0x87,0xE1),      o2(0x87,0xE2),
-          o2(0x87,0xE3),      o2(0x87,0xE4),
-          o2(0x87,0xE5),      o2(0x87,0xE6),
-          o2(0x87,0xE7),      o2(0x87,0xE8),
-          o2(0x87,0xE9),      o2(0x87,0xEA),
-          o2(0x87,0xEB),      o2(0x87,0xEC),
-          o2(0xB4,0xB5),      o2(0x87,0xED),
-          o2(0x87,0xEE),      o2(0x87,0xEF),
-          o2(0xB4,0xB6),      o2(0x87,0xF0),
-          o2(0x87,0xF1),      o2(0x87,0xF2),
-          o2(0xB4,0xB7),      o2(0x87,0xF3),
-          o2(0x87,0xF4),      o2(0x87,0xF5),
-          o2(0x87,0xF6),      o2(0x87,0xF7),
-          o2(0x87,0xF8),      o2(0x87,0xF9),
-          o2(0xB4,0xB8),      o2(0xB4,0xB9),
-          o2(0x87,0xFA),      o2(0x87,0xFB),
-          o2(0x87,0xFC),      o2(0x87,0xFD),
-          o2(0x87,0xFE),      o2(0x88,0x41),
-          o2(0x88,0x42),      o2(0x88,0x43),
-          o2(0x88,0x44),      o2(0x88,0x45),
-          o2(0xB4,0xBA),      o2(0xB4,0xBB),
-          o2(0x88,0x46),      o2(0x88,0x47),
-          o2(0x88,0x48),      o2(0x88,0x49),
-          o2(0x88,0x4A),      o2(0x88,0x4B),
-          o2(0xB4,0xBC),      o2(0x88,0x4C),
-          o2(0x88,0x4D),      o2(0x88,0x4E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_09 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0A_infos[65] = {
-          o2(0x88,0x4F),      o2(0x88,0x50),
-          o2(0x88,0x51),      o2(0x88,0x52),
-          o2(0xB4,0xBD),      o2(0xB4,0xBE),
-          o2(0x88,0x53),      o2(0x88,0x54),
-          o2(0x88,0x55),      o2(0xB4,0xBF),
-          o2(0x88,0x56),      o2(0x88,0x57),
-          o2(0x88,0x58),      o2(0x88,0x59),
-          o2(0x88,0x5A),      o2(0x88,0x61),
-          o2(0xB4,0xC0),      o2(0xB4,0xC1),
-          o2(0x88,0x62),      o2(0x88,0x63),
-          o2(0xB4,0xC2),      o2(0x88,0x64),
-          o2(0x88,0x65),      o2(0x88,0x66),
-          o2(0xB4,0xC3),      o2(0xB4,0xC4),
-          o2(0xB4,0xC5),      o2(0x88,0x67),
-          o2(0x88,0x68),      o2(0x88,0x69),
-          o2(0x88,0x6A),      o2(0x88,0x6B),
-          o2(0xB4,0xC6),      o2(0xB4,0xC7),
-          o2(0x88,0x6C),      o2(0xB4,0xC8),
-          o2(0x88,0x6D),      o2(0xB4,0xC9),
-          o2(0xB4,0xCA),      o2(0x88,0x6E),
-          o2(0x88,0x6F),      o2(0x88,0x70),
-          o2(0xB4,0xCB),      o2(0x88,0x71),
-          o2(0xB4,0xCC),      o2(0x88,0x72),
-          o2(0x88,0x73),      o2(0x88,0x74),
-          o2(0xB4,0xCD),      o2(0x88,0x75),
-          o2(0x88,0x76),      o2(0x88,0x77),
-          o2(0xB4,0xCE),      o2(0x88,0x78),
-          o2(0x88,0x79),      o2(0x88,0x7A),
-          o2(0x88,0x81),      o2(0x88,0x82),
-          o2(0x88,0x83),      o2(0x88,0x84),
-          o2(0x88,0x85),      o2(0x88,0x86),
-          o2(0x88,0x87),      o2(0x88,0x88),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0B_infos[65] = {
-          o2(0x88,0x89),      o2(0x88,0x8A),
-          o2(0x88,0x8B),      o2(0x88,0x8C),
-          o2(0x88,0x8D),      o2(0x88,0x8E),
-          o2(0x88,0x8F),      o2(0x88,0x90),
-          o2(0xB4,0xCF),      o2(0xB4,0xD0),
-          o2(0x88,0x91),      o2(0x88,0x92),
-          o2(0xB4,0xD1),      o2(0x88,0x93),
-          o2(0x88,0x94),      o2(0x88,0x95),
-          o2(0xB4,0xD2),      o2(0x88,0x96),
-          o2(0xB4,0xD3),      o2(0x88,0x97),
-          o2(0x88,0x98),      o2(0x88,0x99),
-          o2(0x88,0x9A),      o2(0x88,0x9B),
-          o2(0xB4,0xD4),      o2(0xB4,0xD5),
-          o2(0x88,0x9C),      o2(0xB4,0xD6),
-          o2(0x88,0x9D),      o2(0xB4,0xD7),
-          o2(0x88,0x9E),      o2(0x88,0x9F),
-          o2(0x88,0xA0),      o2(0x88,0xA1),
-          o2(0xB4,0xD8),      o2(0x88,0xA2),
-          o2(0xB4,0xD9),      o2(0xB4,0xDA),
-          o2(0xB4,0xDB),      o2(0x88,0xA3),
-          o2(0xB4,0xDC),      o2(0x88,0xA4),
-          o2(0x88,0xA5),      o2(0xB4,0xDD),
-          o2(0xB4,0xDE),      o2(0xB4,0xDF),
-          o2(0xB4,0xE0),      o2(0xB4,0xE1),
-          o2(0x88,0xA6),      o2(0x88,0xA7),
-          o2(0x88,0xA8),      o2(0xB4,0xE2),
-          o2(0xB4,0xE3),      o2(0xB4,0xE4),
-          o2(0x88,0xA9),      o2(0xB4,0xE5),
-          o2(0xB4,0xE6),      o2(0xB4,0xE7),
-          o2(0xB4,0xE8),      o2(0xB4,0xE9),
-          o2(0x88,0xAA),      o2(0x88,0xAB),
-          o2(0x88,0xAC),      o2(0xB4,0xEA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0C_infos[65] = {
-          o2(0xB4,0xEB),      o2(0xB4,0xEC),
-          o2(0x88,0xAD),      o2(0x88,0xAE),
-          o2(0xB4,0xED),      o2(0x88,0xAF),
-          o2(0x88,0xB0),      o2(0x88,0xB1),
-          o2(0xB4,0xEE),      o2(0x88,0xB2),
-          o2(0x88,0xB3),      o2(0x88,0xB4),
-          o2(0x88,0xB5),      o2(0x88,0xB6),
-          o2(0x88,0xB7),      o2(0x88,0xB8),
-          o2(0xB4,0xEF),      o2(0xB4,0xF0),
-          o2(0x88,0xB9),      o2(0xB4,0xF1),
-          o2(0xB4,0xF2),      o2(0xB4,0xF3),
-          o2(0x88,0xBA),      o2(0x88,0xBB),
-          o2(0x88,0xBC),      o2(0x88,0xBD),
-          o2(0x88,0xBE),      o2(0x88,0xBF),
-          o2(0xB4,0xF4),      o2(0x88,0xC0),
-          o2(0x88,0xC1),      o2(0x88,0xC2),
-          o2(0x88,0xC3),      o2(0x88,0xC4),
-          o2(0x88,0xC5),      o2(0x88,0xC6),
-          o2(0x88,0xC7),      o2(0x88,0xC8),
-          o2(0x88,0xC9),      o2(0x88,0xCA),
-          o2(0x88,0xCB),      o2(0x88,0xCC),
-          o2(0x88,0xCD),      o2(0x88,0xCE),
-          o2(0x88,0xCF),      o2(0x88,0xD0),
-          o2(0x88,0xD1),      o2(0x88,0xD2),
-          o2(0x88,0xD3),      o2(0x88,0xD4),
-          o2(0x88,0xD5),      o2(0x88,0xD6),
-          o2(0x88,0xD7),      o2(0x88,0xD8),
-          o2(0x88,0xD9),      o2(0x88,0xDA),
-          o2(0x88,0xDB),      o2(0x88,0xDC),
-          o2(0x88,0xDD),      o2(0x88,0xDE),
-          o2(0x88,0xDF),      o2(0x88,0xE0),
-          o2(0x88,0xE1),      o2(0x88,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0D_infos[65] = {
-          o2(0x88,0xE3),      o2(0x88,0xE4),
-          o2(0x88,0xE5),      o2(0x88,0xE6),
-          o2(0x88,0xE7),      o2(0x88,0xE8),
-          o2(0x88,0xE9),      o2(0x88,0xEA),
-          o2(0x88,0xEB),      o2(0x88,0xEC),
-          o2(0x88,0xED),      o2(0x88,0xEE),
-          o2(0x88,0xEF),      o2(0x88,0xF0),
-          o2(0x88,0xF1),      o2(0x88,0xF2),
-          o2(0x88,0xF3),      o2(0x88,0xF4),
-          o2(0x88,0xF5),      o2(0x88,0xF6),
-          o2(0xB4,0xF5),      o2(0xB4,0xF6),
-          o2(0xB4,0xF7),      o2(0x88,0xF7),
-          o2(0xB4,0xF8),      o2(0x88,0xF8),
-          o2(0x88,0xF9),      o2(0xB4,0xF9),
-          o2(0xB4,0xFA),      o2(0x88,0xFA),
-          o2(0xB4,0xFB),      o2(0xB4,0xFC),
-          o2(0x88,0xFB),      o2(0x88,0xFC),
-          o2(0x88,0xFD),      o2(0x88,0xFE),
-          o2(0xB4,0xFD),      o2(0xB4,0xFE),
-          o2(0x89,0x41),      o2(0xB5,0xA1),
-          o2(0x89,0x42),      o2(0xB5,0xA2),
-          o2(0x89,0x43),      o2(0xB5,0xA3),
-          o2(0x89,0x44),      o2(0x89,0x45),
-          o2(0xB5,0xA4),      o2(0x89,0x46),
-          o2(0xB5,0xA5),      o2(0xB5,0xA6),
-          o2(0x89,0x47),      o2(0x89,0x48),
-          o2(0xB5,0xA7),      o2(0x89,0x49),
-          o2(0x89,0x4A),      o2(0x89,0x4B),
-          o2(0xB5,0xA8),      o2(0x89,0x4C),
-          o2(0x89,0x4D),      o2(0x89,0x4E),
-          o2(0x89,0x4F),      o2(0x89,0x50),
-          o2(0x89,0x51),      o2(0x89,0x52),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0E_infos[65] = {
-          o2(0xB5,0xA9),      o2(0xB5,0xAA),
-          o2(0x89,0x53),      o2(0xB5,0xAB),
-          o2(0xB5,0xAC),      o2(0xB5,0xAD),
-          o2(0x89,0x54),      o2(0x89,0x55),
-          o2(0x89,0x56),      o2(0x89,0x57),
-          o2(0x89,0x58),      o2(0x89,0x59),
-          o2(0xB5,0xAE),      o2(0x89,0x5A),
-          o2(0x89,0x61),      o2(0x89,0x62),
-          o2(0xB5,0xAF),      o2(0x89,0x63),
-          o2(0x89,0x64),      o2(0x89,0x65),
-          o2(0xB5,0xB0),      o2(0x89,0x66),
-          o2(0x89,0x67),      o2(0x89,0x68),
-          o2(0x89,0x69),      o2(0x89,0x6A),
-          o2(0x89,0x6B),      o2(0x89,0x6C),
-          o2(0x89,0x6D),      o2(0x89,0x6E),
-          o2(0x89,0x6F),      o2(0x89,0x70),
-          o2(0xB5,0xB1),      o2(0xB5,0xB2),
-          o2(0x89,0x71),      o2(0x89,0x72),
-          o2(0x89,0x73),      o2(0x89,0x74),
-          o2(0x89,0x75),      o2(0x89,0x76),
-          o2(0xB5,0xB3),      o2(0x89,0x77),
-          o2(0x89,0x78),      o2(0x89,0x79),
-          o2(0xB5,0xB4),      o2(0x89,0x7A),
-          o2(0x89,0x81),      o2(0x89,0x82),
-          o2(0x89,0x83),      o2(0x89,0x84),
-          o2(0x89,0x85),      o2(0x89,0x86),
-          o2(0x89,0x87),      o2(0x89,0x88),
-          o2(0x89,0x89),      o2(0x89,0x8A),
-          o2(0x89,0x8B),      o2(0x89,0x8C),
-          o2(0x89,0x8D),      o2(0x89,0x8E),
-          o2(0x89,0x8F),      o2(0x89,0x90),
-          o2(0x89,0x91),      o2(0x89,0x92),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_0F_infos[65] = {
-          o2(0x89,0x93),      o2(0x89,0x94),
-          o2(0x89,0x95),      o2(0x89,0x96),
-          o2(0xB5,0xB5),      o2(0xB5,0xB6),
-          o2(0x89,0x97),      o2(0x89,0x98),
-          o2(0xB5,0xB7),      o2(0x89,0x99),
-          o2(0x89,0x9A),      o2(0xB5,0xB8),
-          o2(0xB5,0xB9),      o2(0x89,0x9B),
-          o2(0xB5,0xBA),      o2(0x89,0x9C),
-          o2(0xB5,0xBB),      o2(0x89,0x9D),
-          o2(0x89,0x9E),      o2(0x89,0x9F),
-          o2(0xB5,0xBC),      o2(0xB5,0xBD),
-          o2(0x89,0xA0),      o2(0xB5,0xBE),
-          o2(0x89,0xA1),      o2(0xB5,0xBF),
-          o2(0x89,0xA2),      o2(0xB5,0xC0),
-          o2(0x89,0xA3),      o2(0xB5,0xC1),
-          o2(0x89,0xA4),      o2(0x89,0xA5),
-          o2(0xB5,0xC2),      o2(0x89,0xA6),
-          o2(0x89,0xA7),      o2(0x89,0xA8),
-          o2(0xB5,0xC3),      o2(0x89,0xA9),
-          o2(0x89,0xAA),      o2(0x89,0xAB),
-          o2(0xB5,0xC4),      o2(0x89,0xAC),
-          o2(0x89,0xAD),      o2(0x89,0xAE),
-          o2(0x89,0xAF),      o2(0x89,0xB0),
-          o2(0x89,0xB1),      o2(0x89,0xB2),
-          o2(0x89,0xB3),      o2(0x89,0xB4),
-          o2(0x89,0xB5),      o2(0x89,0xB6),
-          o2(0x89,0xB7),      o2(0x89,0xB8),
-          o2(0x89,0xB9),      o2(0x89,0xBA),
-          o2(0x89,0xBB),      o2(0x89,0xBC),
-          o2(0x89,0xBD),      o2(0x89,0xBE),
-          o2(0xB5,0xC5),      o2(0x89,0xBF),
-          o2(0x89,0xC0),      o2(0x89,0xC1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_0F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_10_infos[65] = {
-          o2(0x89,0xC2),      o2(0x89,0xC3),
-          o2(0x89,0xC4),      o2(0x89,0xC5),
-          o2(0x89,0xC6),      o2(0x89,0xC7),
-          o2(0x89,0xC8),      o2(0x89,0xC9),
-          o2(0x89,0xCA),      o2(0x89,0xCB),
-          o2(0x89,0xCC),      o2(0x89,0xCD),
-          o2(0x89,0xCE),      o2(0x89,0xCF),
-          o2(0x89,0xD0),      o2(0x89,0xD1),
-          o2(0xB5,0xC6),      o2(0x89,0xD2),
-          o2(0x89,0xD3),      o2(0x89,0xD4),
-          o2(0x89,0xD5),      o2(0x89,0xD6),
-          o2(0x89,0xD7),      o2(0x89,0xD8),
-          o2(0xB5,0xC7),      o2(0x89,0xD9),
-          o2(0x89,0xDA),      o2(0x89,0xDB),
-          o2(0xB5,0xC8),      o2(0x89,0xDC),
-          o2(0x89,0xDD),      o2(0x89,0xDE),
-          o2(0xB5,0xC9),      o2(0x89,0xDF),
-          o2(0x89,0xE0),      o2(0x89,0xE1),
-          o2(0x89,0xE2),      o2(0x89,0xE3),
-          o2(0x89,0xE4),      o2(0x89,0xE5),
-          o2(0xB5,0xCA),      o2(0xB5,0xCB),
-          o2(0x89,0xE6),      o2(0xB5,0xCC),
-          o2(0x89,0xE7),      o2(0x89,0xE8),
-          o2(0x89,0xE9),      o2(0x89,0xEA),
-          o2(0x89,0xEB),      o2(0x89,0xEC),
-          o2(0x89,0xED),      o2(0x89,0xEE),
-          o2(0xB5,0xCD),      o2(0x89,0xEF),
-          o2(0x89,0xF0),      o2(0x89,0xF1),
-          o2(0x89,0xF2),      o2(0x89,0xF3),
-          o2(0x89,0xF4),      o2(0x89,0xF5),
-          o2(0x89,0xF6),      o2(0x89,0xF7),
-          o2(0x89,0xF8),      o2(0x89,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_10 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_11_infos[65] = {
-          o2(0x89,0xFA),      o2(0x89,0xFB),
-          o2(0x89,0xFC),      o2(0x89,0xFD),
-          o2(0x89,0xFE),      o2(0x8A,0x41),
-          o2(0x8A,0x42),      o2(0x8A,0x43),
-          o2(0x8A,0x44),      o2(0x8A,0x45),
-          o2(0x8A,0x46),      o2(0x8A,0x47),
-          o2(0x8A,0x48),      o2(0x8A,0x49),
-          o2(0x8A,0x4A),      o2(0x8A,0x4B),
-          o2(0xB5,0xCE),      o2(0xB5,0xCF),
-          o2(0x8A,0x4C),      o2(0x8A,0x4D),
-          o2(0xB5,0xD0),      o2(0x8A,0x4E),
-          o2(0x8A,0x4F),      o2(0x8A,0x50),
-          o2(0xB5,0xD1),      o2(0x8A,0x51),
-          o2(0x8A,0x52),      o2(0x8A,0x53),
-          o2(0x8A,0x54),      o2(0x8A,0x55),
-          o2(0x8A,0x56),      o2(0x8A,0x57),
-          o2(0xB5,0xD2),      o2(0xB5,0xD3),
-          o2(0x8A,0x58),      o2(0xB5,0xD4),
-          o2(0x8A,0x59),      o2(0xB5,0xD5),
-          o2(0x8A,0x5A),      o2(0x8A,0x61),
-          o2(0x8A,0x62),      o2(0x8A,0x63),
-          o2(0x8A,0x64),      o2(0x8A,0x65),
-          o2(0xB5,0xD6),      o2(0x8A,0x66),
-          o2(0x8A,0x67),      o2(0x8A,0x68),
-          o2(0x8A,0x69),      o2(0x8A,0x6A),
-          o2(0x8A,0x6B),      o2(0x8A,0x6C),
-          o2(0x8A,0x6D),      o2(0x8A,0x6E),
-          o2(0x8A,0x6F),      o2(0x8A,0x70),
-          o2(0x8A,0x71),      o2(0x8A,0x72),
-          o2(0x8A,0x73),      o2(0x8A,0x74),
-          o2(0x8A,0x75),      o2(0x8A,0x76),
-          o2(0x8A,0x77),      o2(0x8A,0x78),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_11 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_12_infos[65] = {
-          o2(0xB5,0xD7),      o2(0x8A,0x79),
-          o2(0x8A,0x7A),      o2(0x8A,0x81),
-          o2(0x8A,0x82),      o2(0x8A,0x83),
-          o2(0x8A,0x84),      o2(0x8A,0x85),
-          o2(0xB5,0xD8),      o2(0x8A,0x86),
-          o2(0x8A,0x87),      o2(0x8A,0x88),
-          o2(0x8A,0x89),      o2(0x8A,0x8A),
-          o2(0x8A,0x8B),      o2(0x8A,0x8C),
-          o2(0x8A,0x8D),      o2(0x8A,0x8E),
-          o2(0x8A,0x8F),      o2(0x8A,0x90),
-          o2(0x8A,0x91),      o2(0x8A,0x92),
-          o2(0x8A,0x93),      o2(0x8A,0x94),
-          o2(0x8A,0x95),      o2(0x8A,0x96),
-          o2(0x8A,0x97),      o2(0x8A,0x98),
-          o2(0x8A,0x99),      o2(0xB5,0xD9),
-          o2(0x8A,0x9A),      o2(0x8A,0x9B),
-          o2(0x8A,0x9C),      o2(0x8A,0x9D),
-          o2(0x8A,0x9E),      o2(0x8A,0x9F),
-          o2(0xB5,0xDA),      o2(0x8A,0xA0),
-          o2(0x8A,0xA1),      o2(0x8A,0xA2),
-          o2(0xB5,0xDB),      o2(0x8A,0xA3),
-          o2(0x8A,0xA4),      o2(0x8A,0xA5),
-          o2(0xB5,0xDC),      o2(0x8A,0xA6),
-          o2(0x8A,0xA7),      o2(0x8A,0xA8),
-          o2(0x8A,0xA9),      o2(0x8A,0xAA),
-          o2(0x8A,0xAB),      o2(0x8A,0xAC),
-          o2(0x8A,0xAD),      o2(0xB5,0xDD),
-          o2(0x8A,0xAE),      o2(0xB5,0xDE),
-          o2(0x8A,0xAF),      o2(0xB5,0xDF),
-          o2(0x8A,0xB0),      o2(0x8A,0xB1),
-          o2(0x8A,0xB2),      o2(0x8A,0xB3),
-          o2(0x8A,0xB4),      o2(0x8A,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_12 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_13_infos[65] = {
-          o2(0xB5,0xE0),      o2(0x8A,0xB6),
-          o2(0x8A,0xB7),      o2(0x8A,0xB8),
-          o2(0xB5,0xE1),      o2(0x8A,0xB9),
-          o2(0x8A,0xBA),      o2(0x8A,0xBB),
-          o2(0xB5,0xE2),      o2(0x8A,0xBC),
-          o2(0x8A,0xBD),      o2(0x8A,0xBE),
-          o2(0x8A,0xBF),      o2(0x8A,0xC0),
-          o2(0x8A,0xC1),      o2(0x8A,0xC2),
-          o2(0xB5,0xE3),      o2(0x8A,0xC3),
-          o2(0x8A,0xC4),      o2(0x8A,0xC5),
-          o2(0x8A,0xC6),      o2(0xB5,0xE4),
-          o2(0x8A,0xC7),      o2(0x8A,0xC8),
-          o2(0x8A,0xC9),      o2(0x8A,0xCA),
-          o2(0x8A,0xCB),      o2(0x8A,0xCC),
-          o2(0xB5,0xE5),      o2(0xB5,0xE6),
-          o2(0x8A,0xCD),      o2(0x8A,0xCE),
-          o2(0xB5,0xE7),      o2(0x8A,0xCF),
-          o2(0x8A,0xD0),      o2(0xB5,0xE8),
-          o2(0xB5,0xE9),      o2(0x8A,0xD1),
-          o2(0xB5,0xEA),      o2(0x8A,0xD2),
-          o2(0x8A,0xD3),      o2(0x8A,0xD4),
-          o2(0x8A,0xD5),      o2(0x8A,0xD6),
-          o2(0xB5,0xEB),      o2(0xB5,0xEC),
-          o2(0x8A,0xD7),      o2(0xB5,0xED),
-          o2(0x8A,0xD8),      o2(0xB5,0xEE),
-          o2(0x8A,0xD9),      o2(0x8A,0xDA),
-          o2(0x8A,0xDB),      o2(0x8A,0xDC),
-          o2(0x8A,0xDD),      o2(0x8A,0xDE),
-          o2(0xB5,0xEF),      o2(0x8A,0xDF),
-          o2(0x8A,0xE0),      o2(0x8A,0xE1),
-          o2(0x8A,0xE2),      o2(0x8A,0xE3),
-          o2(0x8A,0xE4),      o2(0x8A,0xE5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_13 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_14_infos[65] = {
-          o2(0x8A,0xE6),      o2(0x8A,0xE7),
-          o2(0x8A,0xE8),      o2(0x8A,0xE9),
-          o2(0x8A,0xEA),      o2(0x8A,0xEB),
-          o2(0x8A,0xEC),      o2(0x8A,0xED),
-          o2(0x8A,0xEE),      o2(0x8A,0xEF),
-          o2(0x8A,0xF0),      o2(0x8A,0xF1),
-          o2(0x8A,0xF2),      o2(0x8A,0xF3),
-          o2(0x8A,0xF4),      o2(0x8A,0xF5),
-          o2(0x8A,0xF6),      o2(0x8A,0xF7),
-          o2(0x8A,0xF8),      o2(0x8A,0xF9),
-          o2(0xB5,0xF0),      o2(0xB5,0xF1),
-          o2(0x8A,0xFA),      o2(0x8A,0xFB),
-          o2(0xB5,0xF2),      o2(0x8A,0xFC),
-          o2(0x8A,0xFD),      o2(0xB5,0xF3),
-          o2(0xB5,0xF4),      o2(0x8A,0xFE),
-          o2(0x8B,0x41),      o2(0x8B,0x42),
-          o2(0x8B,0x43),      o2(0x8B,0x44),
-          o2(0x8B,0x45),      o2(0x8B,0x46),
-          o2(0xB5,0xF5),      o2(0xB5,0xF6),
-          o2(0x8B,0x47),      o2(0xB5,0xF7),
-          o2(0xB5,0xF8),      o2(0xB5,0xF9),
-          o2(0xB5,0xFA),      o2(0x8B,0x48),
-          o2(0x8B,0x49),      o2(0x8B,0x4A),
-          o2(0x8B,0x4B),      o2(0x8B,0x4C),
-          o2(0xB5,0xFB),      o2(0xB5,0xFC),
-          o2(0x8B,0x4D),      o2(0x8B,0x4E),
-          o2(0xB5,0xFD),      o2(0x8B,0x4F),
-          o2(0x8B,0x50),      o2(0x8B,0x51),
-          o2(0xB5,0xFE),      o2(0x8B,0x52),
-          o2(0x8B,0x53),      o2(0x8B,0x54),
-          o2(0x8B,0x55),      o2(0x8B,0x56),
-          o2(0x8B,0x57),      o2(0x8B,0x58),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_14 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_15_infos[65] = {
-          o2(0xB6,0xA1),      o2(0xB6,0xA2),
-          o2(0x8B,0x59),      o2(0xB6,0xA3),
-          o2(0xB6,0xA4),      o2(0xB6,0xA5),
-          o2(0x8B,0x5A),      o2(0x8B,0x61),
-          o2(0x8B,0x62),      o2(0x8B,0x63),
-          o2(0x8B,0x64),      o2(0xB6,0xA6),
-          o2(0xB6,0xA7),      o2(0xB6,0xA8),
-          o2(0x8B,0x65),      o2(0x8B,0x66),
-          o2(0xB6,0xA9),      o2(0x8B,0x67),
-          o2(0x8B,0x68),      o2(0x8B,0x69),
-          o2(0xB6,0xAA),      o2(0x8B,0x6A),
-          o2(0x8B,0x6B),      o2(0x8B,0x6C),
-          o2(0x8B,0x6D),      o2(0x8B,0x6E),
-          o2(0x8B,0x6F),      o2(0x8B,0x70),
-          o2(0xB6,0xAB),      o2(0xB6,0xAC),
-          o2(0x8B,0x71),      o2(0xB6,0xAD),
-          o2(0xB6,0xAE),      o2(0xB6,0xAF),
-          o2(0x8B,0x72),      o2(0x8B,0x73),
-          o2(0x8B,0x74),      o2(0x8B,0x75),
-          o2(0x8B,0x76),      o2(0x8B,0x77),
-          o2(0x8B,0x78),      o2(0x8B,0x79),
-          o2(0x8B,0x7A),      o2(0x8B,0x81),
-          o2(0x8B,0x82),      o2(0x8B,0x83),
-          o2(0x8B,0x84),      o2(0x8B,0x85),
-          o2(0x8B,0x86),      o2(0x8B,0x87),
-          o2(0x8B,0x88),      o2(0x8B,0x89),
-          o2(0x8B,0x8A),      o2(0x8B,0x8B),
-          o2(0x8B,0x8C),      o2(0x8B,0x8D),
-          o2(0x8B,0x8E),      o2(0x8B,0x8F),
-          o2(0x8B,0x90),      o2(0x8B,0x91),
-          o2(0x8B,0x92),      o2(0x8B,0x93),
-          o2(0x8B,0x94),      o2(0x8B,0x95),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_15 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_16_infos[65] = {
-          o2(0x8B,0x96),      o2(0x8B,0x97),
-          o2(0x8B,0x98),      o2(0x8B,0x99),
-          o2(0x8B,0x9A),      o2(0x8B,0x9B),
-          o2(0x8B,0x9C),      o2(0x8B,0x9D),
-          o2(0x8B,0x9E),      o2(0x8B,0x9F),
-          o2(0x8B,0xA0),      o2(0x8B,0xA1),
-          o2(0x8B,0xA2),      o2(0x8B,0xA3),
-          o2(0x8B,0xA4),      o2(0x8B,0xA5),
-          o2(0x8B,0xA6),      o2(0x8B,0xA7),
-          o2(0x8B,0xA8),      o2(0x8B,0xA9),
-          o2(0x8B,0xAA),      o2(0x8B,0xAB),
-          o2(0x8B,0xAC),      o2(0x8B,0xAD),
-          o2(0x8B,0xAE),      o2(0x8B,0xAF),
-          o2(0x8B,0xB0),      o2(0x8B,0xB1),
-          o2(0x8B,0xB2),      o2(0x8B,0xB3),
-          o2(0x8B,0xB4),      o2(0x8B,0xB5),
-          o2(0xB6,0xB0),      o2(0xB6,0xB1),
-          o2(0x8B,0xB6),      o2(0x8B,0xB7),
-          o2(0xB6,0xB2),      o2(0x8B,0xB8),
-          o2(0x8B,0xB9),      o2(0x8B,0xBA),
-          o2(0xB6,0xB3),      o2(0x8B,0xBB),
-          o2(0xB6,0xB4),      o2(0xB6,0xB5),
-          o2(0x8B,0xBC),      o2(0x8B,0xBD),
-          o2(0x8B,0xBE),      o2(0x8B,0xBF),
-          o2(0xB6,0xB6),      o2(0xB6,0xB7),
-          o2(0x8B,0xC0),      o2(0xB6,0xB8),
-          o2(0xB6,0xB9),      o2(0xB6,0xBA),
-          o2(0x8B,0xC1),      o2(0x8B,0xC2),
-          o2(0x8B,0xC3),      o2(0x8B,0xC4),
-          o2(0x8B,0xC5),      o2(0xB6,0xBB),
-          o2(0xB6,0xBC),      o2(0xB6,0xBD),
-          o2(0x8B,0xC6),      o2(0x8B,0xC7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_16 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_17_infos[65] = {
-          o2(0xB6,0xBE),      o2(0x8B,0xC8),
-          o2(0x8B,0xC9),      o2(0x8B,0xCA),
-          o2(0xB6,0xBF),      o2(0x8B,0xCB),
-          o2(0x8B,0xCC),      o2(0x8B,0xCD),
-          o2(0x8B,0xCE),      o2(0x8B,0xCF),
-          o2(0x8B,0xD0),      o2(0x8B,0xD1),
-          o2(0xB6,0xC0),      o2(0xB6,0xC1),
-          o2(0x8B,0xD2),      o2(0xB6,0xC2),
-          o2(0xB6,0xC3),      o2(0xB6,0xC4),
-          o2(0x8B,0xD3),      o2(0x8B,0xD4),
-          o2(0x8B,0xD5),      o2(0x8B,0xD6),
-          o2(0x8B,0xD7),      o2(0x8B,0xD8),
-          o2(0xB6,0xC5),      o2(0x8B,0xD9),
-          o2(0x8B,0xDA),      o2(0x8B,0xDB),
-          o2(0x8B,0xDC),      o2(0x8B,0xDD),
-          o2(0x8B,0xDE),      o2(0x8B,0xDF),
-          o2(0x8B,0xE0),      o2(0x8B,0xE1),
-          o2(0x8B,0xE2),      o2(0x8B,0xE3),
-          o2(0x8B,0xE4),      o2(0x8B,0xE5),
-          o2(0x8B,0xE6),      o2(0x8B,0xE7),
-          o2(0x8B,0xE8),      o2(0x8B,0xE9),
-          o2(0x8B,0xEA),      o2(0x8B,0xEB),
-          o2(0xB6,0xC6),      o2(0x8B,0xEC),
-          o2(0x8B,0xED),      o2(0x8B,0xEE),
-          o2(0x8B,0xEF),      o2(0x8B,0xF0),
-          o2(0x8B,0xF1),      o2(0x8B,0xF2),
-          o2(0x8B,0xF3),      o2(0x8B,0xF4),
-          o2(0x8B,0xF5),      o2(0x8B,0xF6),
-          o2(0x8B,0xF7),      o2(0x8B,0xF8),
-          o2(0x8B,0xF9),      o2(0x8B,0xFA),
-          o2(0x8B,0xFB),      o2(0x8B,0xFC),
-          o2(0x8B,0xFD),      o2(0x8B,0xFE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_17 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_18_infos[65] = {
-          o2(0x8C,0x41),      o2(0x8C,0x42),
-          o2(0x8C,0x43),      o2(0x8C,0x44),
-          o2(0x8C,0x45),      o2(0x8C,0x46),
-          o2(0x8C,0x47),      o2(0x8C,0x48),
-          o2(0x8C,0x49),      o2(0x8C,0x4A),
-          o2(0x8C,0x4B),      o2(0x8C,0x4C),
-          o2(0x8C,0x4D),      o2(0x8C,0x4E),
-          o2(0x8C,0x4F),      o2(0x8C,0x50),
-          o2(0xB6,0xC7),      o2(0xB6,0xC8),
-          o2(0x8C,0x51),      o2(0x8C,0x52),
-          o2(0xB6,0xC9),      o2(0x8C,0x53),
-          o2(0x8C,0x54),      o2(0x8C,0x55),
-          o2(0xB6,0xCA),      o2(0x8C,0x56),
-          o2(0x8C,0x57),      o2(0x8C,0x58),
-          o2(0x8C,0x59),      o2(0x8C,0x5A),
-          o2(0x8C,0x61),      o2(0x8C,0x62),
-          o2(0x8C,0x63),      o2(0x8C,0x64),
-          o2(0x8C,0x65),      o2(0x8C,0x66),
-          o2(0x8C,0x67),      o2(0xB6,0xCB),
-          o2(0x8C,0x68),      o2(0x8C,0x69),
-          o2(0x8C,0x6A),      o2(0x8C,0x6B),
-          o2(0x8C,0x6C),      o2(0x8C,0x6D),
-          o2(0xB6,0xCC),      o2(0x8C,0x6E),
-          o2(0x8C,0x6F),      o2(0x8C,0x70),
-          o2(0x8C,0x71),      o2(0x8C,0x72),
-          o2(0x8C,0x73),      o2(0x8C,0x74),
-          o2(0xB6,0xCD),      o2(0x8C,0x75),
-          o2(0x8C,0x76),      o2(0x8C,0x77),
-          o2(0x8C,0x78),      o2(0x8C,0x79),
-          o2(0x8C,0x7A),      o2(0x8C,0x81),
-          o2(0x8C,0x82),      o2(0x8C,0x83),
-          o2(0x8C,0x84),      o2(0x8C,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_18 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_19_infos[65] = {
-          o2(0x8C,0x86),      o2(0x8C,0x87),
-          o2(0x8C,0x88),      o2(0x8C,0x89),
-          o2(0x8C,0x8A),      o2(0x8C,0x8B),
-          o2(0x8C,0x8C),      o2(0x8C,0x8D),
-          o2(0xB6,0xCE),      o2(0x8C,0x8E),
-          o2(0x8C,0x8F),      o2(0x8C,0x90),
-          o2(0x8C,0x91),      o2(0x8C,0x92),
-          o2(0x8C,0x93),      o2(0x8C,0x94),
-          o2(0x8C,0x95),      o2(0x8C,0x96),
-          o2(0x8C,0x97),      o2(0x8C,0x98),
-          o2(0x8C,0x99),      o2(0x8C,0x9A),
-          o2(0x8C,0x9B),      o2(0x8C,0x9C),
-          o2(0x8C,0x9D),      o2(0x8C,0x9E),
-          o2(0x8C,0x9F),      o2(0x8C,0xA0),
-          o2(0x8C,0xA1),      o2(0x8C,0xA2),
-          o2(0x8C,0xA3),      o2(0x8C,0xA4),
-          o2(0x8C,0xA5),      o2(0x8C,0xA6),
-          o2(0x8C,0xA7),      o2(0x8C,0xA8),
-          o2(0xB6,0xCF),      o2(0x8C,0xA9),
-          o2(0x8C,0xAA),      o2(0x8C,0xAB),
-          o2(0xB6,0xD0),      o2(0x8C,0xAC),
-          o2(0x8C,0xAD),      o2(0x8C,0xAE),
-          o2(0x8C,0xAF),      o2(0x8C,0xB0),
-          o2(0x8C,0xB1),      o2(0x8C,0xB2),
-          o2(0x8C,0xB3),      o2(0x8C,0xB4),
-          o2(0x8C,0xB5),      o2(0x8C,0xB6),
-          o2(0x8C,0xB7),      o2(0x8C,0xB8),
-          o2(0x8C,0xB9),      o2(0x8C,0xBA),
-          o2(0x8C,0xBB),      o2(0x8C,0xBC),
-          o2(0x8C,0xBD),      o2(0x8C,0xBE),
-          o2(0x8C,0xBF),      o2(0x8C,0xC0),
-          o2(0x8C,0xC1),      o2(0x8C,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_19 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1A_infos[65] = {
-          o2(0x8C,0xC3),      o2(0x8C,0xC4),
-          o2(0x8C,0xC5),      o2(0x8C,0xC6),
-          o2(0x8C,0xC7),      o2(0x8C,0xC8),
-          o2(0x8C,0xC9),      o2(0x8C,0xCA),
-          o2(0x8C,0xCB),      o2(0x8C,0xCC),
-          o2(0x8C,0xCD),      o2(0x8C,0xCE),
-          o2(0x8C,0xCF),      o2(0x8C,0xD0),
-          o2(0x8C,0xD1),      o2(0x8C,0xD2),
-          o2(0x8C,0xD3),      o2(0x8C,0xD4),
-          o2(0x8C,0xD5),      o2(0x8C,0xD6),
-          o2(0x8C,0xD7),      o2(0x8C,0xD8),
-          o2(0x8C,0xD9),      o2(0x8C,0xDA),
-          o2(0x8C,0xDB),      o2(0x8C,0xDC),
-          o2(0x8C,0xDD),      o2(0x8C,0xDE),
-          o2(0xB6,0xD1),      o2(0xB6,0xD2),
-          o2(0x8C,0xDF),      o2(0x8C,0xE0),
-          o2(0xB6,0xD3),      o2(0x8C,0xE1),
-          o2(0x8C,0xE2),      o2(0x8C,0xE3),
-          o2(0xB6,0xD4),      o2(0x8C,0xE4),
-          o2(0x8C,0xE5),      o2(0x8C,0xE6),
-          o2(0x8C,0xE7),      o2(0x8C,0xE8),
-          o2(0x8C,0xE9),      o2(0xB6,0xD5),
-          o2(0xB6,0xD6),      o2(0x8C,0xEA),
-          o2(0x8C,0xEB),      o2(0x8C,0xEC),
-          o2(0x8C,0xED),      o2(0xB6,0xD7),
-          o2(0x8C,0xEE),      o2(0x8C,0xEF),
-          o2(0x8C,0xF0),      o2(0x8C,0xF1),
-          o2(0x8C,0xF2),      o2(0x8C,0xF3),
-          o2(0x8C,0xF4),      o2(0x8C,0xF5),
-          o2(0x8C,0xF6),      o2(0x8C,0xF7),
-          o2(0x8C,0xF8),      o2(0x8C,0xF9),
-          o2(0x8C,0xFA),      o2(0x8C,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1B_infos[65] = {
-          o2(0x8C,0xFC),      o2(0x8C,0xFD),
-          o2(0x8C,0xFE),      o2(0x8D,0x41),
-          o2(0x8D,0x42),      o2(0x8D,0x43),
-          o2(0x8D,0x44),      o2(0x8D,0x45),
-          o2(0x8D,0x46),      o2(0x8D,0x47),
-          o2(0x8D,0x48),      o2(0x8D,0x49),
-          o2(0x8D,0x4A),      o2(0x8D,0x4B),
-          o2(0x8D,0x4C),      o2(0x8D,0x4D),
-          o2(0x8D,0x4E),      o2(0x8D,0x4F),
-          o2(0x8D,0x50),      o2(0x8D,0x51),
-          o2(0xB6,0xD8),      o2(0x8D,0x52),
-          o2(0x8D,0x53),      o2(0x8D,0x54),
-          o2(0x8D,0x55),      o2(0x8D,0x56),
-          o2(0x8D,0x57),      o2(0x8D,0x58),
-          o2(0x8D,0x59),      o2(0x8D,0x5A),
-          o2(0x8D,0x61),      o2(0x8D,0x62),
-          o2(0x8D,0x63),      o2(0x8D,0x64),
-          o2(0x8D,0x65),      o2(0x8D,0x66),
-          o2(0x8D,0x67),      o2(0x8D,0x68),
-          o2(0x8D,0x69),      o2(0x8D,0x6A),
-          o2(0x8D,0x6B),      o2(0x8D,0x6C),
-          o2(0x8D,0x6D),      o2(0x8D,0x6E),
-          o2(0x8D,0x6F),      o2(0x8D,0x70),
-          o2(0x8D,0x71),      o2(0x8D,0x72),
-          o2(0xB6,0xD9),      o2(0x8D,0x73),
-          o2(0x8D,0x74),      o2(0x8D,0x75),
-          o2(0xB6,0xDA),      o2(0x8D,0x76),
-          o2(0x8D,0x77),      o2(0x8D,0x78),
-          o2(0xB6,0xDB),      o2(0x8D,0x79),
-          o2(0x8D,0x7A),      o2(0x8D,0x81),
-          o2(0x8D,0x82),      o2(0x8D,0x83),
-          o2(0x8D,0x84),      o2(0x8D,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1C_infos[65] = {
-          o2(0xB6,0xDC),      o2(0xB6,0xDD),
-          o2(0x8D,0x86),      o2(0x8D,0x87),
-          o2(0x8D,0x88),      o2(0xB6,0xDE),
-          o2(0x8D,0x89),      o2(0x8D,0x8A),
-          o2(0x8D,0x8B),      o2(0x8D,0x8C),
-          o2(0x8D,0x8D),      o2(0x8D,0x8E),
-          o2(0x8D,0x8F),      o2(0x8D,0x90),
-          o2(0x8D,0x91),      o2(0x8D,0x92),
-          o2(0x8D,0x93),      o2(0x8D,0x94),
-          o2(0x8D,0x95),      o2(0x8D,0x96),
-          o2(0x8D,0x97),      o2(0x8D,0x98),
-          o2(0x8D,0x99),      o2(0x8D,0x9A),
-          o2(0x8D,0x9B),      o2(0x8D,0x9C),
-          o2(0x8D,0x9D),      o2(0x8D,0x9E),
-          o2(0x8D,0x9F),      o2(0x8D,0xA0),
-          o2(0x8D,0xA1),      o2(0x8D,0xA2),
-          o2(0x8D,0xA3),      o2(0x8D,0xA4),
-          o2(0x8D,0xA5),      o2(0x8D,0xA6),
-          o2(0x8D,0xA7),      o2(0x8D,0xA8),
-          o2(0x8D,0xA9),      o2(0x8D,0xAA),
-          o2(0xB6,0xDF),      o2(0xB6,0xE0),
-          o2(0x8D,0xAB),      o2(0x8D,0xAC),
-          o2(0xB6,0xE1),      o2(0x8D,0xAD),
-          o2(0x8D,0xAE),      o2(0xB6,0xE2),
-          o2(0xB6,0xE3),      o2(0x8D,0xAF),
-          o2(0x8D,0xB0),      o2(0x8D,0xB1),
-          o2(0x8D,0xB2),      o2(0x8D,0xB3),
-          o2(0x8D,0xB4),      o2(0x8D,0xB5),
-          o2(0xB6,0xE4),      o2(0xB6,0xE5),
-          o2(0x8D,0xB6),      o2(0xB6,0xE6),
-          o2(0x8D,0xB7),      o2(0x8D,0xB8),
-          o2(0x8D,0xB9),      o2(0x8D,0xBA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1D_infos[65] = {
-          o2(0x8D,0xBB),      o2(0x8D,0xBC),
-          o2(0x8D,0xBD),      o2(0x8D,0xBE),
-          o2(0xB6,0xE7),      o2(0x8D,0xBF),
-          o2(0x8D,0xC0),      o2(0x8D,0xC1),
-          o2(0xB6,0xE8),      o2(0x8D,0xC2),
-          o2(0x8D,0xC3),      o2(0x8D,0xC4),
-          o2(0xB6,0xE9),      o2(0x8D,0xC5),
-          o2(0x8D,0xC6),      o2(0x8D,0xC7),
-          o2(0x8D,0xC8),      o2(0x8D,0xC9),
-          o2(0x8D,0xCA),      o2(0x8D,0xCB),
-          o2(0xB6,0xEA),      o2(0xB6,0xEB),
-          o2(0x8D,0xCC),      o2(0x8D,0xCD),
-          o2(0x8D,0xCE),      o2(0x8D,0xCF),
-          o2(0x8D,0xD0),      o2(0x8D,0xD1),
-          o2(0x8D,0xD2),      o2(0x8D,0xD3),
-          o2(0x8D,0xD4),      o2(0x8D,0xD5),
-          o2(0xB6,0xEC),      o2(0x8D,0xD6),
-          o2(0x8D,0xD7),      o2(0x8D,0xD8),
-          o2(0xB6,0xED),      o2(0x8D,0xD9),
-          o2(0x8D,0xDA),      o2(0x8D,0xDB),
-          o2(0xB6,0xEE),      o2(0x8D,0xDC),
-          o2(0x8D,0xDD),      o2(0x8D,0xDE),
-          o2(0x8D,0xDF),      o2(0x8D,0xE0),
-          o2(0x8D,0xE1),      o2(0x8D,0xE2),
-          o2(0xB6,0xEF),      o2(0xB6,0xF0),
-          o2(0x8D,0xE3),      o2(0xB6,0xF1),
-          o2(0x8D,0xE4),      o2(0xB6,0xF2),
-          o2(0x8D,0xE5),      o2(0x8D,0xE6),
-          o2(0x8D,0xE7),      o2(0x8D,0xE8),
-          o2(0x8D,0xE9),      o2(0x8D,0xEA),
-          o2(0xB6,0xF3),      o2(0xB6,0xF4),
-          o2(0x8D,0xEB),      o2(0x8D,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1E_infos[65] = {
-          o2(0xB6,0xF5),      o2(0x8D,0xED),
-          o2(0x8D,0xEE),      o2(0x8D,0xEF),
-          o2(0xB6,0xF6),      o2(0x8D,0xF0),
-          o2(0x8D,0xF1),      o2(0x8D,0xF2),
-          o2(0x8D,0xF3),      o2(0x8D,0xF4),
-          o2(0x8D,0xF5),      o2(0x8D,0xF6),
-          o2(0xB6,0xF7),      o2(0xB6,0xF8),
-          o2(0x8D,0xF7),      o2(0xB6,0xF9),
-          o2(0xB6,0xFA),      o2(0xB6,0xFB),
-          o2(0xB6,0xFC),      o2(0x8D,0xF8),
-          o2(0x8D,0xF9),      o2(0x8D,0xFA),
-          o2(0xB6,0xFD),      o2(0xB6,0xFE),
-          o2(0xB7,0xA1),      o2(0xB7,0xA2),
-          o2(0x8D,0xFB),      o2(0x8D,0xFC),
-          o2(0xB7,0xA3),      o2(0x8D,0xFD),
-          o2(0x8D,0xFE),      o2(0x8E,0x41),
-          o2(0xB7,0xA4),      o2(0x8E,0x42),
-          o2(0x8E,0x43),      o2(0x8E,0x44),
-          o2(0x8E,0x45),      o2(0x8E,0x46),
-          o2(0x8E,0x47),      o2(0x8E,0x48),
-          o2(0xB7,0xA5),      o2(0xB7,0xA6),
-          o2(0x8E,0x49),      o2(0xB7,0xA7),
-          o2(0xB7,0xA8),      o2(0xB7,0xA9),
-          o2(0x8E,0x4A),      o2(0x8E,0x4B),
-          o2(0x8E,0x4C),      o2(0x8E,0x4D),
-          o2(0x8E,0x4E),      o2(0x8E,0x4F),
-          o2(0xB7,0xAA),      o2(0xB7,0xAB),
-          o2(0x8E,0x50),      o2(0x8E,0x51),
-          o2(0xB7,0xAC),      o2(0x8E,0x52),
-          o2(0x8E,0x53),      o2(0x8E,0x54),
-          o2(0x8E,0x55),      o2(0x8E,0x56),
-          o2(0x8E,0x57),      o2(0x8E,0x58),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_1F_infos[65] = {
-          o2(0x8E,0x59),      o2(0x8E,0x5A),
-          o2(0x8E,0x61),      o2(0x8E,0x62),
-          o2(0x8E,0x63),      o2(0x8E,0x64),
-          o2(0x8E,0x65),      o2(0xB7,0xAD),
-          o2(0x8E,0x66),      o2(0xB7,0xAE),
-          o2(0x8E,0x67),      o2(0x8E,0x68),
-          o2(0x8E,0x69),      o2(0x8E,0x6A),
-          o2(0x8E,0x6B),      o2(0x8E,0x6C),
-          o2(0x8E,0x6D),      o2(0x8E,0x6E),
-          o2(0x8E,0x6F),      o2(0x8E,0x70),
-          o2(0x8E,0x71),      o2(0x8E,0x72),
-          o2(0x8E,0x73),      o2(0x8E,0x74),
-          o2(0x8E,0x75),      o2(0x8E,0x76),
-          o2(0x8E,0x77),      o2(0x8E,0x78),
-          o2(0x8E,0x79),      o2(0x8E,0x7A),
-          o2(0x8E,0x81),      o2(0x8E,0x82),
-          o2(0x8E,0x83),      o2(0x8E,0x84),
-          o2(0x8E,0x85),      o2(0x8E,0x86),
-          o2(0x8E,0x87),      o2(0x8E,0x88),
-          o2(0x8E,0x89),      o2(0x8E,0x8A),
-          o2(0x8E,0x8B),      o2(0x8E,0x8C),
-          o2(0x8E,0x8D),      o2(0x8E,0x8E),
-          o2(0xB7,0xAF),      o2(0xB7,0xB0),
-          o2(0x8E,0x8F),      o2(0x8E,0x90),
-          o2(0xB7,0xB1),      o2(0x8E,0x91),
-          o2(0x8E,0x92),      o2(0x8E,0x93),
-          o2(0xB7,0xB2),      o2(0x8E,0x94),
-          o2(0x8E,0x95),      o2(0x8E,0x96),
-          o2(0x8E,0x97),      o2(0x8E,0x98),
-          o2(0x8E,0x99),      o2(0x8E,0x9A),
-          o2(0xB7,0xB3),      o2(0xB7,0xB4),
-          o2(0x8E,0x9B),      o2(0xB7,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_1F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_20_infos[65] = {
-          o2(0xB7,0xB6),      o2(0xB7,0xB7),
-          o2(0x8E,0x9C),      o2(0x8E,0x9D),
-          o2(0x8E,0x9E),      o2(0x8E,0x9F),
-          o2(0x8E,0xA0),      o2(0xB7,0xB8),
-          o2(0xB7,0xB9),      o2(0xB7,0xBA),
-          o2(0x8E,0xA1),      o2(0x8E,0xA2),
-          o2(0xB7,0xBB),      o2(0x8E,0xA3),
-          o2(0x8E,0xA4),      o2(0x8E,0xA5),
-          o2(0xB7,0xBC),      o2(0x8E,0xA6),
-          o2(0x8E,0xA7),      o2(0x8E,0xA8),
-          o2(0x8E,0xA9),      o2(0x8E,0xAA),
-          o2(0x8E,0xAB),      o2(0x8E,0xAC),
-          o2(0xB7,0xBD),      o2(0xB7,0xBE),
-          o2(0x8E,0xAD),      o2(0xB7,0xBF),
-          o2(0x8E,0xAE),      o2(0xB7,0xC0),
-          o2(0x8E,0xAF),      o2(0x8E,0xB0),
-          o2(0x8E,0xB1),      o2(0x8E,0xB2),
-          o2(0x8E,0xB3),      o2(0x8E,0xB4),
-          o2(0xB7,0xC1),      o2(0xB7,0xC2),
-          o2(0x8E,0xB5),      o2(0x8E,0xB6),
-          o2(0xB7,0xC3),      o2(0x8E,0xB7),
-          o2(0x8E,0xB8),      o2(0x8E,0xB9),
-          o2(0xB7,0xC4),      o2(0x8E,0xBA),
-          o2(0x8E,0xBB),      o2(0x8E,0xBC),
-          o2(0x8E,0xBD),      o2(0x8E,0xBE),
-          o2(0x8E,0xBF),      o2(0x8E,0xC0),
-          o2(0xB7,0xC5),      o2(0xB7,0xC6),
-          o2(0x8E,0xC1),      o2(0xB7,0xC7),
-          o2(0xB7,0xC8),      o2(0xB7,0xC9),
-          o2(0x8E,0xC2),      o2(0x8E,0xC3),
-          o2(0x8E,0xC4),      o2(0x8E,0xC5),
-          o2(0x8E,0xC6),      o2(0x8E,0xC7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_20 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_21_infos[65] = {
-          o2(0xB7,0xCA),      o2(0x8E,0xC8),
-          o2(0x8E,0xC9),      o2(0x8E,0xCA),
-          o2(0xB7,0xCB),      o2(0x8E,0xCB),
-          o2(0x8E,0xCC),      o2(0x8E,0xCD),
-          o2(0x8E,0xCE),      o2(0x8E,0xCF),
-          o2(0x8E,0xD0),      o2(0x8E,0xD1),
-          o2(0x8E,0xD2),      o2(0x8E,0xD3),
-          o2(0x8E,0xD4),      o2(0x8E,0xD5),
-          o2(0x8E,0xD6),      o2(0xB7,0xCC),
-          o2(0x8E,0xD7),      o2(0xB7,0xCD),
-          o2(0x8E,0xD8),      o2(0x8E,0xD9),
-          o2(0x8E,0xDA),      o2(0x8E,0xDB),
-          o2(0x8E,0xDC),      o2(0x8E,0xDD),
-          o2(0x8E,0xDE),      o2(0x8E,0xDF),
-          o2(0xB7,0xCE),      o2(0xB7,0xCF),
-          o2(0x8E,0xE0),      o2(0x8E,0xE1),
-          o2(0xB7,0xD0),      o2(0x8E,0xE2),
-          o2(0x8E,0xE3),      o2(0x8E,0xE4),
-          o2(0xB7,0xD1),      o2(0x8E,0xE5),
-          o2(0x8E,0xE6),      o2(0x8E,0xE7),
-          o2(0x8E,0xE8),      o2(0x8E,0xE9),
-          o2(0x8E,0xEA),      o2(0x8E,0xEB),
-          o2(0xB7,0xD2),      o2(0xB7,0xD3),
-          o2(0x8E,0xEC),      o2(0xB7,0xD4),
-          o2(0x8E,0xED),      o2(0xB7,0xD5),
-          o2(0x8E,0xEE),      o2(0x8E,0xEF),
-          o2(0x8E,0xF0),      o2(0x8E,0xF1),
-          o2(0x8E,0xF2),      o2(0x8E,0xF3),
-          o2(0xB7,0xD6),      o2(0x8E,0xF4),
-          o2(0x8E,0xF5),      o2(0x8E,0xF6),
-          o2(0xB7,0xD7),      o2(0x8E,0xF7),
-          o2(0x8E,0xF8),      o2(0x8E,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_21 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_22_infos[65] = {
-          o2(0x8E,0xFA),      o2(0x8E,0xFB),
-          o2(0x8E,0xFC),      o2(0x8E,0xFD),
-          o2(0x8E,0xFE),      o2(0x8F,0x41),
-          o2(0x8F,0x42),      o2(0x8F,0x43),
-          o2(0x8F,0x44),      o2(0x8F,0x45),
-          o2(0x8F,0x46),      o2(0x8F,0x47),
-          o2(0x8F,0x48),      o2(0xB7,0xD8),
-          o2(0x8F,0x49),      o2(0x8F,0x4A),
-          o2(0x8F,0x4B),      o2(0x8F,0x4C),
-          o2(0x8F,0x4D),      o2(0x8F,0x4E),
-          o2(0x8F,0x4F),      o2(0x8F,0x50),
-          o2(0x8F,0x51),      o2(0x8F,0x52),
-          o2(0x8F,0x53),      o2(0x8F,0x54),
-          o2(0x8F,0x55),      o2(0x8F,0x56),
-          o2(0x8F,0x57),      o2(0x8F,0x58),
-          o2(0x8F,0x59),      o2(0x8F,0x5A),
-          o2(0x8F,0x61),      o2(0x8F,0x62),
-          o2(0x8F,0x63),      o2(0x8F,0x64),
-          o2(0x8F,0x65),      o2(0x8F,0x66),
-          o2(0x8F,0x67),      o2(0x8F,0x68),
-          o2(0xB7,0xD9),      o2(0x8F,0x69),
-          o2(0x8F,0x6A),      o2(0x8F,0x6B),
-          o2(0x8F,0x6C),      o2(0x8F,0x6D),
-          o2(0x8F,0x6E),      o2(0x8F,0x6F),
-          o2(0xB7,0xDA),      o2(0x8F,0x70),
-          o2(0x8F,0x71),      o2(0x8F,0x72),
-          o2(0xB7,0xDB),      o2(0x8F,0x73),
-          o2(0x8F,0x74),      o2(0x8F,0x75),
-          o2(0xB7,0xDC),      o2(0x8F,0x76),
-          o2(0x8F,0x77),      o2(0x8F,0x78),
-          o2(0x8F,0x79),      o2(0x8F,0x7A),
-          o2(0x8F,0x81),      o2(0x8F,0x82),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_22 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_23_infos[65] = {
-          o2(0xB7,0xDD),      o2(0xB7,0xDE),
-          o2(0x8F,0x83),      o2(0xB7,0xDF),
-          o2(0x8F,0x84),      o2(0xB7,0xE0),
-          o2(0x8F,0x85),      o2(0x8F,0x86),
-          o2(0x8F,0x87),      o2(0x8F,0x88),
-          o2(0x8F,0x89),      o2(0x8F,0x8A),
-          o2(0xB7,0xE1),      o2(0x8F,0x8B),
-          o2(0x8F,0x8C),      o2(0x8F,0x8D),
-          o2(0xB7,0xE2),      o2(0x8F,0x8E),
-          o2(0x8F,0x8F),      o2(0x8F,0x90),
-          o2(0xB7,0xE3),      o2(0x8F,0x91),
-          o2(0x8F,0x92),      o2(0x8F,0x93),
-          o2(0x8F,0x94),      o2(0x8F,0x95),
-          o2(0x8F,0x96),      o2(0x8F,0x97),
-          o2(0x8F,0x98),      o2(0xB7,0xE4),
-          o2(0x8F,0x99),      o2(0xB7,0xE5),
-          o2(0x8F,0x9A),      o2(0xB7,0xE6),
-          o2(0x8F,0x9B),      o2(0x8F,0x9C),
-          o2(0x8F,0x9D),      o2(0x8F,0x9E),
-          o2(0x8F,0x9F),      o2(0x8F,0xA0),
-          o2(0xB7,0xE7),      o2(0xB7,0xE8),
-          o2(0x8F,0xA1),      o2(0x8F,0xA2),
-          o2(0xB7,0xE9),      o2(0x8F,0xA3),
-          o2(0x8F,0xA4),      o2(0x8F,0xA5),
-          o2(0xB7,0xEA),      o2(0x8F,0xA6),
-          o2(0x8F,0xA7),      o2(0x8F,0xA8),
-          o2(0x8F,0xA9),      o2(0x8F,0xAA),
-          o2(0x8F,0xAB),      o2(0x8F,0xAC),
-          o2(0xB7,0xEB),      o2(0xB7,0xEC),
-          o2(0x8F,0xAD),      o2(0xB7,0xED),
-          o2(0x8F,0xAE),      o2(0xB7,0xEE),
-          o2(0x8F,0xAF),      o2(0x8F,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_23 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_24_infos[65] = {
-          o2(0x8F,0xB1),      o2(0x8F,0xB2),
-          o2(0x8F,0xB3),      o2(0x8F,0xB4),
-          o2(0xB7,0xEF),      o2(0x8F,0xB5),
-          o2(0x8F,0xB6),      o2(0x8F,0xB7),
-          o2(0x8F,0xB8),      o2(0x8F,0xB9),
-          o2(0x8F,0xBA),      o2(0x8F,0xBB),
-          o2(0x8F,0xBC),      o2(0x8F,0xBD),
-          o2(0x8F,0xBE),      o2(0x8F,0xBF),
-          o2(0x8F,0xC0),      o2(0x8F,0xC1),
-          o2(0x8F,0xC2),      o2(0x8F,0xC3),
-          o2(0x8F,0xC4),      o2(0x8F,0xC5),
-          o2(0x8F,0xC6),      o2(0x8F,0xC7),
-          o2(0xB7,0xF0),      o2(0x8F,0xC8),
-          o2(0x8F,0xC9),      o2(0x8F,0xCA),
-          o2(0x8F,0xCB),      o2(0x8F,0xCC),
-          o2(0x8F,0xCD),      o2(0x8F,0xCE),
-          o2(0xB7,0xF1),      o2(0x8F,0xCF),
-          o2(0x8F,0xD0),      o2(0x8F,0xD1),
-          o2(0x8F,0xD2),      o2(0x8F,0xD3),
-          o2(0x8F,0xD4),      o2(0x8F,0xD5),
-          o2(0x8F,0xD6),      o2(0x8F,0xD7),
-          o2(0x8F,0xD8),      o2(0x8F,0xD9),
-          o2(0x8F,0xDA),      o2(0x8F,0xDB),
-          o2(0x8F,0xDC),      o2(0x8F,0xDD),
-          o2(0x8F,0xDE),      o2(0x8F,0xDF),
-          o2(0x8F,0xE0),      o2(0x8F,0xE1),
-          o2(0x8F,0xE2),      o2(0x8F,0xE3),
-          o2(0x8F,0xE4),      o2(0x8F,0xE5),
-          o2(0x8F,0xE6),      o2(0x8F,0xE7),
-          o2(0x8F,0xE8),      o2(0x8F,0xE9),
-          o2(0xB7,0xF2),      o2(0xB7,0xF3),
-          o2(0x8F,0xEA),      o2(0x8F,0xEB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_24 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_25_infos[65] = {
-          o2(0xB7,0xF4),      o2(0x8F,0xEC),
-          o2(0x8F,0xED),      o2(0x8F,0xEE),
-          o2(0xB7,0xF5),      o2(0x8F,0xEF),
-          o2(0x8F,0xF0),      o2(0x8F,0xF1),
-          o2(0x8F,0xF2),      o2(0x8F,0xF3),
-          o2(0x8F,0xF4),      o2(0x8F,0xF5),
-          o2(0xB7,0xF6),      o2(0x8F,0xF6),
-          o2(0x8F,0xF7),      o2(0xB7,0xF7),
-          o2(0x8F,0xF8),      o2(0xB7,0xF8),
-          o2(0x8F,0xF9),      o2(0x8F,0xFA),
-          o2(0x8F,0xFB),      o2(0x8F,0xFC),
-          o2(0x8F,0xFD),      o2(0x8F,0xFE),
-          o2(0xB7,0xF9),      o2(0xB7,0xFA),
-          o2(0x90,0x41),      o2(0x90,0x42),
-          o2(0xB7,0xFB),      o2(0x90,0x43),
-          o2(0x90,0x44),      o2(0x90,0x45),
-          o2(0xB7,0xFC),      o2(0x90,0x46),
-          o2(0x90,0x47),      o2(0x90,0x48),
-          o2(0x90,0x49),      o2(0x90,0x4A),
-          o2(0x90,0x4B),      o2(0x90,0x4C),
-          o2(0xB7,0xFD),      o2(0xB7,0xFE),
-          o2(0x90,0x4D),      o2(0xB8,0xA1),
-          o2(0x90,0x4E),      o2(0xB8,0xA2),
-          o2(0x90,0x4F),      o2(0x90,0x50),
-          o2(0x90,0x51),      o2(0x90,0x52),
-          o2(0x90,0x53),      o2(0x90,0x54),
-          o2(0xB8,0xA3),      o2(0xB8,0xA4),
-          o2(0x90,0x55),      o2(0x90,0x56),
-          o2(0xB8,0xA5),      o2(0x90,0x57),
-          o2(0x90,0x58),      o2(0x90,0x59),
-          o2(0xB8,0xA6),      o2(0x90,0x5A),
-          o2(0x90,0x61),      o2(0x90,0x62),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_25 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_26_infos[65] = {
-          o2(0x90,0x63),      o2(0x90,0x64),
-          o2(0x90,0x65),      o2(0x90,0x66),
-          o2(0xB8,0xA7),      o2(0xB8,0xA8),
-          o2(0x90,0x67),      o2(0xB8,0xA9),
-          o2(0x90,0x68),      o2(0xB8,0xAA),
-          o2(0xB8,0xAB),      o2(0x90,0x69),
-          o2(0x90,0x6A),      o2(0xB8,0xAC),
-          o2(0xB8,0xAD),      o2(0x90,0x6B),
-          o2(0x90,0x6C),      o2(0x90,0x6D),
-          o2(0x90,0x6E),      o2(0x90,0x6F),
-          o2(0x90,0x70),      o2(0x90,0x71),
-          o2(0x90,0x72),      o2(0x90,0x73),
-          o2(0x90,0x74),      o2(0x90,0x75),
-          o2(0x90,0x76),      o2(0x90,0x77),
-          o2(0x90,0x78),      o2(0x90,0x79),
-          o2(0x90,0x7A),      o2(0x90,0x81),
-          o2(0x90,0x82),      o2(0x90,0x83),
-          o2(0x90,0x84),      o2(0x90,0x85),
-          o2(0x90,0x86),      o2(0x90,0x87),
-          o2(0x90,0x88),      o2(0x90,0x89),
-          o2(0x90,0x8A),      o2(0x90,0x8B),
-          o2(0x90,0x8C),      o2(0x90,0x8D),
-          o2(0xB8,0xAE),      o2(0xB8,0xAF),
-          o2(0x90,0x8E),      o2(0x90,0x8F),
-          o2(0xB8,0xB0),      o2(0x90,0x90),
-          o2(0x90,0x91),      o2(0x90,0x92),
-          o2(0xB8,0xB1),      o2(0x90,0x93),
-          o2(0x90,0x94),      o2(0x90,0x95),
-          o2(0x90,0x96),      o2(0x90,0x97),
-          o2(0x90,0x98),      o2(0x90,0x99),
-          o2(0xB8,0xB2),      o2(0xB8,0xB3),
-          o2(0x90,0x9A),      o2(0xB8,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_26 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_27_infos[65] = {
-          o2(0x90,0x9B),      o2(0xB8,0xB5),
-          o2(0x90,0x9C),      o2(0x90,0x9D),
-          o2(0x90,0x9E),      o2(0x90,0x9F),
-          o2(0x90,0xA0),      o2(0x90,0xA1),
-          o2(0xB8,0xB6),      o2(0xB8,0xB7),
-          o2(0x90,0xA2),      o2(0x90,0xA3),
-          o2(0xB8,0xB8),      o2(0x90,0xA4),
-          o2(0xB8,0xB9),      o2(0xB8,0xBA),
-          o2(0xB8,0xBB),      o2(0xB8,0xBC),
-          o2(0xB8,0xBD),      o2(0x90,0xA5),
-          o2(0x90,0xA6),      o2(0x90,0xA7),
-          o2(0x90,0xA8),      o2(0x90,0xA9),
-          o2(0xB8,0xBE),      o2(0xB8,0xBF),
-          o2(0x90,0xAA),      o2(0xB8,0xC0),
-          o2(0x90,0xAB),      o2(0xB8,0xC1),
-          o2(0xB8,0xC2),      o2(0x90,0xAC),
-          o2(0x90,0xAD),      o2(0xB8,0xC3),
-          o2(0x90,0xAE),      o2(0xB8,0xC4),
-          o2(0xB8,0xC5),      o2(0xB8,0xC6),
-          o2(0x90,0xAF),      o2(0x90,0xB0),
-          o2(0xB8,0xC7),      o2(0x90,0xB1),
-          o2(0x90,0xB2),      o2(0x90,0xB3),
-          o2(0xB8,0xC8),      o2(0x90,0xB4),
-          o2(0x90,0xB5),      o2(0x90,0xB6),
-          o2(0x90,0xB7),      o2(0x90,0xB8),
-          o2(0x90,0xB9),      o2(0x90,0xBA),
-          o2(0xB8,0xC9),      o2(0xB8,0xCA),
-          o2(0x90,0xBB),      o2(0xB8,0xCB),
-          o2(0xB8,0xCC),      o2(0xB8,0xCD),
-          o2(0xB8,0xCE),      o2(0x90,0xBC),
-          o2(0x90,0xBD),      o2(0x90,0xBE),
-          o2(0x90,0xBF),      o2(0x90,0xC0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_27 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_28_infos[65] = {
-          o2(0xB8,0xCF),      o2(0xB8,0xD0),
-          o2(0x90,0xC1),      o2(0x90,0xC2),
-          o2(0x90,0xC3),      o2(0x90,0xC4),
-          o2(0x90,0xC5),      o2(0x90,0xC6),
-          o2(0xB8,0xD1),      o2(0x90,0xC7),
-          o2(0x90,0xC8),      o2(0x90,0xC9),
-          o2(0x90,0xCA),      o2(0x90,0xCB),
-          o2(0x90,0xCC),      o2(0x90,0xCD),
-          o2(0x90,0xCE),      o2(0x90,0xCF),
-          o2(0x90,0xD0),      o2(0x90,0xD1),
-          o2(0x90,0xD2),      o2(0xB8,0xD2),
-          o2(0x90,0xD3),      o2(0x90,0xD4),
-          o2(0x90,0xD5),      o2(0x90,0xD6),
-          o2(0x90,0xD7),      o2(0x90,0xD8),
-          o2(0x90,0xD9),      o2(0x90,0xDA),
-          o2(0x90,0xDB),      o2(0x90,0xDC),
-          o2(0x90,0xDD),      o2(0x90,0xDE),
-          o2(0x90,0xDF),      o2(0x90,0xE0),
-          o2(0x90,0xE1),      o2(0x90,0xE2),
-          o2(0x90,0xE3),      o2(0x90,0xE4),
-          o2(0x90,0xE5),      o2(0x90,0xE6),
-          o2(0x90,0xE7),      o2(0x90,0xE8),
-          o2(0x90,0xE9),      o2(0x90,0xEA),
-          o2(0x90,0xEB),      o2(0x90,0xEC),
-          o2(0x90,0xED),      o2(0x90,0xEE),
-          o2(0x90,0xEF),      o2(0x90,0xF0),
-          o2(0x90,0xF1),      o2(0x90,0xF2),
-          o2(0x90,0xF3),      o2(0x90,0xF4),
-          o2(0xB8,0xD3),      o2(0xB8,0xD4),
-          o2(0x90,0xF5),      o2(0x90,0xF6),
-          o2(0xB8,0xD5),      o2(0x90,0xF7),
-          o2(0x90,0xF8),      o2(0x90,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_28 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_29_infos[65] = {
-          o2(0xB8,0xD6),      o2(0x90,0xFA),
-          o2(0xB8,0xD7),      o2(0x90,0xFB),
-          o2(0x90,0xFC),      o2(0x90,0xFD),
-          o2(0x90,0xFE),      o2(0x91,0x41),
-          o2(0xB8,0xD8),      o2(0xB8,0xD9),
-          o2(0x91,0x42),      o2(0xB8,0xDA),
-          o2(0x91,0x43),      o2(0xB8,0xDB),
-          o2(0xB8,0xDC),      o2(0x91,0x44),
-          o2(0x91,0x45),      o2(0x91,0x46),
-          o2(0x91,0x47),      o2(0xB8,0xDD),
-          o2(0xB8,0xDE),      o2(0xB8,0xDF),
-          o2(0x91,0x48),      o2(0x91,0x49),
-          o2(0xB8,0xE0),      o2(0x91,0x4A),
-          o2(0x91,0x4B),      o2(0x91,0x4C),
-          o2(0xB8,0xE1),      o2(0x91,0x4D),
-          o2(0x91,0x4E),      o2(0x91,0x4F),
-          o2(0x91,0x50),      o2(0x91,0x51),
-          o2(0x91,0x52),      o2(0x91,0x53),
-          o2(0xB8,0xE2),      o2(0xB8,0xE3),
-          o2(0x91,0x54),      o2(0xB8,0xE4),
-          o2(0xB8,0xE5),      o2(0xB8,0xE6),
-          o2(0x91,0x55),      o2(0x91,0x56),
-          o2(0x91,0x57),      o2(0x91,0x58),
-          o2(0x91,0x59),      o2(0x91,0x5A),
-          o2(0xB8,0xE7),      o2(0xB8,0xE8),
-          o2(0x91,0x61),      o2(0x91,0x62),
-          o2(0xB8,0xE9),      o2(0x91,0x63),
-          o2(0x91,0x64),      o2(0x91,0x65),
-          o2(0xB8,0xEA),      o2(0x91,0x66),
-          o2(0x91,0x67),      o2(0x91,0x68),
-          o2(0x91,0x69),      o2(0x91,0x6A),
-          o2(0x91,0x6B),      o2(0x91,0x6C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_29 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2A_infos[65] = {
-          o2(0x91,0x6D),      o2(0x91,0x6E),
-          o2(0x91,0x6F),      o2(0xB8,0xEB),
-          o2(0xB8,0xEC),      o2(0xB8,0xED),
-          o2(0x91,0x70),      o2(0xB8,0xEE),
-          o2(0x91,0x71),      o2(0x91,0x72),
-          o2(0x91,0x73),      o2(0x91,0x74),
-          o2(0xB8,0xEF),      o2(0x91,0x75),
-          o2(0x91,0x76),      o2(0x91,0x77),
-          o2(0x91,0x78),      o2(0x91,0x79),
-          o2(0x91,0x7A),      o2(0x91,0x81),
-          o2(0x91,0x82),      o2(0x91,0x83),
-          o2(0x91,0x84),      o2(0x91,0x85),
-          o2(0x91,0x86),      o2(0x91,0x87),
-          o2(0x91,0x88),      o2(0x91,0x89),
-          o2(0x91,0x8A),      o2(0x91,0x8B),
-          o2(0x91,0x8C),      o2(0x91,0x8D),
-          o2(0x91,0x8E),      o2(0x91,0x8F),
-          o2(0x91,0x90),      o2(0x91,0x91),
-          o2(0x91,0x92),      o2(0x91,0x93),
-          o2(0x91,0x94),      o2(0x91,0x95),
-          o2(0xB8,0xF0),      o2(0xB8,0xF1),
-          o2(0x91,0x96),      o2(0xB8,0xF2),
-          o2(0xB8,0xF3),      o2(0x91,0x97),
-          o2(0x91,0x98),      o2(0x91,0x99),
-          o2(0xB8,0xF4),      o2(0x91,0x9A),
-          o2(0xB8,0xF5),      o2(0x91,0x9B),
-          o2(0x91,0x9C),      o2(0x91,0x9D),
-          o2(0x91,0x9E),      o2(0x91,0x9F),
-          o2(0xB8,0xF6),      o2(0xB8,0xF7),
-          o2(0x91,0xA0),      o2(0xB8,0xF8),
-          o2(0x91,0xA1),      o2(0xB8,0xF9),
-          o2(0x91,0xA2),      o2(0x91,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2B_infos[65] = {
-          o2(0x91,0xA4),      o2(0x91,0xA5),
-          o2(0x91,0xA6),      o2(0x91,0xA7),
-          o2(0xB8,0xFA),      o2(0x91,0xA8),
-          o2(0x91,0xA9),      o2(0x91,0xAA),
-          o2(0xB8,0xFB),      o2(0x91,0xAB),
-          o2(0x91,0xAC),      o2(0x91,0xAD),
-          o2(0x91,0xAE),      o2(0x91,0xAF),
-          o2(0x91,0xB0),      o2(0x91,0xB1),
-          o2(0x91,0xB2),      o2(0x91,0xB3),
-          o2(0x91,0xB4),      o2(0x91,0xB5),
-          o2(0x91,0xB6),      o2(0x91,0xB7),
-          o2(0x91,0xB8),      o2(0x91,0xB9),
-          o2(0xB8,0xFC),      o2(0xB8,0xFD),
-          o2(0x91,0xBA),      o2(0x91,0xBB),
-          o2(0x91,0xBC),      o2(0x91,0xBD),
-          o2(0x91,0xBE),      o2(0x91,0xBF),
-          o2(0x91,0xC0),      o2(0x91,0xC1),
-          o2(0x91,0xC2),      o2(0x91,0xC3),
-          o2(0x91,0xC4),      o2(0x91,0xC5),
-          o2(0x91,0xC6),      o2(0x91,0xC7),
-          o2(0x91,0xC8),      o2(0x91,0xC9),
-          o2(0x91,0xCA),      o2(0x91,0xCB),
-          o2(0x91,0xCC),      o2(0x91,0xCD),
-          o2(0x91,0xCE),      o2(0x91,0xCF),
-          o2(0x91,0xD0),      o2(0x91,0xD1),
-          o2(0x91,0xD2),      o2(0x91,0xD3),
-          o2(0x91,0xD4),      o2(0x91,0xD5),
-          o2(0x91,0xD6),      o2(0x91,0xD7),
-          o2(0x91,0xD8),      o2(0x91,0xD9),
-          o2(0x91,0xDA),      o2(0x91,0xDB),
-          o2(0xB8,0xFE),      o2(0x91,0xDC),
-          o2(0x91,0xDD),      o2(0x91,0xDE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2C_infos[65] = {
-          o2(0xB9,0xA1),      o2(0x91,0xDF),
-          o2(0x91,0xE0),      o2(0x91,0xE1),
-          o2(0xB9,0xA2),      o2(0x91,0xE2),
-          o2(0x91,0xE3),      o2(0x91,0xE4),
-          o2(0x91,0xE5),      o2(0x91,0xE6),
-          o2(0x91,0xE7),      o2(0x91,0xE8),
-          o2(0x91,0xE9),      o2(0xB9,0xA3),
-          o2(0x91,0xEA),      o2(0xB9,0xA4),
-          o2(0x91,0xEB),      o2(0xB9,0xA5),
-          o2(0x91,0xEC),      o2(0x91,0xED),
-          o2(0x91,0xEE),      o2(0x91,0xEF),
-          o2(0x91,0xF0),      o2(0x91,0xF1),
-          o2(0xB9,0xA6),      o2(0x91,0xF2),
-          o2(0x91,0xF3),      o2(0x91,0xF4),
-          o2(0xB9,0xA7),      o2(0x91,0xF5),
-          o2(0x91,0xF6),      o2(0x91,0xF7),
-          o2(0xB9,0xA8),      o2(0x91,0xF8),
-          o2(0x91,0xF9),      o2(0x91,0xFA),
-          o2(0x91,0xFB),      o2(0x91,0xFC),
-          o2(0x91,0xFD),      o2(0x91,0xFE),
-          o2(0x92,0x41),      o2(0xB9,0xA9),
-          o2(0x92,0x42),      o2(0xB9,0xAA),
-          o2(0x92,0x43),      o2(0x92,0x44),
-          o2(0x92,0x45),      o2(0x92,0x46),
-          o2(0x92,0x47),      o2(0x92,0x48),
-          o2(0x92,0x49),      o2(0x92,0x4A),
-          o2(0xB9,0xAB),      o2(0xB9,0xAC),
-          o2(0xB9,0xAD),      o2(0x92,0x4B),
-          o2(0xB9,0xAE),      o2(0x92,0x4C),
-          o2(0x92,0x4D),      o2(0xB9,0xAF),
-          o2(0xB9,0xB0),      o2(0xB9,0xB1),
-          o2(0xB9,0xB2),      o2(0x92,0x4E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2D_infos[65] = {
-          o2(0x92,0x4F),      o2(0x92,0x50),
-          o2(0x92,0x51),      o2(0x92,0x52),
-          o2(0xB9,0xB3),      o2(0xB9,0xB4),
-          o2(0x92,0x53),      o2(0xB9,0xB5),
-          o2(0x92,0x54),      o2(0xB9,0xB6),
-          o2(0x92,0x55),      o2(0x92,0x56),
-          o2(0x92,0x57),      o2(0xB9,0xB7),
-          o2(0x92,0x58),      o2(0xB9,0xB8),
-          o2(0xB9,0xB9),      o2(0x92,0x59),
-          o2(0x92,0x5A),      o2(0x92,0x61),
-          o2(0xB9,0xBA),      o2(0x92,0x62),
-          o2(0x92,0x63),      o2(0x92,0x64),
-          o2(0xB9,0xBB),      o2(0x92,0x65),
-          o2(0x92,0x66),      o2(0x92,0x67),
-          o2(0x92,0x68),      o2(0x92,0x69),
-          o2(0x92,0x6A),      o2(0x92,0x6B),
-          o2(0x92,0x6C),      o2(0xB9,0xBC),
-          o2(0x92,0x6D),      o2(0xB9,0xBD),
-          o2(0x92,0x6E),      o2(0x92,0x6F),
-          o2(0x92,0x70),      o2(0x92,0x71),
-          o2(0x92,0x72),      o2(0x92,0x73),
-          o2(0x92,0x74),      o2(0x92,0x75),
-          o2(0xB9,0xBE),      o2(0x92,0x76),
-          o2(0x92,0x77),      o2(0x92,0x78),
-          o2(0x92,0x79),      o2(0x92,0x7A),
-          o2(0x92,0x81),      o2(0x92,0x82),
-          o2(0x92,0x83),      o2(0x92,0x84),
-          o2(0x92,0x85),      o2(0x92,0x86),
-          o2(0x92,0x87),      o2(0x92,0x88),
-          o2(0x92,0x89),      o2(0x92,0x8A),
-          o2(0x92,0x8B),      o2(0x92,0x8C),
-          o2(0x92,0x8D),      o2(0x92,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2E_infos[65] = {
-          o2(0x92,0x8F),      o2(0x92,0x90),
-          o2(0x92,0x91),      o2(0x92,0x92),
-          o2(0x92,0x93),      o2(0x92,0x94),
-          o2(0x92,0x95),      o2(0x92,0x96),
-          o2(0xB9,0xBF),      o2(0x92,0x97),
-          o2(0x92,0x98),      o2(0x92,0x99),
-          o2(0xB9,0xC0),      o2(0x92,0x9A),
-          o2(0x92,0x9B),      o2(0x92,0x9C),
-          o2(0xB9,0xC1),      o2(0x92,0x9D),
-          o2(0x92,0x9E),      o2(0x92,0x9F),
-          o2(0x92,0xA0),      o2(0x92,0xA1),
-          o2(0x92,0xA2),      o2(0x92,0xA3),
-          o2(0x92,0xA4),      o2(0x92,0xA5),
-          o2(0x92,0xA6),      o2(0x92,0xA7),
-          o2(0x92,0xA8),      o2(0x92,0xA9),
-          o2(0x92,0xAA),      o2(0x92,0xAB),
-          o2(0x92,0xAC),      o2(0x92,0xAD),
-          o2(0x92,0xAE),      o2(0x92,0xAF),
-          o2(0xB9,0xC2),      o2(0x92,0xB0),
-          o2(0x92,0xB1),      o2(0x92,0xB2),
-          o2(0xB9,0xC3),      o2(0x92,0xB3),
-          o2(0x92,0xB4),      o2(0x92,0xB5),
-          o2(0xB9,0xC4),      o2(0x92,0xB6),
-          o2(0x92,0xB7),      o2(0x92,0xB8),
-          o2(0x92,0xB9),      o2(0x92,0xBA),
-          o2(0x92,0xBB),      o2(0x92,0xBC),
-          o2(0xB9,0xC5),      o2(0x92,0xBD),
-          o2(0x92,0xBE),      o2(0xB9,0xC6),
-          o2(0x92,0xBF),      o2(0x92,0xC0),
-          o2(0x92,0xC1),      o2(0x92,0xC2),
-          o2(0x92,0xC3),      o2(0x92,0xC4),
-          o2(0x92,0xC5),      o2(0x92,0xC6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_2F_infos[65] = {
-          o2(0xB9,0xC7),      o2(0x92,0xC7),
-          o2(0x92,0xC8),      o2(0x92,0xC9),
-          o2(0xB9,0xC8),      o2(0x92,0xCA),
-          o2(0x92,0xCB),      o2(0x92,0xCC),
-          o2(0xB9,0xC9),      o2(0x92,0xCD),
-          o2(0x92,0xCE),      o2(0x92,0xCF),
-          o2(0x92,0xD0),      o2(0x92,0xD1),
-          o2(0x92,0xD2),      o2(0x92,0xD3),
-          o2(0xB9,0xCA),      o2(0x92,0xD4),
-          o2(0x92,0xD5),      o2(0xB9,0xCB),
-          o2(0x92,0xD6),      o2(0x92,0xD7),
-          o2(0x92,0xD8),      o2(0x92,0xD9),
-          o2(0x92,0xDA),      o2(0x92,0xDB),
-          o2(0x92,0xDC),      o2(0x92,0xDD),
-          o2(0x92,0xDE),      o2(0x92,0xDF),
-          o2(0x92,0xE0),      o2(0x92,0xE1),
-          o2(0x92,0xE2),      o2(0x92,0xE3),
-          o2(0x92,0xE4),      o2(0x92,0xE5),
-          o2(0x92,0xE6),      o2(0x92,0xE7),
-          o2(0x92,0xE8),      o2(0x92,0xE9),
-          o2(0x92,0xEA),      o2(0x92,0xEB),
-          o2(0x92,0xEC),      o2(0x92,0xED),
-          o2(0x92,0xEE),      o2(0x92,0xEF),
-          o2(0x92,0xF0),      o2(0x92,0xF1),
-          o2(0x92,0xF2),      o2(0x92,0xF3),
-          o2(0x92,0xF4),      o2(0x92,0xF5),
-          o2(0x92,0xF6),      o2(0x92,0xF7),
-          o2(0x92,0xF8),      o2(0x92,0xF9),
-          o2(0xB9,0xCC),      o2(0xB9,0xCD),
-          o2(0x92,0xFA),      o2(0x92,0xFB),
-          o2(0xB9,0xCE),      o2(0x92,0xFC),
-          o2(0x92,0xFD),      o2(0xB9,0xCF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_2F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_30_infos[65] = {
-          o2(0xB9,0xD0),      o2(0x92,0xFE),
-          o2(0xB9,0xD1),      o2(0x93,0x41),
-          o2(0x93,0x42),      o2(0x93,0x43),
-          o2(0x93,0x44),      o2(0x93,0x45),
-          o2(0xB9,0xD2),      o2(0xB9,0xD3),
-          o2(0x93,0x46),      o2(0xB9,0xD4),
-          o2(0xB9,0xD5),      o2(0xB9,0xD6),
-          o2(0x93,0x47),      o2(0xB9,0xD7),
-          o2(0x93,0x48),      o2(0xB9,0xD8),
-          o2(0x93,0x49),      o2(0x93,0x4A),
-          o2(0xB9,0xD9),      o2(0xB9,0xDA),
-          o2(0xB9,0xDB),      o2(0xB9,0xDC),
-          o2(0xB9,0xDD),      o2(0x93,0x4B),
-          o2(0x93,0x4C),      o2(0xB9,0xDE),
-          o2(0xB9,0xDF),      o2(0xB9,0xE0),
-          o2(0xB9,0xE1),      o2(0xB9,0xE2),
-          o2(0x93,0x4D),      o2(0x93,0x4E),
-          o2(0x93,0x4F),      o2(0x93,0x50),
-          o2(0xB9,0xE3),      o2(0xB9,0xE4),
-          o2(0x93,0x51),      o2(0xB9,0xE5),
-          o2(0x93,0x52),      o2(0xB9,0xE6),
-          o2(0x93,0x53),      o2(0x93,0x54),
-          o2(0x93,0x55),      o2(0xB9,0xE7),
-          o2(0x93,0x56),      o2(0x93,0x57),
-          o2(0xB9,0xE8),      o2(0xB9,0xE9),
-          o2(0x93,0x58),      o2(0x93,0x59),
-          o2(0xB9,0xEA),      o2(0x93,0x5A),
-          o2(0x93,0x61),      o2(0x93,0x62),
-          o2(0xB9,0xEB),      o2(0x93,0x63),
-          o2(0x93,0x64),      o2(0x93,0x65),
-          o2(0x93,0x66),      o2(0x93,0x67),
-          o2(0x93,0x68),      o2(0x93,0x69),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_30 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_31_infos[65] = {
-          o2(0xB9,0xEC),      o2(0xB9,0xED),
-          o2(0x93,0x6A),      o2(0xB9,0xEE),
-          o2(0xB9,0xEF),      o2(0xB9,0xF0),
-          o2(0x93,0x6B),      o2(0x93,0x6C),
-          o2(0x93,0x6D),      o2(0xB9,0xF1),
-          o2(0x93,0x6E),      o2(0x93,0x6F),
-          o2(0xB9,0xF2),      o2(0xB9,0xF3),
-          o2(0x93,0x70),      o2(0x93,0x71),
-          o2(0xB9,0xF4),      o2(0x93,0x72),
-          o2(0x93,0x73),      o2(0x93,0x74),
-          o2(0x93,0x75),      o2(0x93,0x76),
-          o2(0x93,0x77),      o2(0x93,0x78),
-          o2(0x93,0x79),      o2(0x93,0x7A),
-          o2(0x93,0x81),      o2(0x93,0x82),
-          o2(0x93,0x83),      o2(0xB9,0xF5),
-          o2(0x93,0x84),      o2(0x93,0x85),
-          o2(0x93,0x86),      o2(0x93,0x87),
-          o2(0x93,0x88),      o2(0x93,0x89),
-          o2(0x93,0x8A),      o2(0x93,0x8B),
-          o2(0x93,0x8C),      o2(0x93,0x8D),
-          o2(0x93,0x8E),      o2(0x93,0x8F),
-          o2(0x93,0x90),      o2(0x93,0x91),
-          o2(0x93,0x92),      o2(0x93,0x93),
-          o2(0x93,0x94),      o2(0x93,0x95),
-          o2(0x93,0x96),      o2(0x93,0x97),
-          o2(0x93,0x98),      o2(0x93,0x99),
-          o2(0x93,0x9A),      o2(0x93,0x9B),
-          o2(0x93,0x9C),      o2(0x93,0x9D),
-          o2(0x93,0x9E),      o2(0x93,0x9F),
-          o2(0x93,0xA0),      o2(0x93,0xA1),
-          o2(0x93,0xA2),      o2(0x93,0xA3),
-          o2(0x93,0xA4),      o2(0x93,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_31 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_32_infos[65] = {
-          o2(0x93,0xA6),      o2(0x93,0xA7),
-          o2(0x93,0xA8),      o2(0x93,0xA9),
-          o2(0xB9,0xF6),      o2(0xB9,0xF7),
-          o2(0x93,0xAA),      o2(0x93,0xAB),
-          o2(0xB9,0xF8),      o2(0x93,0xAC),
-          o2(0x93,0xAD),      o2(0xB9,0xF9),
-          o2(0xB9,0xFA),      o2(0x93,0xAE),
-          o2(0xB9,0xFB),      o2(0x93,0xAF),
-          o2(0x93,0xB0),      o2(0x93,0xB1),
-          o2(0x93,0xB2),      o2(0x93,0xB3),
-          o2(0xB9,0xFC),      o2(0xB9,0xFD),
-          o2(0x93,0xB4),      o2(0xB9,0xFE),
-          o2(0x93,0xB5),      o2(0xBA,0xA1),
-          o2(0xBA,0xA2),      o2(0x93,0xB6),
-          o2(0x93,0xB7),      o2(0x93,0xB8),
-          o2(0x93,0xB9),      o2(0x93,0xBA),
-          o2(0xBA,0xA3),      o2(0xBA,0xA4),
-          o2(0x93,0xBB),      o2(0x93,0xBC),
-          o2(0xBA,0xA5),      o2(0x93,0xBD),
-          o2(0x93,0xBE),      o2(0xBA,0xA6),
-          o2(0xBA,0xA7),      o2(0x93,0xBF),
-          o2(0x93,0xC0),      o2(0x93,0xC1),
-          o2(0x93,0xC2),      o2(0x93,0xC3),
-          o2(0x93,0xC4),      o2(0x93,0xC5),
-          o2(0xBA,0xA8),      o2(0xBA,0xA9),
-          o2(0x93,0xC6),      o2(0xBA,0xAA),
-          o2(0xBA,0xAB),      o2(0xBA,0xAC),
-          o2(0x93,0xC7),      o2(0x93,0xC8),
-          o2(0x93,0xC9),      o2(0x93,0xCA),
-          o2(0x93,0xCB),      o2(0x93,0xCC),
-          o2(0xBA,0xAD),      o2(0xBA,0xAE),
-          o2(0x93,0xCD),      o2(0x93,0xCE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_32 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_33_infos[65] = {
-          o2(0xBA,0xAF),      o2(0x93,0xCF),
-          o2(0x93,0xD0),      o2(0x93,0xD1),
-          o2(0xBA,0xB0),      o2(0x93,0xD2),
-          o2(0x93,0xD3),      o2(0x93,0xD4),
-          o2(0x93,0xD5),      o2(0x93,0xD6),
-          o2(0x93,0xD7),      o2(0x93,0xD8),
-          o2(0x93,0xD9),      o2(0xBA,0xB1),
-          o2(0x93,0xDA),      o2(0xBA,0xB2),
-          o2(0xBA,0xB3),      o2(0xBA,0xB4),
-          o2(0x93,0xDB),      o2(0x93,0xDC),
-          o2(0x93,0xDD),      o2(0xBA,0xB5),
-          o2(0x93,0xDE),      o2(0x93,0xDF),
-          o2(0xBA,0xB6),      o2(0x93,0xE0),
-          o2(0x93,0xE1),      o2(0x93,0xE2),
-          o2(0xBA,0xB7),      o2(0x93,0xE3),
-          o2(0x93,0xE4),      o2(0x93,0xE5),
-          o2(0x93,0xE6),      o2(0x93,0xE7),
-          o2(0x93,0xE8),      o2(0x93,0xE9),
-          o2(0x93,0xEA),      o2(0x93,0xEB),
-          o2(0x93,0xEC),      o2(0x93,0xED),
-          o2(0x93,0xEE),      o2(0x93,0xEF),
-          o2(0x93,0xF0),      o2(0x93,0xF1),
-          o2(0x93,0xF2),      o2(0x93,0xF3),
-          o2(0x93,0xF4),      o2(0x93,0xF5),
-          o2(0x93,0xF6),      o2(0x93,0xF7),
-          o2(0x93,0xF8),      o2(0x93,0xF9),
-          o2(0xBA,0xB8),      o2(0xBA,0xB9),
-          o2(0xBA,0xBA),      o2(0x93,0xFA),
-          o2(0xBA,0xBB),      o2(0x93,0xFB),
-          o2(0x93,0xFC),      o2(0x93,0xFD),
-          o2(0xBA,0xBC),      o2(0x93,0xFE),
-          o2(0x94,0x41),      o2(0x94,0x42),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_33 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_34_infos[65] = {
-          o2(0x94,0x43),      o2(0x94,0x44),
-          o2(0x94,0x45),      o2(0x94,0x46),
-          o2(0xBA,0xBD),      o2(0xBA,0xBE),
-          o2(0x94,0x47),      o2(0xBA,0xBF),
-          o2(0x94,0x48),      o2(0xBA,0xC0),
-          o2(0x94,0x49),      o2(0x94,0x4A),
-          o2(0x94,0x4B),      o2(0x94,0x4C),
-          o2(0x94,0x4D),      o2(0x94,0x4E),
-          o2(0xBA,0xC1),      o2(0x94,0x4F),
-          o2(0x94,0x50),      o2(0x94,0x51),
-          o2(0xBA,0xC2),      o2(0x94,0x52),
-          o2(0x94,0x53),      o2(0x94,0x54),
-          o2(0x94,0x55),      o2(0x94,0x56),
-          o2(0x94,0x57),      o2(0x94,0x58),
-          o2(0x94,0x59),      o2(0x94,0x5A),
-          o2(0x94,0x61),      o2(0x94,0x62),
-          o2(0x94,0x63),      o2(0x94,0x64),
-          o2(0x94,0x65),      o2(0x94,0x66),
-          o2(0xBA,0xC3),      o2(0x94,0x67),
-          o2(0x94,0x68),      o2(0x94,0x69),
-          o2(0x94,0x6A),      o2(0x94,0x6B),
-          o2(0x94,0x6C),      o2(0x94,0x6D),
-          o2(0xBA,0xC4),      o2(0x94,0x6E),
-          o2(0x94,0x6F),      o2(0x94,0x70),
-          o2(0x94,0x71),      o2(0x94,0x72),
-          o2(0x94,0x73),      o2(0x94,0x74),
-          o2(0x94,0x75),      o2(0x94,0x76),
-          o2(0x94,0x77),      o2(0x94,0x78),
-          o2(0x94,0x79),      o2(0x94,0x7A),
-          o2(0x94,0x81),      o2(0x94,0x82),
-          o2(0x94,0x83),      o2(0x94,0x84),
-          o2(0x94,0x85),      o2(0x94,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_34 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_35_infos[65] = {
-          o2(0xBA,0xC5),      o2(0x94,0x87),
-          o2(0x94,0x88),      o2(0x94,0x89),
-          o2(0x94,0x8A),      o2(0x94,0x8B),
-          o2(0x94,0x8C),      o2(0x94,0x8D),
-          o2(0xBA,0xC6),      o2(0xBA,0xC7),
-          o2(0x94,0x8E),      o2(0x94,0x8F),
-          o2(0xBA,0xC8),      o2(0x94,0x90),
-          o2(0x94,0x91),      o2(0x94,0x92),
-          o2(0xBA,0xC9),      o2(0x94,0x93),
-          o2(0x94,0x94),      o2(0x94,0x95),
-          o2(0x94,0x96),      o2(0x94,0x97),
-          o2(0x94,0x98),      o2(0x94,0x99),
-          o2(0xBA,0xCA),      o2(0xBA,0xCB),
-          o2(0x94,0x9A),      o2(0x94,0x9B),
-          o2(0x94,0x9C),      o2(0x94,0x9D),
-          o2(0x94,0x9E),      o2(0x94,0x9F),
-          o2(0x94,0xA0),      o2(0x94,0xA1),
-          o2(0x94,0xA2),      o2(0x94,0xA3),
-          o2(0xBA,0xCC),      o2(0x94,0xA4),
-          o2(0x94,0xA5),      o2(0x94,0xA6),
-          o2(0xBA,0xCD),      o2(0x94,0xA7),
-          o2(0x94,0xA8),      o2(0x94,0xA9),
-          o2(0x94,0xAA),      o2(0x94,0xAB),
-          o2(0x94,0xAC),      o2(0x94,0xAD),
-          o2(0x94,0xAE),      o2(0x94,0xAF),
-          o2(0x94,0xB0),      o2(0x94,0xB1),
-          o2(0x94,0xB2),      o2(0x94,0xB3),
-          o2(0x94,0xB4),      o2(0x94,0xB5),
-          o2(0x94,0xB6),      o2(0x94,0xB7),
-          o2(0x94,0xB8),      o2(0x94,0xB9),
-          o2(0x94,0xBA),      o2(0x94,0xBB),
-          o2(0x94,0xBC),      o2(0x94,0xBD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_35 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_36_infos[65] = {
-          o2(0xBA,0xCE),      o2(0xBA,0xCF),
-          o2(0x94,0xBE),      o2(0x94,0xBF),
-          o2(0xBA,0xD0),      o2(0x94,0xC0),
-          o2(0x94,0xC1),      o2(0xBA,0xD1),
-          o2(0xBA,0xD2),      o2(0xBA,0xD3),
-          o2(0xBA,0xD4),      o2(0x94,0xC2),
-          o2(0x94,0xC3),      o2(0x94,0xC4),
-          o2(0x94,0xC5),      o2(0x94,0xC6),
-          o2(0xBA,0xD5),      o2(0xBA,0xD6),
-          o2(0x94,0xC7),      o2(0xBA,0xD7),
-          o2(0x94,0xC8),      o2(0xBA,0xD8),
-          o2(0x94,0xC9),      o2(0x94,0xCA),
-          o2(0x94,0xCB),      o2(0xBA,0xD9),
-          o2(0xBA,0xDA),      o2(0x94,0xCC),
-          o2(0xBA,0xDB),      o2(0x94,0xCD),
-          o2(0x94,0xCE),      o2(0x94,0xCF),
-          o2(0x94,0xD0),      o2(0x94,0xD1),
-          o2(0x94,0xD2),      o2(0x94,0xD3),
-          o2(0xBA,0xDC),      o2(0x94,0xD4),
-          o2(0x94,0xD5),      o2(0x94,0xD6),
-          o2(0x94,0xD7),      o2(0x94,0xD8),
-          o2(0x94,0xD9),      o2(0x94,0xDA),
-          o2(0x94,0xDB),      o2(0x94,0xDC),
-          o2(0x94,0xDD),      o2(0x94,0xDE),
-          o2(0xBA,0xDD),      o2(0x94,0xDF),
-          o2(0x94,0xE0),      o2(0x94,0xE1),
-          o2(0x94,0xE2),      o2(0x94,0xE3),
-          o2(0x94,0xE4),      o2(0x94,0xE5),
-          o2(0xBA,0xDE),      o2(0x94,0xE6),
-          o2(0x94,0xE7),      o2(0x94,0xE8),
-          o2(0x94,0xE9),      o2(0x94,0xEA),
-          o2(0x94,0xEB),      o2(0x94,0xEC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_36 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_37_infos[65] = {
-          o2(0x94,0xED),      o2(0x94,0xEE),
-          o2(0x94,0xEF),      o2(0x94,0xF0),
-          o2(0x94,0xF1),      o2(0x94,0xF2),
-          o2(0x94,0xF3),      o2(0x94,0xF4),
-          o2(0x94,0xF5),      o2(0x94,0xF6),
-          o2(0x94,0xF7),      o2(0x94,0xF8),
-          o2(0x94,0xF9),      o2(0x94,0xFA),
-          o2(0x94,0xFB),      o2(0x94,0xFC),
-          o2(0x94,0xFD),      o2(0x94,0xFE),
-          o2(0x95,0x41),      o2(0x95,0x42),
-          o2(0xBA,0xDF),      o2(0xBA,0xE0),
-          o2(0x95,0x43),      o2(0x95,0x44),
-          o2(0xBA,0xE1),      o2(0x95,0x45),
-          o2(0x95,0x46),      o2(0x95,0x47),
-          o2(0xBA,0xE2),      o2(0x95,0x48),
-          o2(0x95,0x49),      o2(0x95,0x4A),
-          o2(0x95,0x4B),      o2(0x95,0x4C),
-          o2(0x95,0x4D),      o2(0x95,0x4E),
-          o2(0x95,0x4F),      o2(0x95,0x50),
-          o2(0x95,0x51),      o2(0x95,0x52),
-          o2(0x95,0x53),      o2(0xBA,0xE3),
-          o2(0x95,0x54),      o2(0x95,0x55),
-          o2(0x95,0x56),      o2(0x95,0x57),
-          o2(0x95,0x58),      o2(0x95,0x59),
-          o2(0xBA,0xE4),      o2(0x95,0x5A),
-          o2(0x95,0x61),      o2(0x95,0x62),
-          o2(0xBA,0xE5),      o2(0x95,0x63),
-          o2(0x95,0x64),      o2(0x95,0x65),
-          o2(0xBA,0xE6),      o2(0x95,0x66),
-          o2(0x95,0x67),      o2(0x95,0x68),
-          o2(0x95,0x69),      o2(0x95,0x6A),
-          o2(0x95,0x6B),      o2(0x95,0x6C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_37 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_38_infos[65] = {
-          o2(0xBA,0xE7),      o2(0x95,0x6D),
-          o2(0x95,0x6E),      o2(0xBA,0xE8),
-          o2(0x95,0x6F),      o2(0xBA,0xE9),
-          o2(0x95,0x70),      o2(0x95,0x71),
-          o2(0x95,0x72),      o2(0x95,0x73),
-          o2(0x95,0x74),      o2(0x95,0x75),
-          o2(0xBA,0xEA),      o2(0xBA,0xEB),
-          o2(0x95,0x76),      o2(0x95,0x77),
-          o2(0xBA,0xEC),      o2(0x95,0x78),
-          o2(0x95,0x79),      o2(0x95,0x7A),
-          o2(0xBA,0xED),      o2(0x95,0x81),
-          o2(0x95,0x82),      o2(0x95,0x83),
-          o2(0x95,0x84),      o2(0x95,0x85),
-          o2(0x95,0x86),      o2(0x95,0x87),
-          o2(0xBA,0xEE),      o2(0xBA,0xEF),
-          o2(0x95,0x88),      o2(0xBA,0xF0),
-          o2(0x95,0x89),      o2(0x95,0x8A),
-          o2(0x95,0x8B),      o2(0x95,0x8C),
-          o2(0x95,0x8D),      o2(0x95,0x8E),
-          o2(0x95,0x8F),      o2(0x95,0x90),
-          o2(0x95,0x91),      o2(0x95,0x92),
-          o2(0x95,0x93),      o2(0x95,0x94),
-          o2(0x95,0x95),      o2(0x95,0x96),
-          o2(0x95,0x97),      o2(0x95,0x98),
-          o2(0x95,0x99),      o2(0x95,0x9A),
-          o2(0x95,0x9B),      o2(0x95,0x9C),
-          o2(0x95,0x9D),      o2(0x95,0x9E),
-          o2(0x95,0x9F),      o2(0x95,0xA0),
-          o2(0x95,0xA1),      o2(0x95,0xA2),
-          o2(0x95,0xA3),      o2(0x95,0xA4),
-          o2(0x95,0xA5),      o2(0x95,0xA6),
-          o2(0x95,0xA7),      o2(0x95,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_38 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_39_infos[65] = {
-          o2(0x95,0xA9),      o2(0x95,0xAA),
-          o2(0x95,0xAB),      o2(0x95,0xAC),
-          o2(0xBA,0xF1),      o2(0xBA,0xF2),
-          o2(0x95,0xAD),      o2(0x95,0xAE),
-          o2(0xBA,0xF3),      o2(0x95,0xAF),
-          o2(0x95,0xB0),      o2(0x95,0xB1),
-          o2(0xBA,0xF4),      o2(0x95,0xB2),
-          o2(0xBA,0xF5),      o2(0x95,0xB3),
-          o2(0x95,0xB4),      o2(0x95,0xB5),
-          o2(0x95,0xB6),      o2(0x95,0xB7),
-          o2(0xBA,0xF6),      o2(0xBA,0xF7),
-          o2(0x95,0xB8),      o2(0xBA,0xF8),
-          o2(0x95,0xB9),      o2(0xBA,0xF9),
-          o2(0xBA,0xFA),      o2(0xBA,0xFB),
-          o2(0x95,0xBA),      o2(0x95,0xBB),
-          o2(0x95,0xBC),      o2(0x95,0xBD),
-          o2(0xBA,0xFC),      o2(0xBA,0xFD),
-          o2(0x95,0xBE),      o2(0x95,0xBF),
-          o2(0xBA,0xFE),      o2(0x95,0xC0),
-          o2(0x95,0xC1),      o2(0x95,0xC2),
-          o2(0xBB,0xA1),      o2(0x95,0xC3),
-          o2(0xBB,0xA2),      o2(0x95,0xC4),
-          o2(0x95,0xC5),      o2(0x95,0xC6),
-          o2(0x95,0xC7),      o2(0x95,0xC8),
-          o2(0xBB,0xA3),      o2(0xBB,0xA4),
-          o2(0x95,0xC9),      o2(0xBB,0xA5),
-          o2(0xBB,0xA6),      o2(0xBB,0xA7),
-          o2(0x95,0xCA),      o2(0x95,0xCB),
-          o2(0x95,0xCC),      o2(0x95,0xCD),
-          o2(0x95,0xCE),      o2(0xBB,0xA8),
-          o2(0xBB,0xA9),      o2(0xBB,0xAA),
-          o2(0x95,0xCF),      o2(0x95,0xD0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_39 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3A_infos[65] = {
-          o2(0xBB,0xAB),      o2(0x95,0xD1),
-          o2(0x95,0xD2),      o2(0x95,0xD3),
-          o2(0xBB,0xAC),      o2(0x95,0xD4),
-          o2(0x95,0xD5),      o2(0x95,0xD6),
-          o2(0x95,0xD7),      o2(0x95,0xD8),
-          o2(0x95,0xD9),      o2(0x95,0xDA),
-          o2(0xBB,0xAD),      o2(0xBB,0xAE),
-          o2(0x95,0xDB),      o2(0xBB,0xAF),
-          o2(0xBB,0xB0),      o2(0xBB,0xB1),
-          o2(0x95,0xDC),      o2(0x95,0xDD),
-          o2(0x95,0xDE),      o2(0x95,0xDF),
-          o2(0x95,0xE0),      o2(0x95,0xE1),
-          o2(0xBB,0xB2),      o2(0xBB,0xB3),
-          o2(0x95,0xE2),      o2(0x95,0xE3),
-          o2(0x95,0xE4),      o2(0x95,0xE5),
-          o2(0x95,0xE6),      o2(0x95,0xE7),
-          o2(0x95,0xE8),      o2(0x95,0xE9),
-          o2(0x95,0xEA),      o2(0x95,0xEB),
-          o2(0x95,0xEC),      o2(0x95,0xED),
-          o2(0x95,0xEE),      o2(0x95,0xEF),
-          o2(0xBB,0xB4),      o2(0x95,0xF0),
-          o2(0x95,0xF1),      o2(0x95,0xF2),
-          o2(0x95,0xF3),      o2(0x95,0xF4),
-          o2(0x95,0xF5),      o2(0x95,0xF6),
-          o2(0x95,0xF7),      o2(0x95,0xF8),
-          o2(0x95,0xF9),      o2(0x95,0xFA),
-          o2(0x95,0xFB),      o2(0x95,0xFC),
-          o2(0x95,0xFD),      o2(0x95,0xFE),
-          o2(0x96,0x41),      o2(0x96,0x42),
-          o2(0x96,0x43),      o2(0x96,0x44),
-          o2(0x96,0x45),      o2(0x96,0x46),
-          o2(0x96,0x47),      o2(0x96,0x48),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3B_infos[65] = {
-          o2(0x96,0x49),      o2(0x96,0x4A),
-          o2(0x96,0x4B),      o2(0x96,0x4C),
-          o2(0x96,0x4D),      o2(0x96,0x4E),
-          o2(0x96,0x4F),      o2(0x96,0x50),
-          o2(0x96,0x51),      o2(0x96,0x52),
-          o2(0x96,0x53),      o2(0x96,0x54),
-          o2(0x96,0x55),      o2(0x96,0x56),
-          o2(0x96,0x57),      o2(0x96,0x58),
-          o2(0xBB,0xB5),      o2(0xBB,0xB6),
-          o2(0x96,0x59),      o2(0x96,0x5A),
-          o2(0xBB,0xB7),      o2(0x96,0x61),
-          o2(0x96,0x62),      o2(0xBB,0xB8),
-          o2(0xBB,0xB9),      o2(0x96,0x63),
-          o2(0x96,0x64),      o2(0x96,0x65),
-          o2(0x96,0x66),      o2(0x96,0x67),
-          o2(0x96,0x68),      o2(0x96,0x69),
-          o2(0xBB,0xBA),      o2(0x96,0x6A),
-          o2(0x96,0x6B),      o2(0xBB,0xBB),
-          o2(0xBB,0xBC),      o2(0xBB,0xBD),
-          o2(0x96,0x6C),      o2(0x96,0x6D),
-          o2(0x96,0x6E),      o2(0x96,0x6F),
-          o2(0x96,0x70),      o2(0x96,0x71),
-          o2(0xBB,0xBE),      o2(0x96,0x72),
-          o2(0x96,0x73),      o2(0x96,0x74),
-          o2(0x96,0x75),      o2(0x96,0x76),
-          o2(0x96,0x77),      o2(0x96,0x78),
-          o2(0x96,0x79),      o2(0x96,0x7A),
-          o2(0x96,0x81),      o2(0x96,0x82),
-          o2(0x96,0x83),      o2(0x96,0x84),
-          o2(0x96,0x85),      o2(0x96,0x86),
-          o2(0x96,0x87),      o2(0x96,0x88),
-          o2(0x96,0x89),      o2(0x96,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3C_infos[65] = {
-          o2(0x96,0x8B),      o2(0xBB,0xBF),
-          o2(0x96,0x8C),      o2(0x96,0x8D),
-          o2(0x96,0x8E),      o2(0x96,0x8F),
-          o2(0x96,0x90),      o2(0x96,0x91),
-          o2(0xBB,0xC0),      o2(0xBB,0xC1),
-          o2(0x96,0x92),      o2(0x96,0x93),
-          o2(0x96,0x94),      o2(0x96,0x95),
-          o2(0x96,0x96),      o2(0x96,0x97),
-          o2(0x96,0x98),      o2(0x96,0x99),
-          o2(0x96,0x9A),      o2(0x96,0x9B),
-          o2(0x96,0x9C),      o2(0x96,0x9D),
-          o2(0x96,0x9E),      o2(0x96,0x9F),
-          o2(0xBB,0xC2),      o2(0xBB,0xC3),
-          o2(0x96,0xA0),      o2(0xBB,0xC4),
-          o2(0xBB,0xC5),      o2(0xBB,0xC6),
-          o2(0x96,0xA1),      o2(0x96,0xA2),
-          o2(0x96,0xA3),      o2(0x96,0xA4),
-          o2(0x96,0xA5),      o2(0x96,0xA6),
-          o2(0x96,0xA7),      o2(0x96,0xA8),
-          o2(0x96,0xA9),      o2(0x96,0xAA),
-          o2(0x96,0xAB),      o2(0x96,0xAC),
-          o2(0x96,0xAD),      o2(0x96,0xAE),
-          o2(0x96,0xAF),      o2(0x96,0xB0),
-          o2(0x96,0xB1),      o2(0x96,0xB2),
-          o2(0x96,0xB3),      o2(0x96,0xB4),
-          o2(0x96,0xB5),      o2(0x96,0xB6),
-          o2(0x96,0xB7),      o2(0x96,0xB8),
-          o2(0x96,0xB9),      o2(0x96,0xBA),
-          o2(0x96,0xBB),      o2(0x96,0xBC),
-          o2(0x96,0xBD),      o2(0x96,0xBE),
-          o2(0x96,0xBF),      o2(0x96,0xC0),
-          o2(0x96,0xC1),      o2(0x96,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3D_infos[65] = {
-          o2(0xBB,0xC7),      o2(0xBB,0xC8),
-          o2(0x96,0xC3),      o2(0x96,0xC4),
-          o2(0xBB,0xC9),      o2(0x96,0xC5),
-          o2(0x96,0xC6),      o2(0x96,0xC7),
-          o2(0xBB,0xCA),      o2(0x96,0xC8),
-          o2(0x96,0xC9),      o2(0x96,0xCA),
-          o2(0x96,0xCB),      o2(0x96,0xCC),
-          o2(0x96,0xCD),      o2(0x96,0xCE),
-          o2(0xBB,0xCB),      o2(0xBB,0xCC),
-          o2(0x96,0xCF),      o2(0x96,0xD0),
-          o2(0x96,0xD1),      o2(0xBB,0xCD),
-          o2(0x96,0xD2),      o2(0x96,0xD3),
-          o2(0x96,0xD4),      o2(0x96,0xD5),
-          o2(0x96,0xD6),      o2(0x96,0xD7),
-          o2(0x96,0xD8),      o2(0x96,0xD9),
-          o2(0x96,0xDA),      o2(0x96,0xDB),
-          o2(0x96,0xDC),      o2(0x96,0xDD),
-          o2(0x96,0xDE),      o2(0x96,0xDF),
-          o2(0x96,0xE0),      o2(0x96,0xE1),
-          o2(0x96,0xE2),      o2(0x96,0xE3),
-          o2(0x96,0xE4),      o2(0x96,0xE5),
-          o2(0x96,0xE6),      o2(0x96,0xE7),
-          o2(0x96,0xE8),      o2(0x96,0xE9),
-          o2(0x96,0xEA),      o2(0x96,0xEB),
-          o2(0x96,0xEC),      o2(0x96,0xED),
-          o2(0x96,0xEE),      o2(0x96,0xEF),
-          o2(0x96,0xF0),      o2(0x96,0xF1),
-          o2(0x96,0xF2),      o2(0x96,0xF3),
-          o2(0x96,0xF4),      o2(0x96,0xF5),
-          o2(0x96,0xF6),      o2(0x96,0xF7),
-          o2(0x96,0xF8),      o2(0x96,0xF9),
-          o2(0x96,0xFA),      o2(0x96,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3E_infos[65] = {
-          o2(0x96,0xFC),      o2(0x96,0xFD),
-          o2(0x96,0xFE),      o2(0x97,0x41),
-          o2(0x97,0x42),      o2(0x97,0x43),
-          o2(0x97,0x44),      o2(0x97,0x45),
-          o2(0x97,0x46),      o2(0x97,0x47),
-          o2(0x97,0x48),      o2(0x97,0x49),
-          o2(0x97,0x4A),      o2(0x97,0x4B),
-          o2(0x97,0x4C),      o2(0x97,0x4D),
-          o2(0x97,0x4E),      o2(0x97,0x4F),
-          o2(0x97,0x50),      o2(0x97,0x51),
-          o2(0xBB,0xCE),      o2(0x97,0x52),
-          o2(0x97,0x53),      o2(0x97,0x54),
-          o2(0x97,0x55),      o2(0x97,0x56),
-          o2(0x97,0x57),      o2(0x97,0x58),
-          o2(0x97,0x59),      o2(0x97,0x5A),
-          o2(0x97,0x61),      o2(0x97,0x62),
-          o2(0x97,0x63),      o2(0x97,0x64),
-          o2(0x97,0x65),      o2(0x97,0x66),
-          o2(0x97,0x67),      o2(0x97,0x68),
-          o2(0x97,0x69),      o2(0x97,0x6A),
-          o2(0x97,0x6B),      o2(0x97,0x6C),
-          o2(0x97,0x6D),      o2(0x97,0x6E),
-          o2(0x97,0x6F),      o2(0x97,0x70),
-          o2(0x97,0x71),      o2(0x97,0x72),
-          o2(0xBB,0xCF),      o2(0x97,0x73),
-          o2(0x97,0x74),      o2(0x97,0x75),
-          o2(0x97,0x76),      o2(0x97,0x77),
-          o2(0x97,0x78),      o2(0x97,0x79),
-          o2(0x97,0x7A),      o2(0x97,0x81),
-          o2(0x97,0x82),      o2(0x97,0x83),
-          o2(0x97,0x84),      o2(0x97,0x85),
-          o2(0x97,0x86),      o2(0x97,0x87),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_3F_infos[65] = {
-          o2(0x97,0x88),      o2(0x97,0x89),
-          o2(0x97,0x8A),      o2(0x97,0x8B),
-          o2(0x97,0x8C),      o2(0xBB,0xD0),
-          o2(0x97,0x8D),      o2(0x97,0x8E),
-          o2(0x97,0x8F),      o2(0x97,0x90),
-          o2(0x97,0x91),      o2(0x97,0x92),
-          o2(0xBB,0xD1),      o2(0xBB,0xD2),
-          o2(0x97,0x93),      o2(0x97,0x94),
-          o2(0xBB,0xD3),      o2(0x97,0x95),
-          o2(0x97,0x96),      o2(0x97,0x97),
-          o2(0xBB,0xD4),      o2(0x97,0x98),
-          o2(0x97,0x99),      o2(0x97,0x9A),
-          o2(0x97,0x9B),      o2(0x97,0x9C),
-          o2(0x97,0x9D),      o2(0x97,0x9E),
-          o2(0xBB,0xD5),      o2(0x97,0x9F),
-          o2(0x97,0xA0),      o2(0xBB,0xD6),
-          o2(0x97,0xA1),      o2(0xBB,0xD7),
-          o2(0x97,0xA2),      o2(0x97,0xA3),
-          o2(0x97,0xA4),      o2(0x97,0xA5),
-          o2(0x97,0xA6),      o2(0x97,0xA7),
-          o2(0x97,0xA8),      o2(0x97,0xA9),
-          o2(0x97,0xAA),      o2(0x97,0xAB),
-          o2(0x97,0xAC),      o2(0x97,0xAD),
-          o2(0x97,0xAE),      o2(0x97,0xAF),
-          o2(0x97,0xB0),      o2(0x97,0xB1),
-          o2(0x97,0xB2),      o2(0x97,0xB3),
-          o2(0x97,0xB4),      o2(0x97,0xB5),
-          o2(0x97,0xB6),      o2(0x97,0xB7),
-          o2(0x97,0xB8),      o2(0x97,0xB9),
-          o2(0x97,0xBA),      o2(0x97,0xBB),
-          o2(0x97,0xBC),      o2(0x97,0xBD),
-          o2(0x97,0xBE),      o2(0x97,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB_3F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EB_infos[65] = {
-        &to_CP949_EB_00,    &to_CP949_EB_01,
-        &to_CP949_EB_02,    &to_CP949_EB_03,
-        &to_CP949_EB_04,    &to_CP949_EB_05,
-        &to_CP949_EB_06,    &to_CP949_EB_07,
-        &to_CP949_EB_08,    &to_CP949_EB_09,
-        &to_CP949_EB_0A,    &to_CP949_EB_0B,
-        &to_CP949_EB_0C,    &to_CP949_EB_0D,
-        &to_CP949_EB_0E,    &to_CP949_EB_0F,
-        &to_CP949_EB_10,    &to_CP949_EB_11,
-        &to_CP949_EB_12,    &to_CP949_EB_13,
-        &to_CP949_EB_14,    &to_CP949_EB_15,
-        &to_CP949_EB_16,    &to_CP949_EB_17,
-        &to_CP949_EB_18,    &to_CP949_EB_19,
-        &to_CP949_EB_1A,    &to_CP949_EB_1B,
-        &to_CP949_EB_1C,    &to_CP949_EB_1D,
-        &to_CP949_EB_1E,    &to_CP949_EB_1F,
-        &to_CP949_EB_20,    &to_CP949_EB_21,
-        &to_CP949_EB_22,    &to_CP949_EB_23,
-        &to_CP949_EB_24,    &to_CP949_EB_25,
-        &to_CP949_EB_26,    &to_CP949_EB_27,
-        &to_CP949_EB_28,    &to_CP949_EB_29,
-        &to_CP949_EB_2A,    &to_CP949_EB_2B,
-        &to_CP949_EB_2C,    &to_CP949_EB_2D,
-        &to_CP949_EB_2E,    &to_CP949_EB_2F,
-        &to_CP949_EB_30,    &to_CP949_EB_31,
-        &to_CP949_EB_32,    &to_CP949_EB_33,
-        &to_CP949_EB_34,    &to_CP949_EB_35,
-        &to_CP949_EB_36,    &to_CP949_EB_37,
-        &to_CP949_EB_38,    &to_CP949_EB_39,
-        &to_CP949_EB_3A,    &to_CP949_EB_3B,
-        &to_CP949_EB_3C,    &to_CP949_EB_3D,
-        &to_CP949_EB_3E,    &to_CP949_EB_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EB = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EB_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_00_infos[65] = {
-          o2(0x97,0xC0),      o2(0x97,0xC1),
-          o2(0x97,0xC2),      o2(0x97,0xC3),
-          o2(0x97,0xC4),      o2(0x97,0xC5),
-          o2(0x97,0xC6),      o2(0x97,0xC7),
-          o2(0x97,0xC8),      o2(0x97,0xC9),
-          o2(0x97,0xCA),      o2(0x97,0xCB),
-          o2(0x97,0xCC),      o2(0x97,0xCD),
-          o2(0x97,0xCE),      o2(0x97,0xCF),
-          o2(0x97,0xD0),      o2(0x97,0xD1),
-          o2(0x97,0xD2),      o2(0x97,0xD3),
-          o2(0x97,0xD4),      o2(0x97,0xD5),
-          o2(0x97,0xD6),      o2(0x97,0xD7),
-          o2(0x97,0xD8),      o2(0x97,0xD9),
-          o2(0x97,0xDA),      o2(0x97,0xDB),
-          o2(0x97,0xDC),      o2(0x97,0xDD),
-          o2(0x97,0xDE),      o2(0x97,0xDF),
-          o2(0x97,0xE0),      o2(0x97,0xE1),
-          o2(0x97,0xE2),      o2(0x97,0xE3),
-          o2(0x97,0xE4),      o2(0x97,0xE5),
-          o2(0x97,0xE6),      o2(0x97,0xE7),
-          o2(0x97,0xE8),      o2(0x97,0xE9),
-          o2(0x97,0xEA),      o2(0x97,0xEB),
-          o2(0x97,0xEC),      o2(0x97,0xED),
-          o2(0x97,0xEE),      o2(0x97,0xEF),
-          o2(0x97,0xF0),      o2(0x97,0xF1),
-          o2(0x97,0xF2),      o2(0x97,0xF3),
-          o2(0x97,0xF4),      o2(0x97,0xF5),
-          o2(0x97,0xF6),      o2(0x97,0xF7),
-          o2(0x97,0xF8),      o2(0x97,0xF9),
-          o2(0x97,0xFA),      o2(0x97,0xFB),
-          o2(0xBB,0xD8),      o2(0x97,0xFC),
-          o2(0x97,0xFD),      o2(0x97,0xFE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_00 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_01_infos[65] = {
-          o2(0x98,0x41),      o2(0x98,0x42),
-          o2(0x98,0x43),      o2(0x98,0x44),
-          o2(0x98,0x45),      o2(0x98,0x46),
-          o2(0x98,0x47),      o2(0x98,0x48),
-          o2(0x98,0x49),      o2(0x98,0x4A),
-          o2(0x98,0x4B),      o2(0x98,0x4C),
-          o2(0x98,0x4D),      o2(0x98,0x4E),
-          o2(0x98,0x4F),      o2(0x98,0x50),
-          o2(0x98,0x51),      o2(0xBB,0xD9),
-          o2(0x98,0x52),      o2(0x98,0x53),
-          o2(0x98,0x54),      o2(0x98,0x55),
-          o2(0x98,0x56),      o2(0x98,0x57),
-          o2(0xBB,0xDA),      o2(0x98,0x58),
-          o2(0x98,0x59),      o2(0x98,0x5A),
-          o2(0xBB,0xDB),      o2(0x98,0x61),
-          o2(0x98,0x62),      o2(0x98,0x63),
-          o2(0xBB,0xDC),      o2(0x98,0x64),
-          o2(0x98,0x65),      o2(0x98,0x66),
-          o2(0x98,0x67),      o2(0x98,0x68),
-          o2(0x98,0x69),      o2(0x98,0x6A),
-          o2(0xBB,0xDD),      o2(0xBB,0xDE),
-          o2(0x98,0x6B),      o2(0x98,0x6C),
-          o2(0x98,0x6D),      o2(0x98,0x6E),
-          o2(0x98,0x6F),      o2(0x98,0x70),
-          o2(0x98,0x71),      o2(0x98,0x72),
-          o2(0x98,0x73),      o2(0x98,0x74),
-          o2(0x98,0x75),      o2(0x98,0x76),
-          o2(0x98,0x77),      o2(0x98,0x78),
-          o2(0x98,0x79),      o2(0x98,0x7A),
-          o2(0x98,0x81),      o2(0x98,0x82),
-          o2(0x98,0x83),      o2(0x98,0x84),
-          o2(0x98,0x85),      o2(0x98,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_01 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_02_infos[65] = {
-          o2(0x98,0x87),      o2(0x98,0x88),
-          o2(0x98,0x89),      o2(0x98,0x8A),
-          o2(0x98,0x8B),      o2(0x98,0x8C),
-          o2(0x98,0x8D),      o2(0x98,0x8E),
-          o2(0x98,0x8F),      o2(0x98,0x90),
-          o2(0x98,0x91),      o2(0x98,0x92),
-          o2(0x98,0x93),      o2(0x98,0x94),
-          o2(0x98,0x95),      o2(0x98,0x96),
-          o2(0xBB,0xDF),      o2(0xBB,0xE0),
-          o2(0x98,0x97),      o2(0x98,0x98),
-          o2(0xBB,0xE1),      o2(0x98,0x99),
-          o2(0x98,0x9A),      o2(0x98,0x9B),
-          o2(0xBB,0xE2),      o2(0x98,0x9C),
-          o2(0x98,0x9D),      o2(0x98,0x9E),
-          o2(0x98,0x9F),      o2(0x98,0xA0),
-          o2(0x98,0xA1),      o2(0x98,0xA2),
-          o2(0xBB,0xE3),      o2(0xBB,0xE4),
-          o2(0x98,0xA3),      o2(0xBB,0xE5),
-          o2(0x98,0xA4),      o2(0xBB,0xE6),
-          o2(0x98,0xA5),      o2(0x98,0xA6),
-          o2(0x98,0xA7),      o2(0x98,0xA8),
-          o2(0x98,0xA9),      o2(0x98,0xAA),
-          o2(0xBB,0xE7),      o2(0xBB,0xE8),
-          o2(0x98,0xAB),      o2(0xBB,0xE9),
-          o2(0xBB,0xEA),      o2(0x98,0xAC),
-          o2(0x98,0xAD),      o2(0xBB,0xEB),
-          o2(0xBB,0xEC),      o2(0xBB,0xED),
-          o2(0xBB,0xEE),      o2(0x98,0xAE),
-          o2(0x98,0xAF),      o2(0x98,0xB0),
-          o2(0x98,0xB1),      o2(0x98,0xB2),
-          o2(0xBB,0xEF),      o2(0xBB,0xF0),
-          o2(0x98,0xB3),      o2(0xBB,0xF1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_02 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_03_infos[65] = {
-          o2(0xBB,0xF2),      o2(0xBB,0xF3),
-          o2(0x98,0xB4),      o2(0x98,0xB5),
-          o2(0x98,0xB6),      o2(0xBB,0xF4),
-          o2(0x98,0xB7),      o2(0x98,0xB8),
-          o2(0xBB,0xF5),      o2(0xBB,0xF6),
-          o2(0x98,0xB9),      o2(0x98,0xBA),
-          o2(0xBB,0xF7),      o2(0x98,0xBB),
-          o2(0x98,0xBC),      o2(0x98,0xBD),
-          o2(0xBB,0xF8),      o2(0x98,0xBE),
-          o2(0x98,0xBF),      o2(0x98,0xC0),
-          o2(0x98,0xC1),      o2(0x98,0xC2),
-          o2(0x98,0xC3),      o2(0x98,0xC4),
-          o2(0xBB,0xF9),      o2(0xBB,0xFA),
-          o2(0x98,0xC5),      o2(0xBB,0xFB),
-          o2(0xBB,0xFC),      o2(0xBB,0xFD),
-          o2(0x98,0xC6),      o2(0x98,0xC7),
-          o2(0x98,0xC8),      o2(0x98,0xC9),
-          o2(0x98,0xCA),      o2(0x98,0xCB),
-          o2(0xBB,0xFE),      o2(0xBC,0xA1),
-          o2(0x98,0xCC),      o2(0x98,0xCD),
-          o2(0xBC,0xA2),      o2(0x98,0xCE),
-          o2(0x98,0xCF),      o2(0x98,0xD0),
-          o2(0xBC,0xA3),      o2(0x98,0xD1),
-          o2(0x98,0xD2),      o2(0x98,0xD3),
-          o2(0x98,0xD4),      o2(0x98,0xD5),
-          o2(0x98,0xD6),      o2(0x98,0xD7),
-          o2(0xBC,0xA4),      o2(0xBC,0xA5),
-          o2(0x98,0xD8),      o2(0xBC,0xA6),
-          o2(0x98,0xD9),      o2(0xBC,0xA7),
-          o2(0x98,0xDA),      o2(0x98,0xDB),
-          o2(0x98,0xDC),      o2(0x98,0xDD),
-          o2(0x98,0xDE),      o2(0x98,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_03 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_04_infos[65] = {
-          o2(0xBC,0xA8),      o2(0x98,0xE0),
-          o2(0x98,0xE1),      o2(0x98,0xE2),
-          o2(0xBC,0xA9),      o2(0x98,0xE3),
-          o2(0x98,0xE4),      o2(0x98,0xE5),
-          o2(0xBC,0xAA),      o2(0x98,0xE6),
-          o2(0x98,0xE7),      o2(0x98,0xE8),
-          o2(0x98,0xE9),      o2(0x98,0xEA),
-          o2(0x98,0xEB),      o2(0x98,0xEC),
-          o2(0xBC,0xAB),      o2(0x98,0xED),
-          o2(0x98,0xEE),      o2(0x98,0xEF),
-          o2(0x98,0xF0),      o2(0xBC,0xAC),
-          o2(0x98,0xF1),      o2(0x98,0xF2),
-          o2(0x98,0xF3),      o2(0x98,0xF4),
-          o2(0x98,0xF5),      o2(0x98,0xF6),
-          o2(0xBC,0xAD),      o2(0xBC,0xAE),
-          o2(0xBC,0xAF),      o2(0xBC,0xB0),
-          o2(0xBC,0xB1),      o2(0x98,0xF7),
-          o2(0x98,0xF8),      o2(0xBC,0xB2),
-          o2(0xBC,0xB3),      o2(0x98,0xF9),
-          o2(0xBC,0xB4),      o2(0xBC,0xB5),
-          o2(0x98,0xFA),      o2(0x98,0xFB),
-          o2(0x98,0xFC),      o2(0x98,0xFD),
-          o2(0xBC,0xB6),      o2(0xBC,0xB7),
-          o2(0x98,0xFE),      o2(0xBC,0xB8),
-          o2(0xBC,0xB9),      o2(0xBC,0xBA),
-          o2(0x99,0x41),      o2(0x99,0x42),
-          o2(0x99,0x43),      o2(0x99,0x44),
-          o2(0xBC,0xBB),      o2(0x99,0x45),
-          o2(0xBC,0xBC),      o2(0xBC,0xBD),
-          o2(0x99,0x46),      o2(0x99,0x47),
-          o2(0xBC,0xBE),      o2(0x99,0x48),
-          o2(0x99,0x49),      o2(0x99,0x4A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_04 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_05_infos[65] = {
-          o2(0xBC,0xBF),      o2(0x99,0x4B),
-          o2(0x99,0x4C),      o2(0x99,0x4D),
-          o2(0x99,0x4E),      o2(0x99,0x4F),
-          o2(0x99,0x50),      o2(0x99,0x51),
-          o2(0xBC,0xC0),      o2(0xBC,0xC1),
-          o2(0x99,0x52),      o2(0xBC,0xC2),
-          o2(0xBC,0xC3),      o2(0xBC,0xC4),
-          o2(0x99,0x53),      o2(0x99,0x54),
-          o2(0x99,0x55),      o2(0x99,0x56),
-          o2(0x99,0x57),      o2(0x99,0x58),
-          o2(0xBC,0xC5),      o2(0xBC,0xC6),
-          o2(0x99,0x59),      o2(0x99,0x5A),
-          o2(0xBC,0xC7),      o2(0x99,0x61),
-          o2(0x99,0x62),      o2(0x99,0x63),
-          o2(0xBC,0xC8),      o2(0x99,0x64),
-          o2(0x99,0x65),      o2(0x99,0x66),
-          o2(0x99,0x67),      o2(0x99,0x68),
-          o2(0x99,0x69),      o2(0x99,0x6A),
-          o2(0xBC,0xC9),      o2(0xBC,0xCA),
-          o2(0x99,0x6B),      o2(0xBC,0xCB),
-          o2(0xBC,0xCC),      o2(0xBC,0xCD),
-          o2(0x99,0x6C),      o2(0x99,0x6D),
-          o2(0x99,0x6E),      o2(0x99,0x6F),
-          o2(0x99,0x70),      o2(0x99,0x71),
-          o2(0xBC,0xCE),      o2(0x99,0x72),
-          o2(0x99,0x73),      o2(0x99,0x74),
-          o2(0xBC,0xCF),      o2(0x99,0x75),
-          o2(0x99,0x76),      o2(0x99,0x77),
-          o2(0xBC,0xD0),      o2(0x99,0x78),
-          o2(0x99,0x79),      o2(0x99,0x7A),
-          o2(0x99,0x81),      o2(0x99,0x82),
-          o2(0x99,0x83),      o2(0x99,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_05 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_06_infos[65] = {
-          o2(0x99,0x85),      o2(0x99,0x86),
-          o2(0x99,0x87),      o2(0x99,0x88),
-          o2(0x99,0x89),      o2(0xBC,0xD1),
-          o2(0x99,0x8A),      o2(0x99,0x8B),
-          o2(0x99,0x8C),      o2(0x99,0x8D),
-          o2(0x99,0x8E),      o2(0x99,0x8F),
-          o2(0xBC,0xD2),      o2(0xBC,0xD3),
-          o2(0xBC,0xD4),      o2(0x99,0x90),
-          o2(0xBC,0xD5),      o2(0x99,0x91),
-          o2(0x99,0x92),      o2(0x99,0x93),
-          o2(0xBC,0xD6),      o2(0x99,0x94),
-          o2(0xBC,0xD7),      o2(0x99,0x95),
-          o2(0x99,0x96),      o2(0x99,0x97),
-          o2(0x99,0x98),      o2(0x99,0x99),
-          o2(0xBC,0xD8),      o2(0xBC,0xD9),
-          o2(0x99,0x9A),      o2(0xBC,0xDA),
-          o2(0x99,0x9B),      o2(0xBC,0xDB),
-          o2(0x99,0x9C),      o2(0x99,0x9D),
-          o2(0x99,0x9E),      o2(0xBC,0xDC),
-          o2(0x99,0x9F),      o2(0x99,0xA0),
-          o2(0xBC,0xDD),      o2(0xBC,0xDE),
-          o2(0x99,0xA1),      o2(0x99,0xA2),
-          o2(0xBC,0xDF),      o2(0x99,0xA3),
-          o2(0x99,0xA4),      o2(0x99,0xA5),
-          o2(0xBC,0xE0),      o2(0x99,0xA6),
-          o2(0x99,0xA7),      o2(0x99,0xA8),
-          o2(0x99,0xA9),      o2(0x99,0xAA),
-          o2(0x99,0xAB),      o2(0x99,0xAC),
-          o2(0x99,0xAD),      o2(0x99,0xAE),
-          o2(0x99,0xAF),      o2(0x99,0xB0),
-          o2(0x99,0xB1),      o2(0xBC,0xE1),
-          o2(0x99,0xB2),      o2(0x99,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_06 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_07_infos[65] = {
-          o2(0x99,0xB4),      o2(0x99,0xB5),
-          o2(0x99,0xB6),      o2(0x99,0xB7),
-          o2(0xBC,0xE2),      o2(0x99,0xB8),
-          o2(0x99,0xB9),      o2(0x99,0xBA),
-          o2(0xBC,0xE3),      o2(0x99,0xBB),
-          o2(0x99,0xBC),      o2(0x99,0xBD),
-          o2(0xBC,0xE4),      o2(0x99,0xBE),
-          o2(0x99,0xBF),      o2(0x99,0xC0),
-          o2(0x99,0xC1),      o2(0x99,0xC2),
-          o2(0x99,0xC3),      o2(0x99,0xC4),
-          o2(0xBC,0xE5),      o2(0x99,0xC5),
-          o2(0x99,0xC6),      o2(0xBC,0xE6),
-          o2(0xBC,0xE7),      o2(0x99,0xC7),
-          o2(0x99,0xC8),      o2(0x99,0xC9),
-          o2(0x99,0xCA),      o2(0x99,0xCB),
-          o2(0x99,0xCC),      o2(0x99,0xCD),
-          o2(0xBC,0xE8),      o2(0x99,0xCE),
-          o2(0x99,0xCF),      o2(0x99,0xD0),
-          o2(0xBC,0xE9),      o2(0x99,0xD1),
-          o2(0x99,0xD2),      o2(0x99,0xD3),
-          o2(0xBC,0xEA),      o2(0x99,0xD4),
-          o2(0x99,0xD5),      o2(0x99,0xD6),
-          o2(0x99,0xD7),      o2(0x99,0xD8),
-          o2(0x99,0xD9),      o2(0x99,0xDA),
-          o2(0xBC,0xEB),      o2(0xBC,0xEC),
-          o2(0x99,0xDB),      o2(0xBC,0xED),
-          o2(0x99,0xDC),      o2(0x99,0xDD),
-          o2(0x99,0xDE),      o2(0x99,0xDF),
-          o2(0x99,0xE0),      o2(0x99,0xE1),
-          o2(0x99,0xE2),      o2(0x99,0xE3),
-          o2(0xBC,0xEE),      o2(0xBC,0xEF),
-          o2(0x99,0xE4),      o2(0x99,0xE5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_07 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_08_infos[65] = {
-          o2(0xBC,0xF0),      o2(0x99,0xE6),
-          o2(0x99,0xE7),      o2(0x99,0xE8),
-          o2(0xBC,0xF1),      o2(0x99,0xE9),
-          o2(0x99,0xEA),      o2(0x99,0xEB),
-          o2(0x99,0xEC),      o2(0x99,0xED),
-          o2(0x99,0xEE),      o2(0x99,0xEF),
-          o2(0xBC,0xF2),      o2(0xBC,0xF3),
-          o2(0x99,0xF0),      o2(0xBC,0xF4),
-          o2(0x99,0xF1),      o2(0xBC,0xF5),
-          o2(0x99,0xF2),      o2(0x99,0xF3),
-          o2(0x99,0xF4),      o2(0x99,0xF5),
-          o2(0x99,0xF6),      o2(0x99,0xF7),
-          o2(0xBC,0xF6),      o2(0xBC,0xF7),
-          o2(0x99,0xF8),      o2(0x99,0xF9),
-          o2(0xBC,0xF8),      o2(0x99,0xFA),
-          o2(0x99,0xFB),      o2(0xBC,0xF9),
-          o2(0xBC,0xFA),      o2(0x99,0xFC),
-          o2(0x99,0xFD),      o2(0x99,0xFE),
-          o2(0x9A,0x41),      o2(0x9A,0x42),
-          o2(0x9A,0x43),      o2(0x9A,0x44),
-          o2(0xBC,0xFB),      o2(0xBC,0xFC),
-          o2(0x9A,0x45),      o2(0xBC,0xFD),
-          o2(0x9A,0x46),      o2(0xBC,0xFE),
-          o2(0x9A,0x47),      o2(0xBD,0xA1),
-          o2(0x9A,0x48),      o2(0xBD,0xA2),
-          o2(0xBD,0xA3),      o2(0x9A,0x49),
-          o2(0xBD,0xA4),      o2(0x9A,0x4A),
-          o2(0x9A,0x4B),      o2(0x9A,0x4C),
-          o2(0x9A,0x4D),      o2(0x9A,0x4E),
-          o2(0x9A,0x4F),      o2(0x9A,0x50),
-          o2(0x9A,0x51),      o2(0x9A,0x52),
-          o2(0x9A,0x53),      o2(0x9A,0x54),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_08 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_09_infos[65] = {
-          o2(0x9A,0x55),      o2(0x9A,0x56),
-          o2(0x9A,0x57),      o2(0x9A,0x58),
-          o2(0x9A,0x59),      o2(0x9A,0x5A),
-          o2(0x9A,0x61),      o2(0x9A,0x62),
-          o2(0xBD,0xA5),      o2(0x9A,0x63),
-          o2(0x9A,0x64),      o2(0x9A,0x65),
-          o2(0x9A,0x66),      o2(0x9A,0x67),
-          o2(0x9A,0x68),      o2(0x9A,0x69),
-          o2(0xBD,0xA6),      o2(0xBD,0xA7),
-          o2(0x9A,0x6A),      o2(0x9A,0x6B),
-          o2(0xBD,0xA8),      o2(0x9A,0x6C),
-          o2(0x9A,0x6D),      o2(0x9A,0x6E),
-          o2(0xBD,0xA9),      o2(0x9A,0x6F),
-          o2(0x9A,0x70),      o2(0x9A,0x71),
-          o2(0x9A,0x72),      o2(0x9A,0x73),
-          o2(0x9A,0x74),      o2(0x9A,0x75),
-          o2(0xBD,0xAA),      o2(0x9A,0x76),
-          o2(0x9A,0x77),      o2(0x9A,0x78),
-          o2(0x9A,0x79),      o2(0xBD,0xAB),
-          o2(0x9A,0x7A),      o2(0x9A,0x81),
-          o2(0x9A,0x82),      o2(0x9A,0x83),
-          o2(0x9A,0x84),      o2(0x9A,0x85),
-          o2(0xBD,0xAC),      o2(0xBD,0xAD),
-          o2(0x9A,0x86),      o2(0x9A,0x87),
-          o2(0xBD,0xAE),      o2(0x9A,0x88),
-          o2(0x9A,0x89),      o2(0x9A,0x8A),
-          o2(0xBD,0xAF),      o2(0x9A,0x8B),
-          o2(0x9A,0x8C),      o2(0x9A,0x8D),
-          o2(0x9A,0x8E),      o2(0x9A,0x8F),
-          o2(0x9A,0x90),      o2(0x9A,0x91),
-          o2(0xBD,0xB0),      o2(0xBD,0xB1),
-          o2(0x9A,0x92),      o2(0xBD,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_09 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0A_infos[65] = {
-          o2(0x9A,0x93),      o2(0xBD,0xB3),
-          o2(0x9A,0x94),      o2(0x9A,0x95),
-          o2(0x9A,0x96),      o2(0x9A,0x97),
-          o2(0x9A,0x98),      o2(0x9A,0x99),
-          o2(0xBD,0xB4),      o2(0xBD,0xB5),
-          o2(0x9A,0x9A),      o2(0x9A,0x9B),
-          o2(0x9A,0x9C),      o2(0x9A,0x9D),
-          o2(0x9A,0x9E),      o2(0x9A,0x9F),
-          o2(0xBD,0xB6),      o2(0x9A,0xA0),
-          o2(0x9A,0xA1),      o2(0x9A,0xA2),
-          o2(0x9A,0xA3),      o2(0x9A,0xA4),
-          o2(0x9A,0xA5),      o2(0x9A,0xA6),
-          o2(0xBD,0xB7),      o2(0x9A,0xA7),
-          o2(0x9A,0xA8),      o2(0xBD,0xB8),
-          o2(0x9A,0xA9),      o2(0xBD,0xB9),
-          o2(0x9A,0xAA),      o2(0x9A,0xAB),
-          o2(0x9A,0xAC),      o2(0x9A,0xAD),
-          o2(0x9A,0xAE),      o2(0x9A,0xAF),
-          o2(0xBD,0xBA),      o2(0xBD,0xBB),
-          o2(0x9A,0xB0),      o2(0x9A,0xB1),
-          o2(0xBD,0xBC),      o2(0x9A,0xB2),
-          o2(0x9A,0xB3),      o2(0x9A,0xB4),
-          o2(0xBD,0xBD),      o2(0xBD,0xBE),
-          o2(0x9A,0xB5),      o2(0x9A,0xB6),
-          o2(0x9A,0xB7),      o2(0x9A,0xB8),
-          o2(0x9A,0xB9),      o2(0x9A,0xBA),
-          o2(0xBD,0xBF),      o2(0xBD,0xC0),
-          o2(0x9A,0xBB),      o2(0xBD,0xC1),
-          o2(0x9A,0xBC),      o2(0xBD,0xC2),
-          o2(0x9A,0xBD),      o2(0x9A,0xBE),
-          o2(0x9A,0xBF),      o2(0x9A,0xC0),
-          o2(0x9A,0xC1),      o2(0x9A,0xC2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0B_infos[65] = {
-          o2(0x9A,0xC3),      o2(0x9A,0xC4),
-          o2(0x9A,0xC5),      o2(0x9A,0xC6),
-          o2(0x9A,0xC7),      o2(0x9A,0xC8),
-          o2(0x9A,0xC9),      o2(0x9A,0xCA),
-          o2(0x9A,0xCB),      o2(0x9A,0xCC),
-          o2(0x9A,0xCD),      o2(0x9A,0xCE),
-          o2(0x9A,0xCF),      o2(0x9A,0xD0),
-          o2(0x9A,0xD1),      o2(0x9A,0xD2),
-          o2(0x9A,0xD3),      o2(0x9A,0xD4),
-          o2(0x9A,0xD5),      o2(0x9A,0xD6),
-          o2(0x9A,0xD7),      o2(0x9A,0xD8),
-          o2(0x9A,0xD9),      o2(0x9A,0xDA),
-          o2(0x9A,0xDB),      o2(0x9A,0xDC),
-          o2(0x9A,0xDD),      o2(0x9A,0xDE),
-          o2(0xBD,0xC3),      o2(0xBD,0xC4),
-          o2(0x9A,0xDF),      o2(0x9A,0xE0),
-          o2(0xBD,0xC5),      o2(0x9A,0xE1),
-          o2(0x9A,0xE2),      o2(0xBD,0xC6),
-          o2(0xBD,0xC7),      o2(0x9A,0xE3),
-          o2(0x9A,0xE4),      o2(0x9A,0xE5),
-          o2(0x9A,0xE6),      o2(0x9A,0xE7),
-          o2(0x9A,0xE8),      o2(0xBD,0xC8),
-          o2(0xBD,0xC9),      o2(0xBD,0xCA),
-          o2(0x9A,0xE9),      o2(0xBD,0xCB),
-          o2(0x9A,0xEA),      o2(0xBD,0xCC),
-          o2(0x9A,0xEB),      o2(0x9A,0xEC),
-          o2(0x9A,0xED),      o2(0x9A,0xEE),
-          o2(0xBD,0xCD),      o2(0x9A,0xEF),
-          o2(0xBD,0xCE),      o2(0xBD,0xCF),
-          o2(0x9A,0xF0),      o2(0xBD,0xD0),
-          o2(0xBD,0xD1),      o2(0x9A,0xF1),
-          o2(0x9A,0xF2),      o2(0x9A,0xF3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0C_infos[65] = {
-          o2(0xBD,0xD2),      o2(0x9A,0xF4),
-          o2(0x9A,0xF5),      o2(0x9A,0xF6),
-          o2(0x9A,0xF7),      o2(0x9A,0xF8),
-          o2(0x9A,0xF9),      o2(0x9A,0xFA),
-          o2(0xBD,0xD3),      o2(0xBD,0xD4),
-          o2(0x9A,0xFB),      o2(0x9A,0xFC),
-          o2(0xBD,0xD5),      o2(0xBD,0xD6),
-          o2(0x9A,0xFD),      o2(0x9A,0xFE),
-          o2(0x9B,0x41),      o2(0x9B,0x42),
-          o2(0x9B,0x43),      o2(0xBD,0xD7),
-          o2(0xBD,0xD8),      o2(0xBD,0xD9),
-          o2(0x9B,0x44),      o2(0x9B,0x45),
-          o2(0xBD,0xDA),      o2(0x9B,0x46),
-          o2(0x9B,0x47),      o2(0x9B,0x48),
-          o2(0xBD,0xDB),      o2(0x9B,0x49),
-          o2(0x9B,0x4A),      o2(0x9B,0x4B),
-          o2(0x9B,0x4C),      o2(0x9B,0x4D),
-          o2(0x9B,0x4E),      o2(0x9B,0x4F),
-          o2(0xBD,0xDC),      o2(0xBD,0xDD),
-          o2(0x9B,0x50),      o2(0x9B,0x51),
-          o2(0xBD,0xDE),      o2(0xBD,0xDF),
-          o2(0x9B,0x52),      o2(0x9B,0x53),
-          o2(0x9B,0x54),      o2(0x9B,0x55),
-          o2(0x9B,0x56),      o2(0x9B,0x57),
-          o2(0x9B,0x58),      o2(0x9B,0x59),
-          o2(0x9B,0x5A),      o2(0x9B,0x61),
-          o2(0x9B,0x62),      o2(0x9B,0x63),
-          o2(0x9B,0x64),      o2(0x9B,0x65),
-          o2(0x9B,0x66),      o2(0x9B,0x67),
-          o2(0x9B,0x68),      o2(0x9B,0x69),
-          o2(0x9B,0x6A),      o2(0x9B,0x6B),
-          o2(0x9B,0x6C),      o2(0x9B,0x6D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0D_infos[65] = {
-          o2(0x9B,0x6E),      o2(0x9B,0x6F),
-          o2(0x9B,0x70),      o2(0x9B,0x71),
-          o2(0x9B,0x72),      o2(0xBD,0xE0),
-          o2(0x9B,0x73),      o2(0x9B,0x74),
-          o2(0x9B,0x75),      o2(0x9B,0x76),
-          o2(0x9B,0x77),      o2(0x9B,0x78),
-          o2(0x9B,0x79),      o2(0x9B,0x7A),
-          o2(0x9B,0x81),      o2(0x9B,0x82),
-          o2(0x9B,0x83),      o2(0x9B,0x84),
-          o2(0x9B,0x85),      o2(0x9B,0x86),
-          o2(0x9B,0x87),      o2(0x9B,0x88),
-          o2(0x9B,0x89),      o2(0x9B,0x8A),
-          o2(0x9B,0x8B),      o2(0x9B,0x8C),
-          o2(0x9B,0x8D),      o2(0x9B,0x8E),
-          o2(0x9B,0x8F),      o2(0x9B,0x90),
-          o2(0x9B,0x91),      o2(0x9B,0x92),
-          o2(0x9B,0x93),      o2(0x9B,0x94),
-          o2(0x9B,0x95),      o2(0x9B,0x96),
-          o2(0x9B,0x97),      o2(0x9B,0x98),
-          o2(0x9B,0x99),      o2(0x9B,0x9A),
-          o2(0xBD,0xE1),      o2(0xBD,0xE2),
-          o2(0x9B,0x9B),      o2(0x9B,0x9C),
-          o2(0xBD,0xE3),      o2(0x9B,0x9D),
-          o2(0x9B,0x9E),      o2(0x9B,0x9F),
-          o2(0xBD,0xE4),      o2(0x9B,0xA0),
-          o2(0xBD,0xE5),      o2(0x9B,0xA1),
-          o2(0x9B,0xA2),      o2(0x9B,0xA3),
-          o2(0x9B,0xA4),      o2(0x9B,0xA5),
-          o2(0xBD,0xE6),      o2(0xBD,0xE7),
-          o2(0x9B,0xA6),      o2(0x9B,0xA7),
-          o2(0xBD,0xE8),      o2(0xBD,0xE9),
-          o2(0x9B,0xA8),      o2(0x9B,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0E_infos[65] = {
-          o2(0x9B,0xAA),      o2(0x9B,0xAB),
-          o2(0x9B,0xAC),      o2(0x9B,0xAD),
-          o2(0xBD,0xEA),      o2(0x9B,0xAE),
-          o2(0x9B,0xAF),      o2(0x9B,0xB0),
-          o2(0xBD,0xEB),      o2(0x9B,0xB1),
-          o2(0x9B,0xB2),      o2(0x9B,0xB3),
-          o2(0xBD,0xEC),      o2(0x9B,0xB4),
-          o2(0x9B,0xB5),      o2(0x9B,0xB6),
-          o2(0x9B,0xB7),      o2(0x9B,0xB8),
-          o2(0x9B,0xB9),      o2(0x9B,0xBA),
-          o2(0x9B,0xBB),      o2(0x9B,0xBC),
-          o2(0x9B,0xBD),      o2(0x9B,0xBE),
-          o2(0x9B,0xBF),      o2(0x9B,0xC0),
-          o2(0x9B,0xC1),      o2(0x9B,0xC2),
-          o2(0x9B,0xC3),      o2(0x9B,0xC4),
-          o2(0x9B,0xC5),      o2(0x9B,0xC6),
-          o2(0x9B,0xC7),      o2(0x9B,0xC8),
-          o2(0x9B,0xC9),      o2(0x9B,0xCA),
-          o2(0x9B,0xCB),      o2(0x9B,0xCC),
-          o2(0x9B,0xCD),      o2(0x9B,0xCE),
-          o2(0x9B,0xCF),      o2(0x9B,0xD0),
-          o2(0x9B,0xD1),      o2(0x9B,0xD2),
-          o2(0x9B,0xD3),      o2(0x9B,0xD4),
-          o2(0x9B,0xD5),      o2(0x9B,0xD6),
-          o2(0x9B,0xD7),      o2(0x9B,0xD8),
-          o2(0x9B,0xD9),      o2(0x9B,0xDA),
-          o2(0x9B,0xDB),      o2(0x9B,0xDC),
-          o2(0x9B,0xDD),      o2(0x9B,0xDE),
-          o2(0x9B,0xDF),      o2(0x9B,0xE0),
-          o2(0x9B,0xE1),      o2(0x9B,0xE2),
-          o2(0x9B,0xE3),      o2(0x9B,0xE4),
-          o2(0x9B,0xE5),      o2(0x9B,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_0F_infos[65] = {
-          o2(0xBD,0xED),      o2(0x9B,0xE7),
-          o2(0x9B,0xE8),      o2(0x9B,0xE9),
-          o2(0x9B,0xEA),      o2(0x9B,0xEB),
-          o2(0x9B,0xEC),      o2(0x9B,0xED),
-          o2(0x9B,0xEE),      o2(0x9B,0xEF),
-          o2(0x9B,0xF0),      o2(0x9B,0xF1),
-          o2(0x9B,0xF2),      o2(0x9B,0xF3),
-          o2(0x9B,0xF4),      o2(0x9B,0xF5),
-          o2(0x9B,0xF6),      o2(0x9B,0xF7),
-          o2(0x9B,0xF8),      o2(0x9B,0xF9),
-          o2(0x9B,0xFA),      o2(0x9B,0xFB),
-          o2(0x9B,0xFC),      o2(0x9B,0xFD),
-          o2(0xBD,0xEE),      o2(0xBD,0xEF),
-          o2(0x9B,0xFE),      o2(0x9C,0x41),
-          o2(0xBD,0xF0),      o2(0x9C,0x42),
-          o2(0x9C,0x43),      o2(0xBD,0xF1),
-          o2(0xBD,0xF2),      o2(0x9C,0x44),
-          o2(0xBD,0xF3),      o2(0x9C,0x45),
-          o2(0x9C,0x46),      o2(0x9C,0x47),
-          o2(0x9C,0x48),      o2(0x9C,0x49),
-          o2(0xBD,0xF4),      o2(0xBD,0xF5),
-          o2(0x9C,0x4A),      o2(0x9C,0x4B),
-          o2(0x9C,0x4C),      o2(0xBD,0xF6),
-          o2(0x9C,0x4D),      o2(0x9C,0x4E),
-          o2(0x9C,0x4F),      o2(0x9C,0x50),
-          o2(0x9C,0x51),      o2(0x9C,0x52),
-          o2(0xBD,0xF7),      o2(0xBD,0xF8),
-          o2(0x9C,0x53),      o2(0x9C,0x54),
-          o2(0xBD,0xF9),      o2(0x9C,0x55),
-          o2(0x9C,0x56),      o2(0x9C,0x57),
-          o2(0x9C,0x58),      o2(0x9C,0x59),
-          o2(0x9C,0x5A),      o2(0x9C,0x61),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_0F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_10_infos[65] = {
-          o2(0x9C,0x62),      o2(0x9C,0x63),
-          o2(0x9C,0x64),      o2(0x9C,0x65),
-          o2(0x9C,0x66),      o2(0x9C,0x67),
-          o2(0x9C,0x68),      o2(0x9C,0x69),
-          o2(0xBD,0xFA),      o2(0x9C,0x6A),
-          o2(0x9C,0x6B),      o2(0x9C,0x6C),
-          o2(0x9C,0x6D),      o2(0x9C,0x6E),
-          o2(0x9C,0x6F),      o2(0x9C,0x70),
-          o2(0xBD,0xFB),      o2(0x9C,0x71),
-          o2(0x9C,0x72),      o2(0x9C,0x73),
-          o2(0x9C,0x74),      o2(0x9C,0x75),
-          o2(0x9C,0x76),      o2(0x9C,0x77),
-          o2(0x9C,0x78),      o2(0x9C,0x79),
-          o2(0x9C,0x7A),      o2(0x9C,0x81),
-          o2(0x9C,0x82),      o2(0x9C,0x83),
-          o2(0x9C,0x84),      o2(0x9C,0x85),
-          o2(0x9C,0x86),      o2(0x9C,0x87),
-          o2(0x9C,0x88),      o2(0x9C,0x89),
-          o2(0xBD,0xFC),      o2(0x9C,0x8A),
-          o2(0x9C,0x8B),      o2(0x9C,0x8C),
-          o2(0x9C,0x8D),      o2(0x9C,0x8E),
-          o2(0x9C,0x8F),      o2(0x9C,0x90),
-          o2(0xBD,0xFD),      o2(0x9C,0x91),
-          o2(0x9C,0x92),      o2(0x9C,0x93),
-          o2(0xBD,0xFE),      o2(0x9C,0x94),
-          o2(0x9C,0x95),      o2(0x9C,0x96),
-          o2(0xBE,0xA1),      o2(0x9C,0x97),
-          o2(0x9C,0x98),      o2(0x9C,0x99),
-          o2(0x9C,0x9A),      o2(0x9C,0x9B),
-          o2(0x9C,0x9C),      o2(0x9C,0x9D),
-          o2(0xBE,0xA2),      o2(0xBE,0xA3),
-          o2(0x9C,0x9E),      o2(0x9C,0x9F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_10 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_11_infos[65] = {
-          o2(0x9C,0xA0),      o2(0x9C,0xA1),
-          o2(0x9C,0xA2),      o2(0x9C,0xA3),
-          o2(0x9C,0xA4),      o2(0x9C,0xA5),
-          o2(0x9C,0xA6),      o2(0x9C,0xA7),
-          o2(0xBE,0xA4),      o2(0x9C,0xA8),
-          o2(0x9C,0xA9),      o2(0x9C,0xAA),
-          o2(0x9C,0xAB),      o2(0x9C,0xAC),
-          o2(0x9C,0xAD),      o2(0x9C,0xAE),
-          o2(0x9C,0xAF),      o2(0x9C,0xB0),
-          o2(0x9C,0xB1),      o2(0x9C,0xB2),
-          o2(0x9C,0xB3),      o2(0x9C,0xB4),
-          o2(0x9C,0xB5),      o2(0x9C,0xB6),
-          o2(0x9C,0xB7),      o2(0x9C,0xB8),
-          o2(0x9C,0xB9),      o2(0x9C,0xBA),
-          o2(0x9C,0xBB),      o2(0x9C,0xBC),
-          o2(0x9C,0xBD),      o2(0x9C,0xBE),
-          o2(0x9C,0xBF),      o2(0x9C,0xC0),
-          o2(0x9C,0xC1),      o2(0x9C,0xC2),
-          o2(0xBE,0xA5),      o2(0xBE,0xA6),
-          o2(0x9C,0xC3),      o2(0x9C,0xC4),
-          o2(0xBE,0xA7),      o2(0x9C,0xC5),
-          o2(0x9C,0xC6),      o2(0x9C,0xC7),
-          o2(0xBE,0xA8),      o2(0x9C,0xC8),
-          o2(0x9C,0xC9),      o2(0x9C,0xCA),
-          o2(0x9C,0xCB),      o2(0x9C,0xCC),
-          o2(0x9C,0xCD),      o2(0x9C,0xCE),
-          o2(0xBE,0xA9),      o2(0xBE,0xAA),
-          o2(0x9C,0xCF),      o2(0x9C,0xD0),
-          o2(0x9C,0xD1),      o2(0xBE,0xAB),
-          o2(0x9C,0xD2),      o2(0x9C,0xD3),
-          o2(0x9C,0xD4),      o2(0x9C,0xD5),
-          o2(0x9C,0xD6),      o2(0x9C,0xD7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_11 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_12_infos[65] = {
-          o2(0xBE,0xAC),      o2(0x9C,0xD8),
-          o2(0x9C,0xD9),      o2(0x9C,0xDA),
-          o2(0x9C,0xDB),      o2(0x9C,0xDC),
-          o2(0x9C,0xDD),      o2(0x9C,0xDE),
-          o2(0x9C,0xDF),      o2(0x9C,0xE0),
-          o2(0x9C,0xE1),      o2(0x9C,0xE2),
-          o2(0x9C,0xE3),      o2(0x9C,0xE4),
-          o2(0x9C,0xE5),      o2(0x9C,0xE6),
-          o2(0x9C,0xE7),      o2(0x9C,0xE8),
-          o2(0x9C,0xE9),      o2(0x9C,0xEA),
-          o2(0xBE,0xAD),      o2(0x9C,0xEB),
-          o2(0x9C,0xEC),      o2(0x9C,0xED),
-          o2(0x9C,0xEE),      o2(0x9C,0xEF),
-          o2(0x9C,0xF0),      o2(0x9C,0xF1),
-          o2(0xBE,0xAE),      o2(0x9C,0xF2),
-          o2(0x9C,0xF3),      o2(0x9C,0xF4),
-          o2(0x9C,0xF5),      o2(0x9C,0xF6),
-          o2(0x9C,0xF7),      o2(0x9C,0xF8),
-          o2(0x9C,0xF9),      o2(0x9C,0xFA),
-          o2(0x9C,0xFB),      o2(0x9C,0xFC),
-          o2(0x9C,0xFD),      o2(0x9C,0xFE),
-          o2(0x9D,0x41),      o2(0x9D,0x42),
-          o2(0x9D,0x43),      o2(0x9D,0x44),
-          o2(0x9D,0x45),      o2(0x9D,0x46),
-          o2(0x9D,0x47),      o2(0x9D,0x48),
-          o2(0x9D,0x49),      o2(0x9D,0x4A),
-          o2(0x9D,0x4B),      o2(0x9D,0x4C),
-          o2(0x9D,0x4D),      o2(0x9D,0x4E),
-          o2(0xBE,0xAF),      o2(0x9D,0x4F),
-          o2(0x9D,0x50),      o2(0x9D,0x51),
-          o2(0xBE,0xB0),      o2(0x9D,0x52),
-          o2(0x9D,0x53),      o2(0x9D,0x54),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_12 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_13_infos[65] = {
-          o2(0x9D,0x55),      o2(0x9D,0x56),
-          o2(0x9D,0x57),      o2(0x9D,0x58),
-          o2(0x9D,0x59),      o2(0x9D,0x5A),
-          o2(0x9D,0x61),      o2(0x9D,0x62),
-          o2(0x9D,0x63),      o2(0x9D,0x64),
-          o2(0x9D,0x65),      o2(0x9D,0x66),
-          o2(0x9D,0x67),      o2(0x9D,0x68),
-          o2(0x9D,0x69),      o2(0x9D,0x6A),
-          o2(0x9D,0x6B),      o2(0x9D,0x6C),
-          o2(0x9D,0x6D),      o2(0x9D,0x6E),
-          o2(0x9D,0x6F),      o2(0x9D,0x70),
-          o2(0x9D,0x71),      o2(0x9D,0x72),
-          o2(0x9D,0x73),      o2(0x9D,0x74),
-          o2(0x9D,0x75),      o2(0x9D,0x76),
-          o2(0x9D,0x77),      o2(0x9D,0x78),
-          o2(0x9D,0x79),      o2(0x9D,0x7A),
-          o2(0x9D,0x81),      o2(0x9D,0x82),
-          o2(0x9D,0x83),      o2(0x9D,0x84),
-          o2(0x9D,0x85),      o2(0x9D,0x86),
-          o2(0x9D,0x87),      o2(0x9D,0x88),
-          o2(0x9D,0x89),      o2(0xBE,0xB1),
-          o2(0x9D,0x8A),      o2(0x9D,0x8B),
-          o2(0x9D,0x8C),      o2(0x9D,0x8D),
-          o2(0x9D,0x8E),      o2(0x9D,0x8F),
-          o2(0xBE,0xB2),      o2(0xBE,0xB3),
-          o2(0x9D,0x90),      o2(0x9D,0x91),
-          o2(0xBE,0xB4),      o2(0x9D,0x92),
-          o2(0x9D,0x93),      o2(0x9D,0x94),
-          o2(0xBE,0xB5),      o2(0x9D,0x95),
-          o2(0xBE,0xB6),      o2(0x9D,0x96),
-          o2(0x9D,0x97),      o2(0x9D,0x98),
-          o2(0x9D,0x99),      o2(0xBE,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_13 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_14_infos[65] = {
-          o2(0xBE,0xB8),      o2(0xBE,0xB9),
-          o2(0x9D,0x9A),      o2(0x9D,0x9B),
-          o2(0x9D,0x9C),      o2(0x9D,0x9D),
-          o2(0x9D,0x9E),      o2(0x9D,0x9F),
-          o2(0x9D,0xA0),      o2(0x9D,0xA1),
-          o2(0x9D,0xA2),      o2(0x9D,0xA3),
-          o2(0xBE,0xBA),      o2(0x9D,0xA4),
-          o2(0x9D,0xA5),      o2(0x9D,0xA6),
-          o2(0xBE,0xBB),      o2(0x9D,0xA7),
-          o2(0x9D,0xA8),      o2(0x9D,0xA9),
-          o2(0xBE,0xBC),      o2(0x9D,0xAA),
-          o2(0x9D,0xAB),      o2(0x9D,0xAC),
-          o2(0x9D,0xAD),      o2(0x9D,0xAE),
-          o2(0x9D,0xAF),      o2(0x9D,0xB0),
-          o2(0xBE,0xBD),      o2(0x9D,0xB1),
-          o2(0x9D,0xB2),      o2(0x9D,0xB3),
-          o2(0x9D,0xB4),      o2(0x9D,0xB5),
-          o2(0x9D,0xB6),      o2(0x9D,0xB7),
-          o2(0x9D,0xB8),      o2(0x9D,0xB9),
-          o2(0x9D,0xBA),      o2(0x9D,0xBB),
-          o2(0xBE,0xBE),      o2(0xBE,0xBF),
-          o2(0x9D,0xBC),      o2(0x9D,0xBD),
-          o2(0xBE,0xC0),      o2(0x9D,0xBE),
-          o2(0x9D,0xBF),      o2(0x9D,0xC0),
-          o2(0xBE,0xC1),      o2(0x9D,0xC1),
-          o2(0x9D,0xC2),      o2(0x9D,0xC3),
-          o2(0x9D,0xC4),      o2(0x9D,0xC5),
-          o2(0x9D,0xC6),      o2(0x9D,0xC7),
-          o2(0xBE,0xC2),      o2(0xBE,0xC3),
-          o2(0x9D,0xC8),      o2(0xBE,0xC4),
-          o2(0x9D,0xC9),      o2(0xBE,0xC5),
-          o2(0x9D,0xCA),      o2(0x9D,0xCB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_14 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_15_infos[65] = {
-          o2(0x9D,0xCC),      o2(0x9D,0xCD),
-          o2(0x9D,0xCE),      o2(0x9D,0xCF),
-          o2(0xBE,0xC6),      o2(0xBE,0xC7),
-          o2(0x9D,0xD0),      o2(0x9D,0xD1),
-          o2(0xBE,0xC8),      o2(0xBE,0xC9),
-          o2(0xBE,0xCA),      o2(0x9D,0xD2),
-          o2(0xBE,0xCB),      o2(0xBE,0xCC),
-          o2(0xBE,0xCD),      o2(0x9D,0xD3),
-          o2(0x9D,0xD4),      o2(0x9D,0xD5),
-          o2(0x9D,0xD6),      o2(0xBE,0xCE),
-          o2(0xBE,0xCF),      o2(0xBE,0xD0),
-          o2(0x9D,0xD7),      o2(0xBE,0xD1),
-          o2(0xBE,0xD2),      o2(0xBE,0xD3),
-          o2(0x9D,0xD8),      o2(0x9D,0xD9),
-          o2(0x9D,0xDA),      o2(0xBE,0xD4),
-          o2(0xBE,0xD5),      o2(0x9D,0xDB),
-          o2(0xBE,0xD6),      o2(0xBE,0xD7),
-          o2(0x9D,0xDC),      o2(0x9D,0xDD),
-          o2(0xBE,0xD8),      o2(0x9D,0xDE),
-          o2(0x9D,0xDF),      o2(0x9D,0xE0),
-          o2(0xBE,0xD9),      o2(0x9D,0xE1),
-          o2(0x9D,0xE2),      o2(0x9D,0xE3),
-          o2(0x9D,0xE4),      o2(0x9D,0xE5),
-          o2(0x9D,0xE6),      o2(0x9D,0xE7),
-          o2(0xBE,0xDA),      o2(0xBE,0xDB),
-          o2(0x9D,0xE8),      o2(0xBE,0xDC),
-          o2(0xBE,0xDD),      o2(0xBE,0xDE),
-          o2(0x9D,0xE9),      o2(0x9D,0xEA),
-          o2(0x9D,0xEB),      o2(0x9D,0xEC),
-          o2(0x9D,0xED),      o2(0x9D,0xEE),
-          o2(0xBE,0xDF),      o2(0xBE,0xE0),
-          o2(0x9D,0xEF),      o2(0x9D,0xF0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_15 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_16_infos[65] = {
-          o2(0xBE,0xE1),      o2(0x9D,0xF1),
-          o2(0x9D,0xF2),      o2(0x9D,0xF3),
-          o2(0xBE,0xE2),      o2(0x9D,0xF4),
-          o2(0x9D,0xF5),      o2(0xBE,0xE3),
-          o2(0x9D,0xF6),      o2(0x9D,0xF7),
-          o2(0x9D,0xF8),      o2(0x9D,0xF9),
-          o2(0xBE,0xE4),      o2(0xBE,0xE5),
-          o2(0x9D,0xFA),      o2(0xBE,0xE6),
-          o2(0x9D,0xFB),      o2(0xBE,0xE7),
-          o2(0x9D,0xFC),      o2(0x9D,0xFD),
-          o2(0x9D,0xFE),      o2(0xBE,0xE8),
-          o2(0x9E,0x41),      o2(0xBE,0xE9),
-          o2(0xBE,0xEA),      o2(0x9E,0x42),
-          o2(0x9E,0x43),      o2(0x9E,0x44),
-          o2(0xBE,0xEB),      o2(0x9E,0x45),
-          o2(0x9E,0x46),      o2(0x9E,0x47),
-          o2(0xBE,0xEC),      o2(0x9E,0x48),
-          o2(0x9E,0x49),      o2(0x9E,0x4A),
-          o2(0x9E,0x4B),      o2(0x9E,0x4C),
-          o2(0x9E,0x4D),      o2(0x9E,0x4E),
-          o2(0x9E,0x4F),      o2(0xBE,0xED),
-          o2(0x9E,0x50),      o2(0x9E,0x51),
-          o2(0x9E,0x52),      o2(0x9E,0x53),
-          o2(0x9E,0x54),      o2(0x9E,0x55),
-          o2(0x9E,0x56),      o2(0x9E,0x57),
-          o2(0x9E,0x58),      o2(0x9E,0x59),
-          o2(0xBE,0xEE),      o2(0xBE,0xEF),
-          o2(0x9E,0x5A),      o2(0x9E,0x61),
-          o2(0xBE,0xF0),      o2(0xBE,0xF1),
-          o2(0x9E,0x62),      o2(0xBE,0xF2),
-          o2(0xBE,0xF3),      o2(0xBE,0xF4),
-          o2(0xBE,0xF5),      o2(0x9E,0x63),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_16 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_17_infos[65] = {
-          o2(0x9E,0x64),      o2(0x9E,0x65),
-          o2(0x9E,0x66),      o2(0x9E,0x67),
-          o2(0xBE,0xF6),      o2(0xBE,0xF7),
-          o2(0xBE,0xF8),      o2(0xBE,0xF9),
-          o2(0xBE,0xFA),      o2(0xBE,0xFB),
-          o2(0xBE,0xFC),      o2(0x9E,0x68),
-          o2(0xBE,0xFD),      o2(0x9E,0x69),
-          o2(0xBE,0xFE),      o2(0x9E,0x6A),
-          o2(0xBF,0xA1),      o2(0xBF,0xA2),
-          o2(0x9E,0x6B),      o2(0x9E,0x6C),
-          o2(0xBF,0xA3),      o2(0x9E,0x6D),
-          o2(0x9E,0x6E),      o2(0x9E,0x6F),
-          o2(0xBF,0xA4),      o2(0x9E,0x70),
-          o2(0x9E,0x71),      o2(0x9E,0x72),
-          o2(0x9E,0x73),      o2(0x9E,0x74),
-          o2(0x9E,0x75),      o2(0x9E,0x76),
-          o2(0xBF,0xA5),      o2(0xBF,0xA6),
-          o2(0x9E,0x77),      o2(0xBF,0xA7),
-          o2(0x9E,0x78),      o2(0xBF,0xA8),
-          o2(0x9E,0x79),      o2(0x9E,0x7A),
-          o2(0x9E,0x81),      o2(0x9E,0x82),
-          o2(0x9E,0x83),      o2(0x9E,0x84),
-          o2(0xBF,0xA9),      o2(0xBF,0xAA),
-          o2(0xBF,0xAB),      o2(0x9E,0x85),
-          o2(0xBF,0xAC),      o2(0x9E,0x86),
-          o2(0x9E,0x87),      o2(0x9E,0x88),
-          o2(0xBF,0xAD),      o2(0x9E,0x89),
-          o2(0xBF,0xAE),      o2(0xBF,0xAF),
-          o2(0x9E,0x8A),      o2(0x9E,0x8B),
-          o2(0x9E,0x8C),      o2(0x9E,0x8D),
-          o2(0xBF,0xB0),      o2(0xBF,0xB1),
-          o2(0xBF,0xB2),      o2(0xBF,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_17 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_18_infos[65] = {
-          o2(0xBF,0xB4),      o2(0xBF,0xB5),
-          o2(0x9E,0x8E),      o2(0x9E,0x8F),
-          o2(0x9E,0x90),      o2(0xBF,0xB6),
-          o2(0xBF,0xB7),      o2(0xBF,0xB8),
-          o2(0xBF,0xB9),      o2(0x9E,0x91),
-          o2(0x9E,0x92),      o2(0x9E,0x93),
-          o2(0xBF,0xBA),      o2(0x9E,0x94),
-          o2(0x9E,0x95),      o2(0x9E,0x96),
-          o2(0xBF,0xBB),      o2(0x9E,0x97),
-          o2(0x9E,0x98),      o2(0x9E,0x99),
-          o2(0x9E,0x9A),      o2(0x9E,0x9B),
-          o2(0x9E,0x9C),      o2(0x9E,0x9D),
-          o2(0xBF,0xBC),      o2(0xBF,0xBD),
-          o2(0x9E,0x9E),      o2(0xBF,0xBE),
-          o2(0xBF,0xBF),      o2(0x9E,0x9F),
-          o2(0x9E,0xA0),      o2(0x9E,0xA1),
-          o2(0x9E,0xA2),      o2(0x9E,0xA3),
-          o2(0x9E,0xA4),      o2(0x9E,0xA5),
-          o2(0xBF,0xC0),      o2(0xBF,0xC1),
-          o2(0x9E,0xA6),      o2(0x9E,0xA7),
-          o2(0xBF,0xC2),      o2(0x9E,0xA8),
-          o2(0x9E,0xA9),      o2(0x9E,0xAA),
-          o2(0xBF,0xC3),      o2(0xBF,0xC4),
-          o2(0xBF,0xC5),      o2(0x9E,0xAB),
-          o2(0xBF,0xC6),      o2(0x9E,0xAC),
-          o2(0x9E,0xAD),      o2(0xBF,0xC7),
-          o2(0xBF,0xC8),      o2(0xBF,0xC9),
-          o2(0x9E,0xAE),      o2(0xBF,0xCA),
-          o2(0x9E,0xAF),      o2(0xBF,0xCB),
-          o2(0x9E,0xB0),      o2(0xBF,0xCC),
-          o2(0x9E,0xB1),      o2(0x9E,0xB2),
-          o2(0x9E,0xB3),      o2(0x9E,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_18 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_19_infos[65] = {
-          o2(0xBF,0xCD),      o2(0xBF,0xCE),
-          o2(0x9E,0xB5),      o2(0x9E,0xB6),
-          o2(0xBF,0xCF),      o2(0x9E,0xB7),
-          o2(0x9E,0xB8),      o2(0x9E,0xB9),
-          o2(0xBF,0xD0),      o2(0x9E,0xBA),
-          o2(0x9E,0xBB),      o2(0x9E,0xBC),
-          o2(0x9E,0xBD),      o2(0x9E,0xBE),
-          o2(0x9E,0xBF),      o2(0x9E,0xC0),
-          o2(0xBF,0xD1),      o2(0xBF,0xD2),
-          o2(0x9E,0xC1),      o2(0xBF,0xD3),
-          o2(0xBF,0xD4),      o2(0xBF,0xD5),
-          o2(0x9E,0xC2),      o2(0x9E,0xC3),
-          o2(0x9E,0xC4),      o2(0x9E,0xC5),
-          o2(0x9E,0xC6),      o2(0x9E,0xC7),
-          o2(0xBF,0xD6),      o2(0xBF,0xD7),
-          o2(0x9E,0xC8),      o2(0x9E,0xC9),
-          o2(0xBF,0xD8),      o2(0x9E,0xCA),
-          o2(0x9E,0xCB),      o2(0x9E,0xCC),
-          o2(0x9E,0xCD),      o2(0x9E,0xCE),
-          o2(0x9E,0xCF),      o2(0x9E,0xD0),
-          o2(0x9E,0xD1),      o2(0x9E,0xD2),
-          o2(0x9E,0xD3),      o2(0x9E,0xD4),
-          o2(0xBF,0xD9),      o2(0x9E,0xD5),
-          o2(0x9E,0xD6),      o2(0xBF,0xDA),
-          o2(0x9E,0xD7),      o2(0xBF,0xDB),
-          o2(0x9E,0xD8),      o2(0x9E,0xD9),
-          o2(0x9E,0xDA),      o2(0x9E,0xDB),
-          o2(0x9E,0xDC),      o2(0x9E,0xDD),
-          o2(0xBF,0xDC),      o2(0xBF,0xDD),
-          o2(0x9E,0xDE),      o2(0x9E,0xDF),
-          o2(0xBF,0xDE),      o2(0x9E,0xE0),
-          o2(0x9E,0xE1),      o2(0x9E,0xE2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_19 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1A_infos[65] = {
-          o2(0xBF,0xDF),      o2(0x9E,0xE3),
-          o2(0x9E,0xE4),      o2(0x9E,0xE5),
-          o2(0x9E,0xE6),      o2(0x9E,0xE7),
-          o2(0x9E,0xE8),      o2(0x9E,0xE9),
-          o2(0xBF,0xE0),      o2(0xBF,0xE1),
-          o2(0x9E,0xEA),      o2(0xBF,0xE2),
-          o2(0x9E,0xEB),      o2(0xBF,0xE3),
-          o2(0x9E,0xEC),      o2(0x9E,0xED),
-          o2(0x9E,0xEE),      o2(0x9E,0xEF),
-          o2(0x9E,0xF0),      o2(0x9E,0xF1),
-          o2(0xBF,0xE4),      o2(0xBF,0xE5),
-          o2(0x9E,0xF2),      o2(0x9E,0xF3),
-          o2(0xBF,0xE6),      o2(0x9E,0xF4),
-          o2(0x9E,0xF5),      o2(0x9E,0xF6),
-          o2(0xBF,0xE7),      o2(0x9E,0xF7),
-          o2(0x9E,0xF8),      o2(0x9E,0xF9),
-          o2(0x9E,0xFA),      o2(0x9E,0xFB),
-          o2(0x9E,0xFC),      o2(0x9E,0xFD),
-          o2(0xBF,0xE8),      o2(0xBF,0xE9),
-          o2(0x9E,0xFE),      o2(0xBF,0xEA),
-          o2(0x9F,0x41),      o2(0xBF,0xEB),
-          o2(0x9F,0x42),      o2(0x9F,0x43),
-          o2(0x9F,0x44),      o2(0x9F,0x45),
-          o2(0x9F,0x46),      o2(0x9F,0x47),
-          o2(0xBF,0xEC),      o2(0xBF,0xED),
-          o2(0x9F,0x48),      o2(0x9F,0x49),
-          o2(0xBF,0xEE),      o2(0x9F,0x4A),
-          o2(0x9F,0x4B),      o2(0x9F,0x4C),
-          o2(0xBF,0xEF),      o2(0xBF,0xF0),
-          o2(0xBF,0xF1),      o2(0x9F,0x4D),
-          o2(0x9F,0x4E),      o2(0x9F,0x4F),
-          o2(0x9F,0x50),      o2(0x9F,0x51),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1B_infos[65] = {
-          o2(0xBF,0xF2),      o2(0xBF,0xF3),
-          o2(0x9F,0x52),      o2(0xBF,0xF4),
-          o2(0x9F,0x53),      o2(0xBF,0xF5),
-          o2(0x9F,0x54),      o2(0x9F,0x55),
-          o2(0x9F,0x56),      o2(0x9F,0x57),
-          o2(0x9F,0x58),      o2(0x9F,0x59),
-          o2(0xBF,0xF6),      o2(0xBF,0xF7),
-          o2(0x9F,0x5A),      o2(0x9F,0x61),
-          o2(0xBF,0xF8),      o2(0x9F,0x62),
-          o2(0x9F,0x63),      o2(0x9F,0x64),
-          o2(0xBF,0xF9),      o2(0x9F,0x65),
-          o2(0x9F,0x66),      o2(0x9F,0x67),
-          o2(0x9F,0x68),      o2(0x9F,0x69),
-          o2(0x9F,0x6A),      o2(0x9F,0x6B),
-          o2(0xBF,0xFA),      o2(0xBF,0xFB),
-          o2(0x9F,0x6C),      o2(0x9F,0x6D),
-          o2(0xBF,0xFC),      o2(0xBF,0xFD),
-          o2(0x9F,0x6E),      o2(0x9F,0x6F),
-          o2(0x9F,0x70),      o2(0x9F,0x71),
-          o2(0x9F,0x72),      o2(0x9F,0x73),
-          o2(0xBF,0xFE),      o2(0xC0,0xA1),
-          o2(0x9F,0x74),      o2(0x9F,0x75),
-          o2(0xC0,0xA2),      o2(0x9F,0x76),
-          o2(0x9F,0x77),      o2(0x9F,0x78),
-          o2(0xC0,0xA3),      o2(0x9F,0x79),
-          o2(0x9F,0x7A),      o2(0x9F,0x81),
-          o2(0x9F,0x82),      o2(0x9F,0x83),
-          o2(0x9F,0x84),      o2(0x9F,0x85),
-          o2(0xC0,0xA4),      o2(0xC0,0xA5),
-          o2(0x9F,0x86),      o2(0x9F,0x87),
-          o2(0x9F,0x88),      o2(0xC0,0xA6),
-          o2(0x9F,0x89),      o2(0x9F,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1C_infos[65] = {
-          o2(0x9F,0x8B),      o2(0x9F,0x8C),
-          o2(0x9F,0x8D),      o2(0x9F,0x8E),
-          o2(0xC0,0xA7),      o2(0xC0,0xA8),
-          o2(0x9F,0x8F),      o2(0x9F,0x90),
-          o2(0xC0,0xA9),      o2(0x9F,0x91),
-          o2(0x9F,0x92),      o2(0x9F,0x93),
-          o2(0xC0,0xAA),      o2(0x9F,0x94),
-          o2(0x9F,0x95),      o2(0x9F,0x96),
-          o2(0x9F,0x97),      o2(0x9F,0x98),
-          o2(0x9F,0x99),      o2(0x9F,0x9A),
-          o2(0xC0,0xAB),      o2(0xC0,0xAC),
-          o2(0x9F,0x9B),      o2(0xC0,0xAD),
-          o2(0x9F,0x9C),      o2(0xC0,0xAE),
-          o2(0x9F,0x9D),      o2(0x9F,0x9E),
-          o2(0x9F,0x9F),      o2(0x9F,0xA0),
-          o2(0x9F,0xA1),      o2(0x9F,0xA2),
-          o2(0xC0,0xAF),      o2(0xC0,0xB0),
-          o2(0x9F,0xA3),      o2(0x9F,0xA4),
-          o2(0xC0,0xB1),      o2(0x9F,0xA5),
-          o2(0x9F,0xA6),      o2(0x9F,0xA7),
-          o2(0xC0,0xB2),      o2(0x9F,0xA8),
-          o2(0x9F,0xA9),      o2(0x9F,0xAA),
-          o2(0x9F,0xAB),      o2(0x9F,0xAC),
-          o2(0x9F,0xAD),      o2(0x9F,0xAE),
-          o2(0xC0,0xB3),      o2(0xC0,0xB4),
-          o2(0x9F,0xAF),      o2(0xC0,0xB5),
-          o2(0x9F,0xB0),      o2(0xC0,0xB6),
-          o2(0x9F,0xB1),      o2(0xC0,0xB7),
-          o2(0x9F,0xB2),      o2(0x9F,0xB3),
-          o2(0x9F,0xB4),      o2(0x9F,0xB5),
-          o2(0xC0,0xB8),      o2(0xC0,0xB9),
-          o2(0x9F,0xB6),      o2(0x9F,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1D_infos[65] = {
-          o2(0xC0,0xBA),      o2(0x9F,0xB8),
-          o2(0x9F,0xB9),      o2(0x9F,0xBA),
-          o2(0xC0,0xBB),      o2(0x9F,0xBB),
-          o2(0x9F,0xBC),      o2(0x9F,0xBD),
-          o2(0x9F,0xBE),      o2(0x9F,0xBF),
-          o2(0xC0,0xBC),      o2(0x9F,0xC0),
-          o2(0xC0,0xBD),      o2(0xC0,0xBE),
-          o2(0x9F,0xC1),      o2(0xC0,0xBF),
-          o2(0x9F,0xC2),      o2(0xC0,0xC0),
-          o2(0xC0,0xC1),      o2(0xC0,0xC2),
-          o2(0xC0,0xC3),      o2(0xC0,0xC4),
-          o2(0xC0,0xC5),      o2(0xC0,0xC6),
-          o2(0xC0,0xC7),      o2(0x9F,0xC3),
-          o2(0x9F,0xC4),      o2(0x9F,0xC5),
-          o2(0xC0,0xC8),      o2(0x9F,0xC6),
-          o2(0x9F,0xC7),      o2(0x9F,0xC8),
-          o2(0xC0,0xC9),      o2(0x9F,0xC9),
-          o2(0x9F,0xCA),      o2(0x9F,0xCB),
-          o2(0x9F,0xCC),      o2(0x9F,0xCD),
-          o2(0x9F,0xCE),      o2(0x9F,0xCF),
-          o2(0xC0,0xCA),      o2(0x9F,0xD0),
-          o2(0x9F,0xD1),      o2(0xC0,0xCB),
-          o2(0x9F,0xD2),      o2(0x9F,0xD3),
-          o2(0x9F,0xD4),      o2(0x9F,0xD5),
-          o2(0x9F,0xD6),      o2(0x9F,0xD7),
-          o2(0x9F,0xD8),      o2(0x9F,0xD9),
-          o2(0xC0,0xCC),      o2(0xC0,0xCD),
-          o2(0x9F,0xDA),      o2(0x9F,0xDB),
-          o2(0xC0,0xCE),      o2(0x9F,0xDC),
-          o2(0x9F,0xDD),      o2(0x9F,0xDE),
-          o2(0xC0,0xCF),      o2(0xC0,0xD0),
-          o2(0xC0,0xD1),      o2(0x9F,0xDF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1E_infos[65] = {
-          o2(0x9F,0xE0),      o2(0x9F,0xE1),
-          o2(0x9F,0xE2),      o2(0xC0,0xD2),
-          o2(0xC0,0xD3),      o2(0xC0,0xD4),
-          o2(0x9F,0xE3),      o2(0xC0,0xD5),
-          o2(0xC0,0xD6),      o2(0xC0,0xD7),
-          o2(0xC0,0xD8),      o2(0x9F,0xE4),
-          o2(0x9F,0xE5),      o2(0x9F,0xE6),
-          o2(0xC0,0xD9),      o2(0x9F,0xE7),
-          o2(0xC0,0xDA),      o2(0xC0,0xDB),
-          o2(0x9F,0xE8),      o2(0x9F,0xE9),
-          o2(0xC0,0xDC),      o2(0x9F,0xEA),
-          o2(0xC0,0xDD),      o2(0xC0,0xDE),
-          o2(0xC0,0xDF),      o2(0x9F,0xEB),
-          o2(0xC0,0xE0),      o2(0x9F,0xEC),
-          o2(0x9F,0xED),      o2(0x9F,0xEE),
-          o2(0x9F,0xEF),      o2(0x9F,0xF0),
-          o2(0xC0,0xE1),      o2(0xC0,0xE2),
-          o2(0x9F,0xF1),      o2(0xC0,0xE3),
-          o2(0xC0,0xE4),      o2(0xC0,0xE5),
-          o2(0xC0,0xE6),      o2(0x9F,0xF2),
-          o2(0x9F,0xF3),      o2(0x9F,0xF4),
-          o2(0x9F,0xF5),      o2(0x9F,0xF6),
-          o2(0xC0,0xE7),      o2(0xC0,0xE8),
-          o2(0x9F,0xF7),      o2(0x9F,0xF8),
-          o2(0xC0,0xE9),      o2(0x9F,0xF9),
-          o2(0x9F,0xFA),      o2(0x9F,0xFB),
-          o2(0xC0,0xEA),      o2(0x9F,0xFC),
-          o2(0x9F,0xFD),      o2(0x9F,0xFE),
-          o2(0xA0,0x41),      o2(0xA0,0x42),
-          o2(0xA0,0x43),      o2(0xA0,0x44),
-          o2(0xC0,0xEB),      o2(0xC0,0xEC),
-          o2(0xA0,0x45),      o2(0xC0,0xED),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_1F_infos[65] = {
-          o2(0xC0,0xEE),      o2(0xC0,0xEF),
-          o2(0xA0,0x46),      o2(0xA0,0x47),
-          o2(0xA0,0x48),      o2(0xA0,0x49),
-          o2(0xA0,0x4A),      o2(0xA0,0x4B),
-          o2(0xC0,0xF0),      o2(0xC0,0xF1),
-          o2(0xA0,0x4C),      o2(0xA0,0x4D),
-          o2(0xC0,0xF2),      o2(0xA0,0x4E),
-          o2(0xC0,0xF3),      o2(0xA0,0x4F),
-          o2(0xC0,0xF4),      o2(0xA0,0x50),
-          o2(0xA0,0x51),      o2(0xA0,0x52),
-          o2(0xA0,0x53),      o2(0xA0,0x54),
-          o2(0xA0,0x55),      o2(0xA0,0x56),
-          o2(0xC0,0xF5),      o2(0xA0,0x57),
-          o2(0xA0,0x58),      o2(0xA0,0x59),
-          o2(0xA0,0x5A),      o2(0xC0,0xF6),
-          o2(0xA0,0x61),      o2(0xA0,0x62),
-          o2(0xA0,0x63),      o2(0xA0,0x64),
-          o2(0xA0,0x65),      o2(0xA0,0x66),
-          o2(0xC0,0xF7),      o2(0xA0,0x67),
-          o2(0xA0,0x68),      o2(0xA0,0x69),
-          o2(0xC0,0xF8),      o2(0xA0,0x6A),
-          o2(0xA0,0x6B),      o2(0xA0,0x6C),
-          o2(0xC0,0xF9),      o2(0xA0,0x6D),
-          o2(0xA0,0x6E),      o2(0xA0,0x6F),
-          o2(0xA0,0x70),      o2(0xA0,0x71),
-          o2(0xA0,0x72),      o2(0xA0,0x73),
-          o2(0xA0,0x74),      o2(0xA0,0x75),
-          o2(0xA0,0x76),      o2(0xA0,0x77),
-          o2(0xA0,0x78),      o2(0xA0,0x79),
-          o2(0xA0,0x7A),      o2(0xA0,0x81),
-          o2(0xA0,0x82),      o2(0xA0,0x83),
-          o2(0xA0,0x84),      o2(0xA0,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_1F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_1F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_20_infos[65] = {
-          o2(0xC0,0xFA),      o2(0xC0,0xFB),
-          o2(0xA0,0x86),      o2(0xA0,0x87),
-          o2(0xC0,0xFC),      o2(0xA0,0x88),
-          o2(0xA0,0x89),      o2(0xA0,0x8A),
-          o2(0xC0,0xFD),      o2(0xA0,0x8B),
-          o2(0xC0,0xFE),      o2(0xA0,0x8C),
-          o2(0xA0,0x8D),      o2(0xA0,0x8E),
-          o2(0xA0,0x8F),      o2(0xA0,0x90),
-          o2(0xC1,0xA1),      o2(0xC1,0xA2),
-          o2(0xA0,0x91),      o2(0xC1,0xA3),
-          o2(0xA0,0x92),      o2(0xC1,0xA4),
-          o2(0xC1,0xA5),      o2(0xA0,0x93),
-          o2(0xA0,0x94),      o2(0xA0,0x95),
-          o2(0xA0,0x96),      o2(0xA0,0x97),
-          o2(0xC1,0xA6),      o2(0xC1,0xA7),
-          o2(0xA0,0x98),      o2(0xA0,0x99),
-          o2(0xC1,0xA8),      o2(0xA0,0x9A),
-          o2(0xA0,0x9B),      o2(0xA0,0x9C),
-          o2(0xC1,0xA9),      o2(0xA0,0x9D),
-          o2(0xA0,0x9E),      o2(0xA0,0x9F),
-          o2(0xA0,0xA0),      o2(0xA0,0xA1),
-          o2(0xA0,0xA2),      o2(0xA0,0xA3),
-          o2(0xC1,0xAA),      o2(0xC1,0xAB),
-          o2(0xA0,0xA4),      o2(0xC1,0xAC),
-          o2(0xA0,0xA5),      o2(0xC1,0xAD),
-          o2(0xA0,0xA6),      o2(0xA0,0xA7),
-          o2(0xA0,0xA8),      o2(0xA0,0xA9),
-          o2(0xA0,0xAA),      o2(0xA0,0xAB),
-          o2(0xC1,0xAE),      o2(0xA0,0xAC),
-          o2(0xA0,0xAD),      o2(0xA0,0xAE),
-          o2(0xC1,0xAF),      o2(0xA0,0xAF),
-          o2(0xA0,0xB0),      o2(0xA0,0xB1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_20 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_20_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_21_infos[65] = {
-          o2(0xC1,0xB0),      o2(0xA0,0xB2),
-          o2(0xA0,0xB3),      o2(0xA0,0xB4),
-          o2(0xA0,0xB5),      o2(0xA0,0xB6),
-          o2(0xA0,0xB7),      o2(0xA0,0xB8),
-          o2(0xC1,0xB1),      o2(0xC1,0xB2),
-          o2(0xA0,0xB9),      o2(0xA0,0xBA),
-          o2(0xC1,0xB3),      o2(0xC1,0xB4),
-          o2(0xA0,0xBB),      o2(0xA0,0xBC),
-          o2(0xA0,0xBD),      o2(0xA0,0xBE),
-          o2(0xA0,0xBF),      o2(0xA0,0xC0),
-          o2(0xC1,0xB5),      o2(0xA0,0xC1),
-          o2(0xA0,0xC2),      o2(0xA0,0xC3),
-          o2(0xA0,0xC4),      o2(0xA0,0xC5),
-          o2(0xA0,0xC6),      o2(0xA0,0xC7),
-          o2(0xA0,0xC8),      o2(0xA0,0xC9),
-          o2(0xA0,0xCA),      o2(0xA0,0xCB),
-          o2(0xA0,0xCC),      o2(0xA0,0xCD),
-          o2(0xA0,0xCE),      o2(0xA0,0xCF),
-          o2(0xA0,0xD0),      o2(0xA0,0xD1),
-          o2(0xA0,0xD2),      o2(0xA0,0xD3),
-          o2(0xA0,0xD4),      o2(0xA0,0xD5),
-          o2(0xA0,0xD6),      o2(0xA0,0xD7),
-          o2(0xA0,0xD8),      o2(0xA0,0xD9),
-          o2(0xA0,0xDA),      o2(0xA0,0xDB),
-          o2(0xC1,0xB6),      o2(0xC1,0xB7),
-          o2(0xA0,0xDC),      o2(0xA0,0xDD),
-          o2(0xC1,0xB8),      o2(0xA0,0xDE),
-          o2(0xA0,0xDF),      o2(0xA0,0xE0),
-          o2(0xC1,0xB9),      o2(0xA0,0xE1),
-          o2(0xC1,0xBA),      o2(0xA0,0xE2),
-          o2(0xA0,0xE3),      o2(0xA0,0xE4),
-          o2(0xA0,0xE5),      o2(0xA0,0xE6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_21 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_21_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_22_infos[65] = {
-          o2(0xC1,0xBB),      o2(0xC1,0xBC),
-          o2(0xA0,0xE7),      o2(0xC1,0xBD),
-          o2(0xA0,0xE8),      o2(0xC1,0xBE),
-          o2(0xC1,0xBF),      o2(0xC1,0xC0),
-          o2(0xA0,0xE9),      o2(0xA0,0xEA),
-          o2(0xA0,0xEB),      o2(0xC1,0xC1),
-          o2(0xC1,0xC2),      o2(0xC1,0xC3),
-          o2(0xA0,0xEC),      o2(0xA0,0xED),
-          o2(0xA0,0xEE),      o2(0xA0,0xEF),
-          o2(0xA0,0xF0),      o2(0xA0,0xF1),
-          o2(0xC1,0xC4),      o2(0xA0,0xF2),
-          o2(0xA0,0xF3),      o2(0xA0,0xF4),
-          o2(0xA0,0xF5),      o2(0xA0,0xF6),
-          o2(0xA0,0xF7),      o2(0xA0,0xF8),
-          o2(0xA0,0xF9),      o2(0xC1,0xC5),
-          o2(0xA0,0xFA),      o2(0xC1,0xC6),
-          o2(0xA0,0xFB),      o2(0xC1,0xC7),
-          o2(0xA0,0xFC),      o2(0xA0,0xFD),
-          o2(0xA0,0xFE),      o2(0xA1,0x41),
-          o2(0xA1,0x42),      o2(0xA1,0x43),
-          o2(0xC1,0xC8),      o2(0xA1,0x44),
-          o2(0xA1,0x45),      o2(0xA1,0x46),
-          o2(0xA1,0x47),      o2(0xA1,0x48),
-          o2(0xA1,0x49),      o2(0xA1,0x4A),
-          o2(0xA1,0x4B),      o2(0xA1,0x4C),
-          o2(0xA1,0x4D),      o2(0xA1,0x4E),
-          o2(0xA1,0x4F),      o2(0xA1,0x50),
-          o2(0xA1,0x51),      o2(0xA1,0x52),
-          o2(0xA1,0x53),      o2(0xA1,0x54),
-          o2(0xA1,0x55),      o2(0xA1,0x56),
-          o2(0xC1,0xC9),      o2(0xC1,0xCA),
-          o2(0xA1,0x57),      o2(0xA1,0x58),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_22 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_22_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_23_infos[65] = {
-          o2(0xA1,0x59),      o2(0xA1,0x5A),
-          o2(0xA1,0x61),      o2(0xA1,0x62),
-          o2(0xC1,0xCB),      o2(0xA1,0x63),
-          o2(0xA1,0x64),      o2(0xA1,0x65),
-          o2(0xC1,0xCC),      o2(0xA1,0x66),
-          o2(0xA1,0x67),      o2(0xA1,0x68),
-          o2(0xC1,0xCD),      o2(0xA1,0x69),
-          o2(0xA1,0x6A),      o2(0xA1,0x6B),
-          o2(0xA1,0x6C),      o2(0xA1,0x6D),
-          o2(0xA1,0x6E),      o2(0xA1,0x6F),
-          o2(0xC1,0xCE),      o2(0xC1,0xCF),
-          o2(0xA1,0x70),      o2(0xC1,0xD0),
-          o2(0xA1,0x71),      o2(0xC1,0xD1),
-          o2(0xA1,0x72),      o2(0xA1,0x73),
-          o2(0xA1,0x74),      o2(0xA1,0x75),
-          o2(0xA1,0x76),      o2(0xA1,0x77),
-          o2(0xC1,0xD2),      o2(0xC1,0xD3),
-          o2(0xA1,0x78),      o2(0xA1,0x79),
-          o2(0xC1,0xD4),      o2(0xA1,0x7A),
-          o2(0xA1,0x81),      o2(0xA1,0x82),
-          o2(0xA1,0x83),      o2(0xA1,0x84),
-          o2(0xA1,0x85),      o2(0xA1,0x86),
-          o2(0xA1,0x87),      o2(0xA1,0x88),
-          o2(0xA1,0x89),      o2(0xA1,0x8A),
-          o2(0xA1,0x8B),      o2(0xA1,0x8C),
-          o2(0xA1,0x8D),      o2(0xA1,0x8E),
-          o2(0xA1,0x8F),      o2(0xC1,0xD5),
-          o2(0xA1,0x90),      o2(0xA1,0x91),
-          o2(0xA1,0x92),      o2(0xA1,0x93),
-          o2(0xA1,0x94),      o2(0xA1,0x95),
-          o2(0xC1,0xD6),      o2(0xC1,0xD7),
-          o2(0xA1,0x96),      o2(0xA1,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_23 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_23_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_24_infos[65] = {
-          o2(0xC1,0xD8),      o2(0xA1,0x98),
-          o2(0xA1,0x99),      o2(0xA1,0x9A),
-          o2(0xC1,0xD9),      o2(0xC1,0xDA),
-          o2(0xC1,0xDB),      o2(0xA1,0x9B),
-          o2(0xA1,0x9C),      o2(0xA1,0x9D),
-          o2(0xA1,0x9E),      o2(0xA1,0x9F),
-          o2(0xC1,0xDC),      o2(0xC1,0xDD),
-          o2(0xA1,0xA0),      o2(0xC1,0xDE),
-          o2(0xA2,0x41),      o2(0xC1,0xDF),
-          o2(0xA2,0x42),      o2(0xA2,0x43),
-          o2(0xA2,0x44),      o2(0xA2,0x45),
-          o2(0xA2,0x46),      o2(0xA2,0x47),
-          o2(0xC1,0xE0),      o2(0xA2,0x48),
-          o2(0xA2,0x49),      o2(0xA2,0x4A),
-          o2(0xA2,0x4B),      o2(0xA2,0x4C),
-          o2(0xA2,0x4D),      o2(0xA2,0x4E),
-          o2(0xA2,0x4F),      o2(0xA2,0x50),
-          o2(0xA2,0x51),      o2(0xA2,0x52),
-          o2(0xA2,0x53),      o2(0xA2,0x54),
-          o2(0xA2,0x55),      o2(0xA2,0x56),
-          o2(0xA2,0x57),      o2(0xA2,0x58),
-          o2(0xA2,0x59),      o2(0xA2,0x5A),
-          o2(0xC1,0xE1),      o2(0xA2,0x61),
-          o2(0xA2,0x62),      o2(0xA2,0x63),
-          o2(0xA2,0x64),      o2(0xA2,0x65),
-          o2(0xA2,0x66),      o2(0xA2,0x67),
-          o2(0xC1,0xE2),      o2(0xA2,0x68),
-          o2(0xA2,0x69),      o2(0xA2,0x6A),
-          o2(0xA2,0x6B),      o2(0xA2,0x6C),
-          o2(0xA2,0x6D),      o2(0xA2,0x6E),
-          o2(0xA2,0x6F),      o2(0xA2,0x70),
-          o2(0xA2,0x71),      o2(0xA2,0x72),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_24 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_25_infos[65] = {
-          o2(0xA2,0x73),      o2(0xA2,0x74),
-          o2(0xA2,0x75),      o2(0xA2,0x76),
-          o2(0xA2,0x77),      o2(0xA2,0x78),
-          o2(0xA2,0x79),      o2(0xA2,0x7A),
-          o2(0xA2,0x81),      o2(0xA2,0x82),
-          o2(0xA2,0x83),      o2(0xA2,0x84),
-          o2(0xA2,0x85),      o2(0xA2,0x86),
-          o2(0xA2,0x87),      o2(0xA2,0x88),
-          o2(0xC1,0xE3),      o2(0xC1,0xE4),
-          o2(0xA2,0x89),      o2(0xA2,0x8A),
-          o2(0xC1,0xE5),      o2(0xA2,0x8B),
-          o2(0xA2,0x8C),      o2(0xA2,0x8D),
-          o2(0xC1,0xE6),      o2(0xA2,0x8E),
-          o2(0xA2,0x8F),      o2(0xA2,0x90),
-          o2(0xA2,0x91),      o2(0xA2,0x92),
-          o2(0xA2,0x93),      o2(0xA2,0x94),
-          o2(0xC1,0xE7),      o2(0xC1,0xE8),
-          o2(0xA2,0x95),      o2(0xC1,0xE9),
-          o2(0xA2,0x96),      o2(0xA2,0x97),
-          o2(0xA2,0x98),      o2(0xA2,0x99),
-          o2(0xA2,0x9A),      o2(0xA2,0x9B),
-          o2(0xA2,0x9C),      o2(0xA2,0x9D),
-          o2(0xC1,0xEA),      o2(0xA2,0x9E),
-          o2(0xA2,0x9F),      o2(0xA2,0xA0),
-          o2(0xC1,0xEB),      o2(0xA3,0x41),
-          o2(0xA3,0x42),      o2(0xA3,0x43),
-          o2(0xC1,0xEC),      o2(0xA3,0x44),
-          o2(0xA3,0x45),      o2(0xA3,0x46),
-          o2(0xA3,0x47),      o2(0xA3,0x48),
-          o2(0xA3,0x49),      o2(0xA3,0x4A),
-          o2(0xC1,0xED),      o2(0xA3,0x4B),
-          o2(0xA3,0x4C),      o2(0xA3,0x4D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_25 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_26_infos[65] = {
-          o2(0xA3,0x4E),      o2(0xA3,0x4F),
-          o2(0xA3,0x50),      o2(0xA3,0x51),
-          o2(0xA3,0x52),      o2(0xA3,0x53),
-          o2(0xA3,0x54),      o2(0xA3,0x55),
-          o2(0xC1,0xEE),      o2(0xC1,0xEF),
-          o2(0xA3,0x56),      o2(0xA3,0x57),
-          o2(0xC1,0xF0),      o2(0xA3,0x58),
-          o2(0xA3,0x59),      o2(0xA3,0x5A),
-          o2(0xC1,0xF1),      o2(0xA3,0x61),
-          o2(0xA3,0x62),      o2(0xA3,0x63),
-          o2(0xA3,0x64),      o2(0xA3,0x65),
-          o2(0xA3,0x66),      o2(0xA3,0x67),
-          o2(0xC1,0xF2),      o2(0xC1,0xF3),
-          o2(0xA3,0x68),      o2(0xC1,0xF4),
-          o2(0xA3,0x69),      o2(0xC1,0xF5),
-          o2(0xA3,0x6A),      o2(0xA3,0x6B),
-          o2(0xA3,0x6C),      o2(0xA3,0x6D),
-          o2(0xA3,0x6E),      o2(0xA3,0x6F),
-          o2(0xA3,0x70),      o2(0xA3,0x71),
-          o2(0xA3,0x72),      o2(0xA3,0x73),
-          o2(0xA3,0x74),      o2(0xA3,0x75),
-          o2(0xA3,0x76),      o2(0xA3,0x77),
-          o2(0xA3,0x78),      o2(0xA3,0x79),
-          o2(0xA3,0x7A),      o2(0xA3,0x81),
-          o2(0xA3,0x82),      o2(0xA3,0x83),
-          o2(0xA3,0x84),      o2(0xA3,0x85),
-          o2(0xA3,0x86),      o2(0xA3,0x87),
-          o2(0xA3,0x88),      o2(0xA3,0x89),
-          o2(0xA3,0x8A),      o2(0xA3,0x8B),
-          o2(0xA3,0x8C),      o2(0xA3,0x8D),
-          o2(0xA3,0x8E),      o2(0xA3,0x8F),
-          o2(0xA3,0x90),      o2(0xA3,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_26 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_27_infos[65] = {
-          o2(0xC1,0xF6),      o2(0xC1,0xF7),
-          o2(0xA3,0x92),      o2(0xA3,0x93),
-          o2(0xC1,0xF8),      o2(0xA3,0x94),
-          o2(0xA3,0x95),      o2(0xC1,0xF9),
-          o2(0xC1,0xFA),      o2(0xA3,0x96),
-          o2(0xC1,0xFB),      o2(0xA3,0x97),
-          o2(0xA3,0x98),      o2(0xA3,0x99),
-          o2(0xA3,0x9A),      o2(0xA3,0x9B),
-          o2(0xC1,0xFC),      o2(0xC1,0xFD),
-          o2(0xA3,0x9C),      o2(0xC1,0xFE),
-          o2(0xA3,0x9D),      o2(0xC2,0xA1),
-          o2(0xC2,0xA2),      o2(0xA3,0x9E),
-          o2(0xA3,0x9F),      o2(0xC2,0xA3),
-          o2(0xC2,0xA4),      o2(0xA3,0xA0),
-          o2(0xC2,0xA5),      o2(0xC2,0xA6),
-          o2(0xA4,0x41),      o2(0xA4,0x42),
-          o2(0xC2,0xA7),      o2(0xA4,0x43),
-          o2(0xC2,0xA8),      o2(0xA4,0x44),
-          o2(0xC2,0xA9),      o2(0xA4,0x45),
-          o2(0xA4,0x46),      o2(0xC2,0xAA),
-          o2(0xA4,0x47),      o2(0xA4,0x48),
-          o2(0xA4,0x49),      o2(0xA4,0x4A),
-          o2(0xC2,0xAB),      o2(0xC2,0xAC),
-          o2(0xA4,0x4B),      o2(0xC2,0xAD),
-          o2(0xC2,0xAE),      o2(0xC2,0xAF),
-          o2(0xA4,0x4C),      o2(0xA4,0x4D),
-          o2(0xA4,0x4E),      o2(0xA4,0x4F),
-          o2(0xA4,0x50),      o2(0xA4,0x51),
-          o2(0xC2,0xB0),      o2(0xC2,0xB1),
-          o2(0xA4,0x52),      o2(0xA4,0x53),
-          o2(0xC2,0xB2),      o2(0xA4,0x54),
-          o2(0xA4,0x55),      o2(0xA4,0x56),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_27 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_28_infos[65] = {
-          o2(0xC2,0xB3),      o2(0xA4,0x57),
-          o2(0xA4,0x58),      o2(0xA4,0x59),
-          o2(0xA4,0x5A),      o2(0xA4,0x61),
-          o2(0xA4,0x62),      o2(0xA4,0x63),
-          o2(0xC2,0xB4),      o2(0xC2,0xB5),
-          o2(0xA4,0x64),      o2(0xC2,0xB6),
-          o2(0xC2,0xB7),      o2(0xC2,0xB8),
-          o2(0xA4,0x65),      o2(0xA4,0x66),
-          o2(0xA4,0x67),      o2(0xA4,0x68),
-          o2(0xA4,0x69),      o2(0xA4,0x6A),
-          o2(0xC2,0xB9),      o2(0xA4,0x6B),
-          o2(0xA4,0x6C),      o2(0xA4,0x6D),
-          o2(0xC2,0xBA),      o2(0xA4,0x6E),
-          o2(0xA4,0x6F),      o2(0xA4,0x70),
-          o2(0xA4,0x71),      o2(0xA4,0x72),
-          o2(0xA4,0x73),      o2(0xA4,0x74),
-          o2(0xA4,0x75),      o2(0xA4,0x76),
-          o2(0xA4,0x77),      o2(0xA4,0x78),
-          o2(0xA4,0x79),      o2(0xA4,0x7A),
-          o2(0xA4,0x81),      o2(0xA4,0x82),
-          o2(0xA4,0x83),      o2(0xC2,0xBB),
-          o2(0xA4,0x84),      o2(0xA4,0x85),
-          o2(0xA4,0x86),      o2(0xA4,0x87),
-          o2(0xA4,0x88),      o2(0xA4,0x89),
-          o2(0xA4,0x8A),      o2(0xA4,0x8B),
-          o2(0xA4,0x8C),      o2(0xA4,0x8D),
-          o2(0xA4,0x8E),      o2(0xA4,0x8F),
-          o2(0xA4,0x90),      o2(0xA4,0x91),
-          o2(0xA4,0x92),      o2(0xA4,0x93),
-          o2(0xA4,0x94),      o2(0xA4,0x95),
-          o2(0xA4,0x96),      o2(0xA4,0x97),
-          o2(0xA4,0x98),      o2(0xA4,0x99),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_28 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_29_infos[65] = {
-          o2(0xA4,0x9A),      o2(0xA4,0x9B),
-          o2(0xA4,0x9C),      o2(0xA4,0x9D),
-          o2(0xA4,0x9E),      o2(0xA4,0x9F),
-          o2(0xA4,0xA0),      o2(0xA5,0x41),
-          o2(0xA5,0x42),      o2(0xA5,0x43),
-          o2(0xA5,0x44),      o2(0xA5,0x45),
-          o2(0xC2,0xBC),      o2(0xC2,0xBD),
-          o2(0xA5,0x46),      o2(0xA5,0x47),
-          o2(0xC2,0xBE),      o2(0xA5,0x48),
-          o2(0xA5,0x49),      o2(0xA5,0x4A),
-          o2(0xC2,0xBF),      o2(0xA5,0x4B),
-          o2(0xA5,0x4C),      o2(0xA5,0x4D),
-          o2(0xA5,0x4E),      o2(0xA5,0x4F),
-          o2(0xA5,0x50),      o2(0xA5,0x51),
-          o2(0xC2,0xC0),      o2(0xC2,0xC1),
-          o2(0xA5,0x52),      o2(0xC2,0xC2),
-          o2(0xC2,0xC3),      o2(0xC2,0xC4),
-          o2(0xA5,0x53),      o2(0xA5,0x54),
-          o2(0xA5,0x55),      o2(0xA5,0x56),
-          o2(0xA5,0x57),      o2(0xA5,0x58),
-          o2(0xC2,0xC5),      o2(0xA5,0x59),
-          o2(0xA5,0x5A),      o2(0xA5,0x61),
-          o2(0xA5,0x62),      o2(0xA5,0x63),
-          o2(0xA5,0x64),      o2(0xA5,0x65),
-          o2(0xA5,0x66),      o2(0xA5,0x67),
-          o2(0xA5,0x68),      o2(0xA5,0x69),
-          o2(0xA5,0x6A),      o2(0xA5,0x6B),
-          o2(0xA5,0x6C),      o2(0xA5,0x6D),
-          o2(0xA5,0x6E),      o2(0xA5,0x6F),
-          o2(0xA5,0x70),      o2(0xA5,0x71),
-          o2(0xA5,0x72),      o2(0xC2,0xC6),
-          o2(0xA5,0x73),      o2(0xA5,0x74),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_29 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_29_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2A_infos[65] = {
-          o2(0xA5,0x75),      o2(0xA5,0x76),
-          o2(0xA5,0x77),      o2(0xA5,0x78),
-          o2(0xC2,0xC7),      o2(0xA5,0x79),
-          o2(0xA5,0x7A),      o2(0xA5,0x81),
-          o2(0xA5,0x82),      o2(0xA5,0x83),
-          o2(0xA5,0x84),      o2(0xA5,0x85),
-          o2(0xA5,0x86),      o2(0xA5,0x87),
-          o2(0xA5,0x88),      o2(0xA5,0x89),
-          o2(0xA5,0x8A),      o2(0xA5,0x8B),
-          o2(0xA5,0x8C),      o2(0xA5,0x8D),
-          o2(0xA5,0x8E),      o2(0xA5,0x8F),
-          o2(0xA5,0x90),      o2(0xA5,0x91),
-          o2(0xC2,0xC8),      o2(0xA5,0x92),
-          o2(0xA5,0x93),      o2(0xA5,0x94),
-          o2(0xA5,0x95),      o2(0xA5,0x96),
-          o2(0xA5,0x97),      o2(0xA5,0x98),
-          o2(0xA5,0x99),      o2(0xA5,0x9A),
-          o2(0xA5,0x9B),      o2(0xA5,0x9C),
-          o2(0xA5,0x9D),      o2(0xA5,0x9E),
-          o2(0xA5,0x9F),      o2(0xA5,0xA0),
-          o2(0xA6,0x41),      o2(0xA6,0x42),
-          o2(0xA6,0x43),      o2(0xA6,0x44),
-          o2(0xA6,0x45),      o2(0xA6,0x46),
-          o2(0xA6,0x47),      o2(0xA6,0x48),
-          o2(0xA6,0x49),      o2(0xA6,0x4A),
-          o2(0xA6,0x4B),      o2(0xA6,0x4C),
-          o2(0xA6,0x4D),      o2(0xA6,0x4E),
-          o2(0xA6,0x4F),      o2(0xA6,0x50),
-          o2(0xA6,0x51),      o2(0xA6,0x52),
-          o2(0xA6,0x53),      o2(0xA6,0x54),
-          o2(0xC2,0xC9),      o2(0xC2,0xCA),
-          o2(0xA6,0x55),      o2(0xA6,0x56),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2B_infos[65] = {
-          o2(0xC2,0xCB),      o2(0xA6,0x57),
-          o2(0xA6,0x58),      o2(0xA6,0x59),
-          o2(0xC2,0xCC),      o2(0xA6,0x5A),
-          o2(0xA6,0x61),      o2(0xA6,0x62),
-          o2(0xA6,0x63),      o2(0xA6,0x64),
-          o2(0xA6,0x65),      o2(0xA6,0x66),
-          o2(0xC2,0xCD),      o2(0xC2,0xCE),
-          o2(0xA6,0x67),      o2(0xC2,0xCF),
-          o2(0xA6,0x68),      o2(0xC2,0xD0),
-          o2(0xA6,0x69),      o2(0xC2,0xD1),
-          o2(0xA6,0x6A),      o2(0xA6,0x6B),
-          o2(0xA6,0x6C),      o2(0xA6,0x6D),
-          o2(0xC2,0xD2),      o2(0xC2,0xD3),
-          o2(0xA6,0x6E),      o2(0xA6,0x6F),
-          o2(0xA6,0x70),      o2(0xA6,0x71),
-          o2(0xA6,0x72),      o2(0xA6,0x73),
-          o2(0xC2,0xD4),      o2(0xA6,0x74),
-          o2(0xA6,0x75),      o2(0xA6,0x76),
-          o2(0xA6,0x77),      o2(0xA6,0x78),
-          o2(0xA6,0x79),      o2(0xA6,0x7A),
-          o2(0xA6,0x81),      o2(0xA6,0x82),
-          o2(0xA6,0x83),      o2(0xA6,0x84),
-          o2(0xC2,0xD5),      o2(0xA6,0x85),
-          o2(0xA6,0x86),      o2(0xA6,0x87),
-          o2(0xA6,0x88),      o2(0xA6,0x89),
-          o2(0xA6,0x8A),      o2(0xA6,0x8B),
-          o2(0xC2,0xD6),      o2(0xA6,0x8C),
-          o2(0xA6,0x8D),      o2(0xA6,0x8E),
-          o2(0xA6,0x8F),      o2(0xA6,0x90),
-          o2(0xA6,0x91),      o2(0xA6,0x92),
-          o2(0xA6,0x93),      o2(0xA6,0x94),
-          o2(0xA6,0x95),      o2(0xA6,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2C_infos[65] = {
-          o2(0xA6,0x97),      o2(0xA6,0x98),
-          o2(0xA6,0x99),      o2(0xA6,0x9A),
-          o2(0xA6,0x9B),      o2(0xA6,0x9C),
-          o2(0xA6,0x9D),      o2(0xA6,0x9E),
-          o2(0xC2,0xD7),      o2(0xA6,0x9F),
-          o2(0xA6,0xA0),      o2(0xA7,0x41),
-          o2(0xA7,0x42),      o2(0xA7,0x43),
-          o2(0xA7,0x44),      o2(0xA7,0x45),
-          o2(0xC2,0xD8),      o2(0xA7,0x46),
-          o2(0xA7,0x47),      o2(0xA7,0x48),
-          o2(0xC2,0xD9),      o2(0xA7,0x49),
-          o2(0xA7,0x4A),      o2(0xA7,0x4B),
-          o2(0xC2,0xDA),      o2(0xA7,0x4C),
-          o2(0xA7,0x4D),      o2(0xA7,0x4E),
-          o2(0xA7,0x4F),      o2(0xA7,0x50),
-          o2(0xA7,0x51),      o2(0xA7,0x52),
-          o2(0xC2,0xDB),      o2(0xC2,0xDC),
-          o2(0xA7,0x53),      o2(0xA7,0x54),
-          o2(0xA7,0x55),      o2(0xA7,0x56),
-          o2(0xA7,0x57),      o2(0xA7,0x58),
-          o2(0xA7,0x59),      o2(0xA7,0x5A),
-          o2(0xA7,0x61),      o2(0xA7,0x62),
-          o2(0xA7,0x63),      o2(0xA7,0x64),
-          o2(0xA7,0x65),      o2(0xA7,0x66),
-          o2(0xA7,0x67),      o2(0xA7,0x68),
-          o2(0xA7,0x69),      o2(0xA7,0x6A),
-          o2(0xA7,0x6B),      o2(0xA7,0x6C),
-          o2(0xA7,0x6D),      o2(0xA7,0x6E),
-          o2(0xA7,0x6F),      o2(0xA7,0x70),
-          o2(0xA7,0x71),      o2(0xA7,0x72),
-          o2(0xA7,0x73),      o2(0xA7,0x74),
-          o2(0xA7,0x75),      o2(0xA7,0x76),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2D_infos[65] = {
-          o2(0xA7,0x77),      o2(0xC2,0xDD),
-          o2(0xA7,0x78),      o2(0xA7,0x79),
-          o2(0xA7,0x7A),      o2(0xA7,0x81),
-          o2(0xA7,0x82),      o2(0xA7,0x83),
-          o2(0xC2,0xDE),      o2(0xC2,0xDF),
-          o2(0xA7,0x84),      o2(0xA7,0x85),
-          o2(0xC2,0xE0),      o2(0xA7,0x86),
-          o2(0xA7,0x87),      o2(0xA7,0x88),
-          o2(0xC2,0xE1),      o2(0xA7,0x89),
-          o2(0xA7,0x8A),      o2(0xA7,0x8B),
-          o2(0xA7,0x8C),      o2(0xA7,0x8D),
-          o2(0xA7,0x8E),      o2(0xA7,0x8F),
-          o2(0xC2,0xE2),      o2(0xC2,0xE3),
-          o2(0xA7,0x90),      o2(0xA7,0x91),
-          o2(0xA7,0x92),      o2(0xC2,0xE4),
-          o2(0xA7,0x93),      o2(0xA7,0x94),
-          o2(0xA7,0x95),      o2(0xA7,0x96),
-          o2(0xA7,0x97),      o2(0xA7,0x98),
-          o2(0xC2,0xE5),      o2(0xA7,0x99),
-          o2(0xA7,0x9A),      o2(0xA7,0x9B),
-          o2(0xA7,0x9C),      o2(0xA7,0x9D),
-          o2(0xA7,0x9E),      o2(0xA7,0x9F),
-          o2(0xA7,0xA0),      o2(0xA8,0x41),
-          o2(0xA8,0x42),      o2(0xA8,0x43),
-          o2(0xA8,0x44),      o2(0xA8,0x45),
-          o2(0xA8,0x46),      o2(0xA8,0x47),
-          o2(0xA8,0x48),      o2(0xA8,0x49),
-          o2(0xA8,0x4A),      o2(0xA8,0x4B),
-          o2(0xC2,0xE6),      o2(0xC2,0xE7),
-          o2(0xA8,0x4C),      o2(0xA8,0x4D),
-          o2(0xA8,0x4E),      o2(0xA8,0x4F),
-          o2(0xA8,0x50),      o2(0xA8,0x51),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2E_infos[65] = {
-          o2(0xA8,0x52),      o2(0xA8,0x53),
-          o2(0xA8,0x54),      o2(0xA8,0x55),
-          o2(0xA8,0x56),      o2(0xA8,0x57),
-          o2(0xA8,0x58),      o2(0xA8,0x59),
-          o2(0xA8,0x5A),      o2(0xA8,0x61),
-          o2(0xA8,0x62),      o2(0xA8,0x63),
-          o2(0xA8,0x64),      o2(0xA8,0x65),
-          o2(0xA8,0x66),      o2(0xA8,0x67),
-          o2(0xA8,0x68),      o2(0xA8,0x69),
-          o2(0xA8,0x6A),      o2(0xA8,0x6B),
-          o2(0xA8,0x6C),      o2(0xA8,0x6D),
-          o2(0xA8,0x6E),      o2(0xA8,0x6F),
-          o2(0xA8,0x70),      o2(0xA8,0x71),
-          o2(0xA8,0x72),      o2(0xA8,0x73),
-          o2(0xC2,0xE8),      o2(0xA8,0x74),
-          o2(0xA8,0x75),      o2(0xA8,0x76),
-          o2(0xA8,0x77),      o2(0xA8,0x78),
-          o2(0xA8,0x79),      o2(0xA8,0x7A),
-          o2(0xA8,0x81),      o2(0xA8,0x82),
-          o2(0xA8,0x83),      o2(0xA8,0x84),
-          o2(0xA8,0x85),      o2(0xA8,0x86),
-          o2(0xA8,0x87),      o2(0xA8,0x88),
-          o2(0xA8,0x89),      o2(0xA8,0x8A),
-          o2(0xA8,0x8B),      o2(0xA8,0x8C),
-          o2(0xA8,0x8D),      o2(0xA8,0x8E),
-          o2(0xA8,0x8F),      o2(0xA8,0x90),
-          o2(0xA8,0x91),      o2(0xA8,0x92),
-          o2(0xA8,0x93),      o2(0xA8,0x94),
-          o2(0xC2,0xE9),      o2(0xA8,0x95),
-          o2(0xA8,0x96),      o2(0xA8,0x97),
-          o2(0xA8,0x98),      o2(0xA8,0x99),
-          o2(0xA8,0x9A),      o2(0xA8,0x9B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_2F_infos[65] = {
-          o2(0xA8,0x9C),      o2(0xA8,0x9D),
-          o2(0xA8,0x9E),      o2(0xA8,0x9F),
-          o2(0xA8,0xA0),      o2(0xA9,0x41),
-          o2(0xA9,0x42),      o2(0xA9,0x43),
-          o2(0xA9,0x44),      o2(0xA9,0x45),
-          o2(0xA9,0x46),      o2(0xA9,0x47),
-          o2(0xA9,0x48),      o2(0xA9,0x49),
-          o2(0xA9,0x4A),      o2(0xA9,0x4B),
-          o2(0xA9,0x4C),      o2(0xA9,0x4D),
-          o2(0xA9,0x4E),      o2(0xA9,0x4F),
-          o2(0xC2,0xEA),      o2(0xA9,0x50),
-          o2(0xA9,0x51),      o2(0xA9,0x52),
-          o2(0xA9,0x53),      o2(0xA9,0x54),
-          o2(0xA9,0x55),      o2(0xA9,0x56),
-          o2(0xA9,0x57),      o2(0xA9,0x58),
-          o2(0xA9,0x59),      o2(0xA9,0x5A),
-          o2(0xA9,0x61),      o2(0xA9,0x62),
-          o2(0xA9,0x63),      o2(0xA9,0x64),
-          o2(0xC2,0xEB),      o2(0xA9,0x65),
-          o2(0xA9,0x66),      o2(0xC2,0xEC),
-          o2(0xA9,0x67),      o2(0xC2,0xED),
-          o2(0xA9,0x68),      o2(0xA9,0x69),
-          o2(0xA9,0x6A),      o2(0xA9,0x6B),
-          o2(0xA9,0x6C),      o2(0xA9,0x6D),
-          o2(0xA9,0x6E),      o2(0xA9,0x6F),
-          o2(0xA9,0x70),      o2(0xA9,0x71),
-          o2(0xA9,0x72),      o2(0xA9,0x73),
-          o2(0xA9,0x74),      o2(0xA9,0x75),
-          o2(0xA9,0x76),      o2(0xA9,0x77),
-          o2(0xA9,0x78),      o2(0xA9,0x79),
-          o2(0xA9,0x7A),      o2(0xA9,0x81),
-          o2(0xA9,0x82),      o2(0xA9,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_2F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_2F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_30_infos[65] = {
-          o2(0xA9,0x84),      o2(0xA9,0x85),
-          o2(0xA9,0x86),      o2(0xA9,0x87),
-          o2(0xA9,0x88),      o2(0xA9,0x89),
-          o2(0xA9,0x8A),      o2(0xA9,0x8B),
-          o2(0xA9,0x8C),      o2(0xA9,0x8D),
-          o2(0xA9,0x8E),      o2(0xA9,0x8F),
-          o2(0xC2,0xEE),      o2(0xC2,0xEF),
-          o2(0xA9,0x90),      o2(0xA9,0x91),
-          o2(0xC2,0xF0),      o2(0xA9,0x92),
-          o2(0xA9,0x93),      o2(0xA9,0x94),
-          o2(0xC2,0xF1),      o2(0xA9,0x95),
-          o2(0xA9,0x96),      o2(0xA9,0x97),
-          o2(0xA9,0x98),      o2(0xA9,0x99),
-          o2(0xA9,0x9A),      o2(0xA9,0x9B),
-          o2(0xC2,0xF2),      o2(0xC2,0xF3),
-          o2(0xA9,0x9C),      o2(0xA9,0x9D),
-          o2(0xA9,0x9E),      o2(0xC2,0xF4),
-          o2(0xC2,0xF5),      o2(0xA9,0x9F),
-          o2(0xA9,0xA0),      o2(0xAA,0x41),
-          o2(0xAA,0x42),      o2(0xC2,0xF6),
-          o2(0xC2,0xF7),      o2(0xC2,0xF8),
-          o2(0xAA,0x43),      o2(0xAA,0x44),
-          o2(0xC2,0xF9),      o2(0xAA,0x45),
-          o2(0xC2,0xFA),      o2(0xAA,0x46),
-          o2(0xC2,0xFB),      o2(0xAA,0x47),
-          o2(0xAA,0x48),      o2(0xAA,0x49),
-          o2(0xAA,0x4A),      o2(0xAA,0x4B),
-          o2(0xAA,0x4C),      o2(0xAA,0x4D),
-          o2(0xC2,0xFC),      o2(0xC2,0xFD),
-          o2(0xAA,0x4E),      o2(0xC2,0xFE),
-          o2(0xC3,0xA1),      o2(0xC3,0xA2),
-          o2(0xC3,0xA3),      o2(0xAA,0x4F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_30 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_30_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_31_infos[65] = {
-          o2(0xAA,0x50),      o2(0xAA,0x51),
-          o2(0xAA,0x52),      o2(0xAA,0x53),
-          o2(0xC3,0xA4),      o2(0xC3,0xA5),
-          o2(0xAA,0x54),      o2(0xAA,0x55),
-          o2(0xC3,0xA6),      o2(0xAA,0x56),
-          o2(0xAA,0x57),      o2(0xAA,0x58),
-          o2(0xC3,0xA7),      o2(0xAA,0x59),
-          o2(0xAA,0x5A),      o2(0xAA,0x61),
-          o2(0xAA,0x62),      o2(0xAA,0x63),
-          o2(0xAA,0x64),      o2(0xAA,0x65),
-          o2(0xC3,0xA8),      o2(0xC3,0xA9),
-          o2(0xAA,0x66),      o2(0xC3,0xAA),
-          o2(0xC3,0xAB),      o2(0xC3,0xAC),
-          o2(0xAA,0x67),      o2(0xAA,0x68),
-          o2(0xAA,0x69),      o2(0xAA,0x6A),
-          o2(0xAA,0x6B),      o2(0xAA,0x6C),
-          o2(0xC3,0xAD),      o2(0xAA,0x6D),
-          o2(0xAA,0x6E),      o2(0xAA,0x6F),
-          o2(0xC3,0xAE),      o2(0xAA,0x70),
-          o2(0xC3,0xAF),      o2(0xAA,0x71),
-          o2(0xC3,0xB0),      o2(0xAA,0x72),
-          o2(0xAA,0x73),      o2(0xAA,0x74),
-          o2(0xAA,0x75),      o2(0xAA,0x76),
-          o2(0xAA,0x77),      o2(0xAA,0x78),
-          o2(0xC3,0xB1),      o2(0xAA,0x79),
-          o2(0xAA,0x7A),      o2(0xAA,0x81),
-          o2(0xAA,0x82),      o2(0xC3,0xB2),
-          o2(0xAA,0x83),      o2(0xAA,0x84),
-          o2(0xAA,0x85),      o2(0xAA,0x86),
-          o2(0xAA,0x87),      o2(0xAA,0x88),
-          o2(0xAA,0x89),      o2(0xAA,0x8A),
-          o2(0xAA,0x8B),      o2(0xAA,0x8C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_31 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_31_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_32_infos[65] = {
-          o2(0xAA,0x8D),      o2(0xAA,0x8E),
-          o2(0xAA,0x8F),      o2(0xAA,0x90),
-          o2(0xAA,0x91),      o2(0xAA,0x92),
-          o2(0xAA,0x93),      o2(0xAA,0x94),
-          o2(0xAA,0x95),      o2(0xAA,0x96),
-          o2(0xAA,0x97),      o2(0xAA,0x98),
-          o2(0xAA,0x99),      o2(0xAA,0x9A),
-          o2(0xAA,0x9B),      o2(0xAA,0x9C),
-          o2(0xAA,0x9D),      o2(0xAA,0x9E),
-          o2(0xAA,0x9F),      o2(0xAA,0xA0),
-          o2(0xAB,0x41),      o2(0xAB,0x42),
-          o2(0xAB,0x43),      o2(0xAB,0x44),
-          o2(0xC3,0xB3),      o2(0xC3,0xB4),
-          o2(0xAB,0x45),      o2(0xAB,0x46),
-          o2(0xC3,0xB5),      o2(0xAB,0x47),
-          o2(0xAB,0x48),      o2(0xAB,0x49),
-          o2(0xC3,0xB6),      o2(0xAB,0x4A),
-          o2(0xAB,0x4B),      o2(0xAB,0x4C),
-          o2(0xAB,0x4D),      o2(0xAB,0x4E),
-          o2(0xAB,0x4F),      o2(0xAB,0x50),
-          o2(0xC3,0xB7),      o2(0xC3,0xB8),
-          o2(0xAB,0x51),      o2(0xC3,0xB9),
-          o2(0xC3,0xBA),      o2(0xC3,0xBB),
-          o2(0xAB,0x52),      o2(0xAB,0x53),
-          o2(0xAB,0x54),      o2(0xAB,0x55),
-          o2(0xAB,0x56),      o2(0xAB,0x57),
-          o2(0xC3,0xBC),      o2(0xC3,0xBD),
-          o2(0xAB,0x58),      o2(0xAB,0x59),
-          o2(0xC3,0xBE),      o2(0xAB,0x5A),
-          o2(0xAB,0x61),      o2(0xAB,0x62),
-          o2(0xC3,0xBF),      o2(0xAB,0x63),
-          o2(0xAB,0x64),      o2(0xAB,0x65),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_32 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_32_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_33_infos[65] = {
-          o2(0xAB,0x66),      o2(0xAB,0x67),
-          o2(0xAB,0x68),      o2(0xAB,0x69),
-          o2(0xC3,0xC0),      o2(0xC3,0xC1),
-          o2(0xAB,0x6A),      o2(0xC3,0xC2),
-          o2(0xAB,0x6B),      o2(0xC3,0xC3),
-          o2(0xAB,0x6C),      o2(0xAB,0x6D),
-          o2(0xAB,0x6E),      o2(0xAB,0x6F),
-          o2(0xAB,0x70),      o2(0xAB,0x71),
-          o2(0xC3,0xC4),      o2(0xAB,0x72),
-          o2(0xAB,0x73),      o2(0xAB,0x74),
-          o2(0xC3,0xC5),      o2(0xAB,0x75),
-          o2(0xAB,0x76),      o2(0xAB,0x77),
-          o2(0xAB,0x78),      o2(0xAB,0x79),
-          o2(0xAB,0x7A),      o2(0xAB,0x81),
-          o2(0xAB,0x82),      o2(0xAB,0x83),
-          o2(0xAB,0x84),      o2(0xAB,0x85),
-          o2(0xAB,0x86),      o2(0xAB,0x87),
-          o2(0xAB,0x88),      o2(0xAB,0x89),
-          o2(0xC3,0xC6),      o2(0xAB,0x8A),
-          o2(0xAB,0x8B),      o2(0xAB,0x8C),
-          o2(0xAB,0x8D),      o2(0xAB,0x8E),
-          o2(0xAB,0x8F),      o2(0xAB,0x90),
-          o2(0xC3,0xC7),      o2(0xAB,0x91),
-          o2(0xAB,0x92),      o2(0xAB,0x93),
-          o2(0xC3,0xC8),      o2(0xAB,0x94),
-          o2(0xAB,0x95),      o2(0xAB,0x96),
-          o2(0xAB,0x97),      o2(0xAB,0x98),
-          o2(0xAB,0x99),      o2(0xAB,0x9A),
-          o2(0xAB,0x9B),      o2(0xAB,0x9C),
-          o2(0xAB,0x9D),      o2(0xAB,0x9E),
-          o2(0xAB,0x9F),      o2(0xAB,0xA0),
-          o2(0xAC,0x41),      o2(0xAC,0x42),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_33 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_33_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_34_infos[65] = {
-          o2(0xAC,0x43),      o2(0xC3,0xC9),
-          o2(0xAC,0x44),      o2(0xAC,0x45),
-          o2(0xAC,0x46),      o2(0xAC,0x47),
-          o2(0xAC,0x48),      o2(0xAC,0x49),
-          o2(0xC3,0xCA),      o2(0xC3,0xCB),
-          o2(0xAC,0x4A),      o2(0xAC,0x4B),
-          o2(0xC3,0xCC),      o2(0xAC,0x4C),
-          o2(0xAC,0x4D),      o2(0xAC,0x4E),
-          o2(0xC3,0xCD),      o2(0xAC,0x4F),
-          o2(0xAC,0x50),      o2(0xAC,0x51),
-          o2(0xAC,0x52),      o2(0xAC,0x53),
-          o2(0xAC,0x54),      o2(0xAC,0x55),
-          o2(0xC3,0xCE),      o2(0xC3,0xCF),
-          o2(0xAC,0x56),      o2(0xC3,0xD0),
-          o2(0xAC,0x57),      o2(0xC3,0xD1),
-          o2(0xAC,0x58),      o2(0xAC,0x59),
-          o2(0xAC,0x5A),      o2(0xAC,0x61),
-          o2(0xAC,0x62),      o2(0xAC,0x63),
-          o2(0xC3,0xD2),      o2(0xAC,0x64),
-          o2(0xAC,0x65),      o2(0xAC,0x66),
-          o2(0xC3,0xD3),      o2(0xAC,0x67),
-          o2(0xAC,0x68),      o2(0xAC,0x69),
-          o2(0xC3,0xD4),      o2(0xAC,0x6A),
-          o2(0xAC,0x6B),      o2(0xAC,0x6C),
-          o2(0xAC,0x6D),      o2(0xAC,0x6E),
-          o2(0xAC,0x6F),      o2(0xAC,0x70),
-          o2(0xAC,0x71),      o2(0xAC,0x72),
-          o2(0xAC,0x73),      o2(0xAC,0x74),
-          o2(0xAC,0x75),      o2(0xC3,0xD5),
-          o2(0xAC,0x76),      o2(0xAC,0x77),
-          o2(0xAC,0x78),      o2(0xAC,0x79),
-          o2(0xAC,0x7A),      o2(0xAC,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_34 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_34_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_35_infos[65] = {
-          o2(0xAC,0x82),      o2(0xAC,0x83),
-          o2(0xAC,0x84),      o2(0xAC,0x85),
-          o2(0xAC,0x86),      o2(0xAC,0x87),
-          o2(0xAC,0x88),      o2(0xAC,0x89),
-          o2(0xAC,0x8A),      o2(0xAC,0x8B),
-          o2(0xAC,0x8C),      o2(0xAC,0x8D),
-          o2(0xAC,0x8E),      o2(0xAC,0x8F),
-          o2(0xAC,0x90),      o2(0xAC,0x91),
-          o2(0xAC,0x92),      o2(0xAC,0x93),
-          o2(0xAC,0x94),      o2(0xAC,0x95),
-          o2(0xAC,0x96),      o2(0xAC,0x97),
-          o2(0xAC,0x98),      o2(0xAC,0x99),
-          o2(0xAC,0x9A),      o2(0xAC,0x9B),
-          o2(0xAC,0x9C),      o2(0xAC,0x9D),
-          o2(0xC3,0xD6),      o2(0xAC,0x9E),
-          o2(0xAC,0x9F),      o2(0xAC,0xA0),
-          o2(0xC3,0xD7),      o2(0xAD,0x41),
-          o2(0xAD,0x42),      o2(0xAD,0x43),
-          o2(0xC3,0xD8),      o2(0xAD,0x44),
-          o2(0xAD,0x45),      o2(0xAD,0x46),
-          o2(0xAD,0x47),      o2(0xAD,0x48),
-          o2(0xAD,0x49),      o2(0xAD,0x4A),
-          o2(0xC3,0xD9),      o2(0xC3,0xDA),
-          o2(0xAD,0x4B),      o2(0xC3,0xDB),
-          o2(0xAD,0x4C),      o2(0xC3,0xDC),
-          o2(0xAD,0x4D),      o2(0xAD,0x4E),
-          o2(0xAD,0x4F),      o2(0xAD,0x50),
-          o2(0xAD,0x51),      o2(0xAD,0x52),
-          o2(0xC3,0xDD),      o2(0xAD,0x53),
-          o2(0xAD,0x54),      o2(0xAD,0x55),
-          o2(0xAD,0x56),      o2(0xAD,0x57),
-          o2(0xAD,0x58),      o2(0xAD,0x59),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_35 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_35_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_36_infos[65] = {
-          o2(0xAD,0x5A),      o2(0xAD,0x61),
-          o2(0xAD,0x62),      o2(0xAD,0x63),
-          o2(0xAD,0x64),      o2(0xAD,0x65),
-          o2(0xAD,0x66),      o2(0xAD,0x67),
-          o2(0xC3,0xDE),      o2(0xAD,0x68),
-          o2(0xAD,0x69),      o2(0xAD,0x6A),
-          o2(0xAD,0x6B),      o2(0xAD,0x6C),
-          o2(0xAD,0x6D),      o2(0xAD,0x6E),
-          o2(0xAD,0x6F),      o2(0xAD,0x70),
-          o2(0xAD,0x71),      o2(0xAD,0x72),
-          o2(0xC3,0xDF),      o2(0xC3,0xE0),
-          o2(0xAD,0x73),      o2(0xAD,0x74),
-          o2(0xC3,0xE1),      o2(0xAD,0x75),
-          o2(0xAD,0x76),      o2(0xAD,0x77),
-          o2(0xC3,0xE2),      o2(0xAD,0x78),
-          o2(0xAD,0x79),      o2(0xAD,0x7A),
-          o2(0xAD,0x81),      o2(0xAD,0x82),
-          o2(0xAD,0x83),      o2(0xAD,0x84),
-          o2(0xC3,0xE3),      o2(0xC3,0xE4),
-          o2(0xAD,0x85),      o2(0xC3,0xE5),
-          o2(0xAD,0x86),      o2(0xC3,0xE6),
-          o2(0xAD,0x87),      o2(0xAD,0x88),
-          o2(0xAD,0x89),      o2(0xAD,0x8A),
-          o2(0xAD,0x8B),      o2(0xAD,0x8C),
-          o2(0xC3,0xE7),      o2(0xAD,0x8D),
-          o2(0xAD,0x8E),      o2(0xAD,0x8F),
-          o2(0xAD,0x90),      o2(0xAD,0x91),
-          o2(0xAD,0x92),      o2(0xAD,0x93),
-          o2(0xAD,0x94),      o2(0xAD,0x95),
-          o2(0xAD,0x96),      o2(0xAD,0x97),
-          o2(0xAD,0x98),      o2(0xAD,0x99),
-          o2(0xAD,0x9A),      o2(0xAD,0x9B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_36 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_36_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_37_infos[65] = {
-          o2(0xAD,0x9C),      o2(0xAD,0x9D),
-          o2(0xAD,0x9E),      o2(0xAD,0x9F),
-          o2(0xC3,0xE8),      o2(0xAD,0xA0),
-          o2(0xAE,0x41),      o2(0xAE,0x42),
-          o2(0xAE,0x43),      o2(0xAE,0x44),
-          o2(0xAE,0x45),      o2(0xAE,0x46),
-          o2(0xC3,0xE9),      o2(0xAE,0x47),
-          o2(0xAE,0x48),      o2(0xAE,0x49),
-          o2(0xC3,0xEA),      o2(0xAE,0x4A),
-          o2(0xAE,0x4B),      o2(0xAE,0x4C),
-          o2(0xAE,0x4D),      o2(0xAE,0x4E),
-          o2(0xAE,0x4F),      o2(0xAE,0x50),
-          o2(0xAE,0x51),      o2(0xAE,0x52),
-          o2(0xAE,0x53),      o2(0xAE,0x54),
-          o2(0xAE,0x55),      o2(0xAE,0x56),
-          o2(0xAE,0x57),      o2(0xAE,0x58),
-          o2(0xAE,0x59),      o2(0xAE,0x5A),
-          o2(0xAE,0x61),      o2(0xAE,0x62),
-          o2(0xAE,0x63),      o2(0xAE,0x64),
-          o2(0xAE,0x65),      o2(0xAE,0x66),
-          o2(0xC3,0xEB),      o2(0xAE,0x67),
-          o2(0xAE,0x68),      o2(0xAE,0x69),
-          o2(0xC3,0xEC),      o2(0xAE,0x6A),
-          o2(0xAE,0x6B),      o2(0xAE,0x6C),
-          o2(0xC3,0xED),      o2(0xAE,0x6D),
-          o2(0xAE,0x6E),      o2(0xAE,0x6F),
-          o2(0xAE,0x70),      o2(0xAE,0x71),
-          o2(0xAE,0x72),      o2(0xAE,0x73),
-          o2(0xC3,0xEE),      o2(0xC3,0xEF),
-          o2(0xAE,0x74),      o2(0xC3,0xF0),
-          o2(0xAE,0x75),      o2(0xC3,0xF1),
-          o2(0xAE,0x76),      o2(0xAE,0x77),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_37 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_37_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_38_infos[65] = {
-          o2(0xAE,0x78),      o2(0xAE,0x79),
-          o2(0xAE,0x7A),      o2(0xAE,0x81),
-          o2(0xC3,0xF2),      o2(0xAE,0x82),
-          o2(0xAE,0x83),      o2(0xAE,0x84),
-          o2(0xC3,0xF3),      o2(0xAE,0x85),
-          o2(0xAE,0x86),      o2(0xAE,0x87),
-          o2(0xC3,0xF4),      o2(0xAE,0x88),
-          o2(0xAE,0x89),      o2(0xAE,0x8A),
-          o2(0xAE,0x8B),      o2(0xAE,0x8C),
-          o2(0xAE,0x8D),      o2(0xAE,0x8E),
-          o2(0xC3,0xF5),      o2(0xAE,0x8F),
-          o2(0xAE,0x90),      o2(0xAE,0x91),
-          o2(0xAE,0x92),      o2(0xC3,0xF6),
-          o2(0xAE,0x93),      o2(0xAE,0x94),
-          o2(0xAE,0x95),      o2(0xAE,0x96),
-          o2(0xAE,0x97),      o2(0xAE,0x98),
-          o2(0xC3,0xF7),      o2(0xC3,0xF8),
-          o2(0xAE,0x99),      o2(0xAE,0x9A),
-          o2(0xC3,0xF9),      o2(0xAE,0x9B),
-          o2(0xAE,0x9C),      o2(0xAE,0x9D),
-          o2(0xC3,0xFA),      o2(0xAE,0x9E),
-          o2(0xAE,0x9F),      o2(0xAE,0xA0),
-          o2(0xAF,0x41),      o2(0xAF,0x42),
-          o2(0xAF,0x43),      o2(0xAF,0x44),
-          o2(0xC3,0xFB),      o2(0xC3,0xFC),
-          o2(0xAF,0x45),      o2(0xC3,0xFD),
-          o2(0xAF,0x46),      o2(0xC3,0xFE),
-          o2(0xAF,0x47),      o2(0xAF,0x48),
-          o2(0xAF,0x49),      o2(0xAF,0x4A),
-          o2(0xAF,0x4B),      o2(0xAF,0x4C),
-          o2(0xAF,0x4D),      o2(0xAF,0x4E),
-          o2(0xAF,0x4F),      o2(0xAF,0x50),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_38 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_38_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_39_infos[65] = {
-          o2(0xAF,0x51),      o2(0xAF,0x52),
-          o2(0xAF,0x53),      o2(0xAF,0x54),
-          o2(0xAF,0x55),      o2(0xAF,0x56),
-          o2(0xAF,0x57),      o2(0xAF,0x58),
-          o2(0xAF,0x59),      o2(0xAF,0x5A),
-          o2(0xAF,0x61),      o2(0xAF,0x62),
-          o2(0xAF,0x63),      o2(0xAF,0x64),
-          o2(0xAF,0x65),      o2(0xAF,0x66),
-          o2(0xAF,0x67),      o2(0xAF,0x68),
-          o2(0xAF,0x69),      o2(0xAF,0x6A),
-          o2(0xAF,0x6B),      o2(0xAF,0x6C),
-          o2(0xAF,0x6D),      o2(0xAF,0x6E),
-          o2(0xC4,0xA1),      o2(0xC4,0xA2),
-          o2(0xAF,0x6F),      o2(0xAF,0x70),
-          o2(0xC4,0xA3),      o2(0xAF,0x71),
-          o2(0xAF,0x72),      o2(0xC4,0xA4),
-          o2(0xC4,0xA5),      o2(0xC4,0xA6),
-          o2(0xAF,0x73),      o2(0xAF,0x74),
-          o2(0xAF,0x75),      o2(0xAF,0x76),
-          o2(0xAF,0x77),      o2(0xAF,0x78),
-          o2(0xC4,0xA7),      o2(0xC4,0xA8),
-          o2(0xAF,0x79),      o2(0xC4,0xA9),
-          o2(0xAF,0x7A),      o2(0xC4,0xAA),
-          o2(0xAF,0x81),      o2(0xAF,0x82),
-          o2(0xAF,0x83),      o2(0xAF,0x84),
-          o2(0xAF,0x85),      o2(0xAF,0x86),
-          o2(0xC4,0xAB),      o2(0xC4,0xAC),
-          o2(0xAF,0x87),      o2(0xAF,0x88),
-          o2(0xC4,0xAD),      o2(0xAF,0x89),
-          o2(0xAF,0x8A),      o2(0xAF,0x8B),
-          o2(0xC4,0xAE),      o2(0xAF,0x8C),
-          o2(0xAF,0x8D),      o2(0xAF,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_39 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_39_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3A_infos[65] = {
-          o2(0xAF,0x8F),      o2(0xAF,0x90),
-          o2(0xAF,0x91),      o2(0xAF,0x92),
-          o2(0xC4,0xAF),      o2(0xC4,0xB0),
-          o2(0xAF,0x93),      o2(0xC4,0xB1),
-          o2(0xAF,0x94),      o2(0xC4,0xB2),
-          o2(0xAF,0x95),      o2(0xAF,0x96),
-          o2(0xAF,0x97),      o2(0xAF,0x98),
-          o2(0xAF,0x99),      o2(0xAF,0x9A),
-          o2(0xC4,0xB3),      o2(0xC4,0xB4),
-          o2(0xAF,0x9B),      o2(0xAF,0x9C),
-          o2(0xC4,0xB5),      o2(0xAF,0x9D),
-          o2(0xAF,0x9E),      o2(0xAF,0x9F),
-          o2(0xC4,0xB6),      o2(0xAF,0xA0),
-          o2(0xB0,0x41),      o2(0xB0,0x42),
-          o2(0xB0,0x43),      o2(0xB0,0x44),
-          o2(0xB0,0x45),      o2(0xB0,0x46),
-          o2(0xC4,0xB7),      o2(0xC4,0xB8),
-          o2(0xB0,0x47),      o2(0xC4,0xB9),
-          o2(0xC4,0xBA),      o2(0xC4,0xBB),
-          o2(0xB0,0x48),      o2(0xB0,0x49),
-          o2(0xB0,0x4A),      o2(0xB0,0x4B),
-          o2(0xB0,0x4C),      o2(0xB0,0x4D),
-          o2(0xC4,0xBC),      o2(0xC4,0xBD),
-          o2(0xB0,0x4E),      o2(0xB0,0x4F),
-          o2(0xB0,0x50),      o2(0xB0,0x51),
-          o2(0xB0,0x52),      o2(0xB0,0x53),
-          o2(0xB0,0x54),      o2(0xB0,0x55),
-          o2(0xB0,0x56),      o2(0xB0,0x57),
-          o2(0xB0,0x58),      o2(0xB0,0x59),
-          o2(0xB0,0x5A),      o2(0xB0,0x61),
-          o2(0xB0,0x62),      o2(0xB0,0x63),
-          o2(0xB0,0x64),      o2(0xB0,0x65),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3B_infos[65] = {
-          o2(0xB0,0x66),      o2(0xC4,0xBE),
-          o2(0xB0,0x67),      o2(0xB0,0x68),
-          o2(0xB0,0x69),      o2(0xB0,0x6A),
-          o2(0xB0,0x6B),      o2(0xB0,0x6C),
-          o2(0xB0,0x6D),      o2(0xB0,0x6E),
-          o2(0xB0,0x6F),      o2(0xB0,0x70),
-          o2(0xB0,0x71),      o2(0xB0,0x72),
-          o2(0xB0,0x73),      o2(0xB0,0x74),
-          o2(0xB0,0x75),      o2(0xB0,0x76),
-          o2(0xB0,0x77),      o2(0xB0,0x78),
-          o2(0xB0,0x79),      o2(0xB0,0x7A),
-          o2(0xB0,0x81),      o2(0xB0,0x82),
-          o2(0xB0,0x83),      o2(0xB0,0x84),
-          o2(0xB0,0x85),      o2(0xB0,0x86),
-          o2(0xB0,0x87),      o2(0xB0,0x88),
-          o2(0xB0,0x89),      o2(0xB0,0x8A),
-          o2(0xB0,0x8B),      o2(0xB0,0x8C),
-          o2(0xB0,0x8D),      o2(0xB0,0x8E),
-          o2(0xC4,0xBF),      o2(0xC4,0xC0),
-          o2(0xB0,0x8F),      o2(0xB0,0x90),
-          o2(0xC4,0xC1),      o2(0xB0,0x91),
-          o2(0xB0,0x92),      o2(0xC4,0xC2),
-          o2(0xC4,0xC3),      o2(0xB0,0x93),
-          o2(0xB0,0x94),      o2(0xB0,0x95),
-          o2(0xB0,0x96),      o2(0xB0,0x97),
-          o2(0xB0,0x98),      o2(0xB0,0x99),
-          o2(0xC4,0xC4),      o2(0xC4,0xC5),
-          o2(0xB0,0x9A),      o2(0xC4,0xC6),
-          o2(0xC4,0xC7),      o2(0xC4,0xC8),
-          o2(0xB0,0x9B),      o2(0xB0,0x9C),
-          o2(0xB0,0x9D),      o2(0xB0,0x9E),
-          o2(0xB0,0x9F),      o2(0xB0,0xA0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3C_infos[65] = {
-          o2(0xC4,0xC9),      o2(0xC4,0xCA),
-          o2(0xB1,0x41),      o2(0xB1,0x42),
-          o2(0xC4,0xCB),      o2(0xB1,0x43),
-          o2(0xB1,0x44),      o2(0xB1,0x45),
-          o2(0xC4,0xCC),      o2(0xB1,0x46),
-          o2(0xB1,0x47),      o2(0xB1,0x48),
-          o2(0xB1,0x49),      o2(0xB1,0x4A),
-          o2(0xB1,0x4B),      o2(0xB1,0x4C),
-          o2(0xC4,0xCD),      o2(0xC4,0xCE),
-          o2(0xB1,0x4D),      o2(0xC4,0xCF),
-          o2(0xB1,0x4E),      o2(0xC4,0xD0),
-          o2(0xB1,0x4F),      o2(0xB1,0x50),
-          o2(0xB1,0x51),      o2(0xB1,0x52),
-          o2(0xB1,0x53),      o2(0xB1,0x54),
-          o2(0xC4,0xD1),      o2(0xB1,0x55),
-          o2(0xB1,0x56),      o2(0xB1,0x57),
-          o2(0xC4,0xD2),      o2(0xB1,0x58),
-          o2(0xB1,0x59),      o2(0xB1,0x5A),
-          o2(0xC4,0xD3),      o2(0xB1,0x61),
-          o2(0xB1,0x62),      o2(0xB1,0x63),
-          o2(0xB1,0x64),      o2(0xB1,0x65),
-          o2(0xB1,0x66),      o2(0xB1,0x67),
-          o2(0xC4,0xD4),      o2(0xC4,0xD5),
-          o2(0xB1,0x68),      o2(0xC4,0xD6),
-          o2(0xC4,0xD7),      o2(0xC4,0xD8),
-          o2(0xB1,0x69),      o2(0xB1,0x6A),
-          o2(0xB1,0x6B),      o2(0xB1,0x6C),
-          o2(0xB1,0x6D),      o2(0xB1,0x6E),
-          o2(0xC4,0xD9),      o2(0xB1,0x6F),
-          o2(0xB1,0x70),      o2(0xB1,0x71),
-          o2(0xB1,0x72),      o2(0xB1,0x73),
-          o2(0xB1,0x74),      o2(0xB1,0x75),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3D_infos[65] = {
-          o2(0xB1,0x76),      o2(0xB1,0x77),
-          o2(0xB1,0x78),      o2(0xB1,0x79),
-          o2(0xB1,0x7A),      o2(0xB1,0x81),
-          o2(0xB1,0x82),      o2(0xB1,0x83),
-          o2(0xB1,0x84),      o2(0xB1,0x85),
-          o2(0xB1,0x86),      o2(0xB1,0x87),
-          o2(0xB1,0x88),      o2(0xB1,0x89),
-          o2(0xB1,0x8A),      o2(0xB1,0x8B),
-          o2(0xB1,0x8C),      o2(0xB1,0x8D),
-          o2(0xB1,0x8E),      o2(0xB1,0x8F),
-          o2(0xC4,0xDA),      o2(0xC4,0xDB),
-          o2(0xB1,0x90),      o2(0xB1,0x91),
-          o2(0xC4,0xDC),      o2(0xB1,0x92),
-          o2(0xB1,0x93),      o2(0xB1,0x94),
-          o2(0xC4,0xDD),      o2(0xB1,0x95),
-          o2(0xB1,0x96),      o2(0xB1,0x97),
-          o2(0xB1,0x98),      o2(0xB1,0x99),
-          o2(0xB1,0x9A),      o2(0xB1,0x9B),
-          o2(0xC4,0xDE),      o2(0xC4,0xDF),
-          o2(0xB1,0x9C),      o2(0xC4,0xE0),
-          o2(0xB1,0x9D),      o2(0xC4,0xE1),
-          o2(0xB1,0x9E),      o2(0xB1,0x9F),
-          o2(0xB1,0xA0),      o2(0xB2,0x41),
-          o2(0xB2,0x42),      o2(0xB2,0x43),
-          o2(0xC4,0xE2),      o2(0xC4,0xE3),
-          o2(0xB2,0x44),      o2(0xB2,0x45),
-          o2(0xC4,0xE4),      o2(0xB2,0x46),
-          o2(0xB2,0x47),      o2(0xB2,0x48),
-          o2(0xC4,0xE5),      o2(0xB2,0x49),
-          o2(0xB2,0x4A),      o2(0xB2,0x4B),
-          o2(0xB2,0x4C),      o2(0xB2,0x4D),
-          o2(0xB2,0x4E),      o2(0xB2,0x4F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3E_infos[65] = {
-          o2(0xC4,0xE6),      o2(0xB2,0x50),
-          o2(0xB2,0x51),      o2(0xB2,0x52),
-          o2(0xB2,0x53),      o2(0xC4,0xE7),
-          o2(0xB2,0x54),      o2(0xB2,0x55),
-          o2(0xB2,0x56),      o2(0xB2,0x57),
-          o2(0xB2,0x58),      o2(0xB2,0x59),
-          o2(0xC4,0xE8),      o2(0xB2,0x5A),
-          o2(0xB2,0x61),      o2(0xB2,0x62),
-          o2(0xB2,0x63),      o2(0xB2,0x64),
-          o2(0xB2,0x65),      o2(0xB2,0x66),
-          o2(0xB2,0x67),      o2(0xB2,0x68),
-          o2(0xB2,0x69),      o2(0xB2,0x6A),
-          o2(0xB2,0x6B),      o2(0xB2,0x6C),
-          o2(0xB2,0x6D),      o2(0xB2,0x6E),
-          o2(0xB2,0x6F),      o2(0xB2,0x70),
-          o2(0xB2,0x71),      o2(0xB2,0x72),
-          o2(0xB2,0x73),      o2(0xC4,0xE9),
-          o2(0xB2,0x74),      o2(0xB2,0x75),
-          o2(0xB2,0x76),      o2(0xB2,0x77),
-          o2(0xB2,0x78),      o2(0xB2,0x79),
-          o2(0xC4,0xEA),      o2(0xB2,0x7A),
-          o2(0xB2,0x81),      o2(0xB2,0x82),
-          o2(0xB2,0x83),      o2(0xB2,0x84),
-          o2(0xB2,0x85),      o2(0xB2,0x86),
-          o2(0xC4,0xEB),      o2(0xB2,0x87),
-          o2(0xB2,0x88),      o2(0xB2,0x89),
-          o2(0xB2,0x8A),      o2(0xB2,0x8B),
-          o2(0xB2,0x8C),      o2(0xB2,0x8D),
-          o2(0xB2,0x8E),      o2(0xB2,0x8F),
-          o2(0xB2,0x90),      o2(0xB2,0x91),
-          o2(0xB2,0x92),      o2(0xB2,0x93),
-          o2(0xB2,0x94),      o2(0xB2,0x95),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_3F_infos[65] = {
-          o2(0xB2,0x96),      o2(0xB2,0x97),
-          o2(0xB2,0x98),      o2(0xB2,0x99),
-          o2(0xC4,0xEC),      o2(0xB2,0x9A),
-          o2(0xB2,0x9B),      o2(0xB2,0x9C),
-          o2(0xB2,0x9D),      o2(0xB2,0x9E),
-          o2(0xB2,0x9F),      o2(0xB2,0xA0),
-          o2(0xB3,0x41),      o2(0xB3,0x42),
-          o2(0xB3,0x43),      o2(0xB3,0x44),
-          o2(0xB3,0x45),      o2(0xB3,0x46),
-          o2(0xB3,0x47),      o2(0xB3,0x48),
-          o2(0xB3,0x49),      o2(0xB3,0x4A),
-          o2(0xB3,0x4B),      o2(0xB3,0x4C),
-          o2(0xB3,0x4D),      o2(0xB3,0x4E),
-          o2(0xB3,0x4F),      o2(0xB3,0x50),
-          o2(0xB3,0x51),      o2(0xB3,0x52),
-          o2(0xB3,0x53),      o2(0xB3,0x54),
-          o2(0xC4,0xED),      o2(0xC4,0xEE),
-          o2(0xB3,0x55),      o2(0xB3,0x56),
-          o2(0xC4,0xEF),      o2(0xB3,0x57),
-          o2(0xB3,0x58),      o2(0xB3,0x59),
-          o2(0xC4,0xF0),      o2(0xB3,0x5A),
-          o2(0xB3,0x61),      o2(0xB3,0x62),
-          o2(0xB3,0x63),      o2(0xB3,0x64),
-          o2(0xB3,0x65),      o2(0xB3,0x66),
-          o2(0xC4,0xF1),      o2(0xC4,0xF2),
-          o2(0xB3,0x67),      o2(0xC4,0xF3),
-          o2(0xB3,0x68),      o2(0xC4,0xF4),
-          o2(0xB3,0x69),      o2(0xB3,0x6A),
-          o2(0xB3,0x6B),      o2(0xB3,0x6C),
-          o2(0xB3,0x6D),      o2(0xB3,0x6E),
-          o2(0xC4,0xF5),      o2(0xB3,0x6F),
-          o2(0xB3,0x70),      o2(0xB3,0x71),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC_3F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EC_infos[65] = {
-        &to_CP949_EC_00,    &to_CP949_EC_01,
-        &to_CP949_EC_02,    &to_CP949_EC_03,
-        &to_CP949_EC_04,    &to_CP949_EC_05,
-        &to_CP949_EC_06,    &to_CP949_EC_07,
-        &to_CP949_EC_08,    &to_CP949_EC_09,
-        &to_CP949_EC_0A,    &to_CP949_EC_0B,
-        &to_CP949_EC_0C,    &to_CP949_EC_0D,
-        &to_CP949_EC_0E,    &to_CP949_EC_0F,
-        &to_CP949_EC_10,    &to_CP949_EC_11,
-        &to_CP949_EC_12,    &to_CP949_EC_13,
-        &to_CP949_EC_14,    &to_CP949_EC_15,
-        &to_CP949_EC_16,    &to_CP949_EC_17,
-        &to_CP949_EC_18,    &to_CP949_EC_19,
-        &to_CP949_EC_1A,    &to_CP949_EC_1B,
-        &to_CP949_EC_1C,    &to_CP949_EC_1D,
-        &to_CP949_EC_1E,    &to_CP949_EC_1F,
-        &to_CP949_EC_20,    &to_CP949_EC_21,
-        &to_CP949_EC_22,    &to_CP949_EC_23,
-        &to_CP949_EC_24,    &to_CP949_EC_25,
-        &to_CP949_EC_26,    &to_CP949_EC_27,
-        &to_CP949_EC_28,    &to_CP949_EC_29,
-        &to_CP949_EC_2A,    &to_CP949_EC_2B,
-        &to_CP949_EC_2C,    &to_CP949_EC_2D,
-        &to_CP949_EC_2E,    &to_CP949_EC_2F,
-        &to_CP949_EC_30,    &to_CP949_EC_31,
-        &to_CP949_EC_32,    &to_CP949_EC_33,
-        &to_CP949_EC_34,    &to_CP949_EC_35,
-        &to_CP949_EC_36,    &to_CP949_EC_37,
-        &to_CP949_EC_38,    &to_CP949_EC_39,
-        &to_CP949_EC_3A,    &to_CP949_EC_3B,
-        &to_CP949_EC_3C,    &to_CP949_EC_3D,
-        &to_CP949_EC_3E,    &to_CP949_EC_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EC = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EC_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_00_infos[65] = {
-          o2(0xC4,0xF6),      o2(0xB3,0x72),
-          o2(0xB3,0x73),      o2(0xB3,0x74),
-          o2(0xC4,0xF7),      o2(0xB3,0x75),
-          o2(0xB3,0x76),      o2(0xB3,0x77),
-          o2(0xB3,0x78),      o2(0xB3,0x79),
-          o2(0xB3,0x7A),      o2(0xB3,0x81),
-          o2(0xB3,0x82),      o2(0xB3,0x83),
-          o2(0xB3,0x84),      o2(0xB3,0x85),
-          o2(0xB3,0x86),      o2(0xC4,0xF8),
-          o2(0xB3,0x87),      o2(0xB3,0x88),
-          o2(0xB3,0x89),      o2(0xB3,0x8A),
-          o2(0xB3,0x8B),      o2(0xB3,0x8C),
-          o2(0xC4,0xF9),      o2(0xB3,0x8D),
-          o2(0xB3,0x8E),      o2(0xB3,0x8F),
-          o2(0xB3,0x90),      o2(0xB3,0x91),
-          o2(0xB3,0x92),      o2(0xB3,0x93),
-          o2(0xB3,0x94),      o2(0xB3,0x95),
-          o2(0xB3,0x96),      o2(0xB3,0x97),
-          o2(0xB3,0x98),      o2(0xB3,0x99),
-          o2(0xB3,0x9A),      o2(0xB3,0x9B),
-          o2(0xB3,0x9C),      o2(0xB3,0x9D),
-          o2(0xB3,0x9E),      o2(0xB3,0x9F),
-          o2(0xB3,0xA0),      o2(0xC4,0xFA),
-          o2(0xB4,0x41),      o2(0xB4,0x42),
-          o2(0xB4,0x43),      o2(0xB4,0x44),
-          o2(0xB4,0x45),      o2(0xB4,0x46),
-          o2(0xC4,0xFB),      o2(0xC4,0xFC),
-          o2(0xB4,0x47),      o2(0xB4,0x48),
-          o2(0xC4,0xFD),      o2(0xB4,0x49),
-          o2(0xB4,0x4A),      o2(0xB4,0x4B),
-          o2(0xC4,0xFE),      o2(0xB4,0x4C),
-          o2(0xB4,0x4D),      o2(0xB4,0x4E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_00 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_00_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_01_infos[65] = {
-          o2(0xB4,0x4F),      o2(0xB4,0x50),
-          o2(0xB4,0x51),      o2(0xB4,0x52),
-          o2(0xC5,0xA1),      o2(0xC5,0xA2),
-          o2(0xB4,0x53),      o2(0xC5,0xA3),
-          o2(0xB4,0x54),      o2(0xC5,0xA4),
-          o2(0xB4,0x55),      o2(0xB4,0x56),
-          o2(0xB4,0x57),      o2(0xB4,0x58),
-          o2(0xB4,0x59),      o2(0xB4,0x5A),
-          o2(0xC5,0xA5),      o2(0xB4,0x61),
-          o2(0xB4,0x62),      o2(0xB4,0x63),
-          o2(0xC5,0xA6),      o2(0xB4,0x64),
-          o2(0xB4,0x65),      o2(0xB4,0x66),
-          o2(0xC5,0xA7),      o2(0xB4,0x67),
-          o2(0xB4,0x68),      o2(0xB4,0x69),
-          o2(0xB4,0x6A),      o2(0xB4,0x6B),
-          o2(0xB4,0x6C),      o2(0xB4,0x6D),
-          o2(0xC5,0xA8),      o2(0xB4,0x6E),
-          o2(0xB4,0x6F),      o2(0xB4,0x70),
-          o2(0xB4,0x71),      o2(0xB4,0x72),
-          o2(0xB4,0x73),      o2(0xB4,0x74),
-          o2(0xB4,0x75),      o2(0xB4,0x76),
-          o2(0xB4,0x77),      o2(0xB4,0x78),
-          o2(0xC5,0xA9),      o2(0xC5,0xAA),
-          o2(0xB4,0x79),      o2(0xB4,0x7A),
-          o2(0xC5,0xAB),      o2(0xB4,0x81),
-          o2(0xB4,0x82),      o2(0xB4,0x83),
-          o2(0xC5,0xAC),      o2(0xB4,0x84),
-          o2(0xB4,0x85),      o2(0xB4,0x86),
-          o2(0xB4,0x87),      o2(0xB4,0x88),
-          o2(0xB4,0x89),      o2(0xB4,0x8A),
-          o2(0xC5,0xAD),      o2(0xC5,0xAE),
-          o2(0xB4,0x8B),      o2(0xB4,0x8C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_01 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_01_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_02_infos[65] = {
-          o2(0xB4,0x8D),      o2(0xC5,0xAF),
-          o2(0xB4,0x8E),      o2(0xB4,0x8F),
-          o2(0xB4,0x90),      o2(0xB4,0x91),
-          o2(0xB4,0x92),      o2(0xB4,0x93),
-          o2(0xB4,0x94),      o2(0xB4,0x95),
-          o2(0xB4,0x96),      o2(0xB4,0x97),
-          o2(0xB4,0x98),      o2(0xB4,0x99),
-          o2(0xB4,0x9A),      o2(0xB4,0x9B),
-          o2(0xB4,0x9C),      o2(0xB4,0x9D),
-          o2(0xB4,0x9E),      o2(0xB4,0x9F),
-          o2(0xB4,0xA0),      o2(0xB5,0x41),
-          o2(0xB5,0x42),      o2(0xB5,0x43),
-          o2(0xB5,0x44),      o2(0xB5,0x45),
-          o2(0xB5,0x46),      o2(0xB5,0x47),
-          o2(0xB5,0x48),      o2(0xB5,0x49),
-          o2(0xB5,0x4A),      o2(0xB5,0x4B),
-          o2(0xB5,0x4C),      o2(0xB5,0x4D),
-          o2(0xB5,0x4E),      o2(0xB5,0x4F),
-          o2(0xC5,0xB0),      o2(0xC5,0xB1),
-          o2(0xB5,0x50),      o2(0xB5,0x51),
-          o2(0xC5,0xB2),      o2(0xB5,0x52),
-          o2(0xB5,0x53),      o2(0xB5,0x54),
-          o2(0xC5,0xB3),      o2(0xB5,0x55),
-          o2(0xB5,0x56),      o2(0xB5,0x57),
-          o2(0xB5,0x58),      o2(0xB5,0x59),
-          o2(0xB5,0x5A),      o2(0xB5,0x61),
-          o2(0xC5,0xB4),      o2(0xC5,0xB5),
-          o2(0xB5,0x62),      o2(0xC5,0xB6),
-          o2(0xB5,0x63),      o2(0xC5,0xB7),
-          o2(0xB5,0x64),      o2(0xB5,0x65),
-          o2(0xB5,0x66),      o2(0xB5,0x67),
-          o2(0xB5,0x68),      o2(0xB5,0x69),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_02 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_02_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_03_infos[65] = {
-          o2(0xC5,0xB8),      o2(0xC5,0xB9),
-          o2(0xB5,0x6A),      o2(0xB5,0x6B),
-          o2(0xC5,0xBA),      o2(0xB5,0x6C),
-          o2(0xB5,0x6D),      o2(0xB5,0x6E),
-          o2(0xC5,0xBB),      o2(0xC5,0xBC),
-          o2(0xB5,0x6F),      o2(0xB5,0x70),
-          o2(0xB5,0x71),      o2(0xB5,0x72),
-          o2(0xB5,0x73),      o2(0xB5,0x74),
-          o2(0xC5,0xBD),      o2(0xC5,0xBE),
-          o2(0xB5,0x75),      o2(0xC5,0xBF),
-          o2(0xC5,0xC0),      o2(0xC5,0xC1),
-          o2(0xB5,0x76),      o2(0xB5,0x77),
-          o2(0xB5,0x78),      o2(0xB5,0x79),
-          o2(0xB5,0x7A),      o2(0xB5,0x81),
-          o2(0xC5,0xC2),      o2(0xC5,0xC3),
-          o2(0xB5,0x82),      o2(0xB5,0x83),
-          o2(0xC5,0xC4),      o2(0xB5,0x84),
-          o2(0xB5,0x85),      o2(0xB5,0x86),
-          o2(0xC5,0xC5),      o2(0xB5,0x87),
-          o2(0xB5,0x88),      o2(0xB5,0x89),
-          o2(0xB5,0x8A),      o2(0xB5,0x8B),
-          o2(0xB5,0x8C),      o2(0xB5,0x8D),
-          o2(0xC5,0xC6),      o2(0xC5,0xC7),
-          o2(0xB5,0x8E),      o2(0xC5,0xC8),
-          o2(0xC5,0xC9),      o2(0xC5,0xCA),
-          o2(0xB5,0x8F),      o2(0xB5,0x90),
-          o2(0xB5,0x91),      o2(0xB5,0x92),
-          o2(0xB5,0x93),      o2(0xB5,0x94),
-          o2(0xC5,0xCB),      o2(0xB5,0x95),
-          o2(0xB5,0x96),      o2(0xB5,0x97),
-          o2(0xB5,0x98),      o2(0xB5,0x99),
-          o2(0xB5,0x9A),      o2(0xB5,0x9B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_03 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_03_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_04_infos[65] = {
-          o2(0xB5,0x9C),      o2(0xB5,0x9D),
-          o2(0xB5,0x9E),      o2(0xB5,0x9F),
-          o2(0xB5,0xA0),      o2(0xB6,0x41),
-          o2(0xB6,0x42),      o2(0xB6,0x43),
-          o2(0xB6,0x44),      o2(0xB6,0x45),
-          o2(0xB6,0x46),      o2(0xB6,0x47),
-          o2(0xB6,0x48),      o2(0xC5,0xCC),
-          o2(0xB6,0x49),      o2(0xB6,0x4A),
-          o2(0xB6,0x4B),      o2(0xB6,0x4C),
-          o2(0xB6,0x4D),      o2(0xB6,0x4E),
-          o2(0xB6,0x4F),      o2(0xB6,0x50),
-          o2(0xB6,0x51),      o2(0xB6,0x52),
-          o2(0xB6,0x53),      o2(0xB6,0x54),
-          o2(0xB6,0x55),      o2(0xB6,0x56),
-          o2(0xB6,0x57),      o2(0xB6,0x58),
-          o2(0xB6,0x59),      o2(0xB6,0x5A),
-          o2(0xB6,0x61),      o2(0xB6,0x62),
-          o2(0xB6,0x63),      o2(0xB6,0x64),
-          o2(0xB6,0x65),      o2(0xB6,0x66),
-          o2(0xB6,0x67),      o2(0xB6,0x68),
-          o2(0xB6,0x69),      o2(0xB6,0x6A),
-          o2(0xB6,0x6B),      o2(0xB6,0x6C),
-          o2(0xB6,0x6D),      o2(0xB6,0x6E),
-          o2(0xB6,0x6F),      o2(0xB6,0x70),
-          o2(0xC5,0xCD),      o2(0xC5,0xCE),
-          o2(0xB6,0x71),      o2(0xB6,0x72),
-          o2(0xC5,0xCF),      o2(0xB6,0x73),
-          o2(0xB6,0x74),      o2(0xB6,0x75),
-          o2(0xC5,0xD0),      o2(0xB6,0x76),
-          o2(0xC5,0xD1),      o2(0xB6,0x77),
-          o2(0xB6,0x78),      o2(0xB6,0x79),
-          o2(0xB6,0x7A),      o2(0xB6,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_04 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_04_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_05_infos[65] = {
-          o2(0xC5,0xD2),      o2(0xC5,0xD3),
-          o2(0xB6,0x82),      o2(0xC5,0xD4),
-          o2(0xC5,0xD5),      o2(0xC5,0xD6),
-          o2(0xB6,0x83),      o2(0xB6,0x84),
-          o2(0xB6,0x85),      o2(0xB6,0x86),
-          o2(0xB6,0x87),      o2(0xB6,0x88),
-          o2(0xC5,0xD7),      o2(0xC5,0xD8),
-          o2(0xB6,0x89),      o2(0xB6,0x8A),
-          o2(0xC5,0xD9),      o2(0xB6,0x8B),
-          o2(0xB6,0x8C),      o2(0xB6,0x8D),
-          o2(0xC5,0xDA),      o2(0xB6,0x8E),
-          o2(0xB6,0x8F),      o2(0xB6,0x90),
-          o2(0xB6,0x91),      o2(0xB6,0x92),
-          o2(0xB6,0x93),      o2(0xB6,0x94),
-          o2(0xC5,0xDB),      o2(0xC5,0xDC),
-          o2(0xB6,0x95),      o2(0xC5,0xDD),
-          o2(0xB6,0x96),      o2(0xC5,0xDE),
-          o2(0xB6,0x97),      o2(0xB6,0x98),
-          o2(0xB6,0x99),      o2(0xB6,0x9A),
-          o2(0xB6,0x9B),      o2(0xB6,0x9C),
-          o2(0xC5,0xDF),      o2(0xB6,0x9D),
-          o2(0xB6,0x9E),      o2(0xB6,0x9F),
-          o2(0xC5,0xE0),      o2(0xB6,0xA0),
-          o2(0xB7,0x41),      o2(0xB7,0x42),
-          o2(0xB7,0x43),      o2(0xB7,0x44),
-          o2(0xB7,0x45),      o2(0xB7,0x46),
-          o2(0xB7,0x47),      o2(0xB7,0x48),
-          o2(0xB7,0x49),      o2(0xB7,0x4A),
-          o2(0xB7,0x4B),      o2(0xB7,0x4C),
-          o2(0xB7,0x4D),      o2(0xB7,0x4E),
-          o2(0xC5,0xE1),      o2(0xB7,0x4F),
-          o2(0xB7,0x50),      o2(0xB7,0x51),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_05 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_05_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_06_infos[65] = {
-          o2(0xB7,0x52),      o2(0xB7,0x53),
-          o2(0xB7,0x54),      o2(0xB7,0x55),
-          o2(0xC5,0xE2),      o2(0xB7,0x56),
-          o2(0xB7,0x57),      o2(0xB7,0x58),
-          o2(0xC5,0xE3),      o2(0xB7,0x59),
-          o2(0xB7,0x5A),      o2(0xB7,0x61),
-          o2(0xB7,0x62),      o2(0xB7,0x63),
-          o2(0xB7,0x64),      o2(0xB7,0x65),
-          o2(0xB7,0x66),      o2(0xB7,0x67),
-          o2(0xB7,0x68),      o2(0xB7,0x69),
-          o2(0xB7,0x6A),      o2(0xB7,0x6B),
-          o2(0xB7,0x6C),      o2(0xB7,0x6D),
-          o2(0xB7,0x6E),      o2(0xB7,0x6F),
-          o2(0xB7,0x70),      o2(0xB7,0x71),
-          o2(0xB7,0x72),      o2(0xB7,0x73),
-          o2(0xB7,0x74),      o2(0xB7,0x75),
-          o2(0xC5,0xE4),      o2(0xC5,0xE5),
-          o2(0xB7,0x76),      o2(0xB7,0x77),
-          o2(0xC5,0xE6),      o2(0xB7,0x78),
-          o2(0xB7,0x79),      o2(0xB7,0x7A),
-          o2(0xC5,0xE7),      o2(0xB7,0x81),
-          o2(0xB7,0x82),      o2(0xB7,0x83),
-          o2(0xB7,0x84),      o2(0xB7,0x85),
-          o2(0xB7,0x86),      o2(0xB7,0x87),
-          o2(0xC5,0xE8),      o2(0xC5,0xE9),
-          o2(0xB7,0x88),      o2(0xC5,0xEA),
-          o2(0xB7,0x89),      o2(0xC5,0xEB),
-          o2(0xB7,0x8A),      o2(0xB7,0x8B),
-          o2(0xB7,0x8C),      o2(0xB7,0x8D),
-          o2(0xC5,0xEC),      o2(0xB7,0x8E),
-          o2(0xC5,0xED),      o2(0xB7,0x8F),
-          o2(0xB7,0x90),      o2(0xB7,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_06 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_06_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_07_infos[65] = {
-          o2(0xC5,0xEE),      o2(0xB7,0x92),
-          o2(0xB7,0x93),      o2(0xB7,0x94),
-          o2(0xB7,0x95),      o2(0xB7,0x96),
-          o2(0xB7,0x97),      o2(0xB7,0x98),
-          o2(0xB7,0x99),      o2(0xB7,0x9A),
-          o2(0xB7,0x9B),      o2(0xB7,0x9C),
-          o2(0xB7,0x9D),      o2(0xB7,0x9E),
-          o2(0xB7,0x9F),      o2(0xB7,0xA0),
-          o2(0xB8,0x41),      o2(0xB8,0x42),
-          o2(0xB8,0x43),      o2(0xB8,0x44),
-          o2(0xB8,0x45),      o2(0xB8,0x46),
-          o2(0xB8,0x47),      o2(0xB8,0x48),
-          o2(0xC5,0xEF),      o2(0xB8,0x49),
-          o2(0xB8,0x4A),      o2(0xB8,0x4B),
-          o2(0xB8,0x4C),      o2(0xB8,0x4D),
-          o2(0xB8,0x4E),      o2(0xB8,0x4F),
-          o2(0xB8,0x50),      o2(0xB8,0x51),
-          o2(0xB8,0x52),      o2(0xB8,0x53),
-          o2(0xB8,0x54),      o2(0xB8,0x55),
-          o2(0xB8,0x56),      o2(0xB8,0x57),
-          o2(0xB8,0x58),      o2(0xB8,0x59),
-          o2(0xB8,0x5A),      o2(0xB8,0x61),
-          o2(0xB8,0x62),      o2(0xB8,0x63),
-          o2(0xB8,0x64),      o2(0xB8,0x65),
-          o2(0xB8,0x66),      o2(0xB8,0x67),
-          o2(0xB8,0x68),      o2(0xB8,0x69),
-          o2(0xC5,0xF0),      o2(0xB8,0x6A),
-          o2(0xB8,0x6B),      o2(0xB8,0x6C),
-          o2(0xC5,0xF1),      o2(0xB8,0x6D),
-          o2(0xB8,0x6E),      o2(0xB8,0x6F),
-          o2(0xB8,0x70),      o2(0xB8,0x71),
-          o2(0xB8,0x72),      o2(0xB8,0x73),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_07 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_07_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_08_infos[65] = {
-          o2(0xB8,0x74),      o2(0xB8,0x75),
-          o2(0xB8,0x76),      o2(0xB8,0x77),
-          o2(0xB8,0x78),      o2(0xB8,0x79),
-          o2(0xB8,0x7A),      o2(0xC5,0xF2),
-          o2(0xB8,0x81),      o2(0xC5,0xF3),
-          o2(0xB8,0x82),      o2(0xB8,0x83),
-          o2(0xB8,0x84),      o2(0xB8,0x85),
-          o2(0xB8,0x86),      o2(0xB8,0x87),
-          o2(0xC5,0xF4),      o2(0xB8,0x88),
-          o2(0xB8,0x89),      o2(0xB8,0x8A),
-          o2(0xB8,0x8B),      o2(0xB8,0x8C),
-          o2(0xB8,0x8D),      o2(0xB8,0x8E),
-          o2(0xB8,0x8F),      o2(0xB8,0x90),
-          o2(0xB8,0x91),      o2(0xB8,0x92),
-          o2(0xB8,0x93),      o2(0xB8,0x94),
-          o2(0xB8,0x95),      o2(0xB8,0x96),
-          o2(0xB8,0x97),      o2(0xB8,0x98),
-          o2(0xB8,0x99),      o2(0xB8,0x9A),
-          o2(0xB8,0x9B),      o2(0xB8,0x9C),
-          o2(0xB8,0x9D),      o2(0xB8,0x9E),
-          o2(0xB8,0x9F),      o2(0xB8,0xA0),
-          o2(0xB9,0x41),      o2(0xB9,0x42),
-          o2(0xC5,0xF5),      o2(0xC5,0xF6),
-          o2(0xB9,0x43),      o2(0xB9,0x44),
-          o2(0xC5,0xF7),      o2(0xB9,0x45),
-          o2(0xB9,0x46),      o2(0xB9,0x47),
-          o2(0xC5,0xF8),      o2(0xB9,0x48),
-          o2(0xB9,0x49),      o2(0xB9,0x4A),
-          o2(0xB9,0x4B),      o2(0xB9,0x4C),
-          o2(0xB9,0x4D),      o2(0xB9,0x4E),
-          o2(0xC5,0xF9),      o2(0xC5,0xFA),
-          o2(0xB9,0x4F),      o2(0xC5,0xFB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_08 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_08_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_09_infos[65] = {
-          o2(0xB9,0x50),      o2(0xC5,0xFC),
-          o2(0xB9,0x51),      o2(0xB9,0x52),
-          o2(0xB9,0x53),      o2(0xB9,0x54),
-          o2(0xB9,0x55),      o2(0xB9,0x56),
-          o2(0xC5,0xFD),      o2(0xB9,0x57),
-          o2(0xB9,0x58),      o2(0xB9,0x59),
-          o2(0xB9,0x5A),      o2(0xB9,0x61),
-          o2(0xB9,0x62),      o2(0xB9,0x63),
-          o2(0xB9,0x64),      o2(0xB9,0x65),
-          o2(0xB9,0x66),      o2(0xB9,0x67),
-          o2(0xB9,0x68),      o2(0xB9,0x69),
-          o2(0xB9,0x6A),      o2(0xB9,0x6B),
-          o2(0xB9,0x6C),      o2(0xB9,0x6D),
-          o2(0xB9,0x6E),      o2(0xB9,0x6F),
-          o2(0xC5,0xFE),      o2(0xB9,0x70),
-          o2(0xB9,0x71),      o2(0xB9,0x72),
-          o2(0xB9,0x73),      o2(0xB9,0x74),
-          o2(0xB9,0x75),      o2(0xB9,0x76),
-          o2(0xC6,0xA1),      o2(0xB9,0x77),
-          o2(0xB9,0x78),      o2(0xB9,0x79),
-          o2(0xB9,0x7A),      o2(0xB9,0x81),
-          o2(0xB9,0x82),      o2(0xB9,0x83),
-          o2(0xB9,0x84),      o2(0xB9,0x85),
-          o2(0xB9,0x86),      o2(0xB9,0x87),
-          o2(0xB9,0x88),      o2(0xB9,0x89),
-          o2(0xB9,0x8A),      o2(0xB9,0x8B),
-          o2(0xB9,0x8C),      o2(0xB9,0x8D),
-          o2(0xB9,0x8E),      o2(0xB9,0x8F),
-          o2(0xB9,0x90),      o2(0xB9,0x91),
-          o2(0xB9,0x92),      o2(0xB9,0x93),
-          o2(0xB9,0x94),      o2(0xB9,0x95),
-          o2(0xB9,0x96),      o2(0xB9,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_09 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_09_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0A_infos[65] = {
-          o2(0xC6,0xA2),      o2(0xC6,0xA3),
-          o2(0xB9,0x98),      o2(0xB9,0x99),
-          o2(0xC6,0xA4),      o2(0xB9,0x9A),
-          o2(0xB9,0x9B),      o2(0xB9,0x9C),
-          o2(0xC6,0xA5),      o2(0xB9,0x9D),
-          o2(0xB9,0x9E),      o2(0xB9,0x9F),
-          o2(0xB9,0xA0),      o2(0xBA,0x41),
-          o2(0xBA,0x42),      o2(0xBA,0x43),
-          o2(0xC6,0xA6),      o2(0xC6,0xA7),
-          o2(0xBA,0x44),      o2(0xBA,0x45),
-          o2(0xBA,0x46),      o2(0xC6,0xA8),
-          o2(0xBA,0x47),      o2(0xBA,0x48),
-          o2(0xBA,0x49),      o2(0xBA,0x4A),
-          o2(0xBA,0x4B),      o2(0xBA,0x4C),
-          o2(0xC6,0xA9),      o2(0xBA,0x4D),
-          o2(0xBA,0x4E),      o2(0xBA,0x4F),
-          o2(0xC6,0xAA),      o2(0xBA,0x50),
-          o2(0xBA,0x51),      o2(0xBA,0x52),
-          o2(0xC6,0xAB),      o2(0xBA,0x53),
-          o2(0xBA,0x54),      o2(0xBA,0x55),
-          o2(0xBA,0x56),      o2(0xBA,0x57),
-          o2(0xBA,0x58),      o2(0xBA,0x59),
-          o2(0xC6,0xAC),      o2(0xBA,0x5A),
-          o2(0xBA,0x61),      o2(0xBA,0x62),
-          o2(0xBA,0x63),      o2(0xC6,0xAD),
-          o2(0xBA,0x64),      o2(0xBA,0x65),
-          o2(0xBA,0x66),      o2(0xBA,0x67),
-          o2(0xBA,0x68),      o2(0xBA,0x69),
-          o2(0xC6,0xAE),      o2(0xC6,0xAF),
-          o2(0xBA,0x6A),      o2(0xBA,0x6B),
-          o2(0xC6,0xB0),      o2(0xBA,0x6C),
-          o2(0xBA,0x6D),      o2(0xC6,0xB1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0B_infos[65] = {
-          o2(0xC6,0xB2),      o2(0xBA,0x6E),
-          o2(0xC6,0xB3),      o2(0xBA,0x6F),
-          o2(0xBA,0x70),      o2(0xBA,0x71),
-          o2(0xBA,0x72),      o2(0xBA,0x73),
-          o2(0xC6,0xB4),      o2(0xC6,0xB5),
-          o2(0xBA,0x74),      o2(0xC6,0xB6),
-          o2(0xBA,0x75),      o2(0xBA,0x76),
-          o2(0xBA,0x77),      o2(0xBA,0x78),
-          o2(0xBA,0x79),      o2(0xBA,0x7A),
-          o2(0xBA,0x81),      o2(0xBA,0x82),
-          o2(0xC6,0xB7),      o2(0xBA,0x83),
-          o2(0xBA,0x84),      o2(0xBA,0x85),
-          o2(0xC6,0xB8),      o2(0xBA,0x86),
-          o2(0xBA,0x87),      o2(0xBA,0x88),
-          o2(0xC6,0xB9),      o2(0xBA,0x89),
-          o2(0xBA,0x8A),      o2(0xBA,0x8B),
-          o2(0xBA,0x8C),      o2(0xBA,0x8D),
-          o2(0xBA,0x8E),      o2(0xBA,0x8F),
-          o2(0xC6,0xBA),      o2(0xC6,0xBB),
-          o2(0xBA,0x90),      o2(0xBA,0x91),
-          o2(0xBA,0x92),      o2(0xBA,0x93),
-          o2(0xBA,0x94),      o2(0xBA,0x95),
-          o2(0xBA,0x96),      o2(0xBA,0x97),
-          o2(0xBA,0x98),      o2(0xBA,0x99),
-          o2(0xC6,0xBC),      o2(0xC6,0xBD),
-          o2(0xBA,0x9A),      o2(0xBA,0x9B),
-          o2(0xC6,0xBE),      o2(0xBA,0x9C),
-          o2(0xBA,0x9D),      o2(0xBA,0x9E),
-          o2(0xC6,0xBF),      o2(0xBA,0x9F),
-          o2(0xBA,0xA0),      o2(0xBB,0x41),
-          o2(0xBB,0x42),      o2(0xBB,0x43),
-          o2(0xBB,0x44),      o2(0xBB,0x45),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0C_infos[65] = {
-          o2(0xC6,0xC0),      o2(0xC6,0xC1),
-          o2(0xBB,0x46),      o2(0xC6,0xC2),
-          o2(0xBB,0x47),      o2(0xC6,0xC3),
-          o2(0xBB,0x48),      o2(0xBB,0x49),
-          o2(0xBB,0x4A),      o2(0xBB,0x4B),
-          o2(0xBB,0x4C),      o2(0xBB,0x4D),
-          o2(0xC6,0xC4),      o2(0xC6,0xC5),
-          o2(0xC6,0xC6),      o2(0xBB,0x4E),
-          o2(0xC6,0xC7),      o2(0xBB,0x4F),
-          o2(0xBB,0x50),      o2(0xBB,0x51),
-          o2(0xC6,0xC8),      o2(0xBB,0x52),
-          o2(0xC6,0xC9),      o2(0xBB,0x53),
-          o2(0xBB,0x54),      o2(0xBB,0x55),
-          o2(0xBB,0x56),      o2(0xBB,0x57),
-          o2(0xC6,0xCA),      o2(0xC6,0xCB),
-          o2(0xBB,0x58),      o2(0xC6,0xCC),
-          o2(0xC6,0xCD),      o2(0xC6,0xCE),
-          o2(0xBB,0x59),      o2(0xBB,0x5A),
-          o2(0xBB,0x61),      o2(0xC6,0xCF),
-          o2(0xBB,0x62),      o2(0xBB,0x63),
-          o2(0xC6,0xD0),      o2(0xC6,0xD1),
-          o2(0xBB,0x64),      o2(0xBB,0x65),
-          o2(0xC6,0xD2),      o2(0xBB,0x66),
-          o2(0xBB,0x67),      o2(0xBB,0x68),
-          o2(0xC6,0xD3),      o2(0xBB,0x69),
-          o2(0xBB,0x6A),      o2(0xBB,0x6B),
-          o2(0xBB,0x6C),      o2(0xBB,0x6D),
-          o2(0xBB,0x6E),      o2(0xBB,0x6F),
-          o2(0xC6,0xD4),      o2(0xC6,0xD5),
-          o2(0xBB,0x70),      o2(0xC6,0xD6),
-          o2(0xC6,0xD7),      o2(0xC6,0xD8),
-          o2(0xBB,0x71),      o2(0xBB,0x72),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0D_infos[65] = {
-          o2(0xBB,0x73),      o2(0xBB,0x74),
-          o2(0xBB,0x75),      o2(0xBB,0x76),
-          o2(0xC6,0xD9),      o2(0xC6,0xDA),
-          o2(0xBB,0x77),      o2(0xBB,0x78),
-          o2(0xBB,0x79),      o2(0xBB,0x7A),
-          o2(0xBB,0x81),      o2(0xBB,0x82),
-          o2(0xBB,0x83),      o2(0xBB,0x84),
-          o2(0xBB,0x85),      o2(0xBB,0x86),
-          o2(0xBB,0x87),      o2(0xBB,0x88),
-          o2(0xBB,0x89),      o2(0xBB,0x8A),
-          o2(0xBB,0x8B),      o2(0xBB,0x8C),
-          o2(0xBB,0x8D),      o2(0xBB,0x8E),
-          o2(0xBB,0x8F),      o2(0xBB,0x90),
-          o2(0xBB,0x91),      o2(0xBB,0x92),
-          o2(0xBB,0x93),      o2(0xBB,0x94),
-          o2(0xBB,0x95),      o2(0xBB,0x96),
-          o2(0xBB,0x97),      o2(0xBB,0x98),
-          o2(0xBB,0x99),      o2(0xBB,0x9A),
-          o2(0xBB,0x9B),      o2(0xBB,0x9C),
-          o2(0xBB,0x9D),      o2(0xBB,0x9E),
-          o2(0xBB,0x9F),      o2(0xBB,0xA0),
-          o2(0xBC,0x41),      o2(0xBC,0x42),
-          o2(0xBC,0x43),      o2(0xBC,0x44),
-          o2(0xBC,0x45),      o2(0xBC,0x46),
-          o2(0xBC,0x47),      o2(0xBC,0x48),
-          o2(0xBC,0x49),      o2(0xBC,0x4A),
-          o2(0xBC,0x4B),      o2(0xBC,0x4C),
-          o2(0xBC,0x4D),      o2(0xBC,0x4E),
-          o2(0xBC,0x4F),      o2(0xBC,0x50),
-          o2(0xBC,0x51),      o2(0xBC,0x52),
-          o2(0xC6,0xDB),      o2(0xC6,0xDC),
-          o2(0xBC,0x53),      o2(0xBC,0x54),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0E_infos[65] = {
-          o2(0xC6,0xDD),      o2(0xBC,0x55),
-          o2(0xBC,0x56),      o2(0xBC,0x57),
-          o2(0xC6,0xDE),      o2(0xBC,0x58),
-          o2(0xBC,0x59),      o2(0xBC,0x5A),
-          o2(0xBC,0x61),      o2(0xBC,0x62),
-          o2(0xBC,0x63),      o2(0xBC,0x64),
-          o2(0xC6,0xDF),      o2(0xC6,0xE0),
-          o2(0xBC,0x65),      o2(0xC6,0xE1),
-          o2(0xC6,0xE2),      o2(0xC6,0xE3),
-          o2(0xBC,0x66),      o2(0xBC,0x67),
-          o2(0xBC,0x68),      o2(0xBC,0x69),
-          o2(0xBC,0x6A),      o2(0xBC,0x6B),
-          o2(0xC6,0xE4),      o2(0xC6,0xE5),
-          o2(0xBC,0x6C),      o2(0xBC,0x6D),
-          o2(0xC6,0xE6),      o2(0xBC,0x6E),
-          o2(0xBC,0x6F),      o2(0xBC,0x70),
-          o2(0xC6,0xE7),      o2(0xBC,0x71),
-          o2(0xBC,0x72),      o2(0xBC,0x73),
-          o2(0xBC,0x74),      o2(0xBC,0x75),
-          o2(0xBC,0x76),      o2(0xBC,0x77),
-          o2(0xC6,0xE8),      o2(0xC6,0xE9),
-          o2(0xBC,0x78),      o2(0xC6,0xEA),
-          o2(0xBC,0x79),      o2(0xC6,0xEB),
-          o2(0xBC,0x7A),      o2(0xBC,0x81),
-          o2(0xBC,0x82),      o2(0xBC,0x83),
-          o2(0xBC,0x84),      o2(0xBC,0x85),
-          o2(0xC6,0xEC),      o2(0xBC,0x86),
-          o2(0xBC,0x87),      o2(0xBC,0x88),
-          o2(0xC6,0xED),      o2(0xBC,0x89),
-          o2(0xBC,0x8A),      o2(0xBC,0x8B),
-          o2(0xC6,0xEE),      o2(0xBC,0x8C),
-          o2(0xBC,0x8D),      o2(0xBC,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0E = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_0F_infos[65] = {
-          o2(0xBC,0x8F),      o2(0xBC,0x90),
-          o2(0xBC,0x91),      o2(0xBC,0x92),
-          o2(0xC6,0xEF),      o2(0xC6,0xF0),
-          o2(0xBC,0x93),      o2(0xBC,0x94),
-          o2(0xC6,0xF1),      o2(0xC6,0xF2),
-          o2(0xBC,0x95),      o2(0xBC,0x96),
-          o2(0xBC,0x97),      o2(0xBC,0x98),
-          o2(0xBC,0x99),      o2(0xBC,0x9A),
-          o2(0xC6,0xF3),      o2(0xBC,0x9B),
-          o2(0xBC,0x9C),      o2(0xBC,0x9D),
-          o2(0xBC,0x9E),      o2(0xBC,0x9F),
-          o2(0xBC,0xA0),      o2(0xBD,0x41),
-          o2(0xC6,0xF4),      o2(0xBD,0x42),
-          o2(0xBD,0x43),      o2(0xBD,0x44),
-          o2(0xBD,0x45),      o2(0xBD,0x46),
-          o2(0xBD,0x47),      o2(0xBD,0x48),
-          o2(0xBD,0x49),      o2(0xC6,0xF5),
-          o2(0xBD,0x4A),      o2(0xC6,0xF6),
-          o2(0xBD,0x4B),      o2(0xBD,0x4C),
-          o2(0xBD,0x4D),      o2(0xBD,0x4E),
-          o2(0xBD,0x4F),      o2(0xBD,0x50),
-          o2(0xBD,0x51),      o2(0xBD,0x52),
-          o2(0xC6,0xF7),      o2(0xC6,0xF8),
-          o2(0xBD,0x53),      o2(0xBD,0x54),
-          o2(0xC6,0xF9),      o2(0xBD,0x55),
-          o2(0xBD,0x56),      o2(0xBD,0x57),
-          o2(0xC6,0xFA),      o2(0xBD,0x58),
-          o2(0xBD,0x59),      o2(0xBD,0x5A),
-          o2(0xBD,0x61),      o2(0xBD,0x62),
-          o2(0xBD,0x63),      o2(0xBD,0x64),
-          o2(0xC6,0xFB),      o2(0xC6,0xFC),
-          o2(0xBD,0x65),      o2(0xC6,0xFD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_0F = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_0F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_10_infos[65] = {
-          o2(0xBD,0x66),      o2(0xC6,0xFE),
-          o2(0xBD,0x67),      o2(0xBD,0x68),
-          o2(0xBD,0x69),      o2(0xBD,0x6A),
-          o2(0xBD,0x6B),      o2(0xBD,0x6C),
-          o2(0xC7,0xA1),      o2(0xBD,0x6D),
-          o2(0xBD,0x6E),      o2(0xBD,0x6F),
-          o2(0xBD,0x70),      o2(0xBD,0x71),
-          o2(0xBD,0x72),      o2(0xBD,0x73),
-          o2(0xBD,0x74),      o2(0xBD,0x75),
-          o2(0xBD,0x76),      o2(0xBD,0x77),
-          o2(0xBD,0x78),      o2(0xBD,0x79),
-          o2(0xBD,0x7A),      o2(0xBD,0x81),
-          o2(0xBD,0x82),      o2(0xBD,0x83),
-          o2(0xBD,0x84),      o2(0xBD,0x85),
-          o2(0xBD,0x86),      o2(0xC7,0xA2),
-          o2(0xBD,0x87),      o2(0xBD,0x88),
-          o2(0xBD,0x89),      o2(0xBD,0x8A),
-          o2(0xBD,0x8B),      o2(0xBD,0x8C),
-          o2(0xBD,0x8D),      o2(0xBD,0x8E),
-          o2(0xBD,0x8F),      o2(0xBD,0x90),
-          o2(0xBD,0x91),      o2(0xBD,0x92),
-          o2(0xBD,0x93),      o2(0xBD,0x94),
-          o2(0xBD,0x95),      o2(0xBD,0x96),
-          o2(0xBD,0x97),      o2(0xBD,0x98),
-          o2(0xBD,0x99),      o2(0xBD,0x9A),
-          o2(0xBD,0x9B),      o2(0xBD,0x9C),
-          o2(0xBD,0x9D),      o2(0xBD,0x9E),
-          o2(0xBD,0x9F),      o2(0xBD,0xA0),
-          o2(0xBE,0x41),      o2(0xBE,0x42),
-          o2(0xBE,0x43),      o2(0xBE,0x44),
-          o2(0xBE,0x45),      o2(0xBE,0x46),
-          o2(0xBE,0x47),      o2(0xBE,0x48),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_10 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_10_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_11_infos[65] = {
-          o2(0xC7,0xA3),      o2(0xBE,0x49),
-          o2(0xBE,0x4A),      o2(0xBE,0x4B),
-          o2(0xC7,0xA4),      o2(0xBE,0x4C),
-          o2(0xBE,0x4D),      o2(0xBE,0x4E),
-          o2(0xBE,0x4F),      o2(0xBE,0x50),
-          o2(0xBE,0x51),      o2(0xBE,0x52),
-          o2(0xBE,0x53),      o2(0xBE,0x54),
-          o2(0xBE,0x55),      o2(0xBE,0x56),
-          o2(0xBE,0x57),      o2(0xBE,0x58),
-          o2(0xBE,0x59),      o2(0xBE,0x5A),
-          o2(0xBE,0x61),      o2(0xBE,0x62),
-          o2(0xBE,0x63),      o2(0xBE,0x64),
-          o2(0xBE,0x65),      o2(0xBE,0x66),
-          o2(0xBE,0x67),      o2(0xBE,0x68),
-          o2(0xC7,0xA5),      o2(0xBE,0x69),
-          o2(0xBE,0x6A),      o2(0xBE,0x6B),
-          o2(0xC7,0xA6),      o2(0xBE,0x6C),
-          o2(0xBE,0x6D),      o2(0xBE,0x6E),
-          o2(0xC7,0xA7),      o2(0xBE,0x6F),
-          o2(0xBE,0x70),      o2(0xBE,0x71),
-          o2(0xBE,0x72),      o2(0xBE,0x73),
-          o2(0xBE,0x74),      o2(0xBE,0x75),
-          o2(0xBE,0x76),      o2(0xC7,0xA8),
-          o2(0xBE,0x77),      o2(0xC7,0xA9),
-          o2(0xBE,0x78),      o2(0xBE,0x79),
-          o2(0xBE,0x7A),      o2(0xBE,0x81),
-          o2(0xBE,0x82),      o2(0xBE,0x83),
-          o2(0xBE,0x84),      o2(0xBE,0x85),
-          o2(0xC7,0xAA),      o2(0xC7,0xAB),
-          o2(0xBE,0x86),      o2(0xBE,0x87),
-          o2(0xC7,0xAC),      o2(0xBE,0x88),
-          o2(0xBE,0x89),      o2(0xC7,0xAD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_11 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_11_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_12_infos[65] = {
-          o2(0xC7,0xAE),      o2(0xBE,0x8A),
-          o2(0xC7,0xAF),      o2(0xBE,0x8B),
-          o2(0xBE,0x8C),      o2(0xBE,0x8D),
-          o2(0xBE,0x8E),      o2(0xBE,0x8F),
-          o2(0xC7,0xB0),      o2(0xC7,0xB1),
-          o2(0xBE,0x90),      o2(0xC7,0xB2),
-          o2(0xBE,0x91),      o2(0xC7,0xB3),
-          o2(0xBE,0x92),      o2(0xBE,0x93),
-          o2(0xBE,0x94),      o2(0xBE,0x95),
-          o2(0xBE,0x96),      o2(0xBE,0x97),
-          o2(0xC7,0xB4),      o2(0xBE,0x98),
-          o2(0xBE,0x99),      o2(0xBE,0x9A),
-          o2(0xBE,0x9B),      o2(0xBE,0x9C),
-          o2(0xBE,0x9D),      o2(0xBE,0x9E),
-          o2(0xBE,0x9F),      o2(0xBE,0xA0),
-          o2(0xBF,0x41),      o2(0xBF,0x42),
-          o2(0xBF,0x43),      o2(0xBF,0x44),
-          o2(0xBF,0x45),      o2(0xBF,0x46),
-          o2(0xBF,0x47),      o2(0xBF,0x48),
-          o2(0xBF,0x49),      o2(0xBF,0x4A),
-          o2(0xBF,0x4B),      o2(0xC7,0xB5),
-          o2(0xBF,0x4C),      o2(0xBF,0x4D),
-          o2(0xBF,0x4E),      o2(0xBF,0x4F),
-          o2(0xBF,0x50),      o2(0xBF,0x51),
-          o2(0xBF,0x52),      o2(0xBF,0x53),
-          o2(0xBF,0x54),      o2(0xBF,0x55),
-          o2(0xBF,0x56),      o2(0xBF,0x57),
-          o2(0xBF,0x58),      o2(0xBF,0x59),
-          o2(0xBF,0x5A),      o2(0xBF,0x61),
-          o2(0xBF,0x62),      o2(0xBF,0x63),
-          o2(0xBF,0x64),      o2(0xBF,0x65),
-          o2(0xBF,0x66),      o2(0xBF,0x67),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_12 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_12_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_13_infos[65] = {
-          o2(0xBF,0x68),      o2(0xBF,0x69),
-          o2(0xBF,0x6A),      o2(0xBF,0x6B),
-          o2(0xBF,0x6C),      o2(0xBF,0x6D),
-          o2(0xBF,0x6E),      o2(0xBF,0x6F),
-          o2(0xBF,0x70),      o2(0xBF,0x71),
-          o2(0xBF,0x72),      o2(0xBF,0x73),
-          o2(0xC7,0xB6),      o2(0xBF,0x74),
-          o2(0xBF,0x75),      o2(0xBF,0x76),
-          o2(0xC7,0xB7),      o2(0xBF,0x77),
-          o2(0xBF,0x78),      o2(0xBF,0x79),
-          o2(0xC7,0xB8),      o2(0xBF,0x7A),
-          o2(0xBF,0x81),      o2(0xBF,0x82),
-          o2(0xBF,0x83),      o2(0xBF,0x84),
-          o2(0xBF,0x85),      o2(0xBF,0x86),
-          o2(0xC7,0xB9),      o2(0xBF,0x87),
-          o2(0xBF,0x88),      o2(0xC7,0xBA),
-          o2(0xBF,0x89),      o2(0xBF,0x8A),
-          o2(0xBF,0x8B),      o2(0xBF,0x8C),
-          o2(0xBF,0x8D),      o2(0xBF,0x8E),
-          o2(0xBF,0x8F),      o2(0xBF,0x90),
-          o2(0xC7,0xBB),      o2(0xBF,0x91),
-          o2(0xBF,0x92),      o2(0xBF,0x93),
-          o2(0xC7,0xBC),      o2(0xBF,0x94),
-          o2(0xBF,0x95),      o2(0xBF,0x96),
-          o2(0xC7,0xBD),      o2(0xBF,0x97),
-          o2(0xBF,0x98),      o2(0xBF,0x99),
-          o2(0xBF,0x9A),      o2(0xBF,0x9B),
-          o2(0xBF,0x9C),      o2(0xBF,0x9D),
-          o2(0xC7,0xBE),      o2(0xBF,0x9E),
-          o2(0xBF,0x9F),      o2(0xC7,0xBF),
-          o2(0xBF,0xA0),      o2(0xC7,0xC0),
-          o2(0xC0,0x41),      o2(0xC0,0x42),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_13 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_13_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_14_infos[65] = {
-          o2(0xC0,0x43),      o2(0xC0,0x44),
-          o2(0xC0,0x45),      o2(0xC0,0x46),
-          o2(0xC7,0xC1),      o2(0xC0,0x47),
-          o2(0xC0,0x48),      o2(0xC0,0x49),
-          o2(0xC7,0xC2),      o2(0xC0,0x4A),
-          o2(0xC0,0x4B),      o2(0xC0,0x4C),
-          o2(0xC7,0xC3),      o2(0xC0,0x4D),
-          o2(0xC0,0x4E),      o2(0xC0,0x4F),
-          o2(0xC0,0x50),      o2(0xC0,0x51),
-          o2(0xC0,0x52),      o2(0xC0,0x53),
-          o2(0xC7,0xC4),      o2(0xC7,0xC5),
-          o2(0xC0,0x54),      o2(0xC7,0xC6),
-          o2(0xC0,0x55),      o2(0xC0,0x56),
-          o2(0xC0,0x57),      o2(0xC0,0x58),
-          o2(0xC0,0x59),      o2(0xC0,0x5A),
-          o2(0xC0,0x61),      o2(0xC0,0x62),
-          o2(0xC0,0x63),      o2(0xC0,0x64),
-          o2(0xC0,0x65),      o2(0xC0,0x66),
-          o2(0xC0,0x67),      o2(0xC0,0x68),
-          o2(0xC0,0x69),      o2(0xC0,0x6A),
-          o2(0xC0,0x6B),      o2(0xC0,0x6C),
-          o2(0xC0,0x6D),      o2(0xC0,0x6E),
-          o2(0xC0,0x6F),      o2(0xC0,0x70),
-          o2(0xC0,0x71),      o2(0xC0,0x72),
-          o2(0xC0,0x73),      o2(0xC0,0x74),
-          o2(0xC0,0x75),      o2(0xC0,0x76),
-          o2(0xC0,0x77),      o2(0xC0,0x78),
-          o2(0xC0,0x79),      o2(0xC0,0x7A),
-          o2(0xC0,0x81),      o2(0xC0,0x82),
-          o2(0xC0,0x83),      o2(0xC0,0x84),
-          o2(0xC7,0xC7),      o2(0xC7,0xC8),
-          o2(0xC0,0x85),      o2(0xC0,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_14 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_14_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_15_infos[65] = {
-          o2(0xC7,0xC9),      o2(0xC0,0x87),
-          o2(0xC0,0x88),      o2(0xC0,0x89),
-          o2(0xC7,0xCA),      o2(0xC0,0x8A),
-          o2(0xC0,0x8B),      o2(0xC0,0x8C),
-          o2(0xC0,0x8D),      o2(0xC0,0x8E),
-          o2(0xC0,0x8F),      o2(0xC0,0x90),
-          o2(0xC7,0xCB),      o2(0xC7,0xCC),
-          o2(0xC0,0x91),      o2(0xC7,0xCD),
-          o2(0xC0,0x92),      o2(0xC7,0xCE),
-          o2(0xC0,0x93),      o2(0xC0,0x94),
-          o2(0xC0,0x95),      o2(0xC0,0x96),
-          o2(0xC0,0x97),      o2(0xC0,0x98),
-          o2(0xC7,0xCF),      o2(0xC7,0xD0),
-          o2(0xC0,0x99),      o2(0xC0,0x9A),
-          o2(0xC7,0xD1),      o2(0xC0,0x9B),
-          o2(0xC0,0x9C),      o2(0xC0,0x9D),
-          o2(0xC7,0xD2),      o2(0xC0,0x9E),
-          o2(0xC0,0x9F),      o2(0xC0,0xA0),
-          o2(0xC1,0x41),      o2(0xC7,0xD3),
-          o2(0xC1,0x42),      o2(0xC1,0x43),
-          o2(0xC7,0xD4),      o2(0xC7,0xD5),
-          o2(0xC1,0x44),      o2(0xC7,0xD6),
-          o2(0xC1,0x45),      o2(0xC7,0xD7),
-          o2(0xC1,0x46),      o2(0xC1,0x47),
-          o2(0xC1,0x48),      o2(0xC1,0x49),
-          o2(0xC1,0x4A),      o2(0xC1,0x4B),
-          o2(0xC7,0xD8),      o2(0xC7,0xD9),
-          o2(0xC1,0x4C),      o2(0xC1,0x4D),
-          o2(0xC7,0xDA),      o2(0xC1,0x4E),
-          o2(0xC1,0x4F),      o2(0xC1,0x50),
-          o2(0xC7,0xDB),      o2(0xC1,0x51),
-          o2(0xC1,0x52),      o2(0xC1,0x53),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_15 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_15_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_16_infos[65] = {
-          o2(0xC1,0x54),      o2(0xC1,0x55),
-          o2(0xC1,0x56),      o2(0xC1,0x57),
-          o2(0xC7,0xDC),      o2(0xC7,0xDD),
-          o2(0xC1,0x58),      o2(0xC7,0xDE),
-          o2(0xC7,0xDF),      o2(0xC7,0xE0),
-          o2(0xC1,0x59),      o2(0xC1,0x5A),
-          o2(0xC1,0x61),      o2(0xC1,0x62),
-          o2(0xC1,0x63),      o2(0xC1,0x64),
-          o2(0xC7,0xE1),      o2(0xC1,0x65),
-          o2(0xC1,0x66),      o2(0xC1,0x67),
-          o2(0xC1,0x68),      o2(0xC1,0x69),
-          o2(0xC1,0x6A),      o2(0xC1,0x6B),
-          o2(0xC1,0x6C),      o2(0xC1,0x6D),
-          o2(0xC1,0x6E),      o2(0xC1,0x6F),
-          o2(0xC1,0x70),      o2(0xC1,0x71),
-          o2(0xC1,0x72),      o2(0xC1,0x73),
-          o2(0xC1,0x74),      o2(0xC1,0x75),
-          o2(0xC1,0x76),      o2(0xC1,0x77),
-          o2(0xC1,0x78),      o2(0xC7,0xE2),
-          o2(0xC1,0x79),      o2(0xC1,0x7A),
-          o2(0xC1,0x81),      o2(0xC1,0x82),
-          o2(0xC1,0x83),      o2(0xC1,0x84),
-          o2(0xC1,0x85),      o2(0xC1,0x86),
-          o2(0xC1,0x87),      o2(0xC1,0x88),
-          o2(0xC1,0x89),      o2(0xC1,0x8A),
-          o2(0xC1,0x8B),      o2(0xC1,0x8C),
-          o2(0xC1,0x8D),      o2(0xC1,0x8E),
-          o2(0xC1,0x8F),      o2(0xC1,0x90),
-          o2(0xC1,0x91),      o2(0xC1,0x92),
-          o2(0xC1,0x93),      o2(0xC1,0x94),
-          o2(0xC1,0x95),      o2(0xC1,0x96),
-          o2(0xC1,0x97),      o2(0xC1,0x98),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_16 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_16_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_17_infos[65] = {
-          o2(0xC1,0x99),      o2(0xC1,0x9A),
-          o2(0xC1,0x9B),      o2(0xC1,0x9C),
-          o2(0xC1,0x9D),      o2(0xC1,0x9E),
-          o2(0xC1,0x9F),      o2(0xC1,0xA0),
-          o2(0xC7,0xE3),      o2(0xC7,0xE4),
-          o2(0xC2,0x41),      o2(0xC2,0x42),
-          o2(0xC7,0xE5),      o2(0xC2,0x43),
-          o2(0xC2,0x44),      o2(0xC2,0x45),
-          o2(0xC7,0xE6),      o2(0xC2,0x46),
-          o2(0xC7,0xE7),      o2(0xC2,0x47),
-          o2(0xC2,0x48),      o2(0xC2,0x49),
-          o2(0xC2,0x4A),      o2(0xC2,0x4B),
-          o2(0xC7,0xE8),      o2(0xC7,0xE9),
-          o2(0xC2,0x4C),      o2(0xC7,0xEA),
-          o2(0xC2,0x4D),      o2(0xC7,0xEB),
-          o2(0xC2,0x4E),      o2(0xC2,0x4F),
-          o2(0xC2,0x50),      o2(0xC2,0x51),
-          o2(0xC2,0x52),      o2(0xC2,0x53),
-          o2(0xC7,0xEC),      o2(0xC7,0xED),
-          o2(0xC2,0x54),      o2(0xC2,0x55),
-          o2(0xC7,0xEE),      o2(0xC2,0x56),
-          o2(0xC2,0x57),      o2(0xC2,0x58),
-          o2(0xC7,0xEF),      o2(0xC2,0x59),
-          o2(0xC2,0x5A),      o2(0xC2,0x61),
-          o2(0xC2,0x62),      o2(0xC2,0x63),
-          o2(0xC2,0x64),      o2(0xC2,0x65),
-          o2(0xC7,0xF0),      o2(0xC7,0xF1),
-          o2(0xC2,0x66),      o2(0xC7,0xF2),
-          o2(0xC2,0x67),      o2(0xC7,0xF3),
-          o2(0xC2,0x68),      o2(0xC2,0x69),
-          o2(0xC2,0x6A),      o2(0xC2,0x6B),
-          o2(0xC2,0x6C),      o2(0xC2,0x6D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_17 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_17_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_18_infos[65] = {
-          o2(0xC7,0xF4),      o2(0xC7,0xF5),
-          o2(0xC2,0x6E),      o2(0xC2,0x6F),
-          o2(0xC7,0xF6),      o2(0xC2,0x70),
-          o2(0xC2,0x71),      o2(0xC2,0x72),
-          o2(0xC7,0xF7),      o2(0xC2,0x73),
-          o2(0xC2,0x74),      o2(0xC2,0x75),
-          o2(0xC2,0x76),      o2(0xC2,0x77),
-          o2(0xC2,0x78),      o2(0xC2,0x79),
-          o2(0xC7,0xF8),      o2(0xC7,0xF9),
-          o2(0xC2,0x7A),      o2(0xC7,0xFA),
-          o2(0xC7,0xFB),      o2(0xC7,0xFC),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC7,0xFD),      o2(0xC2,0x87),
-          o2(0xC2,0x88),      o2(0xC2,0x89),
-          o2(0xC7,0xFE),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC8,0xA1),      o2(0xC2,0x8D),
-          o2(0xC2,0x8E),      o2(0xC2,0x8F),
-          o2(0xC2,0x90),      o2(0xC2,0x91),
-          o2(0xC2,0x92),      o2(0xC2,0x93),
-          o2(0xC2,0x94),      o2(0xC8,0xA2),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC8,0xA3),      o2(0xC8,0xA4),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-          o2(0xC8,0xA5),      o2(0xC3,0x41),
-          o2(0xC3,0x42),      o2(0xC3,0x43),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_18 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_18_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_19_infos[65] = {
-          o2(0xC8,0xA6),      o2(0xC3,0x44),
-          o2(0xC3,0x45),      o2(0xC3,0x46),
-          o2(0xC3,0x47),      o2(0xC8,0xA7),
-          o2(0xC3,0x48),      o2(0xC3,0x49),
-          o2(0xC8,0xA8),      o2(0xC8,0xA9),
-          o2(0xC3,0x4A),      o2(0xC8,0xAA),
-          o2(0xC3,0x4B),      o2(0xC8,0xAB),
-          o2(0xC3,0x4C),      o2(0xC3,0x4D),
-          o2(0xC3,0x4E),      o2(0xC8,0xAC),
-          o2(0xC3,0x4F),      o2(0xC3,0x50),
-          o2(0xC8,0xAD),      o2(0xC8,0xAE),
-          o2(0xC3,0x51),      o2(0xC3,0x52),
-          o2(0xC8,0xAF),      o2(0xC3,0x53),
-          o2(0xC3,0x54),      o2(0xC3,0x55),
-          o2(0xC8,0xB0),      o2(0xC3,0x56),
-          o2(0xC3,0x57),      o2(0xC3,0x58),
-          o2(0xC3,0x59),      o2(0xC3,0x5A),
-          o2(0xC3,0x61),      o2(0xC3,0x62),
-          o2(0xC3,0x63),      o2(0xC3,0x64),
-          o2(0xC3,0x65),      o2(0xC8,0xB1),
-          o2(0xC3,0x66),      o2(0xC8,0xB2),
-          o2(0xC3,0x67),      o2(0xC3,0x68),
-          o2(0xC3,0x69),      o2(0xC3,0x6A),
-          o2(0xC3,0x6B),      o2(0xC3,0x6C),
-          o2(0xC8,0xB3),      o2(0xC8,0xB4),
-          o2(0xC3,0x6D),      o2(0xC3,0x6E),
-          o2(0xC8,0xB5),      o2(0xC3,0x6F),
-          o2(0xC3,0x70),      o2(0xC3,0x71),
-          o2(0xC3,0x72),      o2(0xC3,0x73),
-          o2(0xC3,0x74),      o2(0xC3,0x75),
-          o2(0xC3,0x76),      o2(0xC3,0x77),
-          o2(0xC3,0x78),      o2(0xC3,0x79),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_19 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_19_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_1A_infos[65] = {
-          o2(0xC3,0x7A),      o2(0xC3,0x81),
-          o2(0xC3,0x82),      o2(0xC8,0xB6),
-          o2(0xC3,0x83),      o2(0xC8,0xB7),
-          o2(0xC3,0x84),      o2(0xC3,0x85),
-          o2(0xC3,0x86),      o2(0xC3,0x87),
-          o2(0xC3,0x88),      o2(0xC3,0x89),
-          o2(0xC8,0xB8),      o2(0xC8,0xB9),
-          o2(0xC3,0x8A),      o2(0xC3,0x8B),
-          o2(0xC8,0xBA),      o2(0xC3,0x8C),
-          o2(0xC3,0x8D),      o2(0xC3,0x8E),
-          o2(0xC8,0xBB),      o2(0xC3,0x8F),
-          o2(0xC3,0x90),      o2(0xC3,0x91),
-          o2(0xC3,0x92),      o2(0xC3,0x93),
-          o2(0xC3,0x94),      o2(0xC3,0x95),
-          o2(0xC3,0x96),      o2(0xC8,0xBC),
-          o2(0xC3,0x97),      o2(0xC8,0xBD),
-          o2(0xC3,0x98),      o2(0xC8,0xBE),
-          o2(0xC3,0x99),      o2(0xC3,0x9A),
-          o2(0xC3,0x9B),      o2(0xC3,0x9C),
-          o2(0xC3,0x9D),      o2(0xC3,0x9E),
-          o2(0xC8,0xBF),      o2(0xC3,0x9F),
-          o2(0xC3,0xA0),      o2(0xC4,0x41),
-          o2(0xC8,0xC0),      o2(0xC4,0x42),
-          o2(0xC4,0x43),      o2(0xC4,0x44),
-          o2(0xC8,0xC1),      o2(0xC4,0x45),
-          o2(0xC4,0x46),      o2(0xC4,0x47),
-          o2(0xC4,0x48),      o2(0xC4,0x49),
-          o2(0xC4,0x4A),      o2(0xC4,0x4B),
-          o2(0xC4,0x4C),      o2(0xC8,0xC2),
-          o2(0xC4,0x4D),      o2(0xC8,0xC3),
-          o2(0xC4,0x4E),      o2(0xC4,0x4F),
-          o2(0xC4,0x50),      o2(0xC4,0x51),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_1A = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_1A_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_1B_infos[65] = {
-          o2(0xC4,0x52),      o2(0xC4,0x53),
-          o2(0xC4,0x54),      o2(0xC4,0x55),
-          o2(0xC8,0xC4),      o2(0xC8,0xC5),
-          o2(0xC4,0x56),      o2(0xC4,0x57),
-          o2(0xC8,0xC6),      o2(0xC4,0x58),
-          o2(0xC4,0x59),      o2(0xC4,0x5A),
-          o2(0xC8,0xC7),      o2(0xC4,0x61),
-          o2(0xC4,0x62),      o2(0xC4,0x63),
-          o2(0xC4,0x64),      o2(0xC8,0xC8),
-          o2(0xC4,0x65),      o2(0xC4,0x66),
-          o2(0xC8,0xC9),      o2(0xC4,0x67),
-          o2(0xC4,0x68),      o2(0xC8,0xCA),
-          o2(0xC4,0x69),      o2(0xC8,0xCB),
-          o2(0xC4,0x6A),      o2(0xC4,0x6B),
-          o2(0xC4,0x6C),      o2(0xC4,0x6D),
-          o2(0xC4,0x6E),      o2(0xC4,0x6F),
-          o2(0xC8,0xCC),      o2(0xC4,0x70),
-          o2(0xC4,0x71),      o2(0xC4,0x72),
-          o2(0xC8,0xCD),      o2(0xC4,0x73),
-          o2(0xC4,0x74),      o2(0xC4,0x75),
-          o2(0xC8,0xCE),      o2(0xC4,0x76),
-          o2(0xC4,0x77),      o2(0xC4,0x78),
-          o2(0xC4,0x79),      o2(0xC4,0x7A),
-          o2(0xC4,0x81),      o2(0xC4,0x82),
-          o2(0xC8,0xCF),      o2(0xC4,0x83),
-          o2(0xC4,0x84),      o2(0xC4,0x85),
-          o2(0xC4,0x86),      o2(0xC8,0xD0),
-          o2(0xC4,0x87),      o2(0xC4,0x88),
-          o2(0xC4,0x89),      o2(0xC4,0x8A),
-          o2(0xC4,0x8B),      o2(0xC4,0x8C),
-          o2(0xC8,0xD1),      o2(0xC8,0xD2),
-          o2(0xC4,0x8D),      o2(0xC4,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_1B = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_1B_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_1C_infos[65] = {
-          o2(0xC8,0xD3),      o2(0xC4,0x8F),
-          o2(0xC4,0x90),      o2(0xC4,0x91),
-          o2(0xC8,0xD4),      o2(0xC4,0x92),
-          o2(0xC4,0x93),      o2(0xC4,0x94),
-          o2(0xC4,0x95),      o2(0xC4,0x96),
-          o2(0xC4,0x97),      o2(0xC4,0x98),
-          o2(0xC4,0x99),      o2(0xC4,0x9A),
-          o2(0xC4,0x9B),      o2(0xC4,0x9C),
-          o2(0xC4,0x9D),      o2(0xC8,0xD5),
-          o2(0xC4,0x9E),      o2(0xC4,0x9F),
-          o2(0xC4,0xA0),      o2(0xC5,0x41),
-          o2(0xC5,0x42),      o2(0xC5,0x43),
-          o2(0xC8,0xD6),      o2(0xC8,0xD7),
-          o2(0xC5,0x44),      o2(0xC5,0x45),
-          o2(0xC8,0xD8),      o2(0xC5,0x46),
-          o2(0xC5,0x47),      o2(0xC5,0x48),
-          o2(0xC8,0xD9),      o2(0xC5,0x49),
-          o2(0xC5,0x4A),      o2(0xC5,0x4B),
-          o2(0xC5,0x4C),      o2(0xC5,0x4D),
-          o2(0xC5,0x4E),      o2(0xC5,0x4F),
-          o2(0xC8,0xDA),      o2(0xC8,0xDB),
-          o2(0xC5,0x50),      o2(0xC8,0xDC),
-          o2(0xC5,0x51),      o2(0xC8,0xDD),
-          o2(0xC5,0x52),      o2(0xC5,0x53),
-          o2(0xC5,0x54),      o2(0xC5,0x55),
-          o2(0xC5,0x56),      o2(0xC5,0x57),
-          o2(0xC8,0xDE),      o2(0xC8,0xDF),
-          o2(0xC5,0x58),      o2(0xC5,0x59),
-          o2(0xC8,0xE0),      o2(0xC5,0x5A),
-          o2(0xC5,0x61),      o2(0xC5,0x62),
-          o2(0xC8,0xE1),      o2(0xC5,0x63),
-          o2(0xC5,0x64),      o2(0xC5,0x65),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_1C = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_1C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_1D_infos[65] = {
-          o2(0xC5,0x66),      o2(0xC5,0x67),
-          o2(0xC5,0x68),      o2(0xC5,0x69),
-          o2(0xC8,0xE2),      o2(0xC5,0x6A),
-          o2(0xC5,0x6B),      o2(0xC8,0xE3),
-          o2(0xC5,0x6C),      o2(0xC8,0xE4),
-          o2(0xC5,0x6D),      o2(0xC5,0x6E),
-          o2(0xC5,0x6F),      o2(0xC5,0x70),
-          o2(0xC5,0x71),      o2(0xC5,0x72),
-          o2(0xC8,0xE5),      o2(0xC8,0xE6),
-          o2(0xC5,0x73),      o2(0xC5,0x74),
-          o2(0xC8,0xE7),      o2(0xC5,0x75),
-          o2(0xC8,0xE8),      o2(0xC8,0xE9),
-          o2(0xC8,0xEA),      o2(0xC8,0xEB),
-          o2(0xC5,0x76),      o2(0xC5,0x77),
-          o2(0xC5,0x78),      o2(0xC5,0x79),
-          o2(0xC5,0x7A),      o2(0xC5,0x81),
-          o2(0xC8,0xEC),      o2(0xC8,0xED),
-          o2(0xC5,0x82),      o2(0xC8,0xEE),
-          o2(0xC5,0x83),      o2(0xC8,0xEF),
-          o2(0xC5,0x84),      o2(0xC5,0x85),
-          o2(0xC5,0x86),      o2(0xC8,0xF0),
-          o2(0xC5,0x87),      o2(0xC5,0x88),
-          o2(0xC8,0xF1),      o2(0xC5,0x89),
-          o2(0xC5,0x8A),      o2(0xC5,0x8B),
-          o2(0xC8,0xF2),      o2(0xC5,0x8C),
-          o2(0xC5,0x8D),      o2(0xC5,0x8E),
-          o2(0xC8,0xF3),      o2(0xC5,0x8F),
-          o2(0xC5,0x90),      o2(0xC5,0x91),
-          o2(0xC5,0x92),      o2(0xC5,0x93),
-          o2(0xC5,0x94),      o2(0xC5,0x95),
-          o2(0xC8,0xF4),      o2(0xC8,0xF5),
-          o2(0xC5,0x96),      o2(0xC5,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_1D = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_ED_1D_infos
-};
-
-static const unsigned char
-to_CP949_ED_1E_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 36, 36, 36,     36, 36, 36, 36, 36, 36, 36, 36,
-     36, 36, 36, 36, 36, 36, 36, 36,     36, 36, 36, 36, 36, 36, 36, 36,
-};
-
-static const struct byte_lookup* const
-to_CP949_ED_1E_infos[37] = {
-          o2(0xC5,0x98),      o2(0xC8,0xF6),
-          o2(0xC5,0x99),      o2(0xC5,0x9A),
-          o2(0xC5,0x9B),      o2(0xC5,0x9C),
-          o2(0xC5,0x9D),      o2(0xC5,0x9E),
-          o2(0xC8,0xF7),      o2(0xC8,0xF8),
-          o2(0xC5,0x9F),      o2(0xC5,0xA0),
-          o2(0xC8,0xF9),      o2(0xC6,0x41),
-          o2(0xC6,0x42),      o2(0xC6,0x43),
-          o2(0xC8,0xFA),      o2(0xC6,0x44),
-          o2(0xC6,0x45),      o2(0xC6,0x46),
-          o2(0xC6,0x47),      o2(0xC6,0x48),
-          o2(0xC6,0x49),      o2(0xC6,0x4A),
-          o2(0xC8,0xFB),      o2(0xC8,0xFC),
-          o2(0xC6,0x4B),      o2(0xC8,0xFD),
-          o2(0xC6,0x4C),      o2(0xC8,0xFE),
-          o2(0xC6,0x4D),      o2(0xC6,0x4E),
-          o2(0xC6,0x4F),      o2(0xC6,0x50),
-          o2(0xC6,0x51),      o2(0xC6,0x52),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED_1E = {
-    to_CP949_ED_1E_offsets,
-    to_CP949_ED_1E_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_ED_infos[32] = {
-        &to_CP949_ED_00,    &to_CP949_ED_01,
-        &to_CP949_ED_02,    &to_CP949_ED_03,
-        &to_CP949_ED_04,    &to_CP949_ED_05,
-        &to_CP949_ED_06,    &to_CP949_ED_07,
-        &to_CP949_ED_08,    &to_CP949_ED_09,
-        &to_CP949_ED_0A,    &to_CP949_ED_0B,
-        &to_CP949_ED_0C,    &to_CP949_ED_0D,
-        &to_CP949_ED_0E,    &to_CP949_ED_0F,
-        &to_CP949_ED_10,    &to_CP949_ED_11,
-        &to_CP949_ED_12,    &to_CP949_ED_13,
-        &to_CP949_ED_14,    &to_CP949_ED_15,
-        &to_CP949_ED_16,    &to_CP949_ED_17,
-        &to_CP949_ED_18,    &to_CP949_ED_19,
-        &to_CP949_ED_1A,    &to_CP949_ED_1B,
-        &to_CP949_ED_1C,    &to_CP949_ED_1D,
-        &to_CP949_ED_1E,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_ED = {
-    to_EUC_KR_ED_offsets,
-    to_CP949_ED_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_24_infos[65] = {
-          o2(0xCB,0xD0),      o2(0xCB,0xD6),
-          o2(0xCB,0xE7),      o2(0xCD,0xCF),
-          o2(0xCD,0xE8),      o2(0xCE,0xAD),
-          o2(0xCF,0xFB),      o2(0xD0,0xA2),
-          o2(0xD0,0xB8),      o2(0xD0,0xD0),
-          o2(0xD0,0xDD),      o2(0xD1,0xD4),
-          o2(0xD1,0xD5),      o2(0xD1,0xD8),
-          o2(0xD1,0xDB),      o2(0xD1,0xDC),
-          o2(0xD1,0xDD),      o2(0xD1,0xDE),
-          o2(0xD1,0xDF),      o2(0xD1,0xE0),
-          o2(0xD1,0xE2),      o2(0xD1,0xE3),
-          o2(0xD1,0xE4),      o2(0xD1,0xE5),
-          o2(0xD1,0xE6),      o2(0xD1,0xE8),
-          o2(0xD1,0xE9),      o2(0xD1,0xEA),
-          o2(0xD1,0xEB),      o2(0xD1,0xED),
-          o2(0xD1,0xEF),      o2(0xD1,0xF0),
-          o2(0xD1,0xF2),      o2(0xD1,0xF6),
-          o2(0xD1,0xFA),      o2(0xD1,0xFC),
-          o2(0xD1,0xFD),      o2(0xD1,0xFE),
-          o2(0xD2,0xA2),      o2(0xD2,0xA3),
-          o2(0xD2,0xA7),      o2(0xD2,0xA8),
-          o2(0xD2,0xA9),      o2(0xD2,0xAA),
-          o2(0xD2,0xAB),      o2(0xD2,0xAD),
-          o2(0xD2,0xB2),      o2(0xD2,0xBE),
-          o2(0xD2,0xC2),      o2(0xD2,0xC3),
-          o2(0xD2,0xC4),      o2(0xD2,0xC6),
-          o2(0xD2,0xC7),      o2(0xD2,0xC8),
-          o2(0xD2,0xC9),      o2(0xD2,0xCA),
-          o2(0xD2,0xCB),      o2(0xD2,0xCD),
-          o2(0xD2,0xCE),      o2(0xD2,0xCF),
-          o2(0xD2,0xD0),      o2(0xD2,0xD1),
-          o2(0xD2,0xD2),      o2(0xD2,0xD3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_24 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EF_24_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_25_infos[65] = {
-          o2(0xD2,0xD4),      o2(0xD2,0xD5),
-          o2(0xD2,0xD6),      o2(0xD2,0xD7),
-          o2(0xD2,0xD9),      o2(0xD2,0xDA),
-          o2(0xD2,0xDE),      o2(0xD2,0xDF),
-          o2(0xD2,0xE1),      o2(0xD2,0xE2),
-          o2(0xD2,0xE4),      o2(0xD2,0xE5),
-          o2(0xD2,0xE6),      o2(0xD2,0xE7),
-          o2(0xD2,0xE8),      o2(0xD2,0xE9),
-          o2(0xD2,0xEA),      o2(0xD2,0xEB),
-          o2(0xD2,0xF0),      o2(0xD2,0xF1),
-          o2(0xD2,0xF2),      o2(0xD2,0xF3),
-          o2(0xD2,0xF4),      o2(0xD2,0xF5),
-          o2(0xD2,0xF7),      o2(0xD2,0xF8),
-          o2(0xD4,0xE6),      o2(0xD4,0xFC),
-          o2(0xD5,0xA5),      o2(0xD5,0xAB),
-          o2(0xD5,0xAE),      o2(0xD6,0xB8),
-          o2(0xD6,0xCD),      o2(0xD7,0xCB),
-          o2(0xD7,0xE4),      o2(0xDB,0xC5),
-          o2(0xDB,0xE4),      o2(0xDC,0xA5),
-          o2(0xDD,0xA5),      o2(0xDD,0xD5),
-          o2(0xDD,0xF4),      o2(0xDE,0xFC),
-          o2(0xDE,0xFE),      o2(0xDF,0xB3),
-          o2(0xDF,0xE1),      o2(0xDF,0xE8),
-          o2(0xE0,0xF1),      o2(0xE1,0xAD),
-          o2(0xE1,0xED),      o2(0xE3,0xF5),
-          o2(0xE4,0xA1),      o2(0xE4,0xA9),
-          o2(0xE5,0xAE),      o2(0xE5,0xB1),
-          o2(0xE5,0xB2),      o2(0xE5,0xB9),
-          o2(0xE5,0xBB),      o2(0xE5,0xBC),
-          o2(0xE5,0xC4),      o2(0xE5,0xCE),
-          o2(0xE5,0xD0),      o2(0xE5,0xD2),
-          o2(0xE5,0xD6),      o2(0xE5,0xFA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_25 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EF_25_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_26_infos[65] = {
-          o2(0xE5,0xFB),      o2(0xE5,0xFC),
-          o2(0xE5,0xFE),      o2(0xE6,0xA1),
-          o2(0xE6,0xA4),      o2(0xE6,0xA7),
-          o2(0xE6,0xAD),      o2(0xE6,0xAF),
-          o2(0xE6,0xB0),      o2(0xE6,0xB1),
-          o2(0xE6,0xB3),      o2(0xE6,0xB7),
-          o2(0xE6,0xB8),      o2(0xE6,0xBC),
-          o2(0xE6,0xC4),      o2(0xE6,0xC6),
-          o2(0xE6,0xC7),      o2(0xE6,0xCA),
-          o2(0xE6,0xD2),      o2(0xE6,0xD6),
-          o2(0xE6,0xD9),      o2(0xE6,0xDC),
-          o2(0xE6,0xDF),      o2(0xE6,0xE1),
-          o2(0xE6,0xE4),      o2(0xE6,0xE5),
-          o2(0xE6,0xE6),      o2(0xE6,0xE8),
-          o2(0xE6,0xEA),      o2(0xE6,0xEB),
-          o2(0xE6,0xEC),      o2(0xE6,0xEF),
-          o2(0xE6,0xF1),      o2(0xE6,0xF2),
-          o2(0xE6,0xF5),      o2(0xE6,0xF6),
-          o2(0xE6,0xF7),      o2(0xE6,0xF9),
-          o2(0xE7,0xA1),      o2(0xE7,0xA6),
-          o2(0xE7,0xA9),      o2(0xE7,0xAA),
-          o2(0xE7,0xAC),      o2(0xE7,0xAD),
-          o2(0xE7,0xB0),      o2(0xE7,0xBF),
-          o2(0xE7,0xC1),      o2(0xE7,0xC6),
-          o2(0xE7,0xC7),      o2(0xE7,0xCB),
-          o2(0xE7,0xCD),      o2(0xE7,0xCF),
-          o2(0xE7,0xD0),      o2(0xE7,0xD3),
-          o2(0xE7,0xDF),      o2(0xE7,0xE4),
-          o2(0xE7,0xE6),      o2(0xE7,0xF7),
-          o2(0xE8,0xE7),      o2(0xE8,0xE8),
-          o2(0xE8,0xF0),      o2(0xE8,0xF1),
-          o2(0xE8,0xF7),      o2(0xE8,0xF9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_26 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EF_26_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_27_infos[65] = {
-          o2(0xE8,0xFB),      o2(0xE8,0xFE),
-          o2(0xE9,0xA7),      o2(0xE9,0xAC),
-          o2(0xE9,0xCC),      o2(0xE9,0xF7),
-          o2(0xEA,0xC1),      o2(0xEA,0xE5),
-          o2(0xEA,0xF4),      o2(0xEA,0xF7),
-          o2(0xEA,0xFC),      o2(0xEA,0xFE),
-          o2(0xEB,0xA4),      o2(0xEB,0xA7),
-          o2(0xEB,0xA9),      o2(0xEB,0xAA),
-          o2(0xEB,0xBA),      o2(0xEB,0xBB),
-          o2(0xEB,0xBD),      o2(0xEB,0xC1),
-          o2(0xEB,0xC2),      o2(0xEB,0xC6),
-          o2(0xEB,0xC7),      o2(0xEB,0xCC),
-          o2(0xEB,0xCF),      o2(0xEB,0xD0),
-          o2(0xEB,0xD1),      o2(0xEB,0xD2),
-          o2(0xEB,0xD8),      o2(0xEC,0xA6),
-          o2(0xEC,0xA7),      o2(0xEC,0xAA),
-          o2(0xEC,0xAF),      o2(0xEC,0xB0),
-          o2(0xEC,0xB1),      o2(0xEC,0xB2),
-          o2(0xEC,0xB5),      o2(0xEC,0xB8),
-          o2(0xEC,0xBA),      o2(0xEC,0xC0),
-          o2(0xEC,0xC1),      o2(0xEC,0xC5),
-          o2(0xEC,0xC6),      o2(0xEC,0xC9),
-          o2(0xEC,0xCA),      o2(0xEC,0xD5),
-          o2(0xEC,0xDD),      o2(0xEC,0xDE),
-          o2(0xEC,0xE1),      o2(0xEC,0xE4),
-          o2(0xEC,0xE7),      o2(0xEC,0xE8),
-          o2(0xEC,0xF7),      o2(0xEC,0xF8),
-          o2(0xEC,0xFA),      o2(0xED,0xA1),
-          o2(0xED,0xA2),      o2(0xED,0xA3),
-          o2(0xED,0xEE),      o2(0xEE,0xDB),
-          o2(0xF2,0xBD),      o2(0xF2,0xFA),
-          o2(0xF3,0xB1),      o2(0xF4,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_27 = {
-    to_EUC_KR_E3_05_offsets,
-    to_CP949_EF_27_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_28_infos[13] = {
-          o2(0xF4,0xEE),      o2(0xF6,0xF4),
-          o2(0xF6,0xF6),      o2(0xF7,0xB8),
-          o2(0xF7,0xC8),      o2(0xF7,0xD3),
-          o2(0xF8,0xDB),      o2(0xF8,0xF0),
-          o2(0xFA,0xA1),      o2(0xFA,0xA2),
-          o2(0xFA,0xE6),      o2(0xFC,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_28 = {
-    to_EUC_KR_E2_15_offsets,
-    to_CP949_EF_28_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_3C_infos[64] = {
-          o2(0xA3,0xA1),      o2(0xA3,0xA2),
-          o2(0xA3,0xA3),      o2(0xA3,0xA4),
-          o2(0xA3,0xA5),      o2(0xA3,0xA6),
-          o2(0xA3,0xA7),      o2(0xA3,0xA8),
-          o2(0xA3,0xA9),      o2(0xA3,0xAA),
-          o2(0xA3,0xAB),      o2(0xA3,0xAC),
-          o2(0xA3,0xAD),      o2(0xA3,0xAE),
-          o2(0xA3,0xAF),      o2(0xA3,0xB0),
-          o2(0xA3,0xB1),      o2(0xA3,0xB2),
-          o2(0xA3,0xB3),      o2(0xA3,0xB4),
-          o2(0xA3,0xB5),      o2(0xA3,0xB6),
-          o2(0xA3,0xB7),      o2(0xA3,0xB8),
-          o2(0xA3,0xB9),      o2(0xA3,0xBA),
-          o2(0xA3,0xBB),      o2(0xA3,0xBC),
-          o2(0xA3,0xBD),      o2(0xA3,0xBE),
-          o2(0xA3,0xBF),      o2(0xA3,0xC0),
-          o2(0xA3,0xC1),      o2(0xA3,0xC2),
-          o2(0xA3,0xC3),      o2(0xA3,0xC4),
-          o2(0xA3,0xC5),      o2(0xA3,0xC6),
-          o2(0xA3,0xC7),      o2(0xA3,0xC8),
-          o2(0xA3,0xC9),      o2(0xA3,0xCA),
-          o2(0xA3,0xCB),      o2(0xA3,0xCC),
-          o2(0xA3,0xCD),      o2(0xA3,0xCE),
-          o2(0xA3,0xCF),      o2(0xA3,0xD0),
-          o2(0xA3,0xD1),      o2(0xA3,0xD2),
-          o2(0xA3,0xD3),      o2(0xA3,0xD4),
-          o2(0xA3,0xD5),      o2(0xA3,0xD6),
-          o2(0xA3,0xD7),      o2(0xA3,0xD8),
-          o2(0xA3,0xD9),      o2(0xA3,0xDA),
-          o2(0xA3,0xDB),      o2(0xA1,0xAC),
-          o2(0xA3,0xDD),      o2(0xA3,0xDE),
-          o2(0xA3,0xDF),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_3C = {
-    to_EUC_KR_E3_01_offsets,
-    to_CP949_EF_3C_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_3D_infos[32] = {
-          o2(0xA3,0xE0),      o2(0xA3,0xE1),
-          o2(0xA3,0xE2),      o2(0xA3,0xE3),
-          o2(0xA3,0xE4),      o2(0xA3,0xE5),
-          o2(0xA3,0xE6),      o2(0xA3,0xE7),
-          o2(0xA3,0xE8),      o2(0xA3,0xE9),
-          o2(0xA3,0xEA),      o2(0xA3,0xEB),
-          o2(0xA3,0xEC),      o2(0xA3,0xED),
-          o2(0xA3,0xEE),      o2(0xA3,0xEF),
-          o2(0xA3,0xF0),      o2(0xA3,0xF1),
-          o2(0xA3,0xF2),      o2(0xA3,0xF3),
-          o2(0xA3,0xF4),      o2(0xA3,0xF5),
-          o2(0xA3,0xF6),      o2(0xA3,0xF7),
-          o2(0xA3,0xF8),      o2(0xA3,0xF9),
-          o2(0xA3,0xFA),      o2(0xA3,0xFB),
-          o2(0xA3,0xFC),      o2(0xA3,0xFD),
-          o2(0xA2,0xA6),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_3D = {
-    to_EUC_KR_ED_offsets,
-    to_CP949_EF_3D_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_3F_infos[7] = {
-          o2(0xA1,0xCB),      o2(0xA1,0xCC),
-          o2(0xA1,0xFE),      o2(0xA3,0xFE),
-          o2(0xA1,0xCD),      o2(0xA3,0xDC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF_3F = {
-    to_EUC_KR_EF_3F_offsets,
-    to_CP949_EF_3F_infos
-};
-
-
-static const struct byte_lookup* const
-to_CP949_EF_infos[9] = {
-        &to_CP949_EF_24,    &to_CP949_EF_25,
-        &to_CP949_EF_26,    &to_CP949_EF_27,
-        &to_CP949_EF_28,    &to_CP949_EF_3C,
-        &to_CP949_EF_3D,    &to_CP949_EF_3F,
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949_EF = {
-    to_EUC_KR_EF_offsets,
-    to_CP949_EF_infos
-};
-
-static const unsigned char
-to_CP949_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23,  1,  2,  3,  4, 23, 23,     23, 23, 23,  5, 23, 23,  6,  7,
-      8,  9, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-     23, 23, 10, 11, 12, 13, 14, 15,     16, 17, 18, 19, 20, 21, 23, 22,
-     23, 23, 23, 23, 23, 23, 23, 23,     23, 23, 23, 23, 23, 23, 23, 23,
-};
-
-static const struct byte_lookup* const
-to_CP949_infos[24] = {
-                  NOMAP,       &to_CP949_C2,
-           &to_CP949_C3,       &to_CP949_C4,
-           &to_CP949_C5,       &to_CP949_CB,
-           &to_CP949_CE,       &to_CP949_CF,
-           &to_CP949_D0,       &to_CP949_D1,
-           &to_CP949_E2,       &to_CP949_E3,
-           &to_CP949_E4,       &to_CP949_E5,
-           &to_CP949_E6,       &to_CP949_E7,
-           &to_CP949_E8,       &to_CP949_E9,
-           &to_CP949_EA,       &to_CP949_EB,
-           &to_CP949_EC,       &to_CP949_ED,
-           &to_CP949_EF,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-to_CP949 = {
-    to_CP949_offsets,
-    to_CP949_infos
-};
-
-static const unsigned char
-from_CP949_81_offsets[256] = {
-    178,178,178,178,178,178,178,178,    178,178,178,178,178,178,178,178,
-    178,178,178,178,178,178,178,178,    178,178,178,178,178,178,178,178,
-    178,178,178,178,178,178,178,178,    178,178,178,178,178,178,178,178,
-    178,178,178,178,178,178,178,178,    178,178,178,178,178,178,178,178,
-    178,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,178,178,178,178,178,
-    178, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,178,178,178,178,178,
-    178, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,153,154,    155,156,157,158,159,160,161,162,
-    163,164,165,166,167,168,169,170,    171,172,173,174,175,176,177,178,
-};
-
-static const struct byte_lookup* const
-from_CP949_81_infos[179] = {
-     o3(0xEA,0xB0,0x82), o3(0xEA,0xB0,0x83),
-     o3(0xEA,0xB0,0x85), o3(0xEA,0xB0,0x86),
-     o3(0xEA,0xB0,0x8B), o3(0xEA,0xB0,0x8C),
-     o3(0xEA,0xB0,0x8D), o3(0xEA,0xB0,0x8E),
-     o3(0xEA,0xB0,0x8F), o3(0xEA,0xB0,0x98),
-     o3(0xEA,0xB0,0x9E), o3(0xEA,0xB0,0x9F),
-     o3(0xEA,0xB0,0xA1), o3(0xEA,0xB0,0xA2),
-     o3(0xEA,0xB0,0xA3), o3(0xEA,0xB0,0xA5),
-     o3(0xEA,0xB0,0xA6), o3(0xEA,0xB0,0xA7),
-     o3(0xEA,0xB0,0xA8), o3(0xEA,0xB0,0xA9),
-     o3(0xEA,0xB0,0xAA), o3(0xEA,0xB0,0xAB),
-     o3(0xEA,0xB0,0xAE), o3(0xEA,0xB0,0xB2),
-     o3(0xEA,0xB0,0xB3), o3(0xEA,0xB0,0xB4),
-     o3(0xEA,0xB0,0xB5), o3(0xEA,0xB0,0xB6),
-     o3(0xEA,0xB0,0xB7), o3(0xEA,0xB0,0xBA),
-     o3(0xEA,0xB0,0xBB), o3(0xEA,0xB0,0xBD),
-     o3(0xEA,0xB0,0xBE), o3(0xEA,0xB0,0xBF),
-     o3(0xEA,0xB1,0x81), o3(0xEA,0xB1,0x82),
-     o3(0xEA,0xB1,0x83), o3(0xEA,0xB1,0x84),
-     o3(0xEA,0xB1,0x85), o3(0xEA,0xB1,0x86),
-     o3(0xEA,0xB1,0x87), o3(0xEA,0xB1,0x88),
-     o3(0xEA,0xB1,0x89), o3(0xEA,0xB1,0x8A),
-     o3(0xEA,0xB1,0x8C), o3(0xEA,0xB1,0x8E),
-     o3(0xEA,0xB1,0x8F), o3(0xEA,0xB1,0x90),
-     o3(0xEA,0xB1,0x91), o3(0xEA,0xB1,0x92),
-     o3(0xEA,0xB1,0x93), o3(0xEA,0xB1,0x95),
-     o3(0xEA,0xB1,0x96), o3(0xEA,0xB1,0x97),
-     o3(0xEA,0xB1,0x99), o3(0xEA,0xB1,0x9A),
-     o3(0xEA,0xB1,0x9B), o3(0xEA,0xB1,0x9D),
-     o3(0xEA,0xB1,0x9E), o3(0xEA,0xB1,0x9F),
-     o3(0xEA,0xB1,0xA0), o3(0xEA,0xB1,0xA1),
-     o3(0xEA,0xB1,0xA2), o3(0xEA,0xB1,0xA3),
-     o3(0xEA,0xB1,0xA4), o3(0xEA,0xB1,0xA5),
-     o3(0xEA,0xB1,0xA6), o3(0xEA,0xB1,0xA7),
-     o3(0xEA,0xB1,0xA8), o3(0xEA,0xB1,0xA9),
-     o3(0xEA,0xB1,0xAA), o3(0xEA,0xB1,0xAB),
-     o3(0xEA,0xB1,0xAC), o3(0xEA,0xB1,0xAD),
-     o3(0xEA,0xB1,0xAE), o3(0xEA,0xB1,0xAF),
-     o3(0xEA,0xB1,0xB2), o3(0xEA,0xB1,0xB3),
-     o3(0xEA,0xB1,0xB5), o3(0xEA,0xB1,0xB6),
-     o3(0xEA,0xB1,0xB9), o3(0xEA,0xB1,0xBB),
-     o3(0xEA,0xB1,0xBC), o3(0xEA,0xB1,0xBD),
-     o3(0xEA,0xB1,0xBE), o3(0xEA,0xB1,0xBF),
-     o3(0xEA,0xB2,0x82), o3(0xEA,0xB2,0x87),
-     o3(0xEA,0xB2,0x88), o3(0xEA,0xB2,0x8D),
-     o3(0xEA,0xB2,0x8E), o3(0xEA,0xB2,0x8F),
-     o3(0xEA,0xB2,0x91), o3(0xEA,0xB2,0x92),
-     o3(0xEA,0xB2,0x93), o3(0xEA,0xB2,0x95),
-     o3(0xEA,0xB2,0x96), o3(0xEA,0xB2,0x97),
-     o3(0xEA,0xB2,0x98), o3(0xEA,0xB2,0x99),
-     o3(0xEA,0xB2,0x9A), o3(0xEA,0xB2,0x9B),
-     o3(0xEA,0xB2,0x9E), o3(0xEA,0xB2,0xA2),
-     o3(0xEA,0xB2,0xA3), o3(0xEA,0xB2,0xA4),
-     o3(0xEA,0xB2,0xA5), o3(0xEA,0xB2,0xA6),
-     o3(0xEA,0xB2,0xA7), o3(0xEA,0xB2,0xAB),
-     o3(0xEA,0xB2,0xAD), o3(0xEA,0xB2,0xAE),
-     o3(0xEA,0xB2,0xB1), o3(0xEA,0xB2,0xB2),
-     o3(0xEA,0xB2,0xB3), o3(0xEA,0xB2,0xB4),
-     o3(0xEA,0xB2,0xB5), o3(0xEA,0xB2,0xB6),
-     o3(0xEA,0xB2,0xB7), o3(0xEA,0xB2,0xBA),
-     o3(0xEA,0xB2,0xBE), o3(0xEA,0xB2,0xBF),
-     o3(0xEA,0xB3,0x80), o3(0xEA,0xB3,0x82),
-     o3(0xEA,0xB3,0x83), o3(0xEA,0xB3,0x85),
-     o3(0xEA,0xB3,0x86), o3(0xEA,0xB3,0x87),
-     o3(0xEA,0xB3,0x89), o3(0xEA,0xB3,0x8A),
-     o3(0xEA,0xB3,0x8B), o3(0xEA,0xB3,0x8D),
-     o3(0xEA,0xB3,0x8E), o3(0xEA,0xB3,0x8F),
-     o3(0xEA,0xB3,0x90), o3(0xEA,0xB3,0x91),
-     o3(0xEA,0xB3,0x92), o3(0xEA,0xB3,0x93),
-     o3(0xEA,0xB3,0x94), o3(0xEA,0xB3,0x96),
-     o3(0xEA,0xB3,0x98), o3(0xEA,0xB3,0x99),
-     o3(0xEA,0xB3,0x9A), o3(0xEA,0xB3,0x9B),
-     o3(0xEA,0xB3,0x9C), o3(0xEA,0xB3,0x9D),
-     o3(0xEA,0xB3,0x9E), o3(0xEA,0xB3,0x9F),
-     o3(0xEA,0xB3,0xA2), o3(0xEA,0xB3,0xA3),
-     o3(0xEA,0xB3,0xA5), o3(0xEA,0xB3,0xA6),
-     o3(0xEA,0xB3,0xA9), o3(0xEA,0xB3,0xAB),
-     o3(0xEA,0xB3,0xAD), o3(0xEA,0xB3,0xAE),
-     o3(0xEA,0xB3,0xB2), o3(0xEA,0xB3,0xB4),
-     o3(0xEA,0xB3,0xB7), o3(0xEA,0xB3,0xB8),
-     o3(0xEA,0xB3,0xB9), o3(0xEA,0xB3,0xBA),
-     o3(0xEA,0xB3,0xBB), o3(0xEA,0xB3,0xBE),
-     o3(0xEA,0xB3,0xBF), o3(0xEA,0xB4,0x81),
-     o3(0xEA,0xB4,0x82), o3(0xEA,0xB4,0x83),
-     o3(0xEA,0xB4,0x85), o3(0xEA,0xB4,0x87),
-     o3(0xEA,0xB4,0x88), o3(0xEA,0xB4,0x89),
-     o3(0xEA,0xB4,0x8A), o3(0xEA,0xB4,0x8B),
-     o3(0xEA,0xB4,0x8E), o3(0xEA,0xB4,0x90),
-     o3(0xEA,0xB4,0x92), o3(0xEA,0xB4,0x93),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_81 = {
-    from_CP949_81_offsets,
-    from_CP949_81_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_82_infos[179] = {
-     o3(0xEA,0xB4,0x94), o3(0xEA,0xB4,0x95),
-     o3(0xEA,0xB4,0x96), o3(0xEA,0xB4,0x97),
-     o3(0xEA,0xB4,0x99), o3(0xEA,0xB4,0x9A),
-     o3(0xEA,0xB4,0x9B), o3(0xEA,0xB4,0x9D),
-     o3(0xEA,0xB4,0x9E), o3(0xEA,0xB4,0x9F),
-     o3(0xEA,0xB4,0xA1), o3(0xEA,0xB4,0xA2),
-     o3(0xEA,0xB4,0xA3), o3(0xEA,0xB4,0xA4),
-     o3(0xEA,0xB4,0xA5), o3(0xEA,0xB4,0xA6),
-     o3(0xEA,0xB4,0xA7), o3(0xEA,0xB4,0xA8),
-     o3(0xEA,0xB4,0xAA), o3(0xEA,0xB4,0xAB),
-     o3(0xEA,0xB4,0xAE), o3(0xEA,0xB4,0xAF),
-     o3(0xEA,0xB4,0xB0), o3(0xEA,0xB4,0xB1),
-     o3(0xEA,0xB4,0xB2), o3(0xEA,0xB4,0xB3),
-     o3(0xEA,0xB4,0xB6), o3(0xEA,0xB4,0xB7),
-     o3(0xEA,0xB4,0xB9), o3(0xEA,0xB4,0xBA),
-     o3(0xEA,0xB4,0xBB), o3(0xEA,0xB4,0xBD),
-     o3(0xEA,0xB4,0xBE), o3(0xEA,0xB4,0xBF),
-     o3(0xEA,0xB5,0x80), o3(0xEA,0xB5,0x81),
-     o3(0xEA,0xB5,0x82), o3(0xEA,0xB5,0x83),
-     o3(0xEA,0xB5,0x86), o3(0xEA,0xB5,0x88),
-     o3(0xEA,0xB5,0x8A), o3(0xEA,0xB5,0x8B),
-     o3(0xEA,0xB5,0x8C), o3(0xEA,0xB5,0x8D),
-     o3(0xEA,0xB5,0x8E), o3(0xEA,0xB5,0x8F),
-     o3(0xEA,0xB5,0x91), o3(0xEA,0xB5,0x92),
-     o3(0xEA,0xB5,0x93), o3(0xEA,0xB5,0x95),
-     o3(0xEA,0xB5,0x96), o3(0xEA,0xB5,0x97),
-     o3(0xEA,0xB5,0x99), o3(0xEA,0xB5,0x9A),
-     o3(0xEA,0xB5,0x9B), o3(0xEA,0xB5,0x9C),
-     o3(0xEA,0xB5,0x9D), o3(0xEA,0xB5,0x9E),
-     o3(0xEA,0xB5,0x9F), o3(0xEA,0xB5,0xA0),
-     o3(0xEA,0xB5,0xA2), o3(0xEA,0xB5,0xA4),
-     o3(0xEA,0xB5,0xA5), o3(0xEA,0xB5,0xA6),
-     o3(0xEA,0xB5,0xA7), o3(0xEA,0xB5,0xA8),
-     o3(0xEA,0xB5,0xA9), o3(0xEA,0xB5,0xAA),
-     o3(0xEA,0xB5,0xAB), o3(0xEA,0xB5,0xAE),
-     o3(0xEA,0xB5,0xAF), o3(0xEA,0xB5,0xB1),
-     o3(0xEA,0xB5,0xB2), o3(0xEA,0xB5,0xB7),
-     o3(0xEA,0xB5,0xB8), o3(0xEA,0xB5,0xB9),
-     o3(0xEA,0xB5,0xBA), o3(0xEA,0xB5,0xBE),
-     o3(0xEA,0xB6,0x80), o3(0xEA,0xB6,0x83),
-     o3(0xEA,0xB6,0x84), o3(0xEA,0xB6,0x85),
-     o3(0xEA,0xB6,0x86), o3(0xEA,0xB6,0x87),
-     o3(0xEA,0xB6,0x8A), o3(0xEA,0xB6,0x8B),
-     o3(0xEA,0xB6,0x8D), o3(0xEA,0xB6,0x8E),
-     o3(0xEA,0xB6,0x8F), o3(0xEA,0xB6,0x91),
-     o3(0xEA,0xB6,0x92), o3(0xEA,0xB6,0x93),
-     o3(0xEA,0xB6,0x94), o3(0xEA,0xB6,0x95),
-     o3(0xEA,0xB6,0x96), o3(0xEA,0xB6,0x97),
-     o3(0xEA,0xB6,0x98), o3(0xEA,0xB6,0x99),
-     o3(0xEA,0xB6,0x9A), o3(0xEA,0xB6,0x9B),
-     o3(0xEA,0xB6,0x9E), o3(0xEA,0xB6,0x9F),
-     o3(0xEA,0xB6,0xA0), o3(0xEA,0xB6,0xA1),
-     o3(0xEA,0xB6,0xA2), o3(0xEA,0xB6,0xA3),
-     o3(0xEA,0xB6,0xA5), o3(0xEA,0xB6,0xA6),
-     o3(0xEA,0xB6,0xA7), o3(0xEA,0xB6,0xA8),
-     o3(0xEA,0xB6,0xA9), o3(0xEA,0xB6,0xAA),
-     o3(0xEA,0xB6,0xAB), o3(0xEA,0xB6,0xAC),
-     o3(0xEA,0xB6,0xAD), o3(0xEA,0xB6,0xAE),
-     o3(0xEA,0xB6,0xAF), o3(0xEA,0xB6,0xB0),
-     o3(0xEA,0xB6,0xB1), o3(0xEA,0xB6,0xB2),
-     o3(0xEA,0xB6,0xB3), o3(0xEA,0xB6,0xB4),
-     o3(0xEA,0xB6,0xB5), o3(0xEA,0xB6,0xB6),
-     o3(0xEA,0xB6,0xB8), o3(0xEA,0xB6,0xB9),
-     o3(0xEA,0xB6,0xBA), o3(0xEA,0xB6,0xBB),
-     o3(0xEA,0xB6,0xBC), o3(0xEA,0xB6,0xBD),
-     o3(0xEA,0xB6,0xBE), o3(0xEA,0xB6,0xBF),
-     o3(0xEA,0xB7,0x82), o3(0xEA,0xB7,0x83),
-     o3(0xEA,0xB7,0x85), o3(0xEA,0xB7,0x86),
-     o3(0xEA,0xB7,0x87), o3(0xEA,0xB7,0x89),
-     o3(0xEA,0xB7,0x8A), o3(0xEA,0xB7,0x8B),
-     o3(0xEA,0xB7,0x8C), o3(0xEA,0xB7,0x8D),
-     o3(0xEA,0xB7,0x8E), o3(0xEA,0xB7,0x8F),
-     o3(0xEA,0xB7,0x92), o3(0xEA,0xB7,0x94),
-     o3(0xEA,0xB7,0x95), o3(0xEA,0xB7,0x96),
-     o3(0xEA,0xB7,0x97), o3(0xEA,0xB7,0x98),
-     o3(0xEA,0xB7,0x99), o3(0xEA,0xB7,0x9A),
-     o3(0xEA,0xB7,0x9B), o3(0xEA,0xB7,0x9D),
-     o3(0xEA,0xB7,0x9E), o3(0xEA,0xB7,0x9F),
-     o3(0xEA,0xB7,0xA1), o3(0xEA,0xB7,0xA2),
-     o3(0xEA,0xB7,0xA3), o3(0xEA,0xB7,0xA5),
-     o3(0xEA,0xB7,0xA6), o3(0xEA,0xB7,0xA7),
-     o3(0xEA,0xB7,0xA8), o3(0xEA,0xB7,0xA9),
-     o3(0xEA,0xB7,0xAA), o3(0xEA,0xB7,0xAB),
-     o3(0xEA,0xB7,0xAC), o3(0xEA,0xB7,0xAD),
-     o3(0xEA,0xB7,0xAE), o3(0xEA,0xB7,0xAF),
-     o3(0xEA,0xB7,0xB0), o3(0xEA,0xB7,0xB1),
-     o3(0xEA,0xB7,0xB2), o3(0xEA,0xB7,0xB3),
-     o3(0xEA,0xB7,0xB4), o3(0xEA,0xB7,0xB5),
-     o3(0xEA,0xB7,0xB6), o3(0xEA,0xB7,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_82 = {
-    from_CP949_81_offsets,
-    from_CP949_82_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_83_infos[179] = {
-     o3(0xEA,0xB7,0xBA), o3(0xEA,0xB7,0xBB),
-     o3(0xEA,0xB7,0xBD), o3(0xEA,0xB7,0xBE),
-     o3(0xEA,0xB8,0x82), o3(0xEA,0xB8,0x83),
-     o3(0xEA,0xB8,0x84), o3(0xEA,0xB8,0x85),
-     o3(0xEA,0xB8,0x86), o3(0xEA,0xB8,0x87),
-     o3(0xEA,0xB8,0x8A), o3(0xEA,0xB8,0x8C),
-     o3(0xEA,0xB8,0x8E), o3(0xEA,0xB8,0x8F),
-     o3(0xEA,0xB8,0x90), o3(0xEA,0xB8,0x91),
-     o3(0xEA,0xB8,0x92), o3(0xEA,0xB8,0x93),
-     o3(0xEA,0xB8,0x95), o3(0xEA,0xB8,0x96),
-     o3(0xEA,0xB8,0x97), o3(0xEA,0xB8,0x98),
-     o3(0xEA,0xB8,0x99), o3(0xEA,0xB8,0x9A),
-     o3(0xEA,0xB8,0x9B), o3(0xEA,0xB8,0x9C),
-     o3(0xEA,0xB8,0x9D), o3(0xEA,0xB8,0x9E),
-     o3(0xEA,0xB8,0x9F), o3(0xEA,0xB8,0xA0),
-     o3(0xEA,0xB8,0xA1), o3(0xEA,0xB8,0xA2),
-     o3(0xEA,0xB8,0xA3), o3(0xEA,0xB8,0xA4),
-     o3(0xEA,0xB8,0xA5), o3(0xEA,0xB8,0xA6),
-     o3(0xEA,0xB8,0xA7), o3(0xEA,0xB8,0xA8),
-     o3(0xEA,0xB8,0xA9), o3(0xEA,0xB8,0xAA),
-     o3(0xEA,0xB8,0xAB), o3(0xEA,0xB8,0xAC),
-     o3(0xEA,0xB8,0xAD), o3(0xEA,0xB8,0xAE),
-     o3(0xEA,0xB8,0xAF), o3(0xEA,0xB8,0xB2),
-     o3(0xEA,0xB8,0xB3), o3(0xEA,0xB8,0xB5),
-     o3(0xEA,0xB8,0xB6), o3(0xEA,0xB8,0xB9),
-     o3(0xEA,0xB8,0xBB), o3(0xEA,0xB8,0xBC),
-     o3(0xEA,0xB8,0xBD), o3(0xEA,0xB8,0xBE),
-     o3(0xEA,0xB8,0xBF), o3(0xEA,0xB9,0x82),
-     o3(0xEA,0xB9,0x84), o3(0xEA,0xB9,0x87),
-     o3(0xEA,0xB9,0x88), o3(0xEA,0xB9,0x89),
-     o3(0xEA,0xB9,0x8B), o3(0xEA,0xB9,0x8F),
-     o3(0xEA,0xB9,0x91), o3(0xEA,0xB9,0x92),
-     o3(0xEA,0xB9,0x93), o3(0xEA,0xB9,0x95),
-     o3(0xEA,0xB9,0x97), o3(0xEA,0xB9,0x98),
-     o3(0xEA,0xB9,0x99), o3(0xEA,0xB9,0x9A),
-     o3(0xEA,0xB9,0x9B), o3(0xEA,0xB9,0x9E),
-     o3(0xEA,0xB9,0xA2), o3(0xEA,0xB9,0xA3),
-     o3(0xEA,0xB9,0xA4), o3(0xEA,0xB9,0xA6),
-     o3(0xEA,0xB9,0xA7), o3(0xEA,0xB9,0xAA),
-     o3(0xEA,0xB9,0xAB), o3(0xEA,0xB9,0xAD),
-     o3(0xEA,0xB9,0xAE), o3(0xEA,0xB9,0xAF),
-     o3(0xEA,0xB9,0xB1), o3(0xEA,0xB9,0xB2),
-     o3(0xEA,0xB9,0xB3), o3(0xEA,0xB9,0xB4),
-     o3(0xEA,0xB9,0xB5), o3(0xEA,0xB9,0xB6),
-     o3(0xEA,0xB9,0xB7), o3(0xEA,0xB9,0xBA),
-     o3(0xEA,0xB9,0xBE), o3(0xEA,0xB9,0xBF),
-     o3(0xEA,0xBA,0x80), o3(0xEA,0xBA,0x81),
-     o3(0xEA,0xBA,0x82), o3(0xEA,0xBA,0x83),
-     o3(0xEA,0xBA,0x86), o3(0xEA,0xBA,0x87),
-     o3(0xEA,0xBA,0x88), o3(0xEA,0xBA,0x89),
-     o3(0xEA,0xBA,0x8A), o3(0xEA,0xBA,0x8B),
-     o3(0xEA,0xBA,0x8D), o3(0xEA,0xBA,0x8E),
-     o3(0xEA,0xBA,0x8F), o3(0xEA,0xBA,0x90),
-     o3(0xEA,0xBA,0x91), o3(0xEA,0xBA,0x92),
-     o3(0xEA,0xBA,0x93), o3(0xEA,0xBA,0x94),
-     o3(0xEA,0xBA,0x95), o3(0xEA,0xBA,0x96),
-     o3(0xEA,0xBA,0x97), o3(0xEA,0xBA,0x98),
-     o3(0xEA,0xBA,0x99), o3(0xEA,0xBA,0x9A),
-     o3(0xEA,0xBA,0x9B), o3(0xEA,0xBA,0x9C),
-     o3(0xEA,0xBA,0x9D), o3(0xEA,0xBA,0x9E),
-     o3(0xEA,0xBA,0x9F), o3(0xEA,0xBA,0xA0),
-     o3(0xEA,0xBA,0xA1), o3(0xEA,0xBA,0xA2),
-     o3(0xEA,0xBA,0xA3), o3(0xEA,0xBA,0xA4),
-     o3(0xEA,0xBA,0xA5), o3(0xEA,0xBA,0xA6),
-     o3(0xEA,0xBA,0xA7), o3(0xEA,0xBA,0xA8),
-     o3(0xEA,0xBA,0xA9), o3(0xEA,0xBA,0xAA),
-     o3(0xEA,0xBA,0xAB), o3(0xEA,0xBA,0xAC),
-     o3(0xEA,0xBA,0xAD), o3(0xEA,0xBA,0xAE),
-     o3(0xEA,0xBA,0xAF), o3(0xEA,0xBA,0xB0),
-     o3(0xEA,0xBA,0xB1), o3(0xEA,0xBA,0xB2),
-     o3(0xEA,0xBA,0xB3), o3(0xEA,0xBA,0xB4),
-     o3(0xEA,0xBA,0xB5), o3(0xEA,0xBA,0xB6),
-     o3(0xEA,0xBA,0xB7), o3(0xEA,0xBA,0xB8),
-     o3(0xEA,0xBA,0xB9), o3(0xEA,0xBA,0xBA),
-     o3(0xEA,0xBA,0xBB), o3(0xEA,0xBA,0xBF),
-     o3(0xEA,0xBB,0x81), o3(0xEA,0xBB,0x82),
-     o3(0xEA,0xBB,0x83), o3(0xEA,0xBB,0x85),
-     o3(0xEA,0xBB,0x86), o3(0xEA,0xBB,0x87),
-     o3(0xEA,0xBB,0x88), o3(0xEA,0xBB,0x89),
-     o3(0xEA,0xBB,0x8A), o3(0xEA,0xBB,0x8B),
-     o3(0xEA,0xBB,0x8E), o3(0xEA,0xBB,0x92),
-     o3(0xEA,0xBB,0x93), o3(0xEA,0xBB,0x94),
-     o3(0xEA,0xBB,0x95), o3(0xEA,0xBB,0x96),
-     o3(0xEA,0xBB,0x97), o3(0xEA,0xBB,0x9A),
-     o3(0xEA,0xBB,0x9B), o3(0xEA,0xBB,0x9D),
-     o3(0xEA,0xBB,0x9E), o3(0xEA,0xBB,0x9F),
-     o3(0xEA,0xBB,0xA0), o3(0xEA,0xBB,0xA1),
-     o3(0xEA,0xBB,0xA2), o3(0xEA,0xBB,0xA3),
-     o3(0xEA,0xBB,0xA4), o3(0xEA,0xBB,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_83 = {
-    from_CP949_81_offsets,
-    from_CP949_83_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_84_infos[179] = {
-     o3(0xEA,0xBB,0xA6), o3(0xEA,0xBB,0xA7),
-     o3(0xEA,0xBB,0xA9), o3(0xEA,0xBB,0xAA),
-     o3(0xEA,0xBB,0xAC), o3(0xEA,0xBB,0xAE),
-     o3(0xEA,0xBB,0xAF), o3(0xEA,0xBB,0xB0),
-     o3(0xEA,0xBB,0xB1), o3(0xEA,0xBB,0xB2),
-     o3(0xEA,0xBB,0xB3), o3(0xEA,0xBB,0xB5),
-     o3(0xEA,0xBB,0xB6), o3(0xEA,0xBB,0xB7),
-     o3(0xEA,0xBB,0xB9), o3(0xEA,0xBB,0xBA),
-     o3(0xEA,0xBB,0xBB), o3(0xEA,0xBB,0xBD),
-     o3(0xEA,0xBB,0xBE), o3(0xEA,0xBB,0xBF),
-     o3(0xEA,0xBC,0x80), o3(0xEA,0xBC,0x81),
-     o3(0xEA,0xBC,0x82), o3(0xEA,0xBC,0x83),
-     o3(0xEA,0xBC,0x84), o3(0xEA,0xBC,0x85),
-     o3(0xEA,0xBC,0x86), o3(0xEA,0xBC,0x89),
-     o3(0xEA,0xBC,0x8A), o3(0xEA,0xBC,0x8B),
-     o3(0xEA,0xBC,0x8C), o3(0xEA,0xBC,0x8E),
-     o3(0xEA,0xBC,0x8F), o3(0xEA,0xBC,0x91),
-     o3(0xEA,0xBC,0x92), o3(0xEA,0xBC,0x93),
-     o3(0xEA,0xBC,0x94), o3(0xEA,0xBC,0x95),
-     o3(0xEA,0xBC,0x96), o3(0xEA,0xBC,0x97),
-     o3(0xEA,0xBC,0x98), o3(0xEA,0xBC,0x99),
-     o3(0xEA,0xBC,0x9A), o3(0xEA,0xBC,0x9B),
-     o3(0xEA,0xBC,0x9C), o3(0xEA,0xBC,0x9D),
-     o3(0xEA,0xBC,0x9E), o3(0xEA,0xBC,0x9F),
-     o3(0xEA,0xBC,0xA0), o3(0xEA,0xBC,0xA1),
-     o3(0xEA,0xBC,0xA2), o3(0xEA,0xBC,0xA3),
-     o3(0xEA,0xBC,0xA4), o3(0xEA,0xBC,0xA5),
-     o3(0xEA,0xBC,0xA6), o3(0xEA,0xBC,0xA7),
-     o3(0xEA,0xBC,0xA8), o3(0xEA,0xBC,0xA9),
-     o3(0xEA,0xBC,0xAA), o3(0xEA,0xBC,0xAB),
-     o3(0xEA,0xBC,0xAE), o3(0xEA,0xBC,0xAF),
-     o3(0xEA,0xBC,0xB1), o3(0xEA,0xBC,0xB3),
-     o3(0xEA,0xBC,0xB5), o3(0xEA,0xBC,0xB6),
-     o3(0xEA,0xBC,0xB7), o3(0xEA,0xBC,0xB8),
-     o3(0xEA,0xBC,0xB9), o3(0xEA,0xBC,0xBA),
-     o3(0xEA,0xBC,0xBB), o3(0xEA,0xBC,0xBE),
-     o3(0xEA,0xBD,0x80), o3(0xEA,0xBD,0x84),
-     o3(0xEA,0xBD,0x85), o3(0xEA,0xBD,0x86),
-     o3(0xEA,0xBD,0x87), o3(0xEA,0xBD,0x8A),
-     o3(0xEA,0xBD,0x8B), o3(0xEA,0xBD,0x8C),
-     o3(0xEA,0xBD,0x8D), o3(0xEA,0xBD,0x8E),
-     o3(0xEA,0xBD,0x8F), o3(0xEA,0xBD,0x91),
-     o3(0xEA,0xBD,0x92), o3(0xEA,0xBD,0x93),
-     o3(0xEA,0xBD,0x94), o3(0xEA,0xBD,0x95),
-     o3(0xEA,0xBD,0x96), o3(0xEA,0xBD,0x97),
-     o3(0xEA,0xBD,0x98), o3(0xEA,0xBD,0x99),
-     o3(0xEA,0xBD,0x9A), o3(0xEA,0xBD,0x9B),
-     o3(0xEA,0xBD,0x9E), o3(0xEA,0xBD,0x9F),
-     o3(0xEA,0xBD,0xA0), o3(0xEA,0xBD,0xA1),
-     o3(0xEA,0xBD,0xA2), o3(0xEA,0xBD,0xA3),
-     o3(0xEA,0xBD,0xA6), o3(0xEA,0xBD,0xA7),
-     o3(0xEA,0xBD,0xA8), o3(0xEA,0xBD,0xA9),
-     o3(0xEA,0xBD,0xAA), o3(0xEA,0xBD,0xAB),
-     o3(0xEA,0xBD,0xAC), o3(0xEA,0xBD,0xAD),
-     o3(0xEA,0xBD,0xAE), o3(0xEA,0xBD,0xAF),
-     o3(0xEA,0xBD,0xB0), o3(0xEA,0xBD,0xB1),
-     o3(0xEA,0xBD,0xB2), o3(0xEA,0xBD,0xB3),
-     o3(0xEA,0xBD,0xB4), o3(0xEA,0xBD,0xB5),
-     o3(0xEA,0xBD,0xB6), o3(0xEA,0xBD,0xB7),
-     o3(0xEA,0xBD,0xB8), o3(0xEA,0xBD,0xBA),
-     o3(0xEA,0xBD,0xBB), o3(0xEA,0xBD,0xBC),
-     o3(0xEA,0xBD,0xBD), o3(0xEA,0xBD,0xBE),
-     o3(0xEA,0xBD,0xBF), o3(0xEA,0xBE,0x81),
-     o3(0xEA,0xBE,0x82), o3(0xEA,0xBE,0x83),
-     o3(0xEA,0xBE,0x85), o3(0xEA,0xBE,0x86),
-     o3(0xEA,0xBE,0x87), o3(0xEA,0xBE,0x89),
-     o3(0xEA,0xBE,0x8A), o3(0xEA,0xBE,0x8B),
-     o3(0xEA,0xBE,0x8C), o3(0xEA,0xBE,0x8D),
-     o3(0xEA,0xBE,0x8E), o3(0xEA,0xBE,0x8F),
-     o3(0xEA,0xBE,0x92), o3(0xEA,0xBE,0x93),
-     o3(0xEA,0xBE,0x94), o3(0xEA,0xBE,0x96),
-     o3(0xEA,0xBE,0x97), o3(0xEA,0xBE,0x98),
-     o3(0xEA,0xBE,0x99), o3(0xEA,0xBE,0x9A),
-     o3(0xEA,0xBE,0x9B), o3(0xEA,0xBE,0x9D),
-     o3(0xEA,0xBE,0x9E), o3(0xEA,0xBE,0x9F),
-     o3(0xEA,0xBE,0xA0), o3(0xEA,0xBE,0xA1),
-     o3(0xEA,0xBE,0xA2), o3(0xEA,0xBE,0xA3),
-     o3(0xEA,0xBE,0xA4), o3(0xEA,0xBE,0xA5),
-     o3(0xEA,0xBE,0xA6), o3(0xEA,0xBE,0xA7),
-     o3(0xEA,0xBE,0xA8), o3(0xEA,0xBE,0xA9),
-     o3(0xEA,0xBE,0xAA), o3(0xEA,0xBE,0xAB),
-     o3(0xEA,0xBE,0xAC), o3(0xEA,0xBE,0xAD),
-     o3(0xEA,0xBE,0xAE), o3(0xEA,0xBE,0xAF),
-     o3(0xEA,0xBE,0xB0), o3(0xEA,0xBE,0xB1),
-     o3(0xEA,0xBE,0xB2), o3(0xEA,0xBE,0xB3),
-     o3(0xEA,0xBE,0xB4), o3(0xEA,0xBE,0xB5),
-     o3(0xEA,0xBE,0xB6), o3(0xEA,0xBE,0xB7),
-     o3(0xEA,0xBE,0xBA), o3(0xEA,0xBE,0xBB),
-     o3(0xEA,0xBE,0xBD), o3(0xEA,0xBE,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_84 = {
-    from_CP949_81_offsets,
-    from_CP949_84_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_85_infos[179] = {
-     o3(0xEA,0xBE,0xBF), o3(0xEA,0xBF,0x81),
-     o3(0xEA,0xBF,0x82), o3(0xEA,0xBF,0x83),
-     o3(0xEA,0xBF,0x84), o3(0xEA,0xBF,0x85),
-     o3(0xEA,0xBF,0x86), o3(0xEA,0xBF,0x8A),
-     o3(0xEA,0xBF,0x8C), o3(0xEA,0xBF,0x8F),
-     o3(0xEA,0xBF,0x90), o3(0xEA,0xBF,0x91),
-     o3(0xEA,0xBF,0x92), o3(0xEA,0xBF,0x93),
-     o3(0xEA,0xBF,0x95), o3(0xEA,0xBF,0x96),
-     o3(0xEA,0xBF,0x97), o3(0xEA,0xBF,0x98),
-     o3(0xEA,0xBF,0x99), o3(0xEA,0xBF,0x9A),
-     o3(0xEA,0xBF,0x9B), o3(0xEA,0xBF,0x9D),
-     o3(0xEA,0xBF,0x9E), o3(0xEA,0xBF,0x9F),
-     o3(0xEA,0xBF,0xA0), o3(0xEA,0xBF,0xA1),
-     o3(0xEA,0xBF,0xA2), o3(0xEA,0xBF,0xA3),
-     o3(0xEA,0xBF,0xA4), o3(0xEA,0xBF,0xA5),
-     o3(0xEA,0xBF,0xA6), o3(0xEA,0xBF,0xA7),
-     o3(0xEA,0xBF,0xAA), o3(0xEA,0xBF,0xAB),
-     o3(0xEA,0xBF,0xAC), o3(0xEA,0xBF,0xAD),
-     o3(0xEA,0xBF,0xAE), o3(0xEA,0xBF,0xAF),
-     o3(0xEA,0xBF,0xB2), o3(0xEA,0xBF,0xB3),
-     o3(0xEA,0xBF,0xB5), o3(0xEA,0xBF,0xB6),
-     o3(0xEA,0xBF,0xB7), o3(0xEA,0xBF,0xB9),
-     o3(0xEA,0xBF,0xBA), o3(0xEA,0xBF,0xBB),
-     o3(0xEA,0xBF,0xBC), o3(0xEA,0xBF,0xBD),
-     o3(0xEA,0xBF,0xBE), o3(0xEA,0xBF,0xBF),
-     o3(0xEB,0x80,0x82), o3(0xEB,0x80,0x83),
-     o3(0xEB,0x80,0x85), o3(0xEB,0x80,0x86),
-     o3(0xEB,0x80,0x87), o3(0xEB,0x80,0x88),
-     o3(0xEB,0x80,0x89), o3(0xEB,0x80,0x8A),
-     o3(0xEB,0x80,0x8B), o3(0xEB,0x80,0x8D),
-     o3(0xEB,0x80,0x8E), o3(0xEB,0x80,0x8F),
-     o3(0xEB,0x80,0x91), o3(0xEB,0x80,0x92),
-     o3(0xEB,0x80,0x93), o3(0xEB,0x80,0x95),
-     o3(0xEB,0x80,0x96), o3(0xEB,0x80,0x97),
-     o3(0xEB,0x80,0x98), o3(0xEB,0x80,0x99),
-     o3(0xEB,0x80,0x9A), o3(0xEB,0x80,0x9B),
-     o3(0xEB,0x80,0x9E), o3(0xEB,0x80,0x9F),
-     o3(0xEB,0x80,0xA0), o3(0xEB,0x80,0xA1),
-     o3(0xEB,0x80,0xA2), o3(0xEB,0x80,0xA3),
-     o3(0xEB,0x80,0xA4), o3(0xEB,0x80,0xA5),
-     o3(0xEB,0x80,0xA6), o3(0xEB,0x80,0xA7),
-     o3(0xEB,0x80,0xA9), o3(0xEB,0x80,0xAA),
-     o3(0xEB,0x80,0xAB), o3(0xEB,0x80,0xAC),
-     o3(0xEB,0x80,0xAD), o3(0xEB,0x80,0xAE),
-     o3(0xEB,0x80,0xAF), o3(0xEB,0x80,0xB0),
-     o3(0xEB,0x80,0xB1), o3(0xEB,0x80,0xB2),
-     o3(0xEB,0x80,0xB3), o3(0xEB,0x80,0xB4),
-     o3(0xEB,0x80,0xB5), o3(0xEB,0x80,0xB6),
-     o3(0xEB,0x80,0xB7), o3(0xEB,0x80,0xB8),
-     o3(0xEB,0x80,0xB9), o3(0xEB,0x80,0xBA),
-     o3(0xEB,0x80,0xBB), o3(0xEB,0x80,0xBC),
-     o3(0xEB,0x80,0xBD), o3(0xEB,0x80,0xBE),
-     o3(0xEB,0x80,0xBF), o3(0xEB,0x81,0x80),
-     o3(0xEB,0x81,0x81), o3(0xEB,0x81,0x82),
-     o3(0xEB,0x81,0x83), o3(0xEB,0x81,0x86),
-     o3(0xEB,0x81,0x87), o3(0xEB,0x81,0x89),
-     o3(0xEB,0x81,0x8B), o3(0xEB,0x81,0x8D),
-     o3(0xEB,0x81,0x8F), o3(0xEB,0x81,0x90),
-     o3(0xEB,0x81,0x91), o3(0xEB,0x81,0x92),
-     o3(0xEB,0x81,0x96), o3(0xEB,0x81,0x98),
-     o3(0xEB,0x81,0x9A), o3(0xEB,0x81,0x9B),
-     o3(0xEB,0x81,0x9C), o3(0xEB,0x81,0x9E),
-     o3(0xEB,0x81,0x9F), o3(0xEB,0x81,0xA0),
-     o3(0xEB,0x81,0xA1), o3(0xEB,0x81,0xA2),
-     o3(0xEB,0x81,0xA3), o3(0xEB,0x81,0xA4),
-     o3(0xEB,0x81,0xA5), o3(0xEB,0x81,0xA6),
-     o3(0xEB,0x81,0xA7), o3(0xEB,0x81,0xA8),
-     o3(0xEB,0x81,0xA9), o3(0xEB,0x81,0xAA),
-     o3(0xEB,0x81,0xAB), o3(0xEB,0x81,0xAC),
-     o3(0xEB,0x81,0xAD), o3(0xEB,0x81,0xAE),
-     o3(0xEB,0x81,0xAF), o3(0xEB,0x81,0xB0),
-     o3(0xEB,0x81,0xB1), o3(0xEB,0x81,0xB2),
-     o3(0xEB,0x81,0xB3), o3(0xEB,0x81,0xB4),
-     o3(0xEB,0x81,0xB5), o3(0xEB,0x81,0xB6),
-     o3(0xEB,0x81,0xB7), o3(0xEB,0x81,0xB8),
-     o3(0xEB,0x81,0xB9), o3(0xEB,0x81,0xBA),
-     o3(0xEB,0x81,0xBB), o3(0xEB,0x81,0xBE),
-     o3(0xEB,0x81,0xBF), o3(0xEB,0x82,0x81),
-     o3(0xEB,0x82,0x82), o3(0xEB,0x82,0x83),
-     o3(0xEB,0x82,0x85), o3(0xEB,0x82,0x86),
-     o3(0xEB,0x82,0x87), o3(0xEB,0x82,0x88),
-     o3(0xEB,0x82,0x89), o3(0xEB,0x82,0x8A),
-     o3(0xEB,0x82,0x8B), o3(0xEB,0x82,0x8E),
-     o3(0xEB,0x82,0x90), o3(0xEB,0x82,0x92),
-     o3(0xEB,0x82,0x93), o3(0xEB,0x82,0x94),
-     o3(0xEB,0x82,0x95), o3(0xEB,0x82,0x96),
-     o3(0xEB,0x82,0x97), o3(0xEB,0x82,0x9B),
-     o3(0xEB,0x82,0x9D), o3(0xEB,0x82,0x9E),
-     o3(0xEB,0x82,0xA3), o3(0xEB,0x82,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_85 = {
-    from_CP949_81_offsets,
-    from_CP949_85_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_86_infos[179] = {
-     o3(0xEB,0x82,0xA5), o3(0xEB,0x82,0xA6),
-     o3(0xEB,0x82,0xA7), o3(0xEB,0x82,0xAA),
-     o3(0xEB,0x82,0xB0), o3(0xEB,0x82,0xB2),
-     o3(0xEB,0x82,0xB6), o3(0xEB,0x82,0xB7),
-     o3(0xEB,0x82,0xB9), o3(0xEB,0x82,0xBA),
-     o3(0xEB,0x82,0xBB), o3(0xEB,0x82,0xBD),
-     o3(0xEB,0x82,0xBE), o3(0xEB,0x82,0xBF),
-     o3(0xEB,0x83,0x80), o3(0xEB,0x83,0x81),
-     o3(0xEB,0x83,0x82), o3(0xEB,0x83,0x83),
-     o3(0xEB,0x83,0x86), o3(0xEB,0x83,0x8A),
-     o3(0xEB,0x83,0x8B), o3(0xEB,0x83,0x8C),
-     o3(0xEB,0x83,0x8D), o3(0xEB,0x83,0x8E),
-     o3(0xEB,0x83,0x8F), o3(0xEB,0x83,0x92),
-     o3(0xEB,0x83,0x93), o3(0xEB,0x83,0x95),
-     o3(0xEB,0x83,0x96), o3(0xEB,0x83,0x97),
-     o3(0xEB,0x83,0x99), o3(0xEB,0x83,0x9A),
-     o3(0xEB,0x83,0x9B), o3(0xEB,0x83,0x9C),
-     o3(0xEB,0x83,0x9D), o3(0xEB,0x83,0x9E),
-     o3(0xEB,0x83,0x9F), o3(0xEB,0x83,0xA1),
-     o3(0xEB,0x83,0xA2), o3(0xEB,0x83,0xA3),
-     o3(0xEB,0x83,0xA4), o3(0xEB,0x83,0xA6),
-     o3(0xEB,0x83,0xA7), o3(0xEB,0x83,0xA8),
-     o3(0xEB,0x83,0xA9), o3(0xEB,0x83,0xAA),
-     o3(0xEB,0x83,0xAB), o3(0xEB,0x83,0xAC),
-     o3(0xEB,0x83,0xAD), o3(0xEB,0x83,0xAE),
-     o3(0xEB,0x83,0xAF), o3(0xEB,0x83,0xB0),
-     o3(0xEB,0x83,0xB1), o3(0xEB,0x83,0xB2),
-     o3(0xEB,0x83,0xB3), o3(0xEB,0x83,0xB4),
-     o3(0xEB,0x83,0xB5), o3(0xEB,0x83,0xB6),
-     o3(0xEB,0x83,0xB7), o3(0xEB,0x83,0xB8),
-     o3(0xEB,0x83,0xB9), o3(0xEB,0x83,0xBA),
-     o3(0xEB,0x83,0xBB), o3(0xEB,0x83,0xBC),
-     o3(0xEB,0x83,0xBD), o3(0xEB,0x83,0xBE),
-     o3(0xEB,0x83,0xBF), o3(0xEB,0x84,0x80),
-     o3(0xEB,0x84,0x81), o3(0xEB,0x84,0x82),
-     o3(0xEB,0x84,0x83), o3(0xEB,0x84,0x84),
-     o3(0xEB,0x84,0x85), o3(0xEB,0x84,0x86),
-     o3(0xEB,0x84,0x87), o3(0xEB,0x84,0x8A),
-     o3(0xEB,0x84,0x8D), o3(0xEB,0x84,0x8E),
-     o3(0xEB,0x84,0x8F), o3(0xEB,0x84,0x91),
-     o3(0xEB,0x84,0x94), o3(0xEB,0x84,0x95),
-     o3(0xEB,0x84,0x96), o3(0xEB,0x84,0x97),
-     o3(0xEB,0x84,0x9A), o3(0xEB,0x84,0x9E),
-     o3(0xEB,0x84,0x9F), o3(0xEB,0x84,0xA0),
-     o3(0xEB,0x84,0xA1), o3(0xEB,0x84,0xA2),
-     o3(0xEB,0x84,0xA6), o3(0xEB,0x84,0xA7),
-     o3(0xEB,0x84,0xA9), o3(0xEB,0x84,0xAA),
-     o3(0xEB,0x84,0xAB), o3(0xEB,0x84,0xAD),
-     o3(0xEB,0x84,0xAE), o3(0xEB,0x84,0xAF),
-     o3(0xEB,0x84,0xB0), o3(0xEB,0x84,0xB1),
-     o3(0xEB,0x84,0xB2), o3(0xEB,0x84,0xB3),
-     o3(0xEB,0x84,0xB6), o3(0xEB,0x84,0xBA),
-     o3(0xEB,0x84,0xBB), o3(0xEB,0x84,0xBC),
-     o3(0xEB,0x84,0xBD), o3(0xEB,0x84,0xBE),
-     o3(0xEB,0x84,0xBF), o3(0xEB,0x85,0x82),
-     o3(0xEB,0x85,0x83), o3(0xEB,0x85,0x85),
-     o3(0xEB,0x85,0x86), o3(0xEB,0x85,0x87),
-     o3(0xEB,0x85,0x89), o3(0xEB,0x85,0x8A),
-     o3(0xEB,0x85,0x8B), o3(0xEB,0x85,0x8C),
-     o3(0xEB,0x85,0x8D), o3(0xEB,0x85,0x8E),
-     o3(0xEB,0x85,0x8F), o3(0xEB,0x85,0x92),
-     o3(0xEB,0x85,0x93), o3(0xEB,0x85,0x96),
-     o3(0xEB,0x85,0x97), o3(0xEB,0x85,0x99),
-     o3(0xEB,0x85,0x9A), o3(0xEB,0x85,0x9B),
-     o3(0xEB,0x85,0x9D), o3(0xEB,0x85,0x9E),
-     o3(0xEB,0x85,0x9F), o3(0xEB,0x85,0xA1),
-     o3(0xEB,0x85,0xA2), o3(0xEB,0x85,0xA3),
-     o3(0xEB,0x85,0xA4), o3(0xEB,0x85,0xA5),
-     o3(0xEB,0x85,0xA6), o3(0xEB,0x85,0xA7),
-     o3(0xEB,0x85,0xA8), o3(0xEB,0x85,0xA9),
-     o3(0xEB,0x85,0xAA), o3(0xEB,0x85,0xAB),
-     o3(0xEB,0x85,0xAC), o3(0xEB,0x85,0xAD),
-     o3(0xEB,0x85,0xAE), o3(0xEB,0x85,0xAF),
-     o3(0xEB,0x85,0xB0), o3(0xEB,0x85,0xB1),
-     o3(0xEB,0x85,0xB2), o3(0xEB,0x85,0xB3),
-     o3(0xEB,0x85,0xB4), o3(0xEB,0x85,0xB5),
-     o3(0xEB,0x85,0xB6), o3(0xEB,0x85,0xB7),
-     o3(0xEB,0x85,0xBA), o3(0xEB,0x85,0xBB),
-     o3(0xEB,0x85,0xBD), o3(0xEB,0x85,0xBE),
-     o3(0xEB,0x85,0xBF), o3(0xEB,0x86,0x81),
-     o3(0xEB,0x86,0x83), o3(0xEB,0x86,0x84),
-     o3(0xEB,0x86,0x85), o3(0xEB,0x86,0x86),
-     o3(0xEB,0x86,0x87), o3(0xEB,0x86,0x8A),
-     o3(0xEB,0x86,0x8C), o3(0xEB,0x86,0x8E),
-     o3(0xEB,0x86,0x8F), o3(0xEB,0x86,0x90),
-     o3(0xEB,0x86,0x91), o3(0xEB,0x86,0x95),
-     o3(0xEB,0x86,0x96), o3(0xEB,0x86,0x97),
-     o3(0xEB,0x86,0x99), o3(0xEB,0x86,0x9A),
-     o3(0xEB,0x86,0x9B), o3(0xEB,0x86,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_86 = {
-    from_CP949_81_offsets,
-    from_CP949_86_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_87_infos[179] = {
-     o3(0xEB,0x86,0x9E), o3(0xEB,0x86,0x9F),
-     o3(0xEB,0x86,0xA0), o3(0xEB,0x86,0xA1),
-     o3(0xEB,0x86,0xA2), o3(0xEB,0x86,0xA3),
-     o3(0xEB,0x86,0xA4), o3(0xEB,0x86,0xA5),
-     o3(0xEB,0x86,0xA6), o3(0xEB,0x86,0xA7),
-     o3(0xEB,0x86,0xA9), o3(0xEB,0x86,0xAA),
-     o3(0xEB,0x86,0xAB), o3(0xEB,0x86,0xAC),
-     o3(0xEB,0x86,0xAD), o3(0xEB,0x86,0xAE),
-     o3(0xEB,0x86,0xAF), o3(0xEB,0x86,0xB0),
-     o3(0xEB,0x86,0xB1), o3(0xEB,0x86,0xB2),
-     o3(0xEB,0x86,0xB3), o3(0xEB,0x86,0xB4),
-     o3(0xEB,0x86,0xB5), o3(0xEB,0x86,0xB6),
-     o3(0xEB,0x86,0xB7), o3(0xEB,0x86,0xB8),
-     o3(0xEB,0x86,0xB9), o3(0xEB,0x86,0xBA),
-     o3(0xEB,0x86,0xBB), o3(0xEB,0x86,0xBC),
-     o3(0xEB,0x86,0xBD), o3(0xEB,0x86,0xBE),
-     o3(0xEB,0x86,0xBF), o3(0xEB,0x87,0x80),
-     o3(0xEB,0x87,0x81), o3(0xEB,0x87,0x82),
-     o3(0xEB,0x87,0x83), o3(0xEB,0x87,0x84),
-     o3(0xEB,0x87,0x85), o3(0xEB,0x87,0x86),
-     o3(0xEB,0x87,0x87), o3(0xEB,0x87,0x88),
-     o3(0xEB,0x87,0x89), o3(0xEB,0x87,0x8A),
-     o3(0xEB,0x87,0x8B), o3(0xEB,0x87,0x8D),
-     o3(0xEB,0x87,0x8E), o3(0xEB,0x87,0x8F),
-     o3(0xEB,0x87,0x91), o3(0xEB,0x87,0x92),
-     o3(0xEB,0x87,0x93), o3(0xEB,0x87,0x95),
-     o3(0xEB,0x87,0x96), o3(0xEB,0x87,0x97),
-     o3(0xEB,0x87,0x98), o3(0xEB,0x87,0x99),
-     o3(0xEB,0x87,0x9A), o3(0xEB,0x87,0x9B),
-     o3(0xEB,0x87,0x9E), o3(0xEB,0x87,0xA0),
-     o3(0xEB,0x87,0xA1), o3(0xEB,0x87,0xA2),
-     o3(0xEB,0x87,0xA3), o3(0xEB,0x87,0xA4),
-     o3(0xEB,0x87,0xA5), o3(0xEB,0x87,0xA6),
-     o3(0xEB,0x87,0xA7), o3(0xEB,0x87,0xAA),
-     o3(0xEB,0x87,0xAB), o3(0xEB,0x87,0xAD),
-     o3(0xEB,0x87,0xAE), o3(0xEB,0x87,0xAF),
-     o3(0xEB,0x87,0xB1), o3(0xEB,0x87,0xB2),
-     o3(0xEB,0x87,0xB3), o3(0xEB,0x87,0xB4),
-     o3(0xEB,0x87,0xB5), o3(0xEB,0x87,0xB6),
-     o3(0xEB,0x87,0xB7), o3(0xEB,0x87,0xB8),
-     o3(0xEB,0x87,0xBA), o3(0xEB,0x87,0xBC),
-     o3(0xEB,0x87,0xBE), o3(0xEB,0x87,0xBF),
-     o3(0xEB,0x88,0x80), o3(0xEB,0x88,0x81),
-     o3(0xEB,0x88,0x82), o3(0xEB,0x88,0x83),
-     o3(0xEB,0x88,0x86), o3(0xEB,0x88,0x87),
-     o3(0xEB,0x88,0x89), o3(0xEB,0x88,0x8A),
-     o3(0xEB,0x88,0x8D), o3(0xEB,0x88,0x8E),
-     o3(0xEB,0x88,0x8F), o3(0xEB,0x88,0x90),
-     o3(0xEB,0x88,0x91), o3(0xEB,0x88,0x92),
-     o3(0xEB,0x88,0x93), o3(0xEB,0x88,0x96),
-     o3(0xEB,0x88,0x98), o3(0xEB,0x88,0x9A),
-     o3(0xEB,0x88,0x9B), o3(0xEB,0x88,0x9C),
-     o3(0xEB,0x88,0x9D), o3(0xEB,0x88,0x9E),
-     o3(0xEB,0x88,0x9F), o3(0xEB,0x88,0xA1),
-     o3(0xEB,0x88,0xA2), o3(0xEB,0x88,0xA3),
-     o3(0xEB,0x88,0xA4), o3(0xEB,0x88,0xA5),
-     o3(0xEB,0x88,0xA6), o3(0xEB,0x88,0xA7),
-     o3(0xEB,0x88,0xA8), o3(0xEB,0x88,0xA9),
-     o3(0xEB,0x88,0xAA), o3(0xEB,0x88,0xAB),
-     o3(0xEB,0x88,0xAC), o3(0xEB,0x88,0xAD),
-     o3(0xEB,0x88,0xAE), o3(0xEB,0x88,0xAF),
-     o3(0xEB,0x88,0xB0), o3(0xEB,0x88,0xB1),
-     o3(0xEB,0x88,0xB2), o3(0xEB,0x88,0xB3),
-     o3(0xEB,0x88,0xB5), o3(0xEB,0x88,0xB6),
-     o3(0xEB,0x88,0xB7), o3(0xEB,0x88,0xB8),
-     o3(0xEB,0x88,0xB9), o3(0xEB,0x88,0xBA),
-     o3(0xEB,0x88,0xBB), o3(0xEB,0x88,0xBD),
-     o3(0xEB,0x88,0xBE), o3(0xEB,0x88,0xBF),
-     o3(0xEB,0x89,0x80), o3(0xEB,0x89,0x81),
-     o3(0xEB,0x89,0x82), o3(0xEB,0x89,0x83),
-     o3(0xEB,0x89,0x84), o3(0xEB,0x89,0x85),
-     o3(0xEB,0x89,0x86), o3(0xEB,0x89,0x87),
-     o3(0xEB,0x89,0x88), o3(0xEB,0x89,0x89),
-     o3(0xEB,0x89,0x8A), o3(0xEB,0x89,0x8B),
-     o3(0xEB,0x89,0x8C), o3(0xEB,0x89,0x8D),
-     o3(0xEB,0x89,0x8E), o3(0xEB,0x89,0x8F),
-     o3(0xEB,0x89,0x90), o3(0xEB,0x89,0x91),
-     o3(0xEB,0x89,0x92), o3(0xEB,0x89,0x93),
-     o3(0xEB,0x89,0x94), o3(0xEB,0x89,0x95),
-     o3(0xEB,0x89,0x96), o3(0xEB,0x89,0x97),
-     o3(0xEB,0x89,0x99), o3(0xEB,0x89,0x9A),
-     o3(0xEB,0x89,0x9B), o3(0xEB,0x89,0x9D),
-     o3(0xEB,0x89,0x9E), o3(0xEB,0x89,0x9F),
-     o3(0xEB,0x89,0xA1), o3(0xEB,0x89,0xA2),
-     o3(0xEB,0x89,0xA3), o3(0xEB,0x89,0xA4),
-     o3(0xEB,0x89,0xA5), o3(0xEB,0x89,0xA6),
-     o3(0xEB,0x89,0xA7), o3(0xEB,0x89,0xAA),
-     o3(0xEB,0x89,0xAB), o3(0xEB,0x89,0xAC),
-     o3(0xEB,0x89,0xAD), o3(0xEB,0x89,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_87 = {
-    from_CP949_81_offsets,
-    from_CP949_87_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_88_infos[179] = {
-     o3(0xEB,0x89,0xAF), o3(0xEB,0x89,0xB0),
-     o3(0xEB,0x89,0xB1), o3(0xEB,0x89,0xB2),
-     o3(0xEB,0x89,0xB3), o3(0xEB,0x89,0xB6),
-     o3(0xEB,0x89,0xB7), o3(0xEB,0x89,0xB8),
-     o3(0xEB,0x89,0xB9), o3(0xEB,0x89,0xBA),
-     o3(0xEB,0x89,0xBB), o3(0xEB,0x89,0xBD),
-     o3(0xEB,0x89,0xBE), o3(0xEB,0x89,0xBF),
-     o3(0xEB,0x8A,0x80), o3(0xEB,0x8A,0x81),
-     o3(0xEB,0x8A,0x82), o3(0xEB,0x8A,0x83),
-     o3(0xEB,0x8A,0x86), o3(0xEB,0x8A,0x87),
-     o3(0xEB,0x8A,0x88), o3(0xEB,0x8A,0x8A),
-     o3(0xEB,0x8A,0x8B), o3(0xEB,0x8A,0x8C),
-     o3(0xEB,0x8A,0x8D), o3(0xEB,0x8A,0x8E),
-     o3(0xEB,0x8A,0x8F), o3(0xEB,0x8A,0x92),
-     o3(0xEB,0x8A,0x93), o3(0xEB,0x8A,0x95),
-     o3(0xEB,0x8A,0x96), o3(0xEB,0x8A,0x97),
-     o3(0xEB,0x8A,0x9B), o3(0xEB,0x8A,0x9C),
-     o3(0xEB,0x8A,0x9D), o3(0xEB,0x8A,0x9E),
-     o3(0xEB,0x8A,0x9F), o3(0xEB,0x8A,0xA2),
-     o3(0xEB,0x8A,0xA4), o3(0xEB,0x8A,0xA7),
-     o3(0xEB,0x8A,0xA8), o3(0xEB,0x8A,0xA9),
-     o3(0xEB,0x8A,0xAB), o3(0xEB,0x8A,0xAD),
-     o3(0xEB,0x8A,0xAE), o3(0xEB,0x8A,0xAF),
-     o3(0xEB,0x8A,0xB1), o3(0xEB,0x8A,0xB2),
-     o3(0xEB,0x8A,0xB3), o3(0xEB,0x8A,0xB5),
-     o3(0xEB,0x8A,0xB6), o3(0xEB,0x8A,0xB7),
-     o3(0xEB,0x8A,0xB8), o3(0xEB,0x8A,0xB9),
-     o3(0xEB,0x8A,0xBA), o3(0xEB,0x8A,0xBB),
-     o3(0xEB,0x8A,0xBC), o3(0xEB,0x8A,0xBD),
-     o3(0xEB,0x8A,0xBE), o3(0xEB,0x8A,0xBF),
-     o3(0xEB,0x8B,0x80), o3(0xEB,0x8B,0x81),
-     o3(0xEB,0x8B,0x82), o3(0xEB,0x8B,0x83),
-     o3(0xEB,0x8B,0x84), o3(0xEB,0x8B,0x85),
-     o3(0xEB,0x8B,0x86), o3(0xEB,0x8B,0x87),
-     o3(0xEB,0x8B,0x8A), o3(0xEB,0x8B,0x8B),
-     o3(0xEB,0x8B,0x8D), o3(0xEB,0x8B,0x8E),
-     o3(0xEB,0x8B,0x8F), o3(0xEB,0x8B,0x91),
-     o3(0xEB,0x8B,0x93), o3(0xEB,0x8B,0x94),
-     o3(0xEB,0x8B,0x95), o3(0xEB,0x8B,0x96),
-     o3(0xEB,0x8B,0x97), o3(0xEB,0x8B,0x9A),
-     o3(0xEB,0x8B,0x9C), o3(0xEB,0x8B,0x9E),
-     o3(0xEB,0x8B,0x9F), o3(0xEB,0x8B,0xA0),
-     o3(0xEB,0x8B,0xA1), o3(0xEB,0x8B,0xA3),
-     o3(0xEB,0x8B,0xA7), o3(0xEB,0x8B,0xA9),
-     o3(0xEB,0x8B,0xAA), o3(0xEB,0x8B,0xB0),
-     o3(0xEB,0x8B,0xB1), o3(0xEB,0x8B,0xB2),
-     o3(0xEB,0x8B,0xB6), o3(0xEB,0x8B,0xBC),
-     o3(0xEB,0x8B,0xBD), o3(0xEB,0x8B,0xBE),
-     o3(0xEB,0x8C,0x82), o3(0xEB,0x8C,0x83),
-     o3(0xEB,0x8C,0x85), o3(0xEB,0x8C,0x86),
-     o3(0xEB,0x8C,0x87), o3(0xEB,0x8C,0x89),
-     o3(0xEB,0x8C,0x8A), o3(0xEB,0x8C,0x8B),
-     o3(0xEB,0x8C,0x8C), o3(0xEB,0x8C,0x8D),
-     o3(0xEB,0x8C,0x8E), o3(0xEB,0x8C,0x8F),
-     o3(0xEB,0x8C,0x92), o3(0xEB,0x8C,0x96),
-     o3(0xEB,0x8C,0x97), o3(0xEB,0x8C,0x98),
-     o3(0xEB,0x8C,0x99), o3(0xEB,0x8C,0x9A),
-     o3(0xEB,0x8C,0x9B), o3(0xEB,0x8C,0x9D),
-     o3(0xEB,0x8C,0x9E), o3(0xEB,0x8C,0x9F),
-     o3(0xEB,0x8C,0xA0), o3(0xEB,0x8C,0xA1),
-     o3(0xEB,0x8C,0xA2), o3(0xEB,0x8C,0xA3),
-     o3(0xEB,0x8C,0xA4), o3(0xEB,0x8C,0xA5),
-     o3(0xEB,0x8C,0xA6), o3(0xEB,0x8C,0xA7),
-     o3(0xEB,0x8C,0xA8), o3(0xEB,0x8C,0xA9),
-     o3(0xEB,0x8C,0xAA), o3(0xEB,0x8C,0xAB),
-     o3(0xEB,0x8C,0xAC), o3(0xEB,0x8C,0xAD),
-     o3(0xEB,0x8C,0xAE), o3(0xEB,0x8C,0xAF),
-     o3(0xEB,0x8C,0xB0), o3(0xEB,0x8C,0xB1),
-     o3(0xEB,0x8C,0xB2), o3(0xEB,0x8C,0xB3),
-     o3(0xEB,0x8C,0xB4), o3(0xEB,0x8C,0xB5),
-     o3(0xEB,0x8C,0xB6), o3(0xEB,0x8C,0xB7),
-     o3(0xEB,0x8C,0xB8), o3(0xEB,0x8C,0xB9),
-     o3(0xEB,0x8C,0xBA), o3(0xEB,0x8C,0xBB),
-     o3(0xEB,0x8C,0xBC), o3(0xEB,0x8C,0xBD),
-     o3(0xEB,0x8C,0xBE), o3(0xEB,0x8C,0xBF),
-     o3(0xEB,0x8D,0x80), o3(0xEB,0x8D,0x81),
-     o3(0xEB,0x8D,0x82), o3(0xEB,0x8D,0x83),
-     o3(0xEB,0x8D,0x84), o3(0xEB,0x8D,0x85),
-     o3(0xEB,0x8D,0x86), o3(0xEB,0x8D,0x87),
-     o3(0xEB,0x8D,0x88), o3(0xEB,0x8D,0x89),
-     o3(0xEB,0x8D,0x8A), o3(0xEB,0x8D,0x8B),
-     o3(0xEB,0x8D,0x8C), o3(0xEB,0x8D,0x8D),
-     o3(0xEB,0x8D,0x8E), o3(0xEB,0x8D,0x8F),
-     o3(0xEB,0x8D,0x90), o3(0xEB,0x8D,0x91),
-     o3(0xEB,0x8D,0x92), o3(0xEB,0x8D,0x93),
-     o3(0xEB,0x8D,0x97), o3(0xEB,0x8D,0x99),
-     o3(0xEB,0x8D,0x9A), o3(0xEB,0x8D,0x9D),
-     o3(0xEB,0x8D,0xA0), o3(0xEB,0x8D,0xA1),
-     o3(0xEB,0x8D,0xA2), o3(0xEB,0x8D,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_88 = {
-    from_CP949_81_offsets,
-    from_CP949_88_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_89_infos[179] = {
-     o3(0xEB,0x8D,0xA6), o3(0xEB,0x8D,0xA8),
-     o3(0xEB,0x8D,0xAA), o3(0xEB,0x8D,0xAC),
-     o3(0xEB,0x8D,0xAD), o3(0xEB,0x8D,0xAF),
-     o3(0xEB,0x8D,0xB2), o3(0xEB,0x8D,0xB3),
-     o3(0xEB,0x8D,0xB5), o3(0xEB,0x8D,0xB6),
-     o3(0xEB,0x8D,0xB7), o3(0xEB,0x8D,0xB9),
-     o3(0xEB,0x8D,0xBA), o3(0xEB,0x8D,0xBB),
-     o3(0xEB,0x8D,0xBC), o3(0xEB,0x8D,0xBD),
-     o3(0xEB,0x8D,0xBE), o3(0xEB,0x8D,0xBF),
-     o3(0xEB,0x8E,0x82), o3(0xEB,0x8E,0x86),
-     o3(0xEB,0x8E,0x87), o3(0xEB,0x8E,0x88),
-     o3(0xEB,0x8E,0x89), o3(0xEB,0x8E,0x8A),
-     o3(0xEB,0x8E,0x8B), o3(0xEB,0x8E,0x8D),
-     o3(0xEB,0x8E,0x8E), o3(0xEB,0x8E,0x8F),
-     o3(0xEB,0x8E,0x91), o3(0xEB,0x8E,0x92),
-     o3(0xEB,0x8E,0x93), o3(0xEB,0x8E,0x95),
-     o3(0xEB,0x8E,0x96), o3(0xEB,0x8E,0x97),
-     o3(0xEB,0x8E,0x98), o3(0xEB,0x8E,0x99),
-     o3(0xEB,0x8E,0x9A), o3(0xEB,0x8E,0x9B),
-     o3(0xEB,0x8E,0x9C), o3(0xEB,0x8E,0x9D),
-     o3(0xEB,0x8E,0x9E), o3(0xEB,0x8E,0x9F),
-     o3(0xEB,0x8E,0xA2), o3(0xEB,0x8E,0xA3),
-     o3(0xEB,0x8E,0xA4), o3(0xEB,0x8E,0xA5),
-     o3(0xEB,0x8E,0xA6), o3(0xEB,0x8E,0xA7),
-     o3(0xEB,0x8E,0xA9), o3(0xEB,0x8E,0xAA),
-     o3(0xEB,0x8E,0xAB), o3(0xEB,0x8E,0xAD),
-     o3(0xEB,0x8E,0xAE), o3(0xEB,0x8E,0xAF),
-     o3(0xEB,0x8E,0xB0), o3(0xEB,0x8E,0xB1),
-     o3(0xEB,0x8E,0xB2), o3(0xEB,0x8E,0xB3),
-     o3(0xEB,0x8E,0xB4), o3(0xEB,0x8E,0xB5),
-     o3(0xEB,0x8E,0xB6), o3(0xEB,0x8E,0xB7),
-     o3(0xEB,0x8E,0xB8), o3(0xEB,0x8E,0xB9),
-     o3(0xEB,0x8E,0xBA), o3(0xEB,0x8E,0xBB),
-     o3(0xEB,0x8E,0xBC), o3(0xEB,0x8E,0xBD),
-     o3(0xEB,0x8E,0xBE), o3(0xEB,0x8E,0xBF),
-     o3(0xEB,0x8F,0x80), o3(0xEB,0x8F,0x81),
-     o3(0xEB,0x8F,0x82), o3(0xEB,0x8F,0x83),
-     o3(0xEB,0x8F,0x86), o3(0xEB,0x8F,0x87),
-     o3(0xEB,0x8F,0x89), o3(0xEB,0x8F,0x8A),
-     o3(0xEB,0x8F,0x8D), o3(0xEB,0x8F,0x8F),
-     o3(0xEB,0x8F,0x91), o3(0xEB,0x8F,0x92),
-     o3(0xEB,0x8F,0x93), o3(0xEB,0x8F,0x96),
-     o3(0xEB,0x8F,0x98), o3(0xEB,0x8F,0x9A),
-     o3(0xEB,0x8F,0x9C), o3(0xEB,0x8F,0x9E),
-     o3(0xEB,0x8F,0x9F), o3(0xEB,0x8F,0xA1),
-     o3(0xEB,0x8F,0xA2), o3(0xEB,0x8F,0xA3),
-     o3(0xEB,0x8F,0xA5), o3(0xEB,0x8F,0xA6),
-     o3(0xEB,0x8F,0xA7), o3(0xEB,0x8F,0xA9),
-     o3(0xEB,0x8F,0xAA), o3(0xEB,0x8F,0xAB),
-     o3(0xEB,0x8F,0xAC), o3(0xEB,0x8F,0xAD),
-     o3(0xEB,0x8F,0xAE), o3(0xEB,0x8F,0xAF),
-     o3(0xEB,0x8F,0xB0), o3(0xEB,0x8F,0xB1),
-     o3(0xEB,0x8F,0xB2), o3(0xEB,0x8F,0xB3),
-     o3(0xEB,0x8F,0xB4), o3(0xEB,0x8F,0xB5),
-     o3(0xEB,0x8F,0xB6), o3(0xEB,0x8F,0xB7),
-     o3(0xEB,0x8F,0xB8), o3(0xEB,0x8F,0xB9),
-     o3(0xEB,0x8F,0xBA), o3(0xEB,0x8F,0xBB),
-     o3(0xEB,0x8F,0xBD), o3(0xEB,0x8F,0xBE),
-     o3(0xEB,0x8F,0xBF), o3(0xEB,0x90,0x80),
-     o3(0xEB,0x90,0x81), o3(0xEB,0x90,0x82),
-     o3(0xEB,0x90,0x83), o3(0xEB,0x90,0x84),
-     o3(0xEB,0x90,0x85), o3(0xEB,0x90,0x86),
-     o3(0xEB,0x90,0x87), o3(0xEB,0x90,0x88),
-     o3(0xEB,0x90,0x89), o3(0xEB,0x90,0x8A),
-     o3(0xEB,0x90,0x8B), o3(0xEB,0x90,0x8C),
-     o3(0xEB,0x90,0x8D), o3(0xEB,0x90,0x8E),
-     o3(0xEB,0x90,0x8F), o3(0xEB,0x90,0x91),
-     o3(0xEB,0x90,0x92), o3(0xEB,0x90,0x93),
-     o3(0xEB,0x90,0x94), o3(0xEB,0x90,0x95),
-     o3(0xEB,0x90,0x96), o3(0xEB,0x90,0x97),
-     o3(0xEB,0x90,0x99), o3(0xEB,0x90,0x9A),
-     o3(0xEB,0x90,0x9B), o3(0xEB,0x90,0x9D),
-     o3(0xEB,0x90,0x9E), o3(0xEB,0x90,0x9F),
-     o3(0xEB,0x90,0xA1), o3(0xEB,0x90,0xA2),
-     o3(0xEB,0x90,0xA3), o3(0xEB,0x90,0xA4),
-     o3(0xEB,0x90,0xA5), o3(0xEB,0x90,0xA6),
-     o3(0xEB,0x90,0xA7), o3(0xEB,0x90,0xAA),
-     o3(0xEB,0x90,0xAC), o3(0xEB,0x90,0xAD),
-     o3(0xEB,0x90,0xAE), o3(0xEB,0x90,0xAF),
-     o3(0xEB,0x90,0xB0), o3(0xEB,0x90,0xB1),
-     o3(0xEB,0x90,0xB2), o3(0xEB,0x90,0xB3),
-     o3(0xEB,0x90,0xB5), o3(0xEB,0x90,0xB6),
-     o3(0xEB,0x90,0xB7), o3(0xEB,0x90,0xB8),
-     o3(0xEB,0x90,0xB9), o3(0xEB,0x90,0xBA),
-     o3(0xEB,0x90,0xBB), o3(0xEB,0x90,0xBC),
-     o3(0xEB,0x90,0xBD), o3(0xEB,0x90,0xBE),
-     o3(0xEB,0x90,0xBF), o3(0xEB,0x91,0x80),
-     o3(0xEB,0x91,0x81), o3(0xEB,0x91,0x82),
-     o3(0xEB,0x91,0x83), o3(0xEB,0x91,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_89 = {
-    from_CP949_81_offsets,
-    from_CP949_89_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8A_infos[179] = {
-     o3(0xEB,0x91,0x85), o3(0xEB,0x91,0x86),
-     o3(0xEB,0x91,0x87), o3(0xEB,0x91,0x88),
-     o3(0xEB,0x91,0x89), o3(0xEB,0x91,0x8A),
-     o3(0xEB,0x91,0x8B), o3(0xEB,0x91,0x8C),
-     o3(0xEB,0x91,0x8D), o3(0xEB,0x91,0x8E),
-     o3(0xEB,0x91,0x8F), o3(0xEB,0x91,0x92),
-     o3(0xEB,0x91,0x93), o3(0xEB,0x91,0x95),
-     o3(0xEB,0x91,0x96), o3(0xEB,0x91,0x97),
-     o3(0xEB,0x91,0x99), o3(0xEB,0x91,0x9A),
-     o3(0xEB,0x91,0x9B), o3(0xEB,0x91,0x9C),
-     o3(0xEB,0x91,0x9D), o3(0xEB,0x91,0x9E),
-     o3(0xEB,0x91,0x9F), o3(0xEB,0x91,0xA2),
-     o3(0xEB,0x91,0xA4), o3(0xEB,0x91,0xA6),
-     o3(0xEB,0x91,0xA7), o3(0xEB,0x91,0xA8),
-     o3(0xEB,0x91,0xA9), o3(0xEB,0x91,0xAA),
-     o3(0xEB,0x91,0xAB), o3(0xEB,0x91,0xAD),
-     o3(0xEB,0x91,0xAE), o3(0xEB,0x91,0xAF),
-     o3(0xEB,0x91,0xB0), o3(0xEB,0x91,0xB1),
-     o3(0xEB,0x91,0xB2), o3(0xEB,0x91,0xB3),
-     o3(0xEB,0x91,0xB4), o3(0xEB,0x91,0xB5),
-     o3(0xEB,0x91,0xB6), o3(0xEB,0x91,0xB7),
-     o3(0xEB,0x91,0xB8), o3(0xEB,0x91,0xB9),
-     o3(0xEB,0x91,0xBA), o3(0xEB,0x91,0xBB),
-     o3(0xEB,0x91,0xBC), o3(0xEB,0x91,0xBD),
-     o3(0xEB,0x91,0xBE), o3(0xEB,0x91,0xBF),
-     o3(0xEB,0x92,0x81), o3(0xEB,0x92,0x82),
-     o3(0xEB,0x92,0x83), o3(0xEB,0x92,0x84),
-     o3(0xEB,0x92,0x85), o3(0xEB,0x92,0x86),
-     o3(0xEB,0x92,0x87), o3(0xEB,0x92,0x89),
-     o3(0xEB,0x92,0x8A), o3(0xEB,0x92,0x8B),
-     o3(0xEB,0x92,0x8C), o3(0xEB,0x92,0x8D),
-     o3(0xEB,0x92,0x8E), o3(0xEB,0x92,0x8F),
-     o3(0xEB,0x92,0x90), o3(0xEB,0x92,0x91),
-     o3(0xEB,0x92,0x92), o3(0xEB,0x92,0x93),
-     o3(0xEB,0x92,0x94), o3(0xEB,0x92,0x95),
-     o3(0xEB,0x92,0x96), o3(0xEB,0x92,0x97),
-     o3(0xEB,0x92,0x98), o3(0xEB,0x92,0x99),
-     o3(0xEB,0x92,0x9A), o3(0xEB,0x92,0x9B),
-     o3(0xEB,0x92,0x9C), o3(0xEB,0x92,0x9E),
-     o3(0xEB,0x92,0x9F), o3(0xEB,0x92,0xA0),
-     o3(0xEB,0x92,0xA1), o3(0xEB,0x92,0xA2),
-     o3(0xEB,0x92,0xA3), o3(0xEB,0x92,0xA5),
-     o3(0xEB,0x92,0xA6), o3(0xEB,0x92,0xA7),
-     o3(0xEB,0x92,0xA9), o3(0xEB,0x92,0xAA),
-     o3(0xEB,0x92,0xAB), o3(0xEB,0x92,0xAD),
-     o3(0xEB,0x92,0xAE), o3(0xEB,0x92,0xAF),
-     o3(0xEB,0x92,0xB0), o3(0xEB,0x92,0xB1),
-     o3(0xEB,0x92,0xB2), o3(0xEB,0x92,0xB3),
-     o3(0xEB,0x92,0xB4), o3(0xEB,0x92,0xB6),
-     o3(0xEB,0x92,0xB8), o3(0xEB,0x92,0xBA),
-     o3(0xEB,0x92,0xBB), o3(0xEB,0x92,0xBC),
-     o3(0xEB,0x92,0xBD), o3(0xEB,0x92,0xBE),
-     o3(0xEB,0x92,0xBF), o3(0xEB,0x93,0x81),
-     o3(0xEB,0x93,0x82), o3(0xEB,0x93,0x83),
-     o3(0xEB,0x93,0x85), o3(0xEB,0x93,0x86),
-     o3(0xEB,0x93,0x87), o3(0xEB,0x93,0x89),
-     o3(0xEB,0x93,0x8A), o3(0xEB,0x93,0x8B),
-     o3(0xEB,0x93,0x8C), o3(0xEB,0x93,0x8D),
-     o3(0xEB,0x93,0x8E), o3(0xEB,0x93,0x8F),
-     o3(0xEB,0x93,0x91), o3(0xEB,0x93,0x92),
-     o3(0xEB,0x93,0x93), o3(0xEB,0x93,0x94),
-     o3(0xEB,0x93,0x96), o3(0xEB,0x93,0x97),
-     o3(0xEB,0x93,0x98), o3(0xEB,0x93,0x99),
-     o3(0xEB,0x93,0x9A), o3(0xEB,0x93,0x9B),
-     o3(0xEB,0x93,0x9E), o3(0xEB,0x93,0x9F),
-     o3(0xEB,0x93,0xA1), o3(0xEB,0x93,0xA2),
-     o3(0xEB,0x93,0xA5), o3(0xEB,0x93,0xA7),
-     o3(0xEB,0x93,0xA8), o3(0xEB,0x93,0xA9),
-     o3(0xEB,0x93,0xAA), o3(0xEB,0x93,0xAB),
-     o3(0xEB,0x93,0xAE), o3(0xEB,0x93,0xB0),
-     o3(0xEB,0x93,0xB2), o3(0xEB,0x93,0xB3),
-     o3(0xEB,0x93,0xB4), o3(0xEB,0x93,0xB5),
-     o3(0xEB,0x93,0xB6), o3(0xEB,0x93,0xB7),
-     o3(0xEB,0x93,0xB9), o3(0xEB,0x93,0xBA),
-     o3(0xEB,0x93,0xBB), o3(0xEB,0x93,0xBC),
-     o3(0xEB,0x93,0xBD), o3(0xEB,0x93,0xBE),
-     o3(0xEB,0x93,0xBF), o3(0xEB,0x94,0x80),
-     o3(0xEB,0x94,0x81), o3(0xEB,0x94,0x82),
-     o3(0xEB,0x94,0x83), o3(0xEB,0x94,0x84),
-     o3(0xEB,0x94,0x85), o3(0xEB,0x94,0x86),
-     o3(0xEB,0x94,0x87), o3(0xEB,0x94,0x88),
-     o3(0xEB,0x94,0x89), o3(0xEB,0x94,0x8A),
-     o3(0xEB,0x94,0x8B), o3(0xEB,0x94,0x8C),
-     o3(0xEB,0x94,0x8D), o3(0xEB,0x94,0x8E),
-     o3(0xEB,0x94,0x8F), o3(0xEB,0x94,0x90),
-     o3(0xEB,0x94,0x91), o3(0xEB,0x94,0x92),
-     o3(0xEB,0x94,0x93), o3(0xEB,0x94,0x96),
-     o3(0xEB,0x94,0x97), o3(0xEB,0x94,0x99),
-     o3(0xEB,0x94,0x9A), o3(0xEB,0x94,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8A = {
-    from_CP949_81_offsets,
-    from_CP949_8A_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8B_infos[179] = {
-     o3(0xEB,0x94,0x9E), o3(0xEB,0x94,0x9F),
-     o3(0xEB,0x94,0xA0), o3(0xEB,0x94,0xA1),
-     o3(0xEB,0x94,0xA2), o3(0xEB,0x94,0xA3),
-     o3(0xEB,0x94,0xA6), o3(0xEB,0x94,0xAB),
-     o3(0xEB,0x94,0xAC), o3(0xEB,0x94,0xAD),
-     o3(0xEB,0x94,0xAE), o3(0xEB,0x94,0xAF),
-     o3(0xEB,0x94,0xB2), o3(0xEB,0x94,0xB3),
-     o3(0xEB,0x94,0xB5), o3(0xEB,0x94,0xB6),
-     o3(0xEB,0x94,0xB7), o3(0xEB,0x94,0xB9),
-     o3(0xEB,0x94,0xBA), o3(0xEB,0x94,0xBB),
-     o3(0xEB,0x94,0xBC), o3(0xEB,0x94,0xBD),
-     o3(0xEB,0x94,0xBE), o3(0xEB,0x94,0xBF),
-     o3(0xEB,0x95,0x82), o3(0xEB,0x95,0x86),
-     o3(0xEB,0x95,0x87), o3(0xEB,0x95,0x88),
-     o3(0xEB,0x95,0x89), o3(0xEB,0x95,0x8A),
-     o3(0xEB,0x95,0x8E), o3(0xEB,0x95,0x8F),
-     o3(0xEB,0x95,0x91), o3(0xEB,0x95,0x92),
-     o3(0xEB,0x95,0x93), o3(0xEB,0x95,0x95),
-     o3(0xEB,0x95,0x96), o3(0xEB,0x95,0x97),
-     o3(0xEB,0x95,0x98), o3(0xEB,0x95,0x99),
-     o3(0xEB,0x95,0x9A), o3(0xEB,0x95,0x9B),
-     o3(0xEB,0x95,0x9E), o3(0xEB,0x95,0xA2),
-     o3(0xEB,0x95,0xA3), o3(0xEB,0x95,0xA4),
-     o3(0xEB,0x95,0xA5), o3(0xEB,0x95,0xA6),
-     o3(0xEB,0x95,0xA7), o3(0xEB,0x95,0xA8),
-     o3(0xEB,0x95,0xA9), o3(0xEB,0x95,0xAA),
-     o3(0xEB,0x95,0xAB), o3(0xEB,0x95,0xAC),
-     o3(0xEB,0x95,0xAD), o3(0xEB,0x95,0xAE),
-     o3(0xEB,0x95,0xAF), o3(0xEB,0x95,0xB0),
-     o3(0xEB,0x95,0xB1), o3(0xEB,0x95,0xB2),
-     o3(0xEB,0x95,0xB3), o3(0xEB,0x95,0xB4),
-     o3(0xEB,0x95,0xB5), o3(0xEB,0x95,0xB6),
-     o3(0xEB,0x95,0xB7), o3(0xEB,0x95,0xB8),
-     o3(0xEB,0x95,0xB9), o3(0xEB,0x95,0xBA),
-     o3(0xEB,0x95,0xBB), o3(0xEB,0x95,0xBC),
-     o3(0xEB,0x95,0xBD), o3(0xEB,0x95,0xBE),
-     o3(0xEB,0x95,0xBF), o3(0xEB,0x96,0x80),
-     o3(0xEB,0x96,0x81), o3(0xEB,0x96,0x82),
-     o3(0xEB,0x96,0x83), o3(0xEB,0x96,0x84),
-     o3(0xEB,0x96,0x85), o3(0xEB,0x96,0x86),
-     o3(0xEB,0x96,0x87), o3(0xEB,0x96,0x88),
-     o3(0xEB,0x96,0x89), o3(0xEB,0x96,0x8A),
-     o3(0xEB,0x96,0x8B), o3(0xEB,0x96,0x8C),
-     o3(0xEB,0x96,0x8D), o3(0xEB,0x96,0x8E),
-     o3(0xEB,0x96,0x8F), o3(0xEB,0x96,0x90),
-     o3(0xEB,0x96,0x91), o3(0xEB,0x96,0x92),
-     o3(0xEB,0x96,0x93), o3(0xEB,0x96,0x94),
-     o3(0xEB,0x96,0x95), o3(0xEB,0x96,0x96),
-     o3(0xEB,0x96,0x97), o3(0xEB,0x96,0x98),
-     o3(0xEB,0x96,0x99), o3(0xEB,0x96,0x9A),
-     o3(0xEB,0x96,0x9B), o3(0xEB,0x96,0x9C),
-     o3(0xEB,0x96,0x9D), o3(0xEB,0x96,0x9E),
-     o3(0xEB,0x96,0x9F), o3(0xEB,0x96,0xA2),
-     o3(0xEB,0x96,0xA3), o3(0xEB,0x96,0xA5),
-     o3(0xEB,0x96,0xA6), o3(0xEB,0x96,0xA7),
-     o3(0xEB,0x96,0xA9), o3(0xEB,0x96,0xAC),
-     o3(0xEB,0x96,0xAD), o3(0xEB,0x96,0xAE),
-     o3(0xEB,0x96,0xAF), o3(0xEB,0x96,0xB2),
-     o3(0xEB,0x96,0xB6), o3(0xEB,0x96,0xB7),
-     o3(0xEB,0x96,0xB8), o3(0xEB,0x96,0xB9),
-     o3(0xEB,0x96,0xBA), o3(0xEB,0x96,0xBE),
-     o3(0xEB,0x96,0xBF), o3(0xEB,0x97,0x81),
-     o3(0xEB,0x97,0x82), o3(0xEB,0x97,0x83),
-     o3(0xEB,0x97,0x85), o3(0xEB,0x97,0x86),
-     o3(0xEB,0x97,0x87), o3(0xEB,0x97,0x88),
-     o3(0xEB,0x97,0x89), o3(0xEB,0x97,0x8A),
-     o3(0xEB,0x97,0x8B), o3(0xEB,0x97,0x8E),
-     o3(0xEB,0x97,0x92), o3(0xEB,0x97,0x93),
-     o3(0xEB,0x97,0x94), o3(0xEB,0x97,0x95),
-     o3(0xEB,0x97,0x96), o3(0xEB,0x97,0x97),
-     o3(0xEB,0x97,0x99), o3(0xEB,0x97,0x9A),
-     o3(0xEB,0x97,0x9B), o3(0xEB,0x97,0x9C),
-     o3(0xEB,0x97,0x9D), o3(0xEB,0x97,0x9E),
-     o3(0xEB,0x97,0x9F), o3(0xEB,0x97,0xA0),
-     o3(0xEB,0x97,0xA1), o3(0xEB,0x97,0xA2),
-     o3(0xEB,0x97,0xA3), o3(0xEB,0x97,0xA4),
-     o3(0xEB,0x97,0xA5), o3(0xEB,0x97,0xA6),
-     o3(0xEB,0x97,0xA7), o3(0xEB,0x97,0xA8),
-     o3(0xEB,0x97,0xA9), o3(0xEB,0x97,0xAA),
-     o3(0xEB,0x97,0xAB), o3(0xEB,0x97,0xAD),
-     o3(0xEB,0x97,0xAE), o3(0xEB,0x97,0xAF),
-     o3(0xEB,0x97,0xB0), o3(0xEB,0x97,0xB1),
-     o3(0xEB,0x97,0xB2), o3(0xEB,0x97,0xB3),
-     o3(0xEB,0x97,0xB4), o3(0xEB,0x97,0xB5),
-     o3(0xEB,0x97,0xB6), o3(0xEB,0x97,0xB7),
-     o3(0xEB,0x97,0xB8), o3(0xEB,0x97,0xB9),
-     o3(0xEB,0x97,0xBA), o3(0xEB,0x97,0xBB),
-     o3(0xEB,0x97,0xBC), o3(0xEB,0x97,0xBD),
-     o3(0xEB,0x97,0xBE), o3(0xEB,0x97,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8B = {
-    from_CP949_81_offsets,
-    from_CP949_8B_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8C_infos[179] = {
-     o3(0xEB,0x98,0x80), o3(0xEB,0x98,0x81),
-     o3(0xEB,0x98,0x82), o3(0xEB,0x98,0x83),
-     o3(0xEB,0x98,0x84), o3(0xEB,0x98,0x85),
-     o3(0xEB,0x98,0x86), o3(0xEB,0x98,0x87),
-     o3(0xEB,0x98,0x88), o3(0xEB,0x98,0x89),
-     o3(0xEB,0x98,0x8A), o3(0xEB,0x98,0x8B),
-     o3(0xEB,0x98,0x8C), o3(0xEB,0x98,0x8D),
-     o3(0xEB,0x98,0x8E), o3(0xEB,0x98,0x8F),
-     o3(0xEB,0x98,0x92), o3(0xEB,0x98,0x93),
-     o3(0xEB,0x98,0x95), o3(0xEB,0x98,0x96),
-     o3(0xEB,0x98,0x97), o3(0xEB,0x98,0x99),
-     o3(0xEB,0x98,0x9A), o3(0xEB,0x98,0x9B),
-     o3(0xEB,0x98,0x9C), o3(0xEB,0x98,0x9D),
-     o3(0xEB,0x98,0x9E), o3(0xEB,0x98,0x9F),
-     o3(0xEB,0x98,0xA0), o3(0xEB,0x98,0xA1),
-     o3(0xEB,0x98,0xA2), o3(0xEB,0x98,0xA3),
-     o3(0xEB,0x98,0xA4), o3(0xEB,0x98,0xA6),
-     o3(0xEB,0x98,0xA7), o3(0xEB,0x98,0xA8),
-     o3(0xEB,0x98,0xA9), o3(0xEB,0x98,0xAA),
-     o3(0xEB,0x98,0xAB), o3(0xEB,0x98,0xAD),
-     o3(0xEB,0x98,0xAE), o3(0xEB,0x98,0xAF),
-     o3(0xEB,0x98,0xB0), o3(0xEB,0x98,0xB1),
-     o3(0xEB,0x98,0xB2), o3(0xEB,0x98,0xB3),
-     o3(0xEB,0x98,0xB5), o3(0xEB,0x98,0xB6),
-     o3(0xEB,0x98,0xB7), o3(0xEB,0x98,0xB8),
-     o3(0xEB,0x98,0xB9), o3(0xEB,0x98,0xBA),
-     o3(0xEB,0x98,0xBB), o3(0xEB,0x98,0xBC),
-     o3(0xEB,0x98,0xBD), o3(0xEB,0x98,0xBE),
-     o3(0xEB,0x98,0xBF), o3(0xEB,0x99,0x80),
-     o3(0xEB,0x99,0x81), o3(0xEB,0x99,0x82),
-     o3(0xEB,0x99,0x83), o3(0xEB,0x99,0x84),
-     o3(0xEB,0x99,0x85), o3(0xEB,0x99,0x86),
-     o3(0xEB,0x99,0x87), o3(0xEB,0x99,0x89),
-     o3(0xEB,0x99,0x8A), o3(0xEB,0x99,0x8B),
-     o3(0xEB,0x99,0x8C), o3(0xEB,0x99,0x8D),
-     o3(0xEB,0x99,0x8E), o3(0xEB,0x99,0x8F),
-     o3(0xEB,0x99,0x90), o3(0xEB,0x99,0x91),
-     o3(0xEB,0x99,0x92), o3(0xEB,0x99,0x93),
-     o3(0xEB,0x99,0x94), o3(0xEB,0x99,0x95),
-     o3(0xEB,0x99,0x96), o3(0xEB,0x99,0x97),
-     o3(0xEB,0x99,0x98), o3(0xEB,0x99,0x99),
-     o3(0xEB,0x99,0x9A), o3(0xEB,0x99,0x9B),
-     o3(0xEB,0x99,0x9C), o3(0xEB,0x99,0x9D),
-     o3(0xEB,0x99,0x9E), o3(0xEB,0x99,0x9F),
-     o3(0xEB,0x99,0xA0), o3(0xEB,0x99,0xA1),
-     o3(0xEB,0x99,0xA2), o3(0xEB,0x99,0xA3),
-     o3(0xEB,0x99,0xA5), o3(0xEB,0x99,0xA6),
-     o3(0xEB,0x99,0xA7), o3(0xEB,0x99,0xA9),
-     o3(0xEB,0x99,0xAA), o3(0xEB,0x99,0xAB),
-     o3(0xEB,0x99,0xAC), o3(0xEB,0x99,0xAD),
-     o3(0xEB,0x99,0xAE), o3(0xEB,0x99,0xAF),
-     o3(0xEB,0x99,0xB0), o3(0xEB,0x99,0xB1),
-     o3(0xEB,0x99,0xB2), o3(0xEB,0x99,0xB3),
-     o3(0xEB,0x99,0xB4), o3(0xEB,0x99,0xB5),
-     o3(0xEB,0x99,0xB6), o3(0xEB,0x99,0xB7),
-     o3(0xEB,0x99,0xB8), o3(0xEB,0x99,0xB9),
-     o3(0xEB,0x99,0xBA), o3(0xEB,0x99,0xBB),
-     o3(0xEB,0x99,0xBC), o3(0xEB,0x99,0xBD),
-     o3(0xEB,0x99,0xBE), o3(0xEB,0x99,0xBF),
-     o3(0xEB,0x9A,0x80), o3(0xEB,0x9A,0x81),
-     o3(0xEB,0x9A,0x82), o3(0xEB,0x9A,0x83),
-     o3(0xEB,0x9A,0x84), o3(0xEB,0x9A,0x85),
-     o3(0xEB,0x9A,0x86), o3(0xEB,0x9A,0x87),
-     o3(0xEB,0x9A,0x88), o3(0xEB,0x9A,0x89),
-     o3(0xEB,0x9A,0x8A), o3(0xEB,0x9A,0x8B),
-     o3(0xEB,0x9A,0x8C), o3(0xEB,0x9A,0x8D),
-     o3(0xEB,0x9A,0x8E), o3(0xEB,0x9A,0x8F),
-     o3(0xEB,0x9A,0x90), o3(0xEB,0x9A,0x91),
-     o3(0xEB,0x9A,0x92), o3(0xEB,0x9A,0x93),
-     o3(0xEB,0x9A,0x94), o3(0xEB,0x9A,0x95),
-     o3(0xEB,0x9A,0x96), o3(0xEB,0x9A,0x97),
-     o3(0xEB,0x9A,0x98), o3(0xEB,0x9A,0x99),
-     o3(0xEB,0x9A,0x9A), o3(0xEB,0x9A,0x9B),
-     o3(0xEB,0x9A,0x9E), o3(0xEB,0x9A,0x9F),
-     o3(0xEB,0x9A,0xA1), o3(0xEB,0x9A,0xA2),
-     o3(0xEB,0x9A,0xA3), o3(0xEB,0x9A,0xA5),
-     o3(0xEB,0x9A,0xA6), o3(0xEB,0x9A,0xA7),
-     o3(0xEB,0x9A,0xA8), o3(0xEB,0x9A,0xA9),
-     o3(0xEB,0x9A,0xAA), o3(0xEB,0x9A,0xAD),
-     o3(0xEB,0x9A,0xAE), o3(0xEB,0x9A,0xAF),
-     o3(0xEB,0x9A,0xB0), o3(0xEB,0x9A,0xB2),
-     o3(0xEB,0x9A,0xB3), o3(0xEB,0x9A,0xB4),
-     o3(0xEB,0x9A,0xB5), o3(0xEB,0x9A,0xB6),
-     o3(0xEB,0x9A,0xB7), o3(0xEB,0x9A,0xB8),
-     o3(0xEB,0x9A,0xB9), o3(0xEB,0x9A,0xBA),
-     o3(0xEB,0x9A,0xBB), o3(0xEB,0x9A,0xBC),
-     o3(0xEB,0x9A,0xBD), o3(0xEB,0x9A,0xBE),
-     o3(0xEB,0x9A,0xBF), o3(0xEB,0x9B,0x80),
-     o3(0xEB,0x9B,0x81), o3(0xEB,0x9B,0x82),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8C = {
-    from_CP949_81_offsets,
-    from_CP949_8C_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8D_infos[179] = {
-     o3(0xEB,0x9B,0x83), o3(0xEB,0x9B,0x84),
-     o3(0xEB,0x9B,0x85), o3(0xEB,0x9B,0x86),
-     o3(0xEB,0x9B,0x87), o3(0xEB,0x9B,0x88),
-     o3(0xEB,0x9B,0x89), o3(0xEB,0x9B,0x8A),
-     o3(0xEB,0x9B,0x8B), o3(0xEB,0x9B,0x8C),
-     o3(0xEB,0x9B,0x8D), o3(0xEB,0x9B,0x8E),
-     o3(0xEB,0x9B,0x8F), o3(0xEB,0x9B,0x90),
-     o3(0xEB,0x9B,0x91), o3(0xEB,0x9B,0x92),
-     o3(0xEB,0x9B,0x93), o3(0xEB,0x9B,0x95),
-     o3(0xEB,0x9B,0x96), o3(0xEB,0x9B,0x97),
-     o3(0xEB,0x9B,0x98), o3(0xEB,0x9B,0x99),
-     o3(0xEB,0x9B,0x9A), o3(0xEB,0x9B,0x9B),
-     o3(0xEB,0x9B,0x9C), o3(0xEB,0x9B,0x9D),
-     o3(0xEB,0x9B,0x9E), o3(0xEB,0x9B,0x9F),
-     o3(0xEB,0x9B,0xA0), o3(0xEB,0x9B,0xA1),
-     o3(0xEB,0x9B,0xA2), o3(0xEB,0x9B,0xA3),
-     o3(0xEB,0x9B,0xA4), o3(0xEB,0x9B,0xA5),
-     o3(0xEB,0x9B,0xA6), o3(0xEB,0x9B,0xA7),
-     o3(0xEB,0x9B,0xA8), o3(0xEB,0x9B,0xA9),
-     o3(0xEB,0x9B,0xAA), o3(0xEB,0x9B,0xAB),
-     o3(0xEB,0x9B,0xAC), o3(0xEB,0x9B,0xAD),
-     o3(0xEB,0x9B,0xAE), o3(0xEB,0x9B,0xAF),
-     o3(0xEB,0x9B,0xB1), o3(0xEB,0x9B,0xB2),
-     o3(0xEB,0x9B,0xB3), o3(0xEB,0x9B,0xB5),
-     o3(0xEB,0x9B,0xB6), o3(0xEB,0x9B,0xB7),
-     o3(0xEB,0x9B,0xB9), o3(0xEB,0x9B,0xBA),
-     o3(0xEB,0x9B,0xBB), o3(0xEB,0x9B,0xBC),
-     o3(0xEB,0x9B,0xBD), o3(0xEB,0x9B,0xBE),
-     o3(0xEB,0x9B,0xBF), o3(0xEB,0x9C,0x82),
-     o3(0xEB,0x9C,0x83), o3(0xEB,0x9C,0x84),
-     o3(0xEB,0x9C,0x86), o3(0xEB,0x9C,0x87),
-     o3(0xEB,0x9C,0x88), o3(0xEB,0x9C,0x89),
-     o3(0xEB,0x9C,0x8A), o3(0xEB,0x9C,0x8B),
-     o3(0xEB,0x9C,0x8C), o3(0xEB,0x9C,0x8D),
-     o3(0xEB,0x9C,0x8E), o3(0xEB,0x9C,0x8F),
-     o3(0xEB,0x9C,0x90), o3(0xEB,0x9C,0x91),
-     o3(0xEB,0x9C,0x92), o3(0xEB,0x9C,0x93),
-     o3(0xEB,0x9C,0x94), o3(0xEB,0x9C,0x95),
-     o3(0xEB,0x9C,0x96), o3(0xEB,0x9C,0x97),
-     o3(0xEB,0x9C,0x98), o3(0xEB,0x9C,0x99),
-     o3(0xEB,0x9C,0x9A), o3(0xEB,0x9C,0x9B),
-     o3(0xEB,0x9C,0x9C), o3(0xEB,0x9C,0x9D),
-     o3(0xEB,0x9C,0x9E), o3(0xEB,0x9C,0x9F),
-     o3(0xEB,0x9C,0xA0), o3(0xEB,0x9C,0xA1),
-     o3(0xEB,0x9C,0xA2), o3(0xEB,0x9C,0xA3),
-     o3(0xEB,0x9C,0xA4), o3(0xEB,0x9C,0xA5),
-     o3(0xEB,0x9C,0xA6), o3(0xEB,0x9C,0xA7),
-     o3(0xEB,0x9C,0xAA), o3(0xEB,0x9C,0xAB),
-     o3(0xEB,0x9C,0xAD), o3(0xEB,0x9C,0xAE),
-     o3(0xEB,0x9C,0xB1), o3(0xEB,0x9C,0xB2),
-     o3(0xEB,0x9C,0xB3), o3(0xEB,0x9C,0xB4),
-     o3(0xEB,0x9C,0xB5), o3(0xEB,0x9C,0xB6),
-     o3(0xEB,0x9C,0xB7), o3(0xEB,0x9C,0xBA),
-     o3(0xEB,0x9C,0xBC), o3(0xEB,0x9C,0xBD),
-     o3(0xEB,0x9C,0xBE), o3(0xEB,0x9C,0xBF),
-     o3(0xEB,0x9D,0x80), o3(0xEB,0x9D,0x81),
-     o3(0xEB,0x9D,0x82), o3(0xEB,0x9D,0x83),
-     o3(0xEB,0x9D,0x85), o3(0xEB,0x9D,0x86),
-     o3(0xEB,0x9D,0x87), o3(0xEB,0x9D,0x89),
-     o3(0xEB,0x9D,0x8A), o3(0xEB,0x9D,0x8B),
-     o3(0xEB,0x9D,0x8D), o3(0xEB,0x9D,0x8E),
-     o3(0xEB,0x9D,0x8F), o3(0xEB,0x9D,0x90),
-     o3(0xEB,0x9D,0x91), o3(0xEB,0x9D,0x92),
-     o3(0xEB,0x9D,0x93), o3(0xEB,0x9D,0x96),
-     o3(0xEB,0x9D,0x97), o3(0xEB,0x9D,0x98),
-     o3(0xEB,0x9D,0x99), o3(0xEB,0x9D,0x9A),
-     o3(0xEB,0x9D,0x9B), o3(0xEB,0x9D,0x9C),
-     o3(0xEB,0x9D,0x9D), o3(0xEB,0x9D,0x9E),
-     o3(0xEB,0x9D,0x9F), o3(0xEB,0x9D,0xA1),
-     o3(0xEB,0x9D,0xA2), o3(0xEB,0x9D,0xA3),
-     o3(0xEB,0x9D,0xA5), o3(0xEB,0x9D,0xA6),
-     o3(0xEB,0x9D,0xA7), o3(0xEB,0x9D,0xA9),
-     o3(0xEB,0x9D,0xAA), o3(0xEB,0x9D,0xAB),
-     o3(0xEB,0x9D,0xAC), o3(0xEB,0x9D,0xAD),
-     o3(0xEB,0x9D,0xAE), o3(0xEB,0x9D,0xAF),
-     o3(0xEB,0x9D,0xB2), o3(0xEB,0x9D,0xB4),
-     o3(0xEB,0x9D,0xB6), o3(0xEB,0x9D,0xB7),
-     o3(0xEB,0x9D,0xB8), o3(0xEB,0x9D,0xB9),
-     o3(0xEB,0x9D,0xBA), o3(0xEB,0x9D,0xBB),
-     o3(0xEB,0x9D,0xBE), o3(0xEB,0x9D,0xBF),
-     o3(0xEB,0x9E,0x81), o3(0xEB,0x9E,0x82),
-     o3(0xEB,0x9E,0x83), o3(0xEB,0x9E,0x85),
-     o3(0xEB,0x9E,0x86), o3(0xEB,0x9E,0x87),
-     o3(0xEB,0x9E,0x88), o3(0xEB,0x9E,0x89),
-     o3(0xEB,0x9E,0x8A), o3(0xEB,0x9E,0x8B),
-     o3(0xEB,0x9E,0x8E), o3(0xEB,0x9E,0x93),
-     o3(0xEB,0x9E,0x94), o3(0xEB,0x9E,0x95),
-     o3(0xEB,0x9E,0x9A), o3(0xEB,0x9E,0x9B),
-     o3(0xEB,0x9E,0x9D), o3(0xEB,0x9E,0x9E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8D = {
-    from_CP949_81_offsets,
-    from_CP949_8D_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8E_infos[179] = {
-     o3(0xEB,0x9E,0x9F), o3(0xEB,0x9E,0xA1),
-     o3(0xEB,0x9E,0xA2), o3(0xEB,0x9E,0xA3),
-     o3(0xEB,0x9E,0xA4), o3(0xEB,0x9E,0xA5),
-     o3(0xEB,0x9E,0xA6), o3(0xEB,0x9E,0xA7),
-     o3(0xEB,0x9E,0xAA), o3(0xEB,0x9E,0xAE),
-     o3(0xEB,0x9E,0xAF), o3(0xEB,0x9E,0xB0),
-     o3(0xEB,0x9E,0xB1), o3(0xEB,0x9E,0xB2),
-     o3(0xEB,0x9E,0xB3), o3(0xEB,0x9E,0xB6),
-     o3(0xEB,0x9E,0xB7), o3(0xEB,0x9E,0xB9),
-     o3(0xEB,0x9E,0xBA), o3(0xEB,0x9E,0xBB),
-     o3(0xEB,0x9E,0xBC), o3(0xEB,0x9E,0xBD),
-     o3(0xEB,0x9E,0xBE), o3(0xEB,0x9E,0xBF),
-     o3(0xEB,0x9F,0x80), o3(0xEB,0x9F,0x81),
-     o3(0xEB,0x9F,0x82), o3(0xEB,0x9F,0x83),
-     o3(0xEB,0x9F,0x84), o3(0xEB,0x9F,0x85),
-     o3(0xEB,0x9F,0x86), o3(0xEB,0x9F,0x88),
-     o3(0xEB,0x9F,0x8A), o3(0xEB,0x9F,0x8B),
-     o3(0xEB,0x9F,0x8C), o3(0xEB,0x9F,0x8D),
-     o3(0xEB,0x9F,0x8E), o3(0xEB,0x9F,0x8F),
-     o3(0xEB,0x9F,0x90), o3(0xEB,0x9F,0x91),
-     o3(0xEB,0x9F,0x92), o3(0xEB,0x9F,0x93),
-     o3(0xEB,0x9F,0x94), o3(0xEB,0x9F,0x95),
-     o3(0xEB,0x9F,0x96), o3(0xEB,0x9F,0x97),
-     o3(0xEB,0x9F,0x98), o3(0xEB,0x9F,0x99),
-     o3(0xEB,0x9F,0x9A), o3(0xEB,0x9F,0x9B),
-     o3(0xEB,0x9F,0x9C), o3(0xEB,0x9F,0x9D),
-     o3(0xEB,0x9F,0x9E), o3(0xEB,0x9F,0x9F),
-     o3(0xEB,0x9F,0xA0), o3(0xEB,0x9F,0xA1),
-     o3(0xEB,0x9F,0xA2), o3(0xEB,0x9F,0xA3),
-     o3(0xEB,0x9F,0xA4), o3(0xEB,0x9F,0xA5),
-     o3(0xEB,0x9F,0xA6), o3(0xEB,0x9F,0xA7),
-     o3(0xEB,0x9F,0xA8), o3(0xEB,0x9F,0xA9),
-     o3(0xEB,0x9F,0xAA), o3(0xEB,0x9F,0xAB),
-     o3(0xEB,0x9F,0xAE), o3(0xEB,0x9F,0xAF),
-     o3(0xEB,0x9F,0xB1), o3(0xEB,0x9F,0xB2),
-     o3(0xEB,0x9F,0xB3), o3(0xEB,0x9F,0xB5),
-     o3(0xEB,0x9F,0xB6), o3(0xEB,0x9F,0xB7),
-     o3(0xEB,0x9F,0xB8), o3(0xEB,0x9F,0xB9),
-     o3(0xEB,0x9F,0xBA), o3(0xEB,0x9F,0xBB),
-     o3(0xEB,0x9F,0xBE), o3(0xEB,0xA0,0x82),
-     o3(0xEB,0xA0,0x83), o3(0xEB,0xA0,0x84),
-     o3(0xEB,0xA0,0x85), o3(0xEB,0xA0,0x86),
-     o3(0xEB,0xA0,0x8A), o3(0xEB,0xA0,0x8B),
-     o3(0xEB,0xA0,0x8D), o3(0xEB,0xA0,0x8E),
-     o3(0xEB,0xA0,0x8F), o3(0xEB,0xA0,0x91),
-     o3(0xEB,0xA0,0x92), o3(0xEB,0xA0,0x93),
-     o3(0xEB,0xA0,0x94), o3(0xEB,0xA0,0x95),
-     o3(0xEB,0xA0,0x96), o3(0xEB,0xA0,0x97),
-     o3(0xEB,0xA0,0x9A), o3(0xEB,0xA0,0x9C),
-     o3(0xEB,0xA0,0x9E), o3(0xEB,0xA0,0x9F),
-     o3(0xEB,0xA0,0xA0), o3(0xEB,0xA0,0xA1),
-     o3(0xEB,0xA0,0xA2), o3(0xEB,0xA0,0xA3),
-     o3(0xEB,0xA0,0xA6), o3(0xEB,0xA0,0xA7),
-     o3(0xEB,0xA0,0xA9), o3(0xEB,0xA0,0xAA),
-     o3(0xEB,0xA0,0xAB), o3(0xEB,0xA0,0xAD),
-     o3(0xEB,0xA0,0xAE), o3(0xEB,0xA0,0xAF),
-     o3(0xEB,0xA0,0xB0), o3(0xEB,0xA0,0xB1),
-     o3(0xEB,0xA0,0xB2), o3(0xEB,0xA0,0xB3),
-     o3(0xEB,0xA0,0xB6), o3(0xEB,0xA0,0xBA),
-     o3(0xEB,0xA0,0xBB), o3(0xEB,0xA0,0xBC),
-     o3(0xEB,0xA0,0xBD), o3(0xEB,0xA0,0xBE),
-     o3(0xEB,0xA0,0xBF), o3(0xEB,0xA1,0x81),
-     o3(0xEB,0xA1,0x82), o3(0xEB,0xA1,0x83),
-     o3(0xEB,0xA1,0x85), o3(0xEB,0xA1,0x86),
-     o3(0xEB,0xA1,0x87), o3(0xEB,0xA1,0x88),
-     o3(0xEB,0xA1,0x89), o3(0xEB,0xA1,0x8A),
-     o3(0xEB,0xA1,0x8B), o3(0xEB,0xA1,0x8C),
-     o3(0xEB,0xA1,0x8D), o3(0xEB,0xA1,0x8E),
-     o3(0xEB,0xA1,0x8F), o3(0xEB,0xA1,0x90),
-     o3(0xEB,0xA1,0x92), o3(0xEB,0xA1,0x94),
-     o3(0xEB,0xA1,0x95), o3(0xEB,0xA1,0x96),
-     o3(0xEB,0xA1,0x97), o3(0xEB,0xA1,0x98),
-     o3(0xEB,0xA1,0x99), o3(0xEB,0xA1,0x9A),
-     o3(0xEB,0xA1,0x9B), o3(0xEB,0xA1,0x9E),
-     o3(0xEB,0xA1,0x9F), o3(0xEB,0xA1,0xA1),
-     o3(0xEB,0xA1,0xA2), o3(0xEB,0xA1,0xA3),
-     o3(0xEB,0xA1,0xA5), o3(0xEB,0xA1,0xA6),
-     o3(0xEB,0xA1,0xA7), o3(0xEB,0xA1,0xA8),
-     o3(0xEB,0xA1,0xA9), o3(0xEB,0xA1,0xAA),
-     o3(0xEB,0xA1,0xAB), o3(0xEB,0xA1,0xAE),
-     o3(0xEB,0xA1,0xB0), o3(0xEB,0xA1,0xB2),
-     o3(0xEB,0xA1,0xB3), o3(0xEB,0xA1,0xB4),
-     o3(0xEB,0xA1,0xB5), o3(0xEB,0xA1,0xB6),
-     o3(0xEB,0xA1,0xB7), o3(0xEB,0xA1,0xB9),
-     o3(0xEB,0xA1,0xBA), o3(0xEB,0xA1,0xBB),
-     o3(0xEB,0xA1,0xBD), o3(0xEB,0xA1,0xBE),
-     o3(0xEB,0xA1,0xBF), o3(0xEB,0xA2,0x80),
-     o3(0xEB,0xA2,0x81), o3(0xEB,0xA2,0x82),
-     o3(0xEB,0xA2,0x83), o3(0xEB,0xA2,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8E = {
-    from_CP949_81_offsets,
-    from_CP949_8E_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_8F_infos[179] = {
-     o3(0xEB,0xA2,0x85), o3(0xEB,0xA2,0x86),
-     o3(0xEB,0xA2,0x87), o3(0xEB,0xA2,0x88),
-     o3(0xEB,0xA2,0x89), o3(0xEB,0xA2,0x8A),
-     o3(0xEB,0xA2,0x8B), o3(0xEB,0xA2,0x8C),
-     o3(0xEB,0xA2,0x8E), o3(0xEB,0xA2,0x8F),
-     o3(0xEB,0xA2,0x90), o3(0xEB,0xA2,0x91),
-     o3(0xEB,0xA2,0x92), o3(0xEB,0xA2,0x93),
-     o3(0xEB,0xA2,0x94), o3(0xEB,0xA2,0x95),
-     o3(0xEB,0xA2,0x96), o3(0xEB,0xA2,0x97),
-     o3(0xEB,0xA2,0x98), o3(0xEB,0xA2,0x99),
-     o3(0xEB,0xA2,0x9A), o3(0xEB,0xA2,0x9B),
-     o3(0xEB,0xA2,0x9C), o3(0xEB,0xA2,0x9D),
-     o3(0xEB,0xA2,0x9E), o3(0xEB,0xA2,0x9F),
-     o3(0xEB,0xA2,0xA0), o3(0xEB,0xA2,0xA1),
-     o3(0xEB,0xA2,0xA2), o3(0xEB,0xA2,0xA3),
-     o3(0xEB,0xA2,0xA4), o3(0xEB,0xA2,0xA5),
-     o3(0xEB,0xA2,0xA6), o3(0xEB,0xA2,0xA7),
-     o3(0xEB,0xA2,0xA9), o3(0xEB,0xA2,0xAA),
-     o3(0xEB,0xA2,0xAB), o3(0xEB,0xA2,0xAC),
-     o3(0xEB,0xA2,0xAD), o3(0xEB,0xA2,0xAE),
-     o3(0xEB,0xA2,0xAF), o3(0xEB,0xA2,0xB1),
-     o3(0xEB,0xA2,0xB2), o3(0xEB,0xA2,0xB3),
-     o3(0xEB,0xA2,0xB5), o3(0xEB,0xA2,0xB6),
-     o3(0xEB,0xA2,0xB7), o3(0xEB,0xA2,0xB9),
-     o3(0xEB,0xA2,0xBA), o3(0xEB,0xA2,0xBB),
-     o3(0xEB,0xA2,0xBC), o3(0xEB,0xA2,0xBD),
-     o3(0xEB,0xA2,0xBE), o3(0xEB,0xA2,0xBF),
-     o3(0xEB,0xA3,0x82), o3(0xEB,0xA3,0x84),
-     o3(0xEB,0xA3,0x86), o3(0xEB,0xA3,0x87),
-     o3(0xEB,0xA3,0x88), o3(0xEB,0xA3,0x89),
-     o3(0xEB,0xA3,0x8A), o3(0xEB,0xA3,0x8B),
-     o3(0xEB,0xA3,0x8D), o3(0xEB,0xA3,0x8E),
-     o3(0xEB,0xA3,0x8F), o3(0xEB,0xA3,0x91),
-     o3(0xEB,0xA3,0x92), o3(0xEB,0xA3,0x93),
-     o3(0xEB,0xA3,0x95), o3(0xEB,0xA3,0x96),
-     o3(0xEB,0xA3,0x97), o3(0xEB,0xA3,0x98),
-     o3(0xEB,0xA3,0x99), o3(0xEB,0xA3,0x9A),
-     o3(0xEB,0xA3,0x9B), o3(0xEB,0xA3,0x9C),
-     o3(0xEB,0xA3,0x9E), o3(0xEB,0xA3,0xA0),
-     o3(0xEB,0xA3,0xA2), o3(0xEB,0xA3,0xA3),
-     o3(0xEB,0xA3,0xA4), o3(0xEB,0xA3,0xA5),
-     o3(0xEB,0xA3,0xA6), o3(0xEB,0xA3,0xA7),
-     o3(0xEB,0xA3,0xAA), o3(0xEB,0xA3,0xAB),
-     o3(0xEB,0xA3,0xAD), o3(0xEB,0xA3,0xAE),
-     o3(0xEB,0xA3,0xAF), o3(0xEB,0xA3,0xB1),
-     o3(0xEB,0xA3,0xB2), o3(0xEB,0xA3,0xB3),
-     o3(0xEB,0xA3,0xB4), o3(0xEB,0xA3,0xB5),
-     o3(0xEB,0xA3,0xB6), o3(0xEB,0xA3,0xB7),
-     o3(0xEB,0xA3,0xBA), o3(0xEB,0xA3,0xBC),
-     o3(0xEB,0xA3,0xBE), o3(0xEB,0xA3,0xBF),
-     o3(0xEB,0xA4,0x80), o3(0xEB,0xA4,0x81),
-     o3(0xEB,0xA4,0x82), o3(0xEB,0xA4,0x83),
-     o3(0xEB,0xA4,0x85), o3(0xEB,0xA4,0x86),
-     o3(0xEB,0xA4,0x87), o3(0xEB,0xA4,0x88),
-     o3(0xEB,0xA4,0x89), o3(0xEB,0xA4,0x8A),
-     o3(0xEB,0xA4,0x8B), o3(0xEB,0xA4,0x8C),
-     o3(0xEB,0xA4,0x8D), o3(0xEB,0xA4,0x8E),
-     o3(0xEB,0xA4,0x8F), o3(0xEB,0xA4,0x90),
-     o3(0xEB,0xA4,0x91), o3(0xEB,0xA4,0x92),
-     o3(0xEB,0xA4,0x93), o3(0xEB,0xA4,0x94),
-     o3(0xEB,0xA4,0x95), o3(0xEB,0xA4,0x96),
-     o3(0xEB,0xA4,0x97), o3(0xEB,0xA4,0x99),
-     o3(0xEB,0xA4,0x9A), o3(0xEB,0xA4,0x9B),
-     o3(0xEB,0xA4,0x9C), o3(0xEB,0xA4,0x9D),
-     o3(0xEB,0xA4,0x9E), o3(0xEB,0xA4,0x9F),
-     o3(0xEB,0xA4,0xA1), o3(0xEB,0xA4,0xA2),
-     o3(0xEB,0xA4,0xA3), o3(0xEB,0xA4,0xA4),
-     o3(0xEB,0xA4,0xA5), o3(0xEB,0xA4,0xA6),
-     o3(0xEB,0xA4,0xA7), o3(0xEB,0xA4,0xA8),
-     o3(0xEB,0xA4,0xA9), o3(0xEB,0xA4,0xAA),
-     o3(0xEB,0xA4,0xAB), o3(0xEB,0xA4,0xAC),
-     o3(0xEB,0xA4,0xAD), o3(0xEB,0xA4,0xAE),
-     o3(0xEB,0xA4,0xAF), o3(0xEB,0xA4,0xB0),
-     o3(0xEB,0xA4,0xB1), o3(0xEB,0xA4,0xB2),
-     o3(0xEB,0xA4,0xB3), o3(0xEB,0xA4,0xB4),
-     o3(0xEB,0xA4,0xB5), o3(0xEB,0xA4,0xB6),
-     o3(0xEB,0xA4,0xB7), o3(0xEB,0xA4,0xB8),
-     o3(0xEB,0xA4,0xB9), o3(0xEB,0xA4,0xBA),
-     o3(0xEB,0xA4,0xBB), o3(0xEB,0xA4,0xBE),
-     o3(0xEB,0xA4,0xBF), o3(0xEB,0xA5,0x81),
-     o3(0xEB,0xA5,0x82), o3(0xEB,0xA5,0x83),
-     o3(0xEB,0xA5,0x85), o3(0xEB,0xA5,0x86),
-     o3(0xEB,0xA5,0x87), o3(0xEB,0xA5,0x88),
-     o3(0xEB,0xA5,0x89), o3(0xEB,0xA5,0x8A),
-     o3(0xEB,0xA5,0x8B), o3(0xEB,0xA5,0x8D),
-     o3(0xEB,0xA5,0x8E), o3(0xEB,0xA5,0x90),
-     o3(0xEB,0xA5,0x92), o3(0xEB,0xA5,0x93),
-     o3(0xEB,0xA5,0x94), o3(0xEB,0xA5,0x95),
-     o3(0xEB,0xA5,0x96), o3(0xEB,0xA5,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_8F = {
-    from_CP949_81_offsets,
-    from_CP949_8F_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_90_infos[179] = {
-     o3(0xEB,0xA5,0x9A), o3(0xEB,0xA5,0x9B),
-     o3(0xEB,0xA5,0x9D), o3(0xEB,0xA5,0x9E),
-     o3(0xEB,0xA5,0x9F), o3(0xEB,0xA5,0xA1),
-     o3(0xEB,0xA5,0xA2), o3(0xEB,0xA5,0xA3),
-     o3(0xEB,0xA5,0xA4), o3(0xEB,0xA5,0xA5),
-     o3(0xEB,0xA5,0xA6), o3(0xEB,0xA5,0xA7),
-     o3(0xEB,0xA5,0xAA), o3(0xEB,0xA5,0xAC),
-     o3(0xEB,0xA5,0xAE), o3(0xEB,0xA5,0xAF),
-     o3(0xEB,0xA5,0xB0), o3(0xEB,0xA5,0xB1),
-     o3(0xEB,0xA5,0xB2), o3(0xEB,0xA5,0xB3),
-     o3(0xEB,0xA5,0xB6), o3(0xEB,0xA5,0xB7),
-     o3(0xEB,0xA5,0xB9), o3(0xEB,0xA5,0xBA),
-     o3(0xEB,0xA5,0xBB), o3(0xEB,0xA5,0xBD),
-     o3(0xEB,0xA5,0xBE), o3(0xEB,0xA5,0xBF),
-     o3(0xEB,0xA6,0x80), o3(0xEB,0xA6,0x81),
-     o3(0xEB,0xA6,0x82), o3(0xEB,0xA6,0x83),
-     o3(0xEB,0xA6,0x86), o3(0xEB,0xA6,0x88),
-     o3(0xEB,0xA6,0x8B), o3(0xEB,0xA6,0x8C),
-     o3(0xEB,0xA6,0x8F), o3(0xEB,0xA6,0x90),
-     o3(0xEB,0xA6,0x91), o3(0xEB,0xA6,0x92),
-     o3(0xEB,0xA6,0x93), o3(0xEB,0xA6,0x94),
-     o3(0xEB,0xA6,0x95), o3(0xEB,0xA6,0x96),
-     o3(0xEB,0xA6,0x97), o3(0xEB,0xA6,0x98),
-     o3(0xEB,0xA6,0x99), o3(0xEB,0xA6,0x9A),
-     o3(0xEB,0xA6,0x9B), o3(0xEB,0xA6,0x9C),
-     o3(0xEB,0xA6,0x9D), o3(0xEB,0xA6,0x9E),
-     o3(0xEB,0xA6,0x9F), o3(0xEB,0xA6,0xA0),
-     o3(0xEB,0xA6,0xA1), o3(0xEB,0xA6,0xA2),
-     o3(0xEB,0xA6,0xA3), o3(0xEB,0xA6,0xA4),
-     o3(0xEB,0xA6,0xA5), o3(0xEB,0xA6,0xA6),
-     o3(0xEB,0xA6,0xA7), o3(0xEB,0xA6,0xA8),
-     o3(0xEB,0xA6,0xA9), o3(0xEB,0xA6,0xAA),
-     o3(0xEB,0xA6,0xAB), o3(0xEB,0xA6,0xAE),
-     o3(0xEB,0xA6,0xAF), o3(0xEB,0xA6,0xB1),
-     o3(0xEB,0xA6,0xB2), o3(0xEB,0xA6,0xB3),
-     o3(0xEB,0xA6,0xB5), o3(0xEB,0xA6,0xB6),
-     o3(0xEB,0xA6,0xB7), o3(0xEB,0xA6,0xB8),
-     o3(0xEB,0xA6,0xB9), o3(0xEB,0xA6,0xBA),
-     o3(0xEB,0xA6,0xBB), o3(0xEB,0xA6,0xBE),
-     o3(0xEB,0xA7,0x80), o3(0xEB,0xA7,0x82),
-     o3(0xEB,0xA7,0x83), o3(0xEB,0xA7,0x84),
-     o3(0xEB,0xA7,0x85), o3(0xEB,0xA7,0x86),
-     o3(0xEB,0xA7,0x87), o3(0xEB,0xA7,0x8A),
-     o3(0xEB,0xA7,0x8B), o3(0xEB,0xA7,0x8D),
-     o3(0xEB,0xA7,0x93), o3(0xEB,0xA7,0x94),
-     o3(0xEB,0xA7,0x95), o3(0xEB,0xA7,0x96),
-     o3(0xEB,0xA7,0x97), o3(0xEB,0xA7,0x9A),
-     o3(0xEB,0xA7,0x9C), o3(0xEB,0xA7,0x9F),
-     o3(0xEB,0xA7,0xA0), o3(0xEB,0xA7,0xA2),
-     o3(0xEB,0xA7,0xA6), o3(0xEB,0xA7,0xA7),
-     o3(0xEB,0xA7,0xA9), o3(0xEB,0xA7,0xAA),
-     o3(0xEB,0xA7,0xAB), o3(0xEB,0xA7,0xAD),
-     o3(0xEB,0xA7,0xAE), o3(0xEB,0xA7,0xAF),
-     o3(0xEB,0xA7,0xB0), o3(0xEB,0xA7,0xB1),
-     o3(0xEB,0xA7,0xB2), o3(0xEB,0xA7,0xB3),
-     o3(0xEB,0xA7,0xB6), o3(0xEB,0xA7,0xBB),
-     o3(0xEB,0xA7,0xBC), o3(0xEB,0xA7,0xBD),
-     o3(0xEB,0xA7,0xBE), o3(0xEB,0xA7,0xBF),
-     o3(0xEB,0xA8,0x82), o3(0xEB,0xA8,0x83),
-     o3(0xEB,0xA8,0x84), o3(0xEB,0xA8,0x85),
-     o3(0xEB,0xA8,0x86), o3(0xEB,0xA8,0x87),
-     o3(0xEB,0xA8,0x89), o3(0xEB,0xA8,0x8A),
-     o3(0xEB,0xA8,0x8B), o3(0xEB,0xA8,0x8C),
-     o3(0xEB,0xA8,0x8D), o3(0xEB,0xA8,0x8E),
-     o3(0xEB,0xA8,0x8F), o3(0xEB,0xA8,0x90),
-     o3(0xEB,0xA8,0x91), o3(0xEB,0xA8,0x92),
-     o3(0xEB,0xA8,0x93), o3(0xEB,0xA8,0x94),
-     o3(0xEB,0xA8,0x96), o3(0xEB,0xA8,0x97),
-     o3(0xEB,0xA8,0x98), o3(0xEB,0xA8,0x99),
-     o3(0xEB,0xA8,0x9A), o3(0xEB,0xA8,0x9B),
-     o3(0xEB,0xA8,0x9C), o3(0xEB,0xA8,0x9D),
-     o3(0xEB,0xA8,0x9E), o3(0xEB,0xA8,0x9F),
-     o3(0xEB,0xA8,0xA0), o3(0xEB,0xA8,0xA1),
-     o3(0xEB,0xA8,0xA2), o3(0xEB,0xA8,0xA3),
-     o3(0xEB,0xA8,0xA4), o3(0xEB,0xA8,0xA5),
-     o3(0xEB,0xA8,0xA6), o3(0xEB,0xA8,0xA7),
-     o3(0xEB,0xA8,0xA8), o3(0xEB,0xA8,0xA9),
-     o3(0xEB,0xA8,0xAA), o3(0xEB,0xA8,0xAB),
-     o3(0xEB,0xA8,0xAC), o3(0xEB,0xA8,0xAD),
-     o3(0xEB,0xA8,0xAE), o3(0xEB,0xA8,0xAF),
-     o3(0xEB,0xA8,0xB0), o3(0xEB,0xA8,0xB1),
-     o3(0xEB,0xA8,0xB2), o3(0xEB,0xA8,0xB3),
-     o3(0xEB,0xA8,0xB4), o3(0xEB,0xA8,0xB5),
-     o3(0xEB,0xA8,0xB6), o3(0xEB,0xA8,0xB7),
-     o3(0xEB,0xA8,0xBA), o3(0xEB,0xA8,0xBB),
-     o3(0xEB,0xA8,0xBD), o3(0xEB,0xA8,0xBE),
-     o3(0xEB,0xA8,0xBF), o3(0xEB,0xA9,0x81),
-     o3(0xEB,0xA9,0x83), o3(0xEB,0xA9,0x84),
-     o3(0xEB,0xA9,0x85), o3(0xEB,0xA9,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_90 = {
-    from_CP949_81_offsets,
-    from_CP949_90_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_91_infos[179] = {
-     o3(0xEB,0xA9,0x87), o3(0xEB,0xA9,0x8A),
-     o3(0xEB,0xA9,0x8C), o3(0xEB,0xA9,0x8F),
-     o3(0xEB,0xA9,0x90), o3(0xEB,0xA9,0x91),
-     o3(0xEB,0xA9,0x92), o3(0xEB,0xA9,0x96),
-     o3(0xEB,0xA9,0x97), o3(0xEB,0xA9,0x99),
-     o3(0xEB,0xA9,0x9A), o3(0xEB,0xA9,0x9B),
-     o3(0xEB,0xA9,0x9D), o3(0xEB,0xA9,0x9E),
-     o3(0xEB,0xA9,0x9F), o3(0xEB,0xA9,0xA0),
-     o3(0xEB,0xA9,0xA1), o3(0xEB,0xA9,0xA2),
-     o3(0xEB,0xA9,0xA3), o3(0xEB,0xA9,0xA6),
-     o3(0xEB,0xA9,0xAA), o3(0xEB,0xA9,0xAB),
-     o3(0xEB,0xA9,0xAC), o3(0xEB,0xA9,0xAD),
-     o3(0xEB,0xA9,0xAE), o3(0xEB,0xA9,0xAF),
-     o3(0xEB,0xA9,0xB2), o3(0xEB,0xA9,0xB3),
-     o3(0xEB,0xA9,0xB5), o3(0xEB,0xA9,0xB6),
-     o3(0xEB,0xA9,0xB7), o3(0xEB,0xA9,0xB9),
-     o3(0xEB,0xA9,0xBA), o3(0xEB,0xA9,0xBB),
-     o3(0xEB,0xA9,0xBC), o3(0xEB,0xA9,0xBD),
-     o3(0xEB,0xA9,0xBE), o3(0xEB,0xA9,0xBF),
-     o3(0xEB,0xAA,0x80), o3(0xEB,0xAA,0x81),
-     o3(0xEB,0xAA,0x82), o3(0xEB,0xAA,0x86),
-     o3(0xEB,0xAA,0x88), o3(0xEB,0xAA,0x89),
-     o3(0xEB,0xAA,0x8A), o3(0xEB,0xAA,0x8B),
-     o3(0xEB,0xAA,0x8D), o3(0xEB,0xAA,0x8E),
-     o3(0xEB,0xAA,0x8F), o3(0xEB,0xAA,0x90),
-     o3(0xEB,0xAA,0x91), o3(0xEB,0xAA,0x92),
-     o3(0xEB,0xAA,0x93), o3(0xEB,0xAA,0x94),
-     o3(0xEB,0xAA,0x95), o3(0xEB,0xAA,0x96),
-     o3(0xEB,0xAA,0x97), o3(0xEB,0xAA,0x98),
-     o3(0xEB,0xAA,0x99), o3(0xEB,0xAA,0x9A),
-     o3(0xEB,0xAA,0x9B), o3(0xEB,0xAA,0x9C),
-     o3(0xEB,0xAA,0x9D), o3(0xEB,0xAA,0x9E),
-     o3(0xEB,0xAA,0x9F), o3(0xEB,0xAA,0xA0),
-     o3(0xEB,0xAA,0xA1), o3(0xEB,0xAA,0xA2),
-     o3(0xEB,0xAA,0xA3), o3(0xEB,0xAA,0xA4),
-     o3(0xEB,0xAA,0xA5), o3(0xEB,0xAA,0xA6),
-     o3(0xEB,0xAA,0xA7), o3(0xEB,0xAA,0xAA),
-     o3(0xEB,0xAA,0xAD), o3(0xEB,0xAA,0xAE),
-     o3(0xEB,0xAA,0xAF), o3(0xEB,0xAA,0xB1),
-     o3(0xEB,0xAA,0xB3), o3(0xEB,0xAA,0xB4),
-     o3(0xEB,0xAA,0xB5), o3(0xEB,0xAA,0xB6),
-     o3(0xEB,0xAA,0xB7), o3(0xEB,0xAA,0xBA),
-     o3(0xEB,0xAA,0xBC), o3(0xEB,0xAA,0xBE),
-     o3(0xEB,0xAA,0xBF), o3(0xEB,0xAB,0x80),
-     o3(0xEB,0xAB,0x81), o3(0xEB,0xAB,0x82),
-     o3(0xEB,0xAB,0x83), o3(0xEB,0xAB,0x85),
-     o3(0xEB,0xAB,0x86), o3(0xEB,0xAB,0x87),
-     o3(0xEB,0xAB,0x89), o3(0xEB,0xAB,0x8A),
-     o3(0xEB,0xAB,0x8B), o3(0xEB,0xAB,0x8C),
-     o3(0xEB,0xAB,0x8D), o3(0xEB,0xAB,0x8E),
-     o3(0xEB,0xAB,0x8F), o3(0xEB,0xAB,0x90),
-     o3(0xEB,0xAB,0x91), o3(0xEB,0xAB,0x92),
-     o3(0xEB,0xAB,0x93), o3(0xEB,0xAB,0x94),
-     o3(0xEB,0xAB,0x95), o3(0xEB,0xAB,0x96),
-     o3(0xEB,0xAB,0x97), o3(0xEB,0xAB,0x9A),
-     o3(0xEB,0xAB,0x9B), o3(0xEB,0xAB,0x9C),
-     o3(0xEB,0xAB,0x9D), o3(0xEB,0xAB,0x9E),
-     o3(0xEB,0xAB,0x9F), o3(0xEB,0xAB,0xA0),
-     o3(0xEB,0xAB,0xA1), o3(0xEB,0xAB,0xA2),
-     o3(0xEB,0xAB,0xA3), o3(0xEB,0xAB,0xA4),
-     o3(0xEB,0xAB,0xA5), o3(0xEB,0xAB,0xA6),
-     o3(0xEB,0xAB,0xA7), o3(0xEB,0xAB,0xA8),
-     o3(0xEB,0xAB,0xA9), o3(0xEB,0xAB,0xAA),
-     o3(0xEB,0xAB,0xAB), o3(0xEB,0xAB,0xAC),
-     o3(0xEB,0xAB,0xAD), o3(0xEB,0xAB,0xAE),
-     o3(0xEB,0xAB,0xAF), o3(0xEB,0xAB,0xB0),
-     o3(0xEB,0xAB,0xB1), o3(0xEB,0xAB,0xB2),
-     o3(0xEB,0xAB,0xB3), o3(0xEB,0xAB,0xB4),
-     o3(0xEB,0xAB,0xB5), o3(0xEB,0xAB,0xB6),
-     o3(0xEB,0xAB,0xB7), o3(0xEB,0xAB,0xB8),
-     o3(0xEB,0xAB,0xB9), o3(0xEB,0xAB,0xBA),
-     o3(0xEB,0xAB,0xBB), o3(0xEB,0xAB,0xBD),
-     o3(0xEB,0xAB,0xBE), o3(0xEB,0xAB,0xBF),
-     o3(0xEB,0xAC,0x81), o3(0xEB,0xAC,0x82),
-     o3(0xEB,0xAC,0x83), o3(0xEB,0xAC,0x85),
-     o3(0xEB,0xAC,0x86), o3(0xEB,0xAC,0x87),
-     o3(0xEB,0xAC,0x88), o3(0xEB,0xAC,0x89),
-     o3(0xEB,0xAC,0x8A), o3(0xEB,0xAC,0x8B),
-     o3(0xEB,0xAC,0x8C), o3(0xEB,0xAC,0x8E),
-     o3(0xEB,0xAC,0x90), o3(0xEB,0xAC,0x92),
-     o3(0xEB,0xAC,0x93), o3(0xEB,0xAC,0x94),
-     o3(0xEB,0xAC,0x95), o3(0xEB,0xAC,0x96),
-     o3(0xEB,0xAC,0x97), o3(0xEB,0xAC,0x99),
-     o3(0xEB,0xAC,0x9A), o3(0xEB,0xAC,0x9B),
-     o3(0xEB,0xAC,0x9D), o3(0xEB,0xAC,0x9E),
-     o3(0xEB,0xAC,0x9F), o3(0xEB,0xAC,0xA1),
-     o3(0xEB,0xAC,0xA2), o3(0xEB,0xAC,0xA3),
-     o3(0xEB,0xAC,0xA4), o3(0xEB,0xAC,0xA5),
-     o3(0xEB,0xAC,0xA6), o3(0xEB,0xAC,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_91 = {
-    from_CP949_81_offsets,
-    from_CP949_91_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_92_infos[179] = {
-     o3(0xEB,0xAC,0xA8), o3(0xEB,0xAC,0xAA),
-     o3(0xEB,0xAC,0xAC), o3(0xEB,0xAC,0xAD),
-     o3(0xEB,0xAC,0xAE), o3(0xEB,0xAC,0xAF),
-     o3(0xEB,0xAC,0xB0), o3(0xEB,0xAC,0xB1),
-     o3(0xEB,0xAC,0xB2), o3(0xEB,0xAC,0xB3),
-     o3(0xEB,0xAC,0xB7), o3(0xEB,0xAC,0xB9),
-     o3(0xEB,0xAC,0xBA), o3(0xEB,0xAC,0xBF),
-     o3(0xEB,0xAD,0x80), o3(0xEB,0xAD,0x81),
-     o3(0xEB,0xAD,0x82), o3(0xEB,0xAD,0x83),
-     o3(0xEB,0xAD,0x86), o3(0xEB,0xAD,0x88),
-     o3(0xEB,0xAD,0x8A), o3(0xEB,0xAD,0x8B),
-     o3(0xEB,0xAD,0x8C), o3(0xEB,0xAD,0x8E),
-     o3(0xEB,0xAD,0x91), o3(0xEB,0xAD,0x92),
-     o3(0xEB,0xAD,0x93), o3(0xEB,0xAD,0x95),
-     o3(0xEB,0xAD,0x96), o3(0xEB,0xAD,0x97),
-     o3(0xEB,0xAD,0x99), o3(0xEB,0xAD,0x9A),
-     o3(0xEB,0xAD,0x9B), o3(0xEB,0xAD,0x9C),
-     o3(0xEB,0xAD,0x9D), o3(0xEB,0xAD,0x9E),
-     o3(0xEB,0xAD,0x9F), o3(0xEB,0xAD,0xA0),
-     o3(0xEB,0xAD,0xA2), o3(0xEB,0xAD,0xA4),
-     o3(0xEB,0xAD,0xA5), o3(0xEB,0xAD,0xA6),
-     o3(0xEB,0xAD,0xA7), o3(0xEB,0xAD,0xA8),
-     o3(0xEB,0xAD,0xA9), o3(0xEB,0xAD,0xAA),
-     o3(0xEB,0xAD,0xAB), o3(0xEB,0xAD,0xAD),
-     o3(0xEB,0xAD,0xAE), o3(0xEB,0xAD,0xAF),
-     o3(0xEB,0xAD,0xB0), o3(0xEB,0xAD,0xB1),
-     o3(0xEB,0xAD,0xB2), o3(0xEB,0xAD,0xB3),
-     o3(0xEB,0xAD,0xB4), o3(0xEB,0xAD,0xB5),
-     o3(0xEB,0xAD,0xB6), o3(0xEB,0xAD,0xB7),
-     o3(0xEB,0xAD,0xB8), o3(0xEB,0xAD,0xB9),
-     o3(0xEB,0xAD,0xBA), o3(0xEB,0xAD,0xBB),
-     o3(0xEB,0xAD,0xBC), o3(0xEB,0xAD,0xBD),
-     o3(0xEB,0xAD,0xBE), o3(0xEB,0xAD,0xBF),
-     o3(0xEB,0xAE,0x80), o3(0xEB,0xAE,0x81),
-     o3(0xEB,0xAE,0x82), o3(0xEB,0xAE,0x83),
-     o3(0xEB,0xAE,0x84), o3(0xEB,0xAE,0x85),
-     o3(0xEB,0xAE,0x86), o3(0xEB,0xAE,0x87),
-     o3(0xEB,0xAE,0x89), o3(0xEB,0xAE,0x8A),
-     o3(0xEB,0xAE,0x8B), o3(0xEB,0xAE,0x8D),
-     o3(0xEB,0xAE,0x8E), o3(0xEB,0xAE,0x8F),
-     o3(0xEB,0xAE,0x91), o3(0xEB,0xAE,0x92),
-     o3(0xEB,0xAE,0x93), o3(0xEB,0xAE,0x94),
-     o3(0xEB,0xAE,0x95), o3(0xEB,0xAE,0x96),
-     o3(0xEB,0xAE,0x97), o3(0xEB,0xAE,0x98),
-     o3(0xEB,0xAE,0x99), o3(0xEB,0xAE,0x9A),
-     o3(0xEB,0xAE,0x9B), o3(0xEB,0xAE,0x9C),
-     o3(0xEB,0xAE,0x9D), o3(0xEB,0xAE,0x9E),
-     o3(0xEB,0xAE,0x9F), o3(0xEB,0xAE,0xA0),
-     o3(0xEB,0xAE,0xA1), o3(0xEB,0xAE,0xA2),
-     o3(0xEB,0xAE,0xA3), o3(0xEB,0xAE,0xA5),
-     o3(0xEB,0xAE,0xA6), o3(0xEB,0xAE,0xA7),
-     o3(0xEB,0xAE,0xA9), o3(0xEB,0xAE,0xAA),
-     o3(0xEB,0xAE,0xAB), o3(0xEB,0xAE,0xAD),
-     o3(0xEB,0xAE,0xAE), o3(0xEB,0xAE,0xAF),
-     o3(0xEB,0xAE,0xB0), o3(0xEB,0xAE,0xB1),
-     o3(0xEB,0xAE,0xB2), o3(0xEB,0xAE,0xB3),
-     o3(0xEB,0xAE,0xB5), o3(0xEB,0xAE,0xB6),
-     o3(0xEB,0xAE,0xB8), o3(0xEB,0xAE,0xB9),
-     o3(0xEB,0xAE,0xBA), o3(0xEB,0xAE,0xBB),
-     o3(0xEB,0xAE,0xBC), o3(0xEB,0xAE,0xBD),
-     o3(0xEB,0xAE,0xBE), o3(0xEB,0xAE,0xBF),
-     o3(0xEB,0xAF,0x81), o3(0xEB,0xAF,0x82),
-     o3(0xEB,0xAF,0x83), o3(0xEB,0xAF,0x85),
-     o3(0xEB,0xAF,0x86), o3(0xEB,0xAF,0x87),
-     o3(0xEB,0xAF,0x89), o3(0xEB,0xAF,0x8A),
-     o3(0xEB,0xAF,0x8B), o3(0xEB,0xAF,0x8C),
-     o3(0xEB,0xAF,0x8D), o3(0xEB,0xAF,0x8E),
-     o3(0xEB,0xAF,0x8F), o3(0xEB,0xAF,0x91),
-     o3(0xEB,0xAF,0x92), o3(0xEB,0xAF,0x94),
-     o3(0xEB,0xAF,0x95), o3(0xEB,0xAF,0x96),
-     o3(0xEB,0xAF,0x97), o3(0xEB,0xAF,0x98),
-     o3(0xEB,0xAF,0x99), o3(0xEB,0xAF,0x9A),
-     o3(0xEB,0xAF,0x9B), o3(0xEB,0xAF,0x9C),
-     o3(0xEB,0xAF,0x9D), o3(0xEB,0xAF,0x9E),
-     o3(0xEB,0xAF,0x9F), o3(0xEB,0xAF,0xA0),
-     o3(0xEB,0xAF,0xA1), o3(0xEB,0xAF,0xA2),
-     o3(0xEB,0xAF,0xA3), o3(0xEB,0xAF,0xA4),
-     o3(0xEB,0xAF,0xA5), o3(0xEB,0xAF,0xA6),
-     o3(0xEB,0xAF,0xA7), o3(0xEB,0xAF,0xA8),
-     o3(0xEB,0xAF,0xA9), o3(0xEB,0xAF,0xAA),
-     o3(0xEB,0xAF,0xAB), o3(0xEB,0xAF,0xAC),
-     o3(0xEB,0xAF,0xAD), o3(0xEB,0xAF,0xAE),
-     o3(0xEB,0xAF,0xAF), o3(0xEB,0xAF,0xB0),
-     o3(0xEB,0xAF,0xB1), o3(0xEB,0xAF,0xB2),
-     o3(0xEB,0xAF,0xB3), o3(0xEB,0xAF,0xB4),
-     o3(0xEB,0xAF,0xB5), o3(0xEB,0xAF,0xB6),
-     o3(0xEB,0xAF,0xB7), o3(0xEB,0xAF,0xBA),
-     o3(0xEB,0xAF,0xBB), o3(0xEB,0xAF,0xBD),
-     o3(0xEB,0xAF,0xBE), o3(0xEB,0xB0,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_92 = {
-    from_CP949_81_offsets,
-    from_CP949_92_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_93_infos[179] = {
-     o3(0xEB,0xB0,0x83), o3(0xEB,0xB0,0x84),
-     o3(0xEB,0xB0,0x85), o3(0xEB,0xB0,0x86),
-     o3(0xEB,0xB0,0x87), o3(0xEB,0xB0,0x8A),
-     o3(0xEB,0xB0,0x8E), o3(0xEB,0xB0,0x90),
-     o3(0xEB,0xB0,0x92), o3(0xEB,0xB0,0x93),
-     o3(0xEB,0xB0,0x99), o3(0xEB,0xB0,0x9A),
-     o3(0xEB,0xB0,0xA0), o3(0xEB,0xB0,0xA1),
-     o3(0xEB,0xB0,0xA2), o3(0xEB,0xB0,0xA3),
-     o3(0xEB,0xB0,0xA6), o3(0xEB,0xB0,0xA8),
-     o3(0xEB,0xB0,0xAA), o3(0xEB,0xB0,0xAB),
-     o3(0xEB,0xB0,0xAC), o3(0xEB,0xB0,0xAE),
-     o3(0xEB,0xB0,0xAF), o3(0xEB,0xB0,0xB2),
-     o3(0xEB,0xB0,0xB3), o3(0xEB,0xB0,0xB5),
-     o3(0xEB,0xB0,0xB6), o3(0xEB,0xB0,0xB7),
-     o3(0xEB,0xB0,0xB9), o3(0xEB,0xB0,0xBA),
-     o3(0xEB,0xB0,0xBB), o3(0xEB,0xB0,0xBC),
-     o3(0xEB,0xB0,0xBD), o3(0xEB,0xB0,0xBE),
-     o3(0xEB,0xB0,0xBF), o3(0xEB,0xB1,0x82),
-     o3(0xEB,0xB1,0x86), o3(0xEB,0xB1,0x87),
-     o3(0xEB,0xB1,0x88), o3(0xEB,0xB1,0x8A),
-     o3(0xEB,0xB1,0x8B), o3(0xEB,0xB1,0x8E),
-     o3(0xEB,0xB1,0x8F), o3(0xEB,0xB1,0x91),
-     o3(0xEB,0xB1,0x92), o3(0xEB,0xB1,0x93),
-     o3(0xEB,0xB1,0x94), o3(0xEB,0xB1,0x95),
-     o3(0xEB,0xB1,0x96), o3(0xEB,0xB1,0x97),
-     o3(0xEB,0xB1,0x98), o3(0xEB,0xB1,0x99),
-     o3(0xEB,0xB1,0x9A), o3(0xEB,0xB1,0x9B),
-     o3(0xEB,0xB1,0x9C), o3(0xEB,0xB1,0x9E),
-     o3(0xEB,0xB1,0x9F), o3(0xEB,0xB1,0xA0),
-     o3(0xEB,0xB1,0xA1), o3(0xEB,0xB1,0xA2),
-     o3(0xEB,0xB1,0xA3), o3(0xEB,0xB1,0xA4),
-     o3(0xEB,0xB1,0xA5), o3(0xEB,0xB1,0xA6),
-     o3(0xEB,0xB1,0xA7), o3(0xEB,0xB1,0xA8),
-     o3(0xEB,0xB1,0xA9), o3(0xEB,0xB1,0xAA),
-     o3(0xEB,0xB1,0xAB), o3(0xEB,0xB1,0xAC),
-     o3(0xEB,0xB1,0xAD), o3(0xEB,0xB1,0xAE),
-     o3(0xEB,0xB1,0xAF), o3(0xEB,0xB1,0xB0),
-     o3(0xEB,0xB1,0xB1), o3(0xEB,0xB1,0xB2),
-     o3(0xEB,0xB1,0xB3), o3(0xEB,0xB1,0xB4),
-     o3(0xEB,0xB1,0xB5), o3(0xEB,0xB1,0xB6),
-     o3(0xEB,0xB1,0xB7), o3(0xEB,0xB1,0xB8),
-     o3(0xEB,0xB1,0xB9), o3(0xEB,0xB1,0xBA),
-     o3(0xEB,0xB1,0xBB), o3(0xEB,0xB1,0xBC),
-     o3(0xEB,0xB1,0xBD), o3(0xEB,0xB1,0xBE),
-     o3(0xEB,0xB1,0xBF), o3(0xEB,0xB2,0x80),
-     o3(0xEB,0xB2,0x81), o3(0xEB,0xB2,0x82),
-     o3(0xEB,0xB2,0x83), o3(0xEB,0xB2,0x86),
-     o3(0xEB,0xB2,0x87), o3(0xEB,0xB2,0x89),
-     o3(0xEB,0xB2,0x8A), o3(0xEB,0xB2,0x8D),
-     o3(0xEB,0xB2,0x8F), o3(0xEB,0xB2,0x90),
-     o3(0xEB,0xB2,0x91), o3(0xEB,0xB2,0x92),
-     o3(0xEB,0xB2,0x93), o3(0xEB,0xB2,0x96),
-     o3(0xEB,0xB2,0x98), o3(0xEB,0xB2,0x9B),
-     o3(0xEB,0xB2,0x9C), o3(0xEB,0xB2,0x9D),
-     o3(0xEB,0xB2,0x9E), o3(0xEB,0xB2,0x9F),
-     o3(0xEB,0xB2,0xA2), o3(0xEB,0xB2,0xA3),
-     o3(0xEB,0xB2,0xA5), o3(0xEB,0xB2,0xA6),
-     o3(0xEB,0xB2,0xA9), o3(0xEB,0xB2,0xAA),
-     o3(0xEB,0xB2,0xAB), o3(0xEB,0xB2,0xAC),
-     o3(0xEB,0xB2,0xAD), o3(0xEB,0xB2,0xAE),
-     o3(0xEB,0xB2,0xAF), o3(0xEB,0xB2,0xB2),
-     o3(0xEB,0xB2,0xB6), o3(0xEB,0xB2,0xB7),
-     o3(0xEB,0xB2,0xB8), o3(0xEB,0xB2,0xB9),
-     o3(0xEB,0xB2,0xBA), o3(0xEB,0xB2,0xBB),
-     o3(0xEB,0xB2,0xBE), o3(0xEB,0xB2,0xBF),
-     o3(0xEB,0xB3,0x81), o3(0xEB,0xB3,0x82),
-     o3(0xEB,0xB3,0x83), o3(0xEB,0xB3,0x85),
-     o3(0xEB,0xB3,0x86), o3(0xEB,0xB3,0x87),
-     o3(0xEB,0xB3,0x88), o3(0xEB,0xB3,0x89),
-     o3(0xEB,0xB3,0x8A), o3(0xEB,0xB3,0x8B),
-     o3(0xEB,0xB3,0x8C), o3(0xEB,0xB3,0x8E),
-     o3(0xEB,0xB3,0x92), o3(0xEB,0xB3,0x93),
-     o3(0xEB,0xB3,0x94), o3(0xEB,0xB3,0x96),
-     o3(0xEB,0xB3,0x97), o3(0xEB,0xB3,0x99),
-     o3(0xEB,0xB3,0x9A), o3(0xEB,0xB3,0x9B),
-     o3(0xEB,0xB3,0x9D), o3(0xEB,0xB3,0x9E),
-     o3(0xEB,0xB3,0x9F), o3(0xEB,0xB3,0xA0),
-     o3(0xEB,0xB3,0xA1), o3(0xEB,0xB3,0xA2),
-     o3(0xEB,0xB3,0xA3), o3(0xEB,0xB3,0xA4),
-     o3(0xEB,0xB3,0xA5), o3(0xEB,0xB3,0xA6),
-     o3(0xEB,0xB3,0xA7), o3(0xEB,0xB3,0xA8),
-     o3(0xEB,0xB3,0xA9), o3(0xEB,0xB3,0xAA),
-     o3(0xEB,0xB3,0xAB), o3(0xEB,0xB3,0xAC),
-     o3(0xEB,0xB3,0xAD), o3(0xEB,0xB3,0xAE),
-     o3(0xEB,0xB3,0xAF), o3(0xEB,0xB3,0xB0),
-     o3(0xEB,0xB3,0xB1), o3(0xEB,0xB3,0xB2),
-     o3(0xEB,0xB3,0xB3), o3(0xEB,0xB3,0xB7),
-     o3(0xEB,0xB3,0xB9), o3(0xEB,0xB3,0xBA),
-     o3(0xEB,0xB3,0xBB), o3(0xEB,0xB3,0xBD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_93 = {
-    from_CP949_81_offsets,
-    from_CP949_93_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_94_infos[179] = {
-     o3(0xEB,0xB3,0xBE), o3(0xEB,0xB3,0xBF),
-     o3(0xEB,0xB4,0x80), o3(0xEB,0xB4,0x81),
-     o3(0xEB,0xB4,0x82), o3(0xEB,0xB4,0x83),
-     o3(0xEB,0xB4,0x86), o3(0xEB,0xB4,0x88),
-     o3(0xEB,0xB4,0x8A), o3(0xEB,0xB4,0x8B),
-     o3(0xEB,0xB4,0x8C), o3(0xEB,0xB4,0x8D),
-     o3(0xEB,0xB4,0x8E), o3(0xEB,0xB4,0x8F),
-     o3(0xEB,0xB4,0x91), o3(0xEB,0xB4,0x92),
-     o3(0xEB,0xB4,0x93), o3(0xEB,0xB4,0x95),
-     o3(0xEB,0xB4,0x96), o3(0xEB,0xB4,0x97),
-     o3(0xEB,0xB4,0x98), o3(0xEB,0xB4,0x99),
-     o3(0xEB,0xB4,0x9A), o3(0xEB,0xB4,0x9B),
-     o3(0xEB,0xB4,0x9C), o3(0xEB,0xB4,0x9D),
-     o3(0xEB,0xB4,0x9E), o3(0xEB,0xB4,0x9F),
-     o3(0xEB,0xB4,0xA0), o3(0xEB,0xB4,0xA1),
-     o3(0xEB,0xB4,0xA2), o3(0xEB,0xB4,0xA3),
-     o3(0xEB,0xB4,0xA5), o3(0xEB,0xB4,0xA6),
-     o3(0xEB,0xB4,0xA7), o3(0xEB,0xB4,0xA8),
-     o3(0xEB,0xB4,0xA9), o3(0xEB,0xB4,0xAA),
-     o3(0xEB,0xB4,0xAB), o3(0xEB,0xB4,0xAD),
-     o3(0xEB,0xB4,0xAE), o3(0xEB,0xB4,0xAF),
-     o3(0xEB,0xB4,0xB0), o3(0xEB,0xB4,0xB1),
-     o3(0xEB,0xB4,0xB2), o3(0xEB,0xB4,0xB3),
-     o3(0xEB,0xB4,0xB4), o3(0xEB,0xB4,0xB5),
-     o3(0xEB,0xB4,0xB6), o3(0xEB,0xB4,0xB7),
-     o3(0xEB,0xB4,0xB8), o3(0xEB,0xB4,0xB9),
-     o3(0xEB,0xB4,0xBA), o3(0xEB,0xB4,0xBB),
-     o3(0xEB,0xB4,0xBC), o3(0xEB,0xB4,0xBD),
-     o3(0xEB,0xB4,0xBE), o3(0xEB,0xB4,0xBF),
-     o3(0xEB,0xB5,0x81), o3(0xEB,0xB5,0x82),
-     o3(0xEB,0xB5,0x83), o3(0xEB,0xB5,0x84),
-     o3(0xEB,0xB5,0x85), o3(0xEB,0xB5,0x86),
-     o3(0xEB,0xB5,0x87), o3(0xEB,0xB5,0x8A),
-     o3(0xEB,0xB5,0x8B), o3(0xEB,0xB5,0x8D),
-     o3(0xEB,0xB5,0x8E), o3(0xEB,0xB5,0x8F),
-     o3(0xEB,0xB5,0x91), o3(0xEB,0xB5,0x92),
-     o3(0xEB,0xB5,0x93), o3(0xEB,0xB5,0x94),
-     o3(0xEB,0xB5,0x95), o3(0xEB,0xB5,0x96),
-     o3(0xEB,0xB5,0x97), o3(0xEB,0xB5,0x9A),
-     o3(0xEB,0xB5,0x9B), o3(0xEB,0xB5,0x9C),
-     o3(0xEB,0xB5,0x9D), o3(0xEB,0xB5,0x9E),
-     o3(0xEB,0xB5,0x9F), o3(0xEB,0xB5,0xA0),
-     o3(0xEB,0xB5,0xA1), o3(0xEB,0xB5,0xA2),
-     o3(0xEB,0xB5,0xA3), o3(0xEB,0xB5,0xA5),
-     o3(0xEB,0xB5,0xA6), o3(0xEB,0xB5,0xA7),
-     o3(0xEB,0xB5,0xA9), o3(0xEB,0xB5,0xAA),
-     o3(0xEB,0xB5,0xAB), o3(0xEB,0xB5,0xAC),
-     o3(0xEB,0xB5,0xAD), o3(0xEB,0xB5,0xAE),
-     o3(0xEB,0xB5,0xAF), o3(0xEB,0xB5,0xB0),
-     o3(0xEB,0xB5,0xB1), o3(0xEB,0xB5,0xB2),
-     o3(0xEB,0xB5,0xB3), o3(0xEB,0xB5,0xB4),
-     o3(0xEB,0xB5,0xB5), o3(0xEB,0xB5,0xB6),
-     o3(0xEB,0xB5,0xB7), o3(0xEB,0xB5,0xB8),
-     o3(0xEB,0xB5,0xB9), o3(0xEB,0xB5,0xBA),
-     o3(0xEB,0xB5,0xBB), o3(0xEB,0xB5,0xBC),
-     o3(0xEB,0xB5,0xBD), o3(0xEB,0xB5,0xBE),
-     o3(0xEB,0xB5,0xBF), o3(0xEB,0xB6,0x82),
-     o3(0xEB,0xB6,0x83), o3(0xEB,0xB6,0x85),
-     o3(0xEB,0xB6,0x86), o3(0xEB,0xB6,0x8B),
-     o3(0xEB,0xB6,0x8C), o3(0xEB,0xB6,0x8D),
-     o3(0xEB,0xB6,0x8E), o3(0xEB,0xB6,0x8F),
-     o3(0xEB,0xB6,0x92), o3(0xEB,0xB6,0x94),
-     o3(0xEB,0xB6,0x96), o3(0xEB,0xB6,0x97),
-     o3(0xEB,0xB6,0x98), o3(0xEB,0xB6,0x9B),
-     o3(0xEB,0xB6,0x9D), o3(0xEB,0xB6,0x9E),
-     o3(0xEB,0xB6,0x9F), o3(0xEB,0xB6,0xA0),
-     o3(0xEB,0xB6,0xA1), o3(0xEB,0xB6,0xA2),
-     o3(0xEB,0xB6,0xA3), o3(0xEB,0xB6,0xA5),
-     o3(0xEB,0xB6,0xA6), o3(0xEB,0xB6,0xA7),
-     o3(0xEB,0xB6,0xA8), o3(0xEB,0xB6,0xA9),
-     o3(0xEB,0xB6,0xAA), o3(0xEB,0xB6,0xAB),
-     o3(0xEB,0xB6,0xAC), o3(0xEB,0xB6,0xAD),
-     o3(0xEB,0xB6,0xAE), o3(0xEB,0xB6,0xAF),
-     o3(0xEB,0xB6,0xB1), o3(0xEB,0xB6,0xB2),
-     o3(0xEB,0xB6,0xB3), o3(0xEB,0xB6,0xB4),
-     o3(0xEB,0xB6,0xB5), o3(0xEB,0xB6,0xB6),
-     o3(0xEB,0xB6,0xB7), o3(0xEB,0xB6,0xB9),
-     o3(0xEB,0xB6,0xBA), o3(0xEB,0xB6,0xBB),
-     o3(0xEB,0xB6,0xBC), o3(0xEB,0xB6,0xBD),
-     o3(0xEB,0xB6,0xBE), o3(0xEB,0xB6,0xBF),
-     o3(0xEB,0xB7,0x80), o3(0xEB,0xB7,0x81),
-     o3(0xEB,0xB7,0x82), o3(0xEB,0xB7,0x83),
-     o3(0xEB,0xB7,0x84), o3(0xEB,0xB7,0x85),
-     o3(0xEB,0xB7,0x86), o3(0xEB,0xB7,0x87),
-     o3(0xEB,0xB7,0x88), o3(0xEB,0xB7,0x89),
-     o3(0xEB,0xB7,0x8A), o3(0xEB,0xB7,0x8B),
-     o3(0xEB,0xB7,0x8C), o3(0xEB,0xB7,0x8D),
-     o3(0xEB,0xB7,0x8E), o3(0xEB,0xB7,0x8F),
-     o3(0xEB,0xB7,0x90), o3(0xEB,0xB7,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_94 = {
-    from_CP949_81_offsets,
-    from_CP949_94_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_95_infos[179] = {
-     o3(0xEB,0xB7,0x92), o3(0xEB,0xB7,0x93),
-     o3(0xEB,0xB7,0x96), o3(0xEB,0xB7,0x97),
-     o3(0xEB,0xB7,0x99), o3(0xEB,0xB7,0x9A),
-     o3(0xEB,0xB7,0x9B), o3(0xEB,0xB7,0x9D),
-     o3(0xEB,0xB7,0x9E), o3(0xEB,0xB7,0x9F),
-     o3(0xEB,0xB7,0xA0), o3(0xEB,0xB7,0xA1),
-     o3(0xEB,0xB7,0xA2), o3(0xEB,0xB7,0xA3),
-     o3(0xEB,0xB7,0xA4), o3(0xEB,0xB7,0xA5),
-     o3(0xEB,0xB7,0xA6), o3(0xEB,0xB7,0xA7),
-     o3(0xEB,0xB7,0xA8), o3(0xEB,0xB7,0xAA),
-     o3(0xEB,0xB7,0xAB), o3(0xEB,0xB7,0xAC),
-     o3(0xEB,0xB7,0xAD), o3(0xEB,0xB7,0xAE),
-     o3(0xEB,0xB7,0xAF), o3(0xEB,0xB7,0xB1),
-     o3(0xEB,0xB7,0xB2), o3(0xEB,0xB7,0xB3),
-     o3(0xEB,0xB7,0xB5), o3(0xEB,0xB7,0xB6),
-     o3(0xEB,0xB7,0xB7), o3(0xEB,0xB7,0xB9),
-     o3(0xEB,0xB7,0xBA), o3(0xEB,0xB7,0xBB),
-     o3(0xEB,0xB7,0xBC), o3(0xEB,0xB7,0xBD),
-     o3(0xEB,0xB7,0xBE), o3(0xEB,0xB7,0xBF),
-     o3(0xEB,0xB8,0x81), o3(0xEB,0xB8,0x82),
-     o3(0xEB,0xB8,0x84), o3(0xEB,0xB8,0x86),
-     o3(0xEB,0xB8,0x87), o3(0xEB,0xB8,0x88),
-     o3(0xEB,0xB8,0x89), o3(0xEB,0xB8,0x8A),
-     o3(0xEB,0xB8,0x8B), o3(0xEB,0xB8,0x8E),
-     o3(0xEB,0xB8,0x8F), o3(0xEB,0xB8,0x91),
-     o3(0xEB,0xB8,0x92), o3(0xEB,0xB8,0x93),
-     o3(0xEB,0xB8,0x95), o3(0xEB,0xB8,0x96),
-     o3(0xEB,0xB8,0x97), o3(0xEB,0xB8,0x98),
-     o3(0xEB,0xB8,0x99), o3(0xEB,0xB8,0x9A),
-     o3(0xEB,0xB8,0x9B), o3(0xEB,0xB8,0x9E),
-     o3(0xEB,0xB8,0xA0), o3(0xEB,0xB8,0xA1),
-     o3(0xEB,0xB8,0xA2), o3(0xEB,0xB8,0xA3),
-     o3(0xEB,0xB8,0xA4), o3(0xEB,0xB8,0xA5),
-     o3(0xEB,0xB8,0xA6), o3(0xEB,0xB8,0xA7),
-     o3(0xEB,0xB8,0xA8), o3(0xEB,0xB8,0xA9),
-     o3(0xEB,0xB8,0xAA), o3(0xEB,0xB8,0xAB),
-     o3(0xEB,0xB8,0xAC), o3(0xEB,0xB8,0xAD),
-     o3(0xEB,0xB8,0xAE), o3(0xEB,0xB8,0xAF),
-     o3(0xEB,0xB8,0xB0), o3(0xEB,0xB8,0xB1),
-     o3(0xEB,0xB8,0xB2), o3(0xEB,0xB8,0xB3),
-     o3(0xEB,0xB8,0xB4), o3(0xEB,0xB8,0xB5),
-     o3(0xEB,0xB8,0xB6), o3(0xEB,0xB8,0xB7),
-     o3(0xEB,0xB8,0xB8), o3(0xEB,0xB8,0xB9),
-     o3(0xEB,0xB8,0xBA), o3(0xEB,0xB8,0xBB),
-     o3(0xEB,0xB8,0xBC), o3(0xEB,0xB8,0xBD),
-     o3(0xEB,0xB8,0xBE), o3(0xEB,0xB8,0xBF),
-     o3(0xEB,0xB9,0x80), o3(0xEB,0xB9,0x81),
-     o3(0xEB,0xB9,0x82), o3(0xEB,0xB9,0x83),
-     o3(0xEB,0xB9,0x86), o3(0xEB,0xB9,0x87),
-     o3(0xEB,0xB9,0x89), o3(0xEB,0xB9,0x8A),
-     o3(0xEB,0xB9,0x8B), o3(0xEB,0xB9,0x8D),
-     o3(0xEB,0xB9,0x8F), o3(0xEB,0xB9,0x90),
-     o3(0xEB,0xB9,0x91), o3(0xEB,0xB9,0x92),
-     o3(0xEB,0xB9,0x93), o3(0xEB,0xB9,0x96),
-     o3(0xEB,0xB9,0x98), o3(0xEB,0xB9,0x9C),
-     o3(0xEB,0xB9,0x9D), o3(0xEB,0xB9,0x9E),
-     o3(0xEB,0xB9,0x9F), o3(0xEB,0xB9,0xA2),
-     o3(0xEB,0xB9,0xA3), o3(0xEB,0xB9,0xA5),
-     o3(0xEB,0xB9,0xA6), o3(0xEB,0xB9,0xA7),
-     o3(0xEB,0xB9,0xA9), o3(0xEB,0xB9,0xAB),
-     o3(0xEB,0xB9,0xAC), o3(0xEB,0xB9,0xAD),
-     o3(0xEB,0xB9,0xAE), o3(0xEB,0xB9,0xAF),
-     o3(0xEB,0xB9,0xB2), o3(0xEB,0xB9,0xB6),
-     o3(0xEB,0xB9,0xB7), o3(0xEB,0xB9,0xB8),
-     o3(0xEB,0xB9,0xB9), o3(0xEB,0xB9,0xBA),
-     o3(0xEB,0xB9,0xBE), o3(0xEB,0xB9,0xBF),
-     o3(0xEB,0xBA,0x81), o3(0xEB,0xBA,0x82),
-     o3(0xEB,0xBA,0x83), o3(0xEB,0xBA,0x85),
-     o3(0xEB,0xBA,0x86), o3(0xEB,0xBA,0x87),
-     o3(0xEB,0xBA,0x88), o3(0xEB,0xBA,0x89),
-     o3(0xEB,0xBA,0x8A), o3(0xEB,0xBA,0x8B),
-     o3(0xEB,0xBA,0x8E), o3(0xEB,0xBA,0x92),
-     o3(0xEB,0xBA,0x93), o3(0xEB,0xBA,0x94),
-     o3(0xEB,0xBA,0x95), o3(0xEB,0xBA,0x96),
-     o3(0xEB,0xBA,0x97), o3(0xEB,0xBA,0x9A),
-     o3(0xEB,0xBA,0x9B), o3(0xEB,0xBA,0x9C),
-     o3(0xEB,0xBA,0x9D), o3(0xEB,0xBA,0x9E),
-     o3(0xEB,0xBA,0x9F), o3(0xEB,0xBA,0xA0),
-     o3(0xEB,0xBA,0xA1), o3(0xEB,0xBA,0xA2),
-     o3(0xEB,0xBA,0xA3), o3(0xEB,0xBA,0xA4),
-     o3(0xEB,0xBA,0xA5), o3(0xEB,0xBA,0xA6),
-     o3(0xEB,0xBA,0xA7), o3(0xEB,0xBA,0xA9),
-     o3(0xEB,0xBA,0xAA), o3(0xEB,0xBA,0xAB),
-     o3(0xEB,0xBA,0xAC), o3(0xEB,0xBA,0xAD),
-     o3(0xEB,0xBA,0xAE), o3(0xEB,0xBA,0xAF),
-     o3(0xEB,0xBA,0xB0), o3(0xEB,0xBA,0xB1),
-     o3(0xEB,0xBA,0xB2), o3(0xEB,0xBA,0xB3),
-     o3(0xEB,0xBA,0xB4), o3(0xEB,0xBA,0xB5),
-     o3(0xEB,0xBA,0xB6), o3(0xEB,0xBA,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_95 = {
-    from_CP949_81_offsets,
-    from_CP949_95_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_96_infos[179] = {
-     o3(0xEB,0xBA,0xB8), o3(0xEB,0xBA,0xB9),
-     o3(0xEB,0xBA,0xBA), o3(0xEB,0xBA,0xBB),
-     o3(0xEB,0xBA,0xBC), o3(0xEB,0xBA,0xBD),
-     o3(0xEB,0xBA,0xBE), o3(0xEB,0xBA,0xBF),
-     o3(0xEB,0xBB,0x80), o3(0xEB,0xBB,0x81),
-     o3(0xEB,0xBB,0x82), o3(0xEB,0xBB,0x83),
-     o3(0xEB,0xBB,0x84), o3(0xEB,0xBB,0x85),
-     o3(0xEB,0xBB,0x86), o3(0xEB,0xBB,0x87),
-     o3(0xEB,0xBB,0x88), o3(0xEB,0xBB,0x89),
-     o3(0xEB,0xBB,0x8A), o3(0xEB,0xBB,0x8B),
-     o3(0xEB,0xBB,0x8C), o3(0xEB,0xBB,0x8D),
-     o3(0xEB,0xBB,0x8E), o3(0xEB,0xBB,0x8F),
-     o3(0xEB,0xBB,0x92), o3(0xEB,0xBB,0x93),
-     o3(0xEB,0xBB,0x95), o3(0xEB,0xBB,0x96),
-     o3(0xEB,0xBB,0x99), o3(0xEB,0xBB,0x9A),
-     o3(0xEB,0xBB,0x9B), o3(0xEB,0xBB,0x9C),
-     o3(0xEB,0xBB,0x9D), o3(0xEB,0xBB,0x9E),
-     o3(0xEB,0xBB,0x9F), o3(0xEB,0xBB,0xA1),
-     o3(0xEB,0xBB,0xA2), o3(0xEB,0xBB,0xA6),
-     o3(0xEB,0xBB,0xA7), o3(0xEB,0xBB,0xA8),
-     o3(0xEB,0xBB,0xA9), o3(0xEB,0xBB,0xAA),
-     o3(0xEB,0xBB,0xAB), o3(0xEB,0xBB,0xAD),
-     o3(0xEB,0xBB,0xAE), o3(0xEB,0xBB,0xAF),
-     o3(0xEB,0xBB,0xB0), o3(0xEB,0xBB,0xB1),
-     o3(0xEB,0xBB,0xB2), o3(0xEB,0xBB,0xB3),
-     o3(0xEB,0xBB,0xB4), o3(0xEB,0xBB,0xB5),
-     o3(0xEB,0xBB,0xB6), o3(0xEB,0xBB,0xB7),
-     o3(0xEB,0xBB,0xB8), o3(0xEB,0xBB,0xB9),
-     o3(0xEB,0xBB,0xBA), o3(0xEB,0xBB,0xBB),
-     o3(0xEB,0xBB,0xBC), o3(0xEB,0xBB,0xBD),
-     o3(0xEB,0xBB,0xBE), o3(0xEB,0xBB,0xBF),
-     o3(0xEB,0xBC,0x80), o3(0xEB,0xBC,0x82),
-     o3(0xEB,0xBC,0x83), o3(0xEB,0xBC,0x84),
-     o3(0xEB,0xBC,0x85), o3(0xEB,0xBC,0x86),
-     o3(0xEB,0xBC,0x87), o3(0xEB,0xBC,0x8A),
-     o3(0xEB,0xBC,0x8B), o3(0xEB,0xBC,0x8C),
-     o3(0xEB,0xBC,0x8D), o3(0xEB,0xBC,0x8E),
-     o3(0xEB,0xBC,0x8F), o3(0xEB,0xBC,0x90),
-     o3(0xEB,0xBC,0x91), o3(0xEB,0xBC,0x92),
-     o3(0xEB,0xBC,0x93), o3(0xEB,0xBC,0x94),
-     o3(0xEB,0xBC,0x95), o3(0xEB,0xBC,0x96),
-     o3(0xEB,0xBC,0x97), o3(0xEB,0xBC,0x9A),
-     o3(0xEB,0xBC,0x9E), o3(0xEB,0xBC,0x9F),
-     o3(0xEB,0xBC,0xA0), o3(0xEB,0xBC,0xA1),
-     o3(0xEB,0xBC,0xA2), o3(0xEB,0xBC,0xA3),
-     o3(0xEB,0xBC,0xA4), o3(0xEB,0xBC,0xA5),
-     o3(0xEB,0xBC,0xA6), o3(0xEB,0xBC,0xA7),
-     o3(0xEB,0xBC,0xA8), o3(0xEB,0xBC,0xA9),
-     o3(0xEB,0xBC,0xAA), o3(0xEB,0xBC,0xAB),
-     o3(0xEB,0xBC,0xAC), o3(0xEB,0xBC,0xAD),
-     o3(0xEB,0xBC,0xAE), o3(0xEB,0xBC,0xAF),
-     o3(0xEB,0xBC,0xB0), o3(0xEB,0xBC,0xB1),
-     o3(0xEB,0xBC,0xB2), o3(0xEB,0xBC,0xB3),
-     o3(0xEB,0xBC,0xB4), o3(0xEB,0xBC,0xB5),
-     o3(0xEB,0xBC,0xB6), o3(0xEB,0xBC,0xB7),
-     o3(0xEB,0xBC,0xB8), o3(0xEB,0xBC,0xB9),
-     o3(0xEB,0xBC,0xBA), o3(0xEB,0xBC,0xBB),
-     o3(0xEB,0xBC,0xBC), o3(0xEB,0xBC,0xBD),
-     o3(0xEB,0xBC,0xBE), o3(0xEB,0xBC,0xBF),
-     o3(0xEB,0xBD,0x82), o3(0xEB,0xBD,0x83),
-     o3(0xEB,0xBD,0x85), o3(0xEB,0xBD,0x86),
-     o3(0xEB,0xBD,0x87), o3(0xEB,0xBD,0x89),
-     o3(0xEB,0xBD,0x8A), o3(0xEB,0xBD,0x8B),
-     o3(0xEB,0xBD,0x8C), o3(0xEB,0xBD,0x8D),
-     o3(0xEB,0xBD,0x8E), o3(0xEB,0xBD,0x8F),
-     o3(0xEB,0xBD,0x92), o3(0xEB,0xBD,0x93),
-     o3(0xEB,0xBD,0x94), o3(0xEB,0xBD,0x96),
-     o3(0xEB,0xBD,0x97), o3(0xEB,0xBD,0x98),
-     o3(0xEB,0xBD,0x99), o3(0xEB,0xBD,0x9A),
-     o3(0xEB,0xBD,0x9B), o3(0xEB,0xBD,0x9C),
-     o3(0xEB,0xBD,0x9D), o3(0xEB,0xBD,0x9E),
-     o3(0xEB,0xBD,0x9F), o3(0xEB,0xBD,0xA0),
-     o3(0xEB,0xBD,0xA1), o3(0xEB,0xBD,0xA2),
-     o3(0xEB,0xBD,0xA3), o3(0xEB,0xBD,0xA4),
-     o3(0xEB,0xBD,0xA5), o3(0xEB,0xBD,0xA6),
-     o3(0xEB,0xBD,0xA7), o3(0xEB,0xBD,0xA8),
-     o3(0xEB,0xBD,0xA9), o3(0xEB,0xBD,0xAA),
-     o3(0xEB,0xBD,0xAB), o3(0xEB,0xBD,0xAC),
-     o3(0xEB,0xBD,0xAD), o3(0xEB,0xBD,0xAE),
-     o3(0xEB,0xBD,0xAF), o3(0xEB,0xBD,0xB0),
-     o3(0xEB,0xBD,0xB1), o3(0xEB,0xBD,0xB2),
-     o3(0xEB,0xBD,0xB3), o3(0xEB,0xBD,0xB4),
-     o3(0xEB,0xBD,0xB5), o3(0xEB,0xBD,0xB6),
-     o3(0xEB,0xBD,0xB7), o3(0xEB,0xBD,0xB8),
-     o3(0xEB,0xBD,0xB9), o3(0xEB,0xBD,0xBA),
-     o3(0xEB,0xBD,0xBB), o3(0xEB,0xBD,0xBC),
-     o3(0xEB,0xBD,0xBD), o3(0xEB,0xBD,0xBE),
-     o3(0xEB,0xBD,0xBF), o3(0xEB,0xBE,0x80),
-     o3(0xEB,0xBE,0x81), o3(0xEB,0xBE,0x82),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_96 = {
-    from_CP949_81_offsets,
-    from_CP949_96_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_97_infos[179] = {
-     o3(0xEB,0xBE,0x83), o3(0xEB,0xBE,0x84),
-     o3(0xEB,0xBE,0x85), o3(0xEB,0xBE,0x86),
-     o3(0xEB,0xBE,0x87), o3(0xEB,0xBE,0x88),
-     o3(0xEB,0xBE,0x89), o3(0xEB,0xBE,0x8A),
-     o3(0xEB,0xBE,0x8B), o3(0xEB,0xBE,0x8C),
-     o3(0xEB,0xBE,0x8D), o3(0xEB,0xBE,0x8E),
-     o3(0xEB,0xBE,0x8F), o3(0xEB,0xBE,0x90),
-     o3(0xEB,0xBE,0x91), o3(0xEB,0xBE,0x92),
-     o3(0xEB,0xBE,0x93), o3(0xEB,0xBE,0x95),
-     o3(0xEB,0xBE,0x96), o3(0xEB,0xBE,0x97),
-     o3(0xEB,0xBE,0x98), o3(0xEB,0xBE,0x99),
-     o3(0xEB,0xBE,0x9A), o3(0xEB,0xBE,0x9B),
-     o3(0xEB,0xBE,0x9C), o3(0xEB,0xBE,0x9D),
-     o3(0xEB,0xBE,0x9E), o3(0xEB,0xBE,0x9F),
-     o3(0xEB,0xBE,0xA0), o3(0xEB,0xBE,0xA1),
-     o3(0xEB,0xBE,0xA2), o3(0xEB,0xBE,0xA3),
-     o3(0xEB,0xBE,0xA4), o3(0xEB,0xBE,0xA5),
-     o3(0xEB,0xBE,0xA6), o3(0xEB,0xBE,0xA7),
-     o3(0xEB,0xBE,0xA8), o3(0xEB,0xBE,0xA9),
-     o3(0xEB,0xBE,0xAA), o3(0xEB,0xBE,0xAB),
-     o3(0xEB,0xBE,0xAC), o3(0xEB,0xBE,0xAD),
-     o3(0xEB,0xBE,0xAE), o3(0xEB,0xBE,0xAF),
-     o3(0xEB,0xBE,0xB1), o3(0xEB,0xBE,0xB2),
-     o3(0xEB,0xBE,0xB3), o3(0xEB,0xBE,0xB4),
-     o3(0xEB,0xBE,0xB5), o3(0xEB,0xBE,0xB6),
-     o3(0xEB,0xBE,0xB7), o3(0xEB,0xBE,0xB8),
-     o3(0xEB,0xBE,0xB9), o3(0xEB,0xBE,0xBA),
-     o3(0xEB,0xBE,0xBB), o3(0xEB,0xBE,0xBC),
-     o3(0xEB,0xBE,0xBD), o3(0xEB,0xBE,0xBE),
-     o3(0xEB,0xBE,0xBF), o3(0xEB,0xBF,0x80),
-     o3(0xEB,0xBF,0x81), o3(0xEB,0xBF,0x82),
-     o3(0xEB,0xBF,0x83), o3(0xEB,0xBF,0x84),
-     o3(0xEB,0xBF,0x86), o3(0xEB,0xBF,0x87),
-     o3(0xEB,0xBF,0x88), o3(0xEB,0xBF,0x89),
-     o3(0xEB,0xBF,0x8A), o3(0xEB,0xBF,0x8B),
-     o3(0xEB,0xBF,0x8E), o3(0xEB,0xBF,0x8F),
-     o3(0xEB,0xBF,0x91), o3(0xEB,0xBF,0x92),
-     o3(0xEB,0xBF,0x93), o3(0xEB,0xBF,0x95),
-     o3(0xEB,0xBF,0x96), o3(0xEB,0xBF,0x97),
-     o3(0xEB,0xBF,0x98), o3(0xEB,0xBF,0x99),
-     o3(0xEB,0xBF,0x9A), o3(0xEB,0xBF,0x9B),
-     o3(0xEB,0xBF,0x9D), o3(0xEB,0xBF,0x9E),
-     o3(0xEB,0xBF,0xA0), o3(0xEB,0xBF,0xA2),
-     o3(0xEB,0xBF,0xA3), o3(0xEB,0xBF,0xA4),
-     o3(0xEB,0xBF,0xA5), o3(0xEB,0xBF,0xA6),
-     o3(0xEB,0xBF,0xA7), o3(0xEB,0xBF,0xA8),
-     o3(0xEB,0xBF,0xA9), o3(0xEB,0xBF,0xAA),
-     o3(0xEB,0xBF,0xAB), o3(0xEB,0xBF,0xAC),
-     o3(0xEB,0xBF,0xAD), o3(0xEB,0xBF,0xAE),
-     o3(0xEB,0xBF,0xAF), o3(0xEB,0xBF,0xB0),
-     o3(0xEB,0xBF,0xB1), o3(0xEB,0xBF,0xB2),
-     o3(0xEB,0xBF,0xB3), o3(0xEB,0xBF,0xB4),
-     o3(0xEB,0xBF,0xB5), o3(0xEB,0xBF,0xB6),
-     o3(0xEB,0xBF,0xB7), o3(0xEB,0xBF,0xB8),
-     o3(0xEB,0xBF,0xB9), o3(0xEB,0xBF,0xBA),
-     o3(0xEB,0xBF,0xBB), o3(0xEB,0xBF,0xBC),
-     o3(0xEB,0xBF,0xBD), o3(0xEB,0xBF,0xBE),
-     o3(0xEB,0xBF,0xBF), o3(0xEC,0x80,0x80),
-     o3(0xEC,0x80,0x81), o3(0xEC,0x80,0x82),
-     o3(0xEC,0x80,0x83), o3(0xEC,0x80,0x84),
-     o3(0xEC,0x80,0x85), o3(0xEC,0x80,0x86),
-     o3(0xEC,0x80,0x87), o3(0xEC,0x80,0x88),
-     o3(0xEC,0x80,0x89), o3(0xEC,0x80,0x8A),
-     o3(0xEC,0x80,0x8B), o3(0xEC,0x80,0x8C),
-     o3(0xEC,0x80,0x8D), o3(0xEC,0x80,0x8E),
-     o3(0xEC,0x80,0x8F), o3(0xEC,0x80,0x90),
-     o3(0xEC,0x80,0x91), o3(0xEC,0x80,0x92),
-     o3(0xEC,0x80,0x93), o3(0xEC,0x80,0x94),
-     o3(0xEC,0x80,0x95), o3(0xEC,0x80,0x96),
-     o3(0xEC,0x80,0x97), o3(0xEC,0x80,0x98),
-     o3(0xEC,0x80,0x99), o3(0xEC,0x80,0x9A),
-     o3(0xEC,0x80,0x9B), o3(0xEC,0x80,0x9C),
-     o3(0xEC,0x80,0x9D), o3(0xEC,0x80,0x9E),
-     o3(0xEC,0x80,0x9F), o3(0xEC,0x80,0xA0),
-     o3(0xEC,0x80,0xA1), o3(0xEC,0x80,0xA2),
-     o3(0xEC,0x80,0xA3), o3(0xEC,0x80,0xA4),
-     o3(0xEC,0x80,0xA5), o3(0xEC,0x80,0xA6),
-     o3(0xEC,0x80,0xA7), o3(0xEC,0x80,0xA8),
-     o3(0xEC,0x80,0xA9), o3(0xEC,0x80,0xAA),
-     o3(0xEC,0x80,0xAB), o3(0xEC,0x80,0xAC),
-     o3(0xEC,0x80,0xAD), o3(0xEC,0x80,0xAE),
-     o3(0xEC,0x80,0xAF), o3(0xEC,0x80,0xB0),
-     o3(0xEC,0x80,0xB1), o3(0xEC,0x80,0xB2),
-     o3(0xEC,0x80,0xB3), o3(0xEC,0x80,0xB4),
-     o3(0xEC,0x80,0xB5), o3(0xEC,0x80,0xB6),
-     o3(0xEC,0x80,0xB7), o3(0xEC,0x80,0xB8),
-     o3(0xEC,0x80,0xB9), o3(0xEC,0x80,0xBA),
-     o3(0xEC,0x80,0xBB), o3(0xEC,0x80,0xBD),
-     o3(0xEC,0x80,0xBE), o3(0xEC,0x80,0xBF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_97 = {
-    from_CP949_81_offsets,
-    from_CP949_97_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_98_infos[179] = {
-     o3(0xEC,0x81,0x80), o3(0xEC,0x81,0x81),
-     o3(0xEC,0x81,0x82), o3(0xEC,0x81,0x83),
-     o3(0xEC,0x81,0x84), o3(0xEC,0x81,0x85),
-     o3(0xEC,0x81,0x86), o3(0xEC,0x81,0x87),
-     o3(0xEC,0x81,0x88), o3(0xEC,0x81,0x89),
-     o3(0xEC,0x81,0x8A), o3(0xEC,0x81,0x8B),
-     o3(0xEC,0x81,0x8C), o3(0xEC,0x81,0x8D),
-     o3(0xEC,0x81,0x8E), o3(0xEC,0x81,0x8F),
-     o3(0xEC,0x81,0x90), o3(0xEC,0x81,0x92),
-     o3(0xEC,0x81,0x93), o3(0xEC,0x81,0x94),
-     o3(0xEC,0x81,0x95), o3(0xEC,0x81,0x96),
-     o3(0xEC,0x81,0x97), o3(0xEC,0x81,0x99),
-     o3(0xEC,0x81,0x9A), o3(0xEC,0x81,0x9B),
-     o3(0xEC,0x81,0x9D), o3(0xEC,0x81,0x9E),
-     o3(0xEC,0x81,0x9F), o3(0xEC,0x81,0xA1),
-     o3(0xEC,0x81,0xA2), o3(0xEC,0x81,0xA3),
-     o3(0xEC,0x81,0xA4), o3(0xEC,0x81,0xA5),
-     o3(0xEC,0x81,0xA6), o3(0xEC,0x81,0xA7),
-     o3(0xEC,0x81,0xAA), o3(0xEC,0x81,0xAB),
-     o3(0xEC,0x81,0xAC), o3(0xEC,0x81,0xAD),
-     o3(0xEC,0x81,0xAE), o3(0xEC,0x81,0xAF),
-     o3(0xEC,0x81,0xB0), o3(0xEC,0x81,0xB1),
-     o3(0xEC,0x81,0xB2), o3(0xEC,0x81,0xB3),
-     o3(0xEC,0x81,0xB4), o3(0xEC,0x81,0xB5),
-     o3(0xEC,0x81,0xB6), o3(0xEC,0x81,0xB7),
-     o3(0xEC,0x81,0xB8), o3(0xEC,0x81,0xB9),
-     o3(0xEC,0x81,0xBA), o3(0xEC,0x81,0xBB),
-     o3(0xEC,0x81,0xBC), o3(0xEC,0x81,0xBD),
-     o3(0xEC,0x81,0xBE), o3(0xEC,0x81,0xBF),
-     o3(0xEC,0x82,0x80), o3(0xEC,0x82,0x81),
-     o3(0xEC,0x82,0x82), o3(0xEC,0x82,0x83),
-     o3(0xEC,0x82,0x84), o3(0xEC,0x82,0x85),
-     o3(0xEC,0x82,0x86), o3(0xEC,0x82,0x87),
-     o3(0xEC,0x82,0x88), o3(0xEC,0x82,0x89),
-     o3(0xEC,0x82,0x8A), o3(0xEC,0x82,0x8B),
-     o3(0xEC,0x82,0x8C), o3(0xEC,0x82,0x8D),
-     o3(0xEC,0x82,0x8E), o3(0xEC,0x82,0x8F),
-     o3(0xEC,0x82,0x92), o3(0xEC,0x82,0x93),
-     o3(0xEC,0x82,0x95), o3(0xEC,0x82,0x96),
-     o3(0xEC,0x82,0x97), o3(0xEC,0x82,0x99),
-     o3(0xEC,0x82,0x9A), o3(0xEC,0x82,0x9B),
-     o3(0xEC,0x82,0x9C), o3(0xEC,0x82,0x9D),
-     o3(0xEC,0x82,0x9E), o3(0xEC,0x82,0x9F),
-     o3(0xEC,0x82,0xA2), o3(0xEC,0x82,0xA4),
-     o3(0xEC,0x82,0xA6), o3(0xEC,0x82,0xA7),
-     o3(0xEC,0x82,0xA8), o3(0xEC,0x82,0xA9),
-     o3(0xEC,0x82,0xAA), o3(0xEC,0x82,0xAB),
-     o3(0xEC,0x82,0xAE), o3(0xEC,0x82,0xB1),
-     o3(0xEC,0x82,0xB2), o3(0xEC,0x82,0xB7),
-     o3(0xEC,0x82,0xB8), o3(0xEC,0x82,0xB9),
-     o3(0xEC,0x82,0xBA), o3(0xEC,0x82,0xBB),
-     o3(0xEC,0x82,0xBE), o3(0xEC,0x83,0x82),
-     o3(0xEC,0x83,0x83), o3(0xEC,0x83,0x84),
-     o3(0xEC,0x83,0x86), o3(0xEC,0x83,0x87),
-     o3(0xEC,0x83,0x8A), o3(0xEC,0x83,0x8B),
-     o3(0xEC,0x83,0x8D), o3(0xEC,0x83,0x8E),
-     o3(0xEC,0x83,0x8F), o3(0xEC,0x83,0x91),
-     o3(0xEC,0x83,0x92), o3(0xEC,0x83,0x93),
-     o3(0xEC,0x83,0x94), o3(0xEC,0x83,0x95),
-     o3(0xEC,0x83,0x96), o3(0xEC,0x83,0x97),
-     o3(0xEC,0x83,0x9A), o3(0xEC,0x83,0x9E),
-     o3(0xEC,0x83,0x9F), o3(0xEC,0x83,0xA0),
-     o3(0xEC,0x83,0xA1), o3(0xEC,0x83,0xA2),
-     o3(0xEC,0x83,0xA3), o3(0xEC,0x83,0xA6),
-     o3(0xEC,0x83,0xA7), o3(0xEC,0x83,0xA9),
-     o3(0xEC,0x83,0xAA), o3(0xEC,0x83,0xAB),
-     o3(0xEC,0x83,0xAD), o3(0xEC,0x83,0xAE),
-     o3(0xEC,0x83,0xAF), o3(0xEC,0x83,0xB0),
-     o3(0xEC,0x83,0xB1), o3(0xEC,0x83,0xB2),
-     o3(0xEC,0x83,0xB3), o3(0xEC,0x83,0xB6),
-     o3(0xEC,0x83,0xB8), o3(0xEC,0x83,0xBA),
-     o3(0xEC,0x83,0xBB), o3(0xEC,0x83,0xBC),
-     o3(0xEC,0x83,0xBD), o3(0xEC,0x83,0xBE),
-     o3(0xEC,0x83,0xBF), o3(0xEC,0x84,0x81),
-     o3(0xEC,0x84,0x82), o3(0xEC,0x84,0x83),
-     o3(0xEC,0x84,0x85), o3(0xEC,0x84,0x86),
-     o3(0xEC,0x84,0x87), o3(0xEC,0x84,0x89),
-     o3(0xEC,0x84,0x8A), o3(0xEC,0x84,0x8B),
-     o3(0xEC,0x84,0x8C), o3(0xEC,0x84,0x8D),
-     o3(0xEC,0x84,0x8E), o3(0xEC,0x84,0x8F),
-     o3(0xEC,0x84,0x91), o3(0xEC,0x84,0x92),
-     o3(0xEC,0x84,0x93), o3(0xEC,0x84,0x94),
-     o3(0xEC,0x84,0x96), o3(0xEC,0x84,0x97),
-     o3(0xEC,0x84,0x98), o3(0xEC,0x84,0x99),
-     o3(0xEC,0x84,0x9A), o3(0xEC,0x84,0x9B),
-     o3(0xEC,0x84,0xA1), o3(0xEC,0x84,0xA2),
-     o3(0xEC,0x84,0xA5), o3(0xEC,0x84,0xA8),
-     o3(0xEC,0x84,0xA9), o3(0xEC,0x84,0xAA),
-     o3(0xEC,0x84,0xAB), o3(0xEC,0x84,0xAE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_98 = {
-    from_CP949_81_offsets,
-    from_CP949_98_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_99_infos[179] = {
-     o3(0xEC,0x84,0xB2), o3(0xEC,0x84,0xB3),
-     o3(0xEC,0x84,0xB4), o3(0xEC,0x84,0xB5),
-     o3(0xEC,0x84,0xB7), o3(0xEC,0x84,0xBA),
-     o3(0xEC,0x84,0xBB), o3(0xEC,0x84,0xBD),
-     o3(0xEC,0x84,0xBE), o3(0xEC,0x84,0xBF),
-     o3(0xEC,0x85,0x81), o3(0xEC,0x85,0x82),
-     o3(0xEC,0x85,0x83), o3(0xEC,0x85,0x84),
-     o3(0xEC,0x85,0x85), o3(0xEC,0x85,0x86),
-     o3(0xEC,0x85,0x87), o3(0xEC,0x85,0x8A),
-     o3(0xEC,0x85,0x8E), o3(0xEC,0x85,0x8F),
-     o3(0xEC,0x85,0x90), o3(0xEC,0x85,0x91),
-     o3(0xEC,0x85,0x92), o3(0xEC,0x85,0x93),
-     o3(0xEC,0x85,0x96), o3(0xEC,0x85,0x97),
-     o3(0xEC,0x85,0x99), o3(0xEC,0x85,0x9A),
-     o3(0xEC,0x85,0x9B), o3(0xEC,0x85,0x9D),
-     o3(0xEC,0x85,0x9E), o3(0xEC,0x85,0x9F),
-     o3(0xEC,0x85,0xA0), o3(0xEC,0x85,0xA1),
-     o3(0xEC,0x85,0xA2), o3(0xEC,0x85,0xA3),
-     o3(0xEC,0x85,0xA6), o3(0xEC,0x85,0xAA),
-     o3(0xEC,0x85,0xAB), o3(0xEC,0x85,0xAC),
-     o3(0xEC,0x85,0xAD), o3(0xEC,0x85,0xAE),
-     o3(0xEC,0x85,0xAF), o3(0xEC,0x85,0xB1),
-     o3(0xEC,0x85,0xB2), o3(0xEC,0x85,0xB3),
-     o3(0xEC,0x85,0xB5), o3(0xEC,0x85,0xB6),
-     o3(0xEC,0x85,0xB7), o3(0xEC,0x85,0xB9),
-     o3(0xEC,0x85,0xBA), o3(0xEC,0x85,0xBB),
-     o3(0xEC,0x85,0xBC), o3(0xEC,0x85,0xBD),
-     o3(0xEC,0x85,0xBE), o3(0xEC,0x85,0xBF),
-     o3(0xEC,0x86,0x80), o3(0xEC,0x86,0x81),
-     o3(0xEC,0x86,0x82), o3(0xEC,0x86,0x83),
-     o3(0xEC,0x86,0x84), o3(0xEC,0x86,0x86),
-     o3(0xEC,0x86,0x87), o3(0xEC,0x86,0x88),
-     o3(0xEC,0x86,0x89), o3(0xEC,0x86,0x8A),
-     o3(0xEC,0x86,0x8B), o3(0xEC,0x86,0x8F),
-     o3(0xEC,0x86,0x91), o3(0xEC,0x86,0x92),
-     o3(0xEC,0x86,0x93), o3(0xEC,0x86,0x95),
-     o3(0xEC,0x86,0x97), o3(0xEC,0x86,0x98),
-     o3(0xEC,0x86,0x99), o3(0xEC,0x86,0x9A),
-     o3(0xEC,0x86,0x9B), o3(0xEC,0x86,0x9E),
-     o3(0xEC,0x86,0xA0), o3(0xEC,0x86,0xA2),
-     o3(0xEC,0x86,0xA3), o3(0xEC,0x86,0xA4),
-     o3(0xEC,0x86,0xA6), o3(0xEC,0x86,0xA7),
-     o3(0xEC,0x86,0xAA), o3(0xEC,0x86,0xAB),
-     o3(0xEC,0x86,0xAD), o3(0xEC,0x86,0xAE),
-     o3(0xEC,0x86,0xAF), o3(0xEC,0x86,0xB1),
-     o3(0xEC,0x86,0xB2), o3(0xEC,0x86,0xB3),
-     o3(0xEC,0x86,0xB4), o3(0xEC,0x86,0xB5),
-     o3(0xEC,0x86,0xB6), o3(0xEC,0x86,0xB7),
-     o3(0xEC,0x86,0xB8), o3(0xEC,0x86,0xB9),
-     o3(0xEC,0x86,0xBA), o3(0xEC,0x86,0xBB),
-     o3(0xEC,0x86,0xBC), o3(0xEC,0x86,0xBE),
-     o3(0xEC,0x86,0xBF), o3(0xEC,0x87,0x80),
-     o3(0xEC,0x87,0x81), o3(0xEC,0x87,0x82),
-     o3(0xEC,0x87,0x83), o3(0xEC,0x87,0x85),
-     o3(0xEC,0x87,0x86), o3(0xEC,0x87,0x87),
-     o3(0xEC,0x87,0x89), o3(0xEC,0x87,0x8A),
-     o3(0xEC,0x87,0x8B), o3(0xEC,0x87,0x8D),
-     o3(0xEC,0x87,0x8E), o3(0xEC,0x87,0x8F),
-     o3(0xEC,0x87,0x90), o3(0xEC,0x87,0x91),
-     o3(0xEC,0x87,0x92), o3(0xEC,0x87,0x93),
-     o3(0xEC,0x87,0x95), o3(0xEC,0x87,0x96),
-     o3(0xEC,0x87,0x99), o3(0xEC,0x87,0x9A),
-     o3(0xEC,0x87,0x9B), o3(0xEC,0x87,0x9C),
-     o3(0xEC,0x87,0x9D), o3(0xEC,0x87,0x9E),
-     o3(0xEC,0x87,0x9F), o3(0xEC,0x87,0xA1),
-     o3(0xEC,0x87,0xA2), o3(0xEC,0x87,0xA3),
-     o3(0xEC,0x87,0xA5), o3(0xEC,0x87,0xA6),
-     o3(0xEC,0x87,0xA7), o3(0xEC,0x87,0xA9),
-     o3(0xEC,0x87,0xAA), o3(0xEC,0x87,0xAB),
-     o3(0xEC,0x87,0xAC), o3(0xEC,0x87,0xAD),
-     o3(0xEC,0x87,0xAE), o3(0xEC,0x87,0xAF),
-     o3(0xEC,0x87,0xB2), o3(0xEC,0x87,0xB4),
-     o3(0xEC,0x87,0xB5), o3(0xEC,0x87,0xB6),
-     o3(0xEC,0x87,0xB7), o3(0xEC,0x87,0xB8),
-     o3(0xEC,0x87,0xB9), o3(0xEC,0x87,0xBA),
-     o3(0xEC,0x87,0xBB), o3(0xEC,0x87,0xBE),
-     o3(0xEC,0x87,0xBF), o3(0xEC,0x88,0x81),
-     o3(0xEC,0x88,0x82), o3(0xEC,0x88,0x83),
-     o3(0xEC,0x88,0x85), o3(0xEC,0x88,0x86),
-     o3(0xEC,0x88,0x87), o3(0xEC,0x88,0x88),
-     o3(0xEC,0x88,0x89), o3(0xEC,0x88,0x8A),
-     o3(0xEC,0x88,0x8B), o3(0xEC,0x88,0x8E),
-     o3(0xEC,0x88,0x90), o3(0xEC,0x88,0x92),
-     o3(0xEC,0x88,0x93), o3(0xEC,0x88,0x94),
-     o3(0xEC,0x88,0x95), o3(0xEC,0x88,0x96),
-     o3(0xEC,0x88,0x97), o3(0xEC,0x88,0x9A),
-     o3(0xEC,0x88,0x9B), o3(0xEC,0x88,0x9D),
-     o3(0xEC,0x88,0x9E), o3(0xEC,0x88,0xA1),
-     o3(0xEC,0x88,0xA2), o3(0xEC,0x88,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_99 = {
-    from_CP949_81_offsets,
-    from_CP949_99_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9A_infos[179] = {
-     o3(0xEC,0x88,0xA4), o3(0xEC,0x88,0xA5),
-     o3(0xEC,0x88,0xA6), o3(0xEC,0x88,0xA7),
-     o3(0xEC,0x88,0xAA), o3(0xEC,0x88,0xAC),
-     o3(0xEC,0x88,0xAE), o3(0xEC,0x88,0xB0),
-     o3(0xEC,0x88,0xB3), o3(0xEC,0x88,0xB5),
-     o3(0xEC,0x88,0xB6), o3(0xEC,0x88,0xB7),
-     o3(0xEC,0x88,0xB8), o3(0xEC,0x88,0xB9),
-     o3(0xEC,0x88,0xBA), o3(0xEC,0x88,0xBB),
-     o3(0xEC,0x88,0xBC), o3(0xEC,0x88,0xBD),
-     o3(0xEC,0x88,0xBE), o3(0xEC,0x88,0xBF),
-     o3(0xEC,0x89,0x80), o3(0xEC,0x89,0x81),
-     o3(0xEC,0x89,0x82), o3(0xEC,0x89,0x83),
-     o3(0xEC,0x89,0x84), o3(0xEC,0x89,0x85),
-     o3(0xEC,0x89,0x86), o3(0xEC,0x89,0x87),
-     o3(0xEC,0x89,0x89), o3(0xEC,0x89,0x8A),
-     o3(0xEC,0x89,0x8B), o3(0xEC,0x89,0x8C),
-     o3(0xEC,0x89,0x8D), o3(0xEC,0x89,0x8E),
-     o3(0xEC,0x89,0x8F), o3(0xEC,0x89,0x92),
-     o3(0xEC,0x89,0x93), o3(0xEC,0x89,0x95),
-     o3(0xEC,0x89,0x96), o3(0xEC,0x89,0x97),
-     o3(0xEC,0x89,0x99), o3(0xEC,0x89,0x9A),
-     o3(0xEC,0x89,0x9B), o3(0xEC,0x89,0x9C),
-     o3(0xEC,0x89,0x9D), o3(0xEC,0x89,0x9E),
-     o3(0xEC,0x89,0x9F), o3(0xEC,0x89,0xA1),
-     o3(0xEC,0x89,0xA2), o3(0xEC,0x89,0xA3),
-     o3(0xEC,0x89,0xA4), o3(0xEC,0x89,0xA6),
-     o3(0xEC,0x89,0xA7), o3(0xEC,0x89,0xA8),
-     o3(0xEC,0x89,0xA9), o3(0xEC,0x89,0xAA),
-     o3(0xEC,0x89,0xAB), o3(0xEC,0x89,0xAE),
-     o3(0xEC,0x89,0xAF), o3(0xEC,0x89,0xB1),
-     o3(0xEC,0x89,0xB2), o3(0xEC,0x89,0xB3),
-     o3(0xEC,0x89,0xB5), o3(0xEC,0x89,0xB6),
-     o3(0xEC,0x89,0xB7), o3(0xEC,0x89,0xB8),
-     o3(0xEC,0x89,0xB9), o3(0xEC,0x89,0xBA),
-     o3(0xEC,0x89,0xBB), o3(0xEC,0x89,0xBE),
-     o3(0xEC,0x8A,0x80), o3(0xEC,0x8A,0x82),
-     o3(0xEC,0x8A,0x83), o3(0xEC,0x8A,0x84),
-     o3(0xEC,0x8A,0x85), o3(0xEC,0x8A,0x86),
-     o3(0xEC,0x8A,0x87), o3(0xEC,0x8A,0x8A),
-     o3(0xEC,0x8A,0x8B), o3(0xEC,0x8A,0x8C),
-     o3(0xEC,0x8A,0x8D), o3(0xEC,0x8A,0x8E),
-     o3(0xEC,0x8A,0x8F), o3(0xEC,0x8A,0x91),
-     o3(0xEC,0x8A,0x92), o3(0xEC,0x8A,0x93),
-     o3(0xEC,0x8A,0x94), o3(0xEC,0x8A,0x95),
-     o3(0xEC,0x8A,0x96), o3(0xEC,0x8A,0x97),
-     o3(0xEC,0x8A,0x99), o3(0xEC,0x8A,0x9A),
-     o3(0xEC,0x8A,0x9C), o3(0xEC,0x8A,0x9E),
-     o3(0xEC,0x8A,0x9F), o3(0xEC,0x8A,0xA0),
-     o3(0xEC,0x8A,0xA1), o3(0xEC,0x8A,0xA2),
-     o3(0xEC,0x8A,0xA3), o3(0xEC,0x8A,0xA6),
-     o3(0xEC,0x8A,0xA7), o3(0xEC,0x8A,0xA9),
-     o3(0xEC,0x8A,0xAA), o3(0xEC,0x8A,0xAB),
-     o3(0xEC,0x8A,0xAE), o3(0xEC,0x8A,0xAF),
-     o3(0xEC,0x8A,0xB0), o3(0xEC,0x8A,0xB1),
-     o3(0xEC,0x8A,0xB2), o3(0xEC,0x8A,0xB3),
-     o3(0xEC,0x8A,0xB6), o3(0xEC,0x8A,0xB8),
-     o3(0xEC,0x8A,0xBA), o3(0xEC,0x8A,0xBB),
-     o3(0xEC,0x8A,0xBC), o3(0xEC,0x8A,0xBD),
-     o3(0xEC,0x8A,0xBE), o3(0xEC,0x8A,0xBF),
-     o3(0xEC,0x8B,0x80), o3(0xEC,0x8B,0x81),
-     o3(0xEC,0x8B,0x82), o3(0xEC,0x8B,0x83),
-     o3(0xEC,0x8B,0x84), o3(0xEC,0x8B,0x85),
-     o3(0xEC,0x8B,0x86), o3(0xEC,0x8B,0x87),
-     o3(0xEC,0x8B,0x88), o3(0xEC,0x8B,0x89),
-     o3(0xEC,0x8B,0x8A), o3(0xEC,0x8B,0x8B),
-     o3(0xEC,0x8B,0x8C), o3(0xEC,0x8B,0x8D),
-     o3(0xEC,0x8B,0x8E), o3(0xEC,0x8B,0x8F),
-     o3(0xEC,0x8B,0x90), o3(0xEC,0x8B,0x91),
-     o3(0xEC,0x8B,0x92), o3(0xEC,0x8B,0x93),
-     o3(0xEC,0x8B,0x94), o3(0xEC,0x8B,0x95),
-     o3(0xEC,0x8B,0x96), o3(0xEC,0x8B,0x97),
-     o3(0xEC,0x8B,0x98), o3(0xEC,0x8B,0x99),
-     o3(0xEC,0x8B,0x9A), o3(0xEC,0x8B,0x9B),
-     o3(0xEC,0x8B,0x9E), o3(0xEC,0x8B,0x9F),
-     o3(0xEC,0x8B,0xA1), o3(0xEC,0x8B,0xA2),
-     o3(0xEC,0x8B,0xA5), o3(0xEC,0x8B,0xA6),
-     o3(0xEC,0x8B,0xA7), o3(0xEC,0x8B,0xA8),
-     o3(0xEC,0x8B,0xA9), o3(0xEC,0x8B,0xAA),
-     o3(0xEC,0x8B,0xAE), o3(0xEC,0x8B,0xB0),
-     o3(0xEC,0x8B,0xB2), o3(0xEC,0x8B,0xB3),
-     o3(0xEC,0x8B,0xB4), o3(0xEC,0x8B,0xB5),
-     o3(0xEC,0x8B,0xB7), o3(0xEC,0x8B,0xBA),
-     o3(0xEC,0x8B,0xBD), o3(0xEC,0x8B,0xBE),
-     o3(0xEC,0x8B,0xBF), o3(0xEC,0x8C,0x81),
-     o3(0xEC,0x8C,0x82), o3(0xEC,0x8C,0x83),
-     o3(0xEC,0x8C,0x84), o3(0xEC,0x8C,0x85),
-     o3(0xEC,0x8C,0x86), o3(0xEC,0x8C,0x87),
-     o3(0xEC,0x8C,0x8A), o3(0xEC,0x8C,0x8B),
-     o3(0xEC,0x8C,0x8E), o3(0xEC,0x8C,0x8F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9A = {
-    from_CP949_81_offsets,
-    from_CP949_9A_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9B_infos[179] = {
-     o3(0xEC,0x8C,0x90), o3(0xEC,0x8C,0x91),
-     o3(0xEC,0x8C,0x92), o3(0xEC,0x8C,0x96),
-     o3(0xEC,0x8C,0x97), o3(0xEC,0x8C,0x99),
-     o3(0xEC,0x8C,0x9A), o3(0xEC,0x8C,0x9B),
-     o3(0xEC,0x8C,0x9D), o3(0xEC,0x8C,0x9E),
-     o3(0xEC,0x8C,0x9F), o3(0xEC,0x8C,0xA0),
-     o3(0xEC,0x8C,0xA1), o3(0xEC,0x8C,0xA2),
-     o3(0xEC,0x8C,0xA3), o3(0xEC,0x8C,0xA6),
-     o3(0xEC,0x8C,0xA7), o3(0xEC,0x8C,0xAA),
-     o3(0xEC,0x8C,0xAB), o3(0xEC,0x8C,0xAC),
-     o3(0xEC,0x8C,0xAD), o3(0xEC,0x8C,0xAE),
-     o3(0xEC,0x8C,0xAF), o3(0xEC,0x8C,0xB0),
-     o3(0xEC,0x8C,0xB1), o3(0xEC,0x8C,0xB2),
-     o3(0xEC,0x8C,0xB3), o3(0xEC,0x8C,0xB4),
-     o3(0xEC,0x8C,0xB5), o3(0xEC,0x8C,0xB6),
-     o3(0xEC,0x8C,0xB7), o3(0xEC,0x8C,0xB8),
-     o3(0xEC,0x8C,0xB9), o3(0xEC,0x8C,0xBA),
-     o3(0xEC,0x8C,0xBB), o3(0xEC,0x8C,0xBC),
-     o3(0xEC,0x8C,0xBD), o3(0xEC,0x8C,0xBE),
-     o3(0xEC,0x8C,0xBF), o3(0xEC,0x8D,0x80),
-     o3(0xEC,0x8D,0x81), o3(0xEC,0x8D,0x82),
-     o3(0xEC,0x8D,0x83), o3(0xEC,0x8D,0x84),
-     o3(0xEC,0x8D,0x86), o3(0xEC,0x8D,0x87),
-     o3(0xEC,0x8D,0x88), o3(0xEC,0x8D,0x89),
-     o3(0xEC,0x8D,0x8A), o3(0xEC,0x8D,0x8B),
-     o3(0xEC,0x8D,0x8C), o3(0xEC,0x8D,0x8D),
-     o3(0xEC,0x8D,0x8E), o3(0xEC,0x8D,0x8F),
-     o3(0xEC,0x8D,0x90), o3(0xEC,0x8D,0x91),
-     o3(0xEC,0x8D,0x92), o3(0xEC,0x8D,0x93),
-     o3(0xEC,0x8D,0x94), o3(0xEC,0x8D,0x95),
-     o3(0xEC,0x8D,0x96), o3(0xEC,0x8D,0x97),
-     o3(0xEC,0x8D,0x98), o3(0xEC,0x8D,0x99),
-     o3(0xEC,0x8D,0x9A), o3(0xEC,0x8D,0x9B),
-     o3(0xEC,0x8D,0x9C), o3(0xEC,0x8D,0x9D),
-     o3(0xEC,0x8D,0x9E), o3(0xEC,0x8D,0x9F),
-     o3(0xEC,0x8D,0xA0), o3(0xEC,0x8D,0xA1),
-     o3(0xEC,0x8D,0xA2), o3(0xEC,0x8D,0xA3),
-     o3(0xEC,0x8D,0xA4), o3(0xEC,0x8D,0xA5),
-     o3(0xEC,0x8D,0xA6), o3(0xEC,0x8D,0xA7),
-     o3(0xEC,0x8D,0xAA), o3(0xEC,0x8D,0xAB),
-     o3(0xEC,0x8D,0xAD), o3(0xEC,0x8D,0xAE),
-     o3(0xEC,0x8D,0xAF), o3(0xEC,0x8D,0xB1),
-     o3(0xEC,0x8D,0xB3), o3(0xEC,0x8D,0xB4),
-     o3(0xEC,0x8D,0xB5), o3(0xEC,0x8D,0xB6),
-     o3(0xEC,0x8D,0xB7), o3(0xEC,0x8D,0xBA),
-     o3(0xEC,0x8D,0xBB), o3(0xEC,0x8D,0xBE),
-     o3(0xEC,0x8D,0xBF), o3(0xEC,0x8E,0x80),
-     o3(0xEC,0x8E,0x81), o3(0xEC,0x8E,0x82),
-     o3(0xEC,0x8E,0x83), o3(0xEC,0x8E,0x85),
-     o3(0xEC,0x8E,0x86), o3(0xEC,0x8E,0x87),
-     o3(0xEC,0x8E,0x89), o3(0xEC,0x8E,0x8A),
-     o3(0xEC,0x8E,0x8B), o3(0xEC,0x8E,0x8D),
-     o3(0xEC,0x8E,0x8E), o3(0xEC,0x8E,0x8F),
-     o3(0xEC,0x8E,0x90), o3(0xEC,0x8E,0x91),
-     o3(0xEC,0x8E,0x92), o3(0xEC,0x8E,0x93),
-     o3(0xEC,0x8E,0x94), o3(0xEC,0x8E,0x95),
-     o3(0xEC,0x8E,0x96), o3(0xEC,0x8E,0x97),
-     o3(0xEC,0x8E,0x98), o3(0xEC,0x8E,0x99),
-     o3(0xEC,0x8E,0x9A), o3(0xEC,0x8E,0x9B),
-     o3(0xEC,0x8E,0x9C), o3(0xEC,0x8E,0x9D),
-     o3(0xEC,0x8E,0x9E), o3(0xEC,0x8E,0x9F),
-     o3(0xEC,0x8E,0xA0), o3(0xEC,0x8E,0xA1),
-     o3(0xEC,0x8E,0xA2), o3(0xEC,0x8E,0xA3),
-     o3(0xEC,0x8E,0xA4), o3(0xEC,0x8E,0xA5),
-     o3(0xEC,0x8E,0xA6), o3(0xEC,0x8E,0xA7),
-     o3(0xEC,0x8E,0xA8), o3(0xEC,0x8E,0xA9),
-     o3(0xEC,0x8E,0xAA), o3(0xEC,0x8E,0xAB),
-     o3(0xEC,0x8E,0xAC), o3(0xEC,0x8E,0xAD),
-     o3(0xEC,0x8E,0xAE), o3(0xEC,0x8E,0xAF),
-     o3(0xEC,0x8E,0xB0), o3(0xEC,0x8E,0xB1),
-     o3(0xEC,0x8E,0xB2), o3(0xEC,0x8E,0xB3),
-     o3(0xEC,0x8E,0xB4), o3(0xEC,0x8E,0xB5),
-     o3(0xEC,0x8E,0xB6), o3(0xEC,0x8E,0xB7),
-     o3(0xEC,0x8E,0xB8), o3(0xEC,0x8E,0xB9),
-     o3(0xEC,0x8E,0xBA), o3(0xEC,0x8E,0xBB),
-     o3(0xEC,0x8E,0xBC), o3(0xEC,0x8E,0xBD),
-     o3(0xEC,0x8E,0xBE), o3(0xEC,0x8E,0xBF),
-     o3(0xEC,0x8F,0x81), o3(0xEC,0x8F,0x82),
-     o3(0xEC,0x8F,0x83), o3(0xEC,0x8F,0x84),
-     o3(0xEC,0x8F,0x85), o3(0xEC,0x8F,0x86),
-     o3(0xEC,0x8F,0x87), o3(0xEC,0x8F,0x88),
-     o3(0xEC,0x8F,0x89), o3(0xEC,0x8F,0x8A),
-     o3(0xEC,0x8F,0x8B), o3(0xEC,0x8F,0x8C),
-     o3(0xEC,0x8F,0x8D), o3(0xEC,0x8F,0x8E),
-     o3(0xEC,0x8F,0x8F), o3(0xEC,0x8F,0x90),
-     o3(0xEC,0x8F,0x91), o3(0xEC,0x8F,0x92),
-     o3(0xEC,0x8F,0x93), o3(0xEC,0x8F,0x94),
-     o3(0xEC,0x8F,0x95), o3(0xEC,0x8F,0x96),
-     o3(0xEC,0x8F,0x97), o3(0xEC,0x8F,0x9A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9B = {
-    from_CP949_81_offsets,
-    from_CP949_9B_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9C_infos[179] = {
-     o3(0xEC,0x8F,0x9B), o3(0xEC,0x8F,0x9D),
-     o3(0xEC,0x8F,0x9E), o3(0xEC,0x8F,0xA1),
-     o3(0xEC,0x8F,0xA3), o3(0xEC,0x8F,0xA4),
-     o3(0xEC,0x8F,0xA5), o3(0xEC,0x8F,0xA6),
-     o3(0xEC,0x8F,0xA7), o3(0xEC,0x8F,0xAA),
-     o3(0xEC,0x8F,0xAB), o3(0xEC,0x8F,0xAC),
-     o3(0xEC,0x8F,0xAE), o3(0xEC,0x8F,0xAF),
-     o3(0xEC,0x8F,0xB0), o3(0xEC,0x8F,0xB1),
-     o3(0xEC,0x8F,0xB2), o3(0xEC,0x8F,0xB3),
-     o3(0xEC,0x8F,0xB6), o3(0xEC,0x8F,0xB7),
-     o3(0xEC,0x8F,0xB9), o3(0xEC,0x8F,0xBA),
-     o3(0xEC,0x8F,0xBB), o3(0xEC,0x8F,0xBC),
-     o3(0xEC,0x8F,0xBD), o3(0xEC,0x8F,0xBE),
-     o3(0xEC,0x8F,0xBF), o3(0xEC,0x90,0x80),
-     o3(0xEC,0x90,0x81), o3(0xEC,0x90,0x82),
-     o3(0xEC,0x90,0x83), o3(0xEC,0x90,0x84),
-     o3(0xEC,0x90,0x85), o3(0xEC,0x90,0x86),
-     o3(0xEC,0x90,0x87), o3(0xEC,0x90,0x89),
-     o3(0xEC,0x90,0x8A), o3(0xEC,0x90,0x8B),
-     o3(0xEC,0x90,0x8C), o3(0xEC,0x90,0x8D),
-     o3(0xEC,0x90,0x8E), o3(0xEC,0x90,0x8F),
-     o3(0xEC,0x90,0x91), o3(0xEC,0x90,0x92),
-     o3(0xEC,0x90,0x93), o3(0xEC,0x90,0x94),
-     o3(0xEC,0x90,0x95), o3(0xEC,0x90,0x96),
-     o3(0xEC,0x90,0x97), o3(0xEC,0x90,0x98),
-     o3(0xEC,0x90,0x99), o3(0xEC,0x90,0x9A),
-     o3(0xEC,0x90,0x9B), o3(0xEC,0x90,0x9C),
-     o3(0xEC,0x90,0x9D), o3(0xEC,0x90,0x9E),
-     o3(0xEC,0x90,0x9F), o3(0xEC,0x90,0xA0),
-     o3(0xEC,0x90,0xA1), o3(0xEC,0x90,0xA2),
-     o3(0xEC,0x90,0xA3), o3(0xEC,0x90,0xA5),
-     o3(0xEC,0x90,0xA6), o3(0xEC,0x90,0xA7),
-     o3(0xEC,0x90,0xA8), o3(0xEC,0x90,0xA9),
-     o3(0xEC,0x90,0xAA), o3(0xEC,0x90,0xAB),
-     o3(0xEC,0x90,0xAD), o3(0xEC,0x90,0xAE),
-     o3(0xEC,0x90,0xAF), o3(0xEC,0x90,0xB1),
-     o3(0xEC,0x90,0xB2), o3(0xEC,0x90,0xB3),
-     o3(0xEC,0x90,0xB5), o3(0xEC,0x90,0xB6),
-     o3(0xEC,0x90,0xB7), o3(0xEC,0x90,0xB8),
-     o3(0xEC,0x90,0xB9), o3(0xEC,0x90,0xBA),
-     o3(0xEC,0x90,0xBB), o3(0xEC,0x90,0xBE),
-     o3(0xEC,0x90,0xBF), o3(0xEC,0x91,0x80),
-     o3(0xEC,0x91,0x81), o3(0xEC,0x91,0x82),
-     o3(0xEC,0x91,0x83), o3(0xEC,0x91,0x84),
-     o3(0xEC,0x91,0x85), o3(0xEC,0x91,0x86),
-     o3(0xEC,0x91,0x87), o3(0xEC,0x91,0x89),
-     o3(0xEC,0x91,0x8A), o3(0xEC,0x91,0x8B),
-     o3(0xEC,0x91,0x8C), o3(0xEC,0x91,0x8D),
-     o3(0xEC,0x91,0x8E), o3(0xEC,0x91,0x8F),
-     o3(0xEC,0x91,0x90), o3(0xEC,0x91,0x91),
-     o3(0xEC,0x91,0x92), o3(0xEC,0x91,0x93),
-     o3(0xEC,0x91,0x94), o3(0xEC,0x91,0x95),
-     o3(0xEC,0x91,0x96), o3(0xEC,0x91,0x97),
-     o3(0xEC,0x91,0x98), o3(0xEC,0x91,0x99),
-     o3(0xEC,0x91,0x9A), o3(0xEC,0x91,0x9B),
-     o3(0xEC,0x91,0x9C), o3(0xEC,0x91,0x9D),
-     o3(0xEC,0x91,0x9E), o3(0xEC,0x91,0x9F),
-     o3(0xEC,0x91,0xA0), o3(0xEC,0x91,0xA1),
-     o3(0xEC,0x91,0xA2), o3(0xEC,0x91,0xA3),
-     o3(0xEC,0x91,0xA6), o3(0xEC,0x91,0xA7),
-     o3(0xEC,0x91,0xA9), o3(0xEC,0x91,0xAA),
-     o3(0xEC,0x91,0xAB), o3(0xEC,0x91,0xAD),
-     o3(0xEC,0x91,0xAE), o3(0xEC,0x91,0xAF),
-     o3(0xEC,0x91,0xB0), o3(0xEC,0x91,0xB1),
-     o3(0xEC,0x91,0xB2), o3(0xEC,0x91,0xB3),
-     o3(0xEC,0x91,0xB6), o3(0xEC,0x91,0xB7),
-     o3(0xEC,0x91,0xB8), o3(0xEC,0x91,0xBA),
-     o3(0xEC,0x91,0xBB), o3(0xEC,0x91,0xBC),
-     o3(0xEC,0x91,0xBD), o3(0xEC,0x91,0xBE),
-     o3(0xEC,0x91,0xBF), o3(0xEC,0x92,0x81),
-     o3(0xEC,0x92,0x82), o3(0xEC,0x92,0x83),
-     o3(0xEC,0x92,0x84), o3(0xEC,0x92,0x85),
-     o3(0xEC,0x92,0x86), o3(0xEC,0x92,0x87),
-     o3(0xEC,0x92,0x88), o3(0xEC,0x92,0x89),
-     o3(0xEC,0x92,0x8A), o3(0xEC,0x92,0x8B),
-     o3(0xEC,0x92,0x8C), o3(0xEC,0x92,0x8D),
-     o3(0xEC,0x92,0x8E), o3(0xEC,0x92,0x8F),
-     o3(0xEC,0x92,0x90), o3(0xEC,0x92,0x91),
-     o3(0xEC,0x92,0x92), o3(0xEC,0x92,0x93),
-     o3(0xEC,0x92,0x95), o3(0xEC,0x92,0x96),
-     o3(0xEC,0x92,0x97), o3(0xEC,0x92,0x98),
-     o3(0xEC,0x92,0x99), o3(0xEC,0x92,0x9A),
-     o3(0xEC,0x92,0x9B), o3(0xEC,0x92,0x9D),
-     o3(0xEC,0x92,0x9E), o3(0xEC,0x92,0x9F),
-     o3(0xEC,0x92,0xA0), o3(0xEC,0x92,0xA1),
-     o3(0xEC,0x92,0xA2), o3(0xEC,0x92,0xA3),
-     o3(0xEC,0x92,0xA4), o3(0xEC,0x92,0xA5),
-     o3(0xEC,0x92,0xA6), o3(0xEC,0x92,0xA7),
-     o3(0xEC,0x92,0xA8), o3(0xEC,0x92,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9C = {
-    from_CP949_81_offsets,
-    from_CP949_9C_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9D_infos[179] = {
-     o3(0xEC,0x92,0xAA), o3(0xEC,0x92,0xAB),
-     o3(0xEC,0x92,0xAC), o3(0xEC,0x92,0xAD),
-     o3(0xEC,0x92,0xAE), o3(0xEC,0x92,0xAF),
-     o3(0xEC,0x92,0xB0), o3(0xEC,0x92,0xB1),
-     o3(0xEC,0x92,0xB2), o3(0xEC,0x92,0xB3),
-     o3(0xEC,0x92,0xB4), o3(0xEC,0x92,0xB5),
-     o3(0xEC,0x92,0xB6), o3(0xEC,0x92,0xB7),
-     o3(0xEC,0x92,0xB9), o3(0xEC,0x92,0xBA),
-     o3(0xEC,0x92,0xBB), o3(0xEC,0x92,0xBD),
-     o3(0xEC,0x92,0xBE), o3(0xEC,0x92,0xBF),
-     o3(0xEC,0x93,0x80), o3(0xEC,0x93,0x81),
-     o3(0xEC,0x93,0x82), o3(0xEC,0x93,0x83),
-     o3(0xEC,0x93,0x84), o3(0xEC,0x93,0x85),
-     o3(0xEC,0x93,0x86), o3(0xEC,0x93,0x87),
-     o3(0xEC,0x93,0x88), o3(0xEC,0x93,0x89),
-     o3(0xEC,0x93,0x8A), o3(0xEC,0x93,0x8B),
-     o3(0xEC,0x93,0x8C), o3(0xEC,0x93,0x8D),
-     o3(0xEC,0x93,0x8E), o3(0xEC,0x93,0x8F),
-     o3(0xEC,0x93,0x90), o3(0xEC,0x93,0x91),
-     o3(0xEC,0x93,0x92), o3(0xEC,0x93,0x93),
-     o3(0xEC,0x93,0x94), o3(0xEC,0x93,0x95),
-     o3(0xEC,0x93,0x96), o3(0xEC,0x93,0x97),
-     o3(0xEC,0x93,0x98), o3(0xEC,0x93,0x99),
-     o3(0xEC,0x93,0x9A), o3(0xEC,0x93,0x9B),
-     o3(0xEC,0x93,0x9C), o3(0xEC,0x93,0x9D),
-     o3(0xEC,0x93,0x9E), o3(0xEC,0x93,0x9F),
-     o3(0xEC,0x93,0xA0), o3(0xEC,0x93,0xA1),
-     o3(0xEC,0x93,0xA2), o3(0xEC,0x93,0xA3),
-     o3(0xEC,0x93,0xA4), o3(0xEC,0x93,0xA5),
-     o3(0xEC,0x93,0xA6), o3(0xEC,0x93,0xA7),
-     o3(0xEC,0x93,0xA8), o3(0xEC,0x93,0xAA),
-     o3(0xEC,0x93,0xAB), o3(0xEC,0x93,0xAC),
-     o3(0xEC,0x93,0xAD), o3(0xEC,0x93,0xAE),
-     o3(0xEC,0x93,0xAF), o3(0xEC,0x93,0xB2),
-     o3(0xEC,0x93,0xB3), o3(0xEC,0x93,0xB5),
-     o3(0xEC,0x93,0xB6), o3(0xEC,0x93,0xB7),
-     o3(0xEC,0x93,0xB9), o3(0xEC,0x93,0xBB),
-     o3(0xEC,0x93,0xBC), o3(0xEC,0x93,0xBD),
-     o3(0xEC,0x93,0xBE), o3(0xEC,0x94,0x82),
-     o3(0xEC,0x94,0x83), o3(0xEC,0x94,0x84),
-     o3(0xEC,0x94,0x85), o3(0xEC,0x94,0x86),
-     o3(0xEC,0x94,0x87), o3(0xEC,0x94,0x88),
-     o3(0xEC,0x94,0x89), o3(0xEC,0x94,0x8A),
-     o3(0xEC,0x94,0x8B), o3(0xEC,0x94,0x8D),
-     o3(0xEC,0x94,0x8E), o3(0xEC,0x94,0x8F),
-     o3(0xEC,0x94,0x91), o3(0xEC,0x94,0x92),
-     o3(0xEC,0x94,0x93), o3(0xEC,0x94,0x95),
-     o3(0xEC,0x94,0x96), o3(0xEC,0x94,0x97),
-     o3(0xEC,0x94,0x98), o3(0xEC,0x94,0x99),
-     o3(0xEC,0x94,0x9A), o3(0xEC,0x94,0x9B),
-     o3(0xEC,0x94,0x9D), o3(0xEC,0x94,0x9E),
-     o3(0xEC,0x94,0x9F), o3(0xEC,0x94,0xA0),
-     o3(0xEC,0x94,0xA1), o3(0xEC,0x94,0xA2),
-     o3(0xEC,0x94,0xA3), o3(0xEC,0x94,0xA4),
-     o3(0xEC,0x94,0xA5), o3(0xEC,0x94,0xA6),
-     o3(0xEC,0x94,0xA7), o3(0xEC,0x94,0xAA),
-     o3(0xEC,0x94,0xAB), o3(0xEC,0x94,0xAD),
-     o3(0xEC,0x94,0xAE), o3(0xEC,0x94,0xAF),
-     o3(0xEC,0x94,0xB1), o3(0xEC,0x94,0xB2),
-     o3(0xEC,0x94,0xB3), o3(0xEC,0x94,0xB4),
-     o3(0xEC,0x94,0xB5), o3(0xEC,0x94,0xB6),
-     o3(0xEC,0x94,0xB7), o3(0xEC,0x94,0xBA),
-     o3(0xEC,0x94,0xBC), o3(0xEC,0x94,0xBE),
-     o3(0xEC,0x94,0xBF), o3(0xEC,0x95,0x80),
-     o3(0xEC,0x95,0x81), o3(0xEC,0x95,0x82),
-     o3(0xEC,0x95,0x83), o3(0xEC,0x95,0x86),
-     o3(0xEC,0x95,0x87), o3(0xEC,0x95,0x8B),
-     o3(0xEC,0x95,0x8F), o3(0xEC,0x95,0x90),
-     o3(0xEC,0x95,0x91), o3(0xEC,0x95,0x92),
-     o3(0xEC,0x95,0x96), o3(0xEC,0x95,0x9A),
-     o3(0xEC,0x95,0x9B), o3(0xEC,0x95,0x9C),
-     o3(0xEC,0x95,0x9F), o3(0xEC,0x95,0xA2),
-     o3(0xEC,0x95,0xA3), o3(0xEC,0x95,0xA5),
-     o3(0xEC,0x95,0xA6), o3(0xEC,0x95,0xA7),
-     o3(0xEC,0x95,0xA9), o3(0xEC,0x95,0xAA),
-     o3(0xEC,0x95,0xAB), o3(0xEC,0x95,0xAC),
-     o3(0xEC,0x95,0xAD), o3(0xEC,0x95,0xAE),
-     o3(0xEC,0x95,0xAF), o3(0xEC,0x95,0xB2),
-     o3(0xEC,0x95,0xB6), o3(0xEC,0x95,0xB7),
-     o3(0xEC,0x95,0xB8), o3(0xEC,0x95,0xB9),
-     o3(0xEC,0x95,0xBA), o3(0xEC,0x95,0xBB),
-     o3(0xEC,0x95,0xBE), o3(0xEC,0x95,0xBF),
-     o3(0xEC,0x96,0x81), o3(0xEC,0x96,0x82),
-     o3(0xEC,0x96,0x83), o3(0xEC,0x96,0x85),
-     o3(0xEC,0x96,0x86), o3(0xEC,0x96,0x88),
-     o3(0xEC,0x96,0x89), o3(0xEC,0x96,0x8A),
-     o3(0xEC,0x96,0x8B), o3(0xEC,0x96,0x8E),
-     o3(0xEC,0x96,0x90), o3(0xEC,0x96,0x92),
-     o3(0xEC,0x96,0x93), o3(0xEC,0x96,0x94),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9D = {
-    from_CP949_81_offsets,
-    from_CP949_9D_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9E_infos[179] = {
-     o3(0xEC,0x96,0x96), o3(0xEC,0x96,0x99),
-     o3(0xEC,0x96,0x9A), o3(0xEC,0x96,0x9B),
-     o3(0xEC,0x96,0x9D), o3(0xEC,0x96,0x9E),
-     o3(0xEC,0x96,0x9F), o3(0xEC,0x96,0xA1),
-     o3(0xEC,0x96,0xA2), o3(0xEC,0x96,0xA3),
-     o3(0xEC,0x96,0xA4), o3(0xEC,0x96,0xA5),
-     o3(0xEC,0x96,0xA6), o3(0xEC,0x96,0xA7),
-     o3(0xEC,0x96,0xA8), o3(0xEC,0x96,0xAA),
-     o3(0xEC,0x96,0xAB), o3(0xEC,0x96,0xAC),
-     o3(0xEC,0x96,0xAD), o3(0xEC,0x96,0xAE),
-     o3(0xEC,0x96,0xAF), o3(0xEC,0x96,0xB0),
-     o3(0xEC,0x96,0xB1), o3(0xEC,0x96,0xB2),
-     o3(0xEC,0x96,0xB3), o3(0xEC,0x96,0xB6),
-     o3(0xEC,0x96,0xB7), o3(0xEC,0x96,0xBA),
-     o3(0xEC,0x96,0xBF), o3(0xEC,0x97,0x80),
-     o3(0xEC,0x97,0x81), o3(0xEC,0x97,0x82),
-     o3(0xEC,0x97,0x83), o3(0xEC,0x97,0x8B),
-     o3(0xEC,0x97,0x8D), o3(0xEC,0x97,0x8F),
-     o3(0xEC,0x97,0x92), o3(0xEC,0x97,0x93),
-     o3(0xEC,0x97,0x95), o3(0xEC,0x97,0x96),
-     o3(0xEC,0x97,0x97), o3(0xEC,0x97,0x99),
-     o3(0xEC,0x97,0x9A), o3(0xEC,0x97,0x9B),
-     o3(0xEC,0x97,0x9C), o3(0xEC,0x97,0x9D),
-     o3(0xEC,0x97,0x9E), o3(0xEC,0x97,0x9F),
-     o3(0xEC,0x97,0xA2), o3(0xEC,0x97,0xA4),
-     o3(0xEC,0x97,0xA6), o3(0xEC,0x97,0xA7),
-     o3(0xEC,0x97,0xA8), o3(0xEC,0x97,0xA9),
-     o3(0xEC,0x97,0xAA), o3(0xEC,0x97,0xAB),
-     o3(0xEC,0x97,0xAF), o3(0xEC,0x97,0xB1),
-     o3(0xEC,0x97,0xB2), o3(0xEC,0x97,0xB3),
-     o3(0xEC,0x97,0xB5), o3(0xEC,0x97,0xB8),
-     o3(0xEC,0x97,0xB9), o3(0xEC,0x97,0xBA),
-     o3(0xEC,0x97,0xBB), o3(0xEC,0x98,0x82),
-     o3(0xEC,0x98,0x83), o3(0xEC,0x98,0x84),
-     o3(0xEC,0x98,0x89), o3(0xEC,0x98,0x8A),
-     o3(0xEC,0x98,0x8B), o3(0xEC,0x98,0x8D),
-     o3(0xEC,0x98,0x8E), o3(0xEC,0x98,0x8F),
-     o3(0xEC,0x98,0x91), o3(0xEC,0x98,0x92),
-     o3(0xEC,0x98,0x93), o3(0xEC,0x98,0x94),
-     o3(0xEC,0x98,0x95), o3(0xEC,0x98,0x96),
-     o3(0xEC,0x98,0x97), o3(0xEC,0x98,0x9A),
-     o3(0xEC,0x98,0x9D), o3(0xEC,0x98,0x9E),
-     o3(0xEC,0x98,0x9F), o3(0xEC,0x98,0xA0),
-     o3(0xEC,0x98,0xA1), o3(0xEC,0x98,0xA2),
-     o3(0xEC,0x98,0xA3), o3(0xEC,0x98,0xA6),
-     o3(0xEC,0x98,0xA7), o3(0xEC,0x98,0xA9),
-     o3(0xEC,0x98,0xAA), o3(0xEC,0x98,0xAB),
-     o3(0xEC,0x98,0xAF), o3(0xEC,0x98,0xB1),
-     o3(0xEC,0x98,0xB2), o3(0xEC,0x98,0xB6),
-     o3(0xEC,0x98,0xB8), o3(0xEC,0x98,0xBA),
-     o3(0xEC,0x98,0xBC), o3(0xEC,0x98,0xBD),
-     o3(0xEC,0x98,0xBE), o3(0xEC,0x98,0xBF),
-     o3(0xEC,0x99,0x82), o3(0xEC,0x99,0x83),
-     o3(0xEC,0x99,0x85), o3(0xEC,0x99,0x86),
-     o3(0xEC,0x99,0x87), o3(0xEC,0x99,0x89),
-     o3(0xEC,0x99,0x8A), o3(0xEC,0x99,0x8B),
-     o3(0xEC,0x99,0x8C), o3(0xEC,0x99,0x8D),
-     o3(0xEC,0x99,0x8E), o3(0xEC,0x99,0x8F),
-     o3(0xEC,0x99,0x92), o3(0xEC,0x99,0x96),
-     o3(0xEC,0x99,0x97), o3(0xEC,0x99,0x98),
-     o3(0xEC,0x99,0x99), o3(0xEC,0x99,0x9A),
-     o3(0xEC,0x99,0x9B), o3(0xEC,0x99,0x9E),
-     o3(0xEC,0x99,0x9F), o3(0xEC,0x99,0xA1),
-     o3(0xEC,0x99,0xA2), o3(0xEC,0x99,0xA3),
-     o3(0xEC,0x99,0xA4), o3(0xEC,0x99,0xA5),
-     o3(0xEC,0x99,0xA6), o3(0xEC,0x99,0xA7),
-     o3(0xEC,0x99,0xA8), o3(0xEC,0x99,0xA9),
-     o3(0xEC,0x99,0xAA), o3(0xEC,0x99,0xAB),
-     o3(0xEC,0x99,0xAD), o3(0xEC,0x99,0xAE),
-     o3(0xEC,0x99,0xB0), o3(0xEC,0x99,0xB2),
-     o3(0xEC,0x99,0xB3), o3(0xEC,0x99,0xB4),
-     o3(0xEC,0x99,0xB5), o3(0xEC,0x99,0xB6),
-     o3(0xEC,0x99,0xB7), o3(0xEC,0x99,0xBA),
-     o3(0xEC,0x99,0xBB), o3(0xEC,0x99,0xBD),
-     o3(0xEC,0x99,0xBE), o3(0xEC,0x99,0xBF),
-     o3(0xEC,0x9A,0x81), o3(0xEC,0x9A,0x82),
-     o3(0xEC,0x9A,0x83), o3(0xEC,0x9A,0x84),
-     o3(0xEC,0x9A,0x85), o3(0xEC,0x9A,0x86),
-     o3(0xEC,0x9A,0x87), o3(0xEC,0x9A,0x8A),
-     o3(0xEC,0x9A,0x8C), o3(0xEC,0x9A,0x8E),
-     o3(0xEC,0x9A,0x8F), o3(0xEC,0x9A,0x90),
-     o3(0xEC,0x9A,0x91), o3(0xEC,0x9A,0x92),
-     o3(0xEC,0x9A,0x93), o3(0xEC,0x9A,0x96),
-     o3(0xEC,0x9A,0x97), o3(0xEC,0x9A,0x99),
-     o3(0xEC,0x9A,0x9A), o3(0xEC,0x9A,0x9B),
-     o3(0xEC,0x9A,0x9D), o3(0xEC,0x9A,0x9E),
-     o3(0xEC,0x9A,0x9F), o3(0xEC,0x9A,0xA0),
-     o3(0xEC,0x9A,0xA1), o3(0xEC,0x9A,0xA2),
-     o3(0xEC,0x9A,0xA3), o3(0xEC,0x9A,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9E = {
-    from_CP949_81_offsets,
-    from_CP949_9E_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_9F_infos[179] = {
-     o3(0xEC,0x9A,0xA8), o3(0xEC,0x9A,0xAA),
-     o3(0xEC,0x9A,0xAB), o3(0xEC,0x9A,0xAC),
-     o3(0xEC,0x9A,0xAD), o3(0xEC,0x9A,0xAE),
-     o3(0xEC,0x9A,0xAF), o3(0xEC,0x9A,0xB2),
-     o3(0xEC,0x9A,0xB3), o3(0xEC,0x9A,0xB5),
-     o3(0xEC,0x9A,0xB6), o3(0xEC,0x9A,0xB7),
-     o3(0xEC,0x9A,0xBB), o3(0xEC,0x9A,0xBC),
-     o3(0xEC,0x9A,0xBD), o3(0xEC,0x9A,0xBE),
-     o3(0xEC,0x9A,0xBF), o3(0xEC,0x9B,0x82),
-     o3(0xEC,0x9B,0x84), o3(0xEC,0x9B,0x86),
-     o3(0xEC,0x9B,0x87), o3(0xEC,0x9B,0x88),
-     o3(0xEC,0x9B,0x89), o3(0xEC,0x9B,0x8A),
-     o3(0xEC,0x9B,0x8B), o3(0xEC,0x9B,0x8E),
-     o3(0xEC,0x9B,0x8F), o3(0xEC,0x9B,0x91),
-     o3(0xEC,0x9B,0x92), o3(0xEC,0x9B,0x93),
-     o3(0xEC,0x9B,0x95), o3(0xEC,0x9B,0x96),
-     o3(0xEC,0x9B,0x97), o3(0xEC,0x9B,0x98),
-     o3(0xEC,0x9B,0x99), o3(0xEC,0x9B,0x9A),
-     o3(0xEC,0x9B,0x9B), o3(0xEC,0x9B,0x9E),
-     o3(0xEC,0x9B,0x9F), o3(0xEC,0x9B,0xA2),
-     o3(0xEC,0x9B,0xA3), o3(0xEC,0x9B,0xA4),
-     o3(0xEC,0x9B,0xA5), o3(0xEC,0x9B,0xA6),
-     o3(0xEC,0x9B,0xA7), o3(0xEC,0x9B,0xAA),
-     o3(0xEC,0x9B,0xAB), o3(0xEC,0x9B,0xAD),
-     o3(0xEC,0x9B,0xAE), o3(0xEC,0x9B,0xAF),
-     o3(0xEC,0x9B,0xB1), o3(0xEC,0x9B,0xB2),
-     o3(0xEC,0x9B,0xB3), o3(0xEC,0x9B,0xB4),
-     o3(0xEC,0x9B,0xB5), o3(0xEC,0x9B,0xB6),
-     o3(0xEC,0x9B,0xB7), o3(0xEC,0x9B,0xBA),
-     o3(0xEC,0x9B,0xBB), o3(0xEC,0x9B,0xBC),
-     o3(0xEC,0x9B,0xBE), o3(0xEC,0x9B,0xBF),
-     o3(0xEC,0x9C,0x80), o3(0xEC,0x9C,0x81),
-     o3(0xEC,0x9C,0x82), o3(0xEC,0x9C,0x83),
-     o3(0xEC,0x9C,0x86), o3(0xEC,0x9C,0x87),
-     o3(0xEC,0x9C,0x89), o3(0xEC,0x9C,0x8A),
-     o3(0xEC,0x9C,0x8B), o3(0xEC,0x9C,0x8D),
-     o3(0xEC,0x9C,0x8E), o3(0xEC,0x9C,0x8F),
-     o3(0xEC,0x9C,0x90), o3(0xEC,0x9C,0x91),
-     o3(0xEC,0x9C,0x92), o3(0xEC,0x9C,0x93),
-     o3(0xEC,0x9C,0x96), o3(0xEC,0x9C,0x98),
-     o3(0xEC,0x9C,0x9A), o3(0xEC,0x9C,0x9B),
-     o3(0xEC,0x9C,0x9C), o3(0xEC,0x9C,0x9D),
-     o3(0xEC,0x9C,0x9E), o3(0xEC,0x9C,0x9F),
-     o3(0xEC,0x9C,0xA2), o3(0xEC,0x9C,0xA3),
-     o3(0xEC,0x9C,0xA5), o3(0xEC,0x9C,0xA6),
-     o3(0xEC,0x9C,0xA7), o3(0xEC,0x9C,0xA9),
-     o3(0xEC,0x9C,0xAA), o3(0xEC,0x9C,0xAB),
-     o3(0xEC,0x9C,0xAC), o3(0xEC,0x9C,0xAD),
-     o3(0xEC,0x9C,0xAE), o3(0xEC,0x9C,0xAF),
-     o3(0xEC,0x9C,0xB2), o3(0xEC,0x9C,0xB4),
-     o3(0xEC,0x9C,0xB6), o3(0xEC,0x9C,0xB8),
-     o3(0xEC,0x9C,0xB9), o3(0xEC,0x9C,0xBA),
-     o3(0xEC,0x9C,0xBB), o3(0xEC,0x9C,0xBE),
-     o3(0xEC,0x9C,0xBF), o3(0xEC,0x9D,0x81),
-     o3(0xEC,0x9D,0x82), o3(0xEC,0x9D,0x83),
-     o3(0xEC,0x9D,0x85), o3(0xEC,0x9D,0x86),
-     o3(0xEC,0x9D,0x87), o3(0xEC,0x9D,0x88),
-     o3(0xEC,0x9D,0x89), o3(0xEC,0x9D,0x8B),
-     o3(0xEC,0x9D,0x8E), o3(0xEC,0x9D,0x90),
-     o3(0xEC,0x9D,0x99), o3(0xEC,0x9D,0x9A),
-     o3(0xEC,0x9D,0x9B), o3(0xEC,0x9D,0x9D),
-     o3(0xEC,0x9D,0x9E), o3(0xEC,0x9D,0x9F),
-     o3(0xEC,0x9D,0xA1), o3(0xEC,0x9D,0xA2),
-     o3(0xEC,0x9D,0xA3), o3(0xEC,0x9D,0xA4),
-     o3(0xEC,0x9D,0xA5), o3(0xEC,0x9D,0xA6),
-     o3(0xEC,0x9D,0xA7), o3(0xEC,0x9D,0xA9),
-     o3(0xEC,0x9D,0xAA), o3(0xEC,0x9D,0xAC),
-     o3(0xEC,0x9D,0xAD), o3(0xEC,0x9D,0xAE),
-     o3(0xEC,0x9D,0xAF), o3(0xEC,0x9D,0xB0),
-     o3(0xEC,0x9D,0xB1), o3(0xEC,0x9D,0xB2),
-     o3(0xEC,0x9D,0xB3), o3(0xEC,0x9D,0xB6),
-     o3(0xEC,0x9D,0xB7), o3(0xEC,0x9D,0xB9),
-     o3(0xEC,0x9D,0xBA), o3(0xEC,0x9D,0xBB),
-     o3(0xEC,0x9D,0xBF), o3(0xEC,0x9E,0x80),
-     o3(0xEC,0x9E,0x81), o3(0xEC,0x9E,0x82),
-     o3(0xEC,0x9E,0x86), o3(0xEC,0x9E,0x8B),
-     o3(0xEC,0x9E,0x8C), o3(0xEC,0x9E,0x8D),
-     o3(0xEC,0x9E,0x8F), o3(0xEC,0x9E,0x92),
-     o3(0xEC,0x9E,0x93), o3(0xEC,0x9E,0x95),
-     o3(0xEC,0x9E,0x99), o3(0xEC,0x9E,0x9B),
-     o3(0xEC,0x9E,0x9C), o3(0xEC,0x9E,0x9D),
-     o3(0xEC,0x9E,0x9E), o3(0xEC,0x9E,0x9F),
-     o3(0xEC,0x9E,0xA2), o3(0xEC,0x9E,0xA7),
-     o3(0xEC,0x9E,0xA8), o3(0xEC,0x9E,0xA9),
-     o3(0xEC,0x9E,0xAA), o3(0xEC,0x9E,0xAB),
-     o3(0xEC,0x9E,0xAE), o3(0xEC,0x9E,0xAF),
-     o3(0xEC,0x9E,0xB1), o3(0xEC,0x9E,0xB2),
-     o3(0xEC,0x9E,0xB3), o3(0xEC,0x9E,0xB5),
-     o3(0xEC,0x9E,0xB6), o3(0xEC,0x9E,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_9F = {
-    from_CP949_81_offsets,
-    from_CP949_9F_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_A0_infos[179] = {
-     o3(0xEC,0x9E,0xB8), o3(0xEC,0x9E,0xB9),
-     o3(0xEC,0x9E,0xBA), o3(0xEC,0x9E,0xBB),
-     o3(0xEC,0x9E,0xBE), o3(0xEC,0x9F,0x82),
-     o3(0xEC,0x9F,0x83), o3(0xEC,0x9F,0x84),
-     o3(0xEC,0x9F,0x85), o3(0xEC,0x9F,0x86),
-     o3(0xEC,0x9F,0x87), o3(0xEC,0x9F,0x8A),
-     o3(0xEC,0x9F,0x8B), o3(0xEC,0x9F,0x8D),
-     o3(0xEC,0x9F,0x8F), o3(0xEC,0x9F,0x91),
-     o3(0xEC,0x9F,0x92), o3(0xEC,0x9F,0x93),
-     o3(0xEC,0x9F,0x94), o3(0xEC,0x9F,0x95),
-     o3(0xEC,0x9F,0x96), o3(0xEC,0x9F,0x97),
-     o3(0xEC,0x9F,0x99), o3(0xEC,0x9F,0x9A),
-     o3(0xEC,0x9F,0x9B), o3(0xEC,0x9F,0x9C),
-     o3(0xEC,0x9F,0x9E), o3(0xEC,0x9F,0x9F),
-     o3(0xEC,0x9F,0xA0), o3(0xEC,0x9F,0xA1),
-     o3(0xEC,0x9F,0xA2), o3(0xEC,0x9F,0xA3),
-     o3(0xEC,0x9F,0xA5), o3(0xEC,0x9F,0xA6),
-     o3(0xEC,0x9F,0xA7), o3(0xEC,0x9F,0xA9),
-     o3(0xEC,0x9F,0xAA), o3(0xEC,0x9F,0xAB),
-     o3(0xEC,0x9F,0xAD), o3(0xEC,0x9F,0xAE),
-     o3(0xEC,0x9F,0xAF), o3(0xEC,0x9F,0xB0),
-     o3(0xEC,0x9F,0xB1), o3(0xEC,0x9F,0xB2),
-     o3(0xEC,0x9F,0xB3), o3(0xEC,0x9F,0xB4),
-     o3(0xEC,0x9F,0xB5), o3(0xEC,0x9F,0xB6),
-     o3(0xEC,0x9F,0xB7), o3(0xEC,0x9F,0xB8),
-     o3(0xEC,0x9F,0xB9), o3(0xEC,0x9F,0xBA),
-     o3(0xEC,0x9F,0xBB), o3(0xEC,0x9F,0xBC),
-     o3(0xEC,0x9F,0xBD), o3(0xEC,0x9F,0xBE),
-     o3(0xEC,0x9F,0xBF), o3(0xEC,0xA0,0x82),
-     o3(0xEC,0xA0,0x83), o3(0xEC,0xA0,0x85),
-     o3(0xEC,0xA0,0x86), o3(0xEC,0xA0,0x87),
-     o3(0xEC,0xA0,0x89), o3(0xEC,0xA0,0x8B),
-     o3(0xEC,0xA0,0x8C), o3(0xEC,0xA0,0x8D),
-     o3(0xEC,0xA0,0x8E), o3(0xEC,0xA0,0x8F),
-     o3(0xEC,0xA0,0x92), o3(0xEC,0xA0,0x94),
-     o3(0xEC,0xA0,0x97), o3(0xEC,0xA0,0x98),
-     o3(0xEC,0xA0,0x99), o3(0xEC,0xA0,0x9A),
-     o3(0xEC,0xA0,0x9B), o3(0xEC,0xA0,0x9E),
-     o3(0xEC,0xA0,0x9F), o3(0xEC,0xA0,0xA1),
-     o3(0xEC,0xA0,0xA2), o3(0xEC,0xA0,0xA3),
-     o3(0xEC,0xA0,0xA5), o3(0xEC,0xA0,0xA6),
-     o3(0xEC,0xA0,0xA7), o3(0xEC,0xA0,0xA8),
-     o3(0xEC,0xA0,0xA9), o3(0xEC,0xA0,0xAA),
-     o3(0xEC,0xA0,0xAB), o3(0xEC,0xA0,0xAE),
-     o3(0xEC,0xA0,0xB0), o3(0xEC,0xA0,0xB2),
-     o3(0xEC,0xA0,0xB3), o3(0xEC,0xA0,0xB4),
-     o3(0xEC,0xA0,0xB5), o3(0xEC,0xA0,0xB6),
-     o3(0xEC,0xA0,0xB7), o3(0xEC,0xA0,0xB9),
-     o3(0xEC,0xA0,0xBA), o3(0xEC,0xA0,0xBB),
-     o3(0xEC,0xA0,0xBD), o3(0xEC,0xA0,0xBE),
-     o3(0xEC,0xA0,0xBF), o3(0xEC,0xA1,0x81),
-     o3(0xEC,0xA1,0x82), o3(0xEC,0xA1,0x83),
-     o3(0xEC,0xA1,0x84), o3(0xEC,0xA1,0x85),
-     o3(0xEC,0xA1,0x86), o3(0xEC,0xA1,0x87),
-     o3(0xEC,0xA1,0x8A), o3(0xEC,0xA1,0x8B),
-     o3(0xEC,0xA1,0x8E), o3(0xEC,0xA1,0x8F),
-     o3(0xEC,0xA1,0x90), o3(0xEC,0xA1,0x91),
-     o3(0xEC,0xA1,0x92), o3(0xEC,0xA1,0x93),
-     o3(0xEC,0xA1,0x95), o3(0xEC,0xA1,0x96),
-     o3(0xEC,0xA1,0x97), o3(0xEC,0xA1,0x98),
-     o3(0xEC,0xA1,0x99), o3(0xEC,0xA1,0x9A),
-     o3(0xEC,0xA1,0x9B), o3(0xEC,0xA1,0x9C),
-     o3(0xEC,0xA1,0x9D), o3(0xEC,0xA1,0x9E),
-     o3(0xEC,0xA1,0x9F), o3(0xEC,0xA1,0xA0),
-     o3(0xEC,0xA1,0xA1), o3(0xEC,0xA1,0xA2),
-     o3(0xEC,0xA1,0xA3), o3(0xEC,0xA1,0xA4),
-     o3(0xEC,0xA1,0xA5), o3(0xEC,0xA1,0xA6),
-     o3(0xEC,0xA1,0xA7), o3(0xEC,0xA1,0xA8),
-     o3(0xEC,0xA1,0xA9), o3(0xEC,0xA1,0xAA),
-     o3(0xEC,0xA1,0xAB), o3(0xEC,0xA1,0xAC),
-     o3(0xEC,0xA1,0xAD), o3(0xEC,0xA1,0xAE),
-     o3(0xEC,0xA1,0xAF), o3(0xEC,0xA1,0xB2),
-     o3(0xEC,0xA1,0xB3), o3(0xEC,0xA1,0xB5),
-     o3(0xEC,0xA1,0xB6), o3(0xEC,0xA1,0xB7),
-     o3(0xEC,0xA1,0xB9), o3(0xEC,0xA1,0xBB),
-     o3(0xEC,0xA1,0xBC), o3(0xEC,0xA1,0xBD),
-     o3(0xEC,0xA1,0xBE), o3(0xEC,0xA1,0xBF),
-     o3(0xEC,0xA2,0x82), o3(0xEC,0xA2,0x84),
-     o3(0xEC,0xA2,0x88), o3(0xEC,0xA2,0x89),
-     o3(0xEC,0xA2,0x8A), o3(0xEC,0xA2,0x8E),
-     o3(0xEC,0xA2,0x8F), o3(0xEC,0xA2,0x90),
-     o3(0xEC,0xA2,0x91), o3(0xEC,0xA2,0x92),
-     o3(0xEC,0xA2,0x93), o3(0xEC,0xA2,0x95),
-     o3(0xEC,0xA2,0x96), o3(0xEC,0xA2,0x97),
-     o3(0xEC,0xA2,0x98), o3(0xEC,0xA2,0x99),
-     o3(0xEC,0xA2,0x9A), o3(0xEC,0xA2,0x9B),
-     o3(0xEC,0xA2,0x9C), o3(0xEC,0xA2,0x9E),
-     o3(0xEC,0xA2,0xA0), o3(0xEC,0xA2,0xA2),
-     o3(0xEC,0xA2,0xA3), o3(0xEC,0xA2,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A0 = {
-    from_CP949_81_offsets,
-    from_CP949_A0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_A1_infos[179] = {
-     o3(0xEC,0xA2,0xA5), o3(0xEC,0xA2,0xA6),
-     o3(0xEC,0xA2,0xA7), o3(0xEC,0xA2,0xA9),
-     o3(0xEC,0xA2,0xAA), o3(0xEC,0xA2,0xAB),
-     o3(0xEC,0xA2,0xAC), o3(0xEC,0xA2,0xAD),
-     o3(0xEC,0xA2,0xAE), o3(0xEC,0xA2,0xAF),
-     o3(0xEC,0xA2,0xB0), o3(0xEC,0xA2,0xB1),
-     o3(0xEC,0xA2,0xB2), o3(0xEC,0xA2,0xB3),
-     o3(0xEC,0xA2,0xB4), o3(0xEC,0xA2,0xB5),
-     o3(0xEC,0xA2,0xB6), o3(0xEC,0xA2,0xB7),
-     o3(0xEC,0xA2,0xB8), o3(0xEC,0xA2,0xB9),
-     o3(0xEC,0xA2,0xBA), o3(0xEC,0xA2,0xBB),
-     o3(0xEC,0xA2,0xBE), o3(0xEC,0xA2,0xBF),
-     o3(0xEC,0xA3,0x80), o3(0xEC,0xA3,0x81),
-     o3(0xEC,0xA3,0x82), o3(0xEC,0xA3,0x83),
-     o3(0xEC,0xA3,0x85), o3(0xEC,0xA3,0x86),
-     o3(0xEC,0xA3,0x87), o3(0xEC,0xA3,0x89),
-     o3(0xEC,0xA3,0x8A), o3(0xEC,0xA3,0x8B),
-     o3(0xEC,0xA3,0x8D), o3(0xEC,0xA3,0x8E),
-     o3(0xEC,0xA3,0x8F), o3(0xEC,0xA3,0x90),
-     o3(0xEC,0xA3,0x91), o3(0xEC,0xA3,0x92),
-     o3(0xEC,0xA3,0x93), o3(0xEC,0xA3,0x96),
-     o3(0xEC,0xA3,0x98), o3(0xEC,0xA3,0x9A),
-     o3(0xEC,0xA3,0x9B), o3(0xEC,0xA3,0x9C),
-     o3(0xEC,0xA3,0x9D), o3(0xEC,0xA3,0x9E),
-     o3(0xEC,0xA3,0x9F), o3(0xEC,0xA3,0xA2),
-     o3(0xEC,0xA3,0xA3), o3(0xEC,0xA3,0xA5),
-     o3(0xEC,0xA3,0xA6), o3(0xEC,0xA3,0xA7),
-     o3(0xEC,0xA3,0xA8), o3(0xEC,0xA3,0xA9),
-     o3(0xEC,0xA3,0xAA), o3(0xEC,0xA3,0xAB),
-     o3(0xEC,0xA3,0xAC), o3(0xEC,0xA3,0xAD),
-     o3(0xEC,0xA3,0xAE), o3(0xEC,0xA3,0xAF),
-     o3(0xEC,0xA3,0xB0), o3(0xEC,0xA3,0xB1),
-     o3(0xEC,0xA3,0xB2), o3(0xEC,0xA3,0xB3),
-     o3(0xEC,0xA3,0xB4), o3(0xEC,0xA3,0xB6),
-     o3(0xEC,0xA3,0xB7), o3(0xEC,0xA3,0xB8),
-     o3(0xEC,0xA3,0xB9), o3(0xEC,0xA3,0xBA),
-     o3(0xEC,0xA3,0xBB), o3(0xEC,0xA3,0xBE),
-     o3(0xEC,0xA3,0xBF), o3(0xEC,0xA4,0x81),
-     o3(0xEC,0xA4,0x82), o3(0xEC,0xA4,0x83),
-     o3(0xEC,0xA4,0x87), o3(0xEC,0xA4,0x88),
-     o3(0xEC,0xA4,0x89), o3(0xEC,0xA4,0x8A),
-     o3(0xEC,0xA4,0x8B), o3(0xEC,0xA4,0x8E),
-     o3(0xE3,0x80,0x80), o3(0xE3,0x80,0x81),
-     o3(0xE3,0x80,0x82),      o2(0xC2,0xB7),
-     o3(0xE2,0x80,0xA5), o3(0xE2,0x80,0xA6),
-          o2(0xC2,0xA8), o3(0xE3,0x80,0x83),
-          o2(0xC2,0xAD), o3(0xE2,0x80,0x95),
-     o3(0xE2,0x88,0xA5), o3(0xEF,0xBC,0xBC),
-     o3(0xE2,0x88,0xBC), o3(0xE2,0x80,0x98),
-     o3(0xE2,0x80,0x99), o3(0xE2,0x80,0x9C),
-     o3(0xE2,0x80,0x9D), o3(0xE3,0x80,0x94),
-     o3(0xE3,0x80,0x95), o3(0xE3,0x80,0x88),
-     o3(0xE3,0x80,0x89), o3(0xE3,0x80,0x8A),
-     o3(0xE3,0x80,0x8B), o3(0xE3,0x80,0x8C),
-     o3(0xE3,0x80,0x8D), o3(0xE3,0x80,0x8E),
-     o3(0xE3,0x80,0x8F), o3(0xE3,0x80,0x90),
-     o3(0xE3,0x80,0x91),      o2(0xC2,0xB1),
-          o2(0xC3,0x97),      o2(0xC3,0xB7),
-     o3(0xE2,0x89,0xA0), o3(0xE2,0x89,0xA4),
-     o3(0xE2,0x89,0xA5), o3(0xE2,0x88,0x9E),
-     o3(0xE2,0x88,0xB4),      o2(0xC2,0xB0),
-     o3(0xE2,0x80,0xB2), o3(0xE2,0x80,0xB3),
-     o3(0xE2,0x84,0x83), o3(0xE2,0x84,0xAB),
-     o3(0xEF,0xBF,0xA0), o3(0xEF,0xBF,0xA1),
-     o3(0xEF,0xBF,0xA5), o3(0xE2,0x99,0x82),
-     o3(0xE2,0x99,0x80), o3(0xE2,0x88,0xA0),
-     o3(0xE2,0x8A,0xA5), o3(0xE2,0x8C,0x92),
-     o3(0xE2,0x88,0x82), o3(0xE2,0x88,0x87),
-     o3(0xE2,0x89,0xA1), o3(0xE2,0x89,0x92),
-          o2(0xC2,0xA7), o3(0xE2,0x80,0xBB),
-     o3(0xE2,0x98,0x86), o3(0xE2,0x98,0x85),
-     o3(0xE2,0x97,0x8B), o3(0xE2,0x97,0x8F),
-     o3(0xE2,0x97,0x8E), o3(0xE2,0x97,0x87),
-     o3(0xE2,0x97,0x86), o3(0xE2,0x96,0xA1),
-     o3(0xE2,0x96,0xA0), o3(0xE2,0x96,0xB3),
-     o3(0xE2,0x96,0xB2), o3(0xE2,0x96,0xBD),
-     o3(0xE2,0x96,0xBC), o3(0xE2,0x86,0x92),
-     o3(0xE2,0x86,0x90), o3(0xE2,0x86,0x91),
-     o3(0xE2,0x86,0x93), o3(0xE2,0x86,0x94),
-     o3(0xE3,0x80,0x93), o3(0xE2,0x89,0xAA),
-     o3(0xE2,0x89,0xAB), o3(0xE2,0x88,0x9A),
-     o3(0xE2,0x88,0xBD), o3(0xE2,0x88,0x9D),
-     o3(0xE2,0x88,0xB5), o3(0xE2,0x88,0xAB),
-     o3(0xE2,0x88,0xAC), o3(0xE2,0x88,0x88),
-     o3(0xE2,0x88,0x8B), o3(0xE2,0x8A,0x86),
-     o3(0xE2,0x8A,0x87), o3(0xE2,0x8A,0x82),
-     o3(0xE2,0x8A,0x83), o3(0xE2,0x88,0xAA),
-     o3(0xE2,0x88,0xA9), o3(0xE2,0x88,0xA7),
-     o3(0xE2,0x88,0xA8), o3(0xEF,0xBF,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A1 = {
-    from_CP949_81_offsets,
-    from_CP949_A1_infos
-};
-
-static const unsigned char
-from_CP949_A2_offsets[256] = {
-    155,155,155,155,155,155,155,155,    155,155,155,155,155,155,155,155,
-    155,155,155,155,155,155,155,155,    155,155,155,155,155,155,155,155,
-    155,155,155,155,155,155,155,155,    155,155,155,155,155,155,155,155,
-    155,155,155,155,155,155,155,155,    155,155,155,155,155,155,155,155,
-    155,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,155,155,155,155,155,
-    155, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,155,155,155,155,155,
-    155, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,153,154,    155,155,155,155,155,155,155,155,
-    155,155,155,155,155,155,155,155,    155,155,155,155,155,155,155,155,
-};
-
-static const struct byte_lookup* const
-from_CP949_A2_infos[156] = {
-     o3(0xEC,0xA4,0x90), o3(0xEC,0xA4,0x92),
-     o3(0xEC,0xA4,0x93), o3(0xEC,0xA4,0x94),
-     o3(0xEC,0xA4,0x95), o3(0xEC,0xA4,0x96),
-     o3(0xEC,0xA4,0x97), o3(0xEC,0xA4,0x99),
-     o3(0xEC,0xA4,0x9A), o3(0xEC,0xA4,0x9B),
-     o3(0xEC,0xA4,0x9C), o3(0xEC,0xA4,0x9D),
-     o3(0xEC,0xA4,0x9E), o3(0xEC,0xA4,0x9F),
-     o3(0xEC,0xA4,0xA0), o3(0xEC,0xA4,0xA1),
-     o3(0xEC,0xA4,0xA2), o3(0xEC,0xA4,0xA3),
-     o3(0xEC,0xA4,0xA4), o3(0xEC,0xA4,0xA5),
-     o3(0xEC,0xA4,0xA6), o3(0xEC,0xA4,0xA7),
-     o3(0xEC,0xA4,0xA8), o3(0xEC,0xA4,0xA9),
-     o3(0xEC,0xA4,0xAA), o3(0xEC,0xA4,0xAB),
-     o3(0xEC,0xA4,0xAD), o3(0xEC,0xA4,0xAE),
-     o3(0xEC,0xA4,0xAF), o3(0xEC,0xA4,0xB0),
-     o3(0xEC,0xA4,0xB1), o3(0xEC,0xA4,0xB2),
-     o3(0xEC,0xA4,0xB3), o3(0xEC,0xA4,0xB5),
-     o3(0xEC,0xA4,0xB6), o3(0xEC,0xA4,0xB7),
-     o3(0xEC,0xA4,0xB8), o3(0xEC,0xA4,0xB9),
-     o3(0xEC,0xA4,0xBA), o3(0xEC,0xA4,0xBB),
-     o3(0xEC,0xA4,0xBC), o3(0xEC,0xA4,0xBD),
-     o3(0xEC,0xA4,0xBE), o3(0xEC,0xA4,0xBF),
-     o3(0xEC,0xA5,0x80), o3(0xEC,0xA5,0x81),
-     o3(0xEC,0xA5,0x82), o3(0xEC,0xA5,0x83),
-     o3(0xEC,0xA5,0x84), o3(0xEC,0xA5,0x85),
-     o3(0xEC,0xA5,0x86), o3(0xEC,0xA5,0x87),
-     o3(0xEC,0xA5,0x88), o3(0xEC,0xA5,0x89),
-     o3(0xEC,0xA5,0x8A), o3(0xEC,0xA5,0x8B),
-     o3(0xEC,0xA5,0x8C), o3(0xEC,0xA5,0x8D),
-     o3(0xEC,0xA5,0x8E), o3(0xEC,0xA5,0x8F),
-     o3(0xEC,0xA5,0x92), o3(0xEC,0xA5,0x93),
-     o3(0xEC,0xA5,0x95), o3(0xEC,0xA5,0x96),
-     o3(0xEC,0xA5,0x97), o3(0xEC,0xA5,0x99),
-     o3(0xEC,0xA5,0x9A), o3(0xEC,0xA5,0x9B),
-     o3(0xEC,0xA5,0x9C), o3(0xEC,0xA5,0x9D),
-     o3(0xEC,0xA5,0x9E), o3(0xEC,0xA5,0x9F),
-     o3(0xEC,0xA5,0xA2), o3(0xEC,0xA5,0xA4),
-     o3(0xEC,0xA5,0xA5), o3(0xEC,0xA5,0xA6),
-     o3(0xEC,0xA5,0xA7), o3(0xEC,0xA5,0xA8),
-     o3(0xEC,0xA5,0xA9), o3(0xEC,0xA5,0xAA),
-     o3(0xEC,0xA5,0xAB), o3(0xEC,0xA5,0xAD),
-     o3(0xEC,0xA5,0xAE), o3(0xEC,0xA5,0xAF),
-     o3(0xE2,0x87,0x92), o3(0xE2,0x87,0x94),
-     o3(0xE2,0x88,0x80), o3(0xE2,0x88,0x83),
-          o2(0xC2,0xB4), o3(0xEF,0xBD,0x9E),
-          o2(0xCB,0x87),      o2(0xCB,0x98),
-          o2(0xCB,0x9D),      o2(0xCB,0x9A),
-          o2(0xCB,0x99),      o2(0xC2,0xB8),
-          o2(0xCB,0x9B),      o2(0xC2,0xA1),
-          o2(0xC2,0xBF),      o2(0xCB,0x90),
-     o3(0xE2,0x88,0xAE), o3(0xE2,0x88,0x91),
-     o3(0xE2,0x88,0x8F),      o2(0xC2,0xA4),
-     o3(0xE2,0x84,0x89), o3(0xE2,0x80,0xB0),
-     o3(0xE2,0x97,0x81), o3(0xE2,0x97,0x80),
-     o3(0xE2,0x96,0xB7), o3(0xE2,0x96,0xB6),
-     o3(0xE2,0x99,0xA4), o3(0xE2,0x99,0xA0),
-     o3(0xE2,0x99,0xA1), o3(0xE2,0x99,0xA5),
-     o3(0xE2,0x99,0xA7), o3(0xE2,0x99,0xA3),
-     o3(0xE2,0x8A,0x99), o3(0xE2,0x97,0x88),
-     o3(0xE2,0x96,0xA3), o3(0xE2,0x97,0x90),
-     o3(0xE2,0x97,0x91), o3(0xE2,0x96,0x92),
-     o3(0xE2,0x96,0xA4), o3(0xE2,0x96,0xA5),
-     o3(0xE2,0x96,0xA8), o3(0xE2,0x96,0xA7),
-     o3(0xE2,0x96,0xA6), o3(0xE2,0x96,0xA9),
-     o3(0xE2,0x99,0xA8), o3(0xE2,0x98,0x8F),
-     o3(0xE2,0x98,0x8E), o3(0xE2,0x98,0x9C),
-     o3(0xE2,0x98,0x9E),      o2(0xC2,0xB6),
-     o3(0xE2,0x80,0xA0), o3(0xE2,0x80,0xA1),
-     o3(0xE2,0x86,0x95), o3(0xE2,0x86,0x97),
-     o3(0xE2,0x86,0x99), o3(0xE2,0x86,0x96),
-     o3(0xE2,0x86,0x98), o3(0xE2,0x99,0xAD),
-     o3(0xE2,0x99,0xA9), o3(0xE2,0x99,0xAA),
-     o3(0xE2,0x99,0xAC), o3(0xE3,0x89,0xBF),
-     o3(0xE3,0x88,0x9C), o3(0xE2,0x84,0x96),
-     o3(0xE3,0x8F,0x87), o3(0xE2,0x84,0xA2),
-     o3(0xE3,0x8F,0x82), o3(0xE3,0x8F,0x98),
-     o3(0xE2,0x84,0xA1), o3(0xE2,0x82,0xAC),
-          o2(0xC2,0xAE),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A2 = {
-    from_CP949_A2_offsets,
-    from_CP949_A2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_A3_infos[179] = {
-     o3(0xEC,0xA5,0xB1), o3(0xEC,0xA5,0xB2),
-     o3(0xEC,0xA5,0xB3), o3(0xEC,0xA5,0xB5),
-     o3(0xEC,0xA5,0xB6), o3(0xEC,0xA5,0xB7),
-     o3(0xEC,0xA5,0xB8), o3(0xEC,0xA5,0xB9),
-     o3(0xEC,0xA5,0xBA), o3(0xEC,0xA5,0xBB),
-     o3(0xEC,0xA5,0xBD), o3(0xEC,0xA5,0xBE),
-     o3(0xEC,0xA5,0xBF), o3(0xEC,0xA6,0x80),
-     o3(0xEC,0xA6,0x81), o3(0xEC,0xA6,0x82),
-     o3(0xEC,0xA6,0x83), o3(0xEC,0xA6,0x84),
-     o3(0xEC,0xA6,0x85), o3(0xEC,0xA6,0x86),
-     o3(0xEC,0xA6,0x87), o3(0xEC,0xA6,0x8A),
-     o3(0xEC,0xA6,0x8B), o3(0xEC,0xA6,0x8D),
-     o3(0xEC,0xA6,0x8E), o3(0xEC,0xA6,0x8F),
-     o3(0xEC,0xA6,0x91), o3(0xEC,0xA6,0x92),
-     o3(0xEC,0xA6,0x93), o3(0xEC,0xA6,0x94),
-     o3(0xEC,0xA6,0x95), o3(0xEC,0xA6,0x96),
-     o3(0xEC,0xA6,0x97), o3(0xEC,0xA6,0x9A),
-     o3(0xEC,0xA6,0x9C), o3(0xEC,0xA6,0x9E),
-     o3(0xEC,0xA6,0x9F), o3(0xEC,0xA6,0xA0),
-     o3(0xEC,0xA6,0xA1), o3(0xEC,0xA6,0xA2),
-     o3(0xEC,0xA6,0xA3), o3(0xEC,0xA6,0xA4),
-     o3(0xEC,0xA6,0xA5), o3(0xEC,0xA6,0xA6),
-     o3(0xEC,0xA6,0xA7), o3(0xEC,0xA6,0xA8),
-     o3(0xEC,0xA6,0xA9), o3(0xEC,0xA6,0xAA),
-     o3(0xEC,0xA6,0xAB), o3(0xEC,0xA6,0xAC),
-     o3(0xEC,0xA6,0xAD), o3(0xEC,0xA6,0xAE),
-     o3(0xEC,0xA6,0xAF), o3(0xEC,0xA6,0xB0),
-     o3(0xEC,0xA6,0xB1), o3(0xEC,0xA6,0xB2),
-     o3(0xEC,0xA6,0xB3), o3(0xEC,0xA6,0xB4),
-     o3(0xEC,0xA6,0xB5), o3(0xEC,0xA6,0xB6),
-     o3(0xEC,0xA6,0xB7), o3(0xEC,0xA6,0xB8),
-     o3(0xEC,0xA6,0xB9), o3(0xEC,0xA6,0xBA),
-     o3(0xEC,0xA6,0xBB), o3(0xEC,0xA6,0xBC),
-     o3(0xEC,0xA6,0xBD), o3(0xEC,0xA6,0xBE),
-     o3(0xEC,0xA6,0xBF), o3(0xEC,0xA7,0x82),
-     o3(0xEC,0xA7,0x83), o3(0xEC,0xA7,0x85),
-     o3(0xEC,0xA7,0x86), o3(0xEC,0xA7,0x89),
-     o3(0xEC,0xA7,0x8B), o3(0xEC,0xA7,0x8C),
-     o3(0xEC,0xA7,0x8D), o3(0xEC,0xA7,0x8E),
-     o3(0xEC,0xA7,0x8F), o3(0xEC,0xA7,0x92),
-     o3(0xEC,0xA7,0x94), o3(0xEC,0xA7,0x97),
-     o3(0xEC,0xA7,0x98), o3(0xEC,0xA7,0x9B),
-     o3(0xEF,0xBC,0x81), o3(0xEF,0xBC,0x82),
-     o3(0xEF,0xBC,0x83), o3(0xEF,0xBC,0x84),
-     o3(0xEF,0xBC,0x85), o3(0xEF,0xBC,0x86),
-     o3(0xEF,0xBC,0x87), o3(0xEF,0xBC,0x88),
-     o3(0xEF,0xBC,0x89), o3(0xEF,0xBC,0x8A),
-     o3(0xEF,0xBC,0x8B), o3(0xEF,0xBC,0x8C),
-     o3(0xEF,0xBC,0x8D), o3(0xEF,0xBC,0x8E),
-     o3(0xEF,0xBC,0x8F), o3(0xEF,0xBC,0x90),
-     o3(0xEF,0xBC,0x91), o3(0xEF,0xBC,0x92),
-     o3(0xEF,0xBC,0x93), o3(0xEF,0xBC,0x94),
-     o3(0xEF,0xBC,0x95), o3(0xEF,0xBC,0x96),
-     o3(0xEF,0xBC,0x97), o3(0xEF,0xBC,0x98),
-     o3(0xEF,0xBC,0x99), o3(0xEF,0xBC,0x9A),
-     o3(0xEF,0xBC,0x9B), o3(0xEF,0xBC,0x9C),
-     o3(0xEF,0xBC,0x9D), o3(0xEF,0xBC,0x9E),
-     o3(0xEF,0xBC,0x9F), o3(0xEF,0xBC,0xA0),
-     o3(0xEF,0xBC,0xA1), o3(0xEF,0xBC,0xA2),
-     o3(0xEF,0xBC,0xA3), o3(0xEF,0xBC,0xA4),
-     o3(0xEF,0xBC,0xA5), o3(0xEF,0xBC,0xA6),
-     o3(0xEF,0xBC,0xA7), o3(0xEF,0xBC,0xA8),
-     o3(0xEF,0xBC,0xA9), o3(0xEF,0xBC,0xAA),
-     o3(0xEF,0xBC,0xAB), o3(0xEF,0xBC,0xAC),
-     o3(0xEF,0xBC,0xAD), o3(0xEF,0xBC,0xAE),
-     o3(0xEF,0xBC,0xAF), o3(0xEF,0xBC,0xB0),
-     o3(0xEF,0xBC,0xB1), o3(0xEF,0xBC,0xB2),
-     o3(0xEF,0xBC,0xB3), o3(0xEF,0xBC,0xB4),
-     o3(0xEF,0xBC,0xB5), o3(0xEF,0xBC,0xB6),
-     o3(0xEF,0xBC,0xB7), o3(0xEF,0xBC,0xB8),
-     o3(0xEF,0xBC,0xB9), o3(0xEF,0xBC,0xBA),
-     o3(0xEF,0xBC,0xBB), o3(0xEF,0xBF,0xA6),
-     o3(0xEF,0xBC,0xBD), o3(0xEF,0xBC,0xBE),
-     o3(0xEF,0xBC,0xBF), o3(0xEF,0xBD,0x80),
-     o3(0xEF,0xBD,0x81), o3(0xEF,0xBD,0x82),
-     o3(0xEF,0xBD,0x83), o3(0xEF,0xBD,0x84),
-     o3(0xEF,0xBD,0x85), o3(0xEF,0xBD,0x86),
-     o3(0xEF,0xBD,0x87), o3(0xEF,0xBD,0x88),
-     o3(0xEF,0xBD,0x89), o3(0xEF,0xBD,0x8A),
-     o3(0xEF,0xBD,0x8B), o3(0xEF,0xBD,0x8C),
-     o3(0xEF,0xBD,0x8D), o3(0xEF,0xBD,0x8E),
-     o3(0xEF,0xBD,0x8F), o3(0xEF,0xBD,0x90),
-     o3(0xEF,0xBD,0x91), o3(0xEF,0xBD,0x92),
-     o3(0xEF,0xBD,0x93), o3(0xEF,0xBD,0x94),
-     o3(0xEF,0xBD,0x95), o3(0xEF,0xBD,0x96),
-     o3(0xEF,0xBD,0x97), o3(0xEF,0xBD,0x98),
-     o3(0xEF,0xBD,0x99), o3(0xEF,0xBD,0x9A),
-     o3(0xEF,0xBD,0x9B), o3(0xEF,0xBD,0x9C),
-     o3(0xEF,0xBD,0x9D), o3(0xEF,0xBF,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A3 = {
-    from_CP949_81_offsets,
-    from_CP949_A3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_A4_infos[179] = {
-     o3(0xEC,0xA7,0x9E), o3(0xEC,0xA7,0x9F),
-     o3(0xEC,0xA7,0xA1), o3(0xEC,0xA7,0xA3),
-     o3(0xEC,0xA7,0xA5), o3(0xEC,0xA7,0xA6),
-     o3(0xEC,0xA7,0xA8), o3(0xEC,0xA7,0xA9),
-     o3(0xEC,0xA7,0xAA), o3(0xEC,0xA7,0xAB),
-     o3(0xEC,0xA7,0xAE), o3(0xEC,0xA7,0xB2),
-     o3(0xEC,0xA7,0xB3), o3(0xEC,0xA7,0xB4),
-     o3(0xEC,0xA7,0xB5), o3(0xEC,0xA7,0xB6),
-     o3(0xEC,0xA7,0xB7), o3(0xEC,0xA7,0xBA),
-     o3(0xEC,0xA7,0xBB), o3(0xEC,0xA7,0xBD),
-     o3(0xEC,0xA7,0xBE), o3(0xEC,0xA7,0xBF),
-     o3(0xEC,0xA8,0x81), o3(0xEC,0xA8,0x82),
-     o3(0xEC,0xA8,0x83), o3(0xEC,0xA8,0x84),
-     o3(0xEC,0xA8,0x85), o3(0xEC,0xA8,0x86),
-     o3(0xEC,0xA8,0x87), o3(0xEC,0xA8,0x8A),
-     o3(0xEC,0xA8,0x8E), o3(0xEC,0xA8,0x8F),
-     o3(0xEC,0xA8,0x90), o3(0xEC,0xA8,0x91),
-     o3(0xEC,0xA8,0x92), o3(0xEC,0xA8,0x93),
-     o3(0xEC,0xA8,0x95), o3(0xEC,0xA8,0x96),
-     o3(0xEC,0xA8,0x97), o3(0xEC,0xA8,0x99),
-     o3(0xEC,0xA8,0x9A), o3(0xEC,0xA8,0x9B),
-     o3(0xEC,0xA8,0x9C), o3(0xEC,0xA8,0x9D),
-     o3(0xEC,0xA8,0x9E), o3(0xEC,0xA8,0x9F),
-     o3(0xEC,0xA8,0xA0), o3(0xEC,0xA8,0xA1),
-     o3(0xEC,0xA8,0xA2), o3(0xEC,0xA8,0xA3),
-     o3(0xEC,0xA8,0xA4), o3(0xEC,0xA8,0xA5),
-     o3(0xEC,0xA8,0xA6), o3(0xEC,0xA8,0xA7),
-     o3(0xEC,0xA8,0xA8), o3(0xEC,0xA8,0xAA),
-     o3(0xEC,0xA8,0xAB), o3(0xEC,0xA8,0xAC),
-     o3(0xEC,0xA8,0xAD), o3(0xEC,0xA8,0xAE),
-     o3(0xEC,0xA8,0xAF), o3(0xEC,0xA8,0xB0),
-     o3(0xEC,0xA8,0xB1), o3(0xEC,0xA8,0xB2),
-     o3(0xEC,0xA8,0xB3), o3(0xEC,0xA8,0xB4),
-     o3(0xEC,0xA8,0xB5), o3(0xEC,0xA8,0xB6),
-     o3(0xEC,0xA8,0xB7), o3(0xEC,0xA8,0xB8),
-     o3(0xEC,0xA8,0xB9), o3(0xEC,0xA8,0xBA),
-     o3(0xEC,0xA8,0xBB), o3(0xEC,0xA8,0xBC),
-     o3(0xEC,0xA8,0xBD), o3(0xEC,0xA8,0xBE),
-     o3(0xEC,0xA8,0xBF), o3(0xEC,0xA9,0x80),
-     o3(0xEC,0xA9,0x81), o3(0xEC,0xA9,0x82),
-     o3(0xEC,0xA9,0x83), o3(0xEC,0xA9,0x84),
-     o3(0xEC,0xA9,0x85), o3(0xEC,0xA9,0x86),
-     o3(0xE3,0x84,0xB1), o3(0xE3,0x84,0xB2),
-     o3(0xE3,0x84,0xB3), o3(0xE3,0x84,0xB4),
-     o3(0xE3,0x84,0xB5), o3(0xE3,0x84,0xB6),
-     o3(0xE3,0x84,0xB7), o3(0xE3,0x84,0xB8),
-     o3(0xE3,0x84,0xB9), o3(0xE3,0x84,0xBA),
-     o3(0xE3,0x84,0xBB), o3(0xE3,0x84,0xBC),
-     o3(0xE3,0x84,0xBD), o3(0xE3,0x84,0xBE),
-     o3(0xE3,0x84,0xBF), o3(0xE3,0x85,0x80),
-     o3(0xE3,0x85,0x81), o3(0xE3,0x85,0x82),
-     o3(0xE3,0x85,0x83), o3(0xE3,0x85,0x84),
-     o3(0xE3,0x85,0x85), o3(0xE3,0x85,0x86),
-     o3(0xE3,0x85,0x87), o3(0xE3,0x85,0x88),
-     o3(0xE3,0x85,0x89), o3(0xE3,0x85,0x8A),
-     o3(0xE3,0x85,0x8B), o3(0xE3,0x85,0x8C),
-     o3(0xE3,0x85,0x8D), o3(0xE3,0x85,0x8E),
-     o3(0xE3,0x85,0x8F), o3(0xE3,0x85,0x90),
-     o3(0xE3,0x85,0x91), o3(0xE3,0x85,0x92),
-     o3(0xE3,0x85,0x93), o3(0xE3,0x85,0x94),
-     o3(0xE3,0x85,0x95), o3(0xE3,0x85,0x96),
-     o3(0xE3,0x85,0x97), o3(0xE3,0x85,0x98),
-     o3(0xE3,0x85,0x99), o3(0xE3,0x85,0x9A),
-     o3(0xE3,0x85,0x9B), o3(0xE3,0x85,0x9C),
-     o3(0xE3,0x85,0x9D), o3(0xE3,0x85,0x9E),
-     o3(0xE3,0x85,0x9F), o3(0xE3,0x85,0xA0),
-     o3(0xE3,0x85,0xA1), o3(0xE3,0x85,0xA2),
-     o3(0xE3,0x85,0xA3), o3(0xE3,0x85,0xA4),
-     o3(0xE3,0x85,0xA5), o3(0xE3,0x85,0xA6),
-     o3(0xE3,0x85,0xA7), o3(0xE3,0x85,0xA8),
-     o3(0xE3,0x85,0xA9), o3(0xE3,0x85,0xAA),
-     o3(0xE3,0x85,0xAB), o3(0xE3,0x85,0xAC),
-     o3(0xE3,0x85,0xAD), o3(0xE3,0x85,0xAE),
-     o3(0xE3,0x85,0xAF), o3(0xE3,0x85,0xB0),
-     o3(0xE3,0x85,0xB1), o3(0xE3,0x85,0xB2),
-     o3(0xE3,0x85,0xB3), o3(0xE3,0x85,0xB4),
-     o3(0xE3,0x85,0xB5), o3(0xE3,0x85,0xB6),
-     o3(0xE3,0x85,0xB7), o3(0xE3,0x85,0xB8),
-     o3(0xE3,0x85,0xB9), o3(0xE3,0x85,0xBA),
-     o3(0xE3,0x85,0xBB), o3(0xE3,0x85,0xBC),
-     o3(0xE3,0x85,0xBD), o3(0xE3,0x85,0xBE),
-     o3(0xE3,0x85,0xBF), o3(0xE3,0x86,0x80),
-     o3(0xE3,0x86,0x81), o3(0xE3,0x86,0x82),
-     o3(0xE3,0x86,0x83), o3(0xE3,0x86,0x84),
-     o3(0xE3,0x86,0x85), o3(0xE3,0x86,0x86),
-     o3(0xE3,0x86,0x87), o3(0xE3,0x86,0x88),
-     o3(0xE3,0x86,0x89), o3(0xE3,0x86,0x8A),
-     o3(0xE3,0x86,0x8B), o3(0xE3,0x86,0x8C),
-     o3(0xE3,0x86,0x8D), o3(0xE3,0x86,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A4 = {
-    from_CP949_81_offsets,
-    from_CP949_A4_infos
-};
-
-static const unsigned char
-from_CP949_A5_offsets[256] = {
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,152,152,152,152,152,
-    152, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,152,152,152,152,152,
-    152, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93,152,152,152,152,152,
-     94, 95, 96, 97, 98, 99,100,101,    102,103,152,152,152,152,152,152,
-    152,104,105,106,107,108,109,110,    111,112,113,114,115,116,117,118,
-    119,120,121,122,123,124,125,126,    127,152,152,152,152,152,152,152,
-    152,128,129,130,131,132,133,134,    135,136,137,138,139,140,141,142,
-    143,144,145,146,147,148,149,150,    151,152,152,152,152,152,152,152,
-};
-
-static const struct byte_lookup* const
-from_CP949_A5_infos[153] = {
-     o3(0xEC,0xA9,0x87), o3(0xEC,0xA9,0x88),
-     o3(0xEC,0xA9,0x89), o3(0xEC,0xA9,0x8A),
-     o3(0xEC,0xA9,0x8B), o3(0xEC,0xA9,0x8E),
-     o3(0xEC,0xA9,0x8F), o3(0xEC,0xA9,0x91),
-     o3(0xEC,0xA9,0x92), o3(0xEC,0xA9,0x93),
-     o3(0xEC,0xA9,0x95), o3(0xEC,0xA9,0x96),
-     o3(0xEC,0xA9,0x97), o3(0xEC,0xA9,0x98),
-     o3(0xEC,0xA9,0x99), o3(0xEC,0xA9,0x9A),
-     o3(0xEC,0xA9,0x9B), o3(0xEC,0xA9,0x9E),
-     o3(0xEC,0xA9,0xA2), o3(0xEC,0xA9,0xA3),
-     o3(0xEC,0xA9,0xA4), o3(0xEC,0xA9,0xA5),
-     o3(0xEC,0xA9,0xA6), o3(0xEC,0xA9,0xA7),
-     o3(0xEC,0xA9,0xA9), o3(0xEC,0xA9,0xAA),
-     o3(0xEC,0xA9,0xAB), o3(0xEC,0xA9,0xAC),
-     o3(0xEC,0xA9,0xAD), o3(0xEC,0xA9,0xAE),
-     o3(0xEC,0xA9,0xAF), o3(0xEC,0xA9,0xB0),
-     o3(0xEC,0xA9,0xB1), o3(0xEC,0xA9,0xB2),
-     o3(0xEC,0xA9,0xB3), o3(0xEC,0xA9,0xB4),
-     o3(0xEC,0xA9,0xB5), o3(0xEC,0xA9,0xB6),
-     o3(0xEC,0xA9,0xB7), o3(0xEC,0xA9,0xB8),
-     o3(0xEC,0xA9,0xB9), o3(0xEC,0xA9,0xBA),
-     o3(0xEC,0xA9,0xBB), o3(0xEC,0xA9,0xBC),
-     o3(0xEC,0xA9,0xBE), o3(0xEC,0xA9,0xBF),
-     o3(0xEC,0xAA,0x80), o3(0xEC,0xAA,0x81),
-     o3(0xEC,0xAA,0x82), o3(0xEC,0xAA,0x83),
-     o3(0xEC,0xAA,0x85), o3(0xEC,0xAA,0x86),
-     o3(0xEC,0xAA,0x87), o3(0xEC,0xAA,0x88),
-     o3(0xEC,0xAA,0x89), o3(0xEC,0xAA,0x8A),
-     o3(0xEC,0xAA,0x8B), o3(0xEC,0xAA,0x8C),
-     o3(0xEC,0xAA,0x8D), o3(0xEC,0xAA,0x8E),
-     o3(0xEC,0xAA,0x8F), o3(0xEC,0xAA,0x90),
-     o3(0xEC,0xAA,0x91), o3(0xEC,0xAA,0x92),
-     o3(0xEC,0xAA,0x93), o3(0xEC,0xAA,0x94),
-     o3(0xEC,0xAA,0x95), o3(0xEC,0xAA,0x96),
-     o3(0xEC,0xAA,0x97), o3(0xEC,0xAA,0x99),
-     o3(0xEC,0xAA,0x9A), o3(0xEC,0xAA,0x9B),
-     o3(0xEC,0xAA,0x9C), o3(0xEC,0xAA,0x9D),
-     o3(0xEC,0xAA,0x9E), o3(0xEC,0xAA,0x9F),
-     o3(0xEC,0xAA,0xA0), o3(0xEC,0xAA,0xA1),
-     o3(0xEC,0xAA,0xA2), o3(0xEC,0xAA,0xA3),
-     o3(0xEC,0xAA,0xA4), o3(0xEC,0xAA,0xA5),
-     o3(0xEC,0xAA,0xA6), o3(0xEC,0xAA,0xA7),
-     o3(0xE2,0x85,0xB0), o3(0xE2,0x85,0xB1),
-     o3(0xE2,0x85,0xB2), o3(0xE2,0x85,0xB3),
-     o3(0xE2,0x85,0xB4), o3(0xE2,0x85,0xB5),
-     o3(0xE2,0x85,0xB6), o3(0xE2,0x85,0xB7),
-     o3(0xE2,0x85,0xB8), o3(0xE2,0x85,0xB9),
-     o3(0xE2,0x85,0xA0), o3(0xE2,0x85,0xA1),
-     o3(0xE2,0x85,0xA2), o3(0xE2,0x85,0xA3),
-     o3(0xE2,0x85,0xA4), o3(0xE2,0x85,0xA5),
-     o3(0xE2,0x85,0xA6), o3(0xE2,0x85,0xA7),
-     o3(0xE2,0x85,0xA8), o3(0xE2,0x85,0xA9),
-          o2(0xCE,0x91),      o2(0xCE,0x92),
-          o2(0xCE,0x93),      o2(0xCE,0x94),
-          o2(0xCE,0x95),      o2(0xCE,0x96),
-          o2(0xCE,0x97),      o2(0xCE,0x98),
-          o2(0xCE,0x99),      o2(0xCE,0x9A),
-          o2(0xCE,0x9B),      o2(0xCE,0x9C),
-          o2(0xCE,0x9D),      o2(0xCE,0x9E),
-          o2(0xCE,0x9F),      o2(0xCE,0xA0),
-          o2(0xCE,0xA1),      o2(0xCE,0xA3),
-          o2(0xCE,0xA4),      o2(0xCE,0xA5),
-          o2(0xCE,0xA6),      o2(0xCE,0xA7),
-          o2(0xCE,0xA8),      o2(0xCE,0xA9),
-          o2(0xCE,0xB1),      o2(0xCE,0xB2),
-          o2(0xCE,0xB3),      o2(0xCE,0xB4),
-          o2(0xCE,0xB5),      o2(0xCE,0xB6),
-          o2(0xCE,0xB7),      o2(0xCE,0xB8),
-          o2(0xCE,0xB9),      o2(0xCE,0xBA),
-          o2(0xCE,0xBB),      o2(0xCE,0xBC),
-          o2(0xCE,0xBD),      o2(0xCE,0xBE),
-          o2(0xCE,0xBF),      o2(0xCF,0x80),
-          o2(0xCF,0x81),      o2(0xCF,0x83),
-          o2(0xCF,0x84),      o2(0xCF,0x85),
-          o2(0xCF,0x86),      o2(0xCF,0x87),
-          o2(0xCF,0x88),      o2(0xCF,0x89),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A5 = {
-    from_CP949_A5_offsets,
-    from_CP949_A5_infos
-};
-
-static const unsigned char
-from_CP949_A6_offsets[256] = {
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-    152,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,152,152,152,152,152,
-    152, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,152,152,152,152,152,
-    152, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,152,152,    152,152,152,152,152,152,152,152,
-    152,152,152,152,152,152,152,152,    152,152,152,152,152,152,152,152,
-};
-
-static const struct byte_lookup* const
-from_CP949_A6_infos[153] = {
-     o3(0xEC,0xAA,0xA8), o3(0xEC,0xAA,0xA9),
-     o3(0xEC,0xAA,0xAA), o3(0xEC,0xAA,0xAB),
-     o3(0xEC,0xAA,0xAC), o3(0xEC,0xAA,0xAD),
-     o3(0xEC,0xAA,0xAE), o3(0xEC,0xAA,0xAF),
-     o3(0xEC,0xAA,0xB0), o3(0xEC,0xAA,0xB1),
-     o3(0xEC,0xAA,0xB2), o3(0xEC,0xAA,0xB3),
-     o3(0xEC,0xAA,0xB4), o3(0xEC,0xAA,0xB5),
-     o3(0xEC,0xAA,0xB6), o3(0xEC,0xAA,0xB7),
-     o3(0xEC,0xAA,0xB8), o3(0xEC,0xAA,0xB9),
-     o3(0xEC,0xAA,0xBA), o3(0xEC,0xAA,0xBB),
-     o3(0xEC,0xAA,0xBE), o3(0xEC,0xAA,0xBF),
-     o3(0xEC,0xAB,0x81), o3(0xEC,0xAB,0x82),
-     o3(0xEC,0xAB,0x83), o3(0xEC,0xAB,0x85),
-     o3(0xEC,0xAB,0x86), o3(0xEC,0xAB,0x87),
-     o3(0xEC,0xAB,0x88), o3(0xEC,0xAB,0x89),
-     o3(0xEC,0xAB,0x8A), o3(0xEC,0xAB,0x8B),
-     o3(0xEC,0xAB,0x8E), o3(0xEC,0xAB,0x90),
-     o3(0xEC,0xAB,0x92), o3(0xEC,0xAB,0x94),
-     o3(0xEC,0xAB,0x95), o3(0xEC,0xAB,0x96),
-     o3(0xEC,0xAB,0x97), o3(0xEC,0xAB,0x9A),
-     o3(0xEC,0xAB,0x9B), o3(0xEC,0xAB,0x9C),
-     o3(0xEC,0xAB,0x9D), o3(0xEC,0xAB,0x9E),
-     o3(0xEC,0xAB,0x9F), o3(0xEC,0xAB,0xA1),
-     o3(0xEC,0xAB,0xA2), o3(0xEC,0xAB,0xA3),
-     o3(0xEC,0xAB,0xA4), o3(0xEC,0xAB,0xA5),
-     o3(0xEC,0xAB,0xA6), o3(0xEC,0xAB,0xA7),
-     o3(0xEC,0xAB,0xA8), o3(0xEC,0xAB,0xA9),
-     o3(0xEC,0xAB,0xAA), o3(0xEC,0xAB,0xAB),
-     o3(0xEC,0xAB,0xAD), o3(0xEC,0xAB,0xAE),
-     o3(0xEC,0xAB,0xAF), o3(0xEC,0xAB,0xB0),
-     o3(0xEC,0xAB,0xB1), o3(0xEC,0xAB,0xB2),
-     o3(0xEC,0xAB,0xB3), o3(0xEC,0xAB,0xB5),
-     o3(0xEC,0xAB,0xB6), o3(0xEC,0xAB,0xB7),
-     o3(0xEC,0xAB,0xB8), o3(0xEC,0xAB,0xB9),
-     o3(0xEC,0xAB,0xBA), o3(0xEC,0xAB,0xBB),
-     o3(0xEC,0xAB,0xBC), o3(0xEC,0xAB,0xBD),
-     o3(0xEC,0xAB,0xBE), o3(0xEC,0xAB,0xBF),
-     o3(0xEC,0xAC,0x80), o3(0xEC,0xAC,0x81),
-     o3(0xEC,0xAC,0x82), o3(0xEC,0xAC,0x83),
-     o3(0xEC,0xAC,0x84), o3(0xEC,0xAC,0x85),
-     o3(0xEC,0xAC,0x86), o3(0xEC,0xAC,0x87),
-     o3(0xEC,0xAC,0x89), o3(0xEC,0xAC,0x8A),
-     o3(0xE2,0x94,0x80), o3(0xE2,0x94,0x82),
-     o3(0xE2,0x94,0x8C), o3(0xE2,0x94,0x90),
-     o3(0xE2,0x94,0x98), o3(0xE2,0x94,0x94),
-     o3(0xE2,0x94,0x9C), o3(0xE2,0x94,0xAC),
-     o3(0xE2,0x94,0xA4), o3(0xE2,0x94,0xB4),
-     o3(0xE2,0x94,0xBC), o3(0xE2,0x94,0x81),
-     o3(0xE2,0x94,0x83), o3(0xE2,0x94,0x8F),
-     o3(0xE2,0x94,0x93), o3(0xE2,0x94,0x9B),
-     o3(0xE2,0x94,0x97), o3(0xE2,0x94,0xA3),
-     o3(0xE2,0x94,0xB3), o3(0xE2,0x94,0xAB),
-     o3(0xE2,0x94,0xBB), o3(0xE2,0x95,0x8B),
-     o3(0xE2,0x94,0xA0), o3(0xE2,0x94,0xAF),
-     o3(0xE2,0x94,0xA8), o3(0xE2,0x94,0xB7),
-     o3(0xE2,0x94,0xBF), o3(0xE2,0x94,0x9D),
-     o3(0xE2,0x94,0xB0), o3(0xE2,0x94,0xA5),
-     o3(0xE2,0x94,0xB8), o3(0xE2,0x95,0x82),
-     o3(0xE2,0x94,0x92), o3(0xE2,0x94,0x91),
-     o3(0xE2,0x94,0x9A), o3(0xE2,0x94,0x99),
-     o3(0xE2,0x94,0x96), o3(0xE2,0x94,0x95),
-     o3(0xE2,0x94,0x8E), o3(0xE2,0x94,0x8D),
-     o3(0xE2,0x94,0x9E), o3(0xE2,0x94,0x9F),
-     o3(0xE2,0x94,0xA1), o3(0xE2,0x94,0xA2),
-     o3(0xE2,0x94,0xA6), o3(0xE2,0x94,0xA7),
-     o3(0xE2,0x94,0xA9), o3(0xE2,0x94,0xAA),
-     o3(0xE2,0x94,0xAD), o3(0xE2,0x94,0xAE),
-     o3(0xE2,0x94,0xB1), o3(0xE2,0x94,0xB2),
-     o3(0xE2,0x94,0xB5), o3(0xE2,0x94,0xB6),
-     o3(0xE2,0x94,0xB9), o3(0xE2,0x94,0xBA),
-     o3(0xE2,0x94,0xBD), o3(0xE2,0x94,0xBE),
-     o3(0xE2,0x95,0x80), o3(0xE2,0x95,0x81),
-     o3(0xE2,0x95,0x83), o3(0xE2,0x95,0x84),
-     o3(0xE2,0x95,0x85), o3(0xE2,0x95,0x86),
-     o3(0xE2,0x95,0x87), o3(0xE2,0x95,0x88),
-     o3(0xE2,0x95,0x89), o3(0xE2,0x95,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A6 = {
-    from_CP949_A6_offsets,
-    from_CP949_A6_infos
-};
-
-static const unsigned char
-from_CP949_A7_offsets[256] = {
-    163,163,163,163,163,163,163,163,    163,163,163,163,163,163,163,163,
-    163,163,163,163,163,163,163,163,    163,163,163,163,163,163,163,163,
-    163,163,163,163,163,163,163,163,    163,163,163,163,163,163,163,163,
-    163,163,163,163,163,163,163,163,    163,163,163,163,163,163,163,163,
-    163,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,163,163,163,163,163,
-    163, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,163,163,163,163,163,
-    163, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,153,154,    155,156,157,158,159,160,161,162,
-    163,163,163,163,163,163,163,163,    163,163,163,163,163,163,163,163,
-};
-
-static const struct byte_lookup* const
-from_CP949_A7_infos[164] = {
-     o3(0xEC,0xAC,0x8B), o3(0xEC,0xAC,0x8C),
-     o3(0xEC,0xAC,0x8D), o3(0xEC,0xAC,0x8E),
-     o3(0xEC,0xAC,0x8F), o3(0xEC,0xAC,0x91),
-     o3(0xEC,0xAC,0x92), o3(0xEC,0xAC,0x93),
-     o3(0xEC,0xAC,0x95), o3(0xEC,0xAC,0x96),
-     o3(0xEC,0xAC,0x97), o3(0xEC,0xAC,0x99),
-     o3(0xEC,0xAC,0x9A), o3(0xEC,0xAC,0x9B),
-     o3(0xEC,0xAC,0x9C), o3(0xEC,0xAC,0x9D),
-     o3(0xEC,0xAC,0x9E), o3(0xEC,0xAC,0x9F),
-     o3(0xEC,0xAC,0xA2), o3(0xEC,0xAC,0xA3),
-     o3(0xEC,0xAC,0xA4), o3(0xEC,0xAC,0xA5),
-     o3(0xEC,0xAC,0xA6), o3(0xEC,0xAC,0xA7),
-     o3(0xEC,0xAC,0xA8), o3(0xEC,0xAC,0xA9),
-     o3(0xEC,0xAC,0xAA), o3(0xEC,0xAC,0xAB),
-     o3(0xEC,0xAC,0xAC), o3(0xEC,0xAC,0xAD),
-     o3(0xEC,0xAC,0xAE), o3(0xEC,0xAC,0xAF),
-     o3(0xEC,0xAC,0xB0), o3(0xEC,0xAC,0xB1),
-     o3(0xEC,0xAC,0xB2), o3(0xEC,0xAC,0xB3),
-     o3(0xEC,0xAC,0xB4), o3(0xEC,0xAC,0xB5),
-     o3(0xEC,0xAC,0xB6), o3(0xEC,0xAC,0xB7),
-     o3(0xEC,0xAC,0xB8), o3(0xEC,0xAC,0xB9),
-     o3(0xEC,0xAC,0xBA), o3(0xEC,0xAC,0xBB),
-     o3(0xEC,0xAC,0xBC), o3(0xEC,0xAC,0xBD),
-     o3(0xEC,0xAC,0xBE), o3(0xEC,0xAC,0xBF),
-     o3(0xEC,0xAD,0x80), o3(0xEC,0xAD,0x82),
-     o3(0xEC,0xAD,0x83), o3(0xEC,0xAD,0x84),
-     o3(0xEC,0xAD,0x85), o3(0xEC,0xAD,0x86),
-     o3(0xEC,0xAD,0x87), o3(0xEC,0xAD,0x8A),
-     o3(0xEC,0xAD,0x8B), o3(0xEC,0xAD,0x8D),
-     o3(0xEC,0xAD,0x8E), o3(0xEC,0xAD,0x8F),
-     o3(0xEC,0xAD,0x91), o3(0xEC,0xAD,0x92),
-     o3(0xEC,0xAD,0x93), o3(0xEC,0xAD,0x94),
-     o3(0xEC,0xAD,0x95), o3(0xEC,0xAD,0x96),
-     o3(0xEC,0xAD,0x97), o3(0xEC,0xAD,0x9A),
-     o3(0xEC,0xAD,0x9B), o3(0xEC,0xAD,0x9C),
-     o3(0xEC,0xAD,0x9E), o3(0xEC,0xAD,0x9F),
-     o3(0xEC,0xAD,0xA0), o3(0xEC,0xAD,0xA1),
-     o3(0xEC,0xAD,0xA2), o3(0xEC,0xAD,0xA3),
-     o3(0xEC,0xAD,0xA5), o3(0xEC,0xAD,0xA6),
-     o3(0xEC,0xAD,0xA7), o3(0xEC,0xAD,0xA8),
-     o3(0xEC,0xAD,0xA9), o3(0xEC,0xAD,0xAA),
-     o3(0xEC,0xAD,0xAB), o3(0xEC,0xAD,0xAC),
-     o3(0xE3,0x8E,0x95), o3(0xE3,0x8E,0x96),
-     o3(0xE3,0x8E,0x97), o3(0xE2,0x84,0x93),
-     o3(0xE3,0x8E,0x98), o3(0xE3,0x8F,0x84),
-     o3(0xE3,0x8E,0xA3), o3(0xE3,0x8E,0xA4),
-     o3(0xE3,0x8E,0xA5), o3(0xE3,0x8E,0xA6),
-     o3(0xE3,0x8E,0x99), o3(0xE3,0x8E,0x9A),
-     o3(0xE3,0x8E,0x9B), o3(0xE3,0x8E,0x9C),
-     o3(0xE3,0x8E,0x9D), o3(0xE3,0x8E,0x9E),
-     o3(0xE3,0x8E,0x9F), o3(0xE3,0x8E,0xA0),
-     o3(0xE3,0x8E,0xA1), o3(0xE3,0x8E,0xA2),
-     o3(0xE3,0x8F,0x8A), o3(0xE3,0x8E,0x8D),
-     o3(0xE3,0x8E,0x8E), o3(0xE3,0x8E,0x8F),
-     o3(0xE3,0x8F,0x8F), o3(0xE3,0x8E,0x88),
-     o3(0xE3,0x8E,0x89), o3(0xE3,0x8F,0x88),
-     o3(0xE3,0x8E,0xA7), o3(0xE3,0x8E,0xA8),
-     o3(0xE3,0x8E,0xB0), o3(0xE3,0x8E,0xB1),
-     o3(0xE3,0x8E,0xB2), o3(0xE3,0x8E,0xB3),
-     o3(0xE3,0x8E,0xB4), o3(0xE3,0x8E,0xB5),
-     o3(0xE3,0x8E,0xB6), o3(0xE3,0x8E,0xB7),
-     o3(0xE3,0x8E,0xB8), o3(0xE3,0x8E,0xB9),
-     o3(0xE3,0x8E,0x80), o3(0xE3,0x8E,0x81),
-     o3(0xE3,0x8E,0x82), o3(0xE3,0x8E,0x83),
-     o3(0xE3,0x8E,0x84), o3(0xE3,0x8E,0xBA),
-     o3(0xE3,0x8E,0xBB), o3(0xE3,0x8E,0xBC),
-     o3(0xE3,0x8E,0xBD), o3(0xE3,0x8E,0xBE),
-     o3(0xE3,0x8E,0xBF), o3(0xE3,0x8E,0x90),
-     o3(0xE3,0x8E,0x91), o3(0xE3,0x8E,0x92),
-     o3(0xE3,0x8E,0x93), o3(0xE3,0x8E,0x94),
-     o3(0xE2,0x84,0xA6), o3(0xE3,0x8F,0x80),
-     o3(0xE3,0x8F,0x81), o3(0xE3,0x8E,0x8A),
-     o3(0xE3,0x8E,0x8B), o3(0xE3,0x8E,0x8C),
-     o3(0xE3,0x8F,0x96), o3(0xE3,0x8F,0x85),
-     o3(0xE3,0x8E,0xAD), o3(0xE3,0x8E,0xAE),
-     o3(0xE3,0x8E,0xAF), o3(0xE3,0x8F,0x9B),
-     o3(0xE3,0x8E,0xA9), o3(0xE3,0x8E,0xAA),
-     o3(0xE3,0x8E,0xAB), o3(0xE3,0x8E,0xAC),
-     o3(0xE3,0x8F,0x9D), o3(0xE3,0x8F,0x90),
-     o3(0xE3,0x8F,0x93), o3(0xE3,0x8F,0x83),
-     o3(0xE3,0x8F,0x89), o3(0xE3,0x8F,0x9C),
-     o3(0xE3,0x8F,0x86),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A7 = {
-    from_CP949_A7_offsets,
-    from_CP949_A7_infos
-};
-
-static const unsigned char
-from_CP949_A8_offsets[256] = {
-    175,175,175,175,175,175,175,175,    175,175,175,175,175,175,175,175,
-    175,175,175,175,175,175,175,175,    175,175,175,175,175,175,175,175,
-    175,175,175,175,175,175,175,175,    175,175,175,175,175,175,175,175,
-    175,175,175,175,175,175,175,175,    175,175,175,175,175,175,175,175,
-    175,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,175,175,175,175,175,
-    175, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,175,175,175,175,175,
-    175, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87,175, 88,175,     89, 90, 91, 92, 93, 94, 95, 96,
-    175, 97, 98, 99,100,101,102,103,    104,105,106,107,108,109,110,111,
-    112,113,114,115,116,117,118,119,    120,121,122,123,124,125,126,127,
-    128,129,130,131,132,133,134,135,    136,137,138,139,140,141,142,143,
-    144,145,146,147,148,149,150,151,    152,153,154,155,156,157,158,159,
-    160,161,162,163,164,165,166,167,    168,169,170,171,172,173,174,175,
-};
-
-static const struct byte_lookup* const
-from_CP949_A8_infos[176] = {
-     o3(0xEC,0xAD,0xAD), o3(0xEC,0xAD,0xAE),
-     o3(0xEC,0xAD,0xAF), o3(0xEC,0xAD,0xB0),
-     o3(0xEC,0xAD,0xB1), o3(0xEC,0xAD,0xB2),
-     o3(0xEC,0xAD,0xB3), o3(0xEC,0xAD,0xB4),
-     o3(0xEC,0xAD,0xB5), o3(0xEC,0xAD,0xB6),
-     o3(0xEC,0xAD,0xB7), o3(0xEC,0xAD,0xBA),
-     o3(0xEC,0xAD,0xBB), o3(0xEC,0xAD,0xBC),
-     o3(0xEC,0xAD,0xBD), o3(0xEC,0xAD,0xBE),
-     o3(0xEC,0xAD,0xBF), o3(0xEC,0xAE,0x80),
-     o3(0xEC,0xAE,0x81), o3(0xEC,0xAE,0x82),
-     o3(0xEC,0xAE,0x83), o3(0xEC,0xAE,0x84),
-     o3(0xEC,0xAE,0x85), o3(0xEC,0xAE,0x86),
-     o3(0xEC,0xAE,0x87), o3(0xEC,0xAE,0x88),
-     o3(0xEC,0xAE,0x89), o3(0xEC,0xAE,0x8A),
-     o3(0xEC,0xAE,0x8B), o3(0xEC,0xAE,0x8C),
-     o3(0xEC,0xAE,0x8D), o3(0xEC,0xAE,0x8E),
-     o3(0xEC,0xAE,0x8F), o3(0xEC,0xAE,0x90),
-     o3(0xEC,0xAE,0x91), o3(0xEC,0xAE,0x92),
-     o3(0xEC,0xAE,0x93), o3(0xEC,0xAE,0x94),
-     o3(0xEC,0xAE,0x95), o3(0xEC,0xAE,0x96),
-     o3(0xEC,0xAE,0x97), o3(0xEC,0xAE,0x98),
-     o3(0xEC,0xAE,0x99), o3(0xEC,0xAE,0x9A),
-     o3(0xEC,0xAE,0x9B), o3(0xEC,0xAE,0x9D),
-     o3(0xEC,0xAE,0x9E), o3(0xEC,0xAE,0x9F),
-     o3(0xEC,0xAE,0xA0), o3(0xEC,0xAE,0xA1),
-     o3(0xEC,0xAE,0xA2), o3(0xEC,0xAE,0xA3),
-     o3(0xEC,0xAE,0xA4), o3(0xEC,0xAE,0xA5),
-     o3(0xEC,0xAE,0xA6), o3(0xEC,0xAE,0xA7),
-     o3(0xEC,0xAE,0xA8), o3(0xEC,0xAE,0xA9),
-     o3(0xEC,0xAE,0xAA), o3(0xEC,0xAE,0xAB),
-     o3(0xEC,0xAE,0xAC), o3(0xEC,0xAE,0xAD),
-     o3(0xEC,0xAE,0xAE), o3(0xEC,0xAE,0xAF),
-     o3(0xEC,0xAE,0xB0), o3(0xEC,0xAE,0xB1),
-     o3(0xEC,0xAE,0xB2), o3(0xEC,0xAE,0xB3),
-     o3(0xEC,0xAE,0xB4), o3(0xEC,0xAE,0xB5),
-     o3(0xEC,0xAE,0xB6), o3(0xEC,0xAE,0xB7),
-     o3(0xEC,0xAE,0xB9), o3(0xEC,0xAE,0xBA),
-     o3(0xEC,0xAE,0xBB), o3(0xEC,0xAE,0xBC),
-     o3(0xEC,0xAE,0xBD), o3(0xEC,0xAE,0xBE),
-     o3(0xEC,0xAE,0xBF), o3(0xEC,0xAF,0x80),
-     o3(0xEC,0xAF,0x81), o3(0xEC,0xAF,0x82),
-     o3(0xEC,0xAF,0x83), o3(0xEC,0xAF,0x84),
-          o2(0xC3,0x86),      o2(0xC3,0x90),
-          o2(0xC2,0xAA),      o2(0xC4,0xA6),
-          o2(0xC4,0xB2),      o2(0xC4,0xBF),
-          o2(0xC5,0x81),      o2(0xC3,0x98),
-          o2(0xC5,0x92),      o2(0xC2,0xBA),
-          o2(0xC3,0x9E),      o2(0xC5,0xA6),
-          o2(0xC5,0x8A), o3(0xE3,0x89,0xA0),
-     o3(0xE3,0x89,0xA1), o3(0xE3,0x89,0xA2),
-     o3(0xE3,0x89,0xA3), o3(0xE3,0x89,0xA4),
-     o3(0xE3,0x89,0xA5), o3(0xE3,0x89,0xA6),
-     o3(0xE3,0x89,0xA7), o3(0xE3,0x89,0xA8),
-     o3(0xE3,0x89,0xA9), o3(0xE3,0x89,0xAA),
-     o3(0xE3,0x89,0xAB), o3(0xE3,0x89,0xAC),
-     o3(0xE3,0x89,0xAD), o3(0xE3,0x89,0xAE),
-     o3(0xE3,0x89,0xAF), o3(0xE3,0x89,0xB0),
-     o3(0xE3,0x89,0xB1), o3(0xE3,0x89,0xB2),
-     o3(0xE3,0x89,0xB3), o3(0xE3,0x89,0xB4),
-     o3(0xE3,0x89,0xB5), o3(0xE3,0x89,0xB6),
-     o3(0xE3,0x89,0xB7), o3(0xE3,0x89,0xB8),
-     o3(0xE3,0x89,0xB9), o3(0xE3,0x89,0xBA),
-     o3(0xE3,0x89,0xBB), o3(0xE2,0x93,0x90),
-     o3(0xE2,0x93,0x91), o3(0xE2,0x93,0x92),
-     o3(0xE2,0x93,0x93), o3(0xE2,0x93,0x94),
-     o3(0xE2,0x93,0x95), o3(0xE2,0x93,0x96),
-     o3(0xE2,0x93,0x97), o3(0xE2,0x93,0x98),
-     o3(0xE2,0x93,0x99), o3(0xE2,0x93,0x9A),
-     o3(0xE2,0x93,0x9B), o3(0xE2,0x93,0x9C),
-     o3(0xE2,0x93,0x9D), o3(0xE2,0x93,0x9E),
-     o3(0xE2,0x93,0x9F), o3(0xE2,0x93,0xA0),
-     o3(0xE2,0x93,0xA1), o3(0xE2,0x93,0xA2),
-     o3(0xE2,0x93,0xA3), o3(0xE2,0x93,0xA4),
-     o3(0xE2,0x93,0xA5), o3(0xE2,0x93,0xA6),
-     o3(0xE2,0x93,0xA7), o3(0xE2,0x93,0xA8),
-     o3(0xE2,0x93,0xA9), o3(0xE2,0x91,0xA0),
-     o3(0xE2,0x91,0xA1), o3(0xE2,0x91,0xA2),
-     o3(0xE2,0x91,0xA3), o3(0xE2,0x91,0xA4),
-     o3(0xE2,0x91,0xA5), o3(0xE2,0x91,0xA6),
-     o3(0xE2,0x91,0xA7), o3(0xE2,0x91,0xA8),
-     o3(0xE2,0x91,0xA9), o3(0xE2,0x91,0xAA),
-     o3(0xE2,0x91,0xAB), o3(0xE2,0x91,0xAC),
-     o3(0xE2,0x91,0xAD), o3(0xE2,0x91,0xAE),
-          o2(0xC2,0xBD), o3(0xE2,0x85,0x93),
-     o3(0xE2,0x85,0x94),      o2(0xC2,0xBC),
-          o2(0xC2,0xBE), o3(0xE2,0x85,0x9B),
-     o3(0xE2,0x85,0x9C), o3(0xE2,0x85,0x9D),
-     o3(0xE2,0x85,0x9E),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A8 = {
-    from_CP949_A8_offsets,
-    from_CP949_A8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_A9_infos[179] = {
-     o3(0xEC,0xAF,0x85), o3(0xEC,0xAF,0x86),
-     o3(0xEC,0xAF,0x87), o3(0xEC,0xAF,0x88),
-     o3(0xEC,0xAF,0x89), o3(0xEC,0xAF,0x8A),
-     o3(0xEC,0xAF,0x8B), o3(0xEC,0xAF,0x8C),
-     o3(0xEC,0xAF,0x8D), o3(0xEC,0xAF,0x8E),
-     o3(0xEC,0xAF,0x8F), o3(0xEC,0xAF,0x90),
-     o3(0xEC,0xAF,0x91), o3(0xEC,0xAF,0x92),
-     o3(0xEC,0xAF,0x93), o3(0xEC,0xAF,0x95),
-     o3(0xEC,0xAF,0x96), o3(0xEC,0xAF,0x97),
-     o3(0xEC,0xAF,0x98), o3(0xEC,0xAF,0x99),
-     o3(0xEC,0xAF,0x9A), o3(0xEC,0xAF,0x9B),
-     o3(0xEC,0xAF,0x9C), o3(0xEC,0xAF,0x9D),
-     o3(0xEC,0xAF,0x9E), o3(0xEC,0xAF,0x9F),
-     o3(0xEC,0xAF,0xA0), o3(0xEC,0xAF,0xA1),
-     o3(0xEC,0xAF,0xA2), o3(0xEC,0xAF,0xA3),
-     o3(0xEC,0xAF,0xA5), o3(0xEC,0xAF,0xA6),
-     o3(0xEC,0xAF,0xA8), o3(0xEC,0xAF,0xAA),
-     o3(0xEC,0xAF,0xAB), o3(0xEC,0xAF,0xAC),
-     o3(0xEC,0xAF,0xAD), o3(0xEC,0xAF,0xAE),
-     o3(0xEC,0xAF,0xAF), o3(0xEC,0xAF,0xB0),
-     o3(0xEC,0xAF,0xB1), o3(0xEC,0xAF,0xB2),
-     o3(0xEC,0xAF,0xB3), o3(0xEC,0xAF,0xB4),
-     o3(0xEC,0xAF,0xB5), o3(0xEC,0xAF,0xB6),
-     o3(0xEC,0xAF,0xB7), o3(0xEC,0xAF,0xB8),
-     o3(0xEC,0xAF,0xB9), o3(0xEC,0xAF,0xBA),
-     o3(0xEC,0xAF,0xBB), o3(0xEC,0xAF,0xBC),
-     o3(0xEC,0xAF,0xBD), o3(0xEC,0xAF,0xBE),
-     o3(0xEC,0xAF,0xBF), o3(0xEC,0xB0,0x80),
-     o3(0xEC,0xB0,0x81), o3(0xEC,0xB0,0x82),
-     o3(0xEC,0xB0,0x83), o3(0xEC,0xB0,0x84),
-     o3(0xEC,0xB0,0x85), o3(0xEC,0xB0,0x86),
-     o3(0xEC,0xB0,0x87), o3(0xEC,0xB0,0x88),
-     o3(0xEC,0xB0,0x89), o3(0xEC,0xB0,0x8A),
-     o3(0xEC,0xB0,0x8B), o3(0xEC,0xB0,0x8E),
-     o3(0xEC,0xB0,0x8F), o3(0xEC,0xB0,0x91),
-     o3(0xEC,0xB0,0x92), o3(0xEC,0xB0,0x93),
-     o3(0xEC,0xB0,0x95), o3(0xEC,0xB0,0x96),
-     o3(0xEC,0xB0,0x97), o3(0xEC,0xB0,0x98),
-     o3(0xEC,0xB0,0x99), o3(0xEC,0xB0,0x9A),
-     o3(0xEC,0xB0,0x9B), o3(0xEC,0xB0,0x9E),
-     o3(0xEC,0xB0,0x9F), o3(0xEC,0xB0,0xA0),
-     o3(0xEC,0xB0,0xA3), o3(0xEC,0xB0,0xA4),
-          o2(0xC3,0xA6),      o2(0xC4,0x91),
-          o2(0xC3,0xB0),      o2(0xC4,0xA7),
-          o2(0xC4,0xB1),      o2(0xC4,0xB3),
-          o2(0xC4,0xB8),      o2(0xC5,0x80),
-          o2(0xC5,0x82),      o2(0xC3,0xB8),
-          o2(0xC5,0x93),      o2(0xC3,0x9F),
-          o2(0xC3,0xBE),      o2(0xC5,0xA7),
-          o2(0xC5,0x8B),      o2(0xC5,0x89),
-     o3(0xE3,0x88,0x80), o3(0xE3,0x88,0x81),
-     o3(0xE3,0x88,0x82), o3(0xE3,0x88,0x83),
-     o3(0xE3,0x88,0x84), o3(0xE3,0x88,0x85),
-     o3(0xE3,0x88,0x86), o3(0xE3,0x88,0x87),
-     o3(0xE3,0x88,0x88), o3(0xE3,0x88,0x89),
-     o3(0xE3,0x88,0x8A), o3(0xE3,0x88,0x8B),
-     o3(0xE3,0x88,0x8C), o3(0xE3,0x88,0x8D),
-     o3(0xE3,0x88,0x8E), o3(0xE3,0x88,0x8F),
-     o3(0xE3,0x88,0x90), o3(0xE3,0x88,0x91),
-     o3(0xE3,0x88,0x92), o3(0xE3,0x88,0x93),
-     o3(0xE3,0x88,0x94), o3(0xE3,0x88,0x95),
-     o3(0xE3,0x88,0x96), o3(0xE3,0x88,0x97),
-     o3(0xE3,0x88,0x98), o3(0xE3,0x88,0x99),
-     o3(0xE3,0x88,0x9A), o3(0xE3,0x88,0x9B),
-     o3(0xE2,0x92,0x9C), o3(0xE2,0x92,0x9D),
-     o3(0xE2,0x92,0x9E), o3(0xE2,0x92,0x9F),
-     o3(0xE2,0x92,0xA0), o3(0xE2,0x92,0xA1),
-     o3(0xE2,0x92,0xA2), o3(0xE2,0x92,0xA3),
-     o3(0xE2,0x92,0xA4), o3(0xE2,0x92,0xA5),
-     o3(0xE2,0x92,0xA6), o3(0xE2,0x92,0xA7),
-     o3(0xE2,0x92,0xA8), o3(0xE2,0x92,0xA9),
-     o3(0xE2,0x92,0xAA), o3(0xE2,0x92,0xAB),
-     o3(0xE2,0x92,0xAC), o3(0xE2,0x92,0xAD),
-     o3(0xE2,0x92,0xAE), o3(0xE2,0x92,0xAF),
-     o3(0xE2,0x92,0xB0), o3(0xE2,0x92,0xB1),
-     o3(0xE2,0x92,0xB2), o3(0xE2,0x92,0xB3),
-     o3(0xE2,0x92,0xB4), o3(0xE2,0x92,0xB5),
-     o3(0xE2,0x91,0xB4), o3(0xE2,0x91,0xB5),
-     o3(0xE2,0x91,0xB6), o3(0xE2,0x91,0xB7),
-     o3(0xE2,0x91,0xB8), o3(0xE2,0x91,0xB9),
-     o3(0xE2,0x91,0xBA), o3(0xE2,0x91,0xBB),
-     o3(0xE2,0x91,0xBC), o3(0xE2,0x91,0xBD),
-     o3(0xE2,0x91,0xBE), o3(0xE2,0x91,0xBF),
-     o3(0xE2,0x92,0x80), o3(0xE2,0x92,0x81),
-     o3(0xE2,0x92,0x82),      o2(0xC2,0xB9),
-          o2(0xC2,0xB2),      o2(0xC2,0xB3),
-     o3(0xE2,0x81,0xB4), o3(0xE2,0x81,0xBF),
-     o3(0xE2,0x82,0x81), o3(0xE2,0x82,0x82),
-     o3(0xE2,0x82,0x83), o3(0xE2,0x82,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_A9 = {
-    from_CP949_81_offsets,
-    from_CP949_A9_infos
-};
-
-static const unsigned char
-from_CP949_AA_offsets[256] = {
-    167,167,167,167,167,167,167,167,    167,167,167,167,167,167,167,167,
-    167,167,167,167,167,167,167,167,    167,167,167,167,167,167,167,167,
-    167,167,167,167,167,167,167,167,    167,167,167,167,167,167,167,167,
-    167,167,167,167,167,167,167,167,    167,167,167,167,167,167,167,167,
-    167,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,167,167,167,167,167,
-    167, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,167,167,167,167,167,
-    167, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,153,154,    155,156,157,158,159,160,161,162,
-    163,164,165,166,167,167,167,167,    167,167,167,167,167,167,167,167,
-};
-
-static const struct byte_lookup* const
-from_CP949_AA_infos[168] = {
-     o3(0xEC,0xB0,0xA5), o3(0xEC,0xB0,0xA6),
-     o3(0xEC,0xB0,0xAA), o3(0xEC,0xB0,0xAB),
-     o3(0xEC,0xB0,0xAD), o3(0xEC,0xB0,0xAF),
-     o3(0xEC,0xB0,0xB1), o3(0xEC,0xB0,0xB2),
-     o3(0xEC,0xB0,0xB3), o3(0xEC,0xB0,0xB4),
-     o3(0xEC,0xB0,0xB5), o3(0xEC,0xB0,0xB6),
-     o3(0xEC,0xB0,0xB7), o3(0xEC,0xB0,0xBA),
-     o3(0xEC,0xB0,0xBF), o3(0xEC,0xB1,0x80),
-     o3(0xEC,0xB1,0x81), o3(0xEC,0xB1,0x82),
-     o3(0xEC,0xB1,0x83), o3(0xEC,0xB1,0x86),
-     o3(0xEC,0xB1,0x87), o3(0xEC,0xB1,0x89),
-     o3(0xEC,0xB1,0x8A), o3(0xEC,0xB1,0x8B),
-     o3(0xEC,0xB1,0x8D), o3(0xEC,0xB1,0x8E),
-     o3(0xEC,0xB1,0x8F), o3(0xEC,0xB1,0x90),
-     o3(0xEC,0xB1,0x91), o3(0xEC,0xB1,0x92),
-     o3(0xEC,0xB1,0x93), o3(0xEC,0xB1,0x96),
-     o3(0xEC,0xB1,0x9A), o3(0xEC,0xB1,0x9B),
-     o3(0xEC,0xB1,0x9C), o3(0xEC,0xB1,0x9D),
-     o3(0xEC,0xB1,0x9E), o3(0xEC,0xB1,0x9F),
-     o3(0xEC,0xB1,0xA1), o3(0xEC,0xB1,0xA2),
-     o3(0xEC,0xB1,0xA3), o3(0xEC,0xB1,0xA5),
-     o3(0xEC,0xB1,0xA7), o3(0xEC,0xB1,0xA9),
-     o3(0xEC,0xB1,0xAA), o3(0xEC,0xB1,0xAB),
-     o3(0xEC,0xB1,0xAC), o3(0xEC,0xB1,0xAD),
-     o3(0xEC,0xB1,0xAE), o3(0xEC,0xB1,0xAF),
-     o3(0xEC,0xB1,0xB1), o3(0xEC,0xB1,0xB2),
-     o3(0xEC,0xB1,0xB3), o3(0xEC,0xB1,0xB4),
-     o3(0xEC,0xB1,0xB6), o3(0xEC,0xB1,0xB7),
-     o3(0xEC,0xB1,0xB8), o3(0xEC,0xB1,0xB9),
-     o3(0xEC,0xB1,0xBA), o3(0xEC,0xB1,0xBB),
-     o3(0xEC,0xB1,0xBC), o3(0xEC,0xB1,0xBD),
-     o3(0xEC,0xB1,0xBE), o3(0xEC,0xB1,0xBF),
-     o3(0xEC,0xB2,0x80), o3(0xEC,0xB2,0x81),
-     o3(0xEC,0xB2,0x82), o3(0xEC,0xB2,0x83),
-     o3(0xEC,0xB2,0x84), o3(0xEC,0xB2,0x85),
-     o3(0xEC,0xB2,0x86), o3(0xEC,0xB2,0x87),
-     o3(0xEC,0xB2,0x88), o3(0xEC,0xB2,0x89),
-     o3(0xEC,0xB2,0x8A), o3(0xEC,0xB2,0x8B),
-     o3(0xEC,0xB2,0x8C), o3(0xEC,0xB2,0x8D),
-     o3(0xEC,0xB2,0x8E), o3(0xEC,0xB2,0x8F),
-     o3(0xEC,0xB2,0x90), o3(0xEC,0xB2,0x91),
-     o3(0xEC,0xB2,0x92), o3(0xEC,0xB2,0x93),
-     o3(0xE3,0x81,0x81), o3(0xE3,0x81,0x82),
-     o3(0xE3,0x81,0x83), o3(0xE3,0x81,0x84),
-     o3(0xE3,0x81,0x85), o3(0xE3,0x81,0x86),
-     o3(0xE3,0x81,0x87), o3(0xE3,0x81,0x88),
-     o3(0xE3,0x81,0x89), o3(0xE3,0x81,0x8A),
-     o3(0xE3,0x81,0x8B), o3(0xE3,0x81,0x8C),
-     o3(0xE3,0x81,0x8D), o3(0xE3,0x81,0x8E),
-     o3(0xE3,0x81,0x8F), o3(0xE3,0x81,0x90),
-     o3(0xE3,0x81,0x91), o3(0xE3,0x81,0x92),
-     o3(0xE3,0x81,0x93), o3(0xE3,0x81,0x94),
-     o3(0xE3,0x81,0x95), o3(0xE3,0x81,0x96),
-     o3(0xE3,0x81,0x97), o3(0xE3,0x81,0x98),
-     o3(0xE3,0x81,0x99), o3(0xE3,0x81,0x9A),
-     o3(0xE3,0x81,0x9B), o3(0xE3,0x81,0x9C),
-     o3(0xE3,0x81,0x9D), o3(0xE3,0x81,0x9E),
-     o3(0xE3,0x81,0x9F), o3(0xE3,0x81,0xA0),
-     o3(0xE3,0x81,0xA1), o3(0xE3,0x81,0xA2),
-     o3(0xE3,0x81,0xA3), o3(0xE3,0x81,0xA4),
-     o3(0xE3,0x81,0xA5), o3(0xE3,0x81,0xA6),
-     o3(0xE3,0x81,0xA7), o3(0xE3,0x81,0xA8),
-     o3(0xE3,0x81,0xA9), o3(0xE3,0x81,0xAA),
-     o3(0xE3,0x81,0xAB), o3(0xE3,0x81,0xAC),
-     o3(0xE3,0x81,0xAD), o3(0xE3,0x81,0xAE),
-     o3(0xE3,0x81,0xAF), o3(0xE3,0x81,0xB0),
-     o3(0xE3,0x81,0xB1), o3(0xE3,0x81,0xB2),
-     o3(0xE3,0x81,0xB3), o3(0xE3,0x81,0xB4),
-     o3(0xE3,0x81,0xB5), o3(0xE3,0x81,0xB6),
-     o3(0xE3,0x81,0xB7), o3(0xE3,0x81,0xB8),
-     o3(0xE3,0x81,0xB9), o3(0xE3,0x81,0xBA),
-     o3(0xE3,0x81,0xBB), o3(0xE3,0x81,0xBC),
-     o3(0xE3,0x81,0xBD), o3(0xE3,0x81,0xBE),
-     o3(0xE3,0x81,0xBF), o3(0xE3,0x82,0x80),
-     o3(0xE3,0x82,0x81), o3(0xE3,0x82,0x82),
-     o3(0xE3,0x82,0x83), o3(0xE3,0x82,0x84),
-     o3(0xE3,0x82,0x85), o3(0xE3,0x82,0x86),
-     o3(0xE3,0x82,0x87), o3(0xE3,0x82,0x88),
-     o3(0xE3,0x82,0x89), o3(0xE3,0x82,0x8A),
-     o3(0xE3,0x82,0x8B), o3(0xE3,0x82,0x8C),
-     o3(0xE3,0x82,0x8D), o3(0xE3,0x82,0x8E),
-     o3(0xE3,0x82,0x8F), o3(0xE3,0x82,0x90),
-     o3(0xE3,0x82,0x91), o3(0xE3,0x82,0x92),
-     o3(0xE3,0x82,0x93),              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AA = {
-    from_CP949_AA_offsets,
-    from_CP949_AA_infos
-};
-
-static const unsigned char
-from_CP949_AB_offsets[256] = {
-    170,170,170,170,170,170,170,170,    170,170,170,170,170,170,170,170,
-    170,170,170,170,170,170,170,170,    170,170,170,170,170,170,170,170,
-    170,170,170,170,170,170,170,170,    170,170,170,170,170,170,170,170,
-    170,170,170,170,170,170,170,170,    170,170,170,170,170,170,170,170,
-    170,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,170,170,170,170,170,
-    170, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,170,170,170,170,170,
-    170, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,117,118,119,120,121,122,    123,124,125,126,127,128,129,130,
-    131,132,133,134,135,136,137,138,    139,140,141,142,143,144,145,146,
-    147,148,149,150,151,152,153,154,    155,156,157,158,159,160,161,162,
-    163,164,165,166,167,168,169,170,    170,170,170,170,170,170,170,170,
-};
-
-static const struct byte_lookup* const
-from_CP949_AB_infos[171] = {
-     o3(0xEC,0xB2,0x94), o3(0xEC,0xB2,0x95),
-     o3(0xEC,0xB2,0x96), o3(0xEC,0xB2,0x97),
-     o3(0xEC,0xB2,0x9A), o3(0xEC,0xB2,0x9B),
-     o3(0xEC,0xB2,0x9D), o3(0xEC,0xB2,0x9E),
-     o3(0xEC,0xB2,0x9F), o3(0xEC,0xB2,0xA1),
-     o3(0xEC,0xB2,0xA2), o3(0xEC,0xB2,0xA3),
-     o3(0xEC,0xB2,0xA4), o3(0xEC,0xB2,0xA5),
-     o3(0xEC,0xB2,0xA6), o3(0xEC,0xB2,0xA7),
-     o3(0xEC,0xB2,0xAA), o3(0xEC,0xB2,0xAE),
-     o3(0xEC,0xB2,0xAF), o3(0xEC,0xB2,0xB0),
-     o3(0xEC,0xB2,0xB1), o3(0xEC,0xB2,0xB2),
-     o3(0xEC,0xB2,0xB3), o3(0xEC,0xB2,0xB6),
-     o3(0xEC,0xB2,0xB7), o3(0xEC,0xB2,0xB9),
-     o3(0xEC,0xB2,0xBA), o3(0xEC,0xB2,0xBB),
-     o3(0xEC,0xB2,0xBD), o3(0xEC,0xB2,0xBE),
-     o3(0xEC,0xB2,0xBF), o3(0xEC,0xB3,0x80),
-     o3(0xEC,0xB3,0x81), o3(0xEC,0xB3,0x82),
-     o3(0xEC,0xB3,0x83), o3(0xEC,0xB3,0x86),
-     o3(0xEC,0xB3,0x88), o3(0xEC,0xB3,0x8A),
-     o3(0xEC,0xB3,0x8B), o3(0xEC,0xB3,0x8C),
-     o3(0xEC,0xB3,0x8D), o3(0xEC,0xB3,0x8E),
-     o3(0xEC,0xB3,0x8F), o3(0xEC,0xB3,0x91),
-     o3(0xEC,0xB3,0x92), o3(0xEC,0xB3,0x93),
-     o3(0xEC,0xB3,0x95), o3(0xEC,0xB3,0x96),
-     o3(0xEC,0xB3,0x97), o3(0xEC,0xB3,0x98),
-     o3(0xEC,0xB3,0x99), o3(0xEC,0xB3,0x9A),
-     o3(0xEC,0xB3,0x9B), o3(0xEC,0xB3,0x9C),
-     o3(0xEC,0xB3,0x9D), o3(0xEC,0xB3,0x9E),
-     o3(0xEC,0xB3,0x9F), o3(0xEC,0xB3,0xA0),
-     o3(0xEC,0xB3,0xA1), o3(0xEC,0xB3,0xA2),
-     o3(0xEC,0xB3,0xA3), o3(0xEC,0xB3,0xA5),
-     o3(0xEC,0xB3,0xA6), o3(0xEC,0xB3,0xA7),
-     o3(0xEC,0xB3,0xA8), o3(0xEC,0xB3,0xA9),
-     o3(0xEC,0xB3,0xAA), o3(0xEC,0xB3,0xAB),
-     o3(0xEC,0xB3,0xAD), o3(0xEC,0xB3,0xAE),
-     o3(0xEC,0xB3,0xAF), o3(0xEC,0xB3,0xB1),
-     o3(0xEC,0xB3,0xB2), o3(0xEC,0xB3,0xB3),
-     o3(0xEC,0xB3,0xB4), o3(0xEC,0xB3,0xB5),
-     o3(0xEC,0xB3,0xB6), o3(0xEC,0xB3,0xB7),
-     o3(0xEC,0xB3,0xB8), o3(0xEC,0xB3,0xB9),
-     o3(0xEC,0xB3,0xBA), o3(0xEC,0xB3,0xBB),
-     o3(0xEC,0xB3,0xBC), o3(0xEC,0xB3,0xBD),
-     o3(0xE3,0x82,0xA1), o3(0xE3,0x82,0xA2),
-     o3(0xE3,0x82,0xA3), o3(0xE3,0x82,0xA4),
-     o3(0xE3,0x82,0xA5), o3(0xE3,0x82,0xA6),
-     o3(0xE3,0x82,0xA7), o3(0xE3,0x82,0xA8),
-     o3(0xE3,0x82,0xA9), o3(0xE3,0x82,0xAA),
-     o3(0xE3,0x82,0xAB), o3(0xE3,0x82,0xAC),
-     o3(0xE3,0x82,0xAD), o3(0xE3,0x82,0xAE),
-     o3(0xE3,0x82,0xAF), o3(0xE3,0x82,0xB0),
-     o3(0xE3,0x82,0xB1), o3(0xE3,0x82,0xB2),
-     o3(0xE3,0x82,0xB3), o3(0xE3,0x82,0xB4),
-     o3(0xE3,0x82,0xB5), o3(0xE3,0x82,0xB6),
-     o3(0xE3,0x82,0xB7), o3(0xE3,0x82,0xB8),
-     o3(0xE3,0x82,0xB9), o3(0xE3,0x82,0xBA),
-     o3(0xE3,0x82,0xBB), o3(0xE3,0x82,0xBC),
-     o3(0xE3,0x82,0xBD), o3(0xE3,0x82,0xBE),
-     o3(0xE3,0x82,0xBF), o3(0xE3,0x83,0x80),
-     o3(0xE3,0x83,0x81), o3(0xE3,0x83,0x82),
-     o3(0xE3,0x83,0x83), o3(0xE3,0x83,0x84),
-     o3(0xE3,0x83,0x85), o3(0xE3,0x83,0x86),
-     o3(0xE3,0x83,0x87), o3(0xE3,0x83,0x88),
-     o3(0xE3,0x83,0x89), o3(0xE3,0x83,0x8A),
-     o3(0xE3,0x83,0x8B), o3(0xE3,0x83,0x8C),
-     o3(0xE3,0x83,0x8D), o3(0xE3,0x83,0x8E),
-     o3(0xE3,0x83,0x8F), o3(0xE3,0x83,0x90),
-     o3(0xE3,0x83,0x91), o3(0xE3,0x83,0x92),
-     o3(0xE3,0x83,0x93), o3(0xE3,0x83,0x94),
-     o3(0xE3,0x83,0x95), o3(0xE3,0x83,0x96),
-     o3(0xE3,0x83,0x97), o3(0xE3,0x83,0x98),
-     o3(0xE3,0x83,0x99), o3(0xE3,0x83,0x9A),
-     o3(0xE3,0x83,0x9B), o3(0xE3,0x83,0x9C),
-     o3(0xE3,0x83,0x9D), o3(0xE3,0x83,0x9E),
-     o3(0xE3,0x83,0x9F), o3(0xE3,0x83,0xA0),
-     o3(0xE3,0x83,0xA1), o3(0xE3,0x83,0xA2),
-     o3(0xE3,0x83,0xA3), o3(0xE3,0x83,0xA4),
-     o3(0xE3,0x83,0xA5), o3(0xE3,0x83,0xA6),
-     o3(0xE3,0x83,0xA7), o3(0xE3,0x83,0xA8),
-     o3(0xE3,0x83,0xA9), o3(0xE3,0x83,0xAA),
-     o3(0xE3,0x83,0xAB), o3(0xE3,0x83,0xAC),
-     o3(0xE3,0x83,0xAD), o3(0xE3,0x83,0xAE),
-     o3(0xE3,0x83,0xAF), o3(0xE3,0x83,0xB0),
-     o3(0xE3,0x83,0xB1), o3(0xE3,0x83,0xB2),
-     o3(0xE3,0x83,0xB3), o3(0xE3,0x83,0xB4),
-     o3(0xE3,0x83,0xB5), o3(0xE3,0x83,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AB = {
-    from_CP949_AB_offsets,
-    from_CP949_AB_infos
-};
-
-static const unsigned char
-from_CP949_AC_offsets[256] = {
-    150,150,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-    150,150,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-    150,150,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-    150,150,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-    150,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25,150,150,150,150,150,
-    150, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51,150,150,150,150,150,
-    150, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 85, 86, 87, 88, 89, 90,     91, 92, 93, 94, 95, 96, 97, 98,
-     99,100,101,102,103,104,105,106,    107,108,109,110,111,112,113,114,
-    115,116,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-    150,117,118,119,120,121,122,123,    124,125,126,127,128,129,130,131,
-    132,133,134,135,136,137,138,139,    140,141,142,143,144,145,146,147,
-    148,149,150,150,150,150,150,150,    150,150,150,150,150,150,150,150,
-};
-
-static const struct byte_lookup* const
-from_CP949_AC_infos[151] = {
-     o3(0xEC,0xB3,0xBE), o3(0xEC,0xB3,0xBF),
-     o3(0xEC,0xB4,0x80), o3(0xEC,0xB4,0x82),
-     o3(0xEC,0xB4,0x83), o3(0xEC,0xB4,0x84),
-     o3(0xEC,0xB4,0x85), o3(0xEC,0xB4,0x86),
-     o3(0xEC,0xB4,0x87), o3(0xEC,0xB4,0x8A),
-     o3(0xEC,0xB4,0x8B), o3(0xEC,0xB4,0x8D),
-     o3(0xEC,0xB4,0x8E), o3(0xEC,0xB4,0x8F),
-     o3(0xEC,0xB4,0x91), o3(0xEC,0xB4,0x92),
-     o3(0xEC,0xB4,0x93), o3(0xEC,0xB4,0x94),
-     o3(0xEC,0xB4,0x95), o3(0xEC,0xB4,0x96),
-     o3(0xEC,0xB4,0x97), o3(0xEC,0xB4,0x9A),
-     o3(0xEC,0xB4,0x9C), o3(0xEC,0xB4,0x9E),
-     o3(0xEC,0xB4,0x9F), o3(0xEC,0xB4,0xA0),
-     o3(0xEC,0xB4,0xA1), o3(0xEC,0xB4,0xA2),
-     o3(0xEC,0xB4,0xA3), o3(0xEC,0xB4,0xA5),
-     o3(0xEC,0xB4,0xA6), o3(0xEC,0xB4,0xA7),
-     o3(0xEC,0xB4,0xA9), o3(0xEC,0xB4,0xAA),
-     o3(0xEC,0xB4,0xAB), o3(0xEC,0xB4,0xAD),
-     o3(0xEC,0xB4,0xAE), o3(0xEC,0xB4,0xAF),
-     o3(0xEC,0xB4,0xB0), o3(0xEC,0xB4,0xB1),
-     o3(0xEC,0xB4,0xB2), o3(0xEC,0xB4,0xB3),
-     o3(0xEC,0xB4,0xB4), o3(0xEC,0xB4,0xB5),
-     o3(0xEC,0xB4,0xB6), o3(0xEC,0xB4,0xB7),
-     o3(0xEC,0xB4,0xB8), o3(0xEC,0xB4,0xBA),
-     o3(0xEC,0xB4,0xBB), o3(0xEC,0xB4,0xBC),
-     o3(0xEC,0xB4,0xBD), o3(0xEC,0xB4,0xBE),
-     o3(0xEC,0xB4,0xBF), o3(0xEC,0xB5,0x80),
-     o3(0xEC,0xB5,0x81), o3(0xEC,0xB5,0x82),
-     o3(0xEC,0xB5,0x83), o3(0xEC,0xB5,0x84),
-     o3(0xEC,0xB5,0x85), o3(0xEC,0xB5,0x86),
-     o3(0xEC,0xB5,0x87), o3(0xEC,0xB5,0x88),
-     o3(0xEC,0xB5,0x89), o3(0xEC,0xB5,0x8A),
-     o3(0xEC,0xB5,0x8B), o3(0xEC,0xB5,0x8C),
-     o3(0xEC,0xB5,0x8D), o3(0xEC,0xB5,0x8E),
-     o3(0xEC,0xB5,0x8F), o3(0xEC,0xB5,0x90),
-     o3(0xEC,0xB5,0x91), o3(0xEC,0xB5,0x92),
-     o3(0xEC,0xB5,0x93), o3(0xEC,0xB5,0x94),
-     o3(0xEC,0xB5,0x95), o3(0xEC,0xB5,0x96),
-     o3(0xEC,0xB5,0x97), o3(0xEC,0xB5,0x98),
-     o3(0xEC,0xB5,0x99), o3(0xEC,0xB5,0x9A),
-     o3(0xEC,0xB5,0x9B), o3(0xEC,0xB5,0x9D),
-     o3(0xEC,0xB5,0x9E), o3(0xEC,0xB5,0x9F),
-          o2(0xD0,0x90),      o2(0xD0,0x91),
-          o2(0xD0,0x92),      o2(0xD0,0x93),
-          o2(0xD0,0x94),      o2(0xD0,0x95),
-          o2(0xD0,0x81),      o2(0xD0,0x96),
-          o2(0xD0,0x97),      o2(0xD0,0x98),
-          o2(0xD0,0x99),      o2(0xD0,0x9A),
-          o2(0xD0,0x9B),      o2(0xD0,0x9C),
-          o2(0xD0,0x9D),      o2(0xD0,0x9E),
-          o2(0xD0,0x9F),      o2(0xD0,0xA0),
-          o2(0xD0,0xA1),      o2(0xD0,0xA2),
-          o2(0xD0,0xA3),      o2(0xD0,0xA4),
-          o2(0xD0,0xA5),      o2(0xD0,0xA6),
-          o2(0xD0,0xA7),      o2(0xD0,0xA8),
-          o2(0xD0,0xA9),      o2(0xD0,0xAA),
-          o2(0xD0,0xAB),      o2(0xD0,0xAC),
-          o2(0xD0,0xAD),      o2(0xD0,0xAE),
-          o2(0xD0,0xAF),      o2(0xD0,0xB0),
-          o2(0xD0,0xB1),      o2(0xD0,0xB2),
-          o2(0xD0,0xB3),      o2(0xD0,0xB4),
-          o2(0xD0,0xB5),      o2(0xD1,0x91),
-          o2(0xD0,0xB6),      o2(0xD0,0xB7),
-          o2(0xD0,0xB8),      o2(0xD0,0xB9),
-          o2(0xD0,0xBA),      o2(0xD0,0xBB),
-          o2(0xD0,0xBC),      o2(0xD0,0xBD),
-          o2(0xD0,0xBE),      o2(0xD0,0xBF),
-          o2(0xD1,0x80),      o2(0xD1,0x81),
-          o2(0xD1,0x82),      o2(0xD1,0x83),
-          o2(0xD1,0x84),      o2(0xD1,0x85),
-          o2(0xD1,0x86),      o2(0xD1,0x87),
-          o2(0xD1,0x88),      o2(0xD1,0x89),
-          o2(0xD1,0x8A),      o2(0xD1,0x8B),
-          o2(0xD1,0x8C),      o2(0xD1,0x8D),
-          o2(0xD1,0x8E),      o2(0xD1,0x8F),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AC = {
-    from_CP949_AC_offsets,
-    from_CP949_AC_infos
-};
-
-static const unsigned char
-from_CP949_AD_offsets[256] = {
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,     23, 24, 25, 84, 84, 84, 84, 84,
-     84, 26, 27, 28, 29, 30, 31, 32,     33, 34, 35, 36, 37, 38, 39, 40,
-     41, 42, 43, 44, 45, 46, 47, 48,     49, 50, 51, 84, 84, 84, 84, 84,
-     84, 52, 53, 54, 55, 56, 57, 58,     59, 60, 61, 62, 63, 64, 65, 66,
-     67, 68, 69, 70, 71, 72, 73, 74,     75, 76, 77, 78, 79, 80, 81, 82,
-     83, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,     84, 84, 84, 84, 84, 84, 84, 84,
-};
-
-static const struct byte_lookup* const
-from_CP949_AD_infos[85] = {
-     o3(0xEC,0xB5,0xA1), o3(0xEC,0xB5,0xA2),
-     o3(0xEC,0xB5,0xA3), o3(0xEC,0xB5,0xA5),
-     o3(0xEC,0xB5,0xA6), o3(0xEC,0xB5,0xA7),
-     o3(0xEC,0xB5,0xA8), o3(0xEC,0xB5,0xA9),
-     o3(0xEC,0xB5,0xAA), o3(0xEC,0xB5,0xAB),
-     o3(0xEC,0xB5,0xAE), o3(0xEC,0xB5,0xB0),
-     o3(0xEC,0xB5,0xB2), o3(0xEC,0xB5,0xB3),
-     o3(0xEC,0xB5,0xB4), o3(0xEC,0xB5,0xB5),
-     o3(0xEC,0xB5,0xB6), o3(0xEC,0xB5,0xB7),
-     o3(0xEC,0xB5,0xB9), o3(0xEC,0xB5,0xBA),
-     o3(0xEC,0xB5,0xBB), o3(0xEC,0xB5,0xBC),
-     o3(0xEC,0xB5,0xBD), o3(0xEC,0xB5,0xBE),
-     o3(0xEC,0xB5,0xBF), o3(0xEC,0xB6,0x80),
-     o3(0xEC,0xB6,0x81), o3(0xEC,0xB6,0x82),
-     o3(0xEC,0xB6,0x83), o3(0xEC,0xB6,0x84),
-     o3(0xEC,0xB6,0x85), o3(0xEC,0xB6,0x86),
-     o3(0xEC,0xB6,0x87), o3(0xEC,0xB6,0x89),
-     o3(0xEC,0xB6,0x8A), o3(0xEC,0xB6,0x8B),
-     o3(0xEC,0xB6,0x8C), o3(0xEC,0xB6,0x8D),
-     o3(0xEC,0xB6,0x8E), o3(0xEC,0xB6,0x8F),
-     o3(0xEC,0xB6,0x90), o3(0xEC,0xB6,0x91),
-     o3(0xEC,0xB6,0x92), o3(0xEC,0xB6,0x93),
-     o3(0xEC,0xB6,0x96), o3(0xEC,0xB6,0x97),
-     o3(0xEC,0xB6,0x99), o3(0xEC,0xB6,0x9A),
-     o3(0xEC,0xB6,0x9B), o3(0xEC,0xB6,0x9D),
-     o3(0xEC,0xB6,0x9E), o3(0xEC,0xB6,0x9F),
-     o3(0xEC,0xB6,0xA0), o3(0xEC,0xB6,0xA1),
-     o3(0xEC,0xB6,0xA2), o3(0xEC,0xB6,0xA3),
-     o3(0xEC,0xB6,0xA6), o3(0xEC,0xB6,0xA8),
-     o3(0xEC,0xB6,0xAA), o3(0xEC,0xB6,0xAB),
-     o3(0xEC,0xB6,0xAC), o3(0xEC,0xB6,0xAD),
-     o3(0xEC,0xB6,0xAE), o3(0xEC,0xB6,0xAF),
-     o3(0xEC,0xB6,0xB1), o3(0xEC,0xB6,0xB2),
-     o3(0xEC,0xB6,0xB3), o3(0xEC,0xB6,0xB4),
-     o3(0xEC,0xB6,0xB5), o3(0xEC,0xB6,0xB6),
-     o3(0xEC,0xB6,0xB7), o3(0xEC,0xB6,0xB8),
-     o3(0xEC,0xB6,0xB9), o3(0xEC,0xB6,0xBA),
-     o3(0xEC,0xB6,0xBB), o3(0xEC,0xB6,0xBC),
-     o3(0xEC,0xB6,0xBD), o3(0xEC,0xB6,0xBE),
-     o3(0xEC,0xB6,0xBF), o3(0xEC,0xB7,0x80),
-     o3(0xEC,0xB7,0x81), o3(0xEC,0xB7,0x82),
-     o3(0xEC,0xB7,0x83), o3(0xEC,0xB7,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AD = {
-    from_CP949_AD_offsets,
-    from_CP949_AD_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_AE_infos[85] = {
-     o3(0xEC,0xB7,0x86), o3(0xEC,0xB7,0x87),
-     o3(0xEC,0xB7,0x88), o3(0xEC,0xB7,0x89),
-     o3(0xEC,0xB7,0x8A), o3(0xEC,0xB7,0x8B),
-     o3(0xEC,0xB7,0x8D), o3(0xEC,0xB7,0x8E),
-     o3(0xEC,0xB7,0x8F), o3(0xEC,0xB7,0x91),
-     o3(0xEC,0xB7,0x92), o3(0xEC,0xB7,0x93),
-     o3(0xEC,0xB7,0x94), o3(0xEC,0xB7,0x95),
-     o3(0xEC,0xB7,0x96), o3(0xEC,0xB7,0x97),
-     o3(0xEC,0xB7,0x98), o3(0xEC,0xB7,0x99),
-     o3(0xEC,0xB7,0x9A), o3(0xEC,0xB7,0x9B),
-     o3(0xEC,0xB7,0x9C), o3(0xEC,0xB7,0x9D),
-     o3(0xEC,0xB7,0x9E), o3(0xEC,0xB7,0x9F),
-     o3(0xEC,0xB7,0xA0), o3(0xEC,0xB7,0xA1),
-     o3(0xEC,0xB7,0xA2), o3(0xEC,0xB7,0xA3),
-     o3(0xEC,0xB7,0xA4), o3(0xEC,0xB7,0xA5),
-     o3(0xEC,0xB7,0xA6), o3(0xEC,0xB7,0xA7),
-     o3(0xEC,0xB7,0xA9), o3(0xEC,0xB7,0xAA),
-     o3(0xEC,0xB7,0xAB), o3(0xEC,0xB7,0xAD),
-     o3(0xEC,0xB7,0xAE), o3(0xEC,0xB7,0xAF),
-     o3(0xEC,0xB7,0xB1), o3(0xEC,0xB7,0xB2),
-     o3(0xEC,0xB7,0xB3), o3(0xEC,0xB7,0xB4),
-     o3(0xEC,0xB7,0xB5), o3(0xEC,0xB7,0xB6),
-     o3(0xEC,0xB7,0xB7), o3(0xEC,0xB7,0xBA),
-     o3(0xEC,0xB7,0xBC), o3(0xEC,0xB7,0xBE),
-     o3(0xEC,0xB7,0xBF), o3(0xEC,0xB8,0x80),
-     o3(0xEC,0xB8,0x81), o3(0xEC,0xB8,0x82),
-     o3(0xEC,0xB8,0x83), o3(0xEC,0xB8,0x85),
-     o3(0xEC,0xB8,0x86), o3(0xEC,0xB8,0x87),
-     o3(0xEC,0xB8,0x89), o3(0xEC,0xB8,0x8A),
-     o3(0xEC,0xB8,0x8B), o3(0xEC,0xB8,0x8D),
-     o3(0xEC,0xB8,0x8E), o3(0xEC,0xB8,0x8F),
-     o3(0xEC,0xB8,0x90), o3(0xEC,0xB8,0x91),
-     o3(0xEC,0xB8,0x92), o3(0xEC,0xB8,0x93),
-     o3(0xEC,0xB8,0x95), o3(0xEC,0xB8,0x96),
-     o3(0xEC,0xB8,0x97), o3(0xEC,0xB8,0x98),
-     o3(0xEC,0xB8,0x9A), o3(0xEC,0xB8,0x9B),
-     o3(0xEC,0xB8,0x9C), o3(0xEC,0xB8,0x9D),
-     o3(0xEC,0xB8,0x9E), o3(0xEC,0xB8,0x9F),
-     o3(0xEC,0xB8,0xA2), o3(0xEC,0xB8,0xA3),
-     o3(0xEC,0xB8,0xA5), o3(0xEC,0xB8,0xA6),
-     o3(0xEC,0xB8,0xA7), o3(0xEC,0xB8,0xA9),
-     o3(0xEC,0xB8,0xAA), o3(0xEC,0xB8,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AE = {
-    from_CP949_AD_offsets,
-    from_CP949_AE_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_AF_infos[85] = {
-     o3(0xEC,0xB8,0xAC), o3(0xEC,0xB8,0xAD),
-     o3(0xEC,0xB8,0xAE), o3(0xEC,0xB8,0xAF),
-     o3(0xEC,0xB8,0xB2), o3(0xEC,0xB8,0xB4),
-     o3(0xEC,0xB8,0xB6), o3(0xEC,0xB8,0xB7),
-     o3(0xEC,0xB8,0xB8), o3(0xEC,0xB8,0xB9),
-     o3(0xEC,0xB8,0xBA), o3(0xEC,0xB8,0xBB),
-     o3(0xEC,0xB8,0xBC), o3(0xEC,0xB8,0xBD),
-     o3(0xEC,0xB8,0xBE), o3(0xEC,0xB8,0xBF),
-     o3(0xEC,0xB9,0x80), o3(0xEC,0xB9,0x81),
-     o3(0xEC,0xB9,0x82), o3(0xEC,0xB9,0x83),
-     o3(0xEC,0xB9,0x84), o3(0xEC,0xB9,0x85),
-     o3(0xEC,0xB9,0x86), o3(0xEC,0xB9,0x87),
-     o3(0xEC,0xB9,0x88), o3(0xEC,0xB9,0x89),
-     o3(0xEC,0xB9,0x8A), o3(0xEC,0xB9,0x8B),
-     o3(0xEC,0xB9,0x8C), o3(0xEC,0xB9,0x8D),
-     o3(0xEC,0xB9,0x8E), o3(0xEC,0xB9,0x8F),
-     o3(0xEC,0xB9,0x90), o3(0xEC,0xB9,0x91),
-     o3(0xEC,0xB9,0x92), o3(0xEC,0xB9,0x93),
-     o3(0xEC,0xB9,0x94), o3(0xEC,0xB9,0x95),
-     o3(0xEC,0xB9,0x96), o3(0xEC,0xB9,0x97),
-     o3(0xEC,0xB9,0x9A), o3(0xEC,0xB9,0x9B),
-     o3(0xEC,0xB9,0x9D), o3(0xEC,0xB9,0x9E),
-     o3(0xEC,0xB9,0xA2), o3(0xEC,0xB9,0xA3),
-     o3(0xEC,0xB9,0xA4), o3(0xEC,0xB9,0xA5),
-     o3(0xEC,0xB9,0xA6), o3(0xEC,0xB9,0xA7),
-     o3(0xEC,0xB9,0xAA), o3(0xEC,0xB9,0xAC),
-     o3(0xEC,0xB9,0xAE), o3(0xEC,0xB9,0xAF),
-     o3(0xEC,0xB9,0xB0), o3(0xEC,0xB9,0xB1),
-     o3(0xEC,0xB9,0xB2), o3(0xEC,0xB9,0xB3),
-     o3(0xEC,0xB9,0xB6), o3(0xEC,0xB9,0xB7),
-     o3(0xEC,0xB9,0xB9), o3(0xEC,0xB9,0xBA),
-     o3(0xEC,0xB9,0xBB), o3(0xEC,0xB9,0xBD),
-     o3(0xEC,0xB9,0xBE), o3(0xEC,0xB9,0xBF),
-     o3(0xEC,0xBA,0x80), o3(0xEC,0xBA,0x81),
-     o3(0xEC,0xBA,0x82), o3(0xEC,0xBA,0x83),
-     o3(0xEC,0xBA,0x86), o3(0xEC,0xBA,0x88),
-     o3(0xEC,0xBA,0x8A), o3(0xEC,0xBA,0x8B),
-     o3(0xEC,0xBA,0x8C), o3(0xEC,0xBA,0x8D),
-     o3(0xEC,0xBA,0x8E), o3(0xEC,0xBA,0x8F),
-     o3(0xEC,0xBA,0x92), o3(0xEC,0xBA,0x93),
-     o3(0xEC,0xBA,0x95), o3(0xEC,0xBA,0x96),
-     o3(0xEC,0xBA,0x97), o3(0xEC,0xBA,0x99),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_AF = {
-    from_CP949_AD_offsets,
-    from_CP949_AF_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B0_infos[179] = {
-     o3(0xEC,0xBA,0x9A), o3(0xEC,0xBA,0x9B),
-     o3(0xEC,0xBA,0x9C), o3(0xEC,0xBA,0x9D),
-     o3(0xEC,0xBA,0x9E), o3(0xEC,0xBA,0x9F),
-     o3(0xEC,0xBA,0xA2), o3(0xEC,0xBA,0xA6),
-     o3(0xEC,0xBA,0xA7), o3(0xEC,0xBA,0xA8),
-     o3(0xEC,0xBA,0xA9), o3(0xEC,0xBA,0xAA),
-     o3(0xEC,0xBA,0xAB), o3(0xEC,0xBA,0xAE),
-     o3(0xEC,0xBA,0xAF), o3(0xEC,0xBA,0xB0),
-     o3(0xEC,0xBA,0xB1), o3(0xEC,0xBA,0xB2),
-     o3(0xEC,0xBA,0xB3), o3(0xEC,0xBA,0xB4),
-     o3(0xEC,0xBA,0xB5), o3(0xEC,0xBA,0xB6),
-     o3(0xEC,0xBA,0xB7), o3(0xEC,0xBA,0xB8),
-     o3(0xEC,0xBA,0xB9), o3(0xEC,0xBA,0xBA),
-     o3(0xEC,0xBA,0xBB), o3(0xEC,0xBA,0xBC),
-     o3(0xEC,0xBA,0xBD), o3(0xEC,0xBA,0xBE),
-     o3(0xEC,0xBA,0xBF), o3(0xEC,0xBB,0x80),
-     o3(0xEC,0xBB,0x82), o3(0xEC,0xBB,0x83),
-     o3(0xEC,0xBB,0x84), o3(0xEC,0xBB,0x85),
-     o3(0xEC,0xBB,0x86), o3(0xEC,0xBB,0x87),
-     o3(0xEC,0xBB,0x88), o3(0xEC,0xBB,0x89),
-     o3(0xEC,0xBB,0x8A), o3(0xEC,0xBB,0x8B),
-     o3(0xEC,0xBB,0x8C), o3(0xEC,0xBB,0x8D),
-     o3(0xEC,0xBB,0x8E), o3(0xEC,0xBB,0x8F),
-     o3(0xEC,0xBB,0x90), o3(0xEC,0xBB,0x91),
-     o3(0xEC,0xBB,0x92), o3(0xEC,0xBB,0x93),
-     o3(0xEC,0xBB,0x94), o3(0xEC,0xBB,0x95),
-     o3(0xEC,0xBB,0x96), o3(0xEC,0xBB,0x97),
-     o3(0xEC,0xBB,0x98), o3(0xEC,0xBB,0x99),
-     o3(0xEC,0xBB,0x9A), o3(0xEC,0xBB,0x9B),
-     o3(0xEC,0xBB,0x9C), o3(0xEC,0xBB,0x9D),
-     o3(0xEC,0xBB,0x9E), o3(0xEC,0xBB,0x9F),
-     o3(0xEC,0xBB,0xA0), o3(0xEC,0xBB,0xA1),
-     o3(0xEC,0xBB,0xA2), o3(0xEC,0xBB,0xA3),
-     o3(0xEC,0xBB,0xA6), o3(0xEC,0xBB,0xA7),
-     o3(0xEC,0xBB,0xA9), o3(0xEC,0xBB,0xAA),
-     o3(0xEC,0xBB,0xAD), o3(0xEC,0xBB,0xAE),
-     o3(0xEC,0xBB,0xAF), o3(0xEC,0xBB,0xB0),
-     o3(0xEC,0xBB,0xB1), o3(0xEC,0xBB,0xB2),
-     o3(0xEC,0xBB,0xB3), o3(0xEC,0xBB,0xB6),
-     o3(0xEC,0xBB,0xBA), o3(0xEC,0xBB,0xBB),
-     o3(0xEC,0xBB,0xBC), o3(0xEC,0xBB,0xBD),
-     o3(0xEC,0xBB,0xBE), o3(0xEC,0xBB,0xBF),
-     o3(0xEA,0xB0,0x80), o3(0xEA,0xB0,0x81),
-     o3(0xEA,0xB0,0x84), o3(0xEA,0xB0,0x87),
-     o3(0xEA,0xB0,0x88), o3(0xEA,0xB0,0x89),
-     o3(0xEA,0xB0,0x8A), o3(0xEA,0xB0,0x90),
-     o3(0xEA,0xB0,0x91), o3(0xEA,0xB0,0x92),
-     o3(0xEA,0xB0,0x93), o3(0xEA,0xB0,0x94),
-     o3(0xEA,0xB0,0x95), o3(0xEA,0xB0,0x96),
-     o3(0xEA,0xB0,0x97), o3(0xEA,0xB0,0x99),
-     o3(0xEA,0xB0,0x9A), o3(0xEA,0xB0,0x9B),
-     o3(0xEA,0xB0,0x9C), o3(0xEA,0xB0,0x9D),
-     o3(0xEA,0xB0,0xA0), o3(0xEA,0xB0,0xA4),
-     o3(0xEA,0xB0,0xAC), o3(0xEA,0xB0,0xAD),
-     o3(0xEA,0xB0,0xAF), o3(0xEA,0xB0,0xB0),
-     o3(0xEA,0xB0,0xB1), o3(0xEA,0xB0,0xB8),
-     o3(0xEA,0xB0,0xB9), o3(0xEA,0xB0,0xBC),
-     o3(0xEA,0xB1,0x80), o3(0xEA,0xB1,0x8B),
-     o3(0xEA,0xB1,0x8D), o3(0xEA,0xB1,0x94),
-     o3(0xEA,0xB1,0x98), o3(0xEA,0xB1,0x9C),
-     o3(0xEA,0xB1,0xB0), o3(0xEA,0xB1,0xB1),
-     o3(0xEA,0xB1,0xB4), o3(0xEA,0xB1,0xB7),
-     o3(0xEA,0xB1,0xB8), o3(0xEA,0xB1,0xBA),
-     o3(0xEA,0xB2,0x80), o3(0xEA,0xB2,0x81),
-     o3(0xEA,0xB2,0x83), o3(0xEA,0xB2,0x84),
-     o3(0xEA,0xB2,0x85), o3(0xEA,0xB2,0x86),
-     o3(0xEA,0xB2,0x89), o3(0xEA,0xB2,0x8A),
-     o3(0xEA,0xB2,0x8B), o3(0xEA,0xB2,0x8C),
-     o3(0xEA,0xB2,0x90), o3(0xEA,0xB2,0x94),
-     o3(0xEA,0xB2,0x9C), o3(0xEA,0xB2,0x9D),
-     o3(0xEA,0xB2,0x9F), o3(0xEA,0xB2,0xA0),
-     o3(0xEA,0xB2,0xA1), o3(0xEA,0xB2,0xA8),
-     o3(0xEA,0xB2,0xA9), o3(0xEA,0xB2,0xAA),
-     o3(0xEA,0xB2,0xAC), o3(0xEA,0xB2,0xAF),
-     o3(0xEA,0xB2,0xB0), o3(0xEA,0xB2,0xB8),
-     o3(0xEA,0xB2,0xB9), o3(0xEA,0xB2,0xBB),
-     o3(0xEA,0xB2,0xBC), o3(0xEA,0xB2,0xBD),
-     o3(0xEA,0xB3,0x81), o3(0xEA,0xB3,0x84),
-     o3(0xEA,0xB3,0x88), o3(0xEA,0xB3,0x8C),
-     o3(0xEA,0xB3,0x95), o3(0xEA,0xB3,0x97),
-     o3(0xEA,0xB3,0xA0), o3(0xEA,0xB3,0xA1),
-     o3(0xEA,0xB3,0xA4), o3(0xEA,0xB3,0xA7),
-     o3(0xEA,0xB3,0xA8), o3(0xEA,0xB3,0xAA),
-     o3(0xEA,0xB3,0xAC), o3(0xEA,0xB3,0xAF),
-     o3(0xEA,0xB3,0xB0), o3(0xEA,0xB3,0xB1),
-     o3(0xEA,0xB3,0xB3), o3(0xEA,0xB3,0xB5),
-     o3(0xEA,0xB3,0xB6), o3(0xEA,0xB3,0xBC),
-     o3(0xEA,0xB3,0xBD), o3(0xEA,0xB4,0x80),
-     o3(0xEA,0xB4,0x84), o3(0xEA,0xB4,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B0 = {
-    from_CP949_81_offsets,
-    from_CP949_B0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B1_infos[179] = {
-     o3(0xEC,0xBC,0x82), o3(0xEC,0xBC,0x83),
-     o3(0xEC,0xBC,0x85), o3(0xEC,0xBC,0x86),
-     o3(0xEC,0xBC,0x87), o3(0xEC,0xBC,0x89),
-     o3(0xEC,0xBC,0x8A), o3(0xEC,0xBC,0x8B),
-     o3(0xEC,0xBC,0x8C), o3(0xEC,0xBC,0x8D),
-     o3(0xEC,0xBC,0x8E), o3(0xEC,0xBC,0x8F),
-     o3(0xEC,0xBC,0x92), o3(0xEC,0xBC,0x94),
-     o3(0xEC,0xBC,0x96), o3(0xEC,0xBC,0x97),
-     o3(0xEC,0xBC,0x98), o3(0xEC,0xBC,0x99),
-     o3(0xEC,0xBC,0x9A), o3(0xEC,0xBC,0x9B),
-     o3(0xEC,0xBC,0x9D), o3(0xEC,0xBC,0x9E),
-     o3(0xEC,0xBC,0x9F), o3(0xEC,0xBC,0xA1),
-     o3(0xEC,0xBC,0xA2), o3(0xEC,0xBC,0xA3),
-     o3(0xEC,0xBC,0xA5), o3(0xEC,0xBC,0xA6),
-     o3(0xEC,0xBC,0xA7), o3(0xEC,0xBC,0xA8),
-     o3(0xEC,0xBC,0xA9), o3(0xEC,0xBC,0xAA),
-     o3(0xEC,0xBC,0xAB), o3(0xEC,0xBC,0xAE),
-     o3(0xEC,0xBC,0xB2), o3(0xEC,0xBC,0xB3),
-     o3(0xEC,0xBC,0xB4), o3(0xEC,0xBC,0xB5),
-     o3(0xEC,0xBC,0xB6), o3(0xEC,0xBC,0xB7),
-     o3(0xEC,0xBC,0xB9), o3(0xEC,0xBC,0xBA),
-     o3(0xEC,0xBC,0xBB), o3(0xEC,0xBC,0xBC),
-     o3(0xEC,0xBC,0xBD), o3(0xEC,0xBC,0xBE),
-     o3(0xEC,0xBC,0xBF), o3(0xEC,0xBD,0x80),
-     o3(0xEC,0xBD,0x81), o3(0xEC,0xBD,0x82),
-     o3(0xEC,0xBD,0x83), o3(0xEC,0xBD,0x84),
-     o3(0xEC,0xBD,0x85), o3(0xEC,0xBD,0x86),
-     o3(0xEC,0xBD,0x87), o3(0xEC,0xBD,0x88),
-     o3(0xEC,0xBD,0x89), o3(0xEC,0xBD,0x8A),
-     o3(0xEC,0xBD,0x8B), o3(0xEC,0xBD,0x8C),
-     o3(0xEC,0xBD,0x8D), o3(0xEC,0xBD,0x8E),
-     o3(0xEC,0xBD,0x8F), o3(0xEC,0xBD,0x90),
-     o3(0xEC,0xBD,0x91), o3(0xEC,0xBD,0x92),
-     o3(0xEC,0xBD,0x93), o3(0xEC,0xBD,0x96),
-     o3(0xEC,0xBD,0x97), o3(0xEC,0xBD,0x99),
-     o3(0xEC,0xBD,0x9A), o3(0xEC,0xBD,0x9B),
-     o3(0xEC,0xBD,0x9D), o3(0xEC,0xBD,0x9E),
-     o3(0xEC,0xBD,0x9F), o3(0xEC,0xBD,0xA0),
-     o3(0xEC,0xBD,0xA1), o3(0xEC,0xBD,0xA2),
-     o3(0xEC,0xBD,0xA3), o3(0xEC,0xBD,0xA6),
-     o3(0xEC,0xBD,0xA8), o3(0xEC,0xBD,0xAA),
-     o3(0xEC,0xBD,0xAB), o3(0xEC,0xBD,0xAC),
-     o3(0xEA,0xB4,0x8C), o3(0xEA,0xB4,0x8D),
-     o3(0xEA,0xB4,0x8F), o3(0xEA,0xB4,0x91),
-     o3(0xEA,0xB4,0x98), o3(0xEA,0xB4,0x9C),
-     o3(0xEA,0xB4,0xA0), o3(0xEA,0xB4,0xA9),
-     o3(0xEA,0xB4,0xAC), o3(0xEA,0xB4,0xAD),
-     o3(0xEA,0xB4,0xB4), o3(0xEA,0xB4,0xB5),
-     o3(0xEA,0xB4,0xB8), o3(0xEA,0xB4,0xBC),
-     o3(0xEA,0xB5,0x84), o3(0xEA,0xB5,0x85),
-     o3(0xEA,0xB5,0x87), o3(0xEA,0xB5,0x89),
-     o3(0xEA,0xB5,0x90), o3(0xEA,0xB5,0x94),
-     o3(0xEA,0xB5,0x98), o3(0xEA,0xB5,0xA1),
-     o3(0xEA,0xB5,0xA3), o3(0xEA,0xB5,0xAC),
-     o3(0xEA,0xB5,0xAD), o3(0xEA,0xB5,0xB0),
-     o3(0xEA,0xB5,0xB3), o3(0xEA,0xB5,0xB4),
-     o3(0xEA,0xB5,0xB5), o3(0xEA,0xB5,0xB6),
-     o3(0xEA,0xB5,0xBB), o3(0xEA,0xB5,0xBC),
-     o3(0xEA,0xB5,0xBD), o3(0xEA,0xB5,0xBF),
-     o3(0xEA,0xB6,0x81), o3(0xEA,0xB6,0x82),
-     o3(0xEA,0xB6,0x88), o3(0xEA,0xB6,0x89),
-     o3(0xEA,0xB6,0x8C), o3(0xEA,0xB6,0x90),
-     o3(0xEA,0xB6,0x9C), o3(0xEA,0xB6,0x9D),
-     o3(0xEA,0xB6,0xA4), o3(0xEA,0xB6,0xB7),
-     o3(0xEA,0xB7,0x80), o3(0xEA,0xB7,0x81),
-     o3(0xEA,0xB7,0x84), o3(0xEA,0xB7,0x88),
-     o3(0xEA,0xB7,0x90), o3(0xEA,0xB7,0x91),
-     o3(0xEA,0xB7,0x93), o3(0xEA,0xB7,0x9C),
-     o3(0xEA,0xB7,0xA0), o3(0xEA,0xB7,0xA4),
-     o3(0xEA,0xB7,0xB8), o3(0xEA,0xB7,0xB9),
-     o3(0xEA,0xB7,0xBC), o3(0xEA,0xB7,0xBF),
-     o3(0xEA,0xB8,0x80), o3(0xEA,0xB8,0x81),
-     o3(0xEA,0xB8,0x88), o3(0xEA,0xB8,0x89),
-     o3(0xEA,0xB8,0x8B), o3(0xEA,0xB8,0x8D),
-     o3(0xEA,0xB8,0x94), o3(0xEA,0xB8,0xB0),
-     o3(0xEA,0xB8,0xB1), o3(0xEA,0xB8,0xB4),
-     o3(0xEA,0xB8,0xB7), o3(0xEA,0xB8,0xB8),
-     o3(0xEA,0xB8,0xBA), o3(0xEA,0xB9,0x80),
-     o3(0xEA,0xB9,0x81), o3(0xEA,0xB9,0x83),
-     o3(0xEA,0xB9,0x85), o3(0xEA,0xB9,0x86),
-     o3(0xEA,0xB9,0x8A), o3(0xEA,0xB9,0x8C),
-     o3(0xEA,0xB9,0x8D), o3(0xEA,0xB9,0x8E),
-     o3(0xEA,0xB9,0x90), o3(0xEA,0xB9,0x94),
-     o3(0xEA,0xB9,0x96), o3(0xEA,0xB9,0x9C),
-     o3(0xEA,0xB9,0x9D), o3(0xEA,0xB9,0x9F),
-     o3(0xEA,0xB9,0xA0), o3(0xEA,0xB9,0xA1),
-     o3(0xEA,0xB9,0xA5), o3(0xEA,0xB9,0xA8),
-     o3(0xEA,0xB9,0xA9), o3(0xEA,0xB9,0xAC),
-     o3(0xEA,0xB9,0xB0), o3(0xEA,0xB9,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B1 = {
-    from_CP949_81_offsets,
-    from_CP949_B1_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B2_infos[179] = {
-     o3(0xEC,0xBD,0xAD), o3(0xEC,0xBD,0xAE),
-     o3(0xEC,0xBD,0xAF), o3(0xEC,0xBD,0xB2),
-     o3(0xEC,0xBD,0xB3), o3(0xEC,0xBD,0xB5),
-     o3(0xEC,0xBD,0xB6), o3(0xEC,0xBD,0xB7),
-     o3(0xEC,0xBD,0xB9), o3(0xEC,0xBD,0xBA),
-     o3(0xEC,0xBD,0xBB), o3(0xEC,0xBD,0xBC),
-     o3(0xEC,0xBD,0xBD), o3(0xEC,0xBD,0xBE),
-     o3(0xEC,0xBD,0xBF), o3(0xEC,0xBE,0x81),
-     o3(0xEC,0xBE,0x82), o3(0xEC,0xBE,0x83),
-     o3(0xEC,0xBE,0x84), o3(0xEC,0xBE,0x86),
-     o3(0xEC,0xBE,0x87), o3(0xEC,0xBE,0x88),
-     o3(0xEC,0xBE,0x89), o3(0xEC,0xBE,0x8A),
-     o3(0xEC,0xBE,0x8B), o3(0xEC,0xBE,0x8D),
-     o3(0xEC,0xBE,0x8E), o3(0xEC,0xBE,0x8F),
-     o3(0xEC,0xBE,0x90), o3(0xEC,0xBE,0x91),
-     o3(0xEC,0xBE,0x92), o3(0xEC,0xBE,0x93),
-     o3(0xEC,0xBE,0x94), o3(0xEC,0xBE,0x95),
-     o3(0xEC,0xBE,0x96), o3(0xEC,0xBE,0x97),
-     o3(0xEC,0xBE,0x98), o3(0xEC,0xBE,0x99),
-     o3(0xEC,0xBE,0x9A), o3(0xEC,0xBE,0x9B),
-     o3(0xEC,0xBE,0x9C), o3(0xEC,0xBE,0x9D),
-     o3(0xEC,0xBE,0x9E), o3(0xEC,0xBE,0x9F),
-     o3(0xEC,0xBE,0xA0), o3(0xEC,0xBE,0xA2),
-     o3(0xEC,0xBE,0xA3), o3(0xEC,0xBE,0xA4),
-     o3(0xEC,0xBE,0xA5), o3(0xEC,0xBE,0xA6),
-     o3(0xEC,0xBE,0xA7), o3(0xEC,0xBE,0xA9),
-     o3(0xEC,0xBE,0xAA), o3(0xEC,0xBE,0xAB),
-     o3(0xEC,0xBE,0xAC), o3(0xEC,0xBE,0xAD),
-     o3(0xEC,0xBE,0xAE), o3(0xEC,0xBE,0xAF),
-     o3(0xEC,0xBE,0xB1), o3(0xEC,0xBE,0xB2),
-     o3(0xEC,0xBE,0xB3), o3(0xEC,0xBE,0xB4),
-     o3(0xEC,0xBE,0xB5), o3(0xEC,0xBE,0xB6),
-     o3(0xEC,0xBE,0xB7), o3(0xEC,0xBE,0xB8),
-     o3(0xEC,0xBE,0xB9), o3(0xEC,0xBE,0xBA),
-     o3(0xEC,0xBE,0xBB), o3(0xEC,0xBE,0xBC),
-     o3(0xEC,0xBE,0xBD), o3(0xEC,0xBE,0xBE),
-     o3(0xEC,0xBE,0xBF), o3(0xEC,0xBF,0x80),
-     o3(0xEC,0xBF,0x81), o3(0xEC,0xBF,0x82),
-     o3(0xEC,0xBF,0x83), o3(0xEC,0xBF,0x85),
-     o3(0xEC,0xBF,0x86), o3(0xEC,0xBF,0x87),
-     o3(0xEC,0xBF,0x88), o3(0xEC,0xBF,0x89),
-     o3(0xEC,0xBF,0x8A), o3(0xEC,0xBF,0x8B),
-     o3(0xEA,0xB9,0xB9), o3(0xEA,0xB9,0xBB),
-     o3(0xEA,0xB9,0xBC), o3(0xEA,0xB9,0xBD),
-     o3(0xEA,0xBA,0x84), o3(0xEA,0xBA,0x85),
-     o3(0xEA,0xBA,0x8C), o3(0xEA,0xBA,0xBC),
-     o3(0xEA,0xBA,0xBD), o3(0xEA,0xBA,0xBE),
-     o3(0xEA,0xBB,0x80), o3(0xEA,0xBB,0x84),
-     o3(0xEA,0xBB,0x8C), o3(0xEA,0xBB,0x8D),
-     o3(0xEA,0xBB,0x8F), o3(0xEA,0xBB,0x90),
-     o3(0xEA,0xBB,0x91), o3(0xEA,0xBB,0x98),
-     o3(0xEA,0xBB,0x99), o3(0xEA,0xBB,0x9C),
-     o3(0xEA,0xBB,0xA8), o3(0xEA,0xBB,0xAB),
-     o3(0xEA,0xBB,0xAD), o3(0xEA,0xBB,0xB4),
-     o3(0xEA,0xBB,0xB8), o3(0xEA,0xBB,0xBC),
-     o3(0xEA,0xBC,0x87), o3(0xEA,0xBC,0x88),
-     o3(0xEA,0xBC,0x8D), o3(0xEA,0xBC,0x90),
-     o3(0xEA,0xBC,0xAC), o3(0xEA,0xBC,0xAD),
-     o3(0xEA,0xBC,0xB0), o3(0xEA,0xBC,0xB2),
-     o3(0xEA,0xBC,0xB4), o3(0xEA,0xBC,0xBC),
-     o3(0xEA,0xBC,0xBD), o3(0xEA,0xBC,0xBF),
-     o3(0xEA,0xBD,0x81), o3(0xEA,0xBD,0x82),
-     o3(0xEA,0xBD,0x83), o3(0xEA,0xBD,0x88),
-     o3(0xEA,0xBD,0x89), o3(0xEA,0xBD,0x90),
-     o3(0xEA,0xBD,0x9C), o3(0xEA,0xBD,0x9D),
-     o3(0xEA,0xBD,0xA4), o3(0xEA,0xBD,0xA5),
-     o3(0xEA,0xBD,0xB9), o3(0xEA,0xBE,0x80),
-     o3(0xEA,0xBE,0x84), o3(0xEA,0xBE,0x88),
-     o3(0xEA,0xBE,0x90), o3(0xEA,0xBE,0x91),
-     o3(0xEA,0xBE,0x95), o3(0xEA,0xBE,0x9C),
-     o3(0xEA,0xBE,0xB8), o3(0xEA,0xBE,0xB9),
-     o3(0xEA,0xBE,0xBC), o3(0xEA,0xBF,0x80),
-     o3(0xEA,0xBF,0x87), o3(0xEA,0xBF,0x88),
-     o3(0xEA,0xBF,0x89), o3(0xEA,0xBF,0x8B),
-     o3(0xEA,0xBF,0x8D), o3(0xEA,0xBF,0x8E),
-     o3(0xEA,0xBF,0x94), o3(0xEA,0xBF,0x9C),
-     o3(0xEA,0xBF,0xA8), o3(0xEA,0xBF,0xA9),
-     o3(0xEA,0xBF,0xB0), o3(0xEA,0xBF,0xB1),
-     o3(0xEA,0xBF,0xB4), o3(0xEA,0xBF,0xB8),
-     o3(0xEB,0x80,0x80), o3(0xEB,0x80,0x81),
-     o3(0xEB,0x80,0x84), o3(0xEB,0x80,0x8C),
-     o3(0xEB,0x80,0x90), o3(0xEB,0x80,0x94),
-     o3(0xEB,0x80,0x9C), o3(0xEB,0x80,0x9D),
-     o3(0xEB,0x80,0xA8), o3(0xEB,0x81,0x84),
-     o3(0xEB,0x81,0x85), o3(0xEB,0x81,0x88),
-     o3(0xEB,0x81,0x8A), o3(0xEB,0x81,0x8C),
-     o3(0xEB,0x81,0x8E), o3(0xEB,0x81,0x93),
-     o3(0xEB,0x81,0x94), o3(0xEB,0x81,0x95),
-     o3(0xEB,0x81,0x97), o3(0xEB,0x81,0x99),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B2 = {
-    from_CP949_81_offsets,
-    from_CP949_B2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B3_infos[179] = {
-     o3(0xEC,0xBF,0x8C), o3(0xEC,0xBF,0x8D),
-     o3(0xEC,0xBF,0x8E), o3(0xEC,0xBF,0x8F),
-     o3(0xEC,0xBF,0x90), o3(0xEC,0xBF,0x91),
-     o3(0xEC,0xBF,0x92), o3(0xEC,0xBF,0x93),
-     o3(0xEC,0xBF,0x94), o3(0xEC,0xBF,0x95),
-     o3(0xEC,0xBF,0x96), o3(0xEC,0xBF,0x97),
-     o3(0xEC,0xBF,0x98), o3(0xEC,0xBF,0x99),
-     o3(0xEC,0xBF,0x9A), o3(0xEC,0xBF,0x9B),
-     o3(0xEC,0xBF,0x9C), o3(0xEC,0xBF,0x9D),
-     o3(0xEC,0xBF,0x9E), o3(0xEC,0xBF,0x9F),
-     o3(0xEC,0xBF,0xA2), o3(0xEC,0xBF,0xA3),
-     o3(0xEC,0xBF,0xA5), o3(0xEC,0xBF,0xA6),
-     o3(0xEC,0xBF,0xA7), o3(0xEC,0xBF,0xA9),
-     o3(0xEC,0xBF,0xAA), o3(0xEC,0xBF,0xAB),
-     o3(0xEC,0xBF,0xAC), o3(0xEC,0xBF,0xAD),
-     o3(0xEC,0xBF,0xAE), o3(0xEC,0xBF,0xAF),
-     o3(0xEC,0xBF,0xB2), o3(0xEC,0xBF,0xB4),
-     o3(0xEC,0xBF,0xB6), o3(0xEC,0xBF,0xB7),
-     o3(0xEC,0xBF,0xB8), o3(0xEC,0xBF,0xB9),
-     o3(0xEC,0xBF,0xBA), o3(0xEC,0xBF,0xBB),
-     o3(0xEC,0xBF,0xBD), o3(0xEC,0xBF,0xBE),
-     o3(0xEC,0xBF,0xBF), o3(0xED,0x80,0x81),
-     o3(0xED,0x80,0x82), o3(0xED,0x80,0x83),
-     o3(0xED,0x80,0x85), o3(0xED,0x80,0x86),
-     o3(0xED,0x80,0x87), o3(0xED,0x80,0x88),
-     o3(0xED,0x80,0x89), o3(0xED,0x80,0x8A),
-     o3(0xED,0x80,0x8B), o3(0xED,0x80,0x8C),
-     o3(0xED,0x80,0x8D), o3(0xED,0x80,0x8E),
-     o3(0xED,0x80,0x8F), o3(0xED,0x80,0x90),
-     o3(0xED,0x80,0x92), o3(0xED,0x80,0x93),
-     o3(0xED,0x80,0x94), o3(0xED,0x80,0x95),
-     o3(0xED,0x80,0x96), o3(0xED,0x80,0x97),
-     o3(0xED,0x80,0x99), o3(0xED,0x80,0x9A),
-     o3(0xED,0x80,0x9B), o3(0xED,0x80,0x9C),
-     o3(0xED,0x80,0x9D), o3(0xED,0x80,0x9E),
-     o3(0xED,0x80,0x9F), o3(0xED,0x80,0xA0),
-     o3(0xED,0x80,0xA1), o3(0xED,0x80,0xA2),
-     o3(0xED,0x80,0xA3), o3(0xED,0x80,0xA4),
-     o3(0xED,0x80,0xA5), o3(0xED,0x80,0xA6),
-     o3(0xED,0x80,0xA7), o3(0xED,0x80,0xA8),
-     o3(0xED,0x80,0xA9), o3(0xED,0x80,0xAA),
-     o3(0xED,0x80,0xAB), o3(0xED,0x80,0xAC),
-     o3(0xEB,0x81,0x9D), o3(0xEB,0x81,0xBC),
-     o3(0xEB,0x81,0xBD), o3(0xEB,0x82,0x80),
-     o3(0xEB,0x82,0x84), o3(0xEB,0x82,0x8C),
-     o3(0xEB,0x82,0x8D), o3(0xEB,0x82,0x8F),
-     o3(0xEB,0x82,0x91), o3(0xEB,0x82,0x98),
-     o3(0xEB,0x82,0x99), o3(0xEB,0x82,0x9A),
-     o3(0xEB,0x82,0x9C), o3(0xEB,0x82,0x9F),
-     o3(0xEB,0x82,0xA0), o3(0xEB,0x82,0xA1),
-     o3(0xEB,0x82,0xA2), o3(0xEB,0x82,0xA8),
-     o3(0xEB,0x82,0xA9), o3(0xEB,0x82,0xAB),
-     o3(0xEB,0x82,0xAC), o3(0xEB,0x82,0xAD),
-     o3(0xEB,0x82,0xAE), o3(0xEB,0x82,0xAF),
-     o3(0xEB,0x82,0xB1), o3(0xEB,0x82,0xB3),
-     o3(0xEB,0x82,0xB4), o3(0xEB,0x82,0xB5),
-     o3(0xEB,0x82,0xB8), o3(0xEB,0x82,0xBC),
-     o3(0xEB,0x83,0x84), o3(0xEB,0x83,0x85),
-     o3(0xEB,0x83,0x87), o3(0xEB,0x83,0x88),
-     o3(0xEB,0x83,0x89), o3(0xEB,0x83,0x90),
-     o3(0xEB,0x83,0x91), o3(0xEB,0x83,0x94),
-     o3(0xEB,0x83,0x98), o3(0xEB,0x83,0xA0),
-     o3(0xEB,0x83,0xA5), o3(0xEB,0x84,0x88),
-     o3(0xEB,0x84,0x89), o3(0xEB,0x84,0x8B),
-     o3(0xEB,0x84,0x8C), o3(0xEB,0x84,0x90),
-     o3(0xEB,0x84,0x92), o3(0xEB,0x84,0x93),
-     o3(0xEB,0x84,0x98), o3(0xEB,0x84,0x99),
-     o3(0xEB,0x84,0x9B), o3(0xEB,0x84,0x9C),
-     o3(0xEB,0x84,0x9D), o3(0xEB,0x84,0xA3),
-     o3(0xEB,0x84,0xA4), o3(0xEB,0x84,0xA5),
-     o3(0xEB,0x84,0xA8), o3(0xEB,0x84,0xAC),
-     o3(0xEB,0x84,0xB4), o3(0xEB,0x84,0xB5),
-     o3(0xEB,0x84,0xB7), o3(0xEB,0x84,0xB8),
-     o3(0xEB,0x84,0xB9), o3(0xEB,0x85,0x80),
-     o3(0xEB,0x85,0x81), o3(0xEB,0x85,0x84),
-     o3(0xEB,0x85,0x88), o3(0xEB,0x85,0x90),
-     o3(0xEB,0x85,0x91), o3(0xEB,0x85,0x94),
-     o3(0xEB,0x85,0x95), o3(0xEB,0x85,0x98),
-     o3(0xEB,0x85,0x9C), o3(0xEB,0x85,0xA0),
-     o3(0xEB,0x85,0xB8), o3(0xEB,0x85,0xB9),
-     o3(0xEB,0x85,0xBC), o3(0xEB,0x86,0x80),
-     o3(0xEB,0x86,0x82), o3(0xEB,0x86,0x88),
-     o3(0xEB,0x86,0x89), o3(0xEB,0x86,0x8B),
-     o3(0xEB,0x86,0x8D), o3(0xEB,0x86,0x92),
-     o3(0xEB,0x86,0x93), o3(0xEB,0x86,0x94),
-     o3(0xEB,0x86,0x98), o3(0xEB,0x86,0x9C),
-     o3(0xEB,0x86,0xA8), o3(0xEB,0x87,0x8C),
-     o3(0xEB,0x87,0x90), o3(0xEB,0x87,0x94),
-     o3(0xEB,0x87,0x9C), o3(0xEB,0x87,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B3 = {
-    from_CP949_81_offsets,
-    from_CP949_B3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B4_infos[179] = {
-     o3(0xED,0x80,0xAE), o3(0xED,0x80,0xAF),
-     o3(0xED,0x80,0xB0), o3(0xED,0x80,0xB1),
-     o3(0xED,0x80,0xB2), o3(0xED,0x80,0xB3),
-     o3(0xED,0x80,0xB6), o3(0xED,0x80,0xB7),
-     o3(0xED,0x80,0xB9), o3(0xED,0x80,0xBA),
-     o3(0xED,0x80,0xBB), o3(0xED,0x80,0xBD),
-     o3(0xED,0x80,0xBE), o3(0xED,0x80,0xBF),
-     o3(0xED,0x81,0x80), o3(0xED,0x81,0x81),
-     o3(0xED,0x81,0x82), o3(0xED,0x81,0x83),
-     o3(0xED,0x81,0x86), o3(0xED,0x81,0x88),
-     o3(0xED,0x81,0x8A), o3(0xED,0x81,0x8B),
-     o3(0xED,0x81,0x8C), o3(0xED,0x81,0x8D),
-     o3(0xED,0x81,0x8E), o3(0xED,0x81,0x8F),
-     o3(0xED,0x81,0x91), o3(0xED,0x81,0x92),
-     o3(0xED,0x81,0x93), o3(0xED,0x81,0x95),
-     o3(0xED,0x81,0x96), o3(0xED,0x81,0x97),
-     o3(0xED,0x81,0x99), o3(0xED,0x81,0x9A),
-     o3(0xED,0x81,0x9B), o3(0xED,0x81,0x9C),
-     o3(0xED,0x81,0x9D), o3(0xED,0x81,0x9E),
-     o3(0xED,0x81,0x9F), o3(0xED,0x81,0xA1),
-     o3(0xED,0x81,0xA2), o3(0xED,0x81,0xA3),
-     o3(0xED,0x81,0xA4), o3(0xED,0x81,0xA5),
-     o3(0xED,0x81,0xA6), o3(0xED,0x81,0xA7),
-     o3(0xED,0x81,0xA8), o3(0xED,0x81,0xA9),
-     o3(0xED,0x81,0xAA), o3(0xED,0x81,0xAB),
-     o3(0xED,0x81,0xAE), o3(0xED,0x81,0xAF),
-     o3(0xED,0x81,0xB1), o3(0xED,0x81,0xB2),
-     o3(0xED,0x81,0xB3), o3(0xED,0x81,0xB5),
-     o3(0xED,0x81,0xB6), o3(0xED,0x81,0xB7),
-     o3(0xED,0x81,0xB8), o3(0xED,0x81,0xB9),
-     o3(0xED,0x81,0xBA), o3(0xED,0x81,0xBB),
-     o3(0xED,0x81,0xBE), o3(0xED,0x81,0xBF),
-     o3(0xED,0x82,0x80), o3(0xED,0x82,0x82),
-     o3(0xED,0x82,0x83), o3(0xED,0x82,0x84),
-     o3(0xED,0x82,0x85), o3(0xED,0x82,0x86),
-     o3(0xED,0x82,0x87), o3(0xED,0x82,0x88),
-     o3(0xED,0x82,0x89), o3(0xED,0x82,0x8A),
-     o3(0xED,0x82,0x8B), o3(0xED,0x82,0x8C),
-     o3(0xED,0x82,0x8D), o3(0xED,0x82,0x8E),
-     o3(0xED,0x82,0x8F), o3(0xED,0x82,0x90),
-     o3(0xED,0x82,0x91), o3(0xED,0x82,0x92),
-     o3(0xED,0x82,0x93), o3(0xED,0x82,0x94),
-     o3(0xEB,0x87,0x9F), o3(0xEB,0x87,0xA8),
-     o3(0xEB,0x87,0xA9), o3(0xEB,0x87,0xAC),
-     o3(0xEB,0x87,0xB0), o3(0xEB,0x87,0xB9),
-     o3(0xEB,0x87,0xBB), o3(0xEB,0x87,0xBD),
-     o3(0xEB,0x88,0x84), o3(0xEB,0x88,0x85),
-     o3(0xEB,0x88,0x88), o3(0xEB,0x88,0x8B),
-     o3(0xEB,0x88,0x8C), o3(0xEB,0x88,0x94),
-     o3(0xEB,0x88,0x95), o3(0xEB,0x88,0x97),
-     o3(0xEB,0x88,0x99), o3(0xEB,0x88,0xA0),
-     o3(0xEB,0x88,0xB4), o3(0xEB,0x88,0xBC),
-     o3(0xEB,0x89,0x98), o3(0xEB,0x89,0x9C),
-     o3(0xEB,0x89,0xA0), o3(0xEB,0x89,0xA8),
-     o3(0xEB,0x89,0xA9), o3(0xEB,0x89,0xB4),
-     o3(0xEB,0x89,0xB5), o3(0xEB,0x89,0xBC),
-     o3(0xEB,0x8A,0x84), o3(0xEB,0x8A,0x85),
-     o3(0xEB,0x8A,0x89), o3(0xEB,0x8A,0x90),
-     o3(0xEB,0x8A,0x91), o3(0xEB,0x8A,0x94),
-     o3(0xEB,0x8A,0x98), o3(0xEB,0x8A,0x99),
-     o3(0xEB,0x8A,0x9A), o3(0xEB,0x8A,0xA0),
-     o3(0xEB,0x8A,0xA1), o3(0xEB,0x8A,0xA3),
-     o3(0xEB,0x8A,0xA5), o3(0xEB,0x8A,0xA6),
-     o3(0xEB,0x8A,0xAA), o3(0xEB,0x8A,0xAC),
-     o3(0xEB,0x8A,0xB0), o3(0xEB,0x8A,0xB4),
-     o3(0xEB,0x8B,0x88), o3(0xEB,0x8B,0x89),
-     o3(0xEB,0x8B,0x8C), o3(0xEB,0x8B,0x90),
-     o3(0xEB,0x8B,0x92), o3(0xEB,0x8B,0x98),
-     o3(0xEB,0x8B,0x99), o3(0xEB,0x8B,0x9B),
-     o3(0xEB,0x8B,0x9D), o3(0xEB,0x8B,0xA2),
-     o3(0xEB,0x8B,0xA4), o3(0xEB,0x8B,0xA5),
-     o3(0xEB,0x8B,0xA6), o3(0xEB,0x8B,0xA8),
-     o3(0xEB,0x8B,0xAB), o3(0xEB,0x8B,0xAC),
-     o3(0xEB,0x8B,0xAD), o3(0xEB,0x8B,0xAE),
-     o3(0xEB,0x8B,0xAF), o3(0xEB,0x8B,0xB3),
-     o3(0xEB,0x8B,0xB4), o3(0xEB,0x8B,0xB5),
-     o3(0xEB,0x8B,0xB7), o3(0xEB,0x8B,0xB8),
-     o3(0xEB,0x8B,0xB9), o3(0xEB,0x8B,0xBA),
-     o3(0xEB,0x8B,0xBB), o3(0xEB,0x8B,0xBF),
-     o3(0xEB,0x8C,0x80), o3(0xEB,0x8C,0x81),
-     o3(0xEB,0x8C,0x84), o3(0xEB,0x8C,0x88),
-     o3(0xEB,0x8C,0x90), o3(0xEB,0x8C,0x91),
-     o3(0xEB,0x8C,0x93), o3(0xEB,0x8C,0x94),
-     o3(0xEB,0x8C,0x95), o3(0xEB,0x8C,0x9C),
-     o3(0xEB,0x8D,0x94), o3(0xEB,0x8D,0x95),
-     o3(0xEB,0x8D,0x96), o3(0xEB,0x8D,0x98),
-     o3(0xEB,0x8D,0x9B), o3(0xEB,0x8D,0x9C),
-     o3(0xEB,0x8D,0x9E), o3(0xEB,0x8D,0x9F),
-     o3(0xEB,0x8D,0xA4), o3(0xEB,0x8D,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B4 = {
-    from_CP949_81_offsets,
-    from_CP949_B4_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B5_infos[179] = {
-     o3(0xED,0x82,0x95), o3(0xED,0x82,0x96),
-     o3(0xED,0x82,0x97), o3(0xED,0x82,0x98),
-     o3(0xED,0x82,0x99), o3(0xED,0x82,0x9A),
-     o3(0xED,0x82,0x9B), o3(0xED,0x82,0x9C),
-     o3(0xED,0x82,0x9D), o3(0xED,0x82,0x9E),
-     o3(0xED,0x82,0x9F), o3(0xED,0x82,0xA0),
-     o3(0xED,0x82,0xA1), o3(0xED,0x82,0xA2),
-     o3(0xED,0x82,0xA3), o3(0xED,0x82,0xA6),
-     o3(0xED,0x82,0xA7), o3(0xED,0x82,0xA9),
-     o3(0xED,0x82,0xAA), o3(0xED,0x82,0xAB),
-     o3(0xED,0x82,0xAD), o3(0xED,0x82,0xAE),
-     o3(0xED,0x82,0xAF), o3(0xED,0x82,0xB0),
-     o3(0xED,0x82,0xB1), o3(0xED,0x82,0xB2),
-     o3(0xED,0x82,0xB3), o3(0xED,0x82,0xB6),
-     o3(0xED,0x82,0xB8), o3(0xED,0x82,0xBA),
-     o3(0xED,0x82,0xBB), o3(0xED,0x82,0xBC),
-     o3(0xED,0x82,0xBD), o3(0xED,0x82,0xBE),
-     o3(0xED,0x82,0xBF), o3(0xED,0x83,0x82),
-     o3(0xED,0x83,0x83), o3(0xED,0x83,0x85),
-     o3(0xED,0x83,0x86), o3(0xED,0x83,0x87),
-     o3(0xED,0x83,0x8A), o3(0xED,0x83,0x8B),
-     o3(0xED,0x83,0x8C), o3(0xED,0x83,0x8D),
-     o3(0xED,0x83,0x8E), o3(0xED,0x83,0x8F),
-     o3(0xED,0x83,0x92), o3(0xED,0x83,0x96),
-     o3(0xED,0x83,0x97), o3(0xED,0x83,0x98),
-     o3(0xED,0x83,0x99), o3(0xED,0x83,0x9A),
-     o3(0xED,0x83,0x9B), o3(0xED,0x83,0x9E),
-     o3(0xED,0x83,0x9F), o3(0xED,0x83,0xA1),
-     o3(0xED,0x83,0xA2), o3(0xED,0x83,0xA3),
-     o3(0xED,0x83,0xA5), o3(0xED,0x83,0xA6),
-     o3(0xED,0x83,0xA7), o3(0xED,0x83,0xA8),
-     o3(0xED,0x83,0xA9), o3(0xED,0x83,0xAA),
-     o3(0xED,0x83,0xAB), o3(0xED,0x83,0xAE),
-     o3(0xED,0x83,0xB2), o3(0xED,0x83,0xB3),
-     o3(0xED,0x83,0xB4), o3(0xED,0x83,0xB5),
-     o3(0xED,0x83,0xB6), o3(0xED,0x83,0xB7),
-     o3(0xED,0x83,0xB9), o3(0xED,0x83,0xBA),
-     o3(0xED,0x83,0xBB), o3(0xED,0x83,0xBC),
-     o3(0xED,0x83,0xBD), o3(0xED,0x83,0xBE),
-     o3(0xED,0x83,0xBF), o3(0xED,0x84,0x80),
-     o3(0xED,0x84,0x81), o3(0xED,0x84,0x82),
-     o3(0xED,0x84,0x83), o3(0xED,0x84,0x84),
-     o3(0xEB,0x8D,0xA7), o3(0xEB,0x8D,0xA9),
-     o3(0xEB,0x8D,0xAB), o3(0xEB,0x8D,0xAE),
-     o3(0xEB,0x8D,0xB0), o3(0xEB,0x8D,0xB1),
-     o3(0xEB,0x8D,0xB4), o3(0xEB,0x8D,0xB8),
-     o3(0xEB,0x8E,0x80), o3(0xEB,0x8E,0x81),
-     o3(0xEB,0x8E,0x83), o3(0xEB,0x8E,0x84),
-     o3(0xEB,0x8E,0x85), o3(0xEB,0x8E,0x8C),
-     o3(0xEB,0x8E,0x90), o3(0xEB,0x8E,0x94),
-     o3(0xEB,0x8E,0xA0), o3(0xEB,0x8E,0xA1),
-     o3(0xEB,0x8E,0xA8), o3(0xEB,0x8E,0xAC),
-     o3(0xEB,0x8F,0x84), o3(0xEB,0x8F,0x85),
-     o3(0xEB,0x8F,0x88), o3(0xEB,0x8F,0x8B),
-     o3(0xEB,0x8F,0x8C), o3(0xEB,0x8F,0x8E),
-     o3(0xEB,0x8F,0x90), o3(0xEB,0x8F,0x94),
-     o3(0xEB,0x8F,0x95), o3(0xEB,0x8F,0x97),
-     o3(0xEB,0x8F,0x99), o3(0xEB,0x8F,0x9B),
-     o3(0xEB,0x8F,0x9D), o3(0xEB,0x8F,0xA0),
-     o3(0xEB,0x8F,0xA4), o3(0xEB,0x8F,0xA8),
-     o3(0xEB,0x8F,0xBC), o3(0xEB,0x90,0x90),
-     o3(0xEB,0x90,0x98), o3(0xEB,0x90,0x9C),
-     o3(0xEB,0x90,0xA0), o3(0xEB,0x90,0xA8),
-     o3(0xEB,0x90,0xA9), o3(0xEB,0x90,0xAB),
-     o3(0xEB,0x90,0xB4), o3(0xEB,0x91,0x90),
-     o3(0xEB,0x91,0x91), o3(0xEB,0x91,0x94),
-     o3(0xEB,0x91,0x98), o3(0xEB,0x91,0xA0),
-     o3(0xEB,0x91,0xA1), o3(0xEB,0x91,0xA3),
-     o3(0xEB,0x91,0xA5), o3(0xEB,0x91,0xAC),
-     o3(0xEB,0x92,0x80), o3(0xEB,0x92,0x88),
-     o3(0xEB,0x92,0x9D), o3(0xEB,0x92,0xA4),
-     o3(0xEB,0x92,0xA8), o3(0xEB,0x92,0xAC),
-     o3(0xEB,0x92,0xB5), o3(0xEB,0x92,0xB7),
-     o3(0xEB,0x92,0xB9), o3(0xEB,0x93,0x80),
-     o3(0xEB,0x93,0x84), o3(0xEB,0x93,0x88),
-     o3(0xEB,0x93,0x90), o3(0xEB,0x93,0x95),
-     o3(0xEB,0x93,0x9C), o3(0xEB,0x93,0x9D),
-     o3(0xEB,0x93,0xA0), o3(0xEB,0x93,0xA3),
-     o3(0xEB,0x93,0xA4), o3(0xEB,0x93,0xA6),
-     o3(0xEB,0x93,0xAC), o3(0xEB,0x93,0xAD),
-     o3(0xEB,0x93,0xAF), o3(0xEB,0x93,0xB1),
-     o3(0xEB,0x93,0xB8), o3(0xEB,0x94,0x94),
-     o3(0xEB,0x94,0x95), o3(0xEB,0x94,0x98),
-     o3(0xEB,0x94,0x9B), o3(0xEB,0x94,0x9C),
-     o3(0xEB,0x94,0xA4), o3(0xEB,0x94,0xA5),
-     o3(0xEB,0x94,0xA7), o3(0xEB,0x94,0xA8),
-     o3(0xEB,0x94,0xA9), o3(0xEB,0x94,0xAA),
-     o3(0xEB,0x94,0xB0), o3(0xEB,0x94,0xB1),
-     o3(0xEB,0x94,0xB4), o3(0xEB,0x94,0xB8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B5 = {
-    from_CP949_81_offsets,
-    from_CP949_B5_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B6_infos[179] = {
-     o3(0xED,0x84,0x85), o3(0xED,0x84,0x86),
-     o3(0xED,0x84,0x87), o3(0xED,0x84,0x88),
-     o3(0xED,0x84,0x89), o3(0xED,0x84,0x8A),
-     o3(0xED,0x84,0x8B), o3(0xED,0x84,0x8C),
-     o3(0xED,0x84,0x8E), o3(0xED,0x84,0x8F),
-     o3(0xED,0x84,0x90), o3(0xED,0x84,0x91),
-     o3(0xED,0x84,0x92), o3(0xED,0x84,0x93),
-     o3(0xED,0x84,0x94), o3(0xED,0x84,0x95),
-     o3(0xED,0x84,0x96), o3(0xED,0x84,0x97),
-     o3(0xED,0x84,0x98), o3(0xED,0x84,0x99),
-     o3(0xED,0x84,0x9A), o3(0xED,0x84,0x9B),
-     o3(0xED,0x84,0x9C), o3(0xED,0x84,0x9D),
-     o3(0xED,0x84,0x9E), o3(0xED,0x84,0x9F),
-     o3(0xED,0x84,0xA0), o3(0xED,0x84,0xA1),
-     o3(0xED,0x84,0xA2), o3(0xED,0x84,0xA3),
-     o3(0xED,0x84,0xA4), o3(0xED,0x84,0xA5),
-     o3(0xED,0x84,0xA6), o3(0xED,0x84,0xA7),
-     o3(0xED,0x84,0xA8), o3(0xED,0x84,0xA9),
-     o3(0xED,0x84,0xAA), o3(0xED,0x84,0xAB),
-     o3(0xED,0x84,0xAC), o3(0xED,0x84,0xAD),
-     o3(0xED,0x84,0xAE), o3(0xED,0x84,0xAF),
-     o3(0xED,0x84,0xB2), o3(0xED,0x84,0xB3),
-     o3(0xED,0x84,0xB5), o3(0xED,0x84,0xB6),
-     o3(0xED,0x84,0xB7), o3(0xED,0x84,0xB9),
-     o3(0xED,0x84,0xBB), o3(0xED,0x84,0xBC),
-     o3(0xED,0x84,0xBD), o3(0xED,0x84,0xBE),
-     o3(0xED,0x84,0xBF), o3(0xED,0x85,0x82),
-     o3(0xED,0x85,0x86), o3(0xED,0x85,0x87),
-     o3(0xED,0x85,0x88), o3(0xED,0x85,0x89),
-     o3(0xED,0x85,0x8A), o3(0xED,0x85,0x8B),
-     o3(0xED,0x85,0x8E), o3(0xED,0x85,0x8F),
-     o3(0xED,0x85,0x91), o3(0xED,0x85,0x92),
-     o3(0xED,0x85,0x93), o3(0xED,0x85,0x95),
-     o3(0xED,0x85,0x96), o3(0xED,0x85,0x97),
-     o3(0xED,0x85,0x98), o3(0xED,0x85,0x99),
-     o3(0xED,0x85,0x9A), o3(0xED,0x85,0x9B),
-     o3(0xED,0x85,0x9E), o3(0xED,0x85,0xA0),
-     o3(0xED,0x85,0xA2), o3(0xED,0x85,0xA3),
-     o3(0xED,0x85,0xA4), o3(0xED,0x85,0xA5),
-     o3(0xED,0x85,0xA6), o3(0xED,0x85,0xA7),
-     o3(0xED,0x85,0xA9), o3(0xED,0x85,0xAA),
-     o3(0xED,0x85,0xAB), o3(0xED,0x85,0xAD),
-     o3(0xEB,0x95,0x80), o3(0xEB,0x95,0x81),
-     o3(0xEB,0x95,0x83), o3(0xEB,0x95,0x84),
-     o3(0xEB,0x95,0x85), o3(0xEB,0x95,0x8B),
-     o3(0xEB,0x95,0x8C), o3(0xEB,0x95,0x8D),
-     o3(0xEB,0x95,0x90), o3(0xEB,0x95,0x94),
-     o3(0xEB,0x95,0x9C), o3(0xEB,0x95,0x9D),
-     o3(0xEB,0x95,0x9F), o3(0xEB,0x95,0xA0),
-     o3(0xEB,0x95,0xA1), o3(0xEB,0x96,0xA0),
-     o3(0xEB,0x96,0xA1), o3(0xEB,0x96,0xA4),
-     o3(0xEB,0x96,0xA8), o3(0xEB,0x96,0xAA),
-     o3(0xEB,0x96,0xAB), o3(0xEB,0x96,0xB0),
-     o3(0xEB,0x96,0xB1), o3(0xEB,0x96,0xB3),
-     o3(0xEB,0x96,0xB4), o3(0xEB,0x96,0xB5),
-     o3(0xEB,0x96,0xBB), o3(0xEB,0x96,0xBC),
-     o3(0xEB,0x96,0xBD), o3(0xEB,0x97,0x80),
-     o3(0xEB,0x97,0x84), o3(0xEB,0x97,0x8C),
-     o3(0xEB,0x97,0x8D), o3(0xEB,0x97,0x8F),
-     o3(0xEB,0x97,0x90), o3(0xEB,0x97,0x91),
-     o3(0xEB,0x97,0x98), o3(0xEB,0x97,0xAC),
-     o3(0xEB,0x98,0x90), o3(0xEB,0x98,0x91),
-     o3(0xEB,0x98,0x94), o3(0xEB,0x98,0x98),
-     o3(0xEB,0x98,0xA5), o3(0xEB,0x98,0xAC),
-     o3(0xEB,0x98,0xB4), o3(0xEB,0x99,0x88),
-     o3(0xEB,0x99,0xA4), o3(0xEB,0x99,0xA8),
-     o3(0xEB,0x9A,0x9C), o3(0xEB,0x9A,0x9D),
-     o3(0xEB,0x9A,0xA0), o3(0xEB,0x9A,0xA4),
-     o3(0xEB,0x9A,0xAB), o3(0xEB,0x9A,0xAC),
-     o3(0xEB,0x9A,0xB1), o3(0xEB,0x9B,0x94),
-     o3(0xEB,0x9B,0xB0), o3(0xEB,0x9B,0xB4),
-     o3(0xEB,0x9B,0xB8), o3(0xEB,0x9C,0x80),
-     o3(0xEB,0x9C,0x81), o3(0xEB,0x9C,0x85),
-     o3(0xEB,0x9C,0xA8), o3(0xEB,0x9C,0xA9),
-     o3(0xEB,0x9C,0xAC), o3(0xEB,0x9C,0xAF),
-     o3(0xEB,0x9C,0xB0), o3(0xEB,0x9C,0xB8),
-     o3(0xEB,0x9C,0xB9), o3(0xEB,0x9C,0xBB),
-     o3(0xEB,0x9D,0x84), o3(0xEB,0x9D,0x88),
-     o3(0xEB,0x9D,0x8C), o3(0xEB,0x9D,0x94),
-     o3(0xEB,0x9D,0x95), o3(0xEB,0x9D,0xA0),
-     o3(0xEB,0x9D,0xA4), o3(0xEB,0x9D,0xA8),
-     o3(0xEB,0x9D,0xB0), o3(0xEB,0x9D,0xB1),
-     o3(0xEB,0x9D,0xB3), o3(0xEB,0x9D,0xB5),
-     o3(0xEB,0x9D,0xBC), o3(0xEB,0x9D,0xBD),
-     o3(0xEB,0x9E,0x80), o3(0xEB,0x9E,0x84),
-     o3(0xEB,0x9E,0x8C), o3(0xEB,0x9E,0x8D),
-     o3(0xEB,0x9E,0x8F), o3(0xEB,0x9E,0x90),
-     o3(0xEB,0x9E,0x91), o3(0xEB,0x9E,0x92),
-     o3(0xEB,0x9E,0x96), o3(0xEB,0x9E,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B6 = {
-    from_CP949_81_offsets,
-    from_CP949_B6_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B7_infos[179] = {
-     o3(0xED,0x85,0xAE), o3(0xED,0x85,0xAF),
-     o3(0xED,0x85,0xB0), o3(0xED,0x85,0xB1),
-     o3(0xED,0x85,0xB2), o3(0xED,0x85,0xB3),
-     o3(0xED,0x85,0xB4), o3(0xED,0x85,0xB5),
-     o3(0xED,0x85,0xB6), o3(0xED,0x85,0xB7),
-     o3(0xED,0x85,0xB8), o3(0xED,0x85,0xB9),
-     o3(0xED,0x85,0xBA), o3(0xED,0x85,0xBB),
-     o3(0xED,0x85,0xBD), o3(0xED,0x85,0xBE),
-     o3(0xED,0x85,0xBF), o3(0xED,0x86,0x80),
-     o3(0xED,0x86,0x81), o3(0xED,0x86,0x82),
-     o3(0xED,0x86,0x83), o3(0xED,0x86,0x85),
-     o3(0xED,0x86,0x86), o3(0xED,0x86,0x87),
-     o3(0xED,0x86,0x89), o3(0xED,0x86,0x8A),
-     o3(0xED,0x86,0x8B), o3(0xED,0x86,0x8C),
-     o3(0xED,0x86,0x8D), o3(0xED,0x86,0x8E),
-     o3(0xED,0x86,0x8F), o3(0xED,0x86,0x90),
-     o3(0xED,0x86,0x91), o3(0xED,0x86,0x92),
-     o3(0xED,0x86,0x93), o3(0xED,0x86,0x94),
-     o3(0xED,0x86,0x95), o3(0xED,0x86,0x96),
-     o3(0xED,0x86,0x97), o3(0xED,0x86,0x98),
-     o3(0xED,0x86,0x99), o3(0xED,0x86,0x9A),
-     o3(0xED,0x86,0x9B), o3(0xED,0x86,0x9C),
-     o3(0xED,0x86,0x9D), o3(0xED,0x86,0x9E),
-     o3(0xED,0x86,0x9F), o3(0xED,0x86,0xA2),
-     o3(0xED,0x86,0xA3), o3(0xED,0x86,0xA5),
-     o3(0xED,0x86,0xA6), o3(0xED,0x86,0xA7),
-     o3(0xED,0x86,0xA9), o3(0xED,0x86,0xAA),
-     o3(0xED,0x86,0xAB), o3(0xED,0x86,0xAC),
-     o3(0xED,0x86,0xAD), o3(0xED,0x86,0xAE),
-     o3(0xED,0x86,0xAF), o3(0xED,0x86,0xB2),
-     o3(0xED,0x86,0xB4), o3(0xED,0x86,0xB6),
-     o3(0xED,0x86,0xB7), o3(0xED,0x86,0xB8),
-     o3(0xED,0x86,0xB9), o3(0xED,0x86,0xBB),
-     o3(0xED,0x86,0xBD), o3(0xED,0x86,0xBE),
-     o3(0xED,0x86,0xBF), o3(0xED,0x87,0x81),
-     o3(0xED,0x87,0x82), o3(0xED,0x87,0x83),
-     o3(0xED,0x87,0x84), o3(0xED,0x87,0x85),
-     o3(0xED,0x87,0x86), o3(0xED,0x87,0x87),
-     o3(0xED,0x87,0x88), o3(0xED,0x87,0x89),
-     o3(0xED,0x87,0x8A), o3(0xED,0x87,0x8B),
-     o3(0xED,0x87,0x8C), o3(0xED,0x87,0x8D),
-     o3(0xED,0x87,0x8E), o3(0xED,0x87,0x8F),
-     o3(0xEB,0x9E,0x98), o3(0xEB,0x9E,0x99),
-     o3(0xEB,0x9E,0x9C), o3(0xEB,0x9E,0xA0),
-     o3(0xEB,0x9E,0xA8), o3(0xEB,0x9E,0xA9),
-     o3(0xEB,0x9E,0xAB), o3(0xEB,0x9E,0xAC),
-     o3(0xEB,0x9E,0xAD), o3(0xEB,0x9E,0xB4),
-     o3(0xEB,0x9E,0xB5), o3(0xEB,0x9E,0xB8),
-     o3(0xEB,0x9F,0x87), o3(0xEB,0x9F,0x89),
-     o3(0xEB,0x9F,0xAC), o3(0xEB,0x9F,0xAD),
-     o3(0xEB,0x9F,0xB0), o3(0xEB,0x9F,0xB4),
-     o3(0xEB,0x9F,0xBC), o3(0xEB,0x9F,0xBD),
-     o3(0xEB,0x9F,0xBF), o3(0xEB,0xA0,0x80),
-     o3(0xEB,0xA0,0x81), o3(0xEB,0xA0,0x87),
-     o3(0xEB,0xA0,0x88), o3(0xEB,0xA0,0x89),
-     o3(0xEB,0xA0,0x8C), o3(0xEB,0xA0,0x90),
-     o3(0xEB,0xA0,0x98), o3(0xEB,0xA0,0x99),
-     o3(0xEB,0xA0,0x9B), o3(0xEB,0xA0,0x9D),
-     o3(0xEB,0xA0,0xA4), o3(0xEB,0xA0,0xA5),
-     o3(0xEB,0xA0,0xA8), o3(0xEB,0xA0,0xAC),
-     o3(0xEB,0xA0,0xB4), o3(0xEB,0xA0,0xB5),
-     o3(0xEB,0xA0,0xB7), o3(0xEB,0xA0,0xB8),
-     o3(0xEB,0xA0,0xB9), o3(0xEB,0xA1,0x80),
-     o3(0xEB,0xA1,0x84), o3(0xEB,0xA1,0x91),
-     o3(0xEB,0xA1,0x93), o3(0xEB,0xA1,0x9C),
-     o3(0xEB,0xA1,0x9D), o3(0xEB,0xA1,0xA0),
-     o3(0xEB,0xA1,0xA4), o3(0xEB,0xA1,0xAC),
-     o3(0xEB,0xA1,0xAD), o3(0xEB,0xA1,0xAF),
-     o3(0xEB,0xA1,0xB1), o3(0xEB,0xA1,0xB8),
-     o3(0xEB,0xA1,0xBC), o3(0xEB,0xA2,0x8D),
-     o3(0xEB,0xA2,0xA8), o3(0xEB,0xA2,0xB0),
-     o3(0xEB,0xA2,0xB4), o3(0xEB,0xA2,0xB8),
-     o3(0xEB,0xA3,0x80), o3(0xEB,0xA3,0x81),
-     o3(0xEB,0xA3,0x83), o3(0xEB,0xA3,0x85),
-     o3(0xEB,0xA3,0x8C), o3(0xEB,0xA3,0x90),
-     o3(0xEB,0xA3,0x94), o3(0xEB,0xA3,0x9D),
-     o3(0xEB,0xA3,0x9F), o3(0xEB,0xA3,0xA1),
-     o3(0xEB,0xA3,0xA8), o3(0xEB,0xA3,0xA9),
-     o3(0xEB,0xA3,0xAC), o3(0xEB,0xA3,0xB0),
-     o3(0xEB,0xA3,0xB8), o3(0xEB,0xA3,0xB9),
-     o3(0xEB,0xA3,0xBB), o3(0xEB,0xA3,0xBD),
-     o3(0xEB,0xA4,0x84), o3(0xEB,0xA4,0x98),
-     o3(0xEB,0xA4,0xA0), o3(0xEB,0xA4,0xBC),
-     o3(0xEB,0xA4,0xBD), o3(0xEB,0xA5,0x80),
-     o3(0xEB,0xA5,0x84), o3(0xEB,0xA5,0x8C),
-     o3(0xEB,0xA5,0x8F), o3(0xEB,0xA5,0x91),
-     o3(0xEB,0xA5,0x98), o3(0xEB,0xA5,0x99),
-     o3(0xEB,0xA5,0x9C), o3(0xEB,0xA5,0xA0),
-     o3(0xEB,0xA5,0xA8), o3(0xEB,0xA5,0xA9),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B7 = {
-    from_CP949_81_offsets,
-    from_CP949_B7_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B8_infos[179] = {
-     o3(0xED,0x87,0x90), o3(0xED,0x87,0x91),
-     o3(0xED,0x87,0x92), o3(0xED,0x87,0x93),
-     o3(0xED,0x87,0x94), o3(0xED,0x87,0x95),
-     o3(0xED,0x87,0x96), o3(0xED,0x87,0x97),
-     o3(0xED,0x87,0x99), o3(0xED,0x87,0x9A),
-     o3(0xED,0x87,0x9B), o3(0xED,0x87,0x9C),
-     o3(0xED,0x87,0x9D), o3(0xED,0x87,0x9E),
-     o3(0xED,0x87,0x9F), o3(0xED,0x87,0xA0),
-     o3(0xED,0x87,0xA1), o3(0xED,0x87,0xA2),
-     o3(0xED,0x87,0xA3), o3(0xED,0x87,0xA4),
-     o3(0xED,0x87,0xA5), o3(0xED,0x87,0xA6),
-     o3(0xED,0x87,0xA7), o3(0xED,0x87,0xA8),
-     o3(0xED,0x87,0xA9), o3(0xED,0x87,0xAA),
-     o3(0xED,0x87,0xAB), o3(0xED,0x87,0xAC),
-     o3(0xED,0x87,0xAD), o3(0xED,0x87,0xAE),
-     o3(0xED,0x87,0xAF), o3(0xED,0x87,0xB0),
-     o3(0xED,0x87,0xB1), o3(0xED,0x87,0xB2),
-     o3(0xED,0x87,0xB3), o3(0xED,0x87,0xB5),
-     o3(0xED,0x87,0xB6), o3(0xED,0x87,0xB7),
-     o3(0xED,0x87,0xB9), o3(0xED,0x87,0xBA),
-     o3(0xED,0x87,0xBB), o3(0xED,0x87,0xBC),
-     o3(0xED,0x87,0xBD), o3(0xED,0x87,0xBE),
-     o3(0xED,0x87,0xBF), o3(0xED,0x88,0x80),
-     o3(0xED,0x88,0x81), o3(0xED,0x88,0x82),
-     o3(0xED,0x88,0x83), o3(0xED,0x88,0x84),
-     o3(0xED,0x88,0x85), o3(0xED,0x88,0x86),
-     o3(0xED,0x88,0x88), o3(0xED,0x88,0x8A),
-     o3(0xED,0x88,0x8B), o3(0xED,0x88,0x8C),
-     o3(0xED,0x88,0x8D), o3(0xED,0x88,0x8E),
-     o3(0xED,0x88,0x8F), o3(0xED,0x88,0x91),
-     o3(0xED,0x88,0x92), o3(0xED,0x88,0x93),
-     o3(0xED,0x88,0x94), o3(0xED,0x88,0x95),
-     o3(0xED,0x88,0x96), o3(0xED,0x88,0x97),
-     o3(0xED,0x88,0x98), o3(0xED,0x88,0x99),
-     o3(0xED,0x88,0x9A), o3(0xED,0x88,0x9B),
-     o3(0xED,0x88,0x9C), o3(0xED,0x88,0x9D),
-     o3(0xED,0x88,0x9E), o3(0xED,0x88,0x9F),
-     o3(0xED,0x88,0xA0), o3(0xED,0x88,0xA1),
-     o3(0xED,0x88,0xA2), o3(0xED,0x88,0xA3),
-     o3(0xED,0x88,0xA4), o3(0xED,0x88,0xA5),
-     o3(0xED,0x88,0xA6), o3(0xED,0x88,0xA7),
-     o3(0xED,0x88,0xA8), o3(0xED,0x88,0xA9),
-     o3(0xEB,0xA5,0xAB), o3(0xEB,0xA5,0xAD),
-     o3(0xEB,0xA5,0xB4), o3(0xEB,0xA5,0xB5),
-     o3(0xEB,0xA5,0xB8), o3(0xEB,0xA5,0xBC),
-     o3(0xEB,0xA6,0x84), o3(0xEB,0xA6,0x85),
-     o3(0xEB,0xA6,0x87), o3(0xEB,0xA6,0x89),
-     o3(0xEB,0xA6,0x8A), o3(0xEB,0xA6,0x8D),
-     o3(0xEB,0xA6,0x8E), o3(0xEB,0xA6,0xAC),
-     o3(0xEB,0xA6,0xAD), o3(0xEB,0xA6,0xB0),
-     o3(0xEB,0xA6,0xB4), o3(0xEB,0xA6,0xBC),
-     o3(0xEB,0xA6,0xBD), o3(0xEB,0xA6,0xBF),
-     o3(0xEB,0xA7,0x81), o3(0xEB,0xA7,0x88),
-     o3(0xEB,0xA7,0x89), o3(0xEB,0xA7,0x8C),
-     o3(0xEB,0xA7,0x8E), o3(0xEB,0xA7,0x8F),
-     o3(0xEB,0xA7,0x90), o3(0xEB,0xA7,0x91),
-     o3(0xEB,0xA7,0x92), o3(0xEB,0xA7,0x98),
-     o3(0xEB,0xA7,0x99), o3(0xEB,0xA7,0x9B),
-     o3(0xEB,0xA7,0x9D), o3(0xEB,0xA7,0x9E),
-     o3(0xEB,0xA7,0xA1), o3(0xEB,0xA7,0xA3),
-     o3(0xEB,0xA7,0xA4), o3(0xEB,0xA7,0xA5),
-     o3(0xEB,0xA7,0xA8), o3(0xEB,0xA7,0xAC),
-     o3(0xEB,0xA7,0xB4), o3(0xEB,0xA7,0xB5),
-     o3(0xEB,0xA7,0xB7), o3(0xEB,0xA7,0xB8),
-     o3(0xEB,0xA7,0xB9), o3(0xEB,0xA7,0xBA),
-     o3(0xEB,0xA8,0x80), o3(0xEB,0xA8,0x81),
-     o3(0xEB,0xA8,0x88), o3(0xEB,0xA8,0x95),
-     o3(0xEB,0xA8,0xB8), o3(0xEB,0xA8,0xB9),
-     o3(0xEB,0xA8,0xBC), o3(0xEB,0xA9,0x80),
-     o3(0xEB,0xA9,0x82), o3(0xEB,0xA9,0x88),
-     o3(0xEB,0xA9,0x89), o3(0xEB,0xA9,0x8B),
-     o3(0xEB,0xA9,0x8D), o3(0xEB,0xA9,0x8E),
-     o3(0xEB,0xA9,0x93), o3(0xEB,0xA9,0x94),
-     o3(0xEB,0xA9,0x95), o3(0xEB,0xA9,0x98),
-     o3(0xEB,0xA9,0x9C), o3(0xEB,0xA9,0xA4),
-     o3(0xEB,0xA9,0xA5), o3(0xEB,0xA9,0xA7),
-     o3(0xEB,0xA9,0xA8), o3(0xEB,0xA9,0xA9),
-     o3(0xEB,0xA9,0xB0), o3(0xEB,0xA9,0xB1),
-     o3(0xEB,0xA9,0xB4), o3(0xEB,0xA9,0xB8),
-     o3(0xEB,0xAA,0x83), o3(0xEB,0xAA,0x84),
-     o3(0xEB,0xAA,0x85), o3(0xEB,0xAA,0x87),
-     o3(0xEB,0xAA,0x8C), o3(0xEB,0xAA,0xA8),
-     o3(0xEB,0xAA,0xA9), o3(0xEB,0xAA,0xAB),
-     o3(0xEB,0xAA,0xAC), o3(0xEB,0xAA,0xB0),
-     o3(0xEB,0xAA,0xB2), o3(0xEB,0xAA,0xB8),
-     o3(0xEB,0xAA,0xB9), o3(0xEB,0xAA,0xBB),
-     o3(0xEB,0xAA,0xBD), o3(0xEB,0xAB,0x84),
-     o3(0xEB,0xAB,0x88), o3(0xEB,0xAB,0x98),
-     o3(0xEB,0xAB,0x99), o3(0xEB,0xAB,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B8 = {
-    from_CP949_81_offsets,
-    from_CP949_B8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_B9_infos[179] = {
-     o3(0xED,0x88,0xAA), o3(0xED,0x88,0xAB),
-     o3(0xED,0x88,0xAE), o3(0xED,0x88,0xAF),
-     o3(0xED,0x88,0xB1), o3(0xED,0x88,0xB2),
-     o3(0xED,0x88,0xB3), o3(0xED,0x88,0xB5),
-     o3(0xED,0x88,0xB6), o3(0xED,0x88,0xB7),
-     o3(0xED,0x88,0xB8), o3(0xED,0x88,0xB9),
-     o3(0xED,0x88,0xBA), o3(0xED,0x88,0xBB),
-     o3(0xED,0x88,0xBE), o3(0xED,0x89,0x80),
-     o3(0xED,0x89,0x82), o3(0xED,0x89,0x83),
-     o3(0xED,0x89,0x84), o3(0xED,0x89,0x85),
-     o3(0xED,0x89,0x86), o3(0xED,0x89,0x87),
-     o3(0xED,0x89,0x89), o3(0xED,0x89,0x8A),
-     o3(0xED,0x89,0x8B), o3(0xED,0x89,0x8C),
-     o3(0xED,0x89,0x8D), o3(0xED,0x89,0x8E),
-     o3(0xED,0x89,0x8F), o3(0xED,0x89,0x90),
-     o3(0xED,0x89,0x91), o3(0xED,0x89,0x92),
-     o3(0xED,0x89,0x93), o3(0xED,0x89,0x94),
-     o3(0xED,0x89,0x95), o3(0xED,0x89,0x96),
-     o3(0xED,0x89,0x97), o3(0xED,0x89,0x98),
-     o3(0xED,0x89,0x99), o3(0xED,0x89,0x9A),
-     o3(0xED,0x89,0x9B), o3(0xED,0x89,0x9D),
-     o3(0xED,0x89,0x9E), o3(0xED,0x89,0x9F),
-     o3(0xED,0x89,0xA0), o3(0xED,0x89,0xA1),
-     o3(0xED,0x89,0xA2), o3(0xED,0x89,0xA3),
-     o3(0xED,0x89,0xA5), o3(0xED,0x89,0xA6),
-     o3(0xED,0x89,0xA7), o3(0xED,0x89,0xA8),
-     o3(0xED,0x89,0xA9), o3(0xED,0x89,0xAA),
-     o3(0xED,0x89,0xAB), o3(0xED,0x89,0xAC),
-     o3(0xED,0x89,0xAD), o3(0xED,0x89,0xAE),
-     o3(0xED,0x89,0xAF), o3(0xED,0x89,0xB0),
-     o3(0xED,0x89,0xB1), o3(0xED,0x89,0xB2),
-     o3(0xED,0x89,0xB3), o3(0xED,0x89,0xB4),
-     o3(0xED,0x89,0xB5), o3(0xED,0x89,0xB6),
-     o3(0xED,0x89,0xB7), o3(0xED,0x89,0xB8),
-     o3(0xED,0x89,0xB9), o3(0xED,0x89,0xBA),
-     o3(0xED,0x89,0xBB), o3(0xED,0x89,0xBC),
-     o3(0xED,0x89,0xBD), o3(0xED,0x89,0xBE),
-     o3(0xED,0x89,0xBF), o3(0xED,0x8A,0x82),
-     o3(0xED,0x8A,0x83), o3(0xED,0x8A,0x85),
-     o3(0xED,0x8A,0x86), o3(0xED,0x8A,0x87),
-     o3(0xED,0x8A,0x89), o3(0xED,0x8A,0x8A),
-     o3(0xED,0x8A,0x8B), o3(0xED,0x8A,0x8C),
-     o3(0xEB,0xAC,0x80), o3(0xEB,0xAC,0x84),
-     o3(0xEB,0xAC,0x8D), o3(0xEB,0xAC,0x8F),
-     o3(0xEB,0xAC,0x91), o3(0xEB,0xAC,0x98),
-     o3(0xEB,0xAC,0x9C), o3(0xEB,0xAC,0xA0),
-     o3(0xEB,0xAC,0xA9), o3(0xEB,0xAC,0xAB),
-     o3(0xEB,0xAC,0xB4), o3(0xEB,0xAC,0xB5),
-     o3(0xEB,0xAC,0xB6), o3(0xEB,0xAC,0xB8),
-     o3(0xEB,0xAC,0xBB), o3(0xEB,0xAC,0xBC),
-     o3(0xEB,0xAC,0xBD), o3(0xEB,0xAC,0xBE),
-     o3(0xEB,0xAD,0x84), o3(0xEB,0xAD,0x85),
-     o3(0xEB,0xAD,0x87), o3(0xEB,0xAD,0x89),
-     o3(0xEB,0xAD,0x8D), o3(0xEB,0xAD,0x8F),
-     o3(0xEB,0xAD,0x90), o3(0xEB,0xAD,0x94),
-     o3(0xEB,0xAD,0x98), o3(0xEB,0xAD,0xA1),
-     o3(0xEB,0xAD,0xA3), o3(0xEB,0xAD,0xAC),
-     o3(0xEB,0xAE,0x88), o3(0xEB,0xAE,0x8C),
-     o3(0xEB,0xAE,0x90), o3(0xEB,0xAE,0xA4),
-     o3(0xEB,0xAE,0xA8), o3(0xEB,0xAE,0xAC),
-     o3(0xEB,0xAE,0xB4), o3(0xEB,0xAE,0xB7),
-     o3(0xEB,0xAF,0x80), o3(0xEB,0xAF,0x84),
-     o3(0xEB,0xAF,0x88), o3(0xEB,0xAF,0x90),
-     o3(0xEB,0xAF,0x93), o3(0xEB,0xAF,0xB8),
-     o3(0xEB,0xAF,0xB9), o3(0xEB,0xAF,0xBC),
-     o3(0xEB,0xAF,0xBF), o3(0xEB,0xB0,0x80),
-     o3(0xEB,0xB0,0x82), o3(0xEB,0xB0,0x88),
-     o3(0xEB,0xB0,0x89), o3(0xEB,0xB0,0x8B),
-     o3(0xEB,0xB0,0x8C), o3(0xEB,0xB0,0x8D),
-     o3(0xEB,0xB0,0x8F), o3(0xEB,0xB0,0x91),
-     o3(0xEB,0xB0,0x94), o3(0xEB,0xB0,0x95),
-     o3(0xEB,0xB0,0x96), o3(0xEB,0xB0,0x97),
-     o3(0xEB,0xB0,0x98), o3(0xEB,0xB0,0x9B),
-     o3(0xEB,0xB0,0x9C), o3(0xEB,0xB0,0x9D),
-     o3(0xEB,0xB0,0x9E), o3(0xEB,0xB0,0x9F),
-     o3(0xEB,0xB0,0xA4), o3(0xEB,0xB0,0xA5),
-     o3(0xEB,0xB0,0xA7), o3(0xEB,0xB0,0xA9),
-     o3(0xEB,0xB0,0xAD), o3(0xEB,0xB0,0xB0),
-     o3(0xEB,0xB0,0xB1), o3(0xEB,0xB0,0xB4),
-     o3(0xEB,0xB0,0xB8), o3(0xEB,0xB1,0x80),
-     o3(0xEB,0xB1,0x81), o3(0xEB,0xB1,0x83),
-     o3(0xEB,0xB1,0x84), o3(0xEB,0xB1,0x85),
-     o3(0xEB,0xB1,0x89), o3(0xEB,0xB1,0x8C),
-     o3(0xEB,0xB1,0x8D), o3(0xEB,0xB1,0x90),
-     o3(0xEB,0xB1,0x9D), o3(0xEB,0xB2,0x84),
-     o3(0xEB,0xB2,0x85), o3(0xEB,0xB2,0x88),
-     o3(0xEB,0xB2,0x8B), o3(0xEB,0xB2,0x8C),
-     o3(0xEB,0xB2,0x8E), o3(0xEB,0xB2,0x94),
-     o3(0xEB,0xB2,0x95), o3(0xEB,0xB2,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_B9 = {
-    from_CP949_81_offsets,
-    from_CP949_B9_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BA_infos[179] = {
-     o3(0xED,0x8A,0x8D), o3(0xED,0x8A,0x8E),
-     o3(0xED,0x8A,0x8F), o3(0xED,0x8A,0x92),
-     o3(0xED,0x8A,0x93), o3(0xED,0x8A,0x94),
-     o3(0xED,0x8A,0x96), o3(0xED,0x8A,0x97),
-     o3(0xED,0x8A,0x98), o3(0xED,0x8A,0x99),
-     o3(0xED,0x8A,0x9A), o3(0xED,0x8A,0x9B),
-     o3(0xED,0x8A,0x9D), o3(0xED,0x8A,0x9E),
-     o3(0xED,0x8A,0x9F), o3(0xED,0x8A,0xA1),
-     o3(0xED,0x8A,0xA2), o3(0xED,0x8A,0xA3),
-     o3(0xED,0x8A,0xA5), o3(0xED,0x8A,0xA6),
-     o3(0xED,0x8A,0xA7), o3(0xED,0x8A,0xA8),
-     o3(0xED,0x8A,0xA9), o3(0xED,0x8A,0xAA),
-     o3(0xED,0x8A,0xAB), o3(0xED,0x8A,0xAD),
-     o3(0xED,0x8A,0xAE), o3(0xED,0x8A,0xAF),
-     o3(0xED,0x8A,0xB0), o3(0xED,0x8A,0xB2),
-     o3(0xED,0x8A,0xB3), o3(0xED,0x8A,0xB4),
-     o3(0xED,0x8A,0xB5), o3(0xED,0x8A,0xB6),
-     o3(0xED,0x8A,0xB7), o3(0xED,0x8A,0xBA),
-     o3(0xED,0x8A,0xBB), o3(0xED,0x8A,0xBD),
-     o3(0xED,0x8A,0xBE), o3(0xED,0x8B,0x81),
-     o3(0xED,0x8B,0x83), o3(0xED,0x8B,0x84),
-     o3(0xED,0x8B,0x85), o3(0xED,0x8B,0x86),
-     o3(0xED,0x8B,0x87), o3(0xED,0x8B,0x8A),
-     o3(0xED,0x8B,0x8C), o3(0xED,0x8B,0x8D),
-     o3(0xED,0x8B,0x8E), o3(0xED,0x8B,0x8F),
-     o3(0xED,0x8B,0x90), o3(0xED,0x8B,0x91),
-     o3(0xED,0x8B,0x92), o3(0xED,0x8B,0x93),
-     o3(0xED,0x8B,0x95), o3(0xED,0x8B,0x96),
-     o3(0xED,0x8B,0x97), o3(0xED,0x8B,0x99),
-     o3(0xED,0x8B,0x9A), o3(0xED,0x8B,0x9B),
-     o3(0xED,0x8B,0x9D), o3(0xED,0x8B,0x9E),
-     o3(0xED,0x8B,0x9F), o3(0xED,0x8B,0xA0),
-     o3(0xED,0x8B,0xA1), o3(0xED,0x8B,0xA2),
-     o3(0xED,0x8B,0xA3), o3(0xED,0x8B,0xA6),
-     o3(0xED,0x8B,0xA7), o3(0xED,0x8B,0xA8),
-     o3(0xED,0x8B,0xA9), o3(0xED,0x8B,0xAA),
-     o3(0xED,0x8B,0xAB), o3(0xED,0x8B,0xAC),
-     o3(0xED,0x8B,0xAD), o3(0xED,0x8B,0xAE),
-     o3(0xED,0x8B,0xAF), o3(0xED,0x8B,0xB2),
-     o3(0xED,0x8B,0xB3), o3(0xED,0x8B,0xB5),
-     o3(0xED,0x8B,0xB6), o3(0xED,0x8B,0xB7),
-     o3(0xED,0x8B,0xB9), o3(0xED,0x8B,0xBA),
-     o3(0xEB,0xB2,0x99), o3(0xEB,0xB2,0x9A),
-     o3(0xEB,0xB2,0xA0), o3(0xEB,0xB2,0xA1),
-     o3(0xEB,0xB2,0xA4), o3(0xEB,0xB2,0xA7),
-     o3(0xEB,0xB2,0xA8), o3(0xEB,0xB2,0xB0),
-     o3(0xEB,0xB2,0xB1), o3(0xEB,0xB2,0xB3),
-     o3(0xEB,0xB2,0xB4), o3(0xEB,0xB2,0xB5),
-     o3(0xEB,0xB2,0xBC), o3(0xEB,0xB2,0xBD),
-     o3(0xEB,0xB3,0x80), o3(0xEB,0xB3,0x84),
-     o3(0xEB,0xB3,0x8D), o3(0xEB,0xB3,0x8F),
-     o3(0xEB,0xB3,0x90), o3(0xEB,0xB3,0x91),
-     o3(0xEB,0xB3,0x95), o3(0xEB,0xB3,0x98),
-     o3(0xEB,0xB3,0x9C), o3(0xEB,0xB3,0xB4),
-     o3(0xEB,0xB3,0xB5), o3(0xEB,0xB3,0xB6),
-     o3(0xEB,0xB3,0xB8), o3(0xEB,0xB3,0xBC),
-     o3(0xEB,0xB4,0x84), o3(0xEB,0xB4,0x85),
-     o3(0xEB,0xB4,0x87), o3(0xEB,0xB4,0x89),
-     o3(0xEB,0xB4,0x90), o3(0xEB,0xB4,0x94),
-     o3(0xEB,0xB4,0xA4), o3(0xEB,0xB4,0xAC),
-     o3(0xEB,0xB5,0x80), o3(0xEB,0xB5,0x88),
-     o3(0xEB,0xB5,0x89), o3(0xEB,0xB5,0x8C),
-     o3(0xEB,0xB5,0x90), o3(0xEB,0xB5,0x98),
-     o3(0xEB,0xB5,0x99), o3(0xEB,0xB5,0xA4),
-     o3(0xEB,0xB5,0xA8), o3(0xEB,0xB6,0x80),
-     o3(0xEB,0xB6,0x81), o3(0xEB,0xB6,0x84),
-     o3(0xEB,0xB6,0x87), o3(0xEB,0xB6,0x88),
-     o3(0xEB,0xB6,0x89), o3(0xEB,0xB6,0x8A),
-     o3(0xEB,0xB6,0x90), o3(0xEB,0xB6,0x91),
-     o3(0xEB,0xB6,0x93), o3(0xEB,0xB6,0x95),
-     o3(0xEB,0xB6,0x99), o3(0xEB,0xB6,0x9A),
-     o3(0xEB,0xB6,0x9C), o3(0xEB,0xB6,0xA4),
-     o3(0xEB,0xB6,0xB0), o3(0xEB,0xB6,0xB8),
-     o3(0xEB,0xB7,0x94), o3(0xEB,0xB7,0x95),
-     o3(0xEB,0xB7,0x98), o3(0xEB,0xB7,0x9C),
-     o3(0xEB,0xB7,0xA9), o3(0xEB,0xB7,0xB0),
-     o3(0xEB,0xB7,0xB4), o3(0xEB,0xB7,0xB8),
-     o3(0xEB,0xB8,0x80), o3(0xEB,0xB8,0x83),
-     o3(0xEB,0xB8,0x85), o3(0xEB,0xB8,0x8C),
-     o3(0xEB,0xB8,0x8D), o3(0xEB,0xB8,0x90),
-     o3(0xEB,0xB8,0x94), o3(0xEB,0xB8,0x9C),
-     o3(0xEB,0xB8,0x9D), o3(0xEB,0xB8,0x9F),
-     o3(0xEB,0xB9,0x84), o3(0xEB,0xB9,0x85),
-     o3(0xEB,0xB9,0x88), o3(0xEB,0xB9,0x8C),
-     o3(0xEB,0xB9,0x8E), o3(0xEB,0xB9,0x94),
-     o3(0xEB,0xB9,0x95), o3(0xEB,0xB9,0x97),
-     o3(0xEB,0xB9,0x99), o3(0xEB,0xB9,0x9A),
-     o3(0xEB,0xB9,0x9B), o3(0xEB,0xB9,0xA0),
-     o3(0xEB,0xB9,0xA1), o3(0xEB,0xB9,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BA = {
-    from_CP949_81_offsets,
-    from_CP949_BA_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BB_infos[179] = {
-     o3(0xED,0x8B,0xBB), o3(0xED,0x8B,0xBC),
-     o3(0xED,0x8B,0xBD), o3(0xED,0x8B,0xBE),
-     o3(0xED,0x8B,0xBF), o3(0xED,0x8C,0x82),
-     o3(0xED,0x8C,0x84), o3(0xED,0x8C,0x86),
-     o3(0xED,0x8C,0x87), o3(0xED,0x8C,0x88),
-     o3(0xED,0x8C,0x89), o3(0xED,0x8C,0x8A),
-     o3(0xED,0x8C,0x8B), o3(0xED,0x8C,0x8F),
-     o3(0xED,0x8C,0x91), o3(0xED,0x8C,0x92),
-     o3(0xED,0x8C,0x93), o3(0xED,0x8C,0x95),
-     o3(0xED,0x8C,0x97), o3(0xED,0x8C,0x98),
-     o3(0xED,0x8C,0x99), o3(0xED,0x8C,0x9A),
-     o3(0xED,0x8C,0x9B), o3(0xED,0x8C,0x9E),
-     o3(0xED,0x8C,0xA2), o3(0xED,0x8C,0xA3),
-     o3(0xED,0x8C,0xA4), o3(0xED,0x8C,0xA6),
-     o3(0xED,0x8C,0xA7), o3(0xED,0x8C,0xAA),
-     o3(0xED,0x8C,0xAB), o3(0xED,0x8C,0xAD),
-     o3(0xED,0x8C,0xAE), o3(0xED,0x8C,0xAF),
-     o3(0xED,0x8C,0xB1), o3(0xED,0x8C,0xB2),
-     o3(0xED,0x8C,0xB3), o3(0xED,0x8C,0xB4),
-     o3(0xED,0x8C,0xB5), o3(0xED,0x8C,0xB6),
-     o3(0xED,0x8C,0xB7), o3(0xED,0x8C,0xBA),
-     o3(0xED,0x8C,0xBE), o3(0xED,0x8C,0xBF),
-     o3(0xED,0x8D,0x80), o3(0xED,0x8D,0x81),
-     o3(0xED,0x8D,0x82), o3(0xED,0x8D,0x83),
-     o3(0xED,0x8D,0x86), o3(0xED,0x8D,0x87),
-     o3(0xED,0x8D,0x88), o3(0xED,0x8D,0x89),
-     o3(0xED,0x8D,0x8A), o3(0xED,0x8D,0x8B),
-     o3(0xED,0x8D,0x8C), o3(0xED,0x8D,0x8D),
-     o3(0xED,0x8D,0x8E), o3(0xED,0x8D,0x8F),
-     o3(0xED,0x8D,0x90), o3(0xED,0x8D,0x91),
-     o3(0xED,0x8D,0x92), o3(0xED,0x8D,0x93),
-     o3(0xED,0x8D,0x94), o3(0xED,0x8D,0x95),
-     o3(0xED,0x8D,0x96), o3(0xED,0x8D,0x97),
-     o3(0xED,0x8D,0x98), o3(0xED,0x8D,0x99),
-     o3(0xED,0x8D,0x9A), o3(0xED,0x8D,0x9B),
-     o3(0xED,0x8D,0x9C), o3(0xED,0x8D,0x9D),
-     o3(0xED,0x8D,0x9E), o3(0xED,0x8D,0x9F),
-     o3(0xED,0x8D,0xA0), o3(0xED,0x8D,0xA1),
-     o3(0xED,0x8D,0xA2), o3(0xED,0x8D,0xA3),
-     o3(0xED,0x8D,0xA4), o3(0xED,0x8D,0xA5),
-     o3(0xED,0x8D,0xA6), o3(0xED,0x8D,0xA7),
-     o3(0xED,0x8D,0xA8), o3(0xED,0x8D,0xA9),
-     o3(0xEB,0xB9,0xA8), o3(0xEB,0xB9,0xAA),
-     o3(0xEB,0xB9,0xB0), o3(0xEB,0xB9,0xB1),
-     o3(0xEB,0xB9,0xB3), o3(0xEB,0xB9,0xB4),
-     o3(0xEB,0xB9,0xB5), o3(0xEB,0xB9,0xBB),
-     o3(0xEB,0xB9,0xBC), o3(0xEB,0xB9,0xBD),
-     o3(0xEB,0xBA,0x80), o3(0xEB,0xBA,0x84),
-     o3(0xEB,0xBA,0x8C), o3(0xEB,0xBA,0x8D),
-     o3(0xEB,0xBA,0x8F), o3(0xEB,0xBA,0x90),
-     o3(0xEB,0xBA,0x91), o3(0xEB,0xBA,0x98),
-     o3(0xEB,0xBA,0x99), o3(0xEB,0xBA,0xA8),
-     o3(0xEB,0xBB,0x90), o3(0xEB,0xBB,0x91),
-     o3(0xEB,0xBB,0x94), o3(0xEB,0xBB,0x97),
-     o3(0xEB,0xBB,0x98), o3(0xEB,0xBB,0xA0),
-     o3(0xEB,0xBB,0xA3), o3(0xEB,0xBB,0xA4),
-     o3(0xEB,0xBB,0xA5), o3(0xEB,0xBB,0xAC),
-     o3(0xEB,0xBC,0x81), o3(0xEB,0xBC,0x88),
-     o3(0xEB,0xBC,0x89), o3(0xEB,0xBC,0x98),
-     o3(0xEB,0xBC,0x99), o3(0xEB,0xBC,0x9B),
-     o3(0xEB,0xBC,0x9C), o3(0xEB,0xBC,0x9D),
-     o3(0xEB,0xBD,0x80), o3(0xEB,0xBD,0x81),
-     o3(0xEB,0xBD,0x84), o3(0xEB,0xBD,0x88),
-     o3(0xEB,0xBD,0x90), o3(0xEB,0xBD,0x91),
-     o3(0xEB,0xBD,0x95), o3(0xEB,0xBE,0x94),
-     o3(0xEB,0xBE,0xB0), o3(0xEB,0xBF,0x85),
-     o3(0xEB,0xBF,0x8C), o3(0xEB,0xBF,0x8D),
-     o3(0xEB,0xBF,0x90), o3(0xEB,0xBF,0x94),
-     o3(0xEB,0xBF,0x9C), o3(0xEB,0xBF,0x9F),
-     o3(0xEB,0xBF,0xA1), o3(0xEC,0x80,0xBC),
-     o3(0xEC,0x81,0x91), o3(0xEC,0x81,0x98),
-     o3(0xEC,0x81,0x9C), o3(0xEC,0x81,0xA0),
-     o3(0xEC,0x81,0xA8), o3(0xEC,0x81,0xA9),
-     o3(0xEC,0x82,0x90), o3(0xEC,0x82,0x91),
-     o3(0xEC,0x82,0x94), o3(0xEC,0x82,0x98),
-     o3(0xEC,0x82,0xA0), o3(0xEC,0x82,0xA1),
-     o3(0xEC,0x82,0xA3), o3(0xEC,0x82,0xA5),
-     o3(0xEC,0x82,0xAC), o3(0xEC,0x82,0xAD),
-     o3(0xEC,0x82,0xAF), o3(0xEC,0x82,0xB0),
-     o3(0xEC,0x82,0xB3), o3(0xEC,0x82,0xB4),
-     o3(0xEC,0x82,0xB5), o3(0xEC,0x82,0xB6),
-     o3(0xEC,0x82,0xBC), o3(0xEC,0x82,0xBD),
-     o3(0xEC,0x82,0xBF), o3(0xEC,0x83,0x80),
-     o3(0xEC,0x83,0x81), o3(0xEC,0x83,0x85),
-     o3(0xEC,0x83,0x88), o3(0xEC,0x83,0x89),
-     o3(0xEC,0x83,0x8C), o3(0xEC,0x83,0x90),
-     o3(0xEC,0x83,0x98), o3(0xEC,0x83,0x99),
-     o3(0xEC,0x83,0x9B), o3(0xEC,0x83,0x9C),
-     o3(0xEC,0x83,0x9D), o3(0xEC,0x83,0xA4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BB = {
-    from_CP949_81_offsets,
-    from_CP949_BB_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BC_infos[179] = {
-     o3(0xED,0x8D,0xAA), o3(0xED,0x8D,0xAB),
-     o3(0xED,0x8D,0xAC), o3(0xED,0x8D,0xAD),
-     o3(0xED,0x8D,0xAE), o3(0xED,0x8D,0xAF),
-     o3(0xED,0x8D,0xB0), o3(0xED,0x8D,0xB1),
-     o3(0xED,0x8D,0xB2), o3(0xED,0x8D,0xB3),
-     o3(0xED,0x8D,0xB4), o3(0xED,0x8D,0xB5),
-     o3(0xED,0x8D,0xB6), o3(0xED,0x8D,0xB7),
-     o3(0xED,0x8D,0xB8), o3(0xED,0x8D,0xB9),
-     o3(0xED,0x8D,0xBA), o3(0xED,0x8D,0xBB),
-     o3(0xED,0x8D,0xBE), o3(0xED,0x8D,0xBF),
-     o3(0xED,0x8E,0x81), o3(0xED,0x8E,0x82),
-     o3(0xED,0x8E,0x83), o3(0xED,0x8E,0x85),
-     o3(0xED,0x8E,0x86), o3(0xED,0x8E,0x87),
-     o3(0xED,0x8E,0x88), o3(0xED,0x8E,0x89),
-     o3(0xED,0x8E,0x8A), o3(0xED,0x8E,0x8B),
-     o3(0xED,0x8E,0x8E), o3(0xED,0x8E,0x92),
-     o3(0xED,0x8E,0x93), o3(0xED,0x8E,0x94),
-     o3(0xED,0x8E,0x95), o3(0xED,0x8E,0x96),
-     o3(0xED,0x8E,0x97), o3(0xED,0x8E,0x9A),
-     o3(0xED,0x8E,0x9B), o3(0xED,0x8E,0x9D),
-     o3(0xED,0x8E,0x9E), o3(0xED,0x8E,0x9F),
-     o3(0xED,0x8E,0xA1), o3(0xED,0x8E,0xA2),
-     o3(0xED,0x8E,0xA3), o3(0xED,0x8E,0xA4),
-     o3(0xED,0x8E,0xA5), o3(0xED,0x8E,0xA6),
-     o3(0xED,0x8E,0xA7), o3(0xED,0x8E,0xAA),
-     o3(0xED,0x8E,0xAC), o3(0xED,0x8E,0xAE),
-     o3(0xED,0x8E,0xAF), o3(0xED,0x8E,0xB0),
-     o3(0xED,0x8E,0xB1), o3(0xED,0x8E,0xB2),
-     o3(0xED,0x8E,0xB3), o3(0xED,0x8E,0xB5),
-     o3(0xED,0x8E,0xB6), o3(0xED,0x8E,0xB7),
-     o3(0xED,0x8E,0xB9), o3(0xED,0x8E,0xBA),
-     o3(0xED,0x8E,0xBB), o3(0xED,0x8E,0xBD),
-     o3(0xED,0x8E,0xBE), o3(0xED,0x8E,0xBF),
-     o3(0xED,0x8F,0x80), o3(0xED,0x8F,0x81),
-     o3(0xED,0x8F,0x82), o3(0xED,0x8F,0x83),
-     o3(0xED,0x8F,0x86), o3(0xED,0x8F,0x87),
-     o3(0xED,0x8F,0x8A), o3(0xED,0x8F,0x8B),
-     o3(0xED,0x8F,0x8C), o3(0xED,0x8F,0x8D),
-     o3(0xED,0x8F,0x8E), o3(0xED,0x8F,0x8F),
-     o3(0xED,0x8F,0x91), o3(0xED,0x8F,0x92),
-     o3(0xED,0x8F,0x93), o3(0xED,0x8F,0x94),
-     o3(0xED,0x8F,0x95), o3(0xED,0x8F,0x96),
-     o3(0xEC,0x83,0xA5), o3(0xEC,0x83,0xA8),
-     o3(0xEC,0x83,0xAC), o3(0xEC,0x83,0xB4),
-     o3(0xEC,0x83,0xB5), o3(0xEC,0x83,0xB7),
-     o3(0xEC,0x83,0xB9), o3(0xEC,0x84,0x80),
-     o3(0xEC,0x84,0x84), o3(0xEC,0x84,0x88),
-     o3(0xEC,0x84,0x90), o3(0xEC,0x84,0x95),
-     o3(0xEC,0x84,0x9C), o3(0xEC,0x84,0x9D),
-     o3(0xEC,0x84,0x9E), o3(0xEC,0x84,0x9F),
-     o3(0xEC,0x84,0xA0), o3(0xEC,0x84,0xA3),
-     o3(0xEC,0x84,0xA4), o3(0xEC,0x84,0xA6),
-     o3(0xEC,0x84,0xA7), o3(0xEC,0x84,0xAC),
-     o3(0xEC,0x84,0xAD), o3(0xEC,0x84,0xAF),
-     o3(0xEC,0x84,0xB0), o3(0xEC,0x84,0xB1),
-     o3(0xEC,0x84,0xB6), o3(0xEC,0x84,0xB8),
-     o3(0xEC,0x84,0xB9), o3(0xEC,0x84,0xBC),
-     o3(0xEC,0x85,0x80), o3(0xEC,0x85,0x88),
-     o3(0xEC,0x85,0x89), o3(0xEC,0x85,0x8B),
-     o3(0xEC,0x85,0x8C), o3(0xEC,0x85,0x8D),
-     o3(0xEC,0x85,0x94), o3(0xEC,0x85,0x95),
-     o3(0xEC,0x85,0x98), o3(0xEC,0x85,0x9C),
-     o3(0xEC,0x85,0xA4), o3(0xEC,0x85,0xA5),
-     o3(0xEC,0x85,0xA7), o3(0xEC,0x85,0xA8),
-     o3(0xEC,0x85,0xA9), o3(0xEC,0x85,0xB0),
-     o3(0xEC,0x85,0xB4), o3(0xEC,0x85,0xB8),
-     o3(0xEC,0x86,0x85), o3(0xEC,0x86,0x8C),
-     o3(0xEC,0x86,0x8D), o3(0xEC,0x86,0x8E),
-     o3(0xEC,0x86,0x90), o3(0xEC,0x86,0x94),
-     o3(0xEC,0x86,0x96), o3(0xEC,0x86,0x9C),
-     o3(0xEC,0x86,0x9D), o3(0xEC,0x86,0x9F),
-     o3(0xEC,0x86,0xA1), o3(0xEC,0x86,0xA5),
-     o3(0xEC,0x86,0xA8), o3(0xEC,0x86,0xA9),
-     o3(0xEC,0x86,0xAC), o3(0xEC,0x86,0xB0),
-     o3(0xEC,0x86,0xBD), o3(0xEC,0x87,0x84),
-     o3(0xEC,0x87,0x88), o3(0xEC,0x87,0x8C),
-     o3(0xEC,0x87,0x94), o3(0xEC,0x87,0x97),
-     o3(0xEC,0x87,0x98), o3(0xEC,0x87,0xA0),
-     o3(0xEC,0x87,0xA4), o3(0xEC,0x87,0xA8),
-     o3(0xEC,0x87,0xB0), o3(0xEC,0x87,0xB1),
-     o3(0xEC,0x87,0xB3), o3(0xEC,0x87,0xBC),
-     o3(0xEC,0x87,0xBD), o3(0xEC,0x88,0x80),
-     o3(0xEC,0x88,0x84), o3(0xEC,0x88,0x8C),
-     o3(0xEC,0x88,0x8D), o3(0xEC,0x88,0x8F),
-     o3(0xEC,0x88,0x91), o3(0xEC,0x88,0x98),
-     o3(0xEC,0x88,0x99), o3(0xEC,0x88,0x9C),
-     o3(0xEC,0x88,0x9F), o3(0xEC,0x88,0xA0),
-     o3(0xEC,0x88,0xA8), o3(0xEC,0x88,0xA9),
-     o3(0xEC,0x88,0xAB), o3(0xEC,0x88,0xAD),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BC = {
-    from_CP949_81_offsets,
-    from_CP949_BC_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BD_infos[179] = {
-     o3(0xED,0x8F,0x97), o3(0xED,0x8F,0x99),
-     o3(0xED,0x8F,0x9A), o3(0xED,0x8F,0x9B),
-     o3(0xED,0x8F,0x9C), o3(0xED,0x8F,0x9D),
-     o3(0xED,0x8F,0x9E), o3(0xED,0x8F,0x9F),
-     o3(0xED,0x8F,0xA0), o3(0xED,0x8F,0xA2),
-     o3(0xED,0x8F,0xA4), o3(0xED,0x8F,0xA5),
-     o3(0xED,0x8F,0xA6), o3(0xED,0x8F,0xA7),
-     o3(0xED,0x8F,0xA8), o3(0xED,0x8F,0xA9),
-     o3(0xED,0x8F,0xAA), o3(0xED,0x8F,0xAB),
-     o3(0xED,0x8F,0xAE), o3(0xED,0x8F,0xAF),
-     o3(0xED,0x8F,0xB1), o3(0xED,0x8F,0xB2),
-     o3(0xED,0x8F,0xB3), o3(0xED,0x8F,0xB5),
-     o3(0xED,0x8F,0xB6), o3(0xED,0x8F,0xB7),
-     o3(0xED,0x8F,0xB8), o3(0xED,0x8F,0xB9),
-     o3(0xED,0x8F,0xBA), o3(0xED,0x8F,0xBB),
-     o3(0xED,0x8F,0xBE), o3(0xED,0x90,0x80),
-     o3(0xED,0x90,0x82), o3(0xED,0x90,0x83),
-     o3(0xED,0x90,0x84), o3(0xED,0x90,0x85),
-     o3(0xED,0x90,0x86), o3(0xED,0x90,0x87),
-     o3(0xED,0x90,0x89), o3(0xED,0x90,0x8A),
-     o3(0xED,0x90,0x8B), o3(0xED,0x90,0x8C),
-     o3(0xED,0x90,0x8D), o3(0xED,0x90,0x8E),
-     o3(0xED,0x90,0x8F), o3(0xED,0x90,0x90),
-     o3(0xED,0x90,0x91), o3(0xED,0x90,0x92),
-     o3(0xED,0x90,0x93), o3(0xED,0x90,0x94),
-     o3(0xED,0x90,0x95), o3(0xED,0x90,0x96),
-     o3(0xED,0x90,0x97), o3(0xED,0x90,0x98),
-     o3(0xED,0x90,0x99), o3(0xED,0x90,0x9A),
-     o3(0xED,0x90,0x9B), o3(0xED,0x90,0x9C),
-     o3(0xED,0x90,0x9E), o3(0xED,0x90,0x9F),
-     o3(0xED,0x90,0xA0), o3(0xED,0x90,0xA1),
-     o3(0xED,0x90,0xA2), o3(0xED,0x90,0xA3),
-     o3(0xED,0x90,0xA4), o3(0xED,0x90,0xA5),
-     o3(0xED,0x90,0xA6), o3(0xED,0x90,0xA7),
-     o3(0xED,0x90,0xA8), o3(0xED,0x90,0xA9),
-     o3(0xED,0x90,0xAA), o3(0xED,0x90,0xAB),
-     o3(0xED,0x90,0xAC), o3(0xED,0x90,0xAD),
-     o3(0xED,0x90,0xAE), o3(0xED,0x90,0xAF),
-     o3(0xED,0x90,0xB0), o3(0xED,0x90,0xB1),
-     o3(0xED,0x90,0xB2), o3(0xED,0x90,0xB3),
-     o3(0xED,0x90,0xB4), o3(0xED,0x90,0xB5),
-     o3(0xED,0x90,0xB6), o3(0xED,0x90,0xB7),
-     o3(0xEC,0x88,0xAF), o3(0xEC,0x88,0xB1),
-     o3(0xEC,0x88,0xB2), o3(0xEC,0x88,0xB4),
-     o3(0xEC,0x89,0x88), o3(0xEC,0x89,0x90),
-     o3(0xEC,0x89,0x91), o3(0xEC,0x89,0x94),
-     o3(0xEC,0x89,0x98), o3(0xEC,0x89,0xA0),
-     o3(0xEC,0x89,0xA5), o3(0xEC,0x89,0xAC),
-     o3(0xEC,0x89,0xAD), o3(0xEC,0x89,0xB0),
-     o3(0xEC,0x89,0xB4), o3(0xEC,0x89,0xBC),
-     o3(0xEC,0x89,0xBD), o3(0xEC,0x89,0xBF),
-     o3(0xEC,0x8A,0x81), o3(0xEC,0x8A,0x88),
-     o3(0xEC,0x8A,0x89), o3(0xEC,0x8A,0x90),
-     o3(0xEC,0x8A,0x98), o3(0xEC,0x8A,0x9B),
-     o3(0xEC,0x8A,0x9D), o3(0xEC,0x8A,0xA4),
-     o3(0xEC,0x8A,0xA5), o3(0xEC,0x8A,0xA8),
-     o3(0xEC,0x8A,0xAC), o3(0xEC,0x8A,0xAD),
-     o3(0xEC,0x8A,0xB4), o3(0xEC,0x8A,0xB5),
-     o3(0xEC,0x8A,0xB7), o3(0xEC,0x8A,0xB9),
-     o3(0xEC,0x8B,0x9C), o3(0xEC,0x8B,0x9D),
-     o3(0xEC,0x8B,0xA0), o3(0xEC,0x8B,0xA3),
-     o3(0xEC,0x8B,0xA4), o3(0xEC,0x8B,0xAB),
-     o3(0xEC,0x8B,0xAC), o3(0xEC,0x8B,0xAD),
-     o3(0xEC,0x8B,0xAF), o3(0xEC,0x8B,0xB1),
-     o3(0xEC,0x8B,0xB6), o3(0xEC,0x8B,0xB8),
-     o3(0xEC,0x8B,0xB9), o3(0xEC,0x8B,0xBB),
-     o3(0xEC,0x8B,0xBC), o3(0xEC,0x8C,0x80),
-     o3(0xEC,0x8C,0x88), o3(0xEC,0x8C,0x89),
-     o3(0xEC,0x8C,0x8C), o3(0xEC,0x8C,0x8D),
-     o3(0xEC,0x8C,0x93), o3(0xEC,0x8C,0x94),
-     o3(0xEC,0x8C,0x95), o3(0xEC,0x8C,0x98),
-     o3(0xEC,0x8C,0x9C), o3(0xEC,0x8C,0xA4),
-     o3(0xEC,0x8C,0xA5), o3(0xEC,0x8C,0xA8),
-     o3(0xEC,0x8C,0xA9), o3(0xEC,0x8D,0x85),
-     o3(0xEC,0x8D,0xA8), o3(0xEC,0x8D,0xA9),
-     o3(0xEC,0x8D,0xAC), o3(0xEC,0x8D,0xB0),
-     o3(0xEC,0x8D,0xB2), o3(0xEC,0x8D,0xB8),
-     o3(0xEC,0x8D,0xB9), o3(0xEC,0x8D,0xBC),
-     o3(0xEC,0x8D,0xBD), o3(0xEC,0x8E,0x84),
-     o3(0xEC,0x8E,0x88), o3(0xEC,0x8E,0x8C),
-     o3(0xEC,0x8F,0x80), o3(0xEC,0x8F,0x98),
-     o3(0xEC,0x8F,0x99), o3(0xEC,0x8F,0x9C),
-     o3(0xEC,0x8F,0x9F), o3(0xEC,0x8F,0xA0),
-     o3(0xEC,0x8F,0xA2), o3(0xEC,0x8F,0xA8),
-     o3(0xEC,0x8F,0xA9), o3(0xEC,0x8F,0xAD),
-     o3(0xEC,0x8F,0xB4), o3(0xEC,0x8F,0xB5),
-     o3(0xEC,0x8F,0xB8), o3(0xEC,0x90,0x88),
-     o3(0xEC,0x90,0x90), o3(0xEC,0x90,0xA4),
-     o3(0xEC,0x90,0xAC), o3(0xEC,0x90,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BD = {
-    from_CP949_81_offsets,
-    from_CP949_BD_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BE_infos[179] = {
-     o3(0xED,0x90,0xB8), o3(0xED,0x90,0xB9),
-     o3(0xED,0x90,0xBA), o3(0xED,0x90,0xBB),
-     o3(0xED,0x90,0xBC), o3(0xED,0x90,0xBD),
-     o3(0xED,0x90,0xBE), o3(0xED,0x90,0xBF),
-     o3(0xED,0x91,0x81), o3(0xED,0x91,0x82),
-     o3(0xED,0x91,0x83), o3(0xED,0x91,0x85),
-     o3(0xED,0x91,0x86), o3(0xED,0x91,0x87),
-     o3(0xED,0x91,0x88), o3(0xED,0x91,0x89),
-     o3(0xED,0x91,0x8A), o3(0xED,0x91,0x8B),
-     o3(0xED,0x91,0x8C), o3(0xED,0x91,0x8D),
-     o3(0xED,0x91,0x8E), o3(0xED,0x91,0x8F),
-     o3(0xED,0x91,0x90), o3(0xED,0x91,0x91),
-     o3(0xED,0x91,0x92), o3(0xED,0x91,0x93),
-     o3(0xED,0x91,0x94), o3(0xED,0x91,0x95),
-     o3(0xED,0x91,0x96), o3(0xED,0x91,0x97),
-     o3(0xED,0x91,0x98), o3(0xED,0x91,0x99),
-     o3(0xED,0x91,0x9A), o3(0xED,0x91,0x9B),
-     o3(0xED,0x91,0x9D), o3(0xED,0x91,0x9E),
-     o3(0xED,0x91,0x9F), o3(0xED,0x91,0xA1),
-     o3(0xED,0x91,0xA2), o3(0xED,0x91,0xA3),
-     o3(0xED,0x91,0xA5), o3(0xED,0x91,0xA6),
-     o3(0xED,0x91,0xA7), o3(0xED,0x91,0xA8),
-     o3(0xED,0x91,0xA9), o3(0xED,0x91,0xAA),
-     o3(0xED,0x91,0xAB), o3(0xED,0x91,0xAC),
-     o3(0xED,0x91,0xAE), o3(0xED,0x91,0xB0),
-     o3(0xED,0x91,0xB1), o3(0xED,0x91,0xB2),
-     o3(0xED,0x91,0xB3), o3(0xED,0x91,0xB4),
-     o3(0xED,0x91,0xB5), o3(0xED,0x91,0xB6),
-     o3(0xED,0x91,0xB7), o3(0xED,0x91,0xBA),
-     o3(0xED,0x91,0xBB), o3(0xED,0x91,0xBD),
-     o3(0xED,0x91,0xBE), o3(0xED,0x92,0x81),
-     o3(0xED,0x92,0x83), o3(0xED,0x92,0x84),
-     o3(0xED,0x92,0x85), o3(0xED,0x92,0x86),
-     o3(0xED,0x92,0x87), o3(0xED,0x92,0x8A),
-     o3(0xED,0x92,0x8C), o3(0xED,0x92,0x8E),
-     o3(0xED,0x92,0x8F), o3(0xED,0x92,0x90),
-     o3(0xED,0x92,0x91), o3(0xED,0x92,0x92),
-     o3(0xED,0x92,0x93), o3(0xED,0x92,0x95),
-     o3(0xED,0x92,0x96), o3(0xED,0x92,0x97),
-     o3(0xED,0x92,0x98), o3(0xED,0x92,0x99),
-     o3(0xED,0x92,0x9A), o3(0xED,0x92,0x9B),
-     o3(0xED,0x92,0x9C), o3(0xED,0x92,0x9D),
-     o3(0xEC,0x90,0xB4), o3(0xEC,0x90,0xBC),
-     o3(0xEC,0x90,0xBD), o3(0xEC,0x91,0x88),
-     o3(0xEC,0x91,0xA4), o3(0xEC,0x91,0xA5),
-     o3(0xEC,0x91,0xA8), o3(0xEC,0x91,0xAC),
-     o3(0xEC,0x91,0xB4), o3(0xEC,0x91,0xB5),
-     o3(0xEC,0x91,0xB9), o3(0xEC,0x92,0x80),
-     o3(0xEC,0x92,0x94), o3(0xEC,0x92,0x9C),
-     o3(0xEC,0x92,0xB8), o3(0xEC,0x92,0xBC),
-     o3(0xEC,0x93,0xA9), o3(0xEC,0x93,0xB0),
-     o3(0xEC,0x93,0xB1), o3(0xEC,0x93,0xB4),
-     o3(0xEC,0x93,0xB8), o3(0xEC,0x93,0xBA),
-     o3(0xEC,0x93,0xBF), o3(0xEC,0x94,0x80),
-     o3(0xEC,0x94,0x81), o3(0xEC,0x94,0x8C),
-     o3(0xEC,0x94,0x90), o3(0xEC,0x94,0x94),
-     o3(0xEC,0x94,0x9C), o3(0xEC,0x94,0xA8),
-     o3(0xEC,0x94,0xA9), o3(0xEC,0x94,0xAC),
-     o3(0xEC,0x94,0xB0), o3(0xEC,0x94,0xB8),
-     o3(0xEC,0x94,0xB9), o3(0xEC,0x94,0xBB),
-     o3(0xEC,0x94,0xBD), o3(0xEC,0x95,0x84),
-     o3(0xEC,0x95,0x85), o3(0xEC,0x95,0x88),
-     o3(0xEC,0x95,0x89), o3(0xEC,0x95,0x8A),
-     o3(0xEC,0x95,0x8C), o3(0xEC,0x95,0x8D),
-     o3(0xEC,0x95,0x8E), o3(0xEC,0x95,0x93),
-     o3(0xEC,0x95,0x94), o3(0xEC,0x95,0x95),
-     o3(0xEC,0x95,0x97), o3(0xEC,0x95,0x98),
-     o3(0xEC,0x95,0x99), o3(0xEC,0x95,0x9D),
-     o3(0xEC,0x95,0x9E), o3(0xEC,0x95,0xA0),
-     o3(0xEC,0x95,0xA1), o3(0xEC,0x95,0xA4),
-     o3(0xEC,0x95,0xA8), o3(0xEC,0x95,0xB0),
-     o3(0xEC,0x95,0xB1), o3(0xEC,0x95,0xB3),
-     o3(0xEC,0x95,0xB4), o3(0xEC,0x95,0xB5),
-     o3(0xEC,0x95,0xBC), o3(0xEC,0x95,0xBD),
-     o3(0xEC,0x96,0x80), o3(0xEC,0x96,0x84),
-     o3(0xEC,0x96,0x87), o3(0xEC,0x96,0x8C),
-     o3(0xEC,0x96,0x8D), o3(0xEC,0x96,0x8F),
-     o3(0xEC,0x96,0x91), o3(0xEC,0x96,0x95),
-     o3(0xEC,0x96,0x97), o3(0xEC,0x96,0x98),
-     o3(0xEC,0x96,0x9C), o3(0xEC,0x96,0xA0),
-     o3(0xEC,0x96,0xA9), o3(0xEC,0x96,0xB4),
-     o3(0xEC,0x96,0xB5), o3(0xEC,0x96,0xB8),
-     o3(0xEC,0x96,0xB9), o3(0xEC,0x96,0xBB),
-     o3(0xEC,0x96,0xBC), o3(0xEC,0x96,0xBD),
-     o3(0xEC,0x96,0xBE), o3(0xEC,0x97,0x84),
-     o3(0xEC,0x97,0x85), o3(0xEC,0x97,0x86),
-     o3(0xEC,0x97,0x87), o3(0xEC,0x97,0x88),
-     o3(0xEC,0x97,0x89), o3(0xEC,0x97,0x8A),
-     o3(0xEC,0x97,0x8C), o3(0xEC,0x97,0x8E),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BE = {
-    from_CP949_81_offsets,
-    from_CP949_BE_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_BF_infos[179] = {
-     o3(0xED,0x92,0x9E), o3(0xED,0x92,0x9F),
-     o3(0xED,0x92,0xA0), o3(0xED,0x92,0xA1),
-     o3(0xED,0x92,0xA2), o3(0xED,0x92,0xA3),
-     o3(0xED,0x92,0xA4), o3(0xED,0x92,0xA5),
-     o3(0xED,0x92,0xA6), o3(0xED,0x92,0xA7),
-     o3(0xED,0x92,0xA8), o3(0xED,0x92,0xAA),
-     o3(0xED,0x92,0xAB), o3(0xED,0x92,0xAC),
-     o3(0xED,0x92,0xAD), o3(0xED,0x92,0xAE),
-     o3(0xED,0x92,0xAF), o3(0xED,0x92,0xB0),
-     o3(0xED,0x92,0xB1), o3(0xED,0x92,0xB2),
-     o3(0xED,0x92,0xB3), o3(0xED,0x92,0xB4),
-     o3(0xED,0x92,0xB5), o3(0xED,0x92,0xB6),
-     o3(0xED,0x92,0xB7), o3(0xED,0x92,0xB8),
-     o3(0xED,0x92,0xB9), o3(0xED,0x92,0xBA),
-     o3(0xED,0x92,0xBB), o3(0xED,0x92,0xBC),
-     o3(0xED,0x92,0xBD), o3(0xED,0x92,0xBE),
-     o3(0xED,0x92,0xBF), o3(0xED,0x93,0x80),
-     o3(0xED,0x93,0x81), o3(0xED,0x93,0x82),
-     o3(0xED,0x93,0x83), o3(0xED,0x93,0x84),
-     o3(0xED,0x93,0x85), o3(0xED,0x93,0x86),
-     o3(0xED,0x93,0x87), o3(0xED,0x93,0x88),
-     o3(0xED,0x93,0x89), o3(0xED,0x93,0x8A),
-     o3(0xED,0x93,0x8B), o3(0xED,0x93,0x8D),
-     o3(0xED,0x93,0x8E), o3(0xED,0x93,0x8F),
-     o3(0xED,0x93,0x91), o3(0xED,0x93,0x92),
-     o3(0xED,0x93,0x93), o3(0xED,0x93,0x95),
-     o3(0xED,0x93,0x96), o3(0xED,0x93,0x97),
-     o3(0xED,0x93,0x98), o3(0xED,0x93,0x99),
-     o3(0xED,0x93,0x9A), o3(0xED,0x93,0x9B),
-     o3(0xED,0x93,0x9D), o3(0xED,0x93,0x9E),
-     o3(0xED,0x93,0xA0), o3(0xED,0x93,0xA1),
-     o3(0xED,0x93,0xA2), o3(0xED,0x93,0xA3),
-     o3(0xED,0x93,0xA4), o3(0xED,0x93,0xA5),
-     o3(0xED,0x93,0xA6), o3(0xED,0x93,0xA7),
-     o3(0xED,0x93,0xA9), o3(0xED,0x93,0xAA),
-     o3(0xED,0x93,0xAB), o3(0xED,0x93,0xAD),
-     o3(0xED,0x93,0xAE), o3(0xED,0x93,0xAF),
-     o3(0xED,0x93,0xB1), o3(0xED,0x93,0xB2),
-     o3(0xED,0x93,0xB3), o3(0xED,0x93,0xB4),
-     o3(0xED,0x93,0xB5), o3(0xED,0x93,0xB6),
-     o3(0xED,0x93,0xB7), o3(0xED,0x93,0xB9),
-     o3(0xED,0x93,0xBA), o3(0xED,0x93,0xBC),
-     o3(0xEC,0x97,0x90), o3(0xEC,0x97,0x91),
-     o3(0xEC,0x97,0x94), o3(0xEC,0x97,0x98),
-     o3(0xEC,0x97,0xA0), o3(0xEC,0x97,0xA1),
-     o3(0xEC,0x97,0xA3), o3(0xEC,0x97,0xA5),
-     o3(0xEC,0x97,0xAC), o3(0xEC,0x97,0xAD),
-     o3(0xEC,0x97,0xAE), o3(0xEC,0x97,0xB0),
-     o3(0xEC,0x97,0xB4), o3(0xEC,0x97,0xB6),
-     o3(0xEC,0x97,0xB7), o3(0xEC,0x97,0xBC),
-     o3(0xEC,0x97,0xBD), o3(0xEC,0x97,0xBE),
-     o3(0xEC,0x97,0xBF), o3(0xEC,0x98,0x80),
-     o3(0xEC,0x98,0x81), o3(0xEC,0x98,0x85),
-     o3(0xEC,0x98,0x86), o3(0xEC,0x98,0x87),
-     o3(0xEC,0x98,0x88), o3(0xEC,0x98,0x8C),
-     o3(0xEC,0x98,0x90), o3(0xEC,0x98,0x98),
-     o3(0xEC,0x98,0x99), o3(0xEC,0x98,0x9B),
-     o3(0xEC,0x98,0x9C), o3(0xEC,0x98,0xA4),
-     o3(0xEC,0x98,0xA5), o3(0xEC,0x98,0xA8),
-     o3(0xEC,0x98,0xAC), o3(0xEC,0x98,0xAD),
-     o3(0xEC,0x98,0xAE), o3(0xEC,0x98,0xB0),
-     o3(0xEC,0x98,0xB3), o3(0xEC,0x98,0xB4),
-     o3(0xEC,0x98,0xB5), o3(0xEC,0x98,0xB7),
-     o3(0xEC,0x98,0xB9), o3(0xEC,0x98,0xBB),
-     o3(0xEC,0x99,0x80), o3(0xEC,0x99,0x81),
-     o3(0xEC,0x99,0x84), o3(0xEC,0x99,0x88),
-     o3(0xEC,0x99,0x90), o3(0xEC,0x99,0x91),
-     o3(0xEC,0x99,0x93), o3(0xEC,0x99,0x94),
-     o3(0xEC,0x99,0x95), o3(0xEC,0x99,0x9C),
-     o3(0xEC,0x99,0x9D), o3(0xEC,0x99,0xA0),
-     o3(0xEC,0x99,0xAC), o3(0xEC,0x99,0xAF),
-     o3(0xEC,0x99,0xB1), o3(0xEC,0x99,0xB8),
-     o3(0xEC,0x99,0xB9), o3(0xEC,0x99,0xBC),
-     o3(0xEC,0x9A,0x80), o3(0xEC,0x9A,0x88),
-     o3(0xEC,0x9A,0x89), o3(0xEC,0x9A,0x8B),
-     o3(0xEC,0x9A,0x8D), o3(0xEC,0x9A,0x94),
-     o3(0xEC,0x9A,0x95), o3(0xEC,0x9A,0x98),
-     o3(0xEC,0x9A,0x9C), o3(0xEC,0x9A,0xA4),
-     o3(0xEC,0x9A,0xA5), o3(0xEC,0x9A,0xA7),
-     o3(0xEC,0x9A,0xA9), o3(0xEC,0x9A,0xB0),
-     o3(0xEC,0x9A,0xB1), o3(0xEC,0x9A,0xB4),
-     o3(0xEC,0x9A,0xB8), o3(0xEC,0x9A,0xB9),
-     o3(0xEC,0x9A,0xBA), o3(0xEC,0x9B,0x80),
-     o3(0xEC,0x9B,0x81), o3(0xEC,0x9B,0x83),
-     o3(0xEC,0x9B,0x85), o3(0xEC,0x9B,0x8C),
-     o3(0xEC,0x9B,0x8D), o3(0xEC,0x9B,0x90),
-     o3(0xEC,0x9B,0x94), o3(0xEC,0x9B,0x9C),
-     o3(0xEC,0x9B,0x9D), o3(0xEC,0x9B,0xA0),
-     o3(0xEC,0x9B,0xA1), o3(0xEC,0x9B,0xA8),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_BF = {
-    from_CP949_81_offsets,
-    from_CP949_BF_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C0_infos[179] = {
-     o3(0xED,0x93,0xBE), o3(0xED,0x93,0xBF),
-     o3(0xED,0x94,0x80), o3(0xED,0x94,0x81),
-     o3(0xED,0x94,0x82), o3(0xED,0x94,0x83),
-     o3(0xED,0x94,0x85), o3(0xED,0x94,0x86),
-     o3(0xED,0x94,0x87), o3(0xED,0x94,0x89),
-     o3(0xED,0x94,0x8A), o3(0xED,0x94,0x8B),
-     o3(0xED,0x94,0x8D), o3(0xED,0x94,0x8E),
-     o3(0xED,0x94,0x8F), o3(0xED,0x94,0x90),
-     o3(0xED,0x94,0x91), o3(0xED,0x94,0x92),
-     o3(0xED,0x94,0x93), o3(0xED,0x94,0x96),
-     o3(0xED,0x94,0x98), o3(0xED,0x94,0x99),
-     o3(0xED,0x94,0x9A), o3(0xED,0x94,0x9B),
-     o3(0xED,0x94,0x9C), o3(0xED,0x94,0x9D),
-     o3(0xED,0x94,0x9E), o3(0xED,0x94,0x9F),
-     o3(0xED,0x94,0xA0), o3(0xED,0x94,0xA1),
-     o3(0xED,0x94,0xA2), o3(0xED,0x94,0xA3),
-     o3(0xED,0x94,0xA4), o3(0xED,0x94,0xA5),
-     o3(0xED,0x94,0xA6), o3(0xED,0x94,0xA7),
-     o3(0xED,0x94,0xA8), o3(0xED,0x94,0xA9),
-     o3(0xED,0x94,0xAA), o3(0xED,0x94,0xAB),
-     o3(0xED,0x94,0xAC), o3(0xED,0x94,0xAD),
-     o3(0xED,0x94,0xAE), o3(0xED,0x94,0xAF),
-     o3(0xED,0x94,0xB0), o3(0xED,0x94,0xB1),
-     o3(0xED,0x94,0xB2), o3(0xED,0x94,0xB3),
-     o3(0xED,0x94,0xB4), o3(0xED,0x94,0xB5),
-     o3(0xED,0x94,0xB6), o3(0xED,0x94,0xB7),
-     o3(0xED,0x94,0xB8), o3(0xED,0x94,0xB9),
-     o3(0xED,0x94,0xBA), o3(0xED,0x94,0xBB),
-     o3(0xED,0x94,0xBE), o3(0xED,0x94,0xBF),
-     o3(0xED,0x95,0x81), o3(0xED,0x95,0x82),
-     o3(0xED,0x95,0x83), o3(0xED,0x95,0x85),
-     o3(0xED,0x95,0x86), o3(0xED,0x95,0x87),
-     o3(0xED,0x95,0x88), o3(0xED,0x95,0x89),
-     o3(0xED,0x95,0x8A), o3(0xED,0x95,0x8B),
-     o3(0xED,0x95,0x8E), o3(0xED,0x95,0x90),
-     o3(0xED,0x95,0x92), o3(0xED,0x95,0x93),
-     o3(0xED,0x95,0x94), o3(0xED,0x95,0x95),
-     o3(0xED,0x95,0x96), o3(0xED,0x95,0x97),
-     o3(0xED,0x95,0x9A), o3(0xED,0x95,0x9B),
-     o3(0xED,0x95,0x9D), o3(0xED,0x95,0x9E),
-     o3(0xED,0x95,0x9F), o3(0xED,0x95,0xA1),
-     o3(0xED,0x95,0xA2), o3(0xED,0x95,0xA3),
-     o3(0xEC,0x9B,0xA9), o3(0xEC,0x9B,0xAC),
-     o3(0xEC,0x9B,0xB0), o3(0xEC,0x9B,0xB8),
-     o3(0xEC,0x9B,0xB9), o3(0xEC,0x9B,0xBD),
-     o3(0xEC,0x9C,0x84), o3(0xEC,0x9C,0x85),
-     o3(0xEC,0x9C,0x88), o3(0xEC,0x9C,0x8C),
-     o3(0xEC,0x9C,0x94), o3(0xEC,0x9C,0x95),
-     o3(0xEC,0x9C,0x97), o3(0xEC,0x9C,0x99),
-     o3(0xEC,0x9C,0xA0), o3(0xEC,0x9C,0xA1),
-     o3(0xEC,0x9C,0xA4), o3(0xEC,0x9C,0xA8),
-     o3(0xEC,0x9C,0xB0), o3(0xEC,0x9C,0xB1),
-     o3(0xEC,0x9C,0xB3), o3(0xEC,0x9C,0xB5),
-     o3(0xEC,0x9C,0xB7), o3(0xEC,0x9C,0xBC),
-     o3(0xEC,0x9C,0xBD), o3(0xEC,0x9D,0x80),
-     o3(0xEC,0x9D,0x84), o3(0xEC,0x9D,0x8A),
-     o3(0xEC,0x9D,0x8C), o3(0xEC,0x9D,0x8D),
-     o3(0xEC,0x9D,0x8F), o3(0xEC,0x9D,0x91),
-     o3(0xEC,0x9D,0x92), o3(0xEC,0x9D,0x93),
-     o3(0xEC,0x9D,0x94), o3(0xEC,0x9D,0x95),
-     o3(0xEC,0x9D,0x96), o3(0xEC,0x9D,0x97),
-     o3(0xEC,0x9D,0x98), o3(0xEC,0x9D,0x9C),
-     o3(0xEC,0x9D,0xA0), o3(0xEC,0x9D,0xA8),
-     o3(0xEC,0x9D,0xAB), o3(0xEC,0x9D,0xB4),
-     o3(0xEC,0x9D,0xB5), o3(0xEC,0x9D,0xB8),
-     o3(0xEC,0x9D,0xBC), o3(0xEC,0x9D,0xBD),
-     o3(0xEC,0x9D,0xBE), o3(0xEC,0x9E,0x83),
-     o3(0xEC,0x9E,0x84), o3(0xEC,0x9E,0x85),
-     o3(0xEC,0x9E,0x87), o3(0xEC,0x9E,0x88),
-     o3(0xEC,0x9E,0x89), o3(0xEC,0x9E,0x8A),
-     o3(0xEC,0x9E,0x8E), o3(0xEC,0x9E,0x90),
-     o3(0xEC,0x9E,0x91), o3(0xEC,0x9E,0x94),
-     o3(0xEC,0x9E,0x96), o3(0xEC,0x9E,0x97),
-     o3(0xEC,0x9E,0x98), o3(0xEC,0x9E,0x9A),
-     o3(0xEC,0x9E,0xA0), o3(0xEC,0x9E,0xA1),
-     o3(0xEC,0x9E,0xA3), o3(0xEC,0x9E,0xA4),
-     o3(0xEC,0x9E,0xA5), o3(0xEC,0x9E,0xA6),
-     o3(0xEC,0x9E,0xAC), o3(0xEC,0x9E,0xAD),
-     o3(0xEC,0x9E,0xB0), o3(0xEC,0x9E,0xB4),
-     o3(0xEC,0x9E,0xBC), o3(0xEC,0x9E,0xBD),
-     o3(0xEC,0x9E,0xBF), o3(0xEC,0x9F,0x80),
-     o3(0xEC,0x9F,0x81), o3(0xEC,0x9F,0x88),
-     o3(0xEC,0x9F,0x89), o3(0xEC,0x9F,0x8C),
-     o3(0xEC,0x9F,0x8E), o3(0xEC,0x9F,0x90),
-     o3(0xEC,0x9F,0x98), o3(0xEC,0x9F,0x9D),
-     o3(0xEC,0x9F,0xA4), o3(0xEC,0x9F,0xA8),
-     o3(0xEC,0x9F,0xAC), o3(0xEC,0xA0,0x80),
-     o3(0xEC,0xA0,0x81), o3(0xEC,0xA0,0x84),
-     o3(0xEC,0xA0,0x88), o3(0xEC,0xA0,0x8A),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C0 = {
-    from_CP949_81_offsets,
-    from_CP949_C0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C1_infos[179] = {
-     o3(0xED,0x95,0xA4), o3(0xED,0x95,0xA6),
-     o3(0xED,0x95,0xA7), o3(0xED,0x95,0xAA),
-     o3(0xED,0x95,0xAC), o3(0xED,0x95,0xAE),
-     o3(0xED,0x95,0xAF), o3(0xED,0x95,0xB0),
-     o3(0xED,0x95,0xB1), o3(0xED,0x95,0xB2),
-     o3(0xED,0x95,0xB3), o3(0xED,0x95,0xB6),
-     o3(0xED,0x95,0xB7), o3(0xED,0x95,0xB9),
-     o3(0xED,0x95,0xBA), o3(0xED,0x95,0xBB),
-     o3(0xED,0x95,0xBD), o3(0xED,0x95,0xBE),
-     o3(0xED,0x95,0xBF), o3(0xED,0x96,0x80),
-     o3(0xED,0x96,0x81), o3(0xED,0x96,0x82),
-     o3(0xED,0x96,0x83), o3(0xED,0x96,0x86),
-     o3(0xED,0x96,0x8A), o3(0xED,0x96,0x8B),
-     o3(0xED,0x96,0x8C), o3(0xED,0x96,0x8D),
-     o3(0xED,0x96,0x8E), o3(0xED,0x96,0x8F),
-     o3(0xED,0x96,0x91), o3(0xED,0x96,0x92),
-     o3(0xED,0x96,0x93), o3(0xED,0x96,0x94),
-     o3(0xED,0x96,0x95), o3(0xED,0x96,0x96),
-     o3(0xED,0x96,0x97), o3(0xED,0x96,0x98),
-     o3(0xED,0x96,0x99), o3(0xED,0x96,0x9A),
-     o3(0xED,0x96,0x9B), o3(0xED,0x96,0x9C),
-     o3(0xED,0x96,0x9D), o3(0xED,0x96,0x9E),
-     o3(0xED,0x96,0x9F), o3(0xED,0x96,0xA0),
-     o3(0xED,0x96,0xA1), o3(0xED,0x96,0xA2),
-     o3(0xED,0x96,0xA3), o3(0xED,0x96,0xA4),
-     o3(0xED,0x96,0xA6), o3(0xED,0x96,0xA7),
-     o3(0xED,0x96,0xA8), o3(0xED,0x96,0xA9),
-     o3(0xED,0x96,0xAA), o3(0xED,0x96,0xAB),
-     o3(0xED,0x96,0xAC), o3(0xED,0x96,0xAD),
-     o3(0xED,0x96,0xAE), o3(0xED,0x96,0xAF),
-     o3(0xED,0x96,0xB0), o3(0xED,0x96,0xB1),
-     o3(0xED,0x96,0xB2), o3(0xED,0x96,0xB3),
-     o3(0xED,0x96,0xB4), o3(0xED,0x96,0xB5),
-     o3(0xED,0x96,0xB6), o3(0xED,0x96,0xB7),
-     o3(0xED,0x96,0xB8), o3(0xED,0x96,0xB9),
-     o3(0xED,0x96,0xBA), o3(0xED,0x96,0xBB),
-     o3(0xED,0x96,0xBC), o3(0xED,0x96,0xBD),
-     o3(0xED,0x96,0xBE), o3(0xED,0x96,0xBF),
-     o3(0xED,0x97,0x80), o3(0xED,0x97,0x81),
-     o3(0xED,0x97,0x82), o3(0xED,0x97,0x83),
-     o3(0xED,0x97,0x84), o3(0xED,0x97,0x85),
-     o3(0xED,0x97,0x86), o3(0xED,0x97,0x87),
-     o3(0xEC,0xA0,0x90), o3(0xEC,0xA0,0x91),
-     o3(0xEC,0xA0,0x93), o3(0xEC,0xA0,0x95),
-     o3(0xEC,0xA0,0x96), o3(0xEC,0xA0,0x9C),
-     o3(0xEC,0xA0,0x9D), o3(0xEC,0xA0,0xA0),
-     o3(0xEC,0xA0,0xA4), o3(0xEC,0xA0,0xAC),
-     o3(0xEC,0xA0,0xAD), o3(0xEC,0xA0,0xAF),
-     o3(0xEC,0xA0,0xB1), o3(0xEC,0xA0,0xB8),
-     o3(0xEC,0xA0,0xBC), o3(0xEC,0xA1,0x80),
-     o3(0xEC,0xA1,0x88), o3(0xEC,0xA1,0x89),
-     o3(0xEC,0xA1,0x8C), o3(0xEC,0xA1,0x8D),
-     o3(0xEC,0xA1,0x94), o3(0xEC,0xA1,0xB0),
-     o3(0xEC,0xA1,0xB1), o3(0xEC,0xA1,0xB4),
-     o3(0xEC,0xA1,0xB8), o3(0xEC,0xA1,0xBA),
-     o3(0xEC,0xA2,0x80), o3(0xEC,0xA2,0x81),
-     o3(0xEC,0xA2,0x83), o3(0xEC,0xA2,0x85),
-     o3(0xEC,0xA2,0x86), o3(0xEC,0xA2,0x87),
-     o3(0xEC,0xA2,0x8B), o3(0xEC,0xA2,0x8C),
-     o3(0xEC,0xA2,0x8D), o3(0xEC,0xA2,0x94),
-     o3(0xEC,0xA2,0x9D), o3(0xEC,0xA2,0x9F),
-     o3(0xEC,0xA2,0xA1), o3(0xEC,0xA2,0xA8),
-     o3(0xEC,0xA2,0xBC), o3(0xEC,0xA2,0xBD),
-     o3(0xEC,0xA3,0x84), o3(0xEC,0xA3,0x88),
-     o3(0xEC,0xA3,0x8C), o3(0xEC,0xA3,0x94),
-     o3(0xEC,0xA3,0x95), o3(0xEC,0xA3,0x97),
-     o3(0xEC,0xA3,0x99), o3(0xEC,0xA3,0xA0),
-     o3(0xEC,0xA3,0xA1), o3(0xEC,0xA3,0xA4),
-     o3(0xEC,0xA3,0xB5), o3(0xEC,0xA3,0xBC),
-     o3(0xEC,0xA3,0xBD), o3(0xEC,0xA4,0x80),
-     o3(0xEC,0xA4,0x84), o3(0xEC,0xA4,0x85),
-     o3(0xEC,0xA4,0x86), o3(0xEC,0xA4,0x8C),
-     o3(0xEC,0xA4,0x8D), o3(0xEC,0xA4,0x8F),
-     o3(0xEC,0xA4,0x91), o3(0xEC,0xA4,0x98),
-     o3(0xEC,0xA4,0xAC), o3(0xEC,0xA4,0xB4),
-     o3(0xEC,0xA5,0x90), o3(0xEC,0xA5,0x91),
-     o3(0xEC,0xA5,0x94), o3(0xEC,0xA5,0x98),
-     o3(0xEC,0xA5,0xA0), o3(0xEC,0xA5,0xA1),
-     o3(0xEC,0xA5,0xA3), o3(0xEC,0xA5,0xAC),
-     o3(0xEC,0xA5,0xB0), o3(0xEC,0xA5,0xB4),
-     o3(0xEC,0xA5,0xBC), o3(0xEC,0xA6,0x88),
-     o3(0xEC,0xA6,0x89), o3(0xEC,0xA6,0x8C),
-     o3(0xEC,0xA6,0x90), o3(0xEC,0xA6,0x98),
-     o3(0xEC,0xA6,0x99), o3(0xEC,0xA6,0x9B),
-     o3(0xEC,0xA6,0x9D), o3(0xEC,0xA7,0x80),
-     o3(0xEC,0xA7,0x81), o3(0xEC,0xA7,0x84),
-     o3(0xEC,0xA7,0x87), o3(0xEC,0xA7,0x88),
-     o3(0xEC,0xA7,0x8A), o3(0xEC,0xA7,0x90),
-     o3(0xEC,0xA7,0x91), o3(0xEC,0xA7,0x93),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C1 = {
-    from_CP949_81_offsets,
-    from_CP949_C1_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C2_infos[179] = {
-     o3(0xED,0x97,0x8A), o3(0xED,0x97,0x8B),
-     o3(0xED,0x97,0x8D), o3(0xED,0x97,0x8E),
-     o3(0xED,0x97,0x8F), o3(0xED,0x97,0x91),
-     o3(0xED,0x97,0x93), o3(0xED,0x97,0x94),
-     o3(0xED,0x97,0x95), o3(0xED,0x97,0x96),
-     o3(0xED,0x97,0x97), o3(0xED,0x97,0x9A),
-     o3(0xED,0x97,0x9C), o3(0xED,0x97,0x9E),
-     o3(0xED,0x97,0x9F), o3(0xED,0x97,0xA0),
-     o3(0xED,0x97,0xA1), o3(0xED,0x97,0xA2),
-     o3(0xED,0x97,0xA3), o3(0xED,0x97,0xA6),
-     o3(0xED,0x97,0xA7), o3(0xED,0x97,0xA9),
-     o3(0xED,0x97,0xAA), o3(0xED,0x97,0xAB),
-     o3(0xED,0x97,0xAD), o3(0xED,0x97,0xAE),
-     o3(0xED,0x97,0xAF), o3(0xED,0x97,0xB0),
-     o3(0xED,0x97,0xB1), o3(0xED,0x97,0xB2),
-     o3(0xED,0x97,0xB3), o3(0xED,0x97,0xB6),
-     o3(0xED,0x97,0xB8), o3(0xED,0x97,0xBA),
-     o3(0xED,0x97,0xBB), o3(0xED,0x97,0xBC),
-     o3(0xED,0x97,0xBD), o3(0xED,0x97,0xBE),
-     o3(0xED,0x97,0xBF), o3(0xED,0x98,0x82),
-     o3(0xED,0x98,0x83), o3(0xED,0x98,0x85),
-     o3(0xED,0x98,0x86), o3(0xED,0x98,0x87),
-     o3(0xED,0x98,0x89), o3(0xED,0x98,0x8A),
-     o3(0xED,0x98,0x8B), o3(0xED,0x98,0x8C),
-     o3(0xED,0x98,0x8D), o3(0xED,0x98,0x8E),
-     o3(0xED,0x98,0x8F), o3(0xED,0x98,0x92),
-     o3(0xED,0x98,0x96), o3(0xED,0x98,0x97),
-     o3(0xED,0x98,0x98), o3(0xED,0x98,0x99),
-     o3(0xED,0x98,0x9A), o3(0xED,0x98,0x9B),
-     o3(0xED,0x98,0x9D), o3(0xED,0x98,0x9E),
-     o3(0xED,0x98,0x9F), o3(0xED,0x98,0xA1),
-     o3(0xED,0x98,0xA2), o3(0xED,0x98,0xA3),
-     o3(0xED,0x98,0xA5), o3(0xED,0x98,0xA6),
-     o3(0xED,0x98,0xA7), o3(0xED,0x98,0xA8),
-     o3(0xED,0x98,0xA9), o3(0xED,0x98,0xAA),
-     o3(0xED,0x98,0xAB), o3(0xED,0x98,0xAC),
-     o3(0xED,0x98,0xAE), o3(0xED,0x98,0xAF),
-     o3(0xED,0x98,0xB0), o3(0xED,0x98,0xB1),
-     o3(0xED,0x98,0xB2), o3(0xED,0x98,0xB3),
-     o3(0xED,0x98,0xB4), o3(0xED,0x98,0xB5),
-     o3(0xED,0x98,0xB6), o3(0xED,0x98,0xB7),
-     o3(0xED,0x98,0xBA), o3(0xED,0x98,0xBB),
-     o3(0xEC,0xA7,0x95), o3(0xEC,0xA7,0x96),
-     o3(0xEC,0xA7,0x99), o3(0xEC,0xA7,0x9A),
-     o3(0xEC,0xA7,0x9C), o3(0xEC,0xA7,0x9D),
-     o3(0xEC,0xA7,0xA0), o3(0xEC,0xA7,0xA2),
-     o3(0xEC,0xA7,0xA4), o3(0xEC,0xA7,0xA7),
-     o3(0xEC,0xA7,0xAC), o3(0xEC,0xA7,0xAD),
-     o3(0xEC,0xA7,0xAF), o3(0xEC,0xA7,0xB0),
-     o3(0xEC,0xA7,0xB1), o3(0xEC,0xA7,0xB8),
-     o3(0xEC,0xA7,0xB9), o3(0xEC,0xA7,0xBC),
-     o3(0xEC,0xA8,0x80), o3(0xEC,0xA8,0x88),
-     o3(0xEC,0xA8,0x89), o3(0xEC,0xA8,0x8B),
-     o3(0xEC,0xA8,0x8C), o3(0xEC,0xA8,0x8D),
-     o3(0xEC,0xA8,0x94), o3(0xEC,0xA8,0x98),
-     o3(0xEC,0xA8,0xA9), o3(0xEC,0xA9,0x8C),
-     o3(0xEC,0xA9,0x8D), o3(0xEC,0xA9,0x90),
-     o3(0xEC,0xA9,0x94), o3(0xEC,0xA9,0x9C),
-     o3(0xEC,0xA9,0x9D), o3(0xEC,0xA9,0x9F),
-     o3(0xEC,0xA9,0xA0), o3(0xEC,0xA9,0xA1),
-     o3(0xEC,0xA9,0xA8), o3(0xEC,0xA9,0xBD),
-     o3(0xEC,0xAA,0x84), o3(0xEC,0xAA,0x98),
-     o3(0xEC,0xAA,0xBC), o3(0xEC,0xAA,0xBD),
-     o3(0xEC,0xAB,0x80), o3(0xEC,0xAB,0x84),
-     o3(0xEC,0xAB,0x8C), o3(0xEC,0xAB,0x8D),
-     o3(0xEC,0xAB,0x8F), o3(0xEC,0xAB,0x91),
-     o3(0xEC,0xAB,0x93), o3(0xEC,0xAB,0x98),
-     o3(0xEC,0xAB,0x99), o3(0xEC,0xAB,0xA0),
-     o3(0xEC,0xAB,0xAC), o3(0xEC,0xAB,0xB4),
-     o3(0xEC,0xAC,0x88), o3(0xEC,0xAC,0x90),
-     o3(0xEC,0xAC,0x94), o3(0xEC,0xAC,0x98),
-     o3(0xEC,0xAC,0xA0), o3(0xEC,0xAC,0xA1),
-     o3(0xEC,0xAD,0x81), o3(0xEC,0xAD,0x88),
-     o3(0xEC,0xAD,0x89), o3(0xEC,0xAD,0x8C),
-     o3(0xEC,0xAD,0x90), o3(0xEC,0xAD,0x98),
-     o3(0xEC,0xAD,0x99), o3(0xEC,0xAD,0x9D),
-     o3(0xEC,0xAD,0xA4), o3(0xEC,0xAD,0xB8),
-     o3(0xEC,0xAD,0xB9), o3(0xEC,0xAE,0x9C),
-     o3(0xEC,0xAE,0xB8), o3(0xEC,0xAF,0x94),
-     o3(0xEC,0xAF,0xA4), o3(0xEC,0xAF,0xA7),
-     o3(0xEC,0xAF,0xA9), o3(0xEC,0xB0,0x8C),
-     o3(0xEC,0xB0,0x8D), o3(0xEC,0xB0,0x90),
-     o3(0xEC,0xB0,0x94), o3(0xEC,0xB0,0x9C),
-     o3(0xEC,0xB0,0x9D), o3(0xEC,0xB0,0xA1),
-     o3(0xEC,0xB0,0xA2), o3(0xEC,0xB0,0xA7),
-     o3(0xEC,0xB0,0xA8), o3(0xEC,0xB0,0xA9),
-     o3(0xEC,0xB0,0xAC), o3(0xEC,0xB0,0xAE),
-     o3(0xEC,0xB0,0xB0), o3(0xEC,0xB0,0xB8),
-     o3(0xEC,0xB0,0xB9), o3(0xEC,0xB0,0xBB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C2 = {
-    from_CP949_81_offsets,
-    from_CP949_C2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C3_infos[179] = {
-     o3(0xED,0x98,0xBD), o3(0xED,0x98,0xBE),
-     o3(0xED,0x98,0xBF), o3(0xED,0x99,0x81),
-     o3(0xED,0x99,0x82), o3(0xED,0x99,0x83),
-     o3(0xED,0x99,0x84), o3(0xED,0x99,0x86),
-     o3(0xED,0x99,0x87), o3(0xED,0x99,0x8A),
-     o3(0xED,0x99,0x8C), o3(0xED,0x99,0x8E),
-     o3(0xED,0x99,0x8F), o3(0xED,0x99,0x90),
-     o3(0xED,0x99,0x92), o3(0xED,0x99,0x93),
-     o3(0xED,0x99,0x96), o3(0xED,0x99,0x97),
-     o3(0xED,0x99,0x99), o3(0xED,0x99,0x9A),
-     o3(0xED,0x99,0x9B), o3(0xED,0x99,0x9D),
-     o3(0xED,0x99,0x9E), o3(0xED,0x99,0x9F),
-     o3(0xED,0x99,0xA0), o3(0xED,0x99,0xA1),
-     o3(0xED,0x99,0xA2), o3(0xED,0x99,0xA3),
-     o3(0xED,0x99,0xA4), o3(0xED,0x99,0xA5),
-     o3(0xED,0x99,0xA6), o3(0xED,0x99,0xA8),
-     o3(0xED,0x99,0xAA), o3(0xED,0x99,0xAB),
-     o3(0xED,0x99,0xAC), o3(0xED,0x99,0xAD),
-     o3(0xED,0x99,0xAE), o3(0xED,0x99,0xAF),
-     o3(0xED,0x99,0xB2), o3(0xED,0x99,0xB3),
-     o3(0xED,0x99,0xB5), o3(0xED,0x99,0xB6),
-     o3(0xED,0x99,0xB7), o3(0xED,0x99,0xB8),
-     o3(0xED,0x99,0xB9), o3(0xED,0x99,0xBA),
-     o3(0xED,0x99,0xBB), o3(0xED,0x99,0xBC),
-     o3(0xED,0x99,0xBD), o3(0xED,0x99,0xBE),
-     o3(0xED,0x99,0xBF), o3(0xED,0x9A,0x80),
-     o3(0xED,0x9A,0x81), o3(0xED,0x9A,0x82),
-     o3(0xED,0x9A,0x84), o3(0xED,0x9A,0x86),
-     o3(0xED,0x9A,0x87), o3(0xED,0x9A,0x88),
-     o3(0xED,0x9A,0x89), o3(0xED,0x9A,0x8A),
-     o3(0xED,0x9A,0x8B), o3(0xED,0x9A,0x8E),
-     o3(0xED,0x9A,0x8F), o3(0xED,0x9A,0x91),
-     o3(0xED,0x9A,0x92), o3(0xED,0x9A,0x93),
-     o3(0xED,0x9A,0x95), o3(0xED,0x9A,0x96),
-     o3(0xED,0x9A,0x97), o3(0xED,0x9A,0x98),
-     o3(0xED,0x9A,0x99), o3(0xED,0x9A,0x9A),
-     o3(0xED,0x9A,0x9B), o3(0xED,0x9A,0x9C),
-     o3(0xED,0x9A,0x9E), o3(0xED,0x9A,0xA0),
-     o3(0xED,0x9A,0xA2), o3(0xED,0x9A,0xA3),
-     o3(0xED,0x9A,0xA4), o3(0xED,0x9A,0xA5),
-     o3(0xED,0x9A,0xA6), o3(0xED,0x9A,0xA7),
-     o3(0xED,0x9A,0xA9), o3(0xED,0x9A,0xAA),
-     o3(0xEC,0xB0,0xBC), o3(0xEC,0xB0,0xBD),
-     o3(0xEC,0xB0,0xBE), o3(0xEC,0xB1,0x84),
-     o3(0xEC,0xB1,0x85), o3(0xEC,0xB1,0x88),
-     o3(0xEC,0xB1,0x8C), o3(0xEC,0xB1,0x94),
-     o3(0xEC,0xB1,0x95), o3(0xEC,0xB1,0x97),
-     o3(0xEC,0xB1,0x98), o3(0xEC,0xB1,0x99),
-     o3(0xEC,0xB1,0xA0), o3(0xEC,0xB1,0xA4),
-     o3(0xEC,0xB1,0xA6), o3(0xEC,0xB1,0xA8),
-     o3(0xEC,0xB1,0xB0), o3(0xEC,0xB1,0xB5),
-     o3(0xEC,0xB2,0x98), o3(0xEC,0xB2,0x99),
-     o3(0xEC,0xB2,0x9C), o3(0xEC,0xB2,0xA0),
-     o3(0xEC,0xB2,0xA8), o3(0xEC,0xB2,0xA9),
-     o3(0xEC,0xB2,0xAB), o3(0xEC,0xB2,0xAC),
-     o3(0xEC,0xB2,0xAD), o3(0xEC,0xB2,0xB4),
-     o3(0xEC,0xB2,0xB5), o3(0xEC,0xB2,0xB8),
-     o3(0xEC,0xB2,0xBC), o3(0xEC,0xB3,0x84),
-     o3(0xEC,0xB3,0x85), o3(0xEC,0xB3,0x87),
-     o3(0xEC,0xB3,0x89), o3(0xEC,0xB3,0x90),
-     o3(0xEC,0xB3,0x94), o3(0xEC,0xB3,0xA4),
-     o3(0xEC,0xB3,0xAC), o3(0xEC,0xB3,0xB0),
-     o3(0xEC,0xB4,0x81), o3(0xEC,0xB4,0x88),
-     o3(0xEC,0xB4,0x89), o3(0xEC,0xB4,0x8C),
-     o3(0xEC,0xB4,0x90), o3(0xEC,0xB4,0x98),
-     o3(0xEC,0xB4,0x99), o3(0xEC,0xB4,0x9B),
-     o3(0xEC,0xB4,0x9D), o3(0xEC,0xB4,0xA4),
-     o3(0xEC,0xB4,0xA8), o3(0xEC,0xB4,0xAC),
-     o3(0xEC,0xB4,0xB9), o3(0xEC,0xB5,0x9C),
-     o3(0xEC,0xB5,0xA0), o3(0xEC,0xB5,0xA4),
-     o3(0xEC,0xB5,0xAC), o3(0xEC,0xB5,0xAD),
-     o3(0xEC,0xB5,0xAF), o3(0xEC,0xB5,0xB1),
-     o3(0xEC,0xB5,0xB8), o3(0xEC,0xB6,0x88),
-     o3(0xEC,0xB6,0x94), o3(0xEC,0xB6,0x95),
-     o3(0xEC,0xB6,0x98), o3(0xEC,0xB6,0x9C),
-     o3(0xEC,0xB6,0xA4), o3(0xEC,0xB6,0xA5),
-     o3(0xEC,0xB6,0xA7), o3(0xEC,0xB6,0xA9),
-     o3(0xEC,0xB6,0xB0), o3(0xEC,0xB7,0x84),
-     o3(0xEC,0xB7,0x8C), o3(0xEC,0xB7,0x90),
-     o3(0xEC,0xB7,0xA8), o3(0xEC,0xB7,0xAC),
-     o3(0xEC,0xB7,0xB0), o3(0xEC,0xB7,0xB8),
-     o3(0xEC,0xB7,0xB9), o3(0xEC,0xB7,0xBB),
-     o3(0xEC,0xB7,0xBD), o3(0xEC,0xB8,0x84),
-     o3(0xEC,0xB8,0x88), o3(0xEC,0xB8,0x8C),
-     o3(0xEC,0xB8,0x94), o3(0xEC,0xB8,0x99),
-     o3(0xEC,0xB8,0xA0), o3(0xEC,0xB8,0xA1),
-     o3(0xEC,0xB8,0xA4), o3(0xEC,0xB8,0xA8),
-     o3(0xEC,0xB8,0xB0), o3(0xEC,0xB8,0xB1),
-     o3(0xEC,0xB8,0xB3), o3(0xEC,0xB8,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C3 = {
-    from_CP949_81_offsets,
-    from_CP949_C3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C4_infos[179] = {
-     o3(0xED,0x9A,0xAB), o3(0xED,0x9A,0xAD),
-     o3(0xED,0x9A,0xAE), o3(0xED,0x9A,0xAF),
-     o3(0xED,0x9A,0xB1), o3(0xED,0x9A,0xB2),
-     o3(0xED,0x9A,0xB3), o3(0xED,0x9A,0xB4),
-     o3(0xED,0x9A,0xB5), o3(0xED,0x9A,0xB6),
-     o3(0xED,0x9A,0xB7), o3(0xED,0x9A,0xB8),
-     o3(0xED,0x9A,0xBA), o3(0xED,0x9A,0xBC),
-     o3(0xED,0x9A,0xBD), o3(0xED,0x9A,0xBE),
-     o3(0xED,0x9A,0xBF), o3(0xED,0x9B,0x80),
-     o3(0xED,0x9B,0x81), o3(0xED,0x9B,0x82),
-     o3(0xED,0x9B,0x83), o3(0xED,0x9B,0x86),
-     o3(0xED,0x9B,0x87), o3(0xED,0x9B,0x89),
-     o3(0xED,0x9B,0x8A), o3(0xED,0x9B,0x8B),
-     o3(0xED,0x9B,0x8D), o3(0xED,0x9B,0x8E),
-     o3(0xED,0x9B,0x8F), o3(0xED,0x9B,0x90),
-     o3(0xED,0x9B,0x92), o3(0xED,0x9B,0x93),
-     o3(0xED,0x9B,0x95), o3(0xED,0x9B,0x96),
-     o3(0xED,0x9B,0x98), o3(0xED,0x9B,0x9A),
-     o3(0xED,0x9B,0x9B), o3(0xED,0x9B,0x9C),
-     o3(0xED,0x9B,0x9D), o3(0xED,0x9B,0x9E),
-     o3(0xED,0x9B,0x9F), o3(0xED,0x9B,0xA1),
-     o3(0xED,0x9B,0xA2), o3(0xED,0x9B,0xA3),
-     o3(0xED,0x9B,0xA5), o3(0xED,0x9B,0xA6),
-     o3(0xED,0x9B,0xA7), o3(0xED,0x9B,0xA9),
-     o3(0xED,0x9B,0xAA), o3(0xED,0x9B,0xAB),
-     o3(0xED,0x9B,0xAC), o3(0xED,0x9B,0xAD),
-     o3(0xED,0x9B,0xAE), o3(0xED,0x9B,0xAF),
-     o3(0xED,0x9B,0xB1), o3(0xED,0x9B,0xB2),
-     o3(0xED,0x9B,0xB3), o3(0xED,0x9B,0xB4),
-     o3(0xED,0x9B,0xB6), o3(0xED,0x9B,0xB7),
-     o3(0xED,0x9B,0xB8), o3(0xED,0x9B,0xB9),
-     o3(0xED,0x9B,0xBA), o3(0xED,0x9B,0xBB),
-     o3(0xED,0x9B,0xBE), o3(0xED,0x9B,0xBF),
-     o3(0xED,0x9C,0x81), o3(0xED,0x9C,0x82),
-     o3(0xED,0x9C,0x83), o3(0xED,0x9C,0x85),
-     o3(0xED,0x9C,0x86), o3(0xED,0x9C,0x87),
-     o3(0xED,0x9C,0x88), o3(0xED,0x9C,0x89),
-     o3(0xED,0x9C,0x8A), o3(0xED,0x9C,0x8B),
-     o3(0xED,0x9C,0x8C), o3(0xED,0x9C,0x8D),
-     o3(0xED,0x9C,0x8E), o3(0xED,0x9C,0x8F),
-     o3(0xED,0x9C,0x90), o3(0xED,0x9C,0x92),
-     o3(0xED,0x9C,0x93), o3(0xED,0x9C,0x94),
-     o3(0xEC,0xB9,0x98), o3(0xEC,0xB9,0x99),
-     o3(0xEC,0xB9,0x9C), o3(0xEC,0xB9,0x9F),
-     o3(0xEC,0xB9,0xA0), o3(0xEC,0xB9,0xA1),
-     o3(0xEC,0xB9,0xA8), o3(0xEC,0xB9,0xA9),
-     o3(0xEC,0xB9,0xAB), o3(0xEC,0xB9,0xAD),
-     o3(0xEC,0xB9,0xB4), o3(0xEC,0xB9,0xB5),
-     o3(0xEC,0xB9,0xB8), o3(0xEC,0xB9,0xBC),
-     o3(0xEC,0xBA,0x84), o3(0xEC,0xBA,0x85),
-     o3(0xEC,0xBA,0x87), o3(0xEC,0xBA,0x89),
-     o3(0xEC,0xBA,0x90), o3(0xEC,0xBA,0x91),
-     o3(0xEC,0xBA,0x94), o3(0xEC,0xBA,0x98),
-     o3(0xEC,0xBA,0xA0), o3(0xEC,0xBA,0xA1),
-     o3(0xEC,0xBA,0xA3), o3(0xEC,0xBA,0xA4),
-     o3(0xEC,0xBA,0xA5), o3(0xEC,0xBA,0xAC),
-     o3(0xEC,0xBA,0xAD), o3(0xEC,0xBB,0x81),
-     o3(0xEC,0xBB,0xA4), o3(0xEC,0xBB,0xA5),
-     o3(0xEC,0xBB,0xA8), o3(0xEC,0xBB,0xAB),
-     o3(0xEC,0xBB,0xAC), o3(0xEC,0xBB,0xB4),
-     o3(0xEC,0xBB,0xB5), o3(0xEC,0xBB,0xB7),
-     o3(0xEC,0xBB,0xB8), o3(0xEC,0xBB,0xB9),
-     o3(0xEC,0xBC,0x80), o3(0xEC,0xBC,0x81),
-     o3(0xEC,0xBC,0x84), o3(0xEC,0xBC,0x88),
-     o3(0xEC,0xBC,0x90), o3(0xEC,0xBC,0x91),
-     o3(0xEC,0xBC,0x93), o3(0xEC,0xBC,0x95),
-     o3(0xEC,0xBC,0x9C), o3(0xEC,0xBC,0xA0),
-     o3(0xEC,0xBC,0xA4), o3(0xEC,0xBC,0xAC),
-     o3(0xEC,0xBC,0xAD), o3(0xEC,0xBC,0xAF),
-     o3(0xEC,0xBC,0xB0), o3(0xEC,0xBC,0xB1),
-     o3(0xEC,0xBC,0xB8), o3(0xEC,0xBD,0x94),
-     o3(0xEC,0xBD,0x95), o3(0xEC,0xBD,0x98),
-     o3(0xEC,0xBD,0x9C), o3(0xEC,0xBD,0xA4),
-     o3(0xEC,0xBD,0xA5), o3(0xEC,0xBD,0xA7),
-     o3(0xEC,0xBD,0xA9), o3(0xEC,0xBD,0xB0),
-     o3(0xEC,0xBD,0xB1), o3(0xEC,0xBD,0xB4),
-     o3(0xEC,0xBD,0xB8), o3(0xEC,0xBE,0x80),
-     o3(0xEC,0xBE,0x85), o3(0xEC,0xBE,0x8C),
-     o3(0xEC,0xBE,0xA1), o3(0xEC,0xBE,0xA8),
-     o3(0xEC,0xBE,0xB0), o3(0xEC,0xBF,0x84),
-     o3(0xEC,0xBF,0xA0), o3(0xEC,0xBF,0xA1),
-     o3(0xEC,0xBF,0xA4), o3(0xEC,0xBF,0xA8),
-     o3(0xEC,0xBF,0xB0), o3(0xEC,0xBF,0xB1),
-     o3(0xEC,0xBF,0xB3), o3(0xEC,0xBF,0xB5),
-     o3(0xEC,0xBF,0xBC), o3(0xED,0x80,0x80),
-     o3(0xED,0x80,0x84), o3(0xED,0x80,0x91),
-     o3(0xED,0x80,0x98), o3(0xED,0x80,0xAD),
-     o3(0xED,0x80,0xB4), o3(0xED,0x80,0xB5),
-     o3(0xED,0x80,0xB8), o3(0xED,0x80,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C4 = {
-    from_CP949_81_offsets,
-    from_CP949_C4_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C5_infos[179] = {
-     o3(0xED,0x9C,0x95), o3(0xED,0x9C,0x96),
-     o3(0xED,0x9C,0x97), o3(0xED,0x9C,0x9A),
-     o3(0xED,0x9C,0x9B), o3(0xED,0x9C,0x9D),
-     o3(0xED,0x9C,0x9E), o3(0xED,0x9C,0x9F),
-     o3(0xED,0x9C,0xA1), o3(0xED,0x9C,0xA2),
-     o3(0xED,0x9C,0xA3), o3(0xED,0x9C,0xA4),
-     o3(0xED,0x9C,0xA5), o3(0xED,0x9C,0xA6),
-     o3(0xED,0x9C,0xA7), o3(0xED,0x9C,0xAA),
-     o3(0xED,0x9C,0xAC), o3(0xED,0x9C,0xAE),
-     o3(0xED,0x9C,0xAF), o3(0xED,0x9C,0xB0),
-     o3(0xED,0x9C,0xB1), o3(0xED,0x9C,0xB2),
-     o3(0xED,0x9C,0xB3), o3(0xED,0x9C,0xB6),
-     o3(0xED,0x9C,0xB7), o3(0xED,0x9C,0xB9),
-     o3(0xED,0x9C,0xBA), o3(0xED,0x9C,0xBB),
-     o3(0xED,0x9C,0xBD), o3(0xED,0x9C,0xBE),
-     o3(0xED,0x9C,0xBF), o3(0xED,0x9D,0x80),
-     o3(0xED,0x9D,0x81), o3(0xED,0x9D,0x82),
-     o3(0xED,0x9D,0x83), o3(0xED,0x9D,0x85),
-     o3(0xED,0x9D,0x86), o3(0xED,0x9D,0x88),
-     o3(0xED,0x9D,0x8A), o3(0xED,0x9D,0x8B),
-     o3(0xED,0x9D,0x8C), o3(0xED,0x9D,0x8D),
-     o3(0xED,0x9D,0x8E), o3(0xED,0x9D,0x8F),
-     o3(0xED,0x9D,0x92), o3(0xED,0x9D,0x93),
-     o3(0xED,0x9D,0x95), o3(0xED,0x9D,0x9A),
-     o3(0xED,0x9D,0x9B), o3(0xED,0x9D,0x9C),
-     o3(0xED,0x9D,0x9D), o3(0xED,0x9D,0x9E),
-     o3(0xED,0x9D,0x9F), o3(0xED,0x9D,0xA2),
-     o3(0xED,0x9D,0xA4), o3(0xED,0x9D,0xA6),
-     o3(0xED,0x9D,0xA7), o3(0xED,0x9D,0xA8),
-     o3(0xED,0x9D,0xAA), o3(0xED,0x9D,0xAB),
-     o3(0xED,0x9D,0xAD), o3(0xED,0x9D,0xAE),
-     o3(0xED,0x9D,0xAF), o3(0xED,0x9D,0xB1),
-     o3(0xED,0x9D,0xB2), o3(0xED,0x9D,0xB3),
-     o3(0xED,0x9D,0xB5), o3(0xED,0x9D,0xB6),
-     o3(0xED,0x9D,0xB7), o3(0xED,0x9D,0xB8),
-     o3(0xED,0x9D,0xB9), o3(0xED,0x9D,0xBA),
-     o3(0xED,0x9D,0xBB), o3(0xED,0x9D,0xBE),
-     o3(0xED,0x9D,0xBF), o3(0xED,0x9E,0x80),
-     o3(0xED,0x9E,0x82), o3(0xED,0x9E,0x83),
-     o3(0xED,0x9E,0x84), o3(0xED,0x9E,0x85),
-     o3(0xED,0x9E,0x86), o3(0xED,0x9E,0x87),
-     o3(0xED,0x9E,0x8A), o3(0xED,0x9E,0x8B),
-     o3(0xED,0x81,0x84), o3(0xED,0x81,0x85),
-     o3(0xED,0x81,0x87), o3(0xED,0x81,0x89),
-     o3(0xED,0x81,0x90), o3(0xED,0x81,0x94),
-     o3(0xED,0x81,0x98), o3(0xED,0x81,0xA0),
-     o3(0xED,0x81,0xAC), o3(0xED,0x81,0xAD),
-     o3(0xED,0x81,0xB0), o3(0xED,0x81,0xB4),
-     o3(0xED,0x81,0xBC), o3(0xED,0x81,0xBD),
-     o3(0xED,0x82,0x81), o3(0xED,0x82,0xA4),
-     o3(0xED,0x82,0xA5), o3(0xED,0x82,0xA8),
-     o3(0xED,0x82,0xAC), o3(0xED,0x82,0xB4),
-     o3(0xED,0x82,0xB5), o3(0xED,0x82,0xB7),
-     o3(0xED,0x82,0xB9), o3(0xED,0x83,0x80),
-     o3(0xED,0x83,0x81), o3(0xED,0x83,0x84),
-     o3(0xED,0x83,0x88), o3(0xED,0x83,0x89),
-     o3(0xED,0x83,0x90), o3(0xED,0x83,0x91),
-     o3(0xED,0x83,0x93), o3(0xED,0x83,0x94),
-     o3(0xED,0x83,0x95), o3(0xED,0x83,0x9C),
-     o3(0xED,0x83,0x9D), o3(0xED,0x83,0xA0),
-     o3(0xED,0x83,0xA4), o3(0xED,0x83,0xAC),
-     o3(0xED,0x83,0xAD), o3(0xED,0x83,0xAF),
-     o3(0xED,0x83,0xB0), o3(0xED,0x83,0xB1),
-     o3(0xED,0x83,0xB8), o3(0xED,0x84,0x8D),
-     o3(0xED,0x84,0xB0), o3(0xED,0x84,0xB1),
-     o3(0xED,0x84,0xB4), o3(0xED,0x84,0xB8),
-     o3(0xED,0x84,0xBA), o3(0xED,0x85,0x80),
-     o3(0xED,0x85,0x81), o3(0xED,0x85,0x83),
-     o3(0xED,0x85,0x84), o3(0xED,0x85,0x85),
-     o3(0xED,0x85,0x8C), o3(0xED,0x85,0x8D),
-     o3(0xED,0x85,0x90), o3(0xED,0x85,0x94),
-     o3(0xED,0x85,0x9C), o3(0xED,0x85,0x9D),
-     o3(0xED,0x85,0x9F), o3(0xED,0x85,0xA1),
-     o3(0xED,0x85,0xA8), o3(0xED,0x85,0xAC),
-     o3(0xED,0x85,0xBC), o3(0xED,0x86,0x84),
-     o3(0xED,0x86,0x88), o3(0xED,0x86,0xA0),
-     o3(0xED,0x86,0xA1), o3(0xED,0x86,0xA4),
-     o3(0xED,0x86,0xA8), o3(0xED,0x86,0xB0),
-     o3(0xED,0x86,0xB1), o3(0xED,0x86,0xB3),
-     o3(0xED,0x86,0xB5), o3(0xED,0x86,0xBA),
-     o3(0xED,0x86,0xBC), o3(0xED,0x87,0x80),
-     o3(0xED,0x87,0x98), o3(0xED,0x87,0xB4),
-     o3(0xED,0x87,0xB8), o3(0xED,0x88,0x87),
-     o3(0xED,0x88,0x89), o3(0xED,0x88,0x90),
-     o3(0xED,0x88,0xAC), o3(0xED,0x88,0xAD),
-     o3(0xED,0x88,0xB0), o3(0xED,0x88,0xB4),
-     o3(0xED,0x88,0xBC), o3(0xED,0x88,0xBD),
-     o3(0xED,0x88,0xBF), o3(0xED,0x89,0x81),
-     o3(0xED,0x89,0x88), o3(0xED,0x89,0x9C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C5 = {
-    from_CP949_81_offsets,
-    from_CP949_C5_infos
-};
-
-static const unsigned char
-from_CP949_C6_offsets[256] = {
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,  0,  1,  2,  3,  4,  5,  6,      7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112,112,112,112,112,112,112,112,    112,112,112,112,112,112,112,112,
-    112, 18, 19, 20, 21, 22, 23, 24,     25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,     41, 42, 43, 44, 45, 46, 47, 48,
-     49, 50, 51, 52, 53, 54, 55, 56,     57, 58, 59, 60, 61, 62, 63, 64,
-     65, 66, 67, 68, 69, 70, 71, 72,     73, 74, 75, 76, 77, 78, 79, 80,
-     81, 82, 83, 84, 85, 86, 87, 88,     89, 90, 91, 92, 93, 94, 95, 96,
-     97, 98, 99,100,101,102,103,104,    105,106,107,108,109,110,111,112,
-};
-
-static const struct byte_lookup* const
-from_CP949_C6_infos[113] = {
-     o3(0xED,0x9E,0x8D), o3(0xED,0x9E,0x8E),
-     o3(0xED,0x9E,0x8F), o3(0xED,0x9E,0x91),
-     o3(0xED,0x9E,0x92), o3(0xED,0x9E,0x93),
-     o3(0xED,0x9E,0x94), o3(0xED,0x9E,0x95),
-     o3(0xED,0x9E,0x96), o3(0xED,0x9E,0x97),
-     o3(0xED,0x9E,0x9A), o3(0xED,0x9E,0x9C),
-     o3(0xED,0x9E,0x9E), o3(0xED,0x9E,0x9F),
-     o3(0xED,0x9E,0xA0), o3(0xED,0x9E,0xA1),
-     o3(0xED,0x9E,0xA2), o3(0xED,0x9E,0xA3),
-     o3(0xED,0x89,0xA4), o3(0xED,0x8A,0x80),
-     o3(0xED,0x8A,0x81), o3(0xED,0x8A,0x84),
-     o3(0xED,0x8A,0x88), o3(0xED,0x8A,0x90),
-     o3(0xED,0x8A,0x91), o3(0xED,0x8A,0x95),
-     o3(0xED,0x8A,0x9C), o3(0xED,0x8A,0xA0),
-     o3(0xED,0x8A,0xA4), o3(0xED,0x8A,0xAC),
-     o3(0xED,0x8A,0xB1), o3(0xED,0x8A,0xB8),
-     o3(0xED,0x8A,0xB9), o3(0xED,0x8A,0xBC),
-     o3(0xED,0x8A,0xBF), o3(0xED,0x8B,0x80),
-     o3(0xED,0x8B,0x82), o3(0xED,0x8B,0x88),
-     o3(0xED,0x8B,0x89), o3(0xED,0x8B,0x8B),
-     o3(0xED,0x8B,0x94), o3(0xED,0x8B,0x98),
-     o3(0xED,0x8B,0x9C), o3(0xED,0x8B,0xA4),
-     o3(0xED,0x8B,0xA5), o3(0xED,0x8B,0xB0),
-     o3(0xED,0x8B,0xB1), o3(0xED,0x8B,0xB4),
-     o3(0xED,0x8B,0xB8), o3(0xED,0x8C,0x80),
-     o3(0xED,0x8C,0x81), o3(0xED,0x8C,0x83),
-     o3(0xED,0x8C,0x85), o3(0xED,0x8C,0x8C),
-     o3(0xED,0x8C,0x8D), o3(0xED,0x8C,0x8E),
-     o3(0xED,0x8C,0x90), o3(0xED,0x8C,0x94),
-     o3(0xED,0x8C,0x96), o3(0xED,0x8C,0x9C),
-     o3(0xED,0x8C,0x9D), o3(0xED,0x8C,0x9F),
-     o3(0xED,0x8C,0xA0), o3(0xED,0x8C,0xA1),
-     o3(0xED,0x8C,0xA5), o3(0xED,0x8C,0xA8),
-     o3(0xED,0x8C,0xA9), o3(0xED,0x8C,0xAC),
-     o3(0xED,0x8C,0xB0), o3(0xED,0x8C,0xB8),
-     o3(0xED,0x8C,0xB9), o3(0xED,0x8C,0xBB),
-     o3(0xED,0x8C,0xBC), o3(0xED,0x8C,0xBD),
-     o3(0xED,0x8D,0x84), o3(0xED,0x8D,0x85),
-     o3(0xED,0x8D,0xBC), o3(0xED,0x8D,0xBD),
-     o3(0xED,0x8E,0x80), o3(0xED,0x8E,0x84),
-     o3(0xED,0x8E,0x8C), o3(0xED,0x8E,0x8D),
-     o3(0xED,0x8E,0x8F), o3(0xED,0x8E,0x90),
-     o3(0xED,0x8E,0x91), o3(0xED,0x8E,0x98),
-     o3(0xED,0x8E,0x99), o3(0xED,0x8E,0x9C),
-     o3(0xED,0x8E,0xA0), o3(0xED,0x8E,0xA8),
-     o3(0xED,0x8E,0xA9), o3(0xED,0x8E,0xAB),
-     o3(0xED,0x8E,0xAD), o3(0xED,0x8E,0xB4),
-     o3(0xED,0x8E,0xB8), o3(0xED,0x8E,0xBC),
-     o3(0xED,0x8F,0x84), o3(0xED,0x8F,0x85),
-     o3(0xED,0x8F,0x88), o3(0xED,0x8F,0x89),
-     o3(0xED,0x8F,0x90), o3(0xED,0x8F,0x98),
-     o3(0xED,0x8F,0xA1), o3(0xED,0x8F,0xA3),
-     o3(0xED,0x8F,0xAC), o3(0xED,0x8F,0xAD),
-     o3(0xED,0x8F,0xB0), o3(0xED,0x8F,0xB4),
-     o3(0xED,0x8F,0xBC), o3(0xED,0x8F,0xBD),
-     o3(0xED,0x8F,0xBF), o3(0xED,0x90,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C6 = {
-    from_CP949_C6_offsets,
-    from_CP949_C6_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C7_infos[95] = {
-     o3(0xED,0x90,0x88), o3(0xED,0x90,0x9D),
-     o3(0xED,0x91,0x80), o3(0xED,0x91,0x84),
-     o3(0xED,0x91,0x9C), o3(0xED,0x91,0xA0),
-     o3(0xED,0x91,0xA4), o3(0xED,0x91,0xAD),
-     o3(0xED,0x91,0xAF), o3(0xED,0x91,0xB8),
-     o3(0xED,0x91,0xB9), o3(0xED,0x91,0xBC),
-     o3(0xED,0x91,0xBF), o3(0xED,0x92,0x80),
-     o3(0xED,0x92,0x82), o3(0xED,0x92,0x88),
-     o3(0xED,0x92,0x89), o3(0xED,0x92,0x8B),
-     o3(0xED,0x92,0x8D), o3(0xED,0x92,0x94),
-     o3(0xED,0x92,0xA9), o3(0xED,0x93,0x8C),
-     o3(0xED,0x93,0x90), o3(0xED,0x93,0x94),
-     o3(0xED,0x93,0x9C), o3(0xED,0x93,0x9F),
-     o3(0xED,0x93,0xA8), o3(0xED,0x93,0xAC),
-     o3(0xED,0x93,0xB0), o3(0xED,0x93,0xB8),
-     o3(0xED,0x93,0xBB), o3(0xED,0x93,0xBD),
-     o3(0xED,0x94,0x84), o3(0xED,0x94,0x88),
-     o3(0xED,0x94,0x8C), o3(0xED,0x94,0x94),
-     o3(0xED,0x94,0x95), o3(0xED,0x94,0x97),
-     o3(0xED,0x94,0xBC), o3(0xED,0x94,0xBD),
-     o3(0xED,0x95,0x80), o3(0xED,0x95,0x84),
-     o3(0xED,0x95,0x8C), o3(0xED,0x95,0x8D),
-     o3(0xED,0x95,0x8F), o3(0xED,0x95,0x91),
-     o3(0xED,0x95,0x98), o3(0xED,0x95,0x99),
-     o3(0xED,0x95,0x9C), o3(0xED,0x95,0xA0),
-     o3(0xED,0x95,0xA5), o3(0xED,0x95,0xA8),
-     o3(0xED,0x95,0xA9), o3(0xED,0x95,0xAB),
-     o3(0xED,0x95,0xAD), o3(0xED,0x95,0xB4),
-     o3(0xED,0x95,0xB5), o3(0xED,0x95,0xB8),
-     o3(0xED,0x95,0xBC), o3(0xED,0x96,0x84),
-     o3(0xED,0x96,0x85), o3(0xED,0x96,0x87),
-     o3(0xED,0x96,0x88), o3(0xED,0x96,0x89),
-     o3(0xED,0x96,0x90), o3(0xED,0x96,0xA5),
-     o3(0xED,0x97,0x88), o3(0xED,0x97,0x89),
-     o3(0xED,0x97,0x8C), o3(0xED,0x97,0x90),
-     o3(0xED,0x97,0x92), o3(0xED,0x97,0x98),
-     o3(0xED,0x97,0x99), o3(0xED,0x97,0x9B),
-     o3(0xED,0x97,0x9D), o3(0xED,0x97,0xA4),
-     o3(0xED,0x97,0xA5), o3(0xED,0x97,0xA8),
-     o3(0xED,0x97,0xAC), o3(0xED,0x97,0xB4),
-     o3(0xED,0x97,0xB5), o3(0xED,0x97,0xB7),
-     o3(0xED,0x97,0xB9), o3(0xED,0x98,0x80),
-     o3(0xED,0x98,0x81), o3(0xED,0x98,0x84),
-     o3(0xED,0x98,0x88), o3(0xED,0x98,0x90),
-     o3(0xED,0x98,0x91), o3(0xED,0x98,0x93),
-     o3(0xED,0x98,0x94), o3(0xED,0x98,0x95),
-     o3(0xED,0x98,0x9C), o3(0xED,0x98,0xA0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C7 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_C7_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_C8_infos[95] = {
-     o3(0xED,0x98,0xA4), o3(0xED,0x98,0xAD),
-     o3(0xED,0x98,0xB8), o3(0xED,0x98,0xB9),
-     o3(0xED,0x98,0xBC), o3(0xED,0x99,0x80),
-     o3(0xED,0x99,0x85), o3(0xED,0x99,0x88),
-     o3(0xED,0x99,0x89), o3(0xED,0x99,0x8B),
-     o3(0xED,0x99,0x8D), o3(0xED,0x99,0x91),
-     o3(0xED,0x99,0x94), o3(0xED,0x99,0x95),
-     o3(0xED,0x99,0x98), o3(0xED,0x99,0x9C),
-     o3(0xED,0x99,0xA7), o3(0xED,0x99,0xA9),
-     o3(0xED,0x99,0xB0), o3(0xED,0x99,0xB1),
-     o3(0xED,0x99,0xB4), o3(0xED,0x9A,0x83),
-     o3(0xED,0x9A,0x85), o3(0xED,0x9A,0x8C),
-     o3(0xED,0x9A,0x8D), o3(0xED,0x9A,0x90),
-     o3(0xED,0x9A,0x94), o3(0xED,0x9A,0x9D),
-     o3(0xED,0x9A,0x9F), o3(0xED,0x9A,0xA1),
-     o3(0xED,0x9A,0xA8), o3(0xED,0x9A,0xAC),
-     o3(0xED,0x9A,0xB0), o3(0xED,0x9A,0xB9),
-     o3(0xED,0x9A,0xBB), o3(0xED,0x9B,0x84),
-     o3(0xED,0x9B,0x85), o3(0xED,0x9B,0x88),
-     o3(0xED,0x9B,0x8C), o3(0xED,0x9B,0x91),
-     o3(0xED,0x9B,0x94), o3(0xED,0x9B,0x97),
-     o3(0xED,0x9B,0x99), o3(0xED,0x9B,0xA0),
-     o3(0xED,0x9B,0xA4), o3(0xED,0x9B,0xA8),
-     o3(0xED,0x9B,0xB0), o3(0xED,0x9B,0xB5),
-     o3(0xED,0x9B,0xBC), o3(0xED,0x9B,0xBD),
-     o3(0xED,0x9C,0x80), o3(0xED,0x9C,0x84),
-     o3(0xED,0x9C,0x91), o3(0xED,0x9C,0x98),
-     o3(0xED,0x9C,0x99), o3(0xED,0x9C,0x9C),
-     o3(0xED,0x9C,0xA0), o3(0xED,0x9C,0xA8),
-     o3(0xED,0x9C,0xA9), o3(0xED,0x9C,0xAB),
-     o3(0xED,0x9C,0xAD), o3(0xED,0x9C,0xB4),
-     o3(0xED,0x9C,0xB5), o3(0xED,0x9C,0xB8),
-     o3(0xED,0x9C,0xBC), o3(0xED,0x9D,0x84),
-     o3(0xED,0x9D,0x87), o3(0xED,0x9D,0x89),
-     o3(0xED,0x9D,0x90), o3(0xED,0x9D,0x91),
-     o3(0xED,0x9D,0x94), o3(0xED,0x9D,0x96),
-     o3(0xED,0x9D,0x97), o3(0xED,0x9D,0x98),
-     o3(0xED,0x9D,0x99), o3(0xED,0x9D,0xA0),
-     o3(0xED,0x9D,0xA1), o3(0xED,0x9D,0xA3),
-     o3(0xED,0x9D,0xA5), o3(0xED,0x9D,0xA9),
-     o3(0xED,0x9D,0xAC), o3(0xED,0x9D,0xB0),
-     o3(0xED,0x9D,0xB4), o3(0xED,0x9D,0xBC),
-     o3(0xED,0x9D,0xBD), o3(0xED,0x9E,0x81),
-     o3(0xED,0x9E,0x88), o3(0xED,0x9E,0x89),
-     o3(0xED,0x9E,0x8C), o3(0xED,0x9E,0x90),
-     o3(0xED,0x9E,0x98), o3(0xED,0x9E,0x99),
-     o3(0xED,0x9E,0x9B), o3(0xED,0x9E,0x9D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_C8 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_C8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CA_infos[95] = {
-     o3(0xE4,0xBC,0xBD), o3(0xE4,0xBD,0xB3),
-     o3(0xE5,0x81,0x87), o3(0xE5,0x83,0xB9),
-     o3(0xE5,0x8A,0xA0), o3(0xE5,0x8F,0xAF),
-     o3(0xE5,0x91,0xB5), o3(0xE5,0x93,0xA5),
-     o3(0xE5,0x98,0x89), o3(0xE5,0xAB,0x81),
-     o3(0xE5,0xAE,0xB6), o3(0xE6,0x9A,0x87),
-     o3(0xE6,0x9E,0xB6), o3(0xE6,0x9E,0xB7),
-     o3(0xE6,0x9F,0xAF), o3(0xE6,0xAD,0x8C),
-     o3(0xE7,0x8F,0x82), o3(0xE7,0x97,0x82),
-     o3(0xE7,0xA8,0xBC), o3(0xE8,0x8B,0x9B),
-     o3(0xE8,0x8C,0x84), o3(0xE8,0xA1,0x97),
-     o3(0xE8,0xA2,0x88), o3(0xE8,0xA8,0xB6),
-     o3(0xE8,0xB3,0x88), o3(0xE8,0xB7,0x8F),
-     o3(0xE8,0xBB,0xBB), o3(0xE8,0xBF,0xA6),
-     o3(0xE9,0xA7,0x95), o3(0xE5,0x88,0xBB),
-     o3(0xE5,0x8D,0xB4), o3(0xE5,0x90,0x84),
-     o3(0xE6,0x81,0xAA), o3(0xE6,0x85,0xA4),
-     o3(0xE6,0xAE,0xBC), o3(0xE7,0x8F,0x8F),
-     o3(0xE8,0x84,0x9A), o3(0xE8,0xA6,0xBA),
-     o3(0xE8,0xA7,0x92), o3(0xE9,0x96,0xA3),
-     o3(0xE4,0xBE,0x83), o3(0xE5,0x88,0x8A),
-     o3(0xE5,0xA2,0xBE), o3(0xE5,0xA5,0xB8),
-     o3(0xE5,0xA7,0xA6), o3(0xE5,0xB9,0xB2),
-     o3(0xE5,0xB9,0xB9), o3(0xE6,0x87,0x87),
-     o3(0xE6,0x8F,0x80), o3(0xE6,0x9D,0x86),
-     o3(0xE6,0x9F,0xAC), o3(0xE6,0xA1,0xBF),
-     o3(0xE6,0xBE,0x97), o3(0xE7,0x99,0x8E),
-     o3(0xE7,0x9C,0x8B), o3(0xE7,0xA3,0xB5),
-     o3(0xE7,0xA8,0x88), o3(0xE7,0xAB,0xBF),
-     o3(0xE7,0xB0,0xA1), o3(0xE8,0x82,0x9D),
-     o3(0xE8,0x89,0xAE), o3(0xE8,0x89,0xB1),
-     o3(0xE8,0xAB,0xAB), o3(0xE9,0x96,0x93),
-     o3(0xE4,0xB9,0xAB), o3(0xE5,0x96,0x9D),
-     o3(0xE6,0x9B,0xB7), o3(0xE6,0xB8,0xB4),
-     o3(0xE7,0xA2,0xA3), o3(0xE7,0xAB,0xAD),
-     o3(0xE8,0x91,0x9B), o3(0xE8,0xA4,0x90),
-     o3(0xE8,0x9D,0x8E), o3(0xE9,0x9E,0xA8),
-     o3(0xE5,0x8B,0x98), o3(0xE5,0x9D,0x8E),
-     o3(0xE5,0xA0,0xAA), o3(0xE5,0xB5,0x8C),
-     o3(0xE6,0x84,0x9F), o3(0xE6,0x86,0xBE),
-     o3(0xE6,0x88,0xA1), o3(0xE6,0x95,0xA2),
-     o3(0xE6,0x9F,0x91), o3(0xE6,0xA9,0x84),
-     o3(0xE6,0xB8,0x9B), o3(0xE7,0x94,0x98),
-     o3(0xE7,0x96,0xB3), o3(0xE7,0x9B,0xA3),
-     o3(0xE7,0x9E,0xB0), o3(0xE7,0xB4,0xBA),
-     o3(0xE9,0x82,0xAF), o3(0xE9,0x91,0x91),
-     o3(0xE9,0x91,0x92), o3(0xE9,0xBE,0x95),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CA = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CA_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CB_infos[95] = {
-     o3(0xE5,0x8C,0xA3), o3(0xE5,0xB2,0xAC),
-     o3(0xE7,0x94,0xB2), o3(0xE8,0x83,0x9B),
-     o3(0xE9,0x89,0x80), o3(0xE9,0x96,0x98),
-     o3(0xE5,0x89,0x9B), o3(0xE5,0xA0,0x88),
-     o3(0xE5,0xA7,0x9C), o3(0xE5,0xB2,0xA1),
-     o3(0xE5,0xB4,0x97), o3(0xE5,0xBA,0xB7),
-     o3(0xE5,0xBC,0xBA), o3(0xE5,0xBD,0x8A),
-     o3(0xE6,0x85,0xB7), o3(0xE6,0xB1,0x9F),
-     o3(0xE7,0x95,0xBA), o3(0xE7,0x96,0x86),
-     o3(0xE7,0xB3,0xA0), o3(0xE7,0xB5,0xB3),
-     o3(0xE7,0xB6,0xB1), o3(0xE7,0xBE,0x8C),
-     o3(0xE8,0x85,0x94), o3(0xE8,0x88,0xA1),
-     o3(0xE8,0x96,0x91), o3(0xE8,0xA5,0x81),
-     o3(0xE8,0xAC,0x9B), o3(0xE9,0x8B,0xBC),
-     o3(0xE9,0x99,0x8D), o3(0xE9,0xB1,0x87),
-     o3(0xE4,0xBB,0x8B), o3(0xE4,0xBB,0xB7),
-     o3(0xE5,0x80,0x8B), o3(0xE5,0x87,0xB1),
-     o3(0xE5,0xA1,0x8F), o3(0xE6,0x84,0xB7),
-     o3(0xE6,0x84,0xBE), o3(0xE6,0x85,0xA8),
-     o3(0xE6,0x94,0xB9), o3(0xE6,0xA7,0xAA),
-     o3(0xE6,0xBC,0x91), o3(0xE7,0x96,0xA5),
-     o3(0xE7,0x9A,0x86), o3(0xE7,0x9B,0x96),
-     o3(0xE7,0xAE,0x87), o3(0xE8,0x8A,0xA5),
-     o3(0xE8,0x93,0x8B), o3(0xEF,0xA4,0x80),
-     o3(0xE9,0x8E,0xA7), o3(0xE9,0x96,0x8B),
-     o3(0xE5,0x96,0x80), o3(0xE5,0xAE,0xA2),
-     o3(0xE5,0x9D,0x91), o3(0xEF,0xA4,0x81),
-     o3(0xE7,0xB2,0xB3), o3(0xE7,0xBE,0xB9),
-     o3(0xE9,0x86,0xB5), o3(0xE5,0x80,0xA8),
-     o3(0xE5,0x8E,0xBB), o3(0xE5,0xB1,0x85),
-     o3(0xE5,0xB7,0xA8), o3(0xE6,0x8B,0x92),
-     o3(0xE6,0x8D,0xAE), o3(0xE6,0x93,0x9A),
-     o3(0xE6,0x93,0xA7), o3(0xE6,0xB8,0xA0),
-     o3(0xE7,0x82,0xAC), o3(0xE7,0xA5,0x9B),
-     o3(0xE8,0xB7,0x9D), o3(0xE8,0xB8,0x9E),
-     o3(0xEF,0xA4,0x82), o3(0xE9,0x81,0xBD),
-     o3(0xE9,0x89,0x85), o3(0xE9,0x8B,0xB8),
-     o3(0xE4,0xB9,0xBE), o3(0xE4,0xBB,0xB6),
-     o3(0xE5,0x81,0xA5), o3(0xE5,0xB7,0xBE),
-     o3(0xE5,0xBB,0xBA), o3(0xE6,0x84,0x86),
-     o3(0xE6,0xA5,0x97), o3(0xE8,0x85,0xB1),
-     o3(0xE8,0x99,0x94), o3(0xE8,0xB9,0x87),
-     o3(0xE9,0x8D,0xB5), o3(0xE9,0xA8,0xAB),
-     o3(0xE4,0xB9,0x9E), o3(0xE5,0x82,0x91),
-     o3(0xE6,0x9D,0xB0), o3(0xE6,0xA1,0x80),
-     o3(0xE5,0x84,0x89), o3(0xE5,0x8A,0x8D),
-     o3(0xE5,0x8A,0x92), o3(0xE6,0xAA,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CB = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CB_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CC_infos[95] = {
-     o3(0xE7,0x9E,0xBC), o3(0xE9,0x88,0x90),
-     o3(0xE9,0xBB,0x94), o3(0xE5,0x8A,0xAB),
-     o3(0xE6,0x80,0xAF), o3(0xE8,0xBF,0xB2),
-     o3(0xE5,0x81,0x88), o3(0xE6,0x86,0xA9),
-     o3(0xE6,0x8F,0xAD), o3(0xE6,0x93,0x8A),
-     o3(0xE6,0xA0,0xBC), o3(0xE6,0xAA,0x84),
-     o3(0xE6,0xBF,0x80), o3(0xE8,0x86,0x88),
-     o3(0xE8,0xA6,0xA1), o3(0xE9,0x9A,0x94),
-     o3(0xE5,0xA0,0x85), o3(0xE7,0x89,0xBD),
-     o3(0xE7,0x8A,0xAC), o3(0xE7,0x94,0x84),
-     o3(0xE7,0xB5,0xB9), o3(0xE7,0xB9,0xAD),
-     o3(0xE8,0x82,0xA9), o3(0xE8,0xA6,0x8B),
-     o3(0xE8,0xAD,0xB4), o3(0xE9,0x81,0xA3),
-     o3(0xE9,0xB5,0x91), o3(0xE6,0x8A,0x89),
-     o3(0xE6,0xB1,0xBA), o3(0xE6,0xBD,0x94),
-     o3(0xE7,0xB5,0x90), o3(0xE7,0xBC,0xBA),
-     o3(0xE8,0xA8,0xA3), o3(0xE5,0x85,0xBC),
-     o3(0xE6,0x85,0x8A), o3(0xE7,0xAE,0x9D),
-     o3(0xE8,0xAC,0x99), o3(0xE9,0x89,0x97),
-     o3(0xE9,0x8E,0x8C), o3(0xE4,0xBA,0xAC),
-     o3(0xE4,0xBF,0x93), o3(0xE5,0x80,0x9E),
-     o3(0xE5,0x82,0xBE), o3(0xE5,0x84,0x86),
-     o3(0xE5,0x8B,0x81), o3(0xE5,0x8B,0x8D),
-     o3(0xE5,0x8D,0xBF), o3(0xE5,0x9D,0xB0),
-     o3(0xE5,0xA2,0x83), o3(0xE5,0xBA,0x9A),
-     o3(0xE5,0xBE,0x91), o3(0xE6,0x85,0xB6),
-     o3(0xE6,0x86,0xAC), o3(0xE6,0x93,0x8E),
-     o3(0xE6,0x95,0xAC), o3(0xE6,0x99,0xAF),
-     o3(0xE6,0x9A,0xBB), o3(0xE6,0x9B,0xB4),
-     o3(0xE6,0xA2,0x97), o3(0xE6,0xB6,0x87),
-     o3(0xE7,0x82,0x85), o3(0xE7,0x83,0xB1),
-     o3(0xE7,0x92,0x9F), o3(0xE7,0x92,0xA5),
-     o3(0xE7,0x93,0x8A), o3(0xE7,0x97,0x99),
-     o3(0xE7,0xA1,0xAC), o3(0xE7,0xA3,0xAC),
-     o3(0xE7,0xAB,0x9F), o3(0xE7,0xAB,0xB6),
-     o3(0xE7,0xB5,0x85), o3(0xE7,0xB6,0x93),
-     o3(0xE8,0x80,0x95), o3(0xE8,0x80,0xBF),
-     o3(0xE8,0x84,0x9B), o3(0xE8,0x8E,0x96),
-     o3(0xE8,0xAD,0xA6), o3(0xE8,0xBC,0x95),
-     o3(0xE9,0x80,0x95), o3(0xE9,0x8F,0xA1),
-     o3(0xE9,0xA0,0x83), o3(0xE9,0xA0,0xB8),
-     o3(0xE9,0xA9,0x9A), o3(0xE9,0xAF,0xA8),
-     o3(0xE4,0xBF,0x82), o3(0xE5,0x95,0x93),
-     o3(0xE5,0xA0,0xBA), o3(0xE5,0xA5,0x91),
-     o3(0xE5,0xAD,0xA3), o3(0xE5,0xB1,0x86),
-     o3(0xE6,0x82,0xB8), o3(0xE6,0x88,0x92),
-     o3(0xE6,0xA1,0x82), o3(0xE6,0xA2,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CC = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CC_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CD_infos[95] = {
-     o3(0xE6,0xA3,0xA8), o3(0xE6,0xBA,0xAA),
-     o3(0xE7,0x95,0x8C), o3(0xE7,0x99,0xB8),
-     o3(0xE7,0xA3,0x8E), o3(0xE7,0xA8,0xBD),
-     o3(0xE7,0xB3,0xBB), o3(0xE7,0xB9,0xAB),
-     o3(0xE7,0xB9,0xBC), o3(0xE8,0xA8,0x88),
-     o3(0xE8,0xAA,0xA1), o3(0xE8,0xB0,0xBF),
-     o3(0xE9,0x9A,0x8E), o3(0xE9,0xB7,0x84),
-     o3(0xE5,0x8F,0xA4), o3(0xE5,0x8F,0xA9),
-     o3(0xE5,0x91,0x8A), o3(0xE5,0x91,0xB1),
-     o3(0xE5,0x9B,0xBA), o3(0xE5,0xA7,0x91),
-     o3(0xE5,0xAD,0xA4), o3(0xE5,0xB0,0xBB),
-     o3(0xE5,0xBA,0xAB), o3(0xE6,0x8B,0xB7),
-     o3(0xE6,0x94,0xB7), o3(0xE6,0x95,0x85),
-     o3(0xE6,0x95,0xB2), o3(0xE6,0x9A,0xA0),
-     o3(0xE6,0x9E,0xAF), o3(0xE6,0xA7,0x81),
-     o3(0xE6,0xB2,0xBD), o3(0xE7,0x97,0xBC),
-     o3(0xE7,0x9A,0x90), o3(0xE7,0x9D,0xBE),
-     o3(0xE7,0xA8,0xBF), o3(0xE7,0xBE,0x94),
-     o3(0xE8,0x80,0x83), o3(0xE8,0x82,0xA1),
-     o3(0xE8,0x86,0x8F), o3(0xE8,0x8B,0xA6),
-     o3(0xE8,0x8B,0xBD), o3(0xE8,0x8F,0xB0),
-     o3(0xE8,0x97,0x81), o3(0xE8,0xA0,0xB1),
-     o3(0xE8,0xA2,0xB4), o3(0xE8,0xAA,0xA5),
-     o3(0xEF,0xA4,0x83), o3(0xE8,0xBE,0x9C),
-     o3(0xE9,0x8C,0xAE), o3(0xE9,0x9B,0x87),
-     o3(0xE9,0xA1,0xA7), o3(0xE9,0xAB,0x98),
-     o3(0xE9,0xBC,0x93), o3(0xE5,0x93,0xAD),
-     o3(0xE6,0x96,0x9B), o3(0xE6,0x9B,0xB2),
-     o3(0xE6,0xA2,0x8F), o3(0xE7,0xA9,0x80),
-     o3(0xE8,0xB0,0xB7), o3(0xE9,0xB5,0xA0),
-     o3(0xE5,0x9B,0xB0), o3(0xE5,0x9D,0xA4),
-     o3(0xE5,0xB4,0x91), o3(0xE6,0x98,0x86),
-     o3(0xE6,0xA2,0xB1), o3(0xE6,0xA3,0x8D),
-     o3(0xE6,0xBB,0xBE), o3(0xE7,0x90,0xA8),
-     o3(0xE8,0xA2,0x9E), o3(0xE9,0xAF,0xA4),
-     o3(0xE6,0xB1,0xA8), o3(0xEF,0xA4,0x84),
-     o3(0xE9,0xAA,0xA8), o3(0xE4,0xBE,0x9B),
-     o3(0xE5,0x85,0xAC), o3(0xE5,0x85,0xB1),
-     o3(0xE5,0x8A,0x9F), o3(0xE5,0xAD,0x94),
-     o3(0xE5,0xB7,0xA5), o3(0xE6,0x81,0x90),
-     o3(0xE6,0x81,0xAD), o3(0xE6,0x8B,0xB1),
-     o3(0xE6,0x8E,0xA7), o3(0xE6,0x94,0xBB),
-     o3(0xE7,0x8F,0x99), o3(0xE7,0xA9,0xBA),
-     o3(0xE8,0x9A,0xA3), o3(0xE8,0xB2,0xA2),
-     o3(0xE9,0x9E,0x8F), o3(0xE4,0xB8,0xB2),
-     o3(0xE5,0xAF,0xA1), o3(0xE6,0x88,0x88),
-     o3(0xE6,0x9E,0x9C), o3(0xE7,0x93,0x9C),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CD = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CD_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CE_infos[95] = {
-     o3(0xE7,0xA7,0x91), o3(0xE8,0x8F,0x93),
-     o3(0xE8,0xAA,0x87), o3(0xE8,0xAA,0xB2),
-     o3(0xE8,0xB7,0xA8), o3(0xE9,0x81,0x8E),
-     o3(0xE9,0x8D,0x8B), o3(0xE9,0xA1,0x86),
-     o3(0xE5,0xBB,0x93), o3(0xE6,0xA7,0xA8),
-     o3(0xE8,0x97,0xBF), o3(0xE9,0x83,0xAD),
-     o3(0xEF,0xA4,0x85), o3(0xE5,0x86,0xA0),
-     o3(0xE5,0xAE,0x98), o3(0xE5,0xAF,0xAC),
-     o3(0xE6,0x85,0xA3), o3(0xE6,0xA3,0xBA),
-     o3(0xE6,0xAC,0xBE), o3(0xE7,0x81,0x8C),
-     o3(0xE7,0x90,0xAF), o3(0xE7,0x93,0x98),
-     o3(0xE7,0xAE,0xA1), o3(0xE7,0xBD,0x90),
-     o3(0xE8,0x8F,0x85), o3(0xE8,0xA7,0x80),
-     o3(0xE8,0xB2,0xAB), o3(0xE9,0x97,0x9C),
-     o3(0xE9,0xA4,0xA8), o3(0xE5,0x88,0xAE),
-     o3(0xE6,0x81,0x9D), o3(0xE6,0x8B,0xAC),
-     o3(0xE9,0x80,0x82), o3(0xE4,0xBE,0x8A),
-     o3(0xE5,0x85,0x89), o3(0xE5,0x8C,0xA1),
-     o3(0xE5,0xA3,0x99), o3(0xE5,0xBB,0xA3),
-     o3(0xE6,0x9B,0xA0), o3(0xE6,0xB4,0xB8),
-     o3(0xE7,0x82,0x9A), o3(0xE7,0x8B,0x82),
-     o3(0xE7,0x8F,0x96), o3(0xE7,0xAD,0x90),
-     o3(0xE8,0x83,0xB1), o3(0xE9,0x91,0x9B),
-     o3(0xE5,0x8D,0xA6), o3(0xE6,0x8E,0x9B),
-     o3(0xE7,0xBD,0xAB), o3(0xE4,0xB9,0x96),
-     o3(0xE5,0x82,0x80), o3(0xE5,0xA1,0x8A),
-     o3(0xE5,0xA3,0x9E), o3(0xE6,0x80,0xAA),
-     o3(0xE6,0x84,0xA7), o3(0xE6,0x8B,0x90),
-     o3(0xE6,0xA7,0x90), o3(0xE9,0xAD,0x81),
-     o3(0xE5,0xAE,0x8F), o3(0xE7,0xB4,0x98),
-     o3(0xE8,0x82,0xB1), o3(0xE8,0xBD,0x9F),
-     o3(0xE4,0xBA,0xA4), o3(0xE5,0x83,0x91),
-     o3(0xE5,0x92,0xAC), o3(0xE5,0x96,0xAC),
-     o3(0xE5,0xAC,0x8C), o3(0xE5,0xB6,0xA0),
-     o3(0xE5,0xB7,0xA7), o3(0xE6,0x94,0xAA),
-     o3(0xE6,0x95,0x8E), o3(0xE6,0xA0,0xA1),
-     o3(0xE6,0xA9,0x8B), o3(0xE7,0x8B,0xA1),
-     o3(0xE7,0x9A,0x8E), o3(0xE7,0x9F,0xAF),
-     o3(0xE7,0xB5,0x9E), o3(0xE7,0xBF,0xB9),
-     o3(0xE8,0x86,0xA0), o3(0xE8,0x95,0x8E),
-     o3(0xE8,0x9B,0x9F), o3(0xE8,0xBC,0x83),
-     o3(0xE8,0xBD,0x8E), o3(0xE9,0x83,0x8A),
-     o3(0xE9,0xA4,0x83), o3(0xE9,0xA9,0x95),
-     o3(0xE9,0xAE,0xAB), o3(0xE4,0xB8,0x98),
-     o3(0xE4,0xB9,0x85), o3(0xE4,0xB9,0x9D),
-     o3(0xE4,0xBB,0x87), o3(0xE4,0xBF,0xB1),
-     o3(0xE5,0x85,0xB7), o3(0xE5,0x8B,0xBE),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CE = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CE_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_CF_infos[95] = {
-     o3(0xE5,0x8D,0x80), o3(0xE5,0x8F,0xA3),
-     o3(0xE5,0x8F,0xA5), o3(0xE5,0x92,0x8E),
-     o3(0xE5,0x98,0x94), o3(0xE5,0x9D,0xB5),
-     o3(0xE5,0x9E,0xA2), o3(0xE5,0xAF,0x87),
-     o3(0xE5,0xB6,0x87), o3(0xE5,0xBB,0x90),
-     o3(0xE6,0x87,0xBC), o3(0xE6,0x8B,0x98),
-     o3(0xE6,0x95,0x91), o3(0xE6,0x9E,0xB8),
-     o3(0xE6,0x9F,0xA9), o3(0xE6,0xA7,0x8B),
-     o3(0xE6,0xAD,0x90), o3(0xE6,0xAF,0x86),
-     o3(0xE6,0xAF,0xAC), o3(0xE6,0xB1,0x82),
-     o3(0xE6,0xBA,0x9D), o3(0xE7,0x81,0xB8),
-     o3(0xE7,0x8B,0x97), o3(0xE7,0x8E,0x96),
-     o3(0xE7,0x90,0x83), o3(0xE7,0x9E,0xBF),
-     o3(0xE7,0x9F,0xA9), o3(0xE7,0xA9,0xB6),
-     o3(0xE7,0xB5,0xBF), o3(0xE8,0x80,0x89),
-     o3(0xE8,0x87,0xBC), o3(0xE8,0x88,0x85),
-     o3(0xE8,0x88,0x8A), o3(0xE8,0x8B,0x9F),
-     o3(0xE8,0xA1,0xA2), o3(0xE8,0xAC,0xB3),
-     o3(0xE8,0xB3,0xBC), o3(0xE8,0xBB,0x80),
-     o3(0xE9,0x80,0x91), o3(0xE9,0x82,0xB1),
-     o3(0xE9,0x89,0xA4), o3(0xE9,0x8A,0xB6),
-     o3(0xE9,0xA7,0x92), o3(0xE9,0xA9,0x85),
-     o3(0xE9,0xB3,0xA9), o3(0xE9,0xB7,0x97),
-     o3(0xE9,0xBE,0x9C), o3(0xE5,0x9C,0x8B),
-     o3(0xE5,0xB1,0x80), o3(0xE8,0x8F,0x8A),
-     o3(0xE9,0x9E,0xA0), o3(0xE9,0x9E,0xAB),
-     o3(0xE9,0xBA,0xB4), o3(0xE5,0x90,0x9B),
-     o3(0xE7,0xAA,0x98), o3(0xE7,0xBE,0xA4),
-     o3(0xE8,0xA3,0x99), o3(0xE8,0xBB,0x8D),
-     o3(0xE9,0x83,0xA1), o3(0xE5,0xA0,0x80),
-     o3(0xE5,0xB1,0x88), o3(0xE6,0x8E,0x98),
-     o3(0xE7,0xAA,0x9F), o3(0xE5,0xAE,0xAE),
-     o3(0xE5,0xBC,0x93), o3(0xE7,0xA9,0xB9),
-     o3(0xE7,0xAA,0xAE), o3(0xE8,0x8A,0x8E),
-     o3(0xE8,0xBA,0xAC), o3(0xE5,0x80,0xA6),
-     o3(0xE5,0x88,0xB8), o3(0xE5,0x8B,0xB8),
-     o3(0xE5,0x8D,0xB7), o3(0xE5,0x9C,0x88),
-     o3(0xE6,0x8B,0xB3), o3(0xE6,0x8D,0xB2),
-     o3(0xE6,0xAC,0x8A), o3(0xE6,0xB7,0x83),
-     o3(0xE7,0x9C,0xB7), o3(0xE5,0x8E,0xA5),
-     o3(0xE7,0x8D,0x97), o3(0xE8,0x95,0xA8),
-     o3(0xE8,0xB9,0xB6), o3(0xE9,0x97,0x95),
-     o3(0xE6,0x9C,0xBA), o3(0xE6,0xAB,0x83),
-     o3(0xE6,0xBD,0xB0), o3(0xE8,0xA9,0xAD),
-     o3(0xE8,0xBB,0x8C), o3(0xE9,0xA5,0x8B),
-     o3(0xEF,0xA4,0x86), o3(0xE6,0x99,0xB7),
-     o3(0xE6,0xAD,0xB8), o3(0xE8,0xB2,0xB4),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_CF = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_CF_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D0_infos[95] = {
-     o3(0xE9,0xAC,0xBC), o3(0xEF,0xA4,0x87),
-     o3(0xE5,0x8F,0xAB), o3(0xE5,0x9C,0xAD),
-     o3(0xE5,0xA5,0x8E), o3(0xE6,0x8F,0x86),
-     o3(0xE6,0xA7,0xBB), o3(0xE7,0x8F,0xAA),
-     o3(0xE7,0xA1,0x85), o3(0xE7,0xAA,0xBA),
-     o3(0xE7,0xAB,0x85), o3(0xE7,0xB3,0xBE),
-     o3(0xE8,0x91,0xB5), o3(0xE8,0xA6,0x8F),
-     o3(0xE8,0xB5,0xB3), o3(0xE9,0x80,0xB5),
-     o3(0xE9,0x96,0xA8), o3(0xE5,0x8B,0xBB),
-     o3(0xE5,0x9D,0x87), o3(0xE7,0x95,0x87),
-     o3(0xE7,0xAD,0xA0), o3(0xE8,0x8F,0x8C),
-     o3(0xE9,0x88,0x9E), o3(0xEF,0xA4,0x88),
-     o3(0xE6,0xA9,0x98), o3(0xE5,0x85,0x8B),
-     o3(0xE5,0x89,0x8B), o3(0xE5,0x8A,0x87),
-     o3(0xE6,0x88,0x9F), o3(0xE6,0xA3,0x98),
-     o3(0xE6,0xA5,0xB5), o3(0xE9,0x9A,0x99),
-     o3(0xE5,0x83,0x85), o3(0xE5,0x8A,0xA4),
-     o3(0xE5,0x8B,0xA4), o3(0xE6,0x87,0x83),
-     o3(0xE6,0x96,0xA4), o3(0xE6,0xA0,0xB9),
-     o3(0xE6,0xA7,0xBF), o3(0xE7,0x91,0xBE),
-     o3(0xE7,0xAD,0x8B), o3(0xE8,0x8A,0xB9),
-     o3(0xE8,0x8F,0xAB), o3(0xE8,0xA6,0xB2),
-     o3(0xE8,0xAC,0xB9), o3(0xE8,0xBF,0x91),
-     o3(0xE9,0xA5,0x89), o3(0xEF,0xA4,0x89),
-     o3(0xE4,0xBB,0x8A), o3(0xE5,0xA6,0x97),
-     o3(0xE6,0x93,0x92), o3(0xE6,0x98,0x91),
-     o3(0xE6,0xAA,0x8E), o3(0xE7,0x90,0xB4),
-     o3(0xE7,0xA6,0x81), o3(0xE7,0xA6,0xBD),
-     o3(0xE8,0x8A,0xA9), o3(0xE8,0xA1,0xBE),
-     o3(0xE8,0xA1,0xBF), o3(0xE8,0xA5,0x9F),
-     o3(0xEF,0xA4,0x8A), o3(0xE9,0x8C,0xA6),
-     o3(0xE4,0xBC,0x8B), o3(0xE5,0x8F,0x8A),
-     o3(0xE6,0x80,0xA5), o3(0xE6,0x89,0xB1),
-     o3(0xE6,0xB1,0xB2), o3(0xE7,0xB4,0x9A),
-     o3(0xE7,0xB5,0xA6), o3(0xE4,0xBA,0x98),
-     o3(0xE5,0x85,0xA2), o3(0xE7,0x9F,0x9C),
-     o3(0xE8,0x82,0xAF), o3(0xE4,0xBC,0x81),
-     o3(0xE4,0xBC,0x8E), o3(0xE5,0x85,0xB6),
-     o3(0xE5,0x86,0x80), o3(0xE5,0x97,0x9C),
-     o3(0xE5,0x99,0xA8), o3(0xE5,0x9C,0xBB),
-     o3(0xE5,0x9F,0xBA), o3(0xE5,0x9F,0xBC),
-     o3(0xE5,0xA4,0x94), o3(0xE5,0xA5,0x87),
-     o3(0xE5,0xA6,0x93), o3(0xE5,0xAF,0x84),
-     o3(0xE5,0xB2,0x90), o3(0xE5,0xB4,0x8E),
-     o3(0xE5,0xB7,0xB1), o3(0xE5,0xB9,0xBE),
-     o3(0xE5,0xBF,0x8C), o3(0xE6,0x8A,0x80),
-     o3(0xE6,0x97,0x97), o3(0xE6,0x97,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D0 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D1_infos[95] = {
-     o3(0xE6,0x9C,0x9E), o3(0xE6,0x9C,0x9F),
-     o3(0xE6,0x9D,0x9E), o3(0xE6,0xA3,0x8B),
-     o3(0xE6,0xA3,0x84), o3(0xE6,0xA9,0x9F),
-     o3(0xE6,0xAC,0xBA), o3(0xE6,0xB0,0xA3),
-     o3(0xE6,0xB1,0xBD), o3(0xE6,0xB2,0x82),
-     o3(0xE6,0xB7,0x87), o3(0xE7,0x8E,0x98),
-     o3(0xE7,0x90,0xA6), o3(0xE7,0x90,0xAA),
-     o3(0xE7,0x92,0x82), o3(0xE7,0x92,0xA3),
-     o3(0xE7,0x95,0xB8), o3(0xE7,0x95,0xBF),
-     o3(0xE7,0xA2,0x81), o3(0xE7,0xA3,0xAF),
-     o3(0xE7,0xA5,0x81), o3(0xE7,0xA5,0x87),
-     o3(0xE7,0xA5,0x88), o3(0xE7,0xA5,0xBA),
-     o3(0xE7,0xAE,0x95), o3(0xE7,0xB4,0x80),
-     o3(0xE7,0xB6,0xBA), o3(0xE7,0xBE,0x88),
-     o3(0xE8,0x80,0x86), o3(0xE8,0x80,0xAD),
-     o3(0xE8,0x82,0x8C), o3(0xE8,0xA8,0x98),
-     o3(0xE8,0xAD,0x8F), o3(0xE8,0xB1,0x88),
-     o3(0xE8,0xB5,0xB7), o3(0xE9,0x8C,0xA1),
-     o3(0xE9,0x8C,0xA4), o3(0xE9,0xA3,0xA2),
-     o3(0xE9,0xA5,0x91), o3(0xE9,0xA8,0x8E),
-     o3(0xE9,0xA8,0x8F), o3(0xE9,0xA9,0xA5),
-     o3(0xE9,0xBA,0x92), o3(0xE7,0xB7,0x8A),
-     o3(0xE4,0xBD,0xB6), o3(0xE5,0x90,0x89),
-     o3(0xE6,0x8B,0xAE), o3(0xE6,0xA1,0x94),
-     o3(0xE9,0x87,0x91), o3(0xE5,0x96,0xAB),
-     o3(0xE5,0x84,0xBA), o3(0xEF,0xA4,0x8B),
-     o3(0xEF,0xA4,0x8C), o3(0xE5,0xA8,0x9C),
-     o3(0xE6,0x87,0xA6), o3(0xEF,0xA4,0x8D),
-     o3(0xE6,0x8B,0x8F), o3(0xE6,0x8B,0xBF),
-     o3(0xEF,0xA4,0x8E), o3(0xEF,0xA4,0x8F),
-     o3(0xEF,0xA4,0x90), o3(0xEF,0xA4,0x91),
-     o3(0xEF,0xA4,0x92), o3(0xEF,0xA4,0x93),
-     o3(0xE9,0x82,0xA3), o3(0xEF,0xA4,0x94),
-     o3(0xEF,0xA4,0x95), o3(0xEF,0xA4,0x96),
-     o3(0xEF,0xA4,0x97), o3(0xEF,0xA4,0x98),
-     o3(0xE8,0xAB,0xBE), o3(0xEF,0xA4,0x99),
-     o3(0xEF,0xA4,0x9A), o3(0xEF,0xA4,0x9B),
-     o3(0xEF,0xA4,0x9C), o3(0xE6,0x9A,0x96),
-     o3(0xEF,0xA4,0x9D), o3(0xE7,0x85,0x96),
-     o3(0xEF,0xA4,0x9E), o3(0xEF,0xA4,0x9F),
-     o3(0xE9,0x9B,0xA3), o3(0xEF,0xA4,0xA0),
-     o3(0xE6,0x8D,0x8F), o3(0xE6,0x8D,0xBA),
-     o3(0xE5,0x8D,0x97), o3(0xEF,0xA4,0xA1),
-     o3(0xE6,0x9E,0x8F), o3(0xE6,0xA5,0xA0),
-     o3(0xE6,0xB9,0xB3), o3(0xEF,0xA4,0xA2),
-     o3(0xE7,0x94,0xB7), o3(0xEF,0xA4,0xA3),
-     o3(0xEF,0xA4,0xA4), o3(0xEF,0xA4,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D1 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D1_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D2_infos[95] = {
-     o3(0xE7,0xB4,0x8D), o3(0xEF,0xA4,0xA6),
-     o3(0xEF,0xA4,0xA7), o3(0xE8,0xA1,0xB2),
-     o3(0xE5,0x9B,0x8A), o3(0xE5,0xA8,0x98),
-     o3(0xEF,0xA4,0xA8), o3(0xEF,0xA4,0xA9),
-     o3(0xEF,0xA4,0xAA), o3(0xEF,0xA4,0xAB),
-     o3(0xEF,0xA4,0xAC), o3(0xE4,0xB9,0x83),
-     o3(0xEF,0xA4,0xAD), o3(0xE5,0x85,0xA7),
-     o3(0xE5,0xA5,0x88), o3(0xE6,0x9F,0xB0),
-     o3(0xE8,0x80,0x90), o3(0xEF,0xA4,0xAE),
-     o3(0xE5,0xA5,0xB3), o3(0xE5,0xB9,0xB4),
-     o3(0xE6,0x92,0x9A), o3(0xE7,0xA7,0x8A),
-     o3(0xE5,0xBF,0xB5), o3(0xE6,0x81,0xAC),
-     o3(0xE6,0x8B,0x88), o3(0xE6,0x8D,0xBB),
-     o3(0xE5,0xAF,0xA7), o3(0xE5,0xAF,0x97),
-     o3(0xE5,0x8A,0xAA), o3(0xEF,0xA4,0xAF),
-     o3(0xE5,0xA5,0xB4), o3(0xE5,0xBC,0xA9),
-     o3(0xE6,0x80,0x92), o3(0xEF,0xA4,0xB0),
-     o3(0xEF,0xA4,0xB1), o3(0xEF,0xA4,0xB2),
-     o3(0xE7,0x91,0x99), o3(0xEF,0xA4,0xB3),
-     o3(0xEF,0xA4,0xB4), o3(0xEF,0xA4,0xB5),
-     o3(0xEF,0xA4,0xB6), o3(0xEF,0xA4,0xB7),
-     o3(0xEF,0xA4,0xB8), o3(0xE9,0xA7,0x91),
-     o3(0xEF,0xA4,0xB9), o3(0xEF,0xA4,0xBA),
-     o3(0xEF,0xA4,0xBB), o3(0xEF,0xA4,0xBC),
-     o3(0xEF,0xA4,0xBD), o3(0xEF,0xA4,0xBE),
-     o3(0xEF,0xA4,0xBF), o3(0xEF,0xA5,0x80),
-     o3(0xEF,0xA5,0x81), o3(0xEF,0xA5,0x82),
-     o3(0xEF,0xA5,0x83), o3(0xE6,0xBF,0x83),
-     o3(0xEF,0xA5,0x84), o3(0xEF,0xA5,0x85),
-     o3(0xE8,0x86,0xBF), o3(0xE8,0xBE,0xB2),
-     o3(0xE6,0x83,0xB1), o3(0xEF,0xA5,0x86),
-     o3(0xEF,0xA5,0x87), o3(0xE8,0x85,0xA6),
-     o3(0xEF,0xA5,0x88), o3(0xEF,0xA5,0x89),
-     o3(0xE5,0xB0,0xBF), o3(0xEF,0xA5,0x8A),
-     o3(0xEF,0xA5,0x8B), o3(0xEF,0xA5,0x8C),
-     o3(0xEF,0xA5,0x8D), o3(0xEF,0xA5,0x8E),
-     o3(0xEF,0xA5,0x8F), o3(0xEF,0xA5,0x90),
-     o3(0xEF,0xA5,0x91), o3(0xE5,0xAB,0xA9),
-     o3(0xE8,0xA8,0xA5), o3(0xE6,0x9D,0xBB),
-     o3(0xE7,0xB4,0x90), o3(0xEF,0xA5,0x92),
-     o3(0xEF,0xA5,0x93), o3(0xEF,0xA5,0x94),
-     o3(0xEF,0xA5,0x95), o3(0xEF,0xA5,0x96),
-     o3(0xEF,0xA5,0x97), o3(0xE8,0x83,0xBD),
-     o3(0xEF,0xA5,0x98), o3(0xEF,0xA5,0x99),
-     o3(0xE5,0xB0,0xBC), o3(0xE6,0xB3,0xA5),
-     o3(0xE5,0x8C,0xBF), o3(0xE6,0xBA,0xBA),
-     o3(0xE5,0xA4,0x9A), o3(0xE8,0x8C,0xB6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D2 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D3_infos[95] = {
-     o3(0xE4,0xB8,0xB9), o3(0xE4,0xBA,0xB6),
-     o3(0xE4,0xBD,0x86), o3(0xE5,0x96,0xAE),
-     o3(0xE5,0x9C,0x98), o3(0xE5,0xA3,0x87),
-     o3(0xE5,0xBD,0x96), o3(0xE6,0x96,0xB7),
-     o3(0xE6,0x97,0xA6), o3(0xE6,0xAA,0x80),
-     o3(0xE6,0xAE,0xB5), o3(0xE6,0xB9,0x8D),
-     o3(0xE7,0x9F,0xAD), o3(0xE7,0xAB,0xAF),
-     o3(0xE7,0xB0,0x9E), o3(0xE7,0xB7,0x9E),
-     o3(0xE8,0x9B,0x8B), o3(0xE8,0xA2,0x92),
-     o3(0xE9,0x84,0xB2), o3(0xE9,0x8D,0x9B),
-     o3(0xE6,0x92,0xBB), o3(0xE6,0xBE,0xBE),
-     o3(0xE7,0x8D,0xBA), o3(0xE7,0x96,0xB8),
-     o3(0xE9,0x81,0x94), o3(0xE5,0x95,0x96),
-     o3(0xE5,0x9D,0x8D), o3(0xE6,0x86,0xBA),
-     o3(0xE6,0x93,0x94), o3(0xE6,0x9B,0x87),
-     o3(0xE6,0xB7,0xA1), o3(0xE6,0xB9,0x9B),
-     o3(0xE6,0xBD,0xAD), o3(0xE6,0xBE,0xB9),
-     o3(0xE7,0x97,0xB0), o3(0xE8,0x81,0x83),
-     o3(0xE8,0x86,0xBD), o3(0xE8,0x95,0x81),
-     o3(0xE8,0xA6,0x83), o3(0xE8,0xAB,0x87),
-     o3(0xE8,0xAD,0x9A), o3(0xE9,0x8C,0x9F),
-     o3(0xE6,0xB2,0x93), o3(0xE7,0x95,0x93),
-     o3(0xE7,0xAD,0x94), o3(0xE8,0xB8,0x8F),
-     o3(0xE9,0x81,0x9D), o3(0xE5,0x94,0x90),
-     o3(0xE5,0xA0,0x82), o3(0xE5,0xA1,0x98),
-     o3(0xE5,0xB9,0xA2), o3(0xE6,0x88,0x87),
-     o3(0xE6,0x92,0x9E), o3(0xE6,0xA3,0xA0),
-     o3(0xE7,0x95,0xB6), o3(0xE7,0xB3,0x96),
-     o3(0xE8,0x9E,0xB3), o3(0xE9,0xBB,0xA8),
-     o3(0xE4,0xBB,0xA3), o3(0xE5,0x9E,0x88),
-     o3(0xE5,0x9D,0xAE), o3(0xE5,0xA4,0xA7),
-     o3(0xE5,0xB0,0x8D), o3(0xE5,0xB2,0xB1),
-     o3(0xE5,0xB8,0xB6), o3(0xE5,0xBE,0x85),
-     o3(0xE6,0x88,0xB4), o3(0xE6,0x93,0xA1),
-     o3(0xE7,0x8E,0xB3), o3(0xE8,0x87,0xBA),
-     o3(0xE8,0xA2,0x8B), o3(0xE8,0xB2,0xB8),
-     o3(0xE9,0x9A,0x8A), o3(0xE9,0xBB,0x9B),
-     o3(0xE5,0xAE,0x85), o3(0xE5,0xBE,0xB7),
-     o3(0xE6,0x82,0xB3), o3(0xE5,0x80,0x92),
-     o3(0xE5,0x88,0x80), o3(0xE5,0x88,0xB0),
-     o3(0xE5,0x9C,0x96), o3(0xE5,0xA0,0xB5),
-     o3(0xE5,0xA1,0x97), o3(0xE5,0xB0,0x8E),
-     o3(0xE5,0xB1,0xA0), o3(0xE5,0xB3,0xB6),
-     o3(0xE5,0xB6,0x8B), o3(0xE5,0xBA,0xA6),
-     o3(0xE5,0xBE,0x92), o3(0xE6,0x82,0xBC),
-     o3(0xE6,0x8C,0x91), o3(0xE6,0x8E,0x89),
-     o3(0xE6,0x90,0x97), o3(0xE6,0xA1,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D3 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D4_infos[95] = {
-     o3(0xE6,0xA3,0xB9), o3(0xE6,0xAB,0x82),
-     o3(0xE6,0xB7,0x98), o3(0xE6,0xB8,0xA1),
-     o3(0xE6,0xBB,0x94), o3(0xE6,0xBF,0xA4),
-     o3(0xE7,0x87,0xBE), o3(0xE7,0x9B,0x9C),
-     o3(0xE7,0x9D,0xB9), o3(0xE7,0xA6,0xB1),
-     o3(0xE7,0xA8,0xBB), o3(0xE8,0x90,0x84),
-     o3(0xE8,0xA6,0xA9), o3(0xE8,0xB3,0xAD),
-     o3(0xE8,0xB7,0xB3), o3(0xE8,0xB9,0x88),
-     o3(0xE9,0x80,0x83), o3(0xE9,0x80,0x94),
-     o3(0xE9,0x81,0x93), o3(0xE9,0x83,0xBD),
-     o3(0xE9,0x8D,0x8D), o3(0xE9,0x99,0xB6),
-     o3(0xE9,0x9F,0x9C), o3(0xE6,0xAF,0x92),
-     o3(0xE7,0x80,0x86), o3(0xE7,0x89,0x98),
-     o3(0xE7,0x8A,0xA2), o3(0xE7,0x8D,0xA8),
-     o3(0xE7,0x9D,0xA3), o3(0xE7,0xA6,0xBF),
-     o3(0xE7,0xAF,0xA4), o3(0xE7,0xBA,0x9B),
-     o3(0xE8,0xAE,0x80), o3(0xE5,0xA2,0xA9),
-     o3(0xE6,0x83,0x87), o3(0xE6,0x95,0xA6),
-     o3(0xE6,0x97,0xBD), o3(0xE6,0x9A,0xBE),
-     o3(0xE6,0xB2,0x8C), o3(0xE7,0x84,0x9E),
-     o3(0xE7,0x87,0x89), o3(0xE8,0xB1,0x9A),
-     o3(0xE9,0xA0,0x93), o3(0xE4,0xB9,0xAD),
-     o3(0xE7,0xAA,0x81), o3(0xE4,0xBB,0x9D),
-     o3(0xE5,0x86,0xAC), o3(0xE5,0x87,0x8D),
-     o3(0xE5,0x8B,0x95), o3(0xE5,0x90,0x8C),
-     o3(0xE6,0x86,0xA7), o3(0xE6,0x9D,0xB1),
-     o3(0xE6,0xA1,0x90), o3(0xE6,0xA3,0x9F),
-     o3(0xE6,0xB4,0x9E), o3(0xE6,0xBD,0xBC),
-     o3(0xE7,0x96,0xBC), o3(0xE7,0x9E,0xB3),
-     o3(0xE7,0xAB,0xA5), o3(0xE8,0x83,0xB4),
-     o3(0xE8,0x91,0xA3), o3(0xE9,0x8A,0x85),
-     o3(0xE5,0x85,0x9C), o3(0xE6,0x96,0x97),
-     o3(0xE6,0x9D,0x9C), o3(0xE6,0x9E,0x93),
-     o3(0xE7,0x97,0x98), o3(0xE7,0xAB,0x87),
-     o3(0xE8,0x8D,0xB3), o3(0xEF,0xA5,0x9A),
-     o3(0xE8,0xB1,0x86), o3(0xE9,0x80,0x97),
-     o3(0xE9,0xA0,0xAD), o3(0xE5,0xB1,0xAF),
-     o3(0xE8,0x87,0x80), o3(0xE8,0x8A,0x9A),
-     o3(0xE9,0x81,0x81), o3(0xE9,0x81,0xAF),
-     o3(0xE9,0x88,0x8D), o3(0xE5,0xBE,0x97),
-     o3(0xE5,0xB6,0x9D), o3(0xE6,0xA9,0x99),
-     o3(0xE7,0x87,0x88), o3(0xE7,0x99,0xBB),
-     o3(0xE7,0xAD,0x89), o3(0xE8,0x97,0xA4),
-     o3(0xE8,0xAC,0x84), o3(0xE9,0x84,0xA7),
-     o3(0xE9,0xA8,0xB0), o3(0xE5,0x96,0x87),
-     o3(0xE6,0x87,0xB6), o3(0xEF,0xA5,0x9B),
-     o3(0xE7,0x99,0xA9), o3(0xE7,0xBE,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D4 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D4_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D5_infos[95] = {
-     o3(0xE8,0x98,0xBF), o3(0xE8,0x9E,0xBA),
-     o3(0xE8,0xA3,0xB8), o3(0xE9,0x82,0x8F),
-     o3(0xEF,0xA5,0x9C), o3(0xE6,0xB4,0x9B),
-     o3(0xE7,0x83,0x99), o3(0xE7,0x8F,0x9E),
-     o3(0xE7,0xB5,0xA1), o3(0xE8,0x90,0xBD),
-     o3(0xEF,0xA5,0x9D), o3(0xE9,0x85,0xAA),
-     o3(0xE9,0xA7,0xB1), o3(0xEF,0xA5,0x9E),
-     o3(0xE4,0xBA,0x82), o3(0xE5,0x8D,0xB5),
-     o3(0xE6,0xAC,0x84), o3(0xE6,0xAC,0x92),
-     o3(0xE7,0x80,0xBE), o3(0xE7,0x88,0x9B),
-     o3(0xE8,0x98,0xAD), o3(0xE9,0xB8,0x9E),
-     o3(0xE5,0x89,0x8C), o3(0xE8,0xBE,0xA3),
-     o3(0xE5,0xB5,0x90), o3(0xE6,0x93,0xA5),
-     o3(0xE6,0x94,0xAC), o3(0xE6,0xAC,0x96),
-     o3(0xE6,0xBF,0xAB), o3(0xE7,0xB1,0x83),
-     o3(0xE7,0xBA,0x9C), o3(0xE8,0x97,0x8D),
-     o3(0xE8,0xA5,0xA4), o3(0xE8,0xA6,0xBD),
-     o3(0xE6,0x8B,0x89), o3(0xE8,0x87,0x98),
-     o3(0xE8,0xA0,0x9F), o3(0xE5,0xBB,0x8A),
-     o3(0xE6,0x9C,0x97), o3(0xE6,0xB5,0xAA),
-     o3(0xE7,0x8B,0xBC), o3(0xE7,0x90,0x85),
-     o3(0xE7,0x91,0xAF), o3(0xE8,0x9E,0x82),
-     o3(0xE9,0x83,0x9E), o3(0xE4,0xBE,0x86),
-     o3(0xE5,0xB4,0x8D), o3(0xE5,0xBE,0xA0),
-     o3(0xE8,0x90,0x8A), o3(0xE5,0x86,0xB7),
-     o3(0xE6,0x8E,0xA0), o3(0xE7,0x95,0xA5),
-     o3(0xE4,0xBA,0xAE), o3(0xE5,0x80,0x86),
-     o3(0xE5,0x85,0xA9), o3(0xE5,0x87,0x89),
-     o3(0xE6,0xA2,0x81), o3(0xE6,0xA8,0x91),
-     o3(0xE7,0xB2,0xAE), o3(0xE7,0xB2,0xB1),
-     o3(0xE7,0xB3,0xA7), o3(0xE8,0x89,0xAF),
-     o3(0xE8,0xAB,0x92), o3(0xE8,0xBC,0x9B),
-     o3(0xE9,0x87,0x8F), o3(0xE4,0xBE,0xB6),
-     o3(0xE5,0x84,0xB7), o3(0xE5,0x8B,0xB5),
-     o3(0xE5,0x91,0x82), o3(0xE5,0xBB,0xAC),
-     o3(0xE6,0x85,0xAE), o3(0xE6,0x88,0xBE),
-     o3(0xE6,0x97,0x85), o3(0xE6,0xAB,0x9A),
-     o3(0xE6,0xBF,0xBE), o3(0xE7,0xA4,0xAA),
-     o3(0xE8,0x97,0x9C), o3(0xE8,0xA0,0xA3),
-     o3(0xE9,0x96,0xAD), o3(0xE9,0xA9,0xA2),
-     o3(0xE9,0xA9,0xAA), o3(0xE9,0xBA,0x97),
-     o3(0xE9,0xBB,0x8E), o3(0xE5,0x8A,0x9B),
-     o3(0xE6,0x9B,0x86), o3(0xE6,0xAD,0xB7),
-     o3(0xE7,0x80,0x9D), o3(0xE7,0xA4,0xAB),
-     o3(0xE8,0xBD,0xA2), o3(0xE9,0x9D,0x82),
-     o3(0xE6,0x86,0x90), o3(0xE6,0x88,0x80),
-     o3(0xE6,0x94,0xA3), o3(0xE6,0xBC,0xA3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D5 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D5_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D6_infos[95] = {
-     o3(0xE7,0x85,0x89), o3(0xE7,0x92,0x89),
-     o3(0xE7,0xB7,0xB4), o3(0xE8,0x81,0xAF),
-     o3(0xE8,0x93,0xAE), o3(0xE8,0xBC,0xA6),
-     o3(0xE9,0x80,0xA3), o3(0xE9,0x8D,0x8A),
-     o3(0xE5,0x86,0xBD), o3(0xE5,0x88,0x97),
-     o3(0xE5,0x8A,0xA3), o3(0xE6,0xB4,0x8C),
-     o3(0xE7,0x83,0x88), o3(0xE8,0xA3,0x82),
-     o3(0xE5,0xBB,0x89), o3(0xE6,0x96,0x82),
-     o3(0xE6,0xAE,0xAE), o3(0xE6,0xBF,0x82),
-     o3(0xE7,0xB0,0xBE), o3(0xE7,0x8D,0xB5),
-     o3(0xE4,0xBB,0xA4), o3(0xE4,0xBC,0xB6),
-     o3(0xE5,0x9B,0xB9), o3(0xEF,0xA5,0x9F),
-     o3(0xE5,0xB2,0xBA), o3(0xE5,0xB6,0xBA),
-     o3(0xE6,0x80,0x9C), o3(0xE7,0x8E,0xB2),
-     o3(0xE7,0xAC,0xAD), o3(0xE7,0xBE,0x9A),
-     o3(0xE7,0xBF,0x8E), o3(0xE8,0x81,0x86),
-     o3(0xE9,0x80,0x9E), o3(0xE9,0x88,0xB4),
-     o3(0xE9,0x9B,0xB6), o3(0xE9,0x9D,0x88),
-     o3(0xE9,0xA0,0x98), o3(0xE9,0xBD,0xA1),
-     o3(0xE4,0xBE,0x8B), o3(0xE6,0xBE,0xA7),
-     o3(0xE7,0xA6,0xAE), o3(0xE9,0x86,0xB4),
-     o3(0xE9,0x9A,0xB7), o3(0xE5,0x8B,0x9E),
-     o3(0xEF,0xA5,0xA0), o3(0xE6,0x92,0x88),
-     o3(0xE6,0x93,0x84), o3(0xE6,0xAB,0x93),
-     o3(0xE6,0xBD,0x9E), o3(0xE7,0x80,0x98),
-     o3(0xE7,0x88,0x90), o3(0xE7,0x9B,0xA7),
-     o3(0xE8,0x80,0x81), o3(0xE8,0x98,0x86),
-     o3(0xE8,0x99,0x9C), o3(0xE8,0xB7,0xAF),
-     o3(0xE8,0xBC,0x85), o3(0xE9,0x9C,0xB2),
-     o3(0xE9,0xAD,0xAF), o3(0xE9,0xB7,0xBA),
-     o3(0xE9,0xB9,0xB5), o3(0xE7,0xA2,0x8C),
-     o3(0xE7,0xA5,0xBF), o3(0xE7,0xB6,0xA0),
-     o3(0xE8,0x8F,0x89), o3(0xE9,0x8C,0x84),
-     o3(0xE9,0xB9,0xBF), o3(0xE9,0xBA,0x93),
-     o3(0xE8,0xAB,0x96), o3(0xE5,0xA3,0x9F),
-     o3(0xE5,0xBC,0x84), o3(0xE6,0x9C,0xA7),
-     o3(0xE7,0x80,0xA7), o3(0xE7,0x93,0x8F),
-     o3(0xE7,0xB1,0xA0), o3(0xE8,0x81,0xBE),
-     o3(0xE5,0x84,0xA1), o3(0xE7,0x80,0xA8),
-     o3(0xE7,0x89,0xA2), o3(0xE7,0xA3,0x8A),
-     o3(0xE8,0xB3,0x82), o3(0xE8,0xB3,0x9A),
-     o3(0xE8,0xB3,0xB4), o3(0xE9,0x9B,0xB7),
-     o3(0xE4,0xBA,0x86), o3(0xE5,0x83,0x9A),
-     o3(0xE5,0xAF,0xAE), o3(0xE5,0xBB,0x96),
-     o3(0xE6,0x96,0x99), o3(0xE7,0x87,0x8E),
-     o3(0xE7,0x99,0x82), o3(0xE7,0x9E,0xAD),
-     o3(0xE8,0x81,0x8A), o3(0xE8,0x93,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D6 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D6_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D7_infos[95] = {
-     o3(0xE9,0x81,0xBC), o3(0xE9,0xAC,0xA7),
-     o3(0xE9,0xBE,0x8D), o3(0xE5,0xA3,0x98),
-     o3(0xE5,0xA9,0x81), o3(0xE5,0xB1,0xA2),
-     o3(0xE6,0xA8,0x93), o3(0xE6,0xB7,0x9A),
-     o3(0xE6,0xBC,0x8F), o3(0xE7,0x98,0xBB),
-     o3(0xE7,0xB4,0xAF), o3(0xE7,0xB8,0xB7),
-     o3(0xE8,0x94,0x9E), o3(0xE8,0xA4,0xB8),
-     o3(0xE9,0x8F,0xA4), o3(0xE9,0x99,0x8B),
-     o3(0xE5,0x8A,0x89), o3(0xE6,0x97,0x92),
-     o3(0xE6,0x9F,0xB3), o3(0xE6,0xA6,0xB4),
-     o3(0xE6,0xB5,0x81), o3(0xE6,0xBA,0x9C),
-     o3(0xE7,0x80,0x8F), o3(0xE7,0x90,0x89),
-     o3(0xE7,0x91,0xA0), o3(0xE7,0x95,0x99),
-     o3(0xE7,0x98,0xA4), o3(0xE7,0xA1,0xAB),
-     o3(0xE8,0xAC,0xAC), o3(0xE9,0xA1,0x9E),
-     o3(0xE5,0x85,0xAD), o3(0xE6,0x88,0xAE),
-     o3(0xE9,0x99,0xB8), o3(0xE4,0xBE,0x96),
-     o3(0xE5,0x80,0xAB), o3(0xE5,0xB4,0x99),
-     o3(0xE6,0xB7,0xAA), o3(0xE7,0xB6,0xB8),
-     o3(0xE8,0xBC,0xAA), o3(0xE5,0xBE,0x8B),
-     o3(0xE6,0x85,0x84), o3(0xE6,0xA0,0x97),
-     o3(0xEF,0xA5,0xA1), o3(0xE9,0x9A,0x86),
-     o3(0xE5,0x8B,0x92), o3(0xE8,0x82,0x8B),
-     o3(0xE5,0x87,0x9C), o3(0xE5,0x87,0x8C),
-     o3(0xE6,0xA5,0x9E), o3(0xE7,0xA8,0x9C),
-     o3(0xE7,0xB6,0xBE), o3(0xE8,0x8F,0xB1),
-     o3(0xE9,0x99,0xB5), o3(0xE4,0xBF,0x9A),
-     o3(0xE5,0x88,0xA9), o3(0xE5,0x8E,0x98),
-     o3(0xE5,0x90,0x8F), o3(0xE5,0x94,0x8E),
-     o3(0xE5,0xB1,0xA5), o3(0xE6,0x82,0xA7),
-     o3(0xE6,0x9D,0x8E), o3(0xE6,0xA2,0xA8),
-     o3(0xE6,0xB5,0xAC), o3(0xE7,0x8A,0x81),
-     o3(0xE7,0x8B,0xB8), o3(0xE7,0x90,0x86),
-     o3(0xE7,0x92,0x83), o3(0xEF,0xA5,0xA2),
-     o3(0xE7,0x97,0xA2), o3(0xE7,0xB1,0xAC),
-     o3(0xE7,0xBD,0xB9), o3(0xE7,0xBE,0xB8),
-     o3(0xE8,0x8E,0x89), o3(0xE8,0xA3,0x8F),
-     o3(0xE8,0xA3,0xA1), o3(0xE9,0x87,0x8C),
-     o3(0xE9,0x87,0x90), o3(0xE9,0x9B,0xA2),
-     o3(0xE9,0xAF,0x89), o3(0xE5,0x90,0x9D),
-     o3(0xE6,0xBD,0xBE), o3(0xE7,0x87,0x90),
-     o3(0xE7,0x92,0x98), o3(0xE8,0x97,0xBA),
-     o3(0xE8,0xBA,0xAA), o3(0xE9,0x9A,0xA3),
-     o3(0xE9,0xB1,0x97), o3(0xE9,0xBA,0x9F),
-     o3(0xE6,0x9E,0x97), o3(0xE6,0xB7,0x8B),
-     o3(0xE7,0x90,0xB3), o3(0xE8,0x87,0xA8),
-     o3(0xE9,0x9C,0x96), o3(0xE7,0xA0,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D7 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D7_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D8_infos[95] = {
-     o3(0xE7,0xAB,0x8B), o3(0xE7,0xAC,0xA0),
-     o3(0xE7,0xB2,0x92), o3(0xE6,0x91,0xA9),
-     o3(0xE7,0x91,0xAA), o3(0xE7,0x97,0xB2),
-     o3(0xE7,0xA2,0xBC), o3(0xE7,0xA3,0xA8),
-     o3(0xE9,0xA6,0xAC), o3(0xE9,0xAD,0x94),
-     o3(0xE9,0xBA,0xBB), o3(0xE5,0xAF,0x9E),
-     o3(0xE5,0xB9,0x95), o3(0xE6,0xBC,0xA0),
-     o3(0xE8,0x86,0x9C), o3(0xE8,0x8E,0xAB),
-     o3(0xE9,0x82,0x88), o3(0xE4,0xB8,0x87),
-     o3(0xE5,0x8D,0x8D), o3(0xE5,0xA8,0xA9),
-     o3(0xE5,0xB7,0x92), o3(0xE5,0xBD,0x8E),
-     o3(0xE6,0x85,0xA2), o3(0xE6,0x8C,0xBD),
-     o3(0xE6,0x99,0xA9), o3(0xE6,0x9B,0xBC),
-     o3(0xE6,0xBB,0xBF), o3(0xE6,0xBC,0xAB),
-     o3(0xE7,0x81,0xA3), o3(0xE7,0x9E,0x9E),
-     o3(0xE8,0x90,0xAC), o3(0xE8,0x94,0x93),
-     o3(0xE8,0xA0,0xBB), o3(0xE8,0xBC,0x93),
-     o3(0xE9,0xA5,0x85), o3(0xE9,0xB0,0xBB),
-     o3(0xE5,0x94,0x9C), o3(0xE6,0x8A,0xB9),
-     o3(0xE6,0x9C,0xAB), o3(0xE6,0xB2,0xAB),
-     o3(0xE8,0x8C,0x89), o3(0xE8,0xA5,0xAA),
-     o3(0xE9,0x9D,0xBA), o3(0xE4,0xBA,0xA1),
-     o3(0xE5,0xA6,0x84), o3(0xE5,0xBF,0x98),
-     o3(0xE5,0xBF,0x99), o3(0xE6,0x9C,0x9B),
-     o3(0xE7,0xB6,0xB2), o3(0xE7,0xBD,0x94),
-     o3(0xE8,0x8A,0x92), o3(0xE8,0x8C,0xAB),
-     o3(0xE8,0x8E,0xBD), o3(0xE8,0xBC,0x9E),
-     o3(0xE9,0x82,0x99), o3(0xE5,0x9F,0x8B),
-     o3(0xE5,0xA6,0xB9), o3(0xE5,0xAA,0x92),
-     o3(0xE5,0xAF,0x90), o3(0xE6,0x98,0xA7),
-     o3(0xE6,0x9E,0x9A), o3(0xE6,0xA2,0x85),
-     o3(0xE6,0xAF,0x8F), o3(0xE7,0x85,0xA4),
-     o3(0xE7,0xBD,0xB5), o3(0xE8,0xB2,0xB7),
-     o3(0xE8,0xB3,0xA3), o3(0xE9,0x82,0x81),
-     o3(0xE9,0xAD,0x85), o3(0xE8,0x84,0x88),
-     o3(0xE8,0xB2,0x8A), o3(0xE9,0x99,0x8C),
-     o3(0xE9,0xA9,0x80), o3(0xE9,0xBA,0xA5),
-     o3(0xE5,0xAD,0x9F), o3(0xE6,0xB0,0x93),
-     o3(0xE7,0x8C,0x9B), o3(0xE7,0x9B,0xB2),
-     o3(0xE7,0x9B,0x9F), o3(0xE8,0x90,0x8C),
-     o3(0xE5,0x86,0xAA), o3(0xE8,0xA6,0x93),
-     o3(0xE5,0x85,0x8D), o3(0xE5,0x86,0x95),
-     o3(0xE5,0x8B,0x89), o3(0xE6,0xA3,0x89),
-     o3(0xE6,0xB2,0x94), o3(0xE7,0x9C,0x84),
-     o3(0xE7,0x9C,0xA0), o3(0xE7,0xB6,0xBF),
-     o3(0xE7,0xB7,0xAC), o3(0xE9,0x9D,0xA2),
-     o3(0xE9,0xBA,0xB5), o3(0xE6,0xBB,0x85),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D8 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_D9_infos[95] = {
-     o3(0xE8,0x94,0x91), o3(0xE5,0x86,0xA5),
-     o3(0xE5,0x90,0x8D), o3(0xE5,0x91,0xBD),
-     o3(0xE6,0x98,0x8E), o3(0xE6,0x9A,0x9D),
-     o3(0xE6,0xA4,0xA7), o3(0xE6,0xBA,0x9F),
-     o3(0xE7,0x9A,0xBF), o3(0xE7,0x9E,0x91),
-     o3(0xE8,0x8C,0x97), o3(0xE8,0x93,0x82),
-     o3(0xE8,0x9E,0x9F), o3(0xE9,0x85,0xA9),
-     o3(0xE9,0x8A,0x98), o3(0xE9,0xB3,0xB4),
-     o3(0xE8,0xA2,0x82), o3(0xE4,0xBE,0xAE),
-     o3(0xE5,0x86,0x92), o3(0xE5,0x8B,0x9F),
-     o3(0xE5,0xA7,0x86), o3(0xE5,0xB8,0xBD),
-     o3(0xE6,0x85,0x95), o3(0xE6,0x91,0xB8),
-     o3(0xE6,0x91,0xB9), o3(0xE6,0x9A,0xAE),
-     o3(0xE6,0x9F,0x90), o3(0xE6,0xA8,0xA1),
-     o3(0xE6,0xAF,0x8D), o3(0xE6,0xAF,0x9B),
-     o3(0xE7,0x89,0x9F), o3(0xE7,0x89,0xA1),
-     o3(0xE7,0x91,0x81), o3(0xE7,0x9C,0xB8),
-     o3(0xE7,0x9F,0x9B), o3(0xE8,0x80,0x97),
-     o3(0xE8,0x8A,0xBC), o3(0xE8,0x8C,0x85),
-     o3(0xE8,0xAC,0x80), o3(0xE8,0xAC,0xA8),
-     o3(0xE8,0xB2,0x8C), o3(0xE6,0x9C,0xA8),
-     o3(0xE6,0xB2,0x90), o3(0xE7,0x89,0xA7),
-     o3(0xE7,0x9B,0xAE), o3(0xE7,0x9D,0xA6),
-     o3(0xE7,0xA9,0x86), o3(0xE9,0xB6,0xA9),
-     o3(0xE6,0xAD,0xBF), o3(0xE6,0xB2,0x92),
-     o3(0xE5,0xA4,0xA2), o3(0xE6,0x9C,0xA6),
-     o3(0xE8,0x92,0x99), o3(0xE5,0x8D,0xAF),
-     o3(0xE5,0xA2,0x93), o3(0xE5,0xA6,0x99),
-     o3(0xE5,0xBB,0x9F), o3(0xE6,0x8F,0x8F),
-     o3(0xE6,0x98,0xB4), o3(0xE6,0x9D,0xB3),
-     o3(0xE6,0xB8,0xBA), o3(0xE7,0x8C,0xAB),
-     o3(0xE7,0xAB,0x97), o3(0xE8,0x8B,0x97),
-     o3(0xE9,0x8C,0xA8), o3(0xE5,0x8B,0x99),
-     o3(0xE5,0xB7,0xAB), o3(0xE6,0x86,0xAE),
-     o3(0xE6,0x87,0x8B), o3(0xE6,0x88,0x8A),
-     o3(0xE6,0x8B,0x87), o3(0xE6,0x92,0xAB),
-     o3(0xE6,0x97,0xA0), o3(0xE6,0xA5,0x99),
-     o3(0xE6,0xAD,0xA6), o3(0xE6,0xAF,0x8B),
-     o3(0xE7,0x84,0xA1), o3(0xE7,0x8F,0xB7),
-     o3(0xE7,0x95,0x9D), o3(0xE7,0xB9,0x86),
-     o3(0xE8,0x88,0x9E), o3(0xE8,0x8C,0x82),
-     o3(0xE8,0x95,0xAA), o3(0xE8,0xAA,0xA3),
-     o3(0xE8,0xB2,0xBF), o3(0xE9,0x9C,0xA7),
-     o3(0xE9,0xB5,0xA1), o3(0xE5,0xA2,0xA8),
-     o3(0xE9,0xBB,0x98), o3(0xE5,0x80,0x91),
-     o3(0xE5,0x88,0x8E), o3(0xE5,0x90,0xBB),
-     o3(0xE5,0x95,0x8F), o3(0xE6,0x96,0x87),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_D9 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_D9_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DA_infos[95] = {
-     o3(0xE6,0xB1,0xB6), o3(0xE7,0xB4,0x8A),
-     o3(0xE7,0xB4,0x8B), o3(0xE8,0x81,0x9E),
-     o3(0xE8,0x9A,0x8A), o3(0xE9,0x96,0x80),
-     o3(0xE9,0x9B,0xAF), o3(0xE5,0x8B,0xBF),
-     o3(0xE6,0xB2,0x95), o3(0xE7,0x89,0xA9),
-     o3(0xE5,0x91,0xB3), o3(0xE5,0xAA,0x9A),
-     o3(0xE5,0xB0,0xBE), o3(0xE5,0xB5,0x8B),
-     o3(0xE5,0xBD,0x8C), o3(0xE5,0xBE,0xAE),
-     o3(0xE6,0x9C,0xAA), o3(0xE6,0xA2,0xB6),
-     o3(0xE6,0xA5,0xA3), o3(0xE6,0xB8,0xBC),
-     o3(0xE6,0xB9,0x84), o3(0xE7,0x9C,0x89),
-     o3(0xE7,0xB1,0xB3), o3(0xE7,0xBE,0x8E),
-     o3(0xE8,0x96,0x87), o3(0xE8,0xAC,0x8E),
-     o3(0xE8,0xBF,0xB7), o3(0xE9,0x9D,0xA1),
-     o3(0xE9,0xBB,0xB4), o3(0xE5,0xB2,0xB7),
-     o3(0xE6,0x82,0xB6), o3(0xE6,0x84,0x8D),
-     o3(0xE6,0x86,0xAB), o3(0xE6,0x95,0x8F),
-     o3(0xE6,0x97,0xBB), o3(0xE6,0x97,0xBC),
-     o3(0xE6,0xB0,0x91), o3(0xE6,0xB3,0xAF),
-     o3(0xE7,0x8E,0x9F), o3(0xE7,0x8F,0x89),
-     o3(0xE7,0xB7,0xA1), o3(0xE9,0x96,0x94),
-     o3(0xE5,0xAF,0x86), o3(0xE8,0x9C,0x9C),
-     o3(0xE8,0xAC,0x90), o3(0xE5,0x89,0x9D),
-     o3(0xE5,0x8D,0x9A), o3(0xE6,0x8B,0x8D),
-     o3(0xE6,0x90,0x8F), o3(0xE6,0x92,0xB2),
-     o3(0xE6,0x9C,0xB4), o3(0xE6,0xA8,0xB8),
-     o3(0xE6,0xB3,0x8A), o3(0xE7,0x8F,0x80),
-     o3(0xE7,0x92,0x9E), o3(0xE7,0xAE,0x94),
-     o3(0xE7,0xB2,0x95), o3(0xE7,0xB8,0x9B),
-     o3(0xE8,0x86,0x8A), o3(0xE8,0x88,0xB6),
-     o3(0xE8,0x96,0x84), o3(0xE8,0xBF,0xAB),
-     o3(0xE9,0x9B,0xB9), o3(0xE9,0xA7,0x81),
-     o3(0xE4,0xBC,0xB4), o3(0xE5,0x8D,0x8A),
-     o3(0xE5,0x8F,0x8D), o3(0xE5,0x8F,0x9B),
-     o3(0xE6,0x8B,0x8C), o3(0xE6,0x90,0xAC),
-     o3(0xE6,0x94,0x80), o3(0xE6,0x96,0x91),
-     o3(0xE6,0xA7,0x83), o3(0xE6,0xB3,0xAE),
-     o3(0xE6,0xBD,0x98), o3(0xE7,0x8F,0xAD),
-     o3(0xE7,0x95,0x94), o3(0xE7,0x98,0xA2),
-     o3(0xE7,0x9B,0xA4), o3(0xE7,0x9B,0xBC),
-     o3(0xE7,0xA3,0x90), o3(0xE7,0xA3,0xBB),
-     o3(0xE7,0xA4,0xAC), o3(0xE7,0xB5,0x86),
-     o3(0xE8,0x88,0xAC), o3(0xE8,0x9F,0xA0),
-     o3(0xE8,0xBF,0x94), o3(0xE9,0xA0,0x92),
-     o3(0xE9,0xA3,0xAF), o3(0xE5,0x8B,0x83),
-     o3(0xE6,0x8B,0x94), o3(0xE6,0x92,0xA5),
-     o3(0xE6,0xB8,0xA4), o3(0xE6,0xBD,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DA = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DA_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DB_infos[95] = {
-     o3(0xE7,0x99,0xBC), o3(0xE8,0xB7,0x8B),
-     o3(0xE9,0x86,0xB1), o3(0xE9,0x89,0xA2),
-     o3(0xE9,0xAB,0xAE), o3(0xE9,0xAD,0x83),
-     o3(0xE5,0x80,0xA3), o3(0xE5,0x82,0x8D),
-     o3(0xE5,0x9D,0x8A), o3(0xE5,0xA6,0xA8),
-     o3(0xE5,0xB0,0xA8), o3(0xE5,0xB9,0x87),
-     o3(0xE5,0xBD,0xB7), o3(0xE6,0x88,0xBF),
-     o3(0xE6,0x94,0xBE), o3(0xE6,0x96,0xB9),
-     o3(0xE6,0x97,0x81), o3(0xE6,0x98,0x89),
-     o3(0xE6,0x9E,0x8B), o3(0xE6,0xA6,0x9C),
-     o3(0xE6,0xBB,0x82), o3(0xE7,0xA3,0x85),
-     o3(0xE7,0xB4,0xA1), o3(0xE8,0x82,0xAA),
-     o3(0xE8,0x86,0x80), o3(0xE8,0x88,0xAB),
-     o3(0xE8,0x8A,0xB3), o3(0xE8,0x92,0xA1),
-     o3(0xE8,0x9A,0x8C), o3(0xE8,0xA8,0xAA),
-     o3(0xE8,0xAC,0x97), o3(0xE9,0x82,0xA6),
-     o3(0xE9,0x98,0xB2), o3(0xE9,0xBE,0x90),
-     o3(0xE5,0x80,0x8D), o3(0xE4,0xBF,0xB3),
-     o3(0xEF,0xA5,0xA3), o3(0xE5,0x9F,0xB9),
-     o3(0xE5,0xBE,0x98), o3(0xE6,0x8B,0x9C),
-     o3(0xE6,0x8E,0x92), o3(0xE6,0x9D,0xAF),
-     o3(0xE6,0xB9,0x83), o3(0xE7,0x84,0x99),
-     o3(0xE7,0x9B,0x83), o3(0xE8,0x83,0x8C),
-     o3(0xE8,0x83,0x9A), o3(0xE8,0xA3,0xB4),
-     o3(0xE8,0xA3,0xB5), o3(0xE8,0xA4,0x99),
-     o3(0xE8,0xB3,0xA0), o3(0xE8,0xBC,0xA9),
-     o3(0xE9,0x85,0x8D), o3(0xE9,0x99,0xAA),
-     o3(0xE4,0xBC,0xAF), o3(0xE4,0xBD,0xB0),
-     o3(0xE5,0xB8,0x9B), o3(0xE6,0x9F,0x8F),
-     o3(0xE6,0xA0,0xA2), o3(0xE7,0x99,0xBD),
-     o3(0xE7,0x99,0xBE), o3(0xE9,0xAD,0x84),
-     o3(0xE5,0xB9,0xA1), o3(0xE6,0xA8,0x8A),
-     o3(0xE7,0x85,0xA9), o3(0xE7,0x87,0x94),
-     o3(0xE7,0x95,0xAA), o3(0xEF,0xA5,0xA4),
-     o3(0xE7,0xB9,0x81), o3(0xE8,0x95,0x83),
-     o3(0xE8,0x97,0xA9), o3(0xE9,0xA3,0x9C),
-     o3(0xE4,0xBC,0x90), o3(0xE7,0xAD,0x8F),
-     o3(0xE7,0xBD,0xB0), o3(0xE9,0x96,0xA5),
-     o3(0xE5,0x87,0xA1), o3(0xE5,0xB8,0x86),
-     o3(0xE6,0xA2,0xB5), o3(0xE6,0xB0,0xBE),
-     o3(0xE6,0xB1,0x8E), o3(0xE6,0xB3,0x9B),
-     o3(0xE7,0x8A,0xAF), o3(0xE7,0xAF,0x84),
-     o3(0xE8,0x8C,0x83), o3(0xE6,0xB3,0x95),
-     o3(0xE7,0x90,0xBA), o3(0xE5,0x83,0xBB),
-     o3(0xE5,0x8A,0x88), o3(0xE5,0xA3,0x81),
-     o3(0xE6,0x93,0x98), o3(0xE6,0xAA,0x97),
-     o3(0xE7,0x92,0xA7), o3(0xE7,0x99,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DB = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DB_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DC_infos[95] = {
-     o3(0xE7,0xA2,0xA7), o3(0xE8,0x98,0x97),
-     o3(0xE9,0x97,0xA2), o3(0xE9,0x9C,0xB9),
-     o3(0xEF,0xA5,0xA5), o3(0xE5,0x8D,0x9E),
-     o3(0xE5,0xBC,0x81), o3(0xE8,0xAE,0x8A),
-     o3(0xE8,0xBE,0xA8), o3(0xE8,0xBE,0xAF),
-     o3(0xE9,0x82,0x8A), o3(0xE5,0x88,0xA5),
-     o3(0xE7,0x9E,0xA5), o3(0xE9,0xB1,0x89),
-     o3(0xE9,0xBC,0x88), o3(0xE4,0xB8,0x99),
-     o3(0xE5,0x80,0x82), o3(0xE5,0x85,0xB5),
-     o3(0xE5,0xB1,0x9B), o3(0xE5,0xB9,0xB7),
-     o3(0xE6,0x98,0x9E), o3(0xE6,0x98,0xBA),
-     o3(0xE6,0x9F,0x84), o3(0xE6,0xA3,0x85),
-     o3(0xE7,0x82,0xB3), o3(0xE7,0x94,0x81),
-     o3(0xE7,0x97,0x85), o3(0xE7,0xA7,0x89),
-     o3(0xE7,0xAB,0x9D), o3(0xE8,0xBC,0xA7),
-     o3(0xE9,0xA4,0xA0), o3(0xE9,0xA8,0x88),
-     o3(0xE4,0xBF,0x9D), o3(0xE5,0xA0,0xA1),
-     o3(0xE5,0xA0,0xB1), o3(0xE5,0xAF,0xB6),
-     o3(0xE6,0x99,0xAE), o3(0xE6,0xAD,0xA5),
-     o3(0xE6,0xB4,0x91), o3(0xE6,0xB9,0xBA),
-     o3(0xE6,0xBD,0xBD), o3(0xE7,0x8F,0xA4),
-     o3(0xE7,0x94,0xAB), o3(0xE8,0x8F,0xA9),
-     o3(0xE8,0xA3,0x9C), o3(0xE8,0xA4,0x93),
-     o3(0xE8,0xAD,0x9C), o3(0xE8,0xBC,0x94),
-     o3(0xE4,0xBC,0x8F), o3(0xE5,0x83,0x95),
-     o3(0xE5,0x8C,0x90), o3(0xE5,0x8D,0x9C),
-     o3(0xE5,0xAE,0x93), o3(0xE5,0xBE,0xA9),
-     o3(0xE6,0x9C,0x8D), o3(0xE7,0xA6,0x8F),
-     o3(0xE8,0x85,0xB9), o3(0xE8,0x8C,0xAF),
-     o3(0xE8,0x94,0x94), o3(0xE8,0xA4,0x87),
-     o3(0xE8,0xA6,0x86), o3(0xE8,0xBC,0xB9),
-     o3(0xE8,0xBC,0xBB), o3(0xE9,0xA6,0xA5),
-     o3(0xE9,0xB0,0x92), o3(0xE6,0x9C,0xAC),
-     o3(0xE4,0xB9,0xB6), o3(0xE4,0xBF,0xB8),
-     o3(0xE5,0xA5,0x89), o3(0xE5,0xB0,0x81),
-     o3(0xE5,0xB3,0xAF), o3(0xE5,0xB3,0xB0),
-     o3(0xE6,0x8D,0xA7), o3(0xE6,0xA3,0x92),
-     o3(0xE7,0x83,0xBD), o3(0xE7,0x86,0xA2),
-     o3(0xE7,0x90,0xAB), o3(0xE7,0xB8,0xAB),
-     o3(0xE8,0x93,0xAC), o3(0xE8,0x9C,0x82),
-     o3(0xE9,0x80,0xA2), o3(0xE9,0x8B,0x92),
-     o3(0xE9,0xB3,0xB3), o3(0xE4,0xB8,0x8D),
-     o3(0xE4,0xBB,0x98), o3(0xE4,0xBF,0xAF),
-     o3(0xE5,0x82,0x85), o3(0xE5,0x89,0x96),
-     o3(0xE5,0x89,0xAF), o3(0xE5,0x90,0xA6),
-     o3(0xE5,0x92,0x90), o3(0xE5,0x9F,0xA0),
-     o3(0xE5,0xA4,0xAB), o3(0xE5,0xA9,0xA6),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DC = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DC_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DD_infos[95] = {
-     o3(0xE5,0xAD,0x9A), o3(0xE5,0xAD,0xB5),
-     o3(0xE5,0xAF,0x8C), o3(0xE5,0xBA,0x9C),
-     o3(0xEF,0xA5,0xA6), o3(0xE6,0x89,0xB6),
-     o3(0xE6,0x95,0xB7), o3(0xE6,0x96,0xA7),
-     o3(0xE6,0xB5,0xAE), o3(0xE6,0xBA,0xA5),
-     o3(0xE7,0x88,0xB6), o3(0xE7,0xAC,0xA6),
-     o3(0xE7,0xB0,0xBF), o3(0xE7,0xBC,0xB6),
-     o3(0xE8,0x85,0x90), o3(0xE8,0x85,0x91),
-     o3(0xE8,0x86,0x9A), o3(0xE8,0x89,0x80),
-     o3(0xE8,0x8A,0x99), o3(0xE8,0x8E,0xA9),
-     o3(0xE8,0xA8,0x83), o3(0xE8,0xB2,0xA0),
-     o3(0xE8,0xB3,0xA6), o3(0xE8,0xB3,0xBB),
-     o3(0xE8,0xB5,0xB4), o3(0xE8,0xB6,0xBA),
-     o3(0xE9,0x83,0xA8), o3(0xE9,0x87,0x9C),
-     o3(0xE9,0x98,0x9C), o3(0xE9,0x99,0x84),
-     o3(0xE9,0xA7,0x99), o3(0xE9,0xB3,0xA7),
-     o3(0xE5,0x8C,0x97), o3(0xE5,0x88,0x86),
-     o3(0xE5,0x90,0xA9), o3(0xE5,0x99,0xB4),
-     o3(0xE5,0xA2,0xB3), o3(0xE5,0xA5,0x94),
-     o3(0xE5,0xA5,0xAE), o3(0xE5,0xBF,0xBF),
-     o3(0xE6,0x86,0xA4), o3(0xE6,0x89,0xAE),
-     o3(0xE6,0x98,0x90), o3(0xE6,0xB1,0xBE),
-     o3(0xE7,0x84,0x9A), o3(0xE7,0x9B,0x86),
-     o3(0xE7,0xB2,0x89), o3(0xE7,0xB3,0x9E),
-     o3(0xE7,0xB4,0x9B), o3(0xE8,0x8A,0xAC),
-     o3(0xE8,0xB3,0x81), o3(0xE9,0x9B,0xB0),
-     o3(0xEF,0xA5,0xA7), o3(0xE4,0xBD,0x9B),
-     o3(0xE5,0xBC,0x97), o3(0xE5,0xBD,0xBF),
-     o3(0xE6,0x8B,0x82), o3(0xE5,0xB4,0xA9),
-     o3(0xE6,0x9C,0x8B), o3(0xE6,0xA3,0x9A),
-     o3(0xE7,0xA1,0xBC), o3(0xE7,0xB9,0x83),
-     o3(0xE9,0xB5,0xAC), o3(0xE4,0xB8,0x95),
-     o3(0xE5,0x82,0x99), o3(0xE5,0x8C,0x95),
-     o3(0xE5,0x8C,0xAA), o3(0xE5,0x8D,0x91),
-     o3(0xE5,0xA6,0x83), o3(0xE5,0xA9,0xA2),
-     o3(0xE5,0xBA,0x87), o3(0xE6,0x82,0xB2),
-     o3(0xE6,0x86,0x8A), o3(0xE6,0x89,0x89),
-     o3(0xE6,0x89,0xB9), o3(0xE6,0x96,0x90),
-     o3(0xE6,0x9E,0x87), o3(0xE6,0xA6,0xA7),
-     o3(0xE6,0xAF,0x94), o3(0xE6,0xAF,0x96),
-     o3(0xE6,0xAF,0x97), o3(0xE6,0xAF,0x98),
-     o3(0xE6,0xB2,0xB8), o3(0xEF,0xA5,0xA8),
-     o3(0xE7,0x90,0xB5), o3(0xE7,0x97,0xBA),
-     o3(0xE7,0xA0,0x92), o3(0xE7,0xA2,0x91),
-     o3(0xE7,0xA7,0x95), o3(0xE7,0xA7,0x98),
-     o3(0xE7,0xB2,0x83), o3(0xE7,0xB7,0x8B),
-     o3(0xE7,0xBF,0xA1), o3(0xE8,0x82,0xA5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DD = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DD_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DE_infos[95] = {
-     o3(0xE8,0x84,0xBE), o3(0xE8,0x87,0x82),
-     o3(0xE8,0x8F,0xB2), o3(0xE8,0x9C,0x9A),
-     o3(0xE8,0xA3,0xA8), o3(0xE8,0xAA,0xB9),
-     o3(0xE8,0xAD,0xAC), o3(0xE8,0xB2,0xBB),
-     o3(0xE9,0x84,0x99), o3(0xE9,0x9D,0x9E),
-     o3(0xE9,0xA3,0x9B), o3(0xE9,0xBC,0xBB),
-     o3(0xE5,0x9A,0xAC), o3(0xE5,0xAC,0xAA),
-     o3(0xE5,0xBD,0xAC), o3(0xE6,0x96,0x8C),
-     o3(0xE6,0xAA,0xB3), o3(0xE6,0xAE,0xAF),
-     o3(0xE6,0xB5,0x9C), o3(0xE6,0xBF,0xB1),
-     o3(0xE7,0x80,0x95), o3(0xE7,0x89,0x9D),
-     o3(0xE7,0x8E,0xAD), o3(0xE8,0xB2,0xA7),
-     o3(0xE8,0xB3,0x93), o3(0xE9,0xA0,0xBB),
-     o3(0xE6,0x86,0x91), o3(0xE6,0xB0,0xB7),
-     o3(0xE8,0x81,0x98), o3(0xE9,0xA8,0x81),
-     o3(0xE4,0xB9,0x8D), o3(0xE4,0xBA,0x8B),
-     o3(0xE4,0xBA,0x9B), o3(0xE4,0xBB,0x95),
-     o3(0xE4,0xBC,0xBA), o3(0xE4,0xBC,0xBC),
-     o3(0xE4,0xBD,0xBF), o3(0xE4,0xBF,0x9F),
-     o3(0xE5,0x83,0xBF), o3(0xE5,0x8F,0xB2),
-     o3(0xE5,0x8F,0xB8), o3(0xE5,0x94,0x86),
-     o3(0xE5,0x97,0xA3), o3(0xE5,0x9B,0x9B),
-     o3(0xE5,0xA3,0xAB), o3(0xE5,0xA5,0xA2),
-     o3(0xE5,0xA8,0x91), o3(0xE5,0xAF,0xAB),
-     o3(0xE5,0xAF,0xBA), o3(0xE5,0xB0,0x84),
-     o3(0xE5,0xB7,0xB3), o3(0xE5,0xB8,0xAB),
-     o3(0xE5,0xBE,0x99), o3(0xE6,0x80,0x9D),
-     o3(0xE6,0x8D,0xA8), o3(0xE6,0x96,0x9C),
-     o3(0xE6,0x96,0xAF), o3(0xE6,0x9F,0xB6),
-     o3(0xE6,0x9F,0xBB), o3(0xE6,0xA2,0xAD),
-     o3(0xE6,0xAD,0xBB), o3(0xE6,0xB2,0x99),
-     o3(0xE6,0xB3,0x97), o3(0xE6,0xB8,0xA3),
-     o3(0xE7,0x80,0x89), o3(0xE7,0x8D,0x85),
-     o3(0xE7,0xA0,0x82), o3(0xE7,0xA4,0xBE),
-     o3(0xE7,0xA5,0x80), o3(0xE7,0xA5,0xA0),
-     o3(0xE7,0xA7,0x81), o3(0xE7,0xAF,0xA9),
-     o3(0xE7,0xB4,0x97), o3(0xE7,0xB5,0xB2),
-     o3(0xE8,0x82,0x86), o3(0xE8,0x88,0x8D),
-     o3(0xE8,0x8E,0x8E), o3(0xE8,0x93,0x91),
-     o3(0xE8,0x9B,0x87), o3(0xE8,0xA3,0x9F),
-     o3(0xE8,0xA9,0x90), o3(0xE8,0xA9,0x9E),
-     o3(0xE8,0xAC,0x9D), o3(0xE8,0xB3,0x9C),
-     o3(0xE8,0xB5,0xA6), o3(0xE8,0xBE,0xAD),
-     o3(0xE9,0x82,0xAA), o3(0xE9,0xA3,0xBC),
-     o3(0xE9,0xA7,0x9F), o3(0xE9,0xBA,0x9D),
-     o3(0xE5,0x89,0x8A), o3(0xEF,0xA5,0xA9),
-     o3(0xE6,0x9C,0x94), o3(0xEF,0xA5,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DE = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DE_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_DF_infos[95] = {
-     o3(0xE5,0x82,0x98), o3(0xE5,0x88,0xAA),
-     o3(0xE5,0xB1,0xB1), o3(0xE6,0x95,0xA3),
-     o3(0xE6,0xB1,0x95), o3(0xE7,0x8F,0x8A),
-     o3(0xE7,0x94,0xA3), o3(0xE7,0x96,0x9D),
-     o3(0xE7,0xAE,0x97), o3(0xE8,0x92,0x9C),
-     o3(0xE9,0x85,0xB8), o3(0xE9,0x9C,0xB0),
-     o3(0xE4,0xB9,0xB7), o3(0xE6,0x92,0x92),
-     o3(0xE6,0xAE,0xBA), o3(0xE7,0x85,0x9E),
-     o3(0xE8,0x96,0xA9), o3(0xE4,0xB8,0x89),
-     o3(0xEF,0xA5,0xAB), o3(0xE6,0x9D,0x89),
-     o3(0xE6,0xA3,0xAE), o3(0xE6,0xB8,0x97),
-     o3(0xE8,0x8A,0x9F), o3(0xE8,0x94,0x98),
-     o3(0xE8,0xA1,0xAB), o3(0xE6,0x8F,0xB7),
-     o3(0xE6,0xBE,0x81), o3(0xE9,0x88,0x92),
-     o3(0xE9,0xA2,0xAF), o3(0xE4,0xB8,0x8A),
-     o3(0xE5,0x82,0xB7), o3(0xE5,0x83,0x8F),
-     o3(0xE5,0x84,0x9F), o3(0xE5,0x95,0x86),
-     o3(0xE5,0x96,0xAA), o3(0xE5,0x98,0x97),
-     o3(0xE5,0xAD,0x80), o3(0xE5,0xB0,0x99),
-     o3(0xE5,0xB3,0xA0), o3(0xE5,0xB8,0xB8),
-     o3(0xE5,0xBA,0x8A), o3(0xE5,0xBA,0xA0),
-     o3(0xE5,0xBB,0x82), o3(0xE6,0x83,0xB3),
-     o3(0xE6,0xA1,0x91), o3(0xE6,0xA9,0xA1),
-     o3(0xE6,0xB9,0x98), o3(0xE7,0x88,0xBD),
-     o3(0xE7,0x89,0x80), o3(0xE7,0x8B,0x80),
-     o3(0xE7,0x9B,0xB8), o3(0xE7,0xA5,0xA5),
-     o3(0xE7,0xAE,0xB1), o3(0xE7,0xBF,0x94),
-     o3(0xE8,0xA3,0xB3), o3(0xE8,0xA7,0xB4),
-     o3(0xE8,0xA9,0xB3), o3(0xE8,0xB1,0xA1),
-     o3(0xE8,0xB3,0x9E), o3(0xE9,0x9C,0x9C),
-     o3(0xE5,0xA1,0x9E), o3(0xE7,0x92,0xBD),
-     o3(0xE8,0xB3,0xBD), o3(0xE5,0x97,0x87),
-     o3(0xEF,0xA5,0xAC), o3(0xE7,0xA9,0xA1),
-     o3(0xE7,0xB4,0xA2), o3(0xE8,0x89,0xB2),
-     o3(0xE7,0x89,0xB2), o3(0xE7,0x94,0x9F),
-     o3(0xE7,0x94,0xA5), o3(0xEF,0xA5,0xAD),
-     o3(0xE7,0xAC,0x99), o3(0xE5,0xA2,0x85),
-     o3(0xE5,0xA3,0xBB), o3(0xE5,0xB6,0xBC),
-     o3(0xE5,0xBA,0x8F), o3(0xE5,0xBA,0xB6),
-     o3(0xE5,0xBE,0x90), o3(0xE6,0x81,0x95),
-     o3(0xE6,0x8A,0x92), o3(0xE6,0x8D,0xBF),
-     o3(0xE6,0x95,0x8D), o3(0xE6,0x9A,0x91),
-     o3(0xE6,0x9B,0x99), o3(0xE6,0x9B,0xB8),
-     o3(0xE6,0xA0,0x96), o3(0xE6,0xA3,0xB2),
-     o3(0xE7,0x8A,0x80), o3(0xE7,0x91,0x9E),
-     o3(0xE7,0xAD,0xAE), o3(0xE7,0xB5,0xAE),
-     o3(0xE7,0xB7,0x96), o3(0xE7,0xBD,0xB2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_DF = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_DF_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E0_infos[95] = {
-     o3(0xE8,0x83,0xA5), o3(0xE8,0x88,0x92),
-     o3(0xE8,0x96,0xAF), o3(0xE8,0xA5,0xBF),
-     o3(0xE8,0xAA,0x93), o3(0xE9,0x80,0x9D),
-     o3(0xE9,0x8B,0xA4), o3(0xE9,0xBB,0x8D),
-     o3(0xE9,0xBC,0xA0), o3(0xE5,0xA4,0x95),
-     o3(0xE5,0xA5,0xAD), o3(0xE5,0xB8,0xAD),
-     o3(0xE6,0x83,0x9C), o3(0xE6,0x98,0x94),
-     o3(0xE6,0x99,0xB3), o3(0xE6,0x9E,0x90),
-     o3(0xE6,0xB1,0x90), o3(0xE6,0xB7,0x85),
-     o3(0xE6,0xBD,0x9F), o3(0xE7,0x9F,0xB3),
-     o3(0xE7,0xA2,0xA9), o3(0xE8,0x93,0x86),
-     o3(0xE9,0x87,0x8B), o3(0xE9,0x8C,0xAB),
-     o3(0xE4,0xBB,0x99), o3(0xE5,0x83,0x8A),
-     o3(0xE5,0x85,0x88), o3(0xE5,0x96,0x84),
-     o3(0xE5,0xAC,0x8B), o3(0xE5,0xAE,0xA3),
-     o3(0xE6,0x89,0x87), o3(0xE6,0x95,0xBE),
-     o3(0xE6,0x97,0x8B), o3(0xE6,0xB8,0xB2),
-     o3(0xE7,0x85,0xBD), o3(0xE7,0x90,0x81),
-     o3(0xE7,0x91,0x84), o3(0xE7,0x92,0x87),
-     o3(0xE7,0x92,0xBF), o3(0xE7,0x99,0xAC),
-     o3(0xE7,0xA6,0xAA), o3(0xE7,0xB7,0x9A),
-     o3(0xE7,0xB9,0x95), o3(0xE7,0xBE,0xA8),
-     o3(0xE8,0x85,0xBA), o3(0xE8,0x86,0xB3),
-     o3(0xE8,0x88,0xB9), o3(0xE8,0x98,0x9A),
-     o3(0xE8,0x9F,0xAC), o3(0xE8,0xA9,0xB5),
-     o3(0xE8,0xB7,0xA3), o3(0xE9,0x81,0xB8),
-     o3(0xE9,0x8A,0x91), o3(0xE9,0x90,0xA5),
-     o3(0xE9,0xA5,0x8D), o3(0xE9,0xAE,0xAE),
-     o3(0xE5,0x8D,0xA8), o3(0xE5,0xB1,0x91),
-     o3(0xE6,0xA5,0x94), o3(0xE6,0xB3,0x84),
-     o3(0xE6,0xB4,0xA9), o3(0xE6,0xB8,0xAB),
-     o3(0xE8,0x88,0x8C), o3(0xE8,0x96,0x9B),
-     o3(0xE8,0xA4,0xBB), o3(0xE8,0xA8,0xAD),
-     o3(0xE8,0xAA,0xAA), o3(0xE9,0x9B,0xAA),
-     o3(0xE9,0xBD,0xA7), o3(0xE5,0x89,0xA1),
-     o3(0xE6,0x9A,0xB9), o3(0xE6,0xAE,0xB2),
-     o3(0xE7,0xBA,0x96), o3(0xE8,0x9F,0xBE),
-     o3(0xE8,0xB4,0x8D), o3(0xE9,0x96,0x83),
-     o3(0xE9,0x99,0x9D), o3(0xE6,0x94,0x9D),
-     o3(0xE6,0xB6,0x89), o3(0xE7,0x87,0xAE),
-     o3(0xEF,0xA5,0xAE), o3(0xE5,0x9F,0x8E),
-     o3(0xE5,0xA7,0x93), o3(0xE5,0xAE,0xAC),
-     o3(0xE6,0x80,0xA7), o3(0xE6,0x83,0xBA),
-     o3(0xE6,0x88,0x90), o3(0xE6,0x98,0x9F),
-     o3(0xE6,0x99,0x9F), o3(0xE7,0x8C,0xA9),
-     o3(0xE7,0x8F,0xB9), o3(0xE7,0x9B,0x9B),
-     o3(0xE7,0x9C,0x81), o3(0xE7,0xAD,0xAC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E0 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E1_infos[95] = {
-     o3(0xE8,0x81,0x96), o3(0xE8,0x81,0xB2),
-     o3(0xE8,0x85,0xA5), o3(0xE8,0xAA,0xA0),
-     o3(0xE9,0x86,0x92), o3(0xE4,0xB8,0x96),
-     o3(0xE5,0x8B,0xA2), o3(0xE6,0xAD,0xB2),
-     o3(0xE6,0xB4,0x97), o3(0xE7,0xA8,0x85),
-     o3(0xE7,0xAC,0xB9), o3(0xE7,0xB4,0xB0),
-     o3(0xEF,0xA5,0xAF), o3(0xE8,0xB2,0xB0),
-     o3(0xE5,0x8F,0xAC), o3(0xE5,0x98,0xAF),
-     o3(0xE5,0xA1,0x91), o3(0xE5,0xAE,0xB5),
-     o3(0xE5,0xB0,0x8F), o3(0xE5,0xB0,0x91),
-     o3(0xE5,0xB7,0xA2), o3(0xE6,0x89,0x80),
-     o3(0xE6,0x8E,0x83), o3(0xE6,0x90,0x94),
-     o3(0xE6,0x98,0xAD), o3(0xE6,0xA2,0xB3),
-     o3(0xE6,0xB2,0xBC), o3(0xE6,0xB6,0x88),
-     o3(0xE6,0xBA,0xAF), o3(0xE7,0x80,0x9F),
-     o3(0xE7,0x82,0xA4), o3(0xE7,0x87,0x92),
-     o3(0xE7,0x94,0xA6), o3(0xE7,0x96,0x8F),
-     o3(0xE7,0x96,0x8E), o3(0xE7,0x98,0x99),
-     o3(0xE7,0xAC,0x91), o3(0xE7,0xAF,0xA0),
-     o3(0xE7,0xB0,0xAB), o3(0xE7,0xB4,0xA0),
-     o3(0xE7,0xB4,0xB9), o3(0xE8,0x94,0xAC),
-     o3(0xE8,0x95,0xAD), o3(0xE8,0x98,0x87),
-     o3(0xE8,0xA8,0xB4), o3(0xE9,0x80,0x8D),
-     o3(0xE9,0x81,0xA1), o3(0xE9,0x82,0xB5),
-     o3(0xE9,0x8A,0xB7), o3(0xE9,0x9F,0xB6),
-     o3(0xE9,0xA8,0xB7), o3(0xE4,0xBF,0x97),
-     o3(0xE5,0xB1,0xAC), o3(0xE6,0x9D,0x9F),
-     o3(0xE6,0xB6,0x91), o3(0xE7,0xB2,0x9F),
-     o3(0xE7,0xBA,0x8C), o3(0xE8,0xAC,0x96),
-     o3(0xE8,0xB4,0x96), o3(0xE9,0x80,0x9F),
-     o3(0xE5,0xAD,0xAB), o3(0xE5,0xB7,0xBD),
-     o3(0xE6,0x90,0x8D), o3(0xE8,0x93,0x80),
-     o3(0xE9,0x81,0x9C), o3(0xE9,0xA3,0xA1),
-     o3(0xE7,0x8E,0x87), o3(0xE5,0xAE,0x8B),
-     o3(0xE6,0x82,0x9A), o3(0xE6,0x9D,0xBE),
-     o3(0xE6,0xB7,0x9E), o3(0xE8,0xA8,0x9F),
-     o3(0xE8,0xAA,0xA6), o3(0xE9,0x80,0x81),
-     o3(0xE9,0xA0,0x8C), o3(0xE5,0x88,0xB7),
-     o3(0xEF,0xA5,0xB0), o3(0xE7,0x81,0x91),
-     o3(0xE7,0xA2,0x8E), o3(0xE9,0x8E,0x96),
-     o3(0xE8,0xA1,0xB0), o3(0xE9,0x87,0x97),
-     o3(0xE4,0xBF,0xAE), o3(0xE5,0x8F,0x97),
-     o3(0xE5,0x97,0xBD), o3(0xE5,0x9B,0x9A),
-     o3(0xE5,0x9E,0x82), o3(0xE5,0xA3,0xBD),
-     o3(0xE5,0xAB,0x82), o3(0xE5,0xAE,0x88),
-     o3(0xE5,0xB2,0xAB), o3(0xE5,0xB3,0x80),
-     o3(0xE5,0xB8,0xA5), o3(0xE6,0x84,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E1 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E1_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E2_infos[95] = {
-     o3(0xE6,0x88,0x8D), o3(0xE6,0x89,0x8B),
-     o3(0xE6,0x8E,0x88), o3(0xE6,0x90,0x9C),
-     o3(0xE6,0x94,0xB6), o3(0xE6,0x95,0xB8),
-     o3(0xE6,0xA8,0xB9), o3(0xE6,0xAE,0x8A),
-     o3(0xE6,0xB0,0xB4), o3(0xE6,0xB4,0x99),
-     o3(0xE6,0xBC,0xB1), o3(0xE7,0x87,0xA7),
-     o3(0xE7,0x8B,0xA9), o3(0xE7,0x8D,0xB8),
-     o3(0xE7,0x90,0x87), o3(0xE7,0x92,0xB2),
-     o3(0xE7,0x98,0xA6), o3(0xE7,0x9D,0xA1),
-     o3(0xE7,0xA7,0x80), o3(0xE7,0xA9,0x97),
-     o3(0xE7,0xAB,0xAA), o3(0xE7,0xB2,0xB9),
-     o3(0xE7,0xB6,0x8F), o3(0xE7,0xB6,0xAC),
-     o3(0xE7,0xB9,0xA1), o3(0xE7,0xBE,0x9E),
-     o3(0xE8,0x84,0xA9), o3(0xE8,0x8C,0xB1),
-     o3(0xE8,0x92,0x90), o3(0xE8,0x93,0x9A),
-     o3(0xE8,0x97,0xAA), o3(0xE8,0xA2,0x96),
-     o3(0xE8,0xAA,0xB0), o3(0xE8,0xAE,0x90),
-     o3(0xE8,0xBC,0xB8), o3(0xE9,0x81,0x82),
-     o3(0xE9,0x82,0x83), o3(0xE9,0x85,0xAC),
-     o3(0xE9,0x8A,0x96), o3(0xE9,0x8A,0xB9),
-     o3(0xE9,0x9A,0x8B), o3(0xE9,0x9A,0xA7),
-     o3(0xE9,0x9A,0xA8), o3(0xE9,0x9B,0x96),
-     o3(0xE9,0x9C,0x80), o3(0xE9,0xA0,0x88),
-     o3(0xE9,0xA6,0x96), o3(0xE9,0xAB,0x93),
-     o3(0xE9,0xAC,0x9A), o3(0xE5,0x8F,0x94),
-     o3(0xE5,0xA1,0xBE), o3(0xE5,0xA4,0x99),
-     o3(0xE5,0xAD,0xB0), o3(0xE5,0xAE,0xBF),
-     o3(0xE6,0xB7,0x91), o3(0xE6,0xBD,0x9A),
-     o3(0xE7,0x86,0x9F), o3(0xE7,0x90,0xA1),
-     o3(0xE7,0x92,0xB9), o3(0xE8,0x82,0x85),
-     o3(0xE8,0x8F,0xBD), o3(0xE5,0xB7,0xA1),
-     o3(0xE5,0xBE,0x87), o3(0xE5,0xBE,0xAA),
-     o3(0xE6,0x81,0x82), o3(0xE6,0x97,0xAC),
-     o3(0xE6,0xA0,0x92), o3(0xE6,0xA5,0xAF),
-     o3(0xE6,0xA9,0x93), o3(0xE6,0xAE,0x89),
-     o3(0xE6,0xB4,0xB5), o3(0xE6,0xB7,0xB3),
-     o3(0xE7,0x8F,0xA3), o3(0xE7,0x9B,0xBE),
-     o3(0xE7,0x9E,0xAC), o3(0xE7,0xAD,0x8D),
-     o3(0xE7,0xB4,0x94), o3(0xE8,0x84,0xA3),
-     o3(0xE8,0x88,0x9C), o3(0xE8,0x8D,0x80),
-     o3(0xE8,0x93,0xB4), o3(0xE8,0x95,0xA3),
-     o3(0xE8,0xA9,0xA2), o3(0xE8,0xAB,0x84),
-     o3(0xE9,0x86,0x87), o3(0xE9,0x8C,0x9E),
-     o3(0xE9,0xA0,0x86), o3(0xE9,0xA6,0xB4),
-     o3(0xE6,0x88,0x8C), o3(0xE8,0xA1,0x93),
-     o3(0xE8,0xBF,0xB0), o3(0xE9,0x89,0xA5),
-     o3(0xE5,0xB4,0x87), o3(0xE5,0xB4,0xA7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E2 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E3_infos[95] = {
-     o3(0xE5,0xB5,0xA9), o3(0xE7,0x91,0x9F),
-     o3(0xE8,0x86,0x9D), o3(0xE8,0x9D,0xA8),
-     o3(0xE6,0xBF,0x95), o3(0xE6,0x8B,0xBE),
-     o3(0xE7,0xBF,0x92), o3(0xE8,0xA4,0xB6),
-     o3(0xE8,0xA5,0xB2), o3(0xE4,0xB8,0x9E),
-     o3(0xE4,0xB9,0x98), o3(0xE5,0x83,0xA7),
-     o3(0xE5,0x8B,0x9D), o3(0xE5,0x8D,0x87),
-     o3(0xE6,0x89,0xBF), o3(0xE6,0x98,0x87),
-     o3(0xE7,0xB9,0xA9), o3(0xE8,0xA0,0x85),
-     o3(0xE9,0x99,0x9E), o3(0xE4,0xBE,0x8D),
-     o3(0xE5,0x8C,0x99), o3(0xE5,0x98,0xB6),
-     o3(0xE5,0xA7,0x8B), o3(0xE5,0xAA,0xA4),
-     o3(0xE5,0xB0,0xB8), o3(0xE5,0xB1,0x8E),
-     o3(0xE5,0xB1,0x8D), o3(0xE5,0xB8,0x82),
-     o3(0xE5,0xBC,0x91), o3(0xE6,0x81,0x83),
-     o3(0xE6,0x96,0xBD), o3(0xE6,0x98,0xAF),
-     o3(0xE6,0x99,0x82), o3(0xE6,0x9E,0xBE),
-     o3(0xE6,0x9F,0xB4), o3(0xE7,0x8C,0x9C),
-     o3(0xE7,0x9F,0xA2), o3(0xE7,0xA4,0xBA),
-     o3(0xE7,0xBF,0x85), o3(0xE8,0x92,0x94),
-     o3(0xE8,0x93,0x8D), o3(0xE8,0xA6,0x96),
-     o3(0xE8,0xA9,0xA6), o3(0xE8,0xA9,0xA9),
-     o3(0xE8,0xAB,0xA1), o3(0xE8,0xB1,0x95),
-     o3(0xE8,0xB1,0xBA), o3(0xE5,0x9F,0xB4),
-     o3(0xE5,0xAF,0x94), o3(0xE5,0xBC,0x8F),
-     o3(0xE6,0x81,0xAF), o3(0xE6,0x8B,0xAD),
-     o3(0xE6,0xA4,0x8D), o3(0xE6,0xAE,0x96),
-     o3(0xE6,0xB9,0x9C), o3(0xE7,0x86,0x84),
-     o3(0xE7,0xAF,0x92), o3(0xE8,0x9D,0x95),
-     o3(0xE8,0xAD,0x98), o3(0xE8,0xBB,0xBE),
-     o3(0xE9,0xA3,0x9F), o3(0xE9,0xA3,0xBE),
-     o3(0xE4,0xBC,0xB8), o3(0xE4,0xBE,0x81),
-     o3(0xE4,0xBF,0xA1), o3(0xE5,0x91,0xBB),
-     o3(0xE5,0xA8,0xA0), o3(0xE5,0xAE,0xB8),
-     o3(0xE6,0x84,0xBC), o3(0xE6,0x96,0xB0),
-     o3(0xE6,0x99,0xA8), o3(0xE7,0x87,0xBC),
-     o3(0xE7,0x94,0xB3), o3(0xE7,0xA5,0x9E),
-     o3(0xE7,0xB4,0xB3), o3(0xE8,0x85,0x8E),
-     o3(0xE8,0x87,0xA3), o3(0xE8,0x8E,0x98),
-     o3(0xE8,0x96,0xAA), o3(0xE8,0x97,0x8E),
-     o3(0xE8,0x9C,0x83), o3(0xE8,0xA8,0x8A),
-     o3(0xE8,0xBA,0xAB), o3(0xE8,0xBE,0x9B),
-     o3(0xEF,0xA5,0xB1), o3(0xE8,0xBF,0x85),
-     o3(0xE5,0xA4,0xB1), o3(0xE5,0xAE,0xA4),
-     o3(0xE5,0xAF,0xA6), o3(0xE6,0x82,0x89),
-     o3(0xE5,0xAF,0xA9), o3(0xE5,0xB0,0x8B),
-     o3(0xE5,0xBF,0x83), o3(0xE6,0xB2,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E3 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E4_infos[95] = {
-     o3(0xEF,0xA5,0xB2), o3(0xE6,0xB7,0xB1),
-     o3(0xE7,0x80,0x8B), o3(0xE7,0x94,0x9A),
-     o3(0xE8,0x8A,0xAF), o3(0xE8,0xAB,0xB6),
-     o3(0xE4,0xBB,0x80), o3(0xE5,0x8D,0x81),
-     o3(0xEF,0xA5,0xB3), o3(0xE9,0x9B,0x99),
-     o3(0xE6,0xB0,0x8F), o3(0xE4,0xBA,0x9E),
-     o3(0xE4,0xBF,0x84), o3(0xE5,0x85,0x92),
-     o3(0xE5,0x95,0x9E), o3(0xE5,0xA8,0xA5),
-     o3(0xE5,0xB3,0xA8), o3(0xE6,0x88,0x91),
-     o3(0xE7,0x89,0x99), o3(0xE8,0x8A,0xBD),
-     o3(0xE8,0x8E,0xAA), o3(0xE8,0x9B,0xBE),
-     o3(0xE8,0xA1,0x99), o3(0xE8,0xA8,0x9D),
-     o3(0xE9,0x98,0xBF), o3(0xE9,0x9B,0x85),
-     o3(0xE9,0xA4,0x93), o3(0xE9,0xB4,0x89),
-     o3(0xE9,0xB5,0x9D), o3(0xE5,0xA0,0x8A),
-     o3(0xE5,0xB2,0xB3), o3(0xE5,0xB6,0xBD),
-     o3(0xE5,0xB9,0x84), o3(0xE6,0x83,0xA1),
-     o3(0xE6,0x84,0x95), o3(0xE6,0x8F,0xA1),
-     o3(0xE6,0xA8,0x82), o3(0xE6,0xB8,0xA5),
-     o3(0xE9,0x84,0x82), o3(0xE9,0x8D,0x94),
-     o3(0xE9,0xA1,0x8E), o3(0xE9,0xB0,0x90),
-     o3(0xE9,0xBD,0xB7), o3(0xE5,0xAE,0x89),
-     o3(0xE5,0xB2,0xB8), o3(0xE6,0x8C,0x89),
-     o3(0xE6,0x99,0x8F), o3(0xE6,0xA1,0x88),
-     o3(0xE7,0x9C,0xBC), o3(0xE9,0x9B,0x81),
-     o3(0xE9,0x9E,0x8D), o3(0xE9,0xA1,0x94),
-     o3(0xE9,0xAE,0x9F), o3(0xE6,0x96,0xA1),
-     o3(0xE8,0xAC,0x81), o3(0xE8,0xBB,0x8B),
-     o3(0xE9,0x96,0xBC), o3(0xE5,0x94,0xB5),
-     o3(0xE5,0xB2,0xA9), o3(0xE5,0xB7,0x96),
-     o3(0xE5,0xBA,0xB5), o3(0xE6,0x9A,0x97),
-     o3(0xE7,0x99,0x8C), o3(0xE8,0x8F,0xB4),
-     o3(0xE9,0x97,0x87), o3(0xE5,0xA3,0x93),
-     o3(0xE6,0x8A,0xBC), o3(0xE7,0x8B,0x8E),
-     o3(0xE9,0xB4,0xA8), o3(0xE4,0xBB,0xB0),
-     o3(0xE5,0xA4,0xAE), o3(0xE6,0x80,0x8F),
-     o3(0xE6,0x98,0xBB), o3(0xE6,0xAE,0x83),
-     o3(0xE7,0xA7,0xA7), o3(0xE9,0xB4,0xA6),
-     o3(0xE5,0x8E,0x93), o3(0xE5,0x93,0x80),
-     o3(0xE5,0x9F,0x83), o3(0xE5,0xB4,0x96),
-     o3(0xE6,0x84,0x9B), o3(0xE6,0x9B,0x96),
-     o3(0xE6,0xB6,0xAF), o3(0xE7,0xA2,0x8D),
-     o3(0xE8,0x89,0xBE), o3(0xE9,0x9A,0x98),
-     o3(0xE9,0x9D,0x84), o3(0xE5,0x8E,0x84),
-     o3(0xE6,0x89,0xBC), o3(0xE6,0x8E,0x96),
-     o3(0xE6,0xB6,0xB2), o3(0xE7,0xB8,0x8A),
-     o3(0xE8,0x85,0x8B), o3(0xE9,0xA1,0x8D),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E4 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E4_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E5_infos[95] = {
-     o3(0xE6,0xAB,0xBB), o3(0xE7,0xBD,0x8C),
-     o3(0xE9,0xB6,0xAF), o3(0xE9,0xB8,0x9A),
-     o3(0xE4,0xB9,0x9F), o3(0xE5,0x80,0xBB),
-     o3(0xE5,0x86,0xB6), o3(0xE5,0xA4,0x9C),
-     o3(0xE6,0x83,0xB9), o3(0xE6,0x8F,0xB6),
-     o3(0xE6,0xA4,0xB0), o3(0xE7,0x88,0xBA),
-     o3(0xE8,0x80,0xB6), o3(0xEF,0xA5,0xB4),
-     o3(0xE9,0x87,0x8E), o3(0xE5,0xBC,0xB1),
-     o3(0xEF,0xA5,0xB5), o3(0xEF,0xA5,0xB6),
-     o3(0xE7,0xB4,0x84), o3(0xE8,0x8B,0xA5),
-     o3(0xE8,0x91,0xAF), o3(0xE8,0x92,0xBB),
-     o3(0xE8,0x97,0xA5), o3(0xE8,0xBA,0x8D),
-     o3(0xEF,0xA5,0xB7), o3(0xE4,0xBD,0xAF),
-     o3(0xEF,0xA5,0xB8), o3(0xEF,0xA5,0xB9),
-     o3(0xE5,0xA3,0xA4), o3(0xE5,0xAD,0x83),
-     o3(0xE6,0x81,0x99), o3(0xE6,0x8F,0x9A),
-     o3(0xE6,0x94,0x98), o3(0xE6,0x95,0xAD),
-     o3(0xE6,0x9A,0x98), o3(0xEF,0xA5,0xBA),
-     o3(0xE6,0xA5,0x8A), o3(0xE6,0xA8,0xA3),
-     o3(0xE6,0xB4,0x8B), o3(0xE7,0x80,0x81),
-     o3(0xE7,0x85,0xAC), o3(0xE7,0x97,0x92),
-     o3(0xE7,0x98,0x8D), o3(0xE7,0xA6,0xB3),
-     o3(0xE7,0xA9,0xB0), o3(0xEF,0xA5,0xBB),
-     o3(0xE7,0xBE,0x8A), o3(0xEF,0xA5,0xBC),
-     o3(0xE8,0xA5,0x84), o3(0xEF,0xA5,0xBD),
-     o3(0xE8,0xAE,0x93), o3(0xE9,0x87,0x80),
-     o3(0xE9,0x99,0xBD), o3(0xEF,0xA5,0xBE),
-     o3(0xE9,0xA4,0x8A), o3(0xE5,0x9C,0x84),
-     o3(0xE5,0xBE,0xA1), o3(0xE6,0x96,0xBC),
-     o3(0xE6,0xBC,0x81), o3(0xE7,0x98,0x80),
-     o3(0xE7,0xA6,0xA6), o3(0xE8,0xAA,0x9E),
-     o3(0xE9,0xA6,0xAD), o3(0xE9,0xAD,0x9A),
-     o3(0xE9,0xBD,0xAC), o3(0xE5,0x84,0x84),
-     o3(0xE6,0x86,0xB6), o3(0xE6,0x8A,0x91),
-     o3(0xE6,0xAA,0x8D), o3(0xE8,0x87,0x86),
-     o3(0xE5,0x81,0x83), o3(0xE5,0xA0,0xB0),
-     o3(0xE5,0xBD,0xA6), o3(0xE7,0x84,0x89),
-     o3(0xE8,0xA8,0x80), o3(0xE8,0xAB,0xBA),
-     o3(0xE5,0xAD,0xBC), o3(0xE8,0x98,0x96),
-     o3(0xE4,0xBF,0xBA), o3(0xE5,0x84,0xBC),
-     o3(0xE5,0x9A,0xB4), o3(0xE5,0xA5,0x84),
-     o3(0xE6,0x8E,0xA9), o3(0xE6,0xB7,0xB9),
-     o3(0xE5,0xB6,0xAA), o3(0xE6,0xA5,0xAD),
-     o3(0xE5,0x86,0x86), o3(0xE4,0xBA,0x88),
-     o3(0xE4,0xBD,0x99), o3(0xEF,0xA5,0xBF),
-     o3(0xEF,0xA6,0x80), o3(0xEF,0xA6,0x81),
-     o3(0xE5,0xA6,0x82), o3(0xEF,0xA6,0x82),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E5 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E5_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E6_infos[95] = {
-     o3(0xEF,0xA6,0x83), o3(0xE6,0xAD,0x9F),
-     o3(0xE6,0xB1,0x9D), o3(0xEF,0xA6,0x84),
-     o3(0xE7,0x92,0xB5), o3(0xE7,0xA4,0x96),
-     o3(0xEF,0xA6,0x85), o3(0xE8,0x88,0x87),
-     o3(0xE8,0x89,0x85), o3(0xE8,0x8C,0xB9),
-     o3(0xE8,0xBC,0xBF), o3(0xE8,0xBD,0x9D),
-     o3(0xEF,0xA6,0x86), o3(0xE9,0xA4,0x98),
-     o3(0xEF,0xA6,0x87), o3(0xEF,0xA6,0x88),
-     o3(0xEF,0xA6,0x89), o3(0xE4,0xBA,0xA6),
-     o3(0xEF,0xA6,0x8A), o3(0xE5,0x9F,0x9F),
-     o3(0xE5,0xBD,0xB9), o3(0xE6,0x98,0x93),
-     o3(0xEF,0xA6,0x8B), o3(0xEF,0xA6,0x8C),
-     o3(0xE7,0x96,0xAB), o3(0xE7,0xB9,0xB9),
-     o3(0xE8,0xAD,0xAF), o3(0xEF,0xA6,0x8D),
-     o3(0xE9,0x80,0x86), o3(0xE9,0xA9,0x9B),
-     o3(0xE5,0x9A,0xA5), o3(0xE5,0xA0,0xA7),
-     o3(0xE5,0xA7,0xB8), o3(0xE5,0xA8,0x9F),
-     o3(0xE5,0xAE,0xB4), o3(0xEF,0xA6,0x8E),
-     o3(0xE5,0xBB,0xB6), o3(0xEF,0xA6,0x8F),
-     o3(0xEF,0xA6,0x90), o3(0xE6,0x8D,0x90),
-     o3(0xE6,0x8C,0xBB), o3(0xEF,0xA6,0x91),
-     o3(0xE6,0xA4,0xBD), o3(0xE6,0xB2,0x87),
-     o3(0xE6,0xB2,0xBF), o3(0xE6,0xB6,0x8E),
-     o3(0xE6,0xB6,0x93), o3(0xE6,0xB7,0xB5),
-     o3(0xE6,0xBC,0x94), o3(0xEF,0xA6,0x92),
-     o3(0xE7,0x83,0x9F), o3(0xE7,0x84,0xB6),
-     o3(0xE7,0x85,0x99), o3(0xEF,0xA6,0x93),
-     o3(0xE7,0x87,0x83), o3(0xE7,0x87,0x95),
-     o3(0xEF,0xA6,0x94), o3(0xE7,0xA1,0x8F),
-     o3(0xE7,0xA1,0xAF), o3(0xEF,0xA6,0x95),
-     o3(0xE7,0xAD,0xB5), o3(0xE7,0xB7,0xA3),
-     o3(0xEF,0xA6,0x96), o3(0xE7,0xB8,0xAF),
-     o3(0xEF,0xA6,0x97), o3(0xE8,0xA1,0x8D),
-     o3(0xE8,0xBB,0x9F), o3(0xEF,0xA6,0x98),
-     o3(0xEF,0xA6,0x99), o3(0xEF,0xA6,0x9A),
-     o3(0xE9,0x89,0x9B), o3(0xEF,0xA6,0x9B),
-     o3(0xE9,0xB3,0xB6), o3(0xEF,0xA6,0x9C),
-     o3(0xEF,0xA6,0x9D), o3(0xEF,0xA6,0x9E),
-     o3(0xE6,0x82,0x85), o3(0xE6,0xB6,0x85),
-     o3(0xEF,0xA6,0x9F), o3(0xE7,0x86,0xB1),
-     o3(0xEF,0xA6,0xA0), o3(0xEF,0xA6,0xA1),
-     o3(0xE9,0x96,0xB1), o3(0xE5,0x8E,0xAD),
-     o3(0xEF,0xA6,0xA2), o3(0xEF,0xA6,0xA3),
-     o3(0xEF,0xA6,0xA4), o3(0xE6,0x9F,0x93),
-     o3(0xEF,0xA6,0xA5), o3(0xE7,0x82,0x8E),
-     o3(0xE7,0x84,0xB0), o3(0xE7,0x90,0xB0),
-     o3(0xE8,0x89,0xB6), o3(0xE8,0x8B,0x92),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E6 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E6_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E7_infos[95] = {
-     o3(0xEF,0xA6,0xA6), o3(0xE9,0x96,0xBB),
-     o3(0xE9,0xAB,0xA5), o3(0xE9,0xB9,0xBD),
-     o3(0xE6,0x9B,0x84), o3(0xEF,0xA6,0xA7),
-     o3(0xE7,0x87,0x81), o3(0xE8,0x91,0x89),
-     o3(0xEF,0xA6,0xA8), o3(0xEF,0xA6,0xA9),
-     o3(0xE5,0xA1,0x8B), o3(0xEF,0xA6,0xAA),
-     o3(0xEF,0xA6,0xAB), o3(0xE5,0xB6,0xB8),
-     o3(0xE5,0xBD,0xB1), o3(0xEF,0xA6,0xAC),
-     o3(0xE6,0x98,0xA0), o3(0xE6,0x9A,0x8E),
-     o3(0xE6,0xA5,0xB9), o3(0xE6,0xA6,0xAE),
-     o3(0xE6,0xB0,0xB8), o3(0xE6,0xB3,0xB3),
-     o3(0xE6,0xB8,0xB6), o3(0xE6,0xBD,0x81),
-     o3(0xE6,0xBF,0x9A), o3(0xE7,0x80,0x9B),
-     o3(0xE7,0x80,0xAF), o3(0xE7,0x85,0x90),
-     o3(0xE7,0x87,0x9F), o3(0xE7,0x8D,0xB0),
-     o3(0xEF,0xA6,0xAD), o3(0xE7,0x91,0x9B),
-     o3(0xEF,0xA6,0xAE), o3(0xE7,0x93,0x94),
-     o3(0xE7,0x9B,0x88), o3(0xE7,0xA9,0x8E),
-     o3(0xE7,0xBA,0x93), o3(0xEF,0xA6,0xAF),
-     o3(0xEF,0xA6,0xB0), o3(0xE8,0x8B,0xB1),
-     o3(0xE8,0xA9,0xA0), o3(0xE8,0xBF,0x8E),
-     o3(0xEF,0xA6,0xB1), o3(0xE9,0x8D,0x88),
-     o3(0xEF,0xA6,0xB2), o3(0xE9,0x9C,0x99),
-     o3(0xEF,0xA6,0xB3), o3(0xEF,0xA6,0xB4),
-     o3(0xE4,0xB9,0x82), o3(0xE5,0x80,0xAA),
-     o3(0xEF,0xA6,0xB5), o3(0xE5,0x88,0x88),
-     o3(0xE5,0x8F,0xA1), o3(0xE6,0x9B,0xB3),
-     o3(0xE6,0xB1,0xAD), o3(0xE6,0xBF,0x8A),
-     o3(0xE7,0x8C,0x8A), o3(0xE7,0x9D,0xBF),
-     o3(0xE7,0xA9,0xA2), o3(0xE8,0x8A,0xAE),
-     o3(0xE8,0x97,0x9D), o3(0xE8,0x98,0x82),
-     o3(0xEF,0xA6,0xB6), o3(0xE8,0xA3,0x94),
-     o3(0xE8,0xA9,0xA3), o3(0xE8,0xAD,0xBD),
-     o3(0xE8,0xB1,0xAB), o3(0xEF,0xA6,0xB7),
-     o3(0xE9,0x8A,0xB3), o3(0xEF,0xA6,0xB8),
-     o3(0xE9,0x9C,0x93), o3(0xE9,0xA0,0x90),
-     o3(0xE4,0xBA,0x94), o3(0xE4,0xBC,0x8D),
-     o3(0xE4,0xBF,0x89), o3(0xE5,0x82,0xB2),
-     o3(0xE5,0x8D,0x88), o3(0xE5,0x90,0xBE),
-     o3(0xE5,0x90,0xB3), o3(0xE5,0x97,0x9A),
-     o3(0xE5,0xA1,0xA2), o3(0xE5,0xA2,0xBA),
-     o3(0xE5,0xA5,0xA7), o3(0xE5,0xA8,0x9B),
-     o3(0xE5,0xAF,0xA4), o3(0xE6,0x82,0x9F),
-     o3(0xEF,0xA6,0xB9), o3(0xE6,0x87,0x8A),
-     o3(0xE6,0x95,0x96), o3(0xE6,0x97,0xBF),
-     o3(0xE6,0x99,0xA4), o3(0xE6,0xA2,0xA7),
-     o3(0xE6,0xB1,0x9A), o3(0xE6,0xBE,0xB3),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E7 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E7_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E8_infos[95] = {
-     o3(0xE7,0x83,0x8F), o3(0xE7,0x86,0xAC),
-     o3(0xE7,0x8D,0x92), o3(0xE7,0xAD,0xBD),
-     o3(0xE8,0x9C,0x88), o3(0xE8,0xAA,0xA4),
-     o3(0xE9,0xB0,0xB2), o3(0xE9,0xBC,0x87),
-     o3(0xE5,0xB1,0x8B), o3(0xE6,0xB2,0x83),
-     o3(0xE7,0x8D,0x84), o3(0xE7,0x8E,0x89),
-     o3(0xE9,0x88,0xBA), o3(0xE6,0xBA,0xAB),
-     o3(0xE7,0x91,0xA5), o3(0xE7,0x98,0x9F),
-     o3(0xE7,0xA9,0xA9), o3(0xE7,0xB8,0x95),
-     o3(0xE8,0x98,0x8A), o3(0xE5,0x85,0x80),
-     o3(0xE5,0xA3,0x85), o3(0xE6,0x93,0x81),
-     o3(0xE7,0x93,0xAE), o3(0xE7,0x94,0x95),
-     o3(0xE7,0x99,0xB0), o3(0xE7,0xBF,0x81),
-     o3(0xE9,0x82,0x95), o3(0xE9,0x9B,0x8D),
-     o3(0xE9,0xA5,0x94), o3(0xE6,0xB8,0xA6),
-     o3(0xE7,0x93,0xA6), o3(0xE7,0xAA,0xA9),
-     o3(0xE7,0xAA,0xAA), o3(0xE8,0x87,0xA5),
-     o3(0xE8,0x9B,0x99), o3(0xE8,0x9D,0xB8),
-     o3(0xE8,0xA8,0x9B), o3(0xE5,0xA9,0x89),
-     o3(0xE5,0xAE,0x8C), o3(0xE5,0xAE,0x9B),
-     o3(0xE6,0xA2,0xA1), o3(0xE6,0xA4,0x80),
-     o3(0xE6,0xB5,0xA3), o3(0xE7,0x8E,0xA9),
-     o3(0xE7,0x90,0x93), o3(0xE7,0x90,0xAC),
-     o3(0xE7,0xA2,0x97), o3(0xE7,0xB7,0xA9),
-     o3(0xE7,0xBF,0xAB), o3(0xE8,0x84,0x98),
-     o3(0xE8,0x85,0x95), o3(0xE8,0x8E,0x9E),
-     o3(0xE8,0xB1,0x8C), o3(0xE9,0x98,0xAE),
-     o3(0xE9,0xA0,0x91), o3(0xE6,0x9B,0xB0),
-     o3(0xE5,0xBE,0x80), o3(0xE6,0x97,0xBA),
-     o3(0xE6,0x9E,0x89), o3(0xE6,0xB1,0xAA),
-     o3(0xE7,0x8E,0x8B), o3(0xE5,0x80,0xAD),
-     o3(0xE5,0xA8,0x83), o3(0xE6,0xAD,0xAA),
-     o3(0xE7,0x9F,0xAE), o3(0xE5,0xA4,0x96),
-     o3(0xE5,0xB5,0xAC), o3(0xE5,0xB7,0x8D),
-     o3(0xE7,0x8C,0xA5), o3(0xE7,0x95,0x8F),
-     o3(0xEF,0xA6,0xBA), o3(0xEF,0xA6,0xBB),
-     o3(0xE5,0x83,0xA5), o3(0xE5,0x87,0xB9),
-     o3(0xE5,0xA0,0xAF), o3(0xE5,0xA4,0xAD),
-     o3(0xE5,0xA6,0x96), o3(0xE5,0xA7,0x9A),
-     o3(0xE5,0xAF,0xA5), o3(0xEF,0xA6,0xBC),
-     o3(0xEF,0xA6,0xBD), o3(0xE5,0xB6,0xA2),
-     o3(0xE6,0x8B,0x97), o3(0xE6,0x90,0x96),
-     o3(0xE6,0x92,0x93), o3(0xE6,0x93,0xBE),
-     o3(0xEF,0xA6,0xBE), o3(0xE6,0x9B,0x9C),
-     o3(0xEF,0xA6,0xBF), o3(0xE6,0xA9,0x88),
-     o3(0xEF,0xA7,0x80), o3(0xE7,0x87,0xBF),
-     o3(0xE7,0x91,0xA4), o3(0xEF,0xA7,0x81),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E8 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_E9_infos[95] = {
-     o3(0xE7,0xAA,0x88), o3(0xE7,0xAA,0xAF),
-     o3(0xE7,0xB9,0x87), o3(0xE7,0xB9,0x9E),
-     o3(0xE8,0x80,0x80), o3(0xE8,0x85,0xB0),
-     o3(0xEF,0xA7,0x82), o3(0xE8,0x9F,0xAF),
-     o3(0xE8,0xA6,0x81), o3(0xE8,0xAC,0xA0),
-     o3(0xE9,0x81,0x99), o3(0xEF,0xA7,0x83),
-     o3(0xE9,0x82,0x80), o3(0xE9,0xA5,0x92),
-     o3(0xE6,0x85,0xBE), o3(0xE6,0xAC,0xB2),
-     o3(0xE6,0xB5,0xB4), o3(0xE7,0xB8,0x9F),
-     o3(0xE8,0xA4,0xA5), o3(0xE8,0xBE,0xB1),
-     o3(0xE4,0xBF,0x91), o3(0xE5,0x82,0xAD),
-     o3(0xE5,0x86,0x97), o3(0xE5,0x8B,0x87),
-     o3(0xE5,0x9F,0x87), o3(0xE5,0xA2,0x89),
-     o3(0xE5,0xAE,0xB9), o3(0xE5,0xBA,0xB8),
-     o3(0xE6,0x85,0x82), o3(0xE6,0xA6,0x95),
-     o3(0xE6,0xB6,0x8C), o3(0xE6,0xB9,0xA7),
-     o3(0xE6,0xBA,0xB6), o3(0xE7,0x86,0x94),
-     o3(0xE7,0x91,0xA2), o3(0xE7,0x94,0xA8),
-     o3(0xE7,0x94,0xAC), o3(0xE8,0x81,0xB3),
-     o3(0xE8,0x8C,0xB8), o3(0xE8,0x93,0x89),
-     o3(0xE8,0xB8,0x8A), o3(0xE9,0x8E,0x94),
-     o3(0xE9,0x8F,0x9E), o3(0xEF,0xA7,0x84),
-     o3(0xE4,0xBA,0x8E), o3(0xE4,0xBD,0x91),
-     o3(0xE5,0x81,0xB6), o3(0xE5,0x84,0xAA),
-     o3(0xE5,0x8F,0x88), o3(0xE5,0x8F,0x8B),
-     o3(0xE5,0x8F,0xB3), o3(0xE5,0xAE,0x87),
-     o3(0xE5,0xAF,0x93), o3(0xE5,0xB0,0xA4),
-     o3(0xE6,0x84,0x9A), o3(0xE6,0x86,0x82),
-     o3(0xE6,0x97,0xB4), o3(0xE7,0x89,0x9B),
-     o3(0xE7,0x8E,0x97), o3(0xE7,0x91,0x80),
-     o3(0xE7,0x9B,0x82), o3(0xE7,0xA5,0x90),
-     o3(0xE7,0xA6,0x91), o3(0xE7,0xA6,0xB9),
-     o3(0xE7,0xB4,0x86), o3(0xE7,0xBE,0xBD),
-     o3(0xE8,0x8A,0x8B), o3(0xE8,0x97,0x95),
-     o3(0xE8,0x99,0x9E), o3(0xE8,0xBF,0x82),
-     o3(0xE9,0x81,0x87), o3(0xE9,0x83,0xB5),
-     o3(0xE9,0x87,0xAA), o3(0xE9,0x9A,0x85),
-     o3(0xE9,0x9B,0xA8), o3(0xE9,0x9B,0xA9),
-     o3(0xE5,0x8B,0x96), o3(0xE5,0xBD,0xA7),
-     o3(0xE6,0x97,0xAD), o3(0xE6,0x98,0xB1),
-     o3(0xE6,0xA0,0xAF), o3(0xE7,0x85,0x9C),
-     o3(0xE7,0xA8,0xB6), o3(0xE9,0x83,0x81),
-     o3(0xE9,0xA0,0x8A), o3(0xE4,0xBA,0x91),
-     o3(0xEF,0xA7,0x85), o3(0xE6,0xA9,0x92),
-     o3(0xE6,0xAE,0x9E), o3(0xE6,0xBE,0x90),
-     o3(0xE7,0x86,0x89), o3(0xE8,0x80,0x98),
-     o3(0xE8,0x8A,0xB8), o3(0xE8,0x95,0x93),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_E9 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_E9_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_EA_infos[95] = {
-     o3(0xE9,0x81,0x8B), o3(0xE9,0x9A,0x95),
-     o3(0xE9,0x9B,0xB2), o3(0xE9,0x9F,0xBB),
-     o3(0xE8,0x94,0x9A), o3(0xE9,0xAC,0xB1),
-     o3(0xE4,0xBA,0x90), o3(0xE7,0x86,0x8A),
-     o3(0xE9,0x9B,0x84), o3(0xE5,0x85,0x83),
-     o3(0xE5,0x8E,0x9F), o3(0xE5,0x93,0xA1),
-     o3(0xE5,0x9C,0x93), o3(0xE5,0x9C,0x92),
-     o3(0xE5,0x9E,0xA3), o3(0xE5,0xAA,0x9B),
-     o3(0xE5,0xAB,0x84), o3(0xE5,0xAF,0x83),
-     o3(0xE6,0x80,0xA8), o3(0xE6,0x84,0xBF),
-     o3(0xE6,0x8F,0xB4), o3(0xE6,0xB2,0x85),
-     o3(0xE6,0xB4,0xB9), o3(0xE6,0xB9,0xB2),
-     o3(0xE6,0xBA,0x90), o3(0xE7,0x88,0xB0),
-     o3(0xE7,0x8C,0xBF), o3(0xE7,0x91,0x97),
-     o3(0xE8,0x8B,0x91), o3(0xE8,0xA2,0x81),
-     o3(0xE8,0xBD,0x85), o3(0xE9,0x81,0xA0),
-     o3(0xEF,0xA7,0x86), o3(0xE9,0x99,0xA2),
-     o3(0xE9,0xA1,0x98), o3(0xE9,0xB4,0x9B),
-     o3(0xE6,0x9C,0x88), o3(0xE8,0xB6,0x8A),
-     o3(0xE9,0x89,0x9E), o3(0xE4,0xBD,0x8D),
-     o3(0xE5,0x81,0x89), o3(0xE5,0x83,0x9E),
-     o3(0xE5,0x8D,0xB1), o3(0xE5,0x9C,0x8D),
-     o3(0xE5,0xA7,0x94), o3(0xE5,0xA8,0x81),
-     o3(0xE5,0xB0,0x89), o3(0xE6,0x85,0xB0),
-     o3(0xE6,0x9A,0x90), o3(0xE6,0xB8,0xAD),
-     o3(0xE7,0x88,0xB2), o3(0xE7,0x91,0x8B),
-     o3(0xE7,0xB7,0xAF), o3(0xE8,0x83,0x83),
-     o3(0xE8,0x90,0x8E), o3(0xE8,0x91,0xA6),
-     o3(0xE8,0x94,0xBF), o3(0xE8,0x9D,0x9F),
-     o3(0xE8,0xA1,0x9B), o3(0xE8,0xA4,0x98),
-     o3(0xE8,0xAC,0x82), o3(0xE9,0x81,0x95),
-     o3(0xE9,0x9F,0x8B), o3(0xE9,0xAD,0x8F),
-     o3(0xE4,0xB9,0xB3), o3(0xE4,0xBE,0x91),
-     o3(0xE5,0x84,0x92), o3(0xE5,0x85,0xAA),
-     o3(0xEF,0xA7,0x87), o3(0xE5,0x94,0xAF),
-     o3(0xE5,0x96,0xA9), o3(0xE5,0xAD,0xBA),
-     o3(0xE5,0xAE,0xA5), o3(0xE5,0xB9,0xBC),
-     o3(0xE5,0xB9,0xBD), o3(0xE5,0xBA,0xBE),
-     o3(0xE6,0x82,0xA0), o3(0xE6,0x83,0x9F),
-     o3(0xE6,0x84,0x88), o3(0xE6,0x84,0x89),
-     o3(0xE6,0x8F,0x84), o3(0xE6,0x94,0xB8),
-     o3(0xE6,0x9C,0x89), o3(0xEF,0xA7,0x88),
-     o3(0xE6,0x9F,0x94), o3(0xE6,0x9F,0x9A),
-     o3(0xEF,0xA7,0x89), o3(0xE6,0xA5,0xA1),
-     o3(0xE6,0xA5,0xA2), o3(0xE6,0xB2,0xB9),
-     o3(0xE6,0xB4,0xA7), o3(0xEF,0xA7,0x8A),
-     o3(0xE6,0xB8,0xB8), o3(0xEF,0xA7,0x8B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_EA = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_EA_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_EB_infos[95] = {
-     o3(0xE6,0xBF,0xA1), o3(0xE7,0x8C,0xB6),
-     o3(0xE7,0x8C,0xB7), o3(0xEF,0xA7,0x8C),
-     o3(0xE7,0x91,0x9C), o3(0xE7,0x94,0xB1),
-     o3(0xEF,0xA7,0x8D), o3(0xE7,0x99,0x92),
-     o3(0xEF,0xA7,0x8E), o3(0xEF,0xA7,0x8F),
-     o3(0xE7,0xB6,0xAD), o3(0xE8,0x87,0xBE),
-     o3(0xE8,0x90,0xB8), o3(0xE8,0xA3,0x95),
-     o3(0xE8,0xAA,0x98), o3(0xE8,0xAB,0x9B),
-     o3(0xE8,0xAB,0xAD), o3(0xE8,0xB8,0xB0),
-     o3(0xE8,0xB9,0x82), o3(0xE9,0x81,0x8A),
-     o3(0xE9,0x80,0xBE), o3(0xE9,0x81,0xBA),
-     o3(0xE9,0x85,0x89), o3(0xE9,0x87,0x89),
-     o3(0xE9,0x8D,0xAE), o3(0xEF,0xA7,0x90),
-     o3(0xEF,0xA7,0x91), o3(0xE5,0xA0,0x89),
-     o3(0xEF,0xA7,0x92), o3(0xE6,0xAF,0x93),
-     o3(0xE8,0x82,0x89), o3(0xE8,0x82,0xB2),
-     o3(0xEF,0xA7,0x93), o3(0xEF,0xA7,0x94),
-     o3(0xE5,0x85,0x81), o3(0xE5,0xA5,0xAB),
-     o3(0xE5,0xB0,0xB9), o3(0xEF,0xA7,0x95),
-     o3(0xEF,0xA7,0x96), o3(0xE6,0xBD,0xA4),
-     o3(0xE7,0x8E,0xA7), o3(0xE8,0x83,0xA4),
-     o3(0xE8,0xB4,0x87), o3(0xEF,0xA7,0x97),
-     o3(0xE9,0x88,0x97), o3(0xE9,0x96,0x8F),
-     o3(0xEF,0xA7,0x98), o3(0xEF,0xA7,0x99),
-     o3(0xEF,0xA7,0x9A), o3(0xEF,0xA7,0x9B),
-     o3(0xE8,0x81,0xBF), o3(0xE6,0x88,0x8E),
-     o3(0xE7,0x80,0x9C), o3(0xE7,0xB5,0xA8),
-     o3(0xE8,0x9E,0x8D), o3(0xEF,0xA7,0x9C),
-     o3(0xE5,0x9E,0xA0), o3(0xE6,0x81,0xA9),
-     o3(0xE6,0x85,0x87), o3(0xE6,0xAE,0xB7),
-     o3(0xE8,0xAA,0xBE), o3(0xE9,0x8A,0x80),
-     o3(0xE9,0x9A,0xB1), o3(0xE4,0xB9,0x99),
-     o3(0xE5,0x90,0x9F), o3(0xE6,0xB7,0xAB),
-     o3(0xE8,0x94,0xAD), o3(0xE9,0x99,0xB0),
-     o3(0xE9,0x9F,0xB3), o3(0xE9,0xA3,0xAE),
-     o3(0xE6,0x8F,0x96), o3(0xE6,0xB3,0xA3),
-     o3(0xE9,0x82,0x91), o3(0xE5,0x87,0x9D),
-     o3(0xE6,0x87,0x89), o3(0xE8,0x86,0xBA),
-     o3(0xE9,0xB7,0xB9), o3(0xE4,0xBE,0x9D),
-     o3(0xE5,0x80,0x9A), o3(0xE5,0x84,0x80),
-     o3(0xE5,0xAE,0x9C), o3(0xE6,0x84,0x8F),
-     o3(0xE6,0x87,0xBF), o3(0xE6,0x93,0xAC),
-     o3(0xE6,0xA4,0x85), o3(0xE6,0xAF,0x85),
-     o3(0xE7,0x96,0x91), o3(0xE7,0x9F,0xA3),
-     o3(0xE7,0xBE,0xA9), o3(0xE8,0x89,0xA4),
-     o3(0xE8,0x96,0x8F), o3(0xE8,0x9F,0xBB),
-     o3(0xE8,0xA1,0xA3), o3(0xE8,0xAA,0xBC),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_EB = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_EB_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_EC_infos[95] = {
-     o3(0xE8,0xAD,0xB0), o3(0xE9,0x86,0xAB),
-     o3(0xE4,0xBA,0x8C), o3(0xE4,0xBB,0xA5),
-     o3(0xE4,0xBC,0x8A), o3(0xEF,0xA7,0x9D),
-     o3(0xEF,0xA7,0x9E), o3(0xE5,0xA4,0xB7),
-     o3(0xE5,0xA7,0xA8), o3(0xEF,0xA7,0x9F),
-     o3(0xE5,0xB7,0xB2), o3(0xE5,0xBC,0x9B),
-     o3(0xE5,0xBD,0x9B), o3(0xE6,0x80,0xA1),
-     o3(0xEF,0xA7,0xA0), o3(0xEF,0xA7,0xA1),
-     o3(0xEF,0xA7,0xA2), o3(0xEF,0xA7,0xA3),
-     o3(0xE7,0x88,0xBE), o3(0xE7,0x8F,0xA5),
-     o3(0xEF,0xA7,0xA4), o3(0xE7,0x95,0xB0),
-     o3(0xE7,0x97,0x8D), o3(0xEF,0xA7,0xA5),
-     o3(0xE7,0xA7,0xBB), o3(0xEF,0xA7,0xA6),
-     o3(0xE8,0x80,0x8C), o3(0xE8,0x80,0xB3),
-     o3(0xE8,0x82,0x84), o3(0xE8,0x8B,0xA1),
-     o3(0xE8,0x8D,0x91), o3(0xEF,0xA7,0xA7),
-     o3(0xEF,0xA7,0xA8), o3(0xE8,0xB2,0xBD),
-     o3(0xE8,0xB2,0xB3), o3(0xE9,0x82,0x87),
-     o3(0xEF,0xA7,0xA9), o3(0xEF,0xA7,0xAA),
-     o3(0xE9,0xA3,0xB4), o3(0xE9,0xA4,0x8C),
-     o3(0xEF,0xA7,0xAB), o3(0xEF,0xA7,0xAC),
-     o3(0xE7,0x80,0xB7), o3(0xE7,0x9B,0x8A),
-     o3(0xE7,0xBF,0x8A), o3(0xE7,0xBF,0x8C),
-     o3(0xE7,0xBF,0xBC), o3(0xE8,0xAC,0x9A),
-     o3(0xE4,0xBA,0xBA), o3(0xE4,0xBB,0x81),
-     o3(0xE5,0x88,0x83), o3(0xE5,0x8D,0xB0),
-     o3(0xEF,0xA7,0xAD), o3(0xE5,0x92,0xBD),
-     o3(0xE5,0x9B,0xA0), o3(0xE5,0xA7,0xBB),
-     o3(0xE5,0xAF,0x85), o3(0xE5,0xBC,0x95),
-     o3(0xE5,0xBF,0x8D), o3(0xE6,0xB9,0xAE),
-     o3(0xEF,0xA7,0xAE), o3(0xEF,0xA7,0xAF),
-     o3(0xE7,0xB5,0xAA), o3(0xE8,0x8C,0xB5),
-     o3(0xEF,0xA7,0xB0), o3(0xE8,0x9A,0x93),
-     o3(0xE8,0xAA,0x8D), o3(0xEF,0xA7,0xB1),
-     o3(0xE9,0x9D,0xAD), o3(0xE9,0x9D,0xB7),
-     o3(0xEF,0xA7,0xB2), o3(0xEF,0xA7,0xB3),
-     o3(0xE4,0xB8,0x80), o3(0xE4,0xBD,0x9A),
-     o3(0xE4,0xBD,0xBE), o3(0xE5,0xA3,0xB9),
-     o3(0xE6,0x97,0xA5), o3(0xE6,0xBA,0xA2),
-     o3(0xE9,0x80,0xB8), o3(0xE9,0x8E,0xB0),
-     o3(0xE9,0xA6,0xB9), o3(0xE4,0xBB,0xBB),
-     o3(0xE5,0xA3,0xAC), o3(0xE5,0xA6,0x8A),
-     o3(0xE5,0xA7,0x99), o3(0xE6,0x81,0x81),
-     o3(0xEF,0xA7,0xB4), o3(0xEF,0xA7,0xB5),
-     o3(0xE7,0xA8,0x94), o3(0xEF,0xA7,0xB6),
-     o3(0xE8,0x8D,0x8F), o3(0xE8,0xB3,0x83),
-     o3(0xE5,0x85,0xA5), o3(0xE5,0x8D,0x84),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_EC = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_EC_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_ED_infos[95] = {
-     o3(0xEF,0xA7,0xB7), o3(0xEF,0xA7,0xB8),
-     o3(0xEF,0xA7,0xB9), o3(0xE4,0xBB,0x8D),
-     o3(0xE5,0x89,0xA9), o3(0xE5,0xAD,0x95),
-     o3(0xE8,0x8A,0xBF), o3(0xE4,0xBB,0x94),
-     o3(0xE5,0x88,0xBA), o3(0xE5,0x92,0xA8),
-     o3(0xE5,0xA7,0x89), o3(0xE5,0xA7,0xBF),
-     o3(0xE5,0xAD,0x90), o3(0xE5,0xAD,0x97),
-     o3(0xE5,0xAD,0x9C), o3(0xE6,0x81,0xA3),
-     o3(0xE6,0x85,0x88), o3(0xE6,0xBB,0x8B),
-     o3(0xE7,0x82,0x99), o3(0xE7,0x85,0xAE),
-     o3(0xE7,0x8E,0x86), o3(0xE7,0x93,0xB7),
-     o3(0xE7,0x96,0xB5), o3(0xE7,0xA3,0x81),
-     o3(0xE7,0xB4,0xAB), o3(0xE8,0x80,0x85),
-     o3(0xE8,0x87,0xAA), o3(0xE8,0x8C,0xA8),
-     o3(0xE8,0x94,0x97), o3(0xE8,0x97,0x89),
-     o3(0xE8,0xAB,0xAE), o3(0xE8,0xB3,0x87),
-     o3(0xE9,0x9B,0x8C), o3(0xE4,0xBD,0x9C),
-     o3(0xE5,0x8B,0xBA), o3(0xE5,0x9A,0xBC),
-     o3(0xE6,0x96,0xAB), o3(0xE6,0x98,0xA8),
-     o3(0xE7,0x81,0xBC), o3(0xE7,0x82,0xB8),
-     o3(0xE7,0x88,0xB5), o3(0xE7,0xB6,0xBD),
-     o3(0xE8,0x8A,0x8D), o3(0xE9,0x85,0x8C),
-     o3(0xE9,0x9B,0x80), o3(0xE9,0xB5,0xB2),
-     o3(0xE5,0xAD,0xB1), o3(0xE6,0xA3,0xA7),
-     o3(0xE6,0xAE,0x98), o3(0xE6,0xBD,0xBA),
-     o3(0xE7,0x9B,0x9E), o3(0xE5,0xB2,0x91),
-     o3(0xE6,0x9A,0xAB), o3(0xE6,0xBD,0x9B),
-     o3(0xE7,0xAE,0xB4), o3(0xE7,0xB0,0xAA),
-     o3(0xE8,0xA0,0xB6), o3(0xE9,0x9B,0x9C),
-     o3(0xE4,0xB8,0x88), o3(0xE4,0xBB,0x97),
-     o3(0xE5,0x8C,0xA0), o3(0xE5,0xA0,0xB4),
-     o3(0xE5,0xA2,0xBB), o3(0xE5,0xA3,0xAF),
-     o3(0xE5,0xA5,0xAC), o3(0xE5,0xB0,0x87),
-     o3(0xE5,0xB8,0xB3), o3(0xE5,0xBA,0x84),
-     o3(0xE5,0xBC,0xB5), o3(0xE6,0x8E,0x8C),
-     o3(0xE6,0x9A,0xB2), o3(0xE6,0x9D,0x96),
-     o3(0xE6,0xA8,0x9F), o3(0xE6,0xAA,0xA3),
-     o3(0xE6,0xAC,0x8C), o3(0xE6,0xBC,0xBF),
-     o3(0xE7,0x89,0x86), o3(0xEF,0xA7,0xBA),
-     o3(0xE7,0x8D,0x90), o3(0xE7,0x92,0x8B),
-     o3(0xE7,0xAB,0xA0), o3(0xE7,0xB2,0xA7),
-     o3(0xE8,0x85,0xB8), o3(0xE8,0x87,0x9F),
-     o3(0xE8,0x87,0xA7), o3(0xE8,0x8E,0x8A),
-     o3(0xE8,0x91,0xAC), o3(0xE8,0x94,0xA3),
-     o3(0xE8,0x96,0x94), o3(0xE8,0x97,0x8F),
-     o3(0xE8,0xA3,0x9D), o3(0xE8,0xB4,0x93),
-     o3(0xE9,0x86,0xAC), o3(0xE9,0x95,0xB7),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_ED = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_ED_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_EE_infos[95] = {
-     o3(0xE9,0x9A,0x9C), o3(0xE5,0x86,0x8D),
-     o3(0xE5,0x93,0x89), o3(0xE5,0x9C,0xA8),
-     o3(0xE5,0xAE,0xB0), o3(0xE6,0x89,0x8D),
-     o3(0xE6,0x9D,0x90), o3(0xE6,0xA0,0xBD),
-     o3(0xE6,0xA2,0x93), o3(0xE6,0xB8,0xBD),
-     o3(0xE6,0xBB,0x93), o3(0xE7,0x81,0xBD),
-     o3(0xE7,0xB8,0xA1), o3(0xE8,0xA3,0x81),
-     o3(0xE8,0xB2,0xA1), o3(0xE8,0xBC,0x89),
-     o3(0xE9,0xBD,0x8B), o3(0xE9,0xBD,0x8E),
-     o3(0xE7,0x88,0xAD), o3(0xE7,0xAE,0x8F),
-     o3(0xE8,0xAB,0x8D), o3(0xE9,0x8C,0x9A),
-     o3(0xE4,0xBD,0x87), o3(0xE4,0xBD,0x8E),
-     o3(0xE5,0x84,0xB2), o3(0xE5,0x92,0x80),
-     o3(0xE5,0xA7,0x90), o3(0xE5,0xBA,0x95),
-     o3(0xE6,0x8A,0xB5), o3(0xE6,0x9D,0xB5),
-     o3(0xE6,0xA5,0xAE), o3(0xE6,0xA8,0x97),
-     o3(0xE6,0xB2,0xAE), o3(0xE6,0xB8,0x9A),
-     o3(0xE7,0x8B,0x99), o3(0xE7,0x8C,0xAA),
-     o3(0xE7,0x96,0xBD), o3(0xE7,0xAE,0xB8),
-     o3(0xE7,0xB4,0xB5), o3(0xE8,0x8B,0xA7),
-     o3(0xE8,0x8F,0xB9), o3(0xE8,0x91,0x97),
-     o3(0xE8,0x97,0xB7), o3(0xE8,0xA9,0x9B),
-     o3(0xE8,0xB2,0xAF), o3(0xE8,0xBA,0x87),
-     o3(0xE9,0x80,0x99), o3(0xE9,0x82,0xB8),
-     o3(0xE9,0x9B,0x8E), o3(0xE9,0xBD,0x9F),
-     o3(0xE5,0x8B,0xA3), o3(0xE5,0x90,0x8A),
-     o3(0xE5,0xAB,0xA1), o3(0xE5,0xAF,0x82),
-     o3(0xE6,0x91,0x98), o3(0xE6,0x95,0xB5),
-     o3(0xE6,0xBB,0xB4), o3(0xE7,0x8B,0x84),
-     o3(0xEF,0xA7,0xBB), o3(0xE7,0x9A,0x84),
-     o3(0xE7,0xA9,0x8D), o3(0xE7,0xAC,0x9B),
-     o3(0xE7,0xB1,0x8D), o3(0xE7,0xB8,0xBE),
-     o3(0xE7,0xBF,0x9F), o3(0xE8,0x8D,0xBB),
-     o3(0xE8,0xAC,0xAB), o3(0xE8,0xB3,0x8A),
-     o3(0xE8,0xB5,0xA4), o3(0xE8,0xB7,0xA1),
-     o3(0xE8,0xB9,0x9F), o3(0xE8,0xBF,0xAA),
-     o3(0xE8,0xBF,0xB9), o3(0xE9,0x81,0xA9),
-     o3(0xE9,0x8F,0x91), o3(0xE4,0xBD,0x83),
-     o3(0xE4,0xBD,0xBA), o3(0xE5,0x82,0xB3),
-     o3(0xE5,0x85,0xA8), o3(0xE5,0x85,0xB8),
-     o3(0xE5,0x89,0x8D), o3(0xE5,0x89,0xAA),
-     o3(0xE5,0xA1,0xA1), o3(0xE5,0xA1,0xBC),
-     o3(0xE5,0xA5,0xA0), o3(0xE5,0xB0,0x88),
-     o3(0xE5,0xB1,0x95), o3(0xE5,0xBB,0x9B),
-     o3(0xE6,0x82,0x9B), o3(0xE6,0x88,0xB0),
-     o3(0xE6,0xA0,0x93), o3(0xE6,0xAE,0xBF),
-     o3(0xE6,0xB0,0x88), o3(0xE6,0xBE,0xB1),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_EE = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_EE_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_EF_infos[95] = {
-     o3(0xE7,0x85,0x8E), o3(0xE7,0x90,0xA0),
-     o3(0xE7,0x94,0xB0), o3(0xE7,0x94,0xB8),
-     o3(0xE7,0x95,0x91), o3(0xE7,0x99,0xB2),
-     o3(0xE7,0xAD,0x8C), o3(0xE7,0xAE,0x8B),
-     o3(0xE7,0xAE,0xAD), o3(0xE7,0xAF,0x86),
-     o3(0xE7,0xBA,0x8F), o3(0xE8,0xA9,0xAE),
-     o3(0xE8,0xBC,0xBE), o3(0xE8,0xBD,0x89),
-     o3(0xE9,0x88,0xBF), o3(0xE9,0x8A,0x93),
-     o3(0xE9,0x8C,0xA2), o3(0xE9,0x90,0xAB),
-     o3(0xE9,0x9B,0xBB), o3(0xE9,0xA1,0x9A),
-     o3(0xE9,0xA1,0xAB), o3(0xE9,0xA4,0x9E),
-     o3(0xE5,0x88,0x87), o3(0xE6,0x88,0xAA),
-     o3(0xE6,0x8A,0x98), o3(0xE6,0xB5,0x99),
-     o3(0xE7,0x99,0xA4), o3(0xE7,0xAB,0x8A),
-     o3(0xE7,0xAF,0x80), o3(0xE7,0xB5,0xB6),
-     o3(0xE5,0x8D,0xA0), o3(0xE5,0xB2,0xBE),
-     o3(0xE5,0xBA,0x97), o3(0xE6,0xBC,0xB8),
-     o3(0xE7,0x82,0xB9), o3(0xE7,0xB2,0x98),
-     o3(0xE9,0x9C,0x91), o3(0xE9,0xAE,0x8E),
-     o3(0xE9,0xBB,0x9E), o3(0xE6,0x8E,0xA5),
-     o3(0xE6,0x91,0xBA), o3(0xE8,0x9D,0xB6),
-     o3(0xE4,0xB8,0x81), o3(0xE4,0xBA,0x95),
-     o3(0xE4,0xBA,0xAD), o3(0xE5,0x81,0x9C),
-     o3(0xE5,0x81,0xB5), o3(0xE5,0x91,0x88),
-     o3(0xE5,0xA7,0x83), o3(0xE5,0xAE,0x9A),
-     o3(0xE5,0xB9,0x80), o3(0xE5,0xBA,0xAD),
-     o3(0xE5,0xBB,0xB7), o3(0xE5,0xBE,0x81),
-     o3(0xE6,0x83,0x85), o3(0xE6,0x8C,0xBA),
-     o3(0xE6,0x94,0xBF), o3(0xE6,0x95,0xB4),
-     o3(0xE6,0x97,0x8C), o3(0xE6,0x99,0xB6),
-     o3(0xE6,0x99,0xB8), o3(0xE6,0x9F,0xBE),
-     o3(0xE6,0xA5,0xA8), o3(0xE6,0xAA,0x89),
-     o3(0xE6,0xAD,0xA3), o3(0xE6,0xB1,0x80),
-     o3(0xE6,0xB7,0x80), o3(0xE6,0xB7,0xA8),
-     o3(0xE6,0xB8,0x9F), o3(0xE6,0xB9,0x9E),
-     o3(0xE7,0x80,0x9E), o3(0xE7,0x82,0xA1),
-     o3(0xE7,0x8E,0x8E), o3(0xE7,0x8F,0xBD),
-     o3(0xE7,0x94,0xBA), o3(0xE7,0x9D,0x9B),
-     o3(0xE7,0xA2,0x87), o3(0xE7,0xA6,0x8E),
-     o3(0xE7,0xA8,0x8B), o3(0xE7,0xA9,0xBD),
-     o3(0xE7,0xB2,0xBE), o3(0xE7,0xB6,0x8E),
-     o3(0xE8,0x89,0x87), o3(0xE8,0xA8,0x82),
-     o3(0xE8,0xAB,0xAA), o3(0xE8,0xB2,0x9E),
-     o3(0xE9,0x84,0xAD), o3(0xE9,0x85,0x8A),
-     o3(0xE9,0x87,0x98), o3(0xE9,0x89,0xA6),
-     o3(0xE9,0x8B,0x8C), o3(0xE9,0x8C,0xA0),
-     o3(0xE9,0x9C,0x86), o3(0xE9,0x9D,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_EF = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_EF_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F0_infos[95] = {
-     o3(0xE9,0x9D,0x9C), o3(0xE9,0xA0,0x82),
-     o3(0xE9,0xBC,0x8E), o3(0xE5,0x88,0xB6),
-     o3(0xE5,0x8A,0x91), o3(0xE5,0x95,0xBC),
-     o3(0xE5,0xA0,0xA4), o3(0xE5,0xB8,0x9D),
-     o3(0xE5,0xBC,0x9F), o3(0xE6,0x82,0x8C),
-     o3(0xE6,0x8F,0x90), o3(0xE6,0xA2,0xAF),
-     o3(0xE6,0xBF,0x9F), o3(0xE7,0xA5,0xAD),
-     o3(0xE7,0xAC,0xAC), o3(0xE8,0x87,0x8D),
-     o3(0xE8,0x96,0xBA), o3(0xE8,0xA3,0xBD),
-     o3(0xE8,0xAB,0xB8), o3(0xE8,0xB9,0x84),
-     o3(0xE9,0x86,0x8D), o3(0xE9,0x99,0xA4),
-     o3(0xE9,0x9A,0x9B), o3(0xE9,0x9C,0xBD),
-     o3(0xE9,0xA1,0x8C), o3(0xE9,0xBD,0x8A),
-     o3(0xE4,0xBF,0x8E), o3(0xE5,0x85,0x86),
-     o3(0xE5,0x87,0x8B), o3(0xE5,0x8A,0xA9),
-     o3(0xE5,0x98,0xB2), o3(0xE5,0xBC,0x94),
-     o3(0xE5,0xBD,0xAB), o3(0xE6,0x8E,0xAA),
-     o3(0xE6,0x93,0x8D), o3(0xE6,0x97,0xA9),
-     o3(0xE6,0x99,0x81), o3(0xE6,0x9B,0xBA),
-     o3(0xE6,0x9B,0xB9), o3(0xE6,0x9C,0x9D),
-     o3(0xE6,0xA2,0x9D), o3(0xE6,0xA3,0x97),
-     o3(0xE6,0xA7,0xBD), o3(0xE6,0xBC,0x95),
-     o3(0xE6,0xBD,0xAE), o3(0xE7,0x85,0xA7),
-     o3(0xE7,0x87,0xA5), o3(0xE7,0x88,0xAA),
-     o3(0xE7,0x92,0xAA), o3(0xE7,0x9C,0xBA),
-     o3(0xE7,0xA5,0x96), o3(0xE7,0xA5,0x9A),
-     o3(0xE7,0xA7,0x9F), o3(0xE7,0xA8,0xA0),
-     o3(0xE7,0xAA,0x95), o3(0xE7,0xB2,0x97),
-     o3(0xE7,0xB3,0x9F), o3(0xE7,0xB5,0x84),
-     o3(0xE7,0xB9,0xB0), o3(0xE8,0x82,0x87),
-     o3(0xE8,0x97,0xBB), o3(0xE8,0x9A,0xA4),
-     o3(0xE8,0xA9,0x94), o3(0xE8,0xAA,0xBF),
-     o3(0xE8,0xB6,0x99), o3(0xE8,0xBA,0x81),
-     o3(0xE9,0x80,0xA0), o3(0xE9,0x81,0xAD),
-     o3(0xE9,0x87,0xA3), o3(0xE9,0x98,0xBB),
-     o3(0xE9,0x9B,0x95), o3(0xE9,0xB3,0xA5),
-     o3(0xE6,0x97,0x8F), o3(0xE7,0xB0,0x87),
-     o3(0xE8,0xB6,0xB3), o3(0xE9,0x8F,0x83),
-     o3(0xE5,0xAD,0x98), o3(0xE5,0xB0,0x8A),
-     o3(0xE5,0x8D,0x92), o3(0xE6,0x8B,0x99),
-     o3(0xE7,0x8C,0x9D), o3(0xE5,0x80,0xA7),
-     o3(0xE5,0xAE,0x97), o3(0xE5,0xBE,0x9E),
-     o3(0xE6,0x82,0xB0), o3(0xE6,0x85,0xAB),
-     o3(0xE6,0xA3,0x95), o3(0xE6,0xB7,0x99),
-     o3(0xE7,0x90,0xAE), o3(0xE7,0xA8,0xAE),
-     o3(0xE7,0xB5,0x82), o3(0xE7,0xB6,0x9C),
-     o3(0xE7,0xB8,0xB1), o3(0xE8,0x85,0xAB),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F0 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F0_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F1_infos[95] = {
-     o3(0xE8,0xB8,0xAA), o3(0xE8,0xB8,0xB5),
-     o3(0xE9,0x8D,0xBE), o3(0xE9,0x90,0x98),
-     o3(0xE4,0xBD,0x90), o3(0xE5,0x9D,0x90),
-     o3(0xE5,0xB7,0xA6), o3(0xE5,0xBA,0xA7),
-     o3(0xE6,0x8C,0xAB), o3(0xE7,0xBD,0xAA),
-     o3(0xE4,0xB8,0xBB), o3(0xE4,0xBD,0x8F),
-     o3(0xE4,0xBE,0x8F), o3(0xE5,0x81,0x9A),
-     o3(0xE5,0xA7,0x9D), o3(0xE8,0x83,0x84),
-     o3(0xE5,0x91,0xAA), o3(0xE5,0x91,0xA8),
-     o3(0xE5,0x97,0xBE), o3(0xE5,0xA5,0x8F),
-     o3(0xE5,0xAE,0x99), o3(0xE5,0xB7,0x9E),
-     o3(0xE5,0xBB,0x9A), o3(0xE6,0x99,0x9D),
-     o3(0xE6,0x9C,0xB1), o3(0xE6,0x9F,0xB1),
-     o3(0xE6,0xA0,0xAA), o3(0xE6,0xB3,0xA8),
-     o3(0xE6,0xB4,0xB2), o3(0xE6,0xB9,0x8A),
-     o3(0xE6,0xBE,0x8D), o3(0xE7,0x82,0xB7),
-     o3(0xE7,0x8F,0xA0), o3(0xE7,0x96,0x87),
-     o3(0xE7,0xB1,0x8C), o3(0xE7,0xB4,0x82),
-     o3(0xE7,0xB4,0xAC), o3(0xE7,0xB6,0xA2),
-     o3(0xE8,0x88,0x9F), o3(0xE8,0x9B,0x9B),
-     o3(0xE8,0xA8,0xBB), o3(0xE8,0xAA,0x85),
-     o3(0xE8,0xB5,0xB0), o3(0xE8,0xBA,0x8A),
-     o3(0xE8,0xBC,0xB3), o3(0xE9,0x80,0xB1),
-     o3(0xE9,0x85,0x8E), o3(0xE9,0x85,0x92),
-     o3(0xE9,0x91,0x84), o3(0xE9,0xA7,0x90),
-     o3(0xE7,0xAB,0xB9), o3(0xE7,0xB2,0xA5),
-     o3(0xE4,0xBF,0x8A), o3(0xE5,0x84,0x81),
-     o3(0xE5,0x87,0x86), o3(0xE5,0x9F,0x88),
-     o3(0xE5,0xAF,0xAF), o3(0xE5,0xB3,0xBB),
-     o3(0xE6,0x99,0x99), o3(0xE6,0xA8,0xBD),
-     o3(0xE6,0xB5,0x9A), o3(0xE6,0xBA,0x96),
-     o3(0xE6,0xBF,0xAC), o3(0xE7,0x84,0x8C),
-     o3(0xE7,0x95,0xAF), o3(0xE7,0xAB,0xA3),
-     o3(0xE8,0xA0,0xA2), o3(0xE9,0x80,0xA1),
-     o3(0xE9,0x81,0xB5), o3(0xE9,0x9B,0x8B),
-     o3(0xE9,0xA7,0xBF), o3(0xE8,0x8C,0x81),
-     o3(0xE4,0xB8,0xAD), o3(0xE4,0xBB,0xB2),
-     o3(0xE8,0xA1,0x86), o3(0xE9,0x87,0x8D),
-     o3(0xE5,0x8D,0xBD), o3(0xE6,0xAB,0x9B),
-     o3(0xE6,0xA5,0xAB), o3(0xE6,0xB1,0x81),
-     o3(0xE8,0x91,0xBA), o3(0xE5,0xA2,0x9E),
-     o3(0xE6,0x86,0x8E), o3(0xE6,0x9B,0xBE),
-     o3(0xE6,0x8B,0xAF), o3(0xE7,0x83,0x9D),
-     o3(0xE7,0x94,0x91), o3(0xE7,0x97,0x87),
-     o3(0xE7,0xB9,0x92), o3(0xE8,0x92,0xB8),
-     o3(0xE8,0xAD,0x89), o3(0xE8,0xB4,0x88),
-     o3(0xE4,0xB9,0x8B), o3(0xE5,0x8F,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F1 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F1_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F2_infos[95] = {
-     o3(0xE5,0x92,0xAB), o3(0xE5,0x9C,0xB0),
-     o3(0xE5,0x9D,0x80), o3(0xE5,0xBF,0x97),
-     o3(0xE6,0x8C,0x81), o3(0xE6,0x8C,0x87),
-     o3(0xE6,0x91,0xAF), o3(0xE6,0x94,0xAF),
-     o3(0xE6,0x97,0xA8), o3(0xE6,0x99,0xBA),
-     o3(0xE6,0x9E,0x9D), o3(0xE6,0x9E,0xB3),
-     o3(0xE6,0xAD,0xA2), o3(0xE6,0xB1,0xA0),
-     o3(0xE6,0xB2,0x9A), o3(0xE6,0xBC,0xAC),
-     o3(0xE7,0x9F,0xA5), o3(0xE7,0xA0,0xA5),
-     o3(0xE7,0xA5,0x89), o3(0xE7,0xA5,0x97),
-     o3(0xE7,0xB4,0x99), o3(0xE8,0x82,0xA2),
-     o3(0xE8,0x84,0x82), o3(0xE8,0x87,0xB3),
-     o3(0xE8,0x8A,0x9D), o3(0xE8,0x8A,0xB7),
-     o3(0xE8,0x9C,0x98), o3(0xE8,0xAA,0x8C),
-     o3(0xEF,0xA7,0xBC), o3(0xE8,0xB4,0x84),
-     o3(0xE8,0xB6,0xBE), o3(0xE9,0x81,0xB2),
-     o3(0xE7,0x9B,0xB4), o3(0xE7,0xA8,0x99),
-     o3(0xE7,0xA8,0xB7), o3(0xE7,0xB9,0x94),
-     o3(0xE8,0x81,0xB7), o3(0xE5,0x94,0x87),
-     o3(0xE5,0x97,0x94), o3(0xE5,0xA1,0xB5),
-     o3(0xE6,0x8C,0xAF), o3(0xE6,0x90,0xA2),
-     o3(0xE6,0x99,0x89), o3(0xE6,0x99,0x8B),
-     o3(0xE6,0xA1,0xAD), o3(0xE6,0xA6,0x9B),
-     o3(0xE6,0xAE,0x84), o3(0xE6,0xB4,0xA5),
-     o3(0xE6,0xBA,0xB1), o3(0xE7,0x8F,0x8D),
-     o3(0xE7,0x91,0xA8), o3(0xE7,0x92,0xA1),
-     o3(0xE7,0x95,0x9B), o3(0xE7,0x96,0xB9),
-     o3(0xE7,0x9B,0xA1), o3(0xE7,0x9C,0x9E),
-     o3(0xE7,0x9E,0x8B), o3(0xE7,0xA7,0xA6),
-     o3(0xE7,0xB8,0x89), o3(0xE7,0xB8,0x9D),
-     o3(0xE8,0x87,0xBB), o3(0xE8,0x94,0xAF),
-     o3(0xE8,0xA2,0x97), o3(0xE8,0xA8,0xBA),
-     o3(0xE8,0xB3,0x91), o3(0xE8,0xBB,0xAB),
-     o3(0xE8,0xBE,0xB0), o3(0xE9,0x80,0xB2),
-     o3(0xE9,0x8E,0xAD), o3(0xE9,0x99,0xA3),
-     o3(0xE9,0x99,0xB3), o3(0xE9,0x9C,0x87),
-     o3(0xE4,0xBE,0x84), o3(0xE5,0x8F,0xB1),
-     o3(0xE5,0xA7,0xAA), o3(0xE5,0xAB,0x89),
-     o3(0xE5,0xB8,0x99), o3(0xE6,0xA1,0x8E),
-     o3(0xE7,0x93,0x86), o3(0xE7,0x96,0xBE),
-     o3(0xE7,0xA7,0xA9), o3(0xE7,0xAA,0x92),
-     o3(0xE8,0x86,0xA3), o3(0xE8,0x9B,0xAD),
-     o3(0xE8,0xB3,0xAA), o3(0xE8,0xB7,0x8C),
-     o3(0xE8,0xBF,0xAD), o3(0xE6,0x96,0x9F),
-     o3(0xE6,0x9C,0x95), o3(0xEF,0xA7,0xBD),
-     o3(0xE5,0x9F,0xB7), o3(0xE6,0xBD,0x97),
-     o3(0xE7,0xB7,0x9D), o3(0xE8,0xBC,0xAF),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F2 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F2_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F3_infos[95] = {
-     o3(0xE9,0x8F,0xB6), o3(0xE9,0x9B,0x86),
-     o3(0xE5,0xBE,0xB5), o3(0xE6,0x87,0xB2),
-     o3(0xE6,0xBE,0x84), o3(0xE4,0xB8,0x94),
-     o3(0xE4,0xBE,0x98), o3(0xE5,0x80,0x9F),
-     o3(0xE5,0x8F,0x89), o3(0xE5,0x97,0x9F),
-     o3(0xE5,0xB5,0xAF), o3(0xE5,0xB7,0xAE),
-     o3(0xE6,0xAC,0xA1), o3(0xE6,0xAD,0xA4),
-     o3(0xE7,0xA3,0x8B), o3(0xE7,0xAE,0x9A),
-     o3(0xEF,0xA7,0xBE), o3(0xE8,0xB9,0x89),
-     o3(0xE8,0xBB,0x8A), o3(0xE9,0x81,0xAE),
-     o3(0xE6,0x8D,0x89), o3(0xE6,0x90,0xBE),
-     o3(0xE7,0x9D,0x80), o3(0xE7,0xAA,0x84),
-     o3(0xE9,0x8C,0xAF), o3(0xE9,0x91,0xBF),
-     o3(0xE9,0xBD,0xAA), o3(0xE6,0x92,0xB0),
-     o3(0xE6,0xBE,0xAF), o3(0xE7,0x87,0xA6),
-     o3(0xE7,0x92,0xA8), o3(0xE7,0x93,0x9A),
-     o3(0xE7,0xAB,0x84), o3(0xE7,0xB0,0x92),
-     o3(0xE7,0xBA,0x82), o3(0xE7,0xB2,0xB2),
-     o3(0xE7,0xBA,0x98), o3(0xE8,0xAE,0x9A),
-     o3(0xE8,0xB4,0x8A), o3(0xE9,0x91,0xBD),
-     o3(0xE9,0xA4,0x90), o3(0xE9,0xA5,0x8C),
-     o3(0xE5,0x88,0xB9), o3(0xE5,0xAF,0x9F),
-     o3(0xE6,0x93,0xA6), o3(0xE6,0x9C,0xAD),
-     o3(0xE7,0xB4,0xAE), o3(0xE5,0x83,0xAD),
-     o3(0xE5,0x8F,0x83), o3(0xE5,0xA1,0xB9),
-     o3(0xE6,0x85,0x98), o3(0xE6,0x85,0x99),
-     o3(0xE6,0x87,0xBA), o3(0xE6,0x96,0xAC),
-     o3(0xE7,0xAB,0x99), o3(0xE8,0xAE,0x92),
-     o3(0xE8,0xAE,0x96), o3(0xE5,0x80,0x89),
-     o3(0xE5,0x80,0xA1), o3(0xE5,0x89,0xB5),
-     o3(0xE5,0x94,0xB1), o3(0xE5,0xA8,0xBC),
-     o3(0xE5,0xBB,0xA0), o3(0xE5,0xBD,0xB0),
-     o3(0xE6,0x84,0xB4), o3(0xE6,0x95,0x9E),
-     o3(0xE6,0x98,0x8C), o3(0xE6,0x98,0xB6),
-     o3(0xE6,0x9A,0xA2), o3(0xE6,0xA7,0x8D),
-     o3(0xE6,0xBB,0x84), o3(0xE6,0xBC,0xB2),
-     o3(0xE7,0x8C,0x96), o3(0xE7,0x98,0xA1),
-     o3(0xE7,0xAA,0x93), o3(0xE8,0x84,0xB9),
-     o3(0xE8,0x89,0x99), o3(0xE8,0x8F,0x96),
-     o3(0xE8,0x92,0xBC), o3(0xE5,0x82,0xB5),
-     o3(0xE5,0x9F,0xB0), o3(0xE5,0xAF,0x80),
-     o3(0xE5,0xAF,0xA8), o3(0xE5,0xBD,0xA9),
-     o3(0xE6,0x8E,0xA1), o3(0xE7,0xA0,0xA6),
-     o3(0xE7,0xB6,0xB5), o3(0xE8,0x8F,0x9C),
-     o3(0xE8,0x94,0xA1), o3(0xE9,0x87,0x87),
-     o3(0xE9,0x87,0xB5), o3(0xE5,0x86,0x8A),
-     o3(0xE6,0x9F,0xB5), o3(0xE7,0xAD,0x96),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F3 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F3_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F4_infos[95] = {
-     o3(0xE8,0xB2,0xAC), o3(0xE5,0x87,0x84),
-     o3(0xE5,0xA6,0xBB), o3(0xE6,0x82,0xBD),
-     o3(0xE8,0x99,0x95), o3(0xE5,0x80,0x9C),
-     o3(0xEF,0xA7,0xBF), o3(0xE5,0x89,0x94),
-     o3(0xE5,0xB0,0xBA), o3(0xE6,0x85,0xBD),
-     o3(0xE6,0x88,0x9A), o3(0xE6,0x8B,0x93),
-     o3(0xE6,0x93,0xB2), o3(0xE6,0x96,0xA5),
-     o3(0xE6,0xBB,0x8C), o3(0xE7,0x98,0xA0),
-     o3(0xE8,0x84,0x8A), o3(0xE8,0xB9,0xA0),
-     o3(0xE9,0x99,0x9F), o3(0xE9,0x9A,0xBB),
-     o3(0xE4,0xBB,0x9F), o3(0xE5,0x8D,0x83),
-     o3(0xE5,0x96,0x98), o3(0xE5,0xA4,0xA9),
-     o3(0xE5,0xB7,0x9D), o3(0xE6,0x93,0x85),
-     o3(0xE6,0xB3,0x89), o3(0xE6,0xB7,0xBA),
-     o3(0xE7,0x8E,0x94), o3(0xE7,0xA9,0xBF),
-     o3(0xE8,0x88,0x9B), o3(0xE8,0x96,0xA6),
-     o3(0xE8,0xB3,0xA4), o3(0xE8,0xB8,0x90),
-     o3(0xE9,0x81,0xB7), o3(0xE9,0x87,0xA7),
-     o3(0xE9,0x97,0xA1), o3(0xE9,0x98,0xA1),
-     o3(0xE9,0x9F,0x86), o3(0xE5,0x87,0xB8),
-     o3(0xE5,0x93,0xB2), o3(0xE5,0x96,0x86),
-     o3(0xE5,0xBE,0xB9), o3(0xE6,0x92,0xA4),
-     o3(0xE6,0xBE,0x88), o3(0xE7,0xB6,0xB4),
-     o3(0xE8,0xBC,0x9F), o3(0xE8,0xBD,0x8D),
-     o3(0xE9,0x90,0xB5), o3(0xE5,0x83,0x89),
-     o3(0xE5,0xB0,0x96), o3(0xE6,0xB2,0xBE),
-     o3(0xE6,0xB7,0xBB), o3(0xE7,0x94,0x9B),
-     o3(0xE7,0x9E,0xBB), o3(0xE7,0xB0,0xBD),
-     o3(0xE7,0xB1,0xA4), o3(0xE8,0xA9,0xB9),
-     o3(0xE8,0xAB,0x82), o3(0xE5,0xA0,0x9E),
-     o3(0xE5,0xA6,0xBE), o3(0xE5,0xB8,0x96),
-     o3(0xE6,0x8D,0xB7), o3(0xE7,0x89,0x92),
-     o3(0xE7,0x96,0x8A), o3(0xE7,0x9D,0xAB),
-     o3(0xE8,0xAB,0x9C), o3(0xE8,0xB2,0xBC),
-     o3(0xE8,0xBC,0x92), o3(0xE5,0xBB,0xB3),
-     o3(0xE6,0x99,0xB4), o3(0xE6,0xB7,0xB8),
-     o3(0xE8,0x81,0xBD), o3(0xE8,0x8F,0x81),
-     o3(0xE8,0xAB,0x8B), o3(0xE9,0x9D,0x91),
-     o3(0xE9,0xAF,0x96), o3(0xEF,0xA8,0x80),
-     o3(0xE5,0x89,0x83), o3(0xE6,0x9B,0xBF),
-     o3(0xE6,0xB6,0x95), o3(0xE6,0xBB,0xAF),
-     o3(0xE7,0xB7,0xA0), o3(0xE8,0xAB,0xA6),
-     o3(0xE9,0x80,0xAE), o3(0xE9,0x81,0x9E),
-     o3(0xE9,0xAB,0x94), o3(0xE5,0x88,0x9D),
-     o3(0xE5,0x89,0xBF), o3(0xE5,0x93,0xA8),
-     o3(0xE6,0x86,0x94), o3(0xE6,0x8A,0x84),
-     o3(0xE6,0x8B,0x9B), o3(0xE6,0xA2,0xA2),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F4 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F4_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F5_infos[95] = {
-     o3(0xE6,0xA4,0x92), o3(0xE6,0xA5,0x9A),
-     o3(0xE6,0xA8,0xB5), o3(0xE7,0x82,0x92),
-     o3(0xE7,0x84,0xA6), o3(0xE7,0xA1,0x9D),
-     o3(0xE7,0xA4,0x81), o3(0xE7,0xA4,0x8E),
-     o3(0xE7,0xA7,0x92), o3(0xE7,0xA8,0x8D),
-     o3(0xE8,0x82,0x96), o3(0xE8,0x89,0xB8),
-     o3(0xE8,0x8B,0x95), o3(0xE8,0x8D,0x89),
-     o3(0xE8,0x95,0x89), o3(0xE8,0xB2,0x82),
-     o3(0xE8,0xB6,0x85), o3(0xE9,0x85,0xA2),
-     o3(0xE9,0x86,0x8B), o3(0xE9,0x86,0xAE),
-     o3(0xE4,0xBF,0x83), o3(0xE5,0x9B,0x91),
-     o3(0xE7,0x87,0xAD), o3(0xE7,0x9F,0x97),
-     o3(0xE8,0x9C,0x80), o3(0xE8,0xA7,0xB8),
-     o3(0xE5,0xAF,0xB8), o3(0xE5,0xBF,0x96),
-     o3(0xE6,0x9D,0x91), o3(0xE9,0x82,0xA8),
-     o3(0xE5,0x8F,0xA2), o3(0xE5,0xA1,0x9A),
-     o3(0xE5,0xAF,0xB5), o3(0xE6,0x82,0xA4),
-     o3(0xE6,0x86,0x81), o3(0xE6,0x91,0xA0),
-     o3(0xE7,0xB8,0xBD), o3(0xE8,0x81,0xB0),
-     o3(0xE8,0x94,0xA5), o3(0xE9,0x8A,0x83),
-     o3(0xE6,0x92,0xAE), o3(0xE5,0x82,0xAC),
-     o3(0xE5,0xB4,0x94), o3(0xE6,0x9C,0x80),
-     o3(0xE5,0xA2,0x9C), o3(0xE6,0x8A,0xBD),
-     o3(0xE6,0x8E,0xA8), o3(0xE6,0xA4,0x8E),
-     o3(0xE6,0xA5,0xB8), o3(0xE6,0xA8,0x9E),
-     o3(0xE6,0xB9,0xAB), o3(0xE7,0x9A,0xBA),
-     o3(0xE7,0xA7,0x8B), o3(0xE8,0x8A,0xBB),
-     o3(0xE8,0x90,0xA9), o3(0xE8,0xAB,0x8F),
-     o3(0xE8,0xB6,0xA8), o3(0xE8,0xBF,0xBD),
-     o3(0xE9,0x84,0x92), o3(0xE9,0x85,0x8B),
-     o3(0xE9,0x86,0x9C), o3(0xE9,0x8C,0x90),
-     o3(0xE9,0x8C,0x98), o3(0xE9,0x8E,0x9A),
-     o3(0xE9,0x9B,0x9B), o3(0xE9,0xA8,0xB6),
-     o3(0xE9,0xB0,0x8D), o3(0xE4,0xB8,0x91),
-     o3(0xE7,0x95,0x9C), o3(0xE7,0xA5,0x9D),
-     o3(0xE7,0xAB,0xBA), o3(0xE7,0xAD,0x91),
-     o3(0xE7,0xAF,0x89), o3(0xE7,0xB8,0xAE),
-     o3(0xE8,0x93,0x84), o3(0xE8,0xB9,0x99),
-     o3(0xE8,0xB9,0xB4), o3(0xE8,0xBB,0xB8),
-     o3(0xE9,0x80,0x90), o3(0xE6,0x98,0xA5),
-     o3(0xE6,0xA4,0xBF), o3(0xE7,0x91,0x83),
-     o3(0xE5,0x87,0xBA), o3(0xE6,0x9C,0xAE),
-     o3(0xE9,0xBB,0x9C), o3(0xE5,0x85,0x85),
-     o3(0xE5,0xBF,0xA0), o3(0xE6,0xB2,0x96),
-     o3(0xE8,0x9F,0xB2), o3(0xE8,0xA1,0x9D),
-     o3(0xE8,0xA1,0xB7), o3(0xE6,0x82,0xB4),
-     o3(0xE8,0x86,0xB5), o3(0xE8,0x90,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F5 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F5_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F6_infos[95] = {
-     o3(0xE8,0xB4,0x85), o3(0xE5,0x8F,0x96),
-     o3(0xE5,0x90,0xB9), o3(0xE5,0x98,0xB4),
-     o3(0xE5,0xA8,0xB6), o3(0xE5,0xB0,0xB1),
-     o3(0xE7,0x82,0x8A), o3(0xE7,0xBF,0xA0),
-     o3(0xE8,0x81,0x9A), o3(0xE8,0x84,0x86),
-     o3(0xE8,0x87,0xAD), o3(0xE8,0xB6,0xA3),
-     o3(0xE9,0x86,0x89), o3(0xE9,0xA9,0x9F),
-     o3(0xE9,0xB7,0xB2), o3(0xE5,0x81,0xB4),
-     o3(0xE4,0xBB,0x84), o3(0xE5,0x8E,0xA0),
-     o3(0xE6,0x83,0xBB), o3(0xE6,0xB8,0xAC),
-     o3(0xE5,0xB1,0xA4), o3(0xE4,0xBE,0x88),
-     o3(0xE5,0x80,0xA4), o3(0xE5,0x97,0xA4),
-     o3(0xE5,0xB3,0x99), o3(0xE5,0xB9,0x9F),
-     o3(0xE6,0x81,0xA5), o3(0xE6,0xA2,0x94),
-     o3(0xE6,0xB2,0xBB), o3(0xE6,0xB7,0x84),
-     o3(0xE7,0x86,0xBE), o3(0xE7,0x97,0x94),
-     o3(0xE7,0x97,0xB4), o3(0xE7,0x99,0xA1),
-     o3(0xE7,0xA8,0x9A), o3(0xE7,0xA9,0x89),
-     o3(0xE7,0xB7,0x87), o3(0xE7,0xB7,0xBB),
-     o3(0xE7,0xBD,0xAE), o3(0xE8,0x87,0xB4),
-     o3(0xE8,0x9A,0xA9), o3(0xE8,0xBC,0x9C),
-     o3(0xE9,0x9B,0x89), o3(0xE9,0xA6,0xB3),
-     o3(0xE9,0xBD,0x92), o3(0xE5,0x89,0x87),
-     o3(0xE5,0x8B,0x85), o3(0xE9,0xA3,0xAD),
-     o3(0xE8,0xA6,0xAA), o3(0xE4,0xB8,0x83),
-     o3(0xE6,0x9F,0x92), o3(0xE6,0xBC,0x86),
-     o3(0xE4,0xBE,0xB5), o3(0xE5,0xAF,0xA2),
-     o3(0xE6,0x9E,0x95), o3(0xE6,0xB2,0x88),
-     o3(0xE6,0xB5,0xB8), o3(0xE7,0x90,0x9B),
-     o3(0xE7,0xA0,0xA7), o3(0xE9,0x87,0x9D),
-     o3(0xE9,0x8D,0xBC), o3(0xE8,0x9F,0x84),
-     o3(0xE7,0xA7,0xA4), o3(0xE7,0xA8,0xB1),
-     o3(0xE5,0xBF,0xAB), o3(0xE4,0xBB,0x96),
-     o3(0xE5,0x92,0xA4), o3(0xE5,0x94,0xBE),
-     o3(0xE5,0xA2,0xAE), o3(0xE5,0xA6,0xA5),
-     o3(0xE6,0x83,0xB0), o3(0xE6,0x89,0x93),
-     o3(0xE6,0x8B,0x96), o3(0xE6,0x9C,0xB6),
-     o3(0xE6,0xA5,0x95), o3(0xE8,0x88,0xB5),
-     o3(0xE9,0x99,0x80), o3(0xE9,0xA6,0xB1),
-     o3(0xE9,0xA7,0x9D), o3(0xE5,0x80,0xAC),
-     o3(0xE5,0x8D,0x93), o3(0xE5,0x95,0x84),
-     o3(0xE5,0x9D,0xBC), o3(0xEF,0xA8,0x81),
-     o3(0xE6,0x89,0x98), o3(0xEF,0xA8,0x82),
-     o3(0xE6,0x93,0xA2), o3(0xE6,0x99,0xAB),
-     o3(0xE6,0x9F,0x9D), o3(0xE6,0xBF,0x81),
-     o3(0xE6,0xBF,0xAF), o3(0xE7,0x90,0xA2),
-     o3(0xE7,0x90,0xB8), o3(0xE8,0xA8,0x97),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F6 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F6_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F7_infos[95] = {
-     o3(0xE9,0x90,0xB8), o3(0xE5,0x91,0x91),
-     o3(0xE5,0x98,0x86), o3(0xE5,0x9D,0xA6),
-     o3(0xE5,0xBD,0x88), o3(0xE6,0x86,0x9A),
-     o3(0xE6,0xAD,0x8E), o3(0xE7,0x81,0x98),
-     o3(0xE7,0x82,0xAD), o3(0xE7,0xB6,0xBB),
-     o3(0xE8,0xAA,0x95), o3(0xE5,0xA5,0xAA),
-     o3(0xE8,0x84,0xAB), o3(0xE6,0x8E,0xA2),
-     o3(0xE7,0x9C,0x88), o3(0xE8,0x80,0xBD),
-     o3(0xE8,0xB2,0xAA), o3(0xE5,0xA1,0x94),
-     o3(0xE6,0x90,0xAD), o3(0xE6,0xA6,0xBB),
-     o3(0xE5,0xAE,0x95), o3(0xE5,0xB8,0x91),
-     o3(0xE6,0xB9,0xAF), o3(0xEF,0xA8,0x83),
-     o3(0xE8,0x95,0xA9), o3(0xE5,0x85,0x8C),
-     o3(0xE5,0x8F,0xB0), o3(0xE5,0xA4,0xAA),
-     o3(0xE6,0x80,0xA0), o3(0xE6,0x85,0x8B),
-     o3(0xE6,0xAE,0x86), o3(0xE6,0xB1,0xB0),
-     o3(0xE6,0xB3,0xB0), o3(0xE7,0xAC,0x9E),
-     o3(0xE8,0x83,0x8E), o3(0xE8,0x8B,0x94),
-     o3(0xE8,0xB7,0x86), o3(0xE9,0x82,0xB0),
-     o3(0xE9,0xA2,0xB1), o3(0xEF,0xA8,0x84),
-     o3(0xE6,0x93,0x87), o3(0xE6,0xBE,0xA4),
-     o3(0xE6,0x92,0x91), o3(0xE6,0x94,0x84),
-     o3(0xE5,0x85,0x8E), o3(0xE5,0x90,0x90),
-     o3(0xE5,0x9C,0x9F), o3(0xE8,0xA8,0x8E),
-     o3(0xE6,0x85,0x9F), o3(0xE6,0xA1,0xB6),
-     o3(0xEF,0xA8,0x85), o3(0xE7,0x97,0x9B),
-     o3(0xE7,0xAD,0x92), o3(0xE7,0xB5,0xB1),
-     o3(0xE9,0x80,0x9A), o3(0xE5,0xA0,0x86),
-     o3(0xE6,0xA7,0x8C), o3(0xE8,0x85,0xBF),
-     o3(0xE8,0xA4,0xAA), o3(0xE9,0x80,0x80),
-     o3(0xE9,0xA0,0xB9), o3(0xE5,0x81,0xB8),
-     o3(0xE5,0xA5,0x97), o3(0xE5,0xA6,0xAC),
-     o3(0xE6,0x8A,0x95), o3(0xE9,0x80,0x8F),
-     o3(0xE9,0xAC,0xAA), o3(0xE6,0x85,0x9D),
-     o3(0xE7,0x89,0xB9), o3(0xE9,0x97,0x96),
-     o3(0xE5,0x9D,0xA1), o3(0xE5,0xA9,0x86),
-     o3(0xE5,0xB7,0xB4), o3(0xE6,0x8A,0x8A),
-     o3(0xE6,0x92,0xAD), o3(0xE6,0x93,0xBA),
-     o3(0xE6,0x9D,0xB7), o3(0xE6,0xB3,0xA2),
-     o3(0xE6,0xB4,0xBE), o3(0xE7,0x88,0xAC),
-     o3(0xE7,0x90,0xB6), o3(0xE7,0xA0,0xB4),
-     o3(0xE7,0xBD,0xB7), o3(0xE8,0x8A,0xAD),
-     o3(0xE8,0xB7,0x9B), o3(0xE9,0xA0,0x97),
-     o3(0xE5,0x88,0xA4), o3(0xE5,0x9D,0x82),
-     o3(0xE6,0x9D,0xBF), o3(0xE7,0x89,0x88),
-     o3(0xE7,0x93,0xA3), o3(0xE8,0xB2,0xA9),
-     o3(0xE8,0xBE,0xA6), o3(0xE9,0x88,0x91),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F7 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F7_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F8_infos[95] = {
-     o3(0xE9,0x98,0xAA), o3(0xE5,0x85,0xAB),
-     o3(0xE5,0x8F,0xAD), o3(0xE6,0x8D,0x8C),
-     o3(0xE4,0xBD,0xA9), o3(0xE5,0x94,0x84),
-     o3(0xE6,0x82,0x96), o3(0xE6,0x95,0x97),
-     o3(0xE6,0xB2,0x9B), o3(0xE6,0xB5,0xBF),
-     o3(0xE7,0x89,0x8C), o3(0xE7,0x8B,0xBD),
-     o3(0xE7,0xA8,0x97), o3(0xE8,0xA6,0x87),
-     o3(0xE8,0xB2,0x9D), o3(0xE5,0xBD,0xAD),
-     o3(0xE6,0xBE,0x8E), o3(0xE7,0x83,0xB9),
-     o3(0xE8,0x86,0xA8), o3(0xE6,0x84,0x8E),
-     o3(0xE4,0xBE,0xBF), o3(0xE5,0x81,0x8F),
-     o3(0xE6,0x89,0x81), o3(0xE7,0x89,0x87),
-     o3(0xE7,0xAF,0x87), o3(0xE7,0xB7,0xA8),
-     o3(0xE7,0xBF,0xA9), o3(0xE9,0x81,0x8D),
-     o3(0xE9,0x9E,0xAD), o3(0xE9,0xA8,0x99),
-     o3(0xE8,0xB2,0xB6), o3(0xE5,0x9D,0xAA),
-     o3(0xE5,0xB9,0xB3), o3(0xE6,0x9E,0xB0),
-     o3(0xE8,0x90,0x8D), o3(0xE8,0xA9,0x95),
-     o3(0xE5,0x90,0xA0), o3(0xE5,0xAC,0x96),
-     o3(0xE5,0xB9,0xA3), o3(0xE5,0xBB,0xA2),
-     o3(0xE5,0xBC,0x8A), o3(0xE6,0x96,0x83),
-     o3(0xE8,0x82,0xBA), o3(0xE8,0x94,0xBD),
-     o3(0xE9,0x96,0x89), o3(0xE9,0x99,0x9B),
-     o3(0xE4,0xBD,0x88), o3(0xE5,0x8C,0x85),
-     o3(0xE5,0x8C,0x8D), o3(0xE5,0x8C,0x8F),
-     o3(0xE5,0x92,0x86), o3(0xE5,0x93,0xBA),
-     o3(0xE5,0x9C,0x83), o3(0xE5,0xB8,0x83),
-     o3(0xE6,0x80,0x96), o3(0xE6,0x8A,0x9B),
-     o3(0xE6,0x8A,0xB1), o3(0xE6,0x8D,0x95),
-     o3(0xEF,0xA8,0x86), o3(0xE6,0xB3,0xA1),
-     o3(0xE6,0xB5,0xA6), o3(0xE7,0x96,0xB1),
-     o3(0xE7,0xA0,0xB2), o3(0xE8,0x83,0x9E),
-     o3(0xE8,0x84,0xAF), o3(0xE8,0x8B,0x9E),
-     o3(0xE8,0x91,0xA1), o3(0xE8,0x92,0xB2),
-     o3(0xE8,0xA2,0x8D), o3(0xE8,0xA4,0x92),
-     o3(0xE9,0x80,0x8B), o3(0xE9,0x8B,0xAA),
-     o3(0xE9,0xA3,0xBD), o3(0xE9,0xAE,0x91),
-     o3(0xE5,0xB9,0x85), o3(0xE6,0x9A,0xB4),
-     o3(0xE6,0x9B,0x9D), o3(0xE7,0x80,0x91),
-     o3(0xE7,0x88,0x86), o3(0xEF,0xA8,0x87),
-     o3(0xE4,0xBF,0xB5), o3(0xE5,0x89,0xBD),
-     o3(0xE5,0xBD,0xAA), o3(0xE6,0x85,0x93),
-     o3(0xE6,0x9D,0x93), o3(0xE6,0xA8,0x99),
-     o3(0xE6,0xBC,0x82), o3(0xE7,0x93,0xA2),
-     o3(0xE7,0xA5,0xA8), o3(0xE8,0xA1,0xA8),
-     o3(0xE8,0xB1,0xB9), o3(0xE9,0xA3,0x87),
-     o3(0xE9,0xA3,0x84), o3(0xE9,0xA9,0x83),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F8 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F8_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_F9_infos[95] = {
-     o3(0xE5,0x93,0x81), o3(0xE7,0xA8,0x9F),
-     o3(0xE6,0xA5,0x93), o3(0xE8,0xAB,0xB7),
-     o3(0xE8,0xB1,0x8A), o3(0xE9,0xA2,0xA8),
-     o3(0xE9,0xA6,0xAE), o3(0xE5,0xBD,0xBC),
-     o3(0xE6,0x8A,0xAB), o3(0xE7,0x96,0xB2),
-     o3(0xE7,0x9A,0xAE), o3(0xE8,0xA2,0xAB),
-     o3(0xE9,0x81,0xBF), o3(0xE9,0x99,0x82),
-     o3(0xE5,0x8C,0xB9), o3(0xE5,0xBC,0xBC),
-     o3(0xE5,0xBF,0x85), o3(0xE6,0xB3,0x8C),
-     o3(0xE7,0x8F,0x8C), o3(0xE7,0x95,0xA2),
-     o3(0xE7,0x96,0x8B), o3(0xE7,0xAD,0x86),
-     o3(0xE8,0x8B,0xBE), o3(0xE9,0xA6,0x9D),
-     o3(0xE4,0xB9,0x8F), o3(0xE9,0x80,0xBC),
-     o3(0xE4,0xB8,0x8B), o3(0xE4,0xBD,0x95),
-     o3(0xE5,0x8E,0xA6), o3(0xE5,0xA4,0x8F),
-     o3(0xE5,0xBB,0x88), o3(0xE6,0x98,0xB0),
-     o3(0xE6,0xB2,0xB3), o3(0xE7,0x91,0x95),
-     o3(0xE8,0x8D,0xB7), o3(0xE8,0x9D,0xA6),
-     o3(0xE8,0xB3,0x80), o3(0xE9,0x81,0x90),
-     o3(0xE9,0x9C,0x9E), o3(0xE9,0xB0,0x95),
-     o3(0xE5,0xA3,0x91), o3(0xE5,0xAD,0xB8),
-     o3(0xE8,0x99,0x90), o3(0xE8,0xAC,0x94),
-     o3(0xE9,0xB6,0xB4), o3(0xE5,0xAF,0x92),
-     o3(0xE6,0x81,0xA8), o3(0xE6,0x82,0x8D),
-     o3(0xE6,0x97,0xB1), o3(0xE6,0xB1,0x97),
-     o3(0xE6,0xBC,0xA2), o3(0xE6,0xBE,0xA3),
-     o3(0xE7,0x80,0x9A), o3(0xE7,0xBD,0x95),
-     o3(0xE7,0xBF,0xB0), o3(0xE9,0x96,0x91),
-     o3(0xE9,0x96,0x92), o3(0xE9,0x99,0x90),
-     o3(0xE9,0x9F,0x93), o3(0xE5,0x89,0xB2),
-     o3(0xE8,0xBD,0x84), o3(0xE5,0x87,0xBD),
-     o3(0xE5,0x90,0xAB), o3(0xE5,0x92,0xB8),
-     o3(0xE5,0x95,0xA3), o3(0xE5,0x96,0x8A),
-     o3(0xE6,0xAA,0xBB), o3(0xE6,0xB6,0xB5),
-     o3(0xE7,0xB7,0x98), o3(0xE8,0x89,0xA6),
-     o3(0xE9,0x8A,0x9C), o3(0xE9,0x99,0xB7),
-     o3(0xE9,0xB9,0xB9), o3(0xE5,0x90,0x88),
-     o3(0xE5,0x93,0x88), o3(0xE7,0x9B,0x92),
-     o3(0xE8,0x9B,0xA4), o3(0xE9,0x96,0xA4),
-     o3(0xE9,0x97,0x94), o3(0xE9,0x99,0x9C),
-     o3(0xE4,0xBA,0xA2), o3(0xE4,0xBC,0x89),
-     o3(0xE5,0xA7,0xAE), o3(0xE5,0xAB,0xA6),
-     o3(0xE5,0xB7,0xB7), o3(0xE6,0x81,0x92),
-     o3(0xE6,0x8A,0x97), o3(0xE6,0x9D,0xAD),
-     o3(0xE6,0xA1,0x81), o3(0xE6,0xB2,0x86),
-     o3(0xE6,0xB8,0xAF), o3(0xE7,0xBC,0xB8),
-     o3(0xE8,0x82,0x9B), o3(0xE8,0x88,0xAA),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_F9 = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_F9_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_FA_infos[95] = {
-     o3(0xEF,0xA8,0x88), o3(0xEF,0xA8,0x89),
-     o3(0xE9,0xA0,0x85), o3(0xE4,0xBA,0xA5),
-     o3(0xE5,0x81,0x95), o3(0xE5,0x92,0xB3),
-     o3(0xE5,0x9E,0x93), o3(0xE5,0xA5,0x9A),
-     o3(0xE5,0xAD,0xA9), o3(0xE5,0xAE,0xB3),
-     o3(0xE6,0x87,0x88), o3(0xE6,0xA5,0xB7),
-     o3(0xE6,0xB5,0xB7), o3(0xE7,0x80,0xA3),
-     o3(0xE8,0x9F,0xB9), o3(0xE8,0xA7,0xA3),
-     o3(0xE8,0xA9,0xB2), o3(0xE8,0xAB,0xA7),
-     o3(0xE9,0x82,0x82), o3(0xE9,0xA7,0xAD),
-     o3(0xE9,0xAA,0xB8), o3(0xE5,0x8A,0xBE),
-     o3(0xE6,0xA0,0xB8), o3(0xE5,0x80,0x96),
-     o3(0xE5,0xB9,0xB8), o3(0xE6,0x9D,0x8F),
-     o3(0xE8,0x8D,0x87), o3(0xE8,0xA1,0x8C),
-     o3(0xE4,0xBA,0xAB), o3(0xE5,0x90,0x91),
-     o3(0xE5,0x9A,0xAE), o3(0xE7,0x8F,0xA6),
-     o3(0xE9,0x84,0x95), o3(0xE9,0x9F,0xBF),
-     o3(0xE9,0xA4,0x89), o3(0xE9,0xA5,0x97),
-     o3(0xE9,0xA6,0x99), o3(0xE5,0x99,0x93),
-     o3(0xE5,0xA2,0x9F), o3(0xE8,0x99,0x9B),
-     o3(0xE8,0xA8,0xB1), o3(0xE6,0x86,0xB2),
-     o3(0xE6,0xAB,0xB6), o3(0xE7,0x8D,0xBB),
-     o3(0xE8,0xBB,0x92), o3(0xE6,0xAD,0x87),
-     o3(0xE9,0x9A,0xAA), o3(0xE9,0xA9,0x97),
-     o3(0xE5,0xA5,0x95), o3(0xE7,0x88,0x80),
-     o3(0xE8,0xB5,0xAB), o3(0xE9,0x9D,0xA9),
-     o3(0xE4,0xBF,0x94), o3(0xE5,0xB3,0xB4),
-     o3(0xE5,0xBC,0xA6), o3(0xE6,0x87,0xB8),
-     o3(0xE6,0x99,0x9B), o3(0xE6,0xB3,0xAB),
-     o3(0xE7,0x82,0xAB), o3(0xE7,0x8E,0x84),
-     o3(0xE7,0x8E,0xB9), o3(0xE7,0x8F,0xBE),
-     o3(0xE7,0x9C,0xA9), o3(0xE7,0x9D,0x8D),
-     o3(0xE7,0xB5,0x83), o3(0xE7,0xB5,0xA2),
-     o3(0xE7,0xB8,0xA3), o3(0xE8,0x88,0xB7),
-     o3(0xE8,0xA1,0x92), o3(0xEF,0xA8,0x8A),
-     o3(0xE8,0xB3,0xA2), o3(0xE9,0x89,0x89),
-     o3(0xE9,0xA1,0xAF), o3(0xE5,0xAD,0x91),
-     o3(0xE7,0xA9,0xB4), o3(0xE8,0xA1,0x80),
-     o3(0xE9,0xA0,0x81), o3(0xE5,0xAB,0x8C),
-     o3(0xE4,0xBF,0xA0), o3(0xE5,0x8D,0x94),
-     o3(0xE5,0xA4,0xBE), o3(0xE5,0xB3,0xBD),
-     o3(0xE6,0x8C,0xBE), o3(0xE6,0xB5,0xB9),
-     o3(0xE7,0x8B,0xB9), o3(0xE8,0x84,0x85),
-     o3(0xE8,0x84,0x87), o3(0xE8,0x8E,0xA2),
-     o3(0xE9,0x8B,0x8F), o3(0xE9,0xA0,0xB0),
-     o3(0xE4,0xBA,0xA8), o3(0xE5,0x85,0x84),
-     o3(0xE5,0x88,0x91), o3(0xE5,0x9E,0x8B),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_FA = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_FA_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_FB_infos[95] = {
-     o3(0xE5,0xBD,0xA2), o3(0xE6,0xB3,0x82),
-     o3(0xE6,0xBB,0x8E), o3(0xE7,0x80,0x85),
-     o3(0xE7,0x81,0x90), o3(0xE7,0x82,0xAF),
-     o3(0xE7,0x86,0x92), o3(0xE7,0x8F,0xA9),
-     o3(0xE7,0x91,0xA9), o3(0xE8,0x8D,0x8A),
-     o3(0xE8,0x9E,0xA2), o3(0xE8,0xA1,0xA1),
-     o3(0xE9,0x80,0x88), o3(0xE9,0x82,0xA2),
-     o3(0xE9,0x8E,0xA3), o3(0xE9,0xA6,0xA8),
-     o3(0xE5,0x85,0xAE), o3(0xE5,0xBD,0x97),
-     o3(0xE6,0x83,0xA0), o3(0xE6,0x85,0xA7),
-     o3(0xE6,0x9A,0xB3), o3(0xE8,0x95,0x99),
-     o3(0xE8,0xB9,0x8A), o3(0xE9,0x86,0xAF),
-     o3(0xE9,0x9E,0x8B), o3(0xE4,0xB9,0x8E),
-     o3(0xE4,0xBA,0x92), o3(0xE5,0x91,0xBC),
-     o3(0xE5,0xA3,0x95), o3(0xE5,0xA3,0xBA),
-     o3(0xE5,0xA5,0xBD), o3(0xE5,0xB2,0xB5),
-     o3(0xE5,0xBC,0xA7), o3(0xE6,0x88,0xB6),
-     o3(0xE6,0x89,0x88), o3(0xE6,0x98,0x8A),
-     o3(0xE6,0x99,0xA7), o3(0xE6,0xAF,0xAB),
-     o3(0xE6,0xB5,0xA9), o3(0xE6,0xB7,0x8F),
-     o3(0xE6,0xB9,0x96), o3(0xE6,0xBB,0xB8),
-     o3(0xE6,0xBE,0x94), o3(0xE6,0xBF,0xA0),
-     o3(0xE6,0xBF,0xA9), o3(0xE7,0x81,0x9D),
-     o3(0xE7,0x8B,0x90), o3(0xE7,0x90,0xA5),
-     o3(0xE7,0x91,0x9A), o3(0xE7,0x93,0xA0),
-     o3(0xE7,0x9A,0x93), o3(0xE7,0xA5,0x9C),
-     o3(0xE7,0xB3,0x8A), o3(0xE7,0xB8,0x9E),
-     o3(0xE8,0x83,0xA1), o3(0xE8,0x8A,0xA6),
-     o3(0xE8,0x91,0xAB), o3(0xE8,0x92,0xBF),
-     o3(0xE8,0x99,0x8E), o3(0xE8,0x99,0x9F),
-     o3(0xE8,0x9D,0xB4), o3(0xE8,0xAD,0xB7),
-     o3(0xE8,0xB1,0xAA), o3(0xE9,0x8E,0xAC),
-     o3(0xE9,0xA0,0x80), o3(0xE9,0xA1,0xA5),
-     o3(0xE6,0x83,0x91), o3(0xE6,0x88,0x96),
-     o3(0xE9,0x85,0xB7), o3(0xE5,0xA9,0x9A),
-     o3(0xE6,0x98,0x8F), o3(0xE6,0xB7,0xB7),
-     o3(0xE6,0xB8,0xBE), o3(0xE7,0x90,0xBF),
-     o3(0xE9,0xAD,0x82), o3(0xE5,0xBF,0xBD),
-     o3(0xE6,0x83,0x9A), o3(0xE7,0xAC,0x8F),
-     o3(0xE5,0x93,0x84), o3(0xE5,0xBC,0x98),
-     o3(0xE6,0xB1,0x9E), o3(0xE6,0xB3,0x93),
-     o3(0xE6,0xB4,0xAA), o3(0xE7,0x83,0x98),
-     o3(0xE7,0xB4,0x85), o3(0xE8,0x99,0xB9),
-     o3(0xE8,0xA8,0x8C), o3(0xE9,0xB4,0xBB),
-     o3(0xE5,0x8C,0x96), o3(0xE5,0x92,0x8C),
-     o3(0xE5,0xAC,0x85), o3(0xE6,0xA8,0xBA),
-     o3(0xE7,0x81,0xAB), o3(0xE7,0x95,0xB5),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_FB = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_FB_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_FC_infos[95] = {
-     o3(0xE7,0xA6,0x8D), o3(0xE7,0xA6,0xBE),
-     o3(0xE8,0x8A,0xB1), o3(0xE8,0x8F,0xAF),
-     o3(0xE8,0xA9,0xB1), o3(0xE8,0xAD,0x81),
-     o3(0xE8,0xB2,0xA8), o3(0xE9,0x9D,0xB4),
-     o3(0xEF,0xA8,0x8B), o3(0xE6,0x93,0xB4),
-     o3(0xE6,0x94,0xAB), o3(0xE7,0xA2,0xBA),
-     o3(0xE7,0xA2,0xBB), o3(0xE7,0xA9,0xAB),
-     o3(0xE4,0xB8,0xB8), o3(0xE5,0x96,0x9A),
-     o3(0xE5,0xA5,0x90), o3(0xE5,0xAE,0xA6),
-     o3(0xE5,0xB9,0xBB), o3(0xE6,0x82,0xA3),
-     o3(0xE6,0x8F,0x9B), o3(0xE6,0xAD,0xA1),
-     o3(0xE6,0x99,0xA5), o3(0xE6,0xA1,0x93),
-     o3(0xE6,0xB8,0x99), o3(0xE7,0x85,0xA5),
-     o3(0xE7,0x92,0xB0), o3(0xE7,0xB4,0x88),
-     o3(0xE9,0x82,0x84), o3(0xE9,0xA9,0xA9),
-     o3(0xE9,0xB0,0xA5), o3(0xE6,0xB4,0xBB),
-     o3(0xE6,0xBB,0x91), o3(0xE7,0x8C,0xBE),
-     o3(0xE8,0xB1,0x81), o3(0xE9,0x97,0x8A),
-     o3(0xE5,0x87,0xB0), o3(0xE5,0xB9,0x8C),
-     o3(0xE5,0xBE,0xA8), o3(0xE6,0x81,0x8D),
-     o3(0xE6,0x83,0xB6), o3(0xE6,0x84,0xB0),
-     o3(0xE6,0x85,0x8C), o3(0xE6,0x99,0x83),
-     o3(0xE6,0x99,0x84), o3(0xE6,0xA6,0xA5),
-     o3(0xE6,0xB3,0x81), o3(0xE6,0xB9,0x9F),
-     o3(0xE6,0xBB,0x89), o3(0xE6,0xBD,0xA2),
-     o3(0xE7,0x85,0x8C), o3(0xE7,0x92,0x9C),
-     o3(0xE7,0x9A,0x87), o3(0xE7,0xAF,0x81),
-     o3(0xE7,0xB0,0xA7), o3(0xE8,0x8D,0x92),
-     o3(0xE8,0x9D,0x97), o3(0xE9,0x81,0x91),
-     o3(0xE9,0x9A,0x8D), o3(0xE9,0xBB,0x83),
-     o3(0xE5,0x8C,0xAF), o3(0xE5,0x9B,0x9E),
-     o3(0xE5,0xBB,0xBB), o3(0xE5,0xBE,0x8A),
-     o3(0xE6,0x81,0xA2), o3(0xE6,0x82,0x94),
-     o3(0xE6,0x87,0xB7), o3(0xE6,0x99,0xA6),
-     o3(0xE6,0x9C,0x83), o3(0xE6,0xAA,0x9C),
-     o3(0xE6,0xB7,0xAE), o3(0xE6,0xBE,0xAE),
-     o3(0xE7,0x81,0xB0), o3(0xE7,0x8D,0xAA),
-     o3(0xE7,0xB9,0xAA), o3(0xE8,0x86,0xBE),
-     o3(0xE8,0x8C,0xB4), o3(0xE8,0x9B,0x94),
-     o3(0xE8,0xAA,0xA8), o3(0xE8,0xB3,0x84),
-     o3(0xE5,0x8A,0x83), o3(0xE7,0x8D,0xB2),
-     o3(0xE5,0xAE,0x96), o3(0xE6,0xA9,0xAB),
-     o3(0xE9,0x90,0x84), o3(0xE5,0x93,0xAE),
-     o3(0xE5,0x9A,0x86), o3(0xE5,0xAD,0x9D),
-     o3(0xE6,0x95,0x88), o3(0xE6,0x96,0x85),
-     o3(0xE6,0x9B,0x89), o3(0xE6,0xA2,0x9F),
-     o3(0xE6,0xB6,0x8D), o3(0xE6,0xB7,0x86),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_FC = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_FC_infos
-};
-
-
-static const struct byte_lookup* const
-from_CP949_FD_infos[95] = {
-     o3(0xE7,0x88,0xBB), o3(0xE8,0x82,0xB4),
-     o3(0xE9,0x85,0xB5), o3(0xE9,0xA9,0x8D),
-     o3(0xE4,0xBE,0xAF), o3(0xE5,0x80,0x99),
-     o3(0xE5,0x8E,0x9A), o3(0xE5,0x90,0x8E),
-     o3(0xE5,0x90,0xBC), o3(0xE5,0x96,0x89),
-     o3(0xE5,0x97,0x85), o3(0xE5,0xB8,0xBF),
-     o3(0xE5,0xBE,0x8C), o3(0xE6,0x9C,0xBD),
-     o3(0xE7,0x85,0xA6), o3(0xE7,0x8F,0x9D),
-     o3(0xE9,0x80,0x85), o3(0xE5,0x8B,0x9B),
-     o3(0xE5,0x8B,0xB3), o3(0xE5,0xA1,0xA4),
-     o3(0xE5,0xA3,0x8E), o3(0xE7,0x84,0x84),
-     o3(0xE7,0x86,0x8F), o3(0xE7,0x87,0xBB),
-     o3(0xE8,0x96,0xB0), o3(0xE8,0xA8,0x93),
-     o3(0xE6,0x9A,0x88), o3(0xE8,0x96,0xA8),
-     o3(0xE5,0x96,0xA7), o3(0xE6,0x9A,0x84),
-     o3(0xE7,0x85,0x8A), o3(0xE8,0x90,0xB1),
-     o3(0xE5,0x8D,0x89), o3(0xE5,0x96,0x99),
-     o3(0xE6,0xAF,0x81), o3(0xE5,0xBD,0x99),
-     o3(0xE5,0xBE,0xBD), o3(0xE6,0x8F,0xAE),
-     o3(0xE6,0x9A,0x89), o3(0xE7,0x85,0x87),
-     o3(0xE8,0xAB,0xB1), o3(0xE8,0xBC,0x9D),
-     o3(0xE9,0xBA,0xBE), o3(0xE4,0xBC,0x91),
-     o3(0xE6,0x90,0xBA), o3(0xE7,0x83,0x8B),
-     o3(0xE7,0x95,0xA6), o3(0xE8,0x99,0xA7),
-     o3(0xE6,0x81,0xA4), o3(0xE8,0xAD,0x8E),
-     o3(0xE9,0xB7,0xB8), o3(0xE5,0x85,0x87),
-     o3(0xE5,0x87,0xB6), o3(0xE5,0x8C,0x88),
-     o3(0xE6,0xB4,0xB6), o3(0xE8,0x83,0xB8),
-     o3(0xE9,0xBB,0x91), o3(0xE6,0x98,0x95),
-     o3(0xE6,0xAC,0xA3), o3(0xE7,0x82,0x98),
-     o3(0xE7,0x97,0x95), o3(0xE5,0x90,0x83),
-     o3(0xE5,0xB1,0xB9), o3(0xE7,0xB4,0x87),
-     o3(0xE8,0xA8,0x96), o3(0xE6,0xAC,0xA0),
-     o3(0xE6,0xAC,0xBD), o3(0xE6,0xAD,0x86),
-     o3(0xE5,0x90,0xB8), o3(0xE6,0x81,0xB0),
-     o3(0xE6,0xB4,0xBD), o3(0xE7,0xBF,0x95),
-     o3(0xE8,0x88,0x88), o3(0xE5,0x83,0x96),
-     o3(0xE5,0x87,0x9E), o3(0xE5,0x96,0x9C),
-     o3(0xE5,0x99,0xAB), o3(0xE5,0x9B,0x8D),
-     o3(0xE5,0xA7,0xAC), o3(0xE5,0xAC,0x89),
-     o3(0xE5,0xB8,0x8C), o3(0xE6,0x86,0x99),
-     o3(0xE6,0x86,0x98), o3(0xE6,0x88,0xB1),
-     o3(0xE6,0x99,0x9E), o3(0xE6,0x9B,0xA6),
-     o3(0xE7,0x86,0x99), o3(0xE7,0x86,0xB9),
-     o3(0xE7,0x86,0xBA), o3(0xE7,0x8A,0xA7),
-     o3(0xE7,0xA6,0xA7), o3(0xE7,0xA8,0x80),
-     o3(0xE7,0xBE,0xB2), o3(0xE8,0xA9,0xB0),
-                  UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949_FD = {
-    from_EUC_KR_A1_offsets,
-    from_CP949_FD_infos
-};
-
-static const unsigned char
-from_CP949_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,      0,  0,  0,  0,  0,  0,  0,  0,
-    125,  1,  2,  3,  4,  5,  6,  7,      8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,     24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,     40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,     56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 66, 67, 68, 69, 70, 71,     72,125, 73, 74, 75, 76, 77, 78,
-     79, 80, 81, 82, 83, 84, 85, 86,     87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,101,102,    103,104,105,106,107,108,109,110,
-    111,112,113,114,115,116,117,118,    119,120,121,122,123,124,125,125,
-};
-
-static const struct byte_lookup* const
-from_CP949_infos[126] = {
-                  NOMAP,     &from_CP949_81,
-         &from_CP949_82,     &from_CP949_83,
-         &from_CP949_84,     &from_CP949_85,
-         &from_CP949_86,     &from_CP949_87,
-         &from_CP949_88,     &from_CP949_89,
-         &from_CP949_8A,     &from_CP949_8B,
-         &from_CP949_8C,     &from_CP949_8D,
-         &from_CP949_8E,     &from_CP949_8F,
-         &from_CP949_90,     &from_CP949_91,
-         &from_CP949_92,     &from_CP949_93,
-         &from_CP949_94,     &from_CP949_95,
-         &from_CP949_96,     &from_CP949_97,
-         &from_CP949_98,     &from_CP949_99,
-         &from_CP949_9A,     &from_CP949_9B,
-         &from_CP949_9C,     &from_CP949_9D,
-         &from_CP949_9E,     &from_CP949_9F,
-         &from_CP949_A0,     &from_CP949_A1,
-         &from_CP949_A2,     &from_CP949_A3,
-         &from_CP949_A4,     &from_CP949_A5,
-         &from_CP949_A6,     &from_CP949_A7,
-         &from_CP949_A8,     &from_CP949_A9,
-         &from_CP949_AA,     &from_CP949_AB,
-         &from_CP949_AC,     &from_CP949_AD,
-         &from_CP949_AE,     &from_CP949_AF,
-         &from_CP949_B0,     &from_CP949_B1,
-         &from_CP949_B2,     &from_CP949_B3,
-         &from_CP949_B4,     &from_CP949_B5,
-         &from_CP949_B6,     &from_CP949_B7,
-         &from_CP949_B8,     &from_CP949_B9,
-         &from_CP949_BA,     &from_CP949_BB,
-         &from_CP949_BC,     &from_CP949_BD,
-         &from_CP949_BE,     &from_CP949_BF,
-         &from_CP949_C0,     &from_CP949_C1,
-         &from_CP949_C2,     &from_CP949_C3,
-         &from_CP949_C4,     &from_CP949_C5,
-         &from_CP949_C6,     &from_CP949_C7,
-         &from_CP949_C8,     &from_CP949_CA,
-         &from_CP949_CB,     &from_CP949_CC,
-         &from_CP949_CD,     &from_CP949_CE,
-         &from_CP949_CF,     &from_CP949_D0,
-         &from_CP949_D1,     &from_CP949_D2,
-         &from_CP949_D3,     &from_CP949_D4,
-         &from_CP949_D5,     &from_CP949_D6,
-         &from_CP949_D7,     &from_CP949_D8,
-         &from_CP949_D9,     &from_CP949_DA,
-         &from_CP949_DB,     &from_CP949_DC,
-         &from_CP949_DD,     &from_CP949_DE,
-         &from_CP949_DF,     &from_CP949_E0,
-         &from_CP949_E1,     &from_CP949_E2,
-         &from_CP949_E3,     &from_CP949_E4,
-         &from_CP949_E5,     &from_CP949_E6,
-         &from_CP949_E7,     &from_CP949_E8,
-         &from_CP949_E9,     &from_CP949_EA,
-         &from_CP949_EB,     &from_CP949_EC,
-         &from_CP949_ED,     &from_CP949_EE,
-         &from_CP949_EF,     &from_CP949_F0,
-         &from_CP949_F1,     &from_CP949_F2,
-         &from_CP949_F3,     &from_CP949_F4,
-         &from_CP949_F5,     &from_CP949_F6,
-         &from_CP949_F7,     &from_CP949_F8,
-         &from_CP949_F9,     &from_CP949_FA,
-         &from_CP949_FB,     &from_CP949_FC,
-         &from_CP949_FD,              UNDEF,
-};
-
-static const BYTE_LOOKUP
-from_CP949 = {
-    from_CP949_offsets,
-    from_CP949_infos
-};
-
-static const rb_transcoder
-rb_to_EUC_KR = {
-    "UTF-8", "EUC-KR", &to_EUC_KR, 2, 1,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_from_EUC_KR = {
-    "EUC-KR", "UTF-8", &from_EUC_KR, 3, 0,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_to_CP949 = {
-    "UTF-8", "CP949", &to_CP949, 2, 1,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_from_CP949 = {
-    "CP949", "UTF-8", &from_CP949, 3, 0,
-    NULL, NULL,
-};
-
-void
-Init_korean(void)
-{
-    rb_register_transcoder(&rb_to_EUC_KR);
-    rb_register_transcoder(&rb_from_EUC_KR);
-    rb_register_transcoder(&rb_to_CP949);
-    rb_register_transcoder(&rb_from_CP949);
-}
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb
deleted file mode 100644
index 762dc107e3..0000000000
--- a/enc/trans/make_transdb.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# static const rb_transcoder
-# rb_from_US_ASCII = {
-#     "US-ASCII", "UTF-8", &from_US_ASCII, 1, 0,
-#     NULL, NULL,
-# };
-#
-
-count = 0
-converters = {}
-transdir = ARGV[0]
-outhdr = ARGV[1] || 'transdb.h'
-Dir.open(transdir) {|d| d.grep(/.+\.[ch]\z/)}.sort_by {|e|
-  e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten
-}.each do |fn|
-  open(File.join(transdir,fn)) do |f|
-    f.each_line do |line|
-      if (/^static const rb_transcoder/ =~ line)..(/"(.*?)"\s*,\s*"(.*?)"/ =~ line)
-        if $1 && $2
-	  from_to = "%s to %s" % [$1, $2]
-          converters[from_to]
-          if converters[from_to]
-	    raise ArgumentError, '%s:%d: transcode "%s" is already registered (%s:%d)' %
-	      [fn, $., from_to, *converters[from_to].values_at(2, 3)]
-	  else
-	    converters[from_to] = [$1, $2, fn[0..-3], $.]
-	  end
-        end
-      end
-    end
-  end
-end
-result = converters.map {|k, v| %[rb_declare_transcoder("%s", "%s", "%s");\n] % v}.join
-open(outhdr, 'wb') do |f|
-  f.print result
-end
diff --git a/enc/trans/single_byte.c b/enc/trans/single_byte.c
deleted file mode 100644
index 9e132b8bed..0000000000
--- a/enc/trans/single_byte.c
+++ /dev/null
@@ -1,3109 +0,0 @@
-#include "transcode_data.h"
-
-static const unsigned char
-from_US_ASCII_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  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,  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,  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,  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,
-};
-static const struct byte_lookup* const
-from_US_ASCII_infos[2] = {
-     NOMAP, UNDEF,
-};
-static const BYTE_LOOKUP
-from_US_ASCII = {
-  /* used from from_US_ASCII */
-  /* used from to_US_ASCII */
-  /* used from to_ASCII_8BIT */
-  /* used from from_ASCII_8BIT */
-    from_US_ASCII_offsets,
-    from_US_ASCII_infos
-};
-
-static const rb_transcoder
-rb_from_US_ASCII = {
-    "US-ASCII", "UTF-8", &from_US_ASCII, 1, 0,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_to_US_ASCII = {
-    "UTF-8", "US-ASCII", &from_US_ASCII, 1, 1,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_from_ASCII_8BIT = {
-    "ASCII-8BIT", "UTF-8", &from_US_ASCII, 1, 0,
-    NULL, NULL,
-};
-
-static const rb_transcoder
-rb_to_ASCII_8BIT = {
-    "UTF-8", "ASCII-8BIT", &from_US_ASCII, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_1_offsets[256] = {
-  /* used from from_ISO_8859_1 */
-  /* used from from_ISO_8859_2 */
-  /* used from from_ISO_8859_4 */
-  /* used from from_ISO_8859_5 */
-  /* used from from_ISO_8859_9 */
-  /* used from from_ISO_8859_10 */
-  /* used from from_ISO_8859_13 */
-  /* used from from_ISO_8859_14 */
-  /* used from from_ISO_8859_15 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47, 48,
-     49, 50, 51, 52, 53, 54, 55, 56,   57, 58, 59, 60, 61, 62, 63, 64,
-     65, 66, 67, 68, 69, 70, 71, 72,   73, 74, 75, 76, 77, 78, 79, 80,
-     81, 82, 83, 84, 85, 86, 87, 88,   89, 90, 91, 92, 93, 94, 95, 96,
-     97, 98, 99,100,101,102,103,104,  105,106,107,108,109,110,111,112,
-    113,114,115,116,117,118,119,120,  121,122,123,124,125,126,127,128,
-};
-static const struct byte_lookup* const
-from_ISO_8859_1_infos[129] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC2,0xA1), o2(0xC2,0xA2),
-     o2(0xC2,0xA3), o2(0xC2,0xA4), o2(0xC2,0xA5), o2(0xC2,0xA6),
-     o2(0xC2,0xA7), o2(0xC2,0xA8), o2(0xC2,0xA9), o2(0xC2,0xAA),
-     o2(0xC2,0xAB), o2(0xC2,0xAC), o2(0xC2,0xAD), o2(0xC2,0xAE),
-     o2(0xC2,0xAF), o2(0xC2,0xB0), o2(0xC2,0xB1), o2(0xC2,0xB2),
-     o2(0xC2,0xB3), o2(0xC2,0xB4), o2(0xC2,0xB5), o2(0xC2,0xB6),
-     o2(0xC2,0xB7), o2(0xC2,0xB8), o2(0xC2,0xB9), o2(0xC2,0xBA),
-     o2(0xC2,0xBB), o2(0xC2,0xBC), o2(0xC2,0xBD), o2(0xC2,0xBE),
-     o2(0xC2,0xBF), o2(0xC3,0x80), o2(0xC3,0x81), o2(0xC3,0x82),
-     o2(0xC3,0x83), o2(0xC3,0x84), o2(0xC3,0x85), o2(0xC3,0x86),
-     o2(0xC3,0x87), o2(0xC3,0x88), o2(0xC3,0x89), o2(0xC3,0x8A),
-     o2(0xC3,0x8B), o2(0xC3,0x8C), o2(0xC3,0x8D), o2(0xC3,0x8E),
-     o2(0xC3,0x8F), o2(0xC3,0x90), o2(0xC3,0x91), o2(0xC3,0x92),
-     o2(0xC3,0x93), o2(0xC3,0x94), o2(0xC3,0x95), o2(0xC3,0x96),
-     o2(0xC3,0x97), o2(0xC3,0x98), o2(0xC3,0x99), o2(0xC3,0x9A),
-     o2(0xC3,0x9B), o2(0xC3,0x9C), o2(0xC3,0x9D), o2(0xC3,0x9E),
-     o2(0xC3,0x9F), o2(0xC3,0xA0), o2(0xC3,0xA1), o2(0xC3,0xA2),
-     o2(0xC3,0xA3), o2(0xC3,0xA4), o2(0xC3,0xA5), o2(0xC3,0xA6),
-     o2(0xC3,0xA7), o2(0xC3,0xA8), o2(0xC3,0xA9), o2(0xC3,0xAA),
-     o2(0xC3,0xAB), o2(0xC3,0xAC), o2(0xC3,0xAD), o2(0xC3,0xAE),
-     o2(0xC3,0xAF), o2(0xC3,0xB0), o2(0xC3,0xB1), o2(0xC3,0xB2),
-     o2(0xC3,0xB3), o2(0xC3,0xB4), o2(0xC3,0xB5), o2(0xC3,0xB6),
-     o2(0xC3,0xB7), o2(0xC3,0xB8), o2(0xC3,0xB9), o2(0xC3,0xBA),
-     o2(0xC3,0xBB), o2(0xC3,0xBC), o2(0xC3,0xBD), o2(0xC3,0xBE),
-     o2(0xC3,0xBF),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_1 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_1_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_1 = {
-    "ISO-8859-1", "UTF-8", &from_ISO_8859_1, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_1_C2_offsets[64] = {
-  /* used from to_ISO_8859_1_C2 */
-  /* used from to_ISO_8859_1_C3 */
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-};
-static const struct byte_lookup* const
-to_ISO_8859_1_C2_infos[64] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA1), o1(0xA2), o1(0xA3),
-     o1(0xA4), o1(0xA5), o1(0xA6), o1(0xA7),
-     o1(0xA8), o1(0xA9), o1(0xAA), o1(0xAB),
-     o1(0xAC), o1(0xAD), o1(0xAE), o1(0xAF),
-     o1(0xB0), o1(0xB1), o1(0xB2), o1(0xB3),
-     o1(0xB4), o1(0xB5), o1(0xB6), o1(0xB7),
-     o1(0xB8), o1(0xB9), o1(0xBA), o1(0xBB),
-     o1(0xBC), o1(0xBD), o1(0xBE), o1(0xBF),
-};
-static const BYTE_LOOKUP
-to_ISO_8859_1_C2 = {
-  /* used from to_ISO_8859_1 */
-  /* used from to_ISO_8859_9 */
-    to_ISO_8859_1_C2_offsets,
-    to_ISO_8859_1_C2_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_1_C3_infos[64] = {
-     o1(0xC0), o1(0xC1), o1(0xC2), o1(0xC3),
-     o1(0xC4), o1(0xC5), o1(0xC6), o1(0xC7),
-     o1(0xC8), o1(0xC9), o1(0xCA), o1(0xCB),
-     o1(0xCC), o1(0xCD), o1(0xCE), o1(0xCF),
-     o1(0xD0), o1(0xD1), o1(0xD2), o1(0xD3),
-     o1(0xD4), o1(0xD5), o1(0xD6), o1(0xD7),
-     o1(0xD8), o1(0xD9), o1(0xDA), o1(0xDB),
-     o1(0xDC), o1(0xDD), o1(0xDE), o1(0xDF),
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-     o1(0xF0), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF7),
-     o1(0xF8), o1(0xF9), o1(0xFA), o1(0xFB),
-     o1(0xFC), o1(0xFD), o1(0xFE), o1(0xFF),
-};
-static const BYTE_LOOKUP
-to_ISO_8859_1_C3 = {
-  /* used from to_ISO_8859_1 */
-  /* used from to_ISO_8859_15 */
-    to_ISO_8859_1_C2_offsets,
-    to_ISO_8859_1_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_1_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  1,  2,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_ISO_8859_1_infos[4] = {
-                 NOMAP, &to_ISO_8859_1_C2,
-     &to_ISO_8859_1_C3,             UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_1 = {
-    to_ISO_8859_1_offsets,
-    to_ISO_8859_1_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_1 = {
-    "UTF-8", "ISO-8859-1", &to_ISO_8859_1, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_2_infos[129] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC4,0x84), o2(0xCB,0x98),
-     o2(0xC5,0x81), o2(0xC2,0xA4), o2(0xC4,0xBD), o2(0xC5,0x9A),
-     o2(0xC2,0xA7), o2(0xC2,0xA8), o2(0xC5,0xA0), o2(0xC5,0x9E),
-     o2(0xC5,0xA4), o2(0xC5,0xB9), o2(0xC2,0xAD), o2(0xC5,0xBD),
-     o2(0xC5,0xBB), o2(0xC2,0xB0), o2(0xC4,0x85), o2(0xCB,0x9B),
-     o2(0xC5,0x82), o2(0xC2,0xB4), o2(0xC4,0xBE), o2(0xC5,0x9B),
-     o2(0xCB,0x87), o2(0xC2,0xB8), o2(0xC5,0xA1), o2(0xC5,0x9F),
-     o2(0xC5,0xA5), o2(0xC5,0xBA), o2(0xCB,0x9D), o2(0xC5,0xBE),
-     o2(0xC5,0xBC), o2(0xC5,0x94), o2(0xC3,0x81), o2(0xC3,0x82),
-     o2(0xC4,0x82), o2(0xC3,0x84), o2(0xC4,0xB9), o2(0xC4,0x86),
-     o2(0xC3,0x87), o2(0xC4,0x8C), o2(0xC3,0x89), o2(0xC4,0x98),
-     o2(0xC3,0x8B), o2(0xC4,0x9A), o2(0xC3,0x8D), o2(0xC3,0x8E),
-     o2(0xC4,0x8E), o2(0xC4,0x90), o2(0xC5,0x83), o2(0xC5,0x87),
-     o2(0xC3,0x93), o2(0xC3,0x94), o2(0xC5,0x90), o2(0xC3,0x96),
-     o2(0xC3,0x97), o2(0xC5,0x98), o2(0xC5,0xAE), o2(0xC3,0x9A),
-     o2(0xC5,0xB0), o2(0xC3,0x9C), o2(0xC3,0x9D), o2(0xC5,0xA2),
-     o2(0xC3,0x9F), o2(0xC5,0x95), o2(0xC3,0xA1), o2(0xC3,0xA2),
-     o2(0xC4,0x83), o2(0xC3,0xA4), o2(0xC4,0xBA), o2(0xC4,0x87),
-     o2(0xC3,0xA7), o2(0xC4,0x8D), o2(0xC3,0xA9), o2(0xC4,0x99),
-     o2(0xC3,0xAB), o2(0xC4,0x9B), o2(0xC3,0xAD), o2(0xC3,0xAE),
-     o2(0xC4,0x8F), o2(0xC4,0x91), o2(0xC5,0x84), o2(0xC5,0x88),
-     o2(0xC3,0xB3), o2(0xC3,0xB4), o2(0xC5,0x91), o2(0xC3,0xB6),
-     o2(0xC3,0xB7), o2(0xC5,0x99), o2(0xC5,0xAF), o2(0xC3,0xBA),
-     o2(0xC5,0xB1), o2(0xC3,0xBC), o2(0xC3,0xBD), o2(0xC5,0xA3),
-     o2(0xCB,0x99),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_2 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_2_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_2 = {
-    "ISO-8859-2", "UTF-8", &from_ISO_8859_2, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_2_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 40, 40, 40, 33, 40, 40, 34,   35, 40, 40, 40, 40, 36, 40, 40,
-     37, 40, 40, 40, 38, 40, 40, 40,   39, 40, 40, 40, 40, 40, 40, 40,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_C2_infos[41] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA4), o1(0xA7), o1(0xA8),
-     o1(0xAD), o1(0xB0), o1(0xB4), o1(0xB8),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2_C2 = {
-    to_ISO_8859_2_C2_offsets,
-    to_ISO_8859_2_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_2_C3_offsets[64] = {
-     31,  0,  1, 31,  2, 31, 31,  3,   31,  4, 31,  5, 31,  6,  7, 31,
-     31, 31, 31,  8,  9, 31, 10, 11,   31, 31, 12, 31, 13, 14, 31, 15,
-     31, 16, 17, 31, 18, 31, 31, 19,   31, 20, 31, 21, 31, 22, 23, 31,
-     31, 31, 31, 24, 25, 31, 26, 27,   31, 31, 28, 31, 29, 30, 31, 31,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_C3_infos[32] = {
-     o1(0xC1), o1(0xC2), o1(0xC4), o1(0xC7),
-     o1(0xC9), o1(0xCB), o1(0xCD), o1(0xCE),
-     o1(0xD3), o1(0xD4), o1(0xD6), o1(0xD7),
-     o1(0xDA), o1(0xDC), o1(0xDD), o1(0xDF),
-     o1(0xE1), o1(0xE2), o1(0xE4), o1(0xE7),
-     o1(0xE9), o1(0xEB), o1(0xED), o1(0xEE),
-     o1(0xF3), o1(0xF4), o1(0xF6), o1(0xF7),
-     o1(0xFA), o1(0xFC), o1(0xFD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2_C3 = {
-    to_ISO_8859_2_C3_offsets,
-    to_ISO_8859_2_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_2_C4_offsets[64] = {
-     20, 20,  0,  1,  2,  3,  4,  5,   20, 20, 20, 20,  6,  7,  8,  9,
-     10, 11, 20, 20, 20, 20, 20, 20,   12, 13, 14, 15, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,   20, 16, 17, 20, 20, 18, 19, 20,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_C4_infos[21] = {
-     o1(0xC3), o1(0xE3), o1(0xA1), o1(0xB1),
-     o1(0xC6), o1(0xE6), o1(0xC8), o1(0xE8),
-     o1(0xCF), o1(0xEF), o1(0xD0), o1(0xF0),
-     o1(0xCA), o1(0xEA), o1(0xCC), o1(0xEC),
-     o1(0xC5), o1(0xE5), o1(0xA5), o1(0xB5),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2_C4 = {
-    to_ISO_8859_2_C4_offsets,
-    to_ISO_8859_2_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_2_C5_offsets[64] = {
-     32,  0,  1,  2,  3, 32, 32,  4,    5, 32, 32, 32, 32, 32, 32, 32,
-      6,  7, 32, 32,  8,  9, 32, 32,   10, 11, 12, 13, 32, 32, 14, 15,
-     16, 17, 18, 19, 20, 21, 32, 32,   32, 32, 32, 32, 32, 32, 22, 23,
-     24, 25, 32, 32, 32, 32, 32, 32,   32, 26, 27, 28, 29, 30, 31, 32,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_C5_infos[33] = {
-     o1(0xA3), o1(0xB3), o1(0xD1), o1(0xF1),
-     o1(0xD2), o1(0xF2), o1(0xD5), o1(0xF5),
-     o1(0xC0), o1(0xE0), o1(0xD8), o1(0xF8),
-     o1(0xA6), o1(0xB6), o1(0xAA), o1(0xBA),
-     o1(0xA9), o1(0xB9), o1(0xDE), o1(0xFE),
-     o1(0xAB), o1(0xBB), o1(0xD9), o1(0xF9),
-     o1(0xDB), o1(0xFB), o1(0xAC), o1(0xBC),
-     o1(0xAF), o1(0xBF), o1(0xAE), o1(0xBE),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2_C5 = {
-    to_ISO_8859_2_C5_offsets,
-    to_ISO_8859_2_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_2_CB_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  0,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    1,  2,  5,  3,  5,  4,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_CB_infos[6] = {
-     o1(0xB7), o1(0xA2), o1(0xFF), o1(0xB2),
-     o1(0xBD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2_CB = {
-    to_ISO_8859_2_CB_offsets,
-    to_ISO_8859_2_CB_infos
-};
-
-static const unsigned char
-to_ISO_8859_2_offsets[256] = {
-  /* used from to_ISO_8859_2 */
-  /* used from to_ISO_8859_3 */
-  /* used from to_ISO_8859_4 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  1,  2,  3,  4,  6,  6,    6,  6,  6,  5,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_2_infos[7] = {
-                 NOMAP, &to_ISO_8859_2_C2,
-     &to_ISO_8859_2_C3, &to_ISO_8859_2_C4,
-     &to_ISO_8859_2_C5, &to_ISO_8859_2_CB,
-                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_2 = {
-    to_ISO_8859_2_offsets,
-    to_ISO_8859_2_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_2 = {
-    "UTF-8", "ISO-8859-2", &to_ISO_8859_2, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_3_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37,122, 38, 39,   40, 41, 42, 43, 44, 45,122, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 58, 59, 60,122, 61,
-     62, 63, 64,122, 65, 66, 67, 68,   69, 70, 71, 72, 73, 74, 75, 76,
-    122, 77, 78, 79, 80, 81, 82, 83,   84, 85, 86, 87, 88, 89, 90, 91,
-     92, 93, 94,122, 95, 96, 97, 98,   99,100,101,102,103,104,105,106,
-    122,107,108,109,110,111,112,113,  114,115,116,117,118,119,120,121,
-};
-static const struct byte_lookup* const
-from_ISO_8859_3_infos[123] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC4,0xA6), o2(0xCB,0x98),
-     o2(0xC2,0xA3), o2(0xC2,0xA4), o2(0xC4,0xA4), o2(0xC2,0xA7),
-     o2(0xC2,0xA8), o2(0xC4,0xB0), o2(0xC5,0x9E), o2(0xC4,0x9E),
-     o2(0xC4,0xB4), o2(0xC2,0xAD), o2(0xC5,0xBB), o2(0xC2,0xB0),
-     o2(0xC4,0xA7), o2(0xC2,0xB2), o2(0xC2,0xB3), o2(0xC2,0xB4),
-     o2(0xC2,0xB5), o2(0xC4,0xA5), o2(0xC2,0xB7), o2(0xC2,0xB8),
-     o2(0xC4,0xB1), o2(0xC5,0x9F), o2(0xC4,0x9F), o2(0xC4,0xB5),
-     o2(0xC2,0xBD), o2(0xC5,0xBC), o2(0xC3,0x80), o2(0xC3,0x81),
-     o2(0xC3,0x82), o2(0xC3,0x84), o2(0xC4,0x8A), o2(0xC4,0x88),
-     o2(0xC3,0x87), o2(0xC3,0x88), o2(0xC3,0x89), o2(0xC3,0x8A),
-     o2(0xC3,0x8B), o2(0xC3,0x8C), o2(0xC3,0x8D), o2(0xC3,0x8E),
-     o2(0xC3,0x8F), o2(0xC3,0x91), o2(0xC3,0x92), o2(0xC3,0x93),
-     o2(0xC3,0x94), o2(0xC4,0xA0), o2(0xC3,0x96), o2(0xC3,0x97),
-     o2(0xC4,0x9C), o2(0xC3,0x99), o2(0xC3,0x9A), o2(0xC3,0x9B),
-     o2(0xC3,0x9C), o2(0xC5,0xAC), o2(0xC5,0x9C), o2(0xC3,0x9F),
-     o2(0xC3,0xA0), o2(0xC3,0xA1), o2(0xC3,0xA2), o2(0xC3,0xA4),
-     o2(0xC4,0x8B), o2(0xC4,0x89), o2(0xC3,0xA7), o2(0xC3,0xA8),
-     o2(0xC3,0xA9), o2(0xC3,0xAA), o2(0xC3,0xAB), o2(0xC3,0xAC),
-     o2(0xC3,0xAD), o2(0xC3,0xAE), o2(0xC3,0xAF), o2(0xC3,0xB1),
-     o2(0xC3,0xB2), o2(0xC3,0xB3), o2(0xC3,0xB4), o2(0xC4,0xA1),
-     o2(0xC3,0xB6), o2(0xC3,0xB7), o2(0xC4,0x9D), o2(0xC3,0xB9),
-     o2(0xC3,0xBA), o2(0xC3,0xBB), o2(0xC3,0xBC), o2(0xC5,0xAD),
-     o2(0xC5,0x9D), o2(0xCB,0x99),         UNDEF,
-};
-static const BYTE_LOOKUP
-from_ISO_8859_3 = {
-    from_ISO_8859_3_offsets,
-    from_ISO_8859_3_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_3 = {
-    "ISO-8859-3", "UTF-8", &from_ISO_8859_3, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_3_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 46, 46, 33, 34, 46, 46, 35,   36, 46, 46, 46, 46, 37, 46, 46,
-     38, 46, 39, 40, 41, 42, 46, 43,   44, 46, 46, 46, 46, 45, 46, 46,
-};
-static const struct byte_lookup* const
-to_ISO_8859_3_C2_infos[47] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA3), o1(0xA4), o1(0xA7),
-     o1(0xA8), o1(0xAD), o1(0xB0), o1(0xB2),
-     o1(0xB3), o1(0xB4), o1(0xB5), o1(0xB7),
-     o1(0xB8), o1(0xBD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3_C2 = {
-    to_ISO_8859_3_C2_offsets,
-    to_ISO_8859_3_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_3_C3_offsets[64] = {
-      0,  1,  2, 47,  3, 47, 47,  4,    5,  6,  7,  8,  9, 10, 11, 12,
-     47, 13, 14, 15, 16, 47, 17, 18,   47, 19, 20, 21, 22, 47, 47, 23,
-     24, 25, 26, 47, 27, 47, 47, 28,   29, 30, 31, 32, 33, 34, 35, 36,
-     47, 37, 38, 39, 40, 47, 41, 42,   47, 43, 44, 45, 46, 47, 47, 47,
-};
-static const struct byte_lookup* const
-to_ISO_8859_3_C3_infos[48] = {
-     o1(0xC0), o1(0xC1), o1(0xC2), o1(0xC4),
-     o1(0xC7), o1(0xC8), o1(0xC9), o1(0xCA),
-     o1(0xCB), o1(0xCC), o1(0xCD), o1(0xCE),
-     o1(0xCF), o1(0xD1), o1(0xD2), o1(0xD3),
-     o1(0xD4), o1(0xD6), o1(0xD7), o1(0xD9),
-     o1(0xDA), o1(0xDB), o1(0xDC), o1(0xDF),
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE4),
-     o1(0xE7), o1(0xE8), o1(0xE9), o1(0xEA),
-     o1(0xEB), o1(0xEC), o1(0xED), o1(0xEE),
-     o1(0xEF), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF6), o1(0xF7), o1(0xF9),
-     o1(0xFA), o1(0xFB), o1(0xFC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3_C3 = {
-    to_ISO_8859_3_C3_offsets,
-    to_ISO_8859_3_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_3_C4_offsets[64] = {
-     18, 18, 18, 18, 18, 18, 18, 18,    0,  1,  2,  3, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18,  4,  5,  6,  7,
-      8,  9, 18, 18, 10, 11, 12, 13,   18, 18, 18, 18, 18, 18, 18, 18,
-     14, 15, 18, 18, 16, 17, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-};
-static const struct byte_lookup* const
-to_ISO_8859_3_C4_infos[19] = {
-     o1(0xC6), o1(0xE6), o1(0xC5), o1(0xE5),
-     o1(0xD8), o1(0xF8), o1(0xAB), o1(0xBB),
-     o1(0xD5), o1(0xF5), o1(0xA6), o1(0xB6),
-     o1(0xA1), o1(0xB1), o1(0xA9), o1(0xB9),
-     o1(0xAC), o1(0xBC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3_C4 = {
-    to_ISO_8859_3_C4_offsets,
-    to_ISO_8859_3_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_3_C5_offsets[64] = {
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  0,  1,  2,  3,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  4,  5,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  6,  7,  8,  8,  8,
-};
-static const struct byte_lookup* const
-to_ISO_8859_3_C5_infos[9] = {
-     o1(0xDE), o1(0xFE), o1(0xAA), o1(0xBA),
-     o1(0xDD), o1(0xFD), o1(0xAF), o1(0xBF),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3_C5 = {
-    to_ISO_8859_3_C5_offsets,
-    to_ISO_8859_3_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_3_CB_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    0,  1,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_3_CB_infos[3] = {
-     o1(0xA2), o1(0xFF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3_CB = {
-    to_ISO_8859_3_CB_offsets,
-    to_ISO_8859_3_CB_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_3_infos[7] = {
-                 NOMAP, &to_ISO_8859_3_C2,
-     &to_ISO_8859_3_C3, &to_ISO_8859_3_C4,
-     &to_ISO_8859_3_C5, &to_ISO_8859_3_CB,
-                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_3 = {
-    to_ISO_8859_2_offsets,
-    to_ISO_8859_3_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_3 = {
-    "UTF-8", "ISO-8859-3", &to_ISO_8859_3, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_4_infos[129] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC4,0x84), o2(0xC4,0xB8),
-     o2(0xC5,0x96), o2(0xC2,0xA4), o2(0xC4,0xA8), o2(0xC4,0xBB),
-     o2(0xC2,0xA7), o2(0xC2,0xA8), o2(0xC5,0xA0), o2(0xC4,0x92),
-     o2(0xC4,0xA2), o2(0xC5,0xA6), o2(0xC2,0xAD), o2(0xC5,0xBD),
-     o2(0xC2,0xAF), o2(0xC2,0xB0), o2(0xC4,0x85), o2(0xCB,0x9B),
-     o2(0xC5,0x97), o2(0xC2,0xB4), o2(0xC4,0xA9), o2(0xC4,0xBC),
-     o2(0xCB,0x87), o2(0xC2,0xB8), o2(0xC5,0xA1), o2(0xC4,0x93),
-     o2(0xC4,0xA3), o2(0xC5,0xA7), o2(0xC5,0x8A), o2(0xC5,0xBE),
-     o2(0xC5,0x8B), o2(0xC4,0x80), o2(0xC3,0x81), o2(0xC3,0x82),
-     o2(0xC3,0x83), o2(0xC3,0x84), o2(0xC3,0x85), o2(0xC3,0x86),
-     o2(0xC4,0xAE), o2(0xC4,0x8C), o2(0xC3,0x89), o2(0xC4,0x98),
-     o2(0xC3,0x8B), o2(0xC4,0x96), o2(0xC3,0x8D), o2(0xC3,0x8E),
-     o2(0xC4,0xAA), o2(0xC4,0x90), o2(0xC5,0x85), o2(0xC5,0x8C),
-     o2(0xC4,0xB6), o2(0xC3,0x94), o2(0xC3,0x95), o2(0xC3,0x96),
-     o2(0xC3,0x97), o2(0xC3,0x98), o2(0xC5,0xB2), o2(0xC3,0x9A),
-     o2(0xC3,0x9B), o2(0xC3,0x9C), o2(0xC5,0xA8), o2(0xC5,0xAA),
-     o2(0xC3,0x9F), o2(0xC4,0x81), o2(0xC3,0xA1), o2(0xC3,0xA2),
-     o2(0xC3,0xA3), o2(0xC3,0xA4), o2(0xC3,0xA5), o2(0xC3,0xA6),
-     o2(0xC4,0xAF), o2(0xC4,0x8D), o2(0xC3,0xA9), o2(0xC4,0x99),
-     o2(0xC3,0xAB), o2(0xC4,0x97), o2(0xC3,0xAD), o2(0xC3,0xAE),
-     o2(0xC4,0xAB), o2(0xC4,0x91), o2(0xC5,0x86), o2(0xC5,0x8D),
-     o2(0xC4,0xB7), o2(0xC3,0xB4), o2(0xC3,0xB5), o2(0xC3,0xB6),
-     o2(0xC3,0xB7), o2(0xC3,0xB8), o2(0xC5,0xB3), o2(0xC3,0xBA),
-     o2(0xC3,0xBB), o2(0xC3,0xBC), o2(0xC5,0xA9), o2(0xC5,0xAB),
-     o2(0xCB,0x99),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_4 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_4_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_4 = {
-    "ISO-8859-4", "UTF-8", &from_ISO_8859_4, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_4_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 41, 41, 41, 33, 41, 41, 34,   35, 41, 41, 41, 41, 36, 41, 37,
-     38, 41, 41, 41, 39, 41, 41, 41,   40, 41, 41, 41, 41, 41, 41, 41,
-};
-static const struct byte_lookup* const
-to_ISO_8859_4_C2_infos[42] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA4), o1(0xA7), o1(0xA8),
-     o1(0xAD), o1(0xAF), o1(0xB0), o1(0xB4),
-     o1(0xB8),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4_C2 = {
-    to_ISO_8859_4_C2_offsets,
-    to_ISO_8859_4_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_4_C3_offsets[64] = {
-     37,  0,  1,  2,  3,  4,  5, 37,   37,  6, 37,  7, 37,  8,  9, 37,
-     37, 37, 37, 37, 10, 11, 12, 13,   14, 37, 15, 16, 17, 37, 37, 18,
-     37, 19, 20, 21, 22, 23, 24, 37,   37, 25, 37, 26, 37, 27, 28, 37,
-     37, 37, 37, 37, 29, 30, 31, 32,   33, 37, 34, 35, 36, 37, 37, 37,
-};
-static const struct byte_lookup* const
-to_ISO_8859_4_C3_infos[38] = {
-     o1(0xC1), o1(0xC2), o1(0xC3), o1(0xC4),
-     o1(0xC5), o1(0xC6), o1(0xC9), o1(0xCB),
-     o1(0xCD), o1(0xCE), o1(0xD4), o1(0xD5),
-     o1(0xD6), o1(0xD7), o1(0xD8), o1(0xDA),
-     o1(0xDB), o1(0xDC), o1(0xDF), o1(0xE1),
-     o1(0xE2), o1(0xE3), o1(0xE4), o1(0xE5),
-     o1(0xE6), o1(0xE9), o1(0xEB), o1(0xED),
-     o1(0xEE), o1(0xF4), o1(0xF5), o1(0xF6),
-     o1(0xF7), o1(0xF8), o1(0xFA), o1(0xFB),
-     o1(0xFC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4_C3 = {
-    to_ISO_8859_4_C3_offsets,
-    to_ISO_8859_4_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_4_C4_offsets[64] = {
-  /* used from to_ISO_8859_4_C4 */
-  /* used from to_ISO_8859_10_C4 */
-      0,  1, 27, 27,  2,  3, 27, 27,   27, 27, 27, 27,  4,  5, 27, 27,
-      6,  7,  8,  9, 27, 27, 10, 11,   12, 13, 27, 27, 27, 27, 27, 27,
-     27, 27, 14, 15, 27, 27, 27, 27,   16, 17, 18, 19, 27, 27, 20, 21,
-     27, 27, 27, 27, 27, 27, 22, 23,   24, 27, 27, 25, 26, 27, 27, 27,
-};
-static const struct byte_lookup* const
-to_ISO_8859_4_C4_infos[28] = {
-     o1(0xC0), o1(0xE0), o1(0xA1), o1(0xB1),
-     o1(0xC8), o1(0xE8), o1(0xD0), o1(0xF0),
-     o1(0xAA), o1(0xBA), o1(0xCC), o1(0xEC),
-     o1(0xCA), o1(0xEA), o1(0xAB), o1(0xBB),
-     o1(0xA5), o1(0xB5), o1(0xCF), o1(0xEF),
-     o1(0xC7), o1(0xE7), o1(0xD3), o1(0xF3),
-     o1(0xA2), o1(0xA6), o1(0xB6),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4_C4 = {
-    to_ISO_8859_4_C4_offsets,
-    to_ISO_8859_4_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_4_C5_offsets[64] = {
-     20, 20, 20, 20, 20,  0,  1, 20,   20, 20,  2,  3,  4,  5, 20, 20,
-     20, 20, 20, 20, 20, 20,  6,  7,   20, 20, 20, 20, 20, 20, 20, 20,
-      8,  9, 20, 20, 20, 20, 10, 11,   12, 13, 14, 15, 20, 20, 20, 20,
-     20, 20, 16, 17, 20, 20, 20, 20,   20, 20, 20, 20, 20, 18, 19, 20,
-};
-static const struct byte_lookup* const
-to_ISO_8859_4_C5_infos[21] = {
-     o1(0xD1), o1(0xF1), o1(0xBD), o1(0xBF),
-     o1(0xD2), o1(0xF2), o1(0xA3), o1(0xB3),
-     o1(0xA9), o1(0xB9), o1(0xAC), o1(0xBC),
-     o1(0xDD), o1(0xFD), o1(0xDE), o1(0xFE),
-     o1(0xD9), o1(0xF9), o1(0xAE), o1(0xBE),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4_C5 = {
-    to_ISO_8859_4_C5_offsets,
-    to_ISO_8859_4_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_4_CB_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  0,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  1,  3,  2,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_ISO_8859_4_CB_infos[4] = {
-     o1(0xB7), o1(0xFF), o1(0xB2),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4_CB = {
-    to_ISO_8859_4_CB_offsets,
-    to_ISO_8859_4_CB_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_4_infos[7] = {
-                 NOMAP, &to_ISO_8859_4_C2,
-     &to_ISO_8859_4_C3, &to_ISO_8859_4_C4,
-     &to_ISO_8859_4_C5, &to_ISO_8859_4_CB,
-                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_4 = {
-    to_ISO_8859_2_offsets,
-    to_ISO_8859_4_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_4 = {
-    "UTF-8", "ISO-8859-4", &to_ISO_8859_4, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_5_infos[129] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-          o2(0xD0,0x81),      o2(0xD0,0x82),
-          o2(0xD0,0x83),      o2(0xD0,0x84),
-          o2(0xD0,0x85),      o2(0xD0,0x86),
-          o2(0xD0,0x87),      o2(0xD0,0x88),
-          o2(0xD0,0x89),      o2(0xD0,0x8A),
-          o2(0xD0,0x8B),      o2(0xD0,0x8C),
-          o2(0xC2,0xAD),      o2(0xD0,0x8E),
-          o2(0xD0,0x8F),      o2(0xD0,0x90),
-          o2(0xD0,0x91),      o2(0xD0,0x92),
-          o2(0xD0,0x93),      o2(0xD0,0x94),
-          o2(0xD0,0x95),      o2(0xD0,0x96),
-          o2(0xD0,0x97),      o2(0xD0,0x98),
-          o2(0xD0,0x99),      o2(0xD0,0x9A),
-          o2(0xD0,0x9B),      o2(0xD0,0x9C),
-          o2(0xD0,0x9D),      o2(0xD0,0x9E),
-          o2(0xD0,0x9F),      o2(0xD0,0xA0),
-          o2(0xD0,0xA1),      o2(0xD0,0xA2),
-          o2(0xD0,0xA3),      o2(0xD0,0xA4),
-          o2(0xD0,0xA5),      o2(0xD0,0xA6),
-          o2(0xD0,0xA7),      o2(0xD0,0xA8),
-          o2(0xD0,0xA9),      o2(0xD0,0xAA),
-          o2(0xD0,0xAB),      o2(0xD0,0xAC),
-          o2(0xD0,0xAD),      o2(0xD0,0xAE),
-          o2(0xD0,0xAF),      o2(0xD0,0xB0),
-          o2(0xD0,0xB1),      o2(0xD0,0xB2),
-          o2(0xD0,0xB3),      o2(0xD0,0xB4),
-          o2(0xD0,0xB5),      o2(0xD0,0xB6),
-          o2(0xD0,0xB7),      o2(0xD0,0xB8),
-          o2(0xD0,0xB9),      o2(0xD0,0xBA),
-          o2(0xD0,0xBB),      o2(0xD0,0xBC),
-          o2(0xD0,0xBD),      o2(0xD0,0xBE),
-          o2(0xD0,0xBF),      o2(0xD1,0x80),
-          o2(0xD1,0x81),      o2(0xD1,0x82),
-          o2(0xD1,0x83),      o2(0xD1,0x84),
-          o2(0xD1,0x85),      o2(0xD1,0x86),
-          o2(0xD1,0x87),      o2(0xD1,0x88),
-          o2(0xD1,0x89),      o2(0xD1,0x8A),
-          o2(0xD1,0x8B),      o2(0xD1,0x8C),
-          o2(0xD1,0x8D),      o2(0xD1,0x8E),
-          o2(0xD1,0x8F), o3(0xE2,0x84,0x96),
-          o2(0xD1,0x91),      o2(0xD1,0x92),
-          o2(0xD1,0x93),      o2(0xD1,0x94),
-          o2(0xD1,0x95),      o2(0xD1,0x96),
-          o2(0xD1,0x97),      o2(0xD1,0x98),
-          o2(0xD1,0x99),      o2(0xD1,0x9A),
-          o2(0xD1,0x9B),      o2(0xD1,0x9C),
-          o2(0xC2,0xA7),      o2(0xD1,0x9E),
-          o2(0xD1,0x9F),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_5 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_5_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_5 = {
-    "ISO-8859-5", "UTF-8", &from_ISO_8859_5, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_5_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 35, 35, 35, 35, 35, 35, 33,   35, 35, 35, 35, 35, 34, 35, 35,
-     35, 35, 35, 35, 35, 35, 35, 35,   35, 35, 35, 35, 35, 35, 35, 35,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_C2_infos[36] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xFD), o1(0xAD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5_C2 = {
-    to_ISO_8859_5_C2_offsets,
-    to_ISO_8859_5_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_5_D0_offsets[64] = {
-     62,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 62, 12, 13,
-     14, 15, 16, 17, 18, 19, 20, 21,   22, 23, 24, 25, 26, 27, 28, 29,
-     30, 31, 32, 33, 34, 35, 36, 37,   38, 39, 40, 41, 42, 43, 44, 45,
-     46, 47, 48, 49, 50, 51, 52, 53,   54, 55, 56, 57, 58, 59, 60, 61,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_D0_infos[63] = {
-     o1(0xA1), o1(0xA2), o1(0xA3), o1(0xA4),
-     o1(0xA5), o1(0xA6), o1(0xA7), o1(0xA8),
-     o1(0xA9), o1(0xAA), o1(0xAB), o1(0xAC),
-     o1(0xAE), o1(0xAF), o1(0xB0), o1(0xB1),
-     o1(0xB2), o1(0xB3), o1(0xB4), o1(0xB5),
-     o1(0xB6), o1(0xB7), o1(0xB8), o1(0xB9),
-     o1(0xBA), o1(0xBB), o1(0xBC), o1(0xBD),
-     o1(0xBE), o1(0xBF), o1(0xC0), o1(0xC1),
-     o1(0xC2), o1(0xC3), o1(0xC4), o1(0xC5),
-     o1(0xC6), o1(0xC7), o1(0xC8), o1(0xC9),
-     o1(0xCA), o1(0xCB), o1(0xCC), o1(0xCD),
-     o1(0xCE), o1(0xCF), o1(0xD0), o1(0xD1),
-     o1(0xD2), o1(0xD3), o1(0xD4), o1(0xD5),
-     o1(0xD6), o1(0xD7), o1(0xD8), o1(0xD9),
-     o1(0xDA), o1(0xDB), o1(0xDC), o1(0xDD),
-     o1(0xDE), o1(0xDF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5_D0 = {
-    to_ISO_8859_5_D0_offsets,
-    to_ISO_8859_5_D0_infos
-};
-
-static const unsigned char
-to_ISO_8859_5_D1_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     30, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 30, 28, 29,
-     30, 30, 30, 30, 30, 30, 30, 30,   30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30,   30, 30, 30, 30, 30, 30, 30, 30,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_D1_infos[31] = {
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-     o1(0xF1), o1(0xF2), o1(0xF3), o1(0xF4),
-     o1(0xF5), o1(0xF6), o1(0xF7), o1(0xF8),
-     o1(0xF9), o1(0xFA), o1(0xFB), o1(0xFC),
-     o1(0xFE), o1(0xFF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5_D1 = {
-    to_ISO_8859_5_D1_offsets,
-    to_ISO_8859_5_D1_infos
-};
-
-static const unsigned char
-to_ISO_8859_5_E2_84_offsets[64] = {
-      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,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_E2_84_infos[2] = {
-     o1(0xF0),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5_E2_84 = {
-    to_ISO_8859_5_E2_84_offsets,
-    to_ISO_8859_5_E2_84_infos
-};
-
-static const unsigned char
-to_ISO_8859_5_E2_offsets[64] = {
-      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,  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,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_E2_infos[2] = {
-     &to_ISO_8859_5_E2_84,                UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5_E2 = {
-    to_ISO_8859_5_E2_offsets,
-    to_ISO_8859_5_E2_infos
-};
-
-static const unsigned char
-to_ISO_8859_5_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  1,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      2,  3,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  4,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_5_infos[6] = {
-                 NOMAP, &to_ISO_8859_5_C2,
-     &to_ISO_8859_5_D0, &to_ISO_8859_5_D1,
-     &to_ISO_8859_5_E2,             UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_5 = {
-    to_ISO_8859_5_offsets,
-    to_ISO_8859_5_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_5 = {
-    "UTF-8", "ISO-8859-5", &to_ISO_8859_5, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_6_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 84, 84, 84, 34, 84, 84, 84,   84, 84, 84, 84, 35, 36, 84, 84,
-     84, 84, 84, 84, 84, 84, 84, 84,   84, 84, 84, 37, 84, 84, 84, 38,
-     84, 39, 40, 41, 42, 43, 44, 45,   46, 47, 48, 49, 50, 51, 52, 53,
-     54, 55, 56, 57, 58, 59, 60, 61,   62, 63, 64, 84, 84, 84, 84, 84,
-     65, 66, 67, 68, 69, 70, 71, 72,   73, 74, 75, 76, 77, 78, 79, 80,
-     81, 82, 83, 84, 84, 84, 84, 84,   84, 84, 84, 84, 84, 84, 84, 84,
-};
-static const struct byte_lookup* const
-from_ISO_8859_6_infos[85] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC2,0xA4), o2(0xD8,0x8C),
-     o2(0xC2,0xAD), o2(0xD8,0x9B), o2(0xD8,0x9F), o2(0xD8,0xA1),
-     o2(0xD8,0xA2), o2(0xD8,0xA3), o2(0xD8,0xA4), o2(0xD8,0xA5),
-     o2(0xD8,0xA6), o2(0xD8,0xA7), o2(0xD8,0xA8), o2(0xD8,0xA9),
-     o2(0xD8,0xAA), o2(0xD8,0xAB), o2(0xD8,0xAC), o2(0xD8,0xAD),
-     o2(0xD8,0xAE), o2(0xD8,0xAF), o2(0xD8,0xB0), o2(0xD8,0xB1),
-     o2(0xD8,0xB2), o2(0xD8,0xB3), o2(0xD8,0xB4), o2(0xD8,0xB5),
-     o2(0xD8,0xB6), o2(0xD8,0xB7), o2(0xD8,0xB8), o2(0xD8,0xB9),
-     o2(0xD8,0xBA), o2(0xD9,0x80), o2(0xD9,0x81), o2(0xD9,0x82),
-     o2(0xD9,0x83), o2(0xD9,0x84), o2(0xD9,0x85), o2(0xD9,0x86),
-     o2(0xD9,0x87), o2(0xD9,0x88), o2(0xD9,0x89), o2(0xD9,0x8A),
-     o2(0xD9,0x8B), o2(0xD9,0x8C), o2(0xD9,0x8D), o2(0xD9,0x8E),
-     o2(0xD9,0x8F), o2(0xD9,0x90), o2(0xD9,0x91), o2(0xD9,0x92),
-             UNDEF,
-};
-static const BYTE_LOOKUP
-from_ISO_8859_6 = {
-    from_ISO_8859_6_offsets,
-    from_ISO_8859_6_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_6 = {
-    "ISO-8859-6", "UTF-8", &from_ISO_8859_6, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_6_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 35, 35, 35, 33, 35, 35, 35,   35, 35, 35, 35, 35, 34, 35, 35,
-     35, 35, 35, 35, 35, 35, 35, 35,   35, 35, 35, 35, 35, 35, 35, 35,
-};
-static const struct byte_lookup* const
-to_ISO_8859_6_C2_infos[36] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA4), o1(0xAD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_6_C2 = {
-    to_ISO_8859_6_C2_offsets,
-    to_ISO_8859_6_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_6_D8_offsets[64] = {
-     29, 29, 29, 29, 29, 29, 29, 29,   29, 29, 29, 29,  0, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,   29, 29, 29,  1, 29, 29, 29,  2,
-     29,  3,  4,  5,  6,  7,  8,  9,   10, 11, 12, 13, 14, 15, 16, 17,
-     18, 19, 20, 21, 22, 23, 24, 25,   26, 27, 28, 29, 29, 29, 29, 29,
-};
-static const struct byte_lookup* const
-to_ISO_8859_6_D8_infos[30] = {
-     o1(0xAC), o1(0xBB), o1(0xBF), o1(0xC1),
-     o1(0xC2), o1(0xC3), o1(0xC4), o1(0xC5),
-     o1(0xC6), o1(0xC7), o1(0xC8), o1(0xC9),
-     o1(0xCA), o1(0xCB), o1(0xCC), o1(0xCD),
-     o1(0xCE), o1(0xCF), o1(0xD0), o1(0xD1),
-     o1(0xD2), o1(0xD3), o1(0xD4), o1(0xD5),
-     o1(0xD6), o1(0xD7), o1(0xD8), o1(0xD9),
-     o1(0xDA),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_6_D8 = {
-    to_ISO_8859_6_D8_offsets,
-    to_ISO_8859_6_D8_infos
-};
-
-static const unsigned char
-to_ISO_8859_6_D9_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19,   19, 19, 19, 19, 19, 19, 19, 19,
-};
-static const struct byte_lookup* const
-to_ISO_8859_6_D9_infos[20] = {
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-     o1(0xF0), o1(0xF1), o1(0xF2),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_6_D9 = {
-    to_ISO_8859_6_D9_offsets,
-    to_ISO_8859_6_D9_infos
-};
-
-static const unsigned char
-to_ISO_8859_6_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  1,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    2,  3,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_ISO_8859_6_infos[5] = {
-                 NOMAP, &to_ISO_8859_6_C2,
-     &to_ISO_8859_6_D8, &to_ISO_8859_6_D9,
-                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_6 = {
-    to_ISO_8859_6_offsets,
-    to_ISO_8859_6_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_6 = {
-    "UTF-8", "ISO-8859-6", &to_ISO_8859_6, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_7_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46,126, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 63,
-     64, 65, 66, 67, 68, 69, 70, 71,   72, 73, 74, 75, 76, 77, 78, 79,
-     80, 81,126, 82, 83, 84, 85, 86,   87, 88, 89, 90, 91, 92, 93, 94,
-     95, 96, 97, 98, 99,100,101,102,  103,104,105,106,107,108,109,110,
-    111,112,113,114,115,116,117,118,  119,120,121,122,123,124,125,126,
-};
-static const struct byte_lookup* const
-from_ISO_8859_7_infos[127] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-     o3(0xE2,0x80,0x98), o3(0xE2,0x80,0x99),
-          o2(0xC2,0xA3), o3(0xE2,0x82,0xAC),
-     o3(0xE2,0x82,0xAF),      o2(0xC2,0xA6),
-          o2(0xC2,0xA7),      o2(0xC2,0xA8),
-          o2(0xC2,0xA9),      o2(0xCD,0xBA),
-          o2(0xC2,0xAB),      o2(0xC2,0xAC),
-          o2(0xC2,0xAD), o3(0xE2,0x80,0x95),
-          o2(0xC2,0xB0),      o2(0xC2,0xB1),
-          o2(0xC2,0xB2),      o2(0xC2,0xB3),
-          o2(0xCE,0x84),      o2(0xCE,0x85),
-          o2(0xCE,0x86),      o2(0xC2,0xB7),
-          o2(0xCE,0x88),      o2(0xCE,0x89),
-          o2(0xCE,0x8A),      o2(0xC2,0xBB),
-          o2(0xCE,0x8C),      o2(0xC2,0xBD),
-          o2(0xCE,0x8E),      o2(0xCE,0x8F),
-          o2(0xCE,0x90),      o2(0xCE,0x91),
-          o2(0xCE,0x92),      o2(0xCE,0x93),
-          o2(0xCE,0x94),      o2(0xCE,0x95),
-          o2(0xCE,0x96),      o2(0xCE,0x97),
-          o2(0xCE,0x98),      o2(0xCE,0x99),
-          o2(0xCE,0x9A),      o2(0xCE,0x9B),
-          o2(0xCE,0x9C),      o2(0xCE,0x9D),
-          o2(0xCE,0x9E),      o2(0xCE,0x9F),
-          o2(0xCE,0xA0),      o2(0xCE,0xA1),
-          o2(0xCE,0xA3),      o2(0xCE,0xA4),
-          o2(0xCE,0xA5),      o2(0xCE,0xA6),
-          o2(0xCE,0xA7),      o2(0xCE,0xA8),
-          o2(0xCE,0xA9),      o2(0xCE,0xAA),
-          o2(0xCE,0xAB),      o2(0xCE,0xAC),
-          o2(0xCE,0xAD),      o2(0xCE,0xAE),
-          o2(0xCE,0xAF),      o2(0xCE,0xB0),
-          o2(0xCE,0xB1),      o2(0xCE,0xB2),
-          o2(0xCE,0xB3),      o2(0xCE,0xB4),
-          o2(0xCE,0xB5),      o2(0xCE,0xB6),
-          o2(0xCE,0xB7),      o2(0xCE,0xB8),
-          o2(0xCE,0xB9),      o2(0xCE,0xBA),
-          o2(0xCE,0xBB),      o2(0xCE,0xBC),
-          o2(0xCE,0xBD),      o2(0xCE,0xBE),
-          o2(0xCE,0xBF),      o2(0xCF,0x80),
-          o2(0xCF,0x81),      o2(0xCF,0x82),
-          o2(0xCF,0x83),      o2(0xCF,0x84),
-          o2(0xCF,0x85),      o2(0xCF,0x86),
-          o2(0xCF,0x87),      o2(0xCF,0x88),
-          o2(0xCF,0x89),      o2(0xCF,0x8A),
-          o2(0xCF,0x8B),      o2(0xCF,0x8C),
-          o2(0xCF,0x8D),      o2(0xCF,0x8E),
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-from_ISO_8859_7 = {
-    from_ISO_8859_7_offsets,
-    from_ISO_8859_7_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_7 = {
-    "ISO-8859-7", "UTF-8", &from_ISO_8859_7, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_7_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 48, 48, 33, 48, 48, 34, 35,   36, 37, 48, 38, 39, 40, 48, 48,
-     41, 42, 43, 44, 48, 48, 48, 45,   48, 48, 48, 46, 48, 47, 48, 48,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_C2_infos[49] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA3), o1(0xA6), o1(0xA7),
-     o1(0xA8), o1(0xA9), o1(0xAB), o1(0xAC),
-     o1(0xAD), o1(0xB0), o1(0xB1), o1(0xB2),
-     o1(0xB3), o1(0xB7), o1(0xBB), o1(0xBD),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_C2 = {
-    to_ISO_8859_7_C2_offsets,
-    to_ISO_8859_7_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_CD_offsets[64] = {
-      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,  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,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_CD_infos[2] = {
-     o1(0xAA),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_CD = {
-    to_ISO_8859_7_CD_offsets,
-    to_ISO_8859_7_CD_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_CE_offsets[64] = {
-     56, 56, 56, 56,  0,  1,  2, 56,    3,  4,  5, 56,  6, 56,  7,  8,
-      9, 10, 11, 12, 13, 14, 15, 16,   17, 18, 19, 20, 21, 22, 23, 24,
-     25, 26, 56, 27, 28, 29, 30, 31,   32, 33, 34, 35, 36, 37, 38, 39,
-     40, 41, 42, 43, 44, 45, 46, 47,   48, 49, 50, 51, 52, 53, 54, 55,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_CE_infos[57] = {
-     o1(0xB4), o1(0xB5), o1(0xB6), o1(0xB8),
-     o1(0xB9), o1(0xBA), o1(0xBC), o1(0xBE),
-     o1(0xBF), o1(0xC0), o1(0xC1), o1(0xC2),
-     o1(0xC3), o1(0xC4), o1(0xC5), o1(0xC6),
-     o1(0xC7), o1(0xC8), o1(0xC9), o1(0xCA),
-     o1(0xCB), o1(0xCC), o1(0xCD), o1(0xCE),
-     o1(0xCF), o1(0xD0), o1(0xD1), o1(0xD3),
-     o1(0xD4), o1(0xD5), o1(0xD6), o1(0xD7),
-     o1(0xD8), o1(0xD9), o1(0xDA), o1(0xDB),
-     o1(0xDC), o1(0xDD), o1(0xDE), o1(0xDF),
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_CE = {
-    to_ISO_8859_7_CE_offsets,
-    to_ISO_8859_7_CE_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_CF_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15,   15, 15, 15, 15, 15, 15, 15, 15,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_CF_infos[16] = {
-     o1(0xF0), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF7),
-     o1(0xF8), o1(0xF9), o1(0xFA), o1(0xFB),
-     o1(0xFC), o1(0xFD), o1(0xFE),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_CF = {
-    to_ISO_8859_7_CF_offsets,
-    to_ISO_8859_7_CF_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_E2_80_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  0,  3,  3,    1,  2,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_E2_80_infos[4] = {
-     o1(0xAF), o1(0xA1), o1(0xA2),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_E2_80 = {
-    to_ISO_8859_7_E2_80_offsets,
-    to_ISO_8859_7_E2_80_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_E2_82_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  0,  2,  2,  1,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_E2_82_infos[3] = {
-     o1(0xA4), o1(0xA5),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_E2_82 = {
-    to_ISO_8859_7_E2_82_offsets,
-    to_ISO_8859_7_E2_82_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_E2_offsets[64] = {
-      0,  2,  1,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_E2_infos[3] = {
-     &to_ISO_8859_7_E2_80, &to_ISO_8859_7_E2_82,
-                    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7_E2 = {
-    to_ISO_8859_7_E2_offsets,
-    to_ISO_8859_7_E2_infos
-};
-
-static const unsigned char
-to_ISO_8859_7_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  1,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  2,  3,  4,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  5,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_7_infos[7] = {
-                 NOMAP, &to_ISO_8859_7_C2,
-     &to_ISO_8859_7_CD, &to_ISO_8859_7_CE,
-     &to_ISO_8859_7_CF, &to_ISO_8859_7_E2,
-                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_7 = {
-    to_ISO_8859_7_offsets,
-    to_ISO_8859_7_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_7 = {
-    "UTF-8", "ISO-8859-7", &to_ISO_8859_7, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_8_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 93, 34, 35, 36, 37, 38, 39,   40, 41, 42, 43, 44, 45, 46, 47,
-     48, 49, 50, 51, 52, 53, 54, 55,   56, 57, 58, 59, 60, 61, 62, 93,
-     93, 93, 93, 93, 93, 93, 93, 93,   93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93,   93, 93, 93, 93, 93, 93, 93, 63,
-     64, 65, 66, 67, 68, 69, 70, 71,   72, 73, 74, 75, 76, 77, 78, 79,
-     80, 81, 82, 83, 84, 85, 86, 87,   88, 89, 90, 93, 93, 91, 92, 93,
-};
-static const struct byte_lookup* const
-from_ISO_8859_8_infos[94] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-          o2(0xC2,0xA2),      o2(0xC2,0xA3),
-          o2(0xC2,0xA4),      o2(0xC2,0xA5),
-          o2(0xC2,0xA6),      o2(0xC2,0xA7),
-          o2(0xC2,0xA8),      o2(0xC2,0xA9),
-          o2(0xC3,0x97),      o2(0xC2,0xAB),
-          o2(0xC2,0xAC),      o2(0xC2,0xAD),
-          o2(0xC2,0xAE),      o2(0xC2,0xAF),
-          o2(0xC2,0xB0),      o2(0xC2,0xB1),
-          o2(0xC2,0xB2),      o2(0xC2,0xB3),
-          o2(0xC2,0xB4),      o2(0xC2,0xB5),
-          o2(0xC2,0xB6),      o2(0xC2,0xB7),
-          o2(0xC2,0xB8),      o2(0xC2,0xB9),
-          o2(0xC3,0xB7),      o2(0xC2,0xBB),
-          o2(0xC2,0xBC),      o2(0xC2,0xBD),
-          o2(0xC2,0xBE), o3(0xE2,0x80,0x97),
-          o2(0xD7,0x90),      o2(0xD7,0x91),
-          o2(0xD7,0x92),      o2(0xD7,0x93),
-          o2(0xD7,0x94),      o2(0xD7,0x95),
-          o2(0xD7,0x96),      o2(0xD7,0x97),
-          o2(0xD7,0x98),      o2(0xD7,0x99),
-          o2(0xD7,0x9A),      o2(0xD7,0x9B),
-          o2(0xD7,0x9C),      o2(0xD7,0x9D),
-          o2(0xD7,0x9E),      o2(0xD7,0x9F),
-          o2(0xD7,0xA0),      o2(0xD7,0xA1),
-          o2(0xD7,0xA2),      o2(0xD7,0xA3),
-          o2(0xD7,0xA4),      o2(0xD7,0xA5),
-          o2(0xD7,0xA6),      o2(0xD7,0xA7),
-          o2(0xD7,0xA8),      o2(0xD7,0xA9),
-          o2(0xD7,0xAA), o3(0xE2,0x80,0x8E),
-     o3(0xE2,0x80,0x8F),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_ISO_8859_8 = {
-    from_ISO_8859_8_offsets,
-    from_ISO_8859_8_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_8 = {
-    "ISO-8859-8", "UTF-8", &from_ISO_8859_8, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_8_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 60, 33, 34, 35, 36, 37, 38,   39, 40, 60, 41, 42, 43, 44, 45,
-     46, 47, 48, 49, 50, 51, 52, 53,   54, 55, 60, 56, 57, 58, 59, 60,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_C2_infos[61] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA2), o1(0xA3), o1(0xA4),
-     o1(0xA5), o1(0xA6), o1(0xA7), o1(0xA8),
-     o1(0xA9), o1(0xAB), o1(0xAC), o1(0xAD),
-     o1(0xAE), o1(0xAF), o1(0xB0), o1(0xB1),
-     o1(0xB2), o1(0xB3), o1(0xB4), o1(0xB5),
-     o1(0xB6), o1(0xB7), o1(0xB8), o1(0xB9),
-     o1(0xBB), o1(0xBC), o1(0xBD), o1(0xBE),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8_C2 = {
-    to_ISO_8859_8_C2_offsets,
-    to_ISO_8859_8_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_8_C3_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  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,  1,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_C3_infos[3] = {
-     o1(0xAA), o1(0xBA),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8_C3 = {
-    to_ISO_8859_8_C3_offsets,
-    to_ISO_8859_8_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_8_D7_offsets[64] = {
-     27, 27, 27, 27, 27, 27, 27, 27,   27, 27, 27, 27, 27, 27, 27, 27,
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 27, 27, 27, 27,
-     27, 27, 27, 27, 27, 27, 27, 27,   27, 27, 27, 27, 27, 27, 27, 27,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_D7_infos[28] = {
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-     o1(0xF0), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF7),
-     o1(0xF8), o1(0xF9), o1(0xFA),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8_D7 = {
-    to_ISO_8859_8_D7_offsets,
-    to_ISO_8859_8_D7_infos
-};
-
-static const unsigned char
-to_ISO_8859_8_E2_80_offsets[64] = {
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  0,  1,
-      3,  3,  3,  3,  3,  3,  3,  2,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_E2_80_infos[4] = {
-     o1(0xFD), o1(0xFE), o1(0xDF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8_E2_80 = {
-    to_ISO_8859_8_E2_80_offsets,
-    to_ISO_8859_8_E2_80_infos
-};
-
-static const unsigned char
-to_ISO_8859_8_E2_offsets[64] = {
-  /* used from to_ISO_8859_8_E2 */
-  /* used from to_ISO_8859_10_E2 */
-  /* used from to_ISO_8859_13_E2 */
-      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,
-      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,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_E2_infos[2] = {
-     &to_ISO_8859_8_E2_80,                UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8_E2 = {
-    to_ISO_8859_8_E2_offsets,
-    to_ISO_8859_8_E2_infos
-};
-
-static const unsigned char
-to_ISO_8859_8_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  1,  2,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  3,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  4,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_8_infos[6] = {
-                 NOMAP, &to_ISO_8859_8_C2,
-     &to_ISO_8859_8_C3, &to_ISO_8859_8_D7,
-     &to_ISO_8859_8_E2,             UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_8 = {
-    to_ISO_8859_8_offsets,
-    to_ISO_8859_8_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_8 = {
-    "UTF-8", "ISO-8859-8", &to_ISO_8859_8, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_9_infos[129] = {
-             NOMAP, o2(0xC2,0x80), o2(0xC2,0x81), o2(0xC2,0x82),
-     o2(0xC2,0x83), o2(0xC2,0x84), o2(0xC2,0x85), o2(0xC2,0x86),
-     o2(0xC2,0x87), o2(0xC2,0x88), o2(0xC2,0x89), o2(0xC2,0x8A),
-     o2(0xC2,0x8B), o2(0xC2,0x8C), o2(0xC2,0x8D), o2(0xC2,0x8E),
-     o2(0xC2,0x8F), o2(0xC2,0x90), o2(0xC2,0x91), o2(0xC2,0x92),
-     o2(0xC2,0x93), o2(0xC2,0x94), o2(0xC2,0x95), o2(0xC2,0x96),
-     o2(0xC2,0x97), o2(0xC2,0x98), o2(0xC2,0x99), o2(0xC2,0x9A),
-     o2(0xC2,0x9B), o2(0xC2,0x9C), o2(0xC2,0x9D), o2(0xC2,0x9E),
-     o2(0xC2,0x9F), o2(0xC2,0xA0), o2(0xC2,0xA1), o2(0xC2,0xA2),
-     o2(0xC2,0xA3), o2(0xC2,0xA4), o2(0xC2,0xA5), o2(0xC2,0xA6),
-     o2(0xC2,0xA7), o2(0xC2,0xA8), o2(0xC2,0xA9), o2(0xC2,0xAA),
-     o2(0xC2,0xAB), o2(0xC2,0xAC), o2(0xC2,0xAD), o2(0xC2,0xAE),
-     o2(0xC2,0xAF), o2(0xC2,0xB0), o2(0xC2,0xB1), o2(0xC2,0xB2),
-     o2(0xC2,0xB3), o2(0xC2,0xB4), o2(0xC2,0xB5), o2(0xC2,0xB6),
-     o2(0xC2,0xB7), o2(0xC2,0xB8), o2(0xC2,0xB9), o2(0xC2,0xBA),
-     o2(0xC2,0xBB), o2(0xC2,0xBC), o2(0xC2,0xBD), o2(0xC2,0xBE),
-     o2(0xC2,0xBF), o2(0xC3,0x80), o2(0xC3,0x81), o2(0xC3,0x82),
-     o2(0xC3,0x83), o2(0xC3,0x84), o2(0xC3,0x85), o2(0xC3,0x86),
-     o2(0xC3,0x87), o2(0xC3,0x88), o2(0xC3,0x89), o2(0xC3,0x8A),
-     o2(0xC3,0x8B), o2(0xC3,0x8C), o2(0xC3,0x8D), o2(0xC3,0x8E),
-     o2(0xC3,0x8F), o2(0xC4,0x9E), o2(0xC3,0x91), o2(0xC3,0x92),
-     o2(0xC3,0x93), o2(0xC3,0x94), o2(0xC3,0x95), o2(0xC3,0x96),
-     o2(0xC3,0x97), o2(0xC3,0x98), o2(0xC3,0x99), o2(0xC3,0x9A),
-     o2(0xC3,0x9B), o2(0xC3,0x9C), o2(0xC4,0xB0), o2(0xC5,0x9E),
-     o2(0xC3,0x9F), o2(0xC3,0xA0), o2(0xC3,0xA1), o2(0xC3,0xA2),
-     o2(0xC3,0xA3), o2(0xC3,0xA4), o2(0xC3,0xA5), o2(0xC3,0xA6),
-     o2(0xC3,0xA7), o2(0xC3,0xA8), o2(0xC3,0xA9), o2(0xC3,0xAA),
-     o2(0xC3,0xAB), o2(0xC3,0xAC), o2(0xC3,0xAD), o2(0xC3,0xAE),
-     o2(0xC3,0xAF), o2(0xC4,0x9F), o2(0xC3,0xB1), o2(0xC3,0xB2),
-     o2(0xC3,0xB3), o2(0xC3,0xB4), o2(0xC3,0xB5), o2(0xC3,0xB6),
-     o2(0xC3,0xB7), o2(0xC3,0xB8), o2(0xC3,0xB9), o2(0xC3,0xBA),
-     o2(0xC3,0xBB), o2(0xC3,0xBC), o2(0xC4,0xB1), o2(0xC5,0x9F),
-     o2(0xC3,0xBF),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_9 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_9_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_9 = {
-    "ISO-8859-9", "UTF-8", &from_ISO_8859_9, 2, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_9_C3_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     58, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 58, 58, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,   37, 38, 39, 40, 41, 42, 43, 44,
-     58, 45, 46, 47, 48, 49, 50, 51,   52, 53, 54, 55, 56, 58, 58, 57,
-};
-static const struct byte_lookup* const
-to_ISO_8859_9_C3_infos[59] = {
-     o1(0xC0), o1(0xC1), o1(0xC2), o1(0xC3),
-     o1(0xC4), o1(0xC5), o1(0xC6), o1(0xC7),
-     o1(0xC8), o1(0xC9), o1(0xCA), o1(0xCB),
-     o1(0xCC), o1(0xCD), o1(0xCE), o1(0xCF),
-     o1(0xD1), o1(0xD2), o1(0xD3), o1(0xD4),
-     o1(0xD5), o1(0xD6), o1(0xD7), o1(0xD8),
-     o1(0xD9), o1(0xDA), o1(0xDB), o1(0xDC),
-     o1(0xDF), o1(0xE0), o1(0xE1), o1(0xE2),
-     o1(0xE3), o1(0xE4), o1(0xE5), o1(0xE6),
-     o1(0xE7), o1(0xE8), o1(0xE9), o1(0xEA),
-     o1(0xEB), o1(0xEC), o1(0xED), o1(0xEE),
-     o1(0xEF), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF7),
-     o1(0xF8), o1(0xF9), o1(0xFA), o1(0xFB),
-     o1(0xFC), o1(0xFF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_9_C3 = {
-    to_ISO_8859_9_C3_offsets,
-    to_ISO_8859_9_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_9_C4_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  0,  1,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      2,  3,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_ISO_8859_9_C4_infos[5] = {
-     o1(0xD0), o1(0xF0), o1(0xDD), o1(0xFD),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_9_C4 = {
-    to_ISO_8859_9_C4_offsets,
-    to_ISO_8859_9_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_9_C5_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  0,  1,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_9_C5_infos[3] = {
-     o1(0xDE), o1(0xFE),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_9_C5 = {
-    to_ISO_8859_9_C5_offsets,
-    to_ISO_8859_9_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_9_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  1,  2,  3,  4,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_9_infos[6] = {
-                 NOMAP, &to_ISO_8859_1_C2,
-     &to_ISO_8859_9_C3, &to_ISO_8859_9_C4,
-     &to_ISO_8859_9_C5,             UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_9 = {
-    to_ISO_8859_9_offsets,
-    to_ISO_8859_9_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_9 = {
-    "UTF-8", "ISO-8859-9", &to_ISO_8859_9, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_10_infos[129] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-          o2(0xC4,0x84),      o2(0xC4,0x92),
-          o2(0xC4,0xA2),      o2(0xC4,0xAA),
-          o2(0xC4,0xA8),      o2(0xC4,0xB6),
-          o2(0xC2,0xA7),      o2(0xC4,0xBB),
-          o2(0xC4,0x90),      o2(0xC5,0xA0),
-          o2(0xC5,0xA6),      o2(0xC5,0xBD),
-          o2(0xC2,0xAD),      o2(0xC5,0xAA),
-          o2(0xC5,0x8A),      o2(0xC2,0xB0),
-          o2(0xC4,0x85),      o2(0xC4,0x93),
-          o2(0xC4,0xA3),      o2(0xC4,0xAB),
-          o2(0xC4,0xA9),      o2(0xC4,0xB7),
-          o2(0xC2,0xB7),      o2(0xC4,0xBC),
-          o2(0xC4,0x91),      o2(0xC5,0xA1),
-          o2(0xC5,0xA7),      o2(0xC5,0xBE),
-     o3(0xE2,0x80,0x95),      o2(0xC5,0xAB),
-          o2(0xC5,0x8B),      o2(0xC4,0x80),
-          o2(0xC3,0x81),      o2(0xC3,0x82),
-          o2(0xC3,0x83),      o2(0xC3,0x84),
-          o2(0xC3,0x85),      o2(0xC3,0x86),
-          o2(0xC4,0xAE),      o2(0xC4,0x8C),
-          o2(0xC3,0x89),      o2(0xC4,0x98),
-          o2(0xC3,0x8B),      o2(0xC4,0x96),
-          o2(0xC3,0x8D),      o2(0xC3,0x8E),
-          o2(0xC3,0x8F),      o2(0xC3,0x90),
-          o2(0xC5,0x85),      o2(0xC5,0x8C),
-          o2(0xC3,0x93),      o2(0xC3,0x94),
-          o2(0xC3,0x95),      o2(0xC3,0x96),
-          o2(0xC5,0xA8),      o2(0xC3,0x98),
-          o2(0xC5,0xB2),      o2(0xC3,0x9A),
-          o2(0xC3,0x9B),      o2(0xC3,0x9C),
-          o2(0xC3,0x9D),      o2(0xC3,0x9E),
-          o2(0xC3,0x9F),      o2(0xC4,0x81),
-          o2(0xC3,0xA1),      o2(0xC3,0xA2),
-          o2(0xC3,0xA3),      o2(0xC3,0xA4),
-          o2(0xC3,0xA5),      o2(0xC3,0xA6),
-          o2(0xC4,0xAF),      o2(0xC4,0x8D),
-          o2(0xC3,0xA9),      o2(0xC4,0x99),
-          o2(0xC3,0xAB),      o2(0xC4,0x97),
-          o2(0xC3,0xAD),      o2(0xC3,0xAE),
-          o2(0xC3,0xAF),      o2(0xC3,0xB0),
-          o2(0xC5,0x86),      o2(0xC5,0x8D),
-          o2(0xC3,0xB3),      o2(0xC3,0xB4),
-          o2(0xC3,0xB5),      o2(0xC3,0xB6),
-          o2(0xC5,0xA9),      o2(0xC3,0xB8),
-          o2(0xC5,0xB3),      o2(0xC3,0xBA),
-          o2(0xC3,0xBB),      o2(0xC3,0xBC),
-          o2(0xC3,0xBD),      o2(0xC3,0xBE),
-          o2(0xC4,0xB8),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_10 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_10_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_10 = {
-    "ISO-8859-10", "UTF-8", &from_ISO_8859_10, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_10_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 37, 37, 37, 37, 37, 37, 33,   37, 37, 37, 37, 37, 34, 37, 37,
-     35, 37, 37, 37, 37, 37, 37, 36,   37, 37, 37, 37, 37, 37, 37, 37,
-};
-static const struct byte_lookup* const
-to_ISO_8859_10_C2_infos[38] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA7), o1(0xAD), o1(0xB0),
-     o1(0xB7),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_C2 = {
-    to_ISO_8859_10_C2_offsets,
-    to_ISO_8859_10_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_10_C3_offsets[64] = {
-     45,  0,  1,  2,  3,  4,  5, 45,   45,  6, 45,  7, 45,  8,  9, 10,
-     11, 45, 45, 12, 13, 14, 15, 45,   16, 45, 17, 18, 19, 20, 21, 22,
-     45, 23, 24, 25, 26, 27, 28, 45,   45, 29, 45, 30, 45, 31, 32, 33,
-     34, 45, 45, 35, 36, 37, 38, 45,   39, 45, 40, 41, 42, 43, 44, 45,
-};
-static const struct byte_lookup* const
-to_ISO_8859_10_C3_infos[46] = {
-     o1(0xC1), o1(0xC2), o1(0xC3), o1(0xC4),
-     o1(0xC5), o1(0xC6), o1(0xC9), o1(0xCB),
-     o1(0xCD), o1(0xCE), o1(0xCF), o1(0xD0),
-     o1(0xD3), o1(0xD4), o1(0xD5), o1(0xD6),
-     o1(0xD8), o1(0xDA), o1(0xDB), o1(0xDC),
-     o1(0xDD), o1(0xDE), o1(0xDF), o1(0xE1),
-     o1(0xE2), o1(0xE3), o1(0xE4), o1(0xE5),
-     o1(0xE6), o1(0xE9), o1(0xEB), o1(0xED),
-     o1(0xEE), o1(0xEF), o1(0xF0), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF8),
-     o1(0xFA), o1(0xFB), o1(0xFC), o1(0xFD),
-     o1(0xFE),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_C3 = {
-    to_ISO_8859_10_C3_offsets,
-    to_ISO_8859_10_C3_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_10_C4_infos[28] = {
-     o1(0xC0), o1(0xE0), o1(0xA1), o1(0xB1),
-     o1(0xC8), o1(0xE8), o1(0xA9), o1(0xB9),
-     o1(0xA2), o1(0xB2), o1(0xCC), o1(0xEC),
-     o1(0xCA), o1(0xEA), o1(0xA3), o1(0xB3),
-     o1(0xA5), o1(0xB5), o1(0xA4), o1(0xB4),
-     o1(0xC7), o1(0xE7), o1(0xA6), o1(0xB6),
-     o1(0xFF), o1(0xA8), o1(0xB8),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_C4 = {
-    to_ISO_8859_4_C4_offsets,
-    to_ISO_8859_10_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_10_C5_offsets[64] = {
-     18, 18, 18, 18, 18,  0,  1, 18,   18, 18,  2,  3,  4,  5, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18,   18, 18, 18, 18, 18, 18, 18, 18,
-      6,  7, 18, 18, 18, 18,  8,  9,   10, 11, 12, 13, 18, 18, 18, 18,
-     18, 18, 14, 15, 18, 18, 18, 18,   18, 18, 18, 18, 18, 16, 17, 18,
-};
-static const struct byte_lookup* const
-to_ISO_8859_10_C5_infos[19] = {
-     o1(0xD1), o1(0xF1), o1(0xAF), o1(0xBF),
-     o1(0xD2), o1(0xF2), o1(0xAA), o1(0xBA),
-     o1(0xAB), o1(0xBB), o1(0xD7), o1(0xF7),
-     o1(0xAE), o1(0xBE), o1(0xD9), o1(0xF9),
-     o1(0xAC), o1(0xBC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_C5 = {
-    to_ISO_8859_10_C5_offsets,
-    to_ISO_8859_10_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_10_E2_80_offsets[64] = {
-      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,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-to_ISO_8859_10_E2_80_infos[2] = {
-     o1(0xBD),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_E2_80 = {
-    to_ISO_8859_10_E2_80_offsets,
-    to_ISO_8859_10_E2_80_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_10_E2_infos[2] = {
-     &to_ISO_8859_10_E2_80,                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10_E2 = {
-    to_ISO_8859_8_E2_offsets,
-    to_ISO_8859_10_E2_infos
-};
-
-static const unsigned char
-to_ISO_8859_10_offsets[256] = {
-  /* used from to_ISO_8859_10 */
-  /* used from to_ISO_8859_13 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  1,  2,  3,  4,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  5,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_10_infos[7] = {
-                  NOMAP, &to_ISO_8859_10_C2,
-     &to_ISO_8859_10_C3, &to_ISO_8859_10_C4,
-     &to_ISO_8859_10_C5, &to_ISO_8859_10_E2,
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_10 = {
-    to_ISO_8859_10_offsets,
-    to_ISO_8859_10_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_10 = {
-    "UTF-8", "ISO-8859-10", &to_ISO_8859_10, 1, 1,
-    NULL, NULL,
-};
-
-static const unsigned char
-from_ISO_8859_11_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      1,  2,  3,  4,  5,  6,  7,  8,    9, 10, 11, 12, 13, 14, 15, 16,
-     17, 18, 19, 20, 21, 22, 23, 24,   25, 26, 27, 28, 29, 30, 31, 32,
-     33, 34, 35, 36, 37, 38, 39, 40,   41, 42, 43, 44, 45, 46, 47, 48,
-     49, 50, 51, 52, 53, 54, 55, 56,   57, 58, 59, 60, 61, 62, 63, 64,
-     65, 66, 67, 68, 69, 70, 71, 72,   73, 74, 75, 76, 77, 78, 79, 80,
-     81, 82, 83, 84, 85, 86, 87, 88,   89, 90, 91,121,121,121,121, 92,
-     93, 94, 95, 96, 97, 98, 99,100,  101,102,103,104,105,106,107,108,
-    109,110,111,112,113,114,115,116,  117,118,119,120,121,121,121,121,
-};
-static const struct byte_lookup* const
-from_ISO_8859_11_infos[122] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-     o3(0xE0,0xB8,0x81), o3(0xE0,0xB8,0x82),
-     o3(0xE0,0xB8,0x83), o3(0xE0,0xB8,0x84),
-     o3(0xE0,0xB8,0x85), o3(0xE0,0xB8,0x86),
-     o3(0xE0,0xB8,0x87), o3(0xE0,0xB8,0x88),
-     o3(0xE0,0xB8,0x89), o3(0xE0,0xB8,0x8A),
-     o3(0xE0,0xB8,0x8B), o3(0xE0,0xB8,0x8C),
-     o3(0xE0,0xB8,0x8D), o3(0xE0,0xB8,0x8E),
-     o3(0xE0,0xB8,0x8F), o3(0xE0,0xB8,0x90),
-     o3(0xE0,0xB8,0x91), o3(0xE0,0xB8,0x92),
-     o3(0xE0,0xB8,0x93), o3(0xE0,0xB8,0x94),
-     o3(0xE0,0xB8,0x95), o3(0xE0,0xB8,0x96),
-     o3(0xE0,0xB8,0x97), o3(0xE0,0xB8,0x98),
-     o3(0xE0,0xB8,0x99), o3(0xE0,0xB8,0x9A),
-     o3(0xE0,0xB8,0x9B), o3(0xE0,0xB8,0x9C),
-     o3(0xE0,0xB8,0x9D), o3(0xE0,0xB8,0x9E),
-     o3(0xE0,0xB8,0x9F), o3(0xE0,0xB8,0xA0),
-     o3(0xE0,0xB8,0xA1), o3(0xE0,0xB8,0xA2),
-     o3(0xE0,0xB8,0xA3), o3(0xE0,0xB8,0xA4),
-     o3(0xE0,0xB8,0xA5), o3(0xE0,0xB8,0xA6),
-     o3(0xE0,0xB8,0xA7), o3(0xE0,0xB8,0xA8),
-     o3(0xE0,0xB8,0xA9), o3(0xE0,0xB8,0xAA),
-     o3(0xE0,0xB8,0xAB), o3(0xE0,0xB8,0xAC),
-     o3(0xE0,0xB8,0xAD), o3(0xE0,0xB8,0xAE),
-     o3(0xE0,0xB8,0xAF), o3(0xE0,0xB8,0xB0),
-     o3(0xE0,0xB8,0xB1), o3(0xE0,0xB8,0xB2),
-     o3(0xE0,0xB8,0xB3), o3(0xE0,0xB8,0xB4),
-     o3(0xE0,0xB8,0xB5), o3(0xE0,0xB8,0xB6),
-     o3(0xE0,0xB8,0xB7), o3(0xE0,0xB8,0xB8),
-     o3(0xE0,0xB8,0xB9), o3(0xE0,0xB8,0xBA),
-     o3(0xE0,0xB8,0xBF), o3(0xE0,0xB9,0x80),
-     o3(0xE0,0xB9,0x81), o3(0xE0,0xB9,0x82),
-     o3(0xE0,0xB9,0x83), o3(0xE0,0xB9,0x84),
-     o3(0xE0,0xB9,0x85), o3(0xE0,0xB9,0x86),
-     o3(0xE0,0xB9,0x87), o3(0xE0,0xB9,0x88),
-     o3(0xE0,0xB9,0x89), o3(0xE0,0xB9,0x8A),
-     o3(0xE0,0xB9,0x8B), o3(0xE0,0xB9,0x8C),
-     o3(0xE0,0xB9,0x8D), o3(0xE0,0xB9,0x8E),
-     o3(0xE0,0xB9,0x8F), o3(0xE0,0xB9,0x90),
-     o3(0xE0,0xB9,0x91), o3(0xE0,0xB9,0x92),
-     o3(0xE0,0xB9,0x93), o3(0xE0,0xB9,0x94),
-     o3(0xE0,0xB9,0x95), o3(0xE0,0xB9,0x96),
-     o3(0xE0,0xB9,0x97), o3(0xE0,0xB9,0x98),
-     o3(0xE0,0xB9,0x99), o3(0xE0,0xB9,0x9A),
-     o3(0xE0,0xB9,0x9B),              UNDEF,
-};
-static const BYTE_LOOKUP
-from_ISO_8859_11 = {
-    from_ISO_8859_11_offsets,
-    from_ISO_8859_11_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_11 = {
-    "ISO-8859-11", "UTF-8", &from_ISO_8859_11, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_11_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 33, 33, 33, 33, 33, 33,   33, 33, 33, 33, 33, 33, 33, 33,
-     33, 33, 33, 33, 33, 33, 33, 33,   33, 33, 33, 33, 33, 33, 33, 33,
-};
-static const struct byte_lookup* const
-to_ISO_8859_11_C2_infos[34] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_11_C2 = {
-    to_ISO_8859_11_C2_offsets,
-    to_ISO_8859_11_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_11_E0_B8_offsets[64] = {
-     59,  0,  1,  2,  3,  4,  5,  6,    7,  8,  9, 10, 11, 12, 13, 14,
-     15, 16, 17, 18, 19, 20, 21, 22,   23, 24, 25, 26, 27, 28, 29, 30,
-     31, 32, 33, 34, 35, 36, 37, 38,   39, 40, 41, 42, 43, 44, 45, 46,
-     47, 48, 49, 50, 51, 52, 53, 54,   55, 56, 57, 59, 59, 59, 59, 58,
-};
-static const struct byte_lookup* const
-to_ISO_8859_11_E0_B8_infos[60] = {
-     o1(0xA1), o1(0xA2), o1(0xA3), o1(0xA4),
-     o1(0xA5), o1(0xA6), o1(0xA7), o1(0xA8),
-     o1(0xA9), o1(0xAA), o1(0xAB), o1(0xAC),
-     o1(0xAD), o1(0xAE), o1(0xAF), o1(0xB0),
-     o1(0xB1), o1(0xB2), o1(0xB3), o1(0xB4),
-     o1(0xB5), o1(0xB6), o1(0xB7), o1(0xB8),
-     o1(0xB9), o1(0xBA), o1(0xBB), o1(0xBC),
-     o1(0xBD), o1(0xBE), o1(0xBF), o1(0xC0),
-     o1(0xC1), o1(0xC2), o1(0xC3), o1(0xC4),
-     o1(0xC5), o1(0xC6), o1(0xC7), o1(0xC8),
-     o1(0xC9), o1(0xCA), o1(0xCB), o1(0xCC),
-     o1(0xCD), o1(0xCE), o1(0xCF), o1(0xD0),
-     o1(0xD1), o1(0xD2), o1(0xD3), o1(0xD4),
-     o1(0xD5), o1(0xD6), o1(0xD7), o1(0xD8),
-     o1(0xD9), o1(0xDA), o1(0xDF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_11_E0_B8 = {
-    to_ISO_8859_11_E0_B8_offsets,
-    to_ISO_8859_11_E0_B8_infos
-};
-
-static const unsigned char
-to_ISO_8859_11_E0_B9_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 28, 28, 28,
-     28, 28, 28, 28, 28, 28, 28, 28,   28, 28, 28, 28, 28, 28, 28, 28,
-     28, 28, 28, 28, 28, 28, 28, 28,   28, 28, 28, 28, 28, 28, 28, 28,
-};
-static const struct byte_lookup* const
-to_ISO_8859_11_E0_B9_infos[29] = {
-     o1(0xE0), o1(0xE1), o1(0xE2), o1(0xE3),
-     o1(0xE4), o1(0xE5), o1(0xE6), o1(0xE7),
-     o1(0xE8), o1(0xE9), o1(0xEA), o1(0xEB),
-     o1(0xEC), o1(0xED), o1(0xEE), o1(0xEF),
-     o1(0xF0), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF7),
-     o1(0xF8), o1(0xF9), o1(0xFA), o1(0xFB),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_11_E0_B9 = {
-    to_ISO_8859_11_E0_B9_offsets,
-    to_ISO_8859_11_E0_B9_infos
-};
-
-static const unsigned char
-to_ISO_8859_11_E0_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    0,  1,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_11_E0_infos[3] = {
-     &to_ISO_8859_11_E0_B8, &to_ISO_8859_11_E0_B9,
-                     UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_11_E0 = {
-    to_ISO_8859_11_E0_offsets,
-    to_ISO_8859_11_E0_infos
-};
-
-static const unsigned char
-to_ISO_8859_11_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  1,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      2,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-      3,  3,  3,  3,  3,  3,  3,  3,    3,  3,  3,  3,  3,  3,  3,  3,
-};
-static const struct byte_lookup* const
-to_ISO_8859_11_infos[4] = {
-                  NOMAP, &to_ISO_8859_11_C2,
-     &to_ISO_8859_11_E0,              UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_11 = {
-    to_ISO_8859_11_offsets,
-    to_ISO_8859_11_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_11 = {
-    "UTF-8", "ISO-8859-11", &to_ISO_8859_11, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_13_infos[129] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-     o3(0xE2,0x80,0x9D),      o2(0xC2,0xA2),
-          o2(0xC2,0xA3),      o2(0xC2,0xA4),
-     o3(0xE2,0x80,0x9E),      o2(0xC2,0xA6),
-          o2(0xC2,0xA7),      o2(0xC3,0x98),
-          o2(0xC2,0xA9),      o2(0xC5,0x96),
-          o2(0xC2,0xAB),      o2(0xC2,0xAC),
-          o2(0xC2,0xAD),      o2(0xC2,0xAE),
-          o2(0xC3,0x86),      o2(0xC2,0xB0),
-          o2(0xC2,0xB1),      o2(0xC2,0xB2),
-          o2(0xC2,0xB3), o3(0xE2,0x80,0x9C),
-          o2(0xC2,0xB5),      o2(0xC2,0xB6),
-          o2(0xC2,0xB7),      o2(0xC3,0xB8),
-          o2(0xC2,0xB9),      o2(0xC5,0x97),
-          o2(0xC2,0xBB),      o2(0xC2,0xBC),
-          o2(0xC2,0xBD),      o2(0xC2,0xBE),
-          o2(0xC3,0xA6),      o2(0xC4,0x84),
-          o2(0xC4,0xAE),      o2(0xC4,0x80),
-          o2(0xC4,0x86),      o2(0xC3,0x84),
-          o2(0xC3,0x85),      o2(0xC4,0x98),
-          o2(0xC4,0x92),      o2(0xC4,0x8C),
-          o2(0xC3,0x89),      o2(0xC5,0xB9),
-          o2(0xC4,0x96),      o2(0xC4,0xA2),
-          o2(0xC4,0xB6),      o2(0xC4,0xAA),
-          o2(0xC4,0xBB),      o2(0xC5,0xA0),
-          o2(0xC5,0x83),      o2(0xC5,0x85),
-          o2(0xC3,0x93),      o2(0xC5,0x8C),
-          o2(0xC3,0x95),      o2(0xC3,0x96),
-          o2(0xC3,0x97),      o2(0xC5,0xB2),
-          o2(0xC5,0x81),      o2(0xC5,0x9A),
-          o2(0xC5,0xAA),      o2(0xC3,0x9C),
-          o2(0xC5,0xBB),      o2(0xC5,0xBD),
-          o2(0xC3,0x9F),      o2(0xC4,0x85),
-          o2(0xC4,0xAF),      o2(0xC4,0x81),
-          o2(0xC4,0x87),      o2(0xC3,0xA4),
-          o2(0xC3,0xA5),      o2(0xC4,0x99),
-          o2(0xC4,0x93),      o2(0xC4,0x8D),
-          o2(0xC3,0xA9),      o2(0xC5,0xBA),
-          o2(0xC4,0x97),      o2(0xC4,0xA3),
-          o2(0xC4,0xB7),      o2(0xC4,0xAB),
-          o2(0xC4,0xBC),      o2(0xC5,0xA1),
-          o2(0xC5,0x84),      o2(0xC5,0x86),
-          o2(0xC3,0xB3),      o2(0xC5,0x8D),
-          o2(0xC3,0xB5),      o2(0xC3,0xB6),
-          o2(0xC3,0xB7),      o2(0xC5,0xB3),
-          o2(0xC5,0x82),      o2(0xC5,0x9B),
-          o2(0xC5,0xAB),      o2(0xC3,0xBC),
-          o2(0xC5,0xBC),      o2(0xC5,0xBE),
-     o3(0xE2,0x80,0x99),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_13 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_13_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_13 = {
-    "ISO-8859-13", "UTF-8", &from_ISO_8859_13, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_13_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 55, 33, 34, 35, 55, 36, 37,   55, 38, 55, 39, 40, 41, 42, 55,
-     43, 44, 45, 46, 55, 47, 48, 49,   55, 50, 55, 51, 52, 53, 54, 55,
-};
-static const struct byte_lookup* const
-to_ISO_8859_13_C2_infos[56] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA2), o1(0xA3), o1(0xA4),
-     o1(0xA6), o1(0xA7), o1(0xA9), o1(0xAB),
-     o1(0xAC), o1(0xAD), o1(0xAE), o1(0xB0),
-     o1(0xB1), o1(0xB2), o1(0xB3), o1(0xB5),
-     o1(0xB6), o1(0xB7), o1(0xB9), o1(0xBB),
-     o1(0xBC), o1(0xBD), o1(0xBE),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_C2 = {
-    to_ISO_8859_13_C2_offsets,
-    to_ISO_8859_13_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_13_C3_offsets[64] = {
-     21, 21, 21, 21,  0,  1,  2, 21,   21,  3, 21, 21, 21, 21, 21, 21,
-     21, 21, 21,  4, 21,  5,  6,  7,    8, 21, 21, 21,  9, 21, 21, 10,
-     21, 21, 21, 21, 11, 12, 13, 21,   21, 14, 21, 21, 21, 21, 21, 21,
-     21, 21, 21, 15, 21, 16, 17, 18,   19, 21, 21, 21, 20, 21, 21, 21,
-};
-static const struct byte_lookup* const
-to_ISO_8859_13_C3_infos[22] = {
-     o1(0xC4), o1(0xC5), o1(0xAF), o1(0xC9),
-     o1(0xD3), o1(0xD5), o1(0xD6), o1(0xD7),
-     o1(0xA8), o1(0xDC), o1(0xDF), o1(0xE4),
-     o1(0xE5), o1(0xBF), o1(0xE9), o1(0xF3),
-     o1(0xF5), o1(0xF6), o1(0xF7), o1(0xB8),
-     o1(0xFC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_C3 = {
-    to_ISO_8859_13_C3_offsets,
-    to_ISO_8859_13_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_13_C4_offsets[64] = {
-      0,  1, 24, 24,  2,  3,  4,  5,   24, 24, 24, 24,  6,  7, 24, 24,
-     24, 24,  8,  9, 24, 24, 10, 11,   12, 13, 24, 24, 24, 24, 24, 24,
-     24, 24, 14, 15, 24, 24, 24, 24,   24, 24, 16, 17, 24, 24, 18, 19,
-     24, 24, 24, 24, 24, 24, 20, 21,   24, 24, 24, 22, 23, 24, 24, 24,
-};
-static const struct byte_lookup* const
-to_ISO_8859_13_C4_infos[25] = {
-     o1(0xC2), o1(0xE2), o1(0xC0), o1(0xE0),
-     o1(0xC3), o1(0xE3), o1(0xC8), o1(0xE8),
-     o1(0xC7), o1(0xE7), o1(0xCB), o1(0xEB),
-     o1(0xC6), o1(0xE6), o1(0xCC), o1(0xEC),
-     o1(0xCE), o1(0xEE), o1(0xC1), o1(0xE1),
-     o1(0xCD), o1(0xED), o1(0xCF), o1(0xEF),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_C4 = {
-    to_ISO_8859_13_C4_offsets,
-    to_ISO_8859_13_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_13_C5_offsets[64] = {
-     24,  0,  1,  2,  3,  4,  5, 24,   24, 24, 24, 24,  6,  7, 24, 24,
-     24, 24, 24, 24, 24, 24,  8,  9,   24, 24, 10, 11, 24, 24, 24, 24,
-     12, 13, 24, 24, 24, 24, 24, 24,   24, 24, 14, 15, 24, 24, 24, 24,
-     24, 24, 16, 17, 24, 24, 24, 24,   24, 18, 19, 20, 21, 22, 23, 24,
-};
-static const struct byte_lookup* const
-to_ISO_8859_13_C5_infos[25] = {
-     o1(0xD9), o1(0xF9), o1(0xD1), o1(0xF1),
-     o1(0xD2), o1(0xF2), o1(0xD4), o1(0xF4),
-     o1(0xAA), o1(0xBA), o1(0xDA), o1(0xFA),
-     o1(0xD0), o1(0xF0), o1(0xDB), o1(0xFB),
-     o1(0xD8), o1(0xF8), o1(0xCA), o1(0xEA),
-     o1(0xDD), o1(0xFD), o1(0xDE), o1(0xFE),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_C5 = {
-    to_ISO_8859_13_C5_offsets,
-    to_ISO_8859_13_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_13_E2_80_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  0,  4,  4,  1,  2,  3,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_ISO_8859_13_E2_80_infos[5] = {
-     o1(0xFF), o1(0xB4), o1(0xA1), o1(0xA5),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_E2_80 = {
-    to_ISO_8859_13_E2_80_offsets,
-    to_ISO_8859_13_E2_80_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_13_E2_infos[2] = {
-     &to_ISO_8859_13_E2_80,                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13_E2 = {
-    to_ISO_8859_8_E2_offsets,
-    to_ISO_8859_13_E2_infos
-};
-
-static const struct byte_lookup* const
-to_ISO_8859_13_infos[7] = {
-                  NOMAP, &to_ISO_8859_13_C2,
-     &to_ISO_8859_13_C3, &to_ISO_8859_13_C4,
-     &to_ISO_8859_13_C5, &to_ISO_8859_13_E2,
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_13 = {
-    to_ISO_8859_10_offsets,
-    to_ISO_8859_13_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_13 = {
-    "UTF-8", "ISO-8859-13", &to_ISO_8859_13, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_14_infos[129] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-     o3(0xE1,0xB8,0x82), o3(0xE1,0xB8,0x83),
-          o2(0xC2,0xA3),      o2(0xC4,0x8A),
-          o2(0xC4,0x8B), o3(0xE1,0xB8,0x8A),
-          o2(0xC2,0xA7), o3(0xE1,0xBA,0x80),
-          o2(0xC2,0xA9), o3(0xE1,0xBA,0x82),
-     o3(0xE1,0xB8,0x8B), o3(0xE1,0xBB,0xB2),
-          o2(0xC2,0xAD),      o2(0xC2,0xAE),
-          o2(0xC5,0xB8), o3(0xE1,0xB8,0x9E),
-     o3(0xE1,0xB8,0x9F),      o2(0xC4,0xA0),
-          o2(0xC4,0xA1), o3(0xE1,0xB9,0x80),
-     o3(0xE1,0xB9,0x81),      o2(0xC2,0xB6),
-     o3(0xE1,0xB9,0x96), o3(0xE1,0xBA,0x81),
-     o3(0xE1,0xB9,0x97), o3(0xE1,0xBA,0x83),
-     o3(0xE1,0xB9,0xA0), o3(0xE1,0xBB,0xB3),
-     o3(0xE1,0xBA,0x84), o3(0xE1,0xBA,0x85),
-     o3(0xE1,0xB9,0xA1),      o2(0xC3,0x80),
-          o2(0xC3,0x81),      o2(0xC3,0x82),
-          o2(0xC3,0x83),      o2(0xC3,0x84),
-          o2(0xC3,0x85),      o2(0xC3,0x86),
-          o2(0xC3,0x87),      o2(0xC3,0x88),
-          o2(0xC3,0x89),      o2(0xC3,0x8A),
-          o2(0xC3,0x8B),      o2(0xC3,0x8C),
-          o2(0xC3,0x8D),      o2(0xC3,0x8E),
-          o2(0xC3,0x8F),      o2(0xC5,0xB4),
-          o2(0xC3,0x91),      o2(0xC3,0x92),
-          o2(0xC3,0x93),      o2(0xC3,0x94),
-          o2(0xC3,0x95),      o2(0xC3,0x96),
-     o3(0xE1,0xB9,0xAA),      o2(0xC3,0x98),
-          o2(0xC3,0x99),      o2(0xC3,0x9A),
-          o2(0xC3,0x9B),      o2(0xC3,0x9C),
-          o2(0xC3,0x9D),      o2(0xC5,0xB6),
-          o2(0xC3,0x9F),      o2(0xC3,0xA0),
-          o2(0xC3,0xA1),      o2(0xC3,0xA2),
-          o2(0xC3,0xA3),      o2(0xC3,0xA4),
-          o2(0xC3,0xA5),      o2(0xC3,0xA6),
-          o2(0xC3,0xA7),      o2(0xC3,0xA8),
-          o2(0xC3,0xA9),      o2(0xC3,0xAA),
-          o2(0xC3,0xAB),      o2(0xC3,0xAC),
-          o2(0xC3,0xAD),      o2(0xC3,0xAE),
-          o2(0xC3,0xAF),      o2(0xC5,0xB5),
-          o2(0xC3,0xB1),      o2(0xC3,0xB2),
-          o2(0xC3,0xB3),      o2(0xC3,0xB4),
-          o2(0xC3,0xB5),      o2(0xC3,0xB6),
-     o3(0xE1,0xB9,0xAB),      o2(0xC3,0xB8),
-          o2(0xC3,0xB9),      o2(0xC3,0xBA),
-          o2(0xC3,0xBB),      o2(0xC3,0xBC),
-          o2(0xC3,0xBD),      o2(0xC5,0xB7),
-          o2(0xC3,0xBF),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_14 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_14_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_14 = {
-    "ISO-8859-14", "UTF-8", &from_ISO_8859_14, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_14_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 39, 39, 33, 39, 39, 39, 34,   39, 35, 39, 39, 39, 36, 37, 39,
-     39, 39, 39, 39, 39, 39, 38, 39,   39, 39, 39, 39, 39, 39, 39, 39,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_C2_infos[40] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA3), o1(0xA7), o1(0xA9),
-     o1(0xAD), o1(0xAE), o1(0xB6),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_C2 = {
-    to_ISO_8859_14_C2_offsets,
-    to_ISO_8859_14_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_C3_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     58, 16, 17, 18, 19, 20, 21, 58,   22, 23, 24, 25, 26, 27, 58, 28,
-     29, 30, 31, 32, 33, 34, 35, 36,   37, 38, 39, 40, 41, 42, 43, 44,
-     58, 45, 46, 47, 48, 49, 50, 58,   51, 52, 53, 54, 55, 56, 58, 57,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_C3_infos[59] = {
-     o1(0xC0), o1(0xC1), o1(0xC2), o1(0xC3),
-     o1(0xC4), o1(0xC5), o1(0xC6), o1(0xC7),
-     o1(0xC8), o1(0xC9), o1(0xCA), o1(0xCB),
-     o1(0xCC), o1(0xCD), o1(0xCE), o1(0xCF),
-     o1(0xD1), o1(0xD2), o1(0xD3), o1(0xD4),
-     o1(0xD5), o1(0xD6), o1(0xD8), o1(0xD9),
-     o1(0xDA), o1(0xDB), o1(0xDC), o1(0xDD),
-     o1(0xDF), o1(0xE0), o1(0xE1), o1(0xE2),
-     o1(0xE3), o1(0xE4), o1(0xE5), o1(0xE6),
-     o1(0xE7), o1(0xE8), o1(0xE9), o1(0xEA),
-     o1(0xEB), o1(0xEC), o1(0xED), o1(0xEE),
-     o1(0xEF), o1(0xF1), o1(0xF2), o1(0xF3),
-     o1(0xF4), o1(0xF5), o1(0xF6), o1(0xF8),
-     o1(0xF9), o1(0xFA), o1(0xFB), o1(0xFC),
-     o1(0xFD), o1(0xFF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_C3 = {
-    to_ISO_8859_14_C3_offsets,
-    to_ISO_8859_14_C3_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_C4_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  0,  1,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      2,  3,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_C4_infos[5] = {
-     o1(0xA4), o1(0xA5), o1(0xB2), o1(0xB3),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_C4 = {
-    to_ISO_8859_14_C4_offsets,
-    to_ISO_8859_14_C4_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_C5_offsets[64] = {
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  0,  1,  2,  3,    4,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_C5_infos[6] = {
-     o1(0xD0), o1(0xF0), o1(0xDE), o1(0xFE),
-     o1(0xAF),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_C5 = {
-    to_ISO_8859_14_C5_offsets,
-    to_ISO_8859_14_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_E1_B8_offsets[64] = {
-      6,  6,  0,  1,  6,  6,  6,  6,    6,  6,  2,  3,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  4,  5,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_E1_B8_infos[7] = {
-     o1(0xA1), o1(0xA2), o1(0xA6), o1(0xAB),
-     o1(0xB0), o1(0xB1),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_E1_B8 = {
-    to_ISO_8859_14_E1_B8_offsets,
-    to_ISO_8859_14_E1_B8_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_E1_B9_offsets[64] = {
-      0,  1,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  2,  3,    8,  8,  8,  8,  8,  8,  8,  8,
-      4,  5,  8,  8,  8,  8,  8,  8,    8,  8,  6,  7,  8,  8,  8,  8,
-      8,  8,  8,  8,  8,  8,  8,  8,    8,  8,  8,  8,  8,  8,  8,  8,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_E1_B9_infos[9] = {
-     o1(0xB4), o1(0xB5), o1(0xB7), o1(0xB9),
-     o1(0xBB), o1(0xBF), o1(0xD7), o1(0xF7),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_E1_B9 = {
-    to_ISO_8859_14_E1_B9_offsets,
-    to_ISO_8859_14_E1_B9_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_E1_BA_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_E1_BA_infos[7] = {
-     o1(0xA8), o1(0xB8), o1(0xAA), o1(0xBA),
-     o1(0xBD), o1(0xBE),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_E1_BA = {
-    to_ISO_8859_14_E1_BA_offsets,
-    to_ISO_8859_14_E1_BA_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_E1_BB_offsets[64] = {
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  0,  1,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_E1_BB_infos[3] = {
-     o1(0xAC), o1(0xBC),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_E1_BB = {
-    to_ISO_8859_14_E1_BB_offsets,
-    to_ISO_8859_14_E1_BB_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_E1_offsets[64] = {
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  4,  4,  4,
-      4,  4,  4,  4,  4,  4,  4,  4,    0,  1,  2,  3,  4,  4,  4,  4,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_E1_infos[5] = {
-     &to_ISO_8859_14_E1_B8, &to_ISO_8859_14_E1_B9,
-     &to_ISO_8859_14_E1_BA, &to_ISO_8859_14_E1_BB,
-                     UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14_E1 = {
-    to_ISO_8859_14_E1_offsets,
-    to_ISO_8859_14_E1_infos
-};
-
-static const unsigned char
-to_ISO_8859_14_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  1,  2,  3,  4,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  5,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-      6,  6,  6,  6,  6,  6,  6,  6,    6,  6,  6,  6,  6,  6,  6,  6,
-};
-static const struct byte_lookup* const
-to_ISO_8859_14_infos[7] = {
-                  NOMAP, &to_ISO_8859_14_C2,
-     &to_ISO_8859_14_C3, &to_ISO_8859_14_C4,
-     &to_ISO_8859_14_C5, &to_ISO_8859_14_E1,
-                  UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_14 = {
-    to_ISO_8859_14_offsets,
-    to_ISO_8859_14_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_14 = {
-    "UTF-8", "ISO-8859-14", &to_ISO_8859_14, 1, 1,
-    NULL, NULL,
-};
-
-static const struct byte_lookup* const
-from_ISO_8859_15_infos[129] = {
-                  NOMAP,      o2(0xC2,0x80),
-          o2(0xC2,0x81),      o2(0xC2,0x82),
-          o2(0xC2,0x83),      o2(0xC2,0x84),
-          o2(0xC2,0x85),      o2(0xC2,0x86),
-          o2(0xC2,0x87),      o2(0xC2,0x88),
-          o2(0xC2,0x89),      o2(0xC2,0x8A),
-          o2(0xC2,0x8B),      o2(0xC2,0x8C),
-          o2(0xC2,0x8D),      o2(0xC2,0x8E),
-          o2(0xC2,0x8F),      o2(0xC2,0x90),
-          o2(0xC2,0x91),      o2(0xC2,0x92),
-          o2(0xC2,0x93),      o2(0xC2,0x94),
-          o2(0xC2,0x95),      o2(0xC2,0x96),
-          o2(0xC2,0x97),      o2(0xC2,0x98),
-          o2(0xC2,0x99),      o2(0xC2,0x9A),
-          o2(0xC2,0x9B),      o2(0xC2,0x9C),
-          o2(0xC2,0x9D),      o2(0xC2,0x9E),
-          o2(0xC2,0x9F),      o2(0xC2,0xA0),
-          o2(0xC2,0xA1),      o2(0xC2,0xA2),
-          o2(0xC2,0xA3), o3(0xE2,0x82,0xAC),
-          o2(0xC2,0xA5),      o2(0xC5,0xA0),
-          o2(0xC2,0xA7),      o2(0xC5,0xA1),
-          o2(0xC2,0xA9),      o2(0xC2,0xAA),
-          o2(0xC2,0xAB),      o2(0xC2,0xAC),
-          o2(0xC2,0xAD),      o2(0xC2,0xAE),
-          o2(0xC2,0xAF),      o2(0xC2,0xB0),
-          o2(0xC2,0xB1),      o2(0xC2,0xB2),
-          o2(0xC2,0xB3),      o2(0xC5,0xBD),
-          o2(0xC2,0xB5),      o2(0xC2,0xB6),
-          o2(0xC2,0xB7),      o2(0xC5,0xBE),
-          o2(0xC2,0xB9),      o2(0xC2,0xBA),
-          o2(0xC2,0xBB),      o2(0xC5,0x92),
-          o2(0xC5,0x93),      o2(0xC5,0xB8),
-          o2(0xC2,0xBF),      o2(0xC3,0x80),
-          o2(0xC3,0x81),      o2(0xC3,0x82),
-          o2(0xC3,0x83),      o2(0xC3,0x84),
-          o2(0xC3,0x85),      o2(0xC3,0x86),
-          o2(0xC3,0x87),      o2(0xC3,0x88),
-          o2(0xC3,0x89),      o2(0xC3,0x8A),
-          o2(0xC3,0x8B),      o2(0xC3,0x8C),
-          o2(0xC3,0x8D),      o2(0xC3,0x8E),
-          o2(0xC3,0x8F),      o2(0xC3,0x90),
-          o2(0xC3,0x91),      o2(0xC3,0x92),
-          o2(0xC3,0x93),      o2(0xC3,0x94),
-          o2(0xC3,0x95),      o2(0xC3,0x96),
-          o2(0xC3,0x97),      o2(0xC3,0x98),
-          o2(0xC3,0x99),      o2(0xC3,0x9A),
-          o2(0xC3,0x9B),      o2(0xC3,0x9C),
-          o2(0xC3,0x9D),      o2(0xC3,0x9E),
-          o2(0xC3,0x9F),      o2(0xC3,0xA0),
-          o2(0xC3,0xA1),      o2(0xC3,0xA2),
-          o2(0xC3,0xA3),      o2(0xC3,0xA4),
-          o2(0xC3,0xA5),      o2(0xC3,0xA6),
-          o2(0xC3,0xA7),      o2(0xC3,0xA8),
-          o2(0xC3,0xA9),      o2(0xC3,0xAA),
-          o2(0xC3,0xAB),      o2(0xC3,0xAC),
-          o2(0xC3,0xAD),      o2(0xC3,0xAE),
-          o2(0xC3,0xAF),      o2(0xC3,0xB0),
-          o2(0xC3,0xB1),      o2(0xC3,0xB2),
-          o2(0xC3,0xB3),      o2(0xC3,0xB4),
-          o2(0xC3,0xB5),      o2(0xC3,0xB6),
-          o2(0xC3,0xB7),      o2(0xC3,0xB8),
-          o2(0xC3,0xB9),      o2(0xC3,0xBA),
-          o2(0xC3,0xBB),      o2(0xC3,0xBC),
-          o2(0xC3,0xBD),      o2(0xC3,0xBE),
-          o2(0xC3,0xBF),
-};
-static const BYTE_LOOKUP
-from_ISO_8859_15 = {
-    from_ISO_8859_1_offsets,
-    from_ISO_8859_15_infos
-};
-
-static const rb_transcoder
-rb_from_ISO_8859_15 = {
-    "ISO-8859-15", "UTF-8", &from_ISO_8859_15, 3, 0,
-    NULL, NULL,
-};
-
-static const unsigned char
-to_ISO_8859_15_C2_offsets[64] = {
-      0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15,
-     16, 17, 18, 19, 20, 21, 22, 23,   24, 25, 26, 27, 28, 29, 30, 31,
-     32, 33, 34, 35, 56, 36, 56, 37,   56, 38, 39, 40, 41, 42, 43, 44,
-     45, 46, 47, 48, 56, 49, 50, 51,   56, 52, 53, 54, 56, 56, 56, 55,
-};
-static const struct byte_lookup* const
-to_ISO_8859_15_C2_infos[57] = {
-     o1(0x80), o1(0x81), o1(0x82), o1(0x83),
-     o1(0x84), o1(0x85), o1(0x86), o1(0x87),
-     o1(0x88), o1(0x89), o1(0x8A), o1(0x8B),
-     o1(0x8C), o1(0x8D), o1(0x8E), o1(0x8F),
-     o1(0x90), o1(0x91), o1(0x92), o1(0x93),
-     o1(0x94), o1(0x95), o1(0x96), o1(0x97),
-     o1(0x98), o1(0x99), o1(0x9A), o1(0x9B),
-     o1(0x9C), o1(0x9D), o1(0x9E), o1(0x9F),
-     o1(0xA0), o1(0xA1), o1(0xA2), o1(0xA3),
-     o1(0xA5), o1(0xA7), o1(0xA9), o1(0xAA),
-     o1(0xAB), o1(0xAC), o1(0xAD), o1(0xAE),
-     o1(0xAF), o1(0xB0), o1(0xB1), o1(0xB2),
-     o1(0xB3), o1(0xB5), o1(0xB6), o1(0xB7),
-     o1(0xB9), o1(0xBA), o1(0xBB), o1(0xBF),
-        UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_15_C2 = {
-    to_ISO_8859_15_C2_offsets,
-    to_ISO_8859_15_C2_infos
-};
-
-static const unsigned char
-to_ISO_8859_15_C5_offsets[64] = {
-      7,  7,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  0,  1,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      2,  3,  7,  7,  7,  7,  7,  7,    7,  7,  7,  7,  7,  7,  7,  7,
-      7,  7,  7,  7,  7,  7,  7,  7,    4,  7,  7,  7,  7,  5,  6,  7,
-};
-static const struct byte_lookup* const
-to_ISO_8859_15_C5_infos[8] = {
-     o1(0xBC), o1(0xBD), o1(0xA6), o1(0xA8),
-     o1(0xBE), o1(0xB4), o1(0xB8),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_15_C5 = {
-    to_ISO_8859_15_C5_offsets,
-    to_ISO_8859_15_C5_infos
-};
-
-static const unsigned char
-to_ISO_8859_15_E2_82_offsets[64] = {
-      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,  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,
-};
-static const struct byte_lookup* const
-to_ISO_8859_15_E2_82_infos[2] = {
-     o1(0xA4),    UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_15_E2_82 = {
-    to_ISO_8859_15_E2_82_offsets,
-    to_ISO_8859_15_E2_82_infos
-};
-
-static const unsigned char
-to_ISO_8859_15_E2_offsets[64] = {
-      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,  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,
-};
-static const struct byte_lookup* const
-to_ISO_8859_15_E2_infos[2] = {
-     &to_ISO_8859_15_E2_82,                 UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_15_E2 = {
-    to_ISO_8859_15_E2_offsets,
-    to_ISO_8859_15_E2_infos
-};
-
-static const unsigned char
-to_ISO_8859_15_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  1,  2,  5,  3,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  4,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-      5,  5,  5,  5,  5,  5,  5,  5,    5,  5,  5,  5,  5,  5,  5,  5,
-};
-static const struct byte_lookup* const
-to_ISO_8859_15_infos[6] = {
-                  NOMAP, &to_ISO_8859_15_C2,
-      &to_ISO_8859_1_C3, &to_ISO_8859_15_C5,
-     &to_ISO_8859_15_E2,              UNDEF,
-};
-static const BYTE_LOOKUP
-to_ISO_8859_15 = {
-    to_ISO_8859_15_offsets,
-    to_ISO_8859_15_infos
-};
-
-static const rb_transcoder
-rb_to_ISO_8859_15 = {
-    "UTF-8", "ISO-8859-15", &to_ISO_8859_15, 1, 1,
-    NULL, NULL,
-};
-
-void
-Init_single_byte(void)
-{
-    rb_register_transcoder(&rb_from_US_ASCII);
-    rb_register_transcoder(&rb_to_US_ASCII);
-    rb_register_transcoder(&rb_from_ASCII_8BIT);
-    rb_register_transcoder(&rb_to_ASCII_8BIT);
-    rb_register_transcoder(&rb_from_ISO_8859_1);
-    rb_register_transcoder(&rb_to_ISO_8859_1);
-    rb_register_transcoder(&rb_from_ISO_8859_2);
-    rb_register_transcoder(&rb_to_ISO_8859_2);
-    rb_register_transcoder(&rb_from_ISO_8859_3);
-    rb_register_transcoder(&rb_to_ISO_8859_3);
-    rb_register_transcoder(&rb_from_ISO_8859_4);
-    rb_register_transcoder(&rb_to_ISO_8859_4);
-    rb_register_transcoder(&rb_from_ISO_8859_5);
-    rb_register_transcoder(&rb_to_ISO_8859_5);
-    rb_register_transcoder(&rb_from_ISO_8859_6);
-    rb_register_transcoder(&rb_to_ISO_8859_6);
-    rb_register_transcoder(&rb_from_ISO_8859_7);
-    rb_register_transcoder(&rb_to_ISO_8859_7);
-    rb_register_transcoder(&rb_from_ISO_8859_8);
-    rb_register_transcoder(&rb_to_ISO_8859_8);
-    rb_register_transcoder(&rb_from_ISO_8859_9);
-    rb_register_transcoder(&rb_to_ISO_8859_9);
-    rb_register_transcoder(&rb_from_ISO_8859_10);
-    rb_register_transcoder(&rb_to_ISO_8859_10);
-    rb_register_transcoder(&rb_from_ISO_8859_11);
-    rb_register_transcoder(&rb_to_ISO_8859_11);
-    rb_register_transcoder(&rb_from_ISO_8859_13);
-    rb_register_transcoder(&rb_to_ISO_8859_13);
-    rb_register_transcoder(&rb_from_ISO_8859_14);
-    rb_register_transcoder(&rb_to_ISO_8859_14);
-    rb_register_transcoder(&rb_from_ISO_8859_15);
-    rb_register_transcoder(&rb_to_ISO_8859_15);
-}
-/* Footprint (bytes): gross: 27876, saved: 4544, net: 23332 */
diff --git a/enc/trans/transdb.c b/enc/trans/transdb.c
deleted file mode 100644
index d6ac41e967..0000000000
--- a/enc/trans/transdb.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/**********************************************************************
-
-  enc/trans/transdb.c -
-
-  $Author$
-  created at: Mon Apr  7 15:51:31 2008
-
-  Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib);
-
-void
-Init_transdb(void)
-{
-#include "transdb.h"
-}
diff --git a/enc/trans/utf_16_32.c b/enc/trans/utf_16_32.c
deleted file mode 100644
index 562e12fbfe..0000000000
--- a/enc/trans/utf_16_32.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/* Autogenerated, do not change */
-/* Report bugs to Martin Duerst (duerst@it.aoyama.ac.jp) */
-
-#include "transcode_data.h"
-
-static int
-fun_so_from_utf_16be(const unsigned char* s, unsigned char* o)
-{
-    if (!s[0] && s[1]<0x80) {
-        o[0] = s[1];
-        return 1;
-    }
-    else if (s[0]<0x08) {
-        o[0] = 0xC0 | (s[0]<<2) | (s[1]>>6);
-        o[1] = 0x80 | (s[1]&0x3F);
-        return 2;
-    }
-    else if ((s[0]&0xF8)!=0xD8) {
-        o[0] = 0xE0 | (s[0]>>4);
-        o[1] = 0x80 | ((s[0]&0x0F)<<2) | (s[1]>>6);
-        o[2] = 0x80 | (s[1]&0x3F);
-        return 3;
-    }
-    else {
-        unsigned int u = (((s[0]&0x03)<<2)|(s[1]>>6)) + 1;
-        o[0] = 0xF0 | (u>>2);
-        o[1] = 0x80 | ((u&0x03)<<4) | ((s[1]>>2)&0x0F);
-        o[2] = 0x80 | ((s[1]&0x03)<<4) | ((s[2]&0x03)<<2) | (s[3]>>6);
-        o[3] = 0x80 | (s[3]&0x3F);
-        return 4;
-    }
-}
-
-static int
-fun_so_to_utf_16be(const unsigned char* s, unsigned char* o)
-{
-    if (!(s[0]&0x80)) {
-        o[0] = 0x00;
-        o[1] = s[0];
-        return 2;
-    }
-    else if ((s[0]&0xE0)==0xC0) {
-        o[0] = (s[0]>>2)&0x07;
-        o[1] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
-        return 2;
-    }
-    else if ((s[0]&0xF0)==0xE0) {
-        o[0] = (s[0]<<4) | ((s[1]>>2)^0x20);
-        o[1] = (s[1]<<6) | (s[2]^0x80);
-        return 2;
-    }
-    else {
-        int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
-        o[0] = 0xD8 | (w>>2);
-        o[1] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
-        o[2] = 0xDC | ((s[2]>>2)&0x03);
-        o[3] = (s[2]<<6) | (s[3]&~0x80);
-        return 4;
-    }
-}
-
-static int
-fun_so_from_utf_16le(const unsigned char* s, unsigned char* o)
-{
-    if (!s[1] && s[0]<0x80) {
-        o[0] = s[0];
-        return 1;
-    }
-    else if (s[1]<0x08) {
-        o[0] = 0xC0 | (s[1]<<2) | (s[0]>>6);
-        o[1] = 0x80 | (s[0]&0x3F);
-        return 2;
-    }
-    else if ((s[1]&0xF8)!=0xD8) {
-        o[0] = 0xE0 | (s[1]>>4);
-        o[1] = 0x80 | ((s[1]&0x0F)<<2) | (s[0]>>6);
-        o[2] = 0x80 | (s[0]&0x3F);
-        return 3;
-    }
-    else {
-        unsigned int u = (((s[1]&0x03)<<2)|(s[0]>>6)) + 1;
-        o[0] = 0xF0 | u>>2;
-        o[1] = 0x80 | ((u&0x03)<<4) | ((s[0]>>2)&0x0F);
-        o[2] = 0x80 | ((s[0]&0x03)<<4) | ((s[3]&0x03)<<2) | (s[2]>>6);
-        o[3] = 0x80 | (s[2]&0x3F);
-        return 4;
-    }
-}
-
-static int
-fun_so_to_utf_16le(const unsigned char* s, unsigned char* o)
-{
-    if (!(s[0]&0x80)) {
-        o[1] = 0x00;
-        o[0] = s[0];
-        return 2;
-    }
-    else if ((s[0]&0xE0)==0xC0) {
-        o[1] = (s[0]>>2)&0x07;
-        o[0] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
-        return 2;
-    }
-    else if ((s[0]&0xF0)==0xE0) {
-        o[1] = (s[0]<<4) | ((s[1]>>2)^0x20);
-        o[0] = (s[1]<<6) | (s[2]^0x80);
-        return 2;
-    }
-    else {
-        int w = (((s[0]&0x07)<<2) | ((s[1]>>4)&0x03)) - 1;
-        o[1] = 0xD8 | (w>>2);
-        o[0] = (w<<6) | ((s[1]&0x0F)<<2) | ((s[2]>>4)-8);
-        o[3] = 0xDC | ((s[2]>>2)&0x03);
-        o[2] = (s[2]<<6) | (s[3]&~0x80);
-        return 4;
-    }
-}
-
-static int
-fun_so_from_utf_32be(const unsigned char* s, unsigned char* o)
-{
-    if (!s[1]) {
-        if (s[2]==0 && s[3]<0x80) {
-            o[0] = s[3];
-            return 1;
-        }
-        else if (s[2]<0x08) {
-            o[0] = 0xC0 | (s[2]<<2) | (s[3]>>6);
-            o[1] = 0x80 | (s[3]&0x3F);
-            return 2;
-        }
-        else {
-            o[0] = 0xE0 | (s[2]>>4);
-            o[1] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
-            o[2] = 0x80 | (s[3]&0x3F);
-            return 3;
-        }
-    }
-    else {
-        o[0] = 0xF0 | (s[1]>>2);
-        o[1] = 0x80 | ((s[1]&0x03)<<4) | (s[2]>>4);
-        o[2] = 0x80 | ((s[2]&0x0F)<<2) | (s[3]>>6);
-        o[3] = 0x80 | (s[3]&0x3F);
-        return 4;
-    }
-}
-
-static int
-fun_so_to_utf_32be(const unsigned char* s, unsigned char* o)
-{
-    o[0] = 0;
-    if (!(s[0]&0x80)) {
-        o[1] = o[2] = 0x00;
-        o[3] = s[0];
-    }
-    else if ((s[0]&0xE0)==0xC0) {
-        o[1] = 0x00;
-        o[2] = (s[0]>>2)&0x07;
-        o[3] = ((s[0]&0x03)<<6) | (s[1]&0x3F);
-    }
-    else if ((s[0]&0xF0)==0xE0) {
-        o[1] = 0x00;
-        o[2] = (s[0]<<4) | ((s[1]>>2)^0x20);
-        o[3] = (s[1]<<6) | (s[2]^0x80);
-    }
-    else {
-        o[1] = ((s[0]&0x07)<<2) | ((s[1]>>4)&0x03);
-        o[2] = ((s[1]&0x0F)<<4) | ((s[2]>>2)&0x0F);
-        o[3] = ((s[2]&0x03)<<6) | (s[3]&0x3F);
-    }
-    return 4;
-}
-
-static int
-fun_so_from_utf_32le(const unsigned char* s, unsigned char* o)
-{
-    return 1;
-}
-
-static int
-fun_so_to_utf_32le(const unsigned char* s, unsigned char* o)
-{
-    return 4;
-}
-static const unsigned char
-from_UTF_16BE_00_offsets[256] = {
-  /* used by from_UTF_16BE_00 */
-  /* used by from_UTF_32BE_00_00_D8 */
-  /* used by from_UTF_32BE_00_01 */
-  /* used by from_UTF_32BE_00_11 */
-  /* used by from_UTF_16BE_D8 */
-  /* used by from_UTF_16LE */
-  /* used by from_UTF_32LE */
-  /* used by from_UTF_16LE_00_D8 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const struct byte_lookup* const
-from_UTF_16BE_00_infos[1] = {
-  /* used by from_UTF_16BE_00 */
-  /* used by to_UTF_32BE_C2 */
-     FUNso,
-};
-static const BYTE_LOOKUP
-from_UTF_16BE_00 = {
-  /* used as  from_UTF_16BE */
-  /* used as  from_UTF_32BE_00_00 */
-  /* used as  from_UTF_32BE_00_01 */
-  /* used as  from_UTF_16BE_D8_00 */
-  /* used as  from_UTF_32LE_00_00 */
-  /* used as  from_UTF_32LE_00_D8 */
-    from_UTF_16BE_00_offsets,
-    from_UTF_16BE_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_32BE_00_00_D8_infos[1] = {
-     INVALID,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE_00_00_D8 = {
-  /* used as  from_UTF_32BE_00_00 */
-  /* used as  from_UTF_32BE_00_11 */
-  /* used as  from_UTF_16BE_D8_00 */
-  /* used as  from_UTF_16BE */
-  /* used as  from_UTF_32LE_00_00 */
-  /* used as  from_UTF_32LE_00_D8 */
-    from_UTF_16BE_00_offsets,
-    from_UTF_32BE_00_00_D8_infos
-};
-
-static const unsigned char
-from_UTF_16BE_D8_00_offsets[256] = {
-  /* used by from_UTF_16BE_D8_00 */
-  /* used by from_UTF_16LE_00_D8_00 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  1,  1,  1,  1,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const struct byte_lookup* const
-from_UTF_16BE_D8_00_infos[2] = {
-  /* used by from_UTF_16BE_D8_00 */
-  /* used by from_UTF_32LE_00_D8 */
-     &from_UTF_32BE_00_00_D8,       &from_UTF_16BE_00,
-};
-static const BYTE_LOOKUP
-from_UTF_16BE_D8_00 = {
-    from_UTF_16BE_D8_00_offsets,
-    from_UTF_16BE_D8_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_16BE_D8_infos[1] = {
-     &from_UTF_16BE_D8_00,
-};
-static const BYTE_LOOKUP
-from_UTF_16BE_D8 = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_16BE_D8_infos
-};
-
-static const unsigned char
-from_UTF_16BE_offsets[256] = {
-  /* used by from_UTF_16BE */
-  /* used by from_UTF_16LE_00 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    1,  1,  1,  1,  2,  2,  2,  2,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const struct byte_lookup* const
-from_UTF_16BE_infos[3] = {
-           &from_UTF_16BE_00,       &from_UTF_16BE_D8,
-     &from_UTF_32BE_00_00_D8,
-};
-static const BYTE_LOOKUP
-from_UTF_16BE = {
-    from_UTF_16BE_offsets,
-    from_UTF_16BE_infos
-};
-
-static const rb_transcoder
-rb_from_UTF_16BE = {
-    "UTF-16BE", "UTF-8", &from_UTF_16BE, 4, 0,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_from_utf_16be
-};
-
-static const unsigned char
-to_UTF_32BE_C2_offsets[64] = {
-  /* used by to_UTF_32BE_C2 */
-  /* used by to_UTF_32BE_E1 */
-  /* used by to_UTF_32BE_F1 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_C2 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_32BE_E0 */
-  /* used as  to_UTF_16BE_E0 */
-  /* used as  to_UTF_16BE_E1 */
-  /* used as  to_UTF_32BE_E1 */
-  /* used as  to_UTF_32BE_ED */
-  /* used as  to_UTF_16BE_ED */
-  /* used as  to_UTF_16BE_F0_90 */
-  /* used as  to_UTF_32BE_F0_90 */
-  /* used as  to_UTF_16BE_F1_80 */
-  /* used as  to_UTF_32BE_F1_80 */
-  /* used as  to_UTF_32BE_F4_80 */
-  /* used as  to_UTF_16BE_F4_80 */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-  /* used as  to_UTF_16LE_E0 */
-  /* used as  to_UTF_32LE_E0 */
-  /* used as  to_UTF_32LE_E1 */
-  /* used as  to_UTF_16LE_E1 */
-  /* used as  to_UTF_32LE_ED */
-  /* used as  to_UTF_16LE_ED */
-  /* used as  to_UTF_16LE_F0_90 */
-  /* used as  to_UTF_32LE_F0_90 */
-  /* used as  to_UTF_16LE_F1_80 */
-  /* used as  to_UTF_32LE_F1_80 */
-  /* used as  to_UTF_16LE_F4_80 */
-  /* used as  to_UTF_32LE_F4_80 */
-    to_UTF_32BE_C2_offsets,
-    from_UTF_16BE_00_infos
-};
-
-static const unsigned char
-to_UTF_32BE_E0_offsets[64] = {
-  /* used by to_UTF_32BE_E0 */
-  /* used by to_UTF_32BE_ED */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  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,  1,
-};
-static const struct byte_lookup* const
-to_UTF_32BE_E0_infos[2] = {
-             INVALID, &to_UTF_32BE_C2,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_E0 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_E0_offsets,
-    to_UTF_32BE_E0_infos
-};
-
-static const struct byte_lookup* const
-to_UTF_32BE_E1_infos[1] = {
-     &to_UTF_32BE_C2,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_E1 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_32BE_F0 */
-  /* used as  to_UTF_16BE_F0 */
-  /* used as  to_UTF_16BE_F1 */
-  /* used as  to_UTF_32BE_F1 */
-  /* used as  to_UTF_16BE_F4 */
-  /* used as  to_UTF_32BE_F4 */
-  /* used as  to_UTF_32LE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_16LE_F0 */
-  /* used as  to_UTF_32LE_F0 */
-  /* used as  to_UTF_16LE_F1 */
-  /* used as  to_UTF_32LE_F1 */
-  /* used as  to_UTF_16LE_F4 */
-  /* used as  to_UTF_32LE_F4 */
-    to_UTF_32BE_C2_offsets,
-    to_UTF_32BE_E1_infos
-};
-
-static const struct byte_lookup* const
-to_UTF_32BE_ED_infos[2] = {
-     &to_UTF_32BE_C2,         INVALID,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_ED = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_E0_offsets,
-    to_UTF_32BE_ED_infos
-};
-
-static const unsigned char
-to_UTF_32BE_F0_offsets[64] = {
-  /* used by to_UTF_32BE_F0 */
-  /* used by to_UTF_32BE_F4 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  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,  1,
-      1,  1,  1,  1,  1,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-to_UTF_32BE_F0_infos[2] = {
-             INVALID, &to_UTF_32BE_E1,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_F0 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_F0_offsets,
-    to_UTF_32BE_F0_infos
-};
-
-static const struct byte_lookup* const
-to_UTF_32BE_F1_infos[1] = {
-     &to_UTF_32BE_E1,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_F1 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_C2_offsets,
-    to_UTF_32BE_F1_infos
-};
-
-static const struct byte_lookup* const
-to_UTF_32BE_F4_infos[2] = {
-     &to_UTF_32BE_E1,         INVALID,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE_F4 = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_F0_offsets,
-    to_UTF_32BE_F4_infos
-};
-
-static const unsigned char
-to_UTF_32BE_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  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,  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,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      3,  4,  4,  4,  4,  4,  4,  4,    4,  4,  4,  4,  4,  5,  4,  4,
-      6,  7,  7,  7,  8,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-to_UTF_32BE_infos[9] = {
-               FUNso,         INVALID, &to_UTF_32BE_C2, &to_UTF_32BE_E0,
-     &to_UTF_32BE_E1, &to_UTF_32BE_ED, &to_UTF_32BE_F0, &to_UTF_32BE_F1,
-     &to_UTF_32BE_F4,
-};
-static const BYTE_LOOKUP
-to_UTF_32BE = {
-  /* used as  to_UTF_32BE */
-  /* used as  to_UTF_16BE */
-  /* used as  to_UTF_16LE */
-  /* used as  to_UTF_32LE */
-    to_UTF_32BE_offsets,
-    to_UTF_32BE_infos
-};
-
-static const rb_transcoder
-rb_to_UTF_16BE = {
-    "UTF-8", "UTF-16BE", &to_UTF_32BE, 4, 1,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_to_utf_16be
-};
-
-static const struct byte_lookup* const
-from_UTF_16LE_00_D8_00_infos[2] = {
-     INVALID,   FUNso,
-};
-static const BYTE_LOOKUP
-from_UTF_16LE_00_D8_00 = {
-    from_UTF_16BE_D8_00_offsets,
-    from_UTF_16LE_00_D8_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_16LE_00_D8_infos[1] = {
-     &from_UTF_16LE_00_D8_00,
-};
-static const BYTE_LOOKUP
-from_UTF_16LE_00_D8 = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_16LE_00_D8_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_16LE_00_infos[3] = {
-                    FUNso, &from_UTF_16LE_00_D8,
-                  INVALID,
-};
-static const BYTE_LOOKUP
-from_UTF_16LE_00 = {
-    from_UTF_16BE_offsets,
-    from_UTF_16LE_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_16LE_infos[1] = {
-     &from_UTF_16LE_00,
-};
-static const BYTE_LOOKUP
-from_UTF_16LE = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_16LE_infos
-};
-
-static const rb_transcoder
-rb_from_UTF_16LE = {
-    "UTF-16LE", "UTF-8", &from_UTF_16LE, 4, 0,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_from_utf_16le
-};
-
-static const rb_transcoder
-rb_to_UTF_16LE = {
-    "UTF-8", "UTF-16LE", &to_UTF_32BE, 4, 1,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_to_utf_16le
-};
-
-static const unsigned char
-from_UTF_32BE_00_00_offsets[256] = {
-  /* used by from_UTF_32BE_00_00 */
-  /* used by from_UTF_32LE_00 */
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    1,  1,  1,  1,  1,  1,  1,  1,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const struct byte_lookup* const
-from_UTF_32BE_00_00_infos[2] = {
-  /* used by from_UTF_32BE_00_00 */
-  /* used by from_UTF_32LE_00_00 */
-           &from_UTF_16BE_00, &from_UTF_32BE_00_00_D8,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE_00_00 = {
-    from_UTF_32BE_00_00_offsets,
-    from_UTF_32BE_00_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_32BE_00_01_infos[1] = {
-     &from_UTF_16BE_00,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE_00_01 = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_32BE_00_01_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_32BE_00_11_infos[1] = {
-     &from_UTF_32BE_00_00_D8,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE_00_11 = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_32BE_00_11_infos
-};
-
-static const unsigned char
-from_UTF_32BE_00_offsets[256] = {
-      0,  1,  1,  1,  1,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-      1,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-      2,  2,  2,  2,  2,  2,  2,  2,    2,  2,  2,  2,  2,  2,  2,  2,
-};
-static const struct byte_lookup* const
-from_UTF_32BE_00_infos[3] = {
-     &from_UTF_32BE_00_00, &from_UTF_32BE_00_01,
-     &from_UTF_32BE_00_11,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE_00 = {
-    from_UTF_32BE_00_offsets,
-    from_UTF_32BE_00_infos
-};
-
-static const unsigned char
-from_UTF_32BE_offsets[256] = {
-      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,
-      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,  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,    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,  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,
-      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,  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,    1,  1,  1,  1,  1,  1,  1,  1,
-};
-static const struct byte_lookup* const
-from_UTF_32BE_infos[2] = {
-     &from_UTF_32BE_00,           INVALID,
-};
-static const BYTE_LOOKUP
-from_UTF_32BE = {
-    from_UTF_32BE_offsets,
-    from_UTF_32BE_infos
-};
-
-static const rb_transcoder
-rb_from_UTF_32BE = {
-    "UTF-32BE", "UTF-8", &from_UTF_32BE, 4, 0,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_from_utf_32be
-};
-
-static const rb_transcoder
-rb_to_UTF_32BE = {
-    "UTF-8", "UTF-32BE", &to_UTF_32BE, 4, 1,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_to_utf_32be
-};
-
-static const unsigned char
-from_UTF_32LE_00_00_offsets[256] = {
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      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,
-      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,  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,    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,  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,
-      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,  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,
-};
-static const BYTE_LOOKUP
-from_UTF_32LE_00_00 = {
-    from_UTF_32LE_00_00_offsets,
-    from_UTF_32BE_00_00_infos
-};
-
-static const unsigned char
-from_UTF_32LE_00_D8_offsets[256] = {
-      0,  1,  1,  1,  1,  1,  1,  1,    1,  1,  1,  1,  1,  1,  1,  1,
-      1,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-      0,  0,  0,  0,  0,  0,  0,  0,    0,  0,  0,  0,  0,  0,  0,  0,
-};
-static const BYTE_LOOKUP
-from_UTF_32LE_00_D8 = {
-    from_UTF_32LE_00_D8_offsets,
-    from_UTF_16BE_D8_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_32LE_00_infos[2] = {
-     &from_UTF_32LE_00_00, &from_UTF_32LE_00_D8,
-};
-static const BYTE_LOOKUP
-from_UTF_32LE_00 = {
-    from_UTF_32BE_00_00_offsets,
-    from_UTF_32LE_00_infos
-};
-
-static const struct byte_lookup* const
-from_UTF_32LE_infos[1] = {
-     &from_UTF_32LE_00,
-};
-static const BYTE_LOOKUP
-from_UTF_32LE = {
-    from_UTF_16BE_00_offsets,
-    from_UTF_32LE_infos
-};
-
-static const rb_transcoder
-rb_from_UTF_32LE = {
-    "UTF-32LE", "UTF-8", &from_UTF_32LE, 4, 0,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_from_utf_32le
-};
-
-static const rb_transcoder
-rb_to_UTF_32LE = {
-    "UTF-8", "UTF-32LE", &to_UTF_32BE, 4, 1,
-    NULL, NULL, NULL, NULL, NULL, &fun_so_to_utf_32le
-};
-
-void
-Init_utf_16_32(void)
-{
-    rb_register_transcoder(&rb_from_UTF_16BE);
-    rb_register_transcoder(&rb_to_UTF_16BE);
-    rb_register_transcoder(&rb_from_UTF_16LE);
-    rb_register_transcoder(&rb_to_UTF_16LE);
-    rb_register_transcoder(&rb_from_UTF_32BE);
-    rb_register_transcoder(&rb_to_UTF_32BE);
-    rb_register_transcoder(&rb_from_UTF_32LE);
-    rb_register_transcoder(&rb_to_UTF_32LE);
-}
-/* Footprint (bytes): gross: 13684, saved: 10796, net: 2888 */
diff --git a/enc/unicode.c b/enc/unicode.c
deleted file mode 100644
index 2dfcbba3f6..0000000000
--- a/enc/unicode.c
+++ /dev/null
@@ -1,11359 +0,0 @@
-/**********************************************************************
-  unicode.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regint.h"
-
-#define ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code,ctype) \
-  ((EncUNICODE_ISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-#if 0
-#define ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(code,cbit) \
-  ((EncUNICODE_ISO_8859_1_CtypeTable[code] & (cbit)) != 0)
-#endif
-
-static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x428c, 0x4289, 0x4288, 0x4288, 0x4288, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0288, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0284, 0x01a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x30e2, 0x01a0, 0x00a0, 0x00a8, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 0x00a0, 0x01a0,
-  0x00a0, 0x10a0, 0x30e2, 0x01a0, 0x10a0, 0x10a0, 0x10a0, 0x01a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-/* 'NEWLINE' */
-static const OnigCodePoint CR_NEWLINE[] = {
-  1,
-  0x000a, 0x000a
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-  418,
-  0x0041, 0x005a,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b5, 0x00b5,
-  0x00ba, 0x00ba,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00f6,
-  0x00f8, 0x0241,
-  0x0250, 0x02c1,
-  0x02c6, 0x02d1,
-  0x02e0, 0x02e4,
-  0x02ee, 0x02ee,
-  0x0300, 0x036f,
-  0x037a, 0x037a,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x03f5,
-  0x03f7, 0x0481,
-  0x0483, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x0559,
-  0x0561, 0x0587,
-  0x0591, 0x05b9,
-  0x05bb, 0x05bd,
-  0x05bf, 0x05bf,
-  0x05c1, 0x05c2,
-  0x05c4, 0x05c5,
-  0x05c7, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f2,
-  0x0610, 0x0615,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x066e, 0x06d3,
-  0x06d5, 0x06dc,
-  0x06de, 0x06e8,
-  0x06ea, 0x06ef,
-  0x06fa, 0x06fc,
-  0x06ff, 0x06ff,
-  0x0710, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0963,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09f0, 0x09f1,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a70, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b71, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df3,
-  0x0e01, 0x0e3a,
-  0x0e40, 0x0e4e,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f00,
-  0x0f18, 0x0f19,
-  0x0f35, 0x0f35,
-  0x0f37, 0x0f37,
-  0x0f39, 0x0f39,
-  0x0f3e, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f84,
-  0x0f86, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fc6, 0x0fc6,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1050, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fa,
-  0x10fc, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x135f,
-  0x1380, 0x138f,
-  0x13a0, 0x13f4,
-  0x1401, 0x166c,
-  0x166f, 0x1676,
-  0x1681, 0x169a,
-  0x16a0, 0x16ea,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1734,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17b3,
-  0x17b6, 0x17d3,
-  0x17d7, 0x17d7,
-  0x17dc, 0x17dd,
-  0x180b, 0x180d,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1950, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x1a00, 0x1a1b,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fbc,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fcc,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fe0, 0x1fec,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffc,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x2090, 0x2094,
-  0x20d0, 0x20eb,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210a, 0x2113,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x212f, 0x2131,
-  0x2133, 0x2139,
-  0x213c, 0x213f,
-  0x2145, 0x2149,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2ce4,
-  0x2d00, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x3005, 0x3006,
-  0x302a, 0x302f,
-  0x3031, 0x3035,
-  0x303b, 0x303c,
-  0x3041, 0x3096,
-  0x3099, 0x309a,
-  0x309d, 0x309f,
-  0x30a1, 0x30fa,
-  0x30fc, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x31a0, 0x31b7,
-  0x31f0, 0x31ff,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa800, 0xa827,
-  0xac00, 0xd7a3,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb28,
-  0xfb2a, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfb,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xff21, 0xff3a,
-  0xff41, 0xff5a,
-  0xff66, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10300, 0x1031e,
-  0x10330, 0x10349,
-  0x10380, 0x1039d,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103cf,
-  0x10400, 0x1049d,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a3f,
-  0x1d165, 0x1d169,
-  0x1d16d, 0x1d172,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0x1d242, 0x1d244,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d6c0,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6fa,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d734,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d76e,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d7a8,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0100, 0xe01ef
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-  9,
-  0x0009, 0x0009,
-  0x0020, 0x0020,
-  0x00a0, 0x00a0,
-  0x1680, 0x1680,
-  0x180e, 0x180e,
-  0x2000, 0x200a,
-  0x202f, 0x202f,
-  0x205f, 0x205f,
-  0x3000, 0x3000
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
-  19,
-  0x0000, 0x001f,
-  0x007f, 0x009f,
-  0x00ad, 0x00ad,
-  0x0600, 0x0603,
-  0x06dd, 0x06dd,
-  0x070f, 0x070f,
-  0x17b4, 0x17b5,
-  0x200b, 0x200f,
-  0x202a, 0x202e,
-  0x2060, 0x2063,
-  0x206a, 0x206f,
-  0xd800, 0xf8ff,
-  0xfeff, 0xfeff,
-  0xfff9, 0xfffb,
-  0x1d173, 0x1d17a,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-  23,
-  0x0030, 0x0039,
-  0x0660, 0x0669,
-  0x06f0, 0x06f9,
-  0x0966, 0x096f,
-  0x09e6, 0x09ef,
-  0x0a66, 0x0a6f,
-  0x0ae6, 0x0aef,
-  0x0b66, 0x0b6f,
-  0x0be6, 0x0bef,
-  0x0c66, 0x0c6f,
-  0x0ce6, 0x0cef,
-  0x0d66, 0x0d6f,
-  0x0e50, 0x0e59,
-  0x0ed0, 0x0ed9,
-  0x0f20, 0x0f29,
-  0x1040, 0x1049,
-  0x17e0, 0x17e9,
-  0x1810, 0x1819,
-  0x1946, 0x194f,
-  0x19d0, 0x19d9,
-  0xff10, 0xff19,
-  0x104a0, 0x104a9,
-  0x1d7ce, 0x1d7ff
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-  424,
-  0x0021, 0x007e,
-  0x00a1, 0x0241,
-  0x0250, 0x036f,
-  0x0374, 0x0375,
-  0x037a, 0x037a,
-  0x037e, 0x037e,
-  0x0384, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x055f,
-  0x0561, 0x0587,
-  0x0589, 0x058a,
-  0x0591, 0x05b9,
-  0x05bb, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f4,
-  0x0600, 0x0603,
-  0x060b, 0x0615,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x0660, 0x070d,
-  0x070f, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0970,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09fa,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0af1, 0x0af1,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bfa,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df4,
-  0x0e01, 0x0e3a,
-  0x0e3f, 0x0e5b,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fbe, 0x0fcc,
-  0x0fcf, 0x0fd1,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x137c,
-  0x1380, 0x1399,
-  0x13a0, 0x13f4,
-  0x1401, 0x1676,
-  0x1681, 0x169c,
-  0x16a0, 0x16f0,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1736,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17dd,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x1800, 0x180d,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1940, 0x1940,
-  0x1944, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x19de, 0x1a1b,
-  0x1a1e, 0x1a1f,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fc4,
-  0x1fc6, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fdd, 0x1fef,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffe,
-  0x200b, 0x2027,
-  0x202a, 0x202e,
-  0x2030, 0x205e,
-  0x2060, 0x2063,
-  0x206a, 0x2071,
-  0x2074, 0x208e,
-  0x2090, 0x2094,
-  0x20a0, 0x20b5,
-  0x20d0, 0x20eb,
-  0x2100, 0x214c,
-  0x2153, 0x2183,
-  0x2190, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x2460, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x27c0, 0x27c6,
-  0x27d0, 0x27eb,
-  0x27f0, 0x2b13,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2cea,
-  0x2cf9, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x2ff0, 0x2ffb,
-  0x3001, 0x303f,
-  0x3041, 0x3096,
-  0x3099, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x3190, 0x31b7,
-  0x31c0, 0x31cf,
-  0x31f0, 0x321e,
-  0x3220, 0x3243,
-  0x3250, 0x32fe,
-  0x3300, 0x4db5,
-  0x4dc0, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa490, 0xa4c6,
-  0xa700, 0xa716,
-  0xa800, 0xa82b,
-  0xac00, 0xd7a3,
-  0xe000, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3f,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfd,
-  0xfe00, 0xfe19,
-  0xfe20, 0xfe23,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe66,
-  0xfe68, 0xfe6b,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xfeff, 0xfeff,
-  0xff01, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0xffe0, 0xffe6,
-  0xffe8, 0xffee,
-  0xfff9, 0xfffd,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10100, 0x10102,
-  0x10107, 0x10133,
-  0x10137, 0x1018a,
-  0x10300, 0x1031e,
-  0x10320, 0x10323,
-  0x10330, 0x1034a,
-  0x10380, 0x1039d,
-  0x1039f, 0x103c3,
-  0x103c8, 0x103d5,
-  0x10400, 0x1049d,
-  0x104a0, 0x104a9,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a47,
-  0x10a50, 0x10a58,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d1dd,
-  0x1d200, 0x1d245,
-  0x1d300, 0x1d356,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f,
-  0xe0100, 0xe01ef,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-  480,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b5, 0x00b5,
-  0x00ba, 0x00ba,
-  0x00df, 0x00f6,
-  0x00f8, 0x00ff,
-  0x0101, 0x0101,
-  0x0103, 0x0103,
-  0x0105, 0x0105,
-  0x0107, 0x0107,
-  0x0109, 0x0109,
-  0x010b, 0x010b,
-  0x010d, 0x010d,
-  0x010f, 0x010f,
-  0x0111, 0x0111,
-  0x0113, 0x0113,
-  0x0115, 0x0115,
-  0x0117, 0x0117,
-  0x0119, 0x0119,
-  0x011b, 0x011b,
-  0x011d, 0x011d,
-  0x011f, 0x011f,
-  0x0121, 0x0121,
-  0x0123, 0x0123,
-  0x0125, 0x0125,
-  0x0127, 0x0127,
-  0x0129, 0x0129,
-  0x012b, 0x012b,
-  0x012d, 0x012d,
-  0x012f, 0x012f,
-  0x0131, 0x0131,
-  0x0133, 0x0133,
-  0x0135, 0x0135,
-  0x0137, 0x0138,
-  0x013a, 0x013a,
-  0x013c, 0x013c,
-  0x013e, 0x013e,
-  0x0140, 0x0140,
-  0x0142, 0x0142,
-  0x0144, 0x0144,
-  0x0146, 0x0146,
-  0x0148, 0x0149,
-  0x014b, 0x014b,
-  0x014d, 0x014d,
-  0x014f, 0x014f,
-  0x0151, 0x0151,
-  0x0153, 0x0153,
-  0x0155, 0x0155,
-  0x0157, 0x0157,
-  0x0159, 0x0159,
-  0x015b, 0x015b,
-  0x015d, 0x015d,
-  0x015f, 0x015f,
-  0x0161, 0x0161,
-  0x0163, 0x0163,
-  0x0165, 0x0165,
-  0x0167, 0x0167,
-  0x0169, 0x0169,
-  0x016b, 0x016b,
-  0x016d, 0x016d,
-  0x016f, 0x016f,
-  0x0171, 0x0171,
-  0x0173, 0x0173,
-  0x0175, 0x0175,
-  0x0177, 0x0177,
-  0x017a, 0x017a,
-  0x017c, 0x017c,
-  0x017e, 0x0180,
-  0x0183, 0x0183,
-  0x0185, 0x0185,
-  0x0188, 0x0188,
-  0x018c, 0x018d,
-  0x0192, 0x0192,
-  0x0195, 0x0195,
-  0x0199, 0x019b,
-  0x019e, 0x019e,
-  0x01a1, 0x01a1,
-  0x01a3, 0x01a3,
-  0x01a5, 0x01a5,
-  0x01a8, 0x01a8,
-  0x01aa, 0x01ab,
-  0x01ad, 0x01ad,
-  0x01b0, 0x01b0,
-  0x01b4, 0x01b4,
-  0x01b6, 0x01b6,
-  0x01b9, 0x01ba,
-  0x01bd, 0x01bf,
-  0x01c6, 0x01c6,
-  0x01c9, 0x01c9,
-  0x01cc, 0x01cc,
-  0x01ce, 0x01ce,
-  0x01d0, 0x01d0,
-  0x01d2, 0x01d2,
-  0x01d4, 0x01d4,
-  0x01d6, 0x01d6,
-  0x01d8, 0x01d8,
-  0x01da, 0x01da,
-  0x01dc, 0x01dd,
-  0x01df, 0x01df,
-  0x01e1, 0x01e1,
-  0x01e3, 0x01e3,
-  0x01e5, 0x01e5,
-  0x01e7, 0x01e7,
-  0x01e9, 0x01e9,
-  0x01eb, 0x01eb,
-  0x01ed, 0x01ed,
-  0x01ef, 0x01f0,
-  0x01f3, 0x01f3,
-  0x01f5, 0x01f5,
-  0x01f9, 0x01f9,
-  0x01fb, 0x01fb,
-  0x01fd, 0x01fd,
-  0x01ff, 0x01ff,
-  0x0201, 0x0201,
-  0x0203, 0x0203,
-  0x0205, 0x0205,
-  0x0207, 0x0207,
-  0x0209, 0x0209,
-  0x020b, 0x020b,
-  0x020d, 0x020d,
-  0x020f, 0x020f,
-  0x0211, 0x0211,
-  0x0213, 0x0213,
-  0x0215, 0x0215,
-  0x0217, 0x0217,
-  0x0219, 0x0219,
-  0x021b, 0x021b,
-  0x021d, 0x021d,
-  0x021f, 0x021f,
-  0x0221, 0x0221,
-  0x0223, 0x0223,
-  0x0225, 0x0225,
-  0x0227, 0x0227,
-  0x0229, 0x0229,
-  0x022b, 0x022b,
-  0x022d, 0x022d,
-  0x022f, 0x022f,
-  0x0231, 0x0231,
-  0x0233, 0x0239,
-  0x023c, 0x023c,
-  0x023f, 0x0240,
-  0x0250, 0x02af,
-  0x0390, 0x0390,
-  0x03ac, 0x03ce,
-  0x03d0, 0x03d1,
-  0x03d5, 0x03d7,
-  0x03d9, 0x03d9,
-  0x03db, 0x03db,
-  0x03dd, 0x03dd,
-  0x03df, 0x03df,
-  0x03e1, 0x03e1,
-  0x03e3, 0x03e3,
-  0x03e5, 0x03e5,
-  0x03e7, 0x03e7,
-  0x03e9, 0x03e9,
-  0x03eb, 0x03eb,
-  0x03ed, 0x03ed,
-  0x03ef, 0x03f3,
-  0x03f5, 0x03f5,
-  0x03f8, 0x03f8,
-  0x03fb, 0x03fc,
-  0x0430, 0x045f,
-  0x0461, 0x0461,
-  0x0463, 0x0463,
-  0x0465, 0x0465,
-  0x0467, 0x0467,
-  0x0469, 0x0469,
-  0x046b, 0x046b,
-  0x046d, 0x046d,
-  0x046f, 0x046f,
-  0x0471, 0x0471,
-  0x0473, 0x0473,
-  0x0475, 0x0475,
-  0x0477, 0x0477,
-  0x0479, 0x0479,
-  0x047b, 0x047b,
-  0x047d, 0x047d,
-  0x047f, 0x047f,
-  0x0481, 0x0481,
-  0x048b, 0x048b,
-  0x048d, 0x048d,
-  0x048f, 0x048f,
-  0x0491, 0x0491,
-  0x0493, 0x0493,
-  0x0495, 0x0495,
-  0x0497, 0x0497,
-  0x0499, 0x0499,
-  0x049b, 0x049b,
-  0x049d, 0x049d,
-  0x049f, 0x049f,
-  0x04a1, 0x04a1,
-  0x04a3, 0x04a3,
-  0x04a5, 0x04a5,
-  0x04a7, 0x04a7,
-  0x04a9, 0x04a9,
-  0x04ab, 0x04ab,
-  0x04ad, 0x04ad,
-  0x04af, 0x04af,
-  0x04b1, 0x04b1,
-  0x04b3, 0x04b3,
-  0x04b5, 0x04b5,
-  0x04b7, 0x04b7,
-  0x04b9, 0x04b9,
-  0x04bb, 0x04bb,
-  0x04bd, 0x04bd,
-  0x04bf, 0x04bf,
-  0x04c2, 0x04c2,
-  0x04c4, 0x04c4,
-  0x04c6, 0x04c6,
-  0x04c8, 0x04c8,
-  0x04ca, 0x04ca,
-  0x04cc, 0x04cc,
-  0x04ce, 0x04ce,
-  0x04d1, 0x04d1,
-  0x04d3, 0x04d3,
-  0x04d5, 0x04d5,
-  0x04d7, 0x04d7,
-  0x04d9, 0x04d9,
-  0x04db, 0x04db,
-  0x04dd, 0x04dd,
-  0x04df, 0x04df,
-  0x04e1, 0x04e1,
-  0x04e3, 0x04e3,
-  0x04e5, 0x04e5,
-  0x04e7, 0x04e7,
-  0x04e9, 0x04e9,
-  0x04eb, 0x04eb,
-  0x04ed, 0x04ed,
-  0x04ef, 0x04ef,
-  0x04f1, 0x04f1,
-  0x04f3, 0x04f3,
-  0x04f5, 0x04f5,
-  0x04f7, 0x04f7,
-  0x04f9, 0x04f9,
-  0x0501, 0x0501,
-  0x0503, 0x0503,
-  0x0505, 0x0505,
-  0x0507, 0x0507,
-  0x0509, 0x0509,
-  0x050b, 0x050b,
-  0x050d, 0x050d,
-  0x050f, 0x050f,
-  0x0561, 0x0587,
-  0x1d00, 0x1d2b,
-  0x1d62, 0x1d77,
-  0x1d79, 0x1d9a,
-  0x1e01, 0x1e01,
-  0x1e03, 0x1e03,
-  0x1e05, 0x1e05,
-  0x1e07, 0x1e07,
-  0x1e09, 0x1e09,
-  0x1e0b, 0x1e0b,
-  0x1e0d, 0x1e0d,
-  0x1e0f, 0x1e0f,
-  0x1e11, 0x1e11,
-  0x1e13, 0x1e13,
-  0x1e15, 0x1e15,
-  0x1e17, 0x1e17,
-  0x1e19, 0x1e19,
-  0x1e1b, 0x1e1b,
-  0x1e1d, 0x1e1d,
-  0x1e1f, 0x1e1f,
-  0x1e21, 0x1e21,
-  0x1e23, 0x1e23,
-  0x1e25, 0x1e25,
-  0x1e27, 0x1e27,
-  0x1e29, 0x1e29,
-  0x1e2b, 0x1e2b,
-  0x1e2d, 0x1e2d,
-  0x1e2f, 0x1e2f,
-  0x1e31, 0x1e31,
-  0x1e33, 0x1e33,
-  0x1e35, 0x1e35,
-  0x1e37, 0x1e37,
-  0x1e39, 0x1e39,
-  0x1e3b, 0x1e3b,
-  0x1e3d, 0x1e3d,
-  0x1e3f, 0x1e3f,
-  0x1e41, 0x1e41,
-  0x1e43, 0x1e43,
-  0x1e45, 0x1e45,
-  0x1e47, 0x1e47,
-  0x1e49, 0x1e49,
-  0x1e4b, 0x1e4b,
-  0x1e4d, 0x1e4d,
-  0x1e4f, 0x1e4f,
-  0x1e51, 0x1e51,
-  0x1e53, 0x1e53,
-  0x1e55, 0x1e55,
-  0x1e57, 0x1e57,
-  0x1e59, 0x1e59,
-  0x1e5b, 0x1e5b,
-  0x1e5d, 0x1e5d,
-  0x1e5f, 0x1e5f,
-  0x1e61, 0x1e61,
-  0x1e63, 0x1e63,
-  0x1e65, 0x1e65,
-  0x1e67, 0x1e67,
-  0x1e69, 0x1e69,
-  0x1e6b, 0x1e6b,
-  0x1e6d, 0x1e6d,
-  0x1e6f, 0x1e6f,
-  0x1e71, 0x1e71,
-  0x1e73, 0x1e73,
-  0x1e75, 0x1e75,
-  0x1e77, 0x1e77,
-  0x1e79, 0x1e79,
-  0x1e7b, 0x1e7b,
-  0x1e7d, 0x1e7d,
-  0x1e7f, 0x1e7f,
-  0x1e81, 0x1e81,
-  0x1e83, 0x1e83,
-  0x1e85, 0x1e85,
-  0x1e87, 0x1e87,
-  0x1e89, 0x1e89,
-  0x1e8b, 0x1e8b,
-  0x1e8d, 0x1e8d,
-  0x1e8f, 0x1e8f,
-  0x1e91, 0x1e91,
-  0x1e93, 0x1e93,
-  0x1e95, 0x1e9b,
-  0x1ea1, 0x1ea1,
-  0x1ea3, 0x1ea3,
-  0x1ea5, 0x1ea5,
-  0x1ea7, 0x1ea7,
-  0x1ea9, 0x1ea9,
-  0x1eab, 0x1eab,
-  0x1ead, 0x1ead,
-  0x1eaf, 0x1eaf,
-  0x1eb1, 0x1eb1,
-  0x1eb3, 0x1eb3,
-  0x1eb5, 0x1eb5,
-  0x1eb7, 0x1eb7,
-  0x1eb9, 0x1eb9,
-  0x1ebb, 0x1ebb,
-  0x1ebd, 0x1ebd,
-  0x1ebf, 0x1ebf,
-  0x1ec1, 0x1ec1,
-  0x1ec3, 0x1ec3,
-  0x1ec5, 0x1ec5,
-  0x1ec7, 0x1ec7,
-  0x1ec9, 0x1ec9,
-  0x1ecb, 0x1ecb,
-  0x1ecd, 0x1ecd,
-  0x1ecf, 0x1ecf,
-  0x1ed1, 0x1ed1,
-  0x1ed3, 0x1ed3,
-  0x1ed5, 0x1ed5,
-  0x1ed7, 0x1ed7,
-  0x1ed9, 0x1ed9,
-  0x1edb, 0x1edb,
-  0x1edd, 0x1edd,
-  0x1edf, 0x1edf,
-  0x1ee1, 0x1ee1,
-  0x1ee3, 0x1ee3,
-  0x1ee5, 0x1ee5,
-  0x1ee7, 0x1ee7,
-  0x1ee9, 0x1ee9,
-  0x1eeb, 0x1eeb,
-  0x1eed, 0x1eed,
-  0x1eef, 0x1eef,
-  0x1ef1, 0x1ef1,
-  0x1ef3, 0x1ef3,
-  0x1ef5, 0x1ef5,
-  0x1ef7, 0x1ef7,
-  0x1ef9, 0x1ef9,
-  0x1f00, 0x1f07,
-  0x1f10, 0x1f15,
-  0x1f20, 0x1f27,
-  0x1f30, 0x1f37,
-  0x1f40, 0x1f45,
-  0x1f50, 0x1f57,
-  0x1f60, 0x1f67,
-  0x1f70, 0x1f7d,
-  0x1f80, 0x1f87,
-  0x1f90, 0x1f97,
-  0x1fa0, 0x1fa7,
-  0x1fb0, 0x1fb4,
-  0x1fb6, 0x1fb7,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fc7,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fd7,
-  0x1fe0, 0x1fe7,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ff7,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x210a, 0x210a,
-  0x210e, 0x210f,
-  0x2113, 0x2113,
-  0x212f, 0x212f,
-  0x2134, 0x2134,
-  0x2139, 0x2139,
-  0x213c, 0x213d,
-  0x2146, 0x2149,
-  0x2c30, 0x2c5e,
-  0x2c81, 0x2c81,
-  0x2c83, 0x2c83,
-  0x2c85, 0x2c85,
-  0x2c87, 0x2c87,
-  0x2c89, 0x2c89,
-  0x2c8b, 0x2c8b,
-  0x2c8d, 0x2c8d,
-  0x2c8f, 0x2c8f,
-  0x2c91, 0x2c91,
-  0x2c93, 0x2c93,
-  0x2c95, 0x2c95,
-  0x2c97, 0x2c97,
-  0x2c99, 0x2c99,
-  0x2c9b, 0x2c9b,
-  0x2c9d, 0x2c9d,
-  0x2c9f, 0x2c9f,
-  0x2ca1, 0x2ca1,
-  0x2ca3, 0x2ca3,
-  0x2ca5, 0x2ca5,
-  0x2ca7, 0x2ca7,
-  0x2ca9, 0x2ca9,
-  0x2cab, 0x2cab,
-  0x2cad, 0x2cad,
-  0x2caf, 0x2caf,
-  0x2cb1, 0x2cb1,
-  0x2cb3, 0x2cb3,
-  0x2cb5, 0x2cb5,
-  0x2cb7, 0x2cb7,
-  0x2cb9, 0x2cb9,
-  0x2cbb, 0x2cbb,
-  0x2cbd, 0x2cbd,
-  0x2cbf, 0x2cbf,
-  0x2cc1, 0x2cc1,
-  0x2cc3, 0x2cc3,
-  0x2cc5, 0x2cc5,
-  0x2cc7, 0x2cc7,
-  0x2cc9, 0x2cc9,
-  0x2ccb, 0x2ccb,
-  0x2ccd, 0x2ccd,
-  0x2ccf, 0x2ccf,
-  0x2cd1, 0x2cd1,
-  0x2cd3, 0x2cd3,
-  0x2cd5, 0x2cd5,
-  0x2cd7, 0x2cd7,
-  0x2cd9, 0x2cd9,
-  0x2cdb, 0x2cdb,
-  0x2cdd, 0x2cdd,
-  0x2cdf, 0x2cdf,
-  0x2ce1, 0x2ce1,
-  0x2ce3, 0x2ce4,
-  0x2d00, 0x2d25,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xff41, 0xff5a,
-  0x10428, 0x1044f,
-  0x1d41a, 0x1d433,
-  0x1d44e, 0x1d454,
-  0x1d456, 0x1d467,
-  0x1d482, 0x1d49b,
-  0x1d4b6, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d4cf,
-  0x1d4ea, 0x1d503,
-  0x1d51e, 0x1d537,
-  0x1d552, 0x1d56b,
-  0x1d586, 0x1d59f,
-  0x1d5ba, 0x1d5d3,
-  0x1d5ee, 0x1d607,
-  0x1d622, 0x1d63b,
-  0x1d656, 0x1d66f,
-  0x1d68a, 0x1d6a5,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6e1,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d71b,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d755,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d78f,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-  423,
-  0x0009, 0x000d,
-  0x0020, 0x007e,
-  0x0085, 0x0085,
-  0x00a0, 0x0241,
-  0x0250, 0x036f,
-  0x0374, 0x0375,
-  0x037a, 0x037a,
-  0x037e, 0x037e,
-  0x0384, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x055f,
-  0x0561, 0x0587,
-  0x0589, 0x058a,
-  0x0591, 0x05b9,
-  0x05bb, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f4,
-  0x0600, 0x0603,
-  0x060b, 0x0615,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x0660, 0x070d,
-  0x070f, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0970,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09fa,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0af1, 0x0af1,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bfa,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df4,
-  0x0e01, 0x0e3a,
-  0x0e3f, 0x0e5b,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fbe, 0x0fcc,
-  0x0fcf, 0x0fd1,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x137c,
-  0x1380, 0x1399,
-  0x13a0, 0x13f4,
-  0x1401, 0x1676,
-  0x1680, 0x169c,
-  0x16a0, 0x16f0,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1736,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17dd,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x1800, 0x180e,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1940, 0x1940,
-  0x1944, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x19de, 0x1a1b,
-  0x1a1e, 0x1a1f,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fc4,
-  0x1fc6, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fdd, 0x1fef,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffe,
-  0x2000, 0x2063,
-  0x206a, 0x2071,
-  0x2074, 0x208e,
-  0x2090, 0x2094,
-  0x20a0, 0x20b5,
-  0x20d0, 0x20eb,
-  0x2100, 0x214c,
-  0x2153, 0x2183,
-  0x2190, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x2460, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x27c0, 0x27c6,
-  0x27d0, 0x27eb,
-  0x27f0, 0x2b13,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2cea,
-  0x2cf9, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x2ff0, 0x2ffb,
-  0x3000, 0x303f,
-  0x3041, 0x3096,
-  0x3099, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x3190, 0x31b7,
-  0x31c0, 0x31cf,
-  0x31f0, 0x321e,
-  0x3220, 0x3243,
-  0x3250, 0x32fe,
-  0x3300, 0x4db5,
-  0x4dc0, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa490, 0xa4c6,
-  0xa700, 0xa716,
-  0xa800, 0xa82b,
-  0xac00, 0xd7a3,
-  0xe000, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3f,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfd,
-  0xfe00, 0xfe19,
-  0xfe20, 0xfe23,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe66,
-  0xfe68, 0xfe6b,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xfeff, 0xfeff,
-  0xff01, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0xffe0, 0xffe6,
-  0xffe8, 0xffee,
-  0xfff9, 0xfffd,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10100, 0x10102,
-  0x10107, 0x10133,
-  0x10137, 0x1018a,
-  0x10300, 0x1031e,
-  0x10320, 0x10323,
-  0x10330, 0x1034a,
-  0x10380, 0x1039d,
-  0x1039f, 0x103c3,
-  0x103c8, 0x103d5,
-  0x10400, 0x1049d,
-  0x104a0, 0x104a9,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a47,
-  0x10a50, 0x10a58,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d1dd,
-  0x1d200, 0x1d245,
-  0x1d300, 0x1d356,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f,
-  0xe0100, 0xe01ef,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-  96,
-  0x0021, 0x0023,
-  0x0025, 0x002a,
-  0x002c, 0x002f,
-  0x003a, 0x003b,
-  0x003f, 0x0040,
-  0x005b, 0x005d,
-  0x005f, 0x005f,
-  0x007b, 0x007b,
-  0x007d, 0x007d,
-  0x00a1, 0x00a1,
-  0x00ab, 0x00ab,
-  0x00b7, 0x00b7,
-  0x00bb, 0x00bb,
-  0x00bf, 0x00bf,
-  0x037e, 0x037e,
-  0x0387, 0x0387,
-  0x055a, 0x055f,
-  0x0589, 0x058a,
-  0x05be, 0x05be,
-  0x05c0, 0x05c0,
-  0x05c3, 0x05c3,
-  0x05c6, 0x05c6,
-  0x05f3, 0x05f4,
-  0x060c, 0x060d,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x066a, 0x066d,
-  0x06d4, 0x06d4,
-  0x0700, 0x070d,
-  0x0964, 0x0965,
-  0x0970, 0x0970,
-  0x0df4, 0x0df4,
-  0x0e4f, 0x0e4f,
-  0x0e5a, 0x0e5b,
-  0x0f04, 0x0f12,
-  0x0f3a, 0x0f3d,
-  0x0f85, 0x0f85,
-  0x0fd0, 0x0fd1,
-  0x104a, 0x104f,
-  0x10fb, 0x10fb,
-  0x1361, 0x1368,
-  0x166d, 0x166e,
-  0x169b, 0x169c,
-  0x16eb, 0x16ed,
-  0x1735, 0x1736,
-  0x17d4, 0x17d6,
-  0x17d8, 0x17da,
-  0x1800, 0x180a,
-  0x1944, 0x1945,
-  0x19de, 0x19df,
-  0x1a1e, 0x1a1f,
-  0x2010, 0x2027,
-  0x2030, 0x2043,
-  0x2045, 0x2051,
-  0x2053, 0x205e,
-  0x207d, 0x207e,
-  0x208d, 0x208e,
-  0x2329, 0x232a,
-  0x23b4, 0x23b6,
-  0x2768, 0x2775,
-  0x27c5, 0x27c6,
-  0x27e6, 0x27eb,
-  0x2983, 0x2998,
-  0x29d8, 0x29db,
-  0x29fc, 0x29fd,
-  0x2cf9, 0x2cfc,
-  0x2cfe, 0x2cff,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x3001, 0x3003,
-  0x3008, 0x3011,
-  0x3014, 0x301f,
-  0x3030, 0x3030,
-  0x303d, 0x303d,
-  0x30a0, 0x30a0,
-  0x30fb, 0x30fb,
-  0xfd3e, 0xfd3f,
-  0xfe10, 0xfe19,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe61,
-  0xfe63, 0xfe63,
-  0xfe68, 0xfe68,
-  0xfe6a, 0xfe6b,
-  0xff01, 0xff03,
-  0xff05, 0xff0a,
-  0xff0c, 0xff0f,
-  0xff1a, 0xff1b,
-  0xff1f, 0xff20,
-  0xff3b, 0xff3d,
-  0xff3f, 0xff3f,
-  0xff5b, 0xff5b,
-  0xff5d, 0xff5d,
-  0xff5f, 0xff65,
-  0x10100, 0x10101,
-  0x1039f, 0x1039f,
-  0x10a50, 0x10a58
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
-  11,
-  0x0009, 0x000d,
-  0x0020, 0x0020,
-  0x0085, 0x0085,
-  0x00a0, 0x00a0,
-  0x1680, 0x1680,
-  0x180e, 0x180e,
-  0x2000, 0x200a,
-  0x2028, 0x2029,
-  0x202f, 0x202f,
-  0x205f, 0x205f,
-  0x3000, 0x3000
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
-  476,
-  0x0041, 0x005a,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00de,
-  0x0100, 0x0100,
-  0x0102, 0x0102,
-  0x0104, 0x0104,
-  0x0106, 0x0106,
-  0x0108, 0x0108,
-  0x010a, 0x010a,
-  0x010c, 0x010c,
-  0x010e, 0x010e,
-  0x0110, 0x0110,
-  0x0112, 0x0112,
-  0x0114, 0x0114,
-  0x0116, 0x0116,
-  0x0118, 0x0118,
-  0x011a, 0x011a,
-  0x011c, 0x011c,
-  0x011e, 0x011e,
-  0x0120, 0x0120,
-  0x0122, 0x0122,
-  0x0124, 0x0124,
-  0x0126, 0x0126,
-  0x0128, 0x0128,
-  0x012a, 0x012a,
-  0x012c, 0x012c,
-  0x012e, 0x012e,
-  0x0130, 0x0130,
-  0x0132, 0x0132,
-  0x0134, 0x0134,
-  0x0136, 0x0136,
-  0x0139, 0x0139,
-  0x013b, 0x013b,
-  0x013d, 0x013d,
-  0x013f, 0x013f,
-  0x0141, 0x0141,
-  0x0143, 0x0143,
-  0x0145, 0x0145,
-  0x0147, 0x0147,
-  0x014a, 0x014a,
-  0x014c, 0x014c,
-  0x014e, 0x014e,
-  0x0150, 0x0150,
-  0x0152, 0x0152,
-  0x0154, 0x0154,
-  0x0156, 0x0156,
-  0x0158, 0x0158,
-  0x015a, 0x015a,
-  0x015c, 0x015c,
-  0x015e, 0x015e,
-  0x0160, 0x0160,
-  0x0162, 0x0162,
-  0x0164, 0x0164,
-  0x0166, 0x0166,
-  0x0168, 0x0168,
-  0x016a, 0x016a,
-  0x016c, 0x016c,
-  0x016e, 0x016e,
-  0x0170, 0x0170,
-  0x0172, 0x0172,
-  0x0174, 0x0174,
-  0x0176, 0x0176,
-  0x0178, 0x0179,
-  0x017b, 0x017b,
-  0x017d, 0x017d,
-  0x0181, 0x0182,
-  0x0184, 0x0184,
-  0x0186, 0x0187,
-  0x0189, 0x018b,
-  0x018e, 0x0191,
-  0x0193, 0x0194,
-  0x0196, 0x0198,
-  0x019c, 0x019d,
-  0x019f, 0x01a0,
-  0x01a2, 0x01a2,
-  0x01a4, 0x01a4,
-  0x01a6, 0x01a7,
-  0x01a9, 0x01a9,
-  0x01ac, 0x01ac,
-  0x01ae, 0x01af,
-  0x01b1, 0x01b3,
-  0x01b5, 0x01b5,
-  0x01b7, 0x01b8,
-  0x01bc, 0x01bc,
-  0x01c4, 0x01c4,
-  0x01c7, 0x01c7,
-  0x01ca, 0x01ca,
-  0x01cd, 0x01cd,
-  0x01cf, 0x01cf,
-  0x01d1, 0x01d1,
-  0x01d3, 0x01d3,
-  0x01d5, 0x01d5,
-  0x01d7, 0x01d7,
-  0x01d9, 0x01d9,
-  0x01db, 0x01db,
-  0x01de, 0x01de,
-  0x01e0, 0x01e0,
-  0x01e2, 0x01e2,
-  0x01e4, 0x01e4,
-  0x01e6, 0x01e6,
-  0x01e8, 0x01e8,
-  0x01ea, 0x01ea,
-  0x01ec, 0x01ec,
-  0x01ee, 0x01ee,
-  0x01f1, 0x01f1,
-  0x01f4, 0x01f4,
-  0x01f6, 0x01f8,
-  0x01fa, 0x01fa,
-  0x01fc, 0x01fc,
-  0x01fe, 0x01fe,
-  0x0200, 0x0200,
-  0x0202, 0x0202,
-  0x0204, 0x0204,
-  0x0206, 0x0206,
-  0x0208, 0x0208,
-  0x020a, 0x020a,
-  0x020c, 0x020c,
-  0x020e, 0x020e,
-  0x0210, 0x0210,
-  0x0212, 0x0212,
-  0x0214, 0x0214,
-  0x0216, 0x0216,
-  0x0218, 0x0218,
-  0x021a, 0x021a,
-  0x021c, 0x021c,
-  0x021e, 0x021e,
-  0x0220, 0x0220,
-  0x0222, 0x0222,
-  0x0224, 0x0224,
-  0x0226, 0x0226,
-  0x0228, 0x0228,
-  0x022a, 0x022a,
-  0x022c, 0x022c,
-  0x022e, 0x022e,
-  0x0230, 0x0230,
-  0x0232, 0x0232,
-  0x023a, 0x023b,
-  0x023d, 0x023e,
-  0x0241, 0x0241,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x038f,
-  0x0391, 0x03a1,
-  0x03a3, 0x03ab,
-  0x03d2, 0x03d4,
-  0x03d8, 0x03d8,
-  0x03da, 0x03da,
-  0x03dc, 0x03dc,
-  0x03de, 0x03de,
-  0x03e0, 0x03e0,
-  0x03e2, 0x03e2,
-  0x03e4, 0x03e4,
-  0x03e6, 0x03e6,
-  0x03e8, 0x03e8,
-  0x03ea, 0x03ea,
-  0x03ec, 0x03ec,
-  0x03ee, 0x03ee,
-  0x03f4, 0x03f4,
-  0x03f7, 0x03f7,
-  0x03f9, 0x03fa,
-  0x03fd, 0x042f,
-  0x0460, 0x0460,
-  0x0462, 0x0462,
-  0x0464, 0x0464,
-  0x0466, 0x0466,
-  0x0468, 0x0468,
-  0x046a, 0x046a,
-  0x046c, 0x046c,
-  0x046e, 0x046e,
-  0x0470, 0x0470,
-  0x0472, 0x0472,
-  0x0474, 0x0474,
-  0x0476, 0x0476,
-  0x0478, 0x0478,
-  0x047a, 0x047a,
-  0x047c, 0x047c,
-  0x047e, 0x047e,
-  0x0480, 0x0480,
-  0x048a, 0x048a,
-  0x048c, 0x048c,
-  0x048e, 0x048e,
-  0x0490, 0x0490,
-  0x0492, 0x0492,
-  0x0494, 0x0494,
-  0x0496, 0x0496,
-  0x0498, 0x0498,
-  0x049a, 0x049a,
-  0x049c, 0x049c,
-  0x049e, 0x049e,
-  0x04a0, 0x04a0,
-  0x04a2, 0x04a2,
-  0x04a4, 0x04a4,
-  0x04a6, 0x04a6,
-  0x04a8, 0x04a8,
-  0x04aa, 0x04aa,
-  0x04ac, 0x04ac,
-  0x04ae, 0x04ae,
-  0x04b0, 0x04b0,
-  0x04b2, 0x04b2,
-  0x04b4, 0x04b4,
-  0x04b6, 0x04b6,
-  0x04b8, 0x04b8,
-  0x04ba, 0x04ba,
-  0x04bc, 0x04bc,
-  0x04be, 0x04be,
-  0x04c0, 0x04c1,
-  0x04c3, 0x04c3,
-  0x04c5, 0x04c5,
-  0x04c7, 0x04c7,
-  0x04c9, 0x04c9,
-  0x04cb, 0x04cb,
-  0x04cd, 0x04cd,
-  0x04d0, 0x04d0,
-  0x04d2, 0x04d2,
-  0x04d4, 0x04d4,
-  0x04d6, 0x04d6,
-  0x04d8, 0x04d8,
-  0x04da, 0x04da,
-  0x04dc, 0x04dc,
-  0x04de, 0x04de,
-  0x04e0, 0x04e0,
-  0x04e2, 0x04e2,
-  0x04e4, 0x04e4,
-  0x04e6, 0x04e6,
-  0x04e8, 0x04e8,
-  0x04ea, 0x04ea,
-  0x04ec, 0x04ec,
-  0x04ee, 0x04ee,
-  0x04f0, 0x04f0,
-  0x04f2, 0x04f2,
-  0x04f4, 0x04f4,
-  0x04f6, 0x04f6,
-  0x04f8, 0x04f8,
-  0x0500, 0x0500,
-  0x0502, 0x0502,
-  0x0504, 0x0504,
-  0x0506, 0x0506,
-  0x0508, 0x0508,
-  0x050a, 0x050a,
-  0x050c, 0x050c,
-  0x050e, 0x050e,
-  0x0531, 0x0556,
-  0x10a0, 0x10c5,
-  0x1e00, 0x1e00,
-  0x1e02, 0x1e02,
-  0x1e04, 0x1e04,
-  0x1e06, 0x1e06,
-  0x1e08, 0x1e08,
-  0x1e0a, 0x1e0a,
-  0x1e0c, 0x1e0c,
-  0x1e0e, 0x1e0e,
-  0x1e10, 0x1e10,
-  0x1e12, 0x1e12,
-  0x1e14, 0x1e14,
-  0x1e16, 0x1e16,
-  0x1e18, 0x1e18,
-  0x1e1a, 0x1e1a,
-  0x1e1c, 0x1e1c,
-  0x1e1e, 0x1e1e,
-  0x1e20, 0x1e20,
-  0x1e22, 0x1e22,
-  0x1e24, 0x1e24,
-  0x1e26, 0x1e26,
-  0x1e28, 0x1e28,
-  0x1e2a, 0x1e2a,
-  0x1e2c, 0x1e2c,
-  0x1e2e, 0x1e2e,
-  0x1e30, 0x1e30,
-  0x1e32, 0x1e32,
-  0x1e34, 0x1e34,
-  0x1e36, 0x1e36,
-  0x1e38, 0x1e38,
-  0x1e3a, 0x1e3a,
-  0x1e3c, 0x1e3c,
-  0x1e3e, 0x1e3e,
-  0x1e40, 0x1e40,
-  0x1e42, 0x1e42,
-  0x1e44, 0x1e44,
-  0x1e46, 0x1e46,
-  0x1e48, 0x1e48,
-  0x1e4a, 0x1e4a,
-  0x1e4c, 0x1e4c,
-  0x1e4e, 0x1e4e,
-  0x1e50, 0x1e50,
-  0x1e52, 0x1e52,
-  0x1e54, 0x1e54,
-  0x1e56, 0x1e56,
-  0x1e58, 0x1e58,
-  0x1e5a, 0x1e5a,
-  0x1e5c, 0x1e5c,
-  0x1e5e, 0x1e5e,
-  0x1e60, 0x1e60,
-  0x1e62, 0x1e62,
-  0x1e64, 0x1e64,
-  0x1e66, 0x1e66,
-  0x1e68, 0x1e68,
-  0x1e6a, 0x1e6a,
-  0x1e6c, 0x1e6c,
-  0x1e6e, 0x1e6e,
-  0x1e70, 0x1e70,
-  0x1e72, 0x1e72,
-  0x1e74, 0x1e74,
-  0x1e76, 0x1e76,
-  0x1e78, 0x1e78,
-  0x1e7a, 0x1e7a,
-  0x1e7c, 0x1e7c,
-  0x1e7e, 0x1e7e,
-  0x1e80, 0x1e80,
-  0x1e82, 0x1e82,
-  0x1e84, 0x1e84,
-  0x1e86, 0x1e86,
-  0x1e88, 0x1e88,
-  0x1e8a, 0x1e8a,
-  0x1e8c, 0x1e8c,
-  0x1e8e, 0x1e8e,
-  0x1e90, 0x1e90,
-  0x1e92, 0x1e92,
-  0x1e94, 0x1e94,
-  0x1ea0, 0x1ea0,
-  0x1ea2, 0x1ea2,
-  0x1ea4, 0x1ea4,
-  0x1ea6, 0x1ea6,
-  0x1ea8, 0x1ea8,
-  0x1eaa, 0x1eaa,
-  0x1eac, 0x1eac,
-  0x1eae, 0x1eae,
-  0x1eb0, 0x1eb0,
-  0x1eb2, 0x1eb2,
-  0x1eb4, 0x1eb4,
-  0x1eb6, 0x1eb6,
-  0x1eb8, 0x1eb8,
-  0x1eba, 0x1eba,
-  0x1ebc, 0x1ebc,
-  0x1ebe, 0x1ebe,
-  0x1ec0, 0x1ec0,
-  0x1ec2, 0x1ec2,
-  0x1ec4, 0x1ec4,
-  0x1ec6, 0x1ec6,
-  0x1ec8, 0x1ec8,
-  0x1eca, 0x1eca,
-  0x1ecc, 0x1ecc,
-  0x1ece, 0x1ece,
-  0x1ed0, 0x1ed0,
-  0x1ed2, 0x1ed2,
-  0x1ed4, 0x1ed4,
-  0x1ed6, 0x1ed6,
-  0x1ed8, 0x1ed8,
-  0x1eda, 0x1eda,
-  0x1edc, 0x1edc,
-  0x1ede, 0x1ede,
-  0x1ee0, 0x1ee0,
-  0x1ee2, 0x1ee2,
-  0x1ee4, 0x1ee4,
-  0x1ee6, 0x1ee6,
-  0x1ee8, 0x1ee8,
-  0x1eea, 0x1eea,
-  0x1eec, 0x1eec,
-  0x1eee, 0x1eee,
-  0x1ef0, 0x1ef0,
-  0x1ef2, 0x1ef2,
-  0x1ef4, 0x1ef4,
-  0x1ef6, 0x1ef6,
-  0x1ef8, 0x1ef8,
-  0x1f08, 0x1f0f,
-  0x1f18, 0x1f1d,
-  0x1f28, 0x1f2f,
-  0x1f38, 0x1f3f,
-  0x1f48, 0x1f4d,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f5f,
-  0x1f68, 0x1f6f,
-  0x1fb8, 0x1fbb,
-  0x1fc8, 0x1fcb,
-  0x1fd8, 0x1fdb,
-  0x1fe8, 0x1fec,
-  0x1ff8, 0x1ffb,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210b, 0x210d,
-  0x2110, 0x2112,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x2130, 0x2131,
-  0x2133, 0x2133,
-  0x213e, 0x213f,
-  0x2145, 0x2145,
-  0x2c00, 0x2c2e,
-  0x2c80, 0x2c80,
-  0x2c82, 0x2c82,
-  0x2c84, 0x2c84,
-  0x2c86, 0x2c86,
-  0x2c88, 0x2c88,
-  0x2c8a, 0x2c8a,
-  0x2c8c, 0x2c8c,
-  0x2c8e, 0x2c8e,
-  0x2c90, 0x2c90,
-  0x2c92, 0x2c92,
-  0x2c94, 0x2c94,
-  0x2c96, 0x2c96,
-  0x2c98, 0x2c98,
-  0x2c9a, 0x2c9a,
-  0x2c9c, 0x2c9c,
-  0x2c9e, 0x2c9e,
-  0x2ca0, 0x2ca0,
-  0x2ca2, 0x2ca2,
-  0x2ca4, 0x2ca4,
-  0x2ca6, 0x2ca6,
-  0x2ca8, 0x2ca8,
-  0x2caa, 0x2caa,
-  0x2cac, 0x2cac,
-  0x2cae, 0x2cae,
-  0x2cb0, 0x2cb0,
-  0x2cb2, 0x2cb2,
-  0x2cb4, 0x2cb4,
-  0x2cb6, 0x2cb6,
-  0x2cb8, 0x2cb8,
-  0x2cba, 0x2cba,
-  0x2cbc, 0x2cbc,
-  0x2cbe, 0x2cbe,
-  0x2cc0, 0x2cc0,
-  0x2cc2, 0x2cc2,
-  0x2cc4, 0x2cc4,
-  0x2cc6, 0x2cc6,
-  0x2cc8, 0x2cc8,
-  0x2cca, 0x2cca,
-  0x2ccc, 0x2ccc,
-  0x2cce, 0x2cce,
-  0x2cd0, 0x2cd0,
-  0x2cd2, 0x2cd2,
-  0x2cd4, 0x2cd4,
-  0x2cd6, 0x2cd6,
-  0x2cd8, 0x2cd8,
-  0x2cda, 0x2cda,
-  0x2cdc, 0x2cdc,
-  0x2cde, 0x2cde,
-  0x2ce0, 0x2ce0,
-  0x2ce2, 0x2ce2,
-  0xff21, 0xff3a,
-  0x10400, 0x10427,
-  0x1d400, 0x1d419,
-  0x1d434, 0x1d44d,
-  0x1d468, 0x1d481,
-  0x1d49c, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b5,
-  0x1d4d0, 0x1d4e9,
-  0x1d504, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d538, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d56c, 0x1d585,
-  0x1d5a0, 0x1d5b9,
-  0x1d5d4, 0x1d5ed,
-  0x1d608, 0x1d621,
-  0x1d63c, 0x1d655,
-  0x1d670, 0x1d689,
-  0x1d6a8, 0x1d6c0,
-  0x1d6e2, 0x1d6fa,
-  0x1d71c, 0x1d734,
-  0x1d756, 0x1d76e,
-  0x1d790, 0x1d7a8
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
-  3,
-  0x0030, 0x0039,
-  0x0041, 0x0046,
-  0x0061, 0x0066
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-  464,
-  0x0030, 0x0039,
-  0x0041, 0x005a,
-  0x005f, 0x005f,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b2, 0x00b3,
-  0x00b5, 0x00b5,
-  0x00b9, 0x00ba,
-  0x00bc, 0x00be,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00f6,
-  0x00f8, 0x0241,
-  0x0250, 0x02c1,
-  0x02c6, 0x02d1,
-  0x02e0, 0x02e4,
-  0x02ee, 0x02ee,
-  0x0300, 0x036f,
-  0x037a, 0x037a,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x03f5,
-  0x03f7, 0x0481,
-  0x0483, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x0559,
-  0x0561, 0x0587,
-  0x0591, 0x05b9,
-  0x05bb, 0x05bd,
-  0x05bf, 0x05bf,
-  0x05c1, 0x05c2,
-  0x05c4, 0x05c5,
-  0x05c7, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f2,
-  0x0610, 0x0615,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x0660, 0x0669,
-  0x066e, 0x06d3,
-  0x06d5, 0x06dc,
-  0x06de, 0x06e8,
-  0x06ea, 0x06fc,
-  0x06ff, 0x06ff,
-  0x0710, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0963,
-  0x0966, 0x096f,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09f1,
-  0x09f4, 0x09f9,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b6f,
-  0x0b71, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bf2,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df3,
-  0x0e01, 0x0e3a,
-  0x0e40, 0x0e4e,
-  0x0e50, 0x0e59,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f00,
-  0x0f18, 0x0f19,
-  0x0f20, 0x0f33,
-  0x0f35, 0x0f35,
-  0x0f37, 0x0f37,
-  0x0f39, 0x0f39,
-  0x0f3e, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f84,
-  0x0f86, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fc6, 0x0fc6,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1049,
-  0x1050, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fa,
-  0x10fc, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x135f,
-  0x1369, 0x137c,
-  0x1380, 0x138f,
-  0x13a0, 0x13f4,
-  0x1401, 0x166c,
-  0x166f, 0x1676,
-  0x1681, 0x169a,
-  0x16a0, 0x16ea,
-  0x16ee, 0x16f0,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1734,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17b3,
-  0x17b6, 0x17d3,
-  0x17d7, 0x17d7,
-  0x17dc, 0x17dd,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x180b, 0x180d,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1946, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x1a00, 0x1a1b,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fbc,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fcc,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fe0, 0x1fec,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffc,
-  0x203f, 0x2040,
-  0x2054, 0x2054,
-  0x2070, 0x2071,
-  0x2074, 0x2079,
-  0x207f, 0x2089,
-  0x2090, 0x2094,
-  0x20d0, 0x20eb,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210a, 0x2113,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x212f, 0x2131,
-  0x2133, 0x2139,
-  0x213c, 0x213f,
-  0x2145, 0x2149,
-  0x2153, 0x2183,
-  0x2460, 0x249b,
-  0x24ea, 0x24ff,
-  0x2776, 0x2793,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2ce4,
-  0x2cfd, 0x2cfd,
-  0x2d00, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x3005, 0x3007,
-  0x3021, 0x302f,
-  0x3031, 0x3035,
-  0x3038, 0x303c,
-  0x3041, 0x3096,
-  0x3099, 0x309a,
-  0x309d, 0x309f,
-  0x30a1, 0x30fa,
-  0x30fc, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x3192, 0x3195,
-  0x31a0, 0x31b7,
-  0x31f0, 0x31ff,
-  0x3220, 0x3229,
-  0x3251, 0x325f,
-  0x3280, 0x3289,
-  0x32b1, 0x32bf,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa800, 0xa827,
-  0xac00, 0xd7a3,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb28,
-  0xfb2a, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfb,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0xfe33, 0xfe34,
-  0xfe4d, 0xfe4f,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xff10, 0xff19,
-  0xff21, 0xff3a,
-  0xff3f, 0xff3f,
-  0xff41, 0xff5a,
-  0xff66, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10107, 0x10133,
-  0x10140, 0x10178,
-  0x1018a, 0x1018a,
-  0x10300, 0x1031e,
-  0x10320, 0x10323,
-  0x10330, 0x1034a,
-  0x10380, 0x1039d,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103cf,
-  0x103d1, 0x103d5,
-  0x10400, 0x1049d,
-  0x104a0, 0x104a9,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a47,
-  0x1d165, 0x1d169,
-  0x1d16d, 0x1d172,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0x1d242, 0x1d244,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d6c0,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6fa,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d734,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d76e,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d7a8,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0100, 0xe01ef
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-  436,
-  0x0030, 0x0039,
-  0x0041, 0x005a,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b5, 0x00b5,
-  0x00ba, 0x00ba,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00f6,
-  0x00f8, 0x0241,
-  0x0250, 0x02c1,
-  0x02c6, 0x02d1,
-  0x02e0, 0x02e4,
-  0x02ee, 0x02ee,
-  0x0300, 0x036f,
-  0x037a, 0x037a,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x03f5,
-  0x03f7, 0x0481,
-  0x0483, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x0559,
-  0x0561, 0x0587,
-  0x0591, 0x05b9,
-  0x05bb, 0x05bd,
-  0x05bf, 0x05bf,
-  0x05c1, 0x05c2,
-  0x05c4, 0x05c5,
-  0x05c7, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f2,
-  0x0610, 0x0615,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x0660, 0x0669,
-  0x066e, 0x06d3,
-  0x06d5, 0x06dc,
-  0x06de, 0x06e8,
-  0x06ea, 0x06fc,
-  0x06ff, 0x06ff,
-  0x0710, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0963,
-  0x0966, 0x096f,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09f1,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b6f,
-  0x0b71, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bef,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df3,
-  0x0e01, 0x0e3a,
-  0x0e40, 0x0e4e,
-  0x0e50, 0x0e59,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f00,
-  0x0f18, 0x0f19,
-  0x0f20, 0x0f29,
-  0x0f35, 0x0f35,
-  0x0f37, 0x0f37,
-  0x0f39, 0x0f39,
-  0x0f3e, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f84,
-  0x0f86, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fc6, 0x0fc6,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1049,
-  0x1050, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fa,
-  0x10fc, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x135f,
-  0x1380, 0x138f,
-  0x13a0, 0x13f4,
-  0x1401, 0x166c,
-  0x166f, 0x1676,
-  0x1681, 0x169a,
-  0x16a0, 0x16ea,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1734,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17b3,
-  0x17b6, 0x17d3,
-  0x17d7, 0x17d7,
-  0x17dc, 0x17dd,
-  0x17e0, 0x17e9,
-  0x180b, 0x180d,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1946, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x1a00, 0x1a1b,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fbc,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fcc,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fe0, 0x1fec,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffc,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x2090, 0x2094,
-  0x20d0, 0x20eb,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210a, 0x2113,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x212f, 0x2131,
-  0x2133, 0x2139,
-  0x213c, 0x213f,
-  0x2145, 0x2149,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2ce4,
-  0x2d00, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x3005, 0x3006,
-  0x302a, 0x302f,
-  0x3031, 0x3035,
-  0x303b, 0x303c,
-  0x3041, 0x3096,
-  0x3099, 0x309a,
-  0x309d, 0x309f,
-  0x30a1, 0x30fa,
-  0x30fc, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x31a0, 0x31b7,
-  0x31f0, 0x31ff,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa800, 0xa827,
-  0xac00, 0xd7a3,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb28,
-  0xfb2a, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfb,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xff10, 0xff19,
-  0xff21, 0xff3a,
-  0xff41, 0xff5a,
-  0xff66, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10300, 0x1031e,
-  0x10330, 0x10349,
-  0x10380, 0x1039d,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103cf,
-  0x10400, 0x1049d,
-  0x104a0, 0x104a9,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a3f,
-  0x1d165, 0x1d169,
-  0x1d16d, 0x1d172,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0x1d242, 0x1d244,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d6c0,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6fa,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d734,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d76e,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d7a8,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0100, 0xe01ef
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-  1,
-  0x0000, 0x007f
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-  1,
-  0x0000, 0x10ffff
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-  420,
-  0x0000, 0x0241,
-  0x0250, 0x036f,
-  0x0374, 0x0375,
-  0x037a, 0x037a,
-  0x037e, 0x037e,
-  0x0384, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x055f,
-  0x0561, 0x0587,
-  0x0589, 0x058a,
-  0x0591, 0x05b9,
-  0x05bb, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f4,
-  0x0600, 0x0603,
-  0x060b, 0x0615,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x0621, 0x063a,
-  0x0640, 0x065e,
-  0x0660, 0x070d,
-  0x070f, 0x074a,
-  0x074d, 0x076d,
-  0x0780, 0x07b1,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0970,
-  0x097d, 0x097d,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09fa,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0af1, 0x0af1,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b71,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bfa,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df4,
-  0x0e01, 0x0e3a,
-  0x0e3f, 0x0e5b,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fbe, 0x0fcc,
-  0x0fcf, 0x0fd1,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1059,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x137c,
-  0x1380, 0x1399,
-  0x13a0, 0x13f4,
-  0x1401, 0x1676,
-  0x1680, 0x169c,
-  0x16a0, 0x16f0,
-  0x1700, 0x170c,
-  0x170e, 0x1714,
-  0x1720, 0x1736,
-  0x1740, 0x1753,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773,
-  0x1780, 0x17dd,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x1800, 0x180e,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1940, 0x1940,
-  0x1944, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x19de, 0x1a1b,
-  0x1a1e, 0x1a1f,
-  0x1d00, 0x1dc3,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fc4,
-  0x1fc6, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fdd, 0x1fef,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffe,
-  0x2000, 0x2063,
-  0x206a, 0x2071,
-  0x2074, 0x208e,
-  0x2090, 0x2094,
-  0x20a0, 0x20b5,
-  0x20d0, 0x20eb,
-  0x2100, 0x214c,
-  0x2153, 0x2183,
-  0x2190, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x2460, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x27c0, 0x27c6,
-  0x27d0, 0x27eb,
-  0x27f0, 0x2b13,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2cea,
-  0x2cf9, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x2ff0, 0x2ffb,
-  0x3000, 0x303f,
-  0x3041, 0x3096,
-  0x3099, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x3190, 0x31b7,
-  0x31c0, 0x31cf,
-  0x31f0, 0x321e,
-  0x3220, 0x3243,
-  0x3250, 0x32fe,
-  0x3300, 0x4db5,
-  0x4dc0, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa490, 0xa4c6,
-  0xa700, 0xa716,
-  0xa800, 0xa82b,
-  0xac00, 0xd7a3,
-  0xd800, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3f,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfd,
-  0xfe00, 0xfe19,
-  0xfe20, 0xfe23,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe66,
-  0xfe68, 0xfe6b,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xfeff, 0xfeff,
-  0xff01, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0xffe0, 0xffe6,
-  0xffe8, 0xffee,
-  0xfff9, 0xfffd,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10100, 0x10102,
-  0x10107, 0x10133,
-  0x10137, 0x1018a,
-  0x10300, 0x1031e,
-  0x10320, 0x10323,
-  0x10330, 0x1034a,
-  0x10380, 0x1039d,
-  0x1039f, 0x103c3,
-  0x103c8, 0x103d5,
-  0x10400, 0x1049d,
-  0x104a0, 0x104a9,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a47,
-  0x10a50, 0x10a58,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d1dd,
-  0x1d200, 0x1d245,
-  0x1d300, 0x1d356,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f,
-  0xe0100, 0xe01ef,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-  422,
-  0x0000, 0x001f,
-  0x007f, 0x009f,
-  0x00ad, 0x00ad,
-  0x0242, 0x024f,
-  0x0370, 0x0373,
-  0x0376, 0x0379,
-  0x037b, 0x037d,
-  0x037f, 0x0383,
-  0x038b, 0x038b,
-  0x038d, 0x038d,
-  0x03a2, 0x03a2,
-  0x03cf, 0x03cf,
-  0x0487, 0x0487,
-  0x04cf, 0x04cf,
-  0x04fa, 0x04ff,
-  0x0510, 0x0530,
-  0x0557, 0x0558,
-  0x0560, 0x0560,
-  0x0588, 0x0588,
-  0x058b, 0x0590,
-  0x05ba, 0x05ba,
-  0x05c8, 0x05cf,
-  0x05eb, 0x05ef,
-  0x05f5, 0x060a,
-  0x0616, 0x061a,
-  0x061c, 0x061d,
-  0x0620, 0x0620,
-  0x063b, 0x063f,
-  0x065f, 0x065f,
-  0x06dd, 0x06dd,
-  0x070e, 0x070f,
-  0x074b, 0x074c,
-  0x076e, 0x077f,
-  0x07b2, 0x0900,
-  0x093a, 0x093b,
-  0x094e, 0x094f,
-  0x0955, 0x0957,
-  0x0971, 0x097c,
-  0x097e, 0x0980,
-  0x0984, 0x0984,
-  0x098d, 0x098e,
-  0x0991, 0x0992,
-  0x09a9, 0x09a9,
-  0x09b1, 0x09b1,
-  0x09b3, 0x09b5,
-  0x09ba, 0x09bb,
-  0x09c5, 0x09c6,
-  0x09c9, 0x09ca,
-  0x09cf, 0x09d6,
-  0x09d8, 0x09db,
-  0x09de, 0x09de,
-  0x09e4, 0x09e5,
-  0x09fb, 0x0a00,
-  0x0a04, 0x0a04,
-  0x0a0b, 0x0a0e,
-  0x0a11, 0x0a12,
-  0x0a29, 0x0a29,
-  0x0a31, 0x0a31,
-  0x0a34, 0x0a34,
-  0x0a37, 0x0a37,
-  0x0a3a, 0x0a3b,
-  0x0a3d, 0x0a3d,
-  0x0a43, 0x0a46,
-  0x0a49, 0x0a4a,
-  0x0a4e, 0x0a58,
-  0x0a5d, 0x0a5d,
-  0x0a5f, 0x0a65,
-  0x0a75, 0x0a80,
-  0x0a84, 0x0a84,
-  0x0a8e, 0x0a8e,
-  0x0a92, 0x0a92,
-  0x0aa9, 0x0aa9,
-  0x0ab1, 0x0ab1,
-  0x0ab4, 0x0ab4,
-  0x0aba, 0x0abb,
-  0x0ac6, 0x0ac6,
-  0x0aca, 0x0aca,
-  0x0ace, 0x0acf,
-  0x0ad1, 0x0adf,
-  0x0ae4, 0x0ae5,
-  0x0af0, 0x0af0,
-  0x0af2, 0x0b00,
-  0x0b04, 0x0b04,
-  0x0b0d, 0x0b0e,
-  0x0b11, 0x0b12,
-  0x0b29, 0x0b29,
-  0x0b31, 0x0b31,
-  0x0b34, 0x0b34,
-  0x0b3a, 0x0b3b,
-  0x0b44, 0x0b46,
-  0x0b49, 0x0b4a,
-  0x0b4e, 0x0b55,
-  0x0b58, 0x0b5b,
-  0x0b5e, 0x0b5e,
-  0x0b62, 0x0b65,
-  0x0b72, 0x0b81,
-  0x0b84, 0x0b84,
-  0x0b8b, 0x0b8d,
-  0x0b91, 0x0b91,
-  0x0b96, 0x0b98,
-  0x0b9b, 0x0b9b,
-  0x0b9d, 0x0b9d,
-  0x0ba0, 0x0ba2,
-  0x0ba5, 0x0ba7,
-  0x0bab, 0x0bad,
-  0x0bba, 0x0bbd,
-  0x0bc3, 0x0bc5,
-  0x0bc9, 0x0bc9,
-  0x0bce, 0x0bd6,
-  0x0bd8, 0x0be5,
-  0x0bfb, 0x0c00,
-  0x0c04, 0x0c04,
-  0x0c0d, 0x0c0d,
-  0x0c11, 0x0c11,
-  0x0c29, 0x0c29,
-  0x0c34, 0x0c34,
-  0x0c3a, 0x0c3d,
-  0x0c45, 0x0c45,
-  0x0c49, 0x0c49,
-  0x0c4e, 0x0c54,
-  0x0c57, 0x0c5f,
-  0x0c62, 0x0c65,
-  0x0c70, 0x0c81,
-  0x0c84, 0x0c84,
-  0x0c8d, 0x0c8d,
-  0x0c91, 0x0c91,
-  0x0ca9, 0x0ca9,
-  0x0cb4, 0x0cb4,
-  0x0cba, 0x0cbb,
-  0x0cc5, 0x0cc5,
-  0x0cc9, 0x0cc9,
-  0x0cce, 0x0cd4,
-  0x0cd7, 0x0cdd,
-  0x0cdf, 0x0cdf,
-  0x0ce2, 0x0ce5,
-  0x0cf0, 0x0d01,
-  0x0d04, 0x0d04,
-  0x0d0d, 0x0d0d,
-  0x0d11, 0x0d11,
-  0x0d29, 0x0d29,
-  0x0d3a, 0x0d3d,
-  0x0d44, 0x0d45,
-  0x0d49, 0x0d49,
-  0x0d4e, 0x0d56,
-  0x0d58, 0x0d5f,
-  0x0d62, 0x0d65,
-  0x0d70, 0x0d81,
-  0x0d84, 0x0d84,
-  0x0d97, 0x0d99,
-  0x0db2, 0x0db2,
-  0x0dbc, 0x0dbc,
-  0x0dbe, 0x0dbf,
-  0x0dc7, 0x0dc9,
-  0x0dcb, 0x0dce,
-  0x0dd5, 0x0dd5,
-  0x0dd7, 0x0dd7,
-  0x0de0, 0x0df1,
-  0x0df5, 0x0e00,
-  0x0e3b, 0x0e3e,
-  0x0e5c, 0x0e80,
-  0x0e83, 0x0e83,
-  0x0e85, 0x0e86,
-  0x0e89, 0x0e89,
-  0x0e8b, 0x0e8c,
-  0x0e8e, 0x0e93,
-  0x0e98, 0x0e98,
-  0x0ea0, 0x0ea0,
-  0x0ea4, 0x0ea4,
-  0x0ea6, 0x0ea6,
-  0x0ea8, 0x0ea9,
-  0x0eac, 0x0eac,
-  0x0eba, 0x0eba,
-  0x0ebe, 0x0ebf,
-  0x0ec5, 0x0ec5,
-  0x0ec7, 0x0ec7,
-  0x0ece, 0x0ecf,
-  0x0eda, 0x0edb,
-  0x0ede, 0x0eff,
-  0x0f48, 0x0f48,
-  0x0f6b, 0x0f70,
-  0x0f8c, 0x0f8f,
-  0x0f98, 0x0f98,
-  0x0fbd, 0x0fbd,
-  0x0fcd, 0x0fce,
-  0x0fd2, 0x0fff,
-  0x1022, 0x1022,
-  0x1028, 0x1028,
-  0x102b, 0x102b,
-  0x1033, 0x1035,
-  0x103a, 0x103f,
-  0x105a, 0x109f,
-  0x10c6, 0x10cf,
-  0x10fd, 0x10ff,
-  0x115a, 0x115e,
-  0x11a3, 0x11a7,
-  0x11fa, 0x11ff,
-  0x1249, 0x1249,
-  0x124e, 0x124f,
-  0x1257, 0x1257,
-  0x1259, 0x1259,
-  0x125e, 0x125f,
-  0x1289, 0x1289,
-  0x128e, 0x128f,
-  0x12b1, 0x12b1,
-  0x12b6, 0x12b7,
-  0x12bf, 0x12bf,
-  0x12c1, 0x12c1,
-  0x12c6, 0x12c7,
-  0x12d7, 0x12d7,
-  0x1311, 0x1311,
-  0x1316, 0x1317,
-  0x135b, 0x135e,
-  0x137d, 0x137f,
-  0x139a, 0x139f,
-  0x13f5, 0x1400,
-  0x1677, 0x167f,
-  0x169d, 0x169f,
-  0x16f1, 0x16ff,
-  0x170d, 0x170d,
-  0x1715, 0x171f,
-  0x1737, 0x173f,
-  0x1754, 0x175f,
-  0x176d, 0x176d,
-  0x1771, 0x1771,
-  0x1774, 0x177f,
-  0x17b4, 0x17b5,
-  0x17de, 0x17df,
-  0x17ea, 0x17ef,
-  0x17fa, 0x17ff,
-  0x180f, 0x180f,
-  0x181a, 0x181f,
-  0x1878, 0x187f,
-  0x18aa, 0x18ff,
-  0x191d, 0x191f,
-  0x192c, 0x192f,
-  0x193c, 0x193f,
-  0x1941, 0x1943,
-  0x196e, 0x196f,
-  0x1975, 0x197f,
-  0x19aa, 0x19af,
-  0x19ca, 0x19cf,
-  0x19da, 0x19dd,
-  0x1a1c, 0x1a1d,
-  0x1a20, 0x1cff,
-  0x1dc4, 0x1dff,
-  0x1e9c, 0x1e9f,
-  0x1efa, 0x1eff,
-  0x1f16, 0x1f17,
-  0x1f1e, 0x1f1f,
-  0x1f46, 0x1f47,
-  0x1f4e, 0x1f4f,
-  0x1f58, 0x1f58,
-  0x1f5a, 0x1f5a,
-  0x1f5c, 0x1f5c,
-  0x1f5e, 0x1f5e,
-  0x1f7e, 0x1f7f,
-  0x1fb5, 0x1fb5,
-  0x1fc5, 0x1fc5,
-  0x1fd4, 0x1fd5,
-  0x1fdc, 0x1fdc,
-  0x1ff0, 0x1ff1,
-  0x1ff5, 0x1ff5,
-  0x1fff, 0x1fff,
-  0x200b, 0x200f,
-  0x202a, 0x202e,
-  0x2060, 0x206f,
-  0x2072, 0x2073,
-  0x208f, 0x208f,
-  0x2095, 0x209f,
-  0x20b6, 0x20cf,
-  0x20ec, 0x20ff,
-  0x214d, 0x2152,
-  0x2184, 0x218f,
-  0x23dc, 0x23ff,
-  0x2427, 0x243f,
-  0x244b, 0x245f,
-  0x269d, 0x269f,
-  0x26b2, 0x2700,
-  0x2705, 0x2705,
-  0x270a, 0x270b,
-  0x2728, 0x2728,
-  0x274c, 0x274c,
-  0x274e, 0x274e,
-  0x2753, 0x2755,
-  0x2757, 0x2757,
-  0x275f, 0x2760,
-  0x2795, 0x2797,
-  0x27b0, 0x27b0,
-  0x27bf, 0x27bf,
-  0x27c7, 0x27cf,
-  0x27ec, 0x27ef,
-  0x2b14, 0x2bff,
-  0x2c2f, 0x2c2f,
-  0x2c5f, 0x2c7f,
-  0x2ceb, 0x2cf8,
-  0x2d26, 0x2d2f,
-  0x2d66, 0x2d6e,
-  0x2d70, 0x2d7f,
-  0x2d97, 0x2d9f,
-  0x2da7, 0x2da7,
-  0x2daf, 0x2daf,
-  0x2db7, 0x2db7,
-  0x2dbf, 0x2dbf,
-  0x2dc7, 0x2dc7,
-  0x2dcf, 0x2dcf,
-  0x2dd7, 0x2dd7,
-  0x2ddf, 0x2dff,
-  0x2e18, 0x2e1b,
-  0x2e1e, 0x2e7f,
-  0x2e9a, 0x2e9a,
-  0x2ef4, 0x2eff,
-  0x2fd6, 0x2fef,
-  0x2ffc, 0x2fff,
-  0x3040, 0x3040,
-  0x3097, 0x3098,
-  0x3100, 0x3104,
-  0x312d, 0x3130,
-  0x318f, 0x318f,
-  0x31b8, 0x31bf,
-  0x31d0, 0x31ef,
-  0x321f, 0x321f,
-  0x3244, 0x324f,
-  0x32ff, 0x32ff,
-  0x4db6, 0x4dbf,
-  0x9fbc, 0x9fff,
-  0xa48d, 0xa48f,
-  0xa4c7, 0xa6ff,
-  0xa717, 0xa7ff,
-  0xa82c, 0xabff,
-  0xd7a4, 0xf8ff,
-  0xfa2e, 0xfa2f,
-  0xfa6b, 0xfa6f,
-  0xfada, 0xfaff,
-  0xfb07, 0xfb12,
-  0xfb18, 0xfb1c,
-  0xfb37, 0xfb37,
-  0xfb3d, 0xfb3d,
-  0xfb3f, 0xfb3f,
-  0xfb42, 0xfb42,
-  0xfb45, 0xfb45,
-  0xfbb2, 0xfbd2,
-  0xfd40, 0xfd4f,
-  0xfd90, 0xfd91,
-  0xfdc8, 0xfdef,
-  0xfdfe, 0xfdff,
-  0xfe1a, 0xfe1f,
-  0xfe24, 0xfe2f,
-  0xfe53, 0xfe53,
-  0xfe67, 0xfe67,
-  0xfe6c, 0xfe6f,
-  0xfe75, 0xfe75,
-  0xfefd, 0xff00,
-  0xffbf, 0xffc1,
-  0xffc8, 0xffc9,
-  0xffd0, 0xffd1,
-  0xffd8, 0xffd9,
-  0xffdd, 0xffdf,
-  0xffe7, 0xffe7,
-  0xffef, 0xfffb,
-  0xfffe, 0xffff,
-  0x1000c, 0x1000c,
-  0x10027, 0x10027,
-  0x1003b, 0x1003b,
-  0x1003e, 0x1003e,
-  0x1004e, 0x1004f,
-  0x1005e, 0x1007f,
-  0x100fb, 0x100ff,
-  0x10103, 0x10106,
-  0x10134, 0x10136,
-  0x1018b, 0x102ff,
-  0x1031f, 0x1031f,
-  0x10324, 0x1032f,
-  0x1034b, 0x1037f,
-  0x1039e, 0x1039e,
-  0x103c4, 0x103c7,
-  0x103d6, 0x103ff,
-  0x1049e, 0x1049f,
-  0x104aa, 0x107ff,
-  0x10806, 0x10807,
-  0x10809, 0x10809,
-  0x10836, 0x10836,
-  0x10839, 0x1083b,
-  0x1083d, 0x1083e,
-  0x10840, 0x109ff,
-  0x10a04, 0x10a04,
-  0x10a07, 0x10a0b,
-  0x10a14, 0x10a14,
-  0x10a18, 0x10a18,
-  0x10a34, 0x10a37,
-  0x10a3b, 0x10a3e,
-  0x10a48, 0x10a4f,
-  0x10a59, 0x1cfff,
-  0x1d0f6, 0x1d0ff,
-  0x1d127, 0x1d129,
-  0x1d173, 0x1d17a,
-  0x1d1de, 0x1d1ff,
-  0x1d246, 0x1d2ff,
-  0x1d357, 0x1d3ff,
-  0x1d455, 0x1d455,
-  0x1d49d, 0x1d49d,
-  0x1d4a0, 0x1d4a1,
-  0x1d4a3, 0x1d4a4,
-  0x1d4a7, 0x1d4a8,
-  0x1d4ad, 0x1d4ad,
-  0x1d4ba, 0x1d4ba,
-  0x1d4bc, 0x1d4bc,
-  0x1d4c4, 0x1d4c4,
-  0x1d506, 0x1d506,
-  0x1d50b, 0x1d50c,
-  0x1d515, 0x1d515,
-  0x1d51d, 0x1d51d,
-  0x1d53a, 0x1d53a,
-  0x1d53f, 0x1d53f,
-  0x1d545, 0x1d545,
-  0x1d547, 0x1d549,
-  0x1d551, 0x1d551,
-  0x1d6a6, 0x1d6a7,
-  0x1d7ca, 0x1d7cd,
-  0x1d800, 0x1ffff,
-  0x2a6d7, 0x2f7ff,
-  0x2fa1e, 0xe00ff,
-  0xe01f0, 0x10ffff
-}; /* CR_C */
-
-/* 'Cc': General Category */
-static const OnigCodePoint CR_Cc[] = {
-  2,
-  0x0000, 0x001f,
-  0x007f, 0x009f
-}; /* CR_Cc */
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-  14,
-  0x00ad, 0x00ad,
-  0x0600, 0x0603,
-  0x06dd, 0x06dd,
-  0x070f, 0x070f,
-  0x17b4, 0x17b5,
-  0x200b, 0x200f,
-  0x202a, 0x202e,
-  0x2060, 0x2063,
-  0x206a, 0x206f,
-  0xfeff, 0xfeff,
-  0xfff9, 0xfffb,
-  0x1d173, 0x1d17a,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-  420,
-  0x0242, 0x024f,
-  0x0370, 0x0373,
-  0x0376, 0x0379,
-  0x037b, 0x037d,
-  0x037f, 0x0383,
-  0x038b, 0x038b,
-  0x038d, 0x038d,
-  0x03a2, 0x03a2,
-  0x03cf, 0x03cf,
-  0x0487, 0x0487,
-  0x04cf, 0x04cf,
-  0x04fa, 0x04ff,
-  0x0510, 0x0530,
-  0x0557, 0x0558,
-  0x0560, 0x0560,
-  0x0588, 0x0588,
-  0x058b, 0x0590,
-  0x05ba, 0x05ba,
-  0x05c8, 0x05cf,
-  0x05eb, 0x05ef,
-  0x05f5, 0x05ff,
-  0x0604, 0x060a,
-  0x0616, 0x061a,
-  0x061c, 0x061d,
-  0x0620, 0x0620,
-  0x063b, 0x063f,
-  0x065f, 0x065f,
-  0x070e, 0x070e,
-  0x074b, 0x074c,
-  0x076e, 0x077f,
-  0x07b2, 0x0900,
-  0x093a, 0x093b,
-  0x094e, 0x094f,
-  0x0955, 0x0957,
-  0x0971, 0x097c,
-  0x097e, 0x0980,
-  0x0984, 0x0984,
-  0x098d, 0x098e,
-  0x0991, 0x0992,
-  0x09a9, 0x09a9,
-  0x09b1, 0x09b1,
-  0x09b3, 0x09b5,
-  0x09ba, 0x09bb,
-  0x09c5, 0x09c6,
-  0x09c9, 0x09ca,
-  0x09cf, 0x09d6,
-  0x09d8, 0x09db,
-  0x09de, 0x09de,
-  0x09e4, 0x09e5,
-  0x09fb, 0x0a00,
-  0x0a04, 0x0a04,
-  0x0a0b, 0x0a0e,
-  0x0a11, 0x0a12,
-  0x0a29, 0x0a29,
-  0x0a31, 0x0a31,
-  0x0a34, 0x0a34,
-  0x0a37, 0x0a37,
-  0x0a3a, 0x0a3b,
-  0x0a3d, 0x0a3d,
-  0x0a43, 0x0a46,
-  0x0a49, 0x0a4a,
-  0x0a4e, 0x0a58,
-  0x0a5d, 0x0a5d,
-  0x0a5f, 0x0a65,
-  0x0a75, 0x0a80,
-  0x0a84, 0x0a84,
-  0x0a8e, 0x0a8e,
-  0x0a92, 0x0a92,
-  0x0aa9, 0x0aa9,
-  0x0ab1, 0x0ab1,
-  0x0ab4, 0x0ab4,
-  0x0aba, 0x0abb,
-  0x0ac6, 0x0ac6,
-  0x0aca, 0x0aca,
-  0x0ace, 0x0acf,
-  0x0ad1, 0x0adf,
-  0x0ae4, 0x0ae5,
-  0x0af0, 0x0af0,
-  0x0af2, 0x0b00,
-  0x0b04, 0x0b04,
-  0x0b0d, 0x0b0e,
-  0x0b11, 0x0b12,
-  0x0b29, 0x0b29,
-  0x0b31, 0x0b31,
-  0x0b34, 0x0b34,
-  0x0b3a, 0x0b3b,
-  0x0b44, 0x0b46,
-  0x0b49, 0x0b4a,
-  0x0b4e, 0x0b55,
-  0x0b58, 0x0b5b,
-  0x0b5e, 0x0b5e,
-  0x0b62, 0x0b65,
-  0x0b72, 0x0b81,
-  0x0b84, 0x0b84,
-  0x0b8b, 0x0b8d,
-  0x0b91, 0x0b91,
-  0x0b96, 0x0b98,
-  0x0b9b, 0x0b9b,
-  0x0b9d, 0x0b9d,
-  0x0ba0, 0x0ba2,
-  0x0ba5, 0x0ba7,
-  0x0bab, 0x0bad,
-  0x0bba, 0x0bbd,
-  0x0bc3, 0x0bc5,
-  0x0bc9, 0x0bc9,
-  0x0bce, 0x0bd6,
-  0x0bd8, 0x0be5,
-  0x0bfb, 0x0c00,
-  0x0c04, 0x0c04,
-  0x0c0d, 0x0c0d,
-  0x0c11, 0x0c11,
-  0x0c29, 0x0c29,
-  0x0c34, 0x0c34,
-  0x0c3a, 0x0c3d,
-  0x0c45, 0x0c45,
-  0x0c49, 0x0c49,
-  0x0c4e, 0x0c54,
-  0x0c57, 0x0c5f,
-  0x0c62, 0x0c65,
-  0x0c70, 0x0c81,
-  0x0c84, 0x0c84,
-  0x0c8d, 0x0c8d,
-  0x0c91, 0x0c91,
-  0x0ca9, 0x0ca9,
-  0x0cb4, 0x0cb4,
-  0x0cba, 0x0cbb,
-  0x0cc5, 0x0cc5,
-  0x0cc9, 0x0cc9,
-  0x0cce, 0x0cd4,
-  0x0cd7, 0x0cdd,
-  0x0cdf, 0x0cdf,
-  0x0ce2, 0x0ce5,
-  0x0cf0, 0x0d01,
-  0x0d04, 0x0d04,
-  0x0d0d, 0x0d0d,
-  0x0d11, 0x0d11,
-  0x0d29, 0x0d29,
-  0x0d3a, 0x0d3d,
-  0x0d44, 0x0d45,
-  0x0d49, 0x0d49,
-  0x0d4e, 0x0d56,
-  0x0d58, 0x0d5f,
-  0x0d62, 0x0d65,
-  0x0d70, 0x0d81,
-  0x0d84, 0x0d84,
-  0x0d97, 0x0d99,
-  0x0db2, 0x0db2,
-  0x0dbc, 0x0dbc,
-  0x0dbe, 0x0dbf,
-  0x0dc7, 0x0dc9,
-  0x0dcb, 0x0dce,
-  0x0dd5, 0x0dd5,
-  0x0dd7, 0x0dd7,
-  0x0de0, 0x0df1,
-  0x0df5, 0x0e00,
-  0x0e3b, 0x0e3e,
-  0x0e5c, 0x0e80,
-  0x0e83, 0x0e83,
-  0x0e85, 0x0e86,
-  0x0e89, 0x0e89,
-  0x0e8b, 0x0e8c,
-  0x0e8e, 0x0e93,
-  0x0e98, 0x0e98,
-  0x0ea0, 0x0ea0,
-  0x0ea4, 0x0ea4,
-  0x0ea6, 0x0ea6,
-  0x0ea8, 0x0ea9,
-  0x0eac, 0x0eac,
-  0x0eba, 0x0eba,
-  0x0ebe, 0x0ebf,
-  0x0ec5, 0x0ec5,
-  0x0ec7, 0x0ec7,
-  0x0ece, 0x0ecf,
-  0x0eda, 0x0edb,
-  0x0ede, 0x0eff,
-  0x0f48, 0x0f48,
-  0x0f6b, 0x0f70,
-  0x0f8c, 0x0f8f,
-  0x0f98, 0x0f98,
-  0x0fbd, 0x0fbd,
-  0x0fcd, 0x0fce,
-  0x0fd2, 0x0fff,
-  0x1022, 0x1022,
-  0x1028, 0x1028,
-  0x102b, 0x102b,
-  0x1033, 0x1035,
-  0x103a, 0x103f,
-  0x105a, 0x109f,
-  0x10c6, 0x10cf,
-  0x10fd, 0x10ff,
-  0x115a, 0x115e,
-  0x11a3, 0x11a7,
-  0x11fa, 0x11ff,
-  0x1249, 0x1249,
-  0x124e, 0x124f,
-  0x1257, 0x1257,
-  0x1259, 0x1259,
-  0x125e, 0x125f,
-  0x1289, 0x1289,
-  0x128e, 0x128f,
-  0x12b1, 0x12b1,
-  0x12b6, 0x12b7,
-  0x12bf, 0x12bf,
-  0x12c1, 0x12c1,
-  0x12c6, 0x12c7,
-  0x12d7, 0x12d7,
-  0x1311, 0x1311,
-  0x1316, 0x1317,
-  0x135b, 0x135e,
-  0x137d, 0x137f,
-  0x139a, 0x139f,
-  0x13f5, 0x1400,
-  0x1677, 0x167f,
-  0x169d, 0x169f,
-  0x16f1, 0x16ff,
-  0x170d, 0x170d,
-  0x1715, 0x171f,
-  0x1737, 0x173f,
-  0x1754, 0x175f,
-  0x176d, 0x176d,
-  0x1771, 0x1771,
-  0x1774, 0x177f,
-  0x17de, 0x17df,
-  0x17ea, 0x17ef,
-  0x17fa, 0x17ff,
-  0x180f, 0x180f,
-  0x181a, 0x181f,
-  0x1878, 0x187f,
-  0x18aa, 0x18ff,
-  0x191d, 0x191f,
-  0x192c, 0x192f,
-  0x193c, 0x193f,
-  0x1941, 0x1943,
-  0x196e, 0x196f,
-  0x1975, 0x197f,
-  0x19aa, 0x19af,
-  0x19ca, 0x19cf,
-  0x19da, 0x19dd,
-  0x1a1c, 0x1a1d,
-  0x1a20, 0x1cff,
-  0x1dc4, 0x1dff,
-  0x1e9c, 0x1e9f,
-  0x1efa, 0x1eff,
-  0x1f16, 0x1f17,
-  0x1f1e, 0x1f1f,
-  0x1f46, 0x1f47,
-  0x1f4e, 0x1f4f,
-  0x1f58, 0x1f58,
-  0x1f5a, 0x1f5a,
-  0x1f5c, 0x1f5c,
-  0x1f5e, 0x1f5e,
-  0x1f7e, 0x1f7f,
-  0x1fb5, 0x1fb5,
-  0x1fc5, 0x1fc5,
-  0x1fd4, 0x1fd5,
-  0x1fdc, 0x1fdc,
-  0x1ff0, 0x1ff1,
-  0x1ff5, 0x1ff5,
-  0x1fff, 0x1fff,
-  0x2064, 0x2069,
-  0x2072, 0x2073,
-  0x208f, 0x208f,
-  0x2095, 0x209f,
-  0x20b6, 0x20cf,
-  0x20ec, 0x20ff,
-  0x214d, 0x2152,
-  0x2184, 0x218f,
-  0x23dc, 0x23ff,
-  0x2427, 0x243f,
-  0x244b, 0x245f,
-  0x269d, 0x269f,
-  0x26b2, 0x2700,
-  0x2705, 0x2705,
-  0x270a, 0x270b,
-  0x2728, 0x2728,
-  0x274c, 0x274c,
-  0x274e, 0x274e,
-  0x2753, 0x2755,
-  0x2757, 0x2757,
-  0x275f, 0x2760,
-  0x2795, 0x2797,
-  0x27b0, 0x27b0,
-  0x27bf, 0x27bf,
-  0x27c7, 0x27cf,
-  0x27ec, 0x27ef,
-  0x2b14, 0x2bff,
-  0x2c2f, 0x2c2f,
-  0x2c5f, 0x2c7f,
-  0x2ceb, 0x2cf8,
-  0x2d26, 0x2d2f,
-  0x2d66, 0x2d6e,
-  0x2d70, 0x2d7f,
-  0x2d97, 0x2d9f,
-  0x2da7, 0x2da7,
-  0x2daf, 0x2daf,
-  0x2db7, 0x2db7,
-  0x2dbf, 0x2dbf,
-  0x2dc7, 0x2dc7,
-  0x2dcf, 0x2dcf,
-  0x2dd7, 0x2dd7,
-  0x2ddf, 0x2dff,
-  0x2e18, 0x2e1b,
-  0x2e1e, 0x2e7f,
-  0x2e9a, 0x2e9a,
-  0x2ef4, 0x2eff,
-  0x2fd6, 0x2fef,
-  0x2ffc, 0x2fff,
-  0x3040, 0x3040,
-  0x3097, 0x3098,
-  0x3100, 0x3104,
-  0x312d, 0x3130,
-  0x318f, 0x318f,
-  0x31b8, 0x31bf,
-  0x31d0, 0x31ef,
-  0x321f, 0x321f,
-  0x3244, 0x324f,
-  0x32ff, 0x32ff,
-  0x4db6, 0x4dbf,
-  0x9fbc, 0x9fff,
-  0xa48d, 0xa48f,
-  0xa4c7, 0xa6ff,
-  0xa717, 0xa7ff,
-  0xa82c, 0xabff,
-  0xd7a4, 0xd7ff,
-  0xfa2e, 0xfa2f,
-  0xfa6b, 0xfa6f,
-  0xfada, 0xfaff,
-  0xfb07, 0xfb12,
-  0xfb18, 0xfb1c,
-  0xfb37, 0xfb37,
-  0xfb3d, 0xfb3d,
-  0xfb3f, 0xfb3f,
-  0xfb42, 0xfb42,
-  0xfb45, 0xfb45,
-  0xfbb2, 0xfbd2,
-  0xfd40, 0xfd4f,
-  0xfd90, 0xfd91,
-  0xfdc8, 0xfdef,
-  0xfdfe, 0xfdff,
-  0xfe1a, 0xfe1f,
-  0xfe24, 0xfe2f,
-  0xfe53, 0xfe53,
-  0xfe67, 0xfe67,
-  0xfe6c, 0xfe6f,
-  0xfe75, 0xfe75,
-  0xfefd, 0xfefe,
-  0xff00, 0xff00,
-  0xffbf, 0xffc1,
-  0xffc8, 0xffc9,
-  0xffd0, 0xffd1,
-  0xffd8, 0xffd9,
-  0xffdd, 0xffdf,
-  0xffe7, 0xffe7,
-  0xffef, 0xfff8,
-  0xfffe, 0xffff,
-  0x1000c, 0x1000c,
-  0x10027, 0x10027,
-  0x1003b, 0x1003b,
-  0x1003e, 0x1003e,
-  0x1004e, 0x1004f,
-  0x1005e, 0x1007f,
-  0x100fb, 0x100ff,
-  0x10103, 0x10106,
-  0x10134, 0x10136,
-  0x1018b, 0x102ff,
-  0x1031f, 0x1031f,
-  0x10324, 0x1032f,
-  0x1034b, 0x1037f,
-  0x1039e, 0x1039e,
-  0x103c4, 0x103c7,
-  0x103d6, 0x103ff,
-  0x1049e, 0x1049f,
-  0x104aa, 0x107ff,
-  0x10806, 0x10807,
-  0x10809, 0x10809,
-  0x10836, 0x10836,
-  0x10839, 0x1083b,
-  0x1083d, 0x1083e,
-  0x10840, 0x109ff,
-  0x10a04, 0x10a04,
-  0x10a07, 0x10a0b,
-  0x10a14, 0x10a14,
-  0x10a18, 0x10a18,
-  0x10a34, 0x10a37,
-  0x10a3b, 0x10a3e,
-  0x10a48, 0x10a4f,
-  0x10a59, 0x1cfff,
-  0x1d0f6, 0x1d0ff,
-  0x1d127, 0x1d129,
-  0x1d1de, 0x1d1ff,
-  0x1d246, 0x1d2ff,
-  0x1d357, 0x1d3ff,
-  0x1d455, 0x1d455,
-  0x1d49d, 0x1d49d,
-  0x1d4a0, 0x1d4a1,
-  0x1d4a3, 0x1d4a4,
-  0x1d4a7, 0x1d4a8,
-  0x1d4ad, 0x1d4ad,
-  0x1d4ba, 0x1d4ba,
-  0x1d4bc, 0x1d4bc,
-  0x1d4c4, 0x1d4c4,
-  0x1d506, 0x1d506,
-  0x1d50b, 0x1d50c,
-  0x1d515, 0x1d515,
-  0x1d51d, 0x1d51d,
-  0x1d53a, 0x1d53a,
-  0x1d53f, 0x1d53f,
-  0x1d545, 0x1d545,
-  0x1d547, 0x1d549,
-  0x1d551, 0x1d551,
-  0x1d6a6, 0x1d6a7,
-  0x1d7ca, 0x1d7cd,
-  0x1d800, 0x1ffff,
-  0x2a6d7, 0x2f7ff,
-  0x2fa1e, 0xe0000,
-  0xe0002, 0xe001f,
-  0xe0080, 0xe00ff,
-  0xe01f0, 0xeffff,
-  0xffffe, 0xfffff,
-  0x10fffe, 0x10ffff
-}; /* CR_Cn */
-
-/* 'Co': General Category */
-static const OnigCodePoint CR_Co[] = {
-  3,
-  0xe000, 0xf8ff,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Co */
-
-/* 'Cs': General Category */
-static const OnigCodePoint CR_Cs[] = {
-  1,
-  0xd800, 0xdfff
-}; /* CR_Cs */
-
-/* 'L': Major Category */
-static const OnigCodePoint CR_L[] = {
-  347,
-  0x0041, 0x005a,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b5, 0x00b5,
-  0x00ba, 0x00ba,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00f6,
-  0x00f8, 0x0241,
-  0x0250, 0x02c1,
-  0x02c6, 0x02d1,
-  0x02e0, 0x02e4,
-  0x02ee, 0x02ee,
-  0x037a, 0x037a,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x03f5,
-  0x03f7, 0x0481,
-  0x048a, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x0531, 0x0556,
-  0x0559, 0x0559,
-  0x0561, 0x0587,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f2,
-  0x0621, 0x063a,
-  0x0640, 0x064a,
-  0x066e, 0x066f,
-  0x0671, 0x06d3,
-  0x06d5, 0x06d5,
-  0x06e5, 0x06e6,
-  0x06ee, 0x06ef,
-  0x06fa, 0x06fc,
-  0x06ff, 0x06ff,
-  0x0710, 0x0710,
-  0x0712, 0x072f,
-  0x074d, 0x076d,
-  0x0780, 0x07a5,
-  0x07b1, 0x07b1,
-  0x0904, 0x0939,
-  0x093d, 0x093d,
-  0x0950, 0x0950,
-  0x0958, 0x0961,
-  0x097d, 0x097d,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bd, 0x09bd,
-  0x09ce, 0x09ce,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e1,
-  0x09f0, 0x09f1,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a72, 0x0a74,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abd, 0x0abd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae1,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3d, 0x0b3d,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b71, 0x0b71,
-  0x0b83, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c60, 0x0c61,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbd, 0x0cbd,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d60, 0x0d61,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0e01, 0x0e30,
-  0x0e32, 0x0e33,
-  0x0e40, 0x0e46,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb0,
-  0x0eb2, 0x0eb3,
-  0x0ebd, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f00,
-  0x0f40, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f88, 0x0f8b,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x1050, 0x1055,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fa,
-  0x10fc, 0x10fc,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x1380, 0x138f,
-  0x13a0, 0x13f4,
-  0x1401, 0x166c,
-  0x166f, 0x1676,
-  0x1681, 0x169a,
-  0x16a0, 0x16ea,
-  0x1700, 0x170c,
-  0x170e, 0x1711,
-  0x1720, 0x1731,
-  0x1740, 0x1751,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1780, 0x17b3,
-  0x17d7, 0x17d7,
-  0x17dc, 0x17dc,
-  0x1820, 0x1877,
-  0x1880, 0x18a8,
-  0x1900, 0x191c,
-  0x1950, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19c1, 0x19c7,
-  0x1a00, 0x1a16,
-  0x1d00, 0x1dbf,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fbc,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fcc,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fe0, 0x1fec,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffc,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x2090, 0x2094,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210a, 0x2113,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x212f, 0x2131,
-  0x2133, 0x2139,
-  0x213c, 0x213f,
-  0x2145, 0x2149,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e,
-  0x2c80, 0x2ce4,
-  0x2d00, 0x2d25,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x3005, 0x3006,
-  0x3031, 0x3035,
-  0x303b, 0x303c,
-  0x3041, 0x3096,
-  0x309d, 0x309f,
-  0x30a1, 0x30fa,
-  0x30fc, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x31a0, 0x31b7,
-  0x31f0, 0x31ff,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xa000, 0xa48c,
-  0xa800, 0xa801,
-  0xa803, 0xa805,
-  0xa807, 0xa80a,
-  0xa80c, 0xa822,
-  0xac00, 0xd7a3,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xfb1d, 0xfb1d,
-  0xfb1f, 0xfb28,
-  0xfb2a, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfb,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xff21, 0xff3a,
-  0xff41, 0xff5a,
-  0xff66, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10300, 0x1031e,
-  0x10330, 0x10349,
-  0x10380, 0x1039d,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103cf,
-  0x10400, 0x1049d,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a00,
-  0x10a10, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d6c0,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6fa,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d734,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d76e,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d7a8,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d
-}; /* CR_L */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-  480,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00b5, 0x00b5,
-  0x00ba, 0x00ba,
-  0x00df, 0x00f6,
-  0x00f8, 0x00ff,
-  0x0101, 0x0101,
-  0x0103, 0x0103,
-  0x0105, 0x0105,
-  0x0107, 0x0107,
-  0x0109, 0x0109,
-  0x010b, 0x010b,
-  0x010d, 0x010d,
-  0x010f, 0x010f,
-  0x0111, 0x0111,
-  0x0113, 0x0113,
-  0x0115, 0x0115,
-  0x0117, 0x0117,
-  0x0119, 0x0119,
-  0x011b, 0x011b,
-  0x011d, 0x011d,
-  0x011f, 0x011f,
-  0x0121, 0x0121,
-  0x0123, 0x0123,
-  0x0125, 0x0125,
-  0x0127, 0x0127,
-  0x0129, 0x0129,
-  0x012b, 0x012b,
-  0x012d, 0x012d,
-  0x012f, 0x012f,
-  0x0131, 0x0131,
-  0x0133, 0x0133,
-  0x0135, 0x0135,
-  0x0137, 0x0138,
-  0x013a, 0x013a,
-  0x013c, 0x013c,
-  0x013e, 0x013e,
-  0x0140, 0x0140,
-  0x0142, 0x0142,
-  0x0144, 0x0144,
-  0x0146, 0x0146,
-  0x0148, 0x0149,
-  0x014b, 0x014b,
-  0x014d, 0x014d,
-  0x014f, 0x014f,
-  0x0151, 0x0151,
-  0x0153, 0x0153,
-  0x0155, 0x0155,
-  0x0157, 0x0157,
-  0x0159, 0x0159,
-  0x015b, 0x015b,
-  0x015d, 0x015d,
-  0x015f, 0x015f,
-  0x0161, 0x0161,
-  0x0163, 0x0163,
-  0x0165, 0x0165,
-  0x0167, 0x0167,
-  0x0169, 0x0169,
-  0x016b, 0x016b,
-  0x016d, 0x016d,
-  0x016f, 0x016f,
-  0x0171, 0x0171,
-  0x0173, 0x0173,
-  0x0175, 0x0175,
-  0x0177, 0x0177,
-  0x017a, 0x017a,
-  0x017c, 0x017c,
-  0x017e, 0x0180,
-  0x0183, 0x0183,
-  0x0185, 0x0185,
-  0x0188, 0x0188,
-  0x018c, 0x018d,
-  0x0192, 0x0192,
-  0x0195, 0x0195,
-  0x0199, 0x019b,
-  0x019e, 0x019e,
-  0x01a1, 0x01a1,
-  0x01a3, 0x01a3,
-  0x01a5, 0x01a5,
-  0x01a8, 0x01a8,
-  0x01aa, 0x01ab,
-  0x01ad, 0x01ad,
-  0x01b0, 0x01b0,
-  0x01b4, 0x01b4,
-  0x01b6, 0x01b6,
-  0x01b9, 0x01ba,
-  0x01bd, 0x01bf,
-  0x01c6, 0x01c6,
-  0x01c9, 0x01c9,
-  0x01cc, 0x01cc,
-  0x01ce, 0x01ce,
-  0x01d0, 0x01d0,
-  0x01d2, 0x01d2,
-  0x01d4, 0x01d4,
-  0x01d6, 0x01d6,
-  0x01d8, 0x01d8,
-  0x01da, 0x01da,
-  0x01dc, 0x01dd,
-  0x01df, 0x01df,
-  0x01e1, 0x01e1,
-  0x01e3, 0x01e3,
-  0x01e5, 0x01e5,
-  0x01e7, 0x01e7,
-  0x01e9, 0x01e9,
-  0x01eb, 0x01eb,
-  0x01ed, 0x01ed,
-  0x01ef, 0x01f0,
-  0x01f3, 0x01f3,
-  0x01f5, 0x01f5,
-  0x01f9, 0x01f9,
-  0x01fb, 0x01fb,
-  0x01fd, 0x01fd,
-  0x01ff, 0x01ff,
-  0x0201, 0x0201,
-  0x0203, 0x0203,
-  0x0205, 0x0205,
-  0x0207, 0x0207,
-  0x0209, 0x0209,
-  0x020b, 0x020b,
-  0x020d, 0x020d,
-  0x020f, 0x020f,
-  0x0211, 0x0211,
-  0x0213, 0x0213,
-  0x0215, 0x0215,
-  0x0217, 0x0217,
-  0x0219, 0x0219,
-  0x021b, 0x021b,
-  0x021d, 0x021d,
-  0x021f, 0x021f,
-  0x0221, 0x0221,
-  0x0223, 0x0223,
-  0x0225, 0x0225,
-  0x0227, 0x0227,
-  0x0229, 0x0229,
-  0x022b, 0x022b,
-  0x022d, 0x022d,
-  0x022f, 0x022f,
-  0x0231, 0x0231,
-  0x0233, 0x0239,
-  0x023c, 0x023c,
-  0x023f, 0x0240,
-  0x0250, 0x02af,
-  0x0390, 0x0390,
-  0x03ac, 0x03ce,
-  0x03d0, 0x03d1,
-  0x03d5, 0x03d7,
-  0x03d9, 0x03d9,
-  0x03db, 0x03db,
-  0x03dd, 0x03dd,
-  0x03df, 0x03df,
-  0x03e1, 0x03e1,
-  0x03e3, 0x03e3,
-  0x03e5, 0x03e5,
-  0x03e7, 0x03e7,
-  0x03e9, 0x03e9,
-  0x03eb, 0x03eb,
-  0x03ed, 0x03ed,
-  0x03ef, 0x03f3,
-  0x03f5, 0x03f5,
-  0x03f8, 0x03f8,
-  0x03fb, 0x03fc,
-  0x0430, 0x045f,
-  0x0461, 0x0461,
-  0x0463, 0x0463,
-  0x0465, 0x0465,
-  0x0467, 0x0467,
-  0x0469, 0x0469,
-  0x046b, 0x046b,
-  0x046d, 0x046d,
-  0x046f, 0x046f,
-  0x0471, 0x0471,
-  0x0473, 0x0473,
-  0x0475, 0x0475,
-  0x0477, 0x0477,
-  0x0479, 0x0479,
-  0x047b, 0x047b,
-  0x047d, 0x047d,
-  0x047f, 0x047f,
-  0x0481, 0x0481,
-  0x048b, 0x048b,
-  0x048d, 0x048d,
-  0x048f, 0x048f,
-  0x0491, 0x0491,
-  0x0493, 0x0493,
-  0x0495, 0x0495,
-  0x0497, 0x0497,
-  0x0499, 0x0499,
-  0x049b, 0x049b,
-  0x049d, 0x049d,
-  0x049f, 0x049f,
-  0x04a1, 0x04a1,
-  0x04a3, 0x04a3,
-  0x04a5, 0x04a5,
-  0x04a7, 0x04a7,
-  0x04a9, 0x04a9,
-  0x04ab, 0x04ab,
-  0x04ad, 0x04ad,
-  0x04af, 0x04af,
-  0x04b1, 0x04b1,
-  0x04b3, 0x04b3,
-  0x04b5, 0x04b5,
-  0x04b7, 0x04b7,
-  0x04b9, 0x04b9,
-  0x04bb, 0x04bb,
-  0x04bd, 0x04bd,
-  0x04bf, 0x04bf,
-  0x04c2, 0x04c2,
-  0x04c4, 0x04c4,
-  0x04c6, 0x04c6,
-  0x04c8, 0x04c8,
-  0x04ca, 0x04ca,
-  0x04cc, 0x04cc,
-  0x04ce, 0x04ce,
-  0x04d1, 0x04d1,
-  0x04d3, 0x04d3,
-  0x04d5, 0x04d5,
-  0x04d7, 0x04d7,
-  0x04d9, 0x04d9,
-  0x04db, 0x04db,
-  0x04dd, 0x04dd,
-  0x04df, 0x04df,
-  0x04e1, 0x04e1,
-  0x04e3, 0x04e3,
-  0x04e5, 0x04e5,
-  0x04e7, 0x04e7,
-  0x04e9, 0x04e9,
-  0x04eb, 0x04eb,
-  0x04ed, 0x04ed,
-  0x04ef, 0x04ef,
-  0x04f1, 0x04f1,
-  0x04f3, 0x04f3,
-  0x04f5, 0x04f5,
-  0x04f7, 0x04f7,
-  0x04f9, 0x04f9,
-  0x0501, 0x0501,
-  0x0503, 0x0503,
-  0x0505, 0x0505,
-  0x0507, 0x0507,
-  0x0509, 0x0509,
-  0x050b, 0x050b,
-  0x050d, 0x050d,
-  0x050f, 0x050f,
-  0x0561, 0x0587,
-  0x1d00, 0x1d2b,
-  0x1d62, 0x1d77,
-  0x1d79, 0x1d9a,
-  0x1e01, 0x1e01,
-  0x1e03, 0x1e03,
-  0x1e05, 0x1e05,
-  0x1e07, 0x1e07,
-  0x1e09, 0x1e09,
-  0x1e0b, 0x1e0b,
-  0x1e0d, 0x1e0d,
-  0x1e0f, 0x1e0f,
-  0x1e11, 0x1e11,
-  0x1e13, 0x1e13,
-  0x1e15, 0x1e15,
-  0x1e17, 0x1e17,
-  0x1e19, 0x1e19,
-  0x1e1b, 0x1e1b,
-  0x1e1d, 0x1e1d,
-  0x1e1f, 0x1e1f,
-  0x1e21, 0x1e21,
-  0x1e23, 0x1e23,
-  0x1e25, 0x1e25,
-  0x1e27, 0x1e27,
-  0x1e29, 0x1e29,
-  0x1e2b, 0x1e2b,
-  0x1e2d, 0x1e2d,
-  0x1e2f, 0x1e2f,
-  0x1e31, 0x1e31,
-  0x1e33, 0x1e33,
-  0x1e35, 0x1e35,
-  0x1e37, 0x1e37,
-  0x1e39, 0x1e39,
-  0x1e3b, 0x1e3b,
-  0x1e3d, 0x1e3d,
-  0x1e3f, 0x1e3f,
-  0x1e41, 0x1e41,
-  0x1e43, 0x1e43,
-  0x1e45, 0x1e45,
-  0x1e47, 0x1e47,
-  0x1e49, 0x1e49,
-  0x1e4b, 0x1e4b,
-  0x1e4d, 0x1e4d,
-  0x1e4f, 0x1e4f,
-  0x1e51, 0x1e51,
-  0x1e53, 0x1e53,
-  0x1e55, 0x1e55,
-  0x1e57, 0x1e57,
-  0x1e59, 0x1e59,
-  0x1e5b, 0x1e5b,
-  0x1e5d, 0x1e5d,
-  0x1e5f, 0x1e5f,
-  0x1e61, 0x1e61,
-  0x1e63, 0x1e63,
-  0x1e65, 0x1e65,
-  0x1e67, 0x1e67,
-  0x1e69, 0x1e69,
-  0x1e6b, 0x1e6b,
-  0x1e6d, 0x1e6d,
-  0x1e6f, 0x1e6f,
-  0x1e71, 0x1e71,
-  0x1e73, 0x1e73,
-  0x1e75, 0x1e75,
-  0x1e77, 0x1e77,
-  0x1e79, 0x1e79,
-  0x1e7b, 0x1e7b,
-  0x1e7d, 0x1e7d,
-  0x1e7f, 0x1e7f,
-  0x1e81, 0x1e81,
-  0x1e83, 0x1e83,
-  0x1e85, 0x1e85,
-  0x1e87, 0x1e87,
-  0x1e89, 0x1e89,
-  0x1e8b, 0x1e8b,
-  0x1e8d, 0x1e8d,
-  0x1e8f, 0x1e8f,
-  0x1e91, 0x1e91,
-  0x1e93, 0x1e93,
-  0x1e95, 0x1e9b,
-  0x1ea1, 0x1ea1,
-  0x1ea3, 0x1ea3,
-  0x1ea5, 0x1ea5,
-  0x1ea7, 0x1ea7,
-  0x1ea9, 0x1ea9,
-  0x1eab, 0x1eab,
-  0x1ead, 0x1ead,
-  0x1eaf, 0x1eaf,
-  0x1eb1, 0x1eb1,
-  0x1eb3, 0x1eb3,
-  0x1eb5, 0x1eb5,
-  0x1eb7, 0x1eb7,
-  0x1eb9, 0x1eb9,
-  0x1ebb, 0x1ebb,
-  0x1ebd, 0x1ebd,
-  0x1ebf, 0x1ebf,
-  0x1ec1, 0x1ec1,
-  0x1ec3, 0x1ec3,
-  0x1ec5, 0x1ec5,
-  0x1ec7, 0x1ec7,
-  0x1ec9, 0x1ec9,
-  0x1ecb, 0x1ecb,
-  0x1ecd, 0x1ecd,
-  0x1ecf, 0x1ecf,
-  0x1ed1, 0x1ed1,
-  0x1ed3, 0x1ed3,
-  0x1ed5, 0x1ed5,
-  0x1ed7, 0x1ed7,
-  0x1ed9, 0x1ed9,
-  0x1edb, 0x1edb,
-  0x1edd, 0x1edd,
-  0x1edf, 0x1edf,
-  0x1ee1, 0x1ee1,
-  0x1ee3, 0x1ee3,
-  0x1ee5, 0x1ee5,
-  0x1ee7, 0x1ee7,
-  0x1ee9, 0x1ee9,
-  0x1eeb, 0x1eeb,
-  0x1eed, 0x1eed,
-  0x1eef, 0x1eef,
-  0x1ef1, 0x1ef1,
-  0x1ef3, 0x1ef3,
-  0x1ef5, 0x1ef5,
-  0x1ef7, 0x1ef7,
-  0x1ef9, 0x1ef9,
-  0x1f00, 0x1f07,
-  0x1f10, 0x1f15,
-  0x1f20, 0x1f27,
-  0x1f30, 0x1f37,
-  0x1f40, 0x1f45,
-  0x1f50, 0x1f57,
-  0x1f60, 0x1f67,
-  0x1f70, 0x1f7d,
-  0x1f80, 0x1f87,
-  0x1f90, 0x1f97,
-  0x1fa0, 0x1fa7,
-  0x1fb0, 0x1fb4,
-  0x1fb6, 0x1fb7,
-  0x1fbe, 0x1fbe,
-  0x1fc2, 0x1fc4,
-  0x1fc6, 0x1fc7,
-  0x1fd0, 0x1fd3,
-  0x1fd6, 0x1fd7,
-  0x1fe0, 0x1fe7,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ff7,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x210a, 0x210a,
-  0x210e, 0x210f,
-  0x2113, 0x2113,
-  0x212f, 0x212f,
-  0x2134, 0x2134,
-  0x2139, 0x2139,
-  0x213c, 0x213d,
-  0x2146, 0x2149,
-  0x2c30, 0x2c5e,
-  0x2c81, 0x2c81,
-  0x2c83, 0x2c83,
-  0x2c85, 0x2c85,
-  0x2c87, 0x2c87,
-  0x2c89, 0x2c89,
-  0x2c8b, 0x2c8b,
-  0x2c8d, 0x2c8d,
-  0x2c8f, 0x2c8f,
-  0x2c91, 0x2c91,
-  0x2c93, 0x2c93,
-  0x2c95, 0x2c95,
-  0x2c97, 0x2c97,
-  0x2c99, 0x2c99,
-  0x2c9b, 0x2c9b,
-  0x2c9d, 0x2c9d,
-  0x2c9f, 0x2c9f,
-  0x2ca1, 0x2ca1,
-  0x2ca3, 0x2ca3,
-  0x2ca5, 0x2ca5,
-  0x2ca7, 0x2ca7,
-  0x2ca9, 0x2ca9,
-  0x2cab, 0x2cab,
-  0x2cad, 0x2cad,
-  0x2caf, 0x2caf,
-  0x2cb1, 0x2cb1,
-  0x2cb3, 0x2cb3,
-  0x2cb5, 0x2cb5,
-  0x2cb7, 0x2cb7,
-  0x2cb9, 0x2cb9,
-  0x2cbb, 0x2cbb,
-  0x2cbd, 0x2cbd,
-  0x2cbf, 0x2cbf,
-  0x2cc1, 0x2cc1,
-  0x2cc3, 0x2cc3,
-  0x2cc5, 0x2cc5,
-  0x2cc7, 0x2cc7,
-  0x2cc9, 0x2cc9,
-  0x2ccb, 0x2ccb,
-  0x2ccd, 0x2ccd,
-  0x2ccf, 0x2ccf,
-  0x2cd1, 0x2cd1,
-  0x2cd3, 0x2cd3,
-  0x2cd5, 0x2cd5,
-  0x2cd7, 0x2cd7,
-  0x2cd9, 0x2cd9,
-  0x2cdb, 0x2cdb,
-  0x2cdd, 0x2cdd,
-  0x2cdf, 0x2cdf,
-  0x2ce1, 0x2ce1,
-  0x2ce3, 0x2ce4,
-  0x2d00, 0x2d25,
-  0xfb00, 0xfb06,
-  0xfb13, 0xfb17,
-  0xff41, 0xff5a,
-  0x10428, 0x1044f,
-  0x1d41a, 0x1d433,
-  0x1d44e, 0x1d454,
-  0x1d456, 0x1d467,
-  0x1d482, 0x1d49b,
-  0x1d4b6, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d4cf,
-  0x1d4ea, 0x1d503,
-  0x1d51e, 0x1d537,
-  0x1d552, 0x1d56b,
-  0x1d586, 0x1d59f,
-  0x1d5ba, 0x1d5d3,
-  0x1d5ee, 0x1d607,
-  0x1d622, 0x1d63b,
-  0x1d656, 0x1d66f,
-  0x1d68a, 0x1d6a5,
-  0x1d6c2, 0x1d6da,
-  0x1d6dc, 0x1d6e1,
-  0x1d6fc, 0x1d714,
-  0x1d716, 0x1d71b,
-  0x1d736, 0x1d74e,
-  0x1d750, 0x1d755,
-  0x1d770, 0x1d788,
-  0x1d78a, 0x1d78f,
-  0x1d7aa, 0x1d7c2,
-  0x1d7c4, 0x1d7c9
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-  26,
-  0x02b0, 0x02c1,
-  0x02c6, 0x02d1,
-  0x02e0, 0x02e4,
-  0x02ee, 0x02ee,
-  0x037a, 0x037a,
-  0x0559, 0x0559,
-  0x0640, 0x0640,
-  0x06e5, 0x06e6,
-  0x0e46, 0x0e46,
-  0x0ec6, 0x0ec6,
-  0x10fc, 0x10fc,
-  0x17d7, 0x17d7,
-  0x1843, 0x1843,
-  0x1d2c, 0x1d61,
-  0x1d78, 0x1d78,
-  0x1d9b, 0x1dbf,
-  0x2090, 0x2094,
-  0x2d6f, 0x2d6f,
-  0x3005, 0x3005,
-  0x3031, 0x3035,
-  0x303b, 0x303b,
-  0x309d, 0x309e,
-  0x30fc, 0x30fe,
-  0xa015, 0xa015,
-  0xff70, 0xff70,
-  0xff9e, 0xff9f
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-  245,
-  0x01bb, 0x01bb,
-  0x01c0, 0x01c3,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f2,
-  0x0621, 0x063a,
-  0x0641, 0x064a,
-  0x066e, 0x066f,
-  0x0671, 0x06d3,
-  0x06d5, 0x06d5,
-  0x06ee, 0x06ef,
-  0x06fa, 0x06fc,
-  0x06ff, 0x06ff,
-  0x0710, 0x0710,
-  0x0712, 0x072f,
-  0x074d, 0x076d,
-  0x0780, 0x07a5,
-  0x07b1, 0x07b1,
-  0x0904, 0x0939,
-  0x093d, 0x093d,
-  0x0950, 0x0950,
-  0x0958, 0x0961,
-  0x097d, 0x097d,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bd, 0x09bd,
-  0x09ce, 0x09ce,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e1,
-  0x09f0, 0x09f1,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a72, 0x0a74,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abd, 0x0abd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae1,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3d, 0x0b3d,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b71, 0x0b71,
-  0x0b83, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c60, 0x0c61,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbd, 0x0cbd,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d60, 0x0d61,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0e01, 0x0e30,
-  0x0e32, 0x0e33,
-  0x0e40, 0x0e45,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb0,
-  0x0eb2, 0x0eb3,
-  0x0ebd, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0edc, 0x0edd,
-  0x0f00, 0x0f00,
-  0x0f40, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f88, 0x0f8b,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x1050, 0x1055,
-  0x10d0, 0x10fa,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x1380, 0x138f,
-  0x13a0, 0x13f4,
-  0x1401, 0x166c,
-  0x166f, 0x1676,
-  0x1681, 0x169a,
-  0x16a0, 0x16ea,
-  0x1700, 0x170c,
-  0x170e, 0x1711,
-  0x1720, 0x1731,
-  0x1740, 0x1751,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1780, 0x17b3,
-  0x17dc, 0x17dc,
-  0x1820, 0x1842,
-  0x1844, 0x1877,
-  0x1880, 0x18a8,
-  0x1900, 0x191c,
-  0x1950, 0x196d,
-  0x1970, 0x1974,
-  0x1980, 0x19a9,
-  0x19c1, 0x19c7,
-  0x1a00, 0x1a16,
-  0x2135, 0x2138,
-  0x2d30, 0x2d65,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde,
-  0x3006, 0x3006,
-  0x303c, 0x303c,
-  0x3041, 0x3096,
-  0x309f, 0x309f,
-  0x30a1, 0x30fa,
-  0x30ff, 0x30ff,
-  0x3105, 0x312c,
-  0x3131, 0x318e,
-  0x31a0, 0x31b7,
-  0x31f0, 0x31ff,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xa000, 0xa014,
-  0xa016, 0xa48c,
-  0xa800, 0xa801,
-  0xa803, 0xa805,
-  0xa807, 0xa80a,
-  0xa80c, 0xa822,
-  0xac00, 0xd7a3,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0xfb1d, 0xfb1d,
-  0xfb1f, 0xfb28,
-  0xfb2a, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfb,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc,
-  0xff66, 0xff6f,
-  0xff71, 0xff9d,
-  0xffa0, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa,
-  0x10300, 0x1031e,
-  0x10330, 0x10349,
-  0x10380, 0x1039d,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103cf,
-  0x10450, 0x1049d,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f,
-  0x10a00, 0x10a00,
-  0x10a10, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d
-}; /* CR_Lo */
-
-/* 'Lt': General Category */
-static const OnigCodePoint CR_Lt[] = {
-  10,
-  0x01c5, 0x01c5,
-  0x01c8, 0x01c8,
-  0x01cb, 0x01cb,
-  0x01f2, 0x01f2,
-  0x1f88, 0x1f8f,
-  0x1f98, 0x1f9f,
-  0x1fa8, 0x1faf,
-  0x1fbc, 0x1fbc,
-  0x1fcc, 0x1fcc,
-  0x1ffc, 0x1ffc
-}; /* CR_Lt */
-
-/* 'Lu': General Category */
-static const OnigCodePoint CR_Lu[] = {
-  476,
-  0x0041, 0x005a,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00de,
-  0x0100, 0x0100,
-  0x0102, 0x0102,
-  0x0104, 0x0104,
-  0x0106, 0x0106,
-  0x0108, 0x0108,
-  0x010a, 0x010a,
-  0x010c, 0x010c,
-  0x010e, 0x010e,
-  0x0110, 0x0110,
-  0x0112, 0x0112,
-  0x0114, 0x0114,
-  0x0116, 0x0116,
-  0x0118, 0x0118,
-  0x011a, 0x011a,
-  0x011c, 0x011c,
-  0x011e, 0x011e,
-  0x0120, 0x0120,
-  0x0122, 0x0122,
-  0x0124, 0x0124,
-  0x0126, 0x0126,
-  0x0128, 0x0128,
-  0x012a, 0x012a,
-  0x012c, 0x012c,
-  0x012e, 0x012e,
-  0x0130, 0x0130,
-  0x0132, 0x0132,
-  0x0134, 0x0134,
-  0x0136, 0x0136,
-  0x0139, 0x0139,
-  0x013b, 0x013b,
-  0x013d, 0x013d,
-  0x013f, 0x013f,
-  0x0141, 0x0141,
-  0x0143, 0x0143,
-  0x0145, 0x0145,
-  0x0147, 0x0147,
-  0x014a, 0x014a,
-  0x014c, 0x014c,
-  0x014e, 0x014e,
-  0x0150, 0x0150,
-  0x0152, 0x0152,
-  0x0154, 0x0154,
-  0x0156, 0x0156,
-  0x0158, 0x0158,
-  0x015a, 0x015a,
-  0x015c, 0x015c,
-  0x015e, 0x015e,
-  0x0160, 0x0160,
-  0x0162, 0x0162,
-  0x0164, 0x0164,
-  0x0166, 0x0166,
-  0x0168, 0x0168,
-  0x016a, 0x016a,
-  0x016c, 0x016c,
-  0x016e, 0x016e,
-  0x0170, 0x0170,
-  0x0172, 0x0172,
-  0x0174, 0x0174,
-  0x0176, 0x0176,
-  0x0178, 0x0179,
-  0x017b, 0x017b,
-  0x017d, 0x017d,
-  0x0181, 0x0182,
-  0x0184, 0x0184,
-  0x0186, 0x0187,
-  0x0189, 0x018b,
-  0x018e, 0x0191,
-  0x0193, 0x0194,
-  0x0196, 0x0198,
-  0x019c, 0x019d,
-  0x019f, 0x01a0,
-  0x01a2, 0x01a2,
-  0x01a4, 0x01a4,
-  0x01a6, 0x01a7,
-  0x01a9, 0x01a9,
-  0x01ac, 0x01ac,
-  0x01ae, 0x01af,
-  0x01b1, 0x01b3,
-  0x01b5, 0x01b5,
-  0x01b7, 0x01b8,
-  0x01bc, 0x01bc,
-  0x01c4, 0x01c4,
-  0x01c7, 0x01c7,
-  0x01ca, 0x01ca,
-  0x01cd, 0x01cd,
-  0x01cf, 0x01cf,
-  0x01d1, 0x01d1,
-  0x01d3, 0x01d3,
-  0x01d5, 0x01d5,
-  0x01d7, 0x01d7,
-  0x01d9, 0x01d9,
-  0x01db, 0x01db,
-  0x01de, 0x01de,
-  0x01e0, 0x01e0,
-  0x01e2, 0x01e2,
-  0x01e4, 0x01e4,
-  0x01e6, 0x01e6,
-  0x01e8, 0x01e8,
-  0x01ea, 0x01ea,
-  0x01ec, 0x01ec,
-  0x01ee, 0x01ee,
-  0x01f1, 0x01f1,
-  0x01f4, 0x01f4,
-  0x01f6, 0x01f8,
-  0x01fa, 0x01fa,
-  0x01fc, 0x01fc,
-  0x01fe, 0x01fe,
-  0x0200, 0x0200,
-  0x0202, 0x0202,
-  0x0204, 0x0204,
-  0x0206, 0x0206,
-  0x0208, 0x0208,
-  0x020a, 0x020a,
-  0x020c, 0x020c,
-  0x020e, 0x020e,
-  0x0210, 0x0210,
-  0x0212, 0x0212,
-  0x0214, 0x0214,
-  0x0216, 0x0216,
-  0x0218, 0x0218,
-  0x021a, 0x021a,
-  0x021c, 0x021c,
-  0x021e, 0x021e,
-  0x0220, 0x0220,
-  0x0222, 0x0222,
-  0x0224, 0x0224,
-  0x0226, 0x0226,
-  0x0228, 0x0228,
-  0x022a, 0x022a,
-  0x022c, 0x022c,
-  0x022e, 0x022e,
-  0x0230, 0x0230,
-  0x0232, 0x0232,
-  0x023a, 0x023b,
-  0x023d, 0x023e,
-  0x0241, 0x0241,
-  0x0386, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x038f,
-  0x0391, 0x03a1,
-  0x03a3, 0x03ab,
-  0x03d2, 0x03d4,
-  0x03d8, 0x03d8,
-  0x03da, 0x03da,
-  0x03dc, 0x03dc,
-  0x03de, 0x03de,
-  0x03e0, 0x03e0,
-  0x03e2, 0x03e2,
-  0x03e4, 0x03e4,
-  0x03e6, 0x03e6,
-  0x03e8, 0x03e8,
-  0x03ea, 0x03ea,
-  0x03ec, 0x03ec,
-  0x03ee, 0x03ee,
-  0x03f4, 0x03f4,
-  0x03f7, 0x03f7,
-  0x03f9, 0x03fa,
-  0x03fd, 0x042f,
-  0x0460, 0x0460,
-  0x0462, 0x0462,
-  0x0464, 0x0464,
-  0x0466, 0x0466,
-  0x0468, 0x0468,
-  0x046a, 0x046a,
-  0x046c, 0x046c,
-  0x046e, 0x046e,
-  0x0470, 0x0470,
-  0x0472, 0x0472,
-  0x0474, 0x0474,
-  0x0476, 0x0476,
-  0x0478, 0x0478,
-  0x047a, 0x047a,
-  0x047c, 0x047c,
-  0x047e, 0x047e,
-  0x0480, 0x0480,
-  0x048a, 0x048a,
-  0x048c, 0x048c,
-  0x048e, 0x048e,
-  0x0490, 0x0490,
-  0x0492, 0x0492,
-  0x0494, 0x0494,
-  0x0496, 0x0496,
-  0x0498, 0x0498,
-  0x049a, 0x049a,
-  0x049c, 0x049c,
-  0x049e, 0x049e,
-  0x04a0, 0x04a0,
-  0x04a2, 0x04a2,
-  0x04a4, 0x04a4,
-  0x04a6, 0x04a6,
-  0x04a8, 0x04a8,
-  0x04aa, 0x04aa,
-  0x04ac, 0x04ac,
-  0x04ae, 0x04ae,
-  0x04b0, 0x04b0,
-  0x04b2, 0x04b2,
-  0x04b4, 0x04b4,
-  0x04b6, 0x04b6,
-  0x04b8, 0x04b8,
-  0x04ba, 0x04ba,
-  0x04bc, 0x04bc,
-  0x04be, 0x04be,
-  0x04c0, 0x04c1,
-  0x04c3, 0x04c3,
-  0x04c5, 0x04c5,
-  0x04c7, 0x04c7,
-  0x04c9, 0x04c9,
-  0x04cb, 0x04cb,
-  0x04cd, 0x04cd,
-  0x04d0, 0x04d0,
-  0x04d2, 0x04d2,
-  0x04d4, 0x04d4,
-  0x04d6, 0x04d6,
-  0x04d8, 0x04d8,
-  0x04da, 0x04da,
-  0x04dc, 0x04dc,
-  0x04de, 0x04de,
-  0x04e0, 0x04e0,
-  0x04e2, 0x04e2,
-  0x04e4, 0x04e4,
-  0x04e6, 0x04e6,
-  0x04e8, 0x04e8,
-  0x04ea, 0x04ea,
-  0x04ec, 0x04ec,
-  0x04ee, 0x04ee,
-  0x04f0, 0x04f0,
-  0x04f2, 0x04f2,
-  0x04f4, 0x04f4,
-  0x04f6, 0x04f6,
-  0x04f8, 0x04f8,
-  0x0500, 0x0500,
-  0x0502, 0x0502,
-  0x0504, 0x0504,
-  0x0506, 0x0506,
-  0x0508, 0x0508,
-  0x050a, 0x050a,
-  0x050c, 0x050c,
-  0x050e, 0x050e,
-  0x0531, 0x0556,
-  0x10a0, 0x10c5,
-  0x1e00, 0x1e00,
-  0x1e02, 0x1e02,
-  0x1e04, 0x1e04,
-  0x1e06, 0x1e06,
-  0x1e08, 0x1e08,
-  0x1e0a, 0x1e0a,
-  0x1e0c, 0x1e0c,
-  0x1e0e, 0x1e0e,
-  0x1e10, 0x1e10,
-  0x1e12, 0x1e12,
-  0x1e14, 0x1e14,
-  0x1e16, 0x1e16,
-  0x1e18, 0x1e18,
-  0x1e1a, 0x1e1a,
-  0x1e1c, 0x1e1c,
-  0x1e1e, 0x1e1e,
-  0x1e20, 0x1e20,
-  0x1e22, 0x1e22,
-  0x1e24, 0x1e24,
-  0x1e26, 0x1e26,
-  0x1e28, 0x1e28,
-  0x1e2a, 0x1e2a,
-  0x1e2c, 0x1e2c,
-  0x1e2e, 0x1e2e,
-  0x1e30, 0x1e30,
-  0x1e32, 0x1e32,
-  0x1e34, 0x1e34,
-  0x1e36, 0x1e36,
-  0x1e38, 0x1e38,
-  0x1e3a, 0x1e3a,
-  0x1e3c, 0x1e3c,
-  0x1e3e, 0x1e3e,
-  0x1e40, 0x1e40,
-  0x1e42, 0x1e42,
-  0x1e44, 0x1e44,
-  0x1e46, 0x1e46,
-  0x1e48, 0x1e48,
-  0x1e4a, 0x1e4a,
-  0x1e4c, 0x1e4c,
-  0x1e4e, 0x1e4e,
-  0x1e50, 0x1e50,
-  0x1e52, 0x1e52,
-  0x1e54, 0x1e54,
-  0x1e56, 0x1e56,
-  0x1e58, 0x1e58,
-  0x1e5a, 0x1e5a,
-  0x1e5c, 0x1e5c,
-  0x1e5e, 0x1e5e,
-  0x1e60, 0x1e60,
-  0x1e62, 0x1e62,
-  0x1e64, 0x1e64,
-  0x1e66, 0x1e66,
-  0x1e68, 0x1e68,
-  0x1e6a, 0x1e6a,
-  0x1e6c, 0x1e6c,
-  0x1e6e, 0x1e6e,
-  0x1e70, 0x1e70,
-  0x1e72, 0x1e72,
-  0x1e74, 0x1e74,
-  0x1e76, 0x1e76,
-  0x1e78, 0x1e78,
-  0x1e7a, 0x1e7a,
-  0x1e7c, 0x1e7c,
-  0x1e7e, 0x1e7e,
-  0x1e80, 0x1e80,
-  0x1e82, 0x1e82,
-  0x1e84, 0x1e84,
-  0x1e86, 0x1e86,
-  0x1e88, 0x1e88,
-  0x1e8a, 0x1e8a,
-  0x1e8c, 0x1e8c,
-  0x1e8e, 0x1e8e,
-  0x1e90, 0x1e90,
-  0x1e92, 0x1e92,
-  0x1e94, 0x1e94,
-  0x1ea0, 0x1ea0,
-  0x1ea2, 0x1ea2,
-  0x1ea4, 0x1ea4,
-  0x1ea6, 0x1ea6,
-  0x1ea8, 0x1ea8,
-  0x1eaa, 0x1eaa,
-  0x1eac, 0x1eac,
-  0x1eae, 0x1eae,
-  0x1eb0, 0x1eb0,
-  0x1eb2, 0x1eb2,
-  0x1eb4, 0x1eb4,
-  0x1eb6, 0x1eb6,
-  0x1eb8, 0x1eb8,
-  0x1eba, 0x1eba,
-  0x1ebc, 0x1ebc,
-  0x1ebe, 0x1ebe,
-  0x1ec0, 0x1ec0,
-  0x1ec2, 0x1ec2,
-  0x1ec4, 0x1ec4,
-  0x1ec6, 0x1ec6,
-  0x1ec8, 0x1ec8,
-  0x1eca, 0x1eca,
-  0x1ecc, 0x1ecc,
-  0x1ece, 0x1ece,
-  0x1ed0, 0x1ed0,
-  0x1ed2, 0x1ed2,
-  0x1ed4, 0x1ed4,
-  0x1ed6, 0x1ed6,
-  0x1ed8, 0x1ed8,
-  0x1eda, 0x1eda,
-  0x1edc, 0x1edc,
-  0x1ede, 0x1ede,
-  0x1ee0, 0x1ee0,
-  0x1ee2, 0x1ee2,
-  0x1ee4, 0x1ee4,
-  0x1ee6, 0x1ee6,
-  0x1ee8, 0x1ee8,
-  0x1eea, 0x1eea,
-  0x1eec, 0x1eec,
-  0x1eee, 0x1eee,
-  0x1ef0, 0x1ef0,
-  0x1ef2, 0x1ef2,
-  0x1ef4, 0x1ef4,
-  0x1ef6, 0x1ef6,
-  0x1ef8, 0x1ef8,
-  0x1f08, 0x1f0f,
-  0x1f18, 0x1f1d,
-  0x1f28, 0x1f2f,
-  0x1f38, 0x1f3f,
-  0x1f48, 0x1f4d,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f5f,
-  0x1f68, 0x1f6f,
-  0x1fb8, 0x1fbb,
-  0x1fc8, 0x1fcb,
-  0x1fd8, 0x1fdb,
-  0x1fe8, 0x1fec,
-  0x1ff8, 0x1ffb,
-  0x2102, 0x2102,
-  0x2107, 0x2107,
-  0x210b, 0x210d,
-  0x2110, 0x2112,
-  0x2115, 0x2115,
-  0x2119, 0x211d,
-  0x2124, 0x2124,
-  0x2126, 0x2126,
-  0x2128, 0x2128,
-  0x212a, 0x212d,
-  0x2130, 0x2131,
-  0x2133, 0x2133,
-  0x213e, 0x213f,
-  0x2145, 0x2145,
-  0x2c00, 0x2c2e,
-  0x2c80, 0x2c80,
-  0x2c82, 0x2c82,
-  0x2c84, 0x2c84,
-  0x2c86, 0x2c86,
-  0x2c88, 0x2c88,
-  0x2c8a, 0x2c8a,
-  0x2c8c, 0x2c8c,
-  0x2c8e, 0x2c8e,
-  0x2c90, 0x2c90,
-  0x2c92, 0x2c92,
-  0x2c94, 0x2c94,
-  0x2c96, 0x2c96,
-  0x2c98, 0x2c98,
-  0x2c9a, 0x2c9a,
-  0x2c9c, 0x2c9c,
-  0x2c9e, 0x2c9e,
-  0x2ca0, 0x2ca0,
-  0x2ca2, 0x2ca2,
-  0x2ca4, 0x2ca4,
-  0x2ca6, 0x2ca6,
-  0x2ca8, 0x2ca8,
-  0x2caa, 0x2caa,
-  0x2cac, 0x2cac,
-  0x2cae, 0x2cae,
-  0x2cb0, 0x2cb0,
-  0x2cb2, 0x2cb2,
-  0x2cb4, 0x2cb4,
-  0x2cb6, 0x2cb6,
-  0x2cb8, 0x2cb8,
-  0x2cba, 0x2cba,
-  0x2cbc, 0x2cbc,
-  0x2cbe, 0x2cbe,
-  0x2cc0, 0x2cc0,
-  0x2cc2, 0x2cc2,
-  0x2cc4, 0x2cc4,
-  0x2cc6, 0x2cc6,
-  0x2cc8, 0x2cc8,
-  0x2cca, 0x2cca,
-  0x2ccc, 0x2ccc,
-  0x2cce, 0x2cce,
-  0x2cd0, 0x2cd0,
-  0x2cd2, 0x2cd2,
-  0x2cd4, 0x2cd4,
-  0x2cd6, 0x2cd6,
-  0x2cd8, 0x2cd8,
-  0x2cda, 0x2cda,
-  0x2cdc, 0x2cdc,
-  0x2cde, 0x2cde,
-  0x2ce0, 0x2ce0,
-  0x2ce2, 0x2ce2,
-  0xff21, 0xff3a,
-  0x10400, 0x10427,
-  0x1d400, 0x1d419,
-  0x1d434, 0x1d44d,
-  0x1d468, 0x1d481,
-  0x1d49c, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b5,
-  0x1d4d0, 0x1d4e9,
-  0x1d504, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d538, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d56c, 0x1d585,
-  0x1d5a0, 0x1d5b9,
-  0x1d5d4, 0x1d5ed,
-  0x1d608, 0x1d621,
-  0x1d63c, 0x1d655,
-  0x1d670, 0x1d689,
-  0x1d6a8, 0x1d6c0,
-  0x1d6e2, 0x1d6fa,
-  0x1d71c, 0x1d734,
-  0x1d756, 0x1d76e,
-  0x1d790, 0x1d7a8
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-  133,
-  0x0300, 0x036f,
-  0x0483, 0x0486,
-  0x0488, 0x0489,
-  0x0591, 0x05b9,
-  0x05bb, 0x05bd,
-  0x05bf, 0x05bf,
-  0x05c1, 0x05c2,
-  0x05c4, 0x05c5,
-  0x05c7, 0x05c7,
-  0x0610, 0x0615,
-  0x064b, 0x065e,
-  0x0670, 0x0670,
-  0x06d6, 0x06dc,
-  0x06de, 0x06e4,
-  0x06e7, 0x06e8,
-  0x06ea, 0x06ed,
-  0x0711, 0x0711,
-  0x0730, 0x074a,
-  0x07a6, 0x07b0,
-  0x0901, 0x0903,
-  0x093c, 0x093c,
-  0x093e, 0x094d,
-  0x0951, 0x0954,
-  0x0962, 0x0963,
-  0x0981, 0x0983,
-  0x09bc, 0x09bc,
-  0x09be, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09cd,
-  0x09d7, 0x09d7,
-  0x09e2, 0x09e3,
-  0x0a01, 0x0a03,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a70, 0x0a71,
-  0x0a81, 0x0a83,
-  0x0abc, 0x0abc,
-  0x0abe, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ae2, 0x0ae3,
-  0x0b01, 0x0b03,
-  0x0b3c, 0x0b3c,
-  0x0b3e, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b82, 0x0b82,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0c01, 0x0c03,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c82, 0x0c83,
-  0x0cbc, 0x0cbc,
-  0x0cbe, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0d02, 0x0d03,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d82, 0x0d83,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df3,
-  0x0e31, 0x0e31,
-  0x0e34, 0x0e3a,
-  0x0e47, 0x0e4e,
-  0x0eb1, 0x0eb1,
-  0x0eb4, 0x0eb9,
-  0x0ebb, 0x0ebc,
-  0x0ec8, 0x0ecd,
-  0x0f18, 0x0f19,
-  0x0f35, 0x0f35,
-  0x0f37, 0x0f37,
-  0x0f39, 0x0f39,
-  0x0f3e, 0x0f3f,
-  0x0f71, 0x0f84,
-  0x0f86, 0x0f87,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fc6, 0x0fc6,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1056, 0x1059,
-  0x135f, 0x135f,
-  0x1712, 0x1714,
-  0x1732, 0x1734,
-  0x1752, 0x1753,
-  0x1772, 0x1773,
-  0x17b6, 0x17d3,
-  0x17dd, 0x17dd,
-  0x180b, 0x180d,
-  0x18a9, 0x18a9,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x19b0, 0x19c0,
-  0x19c8, 0x19c9,
-  0x1a17, 0x1a1b,
-  0x1dc0, 0x1dc3,
-  0x20d0, 0x20eb,
-  0x302a, 0x302f,
-  0x3099, 0x309a,
-  0xa802, 0xa802,
-  0xa806, 0xa806,
-  0xa80b, 0xa80b,
-  0xa823, 0xa827,
-  0xfb1e, 0xfb1e,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0x10a01, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a0f,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a3f,
-  0x1d165, 0x1d169,
-  0x1d16d, 0x1d172,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0x1d242, 0x1d244,
-  0xe0100, 0xe01ef
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-  63,
-  0x0903, 0x0903,
-  0x093e, 0x0940,
-  0x0949, 0x094c,
-  0x0982, 0x0983,
-  0x09be, 0x09c0,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09cc,
-  0x09d7, 0x09d7,
-  0x0a03, 0x0a03,
-  0x0a3e, 0x0a40,
-  0x0a83, 0x0a83,
-  0x0abe, 0x0ac0,
-  0x0ac9, 0x0ac9,
-  0x0acb, 0x0acc,
-  0x0b02, 0x0b03,
-  0x0b3e, 0x0b3e,
-  0x0b40, 0x0b40,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4c,
-  0x0b57, 0x0b57,
-  0x0bbe, 0x0bbf,
-  0x0bc1, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcc,
-  0x0bd7, 0x0bd7,
-  0x0c01, 0x0c03,
-  0x0c41, 0x0c44,
-  0x0c82, 0x0c83,
-  0x0cbe, 0x0cbe,
-  0x0cc0, 0x0cc4,
-  0x0cc7, 0x0cc8,
-  0x0cca, 0x0ccb,
-  0x0cd5, 0x0cd6,
-  0x0d02, 0x0d03,
-  0x0d3e, 0x0d40,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4c,
-  0x0d57, 0x0d57,
-  0x0d82, 0x0d83,
-  0x0dcf, 0x0dd1,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df3,
-  0x0f3e, 0x0f3f,
-  0x0f7f, 0x0f7f,
-  0x102c, 0x102c,
-  0x1031, 0x1031,
-  0x1038, 0x1038,
-  0x1056, 0x1057,
-  0x17b6, 0x17b6,
-  0x17be, 0x17c5,
-  0x17c7, 0x17c8,
-  0x1923, 0x1926,
-  0x1929, 0x192b,
-  0x1930, 0x1931,
-  0x1933, 0x1938,
-  0x19b0, 0x19c0,
-  0x19c8, 0x19c9,
-  0x1a19, 0x1a1b,
-  0xa802, 0xa802,
-  0xa823, 0xa824,
-  0xa827, 0xa827,
-  0x1d165, 0x1d166,
-  0x1d16d, 0x1d172
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-  4,
-  0x0488, 0x0489,
-  0x06de, 0x06de,
-  0x20dd, 0x20e0,
-  0x20e2, 0x20e4
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-  124,
-  0x0300, 0x036f,
-  0x0483, 0x0486,
-  0x0591, 0x05b9,
-  0x05bb, 0x05bd,
-  0x05bf, 0x05bf,
-  0x05c1, 0x05c2,
-  0x05c4, 0x05c5,
-  0x05c7, 0x05c7,
-  0x0610, 0x0615,
-  0x064b, 0x065e,
-  0x0670, 0x0670,
-  0x06d6, 0x06dc,
-  0x06df, 0x06e4,
-  0x06e7, 0x06e8,
-  0x06ea, 0x06ed,
-  0x0711, 0x0711,
-  0x0730, 0x074a,
-  0x07a6, 0x07b0,
-  0x0901, 0x0902,
-  0x093c, 0x093c,
-  0x0941, 0x0948,
-  0x094d, 0x094d,
-  0x0951, 0x0954,
-  0x0962, 0x0963,
-  0x0981, 0x0981,
-  0x09bc, 0x09bc,
-  0x09c1, 0x09c4,
-  0x09cd, 0x09cd,
-  0x09e2, 0x09e3,
-  0x0a01, 0x0a02,
-  0x0a3c, 0x0a3c,
-  0x0a41, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a70, 0x0a71,
-  0x0a81, 0x0a82,
-  0x0abc, 0x0abc,
-  0x0ac1, 0x0ac5,
-  0x0ac7, 0x0ac8,
-  0x0acd, 0x0acd,
-  0x0ae2, 0x0ae3,
-  0x0b01, 0x0b01,
-  0x0b3c, 0x0b3c,
-  0x0b3f, 0x0b3f,
-  0x0b41, 0x0b43,
-  0x0b4d, 0x0b4d,
-  0x0b56, 0x0b56,
-  0x0b82, 0x0b82,
-  0x0bc0, 0x0bc0,
-  0x0bcd, 0x0bcd,
-  0x0c3e, 0x0c40,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0cbc, 0x0cbc,
-  0x0cbf, 0x0cbf,
-  0x0cc6, 0x0cc6,
-  0x0ccc, 0x0ccd,
-  0x0d41, 0x0d43,
-  0x0d4d, 0x0d4d,
-  0x0dca, 0x0dca,
-  0x0dd2, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0e31, 0x0e31,
-  0x0e34, 0x0e3a,
-  0x0e47, 0x0e4e,
-  0x0eb1, 0x0eb1,
-  0x0eb4, 0x0eb9,
-  0x0ebb, 0x0ebc,
-  0x0ec8, 0x0ecd,
-  0x0f18, 0x0f19,
-  0x0f35, 0x0f35,
-  0x0f37, 0x0f37,
-  0x0f39, 0x0f39,
-  0x0f71, 0x0f7e,
-  0x0f80, 0x0f84,
-  0x0f86, 0x0f87,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fc6, 0x0fc6,
-  0x102d, 0x1030,
-  0x1032, 0x1032,
-  0x1036, 0x1037,
-  0x1039, 0x1039,
-  0x1058, 0x1059,
-  0x135f, 0x135f,
-  0x1712, 0x1714,
-  0x1732, 0x1734,
-  0x1752, 0x1753,
-  0x1772, 0x1773,
-  0x17b7, 0x17bd,
-  0x17c6, 0x17c6,
-  0x17c9, 0x17d3,
-  0x17dd, 0x17dd,
-  0x180b, 0x180d,
-  0x18a9, 0x18a9,
-  0x1920, 0x1922,
-  0x1927, 0x1928,
-  0x1932, 0x1932,
-  0x1939, 0x193b,
-  0x1a17, 0x1a18,
-  0x1dc0, 0x1dc3,
-  0x20d0, 0x20dc,
-  0x20e1, 0x20e1,
-  0x20e5, 0x20eb,
-  0x302a, 0x302f,
-  0x3099, 0x309a,
-  0xa806, 0xa806,
-  0xa80b, 0xa80b,
-  0xa825, 0xa826,
-  0xfb1e, 0xfb1e,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0x10a01, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a0f,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a3f,
-  0x1d167, 0x1d169,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0x1d242, 0x1d244,
-  0xe0100, 0xe01ef
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-  53,
-  0x0030, 0x0039,
-  0x00b2, 0x00b3,
-  0x00b9, 0x00b9,
-  0x00bc, 0x00be,
-  0x0660, 0x0669,
-  0x06f0, 0x06f9,
-  0x0966, 0x096f,
-  0x09e6, 0x09ef,
-  0x09f4, 0x09f9,
-  0x0a66, 0x0a6f,
-  0x0ae6, 0x0aef,
-  0x0b66, 0x0b6f,
-  0x0be6, 0x0bf2,
-  0x0c66, 0x0c6f,
-  0x0ce6, 0x0cef,
-  0x0d66, 0x0d6f,
-  0x0e50, 0x0e59,
-  0x0ed0, 0x0ed9,
-  0x0f20, 0x0f33,
-  0x1040, 0x1049,
-  0x1369, 0x137c,
-  0x16ee, 0x16f0,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x1810, 0x1819,
-  0x1946, 0x194f,
-  0x19d0, 0x19d9,
-  0x2070, 0x2070,
-  0x2074, 0x2079,
-  0x2080, 0x2089,
-  0x2153, 0x2183,
-  0x2460, 0x249b,
-  0x24ea, 0x24ff,
-  0x2776, 0x2793,
-  0x2cfd, 0x2cfd,
-  0x3007, 0x3007,
-  0x3021, 0x3029,
-  0x3038, 0x303a,
-  0x3192, 0x3195,
-  0x3220, 0x3229,
-  0x3251, 0x325f,
-  0x3280, 0x3289,
-  0x32b1, 0x32bf,
-  0xff10, 0xff19,
-  0x10107, 0x10133,
-  0x10140, 0x10178,
-  0x1018a, 0x1018a,
-  0x10320, 0x10323,
-  0x1034a, 0x1034a,
-  0x103d1, 0x103d5,
-  0x104a0, 0x104a9,
-  0x10a40, 0x10a47,
-  0x1d7ce, 0x1d7ff
-}; /* CR_N */
-
-/* 'Nd': General Category */
-static const OnigCodePoint CR_Nd[] = {
-  23,
-  0x0030, 0x0039,
-  0x0660, 0x0669,
-  0x06f0, 0x06f9,
-  0x0966, 0x096f,
-  0x09e6, 0x09ef,
-  0x0a66, 0x0a6f,
-  0x0ae6, 0x0aef,
-  0x0b66, 0x0b6f,
-  0x0be6, 0x0bef,
-  0x0c66, 0x0c6f,
-  0x0ce6, 0x0cef,
-  0x0d66, 0x0d6f,
-  0x0e50, 0x0e59,
-  0x0ed0, 0x0ed9,
-  0x0f20, 0x0f29,
-  0x1040, 0x1049,
-  0x17e0, 0x17e9,
-  0x1810, 0x1819,
-  0x1946, 0x194f,
-  0x19d0, 0x19d9,
-  0xff10, 0xff19,
-  0x104a0, 0x104a9,
-  0x1d7ce, 0x1d7ff
-}; /* CR_Nd */
-
-/* 'Nl': General Category */
-static const OnigCodePoint CR_Nl[] = {
-  8,
-  0x16ee, 0x16f0,
-  0x2160, 0x2183,
-  0x3007, 0x3007,
-  0x3021, 0x3029,
-  0x3038, 0x303a,
-  0x10140, 0x10174,
-  0x1034a, 0x1034a,
-  0x103d1, 0x103d5
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-  26,
-  0x00b2, 0x00b3,
-  0x00b9, 0x00b9,
-  0x00bc, 0x00be,
-  0x09f4, 0x09f9,
-  0x0bf0, 0x0bf2,
-  0x0f2a, 0x0f33,
-  0x1369, 0x137c,
-  0x17f0, 0x17f9,
-  0x2070, 0x2070,
-  0x2074, 0x2079,
-  0x2080, 0x2089,
-  0x2153, 0x215f,
-  0x2460, 0x249b,
-  0x24ea, 0x24ff,
-  0x2776, 0x2793,
-  0x2cfd, 0x2cfd,
-  0x3192, 0x3195,
-  0x3220, 0x3229,
-  0x3251, 0x325f,
-  0x3280, 0x3289,
-  0x32b1, 0x32bf,
-  0x10107, 0x10133,
-  0x10175, 0x10178,
-  0x1018a, 0x1018a,
-  0x10320, 0x10323,
-  0x10a40, 0x10a47
-}; /* CR_No */
-
-/* 'P': Major Category */
-static const OnigCodePoint CR_P[] = {
-  96,
-  0x0021, 0x0023,
-  0x0025, 0x002a,
-  0x002c, 0x002f,
-  0x003a, 0x003b,
-  0x003f, 0x0040,
-  0x005b, 0x005d,
-  0x005f, 0x005f,
-  0x007b, 0x007b,
-  0x007d, 0x007d,
-  0x00a1, 0x00a1,
-  0x00ab, 0x00ab,
-  0x00b7, 0x00b7,
-  0x00bb, 0x00bb,
-  0x00bf, 0x00bf,
-  0x037e, 0x037e,
-  0x0387, 0x0387,
-  0x055a, 0x055f,
-  0x0589, 0x058a,
-  0x05be, 0x05be,
-  0x05c0, 0x05c0,
-  0x05c3, 0x05c3,
-  0x05c6, 0x05c6,
-  0x05f3, 0x05f4,
-  0x060c, 0x060d,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x066a, 0x066d,
-  0x06d4, 0x06d4,
-  0x0700, 0x070d,
-  0x0964, 0x0965,
-  0x0970, 0x0970,
-  0x0df4, 0x0df4,
-  0x0e4f, 0x0e4f,
-  0x0e5a, 0x0e5b,
-  0x0f04, 0x0f12,
-  0x0f3a, 0x0f3d,
-  0x0f85, 0x0f85,
-  0x0fd0, 0x0fd1,
-  0x104a, 0x104f,
-  0x10fb, 0x10fb,
-  0x1361, 0x1368,
-  0x166d, 0x166e,
-  0x169b, 0x169c,
-  0x16eb, 0x16ed,
-  0x1735, 0x1736,
-  0x17d4, 0x17d6,
-  0x17d8, 0x17da,
-  0x1800, 0x180a,
-  0x1944, 0x1945,
-  0x19de, 0x19df,
-  0x1a1e, 0x1a1f,
-  0x2010, 0x2027,
-  0x2030, 0x2043,
-  0x2045, 0x2051,
-  0x2053, 0x205e,
-  0x207d, 0x207e,
-  0x208d, 0x208e,
-  0x2329, 0x232a,
-  0x23b4, 0x23b6,
-  0x2768, 0x2775,
-  0x27c5, 0x27c6,
-  0x27e6, 0x27eb,
-  0x2983, 0x2998,
-  0x29d8, 0x29db,
-  0x29fc, 0x29fd,
-  0x2cf9, 0x2cfc,
-  0x2cfe, 0x2cff,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x3001, 0x3003,
-  0x3008, 0x3011,
-  0x3014, 0x301f,
-  0x3030, 0x3030,
-  0x303d, 0x303d,
-  0x30a0, 0x30a0,
-  0x30fb, 0x30fb,
-  0xfd3e, 0xfd3f,
-  0xfe10, 0xfe19,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe61,
-  0xfe63, 0xfe63,
-  0xfe68, 0xfe68,
-  0xfe6a, 0xfe6b,
-  0xff01, 0xff03,
-  0xff05, 0xff0a,
-  0xff0c, 0xff0f,
-  0xff1a, 0xff1b,
-  0xff1f, 0xff20,
-  0xff3b, 0xff3d,
-  0xff3f, 0xff3f,
-  0xff5b, 0xff5b,
-  0xff5d, 0xff5d,
-  0xff5f, 0xff65,
-  0x10100, 0x10101,
-  0x1039f, 0x1039f,
-  0x10a50, 0x10a58
-}; /* CR_P */
-
-/* 'Pc': General Category */
-static const OnigCodePoint CR_Pc[] = {
-  6,
-  0x005f, 0x005f,
-  0x203f, 0x2040,
-  0x2054, 0x2054,
-  0xfe33, 0xfe34,
-  0xfe4d, 0xfe4f,
-  0xff3f, 0xff3f
-}; /* CR_Pc */
-
-/* 'Pd': General Category */
-static const OnigCodePoint CR_Pd[] = {
-  12,
-  0x002d, 0x002d,
-  0x058a, 0x058a,
-  0x1806, 0x1806,
-  0x2010, 0x2015,
-  0x2e17, 0x2e17,
-  0x301c, 0x301c,
-  0x3030, 0x3030,
-  0x30a0, 0x30a0,
-  0xfe31, 0xfe32,
-  0xfe58, 0xfe58,
-  0xfe63, 0xfe63,
-  0xff0d, 0xff0d
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-  65,
-  0x0029, 0x0029,
-  0x005d, 0x005d,
-  0x007d, 0x007d,
-  0x0f3b, 0x0f3b,
-  0x0f3d, 0x0f3d,
-  0x169c, 0x169c,
-  0x2046, 0x2046,
-  0x207e, 0x207e,
-  0x208e, 0x208e,
-  0x232a, 0x232a,
-  0x23b5, 0x23b5,
-  0x2769, 0x2769,
-  0x276b, 0x276b,
-  0x276d, 0x276d,
-  0x276f, 0x276f,
-  0x2771, 0x2771,
-  0x2773, 0x2773,
-  0x2775, 0x2775,
-  0x27c6, 0x27c6,
-  0x27e7, 0x27e7,
-  0x27e9, 0x27e9,
-  0x27eb, 0x27eb,
-  0x2984, 0x2984,
-  0x2986, 0x2986,
-  0x2988, 0x2988,
-  0x298a, 0x298a,
-  0x298c, 0x298c,
-  0x298e, 0x298e,
-  0x2990, 0x2990,
-  0x2992, 0x2992,
-  0x2994, 0x2994,
-  0x2996, 0x2996,
-  0x2998, 0x2998,
-  0x29d9, 0x29d9,
-  0x29db, 0x29db,
-  0x29fd, 0x29fd,
-  0x3009, 0x3009,
-  0x300b, 0x300b,
-  0x300d, 0x300d,
-  0x300f, 0x300f,
-  0x3011, 0x3011,
-  0x3015, 0x3015,
-  0x3017, 0x3017,
-  0x3019, 0x3019,
-  0x301b, 0x301b,
-  0x301e, 0x301f,
-  0xfd3f, 0xfd3f,
-  0xfe18, 0xfe18,
-  0xfe36, 0xfe36,
-  0xfe38, 0xfe38,
-  0xfe3a, 0xfe3a,
-  0xfe3c, 0xfe3c,
-  0xfe3e, 0xfe3e,
-  0xfe40, 0xfe40,
-  0xfe42, 0xfe42,
-  0xfe44, 0xfe44,
-  0xfe48, 0xfe48,
-  0xfe5a, 0xfe5a,
-  0xfe5c, 0xfe5c,
-  0xfe5e, 0xfe5e,
-  0xff09, 0xff09,
-  0xff3d, 0xff3d,
-  0xff5d, 0xff5d,
-  0xff60, 0xff60,
-  0xff63, 0xff63
-}; /* CR_Pe */
-
-/* 'Pf': General Category */
-static const OnigCodePoint CR_Pf[] = {
-  9,
-  0x00bb, 0x00bb,
-  0x2019, 0x2019,
-  0x201d, 0x201d,
-  0x203a, 0x203a,
-  0x2e03, 0x2e03,
-  0x2e05, 0x2e05,
-  0x2e0a, 0x2e0a,
-  0x2e0d, 0x2e0d,
-  0x2e1d, 0x2e1d
-}; /* CR_Pf */
-
-/* 'Pi': General Category */
-static const OnigCodePoint CR_Pi[] = {
-  10,
-  0x00ab, 0x00ab,
-  0x2018, 0x2018,
-  0x201b, 0x201c,
-  0x201f, 0x201f,
-  0x2039, 0x2039,
-  0x2e02, 0x2e02,
-  0x2e04, 0x2e04,
-  0x2e09, 0x2e09,
-  0x2e0c, 0x2e0c,
-  0x2e1c, 0x2e1c
-}; /* CR_Pi */
-
-/* 'Po': General Category */
-static const OnigCodePoint CR_Po[] = {
-  88,
-  0x0021, 0x0023,
-  0x0025, 0x0027,
-  0x002a, 0x002a,
-  0x002c, 0x002c,
-  0x002e, 0x002f,
-  0x003a, 0x003b,
-  0x003f, 0x0040,
-  0x005c, 0x005c,
-  0x00a1, 0x00a1,
-  0x00b7, 0x00b7,
-  0x00bf, 0x00bf,
-  0x037e, 0x037e,
-  0x0387, 0x0387,
-  0x055a, 0x055f,
-  0x0589, 0x0589,
-  0x05be, 0x05be,
-  0x05c0, 0x05c0,
-  0x05c3, 0x05c3,
-  0x05c6, 0x05c6,
-  0x05f3, 0x05f4,
-  0x060c, 0x060d,
-  0x061b, 0x061b,
-  0x061e, 0x061f,
-  0x066a, 0x066d,
-  0x06d4, 0x06d4,
-  0x0700, 0x070d,
-  0x0964, 0x0965,
-  0x0970, 0x0970,
-  0x0df4, 0x0df4,
-  0x0e4f, 0x0e4f,
-  0x0e5a, 0x0e5b,
-  0x0f04, 0x0f12,
-  0x0f85, 0x0f85,
-  0x0fd0, 0x0fd1,
-  0x104a, 0x104f,
-  0x10fb, 0x10fb,
-  0x1361, 0x1368,
-  0x166d, 0x166e,
-  0x16eb, 0x16ed,
-  0x1735, 0x1736,
-  0x17d4, 0x17d6,
-  0x17d8, 0x17da,
-  0x1800, 0x1805,
-  0x1807, 0x180a,
-  0x1944, 0x1945,
-  0x19de, 0x19df,
-  0x1a1e, 0x1a1f,
-  0x2016, 0x2017,
-  0x2020, 0x2027,
-  0x2030, 0x2038,
-  0x203b, 0x203e,
-  0x2041, 0x2043,
-  0x2047, 0x2051,
-  0x2053, 0x2053,
-  0x2055, 0x205e,
-  0x23b6, 0x23b6,
-  0x2cf9, 0x2cfc,
-  0x2cfe, 0x2cff,
-  0x2e00, 0x2e01,
-  0x2e06, 0x2e08,
-  0x2e0b, 0x2e0b,
-  0x2e0e, 0x2e16,
-  0x3001, 0x3003,
-  0x303d, 0x303d,
-  0x30fb, 0x30fb,
-  0xfe10, 0xfe16,
-  0xfe19, 0xfe19,
-  0xfe30, 0xfe30,
-  0xfe45, 0xfe46,
-  0xfe49, 0xfe4c,
-  0xfe50, 0xfe52,
-  0xfe54, 0xfe57,
-  0xfe5f, 0xfe61,
-  0xfe68, 0xfe68,
-  0xfe6a, 0xfe6b,
-  0xff01, 0xff03,
-  0xff05, 0xff07,
-  0xff0a, 0xff0a,
-  0xff0c, 0xff0c,
-  0xff0e, 0xff0f,
-  0xff1a, 0xff1b,
-  0xff1f, 0xff20,
-  0xff3c, 0xff3c,
-  0xff61, 0xff61,
-  0xff64, 0xff65,
-  0x10100, 0x10101,
-  0x1039f, 0x1039f,
-  0x10a50, 0x10a58
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-  67,
-  0x0028, 0x0028,
-  0x005b, 0x005b,
-  0x007b, 0x007b,
-  0x0f3a, 0x0f3a,
-  0x0f3c, 0x0f3c,
-  0x169b, 0x169b,
-  0x201a, 0x201a,
-  0x201e, 0x201e,
-  0x2045, 0x2045,
-  0x207d, 0x207d,
-  0x208d, 0x208d,
-  0x2329, 0x2329,
-  0x23b4, 0x23b4,
-  0x2768, 0x2768,
-  0x276a, 0x276a,
-  0x276c, 0x276c,
-  0x276e, 0x276e,
-  0x2770, 0x2770,
-  0x2772, 0x2772,
-  0x2774, 0x2774,
-  0x27c5, 0x27c5,
-  0x27e6, 0x27e6,
-  0x27e8, 0x27e8,
-  0x27ea, 0x27ea,
-  0x2983, 0x2983,
-  0x2985, 0x2985,
-  0x2987, 0x2987,
-  0x2989, 0x2989,
-  0x298b, 0x298b,
-  0x298d, 0x298d,
-  0x298f, 0x298f,
-  0x2991, 0x2991,
-  0x2993, 0x2993,
-  0x2995, 0x2995,
-  0x2997, 0x2997,
-  0x29d8, 0x29d8,
-  0x29da, 0x29da,
-  0x29fc, 0x29fc,
-  0x3008, 0x3008,
-  0x300a, 0x300a,
-  0x300c, 0x300c,
-  0x300e, 0x300e,
-  0x3010, 0x3010,
-  0x3014, 0x3014,
-  0x3016, 0x3016,
-  0x3018, 0x3018,
-  0x301a, 0x301a,
-  0x301d, 0x301d,
-  0xfd3e, 0xfd3e,
-  0xfe17, 0xfe17,
-  0xfe35, 0xfe35,
-  0xfe37, 0xfe37,
-  0xfe39, 0xfe39,
-  0xfe3b, 0xfe3b,
-  0xfe3d, 0xfe3d,
-  0xfe3f, 0xfe3f,
-  0xfe41, 0xfe41,
-  0xfe43, 0xfe43,
-  0xfe47, 0xfe47,
-  0xfe59, 0xfe59,
-  0xfe5b, 0xfe5b,
-  0xfe5d, 0xfe5d,
-  0xff08, 0xff08,
-  0xff3b, 0xff3b,
-  0xff5b, 0xff5b,
-  0xff5f, 0xff5f,
-  0xff62, 0xff62
-}; /* CR_Ps */
-
-/* 'S': Major Category */
-static const OnigCodePoint CR_S[] = {
-  162,
-  0x0024, 0x0024,
-  0x002b, 0x002b,
-  0x003c, 0x003e,
-  0x005e, 0x005e,
-  0x0060, 0x0060,
-  0x007c, 0x007c,
-  0x007e, 0x007e,
-  0x00a2, 0x00a9,
-  0x00ac, 0x00ac,
-  0x00ae, 0x00b1,
-  0x00b4, 0x00b4,
-  0x00b6, 0x00b6,
-  0x00b8, 0x00b8,
-  0x00d7, 0x00d7,
-  0x00f7, 0x00f7,
-  0x02c2, 0x02c5,
-  0x02d2, 0x02df,
-  0x02e5, 0x02ed,
-  0x02ef, 0x02ff,
-  0x0374, 0x0375,
-  0x0384, 0x0385,
-  0x03f6, 0x03f6,
-  0x0482, 0x0482,
-  0x060b, 0x060b,
-  0x060e, 0x060f,
-  0x06e9, 0x06e9,
-  0x06fd, 0x06fe,
-  0x09f2, 0x09f3,
-  0x09fa, 0x09fa,
-  0x0af1, 0x0af1,
-  0x0b70, 0x0b70,
-  0x0bf3, 0x0bfa,
-  0x0e3f, 0x0e3f,
-  0x0f01, 0x0f03,
-  0x0f13, 0x0f17,
-  0x0f1a, 0x0f1f,
-  0x0f34, 0x0f34,
-  0x0f36, 0x0f36,
-  0x0f38, 0x0f38,
-  0x0fbe, 0x0fc5,
-  0x0fc7, 0x0fcc,
-  0x0fcf, 0x0fcf,
-  0x1360, 0x1360,
-  0x1390, 0x1399,
-  0x17db, 0x17db,
-  0x1940, 0x1940,
-  0x19e0, 0x19ff,
-  0x1fbd, 0x1fbd,
-  0x1fbf, 0x1fc1,
-  0x1fcd, 0x1fcf,
-  0x1fdd, 0x1fdf,
-  0x1fed, 0x1fef,
-  0x1ffd, 0x1ffe,
-  0x2044, 0x2044,
-  0x2052, 0x2052,
-  0x207a, 0x207c,
-  0x208a, 0x208c,
-  0x20a0, 0x20b5,
-  0x2100, 0x2101,
-  0x2103, 0x2106,
-  0x2108, 0x2109,
-  0x2114, 0x2114,
-  0x2116, 0x2118,
-  0x211e, 0x2123,
-  0x2125, 0x2125,
-  0x2127, 0x2127,
-  0x2129, 0x2129,
-  0x212e, 0x212e,
-  0x2132, 0x2132,
-  0x213a, 0x213b,
-  0x2140, 0x2144,
-  0x214a, 0x214c,
-  0x2190, 0x2328,
-  0x232b, 0x23b3,
-  0x23b7, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x249c, 0x24e9,
-  0x2500, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2767,
-  0x2794, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x27c0, 0x27c4,
-  0x27d0, 0x27e5,
-  0x27f0, 0x2982,
-  0x2999, 0x29d7,
-  0x29dc, 0x29fb,
-  0x29fe, 0x2b13,
-  0x2ce5, 0x2cea,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x2ff0, 0x2ffb,
-  0x3004, 0x3004,
-  0x3012, 0x3013,
-  0x3020, 0x3020,
-  0x3036, 0x3037,
-  0x303e, 0x303f,
-  0x309b, 0x309c,
-  0x3190, 0x3191,
-  0x3196, 0x319f,
-  0x31c0, 0x31cf,
-  0x3200, 0x321e,
-  0x322a, 0x3243,
-  0x3250, 0x3250,
-  0x3260, 0x327f,
-  0x328a, 0x32b0,
-  0x32c0, 0x32fe,
-  0x3300, 0x33ff,
-  0x4dc0, 0x4dff,
-  0xa490, 0xa4c6,
-  0xa700, 0xa716,
-  0xa828, 0xa82b,
-  0xfb29, 0xfb29,
-  0xfdfc, 0xfdfd,
-  0xfe62, 0xfe62,
-  0xfe64, 0xfe66,
-  0xfe69, 0xfe69,
-  0xff04, 0xff04,
-  0xff0b, 0xff0b,
-  0xff1c, 0xff1e,
-  0xff3e, 0xff3e,
-  0xff40, 0xff40,
-  0xff5c, 0xff5c,
-  0xff5e, 0xff5e,
-  0xffe0, 0xffe6,
-  0xffe8, 0xffee,
-  0xfffc, 0xfffd,
-  0x10102, 0x10102,
-  0x10137, 0x1013f,
-  0x10179, 0x10189,
-  0x103d0, 0x103d0,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d164,
-  0x1d16a, 0x1d16c,
-  0x1d183, 0x1d184,
-  0x1d18c, 0x1d1a9,
-  0x1d1ae, 0x1d1dd,
-  0x1d200, 0x1d241,
-  0x1d245, 0x1d245,
-  0x1d300, 0x1d356,
-  0x1d6c1, 0x1d6c1,
-  0x1d6db, 0x1d6db,
-  0x1d6fb, 0x1d6fb,
-  0x1d715, 0x1d715,
-  0x1d735, 0x1d735,
-  0x1d74f, 0x1d74f,
-  0x1d76f, 0x1d76f,
-  0x1d789, 0x1d789,
-  0x1d7a9, 0x1d7a9,
-  0x1d7c3, 0x1d7c3
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-  14,
-  0x0024, 0x0024,
-  0x00a2, 0x00a5,
-  0x060b, 0x060b,
-  0x09f2, 0x09f3,
-  0x0af1, 0x0af1,
-  0x0bf9, 0x0bf9,
-  0x0e3f, 0x0e3f,
-  0x17db, 0x17db,
-  0x20a0, 0x20b5,
-  0xfdfc, 0xfdfc,
-  0xfe69, 0xfe69,
-  0xff04, 0xff04,
-  0xffe0, 0xffe1,
-  0xffe5, 0xffe6
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-  23,
-  0x005e, 0x005e,
-  0x0060, 0x0060,
-  0x00a8, 0x00a8,
-  0x00af, 0x00af,
-  0x00b4, 0x00b4,
-  0x00b8, 0x00b8,
-  0x02c2, 0x02c5,
-  0x02d2, 0x02df,
-  0x02e5, 0x02ed,
-  0x02ef, 0x02ff,
-  0x0374, 0x0375,
-  0x0384, 0x0385,
-  0x1fbd, 0x1fbd,
-  0x1fbf, 0x1fc1,
-  0x1fcd, 0x1fcf,
-  0x1fdd, 0x1fdf,
-  0x1fed, 0x1fef,
-  0x1ffd, 0x1ffe,
-  0x309b, 0x309c,
-  0xa700, 0xa716,
-  0xff3e, 0xff3e,
-  0xff40, 0xff40,
-  0xffe3, 0xffe3
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-  59,
-  0x002b, 0x002b,
-  0x003c, 0x003e,
-  0x007c, 0x007c,
-  0x007e, 0x007e,
-  0x00ac, 0x00ac,
-  0x00b1, 0x00b1,
-  0x00d7, 0x00d7,
-  0x00f7, 0x00f7,
-  0x03f6, 0x03f6,
-  0x2044, 0x2044,
-  0x2052, 0x2052,
-  0x207a, 0x207c,
-  0x208a, 0x208c,
-  0x2140, 0x2144,
-  0x214b, 0x214b,
-  0x2190, 0x2194,
-  0x219a, 0x219b,
-  0x21a0, 0x21a0,
-  0x21a3, 0x21a3,
-  0x21a6, 0x21a6,
-  0x21ae, 0x21ae,
-  0x21ce, 0x21cf,
-  0x21d2, 0x21d2,
-  0x21d4, 0x21d4,
-  0x21f4, 0x22ff,
-  0x2308, 0x230b,
-  0x2320, 0x2321,
-  0x237c, 0x237c,
-  0x239b, 0x23b3,
-  0x25b7, 0x25b7,
-  0x25c1, 0x25c1,
-  0x25f8, 0x25ff,
-  0x266f, 0x266f,
-  0x27c0, 0x27c4,
-  0x27d0, 0x27e5,
-  0x27f0, 0x27ff,
-  0x2900, 0x2982,
-  0x2999, 0x29d7,
-  0x29dc, 0x29fb,
-  0x29fe, 0x2aff,
-  0xfb29, 0xfb29,
-  0xfe62, 0xfe62,
-  0xfe64, 0xfe66,
-  0xff0b, 0xff0b,
-  0xff1c, 0xff1e,
-  0xff5c, 0xff5c,
-  0xff5e, 0xff5e,
-  0xffe2, 0xffe2,
-  0xffe9, 0xffec,
-  0x1d6c1, 0x1d6c1,
-  0x1d6db, 0x1d6db,
-  0x1d6fb, 0x1d6fb,
-  0x1d715, 0x1d715,
-  0x1d735, 0x1d735,
-  0x1d74f, 0x1d74f,
-  0x1d76f, 0x1d76f,
-  0x1d789, 0x1d789,
-  0x1d7a9, 0x1d7a9,
-  0x1d7c3, 0x1d7c3
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-  120,
-  0x00a6, 0x00a7,
-  0x00a9, 0x00a9,
-  0x00ae, 0x00ae,
-  0x00b0, 0x00b0,
-  0x00b6, 0x00b6,
-  0x0482, 0x0482,
-  0x060e, 0x060f,
-  0x06e9, 0x06e9,
-  0x06fd, 0x06fe,
-  0x09fa, 0x09fa,
-  0x0b70, 0x0b70,
-  0x0bf3, 0x0bf8,
-  0x0bfa, 0x0bfa,
-  0x0f01, 0x0f03,
-  0x0f13, 0x0f17,
-  0x0f1a, 0x0f1f,
-  0x0f34, 0x0f34,
-  0x0f36, 0x0f36,
-  0x0f38, 0x0f38,
-  0x0fbe, 0x0fc5,
-  0x0fc7, 0x0fcc,
-  0x0fcf, 0x0fcf,
-  0x1360, 0x1360,
-  0x1390, 0x1399,
-  0x1940, 0x1940,
-  0x19e0, 0x19ff,
-  0x2100, 0x2101,
-  0x2103, 0x2106,
-  0x2108, 0x2109,
-  0x2114, 0x2114,
-  0x2116, 0x2118,
-  0x211e, 0x2123,
-  0x2125, 0x2125,
-  0x2127, 0x2127,
-  0x2129, 0x2129,
-  0x212e, 0x212e,
-  0x2132, 0x2132,
-  0x213a, 0x213b,
-  0x214a, 0x214a,
-  0x214c, 0x214c,
-  0x2195, 0x2199,
-  0x219c, 0x219f,
-  0x21a1, 0x21a2,
-  0x21a4, 0x21a5,
-  0x21a7, 0x21ad,
-  0x21af, 0x21cd,
-  0x21d0, 0x21d1,
-  0x21d3, 0x21d3,
-  0x21d5, 0x21f3,
-  0x2300, 0x2307,
-  0x230c, 0x231f,
-  0x2322, 0x2328,
-  0x232b, 0x237b,
-  0x237d, 0x239a,
-  0x23b7, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x249c, 0x24e9,
-  0x2500, 0x25b6,
-  0x25b8, 0x25c0,
-  0x25c2, 0x25f7,
-  0x2600, 0x266e,
-  0x2670, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2767,
-  0x2794, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x2800, 0x28ff,
-  0x2b00, 0x2b13,
-  0x2ce5, 0x2cea,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x2ff0, 0x2ffb,
-  0x3004, 0x3004,
-  0x3012, 0x3013,
-  0x3020, 0x3020,
-  0x3036, 0x3037,
-  0x303e, 0x303f,
-  0x3190, 0x3191,
-  0x3196, 0x319f,
-  0x31c0, 0x31cf,
-  0x3200, 0x321e,
-  0x322a, 0x3243,
-  0x3250, 0x3250,
-  0x3260, 0x327f,
-  0x328a, 0x32b0,
-  0x32c0, 0x32fe,
-  0x3300, 0x33ff,
-  0x4dc0, 0x4dff,
-  0xa490, 0xa4c6,
-  0xa828, 0xa82b,
-  0xfdfd, 0xfdfd,
-  0xffe4, 0xffe4,
-  0xffe8, 0xffe8,
-  0xffed, 0xffee,
-  0xfffc, 0xfffd,
-  0x10102, 0x10102,
-  0x10137, 0x1013f,
-  0x10179, 0x10189,
-  0x103d0, 0x103d0,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d164,
-  0x1d16a, 0x1d16c,
-  0x1d183, 0x1d184,
-  0x1d18c, 0x1d1a9,
-  0x1d1ae, 0x1d1dd,
-  0x1d200, 0x1d241,
-  0x1d245, 0x1d245,
-  0x1d300, 0x1d356
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
-  9,
-  0x0020, 0x0020,
-  0x00a0, 0x00a0,
-  0x1680, 0x1680,
-  0x180e, 0x180e,
-  0x2000, 0x200a,
-  0x2028, 0x2029,
-  0x202f, 0x202f,
-  0x205f, 0x205f,
-  0x3000, 0x3000
-}; /* CR_Z */
-
-/* 'Zl': General Category */
-static const OnigCodePoint CR_Zl[] = {
-  1,
-  0x2028, 0x2028
-}; /* CR_Zl */
-
-/* 'Zp': General Category */
-static const OnigCodePoint CR_Zp[] = {
-  1,
-  0x2029, 0x2029
-}; /* CR_Zp */
-
-/* 'Zs': General Category */
-static const OnigCodePoint CR_Zs[] = {
-  8,
-  0x0020, 0x0020,
-  0x00a0, 0x00a0,
-  0x1680, 0x1680,
-  0x180e, 0x180e,
-  0x2000, 0x200a,
-  0x202f, 0x202f,
-  0x205f, 0x205f,
-  0x3000, 0x3000
-}; /* CR_Zs */
-
-/* 'Arabic': Script */
-static const OnigCodePoint CR_Arabic[] = {
-  17,
-  0x060b, 0x060b,
-  0x060d, 0x0615,
-  0x061e, 0x061e,
-  0x0621, 0x063a,
-  0x0641, 0x064a,
-  0x0656, 0x065e,
-  0x066a, 0x066f,
-  0x0671, 0x06dc,
-  0x06de, 0x06ff,
-  0x0750, 0x076d,
-  0xfb50, 0xfbb1,
-  0xfbd3, 0xfd3d,
-  0xfd50, 0xfd8f,
-  0xfd92, 0xfdc7,
-  0xfdf0, 0xfdfc,
-  0xfe70, 0xfe74,
-  0xfe76, 0xfefc
-}; /* CR_Arabic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-  5,
-  0x0531, 0x0556,
-  0x0559, 0x055f,
-  0x0561, 0x0587,
-  0x058a, 0x058a,
-  0xfb13, 0xfb17
-}; /* CR_Armenian */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
-  14,
-  0x0981, 0x0983,
-  0x0985, 0x098c,
-  0x098f, 0x0990,
-  0x0993, 0x09a8,
-  0x09aa, 0x09b0,
-  0x09b2, 0x09b2,
-  0x09b6, 0x09b9,
-  0x09bc, 0x09c4,
-  0x09c7, 0x09c8,
-  0x09cb, 0x09ce,
-  0x09d7, 0x09d7,
-  0x09dc, 0x09dd,
-  0x09df, 0x09e3,
-  0x09e6, 0x09fa
-}; /* CR_Bengali */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-  2,
-  0x3105, 0x312c,
-  0x31a0, 0x31b7
-}; /* CR_Bopomofo */
-
-/* 'Braille': Script */
-static const OnigCodePoint CR_Braille[] = {
-  1,
-  0x2800, 0x28ff
-}; /* CR_Braille */
-
-/* 'Buginese': Script */
-static const OnigCodePoint CR_Buginese[] = {
-  2,
-  0x1a00, 0x1a1b,
-  0x1a1e, 0x1a1f
-}; /* CR_Buginese */
-
-/* 'Buhid': Script */
-static const OnigCodePoint CR_Buhid[] = {
-  1,
-  0x1740, 0x1753
-}; /* CR_Buhid */
-
-/* 'Canadian_Aboriginal': Script */
-static const OnigCodePoint CR_Canadian_Aboriginal[] = {
-  1,
-  0x1401, 0x1676
-}; /* CR_Canadian_Aboriginal */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-  1,
-  0x13a0, 0x13f4
-}; /* CR_Cherokee */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-  126,
-  0x0000, 0x0040,
-  0x005b, 0x0060,
-  0x007b, 0x00a9,
-  0x00ab, 0x00b9,
-  0x00bb, 0x00bf,
-  0x00d7, 0x00d7,
-  0x00f7, 0x00f7,
-  0x02b9, 0x02df,
-  0x02e5, 0x02ff,
-  0x037e, 0x037e,
-  0x0387, 0x0387,
-  0x0589, 0x0589,
-  0x0600, 0x0603,
-  0x060c, 0x060c,
-  0x061b, 0x061b,
-  0x061f, 0x061f,
-  0x0640, 0x0640,
-  0x0660, 0x0669,
-  0x06dd, 0x06dd,
-  0x0964, 0x0965,
-  0x0970, 0x0970,
-  0x0e3f, 0x0e3f,
-  0x10fb, 0x10fb,
-  0x16eb, 0x16ed,
-  0x1735, 0x1736,
-  0x2000, 0x200b,
-  0x200e, 0x2063,
-  0x206a, 0x2070,
-  0x2074, 0x207e,
-  0x2080, 0x208e,
-  0x20a0, 0x20b5,
-  0x2100, 0x2125,
-  0x2127, 0x2129,
-  0x212c, 0x214c,
-  0x2153, 0x2183,
-  0x2190, 0x23db,
-  0x2400, 0x2426,
-  0x2440, 0x244a,
-  0x2460, 0x269c,
-  0x26a0, 0x26b1,
-  0x2701, 0x2704,
-  0x2706, 0x2709,
-  0x270c, 0x2727,
-  0x2729, 0x274b,
-  0x274d, 0x274d,
-  0x274f, 0x2752,
-  0x2756, 0x2756,
-  0x2758, 0x275e,
-  0x2761, 0x2794,
-  0x2798, 0x27af,
-  0x27b1, 0x27be,
-  0x27c0, 0x27c6,
-  0x27d0, 0x27eb,
-  0x27f0, 0x27ff,
-  0x2900, 0x2b13,
-  0x2e00, 0x2e17,
-  0x2e1c, 0x2e1d,
-  0x2ff0, 0x2ffb,
-  0x3000, 0x3004,
-  0x3006, 0x3006,
-  0x3008, 0x3020,
-  0x3030, 0x3037,
-  0x303c, 0x303f,
-  0x309b, 0x309c,
-  0x30a0, 0x30a0,
-  0x30fb, 0x30fc,
-  0x3190, 0x319f,
-  0x31c0, 0x31cf,
-  0x3220, 0x3243,
-  0x3250, 0x325f,
-  0x327e, 0x32fe,
-  0x3300, 0x33ff,
-  0x4dc0, 0x4dff,
-  0xa700, 0xa716,
-  0xe000, 0xf8ff,
-  0xfd3e, 0xfd3f,
-  0xfdfd, 0xfdfd,
-  0xfe10, 0xfe19,
-  0xfe30, 0xfe52,
-  0xfe54, 0xfe66,
-  0xfe68, 0xfe6b,
-  0xfeff, 0xfeff,
-  0xff01, 0xff20,
-  0xff3b, 0xff40,
-  0xff5b, 0xff65,
-  0xff70, 0xff70,
-  0xff9e, 0xff9f,
-  0xffe0, 0xffe6,
-  0xffe8, 0xffee,
-  0xfff9, 0xfffd,
-  0x10100, 0x10102,
-  0x10107, 0x10133,
-  0x10137, 0x1013f,
-  0x1d000, 0x1d0f5,
-  0x1d100, 0x1d126,
-  0x1d12a, 0x1d166,
-  0x1d16a, 0x1d17a,
-  0x1d183, 0x1d184,
-  0x1d18c, 0x1d1a9,
-  0x1d1ae, 0x1d1dd,
-  0x1d300, 0x1d356,
-  0x1d400, 0x1d454,
-  0x1d456, 0x1d49c,
-  0x1d49e, 0x1d49f,
-  0x1d4a2, 0x1d4a2,
-  0x1d4a5, 0x1d4a6,
-  0x1d4a9, 0x1d4ac,
-  0x1d4ae, 0x1d4b9,
-  0x1d4bb, 0x1d4bb,
-  0x1d4bd, 0x1d4c3,
-  0x1d4c5, 0x1d505,
-  0x1d507, 0x1d50a,
-  0x1d50d, 0x1d514,
-  0x1d516, 0x1d51c,
-  0x1d51e, 0x1d539,
-  0x1d53b, 0x1d53e,
-  0x1d540, 0x1d544,
-  0x1d546, 0x1d546,
-  0x1d54a, 0x1d550,
-  0x1d552, 0x1d6a5,
-  0x1d6a8, 0x1d7c9,
-  0x1d7ce, 0x1d7ff,
-  0xe0001, 0xe0001,
-  0xe0020, 0xe007f,
-  0xf0000, 0xffffd,
-  0x100000, 0x10fffd
-}; /* CR_Common */
-
-/* 'Coptic': Script */
-static const OnigCodePoint CR_Coptic[] = {
-  3,
-  0x03e2, 0x03ef,
-  0x2c80, 0x2cea,
-  0x2cf9, 0x2cff
-}; /* CR_Coptic */
-
-/* 'Cypriot': Script */
-static const OnigCodePoint CR_Cypriot[] = {
-  6,
-  0x10800, 0x10805,
-  0x10808, 0x10808,
-  0x1080a, 0x10835,
-  0x10837, 0x10838,
-  0x1083c, 0x1083c,
-  0x1083f, 0x1083f
-}; /* CR_Cypriot */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-  6,
-  0x0400, 0x0486,
-  0x0488, 0x04ce,
-  0x04d0, 0x04f9,
-  0x0500, 0x050f,
-  0x1d2b, 0x1d2b,
-  0x1d78, 0x1d78
-}; /* CR_Cyrillic */
-
-/* 'Deseret': Script */
-static const OnigCodePoint CR_Deseret[] = {
-  1,
-  0x10400, 0x1044f
-}; /* CR_Deseret */
-
-/* 'Devanagari': Script */
-static const OnigCodePoint CR_Devanagari[] = {
-  6,
-  0x0901, 0x0939,
-  0x093c, 0x094d,
-  0x0950, 0x0954,
-  0x0958, 0x0963,
-  0x0966, 0x096f,
-  0x097d, 0x097d
-}; /* CR_Devanagari */
-
-/* 'Ethiopic': Script */
-static const OnigCodePoint CR_Ethiopic[] = {
-  27,
-  0x1200, 0x1248,
-  0x124a, 0x124d,
-  0x1250, 0x1256,
-  0x1258, 0x1258,
-  0x125a, 0x125d,
-  0x1260, 0x1288,
-  0x128a, 0x128d,
-  0x1290, 0x12b0,
-  0x12b2, 0x12b5,
-  0x12b8, 0x12be,
-  0x12c0, 0x12c0,
-  0x12c2, 0x12c5,
-  0x12c8, 0x12d6,
-  0x12d8, 0x1310,
-  0x1312, 0x1315,
-  0x1318, 0x135a,
-  0x135f, 0x137c,
-  0x1380, 0x1399,
-  0x2d80, 0x2d96,
-  0x2da0, 0x2da6,
-  0x2da8, 0x2dae,
-  0x2db0, 0x2db6,
-  0x2db8, 0x2dbe,
-  0x2dc0, 0x2dc6,
-  0x2dc8, 0x2dce,
-  0x2dd0, 0x2dd6,
-  0x2dd8, 0x2dde
-}; /* CR_Ethiopic */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-  4,
-  0x10a0, 0x10c5,
-  0x10d0, 0x10fa,
-  0x10fc, 0x10fc,
-  0x2d00, 0x2d25
-}; /* CR_Georgian */
-
-/* 'Glagolitic': Script */
-static const OnigCodePoint CR_Glagolitic[] = {
-  2,
-  0x2c00, 0x2c2e,
-  0x2c30, 0x2c5e
-}; /* CR_Glagolitic */
-
-/* 'Gothic': Script */
-static const OnigCodePoint CR_Gothic[] = {
-  1,
-  0x10330, 0x1034a
-}; /* CR_Gothic */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-  31,
-  0x0374, 0x0375,
-  0x037a, 0x037a,
-  0x0384, 0x0386,
-  0x0388, 0x038a,
-  0x038c, 0x038c,
-  0x038e, 0x03a1,
-  0x03a3, 0x03ce,
-  0x03d0, 0x03e1,
-  0x03f0, 0x03ff,
-  0x1d26, 0x1d2a,
-  0x1d5d, 0x1d61,
-  0x1d66, 0x1d6a,
-  0x1f00, 0x1f15,
-  0x1f18, 0x1f1d,
-  0x1f20, 0x1f45,
-  0x1f48, 0x1f4d,
-  0x1f50, 0x1f57,
-  0x1f59, 0x1f59,
-  0x1f5b, 0x1f5b,
-  0x1f5d, 0x1f5d,
-  0x1f5f, 0x1f7d,
-  0x1f80, 0x1fb4,
-  0x1fb6, 0x1fc4,
-  0x1fc6, 0x1fd3,
-  0x1fd6, 0x1fdb,
-  0x1fdd, 0x1fef,
-  0x1ff2, 0x1ff4,
-  0x1ff6, 0x1ffe,
-  0x2126, 0x2126,
-  0x10140, 0x1018a,
-  0x1d200, 0x1d245
-}; /* CR_Greek */
-
-/* 'Gujarati': Script */
-static const OnigCodePoint CR_Gujarati[] = {
-  14,
-  0x0a81, 0x0a83,
-  0x0a85, 0x0a8d,
-  0x0a8f, 0x0a91,
-  0x0a93, 0x0aa8,
-  0x0aaa, 0x0ab0,
-  0x0ab2, 0x0ab3,
-  0x0ab5, 0x0ab9,
-  0x0abc, 0x0ac5,
-  0x0ac7, 0x0ac9,
-  0x0acb, 0x0acd,
-  0x0ad0, 0x0ad0,
-  0x0ae0, 0x0ae3,
-  0x0ae6, 0x0aef,
-  0x0af1, 0x0af1
-}; /* CR_Gujarati */
-
-/* 'Gurmukhi': Script */
-static const OnigCodePoint CR_Gurmukhi[] = {
-  15,
-  0x0a01, 0x0a03,
-  0x0a05, 0x0a0a,
-  0x0a0f, 0x0a10,
-  0x0a13, 0x0a28,
-  0x0a2a, 0x0a30,
-  0x0a32, 0x0a33,
-  0x0a35, 0x0a36,
-  0x0a38, 0x0a39,
-  0x0a3c, 0x0a3c,
-  0x0a3e, 0x0a42,
-  0x0a47, 0x0a48,
-  0x0a4b, 0x0a4d,
-  0x0a59, 0x0a5c,
-  0x0a5e, 0x0a5e,
-  0x0a66, 0x0a74
-}; /* CR_Gurmukhi */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-  14,
-  0x2e80, 0x2e99,
-  0x2e9b, 0x2ef3,
-  0x2f00, 0x2fd5,
-  0x3005, 0x3005,
-  0x3007, 0x3007,
-  0x3021, 0x3029,
-  0x3038, 0x303b,
-  0x3400, 0x4db5,
-  0x4e00, 0x9fbb,
-  0xf900, 0xfa2d,
-  0xfa30, 0xfa6a,
-  0xfa70, 0xfad9,
-  0x20000, 0x2a6d6,
-  0x2f800, 0x2fa1d
-}; /* CR_Han */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-  12,
-  0x1100, 0x1159,
-  0x115f, 0x11a2,
-  0x11a8, 0x11f9,
-  0x3131, 0x318e,
-  0x3200, 0x321e,
-  0x3260, 0x327d,
-  0xac00, 0xd7a3,
-  0xffa0, 0xffbe,
-  0xffc2, 0xffc7,
-  0xffca, 0xffcf,
-  0xffd2, 0xffd7,
-  0xffda, 0xffdc
-}; /* CR_Hangul */
-
-/* 'Hanunoo': Script */
-static const OnigCodePoint CR_Hanunoo[] = {
-  1,
-  0x1720, 0x1734
-}; /* CR_Hanunoo */
-
-/* 'Hebrew': Script */
-static const OnigCodePoint CR_Hebrew[] = {
-  10,
-  0x0591, 0x05b9,
-  0x05bb, 0x05c7,
-  0x05d0, 0x05ea,
-  0x05f0, 0x05f4,
-  0xfb1d, 0xfb36,
-  0xfb38, 0xfb3c,
-  0xfb3e, 0xfb3e,
-  0xfb40, 0xfb41,
-  0xfb43, 0xfb44,
-  0xfb46, 0xfb4f
-}; /* CR_Hebrew */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-  2,
-  0x3041, 0x3096,
-  0x309d, 0x309f
-}; /* CR_Hiragana */
-
-/* 'Inherited': Script */
-static const OnigCodePoint CR_Inherited[] = {
-  15,
-  0x0300, 0x036f,
-  0x064b, 0x0655,
-  0x0670, 0x0670,
-  0x1dc0, 0x1dc3,
-  0x200c, 0x200d,
-  0x20d0, 0x20eb,
-  0x302a, 0x302f,
-  0x3099, 0x309a,
-  0xfe00, 0xfe0f,
-  0xfe20, 0xfe23,
-  0x1d167, 0x1d169,
-  0x1d17b, 0x1d182,
-  0x1d185, 0x1d18b,
-  0x1d1aa, 0x1d1ad,
-  0xe0100, 0xe01ef
-}; /* CR_Inherited */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-  13,
-  0x0c82, 0x0c83,
-  0x0c85, 0x0c8c,
-  0x0c8e, 0x0c90,
-  0x0c92, 0x0ca8,
-  0x0caa, 0x0cb3,
-  0x0cb5, 0x0cb9,
-  0x0cbc, 0x0cc4,
-  0x0cc6, 0x0cc8,
-  0x0cca, 0x0ccd,
-  0x0cd5, 0x0cd6,
-  0x0cde, 0x0cde,
-  0x0ce0, 0x0ce1,
-  0x0ce6, 0x0cef
-}; /* CR_Kannada */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-  5,
-  0x30a1, 0x30fa,
-  0x30fd, 0x30ff,
-  0x31f0, 0x31ff,
-  0xff66, 0xff6f,
-  0xff71, 0xff9d
-}; /* CR_Katakana */
-
-/* 'Kharoshthi': Script */
-static const OnigCodePoint CR_Kharoshthi[] = {
-  8,
-  0x10a00, 0x10a03,
-  0x10a05, 0x10a06,
-  0x10a0c, 0x10a13,
-  0x10a15, 0x10a17,
-  0x10a19, 0x10a33,
-  0x10a38, 0x10a3a,
-  0x10a3f, 0x10a47,
-  0x10a50, 0x10a58
-}; /* CR_Kharoshthi */
-
-/* 'Khmer': Script */
-static const OnigCodePoint CR_Khmer[] = {
-  4,
-  0x1780, 0x17dd,
-  0x17e0, 0x17e9,
-  0x17f0, 0x17f9,
-  0x19e0, 0x19ff
-}; /* CR_Khmer */
-
-/* 'Lao': Script */
-static const OnigCodePoint CR_Lao[] = {
-  18,
-  0x0e81, 0x0e82,
-  0x0e84, 0x0e84,
-  0x0e87, 0x0e88,
-  0x0e8a, 0x0e8a,
-  0x0e8d, 0x0e8d,
-  0x0e94, 0x0e97,
-  0x0e99, 0x0e9f,
-  0x0ea1, 0x0ea3,
-  0x0ea5, 0x0ea5,
-  0x0ea7, 0x0ea7,
-  0x0eaa, 0x0eab,
-  0x0ead, 0x0eb9,
-  0x0ebb, 0x0ebd,
-  0x0ec0, 0x0ec4,
-  0x0ec6, 0x0ec6,
-  0x0ec8, 0x0ecd,
-  0x0ed0, 0x0ed9,
-  0x0edc, 0x0edd
-}; /* CR_Lao */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-  23,
-  0x0041, 0x005a,
-  0x0061, 0x007a,
-  0x00aa, 0x00aa,
-  0x00ba, 0x00ba,
-  0x00c0, 0x00d6,
-  0x00d8, 0x00f6,
-  0x00f8, 0x0241,
-  0x0250, 0x02b8,
-  0x02e0, 0x02e4,
-  0x1d00, 0x1d25,
-  0x1d2c, 0x1d5c,
-  0x1d62, 0x1d65,
-  0x1d6b, 0x1d77,
-  0x1d79, 0x1dbf,
-  0x1e00, 0x1e9b,
-  0x1ea0, 0x1ef9,
-  0x2071, 0x2071,
-  0x207f, 0x207f,
-  0x2090, 0x2094,
-  0x212a, 0x212b,
-  0xfb00, 0xfb06,
-  0xff21, 0xff3a,
-  0xff41, 0xff5a
-}; /* CR_Latin */
-
-/* 'Limbu': Script */
-static const OnigCodePoint CR_Limbu[] = {
-  5,
-  0x1900, 0x191c,
-  0x1920, 0x192b,
-  0x1930, 0x193b,
-  0x1940, 0x1940,
-  0x1944, 0x194f
-}; /* CR_Limbu */
-
-/* 'Linear_B': Script */
-static const OnigCodePoint CR_Linear_B[] = {
-  7,
-  0x10000, 0x1000b,
-  0x1000d, 0x10026,
-  0x10028, 0x1003a,
-  0x1003c, 0x1003d,
-  0x1003f, 0x1004d,
-  0x10050, 0x1005d,
-  0x10080, 0x100fa
-}; /* CR_Linear_B */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-  11,
-  0x0d02, 0x0d03,
-  0x0d05, 0x0d0c,
-  0x0d0e, 0x0d10,
-  0x0d12, 0x0d28,
-  0x0d2a, 0x0d39,
-  0x0d3e, 0x0d43,
-  0x0d46, 0x0d48,
-  0x0d4a, 0x0d4d,
-  0x0d57, 0x0d57,
-  0x0d60, 0x0d61,
-  0x0d66, 0x0d6f
-}; /* CR_Malayalam */
-
-/* 'Mongolian': Script */
-static const OnigCodePoint CR_Mongolian[] = {
-  4,
-  0x1800, 0x180e,
-  0x1810, 0x1819,
-  0x1820, 0x1877,
-  0x1880, 0x18a9
-}; /* CR_Mongolian */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-  6,
-  0x1000, 0x1021,
-  0x1023, 0x1027,
-  0x1029, 0x102a,
-  0x102c, 0x1032,
-  0x1036, 0x1039,
-  0x1040, 0x1059
-}; /* CR_Myanmar */
-
-/* 'New_Tai_Lue': Script */
-static const OnigCodePoint CR_New_Tai_Lue[] = {
-  4,
-  0x1980, 0x19a9,
-  0x19b0, 0x19c9,
-  0x19d0, 0x19d9,
-  0x19de, 0x19df
-}; /* CR_New_Tai_Lue */
-
-/* 'Ogham': Script */
-static const OnigCodePoint CR_Ogham[] = {
-  1,
-  0x1680, 0x169c
-}; /* CR_Ogham */
-
-/* 'Old_Italic': Script */
-static const OnigCodePoint CR_Old_Italic[] = {
-  2,
-  0x10300, 0x1031e,
-  0x10320, 0x10323
-}; /* CR_Old_Italic */
-
-/* 'Old_Persian': Script */
-static const OnigCodePoint CR_Old_Persian[] = {
-  2,
-  0x103a0, 0x103c3,
-  0x103c8, 0x103d5
-}; /* CR_Old_Persian */
-
-/* 'Oriya': Script */
-static const OnigCodePoint CR_Oriya[] = {
-  14,
-  0x0b01, 0x0b03,
-  0x0b05, 0x0b0c,
-  0x0b0f, 0x0b10,
-  0x0b13, 0x0b28,
-  0x0b2a, 0x0b30,
-  0x0b32, 0x0b33,
-  0x0b35, 0x0b39,
-  0x0b3c, 0x0b43,
-  0x0b47, 0x0b48,
-  0x0b4b, 0x0b4d,
-  0x0b56, 0x0b57,
-  0x0b5c, 0x0b5d,
-  0x0b5f, 0x0b61,
-  0x0b66, 0x0b71
-}; /* CR_Oriya */
-
-/* 'Osmanya': Script */
-static const OnigCodePoint CR_Osmanya[] = {
-  2,
-  0x10480, 0x1049d,
-  0x104a0, 0x104a9
-}; /* CR_Osmanya */
-
-/* 'Runic': Script */
-static const OnigCodePoint CR_Runic[] = {
-  2,
-  0x16a0, 0x16ea,
-  0x16ee, 0x16f0
-}; /* CR_Runic */
-
-/* 'Shavian': Script */
-static const OnigCodePoint CR_Shavian[] = {
-  1,
-  0x10450, 0x1047f
-}; /* CR_Shavian */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
-  11,
-  0x0d82, 0x0d83,
-  0x0d85, 0x0d96,
-  0x0d9a, 0x0db1,
-  0x0db3, 0x0dbb,
-  0x0dbd, 0x0dbd,
-  0x0dc0, 0x0dc6,
-  0x0dca, 0x0dca,
-  0x0dcf, 0x0dd4,
-  0x0dd6, 0x0dd6,
-  0x0dd8, 0x0ddf,
-  0x0df2, 0x0df4
-}; /* CR_Sinhala */
-
-/* 'Syloti_Nagri': Script */
-static const OnigCodePoint CR_Syloti_Nagri[] = {
-  1,
-  0xa800, 0xa82b
-}; /* CR_Syloti_Nagri */
-
-/* 'Syriac': Script */
-static const OnigCodePoint CR_Syriac[] = {
-  3,
-  0x0700, 0x070d,
-  0x070f, 0x074a,
-  0x074d, 0x074f
-}; /* CR_Syriac */
-
-/* 'Tagalog': Script */
-static const OnigCodePoint CR_Tagalog[] = {
-  2,
-  0x1700, 0x170c,
-  0x170e, 0x1714
-}; /* CR_Tagalog */
-
-/* 'Tagbanwa': Script */
-static const OnigCodePoint CR_Tagbanwa[] = {
-  3,
-  0x1760, 0x176c,
-  0x176e, 0x1770,
-  0x1772, 0x1773
-}; /* CR_Tagbanwa */
-
-/* 'Tai_Le': Script */
-static const OnigCodePoint CR_Tai_Le[] = {
-  2,
-  0x1950, 0x196d,
-  0x1970, 0x1974
-}; /* CR_Tai_Le */
-
-/* 'Tamil': Script */
-static const OnigCodePoint CR_Tamil[] = {
-  15,
-  0x0b82, 0x0b83,
-  0x0b85, 0x0b8a,
-  0x0b8e, 0x0b90,
-  0x0b92, 0x0b95,
-  0x0b99, 0x0b9a,
-  0x0b9c, 0x0b9c,
-  0x0b9e, 0x0b9f,
-  0x0ba3, 0x0ba4,
-  0x0ba8, 0x0baa,
-  0x0bae, 0x0bb9,
-  0x0bbe, 0x0bc2,
-  0x0bc6, 0x0bc8,
-  0x0bca, 0x0bcd,
-  0x0bd7, 0x0bd7,
-  0x0be6, 0x0bfa
-}; /* CR_Tamil */
-
-/* 'Telugu': Script */
-static const OnigCodePoint CR_Telugu[] = {
-  12,
-  0x0c01, 0x0c03,
-  0x0c05, 0x0c0c,
-  0x0c0e, 0x0c10,
-  0x0c12, 0x0c28,
-  0x0c2a, 0x0c33,
-  0x0c35, 0x0c39,
-  0x0c3e, 0x0c44,
-  0x0c46, 0x0c48,
-  0x0c4a, 0x0c4d,
-  0x0c55, 0x0c56,
-  0x0c60, 0x0c61,
-  0x0c66, 0x0c6f
-}; /* CR_Telugu */
-
-/* 'Thaana': Script */
-static const OnigCodePoint CR_Thaana[] = {
-  1,
-  0x0780, 0x07b1
-}; /* CR_Thaana */
-
-/* 'Thai': Script */
-static const OnigCodePoint CR_Thai[] = {
-  2,
-  0x0e01, 0x0e3a,
-  0x0e40, 0x0e5b
-}; /* CR_Thai */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-  7,
-  0x0f00, 0x0f47,
-  0x0f49, 0x0f6a,
-  0x0f71, 0x0f8b,
-  0x0f90, 0x0f97,
-  0x0f99, 0x0fbc,
-  0x0fbe, 0x0fcc,
-  0x0fcf, 0x0fd1
-}; /* CR_Tibetan */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-  2,
-  0x2d30, 0x2d65,
-  0x2d6f, 0x2d6f
-}; /* CR_Tifinagh */
-
-/* 'Ugaritic': Script */
-static const OnigCodePoint CR_Ugaritic[] = {
-  2,
-  0x10380, 0x1039d,
-  0x1039f, 0x1039f
-}; /* CR_Ugaritic */
-
-/* 'Yi': Script */
-static const OnigCodePoint CR_Yi[] = {
-  2,
-  0xa000, 0xa48c,
-  0xa490, 0xa4c6
-}; /* CR_Yi */
-
-
-#endif /* USE_UNICODE_PROPERTIES */
-
-
-typedef struct {
-  int n;
-  OnigCodePoint code[3];
-} CodePointList3;
-
-typedef struct {
-  OnigCodePoint  from;
-  CodePointList3 to;
-} CaseFold_11_Type;
-
-typedef struct {
-  OnigCodePoint  from;
-  CodePointList3 to;
-} CaseUnfold_11_Type;
-
-typedef struct {
-  int n;
-  OnigCodePoint code[2];
-} CodePointList2;
-
-typedef struct {
-  OnigCodePoint  from[2];
-  CodePointList2 to;
-} CaseUnfold_12_Type;
-
-typedef struct {
-  OnigCodePoint  from[3];
-  CodePointList2 to;
-} CaseUnfold_13_Type;
-
-static const CaseFold_11_Type CaseFold[] = {
- { 0x0041, {1, {0x0061}}},
- { 0x0042, {1, {0x0062}}},
- { 0x0043, {1, {0x0063}}},
- { 0x0044, {1, {0x0064}}},
- { 0x0045, {1, {0x0065}}},
- { 0x0046, {1, {0x0066}}},
- { 0x0047, {1, {0x0067}}},
- { 0x0048, {1, {0x0068}}},
- { 0x004a, {1, {0x006a}}},
- { 0x004b, {1, {0x006b}}},
- { 0x004c, {1, {0x006c}}},
- { 0x004d, {1, {0x006d}}},
- { 0x004e, {1, {0x006e}}},
- { 0x004f, {1, {0x006f}}},
- { 0x0050, {1, {0x0070}}},
- { 0x0051, {1, {0x0071}}},
- { 0x0052, {1, {0x0072}}},
- { 0x0053, {1, {0x0073}}},
- { 0x0054, {1, {0x0074}}},
- { 0x0055, {1, {0x0075}}},
- { 0x0056, {1, {0x0076}}},
- { 0x0057, {1, {0x0077}}},
- { 0x0058, {1, {0x0078}}},
- { 0x0059, {1, {0x0079}}},
- { 0x005a, {1, {0x007a}}},
- { 0x00b5, {1, {0x03bc}}},
- { 0x00c0, {1, {0x00e0}}},
- { 0x00c1, {1, {0x00e1}}},
- { 0x00c2, {1, {0x00e2}}},
- { 0x00c3, {1, {0x00e3}}},
- { 0x00c4, {1, {0x00e4}}},
- { 0x00c5, {1, {0x00e5}}},
- { 0x00c6, {1, {0x00e6}}},
- { 0x00c7, {1, {0x00e7}}},
- { 0x00c8, {1, {0x00e8}}},
- { 0x00c9, {1, {0x00e9}}},
- { 0x00ca, {1, {0x00ea}}},
- { 0x00cb, {1, {0x00eb}}},
- { 0x00cc, {1, {0x00ec}}},
- { 0x00cd, {1, {0x00ed}}},
- { 0x00ce, {1, {0x00ee}}},
- { 0x00cf, {1, {0x00ef}}},
- { 0x00d0, {1, {0x00f0}}},
- { 0x00d1, {1, {0x00f1}}},
- { 0x00d2, {1, {0x00f2}}},
- { 0x00d3, {1, {0x00f3}}},
- { 0x00d4, {1, {0x00f4}}},
- { 0x00d5, {1, {0x00f5}}},
- { 0x00d6, {1, {0x00f6}}},
- { 0x00d8, {1, {0x00f8}}},
- { 0x00d9, {1, {0x00f9}}},
- { 0x00da, {1, {0x00fa}}},
- { 0x00db, {1, {0x00fb}}},
- { 0x00dc, {1, {0x00fc}}},
- { 0x00dd, {1, {0x00fd}}},
- { 0x00de, {1, {0x00fe}}},
- { 0x00df, {2, {0x0073, 0x0073}}},
- { 0x0100, {1, {0x0101}}},
- { 0x0102, {1, {0x0103}}},
- { 0x0104, {1, {0x0105}}},
- { 0x0106, {1, {0x0107}}},
- { 0x0108, {1, {0x0109}}},
- { 0x010a, {1, {0x010b}}},
- { 0x010c, {1, {0x010d}}},
- { 0x010e, {1, {0x010f}}},
- { 0x0110, {1, {0x0111}}},
- { 0x0112, {1, {0x0113}}},
- { 0x0114, {1, {0x0115}}},
- { 0x0116, {1, {0x0117}}},
- { 0x0118, {1, {0x0119}}},
- { 0x011a, {1, {0x011b}}},
- { 0x011c, {1, {0x011d}}},
- { 0x011e, {1, {0x011f}}},
- { 0x0120, {1, {0x0121}}},
- { 0x0122, {1, {0x0123}}},
- { 0x0124, {1, {0x0125}}},
- { 0x0126, {1, {0x0127}}},
- { 0x0128, {1, {0x0129}}},
- { 0x012a, {1, {0x012b}}},
- { 0x012c, {1, {0x012d}}},
- { 0x012e, {1, {0x012f}}},
- { 0x0132, {1, {0x0133}}},
- { 0x0134, {1, {0x0135}}},
- { 0x0136, {1, {0x0137}}},
- { 0x0139, {1, {0x013a}}},
- { 0x013b, {1, {0x013c}}},
- { 0x013d, {1, {0x013e}}},
- { 0x013f, {1, {0x0140}}},
- { 0x0141, {1, {0x0142}}},
- { 0x0143, {1, {0x0144}}},
- { 0x0145, {1, {0x0146}}},
- { 0x0147, {1, {0x0148}}},
- { 0x0149, {2, {0x02bc, 0x006e}}},
- { 0x014a, {1, {0x014b}}},
- { 0x014c, {1, {0x014d}}},
- { 0x014e, {1, {0x014f}}},
- { 0x0150, {1, {0x0151}}},
- { 0x0152, {1, {0x0153}}},
- { 0x0154, {1, {0x0155}}},
- { 0x0156, {1, {0x0157}}},
- { 0x0158, {1, {0x0159}}},
- { 0x015a, {1, {0x015b}}},
- { 0x015c, {1, {0x015d}}},
- { 0x015e, {1, {0x015f}}},
- { 0x0160, {1, {0x0161}}},
- { 0x0162, {1, {0x0163}}},
- { 0x0164, {1, {0x0165}}},
- { 0x0166, {1, {0x0167}}},
- { 0x0168, {1, {0x0169}}},
- { 0x016a, {1, {0x016b}}},
- { 0x016c, {1, {0x016d}}},
- { 0x016e, {1, {0x016f}}},
- { 0x0170, {1, {0x0171}}},
- { 0x0172, {1, {0x0173}}},
- { 0x0174, {1, {0x0175}}},
- { 0x0176, {1, {0x0177}}},
- { 0x0178, {1, {0x00ff}}},
- { 0x0179, {1, {0x017a}}},
- { 0x017b, {1, {0x017c}}},
- { 0x017d, {1, {0x017e}}},
- { 0x017f, {1, {0x0073}}},
- { 0x0181, {1, {0x0253}}},
- { 0x0182, {1, {0x0183}}},
- { 0x0184, {1, {0x0185}}},
- { 0x0186, {1, {0x0254}}},
- { 0x0187, {1, {0x0188}}},
- { 0x0189, {1, {0x0256}}},
- { 0x018a, {1, {0x0257}}},
- { 0x018b, {1, {0x018c}}},
- { 0x018e, {1, {0x01dd}}},
- { 0x018f, {1, {0x0259}}},
- { 0x0190, {1, {0x025b}}},
- { 0x0191, {1, {0x0192}}},
- { 0x0193, {1, {0x0260}}},
- { 0x0194, {1, {0x0263}}},
- { 0x0196, {1, {0x0269}}},
- { 0x0197, {1, {0x0268}}},
- { 0x0198, {1, {0x0199}}},
- { 0x019c, {1, {0x026f}}},
- { 0x019d, {1, {0x0272}}},
- { 0x019f, {1, {0x0275}}},
- { 0x01a0, {1, {0x01a1}}},
- { 0x01a2, {1, {0x01a3}}},
- { 0x01a4, {1, {0x01a5}}},
- { 0x01a6, {1, {0x0280}}},
- { 0x01a7, {1, {0x01a8}}},
- { 0x01a9, {1, {0x0283}}},
- { 0x01ac, {1, {0x01ad}}},
- { 0x01ae, {1, {0x0288}}},
- { 0x01af, {1, {0x01b0}}},
- { 0x01b1, {1, {0x028a}}},
- { 0x01b2, {1, {0x028b}}},
- { 0x01b3, {1, {0x01b4}}},
- { 0x01b5, {1, {0x01b6}}},
- { 0x01b7, {1, {0x0292}}},
- { 0x01b8, {1, {0x01b9}}},
- { 0x01bc, {1, {0x01bd}}},
- { 0x01c4, {1, {0x01c6}}},
- { 0x01c5, {1, {0x01c6}}},
- { 0x01c7, {1, {0x01c9}}},
- { 0x01c8, {1, {0x01c9}}},
- { 0x01ca, {1, {0x01cc}}},
- { 0x01cb, {1, {0x01cc}}},
- { 0x01cd, {1, {0x01ce}}},
- { 0x01cf, {1, {0x01d0}}},
- { 0x01d1, {1, {0x01d2}}},
- { 0x01d3, {1, {0x01d4}}},
- { 0x01d5, {1, {0x01d6}}},
- { 0x01d7, {1, {0x01d8}}},
- { 0x01d9, {1, {0x01da}}},
- { 0x01db, {1, {0x01dc}}},
- { 0x01de, {1, {0x01df}}},
- { 0x01e0, {1, {0x01e1}}},
- { 0x01e2, {1, {0x01e3}}},
- { 0x01e4, {1, {0x01e5}}},
- { 0x01e6, {1, {0x01e7}}},
- { 0x01e8, {1, {0x01e9}}},
- { 0x01ea, {1, {0x01eb}}},
- { 0x01ec, {1, {0x01ed}}},
- { 0x01ee, {1, {0x01ef}}},
- { 0x01f0, {2, {0x006a, 0x030c}}},
- { 0x01f1, {1, {0x01f3}}},
- { 0x01f2, {1, {0x01f3}}},
- { 0x01f4, {1, {0x01f5}}},
- { 0x01f6, {1, {0x0195}}},
- { 0x01f7, {1, {0x01bf}}},
- { 0x01f8, {1, {0x01f9}}},
- { 0x01fa, {1, {0x01fb}}},
- { 0x01fc, {1, {0x01fd}}},
- { 0x01fe, {1, {0x01ff}}},
- { 0x0200, {1, {0x0201}}},
- { 0x0202, {1, {0x0203}}},
- { 0x0204, {1, {0x0205}}},
- { 0x0206, {1, {0x0207}}},
- { 0x0208, {1, {0x0209}}},
- { 0x020a, {1, {0x020b}}},
- { 0x020c, {1, {0x020d}}},
- { 0x020e, {1, {0x020f}}},
- { 0x0210, {1, {0x0211}}},
- { 0x0212, {1, {0x0213}}},
- { 0x0214, {1, {0x0215}}},
- { 0x0216, {1, {0x0217}}},
- { 0x0218, {1, {0x0219}}},
- { 0x021a, {1, {0x021b}}},
- { 0x021c, {1, {0x021d}}},
- { 0x021e, {1, {0x021f}}},
- { 0x0220, {1, {0x019e}}},
- { 0x0222, {1, {0x0223}}},
- { 0x0224, {1, {0x0225}}},
- { 0x0226, {1, {0x0227}}},
- { 0x0228, {1, {0x0229}}},
- { 0x022a, {1, {0x022b}}},
- { 0x022c, {1, {0x022d}}},
- { 0x022e, {1, {0x022f}}},
- { 0x0230, {1, {0x0231}}},
- { 0x0232, {1, {0x0233}}},
- { 0x023b, {1, {0x023c}}},
- { 0x023d, {1, {0x019a}}},
- { 0x0241, {1, {0x0294}}},
- { 0x0345, {1, {0x03b9}}},
- { 0x0386, {1, {0x03ac}}},
- { 0x0388, {1, {0x03ad}}},
- { 0x0389, {1, {0x03ae}}},
- { 0x038a, {1, {0x03af}}},
- { 0x038c, {1, {0x03cc}}},
- { 0x038e, {1, {0x03cd}}},
- { 0x038f, {1, {0x03ce}}},
- { 0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x0391, {1, {0x03b1}}},
- { 0x0392, {1, {0x03b2}}},
- { 0x0393, {1, {0x03b3}}},
- { 0x0394, {1, {0x03b4}}},
- { 0x0395, {1, {0x03b5}}},
- { 0x0396, {1, {0x03b6}}},
- { 0x0397, {1, {0x03b7}}},
- { 0x0398, {1, {0x03b8}}},
- { 0x0399, {1, {0x03b9}}},
- { 0x039a, {1, {0x03ba}}},
- { 0x039b, {1, {0x03bb}}},
- { 0x039c, {1, {0x03bc}}},
- { 0x039d, {1, {0x03bd}}},
- { 0x039e, {1, {0x03be}}},
- { 0x039f, {1, {0x03bf}}},
- { 0x03a0, {1, {0x03c0}}},
- { 0x03a1, {1, {0x03c1}}},
- { 0x03a3, {1, {0x03c3}}},
- { 0x03a4, {1, {0x03c4}}},
- { 0x03a5, {1, {0x03c5}}},
- { 0x03a6, {1, {0x03c6}}},
- { 0x03a7, {1, {0x03c7}}},
- { 0x03a8, {1, {0x03c8}}},
- { 0x03a9, {1, {0x03c9}}},
- { 0x03aa, {1, {0x03ca}}},
- { 0x03ab, {1, {0x03cb}}},
- { 0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x03c2, {1, {0x03c3}}},
- { 0x03d0, {1, {0x03b2}}},
- { 0x03d1, {1, {0x03b8}}},
- { 0x03d5, {1, {0x03c6}}},
- { 0x03d6, {1, {0x03c0}}},
- { 0x03d8, {1, {0x03d9}}},
- { 0x03da, {1, {0x03db}}},
- { 0x03dc, {1, {0x03dd}}},
- { 0x03de, {1, {0x03df}}},
- { 0x03e0, {1, {0x03e1}}},
- { 0x03e2, {1, {0x03e3}}},
- { 0x03e4, {1, {0x03e5}}},
- { 0x03e6, {1, {0x03e7}}},
- { 0x03e8, {1, {0x03e9}}},
- { 0x03ea, {1, {0x03eb}}},
- { 0x03ec, {1, {0x03ed}}},
- { 0x03ee, {1, {0x03ef}}},
- { 0x03f0, {1, {0x03ba}}},
- { 0x03f1, {1, {0x03c1}}},
- { 0x03f4, {1, {0x03b8}}},
- { 0x03f5, {1, {0x03b5}}},
- { 0x03f7, {1, {0x03f8}}},
- { 0x03f9, {1, {0x03f2}}},
- { 0x03fa, {1, {0x03fb}}},
- { 0x0400, {1, {0x0450}}},
- { 0x0401, {1, {0x0451}}},
- { 0x0402, {1, {0x0452}}},
- { 0x0403, {1, {0x0453}}},
- { 0x0404, {1, {0x0454}}},
- { 0x0405, {1, {0x0455}}},
- { 0x0406, {1, {0x0456}}},
- { 0x0407, {1, {0x0457}}},
- { 0x0408, {1, {0x0458}}},
- { 0x0409, {1, {0x0459}}},
- { 0x040a, {1, {0x045a}}},
- { 0x040b, {1, {0x045b}}},
- { 0x040c, {1, {0x045c}}},
- { 0x040d, {1, {0x045d}}},
- { 0x040e, {1, {0x045e}}},
- { 0x040f, {1, {0x045f}}},
- { 0x0410, {1, {0x0430}}},
- { 0x0411, {1, {0x0431}}},
- { 0x0412, {1, {0x0432}}},
- { 0x0413, {1, {0x0433}}},
- { 0x0414, {1, {0x0434}}},
- { 0x0415, {1, {0x0435}}},
- { 0x0416, {1, {0x0436}}},
- { 0x0417, {1, {0x0437}}},
- { 0x0418, {1, {0x0438}}},
- { 0x0419, {1, {0x0439}}},
- { 0x041a, {1, {0x043a}}},
- { 0x041b, {1, {0x043b}}},
- { 0x041c, {1, {0x043c}}},
- { 0x041d, {1, {0x043d}}},
- { 0x041e, {1, {0x043e}}},
- { 0x041f, {1, {0x043f}}},
- { 0x0420, {1, {0x0440}}},
- { 0x0421, {1, {0x0441}}},
- { 0x0422, {1, {0x0442}}},
- { 0x0423, {1, {0x0443}}},
- { 0x0424, {1, {0x0444}}},
- { 0x0425, {1, {0x0445}}},
- { 0x0426, {1, {0x0446}}},
- { 0x0427, {1, {0x0447}}},
- { 0x0428, {1, {0x0448}}},
- { 0x0429, {1, {0x0449}}},
- { 0x042a, {1, {0x044a}}},
- { 0x042b, {1, {0x044b}}},
- { 0x042c, {1, {0x044c}}},
- { 0x042d, {1, {0x044d}}},
- { 0x042e, {1, {0x044e}}},
- { 0x042f, {1, {0x044f}}},
- { 0x0460, {1, {0x0461}}},
- { 0x0462, {1, {0x0463}}},
- { 0x0464, {1, {0x0465}}},
- { 0x0466, {1, {0x0467}}},
- { 0x0468, {1, {0x0469}}},
- { 0x046a, {1, {0x046b}}},
- { 0x046c, {1, {0x046d}}},
- { 0x046e, {1, {0x046f}}},
- { 0x0470, {1, {0x0471}}},
- { 0x0472, {1, {0x0473}}},
- { 0x0474, {1, {0x0475}}},
- { 0x0476, {1, {0x0477}}},
- { 0x0478, {1, {0x0479}}},
- { 0x047a, {1, {0x047b}}},
- { 0x047c, {1, {0x047d}}},
- { 0x047e, {1, {0x047f}}},
- { 0x0480, {1, {0x0481}}},
- { 0x048a, {1, {0x048b}}},
- { 0x048c, {1, {0x048d}}},
- { 0x048e, {1, {0x048f}}},
- { 0x0490, {1, {0x0491}}},
- { 0x0492, {1, {0x0493}}},
- { 0x0494, {1, {0x0495}}},
- { 0x0496, {1, {0x0497}}},
- { 0x0498, {1, {0x0499}}},
- { 0x049a, {1, {0x049b}}},
- { 0x049c, {1, {0x049d}}},
- { 0x049e, {1, {0x049f}}},
- { 0x04a0, {1, {0x04a1}}},
- { 0x04a2, {1, {0x04a3}}},
- { 0x04a4, {1, {0x04a5}}},
- { 0x04a6, {1, {0x04a7}}},
- { 0x04a8, {1, {0x04a9}}},
- { 0x04aa, {1, {0x04ab}}},
- { 0x04ac, {1, {0x04ad}}},
- { 0x04ae, {1, {0x04af}}},
- { 0x04b0, {1, {0x04b1}}},
- { 0x04b2, {1, {0x04b3}}},
- { 0x04b4, {1, {0x04b5}}},
- { 0x04b6, {1, {0x04b7}}},
- { 0x04b8, {1, {0x04b9}}},
- { 0x04ba, {1, {0x04bb}}},
- { 0x04bc, {1, {0x04bd}}},
- { 0x04be, {1, {0x04bf}}},
- { 0x04c1, {1, {0x04c2}}},
- { 0x04c3, {1, {0x04c4}}},
- { 0x04c5, {1, {0x04c6}}},
- { 0x04c7, {1, {0x04c8}}},
- { 0x04c9, {1, {0x04ca}}},
- { 0x04cb, {1, {0x04cc}}},
- { 0x04cd, {1, {0x04ce}}},
- { 0x04d0, {1, {0x04d1}}},
- { 0x04d2, {1, {0x04d3}}},
- { 0x04d4, {1, {0x04d5}}},
- { 0x04d6, {1, {0x04d7}}},
- { 0x04d8, {1, {0x04d9}}},
- { 0x04da, {1, {0x04db}}},
- { 0x04dc, {1, {0x04dd}}},
- { 0x04de, {1, {0x04df}}},
- { 0x04e0, {1, {0x04e1}}},
- { 0x04e2, {1, {0x04e3}}},
- { 0x04e4, {1, {0x04e5}}},
- { 0x04e6, {1, {0x04e7}}},
- { 0x04e8, {1, {0x04e9}}},
- { 0x04ea, {1, {0x04eb}}},
- { 0x04ec, {1, {0x04ed}}},
- { 0x04ee, {1, {0x04ef}}},
- { 0x04f0, {1, {0x04f1}}},
- { 0x04f2, {1, {0x04f3}}},
- { 0x04f4, {1, {0x04f5}}},
- { 0x04f6, {1, {0x04f7}}},
- { 0x04f8, {1, {0x04f9}}},
- { 0x0500, {1, {0x0501}}},
- { 0x0502, {1, {0x0503}}},
- { 0x0504, {1, {0x0505}}},
- { 0x0506, {1, {0x0507}}},
- { 0x0508, {1, {0x0509}}},
- { 0x050a, {1, {0x050b}}},
- { 0x050c, {1, {0x050d}}},
- { 0x050e, {1, {0x050f}}},
- { 0x0531, {1, {0x0561}}},
- { 0x0532, {1, {0x0562}}},
- { 0x0533, {1, {0x0563}}},
- { 0x0534, {1, {0x0564}}},
- { 0x0535, {1, {0x0565}}},
- { 0x0536, {1, {0x0566}}},
- { 0x0537, {1, {0x0567}}},
- { 0x0538, {1, {0x0568}}},
- { 0x0539, {1, {0x0569}}},
- { 0x053a, {1, {0x056a}}},
- { 0x053b, {1, {0x056b}}},
- { 0x053c, {1, {0x056c}}},
- { 0x053d, {1, {0x056d}}},
- { 0x053e, {1, {0x056e}}},
- { 0x053f, {1, {0x056f}}},
- { 0x0540, {1, {0x0570}}},
- { 0x0541, {1, {0x0571}}},
- { 0x0542, {1, {0x0572}}},
- { 0x0543, {1, {0x0573}}},
- { 0x0544, {1, {0x0574}}},
- { 0x0545, {1, {0x0575}}},
- { 0x0546, {1, {0x0576}}},
- { 0x0547, {1, {0x0577}}},
- { 0x0548, {1, {0x0578}}},
- { 0x0549, {1, {0x0579}}},
- { 0x054a, {1, {0x057a}}},
- { 0x054b, {1, {0x057b}}},
- { 0x054c, {1, {0x057c}}},
- { 0x054d, {1, {0x057d}}},
- { 0x054e, {1, {0x057e}}},
- { 0x054f, {1, {0x057f}}},
- { 0x0550, {1, {0x0580}}},
- { 0x0551, {1, {0x0581}}},
- { 0x0552, {1, {0x0582}}},
- { 0x0553, {1, {0x0583}}},
- { 0x0554, {1, {0x0584}}},
- { 0x0555, {1, {0x0585}}},
- { 0x0556, {1, {0x0586}}},
- { 0x0587, {2, {0x0565, 0x0582}}},
- { 0x10a0, {1, {0x2d00}}},
- { 0x10a1, {1, {0x2d01}}},
- { 0x10a2, {1, {0x2d02}}},
- { 0x10a3, {1, {0x2d03}}},
- { 0x10a4, {1, {0x2d04}}},
- { 0x10a5, {1, {0x2d05}}},
- { 0x10a6, {1, {0x2d06}}},
- { 0x10a7, {1, {0x2d07}}},
- { 0x10a8, {1, {0x2d08}}},
- { 0x10a9, {1, {0x2d09}}},
- { 0x10aa, {1, {0x2d0a}}},
- { 0x10ab, {1, {0x2d0b}}},
- { 0x10ac, {1, {0x2d0c}}},
- { 0x10ad, {1, {0x2d0d}}},
- { 0x10ae, {1, {0x2d0e}}},
- { 0x10af, {1, {0x2d0f}}},
- { 0x10b0, {1, {0x2d10}}},
- { 0x10b1, {1, {0x2d11}}},
- { 0x10b2, {1, {0x2d12}}},
- { 0x10b3, {1, {0x2d13}}},
- { 0x10b4, {1, {0x2d14}}},
- { 0x10b5, {1, {0x2d15}}},
- { 0x10b6, {1, {0x2d16}}},
- { 0x10b7, {1, {0x2d17}}},
- { 0x10b8, {1, {0x2d18}}},
- { 0x10b9, {1, {0x2d19}}},
- { 0x10ba, {1, {0x2d1a}}},
- { 0x10bb, {1, {0x2d1b}}},
- { 0x10bc, {1, {0x2d1c}}},
- { 0x10bd, {1, {0x2d1d}}},
- { 0x10be, {1, {0x2d1e}}},
- { 0x10bf, {1, {0x2d1f}}},
- { 0x10c0, {1, {0x2d20}}},
- { 0x10c1, {1, {0x2d21}}},
- { 0x10c2, {1, {0x2d22}}},
- { 0x10c3, {1, {0x2d23}}},
- { 0x10c4, {1, {0x2d24}}},
- { 0x10c5, {1, {0x2d25}}},
- { 0x1e00, {1, {0x1e01}}},
- { 0x1e02, {1, {0x1e03}}},
- { 0x1e04, {1, {0x1e05}}},
- { 0x1e06, {1, {0x1e07}}},
- { 0x1e08, {1, {0x1e09}}},
- { 0x1e0a, {1, {0x1e0b}}},
- { 0x1e0c, {1, {0x1e0d}}},
- { 0x1e0e, {1, {0x1e0f}}},
- { 0x1e10, {1, {0x1e11}}},
- { 0x1e12, {1, {0x1e13}}},
- { 0x1e14, {1, {0x1e15}}},
- { 0x1e16, {1, {0x1e17}}},
- { 0x1e18, {1, {0x1e19}}},
- { 0x1e1a, {1, {0x1e1b}}},
- { 0x1e1c, {1, {0x1e1d}}},
- { 0x1e1e, {1, {0x1e1f}}},
- { 0x1e20, {1, {0x1e21}}},
- { 0x1e22, {1, {0x1e23}}},
- { 0x1e24, {1, {0x1e25}}},
- { 0x1e26, {1, {0x1e27}}},
- { 0x1e28, {1, {0x1e29}}},
- { 0x1e2a, {1, {0x1e2b}}},
- { 0x1e2c, {1, {0x1e2d}}},
- { 0x1e2e, {1, {0x1e2f}}},
- { 0x1e30, {1, {0x1e31}}},
- { 0x1e32, {1, {0x1e33}}},
- { 0x1e34, {1, {0x1e35}}},
- { 0x1e36, {1, {0x1e37}}},
- { 0x1e38, {1, {0x1e39}}},
- { 0x1e3a, {1, {0x1e3b}}},
- { 0x1e3c, {1, {0x1e3d}}},
- { 0x1e3e, {1, {0x1e3f}}},
- { 0x1e40, {1, {0x1e41}}},
- { 0x1e42, {1, {0x1e43}}},
- { 0x1e44, {1, {0x1e45}}},
- { 0x1e46, {1, {0x1e47}}},
- { 0x1e48, {1, {0x1e49}}},
- { 0x1e4a, {1, {0x1e4b}}},
- { 0x1e4c, {1, {0x1e4d}}},
- { 0x1e4e, {1, {0x1e4f}}},
- { 0x1e50, {1, {0x1e51}}},
- { 0x1e52, {1, {0x1e53}}},
- { 0x1e54, {1, {0x1e55}}},
- { 0x1e56, {1, {0x1e57}}},
- { 0x1e58, {1, {0x1e59}}},
- { 0x1e5a, {1, {0x1e5b}}},
- { 0x1e5c, {1, {0x1e5d}}},
- { 0x1e5e, {1, {0x1e5f}}},
- { 0x1e60, {1, {0x1e61}}},
- { 0x1e62, {1, {0x1e63}}},
- { 0x1e64, {1, {0x1e65}}},
- { 0x1e66, {1, {0x1e67}}},
- { 0x1e68, {1, {0x1e69}}},
- { 0x1e6a, {1, {0x1e6b}}},
- { 0x1e6c, {1, {0x1e6d}}},
- { 0x1e6e, {1, {0x1e6f}}},
- { 0x1e70, {1, {0x1e71}}},
- { 0x1e72, {1, {0x1e73}}},
- { 0x1e74, {1, {0x1e75}}},
- { 0x1e76, {1, {0x1e77}}},
- { 0x1e78, {1, {0x1e79}}},
- { 0x1e7a, {1, {0x1e7b}}},
- { 0x1e7c, {1, {0x1e7d}}},
- { 0x1e7e, {1, {0x1e7f}}},
- { 0x1e80, {1, {0x1e81}}},
- { 0x1e82, {1, {0x1e83}}},
- { 0x1e84, {1, {0x1e85}}},
- { 0x1e86, {1, {0x1e87}}},
- { 0x1e88, {1, {0x1e89}}},
- { 0x1e8a, {1, {0x1e8b}}},
- { 0x1e8c, {1, {0x1e8d}}},
- { 0x1e8e, {1, {0x1e8f}}},
- { 0x1e90, {1, {0x1e91}}},
- { 0x1e92, {1, {0x1e93}}},
- { 0x1e94, {1, {0x1e95}}},
- { 0x1e96, {2, {0x0068, 0x0331}}},
- { 0x1e97, {2, {0x0074, 0x0308}}},
- { 0x1e98, {2, {0x0077, 0x030a}}},
- { 0x1e99, {2, {0x0079, 0x030a}}},
- { 0x1e9a, {2, {0x0061, 0x02be}}},
- { 0x1e9b, {1, {0x1e61}}},
- { 0x1ea0, {1, {0x1ea1}}},
- { 0x1ea2, {1, {0x1ea3}}},
- { 0x1ea4, {1, {0x1ea5}}},
- { 0x1ea6, {1, {0x1ea7}}},
- { 0x1ea8, {1, {0x1ea9}}},
- { 0x1eaa, {1, {0x1eab}}},
- { 0x1eac, {1, {0x1ead}}},
- { 0x1eae, {1, {0x1eaf}}},
- { 0x1eb0, {1, {0x1eb1}}},
- { 0x1eb2, {1, {0x1eb3}}},
- { 0x1eb4, {1, {0x1eb5}}},
- { 0x1eb6, {1, {0x1eb7}}},
- { 0x1eb8, {1, {0x1eb9}}},
- { 0x1eba, {1, {0x1ebb}}},
- { 0x1ebc, {1, {0x1ebd}}},
- { 0x1ebe, {1, {0x1ebf}}},
- { 0x1ec0, {1, {0x1ec1}}},
- { 0x1ec2, {1, {0x1ec3}}},
- { 0x1ec4, {1, {0x1ec5}}},
- { 0x1ec6, {1, {0x1ec7}}},
- { 0x1ec8, {1, {0x1ec9}}},
- { 0x1eca, {1, {0x1ecb}}},
- { 0x1ecc, {1, {0x1ecd}}},
- { 0x1ece, {1, {0x1ecf}}},
- { 0x1ed0, {1, {0x1ed1}}},
- { 0x1ed2, {1, {0x1ed3}}},
- { 0x1ed4, {1, {0x1ed5}}},
- { 0x1ed6, {1, {0x1ed7}}},
- { 0x1ed8, {1, {0x1ed9}}},
- { 0x1eda, {1, {0x1edb}}},
- { 0x1edc, {1, {0x1edd}}},
- { 0x1ede, {1, {0x1edf}}},
- { 0x1ee0, {1, {0x1ee1}}},
- { 0x1ee2, {1, {0x1ee3}}},
- { 0x1ee4, {1, {0x1ee5}}},
- { 0x1ee6, {1, {0x1ee7}}},
- { 0x1ee8, {1, {0x1ee9}}},
- { 0x1eea, {1, {0x1eeb}}},
- { 0x1eec, {1, {0x1eed}}},
- { 0x1eee, {1, {0x1eef}}},
- { 0x1ef0, {1, {0x1ef1}}},
- { 0x1ef2, {1, {0x1ef3}}},
- { 0x1ef4, {1, {0x1ef5}}},
- { 0x1ef6, {1, {0x1ef7}}},
- { 0x1ef8, {1, {0x1ef9}}},
- { 0x1f08, {1, {0x1f00}}},
- { 0x1f09, {1, {0x1f01}}},
- { 0x1f0a, {1, {0x1f02}}},
- { 0x1f0b, {1, {0x1f03}}},
- { 0x1f0c, {1, {0x1f04}}},
- { 0x1f0d, {1, {0x1f05}}},
- { 0x1f0e, {1, {0x1f06}}},
- { 0x1f0f, {1, {0x1f07}}},
- { 0x1f18, {1, {0x1f10}}},
- { 0x1f19, {1, {0x1f11}}},
- { 0x1f1a, {1, {0x1f12}}},
- { 0x1f1b, {1, {0x1f13}}},
- { 0x1f1c, {1, {0x1f14}}},
- { 0x1f1d, {1, {0x1f15}}},
- { 0x1f28, {1, {0x1f20}}},
- { 0x1f29, {1, {0x1f21}}},
- { 0x1f2a, {1, {0x1f22}}},
- { 0x1f2b, {1, {0x1f23}}},
- { 0x1f2c, {1, {0x1f24}}},
- { 0x1f2d, {1, {0x1f25}}},
- { 0x1f2e, {1, {0x1f26}}},
- { 0x1f2f, {1, {0x1f27}}},
- { 0x1f38, {1, {0x1f30}}},
- { 0x1f39, {1, {0x1f31}}},
- { 0x1f3a, {1, {0x1f32}}},
- { 0x1f3b, {1, {0x1f33}}},
- { 0x1f3c, {1, {0x1f34}}},
- { 0x1f3d, {1, {0x1f35}}},
- { 0x1f3e, {1, {0x1f36}}},
- { 0x1f3f, {1, {0x1f37}}},
- { 0x1f48, {1, {0x1f40}}},
- { 0x1f49, {1, {0x1f41}}},
- { 0x1f4a, {1, {0x1f42}}},
- { 0x1f4b, {1, {0x1f43}}},
- { 0x1f4c, {1, {0x1f44}}},
- { 0x1f4d, {1, {0x1f45}}},
- { 0x1f50, {2, {0x03c5, 0x0313}}},
- { 0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
- { 0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
- { 0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
- { 0x1f59, {1, {0x1f51}}},
- { 0x1f5b, {1, {0x1f53}}},
- { 0x1f5d, {1, {0x1f55}}},
- { 0x1f5f, {1, {0x1f57}}},
- { 0x1f68, {1, {0x1f60}}},
- { 0x1f69, {1, {0x1f61}}},
- { 0x1f6a, {1, {0x1f62}}},
- { 0x1f6b, {1, {0x1f63}}},
- { 0x1f6c, {1, {0x1f64}}},
- { 0x1f6d, {1, {0x1f65}}},
- { 0x1f6e, {1, {0x1f66}}},
- { 0x1f6f, {1, {0x1f67}}},
- { 0x1f80, {2, {0x1f00, 0x03b9}}},
- { 0x1f81, {2, {0x1f01, 0x03b9}}},
- { 0x1f82, {2, {0x1f02, 0x03b9}}},
- { 0x1f83, {2, {0x1f03, 0x03b9}}},
- { 0x1f84, {2, {0x1f04, 0x03b9}}},
- { 0x1f85, {2, {0x1f05, 0x03b9}}},
- { 0x1f86, {2, {0x1f06, 0x03b9}}},
- { 0x1f87, {2, {0x1f07, 0x03b9}}},
- { 0x1f88, {2, {0x1f00, 0x03b9}}},
- { 0x1f89, {2, {0x1f01, 0x03b9}}},
- { 0x1f8a, {2, {0x1f02, 0x03b9}}},
- { 0x1f8b, {2, {0x1f03, 0x03b9}}},
- { 0x1f8c, {2, {0x1f04, 0x03b9}}},
- { 0x1f8d, {2, {0x1f05, 0x03b9}}},
- { 0x1f8e, {2, {0x1f06, 0x03b9}}},
- { 0x1f8f, {2, {0x1f07, 0x03b9}}},
- { 0x1f90, {2, {0x1f20, 0x03b9}}},
- { 0x1f91, {2, {0x1f21, 0x03b9}}},
- { 0x1f92, {2, {0x1f22, 0x03b9}}},
- { 0x1f93, {2, {0x1f23, 0x03b9}}},
- { 0x1f94, {2, {0x1f24, 0x03b9}}},
- { 0x1f95, {2, {0x1f25, 0x03b9}}},
- { 0x1f96, {2, {0x1f26, 0x03b9}}},
- { 0x1f97, {2, {0x1f27, 0x03b9}}},
- { 0x1f98, {2, {0x1f20, 0x03b9}}},
- { 0x1f99, {2, {0x1f21, 0x03b9}}},
- { 0x1f9a, {2, {0x1f22, 0x03b9}}},
- { 0x1f9b, {2, {0x1f23, 0x03b9}}},
- { 0x1f9c, {2, {0x1f24, 0x03b9}}},
- { 0x1f9d, {2, {0x1f25, 0x03b9}}},
- { 0x1f9e, {2, {0x1f26, 0x03b9}}},
- { 0x1f9f, {2, {0x1f27, 0x03b9}}},
- { 0x1fa0, {2, {0x1f60, 0x03b9}}},
- { 0x1fa1, {2, {0x1f61, 0x03b9}}},
- { 0x1fa2, {2, {0x1f62, 0x03b9}}},
- { 0x1fa3, {2, {0x1f63, 0x03b9}}},
- { 0x1fa4, {2, {0x1f64, 0x03b9}}},
- { 0x1fa5, {2, {0x1f65, 0x03b9}}},
- { 0x1fa6, {2, {0x1f66, 0x03b9}}},
- { 0x1fa7, {2, {0x1f67, 0x03b9}}},
- { 0x1fa8, {2, {0x1f60, 0x03b9}}},
- { 0x1fa9, {2, {0x1f61, 0x03b9}}},
- { 0x1faa, {2, {0x1f62, 0x03b9}}},
- { 0x1fab, {2, {0x1f63, 0x03b9}}},
- { 0x1fac, {2, {0x1f64, 0x03b9}}},
- { 0x1fad, {2, {0x1f65, 0x03b9}}},
- { 0x1fae, {2, {0x1f66, 0x03b9}}},
- { 0x1faf, {2, {0x1f67, 0x03b9}}},
- { 0x1fb2, {2, {0x1f70, 0x03b9}}},
- { 0x1fb3, {2, {0x03b1, 0x03b9}}},
- { 0x1fb4, {2, {0x03ac, 0x03b9}}},
- { 0x1fb6, {2, {0x03b1, 0x0342}}},
- { 0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
- { 0x1fb8, {1, {0x1fb0}}},
- { 0x1fb9, {1, {0x1fb1}}},
- { 0x1fba, {1, {0x1f70}}},
- { 0x1fbb, {1, {0x1f71}}},
- { 0x1fbc, {2, {0x03b1, 0x03b9}}},
- { 0x1fbe, {1, {0x03b9}}},
- { 0x1fc2, {2, {0x1f74, 0x03b9}}},
- { 0x1fc3, {2, {0x03b7, 0x03b9}}},
- { 0x1fc4, {2, {0x03ae, 0x03b9}}},
- { 0x1fc6, {2, {0x03b7, 0x0342}}},
- { 0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
- { 0x1fc8, {1, {0x1f72}}},
- { 0x1fc9, {1, {0x1f73}}},
- { 0x1fca, {1, {0x1f74}}},
- { 0x1fcb, {1, {0x1f75}}},
- { 0x1fcc, {2, {0x03b7, 0x03b9}}},
- { 0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
- { 0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x1fd6, {2, {0x03b9, 0x0342}}},
- { 0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
- { 0x1fd8, {1, {0x1fd0}}},
- { 0x1fd9, {1, {0x1fd1}}},
- { 0x1fda, {1, {0x1f76}}},
- { 0x1fdb, {1, {0x1f77}}},
- { 0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
- { 0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x1fe4, {2, {0x03c1, 0x0313}}},
- { 0x1fe6, {2, {0x03c5, 0x0342}}},
- { 0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
- { 0x1fe8, {1, {0x1fe0}}},
- { 0x1fe9, {1, {0x1fe1}}},
- { 0x1fea, {1, {0x1f7a}}},
- { 0x1feb, {1, {0x1f7b}}},
- { 0x1fec, {1, {0x1fe5}}},
- { 0x1ff2, {2, {0x1f7c, 0x03b9}}},
- { 0x1ff3, {2, {0x03c9, 0x03b9}}},
- { 0x1ff4, {2, {0x03ce, 0x03b9}}},
- { 0x1ff6, {2, {0x03c9, 0x0342}}},
- { 0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
- { 0x1ff8, {1, {0x1f78}}},
- { 0x1ff9, {1, {0x1f79}}},
- { 0x1ffa, {1, {0x1f7c}}},
- { 0x1ffb, {1, {0x1f7d}}},
- { 0x1ffc, {2, {0x03c9, 0x03b9}}},
- { 0x2126, {1, {0x03c9}}},
- { 0x212a, {1, {0x006b}}},
- { 0x212b, {1, {0x00e5}}},
- { 0x2160, {1, {0x2170}}},
- { 0x2161, {1, {0x2171}}},
- { 0x2162, {1, {0x2172}}},
- { 0x2163, {1, {0x2173}}},
- { 0x2164, {1, {0x2174}}},
- { 0x2165, {1, {0x2175}}},
- { 0x2166, {1, {0x2176}}},
- { 0x2167, {1, {0x2177}}},
- { 0x2168, {1, {0x2178}}},
- { 0x2169, {1, {0x2179}}},
- { 0x216a, {1, {0x217a}}},
- { 0x216b, {1, {0x217b}}},
- { 0x216c, {1, {0x217c}}},
- { 0x216d, {1, {0x217d}}},
- { 0x216e, {1, {0x217e}}},
- { 0x216f, {1, {0x217f}}},
- { 0x24b6, {1, {0x24d0}}},
- { 0x24b7, {1, {0x24d1}}},
- { 0x24b8, {1, {0x24d2}}},
- { 0x24b9, {1, {0x24d3}}},
- { 0x24ba, {1, {0x24d4}}},
- { 0x24bb, {1, {0x24d5}}},
- { 0x24bc, {1, {0x24d6}}},
- { 0x24bd, {1, {0x24d7}}},
- { 0x24be, {1, {0x24d8}}},
- { 0x24bf, {1, {0x24d9}}},
- { 0x24c0, {1, {0x24da}}},
- { 0x24c1, {1, {0x24db}}},
- { 0x24c2, {1, {0x24dc}}},
- { 0x24c3, {1, {0x24dd}}},
- { 0x24c4, {1, {0x24de}}},
- { 0x24c5, {1, {0x24df}}},
- { 0x24c6, {1, {0x24e0}}},
- { 0x24c7, {1, {0x24e1}}},
- { 0x24c8, {1, {0x24e2}}},
- { 0x24c9, {1, {0x24e3}}},
- { 0x24ca, {1, {0x24e4}}},
- { 0x24cb, {1, {0x24e5}}},
- { 0x24cc, {1, {0x24e6}}},
- { 0x24cd, {1, {0x24e7}}},
- { 0x24ce, {1, {0x24e8}}},
- { 0x24cf, {1, {0x24e9}}},
- { 0x2c00, {1, {0x2c30}}},
- { 0x2c01, {1, {0x2c31}}},
- { 0x2c02, {1, {0x2c32}}},
- { 0x2c03, {1, {0x2c33}}},
- { 0x2c04, {1, {0x2c34}}},
- { 0x2c05, {1, {0x2c35}}},
- { 0x2c06, {1, {0x2c36}}},
- { 0x2c07, {1, {0x2c37}}},
- { 0x2c08, {1, {0x2c38}}},
- { 0x2c09, {1, {0x2c39}}},
- { 0x2c0a, {1, {0x2c3a}}},
- { 0x2c0b, {1, {0x2c3b}}},
- { 0x2c0c, {1, {0x2c3c}}},
- { 0x2c0d, {1, {0x2c3d}}},
- { 0x2c0e, {1, {0x2c3e}}},
- { 0x2c0f, {1, {0x2c3f}}},
- { 0x2c10, {1, {0x2c40}}},
- { 0x2c11, {1, {0x2c41}}},
- { 0x2c12, {1, {0x2c42}}},
- { 0x2c13, {1, {0x2c43}}},
- { 0x2c14, {1, {0x2c44}}},
- { 0x2c15, {1, {0x2c45}}},
- { 0x2c16, {1, {0x2c46}}},
- { 0x2c17, {1, {0x2c47}}},
- { 0x2c18, {1, {0x2c48}}},
- { 0x2c19, {1, {0x2c49}}},
- { 0x2c1a, {1, {0x2c4a}}},
- { 0x2c1b, {1, {0x2c4b}}},
- { 0x2c1c, {1, {0x2c4c}}},
- { 0x2c1d, {1, {0x2c4d}}},
- { 0x2c1e, {1, {0x2c4e}}},
- { 0x2c1f, {1, {0x2c4f}}},
- { 0x2c20, {1, {0x2c50}}},
- { 0x2c21, {1, {0x2c51}}},
- { 0x2c22, {1, {0x2c52}}},
- { 0x2c23, {1, {0x2c53}}},
- { 0x2c24, {1, {0x2c54}}},
- { 0x2c25, {1, {0x2c55}}},
- { 0x2c26, {1, {0x2c56}}},
- { 0x2c27, {1, {0x2c57}}},
- { 0x2c28, {1, {0x2c58}}},
- { 0x2c29, {1, {0x2c59}}},
- { 0x2c2a, {1, {0x2c5a}}},
- { 0x2c2b, {1, {0x2c5b}}},
- { 0x2c2c, {1, {0x2c5c}}},
- { 0x2c2d, {1, {0x2c5d}}},
- { 0x2c2e, {1, {0x2c5e}}},
- { 0x2c80, {1, {0x2c81}}},
- { 0x2c82, {1, {0x2c83}}},
- { 0x2c84, {1, {0x2c85}}},
- { 0x2c86, {1, {0x2c87}}},
- { 0x2c88, {1, {0x2c89}}},
- { 0x2c8a, {1, {0x2c8b}}},
- { 0x2c8c, {1, {0x2c8d}}},
- { 0x2c8e, {1, {0x2c8f}}},
- { 0x2c90, {1, {0x2c91}}},
- { 0x2c92, {1, {0x2c93}}},
- { 0x2c94, {1, {0x2c95}}},
- { 0x2c96, {1, {0x2c97}}},
- { 0x2c98, {1, {0x2c99}}},
- { 0x2c9a, {1, {0x2c9b}}},
- { 0x2c9c, {1, {0x2c9d}}},
- { 0x2c9e, {1, {0x2c9f}}},
- { 0x2ca0, {1, {0x2ca1}}},
- { 0x2ca2, {1, {0x2ca3}}},
- { 0x2ca4, {1, {0x2ca5}}},
- { 0x2ca6, {1, {0x2ca7}}},
- { 0x2ca8, {1, {0x2ca9}}},
- { 0x2caa, {1, {0x2cab}}},
- { 0x2cac, {1, {0x2cad}}},
- { 0x2cae, {1, {0x2caf}}},
- { 0x2cb0, {1, {0x2cb1}}},
- { 0x2cb2, {1, {0x2cb3}}},
- { 0x2cb4, {1, {0x2cb5}}},
- { 0x2cb6, {1, {0x2cb7}}},
- { 0x2cb8, {1, {0x2cb9}}},
- { 0x2cba, {1, {0x2cbb}}},
- { 0x2cbc, {1, {0x2cbd}}},
- { 0x2cbe, {1, {0x2cbf}}},
- { 0x2cc0, {1, {0x2cc1}}},
- { 0x2cc2, {1, {0x2cc3}}},
- { 0x2cc4, {1, {0x2cc5}}},
- { 0x2cc6, {1, {0x2cc7}}},
- { 0x2cc8, {1, {0x2cc9}}},
- { 0x2cca, {1, {0x2ccb}}},
- { 0x2ccc, {1, {0x2ccd}}},
- { 0x2cce, {1, {0x2ccf}}},
- { 0x2cd0, {1, {0x2cd1}}},
- { 0x2cd2, {1, {0x2cd3}}},
- { 0x2cd4, {1, {0x2cd5}}},
- { 0x2cd6, {1, {0x2cd7}}},
- { 0x2cd8, {1, {0x2cd9}}},
- { 0x2cda, {1, {0x2cdb}}},
- { 0x2cdc, {1, {0x2cdd}}},
- { 0x2cde, {1, {0x2cdf}}},
- { 0x2ce0, {1, {0x2ce1}}},
- { 0x2ce2, {1, {0x2ce3}}},
- { 0xfb00, {2, {0x0066, 0x0066}}},
- { 0xfb01, {2, {0x0066, 0x0069}}},
- { 0xfb02, {2, {0x0066, 0x006c}}},
- { 0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
- { 0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
- { 0xfb05, {2, {0x0073, 0x0074}}},
- { 0xfb06, {2, {0x0073, 0x0074}}},
- { 0xfb13, {2, {0x0574, 0x0576}}},
- { 0xfb14, {2, {0x0574, 0x0565}}},
- { 0xfb15, {2, {0x0574, 0x056b}}},
- { 0xfb16, {2, {0x057e, 0x0576}}},
- { 0xfb17, {2, {0x0574, 0x056d}}},
- { 0xff21, {1, {0xff41}}},
- { 0xff22, {1, {0xff42}}},
- { 0xff23, {1, {0xff43}}},
- { 0xff24, {1, {0xff44}}},
- { 0xff25, {1, {0xff45}}},
- { 0xff26, {1, {0xff46}}},
- { 0xff27, {1, {0xff47}}},
- { 0xff28, {1, {0xff48}}},
- { 0xff29, {1, {0xff49}}},
- { 0xff2a, {1, {0xff4a}}},
- { 0xff2b, {1, {0xff4b}}},
- { 0xff2c, {1, {0xff4c}}},
- { 0xff2d, {1, {0xff4d}}},
- { 0xff2e, {1, {0xff4e}}},
- { 0xff2f, {1, {0xff4f}}},
- { 0xff30, {1, {0xff50}}},
- { 0xff31, {1, {0xff51}}},
- { 0xff32, {1, {0xff52}}},
- { 0xff33, {1, {0xff53}}},
- { 0xff34, {1, {0xff54}}},
- { 0xff35, {1, {0xff55}}},
- { 0xff36, {1, {0xff56}}},
- { 0xff37, {1, {0xff57}}},
- { 0xff38, {1, {0xff58}}},
- { 0xff39, {1, {0xff59}}},
- { 0xff3a, {1, {0xff5a}}},
- { 0x10400, {1, {0x10428}}},
- { 0x10401, {1, {0x10429}}},
- { 0x10402, {1, {0x1042a}}},
- { 0x10403, {1, {0x1042b}}},
- { 0x10404, {1, {0x1042c}}},
- { 0x10405, {1, {0x1042d}}},
- { 0x10406, {1, {0x1042e}}},
- { 0x10407, {1, {0x1042f}}},
- { 0x10408, {1, {0x10430}}},
- { 0x10409, {1, {0x10431}}},
- { 0x1040a, {1, {0x10432}}},
- { 0x1040b, {1, {0x10433}}},
- { 0x1040c, {1, {0x10434}}},
- { 0x1040d, {1, {0x10435}}},
- { 0x1040e, {1, {0x10436}}},
- { 0x1040f, {1, {0x10437}}},
- { 0x10410, {1, {0x10438}}},
- { 0x10411, {1, {0x10439}}},
- { 0x10412, {1, {0x1043a}}},
- { 0x10413, {1, {0x1043b}}},
- { 0x10414, {1, {0x1043c}}},
- { 0x10415, {1, {0x1043d}}},
- { 0x10416, {1, {0x1043e}}},
- { 0x10417, {1, {0x1043f}}},
- { 0x10418, {1, {0x10440}}},
- { 0x10419, {1, {0x10441}}},
- { 0x1041a, {1, {0x10442}}},
- { 0x1041b, {1, {0x10443}}},
- { 0x1041c, {1, {0x10444}}},
- { 0x1041d, {1, {0x10445}}},
- { 0x1041e, {1, {0x10446}}},
- { 0x1041f, {1, {0x10447}}},
- { 0x10420, {1, {0x10448}}},
- { 0x10421, {1, {0x10449}}},
- { 0x10422, {1, {0x1044a}}},
- { 0x10423, {1, {0x1044b}}},
- { 0x10424, {1, {0x1044c}}},
- { 0x10425, {1, {0x1044d}}},
- { 0x10426, {1, {0x1044e}}},
- { 0x10427, {1, {0x1044f}}}
-};
-
-static const CaseFold_11_Type CaseFold_Locale[] = {
- { 0x0049, {1, {0x0069}}},
- { 0x0130, {2, {0x0069, 0x0307}}}
-};
-
-static const CaseUnfold_11_Type CaseUnfold_11[] = {
- { 0x0061, {1, {0x0041 }}},
- { 0x0062, {1, {0x0042 }}},
- { 0x0063, {1, {0x0043 }}},
- { 0x0064, {1, {0x0044 }}},
- { 0x0065, {1, {0x0045 }}},
- { 0x0066, {1, {0x0046 }}},
- { 0x0067, {1, {0x0047 }}},
- { 0x0068, {1, {0x0048 }}},
- { 0x006a, {1, {0x004a }}},
- { 0x006b, {2, {0x212a, 0x004b }}},
- { 0x006c, {1, {0x004c }}},
- { 0x006d, {1, {0x004d }}},
- { 0x006e, {1, {0x004e }}},
- { 0x006f, {1, {0x004f }}},
- { 0x0070, {1, {0x0050 }}},
- { 0x0071, {1, {0x0051 }}},
- { 0x0072, {1, {0x0052 }}},
- { 0x0073, {2, {0x0053, 0x017f }}},
- { 0x0074, {1, {0x0054 }}},
- { 0x0075, {1, {0x0055 }}},
- { 0x0076, {1, {0x0056 }}},
- { 0x0077, {1, {0x0057 }}},
- { 0x0078, {1, {0x0058 }}},
- { 0x0079, {1, {0x0059 }}},
- { 0x007a, {1, {0x005a }}},
- { 0x00e0, {1, {0x00c0 }}},
- { 0x00e1, {1, {0x00c1 }}},
- { 0x00e2, {1, {0x00c2 }}},
- { 0x00e3, {1, {0x00c3 }}},
- { 0x00e4, {1, {0x00c4 }}},
- { 0x00e5, {2, {0x212b, 0x00c5 }}},
- { 0x00e6, {1, {0x00c6 }}},
- { 0x00e7, {1, {0x00c7 }}},
- { 0x00e8, {1, {0x00c8 }}},
- { 0x00e9, {1, {0x00c9 }}},
- { 0x00ea, {1, {0x00ca }}},
- { 0x00eb, {1, {0x00cb }}},
- { 0x00ec, {1, {0x00cc }}},
- { 0x00ed, {1, {0x00cd }}},
- { 0x00ee, {1, {0x00ce }}},
- { 0x00ef, {1, {0x00cf }}},
- { 0x00f0, {1, {0x00d0 }}},
- { 0x00f1, {1, {0x00d1 }}},
- { 0x00f2, {1, {0x00d2 }}},
- { 0x00f3, {1, {0x00d3 }}},
- { 0x00f4, {1, {0x00d4 }}},
- { 0x00f5, {1, {0x00d5 }}},
- { 0x00f6, {1, {0x00d6 }}},
- { 0x00f8, {1, {0x00d8 }}},
- { 0x00f9, {1, {0x00d9 }}},
- { 0x00fa, {1, {0x00da }}},
- { 0x00fb, {1, {0x00db }}},
- { 0x00fc, {1, {0x00dc }}},
- { 0x00fd, {1, {0x00dd }}},
- { 0x00fe, {1, {0x00de }}},
- { 0x00ff, {1, {0x0178 }}},
- { 0x0101, {1, {0x0100 }}},
- { 0x0103, {1, {0x0102 }}},
- { 0x0105, {1, {0x0104 }}},
- { 0x0107, {1, {0x0106 }}},
- { 0x0109, {1, {0x0108 }}},
- { 0x010b, {1, {0x010a }}},
- { 0x010d, {1, {0x010c }}},
- { 0x010f, {1, {0x010e }}},
- { 0x0111, {1, {0x0110 }}},
- { 0x0113, {1, {0x0112 }}},
- { 0x0115, {1, {0x0114 }}},
- { 0x0117, {1, {0x0116 }}},
- { 0x0119, {1, {0x0118 }}},
- { 0x011b, {1, {0x011a }}},
- { 0x011d, {1, {0x011c }}},
- { 0x011f, {1, {0x011e }}},
- { 0x0121, {1, {0x0120 }}},
- { 0x0123, {1, {0x0122 }}},
- { 0x0125, {1, {0x0124 }}},
- { 0x0127, {1, {0x0126 }}},
- { 0x0129, {1, {0x0128 }}},
- { 0x012b, {1, {0x012a }}},
- { 0x012d, {1, {0x012c }}},
- { 0x012f, {1, {0x012e }}},
- { 0x0133, {1, {0x0132 }}},
- { 0x0135, {1, {0x0134 }}},
- { 0x0137, {1, {0x0136 }}},
- { 0x013a, {1, {0x0139 }}},
- { 0x013c, {1, {0x013b }}},
- { 0x013e, {1, {0x013d }}},
- { 0x0140, {1, {0x013f }}},
- { 0x0142, {1, {0x0141 }}},
- { 0x0144, {1, {0x0143 }}},
- { 0x0146, {1, {0x0145 }}},
- { 0x0148, {1, {0x0147 }}},
- { 0x014b, {1, {0x014a }}},
- { 0x014d, {1, {0x014c }}},
- { 0x014f, {1, {0x014e }}},
- { 0x0151, {1, {0x0150 }}},
- { 0x0153, {1, {0x0152 }}},
- { 0x0155, {1, {0x0154 }}},
- { 0x0157, {1, {0x0156 }}},
- { 0x0159, {1, {0x0158 }}},
- { 0x015b, {1, {0x015a }}},
- { 0x015d, {1, {0x015c }}},
- { 0x015f, {1, {0x015e }}},
- { 0x0161, {1, {0x0160 }}},
- { 0x0163, {1, {0x0162 }}},
- { 0x0165, {1, {0x0164 }}},
- { 0x0167, {1, {0x0166 }}},
- { 0x0169, {1, {0x0168 }}},
- { 0x016b, {1, {0x016a }}},
- { 0x016d, {1, {0x016c }}},
- { 0x016f, {1, {0x016e }}},
- { 0x0171, {1, {0x0170 }}},
- { 0x0173, {1, {0x0172 }}},
- { 0x0175, {1, {0x0174 }}},
- { 0x0177, {1, {0x0176 }}},
- { 0x017a, {1, {0x0179 }}},
- { 0x017c, {1, {0x017b }}},
- { 0x017e, {1, {0x017d }}},
- { 0x0183, {1, {0x0182 }}},
- { 0x0185, {1, {0x0184 }}},
- { 0x0188, {1, {0x0187 }}},
- { 0x018c, {1, {0x018b }}},
- { 0x0192, {1, {0x0191 }}},
- { 0x0195, {1, {0x01f6 }}},
- { 0x0199, {1, {0x0198 }}},
- { 0x019a, {1, {0x023d }}},
- { 0x019e, {1, {0x0220 }}},
- { 0x01a1, {1, {0x01a0 }}},
- { 0x01a3, {1, {0x01a2 }}},
- { 0x01a5, {1, {0x01a4 }}},
- { 0x01a8, {1, {0x01a7 }}},
- { 0x01ad, {1, {0x01ac }}},
- { 0x01b0, {1, {0x01af }}},
- { 0x01b4, {1, {0x01b3 }}},
- { 0x01b6, {1, {0x01b5 }}},
- { 0x01b9, {1, {0x01b8 }}},
- { 0x01bd, {1, {0x01bc }}},
- { 0x01bf, {1, {0x01f7 }}},
- { 0x01c6, {2, {0x01c4, 0x01c5 }}},
- { 0x01c9, {2, {0x01c7, 0x01c8 }}},
- { 0x01cc, {2, {0x01ca, 0x01cb }}},
- { 0x01ce, {1, {0x01cd }}},
- { 0x01d0, {1, {0x01cf }}},
- { 0x01d2, {1, {0x01d1 }}},
- { 0x01d4, {1, {0x01d3 }}},
- { 0x01d6, {1, {0x01d5 }}},
- { 0x01d8, {1, {0x01d7 }}},
- { 0x01da, {1, {0x01d9 }}},
- { 0x01dc, {1, {0x01db }}},
- { 0x01dd, {1, {0x018e }}},
- { 0x01df, {1, {0x01de }}},
- { 0x01e1, {1, {0x01e0 }}},
- { 0x01e3, {1, {0x01e2 }}},
- { 0x01e5, {1, {0x01e4 }}},
- { 0x01e7, {1, {0x01e6 }}},
- { 0x01e9, {1, {0x01e8 }}},
- { 0x01eb, {1, {0x01ea }}},
- { 0x01ed, {1, {0x01ec }}},
- { 0x01ef, {1, {0x01ee }}},
- { 0x01f3, {2, {0x01f1, 0x01f2 }}},
- { 0x01f5, {1, {0x01f4 }}},
- { 0x01f9, {1, {0x01f8 }}},
- { 0x01fb, {1, {0x01fa }}},
- { 0x01fd, {1, {0x01fc }}},
- { 0x01ff, {1, {0x01fe }}},
- { 0x0201, {1, {0x0200 }}},
- { 0x0203, {1, {0x0202 }}},
- { 0x0205, {1, {0x0204 }}},
- { 0x0207, {1, {0x0206 }}},
- { 0x0209, {1, {0x0208 }}},
- { 0x020b, {1, {0x020a }}},
- { 0x020d, {1, {0x020c }}},
- { 0x020f, {1, {0x020e }}},
- { 0x0211, {1, {0x0210 }}},
- { 0x0213, {1, {0x0212 }}},
- { 0x0215, {1, {0x0214 }}},
- { 0x0217, {1, {0x0216 }}},
- { 0x0219, {1, {0x0218 }}},
- { 0x021b, {1, {0x021a }}},
- { 0x021d, {1, {0x021c }}},
- { 0x021f, {1, {0x021e }}},
- { 0x0223, {1, {0x0222 }}},
- { 0x0225, {1, {0x0224 }}},
- { 0x0227, {1, {0x0226 }}},
- { 0x0229, {1, {0x0228 }}},
- { 0x022b, {1, {0x022a }}},
- { 0x022d, {1, {0x022c }}},
- { 0x022f, {1, {0x022e }}},
- { 0x0231, {1, {0x0230 }}},
- { 0x0233, {1, {0x0232 }}},
- { 0x023c, {1, {0x023b }}},
- { 0x0253, {1, {0x0181 }}},
- { 0x0254, {1, {0x0186 }}},
- { 0x0256, {1, {0x0189 }}},
- { 0x0257, {1, {0x018a }}},
- { 0x0259, {1, {0x018f }}},
- { 0x025b, {1, {0x0190 }}},
- { 0x0260, {1, {0x0193 }}},
- { 0x0263, {1, {0x0194 }}},
- { 0x0268, {1, {0x0197 }}},
- { 0x0269, {1, {0x0196 }}},
- { 0x026f, {1, {0x019c }}},
- { 0x0272, {1, {0x019d }}},
- { 0x0275, {1, {0x019f }}},
- { 0x0280, {1, {0x01a6 }}},
- { 0x0283, {1, {0x01a9 }}},
- { 0x0288, {1, {0x01ae }}},
- { 0x028a, {1, {0x01b1 }}},
- { 0x028b, {1, {0x01b2 }}},
- { 0x0292, {1, {0x01b7 }}},
- { 0x0294, {1, {0x0241 }}},
- { 0x03ac, {1, {0x0386 }}},
- { 0x03ad, {1, {0x0388 }}},
- { 0x03ae, {1, {0x0389 }}},
- { 0x03af, {1, {0x038a }}},
- { 0x03b1, {1, {0x0391 }}},
- { 0x03b2, {2, {0x0392, 0x03d0 }}},
- { 0x03b3, {1, {0x0393 }}},
- { 0x03b4, {1, {0x0394 }}},
- { 0x03b5, {2, {0x03f5, 0x0395 }}},
- { 0x03b6, {1, {0x0396 }}},
- { 0x03b7, {1, {0x0397 }}},
- { 0x03b8, {3, {0x03f4, 0x0398, 0x03d1 }}},
- { 0x03b9, {3, {0x1fbe, 0x0399, 0x0345 }}},
- { 0x03ba, {2, {0x03f0, 0x039a }}},
- { 0x03bb, {1, {0x039b }}},
- { 0x03bc, {2, {0x00b5, 0x039c }}},
- { 0x03bd, {1, {0x039d }}},
- { 0x03be, {1, {0x039e }}},
- { 0x03bf, {1, {0x039f }}},
- { 0x03c0, {2, {0x03a0, 0x03d6 }}},
- { 0x03c1, {2, {0x03f1, 0x03a1 }}},
- { 0x03c3, {2, {0x03a3, 0x03c2 }}},
- { 0x03c4, {1, {0x03a4 }}},
- { 0x03c5, {1, {0x03a5 }}},
- { 0x03c6, {2, {0x03a6, 0x03d5 }}},
- { 0x03c7, {1, {0x03a7 }}},
- { 0x03c8, {1, {0x03a8 }}},
- { 0x03c9, {2, {0x03a9, 0x2126 }}},
- { 0x03ca, {1, {0x03aa }}},
- { 0x03cb, {1, {0x03ab }}},
- { 0x03cc, {1, {0x038c }}},
- { 0x03cd, {1, {0x038e }}},
- { 0x03ce, {1, {0x038f }}},
- { 0x03d9, {1, {0x03d8 }}},
- { 0x03db, {1, {0x03da }}},
- { 0x03dd, {1, {0x03dc }}},
- { 0x03df, {1, {0x03de }}},
- { 0x03e1, {1, {0x03e0 }}},
- { 0x03e3, {1, {0x03e2 }}},
- { 0x03e5, {1, {0x03e4 }}},
- { 0x03e7, {1, {0x03e6 }}},
- { 0x03e9, {1, {0x03e8 }}},
- { 0x03eb, {1, {0x03ea }}},
- { 0x03ed, {1, {0x03ec }}},
- { 0x03ef, {1, {0x03ee }}},
- { 0x03f2, {1, {0x03f9 }}},
- { 0x03f8, {1, {0x03f7 }}},
- { 0x03fb, {1, {0x03fa }}},
- { 0x0430, {1, {0x0410 }}},
- { 0x0431, {1, {0x0411 }}},
- { 0x0432, {1, {0x0412 }}},
- { 0x0433, {1, {0x0413 }}},
- { 0x0434, {1, {0x0414 }}},
- { 0x0435, {1, {0x0415 }}},
- { 0x0436, {1, {0x0416 }}},
- { 0x0437, {1, {0x0417 }}},
- { 0x0438, {1, {0x0418 }}},
- { 0x0439, {1, {0x0419 }}},
- { 0x043a, {1, {0x041a }}},
- { 0x043b, {1, {0x041b }}},
- { 0x043c, {1, {0x041c }}},
- { 0x043d, {1, {0x041d }}},
- { 0x043e, {1, {0x041e }}},
- { 0x043f, {1, {0x041f }}},
- { 0x0440, {1, {0x0420 }}},
- { 0x0441, {1, {0x0421 }}},
- { 0x0442, {1, {0x0422 }}},
- { 0x0443, {1, {0x0423 }}},
- { 0x0444, {1, {0x0424 }}},
- { 0x0445, {1, {0x0425 }}},
- { 0x0446, {1, {0x0426 }}},
- { 0x0447, {1, {0x0427 }}},
- { 0x0448, {1, {0x0428 }}},
- { 0x0449, {1, {0x0429 }}},
- { 0x044a, {1, {0x042a }}},
- { 0x044b, {1, {0x042b }}},
- { 0x044c, {1, {0x042c }}},
- { 0x044d, {1, {0x042d }}},
- { 0x044e, {1, {0x042e }}},
- { 0x044f, {1, {0x042f }}},
- { 0x0450, {1, {0x0400 }}},
- { 0x0451, {1, {0x0401 }}},
- { 0x0452, {1, {0x0402 }}},
- { 0x0453, {1, {0x0403 }}},
- { 0x0454, {1, {0x0404 }}},
- { 0x0455, {1, {0x0405 }}},
- { 0x0456, {1, {0x0406 }}},
- { 0x0457, {1, {0x0407 }}},
- { 0x0458, {1, {0x0408 }}},
- { 0x0459, {1, {0x0409 }}},
- { 0x045a, {1, {0x040a }}},
- { 0x045b, {1, {0x040b }}},
- { 0x045c, {1, {0x040c }}},
- { 0x045d, {1, {0x040d }}},
- { 0x045e, {1, {0x040e }}},
- { 0x045f, {1, {0x040f }}},
- { 0x0461, {1, {0x0460 }}},
- { 0x0463, {1, {0x0462 }}},
- { 0x0465, {1, {0x0464 }}},
- { 0x0467, {1, {0x0466 }}},
- { 0x0469, {1, {0x0468 }}},
- { 0x046b, {1, {0x046a }}},
- { 0x046d, {1, {0x046c }}},
- { 0x046f, {1, {0x046e }}},
- { 0x0471, {1, {0x0470 }}},
- { 0x0473, {1, {0x0472 }}},
- { 0x0475, {1, {0x0474 }}},
- { 0x0477, {1, {0x0476 }}},
- { 0x0479, {1, {0x0478 }}},
- { 0x047b, {1, {0x047a }}},
- { 0x047d, {1, {0x047c }}},
- { 0x047f, {1, {0x047e }}},
- { 0x0481, {1, {0x0480 }}},
- { 0x048b, {1, {0x048a }}},
- { 0x048d, {1, {0x048c }}},
- { 0x048f, {1, {0x048e }}},
- { 0x0491, {1, {0x0490 }}},
- { 0x0493, {1, {0x0492 }}},
- { 0x0495, {1, {0x0494 }}},
- { 0x0497, {1, {0x0496 }}},
- { 0x0499, {1, {0x0498 }}},
- { 0x049b, {1, {0x049a }}},
- { 0x049d, {1, {0x049c }}},
- { 0x049f, {1, {0x049e }}},
- { 0x04a1, {1, {0x04a0 }}},
- { 0x04a3, {1, {0x04a2 }}},
- { 0x04a5, {1, {0x04a4 }}},
- { 0x04a7, {1, {0x04a6 }}},
- { 0x04a9, {1, {0x04a8 }}},
- { 0x04ab, {1, {0x04aa }}},
- { 0x04ad, {1, {0x04ac }}},
- { 0x04af, {1, {0x04ae }}},
- { 0x04b1, {1, {0x04b0 }}},
- { 0x04b3, {1, {0x04b2 }}},
- { 0x04b5, {1, {0x04b4 }}},
- { 0x04b7, {1, {0x04b6 }}},
- { 0x04b9, {1, {0x04b8 }}},
- { 0x04bb, {1, {0x04ba }}},
- { 0x04bd, {1, {0x04bc }}},
- { 0x04bf, {1, {0x04be }}},
- { 0x04c2, {1, {0x04c1 }}},
- { 0x04c4, {1, {0x04c3 }}},
- { 0x04c6, {1, {0x04c5 }}},
- { 0x04c8, {1, {0x04c7 }}},
- { 0x04ca, {1, {0x04c9 }}},
- { 0x04cc, {1, {0x04cb }}},
- { 0x04ce, {1, {0x04cd }}},
- { 0x04d1, {1, {0x04d0 }}},
- { 0x04d3, {1, {0x04d2 }}},
- { 0x04d5, {1, {0x04d4 }}},
- { 0x04d7, {1, {0x04d6 }}},
- { 0x04d9, {1, {0x04d8 }}},
- { 0x04db, {1, {0x04da }}},
- { 0x04dd, {1, {0x04dc }}},
- { 0x04df, {1, {0x04de }}},
- { 0x04e1, {1, {0x04e0 }}},
- { 0x04e3, {1, {0x04e2 }}},
- { 0x04e5, {1, {0x04e4 }}},
- { 0x04e7, {1, {0x04e6 }}},
- { 0x04e9, {1, {0x04e8 }}},
- { 0x04eb, {1, {0x04ea }}},
- { 0x04ed, {1, {0x04ec }}},
- { 0x04ef, {1, {0x04ee }}},
- { 0x04f1, {1, {0x04f0 }}},
- { 0x04f3, {1, {0x04f2 }}},
- { 0x04f5, {1, {0x04f4 }}},
- { 0x04f7, {1, {0x04f6 }}},
- { 0x04f9, {1, {0x04f8 }}},
- { 0x0501, {1, {0x0500 }}},
- { 0x0503, {1, {0x0502 }}},
- { 0x0505, {1, {0x0504 }}},
- { 0x0507, {1, {0x0506 }}},
- { 0x0509, {1, {0x0508 }}},
- { 0x050b, {1, {0x050a }}},
- { 0x050d, {1, {0x050c }}},
- { 0x050f, {1, {0x050e }}},
- { 0x0561, {1, {0x0531 }}},
- { 0x0562, {1, {0x0532 }}},
- { 0x0563, {1, {0x0533 }}},
- { 0x0564, {1, {0x0534 }}},
- { 0x0565, {1, {0x0535 }}},
- { 0x0566, {1, {0x0536 }}},
- { 0x0567, {1, {0x0537 }}},
- { 0x0568, {1, {0x0538 }}},
- { 0x0569, {1, {0x0539 }}},
- { 0x056a, {1, {0x053a }}},
- { 0x056b, {1, {0x053b }}},
- { 0x056c, {1, {0x053c }}},
- { 0x056d, {1, {0x053d }}},
- { 0x056e, {1, {0x053e }}},
- { 0x056f, {1, {0x053f }}},
- { 0x0570, {1, {0x0540 }}},
- { 0x0571, {1, {0x0541 }}},
- { 0x0572, {1, {0x0542 }}},
- { 0x0573, {1, {0x0543 }}},
- { 0x0574, {1, {0x0544 }}},
- { 0x0575, {1, {0x0545 }}},
- { 0x0576, {1, {0x0546 }}},
- { 0x0577, {1, {0x0547 }}},
- { 0x0578, {1, {0x0548 }}},
- { 0x0579, {1, {0x0549 }}},
- { 0x057a, {1, {0x054a }}},
- { 0x057b, {1, {0x054b }}},
- { 0x057c, {1, {0x054c }}},
- { 0x057d, {1, {0x054d }}},
- { 0x057e, {1, {0x054e }}},
- { 0x057f, {1, {0x054f }}},
- { 0x0580, {1, {0x0550 }}},
- { 0x0581, {1, {0x0551 }}},
- { 0x0582, {1, {0x0552 }}},
- { 0x0583, {1, {0x0553 }}},
- { 0x0584, {1, {0x0554 }}},
- { 0x0585, {1, {0x0555 }}},
- { 0x0586, {1, {0x0556 }}},
- { 0x1e01, {1, {0x1e00 }}},
- { 0x1e03, {1, {0x1e02 }}},
- { 0x1e05, {1, {0x1e04 }}},
- { 0x1e07, {1, {0x1e06 }}},
- { 0x1e09, {1, {0x1e08 }}},
- { 0x1e0b, {1, {0x1e0a }}},
- { 0x1e0d, {1, {0x1e0c }}},
- { 0x1e0f, {1, {0x1e0e }}},
- { 0x1e11, {1, {0x1e10 }}},
- { 0x1e13, {1, {0x1e12 }}},
- { 0x1e15, {1, {0x1e14 }}},
- { 0x1e17, {1, {0x1e16 }}},
- { 0x1e19, {1, {0x1e18 }}},
- { 0x1e1b, {1, {0x1e1a }}},
- { 0x1e1d, {1, {0x1e1c }}},
- { 0x1e1f, {1, {0x1e1e }}},
- { 0x1e21, {1, {0x1e20 }}},
- { 0x1e23, {1, {0x1e22 }}},
- { 0x1e25, {1, {0x1e24 }}},
- { 0x1e27, {1, {0x1e26 }}},
- { 0x1e29, {1, {0x1e28 }}},
- { 0x1e2b, {1, {0x1e2a }}},
- { 0x1e2d, {1, {0x1e2c }}},
- { 0x1e2f, {1, {0x1e2e }}},
- { 0x1e31, {1, {0x1e30 }}},
- { 0x1e33, {1, {0x1e32 }}},
- { 0x1e35, {1, {0x1e34 }}},
- { 0x1e37, {1, {0x1e36 }}},
- { 0x1e39, {1, {0x1e38 }}},
- { 0x1e3b, {1, {0x1e3a }}},
- { 0x1e3d, {1, {0x1e3c }}},
- { 0x1e3f, {1, {0x1e3e }}},
- { 0x1e41, {1, {0x1e40 }}},
- { 0x1e43, {1, {0x1e42 }}},
- { 0x1e45, {1, {0x1e44 }}},
- { 0x1e47, {1, {0x1e46 }}},
- { 0x1e49, {1, {0x1e48 }}},
- { 0x1e4b, {1, {0x1e4a }}},
- { 0x1e4d, {1, {0x1e4c }}},
- { 0x1e4f, {1, {0x1e4e }}},
- { 0x1e51, {1, {0x1e50 }}},
- { 0x1e53, {1, {0x1e52 }}},
- { 0x1e55, {1, {0x1e54 }}},
- { 0x1e57, {1, {0x1e56 }}},
- { 0x1e59, {1, {0x1e58 }}},
- { 0x1e5b, {1, {0x1e5a }}},
- { 0x1e5d, {1, {0x1e5c }}},
- { 0x1e5f, {1, {0x1e5e }}},
- { 0x1e61, {2, {0x1e9b, 0x1e60 }}},
- { 0x1e63, {1, {0x1e62 }}},
- { 0x1e65, {1, {0x1e64 }}},
- { 0x1e67, {1, {0x1e66 }}},
- { 0x1e69, {1, {0x1e68 }}},
- { 0x1e6b, {1, {0x1e6a }}},
- { 0x1e6d, {1, {0x1e6c }}},
- { 0x1e6f, {1, {0x1e6e }}},
- { 0x1e71, {1, {0x1e70 }}},
- { 0x1e73, {1, {0x1e72 }}},
- { 0x1e75, {1, {0x1e74 }}},
- { 0x1e77, {1, {0x1e76 }}},
- { 0x1e79, {1, {0x1e78 }}},
- { 0x1e7b, {1, {0x1e7a }}},
- { 0x1e7d, {1, {0x1e7c }}},
- { 0x1e7f, {1, {0x1e7e }}},
- { 0x1e81, {1, {0x1e80 }}},
- { 0x1e83, {1, {0x1e82 }}},
- { 0x1e85, {1, {0x1e84 }}},
- { 0x1e87, {1, {0x1e86 }}},
- { 0x1e89, {1, {0x1e88 }}},
- { 0x1e8b, {1, {0x1e8a }}},
- { 0x1e8d, {1, {0x1e8c }}},
- { 0x1e8f, {1, {0x1e8e }}},
- { 0x1e91, {1, {0x1e90 }}},
- { 0x1e93, {1, {0x1e92 }}},
- { 0x1e95, {1, {0x1e94 }}},
- { 0x1ea1, {1, {0x1ea0 }}},
- { 0x1ea3, {1, {0x1ea2 }}},
- { 0x1ea5, {1, {0x1ea4 }}},
- { 0x1ea7, {1, {0x1ea6 }}},
- { 0x1ea9, {1, {0x1ea8 }}},
- { 0x1eab, {1, {0x1eaa }}},
- { 0x1ead, {1, {0x1eac }}},
- { 0x1eaf, {1, {0x1eae }}},
- { 0x1eb1, {1, {0x1eb0 }}},
- { 0x1eb3, {1, {0x1eb2 }}},
- { 0x1eb5, {1, {0x1eb4 }}},
- { 0x1eb7, {1, {0x1eb6 }}},
- { 0x1eb9, {1, {0x1eb8 }}},
- { 0x1ebb, {1, {0x1eba }}},
- { 0x1ebd, {1, {0x1ebc }}},
- { 0x1ebf, {1, {0x1ebe }}},
- { 0x1ec1, {1, {0x1ec0 }}},
- { 0x1ec3, {1, {0x1ec2 }}},
- { 0x1ec5, {1, {0x1ec4 }}},
- { 0x1ec7, {1, {0x1ec6 }}},
- { 0x1ec9, {1, {0x1ec8 }}},
- { 0x1ecb, {1, {0x1eca }}},
- { 0x1ecd, {1, {0x1ecc }}},
- { 0x1ecf, {1, {0x1ece }}},
- { 0x1ed1, {1, {0x1ed0 }}},
- { 0x1ed3, {1, {0x1ed2 }}},
- { 0x1ed5, {1, {0x1ed4 }}},
- { 0x1ed7, {1, {0x1ed6 }}},
- { 0x1ed9, {1, {0x1ed8 }}},
- { 0x1edb, {1, {0x1eda }}},
- { 0x1edd, {1, {0x1edc }}},
- { 0x1edf, {1, {0x1ede }}},
- { 0x1ee1, {1, {0x1ee0 }}},
- { 0x1ee3, {1, {0x1ee2 }}},
- { 0x1ee5, {1, {0x1ee4 }}},
- { 0x1ee7, {1, {0x1ee6 }}},
- { 0x1ee9, {1, {0x1ee8 }}},
- { 0x1eeb, {1, {0x1eea }}},
- { 0x1eed, {1, {0x1eec }}},
- { 0x1eef, {1, {0x1eee }}},
- { 0x1ef1, {1, {0x1ef0 }}},
- { 0x1ef3, {1, {0x1ef2 }}},
- { 0x1ef5, {1, {0x1ef4 }}},
- { 0x1ef7, {1, {0x1ef6 }}},
- { 0x1ef9, {1, {0x1ef8 }}},
- { 0x1f00, {1, {0x1f08 }}},
- { 0x1f01, {1, {0x1f09 }}},
- { 0x1f02, {1, {0x1f0a }}},
- { 0x1f03, {1, {0x1f0b }}},
- { 0x1f04, {1, {0x1f0c }}},
- { 0x1f05, {1, {0x1f0d }}},
- { 0x1f06, {1, {0x1f0e }}},
- { 0x1f07, {1, {0x1f0f }}},
- { 0x1f10, {1, {0x1f18 }}},
- { 0x1f11, {1, {0x1f19 }}},
- { 0x1f12, {1, {0x1f1a }}},
- { 0x1f13, {1, {0x1f1b }}},
- { 0x1f14, {1, {0x1f1c }}},
- { 0x1f15, {1, {0x1f1d }}},
- { 0x1f20, {1, {0x1f28 }}},
- { 0x1f21, {1, {0x1f29 }}},
- { 0x1f22, {1, {0x1f2a }}},
- { 0x1f23, {1, {0x1f2b }}},
- { 0x1f24, {1, {0x1f2c }}},
- { 0x1f25, {1, {0x1f2d }}},
- { 0x1f26, {1, {0x1f2e }}},
- { 0x1f27, {1, {0x1f2f }}},
- { 0x1f30, {1, {0x1f38 }}},
- { 0x1f31, {1, {0x1f39 }}},
- { 0x1f32, {1, {0x1f3a }}},
- { 0x1f33, {1, {0x1f3b }}},
- { 0x1f34, {1, {0x1f3c }}},
- { 0x1f35, {1, {0x1f3d }}},
- { 0x1f36, {1, {0x1f3e }}},
- { 0x1f37, {1, {0x1f3f }}},
- { 0x1f40, {1, {0x1f48 }}},
- { 0x1f41, {1, {0x1f49 }}},
- { 0x1f42, {1, {0x1f4a }}},
- { 0x1f43, {1, {0x1f4b }}},
- { 0x1f44, {1, {0x1f4c }}},
- { 0x1f45, {1, {0x1f4d }}},
- { 0x1f51, {1, {0x1f59 }}},
- { 0x1f53, {1, {0x1f5b }}},
- { 0x1f55, {1, {0x1f5d }}},
- { 0x1f57, {1, {0x1f5f }}},
- { 0x1f60, {1, {0x1f68 }}},
- { 0x1f61, {1, {0x1f69 }}},
- { 0x1f62, {1, {0x1f6a }}},
- { 0x1f63, {1, {0x1f6b }}},
- { 0x1f64, {1, {0x1f6c }}},
- { 0x1f65, {1, {0x1f6d }}},
- { 0x1f66, {1, {0x1f6e }}},
- { 0x1f67, {1, {0x1f6f }}},
- { 0x1f70, {1, {0x1fba }}},
- { 0x1f71, {1, {0x1fbb }}},
- { 0x1f72, {1, {0x1fc8 }}},
- { 0x1f73, {1, {0x1fc9 }}},
- { 0x1f74, {1, {0x1fca }}},
- { 0x1f75, {1, {0x1fcb }}},
- { 0x1f76, {1, {0x1fda }}},
- { 0x1f77, {1, {0x1fdb }}},
- { 0x1f78, {1, {0x1ff8 }}},
- { 0x1f79, {1, {0x1ff9 }}},
- { 0x1f7a, {1, {0x1fea }}},
- { 0x1f7b, {1, {0x1feb }}},
- { 0x1f7c, {1, {0x1ffa }}},
- { 0x1f7d, {1, {0x1ffb }}},
- { 0x1fb0, {1, {0x1fb8 }}},
- { 0x1fb1, {1, {0x1fb9 }}},
- { 0x1fd0, {1, {0x1fd8 }}},
- { 0x1fd1, {1, {0x1fd9 }}},
- { 0x1fe0, {1, {0x1fe8 }}},
- { 0x1fe1, {1, {0x1fe9 }}},
- { 0x1fe5, {1, {0x1fec }}},
- { 0x2170, {1, {0x2160 }}},
- { 0x2171, {1, {0x2161 }}},
- { 0x2172, {1, {0x2162 }}},
- { 0x2173, {1, {0x2163 }}},
- { 0x2174, {1, {0x2164 }}},
- { 0x2175, {1, {0x2165 }}},
- { 0x2176, {1, {0x2166 }}},
- { 0x2177, {1, {0x2167 }}},
- { 0x2178, {1, {0x2168 }}},
- { 0x2179, {1, {0x2169 }}},
- { 0x217a, {1, {0x216a }}},
- { 0x217b, {1, {0x216b }}},
- { 0x217c, {1, {0x216c }}},
- { 0x217d, {1, {0x216d }}},
- { 0x217e, {1, {0x216e }}},
- { 0x217f, {1, {0x216f }}},
- { 0x24d0, {1, {0x24b6 }}},
- { 0x24d1, {1, {0x24b7 }}},
- { 0x24d2, {1, {0x24b8 }}},
- { 0x24d3, {1, {0x24b9 }}},
- { 0x24d4, {1, {0x24ba }}},
- { 0x24d5, {1, {0x24bb }}},
- { 0x24d6, {1, {0x24bc }}},
- { 0x24d7, {1, {0x24bd }}},
- { 0x24d8, {1, {0x24be }}},
- { 0x24d9, {1, {0x24bf }}},
- { 0x24da, {1, {0x24c0 }}},
- { 0x24db, {1, {0x24c1 }}},
- { 0x24dc, {1, {0x24c2 }}},
- { 0x24dd, {1, {0x24c3 }}},
- { 0x24de, {1, {0x24c4 }}},
- { 0x24df, {1, {0x24c5 }}},
- { 0x24e0, {1, {0x24c6 }}},
- { 0x24e1, {1, {0x24c7 }}},
- { 0x24e2, {1, {0x24c8 }}},
- { 0x24e3, {1, {0x24c9 }}},
- { 0x24e4, {1, {0x24ca }}},
- { 0x24e5, {1, {0x24cb }}},
- { 0x24e6, {1, {0x24cc }}},
- { 0x24e7, {1, {0x24cd }}},
- { 0x24e8, {1, {0x24ce }}},
- { 0x24e9, {1, {0x24cf }}},
- { 0x2c30, {1, {0x2c00 }}},
- { 0x2c31, {1, {0x2c01 }}},
- { 0x2c32, {1, {0x2c02 }}},
- { 0x2c33, {1, {0x2c03 }}},
- { 0x2c34, {1, {0x2c04 }}},
- { 0x2c35, {1, {0x2c05 }}},
- { 0x2c36, {1, {0x2c06 }}},
- { 0x2c37, {1, {0x2c07 }}},
- { 0x2c38, {1, {0x2c08 }}},
- { 0x2c39, {1, {0x2c09 }}},
- { 0x2c3a, {1, {0x2c0a }}},
- { 0x2c3b, {1, {0x2c0b }}},
- { 0x2c3c, {1, {0x2c0c }}},
- { 0x2c3d, {1, {0x2c0d }}},
- { 0x2c3e, {1, {0x2c0e }}},
- { 0x2c3f, {1, {0x2c0f }}},
- { 0x2c40, {1, {0x2c10 }}},
- { 0x2c41, {1, {0x2c11 }}},
- { 0x2c42, {1, {0x2c12 }}},
- { 0x2c43, {1, {0x2c13 }}},
- { 0x2c44, {1, {0x2c14 }}},
- { 0x2c45, {1, {0x2c15 }}},
- { 0x2c46, {1, {0x2c16 }}},
- { 0x2c47, {1, {0x2c17 }}},
- { 0x2c48, {1, {0x2c18 }}},
- { 0x2c49, {1, {0x2c19 }}},
- { 0x2c4a, {1, {0x2c1a }}},
- { 0x2c4b, {1, {0x2c1b }}},
- { 0x2c4c, {1, {0x2c1c }}},
- { 0x2c4d, {1, {0x2c1d }}},
- { 0x2c4e, {1, {0x2c1e }}},
- { 0x2c4f, {1, {0x2c1f }}},
- { 0x2c50, {1, {0x2c20 }}},
- { 0x2c51, {1, {0x2c21 }}},
- { 0x2c52, {1, {0x2c22 }}},
- { 0x2c53, {1, {0x2c23 }}},
- { 0x2c54, {1, {0x2c24 }}},
- { 0x2c55, {1, {0x2c25 }}},
- { 0x2c56, {1, {0x2c26 }}},
- { 0x2c57, {1, {0x2c27 }}},
- { 0x2c58, {1, {0x2c28 }}},
- { 0x2c59, {1, {0x2c29 }}},
- { 0x2c5a, {1, {0x2c2a }}},
- { 0x2c5b, {1, {0x2c2b }}},
- { 0x2c5c, {1, {0x2c2c }}},
- { 0x2c5d, {1, {0x2c2d }}},
- { 0x2c5e, {1, {0x2c2e }}},
- { 0x2c81, {1, {0x2c80 }}},
- { 0x2c83, {1, {0x2c82 }}},
- { 0x2c85, {1, {0x2c84 }}},
- { 0x2c87, {1, {0x2c86 }}},
- { 0x2c89, {1, {0x2c88 }}},
- { 0x2c8b, {1, {0x2c8a }}},
- { 0x2c8d, {1, {0x2c8c }}},
- { 0x2c8f, {1, {0x2c8e }}},
- { 0x2c91, {1, {0x2c90 }}},
- { 0x2c93, {1, {0x2c92 }}},
- { 0x2c95, {1, {0x2c94 }}},
- { 0x2c97, {1, {0x2c96 }}},
- { 0x2c99, {1, {0x2c98 }}},
- { 0x2c9b, {1, {0x2c9a }}},
- { 0x2c9d, {1, {0x2c9c }}},
- { 0x2c9f, {1, {0x2c9e }}},
- { 0x2ca1, {1, {0x2ca0 }}},
- { 0x2ca3, {1, {0x2ca2 }}},
- { 0x2ca5, {1, {0x2ca4 }}},
- { 0x2ca7, {1, {0x2ca6 }}},
- { 0x2ca9, {1, {0x2ca8 }}},
- { 0x2cab, {1, {0x2caa }}},
- { 0x2cad, {1, {0x2cac }}},
- { 0x2caf, {1, {0x2cae }}},
- { 0x2cb1, {1, {0x2cb0 }}},
- { 0x2cb3, {1, {0x2cb2 }}},
- { 0x2cb5, {1, {0x2cb4 }}},
- { 0x2cb7, {1, {0x2cb6 }}},
- { 0x2cb9, {1, {0x2cb8 }}},
- { 0x2cbb, {1, {0x2cba }}},
- { 0x2cbd, {1, {0x2cbc }}},
- { 0x2cbf, {1, {0x2cbe }}},
- { 0x2cc1, {1, {0x2cc0 }}},
- { 0x2cc3, {1, {0x2cc2 }}},
- { 0x2cc5, {1, {0x2cc4 }}},
- { 0x2cc7, {1, {0x2cc6 }}},
- { 0x2cc9, {1, {0x2cc8 }}},
- { 0x2ccb, {1, {0x2cca }}},
- { 0x2ccd, {1, {0x2ccc }}},
- { 0x2ccf, {1, {0x2cce }}},
- { 0x2cd1, {1, {0x2cd0 }}},
- { 0x2cd3, {1, {0x2cd2 }}},
- { 0x2cd5, {1, {0x2cd4 }}},
- { 0x2cd7, {1, {0x2cd6 }}},
- { 0x2cd9, {1, {0x2cd8 }}},
- { 0x2cdb, {1, {0x2cda }}},
- { 0x2cdd, {1, {0x2cdc }}},
- { 0x2cdf, {1, {0x2cde }}},
- { 0x2ce1, {1, {0x2ce0 }}},
- { 0x2ce3, {1, {0x2ce2 }}},
- { 0x2d00, {1, {0x10a0 }}},
- { 0x2d01, {1, {0x10a1 }}},
- { 0x2d02, {1, {0x10a2 }}},
- { 0x2d03, {1, {0x10a3 }}},
- { 0x2d04, {1, {0x10a4 }}},
- { 0x2d05, {1, {0x10a5 }}},
- { 0x2d06, {1, {0x10a6 }}},
- { 0x2d07, {1, {0x10a7 }}},
- { 0x2d08, {1, {0x10a8 }}},
- { 0x2d09, {1, {0x10a9 }}},
- { 0x2d0a, {1, {0x10aa }}},
- { 0x2d0b, {1, {0x10ab }}},
- { 0x2d0c, {1, {0x10ac }}},
- { 0x2d0d, {1, {0x10ad }}},
- { 0x2d0e, {1, {0x10ae }}},
- { 0x2d0f, {1, {0x10af }}},
- { 0x2d10, {1, {0x10b0 }}},
- { 0x2d11, {1, {0x10b1 }}},
- { 0x2d12, {1, {0x10b2 }}},
- { 0x2d13, {1, {0x10b3 }}},
- { 0x2d14, {1, {0x10b4 }}},
- { 0x2d15, {1, {0x10b5 }}},
- { 0x2d16, {1, {0x10b6 }}},
- { 0x2d17, {1, {0x10b7 }}},
- { 0x2d18, {1, {0x10b8 }}},
- { 0x2d19, {1, {0x10b9 }}},
- { 0x2d1a, {1, {0x10ba }}},
- { 0x2d1b, {1, {0x10bb }}},
- { 0x2d1c, {1, {0x10bc }}},
- { 0x2d1d, {1, {0x10bd }}},
- { 0x2d1e, {1, {0x10be }}},
- { 0x2d1f, {1, {0x10bf }}},
- { 0x2d20, {1, {0x10c0 }}},
- { 0x2d21, {1, {0x10c1 }}},
- { 0x2d22, {1, {0x10c2 }}},
- { 0x2d23, {1, {0x10c3 }}},
- { 0x2d24, {1, {0x10c4 }}},
- { 0x2d25, {1, {0x10c5 }}},
- { 0xff41, {1, {0xff21 }}},
- { 0xff42, {1, {0xff22 }}},
- { 0xff43, {1, {0xff23 }}},
- { 0xff44, {1, {0xff24 }}},
- { 0xff45, {1, {0xff25 }}},
- { 0xff46, {1, {0xff26 }}},
- { 0xff47, {1, {0xff27 }}},
- { 0xff48, {1, {0xff28 }}},
- { 0xff49, {1, {0xff29 }}},
- { 0xff4a, {1, {0xff2a }}},
- { 0xff4b, {1, {0xff2b }}},
- { 0xff4c, {1, {0xff2c }}},
- { 0xff4d, {1, {0xff2d }}},
- { 0xff4e, {1, {0xff2e }}},
- { 0xff4f, {1, {0xff2f }}},
- { 0xff50, {1, {0xff30 }}},
- { 0xff51, {1, {0xff31 }}},
- { 0xff52, {1, {0xff32 }}},
- { 0xff53, {1, {0xff33 }}},
- { 0xff54, {1, {0xff34 }}},
- { 0xff55, {1, {0xff35 }}},
- { 0xff56, {1, {0xff36 }}},
- { 0xff57, {1, {0xff37 }}},
- { 0xff58, {1, {0xff38 }}},
- { 0xff59, {1, {0xff39 }}},
- { 0xff5a, {1, {0xff3a }}},
- { 0x10428, {1, {0x10400 }}},
- { 0x10429, {1, {0x10401 }}},
- { 0x1042a, {1, {0x10402 }}},
- { 0x1042b, {1, {0x10403 }}},
- { 0x1042c, {1, {0x10404 }}},
- { 0x1042d, {1, {0x10405 }}},
- { 0x1042e, {1, {0x10406 }}},
- { 0x1042f, {1, {0x10407 }}},
- { 0x10430, {1, {0x10408 }}},
- { 0x10431, {1, {0x10409 }}},
- { 0x10432, {1, {0x1040a }}},
- { 0x10433, {1, {0x1040b }}},
- { 0x10434, {1, {0x1040c }}},
- { 0x10435, {1, {0x1040d }}},
- { 0x10436, {1, {0x1040e }}},
- { 0x10437, {1, {0x1040f }}},
- { 0x10438, {1, {0x10410 }}},
- { 0x10439, {1, {0x10411 }}},
- { 0x1043a, {1, {0x10412 }}},
- { 0x1043b, {1, {0x10413 }}},
- { 0x1043c, {1, {0x10414 }}},
- { 0x1043d, {1, {0x10415 }}},
- { 0x1043e, {1, {0x10416 }}},
- { 0x1043f, {1, {0x10417 }}},
- { 0x10440, {1, {0x10418 }}},
- { 0x10441, {1, {0x10419 }}},
- { 0x10442, {1, {0x1041a }}},
- { 0x10443, {1, {0x1041b }}},
- { 0x10444, {1, {0x1041c }}},
- { 0x10445, {1, {0x1041d }}},
- { 0x10446, {1, {0x1041e }}},
- { 0x10447, {1, {0x1041f }}},
- { 0x10448, {1, {0x10420 }}},
- { 0x10449, {1, {0x10421 }}},
- { 0x1044a, {1, {0x10422 }}},
- { 0x1044b, {1, {0x10423 }}},
- { 0x1044c, {1, {0x10424 }}},
- { 0x1044d, {1, {0x10425 }}},
- { 0x1044e, {1, {0x10426 }}},
- { 0x1044f, {1, {0x10427 }}}
-};
-
-static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = {
- { 0x0069, {1, {0x0049 }}}
-};
-
-static const CaseUnfold_12_Type CaseUnfold_12[] = {
- { {0x0061, 0x02be}, {1, {0x1e9a }}},
- { {0x0066, 0x0066}, {1, {0xfb00 }}},
- { {0x0066, 0x0069}, {1, {0xfb01 }}},
- { {0x0066, 0x006c}, {1, {0xfb02 }}},
- { {0x0068, 0x0331}, {1, {0x1e96 }}},
- { {0x006a, 0x030c}, {1, {0x01f0 }}},
- { {0x0073, 0x0073}, {1, {0x00df }}},
- { {0x0073, 0x0074}, {2, {0xfb05, 0xfb06 }}},
- { {0x0074, 0x0308}, {1, {0x1e97 }}},
- { {0x0077, 0x030a}, {1, {0x1e98 }}},
- { {0x0079, 0x030a}, {1, {0x1e99 }}},
- { {0x02bc, 0x006e}, {1, {0x0149 }}},
- { {0x03ac, 0x03b9}, {1, {0x1fb4 }}},
- { {0x03ae, 0x03b9}, {1, {0x1fc4 }}},
- { {0x03b1, 0x0342}, {1, {0x1fb6 }}},
- { {0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc }}},
- { {0x03b7, 0x0342}, {1, {0x1fc6 }}},
- { {0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc }}},
- { {0x03b9, 0x0342}, {1, {0x1fd6 }}},
- { {0x03c1, 0x0313}, {1, {0x1fe4 }}},
- { {0x03c5, 0x0313}, {1, {0x1f50 }}},
- { {0x03c5, 0x0342}, {1, {0x1fe6 }}},
- { {0x03c9, 0x0342}, {1, {0x1ff6 }}},
- { {0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc }}},
- { {0x03ce, 0x03b9}, {1, {0x1ff4 }}},
- { {0x0565, 0x0582}, {1, {0x0587 }}},
- { {0x0574, 0x0565}, {1, {0xfb14 }}},
- { {0x0574, 0x056b}, {1, {0xfb15 }}},
- { {0x0574, 0x056d}, {1, {0xfb17 }}},
- { {0x0574, 0x0576}, {1, {0xfb13 }}},
- { {0x057e, 0x0576}, {1, {0xfb16 }}},
- { {0x1f00, 0x03b9}, {2, {0x1f88, 0x1f80 }}},
- { {0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89 }}},
- { {0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a }}},
- { {0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b }}},
- { {0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c }}},
- { {0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d }}},
- { {0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e }}},
- { {0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f }}},
- { {0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98 }}},
- { {0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99 }}},
- { {0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a }}},
- { {0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b }}},
- { {0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c }}},
- { {0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d }}},
- { {0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e }}},
- { {0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f }}},
- { {0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8 }}},
- { {0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9 }}},
- { {0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa }}},
- { {0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab }}},
- { {0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac }}},
- { {0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad }}},
- { {0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae }}},
- { {0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf }}},
- { {0x1f70, 0x03b9}, {1, {0x1fb2 }}},
- { {0x1f74, 0x03b9}, {1, {0x1fc2 }}},
- { {0x1f7c, 0x03b9}, {1, {0x1ff2 }}}
-};
-
-static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = {
- { {0x0069, 0x0307}, {1, {0x0130 }}}
-};
-
-static const CaseUnfold_13_Type CaseUnfold_13[] = {
- { {0x0066, 0x0066, 0x0069}, {1, {0xfb03 }}},
- { {0x0066, 0x0066, 0x006c}, {1, {0xfb04 }}},
- { {0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7 }}},
- { {0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7 }}},
- { {0x03b9, 0x0308, 0x0300}, {1, {0x1fd2 }}},
- { {0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3 }}},
- { {0x03b9, 0x0308, 0x0342}, {1, {0x1fd7 }}},
- { {0x03c5, 0x0308, 0x0300}, {1, {0x1fe2 }}},
- { {0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3 }}},
- { {0x03c5, 0x0308, 0x0342}, {1, {0x1fe7 }}},
- { {0x03c5, 0x0313, 0x0300}, {1, {0x1f52 }}},
- { {0x03c5, 0x0313, 0x0301}, {1, {0x1f54 }}},
- { {0x03c5, 0x0313, 0x0342}, {1, {0x1f56 }}},
- { {0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7 }}}
-};
-
-
-static PosixBracketEntryType HashEntryData[] = {
-  { (UChar* )"NEWLINE",                0,  7 },
-  { (UChar* )"Alpha",                  1,  5 },
-  { (UChar* )"Blank",                  2,  5 },
-  { (UChar* )"Cntrl",                  3,  5 },
-  { (UChar* )"Digit",                  4,  5 },
-  { (UChar* )"Graph",                  5,  5 },
-  { (UChar* )"Lower",                  6,  5 },
-  { (UChar* )"Print",                  7,  5 },
-  { (UChar* )"Punct",                  8,  5 },
-  { (UChar* )"Space",                  9,  5 },
-  { (UChar* )"Upper",                 10,  5 },
-  { (UChar* )"XDigit",                11,  6 },
-  { (UChar* )"Word",                  12,  4 },
-  { (UChar* )"Alnum",                 13,  5 },
-  { (UChar* )"ASCII",                 14,  5 },
-
-#ifdef USE_UNICODE_PROPERTIES
-  { (UChar* )"Any",                   15,  3 },
-  { (UChar* )"Assigned",              16,  8 },
-  { (UChar* )"C",                     17,  1 },
-  { (UChar* )"Cc",                    18,  2 },
-  { (UChar* )"Cf",                    19,  2 },
-  { (UChar* )"Cn",                    20,  2 },
-  { (UChar* )"Co",                    21,  2 },
-  { (UChar* )"Cs",                    22,  2 },
-  { (UChar* )"L",                     23,  1 },
-  { (UChar* )"Ll",                    24,  2 },
-  { (UChar* )"Lm",                    25,  2 },
-  { (UChar* )"Lo",                    26,  2 },
-  { (UChar* )"Lt",                    27,  2 },
-  { (UChar* )"Lu",                    28,  2 },
-  { (UChar* )"M",                     29,  1 },
-  { (UChar* )"Mc",                    30,  2 },
-  { (UChar* )"Me",                    31,  2 },
-  { (UChar* )"Mn",                    32,  2 },
-  { (UChar* )"N",                     33,  1 },
-  { (UChar* )"Nd",                    34,  2 },
-  { (UChar* )"Nl",                    35,  2 },
-  { (UChar* )"No",                    36,  2 },
-  { (UChar* )"P",                     37,  1 },
-  { (UChar* )"Pc",                    38,  2 },
-  { (UChar* )"Pd",                    39,  2 },
-  { (UChar* )"Pe",                    40,  2 },
-  { (UChar* )"Pf",                    41,  2 },
-  { (UChar* )"Pi",                    42,  2 },
-  { (UChar* )"Po",                    43,  2 },
-  { (UChar* )"Ps",                    44,  2 },
-  { (UChar* )"S",                     45,  1 },
-  { (UChar* )"Sc",                    46,  2 },
-  { (UChar* )"Sk",                    47,  2 },
-  { (UChar* )"Sm",                    48,  2 },
-  { (UChar* )"So",                    49,  2 },
-  { (UChar* )"Z",                     50,  1 },
-  { (UChar* )"Zl",                    51,  2 },
-  { (UChar* )"Zp",                    52,  2 },
-  { (UChar* )"Zs",                    53,  2 },
-  { (UChar* )"Arabic",                54,  6 },
-  { (UChar* )"Armenian",              55,  8 },
-  { (UChar* )"Bengali",               56,  7 },
-  { (UChar* )"Bopomofo",              57,  8 },
-  { (UChar* )"Braille",               58,  7 },
-  { (UChar* )"Buginese",              59,  8 },
-  { (UChar* )"Buhid",                 60,  5 },
-  { (UChar* )"Canadian_Aboriginal",   61, 19 },
-  { (UChar* )"Cherokee",              62,  8 },
-  { (UChar* )"Common",                63,  6 },
-  { (UChar* )"Coptic",                64,  6 },
-  { (UChar* )"Cypriot",               65,  7 },
-  { (UChar* )"Cyrillic",              66,  8 },
-  { (UChar* )"Deseret",               67,  7 },
-  { (UChar* )"Devanagari",            68, 10 },
-  { (UChar* )"Ethiopic",              69,  8 },
-  { (UChar* )"Georgian",              70,  8 },
-  { (UChar* )"Glagolitic",            71, 10 },
-  { (UChar* )"Gothic",                72,  6 },
-  { (UChar* )"Greek",                 73,  5 },
-  { (UChar* )"Gujarati",              74,  8 },
-  { (UChar* )"Gurmukhi",              75,  8 },
-  { (UChar* )"Han",                   76,  3 },
-  { (UChar* )"Hangul",                77,  6 },
-  { (UChar* )"Hanunoo",               78,  7 },
-  { (UChar* )"Hebrew",                79,  6 },
-  { (UChar* )"Hiragana",              80,  8 },
-  { (UChar* )"Inherited",             81,  9 },
-  { (UChar* )"Kannada",               82,  7 },
-  { (UChar* )"Katakana",              83,  8 },
-  { (UChar* )"Kharoshthi",            84, 10 },
-  { (UChar* )"Khmer",                 85,  5 },
-  { (UChar* )"Lao",                   86,  3 },
-  { (UChar* )"Latin",                 87,  5 },
-  { (UChar* )"Limbu",                 88,  5 },
-  { (UChar* )"Linear_B",              89,  8 },
-  { (UChar* )"Malayalam",             90,  9 },
-  { (UChar* )"Mongolian",             91,  9 },
-  { (UChar* )"Myanmar",               92,  7 },
-  { (UChar* )"New_Tai_Lue",           93, 11 },
-  { (UChar* )"Ogham",                 94,  5 },
-  { (UChar* )"Old_Italic",            95, 10 },
-  { (UChar* )"Old_Persian",           96, 11 },
-  { (UChar* )"Oriya",                 97,  5 },
-  { (UChar* )"Osmanya",               98,  7 },
-  { (UChar* )"Runic",                 99,  5 },
-  { (UChar* )"Shavian",              100,  7 },
-  { (UChar* )"Sinhala",              101,  7 },
-  { (UChar* )"Syloti_Nagri",         102, 12 },
-  { (UChar* )"Syriac",               103,  6 },
-  { (UChar* )"Tagalog",              104,  7 },
-  { (UChar* )"Tagbanwa",             105,  8 },
-  { (UChar* )"Tai_Le",               106,  6 },
-  { (UChar* )"Tamil",                107,  5 },
-  { (UChar* )"Telugu",               108,  6 },
-  { (UChar* )"Thaana",               109,  6 },
-  { (UChar* )"Thai",                 110,  4 },
-  { (UChar* )"Tibetan",              111,  7 },
-  { (UChar* )"Tifinagh",             112,  8 },
-  { (UChar* )"Ugaritic",             113,  8 },
-  { (UChar* )"Yi",                   114,  2 },
-#endif /* USE_UNICODE_PROPERTIES */
-  { (UChar* )NULL,                    -1,  0 }
-};
-
-#ifdef USE_UNICODE_PROPERTIES
-#define CODE_RANGES_NUM     115
-#else
-#define CODE_RANGES_NUM      15
-#endif
-
-static const OnigCodePoint* CodeRanges[CODE_RANGES_NUM];
-static int CodeRangeTableInited = 0;
-
-static void init_code_range_array(void) {
-  THREAD_ATOMIC_START;
-
-  CodeRanges[0] = CR_NEWLINE;
-  CodeRanges[1] = CR_Alpha;
-  CodeRanges[2] = CR_Blank;
-  CodeRanges[3] = CR_Cntrl;
-  CodeRanges[4] = CR_Digit;
-  CodeRanges[5] = CR_Graph;
-  CodeRanges[6] = CR_Lower;
-  CodeRanges[7] = CR_Print;
-  CodeRanges[8] = CR_Punct;
-  CodeRanges[9] = CR_Space;
-  CodeRanges[10] = CR_Upper;
-  CodeRanges[11] = CR_XDigit;
-  CodeRanges[12] = CR_Word;
-  CodeRanges[13] = CR_Alnum;
-  CodeRanges[14] = CR_ASCII;
-
-#ifdef USE_UNICODE_PROPERTIES
-  CodeRanges[15] = CR_Any;
-  CodeRanges[16] = CR_Assigned;
-  CodeRanges[17] = CR_C;
-  CodeRanges[18] = CR_Cc;
-  CodeRanges[19] = CR_Cf;
-  CodeRanges[20] = CR_Cn;
-  CodeRanges[21] = CR_Co;
-  CodeRanges[22] = CR_Cs;
-  CodeRanges[23] = CR_L;
-  CodeRanges[24] = CR_Ll;
-  CodeRanges[25] = CR_Lm;
-  CodeRanges[26] = CR_Lo;
-  CodeRanges[27] = CR_Lt;
-  CodeRanges[28] = CR_Lu;
-  CodeRanges[29] = CR_M;
-  CodeRanges[30] = CR_Mc;
-  CodeRanges[31] = CR_Me;
-  CodeRanges[32] = CR_Mn;
-  CodeRanges[33] = CR_N;
-  CodeRanges[34] = CR_Nd;
-  CodeRanges[35] = CR_Nl;
-  CodeRanges[36] = CR_No;
-  CodeRanges[37] = CR_P;
-  CodeRanges[38] = CR_Pc;
-  CodeRanges[39] = CR_Pd;
-  CodeRanges[40] = CR_Pe;
-  CodeRanges[41] = CR_Pf;
-  CodeRanges[42] = CR_Pi;
-  CodeRanges[43] = CR_Po;
-  CodeRanges[44] = CR_Ps;
-  CodeRanges[45] = CR_S;
-  CodeRanges[46] = CR_Sc;
-  CodeRanges[47] = CR_Sk;
-  CodeRanges[48] = CR_Sm;
-  CodeRanges[49] = CR_So;
-  CodeRanges[50] = CR_Z;
-  CodeRanges[51] = CR_Zl;
-  CodeRanges[52] = CR_Zp;
-  CodeRanges[53] = CR_Zs;
-  CodeRanges[54] = CR_Arabic;
-  CodeRanges[55] = CR_Armenian;
-  CodeRanges[56] = CR_Bengali;
-  CodeRanges[57] = CR_Bopomofo;
-  CodeRanges[58] = CR_Braille;
-  CodeRanges[59] = CR_Buginese;
-  CodeRanges[60] = CR_Buhid;
-  CodeRanges[61] = CR_Canadian_Aboriginal;
-  CodeRanges[62] = CR_Cherokee;
-  CodeRanges[63] = CR_Common;
-  CodeRanges[64] = CR_Coptic;
-  CodeRanges[65] = CR_Cypriot;
-  CodeRanges[66] = CR_Cyrillic;
-  CodeRanges[67] = CR_Deseret;
-  CodeRanges[68] = CR_Devanagari;
-  CodeRanges[69] = CR_Ethiopic;
-  CodeRanges[70] = CR_Georgian;
-  CodeRanges[71] = CR_Glagolitic;
-  CodeRanges[72] = CR_Gothic;
-  CodeRanges[73] = CR_Greek;
-  CodeRanges[74] = CR_Gujarati;
-  CodeRanges[75] = CR_Gurmukhi;
-  CodeRanges[76] = CR_Han;
-  CodeRanges[77] = CR_Hangul;
-  CodeRanges[78] = CR_Hanunoo;
-  CodeRanges[79] = CR_Hebrew;
-  CodeRanges[80] = CR_Hiragana;
-  CodeRanges[81] = CR_Inherited;
-  CodeRanges[82] = CR_Kannada;
-  CodeRanges[83] = CR_Katakana;
-  CodeRanges[84] = CR_Kharoshthi;
-  CodeRanges[85] = CR_Khmer;
-  CodeRanges[86] = CR_Lao;
-  CodeRanges[87] = CR_Latin;
-  CodeRanges[88] = CR_Limbu;
-  CodeRanges[89] = CR_Linear_B;
-  CodeRanges[90] = CR_Malayalam;
-  CodeRanges[91] = CR_Mongolian;
-  CodeRanges[92] = CR_Myanmar;
-  CodeRanges[93] = CR_New_Tai_Lue;
-  CodeRanges[94] = CR_Ogham;
-  CodeRanges[95] = CR_Old_Italic;
-  CodeRanges[96] = CR_Old_Persian;
-  CodeRanges[97] = CR_Oriya;
-  CodeRanges[98] = CR_Osmanya;
-  CodeRanges[99] = CR_Runic;
-  CodeRanges[100] = CR_Shavian;
-  CodeRanges[101] = CR_Sinhala;
-  CodeRanges[102] = CR_Syloti_Nagri;
-  CodeRanges[103] = CR_Syriac;
-  CodeRanges[104] = CR_Tagalog;
-  CodeRanges[105] = CR_Tagbanwa;
-  CodeRanges[106] = CR_Tai_Le;
-  CodeRanges[107] = CR_Tamil;
-  CodeRanges[108] = CR_Telugu;
-  CodeRanges[109] = CR_Thaana;
-  CodeRanges[110] = CR_Thai;
-  CodeRanges[111] = CR_Tibetan;
-  CodeRanges[112] = CR_Tifinagh;
-  CodeRanges[113] = CR_Ugaritic;
-  CodeRanges[114] = CR_Yi;
-#endif /* USE_UNICODE_PROPERTIES */
-
-  CodeRangeTableInited = 1;
-  THREAD_ATOMIC_END;
-}
-
-extern int
-onigenc_unicode_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (
-#ifdef USE_UNICODE_PROPERTIES
-      ctype <= ONIGENC_MAX_STD_CTYPE &&
-#endif
-      code < 256) {
-    return ONIGENC_IS_UNICODE_ISO_8859_1_CTYPE(code, ctype);
-  }
-
-  if (ctype >= CODE_RANGES_NUM) {
-    return ONIGERR_TYPE_BUG;
-  }
-
-  if (CodeRangeTableInited == 0) init_code_range_array();
-
-  return onig_is_in_code_range((UChar* )CodeRanges[ctype], code);
-}
-
-
-extern int
-onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
-{
-  if (ctype >= CODE_RANGES_NUM) {
-    return ONIGERR_TYPE_BUG;
-  }
-
-  if (CodeRangeTableInited == 0) init_code_range_array();
-
-  *ranges = CodeRanges[ctype];
-
-  return 0;
-}
-
-extern int
-onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
-                                      const OnigCodePoint* ranges[],
-				      struct OnigEncodingTypeST* enc ARG_UNUSED)
-{
-  *sb_out = 0x00;
-  return onigenc_unicode_ctype_code_range(ctype, ranges);
-}
-
-#include "ruby/st.h"
-
-#define PROPERTY_NAME_MAX_SIZE    20
-
-static st_table* NameCtypeTable;
-static int NameTableInited = 0;
-
-static int init_name_ctype_table(void)
-{
-  PosixBracketEntryType *pb;
-
-  THREAD_ATOMIC_START;
-
-  NameCtypeTable = onig_st_init_strend_table_with_size(100);
-  if (ONIG_IS_NULL(NameCtypeTable)) return ONIGERR_MEMORY;
-
-  for (pb = HashEntryData; ONIG_IS_NOT_NULL(pb->name); pb++) {
-    onig_st_insert_strend(NameCtypeTable, pb->name, pb->name + pb->len,
-			  (st_data_t )pb->ctype);
-  }
-
-  NameTableInited = 1;
-  THREAD_ATOMIC_END;
-  return 0;
-}
-
-extern int
-onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
-{
-  int len;
-  st_data_t ctype;
-  UChar buf[PROPERTY_NAME_MAX_SIZE];
-  UChar *p;
-  OnigCodePoint code;
-
-  p = name;
-  len = 0;
-  while (p < end) {
-    code = ONIGENC_MBC_TO_CODE(enc, p, end);
-    if (code >= 0x80)
-      return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-
-    buf[len++] = (UChar )code;
-    if (len >= PROPERTY_NAME_MAX_SIZE)
-      return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-
-    p += enclen(enc, p, end);
-  }
-
-  buf[len] = 0;
-
-  if (NameTableInited == 0)  init_name_ctype_table();
-
-  if (onig_st_lookup_strend(NameCtypeTable, buf, buf + len,
-			    &ctype) == 0) {
-    return ONIGERR_INVALID_CHAR_PROPERTY_NAME;
-  }
-
-  return ctype;
-}
-
-
-static int
-code2_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1]) return 0;
-  return 1;
-}
-
-static int
-code2_hash(OnigCodePoint* x)
-{
-  return (int )(x[0] + x[1]);
-}
-
-static const struct st_hash_type type_code2_hash = {
-  code2_cmp,
-  code2_hash,
-};
-
-static int
-code3_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1] && x[2] == y[2]) return 0;
-  return 1;
-}
-
-static int
-code3_hash(OnigCodePoint* x)
-{
-  return (int )(x[0] + x[1] + x[2]);
-}
-
-static const struct st_hash_type type_code3_hash = {
-  code3_cmp,
-  code3_hash,
-};
-
-
-static st_table* FoldTable;    /* fold-1, fold-2, fold-3 */
-static st_table* Unfold1Table;
-static st_table* Unfold2Table;
-static st_table* Unfold3Table;
-static int CaseFoldInited = 0;
-
-static int init_case_fold_table(void)
-{
-  const CaseFold_11_Type   *p;
-  const CaseUnfold_11_Type *p1;
-  const CaseUnfold_12_Type *p2;
-  const CaseUnfold_13_Type *p3;
-  int i;
-
-  THREAD_ATOMIC_START;
-
-  FoldTable = st_init_numtable_with_size(1200);
-  if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
-  for (i = 0; i < (int )(sizeof(CaseFold)/sizeof(CaseFold_11_Type)); i++) {
-    p = &CaseFold[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-  for (i = 0; i < (int )(sizeof(CaseFold_Locale)/sizeof(CaseFold_11_Type));
-       i++) {
-    p = &CaseFold_Locale[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-
-  Unfold1Table = st_init_numtable_with_size(1000);
-  if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type));
-       i++) {
-    p1 = &CaseUnfold_11[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-  for (i = 0;
-       i < (int )(sizeof(CaseUnfold_11_Locale)/sizeof(CaseUnfold_11_Type));
-       i++) {
-    p1 = &CaseUnfold_11_Locale[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-
-  Unfold2Table = st_init_table_with_size(&type_code2_hash, 200);
-  if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type));
-       i++) {
-    p2 = &CaseUnfold_12[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-  for (i = 0;
-       i < (int )(sizeof(CaseUnfold_12_Locale)/sizeof(CaseUnfold_12_Type));
-       i++) {
-    p2 = &CaseUnfold_12_Locale[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-
-  Unfold3Table = st_init_table_with_size(&type_code3_hash, 30);
-  if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));
-       i++) {
-    p3 = &CaseUnfold_13[i];
-    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
-  }
-
-  CaseFoldInited = 1;
-  THREAD_ATOMIC_END;
-  return 0;
-}
-
-extern int
-onigenc_unicode_mbc_case_fold(OnigEncoding enc,
-    OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
-    UChar* fold)
-{
-  CodePointList3 *to;
-  OnigCodePoint code;
-  int i, len, rlen;
-  const UChar *p = *pp;
-
-  if (CaseFoldInited == 0) init_case_fold_table();
-
-  code = ONIGENC_MBC_TO_CODE(enc, p, end);
-  len = enclen(enc, p, end);
-  *pp += len;
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    if (code == 0x0049) {
-      return ONIGENC_CODE_TO_MBC(enc, 0x0131, fold);
-    }
-    else if (code == 0x0130) {
-      return ONIGENC_CODE_TO_MBC(enc, 0x0069, fold);
-    }
-  }
-#endif
-
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
-    if (to->n == 1) {
-      return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);      
-    }
-#if 0
-    /* NO NEEDS TO CHECK */
-    else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-#else
-    else {
-#endif
-      rlen = 0;
-      for (i = 0; i < to->n; i++) {
-	len = ONIGENC_CODE_TO_MBC(enc, to->code[i], fold);
-	fold += len;
-	rlen += len;
-      }
-      return rlen;
-    }
-  }
-
-  for (i = 0; i < len; i++) {
-    *fold++ = *p++;
-  }
-  return len;
-}
-
-extern int
-onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
-				    OnigApplyAllCaseFoldFunc f, void* arg,
-				    OnigEncoding enc ARG_UNUSED)
-{
-  const CaseUnfold_11_Type* p11;
-  OnigCodePoint code;
-  int i, j, k, r;
-
-  /* if (CaseFoldInited == 0) init_case_fold_table(); */
-
-  for (i = 0; i < (int )(sizeof(CaseUnfold_11)/sizeof(CaseUnfold_11_Type));
-       i++) {
-    p11 = &CaseUnfold_11[i];
-    for (j = 0; j < p11->to.n; j++) {
-      code = p11->from;
-      r = (*f)(p11->to.code[j], &code, 1, arg);
-      if (r != 0) return r;
-
-      code = p11->to.code[j];
-      r = (*f)(p11->from, &code, 1, arg);
-      if (r != 0) return r;
-
-      for (k = 0; k < j; k++) {
-	r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]), 1, arg);
-	if (r != 0) return r;
-
-	r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]), 1, arg);
-	if (r != 0) return r;
-      }
-    }
-  }
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    code = 0x0131;
-    r = (*f)(0x0049, &code, 1, arg);
-    if (r != 0) return r;
-    code = 0x0049;
-    r = (*f)(0x0131, &code, 1, arg);
-    if (r != 0) return r;
-
-    code = 0x0130;
-    r = (*f)(0x0069, &code, 1, arg);
-    if (r != 0) return r;
-    code = 0x0069;
-    r = (*f)(0x0130, &code, 1, arg);
-    if (r != 0) return r;
-  }
-  else {
-#endif
-    for (i = 0;
-	 i < (int )(sizeof(CaseUnfold_11_Locale)/sizeof(CaseUnfold_11_Type));
-	 i++) {
-      p11 = &CaseUnfold_11_Locale[i];
-      for (j = 0; j < p11->to.n; j++) {
-	code = p11->from;
-	r = (*f)(p11->to.code[j], &code, 1, arg);
-	if (r != 0) return r;
-
-	code = p11->to.code[j];
-	r = (*f)(p11->from, &code, 1, arg);
-	if (r != 0) return r;
-
-	for (k = 0; k < j; k++) {
-	  r = (*f)(p11->to.code[j], (OnigCodePoint* )(&p11->to.code[k]),
-		   1, arg);
-	  if (r != 0) return r;
-
-	  r = (*f)(p11->to.code[k], (OnigCodePoint* )(&p11->to.code[j]),
-		   1, arg);
-	  if (r != 0) return r;
-	}
-      }
-    }
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-  }
-#endif
-
-  if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    for (i = 0; i < (int )(sizeof(CaseUnfold_12)/sizeof(CaseUnfold_12_Type));
-	 i++) {
-      for (j = 0; j < CaseUnfold_12[i].to.n; j++) {
-	r = (*f)(CaseUnfold_12[i].to.code[j],
-		 (OnigCodePoint* )CaseUnfold_12[i].from, 2, arg);
-	if (r != 0) return r;	
-
-	for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
-	  if (k == j) continue;
-
-	  r = (*f)(CaseUnfold_12[i].to.code[j],
-		   (OnigCodePoint* )(&CaseUnfold_12[i].to.code[k]), 1, arg);
-	  if (r != 0) return r;
-	}
-      }
-    }
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) == 0) {
-#endif
-      for (i = 0;
-	   i < (int )(sizeof(CaseUnfold_12_Locale)/sizeof(CaseUnfold_12_Type));
-	   i++) {
-	for (j = 0; j < CaseUnfold_12_Locale[i].to.n; j++) {
-	  r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
-		   (OnigCodePoint* )CaseUnfold_12_Locale[i].from, 2, arg);
-	  if (r != 0) return r;	
-
-	  for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
-	    if (k == j) continue;
-
-	    r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
-		     (OnigCodePoint* )(&CaseUnfold_12_Locale[i].to.code[k]),
-		     1, arg);
-	    if (r != 0) return r;
-	  }
-	}
-      }
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    }
-#endif
-
-    for (i = 0; i < (int )(sizeof(CaseUnfold_13)/sizeof(CaseUnfold_13_Type));
-	 i++) {
-      for (j = 0; j < CaseUnfold_13[i].to.n; j++) {
-	r = (*f)(CaseUnfold_13[i].to.code[j],
-		 (OnigCodePoint* )CaseUnfold_13[i].from, 3, arg);
-	if (r != 0) return r;	
-
-	for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
-	  if (k == j) continue;
-
-	  r = (*f)(CaseUnfold_13[i].to.code[j],
-		   (OnigCodePoint* )(&CaseUnfold_13[i].to.code[k]), 1, arg);
-	  if (r != 0) return r;
-	}
-      }
-    }
-  }
-
-  return 0;
-}
-
-extern int
-onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
-    OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end,
-    OnigCaseFoldCodeItem items[])
-{
-  int n, i, j, k, len;
-  OnigCodePoint code, codes[3];
-  CodePointList3 *to, *z3;
-  CodePointList2 *z2;
-
-  if (CaseFoldInited == 0) init_case_fold_table();
-
-  n = 0;
-
-  code = ONIGENC_MBC_TO_CODE(enc, p, end);
-  len = enclen(enc, p, end);
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-  if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    if (code == 0x0049) {
-      items[0].byte_len = len;
-      items[0].code_len = 1;
-      items[0].code[0]  = 0x0131;
-      return 1;
-    }
-    else if (code == 0x0130) {
-      items[0].byte_len = len;
-      items[0].code_len = 1;
-      items[0].code[0]  = 0x0069;
-      return 1;
-    }
-    else if (code == 0x0131) {
-      items[0].byte_len = len;
-      items[0].code_len = 1;
-      items[0].code[0]  = 0x0049;
-      return 1;
-    }
-    else if (code == 0x0069) {
-      items[0].byte_len = len;
-      items[0].code_len = 1;
-      items[0].code[0]  = 0x0130;
-      return 1;
-    }
-  }
-#endif
-
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
-    if (to->n == 1) {
-      OnigCodePoint orig_code = code;
-
-      items[0].byte_len = len;
-      items[0].code_len = 1;
-      items[0].code[0]  = to->code[0];
-      n++;
-
-      code = to->code[0];
-      if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
-	for (i = 0; i < to->n; i++) {
-	  if (to->code[i] != orig_code) {
-	    items[n].byte_len = len;
-	    items[n].code_len = 1;
-	    items[n].code[0]  = to->code[i];
-	    n++;
-	  }
-	}
-      }
-    }
-    else if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-      OnigCodePoint cs[3][4];
-      int fn, ncs[3];
-
-      for (fn = 0; fn < to->n; fn++) {
-	cs[fn][0] = to->code[fn];
-	if (onig_st_lookup(Unfold1Table, (st_data_t )cs[fn][0],
-			   (void* )&z3) != 0) {
-	  for (i = 0; i < z3->n; i++) {
-	    cs[fn][i+1] = z3->code[i];
-	  }
-	  ncs[fn] = z3->n + 1;
-	}
-	else
-	  ncs[fn] = 1;
-      }
-
-      if (fn == 2) {
-	for (i = 0; i < ncs[0]; i++) {
-	  for (j = 0; j < ncs[1]; j++) {
-	    items[n].byte_len = len;
-	    items[n].code_len = 2;
-	    items[n].code[0]  = cs[0][i];
-	    items[n].code[1]  = cs[1][j];
-	    n++;
-	  }
-	}
-
-	if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
-	    if (z2->code[i] == code) continue;
-
-	    items[n].byte_len = len;
-	    items[n].code_len = 1;
-	    items[n].code[0]  = z2->code[i];
-	    n++;
-	  }
-	}
-      }
-      else {
-	for (i = 0; i < ncs[0]; i++) {
-	  for (j = 0; j < ncs[1]; j++) {
-	    for (k = 0; k < ncs[2]; k++) {
-	      items[n].byte_len = len;
-	      items[n].code_len = 3;
-	      items[n].code[0]  = cs[0][i];
-	      items[n].code[1]  = cs[1][j];
-	      items[n].code[2]  = cs[2][k];
-	      n++;
-	    }
-	  }
-	}
-
-	if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
-	    if (z2->code[i] == code) continue;
-
-	    items[n].byte_len = len;
-	    items[n].code_len = 1;
-	    items[n].code[0]  = z2->code[i];
-	    n++;
-	  }
-	}
-      }
-
-      /* multi char folded code is not head of another folded multi char */
-      flag = 0; /* DISABLE_CASE_FOLD_MULTI_CHAR(flag); */
-    }
-  }
-  else {
-    if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
-      for (i = 0; i < to->n; i++) {
-	items[n].byte_len = len;
-	items[n].code_len = 1;
-	items[n].code[0]  = to->code[i];
-	n++;
-      }
-    }
-  }
-
-
-  if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    p += len;
-    if (p < end) {
-      int clen;
-
-      codes[0] = code;
-      code = ONIGENC_MBC_TO_CODE(enc, p, end);
-      if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
-	  && to->n == 1) {
-	codes[1] = to->code[0];
-      }
-      else
-	codes[1] = code;
-
-      clen = enclen(enc, p, end);
-      len += clen;
-      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {
-	for (i = 0; i < z2->n; i++) {
-	  items[n].byte_len = len;
-	  items[n].code_len = 1;
-	  items[n].code[0]  = z2->code[i];
-	  n++;
-	}
-      }
-
-      p += clen;
-      if (p < end) {
-	code = ONIGENC_MBC_TO_CODE(enc, p, end);
-	if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
-	    && to->n == 1) {
-	  codes[2] = to->code[0];
-	}
-	else
-	  codes[2] = code;
-
-	clen = enclen(enc, p, end);
-	len += clen;
-	if (onig_st_lookup(Unfold3Table, (st_data_t )codes,
-			   (void* )&z2) != 0) {
-	  for (i = 0; i < z2->n; i++) {
-	    items[n].byte_len = len;
-	    items[n].code_len = 1;
-	    items[n].code[0]  = z2->code[i];
-	    n++;
-	  }
-	}
-      }
-    }
-  }
-
-  return n;
-}
diff --git a/enc/us_ascii.c b/enc/us_ascii.c
deleted file mode 100644
index 39e2b26088..0000000000
--- a/enc/us_ascii.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "regenc.h"
-
-extern int
-us_ascii_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc)
-{
-    if (*p & 0x80)
-        return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1);
-}
-
-OnigEncodingDefine(us_ascii, US_ASCII) = {
-  us_ascii_mbc_enc_len,
-  "US-ASCII",/* name */
-  1,           /* max byte length */
-  1,           /* min byte length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  onigenc_ascii_mbc_case_fold,
-  onigenc_ascii_apply_all_case_fold,
-  onigenc_ascii_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  onigenc_ascii_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("ASCII", "US-ASCII")
-ENC_ALIAS("ANSI_X3.4-1968", "US-ASCII")
-ENC_ALIAS("646", "US-ASCII")
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
deleted file mode 100644
index ccae9397bb..0000000000
--- a/enc/utf_16be.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/**********************************************************************
-  utf_16be.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
-
-static const int EncLen_UTF16[] = {
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-};
-
-static int
-utf16be_mbc_enc_len(const UChar* p, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  int byte = p[0];
-  if (!UTF16_IS_SURROGATE(byte)) {
-    if (2 <= e-p)
-      return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
-    else
-      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
-  }
-  if (UTF16_IS_SURROGATE_FIRST(byte)) {
-    switch (e-p) {
-      case 1: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(3);
-      case 2: return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(2);
-      case 3:
-        if (UTF16_IS_SURROGATE_SECOND(p[2]))
-          return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
-        break;
-      default:
-        if (UTF16_IS_SURROGATE_SECOND(p[2]))
-          return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
-        break;
-    }
-  }
-  return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-utf16be_is_mbc_newline(const UChar* p, const UChar* end,
-		       OnigEncoding enc)
-{
-  if (p + 1 < end) {
-    if (*(p+1) == 0x0a && *p == 0x00)
-      return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *(p+1) == 0x0d ||
-#endif
-	 *(p+1) == 0x85) && *p == 0x00)
-      return 1;
-    if (*p == 0x20 && (*(p+1) == 0x29 || *(p+1) == 0x28))
-      return 1;
-#endif
-  }
-  return 0;
-}
-
-static OnigCodePoint
-utf16be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
-		    OnigEncoding enc)
-{
-  OnigCodePoint code;
-
-  if (UTF16_IS_SURROGATE_FIRST(*p)) {
-    code = ((((p[0] - 0xd8) << 2) + ((p[1] & 0xc0) >> 6) + 1) << 16)
-         + ((((p[1] & 0x3f) << 2) + (p[2] - 0xdc)) << 8)
-         + p[3];
-  }
-  else {
-    code = p[0] * 256 + p[1];
-  }
-  return code;
-}
-
-static int
-utf16be_code_to_mbclen(OnigCodePoint code,
-		       OnigEncoding enc)
-{
-  return (code > 0xffff ? 4 : 2);
-}
-
-static int
-utf16be_code_to_mbc(OnigCodePoint code, UChar *buf,
-		    OnigEncoding enc)
-{
-  UChar* p = buf;
-
-  if (code > 0xffff) {
-    unsigned int high = (code >> 10) + 0xD7C0;
-    unsigned int low = (code & 0x3FF) + 0xDC00;
-    *p++ = (high >> 8) & 0xFF;
-    *p++ = high & 0xFF;
-    *p++ = (low >> 8) & 0xFF;
-    *p++ = low & 0xFF;
-    return 4;
-  }
-  else {
-    *p++ = (UChar )((code & 0xff00) >> 8);
-    *p++ = (UChar )(code & 0xff);
-    return 2;
-  }
-}
-
-static int
-utf16be_mbc_case_fold(OnigCaseFoldType flag,
-		      const UChar** pp, const UChar* end, UChar* fold,
-		      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_ASCII_CODE(*(p+1)) && *p == 0) {
-    p++;
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-      if (*p == 0x49) {
-	*fold++ = 0x01;
-	*fold   = 0x31;
-	(*pp) += 2;
-	return 2;
-      }
-    }
-#endif
-
-    *fold++ = 0;
-    *fold   = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    *pp += 2;
-    return 2;
-  }
-  else
-    return onigenc_unicode_mbc_case_fold(enc, flag,
-					 pp, end, fold);
-}
-
-#if 0
-static int
-utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  const UChar* p = *pp;
-
-  (*pp) += EncLen_UTF16[*p];
-
-  if (*p == 0) {
-    int c, v;
-
-    p++;
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-      return TRUE;
-    }
-
-    c = *p;
-    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
-		(BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-
-    if ((v | BIT_CTYPE_LOWER) != 0) {
-      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-      if (c >= 0xaa && c <= 0xba)
-	return FALSE;
-      else
-	return TRUE;
-    }
-    return (v != 0 ? TRUE : FALSE);
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-utf16be_left_adjust_char_head(const UChar* start, const UChar* s,
-			      OnigEncoding enc ARG_UNUSED)
-{
-  if (s <= start) return (UChar* )s;
-
-  if ((s - start) % 2 == 1) {
-    s--;
-  }
-
-  if (UTF16_IS_SURROGATE_SECOND(*s) && s > start + 1)
-    s -= 2;
-
-  return (UChar* )s;
-}
-
-static int
-utf16be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				   const OnigUChar* p, const OnigUChar* end,
-				   OnigCaseFoldCodeItem items[],
-				   OnigEncoding enc)
-{
-  return onigenc_unicode_get_case_fold_codes_by_str(enc,
-						    flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_16be, UTF_16BE) = {
-  utf16be_mbc_enc_len,
-  "UTF-16BE",   /* name */
-  4,            /* max byte length */
-  2,            /* min byte length */
-  utf16be_is_mbc_newline,
-  utf16be_mbc_to_code,
-  utf16be_code_to_mbclen,
-  utf16be_code_to_mbc,
-  utf16be_mbc_case_fold,
-  onigenc_unicode_apply_all_case_fold,
-  utf16be_get_case_fold_codes_by_str,
-  onigenc_unicode_property_name_to_ctype,
-  onigenc_unicode_is_code_ctype,
-  onigenc_utf16_32_get_ctype_code_range,
-  utf16be_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-2BE", "UTF-16BE")
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
deleted file mode 100644
index c3712f4e18..0000000000
--- a/enc/utf_16le.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/**********************************************************************
-  utf_16le.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define UTF16_IS_SURROGATE_FIRST(c)    (((c) & 0xfc) == 0xd8)
-#define UTF16_IS_SURROGATE_SECOND(c)   (((c) & 0xfc) == 0xdc)
-#define UTF16_IS_SURROGATE(c)          (((c) & 0xf8) == 0xd8)
-
-static const int EncLen_UTF16[] = {
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-};
-
-static int
-utf16le_mbc_enc_len(const UChar* p, const OnigUChar* e,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  int len = e-p, byte;
-  if (len < 2)
-    return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
-  byte = p[1];
-  if (!UTF16_IS_SURROGATE(byte)) {
-    return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2);
-  }
-  if (UTF16_IS_SURROGATE_FIRST(byte)) {
-    if (len < 4)
-      return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(4-len);
-    if (UTF16_IS_SURROGATE_SECOND(p[3]))
-      return ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4);
-  }
-  return ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-utf16le_is_mbc_newline(const UChar* p, const UChar* end,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  if (p + 1 < end) {
-    if (*p == 0x0a && *(p+1) == 0x00)
-      return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *p == 0x0d ||
-#endif
-	 *p == 0x85) && *(p+1) == 0x00)
-      return 1;
-    if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28))
-      return 1;
-#endif
-  }
-  return 0;
-}
-
-static OnigCodePoint
-utf16le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  OnigCodePoint code;
-  UChar c0 = *p;
-  UChar c1 = *(p+1);
-
-  if (UTF16_IS_SURROGATE_FIRST(c1)) {
-    code = ((((c1 - 0xd8) << 2) + ((c0  & 0xc0) >> 6) + 1) << 16)
-         + ((((c0 & 0x3f) << 2) + (p[3] - 0xdc)) << 8)
-         + p[2];
-  }
-  else {
-    code = c1 * 256 + p[0];
-  }
-  return code;
-}
-
-static int
-utf16le_code_to_mbclen(OnigCodePoint code,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  return (code > 0xffff ? 4 : 2);
-}
-
-static int
-utf16le_code_to_mbc(OnigCodePoint code, UChar *buf,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  UChar* p = buf;
-
-  if (code > 0xffff) {
-    unsigned int high = (code >> 10) + 0xD7C0;
-    unsigned int low = (code & 0x3FF) + 0xDC00;
-    *p++ = high & 0xFF;
-    *p++ = (high >> 8) & 0xFF;
-    *p++ = low & 0xFF;
-    *p++ = (low >> 8) & 0xFF;
-    return 4;
-  }
-  else {
-    *p++ = (UChar )(code & 0xff);
-    *p++ = (UChar )((code & 0xff00) >> 8);
-    return 2;
-  }
-}
-
-static int
-utf16le_mbc_case_fold(OnigCaseFoldType flag,
-		      const UChar** pp, const UChar* end, UChar* fold,
-		      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-      if (*p == 0x49) {
-	*fold++ = 0x31;
-	*fold   = 0x01;
-	(*pp) += 2;
-	return 2;
-      }
-    }
-#endif
-
-    *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    *fold   = 0;
-    *pp += 2;
-    return 2;
-  }
-  else
-    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
-					 end, fold);
-}
-
-#if 0
-static int
-utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
-			 const UChar* end)
-{
-  const UChar* p = *pp;
-
-  (*pp) += EncLen_UTF16[*(p+1)];
-
-  if (*(p+1) == 0) {
-    int c, v;
-
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-      return TRUE;
-    }
-
-    c = *p;
-    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
-                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-    if ((v | BIT_CTYPE_LOWER) != 0) {
-      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-      if (c >= 0xaa && c <= 0xba)
-	return FALSE;
-      else
-	return TRUE;
-    }
-    return (v != 0 ? TRUE : FALSE);
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-utf16le_left_adjust_char_head(const UChar* start, const UChar* s,
-			      OnigEncoding enc ARG_UNUSED)
-{
-  if (s <= start) return (UChar* )s;
-
-  if ((s - start) % 2 == 1) {
-    s--;
-  }
-
-  if (UTF16_IS_SURROGATE_SECOND(*(s+1)) && s > start + 1)
-    s -= 2;
-
-  return (UChar* )s;
-}
-
-static int
-utf16le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				   const OnigUChar* p, const OnigUChar* end,
-				   OnigCaseFoldCodeItem items[],
-				   OnigEncoding enc)
-{
-  return onigenc_unicode_get_case_fold_codes_by_str(enc,
-						    flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_16le, UTF_16LE) = {
-  utf16le_mbc_enc_len,
-  "UTF-16LE",   /* name */
-  4,            /* max byte length */
-  2,            /* min byte length */
-  utf16le_is_mbc_newline,
-  utf16le_mbc_to_code,
-  utf16le_code_to_mbclen,
-  utf16le_code_to_mbc,
-  utf16le_mbc_case_fold,
-  onigenc_unicode_apply_all_case_fold,
-  utf16le_get_case_fold_codes_by_str,
-  onigenc_unicode_property_name_to_ctype,
-  onigenc_unicode_is_code_ctype,
-  onigenc_utf16_32_get_ctype_code_range,
-  utf16le_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
-};
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
deleted file mode 100644
index ed6c9b7f3b..0000000000
--- a/enc/utf_32be.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/**********************************************************************
-  utf_32be.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static int
-utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return 4;
-}
-
-static int
-utf32be_is_mbc_newline(const UChar* p, const UChar* end,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  if (p + 3 < end) {
-    if (*(p+3) == 0x0a && *(p+2) == 0 && *(p+1) == 0 && *p == 0)
-      return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *(p+3) == 0x0d ||
-#endif
-	 *(p+3) == 0x85)
-	&& *(p+2) == 0 && *(p+1) == 0 && *p == 0x00)
-      return 1;
-    if (*(p+2) == 0x20 && (*(p+3) == 0x29 || *(p+3) == 0x28)
-	&& *(p+1) == 0 && *p == 0)
-      return 1;
-#endif
-  }
-  return 0;
-}
-
-static OnigCodePoint
-utf32be_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return (OnigCodePoint )(((p[0] * 256 + p[1]) * 256 + p[2]) * 256 + p[3]);
-}
-
-static int
-utf32be_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  return 4;
-}
-
-static int
-utf32be_code_to_mbc(OnigCodePoint code, UChar *buf,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  UChar* p = buf;
-
-  *p++ = (UChar )((code & 0xff000000) >>24);
-  *p++ = (UChar )((code & 0xff0000)   >>16);
-  *p++ = (UChar )((code & 0xff00)     >> 8);
-  *p++ = (UChar ) (code & 0xff);
-  return 4;
-}
-
-static int
-utf32be_mbc_case_fold(OnigCaseFoldType flag,
-		      const UChar** pp, const UChar* end, UChar* fold,
-		      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_ASCII_CODE(*(p+3)) && *(p+2) == 0 && *(p+1) == 0 && *p == 0) {
-    *fold++ = 0;
-    *fold++ = 0;
-
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-      if (*(p+3) == 0x49) {
-	*fold++ = 0x01;
-	*fold   = 0x31;
-	(*pp) += 4;
-	return 4;
-      }
-    }
-#endif
-
-    *fold++ = 0;
-    *fold   = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*(p+3));
-    *pp += 4;
-    return 4;
-  }
-  else
-    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
-					 end, fold);
-}
-
-#if 0
-static int
-utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  const UChar* p = *pp;
-
-  (*pp) += 4;
-
-  if (*(p+2) == 0 && *(p+1) == 0 && *p == 0) {
-    int c, v;
-
-    p += 3;
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-      return TRUE;
-    }
-
-    c = *p;
-    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
-                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-    if ((v | BIT_CTYPE_LOWER) != 0) {
-      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-      if (c >= 0xaa && c <= 0xba)
-	return FALSE;
-      else
-	return TRUE;
-    }
-    return (v != 0 ? TRUE : FALSE);
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-utf32be_left_adjust_char_head(const UChar* start, const UChar* s,
-			      OnigEncoding enc ARG_UNUSED)
-{
-  int rem;
-
-  if (s <= start) return (UChar* )s;
-
-  rem = (s - start) % 4;
-  return (UChar* )(s - rem);
-}
-
-static int
-utf32be_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				   const OnigUChar* p, const OnigUChar* end,
-				   OnigCaseFoldCodeItem items[],
-				   OnigEncoding enc)
-{
-  return onigenc_unicode_get_case_fold_codes_by_str(enc,
-						    flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_32be, UTF_32BE) = {
-  utf32be_mbc_enc_len,
-  "UTF-32BE",   /* name */
-  4,            /* max byte length */
-  4,            /* min byte length */
-  utf32be_is_mbc_newline,
-  utf32be_mbc_to_code,
-  utf32be_code_to_mbclen,
-  utf32be_code_to_mbc,
-  utf32be_mbc_case_fold,
-  onigenc_unicode_apply_all_case_fold,
-  utf32be_get_case_fold_codes_by_str,
-  onigenc_unicode_property_name_to_ctype,
-  onigenc_unicode_is_code_ctype,
-  onigenc_utf16_32_get_ctype_code_range,
-  utf32be_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-4BE", "UTF-32BE")
-
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
deleted file mode 100644
index 53e3522070..0000000000
--- a/enc/utf_32le.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/**********************************************************************
-  utf_32le.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-static int
-utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return 4;
-}
-
-static int
-utf32le_is_mbc_newline(const UChar* p, const UChar* end,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  if (p + 3 < end) {
-    if (*p == 0x0a && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0)
-      return 1;
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-    if ((
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-	 *p == 0x0d ||
-#endif
-	 *p == 0x85)
-	&& *(p+1) == 0x00 && (p+2) == 0x00 && *(p+3) == 0x00)
-      return 1;
-    if (*(p+1) == 0x20 && (*p == 0x29 || *p == 0x28)
-	&& *(p+2) == 0x00 && *(p+3) == 0x00)
-      return 1;
-#endif
-  }
-  return 0;
-}
-
-static OnigCodePoint
-utf32le_mbc_to_code(const UChar* p, const UChar* end ARG_UNUSED,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  return (OnigCodePoint )(((p[3] * 256 + p[2]) * 256 + p[1]) * 256 + p[0]);
-}
-
-static int
-utf32le_code_to_mbclen(OnigCodePoint code ARG_UNUSED,
-		       OnigEncoding enc ARG_UNUSED)
-{
-  return 4;
-}
-
-static int
-utf32le_code_to_mbc(OnigCodePoint code, UChar *buf,
-		    OnigEncoding enc ARG_UNUSED)
-{
-  UChar* p = buf;
-
-  *p++ = (UChar ) (code & 0xff);
-  *p++ = (UChar )((code & 0xff00)     >> 8);
-  *p++ = (UChar )((code & 0xff0000)   >>16);
-  *p++ = (UChar )((code & 0xff000000) >>24);
-  return 4;
-}
-
-static int
-utf32le_mbc_case_fold(OnigCaseFoldType flag,
-		      const UChar** pp, const UChar* end, UChar* fold,
-		      OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_ASCII_CODE(*p) && *(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-      if (*p == 0x49) {
-	*fold++ = 0x31;
-	*fold++ = 0x01;
-      }
-    }
-    else {
-#endif
-      *fold++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-      *fold++ = 0;
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    }
-#endif
-
-    *fold++ = 0;
-    *fold   = 0;
-    *pp += 4;
-    return 4;
-  }
-  else
-    return onigenc_unicode_mbc_case_fold(enc, flag, pp,
-					 end, fold);
-}
-
-#if 0
-static int
-utf32le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
-{
-  const UChar* p = *pp;
-
-  (*pp) += 4;
-
-  if (*(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
-    int c, v;
-
-    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-      return TRUE;
-    }
-
-    c = *p;
-    v = ONIGENC_IS_UNICODE_ISO_8859_1_BIT_CTYPE(c,
-                       (BIT_CTYPE_UPPER | BIT_CTYPE_LOWER));
-    if ((v | BIT_CTYPE_LOWER) != 0) {
-      /* 0xaa, 0xb5, 0xba are lower case letter, but can't convert. */
-      if (c >= 0xaa && c <= 0xba)
-	return FALSE;
-      else
-	return TRUE;
-    }
-    return (v != 0 ? TRUE : FALSE);
-  }
-
-  return FALSE;
-}
-#endif
-
-static UChar*
-utf32le_left_adjust_char_head(const UChar* start, const UChar* s,
-			      OnigEncoding enc ARG_UNUSED)
-{
-  int rem;
-
-  if (s <= start) return (UChar* )s;
-
-  rem = (s - start) % 4;
-  return (UChar* )(s - rem);
-}
-
-static int
-utf32le_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-				   const OnigUChar* p, const OnigUChar* end,
-				   OnigCaseFoldCodeItem items[],
-				   OnigEncoding enc)
-{
-  return onigenc_unicode_get_case_fold_codes_by_str(enc,
-						    flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_32le, UTF_32LE) = {
-  utf32le_mbc_enc_len,
-  "UTF-32LE",   /* name */
-  4,            /* max byte length */
-  4,            /* min byte length */
-  utf32le_is_mbc_newline,
-  utf32le_mbc_to_code,
-  utf32le_code_to_mbclen,
-  utf32le_code_to_mbc,
-  utf32le_mbc_case_fold,
-  onigenc_unicode_apply_all_case_fold,
-  utf32le_get_case_fold_codes_by_str,
-  onigenc_unicode_property_name_to_ctype,
-  onigenc_unicode_is_code_ctype,
-  onigenc_utf16_32_get_ctype_code_range,
-  utf32le_left_adjust_char_head,
-  onigenc_always_false_is_allowed_reverse_match
-};
-ENC_ALIAS("UCS-4LE", "UTF-32LE")
diff --git a/enc/utf_7.h b/enc/utf_7.h
deleted file mode 100644
index fa9f06b1b3..0000000000
--- a/enc/utf_7.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, statefull encoding */
-ENC_DUMMY("UTF-7");
-ENC_ALIAS("CP65000", "UTF-7");
-
diff --git a/enc/utf_8.c b/enc/utf_8.c
deleted file mode 100644
index b8ee92feb4..0000000000
--- a/enc/utf_8.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/**********************************************************************
-  utf_8.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define USE_INVALID_CODE_SCHEME
-
-#ifdef USE_INVALID_CODE_SCHEME
-/* virtual codepoint values for invalid encoding byte 0xfe and 0xff */
-#define INVALID_CODE_FE   0xfffffffe
-#define INVALID_CODE_FF   0xffffffff
-#define VALID_CODE_LIMIT  0x7fffffff
-#endif
-
-#define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
-
-static const int EncLen_UTF8[] = {
-  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, 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, 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, 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,
-  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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-  4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-};
-
-typedef enum {
-  FAILURE = -2,
-  ACCEPT,
-  S0, S1, S2, S3,
-  S4, S5, S6, S7
-} state_t;
-#define A ACCEPT
-#define F FAILURE
-static const signed char trans[][0x100] = {
-  { /* S0   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 1 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 2 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 3 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 4 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 5 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 6 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 7 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* c */ F, F, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* e */ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3,
-    /* f */ 5, 6, 6, 6, 7, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S1   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* 9 */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* a */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* b */ A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S2   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S3   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* b */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S4   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* 9 */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S5   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S6   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* 9 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* a */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* b */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-  { /* S7   0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f */
-    /* 0 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 1 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 2 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 3 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 4 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 5 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 6 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 7 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* 8 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    /* 9 */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* a */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* b */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* c */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* d */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* e */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F,
-    /* f */ F, F, F, F, F, F, F, F, F, F, F, F, F, F, F, F 
-  },
-};
-#undef A
-#undef F
-
-static int
-mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
-{
-  int firstbyte = *p++;
-  state_t s;
-  s = trans[0][firstbyte];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(1) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-1);
-  s = trans[s][*p++];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(2) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-2);
-  s = trans[s][*p++];
-  if (s < 0) return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(3) :
-                                  ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-
-  if (p == e) return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(EncLen_UTF8[firstbyte]-3);
-  s = trans[s][*p++];
-  return s == ACCEPT ? ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(4) :
-                       ONIGENC_CONSTRUCT_MBCLEN_INVALID();
-}
-
-static int
-is_mbc_newline(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  if (p < end) {
-    if (*p == 0x0a) return 1;
-
-#ifdef USE_UNICODE_ALL_LINE_TERMINATORS
-#ifndef USE_CRNL_AS_LINE_TERMINATOR
-    if (*p == 0x0d) return 1;
-#endif
-    if (p + 1 < end) {
-      if (*(p+1) == 0x85 && *p == 0xc2) /* U+0085 */
-	return 1;
-      if (p + 2 < end) {
-	if ((*(p+2) == 0xa8 || *(p+2) == 0xa9)
-	    && *(p+1) == 0x80 && *p == 0xe2)  /* U+2028, U+2029 */
-	  return 1;
-      }
-    }
-#endif
-  }
-
-  return 0;
-}
-
-static OnigCodePoint
-mbc_to_code(const UChar* p, const UChar* end, OnigEncoding enc)
-{
-  int c, len;
-  OnigCodePoint n;
-
-  len = enclen(enc, p, end);
-  c = *p++;
-  if (len > 1) {
-    len--;
-    n = c & ((1 << (6 - len)) - 1);
-    while (len--) {
-      c = *p++;
-      n = (n << 6) | (c & ((1 << 6) - 1));
-    }
-    return n;
-  }
-  else {
-#ifdef USE_INVALID_CODE_SCHEME
-    if (c > 0xfd) {
-      return ((c == 0xfe) ? INVALID_CODE_FE : INVALID_CODE_FF);
-    }
-#endif
-    return (OnigCodePoint )c;
-  }
-}
-
-static int
-code_to_mbclen(OnigCodePoint code, OnigEncoding enc ARG_UNUSED)
-{
-  if      ((code & 0xffffff80) == 0) return 1;
-  else if ((code & 0xfffff800) == 0) return 2;
-  else if ((code & 0xffff0000) == 0) return 3;
-  else if ((code & 0xffe00000) == 0) return 4;
-  else if ((code & 0xfc000000) == 0) return 5;
-  else if ((code & 0x80000000) == 0) return 6;
-#ifdef USE_INVALID_CODE_SCHEME
-  else if (code == INVALID_CODE_FE) return 1;
-  else if (code == INVALID_CODE_FF) return 1;
-#endif
-  else
-    return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-}
-
-static int
-code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
-{
-#define UTF8_TRAILS(code, shift) (UChar )((((code) >> (shift)) & 0x3f) | 0x80)
-#define UTF8_TRAIL0(code)        (UChar )(((code) & 0x3f) | 0x80)
-
-  if ((code & 0xffffff80) == 0) {
-    *buf = (UChar )code;
-    return 1;
-  }
-  else {
-    UChar *p = buf;
-
-    if ((code & 0xfffff800) == 0) {
-      *p++ = (UChar )(((code>>6)& 0x1f) | 0xc0);
-    }
-    else if ((code & 0xffff0000) == 0) {
-      *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
-      *p++ = UTF8_TRAILS(code, 6);
-    }
-    else if ((code & 0xffe00000) == 0) {
-      *p++ = (UChar )(((code>>18) & 0x07) | 0xf0);
-      *p++ = UTF8_TRAILS(code, 12);
-      *p++ = UTF8_TRAILS(code,  6);
-    }
-    else if ((code & 0xfc000000) == 0) {
-      *p++ = (UChar )(((code>>24) & 0x03) | 0xf8);
-      *p++ = UTF8_TRAILS(code, 18);
-      *p++ = UTF8_TRAILS(code, 12);
-      *p++ = UTF8_TRAILS(code,  6);
-    }
-    else if ((code & 0x80000000) == 0) {
-      *p++ = (UChar )(((code>>30) & 0x01) | 0xfc);
-      *p++ = UTF8_TRAILS(code, 24);
-      *p++ = UTF8_TRAILS(code, 18);
-      *p++ = UTF8_TRAILS(code, 12);
-      *p++ = UTF8_TRAILS(code,  6);
-    }
-#ifdef USE_INVALID_CODE_SCHEME
-    else if (code == INVALID_CODE_FE) {
-      *p = 0xfe;
-      return 1;
-    }
-    else if (code == INVALID_CODE_FF) {
-      *p = 0xff;
-      return 1;
-    }
-#endif
-    else {
-      return ONIGERR_TOO_BIG_WIDE_CHAR_VALUE;
-    }
-
-    *p++ = UTF8_TRAIL0(code);
-    return p - buf;
-  }
-}
-
-static int
-mbc_case_fold(OnigCaseFoldType flag, const UChar** pp,
-		   const UChar* end, UChar* fold, OnigEncoding enc)
-{
-  const UChar* p = *pp;
-
-  if (ONIGENC_IS_MBC_ASCII(p)) {
-#ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
-    if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-      if (*p == 0x49) {
-	*fold++ = 0xc4;
-	*fold   = 0xb1;
-	(*pp)++;
-	return 2;
-      }
-    }
-#endif
-
-    *fold = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-    (*pp)++;
-    return 1; /* return byte length of converted char to lower */
-  }
-  else {
-    return onigenc_unicode_mbc_case_fold(enc, flag, pp, end, fold);
-  }
-}
-
-
-static int
-get_ctype_code_range(OnigCtype ctype, OnigCodePoint *sb_out,
-			  const OnigCodePoint* ranges[], OnigEncoding enc ARG_UNUSED)
-{
-  *sb_out = 0x80;
-  return onigenc_unicode_ctype_code_range(ctype, ranges);
-}
-
-
-static UChar*
-left_adjust_char_head(const UChar* start, const UChar* s, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar *p;
-
-  if (s <= start) return (UChar* )s;
-  p = s;
-
-  while (!utf8_islead(*p) && p > start) p--;
-  return (UChar* )p;
-}
-
-static int
-get_case_fold_codes_by_str(OnigCaseFoldType flag,
-    const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[],
-    OnigEncoding enc)
-{
-  return onigenc_unicode_get_case_fold_codes_by_str(enc, flag, p, end, items);
-}
-
-OnigEncodingDefine(utf_8, UTF_8) = {
-  mbc_enc_len,
-  "UTF-8",     /* name */
-  6,           /* max byte length */
-  1,           /* min byte length */
-  is_mbc_newline,
-  mbc_to_code,
-  code_to_mbclen,
-  code_to_mbc,
-  mbc_case_fold,
-  onigenc_unicode_apply_all_case_fold,
-  get_case_fold_codes_by_str,
-  onigenc_unicode_property_name_to_ctype,
-  onigenc_unicode_is_code_ctype,
-  get_ctype_code_range,
-  left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-ENC_ALIAS("CP65001", "UTF-8")
-
-/*
- * Name: UTF8-MAC
- * Link: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/BPFileSystem.html
- * Link: http://developer.apple.com/qa/qa2001/qa1235.html
- * Link: http://developer.apple.com/jp/qa/qa2001/qa1235.html
- */
-ENC_REPLICATE("UTF8-MAC", "UTF-8")
-ENC_ALIAS("UTF-8-MAC", "UTF8-MAC")
-
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
deleted file mode 100644
index 1cb4da4960..0000000000
--- a/enc/windows_1251.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/**********************************************************************
-  cp1251.c -  Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
- *                          K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "regenc.h"
-
-#define ENC_CP1251_TO_LOWER_CASE(c) EncCP1251_ToLowerCaseTable[c]
-#define ENC_IS_CP1251_CTYPE(code,ctype) \
-  ((EncCP1251_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1251_ToLowerCaseTable[256] = {
-  '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-  '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-  '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-  '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-  '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-  '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-  '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-  '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-  '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-  '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-  '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-  '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-  '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-  '\220', '\203', '\202', '\203', '\204', '\205', '\206', '\207',
-  '\210', '\211', '\232', '\213', '\234', '\235', '\236', '\237',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\242', '\242', '\274', '\244', '\264', '\246', '\247',
-  '\270', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
-  '\260', '\261', '\263', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\274', '\276', '\276', '\277',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
-  '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-  '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-  '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-  '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377'
-};
-
-static const unsigned short EncCP1251_CtypeTable[256] = {
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x428c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
-  0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
-  0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
-  0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
-  0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
-  0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
-  0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
-  0x34a2, 0x34a2, 0x01a0, 0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
-  0x0000, 0x01a0, 0x34a2, 0x01a0, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x30e2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x01a0,
-  0x0008, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x0280, 0x34a2, 0x30e2, 0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0,
-  0x34a2, 0x01a0, 0x34a2, 0x01a0, 0x01a0, 0x01a0, 0x01a0, 0x34a2,
-  0x01a0, 0x01a0, 0x34a2, 0x30e2, 0x30e2, 0x31e2, 0x01a0, 0x01a0,
-  0x30e2, 0x0000, 0x30e2, 0x01a0, 0x30e2, 0x34a2, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
-};
-
-static int
-cp1251_mbc_case_fold(OnigCaseFoldType flag ARG_UNUSED,
-             const UChar** pp, const UChar* end ARG_UNUSED, UChar* lower, OnigEncoding enc ARG_UNUSED)
-{
-  const UChar* p = *pp;
-
-  *lower = ENC_CP1251_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-static int
-cp1251_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_CP1251_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0xb8, 0xa8 },
-
-  { 0xe0, 0xc0 },
-  { 0xe1, 0xc1 },
-  { 0xe2, 0xc2 },
-  { 0xe3, 0xc3 },
-  { 0xe4, 0xc4 },
-  { 0xe5, 0xc5 },
-  { 0xe6, 0xc6 },
-  { 0xe7, 0xc7 },
-  { 0xe8, 0xc8 },
-  { 0xe9, 0xc9 },
-  { 0xea, 0xca },
-  { 0xeb, 0xcb },
-  { 0xec, 0xcc },
-  { 0xed, 0xcd },
-  { 0xee, 0xce },
-  { 0xef, 0xcf },
-
-  { 0xf0, 0xd0 },
-  { 0xf1, 0xd1 },
-  { 0xf2, 0xd2 },
-  { 0xf3, 0xd3 },
-  { 0xf4, 0xd4 },
-  { 0xf5, 0xd5 },
-  { 0xf6, 0xd6 },
-  { 0xf7, 0xd7 },
-  { 0xf8, 0xd8 },
-  { 0xf9, 0xd9 },
-  { 0xfa, 0xda },
-  { 0xfb, 0xdb },
-  { 0xfc, 0xdc },
-  { 0xfd, 0xdd },
-  { 0xfe, 0xde },
-  { 0xff, 0xdf }
-};
-
-static int
-cp1251_apply_all_case_fold(OnigCaseFoldType flag,
-			       OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-             flag, f, arg);
-}
-
-static int
-cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
-    const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
-{
-  return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-OnigEncodingDefine(windows_1251, Windows_1251) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1251",      /* name */
-  1,             /* max enc length */
-  1,             /* min enc length */
-  onigenc_is_mbc_newline_0x0a,
-  onigenc_single_byte_mbc_to_code,
-  onigenc_single_byte_code_to_mbclen,
-  onigenc_single_byte_code_to_mbc,
-  cp1251_mbc_case_fold,
-  cp1251_apply_all_case_fold,
-  cp1251_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  cp1251_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
-};
-/*
- * Name: windows-1251
- * MIBenum: 2251
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1251.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1251
- */
-ENC_ALIAS("CP1251", "Windows-1251")
diff --git a/encoding.c b/encoding.c
deleted file mode 100644
index db6cd31ec9..0000000000
--- a/encoding.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-/**********************************************************************
-
-  encoding.c -
-
-  $Author$
-  created at: Thu May 24 17:23:27 JST 2007
-
-  Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
-#include "regenc.h"
-#include <ctype.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
-static ID id_encoding, id_base_encoding;
-VALUE rb_cEncoding;
-static VALUE rb_encoding_list;
-
-struct rb_encoding_entry {
-    const char *name;
-    rb_encoding *enc;
-    rb_encoding *base;
-};
-
-static struct {
-    struct rb_encoding_entry *list;
-    int count;
-    int size;
-    st_table *names;
-} enc_table;
-
-void rb_enc_init(void);
-
-#define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
-
-#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
-
-static int load_encoding(const char *name);
-static VALUE enc_base_encoding(VALUE self);
-
-static void
-enc_mark(void *ptr)
-{
-}
-
-static VALUE
-enc_new(rb_encoding *encoding)
-{
-    return Data_Wrap_Struct(rb_cEncoding, enc_mark, 0, encoding);
-}
-
-VALUE
-rb_enc_from_encoding(rb_encoding *encoding)
-{
-    VALUE list, enc;
-    int idx;
-
-    if (!encoding) return Qnil;
-    idx = ENC_TO_ENCINDEX(encoding);
-    if (!(list = rb_encoding_list)) {
-	rb_bug("rb_enc_from_encoding(%d\"%s\"): no rb_encoding_list",
-	       idx, rb_enc_name(encoding));
-    }
-    enc = rb_ary_entry(list, idx);
-    if (NIL_P(enc)) {
-	rb_bug("rb_enc_from_encoding(%d\"%s\"): not created yet",
-	       idx, rb_enc_name(encoding));
-    }
-    return enc;
-}
-
-static int enc_autoload(rb_encoding *);
-
-static int
-check_encoding(rb_encoding *enc)
-{
-    int index = rb_enc_to_index(enc);
-    if (rb_enc_from_index(index) != enc)
-	return -1;
-    if (enc_autoload_p(enc)) {
-	index = enc_autoload(enc);
-    }
-    return index;
-}
-
-static int
-enc_check_encoding(VALUE obj)
-{
-    if (SPECIAL_CONST_P(obj) || BUILTIN_TYPE(obj) != T_DATA ||
-	RDATA(obj)->dmark != enc_mark) {
-	return -1;
-    }
-    return check_encoding(RDATA(obj)->data);
-}
-
-static int
-must_encoding(VALUE enc)
-{
-    int index = enc_check_encoding(enc);
-    if (index < 0) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Encoding)",
-		 rb_obj_classname(enc));
-    }
-    return index;
-}
-
-int
-rb_to_encoding_index(VALUE enc)
-{
-    int idx;
-
-    idx = enc_check_encoding(enc);
-    if (idx >= 0) {
-	return idx;
-    }
-    else if (NIL_P(enc = rb_check_string_type(enc))) {
-	return -1;
-    }
-    else {
-	return rb_enc_find_index(StringValueCStr(enc));
-    }
-}
-
-rb_encoding *
-rb_to_encoding(VALUE enc)
-{
-    int idx;
-
-    idx = enc_check_encoding(enc);
-    if (idx >= 0) return RDATA(enc)->data;
-    if ((idx = rb_enc_find_index(StringValueCStr(enc))) < 0) {
-	rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
-    }
-    return rb_enc_from_index(idx);
-}
-
-void
-rb_gc_mark_encodings(void)
-{
-}
-
-static int
-enc_table_expand(int newsize)
-{
-    struct rb_encoding_entry *ent;
-    int count = newsize;
-
-    if (enc_table.size >= newsize) return newsize;
-    newsize = (newsize + 7) / 8 * 8;
-    ent = realloc(enc_table.list, sizeof(*enc_table.list) * newsize);
-    if (!ent) return -1;
-    memset(ent + enc_table.size, 0, sizeof(*ent)*(newsize - enc_table.size));
-    enc_table.list = ent;
-    enc_table.size = newsize;
-    return count;
-}
-
-static int
-enc_register_at(int index, const char *name, rb_encoding *encoding)
-{
-    struct rb_encoding_entry *ent = &enc_table.list[index];
-    VALUE list;
-
-    if (!ent->name) {
-	ent->name = name = strdup(name);
-    }
-    else if (STRCASECMP(name, ent->name)) {
-	return -1;
-    }
-    if (!ent->enc) {
-	ent->enc = xmalloc(sizeof(rb_encoding));
-    }
-    if (encoding) {
-	*ent->enc = *encoding;
-    }
-    else {
-	memset(ent->enc, 0, sizeof(*ent->enc));
-    }
-    encoding = ent->enc;
-    encoding->name = name;
-    encoding->ruby_encoding_index = index;
-    st_insert(enc_table.names, (st_data_t)name, (st_data_t)index);
-    list = rb_encoding_list;
-    if (list && NIL_P(rb_ary_entry(list, index))) {
-	/* initialize encoding data */
-	rb_ary_store(list, index, enc_new(encoding));
-    }
-    return index;
-}
-
-static int
-enc_register(const char *name, rb_encoding *encoding)
-{
-    int index = enc_table.count;
-
-    if ((index = enc_table_expand(index + 1)) < 0) return -1;
-    enc_table.count = index;
-    return enc_register_at(index - 1, name, encoding);
-}
-
-static void set_encoding_const(const char *, rb_encoding *);
-int rb_enc_registered(const char *name);
-
-int
-rb_enc_register(const char *name, rb_encoding *encoding)
-{
-    int index = rb_enc_registered(name);
-
-    if (index >= 0) {
-	rb_encoding *oldenc = rb_enc_from_index(index);
-	if (STRCASECMP(name, rb_enc_name(oldenc))) {
-	    index = enc_register(name, encoding);
-	}
-	else if (enc_autoload_p(oldenc) || !ENC_DUMMY_P(oldenc)) {
-	    enc_register_at(index, name, encoding);
-	}
-	else {
-	    rb_raise(rb_eArgError, "encoding %s is already registered", name);
-	}
-    }
-    else {
-	index = enc_register(name, encoding);
-	set_encoding_const(name, rb_enc_from_index(index));
-    }
-    return index;
-}
-
-void
-rb_encdb_declare(const char *name)
-{
-    int idx = rb_enc_registered(name);
-    if (idx < 0) {
-	idx = enc_register(name, 0);
-    }
-    set_encoding_const(name, rb_enc_from_index(idx));
-}
-
-static void
-enc_check_duplication(const char *name)
-{
-    if (rb_enc_registered(name) >= 0) {
-	rb_raise(rb_eArgError, "encoding %s is already registered", name);
-    }
-}
-
-static rb_encoding*
-set_base_encoding(int index, rb_encoding *base)
-{
-    rb_encoding *enc = enc_table.list[index].enc;
-
-    enc_table.list[index].base = base;
-    if (rb_enc_dummy_p(base)) ENC_SET_DUMMY(enc);
-    return enc;
-}
-
-int
-rb_enc_replicate(const char *name, rb_encoding *encoding)
-{
-    int idx;
-
-    enc_check_duplication(name);
-    idx = enc_register(name, encoding);
-    set_base_encoding(idx, encoding);
-    set_encoding_const(name, rb_enc_from_index(idx));
-    return idx;
-}
-
-static int
-enc_replicate(int idx, const char *name, rb_encoding *origenc)
-{
-    if (idx < 0) {
-	idx = enc_register(name, origenc);
-    }
-    else {
-	idx = enc_register_at(idx, name, origenc);
-    }
-    if (idx >= 0) {
-	set_base_encoding(idx, origenc);
-	set_encoding_const(name, rb_enc_from_index(idx));
-    }
-    return idx;
-}
-
-int
-rb_encdb_replicate(const char *name, const char *orig)
-{
-    int origidx = rb_enc_registered(orig);
-    int idx = rb_enc_registered(name);
-
-    if (origidx < 0) {
-	origidx = enc_register(orig, 0);
-    }
-    return enc_replicate(idx, name, rb_enc_from_index(origidx));
-}
-
-int
-rb_define_dummy_encoding(const char *name)
-{
-    int index = rb_enc_replicate(name, rb_ascii8bit_encoding());
-    rb_encoding *enc = enc_table.list[index].enc;
-
-    ENC_SET_DUMMY(enc);
-    return index;
-}
-
-int
-rb_encdb_dummy(const char *name)
-{
-    int index = enc_replicate(rb_enc_registered(name), name,
-			      rb_ascii8bit_encoding());
-    rb_encoding *enc = enc_table.list[index].enc;
-
-    ENC_SET_DUMMY(enc);
-    return index;
-}
-
-/*
- * call-seq:
- *   enc.dummy? => true or false
- *
- * Returns true for dummy encodings.
- * A dummy encoding is an encoding for which character handling is not properly
- * implemented.
- * It is used for stateful encodings.
- *
- *   Encoding::ISO_2022_JP.dummy?       #=> true
- *   Encoding::UTF_8.dummy?             #=> false
- *
- */
-static VALUE
-enc_dummy_p(VALUE enc)
-{
-    return ENC_DUMMY_P(enc_table.list[must_encoding(enc)].enc) ? Qtrue : Qfalse;
-}
-
-static int
-enc_alias(const char *alias, int idx)
-{
-    alias = strdup(alias);
-    st_insert(enc_table.names, (st_data_t)alias, (st_data_t)idx);
-    set_encoding_const(alias, rb_enc_from_index(idx));
-    return idx;
-}
-
-int
-rb_enc_alias(const char *alias, const char *orig)
-{
-    int idx;
-
-    enc_check_duplication(alias);
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    if ((idx = rb_enc_find_index(orig)) < 0) {
-	return -1;
-    }
-    return enc_alias(alias, idx);
-}
-
-int
-rb_encdb_alias(const char *alias, const char *orig)
-{
-    int idx = rb_enc_registered(orig);
-
-    if (idx < 0) {
-	idx = enc_register(orig, 0);
-    }
-    return enc_alias(alias, idx);
-}
-
-enum {
-    ENCINDEX_ASCII,
-    ENCINDEX_UTF_8,
-    ENCINDEX_US_ASCII,
-    ENCINDEX_BUILTIN_MAX
-};
-
-extern rb_encoding OnigEncodingUTF_8;
-extern rb_encoding OnigEncodingUS_ASCII;
-
-void
-rb_enc_init(void)
-{
-    enc_table_expand(ENCODING_COUNT + 1);
-    if (!enc_table.names) {
-	enc_table.names = st_init_strcasetable();
-    }
-#define ENC_REGISTER(enc) enc_register_at(ENCINDEX_##enc, rb_enc_name(&OnigEncoding##enc), &OnigEncoding##enc)
-    ENC_REGISTER(ASCII);
-    ENC_REGISTER(UTF_8);
-    ENC_REGISTER(US_ASCII);
-#undef ENC_REGISTER
-    enc_table.count = ENCINDEX_BUILTIN_MAX;
-}
-
-rb_encoding *
-rb_enc_from_index(int index)
-{
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    if (index < 0 || enc_table.count <= index) {
-	return 0;
-    }
-    return enc_table.list[index].enc;
-}
-
-int
-rb_enc_registered(const char *name)
-{
-    st_data_t idx = 0;
-
-    if (!name) return -1;
-    if (!enc_table.list) return -1;
-    if (st_lookup(enc_table.names, (st_data_t)name, &idx)) {
-	return (int)idx;
-    }
-    return -1;
-}
-
-static VALUE
-require_enc(VALUE enclib)
-{
-    return rb_require_safe(enclib, rb_safe_level());
-}
-
-static int
-load_encoding(const char *name)
-{
-    VALUE enclib = rb_sprintf("enc/%s", name);
-    VALUE verbose = ruby_verbose;
-    VALUE debug = ruby_debug;
-    VALUE loaded;
-    char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib);
-    int idx;
-
-    while (s < e) {
-	if (!ISALNUM(*s)) *s = '_';
-	else if (ISUPPER(*s)) *s = TOLOWER(*s);
-	++s;
-    }
-    OBJ_FREEZE(enclib);
-    ruby_verbose = Qfalse;
-    ruby_debug = Qfalse;
-    loaded = rb_protect(require_enc, enclib, 0);
-    ruby_verbose = verbose;
-    ruby_debug = debug;
-    rb_set_errinfo(Qnil);
-    if (NIL_P(loaded)) return -1;
-    if ((idx = rb_enc_registered(name)) < 0) return -1;
-    if (enc_autoload_p(enc_table.list[idx].enc)) return -1;
-    return idx;
-}
-
-static int
-enc_autoload(rb_encoding *enc)
-{
-    int i;
-    rb_encoding *base = enc_table.list[ENC_TO_ENCINDEX(enc)].base;
-
-    if (base) {
-	i = 0;
-	do {
-	    if (i >= enc_table.count) return -1;
-	} while (enc_table.list[i].enc != base && (++i, 1));
-	if (enc_autoload_p(base)) {
-	    if (enc_autoload(base) < 0) return -1;
-	}
-	i = ENC_TO_ENCINDEX(enc);
-	enc_register_at(i, rb_enc_name(enc), base);
-    }
-    else {
-	i = load_encoding(rb_enc_name(enc));
-    }
-    return i;
-}
-
-int
-rb_enc_find_index(const char *name)
-{
-    int i = rb_enc_registered(name);
-    rb_encoding *enc;
-
-    if (i < 0) {
-	i = load_encoding(name);
-    }
-    else if (enc_autoload_p(enc = rb_enc_from_index(i))) {
-	if (enc_autoload(enc) < 0) {
-	    rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
-		    name);
-	    return 0;
-	}
-    }
-    return i;
-}
-
-rb_encoding *
-rb_enc_find(const char *name)
-{
-    int idx = rb_enc_find_index(name);
-    if (idx < 0) idx = 0;
-    return rb_enc_from_index(idx);
-}
-
-static inline int
-enc_capable(VALUE obj)
-{
-    if (SPECIAL_CONST_P(obj)) return Qfalse;
-    switch (BUILTIN_TYPE(obj)) {
-      case T_STRING:
-      case T_REGEXP:
-      case T_FILE:
-	return Qtrue;
-      case T_DATA:
-	if (RDATA(obj)->dmark == enc_mark) return Qtrue;
-      default:
-	return Qfalse;
-    }
-}
-
-ID
-rb_id_encoding(void)
-{
-    CONST_ID(id_encoding, "encoding");
-    return id_encoding;
-}
-
-int
-rb_enc_get_index(VALUE obj)
-{
-    int i;
-
-    i = ENCODING_GET_INLINED(obj);
-    if (i == ENCODING_INLINE_MAX) {
-	VALUE iv;
-
-	iv = rb_ivar_get(obj, rb_id_encoding());
-	i = NUM2INT(iv);
-    }
-    return i;
-}
-
-void
-rb_enc_set_index(VALUE obj, int idx)
-{
-    if (idx < ENCODING_INLINE_MAX) {
-	ENCODING_SET_INLINED(obj, idx);
-	return;
-    }
-    ENCODING_SET_INLINED(obj, ENCODING_INLINE_MAX);
-    rb_ivar_set(obj, rb_id_encoding(), INT2NUM(idx));
-    return;
-}
-
-VALUE
-rb_enc_associate_index(VALUE obj, int idx)
-{
-/*    enc_check_capable(obj);*/
-    if (rb_enc_get_index(obj) == idx)
-    	return obj;
-    if (!ENC_CODERANGE_ASCIIONLY(obj) ||
-	!rb_enc_asciicompat(rb_enc_from_index(idx))) {
-	ENC_CODERANGE_CLEAR(obj);
-    }
-    rb_enc_set_index(obj, idx);
-    return obj;
-}
-
-VALUE
-rb_enc_associate(VALUE obj, rb_encoding *enc)
-{
-    return rb_enc_associate_index(obj, rb_enc_to_index(enc));
-}
-
-rb_encoding*
-rb_enc_get(VALUE obj)
-{
-    return rb_enc_from_index(rb_enc_get_index(obj));
-}
-
-rb_encoding*
-rb_enc_check(VALUE str1, VALUE str2)
-{
-    rb_encoding *enc = rb_enc_compatible(str1, str2);
-    if (!enc)
-	rb_raise(rb_eArgError, "character encodings differ: %s and %s",
-		 rb_enc_name(rb_enc_get(str1)),
-		 rb_enc_name(rb_enc_get(str2)));
-    return enc;
-}
-
-rb_encoding*
-rb_enc_compatible(VALUE str1, VALUE str2)
-{
-    int idx1, idx2;
-    rb_encoding *enc1, *enc2;
-
-    idx1 = rb_enc_get_index(str1);
-    idx2 = rb_enc_get_index(str2);
-
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
-
-    if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
-    }
-    enc1 = rb_enc_from_index(idx1);
-    enc2 = rb_enc_from_index(idx2);
-
-    if (TYPE(str2) == T_STRING && RSTRING_LEN(str2) == 0)
-	return enc1;
-    if (TYPE(str1) == T_STRING && RSTRING_LEN(str1) == 0)
-	return enc2;
-    if (!rb_enc_asciicompat(enc1) || !rb_enc_asciicompat(enc2)) {
-	return 0;
-    }
-
-    if (BUILTIN_TYPE(str1) != T_STRING) {
-	VALUE tmp = str1;
-	int idx0 = idx1;
-	str1 = str2;
-	str2 = tmp;
-	idx1 = idx2;
-	idx2 = idx0;
-    }
-    if (BUILTIN_TYPE(str1) == T_STRING) {
-	int cr1, cr2;
-
-	cr1 = rb_enc_str_coderange(str1);
-	if (BUILTIN_TYPE(str2) == T_STRING) {
-	    cr2 = rb_enc_str_coderange(str2);
-	    if (cr1 != cr2) {
-		/* may need to handle ENC_CODERANGE_BROKEN */
-		if (cr1 == ENC_CODERANGE_7BIT) return enc2;
-		if (cr2 == ENC_CODERANGE_7BIT) return enc1;
-	    }
-	    if (cr2 == ENC_CODERANGE_7BIT) {
-		if (idx1 == 0) return enc2;
-		return enc1;
-	    }
-	}
-	if (cr1 == ENC_CODERANGE_7BIT)
-	    return enc2;
-    }
-    return 0;
-}
-
-void
-rb_enc_copy(VALUE obj1, VALUE obj2)
-{
-    rb_enc_associate_index(obj1, rb_enc_get_index(obj2));
-}
-
-
-/*
- *  call-seq:
- *     obj.encoding   => encoding
- *
- *  Returns the Encoding object that represents the encoding of obj.
- */
-
-VALUE
-rb_obj_encoding(VALUE obj)
-{
-    rb_encoding *enc = rb_enc_get(obj);
-    if (!enc) {
-	rb_raise(rb_eTypeError, "unknown encoding");
-    }
-    return rb_enc_from_encoding(enc);
-}
-
-int
-rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc)
-{
-    int n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
-    if (MBCLEN_CHARFOUND_P(n) && MBCLEN_CHARFOUND_LEN(n) <= e-p)
-        return MBCLEN_CHARFOUND_LEN(n);
-    else {
-        int min = rb_enc_mbminlen(enc);
-        return min <= e-p ? min : e-p;
-    }
-}
-
-int
-rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
-{
-    int n;
-    if (e <= p)
-        return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(1);
-    n = ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e);
-    if (e-p < n)
-        return ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n-(e-p));
-    return n;
-}
-
-int
-rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
-{
-    int c, l;
-    if (e <= p)
-        return -1;
-    if (rb_enc_asciicompat(enc)) {
-        c = (unsigned char)*p;
-        if (!ISASCII(c))
-            return -1;
-        if (len) *len = 1;
-        return c;
-    }
-    l = rb_enc_precise_mbclen(p, e, enc);
-    if (!MBCLEN_CHARFOUND_P(l))
-        return -1;
-    c = rb_enc_mbc_to_codepoint(p, e, enc);
-    if (!rb_enc_isascii(c, enc))
-        return -1;
-    if (len) *len = l;
-    return c;
-}
-
-int
-rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc)
-{
-    int r;
-    if (e <= p)
-        rb_raise(rb_eArgError, "empty string");
-    r = rb_enc_precise_mbclen(p, e, enc);
-    if (MBCLEN_CHARFOUND_P(r))
-        return rb_enc_mbc_to_codepoint(p, e, enc);
-    else
-	rb_raise(rb_eArgError, "invalid mbstring sequence");
-}
-
-int
-rb_enc_codelen(int c, rb_encoding *enc)
-{
-    int n = ONIGENC_CODE_TO_MBCLEN(enc,c);
-    if (n == 0) {
-	rb_raise(rb_eArgError, "invalid codepoint 0x%x", c);
-    }
-    return n;
-}
-
-int
-rb_enc_toupper(int c, rb_encoding *enc)
-{
-    return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_UPPER_CASE(c):(c));
-}
-
-int
-rb_enc_tolower(int c, rb_encoding *enc)
-{
-    return (ONIGENC_IS_ASCII_CODE(c)?ONIGENC_ASCII_CODE_TO_LOWER_CASE(c):(c));
-}
-
-/*
- * call-seq:
- *   enc.inspect => string
- *
- * Returns a string which represents the encoding for programmers.
- *
- *   Encoding::UTF_8.inspect       #=> "#<Encoding:UTF-8>"
- *   Encoding::ISO_2022_JP.inspect #=> "#<Encoding:ISO-2022-JP (dummy)>"
- */
-static VALUE
-enc_inspect(VALUE self)
-{
-    VALUE str = rb_sprintf("#<%s:%s%s>", rb_obj_classname(self),
-		      rb_enc_name((rb_encoding*)DATA_PTR(self)),
-		      (enc_dummy_p(self) ? " (dummy)" : ""));
-    ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT);
-    return str;
-}
-
-/*
- * call-seq:
- *   enc.name => string
- *
- * Returns the name of the encoding.
- *
- *   Encoding::UTF_8.name       => "UTF-8"
- */
-static VALUE
-enc_name(VALUE self)
-{
-    return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
-}
-
-static VALUE
-enc_base_encoding(VALUE self)
-{
-    rb_encoding *base = enc_table.list[must_encoding(self)].base;
-    if (!base) return Qnil;
-    return ENC_FROM_ENCODING(base);
-}
-
-/*
- * call-seq:
- *   Encoding.list => [enc1, enc2, ...]
- *
- * Returns the list of loaded encodings.
- *
- *   Encoding.list
- *   => [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
- *       #<Encoding:ISO-2022-JP (dummy)>]
- *
- *   Encoding.find("US-ASCII")
- *   => #<Encoding:US-ASCII>
- *
- *   Encoding.list
- *   => [#<Encoding:ASCII-8BIT>, #<Encoding:UTF-8>,
- *       #<Encoding:US-ASCII>, #<Encoding:ISO-2022-JP (dummy)>]
- *
- */
-static VALUE
-enc_list(VALUE klass)
-{
-    VALUE ary = rb_ary_new2(0);
-    rb_ary_replace(ary, rb_encoding_list);
-    return ary;
-}
-
-/*
- * call-seq:
- *   Encoding.find(string) => enc
- *   Encoding.find(symbol) => enc
- *
- * Search the encoding with specified <i>name</i>.
- * <i>name</i> should be a string or symbol.
- *
- *   Encoding.find("US-ASCII")  => #<Encoding:US-ASCII>
- *   Encoding.find(:Shift_JIS)  => #<Encoding:Shift_JIS>
- *
- */
-static VALUE
-enc_find(VALUE klass, VALUE enc)
-{
-    int idx;
-
-    StringValue(enc);
-    if (!rb_enc_asciicompat(rb_enc_get(enc))) {
-	rb_raise(rb_eArgError, "invalid name encoding (non ASCII)");
-    }
-    idx = rb_enc_find_index(StringValueCStr(enc));
-    if (idx < 0) {
-	rb_raise(rb_eArgError, "unknown encoding name - %s", RSTRING_PTR(enc));
-    }
-    return rb_enc_from_encoding(rb_enc_from_index(idx));
-}
-
-/*
- * call-seq:
- *   Encoding.compatible?(str1, str2) => enc or nil
- *
- * Checks the compatibility of two strings.
- * If they are compatible, means concatenatable, 
- * returns an encoding which the concatinated string will be.
- * If they are not compatible, nil is returned.
- *
- *   Encoding.compatible?("\xa1".force_encoding("iso-8859-1"), "b")
- *   => #<Encoding:ISO-8859-1>
- *
- *   Encoding.compatible?(
- *     "\xa1".force_encoding("iso-8859-1"),
- *     "\xa1\xa1".force_encoding("euc-jp"))
- *   => nil
- *
- */
-static VALUE
-enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
-{
-    rb_encoding *enc;
-
-    if (!enc_capable(str1)) return Qnil;
-    if (!enc_capable(str2)) return Qnil;
-    enc = rb_enc_compatible(str1, str2);
-    if (!enc) return Qnil;
-    return rb_enc_from_encoding(enc);
-}
-
-/* :nodoc: */
-static VALUE
-enc_dump(int argc, VALUE *argv, VALUE self)
-{
-    rb_scan_args(argc, argv, "01", 0);
-    return enc_name(self);
-}
-
-/* :nodoc: */
-static VALUE
-enc_load(VALUE klass, VALUE str)
-{
-    return enc_find(klass, str);
-}
-
-rb_encoding *
-rb_ascii8bit_encoding(void)
-{
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_ASCII].enc;
-}
-
-int
-rb_ascii8bit_encindex(void)
-{
-    return ENCINDEX_ASCII;
-}
-
-rb_encoding *
-rb_utf8_encoding(void)
-{
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_UTF_8].enc;
-}
-
-int
-rb_utf8_encindex(void)
-{
-    return ENCINDEX_UTF_8;
-}
-
-rb_encoding *
-rb_usascii_encoding(void)
-{
-    if (!enc_table.list) {
-	rb_enc_init();
-    }
-    return enc_table.list[ENCINDEX_US_ASCII].enc;
-}
-
-int
-rb_usascii_encindex(void)
-{
-    return ENCINDEX_US_ASCII;
-}
-
-rb_encoding *
-rb_locale_encoding(void)
-{
-    VALUE charmap = rb_locale_charmap(rb_cEncoding);
-    int idx;
-
-    if (NIL_P(charmap))
-        return rb_usascii_encoding();
-    else
-        idx = rb_enc_find_index(StringValueCStr(charmap));
-    if (idx < 0)
-        return rb_ascii8bit_encoding();
-
-    return rb_enc_from_index(idx);
-}
-
-rb_encoding *
-rb_filesystem_encoding(void)
-{
-    static rb_encoding *enc;
-    if (!enc) {
-#if defined _WIN32
-	enc = rb_locale_encoding();
-#elif defined __APPLE__
-	enc = rb_enc_find("UTF8-MAC");
-#else
-	enc = rb_locale_encoding();
-#endif
-    }
-    return enc;
-}
-
-static int default_external_index;
-
-rb_encoding *
-rb_default_external_encoding(void)
-{
-    return rb_enc_from_index(default_external_index);
-}
-
-VALUE
-rb_enc_default_external(void)
-{
-    return rb_enc_from_encoding(rb_default_external_encoding());
-}
-
-/*
- * call-seq:
- *   Encoding.default_external => enc
- *
- * Returns default external encoding.
- *
- * It is initialized by the locale or -E option.
- */
-static VALUE
-get_default_external(VALUE klass)
-{
-    return rb_enc_default_external();
-}
-
-void
-rb_enc_set_default_external(VALUE encoding)
-{
-    default_external_index = rb_enc_to_index(rb_to_encoding(encoding));
-}
-
-/*
- * call-seq:
- *   Encoding.locale_charmap => string
- *
- * Returns the locale charmap name.
- *
- *   Debian GNU/Linux
- *     LANG=C
- *       Encoding.locale_charmap  => "ANSI_X3.4-1968"
- *     LANG=ja_JP.EUC-JP
- *       Encoding.locale_charmap  => "EUC-JP"
- *
- *   SunOS 5
- *     LANG=C
- *       Encoding.locale_charmap  => "646"
- *     LANG=ja
- *       Encoding.locale_charmap  => "eucJP"
- *
- */
-VALUE
-rb_locale_charmap(VALUE klass)
-{
-#if defined NO_LOCALE_CHARMAP
-    return rb_usascii_str_new2("ASCII-8BIT");
-#elif defined HAVE_LANGINFO_H
-    char *codeset;
-    codeset = nl_langinfo(CODESET);
-    return rb_usascii_str_new2(codeset);
-#elif defined _WIN32
-    return rb_sprintf("CP%d", GetACP());
-#else
-    return Qnil;
-#endif
-}
-
-static void
-set_encoding_const(const char *name, rb_encoding *enc)
-{
-    VALUE encoding = rb_enc_from_encoding(enc);
-    char *s = (char *)name;
-    int haslower = 0, hasupper = 0, valid = 0;
-
-    if (ISDIGIT(*s)) return;
-    if (ISUPPER(*s)) {
-	hasupper = 1;
-	while (*++s && (ISALNUM(*s) || *s == '_')) {
-	    if (ISLOWER(*s)) haslower = 1;
-	}
-    }
-    if (!*s) {
-	valid = 1;
-	rb_define_const(rb_cEncoding, name, encoding);
-    }
-    if (!valid || haslower) {
-	int len = strlen(name) + 1;
-	if (!haslower || !hasupper) {
-	    do {
-		if (ISLOWER(*s)) haslower = 1;
-		if (ISUPPER(*s)) hasupper = 1;
-	    } while (*++s && (!haslower || !hasupper));
-	}
-	MEMCPY(s = ALLOCA_N(char, len), name, char, len);
-	name = s;
-	if (!valid) {
-	    if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
-	    for (; *s; ++s) {
-		if (!ISALNUM(*s)) *s = '_';
-	    }
-	    if (hasupper) {
-		rb_define_const(rb_cEncoding, name, encoding);
-	    }
-	}
-	if (haslower) {
-	    for (s = (char *)name; *s; ++s) {
-		if (ISLOWER(*s)) *s = ONIGENC_ASCII_CODE_TO_UPPER_CASE((int)*s);
-	    }
-	    rb_define_const(rb_cEncoding, name, encoding);
-	}
-    }
-}
-
-static int
-rb_enc_name_list_i(st_data_t name, st_data_t idx, st_data_t arg)
-{
-    VALUE ary = (VALUE)arg;
-    VALUE str = rb_usascii_str_new2((char *)name);
-    OBJ_FREEZE(str);
-    rb_ary_push(ary, str);
-    return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- *   Encoding.name_list => ["enc1", "enc2", ...]
- *
- * Returns the list of available encoding names.
- *
- *   Encoding.name_list
- *   => ["US-ASCII", "ASCII-8BIT", "UTF-8",
- *       "ISO-8859-1", "Shift_JIS", "EUC-JP",
- *       "Windows-31J",
- *       "BINARY", "CP932", "eucJP"]
- *
- * This list doesn't include dummy encodings.
- *
- */
-
-static VALUE
-rb_enc_name_list(VALUE klass)
-{
-    VALUE ary = rb_ary_new2(enc_table.names->num_entries);
-    st_foreach(enc_table.names, rb_enc_name_list_i, (st_data_t)ary);
-    return ary;
-}
-
-static int
-rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
-{
-    VALUE *p = (VALUE *)arg;
-    VALUE aliases = p[0], ary = p[1];
-    int idx = (int)orig;
-    VALUE key, str = rb_ary_entry(ary, idx);
-
-    if (NIL_P(str)) {
-	rb_encoding *enc = rb_enc_from_index(idx);
-
-	if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
-	    return ST_CONTINUE;
-	}
-	str = rb_usascii_str_new2(rb_enc_name(enc));
-	OBJ_FREEZE(str);
-	rb_ary_store(ary, idx, str);
-    }
-    key = rb_usascii_str_new2((char *)name);
-    OBJ_FREEZE(key);
-    rb_hash_aset(aliases, key, str);
-    return ST_CONTINUE;
-}
-
-/*
- * call-seq:
- *   Encoding.aliases => {"alias1" => "orig1", "alias2" => "orig2", ...}
- *
- * Returns the hash of available encoding alias and original encoding name.
- *
- *   Encoding.aliases
- *   => {"BINARY"=>"ASCII-8BIT", "ASCII"=>"US-ASCII", "ANSI_X3.4-1986"=>"US-ASCII",
- *       "SJIS"=>"Shift_JIS", "eucJP"=>"EUC-JP", "CP932"=>"Windows-31J"}
- *
- */
-
-static VALUE
-rb_enc_aliases(VALUE klass)
-{
-    VALUE aliases[2];
-    aliases[0] = rb_hash_new();
-    aliases[1] = rb_ary_new();
-    st_foreach(enc_table.names, rb_enc_aliases_enc_i, (st_data_t)aliases);
-    return aliases[0];
-}
-
-void
-Init_Encoding(void)
-{
-#undef rb_intern
-    VALUE list;
-    int i;
-
-    id_base_encoding = rb_intern("#base_encoding");
-
-    rb_cEncoding = rb_define_class("Encoding", rb_cObject);
-    rb_undef_alloc_func(rb_cEncoding);
-    rb_define_method(rb_cEncoding, "to_s", enc_name, 0);
-    rb_define_method(rb_cEncoding, "inspect", enc_inspect, 0);
-    rb_define_method(rb_cEncoding, "name", enc_name, 0);
-    rb_define_method(rb_cEncoding, "base_encoding", enc_base_encoding, 0);
-    rb_define_method(rb_cEncoding, "dummy?", enc_dummy_p, 0);
-    rb_define_singleton_method(rb_cEncoding, "list", enc_list, 0);
-    rb_define_singleton_method(rb_cEncoding, "name_list", rb_enc_name_list, 0);
-    rb_define_singleton_method(rb_cEncoding, "aliases", rb_enc_aliases, 0);
-    rb_define_singleton_method(rb_cEncoding, "find", enc_find, 1);
-    rb_define_singleton_method(rb_cEncoding, "compatible?", enc_compatible_p, 2);
-
-    rb_define_method(rb_cEncoding, "_dump", enc_dump, -1);
-    rb_define_singleton_method(rb_cEncoding, "_load", enc_load, 1);
-
-    rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0);
-    rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);
-
-    rb_gc_register_address(&rb_encoding_list);
-    list = rb_ary_new2(enc_table.count);
-    RBASIC(list)->klass = 0;
-    rb_encoding_list = list;
-    for (i = 0; i < enc_table.count; ++i) {
-	rb_ary_push(list, enc_new(enc_table.list[i].enc));
-    }
-}
-
-/* locale insensitive functions */
-
-#define ctype_test(c, ctype) \
-    (rb_isascii(c) && ONIGENC_IS_ASCII_CODE_CTYPE((c), ctype))
-
-int rb_isalnum(int c) { return ctype_test(c, ONIGENC_CTYPE_ALNUM); }
-int rb_isalpha(int c) { return ctype_test(c, ONIGENC_CTYPE_ALPHA); }
-int rb_isblank(int c) { return ctype_test(c, ONIGENC_CTYPE_BLANK); }
-int rb_iscntrl(int c) { return ctype_test(c, ONIGENC_CTYPE_CNTRL); }
-int rb_isdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_DIGIT); }
-int rb_isgraph(int c) { return ctype_test(c, ONIGENC_CTYPE_GRAPH); }
-int rb_islower(int c) { return ctype_test(c, ONIGENC_CTYPE_LOWER); }
-int rb_isprint(int c) { return ctype_test(c, ONIGENC_CTYPE_PRINT); }
-int rb_ispunct(int c) { return ctype_test(c, ONIGENC_CTYPE_PUNCT); }
-int rb_isspace(int c) { return ctype_test(c, ONIGENC_CTYPE_SPACE); }
-int rb_isupper(int c) { return ctype_test(c, ONIGENC_CTYPE_UPPER); }
-int rb_isxdigit(int c) { return ctype_test(c, ONIGENC_CTYPE_XDIGIT); }
-
-int
-rb_tolower(int c)
-{
-    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_LOWER_CASE(c) : c;
-}
-
-int
-rb_toupper(int c)
-{
-    return rb_isascii(c) ? ONIGENC_ASCII_CODE_TO_UPPER_CASE(c) : c;
-}
-
diff --git a/enum.c b/enum.c
index b704732d91..df35c2fe03 100644
--- a/enum.c
+++ b/enum.c
@@ -3,38 +3,67 @@
   enum.c -
 
   $Author$
+  $Date$
   created at: Fri Oct  1 15:15:19 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "node.h"
+#include "util.h"
 
 VALUE rb_mEnumerable;
-static ID id_each, id_eqq, id_cmp, id_next, id_size;
+static ID id_each, id_eqq, id_cmp, id_size;
 
+struct iter_method_arg {
+    VALUE obj;
+    ID mid;
+    int argc;
+    VALUE *argv;
+};
+
+static VALUE iterate_method _((VALUE obj));
 static VALUE
-enum_values_pack(int argc, VALUE *argv)
+iterate_method(obj)
+    VALUE obj;
 {
-    if (argc == 0) return Qnil;
-    if (argc == 1) return argv[0];
-    return rb_ary_new4(argc, argv);
+    struct iter_method_arg *arg;
+
+    arg = (struct iter_method_arg *)obj;
+    return rb_funcall2(arg->obj, arg->mid, arg->argc, arg->argv);
 }
 
-#define ENUM_WANT_SVALUE() do { \
-    i = enum_values_pack(argc, argv); \
-} while (0)
+VALUE
+rb_block_call(obj, mid, argc, argv, bl_proc, data2)
+    VALUE obj;
+    ID mid;
+    int argc;
+    VALUE *argv;
+    VALUE (*bl_proc) (ANYARGS);
+    VALUE data2;
+{
+    struct iter_method_arg arg;
 
-#define enum_yield rb_yield_values2
+    arg.obj = obj;
+    arg.mid = mid;
+    arg.argc = argc;
+    arg.argv = argv;
+    return rb_iterate(iterate_method, (VALUE)&arg, bl_proc, data2);
+}
 
-static VALUE
-grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+VALUE
+rb_each(obj)
+    VALUE obj;
 {
-    ENUM_WANT_SVALUE();
+    return rb_funcall(obj, id_each, 0, 0);
+}
 
+static VALUE
+grep_i(i, arg)
+    VALUE i, *arg;
+{
     if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
 	rb_ary_push(arg[1], i);
     }
@@ -42,10 +71,9 @@ grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
 }
 
 static VALUE
-grep_iter_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+grep_iter_i(i, arg)
+    VALUE i, *arg;
 {
-    ENUM_WANT_SVALUE();
-
     if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
 	rb_ary_push(arg[1], rb_yield(i));
     }
@@ -64,14 +92,15 @@ grep_iter_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
  *
  *     (1..100).grep 38..44   #=> [38, 39, 40, 41, 42, 43, 44]
  *     c = IO.constants
- *     c.grep(/SEEK/)         #=> [:SEEK_SET, :SEEK_CUR, :SEEK_END]
+ *     c.grep(/SEEK/)         #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
  *     res = c.grep(/SEEK/) {|v| IO.const_get(v) }
- *     res                    #=> [0, 1, 2]
+ *     res                    #=> [2, 0, 1]
  *
  */
 
 static VALUE
-enum_grep(VALUE obj, VALUE pat)
+enum_grep(obj, pat)
+    VALUE obj, pat;
 {
     VALUE ary = rb_ary_new();
     VALUE arg[2];
@@ -79,37 +108,41 @@ enum_grep(VALUE obj, VALUE pat)
     arg[0] = pat;
     arg[1] = ary;
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
+    rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
 
     return ary;
 }
 
+static VALUE count_i _((VALUE, VALUE));
 static VALUE
-count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_i(i, memop)
+    VALUE i, memop;
 {
     VALUE *memo = (VALUE*)memop;
 
-    ENUM_WANT_SVALUE();
-
     if (rb_equal(i, memo[1])) {
 	memo[0]++;
     }
     return Qnil;
 }
 
+static VALUE count_iter_i _((VALUE, VALUE));
 static VALUE
-count_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_iter_i(i, memop)
+    VALUE i, memop;
 {
     VALUE *memo = (VALUE*)memop;
 
-    if (RTEST(enum_yield(argc, argv))) {
+    if (RTEST(rb_yield(i))) {
 	memo[0]++;
     }
     return Qnil;
 }
 
+static VALUE count_all_i _((VALUE, VALUE));
 static VALUE
-count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+count_all_i(i, memop)
+    VALUE i, memop;
 {
     VALUE *memo = (VALUE*)memop;
 
@@ -137,7 +170,10 @@ count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_count(int argc, VALUE *argv, VALUE obj)
+enum_count(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE memo[2];	/* [count, condition value] */
     rb_block_call_func *func;
@@ -167,10 +203,10 @@ enum_count(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+find_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
-    ENUM_WANT_SVALUE();
-
     if (RTEST(rb_yield(i))) {
 	*memo = i;
 	rb_iter_break();
@@ -194,14 +230,17 @@ find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_find(int argc, VALUE *argv, VALUE obj)
+enum_find(argc, argv, obj)
+    int argc;
+    VALUE* argv;
+    VALUE obj;
 {
     VALUE memo = Qundef;
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
     RETURN_ENUMERATOR(obj, argc, argv);
-    rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)&memo);
+    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
     if (memo != Qundef) {
 	return memo;
     }
@@ -211,13 +250,14 @@ enum_find(int argc, VALUE *argv, VALUE obj)
     return Qnil;
 }
 
+static VALUE find_index_i _((VALUE, VALUE));
 static VALUE
-find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_i(i, memop)
+    VALUE i;
+    VALUE memop;
 {
     VALUE *memo = (VALUE*)memop;
 
-    ENUM_WANT_SVALUE();
-
     if (rb_equal(i, memo[2])) {
 	memo[0] = UINT2NUM(memo[1]);
 	rb_iter_break();
@@ -226,12 +266,15 @@ find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
     return Qnil;
 }
 
+static VALUE find_index_iter_i _((VALUE, VALUE));
 static VALUE
-find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
+find_index_iter_i(i, memop)
+    VALUE i;
+    VALUE memop;
 {
     VALUE *memo = (VALUE*)memop;
 
-    if (RTEST(enum_yield(argc, argv))) {
+    if (RTEST(rb_yield(i))) {
 	memo[0] = UINT2NUM(memo[1]);
 	rb_iter_break();
     }
@@ -256,7 +299,10 @@ find_index_iter_i(VALUE i, VALUE memop, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_find_index(int argc, VALUE *argv, VALUE obj)
+enum_find_index(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE memo[3];	/* [return value, current index, condition value] */
     rb_block_call_func *func;
@@ -280,10 +326,9 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+find_all_i(i, ary)
+    VALUE i, ary;
 {
-    ENUM_WANT_SVALUE();
-
     if (RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
@@ -304,23 +349,21 @@ find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_find_all(VALUE obj)
+enum_find_all(obj)
+    VALUE obj;
 {
-    VALUE ary;
+    VALUE ary = rb_ary_new();
 
     RETURN_ENUMERATOR(obj, 0, 0);
-
-    ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, find_all_i, ary);
+    rb_iterate(rb_each, obj, find_all_i, ary);
 
     return ary;
 }
 
 static VALUE
-reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+reject_i(i, ary)
+    VALUE i, ary;
 {
-    ENUM_WANT_SVALUE();
-
     if (!RTEST(rb_yield(i))) {
 	rb_ary_push(ary, i);
     }
@@ -339,30 +382,31 @@ reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_reject(VALUE obj)
+enum_reject(obj)
+    VALUE obj;
 {
-    VALUE ary;
+    VALUE ary = rb_ary_new();
 
     RETURN_ENUMERATOR(obj, 0, 0);
-
-    ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, reject_i, ary);
+    rb_iterate(rb_each, obj, reject_i, ary);
 
     return ary;
 }
 
 static VALUE
-collect_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_i(i, ary)
+    VALUE i, ary;
 {
-    rb_ary_push(ary, enum_yield(argc, argv));
+    rb_ary_push(ary, rb_yield(i));
 
     return Qnil;
 }
 
 static VALUE
-collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
+collect_all(i, ary)
+    VALUE i, ary;
 {
-    rb_ary_push(ary, enum_values_pack(argc, argv));
+    rb_ary_push(ary, i);
 
     return Qnil;
 }
@@ -381,14 +425,12 @@ collect_all(VALUE i, VALUE ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_collect(VALUE obj)
+enum_collect(obj)
+    VALUE obj;
 {
-    VALUE ary;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
+    VALUE ary = rb_ary_new();
 
-    ary = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, collect_i, ary);
+    rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
 
     return ary;
 }
@@ -404,7 +446,10 @@ enum_collect(VALUE obj)
  *     { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a   #=> [["a", 1], ["b", 2], ["c", 3]]
  */
 static VALUE
-enum_to_a(int argc, VALUE *argv, VALUE obj)
+enum_to_a(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE ary = rb_ary_new();
 
@@ -413,13 +458,13 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
     return ary;
 }
 
+static VALUE inject_i _((VALUE, VALUE));
 static VALUE
-inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
+inject_i(i, p)
+    VALUE i;
+    VALUE p;
 {
     VALUE *memo = (VALUE *)p;
-
-    ENUM_WANT_SVALUE();
-
     if (memo[0] == Qundef) {
 	memo[0] = i;
     }
@@ -429,13 +474,14 @@ inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
     return Qnil;
 }
 
+static VALUE inject_op_i _((VALUE, VALUE));
 static VALUE
-inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
+inject_op_i(i, p)
+    VALUE i;
+    VALUE p;
 {
     VALUE *memo = (VALUE *)p;
 
-    ENUM_WANT_SVALUE();
-
     if (memo[0] == Qundef) {
 	memo[0] = i;
     }
@@ -491,10 +537,13 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
  *
  */
 static VALUE
-enum_inject(int argc, VALUE *argv, VALUE obj)
+enum_inject(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE memo[2];
-    VALUE (*iter)(VALUE, VALUE, int, VALUE*) = inject_i;
+    rb_block_call_func *iter = inject_i;
 
     switch (rb_scan_args(argc, argv, "02", &memo[0], &memo[1])) {
       case 0:
@@ -522,10 +571,9 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+partition_i(i, ary)
+    VALUE i, *ary;
 {
-    ENUM_WANT_SVALUE();
-
     if (RTEST(rb_yield(i))) {
 	rb_ary_push(ary[0], i);
     }
@@ -548,7 +596,8 @@ partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_partition(VALUE obj)
+enum_partition(obj)
+    VALUE obj;
 {
     VALUE ary[2];
 
@@ -556,20 +605,19 @@ enum_partition(VALUE obj)
 
     ary[0] = rb_ary_new();
     ary[1] = rb_ary_new();
-    rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)ary);
+    rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
 
     return rb_assoc_new(ary[0], ary[1]);
 }
 
 static VALUE
-group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
+group_by_i(i, hash)
+    VALUE i;
+    VALUE hash;
 {
-    VALUE group;
+    VALUE group = rb_yield(i);
     VALUE values;
 
-    ENUM_WANT_SVALUE();
-
-    group = rb_yield(i);
     values = rb_hash_aref(hash, group);
     if (NIL_P(values)) {
 	values = rb_ary_new3(1, i);
@@ -594,7 +642,8 @@ group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_group_by(VALUE obj)
+enum_group_by(obj)
+    VALUE obj;
 {
     VALUE hash;
 
@@ -607,10 +656,10 @@ enum_group_by(VALUE obj)
 }
 
 static VALUE
-first_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+first_i(i, ary)
+    VALUE i;
+    VALUE *ary;
 {
-    ENUM_WANT_SVALUE();
-
     if (NIL_P(ary[0])) {
 	ary[1] = i;
 	rb_iter_break();
@@ -640,7 +689,10 @@ first_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_first(int argc, VALUE *argv, VALUE obj)
+enum_first(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE n, ary[2];
 
@@ -676,32 +728,35 @@ enum_first(int argc, VALUE *argv, VALUE obj)
  */
 
 static VALUE
-enum_sort(VALUE obj)
+enum_sort(obj)
+    VALUE obj;
 {
     return rb_ary_sort(enum_to_a(0, 0, obj));
 }
 
 static VALUE
-sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+sort_by_i(i, ary)
+    VALUE i, ary;
 {
+    VALUE v;
     NODE *memo;
 
-    ENUM_WANT_SVALUE();
-
+    v = rb_yield(i);
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
-    /* use NODE_DOT2 as memo(v, v, -) */
-    memo = rb_node_newnode(NODE_DOT2, rb_yield(i), i, 0);
+    memo = rb_node_newnode(NODE_MEMO, v, i, 0);
     rb_ary_push(ary, (VALUE)memo);
     return Qnil;
 }
 
 static int
-sort_by_cmp(const void *ap, const void *bp, void *data)
+sort_by_cmp(aa, bb, data)
+    NODE **aa, **bb;
+    void *data;
 {
-    VALUE a = (*(NODE *const *)ap)->u1.value;
-    VALUE b = (*(NODE *const *)bp)->u1.value;
+    VALUE a = aa[0]->u1.value;
+    VALUE b = bb[0]->u1.value;
     VALUE ary = (VALUE)data;
 
     if (RBASIC(ary)->klass) {
@@ -718,7 +773,7 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *  values in <i>enum</i> through the given block.
  *
  *     %w{ apple pear fig }.sort_by {|word| word.length}
- *                   #=> ["fig", "pear", "apple"]
+                    #=> ["fig", "pear", "apple"]
  *
  *  The current implementation of <code>sort_by</code> generates an
  *  array of tuples containing the original collection element and the
@@ -780,7 +835,8 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  */
 
 static VALUE
-enum_sort_by(VALUE obj)
+enum_sort_by(obj)
+    VALUE obj;
 {
     VALUE ary;
     long i;
@@ -788,51 +844,46 @@ enum_sort_by(VALUE obj)
     RETURN_ENUMERATOR(obj, 0, 0);
 
     if (TYPE(obj) == T_ARRAY) {
-	ary  = rb_ary_new2(RARRAY_LEN(obj));
+	ary  = rb_ary_new2(RARRAY(obj)->len);
     }
     else {
 	ary = rb_ary_new();
     }
     RBASIC(ary)->klass = 0;
-    rb_block_call(obj, id_each, 0, 0, sort_by_i, ary);
-    if (RARRAY_LEN(ary) > 1) {
-	ruby_qsort(RARRAY_PTR(ary), RARRAY_LEN(ary), sizeof(VALUE),
-		   sort_by_cmp, (void *)ary);
+    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, (void *)ary);
     }
     if (RBASIC(ary)->klass) {
 	rb_raise(rb_eRuntimeError, "sort_by reentered");
     }
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	RARRAY_PTR(ary)[i] = RNODE(RARRAY_PTR(ary)[i])->u2.value;
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
     }
     RBASIC(ary)->klass = rb_cArray;
     return ary;
 }
 
-#define DEFINE_ENUMFUNCS(name) \
-static VALUE \
-name##_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
-{ \
-    return enum_##name##_func(enum_values_pack(argc, argv), memo); \
-} \
-\
-static VALUE \
-name##_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv) \
-{ \
-    return enum_##name##_func(enum_yield(argc, argv), memo); \
-}
-    
 static VALUE
-enum_all_func(VALUE result, VALUE *memo)
+all_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
-    if (!RTEST(result)) {
+    if (!RTEST(i)) {
 	*memo = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-DEFINE_ENUMFUNCS(all)
+static VALUE
+all_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    return all_i(rb_yield(i), memo);
+}
 
 /*
  *  call-seq:
@@ -845,32 +896,41 @@ DEFINE_ENUMFUNCS(all)
  *  <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
+ *     %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(VALUE obj)
+enum_all(obj)
+    VALUE obj;
 {
     VALUE result = Qtrue;
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
     return result;
 }
 
 static VALUE
-enum_any_func(VALUE result, VALUE *memo)
+any_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
-    if (RTEST(result)) {
+    if (RTEST(i)) {
 	*memo = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-DEFINE_ENUMFUNCS(any)
+static VALUE
+any_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    return any_i(rb_yield(i), memo);
+}
 
 /*
  *  call-seq:
@@ -884,25 +944,28 @@ DEFINE_ENUMFUNCS(any)
  *  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
+ *     %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(VALUE obj)
+enum_any(obj)
+    VALUE obj;
 {
     VALUE result = Qfalse;
 
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
+    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
     return result;
 }
 
 static VALUE
-enum_one_func(VALUE result, VALUE *memo)
+one_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
-    if (RTEST(result)) {
+    if (RTEST(i)) {
 	if (*memo == Qundef) {
 	    *memo = Qtrue;
 	}
@@ -914,7 +977,13 @@ enum_one_func(VALUE result, VALUE *memo)
     return Qnil;
 }
 
-DEFINE_ENUMFUNCS(one)
+static VALUE
+one_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    return one_i(rb_yield(i), memo);
+}
 
 /*
  *  call-seq:
@@ -935,7 +1004,8 @@ DEFINE_ENUMFUNCS(one)
  */
 
 static VALUE
-enum_one(VALUE obj)
+enum_one(obj)
+    VALUE obj;
 {
     VALUE result = Qundef;
 
@@ -945,16 +1015,24 @@ enum_one(VALUE obj)
 }
 
 static VALUE
-enum_none_func(VALUE result, VALUE *memo)
+none_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
-    if (RTEST(result)) {
+    if (RTEST(i)) {
 	*memo = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
 }
 
-DEFINE_ENUMFUNCS(none)
+static VALUE
+none_iter_i(i, memo)
+    VALUE i;
+    VALUE *memo;
+{
+    return none_i(rb_yield(i), memo);
+}
 
 /*
  *  call-seq:
@@ -972,7 +1050,8 @@ DEFINE_ENUMFUNCS(none)
  *     [nil,false].none?                                 #=> true
  */
 static VALUE
-enum_none(VALUE obj)
+enum_none(obj)
+    VALUE obj;
 {
     VALUE result = Qtrue;
 
@@ -981,12 +1060,12 @@ enum_none(VALUE obj)
 }
 
 static VALUE
-min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE cmp;
 
-    ENUM_WANT_SVALUE();
-
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -1000,20 +1079,17 @@ min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 }
 
 static VALUE
-min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_ii(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE cmp;
 
-    ENUM_WANT_SVALUE();
-
     if (*memo == Qundef) {
 	*memo = i;
     }
     else {
-	VALUE ary = memo[1];
-	RARRAY_PTR(ary)[0] = i;
-	RARRAY_PTR(ary)[1] = *memo;
-	cmp = rb_yield(ary);
+	cmp = rb_yield_values(2, i, *memo);
 	if (rb_cmpint(cmp, i, *memo) < 0) {
 	    *memo = i;
 	}
@@ -1037,29 +1113,37 @@ min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_min(VALUE obj)
+enum_min(obj)
+    VALUE obj;
 {
-    VALUE result[2];
+    VALUE result = Qundef;
 
-    result[0] = Qundef;
-    if (rb_block_given_p()) {
-	result[1] = rb_ary_new3(2, Qnil, Qnil);
-	rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)result);
-    }
-    else {
-	rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)result);
-    }
-    if (result[0] == Qundef) return Qnil;
-    return result[0];
+    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
+    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(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE cmp;
 
-    ENUM_WANT_SVALUE();
-
     if (*memo == Qundef) {
 	*memo = i;
     }
@@ -1073,20 +1157,17 @@ max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 }
 
 static VALUE
-max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_ii(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE cmp;
 
-    ENUM_WANT_SVALUE();
-
     if (*memo == Qundef) {
 	*memo = i;
     }
     else {
-	VALUE ary = memo[1];
-	RARRAY_PTR(ary)[0] = i;
-	RARRAY_PTR(ary)[1] = *memo;
-	cmp = rb_yield(ary);
+	cmp = rb_yield_values(2, i, *memo);
 	if (rb_cmpint(cmp, i, *memo) > 0) {
 	    *memo = i;
 	}
@@ -1109,29 +1190,23 @@ max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_max(VALUE obj)
+enum_max(obj)
+    VALUE obj;
 {
-    VALUE result[2];
+    VALUE result = Qundef;
 
-    result[0] = Qundef;
-    if (rb_block_given_p()) {
-	result[1] = rb_ary_new3(2, Qnil, Qnil);
-	rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)result);
-    }
-    else {
-	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)result);
-    }
-    if (result[0] == Qundef) return Qnil;
-    return result[0];
+    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
+    if (result == Qundef) return Qnil;
+    return result;
 }
 
 static VALUE
-minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     int n;
 
-    ENUM_WANT_SVALUE();
-
     if (memo[0] == Qundef) {
 	memo[0] = i;
 	memo[1] = i;
@@ -1150,12 +1225,12 @@ minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
 }
 
 static VALUE
-minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_ii(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     int n;
 
-    ENUM_WANT_SVALUE();
-
     if (memo[0] == Qundef) {
 	memo[0] = i;
 	memo[1] = i;
@@ -1163,14 +1238,14 @@ minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
     else {
 	VALUE ary = memo[2];
 
-	RARRAY_PTR(ary)[0] = i;
-	RARRAY_PTR(ary)[1] = memo[0];
+	RARRAY(ary)->ptr[0] = i;
+	RARRAY(ary)->ptr[1] = memo[0];
 	n = rb_cmpint(rb_yield(ary), i, memo[0]);
 	if (n < 0) {
 	    memo[0] = i;
 	}
-	RARRAY_PTR(ary)[0] = i;
-	RARRAY_PTR(ary)[1] = memo[1];
+	RARRAY(ary)->ptr[0] = i;
+	RARRAY(ary)->ptr[1] = memo[1];
 	n = rb_cmpint(rb_yield(ary), i, memo[1]);
 	if (n > 0) {
 	    memo[1] = i;
@@ -1195,7 +1270,8 @@ minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_minmax(VALUE obj)
+enum_minmax(obj)
+    VALUE obj;
 {
     VALUE result[3];
     VALUE ary = rb_ary_new3(2, Qnil, Qnil);
@@ -1209,19 +1285,19 @@ enum_minmax(VALUE obj)
 	rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)result);
     }
     if (result[0] != Qundef) {
-        RARRAY_PTR(ary)[0] = result[0];
-        RARRAY_PTR(ary)[1] = result[1];
+        RARRAY(ary)->ptr[0] = result[0];
+        RARRAY(ary)->ptr[1] = result[1];
     }
     return ary;
 }
 
 static VALUE
-min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+min_by_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE v;
 
-    ENUM_WANT_SVALUE();
-
     v = rb_yield(i);
     if (memo[0] == Qundef) {
 	memo[0] = v;
@@ -1246,7 +1322,8 @@ min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_min_by(VALUE obj)
+enum_min_by(obj)
+    VALUE obj;
 {
     VALUE memo[2];
 
@@ -1259,12 +1336,12 @@ enum_min_by(VALUE obj)
 }
 
 static VALUE
-max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+max_by_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE v;
 
-    ENUM_WANT_SVALUE();
-
     v = rb_yield(i);
     if (memo[0] == Qundef) {
 	memo[0] = v;
@@ -1289,7 +1366,8 @@ max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_max_by(VALUE obj)
+enum_max_by(obj)
+    VALUE obj;
 {
     VALUE memo[2];
 
@@ -1302,12 +1380,12 @@ enum_max_by(VALUE obj)
 }
 
 static VALUE
-minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
+minmax_by_i(i, memo)
+    VALUE i;
+    VALUE *memo;
 {
     VALUE v;
 
-    ENUM_WANT_SVALUE();
-
     v = rb_yield(i);
     if (memo[0] == Qundef) {
 	memo[0] = v;
@@ -1341,7 +1419,8 @@ minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_minmax_by(VALUE obj)
+enum_minmax_by(obj)
+    VALUE obj;
 {
     VALUE memo[4];
 
@@ -1356,9 +1435,11 @@ enum_minmax_by(VALUE obj)
 }
 
 static VALUE
-member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
+member_i(item, memo)
+    VALUE item;
+    VALUE *memo;
 {
-    if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
+    if (rb_equal(item, memo[0])) {
 	memo[1] = Qtrue;
 	rb_iter_break();
     }
@@ -1373,59 +1454,61 @@ member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
  *  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
+ *     IO.constants.include? "SEEK_SET"          #=> true
+ *     IO.constants.include? "SEEK_NO_FURTHER"   #=> false
  *
  */
 
 static VALUE
-enum_member(VALUE obj, VALUE val)
+enum_member(obj, val)
+    VALUE obj, val;
 {
     VALUE memo[2];
 
     memo[0] = val;
     memo[1] = Qfalse;
-    rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
+    rb_iterate(rb_each, obj, member_i, (VALUE)memo);
     return memo[1];
 }
 
 static VALUE
-each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
+each_with_index_i(val, memo)
+    VALUE val;
+    VALUE *memo;
 {
-    long n = (*(VALUE *)memo)++;
-
-    return rb_yield_values(2, enum_values_pack(argc, argv), INT2NUM(n));
+    rb_yield_values(2, val, INT2FIX(*memo));
+    ++*memo;
+    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>.  Given arguments are passed through
- *  to #each().
+ *  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, "dog"=>1, "wombat"=>2}
+ *     hash   #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
  *
  */
 
 static VALUE
-enum_each_with_index(int argc, VALUE *argv, VALUE obj)
+enum_each_with_index(obj)
+    VALUE obj;
 {
-    long memo;
+    VALUE memo;
 
-    RETURN_ENUMERATOR(obj, argc, argv);
+    RETURN_ENUMERATOR(obj, 0, 0);
 
     memo = 0;
-    rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)&memo);
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
     return obj;
 }
 
-
 /*
  *  call-seq:
  *     enum.reverse_each {|item| block } 
@@ -1452,74 +1535,22 @@ enum_reverse_each(int argc, VALUE *argv, VALUE obj)
 
 
 static VALUE
-zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv)
-{
-    volatile VALUE result = memo->u1.value;
-    volatile VALUE args = memo->u2.value;
-    int n = memo->u3.cnt++;
-    volatile VALUE tmp;
-    int i;
-
-    tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
-    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
-    for (i=0; i<RARRAY_LEN(args); i++) {
-	VALUE e = RARRAY_PTR(args)[i];
-
-	if (RARRAY_LEN(e) <= n) {
-	    rb_ary_push(tmp, Qnil);
-	}
-	else {
-	    rb_ary_push(tmp, RARRAY_PTR(e)[n]);
-	}
-    }
-    if (NIL_P(result)) {
-	rb_yield(tmp);
-    }
-    else {
-	rb_ary_push(result, tmp);
-    }
-    return Qnil;
-}
-
-static VALUE
-call_next(VALUE *v)
-{
-    return v[0] = rb_funcall(v[1], id_next, 0, 0);
-}
-
-static VALUE
-call_stop(VALUE *v)
-{
-    return v[0] = Qundef;
-}
-
-static VALUE
-zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
+zip_i(val, memo)
+    VALUE val;
+    VALUE *memo;
 {
-    volatile VALUE result = memo->u1.value;
-    volatile VALUE args = memo->u2.value;
-    volatile VALUE tmp;
+    VALUE result = memo[0];
+    VALUE args = memo[1];
+    int idx = memo[2]++;
+    VALUE tmp;
     int i;
 
-    tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
-    rb_ary_store(tmp, 0, enum_values_pack(argc, argv));
-    for (i=0; i<RARRAY_LEN(args); i++) {
-	if (NIL_P(RARRAY_PTR(args)[i])) {
-	    rb_ary_push(tmp, Qnil);
-	}
-	else {
-	    VALUE v[2];
-
-	    v[1] = RARRAY_PTR(args)[i];
-	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, 0);
-	    if (v[0] == Qundef) {
-		RARRAY_PTR(args)[i] = Qnil;
-		v[0] = Qnil;
-	    }
-	    rb_ary_push(tmp, v[0]);
-	}
+    tmp = rb_ary_new2(RARRAY(args)->len + 1);
+    rb_ary_store(tmp, 0, val);
+    for (i=0; i<RARRAY(args)->len; i++) {
+	rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
     }
-    if (NIL_P(result)) {
+    if (rb_block_given_p()) {
 	rb_yield(tmp);
     }
     else {
@@ -1530,63 +1561,56 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.zip(arg, ...)                   => enumerator
+ *     enum.zip(arg, ...)                   => array
  *     enum.zip(arg, ...) {|arr| block }    => nil
  *
- *  Takes one element from <i>enum</i> and merges corresponding
- *  elements from each <i>args</i>.  This generates a sequence of
- *  <em>n</em>-element arrays, where <em>n</em> is one more than the
- *  count of arguments.  The length of the resulting sequence will be
- *  <code>enum#size</code.  If the size of any argument is less than
- *  <code>enum#size</code>, <code>nil</code> values are supplied. If
- *  a block is given, it is invoked for each output array, otherwise
- *  an array of arrays is returned.
+ *  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,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]]
+ *     (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(int argc, VALUE *argv, VALUE obj)
+enum_zip(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     int i;
-    ID conv;
-    NODE *memo;
-    VALUE result = Qnil;
-    int allary = Qtrue;
+    VALUE result;
+    VALUE memo[3];
 
     for (i=0; i<argc; i++) {
-	if (TYPE(argv[i]) != T_ARRAY) {
-	    allary = Qfalse;
-	    break;
-	}
-    }
-    if (!allary) {
-	CONST_ID(conv, "to_enum");
-	for (i=0; i<argc; i++) {
-	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
-	}
-    }
-    if (!rb_block_given_p()) {
-	result = rb_ary_new();
+	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
     }
-    /* use NODE_DOT2 as memo(v, v, -) */
-    memo = rb_node_newnode(NODE_DOT2, result, rb_ary_new4(argc, argv), 0);
-    rb_block_call(obj, id_each, 0, 0, allary ? zip_ary : zip_i, (VALUE)memo);
+    result = rb_block_given_p() ? Qnil : rb_ary_new();
+    memo[0] = result;
+    memo[1] = rb_ary_new4(argc, argv);
+    memo[2] = 0;
+    rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
 
     return result;
 }
 
 static VALUE
-take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+take_i(i, arg)
+    VALUE i;
+    VALUE *arg;
 {
     if (arg[1]-- == 0) rb_iter_break();
-    rb_ary_push(arg[0], enum_values_pack(argc, argv));
+    rb_ary_push(arg[0], i);
     return Qnil;
 }
 
@@ -1602,7 +1626,9 @@ take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_take(VALUE obj, VALUE n)
+enum_take(obj, n)
+    VALUE obj;
+    VALUE n;
 {
     VALUE args[2];
     long len = NUM2LONG(n);
@@ -1619,10 +1645,12 @@ enum_take(VALUE obj, VALUE n)
 
 
 static VALUE
-take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
+take_while_i(i, ary)
+    VALUE i;
+    VALUE *ary;
 {
-    if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
-    rb_ary_push(*ary, enum_values_pack(argc, argv));
+    if (!RTEST(rb_yield(i))) rb_iter_break();
+    rb_ary_push(*ary, i);
     return Qnil;
 }
 
@@ -1639,7 +1667,8 @@ take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_take_while(VALUE obj)
+enum_take_while(obj)
+    VALUE obj;
 {
     VALUE ary;
 
@@ -1650,10 +1679,12 @@ enum_take_while(VALUE obj)
 }
 
 static VALUE
-drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
+drop_i(i, arg)
+    VALUE i;
+    VALUE *arg;
 {
     if (arg[1] == 0) {
-	rb_ary_push(arg[0], enum_values_pack(argc, argv));
+	rb_ary_push(arg[0], i);
     }
     else {
 	arg[1]--;
@@ -1674,7 +1705,9 @@ drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_drop(VALUE obj, VALUE n)
+enum_drop(obj, n)
+    VALUE obj;
+    VALUE n;
 {
     VALUE args[2];
     long len = NUM2LONG(n);
@@ -1691,10 +1724,10 @@ enum_drop(VALUE obj, VALUE n)
 
 
 static VALUE
-drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
+drop_while_i(i, args)
+    VALUE i;
+    VALUE *args;
 {
-    ENUM_WANT_SVALUE();
-
     if (!args[1] && !RTEST(rb_yield(i))) {
 	args[1] = Qtrue;
     }
@@ -1718,7 +1751,8 @@ drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_drop_while(VALUE obj)
+enum_drop_while(obj)
+    VALUE obj;
 {
     VALUE args[2];
 
@@ -1730,10 +1764,10 @@ enum_drop_while(VALUE obj)
 }
 
 static VALUE
-cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
+cycle_i(i, ary)
+    VALUE i;
+    VALUE ary;
 {
-    ENUM_WANT_SVALUE();
-
     rb_ary_push(ary, i);
     rb_yield(i);
     return Qnil;
@@ -1759,7 +1793,10 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
  */
 
 static VALUE
-enum_cycle(int argc, VALUE *argv, VALUE obj)
+enum_cycle(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE ary;
     VALUE nv = Qnil;
@@ -1778,11 +1815,11 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
     ary = rb_ary_new();
     RBASIC(ary)->klass = 0;
     rb_block_call(obj, id_each, 0, 0, cycle_i, ary);
-    len = RARRAY_LEN(ary);
+    len = RARRAY(ary)->len;
     if (len == 0) return Qnil;
     while (n < 0 || 0 < --n) {
         for (i=0; i<len; i++) {
-            rb_yield(RARRAY_PTR(ary)[i]);
+            rb_yield(RARRAY(ary)->ptr[i]);
         }
     }
     return Qnil;		/* not reached */
@@ -1800,10 +1837,8 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
  */
 
 void
-Init_Enumerable(void)
+Init_Enumerable()
 {
-#undef rb_intern
-
     rb_mEnumerable = rb_define_module("Enumerable");
 
     rb_define_method(rb_mEnumerable, "to_a", enum_to_a, -1);
@@ -1838,7 +1873,8 @@ Init_Enumerable(void)
     rb_define_method(rb_mEnumerable, "minmax_by", enum_minmax_by, 0);
     rb_define_method(rb_mEnumerable, "member?", enum_member, 1);
     rb_define_method(rb_mEnumerable, "include?", enum_member, 1);
-    rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, -1);
+    rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, 0);
+    rb_define_method(rb_mEnumerable, "enum_with_index", enum_each_with_index, 0);
     rb_define_method(rb_mEnumerable, "reverse_each", enum_reverse_each, -1);
     rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
     rb_define_method(rb_mEnumerable, "take", enum_take, 1);
@@ -1850,7 +1886,6 @@ Init_Enumerable(void)
     id_eqq  = rb_intern("===");
     id_each = rb_intern("each");
     id_cmp  = rb_intern("<=>");
-    id_next = rb_intern("next");
     id_size = rb_intern("size");
 }
 
diff --git a/enumerator.c b/enumerator.c
index 8d95b0d9c9..f95d931b62 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -12,8 +12,7 @@
 
 ************************************************/
 
-#include "ruby/ruby.h"
-#include "debug.h"
+#include "ruby.h"
 
 /*
  * Document-class: Enumerable::Enumerator
@@ -29,32 +28,32 @@ VALUE rb_eStopIteration;
 struct enumerator {
     VALUE obj;
     ID    meth;
+    VALUE proc;
     VALUE args;
-    VALUE fib;
-    VALUE dst;
-    VALUE no_next;
+    rb_block_call_func *iter;
 };
 
+static void enumerator_mark _((void *));
 static void
-enumerator_mark(void *p)
+enumerator_mark(p)
+    void *p;
 {
     struct enumerator *ptr = p;
     rb_gc_mark(ptr->obj);
     rb_gc_mark(ptr->args);
-    rb_gc_mark(ptr->fib);
-    rb_gc_mark(ptr->dst);
 }
 
 static struct enumerator *
-enumerator_ptr(VALUE obj)
+enumerator_ptr(obj)
+    VALUE obj;
 {
     struct enumerator *ptr;
 
     Data_Get_Struct(obj, struct enumerator, ptr);
     if (RDATA(obj)->dmark != enumerator_mark) {
 	rb_raise(rb_eTypeError,
-		 "wrong argument type %s (expected %s)",
-		 rb_obj_classname(obj), rb_class2name(rb_cEnumerator));
+		 "wrong argument type %s (expected Enumerable::Enumerator)",
+		 rb_obj_classname(obj));
     }
     if (!ptr || ptr->obj == Qundef) {
 	rb_raise(rb_eArgError, "uninitialized enumerator");
@@ -82,7 +81,10 @@ enumerator_ptr(VALUE obj)
  *
  */
 static VALUE
-obj_to_enum(int argc, VALUE *argv, VALUE obj)
+obj_to_enum(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE meth = sym_each;
 
@@ -94,7 +96,9 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-each_slice_i(VALUE val, VALUE *memo)
+each_slice_i(val, memo)
+    VALUE val;
+    VALUE *memo;
 {
     VALUE ary = memo[0];
     VALUE v = Qnil;
@@ -128,7 +132,8 @@ each_slice_i(VALUE val, VALUE *memo)
  *
  */
 static VALUE
-enum_each_slice(VALUE obj, VALUE n)
+enum_each_slice(obj, n)
+    VALUE obj, n;
 {
     long size = NUM2LONG(n);
     VALUE args[2], ary;
@@ -147,7 +152,9 @@ enum_each_slice(VALUE obj, VALUE n)
 }
 
 static VALUE
-each_cons_i(VALUE val, VALUE *memo)
+each_cons_i(val, memo)
+    VALUE val;
+    VALUE *memo;
 {
     VALUE ary = memo[0];
     VALUE v = Qnil;
@@ -169,7 +176,7 @@ each_cons_i(VALUE val, VALUE *memo)
  *    each_cons(n)
  *
  *  Iterates the given block for each array of consecutive <n>
- *  elements.  If no block is given, returns an enumerator.
+ *  elements.  If no block is given, returns an enumerator.a
  *
  *  e.g.:
  *      (1..10).each_cons(3) {|a| p a}
@@ -185,7 +192,8 @@ each_cons_i(VALUE val, VALUE *memo)
  *
  */
 static VALUE
-enum_each_cons(VALUE obj, VALUE n)
+enum_each_cons(obj, n)
+    VALUE obj, n;
 {
     long size = NUM2LONG(n);
     VALUE args[2];
@@ -200,26 +208,37 @@ enum_each_cons(VALUE obj, VALUE n)
     return Qnil;
 }
 
+static VALUE enumerator_allocate _((VALUE));
 static VALUE
-enumerator_allocate(VALUE klass)
+enumerator_allocate(klass)
+    VALUE klass;
 {
     struct enumerator *ptr;
     VALUE enum_obj;
 
-    enum_obj = Data_Make_Struct(klass, struct enumerator, enumerator_mark, -1, ptr);
+    enum_obj = Data_Make_Struct(klass, struct enumerator,
+				enumerator_mark, -1, ptr);
     ptr->obj = Qundef;
 
     return enum_obj;
 }
 
+static VALUE enumerator_each_i _((VALUE, VALUE));
 static VALUE
-enumerator_each_i(VALUE v, VALUE enum_obj, int argc, VALUE *argv)
+enumerator_each_i(v, enum_obj)
+    VALUE v;
+    VALUE enum_obj;
 {
-    return rb_yield_values2(argc, argv);
+    return rb_yield(v);
 }
 
 static VALUE
-enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
+enumerator_init(enum_obj, obj, meth, argc, argv)
+    VALUE enum_obj;
+    VALUE obj;
+    VALUE meth;
+    int argc;
+    VALUE *argv;
 {
     struct enumerator *ptr;
 
@@ -231,10 +250,8 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
 
     ptr->obj  = obj;
     ptr->meth = rb_to_id(meth);
+    ptr->iter = enumerator_each_i;
     if (argc) ptr->args = rb_ary_new4(argc, argv);
-    ptr->fib = 0;
-    ptr->dst = Qnil;
-    ptr->no_next = Qfalse;
 
     return enum_obj;
 }
@@ -250,7 +267,10 @@ enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
  *  Use of this method is discouraged.  Use Kernel#enum_for() instead.
  */
 static VALUE
-enumerator_initialize(int argc, VALUE *argv, VALUE obj)
+enumerator_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE recv, meth = sym_each;
 
@@ -266,15 +286,13 @@ enumerator_initialize(int argc, VALUE *argv, VALUE obj)
 
 /* :nodoc: */
 static VALUE
-enumerator_init_copy(VALUE obj, VALUE orig)
+enumerator_init_copy(obj, orig)
+    VALUE obj;
+    VALUE orig;
 {
     struct enumerator *ptr0, *ptr1;
 
     ptr0 = enumerator_ptr(orig);
-    if (ptr0->fib) {
-	/* Fibers cannot be copied */
-	rb_raise(rb_eTypeError, "can't copy execution context");
-    }
 
     Data_Get_Struct(obj, struct enumerator, ptr1);
 
@@ -284,14 +302,18 @@ enumerator_init_copy(VALUE obj, VALUE orig)
 
     ptr1->obj  = ptr0->obj;
     ptr1->meth = ptr0->meth;
+    ptr1->iter = ptr0->iter;
     ptr1->args = ptr0->args;
-    ptr1->fib  = 0;
 
     return obj;
 }
 
 VALUE
-rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
+rb_enumeratorize(obj, meth, argc, argv)
+    VALUE obj;
+    VALUE meth;
+    int argc;
+    VALUE *argv;
 {
     return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
 }
@@ -305,7 +327,8 @@ rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
  *
  */
 static VALUE
-enumerator_each(VALUE obj)
+enumerator_each(obj)
+    VALUE obj;
 {
     struct enumerator *e;
     int argc = 0;
@@ -317,12 +340,13 @@ enumerator_each(VALUE obj)
 	argc = RARRAY_LEN(e->args);
 	argv = RARRAY_PTR(e->args);
     }
-    return rb_block_call(e->obj, e->meth, argc, argv,
-			 enumerator_each_i, (VALUE)e);
+    return rb_block_call(e->obj, e->meth, argc, argv, e->iter, (VALUE)e);
 }
 
 static VALUE
-enumerator_with_index_i(VALUE val, VALUE *memo)
+enumerator_with_index_i(val, memo)
+    VALUE val;
+    VALUE *memo;
 {
     val = rb_yield_values(2, val, INT2FIX(*memo));
     ++*memo;
@@ -334,20 +358,20 @@ enumerator_with_index_i(VALUE val, VALUE *memo)
  *    e.with_index {|(*args), idx| ... }
  *    e.with_index
  *
- *  Iterates the given block for each element with an index, which
+ *  Iterates the given block for each elements with an index, which
  *  start from 0.  If no block is given, returns an enumerator.
  *
  */
 static VALUE
-enumerator_with_index(VALUE obj)
+enumerator_with_index(obj)
+    VALUE obj;
 {
-    struct enumerator *e;
+    struct enumerator *e = enumerator_ptr(obj);
     VALUE memo = 0;
     int argc = 0;
     VALUE *argv = 0;
 
     RETURN_ENUMERATOR(obj, 0, 0);
-    e = enumerator_ptr(obj);
     if (e->args) {
 	argc = RARRAY_LEN(e->args);
 	argv = RARRAY_PTR(e->args);
@@ -356,68 +380,6 @@ enumerator_with_index(VALUE obj)
 			 enumerator_with_index_i, (VALUE)&memo);
 }
 
-static VALUE
-enumerator_with_object_i(VALUE val, VALUE memo)
-{
-    return rb_yield_values(2, val, memo);
-}
-
-/*
- *  call-seq:
- *    e.with_object(obj) {|(*args), memo_obj| ... }
- *    e.with_object(obj)
- *
- *  Iterates the given block for each element with an arbitrary
- *  object given, and returns the memo object.
- *
- *  If no block is given, returns an enumerator.
- *
- */
-static VALUE
-enumerator_with_object(VALUE obj, VALUE memo)
-{
-    struct enumerator *e;
-    int argc = 0;
-    VALUE *argv = 0;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-    e = enumerator_ptr(obj);
-    if (e->args) {
-	argc = RARRAY_LEN(e->args);
-	argv = RARRAY_PTR(e->args);
-    }
-    rb_block_call(e->obj, e->meth, argc, argv,
-		  enumerator_with_object_i, memo);
-
-    return memo;
-}
-
-static VALUE
-next_ii(VALUE i, VALUE obj, int argc, VALUE *argv)
-{
-    rb_fiber_yield(argc, argv);
-    return Qnil;
-}
-
-static VALUE
-next_i(VALUE curr, VALUE obj)
-{
-    struct enumerator *e = enumerator_ptr(obj);
-    VALUE nil = Qnil;
-
-    rb_block_call(obj, rb_intern("each"), 0, 0, next_ii, obj);
-    e->no_next = Qtrue;
-    return rb_fiber_yield(1, &nil);
-}
-
-static void
-next_init(VALUE obj, struct enumerator *e)
-{
-    VALUE curr = rb_fiber_current();
-    e->dst = curr;
-    e->fib = rb_fiber_new(next_i, obj);
-}
-
 /*
  * call-seq:
  *   e.next   => object
@@ -430,27 +392,16 @@ next_init(VALUE obj, struct enumerator *e)
  * non-external enumeration methods, unless underlying iteration
  * methods itself has side-effect, e.g. IO#each_line.
  *
+ * Caution: Calling this method causes the "generator" library to be
+ * loaded.
  */
 
 static VALUE
-enumerator_next(VALUE obj)
+enumerator_next(obj)
+    VALUE obj;
 {
-    struct enumerator *e = enumerator_ptr(obj);
-    VALUE curr, v;
-    curr = rb_fiber_current();
-
-    if (!e->fib || !rb_fiber_alive_p(e->fib)) {
-	next_init(obj, e);
-    }
-
-    v = rb_fiber_resume(e->fib, 1, &curr);
-    if (e->no_next) {
-	e->fib = 0;
-	e->dst = Qnil;
-	e->no_next = Qfalse;
-	rb_raise(rb_eStopIteration, "iteration reached at end");
-    }
-    return v;
+    rb_require("generator");
+    return rb_funcall(obj, rb_intern("next"), 0, 0);
 }
 
 /*
@@ -461,24 +412,23 @@ enumerator_next(VALUE obj)
  */
 
 static VALUE
-enumerator_rewind(VALUE obj)
+enumerator_rewind(obj)
+    VALUE obj;
 {
-    struct enumerator *e = enumerator_ptr(obj);
-
-    e->fib = 0;
-    e->dst = Qnil;
-    e->no_next = Qfalse;
-    return obj;
+    rb_require("generator");
+    return rb_funcall(obj, rb_intern("rewind"), 0, 0);
 }
 
 void
-Init_Enumerator(void)
+Init_Enumerator()
 {
     rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
     rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
 
     rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
+    rb_define_method(rb_mEnumerable, "enum_slice", enum_each_slice, 1);
     rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
+    rb_define_method(rb_mEnumerable, "enum_cons", enum_each_cons, 1);
 
     rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
     rb_include_module(rb_cEnumerator, rb_mEnumerable);
@@ -489,11 +439,6 @@ Init_Enumerator(void)
     rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
     rb_define_method(rb_cEnumerator, "each_with_index", enumerator_with_index, 0);
     rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
-#if 0
-    rb_define_method(rb_cEnumerator, "with_object", enumerator_with_object, 1);
-#else
-    (void)enumerator_with_object;
-#endif
     rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
     rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);
 
diff --git a/env.h b/env.h
new file mode 100644
index 0000000000..c50103f71e
--- /dev/null
+++ b/env.h
@@ -0,0 +1,60 @@
+/**********************************************************************
+
+  env.h -
+
+  $Author$
+  $Date$
+  created at: Mon Jul 11 11:53:03 JST 1994
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifndef ENV_H
+#define ENV_H
+
+extern struct FRAME {
+    VALUE self;
+    int argc;
+    ID last_func;
+    ID orig_func;
+    VALUE last_class;
+    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
+
+extern struct SCOPE {
+    struct RBasic super;
+    ID *local_tbl;
+    VALUE *local_vars;
+    int flags;
+} *ruby_scope;
+
+#define SCOPE_ALLOCA  0
+#define SCOPE_MALLOC  1
+#define SCOPE_NOSTACK 2
+#define SCOPE_DONT_RECYCLE 4
+#define SCOPE_CLONE   8
+
+extern int ruby_in_eval;
+
+extern VALUE ruby_class;
+
+struct RVarmap {
+    struct RBasic super;
+    ID id;
+    VALUE val;
+    struct RVarmap *next;
+};
+extern struct RVarmap *ruby_dyna_vars;
+
+#endif /* ENV_H */
diff --git a/error.c b/error.c
index c88ef81323..a991f55e57 100644
--- a/error.c
+++ b/error.c
@@ -3,18 +3,25 @@
   error.c -
 
   $Author$
+  $Date$
   created at: Mon Aug  9 16:11:34 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "vm_core.h"
+#include "ruby.h"
+#include "env.h"
+#include "st.h"
 
 #include <stdio.h>
+#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
@@ -22,30 +29,33 @@
 #define EXIT_SUCCESS 0
 #endif
 
-extern const char ruby_description[];
+extern const char *ruby_description;
+
+int ruby_nerrs;
 
 static int
-err_position_0(char *buf, long len, const char *file, int line)
+err_position(buf, len)
+    char *buf;
+    long len;
 {
-    if (!file) {
+    ruby_set_current_source();
+    if (!ruby_sourcefile) {
 	return 0;
     }
-    else if (line == 0) {
-	return snprintf(buf, len, "%s: ", file);
+    else if (ruby_sourceline == 0) {
+	return snprintf(buf, len, "%s: ", ruby_sourcefile);
     }
     else {
-	return snprintf(buf, len, "%s:%d: ", file, line);
+	return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
     }
 }
 
-static int
-err_position(char *buf, long len)
-{
-    return err_position_0(buf, len, rb_sourcefile(), rb_sourceline());
-}
-
 static void
-err_snprintf(char *buf, long len, const char *fmt, va_list args)
+err_snprintf(buf, len, fmt, args)
+    char *buf;
+    long len;
+    const char *fmt;
+    va_list args;
 {
     long n;
 
@@ -55,88 +65,57 @@ err_snprintf(char *buf, long len, const char *fmt, va_list args)
     }
 }
 
+static void err_append _((const char*));
 static void
-compile_snprintf(char *buf, long len, const char *file, int line, const char *fmt, va_list args)
+err_print(fmt, args)
+    const char *fmt;
+    va_list args;
 {
-    long n;
+    char buf[BUFSIZ];
 
-    n = err_position_0(buf, len, file, line);
-    if (len > n) {
-	vsnprintf((char*)buf+n, len-n, fmt, args);
-    }
+    err_snprintf(buf, BUFSIZ, fmt, args);
+    err_append(buf);
 }
 
-static void err_append(const char*);
-
 void
-rb_compile_error(const char *file, int line, const char *fmt, ...)
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_compile_error(const char *fmt, ...)
+#else
+rb_compile_error(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
-    char buf[BUFSIZ];
 
-    va_start(args, fmt);
-    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
+    va_init_list(args, fmt);
+    err_print(fmt, args);
     va_end(args);
-    err_append(buf);
+    ruby_nerrs++;
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_compile_error_append(const char *fmt, ...)
+#else
+rb_compile_error_append(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
     char buf[BUFSIZ];
 
-    va_start(args, fmt);
+    va_init_list(args, fmt);
     vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
     err_append(buf);
 }
 
 static void
-compile_warn_print(const char *file, int line, const char *fmt, va_list args)
-{
-    char buf[BUFSIZ];
-    int len;
-
-    compile_snprintf(buf, BUFSIZ, file, line, fmt, args);
-    len = strlen(buf);
-    buf[len++] = '\n';
-    rb_write_error2(buf, len);
-}
-
-void
-rb_compile_warn(const char *file, int line, const char *fmt, ...)
-{
-    char buf[BUFSIZ];
-    va_list args;
-
-    if (NIL_P(ruby_verbose)) return;
-
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
-    va_start(args, fmt);
-    compile_warn_print(file, line, buf, args);
-    va_end(args);
-}
-
-/* rb_compile_warning() reports only in verbose mode */
-void
-rb_compile_warning(const char *file, int line, const char *fmt, ...)
-{
-    char buf[BUFSIZ];
+warn_print(fmt, args)
+    const char *fmt;
     va_list args;
-
-    if (!RTEST(ruby_verbose)) return;
-
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-
-    va_start(args, fmt);
-    compile_warn_print(file, line, buf, args);
-    va_end(args);
-}
-
-static void
-warn_print(const char *fmt, va_list args)
 {
     char buf[BUFSIZ];
     int len;
@@ -148,7 +127,13 @@ warn_print(const char *fmt, va_list args)
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_warn(const char *fmt, ...)
+#else
+rb_warn(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     char buf[BUFSIZ];
     va_list args;
@@ -157,14 +142,20 @@ rb_warn(const char *fmt, ...)
 
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
-    va_start(args, fmt);
+    va_init_list(args, fmt);
     warn_print(buf, args);
     va_end(args);
 }
 
 /* rb_warning() reports only in verbose mode */
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_warning(const char *fmt, ...)
+#else
+rb_warning(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     char buf[BUFSIZ];
     va_list args;
@@ -173,7 +164,7 @@ rb_warning(const char *fmt, ...)
 
     snprintf(buf, BUFSIZ, "warning: %s", fmt);
 
-    va_start(args, fmt);
+    va_init_list(args, fmt);
     warn_print(buf, args);
     va_end(args);
 }
@@ -187,7 +178,8 @@ rb_warning(const char *fmt, ...)
  */
 
 static VALUE
-rb_warn_m(VALUE self, VALUE mesg)
+rb_warn_m(self, mesg)
+    VALUE self, mesg;
 {
     if (!NIL_P(ruby_verbose)) {
 	rb_io_write(rb_stderr, mesg);
@@ -196,49 +188,32 @@ rb_warn_m(VALUE self, VALUE mesg)
     return Qnil;
 }
 
-void rb_vm_bugreport(void);
-
-static void
-report_bug(const char *file, int line, const char *fmt, va_list args)
+void
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_bug(const char *fmt, ...)
+#else
+rb_bug(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     char buf[BUFSIZ];
+    va_list args;
     FILE *out = stderr;
-    int len = err_position_0(buf, BUFSIZ, file, line);
+    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, "\n%s\n\n", ruby_description);
-	rb_vm_bugreport();
     }
-}
-
-void
-rb_bug(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    report_bug(rb_sourcefile(), rb_sourceline(), fmt, args);
-    va_end(args);
-
-    abort();
-}
-
-void
-rb_compile_bug(const char *file, int line, const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    report_bug(file, line, fmt, args);
-    va_end(args);
-
     abort();
 }
 
-static const struct types {
+static struct types {
     int type;
     const char *name;
 } builtin_types[] = {
@@ -256,30 +231,31 @@ static const struct types {
     {T_STRUCT,	"Struct"},
     {T_BIGNUM,	"Bignum"},
     {T_FILE,	"File"},
-    {T_RATIONAL,"Rational"},
-    {T_COMPLEX, "Complex"},
     {T_TRUE,	"true"},
     {T_FALSE,	"false"},
     {T_SYMBOL,	"Symbol"},	/* :symbol */
     {T_DATA,	"Data"},	/* internal use: wrapped C pointers */
     {T_MATCH,	"MatchData"},	/* data of $~ */
+    {T_VARMAP,	"Varmap"},	/* internal use: dynamic variables */
+    {T_SCOPE,	"Scope"},	/* internal use: variable scope */
     {T_NODE,	"Node"},	/* internal use: syntax tree node */
     {T_UNDEF,	"undef"},	/* internal use: #undef; should not happen */
+    {-1,	0}
 };
 
 void
-rb_check_type(VALUE x, int t)
+rb_check_type(x, t)
+    VALUE x;
+    int t;
 {
-    const struct types *type = builtin_types;
-    const struct types *const typeend = builtin_types +
-	sizeof(builtin_types) / sizeof(builtin_types[0]);
+    struct types *type = builtin_types;
 
     if (x == Qundef) {
 	rb_bug("undef leaked to the Ruby space");
     }
 
     if (TYPE(x) != t) {
-	while (type < typeend) {
+	while (type->type >= 0) {
 	    if (type->type == t) {
 		const char *etype;
 
@@ -293,7 +269,7 @@ rb_check_type(VALUE x, int t)
 		    etype = "Symbol";
 		}
 		else if (rb_special_const_p(x)) {
-		    etype = RSTRING_PTR(rb_obj_as_string(x));
+		    etype = RSTRING(rb_obj_as_string(x))->ptr;
 		}
 		else {
 		    etype = rb_obj_classname(x);
@@ -303,7 +279,7 @@ rb_check_type(VALUE x, int t)
 	    }
 	    type++;
 	}
-	rb_bug("unknown type 0x%x (0x%x given)", t, TYPE(x));
+	rb_bug("unknown type 0x%x", t);
     }
 }
 
@@ -320,7 +296,6 @@ VALUE rb_eRuntimeError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
 VALUE rb_eIndexError;
-VALUE rb_eKeyError;
 VALUE rb_eRangeError;
 VALUE rb_eNameError;
 VALUE rb_eNoMethodError;
@@ -335,22 +310,27 @@ VALUE rb_eLoadError;
 
 VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
-static VALUE rb_eNOERROR;
 
 VALUE
-rb_exc_new(VALUE etype, const char *ptr, long len)
+rb_exc_new(etype, ptr, len)
+    VALUE etype;
+    const char *ptr;
+    long len;
 {
     return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
 }
 
 VALUE
-rb_exc_new2(VALUE etype, const char *s)
+rb_exc_new2(etype, s)
+    VALUE etype;
+    const char *s;
 {
     return rb_exc_new(etype, s, strlen(s));
 }
 
 VALUE
-rb_exc_new3(VALUE etype, VALUE str)
+rb_exc_new3(etype, str)
+    VALUE etype, str;
 {
     StringValue(str);
     return rb_funcall(etype, rb_intern("new"), 1, str);
@@ -365,7 +345,10 @@ rb_exc_new3(VALUE etype, VALUE str)
  */
 
 static VALUE
-exc_initialize(int argc, VALUE *argv, VALUE exc)
+exc_initialize(argc, argv, exc)
+    int argc;
+    VALUE *argv;
+    VALUE exc;
 {
     VALUE arg;
 
@@ -390,7 +373,10 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
  */
 
 static VALUE
-exc_exception(int argc, VALUE *argv, VALUE self)
+exc_exception(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE exc;
 
@@ -411,7 +397,8 @@ exc_exception(int argc, VALUE *argv, VALUE self)
  */
 
 static VALUE
-exc_to_s(VALUE exc)
+exc_to_s(exc)
+    VALUE exc;
 {
     VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
 
@@ -423,6 +410,7 @@ exc_to_s(VALUE exc)
 /*
  * 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
@@ -431,7 +419,8 @@ exc_to_s(VALUE exc)
  */
 
 static VALUE
-exc_message(VALUE exc)
+exc_to_str(exc)
+    VALUE exc;
 {
     return rb_funcall(exc, rb_intern("to_s"), 0, 0);
 }
@@ -444,13 +433,14 @@ exc_message(VALUE exc)
  */
 
 static VALUE
-exc_inspect(VALUE exc)
+exc_inspect(exc)
+    VALUE exc;
 {
     VALUE str, klass;
 
     klass = CLASS_OF(exc);
     exc = rb_obj_as_string(exc);
-    if (RSTRING_LEN(exc) == 0) {
+    if (RSTRING(exc)->len == 0) {
 	return rb_str_dup(rb_class_name(klass));
     }
 
@@ -494,16 +484,18 @@ exc_inspect(VALUE exc)
 */
 
 static VALUE
-exc_backtrace(VALUE exc)
+exc_backtrace(exc)
+    VALUE exc;
 {
-    ID bt;
+    static ID bt;
 
-    CONST_ID(bt, "bt");
+    if (!bt) bt = rb_intern("bt");
     return rb_attr_get(exc, bt);
 }
 
 VALUE
-rb_check_backtrace(VALUE bt)
+rb_check_backtrace(bt)
+    VALUE bt;
 {
     long i;
     static const char err[] = "backtrace must be Array of String";
@@ -515,8 +507,8 @@ rb_check_backtrace(VALUE bt)
 	if (t != T_ARRAY) {
 	    rb_raise(rb_eTypeError, err);
 	}
-	for (i=0;i<RARRAY_LEN(bt);i++) {
-	    if (TYPE(RARRAY_PTR(bt)[i]) != T_STRING) {
+	for (i=0;i<RARRAY(bt)->len;i++) {
+	    if (TYPE(RARRAY(bt)->ptr[i]) != T_STRING) {
 		rb_raise(rb_eTypeError, err);
 	    }
 	}
@@ -535,37 +527,14 @@ rb_check_backtrace(VALUE bt)
  */
 
 static VALUE
-exc_set_backtrace(VALUE exc, VALUE bt)
+exc_set_backtrace(exc, bt)
+    VALUE exc;
+    VALUE bt;
 {
     return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
 }
 
 /*
- *  call-seq:
- *     exc == obj   => true or false
- *  
- *  Equality---If <i>obj</i> is not an <code>Exception</code>, returns
- *  <code>false</code>. Otherwise, returns <code>true</code> if <i>exc</i> and 
- *  <i>obj</i> share same class, messages, and backtrace.
- */
-
-static VALUE
-exc_equal(VALUE exc, VALUE obj)
-{
-    ID id_mesg;
-
-    if (exc == obj) return Qtrue;
-    if (rb_obj_class(exc) != rb_obj_class(obj))
-	return rb_equal(obj, exc);
-    CONST_ID(id_mesg, "mesg");
-    if (!rb_equal(rb_attr_get(exc, id_mesg), rb_attr_get(obj, id_mesg)))
-	return Qfalse;
-    if (!rb_equal(exc_backtrace(exc), exc_backtrace(obj)))
-	return Qfalse;
-    return Qtrue;
-}
-
-/*
  * call-seq:
  *   SystemExit.new(status=0)   => system_exit
  *
@@ -573,7 +542,10 @@ exc_equal(VALUE exc, VALUE obj)
  */
 
 static VALUE
-exit_initialize(int argc, VALUE *argv, VALUE exc)
+exit_initialize(argc, argv, exc)
+    int argc;
+    VALUE *argv;
+    VALUE exc;
 {
     VALUE status = INT2FIX(EXIT_SUCCESS);
     if (argc > 0 && FIXNUM_P(argv[0])) {
@@ -594,7 +566,8 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
  */
 
 static VALUE
-exit_status(VALUE exc)
+exit_status(exc)
+    VALUE exc;
 {
     return rb_attr_get(exc, rb_intern("status"));
 }
@@ -608,7 +581,8 @@ exit_status(VALUE exc)
  */
 
 static VALUE
-exit_success_p(VALUE exc)
+exit_success_p(exc)
+    VALUE exc;
 {
     VALUE status = rb_attr_get(exc, rb_intern("status"));
     if (NIL_P(status)) return Qtrue;
@@ -617,15 +591,24 @@ exit_success_p(VALUE exc)
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_name_error(ID id, const char *fmt, ...)
+#else
+rb_name_error(id, fmt, va_alist)
+    ID id;
+    const char *fmt;
+    va_dcl
+#endif
 {
     VALUE exc, argv[2];
     va_list args;
+    char buf[BUFSIZ];
 
-    va_start(args, fmt);
-    argv[0] = rb_vsprintf(fmt, args);
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
 
+    argv[0] = rb_str_new2(buf);
     argv[1] = ID2SYM(id);
     exc = rb_class_new_instance(2, argv, rb_eNameError);
     rb_exc_raise(exc);
@@ -641,7 +624,10 @@ rb_name_error(ID id, const char *fmt, ...)
  */
 
 static VALUE
-name_err_initialize(int argc, VALUE *argv, VALUE self)
+name_err_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE name;
 
@@ -659,7 +645,8 @@ name_err_initialize(int argc, VALUE *argv, VALUE self)
  */
 
 static VALUE
-name_err_name(VALUE self)
+name_err_name(self)
+    VALUE self;
 {
     return rb_attr_get(self, rb_intern("name"));
 }
@@ -668,14 +655,14 @@ name_err_name(VALUE self)
  * call-seq:
  *  name_error.to_s   => string
  *
- * Produce a nicely-formatted string representing the +NameError+.
+ * Produce a nicely-formated string representing the +NameError+.
  */
 
 static VALUE
-name_err_to_s(VALUE exc)
+name_err_to_s(exc)
+    VALUE exc;
 {
-    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
-    VALUE str = mesg;
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     StringValue(str);
@@ -697,7 +684,10 @@ name_err_to_s(VALUE exc)
  */
 
 static VALUE
-nometh_err_initialize(int argc, VALUE *argv, VALUE self)
+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);
@@ -707,14 +697,16 @@ nometh_err_initialize(int argc, VALUE *argv, VALUE self)
 
 /* :nodoc: */
 static void
-name_err_mesg_mark(VALUE *ptr)
+name_err_mesg_mark(ptr)
+    VALUE *ptr;
 {
     rb_gc_mark_locations(ptr, ptr+3);
 }
 
 /* :nodoc: */
 static VALUE
-name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
+name_err_mesg_new(obj, mesg, recv, method)
+    VALUE obj, mesg, recv, method;
 {
     VALUE *ptr = ALLOC_N(VALUE, 3);
 
@@ -726,27 +718,8 @@ name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
 
 /* :nodoc: */
 static VALUE
-name_err_mesg_equal(VALUE obj1, VALUE obj2)
-{
-    VALUE *ptr1, *ptr2;
-    int i;
-
-    if (obj1 == obj2) return Qtrue;
-    if (rb_obj_class(obj2) != rb_cNameErrorMesg)
-	return Qfalse;
-
-    Data_Get_Struct(obj1, VALUE, ptr1);
-    Data_Get_Struct(obj2, VALUE, ptr2);
-    for (i=0; i<3; i++) {
-	if (!rb_equal(ptr1[i], ptr2[i]))
-	    return Qfalse;
-    }
-    return Qtrue;
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_to_str(VALUE obj)
+name_err_mesg_to_str(obj)
+    VALUE obj;
 {
     VALUE *ptr, mesg;
     Data_Get_Struct(obj, VALUE, ptr);
@@ -770,10 +743,10 @@ name_err_mesg_to_str(VALUE obj)
 	    break;
 	  default:
 	    d = rb_protect(rb_inspect, obj, 0);
-	    if (NIL_P(d) || RSTRING_LEN(d) > 65) {
+	    if (NIL_P(d) || RSTRING(d)->len > 65) {
 		d = rb_any_to_s(obj);
 	    }
-	    desc = RSTRING_PTR(d);
+	    desc = RSTRING(d)->ptr;
 	    break;
 	}
 	if (desc && desc[0] != '#') {
@@ -792,7 +765,8 @@ name_err_mesg_to_str(VALUE obj)
 
 /* :nodoc: */
 static VALUE
-name_err_mesg_load(VALUE klass, VALUE str)
+name_err_mesg_load(klass, str)
+    VALUE klass, str;
 {
     return str;
 }
@@ -806,17 +780,19 @@ name_err_mesg_load(VALUE klass, VALUE str)
  */
 
 static VALUE
-nometh_err_args(VALUE self)
+nometh_err_args(self)
+    VALUE self;
 {
     return rb_attr_get(self, rb_intern("args"));
 }
 
 void
-rb_invalid_str(const char *str, const char *type)
+rb_invalid_str(str, type)
+    const char *str, *type;
 {
     VALUE s = rb_str_inspect(rb_str_new2(str));
 
-    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING_PTR(s));
+    rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
 }
 
 /* 
@@ -847,13 +823,15 @@ rb_invalid_str(const char *str, const char *type)
  *  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, ...
+ *     Errno.constants   #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
  */
 
 static st_table *syserr_tbl;
 
 static VALUE
-set_syserr(int n, const char *name)
+set_syserr(n, name)
+    int n;
+    const char *name;
 {
     VALUE error;
 
@@ -869,7 +847,8 @@ set_syserr(int n, const char *name)
 }
 
 static VALUE
-get_syserr(int n)
+get_syserr(n)
+    int n;
 {
     VALUE error;
 
@@ -894,7 +873,10 @@ get_syserr(int n)
  */
 
 static VALUE
-syserr_initialize(int argc, VALUE *argv, VALUE self)
+syserr_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
 #if !defined(_WIN32) && !defined(__VMS)
     char *strerror();
@@ -924,10 +906,14 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
     else err = "unknown error";
     if (!NIL_P(mesg)) {
 	VALUE str = mesg;
+	size_t len;
 
 	StringValue(str);
-	mesg = rb_sprintf("%s - %.*s", err,
-			  (int)RSTRING_LEN(str), RSTRING_PTR(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);
@@ -945,7 +931,8 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
  */
 
 static VALUE
-syserr_errno(VALUE self)
+syserr_errno(self)
+    VALUE self;
 {
     return rb_attr_get(self, rb_intern("errno"));
 }
@@ -958,20 +945,20 @@ syserr_errno(VALUE self)
  * if the error numbers _self_ and _other_ are the same.
  */
 
+
 static VALUE
-syserr_eqq(VALUE self, VALUE exc)
+syserr_eqq(self, exc)
+    VALUE self, exc;
 {
     VALUE num, e;
-    ID en;
-
-    CONST_ID(en, "errno");
+    ID en = rb_intern("errno");
 
     if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
 	if (!rb_respond_to(exc, en)) return Qfalse;
     }
     else if (self == rb_eSystemCallError) return Qtrue;
 
-    num = rb_attr_get(exc, rb_intern("errno"));
+    num = rb_attr_get(exc, en);
     if (NIL_P(num)) {
 	num = rb_funcall(exc, en, 0, 0);
     }
@@ -982,19 +969,7 @@ syserr_eqq(VALUE self, VALUE exc)
 }
 
 /*
- * call-seq:
- *   Errno.const_missing   => SystemCallError
- *
- * Returns default SystemCallError class.
- */
-static VALUE
-errno_missing(VALUE self, VALUE id)
-{
-    return rb_eNOERROR;
-}
-
-/*
- *  Descendants of class <code>Exception</code> are used to communicate
+ *  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
@@ -1004,15 +979,15 @@ errno_missing(VALUE self, VALUE id)
  */
 
 void
-Init_Exception(void)
+Init_Exception()
 {
     rb_eException   = rb_define_class("Exception", rb_cObject);
     rb_define_singleton_method(rb_eException, "exception", rb_class_new_instance, -1);
     rb_define_method(rb_eException, "exception", exc_exception, -1);
     rb_define_method(rb_eException, "initialize", exc_initialize, -1);
-    rb_define_method(rb_eException, "==", exc_equal, 1);
     rb_define_method(rb_eException, "to_s", exc_to_s, 0);
-    rb_define_method(rb_eException, "message", exc_message, 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, "inspect", exc_inspect, 0);
     rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
     rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
@@ -1030,21 +1005,13 @@ Init_Exception(void)
     rb_eTypeError     = rb_define_class("TypeError", rb_eStandardError);
     rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
     rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
-    rb_eKeyError      = rb_define_class("KeyError", rb_eIndexError);
     rb_eRangeError    = rb_define_class("RangeError", rb_eStandardError);
-
-    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
-    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
-    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
-    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
-
     rb_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, "==", name_err_mesg_equal, 1);
     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);
@@ -1052,8 +1019,13 @@ Init_Exception(void)
     rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
     rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
 
+    rb_eScriptError = rb_define_class("ScriptError", rb_eException);
+    rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+    rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
+    rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
-    rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
+    rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
     rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
 
     syserr_tbl = st_init_numtable();
@@ -1063,58 +1035,78 @@ Init_Exception(void)
     rb_define_singleton_method(rb_eSystemCallError, "===", syserr_eqq, 1);
 
     rb_mErrno = rb_define_module("Errno");
-    rb_define_singleton_method(rb_mErrno, "const_missing", errno_missing, 1);
 
     rb_define_global_function("warn", rb_warn_m, 1);
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_raise(VALUE exc, const char *fmt, ...)
+#else
+rb_raise(exc, fmt, va_alist)
+    VALUE exc;
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
-    VALUE mesg;
+    char buf[BUFSIZ];
 
-    va_start(args, fmt);
-    mesg = rb_vsprintf(fmt, args);
+    va_init_list(args,fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new3(exc, mesg));
+    rb_exc_raise(rb_exc_new2(exc, buf));
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_loaderror(const char *fmt, ...)
+#else
+rb_loaderror(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
-    VALUE mesg;
+    char buf[BUFSIZ];
 
-    va_start(args, fmt);
-    mesg = rb_vsprintf(fmt, args);
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
-    rb_exc_raise(rb_exc_new3(rb_eLoadError, mesg));
+    rb_exc_raise(rb_exc_new2(rb_eLoadError, buf));
 }
 
 void
-rb_notimplement(void)
+rb_notimplement()
 {
     rb_raise(rb_eNotImpError,
 	     "%s() function is unimplemented on this machine",
-	     rb_id2name(rb_frame_this_func()));
+	     rb_id2name(ruby_frame->last_func));
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_fatal(const char *fmt, ...)
+#else
+rb_fatal(fmt, va_alist)
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
-    VALUE mesg;
+    char buf[BUFSIZ];
 
-    va_start(args, fmt);
-    mesg = rb_vsprintf(fmt, args);
+    va_init_list(args, fmt);
+    vsnprintf(buf, BUFSIZ, fmt, args);
     va_end(args);
 
-    rb_exc_fatal(rb_exc_new3(rb_eFatal, mesg));
+    ruby_in_eval = 0;
+    rb_exc_fatal(rb_exc_new2(rb_eFatal, buf));
 }
 
 void
-rb_sys_fail(const char *mesg)
+rb_sys_fail(mesg)
+    const char *mesg;
 {
     int n = errno;
     VALUE arg;
@@ -1129,45 +1121,54 @@ rb_sys_fail(const char *mesg)
 }
 
 void
+#ifdef HAVE_STDARG_PROTOTYPES
 rb_sys_warning(const char *fmt, ...)
+#else
+rb_sys_warning(fmt, va_alist)
+     const char *fmt;
+     va_dcl
+#endif
 {
-    char buf[BUFSIZ];
-    va_list args;
-    int errno_save;
-
-    errno_save = errno;
-
-    if (!RTEST(ruby_verbose)) return;
-
-    snprintf(buf, BUFSIZ, "warning: %s", fmt);
-    snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
-
-    va_start(args, fmt);
-    warn_print(buf, args);
-    va_end(args);
-    errno = errno_save;
+     char buf[BUFSIZ];
+     va_list args;
+     int errno_save;
+     
+     errno_save = errno;
+
+     if (!RTEST(ruby_verbose)) return;
+
+     snprintf(buf, BUFSIZ, "warning: %s", fmt);
+     snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
+     
+     va_init_list(args, fmt);
+     warn_print(buf, args);
+     va_end(args);
+     errno = errno_save;
 }
 
 void
-rb_load_fail(const char *path)
+rb_load_fail(path)
+    const char *path;
 {
     rb_loaderror("%s -- %s", strerror(errno), path);
 }
 
 void
-rb_error_frozen(const char *what)
+rb_error_frozen(what)
+    const char *what;
 {
-    rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
+    rb_raise(rb_eTypeError, "can't modify frozen %s", what);
 }
 
 void
-rb_check_frozen(VALUE obj)
+rb_check_frozen(obj)
+    VALUE obj;
 {
     if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
 }
 
 void
-Init_syserr(void)
+Init_syserr()
 {
 #ifdef EPERM
     set_syserr(EPERM, "EPERM");
@@ -1535,33 +1536,27 @@ Init_syserr(void)
 #ifdef EDQUOT
     set_syserr(EDQUOT, "EDQUOT");
 #endif
-    rb_eNOERROR = set_syserr(0, "NOERROR");
 }
 
 static void
-err_append(const char *s)
+err_append(s)
+    const char *s;
 {
-    rb_thread_t *th = GET_THREAD();
-    VALUE err = th->errinfo;
+    extern VALUE ruby_errinfo;
 
-    if (th->mild_compile_error) {
-	if (!RTEST(err)) {
-	    err = rb_exc_new2(rb_eSyntaxError, s);
-	    th->errinfo = err;
+    if (ruby_in_eval) {
+	if (NIL_P(ruby_errinfo)) {
+	    ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
 	}
 	else {
-	    VALUE str = rb_obj_as_string(err);
+	    VALUE str = rb_obj_as_string(ruby_errinfo);
 
 	    rb_str_cat2(str, "\n");
 	    rb_str_cat2(str, s);
-	    th->errinfo = rb_exc_new3(rb_eSyntaxError, str);
+	    ruby_errinfo = rb_exc_new3(rb_eSyntaxError, str);
 	}
     }
     else {
-	if (!RTEST(err)) {
-	    err = rb_exc_new2(rb_eSyntaxError, "compile error");
-	    th->errinfo = err;
-	}
 	rb_write_error(s);
 	rb_write_error("\n");
     }
diff --git a/eval.c b/eval.c
index 142433ac93..8eb16853af 100644
--- a/eval.c
+++ b/eval.c
@@ -3,31 +3,1335 @@
   eval.c -
 
   $Author$
+  $Date$
   created at: Thu Jun 10 14:22:17 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "eval_intern.h"
+#include "ruby.h"
+#include "node.h"
+#include "env.h"
+#include "util.h"
+#include "rubysig.h"
 
-VALUE proc_invoke(VALUE, VALUE, VALUE, VALUE);
-VALUE rb_binding_new(void);
-NORETURN(void rb_raise_jump(VALUE));
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
+
+#include <stdio.h>
+
+#include "st.h"
+#include "dln.h"
+
+#ifdef __APPLE__
+#include <crt_externs.h>
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif /* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+#   endif
+#  endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_STDARG_PROTOTYPES
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
+#else
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
+#endif
+
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include <time.h>
+
+#ifdef __BEOS__
+#include <net/socket.h>
+#endif
+
+#ifdef __MACOS__
+#include "macruby_private.h"
+#endif
+
+#ifdef __VMS
+#include "vmsruby_private.h"
+#endif
+
+#ifdef USE_CONTEXT
+
+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(just_before_setjmp, j) ((j)->status = 0, \
+     (just_before_setjmp), \
+     PRE_GETCONTEXT, \
+     getcontext(&(j)->context), \
+     POST_GETCONTEXT, \
+     (j)->status)
+#else
+#  define ruby_setjmp(just_before_setjmp, env) \
+     ((just_before_setjmp), RUBY_SETJMP(env))
+#  define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
+#  ifdef __CYGWIN__
+int _setjmp(), _longjmp();
+#  endif
+#endif
+
+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>
+
+#if defined(__VMS)
+#pragma nostandard
+#endif
+
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#include <sys/stat.h>
+
+VALUE rb_cProc;
+VALUE rb_cBinding;
+static VALUE proc_invoke _((VALUE,VALUE,VALUE,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 method_call _((int, VALUE*, VALUE));
+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
+#define SCOPE_PRIVATE   1
+#define SCOPE_PROTECTED 2
+#define SCOPE_MODFUNC   5
+#define SCOPE_MASK      7
+#define SCOPE_SET(f)  (scope_vmode=(f))
+#define SCOPE_TEST(f) (scope_vmode&(f))
+
+VALUE (*ruby_sandbox_save)_((rb_thread_t));
+VALUE (*ruby_sandbox_restore)_((rb_thread_t));
+NODE* ruby_current_node;
+int ruby_safe_level = 0;
+/* safe-level:
+   0 - strings from streams/environment/ARGV are tainted (default)
+   1 - no dangerous operation by tainted value
+   2 - process/file operations prohibited
+   3 - all generated objects are tainted
+   4 - no global (non-tainted) variable modification/no direct output
+*/
+
+static VALUE safe_getter _((void));
+static void safe_setter _((VALUE val));
+
+void
+rb_secure(level)
+    int level;
+{
+    if (level <= ruby_safe_level) {
+	if (ruby_frame->last_func) {
+	    rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
+		     rb_id2name(ruby_frame->last_func), ruby_safe_level);
+	}
+	else {
+	    rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
+	}
+    }
+}
+
+void
+rb_secure_update(obj)
+    VALUE obj;
+{
+    if (!OBJ_TAINTED(obj)) rb_secure(4);
+}
+
+void
+rb_check_safe_obj(x)
+    VALUE x;
+{
+    if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
+	if (ruby_frame->last_func) {
+	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
+		     rb_id2name(ruby_frame->last_func));
+	}
+	else {
+	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
+	}
+    }
+    rb_secure(4);
+}
+
+void
+rb_check_safe_str(x)
+    VALUE x;
+{
+    rb_check_safe_obj(x);
+    if (TYPE(x)!= T_STRING) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
+		 rb_obj_classname(x));
+    }
+}
+
+NORETURN(static void print_undef _((VALUE, ID)));
+static void
+print_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    rb_name_error(id, "undefined method `%s' for %s `%s'",
+		  rb_id2name(id),
+		  (TYPE(klass) == T_MODULE) ? "module" : "class",
+		  rb_class2name(klass));
+}
+
+static ID removed, singleton_removed, undefined, singleton_undefined;
+
+#define CACHE_SIZE 0x800
+#define CACHE_MASK 0x7ff
+#define EXPR1(c,m) ((((c)>>3)^(m))&CACHE_MASK)
+
+struct cache_entry {		/* method hash table. */
+    ID mid;			/* method's id */
+    ID mid0;			/* method's original id */
+    VALUE klass;		/* receiver's class */
+    VALUE origin;		/* where method defined  */
+    NODE *method;
+    int noex;
+};
+
+static struct cache_entry cache[CACHE_SIZE];
+static int ruby_running = 0;
+
+void
+rb_clear_cache()
+{
+   struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	ent->mid = 0;
+	ent++;
+    }
+}
+
+static void
+rb_clear_cache_for_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->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;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->mid == id) {
+	    ent->mid = 0;
+	}
+	ent++;
+    }
+}
+
+void
+rb_clear_cache_by_class(klass)
+    VALUE klass;
+{
+    struct cache_entry *ent, *end;
+
+    if (!ruby_running) return;
+    ent = cache; end = ent + CACHE_SIZE;
+    while (ent < end) {
+	if (ent->klass == klass || ent->origin == klass) {
+	    ent->mid = 0;
+	}
+	ent++;
+    }
+}
+
+static ID init, eqq, each, aref, aset, match, missing;
+static ID added, singleton_added;
+static ID __id__, __send__, 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)
+
+void
+rb_add_method(klass, mid, node, noex)
+    VALUE klass;
+    ID mid;
+    NODE *node;
+    int noex;
+{
+    NODE *body;
+
+    if (NIL_P(klass)) klass = rb_cObject;
+    if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
+	rb_raise(rb_eSecurityError, "Insecure: can't define method");
+    }
+    if (!FL_TEST(klass, FL_SINGLETON) &&
+	node && nd_type(node) != NODE_ZSUPER &&
+	(mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
+	noex = NOEX_PRIVATE | noex;
+    }
+    else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
+	     mid == rb_intern("allocate")) {
+	rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
+		rb_class2name(rb_iv_get(klass, "__attached__")));
+	mid = ID_ALLOCATOR;
+    }
+    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+    rb_clear_cache_by_id(mid);
+    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+    st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
+    if (node && mid != ID_ALLOCATOR && ruby_running) {
+	if (FL_TEST(klass, FL_SINGLETON)) {
+	    rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
+	}
+	else {
+	    rb_funcall(klass, added, 1, ID2SYM(mid));
+	}
+    }
+}
+
+void
+rb_define_alloc_func(klass, func)
+    VALUE klass;
+    VALUE (*func) _((VALUE));
+{
+    Check_Type(klass, T_CLASS);
+    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0),
+		  NOEX_PRIVATE);
+}
+
+void
+rb_undef_alloc_func(klass)
+    VALUE klass;
+{
+    Check_Type(klass, T_CLASS);
+    rb_add_method(rb_singleton_class(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+}
+
+static NODE*
+search_method(klass, id, origin)
+    VALUE klass, *origin;
+    ID id;
+{
+    st_data_t body;
+
+    if (!klass) return 0;
+    while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) {
+	klass = RCLASS(klass)->super;
+	if (!klass) return 0;
+    }
+
+    if (origin) *origin = klass;
+    return (NODE *)body;
+}
+
+static NODE*
+rb_get_method_body(klassp, idp, noexp)
+    VALUE *klassp;
+    ID *idp;
+    int *noexp;
+{
+    ID id = *idp;
+    VALUE klass = *klassp;
+    VALUE origin = 0;
+    NODE * volatile body;
+    struct cache_entry *ent;
+
+    if ((body = search_method(klass, id, &origin)) == 0 || !body->nd_body) {
+	/* store empty info in cache */
+	ent = cache + EXPR1(klass, id);
+	ent->klass  = klass;
+	ent->origin = klass;
+	ent->mid = ent->mid0 = id;
+	ent->noex   = 0;
+	ent->method = 0;
+
+	return 0;
+    }
+
+    if (ruby_running) {
+	/* store in cache */
+	ent = cache + EXPR1(klass, id);
+	ent->klass  = klass;
+	ent->noex   = body->nd_noex;
+	if (noexp) *noexp = body->nd_noex;
+	body = body->nd_body;
+	if (nd_type(body) == NODE_FBODY) {
+	    ent->mid = id;
+	    *klassp = body->nd_orig;
+	    ent->origin = body->nd_orig;
+	    *idp = ent->mid0 = body->nd_mid;
+	    body = ent->method = body->nd_head;
+	}
+	else {
+	    *klassp = origin;
+	    ent->origin = origin;
+	    ent->mid = ent->mid0 = id;
+	    ent->method = body;
+	}
+    }
+    else {
+	if (noexp) *noexp = body->nd_noex;
+	body = body->nd_body;
+	if (nd_type(body) == NODE_FBODY) {
+	    *klassp = body->nd_orig;
+	    *idp = body->nd_mid;
+	    body = body->nd_head;
+	}
+	else {
+	    *klassp = origin;
+	}
+    }
+
+    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;
+    ID mid;
+{
+    st_data_t data;
+    NODE *body = 0;
+
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't remove method");
+    }
+    if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
+    if (mid == __id__ || mid == __send__ || mid == init) {
+	rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
+    }
+    if (st_lookup(RCLASS(klass)->m_tbl, mid, &data)) {
+	body = (NODE *)data;
+	if (!body || !body->nd_body) body = 0;
+	else {
+	    st_delete(RCLASS(klass)->m_tbl, &mid, &data);
+	}
+    }
+    if (!body) {
+	rb_name_error(mid, "method `%s' not defined in %s",
+		      rb_id2name(mid), rb_class2name(klass));
+    }
+    rb_clear_cache_for_undef(klass, mid);
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
+    }
+    else {
+	rb_funcall(klass, removed, 1, ID2SYM(mid));
+    }
+}
+
+void
+rb_remove_method(klass, name)
+    VALUE klass;
+    const char *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;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	remove_method(mod, rb_to_id(argv[i]));
+    }
+    return mod;
+}
+
+#undef rb_disable_super
+#undef rb_enable_super
+
+void
+rb_disable_super(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    /* obsolete - no use */
+}
+
+void
+rb_enable_super(klass, name)
+    VALUE klass;
+    const char *name;
+{
+    rb_warn("rb_enable_super() is obsolete");
+}
+
+static void
+rb_export_method(klass, name, noex)
+    VALUE klass;
+    ID name;
+    ID noex;
+{
+    NODE *body;
+    VALUE origin;
+
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    body = search_method(klass, name, &origin);
+    if (!body && TYPE(klass) == T_MODULE) {
+	body = search_method(rb_cObject, name, &origin);
+    }
+    if (!body || !body->nd_body) {
+	print_undef(klass, name);
+    }
+    if (body->nd_noex != noex) {
+	if (klass == origin) {
+	    body->nd_noex = noex;
+	}
+	else {
+	    rb_add_method(klass, name, NEW_ZSUPER(), noex);
+	}
+    }
+}
+
+int
+rb_method_boundp(klass, id, ex)
+    VALUE klass;
+    ID id;
+    int ex;
+{
+    struct cache_entry *ent;
+    int noex;
+
+    /* is it in the method cache? */
+    ent = cache + EXPR1(klass, id);
+    if (ent->mid == id && ent->klass == klass) {
+	if (ex && (ent->noex & NOEX_PRIVATE))
+	    return Qfalse;
+	if (!ent->method) return Qfalse;
+	return Qtrue;
+    }
+    if (rb_get_method_body(&klass, &id, &noex)) {
+	if (ex && (noex & NOEX_PRIVATE))
+	    return Qfalse;
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+void
+rb_attr(klass, id, read, write, ex)
+    VALUE klass;
+    ID id;
+    int read, write, ex;
+{
+    const char *name;
+    char *buf;
+    ID attriv;
+    int noex;
+    size_t len;
+
+    if (!ex) noex = NOEX_PUBLIC;
+    else {
+	if (SCOPE_TEST(SCOPE_PRIVATE)) {
+	    noex = NOEX_PRIVATE;
+	    rb_warning((scope_vmode == SCOPE_MODFUNC) ?
+		       "attribute accessor as module_function" :
+		       "private attribute?");
+	}
+	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+	    noex = NOEX_PROTECTED;
+	}
+	else {
+	    noex = NOEX_PUBLIC;
+	}
+    }
+
+    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);
+    attriv = rb_intern(buf);
+    if (read) {
+	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
+    }
+    if (write) {
+	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+    }
+}
+
+extern int ruby_in_compile;
+
+VALUE ruby_errinfo = Qnil;
+extern NODE *ruby_eval_tree_begin;
+extern NODE *ruby_eval_tree;
+extern int ruby_nerrs;
 
-ID rb_frame_callee(void);
 VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
-#define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
+extern VALUE ruby_top_self;
+
+struct FRAME *ruby_frame;
+struct SCOPE *ruby_scope;
+static struct FRAME *top_frame;
+static struct SCOPE *top_scope;
+
+static unsigned long frame_unique = 0;
+
+#define PUSH_FRAME() do {		\
+    volatile struct FRAME _frame;	\
+    _frame.prev = ruby_frame;		\
+    _frame.tmp  = 0;			\
+    _frame.node = ruby_current_node;	\
+    _frame.iter = ruby_iter->iter;	\
+    _frame.argc = 0;			\
+    _frame.flags = 0;			\
+    _frame.uniq = frame_unique++;	\
+    ruby_frame = &_frame
+
+#define POP_FRAME()  			\
+    ruby_current_node = _frame.node;	\
+    ruby_frame = _frame.prev;		\
+} while (0)
+
+struct BLOCK {
+    NODE *var;
+    NODE *body;
+    VALUE self;
+    struct FRAME frame;
+    struct SCOPE *scope;
+    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
+
+static struct BLOCK *ruby_block;
+static unsigned long block_unique = 1;
+
+#define PUSH_BLOCK(v,b) do {		\
+    struct BLOCK _block;		\
+    _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; \
+} while (0)
+
+struct RVarmap *ruby_dyna_vars;
+#define PUSH_VARS() do { \
+    struct RVarmap * volatile _old; \
+    _old = ruby_dyna_vars; \
+    ruby_dyna_vars = 0
+
+#define POP_VARS() \
+    if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
+	if (RBASIC(_old)->flags) /* unless it's already recycled */ \
+	    FL_SET(_old, DVAR_DONT_RECYCLE); \
+    }\
+    ruby_dyna_vars = _old; \
+} while (0)
+
+#define DVAR_DONT_RECYCLE FL_USER2
+
+#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
+
+static struct RVarmap*
+new_dvar(id, value, prev)
+    ID id;
+    VALUE value;
+    struct RVarmap *prev;
+{
+    NEWOBJ(vars, struct RVarmap);
+    OBJSETUP(vars, 0, T_VARMAP);
+    vars->id = id;
+    vars->val = value;
+    vars->next = prev;
+
+    return vars;
+}
+
+VALUE
+rb_dvar_defined(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == id) return Qtrue;
+	vars = vars->next;
+    }
+    return Qfalse;
+}
+
+VALUE
+rb_dvar_curr(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == 0) break;
+	if (vars->id == id) return Qtrue;
+	vars = vars->next;
+    }
+    return Qfalse;
+}
+
+VALUE
+rb_dvar_ref(id)
+    ID id;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (vars->id == id) {
+	    return vars->val;
+	}
+	vars = vars->next;
+    }
+    return Qnil;
+}
+
+void
+rb_dvar_push(id, value)
+    ID id;
+    VALUE value;
+{
+    ruby_dyna_vars = new_dvar(id, value, ruby_dyna_vars);
+}
+
+static void
+dvar_asgn_internal(id, value, curr)
+    ID id;
+    VALUE value;
+    int curr;
+{
+    int n = 0;
+    struct RVarmap *vars = ruby_dyna_vars;
+
+    while (vars) {
+	if (curr && vars->id == 0) {
+	    /* first null is a dvar header */
+	    n++;
+	    if (n == 2) break;
+	}
+	if (vars->id == id) {
+	    vars->val = value;
+	    return;
+	}
+	vars = vars->next;
+    }
+    if (!ruby_dyna_vars) {
+	ruby_dyna_vars = new_dvar(id, value, 0);
+    }
+    else {
+	vars = new_dvar(id, value, ruby_dyna_vars->next);
+	ruby_dyna_vars->next = vars;
+    }
+}
+
+static inline void
+dvar_asgn(id, value)
+    ID id;
+    VALUE value;
+{
+    dvar_asgn_internal(id, value, 0);
+}
+
+static inline void
+dvar_asgn_curr(id, value)
+    ID id;
+    VALUE value;
+{
+    dvar_asgn_internal(id, value, 1);
+}
+
+VALUE *
+rb_svar(cnt)
+    int cnt;
+{
+    struct RVarmap *vars = ruby_dyna_vars;
+    ID id;
+
+    if (!ruby_scope->local_tbl) return NULL;
+    if (cnt >= ruby_scope->local_tbl[0]) return NULL;
+    id = ruby_scope->local_tbl[cnt+1];
+    while (vars) {
+	if (vars->id == id) return &vars->val;
+	vars = vars->next;
+    }
+    if (ruby_scope->local_vars == 0) return NULL;
+    return &ruby_scope->local_vars[cnt];
+}
+
+struct iter {
+    int iter;
+    struct iter *prev;
+};
+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;			\
+    _iter.prev = ruby_iter;		\
+    _iter.iter = (i);			\
+    ruby_iter = &_iter
+
+#define POP_ITER()			\
+    ruby_iter = _iter.prev;		\
+} while (0)
+
+struct tag {
+    rb_jmpbuf_t buf;
+    struct FRAME *frame;
+    struct iter *iter;
+    VALUE tag;
+    VALUE retval;
+    struct SCOPE *scope;
+    VALUE dst;
+    struct tag *prev;
+    int blkid;
+};
+static struct tag *prot_tag;
+
+#define PUSH_TAG(ptag) do {		\
+    struct tag _tag;			\
+    _tag.retval = Qnil;			\
+    _tag.frame = ruby_frame;		\
+    _tag.iter = ruby_iter;		\
+    _tag.prev = 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 EXEC_TAG()    ruby_setjmp(((void)0), prot_tag->buf)
+
+#define JUMP_TAG(st) do {		\
+    ruby_frame = prot_tag->frame;	\
+    ruby_iter = prot_tag->iter;		\
+    ruby_longjmp(prot_tag->buf,(st));	\
+} while (0)
+
+#define POP_TAG()			\
+    prot_tag = _tag.prev;		\
+} while (0)
+
+#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
+
+#define TAG_RETURN	0x1
+#define TAG_BREAK	0x2
+#define TAG_NEXT	0x3
+#define TAG_RETRY	0x4
+#define TAG_REDO	0x5
+#define TAG_RAISE	0x6
+#define TAG_THROW	0x7
+#define TAG_FATAL	0x8
+#define TAG_MASK	0xf
+
+VALUE ruby_class;
+static VALUE ruby_wrapper;	/* security wrapper */
+
+#define PUSH_CLASS(c) do {		\
+    volatile VALUE _class = ruby_class;	\
+    ruby_class = (c)
+
+#define POP_CLASS() ruby_class = _class; \
+} while (0)
+
+NODE *ruby_cref = 0;
+NODE *ruby_top_cref;
+#define PUSH_CREF(c) ruby_cref = NEW_CREF(c,ruby_cref)
+#define POP_CREF() ruby_cref = ruby_cref->nd_next
+
+#define PUSH_SCOPE() do {		\
+    volatile int _vmode = scope_vmode;	\
+    struct SCOPE * volatile _old;	\
+    NEWOBJ(_scope, struct SCOPE);	\
+    OBJSETUP(_scope, 0, T_SCOPE);	\
+    _scope->local_tbl = 0;		\
+    _scope->local_vars = 0;		\
+    _scope->flags = 0;			\
+    _old = ruby_scope;			\
+    ruby_scope = _scope;		\
+    scope_vmode = SCOPE_PUBLIC
+
+rb_thread_t rb_curr_thread;
+rb_thread_t rb_main_thread;
+#define main_thread rb_main_thread
+#define curr_thread rb_curr_thread
+
+static void scope_dup _((struct SCOPE *));
+
+#define POP_SCOPE() 			\
+    if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
+	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) {	\
+	    rb_gc_force_recycle((VALUE)ruby_scope);\
+	}				\
+    }					\
+    ruby_scope->flags |= SCOPE_NOSTACK;	\
+    ruby_scope = _old;			\
+    scope_vmode = _vmode;		\
+} while (0)
+
+static VALUE rb_eval _((VALUE,NODE*));
+static VALUE eval _((VALUE,VALUE,VALUE,const char*,int));
+static NODE *compile _((VALUE, const 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
+#define YIELD_FUNC_LAMBDA 3
+
+static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
+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));
+
+#if 0
+#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
+			      ruby_sourceline = nd_line(ruby_current_node))
+#else
+#define SET_CURRENT_SOURCE() ((void)0)
+#endif
+
+void
+ruby_set_current_source()
+{
+    if (ruby_current_node) {
+	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));
+	}
+	else if (ruby_sourceline == 0) {
+	    warn_printf("%s", ruby_sourcefile);
+	}
+	else {
+	    warn_printf("%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);
+}
+
+static void
+set_backtrace(info, bt)
+    VALUE info, bt;
+{
+    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
+}
+
+static void
+error_print()
+{
+    VALUE errat = Qnil;		/* OK */
+    volatile VALUE eclass, e;
+    const char *einfo;
+    long elen;
+
+    if (NIL_P(ruby_errinfo)) return;
+
+    PUSH_TAG(PROT_NONE);
+    if (EXEC_TAG() == 0) {
+	errat = get_backtrace(ruby_errinfo);
+    }
+    else {
+	errat = Qnil;
+    }
+    if (EXEC_TAG()) goto error;
+    if (NIL_P(errat)){
+	ruby_set_current_source();
+	if (ruby_sourcefile)
+	    warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+	else
+	    warn_printf("%d", ruby_sourceline);
+    }
+    else if (RARRAY(errat)->len == 0) {
+	error_pos();
+    }
+    else {
+	VALUE mesg = RARRAY(errat)->ptr[0];
+
+	if (NIL_P(mesg)) error_pos();
+	else {
+	    warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
+	}
+    }
+
+    eclass = CLASS_OF(ruby_errinfo);
+    if (EXEC_TAG() == 0) {
+  	e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
+ 	StringValue(e);
+	einfo = RSTRING(e)->ptr;
+	elen = RSTRING(e)->len;
+    }
+    else {
+	einfo = "";
+	elen = 0;
+    }
+    if (EXEC_TAG()) goto error;
+    if (eclass == rb_eRuntimeError && elen == 0) {
+	warn_print(": unhandled exception\n");
+    }
+    else {
+	VALUE epath;
 
-#include "eval_error.c"
-#include "eval_safe.c"
-#include "eval_jump.c"
+	epath = rb_class_name(eclass);
+	if (elen == 0) {
+	    warn_print(": ");
+	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+	    warn_print("\n");
+	}
+	else {
+	    char *tail  = 0;
+	    long len = elen;
+
+	    if (RSTRING(epath)->ptr[0] == '#') epath = 0;
+	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
+		len = tail - einfo;
+		tail++;		/* skip newline */
+	    }
+	    warn_print(": ");
+	    warn_print2(einfo, len);
+	    if (epath) {
+		warn_print(" (");
+		warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+		warn_print(")\n");
+	    }
+	    if (tail && elen>len+1) {
+		warn_print2(tail, elen-len-1);
+		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
+	    }
+	}
+    }
 
-/* initialize ruby */
+    if (!NIL_P(errat)) {
+	long i;
+	struct RArray *ep = RARRAY(errat);
+        int truncate = eclass == rb_eSysStackError;
+
+#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
+#define TRACE_HEAD 8
+#define TRACE_TAIL 5
+
+	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);
+	    }
+	    if (truncate && i == TRACE_HEAD && ep->len > TRACE_MAX) {
+		warn_printf("\t ... %ld levels...\n",
+			ep->len - TRACE_HEAD - TRACE_TAIL);
+		i = ep->len - TRACE_TAIL;
+	    }
+	}
+    }
+  error:
+    POP_TAG();
+}
 
 #if defined(__APPLE__)
 #define environ (*_NSGetEnviron())
@@ -36,23 +1340,45 @@ extern char **environ;
 #endif
 char **rb_origenviron;
 
-void rb_clear_trace_func(void);
-void rb_thread_stop_timer_thread(void);
+void rb_call_inits _((void));
+void Init_stack _((VALUE*));
+void Init_heap _((void));
+void Init_ext _((void));
 
-void rb_call_inits(void);
-void Init_heap(void);
-void Init_ext(void);
-void Init_BareVM(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_init(void)
+ruby_native_thread_kill(sig)
+    int sig;
+{
+    NATIVETHREAD_KILL(ruby_thid, sig);
+}
+# endif
+#endif
+
+void
+ruby_init()
 {
     static int initialized = 0;
+    static struct FRAME frame;
+    static struct iter iter;
     int state;
 
     if (initialized)
 	return;
     initialized = 1;
+#ifdef HAVE_NATIVETHREAD
+    ruby_thid = NATIVETHREAD_CURRENT();
+#endif
+
+    ruby_frame = top_frame = &frame;
+    ruby_iter = &iter;
 
 #ifdef __MACOS__
     rb_origenviron = 0;
@@ -60,123 +1386,224 @@ ruby_init(void)
     rb_origenviron = environ;
 #endif
 
-    Init_stack((void *)&state);
-    Init_BareVM();
+    Init_stack((void*)&state);
     Init_heap();
-
-    PUSH_TAG();
+    PUSH_SCOPE();
+    ruby_scope->local_vars = 0;
+    ruby_scope->local_tbl  = 0;
+    top_scope = ruby_scope;
+    /* default visibility is private at toplevel */
+    SCOPE_SET(SCOPE_PRIVATE);
+
+    PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
 	rb_call_inits();
-
+	ruby_class = rb_cObject;
+	ruby_frame->self = ruby_top_self;
+	ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+	ruby_cref = ruby_top_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);
     }
-    GET_VM()->running = 1;
+    POP_SCOPE();
+    ruby_scope = top_scope;
+    top_scope->flags &= ~SCOPE_NOSTACK;
+    ruby_running = 1;
 }
 
-extern void rb_clear_trace_func(void);
+static VALUE
+eval_node(self, node)
+    VALUE self;
+    NODE *node;
+{
+    NODE *beg_tree = ruby_eval_tree_begin;
+
+    ruby_eval_tree_begin = 0;
+    if (beg_tree) {
+	rb_eval(self, beg_tree);
+    }
 
-void *
-ruby_options(int argc, char **argv)
+    if (!node) return Qnil;
+    return rb_eval(self, node);
+}
+
+int ruby_in_eval;
+
+static void rb_thread_cleanup _((void));
+static void rb_thread_wait_other_threads _((void));
+
+static int thread_no_ensure _((void));
+
+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;
+    rb_thread_t th = curr_thread;
+
+    if (rb_thread_set_raised(th))
+	return EXIT_FAILURE;
+    switch (ex & TAG_MASK) {
+      case 0:
+	status = EXIT_SUCCESS;
+	break;
+
+      case TAG_RETURN:
+	error_pos();
+	warn_print(": unexpected return\n");
+	break;
+      case TAG_NEXT:
+	error_pos();
+	warn_print(": unexpected next\n");
+	break;
+      case TAG_BREAK:
+	error_pos();
+	warn_print(": unexpected break\n");
+	break;
+      case TAG_REDO:
+	error_pos();
+	warn_print(": unexpected redo\n");
+	break;
+      case TAG_RETRY:
+	error_pos();
+	warn_print(": retry outside of rescue clause\n");
+	break;
+      case TAG_THROW:
+	if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
+	    NODE *tag = prot_tag->frame->node;
+	    warn_printf("%s:%d: uncaught throw\n",
+		    tag->nd_file, nd_line(tag));
+	}
+	else {
+	    error_pos();
+	    warn_printf(": unexpected throw\n");
+	}
+	break;
+      case TAG_RAISE:
+      case TAG_FATAL:
+	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	    status = sysexit_status(ruby_errinfo);
+	}
+	else if (rb_obj_is_instance_of(ruby_errinfo, rb_eSignal)) {
+	    /* no message when exiting by signal */
+	}
+	else {
+	    error_print();
+	}
+	break;
+      default:
+	rb_bug("Unknown longjmp status %d", ex);
+	break;
+    }
+    rb_thread_reset_raised(th);
+    return status;
+}
+
+void
+ruby_options(argc, argv)
+    int argc;
+    char **argv;
 {
     int state;
-    void *tree = 0;
 
-    Init_stack((void *)&state);
-    PUSH_TAG();
+    Init_stack((void*)&state);
+    PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(GET_THREAD(), tree = ruby_process_options(argc, argv));
+	ruby_process_options(argc, argv);
     }
     else {
-	rb_clear_trace_func();
-	state = error_handle(state);
-	tree = (void *)INT2FIX(state);
+	trace_func = 0;
+	tracing = 0;
+	exit(error_handle(state));
     }
     POP_TAG();
-    return tree;
 }
 
+void rb_exec_end_proc _((void));
+
 static void
-ruby_finalize_0(void)
+ruby_finalize_0()
 {
-    PUSH_TAG();
+    PUSH_TAG(PROT_NONE);
     if (EXEC_TAG() == 0) {
 	rb_trap_exit();
     }
     POP_TAG();
     rb_exec_end_proc();
-    rb_clear_trace_func();
 }
 
 static void
-ruby_finalize_1(void)
+ruby_finalize_1()
 {
-    ruby_sig_finalize();
-    GET_THREAD()->errinfo = Qnil;
+    signal(SIGINT, SIG_DFL);
+    ruby_errinfo = 0;
     rb_gc_call_finalizer_at_exit();
+    trace_func = 0;
+    tracing = 0;
 }
 
 void
-ruby_finalize(void)
+ruby_finalize()
 {
     ruby_finalize_0();
     ruby_finalize_1();
 }
 
-void rb_thread_stop_timer_thread(void);
-
 int
-ruby_cleanup(int ex)
+ruby_cleanup(ex)
+    int ex;
 {
     int state;
     volatile VALUE errs[2];
-    rb_thread_t *th = GET_THREAD();
     int nerr;
 
-    errs[1] = th->errinfo;
-    th->safe_level = 0;
+    errs[1] = ruby_errinfo;
+    ruby_safe_level = 0;
     Init_stack((void *)&state);
-
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, ruby_finalize_0());
-    }
-    POP_TAG();
-
-    errs[0] = th->errinfo;
-    PUSH_TAG();
+    ruby_finalize_0();
+    errs[0] = ruby_errinfo;
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
     if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
+	rb_thread_cleanup();
+	rb_thread_wait_other_threads();
     }
     else if (ex == 0) {
 	ex = state;
     }
-    th->errinfo = errs[1];
+    POP_ITER();
+    ruby_errinfo = errs[1];
     ex = error_handle(ex);
     ruby_finalize_1();
     POP_TAG();
-    rb_thread_stop_timer_thread();
 
     for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
 	VALUE err = errs[nerr];
 
 	if (!RTEST(err)) continue;
 
-	/* th->errinfo contains a NODE while break'ing */
-	if (TYPE(err) == T_NODE) continue;
-
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
 	    return sysexit_status(err);
 	}
@@ -203,54 +1630,347 @@ ruby_cleanup(int ex)
     return ex;
 }
 
-int
-ruby_exec_node(void *n, const char *file)
+static int
+ruby_exec_internal()
 {
     int state;
-    VALUE iseq = (VALUE)n;
-    rb_thread_t *th = GET_THREAD();
 
-    if (!n) return 0;
-
-    PUSH_TAG();
+    PUSH_TAG(PROT_NONE);
+    PUSH_ITER(ITER_NOT);
+    /* default visibility is private at toplevel */
+    SCOPE_SET(SCOPE_PRIVATE);
     if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, {
-	    th->base_block = 0;
-	    rb_iseq_eval(iseq);
-	});
+	eval_node(ruby_top_self, ruby_eval_tree);
     }
+    POP_ITER();
     POP_TAG();
     return state;
 }
 
 void
-ruby_stop(int ex)
+ruby_stop(ex)
+    int ex;
 {
     exit(ruby_cleanup(ex));
 }
 
 int
-ruby_run_node(void *n)
+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);
+    state = ruby_exec();
+    if (state && !ex) ex = state;
+    ruby_stop(ex);
+}
+
+static void
+compile_error(at)
+    const char *at;
+{
+    VALUE str;
+
+    ruby_nerrs = 0;
+    str = rb_str_buf_new2("compile error");
+    if (at) {
+	rb_str_buf_cat2(str, " in ");
+	rb_str_buf_cat2(str, at);
+    }
+    rb_str_buf_cat(str, "\n", 1);
+    if (!NIL_P(ruby_errinfo)) {
+	rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+    }
+    rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
+}
+
+VALUE
+rb_eval_string(str)
+    const char *str;
+{
+    VALUE v;
+    NODE *oldsrc = ruby_current_node;
+
+    ruby_current_node = 0;
+    ruby_sourcefile = rb_source_filename("(eval)");
+    v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
+    ruby_current_node = oldsrc;
+
+    return v;
+}
+
+VALUE
+rb_eval_string_protect(str, state)
+    const char *str;
+    int *state;
+{
+    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+}
+
+VALUE
+rb_eval_string_wrap(str, state)
+    const char *str;
+    int *state;
+{
+    int status;
+    VALUE self = ruby_top_self;
+    VALUE wrapper = ruby_wrapper;
+    VALUE val;
+
+    PUSH_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->last_class = 0;
+    ruby_frame->self = self;
+    PUSH_CREF(ruby_wrapper);
+    PUSH_SCOPE();
+
+    val = rb_eval_string_protect(str, &status);
+    ruby_top_self = self;
+
+    POP_SCOPE();
+    POP_FRAME();
+    POP_CLASS();
+    ruby_wrapper = wrapper;
+    if (state) {
+	*state = status;
+    }
+    else if (status) {
+	JUMP_TAG(status);
+    }
+    return val;
+}
+
+NORETURN(static void localjump_error(const char*, VALUE, int));
+static void
+localjump_error(mesg, value, reason)
+    const char *mesg;
+    VALUE value;
+    int reason;
+{
+    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_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)
+    VALUE exc;
+{
+    return rb_iv_get(exc, "@reason");
+}
+
+NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
+static void
+jump_tag_but_local_jump(state, val)
+    int state;
+    VALUE val;
+{
+
+    if (val == Qundef) val = prot_tag->retval;
+    switch (state) {
+      case 0:
+	break;
+      case TAG_RETURN:
+	localjump_error("unexpected return", val, state);
+	break;
+      case TAG_BREAK:
+	localjump_error("unexpected break", val, state);
+	break;
+      case TAG_NEXT:
+	localjump_error("unexpected next", val, state);
+	break;
+      case TAG_REDO:
+	localjump_error("unexpected redo", Qnil, state);
+	break;
+      case TAG_RETRY:
+	localjump_error("retry outside of rescue clause", Qnil, state);
+	break;
+      default:
+	break;
+    }
+    JUMP_TAG(state);
+}
+
+VALUE
+rb_eval_cmd(cmd, arg, level)
+    VALUE cmd, arg;
+    int level;
+{
+    int state;
+    VALUE val = Qnil;		/* 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();
+	POP_ITER();
+	if (state) JUMP_TAG(state);
+	return val;
+    }
+
+    saved_scope = ruby_scope;
+    ruby_scope = top_scope;
+    PUSH_FRAME();
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    ruby_frame->self = ruby_top_self;
+    PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
+
+    ruby_safe_level = level;
+
+    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);
+    ruby_scope = saved_scope;
+    ruby_safe_level = safe;
+    POP_TAG();
+    POP_FRAME();
+
+    if (state) jump_tag_but_local_jump(state, val);
+    return val;
+}
+
+#define ruby_cbase (ruby_cref->nd_clss)
+
+static VALUE
+ev_const_defined(cref, id, self)
+    NODE *cref;
+    ID id;
+    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;
+	    }
+	}
+	cbase = cbase->nd_next;
+    }
+    return rb_const_defined(cref->nd_clss, id);
+}
+
+static VALUE
+ev_const_get(cref, id, self)
+    NODE *cref;
+    ID id;
+    VALUE self;
 {
-    VALUE v = (VALUE)n;
+    NODE *cbase = cref;
+    VALUE result;
+
+    while (cbase && cbase->nd_next) {
+	VALUE klass = cbase->nd_clss;
 
-    switch (v) {
-      case Qtrue:  return EXIT_SUCCESS;
-      case Qfalse: return EXIT_FAILURE;
+	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;
+	    }
+	}
+	cbase = cbase->nd_next;
     }
-    if (FIXNUM_P(v)) {
-	return FIX2INT(v);
+    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+}
+
+static VALUE
+cvar_cbase()
+{
+    NODE *cref = ruby_cref;
+
+    while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || 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");
     }
-    Init_stack((void *)&n);
-    return ruby_cleanup(ruby_exec_node(n, 0));
+    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
@@ -261,17 +1981,17 @@ ruby_run_node(void *n)
  */
 
 static VALUE
-rb_mod_nesting(void)
+rb_mod_nesting()
 {
+    NODE *cbase = ruby_cref;
     VALUE ary = rb_ary_new();
-    const NODE *cref = vm_cref();
 
-    while (cref && cref->nd_next) {
-	VALUE klass = cref->nd_clss;
-	if (!NIL_P(klass)) {
-	    rb_ary_push(ary, klass);
-	}
-	cref = cref->nd_next;
+    while (cbase && cbase->nd_next) {
+	if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
+	cbase = cbase->nd_next;
+    }
+    if (ruby_wrapper && RARRAY(ary)->len == 0) {
+	rb_ary_push(ary, ruby_wrapper);
     }
     return ary;
 }
@@ -279,48 +1999,39 @@ rb_mod_nesting(void)
 /*
  *  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(int argc, VALUE *argv, VALUE mod)
+rb_mod_s_constants()
 {
-    const NODE *cref = vm_cref();
-    VALUE klass;
-    VALUE cbase = 0;
+    NODE *cbase = ruby_cref;
     void *data = 0;
 
-    if (argc > 0) {
-	return rb_mod_constants(argc, argv, rb_cModule);
-    }
-
-    while (cref) {
-	klass = cref->nd_clss;
-	if (!NIL_P(klass)) {
-	    data = rb_mod_const_at(cref->nd_clss, data);
-	    if (!cbase) {
-		cbase = klass;
-	    }
+    while (cbase) {
+	if (!NIL_P(cbase->nd_clss)) {
+	    data = rb_mod_const_at(cbase->nd_clss, data);
 	}
-	cref = cref->nd_next;
+	cbase = cbase->nd_next;
     }
 
-    if (cbase) {
-	data = rb_mod_const_of(cbase, data);
+    if (!NIL_P(ruby_cbase)) {
+	data = rb_mod_const_of(ruby_cbase, data);
     }
     return rb_const_list(data);
 }
 
 void
-rb_frozen_class_p(VALUE klass)
+rb_frozen_class_p(klass)
+    VALUE klass;
 {
     const char *desc = "something(?!)";
 
@@ -331,46 +2042,2553 @@ rb_frozen_class_p(VALUE klass)
 	    switch (TYPE(klass)) {
 	      case T_MODULE:
 	      case T_ICLASS:
-		desc = "module";
+		desc = "module"; break;
+	      case T_CLASS:
+		desc = "class"; break;
+	    }
+	}
+	rb_error_frozen(desc);
+    }
+}
+
+void
+rb_undef(klass, id)
+    VALUE klass;
+    ID id;
+{
+    VALUE origin;
+    NODE *body;
+
+    if (ruby_cbase == rb_cObject && klass == rb_cObject) {
+	rb_secure(4);
+    }
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
+    }
+    rb_frozen_class_p(klass);
+    if (id == __id__ || id == __send__ || id == init) {
+	rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
+    }
+    body = search_method(klass, id, &origin);
+    if (!body || !body->nd_body) {
+	const char *s0 = " class";
+	VALUE c = klass;
+
+	if (FL_TEST(c, FL_SINGLETON)) {
+	    VALUE obj = rb_iv_get(klass, "__attached__");
+
+	    switch (TYPE(obj)) {
+	      case T_MODULE:
+	      case T_CLASS:
+		c = obj;
+		s0 = "";
+	    }
+	}
+	else if (TYPE(c) == T_MODULE) {
+	    s0 = " module";
+	}
+	rb_name_error(id, "undefined method `%s' for%s `%s'",
+		      rb_id2name(id),s0,rb_class2name(c));
+    }
+    rb_add_method(klass, id, 0, NOEX_PUBLIC);
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	rb_funcall(rb_iv_get(klass, "__attached__"),
+		   singleton_undefined, 1, ID2SYM(id));
+    }
+    else {
+	rb_funcall(klass, undefined, 1, ID2SYM(id));
+    }
+}
+
+/*
+ *  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;
+{
+    int i;
+
+    for (i=0; i<argc; i++) {
+	rb_undef(mod, rb_to_id(argv[i]));
+    }
+    return mod;
+}
+
+void
+rb_alias(klass, name, def)
+    VALUE klass;
+    ID name, def;
+{
+    VALUE origin = 0;
+    NODE *orig, *body, *node;
+    VALUE singleton = 0;
+    st_data_t data;
+
+    rb_frozen_class_p(klass);
+    if (name == def) return;
+    if (klass == rb_cObject) {
+	rb_secure(4);
+    }
+    orig = search_method(klass, def, &origin);
+    if (!orig || !orig->nd_body) {
+	if (TYPE(klass) == T_MODULE) {
+	    orig = search_method(rb_cObject, def, &origin);
+	}
+    }
+    if (!orig || !orig->nd_body) {
+	print_undef(klass, def);
+    }
+    if (FL_TEST(klass, FL_SINGLETON)) {
+	singleton = rb_iv_get(klass, "__attached__");
+    }
+    body = orig->nd_body;
+    orig->nd_cnt++;
+    if (nd_type(body) == NODE_FBODY) { /* was alias */
+	def = body->nd_mid;
+	origin = body->nd_orig;
+	body = body->nd_head;
+    }
+
+    rb_clear_cache_by_id(name);
+    if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, &data)) {
+	node = (NODE *)data;
+	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)));
+
+    if (!ruby_running) return;
+
+    if (singleton) {
+	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
+    }
+    else {
+	rb_funcall(klass, added, 1, ID2SYM(name));
+    }
+}
+
+/*
+ *  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;
+{
+    rb_alias(mod, rb_to_id(newname), rb_to_id(oldname));
+    return mod;
+}
+
+NODE *
+rb_copy_node_scope(node, rval)
+    NODE *node;
+    NODE *rval;
+{
+    NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
+
+    if (node->nd_tbl) {
+	copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
+	MEMCPY(copy->nd_tbl, node->nd_tbl, ID, node->nd_tbl[0]+1);
+    }
+    else {
+	copy->nd_tbl = 0;
+    }
+    return copy;
+}
+
+#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),	\
+     (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 {\
+    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;\
+	    n = anode;\
+	    argv = TMP_ALLOC(argc+extra);\
+	    for (i=0;i<argc;i++) {\
+		argv[i] = rb_eval(self,n->nd_head);\
+		n=n->nd_next;\
+	    }\
+	}\
+	else {\
+	    argc = 0;\
+	    argv = 0;\
+	}\
+    }\
+    else {\
+	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);\
+	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
+    }\
+} while (0)
+
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+
+#define BEGIN_CALLARGS do {\
+    struct BLOCK *tmp_block = ruby_block;\
+    int tmp_iter = ruby_iter->iter;\
+    switch (tmp_iter) {\
+      case ITER_PRE:\
+	if (ruby_block) ruby_block = ruby_block->outer;\
+      case ITER_PAS:\
+	tmp_iter = ITER_NOT;\
+    }\
+    PUSH_ITER(tmp_iter)
+
+#define END_CALLARGS \
+    ruby_block = tmp_block;\
+    POP_ITER();\
+} while (0)
+
+#define MATCH_DATA *rb_svar(node->nd_cnt)
+
+static const char* is_defined _((VALUE, NODE*, char*));
+
+static const char*
+arg_defined(self, node, buf, type)
+    VALUE self;
+    NODE *node;
+    char *buf;
+    char *type;
+{
+    int argc;
+    int i;
+
+    if (!node) return type;	/* no args */
+    if (nd_type(node) == NODE_ARRAY) {
+	argc=node->nd_alen;
+	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 const char*
+is_defined(self, node, buf)
+    VALUE self;
+    NODE *node;			/* OK */
+    char *buf;
+{
+    VALUE val;			/* OK */
+    int state;
+
+  again:
+    if (!node) return "expression";
+    switch (nd_type(node)) {
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	if (ruby_frame->last_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)) {
+	    if (nd_type(node) == NODE_SUPER) {
+		return arg_defined(self, node->nd_args, buf, "super");
+	    }
+	    return "super";
+	}
+	break;
+
+      case NODE_VCALL:
+      case NODE_FCALL:
+	val = self;
+	goto check_bound;
+
+      case NODE_ATTRASGN:
+	val = self;
+	if (node->nd_recv == (NODE *)1) goto check_bound;
+      case NODE_CALL:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    val = rb_eval(self, node->nd_recv);
+	}
+	POP_TAG();
+	if (state) {
+	    ruby_errinfo = Qnil;
+	    return 0;
+	}
+      check_bound:
+	{
+	    int call = nd_type(node)==NODE_CALL;
+
+	    val = CLASS_OF(val);
+	    if (call) {
+		int noex;
+		ID id = node->nd_mid;
+
+		if (!rb_get_method_body(&val, &id, &noex))
+		    break;
+		if ((noex & NOEX_PRIVATE))
+		    break;
+		if ((noex & NOEX_PROTECTED) &&
+		    !rb_obj_is_kind_of(self, rb_class_real(val)))
+		    break;
+	    }
+	    else if (!rb_method_boundp(val, node->nd_mid, call))
 		break;
+	    return arg_defined(self, node->nd_args, buf,
+			       nd_type(node) == NODE_ATTRASGN ?
+			       "assignment" : "method");
+	}
+	break;
+
+      case NODE_MATCH2:
+      case NODE_MATCH3:
+	return "method";
+
+      case NODE_YIELD:
+	if (rb_block_given_p()) {
+	    return "yield";
+	}
+	break;
+
+      case NODE_SELF:
+	return "self";
+
+      case NODE_NIL:
+	return "nil";
+
+      case NODE_TRUE:
+	return "true";
+
+      case NODE_FALSE:
+	return "false";
+
+      case NODE_ATTRSET:
+      case NODE_OP_ASGN1:
+      case NODE_OP_ASGN2:
+      case NODE_OP_ASGN_OR:
+      case NODE_OP_ASGN_AND:
+      case NODE_MASGN:
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_GASGN:
+      case NODE_IASGN:
+      case NODE_CDECL:
+      case NODE_CVDECL:
+      case NODE_CVASGN:
+	return "assignment";
+
+      case NODE_LVAR:
+	return "local-variable";
+      case NODE_DVAR:
+	return "local-variable(in-block)";
+
+      case NODE_GVAR:
+	if (rb_gvar_defined(node->nd_entry)) {
+	    return "global-variable";
+	}
+	break;
+
+      case NODE_IVAR:
+	if (rb_ivar_defined(self, node->nd_vid)) {
+	    return "instance-variable";
+	}
+	break;
+
+      case NODE_CONST:
+	if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
+	    return "constant";
+	}
+	break;
+
+      case NODE_CVAR:
+	if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
+	    return "class variable";
+	}
+	break;
+
+      case NODE_COLON2:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    val = rb_eval(self, node->nd_head);
+	}
+	POP_TAG();
+	if (state) {
+	    ruby_errinfo = Qnil;
+	    return 0;
+	}
+	else {
+	    switch (TYPE(val)) {
 	      case T_CLASS:
-		desc = "class";
+	      case T_MODULE:
+		if (rb_const_defined_from(val, node->nd_mid))
+		    return "constant";
 		break;
+	      default:
+		if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
+		    return "method";
+		}
 	    }
 	}
-	rb_error_frozen(desc);
+	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);
+	    return buf;
+	}
+	break;
+
+      case NODE_BACK_REF:
+	if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
+	    sprintf(buf, "$%c", (char)node->nd_nth);
+	    return buf;
+	}
+	break;
+
+      case NODE_NEWLINE:
+	node = node->nd_next;
+	goto again;
+
+      default:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    rb_eval(self, node);
+	}
+	POP_TAG();
+	if (!state) {
+	    return "expression";
+	}
+	ruby_errinfo = Qnil;
+	break;
+    }
+    return 0;
+}
+
+static int handle_rescue _((VALUE,NODE*));
+
+static void blk_free();
+
+static VALUE
+rb_obj_is_proc(proc)
+    VALUE proc;
+{
+    if (TYPE(proc) == T_DATA && RDATA(proc)->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;
+{
+    rb_event_hook_t *hook;
+
+    hook = ALLOC(rb_event_hook_t);
+    hook->func = func;
+    hook->events = events;
+    hook->next = event_hooks;
+    event_hooks = hook;
+}
+
+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 const 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";
+    }
+}
+
+static void
+call_trace_func(event, node, self, id, klass)
+    rb_event_t event;
+    NODE *node;
+    VALUE self;
+    ID id;
+    VALUE klass;		/* OK */
+{
+    int state, raised;
+    struct FRAME *prev;
+    NODE *node_save;
+    VALUE srcfile;
+    const char *event_name;
+    rb_thread_t th = curr_thread;
+
+    if (!trace_func) return;
+    if (tracing) return;
+    if (ruby_in_compile) return;
+    if (id == ID_ALLOCATOR) return;
+
+    if (!(node_save = ruby_current_node)) {
+	node_save = NEW_NEWLINE(0);
+    }
+    tracing = 1;
+    prev = ruby_frame;
+    PUSH_FRAME();
+    *ruby_frame = *prev;
+    ruby_frame->prev = prev;
+    ruby_frame->iter = 0;	/* blocks not available anyway */
+
+    if (node) {
+	ruby_current_node = node;
+	ruby_frame->node = node;
+	ruby_sourcefile = node->nd_file;
+	ruby_sourceline = nd_line(node);
+    }
+    if (klass) {
+	if (TYPE(klass) == T_ICLASS) {
+	    klass = RBASIC(klass)->klass;
+	}
+	else if (FL_TEST(klass, FL_SINGLETON)) {
+	    klass = rb_iv_get(klass, "__attached__");
+	}
+    }
+    PUSH_TAG(PROT_NONE);
+    raised = rb_thread_reset_raised(th);
+    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),
+					    srcfile,
+					    INT2FIX(ruby_sourceline),
+					    id?ID2SYM(id):Qnil,
+					    self?rb_f_binding(self):Qnil,
+					    klass),
+		    Qundef, 0);
+    }
+    if (raised) rb_thread_set_raised(th);
+    POP_TAG();
+    POP_FRAME();
+
+    tracing = 0;
+    ruby_current_node = node_save;
+    SET_CURRENT_SOURCE();
+    if (state) JUMP_TAG(state);
+}
+
+static VALUE
+avalue_to_svalue(v)
+    VALUE v;
+{
+    VALUE tmp, top;
+
+    tmp = rb_check_array_type(v);
+    if (NIL_P(tmp)) {
+	return v;
+    }
+    if (RARRAY(tmp)->len == 0) {
+	return Qundef;
+    }
+    if (RARRAY(tmp)->len == 1) {
+	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+	if (NIL_P(top)) {
+	    return RARRAY(tmp)->ptr[0];
+	}
+	if (RARRAY(top)->len > 1) {
+	    return v;
+	}
+	return top;
+    }
+    return tmp;
+}
+
+static VALUE
+svalue_to_avalue(v)
+    VALUE v;
+{
+    VALUE tmp, top;
+
+    if (v == Qundef) return rb_ary_new2(0);
+    tmp = rb_check_array_type(v);
+    if (NIL_P(tmp)) {
+	return rb_ary_new3(1, v);
+    }
+    if (RARRAY(tmp)->len == 1) {
+	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
+	if (!NIL_P(top) && RARRAY(top)->len > 1) {
+	    return 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);
+    }
+    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;
+{
+    if (!cpath) {
+	rb_bug("class path missing");
+    }
+    if (cpath->nd_head) {
+	VALUE c = rb_eval(self, cpath->nd_head);
+	switch (TYPE(c)) {
+	  case T_CLASS:
+	  case T_MODULE:
+	    break;
+	  default:
+	    rb_raise(rb_eTypeError, "%s is not a class/module",
+		     RSTRING(rb_obj_as_string(c))->ptr);
+	}
+	return c;
+    }
+    else if (nd_type(cpath) == NODE_COLON2) {
+	return ruby_cbase;
+    }
+    else if (ruby_wrapper) {
+	return ruby_wrapper;
+    }
+    else {
+	return rb_cObject;
+    }
+}
+
+#define return_value(v) do {\
+  if ((prot_tag->retval = (v)) == Qundef) {\
+    prot_tag->retval = Qnil;\
+  }\
+} while (0)
+
+NORETURN(static void 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;
+    NODE *n;
+{
+    NODE * volatile contnode = 0;
+    NODE * volatile node = n;
+    int state;
+    volatile VALUE result = Qnil;
+    st_data_t data;
+
+#define RETURN(v) do { \
+    result = (v); \
+    goto finish; \
+} while (0)
+
+  again:
+    if (!node) RETURN(Qnil);
+
+    ruby_current_node = node;
+    switch (nd_type(node)) {
+      case NODE_BLOCK:
+	if (contnode) {
+	    result = rb_eval(self, node);
+	    break;
+	}
+	contnode = node->nd_next;
+	node = node->nd_head;
+	goto again;
+
+      case NODE_POSTEXE:
+	rb_f_END();
+	nd_set_type(node, NODE_NIL); /* exec just once */
+	result = Qnil;
+	break;
+
+	/* begin .. end without clauses */
+      case NODE_BEGIN:
+	node = node->nd_body;
+	goto again;
+
+	/* nodes for speed-up(default match) */
+      case NODE_MATCH:
+	result = rb_reg_match2(node->nd_lit);
+	break;
+
+	/* nodes for speed-up(literal match) */
+      case NODE_MATCH2:
+	{
+	    VALUE l = rb_eval(self,node->nd_recv);
+	    VALUE r = rb_eval(self,node->nd_value);
+	    result = rb_reg_match(l, r);
+	}
+	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) {
+		result = rb_reg_match(r, l);
+	    }
+	    else {
+		result = rb_funcall(l, match, 1, r);
+	    }
+	}
+	break;
+
+	/* node for speed-up(top-level loop for -n/-p) */
+      case NODE_OPT_N:
+	PUSH_TAG(PROT_LOOP);
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	  opt_n_next:
+	    while (!NIL_P(rb_gets())) {
+	      opt_n_redo:
+		rb_eval(self, node->nd_body);
+	    }
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto opt_n_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto opt_n_next;
+	  case TAG_BREAK:
+	    state = 0;
+	  default:
+	    break;
+	}
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(Qnil);
+
+      case NODE_SELF:
+	RETURN(self);
+
+      case NODE_NIL:
+	RETURN(Qnil);
+
+      case NODE_TRUE:
+	RETURN(Qtrue);
+
+      case NODE_FALSE:
+	RETURN(Qfalse);
+
+      case NODE_IF:
+	if (RTEST(rb_eval(self, node->nd_cond))) {
+	    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	    node = node->nd_body;
+	}
+	else {
+	    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	    node = node->nd_else;
+	}
+	goto again;
+
+      case NODE_WHEN:
+	while (node) {
+	    NODE *tag;
+
+	    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) {
+		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
+		    long i;
+
+		    if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+		    for (i=0; i<RARRAY(v)->len; i++) {
+			if (RTEST(RARRAY(v)->ptr[i])) {
+			    node = node->nd_body;
+			    goto again;
+			}
+		    }
+		    tag = tag->nd_next;
+		    continue;
+		}
+		if (RTEST(rb_eval(self, tag->nd_head))) {
+		    node = node->nd_body;
+		    goto again;
+		}
+		tag = tag->nd_next;
+	    }
+	    node = node->nd_next;
+	}
+	RETURN(Qnil);
+
+      case NODE_CASE:
+	{
+	    VALUE val;
+
+	    val = rb_eval(self, node->nd_head);
+	    node = node->nd_body;
+	    while (node) {
+		NODE *tag;
+
+		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) {
+			VALUE v = rb_eval(self, tag->nd_head->nd_head);
+			long i;
+
+			if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+			for (i=0; i<RARRAY(v)->len; i++) {
+			    if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
+				node = node->nd_body;
+				goto again;
+			    }
+			}
+			tag = tag->nd_next;
+			continue;
+		    }
+		    if (RTEST(rb_funcall2(rb_eval(self, tag->nd_head), eqq, 1, &val))) {
+			node = node->nd_body;
+			goto again;
+		    }
+		    tag = tag->nd_next;
+		}
+		node = node->nd_next;
+	    }
+	}
+	RETURN(Qnil);
+
+      case NODE_WHILE:
+	PUSH_TAG(PROT_LOOP);
+	result = Qnil;
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	    if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
+		goto while_out;
+	    do {
+	      while_redo:
+		rb_eval(self, node->nd_body);
+	      while_next:
+		;
+	    } while (RTEST(rb_eval(self, node->nd_cond)));
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto while_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto while_next;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    /* fall through */
+	  default:
+	    break;
+	}
+      while_out:
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(result);
+
+      case NODE_UNTIL:
+	PUSH_TAG(PROT_LOOP);
+	result = Qnil;
+	switch (state = EXEC_TAG()) {
+	  case 0:
+	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
+		goto until_out;
+	    do {
+	      until_redo:
+		rb_eval(self, node->nd_body);
+	      until_next:
+		;
+	    } while (!RTEST(rb_eval(self, node->nd_cond)));
+	    break;
+
+	  case TAG_REDO:
+	    state = 0;
+	    goto until_redo;
+	  case TAG_NEXT:
+	    state = 0;
+	    goto until_next;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    /* fall through */
+	  default:
+	    break;
+	}
+      until_out:
+	POP_TAG();
+	if (state) JUMP_TAG(state);
+	RETURN(result);
+
+      case NODE_BLOCK_PASS:
+	result = block_pass(self, node);
+	break;
+
+      case NODE_ITER:
+      case NODE_FOR:
+	{
+	    PUSH_TAG(PROT_LOOP);
+	    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);
+		}
+		else {
+		    VALUE recv;
+
+		    _block.flags &= ~BLOCK_D_SCOPE;
+		    BEGIN_CALLARGS;
+		    recv = rb_eval(self, node->nd_iter);
+		    END_CALLARGS;
+		    ruby_current_node = node;
+		    SET_CURRENT_SOURCE();
+		    result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+		}
+		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;
+	    }
+	    POP_BLOCK();
+	    POP_TAG();
+	    switch (state) {
+	      case 0:
+		break;
+	      default:
+		JUMP_TAG(state);
+	    }
+	}
+	break;
+
+      case NODE_BREAK:
+	break_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_NEXT:
+	CHECK_INTS;
+	next_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_REDO:
+	CHECK_INTS;
+	JUMP_TAG(TAG_REDO);
+	break;
+
+      case NODE_RETRY:
+	CHECK_INTS;
+	JUMP_TAG(TAG_RETRY);
+	break;
+
+      case NODE_SPLAT:
+	result = splat_value(rb_eval(self, node->nd_head));
+	break;
+
+      case NODE_TO_ARY:
+	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
+	break;
+
+      case NODE_SVALUE:
+	result = avalue_splat(rb_eval(self, node->nd_head));
+	if (result == Qundef) result = Qnil;
+	break;
+
+      case NODE_YIELD:
+	if (node->nd_head) {
+	    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);
+	break;
+
+      case NODE_RESCUE:
+	{
+	    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;
+
+		rescuing = -1;
+		while (resq) {
+		    ruby_current_node = resq;
+		    if (handle_rescue(self, resq)) {
+			state = 0;
+			rescuing = 1;
+			result = rb_eval(self, resq->nd_body);
+			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;
+	    }
+	}
+	break;
+
+      case NODE_ENSURE:
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    result = rb_eval(self, node->nd_head);
+	}
+	POP_TAG();
+	if (node->nd_ensr && !thread_no_ensure()) {
+	    VALUE retval = prot_tag->retval; /* save retval */
+	    VALUE errinfo = ruby_errinfo;
+
+	    rb_eval(self, node->nd_ensr);
+	    return_value(retval);
+	    ruby_errinfo = errinfo;
+	}
+	if (state) JUMP_TAG(state);
+	break;
+
+      case NODE_AND:
+	result = rb_eval(self, node->nd_1st);
+	if (!RTEST(result)) break;
+	node = node->nd_2nd;
+	goto again;
+
+      case NODE_OR:
+	result = rb_eval(self, node->nd_1st);
+	if (RTEST(result)) break;
+	node = node->nd_2nd;
+	goto again;
+
+      case NODE_NOT:
+	if (RTEST(rb_eval(self, node->nd_body))) result = Qfalse;
+	else result = Qtrue;
+	break;
+
+      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);
+	}	
+	break;
+
+      case NODE_FLIP2:		/* like AWK */
+	{
+	    VALUE *flip = rb_svar(node->nd_cnt);
+	    if (!flip) rb_bug("unexpected local variable");
+	    if (!RTEST(*flip)) {
+		if (RTEST(rb_eval(self, node->nd_beg))) {
+		    *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
+		    result = Qtrue;
+		}
+		else {
+		    result = Qfalse;
+		}
+	    }
+	    else {
+		if (RTEST(rb_eval(self, node->nd_end))) {
+		    *flip = Qfalse;
+		}
+		result = Qtrue;
+	    }
+	}
+	break;
+
+      case NODE_FLIP3:		/* like SED */
+	{
+	    VALUE *flip = rb_svar(node->nd_cnt);
+	    if (!flip) rb_bug("unexpected local variable");
+	    if (!RTEST(*flip)) {
+		result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
+		*flip = result;
+	    }
+	    else {
+		if (RTEST(rb_eval(self, node->nd_end))) {
+		    *flip = Qfalse;
+		}
+		result = Qtrue;
+	    }
+	}
+	break;
+
+      case NODE_RETURN:
+	return_jump(rb_eval(self, node->nd_stts));
+	break;
+
+      case NODE_ARGSCAT:
+	{
+	    VALUE args = rb_eval(self, node->nd_head);
+	    result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
+	}
+	break;
+
+      case NODE_ARGSPUSH:
+	{
+	    VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
+	    result = rb_ary_push(args, rb_eval(self, node->nd_body));
+	}
+	break;
+
+      case NODE_ATTRASGN:
+	{
+	    VALUE recv;
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    int scope;
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    if (node->nd_recv == (NODE *)1) {
+		recv = self;
+		scope = 1;
+	    }
+	    else {
+		recv = rb_eval(self, node->nd_recv);
+		scope = 0;
+	    }
+	    SETUP_ARGS(node->nd_args);
+	    END_CALLARGS;
+
+	    ruby_current_node = node;
+	    SET_CURRENT_SOURCE();
+	    rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
+	    result = argv[argc-1];
+	}
+	break;
+
+      case NODE_CALL:
+	{
+	    VALUE recv;
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    recv = rb_eval(self, node->nd_recv);
+	    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,self);
+	}
+	break;
+
+      case NODE_FCALL:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    BEGIN_CALLARGS;
+	    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,self);
+	}
+	break;
+
+      case NODE_VCALL:
+	SET_CURRENT_SOURCE();
+	result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
+	break;
+
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    TMP_PROTECT;
+
+	    if (ruby_frame->last_class == 0) {
+		if (ruby_frame->last_func) {
+		    rb_name_error(ruby_frame->last_func,
+				  "superclass method `%s' disabled",
+				  rb_id2name(ruby_frame->orig_func));
+		}
+		else {
+		    rb_raise(rb_eNoMethodError, "super called outside of method");
+		}
+	    }
+	    if (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 if (!ruby_scope->local_vars) {
+		    argc = 0;
+		    argv = 0;
+		}
+		else {
+		    argv = ruby_scope->local_vars + 2;
+		}
+	    }
+	    else {
+		BEGIN_CALLARGS;
+		SETUP_ARGS(node->nd_args);
+		END_CALLARGS;
+		ruby_current_node = node;
+	    }
+
+	    SET_CURRENT_SOURCE();
+	    result = rb_call_super(argc, argv);
+	}
+	break;
+
+      case NODE_SCOPE:
+	{
+	    struct FRAME frame;
+	    NODE *saved_cref = 0;
+
+	    frame = *ruby_frame;
+	    frame.tmp = ruby_frame;
+	    ruby_frame = &frame;
+
+	    PUSH_SCOPE();
+	    PUSH_TAG(PROT_NONE);
+	    if (node->nd_rval) {
+		saved_cref = ruby_cref;
+		ruby_cref = (NODE*)node->nd_rval;
+	    }
+	    if (node->nd_tbl) {
+		VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
+		*vars++ = (VALUE)node;
+		ruby_scope->local_vars = vars;
+		rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+		ruby_scope->local_tbl = node->nd_tbl;
+	    }
+	    else {
+		ruby_scope->local_vars = 0;
+		ruby_scope->local_tbl  = 0;
+	    }
+	    if ((state = EXEC_TAG()) == 0) {
+		result = rb_eval(self, node->nd_next);
+	    }
+	    POP_TAG();
+	    POP_SCOPE();
+	    ruby_frame = frame.tmp;
+	    if (saved_cref)
+		ruby_cref = saved_cref;
+	    if (state) JUMP_TAG(state);
+	}
+	break;
+
+      case NODE_OP_ASGN1:
+	{
+	    int argc; VALUE *argv; /* used in SETUP_ARGS */
+	    VALUE recv, val, tmp;
+	    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);
+	    switch (node->nd_mid) {
+	    case 0: /* OR */
+	      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;
+	    default:
+	      tmp = rb_eval(self, rval);
+	      val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+	    }
+	    argv[argc] = val;
+	    rb_funcall2(recv, aset, argc+1, argv);
+	    result = val;
+	}
+	break;
+
+      case NODE_OP_ASGN2:
+	{
+	    ID id = node->nd_next->nd_vid;
+	    VALUE recv, val, tmp;
+
+	    recv = rb_eval(self, node->nd_recv);
+	    val = rb_funcall3(recv, id, 0, 0);
+	    switch (node->nd_next->nd_mid) {
+	    case 0: /* OR */
+	      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;
+	    default:
+	      tmp = rb_eval(self, node->nd_value);
+	      val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+	    }
+
+	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
+	    result = val;
+	}
+	break;
+
+      case NODE_OP_ASGN_AND:
+	result = rb_eval(self, node->nd_head);
+	if (!RTEST(result)) break;
+	node = node->nd_value;
+	goto again;
+
+      case NODE_OP_ASGN_OR:
+	if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
+	    !RTEST(result = rb_eval(self, node->nd_head))) {
+	    node = node->nd_value;
+	    goto again;
+	}
+	break;
+
+      case NODE_MASGN:
+	result = massign(self, node, rb_eval(self, node->nd_value), 0);
+	break;
+
+      case NODE_LASGN:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected local variable assignment");
+	result = rb_eval(self, node->nd_value);
+	ruby_scope->local_vars[node->nd_cnt] = result;
+	break;
+
+      case NODE_DASGN:
+	result = rb_eval(self, node->nd_value);
+	dvar_asgn(node->nd_vid, result);
+	break;
+
+      case NODE_DASGN_CURR:
+	result = rb_eval(self, node->nd_value);
+	dvar_asgn_curr(node->nd_vid, result);
+	break;
+
+      case NODE_GASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_gvar_set(node->nd_entry, result);
+	break;
+
+      case NODE_IASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_ivar_set(self, node->nd_vid, result);
+	break;
+
+      case NODE_CDECL:
+	result = rb_eval(self, node->nd_value);
+	if (node->nd_vid == 0) {
+	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
+	}
+	else {
+	    rb_const_set(ruby_cbase, node->nd_vid, result);
+	}
+	break;
+
+      case NODE_CVDECL:
+	if (NIL_P(ruby_cbase)) {
+	    rb_raise(rb_eTypeError, "no class/module to define class variable");
+	}
+	result = rb_eval(self, node->nd_value);
+	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
+	break;
+
+      case NODE_CVASGN:
+	result = rb_eval(self, node->nd_value);
+	rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
+	break;
+
+      case NODE_LVAR:
+	if (ruby_scope->local_vars == 0) {
+	    rb_bug("unexpected local variable");
+	}
+	result = ruby_scope->local_vars[node->nd_cnt];
+	break;
+
+      case NODE_DVAR:
+	result = rb_dvar_ref(node->nd_vid);
+	break;
+
+      case NODE_GVAR:
+	result = rb_gvar_get(node->nd_entry);
+	break;
+
+      case NODE_IVAR:
+	result = rb_ivar_get(self, node->nd_vid);
+	break;
+
+      case NODE_CONST:
+	result = ev_const_get(ruby_cref, node->nd_vid, self);
+	break;
+
+      case NODE_CVAR:
+	result = rb_cvar_get(cvar_cbase(), node->nd_vid);
+	break;
+
+      case NODE_BLOCK_ARG:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected block argument");
+	if (rb_block_given_p()) {
+	    result = rb_block_proc();
+	    ruby_scope->local_vars[node->nd_cnt] = result;
+	}
+	else {
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_COLON2:
+	{
+	    VALUE klass;
+
+	    klass = rb_eval(self, node->nd_head);
+	    if (rb_is_const_id(node->nd_mid)) {
+		switch (TYPE(klass)) {
+		  case T_CLASS:
+		  case T_MODULE:
+		    result = rb_const_get_from(klass, node->nd_mid);
+		    break;
+		  default:
+		    rb_raise(rb_eTypeError, "%s is not a class/module",
+			     RSTRING(rb_obj_as_string(klass))->ptr);
+		    break;
+		}
+	    }
+	    else {
+		result = rb_funcall(klass, node->nd_mid, 0, 0);
+	    }
+	}
+	break;
+
+      case NODE_COLON3:
+	result = rb_const_get_from(rb_cObject, node->nd_mid);
+	break;
+
+      case NODE_NTH_REF:
+	result = rb_reg_nth_match(node->nd_nth, MATCH_DATA);
+	break;
+
+      case NODE_BACK_REF:
+	switch (node->nd_nth) {
+	  case '&':
+	    result = rb_reg_last_match(MATCH_DATA);
+	    break;
+	  case '`':
+	    result = rb_reg_match_pre(MATCH_DATA);
+	    break;
+	  case '\'':
+	    result = rb_reg_match_post(MATCH_DATA);
+	    break;
+	  case '+':
+	    result = rb_reg_match_last(MATCH_DATA);
+	    break;
+	  default:
+	    rb_bug("unexpected back-ref");
+	}
+	break;
+
+      case NODE_HASH:
+	{
+	    NODE *list;
+	    VALUE hash = rb_hash_new();
+	    VALUE key, val;
+
+	    list = node->nd_head;
+	    while (list) {
+		key = rb_eval(self, list->nd_head);
+		list = list->nd_next;
+		if (list == 0)
+		    rb_bug("odd number list for Hash");
+		val = rb_eval(self, list->nd_head);
+		list = list->nd_next;
+		rb_hash_aset(hash, key, val);
+	    }
+	    result = hash;
+	}
+	break;
+
+      case NODE_ZARRAY:		/* zero length list */
+	result = rb_ary_new();
+	break;
+
+      case NODE_ARRAY:
+	{
+	    VALUE ary;
+	    long i;
+
+	    i = node->nd_alen;
+	    ary = rb_ary_new2(i);
+	    for (i=0;node;node=node->nd_next) {
+		RARRAY(ary)->ptr[i++] = rb_eval(self, node->nd_head);
+		RARRAY(ary)->len = i;
+	    }
+
+	    result = ary;
+	}
+	break;
+
+      case NODE_STR:
+	result = rb_str_new3(node->nd_lit);
+	break;
+
+      case NODE_EVSTR:
+	result = rb_obj_as_string(rb_eval(self, node->nd_body));
+	break;
+
+      case NODE_DSTR:
+      case NODE_DXSTR:
+      case NODE_DREGX:
+      case NODE_DREGX_ONCE:
+      case NODE_DSYM:
+	{
+	    VALUE str, str2;
+	    NODE *list = node->nd_next;
+
+	    str = rb_str_new3(node->nd_lit);
+	    while (list) {
+		if (list->nd_head) {
+		    switch (nd_type(list->nd_head)) {
+		      case NODE_STR:
+			str2 = list->nd_head->nd_lit;
+			break;
+		      default:
+			str2 = rb_eval(self, list->nd_head);
+			break;
+		    }
+		    rb_str_append(str, str2);
+		    OBJ_INFECT(str, str2);
+		}
+		list = list->nd_next;
+	    }
+	    switch (nd_type(node)) {
+	      case NODE_DREGX:
+		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+				    node->nd_cflag);
+		break;
+	      case NODE_DREGX_ONCE:	/* regexp expand once */
+		result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
+				    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;
+	      case NODE_DSYM:
+		result = rb_str_intern(str);
+		break;
+	      default:
+		result = str;
+		break;
+	    }
+	}
+	break;
+
+      case NODE_XSTR:
+	result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+	break;
+
+      case NODE_LIT:
+	result = node->nd_lit;
+	break;
+
+      case NODE_DEFN:
+	if (node->nd_defn) {
+	    NODE *body,  *defn;
+	    VALUE origin = 0;
+	    int noex;
+
+	    if (NIL_P(ruby_class)) {
+		rb_raise(rb_eTypeError, "no class/module to add method");
+	    }
+	    if (ruby_class == rb_cObject && node->nd_mid == init) {
+		rb_warn("redefining Object#initialize may cause infinite loop");
+	    }
+	    if (node->nd_mid == __id__ || node->nd_mid == __send__) {
+		rb_warn("redefining `%s' may cause serious problem",
+			rb_id2name(node->nd_mid));
+	    }
+	    rb_frozen_class_p(ruby_class);
+	    body = search_method(ruby_class, node->nd_mid, &origin);
+	    if (body){
+		if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
+		    rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
+		}
+	    }
+
+	    if (SCOPE_TEST(SCOPE_PRIVATE) || node->nd_mid == init) {
+		noex = NOEX_PRIVATE;
+	    }
+	    else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+		noex = NOEX_PROTECTED;
+	    }
+	    else {
+		noex = NOEX_PUBLIC;
+	    }
+	    if (body && origin == ruby_class && body->nd_body == 0) {
+		noex |= NOEX_NOSUPER;
+	    }
+
+	    defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+	    rb_add_method(ruby_class, node->nd_mid, defn, noex);
+	    if (scope_vmode == SCOPE_MODFUNC) {
+		rb_add_method(rb_singleton_class(ruby_class),
+			      node->nd_mid, defn, NOEX_PUBLIC);
+	    }
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_DEFS:
+	if (node->nd_defn) {
+	    VALUE recv = rb_eval(self, node->nd_recv);
+	    VALUE klass;
+	    NODE *body = 0, *defn;
+
+	    if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
+		rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
+	    }
+	    if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
+		rb_raise(rb_eTypeError,
+			 "can't define singleton method \"%s\" for %s",
+			 rb_id2name(node->nd_mid),
+			 rb_obj_classname(recv));
+	    }
+
+	    if (OBJ_FROZEN(recv)) rb_error_frozen("object");
+	    klass = rb_singleton_class(recv);
+	    if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &data)) {
+		body = (NODE *)data;
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "redefining method prohibited");
+		}
+		if (RTEST(ruby_verbose)) {
+		    rb_warning("redefine %s", rb_id2name(node->nd_mid));
+		}
+	    }
+	    defn = rb_copy_node_scope(node->nd_defn, ruby_cref);
+	    rb_add_method(klass, node->nd_mid, defn,
+			  NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+	    result = Qnil;
+	}
+	break;
+
+      case NODE_UNDEF:
+	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)));
+	result = Qnil;
+	break;
+
+      case NODE_ALIAS:
+	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)));
+	result = Qnil;
+	break;
+
+      case NODE_VALIAS:
+	rb_alias_variable(node->u1.id, node->u2.id);
+	result = Qnil;
+	break;
+
+      case NODE_CLASS:
+	{
+	    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);
+	    }
+	    else {
+		super = 0;
+	    }
+
+	    if (rb_const_defined_at(cbase, cname)) {
+		klass = rb_const_get_at(cbase, cname);
+		if (TYPE(klass) != T_CLASS) {
+		    rb_raise(rb_eTypeError, "%s is not a class",
+			     rb_id2name(cname));
+		}
+		if (super) {
+		    tmp = rb_class_real(RCLASS(klass)->super);
+		    if (tmp != super) {
+			rb_raise(rb_eTypeError, "superclass mismatch for class %s",
+				 rb_id2name(cname));
+		    }
+		    super = 0;
+		}
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "extending class prohibited");
+		}
+	    }
+	    else {
+		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);
+	    }
+	    result = module_setup(klass, node);
+	}
+	break;
+
+      case NODE_MODULE:
+	{
+	    VALUE module, cbase;
+	    ID cname;
+
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no outer class/module");
+	    }
+	    cbase = class_prefix(self, node->nd_cpath);
+	    cname = node->nd_cpath->nd_mid;
+	    if (rb_const_defined_at(cbase, cname)) {
+		module = rb_const_get_at(cbase, cname);
+		if (TYPE(module) != T_MODULE) {
+		    rb_raise(rb_eTypeError, "%s is not a module",
+			     rb_id2name(cname));
+		}
+		if (ruby_safe_level >= 4) {
+		    rb_raise(rb_eSecurityError, "extending module prohibited");
+		}
+	    }
+	    else {
+		module = rb_define_module_id(cname);
+		rb_set_class_path(module, cbase, rb_id2name(cname));
+		rb_const_set(cbase, cname, module);
+	    }
+	    if (ruby_wrapper) {
+		rb_extend_object(module, ruby_wrapper);
+		rb_include_module(module, ruby_wrapper);
+	    }
+
+	    result = module_setup(module, node);
+	}
+	break;
+
+      case NODE_SCLASS:
+	{
+	    VALUE klass;
+
+	    result = rb_eval(self, node->nd_recv);
+	    if (FIXNUM_P(result) || SYMBOL_P(result)) {
+		rb_raise(rb_eTypeError, "no virtual class for %s",
+			 rb_obj_classname(result));
+	    }
+	    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;
+
+      case NODE_DEFINED:
+	{
+	    char buf[20];
+	    const char *desc = is_defined(self, node->nd_head, buf);
+
+	    if (desc) result = rb_str_new2(desc);
+	    else result = Qnil;
+	}
+	break;
+
+      case NODE_NEWLINE:
+	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
+			ruby_frame->last_func,
+			ruby_frame->last_class);
+	node = node->nd_next;
+	goto again;
+
+      default:
+	unknown_node(node);
+    }
+  finish:
+    CHECK_INTS;
+    if (contnode) {
+	node = contnode;
+	contnode = 0;
+	goto again;
+    }
+    return result;
+}
+
+static VALUE
+module_setup(module, n)
+    VALUE module;
+    NODE *n;
+{
+    NODE * volatile node = n->nd_body;
+    int state;
+    struct FRAME frame;
+    VALUE result = Qnil;	/* OK */
+    TMP_PROTECT;
+
+    frame = *ruby_frame;
+    frame.tmp = ruby_frame;
+    ruby_frame = &frame;
+
+    PUSH_CLASS(module);
+    PUSH_SCOPE();
+    PUSH_VARS();
+
+    if (node->nd_tbl) {
+	VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1);
+	*vars++ = (VALUE)node;
+	ruby_scope->local_vars = vars;
+	rb_mem_clear(ruby_scope->local_vars, node->nd_tbl[0]);
+	ruby_scope->local_tbl = node->nd_tbl;
+    }
+    else {
+	ruby_scope->local_vars = 0;
+	ruby_scope->local_tbl  = 0;
+    }
+
+    PUSH_CREF(module);
+    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);
+	result = rb_eval(ruby_cbase, node->nd_next);
+    }
+    POP_TAG();
+    POP_CREF();
+    POP_VARS();
+    POP_SCOPE();
+    POP_CLASS();
+
+    ruby_frame = frame.tmp;
+    EXEC_EVENT_HOOK(RUBY_EVENT_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 RTEST(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);
+}
+
+/*
+ *  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)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE mid, priv;
+    ID id;
+
+    rb_scan_args(argc, argv, "11", &mid, &priv);
+    id = rb_to_id(mid);
+    if (rb_method_boundp(CLASS_OF(obj), id, !RTEST(priv))) {
+	return Qtrue;
+    }
+    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;
+{
+    return rb_method_boundp(mod, rb_to_id(mid), 1);
+}
+
+#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;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PUBLIC))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  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;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PRIVATE))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  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;
+{
+    ID id = rb_to_id(mid);
+    int noex;
+
+    if (rb_get_method_body(&mod, &id, &noex)) {
+	if (VISI_CHECK(noex, NOEX_PROTECTED))
+	    return Qtrue;
+    }
+    return Qfalse;
+}
+
+NORETURN(static VALUE terminate_process _((int, VALUE)));
+static VALUE
+terminate_process(status, mesg)
+    int status;
+    VALUE mesg;
+{
+    VALUE args[2];
+    args[0] = INT2NUM(status);
+    args[1] = mesg;
+
+    rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
+}
+
+void
+rb_exit(status)
+    int status;
+{
+    if (prot_tag) {
+	terminate_process(status, rb_str_new("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;
+    VALUE *argv;
+{
+    VALUE status;
+    int istatus;
+
+    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;
+	}
+    }
+    else {
+	istatus = EXIT_SUCCESS;
     }
+    rb_exit(istatus);
+    return Qnil;		/* not reached */
 }
 
-NORETURN(static void rb_longjmp(int, VALUE));
-VALUE rb_make_backtrace(void);
+
+/*
+ *  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;
+    VALUE *argv;
+{
+    rb_secure(4);
+    if (argc == 0) {
+	if (!NIL_P(ruby_errinfo)) {
+	    error_print();
+	}
+	rb_exit(EXIT_FAILURE);
+    }
+    else {
+	VALUE mesg;
+
+	rb_scan_args(argc, argv, "1", &mesg);
+	StringValue(mesg);
+	rb_io_puts(1, &mesg, rb_stderr);
+	terminate_process(EXIT_FAILURE, mesg);
+    }
+    return Qnil;		/* not reached */
+}
+
+void
+rb_iter_break()
+{
+    break_jump(Qnil);
+}
+
+NORETURN(static void rb_longjmp _((int, VALUE)));
+static VALUE make_backtrace _((void));
 
 static void
-rb_longjmp(int tag, VALUE mesg)
+rb_longjmp(tag, mesg)
+    int tag;
+    VALUE mesg;
 {
     VALUE at;
-    VALUE e;
-    rb_thread_t *th = GET_THREAD();
-    const char *file;
-    int line = 0;
+    rb_thread_t th = curr_thread;
 
     if (rb_thread_set_raised(th)) {
-	th->errinfo = exception_error;
+	ruby_errinfo = exception_error;
 	JUMP_TAG(TAG_FATAL);
     }
-
-    if (NIL_P(mesg))
-	mesg = th->errinfo;
+    if (NIL_P(mesg)) mesg = ruby_errinfo;
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
     }
 
-    file = rb_sourcefile();
-    if (file) line = rb_sourceline();
-    if (file && !NIL_P(mesg)) {
+    ruby_set_current_source();
+    if (ruby_sourcefile && !NIL_P(mesg)) {
 	at = get_backtrace(mesg);
 	if (NIL_P(at)) {
-	    at = rb_make_backtrace();
+	    at = make_backtrace();
 	    if (OBJ_FROZEN(mesg)) {
 		mesg = rb_obj_dup(mesg);
 	    }
@@ -378,30 +4596,25 @@ rb_longjmp(int tag, VALUE mesg)
 	}
     }
     if (!NIL_P(mesg)) {
-	th->errinfo = mesg;
+	ruby_errinfo = mesg;
     }
 
-    if (RTEST(ruby_debug) && !NIL_P(e = th->errinfo) &&
-	!rb_obj_is_kind_of(e, rb_eSystemExit)) {
+    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();
+	PUSH_TAG(PROT_NONE);
 	if ((status = EXEC_TAG()) == 0) {
-	    RB_GC_GUARD(e) = rb_obj_as_string(e);
-	    if (file) {
-		warn_printf("Exception `%s' at %s:%d - %s\n",
-			    rb_obj_classname(th->errinfo),
-			    file, line, RSTRING_PTR(e));
-	    }
-	    else {
-		warn_printf("Exception `%s' - %s\n",
-			    rb_obj_classname(th->errinfo),
-			    RSTRING_PTR(e));
-	    }
+	    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 && th->errinfo == exception_error) {
-	    th->errinfo = mesg;
+	if (status == TAG_FATAL && ruby_errinfo == exception_error) {
+	    ruby_errinfo = mesg;
 	}
 	else if (status) {
 	    rb_thread_reset_raised(th);
@@ -410,36 +4623,49 @@ rb_longjmp(int tag, VALUE mesg)
     }
 
     rb_trap_restore_mask();
-
     if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self,
-			0 /* TODO: id */, 0 /* TODO: klass */);
+	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+			ruby_frame->self,
+			ruby_frame->last_func,
+			ruby_frame->last_class);
+    }
+    if (!prot_tag) {
+	error_print();
     }
-
     rb_thread_raised_clear(th);
     JUMP_TAG(tag);
 }
 
 void
-rb_exc_raise(VALUE mesg)
+rb_exc_jump(mesg)
+    VALUE mesg;
+{
+    rb_thread_raised_clear(rb_curr_thread);
+    ruby_errinfo = mesg;
+    JUMP_TAG(TAG_RAISE);
+}
+
+void
+rb_exc_raise(mesg)
+    VALUE mesg;
 {
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
-rb_exc_fatal(VALUE mesg)
+rb_exc_fatal(mesg)
+    VALUE mesg;
 {
     rb_longjmp(TAG_FATAL, mesg);
 }
 
 void
-rb_interrupt(void)
+rb_interrupt()
 {
-    rb_raise(rb_eInterrupt, "%s", "");
+    static const char fmt[1] = {'\0'};
+    rb_raise(rb_eInterrupt, fmt);
 }
 
-static VALUE get_errinfo(void);
-
 /*
  *  call-seq:
  *     raise
@@ -448,7 +4674,7 @@ static VALUE get_errinfo(void);
  *     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
@@ -459,28 +4685,24 @@ static VALUE get_errinfo(void);
  *  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(int argc, VALUE *argv)
+rb_f_raise(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    VALUE err;
-    if (argc == 0) {
-	err = get_errinfo();
-	if (!NIL_P(err)) {
-	    argc = 1;
-	    argv = &err;
-	}
-    }
     rb_raise_jump(rb_make_exception(argc, argv));
     return Qnil;		/* not reached */
 }
 
-VALUE
-rb_make_exception(int argc, VALUE *argv)
+static VALUE
+rb_make_exception(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE mesg;
     ID exception;
@@ -492,8 +4714,7 @@ rb_make_exception(int argc, VALUE *argv)
 	mesg = Qnil;
 	break;
       case 1:
-	if (NIL_P(argv[0]))
-	    break;
+	if (NIL_P(argv[0])) break;
 	if (TYPE(argv[0]) == T_STRING) {
 	    mesg = rb_exc_new3(rb_eRuntimeError, argv[0]);
 	    break;
@@ -505,7 +4726,7 @@ rb_make_exception(int argc, VALUE *argv)
       case 3:
 	n = 1;
       exception_call:
-	CONST_ID(exception, "exception");
+	exception = rb_intern("exception");
 	if (!rb_respond_to(argv[0], exception)) {
 	    rb_raise(rb_eTypeError, "exception class/object expected");
 	}
@@ -518,40 +4739,39 @@ rb_make_exception(int argc, VALUE *argv)
     if (argc > 0) {
 	if (!rb_obj_is_kind_of(mesg, rb_eException))
 	    rb_raise(rb_eTypeError, "exception object expected");
-	if (argc > 2)
+	if (argc>2)
 	    set_backtrace(mesg, argv[2]);
     }
 
     return mesg;
 }
 
-void
-rb_raise_jump(VALUE mesg)
+static void
+rb_raise_jump(mesg)
+    VALUE mesg;
 {
-    rb_thread_t *th = GET_THREAD();
-    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
-    /* TODO: fix me */
+    if (ruby_frame != top_frame) {
+	PUSH_FRAME();		/* fake frame */
+	*ruby_frame = *_frame.prev->prev;
+	rb_longjmp(TAG_RAISE, mesg);
+	POP_FRAME();
+    }
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
-rb_jump_tag(int tag)
+rb_jump_tag(tag)
+    int tag;
 {
     JUMP_TAG(tag);
 }
 
 int
-rb_block_given_p(void)
+rb_block_given_p()
 {
-    rb_thread_t *th = GET_THREAD();
-
-    if ((th->cfp->lfp[0] & 0x02) == 0 &&
-	GC_GUARDED_PTR_REF(th->cfp->lfp[0])) {
+    if (ruby_frame->iter == ITER_CUR && ruby_block)
 	return Qtrue;
-    }
-    else {
-	return Qfalse;
-    }
+    return Qfalse;
 }
 
 int
@@ -564,11 +4784,11 @@ rb_iterator_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
@@ -582,130 +4802,737 @@ rb_iterator_p()
  */
 
 
-VALUE
-rb_f_block_given_p(void)
+static VALUE
+rb_f_block_given_p()
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
-
-    if (cfp != 0 &&
-	(cfp->lfp[0] & 0x02) == 0 &&
-	GC_GUARDED_PTR_REF(cfp->lfp[0])) {
+    if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
 	return Qtrue;
+    return Qfalse;
+}
+
+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];
+    const 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 */
     }
-    else {
-	return Qfalse;
+    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);
 }
 
-VALUE rb_eThreadError;
+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()) {
-	vm_localjump_error("no block given", Qnil, 0);
+	localjump_error("no block given", Qnil, 0);
     }
 }
 
-VALUE
-rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
-	   VALUE (* r_proc) (ANYARGS), VALUE data2, ...)
+static VALUE
+rb_yield_0(val, self, klass, flags, avalue)
+    VALUE val, self, klass;	/* OK */
+    int flags, avalue;
 {
+    NODE *node, *var;
+    volatile VALUE result = Qnil;
+    volatile VALUE old_cref;
+    volatile VALUE old_wrapper;
+    struct BLOCK * volatile block;
+    struct SCOPE * volatile old_scope;
+    int old_vmode;
+    struct FRAME frame;
+    NODE *cnode = ruby_current_node;
+    int lambda = flags & YIELD_LAMBDA_CALL;
     int state;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    volatile VALUE result;
-    volatile VALUE e_info = th->errinfo;
-    va_list args;
 
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
-      retry_entry:
-	result = (*b_proc) (data1);
+    rb_need_block();
+
+    PUSH_VARS();
+    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;
+    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 */
+	ruby_dyna_vars = new_dvar(0, 0, block->dyna_vars);
     }
     else {
-	th->cfp = cfp; /* restore */
-
-	if (state == TAG_RAISE) {
-	    int handle = Qfalse;
-	    VALUE eclass;
-
-	    va_init_list(args, data2);
-	    while ((eclass = va_arg(args, VALUE)) != 0) {
-		if (rb_obj_is_kind_of(th->errinfo, eclass)) {
-		    handle = Qtrue;
-		    break;
+	/* FOR does not introduce new scope */
+	ruby_dyna_vars = block->dyna_vars;
+    }
+    PUSH_CLASS(klass ? klass : block->klass);
+    if (!klass) {
+	self = block->self;
+    }
+    node = block->body;
+    var = block->var;
+
+    if (var) {
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    NODE *bvar = NULL;
+	  block_var:
+	    if (var == (NODE*)1) { /* no parameter || */
+		if (lambda && RARRAY(val)->len != 0) {
+		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+			     RARRAY(val)->len);
 		}
 	    }
-	    va_end(args);
-
-	    if (handle) {
-		if (r_proc) {
-		    PUSH_TAG();
-		    if ((state = EXEC_TAG()) == 0) {
-			result = (*r_proc) (data2, th->errinfo);
+	    else if (var == (NODE*)2) {
+		if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
+		    rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+			     RARRAY(val)->len);
+		}
+	    }
+	    else if (!bvar && nd_type(var) == NODE_BLOCK_PASS) {
+		bvar = var->nd_body;
+		var = var->nd_args;
+		goto block_var;
+	    }
+	    else if (nd_type(var) == NODE_MASGN) {
+		if (!avalue) {
+		    val = svalue_to_mrhs(val, var->nd_head);
+		}
+		massign(self, var, val, lambda);
+	    }
+	    else {
+		int len = 0;
+		if (avalue) {
+		    len = RARRAY(val)->len;
+		    if (len == 0) {
+			goto zero_arg;
 		    }
-		    POP_TAG();
-		    if (state == TAG_RETRY) {
-			state = 0;
-			th->errinfo = Qnil;
-			goto retry_entry;
+		    if (len == 1) {
+			val = RARRAY(val)->ptr[0];
+		    }
+		    else {
+			goto multi_values;
 		    }
 		}
-		else {
-		    result = Qnil;
-		    state = 0;
+		else if (val == Qundef) {
+		  zero_arg:
+		    val = Qnil;
+		  multi_values:
+		    {
+			ruby_current_node = 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, var, val, lambda);
+	    }
+	    if (bvar) {
+		VALUE blk;
+		if (flags & YIELD_PROC_CALL)
+		    blk = block->block_obj;
+		else
+		    blk = rb_block_proc();
+		assign(self, bvar, blk, 0);
+	    }
+	}
+	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);
+    if ((state = EXEC_TAG()) == 0) {
+      redo:
+	if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
+	    switch (node->nd_state) {
+	      case YIELD_FUNC_LAMBDA:
+		if (!avalue) {
+		    val = rb_ary_new3(1, val);
 		}
-		if (state == 0) {
-		    th->errinfo = e_info;
+		break;
+	      case YIELD_FUNC_AVALUE:
+		if (!avalue) {
+		    val = svalue_to_avalue(val);
+		}
+		break;
+	      default:
+		if (avalue) {
+		    val = avalue_to_svalue(val);
 		}
+		if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
+		    val = Qnil;
+	    }
+	    result = (*node->nd_cfnc)(val, node->nd_tval, self);
+	}
+	else {
+	    result = rb_eval(self, node);
+	}
+    }
+    else {
+	switch (state) {
+	  case TAG_REDO:
+	    state = 0;
+	    CHECK_INTS;
+	    goto redo;
+	  case TAG_NEXT:
+	    if (!lambda) {
+		state = 0;
+		result = prot_tag->retval;
+	    }
+	    break;
+	  case TAG_BREAK:
+	    if (TAG_DST()) {
+		result = prot_tag->retval;
+	    }
+	    else {
+		lambda = Qtrue;	/* just pass TAG_BREAK */
+	    }
+	    break;
+	  default:
+	    break;
+	}
+    }
+    POP_TAG();
+    POP_ITER();
+  pop_state:
+    POP_CLASS();
+    if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
+	!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
+	struct RVarmap *vars = ruby_dyna_vars;
+
+	if (ruby_dyna_vars->id == 0) {
+	    vars = ruby_dyna_vars->next;
+	    rb_gc_force_recycle((VALUE)ruby_dyna_vars);
+	    while (vars && vars->id != 0 && vars != block->dyna_vars) {
+		struct RVarmap *tmp = vars->next;
+		rb_gc_force_recycle((VALUE)vars);
+		vars = tmp;
+	    }
+	}
+    }
+    POP_VARS();
+    ruby_block = block;
+    ruby_frame = ruby_frame->prev;
+    ruby_cref = (NODE*)old_cref;
+    ruby_wrapper = old_wrapper;
+    if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
+	scope_dup(old_scope);
+    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;
+	    }
+	    proc_jump_error(TAG_BREAK, result);
+	}
+	/* fall through */
+      default:
+	JUMP_TAG(state);
+	break;
+    }
+    ruby_current_node = cnode;
+    return result;
+}
+
+VALUE
+rb_yield(val)
+    VALUE val;
+{
+    return rb_yield_0(val, 0, 0, 0, Qfalse);
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_yield_values(int n, ...)
+#else
+rb_yield_values(n, va_alist)
+    int n;
+    va_dcl
+#endif
+{
+    va_list args;
+    VALUE ary;
+
+    if (n == 0) {
+	return rb_yield_0(Qundef, 0, 0, 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);
+}
+
+static VALUE
+loop_i()
+{
+    for (;;) {
+	rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+	CHECK_INTS;
+    }
+    return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     loop {|| block } 
+ *  
+ *  Repeatedly executes the block.
+ *     
+ *     loop do
+ *       print "Input: "
+ *       line = gets
+ *       break if !line or line =~ /^qQ/
+ *       # ...
+ *     end
+ *
+ *  StopIteration raised in the block breaks the loop.
+ */
+
+static VALUE
+rb_f_loop()
+{
+    rb_rescue2(loop_i, (VALUE)0, 0, 0, rb_eStopIteration, (VALUE)0);
+    return Qnil;		/* dummy */
+}
+
+static VALUE
+massign(self, node, val, pcall)
+    VALUE self;
+    NODE *node;
+    VALUE val;
+    int pcall;
+{
+    NODE *list;
+    long i = 0, len;
+
+    len = RARRAY(val)->len;
+    list = node->nd_head;
+    for (; list && i<len; i++) {
+	assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
+	list = list->nd_next;
+    }
+    if (pcall && list) goto arg_error;
+    if (node->nd_args) {
+	if ((long)(node->nd_args) == -1) {
+	    /* no check for mere `*' */
+	}
+	else if (!list && i<len) {
+	    assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
+	}
+	else {
+	    assign(self, node->nd_args, rb_ary_new2(0), pcall);
+	}
+    }
+    else if (pcall && i < len) {
+	goto arg_error;
+    }
+
+    while (list) {
+	i++;
+	assign(self, list->nd_head, Qnil, pcall);
+	list = list->nd_next;
+    }
+    return val;
+
+  arg_error:
+    while (list) {
+	i++;
+	list = list->nd_next;
+    }
+    rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
+}
+
+static void
+assign(self, lhs, val, pcall)
+    VALUE self;
+    NODE *lhs;
+    VALUE val;
+    int pcall;
+{
+    ruby_current_node = lhs;
+    if (val == Qundef) {
+	rb_warning("assigning void value");
+	val = Qnil;
+    }
+    switch (nd_type(lhs)) {
+      case NODE_GASGN:
+	rb_gvar_set(lhs->nd_entry, val);
+	break;
+
+      case NODE_IASGN:
+	rb_ivar_set(self, lhs->nd_vid, val);
+	break;
+
+      case NODE_LASGN:
+	if (ruby_scope->local_vars == 0)
+	    rb_bug("unexpected local variable assignment");
+	ruby_scope->local_vars[lhs->nd_cnt] = val;
+	break;
+
+      case NODE_DASGN:
+	dvar_asgn(lhs->nd_vid, val);
+	break;
+
+      case NODE_DASGN_CURR:
+	dvar_asgn_curr(lhs->nd_vid, val);
+	break;
+
+      case NODE_CDECL:
+	if (lhs->nd_vid == 0) {
+	    rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
+	}
+	else {
+	    rb_const_set(ruby_cbase, lhs->nd_vid, val);
+	}
+	break;
+
+      case NODE_CVDECL:
+	if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
+	    rb_warn("declaring singleton class variable");
+	}
+	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
+	break;
+
+      case NODE_CVASGN:
+	rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
+	break;
+
+      case NODE_MASGN:
+	massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+	break;
+
+      case NODE_CALL:
+      case NODE_ATTRASGN:
+	{
+	    VALUE recv;
+	    int scope;
+	    if (lhs->nd_recv == (NODE *)1) {
+		recv = self;
+		scope = 1;
+	    }
+	    else {
+		recv = rb_eval(self, lhs->nd_recv);
+		scope = 0;
+	    }
+	    if (!lhs->nd_args) {
+		/* attr set */
+		ruby_current_node = lhs;
+		SET_CURRENT_SOURCE();
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
+	    }
+	    else {
+		/* array set */
+		VALUE args;
+
+		args = rb_eval(self, lhs->nd_args);
+		rb_ary_push(args, val);
+		ruby_current_node = lhs;
+		SET_CURRENT_SOURCE();
+		rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
+			RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
 	    }
 	}
+	break;
+
+      default:
+	rb_bug("bug in variable assignment");
+	break;
+    }
+}
+
+VALUE
+rb_iterate(it_proc, data1, bl_proc, data2)
+    VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
+    VALUE data1, data2;
+{
+    int state;
+    volatile VALUE retval = Qnil;
+    NODE *node = NEW_IFUNC(bl_proc, data2);
+    VALUE self = ruby_top_self;
+
+    PUSH_TAG(PROT_LOOP);
+    PUSH_BLOCK(0, node);
+    PUSH_ITER(ITER_PRE);
+    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;
+    }
+    POP_ITER();
+    POP_BLOCK();
     POP_TAG();
-    if (state)
+
+    switch (state) {
+      case 0:
+	break;
+      default:
 	JUMP_TAG(state);
+    }
+    return retval;
+}
+
+static int
+handle_rescue(self, node)
+    VALUE self;
+    NODE *node;
+{
+    int argc; VALUE *argv; /* used in SETUP_ARGS */
+    TMP_PROTECT;
+
+    if (!node->nd_args) {
+	return rb_obj_is_kind_of(ruby_errinfo, rb_eStandardError);
+    }
+
+    BEGIN_CALLARGS;
+    SETUP_ARGS(node->nd_args);
+    END_CALLARGS;
+
+    while (argc--) {
+	if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
+	    rb_raise(rb_eTypeError, "class or module required for rescue clause");
+	}
+	if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
+	argv++;
+    }
+    return 0;
+}
+
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
+#else
+rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
+    VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
+    VALUE data1, data2;
+    va_dcl
+#endif
+{
+    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:
+	result = (*b_proc)(data1);
+	break;
+      case TAG_RAISE:
+	if (handle) break;
+	handle = Qfalse;
+	va_init_list(args, data2);
+	while ((eclass = va_arg(args, VALUE)) != 0) {
+	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
+		handle = Qtrue;
+		break;
+	    }
+	}
+	va_end(args);
+
+	if (handle) {
+	    state = 0;
+	    if (r_proc) {
+		result = (*r_proc)(data2, ruby_errinfo);
+	    }
+	    else {
+		result = Qnil;
+	    }
+	    ruby_errinfo = e_info;
+	}
+    }
+    POP_TAG();
+    if (state) JUMP_TAG(state);
 
     return result;
 }
 
 VALUE
-rb_rescue(VALUE (* b_proc)(ANYARGS), VALUE data1,
-	  VALUE (* r_proc)(ANYARGS), VALUE data2)
+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, (VALUE)0);
 }
 
+static VALUE cont_protect;
+
 VALUE
-rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
+rb_protect(proc, data, state)
+    VALUE (*proc) _((VALUE));
+    VALUE data;
+    int *state;
 {
     VALUE result = Qnil;	/* OK */
     int status;
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    struct rb_vm_trap_tag trap_tag;
-    rb_jmpbuf_t org_jmpbuf;
-
-    trap_tag.prev = th->trap_tag;
 
-    PUSH_TAG();
-    th->trap_tag = &trap_tag;
-    MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
+    PUSH_TAG(PROT_NONE);
+    cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
     if ((status = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
+	result = (*proc)(data);
     }
-    MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
-    th->trap_tag = trap_tag.prev;
+    cont_protect = ((NODE *)cont_protect)->u1.value;
     POP_TAG();
-
     if (state) {
 	*state = status;
     }
     if (status != 0) {
-	th->cfp = cfp;
 	return Qnil;
     }
 
@@ -713,26 +5540,34 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
 }
 
 VALUE
-rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE data2)
+rb_ensure(b_proc, data1, e_proc, data2)
+    VALUE (*b_proc)();
+    VALUE data1;
+    VALUE (*e_proc)();
+    VALUE data2;
 {
     int state;
     volatile VALUE result = Qnil;
+    VALUE retval;
 
-    PUSH_TAG();
+    PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	result = (*b_proc) (data1);
+	result = (*b_proc)(data1);
     }
     POP_TAG();
-    /* TODO: fix me */
-    /* retval = prot_tag ? prot_tag->retval : Qnil; */     /* save retval */
-    (*e_proc) (data2);
-    if (state)
-	JUMP_TAG(state);
+    retval = prot_tag ? prot_tag->retval : Qnil;	/* save retval */
+    if (!thread_no_ensure()) {
+	(*e_proc)(data2);
+    }
+    if (prot_tag) return_value(retval);
+    if (state) JUMP_TAG(state);
     return result;
 }
 
 VALUE
-rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data)
+rb_with_disable_interrupt(proc, data)
+    VALUE (*proc)();
+    VALUE data;
 {
     VALUE result = Qnil;	/* OK */
     int status;
@@ -742,71 +5577,2143 @@ rb_with_disable_interrupt(VALUE (*proc)(ANYARGS), VALUE data)
 	int thr_critical = rb_thread_critical;
 
 	rb_thread_critical = Qtrue;
-	PUSH_TAG();
+	PUSH_TAG(PROT_NONE);
 	if ((status = EXEC_TAG()) == 0) {
-	    result = (*proc) (data);
+	    result = (*proc)(data);
 	}
 	POP_TAG();
 	rb_thread_critical = thr_critical;
     }
     ENABLE_INTS;
-    if (status)
+    if (status) JUMP_TAG(status);
+
+    return result;
+}
+
+static void
+stack_check()
+{
+    rb_thread_t th = rb_curr_thread;
+
+    if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && ruby_stack_check()) {
+	rb_thread_raised_set(th, RAISED_STACKOVERFLOW);
+	rb_exc_raise(sysstack_error);
+    }
+}
+
+static int last_call_status;
+
+#define CSTAT_PRIV  1
+#define CSTAT_PROT  2
+#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)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    ID id;
+    VALUE exc = rb_eNoMethodError;
+    const char *format = 0;
+    NODE *cnode = ruby_current_node;
+
+    if (argc == 0 || !SYMBOL_P(argv[0])) {
+	rb_raise(rb_eArgError, "no id given");
+    }
+
+    stack_check();
+
+    id = SYM2ID(argv[0]);
+
+    if (last_call_status & CSTAT_PRIV) {
+	format = "private method `%s' called for %s";
+    }
+    else if (last_call_status & CSTAT_PROT) {
+	format = "protected method `%s' called for %s";
+    }
+    else if (last_call_status & CSTAT_VCALL) {
+	format = "undefined local variable or method `%s' for %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";
+    }
+
+    ruby_current_node = cnode;
+    {
+	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" */
+	rb_exc_raise(exc);
+    }
+
+    return Qnil;		/* not reached */
+}
+
+static VALUE
+method_missing(obj, id, argc, argv, call_status)
+    VALUE obj;
+    ID    id;
+    int   argc;
+    const VALUE *argv;
+    int   call_status;
+{
+    VALUE *nargv;
+
+    last_call_status = call_status;
+
+    if (id == missing) {
+	PUSH_FRAME();
+	rb_method_missing(argc, argv, obj);
+	POP_FRAME();
+    }
+    else if (id == ID_ALLOCATOR) {
+	rb_raise(rb_eTypeError, "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[0] = ID2SYM(id);
+    return rb_funcall2(obj, missing, argc+1, nargv);
+}
+
+static inline VALUE
+call_cfunc(func, recv, len, argc, argv)
+    VALUE (*func)();
+    VALUE recv;
+    int len, argc;
+    VALUE *argv;
+{
+    if (len >= 0 && argc != len) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+		 argc, len);
+    }
+
+    switch (len) {
+      case -2:
+	return (*func)(recv, rb_ary_new4(argc, argv));
+	break;
+      case -1:
+	return (*func)(argc, argv, recv);
+	break;
+      case 0:
+	return (*func)(recv);
+	break;
+      case 1:
+	return (*func)(recv, argv[0]);
+	break;
+      case 2:
+	return (*func)(recv, argv[0], argv[1]);
+	break;
+      case 3:
+	return (*func)(recv, argv[0], argv[1], argv[2]);
+	break;
+      case 4:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3]);
+	break;
+      case 5:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4]);
+	break;
+      case 6:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5]);
+	break;
+      case 7:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6]);
+	break;
+      case 8:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7]);
+	break;
+      case 9:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8]);
+	break;
+      case 10:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9]);
+	break;
+      case 11:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
+	break;
+      case 12:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9],
+		       argv[10], argv[11]);
+	break;
+      case 13:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12]);
+	break;
+      case 14:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12], argv[13]);
+	break;
+      case 15:
+	return (*func)(recv, argv[0], argv[1], argv[2], argv[3], argv[4],
+		       argv[5], argv[6], argv[7], argv[8], argv[9], argv[10],
+		       argv[11], argv[12], argv[13], argv[14]);
+	break;
+      default:
+	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)
+    VALUE klass, recv;
+    ID    id;
+    ID    oid;
+    int argc;			/* OK */
+    VALUE *argv;		/* OK */
+    NODE * volatile body;
+    int flags;
+{
+    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 && 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:
+      default:
+	itr = ITER_NOT;
+	break;
+    }
+
+    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->self = recv;
+    ruby_frame->argc = argc;
+    ruby_frame->flags = 0;
+
+    switch (nd_type(body)) {
+      case NODE_CFUNC:
+	{
+	    int len = body->nd_argc;
+
+	    if (len < -2) {
+		rb_bug("bad argc (%d) specified for `%s(%s)'",
+		       len, rb_class2name(klass), rb_id2name(id));
+	    }
+	    if (event_hooks) {
+		int state;
+
+		EXEC_EVENT_HOOK(RUBY_EVENT_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);
+		if (state) JUMP_TAG(state);
+	    }
+	    else {
+		result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
+	    }
+	}
+	break;
+
+	/* for attr get/set */
+      case NODE_IVAR:
+	if (argc != 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	}
+	result = rb_attr_get(recv, body->nd_vid);
+	break;
+
+      case NODE_ATTRSET:
+	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;
+
+      case NODE_ZSUPER:
+	result = rb_call_super(argc, argv);
+	break;
+
+      case NODE_DMETHOD:
+	result = method_call(argc, argv, umethod_bind(body->nd_cval, recv));
+	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, ruby_current_node, recv, id, klass);
+	}
+	break;
+
+      case NODE_SCOPE:
+	{
+	    int state;
+	    VALUE *local_vars;	/* OK */
+	    NODE *saved_cref = 0;
+
+	    PUSH_SCOPE();
+	    if (body->nd_rval) {
+		saved_cref = ruby_cref;
+		ruby_cref = (NODE*)body->nd_rval;
+	    }
+	    PUSH_CLASS(ruby_cbase);
+	    if (body->nd_tbl) {
+		local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
+		*local_vars++ = (VALUE)body;
+		rb_mem_clear(local_vars, body->nd_tbl[0]);
+		ruby_scope->local_tbl = body->nd_tbl;
+		ruby_scope->local_vars = local_vars;
+	    }
+	    else {
+		local_vars = ruby_scope->local_vars = 0;
+		ruby_scope->local_tbl  = 0;
+	    }
+	    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;
+
+		if (nd_type(body) == NODE_ARGS) {
+		    node = body;
+		    body = 0;
+		}
+		else if (nd_type(body) == NODE_BLOCK) {
+		    node = body->nd_head;
+		    body = body->nd_next;
+		}
+		if (node) {
+		    if (nd_type(node) != NODE_ARGS) {
+			rb_bug("no argument-node");
+		    }
+
+		    i = node->nd_cnt;
+		    if (i > argc) {
+			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+				 argc, i);
+		    }
+		    if (!node->nd_rest) {
+			NODE *optnode = node->nd_opt;
+
+			nopt = i;
+			while (optnode) {
+			    nopt++;
+			    optnode = optnode->nd_next;
+			}
+			if (nopt < argc) {
+			    rb_raise(rb_eArgError,
+				     "wrong number of arguments (%d for %d)",
+				     argc, nopt);
+			}
+		    }
+		    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--;
+			    ++i;
+			    opt = opt->nd_next;
+			}
+			if (opt) {
+			    rb_eval(recv, opt);
+			    while (opt) {
+				opt = opt->nd_next;
+				++i;
+			    }
+			}
+		    }
+		    if (!node->nd_rest) {
+			i = nopt;
+		    }
+		    else {
+			VALUE v;
+			
+			if (argc > 0) {
+			    v = rb_ary_new4(argc,argv);
+			    i = -i - 1;
+			}
+			else {
+			    v = rb_ary_new2(0);
+			}
+			assign(recv, node->nd_rest, v, 1);
+		    }
+		    ruby_frame->argc = i;
+		}
+		if (event_hooks) {
+		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+		}
+		result = rb_eval(recv, body);
+	    }
+	    else if (state == TAG_RETURN && TAG_DST()) {
+		result = prot_tag->retval;
+		state = 0;
+	    }
+	    POP_TAG();
+	    if (event_hooks) {
+		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, ruby_current_node, recv, id, klass);
+	    }
+	    POP_VARS();
+	    POP_CLASS();
+	    POP_SCOPE();
+	    ruby_cref = saved_cref;
+	    if (safe >= 0) ruby_safe_level = safe;
+	    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);
+		/* fall through */
+	      default:
+		jump_tag_but_local_jump(state, result);
+		break;
+	    }
+	}
+	break;
+
+      default:
+	unknown_node(body);
+	break;
+    }
+    POP_FRAME();
+    POP_ITER();
+    return result;
+}
+
+static VALUE
+rb_call(klass, recv, mid, argc, argv, scope, self)
+    VALUE klass, recv;
+    ID    mid;
+    int argc;			/* OK */
+    const VALUE *argv;		/* OK */
+    int scope;
+    VALUE self;
+{
+    NODE  *body;		/* OK */
+    int    noex;
+    ID     id = mid;
+    struct cache_entry *ent;
+
+    if (!klass) {
+	rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
+		 rb_id2name(mid), recv);
+    }
+    /* is it in the method cache? */
+    ent = cache + EXPR1(klass, mid);
+    if (ent->mid == mid && ent->klass == klass) {
+	if (!ent->method)
+	    return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+	klass = ent->origin;
+	id    = ent->mid0;
+	noex  = ent->noex;
+	body  = ent->method;
+    }
+    else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+	if (scope == 3) {
+	    return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
+	}
+	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+    }
+
+    if (mid != missing && scope == 0) {
+	/* receiver specified form for private method */
+	if (noex & NOEX_PRIVATE)
+	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+
+	/* self must be kind of a specified form for protected method */
+	if (noex & NOEX_PROTECTED) {
+	    VALUE defined_class = klass;
+
+	    if (self == Qundef) self = ruby_frame->self;
+	    if (TYPE(defined_class) == T_ICLASS) {
+		defined_class = RBASIC(defined_class)->klass;
+	    }
+	    if (!rb_obj_is_kind_of(self, rb_class_real(defined_class)))
+		return method_missing(recv, mid, argc, argv, CSTAT_PROT);
+	}
+    }
+
+    return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+}
+
+VALUE
+rb_apply(recv, mid, args)
+    VALUE recv;
+    ID mid;
+    VALUE args;
+{
+    int argc;
+    VALUE *argv;
+
+    argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
+    argv = ALLOCA_N(VALUE, argc);
+    MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+/*
+ *  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;
+    VALUE *argv;
+    VALUE recv;
+{
+    VALUE vid;
+
+    if (argc == 0) rb_raise(rb_eArgError, "no method name given");
+
+    vid = *argv++; argc--;
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1, Qundef);
+    POP_ITER();
+
+    return vid;
+}
+
+static VALUE
+vafuncall(recv, mid, n, ar)
+    VALUE recv;
+    ID mid;
+    int n;
+    va_list *ar;
+{
+    VALUE *argv;
+
+    if (n > 0) {
+	long i;
+
+	argv = ALLOCA_N(VALUE, n);
+
+	for (i=0;i<n;i++) {
+	    argv[i] = va_arg(*ar, VALUE);
+	}
+	va_end(*ar);
+    }
+    else {
+	argv = 0;
+    }
+
+    return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1, Qundef);
+}
+
+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;
+    int argc;
+    const VALUE *argv;
+{
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+}
+
+VALUE
+rb_funcall3(recv, mid, argc, argv)
+    VALUE recv;
+    ID mid;
+    int argc;
+    const VALUE *argv;
+{
+    return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
+}
+
+VALUE
+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));
+    }
+
+    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);
+    }
+
+    PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
+    result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
+    POP_ITER();
 
     return result;
 }
 
-static ID
-frame_func_id(rb_control_frame_t *cfp)
+static VALUE
+backtrace(lev)
+    int lev;
 {
-    rb_iseq_t *iseq = cfp->iseq;
-    if (!iseq) {
-	return cfp->method_id;
+    struct FRAME *frame = ruby_frame;
+    char buf[BUFSIZ];
+    VALUE ary;
+    NODE *n;
+
+    ary = rb_ary_new();
+    if (frame->last_func == ID_ALLOCATOR) {
+	frame = frame->prev;
     }
-    while (iseq) {
-	if (RUBY_VM_IFUNC_P(iseq)) {
-	    return rb_intern("<ifunc>");
+    if (lev < 0) {
+	ruby_set_current_source();
+	if (frame->last_func) {
+	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
+		     ruby_sourcefile, ruby_sourceline,
+		     rb_id2name(frame->last_func));
 	}
-	if (iseq->defined_method_id) {
-	    return iseq->defined_method_id;
+	else if (ruby_sourceline == 0) {
+	    snprintf(buf, BUFSIZ, "%s", ruby_sourcefile);
 	}
-	if (iseq->local_iseq == iseq) {
-	    break;
+	else {
+	    snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
 	}
-	iseq = iseq->parent_iseq;
+	rb_ary_push(ary, rb_str_new2(buf));
+	if (lev < -1) return ary;
+    }
+    else {
+	while (lev-- > 0) {
+	    frame = frame->prev;
+	    if (!frame) {
+		ary = Qnil;
+		break;
+	    }
+	}
+    }
+    for (; frame && (n = frame->node); frame = frame->prev) {
+	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));
+	}
+	else {
+	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
+	}
+	rb_ary_push(ary, rb_str_new2(buf));
+    }
+
+    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;
+    VALUE *argv;
+{
+    VALUE level;
+    int lev;
+
+    rb_scan_args(argc, argv, "01", &level);
+
+    if (NIL_P(level)) lev = 1;
+    else lev = NUM2INT(level);
+    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+
+    return backtrace(lev);
+}
+
+void
+rb_backtrace()
+{
+    long i;
+    VALUE ary;
+
+    ary = backtrace(-1);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	printf("\tfrom %s\n", RSTRING(RARRAY(ary)->ptr[i])->ptr);
     }
-    return 0;
+}
+
+static VALUE
+make_backtrace()
+{
+    return backtrace(-1);
 }
 
 ID
-rb_frame_this_func(void)
+rb_frame_last_func()
 {
-    return frame_func_id(GET_THREAD()->cfp);
+    return ruby_frame->last_func;
 }
 
 ID
-rb_frame_callee(void)
+rb_frame_this_func()
+{
+    return ruby_frame->orig_func;
+}
+
+static NODE*
+compile(src, file, line)
+    VALUE src;
+    const char *file;
+    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;
+}
+
+static VALUE
+eval(self, src, scope, file, line)
+    VALUE self, src, scope;
+    const char *file;
+    int line;
+{
+    struct BLOCK *data = NULL;
+    volatile VALUE result = Qnil;
+    struct SCOPE * volatile old_scope;
+    struct BLOCK * volatile old_block;
+    struct RVarmap * volatile old_dyna_vars;
+    VALUE volatile old_cref;
+    int volatile old_vmode;
+    volatile VALUE old_wrapper;
+    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)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
+		     rb_obj_classname(scope));
+	}
+
+	Data_Get_Struct(scope, struct BLOCK, data);
+	/* PUSH BLOCK from data */
+	frame = data->frame;
+	frame.tmp = ruby_frame;	/* gc protection */
+	ruby_frame = &(frame);
+	old_scope = ruby_scope;
+	ruby_scope = data->scope;
+	old_block = ruby_block;
+	ruby_block = data->prev;
+	old_dyna_vars = ruby_dyna_vars;
+	ruby_dyna_vars = data->dyna_vars;
+	old_vmode = scope_vmode;
+	scope_vmode = data->vmode;
+	old_cref = (VALUE)ruby_cref;
+	ruby_cref = data->cref;
+	old_wrapper = ruby_wrapper;
+	ruby_wrapper = data->wrapper;
+	if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
+	    file = data->frame.node->nd_file;
+	    if (!file) file = "__builtin__";
+	    line = nd_line(data->frame.node);
+	}
+
+	self = data->self;
+	ruby_frame->iter = data->iter;
+    }
+    else {
+	if (ruby_frame->prev) {
+	    ruby_frame->iter = ruby_frame->prev->iter;
+	}
+    }
+    if (file == 0) {
+	ruby_set_current_source();
+	file = ruby_sourcefile;
+	line = ruby_sourceline;
+    }
+    PUSH_CLASS(data ? data->klass : ruby_class);
+    ruby_in_eval++;
+    if (TYPE(ruby_class) == T_ICLASS) {
+	ruby_class = RBASIC(ruby_class)->klass;
+    }
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	NODE *node;
+
+	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);
+    }
+    POP_TAG();
+    POP_CLASS();
+    ruby_in_eval--;
+    if (!NIL_P(scope)) {
+	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
+
+	ruby_wrapper = old_wrapper;
+	ruby_cref  = (NODE*)old_cref;
+	ruby_frame = frame.tmp;
+	ruby_scope = old_scope;
+	ruby_block = old_block;
+	ruby_dyna_vars = old_dyna_vars;
+	data->vmode = scope_vmode; /* write back visibility mode */
+	scope_vmode = old_vmode;
+	if (dont_recycle) {
+	    struct tag *tag;
+	    struct RVarmap *vars;
+
+	    scope_dup(ruby_scope);
+	    for (tag=prot_tag; tag; tag=tag->prev) {
+		scope_dup(tag->scope);
+	    }
+	    for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+		FL_SET(vars, DVAR_DONT_RECYCLE);
+	    }
+	}
+    }
+    else {
+	ruby_frame->iter = iter;
+    }
+    ruby_current_node = nodesave;
+    ruby_set_current_source();
+    if (state) {
+	if (state == TAG_RAISE) {
+	    if (strcmp(file, "(eval)") == 0) {
+		VALUE mesg, errat, bt2;
+
+		errat = get_backtrace(ruby_errinfo);
+		mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
+		if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
+		    (bt2 = backtrace(-2), RARRAY_LEN(bt2) > 0)) {
+		    if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
+			rb_str_update(mesg, 0, 0, rb_str_new2(": "));
+			rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]);
+		    }
+		    RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
+		}
+	    }
+	    rb_exc_raise(ruby_errinfo);
+	}
+	JUMP_TAG(state);
+    }
+
+    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;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE src, scope, vfile, vline;
+    const char *file = "(eval)";
+    int line = 1;
+
+    rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
+    if (ruby_safe_level >= 4) {
+	StringValue(src);
+	if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
+	    rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
+	}
+    }
+    else {
+	SafeStringValue(src);
+    }
+    if (argc >= 3) {
+	StringValue(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;
+
+	prev = ruby_frame;
+	PUSH_FRAME();
+	*ruby_frame = *prev->prev;
+	ruby_frame->prev = prev;
+	val = eval(self, src, scope, file, line);
+	POP_FRAME();
+
+	return val;
+    }
+    return eval(self, src, scope, file, line);
+}
+
+/* function to call func under the specified class/module context */
+static VALUE
+exec_under(func, under, cbase, args)
+    VALUE (*func)();
+    VALUE under, cbase;
+    void *args;
+{
+    VALUE val = Qnil;		/* OK */
+    int state;
+    int mode;
+    struct FRAME *f = ruby_frame;
+
+    PUSH_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;
+    if (cbase) {
+	PUSH_CREF(cbase);
+    }
+
+    mode = scope_vmode;
+    SCOPE_SET(SCOPE_PUBLIC);
+    PUSH_TAG(PROT_NONE);
+    if ((state = EXEC_TAG()) == 0) {
+	val = (*func)(args);
+    }
+    POP_TAG();
+    if (cbase) POP_CREF();
+    SCOPE_SET(mode);
+    POP_FRAME();
+    POP_CLASS();
+    if (state) JUMP_TAG(state);
+
+    return val;
+}
+
+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]);
+}
+
+/* string eval under the class/module context */
+static VALUE
+eval_under(under, self, src, file, line)
+    VALUE under, self, src;
+    const char *file;
+    int line;
+{
+    VALUE args[4];
+
+    if (ruby_safe_level >= 4) {
+	StringValue(src);
+    }
+    else {
+	SafeStringValue(src);
+    }
+    args[0] = self;
+    args[1] = src;
+    args[2] = (VALUE)file;
+    args[3] = (VALUE)line;
+    return exec_under(eval_under_i, under, under, args);
+}
+
+static VALUE
+yield_under_i(self)
+    VALUE self;
+{
+    return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
+}
+
+static VALUE
+yield_args_under_i(vinfo)
+    VALUE vinfo;
+{
+    VALUE *info = (VALUE *)vinfo;
+
+    return rb_yield_0(info[0], info[1], ruby_class, YIELD_PUBLIC_DEF, Qtrue);
+}
+
+/* block eval under the class/module context */
+static VALUE
+yield_under(under, self, args)
+    VALUE under, self, args;
+{
+    if (args == Qundef) {
+	return exec_under(yield_under_i, under, 0, self);
+    }
+    else {
+	VALUE info[2] = { args, self };
+
+	return exec_under(yield_args_under_i, under, 0, (VALUE)info);
+    }
+}
+
+static VALUE
+specific_eval(argc, argv, klass, self)
+    int argc;
+    VALUE *argv;
+    VALUE klass, self;
+{
+    if (rb_block_given_p()) {
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	}
+	return yield_under(klass, self, Qundef);
+    }
+    else {
+	const char *file = "(eval)";
+	int   line = 1;
+
+	if (argc == 0) {
+	    rb_raise(rb_eArgError, "block not supplied");
+	}
+	else {
+	    if (ruby_safe_level >= 4) {
+		StringValue(argv[0]);
+	    }
+	    else {
+		SafeStringValue(argv[0]);
+	    }
+	    if (argc > 3) {
+		rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
+			 rb_id2name(ruby_frame->last_func),
+			 rb_id2name(ruby_frame->last_func));
+	    }
+	    if (argc > 2) line = NUM2INT(argv[2]);
+	    if (argc > 1) {
+		file = StringValuePtr(argv[1]);
+	    }
+	}
+	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;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE klass;
+
+    if (SPECIAL_CONST_P(self)) {
+	klass = Qnil;
+    }
+    else {
+	klass = rb_singleton_class(self);
+    }
+    return specific_eval(argc, argv, klass, self);
+}
+
+/*
+ *  call-seq:
+ *     obj.instance_exec(arg...) {|var...| block }                       => obj
+ *
+ *  Executes 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.  Arguments are passed as block parameters.
+ *
+ *     class KlassWithSecret
+ *       def initialize
+ *         @secret = 99
+ *       end
+ *     end
+ *     k = KlassWithSecret.new
+ *     k.instance_exec(5) {|x| @secret+x }   #=> 104
+ */
+
+VALUE
+rb_obj_instance_exec(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+{
+    VALUE klass;
+
+    if (SPECIAL_CONST_P(self)) {
+	klass = Qnil;
+    }
+    else {
+	klass = rb_singleton_class(self);
+    }
+    return yield_under(klass, self, rb_ary_new4(argc, argv));
+}
+
+/*
+ *  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;
+    VALUE *argv;
+    VALUE mod;
+{
+    return specific_eval(argc, argv, mod, mod);
+}
+
+/*
+ *  call-seq:
+ *     mod.module_exec(arg...) {|var...| block }       => obj
+ *     mod.class_exec(arg...) {|var...| block }        => obj
+ *
+ *  Evaluates the given block in the context of the class/module.
+ *  The method defined in the block will belong to the receiver.
+ *
+ *     class Thing
+ *     end
+ *     Thing.class_exec{
+ *       def hello() "Hello there!" end
+ *     }
+ *     puts Thing.new.hello()
+ *
+ *  <em>produces:</em>
+ *
+ *     Hello there!
+ */
+
+VALUE
+rb_mod_module_exec(argc, argv, mod)
+    int argc;
+    VALUE *argv;
+    VALUE mod;
+{
+    return yield_under(mod, mod, rb_ary_new4(argc, argv));
+}
+
+VALUE rb_load_path;
+
+NORETURN(static void load_failed _((VALUE)));
+
+void
+rb_load(fname, wrap)
+    VALUE fname;
+    int wrap;
+{
+    VALUE tmp;
+    int state;
+    volatile int prohibit_int = rb_prohibit_interrupt;
+    volatile ID last_func;
+    volatile VALUE wrapper = ruby_wrapper;
+    volatile VALUE self = ruby_top_self;
+    NODE *volatile last_node;
+    NODE *saved_cref = ruby_cref;
+
+    if (wrap && ruby_safe_level >= 4) {
+	StringValue(fname);
+    }
+    else {
+	SafeStringValue(fname);
+    }
+    fname = rb_str_new4(fname);
+    tmp = rb_find_file(fname);
+    if (!tmp) {
+	load_failed(fname);
+    }
+    fname = tmp;
+
+    ruby_errinfo = Qnil;	/* ensure */
+    PUSH_VARS();
+    PUSH_CLASS(ruby_wrapper);
+    ruby_cref = ruby_top_cref;
+    if (!wrap) {
+	rb_secure(4);		/* should alter global state */
+	ruby_class = rb_cObject;
+	ruby_wrapper = 0;
+    }
+    else {
+	/* load in anonymous module as toplevel */
+	ruby_class = ruby_wrapper = rb_module_new();
+	self = rb_obj_clone(ruby_top_self);
+	rb_extend_object(self, ruby_wrapper);
+	PUSH_CREF(ruby_wrapper);
+    }
+    PUSH_ITER(ITER_NOT);
+    PUSH_FRAME();
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    ruby_frame->self = self;
+    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();
+    POP_ITER();
+    POP_CLASS();
+    POP_VARS();
+    ruby_wrapper = wrapper;
+    if (ruby_nerrs > 0) {
+	ruby_nerrs = 0;
+	rb_exc_raise(ruby_errinfo);
+    }
+    if (state) jump_tag_but_local_jump(state, Qundef);
+    if (!NIL_P(ruby_errinfo))	/* exception during load */
+	rb_exc_raise(ruby_errinfo);
+}
+
+void
+rb_load_protect(fname, wrap, state)
+    VALUE fname;
+    int wrap;
+    int *state;
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *prev_cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
-    /* check if prev_cfp can be accessible */
-    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
-        return 0;
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	rb_load(fname, wrap);
     }
-    return frame_func_id(prev_cfp);
+    POP_TAG();
+    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;
+    VALUE *argv;
+{
+    VALUE fname, wrap;
+
+    rb_scan_args(argc, argv, "11", &fname, &wrap);
+    rb_load(fname, RTEST(wrap));
+    return Qtrue;
+}
+
+VALUE ruby_dln_librefs;
+static VALUE rb_features;
+static st_table *loading_tbl;
+
+#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
+#ifdef DLEXT2
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
+#else
+#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
+#endif
+
+
+static const char *const loadable_ext[] = {
+    ".rb", DLEXT,
+#ifdef DLEXT2
+    DLEXT2,
+#endif
+    0
+};
+
+static int rb_feature_p _((const char *, const char *, int));
+static int search_required _((VALUE, VALUE *, VALUE *));
+
+static int
+rb_feature_p(feature, ext, rb)
+    const char *feature, *ext;
+    int rb;
+{
+    VALUE v;
+    const char *f, *e;
+    long i, len, elen;
+
+    if (ext) {
+	len = ext - feature;
+	elen = strlen(ext);
+    }
+    else {
+	len = strlen(feature);
+	elen = 0;
+    }
+    for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
+	v = RARRAY_PTR(rb_features)[i];
+	f = StringValuePtr(v);
+	if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
+	    continue;
+	if (!*(e = f + len)) {
+	    if (ext) continue;
+	    return 'u';
+	}
+	if (*e != '.') continue;
+	if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
+	    return 's';
+	}
+	if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
+	    return 'r';
+	}
+    }
+    if (loading_tbl) {
+	if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
+	    if (!ext) return 'u';
+	    return strcmp(ext, ".rb") ? 's' : 'r';
+	}
+	else {
+	    char *buf;
+
+	    if (ext && *ext) return 0;
+	    buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
+	    MEMCPY(buf, feature, char, len);
+	    for (i = 0; (e = loadable_ext[i]) != 0; i++) {
+		strncpy(buf + len, e, DLEXT_MAXLEN + 1);
+		if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
+		    return i ? 's' : 'r';
+		}
+	    }
+	}
+    }
+    return 0;
+}
+
+int
+rb_provided(feature)
+    const char *feature;
+{
+    const char *ext = strrchr(feature, '.');
+
+    if (ext && !strchr(ext, '/')) {
+	if (strcmp(".rb", ext) == 0) {
+	    if (rb_feature_p(feature, ext, Qtrue)) return Qtrue;
+	    return Qfalse;
+	}
+	else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
+	    if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
+	    return Qfalse;
+	}
+    }
+    if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
+	return Qtrue;
+
+    return Qfalse;
+}
+
+static void
+rb_provide_feature(feature)
+    VALUE feature;
+{
+    rb_ary_push(rb_features, feature);
 }
 
 void
-rb_frame_pop(void)
+rb_provide(feature)
+    const char *feature;
 {
-    rb_thread_t *th = GET_THREAD();
-    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    rb_provide_feature(rb_str_new2(feature));
+}
+
+static char *
+load_lock(ftptr)
+    const char *ftptr;
+{
+    st_data_t th;
+
+    if (!loading_tbl ||
+	!st_lookup(loading_tbl, (st_data_t)ftptr, &th))
+    {
+	/* loading ruby library should be serialized. */
+	if (!loading_tbl) {
+	    loading_tbl = st_init_strtable();
+	}
+	/* partial state */
+	ftptr = ruby_strdup(ftptr);
+	st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
+	return (char *)ftptr;
+    }
+    do {
+	if ((rb_thread_t)th == curr_thread) return 0;
+	CHECK_INTS;
+    } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
+    return 0;
+}
+
+static void
+load_unlock(const char *ftptr)
+{
+    if (ftptr) {
+	st_data_t key = (st_data_t)ftptr;
+	
+	if (st_delete(loading_tbl, &key, 0)) {
+	    free((char *)key);
+	}
+    }
+}
+
+/*
+ *  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"
+ */
+
+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;
+
+    *featurep = fname;
+    *path = 0;
+    ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
+    if (ext && !strchr(ext, '/')) {
+	if (strcmp(".rb", ext) == 0) {
+	    if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
+	    if ((*path = rb_find_file(fname)) != 0) return 'r';
+	    return 0;
+	}
+	else if (IS_SOEXT(ext)) {
+	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+	    tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname));
+	    *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';
+	    }
+#else
+	    rb_str_cat2(tmp, DLEXT);
+	    OBJ_FREEZE(tmp);
+	    if ((*path = rb_find_file(tmp)) != 0) {
+		return 's';
+	    }
+#endif
+	}
+	else if (IS_DLEXT(ext)) {
+	    if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
+	    if ((*path = rb_find_file(fname)) != 0) return 's';
+	}
+    }
+    tmp = fname;
+    type = rb_find_file_ext(&tmp, loadable_ext);
+    *featurep = tmp;
+    switch (type) {
+      case 0:
+	ftptr = RSTRING_PTR(tmp);
+	return rb_feature_p(ftptr, 0, Qfalse);
+
+      default:
+	ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
+	if (rb_feature_p(ftptr, ext, !--type)) break;
+	*path = rb_find_file(tmp);
+    }
+    return type ? 's' : 'r';
+}
+
+static void
+load_failed(fname)
+    VALUE fname;
+{
+    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+}
+
+VALUE
+rb_require_safe(fname, safe)
+    VALUE fname;
+    int safe;
+{
+    VALUE result = Qnil;
+    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 || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
+		result = Qfalse;
+	    }
+	    else {
+		ruby_safe_level = 0;
+		switch (found) {
+		  case 'r':
+		    rb_load(path, 0);
+		    break;
+
+		  case 's':
+		    ruby_current_node = 0;
+		    ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
+		    ruby_sourceline = 0;
+		    ruby_frame->last_func = 0;
+		    SCOPE_SET(SCOPE_PUBLIC);
+		    handle = (long)dln_load(RSTRING(path)->ptr);
+		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
+		    break;
+		}
+		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;
+    load_unlock(ftptr);
+    if (state) JUMP_TAG(state);
+    if (NIL_P(result)) {
+	load_failed(fname);
+    }
+    ruby_errinfo = errinfo;
+
+    return result;
+}
+
+VALUE
+rb_require(fname)
+    const char *fname;
+{
+    VALUE fn = rb_str_new2(fname);
+    OBJ_FREEZE(fn);
+    return rb_require_safe(fn, ruby_safe_level);
+}
+
+void
+ruby_init_ext(name, init)
+    const char *name;
+    void (*init) _((void));
+{
+    ruby_current_node = 0;
+    ruby_sourcefile = rb_source_filename(name);
+    ruby_sourceline = 0;
+    ruby_frame->last_func = 0;
+    ruby_frame->orig_func = 0;
+    SCOPE_SET(SCOPE_PUBLIC);
+    if (load_lock(name)) {
+	(*init)();
+	rb_provide(name);
+	load_unlock(name);
+    }
+}
+
+static void
+secure_visibility(self)
+    VALUE self;
+{
+    if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
+	rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
+    }
+}
+
+static void
+set_method_visibility(self, argc, argv, ex)
+    VALUE self;
+    int argc;
+    VALUE *argv;
+    ID ex;
+{
+    int i;
+
+    secure_visibility(self);
+    for (i=0; i<argc; i++) {
+	rb_export_method(self, rb_to_id(argv[i]), ex);
+    }
+    rb_clear_cache_by_class(self);
+}
+
+/*
+ *  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;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PUBLIC);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PUBLIC);
+    }
+    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;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PROTECTED);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PROTECTED);
+    }
+    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;
+    VALUE *argv;
+    VALUE module;
+{
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_PRIVATE);
+    }
+    else {
+	set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+    }
+    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;
+    VALUE *argv;
+    VALUE obj;
+{
+    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PUBLIC);
+    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;
+    VALUE *argv;
+    VALUE obj;
+{
+    set_method_visibility(CLASS_OF(obj), argc, argv, NOEX_PRIVATE);
+    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;
+    VALUE *argv;
+{
+    return rb_mod_public(argc, argv, rb_cObject);
+}
+
+static VALUE
+top_private(argc, argv)
+    int argc;
+    VALUE *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;
+    VALUE *argv;
+    VALUE module;
+{
+    int i;
+    ID id;
+    NODE *body;
+
+    if (TYPE(module) != T_MODULE) {
+	rb_raise(rb_eTypeError, "module_function must be called for modules");
+    }
+
+    secure_visibility(module);
+    if (argc == 0) {
+	SCOPE_SET(SCOPE_MODFUNC);
+	return module;
+    }
+
+    set_method_visibility(module, argc, argv, NOEX_PRIVATE);
+    for (i=0; i<argc; i++) {
+	VALUE m = module;
+
+	id = rb_to_id(argv[i]);
+	for (;;) {
+	    body = search_method(m, id, &m);
+	    if (body == 0) {
+		body = search_method(rb_cObject, id, &m);
+	    }
+	    if (body == 0 || body->nd_body == 0) {
+		print_undef(module, id);
+	    }
+	    if (nd_type(body->nd_body) != NODE_ZSUPER) {
+		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);
+    }
+    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
@@ -816,7 +7723,8 @@ rb_frame_pop(void)
  */
 
 static VALUE
-rb_mod_append_features(VALUE module, VALUE include)
+rb_mod_append_features(module, include)
+    VALUE module, include;
 {
     switch (TYPE(include)) {
       case T_CLASS:
@@ -834,17 +7742,19 @@ rb_mod_append_features(VALUE module, VALUE include)
 /*
  *  call-seq:
  *     include(module, ...)    => self
- *
+ *  
  *  Invokes <code>Module.append_features</code> on each parameter in turn.
  */
 
 static VALUE
-rb_mod_include(int argc, VALUE *argv, VALUE module)
+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);
+    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);
@@ -853,14 +7763,19 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
 }
 
 void
-rb_obj_call_init(VALUE obj, int argc, VALUE *argv)
+rb_obj_call_init(obj, argc, argv)
+    VALUE obj;
+    int argc;
+    VALUE *argv;
 {
-    PASS_PASSED_BLOCK();
-    rb_funcall2(obj, idInitialize, argc, argv);
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    rb_funcall2(obj, init, argc, argv);
+    POP_ITER();
 }
 
 void
-rb_extend_object(VALUE obj, VALUE module)
+rb_extend_object(obj, module)
+    VALUE obj, module;
 {
     rb_include_module(rb_singleton_class(obj), module);
 }
@@ -868,11 +7783,11 @@ rb_extend_object(VALUE obj, VALUE 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
@@ -885,15 +7800,16 @@ rb_extend_object(VALUE obj, VALUE module)
  *     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(VALUE mod, VALUE obj)
+rb_mod_extend_object(mod, obj)
+    VALUE mod, obj;
 {
     rb_extend_object(obj, mod);
     return obj;
@@ -902,22 +7818,22 @@ rb_mod_extend_object(VALUE mod, VALUE 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>
@@ -925,15 +7841,17 @@ rb_mod_extend_object(VALUE mod, VALUE obj)
  */
 
 static VALUE
-rb_obj_extend(int argc, VALUE *argv, VALUE obj)
+rb_obj_extend(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     int i;
 
     if (argc == 0) {
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
     }
-    for (i = 0; i < argc; i++)
-	Check_Type(argv[i], T_MODULE);
+    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);
@@ -944,22 +7862,22 @@ rb_obj_extend(int argc, VALUE *argv, VALUE 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(int argc, VALUE *argv, VALUE self)
+top_include(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
-    rb_thread_t *th = GET_THREAD();
-
     rb_secure(4);
-    if (th->top_wrapper) {
-	rb_warning
-	    ("main#include in the wrapped load is effective only in wrapper module");
-	return rb_mod_include(argc, argv, th->top_wrapper);
+    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);
 }
@@ -967,296 +7885,5741 @@ top_include(int argc, VALUE *argv, VALUE self)
 VALUE rb_f_trace_var();
 VALUE rb_f_untrace_var();
 
-static VALUE *
-errinfo_place(void)
+static void
+errinfo_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
+	rb_raise(rb_eTypeError, "assigning non-exception to $!");
+    }
+    *var = val;
+}
+
+static VALUE
+errat_getter(id)
+    ID id;
+{
+    return get_backtrace(ruby_errinfo);
+}
+
+static void
+errat_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    if (NIL_P(ruby_errinfo)) {
+	rb_raise(rb_eArgError, "$! not set");
+    }
+    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()
+{
+    ID *tbl;
+    int n, i;
+    VALUE ary = rb_ary_new();
+    struct RVarmap *vars;
+
+    tbl = ruby_scope->local_tbl;
+    if (tbl) {
+	n = *tbl++;
+	for (i=2; i<n; i++) {	/* skip first 2 ($_ and $~) */
+	    if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
+	    rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
+	}
+    }
+
+    vars = ruby_dyna_vars;
+    while (vars) {
+	if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
+	    rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
+	}
+	vars = vars->next;
+    }
+
+    return ary;
+}
+
+static VALUE rb_f_catch _((VALUE,VALUE));
+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;
+
+void
+rb_set_end_proc(func, data)
+    void (*func) _((VALUE));
+    VALUE data;
+{
+    struct end_proc_data *link = ALLOC(struct end_proc_data);
+    struct end_proc_data **list;
+
+    if (ruby_wrapper) list = &ephemeral_end_procs;
+    else              list = &end_procs;
+    link->next = *list;
+    link->func = func;
+    link->data = data;
+    link->safe = ruby_safe_level;
+    *list = link;
+}
+
+void
+rb_mark_end_proc()
+{
+    struct end_proc_data *link;
+
+    link = end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = ephemeral_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+    link = tmp_end_procs;
+    while (link) {
+	rb_gc_mark(link->data);
+	link = link->next;
+    }
+}
+
+static void call_end_proc _((VALUE data));
+
+static void
+call_end_proc(data)
+    VALUE data;
+{
+    PUSH_ITER(ITER_NOT);
+    PUSH_FRAME();
+    ruby_frame->self = ruby_frame->prev->self;
+    ruby_frame->node = 0;
+    ruby_frame->last_func = 0;
+    ruby_frame->last_class = 0;
+    proc_invoke(data, rb_ary_new2(0), Qundef, 0);
+    POP_FRAME();
+    POP_ITER();
+}
+
+static void
+rb_f_END()
+{
+    PUSH_FRAME();
+    ruby_frame->argc = 0;
+    ruby_frame->iter = ITER_CUR;
+    rb_set_end_proc(call_end_proc, rb_block_proc());
+    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()
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
+    VALUE proc;
 
-    while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
-	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
-	    if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
-		return &cfp->dfp[-2];
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eArgError, "called without a block");
+    }
+    proc = rb_block_proc();
+    rb_set_end_proc(call_end_proc, proc);
+    return proc;
+}
+
+void
+rb_exec_end_proc()
+{
+    struct end_proc_data *link, *tmp;
+    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);
 	    }
-	    else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
-		     TYPE(cfp->dfp[-2]) != T_NODE &&
-		     !FIXNUM_P(cfp->dfp[-2])) {
-		return &cfp->dfp[-2];
+	    POP_TAG();
+	    if (status) {
+		error_handle(status);
 	    }
+	    tmp = link;
+	    tmp_end_procs = link = link->next;
+	    free(tmp);
 	}
-	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
     }
-    return 0;
+    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);
+	}
+    }
+    ruby_safe_level = safe;
 }
 
+/*
+ *  call-seq:
+ *     __method__         => symbol
+ *  
+ *  Returns the name of the current method as a Symbol.
+ *  If called from inside of an aliased method it will return the original
+ *  nonaliased name.
+ *  If called outside of a method, it returns <code>nil</code>.
+ *  
+ *    def foo
+ *      __method__
+ *    end
+ *    alias bar foo
+ *    
+ *    foo                # => :foo
+ *    bar                # => :foo
+ *
+ */
+
 static VALUE
-get_errinfo(void)
+rb_f_method_name()
 {
-    VALUE *ptr = errinfo_place();
-    if (ptr) {
-	return *ptr;
+    struct FRAME* prev = ruby_frame->prev;
+    if (prev && prev->orig_func) {
+	return ID2SYM(prev->orig_func);
     }
     else {
 	return Qnil;
     }
 }
 
+void
+Init_eval()
+{
+    init = rb_intern("initialize");
+    eqq = rb_intern("===");
+    each = rb_intern("each");
+
+    aref = rb_intern("[]");
+    aset = rb_intern("[]=");
+    match = rb_intern("=~");
+    missing = rb_intern("method_missing");
+    added = rb_intern("method_added");
+    singleton_added = rb_intern("singleton_method_added");
+    removed = rb_intern("method_removed");
+    singleton_removed = rb_intern("singleton_method_removed");
+    undefined = rb_intern("method_undefined");
+    singleton_undefined = rb_intern("singleton_method_undefined");
+
+    __id__ = rb_intern("__id__");
+    __send__ = rb_intern("__send__");
+
+    rb_global_variable((void *)&top_scope);
+    rb_global_variable((void *)&ruby_eval_tree_begin);
+
+    rb_global_variable((void *)&ruby_eval_tree);
+    rb_global_variable((void *)&ruby_dyna_vars);
+
+    rb_define_virtual_variable("$@", errat_getter, errat_setter);
+    rb_define_hooked_variable("$!", &ruby_errinfo, 0, errinfo_setter);
+
+    rb_define_global_function("eval", rb_f_eval, -1);
+    rb_define_global_function("iterator?", rb_f_block_given_p, 0);
+    rb_define_global_function("block_given?", rb_f_block_given_p, 0);
+    rb_define_global_function("method_missing", rb_method_missing, -1);
+    rb_define_global_function("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((void *)&basic_respond_to);
+    basic_respond_to = rb_method_node(rb_cObject, respond_to);
+    
+    rb_define_global_function("raise", rb_f_raise, -1);
+    rb_define_global_function("fail", rb_f_raise, -1);
+
+    rb_define_global_function("caller", rb_f_caller, -1);
+
+    rb_define_global_function("exit", rb_f_exit, -1);
+    rb_define_global_function("abort", rb_f_abort, -1);
+
+    rb_define_global_function("at_exit", rb_f_at_exit, 0);
+
+    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("local_variables", rb_f_local_variables, 0);
+
+    rb_define_global_function("__method__", rb_f_method_name, 0);
+
+    rb_define_method(rb_mKernel, "send", rb_f_send, -1);
+    rb_define_method(rb_mKernel, "__send__", rb_f_send, -1);
+    rb_define_method(rb_mKernel, "instance_eval", rb_obj_instance_eval, -1);
+    rb_define_method(rb_mKernel, "instance_exec", rb_obj_instance_exec, -1);
+
+    rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
+    rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
+    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
+    rb_define_private_method(rb_cModule, "public", rb_mod_public, -1);
+    rb_define_private_method(rb_cModule, "protected", rb_mod_protected, -1);
+    rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
+    rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
+    rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
+    rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
+    rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
+    rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
+    rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
+    rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
+    rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
+    rb_define_method(rb_cModule, "module_exec", rb_mod_module_exec, -1);
+    rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
+    rb_define_method(rb_cModule, "class_exec", rb_mod_module_exec, -1);
+
+    rb_undef_method(rb_cClass, "module_function");
+
+    rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
+    rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
+    rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
+    rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
+
+    rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
+    rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, 0);
+
+    rb_define_singleton_method(ruby_top_self, "include", top_include, -1);
+    rb_define_singleton_method(ruby_top_self, "public", top_public, -1);
+    rb_define_singleton_method(ruby_top_self, "private", top_private, -1);
+
+    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("set_trace_func", set_trace_func, 1);
+    rb_global_variable(&trace_func);
+
+    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
-errinfo_getter(ID id)
+rb_mod_autoload(mod, sym, file)
+    VALUE mod;
+    VALUE sym;
+    VALUE file;
 {
-    return get_errinfo();
+    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);
+}
+
+void
+Init_load()
+{
+    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_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_global_variable(&ruby_wrapper);
+
+    rb_global_variable(&ruby_dln_librefs);
+    ruby_dln_librefs = rb_ary_new();
 }
 
-#if 0
 static void
-errinfo_setter(VALUE val, ID id, VALUE *var)
+scope_dup(scope)
+    struct SCOPE *scope;
 {
-    if (!NIL_P(val) && !rb_obj_is_kind_of(val, rb_eException)) {
-	rb_raise(rb_eTypeError, "assigning non-exception to $!");
+    ID *tbl;
+    VALUE *vars;
+
+    scope->flags |= SCOPE_DONT_RECYCLE;
+    if (scope->flags & SCOPE_MALLOC) return;
+
+    if (scope->local_tbl) {
+	tbl = scope->local_tbl;
+	vars = ALLOC_N(VALUE, tbl[0]+1);
+	*vars++ = scope->local_vars[-1];
+	MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
+	scope->local_vars = vars;
+	scope->flags |= SCOPE_MALLOC;
+    }
+}
+
+static void
+blk_mark(data)
+    struct BLOCK *data;
+{
+    while (data) {
+	rb_gc_mark_frame(&data->frame);
+	rb_gc_mark((VALUE)data->scope);
+	rb_gc_mark((VALUE)data->var);
+	rb_gc_mark((VALUE)data->body);
+	rb_gc_mark((VALUE)data->self);
+	rb_gc_mark((VALUE)data->dyna_vars);
+	rb_gc_mark((VALUE)data->cref);
+	rb_gc_mark(data->wrapper);
+	rb_gc_mark(data->block_obj);
+	data = data->prev;
+    }
+}
+
+static void
+frame_free(frame)
+    struct FRAME *frame;
+{
+    struct FRAME *tmp;
+
+    frame = frame->prev;
+    while (frame) {
+	tmp = frame;
+	frame = frame->prev;
+	free(tmp);
+    }
+}
+
+static void
+blk_free(data)
+    struct BLOCK *data;
+{
+    void *tmp;
+
+    while (data) {
+	frame_free(&data->frame);
+	tmp = data;
+	data = data->prev;
+	free(tmp);
+    }
+}
+
+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;
+{
+    struct BLOCK *tmp;
+    struct RVarmap* vars;
+
+    while (block->prev) {
+	tmp = ALLOC_N(struct BLOCK, 1);
+	MEMCPY(tmp, block->prev, struct BLOCK, 1);
+	scope_dup(tmp->scope);
+	frame_dup(&tmp->frame);
+
+	for (vars = tmp->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
+	}
+
+	block->prev = tmp;
+	block = tmp;
+    }
+}
+
+
+static void
+blk_dup(dup, orig)
+    struct BLOCK *dup, *orig;
+{
+    MEMCPY(dup, orig, struct BLOCK, 1);
+    frame_dup(&dup->frame);
+
+    if (dup->iter) {
+	blk_copy_prev(dup);
+    }
+    else {
+	dup->prev = 0;
+    }
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+proc_clone(self)
+    VALUE self;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+
+    Data_Get_Struct(self, struct BLOCK, orig);
+    bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+    CLONESETUP(bind, self);
+    blk_dup(data, orig);
+
+    return bind;
+}
+
+/*
+ * MISSING: documentation
+ */
+
+#define PROC_TSHIFT (FL_USHIFT+1)
+#define PROC_TMASK  (FL_USER1|FL_USER2|FL_USER3)
+#define PROC_TMAX   (PROC_TMASK >> PROC_TSHIFT)
+
+static int proc_get_safe_level(VALUE);
+
+static VALUE
+proc_dup(self)
+    VALUE self;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+    int safe = proc_get_safe_level(self);
+
+    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 (safe > PROC_TMAX) safe = PROC_TMAX;
+    FL_SET(bind, (safe << PROC_TSHIFT) & PROC_TMASK);
+
+    return bind;
+}
+
+VALUE
+rb_block_dup(self, klass, cref)
+    VALUE self, klass, cref;
+{
+    struct BLOCK *block;
+    VALUE obj = proc_dup(self);
+    Data_Get_Struct(obj, struct BLOCK, block);
+    block->klass = klass;
+    block->cref = NEW_NODE(nd_type(block->cref), cref, block->cref->u2.node,
+			   block->cref->u3.node);
+    return obj;
+}
+
+/*
+ *  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;
+{
+    struct BLOCK *data, *p;
+    struct RVarmap *vars;
+    VALUE bind;
+
+    PUSH_BLOCK(0,0);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+    *data = *ruby_block;
+
+    data->orig_thread = rb_thread_current();
+    data->wrapper = ruby_wrapper;
+    data->iter = rb_f_block_given_p();
+    frame_dup(&data->frame);
+    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) {
+	blk_copy_prev(data);
     }
     else {
-	VALUE *ptr = errinfo_place();
-	if (ptr) {
-	    *ptr = val;
+	data->prev = 0;
+    }
+
+    for (p = data; p; p = p->prev) {
+	for (vars = p->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
 	}
-	else {
-	    rb_raise(rb_eRuntimeError, "errinfo_setter: not in rescue clause.");
+    }
+    scope_dup(data->scope);
+    POP_BLOCK();
+
+    return bind;
+}
+
+/*
+ *  call-seq:
+ *     binding.eval(string [, filename [,lineno]])  => obj
+ *
+ *  Evaluates the Ruby expression(s) in <em>string</em>, in the
+ *  <em>binding</em>'s context.  If the optional <em>filename</em> and
+ *  <em>lineno</em> parameters are present, they will be used when
+ *  reporting syntax errors.
+ *
+ *     def getBinding(param)
+ *       return binding
+ *     end
+ *     b = getBinding("hello")
+ *     b.eval("param")   #=> "hello"
+ */
+
+static VALUE
+bind_eval(argc, argv, bindval)
+    int argc;
+    VALUE *argv;
+    VALUE bindval;
+{
+    VALUE args[4];
+
+    rb_scan_args(argc, argv, "12", &args[0], &args[2], &args[3]);
+    args[1] = bindval;
+    return rb_f_eval(argc+1, args, Qnil /* self will be searched in eval */);
+}
+
+#define SAFE_LEVEL_MAX PROC_TMASK
+
+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);
+}
+
+static int
+proc_get_safe_level(data)
+    VALUE data;
+{
+    return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+}
+
+static void
+proc_set_safe_level(data)
+    VALUE data;
+{
+    ruby_safe_level = proc_get_safe_level(data);
+}
+
+static VALUE
+proc_alloc(klass, proc)
+    VALUE klass;
+    int proc;
+{
+    volatile VALUE block;
+    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);
+    *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);
+    }
+    else {
+	data->prev = 0;
+    }
+
+    for (p = data; p; p = p->prev) {
+	for (vars = p->dyna_vars; vars; vars = vars->next) {
+	    if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	    FL_SET(vars, DVAR_DONT_RECYCLE);
 	}
     }
+    scope_dup(data->scope);
+    proc_save_safe_level(block);
+    if (proc) {
+	data->flags |= BLOCK_LAMBDA;
+    }
+    else {
+	ruby_block->block_obj = block;
+    }
+
+    return block;
+}
+
+/*
+ *  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;
 }
-#endif
 
 VALUE
-rb_errinfo(void)
+rb_block_proc()
 {
-    rb_thread_t *th = GET_THREAD();
-    return th->errinfo;
+    return proc_alloc(rb_cProc, Qfalse);
 }
 
-void
-rb_set_errinfo(VALUE err)
+VALUE
+rb_f_lambda()
 {
-    if (!NIL_P(err) && !rb_obj_is_kind_of(err, rb_eException)) {
-	rb_raise(rb_eTypeError, "assigning non-exception to $!");
+    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);
+}
+
+static int
+block_orphan(data)
+    struct BLOCK *data;
+{
+    if (data->scope->flags & SCOPE_NOSTACK) {
+	return 1;
+    }
+    if (data->orig_thread != rb_thread_current()) {
+	return 1;
+    }
+    return 0;
+}
+
+static VALUE
+proc_invoke(proc, args, self, klass)
+    VALUE proc, args;		/* OK */
+    VALUE self, klass;
+{
+    struct BLOCK * volatile old_block;
+    struct BLOCK _block;
+    struct BLOCK *data;
+    volatile VALUE result = Qundef;
+    int state;
+    volatile int safe = ruby_safe_level;
+    volatile VALUE old_wrapper = ruby_wrapper;
+    volatile int pcall, avalue = Qtrue;
+    volatile VALUE tmp = args;
+    VALUE bvar = Qnil;
+
+    if (rb_block_given_p() && ruby_frame->last_func) {
+	if (klass != ruby_frame->last_class)
+	    klass = rb_obj_class(proc);
+	bvar = rb_block_proc();
+    }
+
+    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];
     }
-    GET_THREAD()->errinfo = err;
+
+    PUSH_VARS();
+    ruby_wrapper = data->wrapper;
+    ruby_dyna_vars = data->dyna_vars;
+    /* PUSH BLOCK from data */
+    old_block = ruby_block;
+    _block = *data;
+    _block.block_obj = bvar;
+    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 */
+    ruby_block = &_block;
+    PUSH_ITER(ITER_CUR);
+    ruby_frame->iter = ITER_CUR;
+    PUSH_TAG(pcall ? PROT_LAMBDA : 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 | YIELD_PROC_CALL, avalue);
+    }
+    else if (TAG_DST()) {
+	result = prot_tag->retval;
+    }
+    POP_TAG();
+    POP_ITER();
+    ruby_block = old_block;
+    ruby_wrapper = old_wrapper;
+    POP_VARS();
+    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);
+	}
+      case TAG_RETURN:
+	if (result != Qundef) {
+	    if (pcall) break;
+	    return_jump(result);
+	}
+      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
+ */
+
 VALUE
-rb_rubylevel_errinfo(void)
+rb_proc_call(proc, args)
+    VALUE proc, args;		/* OK */
 {
-    return get_errinfo();
+    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
+ */
+
 static VALUE
-errat_getter(ID id)
+proc_arity(proc)
+    VALUE proc;
 {
-    VALUE err = get_errinfo();
-    if (!NIL_P(err)) {
-	return get_backtrace(err);
+    struct BLOCK *data;
+    NODE *var, *list;
+    int n;
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    var = data->var;
+    if (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 (var == (NODE*)1) return INT2FIX(0);
+    if (var == (NODE*)2) return INT2FIX(0);
+    if (nd_type(var) == NODE_BLOCK_ARG) {
+	var = var->nd_args;
+	if (var == (NODE*)1) return INT2FIX(0);
+	if (var == (NODE*)2) return INT2FIX(0);
+    }
+    switch (nd_type(var)) {
+      default:
+	return INT2FIX(1);
+      case NODE_MASGN:
+	list = var->nd_head;
+	n = 0;
+	while (list) {
+	    n++;
+	    list = list->nd_next;
+	}
+	if (var->nd_args) return INT2FIX(-n-1);
+	return INT2FIX(n);
+    }
+}
+
+/*
+ * 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;
+{
+    struct BLOCK *data, *data2;
+
+    if (self == other) return Qtrue;
+    if (TYPE(other) != T_DATA) return Qfalse;
+    if (RDATA(other)->dmark != (RUBY_DATA_FUNC)blk_mark) return Qfalse;
+    if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
+    Data_Get_Struct(self, struct BLOCK, data);
+    Data_Get_Struct(other, struct BLOCK, data2);
+    if (data->body != data2->body) return 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;
+}
+
+/*
+ * 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;
+{
+    struct BLOCK *data;
+    NODE *node;
+    const char *cname = rb_obj_classname(self);
+    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+    long len = strlen(cname)+6+w; /* 6:tags 16:addr */
+    VALUE str;
+
+    Data_Get_Struct(self, struct BLOCK, data);
+    if ((node = data->frame.node) || (node = data->body)) {
+	len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
+	str = rb_str_new(0, len);
+	snprintf(RSTRING(str)->ptr, len+1,
+		 "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
+		 node->nd_file, nd_line(node));
     }
     else {
-	return Qnil;
+	str = rb_str_new(0, len);
+	snprintf(RSTRING(str)->ptr, len+1,
+		 "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
     }
+    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+    if (OBJ_TAINTED(self)) OBJ_TAINT(str);
+
+    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;
+{
+    return self;
 }
 
+/*
+ *  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;
+{
+    struct BLOCK *orig, *data;
+    VALUE bind;
+
+    Data_Get_Struct(proc, struct BLOCK, orig);
+    bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
+    MEMCPY(data, orig, struct BLOCK, 1);
+    frame_dup(&data->frame);
+
+    if (data->iter) {
+	blk_copy_prev(data);
+    }
+    else {
+	data->prev = 0;
+    }
+
+    return bind;
+}
+
+static VALUE
+block_pass(self, node)
+    VALUE self;
+    NODE *node;
+{
+    VALUE proc = rb_eval(self, node->nd_body);	/* OK */
+    VALUE b;
+    struct BLOCK * volatile old_block;
+    struct BLOCK _block;
+    struct BLOCK *data;
+    volatile VALUE result = Qnil;
+    int state;
+    volatile int orphan;
+    volatile int safe = ruby_safe_level;
+
+    if (NIL_P(proc)) {
+	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(b)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
+		     rb_obj_classname(proc));
+	}
+	proc = 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_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);
+
+    /* 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;
+
+    PUSH_TAG(PROT_LOOP);
+    state = EXEC_TAG();
+    if (state == 0) {
+      retry:
+	proc_set_safe_level(proc);
+	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();
+    ruby_block = old_block;
+    ruby_safe_level = safe;
+
+    switch (state) {/* escape from orphan block */
+      case 0:
+	break;
+      case TAG_RETURN:
+	if (orphan) {
+	    proc_jump_error(state, prot_tag->retval);
+	}
+      default:
+	JUMP_TAG(state);
+    }
+
+    return result;
+}
+
+struct METHOD {
+    VALUE klass, rklass;
+    VALUE recv;
+    ID id, oid;
+    int safe_level;
+    NODE *body;
+};
+
 static void
-errat_setter(VALUE val, ID id, VALUE *var)
+bm_mark(data)
+    struct METHOD *data;
 {
-    VALUE err = get_errinfo();
-    if (NIL_P(err)) {
-	rb_raise(rb_eArgError, "$! not set");
+    rb_gc_mark(data->rklass);
+    rb_gc_mark(data->klass);
+    rb_gc_mark(data->recv);
+    rb_gc_mark((VALUE)data->body);
+}
+
+static VALUE
+mnew(klass, obj, id, mklass)
+    VALUE klass, obj, mklass;
+    ID id;
+{
+    VALUE method;
+    NODE *body;
+    int noex;
+    struct METHOD *data;
+    VALUE rklass = klass;
+    ID oid = id;
+
+  again:
+    if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
+	print_undef(rklass, oid);
+    }
+
+    if (nd_type(body) == NODE_ZSUPER) {
+	klass = RCLASS(klass)->super;
+	goto again;
     }
-    set_backtrace(err, val);
+
+    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;
+    data->id = id;
+    data->body = body;
+    data->rklass = rklass;
+    data->oid = oid;
+    data->safe_level = NOEX_WITH_SAFE(noex);
+    OBJ_INFECT(method, klass);
+
+    return method;
 }
 
-int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary);
+
+/**********************************************************************
+ *
+ * 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;
+{
+    struct METHOD *m1, *m2;
+
+    if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
+	return Qfalse;
+    if (CLASS_OF(method) != CLASS_OF(other))
+	return Qfalse;
+
+    Data_Get_Struct(method, struct METHOD, m1);
+    Data_Get_Struct(other, struct METHOD, m2);
+
+    if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
+	m1->recv != m2->recv || m1->body != m2->body)
+	return Qfalse;
+
+    return Qtrue;
+}
 
 /*
  *  call-seq:
- *     local_variables    => array
+ *     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;
+{
+    VALUE method;
+    struct METHOD *orig, *data;
+
+    Data_Get_Struct(obj, struct METHOD, orig);
+    method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
+    data->klass = orig->klass;
+    data->recv = Qundef;
+    data->id = orig->id;
+    data->body = orig->body;
+    data->rklass = orig->rklass;
+    data->oid = orig->oid;
+    OBJ_INFECT(method, obj);
+
+    return method;
+}
+
+/*
+ *  call-seq:
+ *     meth.receiver    => object
  *
- *  Returns the names of the current local variables.
+ *  Returns the bound receiver of the method object.
+ */
+
+static VALUE
+method_receiver(obj)
+    VALUE obj;
+{
+    struct METHOD *data;
+
+    Data_Get_Struct(obj, struct METHOD, data);
+    return data->recv;
+}
+
+/*
+ *  call-seq:
+ *     meth.name    => string
  *
- *     fred = 1
- *     for i in 1..10
- *        # ...
+ *  Returns the name of the method.
+ */
+
+static VALUE
+method_name(obj)
+    VALUE obj;
+{
+    struct METHOD *data;
+
+    Data_Get_Struct(obj, struct METHOD, data);
+    return rb_str_new2(rb_id2name(data->oid));
+}
+
+/*
+ *  call-seq:
+ *     meth.owner    => class_or_module
+ *
+ *  Returns the class or module that defines the method.
+ */
+
+static VALUE
+method_owner(obj)
+    VALUE obj;
+{
+    struct METHOD *data;
+
+    Data_Get_Struct(obj, struct METHOD, data);
+    return data->klass;
+}
+
+/*
+ *  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
- *     local_variables   #=> ["fred", "i"]
+ *     
+ *     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"
+ */
+
+VALUE
+rb_obj_method(obj, vid)
+    VALUE obj;
+    VALUE 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_f_local_variables(void)
+rb_mod_method(mod, vid)
+    VALUE mod;
+    VALUE vid;
+{
+    return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
+}
+
+/*
+ * MISSING: documentation
+ */
+
+static VALUE
+method_clone(self)
+    VALUE self;
+{
+    VALUE clone;
+    struct METHOD *orig, *data;
+
+    Data_Get_Struct(self, struct METHOD, orig);
+    clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+    CLONESETUP(clone, self);
+    *data = *orig;
+
+    return clone;
+}
+
+VALUE
+rb_method_dup(self, klass, cref)
+    VALUE self;
+    VALUE klass;
+    VALUE cref;
+{
+    VALUE clone;
+    struct METHOD *orig, *data;
+
+    Data_Get_Struct(self, struct METHOD, orig);
+    clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+    *data = *orig;
+    data->rklass = klass;
+    if (data->body->nd_rval) {
+	NODE *tmp = NEW_NODE(nd_type(data->body->u2.node), cref,
+			     data->body->u2.node->u2.node,
+			     data->body->u2.node->u3.node);
+	data->body = NEW_NODE(nd_type(data->body), data->body->u1.node, tmp,
+			      data->body->u3.node);
+    }
+    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 */
+    struct METHOD *data;
+    int safe;
+
+    Data_Get_Struct(method, struct METHOD, data);
+    if (data->recv == Qundef) {
+	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+    }
+    if (OBJ_TAINTED(method)) {
+        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+    }
+    else {
+	safe = data->safe_level;
+    }
+    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_ITER();
+    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 (FL_TEST(data->rklass, FL_SINGLETON)) {
+	    rb_raise(rb_eTypeError, "singleton method bound 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;
+	    }
+	}
+	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
+	  not_instace:
+	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
+		     rb_class2name(data->rklass));
+	}
+    }
+
+    method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
+    *bound = *data;
+    bound->recv = recv;
+    bound->rklass = rklass;
+
+    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;
+{
+    struct METHOD *data;
+    NODE *body;
+    int n;
+
+    Data_Get_Struct(method, struct METHOD, data);
+
+    body = data->body;
+    switch (nd_type(body)) {
+      case NODE_CFUNC:
+	if (body->nd_argc < 0) return INT2FIX(-1);
+	return INT2FIX(body->nd_argc);
+      case NODE_ZSUPER:
+	return INT2FIX(-1);
+      case NODE_ATTRSET:
+	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:
+	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)
+	    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;
+{
+    struct METHOD *data;
+    VALUE str;
+    const char *s;
+    const char *sharp = "#";
+
+    Data_Get_Struct(method, struct METHOD, data);
+    str = rb_str_buf_new2("#<");
+    s = rb_obj_classname(method);
+    rb_str_buf_cat2(str, s);
+    rb_str_buf_cat2(str, ": ");
+
+    if (FL_TEST(data->klass, FL_SINGLETON)) {
+	VALUE v = rb_iv_get(data->klass, "__attached__");
+
+	if (data->recv == Qundef) {
+	    rb_str_buf_append(str, rb_inspect(data->klass));
+	}
+	else if (data->recv == v) {
+	    rb_str_buf_append(str, rb_inspect(v));
+	    sharp = ".";
+	}
+	else {
+	    rb_str_buf_append(str, rb_inspect(data->recv));
+	    rb_str_buf_cat2(str, "(");
+	    rb_str_buf_append(str, rb_inspect(v));
+	    rb_str_buf_cat2(str, ")");
+	    sharp = ".";
+	}
+    }
+    else {
+	rb_str_buf_cat2(str, rb_class2name(data->rklass));
+	if (data->rklass != data->klass) {
+	    rb_str_buf_cat2(str, "(");
+	    rb_str_buf_cat2(str, rb_class2name(data->klass));
+	    rb_str_buf_cat2(str, ")");
+	}
+    }
+    rb_str_buf_cat2(str, sharp);
+    rb_str_buf_cat2(str, rb_id2name(data->oid));
+    rb_str_buf_cat2(str, ">");
+
+    return str;
+}
+
+static VALUE
+mproc(method)
+    VALUE method;
+{
+    VALUE proc;
+
+    /* emulate ruby's method call */
+    PUSH_ITER(ITER_CUR);
+    PUSH_FRAME();
+    proc = rb_block_proc();
+    POP_FRAME();
+    POP_ITER();
+
+    return proc;
+}
+
+static VALUE
+bmcall(args, method)
+    VALUE args, method;
+{
+    volatile VALUE a;
+    VALUE ret;
+
+    a = svalue_to_avalue(args);
+    ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
+    a = Qnil; /* prevent tail call */
+    return ret;
+}
+
+VALUE
+rb_proc_new(func, val)
+    VALUE (*func)(ANYARGS);	/* VALUE yieldarg[, VALUE procarg] */
+    VALUE val;
+{
+    struct BLOCK *data;
+    VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
+
+    Data_Get_Struct(proc, struct BLOCK, data);
+    data->body->nd_state = YIELD_FUNC_LAMBDA;
+    data->flags |= BLOCK_LAMBDA;
+    return proc;
+}
+
+/*
+ *  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;
+}
+
+static VALUE
+rb_obj_is_method(m)
+    VALUE m;
+{
+    if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  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;
+    VALUE *argv;
+    VALUE mod;
+{
+    ID id;
+    VALUE body;
+    NODE *node;
+    int noex;
+
+    if (argc == 1) {
+	id = rb_to_id(argv[0]);
+	body = proc_lambda();
+    }
+    else if (argc == 2) {
+	id = rb_to_id(argv[0]);
+	body = argv[1];
+	if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
+		     rb_obj_classname(body));
+	}
+    }
+    else {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+    if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
+	node = NEW_DMETHOD(method_unbind(body));
+    }
+    else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
+	struct BLOCK *block;
+
+	body = proc_clone(body);
+	Data_Get_Struct(body, struct BLOCK, block);
+	block->frame.last_func = id;
+	block->frame.orig_func = id;
+	block->frame.last_class = mod;
+	node = NEW_BMETHOD(body);
+    }
+    else {
+	/* type error */
+	rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
+    }
+
+    noex = NOEX_PUBLIC;
+    if (ruby_cbase == mod) {
+	if (SCOPE_TEST(SCOPE_PRIVATE)) {
+	    noex = NOEX_PRIVATE;
+	}
+	else if (SCOPE_TEST(SCOPE_PROTECTED)) {
+	    noex = NOEX_PROTECTED;
+	}
+    }
+    rb_add_method(mod, id, node, noex);
+    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_new3(rb_eFatal,
+				  rb_obj_freeze(rb_str_new2("exception reentered")));
+    OBJ_TAINT(exception_error);
+    OBJ_FREEZE(exception_error);
+
+    rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
+    rb_global_variable(&sysstack_error);
+    sysstack_error = rb_exc_new3(rb_eSysStackError,
+				 rb_obj_freeze(rb_str_new2("stack level too deep")));
+    OBJ_TAINT(sysstack_error);
+    OBJ_FREEZE(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", rb_proc_call, -2);
+    rb_define_method(rb_cProc, "arity", proc_arity, 0);
+    rb_define_method(rb_cProc, "[]", rb_proc_call, -2);
+    rb_define_method(rb_cProc, "==", proc_eq, 1);
+    rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
+    rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
+    rb_define_method(rb_cProc, "binding", proc_binding, 0);
+
+    rb_define_global_function("proc", proc_lambda, 0);
+    rb_define_global_function("lambda", proc_lambda, 0);
+
+    rb_cMethod = rb_define_class("Method", rb_cObject);
+    rb_undef_alloc_func(rb_cMethod);
+    rb_undef_method(CLASS_OF(rb_cMethod), "new");
+    rb_define_method(rb_cMethod, "==", method_eq, 1);
+    rb_define_method(rb_cMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cMethod, "call", method_call, -1);
+    rb_define_method(rb_cMethod, "[]", method_call, -1);
+    rb_define_method(rb_cMethod, "arity", method_arity, 0);
+    rb_define_method(rb_cMethod, "inspect", method_inspect, 0);
+    rb_define_method(rb_cMethod, "to_s", method_inspect, 0);
+    rb_define_method(rb_cMethod, "to_proc", method_proc, 0);
+    rb_define_method(rb_cMethod, "receiver", method_receiver, 0);
+    rb_define_method(rb_cMethod, "name", method_name, 0);
+    rb_define_method(rb_cMethod, "owner", method_owner, 0);
+    rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
+    rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
+
+    rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
+    rb_undef_alloc_func(rb_cUnboundMethod);
+    rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
+    rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
+    rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
+    rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
+    rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
+    rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
+    rb_define_method(rb_cUnboundMethod, "name", method_name, 0);
+    rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0);
+    rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+    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_method(rb_cBinding, "eval", bind_eval, -1);
+    rb_define_global_function("binding", rb_f_binding, 0);
+}
+
+/* Windows SEH refers data on the stack. */
+#undef SAVE_WIN32_EXCEPTION_LIST
+#if defined _WIN32 || defined __CYGWIN__
+#if defined __CYGWIN__
+typedef unsigned long DWORD;
+#endif
+
+static inline DWORD
+win32_get_exception_list()
+{
+    DWORD p;
+# if defined _MSC_VER
+#   ifdef _M_IX86
+#   define SAVE_WIN32_EXCEPTION_LIST
+#   if _MSC_VER >= 1310
+      /* warning: unsafe assignment to fs:0 ... this is ok */
+#     pragma warning(disable: 4733)
+#   endif
+    __asm mov eax, fs:[0];
+    __asm mov p, eax;
+#   endif
+# elif defined __GNUC__
+#   ifdef __i386__
+#   define SAVE_WIN32_EXCEPTION_LIST
+    __asm__("movl %%fs:0,%0" : "=r"(p));
+#   endif
+# elif defined __BORLANDC__
+#   define SAVE_WIN32_EXCEPTION_LIST
+    __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
+    p = _EAX;
+# endif
+    return p;
+}
+
+static inline void
+win32_set_exception_list(p)
+    DWORD p;
+{
+# if defined _MSC_VER
+#   ifdef _M_IX86
+    __asm mov eax, p;
+    __asm mov fs:[0], eax;
+#   endif
+# elif defined __GNUC__
+#   ifdef __i386__
+    __asm__("movl %0,%%fs:0" :: "r"(p));
+#   endif
+# elif defined __BORLANDC__
+    _EAX = p;
+    __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
+# endif
+}
+
+#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
+# error unsupported platform
+#endif
+#endif
+
+int rb_thread_pending = 0;
+
+VALUE rb_cThread;
+
+extern VALUE rb_last_status;
+
+#define WAIT_FD		(1<<0)
+#define WAIT_SELECT	(1<<1)
+#define WAIT_TIME	(1<<2)
+#define WAIT_JOIN	(1<<3)
+#define WAIT_PID	(1<<4)
+
+/* +infty, for this purpose */
+#define DELAY_INFTY 1E30
+
+#if !defined HAVE_PAUSE
+# if defined _WIN32 && !defined __CYGWIN__
+#  define pause() Sleep(INFINITE)
+# else
+#  define pause() sleep(0x7fffffff)
+# endif
+#endif
+
+#define THREAD_TERMINATING 0x400 /* persistent flag */
+#define THREAD_NO_ENSURE   0x800 /* persistent flag */
+#define THREAD_FLAGS_MASK 0xfc00 /* mask for persistent flags */
+
+#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
+#define END_FOREACH_FROM(f,x) } while (x != f)
+
+#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
+#define END_FOREACH(x)    END_FOREACH_FROM(curr_thread,x)
+
+struct thread_status_t {
+    NODE *node;
+
+    int tracing;
+    VALUE errinfo;
+    VALUE last_status;
+    VALUE last_line;
+    VALUE last_match;
+
+    int safe;
+
+    enum rb_thread_status status;
+    int wait_for;
+    int fd;
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    int select_value;
+    double delay;
+    rb_thread_t join;
+};
+
+#define THREAD_COPY_STATUS(src, dst) (void)(	\
+    (dst)->node = (src)->node,			\
+						\
+    (dst)->tracing = (src)->tracing,		\
+    (dst)->errinfo = (src)->errinfo,		\
+    (dst)->last_status = (src)->last_status,	\
+    (dst)->last_line = (src)->last_line,	\
+    (dst)->last_match = (src)->last_match,	\
+						\
+    (dst)->safe = (src)->safe,			\
+						\
+    (dst)->status = (src)->status,		\
+    (dst)->wait_for = (src)->wait_for,		\
+    (dst)->fd = (src)->fd,			\
+    (dst)->readfds = (src)->readfds,		\
+    (dst)->writefds = (src)->writefds,		\
+    (dst)->exceptfds = (src)->exceptfds,	\
+    (dst)->select_value = (src)->select_value,	\
+    (dst)->delay = (src)->delay,		\
+    (dst)->join = (src)->join,			\
+    0)
+
+int
+rb_thread_set_raised(th)
+    rb_thread_t th;
+{
+    if (th->flags & RAISED_EXCEPTION) {
+	return 1;
+    }
+    th->flags |= RAISED_EXCEPTION;
+    return 0;
+}
+
+int
+rb_thread_reset_raised(th)
+    rb_thread_t th;
+{
+    if (!(th->flags & RAISED_EXCEPTION)) {
+	return 0;
+    }
+    th->flags &= ~RAISED_EXCEPTION;
+    return 1;
+}
+
+static int
+thread_no_ensure()
+{
+    return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
+}
+
+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)
+    VALUE cmd;
+    int sig, safe;
+{
+    int state;
+    VALUE val = Qnil;		/* 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_ITER(ITER_NOT);
+    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+    POP_ITER();
+    THREAD_COPY_STATUS(&save, curr_thread);
+
+    if (state) {
+	rb_trap_immediate = 0;
+	rb_thread_ready(curr_thread);
+	JUMP_TAG(state);
+    }
+
+    if (curr_thread->status == THREAD_STOPPED) {
+	rb_thread_schedule();
+    }
+    errno = EINTR;
+
+    return val;
+}
+
+static const char *
+thread_status_name(status)
+    enum rb_thread_status status;
+{
+    switch (status) {
+      case THREAD_RUNNABLE:
+	return "run";
+      case THREAD_STOPPED:
+	return "sleep";
+      case THREAD_TO_KILL:
+	return "aborting";
+      case THREAD_KILLED:
+	return "dead";
+      default:
+	return "unknown";
+    }
+}
+
+/* $SAFE accessor */
+void
+rb_set_safe_level(level)
+    int level;
+{
+    if (level > ruby_safe_level) {
+	if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+	ruby_safe_level = level;
+	curr_thread->safe = level;
+    }
+}
+
+static VALUE
+safe_getter()
+{
+    return INT2NUM(ruby_safe_level);
+}
+
+static void
+safe_setter(val)
+    VALUE val;
+{
+    int level = NUM2INT(val);
+
+    if (level < ruby_safe_level) {
+	rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
+		 ruby_safe_level, level);
+    }
+    if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
+    ruby_safe_level = level;
+    curr_thread->safe = level;
+}
+
+/* Return the current time as a floating-point number */
+static double
+timeofday()
+{
+    struct timeval tv;
+#ifdef CLOCK_MONOTONIC
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+	return (double)tp.tv_sec + (double)tp.tv_nsec * 1e-9;
+    }
+#endif
+    gettimeofday(&tv, NULL);
+    return (double)tv.tv_sec + (double)tv.tv_usec * 1e-6;
+}
+
+#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
+#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+static void
+thread_mark(th)
+    rb_thread_t th;
+{
+    struct FRAME *frame;
+    struct BLOCK *block;
+
+    rb_gc_mark(th->result);
+    rb_gc_mark(th->thread);
+    if (th->join) rb_gc_mark(th->join->thread);
+
+    rb_gc_mark(th->klass);
+    rb_gc_mark(th->wrapper);
+    rb_gc_mark((VALUE)th->cref);
+
+    rb_gc_mark((VALUE)th->scope);
+    rb_gc_mark((VALUE)th->dyna_vars);
+    rb_gc_mark(th->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);
+    rb_gc_mark_maybe(th->sandbox);
+
+    /* mark data in copied stack */
+    if (th == curr_thread) return;
+    if (th->status == THREAD_KILLED) return;
+    if (th->stk_len == 0) return;  /* stack not active, no need to mark. */
+    if (th->stk_ptr) {
+	rb_gc_mark_locations(th->stk_ptr, th->stk_ptr+th->stk_len);
+#if defined(THINK_C) || defined(__human68k__)
+	rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
+#endif
+#ifdef __ia64
+	if (th->bstr_ptr) {
+            rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
+	}
+#endif
+    }
+    frame = th->frame;
+    while (frame && frame != top_frame) {
+	frame = ADJ(frame);
+	rb_gc_mark_frame(frame);
+	if (frame->tmp) {
+	    struct FRAME *tmp = frame->tmp;
+
+	    while (tmp && tmp != top_frame) {
+		tmp = ADJ(tmp);
+		rb_gc_mark_frame(tmp);
+		tmp = tmp->prev;
+	    }
+	}
+	frame = frame->prev;
+    }
+    block = th->block;
+    while (block) {
+	block = ADJ(block);
+	rb_gc_mark_frame(&block->frame);
+	block = block->prev;
+    }
+}
+
+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()
+{
+    rb_thread_t th;
+
+    /* static global mark */
+    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;
+	}
+	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);
+}
+
+static void
+thread_free(th)
+    rb_thread_t th;
+{
+    if (th->stk_ptr) free(th->stk_ptr);
+    th->stk_ptr = 0;
+#ifdef __ia64
+    if (th->bstr_ptr) free(th->bstr_ptr);
+    th->bstr_ptr = 0;
+#endif
+    if (th->locals) st_free_table(th->locals);
+    if (th->status != THREAD_KILLED) {
+	if (th->prev) th->prev->next = th->next;
+	if (th->next) th->next->prev = th->prev;
+    }
+    if (th != main_thread) free(th);
+}
+
+static rb_thread_t
+rb_thread_check(data)
+    VALUE data;
+{
+    if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
+	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
+		 rb_obj_classname(data));
+    }
+    return (rb_thread_t)RDATA(data)->data;
+}
+
+static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
+
+static VALUE th_raise_exception;
+static NODE *th_raise_node;
+static VALUE th_cmd;
+static int   th_sig, th_safe;
+
+#define RESTORE_NORMAL		1
+#define RESTORE_FATAL		2
+#define RESTORE_INTERRUPT	3
+#define RESTORE_TRAP		4
+#define RESTORE_RAISE		5
+#define RESTORE_SIGNAL		6
+#define RESTORE_EXIT		7
+
+extern VALUE *rb_gc_stack_start;
+#ifdef __ia64
+extern VALUE *rb_gc_register_stack_start;
+#endif
+
+static void
+rb_thread_save_context(th)
+    rb_thread_t th;
+{
+    VALUE *pos;
+    size_t len;
+    static VALUE tval;
+
+    len = ruby_stack_length(&pos);
+    th->stk_len = 0;
+    th->stk_pos = pos;
+    if (len > th->stk_max) {
+	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
+	if (!ptr) rb_memerror();
+	th->stk_ptr = ptr;
+	th->stk_max = len;
+    }
+    th->stk_len = len;
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
+#ifdef __ia64
+    th->bstr_pos = rb_gc_register_stack_start;
+    len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
+    th->bstr_len = 0;
+    if (len > th->bstr_max) {
+        VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len);
+        if (!ptr) rb_memerror();
+        th->bstr_ptr = ptr;
+        th->bstr_max = len;
+    }
+    th->bstr_len = len;
+    rb_ia64_flushrs();
+    MEMCPY(th->bstr_ptr, th->bstr_pos, 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;
+    th->dyna_vars = ruby_dyna_vars;
+    th->block = ruby_block;
+    th->flags &= THREAD_FLAGS_MASK;
+    th->flags |= (rb_trap_immediate<<8) | scope_vmode;
+    th->iter = ruby_iter;
+    th->tag = prot_tag;
+    th->tracing = tracing;
+    th->errinfo = ruby_errinfo;
+    th->last_status = rb_last_status;
+    tval = rb_lastline_get();
+    rb_lastline_set(th->last_line);
+    th->last_line = tval;
+    tval = rb_backref_get();
+    rb_backref_set(th->last_match);
+    th->last_match = tval;
+    th->safe = ruby_safe_level;
+
+    th->node = ruby_current_node;
+    if (ruby_sandbox_save != NULL)
+    {
+      ruby_sandbox_save(th);
+    }
+}
+
+static int
+rb_thread_switch(n)
+    int n;
+{
+    rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
+    switch (n) {
+      case 0:
+	return 0;
+      case RESTORE_FATAL:
+	JUMP_TAG(TAG_FATAL);
+	break;
+      case RESTORE_INTERRUPT:
+	rb_interrupt();
+	break;
+      case RESTORE_TRAP:
+	rb_trap_eval(th_cmd, th_sig, th_safe);
+	break;
+      case RESTORE_RAISE:
+	ruby_frame->last_func = 0;
+	ruby_current_node = th_raise_node;
+	rb_raise_jump(th_raise_exception);
+	break;
+      case RESTORE_SIGNAL:
+	rb_thread_signal_raise(th_sig);
+	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;
+    }
+    return 1;
+}
+
+#define THREAD_SAVE_CONTEXT(th) \
+    (rb_thread_switch(ruby_setjmp(rb_thread_save_context(th), (th)->context)))
+
+NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
+NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*)));
+NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *)));
+
+static void
+rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
+{
+    static rb_thread_t tmp;
+    static int ex;
+    static VALUE tval;
+
+    rb_trap_immediate = 0;	/* inhibit interrupts from here */
+    if (ruby_sandbox_restore != NULL)
+    {
+      ruby_sandbox_restore(th);
+    }
+    ruby_frame = th->frame;
+    ruby_scope = th->scope;
+    ruby_class = th->klass;
+    ruby_wrapper = th->wrapper;
+    ruby_cref = th->cref;
+    ruby_dyna_vars = th->dyna_vars;
+    ruby_block = th->block;
+    scope_vmode = th->flags&SCOPE_MASK;
+    ruby_iter = th->iter;
+    prot_tag = th->tag;
+    tracing = th->tracing;
+    ruby_errinfo = th->errinfo;
+    rb_last_status = th->last_status;
+    ruby_safe_level = th->safe;
+
+    ruby_current_node = th->node;
+
+#ifdef SAVE_WIN32_EXCEPTION_LIST
+    win32_set_exception_list(th->win32_exception_list);
+#endif
+    tmp = th;
+    ex = exit;
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
+#ifdef __ia64
+    MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
+#endif
+
+    tval = rb_lastline_get();
+    rb_lastline_set(tmp->last_line);
+    tmp->last_line = tval;
+    tval = rb_backref_get();
+    rb_backref_set(tmp->last_match);
+    tmp->last_match = tval;
+
+    ruby_longjmp(tmp->context, ex);
+}
+
+#ifdef __ia64
+#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
+#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
+static volatile int C(a), C(b), C(c), C(d), C(e);
+static volatile int C(f), C(g), C(h), C(i), C(j);
+static volatile int C(k), C(l), C(m), C(n), C(o);
+static volatile int C(p), C(q), C(r), C(s), C(t);
+int rb_dummy_false = 0;
+NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *)));
+static void
+register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp)
+{
+    if (rb_dummy_false) {
+        /* use registers as much as possible */
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+    }
+    if (curr_bsp < th->bstr_pos+th->bstr_len) {
+        register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp());
+    }
+    rb_thread_restore_context_0(th, exit, &exit);
+}
+#undef C
+#undef E
+#endif
+
+# if defined(_MSC_VER) && _MSC_VER >= 1300
+__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
+# endif
+static void
+stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
+{
+#define STACK_PAD_SIZE 1024
+    VALUE space[STACK_PAD_SIZE];
+
+#if STACK_GROW_DIRECTION < 0
+    if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+#elif STACK_GROW_DIRECTION > 0
+    if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+#else
+    if (addr_in_prev_frame < rb_gc_stack_start) {
+        /* Stack grows downward */
+        if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
+    }
+    else {
+        /* Stack grows upward */
+        if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
+    }
+#endif
+#ifdef __ia64
+    register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
+#else
+    rb_thread_restore_context_0(th, exit, space);
+#endif
+}
+
+static void
+rb_thread_restore_context(th, exit)
+    rb_thread_t th;
+    int exit;
+{
+    VALUE v;
+    if (!th->stk_ptr) rb_bug("unsaved context");
+    stack_extend(th, exit, &v);
+}
+
+static void
+rb_thread_ready(th)
+    rb_thread_t th;
+{
+    th->wait_for = 0;
+    if (th->status != THREAD_TO_KILL) {
+	th->status = THREAD_RUNNABLE;
+    }
+}
+
+static void
+rb_thread_die(th)
+    rb_thread_t th;
+{
+    th->thgroup = 0;
+    th->status = THREAD_KILLED;
+    if (th->stk_ptr) free(th->stk_ptr);
+    th->stk_ptr = 0;
+}
+
+static void
+rb_thread_remove(th)
+    rb_thread_t th;
+{
+    if (th->status == THREAD_KILLED) return;
+
+    rb_thread_ready(th);
+    rb_thread_die(th);
+    th->prev->next = th->next;
+    th->next->prev = th->prev;
+}
+
+static int
+rb_thread_dead(th)
+    rb_thread_t th;
+{
+    return th->status == THREAD_KILLED;
+}
+
+void
+rb_thread_fd_close(fd)
+    int 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)))) {
+	    VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
+	    rb_thread_raise(1, &exc, th);
+	}
+    }
+    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()
+{
+    char msg[21+SIZEOF_LONG*2];
+    VALUE e;
+
+    sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
+    e = rb_exc_new2(rb_eFatal, msg);
+    if (curr_thread == main_thread) {
+	rb_exc_raise(e);
+    }
+    rb_thread_main_jump(e, RESTORE_RAISE);
+}
+
+static void
+copy_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
+{
+    int n = 0;
+    int i;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src)) {
+	    n = i;
+	    FD_SET(i, dst);
+	}
+    }
+}
+
+static int
+match_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
 {
-    VALUE ary = rb_ary_new();
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp =
-	vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp));
     int i;
 
-    while (cfp) {
-	if (cfp->iseq) {
-	    for (i = 0; i < cfp->iseq->local_table_size; i++) {
-		ID lid = cfp->iseq->local_table[i];
-		if (lid) {
-		    const char *vname = rb_id2name(lid);
-		    /* should skip temporary variable */
-		    if (vname) {
-			rb_ary_push(ary, ID2SYM(lid));
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src) && FD_ISSET(i, dst)) {
+	    return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+static int
+intersect_fds(src, dst, max)
+    fd_set *src, *dst;
+    int max;
+{
+    int i, n = 0;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, dst)) {
+	    if (FD_ISSET(i, src)) {
+		/* Wake up only one thread per fd. */
+		FD_CLR(i, src);
+		n++;
+	    }
+	    else {
+		FD_CLR(i, dst);
+	    }
+	}
+    }
+    return n;
+}
+
+static int
+find_bad_fds(dst, src, max)
+    fd_set *dst, *src;
+    int max;
+{
+    int i, test = Qfalse;
+
+    for (i=0; i<=max; i++) {
+	if (FD_ISSET(i, src) && !FD_ISSET(i, dst)) {
+	    FD_CLR(i, src);
+	    test = Qtrue;
+	}
+    }
+    return test;
+}
+
+void
+rb_thread_schedule()
+{
+    rb_thread_t next;		/* OK */
+    rb_thread_t th;
+    rb_thread_t curr;
+    int found = 0;
+
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    struct timeval delay_tv, *delay_ptr;
+    double delay, now;	/* OK */
+    int n, max;
+    int need_select = 0;
+    int select_timeout = 0;
+
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+	rb_bug("cross-thread violation on rb_thread_schedule()");
+    }
+#endif
+    rb_thread_pending = 0;
+    rb_gc_finalize_deferred();
+    if (curr_thread == curr_thread->next
+	&& curr_thread->status == THREAD_RUNNABLE)
+	return;
+
+    next = 0;
+    curr = curr_thread;		/* starting thread */
+
+    while (curr->status == THREAD_KILLED) {
+	curr = curr->prev;
+    }
+
+  again:
+    max = -1;
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_ZERO(&exceptfds);
+    delay = DELAY_INFTY;
+    now = -1.0;
+
+    FOREACH_THREAD_FROM(curr, th) {
+	if (!found && th->status <= THREAD_RUNNABLE) {
+	    found = 1;
+	}
+	if (th->status != THREAD_STOPPED) continue;
+	if (th->wait_for & WAIT_JOIN) {
+	    if (rb_thread_dead(th->join)) {
+		th->status = THREAD_RUNNABLE;
+		found = 1;
+	    }
+	}
+	if (th->wait_for & WAIT_FD) {
+	    FD_SET(th->fd, &readfds);
+	    if (max < th->fd) max = th->fd;
+	    need_select = 1;
+	}
+	if (th->wait_for & WAIT_SELECT) {
+	    copy_fds(&readfds, &th->readfds, th->fd);
+	    copy_fds(&writefds, &th->writefds, th->fd);
+	    copy_fds(&exceptfds, &th->exceptfds, th->fd);
+	    if (max < th->fd) max = th->fd;
+	    need_select = 1;
+	    if (th->wait_for & WAIT_TIME) {
+		select_timeout = 1;
+	    }
+	    th->select_value = 0;
+	}
+	if (th->wait_for & WAIT_TIME) {
+	    double th_delay;
+
+	    if (now < 0.0) now = timeofday();
+	    th_delay = th->delay - now;
+	    if (th_delay <= 0.0) {
+		th->status = THREAD_RUNNABLE;
+		found = 1;
+	    }
+	    else if (th_delay < delay) {
+		delay = th_delay;
+		need_select = 1;
+	    }
+	    else if (th->delay == DELAY_INFTY) {
+		need_select = 1;
+	    }
+	}
+    }
+    END_FOREACH_FROM(curr, th);
+
+    /* Do the select if needed */
+    if (need_select) {
+	/* Convert delay to a timeval */
+	/* If a thread is runnable, just poll */
+	if (found) {
+	    delay_tv.tv_sec = 0;
+	    delay_tv.tv_usec = 0;
+	    delay_ptr = &delay_tv;
+	}
+	else if (delay == DELAY_INFTY) {
+	    delay_ptr = 0;
+	}
+	else {
+	    delay_tv.tv_sec = delay;
+	    delay_tv.tv_usec = (delay - (double)delay_tv.tv_sec)*1e6;
+	    delay_ptr = &delay_tv;
+	}
+
+	n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
+	if (n < 0) {
+	    int e = errno;
+
+	    if (rb_trap_pending) rb_trap_exec();
+	    if (e == EINTR) goto again;
+#ifdef ERESTART
+	    if (e == ERESTART) goto again;
+#endif
+	    FOREACH_THREAD_FROM(curr, th) {
+		if (th->wait_for & WAIT_SELECT) {
+		    int v = 0;
+
+		    v |= find_bad_fds(&readfds, &th->readfds, th->fd);
+		    v |= find_bad_fds(&writefds, &th->writefds, th->fd);
+		    v |= find_bad_fds(&exceptfds, &th->exceptfds, th->fd);
+		    if (v) {
+			th->select_value = n;
+			n = max;
 		    }
 		}
 	    }
+	    END_FOREACH_FROM(curr, th);
+	}
+ 	if (select_timeout && n == 0) {
+ 	    if (now < 0.0) now = timeofday();
+ 	    FOREACH_THREAD_FROM(curr, th) {
+ 		if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
+		    th->delay <= now) {
+ 		    th->status = THREAD_RUNNABLE;
+ 		    th->wait_for = 0;
+ 		    th->select_value = 0;
+ 		    found = 1;
+		    intersect_fds(&readfds, &th->readfds, max);
+		    intersect_fds(&writefds, &th->writefds, max);
+		    intersect_fds(&exceptfds, &th->exceptfds, max);
+		}
+	    }
+	    END_FOREACH_FROM(curr, th);
 	}
-	if (cfp->lfp != cfp->dfp) {
-	    /* block */
-	    VALUE *dfp = GC_GUARDED_PTR_REF(cfp->dfp[0]);
+	if (n > 0) {
+	    now = -1.0;
+	    /* Some descriptors are ready.
+	       Make the corresponding threads runnable. */
+	    FOREACH_THREAD_FROM(curr, th) {
+		if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
+		    /* Wake up only one thread per fd. */
+		    FD_CLR(th->fd, &readfds);
+		    th->status = THREAD_RUNNABLE;
+		    th->fd = 0;
+		    th->wait_for = 0;
+		    found = 1;
+		}
+		if ((th->wait_for&WAIT_SELECT) &&
+		    (match_fds(&readfds, &th->readfds, max) ||
+		     match_fds(&writefds, &th->writefds, max) ||
+		     match_fds(&exceptfds, &th->exceptfds, max))) {
+		    /* Wake up only one thread per fd. */
+		    th->status = THREAD_RUNNABLE;
+		    th->wait_for = 0;
+		    n = intersect_fds(&readfds, &th->readfds, max) +
+			intersect_fds(&writefds, &th->writefds, max) +
+			intersect_fds(&exceptfds, &th->exceptfds, max);
+		    th->select_value = n;
+		    found = 1;
+		}
+	    }
+	    END_FOREACH_FROM(curr, th);
+	}
+	/* The delays for some of the threads should have expired.
+	   Go through the loop once more, to check the delays. */
+	if (!found && delay != DELAY_INFTY)
+	    goto again;
+    }
 
-	    if (vm_collect_local_variables_in_heap(th, dfp, ary)) {
-		break;
+    FOREACH_THREAD_FROM(curr, th) {
+	if (th->status == THREAD_TO_KILL) {
+	    next = th;
+	    break;
+	}
+	if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
+	    if (!next || next->priority < th->priority)
+	       next = th;
+	}
+    }
+    END_FOREACH_FROM(curr, th);
+
+    if (!next) {
+	/* raise fatal error to main thread */
+	curr_thread->node = ruby_current_node;
+	if (curr->next == curr) {
+	    TRAP_BEG;
+	    pause();
+	    TRAP_END;
+	}
+	FOREACH_THREAD_FROM(curr, th) {
+	    warn_printf("deadlock 0x%lx: %s:",
+			th->thread, thread_status_name(th->status));
+	    if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
+	    if (th->wait_for & WAIT_SELECT) warn_printf("S");
+	    if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
+	    if (th->wait_for & WAIT_JOIN)
+		warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
+	    if (th->wait_for & WAIT_PID) warn_printf("P");
+	    if (!th->wait_for) warn_printf("-");
+	    warn_printf(" %s - %s:%d\n",
+			th==main_thread ? "(main)" : "",
+			th->node->nd_file, nd_line(th->node));
+	}
+	END_FOREACH_FROM(curr, th);
+	next = main_thread;
+	rb_thread_ready(next);
+	next->status = THREAD_TO_KILL;
+	if (!rb_thread_dead(curr_thread)) {
+	    rb_thread_save_context(curr_thread);
+	}
+	rb_thread_deadlock();
+    }
+    next->wait_for = 0;
+    if (next->status == THREAD_RUNNABLE && next == curr_thread) {
+	return;
+    }
+
+    /* context switch */
+    if (curr == curr_thread) {
+	if (THREAD_SAVE_CONTEXT(curr)) {
+	    return;
+	}
+    }
+
+    curr_thread = next;
+    if (next->status == THREAD_TO_KILL) {
+	if (!(next->flags & THREAD_TERMINATING)) {
+	    next->flags |= THREAD_TERMINATING;
+	    /* terminate; execute ensure-clause if any */
+	    rb_thread_restore_context(next, RESTORE_FATAL);
+	}
+    }
+    rb_thread_restore_context(next, RESTORE_NORMAL);
+}
+
+void
+rb_thread_wait_fd(fd)
+    int fd;
+{
+    if (rb_thread_critical) return;
+    if (ruby_in_compile) return;
+    if (curr_thread == curr_thread->next) return;
+    if (curr_thread->status == THREAD_TO_KILL) return;
+
+    curr_thread->status = THREAD_STOPPED;
+    curr_thread->fd = fd;
+    curr_thread->wait_for = WAIT_FD;
+    rb_thread_schedule();
+}
+
+int
+rb_thread_fd_writable(fd)
+    int fd;
+{
+    if (rb_thread_critical) return Qtrue;
+    if (curr_thread == curr_thread->next) return Qtrue;
+    if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
+    if (curr_thread->status == THREAD_KILLED) return Qtrue;
+
+    curr_thread->status = THREAD_STOPPED;
+    FD_ZERO(&curr_thread->readfds);
+    FD_ZERO(&curr_thread->writefds);
+    FD_SET(fd, &curr_thread->writefds);
+    FD_ZERO(&curr_thread->exceptfds);
+    curr_thread->fd = fd+1;
+    curr_thread->wait_for = WAIT_SELECT;
+    rb_thread_schedule();
+    return Qfalse;
+}
+
+void
+rb_thread_wait_for(time)
+    struct timeval time;
+{
+    double date;
+
+    if (rb_thread_critical ||
+	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) {
+		switch (errno) {
+		  case EINTR:
+#ifdef ERESTART
+		  case ERESTART:
+#endif
+		    break;
+		  default:
+		    rb_sys_fail("sleep");
+		}
 	    }
-	    else {
-		while (cfp->dfp != dfp) {
-		    cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+#ifndef linux
+	    d = limit - timeofday();
+
+	    time.tv_sec = (int)d;
+	    time.tv_usec = (int)((d - (int)d)*1e6);
+	    if (time.tv_usec < 0) {
+		time.tv_usec += (long)1e6;
+		time.tv_sec -= 1;
+	    }
+	    if (time.tv_sec < 0) return;
+#endif
+	}
+    }
+
+    date = timeofday() + (double)time.tv_sec + (double)time.tv_usec*1e-6;
+    curr_thread->status = THREAD_STOPPED;
+    curr_thread->delay = date;
+    curr_thread->wait_for = WAIT_TIME;
+    rb_thread_schedule();
+}
+
+void rb_thread_sleep_forever _((void));
+
+int
+rb_thread_alone()
+{
+    return curr_thread == curr_thread->next;
+}
+
+int
+rb_thread_select(max, read, write, except, timeout)
+    int max;
+    fd_set *read, *write, *except;
+    struct timeval *timeout;
+{
+#ifndef linux
+    double limit;
+#endif
+    int n;
+
+    if (!read && !write && !except) {
+	if (!timeout) {
+	    rb_thread_sleep_forever();
+	    return 0;
+	}
+	rb_thread_wait_for(*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 ||
+	curr_thread->status == THREAD_TO_KILL) {
+#ifndef linux
+	struct timeval tv, *tvp = timeout;
+
+	if (timeout) {
+	    tv = *timeout;
+	    tvp = &tv;
+	}
+#else
+	struct timeval *const tvp = timeout;
+#endif
+	for (;;) {
+	    TRAP_BEG;
+	    n = select(max, read, write, except, tvp);
+	    TRAP_END;
+	    if (n < 0) {
+		switch (errno) {
+		  case EINTR:
+#ifdef ERESTART
+		  case ERESTART:
+#endif
+#ifndef linux
+		    if (timeout) {
+			double d = limit - timeofday();
+
+			tv.tv_sec = (unsigned int)d;
+			tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
+			if (tv.tv_sec < 0)  tv.tv_sec = 0;
+			if (tv.tv_usec < 0) tv.tv_usec = 0;
+		    }
+#endif
+		    continue;
+		  default:
+		    break;
 		}
 	    }
+	    return n;
 	}
-	else {
+    }
+
+    curr_thread->status = THREAD_STOPPED;
+    if (read) curr_thread->readfds = *read;
+    else FD_ZERO(&curr_thread->readfds);
+    if (write) curr_thread->writefds = *write;
+    else FD_ZERO(&curr_thread->writefds);
+    if (except) curr_thread->exceptfds = *except;
+    else FD_ZERO(&curr_thread->exceptfds);
+    curr_thread->fd = max;
+    curr_thread->wait_for = WAIT_SELECT;
+    if (timeout) {
+	curr_thread->delay = timeofday() +
+	    (double)timeout->tv_sec + (double)timeout->tv_usec*1e-6;
+	curr_thread->wait_for |= WAIT_TIME;
+    }
+    rb_thread_schedule();
+    if (read) *read = curr_thread->readfds;
+    if (write) *write = curr_thread->writefds;
+    if (except) *except = curr_thread->exceptfds;
+    return curr_thread->select_value;
+}
+
+static int rb_thread_join _((rb_thread_t, double));
+
+static int
+rb_thread_join(th, limit)
+    rb_thread_t th;
+    double limit;
+{
+    enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+    if (rb_thread_critical) rb_thread_deadlock();
+    if (!rb_thread_dead(th)) {
+	if (th == curr_thread)
+	    rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
+		     th->thread);
+	if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
+	    rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
+		     curr_thread->thread, th->thread);
+	if (curr_thread->status == THREAD_TO_KILL)
+	    last_status = THREAD_TO_KILL;
+	if (limit == 0) return Qfalse;
+	curr_thread->status = THREAD_STOPPED;
+	curr_thread->join = th;
+	curr_thread->wait_for = WAIT_JOIN;
+	curr_thread->delay = timeofday() + limit;
+	if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
+	rb_thread_schedule();
+	curr_thread->status = last_status;
+	if (!rb_thread_dead(th)) return Qfalse;
+    }
+
+    if (!NIL_P(th->errinfo) && (th->flags & RAISED_EXCEPTION)) {
+	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);
+    }
+
+    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;
+    VALUE *argv;
+    VALUE thread;
+{
+    VALUE limit;
+    double delay = DELAY_INFTY;
+    rb_thread_t th = rb_thread_check(thread);
+
+    rb_scan_args(argc, argv, "01", &limit);
+    if (!NIL_P(limit)) delay = rb_num2dbl(limit);
+    if (!rb_thread_join(th, delay))
+	return Qnil;
+    return thread;
+}
+
+
+/*
+ *  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()
+{
+    rb_thread_t th;
+    VALUE ary = rb_ary_new();
+
+    FOREACH_THREAD(th) {
+	switch (th->status) {
+	  case THREAD_RUNNABLE:
+	  case THREAD_STOPPED:
+	  case THREAD_TO_KILL:
+	    rb_ary_push(ary, th->thread);
+	  default:
 	    break;
 	}
     }
+    END_FOREACH(th);
+
     return ary;
 }
 
 
 /*
  *  call-seq:
- *     __method__         => symbol
- *     __callee__         => symbol
+ *     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;
+{
+    if (!RTEST(rb_thread_wakeup_alive(thread)))
+	rb_raise(rb_eThreadError, "killed thread");
+    return thread;
+}
+
+VALUE
+rb_thread_wakeup_alive(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (th->status == THREAD_KILLED)
+	return Qnil;
+    rb_thread_ready(th);
+
+    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;
+{
+    rb_thread_wakeup(thread);
+    if (!rb_thread_critical) rb_thread_schedule();
+
+    return thread;
+}
+
+
+static void
+rb_kill_thread(th, flags)
+    rb_thread_t th;
+    int flags;
+{
+    if (th != curr_thread && th->safe < 4) {
+	rb_secure(4);
+    }
+    if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
+	return;
+    if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
+
+    rb_thread_ready(th);
+    th->flags |= flags;
+    th->status = THREAD_TO_KILL;
+    if (!rb_thread_critical) rb_thread_schedule();
+}
+
+
+/*
+ *  call-seq:
+ *     thr.exit        => thr
+ *     thr.kill        => thr
+ *     thr.terminate   => thr
+ *  
+ *  Terminates <i>thr</i> and schedules another thread to be run, returning
+ *  the terminated <code>Thread</code>.  If this is the main thread, or the
+ *  last thread, exits the process.
+ */
+
+VALUE
+rb_thread_kill(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    rb_kill_thread(th, 0);
+    return thread;
+}
+
+
+/*
+ *  call-seq:
+ *     thr.exit!        => thr
+ *     thr.kill!        => thr
+ *     thr.terminate!   => thr
+ *  
+ *  Terminates <i>thr</i> without calling ensure clauses and schedules
+ *  another thread to be run, returning the terminated <code>Thread</code>.
+ *  If this is the main thread, or the last thread, exits the process.
  *
- *  Returns the name of the current method as a Symbol.
- *  If called outside of a method, it returns <code>nil</code>.
+ *  See <code>Thread#exit</code> for the safer version.
+ */
+
+static VALUE
+rb_thread_kill_bang(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+    rb_kill_thread(th, THREAD_NO_ENSURE);
+    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;
+{
+    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()
+{
+    rb_thread_schedule();
+    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()
+{
+    enum rb_thread_status last_status = THREAD_RUNNABLE;
+
+    rb_thread_critical = 0;
+    if (curr_thread == curr_thread->next) {
+	rb_raise(rb_eThreadError, "stopping only thread\n\tnote: use sleep to stop forever");
+    }
+    if (curr_thread->status == THREAD_TO_KILL)
+	last_status = THREAD_TO_KILL;
+    curr_thread->status = THREAD_STOPPED;
+    rb_thread_schedule();
+    curr_thread->status = last_status;
+
+    return Qnil;
+}
+
+struct timeval rb_time_timeval();
+
+void
+rb_thread_polling()
+{
+    if (curr_thread != curr_thread->next) {
+	curr_thread->status = THREAD_STOPPED;
+	curr_thread->delay = timeofday() + (double)0.06;
+	curr_thread->wait_for = WAIT_TIME;
+	rb_thread_schedule();
+    }
+}
+
+void
+rb_thread_sleep(sec)
+    int sec;
+{
+    if (curr_thread == curr_thread->next) {
+	TRAP_BEG;
+	sleep(sec);
+	TRAP_END;
+	return;
+    }
+    rb_thread_wait_for(rb_time_timeval(INT2FIX(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;
+    }
+
+    curr_thread->delay = DELAY_INFTY;
+    curr_thread->wait_for = WAIT_TIME;
+    curr_thread->status = THREAD_STOPPED;
+    rb_thread_schedule();
+}
+
+
+/*
+ *  call-seq:
+ *     thr.priority   => integer
+ *
+ *  Returns the priority of <i>thr</i>. Default is inherited from the
+ *  current thread which creating the new thread, or zero for the
+ *  initial main thread; higher-priority threads will run before
+ *  lower-priority threads.
  *
+ *     Thread.current.priority   #=> 0
  */
 
 static VALUE
-rb_f_method_name(void)
+rb_thread_priority(thread)
+    VALUE thread;
 {
-    ID fname = rb_frame_callee();
+    return INT2NUM(rb_thread_check(thread)->priority);
+}
+
 
-    if (fname) {
-	return ID2SYM(fname);
+/*
+ *  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;
+{
+    rb_thread_t th;
+
+    rb_secure(4);
+    th = rb_thread_check(thread);
+
+    th->priority = NUM2INT(prio);
+    rb_thread_schedule();
+    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;
+{
+    rb_thread_t th;
+
+    th = rb_thread_check(thread);
+    if (th == curr_thread) {
+	return INT2NUM(ruby_safe_level);
     }
-    else {
-	return Qnil;
+    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 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
+ */
+
+static VALUE
+rb_thread_s_abort_exc_set(self, val)
+    VALUE self, val;
+{
+    rb_secure(4);
+    ruby_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;
+{
+    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;
+{
+    rb_secure(4);
+    rb_thread_check(thread)->abort = RTEST(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 rb_thread);\
+\
+    th->next = 0;\
+    th->prev = 0;\
+\
+    th->status = THREAD_RUNNABLE;\
+    th->result = 0;\
+    th->flags = 0;\
+\
+    th->stk_ptr = 0;\
+    th->stk_len = 0;\
+    th->stk_max = 0;\
+    th->wait_for = 0;\
+    IA64_INIT(th->bstr_ptr = 0);\
+    IA64_INIT(th->bstr_len = 0);\
+    IA64_INIT(th->bstr_max = 0);\
+    FD_ZERO(&th->readfds);\
+    FD_ZERO(&th->writefds);\
+    FD_ZERO(&th->exceptfds);\
+    th->delay = 0.0;\
+    th->join = 0;\
+\
+    th->frame = 0;\
+    th->scope = 0;\
+    th->klass = 0;\
+    th->wrapper = 0;\
+    th->cref = ruby_cref;\
+    th->dyna_vars = ruby_dyna_vars;\
+    th->block = 0;\
+    th->iter = 0;\
+    th->tag = 0;\
+    th->tracing = 0;\
+    th->errinfo = Qnil;\
+    th->last_status = 0;\
+    th->last_line = 0;\
+    th->last_match = Qnil;\
+    th->abort = 0;\
+    th->priority = 0;\
+    th->thgroup = thgroup_default;\
+    th->locals = 0;\
+    th->thread = 0;\
+    if (curr_thread == 0) {\
+      th->sandbox = Qnil;\
+    } else {\
+      th->sandbox = curr_thread->sandbox;\
+    }\
+} while (0)
+
+static rb_thread_t
+rb_thread_alloc(klass)
+    VALUE klass;
+{
+    rb_thread_t th;
+    struct RVarmap *vars;
+
+    THREAD_ALLOC(th);
+    th->thread = Data_Wrap_Struct(klass, thread_mark, thread_free, th);
+
+    for (vars = th->dyna_vars; vars; vars = vars->next) {
+	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
+	FL_SET(vars, DVAR_DONT_RECYCLE);
+    }
+    return th;
+}
+
+static int thread_init;
+
+#if defined(_THREAD_SAFE)
+static void
+catch_timer(sig)
+    int 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;
+{
+    sigset_t all_signals;
+
+    sigfillset(&all_signals);
+    pthread_sigmask(SIG_BLOCK, &all_signals, 0);
+
+    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);
+	    }
+	}
     }
 }
 
 void
-Init_eval(void)
+rb_thread_start_timer()
 {
-    /* TODO: fix position */
-    GET_THREAD()->vm->mark_object_ary = rb_ary_new();
+}
 
-    rb_define_virtual_variable("$@", errat_getter, errat_setter);
-    rb_define_virtual_variable("$!", errinfo_getter, 0);
+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);
+#endif
+    if (!rb_thread_critical) {
+	rb_thread_pending = 1;
+    }
+    /* cause EINTR */
+}
 
-    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);
+void
+rb_thread_start_timer()
+{
+    struct itimerval tval;
 
-    rb_define_global_function("raise", rb_f_raise, -1);
-    rb_define_global_function("fail", rb_f_raise, -1);
+    if (!thread_init) return;
+    tval.it_interval.tv_sec = 0;
+    tval.it_interval.tv_usec = 10000;
+    tval.it_value = tval.it_interval;
+    setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
 
-    rb_define_global_function("global_variables", rb_f_global_variables, 0);	/* in variable.c */
-    rb_define_global_function("local_variables", rb_f_local_variables, 0);
+void
+rb_thread_stop_timer()
+{
+    struct itimerval tval;
 
-    rb_define_global_function("__method__", rb_f_method_name, 0);
-    rb_define_global_function("__callee__", rb_f_method_name, 0);
+    if (!thread_init) return;
+    tval.it_interval.tv_sec = 0;
+    tval.it_interval.tv_usec = 0;
+    tval.it_value = tval.it_interval;
+    setitimer(ITIMER_VIRTUAL, &tval, NULL);
+}
+#else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
+int rb_thread_tick = THREAD_TICK;
+#endif
 
-    rb_define_private_method(rb_cModule, "append_features", rb_mod_append_features, 1);
-    rb_define_private_method(rb_cModule, "extend_object", rb_mod_extend_object, 1);
-    rb_define_private_method(rb_cModule, "include", rb_mod_include, -1);
-    rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
-    rb_define_method(rb_cModule, "class_eval", rb_mod_module_eval, -1);
+static VALUE
+rb_thread_start_0(fn, arg, th)
+    VALUE (*fn)();
+    void *arg;
+    rb_thread_t th;
+{
+    volatile rb_thread_t th_save = th;
+    volatile VALUE thread = th->thread;
+    struct BLOCK *volatile saved_block = 0;
+    enum rb_thread_status status;
+    int state;
 
-    rb_undef_method(rb_cClass, "module_function");
+    if (OBJ_FROZEN(curr_thread->thgroup)) {
+	rb_raise(rb_eThreadError,
+		 "can't start a new thread (frozen ThreadGroup)");
+    }
 
-    {
-	extern void Init_vm_eval(void);
-	extern void Init_eval_method(void);
-	Init_vm_eval();
-	Init_eval_method();
+    if (!thread_init) {
+	thread_init = 1;
+#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
+#if defined(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
+	rb_thread_start_timer();
+#endif
+#endif
     }
 
-    rb_define_singleton_method(rb_cModule, "nesting", rb_mod_nesting, 0);
-    rb_define_singleton_method(rb_cModule, "constants", rb_mod_s_constants, -1);
+    if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	return thread;
+    }
 
-    rb_define_singleton_method(rb_vm_top_self(), "include", top_include, -1);
+    if (ruby_block) {		/* should nail down higher blocks */
+	struct BLOCK dummy;
 
-    rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
+	dummy.prev = ruby_block;
+	blk_copy_prev(&dummy);
+	saved_block = ruby_block = dummy.prev;
+    }
+    scope_dup(ruby_scope);
+
+    if (!th->next) {
+	/* merge in thread list */
+	th->prev = curr_thread;
+	curr_thread->next->prev = th;
+	th->next = curr_thread->next;
+	curr_thread->next = th;
+	th->priority = curr_thread->priority;
+	th->thgroup = curr_thread->thgroup;
+    }
 
-    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 */
+    PUSH_TAG(PROT_THREAD);
+    if ((state = EXEC_TAG()) == 0) {
+	if (THREAD_SAVE_CONTEXT(th) == 0) {
+	    curr_thread = th;
+	    th->result = (*fn)(arg, th);
+	}
+	th = th_save;
+    }
+    else if (TAG_DST()) {
+	th = th_save;
+	th->result = prot_tag->retval;
+    }
+    POP_TAG();
+    status = th->status;
 
-    rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
+    if (th == main_thread) ruby_stop(state);
+    rb_thread_remove(th);
 
-    exception_error = rb_exc_new3(rb_eFatal,
-				  rb_obj_freeze(rb_str_new2("exception reentered")));
-    rb_ivar_set(exception_error, idThrowState, INT2FIX(TAG_FATAL));
-    OBJ_TAINT(exception_error);
-    OBJ_FREEZE(exception_error);
+    if (saved_block) {
+	blk_free(saved_block);
+    }
+
+    if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
+	th->flags |= RAISED_EXCEPTION;
+	if (state == TAG_FATAL) {
+	    /* fatal error within this thread, need to stop whole script */
+	    main_thread->errinfo = ruby_errinfo;
+	    rb_thread_cleanup();
+	}
+	else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
+	    if (th->safe >= 4) {
+		char buf[32];
+
+		sprintf(buf, "Insecure exit at level %d", th->safe);
+		th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
+	    }
+	    else {
+		/* delegate exception to main_thread */
+		rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
+	    }
+	}
+	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
+	    /* exit on main_thread */
+	    error_print();
+	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+	}
+	else {
+	    th->errinfo = ruby_errinfo;
+	}
+    }
+    rb_thread_schedule();
+    ruby_stop(0);		/* last thread termination */
+    return 0;			/* not reached */
+}
+
+VALUE
+rb_thread_create(fn, arg)
+    VALUE (*fn)();
+    void *arg;
+{
+    Init_stack((void *)&arg);
+    return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
 }
 
+static VALUE
+rb_thread_yield(arg, th)
+    VALUE arg;
+    rb_thread_t th;
+{
+    const ID *tbl;
 
-/* for parser */
+    scope_dup(ruby_block->scope);
 
-int
-rb_dvar_defined(ID id)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_iseq_t *iseq;
-    if (th->base_block && (iseq = th->base_block->iseq)) {
-	while (iseq->type == ISEQ_TYPE_BLOCK ||
-	       iseq->type == ISEQ_TYPE_RESCUE ||
-	       iseq->type == ISEQ_TYPE_ENSURE ||
-	       iseq->type == ISEQ_TYPE_EVAL) {
-	    int i;
-
-	    for (i = 0; i < iseq->local_table_size; i++) {
-		if (iseq->local_table[i] == id) {
-		    return 1;
-		}
+    tbl = ruby_scope->local_tbl;
+    if (tbl) {
+	int n = *tbl++;
+	for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
+	    ID id = *tbl++;
+	    if (id != 0 && !rb_is_local_id(id))  /* push flip states */
+		rb_dvar_push(id, Qfalse);
+	}
+    }
+    rb_dvar_push('_', Qnil);
+    rb_dvar_push('~', Qnil);
+    ruby_block->dyna_vars = ruby_dyna_vars;
+
+    return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, 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;
+    VALUE *argv;
+    VALUE klass;
+{
+    rb_thread_t th = rb_thread_alloc(klass);
+    volatile VALUE *pos;
+
+    pos = th->stk_pos;
+    rb_obj_call_init(th->thread, argc, argv);
+    if (th->stk_pos == 0) {
+	rb_raise(rb_eThreadError, "uninitialized thread - check `%s#initialize'",
+		 rb_class2name(klass));
+    }
+
+    return th->thread;
+}
+
+
+/*
+ *  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);
+}
+
+
+/*
+ *  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;
+{
+    if (!rb_block_given_p()) {
+	rb_raise(rb_eThreadError, "must be called with a block");
+    }
+    return rb_thread_start_0(rb_thread_yield, args, rb_thread_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;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    while (!rb_thread_join(th, DELAY_INFTY));
+
+    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;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) {
+	if (!NIL_P(th->errinfo) && (th->flags & RAISED_EXCEPTION))
+	    return Qnil;
+	return Qfalse;
+    }
+
+    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
+ */
+
+VALUE
+rb_thread_alive_p(thread)
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) return Qfalse;
+    return Qtrue;
+}
+
+
+/*
+ *  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;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (rb_thread_dead(th)) return Qtrue;
+    if (th->status == THREAD_STOPPED) return Qtrue;
+    return Qfalse;
+}
+
+static void
+rb_thread_wait_other_threads()
+{
+    rb_thread_t th;
+    int found;
+
+    /* wait other threads to terminate */
+    while (curr_thread != curr_thread->next) {
+	found = 0;
+	FOREACH_THREAD(th) {
+	    if (th != curr_thread && th->status != THREAD_STOPPED) {
+		found = 1;
+		break;
 	    }
-	    iseq = iseq->parent_iseq;
 	}
+	END_FOREACH(th);
+	if (!found) return;
+	rb_thread_schedule();
     }
-    return 0;
 }
 
-int
-rb_local_defined(ID id)
+static void
+rb_thread_cleanup()
 {
-    rb_thread_t *th = GET_THREAD();
-    rb_iseq_t *iseq;
+    rb_thread_t curr, th;
 
-    if (th->base_block && th->base_block->iseq) {
-	int i;
-	iseq = th->base_block->iseq->local_iseq;
+    curr = curr_thread;
+    while (curr->status == THREAD_KILLED) {
+	curr = curr->prev;
+    }
 
-	for (i=0; i<iseq->local_table_size; i++) {
-	    if (iseq->local_table[i] == id) {
-		return 1;
+    FOREACH_THREAD_FROM(curr, th) {
+	if (th->status != THREAD_KILLED) {
+	    rb_thread_ready(th);
+	    if (th != main_thread) {
+		th->thgroup = 0;
+		th->priority = 0;
+		th->status = THREAD_TO_KILL;
+		RDATA(th->thread)->dfree = NULL;
 	    }
 	}
     }
-    return 0;
+    END_FOREACH_FROM(curr, th);
 }
 
-int
-rb_parse_in_eval(void)
+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;
+{
+    rb_thread_critical = RTEST(val);
+    return val;
+}
+
+void
+rb_thread_interrupt()
+{
+    rb_thread_critical = 0;
+    rb_thread_ready(main_thread);
+    if (curr_thread == main_thread) {
+	rb_interrupt();
+    }
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
+}
+
+void
+rb_thread_signal_raise(sig)
+    int sig;
+{
+    rb_thread_critical = 0;
+    if (curr_thread == main_thread) {
+	VALUE argv[1];
+
+	rb_thread_ready(curr_thread);
+	argv[0] = INT2FIX(sig);
+	rb_exc_raise(rb_class_new_instance(1, argv, rb_eSignal));
+    }
+    rb_thread_ready(main_thread);
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return;
+	}
+    }
+    th_sig = sig;
+    curr_thread = main_thread;
+    rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
+}
+
+void
+rb_thread_trap_eval(cmd, sig, safe)
+    VALUE cmd;
+    int sig, safe;
+{
+    rb_thread_critical = 0;
+    if (curr_thread == main_thread) {
+	rb_trap_eval(cmd, sig, safe);
+	return;
+    }
+    if (!rb_thread_dead(curr_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];
+
+    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);
+}
+
+static VALUE
+rb_thread_raise(argc, argv, th)
+    int argc;
+    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);
+    }
+
+    if (!rb_thread_dead(curr_thread)) {
+	if (THREAD_SAVE_CONTEXT(curr_thread)) {
+	    return th_save->thread;
+	}
+    }
+
+    rb_thread_ready(th);
+    curr_thread = th;
+
+    th_raise_exception = exc;
+    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;
+    VALUE *argv;
+    VALUE thread;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (ruby_safe_level > th->safe) {
+	rb_secure(4);
+    }
+    rb_thread_raise(argc, argv, th);
+    return Qnil;		/* not reached */
+}
+
+VALUE
+rb_thread_local_aref(thread, id)
+    VALUE thread;
+    ID id;
+{
+    rb_thread_t th;
+    VALUE val;
+
+    th = rb_thread_check(thread);
+    if (ruby_safe_level >= 4 && th != curr_thread) {
+	rb_raise(rb_eSecurityError, "Insecure: thread locals");
+    }
+    if (!th->locals) return Qnil;
+    if (st_lookup(th->locals, id, &val)) {
+	return val;
+    }
+    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;
+{
+    return rb_thread_local_aref(thread, rb_to_id(id));
+}
+
+VALUE
+rb_thread_local_aset(thread, id, val)
+    VALUE thread;
+    ID id;
+    VALUE val;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (ruby_safe_level >= 4 && th != curr_thread) {
+	rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
+    }
+    if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
+
+    if (!th->locals) {
+	th->locals = st_init_numtable();
+    }
+    if (NIL_P(val)) {
+	st_delete(th->locals, (st_data_t*)&id, 0);
+	return Qnil;
+    }
+    st_insert(th->locals, 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;
+{
+    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;
+{
+    rb_thread_t th = rb_thread_check(thread);
+
+    if (!th->locals) return Qfalse;
+    if (st_lookup(th->locals, rb_to_id(id), 0))
+	return Qtrue;
+    return Qfalse;
+}
+
+static int
+thread_keys_i(key, value, ary)
+    ID key;
+    VALUE value, ary;
+{
+    rb_ary_push(ary, ID2SYM(key));
+    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;
+{
+    rb_thread_t th = rb_thread_check(thread);
+    VALUE ary = rb_ary_new();
+
+    if (th->locals) {
+	st_foreach(th->locals, thread_keys_i, ary);
+    }
+    return ary;
+}
+
+/*
+ * call-seq:
+ *   thr.inspect   => string
+ *
+ * Dump the name, id, and status of _thr_ to a string.
+ */
+
+static VALUE
+rb_thread_inspect(thread)
+    VALUE thread;
+{
+    const char *cname = rb_obj_classname(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);
+    RSTRING(str)->len = strlen(RSTRING(str)->ptr);
+    OBJ_INFECT(str, thread);
+
+    return str;
+}
+
+void
+rb_thread_atfork()
+{
+    rb_thread_t th;
+
+    if (rb_thread_alone()) return;
+    FOREACH_THREAD(th) {
+	if (th != curr_thread) {
+	    rb_thread_die(th);
+	}
+    }
+    END_FOREACH(th);
+    main_thread = curr_thread;
+    curr_thread->next = curr_thread;
+    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_callcc(self)
+    VALUE self;
+{
+    volatile VALUE cont;
+    rb_thread_t th;
+    volatile rb_thread_t th_save;
+    struct tag *tag;
+    struct RVarmap *vars;
+
+    THREAD_ALLOC(th);
+    cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
+
+    scope_dup(ruby_scope);
+    for (tag=prot_tag; tag; tag=tag->prev) {
+	scope_dup(tag->scope);
+    }
+    th->thread = curr_thread->thread;
+    th->thgroup = cont_protect;
+
+    for (vars = ruby_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;
+    }
+    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;
+    VALUE *argv;
+    VALUE cont;
 {
-    return GET_THREAD()->parse_in_eval != 0;
+    rb_thread_t th = rb_thread_check(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;
+	break;
+      case 1:
+	th->result = argv[0];
+	break;
+      default:
+	th->result = rb_ary_new4(argc, argv);
+	break;
+    }
+
+    rb_thread_restore_context(th, RESTORE_NORMAL);
+    return Qnil;
 }
 
+struct thgroup {
+    int enclosed;
+    VALUE group;
+};
+
 
+/*
+ * 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)
+    VALUE klass;
+{
+    VALUE group;
+    struct thgroup *data;
+
+    group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
+    data->enclosed = 0;
+    data->group = group;
+
+    return group;
+}
+
+
+/*
+ *  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;
+{
+    struct thgroup *data;
+    rb_thread_t th;
+    VALUE ary;
+
+    Data_Get_Struct(group, struct thgroup, data);
+    ary = rb_ary_new();
+
+    FOREACH_THREAD(th) {
+	if (th->thgroup == data->group) {
+	    rb_ary_push(ary, th->thread);
+	}
+    }
+    END_FOREACH(th);
+
+    return ary;
+}
+
+
+/*
+ *  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;
+{
+    rb_thread_t th;
+    struct thgroup *data;
+
+    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;
+    return group;
+}
+
+
+/* variables for recursive traversals */
+static ID recursive_key;
+
+static VALUE
+recursive_check(hash, obj)
+    VALUE hash;
+    VALUE obj;
+{
+    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+	return Qfalse;
+    }
+    else {
+	VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_last_func()));
+
+	if (NIL_P(list) || TYPE(list) != T_HASH)
+	    return Qfalse;
+	if (NIL_P(rb_hash_lookup(list, obj)))
+	    return Qfalse;
+	return Qtrue;
+    }
+}
+
+static VALUE
+recursive_push(hash, obj)
+    VALUE hash;
+    VALUE obj;
+{
+    VALUE list, sym;
+
+    sym = ID2SYM(rb_frame_last_func());
+    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+	hash = rb_hash_new();
+	rb_thread_local_aset(rb_thread_current(), recursive_key, hash);
+	list = Qnil;
+    }
+    else {
+	list = rb_hash_aref(hash, sym);
+    }
+    if (NIL_P(list) || TYPE(list) != T_HASH) {
+	list = rb_hash_new();
+	rb_hash_aset(hash, sym, list);
+    }
+    rb_hash_aset(list, obj, Qtrue);
+    return hash;
+}
+
+static void
+recursive_pop(hash, obj)
+    VALUE hash;
+    VALUE obj;
+{
+    VALUE list, sym;
+
+    sym = ID2SYM(rb_frame_last_func());
+    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+	VALUE symname;
+	VALUE thrname;
+	symname = rb_inspect(sym);
+	thrname = rb_inspect(rb_thread_current());
+
+	rb_raise(rb_eTypeError, "invalid inspect_tbl hash for %s in %s",
+		 StringValuePtr(symname), StringValuePtr(thrname));
+    }
+    list = rb_hash_aref(hash, sym);
+    if (NIL_P(list) || TYPE(list) != T_HASH) {
+	VALUE symname = rb_inspect(sym);
+	VALUE thrname = rb_inspect(rb_thread_current());
+	rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s",
+		 StringValuePtr(symname), StringValuePtr(thrname));
+    }
+    rb_hash_delete(list, obj);
+}
+
+VALUE
+rb_exec_recursive(func, obj, arg)
+    VALUE (*func) _((VALUE, VALUE, int));
+    VALUE obj;
+    VALUE arg;
+{
+    VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
+    VALUE objid = rb_obj_id(obj);
+
+    if (recursive_check(hash, objid)) {
+	return (*func) (obj, arg, Qtrue);
+    }
+    else {
+	VALUE result = Qundef;
+	int state;
+
+	hash = recursive_push(hash, objid);
+	PUSH_TAG(PROT_NONE);
+	if ((state = EXEC_TAG()) == 0) {
+	    result = (*func) (obj, arg, Qfalse);
+	}
+	POP_TAG();
+	recursive_pop(hash, objid);
+	if (state)
+	    JUMP_TAG(state);
+	return result;
+    }
+}
+
+
+/*
+ *  +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()
+{
+    VALUE cThGroup;
+
+    recursive_key = rb_intern("__recursive_key__");
+    rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
+    rb_cThread = rb_define_class("Thread", rb_cObject);
+    rb_undef_alloc_func(rb_cThread);
+
+    rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
+    rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
+    rb_define_singleton_method(rb_cThread, "start", rb_thread_start, -2);
+    rb_define_singleton_method(rb_cThread, "fork", rb_thread_start, -2);
+
+    rb_define_singleton_method(rb_cThread, "stop", rb_thread_stop, 0);
+    rb_define_singleton_method(rb_cThread, "kill", rb_thread_s_kill, 1);
+    rb_define_singleton_method(rb_cThread, "exit", rb_thread_exit, 0);
+    rb_define_singleton_method(rb_cThread, "pass", rb_thread_pass, 0);
+    rb_define_singleton_method(rb_cThread, "current", rb_thread_current, 0);
+    rb_define_singleton_method(rb_cThread, "main", rb_thread_main, 0);
+    rb_define_singleton_method(rb_cThread, "list", rb_thread_list, 0);
+
+    rb_define_singleton_method(rb_cThread, "critical", rb_thread_critical_get, 0);
+    rb_define_singleton_method(rb_cThread, "critical=", rb_thread_critical_set, 1);
+
+    rb_define_singleton_method(rb_cThread, "abort_on_exception", rb_thread_s_abort_exc, 0);
+    rb_define_singleton_method(rb_cThread, "abort_on_exception=", rb_thread_s_abort_exc_set, 1);
+
+    rb_define_method(rb_cThread, "run", rb_thread_run, 0);
+    rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
+    rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
+    rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0);
+    rb_define_method(rb_cThread, "value", rb_thread_value, 0);
+    rb_define_method(rb_cThread, "status", rb_thread_status, 0);
+    rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
+    rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
+    rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
+    rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
+
+    rb_define_method(rb_cThread, "abort_on_exception", rb_thread_abort_exc, 0);
+    rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1);
+
+    rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
+    rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
+    rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
+    rb_define_method(rb_cThread, "group", rb_thread_group, 0);
+
+    rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
+    rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
+    rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
+    rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
+
+    rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
+
+    rb_cCont = rb_define_class("Continuation", rb_cObject);
+    rb_undef_alloc_func(rb_cCont);
+    rb_undef_method(CLASS_OF(rb_cCont), "new");
+    rb_define_method(rb_cCont, "call", rb_cont_call, -1);
+    rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
+    rb_define_global_function("callcc", rb_callcc, 0);
+    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;
+}
+
+/*
+ *  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 */
+
+    tag = ID2SYM(rb_to_id(tag));
+    PUSH_TAG(tag);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_yield_0(tag, 0, 0, 0, Qfalse);
+    }
+    else if (state == TAG_THROW && tag == prot_tag->dst) {
+	val = prot_tag->retval;
+	state = 0;
+    }
+    POP_TAG();
+    if (state) JUMP_TAG(state);
+
+    return val;
+}
+
+static VALUE
+catch_i(tag)
+    VALUE tag;
+{
+    return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
+}
+
+VALUE
+rb_catch(tag, func, data)
+    const char *tag;
+    VALUE (*func)();
+    VALUE data;
+{
+    return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, 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;
+    struct tag *tt = prot_tag;
+
+    rb_scan_args(argc, argv, "11", &tag, &value);
+    tag = ID2SYM(rb_to_id(tag));
+
+    while (tt) {
+	if (tt->tag == tag) {
+	    tt->dst = tag;
+	    tt->retval = value;
+	    break;
+	}
+	if (tt->tag == PROT_THREAD) {
+	    rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
+		     rb_id2name(SYM2ID(tag)),
+		     curr_thread);
+	}
+	tt = tt->prev;
+    }
+    if (!tt) {
+	rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+    }
+    rb_trap_restore_mask();
+    JUMP_TAG(TAG_THROW);
+#ifndef __GNUC__
+    return Qnil; 		/* not reached */
+#endif
+}
+
+void
+rb_throw(tag, val)
+    const char *tag;
+    VALUE val;
+{
+    VALUE argv[2];
+
+    argv[0] = ID2SYM(rb_intern(tag));
+    argv[1] = val;
+    rb_f_throw(2, argv);
+}
diff --git a/eval_error.c b/eval_error.c
deleted file mode 100644
index 622ae4fdd9..0000000000
--- a/eval_error.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*-c-*- */
-/*
- * included by eval.c
- */
-
-static void
-warn_printf(const char *fmt, ...)
-{
-    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(void)
-{
-    const char *sourcefile = rb_sourcefile();
-    int sourceline = rb_sourceline();
-
-    if (sourcefile) {
-	if (sourceline == 0) {
-	    warn_printf("%s", sourcefile);
-	}
-	else if (rb_frame_callee()) {
-	    warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
-			rb_id2name(rb_frame_callee()));
-	}
-	else {
-	    warn_printf("%s:%d", sourcefile, sourceline);
-	}
-    }
-}
-
-VALUE rb_check_backtrace(VALUE);
-
-static VALUE
-get_backtrace(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);
-}
-
-VALUE
-rb_get_backtrace(VALUE info)
-{
-    return get_backtrace(info);
-}
-
-static void
-set_backtrace(VALUE info, VALUE bt)
-{
-    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
-}
-
-static void
-error_print(void)
-{
-    VALUE errat = Qnil;		/* OK */
-    VALUE errinfo = GET_THREAD()->errinfo;
-    volatile VALUE eclass, e;
-    const char *einfo;
-    long elen;
-
-    if (NIL_P(errinfo))
-	return;
-
-    PUSH_TAG();
-    if (EXEC_TAG() == 0) {
-	errat = get_backtrace(errinfo);
-    }
-    else {
-	errat = Qnil;
-    }
-    if (EXEC_TAG())
-	goto error;
-    if (NIL_P(errat)) {
-	const char *file = rb_sourcefile();
-	int line = rb_sourceline();
-	if (file)
-	    warn_printf("%s:%d", file, line);
-	else
-	    warn_printf("%d", line);
-    }
-    else if (RARRAY_LEN(errat) == 0) {
-	error_pos();
-    }
-    else {
-	VALUE mesg = RARRAY_PTR(errat)[0];
-
-	if (NIL_P(mesg))
-	    error_pos();
-	else {
-	    warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
-	}
-    }
-
-    eclass = CLASS_OF(errinfo);
-    if (EXEC_TAG() == 0) {
-	e = rb_funcall(errinfo, rb_intern("message"), 0, 0);
-	StringValue(e);
-	einfo = RSTRING_PTR(e);
-	elen = RSTRING_LEN(e);
-    }
-    else {
-	einfo = "";
-	elen = 0;
-    }
-    if (EXEC_TAG())
-	goto error;
-    if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print(": unhandled exception\n");
-    }
-    else {
-	VALUE epath;
-
-	epath = rb_class_name(eclass);
-	if (elen == 0) {
-	    warn_print(": ");
-	    warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
-	    warn_print("\n");
-	}
-	else {
-	    char *tail = 0;
-	    long len = elen;
-
-	    if (RSTRING_PTR(epath)[0] == '#')
-		epath = 0;
-	    if ((tail = memchr(einfo, '\n', elen)) != 0) {
-		len = tail - einfo;
-		tail++;		/* skip newline */
-	    }
-	    warn_print(": ");
-	    warn_print2(einfo, len);
-	    if (epath) {
-		warn_print(" (");
-		warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
-		warn_print(")\n");
-	    }
-	    if (tail) {
-		warn_print2(tail, elen - len - 1);
-		if (einfo[elen-1] != '\n') warn_print2("\n", 1);
-	    }
-	}
-    }
-
-    if (!NIL_P(errat)) {
-	long i;
-	long len = RARRAY_LEN(errat);
-	VALUE *ptr = RARRAY_PTR(errat);
-        int skip = eclass == rb_eSysStackError;
-	
-#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
-#define TRACE_HEAD 8
-#define TRACE_TAIL 5
-
-	for (i = 1; i < len; i++) {
-	    if (TYPE(ptr[i]) == T_STRING) {
-		warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
-	    }
-	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-		warn_printf("\t ... %ld levels...\n",
-			    len - TRACE_HEAD - TRACE_TAIL);
-		i = len - TRACE_TAIL;
-	    }
-	}
-    }
-  error:
-    POP_TAG();
-}
-
-void
-ruby_error_print(void)
-{
-    error_print();
-}
-
-void
-rb_print_undef(VALUE klass, ID id, int scope)
-{
-    const char *v;
-
-    switch (scope) {
-      default:
-      case NOEX_PUBLIC: v = ""; break;
-      case NOEX_PRIVATE: v = " private"; break;
-      case NOEX_PROTECTED: v = " protected"; break;
-    }
-    rb_name_error(id, "undefined%s method `%s' for %s `%s'", v,
-		  rb_id2name(id),
-		  (TYPE(klass) == T_MODULE) ? "module" : "class",
-		  rb_class2name(klass));
-}
-
-static int
-sysexit_status(VALUE err)
-{
-    VALUE st = rb_iv_get(err, "status");
-    return NUM2INT(st);
-}
-
-static int
-error_handle(int ex)
-{
-    int status = EXIT_FAILURE;
-    rb_thread_t *th = GET_THREAD();
-
-    if (rb_thread_set_raised(th))
-	return EXIT_FAILURE;
-    switch (ex & TAG_MASK) {
-      case 0:
-	status = EXIT_SUCCESS;
-	break;
-
-      case TAG_RETURN:
-	error_pos();
-	warn_print(": unexpected return\n");
-	break;
-      case TAG_NEXT:
-	error_pos();
-	warn_print(": unexpected next\n");
-	break;
-      case TAG_BREAK:
-	error_pos();
-	warn_print(": unexpected break\n");
-	break;
-      case TAG_REDO:
-	error_pos();
-	warn_print(": unexpected redo\n");
-	break;
-      case TAG_RETRY:
-	error_pos();
-	warn_print(": retry outside of rescue clause\n");
-	break;
-      case TAG_THROW:
-	/* TODO: fix me */
-	error_pos();
-	warn_printf(": unexpected throw\n");
-	break;
-      case TAG_RAISE: {
-	VALUE errinfo = GET_THREAD()->errinfo;
-	if (rb_obj_is_kind_of(errinfo, rb_eSystemExit)) {
-	    status = sysexit_status(errinfo);
-	}
-	else if (rb_obj_is_instance_of(errinfo, rb_eSignal)) {
-	    /* no message when exiting by signal */
-	}
-	else {
-	    error_print();
-	}
-	break;
-      }
-      case TAG_FATAL:
-	error_print();
-	break;
-      default:
-	rb_bug("Unknown longjmp status %d", ex);
-	break;
-    }
-    rb_thread_reset_raised(th);
-    return status;
-}
diff --git a/eval_intern.h b/eval_intern.h
deleted file mode 100644
index 19275d911c..0000000000
--- a/eval_intern.h
+++ /dev/null
@@ -1,235 +0,0 @@
-
-#ifndef RUBY_EVAL_INTERN_H
-#define RUBY_EVAL_INTERN_H
-
-#define PASS_PASSED_BLOCK_TH(th) do { \
-    (th)->passed_block = GC_GUARDED_PTR_REF((rb_block_t *)(th)->cfp->lfp[0]); \
-    (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
-} while (0)
-
-#define PASS_PASSED_BLOCK() do { \
-    rb_thread_t * const __th__ = GET_THREAD(); \
-    PASS_PASSED_BLOCK_TH(__th__); \
-} while (0)
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-#include "ruby/util.h"
-#include "ruby/signal.h"
-#include "vm_core.h"
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
-#include <stdio.h>
-#include <setjmp.h>
-
-#include "ruby/st.h"
-#include "dln.h"
-
-#ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
-/* Make alloca work the best possible way.  */
-#ifdef __GNUC__
-# ifndef atarist
-#  ifndef alloca
-#   define alloca __builtin_alloca
-#  endif
-# endif	/* atarist */
-#else
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca		/* predefined by HP cc +Olibcalls */
-void *alloca();
-#   endif
-#  endif /* AIX */
-# endif	/* HAVE_ALLOCA_H */
-#endif /* __GNUC__ */
-
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
-#ifndef HAVE_STRING_H
-char *strrchr(const char *, const char);
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef __BEOS__
-#include <net/socket.h>
-#endif
-
-#ifdef __MACOS__
-#include "macruby_private.h"
-#endif
-
-#ifdef __VMS
-#include "vmsruby_private.h"
-#endif
-
-#define ruby_setjmp(env) RUBY_SETJMP(env)
-#define ruby_longjmp(env,val) RUBY_LONGJMP(env,val)
-#ifdef __CYGWIN__
-int _setjmp(), _longjmp();
-#endif
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-#if defined(__VMS)
-#pragma nostandard
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-/*
-  Solaris sys/select.h switches select to select_large_fdset to support larger
-  file descriptors if FD_SETSIZE is larger than 1024 on 32bit environment.
-  But Ruby doesn't change FD_SETSIZE because fd_set is allocated dynamically.
-  So following definition is required to use select_large_fdset.
-*/
-#ifdef HAVE_SELECT_LARGE_FDSET
-#define select(n, r, w, e, t) select_large_fdset(n, r, w, e, t)
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-#include <sys/stat.h>
-
-#define SAVE_ROOT_JMPBUF(th, stmt) do \
-  if (ruby_setjmp((th)->root_jmpbuf) == 0) { \
-      stmt; \
-  } \
-  else { \
-      rb_fiber_start(); \
-  } while (0)
-
-#define TH_PUSH_TAG(th) do { \
-  rb_thread_t * const _th = th; \
-  struct rb_vm_tag _tag; \
-  _tag.tag = 0; \
-  _tag.prev = _th->tag; \
-  _th->tag = &_tag;
-
-#define TH_POP_TAG() \
-  _th->tag = _tag.prev; \
-} while (0)
-
-#define TH_POP_TAG2() \
-  _th->tag = _tag.prev
-
-#define PUSH_TAG() TH_PUSH_TAG(GET_THREAD())
-#define POP_TAG()      TH_POP_TAG()
-
-#define TH_EXEC_TAG() ruby_setjmp(_th->tag->buf)
-
-#define EXEC_TAG() \
-  TH_EXEC_TAG()
-
-#define TH_JUMP_TAG(th, st) do { \
-  ruby_longjmp(th->tag->buf,(st)); \
-} while (0)
-
-#define JUMP_TAG(st) TH_JUMP_TAG(GET_THREAD(), st)
-
-enum ruby_tag_type {
-    RUBY_TAG_RETURN	= 0x1,
-    RUBY_TAG_BREAK	= 0x2,
-    RUBY_TAG_NEXT	= 0x3,
-    RUBY_TAG_RETRY	= 0x4,
-    RUBY_TAG_REDO	= 0x5,
-    RUBY_TAG_RAISE	= 0x6,
-    RUBY_TAG_THROW	= 0x7,
-    RUBY_TAG_FATAL	= 0x8,
-    RUBY_TAG_MASK	= 0xf
-};
-#define TAG_RETURN	RUBY_TAG_RETURN
-#define TAG_BREAK	RUBY_TAG_BREAK
-#define TAG_NEXT	RUBY_TAG_NEXT
-#define TAG_RETRY	RUBY_TAG_RETRY
-#define TAG_REDO	RUBY_TAG_REDO
-#define TAG_RAISE	RUBY_TAG_RAISE
-#define TAG_THROW	RUBY_TAG_THROW
-#define TAG_FATAL	RUBY_TAG_FATAL
-#define TAG_MASK	RUBY_TAG_MASK
-
-#define NEW_THROW_OBJECT(val, pt, st) \
-  ((VALUE)NEW_NODE(NODE_LIT, (val), (pt), (st)))
-#define SET_THROWOBJ_CATCH_POINT(obj, val) \
-  (RNODE((obj))->u2.value = (val))
-#define SET_THROWOBJ_STATE(obj, val) \
-  (RNODE((obj))->u3.value = (val))
-
-#define GET_THROWOBJ_VAL(obj)         ((VALUE)RNODE((obj))->u1.value)
-#define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value)
-#define GET_THROWOBJ_STATE(obj)       ((int)RNODE((obj))->u3.value)
-
-#define SCOPE_TEST(f)  (vm_cref()->nd_visi & (f))
-#define SCOPE_CHECK(f) (vm_cref()->nd_visi == (f))
-#define SCOPE_SET(f)   (vm_cref()->nd_visi = (f))
-
-#define CHECK_STACK_OVERFLOW(cfp, margin) do \
-  if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \
-      rb_exc_raise(sysstack_error); \
-  } \
-while (0)
-
-void rb_thread_cleanup(void);
-void rb_thread_wait_other_threads(void);
-
-enum {
-    RAISED_EXCEPTION = 1,
-    RAISED_STACKOVERFLOW = 2,
-    RAISED_NOMEMORY = 4
-};
-int rb_thread_set_raised(rb_thread_t *th);
-int rb_thread_reset_raised(rb_thread_t *th);
-#define rb_thread_raised_set(th, f)   ((th)->raised_flag |= (f))
-#define rb_thread_raised_reset(th, f) ((th)->raised_flag &= ~(f))
-#define rb_thread_raised_p(th, f)     (((th)->raised_flag & (f)) != 0)
-#define rb_thread_raised_clear(th)    ((th)->raised_flag = 0)
-
-VALUE rb_f_eval(int argc, VALUE *argv, VALUE self);
-VALUE rb_make_exception(int argc, VALUE *argv);
-
-NORETURN(void rb_fiber_start(void));
-
-NORETURN(void rb_print_undef(VALUE, ID, int));
-NORETURN(void vm_localjump_error(const char *,VALUE, int));
-NORETURN(void vm_jump_tag_but_local_jump(int, VALUE));
-
-VALUE vm_make_jump_tag_but_local_jump(int state, VALUE val);
-NODE *vm_cref(void);
-rb_control_frame_t *vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
-VALUE rb_obj_is_proc(VALUE);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
-void rb_thread_terminate_all(void);
-VALUE rb_vm_top_self();
-VALUE rb_vm_cbase(void);
-
-#endif /* RUBY_EVAL_INTERN_H */
diff --git a/eval_jump.c b/eval_jump.c
deleted file mode 100644
index f474844ba8..0000000000
--- a/eval_jump.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*-c-*- */
-/*
- * from eval.c
- */
-
-#include "eval_intern.h"
-
-/* exit */
-
-void
-rb_call_end_proc(VALUE data)
-{
-    rb_proc_call(data, rb_ary_new());
-}
-
-/*
- *  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(void)
-{
-    VALUE proc;
-
-    if (!rb_block_given_p()) {
-	rb_raise(rb_eArgError, "called without a block");
-    }
-    proc = rb_block_proc();
-    rb_set_end_proc(rb_call_end_proc, proc);
-    return proc;
-}
-
-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;
-
-void
-rb_set_end_proc(void (*func)(VALUE), VALUE data)
-{
-    struct end_proc_data *link = ALLOC(struct end_proc_data);
-    struct end_proc_data **list;
-    rb_thread_t *th = GET_THREAD();
-
-    if (th->top_wrapper) {
-	list = &ephemeral_end_procs;
-    }
-    else {
-	list = &end_procs;
-    }
-    link->next = *list;
-    link->func = func;
-    link->data = data;
-    link->safe = rb_safe_level();
-    *list = link;
-}
-
-void
-rb_mark_end_proc(void)
-{
-    struct end_proc_data *link;
-
-    link = end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-    link = ephemeral_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-    link = tmp_end_procs;
-    while (link) {
-	rb_gc_mark(link->data);
-	link = link->next;
-    }
-}
-
-void
-rb_exec_end_proc(void)
-{
-    struct end_proc_data *link, *tmp;
-    int status;
-    volatile int safe = rb_safe_level();
-
-    while (ephemeral_end_procs) {
-	tmp_end_procs = link = ephemeral_end_procs;
-	ephemeral_end_procs = 0;
-	while (link) {
-	    PUSH_TAG();
-	    if ((status = EXEC_TAG()) == 0) {
-		rb_set_safe_level_force(link->safe);
-		(*link->func) (link->data);
-	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
-	    }
-	    tmp = link;
-	    tmp_end_procs = link = link->next;
-	    xfree(tmp);
-	}
-    }
-    while (end_procs) {
-	tmp_end_procs = link = end_procs;
-	end_procs = 0;
-	while (link) {
-	    PUSH_TAG();
-	    if ((status = EXEC_TAG()) == 0) {
-		rb_set_safe_level_force(link->safe);
-		(*link->func) (link->data);
-	    }
-	    POP_TAG();
-	    if (status) {
-		error_handle(status);
-	    }
-	    tmp = link;
-	    tmp_end_procs = link = link->next;
-	    xfree(tmp);
-	}
-    }
-    rb_set_safe_level_force(safe);
-}
-
-void
-Init_jump(void)
-{
-    rb_define_global_function("at_exit", rb_f_at_exit, 0);
-}
diff --git a/eval_safe.c b/eval_safe.c
deleted file mode 100644
index 7d0a077880..0000000000
--- a/eval_safe.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*-c-*- */
-/*
- * This file is included by eval.c
- */
-
-/* safe-level:
-   0 - strings from streams/environment/ARGV are tainted (default)
-   1 - no dangerous operation by tainted value
-   2 - process/file operations prohibited
-   3 - all generated objects are tainted
-   4 - no global (non-tainted) variable modification/no direct output
-*/
-
-#define SAFE_LEVEL_MAX 4
-
-/* $SAFE accessor */
-
-int
-rb_safe_level(void)
-{
-    return GET_THREAD()->safe_level;
-}
-
-void
-rb_set_safe_level_force(int safe)
-{
-    GET_THREAD()->safe_level = safe;
-}
-
-void
-rb_set_safe_level(int level)
-{
-    rb_thread_t *th = GET_THREAD();
-
-    if (level > th->safe_level) {
-	if (level > SAFE_LEVEL_MAX) {
-	    level = SAFE_LEVEL_MAX;
-	}
-	th->safe_level = level;
-    }
-}
-
-static VALUE
-safe_getter(void)
-{
-    return INT2NUM(rb_safe_level());
-}
-
-static void
-safe_setter(VALUE val)
-{
-    int level = NUM2INT(val);
-    rb_thread_t *th = GET_THREAD();
-
-    if (level < th->safe_level) {
-	rb_raise(rb_eSecurityError,
-		 "tried to downgrade safe level from %d to %d",
-		 th->safe_level, level);
-    }
-    if (level > SAFE_LEVEL_MAX) {
-	level = SAFE_LEVEL_MAX;
-    }
-    th->safe_level = level;
-}
-
-void
-rb_secure(int level)
-{
-    if (level <= rb_safe_level()) {
-	if (rb_frame_callee()) {
-	    rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
-		     rb_id2name(rb_frame_callee()), rb_safe_level());
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation at level %d",
-		     rb_safe_level());
-	}
-    }
-}
-
-void
-rb_secure_update(VALUE obj)
-{
-    if (!OBJ_TAINTED(obj))
-	rb_secure(4);
-}
-
-void
-rb_check_safe_obj(VALUE x)
-{
-    if (rb_safe_level() > 0 && OBJ_TAINTED(x)) {
-	if (rb_frame_callee()) {
-	    rb_raise(rb_eSecurityError, "Insecure operation - %s",
-		     rb_id2name(rb_frame_callee()));
-	}
-	else {
-	    rb_raise(rb_eSecurityError, "Insecure operation: -r");
-	}
-    }
-    rb_secure(4);
-}
-
-void
-rb_check_safe_str(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));
-    }
-}
diff --git a/ext/.document b/ext/.document
index e9f791facc..ba8182593e 100644
--- a/ext/.document
+++ b/ext/.document
@@ -1,11 +1,7 @@
 # Add files to this as they become documented
 
-bigdecimal/bigdecimal.c
-digest/digest.c
-etc/etc.c
-fcntl/fcntl.c
+enumerator/enumerator.c
 iconv/iconv.c
-io/wait/wait.c
 nkf/lib/kconv.rb
 nkf/nkf.c
 socket/socket.c
diff --git a/ext/Setup b/ext/Setup
index b0f29b9f7b..d0d6317a5e 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -10,23 +10,25 @@
 #digest/sha1
 #digest/sha2
 #dl
+#enumerator
 #etc
 #fcntl
 #gdbm
 #iconv
 #io/wait
 #nkf
-#openssl
 #pty
+#openssl
 #racc/cparse
 #readline
-#ripper
 #sdbm
 #socket
 #stringio
 #strscan
 #syck
 #syslog
+#tcltklib
+#thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 6e0b8ae5a6..6bda3a4cfb 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -17,17 +17,18 @@ gdbm
 iconv
 io/wait
 nkf
-#openssl
 pty
+#openssl
 racc/parse
 readline
-ripper
 sdbm
 socket
 stringio
 strscan
 syck
 syslog
+#tcltklib
+thread
 #tk
 #win32ole
 zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
index 5276b125a1..4f94788886 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -17,17 +17,18 @@ gdbm
 #iconv
 #io/wait
 nkf
-#openssl
 #pty
+#openssl
 racc/cparse
 readline
-ripper
 sdbm
 #socket
 stringio
 strscan
 syck
 #syslog
+#tcltklib
+thread
 #tk
 #win32ole
 zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
index fade917e92..afc5923577 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -17,17 +17,18 @@ fcntl
 #iconv
 #io/wait
 nkf
-#openssl
 #pty
+#openssl
 racc/cparse
 #readline
-#ripper
 #sdbm
 socket
 stringio
 strscan
 #syck
 #syslog
+#tcltklib
+thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index c8574ba70a..9f8abf9b8d 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -17,17 +17,18 @@ fcntl
 #iconv
 #io/wait
 nkf
-#openssl
 #pty
+#openssl
 racc/cparse
 #readline
-#ripper
 sdbm
 socket
 stringio
 strscan
 syck
 #syslog
+#tcltklib
+thread
 #tk
 win32ole
 #zlib
diff --git a/ext/Setup.x68 b/ext/Setup.x68
index 03f5d2d50d..0966e737e9 100644
--- a/ext/Setup.x68
+++ b/ext/Setup.x68
@@ -17,17 +17,18 @@ fcntl
 #iconv
 #io/wait
 nkf
-#openssl
 #pty
+#openssl
 racc/cparse
 #readline
-#ripper
 #sdbm
 #socket
 stringio
 strscan
 #syck
 #syslog
+#tcltklib
+thread
 #tk
 #win32ole
 #zlib
diff --git a/ext/Win32API/.cvsignore b/ext/Win32API/.cvsignore
new file mode 100644
index 0000000000..90c83ed9b1
--- /dev/null
+++ b/ext/Win32API/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+*.log
+*.def
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
new file mode 100644
index 0000000000..a4fd0396f0
--- /dev/null
+++ b/ext/Win32API/Win32API.c
@@ -0,0 +1,215 @@
+/*
+  Win32API - Ruby Win32 API Import Facility
+*/
+
+#if !defined _MSC_VER && !defined _WIN32
+#define  WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <stdio.h>
+#endif
+
+#define _T_VOID     0
+#define _T_NUMBER   1
+#define _T_POINTER  2
+#define _T_INTEGER  3
+
+#include "ruby.h"
+
+typedef struct {
+    HANDLE dll;
+    HANDLE proc;
+    VALUE dllname;
+    VALUE import;
+    VALUE export;
+} Win32API;
+
+static void
+Win32API_FreeLibrary(hdll)
+    HINSTANCE hdll;
+{
+    FreeLibrary(hdll);
+}
+
+static VALUE
+Win32API_initialize(self, dllname, proc, import, export)
+    VALUE self;
+    VALUE dllname;
+    VALUE proc;
+    VALUE import;
+    VALUE export;
+{
+    HANDLE hproc;
+    HINSTANCE hdll;
+    VALUE str;
+    VALUE a_import;
+    VALUE *ptr;
+    char *s;
+    int i;
+    int len;
+    int ex = _T_VOID;
+
+    SafeStringValue(dllname);
+    SafeStringValue(proc);
+    hdll = LoadLibrary(RSTRING(dllname)->ptr);
+    if (!hdll)
+	rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
+    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
+    hproc = (HANDLE)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);
+	if (!hproc)
+	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
+		RSTRING(proc)->ptr, RSTRING(str)->ptr);
+    }
+    rb_iv_set(self, "__dll__", UINT2NUM((unsigned long)hdll));
+    rb_iv_set(self, "__dllname__", dllname);
+    rb_iv_set(self, "__proc__", UINT2NUM((unsigned long)hproc));
+
+    a_import = rb_ary_new();
+    switch (TYPE(import)) {
+    case T_NIL:
+	break;
+    case T_ARRAY:
+	ptr = RARRAY(import)->ptr;
+	for (i = 0, len = RARRAY(import)->len; i < len; i++) {
+	    SafeStringValue(ptr[i]);
+	    switch (*(char *)RSTRING(ptr[i])->ptr) {
+	    case 'N': case 'n': case 'L': case 'l':
+		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+		break;
+	    case 'P': case 'p':
+		rb_ary_push(a_import, INT2FIX(_T_POINTER));
+		break;
+	    case 'I': case 'i':
+		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+		break;
+	    }
+	}
+        break;
+    default:
+	SafeStringValue(import);
+	s = RSTRING(import)->ptr;
+	for (i = 0, len = RSTRING(import)->len; i < len; i++) {
+	    switch (*s++) {
+	    case 'N': case 'n': case 'L': case 'l':
+		rb_ary_push(a_import, INT2FIX(_T_NUMBER));
+		break;
+	    case 'P': case 'p':
+		rb_ary_push(a_import, INT2FIX(_T_POINTER));
+		break;
+	    case 'I': case 'i':
+		rb_ary_push(a_import, INT2FIX(_T_INTEGER));
+		break;
+	    }
+	}
+        break;
+    }
+
+    if (16 < RARRAY(a_import)->len) {
+	rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
+    }
+
+    rb_iv_set(self, "__import__", a_import);
+
+    if (NIL_P(export)) {
+	ex = _T_VOID;
+    } else {
+	SafeStringValue(export);
+	switch (*RSTRING(export)->ptr) {
+        case 'V': case 'v':
+	    ex = _T_VOID;
+	    break;
+	case 'N': case 'n': case 'L': case 'l':
+	    ex = _T_NUMBER;
+	    break;
+	case 'P': case 'p':
+	    ex = _T_POINTER;
+	    break;
+	case 'I': case 'i':
+	    ex = _T_INTEGER;
+	    break;
+	}
+    }
+    rb_iv_set(self, "__export__", INT2FIX(ex));
+
+    return Qnil;
+}
+
+#ifdef _MSC_VER
+#pragma optimize("g", off)
+#endif
+static VALUE
+Win32API_Call(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    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;
+
+
+    if (items != nimport)
+	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+	    nimport, items);
+
+    for (i = 0; i < nimport; i++) {
+	unsigned long lParam = 0;
+	switch (FIX2INT(rb_ary_entry(obj_import, 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);
+	    }
+	    break;
+	}
+	params[i] = lParam;
+    }
+
+    ret = ApiFunction(param);
+
+    switch (FIX2INT(obj_export)) {
+    case _T_NUMBER:
+    case _T_INTEGER:
+	return INT2NUM(ret);
+    case _T_POINTER:
+	return rb_str_new2((char *)ret);
+    case _T_VOID:
+    default:
+	return INT2NUM(0);
+    }
+}
+
+void
+Init_Win32API()
+{
+    VALUE cWin32API = rb_define_class("Win32API", rb_cObject);
+    rb_define_method(cWin32API, "initialize", Win32API_initialize, 4);
+    rb_define_method(cWin32API, "call", Win32API_Call, -1);
+    rb_define_alias(cWin32API,  "Call", "call");
+}
diff --git a/ext/Win32API/depend b/ext/Win32API/depend
new file mode 100644
index 0000000000..b224bb66c9
--- /dev/null
+++ b/ext/Win32API/depend
@@ -0,0 +1 @@
+Win32API.o : Win32API.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
new file mode 100644
index 0000000000..865788556f
--- /dev/null
+++ b/ext/Win32API/extconf.rb
@@ -0,0 +1,6 @@
+require 'mkmf'
+
+dir_config("win32")
+if have_header("windows.h") and have_library("kernel32")
+  create_makefile("Win32API")
+end
diff --git a/ext/Win32API/getch.rb b/ext/Win32API/getch.rb
new file mode 100644
index 0000000000..c015bbe9bc
--- /dev/null
+++ b/ext/Win32API/getch.rb
@@ -0,0 +1,5 @@
+require 'Win32API'
+
+getch = Win32API.new("crtdll", "_getch", [], 'L')
+
+puts getch.Call.chr
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
new file mode 100644
index 0000000000..9a2f3827b7
--- /dev/null
+++ b/ext/Win32API/lib/win32/registry.rb
@@ -0,0 +1,831 @@
+=begin
+= Win32 Registry I/F
+win32/registry is registry accessor library for Win32 platform.
+It uses Win32API to call Win32 Registry APIs.
+
+== example
+  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
+    value = reg['foo']                               # read a value
+    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
+    type, value = reg.read('foo')                    # read a value
+    reg['foo'] = 'bar'                               # write a value
+    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
+    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
+    
+    reg.each_value { |name, type, data| ... }        # Enumerate values
+    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
+    
+    reg.delete_value(name)                         # Delete a value
+    reg.delete_key(name)                           # Delete a subkey
+    reg.delete_key(name, true)                     # Delete a subkey recursively
+  end
+
+= Reference
+
+== Win32::Registry class
+
+=== including modules
+
+* Enumerable
+* Registry::Constants
+
+=== class methods
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+--- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
+    Open the registry key ((|subkey|)) under ((|key|)).
+    ((|key|)) is Win32::Registry object of parent key.
+    You can use predefined key HKEY_* (see ((<constants>)))
+    
+    ((|desired|)) and ((|opt|)) is access mask and key option.
+    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
+    
+    If block is given, the key is closed automatically.
+
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+--- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
+    Create or open the registry key ((|subkey|)) under ((|key|)).
+    You can use predefined key HKEY_* (see ((<constants>)))
+    
+    If subkey is already exists, key is opened and Registry#((<created?>))
+    method will return false.
+    
+    If block is given, the key is closed automatically.
+
+--- Registry.expand_environ(str)
+    Replace (({%\w+%})) into the environment value of ((|str|)).
+    This method is used for REG_EXPAND_SZ.
+    
+    For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
+
+--- Registry.type2name(type)
+    Convert registry type value to readable string.
+
+--- Registry.wtime2time(wtime)
+    Convert 64-bit FILETIME integer into Time object.
+
+--- Registry.time2wtime(time)
+    Convert Time object or Integer object into 64-bit FILETIME.
+
+=== instance methods
+--- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+    Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
+
+--- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+    Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
+
+--- close
+    Close key.
+    
+    After closed, most method raises error.
+
+--- read(name, *rtype)
+    Read a registry value named ((|name|)) and return array of
+    [ ((|type|)), ((|data|)) ].
+    When name is nil, the `default' value is read.
+    
+    ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
+    ((|data|)) is value data, its class is:
+    :REG_SZ, REG_EXPAND_SZ
+       String
+    :REG_MULTI_SZ
+       Array of String
+    :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
+       Integer
+    :REG_BINARY
+       String (contains binary data)
+    
+    When ((|rtype|)) is specified, the value type must be included by
+    ((|rtype|)) array, or TypeError is raised.
+
+--- self[name, *rtype]
+    Read a registry value named ((|name|)) and return its value data.
+    The class of value is same as ((<read>)) method returns.
+    
+    If the value type is REG_EXPAND_SZ, returns value data whose environment
+    variables are replaced.
+    If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
+    REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
+    
+    The meaning of ((|rtype|)) is same as ((<read>)) method.
+
+--- read_s(name)
+--- read_i(name)
+--- read_bin(name)
+    Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
+    registry value named ((|name|)).
+    
+    If the values type does not match, TypeError is raised.
+
+--- read_s_expand(name)
+    Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
+    
+    If the value type is REG_EXPAND_SZ, environment variables are replaced.
+    Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
+
+--- write(name, type, data)
+    Write ((|data|)) to a registry value named ((|name|)).
+    When name is nil, write to the `default' value.
+    
+    ((|type|)) is type value. (see ((<Registry::Constants module>)))
+    Class of ((|data|)) must be same as which ((<read>))
+    method returns.
+
+--- self[name, wtype = nil] = value
+    Write ((|value|)) to a registry value named ((|name|)).
+    
+    If ((|wtype|)) is specified, the value type is it.
+    Otherwise, the value type is depend on class of ((|value|)):
+    :Integer
+      REG_DWORD
+    :String
+      REG_SZ
+    :Array
+      REG_MULTI_SZ
+
+--- write_s(name, value)
+--- write_i(name, value)
+--- write_bin(name, value)
+    Write ((|value|)) to a registry value named ((|name|)).
+    
+    The value type is REG_SZ(write_s), REG_DWORD(write_i), or
+    REG_BINARY(write_bin).
+
+--- each { |name, type, value| ... }
+--- each_value { |name, type, value| ... }
+    Enumerate values.
+
+--- each_key { |subkey, wtime| ... }
+    Enumerate subkeys.
+    
+    ((|subkey|)) is String which contains name of subkey.
+    ((|wtime|)) is last write time as FILETIME (64-bit integer).
+    (see ((<Registry.wtime2time>)))
+
+--- delete(name)
+--- delete_value(name)
+    Delete a registry value named ((|name|)).
+    We can not delete the `default' value.
+
+--- delete_key(name, recursive = false)
+    Delete a subkey named ((|name|)) and all its values.
+    
+    If ((|recursive|)) is false, the subkey must not have subkeys.
+    Otherwise, this method deletes all subkeys and values recursively.
+
+--- flush
+    Write all the attributes into the registry file.
+
+--- created?
+    Returns if key is created ((*newly*)).
+    (see ((<Registry.create>)))
+
+--- open?
+    Returns if key is not closed.
+
+--- hkey
+    Returns key handle value.
+
+--- parent
+    Win32::Registry object of parent key, or nil if predefeined key.
+
+--- keyname
+    Same as ((|subkey|)) value of ((<Registry.open>)) or
+    ((<Registry.create>)) method.
+
+--- disposition
+    Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
+
+--- name
+--- to_s
+    Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
+
+--- info
+    Returns key information as Array of:
+    :num_keys
+      The number of subkeys.
+    :max_key_length
+      Maximum length of name of subkeys.
+    :num_values
+      The number of values.
+    :max_value_name_length
+      Maximum length of name of values.
+    :max_value_length
+      Maximum length of value of values.
+    :descriptor_length
+      Length of security descriptor.
+    :wtime
+      Last write time as FILETIME(64-bit integer)
+    
+    For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
+
+--- num_keys
+--- max_key_length
+--- num_values
+--- max_value_name_length
+--- max_value_length
+--- descriptor_length
+--- wtime
+    Returns an item of key information.
+
+=== constants
+--- HKEY_CLASSES_ROOT
+--- HKEY_CURRENT_USER
+--- HKEY_LOCAL_MACHINE
+--- HKEY_PERFORMANCE_DATA
+--- HKEY_CURRENT_CONFIG
+--- HKEY_DYN_DATA
+    Win32::Registry object whose key is predefined key.
+    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
+
+== Win32::Registry::Constants module
+
+For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
+
+--- HKEY_*
+    Predefined key ((*handle*)).
+    These are Integer, not Win32::Registry.
+
+--- REG_*
+    Registry value type.
+
+--- KEY_*
+    Security access mask.
+
+--- KEY_OPTIONS_*
+    Key options.
+
+--- REG_CREATED_NEW_KEY
+--- REG_OPENED_EXISTING_KEY
+    If the key is created newly or opened existing key.
+    See also Registry#((<disposition>)) method.
+
+=end
+
+require 'Win32API'
+
+module Win32
+  class Registry
+    module Constants
+      HKEY_CLASSES_ROOT = 0x80000000
+      HKEY_CURRENT_USER = 0x80000001
+      HKEY_LOCAL_MACHINE = 0x80000002
+      HKEY_USERS = 0x80000003
+      HKEY_PERFORMANCE_DATA = 0x80000004
+      HKEY_PERFORMANCE_TEXT = 0x80000050
+      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
+      HKEY_CURRENT_CONFIG = 0x80000005
+      HKEY_DYN_DATA = 0x80000006
+      
+      REG_NONE = 0
+      REG_SZ = 1
+      REG_EXPAND_SZ = 2
+      REG_BINARY = 3
+      REG_DWORD = 4
+      REG_DWORD_LITTLE_ENDIAN = 4
+      REG_DWORD_BIG_ENDIAN = 5
+      REG_LINK = 6
+      REG_MULTI_SZ = 7
+      REG_RESOURCE_LIST = 8
+      REG_FULL_RESOURCE_DESCRIPTOR = 9
+      REG_RESOURCE_REQUIREMENTS_LIST = 10
+      REG_QWORD = 11
+      REG_QWORD_LITTLE_ENDIAN = 11
+      
+      STANDARD_RIGHTS_READ = 0x00020000
+      STANDARD_RIGHTS_WRITE = 0x00020000
+      KEY_QUERY_VALUE = 0x0001
+      KEY_SET_VALUE = 0x0002
+      KEY_CREATE_SUB_KEY = 0x0004
+      KEY_ENUMERATE_SUB_KEYS = 0x0008
+      KEY_NOTIFY = 0x0010
+      KEY_CREATE_LINK = 0x0020
+      KEY_READ = STANDARD_RIGHTS_READ |
+        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
+      KEY_WRITE = STANDARD_RIGHTS_WRITE |
+        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
+      KEY_EXECUTE = KEY_READ
+      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
+      
+      REG_OPTION_RESERVED = 0x0000
+      REG_OPTION_NON_VOLATILE = 0x0000
+      REG_OPTION_VOLATILE = 0x0001
+      REG_OPTION_CREATE_LINK = 0x0002
+      REG_OPTION_BACKUP_RESTORE = 0x0004
+      REG_OPTION_OPEN_LINK = 0x0008
+      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
+        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
+        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
+      
+      REG_CREATED_NEW_KEY = 1
+      REG_OPENED_EXISTING_KEY = 2
+      
+      REG_WHOLE_HIVE_VOLATILE = 0x0001
+      REG_REFRESH_HIVE = 0x0002
+      REG_NO_LAZY_FLUSH = 0x0004
+      REG_FORCE_RESTORE = 0x0008
+      
+      MAX_KEY_LENGTH = 514
+      MAX_VALUE_LENGTH = 32768
+    end
+    include Constants
+    include Enumerable
+    
+    #
+    # Error
+    #
+    class Error < ::StandardError
+      FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
+      def initialize(code)
+        @code = code
+        msg = "\0" * 1024
+        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
+        super msg[0, len].tr("\r", '').chomp
+      end
+      attr_reader :code
+    end
+    
+    #
+    # Predefined Keys
+    #
+    class PredefinedKey < Registry
+      def initialize(hkey, keyname)
+        @hkey = hkey
+        @parent = nil
+        @keyname = keyname
+        @disposition = REG_OPENED_EXISTING_KEY
+      end
+      
+      # Predefined keys cannot be closed
+      def close
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+      
+      # Fake class for Registry#open, Registry#create
+      def class
+        Registry
+      end
+      
+      # Make all
+      Constants.constants.grep(/^HKEY_/) do |c|
+        Registry.const_set c, new(Constants.const_get(c), c)
+      end
+    end
+    
+    #
+    # Win32 APIs
+    #
+    module API
+      [
+        %w/RegOpenKeyExA    LPLLP        L/,
+        %w/RegCreateKeyExA  LPLLLLPPP    L/,
+        %w/RegEnumValueA    LLPPPPPP     L/,
+        %w/RegEnumKeyExA    LLPPLLLP     L/,
+        %w/RegQueryValueExA LPLPPP       L/,
+        %w/RegSetValueExA   LPLLPL       L/,
+        %w/RegDeleteValue   LP           L/,
+        %w/RegDeleteKey     LP           L/,
+        %w/RegFlushKey      L            L/,
+        %w/RegCloseKey      L            L/,
+        %w/RegQueryInfoKey  LPPPPPPPPPPP L/,
+      ].each do |fn|
+        const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
+      end
+      
+      module_function
+      
+      def check(result)
+        raise Error, result, caller(2) if result != 0
+      end
+      
+      def packdw(dw)
+        [dw].pack('V')
+      end
+      
+      def unpackdw(dw)
+        dw += [0].pack('V')
+        dw.unpack('V')[0]
+      end
+      
+      def packqw(qw)
+        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
+      end
+      
+      def unpackqw(qw)
+        qw = qw.unpack('VV')
+        (qw[1] << 32) | qw[0]
+      end
+      
+      def OpenKey(hkey, name, opt, desired)
+        result = packdw(0)
+        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
+        unpackdw(result)
+      end
+      
+      def CreateKey(hkey, name, opt, desired)
+        result = packdw(0)
+        disp = packdw(0)
+        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
+                                   0, result, disp)
+        [ unpackdw(result), unpackdw(disp) ]
+      end
+      
+      def EnumValue(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
+        name[0, unpackdw(size)]
+      end
+      
+      def EnumKey(hkey, index)
+        name = ' ' * Constants::MAX_KEY_LENGTH
+        size = packdw(Constants::MAX_KEY_LENGTH)
+        wtime = ' ' * 8
+        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
+        [ name[0, unpackdw(size)], unpackqw(wtime) ]
+      end
+      
+      def QueryValue(hkey, name)
+        type = packdw(0)
+        size = packdw(0)
+        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
+        data = ' ' * unpackdw(size)
+        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
+        [ unpackdw(type), data[0, unpackdw(size)] ]
+      end
+      
+      def SetValue(hkey, name, type, data, size)
+        check RegSetValueExA.call(hkey, name, 0, type, data, size)
+      end
+      
+      def DeleteValue(hkey, name)
+        check RegDeleteValue.call(hkey, name)
+      end
+      
+      def DeleteKey(hkey, name)
+        check RegDeleteKey.call(hkey, name)
+      end
+      
+      def FlushKey(hkey)
+        check RegFlushKey.call(hkey)
+      end
+      
+      def CloseKey(hkey)
+        check RegCloseKey.call(hkey)
+      end
+      
+      def QueryInfoKey(hkey)
+        subkeys = packdw(0)
+        maxsubkeylen = packdw(0)
+        values = packdw(0)
+        maxvaluenamelen = packdw(0)
+        maxvaluelen = packdw(0)
+        secdescs = packdw(0)
+        wtime = ' ' * 8
+        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
+          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
+        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
+          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
+          unpackdw(secdescs), unpackqw(wtime) ]
+      end
+    end
+    
+    #
+    # utility functions
+    #
+    def self.expand_environ(str)
+      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
+    end
+    
+    @@type2name = { }
+    %w[
+      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
+      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
+      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
+      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
+    ].each do |type|
+      @@type2name[Constants.const_get(type)] = type
+    end
+    
+    def self.type2name(type)
+      @@type2name[type] || type.to_s
+    end
+    
+    def self.wtime2time(wtime)
+      Time.at((wtime - 116444736000000000) / 10000000)
+    end
+    
+    def self.time2wtime(time)
+      time.to_i * 10000000 + 116444736000000000
+    end
+    
+    #
+    # constructors
+    #
+    private_class_method :new
+    
+    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
+      subkey = subkey.chomp('\\')
+      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+    
+    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
+      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
+      obj = new(newkey, hkey, subkey, disp)
+      if block_given?
+        begin
+          yield obj
+        ensure
+          obj.close
+        end
+      else
+        obj
+      end
+    end
+    
+    #
+    # finalizer
+    #
+    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
+    
+    #
+    # initialize
+    #
+    def initialize(hkey, parent, keyname, disposition)
+      @hkey = hkey
+      @parent = parent
+      @keyname = keyname
+      @disposition = disposition
+      @hkeyfinal = [ hkey ]
+      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
+    end
+    attr_reader :hkey, :parent, :keyname, :disposition
+    
+    #
+    # attributes
+    #
+    def created?
+      @disposition == REG_CREATED_NEW_KEY
+    end
+    
+    def open?
+      !@hkey.nil?
+    end
+    
+    def name
+      parent = self
+      name = @keyname
+      while parent = parent.parent
+        name = parent.keyname + '\\' + name
+      end
+      name
+    end
+    
+    def inspect
+      "\#<Win32::Registry key=#{name.inspect}>"
+    end
+    
+    #
+    # marshalling
+    #
+    def _dump(depth)
+      raise TypeError, "can't dump Win32::Registry"
+    end
+    
+    #
+    # open/close
+    #
+    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
+      self.class.open(self, subkey, desired, opt, &blk)
+    end
+    
+    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
+      self.class.create(self, subkey, desired, opt, &blk)
+    end
+    
+    def close
+      API.CloseKey(@hkey)
+      @hkey = @parent = @keyname = nil
+      @hkeyfinal[0] = nil
+    end
+    
+    #
+    # iterator
+    #
+    def each_value
+      index = 0
+      while true
+        begin
+          subkey = API.EnumValue(@hkey, index)
+        rescue Error
+          break
+        end
+        begin
+          type, data = read(subkey)
+        rescue Error
+          next
+        end
+        yield subkey, type, data
+        index += 1
+      end
+      index
+    end
+    alias each each_value
+    
+    def each_key
+      index = 0
+      while true
+        begin
+          subkey, wtime = API.EnumKey(@hkey, index)
+        rescue Error
+          break
+        end
+        yield subkey, wtime
+        index += 1
+      end
+      index
+    end
+    
+    def keys
+      keys_ary = []
+      each_key { |key,| keys_ary << key }
+      keys_ary
+    end
+    
+    #
+    # reader
+    #
+    def read(name, *rtype)
+      type, data = API.QueryValue(@hkey, name)
+      unless rtype.empty? or rtype.include?(type)
+        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
+      end
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        [ type, data.chop ]
+      when REG_MULTI_SZ
+        [ type, data.split(/\0/) ]
+      when REG_BINARY
+        [ type, data ]
+      when REG_DWORD
+        [ type, API.unpackdw(data) ]
+      when REG_DWORD_BIG_ENDIAN
+        [ type, data.unpack('N')[0] ]
+      when REG_QWORD
+        [ type, API.unpackqw(data) ]
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+    
+    def [](name, *rtype)
+      type, data = read(name, *rtype)
+      case type
+      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
+        data
+      when REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        raise TypeError, "Type #{type} is not supported."
+      end
+    end
+    
+    def read_s(name)
+      read(name, REG_SZ)[1]
+    end
+    
+    def read_s_expand(name)
+      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
+      if type == REG_EXPAND_SZ
+        Registry.expand_environ(data)
+      else
+        data
+      end
+    end
+    
+    def read_i(name)
+      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
+    end
+    
+    def read_bin(name)
+      read(name, REG_BINARY)[1]
+    end
+    
+    #
+    # writer
+    #
+    def write(name, type, data)
+      case type
+      when REG_SZ, REG_EXPAND_SZ
+        data = data.to_s + "\0"
+      when REG_MULTI_SZ
+        data = data.to_a.join("\0") + "\0\0"
+      when REG_BINARY
+        data = data.to_s
+      when REG_DWORD
+        data = API.packdw(data.to_i)
+      when REG_DWORD_BIG_ENDIAN
+        data = [data.to_i].pack('N')
+      when REG_QWORD
+        data = API.packqw(data.to_i)
+      else
+        raise TypeError, "Unsupported type #{type}"
+      end
+      API.SetValue(@hkey, name, type, data, data.length)
+    end
+    
+    def []=(name, rtype, value = nil)
+      if value
+        write name, rtype, value
+      else
+        case value = rtype
+        when Integer
+          write name, REG_DWORD, value
+        when String
+          write name, REG_SZ, value
+        when Array
+          write name, REG_MULTI_SZ, value
+        else
+          raise TypeError, "Unexpected type #{value.class}"
+        end
+      end
+      value
+    end
+    
+    def write_s(name, value)
+      write name, REG_SZ, value.to_s
+    end
+    
+    def write_i(name, value)
+      write name, REG_DWORD, value.to_i
+    end
+    
+    def write_bin(name, value)
+      write name, REG_BINARY, value.to_s
+    end
+    
+    #
+    # delete
+    #
+    def delete_value(name)
+      API.DeleteValue(@hkey, name)
+    end
+    alias delete delete_value
+    
+    def delete_key(name, recursive = false)
+      if recursive
+        open(name, KEY_ALL_ACCESS) do |reg|
+          reg.keys.each do |key|
+            begin
+              reg.delete_key(key, true)
+            rescue Error
+              #
+            end
+          end
+        end
+        API.DeleteKey(@hkey, name)
+      else
+        begin
+          API.EnumKey @hkey, 0
+        rescue Error
+          return API.DeleteKey(@hkey, name)
+        end
+        raise Error.new(5) ## ERROR_ACCESS_DENIED
+      end
+    end
+    
+    #
+    # flush
+    #
+    def flush
+      API.FlushKey @hkey
+    end
+    
+    #
+    # key information
+    #
+    def info
+      API.QueryInfoKey(@hkey)
+    end
+    %w[
+      num_keys max_key_length
+      num_values max_value_name_length max_value_length
+      descriptor_length wtime
+    ].each_with_index do |s, i|
+      eval <<-__END__
+        def #{s}
+          info[#{i}]
+        end
+      __END__
+    end
+  end
+end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
new file mode 100644
index 0000000000..92336fac28
--- /dev/null
+++ b/ext/Win32API/lib/win32/resolv.rb
@@ -0,0 +1,366 @@
+=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.expand_path('hosts', path)
+      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/Win32API/point.rb b/ext/Win32API/point.rb
new file mode 100644
index 0000000000..60e265f3ee
--- /dev/null
+++ b/ext/Win32API/point.rb
@@ -0,0 +1,18 @@
+require 'Win32API'
+
+getCursorPos = Win32API.new("user32", "GetCursorPos", ['P'], 'V')
+
+lpPoint = " " * 8 # store two LONGs
+getCursorPos.Call(lpPoint)
+x, y = lpPoint.unpack("LL") # get the actual values
+
+print "x: ", x, "\n"
+print "y: ", y, "\n"
+
+ods = Win32API.new("kernel32", "OutputDebugString", ['P'], 'V')
+ods.Call("Hello, World\n");
+
+GetDesktopWindow = Win32API.new("user32", "GetDesktopWindow", [], 'L')
+GetActiveWindow = Win32API.new("user32", "GetActiveWindow", [], 'L')
+SendMessage = Win32API.new("user32", "SendMessage", ['L'] * 4, 'L')
+SendMessage.Call GetDesktopWindow.Call, 274, 0xf140, 0
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/bigdecimal/.cvsignore
+++ b/ext/bigdecimal/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 614032953c..636c0907d6 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,7 @@
  *
  */
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,10 +22,7 @@
 #include <float.h>
 #include <math.h>
 #include "math.h"
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
+#include "version.h"
  
 /* #define ENABLE_NUMERIC_STRING */
 
@@ -42,7 +39,7 @@ VALUE rb_cBigDecimal;
 /*
  * ================== Ruby Interface part ==========================
  */
-#define DoSomeOne(x,y,f) rb_num_coerce_bin(x,y,f)
+#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
 
 #if 0
 /* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
@@ -661,7 +658,7 @@ BigDecimal_add(VALUE self, VALUE r)
     U_LONG mx;
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'+');
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
     if(VpIsNaN(b)) return b->obj;
     if(VpIsNaN(a)) return a->obj;
@@ -700,7 +697,7 @@ BigDecimal_sub(VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'-');
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
 
     if(VpIsNaN(b)) return b->obj;
@@ -729,20 +726,7 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     Real *a, *b;
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) {
-	ID f = 0;
-
-	switch(op)
-	{
-	  case '*': return Qnil; /* any op */
-	  case '=': f = rb_intern("=="); break;
-	  case '!': f = rb_intern("!="); break;
-	  case 'G': f = rb_intern(">="); break;
-	  case 'L': f = rb_intern("<="); break;
-	  case '>': case '<': f = (ID)op; break;
-	}
-	return rb_num_coerce_cmp(self,r,f);
-    }
+    if(!b) return rb_num_coerce_cmp(self,r);
     SAVE(b);
     e = VpComp(a, b);
     if(e==999) return Qnil;
@@ -879,7 +863,7 @@ BigDecimal_mult(VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'*');
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
 
     mx = a->Prec + b->Prec;
@@ -898,7 +882,7 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,'/');
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
     *div = b;
     mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
@@ -959,7 +943,7 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,rb_intern("divmod"));
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
 
     if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
@@ -1032,7 +1016,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
 
     GUARD_OBJ(a,GetVpValue(self,1));
     b = GetVpValue(r,0);
-    if(!b) return DoSomeOne(self,r,rb_intern("remainder"));
+    if(!b) return DoSomeOne(self,r);
     SAVE(b);
 
     mx  =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
@@ -2196,14 +2180,12 @@ VpGetDoubleNegZero(void) /* Returns the value of -0 */
     return nzero;
 }
 
-#if 0  /* unused */
 VP_EXPORT int
 VpIsNegDoubleZero(double v)
 {
     double z = VpGetDoubleNegZero();
     return MemCmp(&v,&z,sizeof(v))==0;
 }
-#endif
 
 VP_EXPORT int
 VpException(unsigned short f, const char *str,int always)
@@ -4175,7 +4157,6 @@ Exit:
 /*
  *  m <- ival
  */
-#if 0  /* unused */
 VP_EXPORT void
 VpItoV(Real *m, S_INT ival)
 {
@@ -4233,7 +4214,6 @@ Exit:
 #endif /* _DEBUG */
     return;
 }
-#endif
 
 /*
  * y = SQRT(x),  y*y - x =>0
@@ -4344,6 +4324,7 @@ Exit:
 
 /*
  *
+ * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
  * nf: digit position for operation.
  *
  */
@@ -4364,22 +4345,15 @@ VpMidRound(Real *y, int f, int nf)
     nf += y->exponent*((int)BASE_FIG);
     exptoadd=0;
     if (nf < 0) {
-		/* rounding position too left(large). */
-		if((f!=VP_ROUND_CEIL) && (f!=VP_ROUND_FLOOR)) {
-			VpSetZero(y,VpGetSign(y)); /* truncate everything */
-			return 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;  /* rounding position too right(small). */
+    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;
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index 3a300f1df5..4f77feab00 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -127,9 +127,7 @@ VP_EXPORT unsigned long VpGetRoundMode(void);
 VP_EXPORT unsigned long VpSetRoundMode(unsigned long n);
 
 VP_EXPORT int VpException(unsigned short f,const char *str,int always);
-#if 0  /* unused */
 VP_EXPORT int VpIsNegDoubleZero(double v);
-#endif
 VP_EXPORT U_LONG VpNumOfChars(Real *vp,const char *pszFmt);
 VP_EXPORT U_LONG VpInit(U_LONG BaseVal);
 VP_EXPORT void *VpMemAlloc(U_LONG mb);
@@ -148,9 +146,7 @@ VP_EXPORT void VpToFString(Real *a,char *psz,int fFmt,int fPlus);
 VP_EXPORT int VpCtoV(Real *a,const char *int_chr,U_LONG ni,const char *frac,U_LONG nf,const 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);
-#if 0  /* unused */
 VP_EXPORT void VpItoV(Real *m,S_INT ival);
-#endif
 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);
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 8c36ad14fc..d80eeab901 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -52,7 +52,7 @@ module Jacobian
       s = f.zero
       deriv = []
       if(nRetry>100) then
-         raise "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
+         raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
       end
       dx = dx*f.two
       x[i] += dx
diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c
deleted file mode 100644
index a1b43b5047..0000000000
--- a/ext/continuation/continuation.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-void Init_Continuation_body(void);
-
-void
-Init_continuation(void)
-{
-    Init_Continuation_body();
-}
diff --git a/ext/continuation/extconf.rb b/ext/continuation/extconf.rb
deleted file mode 100644
index 17e2d056db..0000000000
--- a/ext/continuation/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('continuation')
-
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
deleted file mode 100644
index 802b505032..0000000000
--- a/ext/coverage/coverage.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/************************************************
-
-  coverage.c -
-
-  $Author: $
-
-  Copyright (c) 2008 Yusuke Endoh
-
-************************************************/
-
-#include "ruby.h"
-
-static VALUE rb_mCoverage;
-
-extern VALUE rb_get_coverages(void);
-extern void rb_set_coverages(VALUE);
-extern void rb_reset_coverages(void);
-
-/*
- * call-seq:
- *    Coverage.start  => nil
- *
- * Enables coverage measurement.
- */
-static VALUE
-rb_coverage_start(VALUE klass)
-{
-    if (!RTEST(rb_get_coverages())) {
-	VALUE coverages = rb_hash_new();
-	RBASIC(coverages)->klass = 0;
-	rb_set_coverages(coverages);
-    }
-    return Qnil;
-}
-
-static int
-coverage_result_i(st_data_t key, st_data_t val, st_data_t dummy)
-{
-    VALUE coverage = (VALUE)val;
-    RBASIC(coverage)->klass = rb_cArray;
-    rb_ary_freeze(coverage);
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     Coverage.result  => hash
- *
- * Returns a hash that contains filename as key and coverage array as value
- * and disables coverage measurement.
- */
-static VALUE
-rb_coverage_result(VALUE klass)
-{
-    VALUE coverages = rb_get_coverages();
-    if (!RTEST(coverages)) {
-	rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
-    }
-    RBASIC(coverages)->klass = rb_cHash;
-    st_foreach(RHASH_TBL(coverages), coverage_result_i, 0);
-    rb_hash_freeze(coverages);
-    rb_reset_coverages();
-    return coverages;
-}
-
-/* Coverage provides coverage measurement feature for Ruby.
- * This feature is experimental, so these APIs may be changed in future.
- *
- * = Usage
- *
- * (1) require "coverage.so"
- * (2) do Coverage.start
- * (3) require or load Ruby source file
- * (4) Coverage.result will return a hash that contains filename as key and
- *     coverage array as value.
- *
- * = Example
- *
- *   [foo.rb]
- *   s = 0
- *   10.times do |x|
- *     s += x
- *   end
- *
- *   if s == 45
- *     p :ok
- *   else
- *     p :ng
- *   end
- *   [EOF]
- *
- *   require "coverage.so"
- *   Coverage.start
- *   require "foo.rb"
- *   p Coverage.result  #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
- */
-void
-Init_coverage(void)
-{
-    rb_mCoverage = rb_define_module("Coverage");
-    rb_define_module_function(rb_mCoverage, "start", rb_coverage_start, 0);
-    rb_define_module_function(rb_mCoverage, "result", rb_coverage_result, 0);
-}
diff --git a/ext/coverage/extconf.rb b/ext/coverage/extconf.rb
deleted file mode 100644
index 3ebced54a6..0000000000
--- a/ext/coverage/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('coverage')
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/curses/.cvsignore
+++ b/ext/curses/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 7d4ed87478..9c51a2127f 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -54,8 +54,8 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2CHR
-#define CH2FIX CHR2FIX
+#define NUM2CH NUM2LONG
+#define CH2FIX LONG2FIX
 
 static VALUE mCurses;
 static VALUE mKey;
@@ -72,12 +72,12 @@ struct windata {
 
 #define CHECK(c) c
 
-static VALUE window_attroff(VALUE obj, VALUE attrs);
-static VALUE window_attron(VALUE obj, VALUE attrs);
-static VALUE window_attrset(VALUE obj, VALUE attrs);
+static VALUE window_attroff();
+static VALUE window_attron();
+static VALUE window_attrset();
 
 static void
-no_window(void)
+no_window()
 {
     rb_raise(rb_eRuntimeError, "already closed window");
 }
@@ -90,7 +90,8 @@ no_window(void)
 } while (0)
 
 static void
-free_window(struct windata *winp)
+free_window(winp)
+    struct windata *winp;
 {
     if (winp->window && winp->window != stdscr) delwin(winp->window);
     winp->window = 0;
@@ -98,7 +99,9 @@ free_window(struct windata *winp)
 }
 
 static VALUE
-prep_window(VALUE class, WINDOW *window)
+prep_window(class, window)
+    VALUE class;
+    WINDOW *window;
 {
     VALUE obj;
     struct windata *winp;
@@ -118,7 +121,7 @@ prep_window(VALUE class, WINDOW *window)
 
 /* def init_screen */
 static VALUE
-curses_init_screen(void)
+curses_init_screen()
 {
     rb_secure(4);
     if (rb_stdscr) return rb_stdscr;
@@ -136,7 +139,7 @@ curses_init_screen(void)
 
 /* def close_screen */
 static VALUE
-curses_close_screen(void)
+curses_close_screen()
 {
 #ifdef HAVE_ISENDWIN
     if (!isendwin())
@@ -161,7 +164,7 @@ curses_finalize(VALUE dummy)
 
 /* def closed? */
 static VALUE
-curses_closed(void)
+curses_closed()
 {
 #ifdef HAVE_ISENDWIN
     if (isendwin()) {
@@ -175,7 +178,8 @@ curses_closed(void)
 
 /* def clear */
 static VALUE
-curses_clear(VALUE obj)
+curses_clear(obj)
+    VALUE obj;
 {
     curses_stdscr();
     wclear(stdscr);
@@ -184,7 +188,7 @@ curses_clear(VALUE obj)
 
 /* def clrtoeol */
 static VALUE
-curses_clrtoeol(void)
+curses_clrtoeol()
 {
     curses_stdscr();
     clrtoeol();
@@ -193,7 +197,8 @@ curses_clrtoeol(void)
 
 /* def refresh */
 static VALUE
-curses_refresh(VALUE obj)
+curses_refresh(obj)
+    VALUE obj;
 {
     curses_stdscr();
     refresh();
@@ -202,7 +207,8 @@ curses_refresh(VALUE obj)
 
 /* def doupdate */
 static VALUE
-curses_doupdate(VALUE obj)
+curses_doupdate(obj)
+    VALUE obj;
 {
     curses_stdscr();
 #ifdef HAVE_DOUPDATE
@@ -215,7 +221,8 @@ curses_doupdate(VALUE obj)
 
 /* def echo */
 static VALUE
-curses_echo(VALUE obj)
+curses_echo(obj)
+    VALUE obj;
 {
     curses_stdscr();
     echo();
@@ -224,7 +231,8 @@ curses_echo(VALUE obj)
 
 /* def noecho */
 static VALUE
-curses_noecho(VALUE obj)
+curses_noecho(obj)
+    VALUE obj;
 {
     curses_stdscr();
     noecho();
@@ -233,7 +241,8 @@ curses_noecho(VALUE obj)
 
 /* def raw */
 static VALUE
-curses_raw(VALUE obj)
+curses_raw(obj)
+    VALUE obj;
 {
     curses_stdscr();
     raw();
@@ -242,7 +251,8 @@ curses_raw(VALUE obj)
 
 /* def noraw */
 static VALUE
-curses_noraw(VALUE obj)
+curses_noraw(obj)
+    VALUE obj;
 {
     curses_stdscr();
     noraw();
@@ -251,7 +261,8 @@ curses_noraw(VALUE obj)
 
 /* def cbreak */
 static VALUE
-curses_cbreak(VALUE obj)
+curses_cbreak(obj)
+    VALUE obj;
 {
     curses_stdscr();
     cbreak();
@@ -260,7 +271,8 @@ curses_cbreak(VALUE obj)
 
 /* def nocbreak */
 static VALUE
-curses_nocbreak(VALUE obj)
+curses_nocbreak(obj)
+    VALUE obj;
 {
     curses_stdscr();
     nocbreak();
@@ -269,7 +281,8 @@ curses_nocbreak(VALUE obj)
 
 /* def nl */
 static VALUE
-curses_nl(VALUE obj)
+curses_nl(obj)
+    VALUE obj;
 {
     curses_stdscr();
     nl();
@@ -278,7 +291,8 @@ curses_nl(VALUE obj)
 
 /* def nonl */
 static VALUE
-curses_nonl(VALUE obj)
+curses_nonl(obj)
+    VALUE obj;
 {
     curses_stdscr();
     nonl();
@@ -287,7 +301,8 @@ curses_nonl(VALUE obj)
 
 /* def beep */
 static VALUE
-curses_beep(VALUE obj)
+curses_beep(obj)
+    VALUE obj;
 {
 #ifdef HAVE_BEEP
     curses_stdscr();
@@ -298,7 +313,8 @@ curses_beep(VALUE obj)
 
 /* def flash */
 static VALUE
-curses_flash(VALUE obj)
+curses_flash(obj)
+    VALUE obj;
 {
 #ifdef HAVE_FLASH
     curses_stdscr();
@@ -309,7 +325,9 @@ curses_flash(VALUE obj)
 
 /* def ungetch */
 static VALUE
-curses_ungetch(VALUE obj, VALUE ch)
+curses_ungetch(obj, ch)
+    VALUE obj;
+    VALUE ch;
 {
 #ifdef HAVE_UNGETCH
     curses_stdscr();
@@ -322,7 +340,10 @@ curses_ungetch(VALUE obj, VALUE ch)
 
 /* def setpos(y, x) */
 static VALUE
-curses_setpos(VALUE obj, VALUE y, VALUE x)
+curses_setpos(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
 {
     curses_stdscr();
     move(NUM2INT(y), NUM2INT(x));
@@ -331,7 +352,8 @@ curses_setpos(VALUE obj, VALUE y, VALUE x)
 
 /* def standout */
 static VALUE
-curses_standout(VALUE obj)
+curses_standout(obj)
+    VALUE obj;
 {
     standout();
     return Qnil;
@@ -339,7 +361,8 @@ curses_standout(VALUE obj)
 
 /* def standend */
 static VALUE
-curses_standend(VALUE obj)
+curses_standend(obj)
+    VALUE obj;
 {
     standend();
     return Qnil;
@@ -347,7 +370,8 @@ curses_standend(VALUE obj)
 
 /* def inch */
 static VALUE
-curses_inch(VALUE obj)
+curses_inch(obj)
+    VALUE obj;
 {
     curses_stdscr();
     return CH2FIX(inch());
@@ -355,7 +379,9 @@ curses_inch(VALUE obj)
 
 /* def addch(ch) */
 static VALUE
-curses_addch(VALUE obj, VALUE ch)
+curses_addch(obj, ch)
+    VALUE obj;
+    VALUE ch;
 {
     curses_stdscr();
     addch(NUM2CH(ch));
@@ -364,7 +390,9 @@ curses_addch(VALUE obj, VALUE ch)
 
 /* def insch(ch) */
 static VALUE
-curses_insch(VALUE obj, VALUE ch)
+curses_insch(obj, ch)
+    VALUE obj;
+    VALUE ch;
 {
     curses_stdscr();
     insch(NUM2CH(ch));
@@ -373,7 +401,9 @@ curses_insch(VALUE obj, VALUE ch)
 
 /* def addstr(str) */
 static VALUE
-curses_addstr(VALUE obj, VALUE str)
+curses_addstr(obj, str)
+    VALUE obj;
+    VALUE str;
 {
     curses_stdscr();
     if (!NIL_P(str)) {
@@ -384,7 +414,8 @@ curses_addstr(VALUE obj, VALUE str)
 
 /* def getch */
 static VALUE
-curses_getch(VALUE obj)
+curses_getch(obj)
+    VALUE obj;
 {
     rb_read_check(stdin);
     curses_stdscr();
@@ -393,7 +424,8 @@ curses_getch(VALUE obj)
 
 /* def getstr */
 static VALUE
-curses_getstr(VALUE obj)
+curses_getstr(obj)
+    VALUE obj;
 {
     char rtn[1024]; /* This should be big enough.. I hope */
 
@@ -408,7 +440,8 @@ curses_getstr(VALUE obj)
 
 /* def delch */
 static VALUE
-curses_delch(VALUE obj)
+curses_delch(obj)
+    VALUE obj;
 {
     delch();
     return Qnil;
@@ -416,7 +449,8 @@ curses_delch(VALUE obj)
 
 /* def delelteln */
 static VALUE
-curses_deleteln(VALUE obj)
+curses_deleteln(obj)
+    VALUE obj;
 {
 #if defined(HAVE_DELETELN) || defined(deleteln)
     deleteln();
@@ -426,7 +460,8 @@ curses_deleteln(VALUE obj)
 
 /* def insertln */
 static VALUE
-curses_insertln(VALUE obj)
+curses_insertln(obj)
+    VALUE obj;
 {
 #if defined(HAVE_INSERTLN) || defined(insertln)
     insertln();
@@ -436,7 +471,9 @@ curses_insertln(VALUE obj)
 
 /* def keyname */
 static VALUE
-curses_keyname(VALUE obj, VALUE c)
+curses_keyname(obj, c)
+    VALUE obj;
+    VALUE c;
 {
 #ifdef HAVE_KEYNAME
   const char *name;
@@ -453,13 +490,13 @@ curses_keyname(VALUE obj, VALUE c)
 }
 
 static VALUE
-curses_lines(void)
+curses_lines()
 {
     return INT2FIX(LINES);
 }
 
 static VALUE
-curses_cols(void)
+curses_cols()
 {
     return INT2FIX(COLS);
 }
@@ -619,7 +656,7 @@ struct mousedata {
 };
 
 static void
-no_mevent(void)
+no_mevent()
 {
   rb_raise(rb_eRuntimeError, "no such mouse event");
 }
@@ -635,7 +672,7 @@ static void
 curses_mousedata_free(struct mousedata *mdata)
 {
   if (mdata->mevent)
-    xfree(mdata->mevent);
+    free(mdata->mevent);
 }
 
 static VALUE
@@ -731,7 +768,12 @@ window_s_allocate(VALUE class)
 
 /* def initialize(h, w, top, left) */
 static VALUE
-window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
+window_initialize(obj, h, w, top, left)
+    VALUE obj;
+    VALUE h;
+    VALUE w;
+    VALUE top;
+    VALUE left;
 {
     struct windata *winp;
     WINDOW *window;
@@ -749,7 +791,12 @@ window_initialize(VALUE obj, VALUE h, VALUE w, VALUE top, VALUE left)
 
 /* def subwin(height, width, top, left) */
 static VALUE
-window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
+window_subwin(obj, height, width, top, left)
+    VALUE obj;
+    VALUE height;
+    VALUE width;
+    VALUE top;
+    VALUE left;
 {
     struct windata *winp;
     WINDOW *window;
@@ -769,7 +816,8 @@ window_subwin(VALUE obj, VALUE height, VALUE width, VALUE top, VALUE left)
 
 /* def close */
 static VALUE
-window_close(VALUE obj)
+window_close(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -782,7 +830,8 @@ window_close(VALUE obj)
 
 /* def clear */
 static VALUE
-window_clear(VALUE obj)
+window_clear(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -794,7 +843,8 @@ window_clear(VALUE obj)
 
 /* def clrtoeol */
 static VALUE
-window_clrtoeol(VALUE obj)
+window_clrtoeol(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -806,7 +856,8 @@ window_clrtoeol(VALUE obj)
 
 /* def refresh */
 static VALUE
-window_refresh(VALUE obj)
+window_refresh(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -818,7 +869,8 @@ window_refresh(VALUE obj)
 
 /* def noutrefresh */
 static VALUE
-window_noutrefresh(VALUE obj)
+window_noutrefresh(obj)
+    VALUE obj;
 {
     struct windata *winp;
 
@@ -834,7 +886,10 @@ window_noutrefresh(VALUE obj)
 
 /* def move(y, x) */
 static VALUE
-window_move(VALUE obj, VALUE y, VALUE x)
+window_move(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
 {
     struct windata *winp;
     
@@ -846,7 +901,10 @@ window_move(VALUE obj, VALUE y, VALUE x)
 
 /* def setpos(y, x) */
 static VALUE
-window_setpos(VALUE obj, VALUE y, VALUE x)
+window_setpos(obj, y, x)
+    VALUE obj;
+    VALUE y;
+    VALUE x;
 {
     struct windata *winp;
     
@@ -857,7 +915,8 @@ window_setpos(VALUE obj, VALUE y, VALUE x)
 
 /* def cury */
 static VALUE
-window_cury(VALUE obj)
+window_cury(obj)
+    VALUE obj;
 {
     struct windata *winp;
     int x, y;
@@ -869,7 +928,8 @@ window_cury(VALUE obj)
 
 /* def curx */
 static VALUE
-window_curx(VALUE obj)
+window_curx(obj)
+    VALUE obj;
 {
     struct windata *winp;
     int x, y;
@@ -881,7 +941,8 @@ window_curx(VALUE obj)
 
 /* def maxy */
 static VALUE
-window_maxy(VALUE obj)
+window_maxy(obj)
+    VALUE obj;
 {
     struct windata *winp;
 
@@ -901,7 +962,8 @@ window_maxy(VALUE obj)
 
 /* def maxx */
 static VALUE
-window_maxx(VALUE obj)
+window_maxx(obj)
+    VALUE obj;
 {
     struct windata *winp;
 
@@ -921,7 +983,8 @@ window_maxx(VALUE obj)
 
 /* def begy */
 static VALUE
-window_begy(VALUE obj)
+window_begy(obj)
+    VALUE obj;
 {
     struct windata *winp;
     int x, y;
@@ -937,7 +1000,8 @@ window_begy(VALUE obj)
 
 /* def begx */
 static VALUE
-window_begx(VALUE obj)
+window_begx(obj)
+    VALUE obj;
 {
     struct windata *winp;
     int x, y;
@@ -953,7 +1017,9 @@ window_begx(VALUE obj)
 
 /* def box(vert, hor) */
 static VALUE
-window_box(int argc, VALUE *argv, VALUE self)
+window_box(argc, argv, self)
+    int argc;
+    VALUE argv[], self;
 {
     struct windata *winp; 
     VALUE vert, hor, corn;
@@ -987,7 +1053,8 @@ window_box(int argc, VALUE *argv, VALUE self)
 
 /* def standout */
 static VALUE
-window_standout(VALUE obj)
+window_standout(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -998,7 +1065,8 @@ window_standout(VALUE obj)
 
 /* def standend */
 static VALUE
-window_standend(VALUE obj)
+window_standend(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -1009,7 +1077,8 @@ window_standend(VALUE obj)
 
 /* def inch */
 static VALUE
-window_inch(VALUE obj)
+window_inch(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -1019,7 +1088,9 @@ window_inch(VALUE obj)
 
 /* def addch(ch) */
 static VALUE
-window_addch(VALUE obj, VALUE ch)
+window_addch(obj, ch)
+    VALUE obj;
+    VALUE ch;
 {
     struct windata *winp;
     
@@ -1031,7 +1102,9 @@ window_addch(VALUE obj, VALUE ch)
 
 /* def insch(ch) */
 static VALUE
-window_insch(VALUE obj, VALUE ch)
+window_insch(obj, ch)
+    VALUE obj;
+    VALUE ch;
 {
     struct windata *winp;
     
@@ -1043,7 +1116,9 @@ window_insch(VALUE obj, VALUE ch)
 
 /* def addstr(str) */
 static VALUE
-window_addstr(VALUE obj, VALUE str)
+window_addstr(obj, str)
+    VALUE obj;
+    VALUE str;
 {
     if (!NIL_P(str)) {
 	struct windata *winp;
@@ -1056,7 +1131,9 @@ window_addstr(VALUE obj, VALUE str)
 
 /* def <<(str) */
 static VALUE
-window_addstr2(VALUE obj, VALUE str)
+window_addstr2(obj, str)
+    VALUE obj;
+    VALUE str;
 {
     window_addstr(obj, str);
     return obj;
@@ -1064,7 +1141,8 @@ window_addstr2(VALUE obj, VALUE str)
 
 /* def getch */
 static VALUE
-window_getch(VALUE obj)
+window_getch(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -1075,7 +1153,8 @@ window_getch(VALUE obj)
 
 /* def getstr */
 static VALUE
-window_getstr(VALUE obj)
+window_getstr(obj)
+    VALUE obj;
 {
     struct windata *winp;
     char rtn[1024]; /* This should be big enough.. I hope */
@@ -1092,7 +1171,8 @@ window_getstr(VALUE obj)
 
 /* def delch */
 static VALUE
-window_delch(VALUE obj)
+window_delch(obj)
+    VALUE obj;
 {
     struct windata *winp;
     
@@ -1103,7 +1183,8 @@ window_delch(VALUE obj)
 
 /* def delelteln */
 static VALUE
-window_deleteln(VALUE obj)
+window_deleteln(obj)
+    VALUE obj;
 {
 #if defined(HAVE_WDELETELN) || defined(wdeleteln)
     struct windata *winp;
@@ -1116,7 +1197,8 @@ window_deleteln(VALUE obj)
 
 /* def insertln */
 static VALUE
-window_insertln(VALUE obj)
+window_insertln(obj)
+    VALUE obj;
 {
 #if defined(HAVE_WINSERTLN) || defined(winsertln)
     struct windata *winp;
@@ -1174,7 +1256,7 @@ window_color_set(VALUE obj, VALUE col)
   res = wcolor_set(winp->window, NUM2INT(col), NULL);
   return (res == OK) ? Qtrue : Qfalse;
 }
-#endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */
+#endif /* USE_COLOR */
 
 static VALUE
 window_scroll(VALUE obj)
@@ -1357,7 +1439,7 @@ window_timeout(VALUE obj, VALUE delay)
 
 /*------------------------- Initialization -------------------------*/
 void
-Init_curses(void)
+Init_curses()
 {
     mCurses    = rb_define_module("Curses");
     mKey       = rb_define_module_under(mCurses, "Key");
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 799d1bfe5f..0124bbbf4a 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -5,7 +5,6 @@ dir_config('ncurses')
 dir_config('termcap')
 
 make=false
-headers = []
 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")
@@ -24,7 +23,8 @@ if make
     have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"
-  if try_static_assert("sizeof(char*)>sizeof(int)", %w[stdio.h stdlib.h]+curses , flag)
+  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")
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/dbm/.cvsignore
+++ b/ext/dbm/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 42bd4ff057..0247387fdc 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -3,6 +3,7 @@
   dbm.c -
 
   $Author$
+  $Date$
   created at: Mon Jan 24 15:59:52 JST 1994
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -31,7 +32,7 @@ struct dbmdata {
 };
 
 static void
-closed_dbm(void)
+closed_dbm()
 {
     rb_raise(rb_eDBMError, "closed DBM file");
 }
@@ -48,16 +49,18 @@ closed_dbm(void)
 }
 
 static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(dbmp)
+    struct dbmdata *dbmp;
 {
     if (dbmp) {
 	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
-	xfree(dbmp);
+	free(dbmp);
     }
 }
 
 static VALUE
-fdbm_close(VALUE obj)
+fdbm_close(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -69,7 +72,8 @@ fdbm_close(VALUE obj)
 }
 
 static VALUE
-fdbm_closed(VALUE obj)
+fdbm_closed(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -82,14 +86,19 @@ fdbm_closed(VALUE obj)
     return Qfalse;
 }
 
+static VALUE fdbm_alloc _((VALUE));
 static VALUE
-fdbm_alloc(VALUE klass)
+fdbm_alloc(klass)
+    VALUE klass;
 {
     return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
 
 static VALUE
-fdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE file, vmode, vflags;
     DBM *dbm;
@@ -113,24 +122,24 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 
     if (flags & RUBY_DBM_RW_BIT) {
         flags &= ~RUBY_DBM_RW_BIT;
-        dbm = dbm_open(RSTRING_PTR(file), flags, mode);
+        dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
     }
     else {
         dbm = 0;
         if (mode >= 0) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDWR, 0);
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
         }
         if (!dbm) {
-            dbm = dbm_open(RSTRING_PTR(file), O_RDONLY, 0);
+            dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
         }
     }
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING_PTR(file));
+	rb_sys_fail(RSTRING(file)->ptr);
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -142,7 +151,10 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
@@ -158,15 +170,16 @@ fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 static VALUE
-fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     value = dbm_fetch(dbm, key);
@@ -179,13 +192,17 @@ fdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
 }
 
 static VALUE
-fdbm_aref(VALUE obj, VALUE keystr)
+fdbm_aref(obj, keystr)
+    VALUE obj, keystr;
 {
     return fdbm_fetch(obj, keystr, Qnil);
 }
 
 static VALUE
-fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE keystr, valstr, ifnone;
 
@@ -198,21 +215,22 @@ fdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-fdbm_index(VALUE obj, VALUE valstr)
+fdbm_index(obj, valstr)
+    VALUE obj, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if (val.dsize == RSTRING_LEN(valstr) &&
-	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0) {
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0) {
 	    return rb_tainted_str_new(key.dptr, key.dsize);
 	}
     }
@@ -220,31 +238,68 @@ fdbm_index(VALUE obj, VALUE valstr)
 }
 
 static VALUE
-fdbm_select(VALUE obj)
+fdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
-    VALUE new = rb_ary_new();
-    datum key, val;
-    DBM *dbm;
-    struct dbmdata *dbmp;
+    VALUE new;
+    int i;
 
-    GetDBM2(obj, dbmp, dbm);
-    for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-	VALUE assoc, v;
-	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);
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static VALUE
+fdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    if (rb_block_given_p()) {
+        datum key, val;
+        DBM *dbm;
+        struct dbmdata *dbmp;
+
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-	GetDBM2(obj, dbmp, dbm);
+        GetDBM2(obj, dbmp, dbm);
+        for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
+            VALUE assoc, v;
+            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);
+	}
+    }
+    else {
+	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+        }
     }
 
     return new;
 }
 
 static VALUE
-fdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -257,14 +312,16 @@ fdbm_values_at(int argc, VALUE *argv, VALUE obj)
 }
 
 static void
-fdbm_modify(VALUE obj)
+fdbm_modify(obj)
+    VALUE obj;
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
 }
 
 static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
+fdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, value;
     struct dbmdata *dbmp;
@@ -273,11 +330,10 @@ fdbm_delete(VALUE obj, VALUE keystr)
 
     fdbm_modify(obj);
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
-
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (rb_block_given_p()) return rb_yield(keystr);
@@ -298,7 +354,8 @@ fdbm_delete(VALUE obj, VALUE keystr)
 }
 
 static VALUE
-fdbm_shift(VALUE obj)
+fdbm_shift(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -320,7 +377,8 @@ fdbm_shift(VALUE obj)
 }
 
 static VALUE
-fdbm_delete_if(VALUE obj)
+fdbm_delete_if(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -344,23 +402,24 @@ fdbm_delete_if(VALUE obj)
 	GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	keystr = RARRAY(ary)->ptr[i];
 	StringValue(keystr);
-	key.dptr = RSTRING_PTR(keystr);
-	key.dsize = RSTRING_LEN(keystr);
+	key.dptr = RSTRING(keystr)->ptr;
+	key.dsize = RSTRING(keystr)->len;
 	if (dbm_delete(dbm, key)) {
 	    rb_raise(rb_eDBMError, "dbm_delete failed");
 	}
     }
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
 
     return obj;
 }
 
 static VALUE
-fdbm_clear(VALUE obj)
+fdbm_clear(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -380,7 +439,8 @@ fdbm_clear(VALUE obj)
 }
 
 static VALUE
-fdbm_invert(VALUE obj)
+fdbm_invert(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -398,36 +458,49 @@ fdbm_invert(VALUE obj)
     return hash;
 }
 
-static VALUE fdbm_store(VALUE,VALUE,VALUE);
+static VALUE each_pair _((VALUE));
 
 static VALUE
-update_i(VALUE pair, VALUE dbm)
+each_pair(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+    VALUE pair, dbm;
 {
     Check_Type(pair, T_ARRAY);
-    if (RARRAY_LEN(pair) < 2) {
+    if (RARRAY(pair)->len < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    fdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
     return Qnil;
 }
 
 static VALUE
-fdbm_update(VALUE obj, VALUE other)
+fdbm_update(obj, other)
+    VALUE obj, other;
 {
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    rb_iterate(each_pair, other, update_i, obj);
     return obj;
 }
 
 static VALUE
-fdbm_replace(VALUE obj, VALUE other)
+fdbm_replace(obj, other)
+    VALUE obj, other;
 {
     fdbm_clear(obj);
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    rb_iterate(each_pair, other, update_i, obj);
     return obj;
 }
 
 static VALUE
-fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+fdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -437,11 +510,11 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     keystr = rb_obj_as_string(keystr);
     valstr = rb_obj_as_string(valstr);
 
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -457,7 +530,8 @@ fdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 }
 
 static VALUE
-fdbm_length(VALUE obj)
+fdbm_length(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -476,7 +550,8 @@ fdbm_length(VALUE obj)
 }
 
 static VALUE
-fdbm_empty_p(VALUE obj)
+fdbm_empty_p(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -499,14 +574,13 @@ fdbm_empty_p(VALUE obj)
 }
 
 static VALUE
-fdbm_each_value(VALUE obj)
+fdbm_each_value(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -517,14 +591,13 @@ fdbm_each_value(VALUE obj)
 }
 
 static VALUE
-fdbm_each_key(VALUE obj)
+fdbm_each_key(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
@@ -534,15 +607,14 @@ fdbm_each_key(VALUE obj)
 }
 
 static VALUE
-fdbm_each_pair(VALUE obj)
+fdbm_each_pair(obj)
+    VALUE obj;
 {
     datum key, val;
     DBM *dbm;
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -557,7 +629,8 @@ fdbm_each_pair(VALUE obj)
 }
 
 static VALUE
-fdbm_keys(VALUE obj)
+fdbm_keys(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -575,7 +648,8 @@ fdbm_keys(VALUE obj)
 }
 
 static VALUE
-fdbm_values(VALUE obj)
+fdbm_values(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -593,15 +667,16 @@ fdbm_values(VALUE obj)
 }
 
 static VALUE
-fdbm_has_key(VALUE obj, VALUE keystr)
+fdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     val = dbm_fetch(dbm, key);
@@ -610,28 +685,30 @@ fdbm_has_key(VALUE obj, VALUE keystr)
 }
 
 static VALUE
-fdbm_has_value(VALUE obj, VALUE valstr)
+fdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
-	if (val.dsize == RSTRING_LEN(valstr) &&
-	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
 	    return Qtrue;
     }
     return Qfalse;
 }
 
 static VALUE
-fdbm_to_a(VALUE obj)
+fdbm_to_a(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -650,7 +727,8 @@ fdbm_to_a(VALUE obj)
 }
 
 static VALUE
-fdbm_to_hash(VALUE obj)
+fdbm_to_hash(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -669,13 +747,14 @@ fdbm_to_hash(VALUE obj)
 }
 
 static VALUE
-fdbm_reject(VALUE obj)
+fdbm_reject(obj)
+    VALUE obj;
 {
     return rb_hash_delete_if(fdbm_to_hash(obj));
 }
 
 void
-Init_dbm(void)
+Init_dbm()
 {
     rb_cDBM = rb_define_class("DBM", rb_cObject);
     rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
@@ -692,7 +771,9 @@ Init_dbm(void)
     rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
     rb_define_method(rb_cDBM, "store", fdbm_store, 2);
     rb_define_method(rb_cDBM, "index",  fdbm_index, 1);
-    rb_define_method(rb_cDBM, "select",  fdbm_select, 0);
+    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);
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 4d12264063..0074ab605b 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -36,7 +36,7 @@ def headers.db_check(db)
   db_prefix ||= ""
 
   if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
-      hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)}
+      hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
     have_func(db_prefix+"dbm_clearerr") unless have_gdbm
     $defs << hsearch if hsearch
     $defs << '-DDBM_HDR="<'+hdr+'>"'
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/.cvsignore
+++ b/ext/digest/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/bubblebabble/.cvsignore
+++ b/ext/digest/bubblebabble/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index 77a134f364..b9a3470e65 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -16,4 +16,18 @@
 # define __END_DECLS
 #endif
 
+#if defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#elif !defined __CYGWIN__ || !defined __uint8_t_defined
+  typedef unsigned char uint8_t;
+  typedef unsigned int  uint32_t;
+# if SIZEOF_LONG == 8
+  typedef unsigned long uint64_t;
+# elif SIZEOF_LONG_LONG == 8
+  typedef unsigned LONG_LONG uint64_t;
+# else
+#  define NO_UINT64_T
+# endif
+#endif
+
 #endif /* DEFS_H */
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index c3e9546ab4..0b910e8c47 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -266,7 +266,7 @@ rb_digest_instance_inspect(VALUE self)
 {
     VALUE str;
     size_t digest_len = 32;	/* about this size at least */
-    const char *cname;
+    char *cname;
 
     cname = rb_obj_classname(self);
 
@@ -426,7 +426,7 @@ get_digest_base_metadata(VALUE klass)
     VALUE obj;
     rb_digest_metadata_t *algo;
 
-    for (p = klass; p; p = RCLASS_SUPER(p)) {
+    for (p = klass; p; p = RCLASS(p)->super) {
         if (rb_ivar_defined(p, id_metadata)) {
             obj = rb_ivar_get(p, id_metadata);
             break;
@@ -469,7 +469,7 @@ rb_digest_base_alloc(VALUE klass)
     pctx = xmalloc(algo->ctx_size);
     algo->init_func(pctx);
 
-    obj = Data_Wrap_Struct(klass, 0, xfree, pctx);
+    obj = Data_Wrap_Struct(klass, 0, free, pctx);
 
     return obj;
 }
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index a20ca8d68f..cf9127ecc0 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $INSTALLFILES = {
-  "digest.h" => "$(HDRDIR)"
+  "digest.h" => "$(RUBYARCHDIR)"
 }
 
 create_makefile("digest")
diff --git a/ext/digest/lib/digest/hmac.rb b/ext/digest/lib/digest/hmac.rb
deleted file mode 100644
index 0e3068b0c0..0000000000
--- a/ext/digest/lib/digest/hmac.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-# = digest/hmac.rb
-#
-# An implementation of HMAC keyed-hashing algorithm
-#
-# == Overview 
-# 
-# This library adds a method named hmac() to Digest classes, which
-# creates a Digest class for calculating HMAC digests.
-#
-# == Examples
-#
-#   require 'digest/hmac'
-#
-#   # one-liner example
-#   puts Digest::HMAC.hexdigest("data", "hash key", Digest::SHA1)
-#
-#   # rather longer one
-#   hmac = Digest::HMAC.new("foo", Digest::RMD160)
-#
-#   buf = ""
-#   while stream.read(16384, buf)
-#     hmac.update(buf)
-#   end
-#
-#   puts hmac.bubblebabble
-#
-# == License
-#
-# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
-#
-# Documentation by Akinori MUSHA
-#
-# All rights reserved.  You can redistribute and/or modify it under
-# the same terms as Ruby.
-#
-#   $Id$
-#
-
-require 'digest'
-
-module Digest
-  class HMAC < Digest::Class
-    def initialize(key, digester)
-      @md = digester.new
-
-      block_len = @md.block_length
-
-      if key.bytesize > block_len
-        key = @md.digest(key)
-      end
-
-      ipad = Array.new(block_len).fill(0x36)
-      opad = Array.new(block_len).fill(0x5c)
-
-      key.bytes.each_with_index { |c, i|
-        ipad[i] ^= c
-        opad[i] ^= c
-      }
-
-      @key = key.freeze
-      @ipad = ipad.inject('') { |s, c| s << c.chr }.freeze
-      @opad = opad.inject('') { |s, c| s << c.chr }.freeze
-      @md.update(@ipad)
-    end
-
-    def initialize_copy(other)
-      @md = other.instance_eval { @md.clone }
-    end
-
-    def update(text)
-      @md.update(text)
-      self
-    end
-    alias << update
-
-    def reset
-      @md.reset
-      @md.update(@ipad)
-      self
-    end
-
-    def finish
-      d = @md.digest!
-      @md.update(@opad)
-      @md.update(d)
-      @md.digest!
-    end
-    private :finish
-
-    def digest_length
-      @md.digest_length
-    end
-
-    def block_length
-      @md.block_length
-    end
-
-    def inspect
-      sprintf('#<%s: key=%s, digest=%s>', self.class.name, @key.inspect, @md.inspect.sub(/^\#<(.*)>$/) { $1 });
-    end
-  end
-end
-
-if $0 == __FILE__
-  eval DATA.read, nil, $0, __LINE__+4
-end
-
-__END__
-
-require 'test/unit'
-
-module TM_HMAC
-  def test_s_hexdigest
-    cases.each { |h|
-      digesters.each { |d|
-        assert_equal(h[:hexdigest], Digest::HMAC.hexdigest(h[:data], h[:key], d))
-      }
-    }
-  end
-
-  def test_hexdigest
-    cases.each { |h|
-      digesters.each { |d|
-        hmac = Digest::HMAC.new(h[:key], d)
-
-        hmac.update(h[:data])
-
-        assert_equal(h[:hexdigest], hmac.hexdigest)
-      }
-    }
-  end
-
-  def test_reset
-    cases.each { |h|
-      digesters.each { |d|
-        hmac = Digest::HMAC.new(h[:key], d)
-        hmac.update("test")
-        hmac.reset
-        hmac.update(h[:data])
-
-        assert_equal(h[:hexdigest], hmac.hexdigest)
-      }
-    }
-  end
-end  
-
-class TC_HMAC_MD5 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::MD5, Digest::MD5.new]
-  end
-
-  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 16,
-       :data		=> "Hi There",
-       :hexdigest	=> "9294727a3638bb1c13f48ef8158bfc9d",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "750c783e6ab0b503eaa86e310a5db738",
-     }, {
-       :key		=> "\xaa" * 16,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "56be34521d144c88dbb8c733f0e8b3f6",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "697eaf0aca3a3aea3a75164746ffaa79",
-     }, {
-       :key		=> "\x0c" * 16,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "56461ef2342edc00f9bab995690efd4c",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "6f630fad67cda0ee1fb1f562db3aa53e",
-     }
-    ]
-  end
-end
-
-class TC_HMAC_SHA1 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::SHA1, Digest::SHA1.new]
-  end
-
-  # Taken from RFC 2202: Test Cases for HMAC-MD5 and HMAC-SHA-1
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 20,
-       :data		=> "Hi There",
-       :hexdigest	=> "b617318655057264e28bc0b6fb378c8ef146be00",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
-     }, {
-       :key		=> "\xaa" * 20,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
-     }, {
-       :key		=> "\x0c" * 20,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "aa4ae5e15272d00e95705637ce8a3b55ed402112",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
-     }
-    ]
-  end
-end
-
-class TC_HMAC_RMD160 < Test::Unit::TestCase
-  include TM_HMAC
-
-  def digesters
-    [Digest::RMD160, Digest::RMD160.new]
-  end
-
-  # Taken from RFC 2286: Test Cases for HMAC-RIPEMD160 and HMAC-RIPEMD128
-  def cases
-    [
-     {
-       :key		=> "\x0b" * 20,
-       :data		=> "Hi There",
-       :hexdigest	=> "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
-     }, {
-       :key		=> "Jefe",
-       :data		=> "what do ya want for nothing?",
-       :hexdigest	=> "dda6c0213a485a9e24f4742064a7f033b43c4069",
-     }, {
-       :key		=> "\xaa" * 20,
-       :data		=> "\xdd" * 50,
-       :hexdigest	=> "b0b105360de759960ab4f35298e116e295d8e7c1",
-     }, {
-       :key		=> "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19",
-       :data		=> "\xcd" * 50,
-       :hexdigest	=> "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
-     }, {
-       :key		=> "\x0c" * 20,
-       :data		=> "Test With Truncation",
-       :hexdigest	=> "7619693978f91d90539ae786500ff3d8e0518e39",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key - Hash Key First",
-       :hexdigest	=> "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
-     }, {
-       :key		=> "\xaa" * 80,
-       :data		=> "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-       :hexdigest	=> "69ea60798d71616cce5fd0871e23754cd75d5a0a",
-     }
-    ]
-  end
-end
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
new file mode 100644
index 0000000000..c399f2de1d
--- /dev/null
+++ b/ext/digest/lib/md5.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "md5" is obsoleted
+#
+# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/md5'
+
+class MD5 < Digest::MD5
+  class << self
+    alias orig_new new
+    def new(str = nil)
+      if str
+        orig_new.update(str)
+      else
+        orig_new
+      end
+    end
+
+    def md5(*args)
+      new(*args)
+    end
+  end
+end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
new file mode 100644
index 0000000000..4446e12e8d
--- /dev/null
+++ b/ext/digest/lib/sha1.rb
@@ -0,0 +1,23 @@
+# just for compatibility; requiring "sha1" is obsoleted
+#
+# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
+# $Id$
+
+require 'digest/sha1'
+
+class SHA1 < Digest::SHA1
+  class << self
+    alias orig_new new
+    def new(str = nil)
+      if str
+        orig_new.update(str)
+      else
+        orig_new
+      end
+    end
+
+    def sha1(*args)
+      new(*args)
+    end
+  end
+end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/md5/.cvsignore
+++ b/ext/digest/md5/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/rmd160/.cvsignore
+++ b/ext/digest/rmd160/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/sha1/.cvsignore
+++ b/ext/digest/sha1/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/digest/sha2/.cvsignore
+++ b/ext/digest/sha2/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
index 6c0b25a1c5..6d884b6cec 100644
--- a/ext/dl/.cvsignore
+++ b/ext/dl/.cvsignore
@@ -2,9 +2,7 @@ Makefile
 mkmf.log
 dlconfig.h
 dlconfig.rb
-callback.h
 *.func
 *.o
 *~
 *.def
-extconf.h
diff --git a/ext/dl/cfunc.c b/ext/dl/cfunc.c
deleted file mode 100644
index 22e8600002..0000000000
--- a/ext/dl/cfunc.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <errno.h>
-#include "dl.h"
-
-VALUE rb_cDLCFunc;
-
-static ID id_last_error;
-
-static VALUE
-rb_dl_get_last_error(VALUE self)
-{
-    return rb_thread_local_aref(rb_thread_current(), id_last_error);
-}
-
-static VALUE
-rb_dl_set_last_error(VALUE self, VALUE val)
-{
-    rb_thread_local_aset(rb_thread_current(), id_last_error, val);
-    return Qnil;
-}
-
-#if defined(HAVE_WINDOWS_H)
-#include <windows.h>
-static ID id_win32_last_error;
-
-static VALUE
-rb_dl_get_win32_last_error(VALUE self)
-{
-    return rb_thread_local_aref(rb_thread_current(), id_win32_last_error);
-}
-
-static VALUE
-rb_dl_set_win32_last_error(VALUE self, VALUE val)
-{
-    rb_thread_local_aset(rb_thread_current(), id_win32_last_error, val);
-    return Qnil;
-}
-#endif
-
-
-void
-dlcfunc_free(struct cfunc_data *data)
-{
-  if( data->name ){
-      xfree(data->name);
-  }
-  xfree(data);
-}
-
-VALUE
-rb_dlcfunc_new(void (*func)(), int type, const char *name, ID calltype)
-{
-  VALUE val;
-  struct cfunc_data *data;
-
-  rb_secure(4);
-  if( func ){
-    val = Data_Make_Struct(rb_cDLCFunc, struct cfunc_data, 0, dlcfunc_free, data);
-    data->ptr  = func;
-    data->name = name ? strdup(name) : NULL;
-    data->type = type;
-    data->calltype = calltype;
-  }
-  else{
-    val = Qnil;
-  }
-
-  return val;
-}
-
-void *
-rb_dlcfunc2ptr(VALUE val)
-{
-  struct cfunc_data *data;
-  void * func;
-
-  if( rb_obj_is_kind_of(val, rb_cDLCFunc) ){
-    Data_Get_Struct(val, struct cfunc_data, data);
-    func = data->ptr;
-  }
-  else if( val == Qnil ){
-    func = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::CFunc was expected");
-  }
-
-  return func;
-}
-
-VALUE
-rb_dlcfunc_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct cfunc_data *data;
-
-  obj = Data_Make_Struct(klass, struct cfunc_data, 0, dlcfunc_free, data);
-  data->ptr  = 0;
-  data->name = 0;
-  data->type = 0;
-  data->calltype = CFUNC_CDECL;
-
-  return obj;
-}
-
-VALUE
-rb_dlcfunc_initialize(int argc, VALUE argv[], VALUE self)
-{
-    VALUE addr, name, type, calltype;
-    struct cfunc_data *data;
-    void *saddr;
-    const char *sname;
-    
-    rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
-    
-    saddr = (void*)(NUM2PTR(rb_Integer(addr)));
-    sname = NIL_P(name) ? NULL : StringValuePtr(name);
-    
-    Data_Get_Struct(self, struct cfunc_data, data);
-    if( data->name ) xfree(data->name);
-    data->ptr  = saddr;
-    data->name = sname ? strdup(sname) : 0;
-    data->type = (type == Qnil) ? DLTYPE_VOID : NUM2INT(type);
-    data->calltype = (calltype == Qnil) ? CFUNC_CDECL : SYM2ID(calltype);
-
-    return Qnil;
-}
-
-VALUE
-rb_dlcfunc_name(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    return cfunc->name ? rb_tainted_str_new2(cfunc->name) : Qnil;
-}
-
-VALUE
-rb_dlcfunc_ctype(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    return INT2NUM(cfunc->type);
-}
-
-VALUE
-rb_dlcfunc_set_ctype(VALUE self, VALUE ctype)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    cfunc->type = NUM2INT(ctype);
-    return ctype;
-}
-
-VALUE
-rb_dlcfunc_calltype(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    return ID2SYM(cfunc->calltype);
-}
-
-VALUE
-rb_dlcfunc_set_calltype(VALUE self, VALUE sym)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    cfunc->calltype = SYM2ID(sym);
-    return sym;
-}
-
-
-VALUE
-rb_dlcfunc_ptr(VALUE self)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    return PTR2NUM(cfunc->ptr);
-}
-
-VALUE
-rb_dlcfunc_set_ptr(VALUE self, VALUE addr)
-{
-    struct cfunc_data *cfunc;
-
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    cfunc->ptr = NUM2PTR(addr);
-
-    return Qnil;
-}
-
-VALUE
-rb_dlcfunc_inspect(VALUE self)
-{
-    VALUE val;
-    char  *str;
-    int str_size;
-    struct cfunc_data *cfunc;
-    
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-    
-    str_size = (cfunc->name ? strlen(cfunc->name) : 0) + 100;
-    str = ruby_xmalloc(str_size);
-    snprintf(str, str_size - 1,
-	     "#<DL::CFunc:%p ptr=%p type=%d name='%s'>",
-	     cfunc,
-	     cfunc->ptr,
-	     cfunc->type,
-	     cfunc->name ? cfunc->name : "");
-    val = rb_tainted_str_new2(str);
-    ruby_xfree(str);
-
-    return val;
-}
-
-
-# define DECL_FUNC_CDECL(f,ret,args)  ret (FUNC_CDECL(*f))(args)
-# define DECL_FUNC_STDCALL(f,ret,args)  ret (FUNC_STDCALL(*f))(args)
-
-#define CALL_CASE switch( RARRAY_LEN(ary) ){ \
-  CASE(0); break; \
-  CASE(1); break; CASE(2); break; CASE(3); break; CASE(4); break; CASE(5); break; \
-  CASE(6); break; CASE(7); break; CASE(8); break; CASE(9); break; CASE(10);break; \
-  CASE(11);break; CASE(12);break; CASE(13);break; CASE(14);break; CASE(15);break; \
-  CASE(16);break; CASE(17);break; CASE(18);break; CASE(19);break; CASE(20);break; \
-  default: rb_raise(rb_eArgError, "too many arguments"); \
-}
-
-
-VALUE
-rb_dlcfunc_call(VALUE self, VALUE ary)
-{
-    struct cfunc_data *cfunc;
-    int i;
-    DLSTACK_TYPE stack[DLSTACK_SIZE];
-    VALUE result = Qnil;
-
-    rb_secure_update(self);
-
-    memset(stack, 0, sizeof(DLSTACK_TYPE) * DLSTACK_SIZE);
-    Check_Type(ary, T_ARRAY);
-    
-    Data_Get_Struct(self, struct cfunc_data, cfunc);
-
-    if( cfunc->ptr == 0 ){
-	rb_raise(rb_eDLError, "can't call null-function");
-	return Qnil;
-    }
-    
-    for( i = 0; i < RARRAY_LEN(ary); i++ ){
-	if( i >= DLSTACK_SIZE ){
-	    rb_raise(rb_eDLError, "too many arguments (stack overflow)");
-	}
-	stack[i] = NUM2LONG(RARRAY_PTR(ary)[i]);
-    }
-    
-    /* calltype == CFUNC_CDECL */
-    if( cfunc->calltype == CFUNC_CDECL ){
-	switch( cfunc->type ){
-	case DLTYPE_VOID:
-#define CASE(n) case n: { \
-            DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    f(DLSTACK_ARGS##n(stack)); \
-	    result = Qnil; \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    void * ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = PTR2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_CHAR:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    char ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = CHR2FIX(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_SHORT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    short ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM((int)ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_INT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    int ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    long ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LONG2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#if HAVE_LONG_LONG  /* used in ruby.h */
-	case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO) = cfunc->ptr; \
-	    LONG_LONG ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = LL2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#endif
-	case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,float,DLSTACK_PROTO) = cfunc->ptr; \
-	    float ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
-	    DECL_FUNC_CDECL(f,double,DLSTACK_PROTO) = cfunc->ptr; \
-	    double ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	default:
-	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
-	}
-    }
-    else if( cfunc->calltype == CFUNC_STDCALL ){
-	/* calltype == CFUNC_STDCALL */
-	switch( cfunc->type ){
-	case DLTYPE_VOID:
-#define CASE(n) case n: { \
-            DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    f(DLSTACK_ARGS##n(stack)); \
-	    result = Qnil; \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_VOIDP:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    void * ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = PTR2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_CHAR:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    char ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = CHR2FIX(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_SHORT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    short ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM((int)ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_INT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    int ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = INT2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \
-	    long ret; \
-	    ret = f(DLSTACK_ARGS##n(stack)); \
-	    result = LONG2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#if HAVE_LONG_LONG  /* used in ruby.h */
-	case DLTYPE_LONG_LONG:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO) = cfunc->ptr; \
-	    LONG_LONG ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = LL2NUM(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-#endif
-	case DLTYPE_FLOAT:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO) = cfunc->ptr; \
-	    float ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	case DLTYPE_DOUBLE:
-#define CASE(n) case n: { \
-	    DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO) = cfunc->ptr; \
-	    double ret; \
-	    ret = f(DLSTACK_ARGS(stack)); \
-	    result = rb_float_new(ret); \
-}
-	    CALL_CASE;
-#undef CASE
-	    break;
-	default:
-	    rb_raise(rb_eDLTypeError, "unknown type %d", cfunc->type);
-	}
-    }
-    else{
-	rb_raise(rb_eDLError,
-#ifndef LONG_LONG_VALUE
-		 "unsupported call type: %lx",
-#else
-		 "unsupported call type: %llx",
-#endif
-		 cfunc->calltype);
-    }
-
-    rb_dl_set_last_error(self, INT2NUM(errno));
-#if defined(HAVE_WINDOWS_H)
-    rb_dl_set_win32_last_error(self, INT2NUM(GetLastError()));
-#endif
-
-    return result;
-}
-
-VALUE
-rb_dlcfunc_to_i(VALUE self)
-{
-  struct cfunc_data *cfunc;
-
-  Data_Get_Struct(self, struct cfunc_data, cfunc);
-  return PTR2NUM(cfunc->ptr);
-}
-
-void
-Init_dlcfunc()
-{
-    id_last_error = rb_intern("__DL2_LAST_ERROR__");
-#if defined(HAVE_WINDOWS_H)
-    id_win32_last_error = rb_intern("__DL2_WIN32_LAST_ERROR__");
-#endif
-    rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
-    rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
-    rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
-#if defined(HAVE_WINDOWS_H)
-    rb_define_module_function(rb_cDLCFunc, "win32_last_error", rb_dl_get_win32_last_error, 0);
-#endif
-    rb_define_method(rb_cDLCFunc, "initialize", rb_dlcfunc_initialize, -1);
-    rb_define_method(rb_cDLCFunc, "call", rb_dlcfunc_call, 1);
-    rb_define_method(rb_cDLCFunc, "[]",   rb_dlcfunc_call, 1);
-    rb_define_method(rb_cDLCFunc, "name", rb_dlcfunc_name, 0);
-    rb_define_method(rb_cDLCFunc, "ctype", rb_dlcfunc_ctype, 0);
-    rb_define_method(rb_cDLCFunc, "ctype=", rb_dlcfunc_set_ctype, 1);
-    rb_define_method(rb_cDLCFunc, "calltype", rb_dlcfunc_calltype, 0);
-    rb_define_method(rb_cDLCFunc, "calltype=", rb_dlcfunc_set_calltype, 1);
-    rb_define_method(rb_cDLCFunc, "ptr",  rb_dlcfunc_ptr, 0);
-    rb_define_method(rb_cDLCFunc, "ptr=", rb_dlcfunc_set_ptr, 1);
-    rb_define_method(rb_cDLCFunc, "inspect", rb_dlcfunc_inspect, 0);
-    rb_define_method(rb_cDLCFunc, "to_s", rb_dlcfunc_inspect, 0);
-    rb_define_method(rb_cDLCFunc, "to_i", rb_dlcfunc_to_i, 0);
-}
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
deleted file mode 100644
index aeb1852b48..0000000000
--- a/ext/dl/cptr.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby/ruby.h>
-#include <ruby/io.h>
-#include <ctype.h>
-#include "dl.h"
-
-VALUE rb_cDLCPtr;
-
-static ID id_to_ptr;
-
-static void
-dlptr_free(struct ptr_data *data)
-{
-  if (data->ptr) {
-      if (data->free) {
-	  (*(data->free))(data->ptr);
-      }
-  }
-}
-
-static void
-dlptr_mark(struct ptr_data *data)
-{
-}
-
-void
-dlptr_init(VALUE val)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(val, struct ptr_data, data);
-  OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
-  struct ptr_data *data;
-  VALUE val;
-
-  rb_secure(4);
-  val = Data_Make_Struct(klass, struct ptr_data,
-			 0, dlptr_free, data);
-  data->ptr = ptr;
-  data->free = func;
-  data->size = size;
-  dlptr_init(val);
-
-  return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
-  return rb_dlptr_new2(rb_cDLCPtr, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
-  void *ptr;
-
-  rb_secure(4);
-  ptr = ruby_xmalloc((size_t)size);
-  memset(ptr,0,(size_t)size);
-  return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
-  struct ptr_data *data;
-  void *ptr;
-
-  if (rb_obj_is_kind_of(val, rb_cDLCPtr)) {
-    Data_Get_Struct(val, struct ptr_data, data);
-    ptr = data->ptr;
-  }
-  else if (val == Qnil) {
-    ptr = NULL;
-  }
-  else{
-    rb_raise(rb_eTypeError, "DL::PtrData was expected");
-  }
-    
-  return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
-  VALUE obj;
-  struct ptr_data *data;
-
-  rb_secure(4);
-  obj = Data_Make_Struct(klass, struct ptr_data, dlptr_mark, dlptr_free, data);
-  data->ptr = 0;
-  data->size = 0;
-  data->free = 0;
-
-  return obj;
-}
-
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
-  VALUE ptr, sym, size;
-  struct ptr_data *data;
-  void *p = NULL;
-  freefunc_t f = NULL;
-  long s = 0;
-
-  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
-  case 1:
-    p = (void*)(NUM2PTR(rb_Integer(ptr)));
-    break;
-  case 2:
-    p = (void*)(NUM2PTR(rb_Integer(ptr)));
-    s = NUM2LONG(size);
-    break;
-  case 3:
-    p = (void*)(NUM2PTR(rb_Integer(ptr)));
-    s = NUM2LONG(size);
-    f = NIL_P(sym) ? NULL : RCFUNC_DATA(sym)->ptr;
-    break;
-  default:
-    rb_bug("rb_dlptr_initialize");
-  }
-
-  if (p) {
-    Data_Get_Struct(self, struct ptr_data, data);
-    if (data->ptr && data->free) {
-      /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
-      (*(data->free))(data->ptr);
-    }
-    data->ptr  = p;
-    data->size = s;
-    data->free = f;
-  }
-
-  return Qnil;
-}
-
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
-  VALUE size, sym, obj;
-  int   s;
-  freefunc_t f;
-
-  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
-  case 1:
-    s = NUM2LONG(size);
-    f = NULL;
-    break;
-  case 2:
-    s = NUM2LONG(size);
-    f = RCFUNC_DATA(sym)->ptr;
-    break;
-  default:
-    rb_bug("rb_dlptr_s_malloc");
-  }
-
-  obj = rb_dlptr_malloc(s,f);
-
-  return obj;
-}
-
-VALUE
-rb_dlptr_to_i(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return PTR2NUM(data->ptr);
-}
-
-VALUE
-rb_dlptr_to_value(VALUE self)
-{
-    struct ptr_data *data;
-    Data_Get_Struct(self, struct ptr_data, data);
-    return (VALUE)(data->ptr);
-}
-
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-VALUE
-rb_dlptr_ref(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
-  struct ptr_data *data;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  return data->ptr ? Qfalse : Qtrue;
-}
-
-VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
-  struct ptr_data *data;
-  extern VALUE rb_cDLCFunc;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  if( rb_obj_is_kind_of(val, rb_cDLCFunc) == Qtrue ){
-      data->free = RCFUNC_DATA(val)->ptr;
-  }
-  else{
-      data->free = NUM2PTR(rb_Integer(val));
-  }
-
-  return Qnil;
-}
-
-VALUE
-rb_dlptr_free_get(VALUE self)
-{
-  struct ptr_data *pdata;
-
-  Data_Get_Struct(self, struct ptr_data, pdata);
-
-  return rb_dlcfunc_new(pdata->free, DLTYPE_VOID, "free<anonymous>", CFUNC_CDECL);
-}
-
-VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new2((char*)(data->ptr));
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_s");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
-  struct ptr_data *data;
-  VALUE arg1, val;
-  int len;
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  switch (rb_scan_args(argc, argv, "01", &arg1)) {
-  case 0:
-    val = rb_tainted_str_new((char*)(data->ptr),data->size);
-    break;
-  case 1:
-    len = NUM2INT(arg1);
-    val = rb_tainted_str_new((char*)(data->ptr), len);
-    break;
-  default:
-    rb_bug("rb_dlptr_to_str");
-  }
-
-  return val;
-}
-
-VALUE
-rb_dlptr_inspect(VALUE self)
-{
-  struct ptr_data *data;
-  char str[1024];
-
-  Data_Get_Struct(self, struct ptr_data, data);
-  snprintf(str, 1023, "#<%s:%p ptr=%p size=%ld free=%p>",
-	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size, data->free);
-  return rb_str_new2(str);
-}
-
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-
-  return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
-  void *ptr1, *ptr2;
-  ptr1 = rb_dlptr2cptr(self);
-  ptr2 = rb_dlptr2cptr(other);
-  return PTR2NUM((long)ptr1 - (long)ptr2);
-}
-
-VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RPTR_DATA(self)->size;
-  num = NUM2LONG(other);
-  return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
-  void *ptr;
-  long num, size;
-
-  ptr = rb_dlptr2cptr(self);
-  size = RPTR_DATA(self)->size;
-  num = NUM2LONG(other);
-  return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1;
-    VALUE retval = Qnil;
-    size_t offset, len;
-
-    switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
-    case 1:
-	offset = NUM2ULONG(arg0);
-	retval = INT2NUM(*((char*)RPTR_DATA(self)->ptr + offset));
-	break;
-    case 2:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	retval = rb_tainted_str_new((char *)RPTR_DATA(self)->ptr + offset, len);
-	break;
-    default:
-	rb_bug("rb_dlptr_aref()");
-    }
-    return retval;
-}
-
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
-    VALUE arg0, arg1, arg2;
-    VALUE retval = Qnil;
-    size_t offset, len;
-    void *mem;
-
-    switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
-    case 2:
-	offset = NUM2ULONG(arg0);
-	((char*)RPTR_DATA(self)->ptr)[offset] = NUM2UINT(arg1);
-	retval = arg1;
-	break;
-    case 3:
-	offset = NUM2ULONG(arg0);
-	len    = NUM2ULONG(arg1);
-	if( TYPE(arg2) == T_STRING ){
-	    mem = StringValuePtr(arg2);
-	}
-	else if( rb_obj_is_kind_of(arg2, rb_cDLCPtr) ){
-	    mem = rb_dlptr2cptr(arg2);
-	}
-	else{
-	    mem    = NUM2PTR(arg2);
-	}
-	memcpy((char *)RPTR_DATA(self)->ptr + offset, mem, len);
-	retval = arg2;
-	break;
-    default:
-	rb_bug("rb_dlptr_aset()");
-    }
-    return retval;
-}
-
-VALUE
-rb_dlptr_size(int argc, VALUE argv[], VALUE self)
-{
-  VALUE size;
-
-  if (rb_scan_args(argc, argv, "01", &size) == 0){
-    return LONG2NUM(RPTR_DATA(self)->size);
-  }
-  else{
-    RPTR_DATA(self)->size = NUM2LONG(size);
-    return size;
-  }
-}
-
-VALUE
-rb_dlptr_s_to_ptr(VALUE self, VALUE val)
-{
-    if( rb_obj_is_kind_of(val, rb_cIO) == Qtrue ){
-	rb_io_t *fptr;
-	FILE *fp;
-	GetOpenFile(val, fptr);
-	fp = rb_io_stdio_file(fptr);
-	return rb_dlptr_new(fp, 0, NULL);
-    }
-    else if( rb_obj_is_kind_of(val, rb_cString) == Qtrue ){
-        char *ptr = StringValuePtr(val);
-        return rb_dlptr_new(ptr, RSTRING_LEN(val), NULL); 
-    }
-    else if( rb_respond_to(val, id_to_ptr) ){
-	VALUE vptr = rb_funcall(val, id_to_ptr, 0);
-	if( rb_obj_is_kind_of(vptr, rb_cDLCPtr) ){
-	    return vptr;
-	}
-	else{
-	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
-	}
-    }
-    else{
-	return rb_dlptr_new(NUM2PTR(rb_Integer(val)), 0, NULL);
-    }
-}
-
-void
-Init_dlptr()
-{
-    id_to_ptr = rb_intern("to_ptr");
-
-    rb_cDLCPtr = rb_define_class_under(rb_mDL, "CPtr", rb_cObject);
-    rb_define_alloc_func(rb_cDLCPtr, rb_dlptr_s_allocate);
-    rb_define_singleton_method(rb_cDLCPtr, "malloc", rb_dlptr_s_malloc, -1);
-    rb_define_singleton_method(rb_cDLCPtr, "to_ptr", rb_dlptr_s_to_ptr, 1);
-    rb_define_singleton_method(rb_cDLCPtr, "[]", rb_dlptr_s_to_ptr, 1);
-    rb_define_method(rb_cDLCPtr, "initialize", rb_dlptr_initialize, -1);
-    rb_define_method(rb_cDLCPtr, "free=", rb_dlptr_free_set, 1);
-    rb_define_method(rb_cDLCPtr, "free",  rb_dlptr_free_get, 0);
-    rb_define_method(rb_cDLCPtr, "to_i",  rb_dlptr_to_i, 0);
-    rb_define_method(rb_cDLCPtr, "to_value",  rb_dlptr_to_value, 0);
-    rb_define_method(rb_cDLCPtr, "ptr",   rb_dlptr_ptr, 0);
-    rb_define_method(rb_cDLCPtr, "+@", rb_dlptr_ptr, 0);
-    rb_define_method(rb_cDLCPtr, "ref",   rb_dlptr_ref, 0);
-    rb_define_method(rb_cDLCPtr, "-@", rb_dlptr_ref, 0);
-    rb_define_method(rb_cDLCPtr, "null?", rb_dlptr_null_p, 0);
-    rb_define_method(rb_cDLCPtr, "to_s", rb_dlptr_to_s, -1);
-    rb_define_method(rb_cDLCPtr, "to_str", rb_dlptr_to_str, -1);
-    rb_define_method(rb_cDLCPtr, "inspect", rb_dlptr_inspect, 0);
-    rb_define_method(rb_cDLCPtr, "<=>", rb_dlptr_cmp, 1);
-    rb_define_method(rb_cDLCPtr, "==", rb_dlptr_eql, 1);
-    rb_define_method(rb_cDLCPtr, "eql?", rb_dlptr_eql, 1);
-    rb_define_method(rb_cDLCPtr, "+", rb_dlptr_plus, 1);
-    rb_define_method(rb_cDLCPtr, "-", rb_dlptr_minus, 1);
-    rb_define_method(rb_cDLCPtr, "[]", rb_dlptr_aref, -1);
-    rb_define_method(rb_cDLCPtr, "[]=", rb_dlptr_aset, -1);
-    rb_define_method(rb_cDLCPtr, "size", rb_dlptr_size, -1);
-    rb_define_method(rb_cDLCPtr, "size=", rb_dlptr_size, -1);
-
-    rb_define_const(rb_mDL, "NULL", rb_dlptr_new(0, 0, 0));
-}
diff --git a/ext/dl/depend b/ext/dl/depend
index fe89a9fae3..fba3df7a3d 100644
--- a/ext/dl/depend
+++ b/ext/dl/depend
@@ -1,11 +1,46 @@
-cfunc.o: cfunc.c dl.h $(hdrdir)/ruby.h
+LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
 
-cptr.o: cptr.c dl.h $(hdrdir)/ruby.h $(hdrdir)/io.h
+libtest.so: test/libtest.so
 
-handle.o: handle.c dl.h $(hdrdir)/ruby.h
+test/libtest.so: test/test.o $(srcdir)/test/libtest.def
+	$(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
+	$(LDSHARED_TEST:dl.def=test/libtest.def)
 
-dl.o: dl.c dl.h callback.h $(hdrdir)/ruby.h $(hdrdir)/io.h
+test/test.o: $(srcdir)/test/test.c
+	@$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
 
-callback.h: $(srcdir)/mkcallback.rb dl.h
-	@echo "generating callback.h"
-	@$(RUBY) $(srcdir)/mkcallback.rb $(srcdir)/dl.h > $@
+test:: dl.so libtest.so force
+	$(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
+
+force:
+
+.PHONY: force test
+
+allclean: distclean
+	@rm -f $(CLEANFILES) $(DISTCLEANFILES)
+
+$(OBJS): ./dlconfig.h
+
+sym.o: dl.h call.func
+
+dl.o: dl.h callback.func cbtable.func
+
+ptr.o: dl.h
+
+handle.o: dl.h
+
+call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
+	@echo "Generating call.func"
+	@$(RUBY) $(srcdir)/mkcall.rb > $@
+
+callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
+	@echo "Generating callback.func"
+	@$(RUBY) $(srcdir)/mkcallback.rb > $@
+
+cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
+	@echo "Generating cbtable.func"
+	@$(RUBY) $(srcdir)/mkcbtable.rb > $@
+
+debug:
+	$(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index e4bd4d41e9..f65247be86 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,5 +1,9 @@
-#include <ruby/ruby.h>
-#include <ruby/io.h>
+/*
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <rubyio.h>
 #include <ctype.h>
 #include "dl.h"
 
@@ -7,126 +11,726 @@ VALUE rb_mDL;
 VALUE rb_eDLError;
 VALUE rb_eDLTypeError;
 
-ID rbdl_id_cdecl;
-ID rbdl_id_stdcall;
+static VALUE DLFuncTable;
+static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
+static ID id_call;
+
+static int
+rb_dl_scan_callback_args(long stack[], const char *proto,
+			 int *argc, VALUE argv[])
+{
+  int i;
+  long *sp;
+  VALUE val;
+
+  sp = stack;
+  for (i=1; proto[i]; i++) {
+    switch (proto[i]) {
+    case 'C':
+      {
+	char v;
+	v = (char)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'H':
+      {
+	short v;
+	v = (short)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'I':
+      {
+	int v;
+	v = (int)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'L':
+      {
+	long v;
+	v = (long)(*sp);
+	sp++;
+	val = INT2NUM(v);
+      }
+      break;
+    case 'F':
+      {
+	float v;
+	memcpy(&v, sp, sizeof(float));
+	sp += sizeof(float)/sizeof(long);
+	val = rb_float_new(v);
+      }
+      break;
+    case 'D':
+      {
+	double v;
+	memcpy(&v, sp, sizeof(double));
+	sp += sizeof(double)/sizeof(long);
+	val = rb_float_new(v);
+      }
+      break;
+    case 'P':
+      {
+	void *v;
+	memcpy(&v, sp, sizeof(void*));
+	sp++;
+	val = rb_dlptr_new(v, 0, 0);
+      }
+      break;
+    case 'S':
+      {
+	char *v;
+	memcpy(&v, sp, sizeof(void*));
+	sp++;
+	val = rb_tainted_str_new2(v);
+      }
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
+      break;
+    }
+    argv[i-1] = val;
+  }
+  *argc = (i - 1);
+
+  return (*argc);
+}
+
+#include "callback.func"
+
+static void
+init_dl_func_table(){
+#include "cbtable.func"
+}
+
+void *
+dlmalloc(size_t size)
+{
+  DEBUG_CODE2({
+    void *ptr;
+
+    printf("dlmalloc(%d)",size);
+    ptr = xmalloc(size);
+    printf(":0x%x\n",ptr);
+    return ptr;
+  },
+  {
+    return xmalloc(size);
+  });
+}
+
+void *
+dlrealloc(void *ptr, size_t size)
+{
+  DEBUG_CODE({
+    printf("dlrealloc(0x%x,%d)\n",ptr,size);
+  });
+  return xrealloc(ptr, size);
+}
+
+void
+dlfree(void *ptr)
+{
+  DEBUG_CODE({
+    printf("dlfree(0x%x)\n",ptr);
+  });
+  xfree(ptr);
+}
+
+char*
+dlstrdup(const char *str)
+{
+  char *newstr;
+
+  newstr = (char*)dlmalloc(strlen(str)+1);
+  strcpy(newstr,str);
+
+  return newstr;
+}
+
+size_t
+dlsizeof(const char *cstr)
+{
+  size_t size;
+  int i, len, n, dlen;
+  char *d;
+
+  len  = strlen(cstr);
+  size = 0;
+  for (i=0; i<len; i++) {
+    n = 1;
+    if (isdigit(cstr[i+1])) {
+      dlen = 1;
+      while (isdigit(cstr[i+dlen])) { dlen ++; };
+      dlen --;
+      d = ALLOCA_N(char, dlen + 1);
+      strncpy(d, cstr + i + 1, dlen);
+      d[dlen] = '\0';
+      n = atoi(d);
+    }
+    else{
+      dlen = 0;
+    }
+
+    switch (cstr[i]) {
+    case 'I':
+      DLALIGN(0,size,INT_ALIGN);
+    case 'i':
+      size += sizeof(int) * n;
+      break;
+    case 'L':
+      DLALIGN(0,size,LONG_ALIGN);
+    case 'l':
+      size += sizeof(long) * n;
+      break;
+    case 'F':
+      DLALIGN(0,size,FLOAT_ALIGN);
+    case 'f':
+      size += sizeof(float) * n;
+      break;
+    case 'D':
+      DLALIGN(0,size,DOUBLE_ALIGN);
+    case 'd':
+      size += sizeof(double) * n;
+      break;
+    case 'C':
+    case 'c':
+      size += sizeof(char) * n;
+      break;
+    case 'H':
+      DLALIGN(0,size,SHORT_ALIGN);
+    case 'h':
+      size += sizeof(short) * n;
+      break;
+    case 'P':
+    case 'S':
+      DLALIGN(0,size,VOIDP_ALIGN);
+    case 'p':
+    case 's':
+      size += sizeof(void*) * n;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
+      break;
+    }
+    i += dlen;
+  }
+
+  return size;
+}
+
+static float *
+c_farray(VALUE v, long *size)
+{
+  int i, len;
+  float *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(float) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FLOAT:
+      ary[i] = (float)(RFLOAT(e)->value);
+      break;
+    case T_NIL:
+      ary[i] = 0.0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static double *
+c_darray(VALUE v, long *size)
+{
+  int i, len;
+  double *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(double) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FLOAT:
+      ary[i] = (double)(RFLOAT(e)->value);
+      break;
+    case T_NIL:
+      ary[i] = 0.0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static long *
+c_larray(VALUE v, long *size)
+{
+  int i, len;
+  long *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(long) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (long)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static int *
+c_iarray(VALUE v, long *size)
+{
+  int i, len;
+  int *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(int) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (int)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static short *
+c_harray(VALUE v, long *size)
+{
+  int i, len;
+  short *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(short) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (short)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static char *
+c_carray(VALUE v, long *size)
+{
+  int i, len;
+  char *ary;
+  VALUE e;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(char) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+      ary[i] = (char)(NUM2INT(e));
+      break;
+    case T_NIL:
+      ary[i] = 0;
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      break;
+    }
+  }
+
+  return ary;
+}
+
+static void *
+c_parray(VALUE v, long *size)
+{
+  int i, len;
+  void **ary;
+  VALUE e, tmp;
+
+  len = RARRAY(v)->len;
+  *size = sizeof(void*) * len;
+  ary = dlmalloc(*size);
+  for (i=0; i < len; i++) {
+    e = rb_ary_entry(v, i);
+    switch (TYPE(e)) {
+    default:
+      tmp = rb_check_string_type(e);
+      if (NIL_P(tmp)) {
+	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
+      }
+      e = tmp;
+      /* fall through */
+    case T_STRING:
+      rb_check_safe_str(e);
+      {
+	char *str, *src;
+	src = RSTRING(e)->ptr;
+	str = dlstrdup(src);
+	ary[i] = (void*)str;
+      }
+      break;
+    case T_NIL:
+      ary[i] = NULL;
+      break;
+    case T_DATA:
+      if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
+	struct ptr_data *pdata;
+	Data_Get_Struct(e, struct ptr_data, pdata);
+	ary[i] = (void*)(pdata->ptr);
+      }
+      else{
+        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);
+	}
+      }
+      break;
+    }
+  }
+
+  return ary;
+}
+
+void *
+rb_ary2cary(char t, VALUE v, long *size)
+{
+  int len;
+  VALUE val0;
+
+  val0 = rb_check_array_type(v);
+  if(NIL_P(val0)) {
+    rb_raise(rb_eDLTypeError, "an array is expected.");
+  }
+  v = val0;
+
+  len = RARRAY(v)->len;
+  if (len == 0) {
+    return NULL;
+  }
+
+  if (!size) {
+    size = ALLOCA_N(long,1);
+  }
+
+  val0 = rb_ary_entry(v,0);
+  switch (TYPE(val0)) {
+  case T_FIXNUM:
+  case T_BIGNUM:
+    switch (t) {
+    case 'C': case 'c':
+      return (void*)c_carray(v,size);
+    case 'H': case 'h':
+      return (void*)c_harray(v,size);
+    case 'I': case 'i':
+      return (void*)c_iarray(v,size);
+    case 'L': case 'l': case 0:
+      return (void*)c_larray(v,size);
+    default:
+      rb_raise(rb_eDLTypeError, "type mismatch");
+    }
+  case T_STRING:
+    return (void*)c_parray(v,size);
+  case T_FLOAT:
+    switch (t) {
+    case 'F': case 'f':
+      return (void*)c_farray(v,size);
+    case 'D': case 'd': case 0:
+      return (void*)c_darray(v,size);
+    }
+    rb_raise(rb_eDLTypeError, "type mismatch");
+  case T_DATA:
+    if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
+      return (void*)c_parray(v,size);
+    }
+    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);
+  default:
+    rb_raise(rb_eDLTypeError, "unsupported type");
+  }
+}
 
 VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
+rb_str_to_ptr(VALUE self)
 {
-    rb_secure(2);
-    return rb_class_new_instance(argc, argv, rb_cDLHandle);
+  char *ptr;
+  int  len;
+  VALUE p;
+
+  len = RSTRING(self)->len;
+  ptr = (char*)dlmalloc(len + 1);
+  memcpy(ptr, RSTRING(self)->ptr, len);
+  ptr[len] = '\0';
+  p = rb_dlptr_new((void*)ptr,len,dlfree);
+  OBJ_INFECT(p, self);
+  return p;
 }
 
 VALUE
-rb_dl_malloc(VALUE self, VALUE size)
+rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
 {
-    void *ptr;
+  void *ptr;
+  VALUE t;
+  long size;
 
-    ptr = (void*)ruby_xmalloc(NUM2INT(size));
-    return PTR2NUM(ptr);
+  switch (rb_scan_args(argc, argv, "01", &t)) {
+  case 1:
+    ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
+    break;
+  case 0:
+    ptr = rb_ary2cary(0, self, &size);
+    break;
+  }
+  if (ptr) {
+      VALUE p = rb_dlptr_new(ptr, size, dlfree);
+      OBJ_INFECT(p, self);
+      return p;
+  }
+  return Qnil;
 }
 
 VALUE
-rb_dl_realloc(VALUE self, VALUE addr, VALUE size)
+rb_io_to_ptr(VALUE self)
 {
-    void *ptr = NUM2PTR(addr);
+  rb_io_t *fptr;
+  FILE     *fp;
+
+  GetOpenFile(self, fptr);
+  fp = fptr->f;
 
-    ptr = (void*)ruby_xrealloc(ptr, NUM2INT(size));
-    return PTR2NUM(ptr);
+  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
 }
 
 VALUE
-rb_dl_free(VALUE self, VALUE addr)
+rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
 {
-    void *ptr = NUM2PTR(addr);
-    ruby_xfree(ptr);
-    return Qnil;
+  rb_secure(2);
+  return rb_class_new_instance(argc, argv, rb_cDLHandle);
 }
 
 VALUE
-rb_dl_ptr2value(VALUE self, VALUE addr)
+rb_dl_malloc(VALUE self, VALUE size)
 {
-    return (VALUE)NUM2PTR(addr);
+  rb_secure(4);
+  return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
 }
 
 VALUE
-rb_dl_value2ptr(VALUE self, VALUE val)
+rb_dl_strdup(VALUE self, VALUE str)
 {
-    return PTR2NUM((void*)val);
+  SafeStringValue(str);
+  return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
 }
 
-#include "callback.h"
+static VALUE
+rb_dl_sizeof(VALUE self, VALUE str)
+{
+  return INT2NUM(dlsizeof(StringValuePtr(str)));
+}
+
+static VALUE
+rb_dl_callback(int argc, VALUE argv[], VALUE self)
+{
+  VALUE type, proc;
+  int rettype, entry, i;
+  char fname[127];
+
+  rb_secure(4);
+  proc = Qnil;
+  switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
+  case 1:
+    if (rb_block_given_p()) {
+      proc = rb_block_proc();
+    }
+    else{
+      proc = Qnil;
+    }
+  default:
+    break;
+  }
+
+  StringValue(type);
+  switch (RSTRING(type)->ptr[0]) {
+  case '0':
+    rettype = 0x00;
+    break;
+  case 'C':
+    rettype = 0x01;
+    break;
+  case 'H':
+    rettype = 0x02;
+    break;
+  case 'I':
+    rettype = 0x03;
+    break;
+  case 'L':
+    rettype = 0x04;
+    break;
+  case 'F':
+    rettype = 0x05;
+    break;
+  case 'D':
+    rettype = 0x06;
+    break;
+  case 'P':
+    rettype = 0x07;
+    break;
+  default:
+    rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
+  }
+
+  entry = -1;
+  for (i=0; i < MAX_CALLBACK; i++) {
+    if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
+      entry = i;
+      break;
+    }
+  }
+  if (entry < 0) {
+    rb_raise(rb_eDLError, "too many callbacks are defined.");
+  }
+
+  rb_hash_aset(DLFuncTable,
+	       rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
+	       rb_assoc_new(type,proc));
+  sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
+  return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
+		      fname, RSTRING(type)->ptr);
+}
+
+static VALUE
+rb_dl_remove_callback(VALUE mod, VALUE sym)
+{
+  freefunc_t f;
+  int i, j;
+
+  rb_secure(4);
+  f = rb_dlsym2csym(sym);
+  for (i=0; i < CALLBACK_TYPES; i++) {
+    for (j=0; j < MAX_CALLBACK; j++) {
+      if (rb_dl_callback_table[i][j] == f) {
+	rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
+	break;
+      }
+    }
+  }
+  return Qnil;
+}
 
 void
 Init_dl()
 {
-    void Init_dlhandle();
-    void Init_dlcfunc();
-    void Init_dlptr();
-
-    rbdl_id_cdecl = rb_intern("cdecl");
-    rbdl_id_stdcall = rb_intern("stdcall");
-
-    rb_mDL = rb_define_module("DL");
-    rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
-    rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
-
-    rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK));
-    rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE));
-
-    rb_dl_init_callbacks();
-
-    rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
-    rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
-    rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
-
-    rb_define_const(rb_mDL, "TYPE_VOID",  INT2NUM(DLTYPE_VOID));
-    rb_define_const(rb_mDL, "TYPE_VOIDP",  INT2NUM(DLTYPE_VOIDP));
-    rb_define_const(rb_mDL, "TYPE_CHAR",  INT2NUM(DLTYPE_CHAR));
-    rb_define_const(rb_mDL, "TYPE_SHORT",  INT2NUM(DLTYPE_SHORT));
-    rb_define_const(rb_mDL, "TYPE_INT",  INT2NUM(DLTYPE_INT));
-    rb_define_const(rb_mDL, "TYPE_LONG",  INT2NUM(DLTYPE_LONG));
-#if HAVE_LONG_LONG
-    rb_define_const(rb_mDL, "TYPE_LONG_LONG",  INT2NUM(DLTYPE_LONG_LONG));
-#endif
-    rb_define_const(rb_mDL, "TYPE_FLOAT",  INT2NUM(DLTYPE_FLOAT));
-    rb_define_const(rb_mDL, "TYPE_DOUBLE",  INT2NUM(DLTYPE_DOUBLE));
-
-    rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-    rb_define_const(rb_mDL, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
-    rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
-    rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
-    rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
-#if HAVE_LONG_LONG
-    rb_define_const(rb_mDL, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
-#endif
-    rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
-    rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
-
-    rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
-    rb_define_const(rb_mDL, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
-    rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
-    rb_define_const(rb_mDL, "SIZEOF_INT",   INT2NUM(sizeof(int)));
-    rb_define_const(rb_mDL, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
-#if HAVE_LONG_LONG
-    rb_define_const(rb_mDL, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
-#endif
-    rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
-    rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
-
-    rb_define_module_function(rb_mDL, "dlwrap", rb_dl_value2ptr, 1);
-    rb_define_module_function(rb_mDL, "dlunwrap", rb_dl_ptr2value, 1);
-
-    rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
-    rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
-    rb_define_module_function(rb_mDL, "realloc", rb_dl_realloc, 2);
-    rb_define_module_function(rb_mDL, "free", rb_dl_free, 1);
-
-    rb_define_const(rb_mDL, "RUBY_FREE", PTR2NUM(ruby_xfree));
-    rb_define_const(rb_mDL, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
-    rb_define_const(rb_mDL, "BUILD_RUBY_VERSION",  rb_str_new2(RUBY_VERSION));
-
-    Init_dlhandle();
-    Init_dlcfunc();
-    Init_dlptr();
+  void Init_dlptr();
+  void Init_dlsym();
+  void Init_dlhandle();
+
+  id_call = rb_intern("call");
+
+  rb_mDL = rb_define_module("DL");
+
+  rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
+  rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
+
+  DLFuncTable = rb_hash_new();
+  init_dl_func_table();
+  rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
+
+  rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+  rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
+  rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
+
+  rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
+  rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
+  rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+  rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+  rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+  rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+
+  rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
+  rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
+
+  rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
+  rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
+  rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
+  rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
+  rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
+  rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
+  rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
+
+  Init_dlptr();
+  Init_dlsym();
+  Init_dlhandle();
+
+  rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
+
+  rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
+  rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
+  rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
 }
diff --git a/ext/dl/dl.def b/ext/dl/dl.def
new file mode 100644
index 0000000000..cdab4af90d
--- /dev/null
+++ b/ext/dl/dl.def
@@ -0,0 +1,59 @@
+EXPORTS
+Init_dl
+dlfree
+dlmalloc
+dlrealloc
+dlstrdup
+rb_ary_to_ptr
+rb_dl_dlopen
+rb_dl_malloc
+rb_dl_strdup
+rb_eDLError
+rb_eDLTypeError
+rb_io_to_ptr
+rb_mDL
+rb_str_to_ptr
+Init_dlhandle
+rb_cDLHandle
+rb_dlhandle_close
+rb_dlhandle_disable_close
+rb_dlhandle_enable_close
+rb_dlhandle_sym
+Init_dlptr
+rb_cDLPtrData
+rb_dlmem_each
+rb_dlptr2cptr
+rb_dlptr_malloc
+rb_dlptr_aref
+rb_dlptr_aset
+rb_dlptr_cmp
+rb_dlptr_define_data_type
+rb_dlptr_define_struct
+rb_dlptr_define_union
+rb_dlptr_eql
+rb_dlptr_free_get
+rb_dlptr_free_set
+rb_dlptr_get_data_type
+rb_dlptr_inspect
+rb_dlptr_minus
+rb_dlptr_new
+rb_dlptr_new2
+rb_dlptr_null_p
+rb_dlptr_plus
+rb_dlptr_ptr
+rb_dlptr_ref
+rb_dlptr_to_array
+rb_dlptr_to_i
+rb_dlptr_to_s
+rb_dlptr_to_str
+rb_mDLMemorySpace
+Init_dlsym
+rb_cDLSymbol
+rb_dlsym2csym
+rb_dlsym_call
+rb_dlsym_cproto
+rb_dlsym_inspect
+rb_dlsym_name
+rb_dlsym_new
+rb_dlsym_proto
+rb_dlsym_to_ptr
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 7b8ad077ae..1faa316cf1 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -1,14 +1,12 @@
+/* -*- C -*-
+ * $Id$
+ */
+
 #ifndef RUBY_DL_H
 #define RUBY_DL_H
 
 #include <ruby.h>
-
-#if !defined(FUNC_CDECL)
-#  define FUNC_CDECL(x) x
-#endif
-#if !defined(FUNC_STDCALL)
-#  define FUNC_STDCALL(x) x
-#endif
+#include <dlconfig.h>
 
 #if defined(HAVE_DLFCN_H)
 # include <dlfcn.h>
@@ -35,156 +33,281 @@
 # endif
 #endif
 
-#define MAX_CALLBACK 5
-#define DLSTACK_TYPE long
-#define DLSTACK_SIZE (20)
-#define DLSTACK_PROTO \
-    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
-    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
-    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,\
-    DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE,DLSTACK_TYPE
-#define DLSTACK_ARGS(stack) \
-    stack[0],stack[1],stack[2],stack[3],stack[4],\
-    stack[5],stack[6],stack[7],stack[8],stack[9],\
-    stack[10],stack[11],stack[12],stack[13],stack[14],\
-    stack[15],stack[16],stack[17],stack[18],stack[19]
-
-#define DLSTACK_PROTO0 
-#define DLSTACK_PROTO1 DLSTACK_TYPE
-#define DLSTACK_PROTO2 DLSTACK_PROTO1, DLSTACK_TYPE
-#define DLSTACK_PROTO3 DLSTACK_PROTO2, DLSTACK_TYPE
-#define DLSTACK_PROTO4 DLSTACK_PROTO3, DLSTACK_TYPE
-#define DLSTACK_PROTO4 DLSTACK_PROTO3, DLSTACK_TYPE
-#define DLSTACK_PROTO5 DLSTACK_PROTO4, DLSTACK_TYPE
-#define DLSTACK_PROTO6 DLSTACK_PROTO5, DLSTACK_TYPE
-#define DLSTACK_PROTO7 DLSTACK_PROTO6, DLSTACK_TYPE
-#define DLSTACK_PROTO8 DLSTACK_PROTO7, DLSTACK_TYPE
-#define DLSTACK_PROTO9 DLSTACK_PROTO8, DLSTACK_TYPE
-#define DLSTACK_PROTO10 DLSTACK_PROTO9, DLSTACK_TYPE
-#define DLSTACK_PROTO11 DLSTACK_PROTO10, DLSTACK_TYPE
-#define DLSTACK_PROTO12 DLSTACK_PROTO11, DLSTACK_TYPE
-#define DLSTACK_PROTO13 DLSTACK_PROTO12, DLSTACK_TYPE
-#define DLSTACK_PROTO14 DLSTACK_PROTO13, DLSTACK_TYPE
-#define DLSTACK_PROTO14 DLSTACK_PROTO13, DLSTACK_TYPE
-#define DLSTACK_PROTO15 DLSTACK_PROTO14, DLSTACK_TYPE
-#define DLSTACK_PROTO16 DLSTACK_PROTO15, DLSTACK_TYPE
-#define DLSTACK_PROTO17 DLSTACK_PROTO16, DLSTACK_TYPE
-#define DLSTACK_PROTO18 DLSTACK_PROTO17, DLSTACK_TYPE
-#define DLSTACK_PROTO19 DLSTACK_PROTO18, DLSTACK_TYPE
-#define DLSTACK_PROTO20 DLSTACK_PROTO19, DLSTACK_TYPE
-
-#define DLSTACK_ARGS0(stack)
-#define DLSTACK_ARGS1(stack) stack[0]
-#define DLSTACK_ARGS2(stack) DLSTACK_ARGS1(stack), stack[1]
-#define DLSTACK_ARGS3(stack) DLSTACK_ARGS2(stack), stack[2]
-#define DLSTACK_ARGS4(stack) DLSTACK_ARGS3(stack), stack[3]
-#define DLSTACK_ARGS5(stack) DLSTACK_ARGS4(stack), stack[4]
-#define DLSTACK_ARGS6(stack) DLSTACK_ARGS5(stack), stack[5]
-#define DLSTACK_ARGS7(stack) DLSTACK_ARGS6(stack), stack[6]
-#define DLSTACK_ARGS8(stack) DLSTACK_ARGS7(stack), stack[7]
-#define DLSTACK_ARGS9(stack) DLSTACK_ARGS8(stack), stack[8]
-#define DLSTACK_ARGS10(stack) DLSTACK_ARGS9(stack), stack[9]
-#define DLSTACK_ARGS11(stack) DLSTACK_ARGS10(stack), stack[10]
-#define DLSTACK_ARGS12(stack) DLSTACK_ARGS11(stack), stack[11]
-#define DLSTACK_ARGS13(stack) DLSTACK_ARGS12(stack), stack[12]
-#define DLSTACK_ARGS14(stack) DLSTACK_ARGS13(stack), stack[13]
-#define DLSTACK_ARGS15(stack) DLSTACK_ARGS14(stack), stack[14]
-#define DLSTACK_ARGS16(stack) DLSTACK_ARGS15(stack), stack[15]
-#define DLSTACK_ARGS17(stack) DLSTACK_ARGS16(stack), stack[16]
-#define DLSTACK_ARGS18(stack) DLSTACK_ARGS17(stack), stack[17]
-#define DLSTACK_ARGS19(stack) DLSTACK_ARGS18(stack), stack[18]
-#define DLSTACK_ARGS20(stack) DLSTACK_ARGS19(stack), stack[19]
+#if !defined(StringValue)
+# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
+#endif
+#if !defined(StringValuePtr)
+# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
+#endif
+
+#ifdef DEBUG
+#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
+#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
+#else
+#define DEBUG_CODE(b)
+#define DEBUG_CODE2(b1,b2) b2
+#endif
+
+#define VOID_DLTYPE   0x00
+#define CHAR_DLTYPE   0x01
+#define SHORT_DLTYPE  0x02
+#define INT_DLTYPE    0x03
+#define LONG_DLTYPE   0x04
+#define FLOAT_DLTYPE  0x05
+#define DOUBLE_DLTYPE 0x06
+#define VOIDP_DLTYPE  0x07
+
+#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
+#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
+#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
+
+#if SIZEOF_INT == SIZEOF_LONG
+# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2I(x)  x.l
+# define DLINT(x)  (long)x
+#else
+# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2I(x)  x.i
+# define DLINT(x)  (int)x
+#endif
+#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
+#define ANY2L(x)  x.l
+#define DLLONG(x) (long)x
+
+#if defined(WITH_TYPE_FLOAT)
+# if SIZEOF_FLOAT == SIZEOF_DOUBLE
+#   define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+#   define ANY2F(x)  (x.d)
+#   define DLFLOAT(x) ((double)x)
+# else
+#   define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
+#   define ANY2F(x)  (x.f)
+#   define DLFLOAT(x) ((float)x)
+# endif
+#else
+# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+# define ANY2F(x)  (x.d)
+# define DLFLOAT(x) ((double)x)
+#endif
+#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
+#define ANY2D(x)  (x.d)
+#define DLDOUBLE(x) ((double)x)
+
+#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
+# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
+# define ANY2P(x)  (x.i)
+# define DLVOIDP(x) ((int)x)
+#elif SIZEOF_LONG == SIZEOF_VOIDP
+# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
+# define ANY2P(x)  (x.l)
+# define DLVOIDP(x) ((long)x)
+#else
+# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+# define ANY2P(x)  (x.p)
+# define DLVOIDP(x) ((void*)p)
+#endif
+
+#if defined(WITH_TYPE_CHAR)
+# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
+# define ANY2C(x)  (x.c)
+# define DLCHAR(x) ((char)x)
+#else
+# define PUSH_C(x) PUSH_I(x)
+# define ANY2C(x)  ANY2I(x)
+# define DLCHAR(x) DLINT(x)
+#endif
+
+#if defined(WITH_TYPE_SHORT)
+# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
+# define ANY2H(x)  (x.h)
+# define DLSHORT(x) ((short)x)
+#else
+# define PUSH_H(x) PUSH_I(x)
+# define ANY2H(x)  ANY2I(x)
+# define DLSHORT(x) DLINT(x)
+#endif
+
+#define PUSH_S(x) PUSH_P(x)
+#define ANY2S(x) ANY2P(x)
+#define DLSTR(x) DLVOIDP(x)
+
+#define CBPUSH_0(x) PUSH_0(x)
+#define CBPUSH_C(x) PUSH_C(x)
+#define CBPUSH_H(x) PUSH_H(x)
+#define CBPUSH_I(x) PUSH_I(x)
+#define CBPUSH_L(x) PUSH_L(x)
+#define CBPUSH_F(x) PUSH_F(x)
+#define CBPUSH_D(x) PUSH_D(x)
+#if defined(WITH_CBTYPE_VOIDP)
+# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
+#else
+# define CBPUSH_P(x) PUSH_P(x)
+#endif
+
+
+#if defined(USE_INLINE_ASM)
+# if defined(__i386__) && defined(__GNUC__)
+#   define DLSTACK
+#   define DLSTACK_METHOD "asm"
+#   define DLSTACK_REVERSE
+#   define DLSTACK_PROTO
+#   define DLSTACK_ARGS
+#   define DLSTACK_START(sym)
+#   define DLSTACK_END(sym)
+#   define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
+#   define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
+                             asm volatile ("subl $4,%esp");\
+                             asm volatile ("fstps (%esp)");
+#   define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
+                             asm volatile ("subl $8,%esp");\
+                             asm volatile ("fstpl (%esp)")
+# else
+# error --with-asm is not supported on this machine
+# endif
+#elif defined(USE_DLSTACK)
+# define DLSTACK
+# define DLSTACK_GUARD
+# define DLSTACK_METHOD "dl"
+# define DLSTACK_PROTO long,long,long,long,long,\
+                       long,long,long,long,long,\
+                       long,long,long,long,long
+# define DLSTACK_ARGS  stack[0],stack[1],stack[2],stack[3],stack[4],\
+                       stack[5],stack[6],stack[7],stack[8],stack[9],\
+                       stack[10],stack[11],stack[12],stack[13],stack[14]
+# define DLSTACK_SIZE  (sizeof(long)*15)
+# define DLSTACK_START(sym)
+# define DLSTACK_END(sym)
+# define DLSTACK_PUSH_C(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_H(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_I(x)  {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
+# define DLSTACK_PUSH_L(x)  memcpy(sp,&x,sizeof(long)); sp++;
+# define DLSTACK_PUSH_P(x)  memcpy(sp,&x,sizeof(void*)); sp++;
+# define DLSTACK_PUSH_F(x)  memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
+# define DLSTACK_PUSH_D(x)  memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
+#else
+# define DLSTACK_METHOD "none"
+#endif
 
 extern VALUE rb_mDL;
+extern VALUE rb_mDLMemorySpace;
 extern VALUE rb_cDLHandle;
 extern VALUE rb_cDLSymbol;
+extern VALUE rb_cDLPtrData;
+extern VALUE rb_cDLStructData;
+
 extern VALUE rb_eDLError;
 extern VALUE rb_eDLTypeError;
 
+#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
+# define DLLONG2NUM(x) LONG2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2LONG(x))
+#else
+# define DLLONG2NUM(x) INT2NUM((long)x)
+# define DLNUM2LONG(x) (long)(NUM2INT(x))
+#endif
+
 typedef struct { char c; void *x; } s_voidp;
 typedef struct { char c; short x; } s_short;
 typedef struct { char c; int x; } s_int;
 typedef struct { char c; long x; } s_long;
 typedef struct { char c; float x; } s_float;
 typedef struct { char c; double x; } s_double;
-#if HAVE_LONG_LONG
-typedef struct { char c; LONG_LONG x; } s_long_long;
-#endif
 
 #define ALIGN_VOIDP  (sizeof(s_voidp) - sizeof(void *))
 #define ALIGN_SHORT  (sizeof(s_short) - sizeof(short))
-#define ALIGN_CHAR   (1)
 #define ALIGN_INT    (sizeof(s_int) - sizeof(int))
 #define ALIGN_LONG   (sizeof(s_long) - sizeof(long))
-#if HAVE_LONG_LONG
-#define ALIGN_LONG_LONG (sizeof(s_long_long) - sizeof(LONG_LONG))
-#endif
 #define ALIGN_FLOAT  (sizeof(s_float) - sizeof(float))
 #define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
 
+/* for compatibility */
+#define VOIDP_ALIGN  ALIGN_VOIDP
+#define SHORT_ALIGN  ALIGN_SHORT
+#define INT_ALIGN    ALIGN_INT
+#define LONG_ALIGN   ALIGN_LONG
+#define FLOAT_ALIGN  ALIGN_FLOAT
+#define DOUBLE_ALIGN ALIGN_DOUBLE
+
 #define DLALIGN(ptr,offset,align) {\
   while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
 }
 
+typedef void (*freefunc_t)(void *);
+#define DLFREEFUNC(func) ((freefunc_t)(func))
 
-#define DLTYPE_VOID  0
-#define DLTYPE_VOIDP 1
-#define DLTYPE_CHAR  2
-#define DLTYPE_SHORT 3
-#define DLTYPE_INT   4
-#define DLTYPE_LONG  5
-#if HAVE_LONG_LONG
-#define DLTYPE_LONG_LONG 6
-#endif
-#define DLTYPE_FLOAT 7
-#define DLTYPE_DOUBLE 8
-#define MAX_DLTYPE 9
-
-#if SIZEOF_VOIDP == SIZEOF_LONG
-# define PTR2NUM(x)   (ULONG2NUM((unsigned long)(x)))
-# define NUM2PTR(x)   ((void*)(NUM2ULONG(x)))
-#else
-/* # error --->> Ruby/DL2 requires sizeof(void*) == sizeof(long) to be compiled. <<--- */
-# define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
-# define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
-#endif
-
-#define BOOL2INT(x)  ((x == Qtrue)?1:0)
-#define INT2BOOL(x)  (x?Qtrue:Qfalse)
-
-typedef void (*freefunc_t)(void*);
+typedef union {
+  void*  p;
+  char   c;
+  short  h;
+  int    i;
+  long   l;
+  float  f;
+  double d;
+  char  *s;
+} ANY_TYPE;
 
 struct dl_handle {
-    void *ptr;
-    int  open;
-    int  enable_close;
+  void *ptr;
+  int  open;
+  int  enable_close;
 };
 
+struct sym_data {
+  void *func;
+  char *name;
+  char *type;
+  int  len;
+};
 
-struct cfunc_data {
-    void *ptr;
-    char *name;
-    int  type;
-    ID   calltype;
+enum DLPTR_CTYPE {
+  DLPTR_CTYPE_UNKNOWN,
+  DLPTR_CTYPE_STRUCT,
+  DLPTR_CTYPE_UNION
 };
-extern ID rbdl_id_cdecl;
-extern ID rbdl_id_stdcall;
-#define CFUNC_CDECL   (rbdl_id_cdecl)
-#define CFUNC_STDCALL (rbdl_id_stdcall)
 
 struct ptr_data {
-    void *ptr;
-    long size;
-    freefunc_t free;
+  void *ptr;       /* a pointer to the data */
+  freefunc_t free; /* free() */
+  char *stype;      /* array of type specifiers */
+  int  *ssize;      /* size[i] = sizeof(type[i]) > 0 */
+  int  slen;   /* the number of type specifiers */
+  ID   *ids;
+  int  ids_num;
+  int  ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
+  long size;
 };
 
-#define RDL_HANDLE(obj) ((struct dl_handle *)(DATA_PTR(obj)))
-#define RCFUNC_DATA(obj) ((struct cfunc_data *)(DATA_PTR(obj)))
-#define RPTR_DATA(obj) ((struct ptr_data *)(DATA_PTR(obj)))
+#define RDLPTR(obj)  ((struct ptr_data *)(DATA_PTR(obj)))
+#define RDLSYM(obj)  ((struct sym_data *)(DATA_PTR(obj)))
+
+void dlfree(void*);
+void *dlmalloc(size_t);
+void *dlrealloc(void*,size_t);
+char *dlstrdup(const char *);
+size_t dlsizeof(const char *);
+
+void *rb_ary2cary(char t, VALUE ary, long *size);
+
+/*
+void rb_dlmem_delete(void *ptr);
+void rb_dlmem_aset(void *ptr, VALUE obj);
+VALUE rb_dlmem_aref(void *ptr);
+*/
+
+void dlptr_free(struct ptr_data *data);
+void dlptr_init(VALUE val);
 
-VALUE rb_dlcfunc_new(void (*func)(), int dltype, const char * name, ID calltype);
 VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
 VALUE rb_dlptr_malloc(long size, freefunc_t func);
+void *rb_dlptr2cptr(VALUE val);
 
-#endif
+VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
+freefunc_t rb_dlsym2csym(VALUE val);
+
+
+#endif /* RUBY_DL_H */
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
new file mode 100644
index 0000000000..893bd21d79
--- /dev/null
+++ b/ext/dl/doc/dl.txt
@@ -0,0 +1,266 @@
+=begin
+
+= Ruby/DL
+
+Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
+and LoadLibrary() on Windows.
+
+= Building and Installing
+
+  $ ruby extconf.rb    # to create the Makefile
+  $ make               # to build the library 'dl.so'
+  $ make libtest.so    # to build the C library 'libtest.so' for the test script
+  $ make test          # to run the test script
+  $ make install       # to install the library
+  $ make clean         # to remove the created files without Makefile
+  $ make distclean     # to remove the all created files
+
+= Using Ruby/DL
+
+We should usually use DL::Importable module provided by "dl/import.rb".
+It has high-level functions to access library functions. We use
+DL::Importable module to extend a module as follows:
+
+  require "dl/import"
+  module LIBC
+    extend DL::Importable
+  end
+
+Now we can use methods dlload and extern in this module. We load the
+libraries using dlload, and define wrapper methods to library functions
+using extern respectively as follows:
+
+  module LIBC
+    extend DL::Importable
+    dlload "libc.so.6","libm.so.6"
+    extern "int strlen(char*)"
+  end
+  # Note that we should not include the module LIBC from some reason.
+
+We can call the library function strlen() using LIBC.strlen. If the first
+character of given function name is an uppercase, the first character of the
+defined method name becomes lowercase.
+We can also construct memory images of structures and unions using functions
+struct and union which are defined in "dl/struct.rb" as follows:
+
+  require "dl/import"
+  require "dl/struct"
+  module LIBC
+    extend DL::Importable
+    Timeval = struct [       # define timeval structure.
+      "long tv_sec",
+      "long tv_uses",
+    ]
+  end
+  val = LIBC::Timeval.malloc # allocate memory.
+
+Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
+rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
+an object, PtrData, which has already been created.
+
+We can define a callback using the module function "callback" as follows:
+
+  module Foo
+    extend DL::Importable
+    def my_comp(str1,str2)
+      str1 <=> str2
+    end
+    COMPARE = callback "int my_comp(char*,char*)"
+  end
+
+where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
+
+DL::Importable module is very useful. However, we sometimes encounter a case
+that we must directly use low-level functions such as dlsym(). In such case,
+we would use DL module functions. They are described in next section.
+
+= DL module
+
+Module DL consists of three classes, a few module functions and constants.
+The class Symbol represents the symbol we can call. The class PtrData
+indicates a memory block such as a pointer in C. An object instantiated from
+the class Handle keeps a handle to opened library.
+
+== Constants
+
+* VERSION
+* MAJOR_VERSION
+* MINOR_VERSION
+* PATCH_VERSION
+* RTLD_GLOBAL
+* RTLD_LAZY
+* RTLD_NOW
+* MAX_ARG
+* MAX_CBARG
+* MAX_CBENT
+
+== Functions
+
+* handle = dlopen(lib){|handle| ... }
+  * is quite equal to `Handle.new(lib)'
+
+* sym = set_callback(cbtype, entry){|args| ... }
+* sym = set_callback(cbtype, entry, proc)
+  * makes entry-th pre-defined function to call the proc or given block. the 
+    entry-th pre-defined function is specified by cbtype and entry. cbtype is a
+    prototype of the callback. see also the section `Type specifiers' about 
+    cbtype.
+
+* sym = get_callback(cbtype, entry)
+  * returns the Proc object which is given by the above function
+   `set_callback'.
+
+* ptr = malloc(size, [free = nil])
+  * allocates the size bytes, and returns the pointer as a PtrData object ptr.
+
+* ptr = strdup(str)
+  * returns a PtrData object ptr which represents the pointer to a new string
+    which is a duplicate of the string str.
+
+* size = sizeof(type)
+  * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
+    `sizeof("CL")'. the latter is assumed to returns the enough size of the
+    structure `struct foo { char c; long l; }', but the size may not equal to
+    `sizeof(foo)' of C.
+
+== Handle class
+
+* handle = Handle.new(lib){|handle| ... }
+  * opens a library lib and returns a Handle object handle. if a block is
+    given, the handle is automatically closed as the block ends.
+
+* Handle#close
+  * closes the handle opened by the above Handle.new(lib).
+
+* sym = Handle#sym(func, prototype = "0"),
+  sym = Handle#[func, prototype = nil]
+
+  * obtains the pointer to a function called func and returns a Symbol object
+    or a DataPtr object. prototype is a string which consists of type
+    specifiers, it indicates the function's prototype. see also the section
+    `Type specifiers'.
+
+== Symbol class
+
+* sym = Symbol.new(addr, type = nil, name = nil)
+  * creates the Symbol object sym with the type type if type is not nil. addr
+    is the address where the function is allocated. If type is nil, it returns
+    a DataPtr object.
+
+* Symbol::char2type(char)
+  * takes a character char that represents a type and returns the type
+    specifier of the C language.
+
+* str = Symbol#proto()
+  * returns the function prototype.
+
+* str = Symbol#name()
+  * Returns the function name.
+
+* str = Symbol#cproto(),
+  str = Symbol#to_s()
+  * returns the prototype of the C language.
+
+* str = Symbol#inspect()
+  * returns the inspectable string.
+
+* r,rs = Symbol#call(arg1,arg2,...,argN),
+  r,rs = Symbol#[](arg1,arg2,...,argN)
+  * calls the function with parameters arg1, arg2, ..., argN. and the result
+    consists of the return value r and parameters rs. rs is an array.
+
+* ptr = Symbol#to_ptr
+  * returns the corresponding PtrData object ptr.
+
+== PtrData class
+
+* ptr = PtrData.new(addr, [size = 0, free = nil])
+  * returns the PtrData object representing the pointer which indicates the
+    address addr. GC frees the memory using the free function.
+
+* PtrData#free=(sym)
+  * If you specify a symbol object sym, GC frees the memory using the function
+    represented by sym.
+
+* sym = PtrData#free
+  * returns a symbol object sym which is used when GC frees the memory. it
+    usually configured by `PtrData#free=' or `PtrData.new'.
+
+* size = PtrData#size, PtrData#size=(size)
+  * gets and sets allocated size of the memory.
+
+* ary = PtrData#to_a(type, [size])
+  * returns an array of the type which specified with type. type must be one of
+    'S','P','I','L','D' and 'F'.
+
+* str = PtrData#to_s([len])
+  * returns a string which length is len. if len is omitted, the end of the
+    string is '\0'.
+
+* ptr = PtrData#ptr,+@
+  * returns the pointed value as a PtrData object ptr.
+
+* ptr = PtrData#ref,-@
+  * returns the reference as a PtrData object ptr.
+
+* ptr = PtrData#+
+  * returns the PtrData object
+
+* ptr = PtrData#-
+  * returns the PtrData object
+
+* PtrData#struct!(type, *members)
+  * defines the data type to get access to a structure member with a symbol.
+    (see also PtrData#[])
+
+* PtrData#union!(type, *members)
+  * defines the data type to get access to a union member with a symbol. (see
+    also PtrData#[])
+
+* val = PtrData#[key], PtrData#[key, num = 0]
+  * if the key is a string or symbol, this method returns the value of the
+    structure/union member which has the type defined by PtrData#
+    {struct!,union!}. if the key is a integer value and this object represents
+    the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
+
+* PtrData#[key,num]=val, PtrData#[key]=val
+  * if the key is a string or symbol, this method substitute the value of the
+    structure/union member with val. if the key is a integer value and val is a
+    string, this method copies num bytes of val to the memory area ptr using
+    memcpy(3).
+
+== Type specifiers
+
+the prototype consists of the following type specifiers, first element of 
+prototype represents the type of return value, and remaining elements represent
+the type of each argument.
+
+    C : char
+    c : char *
+    H : short
+    h : short *
+    I : int
+    i : int *
+    L : long
+    l : long *
+    F : float
+    f : float *
+    D : double
+    d : double *
+    S : const char *
+    s : char *
+    A : const type[]
+    a : type[] (allocates new memory space)
+    P : void * (same as 'p')
+    p : void * (same as 'P')
+    0 : void function (this must be a first character of the prototype)
+
+the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
+for example:
+
+    DL.callback('IPP'){|ptr1,ptr2|
+      str1 = ptr1.ptr.to_s
+      str2 = ptr2.ptr.to_s
+      str1 <=> str2
+    }
+=end
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index abd8d8f781..beb15ab04c 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -1,31 +1,193 @@
 require 'mkmf'
 
-if( RbConfig::CONFIG['CC'] =~ /gcc/ )
+begin # for the exception SystemExit
+
+$:.unshift File.dirname(__FILE__)
+require 'type'
+
+if( ARGV.include?("--help") )
+  print <<EOF
+  --help             print this messages
+  --with-type-char   strictly use type 'char'
+  --with-type-short  strictly use type 'short'
+  --with-type-float  strictly use type 'float'
+  --with-args=<max_arg>
+  --with-callback=<max_callback>
+  --enable-asm       use the embedded assembler for passing arguments.
+                     (this option is available for i386 machine now.)
+  --enable-dlstack   use a stack emulation for constructing function call.
+EOF
+  exit(0)
+end
+
+($CPPFLAGS || $CFLAGS) << " -I."
+
+if (Config::CONFIG['CC'] =~ /gcc/)  # from Win32API
   $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
 end
 
-$INSTALLFILES = [
-  ["dl.h", "$(HDRDIR)"],
-]
-$distcleanfiles << "callback.h"
+$with_dlstack ||= true
+$with_asm = ! $with_dlstack
+
+$with_type_int = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_INT == SIZEOF_LONG
+#error int not needed
+#endif
+EOF
+
+$with_type_float = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_FLOAT == SIZEOF_DOUBLE
+#error float not needed
+#endif
+EOF
+
+$with_type_voidp = try_cpp(<<EOF)
+#include "config.h"
+#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
+#error void* not needed
+#endif
+EOF
 
+$with_type_char  = DLTYPE[CHAR][:sym]
+$with_type_short = DLTYPE[SHORT][:sym]
+$with_type_long  = DLTYPE[LONG][:sym]
+$with_type_double= DLTYPE[DOUBLE][:sym]
+$with_type_int   &= DLTYPE[INT][:sym]
+$with_type_float &= DLTYPE[FLOAT][:sym]
+$with_type_voidp &= DLTYPE[VOIDP][:sym]
+
+$with_type_char  = enable_config("type-char", $with_type_char)
+$with_type_short = enable_config("type-short", $with_type_short)
+$with_type_float = enable_config("type-float", $with_type_float)
+
+$with_asm        = enable_config("asm", $with_asm)
+$with_dlstack    = enable_config("dlstack", $with_dlstack)
+
+args = with_config("args")
+max_arg = nil
+if( $with_asm || $with_dlstack )
+  $with_type_char = true
+  $with_type_short = true
+  $with_type_float = true
+  max_arg = 0
+end
+if( args )
+  max_arg = args.to_i
+  if( !max_arg )
+    print("--with-args=<max_arg>\n")
+    exit(1)
+  end
+end
+max_arg   ||= 6
+
+max_callback = with_config("callback","10").to_i
+callback_types = DLTYPE.keys.length
+
+
+$dlconfig_h = <<EOF
+#define MAX_ARG           #{max_arg}
+EOF
+
+def dlc_define(const)
+  $dlconfig_h << "#if !defined(#{const})\n" +
+                 "# define #{const}\n" +
+                 "#endif\n"
+end
+
+$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
+$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
+if( $with_dlstack )
+  $dlconfig_h << "#define USE_DLSTACK\n"
+else
+  if( $with_asm )
+    $dlconfig_h << "#define USE_INLINE_ASM\n"
+  end
+end
+if( $with_type_char )
+  $dlconfig_h << "#define WITH_TYPE_CHAR\n"
+end
+if( $with_type_short )
+  $dlconfig_h << "#define WITH_TYPE_SHORT\n"
+end
+if( $with_type_long )
+  $dlconfig_h << "#define WITH_TYPE_LONG\n"
+end
+if( $with_type_double )
+  $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
+end
+if( $with_type_float )
+  $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
+end
+if( $with_type_int )
+  $dlconfig_h << "#define WITH_TYPE_INT\n"
+end
+if( $with_type_voidp )
+  $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
+end
+
+if( have_header("windows.h") )
+  have_library("kernel32")
+  have_func("GetLastError", "windows.h")
+  dlc_define("HAVE_WINDOWS_H")
+  have_windows_h = true
+end
 
-check = true
 if( have_header("dlfcn.h") )
+  dlc_define("HAVE_DLFCN_H")
   have_library("dl")
-  check &&= have_func("dlopen")
-  check &&= have_func("dlclose")
-  check &&= have_func("dlsym")
-  have_func("dlerror")
-elsif( have_header("windows.h") )
-  check &&= have_func("LoadLibrary")
-  check &&= have_func("FreeLibrary")
-  check &&= have_func("GetProcAddress")
+  have_func("dlopen")
+  have_func("dlclose")
+  have_func("dlsym")
+  if( have_func("dlerror") )
+    dlc_define("HAVE_DLERROR")
+  end
+elsif ( have_windows_h )
+  have_func("LoadLibrary")
+  have_func("FreeLibrary")
+  have_func("GetProcAddress")
 else
-  check = false
+  exit(0)
 end
 
-if check
-  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
-  create_makefile("dl")
+def File.update(file, str)
+  begin
+    open(file){|f|f.read} == str
+  rescue Errno::ENOENT
+    false
+  end or open(file, "w"){|f|f.print(str)}
+end
+
+File.update("dlconfig.h", <<EOF)
+#ifndef DLCONFIG_H
+#define DLCONFIG_H
+#{$dlconfig_h}
+#endif /* DLCONFIG_H */
+EOF
+
+File.update("dlconfig.rb", <<EOF)
+MAX_ARG = #{max_arg}
+MAX_CALLBACK = #{max_callback}
+CALLBACK_TYPES = #{callback_types}
+DLTYPE[CHAR][:sym]  = #{$with_type_char}
+DLTYPE[SHORT][:sym] = #{$with_type_short}
+DLTYPE[INT][:sym]   = #{$with_type_int}
+DLTYPE[LONG][:sym]  = #{$with_type_long}
+DLTYPE[FLOAT][:sym] = #{$with_type_float}
+DLTYPE[DOUBLE][:sym]= #{$with_type_double}
+DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
+EOF
+
+$INSTALLFILES = [
+  ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
+  ["dl.h", "$(archdir)$(target_prefix)", ""],
+]
+$cleanfiles = %w[test/test.o]
+$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
+./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
+
+create_makefile('dl')
+rescue SystemExit
+  # do nothing
 end
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
new file mode 100644
index 0000000000..00fbd60c82
--- /dev/null
+++ b/ext/dl/h2rb
@@ -0,0 +1,500 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+# $Id$
+
+require 'mkmf'
+require 'ftools'
+
+$recursive = false
+$force     = false
+$conly     = true
+$inc_path  = []
+$infilename= nil
+$insert_require = true
+
+def valid_ruby_code?(code)
+  begin
+    eval("BEGIN {return true}; #{code}")
+  rescue SyntaxError
+    return false
+  end
+  return false
+end
+
+def print_usage
+  print <<EOF
+h2rb [-r] [-I <path>] [-d] [<filename>]
+EOF
+end
+
+while( ARGV[0] )
+  case( ARGV[0] )
+  when "-r"
+    ARGV.shift
+    $recursive = true
+  when "-R"
+    ARGV.shift
+    $recursive = false
+  when "-l"
+    ARGV.shift
+    $insert_require = true
+  when "-L"
+    ARGV.shift
+    $insert_require = false
+  when "-c"
+    ARGV.shift
+    $conly = true
+  when "-C"
+    ARGV.shift
+    $conly = false
+  when "-f"
+    ARGV.shift
+    $force = true
+  when "-F"
+    ARGV.shift
+    $force = false
+  when "-I"
+    ARGV.shift
+    $inc_path << ARGV.shift
+  when "-d"
+    ARGV.shift
+    $DEBUG = true
+  when "-h","--help"
+    print_usage()
+    exit 0
+  when /-.*/
+    $stderr.print("unknown option '#{ARGV[0]}'.\n")
+    print_usage()
+    exit 0
+  else
+    $infilename = ARGV.shift
+  end
+end
+
+$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
+		     CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
+		     "dl")
+
+class H2RBError < StandardError; end
+
+
+class H2RB
+  def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
+    @inc_path = inc_path || []
+    @inc_dir  = inc_dir  || '.'
+    @indent = 0
+    @parsed_files = []
+    @insert_require = insert_require || false
+  end
+
+  def find_path(file)
+    if( ! file )
+      return nil
+    end
+    if( File.exist?(file) )
+      if( file[0] == ?/ )
+	return file
+      else
+	return file
+      end
+    end
+    @inc_path.each{|path|
+    full = File.join(path, file)
+      if( File.exist?(full) )
+	return full
+      end
+    }
+    return nil
+  end
+
+  def strip_comment(line)
+    if( @commented )
+      if( e = line.index("*/") )
+	line[0..(e+1)] = ""
+	@commented = false
+      else
+	line = ""
+      end
+    else
+      if( s = line.index("/*") )
+	if( e = line.index("*/") )
+	  line[s..(e+1)] = ""
+	else
+	  line[s..-1] = ""
+	  @commented = true
+	end
+      elsif( s = line.index("//") )
+	line[s..(-1)] = ""
+      end
+    end
+      
+    line.gsub!(/\s+$/,"")
+    return line
+  end
+  
+  def up_indent
+    @indent += 1
+  end
+  
+  def down_indent
+    @indent -= 1
+    if( @indent < 0 )
+      raise
+    end
+  end
+  
+  def indent
+    "  " * @indent
+  end
+
+  def rescue_begin
+    line = "#{indent}begin"
+    up_indent
+    return line
+  end
+
+  def rescue_nameerror
+    down_indent
+    line = [
+      "#{indent}rescue NameError => e",
+      "#{indent}  raise e if( $DEBUG )",
+      "#{indent}end"].join($/)
+    return line
+  end
+
+  def parse_enum(line)
+    if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
+      enum_name  = $1
+      enum_block = $2
+      if( enum_name )
+	line = "#{indent}# -- enum #{enum_name}\n"
+      else
+	line = "#{indent}# -- enum\n"
+      end
+      enums = enum_block.split(/,/).collect{|e| e.strip}
+      i = 0
+      enums.each{|elem|
+	var,val = elem.split(/=/).collect{|e| e.strip}
+	if( val )
+	  i = val.to_i
+	end
+	line += "#{indent}#{var} = #{i.to_s}\n"
+	i += 1
+      }
+      line += "#{indent}# -- end of enum"
+      return line
+    else
+      return nil
+    end
+  end
+
+  def parse_define(line)
+    case line
+    when /^#\s*define\s+(\S+)\(\)/
+      line = nil
+    when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
+      if( @conly )
+	line = nil
+      else
+	defname = $1
+	defargs = $2
+	defval  = $3
+	if( !valid_ruby_code?(defval) )
+	  defval = "nil # #{defval}"
+	end
+	if( defname[0,1] =~ /^[A-Z]$/ )
+	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+	else
+	  line = [
+	    "#{indent}def #{defname}(#{defargs})",
+	    "#{indent}  #{defval}",
+	    "#{indent}end"
+	  ].join("\n")
+	end
+      end
+    when /^#\s*define\s+(\S+)\((.+)\)$/
+      if( @conly )
+	line = nil
+      else
+	defname = $1
+	defargs = $2
+	defval  = nil
+	if( !valid_ruby_code?(defval) )
+	  defval = "nil # #{defval}"
+	end
+	if( defname[0,1] =~ /^[A-Z]$/ )
+	  line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
+	else
+	  line = [
+	    "#{indent}def #{defname}(#{defargs})",
+	    "#{indent}  #{defval}",
+	    "#{indent}end"
+	  ].join("\n")
+	end
+      end
+    when /^#\s*define\s+(\S+)\s+(.+)$/
+      defname = $1
+      defval  = $2
+      if( !valid_ruby_code?(defval) )
+	defval = "nil # #{defval}"
+      end
+      line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
+    when /^#\s*define\s+(\S+)$/
+      defname = $1
+      line = "#{indent}#{defname} = nil"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_undef(line)
+    case line
+    when /^#\s*undef\s+([A-Z]\S+)$/
+      defname = $1
+      line = "#{indent}remove_const(:#{defname})"
+    when /^#\s*undef\s+(\S+)$/
+      defname = $1
+      line = "#{indent}#{defname} = nil"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_ifdef(line)
+    case line
+    when /^#\s*ifdef\s+(\S+)$/
+      defname = $1
+      line = [
+	rescue_begin,
+	"#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_ifndef(line)
+    case line
+    when /^#\s*ifndef\s+(\S+)$/
+      defname = $1
+      line = [
+	rescue_begin,
+	"#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_if(line)
+    case line
+    when /^#\s*if\s+(.+)$/
+      cond = $1
+      cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
+      if( valid_ruby_code?(cond) )
+	line = "#{indent}if( #{cond} )"
+      else
+	line = "#{indent}if( false ) # #{cond}"
+      end
+      line = [rescue_begin, line].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_elif(line)
+    case line
+    when /^#\s*elif\s+(.+)$/
+      cond = $1
+      cond.gsub!("defined","defined?")
+      line = "#{indent}elsif( #{cond} )"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_else(line)
+    case line
+    when /^#\s*else\s*/
+      line = "#{indent}else"
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_endif(line)
+    case line
+    when /^#\s*endif\s*$/
+      line = ["#{indent}end", rescue_nameerror].join($/)
+    else
+      line = nil
+    end
+    return line
+  end
+  
+  def parse_include(line)
+    if( ! @insert_require )
+      return nil
+    end
+
+    file = nil
+    case line
+    when /^#\s*include "(.+)"$/
+      file = $1
+      line = "#{indent}require '#{file}'"
+    when /^#\s*include \<(.+)\>$/
+      file = $1
+      line = "#{indent}require '#{file}'"
+    else
+      line = nil
+    end
+    if( @recursive && file && (!@parsed_files.include?(file)) )
+      parse(file, @recursive, @force, @conly)
+    end
+    return line
+  end
+
+
+  def open_files(infilename)
+    if( ! infilename )
+      return [$stdin, $stdout]
+    end
+
+    old_infilename = infilename
+    infilename = find_path(infilename)
+    if( ! infilename )
+      $stderr.print("'#{old_infilename}' was not found.\n")
+      return [nil,nil]
+    end
+
+    if( infilename )
+      if( infilename[0,1] == '/' )
+	outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
+      else
+	outfilename = infilename + ".rb"
+      end
+      File.mkpath(File.dirname(outfilename))
+    else
+      outfilename = nil
+    end
+    
+    if( infilename )
+      fin    = File.open(infilename,"r")
+    else
+      fin    = $stdin
+    end
+    if( outfilename )
+      if( File.exist?(outfilename) && (!@force) )
+	$stderr.print("'#{outfilename}' have already existed.\n")
+	return [fin, nil]
+      end
+      fout   = File.open(outfilename,"w")
+    else
+      fout   = $stdout
+    end
+
+    $stderr.print("#{infilename} -> #{outfilename}\n")
+    if( fout )
+      dir = File.dirname(outfilename)
+      if( dir[0,1] != "." && dir != "" )
+	fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
+		   "  $LOAD_PATH.push('#{dir}')\n",
+		   "end\n")
+      end
+    end
+    return [fin,fout]
+  end
+
+  def parse(infilename = nil, recursive = false, force = false, conly = false)
+    @commented = false
+    @recursive = recursive
+    @force     = force
+    @conly     = conly
+    @parsed_files << infilename
+
+    fin,fout = open_files(infilename)
+    if( !fin )
+      return
+    end
+
+    begin
+      line_number = 0
+      pre_line    = nil
+      fin.each_line{|line|
+	line_number += 1
+	line.chop!
+	if( $DEBUG )
+	  $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
+	end
+	
+	if( pre_line )
+	  line = pre_line + line
+	  pre_line = nil
+	end
+
+	if( line[-1,1] == "\\" )
+	  pre_line = line[0..-2]
+	  next
+	end
+
+	if( eidx = line.index("enum ") )
+	  pre_line = line[eidx .. -1]
+	  if( i = line.index("{") && j = line.index("}") )
+	    line = line[0..j]
+	    pre_line = nil
+	  else
+	    next
+	  end
+	end
+
+	line = strip_comment(line)
+	case line
+	when /^enum\s/
+	  line = parse_enum(line)
+	when /^#\s*define\s/
+	  line = parse_define(line)
+	when /^#\s*undef\s/
+	  line = parse_undef(line)
+	when /^#\s*ifdef\s/
+	  line = parse_ifdef(line)
+	  up_indent
+	when /^#\s*ifndef\s/
+	  line = parse_ifndef(line)
+	  up_indent
+	when /^#\s*if\s/
+	  line = parse_if(line)
+	  up_indent
+	when /^#\s*elif\s/
+	  down_indent
+	  line = parse_elif(line)
+	  up_indent
+	when /^#\s*else/
+	  down_indent
+	  line = parse_else(line)
+	  up_indent
+	when /^#\s*endif/
+	  down_indent
+	  line = parse_endif(line)
+	when /^#\s*include\s/
+	  line = parse_include(line)
+	else
+	  line = nil
+	end
+	if( line && fout )
+	  fout.print(line, "     # #{line_number}",$/)
+	end
+      }
+    ensure
+      fin.close if fin
+      fout.close if fout
+    end
+  end
+end
+
+h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
+h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 24269dfd78..69d47caac0 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -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,11 +50,7 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
   int   cflag;
   const char *err;
 
-  switch( rb_scan_args(argc, argv, "02", &lib, &flag) ){
-  case 0:
-    clib = NULL;
-    cflag = RTLD_LAZY | RTLD_GLOBAL;
-    break;
+  switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
   case 1:
     clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
     cflag = RTLD_LAZY | RTLD_GLOBAL;
@@ -69,24 +65,24 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
 
   ptr = dlopen(clib, cflag);
 #if defined(HAVE_DLERROR)
-  if( !ptr && (err = dlerror()) ){
-    rb_raise(rb_eDLError, "%s", err);
+  if (!ptr && (err = dlerror())) {
+    rb_raise(rb_eRuntimeError, "%s", err);
   }
 #else
-  if( !ptr ){
+  if (!ptr) {
     err = dlerror();
-    rb_raise(rb_eDLError, "%s", err);
+    rb_raise(rb_eRuntimeError, "%s", 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);
   }
 
@@ -119,109 +115,101 @@ rb_dlhandle_to_i(VALUE self)
   struct dl_handle *dlhandle;
 
   Data_Get_Struct(self, struct dl_handle, dlhandle);
-  return PTR2NUM(dlhandle);
+  return DLLONG2NUM(dlhandle);
 }
 
 VALUE
-rb_dlhandle_sym(VALUE self, VALUE sym)
+rb_dlhandle_to_ptr(VALUE self)
 {
-    void (*func)();
-    struct dl_handle *dlhandle;
-    void *handle;
-    const char *name;
-    const char *err;
-    int i;
+  struct dl_handle *dlhandle;
 
-#if defined(HAVE_DLERROR)
-# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
-#else
-# define CHECK_DLERROR
-#endif
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
+}
 
-    rb_secure(2);
+VALUE
+rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
+{
+  VALUE sym, type;
+  void (*func)();
+  VALUE val;
+  struct dl_handle *dlhandle;
+  void *handle;
+  const char *name, *stype;
+  const char *err;
+
+  rb_secure(2);
+  if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
+    SafeStringValue(type);
+    stype = StringValuePtr(type);
+  }
+  else{
+    stype = NULL;
+  }
 
-    if( sym == Qnil ){
+  if (sym == Qnil) {
 #if defined(RTLD_NEXT)
-	name = RTLD_NEXT;
+    name = RTLD_NEXT;
 #else
-	name = NULL;
+    name = NULL;
 #endif
-    }
-    else{
-	name = StringValuePtr(sym);
-    }
-
+  }
+  else{
+    SafeStringValue(sym);
+    name = StringValuePtr(sym);
+  }
 
-    Data_Get_Struct(self, struct dl_handle, dlhandle);
-    if( ! dlhandle->open ){
-	rb_raise(rb_eDLError, "closed handle");
-    }
-    handle = dlhandle->ptr;
+  Data_Get_Struct(self, struct dl_handle, dlhandle);
+  if (!dlhandle->open) {
+    rb_raise(rb_eRuntimeError, "closed handle");
+  }
+  handle = dlhandle->ptr;
 
-    func = dlsym(handle, name);
-    CHECK_DLERROR;
-    if( !func ){
+  func = dlsym(handle, name);
+#if defined(HAVE_DLERROR)
+  if (!func && (err = dlerror()))
+#else
+  if (!func)
+#endif
+  {
 #if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
-	{
-	    int  len = strlen(name);
-	    char *name_a = (char*)xmalloc(len+2);
-	    strcpy(name_a, name);
-	    name_a[len]   = 'A';
-	    name_a[len+1] = '\0';
-	    func = dlsym(handle, name_a);
-	    xfree(name_a);
-	    CHECK_DLERROR;
-	    if( !func ){
-		for( i = 0; i < 256; i += 4 ){
-		    int  len = strlen(name);
-		    char *name_n = (char*)xmalloc(len+5);
-		    sprintf(name_n, "%s@%d%c", name, i, 0);
-		    func = dlsym(handle, name_n);
-		    xfree(name_n);
-		    CHECK_DLERROR;
-		    if( func )
-                    {
-			break;
-		    }
-		}
-		CHECK_DLERROR;
-		if( !func ){
-		    rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
-		}
-	    }
-	}
+    {
+      int  len = strlen(name);
+      char *name_a = (char*)dlmalloc(len+2);
+      strcpy(name_a, name);
+      name_a[len]   = 'A';
+      name_a[len+1] = '\0';
+      func = dlsym(handle, name_a);
+      dlfree(name_a);
+#if defined(HAVE_DLERROR)
+      if (!func && (err = dlerror()))
 #else
-	for( i = 0; i < 256; i += 4 ){
-	    int  len = strlen(name);
-	    char *name_n = (char*)xmalloc(len+4);
-	    sprintf(name_n, "%s@%d", name, i);
-	    func = dlsym(handle, name_n);
-	    xfree(name_n);
-	    CHECK_DLERROR;
-            if( func ){
-		break;
-	    }
-	}
-	CHECK_DLERROR;
-        if( !func ){
-	    rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
-	}
+      if (!func)
 #endif
+      {
+	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+      }
     }
+#else
+    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
+#endif
+  }
+  val = rb_dlsym_new(func, name, stype);
 
-    return PTR2NUM(func);
+  return val;
 }
 
 void
 Init_dlhandle()
 {
-    rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
-    rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
-    rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
-    rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
-    rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
-    rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, 1);
-    rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym,  1);
-    rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
-    rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
+  rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
+  rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
+  rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
+  rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
+  rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
+  rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
+  rb_define_method(rb_cDLHandle, "sym",  rb_dlhandle_sym, -1);
+  rb_define_method(rb_cDLHandle, "[]",  rb_dlhandle_sym, -1);
+  rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
+  rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
 }
diff --git a/ext/dl/install.rb b/ext/dl/install.rb
new file mode 100644
index 0000000000..69b1834301
--- /dev/null
+++ b/ext/dl/install.rb
@@ -0,0 +1,49 @@
+require 'mkmf'
+require 'ftools'
+
+SO_LIBS = ["dl.so"]
+
+$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
+$prefix = CONFIG['prefix']
+$libdir = File.join($prefix,'lib')
+$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
+$arch = CONFIG['arch']
+$archdir = File.join($rubylibdir, $arch)
+
+def find(dir, match = /./)
+  Dir.chdir(dir)
+  files = []
+  Dir.new(".").each{|file|
+    if( file != "." && file != ".." )
+      case File.ftype(file)
+      when "file"
+	if( file =~ match )
+	  files.push(File.join(dir,file))
+	end
+      when "directory"
+	files += find(file, match).collect{|f| File.join(dir,f)}
+      end
+    end
+  }
+  Dir.chdir("..")
+  return files
+end
+
+def install()
+  rb_files = find(File.join(".","lib"), /.rb$/)
+
+  SO_LIBS.each{|f|
+    File.makedirs($rubylibdir, "#{$archdir}")
+    File.install(f, File.join($archdir,f), 0555, true)
+  }
+
+  rb_files.each{|f|
+    origfile = f
+    instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
+    instdir  = File.dirname(instfile)
+    File.makedirs(instdir)
+    File.install(origfile, instfile, 0644, true)
+  }
+end
+
+install()
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
deleted file mode 100644
index d0b2c7a819..0000000000
--- a/ext/dl/lib/dl/callback.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'dl'
-require 'thread'
-
-module DL
-  SEM = Mutex.new
-
-  def set_callback_internal(proc_entry, addr_entry, argc, ty, &cbp)
-    if( argc < 0 )
-      raise(ArgumentError, "arity should not be less than 0.")
-    end
-    addr = nil
-    SEM.synchronize{
-      ary = proc_entry[ty]
-      (0...MAX_CALLBACK).each{|n|
-        idx = (n * DLSTACK_SIZE) + argc
-        if( ary[idx].nil? )
-          ary[idx] = cbp
-          addr = addr_entry[ty][idx]
-          break
-        end
-      }
-    }
-    addr
-  end
-
-  def set_cdecl_callback(ty, argc, &cbp)
-    set_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, argc, ty, &cbp)
-  end
-
-  def set_stdcall_callback(ty, argc, &cbp)
-    set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
-  end
-
-  def remove_callback_internal(proc_entry, addr_entry, addr, ctype = nil)
-    index = nil
-    if( ctype )
-      addr_entry[ctype].each_with_index{|xaddr, idx|
-        if( xaddr == addr )
-          index = idx
-        end
-      }
-    else
-      addr_entry.each{|ty,entry|
-        entry.each_with_index{|xaddr, idx|
-          if( xaddr == addr )
-            index = idx
-          end
-        }
-      }
-    end
-    if( proc_entry[ctype][index] )
-      proc_entry[ctype][index] = nil
-      return true
-    else
-      return false
-    end
-  end
-
-  def remove_cdecl_callback(addr, ctype = nil)
-    remove_callback_internal(CdeclCallbackProcs, CdeclCallbackAddrs, addr, ctype)
-  end
-
-  def remove_stdcall_callback(addr, ctype = nil)
-    remove_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, addr, ctype)
-  end
-
-  alias set_callback set_cdecl_callback
-  alias remove_callback remove_cdecl_callback
-end
diff --git a/ext/dl/lib/dl/cparser.rb b/ext/dl/lib/dl/cparser.rb
deleted file mode 100644
index c897d1b69f..0000000000
--- a/ext/dl/lib/dl/cparser.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-module DL
-  module CParser
-    def parse_struct_signature(signature, tymap=nil)
-      if( signature.is_a?(String) )
-        signature = signature.split("\s*,\s*")
-      end
-      mems = []
-      tys  = []
-      signature.each{|msig|
-        tks = msig.split(/\s+(\*)?/)
-        ty = tks[0..-2].join(" ")
-        member = tks[-1]
-
-        case ty
-        when /\[(\d+)\]/
-          n = $1.to_i
-          ty.gsub!(/\s*\[\d+\]/,"")
-          ty = [ty, n]
-        when /\[\]/
-          ty.gsub!(/\s*\[\]/, "*")
-        end
-
-        case member
-        when /\[(\d+)\]/
-          ty = [ty, $1.to_i]
-          member.gsub!(/\s*\[\d+\]/,"")
-        when /\[\]/
-          ty = ty + "*"
-          member.gsub!(/\s*\[\]/, "")
-        end
-
-        mems.push(member)
-        tys.push(parse_ctype(ty,tymap))
-      }
-      return tys, mems
-    end
-
-    def parse_signature(signature, tymap=nil)
-      tymap ||= {}
-      signature = signature.gsub(/\s+/, " ").strip
-      case signature
-      when /^([\d\w@\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
-        ret = $1
-        args = $2
-        ret = ret.split(/\s+/)
-        args = args.split(/\s*,\s*/)
-        func = ret.pop
-        if( func =~ /^\*/ )
-          func.gsub!(/^\*+/,"")
-          ret.push("*")
-        end
-        ret  = ret.join(" ")
-        return [func, parse_ctype(ret, tymap), args.collect{|arg| parse_ctype(arg, tymap)}]
-      else
-        raise(RuntimeError,"can't parse the function prototype: #{proto}")
-      end
-    end
-
-    def parse_ctype(ty, tymap=nil)
-      tymap ||= {}
-      case ty
-      when Array
-        return [parse_ctype(ty[0], tymap), ty[1]]
-      when "void"
-        return TYPE_VOID
-      when "char"
-        return TYPE_CHAR
-      when "unsigned char"
-        return  -TYPE_CHAR
-      when "short"
-        return TYPE_SHORT
-      when "unsigned short"
-        return -TYPE_SHORT
-      when "int"
-        return TYPE_INT
-      when "unsigned int"
-        return -TYPE_INT
-      when "long"
-        return TYPE_LONG
-      when "unsigned long"
-        return -TYPE_LONG
-      when "long long"
-        if( defined?(TYPE_LONG_LONG) )
-          return TYPE_LONG_LONG
-        else
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-      when "unsigned long long"
-        if( defined?(TYPE_LONG_LONG) )
-          return -TYPE_LONG_LONG
-        else
-          raise(RuntimeError, "unsupported type: #{ty}")
-        end
-      when "float"
-        return TYPE_FLOAT
-      when "double"
-        return TYPE_DOUBLE
-      when /\*/, /\[\s*\]/
-        return TYPE_VOIDP
-      else
-        if( tymap[ty] )
-          return parse_ctype(tymap[ty], tymap)
-        else
-          raise(DLError, "unknown type: #{ty}")
-        end
-      end
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
deleted file mode 100644
index b29aebcc8b..0000000000
--- a/ext/dl/lib/dl/func.rb
+++ /dev/null
@@ -1,141 +0,0 @@
-require 'dl'
-require 'dl/callback'
-require 'dl/stack'
-require 'dl/value'
-require 'thread'
-
-module DL
-  class Function
-    include DL
-    include ValueUtil
-
-    def initialize(cfunc, argtypes, &proc)
-      @cfunc = cfunc
-      @stack = Stack.new(argtypes.collect{|ty| ty.abs})
-      if( @cfunc.ctype < 0 )
-        @cfunc.ctype = @cfunc.ctype.abs
-        @unsigned = true
-      end
-      if( proc )
-        bind(&proc)
-      end
-    end
-
-    def to_i()
-      @cfunc.to_i
-    end
-
-    def call(*args, &block)
-      funcs = []
-      args = wrap_args(args, @stack.types, funcs, &block)
-      r = @cfunc.call(@stack.pack(args))
-      funcs.each{|f| f.unbind_at_call()}
-      return wrap_result(r)
-    end
-
-    def wrap_result(r)
-      case @cfunc.ctype
-      when TYPE_VOIDP
-        r = CPtr.new(r)
-      else
-        if( @unsigned )
-          r = unsigned_value(r, @cfunc.ctype)
-        end
-      end
-      r
-    end
-
-    def bind(&block)
-      if( !block )
-        raise(RuntimeError, "block must be given.")
-      end
-      if( @cfunc.ptr == 0 )
-        cb = Proc.new{|*args|
-          ary = @stack.unpack(args)
-          @stack.types.each_with_index{|ty, idx|
-            case ty
-            when TYPE_VOIDP
-              ary[idx] = CPtr.new(ary[idx])
-            end
-          }
-          r = block.call(*ary)
-          wrap_arg(r, @cfunc.ctype, [])
-        }
-        case @cfunc.calltype
-        when :cdecl
-          @cfunc.ptr = set_cdecl_callback(@cfunc.ctype, @stack.size, &cb)
-        when :stdcall
-          @cfunc.ptr = set_stdcall_callback(@cfunc.ctype, @stack.size, &cb)
-        else
-          raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
-        end
-        if( @cfunc.ptr == 0 )
-          raise(RuntimeException, "can't bind C function.")
-        end
-      end
-    end
-
-    def unbind()
-      if( @cfunc.ptr != 0 )
-        case @cfunc.calltype
-        when :cdecl
-          remove_cdecl_callback(@cfunc.ptr, @cfunc.ctype)
-        when :stdcall
-          remove_stdcall_callback(@cfunc.ptr, @cfunc.ctype)
-        else
-          raise(RuntimeError, "unsupported calltype: #{@cfunc.calltype}")
-        end
-        @cfunc.ptr = 0
-      end
-    end
-
-    def bind_at_call(&block)
-      bind(&block)
-    end
-
-    def unbind_at_call()
-    end
-  end
-
-  class TempFunction < Function
-    def bind_at_call(&block)
-      bind(&block)
-    end
-
-    def unbind_at_call()
-      unbind()
-    end
-  end
-
-  class CarriedFunction < Function
-    def initialize(cfunc, argtypes, n)
-      super(cfunc, argtypes)
-      @carrier = []
-      @index = n
-      @mutex = Mutex.new
-    end
-
-    def create_carrier(data)
-      ary = []
-      userdata = [ary, data]
-      @mutex.lock()
-      @carrier.push(userdata)
-      return dlwrap(userdata)
-    end
-
-    def bind_at_call(&block)
-      userdata = @carrier[-1]
-      userdata[0].push(block)
-      bind{|*args|
-        ptr = args[@index]
-        if( !ptr )
-          raise(RuntimeError, "The index of userdata should be lower than #{args.size}.")
-        end
-        userdata = dlunwrap(Integer(ptr))
-        args[@index] = userdata[1]
-        userdata[0][0].call(*args)
-      }
-      @mutex.unlock()
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index f6fb35944d..01ee2490e8 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -1,215 +1,225 @@
+# -*- ruby -*-
+
 require 'dl'
-require 'dl/func.rb'
-require 'dl/struct.rb'
-require 'dl/cparser.rb'
+require 'dl/types'
 
 module DL
-  class CompositeHandler
-    def initialize(handlers)
-      @handlers = handlers
-    end
-
-    def handlers()
-      @handlers
-    end
-
-    def sym(symbol)
-      @handlers.each{|handle|
-        if( handle )
-          begin
-            addr = handle.sym(symbol)
-            return addr
-          rescue DLError
-          end
-        end
-      }
-      return nil
-    end
-
-    def [](symbol)
-      sym(symbol)
-    end
-  end
-
-  module Importer
-    include DL
-    include CParser
-    extend Importer
-
-    def dlload(*libs)
-      handles = libs.collect{|lib|
-        case lib
-        when nil
-          nil
-        when Handle
-          lib
-        when Importer
-          lib.handlers
-        else
-          begin
-            DL.dlopen(lib)
-          rescue DLError
-            raise(DLError, "can't load #{lib}")
-          end
-        end
-      }.flatten()
-      @handler = CompositeHandler.new(handles)
-      @func_map = {}
-      @type_alias = {}
-    end
-
-    def typealias(alias_type, orig_type)
-      @type_alias[alias_type] = orig_type
-    end
-
-    def sizeof(ty)
-      case ty
-      when String
-        ty = parse_ctype(ty, @type_alias).abs()
-        case ty
-        when TYPE_CHAR
-          return SIZEOF_CHAR
-        when TYPE_SHORT
-          return SIZEOF_SHORT
-        when TYPE_INT
-          return SIZEOF_INT
-        when TYPE_LONG
-          return SIZEOF_LONG
-        when TYPE_LONG_LONG
-          return SIZEOF_LONG_LON
-        when TYPE_FLOAT
-          return SIZEOF_FLOAT
-        when TYPE_DOUBLE
-          return SIZEOF_DOUBLE
-        when TYPE_VOIDP
-          return SIZEOF_VOIDP
-        else
-          raise(DLError, "unknown type: #{ty}")
-        end
-      when Class
-        if( ty.instance_methods().include?("to_ptr") )
-          return ty.size()
-        end
+  module Importable
+    LIB_MAP = {}
+
+    module Internal
+      def init_types()
+	@types ||= ::DL::Types.new
       end
-      return CPtr[ty].size()
-    end
-
-    def parse_bind_options(opts)
-      h = {}
-      prekey = nil
-      while( opt = opts.shift() )
-        case opt
-        when :stdcall, :cdecl
-          h[:call_type] = opt
-        when :carried, :temp, :temporal, :bind
-          h[:callback_type] = opt
-          h[:carrier] = opts.shift()
-        else
-          h[opt] = true
-        end
+
+      def init_sym()
+	@SYM ||= {}
+      end
+
+      def [](name)
+	return @SYM[name.to_s][0]
+      end
+
+      def dlload(*libnames)
+	if( !defined?(@LIBS) )
+	  @LIBS = []
+	end
+	libnames.each{|libname|
+	  if( !LIB_MAP[libname] )
+	    LIB_MAP[libname] = DL.dlopen(libname)
+	  end
+	  @LIBS.push(LIB_MAP[libname])
+	}
+      end
+      alias dllink :dlload
+
+      def parse_cproto(proto)
+	proto = proto.gsub(/\s+/, " ").strip
+	case proto
+	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
+	  ret = $1
+	  args = $2.strip()
+	  ret = ret.split(/\s+/)
+	  args = args.split(/\s*,\s*/)
+	  func = ret.pop()
+	  if( func =~ /^\*/ )
+	    func.gsub!(/^\*+/,"")
+	    ret.push("*")
+	  end
+	  ret  = ret.join(" ")
+	  return [func, ret, args]
+	else
+	  raise(RuntimeError,"can't parse the function prototype: #{proto}")
+	end
       end
-      h
-    end
-    private :parse_bind_options
-
-    def extern(signature, *opts)
-      symname, ctype, argtype = parse_signature(signature, @type_alias)
-      opt = parse_bind_options(opts)
-      f = import_function(symname, ctype, argtype, opt[:call_type])
-      name = symname.gsub(/@.+/,'')
-      @func_map[name] = f
-      # define_method(name){|*args,&block| f.call(*args,&block)}
-      module_eval(<<-EOS)
-        def #{name}(*args, &block)
-          @func_map['#{name}'].call(*args,&block)
+
+      # example:
+      #   extern "int strlen(char*)"
+      #
+      def extern(proto)
+	func,ret,args = parse_cproto(proto)
+	return import(func, ret, args)
+      end
+
+      # example:
+      #   callback "int method_name(int, char*)"
+      #
+      def callback(proto)
+	func,ret,args = parse_cproto(proto)
+
+	init_types()
+	init_sym()
+
+	rty,renc,rdec = @types.encode_return_type(ret)
+        if( !rty )
+          raise(TypeError, "unsupported type: #{ret}")
         end
-      EOS
-      module_function(name)
-      f
-    end
-
-    def bind(signature, *opts, &blk)
-      name, ctype, argtype = parse_signature(signature, @type_alias)
-      h = parse_bind_options(opts)
-      case h[:callback_type]
-      when :bind, nil
-        f = bind_function(name, ctype, argtype, h[:call_type], &blk)
-      when :temp, :temporal
-        f = create_temp_function(name, ctype, argtype, h[:call_type])
-      when :carried
-        f = create_carried_function(name, ctype, argtype, h[:call_type], h[:carrier])
-      else
-        raise(RuntimeError, "unknown callback type: #{h[:callback_type]}")
+	ty,enc,dec = encode_argument_types(args)
+	symty = rty + ty
+
+	module_eval("module_function :#{func}")
+	sym = module_eval([
+	  "DL::callback(\"#{symty}\"){|*args|",
+	  "  sym,rdec,enc,dec  = @SYM['#{func}']",
+	  "  args = enc.call(args) if enc",
+	  "  r,rs = #{func}(*args)",
+	  "  r  = renc.call(r) if rdec",
+	  "  rs = dec.call(rs) if (dec && rs)",
+	  "  @retval = r",
+	  "  @args   = rs",
+	  "  r",
+	  "}",
+	].join("\n"))
+
+	@SYM[func] = [sym,rdec,enc,dec]
+
+	return sym
+      end
+
+      # example:
+      #  typealias("uint", "unsigned int")
+      #
+      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+	init_types()
+	@types.typealias(alias_type, ty1, enc1, dec1,
+                                     ty2||ty1, enc2, dec2)
       end
-      @func_map[name] = f
-      #define_method(name){|*args,&block| f.call(*args,&block)}
-      module_eval(<<-EOS)
-        def #{name}(*args,&block)
-          @func_map['#{name}'].call(*args,&block)
+
+      # example:
+      #  symbol "foo_value"
+      #  symbol "foo_func", "IIP"
+      #
+      def symbol(name, ty = nil)
+	sym = nil
+	@LIBS.each{|lib|
+	  begin
+	    if( ty )
+	      sym = lib[name, ty]
+	    else
+	      sym = lib[name]
+	    end
+	  rescue
+	    next
+	  end
+	}
+	if( !sym )
+	  raise(RuntimeError, "can't find the symbol `#{name}'")
+	end
+	return sym
+      end
+
+      # example:
+      #   import("get_length", "int", ["void*", "int"])
+      #
+      def import(name, rettype, argtypes = nil)
+	init_types()
+	init_sym()
+
+	rty,_,rdec = @types.encode_return_type(rettype)
+        if( !rty )
+          raise(TypeError, "unsupported type: #{rettype}")
         end
-      EOS
-      module_function(name)
-      f
-    end
-
-    def struct(signature)
-      tys, mems = parse_struct_signature(signature, @type_alias)
-      DL::CStructBuilder.create(CStruct, tys, mems)
-    end
-
-    def union(signature)
-      tys, mems = parse_struct_signature(signature, @type_alias)
-      DL::CStructBuilder.create(CUnion, tys, mems)
-    end
-
-    def [](name)
-      @func_map[name]
-    end
-
-    def create_value(ty, val=nil)
-      s = struct([ty + " value"])
-      ptr = s.malloc()
-      if( val )
-        ptr.value = val
+	ty,enc,dec = encode_argument_types(argtypes)
+	symty = rty + ty
+
+	sym = symbol(name, symty)
+
+	mname = name.dup
+	if( ?A <= mname[0] && mname[0] <= ?Z )
+	  mname[0,1] = mname[0,1].downcase
+	end
+	@SYM[mname] = [sym,rdec,enc,dec]
+	
+	module_eval [
+	  "def #{mname}(*args)",
+	  "  sym,rdec,enc,dec  = @SYM['#{mname}']",
+	  "  args = enc.call(args) if enc",
+	  if( $DEBUG )
+	    "  p \"[DL] call #{mname} with \#{args.inspect}\""
+	  else
+	    ""
+	  end,
+	  "  r,rs = sym.call(*args)",
+	  if( $DEBUG )
+	    "  p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
+	  else
+	    ""
+	  end,
+	  "  r  = rdec.call(r) if rdec",
+	  "  rs = dec.call(rs) if dec",
+	  "  @retval = r",
+	  "  @args   = rs",
+	  "  return r",
+	  "end",
+	  "module_function :#{mname}",
+	].join("\n")
+
+	return sym
       end
-      return ptr
-    end
-    alias value create_value
-
-    def import_value(ty, addr)
-      s = struct([ty + " value"])
-      ptr = s.new(addr)
-      return ptr
-    end
-
-    def import_symbol(name)
-      addr = @handler.sym(name)
-      if( !addr )
-        raise(DLError, "cannot find the symbol: #{name}")
+
+      def _args_
+	return @args
       end
-      CPtr.new(addr)
-    end
 
-    def import_function(name, ctype, argtype, call_type = nil)
-      addr = @handler.sym(name)
-      if( !addr )
-        raise(DLError, "cannot find the function: #{name}()")
+      def _retval_
+	return @retval
+      end
+
+      def encode_argument_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
+	  encty.push(ty)
+	  if( enc )
+	    if( c1 )
+	      conv1 = enc
+	      enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
+	    end
+	  else
+	    if( c1 )
+	      enc = proc{|v| v[idx] = c1.call(v[idx]); v}
+	    end
+	  end
+	  if( dec )
+	    if( c2 )
+	      conv2 = dec
+	      dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
+	    end
+	  else
+	    if( c2 )
+	      dec = proc{|v| v[idx] = c2.call(v[idx]); v}
+	    end
+	  end
+	}
+	return [encty.join, enc, dec]
       end
-      Function.new(CFunc.new(addr, ctype, name, call_type || :cdecl), argtype)
-    end
-
-    def bind_function(name, ctype, argtype, call_type = nil, &block)
-      f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
-      f.bind(&block)
-      f
-    end
-
-    def create_temp_function(name, ctype, argtype, call_type = nil)
-      TempFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
-    end
-
-    def create_carried_function(name, ctype, argtype, call_type = nil, n = 0)
-      CarriedFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype, n)
-    end
-  end
+    end # end of Internal
+    include Internal
+  end # end of Importable
 end
diff --git a/ext/dl/lib/dl/pack.rb b/ext/dl/lib/dl/pack.rb
deleted file mode 100644
index ad91833b3a..0000000000
--- a/ext/dl/lib/dl/pack.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-require 'dl'
-
-module DL
-  module PackInfo
-    if( defined?(TYPE_LONG_LONG) )
-    ALIGN_MAP = {
-      TYPE_VOIDP => ALIGN_VOIDP,
-      TYPE_CHAR  => ALIGN_CHAR,
-      TYPE_SHORT => ALIGN_SHORT,
-      TYPE_INT   => ALIGN_INT,
-      TYPE_LONG  => ALIGN_LONG,
-      TYPE_LONG_LONG => ALIGN_LONG_LONG,
-      TYPE_FLOAT => ALIGN_FLOAT,
-      TYPE_DOUBLE => ALIGN_DOUBLE,
-      -TYPE_CHAR  => ALIGN_CHAR,
-      -TYPE_SHORT => ALIGN_SHORT,
-      -TYPE_INT   => ALIGN_INT,
-      -TYPE_LONG  => ALIGN_LONG,
-      -TYPE_LONG_LONG => ALIGN_LONG_LONG,
-    }
-
-    PACK_MAP = {
-      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
-      TYPE_CHAR  => "c",
-      TYPE_SHORT => "s!",
-      TYPE_INT   => "i!",
-      TYPE_LONG  => "l!",
-      TYPE_LONG_LONG => "q",
-      TYPE_FLOAT => "f",
-      TYPE_DOUBLE => "d",
-      -TYPE_CHAR  => "c",
-      -TYPE_SHORT => "s!",
-      -TYPE_INT   => "i!",
-      -TYPE_LONG  => "l!",
-      -TYPE_LONG_LONG => "q",
-    }
-
-    SIZE_MAP = {
-      TYPE_VOIDP => SIZEOF_VOIDP,
-      TYPE_CHAR  => SIZEOF_CHAR,
-      TYPE_SHORT => SIZEOF_SHORT,
-      TYPE_INT   => SIZEOF_INT,
-      TYPE_LONG  => SIZEOF_LONG,
-      TYPE_LONG_LONG => SIZEOF_LONG_LONG,
-      TYPE_FLOAT => SIZEOF_FLOAT,
-      TYPE_DOUBLE => SIZEOF_DOUBLE,
-      -TYPE_CHAR  => SIZEOF_CHAR,
-      -TYPE_SHORT => SIZEOF_SHORT,
-      -TYPE_INT   => SIZEOF_INT,
-      -TYPE_LONG  => SIZEOF_LONG,
-      -TYPE_LONG_LONG => SIZEOF_LONG_LONG,
-    }
-    else
-    ALIGN_MAP = {
-      TYPE_VOIDP => ALIGN_VOIDP,
-      TYPE_CHAR  => ALIGN_CHAR,
-      TYPE_SHORT => ALIGN_SHORT,
-      TYPE_INT   => ALIGN_INT,
-      TYPE_LONG  => ALIGN_LONG,
-      TYPE_FLOAT => ALIGN_FLOAT,
-      TYPE_DOUBLE => ALIGN_DOUBLE,
-      -TYPE_CHAR  => ALIGN_CHAR,
-      -TYPE_SHORT => ALIGN_SHORT,
-      -TYPE_INT   => ALIGN_INT,
-      -TYPE_LONG  => ALIGN_LONG,
-    }
-
-    PACK_MAP = {
-      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG) ? "q" : "l!"),
-      TYPE_CHAR  => "c",
-      TYPE_SHORT => "s!",
-      TYPE_INT   => "i!",
-      TYPE_LONG  => "l!",
-      TYPE_FLOAT => "f",
-      TYPE_DOUBLE => "d",
-      -TYPE_CHAR  => "c",
-      -TYPE_SHORT => "s!",
-      -TYPE_INT   => "i!",
-      -TYPE_LONG  => "l!",
-    }
-
-    SIZE_MAP = {
-      TYPE_VOIDP => SIZEOF_VOIDP,
-      TYPE_CHAR  => SIZEOF_CHAR,
-      TYPE_SHORT => SIZEOF_SHORT,
-      TYPE_INT   => SIZEOF_INT,
-      TYPE_LONG  => SIZEOF_LONG,
-      TYPE_FLOAT => SIZEOF_FLOAT,
-      TYPE_DOUBLE => SIZEOF_DOUBLE,
-      -TYPE_CHAR  => SIZEOF_CHAR,
-      -TYPE_SHORT => SIZEOF_SHORT,
-      -TYPE_INT   => SIZEOF_INT,
-      -TYPE_LONG  => SIZEOF_LONG,
-    }
-    end
-
-    def align(addr, align)
-      d = addr % align
-      if( d == 0 )
-        addr
-      else
-        addr + (align - d)
-      end
-    end
-    module_function :align
-  end
-
-  class Packer
-    include PackInfo
-
-    def Packer.[](*types)
-      Packer.new(types)
-    end
-
-    def initialize(types)
-      parse_types(types)
-    end
-
-    def size()
-      @size
-    end
-    
-    def pack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.pack(@template)
-      when SIZEOF_LONG
-        ary.pack(@template)
-      else
-        raise(RuntimeError, "sizeof(void*)?")
-      end
-    end
-
-    def unpack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.join().unpack(@template)
-      when SIZEOF_LONG_LONG
-        ary.join().unpack(@template)
-      else
-        raise(RuntimeError, "sizeof(void*)?")
-      end
-    end
-    
-    private
-    
-    def parse_types(types)
-      @template = ""
-      addr     = 0
-      types.each{|t|
-        orig_addr = addr
-        if( t.is_a?(Array) )
-          addr = align(orig_addr, ALIGN_MAP[TYPE_VOIDP])
-        else
-          addr = align(orig_addr, ALIGN_MAP[t])
-        end
-        d = addr - orig_addr
-        if( d > 0 )
-          @template << "x#{d}"
-        end
-        if( t.is_a?(Array) )
-          @template << (PACK_MAP[t[0]] * t[1])
-          addr += (SIZE_MAP[t[0]] * t[1])
-        else
-          @template << PACK_MAP[t]
-          addr += SIZE_MAP[t]
-        end
-      }
-      addr = align(addr, ALIGN_MAP[TYPE_VOIDP])
-      @size = addr
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/stack.rb b/ext/dl/lib/dl/stack.rb
deleted file mode 100644
index 9daf089775..0000000000
--- a/ext/dl/lib/dl/stack.rb
+++ /dev/null
@@ -1,140 +0,0 @@
-require 'dl'
-
-module DL
-  class Stack
-    def Stack.[](*types)
-      Stack.new(types)
-    end
-
-    def initialize(types)
-      parse_types(types)
-    end
-
-    def size()
-      @size
-    end
-
-    def types()
-      @types
-    end
-
-    def pack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.pack(@template).unpack('l!*')
-      when SIZEOF_LONG_LONG
-        ary.pack(@template).unpack('q*')
-      else
-        raise(RuntimeError, "sizeof(void*)?")
-      end
-    end
-
-    def unpack(ary)
-      case SIZEOF_VOIDP
-      when SIZEOF_LONG
-        ary.pack('l!*').unpack(@template)
-      when SIZEOF_LONG_LONG
-        ary.pack('q*').unpack(@template)
-      else
-        raise(RuntimeError, "sizeof(void*)?")
-      end
-    end
-    
-    private
-    
-    def align(addr, align)
-      d = addr % align
-      if( d == 0 )
-        addr
-      else
-        addr + (align - d)
-      end
-    end
-
-if( defined?(TYPE_LONG_LONG) )
-    ALIGN_MAP = {
-      TYPE_VOIDP => ALIGN_VOIDP,
-      TYPE_CHAR  => ALIGN_VOIDP,
-      TYPE_SHORT => ALIGN_VOIDP,
-      TYPE_INT   => ALIGN_VOIDP,
-      TYPE_LONG  => ALIGN_VOIDP,
-      TYPE_LONG_LONG => ALIGN_LONG_LONG,
-      TYPE_FLOAT => ALIGN_FLOAT,
-      TYPE_DOUBLE => ALIGN_DOUBLE,
-    }
-
-    PACK_MAP = {
-      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG)? "q" : "l!"),
-      TYPE_CHAR  => "c",
-      TYPE_SHORT => "s!",
-      TYPE_INT   => "i!",
-      TYPE_LONG  => "l!",
-      TYPE_LONG_LONG => "q",
-      TYPE_FLOAT => "f",
-      TYPE_DOUBLE => "d",
-    }
-
-    SIZE_MAP = {
-      TYPE_VOIDP => SIZEOF_VOIDP,
-      TYPE_CHAR  => SIZEOF_CHAR,
-      TYPE_SHORT => SIZEOF_SHORT,
-      TYPE_INT   => SIZEOF_INT,
-      TYPE_LONG  => SIZEOF_LONG,
-      TYPE_LONG_LONG => SIZEOF_LONG_LONG,
-      TYPE_FLOAT => SIZEOF_FLOAT,
-      TYPE_DOUBLE => SIZEOF_DOUBLE,
-    }
-else
-    ALIGN_MAP = {
-      TYPE_VOIDP => ALIGN_VOIDP,
-      TYPE_CHAR  => ALIGN_VOIDP,
-      TYPE_SHORT => ALIGN_VOIDP,
-      TYPE_INT   => ALIGN_VOIDP,
-      TYPE_LONG  => ALIGN_VOIDP,
-      TYPE_FLOAT => ALIGN_FLOAT,
-      TYPE_DOUBLE => ALIGN_DOUBLE,
-    }
-
-    PACK_MAP = {
-      TYPE_VOIDP => ((SIZEOF_VOIDP == SIZEOF_LONG_LONG)? "q" : "l!"),
-      TYPE_CHAR  => "c",
-      TYPE_SHORT => "s!",
-      TYPE_INT   => "i!",
-      TYPE_LONG  => "l!",
-      TYPE_FLOAT => "f",
-      TYPE_DOUBLE => "d",
-    }
-
-    SIZE_MAP = {
-      TYPE_VOIDP => SIZEOF_VOIDP,
-      TYPE_CHAR  => SIZEOF_CHAR,
-      TYPE_SHORT => SIZEOF_SHORT,
-      TYPE_INT   => SIZEOF_INT,
-      TYPE_LONG  => SIZEOF_LONG,
-      TYPE_FLOAT => SIZEOF_FLOAT,
-      TYPE_DOUBLE => SIZEOF_DOUBLE,
-    }
-end
-
-    def parse_types(types)
-      @types = types
-      @template = ""
-      addr      = 0
-      types.each{|t|
-        orig_addr = addr
-        addr = align(orig_addr, ALIGN_MAP[t])
-        d = addr - orig_addr
-        if( d > 0 )
-          @template << "x#{d}"
-        end
-        @template << PACK_MAP[t]
-        addr += SIZE_MAP[t]
-      }
-      if( addr % SIZEOF_VOIDP == 0 )
-        @size = addr / SIZEOF_VOIDP
-      else
-        @size = (addr / SIZEOF_VOIDP) + 1
-      end
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 4272b3960c..33f303fe22 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -1,213 +1,149 @@
+# -*- ruby -*-
+
 require 'dl'
-require 'dl/pack.rb'
+require 'dl/import'
 
 module DL
-  class CStruct
-    def CStruct.entity_class()
-      CStructEntity
-    end
-  end
-
-  class CUnion
-    def CUnion.entity_class()
-      CUnionEntity
-    end
-  end
-
-  module CStructBuilder
-    def create(klass, types, members)
-      new_class = Class.new(klass){
-        define_method(:initialize){|addr|
-          @entity = klass.entity_class.new(addr, types)
-          @entity.assign_names(members)
-        }
-        define_method(:to_ptr){ @entity }
-        define_method(:to_i){ @entity.to_i }
-        members.each{|name|
-          define_method(name){ @entity[name] }
-          define_method(name + "="){|val| @entity[name] = val }
-        }
-      }
-      size = klass.entity_class.size(types)
-      new_class.module_eval(<<-EOS)
-        def new_class.size()
-          #{size}
-        end
-        def new_class.malloc()
-          addr = DL.malloc(#{size})
-          new(addr)
-        end
-      EOS
-      return new_class
-    end
-    module_function :create
-  end
-
-  class CStructEntity < CPtr
-    include PackInfo
-    include ValueUtil
-
-    def CStructEntity.malloc(types, func = nil)
-      addr = DL.malloc(CStructEntity.size(types))
-      CStructEntity.new(addr, types, func)
-    end
-
-    def CStructEntity.size(types)
-      offset = 0
-      max_align = 0
-      types.each_with_index{|t,i|
-        orig_offset = offset
-        if( t.is_a?(Array) )
-          align = PackInfo::ALIGN_MAP[t[0]]
-          offset = PackInfo.align(orig_offset, align)
-          size = offset - orig_offset
-          offset += (PackInfo::SIZE_MAP[t[0]] * t[1])
-        else
-          align = PackInfo::ALIGN_MAP[t]
-          offset = PackInfo.align(orig_offset, align)
-          size = offset - orig_offset
-          offset += PackInfo::SIZE_MAP[t]
-        end
-        if (max_align < align)
-          max_align = align
-        end
-      }
-      offset = PackInfo.align(offset, max_align)
-      offset
-    end
-
-    def initialize(addr, types, func = nil)
-      set_ctypes(types)
-      super(addr, @size, func)
-    end
-
-    def assign_names(members)
-      @members = members
-    end
-
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = []
-      offset = 0
-      max_align = 0
-      types.each_with_index{|t,i|
-        orig_offset = offset
-        if( t.is_a?(Array) )
-          align = ALIGN_MAP[t[0]]
-        else
-          align = ALIGN_MAP[t]
-        end
-        offset = PackInfo.align(orig_offset, align)
-        size = offset - orig_offset
-        @offset[i] = offset
-        if( t.is_a?(Array) )
-          offset += (SIZE_MAP[t[0]] * t[1])
-        else
-          offset += SIZE_MAP[t]
-        end
-        if (max_align < align)
-          max_align = align
-        end
-      }
-      offset = PackInfo.align(offset, max_align)
-      @size = offset
-    end
-
-    def [](name)
-      idx = @members.index(name)
-      if( idx.nil? )
-        raise(ArgumentError, "no such member: #{name}")
+  module Importable
+    module Internal
+      def define_struct(contents)
+	init_types()
+	Struct.new(@types, contents)
       end
-      ty = @ctypes[idx]
-      if( ty.is_a?(Array) )
-        r = super(@offset[idx], SIZE_MAP[ty[0]] * ty[1])
-      else
-        r = super(@offset[idx], SIZE_MAP[ty.abs])
-      end
-      packer = Packer.new([ty])
-      val = packer.unpack([r])
-      case ty
-      when Array
-        case ty[0]
-        when TYPE_VOIDP
-          val = val.collect{|v| CPtr.new(v)}
-        end
-      when TYPE_VOIDP
-        val = CPtr.new(val[0])
-      else
-        val = val[0]
-      end
-      if( ty.is_a?(Integer) && (ty < 0) )
-        return unsigned_value(val, ty)
-      elsif( ty.is_a?(Array) && (ty[0] < 0) )
-        return val.collect{|v| unsigned_value(v,ty[0])}
-      else
-        return val
-      end
-    end
+      alias struct define_struct
 
-    def []=(name, val)
-      idx = @members.index(name)
-      if( idx.nil? )
-        raise(ArgumentError, "no such member: #{name}")
+      def define_union(contents)
+	init_types()
+	Union.new(@types, contents)
       end
-      ty  = @ctypes[idx]
-      packer = Packer.new([ty])
-      val = wrap_arg(val, ty, [])
-      buff = packer.pack([val].flatten())
-      super(@offset[idx], buff.size, buff)
-      if( ty.is_a?(Integer) && (ty < 0) )
-        return unsigned_value(val, ty)
-      elsif( ty.is_a?(Array) && (ty[0] < 0) )
-        return val.collect{|v| unsigned_value(v,ty[0])}
-      else
-        return val
+      alias union define_union
+
+      class Memory
+	def initialize(ptr, names, ty, len, enc, dec)
+	  @ptr = ptr
+	  @names = names
+	  @ty    = ty
+	  @len   = len
+	  @enc   = enc
+	  @dec   = dec
+
+	  # define methods
+	  @names.each{|name|
+	    instance_eval [
+	      "def #{name}",
+	      "  v = @ptr[\"#{name}\"]",
+	      "  if( @len[\"#{name}\"] )",
+	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+              "  else",
+	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
+	      "  end",
+	      "  return v",
+	      "end",
+	      "def #{name}=(v)",
+	      "  if( @len[\"#{name}\"] )",
+	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+	      "  else",
+	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
+              "  end",
+	      "  @ptr[\"#{name}\"] = v",
+	      "  return v",
+	      "end",
+	    ].join("\n")
+	  }
+	end
+
+	def to_ptr
+	  return @ptr
+	end
+
+	def size
+	  return @ptr.size
+	end
       end
-    end
-
-    def to_s()
-      super(@size)
-    end
-  end
-
-  class CUnionEntity < CStructEntity
-    include PackInfo
-
-    def CUnionEntity.malloc(types, func=nil)
-      addr = DL.malloc(CUnionEntity.size(types))
-      CUnionEntity.new(addr, types, func)
-    end
-
-    def CUnionEntity.size(types)
-      size   = 0
-      types.each_with_index{|t,i|
-        if( t.is_a?(Array) )
-          tsize = PackInfo::SIZE_MAP[t[0]] * t[1]
-        else
-          tsize = PackInfo::SIZE_MAP[t]
-        end
-        if( tsize > size )
-          size = tsize
-        end
-      }
-    end
-
-    def set_ctypes(types)
-      @ctypes = types
-      @offset = []
-      @size   = 0
-      types.each_with_index{|t,i|
-        @offset[i] = 0
-        if( t.is_a?(Array) )
-          size = SIZE_MAP[t[0]] * t[1]
-        else
-          size = SIZE_MAP[t]
-        end
-        if( size > @size )
-          @size = size
-        end
-      }
-    end
-  end
-end
 
+      class Struct
+	def initialize(types, contents)
+	  @names = []
+	  @ty   = {}
+	  @len  = {}
+	  @enc  = {}
+	  @dec  = {}
+	  @size = 0
+	  @tys  = ""
+	  @types = types
+	  parse(contents)
+	end
+
+	def size
+	  return @size
+	end
+
+	def members
+	  return @names
+	end
+
+	# ptr must be a PtrData object.
+	def new(ptr)
+	  ptr.struct!(@tys, *@names)
+	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+	  return mem
+	end
+
+	def malloc(size = nil)
+	  if( !size )
+	    size = @size
+	  end
+	  ptr = DL::malloc(size)
+	  return new(ptr)
+	end
+
+	def parse(contents)
+	  contents.each{|elem|
+	    name,ty,num,enc,dec = parse_elem(elem)
+	    @names.push(name)
+	    @ty[name]  = ty
+	    @len[name] = num
+	    @enc[name] = enc
+	    @dec[name] = dec
+	    if( num )
+	      @tys += "#{ty}#{num}"
+	    else
+	      @tys += ty
+	    end
+	  }
+	  @size = DL.sizeof(@tys)
+	end
+	
+	def parse_elem(elem)
+	  elem.strip!
+	  case elem
+	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
+	    ty = ($1 + $2).strip
+	    name = $3
+	    num = nil;
+	  when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
+	    ty = ($1 + $2).strip
+	    name = $3
+	    num = $4.to_i
+	  else
+	    raise(RuntimeError, "invalid element: #{elem}")
+	  end
+	  ty,enc,dec = @types.encode_struct_type(ty)
+          if( !ty )
+            raise(TypeError, "unsupported type: #{ty}")
+          end
+	  return [name,ty,num,enc,dec]
+	end
+      end  # class Struct
+      
+      class Union < Struct
+	def new
+	  ptr = DL::malloc(@size)
+	  ptr.union!(@tys, *@names)
+	  mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
+	  return mem
+	end
+      end
+    end  # module Internal
+  end  # module Importable
+end  # module DL
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index b85ac890cd..1144917dae 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -1,40 +1,245 @@
+# -*- ruby -*-
+
+require 'dl'
+
 module DL
-  module Win32Types
-    def included(m)
-      m.module_eval{
-        typealias "DWORD", "unsigned long"
-        typealias "PDWORD", "unsigned long *"
-        typealias "WORD", "unsigned short"
-        typealias "PWORD", "unsigned short *"
-        typealias "BOOL", "int"
-        typealias "ATOM", "int"
-        typealias "BYTE", "unsigned char"
-        typealias "PBYTE", "unsigned char *"
-        typealias "UINT", "unsigned int"
-        typealias "ULONG", "unsigned long"
-        typealias "UCHAR", "unsigned char"
-        typealias "HANDLE", "unsigned long"
-        typealias "PHANDLE", "void*"
-        typealias "PVOID", "void*"
-        typealias "LPCSTR", "char*"
-        typealias "LPSTR", "char*"
-        typealias "HINSTANCE", "unsigned int"
-        typealias "HDC", "unsigned int"
-        typealias "HWND", "unsigned int"
+  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)
+      
+      # 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],
+      
+      # 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],
+
+      # DL::Importable primitive types
+      ["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",
+	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",
+	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",
+	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",
+	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",
+	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",
+	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",
+	proc{|v| [v].pack("C").unpack("c")[0]},
+	proc{|v| [v].pack("c").unpack("C")[0]},
+	nil, 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",
+	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],
+    ]
+
+    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])
+    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))}
+	    end
+	  else
+	    if( enc )
+	      proc_encode = enc
+	    end
+	  end
+	  if( proc_decode )
+	    if( dec )
+	      conv2 = proc_decode
+	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	    end
+	  else
+	    if( dec )
+	      proc_decode = dec
+	    end
+	  end
+	end
       }
+      return [alias_type, proc_encode, proc_decode]
     end
-    module_function :included
-  end
-
-  module BasicTypes
-    def included(m)
-      m.module_eval{
-        typealias "uint", "unsigned int"
-        typealias "u_int", "unsigned int"
-        typealias "ulong", "unsigned long"
-        typealias "u_long", "unsigned long"
+
+    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))}
+	    end
+	  else
+	    if( enc )
+	      proc_encode = enc
+	    end
+	  end
+	  if( proc_decode )
+	    if( dec )
+	      conv2 = proc_decode
+	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	    end
+	  else
+	    if( dec )
+	      proc_decode = dec
+	    end
+	  end
+	end
       }
+      return [alias_type, proc_encode, proc_decode]
     end
-    module_function :included
-  end
+  end # end of Types
 end
diff --git a/ext/dl/lib/dl/value.rb b/ext/dl/lib/dl/value.rb
deleted file mode 100644
index aa7e0dd325..0000000000
--- a/ext/dl/lib/dl/value.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-require 'dl'
-
-module DL
-  module ValueUtil
-    def unsigned_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("c").unpack("C")[0]
-      when TYPE_SHORT
-        [val].pack("s!").unpack("S!")[0]
-      when TYPE_INT
-        [val].pack("i!").unpack("I!")[0]
-      when TYPE_LONG
-        [val].pack("l!").unpack("L!")[0]
-      when TYPE_LONG_LONG
-        [val].pack("q!").unpack("Q!")[0]
-      else
-        val
-      end
-    end
-
-    def signed_value(val, ty)
-      case ty.abs
-      when TYPE_CHAR
-        [val].pack("C").unpack("c")[0]
-      when TYPE_SHORT
-        [val].pack("S!").unpack("s!")[0]
-      when TYPE_INT
-        [val].pack("I!").unpack("i!")[0]
-      when TYPE_LONG
-        [val].pack("L!").unpack("l!")[0]
-      when TYPE_LONG_LONG
-        [val].pack("Q!").unpack("q!")[0]
-      else
-        val
-      end
-    end
-
-    def wrap_args(args, tys, funcs, &block)
-      result = []
-      tys ||= []
-      args.each_with_index{|arg, idx|
-        result.push(wrap_arg(arg, tys[idx], funcs, &block))
-      }
-      result
-    end
-
-    def wrap_arg(arg, ty, funcs, &block)
-        funcs ||= []
-        case arg
-        when CPtr
-          return arg.to_i
-        when IO
-          case ty
-          when TYPE_VOIDP
-            return CPtr[arg].to_i
-          else
-            return arg.to_i
-          end
-        when Function
-          if( block )
-            arg.bind_at_call(&block)
-            funcs.push(arg)
-          end
-          return arg.to_i
-        when String
-          if( ty.is_a?(Array) )
-            return arg.unpack('C*')
-          else
-            case SIZEOF_VOIDP
-            when SIZEOF_LONG
-              return [arg].pack("p").unpack("l!")[0]
-            when SIZEOF_LONG_LONG
-              return [arg].pack("p").unpack("q")[0]
-            else
-              raise(RuntimeError, "sizeof(void*)?")
-            end
-          end
-        when Float, Integer
-          return arg
-        when Array
-          if( ty.is_a?(Array) ) # used only by struct
-            case ty[0]
-            when TYPE_VOIDP
-              return arg.collect{|v| Integer(v)}
-            when TYPE_CHAR
-              if( arg.is_a?(String) )
-                return val.unpack('C*')
-              end
-            end
-            return arg
-          else
-            return arg
-          end
-        else
-          if( arg.respond_to?(:to_ptr) )
-            return arg.to_ptr.to_i
-          else
-            begin
-              return Integer(arg)
-            rescue
-              raise(ArgumentError, "unknown argument type: #{arg.class}")
-            end
-          end
-        end
-    end
-  end
-end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
new file mode 100644
index 0000000000..0fed47c324
--- /dev/null
+++ b/ext/dl/lib/dl/win32.rb
@@ -0,0 +1,25 @@
+# -*- ruby -*-
+
+require 'dl'
+
+class Win32API
+  DLL = {}
+
+  def initialize(dllname, func, import, export = "0")
+    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    handle = DLL[dllname] ||= DL::Handle.new(dllname)
+    @sym = handle.sym(func, prototype)
+  end
+
+  def call(*args)
+    import = @sym.proto.split("", 2)[1]
+    args.each_with_index do |x, i|
+      args[i] = nil if x == 0 and import[i] == ?S
+      args[i], = [x].pack("I").unpack("i") if import[i] == ?I
+    end
+    ret, = @sym.call(*args)
+    return ret || 0
+  end
+
+  alias Call call
+end
diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
new file mode 100644
index 0000000000..6a85570152
--- /dev/null
+++ b/ext/dl/mkcall.rb
@@ -0,0 +1,62 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def output_arg(x,i)
+  "args[#{i}].#{DLTYPE[x][:stmem]}"
+end
+
+def output_args(types)
+  t = []
+  types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
+  t.join(",")
+end
+
+def output_callfunc(types)
+  t = types[0]
+  stmem = DLTYPE[t][:stmem]
+  ctypes = types2ctypes(types)
+  if( t == VOID )
+    callstm = "(*f)(#{output_args(types)})"
+  else
+    callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
+  end
+  [ "{",
+    "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
+    "#{callstm};",
+    "}"].join(" ")
+end
+
+def output_case(types)
+  num = types2num(types)
+  callfunc_stm = output_callfunc(types)
+<<EOF
+  case #{num}:
+#ifdef DEBUG
+    printf("#{callfunc_stm}\\n");
+#endif
+    #{callfunc_stm};
+    break;
+EOF
+end
+
+def rec_output(types = [VOID])
+  print output_case(types)
+  if( types.length <= MAX_ARG )
+    DLTYPE.keys.sort.each{|t|
+      if( t != VOID && DLTYPE[t][:sym] )
+	rec_output(types + [t])
+      end
+    }
+  end
+end
+
+DLTYPE.keys.sort.each{|t|
+  if( DLTYPE[t][:sym] )
+    $stderr.printf("  #{DLTYPE[t][:ctype]}\n")
+    rec_output([t])
+  end
+}
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
index 21fb177f8b..c9f92e4a0d 100644
--- a/ext/dl/mkcallback.rb
+++ b/ext/dl/mkcallback.rb
@@ -1,189 +1,56 @@
-$out  ||= $stdout
-$dl_h = ARGV[0] || "dl.h"
+# -*- ruby -*-
 
-# import DLSTACK_SIZE, DLSTACK_ARGS and so on
-File.open($dl_h){|f|
-  pre = ""
-  f.each{|line|
-    line.chop!
-    if( line[-1] == ?\ )
-      line.chop!
-      line.concat(" ")
-      pre += line
-      next
-    end
-    if( pre.size > 0 )
-      line = pre + line
-      pre  = ""
-    end
-    case line
-    when /#define\s+DLSTACK_SIZE\s+\(?(\d+)\)?/
-      DLSTACK_SIZE = $1.to_i
-    when /#define\s+DLSTACK_ARGS\s+(.+)/
-      DLSTACK_ARGS = $1.to_i
-    when /#define\s+DLTYPE_([A-Z_]+)\s+\(?(\d+)\)?/
-      eval("#{$1} = #{$2}")
-    when /#define\s+MAX_DLTYPE\s+\(?(\d+)\)?/
-      MAX_DLTYPE  = $1.to_i
-    when /#define\s+MAX_CALLBACK\s+\(?(\d+)\)?/
-      MAX_CALLBACK = $1.to_i
-    end
-  }
-}
-
-CDECL = "cdecl"
-STDCALL = "stdcall"
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
 
-CALLTYPES = [CDECL, STDCALL]
+def mkfunc(rettype, fnum, argc)
+  args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
 
-DLTYPE = {
-  VOID => {
-    :name => 'void',
-    :type => 'void',
-    :conv => nil,
-  },
-  CHAR => {
-    :name => 'char',
-    :type => 'char',
-    :conv => 'NUM2CHR(%s)'
-  },
-  SHORT => {
-    :name => 'short',
-    :type => 'short',
-    :conv => 'NUM2INT(%s)',
-  },
-  INT => {
-    :name => 'int',
-    :type => 'int',
-    :conv => 'NUM2INT(%s)',
-  },
-  LONG  => {
-    :name => 'long',
-    :type => 'long',
-    :conv => 'NUM2LONG(%s)',
-  },
-  LONG_LONG => {
-    :name => 'long_long',
-    :type => 'LONG_LONG',
-    :conv => 'NUM2LL(%s)',
-  },
-  FLOAT => {
-    :name => 'float',
-    :type => 'float',
-    :conv => 'RFLOAT_VALUE(%s)',
-  },
-  DOUBLE => {
-    :name => 'double',
-    :type => 'double',
-    :conv => 'RFLOAT_VALUE(%s)',
-  },
-  VOIDP => {
-    :name => 'ptr',
-    :type => 'void *',
-    :conv => 'NUM2PTR(%s)',
-  },
-}
+  subst_code = (0..(argc-1)).collect{|i|
+    "  buff[#{i.to_s}] = arg#{i.to_s};"
+  }.join("\n")
 
+  ret_code =
+    if( DLTYPE[rettype][:c2rb] )
+      "  return #{DLTYPE[rettype][:rb2c]['retval']};"
+    else
+      "  /* no return value */"
+    end
 
-def func_name(ty, argc, n, calltype)
-  "rb_dl_callback_#{DLTYPE[ty][:name]}_#{argc}_#{n}_#{calltype}"
+  code = [
+    "static #{DLTYPE[rettype][:ctype]}",
+    "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
+    "{",
+    "  VALUE retval, proto, proc, obj;",
+    "  VALUE argv[#{argc.to_s}];",
+    "  int  argc;",
+    "  long buff[#{argc.to_s}];",
+    "",
+    subst_code,
+    "",
+    "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
+    "  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);",
+    "  if( RSTRING(proto)->len >= #{argc.to_s} )",
+    "    rb_raise(rb_eArgError, \"too many arguments\");",
+    "  rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
+    "  retval = rb_funcall2(proc, id_call, argc, argv);",
+    "",
+    ret_code,
+    "}",
+  ].join("\n")
+
+  return code
 end
 
-$out << (<<EOS)
-VALUE rb_DLCdeclCallbackAddrs, rb_DLCdeclCallbackProcs;
-VALUE rb_DLStdcallCallbackAddrs, rb_DLStdcallCallbackProcs;
-/*static void *cdecl_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-/*static void *stdcall_callbacks[MAX_DLTYPE][MAX_CALLBACK];*/
-static ID   cb_call;
-EOS
-
-for calltype in CALLTYPES
-  case calltype
-  when CDECL
-    proc_entry = "rb_DLCdeclCallbackProcs"
-  when STDCALL
-    proc_entry = "rb_DLStdcallCallbackProcs"
-  else
-    raise "unknown calltype: #{calltype}"
+DLTYPE.keys.sort.each{|t|
+  for n in 0..(MAX_CALLBACK - 1)
+    print(mkfunc(t, n, 15), "\n\n")
   end
-  for ty in 0..(MAX_DLTYPE-1)
-    for argc in 0..(DLSTACK_SIZE-1)
-      for n in 0..(MAX_CALLBACK-1)
-        $out << (<<-EOS)
-
-static #{DLTYPE[ty][:type]}
-FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack" + i.to_s}.join(", ")})
-{
-    VALUE ret, cb#{argc > 0 ? ", args[#{argc}]" : ""};
-#{
-      (0...argc).collect{|i|
-	"    args[%d] = LONG2NUM(stack%d);" % [i,i]
-      }.join("\n")
-}
-    cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
-    ret = rb_funcall2(cb, cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
-    return #{DLTYPE[ty][:conv] ? DLTYPE[ty][:conv] % "ret" : ""};
-}
-
-        EOS
-      end
-    end
-  end
-end
-
-$out << (<<EOS)
-static void
-rb_dl_init_callbacks()
-{
-    cb_call = rb_intern("call");		       
-
-    rb_DLCdeclCallbackProcs = rb_ary_new();
-    rb_DLCdeclCallbackAddrs = rb_ary_new();
-    rb_DLStdcallCallbackProcs = rb_ary_new();
-    rb_DLStdcallCallbackAddrs = rb_ary_new();
-    rb_define_const(rb_mDL, "CdeclCallbackProcs", rb_DLCdeclCallbackProcs);
-    rb_define_const(rb_mDL, "CdeclCallbackAddrs", rb_DLCdeclCallbackAddrs);
-    rb_define_const(rb_mDL, "StdcallCallbackProcs", rb_DLStdcallCallbackProcs);
-    rb_define_const(rb_mDL, "StdcallCallbackAddrs", rb_DLStdcallCallbackAddrs);
-#{
-    (0...MAX_DLTYPE).collect{|ty|
-      sprintf("    rb_ary_push(rb_DLCdeclCallbackProcs, rb_ary_new3(%d,%s));",
-              MAX_CALLBACK * DLSTACK_SIZE,
-              (0...MAX_CALLBACK).collect{
-                (0...DLSTACK_SIZE).collect{ "Qnil" }.join(",")
-              }.join(","))
-    }.join("\n")
-}
-#{
-    (0...MAX_DLTYPE).collect{|ty|
-      sprintf("    rb_ary_push(rb_DLCdeclCallbackAddrs, rb_ary_new3(%d,%s));",
-              MAX_CALLBACK * DLSTACK_SIZE,
-              (0...MAX_CALLBACK).collect{|i|
-                (0...DLSTACK_SIZE).collect{|argc|
-                  "PTR2NUM(%s)" % func_name(ty,argc,i,CDECL)
-                }.join(",")
-              }.join(","))
-    }.join("\n")
-}
-#{
-    (0...MAX_DLTYPE).collect{|ty|
-      sprintf("    rb_ary_push(rb_DLStdcallCallbackProcs, rb_ary_new3(%d,%s));",
-              MAX_CALLBACK * DLSTACK_SIZE,
-              (0...MAX_CALLBACK).collect{
-                (0...DLSTACK_SIZE).collect{ "Qnil" }.join(",")
-              }.join(","))
-    }.join("\n")
-}
-#{
-    (0...MAX_DLTYPE).collect{|ty|
-      sprintf("    rb_ary_push(rb_DLStdcallCallbackAddrs, rb_ary_new3(%d,%s));",
-              MAX_CALLBACK * DLSTACK_SIZE,
-              (0...MAX_CALLBACK).collect{|i|
-                (0...DLSTACK_SIZE).collect{|argc|
-                  "PTR2NUM(%s)" % func_name(ty,argc,i,STDCALL)
-                }.join(",")
-              }.join(","))
-    }.join("\n")
-}
 }
-EOS
diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
new file mode 100644
index 0000000000..165c4bdc88
--- /dev/null
+++ b/ext/dl/mkcbtable.rb
@@ -0,0 +1,18 @@
+# -*- ruby -*-
+
+require 'mkmf'
+$:.unshift File.dirname(__FILE__)
+require 'type'
+require 'dlconfig'
+
+def mktable(rettype, fnum, argc)
+  code =
+    "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
+  return code
+end
+
+DLTYPE.keys.sort.each{|t|
+  for n in 0..(MAX_CALLBACK - 1)
+    print(mktable(t, n, 15), "\n")
+  end
+}
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
new file mode 100644
index 0000000000..01eb31da20
--- /dev/null
+++ b/ext/dl/ptr.c
@@ -0,0 +1,1058 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <ctype.h>
+#include "st.h"
+#include "dl.h"
+
+VALUE rb_cDLPtrData;
+VALUE rb_mDLMemorySpace;
+static st_table* st_memory_table;
+
+#ifndef T_SYMBOL
+# define T_SYMBOL T_FIXNUM
+#endif
+
+static void
+rb_dlmem_delete(void *ptr)
+{
+  rb_secure(4);
+  st_delete(st_memory_table, (st_data_t*)&ptr, NULL);
+}
+
+static void
+rb_dlmem_aset(void *ptr, VALUE obj)
+{
+  if (obj == Qnil) {
+    rb_dlmem_delete(ptr);
+  }
+  else{
+    st_insert(st_memory_table, (st_data_t)ptr, (st_data_t)obj);
+  }
+}
+
+static VALUE
+rb_dlmem_aref(void *ptr)
+{
+  VALUE val;
+
+  if(!st_lookup(st_memory_table, (st_data_t)ptr, &val)) return Qnil;
+  return val == Qundef ? Qnil : val;
+}
+
+void
+dlptr_free(struct ptr_data *data)
+{
+  if (data->ptr) {
+    DEBUG_CODE({
+      printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
+	     data->ptr);
+    });
+    rb_dlmem_delete(data->ptr);
+    if (data->free) {
+      DEBUG_CODE({
+	printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
+      });
+      (*(data->free))(data->ptr);
+    }
+  }
+  if (data->stype) dlfree(data->stype);
+  if (data->ssize) dlfree(data->ssize);
+  if (data->ids) dlfree(data->ids);
+}
+
+void
+dlptr_init(VALUE val)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(val, struct ptr_data, data);
+  DEBUG_CODE({
+    printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
+	   data->ptr);
+  });
+  rb_dlmem_aset(data->ptr, val);
+  OBJ_TAINT(val);
+}
+
+VALUE
+rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+  struct ptr_data *data;
+  VALUE val;
+
+  rb_secure(4);
+  if (ptr) {
+    val = rb_dlmem_aref(ptr);
+    if (val == Qnil) {
+      val = Data_Make_Struct(klass, struct ptr_data,
+			     0, dlptr_free, data);
+      data->ptr = ptr;
+      data->free = func;
+      data->ctype = DLPTR_CTYPE_UNKNOWN;
+      data->stype = NULL;
+      data->ssize = NULL;
+      data->slen = 0;
+      data->size = size;
+      data->ids = NULL;
+      data->ids_num = 0;
+      dlptr_init(val);
+    }
+    else{
+      if (func) {
+	Data_Get_Struct(val, struct ptr_data, data);
+	data->free = func;
+      }
+    }
+  }
+  else{
+    val = Qnil;
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_new(void *ptr, long size, freefunc_t func)
+{
+  return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
+}
+
+VALUE
+rb_dlptr_malloc(long size, freefunc_t func)
+{
+  void *ptr;
+
+  rb_secure(4);
+  ptr = dlmalloc((size_t)size);
+  memset(ptr,0,(size_t)size);
+  return rb_dlptr_new(ptr, size, func);
+}
+
+void *
+rb_dlptr2cptr(VALUE val)
+{
+  struct ptr_data *data;
+  void *ptr;
+
+  if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
+    Data_Get_Struct(val, struct ptr_data, data);
+    ptr = data->ptr;
+  }
+  else if (val == Qnil) {
+    ptr = NULL;
+  }
+  else{
+    rb_raise(rb_eTypeError, "DL::PtrData was expected");
+  }
+    
+  return ptr;
+}
+
+static VALUE
+rb_dlptr_s_allocate(VALUE klass)
+{
+  VALUE obj;
+  struct ptr_data *data;
+
+  rb_secure(4);
+  obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
+  data->ptr = 0;
+  data->free = 0;
+  data->ctype = DLPTR_CTYPE_UNKNOWN;
+  data->stype = NULL;
+  data->ssize = NULL;
+  data->slen  = 0;
+  data->size  = 0;
+  data->ids   = NULL;
+  data->ids_num = 0;
+
+  return obj;
+}
+
+static VALUE
+rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
+{
+  VALUE ptr, sym, size;
+  struct ptr_data *data;
+  void *p = NULL;
+  freefunc_t f = NULL;
+  long s = 0;
+
+  switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
+  case 1:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    break;
+  case 2:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    s = DLNUM2LONG(size);
+    break;
+  case 3:
+    p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
+    s = DLNUM2LONG(size);
+    f = rb_dlsym2csym(sym);
+    break;
+  default:
+    rb_bug("rb_dlptr_initialize");
+  }
+
+  if (p) {
+    Data_Get_Struct(self, struct ptr_data, data);
+    if (data->ptr && data->free) {
+      /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
+      (*(data->free))(data->ptr);
+    }
+    data->ptr  = p;
+    data->size = s;
+    data->free = f;
+  }
+
+  return Qnil;
+}
+
+static VALUE
+rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
+{
+  VALUE size, sym, obj;
+  int   s;
+  freefunc_t f = NULL;
+
+  switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
+  case 1:
+    s = NUM2INT(size);
+    break;
+  case 2:
+    s = NUM2INT(size);
+    f = rb_dlsym2csym(sym);
+    break;
+  default:
+    rb_bug("rb_dlptr_s_malloc");
+  }
+
+  obj = rb_dlptr_malloc(s,f);
+
+  return obj;
+}
+
+VALUE
+rb_dlptr_to_i(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return DLLONG2NUM(data->ptr);
+}
+
+VALUE
+rb_dlptr_ptr(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return rb_dlptr_new(*((void**)(data->ptr)),0,0);
+}
+
+VALUE
+rb_dlptr_ref(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return rb_dlptr_new(&(data->ptr),0,0);
+}
+
+VALUE
+rb_dlptr_null_p(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  return data->ptr ? Qfalse : Qtrue;
+}
+
+VALUE
+rb_dlptr_free_set(VALUE self, VALUE val)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  data->free = DLFREEFUNC(rb_dlsym2csym(val));
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_free_get(VALUE self)
+{
+  struct ptr_data *pdata;
+
+  Data_Get_Struct(self, struct ptr_data, pdata);
+
+  return rb_dlsym_new(pdata->free,"(free)","0P");
+}
+
+VALUE
+rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  int n;
+  int i;
+  int t;
+  VALUE ary;
+  VALUE type, size;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  switch (rb_scan_args(argc, argv, "11", &type, &size)) {
+  case 2:
+    t = StringValuePtr(type)[0];
+    n = NUM2INT(size);
+    break;
+  case 1:
+    t = StringValuePtr(type)[0];
+    switch (t) {
+    case 'C':
+      n = data->size;
+      break;
+    case 'H':
+      n = data->size / sizeof(short);
+      break;
+    case 'I':
+      n = data->size / sizeof(int);
+      break;
+    case 'L':
+      n = data->size / sizeof(long);
+      break;
+    case 'F':
+      n = data->size / sizeof(float);
+      break;
+    case 'D':
+      n = data->size / sizeof(double);
+      break;
+    case  'P': case 'p':
+      n = data->size / sizeof(void*);
+      break;
+    case 'S': case 's':
+      n = data->size / sizeof(char*);
+      break;
+    default:
+	n = 0;
+    }
+    break;
+  default:
+    rb_bug("rb_dlptr_to_array");
+  }
+
+  ary = rb_ary_new();
+
+  for (i=0; i < n; i++) {
+    switch (t) {
+    case 'C':
+      rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
+      break;
+    case 'H':
+      rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
+      break;
+    case 'I':
+      rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
+      break;
+    case 'L':
+      rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
+      break;
+    case 'D':
+      rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
+      break;
+    case 'F':
+      rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
+      break;
+    case 'S':
+      {
+	char *str = ((char**)(data->ptr))[i];
+	if (str) {
+	  rb_ary_push(ary, rb_tainted_str_new2(str));
+	}
+	else{
+	  rb_ary_push(ary, Qnil);
+	}
+      }
+      break;
+    case 's':
+      {
+	char *str = ((char**)(data->ptr))[i];
+	if (str) {
+	  rb_ary_push(ary, rb_tainted_str_new2(str));
+	  xfree(str);
+	}
+	else{
+	  rb_ary_push(ary, Qnil);
+	}
+      }
+      break;
+    case 'P':
+      rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
+      break;
+    case 'p':
+      rb_ary_push(ary,
+		  rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
+      break;
+    }
+  }
+
+  return ary;
+}
+
+
+VALUE
+rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  VALUE arg1, val;
+  int len;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  case 0:
+    val = rb_tainted_str_new2((char*)(data->ptr));
+    break;
+  case 1:
+    len = NUM2INT(arg1);
+    val = rb_tainted_str_new((char*)(data->ptr), len);
+    break;
+  default:
+    rb_bug("rb_dlptr_to_s");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
+{
+  struct ptr_data *data;
+  VALUE arg1, val;
+  int len;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (rb_scan_args(argc, argv, "01", &arg1)) {
+  case 0:
+    val = rb_tainted_str_new((char*)(data->ptr),data->size);
+    break;
+  case 1:
+    len = NUM2INT(arg1);
+    val = rb_tainted_str_new((char*)(data->ptr), len);
+    break;
+  default:
+    rb_bug("rb_dlptr_to_str");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlptr_inspect(VALUE self)
+{
+  struct ptr_data *data;
+  char str[1024];
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
+	   rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
+	   (long)data->free);
+  return rb_str_new2(str);
+}
+
+VALUE
+rb_dlptr_eql(VALUE self, VALUE other)
+{
+  void *ptr1, *ptr2;
+  ptr1 = rb_dlptr2cptr(self);
+  ptr2 = rb_dlptr2cptr(other);
+
+  return ptr1 == ptr2 ? Qtrue : Qfalse;
+}
+
+VALUE
+rb_dlptr_cmp(VALUE self, VALUE other)
+{
+  void *ptr1, *ptr2;
+  ptr1 = rb_dlptr2cptr(self);
+  ptr2 = rb_dlptr2cptr(other);
+  return DLLONG2NUM((long)ptr1 - (long)ptr2);
+}
+
+VALUE
+rb_dlptr_plus(VALUE self, VALUE other)
+{
+  void *ptr;
+  long num, size;
+
+  ptr = rb_dlptr2cptr(self);
+  size = RDLPTR(self)->size;
+  num = DLNUM2LONG(other);
+  return rb_dlptr_new((char *)ptr + num, size - num, 0);
+}
+
+VALUE
+rb_dlptr_minus(VALUE self, VALUE other)
+{
+  void *ptr;
+  long num, size;
+
+  ptr = rb_dlptr2cptr(self);
+  size = RDLPTR(self)->size;
+  num = DLNUM2LONG(other);
+  return rb_dlptr_new((char *)ptr - num, size + num, 0);
+}
+
+VALUE
+rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
+{
+  VALUE data_type, type, rest, vid;
+  struct ptr_data *data;
+  int i, t, num;
+  char *ctype;
+
+  rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
+  Data_Get_Struct(self, struct ptr_data, data);
+
+  if (argc == 1 || (argc == 2 && type == Qnil)) {
+    if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
+      data->ctype = DLPTR_CTYPE_UNKNOWN;
+      data->slen = 0;
+      data->ids_num  = 0;
+      if (data->stype) {
+	dlfree(data->stype);
+	data->stype = NULL;
+      }
+      if (data->ids) {
+	dlfree(data->ids);
+	data->ids = NULL;
+      }
+      return Qnil;
+    }
+    else{
+      rb_raise(rb_eArgError, "wrong arguments");
+    }
+  }
+
+  t = NUM2INT(data_type);
+  StringValue(type);
+  Check_Type(rest, T_ARRAY);
+  num = RARRAY(rest)->len;
+  for (i=0; i<num; i++) {
+    rb_to_id(rb_ary_entry(rest,i));
+  }
+
+  data->ctype = t;
+  data->slen = num;
+  data->ids_num  = num;
+  if (data->stype) dlfree(data->stype);
+  data->stype = (char*)dlmalloc(sizeof(char) * num);
+  if (data->ssize) dlfree(data->ssize);
+  data->ssize = (int*)dlmalloc(sizeof(int) * num);
+  if (data->ids) dlfree(data->ids);
+  data->ids  = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
+
+  ctype = StringValuePtr(type);
+  for (i=0; i<num; i++) {
+    vid = rb_ary_entry(rest,i);
+    data->ids[i] = rb_to_id(vid);
+    data->stype[i] = *ctype;
+    ctype ++;
+    if (isdigit(*ctype)) {
+      char *p, *d;
+      for (p=ctype; isdigit(*p); p++) ;
+      d = ALLOCA_N(char, p - ctype + 1);
+      strncpy(d, ctype, p - ctype);
+      d[p - ctype] = '\0';
+      data->ssize[i] = atoi(d);
+      ctype = p;
+    }
+    else{
+      data->ssize[i] = 1;
+    }
+  }
+
+  if (*ctype) {
+    rb_raise(rb_eArgError, "too few/many arguments");
+  }
+
+  if (!data->size)
+    data->size = dlsizeof(RSTRING(type)->ptr);
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
+{
+  VALUE *pass_argv;
+  int pass_argc, i;
+
+  pass_argc = argc + 1;
+  pass_argv = ALLOCA_N(VALUE, pass_argc);
+  pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
+  for (i=1; i<pass_argc; i++) {
+    pass_argv[i] = argv[i-1];
+  }
+  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
+{
+  VALUE *pass_argv;
+  int pass_argc, i;
+
+  pass_argc = argc + 1;
+  pass_argv = ALLOCA_N(VALUE, pass_argc);
+  pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
+  for (i=1; i<pass_argc; i++) {
+    pass_argv[i] = argv[i-1];
+  }
+  return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
+}
+
+VALUE
+rb_dlptr_get_data_type(VALUE self)
+{
+  struct ptr_data *data;
+
+  Data_Get_Struct(self, struct ptr_data, data);
+  if (data->stype)
+    return rb_assoc_new(INT2FIX(data->ctype),
+			rb_tainted_str_new(data->stype, data->slen));
+  else
+    return rb_assoc_new(INT2FIX(data->ctype), Qnil);
+}
+
+static VALUE
+cary2ary(void *ptr, char t, int len)
+{
+  VALUE ary;
+  VALUE elem;
+  int i;
+
+  if (len < 1)
+    return Qnil;
+
+  if (len == 1) {
+    switch (t) {
+    case 'I':
+      elem = INT2NUM(*((int*)ptr));
+      ptr = (char *)ptr + sizeof(int);
+      break;
+    case 'L':
+      elem = DLLONG2NUM(*((long*)ptr));
+      ptr = (char *)ptr + sizeof(long);
+      break;
+    case 'P':
+    case 'S':
+      elem = rb_dlptr_new(*((void**)ptr),0, 0);
+      ptr = (char *)ptr + sizeof(void*);
+      break;
+    case 'F':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(float);
+      break;
+    case 'D':
+      elem = rb_float_new(*((double*)ptr));
+      ptr = (char *)ptr + sizeof(double);
+      break;
+    case 'C':
+      elem = INT2NUM(*((char*)ptr));
+      ptr = (char *)ptr + sizeof(char);
+      break;
+    case 'H':
+      elem = INT2NUM(*((short*)ptr));
+      ptr = (char *)ptr + sizeof(short);
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+    }
+    return elem;
+  }
+
+  ary = rb_ary_new();
+  for (i=0; i < len; i++) {
+    switch (t) {
+    case 'I':
+      elem = INT2NUM(*((int*)ptr));
+      ptr = (char *)ptr + sizeof(int);
+      break;
+    case 'L':
+      elem = DLLONG2NUM(*((long*)ptr));
+      ptr = (char *)ptr + sizeof(long);
+      break;
+    case 'P':
+    case 'S':
+      elem = rb_dlptr_new(*((void**)ptr), 0, 0);
+      ptr = (char *)ptr + sizeof(void*);
+      break;
+    case 'F':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(float);
+      break;
+    case 'D':
+      elem = rb_float_new(*((float*)ptr));
+      ptr = (char *)ptr + sizeof(double);
+      break;
+    case 'C':
+      elem = INT2NUM(*((char*)ptr));
+      ptr = (char *)ptr + sizeof(char);
+      break;
+    case 'H':
+      elem = INT2NUM(*((short*)ptr));
+      ptr = (char *)ptr + sizeof(short);
+      break;
+    default:
+      rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
+    }
+    rb_ary_push(ary, elem);
+  }
+
+  return ary;
+}
+
+VALUE
+rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
+{
+  VALUE key = Qnil, num = Qnil;
+  ID id;
+  struct ptr_data *data;
+  int i;
+  int offset;
+
+  if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
+    num = INT2NUM(0);
+  }
+
+  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+    VALUE pass[1];
+    pass[0] = num;
+    return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
+  }
+  rb_to_id(key);
+  if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
+    rb_raise(rb_eTypeError, "the key must be a string or symbol");
+  }
+
+  id = rb_to_id(key);
+  Data_Get_Struct(self, struct ptr_data, data);
+  offset = 0;
+  switch (data->ctype) {
+  case DLPTR_CTYPE_STRUCT:
+    for (i=0; i < data->ids_num; i++) {
+      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) {
+	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+      }
+      switch (data->stype[i]) {
+      case 'I':
+	offset += sizeof(int) * data->ssize[i];
+	break;
+      case 'L':
+	offset += sizeof(long) * data->ssize[i];
+	break;
+      case 'P':
+      case 'S':
+	offset += sizeof(void*) * data->ssize[i];
+	break;
+      case 'F':
+	offset += sizeof(float) * data->ssize[i];
+	break;
+      case 'D':
+	offset += sizeof(double) * data->ssize[i];
+	break;
+      case 'C':
+	offset += sizeof(char) * data->ssize[i];
+	break;
+      case 'H':
+	offset += sizeof(short) * data->ssize[i];
+	break;
+      default:
+	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+    }
+    break;
+  case DLPTR_CTYPE_UNION:
+    for (i=0; i < data->ids_num; i++) {
+      if (data->ids[i] == id) {
+	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
+      }
+    }
+    break;
+  } /* end of switch */
+
+  rb_raise(rb_eNameError, "undefined key `%s' for %s",
+	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+  return Qnil;
+}
+
+static void *
+ary2cary(char t, VALUE val, long *size)
+{
+  void *ptr;
+
+  if (TYPE(val) == T_ARRAY) {
+    ptr = rb_ary2cary(t, val, size);
+  }
+  else{
+    ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
+  }
+  return ptr;
+}
+
+VALUE
+rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
+{
+  VALUE key = Qnil, num = Qnil, val = Qnil;
+  ID id;
+  struct ptr_data *data;
+  int i;
+  int offset;
+  long memsize;
+  void *memimg;
+
+  rb_secure(4);
+  switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
+  case 2:
+    val = num;
+    num = Qnil;
+    break;
+  }
+
+  if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
+    void *dst, *src;
+    long len;
+
+    StringValue(val);
+    Data_Get_Struct(self, struct ptr_data, data);
+    dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
+    src = RSTRING(val)->ptr;
+    len = RSTRING(val)->len;
+    if (num == Qnil) {
+      memcpy(dst, src, len);
+    }
+    else{
+      long n = NUM2INT(num);
+      memcpy(dst, src, n < len ? n : len);
+      if (n > len) MEMZERO((char*)dst + len, char, n - len);
+    }
+    return val;
+  }
+
+  id = rb_to_id(key);
+  Data_Get_Struct(self, struct ptr_data, data);
+  switch (data->ctype) {
+  case DLPTR_CTYPE_STRUCT:
+    offset = 0;
+    for (i=0; i < data->ids_num; i++) {
+      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) {
+	memimg = ary2cary(data->stype[i], val, &memsize);
+	memcpy((char *)data->ptr + offset, memimg, memsize);
+        dlfree(memimg);
+	return val;
+      }
+      switch (data->stype[i]) {
+      case 'I':
+      case 'i':
+	offset += sizeof(int) * data->ssize[i];
+	break;
+      case 'L':
+      case 'l':
+	offset += sizeof(long) * data->ssize[i];
+	break;
+      case 'P':
+      case 'p':
+      case 'S':
+      case 's':
+	offset += sizeof(void*) * data->ssize[i];
+	break;
+      case 'D':
+      case 'd':
+	offset += sizeof(double) * data->ssize[i];
+	break;
+      case 'F':
+      case 'f':
+	offset += sizeof(float) * data->ssize[i];
+	break;
+      case 'C':
+      case 'c':
+	offset += sizeof(char) * data->ssize[i];
+	break;
+      case 'H':
+      case 'h':
+	offset += sizeof(short) * data->ssize[i];
+	break;
+      default:
+	rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+      }
+    }
+    return val;
+    /* break; */
+  case DLPTR_CTYPE_UNION:
+    for (i=0; i < data->ids_num; i++) {
+      if (data->ids[i] == id) {
+	switch (data->stype[i]) {
+	case 'I': case 'i':
+	  memsize = sizeof(int) * data->ssize[i];
+	  break;
+	case 'L': case 'l':
+	  memsize = sizeof(long) * data->ssize[i];
+	  break;
+	case 'P': case 'p':
+	case 'S': case 's':
+	  memsize = sizeof(void*) * data->ssize[i];
+	  break;
+	case 'F': case 'f':
+	  memsize = sizeof(float) * data->ssize[i];
+	  break;
+	case 'D': case 'd':
+	  memsize = sizeof(double) * data->ssize[i];
+	  break;
+	case 'C': case 'c':
+	  memsize = sizeof(char) * data->ssize[i];
+	  break;
+	case 'H': case 'h':
+	  memsize = sizeof(short) * data->ssize[i];
+	  break;
+	default:
+	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+	}
+	memimg = ary2cary(data->stype[i], val, NULL);
+	memcpy(data->ptr, memimg, memsize);
+        dlfree(memimg);
+      }
+    }
+    return val;
+    /* break; */
+  }
+
+  rb_raise(rb_eNameError, "undefined key `%s' for %s",
+	   rb_id2name(id), rb_class2name(CLASS_OF(self)));
+
+  return Qnil;
+}
+
+VALUE
+rb_dlptr_size(int argc, VALUE argv[], VALUE self)
+{
+  VALUE size;
+
+  if (rb_scan_args(argc, argv, "01", &size) == 0){
+    return DLLONG2NUM(RDLPTR(self)->size);
+  }
+  else{
+    RDLPTR(self)->size = DLNUM2LONG(size);
+    return size;
+  }
+}
+
+static int
+dlmem_each_i(void* key, VALUE value, void* arg)
+{
+  VALUE vkey = DLLONG2NUM(key);
+  rb_yield(rb_assoc_new(vkey, value));
+  return Qnil;
+}
+
+VALUE
+rb_dlmem_each(VALUE self)
+{
+  st_foreach(st_memory_table, dlmem_each_i, 0);
+  return Qnil;
+}
+
+void
+Init_dlptr()
+{
+  rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
+  rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
+  rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
+  rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
+  rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
+  rb_define_method(rb_cDLPtrData, "free",  rb_dlptr_free_get, 0);
+  rb_define_method(rb_cDLPtrData, "to_i",  rb_dlptr_to_i, 0);
+  rb_define_method(rb_cDLPtrData, "ptr",   rb_dlptr_ptr, 0);
+  rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
+  rb_define_method(rb_cDLPtrData, "ref",   rb_dlptr_ref, 0);
+  rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
+  rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
+  rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
+  rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
+  rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
+  rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
+  rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
+  rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
+  rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
+  rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
+  rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
+  rb_define_method(rb_cDLPtrData, "define_data_type",
+		   rb_dlptr_define_data_type, -1);
+  rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
+  rb_define_method(rb_cDLPtrData, "union!",  rb_dlptr_define_union,  -1);
+  rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
+  rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
+  rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
+  rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
+  rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
+
+  rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
+  st_memory_table = st_init_numtable();
+  rb_define_const(rb_mDLMemorySpace, "MemoryTable", Qnil); /* historical */
+  rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
+}
diff --git a/ext/dl/sample/c++sample.C b/ext/dl/sample/c++sample.C
new file mode 100644
index 0000000000..d083d337a7
--- /dev/null
+++ b/ext/dl/sample/c++sample.C
@@ -0,0 +1,35 @@
+#include <stdio.h>
+
+class Person {
+private:
+  const char *name;
+  int age;
+
+public:
+  Person(const char *name, int age);
+  const char * get_name();
+  int get_age();
+  void set_age(int i);
+};
+
+Person::Person(const char *name, int age)
+  : name(name), age(age)
+{
+  /* empty */
+}
+
+const char *
+Person::get_name()
+{
+  return name;
+}
+
+int
+Person::get_age(){
+  return age;
+}
+
+void
+Person::set_age(int i){
+  age = i;
+}
diff --git a/ext/dl/sample/c++sample.rb b/ext/dl/sample/c++sample.rb
new file mode 100644
index 0000000000..29887df845
--- /dev/null
+++ b/ext/dl/sample/c++sample.rb
@@ -0,0 +1,60 @@
+=begin
+ This script shows how to deal with C++ classes using Ruby/DL.
+ You must build a dynamic loadable library using "c++sample.C"
+ to run this script as follows:
+   $ g++ -o libsample.so -shared c++sample.C
+=end
+
+require 'dl'
+require 'dl/import'
+require 'dl/struct'
+
+# Give a name of dynamic loadable library
+LIBNAME = ARGV[0] || "libsample.so"
+
+class Person
+  module Core
+    extend DL::Importable
+    
+    dlload LIBNAME
+
+    # mangled symbol names
+    extern "void __6PersonPCci(void *, const char *, int)"
+    extern "const char *get_name__6Person(void *)"
+    extern "int get_age__6Person(void *)"
+    extern "void set_age__6Personi(void *, int)"
+
+    Data = struct [
+      "char *name",
+      "int age",
+    ]
+  end
+
+  def initialize(name, age)
+    @ptr = Core::Data.alloc
+    Core::__6PersonPCci(@ptr, name, age)
+  end
+
+  def get_name()
+    str = Core::get_name__6Person(@ptr)
+    if( str )
+      str.to_s
+    else
+      nil
+    end
+  end
+
+  def get_age()
+    Core::get_age__6Person(@ptr)
+  end
+
+  def set_age(age)
+    Core::set_age__6Personi(@ptr, age)
+  end
+end
+
+obj = Person.new("ttate", 1)
+p obj.get_name()
+p obj.get_age()
+obj.set_age(10)
+p obj.get_age()
diff --git a/ext/dl/sample/drives.rb b/ext/dl/sample/drives.rb
new file mode 100644
index 0000000000..8a590404b1
--- /dev/null
+++ b/ext/dl/sample/drives.rb
@@ -0,0 +1,70 @@
+# -*- ruby -*-
+# drives.rb -- find existing drives and show the drive type.
+
+require 'dl'
+require 'dl/import'
+
+module Kernel32
+  extend DL::Importable
+
+  dlload "kernel32"
+
+  extern "long GetLogicalDrives()"
+  extern "int GetDriveType(char*)"
+  extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
+end
+
+include Kernel32
+
+buff = Kernel32.getLogicalDrives()
+
+i = 0
+ds = []
+while( i < 26 )
+  mask = (1 << i)
+  if( buff & mask > 0 )
+    ds.push((65+i).chr)
+  end
+  i += 1
+end
+
+=begin
+From the cygwin's /usr/include/w32api/winbase.h:
+#define DRIVE_UNKNOWN 0
+#define DRIVE_NO_ROOT_DIR 1
+#define DRIVE_REMOVABLE 2
+#define DRIVE_FIXED 3
+#define DRIVE_REMOTE 4
+#define DRIVE_CDROM 5
+#define DRIVE_RAMDISK 6
+=end
+
+types = [
+  "unknown",
+  "no root dir",
+  "Removable",
+  "Fixed", 
+  "Remote",
+  "CDROM",
+  "RAM",
+]
+print("Drive : Type (Free Space/Available Space)\n")
+ds.each{|d|
+  t = Kernel32.getDriveType(d + ":\\")
+  Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
+  _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
+  fbytes = sec_per_clus * byte_per_sec * free_clus
+  tbytes = sec_per_clus * byte_per_sec * total_clus
+  unit = "B"
+  if( fbytes > 1024 && tbytes > 1024 )
+    fbytes = fbytes / 1024
+    tbytes = tbytes / 1024
+    unit = "K"
+  end
+  if( fbytes > 1024 && tbytes > 1024 )
+    fbytes = fbytes / 1024
+    tbytes = tbytes / 1024
+    unit = "M"
+  end
+  print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
+}
diff --git a/ext/dl/sample/getch.rb b/ext/dl/sample/getch.rb
new file mode 100644
index 0000000000..3f7261c979
--- /dev/null
+++ b/ext/dl/sample/getch.rb
@@ -0,0 +1,5 @@
+require 'dl'
+
+crtdll = DL::dlopen("crtdll")
+getch  = crtdll['_getch', 'L']
+print(getch.call, "\n")
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
new file mode 100644
index 0000000000..a1f6fbe543
--- /dev/null
+++ b/ext/dl/sample/libc.rb
@@ -0,0 +1,69 @@
+require "dl/import"
+require "dl/struct"
+
+module LIBC
+  extend DL::Importable
+
+  begin
+    dlload "libc.so.6"
+  rescue
+    dlload "libc.so.5"
+  end
+
+  extern "int atoi(char*)"
+  extern "ibool isdigit(int)"
+  extern "int gettimeofday(struct timeval *, struct timezone *)"
+  extern "char* strcat(char*, char*)"
+  extern "FILE* fopen(char*, char*)"
+  extern "int fclose(FILE*)"
+  extern "int fgetc(FILE*)"
+  extern "int strlen(char*)"
+  extern "void qsort(void*, int, int, void*)"
+
+  def str_qsort(ary, comp)
+    len = ary.length
+    r,rs = qsort(ary, len, DL.sizeof('P'), comp)
+    return rs[0].to_a('S', len)
+  end
+
+  Timeval = struct [
+    "long tv_sec",
+    "long tv_usec",
+  ]
+
+  Timezone = struct [
+    "int tz_minuteswest",
+    "int tz_dsttime",
+  ]
+
+  def my_compare(ptr1, ptr2)
+    ptr1.ptr.to_s <=> ptr2.ptr.to_s
+  end
+  COMPARE = callback("int my_compare(char**, char**)")
+end
+
+
+$cb1 = DL.callback('IPP'){|ptr1, ptr2|
+  str1 = ptr1.ptr.to_s
+  str2 = ptr2.ptr.to_s
+  str1 <=> str2
+}
+
+p LIBC.atoi("10")
+
+p LIBC.isdigit(?1)
+
+p LIBC.isdigit(?a)
+
+p LIBC.strcat("a", "b")
+
+ary = ["a","c","b"]
+ptr = ary.to_ptr
+LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
+p ptr.to_a('S', ary.length)
+
+tv = LIBC::Timeval.malloc
+tz = LIBC::Timezone.malloc
+LIBC.gettimeofday(tv, tz)
+
+p Time.at(tv.tv_sec)
diff --git a/ext/dl/sample/msgbox.rb b/ext/dl/sample/msgbox.rb
new file mode 100644
index 0000000000..091e646091
--- /dev/null
+++ b/ext/dl/sample/msgbox.rb
@@ -0,0 +1,19 @@
+# This script works on Windows.
+
+require 'dl'
+
+User32 = DL.dlopen("user32")
+Kernel32 = DL.dlopen("kernel32")
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = User32['MessageBoxA', 'ILSSI']
+r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+  print("OK!\n")
+when 2
+  print("Cancel!\n")
+end
diff --git a/ext/dl/sample/msgbox2.rb b/ext/dl/sample/msgbox2.rb
new file mode 100644
index 0000000000..e49846cc5e
--- /dev/null
+++ b/ext/dl/sample/msgbox2.rb
@@ -0,0 +1,18 @@
+# This script works on Windows.
+
+require 'dl/win32'
+
+MB_OK = 0
+MB_OKCANCEL = 1
+
+message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
+r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
+
+case r
+when 1
+  print("OK!\n")
+when 2
+  print("Cancel!\n")
+else
+  p r
+end
diff --git a/ext/dl/sample/stream.rb b/ext/dl/sample/stream.rb
new file mode 100644
index 0000000000..179836999d
--- /dev/null
+++ b/ext/dl/sample/stream.rb
@@ -0,0 +1,87 @@
+# -*- ruby -*-
+# Display a file name and stream names of a file with those size.
+
+require 'dl'
+require 'dl/import'
+
+module NTFS
+  extend DL::Importable
+
+  dlload "kernel32.dll"
+
+  OPEN_EXISTING         = 3
+  GENERIC_READ          = 0x80000000
+  BACKUP_DATA           = 0x00000001
+  BACKUP_ALTERNATE_DATA = 0x00000004
+  FILE_SHARE_READ       = 0x00000001
+  FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+
+  typealias "LPSECURITY_ATTRIBUTES", "void*"
+
+  extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
+  extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
+  extern "BOOL CloseHandle(HANDLE)"
+  extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
+                            DWORD, DWORD, HANDLE)"
+
+  module_function
+
+  def streams(filename)
+    status = []
+    h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
+		   OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
+    if( h != 0 )
+      begin
+	# allocate the memory for backup data used in backupRead().
+	data = DL.malloc(DL.sizeof("L5"))
+	data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
+
+	# allocate memories for references to long values used in backupRead().
+	context = DL.malloc(DL.sizeof("L"))
+	lval = DL.malloc(DL.sizeof("L"))
+
+	while( backupRead(h, data, data.size, lval, false, false, context) )
+	  size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
+	  case data[:id]
+	  when BACKUP_ALTERNATE_DATA
+	    stream_name = DL.malloc(data[:name_size])
+	    backupRead(h, stream_name, stream_name.size,
+		       lval, false, false, context)
+	    name = stream_name[0, stream_name.size]
+	    name.tr!("\000","")
+	    if( name =~ /^:(.*?):.*$/ )
+	      status.push([$1,size])
+	    end
+	  when BACKUP_DATA
+	    status.push([nil,size])
+	  else
+	    raise(RuntimeError, "unknown data type #{data[:id]}.")
+	  end
+	  l1 = DL.malloc(DL.sizeof("L"))
+	  l2 = DL.malloc(DL.sizeof("L"))
+	  if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
+	    break
+	  end
+	end
+      ensure
+	backupRead(h, nil, 0, lval, true, false, context)
+	closeHandle(h)
+      end
+      return status
+    else
+      raise(RuntimeError, "can't open #{filename}.\n")
+    end
+  end
+end
+
+ARGV.each{|filename|
+  if( File.exist?(filename) )
+    NTFS.streams(filename).each{|name,size|
+      if( name )
+	print("#{filename}:#{name}\t#{size}bytes\n")
+      else
+	print("#{filename}\t#{size}bytes\n")
+      end
+    }
+  end
+}
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
new file mode 100644
index 0000000000..933fb7f4f0
--- /dev/null
+++ b/ext/dl/sym.c
@@ -0,0 +1,993 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include <errno.h>
+#include "dl.h"
+
+VALUE rb_cDLSymbol;
+
+static const char *
+char2type(int ch)
+{
+  switch (ch) {
+  case '0':
+    return "void";
+  case 'P':
+    return "void *";
+  case 'p':
+    return "void *";
+  case 'C':
+    return "char";
+  case 'c':
+    return "char *";
+  case 'H':
+    return "short";
+  case 'h':
+    return "short *";
+  case 'I':
+    return "int";
+  case 'i':
+    return "int *";
+  case 'L':
+    return "long";
+  case 'l':
+    return "long *";
+  case 'F':
+    return "double";
+  case 'f':
+    return "double *";
+  case 'D':
+    return "double";
+  case 'd':
+    return "double *";
+  case 'S':
+    return "const char *";
+  case 's':
+    return "char *";
+  case 'A':
+    return "[]";
+  case 'a':
+    return "[]"; /* ?? */
+  }
+  return NULL;
+}
+
+void
+dlsym_free(struct sym_data *data)
+{
+  if( data->name ){
+    DEBUG_CODE({
+      printf("dlsym_free(): free(data->name:%s)\n",data->name);
+    });
+    free(data->name);
+  }
+  if( data->type ){
+    DEBUG_CODE({
+      printf("dlsym_free(): free(data->type:%s)\n",data->type);
+    });
+    free(data->type);
+  }
+}
+
+VALUE
+rb_dlsym_new(void (*func)(), const char *name, const char *type)
+{
+  VALUE val;
+  struct sym_data *data;
+  const char *ptype;
+
+  rb_secure(4);
+  if( !type || !type[0] ){
+    return rb_dlptr_new((void*)func, 0, 0);
+  }
+
+  for( ptype = type; *ptype; ptype ++ ){
+    if( ! char2type(*ptype) ){
+      rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
+    }
+  }
+
+  if( func ){
+    val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
+    data->func = func;
+    data->name = name ? strdup(name) : NULL;
+    data->type = type ? strdup(type) : NULL;
+    data->len  = type ? strlen(type) : 0;
+#if !(defined(DLSTACK))
+    if( data->len - 1 > MAX_ARG ){
+      rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
+    }
+#endif
+  }
+  else{
+    val = Qnil;
+  }
+
+  return val;
+}
+
+freefunc_t
+rb_dlsym2csym(VALUE val)
+{
+  struct sym_data *data;
+  freefunc_t func;
+
+  if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
+    Data_Get_Struct(val, struct sym_data, data);
+    func = data->func;
+  }
+  else if( val == Qnil ){
+    func = NULL;
+  }
+  else{
+    rb_raise(rb_eTypeError, "DL::Symbol was expected");
+  }
+
+  return func;
+}
+
+VALUE
+rb_dlsym_s_allocate(VALUE klass)
+{
+  VALUE obj;
+  struct sym_data *data;
+
+  obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
+  data->func = 0;
+  data->name = 0;
+  data->type = 0;
+  data->len  = 0;
+
+  return obj;
+}
+
+VALUE
+rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
+{
+  VALUE addr, name, type;
+  struct sym_data *data;
+  void *saddr;
+  const char *sname, *stype;
+
+  rb_scan_args(argc, argv, "12", &addr, &name, &type);
+
+  saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
+  if (!NIL_P(name)) StringValue(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);
+    if( data->name ) free(data->name);
+    if( data->type ) free(data->type);
+    data->func = saddr;
+    data->name = sname ? strdup(sname) : 0;
+    data->type = stype ? strdup(stype) : 0;
+    data->len  = stype ? strlen(stype) : 0;
+  }
+
+  return Qnil;
+}
+
+VALUE
+rb_s_dlsym_char2type(VALUE self, VALUE ch)
+{
+  const char *type;
+
+  type = char2type(StringValuePtr(ch)[0]);
+
+  if (type == NULL)
+    return Qnil;
+  else
+    return rb_str_new2(type);
+}
+
+VALUE
+rb_dlsym_name(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
+}
+
+VALUE
+rb_dlsym_proto(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
+}
+
+VALUE
+rb_dlsym_cproto(VALUE self)
+{
+  struct sym_data *sym;
+  const char *ptype, *typestr;
+  size_t len;
+  VALUE val;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+
+  ptype = sym->type;
+
+  if( ptype ){
+    typestr = char2type(*ptype++);
+    len = strlen(typestr);
+    
+    val = rb_tainted_str_new(typestr, len);
+    if (typestr[len - 1] != '*')
+      rb_str_cat(val, " ", 1);
+
+    if( sym->name ){
+      rb_str_cat2(val, sym->name);
+    }
+    else{
+      rb_str_cat2(val, "(null)");
+    }
+    rb_str_cat(val, "(", 1);
+    
+    while (*ptype) {
+      const char *ty = char2type(*ptype++);
+      rb_str_cat2(val, ty);
+      if (*ptype)
+	rb_str_cat(val, ", ", 2);
+    }
+
+    rb_str_cat(val, ");", 2);
+  }
+  else{
+    val = rb_tainted_str_new2("void (");
+    if( sym->name ){
+      rb_str_cat2(val, sym->name);
+    }
+    else{
+      rb_str_cat2(val, "(null)");
+    }
+    rb_str_cat2(val, ")()");
+  }
+
+  return val;
+}
+
+VALUE
+rb_dlsym_inspect(VALUE self)
+{
+  VALUE proto;
+  VALUE val;
+  char  *str;
+  int str_size;
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  proto = rb_dlsym_cproto(self);
+
+  str_size = RSTRING(proto)->len + 100;
+  str = dlmalloc(str_size);
+  snprintf(str, str_size - 1,
+          "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
+	   sym, sym->func, RSTRING(proto)->ptr);
+  val = rb_tainted_str_new2(str);
+  dlfree(str);
+
+  return val;
+}
+
+static int
+stack_size(struct sym_data *sym)
+{
+  int i;
+  int size;
+
+  size = 0;
+  for( i=1; i < sym->len; i++ ){
+    switch(sym->type[i]){
+    case 'C':
+    case 'H':
+    case 'I':
+    case 'L':
+      size += sizeof(long);
+      break;
+    case 'F':
+      size += sizeof(float);
+      break;
+    case 'D':
+      size += sizeof(double);
+      break;
+    case 'c':
+    case 'h':
+    case 'i':
+    case 'l':
+    case 'f':
+    case 'd':
+    case 'p':
+    case 'P':
+    case 's':
+    case 'S':
+    case 'a':
+    case 'A':
+      size += sizeof(void*);
+      break;
+    default:
+      return -(sym->type[i]);
+    }
+  }
+  return size;
+}
+
+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)
+{
+  struct sym_data *sym;
+  ANY_TYPE *args;
+  ANY_TYPE *dargs;
+  ANY_TYPE ret;
+  int   *dtypes;
+  VALUE val;
+  VALUE dvals;
+  int i;
+  long ftype;
+  void *func;
+
+  rb_secure_update(self);
+  Data_Get_Struct(self, struct sym_data, sym);
+  DEBUG_CODE({
+    printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
+  });
+  if( (sym->len - 1) != argc ){
+    rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
+  }
+
+  ftype = 0;
+  dvals = Qnil;
+
+  args = ALLOC_N(ANY_TYPE, sym->len - 1);
+  dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
+  dtypes = ALLOC_N(int, sym->len - 1);
+#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
+
+  for( i = sym->len - 2; i >= 0; i-- ){
+    dtypes[i] = 0;
+
+    switch( sym->type[i+1] ){
+    case 'p':
+      dtypes[i] = 'p';
+    case 'P':
+      {
+	struct ptr_data *data;
+	VALUE pval;
+
+	if( argv[i] == Qnil ){
+	  ANY2P(args[i]) = DLVOIDP(0);
+	}
+	else{
+	  if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
+	    pval = argv[i];
+	  }
+	  else{
+	    pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
+	    if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
+	      rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
+	    }
+	  }
+	  rb_check_safe_obj(pval);
+	  Data_Get_Struct(pval, struct ptr_data, data);
+	  ANY2P(args[i]) = DLVOIDP(data->ptr);
+	}
+      }
+      PUSH_P(ftype);
+      break;
+    case 'a':
+      dtypes[i] = 'a';
+    case 'A':
+      if( argv[i] == Qnil ){
+	ANY2P(args[i]) = DLVOIDP(0);
+      }
+      else{
+	ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
+      }
+      PUSH_P(ftype);
+      break;
+    case 'C':
+      ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
+      PUSH_C(ftype);
+      break;
+    case 'c':
+      ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
+      dtypes[i] = 'c';
+      PUSH_P(ftype);
+      break;
+    case 'H':
+      ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
+      PUSH_C(ftype);
+      break;
+    case 'h':
+      ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
+      dtypes[i] = 'h';
+      PUSH_P(ftype);
+      break;
+    case 'I':
+      ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
+      PUSH_I(ftype);
+      break;
+    case 'i':
+      ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
+      ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
+      dtypes[i] = 'i';
+      PUSH_P(ftype);
+      break;
+    case 'L':
+      ANY2L(args[i]) = DLNUM2LONG(argv[i]);
+      PUSH_L(ftype);
+      break;
+    case 'l':
+      ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
+      ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
+      dtypes[i] = 'l';
+      PUSH_P(ftype);
+      break;
+    case 'F':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+      PUSH_F(ftype);
+      break;
+    case 'f':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
+      ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
+      dtypes[i] = 'f';
+      PUSH_P(ftype);
+      break;
+    case 'D':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2D(args[i]) = RFLOAT(argv[i])->value;
+      PUSH_D(ftype);
+      break;
+    case 'd':
+      Check_Type(argv[i], T_FLOAT);
+      ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
+      ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
+      dtypes[i] = 'd';
+      PUSH_P(ftype);
+      break;
+    case 'S':
+      if( argv[i] == Qnil ){
+	ANY2S(args[i]) = DLSTR(0);
+      }
+      else{
+	VALUE str = argv[i];
+	SafeStringValue(str);
+	ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
+      }
+      PUSH_P(ftype);
+      break;
+    case 's':
+      {
+	VALUE str = argv[i];
+	SafeStringValue(str);
+	ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
+	memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
+	dtypes[i] = 's';
+      }
+      PUSH_P(ftype);
+      break;
+    default:
+      FREE_ARGS;
+      rb_raise(rb_eDLTypeError,
+	       "unknown type '%c' of the return value.",
+	       sym->type[i+1]);
+    }
+  }
+
+  switch( sym->type[0] ){
+  case '0':
+    PUSH_0(ftype);
+    break;
+  case 'P':
+  case 'p':
+  case 'S':
+  case 's':
+  case 'A':
+  case 'a':
+    PUSH_P(ftype);
+    break;
+  case 'C':
+  case 'c':
+    PUSH_C(ftype);
+    break;
+  case 'H':
+  case 'h':
+    PUSH_H(ftype);
+    break;
+  case 'I':
+  case 'i':
+    PUSH_I(ftype);
+    break;
+  case 'L':
+  case 'l':
+    PUSH_L(ftype);
+    break;
+  case 'F':
+  case 'f':
+    PUSH_F(ftype);
+    break;
+  case 'D':
+  case 'd':
+    PUSH_D(ftype);
+    break;
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError,
+	     "unknown type `%c' of the return value.",
+	     sym->type[0]);
+  }
+
+  func = sym->func;
+
+#if defined(DLSTACK)
+  {
+#if defined(DLSTACK_SIZE)
+  int  stk_size;
+  long stack[DLSTACK_SIZE];
+  long *sp;
+
+  sp = stack;
+  stk_size = stack_size(sym);
+  if( stk_size < 0 ){
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
+  }
+  else if( stk_size > (int)(DLSTACK_SIZE) ){
+    FREE_ARGS;
+    rb_raise(rb_eArgError, "too many arguments.");
+  }
+#endif
+
+  DLSTACK_START(sym);
+
+#if defined(DLSTACK_REVERSE)
+  for( i = sym->len - 2; i >= 0; i-- )
+#else
+  for( i = 0; i <= sym->len -2; i++ )
+#endif
+  {
+    switch( sym->type[i+1] ){
+    case 'p':
+    case 'P':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'a':
+    case 'A':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'C':
+      DLSTACK_PUSH_C(ANY2C(args[i]));
+      break;
+    case 'c':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'H':
+      DLSTACK_PUSH_H(ANY2H(args[i]));
+      break;
+    case 'h':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'I':
+      DLSTACK_PUSH_I(ANY2I(args[i]));
+      break;
+    case 'i':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'L':
+      DLSTACK_PUSH_L(ANY2L(args[i]));
+      break;
+    case 'l':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'F':
+      DLSTACK_PUSH_F(ANY2F(args[i]));
+      break;
+    case 'f':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'D':
+      DLSTACK_PUSH_D(ANY2D(args[i]));
+      break;
+    case 'd':
+      DLSTACK_PUSH_P(ANY2P(args[i]));
+      break;
+    case 'S':
+    case 's':
+      DLSTACK_PUSH_P(ANY2S(args[i]));
+      break;
+    }
+  }
+  DLSTACK_END(sym->type);
+
+#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':
+      {
+	void (*f)(DLSTACK_PROTO) = func;
+	f(DLSTACK_ARGS);
+      }
+      break;
+    case 'P':
+    case 'p':
+      {
+	void * (*f)(DLSTACK_PROTO) = func;
+	ret.p = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'C':
+    case 'c':
+      {
+	char (*f)(DLSTACK_PROTO) = func;
+	ret.c = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'H':
+    case 'h':
+      {
+	short (*f)(DLSTACK_PROTO) = func;
+	ret.h = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'I':
+    case 'i':
+      {
+	int (*f)(DLSTACK_PROTO) = func;
+	ret.i = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'L':
+    case 'l':
+      {
+	long (*f)(DLSTACK_PROTO) = func;
+	ret.l = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'F':
+    case 'f':
+      {
+	float (*f)(DLSTACK_PROTO) = func;
+	ret.f = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'D':
+    case 'd':
+      {
+	double (*f)(DLSTACK_PROTO) = func;
+	ret.d = f(DLSTACK_ARGS);
+      }
+      break;
+    case 'S':
+    case 's':
+      {
+	char * (*f)(DLSTACK_PROTO) = func;
+	ret.s = f(DLSTACK_ARGS);
+      }
+      break;
+    default:
+      FREE_ARGS;
+      rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+    }
+  }
+#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){
+#include "call.func"
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
+  }
+#endif /* defined(DLSTACK) */
+
+  switch( sym->type[0] ){
+  case '0':
+    val = Qnil;
+    break;
+  case 'P':
+    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
+    break;
+  case 'p':
+    val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
+    break;
+  case 'C':
+  case 'c':
+    val = CHR2FIX((char)(ANY2C(ret)));
+    break;
+  case 'H':
+  case 'h':
+    val = INT2NUM((short)(ANY2H(ret)));
+    break;
+  case 'I':
+  case 'i':
+    val = INT2NUM((int)(ANY2I(ret)));
+    break;
+  case 'L':
+  case 'l':
+    val = DLLONG2NUM((long)(ANY2L(ret)));
+    break;
+  case 'F':
+  case 'f':
+    val = rb_float_new((double)(ANY2F(ret)));
+    break;
+  case 'D':
+  case 'd':
+    val = rb_float_new((double)(ANY2D(ret)));
+    break;
+  case 'S':
+    if( ANY2S(ret) ){
+      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+    }
+    else{
+      val = Qnil;
+    }
+    break;
+  case 's':
+    if( ANY2S(ret) ){
+      val = rb_tainted_str_new2((char*)(ANY2S(ret)));
+      DEBUG_CODE({
+	printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
+      });
+      dlfree((void*)(ANY2S(ret)));
+    }
+    else{
+      val = Qnil;
+    }
+    break;
+  default:
+    FREE_ARGS;
+    rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
+  }
+
+  dvals = rb_ary_new();
+  for( i = 0; i <= sym->len - 2; i++ ){
+    if( dtypes[i] ){
+      switch( dtypes[i] ){
+      case 'c':
+	rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
+	break;
+      case 'h':
+	rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
+	break;
+      case 'i':
+	rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
+	break;
+      case 'l':
+        rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
+        break;
+      case 'f':
+	rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
+	break;
+      case 'd':
+	rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
+	break;
+      case 'p':
+	rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
+	break;
+      case 'a':
+	rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
+	break;
+      case 's':
+	rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
+	DEBUG_CODE({
+	  printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
+	});
+	dlfree((void*)ANY2S(args[i]));
+	break;
+      default:
+	{
+	  char c = dtypes[i];
+	  FREE_ARGS;
+	  rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
+	}
+      }
+    }
+    else{
+      switch( sym->type[i+1] ){
+      case 'A':
+	dlfree((void*)ANY2P(args[i]));
+	break;
+      }
+      rb_ary_push(dvals, argv[i]);
+    }
+  }
+
+  FREE_ARGS;
+#undef FREE_ARGS
+  return rb_assoc_new(val,dvals);
+}
+
+VALUE
+rb_dlsym_to_i(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return DLLONG2NUM(sym);
+}
+
+VALUE
+rb_dlsym_to_ptr(VALUE self)
+{
+  struct sym_data *sym;
+
+  Data_Get_Struct(self, struct sym_data, sym);
+  return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
+}
+
+void
+Init_dlsym()
+{
+  rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
+  rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
+  rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
+  rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
+  rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
+  rb_define_method(rb_cDLSymbol, "[]",   rb_dlsym_call, -1);
+  rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
+  rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
+  rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
+  rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
+  rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
+  rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
+  rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
+
+  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/libtest.def b/ext/dl/test/libtest.def
new file mode 100644
index 0000000000..8ecefc917b
--- /dev/null
+++ b/ext/dl/test/libtest.def
@@ -0,0 +1,28 @@
+EXPORTS
+test_alloc_test_struct
+test_append
+test_arylen
+test_c2i
+test_call_func1
+test_callback1
+test_close
+test_d2f
+test_f2d
+test_fill_test_struct
+test_fill_test_union
+test_gets
+test_i2c
+test_init
+test_isucc
+test_lcc
+test_lsucc
+test_open
+test_strcat
+test_strlen
+test_succ
+test_data_init
+test_data_add
+test_data_aref
+test_set_long_value
+test_get_long_value
+internal_long_value
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c
new file mode 100644
index 0000000000..7321379390
--- /dev/null
+++ b/ext/dl/test/test.c
@@ -0,0 +1,247 @@
+#include <stdio.h>
+#include <string.h>
+
+static char internal_string[] = "internal_string";
+long internal_long_value = 100;
+
+struct test_struct {
+  char c;
+  long l;
+};
+
+union test_union {
+  char c;
+  int  i;
+  long l;
+  void *p;
+};
+
+struct test_data {
+  char name[1024];
+  struct test_data *next;
+};
+
+long
+test_get_long_value()
+{
+  return internal_long_value;
+};
+
+void
+test_set_long_value(long l)
+{
+  internal_long_value = l;
+};
+
+void
+test_fill_test_struct(struct test_struct *ptr, char c, long l)
+{
+  ptr->c = c;
+  ptr->l = l;
+};
+
+void
+test_fill_test_union(union test_union *ptr, long l)
+{
+  ptr->l = l;
+};
+
+struct test_struct *
+test_alloc_test_struct(char c, long l)
+{
+  struct test_struct *data;
+
+  data = (struct test_struct *)malloc(sizeof(struct test_struct));
+  data->c = c;
+  data->l = l;
+
+  return data;
+};
+
+int
+test_c2i(char c)
+{
+  return (int)c;
+};
+
+char
+test_i2c(int i)
+{
+  return (char)i;
+};
+
+long
+test_lcc(char c1, char c2)
+{
+  return (long)(c1 + c2);
+};
+
+double
+test_f2d(float f)
+{
+  double d;
+  d = f;
+  return d;
+};
+
+float
+test_d2f(double d)
+{
+  float f;
+  f = d;
+  return f;
+};
+
+int
+test_strlen(const char *str)
+{
+  return strlen(str);
+};
+
+int
+test_isucc(int i)
+{
+  return (i+1);
+};
+
+long
+test_lsucc(long l)
+{
+  return (l+1);
+};
+
+void
+test_succ(long *l)
+{
+  (*l)++;
+};
+
+char *
+test_strcat(char *str1, const char *str2)
+{
+  return strcat(str1, str2);
+};
+
+int
+test_arylen(char *ary[])
+{
+  int i;
+  for( i=0; ary[i]; i++ ){};
+  return i;
+};
+
+void
+test_append(char *ary[], int len, char *astr)
+{
+  int i;
+  int size1,size2;
+  char *str;
+
+  size2 = strlen(astr);
+
+  for( i=0; i <= len - 1; i++ ){
+    size1 = strlen(ary[i]);
+    str = (char*)malloc(size1 + size2 + 1);
+    strcpy(str, ary[i]);
+    strcat(str, astr);
+    ary[i] = str;
+  };
+};
+
+int
+test_init(int *argc, char **argv[])
+{
+  int i;
+  char s[256];
+
+  for( i=0; i < (*argc); i++ ){
+    sprintf(s, "arg%d", i);
+    if( strcmp((*argv)[i], s) != 0 ){
+      return 1;
+    }
+  }
+  return 0;
+}
+
+FILE *
+test_open(const char *filename, const char *mode)
+{
+  FILE *file;
+  file = fopen(filename,mode);
+  return file;
+};
+
+void
+test_close(FILE *file)
+{
+  fclose(file);
+};
+
+char *
+test_gets(char *s, int size, FILE *f)
+{
+  return fgets(s,size,f);
+};
+
+typedef int callback1_t(int, char *);
+#define CALLBACK_MSG "callback message"
+
+int
+test_callback1(int err, const char *msg)
+{
+  if( strcmp(msg, CALLBACK_MSG) == 0 ){
+    return 1;
+  }
+  else{
+    return 0;
+  }
+}
+
+int
+test_call_func1(callback1_t *func)
+{
+  if( func ){
+    return (*func)(0, CALLBACK_MSG);
+  }
+  else{
+    return 0;
+  }
+}
+
+struct test_data *
+test_data_init()
+{
+  struct test_data *data;
+
+  data = (struct test_data *)malloc(sizeof(struct test_data));
+  data->next = NULL;
+  memset(data->name, 0, 1024);
+
+  return data;
+};
+
+void
+test_data_add(struct test_data *list, const char *name)
+{
+  struct test_data *data;
+
+  data = (struct test_data *)malloc(sizeof(struct test_data));
+  memset(data->name, 0, 1024);
+  strncpy(data->name, name, 1024);
+  data->next = list->next;
+  list->next = data;
+};
+
+struct test_data *
+test_data_aref(struct test_data *list, int i)
+{
+  struct test_data *data;
+  int j;
+
+  for( data = list->next, j=0; data; data = data->next, j++ ){
+    if( i == j ){
+      return data;
+    };
+  };
+  return NULL;
+};
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
new file mode 100644
index 0000000000..bf8dfc18e3
--- /dev/null
+++ b/ext/dl/test/test.rb
@@ -0,0 +1,306 @@
+# -*- ruby -*-
+
+require 'dl'
+require 'dl/import'
+
+$FAIL = 0
+$TOTAL = 0
+
+def assert(label, ty, *conds)
+  $TOTAL += 1
+  cond = !conds.include?(false)
+  if( cond )
+    printf("succeed in `#{label}'\n")
+  else
+    $FAIL += 1
+    case ty
+    when :may
+      printf("fail in `#{label}' ... expected\n")
+    when :must
+      printf("fail in `#{label}' ... unexpected\n")
+    when :raise
+      raise(RuntimeError, "fail in `#{label}'")
+    end
+  end
+end
+
+def debug(*xs)
+  if( $DEBUG )
+    xs.each{|x|
+      p x
+    }
+  end
+end
+
+print("DLSTACK   = #{DL::DLSTACK}\n")
+print("MAX_ARG   = #{DL::MAX_ARG}\n")
+print("\n")
+print("DL::FREE = #{DL::FREE.inspect}\n")
+print("\n")
+
+$LIB = nil
+if( !$LIB && File.exist?("libtest.so") )
+  $LIB = "./libtest.so"
+end
+if( !$LIB && File.exist?("test/libtest.so") )
+  $LIB = "./test/libtest.so"
+end
+
+module LIBTest
+  extend DL::Importable
+
+  dlload($LIB)
+  extern "int test_c2i(char)"
+  extern "char test_i2c(int)"
+  extern "long test_lcc(char, char)"
+  extern "double test_f2d(float)"
+  extern "float test_d2f(double)"
+  extern "int test_strlen(char*)"
+  extern "int test_isucc(int)"
+  extern "long test_lsucc(long)"
+  extern "void test_succ(long *)"
+  extern "int test_arylen(int [])"
+  extern "void test_append(char*[], int, char *)"
+end
+
+DL.dlopen($LIB){|h|
+  c2i = h["test_c2i","IC"]
+  debug c2i
+  r,rs = c2i[?a]
+  debug r,rs
+  assert("c2i", :may, r == ?a)
+  assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
+
+  i2c = h["test_i2c","CI"]
+  debug i2c
+  r,rs = i2c[?a]
+  debug r,rs
+  assert("i2c", :may, r == ?a)
+  assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
+
+  lcc = h["test_lcc","LCC"]
+  debug lcc
+  r,rs = lcc[1,2]
+  assert("lcc", :may, r == 3)
+  assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
+
+  f2d = h["test_f2d","DF"]
+  debug f2d
+  r,rs = f2d[20.001]
+  debug r,rs
+  assert("f2d", :may, r.to_i == 20)
+  assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
+
+  d2f = h["test_d2f","FD"]
+  debug d2f
+  r,rs = d2f[20.001]
+  debug r,rs
+  assert("d2f", :may, r.to_i == 20)
+  assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
+
+  strlen = h["test_strlen","IS"]
+  debug strlen
+  r,rs = strlen["0123456789"]
+  debug r,rs
+  assert("strlen", :must, r == 10)
+  assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
+
+  isucc = h["test_isucc","II"]
+  debug isucc
+  r,rs = isucc[2]
+  debug r,rs
+  assert("isucc", :must, r == 3)
+  assert("extern isucc", :must, r == LIBTest.test_isucc(2))
+
+  lsucc = h["test_lsucc","LL"]
+  debug lsucc
+  r,rs = lsucc[10000000]
+  debug r,rs
+  assert("lsucc", :must, r == 10000001)
+  assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
+
+  succ = h["test_succ","0l"]
+  debug succ
+  r,rs = succ[0]
+  debug r,rs
+  assert("succ", :must, rs[0] == 1)
+  l = DL.malloc(DL.sizeof("L"))
+  l.struct!("L",:lval)
+  LIBTest.test_succ(l)
+  assert("extern succ", :must, rs[0] == l[:lval])
+
+  arylen = h["test_arylen","IA"]
+  debug arylen
+  r,rs = arylen[["a","b","c","d",nil]]
+  debug r,rs
+  assert("arylen", :must, r == 4)
+
+  arylen = h["test_arylen","IP"]
+  debug arylen
+  r,rs = arylen[["a","b","c","d",nil]]
+  debug r,rs
+  assert("arylen", :must, r == 4)
+  assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
+
+  append = h["test_append","0aIS"]
+  debug append
+  r,rs = append[["a","b","c"],3,"x"]
+  debug r,rs
+  assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
+
+  LIBTest.test_append(["a","b","c"],3,"x")
+  assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
+
+  strcat = h["test_strcat","SsS"]
+  debug strcat
+  r,rs = strcat["abc\0","x"]
+  debug r,rs
+  assert("strcat", :must, rs[0].to_s == "abcx")
+
+  init = h["test_init","IiP"]
+  debug init
+  argc = 3
+  argv = ["arg0","arg1","arg2"].to_ptr
+  r,rs = init[argc, argv.ref]
+  assert("init", :must, r == 0)
+}
+
+
+h = DL.dlopen($LIB)
+
+sym_open = h["test_open", "PSS"]
+sym_gets = h["test_gets", "SsIP"]
+sym_close = h["test_close", "0P"]
+debug sym_open,sym_gets,sym_close
+
+line = "Hello world!\n"
+File.open("tmp.txt", "w"){|f|
+  f.print(line)
+}
+
+fp,rs = sym_open["tmp.txt", "r"]
+if( fp )
+  fp.free = sym_close
+  r,rs = sym_gets[" " * 256, 256, fp]
+  debug r,rs
+  assert("open,gets", :must, rs[0] == line)
+  ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
+  fp = nil
+else
+  assert("open,gets", :must, line == nil)
+  File.unlink("tmp.txt")
+end
+
+
+callback1 = h["test_callback1"]
+debug callback1
+r,rs = h["test_call_func1", "IP"][callback1]
+debug r,rs
+assert("callback1", :must, r == 1)
+
+
+callback2 = DL.callback("LLP"){|num,ptr|
+  msg = ptr.to_s
+  if( msg == "callback message" )
+    2
+  else
+    0
+  end
+}
+debug callback2
+r,rs = h["test_call_func1", "IP"][callback2]
+debug r,rs
+assert("callback2", :must, r == 2)
+DL.remove_callback(callback2)
+
+ptr = DL.malloc(DL.sizeof('CL'))
+ptr.struct!("CL", :c, :l)
+ptr["c"] = 0
+ptr["l"] = 0
+r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
+debug r,rs
+assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
+assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
+
+
+r,rs = h["test_alloc_test_struct", "PIL"][100,200]
+r.free = DL::FREE
+r.struct!("CL", :c, :l)
+assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
+assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
+
+ptr = h["test_strlen"]
+sym1 = DL::Symbol.new(ptr,"foo","0")
+sym2 = h["test_strlen","LS"]
+assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
+
+set_val = h["test_set_long_value","0"]
+get_val = h["test_get_long_value","L"]
+lval = get_val[][0]
+ptr = h["internal_long_value"]
+ptr.struct!("L", :l)
+assert("get value", :must, ptr["l"] == lval)
+assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+ptr["l"] = 200
+lval = get_val[][0]
+assert("set value", :must, ptr["l"] == lval)
+assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
+
+
+data_init = h["test_data_init", "P"]
+data_add  = h["test_data_add", "0PS"]
+data_aref = h["test_data_aref", "PPI"]
+r,rs = data_init[]
+ptr = r
+data_add[ptr, "name1"]
+data_add[ptr, "name2"]
+data_add[ptr, "name3"]
+
+r,rs = data_aref[ptr, 1]
+ptr = r
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
+
+ptr = ptr["next"]
+ptr.struct!("C1024P", :name, :next)
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
+assert("data_aref", :must,
+       ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
+
+GC.start
+
+ptr = DL::malloc(32)
+ptr.struct!("CHIL", "c", "h", "i", "l")
+ptr["c"] = 1
+ptr["h"] = 2
+ptr["i"] = 3
+ptr["l"] = 4
+assert("struct!", :must,
+       ptr["c"] == 1 &&
+       ptr["h"] == 2 &&
+       ptr["i"] == 3 &&
+       ptr["l"] == 4)
+
+ptr = DL::malloc(DL::sizeof("IP"))
+ptr.struct!("IP", "n", "ptr")
+ptr["n"] = 10
+ptr["ptr"] = nil
+assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
+
+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/dl/test/test_all.rb b/ext/dl/test/test_all.rb
deleted file mode 100644
index fb1f4939f9..0000000000
--- a/ext/dl/test/test_all.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'test_base'
-require 'dl/import'
-
-require 'test_dl2'
-require 'test_func'
-require 'test_import'
-
-case RUBY_PLATFORM
-when /cygwin/, /mingw32/, /mswin32/, /bccwin32/
-  require 'test_win32'
-end
diff --git a/ext/dl/test/test_base.rb b/ext/dl/test/test_base.rb
deleted file mode 100644
index fc72db4e5e..0000000000
--- a/ext/dl/test/test_base.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-require 'test/unit'
-require 'dl'
-
-case RUBY_PLATFORM
-when /cygwin/
-  LIBC_SO = "cygwin1.dll"
-  LIBM_SO = "cygwin1.dll"
-when /linux/
-  LIBC_SO = "/lib/libc.so.6"
-  LIBM_SO = "/lib/libm.so.6"
-when /mingw/, /mswin32/
-  LIBC_SO = "msvcrt.dll"
-  LIBM_SO = "msvcrt.dll"
-else
-  LIBC_SO = ARGV[0]
-  LIBM_SO = ARGV[1]
-  if( !(LIBC_SO && LIBM_SO) )
-    $stderr.puts("#{$0} <libc> <libm>")
-    exit
-  end
-end
-
-module DL
-  class TestBase < Test::Unit::TestCase
-    include Math
-    include DL
-
-    def setup
-      @libc = dlopen(LIBC_SO)
-      @libm = dlopen(LIBM_SO)
-    end
-    
-    def assert_match(expected, actual, message="")
-      assert(expected === actual, message)
-    end
-
-    def assert_positive(actual)
-      assert(actual > 0)
-    end
-
-    def assert_zero(actual)
-      assert(actual == 0)
-    end
-
-    def assert_negative(actual)
-      assert(actual < 0)
-    end
-
-    def test_empty()
-    end
-  end
-end
diff --git a/ext/dl/test/test_dl2.rb b/ext/dl/test/test_dl2.rb
deleted file mode 100644
index 8c1f3e71b4..0000000000
--- a/ext/dl/test/test_dl2.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-require 'test_base.rb'
-require 'dl/callback'
-
-module DL
-class TestDL < TestBase
-  def test_call_int()
-    cfunc = CFunc.new(@libc['atoi'], TYPE_INT, 'atoi')
-    x = cfunc.call(["100"].pack("p").unpack("l!*"))
-    assert_equal(100, x)
-
-    cfunc = CFunc.new(@libc['atoi'], TYPE_INT, 'atoi')
-    x = cfunc.call(["-100"].pack("p").unpack("l!*"))
-    assert_equal(-100, x)
-  end
-
-  def test_call_long()
-    cfunc = CFunc.new(@libc['atol'], TYPE_LONG, 'atol')
-    x = cfunc.call(["100"].pack("p").unpack("l!*"))
-    assert_equal(100, x)
-    cfunc = CFunc.new(@libc['atol'], TYPE_LONG, 'atol')
-    x = cfunc.call(["-100"].pack("p").unpack("l!*"))
-    assert_equal(-100, x)
-  end
-
-  def test_call_double()
-    cfunc = CFunc.new(@libc['atof'], TYPE_DOUBLE, 'atof')
-    x = cfunc.call(["0.1"].pack("p").unpack("l!*"))
-    assert_match(0.09..0.11, x)
-
-    cfunc = CFunc.new(@libc['atof'], TYPE_DOUBLE, 'atof')
-    x = cfunc.call(["-0.1"].pack("p").unpack("l!*"))
-    assert_match(-0.11 .. -0.09, x)
-  end
-
-  def test_sin()
-    cfunc = CFunc.new(@libm['sin'], TYPE_DOUBLE, 'sin')
-    x = cfunc.call([3.14/2].pack("d").unpack("l!*"))
-    assert_equal(x, Math.sin(3.14/2))
-
-    cfunc = CFunc.new(@libm['sin'], TYPE_DOUBLE, 'sin')
-    x = cfunc.call([-3.14/2].pack("d").unpack("l!*"))
-    assert_equal(Math.sin(-3.14/2), x)
-  end
-
-  def test_strlen()
-    cfunc = CFunc.new(@libc['strlen'], TYPE_INT, 'strlen')
-    x = cfunc.call(["abc"].pack("p").unpack("l!*"))
-    assert_equal("abc".size, x)
-  end
-
-  def test_strcpy()
-    buff = "xxxx"
-    str  = "abc"
-    cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy')
-    x = cfunc.call([buff,str].pack("pp").unpack("l!*"))
-    assert_equal("abc\0", buff)
-    assert_equal("abc\0", CPtr.new(x).to_s(4))
-
-    buff = "xxxx"
-    str  = "abc"
-    cfunc = CFunc.new(@libc['strncpy'], TYPE_VOIDP, 'strncpy')
-    x = cfunc.call([buff,str,3].pack("ppi").unpack("l!*"))
-    assert_equal("abcx", buff)
-    assert_equal("abcx", CPtr.new(x).to_s(4))
-
-    ptr = CPtr.malloc(4)
-    str = "abc"
-    cfunc = CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy')
-    x = cfunc.call([ptr.to_i,str].pack("lp").unpack("l!*"))
-    assert_equal("abc\0", ptr[0,4])
-    assert_equal("abc\0", CPtr.new(x).to_s(4))
-  end
-
-  def test_callback()
-    buff = "foobarbaz"
-    cb = set_callback(TYPE_INT,2){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
-    cfunc = CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort')
-    cfunc.call([buff, buff.size, 1, cb].pack("pI!I!L!").unpack("l!*"))
-    assert_equal('aabbfoorz', buff)
-  end
-
-  def test_dlwrap()
-    ary = [0,1,2,4,5]
-    addr = dlwrap(ary)
-    ary2 = dlunwrap(addr)
-    assert_equal(ary, ary2)
-  end
-
-  def test_cptr()
-    check = Proc.new{|str,ptr|
-      assert_equal(str.size(), ptr.size())
-      assert_equal(str, ptr.to_s())
-      assert_equal(str[0,2], ptr.to_s(2))
-      assert_equal(str[0,2], ptr[0,2])
-      assert_equal(str[1,2], ptr[1,2])
-      assert_equal(str[1,0], ptr[1,0])
-      assert_equal(str[0].ord, ptr[0])
-      assert_equal(str[1].ord, ptr[1])
-    }
-    str = 'abc'
-    ptr = CPtr[str]
-    check.call(str, ptr)
-    str[0] = "c"
-    ptr[0] = "c".ord
-    check.call(str, ptr)
-    str[0,2] = "aa"
-    ptr[0,2] = "aa"
-    check.call(str, ptr)
-  end
-end
-end # module DL
diff --git a/ext/dl/test/test_func.rb b/ext/dl/test/test_func.rb
deleted file mode 100644
index 64a32d9565..0000000000
--- a/ext/dl/test/test_func.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'test_base'
-require 'dl/func'
-
-module DL
-  class TestFunc < TestBase
-    def test_strcpy()
-      f = Function.new(CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy'),
-                       [TYPE_VOIDP, TYPE_VOIDP])
-      buff = "000"
-      str = f.call(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_isdigit()
-      f = Function.new(CFunc.new(@libc['isdigit'], TYPE_INT, 'isdigit'),
-                       [TYPE_INT])
-      r1 = f.call(?1)
-      r2 = f.call(?2)
-      rr = f.call(?r)
-      assert_positive(r1)
-      assert_positive(r2)
-      assert_zero(rr)
-    end
-
-    def test_atof()
-      f = Function.new(CFunc.new(@libc['atof'], TYPE_FLOAT, 'atof'),
-                       [TYPE_VOIDP])
-      r = f.call("12.34")
-      assert_match(12.00..13.00, r)
-    end
-
-    def test_strtod()
-      f = Function.new(CFunc.new(@libc['strtod'], TYPE_DOUBLE, 'strtod'),
-                       [TYPE_VOIDP, TYPE_VOIDP])
-      buff1 = "12.34"
-      buff2 = "     "
-      r = f.call(buff1, buff2)
-      assert_match(12.00..13.00, r)
-    end
-
-    def test_qsort1()
-      cb = Function.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
-                        [TYPE_VOIDP, TYPE_VOIDP]){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
-      qsort = Function.new(CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort'),
-                           [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP])
-      buff = "9341"
-      qsort.call(buff, buff.size, 1, cb)
-      assert_equal("1349", buff)
-    end
-
-    def test_qsort2()
-      cb = TempFunction.new(CFunc.new(0, TYPE_INT, '<callback>qsort'),
-                               [TYPE_VOIDP, TYPE_VOIDP])
-      qsort = Function.new(CFunc.new(@libc['qsort'], TYPE_VOID, 'qsort'),
-                           [TYPE_VOIDP, TYPE_INT, TYPE_INT, TYPE_VOIDP])
-      buff = "9341"
-      qsort.call(buff, buff.size, 1, cb){|x,y| CPtr.new(x)[0] <=> CPtr.new(y)[0]}
-      assert_equal("1349", buff)
-    end
-  end
-end
diff --git a/ext/dl/test/test_import.rb b/ext/dl/test/test_import.rb
deleted file mode 100644
index f0694637eb..0000000000
--- a/ext/dl/test/test_import.rb
+++ /dev/null
@@ -1,154 +0,0 @@
-require 'test_base'
-require 'dl/import'
-
-module DL
-  module LIBC
-    extend Importer
-    dlload LIBC_SO, LIBM_SO
-
-    typealias 'string', 'char*'
-    typealias 'FILE*', 'void*'
-
-    extern "void *strcpy(char*, char*)"
-    extern "int isdigit(int)"
-    extern "float atof(string)"
-    extern "unsigned long strtoul(char*, char **, int)"
-    extern "int qsort(void*, int, int, void*)"
-    extern "void fprintf(FILE*, char*)"
-    extern "int gettimeofday(timeval*, timezone*)" rescue nil
-
-    QsortCallback = bind("void *qsort_callback(void*, void*)", :temp)
-    BoundQsortCallback = bind("void *qsort_callback(void*, void*)"){|ptr1,ptr2| ptr1[0] <=> ptr2[0]}
-    Timeval = struct [
-      "long tv_sec",
-      "long tv_usec",
-    ]
-    Timezone = struct [
-      "int tz_minuteswest",
-      "int tz_dsttime",
-    ]
-    MyStruct = struct [
-      "short num[5]",
-      "char c",
-      "unsigned char buff[7]",
-    ]
-
-    CallCallback = bind("void call_callback(void*, void*)"){|ptr1, ptr2|
-      f = Function.new(CFunc.new(ptr1.to_i, DL::TYPE_VOID, "<anonymous>"), [TYPE_VOIDP])
-      f.call(ptr2)
-    }
-    CarriedFunction = bind("void callback_function(void*)", :carried, 0)
-  end
-
-  class TestImport < TestBase
-    def test_malloc()
-      s1 = LIBC::Timeval.malloc()
-      s2 = LIBC::Timeval.malloc()
-      assert_not_equal(s1.to_ptr.to_i, s2.to_ptr.to_i)
-    end
-
-    def test_sizeof()
-      assert_equal(DL::SIZEOF_VOIDP, LIBC.sizeof("FILE*"))
-      assert_equal(LIBC::MyStruct.size(), LIBC.sizeof(LIBC::MyStruct))
-    end
-
-    def test_unsigned_result()
-      d = (2 ** 31) + 1
-      
-      r = LIBC.strtoul(d.to_s, 0, 0)
-      assert_equal(d, r)
-    end
-
-    def test_io()
-      if( RUBY_PLATFORM != DL::BUILD_RUBY_PLATFORM )
-        return
-      end
-      io_in,io_out = IO.pipe()
-      LIBC.fprintf(io_out, "hello")
-      io_out.flush()
-      io_out.close()
-      str = io_in.read()
-      io_in.close()
-      assert_equal("hello", str)
-    end
-
-    def test_value()
-      i = LIBC.value('int', 2)
-      assert_equal(2, i.value)
-      
-      d = LIBC.value('double', 2.0)
-      assert_equal(2.0, d.value)
-
-      ary = LIBC.value('int[3]', [0,1,2])
-      assert_equal([0,1,2], ary.value)
-    end
-
-    def test_carried_function()
-      data1 = "data"
-      data2 = nil
-      LIBC.call_callback(LIBC::CarriedFunction, LIBC::CarriedFunction.create_carrier(data1)){|d|
-        data2 = d
-      }
-      assert_equal(data1, data2)
-    end
-
-    def test_struct()
-      s = LIBC::MyStruct.malloc()
-      s.num = [0,1,2,3,4]
-      s.c = ?a
-      s.buff = "012345\377"
-      assert_equal([0,1,2,3,4], s.num)
-      assert_equal(?a, s.c)
-      assert_equal([?0,?1,?2,?3,?4,?5,?\377], s.buff)
-    end
-
-    def test_gettimeofday()
-      if( defined?(LIBC.gettimeofday) )
-        timeval = LIBC::Timeval.malloc()
-        timezone = LIBC::Timezone.malloc()
-        LIBC.gettimeofday(timeval, timezone)
-        cur = Time.now()
-        assert(cur.to_i - 2 <= timeval.tv_sec && timeval.tv_sec <= cur.to_i)
-      end
-    end
-
-    def test_strcpy()
-      buff = "000"
-      str = LIBC.strcpy(buff, "123")
-      assert_equal("123", buff)
-      assert_equal("123", str.to_s)
-    end
-
-    def test_isdigit()
-      r1 = LIBC.isdigit(?1)
-      r2 = LIBC.isdigit(?2)
-      rr = LIBC.isdigit(?r)
-      assert_positive(r1)
-      assert_positive(r2)
-      assert_zero(rr)
-    end
-
-    def test_atof()
-      r = LIBC.atof("12.34")
-      assert_match(12.00..13.00, r)
-    end
-
-    def test_strtod()
-      f = Function.new(CFunc.new(@libc['strtod'], TYPE_DOUBLE, 'strtod'),
-                       [TYPE_VOIDP, TYPE_VOIDP])
-      buff1 = "12.34"
-      buff2 = "     "
-      r = f.call(buff1, buff2)
-      assert_match(12.00..13.00, r)
-    end
-
-    def test_qsort()
-      buff = "9341"
-      LIBC.qsort(buff, buff.size, 1, LIBC::QsortCallback){|ptr1,ptr2| ptr1[0] <=> ptr2[0]}
-      assert_equal("1349", buff)
-      buff = "9341"
-      LIBC.qsort(buff, buff.size, 1, LIBC::BoundQsortCallback)
-      assert_equal("1349", buff)
-    end
-  end
-end
diff --git a/ext/dl/test/test_win32.rb b/ext/dl/test/test_win32.rb
deleted file mode 100644
index b2210287a1..0000000000
--- a/ext/dl/test/test_win32.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-require 'test_base'
-require 'dl/import'
-require 'dl/types'
-
-module Win32API
-  extend DL::Importer
-
-  dlload "kernel32.dll"
-
-  include DL::Win32Types
-
-  OSVERSIONINFO = struct [
-    "DWORD dwOSVersionInfoSize",
-    "DWORD dwMajorVersion",
-    "DWORD dwMinorVersion",
-    "DWORD dwBuildNumber",
-    "DWORD dwPlatformId",
-    "UCHAR szCSDVersion[128]",
-  ]
-
-  typealias "POSVERSIONINFO", "OSVERSIONINFO*"
-
-  extern "BOOL GetVersionEx(POSVERSIONINFO)", :stdcall
-
-  def get_version_ex()
-    ptr = OSVERSIONINFO.malloc()
-    ptr.dwOSVersionInfoSize = OSVERSIONINFO.size
-    ret = GetVersionEx(ptr)
-    if( ret )
-      ptr
-    else
-      nil
-    end
-  end
-  module_function :get_version_ex
-end
-
-module DL
-class TestWin32 < TestBase
-  def test_version()
-    platform = Win32API.get_version_ex().dwPlatformId
-    case ENV['OS']
-    when 'Windows_NT'
-      expect = 2
-    when /Windows.+/
-      expect = 1
-    else
-      expect = 0
-    end
-    assert_equal(expect, platform)
-  end
-end
-end
diff --git a/ext/dl/type.rb b/ext/dl/type.rb
new file mode 100644
index 0000000000..804420c395
--- /dev/null
+++ b/ext/dl/type.rb
@@ -0,0 +1,115 @@
+# example:
+#  DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
+#  DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
+
+DLTYPE = {
+  VOID  = 0x00 => {
+    :name => 'VOID',
+    :rb2c => nil,
+    :c2rb => nil,
+    :ctype => "void",
+    :stmem => "v",
+    :sym => true,
+    :cb => true,
+  },
+  CHAR  = 0x01 => {
+    :name => 'CHAR',
+    :rb2c => proc{|x| "NUM2CHR(#{x})"},
+    :c2rb => proc{|x| "CHR2FIX(#{x})"},
+    :ctype => "char",
+    :stmem => "c",
+    :sym => false,
+    :cb => false,
+  },
+  SHORT = 0x02 => {
+    :name => 'SHORT',
+    :rb2c => proc{|x| "FIX2INT(#{x})"},
+    :c2rb => proc{|x| "INT2FIX(#{x})"},
+    :ctype => "short",
+    :stmem => "h",
+    :sym => false,
+    :cb => false,
+  },
+  INT   = 0x03 => {
+    :name => 'INT',
+    :rb2c => proc{|x| "NUM2INT(#{x})"},
+    :c2rb => proc{|x| "INT2NUM(#{x})"},
+    :ctype => "int",
+    :stmem => "i",
+    :sym => true,
+    :cb => false,
+  },
+  LONG  = 0x04 => {
+    :name => 'LONG',
+    :rb2c => proc{|x| "NUM2INT(#{x})"},
+    :c2rb => proc{|x| "INT2NUM(#{x})"},
+    :ctype => "long",
+    :stmem => "l",
+    :sym => true,
+    :cb => true,
+  },
+  FLOAT = 0x05 => {
+    :name => 'FLOAT',
+    :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
+    :c2rb => proc{|x| "rb_float_new((double)#{x})"},
+    :ctype => "float",
+    :stmem => "f",
+    :sym => false,
+    :cb => false,
+  },
+  DOUBLE = 0x06 => {
+    :name => 'DOUBLE',
+    :rb2c => proc{|x| "RFLOAT(#{x})->value"},
+    :c2rb => proc{|x| "rb_float_new(#{x})"},
+    :ctype => "double",
+    :stmem => "d",
+    :sym => true,
+    :cb => true,
+  },
+  VOIDP = 0x07 => {
+    :name => 'VOIDP',
+    :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
+    :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
+    :ctype => "void *",
+    :stmem => "p",
+    :sym => true,
+    :cb => true,
+  },
+}
+
+def tpush(t, x)
+  (t << 3)|x
+end
+
+def tget(t, i)
+  (t & (0x07 << (i * 3))) >> (i * 3)
+end
+
+def types2num(types)
+  res = 0x00
+  r = types.reverse
+  r.each{|t|
+    res = tpush(res,t)
+  }
+  res
+end
+
+def num2types(num)
+  ts = []
+  i  = 0
+  t = tget(num,i)
+  while( (t != VOID && i > 0) || (i == 0) )
+    ts.push(DLTYPE[t][:ctype])
+    i += 1
+    t = tget(num,i)
+  end
+  ts
+end
+
+def types2ctypes(types)
+  res = []
+  types.each{|t|
+    res.push(DLTYPE[t][:ctype])
+  }
+  res
+end
diff --git a/ext/dl/win32/extconf.rb b/ext/dl/win32/extconf.rb
deleted file mode 100644
index a72ca49c06..0000000000
--- a/ext/dl/win32/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-if compiled?('dl') and $mswin||$bccwin||$mingw||$cygwin
-  create_makefile('win32')
-end
diff --git a/ext/dl/win32/lib/Win32API.rb b/ext/dl/win32/lib/Win32API.rb
deleted file mode 100644
index b642e0c8fe..0000000000
--- a/ext/dl/win32/lib/Win32API.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- ruby -*-
-# for backward compatibility
-warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: Win32API is deprecated after Ruby 1.9.1; use dl directly instead" if $VERBOSE
-
-require 'dl'
-
-class Win32API
-  DLL = {}
-  TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
-
-  def initialize(dllname, func, import, export = "0")
-    @proto = [import].join.tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
-    handle = DLL[dllname] ||= DL.dlopen(dllname)
-    @func = DL::CFunc.new(handle[func], TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], func)
-  end
-
-  def call(*args)
-    import = @proto.split("")
-    args.each_with_index do |x, i|
-      args[i], = [x == 0 ? nil : x].pack("p").unpack("l!*") if import[i] == "S"
-      args[i], = [x].pack("I").unpack("i") if import[i] == "I"
-    end
-    ret, = @func.call(args)
-    return ret || 0
-  end
-
-  alias Call call
-end
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
deleted file mode 100644
index ccdd721818..0000000000
--- a/ext/dl/win32/lib/win32/registry.rb
+++ /dev/null
@@ -1,832 +0,0 @@
-=begin
-= Win32 Registry I/F
-win32/registry is registry accessor library for Win32 platform.
-It uses Win32API to call Win32 Registry APIs.
-
-== example
-  Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
-    value = reg['foo']                               # read a value
-    value = reg['foo', Win32::Registry::REG_SZ]      # read a value with type
-    type, value = reg.read('foo')                    # read a value
-    reg['foo'] = 'bar'                               # write a value
-    reg['foo', Win32::Registry::REG_SZ] = 'bar'      # write a value with type
-    reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-    
-    reg.each_value { |name, type, data| ... }        # Enumerate values
-    reg.each_key { |key, wtime| ... }                # Enumerate subkeys
-    
-    reg.delete_value(name)                         # Delete a value
-    reg.delete_key(name)                           # Delete a subkey
-    reg.delete_key(name, true)                     # Delete a subkey recursively
-  end
-
-= Reference
-
-== Win32::Registry class
-
-=== including modules
-
-* Enumerable
-* Registry::Constants
-
-=== class methods
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Open the registry key ((|subkey|)) under ((|key|)).
-    ((|key|)) is Win32::Registry object of parent key.
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    ((|desired|)) and ((|opt|)) is access mask and key option.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
-    
-    If block is given, the key is closed automatically.
-
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
-    Create or open the registry key ((|subkey|)) under ((|key|)).
-    You can use predefined key HKEY_* (see ((<constants>)))
-    
-    If subkey is already exists, key is opened and Registry#((<created?>))
-    method will return false.
-    
-    If block is given, the key is closed automatically.
-
---- Registry.expand_environ(str)
-    Replace (({%\w+%})) into the environment value of ((|str|)).
-    This method is used for REG_EXPAND_SZ.
-    
-    For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
-
---- Registry.type2name(type)
-    Convert registry type value to readable string.
-
---- Registry.wtime2time(wtime)
-    Convert 64-bit FILETIME integer into Time object.
-
---- Registry.time2wtime(time)
-    Convert Time object or Integer object into 64-bit FILETIME.
-
-=== instance methods
---- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
-
---- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-    Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
-
---- close
-    Close key.
-    
-    After closed, most method raises error.
-
---- read(name, *rtype)
-    Read a registry value named ((|name|)) and return array of
-    [ ((|type|)), ((|data|)) ].
-    When name is nil, the `default' value is read.
-    
-    ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
-    ((|data|)) is value data, its class is:
-    :REG_SZ, REG_EXPAND_SZ
-       String
-    :REG_MULTI_SZ
-       Array of String
-    :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
-       Integer
-    :REG_BINARY
-       String (contains binary data)
-    
-    When ((|rtype|)) is specified, the value type must be included by
-    ((|rtype|)) array, or TypeError is raised.
-
---- self[name, *rtype]
-    Read a registry value named ((|name|)) and return its value data.
-    The class of value is same as ((<read>)) method returns.
-    
-    If the value type is REG_EXPAND_SZ, returns value data whose environment
-    variables are replaced.
-    If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
-    REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-    
-    The meaning of ((|rtype|)) is same as ((<read>)) method.
-
---- read_s(name)
---- read_i(name)
---- read_bin(name)
-    Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
-    registry value named ((|name|)).
-    
-    If the values type does not match, TypeError is raised.
-
---- read_s_expand(name)
-    Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
-    
-    If the value type is REG_EXPAND_SZ, environment variables are replaced.
-    Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-
---- write(name, type, data)
-    Write ((|data|)) to a registry value named ((|name|)).
-    When name is nil, write to the `default' value.
-    
-    ((|type|)) is type value. (see ((<Registry::Constants module>)))
-    Class of ((|data|)) must be same as which ((<read>))
-    method returns.
-
---- self[name, wtype = nil] = value
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    If ((|wtype|)) is specified, the value type is it.
-    Otherwise, the value type is depend on class of ((|value|)):
-    :Integer
-      REG_DWORD
-    :String
-      REG_SZ
-    :Array
-      REG_MULTI_SZ
-
---- write_s(name, value)
---- write_i(name, value)
---- write_bin(name, value)
-    Write ((|value|)) to a registry value named ((|name|)).
-    
-    The value type is REG_SZ(write_s), REG_DWORD(write_i), or
-    REG_BINARY(write_bin).
-
---- each { |name, type, value| ... }
---- each_value { |name, type, value| ... }
-    Enumerate values.
-
---- each_key { |subkey, wtime| ... }
-    Enumerate subkeys.
-    
-    ((|subkey|)) is String which contains name of subkey.
-    ((|wtime|)) is last write time as FILETIME (64-bit integer).
-    (see ((<Registry.wtime2time>)))
-
---- delete(name)
---- delete_value(name)
-    Delete a registry value named ((|name|)).
-    We can not delete the `default' value.
-
---- delete_key(name, recursive = false)
-    Delete a subkey named ((|name|)) and all its values.
-    
-    If ((|recursive|)) is false, the subkey must not have subkeys.
-    Otherwise, this method deletes all subkeys and values recursively.
-
---- flush
-    Write all the attributes into the registry file.
-
---- created?
-    Returns if key is created ((*newly*)).
-    (see ((<Registry.create>)))
-
---- open?
-    Returns if key is not closed.
-
---- hkey
-    Returns key handle value.
-
---- parent
-    Win32::Registry object of parent key, or nil if predefeined key.
-
---- keyname
-    Same as ((|subkey|)) value of ((<Registry.open>)) or
-    ((<Registry.create>)) method.
-
---- disposition
-    Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-
---- name
---- to_s
-    Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
-
---- info
-    Returns key information as Array of:
-    :num_keys
-      The number of subkeys.
-    :max_key_length
-      Maximum length of name of subkeys.
-    :num_values
-      The number of values.
-    :max_value_name_length
-      Maximum length of name of values.
-    :max_value_length
-      Maximum length of value of values.
-    :descriptor_length
-      Length of security descriptor.
-    :wtime
-      Last write time as FILETIME(64-bit integer)
-    
-    For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
-
---- num_keys
---- max_key_length
---- num_values
---- max_value_name_length
---- max_value_length
---- descriptor_length
---- wtime
-    Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
---- HKEY_CURRENT_USER
---- HKEY_LOCAL_MACHINE
---- HKEY_PERFORMANCE_DATA
---- HKEY_CURRENT_CONFIG
---- HKEY_DYN_DATA
-    Win32::Registry object whose key is predefined key.
-    For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
-
-== Win32::Registry::Constants module
-
-For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
-
---- HKEY_*
-    Predefined key ((*handle*)).
-    These are Integer, not Win32::Registry.
-
---- REG_*
-    Registry value type.
-
---- KEY_*
-    Security access mask.
-
---- KEY_OPTIONS_*
-    Key options.
-
---- REG_CREATED_NEW_KEY
---- REG_OPENED_EXISTING_KEY
-    If the key is created newly or opened existing key.
-    See also Registry#((<disposition>)) method.
-
-=end
-
-require 'Win32API'
-
-module Win32
-  class Registry
-    module Constants
-      HKEY_CLASSES_ROOT = 0x80000000
-      HKEY_CURRENT_USER = 0x80000001
-      HKEY_LOCAL_MACHINE = 0x80000002
-      HKEY_USERS = 0x80000003
-      HKEY_PERFORMANCE_DATA = 0x80000004
-      HKEY_PERFORMANCE_TEXT = 0x80000050
-      HKEY_PERFORMANCE_NLSTEXT = 0x80000060
-      HKEY_CURRENT_CONFIG = 0x80000005
-      HKEY_DYN_DATA = 0x80000006
-      
-      REG_NONE = 0
-      REG_SZ = 1
-      REG_EXPAND_SZ = 2
-      REG_BINARY = 3
-      REG_DWORD = 4
-      REG_DWORD_LITTLE_ENDIAN = 4
-      REG_DWORD_BIG_ENDIAN = 5
-      REG_LINK = 6
-      REG_MULTI_SZ = 7
-      REG_RESOURCE_LIST = 8
-      REG_FULL_RESOURCE_DESCRIPTOR = 9
-      REG_RESOURCE_REQUIREMENTS_LIST = 10
-      REG_QWORD = 11
-      REG_QWORD_LITTLE_ENDIAN = 11
-      
-      STANDARD_RIGHTS_READ = 0x00020000
-      STANDARD_RIGHTS_WRITE = 0x00020000
-      KEY_QUERY_VALUE = 0x0001
-      KEY_SET_VALUE = 0x0002
-      KEY_CREATE_SUB_KEY = 0x0004
-      KEY_ENUMERATE_SUB_KEYS = 0x0008
-      KEY_NOTIFY = 0x0010
-      KEY_CREATE_LINK = 0x0020
-      KEY_READ = STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
-      KEY_WRITE = STANDARD_RIGHTS_WRITE |
-        KEY_SET_VALUE | KEY_CREATE_SUB_KEY
-      KEY_EXECUTE = KEY_READ
-      KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-      
-      REG_OPTION_RESERVED = 0x0000
-      REG_OPTION_NON_VOLATILE = 0x0000
-      REG_OPTION_VOLATILE = 0x0001
-      REG_OPTION_CREATE_LINK = 0x0002
-      REG_OPTION_BACKUP_RESTORE = 0x0004
-      REG_OPTION_OPEN_LINK = 0x0008
-      REG_LEGAL_OPTION = REG_OPTION_RESERVED |
-        REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
-        REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-      
-      REG_CREATED_NEW_KEY = 1
-      REG_OPENED_EXISTING_KEY = 2
-      
-      REG_WHOLE_HIVE_VOLATILE = 0x0001
-      REG_REFRESH_HIVE = 0x0002
-      REG_NO_LAZY_FLUSH = 0x0004
-      REG_FORCE_RESTORE = 0x0008
-      
-      MAX_KEY_LENGTH = 514
-      MAX_VALUE_LENGTH = 32768
-    end
-    include Constants
-    include Enumerable
-    
-    #
-    # Error
-    #
-    class Error < ::StandardError
-      FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
-      def initialize(code)
-        @code = code
-        msg = "\0".force_encoding(Encoding::ASCII_8BIT) * 1024
-        len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
-        msg = msg[0, len].force_encoding(Encoding.find(Encoding.locale_charmap))
-        super msg.tr("\r", '').chomp
-      end
-      attr_reader :code
-    end
-    
-    #
-    # Predefined Keys
-    #
-    class PredefinedKey < Registry
-      def initialize(hkey, keyname)
-        @hkey = hkey
-        @parent = nil
-        @keyname = keyname
-        @disposition = REG_OPENED_EXISTING_KEY
-      end
-      
-      # Predefined keys cannot be closed
-      def close
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-      
-      # Fake class for Registry#open, Registry#create
-      def class
-        Registry
-      end
-      
-      # Make all
-      Constants.constants.grep(/^HKEY_/) do |c|
-        Registry.const_set c, new(Constants.const_get(c), c)
-      end
-    end
-    
-    #
-    # Win32 APIs
-    #
-    module API
-      [
-        %w/RegOpenKeyExA    LPLLP        L/,
-        %w/RegCreateKeyExA  LPLLLLPPP    L/,
-        %w/RegEnumValueA    LLPPPPPP     L/,
-        %w/RegEnumKeyExA    LLPPLLLP     L/,
-        %w/RegQueryValueExA LPLPPP       L/,
-        %w/RegSetValueExA   LPLLPL       L/,
-        %w/RegDeleteValue   LP           L/,
-        %w/RegDeleteKey     LP           L/,
-        %w/RegFlushKey      L            L/,
-        %w/RegCloseKey      L            L/,
-        %w/RegQueryInfoKey  LPPPPPPPPPPP L/,
-      ].each do |fn|
-        const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
-      end
-      
-      module_function
-      
-      def check(result)
-        raise Error, result, caller(2) if result != 0
-      end
-      
-      def packdw(dw)
-        [dw].pack('V')
-      end
-      
-      def unpackdw(dw)
-        dw += [0].pack('V')
-        dw.unpack('V')[0]
-      end
-      
-      def packqw(qw)
-        [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
-      end
-      
-      def unpackqw(qw)
-        qw = qw.unpack('VV')
-        (qw[1] << 32) | qw[0]
-      end
-      
-      def OpenKey(hkey, name, opt, desired)
-        result = packdw(0)
-        check RegOpenKeyExA.call(hkey, name, opt, desired, result)
-        unpackdw(result)
-      end
-      
-      def CreateKey(hkey, name, opt, desired)
-        result = packdw(0)
-        disp = packdw(0)
-        check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
-                                   0, result, disp)
-        [ unpackdw(result), unpackdw(disp) ]
-      end
-      
-      def EnumValue(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
-        name[0, unpackdw(size)]
-      end
-      
-      def EnumKey(hkey, index)
-        name = ' ' * Constants::MAX_KEY_LENGTH
-        size = packdw(Constants::MAX_KEY_LENGTH)
-        wtime = ' ' * 8
-        check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
-        [ name[0, unpackdw(size)], unpackqw(wtime) ]
-      end
-      
-      def QueryValue(hkey, name)
-        type = packdw(0)
-        size = packdw(0)
-        check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
-        data = ' ' * unpackdw(size)
-        check RegQueryValueExA.call(hkey, name, 0, type, data, size)
-        [ unpackdw(type), data[0, unpackdw(size)] ]
-      end
-      
-      def SetValue(hkey, name, type, data, size)
-        check RegSetValueExA.call(hkey, name, 0, type, data, size)
-      end
-      
-      def DeleteValue(hkey, name)
-        check RegDeleteValue.call(hkey, name)
-      end
-      
-      def DeleteKey(hkey, name)
-        check RegDeleteKey.call(hkey, name)
-      end
-      
-      def FlushKey(hkey)
-        check RegFlushKey.call(hkey)
-      end
-      
-      def CloseKey(hkey)
-        check RegCloseKey.call(hkey)
-      end
-      
-      def QueryInfoKey(hkey)
-        subkeys = packdw(0)
-        maxsubkeylen = packdw(0)
-        values = packdw(0)
-        maxvaluenamelen = packdw(0)
-        maxvaluelen = packdw(0)
-        secdescs = packdw(0)
-        wtime = ' ' * 8
-        check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
-          values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
-        [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
-          unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
-          unpackdw(secdescs), unpackqw(wtime) ]
-      end
-    end
-    
-    #
-    # utility functions
-    #
-    def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
-    end
-    
-    @@type2name = { }
-    %w[
-      REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
-      REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
-      REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
-      REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
-    ].each do |type|
-      @@type2name[Constants.const_get(type)] = type
-    end
-    
-    def self.type2name(type)
-      @@type2name[type] || type.to_s
-    end
-    
-    def self.wtime2time(wtime)
-      Time.at((wtime - 116444736000000000) / 10000000)
-    end
-    
-    def self.time2wtime(time)
-      time.to_i * 10000000 + 116444736000000000
-    end
-    
-    #
-    # constructors
-    #
-    private_class_method :new
-    
-    def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
-      subkey = subkey.chomp('\\')
-      newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
-      newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
-      obj = new(newkey, hkey, subkey, disp)
-      if block_given?
-        begin
-          yield obj
-        ensure
-          obj.close
-        end
-      else
-        obj
-      end
-    end
-    
-    #
-    # finalizer
-    #
-    @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-    
-    #
-    # initialize
-    #
-    def initialize(hkey, parent, keyname, disposition)
-      @hkey = hkey
-      @parent = parent
-      @keyname = keyname
-      @disposition = disposition
-      @hkeyfinal = [ hkey ]
-      ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
-    end
-    attr_reader :hkey, :parent, :keyname, :disposition
-    
-    #
-    # attributes
-    #
-    def created?
-      @disposition == REG_CREATED_NEW_KEY
-    end
-    
-    def open?
-      !@hkey.nil?
-    end
-    
-    def name
-      parent = self
-      name = @keyname
-      while parent = parent.parent
-        name = parent.keyname + '\\' + name
-      end
-      name
-    end
-    
-    def inspect
-      "\#<Win32::Registry key=#{name.inspect}>"
-    end
-    
-    #
-    # marshalling
-    #
-    def _dump(depth)
-      raise TypeError, "can't dump Win32::Registry"
-    end
-    
-    #
-    # open/close
-    #
-    def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
-      self.class.open(self, subkey, desired, opt, &blk)
-    end
-    
-    def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
-      self.class.create(self, subkey, desired, opt, &blk)
-    end
-    
-    def close
-      API.CloseKey(@hkey)
-      @hkey = @parent = @keyname = nil
-      @hkeyfinal[0] = nil
-    end
-    
-    #
-    # iterator
-    #
-    def each_value
-      index = 0
-      while true
-        begin
-          subkey = API.EnumValue(@hkey, index)
-        rescue Error
-          break
-        end
-        begin
-          type, data = read(subkey)
-        rescue Error
-          next
-        end
-        yield subkey, type, data
-        index += 1
-      end
-      index
-    end
-    alias each each_value
-    
-    def each_key
-      index = 0
-      while true
-        begin
-          subkey, wtime = API.EnumKey(@hkey, index)
-        rescue Error
-          break
-        end
-        yield subkey, wtime
-        index += 1
-      end
-      index
-    end
-    
-    def keys
-      keys_ary = []
-      each_key { |key,| keys_ary << key }
-      keys_ary
-    end
-    
-    #
-    # reader
-    #
-    def read(name, *rtype)
-      type, data = API.QueryValue(@hkey, name)
-      unless rtype.empty? or rtype.include?(type)
-        raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
-      end
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        [ type, data.chop ]
-      when REG_MULTI_SZ
-        [ type, data.split(/\0/) ]
-      when REG_BINARY
-        [ type, data ]
-      when REG_DWORD
-        [ type, API.unpackdw(data) ]
-      when REG_DWORD_BIG_ENDIAN
-        [ type, data.unpack('N')[0] ]
-      when REG_QWORD
-        [ type, API.unpackqw(data) ]
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def [](name, *rtype)
-      type, data = read(name, *rtype)
-      case type
-      when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
-        data
-      when REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        raise TypeError, "Type #{type} is not supported."
-      end
-    end
-    
-    def read_s(name)
-      read(name, REG_SZ)[1]
-    end
-    
-    def read_s_expand(name)
-      type, data = read(name, REG_SZ, REG_EXPAND_SZ)
-      if type == REG_EXPAND_SZ
-        Registry.expand_environ(data)
-      else
-        data
-      end
-    end
-    
-    def read_i(name)
-      read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
-    end
-    
-    def read_bin(name)
-      read(name, REG_BINARY)[1]
-    end
-    
-    #
-    # writer
-    #
-    def write(name, type, data)
-      case type
-      when REG_SZ, REG_EXPAND_SZ
-        data = data.to_s + "\0"
-      when REG_MULTI_SZ
-        data = data.to_a.join("\0") + "\0\0"
-      when REG_BINARY
-        data = data.to_s
-      when REG_DWORD
-        data = API.packdw(data.to_i)
-      when REG_DWORD_BIG_ENDIAN
-        data = [data.to_i].pack('N')
-      when REG_QWORD
-        data = API.packqw(data.to_i)
-      else
-        raise TypeError, "Unsupported type #{type}"
-      end
-      API.SetValue(@hkey, name, type, data, data.length)
-    end
-    
-    def []=(name, rtype, value = nil)
-      if value
-        write name, rtype, value
-      else
-        case value = rtype
-        when Integer
-          write name, REG_DWORD, value
-        when String
-          write name, REG_SZ, value
-        when Array
-          write name, REG_MULTI_SZ, value
-        else
-          raise TypeError, "Unexpected type #{value.class}"
-        end
-      end
-      value
-    end
-    
-    def write_s(name, value)
-      write name, REG_SZ, value.to_s
-    end
-    
-    def write_i(name, value)
-      write name, REG_DWORD, value.to_i
-    end
-    
-    def write_bin(name, value)
-      write name, REG_BINARY, value.to_s
-    end
-    
-    #
-    # delete
-    #
-    def delete_value(name)
-      API.DeleteValue(@hkey, name)
-    end
-    alias delete delete_value
-    
-    def delete_key(name, recursive = false)
-      if recursive
-        open(name, KEY_ALL_ACCESS) do |reg|
-          reg.keys.each do |key|
-            begin
-              reg.delete_key(key, true)
-            rescue Error
-              #
-            end
-          end
-        end
-        API.DeleteKey(@hkey, name)
-      else
-        begin
-          API.EnumKey @hkey, 0
-        rescue Error
-          return API.DeleteKey(@hkey, name)
-        end
-        raise Error.new(5) ## ERROR_ACCESS_DENIED
-      end
-    end
-    
-    #
-    # flush
-    #
-    def flush
-      API.FlushKey @hkey
-    end
-    
-    #
-    # key information
-    #
-    def info
-      API.QueryInfoKey(@hkey)
-    end
-    %w[
-      num_keys max_key_length
-      num_values max_value_name_length max_value_length
-      descriptor_length wtime
-    ].each_with_index do |s, i|
-      eval <<-__END__
-        def #{s}
-          info[#{i}]
-        end
-      __END__
-    end
-  end
-end
diff --git a/ext/dl/win32/lib/win32/resolv.rb b/ext/dl/win32/lib/win32/resolv.rb
deleted file mode 100644
index 4e69f58085..0000000000
--- a/ext/dl/win32/lib/win32/resolv.rb
+++ /dev/null
@@ -1,370 +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.expand_path('hosts', path)
-      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|
-                    begin
-                      ns = regif.read_s(key)
-                    rescue
-                    else
-                      unless ns.empty?
-                        nameserver.concat(ns.split(/[,\s]\s*/))
-                        break
-                      end
-                    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/dl/win32/lib/win32/sspi.rb b/ext/dl/win32/lib/win32/sspi.rb
deleted file mode 100644
index ef90ae35a7..0000000000
--- a/ext/dl/win32/lib/win32/sspi.rb
+++ /dev/null
@@ -1,330 +0,0 @@
-#
-# = win32/sspi.rb
-#
-# Copyright (c) 2006-2007 Justin Bailey
-# 
-# Written and maintained by Justin Bailey <jgbailey@gmail.com>.
-#
-# This program is free software. You can re-distribute and/or
-# modify this program under the same terms of ruby itself ---
-# Ruby Distribution License or GNU General Public License.
-#
-
-require 'Win32API'
-
-# Implements bindings to Win32 SSPI functions, focused on authentication to a proxy server over HTTP.
-module Win32
-	module SSPI
-		# Specifies how credential structure requested will be used. Only SECPKG_CRED_OUTBOUND is used
-		# here.
-		SECPKG_CRED_INBOUND = 0x00000001
-		SECPKG_CRED_OUTBOUND = 0x00000002
-		SECPKG_CRED_BOTH = 0x00000003
-
-		# Format of token. NETWORK format is used here.
-		SECURITY_NATIVE_DREP = 0x00000010
-		SECURITY_NETWORK_DREP = 0x00000000
-
-		# InitializeSecurityContext Requirement flags
-		ISC_REQ_REPLAY_DETECT = 0x00000004
-		ISC_REQ_SEQUENCE_DETECT = 0x00000008
-		ISC_REQ_CONFIDENTIALITY = 0x00000010
-		ISC_REQ_USE_SESSION_KEY = 0x00000020
-		ISC_REQ_PROMPT_FOR_CREDS = 0x00000040
-		ISC_REQ_CONNECTION = 0x00000800
-
-		# Win32 API Functions. Uses Win32API to bind methods to constants contained in class. 
-		module API
-			# Can be called with AcquireCredentialsHandle.call()
-			AcquireCredentialsHandle = Win32API.new("secur32", "AcquireCredentialsHandle", 'ppLpppppp', 'L')
-			# Can be called with InitializeSecurityContext.call()
-			InitializeSecurityContext = Win32API.new("secur32", "InitializeSecurityContext", 'pppLLLpLpppp', 'L')
-			# Can be called with DeleteSecurityContext.call()
-			DeleteSecurityContext = Win32API.new("secur32", "DeleteSecurityContext", 'P', 'L')
-			# Can be called with FreeCredentialsHandle.call()
-			FreeCredentialsHandle = Win32API.new("secur32", "FreeCredentialsHandle", 'P', 'L')
-		end
-	  
-		# SecHandle struct
-		class SecurityHandle
-			def upper
-				@struct.unpack("LL")[1]
-			end
-	    
-			def lower
-				@struct.unpack("LL")[0]
-			end
-	    
-			def to_p
-				@struct ||= "\0" * 8
-			end
-		end
-	  
-		# Some familiar aliases for the SecHandle structure
-		CredHandle = CtxtHandle = SecurityHandle
-
-		# TimeStamp struct
-		class TimeStamp
-			attr_reader :struct
-
-			def to_p
-				@struct ||= "\0" * 8
-			end
-		end
-	  
-		# Creates binary representaiton of a SecBufferDesc structure,
-		# including the SecBuffer contained inside.
-		class SecurityBuffer
-
-			SECBUFFER_TOKEN = 2   # Security token
-	    
-			TOKENBUFSIZE = 12288
-			SECBUFFER_VERSION = 0
-
-			def initialize(buffer = nil)
-				@buffer = buffer || "\0" * TOKENBUFSIZE
-				@bufferSize = @buffer.length
-				@type = SECBUFFER_TOKEN
-			end
-	    
-			def bufferSize
-				unpack
-				@bufferSize
-			end
-	    
-			def bufferType
-				unpack
-				@type
-			end
-	    
-			def token
-				unpack
-				@buffer
-			end
-	    
-			def to_p
-				# Assumption is that when to_p is called we are going to get a packed structure. Therefore,
-				# set @unpacked back to nil so we know to unpack when accessors are next accessed.
-				@unpacked = nil
-				# Assignment of inner structure to variable is very important here. Without it,
-				# will not be able to unpack changes to the structure. Alternative, nested unpacks,
-				# does not work (i.e. @struct.unpack("LLP12")[2].unpack("LLP12") results in "no associated pointer")
-				@sec_buffer ||= [@bufferSize, @type, @buffer].pack("LLP")
-				@struct ||= [SECBUFFER_VERSION, 1, @sec_buffer].pack("LLP")    
-			end
-	  
-		private
-	  
-			# Unpacks the SecurityBufferDesc structure into member variables. We
-			# only want to do this once per struct, so the struct is deleted
-			# after unpacking. 
-			def unpack
-				if ! @unpacked && @sec_buffer && @struct
-					@bufferSize, @type = @sec_buffer.unpack("LL")
-					@buffer = @sec_buffer.unpack("LLP#{@bufferSize}")[2]
-					@struct = nil
-					@sec_buffer = nil
-					@unpacked = true
-				end
-			end
-		end
-	  
-		# SEC_WINNT_AUTH_IDENTITY structure
-		class Identity
-			SEC_WINNT_AUTH_IDENTITY_ANSI = 0x1
-
-			attr_accessor :user, :domain, :password
-	    
-			def initialize(user = nil, domain = nil, password = nil)
-				@user = user
-				@domain = domain
-				@password = password
-				@flags = SEC_WINNT_AUTH_IDENTITY_ANSI
-			end
-	    
-			def to_p
-				[@user, @user ? @user.length : 0, 
-				 @domain, @domain ? @domain.length : 0,
-				 @password, @password ? @password.length : 0,
-				 @flags].pack("PLPLPLL")
-			end    
-		end
-
-		# Takes a return result from an SSPI function and interprets the value.
-		class SSPIResult 
-			# Good results
-			SEC_E_OK = 0x00000000
-			SEC_I_CONTINUE_NEEDED = 0x00090312
-
-			# These are generally returned by InitializeSecurityContext
-			SEC_E_INSUFFICIENT_MEMORY = 0x80090300
-			SEC_E_INTERNAL_ERROR = 0x80090304
-			SEC_E_INVALID_HANDLE = 0x80090301
-			SEC_E_INVALID_TOKEN = 0x80090308
-			SEC_E_LOGON_DENIED = 0x8009030C
-			SEC_E_NO_AUTHENTICATING_AUTHORITY = 0x80090311
-			SEC_E_NO_CREDENTIALS = 0x8009030E
-			SEC_E_TARGET_UNKNOWN = 0x80090303
-			SEC_E_UNSUPPORTED_FUNCTION = 0x80090302
-			SEC_E_WRONG_PRINCIPAL = 0x80090322
-
-			# These are generally returned by AcquireCredentialsHandle
-			SEC_E_NOT_OWNER = 0x80090306
-			SEC_E_SECPKG_NOT_FOUND = 0x80090305
-			SEC_E_UNKNOWN_CREDENTIALS = 0x8009030D
-	    
-			@@map = {}
-			constants.each { |v| @@map[self.const_get(v.to_s)] = v }
-
-			attr_reader :value
-	    
-			def initialize(value)
-				# convert to unsigned long
-				value = [value].pack("L").unpack("L").first
-				raise "#{value.to_s(16)} is not a recognized result" unless @@map.has_key? value
-				@value = value
-			end
-	    
-			def to_s
-				@@map[@value].to_s
-			end
-	    
-			def ok?
-				@value == SEC_I_CONTINUE_NEEDED || @value == SEC_E_OK
-			end
-	    
-			def ==(other)
-				if other.is_a?(SSPIResult)
-					@value == other.value
-				elsif other.is_a?(Fixnum)
-					@value == @@map[other]
-				else
-					false
-				end
-			end
-		end
-
-		# Handles "Negotiate" type authentication. Geared towards authenticating with a proxy server over HTTP
-		class NegotiateAuth  
-			attr_accessor :credentials, :context, :contextAttributes, :user, :domain
-
-			# Default request flags for SSPI functions
-			REQUEST_FLAGS = ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION
-
-			# NTLM tokens start with this header always. Encoding alone adds "==" and newline, so remove those
-      B64_TOKEN_PREFIX = ["NTLMSSP"].pack("m").delete("=\n")  
-
-			# Given a connection and a request path, performs authentication as the current user and returns
-			# the response from a GET request. The connnection should be a Net::HTTP object, and it should
-			# have been constructed using the Net::HTTP.Proxy method, but anything that responds to "get" will work.
-			# If a user and domain are given, will authenticate as the given user.
-			# Returns the response received from the get method (usually Net::HTTPResponse)
-			def NegotiateAuth.proxy_auth_get(http, path, user = nil, domain = nil)
-				raise "http must respond to :get" unless http.respond_to?(:get)
-				nego_auth = self.new user, domain
-	      
-				resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.get_initial_token }
-				if resp["Proxy-Authenticate"]
-					resp = http.get path, { "Proxy-Authorization" => "Negotiate " + nego_auth.complete_authentication(resp["Proxy-Authenticate"].split(" ").last.strip) }
-				end
-
-				resp
-			end
-	    
-			# Creates a new instance ready for authentication as the given user in the given domain.
-			# Defaults to current user and domain as defined by ENV["USERDOMAIN"] and ENV["USERNAME"] if
-			# no arguments are supplied.
-			def initialize(user = nil, domain = nil)
-				if user.nil? && domain.nil? && ENV["USERNAME"].nil? && ENV["USERDOMAIN"].nil?
-					raise "A username or domain must be supplied since they cannot be retrieved from the environment"
-				end
-	      
-				@user = user || ENV["USERNAME"]
-				@domain = domain || ENV["USERDOMAIN"]
-			end
-
-			# Gets the initial Negotiate token. Returns it as a base64 encoded string suitable for use in HTTP. Can
-			# be easily decoded, however.
-			def get_initial_token
-				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-				get_credentials
-
-				outputBuffer = SecurityBuffer.new
-				@context = CtxtHandle.new
-				@contextAttributes = "\0" * 4
-
-				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, nil, nil, 
-					REQUEST_FLAGS,0, SECURITY_NETWORK_DREP, nil, 0, @context.to_p, outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-
-				if result.ok? then
-					return encode_token(outputBuffer.token)
-				else
-					raise "Error: #{result.to_s}"
-				end
-			end
-	    
-			# Takes a token and gets the next token in the Negotiate authentication chain. Token can be Base64 encoded or not. 
-			# The token can include the "Negotiate" header and it will be stripped.
-			# Does not indicate if SEC_I_CONTINUE or SEC_E_OK was returned.
-			# Token returned is Base64 encoded w/ all new lines removed.
-			def complete_authentication(token)
-				raise "This object is no longer usable because its resources have been freed." if @cleaned_up
-
-				# Nil token OK, just set it to empty string      
-				token = "" if token.nil?
-
-				if token.include? "Negotiate"
-					# If the Negotiate prefix is passed in, assume we are seeing "Negotiate <token>" and get the token.
-					token = token.split(" ").last
-				end
-
-				if token.include? B64_TOKEN_PREFIX 
-					# indicates base64 encoded token
-          token = token.strip.unpack("m")[0]
-				end
-	      
-				outputBuffer = SecurityBuffer.new
-				result = SSPIResult.new(API::InitializeSecurityContext.call(@credentials.to_p, @context.to_p, nil, 
-					REQUEST_FLAGS, 0, SECURITY_NETWORK_DREP, SecurityBuffer.new(token).to_p, 0, 
-					@context.to_p,
-					outputBuffer.to_p, @contextAttributes, TimeStamp.new.to_p))
-	       
-				if result.ok? then
-					return encode_token(outputBuffer.token)
-				else
-					raise "Error: #{result.to_s}"
-				end
-			ensure
-				# need to make sure we don't clean up if we've already cleaned up.
-				clean_up unless @cleaned_up
-			end
-
-		 private
-
-			def clean_up
-				# free structures allocated
-				@cleaned_up = true
-				API::FreeCredentialsHandle.call(@credentials.to_p)
-				API::DeleteSecurityContext.call(@context.to_p)
-				@context = nil
-				@credentials = nil
-				@contextAttributes = nil
-			end
-
-			# Gets credentials based on user, domain or both. If both are nil, an error occurs
-			def get_credentials
-				@credentials = CredHandle.new
-				ts = TimeStamp.new
-				@identity = Identity.new @user, @domain
-				result = SSPIResult.new(API::AcquireCredentialsHandle.call(nil, "Negotiate", SECPKG_CRED_OUTBOUND, nil, @identity.to_p, 
-					nil, nil, @credentials.to_p, ts.to_p))
-				raise "Error acquire credentials: #{result}" unless result.ok?
-			end
-
-			def encode_token(t)
-				# encode64 will add newlines every 60 characters so we need to remove those.
-        [t].pack("m").delete("\n")
-			end
-		end
-	end
-end
-\ No newline at end of file
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index f09c8d76db..ecb9e16411 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -3,6 +3,7 @@
   etc.c -
 
   $Author$
+  $Date$
   created at: Tue Mar 22 18:39:19 JST 1994
 
 ************************************************/
@@ -41,7 +42,8 @@ char *getlogin();
  *   Etc.getlogin -> 'guest'
  */
 static VALUE
-etc_getlogin(VALUE obj)
+etc_getlogin(obj)
+    VALUE obj;
 {
     char *login;
 
@@ -60,7 +62,8 @@ etc_getlogin(VALUE obj)
 
 #if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
 static VALUE
-safe_setup_str(const char *str)
+safe_setup_str(str)
+    const char *str;
 {
     if (str == 0) str = "";
     return rb_tainted_str_new2(str);
@@ -69,7 +72,8 @@ safe_setup_str(const char *str)
 
 #ifdef HAVE_GETPWENT
 static VALUE
-setup_passwd(struct passwd *pwd)
+setup_passwd(pwd)
+    struct passwd *pwd;
 {
     if (pwd == 0) rb_sys_fail("/etc/passwd");
     return rb_struct_new(sPasswd,
@@ -77,8 +81,8 @@ setup_passwd(struct passwd *pwd)
 #ifdef HAVE_ST_PW_PASSWD
 			 safe_setup_str(pwd->pw_passwd),
 #endif
-			 UIDT2NUM(pwd->pw_uid),
-			 GIDT2NUM(pwd->pw_gid),
+			 PW_UID2VAL(pwd->pw_uid),
+			 PW_GID2VAL(pwd->pw_gid),
 #ifdef HAVE_ST_PW_GECOS
 			 safe_setup_str(pwd->pw_gecos),
 #endif
@@ -117,7 +121,10 @@ setup_passwd(struct passwd *pwd)
  * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
-etc_getpwuid(int argc, VALUE *argv, VALUE obj)
+etc_getpwuid(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
 #if defined(HAVE_GETPWENT)
     VALUE id;
@@ -126,7 +133,7 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	uid = NUM2UIDT(id);
+	uid = PW_VAL2UID(id);
     }
     else {
 	uid = getuid();
@@ -148,14 +155,15 @@ etc_getpwuid(int argc, VALUE *argv, VALUE obj)
  * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
  */
 static VALUE
-etc_getpwnam(VALUE obj, VALUE nam)
+etc_getpwnam(obj, nam)
+    VALUE obj, nam;
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pwd;
 
     SafeStringValue(nam);
-    pwd = getpwnam(RSTRING_PTR(nam));
-    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING_PTR(nam));
+    pwd = getpwnam(RSTRING(nam)->ptr);
+    if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
     return setup_passwd(pwd);
 #else 
     return Qnil;
@@ -165,14 +173,14 @@ etc_getpwnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETPWENT
 static int passwd_blocking = 0;
 static VALUE
-passwd_ensure(void)
+passwd_ensure()
 {
     passwd_blocking = Qfalse;
     return Qnil;
 }
 
 static VALUE
-passwd_iterate(void)
+passwd_iterate()
 {
     struct passwd *pw;
 
@@ -188,7 +196,7 @@ passwd_iterate(void)
 /* Provides a convenient Ruby iterator which executes a block for each entry 
  * in the /etc/passwd file.
  *
- * The code block is passed an Struct::Passwd struct; see getpwent above for 
+ * The code block is passed an Etc::Passwd struct; see getpwent above for 
  * details.
  *
  * Example:
@@ -201,7 +209,8 @@ passwd_iterate(void)
  *
  */
 static VALUE
-etc_passwd(VALUE obj)
+etc_passwd(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
@@ -225,7 +234,8 @@ etc_passwd(VALUE obj)
  * to getpwent will return the first entry again.
  */
 static VALUE
-etc_setpwent(VALUE obj)
+etc_setpwent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETPWENT
     setpwent();
@@ -237,7 +247,8 @@ etc_setpwent(VALUE obj)
  * getpwent, and closes the file.
  */
 static VALUE
-etc_endpwent(VALUE obj)
+etc_endpwent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETPWENT
     endpwent();
@@ -272,7 +283,8 @@ etc_endpwent(VALUE obj)
  * - Passwd#shell contains the path to the login shell of the user as a String.
  */
 static VALUE
-etc_getpwent(VALUE obj)
+etc_getpwent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
@@ -286,7 +298,8 @@ etc_getpwent(VALUE obj)
 
 #ifdef HAVE_GETGRENT
 static VALUE
-setup_group(struct group *grp)
+setup_group(grp)
+    struct group *grp;
 {
     VALUE mem;
     char **tbl;
@@ -302,7 +315,7 @@ setup_group(struct group *grp)
 #ifdef HAVE_ST_GR_PASSWD
 			 safe_setup_str(grp->gr_passwd),
 #endif
-			 GIDT2NUM(grp->gr_gid),
+			 PW_GID2VAL(grp->gr_gid),
 			 mem);
 }
 #endif
@@ -318,20 +331,15 @@ setup_group(struct group *grp)
  *
  */
 static VALUE
-etc_getgrgid(int argc, VALUE *argv, VALUE obj)
+etc_getgrgid(obj, id)
+    VALUE obj, id;
 {
 #ifdef HAVE_GETGRENT
-    VALUE id;
     gid_t gid;
     struct group *grp;
 
     rb_secure(4);
-    if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	gid = NUM2GIDT(id);
-    }
-    else {
-	gid = getgid();
-    }
+    gid = PW_VAL2GID(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
     return setup_group(grp);
@@ -351,15 +359,16 @@ etc_getgrgid(int argc, VALUE *argv, VALUE obj)
  *
  */
 static VALUE
-etc_getgrnam(VALUE obj, VALUE nam)
+etc_getgrnam(obj, nam)
+    VALUE obj, nam;
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
 
     rb_secure(4);
     SafeStringValue(nam);
-    grp = getgrnam(RSTRING_PTR(nam));
-    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING_PTR(nam));
+    grp = getgrnam(RSTRING(nam)->ptr);
+    if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
     return setup_group(grp);
 #else
     return Qnil;
@@ -369,14 +378,14 @@ etc_getgrnam(VALUE obj, VALUE nam)
 #ifdef HAVE_GETGRENT
 static int group_blocking = 0;
 static VALUE
-group_ensure(void)
+group_ensure()
 {
     group_blocking = Qfalse;
     return Qnil;
 }
 
 static VALUE
-group_iterate(void)
+group_iterate()
 {
     struct group *pw;
 
@@ -392,7 +401,7 @@ group_iterate(void)
 /* Provides a convenient Ruby iterator which executes a block for each entry 
  * in the /etc/group file.
  *
- * The code block is passed an Struct::Group struct; see getgrent above for 
+ * The code block is passed an Etc::Group struct; see getgrent above for 
  * details.
  *
  * Example:
@@ -405,7 +414,8 @@ group_iterate(void)
  *
  */
 static VALUE
-etc_group(VALUE obj)
+etc_group(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETGRENT
     struct group *grp;
@@ -429,7 +439,8 @@ etc_group(VALUE obj)
  * to getgrent will return the first entry again.
  */
 static VALUE
-etc_setgrent(VALUE obj)
+etc_setgrent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETGRENT
     setgrent();
@@ -441,7 +452,8 @@ etc_setgrent(VALUE obj)
  * getgrent, and closes the file.
  */
 static VALUE
-etc_endgrent(VALUE obj)
+etc_endgrent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETGRENT
     endgrent();
@@ -470,7 +482,8 @@ etc_endgrent(VALUE obj)
  *   members of the group.
  */
 static VALUE
-etc_getgrent(VALUE obj)
+etc_getgrent(obj)
+    VALUE obj;
 {
 #ifdef HAVE_GETGRENT
     struct group *gr;
@@ -482,17 +495,18 @@ etc_getgrent(VALUE obj)
     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(void)
+Init_etc()
 {
-    VALUE mEtc;
-
     mEtc = rb_define_module("Etc");
+
     rb_define_module_function(mEtc, "getlogin", etc_getlogin, 0);
 
     rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
@@ -502,13 +516,14 @@ Init_etc(void)
     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, "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
@@ -534,15 +549,13 @@ Init_etc(void)
 				"expire",
 #endif
 				NULL);
-    rb_define_const(mEtc, "Passwd", sPasswd);
 
 #ifdef HAVE_GETGRENT
+    rb_global_variable(&sGroup);
     sGroup = rb_struct_define("Group", "name",
 #ifdef HAVE_ST_GR_PASSWD
 			      "passwd",
 #endif
 			      "gid", "mem", NULL);
-
-    rb_define_const(mEtc, "Group", sGroup);
 #endif
 }
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 2914bfb196..dbd0672545 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -24,5 +24,20 @@ if  a or b or c
   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 52f10defea..64746552c1 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -24,18 +24,17 @@ alias $0 $progname
 $extlist = []
 $compiled = {}
 
-srcdir = File.dirname(File.dirname(__FILE__))
-unless defined?(CROSS_COMPILING) and CROSS_COMPILING
-  $:.replace([File.expand_path("lib", srcdir), Dir.pwd])
-end
-$:.unshift(srcdir)
+$:.replace([Dir.pwd])
 require 'rbconfig'
 
+srcdir = File.dirname(File.dirname(__FILE__))
+
+$:.unshift(srcdir, File.expand_path("lib", srcdir))
+
 $topdir = "."
 $top_srcdir = srcdir
 
-$" << "mkmf.rb"
-load File.expand_path("lib/mkmf.rb", srcdir)
+require 'mkmf'
 require 'optparse/shellwords'
 
 def sysquote(x)
@@ -43,6 +42,15 @@ def sysquote(x)
   @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])
@@ -61,7 +69,7 @@ def extract_makefile(makefile, keep = true)
       unless installrb.empty?
         config = CONFIG.dup
         install_dirs(target_prefix).each {|var, val| config[var] = val}
-        FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
+        FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
       end
     end
     return false
@@ -87,6 +95,15 @@ end
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
+  if $force_static or $static_ext[target]
+    $static = target
+  else
+    $static = false
+  end
+
+  unless $ignore
+    return true if $nodynamic and not $static
+  end
 
   FileUtils.mkpath target unless File.directory?(target)
   begin
@@ -110,7 +127,7 @@ def extmake(target)
     makefile = "./Makefile"
     ok = File.exist?(makefile)
     unless $ignore
-      rbconfig0 = RbConfig::CONFIG
+      rbconfig0 = Config::CONFIG
       mkconfig0 = CONFIG
       rbconfig = {
 	"hdrdir" => $hdrdir,
@@ -118,13 +135,13 @@ def extmake(target)
 	"topdir" => $topdir,
       }
       mkconfig = {
-	"hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
+	"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}
-      RbConfig.module_eval {
+      Config.module_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, rbconfig)
 	remove_const(:MAKEFILE_CONFIG)
@@ -166,7 +183,7 @@ def extmake(target)
     ok = yield(ok) if block_given?
     unless ok
       open(makefile, "w") do |f|
-	f.print(*dummy_makefile(CONFIG["srcdir"]))
+	f.print dummy_makefile(CONFIG["srcdir"])
       end
       return true
     end
@@ -187,6 +204,7 @@ def extmake(target)
       if $clean != true
 	FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
       end
+      File.unlink(makefile) rescue nil
     end
     if $static
       $extflags ||= ""
@@ -200,7 +218,7 @@ def extmake(target)
     end
   ensure
     unless $ignore
-      RbConfig.module_eval {
+      Config.module_eval {
 	remove_const(:CONFIG)
 	const_set(:CONFIG, rbconfig0)
 	remove_const(:MAKEFILE_CONFIG)
@@ -232,6 +250,7 @@ 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|
@@ -270,7 +289,7 @@ def parse_args()
   rescue OptionParser::InvalidOption => e
     retry if /^--/ =~ e.args[0]
     $optparser.warn(e)
-    abort $optparser.to_s
+    abort opts.to_s
   end
 
   $destdir ||= ''
@@ -296,7 +315,7 @@ def parse_args()
   $continue = $mflags.set?(?k)
   if $extout
     $extout = '$(topdir)/'+$extout
-    RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
+    Config::CONFIG["extout"] = CONFIG["extout"] = $extout
     $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
     $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
   end
@@ -329,7 +348,7 @@ end
 
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
-  $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
+  $ruby = CONFIG['MINIRUBY']
 elsif sep = config_string('BUILD_FILE_SEPARATOR')
   $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
 else
@@ -341,9 +360,9 @@ unless CROSS_COMPILING
   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
   $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
   ENV["RUBYLIB"] = "-"
-  ENV["RUBYOPT"] = "-r#{File.expand_path('ext/purelib.rb', $top_srcdir)}"
+  ENV["RUBYOPT"] = "-rpurelib.rb"
 end
-$config_h = '$(arch_hdrdir)/ruby/config.h'
+$config_h = '$(topdir)/config.h'
 $mflags << "ruby=#$ruby"
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
@@ -351,8 +370,7 @@ MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtim
 # get static-link modules
 $static_ext = {}
 if $extstatic
-  $extstatic.each do |t|
-    target = t
+  $extstatic.each do |target|
     target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
     $static_ext[target] = $static_ext.size
   end
@@ -389,22 +407,16 @@ 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 {|o|arg_config(w+o)}).any?
-      nil
+    if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
+      proc {false}
     elsif (w = w.grep(String)).empty?
       proc {true}
     else
-      proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
+      proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
     end
   }
-  if withes
-    withouts ||= proc {true}
-  else
-    withes = proc {false}
-    withouts ||= withes
-  end
-  cond = proc {|ext, *|
-    cond1 = proc {|n| File.fnmatch(n, ext)}
+  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|
@@ -417,7 +429,7 @@ else
 end
 
 if $extout
-  extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
+  extout = Config.expand("#{$extout}", Config::CONFIG.merge("topdir"=>$topdir))
   unless $ignore
     FileUtils.mkpath(extout)
   end
@@ -428,13 +440,9 @@ FileUtils::makedirs('ext')
 Dir::chdir('ext')
 
 hdrdir = $hdrdir
-$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
+$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
 exts.each do |d|
-  $static = $force_static ? $static_ext[target] : false
-
-  if $ignore or !$nodynamic or $static
-    extmake(d) or abort
-  end
+  extmake(d) or abort
 end
 $top_srcdir = srcdir
 $topdir = "."
@@ -493,17 +501,14 @@ unless $extlist.empty?
   src = %{\
 #include "ruby.h"
 
-#define init(func, name) {	\\
-    extern void func _((void));	\\
-    ruby_init_ext(name, func);	\\
-}
+#define init(func, name) {void func _((void)); ruby_init_ext(name, func);}
 
 void ruby_init_ext _((const char *name, void (*init)(void)));
 
 void Init_ext _((void))\n{\n#$extinit}
 }
   if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
-    open(extinit.c, "w") {|fe| fe.print src}
+    open(extinit.c, "w") {|f| f.print src}
   end
 
   $extobjs = "ext/#{extinit.o} #{$extobjs}"
@@ -520,15 +525,15 @@ void Init_ext _((void))\n{\n#$extinit}
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
   }.compact
-  puts(*conf)
+  puts conf
   $stdout.flush
   $mflags.concat(conf)
 else
   FileUtils.rm_f(extinit.to_a)
 end
 rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|n|
-  r = n
+%w[RUBY RUBYW STATIC_RUBY].each {|r|
+  n = r
   if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
     rubies << Config.expand(r+=EXEEXT)
     $mflags << "#{n}=#{r}"
@@ -555,8 +560,6 @@ if $nmake == ?b
     vars.each {|flag| flag.sub!(/\A/, "-D")}
   end
 end
-$mflags.unshift("topdir=#$topdir")
-ENV.delete("RUBYOPT")
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/fcntl/.cvsignore
+++ b/ext/fcntl/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/fiber/extconf.rb b/ext/fiber/extconf.rb
deleted file mode 100644
index 904ab94a9c..0000000000
--- a/ext/fiber/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('fiber')
-
diff --git a/ext/fiber/fiber.c b/ext/fiber/fiber.c
deleted file mode 100644
index 7c33a1f231..0000000000
--- a/ext/fiber/fiber.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-void Init_Fiber_as_Coroutine(void);
-
-void
-Init_fiber(void)
-{
-    Init_Fiber_as_Coroutine();
-}
diff --git a/ext/gdbm/.cvsignore b/ext/gdbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/gdbm/.cvsignore
+++ b/ext/gdbm/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index e6a6e0d039..82109fda90 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -3,6 +3,7 @@
   gdbm.c -
 
   $Author$
+  $Date$
   modified at: Mon Jan 24 15:59:52 JST 1994
 
   Documentation by Peter Adolphs < futzilogik at users dot sourceforge dot net >
@@ -78,7 +79,8 @@ static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
 #define MY_BLOCK_SIZE (2048)
 #define MY_FATAL_FUNC rb_gdbm_fatal
 static void
-rb_gdbm_fatal(char *msg)
+rb_gdbm_fatal(msg)
+    char *msg;
 {
     rb_raise(rb_eGDBMFatalError, "%s", msg);
 }
@@ -89,7 +91,7 @@ struct dbmdata {
 };
 
 static void
-closed_dbm(void)
+closed_dbm()
 {
     rb_raise(rb_eRuntimeError, "closed GDBM file");
 }
@@ -106,11 +108,12 @@ closed_dbm(void)
 }
 
 static void
-free_dbm(struct dbmdata *dbmp)
+free_dbm(dbmp)
+    struct dbmdata *dbmp;
 {
     if (dbmp) {
         if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
-        xfree(dbmp);
+        free(dbmp);
     }
 }
 
@@ -121,7 +124,8 @@ free_dbm(struct dbmdata *dbmp)
  * Closes the associated database file.
  */
 static VALUE
-fgdbm_close(VALUE obj)
+fgdbm_close(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -139,7 +143,8 @@ fgdbm_close(VALUE obj)
  * Returns true if the associated database file has been closed.
  */
 static VALUE
-fgdbm_closed(VALUE obj)
+fgdbm_closed(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -152,8 +157,11 @@ fgdbm_closed(VALUE obj)
     return Qfalse;
 }
 
+static VALUE fgdbm_s_alloc _((VALUE));
+
 static VALUE
-fgdbm_s_alloc(VALUE klass)
+fgdbm_s_alloc(klass)
+    VALUE klass;
 {
     return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
@@ -182,7 +190,10 @@ fgdbm_s_alloc(VALUE klass)
  * database file as a reader (cf. flag <tt>READER</tt>).
  */
 static VALUE
-fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fgdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE file, vmode, vflags;
     GDBM_FILE dbm;
@@ -206,31 +217,31 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
 
     if (flags & RUBY_GDBM_RW_BIT) {
         flags &= ~RUBY_GDBM_RW_BIT;
-        dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE, 
-                        flags, mode, MY_FATAL_FUNC);
+	dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
+			flags, mode, MY_FATAL_FUNC);
     }
     else {
         dbm = 0;
         if (mode >= 0)
-            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
                             GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
         if (!dbm)
-            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
                             GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
         if (!dbm)
-            dbm = gdbm_open(RSTRING_PTR(file), MY_BLOCK_SIZE, 
+            dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE, 
                             GDBM_READER|flags, 0, MY_FATAL_FUNC);
     }
 
     if (!dbm) {
-        if (mode == -1) return Qnil;
-
-        if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
-            gdbm_errno == GDBM_CANT_BE_READER ||
-            gdbm_errno == GDBM_CANT_BE_WRITER)
-            rb_sys_fail(RSTRING_PTR(file));
-        else
-            rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+	if (mode == -1) return Qnil;
+
+	if (gdbm_errno == GDBM_FILE_OPEN_ERROR ||
+	    gdbm_errno == GDBM_CANT_BE_READER ||
+	    gdbm_errno == GDBM_CANT_BE_WRITER)
+	    rb_sys_fail(RSTRING(file)->ptr);
+	else
+	    rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -262,12 +273,15 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
  *   end
  */
 static VALUE
-fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fgdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
     if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
-        return Qnil;
+	return Qnil;
     }
 
     if (rb_block_given_p()) {
@@ -278,7 +292,9 @@ fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 static VALUE
-rb_gdbm_fetch(GDBM_FILE dbm, datum key)
+rb_gdbm_fetch(dbm, key)
+    GDBM_FILE dbm;
+    datum key;
 {
     datum val;
     VALUE str;
@@ -287,26 +303,33 @@ rb_gdbm_fetch(GDBM_FILE dbm, datum key)
     if (val.dptr == 0)
         return Qnil;
 
-    str = rb_str_new(val.dptr, val.dsize);
-    free(val.dptr);
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = val.dsize;
+    RSTRING(str)->aux.capa = val.dsize;
+    RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
+    RSTRING(str)->ptr[val.dsize] = '\0';
+
     OBJ_TAINT(str);
     return (VALUE)str;
 }
 
 static VALUE
-rb_gdbm_fetch2(GDBM_FILE dbm, VALUE keystr)
+rb_gdbm_fetch2(dbm, keystr)
+    GDBM_FILE dbm;
+    VALUE keystr;
 {
     datum key;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     return rb_gdbm_fetch(dbm, key);
 }
 
 static VALUE
-rb_gdbm_fetch3(VALUE obj, VALUE keystr)
+rb_gdbm_fetch3(obj, keystr)
+    VALUE obj, keystr;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -316,7 +339,8 @@ rb_gdbm_fetch3(VALUE obj, VALUE keystr)
 }
 
 static VALUE
-rb_gdbm_firstkey(GDBM_FILE dbm)
+rb_gdbm_firstkey(dbm)
+    GDBM_FILE dbm;
 {
     datum key;
     VALUE str;
@@ -325,39 +349,51 @@ rb_gdbm_firstkey(GDBM_FILE dbm)
     if (key.dptr == 0)
         return Qnil;
 
-    str = rb_str_new(key.dptr, key.dsize);
-    free(key.dptr);
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = key.dsize;
+    RSTRING(str)->aux.capa = key.dsize;
+    RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
+    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
     OBJ_TAINT(str);
     return str;
 }
 
 static VALUE
-rb_gdbm_nextkey(GDBM_FILE dbm, VALUE keystr)
+rb_gdbm_nextkey(dbm, keystr)
+    GDBM_FILE dbm;
+    VALUE keystr;
 {
     datum key, key2;
     VALUE str;
 
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
     key2 = gdbm_nextkey(dbm, key);
     if (key2.dptr == 0)
         return Qnil;
 
-    str = rb_str_new(key2.dptr, key2.dsize);
+    str = rb_obj_alloc(rb_cString);
+    RSTRING(str)->len = key2.dsize;
+    RSTRING(str)->aux.capa = key2.dsize;
+    RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
+    RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+
     OBJ_TAINT(str);
     return str;
 }
 
 static VALUE
-fgdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fgdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
 {
     VALUE valstr;
 
     valstr = rb_gdbm_fetch3(obj, keystr);
     if (NIL_P(valstr)) {
-        if (ifnone == Qnil && rb_block_given_p())
-            return rb_yield(keystr);
-        return ifnone;
+	if (ifnone == Qnil && rb_block_given_p())
+	    return rb_yield(keystr);
+	return ifnone;
     }
     return valstr;
 }
@@ -369,7 +405,8 @@ fgdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
  * Retrieves the _value_ corresponding to _key_.
  */
 static VALUE
-fgdbm_aref(VALUE obj, VALUE keystr)
+fgdbm_aref(obj, keystr)
+    VALUE obj, keystr;
 {
     return rb_gdbm_fetch3(obj, keystr);
 }
@@ -382,7 +419,10 @@ fgdbm_aref(VALUE obj, VALUE keystr)
  * associated with _key_, _default_ will be returned instead.
  */
 static VALUE
-fgdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fgdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE keystr, valstr, ifnone;
 
@@ -402,7 +442,8 @@ fgdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
  * same value, the key that is found first will be returned.
  */
 static VALUE
-fgdbm_index(VALUE obj, VALUE valstr)
+fgdbm_index(obj, valstr)
+    VALUE obj, valstr;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -413,17 +454,34 @@ fgdbm_index(VALUE obj, VALUE valstr)
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
-        valstr2 = rb_gdbm_fetch2(dbm, keystr);
+	valstr2 = rb_gdbm_fetch2(dbm, keystr);
         if (!NIL_P(valstr2) &&
-            RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
-            memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
-                   RSTRING_LEN(valstr)) == 0) {
-            return keystr;
+            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+                   RSTRING(valstr)->len) == 0) {
+	    return keystr;
         }
     }
     return Qnil;
 }
 
+static VALUE
+fgdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new;
+    int i;
+
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+    }
+
+    return new;
+}
+
 /*
  * call-seq:
  *      gdbm.select { |value| block } -> array
@@ -432,23 +490,40 @@ fgdbm_index(VALUE obj, VALUE valstr)
  * evaluates to true.
  */
 static VALUE
-fgdbm_select(VALUE obj)
+fgdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
-    VALUE new = rb_ary_new();
-    GDBM_FILE dbm;
-    struct dbmdata *dbmp;
-    VALUE keystr;
+    VALUE new = rb_ary_new2(argc);
+    int i;
 
-    GetDBM2(obj, dbmp, 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 (rb_block_given_p()) {
+        GDBM_FILE dbm;
+        struct dbmdata *dbmp;
+        VALUE keystr;
 
-        if (RTEST(v)) {
-            rb_ary_push(new, assoc);
-        }
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
+	}
         GetDBM2(obj, dbmp, 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);
+        }
+    }
+    else {
+	rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+        }
     }
 
     return new;
@@ -461,7 +536,10 @@ fgdbm_select(VALUE obj)
  * Returns an array of the values associated with each specified _key_.
  */
 static VALUE
-fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fgdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -474,14 +552,16 @@ fgdbm_values_at(int argc, VALUE *argv, VALUE obj)
 }
 
 static void
-rb_gdbm_modify(VALUE obj)
+rb_gdbm_modify(obj)
+    VALUE obj;
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
 }
 
 static VALUE
-rb_gdbm_delete(VALUE obj, VALUE keystr)
+rb_gdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -489,8 +569,8 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
 
     rb_gdbm_modify(obj);
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     if (!gdbm_exists(dbm, key)) {
@@ -515,7 +595,8 @@ rb_gdbm_delete(VALUE obj, VALUE keystr)
  * returns the corresponding _value_. Returns nil if the database is empty.
  */
 static VALUE
-fgdbm_delete(VALUE obj, VALUE keystr)
+fgdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
     VALUE valstr;
 
@@ -532,7 +613,8 @@ fgdbm_delete(VALUE obj, VALUE keystr)
  * two-item array [ _key_, _value_ ]. Returns nil if the database is empty.
  */
 static VALUE
-fgdbm_shift(VALUE obj)
+fgdbm_shift(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -556,7 +638,8 @@ fgdbm_shift(VALUE obj)
  * Deletes every key-value pair from _gdbm_ for which _block_ evaluates to true.
  */
 static VALUE
-fgdbm_delete_if(VALUE obj)
+fgdbm_delete_if(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -579,10 +662,10 @@ fgdbm_delete_if(VALUE obj)
         GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY_LEN(ary); i++)
-        rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
+    for (i = 0; i < RARRAY(ary)->len; i++)
+        rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
 
     return obj;
 }
@@ -594,7 +677,8 @@ fgdbm_delete_if(VALUE obj)
  * Removes all the key-value pairs within _gdbm_.
  */
 static VALUE
-fgdbm_clear(VALUE obj)
+fgdbm_clear(obj)
+    VALUE obj;
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -638,7 +722,8 @@ fgdbm_clear(VALUE obj)
  * as values.
  */
 static VALUE
-fgdbm_invert(VALUE obj)
+fgdbm_invert(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -648,55 +733,33 @@ fgdbm_invert(VALUE obj)
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
-        valstr = rb_gdbm_fetch2(dbm, keystr);
+	valstr = rb_gdbm_fetch2(dbm, keystr);
 
-        rb_hash_aset(hash, valstr, keystr);
+	rb_hash_aset(hash, valstr, keystr);
     }
     return hash;
 }
 
-/*
- * call-seq:
- *      gdbm[key]= value -> value
- *      gdbm.store(key, value) -> value
- *
- * Associates the value _value_ with the specified _key_.
- */
+static VALUE each_pair _((VALUE));
+
 static VALUE
-fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+each_pair(obj)
+    VALUE obj;
 {
-    datum key, val;
-    struct dbmdata *dbmp;
-    GDBM_FILE dbm;
-
-    rb_gdbm_modify(obj);
-    StringValue(keystr);
-    StringValue(valstr);
-
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
-
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
-
-    GetDBM2(obj, dbmp, dbm);
-    dbmp->di_size = -1;
-    if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
-        if (errno == EPERM) rb_sys_fail(0);
-        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
-    }
-
-    return valstr;
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
 }
 
+static VALUE fgdbm_store _((VALUE,VALUE,VALUE));
+
 static VALUE
-update_i(VALUE pair, VALUE dbm)
+update_i(pair, dbm)
+    VALUE pair, dbm;
 {
     Check_Type(pair, T_ARRAY);
-    if (RARRAY_LEN(pair) < 2) {
-        rb_raise(rb_eArgError, "pair must be [key, value]");
+    if (RARRAY(pair)->len < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
+    fgdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
     return Qnil;
 }
 
@@ -709,9 +772,10 @@ update_i(VALUE pair, VALUE dbm)
  * method.
  */
 static VALUE
-fgdbm_update(VALUE obj, VALUE other)
+fgdbm_update(obj, other)
+    VALUE obj, other;
 {
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    rb_iterate(each_pair, other, update_i, obj);
     return obj;
 }
 
@@ -723,22 +787,59 @@ fgdbm_update(VALUE obj, VALUE other)
  * _other_ must have an each_pair method.
  */
 static VALUE
-fgdbm_replace(VALUE obj, VALUE other)
+fgdbm_replace(obj, other)
+    VALUE obj, other;
 {
     fgdbm_clear(obj);
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
+    rb_iterate(each_pair, other, update_i, obj);
     return obj;
 }
 
 /*
  * call-seq:
+ *      gdbm[key]= value -> value
+ *      gdbm.store(key, value) -> value
+ *
+ * Associates the value _value_ with the specified _key_.
+ */
+static VALUE
+fgdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
+{
+    datum key, val;
+    struct dbmdata *dbmp;
+    GDBM_FILE dbm;
+
+    rb_gdbm_modify(obj);
+    StringValue(keystr);
+    StringValue(valstr);
+
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
+
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
+
+    GetDBM2(obj, dbmp, dbm);
+    dbmp->di_size = -1;
+    if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
+        if (errno == EPERM) rb_sys_fail(0);
+        rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+    }
+
+    return valstr;
+}
+
+/*
+ * call-seq:
  *      gdbm.length -> fixnum
  *      gdbm.size -> fixnum
  *
  * Returns the number of key-value pairs in this database.
  */
 static VALUE
-fgdbm_length(VALUE obj)
+fgdbm_length(obj)
+    VALUE obj;
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -751,7 +852,7 @@ fgdbm_length(VALUE obj)
     for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
         nextkey = gdbm_nextkey(dbm, key);
         free(key.dptr);
-        i++;
+	i++;
     }
     dbmp->di_size = i;
 
@@ -765,7 +866,8 @@ fgdbm_length(VALUE obj)
  * Returns true if the database is empty.
  */
 static VALUE
-fgdbm_empty_p(VALUE obj)
+fgdbm_empty_p(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -773,13 +875,13 @@ fgdbm_empty_p(VALUE obj)
 
     GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
-        dbm = dbmp->di_dbm;
+	dbm = dbmp->di_dbm;
 
-        key = gdbm_firstkey(dbm);
+	key = gdbm_firstkey(dbm);
         if (key.dptr) {
             free(key.dptr);
             return Qfalse;
-        }
+	}
         return Qtrue;
     }
 
@@ -795,20 +897,19 @@ fgdbm_empty_p(VALUE obj)
  * _value_ as a parameter.
  */
 static VALUE
-fgdbm_each_value(VALUE obj)
+fgdbm_each_value(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, 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);
+	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -821,20 +922,19 @@ fgdbm_each_value(VALUE obj)
  * _key_ as a parameter.
  */
 static VALUE
-fgdbm_each_key(VALUE obj)
+fgdbm_each_key(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
     VALUE keystr;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(keystr);
-        GetDBM2(obj, dbmp, dbm);
+	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -847,14 +947,13 @@ fgdbm_each_key(VALUE obj)
  * correspoding _value_ as a parameter.
  */
 static VALUE
-fgdbm_each_pair(VALUE obj)
+fgdbm_each_pair(obj)
+    VALUE obj;
 {
     GDBM_FILE dbm;
     struct dbmdata *dbmp;
     VALUE keystr;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -873,7 +972,8 @@ fgdbm_each_pair(VALUE obj)
  * Returns an array of all keys of this database.
  */
 static VALUE
-fgdbm_keys(VALUE obj)
+fgdbm_keys(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -897,7 +997,8 @@ fgdbm_keys(VALUE obj)
  * Returns an array of all values of this database.
  */
 static VALUE
-fgdbm_values(VALUE obj)
+fgdbm_values(obj)
+    VALUE obj;
 {
     datum key, nextkey;
     struct dbmdata *dbmp;
@@ -925,15 +1026,16 @@ fgdbm_values(VALUE obj)
  * Returns false otherwise.
  */
 static VALUE
-fgdbm_has_key(VALUE obj, VALUE keystr)
+fgdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key;
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     if (gdbm_exists(dbm, key))
@@ -950,7 +1052,8 @@ fgdbm_has_key(VALUE obj, VALUE keystr)
  * Returns false otherwise.
  */
 static VALUE
-fgdbm_has_value(VALUE obj, VALUE valstr)
+fgdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -961,13 +1064,13 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
-        valstr2 = rb_gdbm_fetch2(dbm, keystr);
+	valstr2 = rb_gdbm_fetch2(dbm, keystr);
 
         if (!NIL_P(valstr2) &&
-            RSTRING_LEN(valstr) == RSTRING_LEN(valstr2) &&
-            memcmp(RSTRING_PTR(valstr), RSTRING_PTR(valstr2),
-                   RSTRING_LEN(valstr)) == 0) {
-            return Qtrue;
+            RSTRING(valstr)->len == RSTRING(valstr2)->len &&
+            memcmp(RSTRING(valstr)->ptr, RSTRING(valstr2)->ptr,
+                   RSTRING(valstr)->len) == 0) {
+	    return Qtrue;
         }
     }
     return Qfalse;
@@ -980,7 +1083,8 @@ fgdbm_has_value(VALUE obj, VALUE valstr)
  * Returns an array of all key-value pairs contained in the database.
  */
 static VALUE
-fgdbm_to_a(VALUE obj)
+fgdbm_to_a(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1006,7 +1110,8 @@ fgdbm_to_a(VALUE obj)
  * deletions in the database.
  */
 static VALUE
-fgdbm_reorganize(VALUE obj)
+fgdbm_reorganize(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1028,7 +1133,8 @@ fgdbm_reorganize(VALUE obj)
  * to the disk have been finished.
  */
 static VALUE
-fgdbm_sync(VALUE obj)
+fgdbm_sync(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1046,7 +1152,8 @@ fgdbm_sync(VALUE obj)
  * Sets the size of the internal bucket cache to _size_.
  */
 static VALUE
-fgdbm_set_cachesize(VALUE obj, VALUE val)
+fgdbm_set_cachesize(obj, val)
+    VALUE obj, val;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1071,7 +1178,8 @@ fgdbm_set_cachesize(VALUE obj, VALUE val)
  * default. See also: #syncmode=
  */
 static VALUE
-fgdbm_set_fastmode(VALUE obj, VALUE val)
+fgdbm_set_fastmode(obj, val)
+    VALUE obj, val;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1102,7 +1210,8 @@ fgdbm_set_fastmode(VALUE obj, VALUE val)
  * by default. See also: #fastmode=
  */
 static VALUE
-fgdbm_set_syncmode(VALUE obj, VALUE val)
+fgdbm_set_syncmode(obj, val)
+    VALUE obj, val;
 {
 #if !defined(GDBM_SYNCMODE)
     fgdbm_set_fastmode(obj, RTEST(val) ? Qfalse : Qtrue);
@@ -1131,7 +1240,8 @@ fgdbm_set_syncmode(VALUE obj, VALUE val)
  * Returns a hash of all key-value pairs contained in the database.
  */
 static VALUE
-fgdbm_to_hash(VALUE obj)
+fgdbm_to_hash(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
@@ -1156,13 +1266,14 @@ fgdbm_to_hash(VALUE obj)
  * which _block_ evaluates to true are removed. See also: #delete_if
  */
 static VALUE
-fgdbm_reject(VALUE obj)
+fgdbm_reject(obj)
+    VALUE obj;
 {
     return rb_hash_delete_if(fgdbm_to_hash(obj));
 }
 
 void
-Init_gdbm(void)
+Init_gdbm()
 {
     rb_cGDBM = rb_define_class("GDBM", rb_cObject);
     rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
@@ -1180,7 +1291,9 @@ Init_gdbm(void)
     rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
     rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
     rb_define_method(rb_cGDBM, "index",  fgdbm_index, 1);
-    rb_define_method(rb_cGDBM, "select",  fgdbm_select, 0);
+    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);
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
index 66c8f5297a..394787fced 100644
--- a/ext/iconv/.cvsignore
+++ b/ext/iconv/.cvsignore
@@ -3,4 +3,3 @@ mkmf.log
 *.def
 iconv.rb
 config.charset
-extconf.h
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index d4ed9139c8..aed4644290 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -6,8 +6,8 @@ require 'optparse'
 # http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
 # Fri, 30 May 2003 00:09:00 GMT'
 
-OS = RbConfig::CONFIG["target_os"]
-SHELL = RbConfig::CONFIG['SHELL']
+OS = Config::CONFIG["target_os"]
+SHELL = Config::CONFIG['SHELL']
 
 class Hash::Ordered < Hash
   def [](key)
diff --git a/ext/iconv/depend b/ext/iconv/depend
index ac555596ce..688ddd97b7 100644
--- a/ext/iconv/depend
+++ b/ext/iconv/depend
@@ -1,2 +1,2 @@
 iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
-  $(hdrdir)/st.h $(hdrdir)/intern.h $(hdrdir)/encoding.h
+  $(hdrdir)/intern.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index 9632bf4db9..a9d0cfb5e6 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -23,8 +23,6 @@ if have_func("iconv", "iconv.h") or
     end
     $defs.push('-DICONV_INPTR_CONST')
   end
-  have_func("iconvlist", "iconv.h")
-  have_func("__iconv_free_list", "iconv.h")
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 6141a5bb4d..d989b97df2 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -4,6 +4,7 @@
   iconv.c -
 
   $Author$
+  $Date$
   created at: Wed Dec  1 20:28:09 JST 1999
 
   All the files in this distribution are covered under the Ruby's
@@ -13,13 +14,12 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include <errno.h>
 #include <iconv.h>
 #include <assert.h>
-#include "ruby/st.h"
-#include "ruby/intern.h"
-#include "ruby/encoding.h"
+#include "st.h"
+#include "intern.h"
 
 /*
  * Document-class: Iconv
@@ -80,18 +80,9 @@ struct iconv_env_t
     int argc;
     VALUE *argv;
     VALUE ret;
-    int toidx;
     VALUE (*append)_((VALUE, VALUE));
 };
 
-struct rb_iconv_opt_t
-{
-    VALUE transliterate;
-    VALUE discard_ilseq;
-};
-
-static ID id_transliterate, id_discard_ilseq;
-
 static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
 static VALUE rb_eIconvIllegalSeq;
@@ -105,22 +96,20 @@ static VALUE iconv_failure_initialize _((VALUE error, VALUE mesg, VALUE success,
 static VALUE iconv_failure_success _((VALUE self));
 static VALUE iconv_failure_failed _((VALUE self));
 
-static iconv_t iconv_create _((VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx));
+static iconv_t iconv_create _((VALUE to, VALUE from));
 static void iconv_dfree _((void *cd));
 static VALUE iconv_free _((VALUE cd));
 static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
 static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, int toidx,
-			      struct iconv_env_t* env));
+static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env));
 static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self));
+static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
+static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
 static VALUE iconv_s_convert _((struct iconv_env_t* env));
 static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
 static VALUE iconv_init_state _((VALUE cd));
 static VALUE iconv_finish _((VALUE self));
 static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_conv _((int argc, VALUE *argv, VALUE self));
 
 static VALUE charset_map;
 
@@ -130,21 +119,26 @@ static VALUE charset_map;
  *
  * Returns the map from canonical name to system dependent name.
  */
-static VALUE
-charset_map_get(void)
+static VALUE charset_map_get _((void))
 {
     return charset_map;
 }
 
 static char *
-map_charset(VALUE *code)
+map_charset
+#ifdef HAVE_PROTOTYPES
+    (VALUE *code)
+#else /* HAVE_PROTOTYPES */
+    (code)
+    VALUE *code;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE val = *code;
 
-    if (RHASH_SIZE(charset_map)) {
+    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_TBL(charset_map), key, &val)) {
+	if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
 	    *code = val;
 	}
     }
@@ -152,21 +146,20 @@ map_charset(VALUE *code)
 }
 
 static iconv_t
-iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
+iconv_create
+#ifdef HAVE_PROTOTYPES
+    (VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (to, from)
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
 {
     const char* tocode = map_charset(&to);
     const char* fromcode = map_charset(&from);
-    iconv_t cd;
 
-    if ((*idx = rb_enc_find_index(tocode)) < 0) {
-	const char *slash = strchr(tocode, '/');
-	if (slash && slash[1] == '/') {
-	    VALUE tmp = rb_str_new(tocode, slash - tocode);
-	    *idx = rb_enc_find_index(RSTRING_PTR(tmp));
-	}
-    }
+    iconv_t cd = iconv_open(tocode, fromcode);
 
-    cd = iconv_open(tocode, fromcode);
     if (cd == (iconv_t)-1) {
 	switch (errno) {
 	  case EMFILE:
@@ -178,41 +171,30 @@ iconv_create(VALUE to, VALUE from, struct rb_iconv_opt_t *opt, int *idx)
 	if (cd == (iconv_t)-1) {
 	    int inval = errno == EINVAL;
 	    const char *s = inval ? "invalid encoding " : "iconv";
-	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING_LEN(to) +
-					    RSTRING_LEN(from) + 8);
+	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
+					    RSTRING(from)->len + 8);
 
-	    sprintf(RSTRING_PTR(msg), "%s(\"%s\", \"%s\")",
-		    s, RSTRING_PTR(to), RSTRING_PTR(from));
-	    s = RSTRING_PTR(msg);
-	    rb_str_set_len(msg, strlen(s));
+	    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);
 	}
     }
 
-    if (opt) {
-#ifdef ICONV_SET_TRANSLITERATE
-	if (opt->transliterate != Qundef) {
-	    int flag = RTEST(opt->transliterate);
-	    if (iconvctl(cd, ICONV_SET_TRANSLITERATE, (void *)&flag))
-		rb_sys_fail("ICONV_SET_TRANSLITERATE");
-	}
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
-	if (opt->discard_ilseq != Qundef) {
-	    int flag = RTEST(opt->discard_ilseq);
-	    if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&flag))
-		rb_sys_fail("ICONV_SET_DISCARD_ILSEQ");
-	}
-#endif
-    }
-
     return cd;
 }
 
 static void
-iconv_dfree(void *cd)
+iconv_dfree
+#ifdef HAVE_PROTOTYPES
+    (void *cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    void *cd;
+#endif /* HAVE_PROTOTYPES */
 {
     iconv_close(VALUE2ICONV(cd));
 }
@@ -220,7 +202,13 @@ iconv_dfree(void *cd)
 #define ICONV_FREE iconv_dfree
 
 static VALUE
-iconv_free(VALUE cd)
+iconv_free
+#ifdef HAVE_PROTOTYPES
+    (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    VALUE cd;
+#endif /* HAVE_PROTOTYPES */
 {
     if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
 	rb_sys_fail("iconv_close");
@@ -228,7 +216,13 @@ iconv_free(VALUE cd)
 }
 
 static VALUE
-check_iconv(VALUE obj)
+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) {
@@ -238,7 +232,17 @@ check_iconv(VALUE obj)
 }
 
 static VALUE
-iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+iconv_try
+#ifdef HAVE_PROTOTYPES
+    (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
+#else /* HAVE_PROTOTYPES */
+    (cd, inptr, inlen, outptr, outlen)
+    iconv_t cd;
+    const char **inptr;
+    size_t *inlen;
+    char **outptr;
+    size_t *outlen;
+#endif /* HAVE_PROTOTYPES */
 {
 #ifdef ICONV_INPTR_CONST
 #define ICONV_INPTR_CAST
@@ -278,8 +282,13 @@ iconv_try(iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *
 
 #define FAILED_MAXLEN 16
 
-static VALUE
-iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
+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);
@@ -288,14 +297,22 @@ iconv_failure_initialize(VALUE error, VALUE mesg, VALUE success, VALUE failed)
 }
 
 static VALUE
-iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+iconv_fail
+#ifdef HAVE_PROTOTYPES
+    (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
+#else /* HAVE_PROTOTYPES */
+    (error, success, failed, env, mesg)
+    VALUE error, success, failed;
+    struct iconv_env_t *env;
+    const char *mesg;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE args[3];
 
     if (mesg && *mesg) {
 	args[0] = rb_str_new2(mesg);
     }
-    else if (TYPE(failed) != T_STRING || RSTRING_LEN(failed) < FAILED_MAXLEN) {
+    else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < FAILED_MAXLEN) {
 	args[0] = rb_inspect(failed);
     }
     else {
@@ -313,19 +330,29 @@ iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, co
     }
     error = rb_class_new_instance(3, args, error);
     if (!rb_block_given_p()) rb_exc_raise(error);
-    rb_set_errinfo(error);
+    ruby_errinfo = error;
     return rb_yield(failed);
 }
 
 static VALUE
-rb_str_derive(VALUE str, const char* ptr, int len)
+rb_str_derive
+#ifdef HAVE_PROTOTYPES
+    (VALUE str, const char* ptr, int len)
+#else /* HAVE_PROTOTYPES */
+    (str, ptr, len)
+    VALUE str;
+    const char *ptr;
+    int len;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE ret;
 
     if (NIL_P(str))
 	return rb_str_new(ptr, len);
-    if (RSTRING_PTR(str) + RSTRING_LEN(str) == ptr + len)
-	ret = rb_str_subseq(str, ptr - RSTRING_PTR(str), len);
+    if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
+	return str;
+    if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
+	ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
     else
 	ret = rb_str_new(ptr, len);
     OBJ_INFECT(ret, str);
@@ -333,7 +360,17 @@ rb_str_derive(VALUE str, const char* ptr, int len)
 }
 
 static VALUE
-iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct iconv_env_t* env)
+iconv_convert
+#ifdef HAVE_PROTOTYPES
+    (iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+    (cd, str, start, length, env)
+    iconv_t cd;
+    VALUE str;
+    long start;
+    long length;
+    struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE ret = Qfalse;
     VALUE error = Qfalse;
@@ -359,7 +396,7 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 	    unsigned int i;
 	    rescue = iconv_fail(error, Qnil, Qnil, env, 0);
 	    if (TYPE(rescue) == T_ARRAY) {
-		str = RARRAY_LEN(rescue) > 0 ? RARRAY_PTR(rescue)[0] : Qnil;
+		str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[0] : Qnil;
 	    }
 	    if (FIXNUM_P(str) && (i = FIX2INT(str)) <= 0xff) {
 		char c = i;
@@ -377,8 +414,8 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 	int slen;
 
 	StringValue(str);
-	slen = RSTRING_LEN(str);
-	inptr = RSTRING_PTR(str);
+	slen = RSTRING(str)->len;
+	inptr = RSTRING(str)->ptr;
 
 	inptr += start;
 	if (length < 0 || length > start + slen)
@@ -405,7 +442,6 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 	    {
 		if (NIL_P(str)) {
 		    ret = rb_str_new(buffer, outlen);
-		    if (toidx >= 0) rb_enc_associate_index(ret, toidx);
 		}
 		else {
 		    if (ret) {
@@ -413,7 +449,6 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 		    }
 		    else {
 			ret = rb_str_new(instart, tmpstart - instart);
-			if (toidx >= 0) rb_enc_associate_index(ret, toidx);
 			OBJ_INFECT(ret, str);
 		    }
 		    ret = rb_str_buf_cat(ret, buffer, outlen);
@@ -433,22 +468,19 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 	if (RTEST(error)) {
 	    long len = 0;
 
-	    if (!ret) {
+	    if (!ret)
 		ret = rb_str_derive(str, instart, inptr - instart);
-		if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-	    }
-	    else if (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_LEN(rescue)) > 0)
-		    rb_str_concat(ret, RARRAY_PTR(rescue)[0]);
-		if (len > 1 && !NIL_P(str = RARRAY_PTR(rescue)[1])) {
+		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_LEN(str);
-		    instart = inptr = RSTRING_PTR(str);
+		    inlen = length = RSTRING(str)->len;
+		    instart = inptr = RSTRING(str)->ptr;
 		    continue;
 		}
 	    }
@@ -459,94 +491,28 @@ iconv_convert(iconv_t cd, VALUE str, long start, long length, int toidx, struct
 	}
     } while (inlen > 0);
 
-    if (!ret) {
+    if (!ret)
 	ret = rb_str_derive(str, instart, inptr - instart);
-	if (toidx >= 0) rb_enc_associate_index(ret, toidx);
-    }
-    else if (inptr > instart) {
+    else if (inptr > instart)
 	rb_str_cat(ret, instart, inptr - instart);
-    }
     return ret;
 }
 
 static VALUE
-iconv_s_allocate(VALUE klass)
+iconv_s_allocate
+#ifdef HAVE_PROTOTYPES
+    (VALUE klass)
+#else /* HAVE_PROTOTYPES */
+    (klass)
+    VALUE klass;
+#endif /* HAVE_PROTOTYPES */
 {
     return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
 }
 
-static VALUE
-get_iconv_opt_i(VALUE i, VALUE arg)
-{
-    struct rb_iconv_opt_t *opt = (struct rb_iconv_opt_t *)arg;
-    VALUE name, val;
-
-    (void)opt;
-    i = rb_Array(i);
-    name = rb_ary_entry(i, 0);
-    val = rb_ary_entry(i, 1);
-    do {
-	if (SYMBOL_P(name)) {
-	    ID id = SYM2ID(name);
-	    if (id == id_transliterate) {
-#ifdef ICONV_SET_TRANSLITERATE
-		opt->transliterate = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	    if (id == id_discard_ilseq) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
-		opt->discard_ilseq = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	}
-	else {
-	    const char *s = StringValueCStr(name);
-	    if (strcmp(s, "transliterate") == 0) {
-#ifdef ICONV_SET_TRANSLITERATE
-		opt->transliterate = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	    if (strcmp(s, "discard_ilseq") == 0) {
-#ifdef ICONV_SET_DISCARD_ILSEQ
-		opt->discard_ilseq = val;
-#else
-		rb_notimplement();
-#endif
-		break;
-	    }
-	}
-	name = rb_inspect(name);
-	rb_raise(rb_eArgError, "unknown option - %s", StringValueCStr(name));
-    } while (0);
-    return Qnil;
-}
-
-static void
-get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
-{
-    opt->transliterate = Qundef;
-    opt->discard_ilseq = Qundef;
-    if (!NIL_P(options)) {
-	rb_block_call(options, rb_intern("each"), 0, 0, get_iconv_opt_i, (VALUE)opt);
-    }
-}
-
-#define iconv_ctl(self, func, val) (\
-	iconvctl(VALUE2ICONV(check_iconv(self)), func, (void *)&(val)) ? \
-	rb_sys_fail(#func) : (void)0)
-
 /*
  * Document-method: new
- * call-seq: Iconv.new(to, from, [options])
+ * call-seq: Iconv.new(to, from)
  *
  * Creates new code converter from a coding-system designated with +from+
  * to another one designated with +to+.
@@ -555,7 +521,6 @@ get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
  *
  * +to+::   encoding name for destination
  * +from+:: encoding name for source
- * +options+:: options for converter
  *
  * === Exceptions
  *
@@ -564,18 +529,19 @@ get_iconv_opt(struct rb_iconv_opt_t *opt, VALUE options)
  * SystemCallError:: if <tt>iconv_open(3)</tt> fails
  */
 static VALUE
-iconv_initialize(int argc, VALUE *argv, VALUE self)
+iconv_initialize
+#ifdef HAVE_PROTOTYPES
+    (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (self, to, from)
+    VALUE self;
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
 {
-    VALUE to, from, options;
-    struct rb_iconv_opt_t opt;
-    int idx;
-
-    rb_scan_args(argc, argv, "21", &to, &from, &options);
-    get_iconv_opt(&opt, options);
     iconv_free(check_iconv(self));
     DATA_PTR(self) = NULL;
-    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from, &opt, &idx));
-    if (idx >= 0) ENCODING_SET(self, idx);
+    DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
     return self;
 }
 
@@ -588,19 +554,19 @@ iconv_initialize(int argc, VALUE *argv, VALUE self)
  * returned from the block.
  */
 static VALUE
-iconv_s_open(int argc, VALUE *argv, VALUE self)
-{
-    VALUE to, from, options, cd;
-    struct rb_iconv_opt_t opt;
-    int idx;
-
-    rb_scan_args(argc, argv, "21", &to, &from, &options);
-    get_iconv_opt(&opt, options);
-    cd = ICONV2VALUE(iconv_create(to, from, &opt, &idx));
+iconv_s_open
+#ifdef HAVE_PROTOTYPES
+    (VALUE self, VALUE to, VALUE from)
+#else /* HAVE_PROTOTYPES */
+    (self, to, from)
+    VALUE self;
+    VALUE to;
+    VALUE from;
+#endif /* HAVE_PROTOTYPES */
+{
+    VALUE cd = ICONV2VALUE(iconv_create(to, from));
 
     self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
-    if (idx >= 0) ENCODING_SET(self, idx);
-
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
     }
@@ -610,19 +576,24 @@ iconv_s_open(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-iconv_s_convert(struct iconv_env_t* env)
+iconv_s_convert
+#ifdef HAVE_PROTOTYPES
+    (struct iconv_env_t* env)
+#else /* HAVE_PROTOTYPES */
+    (env)
+    struct iconv_env_t *env;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE last = 0;
 
     for (; env->argc > 0; --env->argc, ++env->argv) {
-	VALUE s = iconv_convert(env->cd, last = *(env->argv),
-				0, -1, env->toidx, env);
+	VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
 	env->append(env->ret, s);
     }
 
     if (!NIL_P(last)) {
-	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env->toidx, env);
-	if (RSTRING_LEN(s))
+	VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
+	if (RSTRING(s)->len)
 	    env->append(env->ret, s);
     }
 
@@ -648,7 +619,15 @@ iconv_s_convert(struct iconv_env_t* env)
  * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
  */
 static VALUE
-iconv_s_iconv(int argc, VALUE *argv, VALUE self)
+iconv_s_iconv
+#ifdef HAVE_PROTOTYPES
+    (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     struct iconv_env_t arg;
 
@@ -659,7 +638,7 @@ iconv_s_iconv(int argc, VALUE *argv, VALUE self)
     arg.argv = argv + 2;
     arg.append = rb_ary_push;
     arg.ret = rb_ary_new2(argc);
-    arg.cd = iconv_create(argv[0], argv[1], NULL, &arg.toidx);
+    arg.cd = iconv_create(argv[0], argv[1]);
     return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
 }
 
@@ -672,7 +651,13 @@ iconv_s_iconv(int argc, VALUE *argv, VALUE self)
  * See Iconv.iconv.
  */
 static VALUE
-iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
+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;
 
@@ -680,93 +665,11 @@ iconv_s_conv(VALUE self, VALUE to, VALUE from, VALUE str)
     arg.argv = &str;
     arg.append = rb_str_append;
     arg.ret = rb_str_new(0, 0);
-    arg.cd = iconv_create(to, from, NULL, &arg.toidx);
+    arg.cd = iconv_create(to, from);
     return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
 }
 
 /*
- * Document-method: list
- * call-seq: Iconv.list {|*aliases| ... }
- *
- * Iterates each alias sets.
- */
-
-#ifdef HAVE_ICONVLIST
-struct iconv_name_list
-{
-    unsigned int namescount;
-    const char *const *names;
-    VALUE array;
-};
-
-static VALUE
-list_iconv_i(VALUE ptr)
-{
-    struct iconv_name_list *p = (struct iconv_name_list *)ptr;
-    unsigned int i, namescount = p->namescount;
-    const char *const *names = p->names;
-    VALUE ary = rb_ary_new2(namescount);
-
-    for (i = 0; i < namescount; i++) {
-	rb_ary_push(ary, rb_str_new2(names[i]));
-    }
-    if (p->array) {
-	return rb_ary_push(p->array, ary);
-    }
-    return rb_yield(ary);
-}
-
-static int
-list_iconv(unsigned int namescount, const char *const *names, void *data)
-{
-    int *state = data;
-    struct iconv_name_list list;
-
-    list.namescount = namescount;
-    list.names = names;
-    list.array = ((VALUE *)data)[1];
-    rb_protect(list_iconv_i, (VALUE)&list, state);
-    return *state;
-}
-#endif
-
-static VALUE
-iconv_s_list(void)
-{
-#ifdef HAVE_ICONVLIST
-    int state;
-    VALUE args[2];
-
-    args[1] = rb_block_given_p() ? 0 : rb_ary_new();
-    iconvlist(list_iconv, args);
-    state = *(int *)args;
-    if (state) rb_jump_tag(state);
-    if (args[1]) return args[1];
-#elif defined(HAVE___ICONV_FREE_LIST)
-    char **list;
-    size_t sz, i;
-    VALUE ary;
-
-    if (__iconv_get_list(&list, &sz)) return Qnil;
-
-    ary = rb_ary_new2(sz);
-    for (i = 0; i < sz; i++) {
-	rb_ary_push(ary, rb_str_new2(list[i]));
-    }
-    __iconv_free_list(list, sz);
-
-    if (!rb_block_given_p())
-	return ary;
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_PTR(ary)[i]);
-    }
-#else
-    rb_notimplement();
-#endif
-    return Qnil;
-}
-
-/*
  * Document-method: close
  *
  * Finishes conversion.
@@ -778,20 +681,32 @@ iconv_s_list(void)
  * its initial shift state.
  */
 static VALUE
-iconv_init_state(VALUE self)
+iconv_init_state
+#ifdef HAVE_PROTOTYPES
+    (VALUE cd)
+#else /* HAVE_PROTOTYPES */
+    (cd)
+    VALUE cd;
+#endif /* HAVE_PROTOTYPES */
 {
-    iconv_t cd = VALUE2ICONV((VALUE)DATA_PTR(self));
-    DATA_PTR(self) = NULL;
-    return iconv_convert(cd, Qnil, 0, 0, ENCODING_GET(self), NULL);
+    return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
 }
 
 static VALUE
-iconv_finish(VALUE self)
+iconv_finish
+#ifdef HAVE_PROTOTYPES
+    (VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE cd = check_iconv(self);
 
     if (!cd) return Qnil;
-    return rb_ensure(iconv_init_state, self, iconv_free, cd);
+    DATA_PTR(self) = NULL;
+
+    return rb_ensure(iconv_init_state, cd, iconv_free, cd);
 }
 
 /*
@@ -822,186 +737,34 @@ iconv_finish(VALUE self)
  * See the Iconv documentation.
  */
 static VALUE
-iconv_iconv(int argc, VALUE *argv, VALUE self)
+iconv_iconv
+#ifdef HAVE_PROTOTYPES
+    (int argc, VALUE *argv, VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     VALUE str, n1, n2;
     VALUE cd = check_iconv(self);
     long start = 0, length = 0, slen = 0;
 
     rb_scan_args(argc, argv, "12", &str, &n1, &n2);
-    if (!NIL_P(str)) {
-	VALUE n = rb_str_length(StringValue(str));
-	slen = NUM2LONG(n);
-    }
+    if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
     if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
 	if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
-	    length = NIL_P(n2) ? -1 : NUM2LONG(n2);
-	}
-    }
-    if (start > 0 || length > 0) {
-	rb_encoding *enc = rb_enc_get(str);
-	const char *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
-	const char *ps = s;
-	if (start > 0) {
-	    start = (ps = rb_enc_nth(s, e, start, enc)) - s;
-	}
-	if (length > 0) {
-	    length = rb_enc_nth(ps, e, length, enc) - ps;
+	    if (NIL_P(n2)) {
+		length = -1;
+	    }
+	    else if ((length = NUM2LONG(n2)) >= slen - start) {
+		length = slen - start;
+	    }
 	}
     }
 
-    return iconv_convert(VALUE2ICONV(cd), str, start, length, ENCODING_GET(self), NULL);
-}
-
-/*
- * Document-method: conv
- * call-seq: conv(str...)
- *
- * Equivalent to
- *
- *   iconv(nil, str..., nil).join
- */
-static VALUE
-iconv_conv(int argc, VALUE *argv, VALUE self)
-{
-    iconv_t cd = VALUE2ICONV(check_iconv(self));
-    VALUE str, s;
-    int toidx = ENCODING_GET(self);
-
-    str = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
-    if (argc > 0) {
-	do {
-	    s = iconv_convert(cd, *argv++, 0, -1, toidx, NULL);
-	    if (RSTRING_LEN(s))
-		rb_str_buf_append(str, s);
-	} while (--argc);
-	s = iconv_convert(cd, Qnil, 0, 0, toidx, NULL);
-	if (RSTRING_LEN(s))
-	    rb_str_buf_append(str, s);
-    }
-
-    return str;
-}
-
-/*
- * Document-method: trivial?
- * call-seq: trivial?
- *
- * Returns trivial flag.
- */
-static VALUE
-iconv_trivialp(VALUE self)
-{
-#ifdef ICONV_TRIVIALP
-    int trivial = 0;
-    iconv_ctl(self, ICONV_TRIVIALP, trivial);
-    if (trivial) return Qtrue;
-#else
-    rb_notimplement();
-#endif
-    return Qfalse;
-}
-
-/*
- * Document-method: transliterate?
- * call-seq: transliterate?
- *
- * Returns transliterate flag.
- */
-static VALUE
-iconv_get_transliterate(VALUE self)
-{
-#ifdef ICONV_GET_TRANSLITERATE
-    int trans = 0;
-    iconv_ctl(self, ICONV_GET_TRANSLITERATE, trans);
-    if (trans) return Qtrue;
-#else
-    rb_notimplement();
-#endif
-    return Qfalse;
-}
-
-/*
- * Document-method: transliterate=
- * call-seq: cd.transliterate = flag
- *
- * Sets transliterate flag.
- */
-static VALUE
-iconv_set_transliterate(VALUE self, VALUE transliterate)
-{
-#ifdef ICONV_SET_TRANSLITERATE
-    int trans = RTEST(transliterate);
-    iconv_ctl(self, ICONV_SET_TRANSLITERATE, trans);
-#else
-    rb_notimplement();
-#endif
-    return self;
-}
-
-/*
- * Document-method: discard_ilseq?
- * call-seq: discard_ilseq?
- *
- * Returns discard_ilseq flag.
- */
-static VALUE
-iconv_get_discard_ilseq(VALUE self)
-{
-#ifdef ICONV_GET_DISCARD_ILSEQ
-    int dis = 0;
-    iconv_ctl(self, ICONV_GET_DISCARD_ILSEQ, dis);
-    if (dis) return Qtrue;
-#else
-    rb_notimplement();
-#endif
-    return Qfalse;
-}
-
-/*
- * Document-method: discard_ilseq=
- * call-seq: cd.discard_ilseq = flag
- *
- * Sets discard_ilseq flag.
- */
-static VALUE
-iconv_set_discard_ilseq(VALUE self, VALUE discard_ilseq)
-{
-#ifdef ICONV_SET_DISCARD_ILSEQ
-    int dis = RTEST(discard_ilseq);
-    iconv_ctl(self, ICONV_SET_DISCARD_ILSEQ, dis);
-#else
-    rb_notimplement();
-#endif
-    return self;
-}
-
-/*
- * Document-method: ctlmethods
- * call-seq: Iconv.ctlmethods => array
- *
- * Returns available iconvctl() method list.
- */
-static VALUE
-iconv_s_ctlmethods(VALUE klass)
-{
-    VALUE ary = rb_ary_new();
-#ifdef ICONV_TRIVIALP
-    rb_ary_push(ary, ID2SYM(rb_intern("trivial?")));
-#endif
-#ifdef ICONV_GET_TRANSLITERATE
-    rb_ary_push(ary, ID2SYM(rb_intern("transliterate?")));
-#endif
-#ifdef ICONV_SET_TRANSLITERATE
-    rb_ary_push(ary, ID2SYM(rb_intern("transliterate=")));
-#endif
-#ifdef ICONV_GET_DISCARD_ILSEQ
-    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq?")));
-#endif
-#ifdef ICONV_SET_DISCARD_ILSEQ
-    rb_ary_push(ary, ID2SYM(rb_intern("discard_ilseq=")));
-#endif
-    return ary;
+    return iconv_convert(VALUE2ICONV(cd), str, start, length, NULL);
 }
 
 /*
@@ -1020,7 +783,13 @@ iconv_s_ctlmethods(VALUE klass)
  *   failure and the last element is string on the way.
  */
 static VALUE
-iconv_failure_success(VALUE self)
+iconv_failure_success
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     return rb_attr_get(self, rb_success);
 }
@@ -1033,7 +802,13 @@ iconv_failure_success(VALUE self)
  * character caused the exception. 
  */
 static VALUE
-iconv_failure_failed(VALUE self)
+iconv_failure_failed
+#ifdef HAVE_PROTOTYPES
+(VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     return rb_attr_get(self, rb_failed);
 }
@@ -1045,7 +820,13 @@ iconv_failure_failed(VALUE self)
  * Returns inspected string like as: #<_class_: _success_, _failed_>
  */
 static VALUE
-iconv_failure_inspect(VALUE self)
+iconv_failure_inspect
+#ifdef HAVE_PROTOTYPES
+    (VALUE self)
+#else /* HAVE_PROTOTYPES */
+    (self)
+    VALUE self;
+#endif /* HAVE_PROTOTYPES */
 {
     const char *cname = rb_class2name(CLASS_OF(self));
     VALUE success = rb_attr_get(self, rb_success);
@@ -1093,25 +874,17 @@ iconv_failure_inspect(VALUE self)
  */
 
 void
-Init_iconv(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, -1);
+    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_singleton_method(rb_cIconv, "list", iconv_s_list, 0);
-    rb_define_singleton_method(rb_cIconv, "ctlmethods", iconv_s_ctlmethods, 0);
-    rb_define_method(rb_cIconv, "initialize", iconv_initialize, -1);
+    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_define_method(rb_cIconv, "conv", iconv_conv, -1);
-    rb_define_method(rb_cIconv, "trivial?", iconv_trivialp, 0);
-    rb_define_method(rb_cIconv, "transliterate?", iconv_get_transliterate, 0);
-    rb_define_method(rb_cIconv, "transliterate=", iconv_set_transliterate, 1);
-    rb_define_method(rb_cIconv, "discard_ilseq?", iconv_get_discard_ilseq, 0);
-    rb_define_method(rb_cIconv, "discard_ilseq=", iconv_set_discard_ilseq, 1);
 
     rb_eIconvFailure = rb_define_module_under(rb_cIconv, "Failure");
     rb_define_method(rb_eIconvFailure, "initialize", iconv_failure_initialize, 3);
@@ -1132,8 +905,6 @@ Init_iconv(void)
 
     rb_success = rb_intern("success");
     rb_failed = rb_intern("failed");
-    id_transliterate = rb_intern("transliterate");
-    id_discard_ilseq = rb_intern("discard_ilseq");
 
     rb_gc_register_address(&charset_map);
     charset_map = rb_hash_new();
diff --git a/ext/iconv/mkwrapper.rb b/ext/iconv/mkwrapper.rb
deleted file mode 100644
index 34718507d6..0000000000
--- a/ext/iconv/mkwrapper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/ruby
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
-
-HEADER = <<SRC
-require 'iconv.so'
-
-class Iconv
-  case RUBY_PLATFORM
-SRC
-
-def charset_alias(config_charset, mapfile = nil)
-  found = nil
-  src = [HEADER]
-  open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or return
-    input.each do |line|
-      case line
-      when /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/
-        (s = "  when ") << $&.split('|').collect {|targ|
-          targ.strip!
-          tail = targ.chomp!("*") ? '' : '\z'
-          head = targ.slice!(/\A\*/) ? '' : '\A'
-          targ.gsub!(/\*/, '.*')
-          "/#{head}#{targ}#{tail}/"
-        }.join(", ")
-        src << s
-        found = {}
-      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
-        sys, can = $1, $2
-        can.downcase!
-        unless found[can] or (/\Aen_(?!US\z)/ =~ sys && /\ACP437\z/i =~ can)
-          found[can] = true
-          src << "    charset_map['#{can}'] = '#{sys}'.freeze"
-        end
-      when /^\s*;;/
-        found = nil
-      end
-    end
-  end
-  src << "  end" << "end"
-  if mapfile
-    open(mapfile, "wb") {|f| f.puts *src}
-  else
-    puts *src
-  end
-end
-
-(1..2) === ARGV.size or abort "usage: #{$0} config_charset [mapfile]"
-charset_alias(*ARGV)
diff --git a/ext/io/wait/.cvsignore b/ext/io/wait/.cvsignore
index 8767482975..fc802ff1c2 100644
--- a/ext/io/wait/.cvsignore
+++ b/ext/io/wait/.cvsignore
@@ -1,3 +1,2 @@
 Makefile
 mkmf.log
-extconf.h
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index 1a0edbd846..e8181d25f5 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -2,7 +2,7 @@ require 'mkmf'
 target = "io/wait"
 
 unless macro_defined?("DOSISH", "#include <ruby.h>")
-  fionread = %w[sys/ioctl.h sys/filio.h sys/socket.h].find do |h|
+  fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
     have_macro("FIONREAD", h)
   end
   if fionread
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 5986f61b39..02cb54a014 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -3,6 +3,7 @@
   io/wait.c -
 
   $Author$
+  $Date$
   created at: Tue Aug 28 09:08:06 JST 2001
 
   All the files in this distribution are covered under the Ruby's
@@ -30,7 +31,7 @@
 #ifdef HAVE_RB_W32_IS_SOCKET
 #define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
 #else
-#define FIONREAD_POSSIBLE_P(fd) ((void)(fd),Qtrue)
+#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
 #endif
 
 static VALUE io_ready_p _((VALUE io));
@@ -40,96 +41,83 @@ void Init_wait _((void));
 EXTERN struct timeval rb_time_interval _((VALUE time));
 
 /*
- * call-seq:
- *   io.ready? -> true, false or nil
- *
- * Returns non-nil if input available without blocking, or nil.
+=begin
+= IO wait methods.
+=end
  */
 
+/*
+=begin
+--- IO#ready?
+    returns non-nil if input available without blocking, or nil.
+=end
+*/
 static VALUE
-io_ready_p(VALUE io)
+io_ready_p(io)
+    VALUE io;
 {
     rb_io_t *fptr;
+    FILE *fp;
     ioctl_arg n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    if (rb_io_read_pending(fptr)) return Qtrue;
-    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
-    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
+    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;
 }
 
-struct wait_readable_arg {
-    rb_fdset_t fds;
-    struct timeval *timeout;
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_readable(VALUE p)
-{
-    struct wait_readable_arg *arg = (struct wait_readable_arg *)p;
-    rb_fdset_t *fds = &arg->fds;
-
-    return (VALUE)rb_thread_select(rb_fd_max(fds), rb_fd_ptr(fds), NULL, NULL, arg->timeout);
-}
-#endif
-
 /*
- * call-seq:
- *   io.wait          -> IO, true, false or nil
- *   io.wait(timeout) -> IO, true, false or nil
- *
- * Waits until input is available or times out and returns self or nil when
- * EOF is reached.
- */
-
+=begin
+--- IO#wait([timeout])
+    waits until input available or timed out and returns self, or nil
+    when EOF reached.
+=end
+*/
 static VALUE
-io_wait(int argc, VALUE *argv, VALUE io)
+io_wait(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     rb_io_t *fptr;
-    struct wait_readable_arg arg;
-    int fd, i;
+    fd_set rd;
+    FILE *fp;
+    int fd;
     ioctl_arg n;
     VALUE timeout;
-    struct timeval timerec;
+    struct timeval *tp, timerec;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     rb_scan_args(argc, argv, "01", &timeout);
     if (NIL_P(timeout)) {
-	arg.timeout = 0;
+	tp = 0;
     }
     else {
 	timerec = rb_time_interval(timeout);
-	arg.timeout = &timerec;
+	tp = &timerec;
     }
 
-    if (rb_io_read_pending(fptr)) return Qtrue;
-    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
-    fd = fptr->fd;
-    rb_fd_init(&arg.fds);
-    rb_fd_set(fd, &arg.fds);
-#ifdef HAVE_RB_FD_INIT
-    i = (int)rb_ensure(wait_readable, (VALUE)&arg,
-		       (VALUE (*)_((VALUE)))rb_fd_term, (VALUE)&arg.fds);
-#else
-    i = rb_thread_select(fd + 1, rb_fd_ptr(&arg.fds), NULL, NULL, arg.timeout);
-#endif
-    if (i < 0)
+    fp = fptr->f;
+    if (feof(fp)) return Qfalse;
+    if (rb_read_pending(fp)) return Qtrue;
+    fd = fileno(fp);
+    FD_ZERO(&rd);
+    FD_SET(fd, &rd);
+    if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
 	rb_sys_fail(0);
     rb_io_check_closed(fptr);
-    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
+    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;
 }
 
-/*
- * IO wait methods
- */
-
 void
 Init_wait()
 {
diff --git a/ext/json/ext/generator/extconf.rb b/ext/json/ext/generator/extconf.rb
deleted file mode 100644
index 86ed7e6367..0000000000
--- a/ext/json/ext/generator/extconf.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-if CONFIG['CC'] =~ /gcc/
-  #$CFLAGS += ' -Wall -ggdb'
-  $CFLAGS += ' -Wall'
-end
-
-have_header 'st.h'
-create_makefile 'json/ext/generator'
diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c
deleted file mode 100644
index b8a1ea16d1..0000000000
--- a/ext/json/ext/generator/generator.c
+++ /dev/null
@@ -1,881 +0,0 @@
-/* vim: set cin et sw=4 ts=4: */
-
-#include "ruby.h"
-#include "ruby/st.h"
-#include "unicode.h"
-#include <string.h>
-#include <math.h>
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
-
-#define check_max_nesting(state, depth) do {                                   \
-    long current_nesting = 1 + depth;                                          \
-    if (state->max_nesting != 0 && current_nesting > state->max_nesting)       \
-        rb_raise(eNestingError, "nesting of %ld is too deep", current_nesting); \
-} while (0);
-
-static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
-             mHash, mArray, mInteger, mFloat, mString, mString_Extend,
-             mTrueClass, mFalseClass, mNilClass, eGeneratorError,
-             eCircularDatastructure, eNestingError;
-
-static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
-          i_object_nl, i_array_nl, i_check_circular, i_max_nesting,
-          i_allow_nan, i_pack, i_unpack, i_create_id, i_extend;
-
-typedef struct JSON_Generator_StateStruct {
-    VALUE indent;
-    VALUE space;
-    VALUE space_before;
-    VALUE object_nl;
-    VALUE array_nl;
-    int check_circular;
-    VALUE seen;
-    VALUE memo;
-    VALUE depth;
-    long max_nesting;
-    int flag;
-    int allow_nan;
-} JSON_Generator_State;
-
-#define GET_STATE(self)                       \
-    JSON_Generator_State *state;              \
-    Data_Get_Struct(self, JSON_Generator_State, state);
-
-/* 
- * Document-module: JSON::Ext::Generator
- *
- * This is the JSON generator implemented as a C extension. It can be
- * configured to be used by setting
- *
- *  JSON.generator = JSON::Ext::Generator
- *
- * with the method generator= in JSON.
- *
- */
-
-static int hash_to_json_state_i(VALUE key, VALUE value, VALUE Vstate)
-{
-    VALUE json, buf, Vdepth;
-    GET_STATE(Vstate);
-    buf = state->memo;
-    Vdepth = state->depth;
-
-    if (key == Qundef) return ST_CONTINUE;
-    if (state->flag) {
-        state->flag = 0;
-        rb_str_buf_cat2(buf, ",");
-        if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(buf, state->object_nl);
-    }
-    if (RSTRING_LEN(state->object_nl)) {
-        rb_str_buf_append(buf, rb_str_times(state->indent, Vdepth));
-    }
-    json = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 2, Vstate, Vdepth);
-    Check_Type(json, T_STRING);
-    rb_str_buf_append(buf, json);
-    OBJ_INFECT(buf, json);
-    if (RSTRING_LEN(state->space_before)) {
-        rb_str_buf_append(buf, state->space_before);
-    }
-    rb_str_buf_cat2(buf, ":");
-    if (RSTRING_LEN(state->space)) rb_str_buf_append(buf, state->space);
-    json = rb_funcall(value, i_to_json, 2, Vstate, Vdepth);
-    Check_Type(json, T_STRING);
-    state->flag = 1;
-    rb_str_buf_append(buf, json);
-    OBJ_INFECT(buf, json);
-    state->depth = Vdepth;
-    state->memo = buf;
-    return ST_CONTINUE;
-}
-
-inline static VALUE mHash_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth) {
-    long depth, len = RHASH_SIZE(self);
-    VALUE result;
-    GET_STATE(Vstate);
-
-    depth = 1 + FIX2LONG(Vdepth);
-    result = rb_str_buf_new(len);
-    state->memo = result;
-    state->depth = LONG2FIX(depth);
-    state->flag = 0;
-    rb_str_buf_cat2(result, "{");
-    if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
-    rb_hash_foreach(self, hash_to_json_state_i, Vstate);
-    if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
-    if (RSTRING_LEN(state->object_nl)) {
-        rb_str_buf_append(result, rb_str_times(state->indent, Vdepth));
-    }
-    rb_str_buf_cat2(result, "}");
-    return result;
-}
-
-static int hash_to_json_i(VALUE key, VALUE value, VALUE buf)
-{
-    VALUE tmp;
-
-    if (key == Qundef) return ST_CONTINUE;
-    if (RSTRING_LEN(buf) > 1) rb_str_buf_cat2(buf, ",");
-    tmp = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 0);
-    Check_Type(tmp, T_STRING);
-    rb_str_buf_append(buf, tmp);
-    OBJ_INFECT(buf, tmp);
-    rb_str_buf_cat2(buf, ":");
-    tmp = rb_funcall(value, i_to_json, 0);
-    Check_Type(tmp, T_STRING);
-    rb_str_buf_append(buf, tmp);
-    OBJ_INFECT(buf, tmp);
-
-    return ST_CONTINUE;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string containing a JSON object, that is unparsed from
- * this Hash instance.
- * _state_ is a JSON::State object, that can also be used to configure the
- * produced JSON string output further.
- * _depth_ is used to find out nesting depth, to indent accordingly.
- */
-static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
-{
-    VALUE Vstate, Vdepth, result;
-    long depth;
-
-    rb_scan_args(argc, argv, "02", &Vstate, &Vdepth);
-    depth = NIL_P(Vdepth) ? 0 : FIX2LONG(Vdepth);
-    if (NIL_P(Vstate)) {
-        long len = RHASH_SIZE(self);
-        result = rb_str_buf_new(len);
-        rb_str_buf_cat2(result, "{");
-        rb_hash_foreach(self, hash_to_json_i, result);
-        rb_str_buf_cat2(result, "}");
-    } else {
-        GET_STATE(Vstate);
-        check_max_nesting(state, depth);
-        if (state->check_circular) {
-            VALUE self_id = rb_obj_id(self);
-            if (RTEST(rb_hash_aref(state->seen, self_id))) {
-                rb_raise(eCircularDatastructure,
-                        "circular data structures not supported!");
-            }
-            rb_hash_aset(state->seen, self_id, Qtrue);
-            result = mHash_json_transfrom(self, Vstate, LONG2FIX(depth));
-            rb_hash_delete(state->seen, self_id);
-        } else {
-            result = mHash_json_transfrom(self, Vstate, LONG2FIX(depth));
-        }
-    }
-    OBJ_INFECT(result, self);
-    return result;
-}
-
-inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth) {
-    long i, len = RARRAY_LEN(self);
-    VALUE shift, result;
-    long depth = NIL_P(Vdepth) ? 0 : FIX2LONG(Vdepth);
-    VALUE delim = rb_str_new2(",");
-    GET_STATE(Vstate);
-
-    check_max_nesting(state, depth);
-    if (state->check_circular) {
-        VALUE self_id = rb_obj_id(self);
-        rb_hash_aset(state->seen, self_id, Qtrue);
-        result = rb_str_buf_new(len);
-        if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
-        shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
-
-        rb_str_buf_cat2(result, "[");
-        OBJ_INFECT(result, self);
-        rb_str_buf_append(result, state->array_nl);
-        for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY_PTR(self)[i];
-            if (RTEST(rb_hash_aref(state->seen, rb_obj_id(element)))) {
-                rb_raise(eCircularDatastructure,
-                        "circular data structures not supported!");
-            }
-            OBJ_INFECT(result, element);
-            if (i > 0) rb_str_buf_append(result, delim);
-            rb_str_buf_append(result, shift);
-            element = rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1));
-            Check_Type(element, T_STRING);
-            rb_str_buf_append(result, element);
-        }
-        if (RSTRING_LEN(state->array_nl)) {
-            rb_str_buf_append(result, state->array_nl);
-            rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
-        }
-        rb_str_buf_cat2(result, "]");
-        rb_hash_delete(state->seen, self_id);
-    } else {
-        result = rb_str_buf_new(len);
-        OBJ_INFECT(result, self);
-        if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
-        shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
-
-        rb_str_buf_cat2(result, "[");
-        rb_str_buf_append(result, state->array_nl);
-        for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY_PTR(self)[i];
-            OBJ_INFECT(result, element);
-            if (i > 0) rb_str_buf_append(result, delim);
-            rb_str_buf_append(result, shift);
-            element = rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1));
-            Check_Type(element, T_STRING);
-            rb_str_buf_append(result, element);
-        }
-        rb_str_buf_append(result, state->array_nl);
-        if (RSTRING_LEN(state->array_nl)) {
-            rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
-        }
-        rb_str_buf_cat2(result, "]");
-    }
-    return result;
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string containing a JSON array, that is unparsed from
- * this Array instance.
- * _state_ is a JSON::State object, that can also be used to configure the
- * produced JSON string output further.
- * _depth_ is used to find out nesting depth, to indent accordingly.
- */
-static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
-    VALUE Vstate, Vdepth, result;
-
-    rb_scan_args(argc, argv, "02", &Vstate, &Vdepth);
-    if (NIL_P(Vstate)) {
-        long i, len = RARRAY_LEN(self);
-        result = rb_str_buf_new(2 + 2 * len);
-        rb_str_buf_cat2(result, "[");
-        OBJ_INFECT(result, self);
-        for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY_PTR(self)[i];
-            OBJ_INFECT(result, element);
-            if (i > 0) rb_str_buf_cat2(result, ",");
-            element = rb_funcall(element, i_to_json, 0);
-            Check_Type(element, T_STRING);
-            rb_str_buf_append(result, element);
-        }
-        rb_str_buf_cat2(result, "]");
-    } else {
-        result = mArray_json_transfrom(self, Vstate, Vdepth);
-    }
-    OBJ_INFECT(result, self);
-    return result;
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Integer number.
- */
-static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
-{
-    return rb_funcall(self, i_to_s, 0);
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Float number.
- */
-static VALUE mFloat_to_json(int argc, VALUE *argv, VALUE self)
-{
-    JSON_Generator_State *state = NULL;
-    VALUE Vstate, rest, tmp;
-    double value = RFLOAT_VALUE(self);
-    rb_scan_args(argc, argv, "01*", &Vstate, &rest);
-    if (!NIL_P(Vstate)) Data_Get_Struct(Vstate, JSON_Generator_State, state);
-    if (isinf(value)) {
-        if (!state || state->allow_nan) {
-            return rb_funcall(self, i_to_s, 0);
-        } else {
-            tmp = rb_funcall(self, i_to_s, 0);
-            rb_raise(eGeneratorError, "%s not allowed in JSON", StringValueCStr(tmp));
-        }
-    } else if (isnan(value)) {
-        if (!state || state->allow_nan) {
-            return rb_funcall(self, i_to_s, 0);
-        } else {
-            tmp = rb_funcall(self, i_to_s, 0);
-            rb_raise(eGeneratorError, "%s not allowed in JSON", StringValueCStr(tmp));
-        }
-    } else {
-        return rb_funcall(self, i_to_s, 0);
-    }
-}
-
-/*
- * call-seq: String.included(modul)
- *
- * Extends _modul_ with the String::Extend module.
- */
-static VALUE mString_included_s(VALUE self, VALUE modul) {
-    return rb_funcall(modul, i_extend, 1, mString_Extend);
-}
-
-/*
- * call-seq: to_json(*)
- *
- * This string should be encoded with UTF-8 A call to this method
- * returns a JSON string encoded with UTF16 big endian characters as
- * \u????.
- */
-static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
-{
-    VALUE result = rb_str_buf_new(RSTRING_LEN(self));
-    rb_str_buf_cat2(result, "\"");
-    JSON_convert_UTF8_to_JSON(result, self, strictConversion);
-    rb_str_buf_cat2(result, "\"");
-    return result;
-}
-
-/*
- * call-seq: to_json_raw_object()
- *
- * This method creates a raw object hash, that can be nested into
- * other data structures and will be unparsed as a raw string. This
- * method should be used, if you want to convert raw strings to JSON
- * instead of UTF-8 strings, e. g. binary data.
- */
-static VALUE mString_to_json_raw_object(VALUE self) {
-    VALUE ary;
-    VALUE result = rb_hash_new();
-    rb_hash_aset(result, rb_funcall(mJSON, i_create_id, 0), rb_class_name(rb_obj_class(self)));
-    ary = rb_funcall(self, i_unpack, 1, rb_str_new2("C*"));
-    rb_hash_aset(result, rb_str_new2("raw"), ary);
-    return result;
-}
-
-/*
- * call-seq: to_json_raw(*args)
- *
- * This method creates a JSON text from the result of a call to
- * to_json_raw_object of this String.
- */
-static VALUE mString_to_json_raw(int argc, VALUE *argv, VALUE self) {
-    VALUE obj = mString_to_json_raw_object(self);
-    Check_Type(obj, T_HASH);
-    return mHash_to_json(argc, argv, obj);
-}
-
-/*
- * call-seq: json_create(o)
- *
- * Raw Strings are JSON Objects (the raw bytes are stored in an array for the
- * key "raw"). The Ruby String can be created by this module method.
- */
-static VALUE mString_Extend_json_create(VALUE self, VALUE o) {
-    VALUE ary;
-    Check_Type(o, T_HASH);
-    ary = rb_hash_aref(o, rb_str_new2("raw"));
-    return rb_funcall(ary, i_pack, 1, rb_str_new2("C*"));
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string for true: 'true'.
- */
-static VALUE mTrueClass_to_json(int argc, VALUE *argv, VALUE self)
-{
-    return rb_str_new2("true");
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- * Returns a JSON string for false: 'false'.
- */
-static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self)
-{
-    return rb_str_new2("false");
-}
-
-/*
- * call-seq: to_json(state = nil, depth = 0)
- *
- */
-static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self)
-{
-    return rb_str_new2("null");
-}
-
-/*
- * call-seq: to_json(*)
- *
- * Converts this object to a string (calling #to_s), converts
- * it to a JSON string, and returns the result. This is a fallback, if no
- * special method #to_json was defined for some object.
- */
-static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
-{
-    VALUE string = rb_funcall(self, i_to_s, 0);
-    Check_Type(string, T_STRING);
-    return mString_to_json(argc, argv, string);
-}
-
-/* 
- * Document-class: JSON::Ext::Generator::State
- *
- * This class is used to create State instances, that are use to hold data
- * while generating a JSON text from a a Ruby data structure.
- */
-
-static void State_mark(JSON_Generator_State *state)
-{
-    rb_gc_mark_maybe(state->indent);
-    rb_gc_mark_maybe(state->space);
-    rb_gc_mark_maybe(state->space_before);
-    rb_gc_mark_maybe(state->object_nl);
-    rb_gc_mark_maybe(state->array_nl);
-    rb_gc_mark_maybe(state->seen);
-    rb_gc_mark_maybe(state->memo);
-    rb_gc_mark_maybe(state->depth);
-}
-
-static JSON_Generator_State *State_allocate()
-{
-    JSON_Generator_State *state = ALLOC(JSON_Generator_State);
-    return state;
-}
-
-static VALUE cState_s_allocate(VALUE klass)
-{
-    JSON_Generator_State *state = State_allocate();
-    return Data_Wrap_Struct(klass, State_mark, -1, state);
-}
-
-/*
- * call-seq: configure(opts)
- *
- * Configure this State instance with the Hash _opts_, and return
- * itself.
- */
-static inline VALUE cState_configure(VALUE self, VALUE opts)
-{
-    VALUE tmp;
-    GET_STATE(self);
-    tmp = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
-    if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
-    if (NIL_P(tmp)) {
-        rb_raise(rb_eArgError, "opts has to be hash like or convertable into a hash");
-    }
-    opts = tmp;
-    tmp = rb_hash_aref(opts, ID2SYM(i_indent));
-    if (RTEST(tmp)) {
-        Check_Type(tmp, T_STRING);
-        state->indent = tmp;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space));
-    if (RTEST(tmp)) {
-        Check_Type(tmp, T_STRING);
-        state->space = tmp;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
-    if (RTEST(tmp)) {
-        Check_Type(tmp, T_STRING);
-        state->space_before = tmp;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
-    if (RTEST(tmp)) {
-        Check_Type(tmp, T_STRING);
-        state->array_nl = tmp;
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
-    if (RTEST(tmp)) {
-        Check_Type(tmp, T_STRING);
-        state->object_nl = tmp;
-    }
-    tmp = ID2SYM(i_check_circular);
-    if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-        tmp = rb_hash_aref(opts, ID2SYM(i_check_circular));
-        state->check_circular = RTEST(tmp);
-    } else {
-        state->check_circular = 1;
-    }
-    tmp = ID2SYM(i_max_nesting);
-    state->max_nesting = 19;
-    if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-        VALUE max_nesting = rb_hash_aref(opts, tmp);
-        if (RTEST(max_nesting)) {
-            Check_Type(max_nesting, T_FIXNUM);
-            state->max_nesting = FIX2LONG(max_nesting);
-        } else {
-            state->max_nesting = 0;
-        }
-    }
-    tmp = rb_hash_aref(opts, ID2SYM(i_allow_nan));
-    state->allow_nan = RTEST(tmp);
-    return self;
-}
-
-/*
- * call-seq: to_h
- *
- * Returns the configuration instance variables as a hash, that can be
- * passed to the configure method.
- */
-static VALUE cState_to_h(VALUE self)
-{
-    VALUE result = rb_hash_new();
-    GET_STATE(self);
-    rb_hash_aset(result, ID2SYM(i_indent), state->indent);
-    rb_hash_aset(result, ID2SYM(i_space), state->space);
-    rb_hash_aset(result, ID2SYM(i_space_before), state->space_before);
-    rb_hash_aset(result, ID2SYM(i_object_nl), state->object_nl);
-    rb_hash_aset(result, ID2SYM(i_array_nl), state->array_nl);
-    rb_hash_aset(result, ID2SYM(i_check_circular), state->check_circular ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
-    rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
-    return result;
-}
-
-
-/*
- * call-seq: new(opts = {})
- *
- * Instantiates a new State object, configured by _opts_.
- *
- * _opts_ can have the following keys:
- *
- * * *indent*: a string used to indent levels (default: ''),
- * * *space*: a string that is put after, a : or , delimiter (default: ''),
- * * *space_before*: a string that is put before a : pair delimiter (default: ''),
- * * *object_nl*: a string that is put at the end of a JSON object (default: ''), 
- * * *array_nl*: a string that is put at the end of a JSON array (default: ''),
- * * *check_circular*: true if checking for circular data structures
- *   should be done, false (the default) otherwise.
- * * *allow_nan*: true if NaN, Infinity, and -Infinity should be
- *   generated, otherwise an exception is thrown, if these values are
- *   encountered. This options defaults to false.
- */
-static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE opts;
-    GET_STATE(self);
-
-    rb_scan_args(argc, argv, "01", &opts);
-    state->indent = rb_str_new2("");
-    state->space = rb_str_new2("");
-    state->space_before = rb_str_new2("");
-    state->array_nl = rb_str_new2("");
-    state->object_nl = rb_str_new2("");
-    if (NIL_P(opts)) {
-        state->check_circular = 1;
-        state->allow_nan = 0;
-        state->max_nesting = 19;
-    } else {
-        cState_configure(self, opts);
-    }
-    state->seen = rb_hash_new();
-    state->memo = Qnil;
-    state->depth = INT2FIX(0);
-    return self;
-}
-
-/*
- * call-seq: from_state(opts)
- *
- * Creates a State object from _opts_, which ought to be Hash to create a
- * new State instance configured by _opts_, something else to create an
- * unconfigured instance. If _opts_ is a State object, it is just returned.
- */
-static VALUE cState_from_state_s(VALUE self, VALUE opts)
-{
-    if (rb_obj_is_kind_of(opts, self)) {
-        return opts;
-    } else if (rb_obj_is_kind_of(opts, rb_cHash)) {
-        return rb_funcall(self, i_new, 1, opts);
-    } else {
-        return rb_funcall(self, i_new, 0);
-    }
-}
-
-/*
- * call-seq: indent()
- *
- * This string is used to indent levels in the JSON text.
- */
-static VALUE cState_indent(VALUE self)
-{
-    GET_STATE(self);
-    return state->indent;
-}
-
-/*
- * call-seq: indent=(indent)
- *
- * This string is used to indent levels in the JSON text.
- */
-static VALUE cState_indent_set(VALUE self, VALUE indent)
-{
-    GET_STATE(self);
-    Check_Type(indent, T_STRING);
-    return state->indent = indent;
-}
-
-/*
- * call-seq: space()
- *
- * This string is used to insert a space between the tokens in a JSON
- * string.
- */
-static VALUE cState_space(VALUE self)
-{
-    GET_STATE(self);
-    return state->space;
-}
-
-/*
- * call-seq: space=(space)
- *
- * This string is used to insert a space between the tokens in a JSON
- * string.
- */
-static VALUE cState_space_set(VALUE self, VALUE space)
-{
-    GET_STATE(self);
-    Check_Type(space, T_STRING);
-    return state->space = space;
-}
-
-/*
- * call-seq: space_before()
- *
- * This string is used to insert a space before the ':' in JSON objects.
- */
-static VALUE cState_space_before(VALUE self)
-{
-    GET_STATE(self);
-    return state->space_before;
-}
-
-/*
- * call-seq: space_before=(space_before)
- *
- * This string is used to insert a space before the ':' in JSON objects.
- */
-static VALUE cState_space_before_set(VALUE self, VALUE space_before)
-{
-    GET_STATE(self);
-    Check_Type(space_before, T_STRING);
-    return state->space_before = space_before;
-}
-
-/*
- * call-seq: object_nl()
- *
- * This string is put at the end of a line that holds a JSON object (or
- * Hash).
- */
-static VALUE cState_object_nl(VALUE self)
-{
-    GET_STATE(self);
-    return state->object_nl;
-}
-
-/*
- * call-seq: object_nl=(object_nl)
- *
- * This string is put at the end of a line that holds a JSON object (or
- * Hash).
- */
-static VALUE cState_object_nl_set(VALUE self, VALUE object_nl)
-{
-    GET_STATE(self);
-    Check_Type(object_nl, T_STRING);
-    return state->object_nl = object_nl;
-}
-
-/*
- * call-seq: array_nl()
- *
- * This string is put at the end of a line that holds a JSON array.
- */
-static VALUE cState_array_nl(VALUE self)
-{
-    GET_STATE(self);
-    return state->array_nl;
-}
-
-/*
- * call-seq: array_nl=(array_nl)
- *
- * This string is put at the end of a line that holds a JSON array.
- */
-static VALUE cState_array_nl_set(VALUE self, VALUE array_nl)
-{
-    GET_STATE(self);
-    Check_Type(array_nl, T_STRING);
-    return state->array_nl = array_nl;
-}
-
-/*
- * call-seq: check_circular?
- *
- * Returns true, if circular data structures should be checked,
- * otherwise returns false.
- */
-static VALUE cState_check_circular_p(VALUE self)
-{
-    GET_STATE(self);
-    return state->check_circular ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq: max_nesting
- *
- * This integer returns the maximum level of data structure nesting in
- * the generated JSON, max_nesting = 0 if no maximum is checked.
- */
-static VALUE cState_max_nesting(VALUE self)
-{
-    GET_STATE(self);
-    return LONG2FIX(state->max_nesting);
-}
-
-/*
- * call-seq: max_nesting=(depth)
- *
- * This sets the maximum level of data structure nesting in the generated JSON
- * to the integer depth, max_nesting = 0 if no maximum should be checked.
- */
-static VALUE cState_max_nesting_set(VALUE self, VALUE depth)
-{
-    GET_STATE(self);
-    Check_Type(depth, T_FIXNUM);
-    state->max_nesting = FIX2LONG(depth);
-    return Qnil;
-}
-
-/*
- * call-seq: allow_nan?
- *
- * Returns true, if NaN, Infinity, and -Infinity should be generated, otherwise
- * returns false.
- */
-static VALUE cState_allow_nan_p(VALUE self)
-{
-    GET_STATE(self);
-    return state->allow_nan ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq: seen?(object)
- *
- * Returns _true_, if _object_ was already seen during this generating run. 
- */
-static VALUE cState_seen_p(VALUE self, VALUE object)
-{
-    GET_STATE(self);
-    return rb_hash_aref(state->seen, rb_obj_id(object));
-}
-
-/*
- * call-seq: remember(object)
- *
- * Remember _object_, to find out if it was already encountered (if a cyclic
- * data structure is rendered). 
- */
-static VALUE cState_remember(VALUE self, VALUE object)
-{
-    GET_STATE(self);
-    return rb_hash_aset(state->seen, rb_obj_id(object), Qtrue);
-}
-
-/*
- * call-seq: forget(object)
- *
- * Forget _object_ for this generating run.
- */
-static VALUE cState_forget(VALUE self, VALUE object)
-{
-    GET_STATE(self);
-    return rb_hash_delete(state->seen, rb_obj_id(object));
-}
-
-/*
- *
- */
-void Init_generator()
-{
-    rb_require("json/common");
-    mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    mGenerator = rb_define_module_under(mExt, "Generator");
-    eGeneratorError = rb_path2class("JSON::GeneratorError");
-    eCircularDatastructure = rb_path2class("JSON::CircularDatastructure");
-    eNestingError = rb_path2class("JSON::NestingError");
-    cState = rb_define_class_under(mGenerator, "State", rb_cObject);
-    rb_define_alloc_func(cState, cState_s_allocate);
-    rb_define_singleton_method(cState, "from_state", cState_from_state_s, 1);
-    rb_define_method(cState, "initialize", cState_initialize, -1);
-
-    rb_define_method(cState, "indent", cState_indent, 0);
-    rb_define_method(cState, "indent=", cState_indent_set, 1);
-    rb_define_method(cState, "space", cState_space, 0);
-    rb_define_method(cState, "space=", cState_space_set, 1);
-    rb_define_method(cState, "space_before", cState_space_before, 0);
-    rb_define_method(cState, "space_before=", cState_space_before_set, 1);
-    rb_define_method(cState, "object_nl", cState_object_nl, 0);
-    rb_define_method(cState, "object_nl=", cState_object_nl_set, 1);
-    rb_define_method(cState, "array_nl", cState_array_nl, 0);
-    rb_define_method(cState, "array_nl=", cState_array_nl_set, 1);
-    rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
-    rb_define_method(cState, "max_nesting", cState_max_nesting, 0);
-    rb_define_method(cState, "max_nesting=", cState_max_nesting_set, 1);
-    rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
-    rb_define_method(cState, "seen?", cState_seen_p, 1);
-    rb_define_method(cState, "remember", cState_remember, 1);
-    rb_define_method(cState, "forget", cState_forget, 1);
-    rb_define_method(cState, "configure", cState_configure, 1);
-    rb_define_method(cState, "to_h", cState_to_h, 0);
-
-    mGeneratorMethods = rb_define_module_under(mGenerator, "GeneratorMethods");
-    mObject = rb_define_module_under(mGeneratorMethods, "Object");
-    rb_define_method(mObject, "to_json", mObject_to_json, -1);
-    mHash = rb_define_module_under(mGeneratorMethods, "Hash");
-    rb_define_method(mHash, "to_json", mHash_to_json, -1);
-    mArray = rb_define_module_under(mGeneratorMethods, "Array");
-    rb_define_method(mArray, "to_json", mArray_to_json, -1);
-    mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
-    rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
-    mFloat = rb_define_module_under(mGeneratorMethods, "Float");
-    rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
-    mString = rb_define_module_under(mGeneratorMethods, "String");
-    rb_define_singleton_method(mString, "included", mString_included_s, 1);
-    rb_define_method(mString, "to_json", mString_to_json, -1);
-    rb_define_method(mString, "to_json_raw", mString_to_json_raw, -1);
-    rb_define_method(mString, "to_json_raw_object", mString_to_json_raw_object, 0);
-    mString_Extend = rb_define_module_under(mString, "Extend");
-    rb_define_method(mString_Extend, "json_create", mString_Extend_json_create, 1);
-    mTrueClass = rb_define_module_under(mGeneratorMethods, "TrueClass");
-    rb_define_method(mTrueClass, "to_json", mTrueClass_to_json, -1);
-    mFalseClass = rb_define_module_under(mGeneratorMethods, "FalseClass");
-    rb_define_method(mFalseClass, "to_json", mFalseClass_to_json, -1);
-    mNilClass = rb_define_module_under(mGeneratorMethods, "NilClass");
-    rb_define_method(mNilClass, "to_json", mNilClass_to_json, -1);
-
-    i_to_s = rb_intern("to_s");
-    i_to_json = rb_intern("to_json");
-    i_new = rb_intern("new");
-    i_indent = rb_intern("indent");
-    i_space = rb_intern("space");
-    i_space_before = rb_intern("space_before");
-    i_object_nl = rb_intern("object_nl");
-    i_array_nl = rb_intern("array_nl");
-    i_check_circular = rb_intern("check_circular");
-    i_max_nesting = rb_intern("max_nesting");
-    i_allow_nan = rb_intern("allow_nan");
-    i_pack = rb_intern("pack");
-    i_unpack = rb_intern("unpack");
-    i_create_id = rb_intern("create_id");
-    i_extend = rb_intern("extend");
-}
diff --git a/ext/json/ext/generator/unicode.c b/ext/json/ext/generator/unicode.c
deleted file mode 100644
index 44e1f41f98..0000000000
--- a/ext/json/ext/generator/unicode.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* vim: set cin et sw=4 ts=4: */
-
-#include "unicode.h"
-
-#define unicode_escape(buffer, character)          \
-    snprintf(buf, 7, "\\u%04x", (unsigned int) (character)); \
-         rb_str_buf_cat(buffer, buf, 6);
-
-/*
- * Copyright 2001-2004 Unicode, Inc.
- * 
- * Disclaimer
- * 
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- * 
- * Limitations on Rights to Redistribute This Code
- * 
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
-		     0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow.  There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-/*
- * Utility routine to tell whether a sequence of bytes is legal UTF-8.
- * This must be called with the length pre-determined by the first byte.
- * If not calling this from ConvertUTF8to*, then the length can be set by:
- *  length = trailingBytesForUTF8[*source]+1;
- * and the sequence is illegal right away if there aren't that many bytes
- * available.
- * If presented with a length > 4, this returns 0.  The Unicode
- * definition of UTF-8 goes up to 4-byte sequences.
- */
-
-inline static unsigned char isLegalUTF8(const UTF8 *source, int length)
-{
-    UTF8 a;
-    const UTF8 *srcptr = source+length;
-    switch (length) {
-        default: return 0;
-                 /* Everything else falls through when "1"... */
-        case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
-        case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
-        case 2: if ((a = (*--srcptr)) > 0xBF) return 0;
-
-                    switch (*source) {
-                        /* no fall-through in this inner switch */
-                        case 0xE0: if (a < 0xA0) return 0; break;
-                        case 0xED: if (a > 0x9F) return 0; break;
-                        case 0xF0: if (a < 0x90) return 0; break;
-                        case 0xF4: if (a > 0x8F) return 0; break;
-                        default:   if (a < 0x80) return 0;
-                    }
-
-        case 1: if (*source >= 0x80 && *source < 0xC2) return 0;
-    }
-    if (*source > 0xF4) return 0;
-    return 1;
-}
-
-void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags)
-{
-    char buf[7];
-    const UTF8* source = (UTF8 *) RSTRING_PTR(string);
-    const UTF8* sourceEnd = source + RSTRING_LEN(string);
-
-    while (source < sourceEnd) {
-        UTF32 ch = 0;
-        unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
-        if (source + extraBytesToRead >= sourceEnd) {
-            rb_raise(rb_path2class("JSON::GeneratorError"),
-                    "partial character in source, but hit end");
-        }
-        if (!isLegalUTF8(source, extraBytesToRead+1)) {
-            rb_raise(rb_path2class("JSON::GeneratorError"),
-                    "source sequence is illegal/malformed");
-        }
-        /*
-         * The cases all fall through. See "Note A" below.
-         */
-        switch (extraBytesToRead) {
-            case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
-            case 3: ch += *source++; ch <<= 6;
-            case 2: ch += *source++; ch <<= 6;
-            case 1: ch += *source++; ch <<= 6;
-            case 0: ch += *source++;
-        }
-        ch -= offsetsFromUTF8[extraBytesToRead];
-
-        if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
-                if (flags == strictConversion) {
-                    source -= (extraBytesToRead+1); /* return to the illegal value itself */
-                    rb_raise(rb_path2class("JSON::GeneratorError"),
-                        "source sequence is illegal/malformed");
-                } else {
-                    unicode_escape(buffer, UNI_REPLACEMENT_CHAR);
-                }
-            } else {
-                /* normal case */
-                if (ch == '"') {
-                    rb_str_buf_cat2(buffer, "\\\"");
-                } else if (ch == '\\') {
-                    rb_str_buf_cat2(buffer, "\\\\");
-                } else if (ch == '/') {
-                    rb_str_buf_cat2(buffer, "\\/");
-                } else if (ch >= 0x20 && ch <= 0x7f) {
-                    rb_str_buf_cat(buffer, (char *) source - 1, 1);
-                } else if (ch == '\n') {
-                    rb_str_buf_cat2(buffer, "\\n");
-                } else if (ch == '\r') {
-                    rb_str_buf_cat2(buffer, "\\r");
-                } else if (ch == '\t') {
-                    rb_str_buf_cat2(buffer, "\\t");
-                } else if (ch == '\f') {
-                    rb_str_buf_cat2(buffer, "\\f");
-                } else if (ch == '\b') {
-                    rb_str_buf_cat2(buffer, "\\b");
-                } else if (ch < 0x20) {
-                    unicode_escape(buffer, (UTF16) ch);
-                } else {
-                    unicode_escape(buffer, (UTF16) ch);
-                }
-            }
-        } else if (ch > UNI_MAX_UTF16) {
-            if (flags == strictConversion) {
-                source -= (extraBytesToRead+1); /* return to the start */
-                rb_raise(rb_path2class("JSON::GeneratorError"),
-                        "source sequence is illegal/malformed");
-            } else {
-                unicode_escape(buffer, UNI_REPLACEMENT_CHAR);
-            }
-        } else {
-            /* target is a character in range 0xFFFF - 0x10FFFF. */
-            ch -= halfBase;
-            unicode_escape(buffer, (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START));
-            unicode_escape(buffer, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
-        }
-    }
-}
diff --git a/ext/json/ext/generator/unicode.h b/ext/json/ext/generator/unicode.h
deleted file mode 100644
index 841474bcea..0000000000
--- a/ext/json/ext/generator/unicode.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "ruby.h"
-
-#ifndef _GENERATOR_UNICODE_H_
-#define _GENERATOR_UNICODE_H_
-
-typedef enum {
-	conversionOK = 0, 	/* conversion successful */
-	sourceExhausted,	/* partial character in source, but hit end */
-	targetExhausted,	/* insuff. room in target for conversion */
-	sourceIllegal		/* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
-	strictConversion = 0,
-	lenientConversion
-} ConversionFlags;
-
-typedef unsigned long	UTF32;	/* at least 32 bits */
-typedef unsigned short	UTF16;	/* at least 16 bits */
-typedef unsigned char	UTF8;	/* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags);
-
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#endif
diff --git a/ext/json/ext/parser/extconf.rb b/ext/json/ext/parser/extconf.rb
deleted file mode 100644
index b2e7b051a4..0000000000
--- a/ext/json/ext/parser/extconf.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-if CONFIG['CC'] =~ /gcc/
-  #$CFLAGS += ' -Wall -ggdb'
-  $CFLAGS += ' -Wall'
-end
-
-have_header 'st.h'
-create_makefile 'json/ext/parser'
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
deleted file mode 100644
index 8734de2f5b..0000000000
--- a/ext/json/ext/parser/parser.c
+++ /dev/null
@@ -1,1753 +0,0 @@
-#line 1 "parser.rl"
-/* vim: set cin et sw=4 ts=4: */
-
-#include "ruby.h"
-#include "ruby/re.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "unicode.h"
-
-#define EVIL 0x666
-
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
-
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
-          i_chr, i_max_nesting, i_allow_nan; 
-
-#define MinusInfinity "-Infinity"
-
-typedef struct JSON_ParserStruct {
-    VALUE Vsource;
-    char *source;
-    long len;
-    char *memo;
-    VALUE create_id;
-    int max_nesting;
-    int current_nesting;
-    int allow_nan;
-} JSON_Parser;
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-
-#define GET_STRUCT                          \
-    JSON_Parser *json;                      \
-    Data_Get_Struct(self, JSON_Parser, json);
-
-#line 67 "parser.rl"
-
-
-
-#line 47 "parser.c"
-static const int JSON_object_start = 1;
-static const int JSON_object_first_final = 27;
-static const int JSON_object_error = 0;
-
-static const int JSON_object_en_main = 1;
-
-#line 100 "parser.rl"
-
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-    VALUE last_name = Qnil;
-
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
-    }
-
-    *result = rb_hash_new();
-
-    
-#line 69 "parser.c"
-	{
-	cs = JSON_object_start;
-	}
-#line 114 "parser.rl"
-    
-#line 75 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 123 )
-		goto st2;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	switch( (*p) ) {
-		case 13: goto st2;
-		case 32: goto st2;
-		case 34: goto tr2;
-		case 47: goto st23;
-		case 125: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st2;
-	goto st0;
-tr2:
-#line 86 "parser.rl"
-	{
-        char *np = JSON_parse_string(json, p, pe, &last_name);
-        if (np == NULL) goto _out3; else {p = (( np))-1;}
-    }
-	goto st3;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-#line 112 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st3;
-		case 32: goto st3;
-		case 47: goto st4;
-		case 58: goto st8;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st3;
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st5;
-		case 47: goto st7;
-	}
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	if ( (*p) == 42 )
-		goto st6;
-	goto st5;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st6;
-		case 47: goto st3;
-	}
-	goto st5;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	if ( (*p) == 10 )
-		goto st3;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-	switch( (*p) ) {
-		case 13: goto st8;
-		case 32: goto st8;
-		case 34: goto tr11;
-		case 45: goto tr11;
-		case 47: goto st19;
-		case 73: goto tr11;
-		case 78: goto tr11;
-		case 91: goto tr11;
-		case 102: goto tr11;
-		case 110: goto tr11;
-		case 116: goto tr11;
-		case 123: goto tr11;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr11;
-	} else if ( (*p) >= 9 )
-		goto st8;
-	goto st0;
-tr11:
-#line 75 "parser.rl"
-	{
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v); 
-        if (np == NULL) {
-            goto _out9;
-        } else {
-            rb_hash_aset(*result, last_name, v);
-            {p = (( np))-1;}
-        }
-    }
-	goto st9;
-st9:
-	if ( ++p == pe )
-		goto _out9;
-case 9:
-#line 195 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st9;
-		case 32: goto st9;
-		case 44: goto st10;
-		case 47: goto st15;
-		case 125: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st9;
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _out10;
-case 10:
-	switch( (*p) ) {
-		case 13: goto st10;
-		case 32: goto st10;
-		case 34: goto tr2;
-		case 47: goto st11;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st10;
-	goto st0;
-st11:
-	if ( ++p == pe )
-		goto _out11;
-case 11:
-	switch( (*p) ) {
-		case 42: goto st12;
-		case 47: goto st14;
-	}
-	goto st0;
-st12:
-	if ( ++p == pe )
-		goto _out12;
-case 12:
-	if ( (*p) == 42 )
-		goto st13;
-	goto st12;
-st13:
-	if ( ++p == pe )
-		goto _out13;
-case 13:
-	switch( (*p) ) {
-		case 42: goto st13;
-		case 47: goto st10;
-	}
-	goto st12;
-st14:
-	if ( ++p == pe )
-		goto _out14;
-case 14:
-	if ( (*p) == 10 )
-		goto st10;
-	goto st14;
-st15:
-	if ( ++p == pe )
-		goto _out15;
-case 15:
-	switch( (*p) ) {
-		case 42: goto st16;
-		case 47: goto st18;
-	}
-	goto st0;
-st16:
-	if ( ++p == pe )
-		goto _out16;
-case 16:
-	if ( (*p) == 42 )
-		goto st17;
-	goto st16;
-st17:
-	if ( ++p == pe )
-		goto _out17;
-case 17:
-	switch( (*p) ) {
-		case 42: goto st17;
-		case 47: goto st9;
-	}
-	goto st16;
-st18:
-	if ( ++p == pe )
-		goto _out18;
-case 18:
-	if ( (*p) == 10 )
-		goto st9;
-	goto st18;
-tr4:
-#line 91 "parser.rl"
-	{ goto _out27; }
-	goto st27;
-st27:
-	if ( ++p == pe )
-		goto _out27;
-case 27:
-#line 291 "parser.c"
-	goto st0;
-st19:
-	if ( ++p == pe )
-		goto _out19;
-case 19:
-	switch( (*p) ) {
-		case 42: goto st20;
-		case 47: goto st22;
-	}
-	goto st0;
-st20:
-	if ( ++p == pe )
-		goto _out20;
-case 20:
-	if ( (*p) == 42 )
-		goto st21;
-	goto st20;
-st21:
-	if ( ++p == pe )
-		goto _out21;
-case 21:
-	switch( (*p) ) {
-		case 42: goto st21;
-		case 47: goto st8;
-	}
-	goto st20;
-st22:
-	if ( ++p == pe )
-		goto _out22;
-case 22:
-	if ( (*p) == 10 )
-		goto st8;
-	goto st22;
-st23:
-	if ( ++p == pe )
-		goto _out23;
-case 23:
-	switch( (*p) ) {
-		case 42: goto st24;
-		case 47: goto st26;
-	}
-	goto st0;
-st24:
-	if ( ++p == pe )
-		goto _out24;
-case 24:
-	if ( (*p) == 42 )
-		goto st25;
-	goto st24;
-st25:
-	if ( ++p == pe )
-		goto _out25;
-case 25:
-	switch( (*p) ) {
-		case 42: goto st25;
-		case 47: goto st2;
-	}
-	goto st24;
-st26:
-	if ( ++p == pe )
-		goto _out26;
-case 26:
-	if ( (*p) == 10 )
-		goto st2;
-	goto st26;
-	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out18: cs = 18; goto _out; 
-	_out27: cs = 27; goto _out; 
-	_out19: cs = 19; goto _out; 
-	_out20: cs = 20; goto _out; 
-	_out21: cs = 21; goto _out; 
-	_out22: cs = 22; goto _out; 
-	_out23: cs = 23; goto _out; 
-	_out24: cs = 24; goto _out; 
-	_out25: cs = 25; goto _out; 
-	_out26: cs = 26; goto _out; 
-
-	_out: {}
-	}
-#line 115 "parser.rl"
-
-    if (cs >= JSON_object_first_final) {
-        if (RTEST(json->create_id)) {
-            VALUE klassname = rb_hash_aref(*result, json->create_id);
-            if (!NIL_P(klassname)) {
-                VALUE klass = rb_path2class(StringValueCStr(klassname));
-                if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
-                    *result = rb_funcall(klass, i_json_create, 1, *result);
-                }
-            }
-        }
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-#line 407 "parser.c"
-static const int JSON_value_start = 1;
-static const int JSON_value_first_final = 21;
-static const int JSON_value_error = 0;
-
-static const int JSON_value_en_main = 1;
-
-#line 213 "parser.rl"
-
-
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    
-#line 422 "parser.c"
-	{
-	cs = JSON_value_start;
-	}
-#line 220 "parser.rl"
-    
-#line 428 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 34: goto tr0;
-		case 45: goto tr2;
-		case 73: goto st2;
-		case 78: goto st9;
-		case 91: goto tr5;
-		case 102: goto st11;
-		case 110: goto st15;
-		case 116: goto st18;
-		case 123: goto tr9;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr2;
-	goto st0;
-st0:
-	goto _out0;
-tr0:
-#line 161 "parser.rl"
-	{
-        char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) goto _out21; else {p = (( np))-1;}
-    }
-	goto st21;
-tr2:
-#line 166 "parser.rl"
-	{
-        char *np;
-        if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
-            if (json->allow_nan) {
-                *result = CMinusInfinity;
-                {p = (( p + 10))-1;}
-                goto _out21;
-            } else {
-                rb_raise(eParserError, "unexpected token at '%s'", p);
-            }
-        }
-        np = JSON_parse_float(json, p, pe, result);
-        if (np != NULL) {p = (( np))-1;}
-        np = JSON_parse_integer(json, p, pe, result);
-        if (np != NULL) {p = (( np))-1;}
-        goto _out21;
-    }
-	goto st21;
-tr5:
-#line 184 "parser.rl"
-	{ 
-        char *np;
-        json->current_nesting += 1;
-        np = JSON_parse_array(json, p, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) goto _out21; else {p = (( np))-1;}
-    }
-	goto st21;
-tr9:
-#line 192 "parser.rl"
-	{ 
-        char *np;
-        json->current_nesting += 1;
-        np =  JSON_parse_object(json, p, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) goto _out21; else {p = (( np))-1;}
-    }
-	goto st21;
-tr16:
-#line 154 "parser.rl"
-	{
-        if (json->allow_nan) {
-            *result = CInfinity;
-        } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 8);
-        }
-    }
-	goto st21;
-tr18:
-#line 147 "parser.rl"
-	{
-        if (json->allow_nan) {
-            *result = CNaN;
-        } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 2);
-        }
-    }
-	goto st21;
-tr22:
-#line 141 "parser.rl"
-	{
-        *result = Qfalse;
-    }
-	goto st21;
-tr25:
-#line 138 "parser.rl"
-	{
-        *result = Qnil;
-    }
-	goto st21;
-tr28:
-#line 144 "parser.rl"
-	{
-        *result = Qtrue;
-    }
-	goto st21;
-st21:
-	if ( ++p == pe )
-		goto _out21;
-case 21:
-#line 200 "parser.rl"
-	{ goto _out21; }
-#line 542 "parser.c"
-	goto st0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	if ( (*p) == 110 )
-		goto st3;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-	if ( (*p) == 102 )
-		goto st4;
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	if ( (*p) == 105 )
-		goto st5;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	if ( (*p) == 110 )
-		goto st6;
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	if ( (*p) == 105 )
-		goto st7;
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	if ( (*p) == 116 )
-		goto st8;
-	goto st0;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-	if ( (*p) == 121 )
-		goto tr16;
-	goto st0;
-st9:
-	if ( ++p == pe )
-		goto _out9;
-case 9:
-	if ( (*p) == 97 )
-		goto st10;
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _out10;
-case 10:
-	if ( (*p) == 78 )
-		goto tr18;
-	goto st0;
-st11:
-	if ( ++p == pe )
-		goto _out11;
-case 11:
-	if ( (*p) == 97 )
-		goto st12;
-	goto st0;
-st12:
-	if ( ++p == pe )
-		goto _out12;
-case 12:
-	if ( (*p) == 108 )
-		goto st13;
-	goto st0;
-st13:
-	if ( ++p == pe )
-		goto _out13;
-case 13:
-	if ( (*p) == 115 )
-		goto st14;
-	goto st0;
-st14:
-	if ( ++p == pe )
-		goto _out14;
-case 14:
-	if ( (*p) == 101 )
-		goto tr22;
-	goto st0;
-st15:
-	if ( ++p == pe )
-		goto _out15;
-case 15:
-	if ( (*p) == 117 )
-		goto st16;
-	goto st0;
-st16:
-	if ( ++p == pe )
-		goto _out16;
-case 16:
-	if ( (*p) == 108 )
-		goto st17;
-	goto st0;
-st17:
-	if ( ++p == pe )
-		goto _out17;
-case 17:
-	if ( (*p) == 108 )
-		goto tr25;
-	goto st0;
-st18:
-	if ( ++p == pe )
-		goto _out18;
-case 18:
-	if ( (*p) == 114 )
-		goto st19;
-	goto st0;
-st19:
-	if ( ++p == pe )
-		goto _out19;
-case 19:
-	if ( (*p) == 117 )
-		goto st20;
-	goto st0;
-st20:
-	if ( ++p == pe )
-		goto _out20;
-case 20:
-	if ( (*p) == 101 )
-		goto tr28;
-	goto st0;
-	}
-	_out0: cs = 0; goto _out; 
-	_out21: cs = 21; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out18: cs = 18; goto _out; 
-	_out19: cs = 19; goto _out; 
-	_out20: cs = 20; goto _out; 
-
-	_out: {}
-	}
-#line 221 "parser.rl"
-
-    if (cs >= JSON_value_first_final) {
-        return p;
-    } else {
-        return NULL;
-    }
-}
-
-
-#line 712 "parser.c"
-static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 5;
-static const int JSON_integer_error = 0;
-
-static const int JSON_integer_en_main = 1;
-
-#line 237 "parser.rl"
-
-
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    
-#line 727 "parser.c"
-	{
-	cs = JSON_integer_start;
-	}
-#line 244 "parser.rl"
-    json->memo = p;
-    
-#line 734 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 45: goto st2;
-		case 48: goto st3;
-	}
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st4;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	if ( (*p) == 48 )
-		goto st3;
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st4;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st0;
-	goto tr4;
-tr4:
-#line 234 "parser.rl"
-	{ goto _out5; }
-	goto st5;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-#line 774 "parser.c"
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st4;
-	goto tr4;
-	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out4: cs = 4; goto _out; 
-
-	_out: {}
-	}
-#line 246 "parser.rl"
-
-    if (cs >= JSON_integer_first_final) {
-        long len = p - json->memo;
-        *result = rb_Integer(rb_str_new(json->memo, len));
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-#line 804 "parser.c"
-static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 10;
-static const int JSON_float_error = 0;
-
-static const int JSON_float_en_main = 1;
-
-#line 268 "parser.rl"
-
-
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    
-#line 819 "parser.c"
-	{
-	cs = JSON_float_start;
-	}
-#line 275 "parser.rl"
-    json->memo = p;
-    
-#line 826 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 45: goto st2;
-		case 48: goto st3;
-	}
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st9;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	if ( (*p) == 48 )
-		goto st3;
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st9;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st6;
-		case 101: goto st6;
-	}
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	switch( (*p) ) {
-		case 69: goto st6;
-		case 101: goto st6;
-	}
-	if ( (*p) > 46 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st5;
-	} else if ( (*p) >= 45 )
-		goto st0;
-	goto tr7;
-tr7:
-#line 262 "parser.rl"
-	{ goto _out10; }
-	goto st10;
-st10:
-	if ( ++p == pe )
-		goto _out10;
-case 10:
-#line 890 "parser.c"
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	switch( (*p) ) {
-		case 43: goto st7;
-		case 45: goto st7;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st8;
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st8;
-	goto st0;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-	switch( (*p) ) {
-		case 69: goto st0;
-		case 101: goto st0;
-	}
-	if ( (*p) > 46 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st8;
-	} else if ( (*p) >= 45 )
-		goto st0;
-	goto tr7;
-st9:
-	if ( ++p == pe )
-		goto _out9;
-case 9:
-	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st6;
-		case 101: goto st6;
-	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st9;
-	goto st0;
-	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-
-	_out: {}
-	}
-#line 277 "parser.rl"
-
-    if (cs >= JSON_float_first_final) {
-        long len = p - json->memo;
-        *result = rb_Float(rb_str_new(json->memo, len));
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-
-#line 963 "parser.c"
-static const int JSON_array_start = 1;
-static const int JSON_array_first_final = 17;
-static const int JSON_array_error = 0;
-
-static const int JSON_array_en_main = 1;
-
-#line 313 "parser.rl"
-
-
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
-    }
-    *result = rb_ary_new();
-
-    
-#line 983 "parser.c"
-	{
-	cs = JSON_array_start;
-	}
-#line 325 "parser.rl"
-    
-#line 989 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 91 )
-		goto st2;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	switch( (*p) ) {
-		case 13: goto st2;
-		case 32: goto st2;
-		case 34: goto tr2;
-		case 45: goto tr2;
-		case 47: goto st13;
-		case 73: goto tr2;
-		case 78: goto tr2;
-		case 91: goto tr2;
-		case 93: goto tr4;
-		case 102: goto tr2;
-		case 110: goto tr2;
-		case 116: goto tr2;
-		case 123: goto tr2;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr2;
-	} else if ( (*p) >= 9 )
-		goto st2;
-	goto st0;
-tr2:
-#line 294 "parser.rl"
-	{
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v); 
-        if (np == NULL) {
-            goto _out3;
-        } else {
-            rb_ary_push(*result, v);
-            {p = (( np))-1;}
-        }
-    }
-	goto st3;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-#line 1043 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st3;
-		case 32: goto st3;
-		case 44: goto st4;
-		case 47: goto st9;
-		case 93: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st3;
-	goto st0;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	switch( (*p) ) {
-		case 13: goto st4;
-		case 32: goto st4;
-		case 34: goto tr2;
-		case 45: goto tr2;
-		case 47: goto st5;
-		case 73: goto tr2;
-		case 78: goto tr2;
-		case 91: goto tr2;
-		case 102: goto tr2;
-		case 110: goto tr2;
-		case 116: goto tr2;
-		case 123: goto tr2;
-	}
-	if ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr2;
-	} else if ( (*p) >= 9 )
-		goto st4;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	switch( (*p) ) {
-		case 42: goto st6;
-		case 47: goto st8;
-	}
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	if ( (*p) == 42 )
-		goto st7;
-	goto st6;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st4;
-	}
-	goto st6;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-	if ( (*p) == 10 )
-		goto st4;
-	goto st8;
-st9:
-	if ( ++p == pe )
-		goto _out9;
-case 9:
-	switch( (*p) ) {
-		case 42: goto st10;
-		case 47: goto st12;
-	}
-	goto st0;
-st10:
-	if ( ++p == pe )
-		goto _out10;
-case 10:
-	if ( (*p) == 42 )
-		goto st11;
-	goto st10;
-st11:
-	if ( ++p == pe )
-		goto _out11;
-case 11:
-	switch( (*p) ) {
-		case 42: goto st11;
-		case 47: goto st3;
-	}
-	goto st10;
-st12:
-	if ( ++p == pe )
-		goto _out12;
-case 12:
-	if ( (*p) == 10 )
-		goto st3;
-	goto st12;
-tr4:
-#line 305 "parser.rl"
-	{ goto _out17; }
-	goto st17;
-st17:
-	if ( ++p == pe )
-		goto _out17;
-case 17:
-#line 1150 "parser.c"
-	goto st0;
-st13:
-	if ( ++p == pe )
-		goto _out13;
-case 13:
-	switch( (*p) ) {
-		case 42: goto st14;
-		case 47: goto st16;
-	}
-	goto st0;
-st14:
-	if ( ++p == pe )
-		goto _out14;
-case 14:
-	if ( (*p) == 42 )
-		goto st15;
-	goto st14;
-st15:
-	if ( ++p == pe )
-		goto _out15;
-case 15:
-	switch( (*p) ) {
-		case 42: goto st15;
-		case 47: goto st2;
-	}
-	goto st14;
-st16:
-	if ( ++p == pe )
-		goto _out16;
-case 16:
-	if ( (*p) == 10 )
-		goto st2;
-	goto st16;
-	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-
-	_out: {}
-	}
-#line 326 "parser.rl"
-
-    if(cs >= JSON_array_first_final) {
-        return p + 1;
-    } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
-    }
-}
-
-static VALUE json_string_unescape(char *p, char *pe)
-{
-    VALUE result = rb_enc_str_new("", 0, rb_utf8_encoding());
-
-    while (p < pe) {
-        if (*p == '\\') {
-            p++;
-            if (p >= pe) return Qnil; /* raise an exception later, \ at end */
-            switch (*p) {
-                case '"':
-                case '\\':
-                    rb_str_buf_cat(result, p, 1);
-                    p++;
-                    break;
-                case 'b':
-                    rb_str_buf_cat2(result, "\b");
-                    p++;
-                    break;
-                case 'f':
-                    rb_str_buf_cat2(result, "\f");
-                    p++;
-                    break;
-                case 'n':
-                    rb_str_buf_cat2(result, "\n");
-                    p++;
-                    break;
-                case 'r':
-                    rb_str_buf_cat2(result, "\r");
-                    p++;
-                    break;
-                case 't':
-                    rb_str_buf_cat2(result, "\t");
-                    p++;
-                    break;
-                case 'u':
-                    if (p > pe - 4) { 
-                        return Qnil;
-                    } else {
-                        p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
-                    }
-                    break;
-                default:
-                    rb_str_buf_cat(result, p, 1);
-                    p++;
-                    break;
-            }
-        } else {
-            char *q = p;
-            while (*q != '\\' && q < pe) q++;
-            rb_str_buf_cat(result, p, q - p);
-            p = q;
-        }
-    }
-    return result;
-}
-
-
-#line 1271 "parser.c"
-static const int JSON_string_start = 1;
-static const int JSON_string_first_final = 8;
-static const int JSON_string_error = 0;
-
-static const int JSON_string_en_main = 1;
-
-#line 404 "parser.rl"
-
-
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    *result = rb_enc_str_new("", 0, rb_utf8_encoding());
-    
-#line 1287 "parser.c"
-	{
-	cs = JSON_string_start;
-	}
-#line 412 "parser.rl"
-    json->memo = p;
-    
-#line 1294 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-case 1:
-	if ( (*p) == 34 )
-		goto st2;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	switch( (*p) ) {
-		case 34: goto tr2;
-		case 92: goto st3;
-	}
-	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st0;
-	goto st2;
-tr2:
-#line 396 "parser.rl"
-	{
-        *result = json_string_unescape(json->memo + 1, p);
-        if (NIL_P(*result)) goto _out8; else {p = (( p + 1))-1;}
-    }
-#line 401 "parser.rl"
-	{ goto _out8; }
-	goto st8;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-#line 1330 "parser.c"
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-	if ( (*p) == 117 )
-		goto st4;
-	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st0;
-	goto st2;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st5;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st5;
-	} else
-		goto st5;
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st6;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st6;
-	} else
-		goto st6;
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st7;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st7;
-	} else
-		goto st7;
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st2;
-	} else if ( (*p) > 70 ) {
-		if ( 97 <= (*p) && (*p) <= 102 )
-			goto st2;
-	} else
-		goto st2;
-	goto st0;
-	}
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-
-	_out: {}
-	}
-#line 414 "parser.rl"
-
-    if (cs >= JSON_string_first_final) {
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-
-#line 1416 "parser.c"
-static const int JSON_start = 1;
-static const int JSON_first_final = 10;
-static const int JSON_error = 0;
-
-static const int JSON_en_main = 1;
-
-#line 448 "parser.rl"
-
-
-/* 
- * Document-class: JSON::Ext::Parser
- *
- * This is the JSON parser implemented as a C extension. It can be configured
- * to be used by setting
- *
- *  JSON.parser = JSON::Ext::Parser
- *
- * with the method parser= in JSON.
- *
- */
-
-/*
- * call-seq: new(source, opts => {})
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * It will be configured by the _opts_ hash. _opts_ can have the following
- * keys:
- *
- * _opts_ can have the following keys:
- * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- *   structures. Disable depth checking with :max_nesting => false|nil|0, it
- *   defaults to 19.
- * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
- *   false.
- * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matchin class and create_id was found. This option
- *   defaults to true.
- */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
-{
-    char *ptr;
-    long len;
-    VALUE source, opts;
-    GET_STRUCT;
-    rb_scan_args(argc, argv, "11", &source, &opts);
-    source = StringValue(source);
-    ptr = RSTRING_PTR(source);
-    len = RSTRING_LEN(source);
-    if (len < 2) {
-        rb_raise(eParserError, "A JSON text must at least contain two octets!");
-    }
-    if (!NIL_P(opts)) {
-        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
-        if (NIL_P(opts)) {
-            rb_raise(rb_eArgError, "opts needs to be like a hash");
-        } else {
-            VALUE tmp = ID2SYM(i_max_nesting);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE max_nesting = rb_hash_aref(opts, tmp);
-                if (RTEST(max_nesting)) {
-                    Check_Type(max_nesting, T_FIXNUM);
-                    json->max_nesting = FIX2INT(max_nesting);
-                } else {
-                    json->max_nesting = 0;
-                }
-            } else {
-                json->max_nesting = 19;
-            }
-            tmp = ID2SYM(i_allow_nan);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE allow_nan = rb_hash_aref(opts, tmp);
-                json->allow_nan = RTEST(allow_nan) ? 1 : 0;
-            } else {
-                json->allow_nan = 0;
-            }
-            tmp = ID2SYM(i_create_additions);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE create_additions = rb_hash_aref(opts, tmp);
-                if (RTEST(create_additions)) {
-                    json->create_id = rb_funcall(mJSON, i_create_id, 0);
-                } else {
-                    json->create_id = Qnil;
-                }
-            } else {
-                json->create_id = rb_funcall(mJSON, i_create_id, 0);
-            }
-        }
-    } else {
-        json->max_nesting = 19;
-        json->allow_nan = 0;
-        json->create_id = rb_funcall(mJSON, i_create_id, 0);
-    }
-    json->current_nesting = 0;
-    /*
-       Convert these?
-    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    }
-    */
-    json->len = len;
-    json->source = ptr;
-    json->Vsource = source;
-    return self;
-}
-
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_STRUCT;
-
-    
-#line 1546 "parser.c"
-	{
-	cs = JSON_start;
-	}
-#line 570 "parser.rl"
-    p = json->source;
-    pe = p + json->len;
-    
-#line 1554 "parser.c"
-	{
-	if ( p == pe )
-		goto _out;
-	switch ( cs )
-	{
-st1:
-	if ( ++p == pe )
-		goto _out1;
-case 1:
-	switch( (*p) ) {
-		case 13: goto st1;
-		case 32: goto st1;
-		case 47: goto st2;
-		case 91: goto tr3;
-		case 123: goto tr4;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st1;
-	goto st0;
-st0:
-	goto _out0;
-st2:
-	if ( ++p == pe )
-		goto _out2;
-case 2:
-	switch( (*p) ) {
-		case 42: goto st3;
-		case 47: goto st5;
-	}
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _out3;
-case 3:
-	if ( (*p) == 42 )
-		goto st4;
-	goto st3;
-st4:
-	if ( ++p == pe )
-		goto _out4;
-case 4:
-	switch( (*p) ) {
-		case 42: goto st4;
-		case 47: goto st1;
-	}
-	goto st3;
-st5:
-	if ( ++p == pe )
-		goto _out5;
-case 5:
-	if ( (*p) == 10 )
-		goto st1;
-	goto st5;
-tr3:
-#line 437 "parser.rl"
-	{
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_array(json, p, pe, &result);
-        if (np == NULL) goto _out10; else {p = (( np))-1;}
-    }
-	goto st10;
-tr4:
-#line 430 "parser.rl"
-	{
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_object(json, p, pe, &result);
-        if (np == NULL) goto _out10; else {p = (( np))-1;}
-    }
-	goto st10;
-st10:
-	if ( ++p == pe )
-		goto _out10;
-case 10:
-#line 1630 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st10;
-		case 32: goto st10;
-		case 47: goto st6;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st10;
-	goto st0;
-st6:
-	if ( ++p == pe )
-		goto _out6;
-case 6:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st9;
-	}
-	goto st0;
-st7:
-	if ( ++p == pe )
-		goto _out7;
-case 7:
-	if ( (*p) == 42 )
-		goto st8;
-	goto st7;
-st8:
-	if ( ++p == pe )
-		goto _out8;
-case 8:
-	switch( (*p) ) {
-		case 42: goto st8;
-		case 47: goto st10;
-	}
-	goto st7;
-st9:
-	if ( ++p == pe )
-		goto _out9;
-case 9:
-	if ( (*p) == 10 )
-		goto st10;
-	goto st9;
-	}
-	_out1: cs = 1; goto _out; 
-	_out0: cs = 0; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-
-	_out: {}
-	}
-#line 573 "parser.rl"
-
-    if (cs >= JSON_first_final && p == pe) {
-        return result;
-    } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
-    }
-}
-
-inline static JSON_Parser *JSON_allocate()
-{
-    JSON_Parser *json = ALLOC(JSON_Parser);
-    MEMZERO(json, JSON_Parser, 1);
-    return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
-{
-    rb_gc_mark_maybe(json->Vsource);
-    rb_gc_mark_maybe(json->create_id);
-}
-
-static void JSON_free(JSON_Parser *json)
-{
-    ruby_xfree(json);
-}
-
-static VALUE cJSON_parser_s_allocate(VALUE klass)
-{
-    JSON_Parser *json = JSON_allocate();
-    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
-    GET_STRUCT;
-    return rb_str_dup(json->Vsource);
-}
-
-void Init_parser()
-{
-    mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
-    eParserError = rb_path2class("JSON::ParserError");
-    eNestingError = rb_path2class("JSON::NestingError");
-    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, -1);
-    rb_define_method(cParser, "parse", cParser_parse, 0);
-    rb_define_method(cParser, "source", cParser_source, 0);
-
-    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
-    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
-    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
-
-    i_json_creatable_p = rb_intern("json_creatable?");
-    i_json_create = rb_intern("json_create");
-    i_create_id = rb_intern("create_id");
-    i_create_additions = rb_intern("create_additions");
-    i_chr = rb_intern("chr");
-    i_max_nesting = rb_intern("max_nesting");
-    i_allow_nan = rb_intern("allow_nan");
-}
diff --git a/ext/json/ext/parser/parser.rl b/ext/json/ext/parser/parser.rl
deleted file mode 100644
index c25b1278f7..0000000000
--- a/ext/json/ext/parser/parser.rl
+++ /dev/null
@@ -1,640 +0,0 @@
-/* vim: set cin et sw=4 ts=4: */
-
-#include "ruby.h"
-#include "ruby/re.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "unicode.h"
-
-#define EVIL 0x666
-
-static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
-static VALUE CNaN, CInfinity, CMinusInfinity;
-
-static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
-          i_chr, i_max_nesting, i_allow_nan; 
-
-#define MinusInfinity "-Infinity"
-
-typedef struct JSON_ParserStruct {
-    VALUE Vsource;
-    char *source;
-    long len;
-    char *memo;
-    VALUE create_id;
-    int max_nesting;
-    int current_nesting;
-    int allow_nan;
-} JSON_Parser;
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
-
-#define GET_STRUCT                          \
-    JSON_Parser *json;                      \
-    Data_Get_Struct(self, JSON_Parser, json);
-
-%%{
-    machine JSON_common;
-
-    cr                  = '\n';
-    cr_neg              = [^\n];
-    ws                  = [ \t\r\n];
-    c_comment           = '/*' ( any* - (any* '*/' any* ) ) '*/';
-    cpp_comment         = '//' cr_neg* cr;
-    comment             = c_comment | cpp_comment;
-    ignore              = ws | comment;
-    name_separator      = ':';
-    value_separator     = ',';
-    Vnull               = 'null';
-    Vfalse              = 'false';
-    Vtrue               = 'true';
-    VNaN                = 'NaN';
-    VInfinity           = 'Infinity';
-    VMinusInfinity      = '-Infinity';
-    begin_value         = [nft"\-[{NI] | digit;
-    begin_object        = '{';
-    end_object          = '}';
-    begin_array         = '[';
-    end_array           = ']';
-    begin_string        = '"';
-    begin_name          = begin_string;
-    begin_number        = digit | '-';
-}%%
-
-%%{
-    machine JSON_object;
-    include JSON_common;
-
-    write data;
-
-    action parse_value {
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v); 
-        if (np == NULL) {
-            fbreak;
-        } else {
-            rb_hash_aset(*result, last_name, v);
-            fexec np;
-        }
-    }
-
-    action parse_name {
-        char *np = JSON_parse_string(json, fpc, pe, &last_name);
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    action exit { fbreak; }
-
-    a_pair  = ignore* begin_name >parse_name
-        ignore* name_separator ignore*
-        begin_value >parse_value;
-
-    main := begin_object
-          (a_pair (ignore* value_separator a_pair)*)?
-          ignore* end_object @exit;
-}%%
-
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-    VALUE last_name = Qnil;
-
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
-    }
-
-    *result = rb_hash_new();
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= JSON_object_first_final) {
-        if (RTEST(json->create_id)) {
-            VALUE klassname = rb_hash_aref(*result, json->create_id);
-            if (!NIL_P(klassname)) {
-                VALUE klass = rb_path2class(StringValueCStr(klassname));
-                if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
-                    *result = rb_funcall(klass, i_json_create, 1, *result);
-                }
-            }
-        }
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-%%{
-    machine JSON_value;
-    include JSON_common;
-
-    write data;
-
-    action parse_null {
-        *result = Qnil;
-    }
-    action parse_false {
-        *result = Qfalse;
-    }
-    action parse_true {
-        *result = Qtrue;
-    }
-    action parse_nan {
-        if (json->allow_nan) {
-            *result = CNaN;
-        } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 2);
-        }
-    }
-    action parse_infinity {
-        if (json->allow_nan) {
-            *result = CInfinity;
-        } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 8);
-        }
-    }
-    action parse_string {
-        char *np = JSON_parse_string(json, fpc, pe, result);
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    action parse_number {
-        char *np;
-        if(pe > fpc + 9 && !strncmp(MinusInfinity, fpc, 9)) {
-            if (json->allow_nan) {
-                *result = CMinusInfinity;
-                fexec p + 10;
-                fbreak;
-            } else {
-                rb_raise(eParserError, "unexpected token at '%s'", p);
-            }
-        }
-        np = JSON_parse_float(json, fpc, pe, result);
-        if (np != NULL) fexec np;
-        np = JSON_parse_integer(json, fpc, pe, result);
-        if (np != NULL) fexec np;
-        fbreak;
-    }
-
-    action parse_array { 
-        char *np;
-        json->current_nesting += 1;
-        np = JSON_parse_array(json, fpc, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    action parse_object { 
-        char *np;
-        json->current_nesting += 1;
-        np =  JSON_parse_object(json, fpc, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    action exit { fbreak; }
-
-main := (
-              Vnull @parse_null |
-              Vfalse @parse_false |
-              Vtrue @parse_true |
-              VNaN @parse_nan |
-              VInfinity @parse_infinity |
-              begin_number >parse_number |
-              begin_string >parse_string |
-              begin_array >parse_array |
-              begin_object >parse_object
-        ) %*exit;
-}%%
-
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    %% write init;
-    %% write exec;
-
-    if (cs >= JSON_value_first_final) {
-        return p;
-    } else {
-        return NULL;
-    }
-}
-
-%%{
-    machine JSON_integer;
-
-    write data;
-
-    action exit { fbreak; }
-
-    main := '-'? ('0' | [1-9][0-9]*) (^[0-9] @exit);
-}%%
-
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (cs >= JSON_integer_first_final) {
-        long len = p - json->memo;
-        *result = rb_Integer(rb_str_new(json->memo, len));
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-%%{
-    machine JSON_float;
-    include JSON_common;
-
-    write data;
-
-    action exit { fbreak; }
-
-    main := '-'? (
-              (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
-              | (('0' | [1-9][0-9]*) ([Ee] [+\-]?[0-9]+))
-             )  (^[0-9Ee.\-] @exit );
-}%%
-
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (cs >= JSON_float_first_final) {
-        long len = p - json->memo;
-        *result = rb_Float(rb_str_new(json->memo, len));
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-%%{
-    machine JSON_array;
-    include JSON_common;
-
-    write data;
-
-    action parse_value {
-        VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v); 
-        if (np == NULL) {
-            fbreak;
-        } else {
-            rb_ary_push(*result, v);
-            fexec np;
-        }
-    }
-
-    action exit { fbreak; }
-
-    next_element  = value_separator ignore* begin_value >parse_value;
-
-    main := begin_array ignore*
-          ((begin_value >parse_value ignore*)
-           (ignore* next_element ignore*)*)?
-          end_array @exit;
-}%%
-
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    if (json->max_nesting && json->current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
-    }
-    *result = rb_ary_new();
-
-    %% write init;
-    %% write exec;
-
-    if(cs >= JSON_array_first_final) {
-        return p + 1;
-    } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
-    }
-}
-
-static VALUE json_string_unescape(char *p, char *pe)
-{
-    VALUE result = rb_enc_str_new(0, pe - p + 1, rb_utf8_encoding());
-
-    while (p < pe) {
-        if (*p == '\\') {
-            p++;
-            if (p >= pe) return Qnil; /* raise an exception later, \ at end */
-            switch (*p) {
-                case '"':
-                case '\\':
-                    rb_str_buf_cat(result, p, 1);
-                    p++;
-                    break;
-                case 'b':
-                    rb_str_buf_cat2(result, "\b");
-                    p++;
-                    break;
-                case 'f':
-                    rb_str_buf_cat2(result, "\f");
-                    p++;
-                    break;
-                case 'n':
-                    rb_str_buf_cat2(result, "\n");
-                    p++;
-                    break;
-                case 'r':
-                    rb_str_buf_cat2(result, "\r");
-                    p++;
-                    break;
-                case 't':
-                    rb_str_buf_cat2(result, "\t");
-                    p++;
-                    break;
-                case 'u':
-                    if (p > pe - 4) { 
-                        return Qnil;
-                    } else {
-                        p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
-                    }
-                    break;
-                default:
-                    rb_str_buf_cat(result, p, 1);
-                    p++;
-                    break;
-            }
-        } else {
-            char *q = p;
-            while (*q != '\\' && q < pe) q++;
-            rb_str_buf_cat(result, p, q - p);
-            p = q;
-        }
-    }
-    return result;
-}
-
-%%{
-    machine JSON_string;
-    include JSON_common;
-
-    write data;
-
-    action parse_string {
-        *result = json_string_unescape(json->memo + 1, p);
-        if (NIL_P(*result)) fbreak; else fexec p + 1;
-    }
-
-    action exit { fbreak; }
-
-    main := '"' ((^(["\\] | 0..0x1f) | '\\'["\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^(["\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
-}%%
-
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
-{
-    int cs = EVIL;
-
-    *result = rb_enc_str_new("", 0, rb_utf8_encoding());
-    %% write init;
-    json->memo = p;
-    %% write exec;
-
-    if (cs >= JSON_string_first_final) {
-        return p + 1;
-    } else {
-        return NULL;
-    }
-}
-
-
-%%{
-    machine JSON;
-
-    write data;
-
-    include JSON_common;
-
-    action parse_object {
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_object(json, fpc, pe, &result);
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    action parse_array {
-        char *np;
-        json->current_nesting = 1;
-        np = JSON_parse_array(json, fpc, pe, &result);
-        if (np == NULL) fbreak; else fexec np;
-    }
-
-    main := ignore* (
-            begin_object >parse_object |
-            begin_array >parse_array
-            ) ignore*;
-}%%
-
-/* 
- * Document-class: JSON::Ext::Parser
- *
- * This is the JSON parser implemented as a C extension. It can be configured
- * to be used by setting
- *
- *  JSON.parser = JSON::Ext::Parser
- *
- * with the method parser= in JSON.
- *
- */
-
-/*
- * call-seq: new(source, opts => {})
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- *
- * It will be configured by the _opts_ hash. _opts_ can have the following
- * keys:
- *
- * _opts_ can have the following keys:
- * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
- *   structures. Disable depth checking with :max_nesting => false|nil|0, it
- *   defaults to 19.
- * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
- *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
- *   false.
- * * *create_additions*: If set to false, the Parser doesn't create
- *   additions even if a matchin class and create_id was found. This option
- *   defaults to true.
- */
-static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
-{
-    char *ptr;
-    long len;
-    VALUE source, opts;
-    GET_STRUCT;
-    rb_scan_args(argc, argv, "11", &source, &opts);
-    source = StringValue(source);
-    ptr = RSTRING_PTR(source);
-    len = RSTRING_LEN(source);
-    if (len < 2) {
-        rb_raise(eParserError, "A JSON text must at least contain two octets!");
-    }
-    if (!NIL_P(opts)) {
-        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
-        if (NIL_P(opts)) {
-            rb_raise(rb_eArgError, "opts needs to be like a hash");
-        } else {
-            VALUE tmp = ID2SYM(i_max_nesting);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE max_nesting = rb_hash_aref(opts, tmp);
-                if (RTEST(max_nesting)) {
-                    Check_Type(max_nesting, T_FIXNUM);
-                    json->max_nesting = FIX2INT(max_nesting);
-                } else {
-                    json->max_nesting = 0;
-                }
-            } else {
-                json->max_nesting = 19;
-            }
-            tmp = ID2SYM(i_allow_nan);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE allow_nan = rb_hash_aref(opts, tmp);
-                json->allow_nan = RTEST(allow_nan) ? 1 : 0;
-            } else {
-                json->allow_nan = 0;
-            }
-            tmp = ID2SYM(i_create_additions);
-            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
-                VALUE create_additions = rb_hash_aref(opts, tmp);
-                if (RTEST(create_additions)) {
-                    json->create_id = rb_funcall(mJSON, i_create_id, 0);
-                } else {
-                    json->create_id = Qnil;
-                }
-            } else {
-                json->create_id = rb_funcall(mJSON, i_create_id, 0);
-            }
-        }
-    } else {
-        json->max_nesting = 19;
-        json->allow_nan = 0;
-        json->create_id = rb_funcall(mJSON, i_create_id, 0);
-    }
-    json->current_nesting = 0;
-    /*
-       Convert these?
-    if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
-    }
-    */
-    json->len = len;
-    json->source = ptr;
-    json->Vsource = source;
-    return self;
-}
-
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
-{
-    char *p, *pe;
-    int cs = EVIL;
-    VALUE result = Qnil;
-    GET_STRUCT;
-
-    %% write init;
-    p = json->source;
-    pe = p + json->len;
-    %% write exec;
-
-    if (cs >= JSON_first_final && p == pe) {
-        return result;
-    } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
-    }
-}
-
-inline static JSON_Parser *JSON_allocate()
-{
-    JSON_Parser *json = ALLOC(JSON_Parser);
-    MEMZERO(json, JSON_Parser, 1);
-    return json;
-}
-
-static void JSON_mark(JSON_Parser *json)
-{
-    rb_gc_mark_maybe(json->Vsource);
-    rb_gc_mark_maybe(json->create_id);
-}
-
-static void JSON_free(JSON_Parser *json)
-{
-    ruby_xfree(json);
-}
-
-static VALUE cJSON_parser_s_allocate(VALUE klass)
-{
-    JSON_Parser *json = JSON_allocate();
-    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
-}
-
-/*
- * call-seq: source()
- *
- * Returns a copy of the current _source_ string, that was used to construct
- * this Parser.
- */
-static VALUE cParser_source(VALUE self)
-{
-    GET_STRUCT;
-    return rb_str_dup(json->Vsource);
-}
-
-void Init_parser()
-{
-    mJSON = rb_define_module("JSON");
-    mExt = rb_define_module_under(mJSON, "Ext");
-    cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
-    eParserError = rb_path2class("JSON::ParserError");
-    eNestingError = rb_path2class("JSON::NestingError");
-    rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, -1);
-    rb_define_method(cParser, "parse", cParser_parse, 0);
-    rb_define_method(cParser, "source", cParser_source, 0);
-
-    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
-    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
-    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
-
-    i_json_creatable_p = rb_intern("json_creatable?");
-    i_json_create = rb_intern("json_create");
-    i_create_id = rb_intern("create_id");
-    i_create_additions = rb_intern("create_additions");
-    i_chr = rb_intern("chr");
-    i_max_nesting = rb_intern("max_nesting");
-    i_allow_nan = rb_intern("allow_nan");
-}
diff --git a/ext/json/ext/parser/unicode.c b/ext/json/ext/parser/unicode.c
deleted file mode 100644
index f196727354..0000000000
--- a/ext/json/ext/parser/unicode.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* vim: set cin et sw=4 ts=4: */
-
-#include "unicode.h"
-
-/*
- * Copyright 2001-2004 Unicode, Inc.
- * 
- * Disclaimer
- * 
- * This source code is provided as is by Unicode, Inc. No claims are
- * made as to fitness for any particular purpose. No warranties of any
- * kind are expressed or implied. The recipient agrees to determine
- * applicability of information provided. If this file has been
- * purchased on magnetic or optical media from Unicode, Inc., the
- * sole remedy for any claim will be exchange of defective media
- * within 90 days of receipt.
- * 
- * Limitations on Rights to Redistribute This Code
- * 
- * Unicode, Inc. hereby grants the right to freely use the information
- * supplied in this file in the creation of products supporting the
- * Unicode Standard, and to make copies of this file in any form
- * for internal or external distribution as long as this notice
- * remains attached.
- */
-
-/*
- * Index into the table below with the first byte of a UTF-8 sequence to
- * get the number of trailing bytes that are supposed to follow it.
- * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
- * left as-is for anyone who may want to do such conversion, which was
- * allowed in earlier algorithms.
- */
-static const char trailingBytesForUTF8[256] = {
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
-};
-
-/*
- * Magic values subtracted from a buffer value during UTF8 conversion.
- * This table contains as many values as there might be trailing bytes
- * in a UTF-8 sequence.
- */
-static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
-             0x03C82080UL, 0xFA082080UL, 0x82082080UL };
-
-/*
- * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow.  There are
- * as many entries in this table as there are UTF-8 sequence types.
- * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
- * for *legal* UTF-8 will be 4 or fewer bytes total.
- */
-static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-char *JSON_convert_UTF16_to_UTF8 (
-        VALUE buffer,
-        char *source,
-        char *sourceEnd,
-        ConversionFlags flags)
-{
-    UTF16 *tmp, *tmpPtr, *tmpEnd;
-    char buf[5];
-    long n = 0, i;
-    char *p = source - 1;
-
-    while (p < sourceEnd && p[0] == '\\' && p[1] == 'u') {
-        p += 6;
-        n++;
-    }
-    p = source + 1;
-    buf[4] = 0;
-    tmpPtr = tmp = ALLOC_N(UTF16, n);
-    tmpEnd = tmp + n;
-    for (i = 0; i < n; i++) {
-        buf[0] = *p++;
-        buf[1] = *p++;
-        buf[2] = *p++;
-        buf[3] = *p++;
-        tmpPtr[i] = strtol(buf, NULL, 16);
-        p += 2;
-    }
-
-    while (tmpPtr < tmpEnd) {
-        UTF32 ch;
-        unsigned short bytesToWrite = 0;
-        const UTF32 byteMask = 0xBF;
-        const UTF32 byteMark = 0x80; 
-        ch = *tmpPtr++;
-        /* If we have a surrogate pair, convert to UTF32 first. */
-        if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
-            /* If the 16 bits following the high surrogate are in the source
-             * buffer... */
-            if (tmpPtr < tmpEnd) {
-                UTF32 ch2 = *tmpPtr;
-                /* If it's a low surrogate, convert to UTF32. */
-                if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
-                    ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
-                        + (ch2 - UNI_SUR_LOW_START) + halfBase;
-                    ++tmpPtr;
-                } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
-		    ruby_xfree(tmp);
-                    rb_raise(rb_path2class("JSON::ParserError"),
-                            "source sequence is illegal/malformed near %s", source);
-                }
-            } else { /* We don't have the 16 bits following the high surrogate. */
-                ruby_xfree(tmp);
-                rb_raise(rb_path2class("JSON::ParserError"),
-                    "partial character in source, but hit end near %s", source);
-                break;
-            }
-        } else if (flags == strictConversion) {
-            /* UTF-16 surrogate values are illegal in UTF-32 */
-            if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
-                ruby_xfree(tmp);
-                rb_raise(rb_path2class("JSON::ParserError"),
-                    "source sequence is illegal/malformed near %s", source);
-            }
-        }
-        /* Figure out how many bytes the result will require */
-        if (ch < (UTF32) 0x80) {
-            bytesToWrite = 1;
-        } else if (ch < (UTF32) 0x800) {
-            bytesToWrite = 2;
-        } else if (ch < (UTF32) 0x10000) {
-            bytesToWrite = 3;
-        } else if (ch < (UTF32) 0x110000) {
-            bytesToWrite = 4;
-        } else {
-            bytesToWrite = 3;
-            ch = UNI_REPLACEMENT_CHAR;
-        }
-
-        buf[0] = 0;
-        buf[1] = 0;
-        buf[2] = 0;
-        buf[3] = 0;
-        p = buf + bytesToWrite;
-        switch (bytesToWrite) { /* note: everything falls through. */
-            case 4: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
-            case 3: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
-            case 2: *--p = (UTF8) ((ch | byteMark) & byteMask); ch >>= 6;
-            case 1: *--p = (UTF8) (ch | firstByteMark[bytesToWrite]);
-        }
-        rb_str_buf_cat(buffer, p, bytesToWrite);
-    }
-    ruby_xfree(tmp);
-    source += 5 + (n - 1) * 6;
-    return source;
-}
diff --git a/ext/json/ext/parser/unicode.h b/ext/json/ext/parser/unicode.h
deleted file mode 100644
index 155da0ceee..0000000000
--- a/ext/json/ext/parser/unicode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#ifndef _PARSER_UNICODE_H_
-#define _PARSER_UNICODE_H_
-
-#include "ruby.h"
-
-typedef unsigned long	UTF32;	/* at least 32 bits */
-typedef unsigned short	UTF16;	/* at least 16 bits */
-typedef unsigned char	UTF8;	/* typically 8 bits */
-
-#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
-#define UNI_MAX_BMP (UTF32)0x0000FFFF
-#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
-#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
-#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
-
-#define UNI_SUR_HIGH_START  (UTF32)0xD800
-#define UNI_SUR_HIGH_END    (UTF32)0xDBFF
-#define UNI_SUR_LOW_START   (UTF32)0xDC00
-#define UNI_SUR_LOW_END     (UTF32)0xDFFF
-
-static const int halfShift  = 10; /* used for shifting by 10 bits */
-
-static const UTF32 halfBase = 0x0010000UL;
-static const UTF32 halfMask = 0x3FFUL;
-
-typedef enum {
-	conversionOK = 0, 	/* conversion successful */
-	sourceExhausted,	/* partial character in source, but hit end */
-	targetExhausted,	/* insuff. room in target for conversion */
-	sourceIllegal		/* source sequence is illegal/malformed */
-} ConversionResult;
-
-typedef enum {
-	strictConversion = 0,
-	lenientConversion
-} ConversionFlags;
-
-char *JSON_convert_UTF16_to_UTF8 (
-    VALUE buffer,
-    char *source,
-    char *sourceEnd,
-		ConversionFlags flags);
-
-#ifndef RARRAY_PTR
-#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
-#endif
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
-#endif
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(string) RSTRING(string)->ptr
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(string) RSTRING(string)->len
-#endif
-
-#endif
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
deleted file mode 100644
index 850798c643..0000000000
--- a/ext/json/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-create_makefile('json')
-
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
deleted file mode 100644
index 3b0b711550..0000000000
--- a/ext/json/lib/json.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-require 'json/common'
-# = json - JSON for Ruby
-#
-# == Description
-#
-# This is a implementation of the JSON specification according to RFC 4627
-# (http://www.ietf.org/rfc/rfc4627.txt). Starting from version 1.0.0 on there
-# will be two variants available:
-#
-# * A pure ruby variant, that relies on the iconv and the stringscan
-#   extensions, which are both part of the ruby standard library.
-# * The quite a bit faster C extension variant, which is in parts implemented
-#   in C and comes with its own unicode conversion functions and a parser
-#   generated by the ragel state machine compiler
-#   (http://www.cs.queensu.ca/~thurston/ragel).
-#
-# Both variants of the JSON generator escape all non-ASCII an control
-# characters with \uXXXX escape sequences, and support UTF-16 surrogate pairs
-# in order to be able to generate the whole range of unicode code points. This
-# means that generated JSON text is encoded as UTF-8 (because ASCII is a subset
-# of UTF-8) and at the same time avoids decoding problems for receiving
-# endpoints, that don't expect UTF-8 encoded texts. On the negative side this
-# may lead to a bit longer strings than necessarry.
-#
-# All strings, that are to be encoded as JSON strings, should be UTF-8 byte
-# sequences on the Ruby side. To encode raw binary strings, that aren't UTF-8
-# encoded, please use the to_json_raw_object method of String (which produces
-# an object, that contains a byte array) and decode the result on the receiving
-# endpoint.
-#
-# == Author
-#
-# Florian Frank <mailto:flori@ping.de>
-#
-# == License
-#
-# This software is distributed under the same license as Ruby itself, see
-# http://www.ruby-lang.org/en/LICENSE.txt.
-#
-# == Download
-#
-# The latest version of this library can be downloaded at
-#
-# * http://rubyforge.org/frs?group_id=953
-#
-# Online Documentation should be located at
-#
-# * http://json.rubyforge.org
-#
-# == Usage
-# 
-# To use JSON you can
-#   require 'json'
-# to load the installed variant (either the extension 'json' or the pure
-# variant 'json_pure'). If you have installed the extension variant, you can
-# pick either the extension variant or the pure variant by typing
-#   require 'json/ext'
-# or
-#   require 'json/pure'
-#
-# You can choose to load a set of common additions to ruby core's objects if
-# you
-#   require 'json/add/core'
-#
-# After requiring this you can, e. g., serialise/deserialise Ruby ranges:
-#
-#   JSON JSON(1..10) # => 1..10
-#
-# To find out how to add JSON support to other or your own classes, read the
-# Examples section below.
-#
-# To get the best compatibility to rails' JSON implementation, you can
-#   require 'json/add/rails'
-#
-# Both of the additions attempt to require 'json' (like above) first, if it has
-# not been required yet.
-#
-# == Speed Comparisons
-#
-# I have created some benchmark results (see the benchmarks subdir of the
-# package) for the JSON-Parser to estimate the speed up in the C extension:
-#
-# JSON::Pure::Parser::  28.90  calls/second
-# JSON::Ext::Parser::  505.50 calls/second
-#
-# This is ca. <b>17.5</b> times the speed of the pure Ruby implementation.
-#
-# I have benchmarked the JSON-Generator as well. This generates a few more
-# values, because there are different modes, that also influence the achieved
-# speed:
-#
-# * JSON::Pure::Generator:
-#   generate::        35.06 calls/second
-#   pretty_generate:: 34.00 calls/second
-#   fast_generate::   41.06 calls/second
-#
-# * JSON::Ext::Generator:
-#   generate::        492.11 calls/second
-#   pretty_generate:: 348.85 calls/second
-#   fast_generate::   541.60 calls/second
-#
-# * Speedup Ext/Pure:
-#   generate safe::   14.0 times
-#   generate pretty:: 10.3 times
-#   generate fast::   13.2 times
-#
-# The rails framework includes a generator as well, also it seems to be rather
-# slow: I measured only 23.87 calls/second which is slower than any of my pure
-# generator results. Here a comparison of the different speedups with the Rails
-# measurement as the divisor:
-#
-# * Speedup Pure/Rails:
-#   generate safe::   1.5 times
-#   generate pretty:: 1.4 times
-#   generate fast::   1.7 times
-#
-# * Speedup Ext/Rails:
-#   generate safe::   20.6 times
-#   generate pretty:: 14.6 times
-#   generate fast::   22.7 times
-#
-# To achieve the fastest JSON text output, you can use the
-# fast_generate/fast_unparse methods. Beware, that this will disable the
-# checking for circular Ruby data structures, which may cause JSON to go into
-# an infinite loop.
-#
-# == Examples
-#
-# To create a JSON text from a ruby data structure, you
-# can call JSON.generate (or JSON.unparse) like that:
-#
-#  json = JSON.generate [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#  # => "[1,2,{\"a\":3.141},false,true,null,\"4..10\"]"
-#
-# To create a valid JSON text you have to make sure, that the output is
-# embedded in either a JSON array [] or a JSON object {}. The easiest way to do
-# this, is by putting your values in a Ruby Array or Hash instance.
-#
-# To get back a ruby data structure from a JSON text, you have to call
-# JSON.parse on it:
-#
-#  JSON.parse json
-#  # => [1, 2, {"a"=>3.141}, false, true, nil, "4..10"]
-# 
-# Note, that the range from the original data structure is a simple
-# string now. The reason for this is, that JSON doesn't support ranges
-# or arbitrary classes. In this case the json library falls back to call
-# Object#to_json, which is the same as #to_s.to_json.
-#
-# It's possible to add JSON support serialization to arbitrary classes by
-# simply implementing a more specialized version of the #to_json method, that
-# should return a JSON object (a hash converted to JSON with #to_json) like
-# this (don't forget the *a for all the arguments):
-#
-#  class Range
-#    def to_json(*a)
-#      {
-#        'json_class'   => self.class.name, # = 'Range'
-#        'data'         => [ first, last, exclude_end? ]
-#      }.to_json(*a)
-#    end
-#  end
-#
-# The hash key 'json_class' is the class, that will be asked to deserialise the
-# JSON representation later. In this case it's 'Range', but any namespace of
-# the form 'A::B' or '::A::B' will do. All other keys are arbitrary and can be
-# used to store the necessary data to configure the object to be deserialised.
-#
-# If a the key 'json_class' is found in a JSON object, the JSON parser checks
-# if the given class responds to the json_create class method. If so, it is
-# called with the JSON object converted to a Ruby hash. So a range can
-# be deserialised by implementing Range.json_create like this:
-# 
-#  class Range
-#    def self.json_create(o)
-#      new(*o['data'])
-#    end
-#  end
-#
-# Now it possible to serialise/deserialise ranges as well:
-#
-#  json = JSON.generate [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#  # => "[1,2,{\"a\":3.141},false,true,null,{\"json_class\":\"Range\",\"data\":[4,10,false]}]"
-#  JSON.parse json
-#  # => [1, 2, {"a"=>3.141}, false, true, nil, 4..10]
-#
-# JSON.generate always creates the shortest possible string representation of a
-# ruby data structure in one line. This good for data storage or network
-# protocols, but not so good for humans to read. Fortunately there's also
-# JSON.pretty_generate (or JSON.pretty_generate) that creates a more
-# readable output:
-#
-#  puts JSON.pretty_generate([1, 2, {"a"=>3.141}, false, true, nil, 4..10])
-#  [
-#    1,
-#    2,
-#    {
-#      "a": 3.141
-#    },
-#    false,
-#    true,
-#    null,
-#    {
-#      "json_class": "Range",
-#      "data": [
-#        4,
-#        10,
-#        false
-#      ]
-#    }
-#  ]
-#
-# There are also the methods Kernel#j for unparse, and Kernel#jj for
-# pretty_unparse output to the console, that work analogous to Core Ruby's p
-# and the pp library's pp methods.
-#
-# The script tools/server.rb contains a small example if you want to test, how
-# receiving a JSON object from a webrick server in your browser with the
-# javasript prototype library (http://www.prototypejs.org) works.
-#
-module JSON
-  require 'json/version'
-
-  if VARIANT_BINARY
-    require 'json/ext'
-  else
-    begin
-      require 'json/ext'
-    rescue LoadError
-      require 'json/pure'
-    end
-  end
-
-  JSON_LOADED = true
-end
diff --git a/ext/json/lib/json/Array.xpm b/ext/json/lib/json/Array.xpm
deleted file mode 100644
index 27c48011f9..0000000000
--- a/ext/json/lib/json/Array.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * Array_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"                ",
-"   ..........   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   .        .   ",
-"   ..........   ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/FalseClass.xpm b/ext/json/lib/json/FalseClass.xpm
deleted file mode 100644
index 25ce60832d..0000000000
--- a/ext/json/lib/json/FalseClass.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * False_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FF0000",
-"                ",
-"                ",
-"                ",
-"     ......     ",
-"     .          ",
-"     .          ",
-"     .          ",
-"     ......     ",
-"     .          ",
-"     .          ",
-"     .          ",
-"     .          ",
-"     .          ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/Hash.xpm b/ext/json/lib/json/Hash.xpm
deleted file mode 100644
index cd8f6f7b53..0000000000
--- a/ext/json/lib/json/Hash.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * Hash_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"                ",
-"       .  .     ",
-"       .  .     ",
-"       .  .     ",
-"    .........   ",
-"      .  .      ",
-"      .  .      ",
-"   .........    ",
-"     .  .       ",
-"     .  .       ",
-"     .  .       ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/Key.xpm b/ext/json/lib/json/Key.xpm
deleted file mode 100644
index 9fd7281388..0000000000
--- a/ext/json/lib/json/Key.xpm
+++ /dev/null
@@ -1,73 +0,0 @@
-/* XPM */
-static char * Key_xpm[] = {
-"16 16 54 1",
-" 	c None",
-".	c #110007",
-"+	c #0E0900",
-"@	c #000013",
-"#	c #070600",
-"$	c #F6F006",
-"%	c #ECE711",
-"&	c #E5EE00",
-"*	c #16021E",
-"=	c #120900",
-"-	c #EDF12B",
-";	c #000033",
-">	c #0F0000",
-",	c #FFFE03",
-"'	c #E6E500",
-")	c #16021B",
-"!	c #F7F502",
-"~	c #000E00",
-"{	c #130000",
-"]	c #FFF000",
-"^	c #FFE711",
-"/	c #140005",
-"(	c #190025",
-"_	c #E9DD27",
-":	c #E7DC04",
-"<	c #FFEC09",
-"[	c #FFE707",
-"}	c #FFDE10",
-"|	c #150021",
-"1	c #160700",
-"2	c #FAF60E",
-"3	c #EFE301",
-"4	c #FEF300",
-"5	c #E7E000",
-"6	c #FFFF08",
-"7	c #0E0206",
-"8	c #040000",
-"9	c #03052E",
-"0	c #041212",
-"a	c #070300",
-"b	c #F2E713",
-"c	c #F9DE13",
-"d	c #36091E",
-"e	c #00001C",
-"f	c #1F0010",
-"g	c #FFF500",
-"h	c #DEDE00",
-"i	c #050A00",
-"j	c #FAF14A",
-"k	c #F5F200",
-"l	c #040404",
-"m	c #1A0D00",
-"n	c #EDE43D",
-"o	c #ECE007",
-"                ",
-"                ",
-"    .+@         ",
-"   #$%&*        ",
-"  =-;>,')       ",
-"  >!~{]^/       ",
-"  (_:<[}|       ",
-"   1234567      ",
-"    890abcd     ",
-"       efghi    ",
-"         >jkl   ",
-"          mnol  ",
-"           >kl  ",
-"            ll  ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/NilClass.xpm b/ext/json/lib/json/NilClass.xpm
deleted file mode 100644
index 3509f06c99..0000000000
--- a/ext/json/lib/json/NilClass.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * False_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"                ",
-"       ...      ",
-"      .   .     ",
-"     .     .    ",
-"     .     .    ",
-"     .     .    ",
-"     .     .    ",
-"     .     .    ",
-"     .     .    ",
-"      .   .     ",
-"       ...      ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/Numeric.xpm b/ext/json/lib/json/Numeric.xpm
deleted file mode 100644
index e071e2ee9c..0000000000
--- a/ext/json/lib/json/Numeric.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * Numeric_xpm[] = {
-"16 16 9 1",
-" 	c None",
-".	c #FF0000",
-"+	c #0000FF",
-"@	c #0023DB",
-"#	c #00EA14",
-"$	c #00FF00",
-"%	c #004FAF",
-"&	c #0028D6",
-"*	c #00F20C",
-"                ",
-"                ",
-"                ",
-" ... +++@#$$$$  ",
-"   .+   %&   $$ ",
-"   .     +    $ ",
-"   .     +   $$ ",
-"   .    ++$$$$  ",
-"   .    +    $$ ",
-"   .   +      $ ",
-"   .  +       $ ",
-"   . +  $    $$ ",
-" .....++++*$$   ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/String.xpm b/ext/json/lib/json/String.xpm
deleted file mode 100644
index f79a89cdc1..0000000000
--- a/ext/json/lib/json/String.xpm
+++ /dev/null
@@ -1,96 +0,0 @@
-/* XPM */
-static char * String_xpm[] = {
-"16 16 77 1",
-" 	c None",
-".	c #000000",
-"+	c #040404",
-"@	c #080806",
-"#	c #090606",
-"$	c #EEEAE1",
-"%	c #E7E3DA",
-"&	c #E0DBD1",
-"*	c #D4B46F",
-"=	c #0C0906",
-"-	c #E3C072",
-";	c #E4C072",
-">	c #060505",
-",	c #0B0A08",
-"'	c #D5B264",
-")	c #D3AF5A",
-"!	c #080602",
-"~	c #E1B863",
-"{	c #DDB151",
-"]	c #DBAE4A",
-"^	c #DDB152",
-"/	c #DDB252",
-"(	c #070705",
-"_	c #0C0A07",
-":	c #D3A33B",
-"<	c #020201",
-"[	c #DAAA41",
-"}	c #040302",
-"|	c #E4D9BF",
-"1	c #0B0907",
-"2	c #030201",
-"3	c #020200",
-"4	c #C99115",
-"5	c #080704",
-"6	c #DBC8A2",
-"7	c #E7D7B4",
-"8	c #E0CD9E",
-"9	c #080601",
-"0	c #040400",
-"a	c #010100",
-"b	c #0B0B08",
-"c	c #DCBF83",
-"d	c #DCBC75",
-"e	c #DEB559",
-"f	c #040301",
-"g	c #BC8815",
-"h	c #120E07",
-"i	c #060402",
-"j	c #0A0804",
-"k	c #D4A747",
-"l	c #D6A12F",
-"m	c #0E0C05",
-"n	c #C8C1B0",
-"o	c #1D1B15",
-"p	c #D7AD51",
-"q	c #070502",
-"r	c #080804",
-"s	c #BC953B",
-"t	c #C4BDAD",
-"u	c #0B0807",
-"v	c #DBAC47",
-"w	c #1B150A",
-"x	c #B78A2C",
-"y	c #D8A83C",
-"z	c #D4A338",
-"A	c #0F0B03",
-"B	c #181105",
-"C	c #C59325",
-"D	c #C18E1F",
-"E	c #060600",
-"F	c #CC992D",
-"G	c #B98B25",
-"H	c #B3831F",
-"I	c #C08C1C",
-"J	c #060500",
-"K	c #0E0C03",
-"L	c #0D0A00",
-"                ",
-"   .+@#         ",
-"  .$%&*=        ",
-" .-;>,')!       ",
-" .~.  .{].      ",
-" .^/. (_:<      ",
-"  .[.}|$12      ",
-"   345678}90    ",
-"    a2bcdefgh   ",
-"      ijkl.mno  ",
-"      <pq. rstu ",
-"      .]v.  wx= ",
-"       .yzABCDE ",
-"        .FGHIJ  ",
-"         0KL0   ",
-"                "};
diff --git a/ext/json/lib/json/TrueClass.xpm b/ext/json/lib/json/TrueClass.xpm
deleted file mode 100644
index 143eef49bb..0000000000
--- a/ext/json/lib/json/TrueClass.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * TrueClass_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #0BF311",
-"                ",
-"                ",
-"                ",
-"   .........    ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"       .        ",
-"                ",
-"                ",
-"                "};
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
deleted file mode 100644
index 630ed6e4b7..0000000000
--- a/ext/json/lib/json/add/core.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-# This file contains implementations of ruby core's custom objects for
-# serialisation/deserialisation.
-
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
-  ::JSON::JSON_LOADED
-  require 'json'
-end
-require 'date'
-
-class Time
-  def self.json_create(object)
-    at(*object.values_at('s', 'u'))
-  end
-
-  def to_json(*args)
-    {
-      'json_class' => self.class.name.to_s,
-      's' => tv_sec,
-      'u' => tv_usec,
-    }.to_json(*args)
-  end
-end
-
-class Date
-  def self.json_create(object)
-    civil(*object.values_at('y', 'm', 'd', 'sg'))
-  end
-
-  def to_json(*args)
-    {
-      'json_class' => self.class.name.to_s,
-      'y' => year,
-      'm' => month,
-      'd' => day,
-      'sg' => @sg,
-    }.to_json(*args)
-  end
-end
-
-class DateTime
-  def self.json_create(object)
-    args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
-    of_a, of_b = object['of'].split('/')
-    args << Rational(of_a.to_i, of_b.to_i)
-    args << object['sg']
-    civil(*args)
-  end
-
-  def to_json(*args)
-    {
-      'json_class' => self.class.name.to_s,
-      'y' => year,
-      'm' => month,
-      'd' => day,
-      'H' => hour,
-      'M' => min,
-      'S' => sec,
-      'of' => offset.to_s,
-      'sg' => @sg,
-    }.to_json(*args)
-  end
-end
-
-class Range
-  def self.json_create(object)
-    new(*object['a'])
-  end
-
-  def to_json(*args)
-    {
-      'json_class'   => self.class.name.to_s,
-      'a'         => [ first, last, exclude_end? ]
-    }.to_json(*args)
-  end
-end
-
-class Struct
-  def self.json_create(object)
-    new(*object['v'])
-  end
-
-  def to_json(*args)
-    klass = self.class.name.to_s
-    klass.empty? and raise JSON::JSONError, "Only named structs are supported!"
-    {
-      'json_class' => klass,
-      'v'     => values,
-    }.to_json(*args)
-  end
-end
-
-class Exception
-  def self.json_create(object)
-    result = new(object['m'])
-    result.set_backtrace object['b']
-    result
-  end
-
-  def to_json(*args)
-    {
-      'json_class' => self.class.name.to_s,
-      'm'   => message,
-      'b' => backtrace,
-    }.to_json(*args)
-  end
-end
-
-class Regexp
-  def self.json_create(object)
-    new(object['s'], object['o'])
-  end
-
-  def to_json(*)
-    {
-      'json_class' => self.class.name.to_s,
-      'o' => options,
-      's' => source,
-    }.to_json
-  end
-end
diff --git a/ext/json/lib/json/add/rails.rb b/ext/json/lib/json/add/rails.rb
deleted file mode 100644
index e86ed1aab9..0000000000
--- a/ext/json/lib/json/add/rails.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file contains implementations of rails custom objects for
-# serialisation/deserialisation.
-
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
-  ::JSON::JSON_LOADED
-  require 'json'
-end
-
-class Object
-  def self.json_create(object)
-    obj = new
-    for key, value in object
-      next if key == 'json_class'
-      instance_variable_set "@#{key}", value
-    end
-    obj
-  end
-
-  def to_json(*a)
-    result = {
-      'json_class' => self.class.name
-    }
-    instance_variables.inject(result) do |r, name|
-      r[name[1..-1]] = instance_variable_get name
-      r
-    end
-    result.to_json(*a)
-  end
-end
-
-class Symbol
-  def to_json(*a)
-    to_s.to_json(*a)
-  end
-end
-
-module Enumerable
-  def to_json(*a)
-    to_a.to_json(*a)
-  end
-end
-
-# class Regexp
-#   def to_json(*)
-#     inspect
-#   end
-# end
-#
-# The above rails definition has some problems:
-#
-# 1. { 'foo' => /bar/ }.to_json # => "{foo: /bar/}"
-#    This isn't valid JSON, because the regular expression syntax is not
-#    defined in RFC 4627. (And unquoted strings are disallowed there, too.)
-#    Though it is valid Javascript.
-#
-# 2. { 'foo' => /bar/mix }.to_json # => "{foo: /bar/mix}"
-#    This isn't even valid Javascript.
-
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
deleted file mode 100644
index 7bc5ae0656..0000000000
--- a/ext/json/lib/json/common.rb
+++ /dev/null
@@ -1,354 +0,0 @@
-require 'json/version'
-
-module JSON
-  class << self
-    # If _object_ is string like parse the string and return the parsed result
-    # as a Ruby data structure. Otherwise generate a JSON text from the Ruby
-    # data structure object and return it.
-    #
-    # The _opts_ argument is passed through to generate/parse respectively, see
-    # generate and parse for their documentation.
-    def [](object, opts = {})
-      if object.respond_to? :to_str
-        JSON.parse(object.to_str, opts => {})
-      else
-        JSON.generate(object, opts => {})
-      end
-    end
-
-    # Returns the JSON parser class, that is used by JSON. This might be either
-    # JSON::Ext::Parser or JSON::Pure::Parser.
-    attr_reader :parser
-
-    # Set the JSON parser class _parser_ to be used by JSON.
-    def parser=(parser) # :nodoc:
-      @parser = parser
-      remove_const :Parser if const_defined? :Parser
-      const_set :Parser, parser
-    end
-
-    # Return the constant located at _path_. The format of _path_ has to be
-    # either ::A::B::C or A::B::C. In any case A has to be located at the top
-    # level (absolute namespace path?). If there doesn't exist a constant at
-    # the given path, an ArgumentError is raised.
-    def deep_const_get(path) # :nodoc:
-      path = path.to_s
-      path.split(/::/).inject(Object) do |p, c|
-        case
-        when c.empty?             then p
-        when p.const_defined?(c)  then p.const_get(c)
-        else                      raise ArgumentError, "can't find const #{path}"
-        end
-      end
-    end
-
-    # Set the module _generator_ to be used by JSON.
-    def generator=(generator) # :nodoc:
-      @generator = generator
-      generator_methods = generator::GeneratorMethods
-      for const in generator_methods.constants
-        klass = deep_const_get(const)
-        modul = generator_methods.const_get(const)
-        klass.class_eval do
-          instance_methods(false).each do |m|
-            m.to_s == 'to_json' and remove_method m
-          end
-          include modul
-        end
-      end
-      self.state = generator::State
-      const_set :State, self.state
-    end
-
-    # Returns the JSON generator modul, that is used by JSON. This might be
-    # either JSON::Ext::Generator or JSON::Pure::Generator.
-    attr_reader :generator
-
-    # Returns the JSON generator state class, that is used by JSON. This might
-    # be either JSON::Ext::Generator::State or JSON::Pure::Generator::State.
-    attr_accessor :state
-
-    # This is create identifier, that is used to decide, if the _json_create_
-    # hook of a class should be called. It defaults to 'json_class'.
-    attr_accessor :create_id
-  end
-  self.create_id = 'json_class'
-
-  NaN           = (-1.0) ** 0.5
-
-  Infinity      = 1.0/0
-
-  MinusInfinity = -Infinity
-
-  # The base exception for JSON errors.
-  class JSONError < StandardError; end
-
-  # This exception is raised, if a parser error occurs.
-  class ParserError < JSONError; end
-
-  # This exception is raised, if the nesting of parsed datastructures is too
-  # deep.
-  class NestingError < ParserError; end
-
-  # This exception is raised, if a generator or unparser error occurs.
-  class GeneratorError < JSONError; end
-  # For backwards compatibility
-  UnparserError = GeneratorError
-
-  # If a circular data structure is encountered while unparsing
-  # this exception is raised.
-  class CircularDatastructure < GeneratorError; end
-
-  # This exception is raised, if the required unicode support is missing on the
-  # system. Usually this means, that the iconv library is not installed.
-  class MissingUnicodeSupport < JSONError; end
-
-  module_function
-
-  # Parse the JSON string _source_ into a Ruby data structure and return it.
-  #
-  # _opts_ can have the following
-  # keys:
-  # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
-  #   structures. Disable depth checking with :max_nesting => false, it defaults
-  #   to 19.
-  # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
-  #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
-  #   to false.
-  # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matchin class and create_id was found. This option
-  #   defaults to true.
-  def parse(source, opts = {})
-    JSON.parser.new(source, opts).parse
-  end
-
-  # Parse the JSON string _source_ into a Ruby data structure and return it.
-  # The bang version of the parse method, defaults to the more dangerous values
-  # for the _opts_ hash, so be sure only to parse trusted _source_ strings.
-  #
-  # _opts_ can have the following keys:
-  # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
-  #   structures. Enable depth checking with :max_nesting => anInteger. The parse!
-  #   methods defaults to not doing max depth checking: This can be dangerous,
-  #   if someone wants to fill up your stack.
-  # * *allow_nan*: If set to true, allow NaN, Infinity, and -Infinity in
-  #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
-  #   to true.
-  # * *create_additions*: If set to false, the Parser doesn't create
-  #   additions even if a matchin class and create_id was found. This option
-  #   defaults to true.
-  def parse!(source, opts = {})
-    opts = {
-      :max_nesting => false,
-      :allow_nan => true
-    }.update(opts)
-    JSON.parser.new(source, opts).parse
-  end
-
-  # Unparse the Ruby data structure _obj_ into a single line JSON string and
-  # return it. _state_ is
-  # * a JSON::State object,
-  # * or a Hash like object (responding to to_hash),
-  # * an object convertible into a hash by a to_h method,
-  # that is used as or to configure a State object.
-  #
-  # It defaults to a state object, that creates the shortest possible JSON text
-  # in one line, checks for circular data structures and doesn't allow NaN,
-  # Infinity, and -Infinity.
-  #
-  # A _state_ hash can have the following keys:
-  # * *indent*: a string used to indent levels (default: ''),
-  # * *space*: a string that is put after, a : or , delimiter (default: ''),
-  # * *space_before*: a string that is put before a : pair delimiter (default: ''),
-  # * *object_nl*: a string that is put at the end of a JSON object (default: ''), 
-  # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
-  # * *check_circular*: true if checking for circular data structures
-  #   should be done (the default), false otherwise.
-  # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
-  #   generated, otherwise an exception is thrown, if these values are
-  #   encountered. This options defaults to false.
-  # * *max_nesting*: The maximum depth of nesting allowed in the data
-  #   structures from which JSON is to be generated. Disable depth checking
-  #   with :max_nesting => false, it defaults to 19.
-  #
-  # See also the fast_generate for the fastest creation method with the least
-  # amount of sanity checks, and the pretty_generate method for some
-  # defaults for a pretty output.
-  def generate(obj, state = nil)
-    if state
-      state = State.from_state(state)
-    else
-      state = State.new
-    end
-    obj.to_json(state)
-  end
-
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
-  alias unparse generate
-  module_function :unparse
-  # :startdoc:
-
-  # Unparse the Ruby data structure _obj_ into a single line JSON string and
-  # return it. This method disables the checks for circles in Ruby objects, and
-  # also generates NaN, Infinity, and, -Infinity float values.
-  #
-  # *WARNING*: Be careful not to pass any Ruby data structures with circles as
-  # _obj_ argument, because this will cause JSON to go into an infinite loop.
-  def fast_generate(obj)
-    obj.to_json(nil)
-  end
-
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
-  alias fast_unparse fast_generate
-  module_function :fast_unparse
-  # :startdoc:
-
-  # Unparse the Ruby data structure _obj_ into a JSON string and return it. The
-  # returned string is a prettier form of the string returned by #unparse.
-  #
-  # The _opts_ argument can be used to configure the generator, see the
-  # generate method for a more detailed explanation.
-  def pretty_generate(obj, opts = nil)
-    state = JSON.state.new(
-      :indent     => '  ',
-      :space      => ' ',
-      :object_nl  => "\n",
-      :array_nl   => "\n",
-      :check_circular => true
-    )
-    if opts
-      if opts.respond_to? :to_hash
-        opts = opts.to_hash
-      elsif opts.respond_to? :to_h
-        opts = opts.to_h
-      else
-        raise TypeError, "can't convert #{opts.class} into Hash"
-      end
-      state.configure(opts)
-    end
-    obj.to_json(state)
-  end
-
-  # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
-  alias pretty_unparse pretty_generate
-  module_function :pretty_unparse
-  # :startdoc:
-
-  # Load a ruby data structure from a JSON _source_ and return it. A source can
-  # either be a string like object, an IO like object, or an object responding
-  # to the read method. If _proc_ was given, it will be called with any nested
-  # Ruby object as an argument recursively in depth first order.
-  #
-  # This method is part of the implementation of the load/dump interface of
-  # Marshal and YAML.
-  def load(source, proc = nil)
-    if source.respond_to? :to_str
-      source = source.to_str
-    elsif source.respond_to? :to_io
-      source = source.to_io.read
-    else
-      source = source.read
-    end
-    result = parse(source, :max_nesting => false, :allow_nan => true)
-    recurse_proc(result, &proc) if proc
-    result
-  end
-
-  def recurse_proc(result, &proc)
-    case result
-    when Array
-      result.each { |x| recurse_proc x, &proc }
-      proc.call result
-    when Hash
-      result.each { |x, y| recurse_proc x, &proc; recurse_proc y, &proc }
-      proc.call result
-    else
-      proc.call result
-    end
-  end
-  private :recurse_proc
-  module_function :recurse_proc
-
-  alias restore load
-  module_function :restore
-
-  # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
-  # the result.
-  #
-  # If anIO (an IO like object or an object that responds to the write method)
-  # was given, the resulting JSON is written to it.
-  #
-  # If the number of nested arrays or objects exceeds _limit_ an ArgumentError
-  # exception is raised. This argument is similar (but not exactly the
-  # same!) to the _limit_ argument in Marshal.dump.
-  #
-  # This method is part of the implementation of the load/dump interface of
-  # Marshal and YAML.
-  def dump(obj, anIO = nil, limit = nil)
-    if anIO and limit.nil?
-      anIO = anIO.to_io if anIO.respond_to?(:to_io)
-      unless anIO.respond_to?(:write)
-        limit = anIO
-        anIO = nil
-      end
-    end
-    limit ||= 0
-    result = generate(obj, :allow_nan => true, :max_nesting => limit)
-    if anIO
-      anIO.write result
-      anIO
-    else
-      result
-    end
-  rescue JSON::NestingError
-    raise ArgumentError, "exceed depth limit"
-  end
-end
-
-module ::Kernel
-  # Outputs _objs_ to STDOUT as JSON strings in the shortest form, that is in
-  # one line.
-  def j(*objs)
-    objs.each do |obj|
-      puts JSON::generate(obj, :allow_nan => true, :max_nesting => false)
-    end
-    nil
-  end
-
-  # Ouputs _objs_ to STDOUT as JSON strings in a pretty format, with
-  # indentation and over many lines.
-  def jj(*objs)
-    objs.each do |obj|
-      puts JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)
-    end
-    nil
-  end
-
-  # If _object_ is string like parse the string and return the parsed result as
-  # a Ruby data structure. Otherwise generate a JSON text from the Ruby data
-  # structure object and return it.
-  #
-  # The _opts_ argument is passed through to generate/parse respectively, see
-  # generate and parse for their documentation.
-  def JSON(object, opts = {})
-    if object.respond_to? :to_str
-      JSON.parse(object.to_str, opts)
-    else
-      JSON.generate(object, opts)
-    end
-  end
-end
-
-class ::Class
-  # Returns true, if this class can be used to create an instance
-  # from a serialised JSON string. The class has to implement a class
-  # method _json_create_ that expects a hash as first parameter, which includes
-  # the required data.
-  def json_creatable?
-    respond_to?(:json_create)
-  end
-end
-  # vim: set et sw=2 ts=2:
diff --git a/ext/json/lib/json/editor.rb b/ext/json/lib/json/editor.rb
deleted file mode 100644
index 9a65400622..0000000000
--- a/ext/json/lib/json/editor.rb
+++ /dev/null
@@ -1,1363 +0,0 @@
-# To use the GUI JSON editor, start the edit_json.rb executable script. It
-# requires ruby-gtk to be installed.
-
-require 'gtk2'
-require 'iconv'
-require 'json'
-require 'rbconfig'
-require 'open-uri'
-
-module JSON
-  module Editor
-    include Gtk
-
-    # Beginning of the editor window title
-    TITLE                 = 'JSON Editor'.freeze
-
-    # Columns constants
-    ICON_COL, TYPE_COL, CONTENT_COL = 0, 1, 2
-
-    # JSON primitive types (Containers)
-    CONTAINER_TYPES = %w[Array Hash].sort
-    # All JSON primitive types
-    ALL_TYPES = (%w[TrueClass FalseClass Numeric String NilClass] +
-                 CONTAINER_TYPES).sort
-
-    # The Nodes necessary for the tree representation of a JSON document
-    ALL_NODES = (ALL_TYPES + %w[Key]).sort
-
-    DEFAULT_DIALOG_KEY_PRESS_HANDLER = lambda do |dialog, event|
-      case event.keyval
-      when Gdk::Keyval::GDK_Return
-        dialog.response Dialog::RESPONSE_ACCEPT
-      when Gdk::Keyval::GDK_Escape
-        dialog.response Dialog::RESPONSE_REJECT
-      end
-    end
-
-    # Returns the Gdk::Pixbuf of the icon named _name_ from the icon cache.
-    def Editor.fetch_icon(name)
-      @icon_cache ||= {}
-      unless @icon_cache.key?(name)
-        path = File.dirname(__FILE__)
-        @icon_cache[name] = Gdk::Pixbuf.new(File.join(path, name + '.xpm'))
-      end
-     @icon_cache[name]
-    end
-
-    # Opens an error dialog on top of _window_ showing the error message
-    # _text_.
-    def Editor.error_dialog(window, text)
-      dialog = MessageDialog.new(window, Dialog::MODAL, 
-        MessageDialog::ERROR, 
-        MessageDialog::BUTTONS_CLOSE, text)
-      dialog.show_all
-      dialog.run
-    rescue TypeError
-      dialog = MessageDialog.new(Editor.window, Dialog::MODAL, 
-        MessageDialog::ERROR, 
-        MessageDialog::BUTTONS_CLOSE, text)
-      dialog.show_all
-      dialog.run
-    ensure
-      dialog.destroy if dialog
-    end
-
-    # Opens a yes/no question dialog on top of _window_ showing the error
-    # message _text_. If yes was answered _true_ is returned, otherwise
-    # _false_.
-    def Editor.question_dialog(window, text)
-      dialog = MessageDialog.new(window, Dialog::MODAL, 
-        MessageDialog::QUESTION, 
-        MessageDialog::BUTTONS_YES_NO, text)
-      dialog.show_all
-      dialog.run do |response|
-        return Gtk::Dialog::RESPONSE_YES === response
-      end
-    ensure
-      dialog.destroy if dialog
-    end
-
-    # Convert the tree model starting from Gtk::TreeIter _iter_ into a Ruby
-    # data structure and return it.
-    def Editor.model2data(iter)
-      return nil if iter.nil?
-      case iter.type
-      when 'Hash'
-        hash = {}
-        iter.each { |c| hash[c.content] = Editor.model2data(c.first_child) }
-        hash
-      when 'Array'
-        array = Array.new(iter.n_children)
-        iter.each_with_index { |c, i| array[i] = Editor.model2data(c) }
-        array
-      when 'Key'
-        iter.content
-      when 'String'
-        iter.content
-      when 'Numeric'
-        content = iter.content
-        if /\./.match(content)
-          content.to_f
-        else
-          content.to_i
-        end
-      when 'TrueClass'
-        true
-      when 'FalseClass'
-        false
-      when 'NilClass'
-        nil
-      else
-        fail "Unknown type found in model: #{iter.type}"
-      end
-    end
-
-    # Convert the Ruby data structure _data_ into tree model data for Gtk and
-    # returns the whole model. If the parameter _model_ wasn't given a new
-    # Gtk::TreeStore is created as the model. The _parent_ parameter specifies
-    # the parent node (iter, Gtk:TreeIter instance) to which the data is
-    # appended, alternativeley the result of the yielded block is used as iter.
-    def Editor.data2model(data, model = nil, parent = nil)
-      model ||= TreeStore.new(Gdk::Pixbuf, String, String)
-      iter = if block_given?
-        yield model
-      else
-        model.append(parent)
-      end
-      case data
-      when Hash
-        iter.type = 'Hash'
-        data.sort.each do |key, value|
-          pair_iter = model.append(iter)
-          pair_iter.type    = 'Key'
-          pair_iter.content = key.to_s
-          Editor.data2model(value, model, pair_iter)
-        end
-      when Array
-        iter.type = 'Array'
-        data.each do |value|
-          Editor.data2model(value, model, iter)
-        end
-      when Numeric
-        iter.type = 'Numeric'
-        iter.content = data.to_s
-      when String, true, false, nil
-        iter.type    = data.class.name
-        iter.content = data.nil? ? 'null' : data.to_s
-      else
-        iter.type    = 'String'
-        iter.content = data.to_s
-      end
-      model
-    end
-
-    # The Gtk::TreeIter class is reopened and some auxiliary methods are added.
-    class Gtk::TreeIter
-      include Enumerable
-
-      # Traverse each of this Gtk::TreeIter instance's children
-      # and yield to them.
-      def each
-        n_children.times { |i| yield nth_child(i) }
-      end
-
-      # Recursively traverse all nodes of this Gtk::TreeIter's subtree
-      # (including self) and yield to them.
-      def recursive_each(&block)
-        yield self
-        each do |i|
-          i.recursive_each(&block)
-        end
-      end
-
-      # Remove the subtree of this Gtk::TreeIter instance from the
-      # model _model_.
-      def remove_subtree(model)
-        while current = first_child
-          model.remove(current)
-        end
-      end
-
-      # Returns the type of this node.
-      def type
-        self[TYPE_COL]
-      end
-
-      # Sets the type of this node to _value_. This implies setting
-      # the respective icon accordingly.
-      def type=(value)
-        self[TYPE_COL] = value
-        self[ICON_COL] = Editor.fetch_icon(value)
-      end
-
-      # Returns the content of this node.
-      def content
-        self[CONTENT_COL]
-      end
-
-      # Sets the content of this node to _value_.
-      def content=(value)
-        self[CONTENT_COL] = value
-      end
-    end
-
-    # This module bundles some method, that can be used to create a menu. It
-    # should be included into the class in question.
-    module MenuExtension
-      include Gtk
-
-      # Creates a Menu, that includes MenuExtension. _treeview_ is the
-      # Gtk::TreeView, on which it operates.
-      def initialize(treeview)
-        @treeview = treeview
-        @menu = Menu.new
-      end
-
-      # Returns the Gtk::TreeView of this menu.
-      attr_reader :treeview
-
-      # Returns the menu.
-      attr_reader :menu
-
-      # Adds a Gtk::SeparatorMenuItem to this instance's #menu.
-      def add_separator
-        menu.append SeparatorMenuItem.new
-      end
-
-      # Adds a Gtk::MenuItem to this instance's #menu. _label_ is the label
-      # string, _klass_ is the item type, and _callback_ is the procedure, that
-      # is called if the _item_ is activated.
-      def add_item(label, keyval = nil, klass = MenuItem, &callback)
-        label = "#{label} (C-#{keyval.chr})" if keyval
-        item = klass.new(label)
-        item.signal_connect(:activate, &callback)
-        if keyval
-          self.signal_connect(:'key-press-event') do |item, event|
-            if event.state & Gdk::Window::ModifierType::CONTROL_MASK != 0 and
-              event.keyval == keyval
-              callback.call item
-            end
-          end
-        end
-        menu.append item
-        item
-      end
-
-      # This method should be implemented in subclasses to create the #menu of
-      # this instance. It has to be called after an instance of this class is
-      # created, to build the menu.
-      def create
-        raise NotImplementedError
-      end
-
-      def method_missing(*a, &b)
-        treeview.__send__(*a, &b)
-      end
-    end
-
-    # This class creates the popup menu, that opens when clicking onto the
-    # treeview.
-    class PopUpMenu
-      include MenuExtension
-
-      # Change the type or content of the selected node.
-      def change_node(item)
-        if current = selection.selected
-          parent = current.parent
-          old_type, old_content = current.type, current.content
-          if ALL_TYPES.include?(old_type)
-            @clipboard_data = Editor.model2data(current)
-            type, content = ask_for_element(parent, current.type,
-              current.content)
-            if type
-              current.type, current.content = type, content
-              current.remove_subtree(model)
-              toplevel.display_status("Changed a node in tree.")
-              window.change
-            end
-          else
-            toplevel.display_status(
-              "Cannot change node of type #{old_type} in tree!")
-          end
-        end
-      end
-
-      # Cut the selected node and its subtree, and save it into the
-      # clipboard.
-      def cut_node(item)
-        if current = selection.selected
-          if current and current.type == 'Key'
-            @clipboard_data = {
-              current.content => Editor.model2data(current.first_child)
-            }
-          else
-            @clipboard_data = Editor.model2data(current)
-          end
-          model.remove(current)
-          window.change
-          toplevel.display_status("Cut a node from tree.")
-        end
-      end
-
-      # Copy the selected node and its subtree, and save it into the
-      # clipboard.
-      def copy_node(item)
-        if current = selection.selected
-          if current and current.type == 'Key'
-            @clipboard_data = {
-              current.content => Editor.model2data(current.first_child)
-            }
-          else
-            @clipboard_data = Editor.model2data(current)
-          end
-          window.change
-          toplevel.display_status("Copied a node from tree.")
-        end
-      end
-
-      # Paste the data in the clipboard into the selected Array or Hash by
-      # appending it.
-      def paste_node_appending(item)
-        if current = selection.selected
-          if @clipboard_data
-            case current.type
-            when 'Array'
-              Editor.data2model(@clipboard_data, model, current)
-              expand_collapse(current)
-            when 'Hash'
-              if @clipboard_data.is_a? Hash
-                parent = current.parent
-                hash = Editor.model2data(current)
-                model.remove(current)
-                hash.update(@clipboard_data)
-                Editor.data2model(hash, model, parent)
-                if parent
-                  expand_collapse(parent)
-                elsif @expanded
-                  expand_all
-                end
-                window.change
-              else
-                toplevel.display_status(
-                  "Cannot paste non-#{current.type} data into '#{current.type}'!")
-              end
-            else
-              toplevel.display_status(
-                "Cannot paste node below '#{current.type}'!")
-            end
-          else
-            toplevel.display_status("Nothing to paste in clipboard!")
-          end
-        else
-            toplevel.display_status("Append a node into the root first!")
-        end
-      end
-
-      # Paste the data in the clipboard into the selected Array inserting it
-      # before the selected element.
-      def paste_node_inserting_before(item)
-        if current = selection.selected
-          if @clipboard_data
-            parent = current.parent or return
-            parent_type = parent.type
-            if parent_type == 'Array'
-              selected_index = parent.each_with_index do |c, i|
-                break i if c == current
-              end
-              Editor.data2model(@clipboard_data, model, parent) do |m|
-                m.insert_before(parent, current)
-              end
-              expand_collapse(current)
-              toplevel.display_status("Inserted an element to " +
-                "'#{parent_type}' before index #{selected_index}.")
-              window.change
-            else
-              toplevel.display_status(
-                "Cannot insert node below '#{parent_type}'!")
-            end
-          else
-            toplevel.display_status("Nothing to paste in clipboard!")
-          end
-        else
-            toplevel.display_status("Append a node into the root first!")
-        end
-      end
-
-      # Append a new node to the selected Hash or Array.
-      def append_new_node(item)
-        if parent = selection.selected
-          parent_type = parent.type
-          case parent_type
-          when 'Hash'
-            key, type, content = ask_for_hash_pair(parent)
-            key or return
-            iter = create_node(parent, 'Key', key)
-            iter = create_node(iter, type, content)
-            toplevel.display_status(
-              "Added a (key, value)-pair to '#{parent_type}'.")
-            window.change
-          when 'Array'
-            type, content = ask_for_element(parent)
-            type or return
-            iter = create_node(parent, type, content)
-            window.change
-            toplevel.display_status("Appendend an element to '#{parent_type}'.")
-          else
-            toplevel.display_status("Cannot append to '#{parent_type}'!")
-          end
-        else
-          type, content = ask_for_element
-          type or return
-          iter = create_node(nil, type, content)
-          window.change
-        end
-      end
-
-      # Insert a new node into an Array before the selected element.
-      def insert_new_node(item)
-        if current = selection.selected
-          parent = current.parent or return
-          parent_parent = parent.parent
-          parent_type = parent.type
-          if parent_type == 'Array'
-            selected_index = parent.each_with_index do |c, i|
-              break i if c == current
-            end
-            type, content = ask_for_element(parent)
-            type or return
-            iter = model.insert_before(parent, current)
-            iter.type, iter.content = type, content
-            toplevel.display_status("Inserted an element to " +
-              "'#{parent_type}' before index #{selected_index}.")
-            window.change
-          else
-            toplevel.display_status(
-              "Cannot insert node below '#{parent_type}'!")
-          end
-        else
-            toplevel.display_status("Append a node into the root first!")
-        end
-      end
-
-      # Recursively collapse/expand a subtree starting from the selected node.
-      def collapse_expand(item)
-        if current = selection.selected
-          if row_expanded?(current.path)
-            collapse_row(current.path)
-          else
-            expand_row(current.path, true)
-          end
-        else
-            toplevel.display_status("Append a node into the root first!")
-        end
-      end
-
-      # Create the menu.
-      def create
-        add_item("Change node", ?n, &method(:change_node))
-        add_separator
-        add_item("Cut node", ?X, &method(:cut_node))
-        add_item("Copy node", ?C, &method(:copy_node))
-        add_item("Paste node (appending)", ?A, &method(:paste_node_appending))
-        add_item("Paste node (inserting before)", ?I,
-          &method(:paste_node_inserting_before))
-        add_separator
-        add_item("Append new node", ?a, &method(:append_new_node))
-        add_item("Insert new node before", ?i, &method(:insert_new_node))
-        add_separator 
-        add_item("Collapse/Expand node (recursively)", ?e,
-          &method(:collapse_expand))
-
-        menu.show_all
-        signal_connect(:button_press_event) do |widget, event|
-          if event.kind_of? Gdk::EventButton and event.button == 3
-            menu.popup(nil, nil, event.button, event.time)
-          end
-        end
-        signal_connect(:popup_menu) do
-          menu.popup(nil, nil, 0, Gdk::Event::CURRENT_TIME)
-        end
-      end
-    end
-
-    # This class creates the File pulldown menu.
-    class FileMenu
-      include MenuExtension
-
-      # Clear the model and filename, but ask to save the JSON document, if
-      # unsaved changes have occured.
-      def new(item)
-        window.clear
-      end
-
-      # Open a file and load it into the editor. Ask to save the JSON document
-      # first, if unsaved changes have occured.
-      def open(item)
-        window.file_open
-      end
-
-      def open_location(item)
-        window.location_open
-      end
-
-      # Revert the current JSON document in the editor to the saved version.
-      def revert(item)
-        window.instance_eval do
-          @filename and file_open(@filename) 
-        end
-      end
-
-      # Save the current JSON document.
-      def save(item)
-        window.file_save
-      end
-
-      # Save the current JSON document under the given filename.
-      def save_as(item)
-        window.file_save_as
-      end
-
-      # Quit the editor, after asking to save any unsaved changes first.
-      def quit(item)
-        window.quit
-      end
-
-      # Create the menu.
-      def create
-        title = MenuItem.new('File')
-        title.submenu = menu
-        add_item('New', &method(:new))
-        add_item('Open', ?o, &method(:open))
-        add_item('Open location', ?l, &method(:open_location))
-        add_item('Revert', &method(:revert))
-        add_separator
-        add_item('Save', ?s, &method(:save))
-        add_item('Save As', ?S, &method(:save_as))
-        add_separator
-        add_item('Quit', ?q, &method(:quit))
-        title
-      end
-    end
-
-    # This class creates the Edit pulldown menu.
-    class EditMenu
-      include MenuExtension
-
-      # Copy data from model into primary clipboard.
-      def copy(item)
-        data = Editor.model2data(model.iter_first)
-        json = JSON.pretty_generate(data, :max_nesting => false)
-        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
-        c.text = json
-      end
-
-      # Copy json text from primary clipboard into model.
-      def paste(item)
-        c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
-        if json = c.wait_for_text
-          window.ask_save if @changed
-          begin
-            window.edit json
-          rescue JSON::ParserError
-            window.clear
-          end
-        end
-      end
-
-      # Find a string in all nodes' contents and select the found node in the
-      # treeview.
-      def find(item)
-        @search = ask_for_find_term(@search) or return
-        iter = model.get_iter('0') or return
-        iter.recursive_each do |i|
-          if @iter
-            if @iter != i
-              next
-            else
-              @iter = nil
-              next
-            end
-          elsif @search.match(i[CONTENT_COL])
-             set_cursor(i.path, nil, false)
-             @iter = i
-             break
-          end
-        end
-      end
-
-      # Repeat the last search given by #find.
-      def find_again(item)
-        @search or return
-        iter = model.get_iter('0')
-        iter.recursive_each do |i|
-          if @iter
-            if @iter != i
-              next
-            else
-              @iter = nil
-              next
-            end
-          elsif @search.match(i[CONTENT_COL])
-             set_cursor(i.path, nil, false)
-             @iter = i
-             break
-          end
-        end
-      end
-
-      # Sort (Reverse sort) all elements of the selected array by the given
-      # expression. _x_ is the element in question.
-      def sort(item)
-        if current = selection.selected
-          if current.type == 'Array'
-            parent = current.parent
-            ary = Editor.model2data(current)
-            order, reverse = ask_for_order
-            order or return
-            begin
-              block = eval "lambda { |x| #{order} }"
-              if reverse
-                ary.sort! { |a,b| block[b] <=> block[a] }
-              else
-                ary.sort! { |a,b| block[a] <=> block[b] }
-              end
-            rescue => e
-              Editor.error_dialog(self, "Failed to sort Array with #{order}: #{e}!")
-            else
-              Editor.data2model(ary, model, parent) do |m|
-                m.insert_before(parent, current)
-              end
-              model.remove(current)
-              expand_collapse(parent)
-              window.change
-              toplevel.display_status("Array has been sorted.")
-            end
-          else
-            toplevel.display_status("Only Array nodes can be sorted!")
-          end
-        else
-            toplevel.display_status("Select an Array to sort first!")
-        end
-      end
-
-      # Create the menu.
-      def create
-        title = MenuItem.new('Edit')
-        title.submenu = menu
-        add_item('Copy', ?c, &method(:copy))
-        add_item('Paste', ?v, &method(:paste))
-        add_separator
-        add_item('Find', ?f, &method(:find))
-        add_item('Find Again', ?g, &method(:find_again))
-        add_separator
-        add_item('Sort', ?S, &method(:sort))
-        title
-      end
-    end
-
-    class OptionsMenu
-      include MenuExtension
-
-      # Collapse/Expand all nodes by default.
-      def collapsed_nodes(item)
-        if expanded
-          self.expanded = false
-          collapse_all
-        else
-          self.expanded = true
-          expand_all 
-        end
-      end
-
-      # Toggle pretty saving mode on/off.
-      def pretty_saving(item)
-        @pretty_item.toggled
-        window.change
-      end
-
-      attr_reader :pretty_item
-
-      # Create the menu.
-      def create
-        title = MenuItem.new('Options')
-        title.submenu = menu
-        add_item('Collapsed nodes', nil, CheckMenuItem, &method(:collapsed_nodes))
-        @pretty_item = add_item('Pretty saving', nil, CheckMenuItem,
-          &method(:pretty_saving))
-        @pretty_item.active = true
-        window.unchange
-        title
-      end
-    end
-
-    # This class inherits from Gtk::TreeView, to configure it and to add a lot
-    # of behaviour to it.
-    class JSONTreeView < Gtk::TreeView
-      include Gtk
-
-      # Creates a JSONTreeView instance, the parameter _window_ is
-      # a MainWindow instance and used for self delegation.
-      def initialize(window)
-        @window = window
-        super(TreeStore.new(Gdk::Pixbuf, String, String))
-        self.selection.mode = SELECTION_BROWSE
-
-        @expanded = false
-        self.headers_visible = false
-        add_columns
-        add_popup_menu
-      end
-
-      # Returns the MainWindow instance of this JSONTreeView.
-      attr_reader :window
-
-      # Returns true, if nodes are autoexpanding, false otherwise.
-      attr_accessor :expanded
-
-      private
-
-      def add_columns
-        cell = CellRendererPixbuf.new
-        column = TreeViewColumn.new('Icon', cell,
-          'pixbuf'      => ICON_COL
-        )
-        append_column(column)
-
-        cell = CellRendererText.new
-        column = TreeViewColumn.new('Type', cell,
-          'text'      => TYPE_COL
-        )
-        append_column(column)
-
-        cell = CellRendererText.new
-        cell.editable = true
-        column = TreeViewColumn.new('Content', cell,
-          'text'       => CONTENT_COL
-        )
-        cell.signal_connect(:edited, &method(:cell_edited))
-        append_column(column)
-      end
-
-      def unify_key(iter, key)
-        return unless iter.type == 'Key'
-        parent = iter.parent
-        if parent.any? { |c| c != iter and c.content == key }
-          old_key = key
-          i = 0
-          begin
-            key = sprintf("%s.%d", old_key, i += 1)
-          end while parent.any? { |c| c != iter and c.content == key }
-        end
-        iter.content = key
-      end
-
-      def cell_edited(cell, path, value)
-        iter = model.get_iter(path)
-        case iter.type
-        when 'Key'
-          unify_key(iter, value)
-          toplevel.display_status('Key has been changed.')
-        when 'FalseClass'
-          value.downcase!
-          if value == 'true'
-            iter.type, iter.content = 'TrueClass', 'true'
-          end
-        when 'TrueClass'
-          value.downcase!
-          if value == 'false'
-            iter.type, iter.content = 'FalseClass', 'false'
-          end
-        when 'Numeric'
-          iter.content = (Integer(value) rescue Float(value) rescue 0).to_s
-        when 'String'
-          iter.content = value
-        when 'Hash', 'Array'
-          return
-        else
-          fail "Unknown type found in model: #{iter.type}"
-        end
-        window.change
-      end
-
-      def configure_value(value, type)
-        value.editable = false
-        case type
-        when 'Array', 'Hash'
-          value.text = ''
-        when 'TrueClass'
-          value.text = 'true'
-        when 'FalseClass'
-          value.text = 'false'
-        when 'NilClass'
-          value.text = 'null'
-        when 'Numeric', 'String'
-          value.text ||= ''
-          value.editable = true
-        else
-          raise ArgumentError, "unknown type '#{type}' encountered"
-        end
-      end
-
-      def add_popup_menu
-        menu = PopUpMenu.new(self)
-        menu.create
-      end
-
-      public
-
-      # Create a _type_ node with content _content_, and add it to _parent_
-      # in the model. If _parent_ is nil, create a new model and put it into
-      # the editor treeview.
-      def create_node(parent, type, content)
-        iter = if parent
-          model.append(parent)
-        else
-          new_model = Editor.data2model(nil)
-          toplevel.view_new_model(new_model)
-          new_model.iter_first
-        end
-        iter.type, iter.content = type, content
-        expand_collapse(parent) if parent
-        iter
-      end
-
-      # Ask for a hash key, value pair to be added to the Hash node _parent_.
-      def ask_for_hash_pair(parent)
-        key_input = type_input = value_input = nil
-
-        dialog = Dialog.new("New (key, value) pair for Hash", nil, nil,
-          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
-          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
-        )
-        dialog.width_request = 640
-
-        hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Key:"), false)
-        hbox.pack_start(key_input = Entry.new)
-        key_input.text = @key || ''
-        dialog.vbox.pack_start(hbox, false)
-        key_input.signal_connect(:activate) do
-          if parent.any? { |c| c.content == key_input.text }
-            toplevel.display_status('Key already exists in Hash!')
-            key_input.text = ''
-          else
-            toplevel.display_status('Key has been changed.')
-          end
-        end
-
-        hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Type:"), false)
-        hbox.pack_start(type_input = ComboBox.new(true))
-        ALL_TYPES.each { |t| type_input.append_text(t) }
-        type_input.active = @type || 0
-        dialog.vbox.pack_start(hbox, false)
-
-        type_input.signal_connect(:changed) do
-          value_input.editable = false
-          case ALL_TYPES[type_input.active]
-          when 'Array', 'Hash'
-            value_input.text = ''
-          when 'TrueClass'
-            value_input.text = 'true'
-          when 'FalseClass'
-            value_input.text = 'false'
-          when 'NilClass'
-            value_input.text = 'null'
-          else
-            value_input.text = ''
-            value_input.editable = true
-          end
-        end
-
-        hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Value:"), false)
-        hbox.pack_start(value_input = Entry.new)
-        value_input.width_chars = 60
-        value_input.text = @value || ''
-        dialog.vbox.pack_start(hbox, false)
-
-        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
-        dialog.show_all
-        self.focus = dialog
-        dialog.run do |response| 
-          if response == Dialog::RESPONSE_ACCEPT
-            @key = key_input.text
-            type = ALL_TYPES[@type = type_input.active]
-            content = value_input.text
-            return @key, type, content
-          end
-        end
-        return
-      ensure
-        dialog.destroy
-      end
-
-      # Ask for an element to be appended _parent_.
-      def ask_for_element(parent = nil, default_type = nil, value_text = @content)
-        type_input = value_input = nil
-
-        dialog = Dialog.new(
-          "New element into #{parent ? parent.type : 'root'}",
-          nil, nil,
-          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
-          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
-        )
-        hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Type:"), false)
-        hbox.pack_start(type_input = ComboBox.new(true))
-        default_active = 0
-        types = parent ? ALL_TYPES : CONTAINER_TYPES
-        types.each_with_index do |t, i|
-          type_input.append_text(t)
-          if t == default_type
-            default_active = i
-          end
-        end
-        type_input.active = default_active
-        dialog.vbox.pack_start(hbox, false)
-        type_input.signal_connect(:changed) do
-          configure_value(value_input, types[type_input.active])
-        end
-
-        hbox = HBox.new(false, 5)
-        hbox.pack_start(Label.new("Value:"), false)
-        hbox.pack_start(value_input = Entry.new)
-        value_input.width_chars = 60
-        value_input.text = value_text if value_text
-        configure_value(value_input, types[type_input.active])
-
-        dialog.vbox.pack_start(hbox, false)
-
-        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
-        dialog.show_all
-        self.focus = dialog
-        dialog.run do |response| 
-          if response == Dialog::RESPONSE_ACCEPT
-            type = types[type_input.active]
-            @content = case type
-            when 'Numeric'
-              Integer(value_input.text) rescue Float(value_input.text) rescue 0
-            else
-              value_input.text
-            end.to_s
-            return type, @content
-          end
-        end
-        return
-      ensure
-        dialog.destroy if dialog
-      end
-
-      # Ask for an order criteria for sorting, using _x_ for the element in
-      # question. Returns the order criterium, and true/false for reverse
-      # sorting.
-      def ask_for_order
-        dialog = Dialog.new(
-          "Give an order criterium for 'x'.",
-          nil, nil,
-          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
-          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
-        )
-        hbox = HBox.new(false, 5)
-
-        hbox.pack_start(Label.new("Order:"), false)
-        hbox.pack_start(order_input = Entry.new)
-        order_input.text = @order || 'x'
-        order_input.width_chars = 60
-
-        hbox.pack_start(reverse_checkbox = CheckButton.new('Reverse'), false)
-
-        dialog.vbox.pack_start(hbox, false)
-
-        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
-        dialog.show_all
-        self.focus = dialog
-        dialog.run do |response| 
-          if response == Dialog::RESPONSE_ACCEPT
-            return @order = order_input.text, reverse_checkbox.active?
-          end
-        end
-        return
-      ensure
-        dialog.destroy if dialog
-      end
-
-      # Ask for a find term to search for in the tree. Returns the term as a
-      # string.
-      def ask_for_find_term(search = nil)
-        dialog = Dialog.new(
-          "Find a node matching regex in tree.",
-          nil, nil,
-          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
-          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
-        )
-        hbox = HBox.new(false, 5)
-
-        hbox.pack_start(Label.new("Regex:"), false)
-        hbox.pack_start(regex_input = Entry.new)
-        hbox.pack_start(icase_checkbox = CheckButton.new('Icase'), false)
-        regex_input.width_chars = 60
-        if search
-          regex_input.text = search.source
-          icase_checkbox.active = search.casefold?
-        end
-
-        dialog.vbox.pack_start(hbox, false)
-
-        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
-        dialog.show_all
-        self.focus = dialog
-        dialog.run do |response| 
-          if response == Dialog::RESPONSE_ACCEPT
-            begin
-              return Regexp.new(regex_input.text, icase_checkbox.active? ? Regexp::IGNORECASE : 0)
-            rescue => e
-              Editor.error_dialog(self, "Evaluation of regex /#{regex_input.text}/ failed: #{e}!")
-              return
-            end
-          end
-        end
-        return
-      ensure
-        dialog.destroy if dialog
-      end
-
-      # Expand or collapse row pointed to by _iter_ according
-      # to the #expanded attribute.
-      def expand_collapse(iter)
-        if expanded
-          expand_row(iter.path, true)
-        else
-          collapse_row(iter.path)
-        end
-      end
-    end
-
-    # The editor main window
-    class MainWindow < Gtk::Window
-      include Gtk
-
-      def initialize(encoding)
-        @changed  = false
-        @encoding = encoding
-        super(TOPLEVEL)
-        display_title
-        set_default_size(800, 600)
-        signal_connect(:delete_event) { quit }
-
-        vbox = VBox.new(false, 0)
-        add(vbox)
-        #vbox.border_width = 0
-
-        @treeview = JSONTreeView.new(self)
-        @treeview.signal_connect(:'cursor-changed') do
-          display_status('')
-        end
-
-        menu_bar = create_menu_bar
-        vbox.pack_start(menu_bar, false, false, 0)
-
-        sw = ScrolledWindow.new(nil, nil)
-        sw.shadow_type = SHADOW_ETCHED_IN
-        sw.set_policy(POLICY_AUTOMATIC, POLICY_AUTOMATIC)
-        vbox.pack_start(sw, true, true, 0)
-        sw.add(@treeview)
-
-        @status_bar = Statusbar.new
-        vbox.pack_start(@status_bar, false, false, 0)
-
-        @filename ||= nil
-        if @filename
-          data = read_data(@filename)
-          view_new_model Editor.data2model(data)
-        end
-
-        signal_connect(:button_release_event) do |_,event|
-          if event.button == 2
-            c = Gtk::Clipboard.get(Gdk::Selection::PRIMARY)
-            if url = c.wait_for_text
-              location_open url
-            end
-            false
-          else
-            true
-          end
-        end
-      end
-
-      # Creates the menu bar with the pulldown menus and returns it.
-      def create_menu_bar
-        menu_bar = MenuBar.new
-        @file_menu = FileMenu.new(@treeview)
-        menu_bar.append @file_menu.create
-        @edit_menu = EditMenu.new(@treeview)
-        menu_bar.append @edit_menu.create
-        @options_menu = OptionsMenu.new(@treeview)
-        menu_bar.append @options_menu.create
-        menu_bar
-      end
-
-      # Sets editor status to changed, to indicate that the edited data
-      # containts unsaved changes.
-      def change
-        @changed = true
-        display_title
-      end
-
-      # Sets editor status to unchanged, to indicate that the edited data
-      # doesn't containt unsaved changes.
-      def unchange
-        @changed = false
-        display_title
-      end
-
-      # Puts a new model _model_ into the Gtk::TreeView to be edited.
-      def view_new_model(model)
-        @treeview.model     = model
-        @treeview.expanded  = true
-        @treeview.expand_all
-        unchange
-      end
-
-      # Displays _text_ in the status bar.
-      def display_status(text)
-        @cid ||= nil
-        @status_bar.pop(@cid) if @cid
-        @cid = @status_bar.get_context_id('dummy')
-        @status_bar.push(@cid, text)
-      end
-
-      # Opens a dialog, asking, if changes should be saved to a file.
-      def ask_save
-        if Editor.question_dialog(self,
-          "Unsaved changes to JSON model. Save?")
-          if @filename
-            file_save
-          else
-            file_save_as
-          end
-        end
-      end
-
-      # Quit this editor, that is, leave this editor's main loop.
-      def quit
-        ask_save if @changed
-        if Gtk.main_level > 0
-          destroy
-          Gtk.main_quit
-        end
-        nil
-      end
-
-      # Display the new title according to the editor's current state.
-      def display_title
-        title = TITLE.dup
-        title << ": #@filename" if @filename
-        title << " *" if @changed
-        self.title = title
-      end
-
-      # Clear the current model, after asking to save all unsaved changes.
-      def clear
-        ask_save if @changed
-        @filename = nil
-        self.view_new_model nil
-      end
-
-      def check_pretty_printed(json)
-        pretty = !!((nl_index = json.index("\n")) && nl_index != json.size - 1)
-        @options_menu.pretty_item.active = pretty
-      end
-      private :check_pretty_printed
-
-      # Open the data at the location _uri_, if given. Otherwise open a dialog
-      # to ask for the _uri_.
-      def location_open(uri = nil)
-        uri = ask_for_location unless uri
-        uri or return
-        ask_save if @changed
-        data = load_location(uri) or return
-        view_new_model Editor.data2model(data)
-      end
-
-      # Open the file _filename_ or call the #select_file method to ask for a
-      # filename.
-      def file_open(filename = nil)
-        filename = select_file('Open as a JSON file') unless filename
-        data = load_file(filename) or return
-        view_new_model Editor.data2model(data)
-      end
-
-      # Edit the string _json_ in the editor.
-      def edit(json)
-        if json.respond_to? :read
-          json = json.read
-        end
-        data = parse_json json
-        view_new_model Editor.data2model(data)
-      end
-
-      # Save the current file.
-      def file_save
-        if @filename
-          store_file(@filename)
-        else
-          file_save_as
-        end
-      end
-
-      # Save the current file as the filename 
-      def file_save_as
-        filename = select_file('Save as a JSON file')
-        store_file(filename)
-      end
-
-      # Store the current JSON document to _path_.
-      def store_file(path)
-        if path
-          data = Editor.model2data(@treeview.model.iter_first)
-          File.open(path + '.tmp', 'wb') do |output|
-            data or break
-            if @options_menu.pretty_item.active?
-              output.puts JSON.pretty_generate(data, :max_nesting => false)
-            else
-              output.write JSON.generate(data, :max_nesting => false)
-            end
-          end
-          File.rename path + '.tmp', path
-          @filename = path
-          toplevel.display_status("Saved data to '#@filename'.")
-          unchange
-        end
-      rescue SystemCallError => e
-        Editor.error_dialog(self, "Failed to store JSON file: #{e}!")
-      end
-  
-      # Load the file named _filename_ into the editor as a JSON document.
-      def load_file(filename)
-        if filename
-          if File.directory?(filename)
-            Editor.error_dialog(self, "Try to select a JSON file!")
-            nil
-          else
-            @filename = filename
-            if data = read_data(filename)
-              toplevel.display_status("Loaded data from '#@filename'.")
-            end
-            display_title
-            data
-          end
-        end
-      end
-
-      # Load the data at location _uri_ into the editor as a JSON document.
-      def load_location(uri)
-        data = read_data(uri) or return
-        @filename = nil
-        toplevel.display_status("Loaded data from '#{uri}'.")
-        display_title
-        data
-      end
-
-      def parse_json(json)
-        check_pretty_printed(json)
-        if @encoding && !/^utf8$/i.match(@encoding)
-          iconverter = Iconv.new('utf8', @encoding)
-          json = iconverter.iconv(json)
-        end
-        JSON::parse(json, :max_nesting => false, :create_additions => false)
-      end
-      private :parse_json
-
-      # Read a JSON document from the file named _filename_, parse it into a
-      # ruby data structure, and return the data.
-      def read_data(filename)
-        open(filename) do |f|
-          json = f.read
-          return parse_json(json)
-        end
-      rescue => e
-        Editor.error_dialog(self, "Failed to parse JSON file: #{e}!")
-        return
-      end
-
-      # Open a file selecton dialog, displaying _message_, and return the
-      # selected filename or nil, if no file was selected.
-      def select_file(message)
-        filename = nil
-        fs = FileSelection.new(message)
-        fs.set_modal(true)
-        @default_dir = File.join(Dir.pwd, '') unless @default_dir
-        fs.set_filename(@default_dir)
-        fs.set_transient_for(self)
-        fs.signal_connect(:destroy) { Gtk.main_quit }
-        fs.ok_button.signal_connect(:clicked) do
-          filename = fs.filename
-          @default_dir = File.join(File.dirname(filename), '')
-          fs.destroy
-          Gtk.main_quit
-        end
-        fs.cancel_button.signal_connect(:clicked) do
-          fs.destroy
-          Gtk.main_quit
-        end
-        fs.show_all
-        Gtk.main
-        filename
-      end
-
-      # Ask for location URI a to load data from. Returns the URI as a string.
-      def ask_for_location
-        dialog = Dialog.new(
-          "Load data from location...",
-          nil, nil,
-          [ Stock::OK, Dialog::RESPONSE_ACCEPT ],
-          [ Stock::CANCEL, Dialog::RESPONSE_REJECT ]
-        )
-        hbox = HBox.new(false, 5)
-
-        hbox.pack_start(Label.new("Location:"), false)
-        hbox.pack_start(location_input = Entry.new)
-        location_input.width_chars = 60
-        location_input.text = @location || ''
-
-        dialog.vbox.pack_start(hbox, false)
-
-        dialog.signal_connect(:'key-press-event', &DEFAULT_DIALOG_KEY_PRESS_HANDLER)
-        dialog.show_all
-        dialog.run do |response| 
-          if response == Dialog::RESPONSE_ACCEPT
-            return @location = location_input.text
-          end
-        end
-        return
-      ensure
-        dialog.destroy if dialog
-      end
-    end
-
-    class << self
-      # Starts a JSON Editor. If a block was given, it yields
-      # to the JSON::Editor::MainWindow instance.
-      def start(encoding = 'utf8') # :yield: window
-        Gtk.init
-        @window = Editor::MainWindow.new(encoding)
-        @window.icon_list = [ Editor.fetch_icon('json') ]
-        yield @window if block_given?
-        @window.show_all
-        Gtk.main
-      end
-
-      # Edit the string _json_ with encoding _encoding_ in the editor.
-      def edit(json, encoding = 'utf8')
-        start(encoding) do |window|
-          window.edit json
-        end
-      end
-
-      attr_reader :window
-    end
-  end
-end
-  # vim: set et sw=2 ts=2:
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
deleted file mode 100644
index ff4fa42329..0000000000
--- a/ext/json/lib/json/ext.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'json/common'
-
-module JSON
-  # This module holds all the modules/classes that implement JSON's
-  # functionality as C extensions.
-  module Ext
-    require 'json/ext/parser'
-    require 'json/ext/generator'
-    $DEBUG and warn "Using c extension for JSON."
-    JSON.parser = Parser
-    JSON.generator = Generator
-  end
-end
diff --git a/ext/json/lib/json/json.xpm b/ext/json/lib/json/json.xpm
deleted file mode 100644
index 2cb626bb05..0000000000
--- a/ext/json/lib/json/json.xpm
+++ /dev/null
@@ -1,1499 +0,0 @@
-/* XPM */
-static char * json_xpm[] = {
-"64 64 1432 2",
-"  	c None",
-". 	c #641839",
-"+ 	c #CF163C",
-"@ 	c #D31C3B",
-"# 	c #E11A38",
-"$ 	c #5F242D",
-"% 	c #320C22",
-"& 	c #9B532D",
-"* 	c #F32E34",
-"= 	c #820F33",
-"- 	c #4B0F34",
-"; 	c #8E1237",
-"> 	c #944029",
-", 	c #961325",
-"' 	c #A00C24",
-") 	c #872C23",
-"! 	c #694021",
-"~ 	c #590D1F",
-"{ 	c #420528",
-"] 	c #D85A2D",
-"^ 	c #7E092B",
-"/ 	c #0E0925",
-"( 	c #0D081F",
-"_ 	c #0F081E",
-": 	c #12071F",
-"< 	c #360620",
-"[ 	c #682A21",
-"} 	c #673F21",
-"| 	c #780E21",
-"1 	c #A82320",
-"2 	c #8D1D1F",
-"3 	c #970127",
-"4 	c #0D0123",
-"5 	c #0D0324",
-"6 	c #3B1E28",
-"7 	c #C28429",
-"8 	c #0C0523",
-"9 	c #0C041E",
-"0 	c #0E031A",
-"a 	c #11031A",
-"b 	c #13031B",
-"c 	c #13031C",
-"d 	c #11031D",
-"e 	c #19051E",
-"f 	c #390E20",
-"g 	c #9C0C20",
-"h 	c #C00721",
-"i 	c #980320",
-"j 	c #14031E",
-"k 	c #CD9F32",
-"l 	c #C29F2E",
-"m 	c #0F0325",
-"n 	c #0D0321",
-"o 	c #0E0324",
-"p 	c #D08329",
-"q 	c #9D1B27",
-"r 	c #1C0320",
-"s 	c #0D011A",
-"t 	c #120117",
-"u 	c #130017",
-"v 	c #150018",
-"w 	c #160119",
-"x 	c #17021A",
-"y 	c #15021B",
-"z 	c #11021E",
-"A 	c #0F021F",
-"B 	c #8C1821",
-"C 	c #CF4522",
-"D 	c #831821",
-"E 	c #BA7033",
-"F 	c #EDB339",
-"G 	c #C89733",
-"H 	c #280727",
-"I 	c #0F051F",
-"J 	c #0E0420",
-"K 	c #591F27",
-"L 	c #E47129",
-"M 	c #612224",
-"N 	c #0C021D",
-"O 	c #120018",
-"P 	c #140017",
-"Q 	c #170017",
-"R 	c #190018",
-"S 	c #1B0019",
-"T 	c #1B011A",
-"U 	c #18011B",
-"V 	c #15011C",
-"W 	c #12031E",
-"X 	c #460A21",
-"Y 	c #A13823",
-"Z 	c #784323",
-"` 	c #5A0C21",
-" .	c #BC4530",
-"..	c #EB5B38",
-"+.	c #CE4E3B",
-"@.	c #DD9334",
-"#.	c #751A27",
-"$.	c #11071E",
-"%.	c #0F041C",
-"&.	c #1E0824",
-"*.	c #955A28",
-"=.	c #9A5027",
-"-.	c #1E0321",
-";.	c #11011A",
-">.	c #140018",
-",.	c #180018",
-"'.	c #1F001A",
-").	c #20001B",
-"!.	c #1E001A",
-"~.	c #1B001A",
-"{.	c #16021B",
-"].	c #16041E",
-"^.	c #220622",
-"/.	c #5F3525",
-"(.	c #DE5724",
-"_.	c #611021",
-":.	c #0F0925",
-"<.	c #D1892E",
-"[.	c #F27036",
-"}.	c #EC633B",
-"|.	c #DA293C",
-"1.	c #E64833",
-"2.	c #912226",
-"3.	c #11081C",
-"4.	c #110419",
-"5.	c #0F041E",
-"6.	c #451425",
-"7.	c #BF6F28",
-"8.	c #332225",
-"9.	c #0E021E",
-"0.	c #13001B",
-"a.	c #17001A",
-"b.	c #1C001B",
-"c.	c #21001C",
-"d.	c #23001C",
-"e.	c #21001B",
-"f.	c #19021A",
-"g.	c #17041E",
-"h.	c #150721",
-"i.	c #602424",
-"j.	c #D51223",
-"k.	c #540820",
-"l.	c #D04D2D",
-"m.	c #EA8933",
-"n.	c #875637",
-"o.	c #88543A",
-"p.	c #E5923A",
-"q.	c #891931",
-"r.	c #130B25",
-"s.	c #10051B",
-"t.	c #110217",
-"u.	c #12021A",
-"v.	c #761826",
-"w.	c #E2A728",
-"x.	c #300224",
-"y.	c #10011E",
-"z.	c #16001B",
-"A.	c #1B001B",
-"B.	c #21001A",
-"C.	c #1E0019",
-"D.	c #1D0019",
-"E.	c #1A011A",
-"F.	c #17031C",
-"G.	c #120720",
-"H.	c #4E0822",
-"I.	c #670721",
-"J.	c #C07630",
-"K.	c #F59734",
-"L.	c #BE1B35",
-"M.	c #0E1435",
-"N.	c #522037",
-"O.	c #DB8039",
-"P.	c #D45933",
-"Q.	c #420927",
-"R.	c #0F041D",
-"S.	c #140118",
-"T.	c #13021D",
-"U.	c #100423",
-"V.	c #7B6227",
-"W.	c #C04326",
-"X.	c #0E0020",
-"Y.	c #13001D",
-"Z.	c #18001B",
-"`.	c #1E001B",
-" +	c #22001C",
-".+	c #22001B",
-"++	c #1B011B",
-"@+	c #16041D",
-"#+	c #130520",
-"$+	c #860521",
-"%+	c #710520",
-"&+	c #670A2A",
-"*+	c #A66431",
-"=+	c #E97536",
-"-+	c #F8833A",
-";+	c #F77A3A",
-">+	c #C45337",
-",+	c #0A1C35",
-"'+	c #993638",
-")+	c #F7863B",
-"!+	c #F49736",
-"~+	c #94462B",
-"{+	c #0E031F",
-"]+	c #130119",
-"^+	c #160018",
-"/+	c #16011B",
-"(+	c #15021F",
-"_+	c #120123",
-":+	c #A65C28",
-"<+	c #5C4D23",
-"[+	c #0F001F",
-"}+	c #14001D",
-"|+	c #1A001B",
-"1+	c #1F001B",
-"2+	c #24001D",
-"3+	c #25001D",
-"4+	c #24001C",
-"5+	c #1F001C",
-"6+	c #1A011C",
-"7+	c #16021E",
-"8+	c #3F0421",
-"9+	c #BC0522",
-"0+	c #1C041E",
-"a+	c #7F5531",
-"b+	c #E68A38",
-"c+	c #F8933E",
-"d+	c #FA7942",
-"e+	c #FB7543",
-"f+	c #FA6F41",
-"g+	c #F1793D",
-"h+	c #7D3B3A",
-"i+	c #28263B",
-"j+	c #D45441",
-"k+	c #F8A238",
-"l+	c #996B2D",
-"m+	c #0E0421",
-"n+	c #12011A",
-"o+	c #180019",
-"p+	c #17001C",
-"q+	c #12001F",
-"r+	c #4C2B2A",
-"s+	c #DB8130",
-"t+	c #540023",
-"u+	c #0F0120",
-"v+	c #16011C",
-"w+	c #22001D",
-"x+	c #25001F",
-"y+	c #26001F",
-"z+	c #25001E",
-"A+	c #24001E",
-"B+	c #1D001C",
-"C+	c #18011D",
-"D+	c #16031F",
-"E+	c #3C0522",
-"F+	c #9B0821",
-"G+	c #13041E",
-"H+	c #F6462E",
-"I+	c #E6AB37",
-"J+	c #E7A03E",
-"K+	c #FA9F44",
-"L+	c #FB8A48",
-"M+	c #FD7A4A",
-"N+	c #FD794A",
-"O+	c #FD7748",
-"P+	c #FD7E45",
-"Q+	c #FD8343",
-"R+	c #FB5D42",
-"S+	c #6E3A40",
-"T+	c #EE8A37",
-"U+	c #7E252B",
-"V+	c #100520",
-"W+	c #13011A",
-"X+	c #170019",
-"Y+	c #15001C",
-"Z+	c #0F0020",
-"`+	c #564427",
-" @	c #E0BA29",
-".@	c #5E2B25",
-"+@	c #10011F",
-"@@	c #17011C",
-"#@	c #1E001D",
-"$@	c #23001F",
-"%@	c #250020",
-"&@	c #24001F",
-"*@	c #23001E",
-"=@	c #21001E",
-"-@	c #1B001C",
-";@	c #17021D",
-">@	c #14041E",
-",@	c #AC0B25",
-"'@	c #5E1420",
-")@	c #F28635",
-"!@	c #C2733E",
-"~@	c #984C44",
-"{@	c #EA9148",
-"]@	c #FB844B",
-"^@	c #FD7E4C",
-"/@	c #FE7E4C",
-"(@	c #FE7E4B",
-"_@	c #FE7749",
-":@	c #FD7148",
-"<@	c #FB7D46",
-"[@	c #F89641",
-"}@	c #B95634",
-"|@	c #0D0927",
-"1@	c #11041D",
-"2@	c #150119",
-"3@	c #180017",
-"4@	c #16001A",
-"5@	c #13001E",
-"6@	c #110023",
-"7@	c #944C29",
-"8@	c #EE6229",
-"9@	c #3D0324",
-"0@	c #12021F",
-"a@	c #19011D",
-"b@	c #21001F",
-"c@	c #22001F",
-"d@	c #20001E",
-"e@	c #1F001D",
-"f@	c #1C001C",
-"g@	c #19011C",
-"h@	c #3D1621",
-"i@	c #B53622",
-"j@	c #31061F",
-"k@	c #841D34",
-"l@	c #F2703F",
-"m@	c #C14445",
-"n@	c #E67349",
-"o@	c #FB8E4B",
-"p@	c #FD834C",
-"q@	c #FE834D",
-"r@	c #FE834C",
-"s@	c #FE804C",
-"t@	c #FD814B",
-"u@	c #FB7D49",
-"v@	c #F79B43",
-"w@	c #AF1234",
-"x@	c #0D0625",
-"y@	c #13021C",
-"z@	c #1A0019",
-"A@	c #190019",
-"B@	c #410225",
-"C@	c #D39729",
-"D@	c #AA5927",
-"E@	c #0E0422",
-"F@	c #15021E",
-"G@	c #1A011D",
-"H@	c #1D001D",
-"I@	c #15031D",
-"J@	c #240820",
-"K@	c #A01023",
-"L@	c #670B21",
-"M@	c #3D0D33",
-"N@	c #E63C3E",
-"O@	c #EF7C45",
-"P@	c #F59048",
-"Q@	c #FB944A",
-"R@	c #FD904A",
-"S@	c #FE8E4B",
-"T@	c #FE854A",
-"U@	c #FE854B",
-"V@	c #FE884C",
-"W@	c #FC954B",
-"X@	c #F8AB45",
-"Y@	c #C37A35",
-"Z@	c #0D0425",
-"`@	c #13011B",
-" #	c #170018",
-".#	c #1A0018",
-"+#	c #1C0019",
-"@#	c #15001B",
-"##	c #100120",
-"$#	c #311F25",
-"%#	c #E68E28",
-"&#	c #7A1425",
-"*#	c #130321",
-"=#	c #17011E",
-"-#	c #1A001D",
-";#	c #19001B",
-">#	c #16021C",
-",#	c #130521",
-"'#	c #6F3123",
-")#	c #6D3022",
-"!#	c #C89433",
-"~#	c #EA7E3E",
-"{#	c #DB2943",
-"]#	c #EF7745",
-"^#	c #FB8544",
-"/#	c #FD9A43",
-"(#	c #FE9941",
-"_#	c #FE9D43",
-":#	c #FEA548",
-"<#	c #FEAE49",
-"[#	c #FCB944",
-"}#	c #CA9F35",
-"|#	c #0E0225",
-"1#	c #11001B",
-"2#	c #160019",
-"3#	c #12011B",
-"4#	c #0F0220",
-"5#	c #351D26",
-"6#	c #D85B28",
-"7#	c #6C0F26",
-"8#	c #190121",
-"9#	c #1B001E",
-"0#	c #1A001C",
-"a#	c #1D001B",
-"b#	c #130220",
-"c#	c #703A23",
-"d#	c #713A23",
-"e#	c #140327",
-"f#	c #411B36",
-"g#	c #C8713E",
-"h#	c #7A3A3F",
-"i#	c #CE2C3C",
-"j#	c #E77338",
-"k#	c #9C6535",
-"l#	c #9C6233",
-"m#	c #9C6332",
-"n#	c #9C6A35",
-"o#	c #C37D3C",
-"p#	c #FEAC41",
-"q#	c #FEC23E",
-"r#	c #826330",
-"s#	c #100122",
-"t#	c #120019",
-"u#	c #150017",
-"v#	c #190017",
-"w#	c #1B0018",
-"x#	c #12001A",
-"y#	c #10021F",
-"z#	c #1A0326",
-"A#	c #5F292A",
-"B#	c #7B4E29",
-"C#	c #3C0E25",
-"D#	c #1A0020",
-"E#	c #14021F",
-"F#	c #723B23",
-"G#	c #14001A",
-"H#	c #58042A",
-"I#	c #A28337",
-"J#	c #C8813B",
-"K#	c #B14B38",
-"L#	c #761231",
-"M#	c #5A132A",
-"N#	c #0D0726",
-"O#	c #0C0623",
-"P#	c #0B0723",
-"Q#	c #0B0A26",
-"R#	c #321C2D",
-"S#	c #C45B33",
-"T#	c #FEBB33",
-"U#	c #13052A",
-"V#	c #13011F",
-"W#	c #160017",
-"X#	c #15001A",
-"Y#	c #12001D",
-"Z#	c #94062A",
-"`#	c #630D2C",
-" $	c #85292B",
-".$	c #AA5E29",
-"+$	c #1F0123",
-"@$	c #19011F",
-"#$	c #1E001C",
-"$$	c #15031F",
-"%$	c #712122",
-"&$	c #712223",
-"*$	c #14011B",
-"=$	c #110321",
-"-$	c #AF0C2B",
-";$	c #E7D534",
-">$	c #EAC934",
-",$	c #84582D",
-"'$	c #1B0824",
-")$	c #11041E",
-"!$	c #10021B",
-"~$	c #100119",
-"{$	c #100218",
-"]$	c #0F041A",
-"^$	c #0E0720",
-"/$	c #2C1026",
-"($	c #D8A328",
-"_$	c #140322",
-":$	c #160016",
-"<$	c #14001F",
-"[$	c #120024",
-"}$	c #100128",
-"|$	c #3C032F",
-"1$	c #2C062E",
-"2$	c #29022B",
-"3$	c #A31D29",
-"4$	c #976A25",
-"5$	c #1A0321",
-"6$	c #17031E",
-"7$	c #1B021D",
-"8$	c #20001C",
-"9$	c #14041F",
-"0$	c #703422",
-"a$	c #6F3522",
-"b$	c #8D0328",
-"c$	c #920329",
-"d$	c #0F0326",
-"e$	c #100321",
-"f$	c #11021B",
-"g$	c #130117",
-"h$	c #140016",
-"i$	c #150015",
-"j$	c #140015",
-"k$	c #130116",
-"l$	c #120219",
-"m$	c #11031C",
-"n$	c #12031D",
-"o$	c #170016",
-"p$	c #160020",
-"q$	c #250029",
-"r$	c #670033",
-"s$	c #DCA238",
-"t$	c #F5C736",
-"u$	c #9A732E",
-"v$	c #110227",
-"w$	c #110324",
-"x$	c #811924",
-"y$	c #A04323",
-"z$	c #250721",
-"A$	c #1A041F",
-"B$	c #1E011D",
-"C$	c #1C011C",
-"D$	c #18031D",
-"E$	c #130721",
-"F$	c #6F3623",
-"G$	c #6B3622",
-"H$	c #1A001A",
-"I$	c #14011F",
-"J$	c #12011E",
-"K$	c #11011C",
-"L$	c #140117",
-"M$	c #170015",
-"N$	c #150016",
-"O$	c #120119",
-"P$	c #11011B",
-"Q$	c #11001A",
-"R$	c #130018",
-"S$	c #170118",
-"T$	c #170119",
-"U$	c #18021E",
-"V$	c #1A0126",
-"W$	c #6F2332",
-"X$	c #E5563B",
-"Y$	c #F1B83F",
-"Z$	c #F6CC38",
-"`$	c #9D7A2D",
-" %	c #130123",
-".%	c #130320",
-"+%	c #2A0721",
-"@%	c #B00E24",
-"#%	c #7D0B23",
-"$%	c #1F0522",
-"%%	c #1E0220",
-"&%	c #1D011E",
-"*%	c #1A031E",
-"=%	c #15051F",
-"-%	c #241322",
-";%	c #A32F23",
-">%	c #670E21",
-",%	c #1C001A",
-"'%	c #19001A",
-")%	c #180016",
-"!%	c #160118",
-"~%	c #140219",
-"{%	c #11021C",
-"]%	c #10021E",
-"^%	c #0F011D",
-"/%	c #170117",
-"(%	c #160219",
-"_%	c #17041D",
-":%	c #190523",
-"<%	c #8C042E",
-"[%	c #B65838",
-"}%	c #E9D73F",
-"|%	c #EED43E",
-"1%	c #D85538",
-"2%	c #493129",
-"3%	c #130120",
-"4%	c #15021D",
-"5%	c #330822",
-"6%	c #8A0825",
-"7%	c #3C0424",
-"8%	c #1E0322",
-"9%	c #1C0321",
-"0%	c #180421",
-"a%	c #130822",
-"b%	c #AF2D24",
-"c%	c #BC5623",
-"d%	c #2F071F",
-"e%	c #1A041C",
-"f%	c #1C031C",
-"g%	c #1D011C",
-"h%	c #160117",
-"i%	c #150419",
-"j%	c #12081D",
-"k%	c #0F0923",
-"l%	c #A77027",
-"m%	c #A60525",
-"n%	c #11021A",
-"o%	c #130218",
-"p%	c #150319",
-"q%	c #16061D",
-"r%	c #180923",
-"s%	c #9C1D2B",
-"t%	c #A32636",
-"u%	c #A66E3B",
-"v%	c #4B2E3C",
-"w%	c #412C36",
-"x%	c #36012D",
-"y%	c #140123",
-"z%	c #17001E",
-"A%	c #19011B",
-"B%	c #1A0421",
-"C%	c #340425",
-"D%	c #9E0326",
-"E%	c #1F0424",
-"F%	c #1C0524",
-"G%	c #180724",
-"H%	c #A91024",
-"I%	c #D55D24",
-"J%	c #90071E",
-"K%	c #3C051D",
-"L%	c #1C021C",
-"M%	c #1C011A",
-"N%	c #1D001A",
-"O%	c #160116",
-"P%	c #150216",
-"Q%	c #140217",
-"R%	c #140618",
-"S%	c #120D1D",
-"T%	c #231925",
-"U%	c #B16A2E",
-"V%	c #FDAC34",
-"W%	c #D58631",
-"X%	c #280E2A",
-"Y%	c #0D0A23",
-"Z%	c #0F0920",
-"`%	c #120C21",
-" &	c #1F1026",
-".&	c #A3352E",
-"+&	c #EE9F36",
-"@&	c #5D2A3C",
-"#&	c #960D3C",
-"$&	c #970638",
-"%&	c #A00330",
-"&&	c #4D0126",
-"*&	c #1C001F",
-"=&	c #280120",
-"-&	c #290223",
-";&	c #1F0425",
-">&	c #260726",
-",&	c #340A26",
-"'&	c #850925",
-")&	c #3A0823",
-"!&	c #82071D",
-"~&	c #5E071D",
-"{&	c #18051C",
-"]&	c #18021A",
-"^&	c #190118",
-"/&	c #160217",
-"(&	c #150418",
-"_&	c #130618",
-":&	c #110718",
-"<&	c #10081A",
-"[&	c #110D1D",
-"}&	c #291C24",
-"|&	c #A73B2D",
-"1&	c #FD6B36",
-"2&	c #FD853C",
-"3&	c #FD863B",
-"4&	c #C24A35",
-"5&	c #6B442F",
-"6&	c #6D302D",
-"7&	c #6E252E",
-"8&	c #8E3B32",
-"9&	c #DE7739",
-"0&	c #F48E3F",
-"a&	c #DD8D41",
-"b&	c #854F3D",
-"c&	c #7E2D35",
-"d&	c #33082B",
-"e&	c #1C0222",
-"f&	c #20001F",
-"g&	c #1F0222",
-"h&	c #1A0524",
-"i&	c #440C27",
-"j&	c #BC1427",
-"k&	c #20041B",
-"l&	c #53061C",
-"m&	c #25071B",
-"n&	c #11061A",
-"o&	c #130418",
-"p&	c #140317",
-"q&	c #150217",
-"r&	c #160318",
-"s&	c #12051B",
-"t&	c #100C1D",
-"u&	c #0E101E",
-"v&	c #0C121F",
-"w&	c #0C1321",
-"x&	c #781725",
-"y&	c #B25D2C",
-"z&	c #FA6335",
-"A&	c #FD633C",
-"B&	c #FE6D42",
-"C&	c #FE7C42",
-"D&	c #FE813F",
-"E&	c #FE873C",
-"F&	c #FD743B",
-"G&	c #FB683B",
-"H&	c #FA7A3E",
-"I&	c #F98242",
-"J&	c #F97844",
-"K&	c #F98943",
-"L&	c #F79C3D",
-"M&	c #A25133",
-"N&	c #280B28",
-"O&	c #1D021F",
-"P&	c #1F011C",
-"Q&	c #280321",
-"R&	c #1C0724",
-"S&	c #3F1C27",
-"T&	c #D33C27",
-"U&	c #0E061B",
-"V&	c #0C091C",
-"W&	c #0C0A1B",
-"X&	c #0E091A",
-"Y&	c #11081B",
-"Z&	c #100A20",
-"`&	c #0E0D23",
-" *	c #551227",
-".*	c #B21829",
-"+*	c #C42329",
-"@*	c #C62C29",
-"#*	c #C55429",
-"$*	c #E76F2B",
-"%*	c #F14232",
-"&*	c #F95E3A",
-"**	c #FC6740",
-"=*	c #FE6E45",
-"-*	c #FE7246",
-";*	c #FE7545",
-">*	c #FE7744",
-",*	c #FD7745",
-"'*	c #FD7845",
-")*	c #FD7847",
-"!*	c #FD7948",
-"~*	c #FD7B44",
-"{*	c #FC7C3B",
-"]*	c #6F3130",
-"^*	c #140B24",
-"/*	c #19031D",
-"(*	c #1C011B",
-"_*	c #5A011F",
-":*	c #B70421",
-"<*	c #380824",
-"[*	c #3E2626",
-"}*	c #9F5626",
-"|*	c #13051E",
-"1*	c #360A21",
-"2*	c #361223",
-"3*	c #371724",
-"4*	c #381824",
-"5*	c #3B1524",
-"6*	c #3E1E26",
-"7*	c #471A29",
-"8*	c #DB252E",
-"9*	c #ED2733",
-"0*	c #EE5436",
-"a*	c #F04237",
-"b*	c #F33934",
-"c*	c #F53D2F",
-"d*	c #D7312B",
-"e*	c #AF212B",
-"f*	c #3A2C31",
-"g*	c #F65F39",
-"h*	c #FB6F41",
-"i*	c #FD6D45",
-"j*	c #FE7047",
-"k*	c #FE7647",
-"l*	c #FE7847",
-"m*	c #FE7848",
-"n*	c #FE7748",
-"o*	c #FE7948",
-"p*	c #FE7C48",
-"q*	c #FE7C47",
-"r*	c #FE7642",
-"s*	c #FE7439",
-"t*	c #6D332C",
-"u*	c #100B21",
-"v*	c #16031B",
-"w*	c #2B001B",
-"x*	c #22011F",
-"y*	c #220521",
-"z*	c #1B0A23",
-"A*	c #421425",
-"B*	c #951924",
-"C*	c #381023",
-"D*	c #E94028",
-"E*	c #E7302B",
-"F*	c #EF432D",
-"G*	c #F4302E",
-"H*	c #F32C30",
-"I*	c #CB4432",
-"J*	c #DD3235",
-"K*	c #EF4B3A",
-"L*	c #F0333E",
-"M*	c #CC3D3F",
-"N*	c #E4313C",
-"O*	c #F34834",
-"P*	c #D13E2C",
-"Q*	c #431825",
-"R*	c #0E1424",
-"S*	c #3C202C",
-"T*	c #F15537",
-"U*	c #F97140",
-"V*	c #FC6E45",
-"W*	c #FE7547",
-"X*	c #FE7947",
-"Y*	c #FE7B48",
-"Z*	c #FE7D48",
-"`*	c #FE8047",
-" =	c #FE7A42",
-".=	c #FE7A38",
-"+=	c #6D442B",
-"@=	c #0F0B21",
-"#=	c #15031A",
-"$=	c #49001B",
-"%=	c #2F001C",
-"&=	c #21021E",
-"*=	c #220620",
-"==	c #1B0D23",
-"-=	c #641625",
-";=	c #951823",
-">=	c #390F25",
-",=	c #AC3A2A",
-"'=	c #B6492E",
-")=	c #ED7531",
-"!=	c #F45A34",
-"~=	c #F54C36",
-"{=	c #C72D39",
-"]=	c #DE283C",
-"^=	c #F33B40",
-"/=	c #F34142",
-"(=	c #D0393F",
-"_=	c #E72E39",
-":=	c #DB3C2E",
-"<=	c #461724",
-"[=	c #0F0D1E",
-"}=	c #140B1E",
-"|=	c #341427",
-"1=	c #CB4834",
-"2=	c #F7743F",
-"3=	c #FB7145",
-"4=	c #FE7747",
-"5=	c #FE7A47",
-"6=	c #FF7B48",
-"7=	c #FF7C48",
-"8=	c #FE7F47",
-"9=	c #FE8247",
-"0=	c #FE8642",
-"a=	c #FE8439",
-"b=	c #6D442D",
-"c=	c #0F0A21",
-"d=	c #14031A",
-"e=	c #20031D",
-"f=	c #210821",
-"g=	c #191024",
-"h=	c #CC1C25",
-"i=	c #961423",
-"j=	c #2C162C",
-"k=	c #BD242E",
-"l=	c #EF2C31",
-"m=	c #F54C34",
-"n=	c #F34037",
-"o=	c #F5353A",
-"p=	c #F7413D",
-"q=	c #F8423D",
-"r=	c #F93A39",
-"s=	c #F95731",
-"t=	c #341425",
-"u=	c #110A1D",
-"v=	c #140619",
-"w=	c #18051B",
-"x=	c #200F26",
-"y=	c #864833",
-"z=	c #F8773F",
-"A=	c #FC7445",
-"B=	c #FF7E48",
-"C=	c #FF7E49",
-"D=	c #FF7D49",
-"E=	c #FF7D48",
-"F=	c #FE8347",
-"G=	c #FE8743",
-"H=	c #FE893B",
-"I=	c #6E452F",
-"J=	c #100E23",
-"K=	c #14041A",
-"L=	c #55041D",
-"M=	c #540921",
-"N=	c #161124",
-"O=	c #CE6A25",
-"P=	c #3F1129",
-"Q=	c #170A29",
-"R=	c #0F0F29",
-"S=	c #15132B",
-"T=	c #1E182D",
-"U=	c #A82B3D",
-"V=	c #CB6633",
-"W=	c #CC6932",
-"X=	c #CC3D2D",
-"Y=	c #331225",
-"Z=	c #0F091C",
-"`=	c #120417",
-" -	c #160216",
-".-	c #190419",
-"+-	c #210F26",
-"@-	c #8C4934",
-"#-	c #F97A40",
-"$-	c #FC7545",
-"%-	c #FF7B49",
-"&-	c #FE7D46",
-"*-	c #FE7E43",
-"=-	c #FD7B3E",
-"--	c #FA6934",
-";-	c #532328",
-">-	c #130B1D",
-",-	c #150519",
-"'-	c #14041C",
-")-	c #120920",
-"!-	c #C43624",
-"~-	c #A21E23",
-"{-	c #F87C30",
-"]-	c #C9302D",
-"^-	c #300F2A",
-"/-	c #591129",
-"(-	c #171328",
-"_-	c #171628",
-":-	c #141829",
-"<-	c #101A2B",
-"[-	c #0F172B",
-"}-	c #0F1226",
-"|-	c #0E0C20",
-"1-	c #100619",
-"2-	c #140316",
-"3-	c #19051B",
-"4-	c #3C1428",
-"5-	c #E04B36",
-"6-	c #FA7B41",
-"7-	c #FD7346",
-"8-	c #FE7548",
-"9-	c #FF7849",
-"0-	c #FF7749",
-"a-	c #FE7B47",
-"b-	c #FE7945",
-"c-	c #FC7740",
-"d-	c #FA7E39",
-"e-	c #C1432F",
-"f-	c #131523",
-"g-	c #130A1C",
-"h-	c #420621",
-"i-	c #D08423",
-"j-	c #F87739",
-"k-	c #C03D37",
-"l-	c #962B34",
-"m-	c #A14332",
-"n-	c #E54B30",
-"o-	c #9E3E2F",
-"p-	c #7F262E",
-"q-	c #922D2E",
-"r-	c #9C4B2E",
-"s-	c #65212C",
-"t-	c #101628",
-"u-	c #101022",
-"v-	c #11091C",
-"w-	c #130619",
-"x-	c #160A1E",
-"y-	c #43252C",
-"z-	c #F66439",
-"A-	c #FA6942",
-"B-	c #FD6C47",
-"C-	c #FE6E48",
-"D-	c #FE6F48",
-"E-	c #FE7049",
-"F-	c #FE714A",
-"G-	c #FE744A",
-"H-	c #FE7846",
-"I-	c #FD7243",
-"J-	c #FC703E",
-"K-	c #FA6C37",
-"L-	c #81312B",
-"M-	c #121123",
-"N-	c #15071D",
-"O-	c #16031A",
-"P-	c #17021B",
-"Q-	c #8F3D22",
-"R-	c #F8393E",
-"S-	c #E42A3D",
-"T-	c #E7473B",
-"U-	c #FB503B",
-"V-	c #FB4F3A",
-"W-	c #F95439",
-"X-	c #ED4C38",
-"Y-	c #F45938",
-"Z-	c #FB6537",
-"`-	c #EA5236",
-" ;	c #CE6232",
-".;	c #CD392C",
-"+;	c #181425",
-"@;	c #120F21",
-"#;	c #130D20",
-"$;	c #151225",
-"%;	c #903431",
-"&;	c #F8703D",
-"*;	c #FB6344",
-"=;	c #FD6748",
-"-;	c #FE6849",
-";;	c #FE6949",
-">;	c #FE6A49",
-",;	c #FE6C4A",
-"';	c #FE704A",
-");	c #FE734A",
-"!;	c #FE7449",
-"~;	c #FE7347",
-"{;	c #FE7145",
-"];	c #FD6C42",
-"^;	c #FD753D",
-"/;	c #F36E35",
-"(;	c #CB452C",
-"_;	c #600D24",
-":;	c #1C061F",
-"<;	c #1E031F",
-"[;	c #5B3821",
-"};	c #CE9822",
-"|;	c #FA4341",
-"1;	c #FB4341",
-"2;	c #FC4541",
-"3;	c #FC4542",
-"4;	c #FC4143",
-"5;	c #FC4D42",
-"6;	c #FB5042",
-"7;	c #FB5342",
-"8;	c #FC5242",
-"9;	c #FD4F40",
-"0;	c #FD503E",
-"a;	c #FB6339",
-"b;	c #F45E33",
-"c;	c #A12A2E",
-"d;	c #401E2C",
-"e;	c #452D2F",
-"f;	c #F74F38",
-"g;	c #FA5940",
-"h;	c #FC6245",
-"i;	c #FE6447",
-"j;	c #FE6449",
-"k;	c #FE6549",
-"l;	c #FE6749",
-"m;	c #FE6B49",
-"n;	c #FE6D49",
-"o;	c #FE6D48",
-"p;	c #FE6D47",
-"q;	c #FE6D45",
-"r;	c #FE6C44",
-"s;	c #FE6A42",
-"t;	c #FE663C",
-"u;	c #FC6233",
-"v;	c #752129",
-"w;	c #1F0922",
-"x;	c #750520",
-"y;	c #81061F",
-"z;	c #FA3D42",
-"A;	c #FB4142",
-"B;	c #FD4543",
-"C;	c #FD4844",
-"D;	c #FD4A45",
-"E;	c #FD4D45",
-"F;	c #FD5045",
-"G;	c #FD5345",
-"H;	c #FE5346",
-"I;	c #FE5445",
-"J;	c #FD5444",
-"K;	c #FC4F41",
-"L;	c #FA513D",
-"M;	c #F95339",
-"N;	c #F63736",
-"O;	c #F75737",
-"P;	c #F95F3B",
-"Q;	c #FB5840",
-"R;	c #FD5F43",
-"S;	c #FE6345",
-"T;	c #FE6547",
-"U;	c #FE6548",
-"V;	c #FE6448",
-"W;	c #FE6248",
-"X;	c #FE6348",
-"Y;	c #FE6748",
-"Z;	c #FE6848",
-"`;	c #FE6846",
-" >	c #FE6A45",
-".>	c #FE6D43",
-"+>	c #FE703F",
-"@>	c #FC6F36",
-"#>	c #6F302B",
-"$>	c #140A22",
-"%>	c #FA3B42",
-"&>	c #FC4243",
-"*>	c #FD4744",
-"=>	c #FE4A45",
-"->	c #FE4C47",
-";>	c #FE4D47",
-">>	c #FE5047",
-",>	c #FE5347",
-"'>	c #FE5447",
-")>	c #FD5246",
-"!>	c #FB503F",
-"~>	c #FA543D",
-"{>	c #9B3D3B",
-"]>	c #A3433B",
-"^>	c #F9683D",
-"/>	c #FC6940",
-"(>	c #FE6342",
-"_>	c #FE6645",
-":>	c #FE6646",
-"<>	c #FE6147",
-"[>	c #FE6048",
-"}>	c #FE6148",
-"|>	c #FE6746",
-"1>	c #FE6A46",
-"2>	c #FE6F45",
-"3>	c #FE7441",
-"4>	c #FC7D39",
-"5>	c #6C422E",
-"6>	c #0F0F23",
-"7>	c #FA4142",
-"8>	c #FC4643",
-"9>	c #FE4D46",
-"0>	c #FE4E47",
-"a>	c #FE4F48",
-"b>	c #FE5148",
-"c>	c #FE5348",
-"d>	c #FE5548",
-"e>	c #FE5247",
-"f>	c #FD5445",
-"g>	c #FC5544",
-"h>	c #F96041",
-"i>	c #D33F3D",
-"j>	c #392D39",
-"k>	c #973C38",
-"l>	c #F94E3A",
-"m>	c #FD693E",
-"n>	c #FE6C43",
-"o>	c #FE6047",
-"p>	c #FE5D47",
-"q>	c #FE5E48",
-"r>	c #FE6948",
-"s>	c #FE6947",
-"t>	c #FE6B47",
-"u>	c #FE6E46",
-"v>	c #FD6D43",
-"w>	c #FB723D",
-"x>	c #D54A33",
-"y>	c #301C29",
-"z>	c #FB4A42",
-"A>	c #FD4B44",
-"B>	c #FE4F47",
-"C>	c #FE5048",
-"D>	c #FE5648",
-"E>	c #FE5848",
-"F>	c #FE5747",
-"G>	c #FE5547",
-"H>	c #FC5945",
-"I>	c #F95742",
-"J>	c #F3543D",
-"K>	c #A33336",
-"L>	c #302032",
-"M>	c #152433",
-"N>	c #CD3E38",
-"O>	c #FD5A3F",
-"P>	c #FE6343",
-"Q>	c #FE6446",
-"R>	c #FE6247",
-"S>	c #FE6A47",
-"T>	c #FC6542",
-"U>	c #FB6A3B",
-"V>	c #FA6D34",
-"W>	c #D73C2D",
-"X>	c #442428",
-"Y>	c #281323",
-"Z>	c #FD4E42",
-"`>	c #FD4D43",
-" ,	c #FE4D45",
-".,	c #FE5248",
-"+,	c #FE5947",
-"@,	c #FE5C47",
-"#,	c #FE5B47",
-"$,	c #FE5A47",
-"%,	c #FE5847",
-"&,	c #FC5C45",
-"*,	c #F95B43",
-"=,	c #F3613F",
-"-,	c #E74F37",
-";,	c #8C2431",
-">,	c #161E2F",
-",,	c #CD4E33",
-"',	c #FD503A",
-"),	c #FE5D40",
-"!,	c #FE6445",
-"~,	c #FE6946",
-"{,	c #FE6847",
-"],	c #FE6747",
-"^,	c #FD6644",
-"/,	c #FD6241",
-"(,	c #FD5B3D",
-"_,	c #FE6739",
-":,	c #FE6135",
-"<,	c #AB4830",
-"[,	c #733E2A",
-"},	c #161224",
-"|,	c #FC4E42",
-"1,	c #FE4D44",
-"2,	c #FE4E46",
-"3,	c #FE5147",
-"4,	c #FE5E47",
-"5,	c #FD5C46",
-"6,	c #FA5B44",
-"7,	c #F45441",
-"8,	c #EB393A",
-"9,	c #CC3433",
-"0,	c #47212F",
-"a,	c #59242F",
-"b,	c #FC6734",
-"c,	c #FC6F3A",
-"d,	c #FC723E",
-"e,	c #FD6540",
-"f,	c #FE6442",
-"g,	c #FE6643",
-"h,	c #FE6944",
-"i,	c #FE6546",
-"j,	c #FE6444",
-"k,	c #FE6143",
-"l,	c #FE5E41",
-"m,	c #FE613F",
-"n,	c #FE683C",
-"o,	c #FE7937",
-"p,	c #A25030",
-"q,	c #692629",
-"r,	c #151122",
-"s,	c #FA573F",
-"t,	c #FB4D40",
-"u,	c #FC4F43",
-"v,	c #FE5246",
-"w,	c #FF6347",
-"x,	c #FE5F48",
-"y,	c #F65942",
-"z,	c #F0493D",
-"A,	c #ED3736",
-"B,	c #73262F",
-"C,	c #10152C",
-"D,	c #3B292F",
-"E,	c #363034",
-"F,	c #AC3938",
-"G,	c #FC6B3B",
-"H,	c #FD763C",
-"I,	c #FE6D3F",
-"J,	c #FE6341",
-"K,	c #FE6642",
-"L,	c #FE6745",
-"M,	c #FE6245",
-"N,	c #FE6244",
-"O,	c #FE6841",
-"P,	c #FF683B",
-"Q,	c #EC7035",
-"R,	c #D0412D",
-"S,	c #3A1627",
-"T,	c #CF3938",
-"U,	c #F6543C",
-"V,	c #FB5040",
-"W,	c #FD5544",
-"X,	c #FE5A48",
-"Y,	c #FE5D48",
-"Z,	c #FE5F47",
-"`,	c #FF6147",
-" '	c #FD5C45",
-".'	c #FB5B43",
-"+'	c #FA5A42",
-"@'	c #F76040",
-"#'	c #F4623D",
-"$'	c #F26D38",
-"%'	c #EC4130",
-"&'	c #380E2B",
-"*'	c #13122C",
-"='	c #362D31",
-"-'	c #353435",
-";'	c #352E37",
-">'	c #2D3337",
-",'	c #CC5838",
-"''	c #CD6F3A",
-")'	c #CE6E3D",
-"!'	c #FE793F",
-"~'	c #FD7541",
-"{'	c #FD6243",
-"]'	c #FE6545",
-"^'	c #FF6543",
-"/'	c #FF6240",
-"('	c #FE723B",
-"_'	c #FE8034",
-":'	c #442D2C",
-"<'	c #311725",
-"['	c #222830",
-"}'	c #B73B36",
-"|'	c #F94C3D",
-"1'	c #FD5543",
-"2'	c #FE5B48",
-"3'	c #FF5E47",
-"4'	c #FE5C48",
-"5'	c #FC5B44",
-"6'	c #F95640",
-"7'	c #C34E3D",
-"8'	c #A45A3A",
-"9'	c #F37438",
-"0'	c #F28935",
-"a'	c #AF422F",
-"b'	c #240D2B",
-"c'	c #88292F",
-"d'	c #FA8E34",
-"e'	c #FC7E38",
-"f'	c #FC5939",
-"g'	c #694A37",
-"h'	c #693437",
-"i'	c #382638",
-"j'	c #142439",
-"k'	c #9F483A",
-"l'	c #C45E3C",
-"m'	c #FD7240",
-"n'	c #FF6645",
-"o'	c #FF6245",
-"p'	c #FF6045",
-"q'	c #FF6146",
-"r'	c #FF6246",
-"s'	c #FF6446",
-"t'	c #FF6545",
-"u'	c #FE763F",
-"v'	c #FE7237",
-"w'	c #C65331",
-"x'	c #3D272A",
-"y'	c #0D1E2B",
-"z'	c #683032",
-"A'	c #F9453A",
-"B'	c #FD5341",
-"C'	c #FE5A46",
-"D'	c #FF5A48",
-"E'	c #FE5948",
-"F'	c #FD5A47",
-"G'	c #FC5D43",
-"H'	c #F95B3D",
-"I'	c #713F37",
-"J'	c #1E2D32",
-"K'	c #C44531",
-"L'	c #EF7A2F",
-"M'	c #6B2E2C",
-"N'	c #0F0E2C",
-"O'	c #F56633",
-"P'	c #FA803A",
-"Q'	c #FC673E",
-"R'	c #FD673E",
-"S'	c #FC6F3C",
-"T'	c #FA6E3B",
-"U'	c #C6633A",
-"V'	c #A06739",
-"W'	c #835638",
-"X'	c #381F38",
-"Y'	c #713B38",
-"Z'	c #7B503C",
-"`'	c #FE7741",
-" )	c #FE7344",
-".)	c #FE6D46",
-"+)	c #FF6946",
-"@)	c #FF5E46",
-"#)	c #FF5D46",
-"$)	c #FF5D47",
-"%)	c #FF5F48",
-"&)	c #FF6248",
-"*)	c #FE6941",
-"=)	c #FC783C",
-"-)	c #C46B35",
-";)	c #892730",
-">)	c #111629",
-",)	c #1F2630",
-"')	c #AD3939",
-"))	c #FC5D41",
-"!)	c #FE5946",
-"~)	c #FF5848",
-"{)	c #FE5549",
-"])	c #FC5E42",
-"^)	c #FA673B",
-"/)	c #DB7033",
-"()	c #392E2B",
-"_)	c #311A28",
-":)	c #3C2127",
-"<)	c #1D1027",
-"[)	c #92102C",
-"})	c #F58336",
-"|)	c #FA673E",
-"1)	c #FD6642",
-"2)	c #FD5A41",
-"3)	c #FC6D41",
-"4)	c #FC6D3F",
-"5)	c #FD683E",
-"6)	c #F38C39",
-"7)	c #CE6535",
-"8)	c #612E34",
-"9)	c #1D2637",
-"0)	c #71513E",
-"a)	c #FF6847",
-"b)	c #FF5F47",
-"c)	c #FF5A46",
-"d)	c #FF5847",
-"e)	c #FF5748",
-"f)	c #FF594A",
-"g)	c #FF5E4B",
-"h)	c #FE654C",
-"i)	c #FE694B",
-"j)	c #FE6B48",
-"k)	c #FC6A43",
-"l)	c #F7683E",
-"m)	c #EC6E39",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                              . + @ # $   %                                                     ",
-"                                                            & * = - ; > , ' ) ! ~                                               ",
-"                                                            { ] ^ / ( _ : < [ } | 1 2                                           ",
-"                                                        3 4 5 6 7 8 9 0 a b c d e f g h i j                                     ",
-"                                                      k l m n o p q r s t u v w x y z A B C D                                   ",
-"                                                    E F G H I J K L M N O P Q R S T U V W X Y Z `                               ",
-"                                                   ...+.@.#.$.%.&.*.=.-.;.>.,.S '.).!.~.{.].^./.(._.                            ",
-"                                              :.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.!.S f.g.h.i.j.k.                          ",
-"                                              l.m.n.o.p.q.r.s.t.u.J v.w.x.y.z.A.c.d.d.B.C.D.E.F.G.H.I.                          ",
-"                                            J.K.L.M.N.O.P.Q.R.t S.T.U.V.W.X.Y.Z.`. +d.d..+B.'.++@+#+$+%+                        ",
-"                                      &+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+d.2+3+4+d.5+6+7+8+9+0+                      ",
-"                                    a+b+c+d+e+f+g+h+i+j+k+l+m+n+^+o+p+q+r+s+t+u+v+b.w+x+y+z+A+w+B+C+D+E+F+G+                    ",
-"                                H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+Q ,.X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@#@-@;@>@,@'@                    ",
-"                                )@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@R ,.4@5@6@7@8@9@0@a@#@b@c@=@d@e@f@g@>@h@i@j@                  ",
-"                                k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@^+R S z@A@z.q+B@C@D@E@F@G@H@#@e@#@#@f@g@I@J@K@L@                  ",
-"                                M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#+#S A@@###$#%#&#*#=#-#f@B+B+B+f@;#>#,#'#)#                  ",
-"                                !#~#{#]#^#/#(#(#_#:#<#[#}#|#1#^+.#S +#+#z@2#3#4#5#6#7#8#9#0#A.B+B+a#A.@@b#c#d#                  ",
-"                              e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#.#w#S R ^+x#y#z#A#B#C#D#-#A.a#`.`.b.g@E#d#F#                  ",
-"                          G#0@H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#>.W#3@v#R R X+X#Y#s#Z#`# $.$+$@$g@f@5+5+#$6+$$%$&$                  ",
-"                          *$=$-$;$>$,$'$)$!$~${$]$^$/$($_$*$u#:$Q 3@,.X+z.<$[$}$|$1$2$3$4$5$6$7$e@8$#$G@9$0$a$                  ",
-"                        ,.4@E#b$c$d$e$f$g$h$i$j$k$l$m$n$`@>.:$o$3@,. #a.p$q$r$s$t$u$v$w$x$y$z$A$B$#@C$D$E$F$G$                  ",
-"                      R S H$v+I$J$K$n+L$:$o$o$M$N$L$O$P$Q$R$N$o$3@S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%                  ",
-"                      E.,%~.'%Z.4@v W#o$)%)%)%Q !%~%{%]%^%Q$u u#/%(%_%:%<%[%}%|%1%2%3%4%=%5%6%7%8%9%0%a%b%c%d%                  ",
-"                    e%f%g%a#,%,%z@R 3@3@3@)%Q h%i%j%k%l%m%{+n%o%p%q%r%s%t%u%v%w%x%y%z%A%*%B%C%D%E%F%G%H%I%                      ",
-"                    J%K%L%M%N%D.S v#)%)%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&%&&&*&f@a##@=&-&;&>&,&'&)&                        ",
-"                  !&~&{&]&^&.#w#^&/%/&(&_&:&<&[&}&|&1&2&3&4&5&6&7&8&9&0&a&b&c&d&e&e@1+5+e@f&g&h&i&j&                            ",
-"                k&l&m&n&o&p&q&r&i%s&3.t&u&v&w&x&y&z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&P&1+`.e@f&Q&R&S&T&                            ",
-"                0 U&V&W&X&<&Y&j%Z&`& *.*+*@*#*$*%*&***=*-*;*>*>*,*'*)*!*~*{*]*^*/*(*a#B+#@_*:*<*[*}*                            ",
-"                |*1*2*3*4*5*6*7*8*9*0*a*b*c*d*e*f*g*h*i*j*k*l*m*n*o*p*q*r*s*t*u*v*E.w*d.e@x*y*z*A*B*                            ",
-"                C*D*E*F*G*H*I*J*K*L*M*N*O*P*Q*R*S*T*U*V*W*l*X*o*o*Y*Z*`* =.=+=@=#='%$=%=e@&=*===-=;=                            ",
-"                >=,='=)=!=~={=]=^=/=(=_=:=<=[=}=|=1=2=3=4=5=p*6=6=7=8=9=0=a=b=c=d=A@~.b.B+e=f=g=h=i=                            ",
-"                    j=k=l=m=n=o=p=q=r=s=t=u=v=w=x=y=z=A=5=Z*B=C=D=E=8=F=G=H=I=J=K=S$R z@'%L=M=N=O=                              ",
-"                    P=Q=R=S=T=U=V=W=X=Y=Z=`= -.-+-@-#-$-5=p*E=D=%-%-q*&-*-=---;->-,-/%3@^+'-)-!-~-                              ",
-"                  {-]-^-/-(-_-:-<-[-}-|-1-2- -3-4-5-6-7-8-n*m*9-0-9-o*a-b-c-d-e-f-g-(&h%w c h-i-                                ",
-"                j-k-l-m-n-o-p-q-r-s-t-u-v-w-,-x-y-z-A-B-C-D-E-E-F-G-_@m*H-I-J-K-L-M-N-O-P-(+Q-                                  ",
-"                R-S-T-U-V-W-X-Y-Z-`- ;.;+;@;#;$;%;&;*;=;-;-;;;>;,;';);!;~;{;];^;/;(;_;:;<;[;};                                  ",
-"                |;1;2;3;4;5;6;7;8;9;0;a;b;c;d;e;f;g;h;i;j;j;k;k;l;m;n;o;p;q;r;s;t;u;v;w;x;y;                                    ",
-"                z;A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T;U;V;W;X;k;Y;Z;`; >r;.>+>@>#>$>                                        ",
-"                %>&>*>=>->;>>>,>'>,>)>F;8;!>~>{>]>^>/>(>_>:>i;<>[>X;}>i;|>1>q;2>3>4>5>6>                                        ",
-"                7>8>=>9>0>a>b>c>d>,>e>e>f>g>h>i>j>k>l>m>n>:>i;o>p>q>W;r>s>t>p;u>v>w>x>y>                                        ",
-"                z>A>9>0>B>C>c>D>E>F>G>G>F>H>I>J>K>L>M>N>O>P>Q>R>o>R>T;s>S>S>S>t>1>T>U>V>W>X>Y>                                  ",
-"                Z>`> ,9>B>.,D>+,@,#,$,%,$,&,*,=,-,;,>,,,',),P>!,!,_>~,t>s>{,],{,],^,/,(,_,:,<,[,},                              ",
-"                |,`>1,2,3,G>+,4,o>o>4,@,@,5,6,7,8,9,0,a,b,c,d,e,f,g,h, >~,|>T;T;T;i,j,k,l,m,n,o,p,q,r,                          ",
-"                s,t,u,v,G>%,@,o>w,R>x,p>@,5,6,y,z,A,B,C,D,E,F,G,H,I,J,K,L,L,i,i;i;i;Q>S;M,N,P>O,P,Q,R,S,                        ",
-"                T,U,V,W,%,X,Y,Z,`,[>q>@, '.'+'@'#'$'%'&'*'='-';'>',''')'!'~'{'N,i,:>_>]'M,M,Q>_>^'/'('_':'<'                    ",
-"                ['}'|'1'$,X,2'p>3'4'2'@,5'6'7'8'9'0'a'b'c'd'e'f'g'h'i'j'k'l'd,m'g, > >n'o'p'q'r's't'.>u'v'w'x'                  ",
-"                y'z'A'B'C'X,X,2'D'E'E'F'G'H'I'J'K'L'M'N'O'P'Q'R'S'T'U'V'W'X'Y'Z'`' ).)+)r'@)#)$)%)&)l;1>*)=)-);)                ",
-"                >),)')))!)X,E'X,~){)d>!)])^)/)()_):)<)[)})|)1)f,2)3)4)5)6)7)8)9)0)*--*a)b)c)d)e)f)g)h)i)j)k)l)m)                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                ",
-"                                                                                                                                "};
diff --git a/ext/json/lib/json/pure.rb b/ext/json/lib/json/pure.rb
deleted file mode 100644
index b86d905523..0000000000
--- a/ext/json/lib/json/pure.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'json/common'
-require 'json/pure/parser'
-require 'json/pure/generator'
-
-module JSON
-  begin
-    require 'iconv'
-    # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-    UTF16toUTF8 = Iconv.new('utf-8', 'utf-16be') # :nodoc:
-    # An iconv instance to convert from UTF16 Big Endian to UTF8.
-    UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8') # :nodoc:
-    UTF8toUTF16.iconv('no bom')
-  rescue Errno::EINVAL, Iconv::InvalidEncoding
-    # Iconv doesn't support big endian utf-16. Let's try to hack this manually
-    # into the converters.
-    begin
-      old_verbose, $VERBSOSE = $VERBOSE, nil
-      # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-      UTF16toUTF8 = Iconv.new('utf-8', 'utf-16') # :nodoc:
-      # An iconv instance to convert from UTF16 Big Endian to UTF8.
-      UTF8toUTF16 = Iconv.new('utf-16', 'utf-8') # :nodoc:
-      UTF8toUTF16.iconv('no bom')
-      if UTF8toUTF16.iconv("\xe2\x82\xac") == "\xac\x20"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            result = @iconv.iconv(string)
-            JSON.swap!(result)
-          end
-        end
-        UTF8toUTF16 = swapper.new(UTF8toUTF16) # :nodoc:
-      end
-      if UTF16toUTF8.iconv("\xac\x20") == "\xe2\x82\xac"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            string = JSON.swap!(string.dup)
-            @iconv.iconv(string)
-          end
-        end
-        UTF16toUTF8 = swapper.new(UTF16toUTF8) # :nodoc:
-      end
-    rescue Errno::EINVAL, Iconv::InvalidEncoding
-      raise MissingUnicodeSupport, "iconv doesn't seem to support UTF-8/UTF-16 conversions"
-    ensure
-      $VERBOSE = old_verbose
-    end
-  rescue LoadError
-    raise MissingUnicodeSupport,
-      "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions"
-  end
-
-  # Swap consecutive bytes of _string_ in place.
-  def self.swap!(string) # :nodoc:
-    0.upto(string.size / 2) do |i|
-      break unless string[2 * i + 1]
-      string[2 * i], string[2 * i + 1] = string[2 * i + 1], string[2 * i]
-    end
-    string
-  end
-
-  # This module holds all the modules/classes that implement JSON's
-  # functionality in pure ruby.
-  module Pure
-    $DEBUG and warn "Using pure library for JSON."
-    JSON.parser = Parser
-    JSON.generator = Generator
-  end
-end
diff --git a/ext/json/lib/json/pure/generator.rb b/ext/json/lib/json/pure/generator.rb
deleted file mode 100644
index c8bbfd09ee..0000000000
--- a/ext/json/lib/json/pure/generator.rb
+++ /dev/null
@@ -1,394 +0,0 @@
-module JSON
-  MAP = {
-    "\x0" => '\u0000',
-    "\x1" => '\u0001',
-    "\x2" => '\u0002',
-    "\x3" => '\u0003',
-    "\x4" => '\u0004',
-    "\x5" => '\u0005',
-    "\x6" => '\u0006',
-    "\x7" => '\u0007',
-    "\b"  =>  '\b',
-    "\t"  =>  '\t',
-    "\n"  =>  '\n',
-    "\xb" => '\u000b',
-    "\f"  =>  '\f',
-    "\r"  =>  '\r',
-    "\xe" => '\u000e',
-    "\xf" => '\u000f',
-    "\x10" => '\u0010',
-    "\x11" => '\u0011',
-    "\x12" => '\u0012',
-    "\x13" => '\u0013',
-    "\x14" => '\u0014',
-    "\x15" => '\u0015',
-    "\x16" => '\u0016',
-    "\x17" => '\u0017',
-    "\x18" => '\u0018',
-    "\x19" => '\u0019',
-    "\x1a" => '\u001a',
-    "\x1b" => '\u001b',
-    "\x1c" => '\u001c',
-    "\x1d" => '\u001d',
-    "\x1e" => '\u001e',
-    "\x1f" => '\u001f',
-    '"'   =>  '\"',
-    '\\'  =>  '\\\\',
-    '/'   =>  '\/',
-  } # :nodoc:
-
-  # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
-  # UTF16 big endian characters as \u????, and return it.
-  def utf8_to_json(string) # :nodoc:
-    string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
-    string.gsub!(/(
-                    (?:
-                      [\xc2-\xdf][\x80-\xbf]    |
-                      [\xe0-\xef][\x80-\xbf]{2} |
-                      [\xf0-\xf4][\x80-\xbf]{3}
-                    )+ |
-                    [\x80-\xc1\xf5-\xff]       # invalid
-                  )/nx) { |c|
-      c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
-      s.gsub!(/.{4}/n, '\\\\u\&')
-    }
-    string
-  rescue Iconv::Failure => e
-    raise GeneratorError, "Caught #{e.class}: #{e}"
-  end
-  module_function :utf8_to_json
-
-  module Pure
-    module Generator
-      # This class is used to create State instances, that are use to hold data
-      # while generating a JSON text from a a Ruby data structure.
-      class State
-        # Creates a State object from _opts_, which ought to be Hash to create
-        # a new State instance configured by _opts_, something else to create
-        # an unconfigured instance. If _opts_ is a State object, it is just
-        # returned.
-        def self.from_state(opts)
-          case opts
-          when self
-            opts
-          when Hash
-            new(opts)
-          else
-            new
-          end
-        end
-
-        # Instantiates a new State object, configured by _opts_.
-        #
-        # _opts_ can have the following keys:
-        #
-        # * *indent*: a string used to indent levels (default: ''),
-        # * *space*: a string that is put after, a : or , delimiter (default: ''),
-        # * *space_before*: a string that is put before a : pair delimiter (default: ''),
-        # * *object_nl*: a string that is put at the end of a JSON object (default: ''), 
-        # * *array_nl*: a string that is put at the end of a JSON array (default: ''),
-        # * *check_circular*: true if checking for circular data structures
-        #   should be done (the default), false otherwise.
-        # * *check_circular*: true if checking for circular data structures
-        #   should be done, false (the default) otherwise.
-        # * *allow_nan*: true if NaN, Infinity, and -Infinity should be
-        #   generated, otherwise an exception is thrown, if these values are
-        #   encountered. This options defaults to false.
-        def initialize(opts = {})
-          @seen = {}
-          @indent         = ''
-          @space          = ''
-          @space_before   = ''
-          @object_nl      = ''
-          @array_nl       = ''
-          @check_circular = true
-          @allow_nan      = false
-          configure opts
-        end
-
-        # This string is used to indent levels in the JSON text.
-        attr_accessor :indent
-
-        # This string is used to insert a space between the tokens in a JSON
-        # string.
-        attr_accessor :space
-
-        # This string is used to insert a space before the ':' in JSON objects.
-        attr_accessor :space_before
-
-        # This string is put at the end of a line that holds a JSON object (or
-        # Hash).
-        attr_accessor :object_nl
-
-        # This string is put at the end of a line that holds a JSON array.
-        attr_accessor :array_nl
-
-        # This integer returns the maximum level of data structure nesting in
-        # the generated JSON, max_nesting = 0 if no maximum is checked.
-        attr_accessor :max_nesting
-
-        def check_max_nesting(depth) # :nodoc:
-          return if @max_nesting.zero?
-          current_nesting = depth + 1
-          current_nesting > @max_nesting and
-            raise NestingError, "nesting of #{current_nesting} is too deep"
-        end
-
-        # Returns true, if circular data structures should be checked,
-        # otherwise returns false.
-        def check_circular?
-          @check_circular
-        end
-
-        # Returns true if NaN, Infinity, and -Infinity should be considered as
-        # valid JSON and output.
-        def allow_nan?
-          @allow_nan
-        end
-
-        # Returns _true_, if _object_ was already seen during this generating
-        # run. 
-        def seen?(object)
-          @seen.key?(object.__id__)
-        end
-
-        # Remember _object_, to find out if it was already encountered (if a
-        # cyclic data structure is if a cyclic data structure is rendered). 
-        def remember(object)
-          @seen[object.__id__] = true
-        end
-
-        # Forget _object_ for this generating run.
-        def forget(object)
-          @seen.delete object.__id__
-        end
-
-        # Configure this State instance with the Hash _opts_, and return
-        # itself.
-        def configure(opts)
-          @indent         = opts[:indent] if opts.key?(:indent)
-          @space          = opts[:space] if opts.key?(:space)
-          @space_before   = opts[:space_before] if opts.key?(:space_before)
-          @object_nl      = opts[:object_nl] if opts.key?(:object_nl)
-          @array_nl       = opts[:array_nl] if opts.key?(:array_nl)
-          @check_circular = !!opts[:check_circular] if opts.key?(:check_circular)
-          @allow_nan      = !!opts[:allow_nan] if opts.key?(:allow_nan)
-          if !opts.key?(:max_nesting) # defaults to 19
-            @max_nesting = 19
-          elsif opts[:max_nesting]
-            @max_nesting = opts[:max_nesting]
-          else
-            @max_nesting = 0
-          end
-          self
-        end
-
-        # Returns the configuration instance variables as a hash, that can be
-        # passed to the configure method.
-        def to_h
-          result = {}
-          for iv in %w[indent space space_before object_nl array_nl check_circular allow_nan max_nesting]
-            result[iv.intern] = instance_variable_get("@#{iv}")
-          end
-          result
-        end
-      end
-
-      module GeneratorMethods
-        module Object
-          # Converts this object to a string (calling #to_s), converts
-          # it to a JSON string, and returns the result. This is a fallback, if no
-          # special method #to_json was defined for some object.
-          def to_json(*) to_s.to_json end
-        end
-
-        module Hash
-          # Returns a JSON string containing a JSON object, that is unparsed from
-          # this Hash instance.
-          # _state_ is a JSON::State object, that can also be used to configure the
-          # produced JSON string output further.
-          # _depth_ is used to find out nesting depth, to indent accordingly.
-          def to_json(state = nil, depth = 0, *)
-            if state
-              state = JSON.state.from_state(state)
-              state.check_max_nesting(depth)
-              json_check_circular(state) { json_transform(state, depth) }
-            else
-              json_transform(state, depth)
-            end
-          end
-
-          private
-
-          def json_check_circular(state)
-            if state and state.check_circular?
-              state.seen?(self) and raise JSON::CircularDatastructure,
-                  "circular data structures not supported!"
-              state.remember self
-            end
-            yield
-          ensure
-            state and state.forget self
-          end
-
-          def json_shift(state, depth)
-            state and not state.object_nl.empty? or return ''
-            state.indent * depth
-          end
-
-          def json_transform(state, depth)
-            delim = ','
-            delim << state.object_nl if state
-            result = '{'
-            result << state.object_nl if state
-            result << map { |key,value|
-              s = json_shift(state, depth + 1)
-              s << key.to_s.to_json(state, depth + 1)
-              s << state.space_before if state
-              s << ':'
-              s << state.space if state
-              s << value.to_json(state, depth + 1)
-            }.join(delim)
-            result << state.object_nl if state
-            result << json_shift(state, depth)
-            result << '}'
-            result
-          end
-        end
-
-        module Array
-          # Returns a JSON string containing a JSON array, that is unparsed from
-          # this Array instance.
-          # _state_ is a JSON::State object, that can also be used to configure the
-          # produced JSON string output further.
-          # _depth_ is used to find out nesting depth, to indent accordingly.
-          def to_json(state = nil, depth = 0, *)
-            if state
-              state = JSON.state.from_state(state)
-              state.check_max_nesting(depth)
-              json_check_circular(state) { json_transform(state, depth) }
-            else
-              json_transform(state, depth)
-            end
-          end
-
-          private
-
-          def json_check_circular(state)
-            if state and state.check_circular?
-              state.seen?(self) and raise JSON::CircularDatastructure,
-                "circular data structures not supported!"
-              state.remember self
-            end
-            yield
-          ensure
-            state and state.forget self
-          end
-
-          def json_shift(state, depth)
-            state and not state.array_nl.empty? or return ''
-            state.indent * depth
-          end
-
-          def json_transform(state, depth)
-            delim = ','
-            delim << state.array_nl if state
-            result = '['
-            result << state.array_nl if state
-            result << map { |value|
-              json_shift(state, depth + 1) << value.to_json(state, depth + 1)
-            }.join(delim)
-            result << state.array_nl if state
-            result << json_shift(state, depth) 
-            result << ']'
-            result
-          end
-        end
-
-        module Integer
-          # Returns a JSON string representation for this Integer number.
-          def to_json(*) to_s end
-        end
-
-        module Float
-          # Returns a JSON string representation for this Float number.
-          def to_json(state = nil, *)
-            case
-            when infinite?
-              if !state || state.allow_nan?
-                to_s
-              else
-                raise GeneratorError, "#{self} not allowed in JSON"
-              end
-            when nan?
-              if !state || state.allow_nan?
-                to_s
-              else
-                raise GeneratorError, "#{self} not allowed in JSON"
-              end
-            else
-              to_s
-            end
-          end
-        end
-
-        module String
-          # This string should be encoded with UTF-8 A call to this method
-          # returns a JSON string encoded with UTF16 big endian characters as
-          # \u????.
-          def to_json(*)
-            '"' << JSON.utf8_to_json(self) << '"'
-          end
-
-          # Module that holds the extinding methods if, the String module is
-          # included.
-          module Extend
-            # Raw Strings are JSON Objects (the raw bytes are stored in an array for the
-            # key "raw"). The Ruby String can be created by this module method.
-            def json_create(o)
-              o['raw'].pack('C*')
-            end
-          end
-
-          # Extends _modul_ with the String::Extend module.
-          def self.included(modul)
-            modul.extend Extend
-          end
-
-          # This method creates a raw object hash, that can be nested into
-          # other data structures and will be unparsed as a raw string. This
-          # method should be used, if you want to convert raw strings to JSON
-          # instead of UTF-8 strings, e. g. binary data.
-          def to_json_raw_object
-            {
-              JSON.create_id  => self.class.name,
-              'raw'           => self.unpack('C*'),
-            }
-          end
-
-          # This method creates a JSON text from the result of
-          # a call to to_json_raw_object of this String.
-          def to_json_raw(*args)
-            to_json_raw_object.to_json(*args)
-          end
-        end
-
-        module TrueClass
-          # Returns a JSON string for true: 'true'.
-          def to_json(*) 'true' end
-        end
-
-        module FalseClass
-          # Returns a JSON string for false: 'false'.
-          def to_json(*) 'false' end
-        end
-
-        module NilClass
-          # Returns a JSON string for nil: 'null'.
-          def to_json(*) 'null' end
-        end
-      end
-    end
-  end
-end
diff --git a/ext/json/lib/json/pure/parser.rb b/ext/json/lib/json/pure/parser.rb
deleted file mode 100644
index 39bee54269..0000000000
--- a/ext/json/lib/json/pure/parser.rb
+++ /dev/null
@@ -1,260 +0,0 @@
-require 'strscan'
-
-module JSON
-  module Pure
-    # This class implements the JSON parser that is used to parse a JSON string
-    # into a Ruby data structure.
-    class Parser < StringScanner
-      STRING                = /" ((?:[^\x0-\x1f"\\] |
-                                  \\["\\\/bfnrt] |
-                                  \\u[0-9a-fA-F]{4} |
-                                  \\[\x20-\xff])*)
-                              "/nx
-      INTEGER               = /(-?0|-?[1-9]\d*)/
-      FLOAT                 = /(-?
-                                (?:0|[1-9]\d*)
-                                (?:
-                                  \.\d+(?i:e[+-]?\d+) |
-                                  \.\d+ |
-                                  (?i:e[+-]?\d+)
-                                )
-                                )/x
-      NAN                   = /NaN/
-      INFINITY              = /Infinity/
-      MINUS_INFINITY        = /-Infinity/
-      OBJECT_OPEN           = /\{/
-      OBJECT_CLOSE          = /\}/
-      ARRAY_OPEN            = /\[/
-      ARRAY_CLOSE           = /\]/
-      PAIR_DELIMITER        = /:/
-      COLLECTION_DELIMITER  = /,/
-      TRUE                  = /true/
-      FALSE                 = /false/
-      NULL                  = /null/
-      IGNORE                = %r(
-        (?:
-         //[^\n\r]*[\n\r]| # line comments
-         /\*               # c-style comments
-         (?:
-          [^*/]|        # normal chars
-          /[^*]|        # slashes that do not start a nested comment
-          \*[^/]|       # asterisks that do not end this comment
-          /(?=\*/)      # single slash before this comment's end 
-         )*
-           \*/               # the End of this comment
-           |[ \t\r\n]+       # whitespaces: space, horicontal tab, lf, cr
-        )+
-      )mx
-
-      UNPARSED = Object.new
-
-      # Creates a new JSON::Pure::Parser instance for the string _source_.
-      #
-      # It will be configured by the _opts_ hash. _opts_ can have the following
-      # keys:
-      # * *max_nesting*: The maximum depth of nesting allowed in the parsed data
-      #   structures. Disable depth checking with :max_nesting => false|nil|0,
-      #   it defaults to 19.
-      # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
-      #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
-      #   to false.
-      # * *create_additions*: If set to false, the Parser doesn't create
-      #   additions even if a matchin class and create_id was found. This option
-      #   defaults to true.
-      def initialize(source, opts = {})
-        super
-        if !opts.key?(:max_nesting) # defaults to 19
-          @max_nesting = 19
-        elsif opts[:max_nesting]
-          @max_nesting = opts[:max_nesting]
-        else
-          @max_nesting = 0
-        end
-        @allow_nan = !!opts[:allow_nan]
-        ca = true
-        ca = opts[:create_additions] if opts.key?(:create_additions)
-        @create_id = ca ? JSON.create_id : nil
-      end
-
-      alias source string
-
-      # Parses the current JSON string _source_ and returns the complete data
-      # structure as a result.
-      def parse
-        reset
-        obj = nil
-        until eos?
-          case
-          when scan(OBJECT_OPEN)
-            obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-            @current_nesting = 1
-            obj = parse_object
-          when scan(ARRAY_OPEN)
-            obj and raise ParserError, "source '#{peek(20)}' not in JSON!"
-            @current_nesting = 1
-            obj = parse_array
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "source '#{peek(20)}' not in JSON!"
-          end
-        end
-        obj or raise ParserError, "source did not contain any JSON!"
-        obj
-      end
-
-      private
-
-      # Unescape characters in strings.
-      UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-      UNESCAPE_MAP.update({
-        ?"  => '"',
-        ?\\ => '\\',
-        ?/  => '/',
-        ?b  => "\b",
-        ?f  => "\f",
-        ?n  => "\n",
-        ?r  => "\r",
-        ?t  => "\t",
-        ?u  => nil, 
-      })
-
-      def parse_string
-        if scan(STRING)
-          return '' if self[1].empty?
-          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do
-            c = $&
-            if u = UNESCAPE_MAP[c[1]]
-              u
-            else # \uXXXX
-              bytes = ''
-              i = 0
-              while c[6 * i] == ?\\ && c[6 * i + 1] == ?u 
-                bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)
-                i += 1
-              end
-              JSON::UTF16toUTF8.iconv(bytes)
-            end
-          end
-        else
-          UNPARSED
-        end
-      rescue Iconv::Failure => e
-        raise GeneratorError, "Caught #{e.class}: #{e}"
-      end
-
-      def parse_value
-        case
-        when scan(FLOAT)
-          Float(self[1])
-        when scan(INTEGER)
-          Integer(self[1])
-        when scan(TRUE)
-          true
-        when scan(FALSE)
-          false
-        when scan(NULL)
-          nil
-        when (string = parse_string) != UNPARSED
-          string
-        when scan(ARRAY_OPEN)
-          @current_nesting += 1
-          ary = parse_array
-          @current_nesting -= 1
-          ary
-        when scan(OBJECT_OPEN)
-          @current_nesting += 1
-          obj = parse_object
-          @current_nesting -= 1
-          obj
-        when @allow_nan && scan(NAN)
-          NaN
-        when @allow_nan && scan(INFINITY)
-          Infinity
-        when @allow_nan && scan(MINUS_INFINITY)
-          MinusInfinity
-        else
-          UNPARSED
-        end
-      end
-
-      def parse_array
-        raise NestingError, "nesting of #@current_nesting is to deep" if
-          @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = []
-        delim = false
-        until eos?
-          case
-          when (value = parse_value) != UNPARSED
-            delim = false
-            result << value
-            skip(IGNORE)
-            if scan(COLLECTION_DELIMITER)
-              delim = true
-            elsif match?(ARRAY_CLOSE)
-              ;
-            else
-              raise ParserError, "expected ',' or ']' in array at '#{peek(20)}'!"
-            end
-          when scan(ARRAY_CLOSE)
-            if delim
-              raise ParserError, "expected next element in array at '#{peek(20)}'!"
-            end
-            break
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "unexpected token in array at '#{peek(20)}'!"
-          end
-        end
-        result
-      end
-
-      def parse_object
-        raise NestingError, "nesting of #@current_nesting is to deep" if
-          @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = {}
-        delim = false
-        until eos?
-          case
-          when (string = parse_string) != UNPARSED
-            skip(IGNORE)
-            unless scan(PAIR_DELIMITER)
-              raise ParserError, "expected ':' in object at '#{peek(20)}'!"
-            end
-            skip(IGNORE)
-            unless (value = parse_value).equal? UNPARSED
-              result[string] = value
-              delim = false
-              skip(IGNORE)
-              if scan(COLLECTION_DELIMITER)
-                delim = true
-              elsif match?(OBJECT_CLOSE)
-                ;
-              else
-                raise ParserError, "expected ',' or '}' in object at '#{peek(20)}'!"
-              end
-            else
-              raise ParserError, "expected value in object at '#{peek(20)}'!"
-            end
-          when scan(OBJECT_CLOSE)
-            if delim
-              raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
-            end
-            if @create_id and klassname = result[@create_id]
-              klass = JSON.deep_const_get klassname
-              break unless klass and klass.json_creatable?
-              result = klass.json_create(result)
-            end
-            break
-          when skip(IGNORE)
-            ;
-          else
-            raise ParserError, "unexpected token in object at '#{peek(20)}'!"
-          end
-        end
-        result
-      end
-    end
-  end
-end
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
deleted file mode 100644
index 3d674ac44f..0000000000
--- a/ext/json/lib/json/version.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module JSON
-  # JSON version
-  VERSION         = '1.1.2'
-  VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
-  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
-  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-  VARIANT_BINARY  = false
-end
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/nkf/.cvsignore
+++ b/ext/nkf/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 81a8a4b72b..4ffe8d984e 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -18,9 +18,9 @@ module Kconv
   #
   # Public Constants
   #
-
+  
   #Constant of Encoding
-
+  
   # Auto-Detect
   AUTO = NKF::AUTO
   # ISO-2022-JP
@@ -45,18 +45,84 @@ module Kconv
   UNKNOWN = NKF::UNKNOWN
 
   #
+  # Private Constants
+  #
+  
+  # Revision of kconv.rb
+  REVISION = %q$Revision$
+  
+  #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-\xfe] [\xa1-\xfe] |
+		    [\xa1-\xfe] [\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, to_enc, from_enc=nil)
+  #    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.
-  def kconv(str, to_enc, from_enc=nil)
-    opt = ''
-    opt += ' --ic=' + from_enc.to_s if from_enc
-    opt += ' --oc=' + to_enc.to_s if to_enc
+  #
+  # *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
+      opt << 'J'
+    when ::NKF::EUC
+      opt << 'E'
+    when ::NKF::SJIS
+      opt << 'S'
+    when ::NKF::UTF8
+      opt << 'W'
+    when ::NKF::UTF16
+      opt << 'W16'
+    end
+
+    case out_code
+    when ::NKF::JIS
+      opt << 'j'
+    when ::NKF::EUC
+      opt << 'e'
+    when ::NKF::SJIS
+      opt << 's'
+    when ::NKF::UTF8
+      opt << 'w'
+    when ::NKF::UTF16
+      opt << 'w16'
+    when ::NKF::NOCONV
+      return str
+    end
+
+    opt = '' if opt == '-'
 
     ::NKF::nkf(opt, str)
   end
@@ -67,143 +133,149 @@ module Kconv
   #
 
   # call-seq:
-  #    Kconv.tojis(str)   => string
+  #    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)
-    kconv(str, JIS)
+    ::NKF::nkf('-jm', str)
   end
   module_function :tojis
 
   # call-seq:
-  #    Kconv.toeuc(str)   => string
+  #    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)
-    kconv(str, EUC)
+    ::NKF::nkf('-em', str)
   end
   module_function :toeuc
 
   # call-seq:
-  #    Kconv.tosjis(str)   => string
+  #    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)
-    kconv(str, SJIS)
+    ::NKF::nkf('-sm', str)
   end
   module_function :tosjis
 
   # call-seq:
-  #    Kconv.toutf8(str)   => string
+  #    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)
-    kconv(str, UTF8)
+    ::NKF::nkf('-wm', str)
   end
   module_function :toutf8
 
   # call-seq:
-  #    Kconv.toutf16(str)   => string
+  #    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)
-    kconv(str, UTF16)
+    ::NKF::nkf('-w16m', str)
   end
   module_function :toutf16
 
-  # call-seq:
-  #    Kconv.toutf32(str)   => string
-  #
-  # Convert <code>str</code> to UTF-32
-  def toutf32(str)
-    kconv(str, UTF32)
-  end
-  module_function :toutf32
-
-  # call-seq:
-  #    Kconv.tolocale   => string
-  #
-  # Convert <code>self</code> to locale encoding
-  def tolocale(str)
-    kconv(str, Encoding.locale_charmap)
-  end
-  module_function :tolocale
-
   #
   # guess
   #
 
   # call-seq:
-  #    Kconv.guess(str)   => encoding
+  #    Kconv.guess(str)   -> integer
   #
-  # Guess input encoding by NKF.guess
+  # Guess input encoding by NKF.guess2
   def 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)   => true or false
+  #    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)
-    str.dup.force_encoding(EUC).valid_encoding?
+    RegexpEucjp.match( str )
   end
   module_function :iseuc
 
   # call-seq:
-  #    Kconv.issjis(str)   => true or false
+  #    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)
-    str.dup.force_encoding(SJIS).valid_encoding?
+    RegexpShiftjis.match( str )
   end
   module_function :issjis
 
   # call-seq:
-  #    Kconv.isjis(str)   => true or false
-  #
-  # Returns whether input encoding is ISO-2022-JP or not.
-  def isjis(str)
-    /\A [\t\n\r\x20-\x7E]*
-      (?:
-        (?:\x1b \x28 I      [\x21-\x7E]*
-          |\x1b \x28 J      [\x21-\x7E]*
-          |\x1b \x24 @      (?:[\x21-\x7E]{2})*
-          |\x1b \x24 B      (?:[\x21-\x7E]{2})*
-          |\x1b \x24 \x28 D (?:[\x21-\x7E]{2})*
-        )*
-        \x1b \x28 B [\t\n\r\x20-\x7E]*
-      )*
-     \z/nox =~ str.dup.force_encoding('BINARY') ? true : false
-  end
-  module_function :isjis
-
-  # call-seq:
-  #    Kconv.isutf8(str)   => true or false
+  #    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)
-    str.dup.force_encoding(UTF8).valid_encoding?
+    RegexpUtf8.match( str )
   end
   module_function :isutf8
+
 end
 
 class String
   # call-seq:
-  #    String#kconv(to_enc, from_enc)
+  #    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.
-  def kconv(to_enc, from_enc=nil)
-    form_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0]
-    Kconv::kconv(self, to_enc, from_enc)
+  #
+  # *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
   
   #
@@ -211,72 +283,85 @@ class String
   #
   
   # call-seq:
-  #    String#tojis   => string
+  #    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
+  #    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
+  #    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
+  #    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
+  #    String#toutf16   -> string
   #
   # Convert <code>self</code> to UTF-16
-  def toutf16; Kconv.toutf16(self) end
-
-  # call-seq:
-  #    String#toutf32   => string
-  #
-  # Convert <code>self</code> to UTF-32
-  def toutf32; Kconv.toutf32(self) end
-
-  # call-seq:
-  #    String#tolocale   => string
   #
-  # Convert <code>self</code> to locale encoding
-  def tolocale; Kconv.tolocale(self) end
+  # *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   => true or false
+  #    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   => true or false
+  #    String#issjis   -> obj or nil
   #
   # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
-  def issjis;	Kconv.issjis(self) end
-
-  # call-seq:
-  #    String#isjis   => true or false
   #
-  # Returns whether <code>self</code>'s encoding is ISO-2022-JP or not.
-  def isjis;	Kconv.isjis(self) end
+  # *Note* don't expect this return value is MatchData.
+  def issjis;	Kconv.issjis(self) end
 
   # call-seq:
-  #    String#isutf8   => true or false
+  #    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
 end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
index 50daa891fa..9da82c6aee 100644
--- a/ext/nkf/nkf-utf8/config.h
+++ b/ext/nkf/nkf-utf8/config.h
@@ -1,52 +1,88 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-/* UTF8 input and output */
+/* UTF8 $BF~=PNO(B */
 #define UTF8_INPUT_ENABLE
 #define UTF8_OUTPUT_ENABLE
 
-/* invert characters invalid in Shift_JIS to CP932 */
+/* Shift_JIS $BHO0O30$NJ8;z$r!"(BCP932 $B$GF1CM$JJ8;z$KFI$_49$($k(B */
 #define SHIFTJIS_CP932
 
-/* fix input encoding when given by option */
+/* $B%*%W%7%g%s$GF~NO$r;XDj$7$?;~$K!"J8;z%3!<%I$r8GDj$9$k(B */
 #define INPUT_CODE_FIX
 
-/* --overwrite option */
+/* --overwrite $B%*%W%7%g%s(B */
 /* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
 #define OVERWRITE
 
-/* --cap-input, --url-input option */
+/* --cap-input, --url-input $B%*%W%7%g%s(B */
 #define INPUT_OPTION
 
-/* --numchar-input option */
+/* --numchar-input $B%*%W%7%g%s(B */
 #define NUMCHAR_OPTION
 
-/* --debug, --no-output option */
+/* --debug, --no-output $B%*%W%7%g%s(B */
 #define CHECK_OPTION
 
 /* JIS X0212 */
 #define X0212_ENABLE
 
-/* --exec-in, --exec-out option
- * require pipe, fork, execvp and so on.
- * please undef this on MS-DOS, MinGW
- * this is still buggy arround child process
+/* --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
 
-/*
- * Select Default Output Encoding
- * 
- */
+#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
 
-/* #define DEFAULT_CODE_JIS    */
-/* #define DEFAULT_CODE_SJIS   */
-/* #define DEFAULT_CODE_EUC    */
-/* #define DEFAULT_CODE_UTF8   */
-/* #define DEFAULT_CODE_LOCALE */
+#if defined(NUMCHAR_OPTION) && !defined(UTF8_INPUT_ENABLE)
+#define UTF8_INPUT_ENABLE
+#endif
 
-#endif /* _CONFIG_H_ */
+#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
index a4ad15dcfb..3cd1b160da 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1,300 +1,290 @@
 /** Network Kanji Filter. (PDS Version)
- ** -*- coding: ISO-2022-JP -*-
- ************************************************************************
- ** 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.
- ***********************************************************************/
+************************************************************************
+** 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.
+***********************************************************************/
 
 /***********************************************************************
- * $B8=:_!"(Bnkf $B$O(B SorceForge $B$K$F%a%s%F%J%s%9$,B3$1$i$l$F$$$^$9!#(B
- * http://sourceforge.jp/projects/nkf/
- ***********************************************************************/
-#define NKF_IDENT "$Id$"
+** 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$ */
 #define NKF_VERSION "2.0.8"
-#define NKF_RELEASE_DATE "2008-02-08"
+#define NKF_RELEASE_DATE "2007-01-28"
+#include "config.h"
+#include "utf8tbl.h"
+
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
-    "Copyright (C) 2002-2008 Kono, Furukawa, Naruse, mastodon"
+    "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
 
-#include "config.h"
-#include "nkf.h"
-#include "utf8tbl.h"
 
-/* state of output_mode and input_mode
+/*
+**
+**
+**
+** USAGE:       nkf [flags] [file] 
+**
+** Flags:
+** b    Output is buffered             (DEFAULT)
+** u    Output is unbuffered
+**
+** t    no operation
+**
+** j    Output 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
-   JIS_X_0201_1976_K
-   ISO_8859_1
-   JIS_X_0208
-   EOF      all termination
+                X0201
+                ISO8859_1
+                X0208
+                EOF      all termination
    c1           32bit data
 
  */
 
-/* MIME ENCODE */
-
+#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         EUC_INPUT      16
+#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		UTF16_INPUT    1015
+#define		UTF32_INPUT    1017
+
 /* byte order */
-enum byte_order {
-    ENDIAN_BIG    = 1,
-    ENDIAN_LITTLE = 2,
-    ENDIAN_2143   = 3,
-    ENDIAN_3412   = 4
-};
+
+#define		ENDIAN_BIG	1234
+#define		ENDIAN_LITTLE	4321
+#define		ENDIAN_2143	2143
+#define		ENDIAN_3412	3412
+
+#define         WISH_TRUE      15
 
 /* ASCII CODE */
 
 #define         BS      0x08
 #define         TAB     0x09
-#define         LF      0x0a
+#define         NL      0x0a
 #define         CR      0x0d
 #define         ESC     0x1b
-#define         SP      0x20
+#define         SPACE   0x20
+#define         AT      0x40
+#define         SSP     0xa0
 #define         DEL     0x7f
 #define         SI      0x0f
 #define         SO      0x0e
-#define         SS2     0x8e
+#define         SSO     0x8e
 #define         SS3     0x8f
-#define         CRLF    0x0D0A
-
-
-/* encodings */
-
-enum nkf_encodings {
-    ASCII,
-    ISO_8859_1,
-    ISO_2022_JP,
-    CP50220,
-    CP50221,
-    CP50222,
-    ISO_2022_JP_1,
-    ISO_2022_JP_3,
-    ISO_2022_JP_2004,
-    SHIFT_JIS,
-    WINDOWS_31J,
-    CP10001,
-    EUC_JP,
-    EUCJP_NKF,
-    CP51932,
-    EUCJP_MS,
-    EUCJP_ASCII,
-    SHIFT_JISX0213,
-    SHIFT_JIS_2004,
-    EUC_JISX0213,
-    EUC_JIS_2004,
-    UTF_8,
-    UTF_8N,
-    UTF_8_BOM,
-    UTF8_MAC,
-    UTF_16,
-    UTF_16BE,
-    UTF_16BE_BOM,
-    UTF_16LE,
-    UTF_16LE_BOM,
-    UTF_32,
-    UTF_32BE,
-    UTF_32BE_BOM,
-    UTF_32LE,
-    UTF_32LE_BOM,
-    BINARY,
-    NKF_ENCODING_TABLE_SIZE,
-    JIS_X_0201_1976_K = 0x1013, /* I */ /* JIS C 6220-1969 */
-    /* JIS_X_0201_1976_R = 0x1014, */ /* J */ /* JIS C 6220-1969 */
-    /* JIS_X_0208_1978   = 0x1040, */ /* @ */ /* JIS C 6226-1978 */
-    /* JIS_X_0208_1983   = 0x1087, */ /* B */ /* JIS C 6226-1983 */
-    JIS_X_0208        = 0x1168, /* @B */
-    JIS_X_0212        = 0x1159, /* D */
-    /* JIS_X_0213_2000_1 = 0x1228, */ /* O */
-    JIS_X_0213_2 = 0x1229, /* P */
-    JIS_X_0213_1 = 0x1233, /* Q */
-};
-
-static nkf_char s_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char e_iconv(nkf_char c2, nkf_char c1, nkf_char c0);
-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 w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0);
-static void j_oconv(nkf_char c2, nkf_char c1);
-static void s_oconv(nkf_char c2, nkf_char c1);
-static void e_oconv(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);
-static void w_oconv32(nkf_char c2, nkf_char c1);
-
-typedef struct {
-    const char *name;
-    nkf_char (*iconv)(nkf_char c2, nkf_char c1, nkf_char c0);
-    void (*oconv)(nkf_char c2, nkf_char c1);
-} nkf_native_encoding;
-
-nkf_native_encoding NkfEncodingASCII =		{ "ASCII", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingISO_2022_JP =	{ "ISO-2022-JP", e_iconv, j_oconv };
-nkf_native_encoding NkfEncodingShift_JIS =	{ "Shift_JIS", s_iconv, s_oconv };
-nkf_native_encoding NkfEncodingEUC_JP =		{ "EUC-JP", e_iconv, e_oconv };
-nkf_native_encoding NkfEncodingUTF_8 =		{ "UTF-8", w_iconv, w_oconv };
-nkf_native_encoding NkfEncodingUTF_16 =		{ "UTF-16", w_iconv16, w_oconv16 };
-nkf_native_encoding NkfEncodingUTF_32 =		{ "UTF-32", w_iconv32, w_oconv32 };
-
-typedef struct {
-    const int id;
-    const char *name;
-    const nkf_native_encoding *base_encoding;
-} nkf_encoding;
-
-nkf_encoding nkf_encoding_table[] = {
-    {ASCII,		"US-ASCII",		&NkfEncodingASCII},
-    {ISO_8859_1,	"ISO-8859-1",		&NkfEncodingASCII},
-    {ISO_2022_JP,	"ISO-2022-JP",		&NkfEncodingISO_2022_JP},
-    {CP50220,		"CP50220",		&NkfEncodingISO_2022_JP},
-    {CP50221,		"CP50221",		&NkfEncodingISO_2022_JP},
-    {CP50222,		"CP50222",		&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_1,	"ISO-2022-JP-1",	&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_3,	"ISO-2022-JP-3",	&NkfEncodingISO_2022_JP},
-    {ISO_2022_JP_2004,	"ISO-2022-JP-2004",	&NkfEncodingISO_2022_JP},
-    {SHIFT_JIS,		"Shift_JIS",		&NkfEncodingShift_JIS},
-    {WINDOWS_31J,	"Windows-31J",		&NkfEncodingShift_JIS},
-    {CP10001,		"CP10001",		&NkfEncodingShift_JIS},
-    {EUC_JP,		"EUC-JP",		&NkfEncodingEUC_JP},
-    {EUCJP_NKF,		"eucJP-nkf",		&NkfEncodingEUC_JP},
-    {CP51932,		"CP51932",		&NkfEncodingEUC_JP},
-    {EUCJP_MS,		"eucJP-MS",		&NkfEncodingEUC_JP},
-    {EUCJP_ASCII,	"eucJP-ASCII",		&NkfEncodingEUC_JP},
-    {SHIFT_JISX0213,	"Shift_JISX0213",	&NkfEncodingShift_JIS},
-    {SHIFT_JIS_2004,	"Shift_JIS-2004",	&NkfEncodingShift_JIS},
-    {EUC_JISX0213,	"EUC-JISX0213",		&NkfEncodingEUC_JP},
-    {EUC_JIS_2004,	"EUC-JIS-2004",		&NkfEncodingEUC_JP},
-    {UTF_8,		"UTF-8",		&NkfEncodingUTF_8},
-    {UTF_8N,		"UTF-8N",		&NkfEncodingUTF_8},
-    {UTF_8_BOM,		"UTF-8-BOM",		&NkfEncodingUTF_8},
-    {UTF8_MAC,		"UTF8-MAC",		&NkfEncodingUTF_8},
-    {UTF_16,		"UTF-16",		&NkfEncodingUTF_16},
-    {UTF_16BE,		"UTF-16BE",		&NkfEncodingUTF_16},
-    {UTF_16BE_BOM,	"UTF-16BE-BOM",		&NkfEncodingUTF_16},
-    {UTF_16LE,		"UTF-16LE",		&NkfEncodingUTF_16},
-    {UTF_16LE_BOM,	"UTF-16LE-BOM",		&NkfEncodingUTF_16},
-    {UTF_32,		"UTF-32",		&NkfEncodingUTF_32},
-    {UTF_32BE,		"UTF-32BE",		&NkfEncodingUTF_32},
-    {UTF_32BE_BOM,	"UTF-32BE-BOM",		&NkfEncodingUTF_32},
-    {UTF_32LE,		"UTF-32LE",		&NkfEncodingUTF_32},
-    {UTF_32LE_BOM,	"UTF-32LE-BOM",		&NkfEncodingUTF_32},
-    {BINARY,		"BINARY",		&NkfEncodingASCII},
-    {-1,		NULL,			NULL}
-};
-
-struct {
-    const char *name;
-    const int id;
-} encoding_name_to_id_table[] = {
-    {"US-ASCII",		ASCII},
-    {"ASCII",			ASCII},
-    {"ISO-2022-JP",		ISO_2022_JP},
-    {"ISO2022JP-CP932",		CP50220},
-    {"CP50220",			CP50220},
-    {"CP50221",			CP50221},
-    {"CSISO2022JP",		CP50221},
-    {"CP50222",			CP50222},
-    {"ISO-2022-JP-1",		ISO_2022_JP_1},
-    {"ISO-2022-JP-3",		ISO_2022_JP_3},
-    {"ISO-2022-JP-2004",	ISO_2022_JP_2004},
-    {"SHIFT_JIS",		SHIFT_JIS},
-    {"SJIS",			SHIFT_JIS},
-    {"WINDOWS-31J",		WINDOWS_31J},
-    {"CSWINDOWS31J",		WINDOWS_31J},
-    {"CP932",			WINDOWS_31J},
-    {"MS932",			WINDOWS_31J},
-    {"CP10001",			CP10001},
-    {"EUCJP",			EUC_JP},
-    {"EUC-JP",			EUC_JP},
-    {"EUCJP-NKF",		EUCJP_NKF},
-    {"CP51932",			CP51932},
-    {"EUC-JP-MS",		EUCJP_MS},
-    {"EUCJP-MS",		EUCJP_MS},
-    {"EUCJPMS",			EUCJP_MS},
-    {"EUC-JP-ASCII",		EUCJP_ASCII},
-    {"EUCJP-ASCII",		EUCJP_ASCII},
-    {"SHIFT_JISX0213",		SHIFT_JISX0213},
-    {"SHIFT_JIS-2004",		SHIFT_JIS_2004},
-    {"EUC-JISX0213",		EUC_JISX0213},
-    {"EUC-JIS-2004",		EUC_JIS_2004},
-    {"UTF-8",			UTF_8},
-    {"UTF-8N",			UTF_8N},
-    {"UTF-8-BOM",		UTF_8_BOM},
-    {"UTF8-MAC",		UTF8_MAC},
-    {"UTF-8-MAC",		UTF8_MAC},
-    {"UTF-16",			UTF_16},
-    {"UTF-16BE",		UTF_16BE},
-    {"UTF-16BE-BOM",		UTF_16BE_BOM},
-    {"UTF-16LE",		UTF_16LE},
-    {"UTF-16LE-BOM",		UTF_16LE_BOM},
-    {"UTF-32",			UTF_32},
-    {"UTF-32BE",		UTF_32BE},
-    {"UTF-32BE-BOM",		UTF_32BE_BOM},
-    {"UTF-32LE",		UTF_32LE},
-    {"UTF-32LE-BOM",		UTF_32LE_BOM},
-    {"BINARY",			BINARY},
-    {NULL,			-1}
-};
-
-#if defined(DEFAULT_CODE_JIS)
-#define	    DEFAULT_ENCIDX ISO_2022_JP
-#elif defined(DEFAULT_CODE_SJIS)
-#define	    DEFAULT_ENCIDX SHIFT_JIS
-#elif defined(DEFAULT_CODE_EUC)
-#define	    DEFAULT_ENCIDX EUC_JP
-#elif defined(DEFAULT_CODE_UTF8)
-#define	    DEFAULT_ENCIDX UTF_8
-#endif
-
 
 #define		is_alnum(c)  \
-    (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
+            (('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 == SP || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == LF)
+#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) (SP<=c && 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 bin2hex(c) ("0123456789ABCDEF"[c&15])
+                    ('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 nkf_noescape_mime(c) ((c == CR) || (c == LF) || \
-			      ((c > SP) && (c < DEL) && (c != '?') && (c != '=') && (c != '_') \
-			       && (c != '(') && (c != ')') && (c != '.') && (c != 0x22)))
 
+#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 nkf_byte_jisx0201_katakana_p(c) (SP <= c && c < (0xE0&0x7F))
 
 #define         HOLD_SIZE       1024
 #if defined(INT_IS_SHORT)
@@ -306,11 +296,23 @@ struct {
 #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 */
@@ -318,7 +320,7 @@ extern POINT _BufferSize;
 #endif
 
 struct input_code{
-    const char *name;
+    char *name;
     nkf_char stat;
     nkf_char score;
     nkf_char index;
@@ -328,22 +330,31 @@ struct input_code{
     int _file_stat;
 };
 
-static const char *input_codename = NULL; /* NULL: unestablished, "": BINARY */
-static nkf_encoding *input_encoding = NULL;
-static nkf_encoding *output_encoding = NULL;
+static char *input_codename = "";
 
-static int kanji_convert(FILE *f);
+#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
- * 3: CP10001
  */
-#define UCS_MAP_ASCII   0
-#define UCS_MAP_MS      1
-#define UCS_MAP_CP932   2
-#define UCS_MAP_CP10001 3
+#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
@@ -353,13 +364,48 @@ static  int     no_cp932ext_f = FALSE;
 static  int     no_best_fit_chars_f = FALSE;
 static  int     input_endian = ENDIAN_BIG;
 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     w_iconv32(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);
 static  void    w_status(struct input_code *, nkf_char);
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
 static  int     output_bom_f = FALSE;
 static  int     output_endian = ENDIAN_BIG;
-#endif
+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);
+static  void    w_oconv32(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);
@@ -368,9 +414,32 @@ 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 void mime_putc(nkf_char c);
+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 */
 
@@ -378,6 +447,19 @@ static void mime_putc(nkf_char c);
 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 = 0;
+
+/* 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;
@@ -386,60 +468,79 @@ 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 = MIME_DECODE_DEFAULT;   /* convert MIME B base64 or Q */
+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 */
-static int             x0201_f = X0201_DEFAULT; /* convert JIS X 0201 */
-static int             iso2022jp_f = FALSE;    /* replace non ISO-2022-JP with GETA */
+#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
 
-#define PREFIX_EUCG3    NKF_INT32_C(0x8F00)
-#define CLASS_MASK      NKF_INT32_C(0xFF000000)
-#define CLASS_UNICODE   NKF_INT32_C(0x01000000)
-#define VALUE_MASK      NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_BMP_MAX NKF_INT32_C(0x0000FFFF)
-#define UNICODE_MAX     NKF_INT32_C(0x0010FFFF)
-#define nkf_char_euc3_new(c) ((c) | PREFIX_EUCG3)
-#define nkf_char_unicode_new(c) ((c) | CLASS_UNICODE)
-#define nkf_char_unicode_p(c) ((c & CLASS_MASK) == CLASS_UNICODE)
-#define nkf_char_unicode_bmp_p(c) ((c & VALUE_MASK) <= NKF_INT32_C(UNICODE_BMP_MAX))
-#define nkf_char_unicode_value_p(c) ((c & VALUE_MASK) <= NKF_INT32_C(UNICODE_MAX))
+#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_UNICODE	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_UNICODE)
+#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 int debug_f = FALSE;
+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 = 0; /* 0: OFF, 1: ON, 2: VERBOSE */
-static  void    set_input_codename(const char *codename);
+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;
@@ -455,11 +556,23 @@ 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);
 
@@ -468,11 +581,13 @@ struct input_code input_code_list[] = {
     {"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},     NULL, w_iconv16, 0},
+    {"UTF-32",    0, 0, 0, {0, 0, 0},     NULL, w_iconv32, 0},
 #endif
     {0}
 };
 
-static int              mimeout_mode = 0; /* 0, -1, 'Q', 'B', 1, 2 */
+static int              mimeout_mode = 0;
 static int              base64_count = 0;
 
 /* X0208 -> ASCII converter */
@@ -495,28 +610,31 @@ static unsigned char   ascii_intro = DEFAULT_R;
 
 static int             fold_margin  = FOLD_MARGIN;
 
-/* process default */
+/* converters */
 
-static 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 */
-}
+#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
 
-static void
-no_connection(nkf_char c2, nkf_char c1)
-{
-    no_connection2(c2,c1,0);
-}
+/* process default */
+static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
 
-static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
 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_eol_conv)(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;
@@ -542,15 +660,17 @@ 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 */
-static int input_mode =  ASCII;    /* input kanji mode */
+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[]= {
+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,
@@ -572,7 +692,8 @@ static const unsigned char cv[]= {
 
 /* X0201 kana conversion table for daguten */
 /* 90-9F A0-DF */
-static const unsigned char dv[]= {
+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,
@@ -593,7 +714,8 @@ static const unsigned char dv[]= {
 
 /* X0201 kana conversion table for han-daguten */
 /* 90-9F A0-DF */
-static const unsigned char ev[]= {
+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,
@@ -615,7 +737,8 @@ static const unsigned char ev[]= {
 
 /* X0208 kigou conversion table */
 /* 0x8140 - 0x819e */
-static const unsigned char fv[] = {
+static const
+unsigned char fv[] = {
 
     0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
     0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
@@ -632,19 +755,18 @@ static const unsigned char fv[] = {
 } ;
 
 
+#define    CRLF      1
 
-static int option_mode = 0;
 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 eolmode_f = 0;   /* CR, LF, CRLF */
-static int input_eol = 0; /* 0: unestablished, EOF: MIXED */
-static nkf_char prev_cr = 0; /* CR or 0 */
+static int             crmode_f = 0;   /* CR, NL, CRLF */
 #ifdef EASYWIN /*Easy Win */
 static int             end_check;
 #endif /*Easy Win */
@@ -653,239 +775,263 @@ static int             end_check;
 nkf_char std_gc_buf[STD_GC_BUFSIZE];
 nkf_char std_gc_ndx;
 
-static int
-nkf_str_caseeql(const char *src, const char *target)
+#ifdef WIN32DLL
+#include "nkf32dll.c"
+#elif defined(PERL_XS)
+#else /* WIN32DLL */
+int main(int argc, char **argv)
 {
-    int i;
-    for (i = 0; src[i] && target[i]; i++) {
-	if (nkf_toupper(src[i]) != nkf_toupper(target[i])) return FALSE;
-    }
-    if (src[i] || target[i]) return FALSE;
-    else return TRUE;
-}
+    FILE  *fin;
+    unsigned char  *cp;
 
-static nkf_encoding*
-nkf_enc_from_index(int idx)
-{
-    if (idx < 0 || NKF_ENCODING_TABLE_SIZE <= idx) {
-	return 0;
-    }
-    return &nkf_encoding_table[idx];
-}
+    char *outfname = NULL;
+    char *origfname;
 
-static int
-nkf_enc_find_index(const char *name)
-{
-    int i;
-    if (name[0] == 'X' && *(name+1) == '-') name += 2;
-    for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) {
-	if (nkf_str_caseeql(encoding_name_to_id_table[i].name, name)) {
-	    return encoding_name_to_id_table[i].id;
-	}
-    }
-    return -1;
-}
+#ifdef EASYWIN /*Easy Win */
+    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
+#endif
 
-static nkf_encoding*
-nkf_enc_find(const char *name)
-{
-    int idx = -1;
-    idx = nkf_enc_find_index(name);
-    if (idx < 0) return 0;
-    return nkf_enc_from_index(idx);
-}
+    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);
 
-#define nkf_enc_name(enc) (enc)->name
-#define nkf_enc_to_index(enc) (enc)->id
-#define nkf_enc_to_base_encoding(enc) (enc)->base_encoding
-#define nkf_enc_to_iconv(enc) nkf_enc_to_base_encoding(enc)->iconv
-#define nkf_enc_to_oconv(enc) nkf_enc_to_base_encoding(enc)->oconv
-#define nkf_enc_asciicompat(enc) (\
-				  nkf_enc_to_base_encoding(enc) == &NkfEncodingASCII ||\
-				  nkf_enc_to_base_encoding(enc) == &NkfEncodingISO_2022_JP)
-#define nkf_enc_unicode_p(enc) (\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_8 ||\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_16 ||\
-				nkf_enc_to_base_encoding(enc) == &NkfEncodingUTF_32)
-#define nkf_enc_cp5022x_p(enc) (\
-				nkf_enc_to_index(enc) == CP50220 ||\
-				nkf_enc_to_index(enc) == CP50221 ||\
-				nkf_enc_to_index(enc) == CP50222)
-
-#ifdef DEFAULT_CODE_LOCALE
-static char*
-nkf_locale_charmap()
-{
-#ifdef HAVE_LANGINFO_H
-    return nl_langinfo(CODESET);
-#elif defined(__WIN32__)
-    return sprintf("CP%d", GetACP());
+    if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+    if (freopen("","wb",stdout) == NULL) 
+        return (-1);
 #else
-    return NULL;
+    setbinmode(stdout);
 #endif
-}
 
-static nkf_encoding*
-nkf_locale_encoding()
-{
-    nkf_encoding *enc = 0;
-    char *encname = nkf_locale_charmap();
-    if (encname)
-	enc = nkf_enc_find(encname);
-    if (enc < 0) enc = 0;
-    return enc;
-}
-#endif /* DEFAULT_CODE_LOCALE */
+    if (unbuf_f)
+      setbuf(stdout, (char *) NULL);
+    else
+      setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
 
-static nkf_encoding*
-nkf_default_encoding()
-{
-    nkf_encoding *enc = 0;
-#ifdef DEFAULT_CODE_LOCALE
-    enc = nkf_locale_encoding();
-#elif DEFAULT_ENCIDX
-    enc = nkf_enc_from_index(DEFAULT_ENCIDX);
+    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;
+	int is_argument_error = FALSE;
+      while (argc--) {
+	    is_inputcode_mixed = FALSE;
+	    is_inputcode_set   = FALSE;
+	    input_codename = "";
+#ifdef CHECK_OPTION
+	    iconv_for_check = 0;
 #endif
-    return enc;
-}
-
-#ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
+          if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
+              perror(*--argv);
+		*argv++;
+		is_argument_error = TRUE;
+		continue;
+          } else {
+#ifdef OVERWRITE
+              int fd = 0;
+              int fd_backup = 0;
 #endif
 
-static void
-version(void)
-{
-    fprintf(HELP_OUTPUT,"Network Kanji Filter Version " NKF_VERSION " (" NKF_RELEASE_DATE ") \n" COPY_RIGHT "\n");
-}
-
-static void
-usage(void)
-{
-    fprintf(HELP_OUTPUT,
-	    "USAGE:  nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n"
-	    "Flags:\n"
-	    "b,u      Output is buffered (DEFAULT),Output is unbuffered\n"
-	    "j,s,e,w  Output code is ISO-2022-JP, Shift JIS, EUC-JP, UTF-8N\n"
-#ifdef UTF8_OUTPUT_ENABLE
-	    "         After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n"
-#endif
-	    "J,S,E,W  Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n"
-#ifdef UTF8_INPUT_ENABLE
-	    "         After 'W' you can add more options. -W[ 8, 16 [BL] ] \n"
-#endif
-	    "t        no conversion\n"
-	    "i[@B]    Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n"
-	    "o[BJH]   Specify the Esc Seq for ASCII/Roman        (DEFAULT B)\n"
-	    "r        {de/en}crypt ROT13/47\n"
-	    "h        1 katakana->hiragana, 2 hiragana->katakana, 3 both\n"
-	    "m[BQSN0] MIME decode [B:base64,Q:quoted,S:strict,N:non-strict,0:no decode]\n"
-	    "M[BQ]    MIME encode [B:base64 Q:quoted]\n"
-	    "l        ISO8859-1 (Latin-1) support\n"
-	    "f/F      Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n"
-	    "Z[0-4]   Default/0: Convert JISX0208 Alphabet to ASCII\n"
-	    "         1: Kankaku to one space  2: to two spaces  3: HTML Entity\n"
-	    "         4: JISX0208 Katakana to JISX0201 Katakana\n"
-	    "X,x      Assume X0201 kana in MS-Kanji, -x preserves X0201\n"
-	    "B[0-2]   Broken input  0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n"
-#ifdef MSDOS
-	    "T        Text mode output\n"
-#endif
-	    "O        Output to File (DEFAULT 'nkf.out')\n"
-	    "I        Convert non ISO-2022-JP charactor to GETA\n"
-	    "d,c      Convert line breaks  -d: LF  -c: CRLF\n"
-	    "-L[uwm]  line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n"
-	    "v, V     Show this usage. V: show configuration\n"
-	    "\n"
-	    "Long name options\n"
-	    " --ic=<input codeset>  --oc=<output codeset>\n"
-	    "                   Specify the input or output codeset\n"
-	    " --fj  --unix --mac  --windows\n"
-	    " --jis  --euc  --sjis  --utf8  --utf16  --mime  --base64\n"
-	    "                   Convert for the system or code\n"
-	    " --hiragana  --katakana  --katakana-hiragana\n"
-	    "                   To Hiragana/Katakana Conversion\n"
-	    " --prefix=         Insert escape before troublesome characters of Shift_JIS\n"
-#ifdef INPUT_OPTION
-	    " --cap-input, --url-input  Convert hex after ':' or '%%'\n"
-#endif
-#ifdef NUMCHAR_OPTION
-	    " --numchar-input   Convert Unicode Character Reference\n"
-#endif
-#ifdef UTF8_INPUT_ENABLE
-	    " --fb-{skip, html, xml, perl, java, subchar}\n"
-	    "                   Specify how nkf handles unassigned characters\n"
-#endif
+/* reopen file for stdout */
+              if (file_out_f == TRUE) {
 #ifdef OVERWRITE
-	    " --in-place[=SUFFIX]  --overwrite[=SUFFIX]\n"
-	    "                   Overwrite original listed files by filtered result\n"
-	    "                   --overwrite preserves timestamp of original files\n"
-#endif
-	    " -g  --guess       Guess the input code\n"
-	    " --help  --version Show this help/the version\n"
-	    "                   For more information, see also man nkf\n"
-	    "\n");
-    version();
-}
-
-static void
-show_configuration(void)
-{
-    fprintf(HELP_OUTPUT,
-	    "Summary of my nkf " NKF_VERSION " (" NKF_RELEASE_DATE ") configuration:\n"
-	    "  nkf identity:\n"
-	    "    " NKF_IDENT "\n"
-	    "  Compile-time options:\n"
-	    "    Compiled at:                 " __DATE__ " " __TIME__ "\n"
-	   );
-    fprintf(HELP_OUTPUT,
-	    "    Default output encoding:     "
-#ifdef DEFAULT_CODE_LOCALE
-	    "LOCALE (%s)\n", nkf_enc_name(nkf_default_encoding())
-#elif DEFAULT_ENCIDX
-	    "CONFIG (%s)\n", nkf_enc_name(nkf_default_encoding())
+                  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
-	    "NONE\n"
-#endif
-	   );
-    fprintf(HELP_OUTPUT,
-	    "    Default output end of line:  "
-#if DEFAULT_NEWLINE == CR
-	    "CR"
-#elif DEFAULT_NEWLINE == CRLF
-	    "CRLF"
+                      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
-	    "LF"
+                      setbinmode(stdout);
 #endif
-	    "\n"
-	    "    Decode MIME encoded string:  "
-#if MIME_DECODE_DEFAULT
-	    "ON"
+                  }
+              }
+              if (binmode_f == TRUE)
+#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
+                 if (freopen("","rb",fin) == NULL) 
+                    return (-1);
 #else
-	    "OFF"
-#endif
-	    "\n"
-	    "    Convert JIS X 0201 Katakana: "
-#if X0201_DEFAULT
-	    "ON"
+                 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
-	    "OFF"
-#endif
-	    "\n"
-	    "    --help, --version output:    "
-#if HELP_OUTPUT_HELP_OUTPUT
-	    "HELP_OUTPUT"
+                  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
-	    "STDOUT"
+			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
-	    "\n");
+		    }
+                  if (rename(outfname, origfname)) {
+                      perror(origfname);
+                      fprintf(stderr, "Can't rename %s to %s\n",
+                              outfname, origfname);
+                  }
+                  free(outfname);
+              }
+#endif
+          }
+      }
+	if (is_argument_error)
+	    return(-1);
+    }
+#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 /*PERL_XS*/
+#endif /* WIN32DLL */
 
 #ifdef OVERWRITE
-static char*
-get_backup_filename(const char *suffix, const char *filename)
+char *get_backup_filename(const char *suffix, const char *filename)
 {
     char *backup_filename;
     int asterisk_count = 0;
@@ -915,7 +1061,8 @@ get_backup_filename(const char *suffix, const char *filename)
 	}
 	backup_filename[j] = '\0';
     }else{
-	backup_filename = malloc(filename_length + strlen(suffix) + 1);
+	j = strlen(suffix) + filename_length;
+	backup_filename = malloc( + 1);
 	strcpy(backup_filename, filename);
 	strcat(backup_filename, suffix);
 	backup_filename[j] = '\0';
@@ -924,102 +1071,8 @@ get_backup_filename(const char *suffix, const char *filename)
 }
 #endif
 
-#ifdef UTF8_INPUT_ENABLE
-static void
-nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
-{
-    int shift = 20;
-    c &= VALUE_MASK;
-    while(shift >= 0){
-	if(c >= 1<<shift){
-	    while(shift >= 0){
-		(*f)(0, bin2hex(c>>shift));
-		shift -= 4;
-	    }
-	}else{
-	    shift -= 4;
-	}
-    }
-    return;
-}
-
-static 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;
-}
-
-static void
-encode_fallback_xml(nkf_char c)
-{
-    (*oconv)(0, '&');
-    (*oconv)(0, '#');
-    (*oconv)(0, 'x');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, ';');
-    return;
-}
-
-static void
-encode_fallback_java(nkf_char c)
-{
-    (*oconv)(0, '\\');
-    c &= VALUE_MASK;
-    if(!nkf_char_unicode_bmp_p(c)){
-	(*oconv)(0, 'U');
-	(*oconv)(0, '0');
-	(*oconv)(0, '0');
-	(*oconv)(0, bin2hex(c>>20));
-	(*oconv)(0, bin2hex(c>>16));
-    }else{
-	(*oconv)(0, 'u');
-    }
-    (*oconv)(0, bin2hex(c>>12));
-    (*oconv)(0, bin2hex(c>> 8));
-    (*oconv)(0, bin2hex(c>> 4));
-    (*oconv)(0, bin2hex(c    ));
-    return;
-}
-
-static void
-encode_fallback_perl(nkf_char c)
-{
-    (*oconv)(0, '\\');
-    (*oconv)(0, 'x');
-    (*oconv)(0, '{');
-    nkf_each_char_to_hex(oconv, c);
-    (*oconv)(0, '}');
-    return;
-}
-
-static void
-encode_fallback_subchar(nkf_char c)
-{
-    c = unicode_subchar;
-    (*oconv)((c>>8)&0xFF, c&0xFF);
-    return;
-}
-#endif
-
-static const struct {
+static const
+struct {
     const char *name;
     const char *alias;
 } long_option[] = {
@@ -1044,8 +1097,7 @@ static const struct {
     {"hiragana","h1"},
     {"katakana","h2"},
     {"katakana-hiragana","h3"},
-    {"guess=", ""},
-    {"guess", "g2"},
+    {"guess", "g"},
     {"cp932", ""},
     {"no-cp932", ""},
 #ifdef X0212_ENABLE
@@ -1099,411 +1151,2019 @@ static const struct {
     {"prefix=", ""},
 };
 
-static void
-set_input_encoding(nkf_encoding *enc)
+static int option_mode = 0;
+
+void options(unsigned char *cp)
 {
-    switch (nkf_enc_to_index(enc)) {
-    case ISO_8859_1:
-	iso8859_f = TRUE;
-	break;
-    case CP50220:
-    case CP50221:
-    case CP50222:
+    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){
+			input_f = JIS_INPUT;
+		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
+		      strcmp(codeset, "CP50220") == 0 ||
+		      strcmp(codeset, "CP50221") == 0 ||
+		      strcmp(codeset, "CP50222") == 0){
+			input_f = JIS_INPUT;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
+			cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+			ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-	break;
-    case ISO_2022_JP_1:
-	x0212_f = TRUE;
-	break;
-    case ISO_2022_JP_3:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-	break;
-    case ISO_2022_JP_2004:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
-	break;
-    case SHIFT_JIS:
-	break;
-    case WINDOWS_31J:
-#ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+			input_f = JIS_INPUT;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
 #endif
-	break;
-	break;
-    case CP10001:
+		    }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;
+		    }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
+			     strcmp(codeset, "CSWINDOWS31J") == 0 ||
+			     strcmp(codeset, "CP932") == 0 ||
+			     strcmp(codeset, "MS932") == 0){
+			input_f = SJIS_INPUT;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
+			cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP10001;
+			ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-	break;
-    case EUC_JP:
-	break;
-    case EUCJP_NKF:
-	break;
-    case CP51932:
+		    }else if(strcmp(codeset, "EUCJP") == 0 ||
+			     strcmp(codeset, "EUC-JP") == 0){
+			input_f = EUC_INPUT;
+		    }else if(strcmp(codeset, "CP51932") == 0){
+			input_f = EUC_INPUT;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = TRUE;
+			cp51932_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+			ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-	break;
-    case EUCJP_MS:
+		    }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
+			     strcmp(codeset, "EUCJP-MS") == 0 ||
+			     strcmp(codeset, "EUCJPMS") == 0){
+			input_f = EUC_INPUT;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
+			cp51932_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_MS;
+			ms_ucs_map_f = UCS_MAP_MS;
 #endif
-	break;
-    case EUCJP_ASCII:
+		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+			     strcmp(codeset, "EUCJP-ASCII") == 0){
+			input_f = EUC_INPUT;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
+			cp51932_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
+			ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-	break;
-    case SHIFT_JISX0213:
-    case SHIFT_JIS_2004:
-	x0213_f = TRUE;
+		    }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;
+			cp51932_f = FALSE;
 #endif
-	break;
-    case EUC_JISX0213:
-    case EUC_JIS_2004:
-	x0213_f = TRUE;
+		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+			     strcmp(codeset, "EUC-JIS-2004") == 0){
+			input_f = EUC_INPUT;
+			x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-	cp51932_f = FALSE;
+			cp51932_f = FALSE;
 #endif
-	break;
 #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
-    case UTF8_MAC:
-	nfc_f = TRUE;
-	break;
+		    }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 ||
+			     strcmp(codeset, "UTF-16BE") == 0 ||
+			     strcmp(codeset, "UTF-16BE-BOM") == 0){
+			input_f = UTF16_INPUT;
+			input_endian = ENDIAN_BIG;
+		    }else if(strcmp(codeset, "UTF-16LE") == 0 ||
+			     strcmp(codeset, "UTF-16LE-BOM") == 0){
+			input_f = UTF16_INPUT;
+			input_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-32") == 0 ||
+			     strcmp(codeset, "UTF-32BE") == 0 ||
+			     strcmp(codeset, "UTF-32BE-BOM") == 0){
+			input_f = UTF32_INPUT;
+			input_endian = ENDIAN_BIG;
+		    }else if(strcmp(codeset, "UTF-32LE") == 0 ||
+			     strcmp(codeset, "UTF-32LE-BOM") == 0){
+			input_f = UTF32_INPUT;
+			input_endian = ENDIAN_LITTLE;
 #endif
-    case UTF_16:
-    case UTF_16BE:
-    case UTF_16BE_BOM:
-	input_endian = ENDIAN_BIG;
-	break;
-    case UTF_16LE:
-    case UTF_16LE_BOM:
-	input_endian = ENDIAN_LITTLE;
-	break;
-    case UTF_32:
-    case UTF_32BE:
-    case UTF_32BE_BOM:
-	input_endian = ENDIAN_BIG;
-	break;
-    case UTF_32LE:
-    case UTF_32LE_BOM:
-	input_endian = ENDIAN_LITTLE;
-	break;
+		    }
+                    continue;
+		}
+                if (strcmp(long_option[i].name, "oc=") == 0){
+		    x0201_f = FALSE;
+		    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){
+			output_conv = j_oconv;
+		    }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
+			output_conv = j_oconv;
+			no_cp932ext_f = TRUE;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
 #endif
-    }
-}
-
-static void
-set_output_encoding(nkf_encoding *enc)
-{
-    switch (nkf_enc_to_index(enc)) {
-    case CP50220:
-	x0201_f = TRUE;
+#ifdef UTF8_OUTPUT_ENABLE
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "CP50220") == 0){
+			output_conv = j_oconv;
+			x0201_f = TRUE;
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+			ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-	break;
-    case CP50221:
+		    }else if(strcmp(codeset, "CP50221") == 0){
+			output_conv = j_oconv;
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+			ms_ucs_map_f = UCS_MAP_CP932;
+#endif
+		    }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
+			output_conv = j_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
 #endif
-	break;
-    case ISO_2022_JP_1:
-	x0212_f = TRUE;
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_f = FALSE;
 #endif
-	break;
-    case ISO_2022_JP_3:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
+		    }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
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_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;
+#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;
+#ifdef SHIFTJIS_CP932
+			cp932inv_f = FALSE;
 #endif
-	break;
-    case SHIFT_JIS:
-	break;
-    case WINDOWS_31J:
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+			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;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
 #endif
-	break;
-    case CP10001:
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP10001;
+			ms_ucs_map_f = UCS_MAP_MS;
 #endif
-	break;
-    case EUC_JP:
-	x0212_f = TRUE;
-#ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+		    }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
+			     strcmp(codeset, "EUCJP-ASCII") == 0){
+			output_conv = e_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
+			ms_ucs_map_f = UCS_MAP_ASCII;
 #endif
-	break;
-    case EUCJP_NKF:
-	x0212_f = FALSE;
+		    }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
+			     strcmp(codeset, "SHIFT_JIS-2004") == 0){
+			output_conv = s_oconv;
+			x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_f = FALSE;
 #endif
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
+		    }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
+			     strcmp(codeset, "EUC-JIS-2004") == 0){
+			output_conv = e_oconv;
+#ifdef X0212_ENABLE
+			x0212_f = TRUE;
 #endif
-	break;
-    case CP51932:
+			x0213_f = TRUE;
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+			cp932inv_f = FALSE;
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_CP932;
+		    }else if(strcmp(codeset, "UTF-8") == 0){
+			output_conv = w_oconv;
+		    }else if(strcmp(codeset, "UTF-8N") == 0){
+			output_conv = w_oconv;
+		    }else if(strcmp(codeset, "UTF-8-BOM") == 0){
+			output_conv = w_oconv;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-16BE") == 0){
+			output_conv = w_oconv16;
+		    }else if(strcmp(codeset, "UTF-16") == 0 ||
+			     strcmp(codeset, "UTF-16BE-BOM") == 0){
+			output_conv = w_oconv16;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-16LE") == 0){
+			output_conv = w_oconv16;
+			output_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
+			output_conv = w_oconv16;
+			output_endian = ENDIAN_LITTLE;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-32") == 0 ||
+			     strcmp(codeset, "UTF-32BE") == 0){
+			output_conv = w_oconv32;
+		    }else if(strcmp(codeset, "UTF-32BE-BOM") == 0){
+			output_conv = w_oconv32;
+			output_bom_f = TRUE;
+		    }else if(strcmp(codeset, "UTF-32LE") == 0){
+			output_conv = w_oconv32;
+			output_endian = ENDIAN_LITTLE;
+		    }else if(strcmp(codeset, "UTF-32LE-BOM") == 0){
+			output_conv = w_oconv32;
+			output_endian = ENDIAN_LITTLE;
+			output_bom_f = TRUE;
 #endif
-	break;
-    case EUCJP_MS:
-	x0212_f = TRUE;
-#ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_MS;
+		    }
+                    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
-	break;
-    case EUCJP_ASCII:
-	x0212_f = TRUE;
 #ifdef UTF8_OUTPUT_ENABLE
-	ms_ucs_map_f = UCS_MAP_ASCII;
+                    ms_ucs_map_f = UCS_MAP_CP932;
 #endif
-	break;
-    case SHIFT_JISX0213:
-    case SHIFT_JIS_2004:
-	x0213_f = TRUE;
+                    continue;
+                }
+                if (strcmp(long_option[i].name, "no-cp932") == 0){
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+                    cp51932_f = FALSE;
+                    cp932inv_f = FALSE;
 #endif
-	break;
-    case EUC_JISX0213:
-    case EUC_JIS_2004:
-	x0212_f = TRUE;
-	x0213_f = TRUE;
+#ifdef UTF8_OUTPUT_ENABLE
+                    ms_ucs_map_f = UCS_MAP_ASCII;
+#endif
+                    continue;
+                }
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f == TRUE) cp932inv_f = FALSE;
+                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
-	break;
 #ifdef UTF8_OUTPUT_ENABLE
-    case UTF_8_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_16:
-    case UTF_16BE_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_16LE:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = FALSE;
-	break;
-    case UTF_16LE_BOM:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = TRUE;
-	break;
-    case UTF_32BE_BOM:
-	output_bom_f = TRUE;
-	break;
-    case UTF_32LE:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = FALSE;
-	break;
-    case UTF_32LE_BOM:
-	output_endian = ENDIAN_LITTLE;
-	output_bom_f = TRUE;
-	break;
+                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;
+            cp932inv_f = FALSE;
+            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 (cp[0] == '8') {
+		output_conv = w_oconv; cp++;
+		if (cp[0] == '0'){
+		    cp++;
+		} else {
+		    output_bom_f = TRUE;
+		}
+	    } else {
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    output_conv = w_oconv16; cp+=2;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    output_conv = w_oconv32; cp+=2;
+		} else {
+		    output_conv = w_oconv;
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    output_endian = ENDIAN_LITTLE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+                } else {
+		    continue;
+                }
+		if (cp[0] == '0'){
+		    cp++;
+		} else {
+		    output_bom_f = TRUE;
+		}
+	    }
+            continue;
+#endif
+#ifdef UTF8_INPUT_ENABLE
+        case 'W':           /* UTF input */
+	    if (cp[0] == '8') {
+		cp++;
+		input_f = UTF8_INPUT;
+	    }else{
+		if ('1'== cp[0] && '6'==cp[1]) {
+		    cp += 2;
+		    input_f = UTF16_INPUT;
+		    input_endian = ENDIAN_BIG;
+		} else if ('3'== cp[0] && '2'==cp[1]) {
+		    cp += 2;
+		    input_f = UTF32_INPUT;
+		    input_endian = ENDIAN_BIG;
+		} else {
+		    input_f = UTF8_INPUT;
+		    continue;
+		}
+		if (cp[0]=='L') {
+		    cp++;
+		    input_endian = ENDIAN_LITTLE;
+		} else if (cp[0] == 'B') {
+		    cp++;
+		}
+	    }
+            continue;
+#endif
+        /* Input code assumption */
+        case 'J':   /* JIS input */
+            input_f = JIS_INPUT;
+            continue;
+        case 'E':   /* AT&T EUC input */
+            input_f = EUC_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;
+        }
     }
 }
 
-static struct input_code*
-find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
 {
     if (iconv_func){
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    if (iconv_func == p->iconv_func){
-		return p;
-	    }
-	    p++;
-	}
+        struct input_code *p = input_code_list;
+        while (p->name){
+            if (iconv_func == p->iconv_func){
+                return p;
+            }
+            p++;
+        }
     }
     return 0;
 }
 
-static void
-set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
+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_encoding)
+    if (f || !input_f)
 #endif
-	if (estab_f != f){
-	    estab_f = f;
-	}
+        if (estab_f != f){
+            estab_f = f;
+        }
 
     if (iconv_func
 #ifdef INPUT_CODE_FIX
-	&& (f == -TRUE || !input_encoding) /* -TRUE means "FORCE" */
+        && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
 #endif
-       ){
-	iconv = iconv_func;
+        ){
+        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(p->name);
-	}
-	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
 }
 
-#ifdef X0212_ENABLE
-static nkf_char
-x0212_shift(nkf_char c)
+#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)
 {
-    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);
-	}
+    if (ptr){
+        ptr->score |= score;
     }
-    return ret;
 }
 
+void clr_code_score(struct input_code *ptr, nkf_char score)
+{
+    if (ptr){
+        ptr->score &= ~score;
+    }
+}
 
-static nkf_char
-x0212_unshift(nkf_char c)
+void code_score(struct input_code *ptr)
 {
-    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));
+    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);
     }
-    return ret;
 }
+
+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;
+    }
+}
 
-static nkf_char
-e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+void e_status(struct input_code *ptr, nkf_char c)
 {
-    nkf_char ndx;
-    if (is_eucg3(c2)){
-	ndx = c2 & 0x7f;
-	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;
+    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 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 if (0xf0 <= c && c <= 0xf4){
+              ptr->stat = 3;
+              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;
+      case 3:
+	if (0x80 <= c && c <= 0xbf){
+	    if (ptr->index < ptr->stat){
+		status_push_ch(ptr, c);
+	    } else {
+	    	status_clear(ptr);
 	    }
-	    return 1;
+          }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){
+        if (!p->status_func) {
+	    ++p;
+	    continue;
 	}
+        if (!p->status_func)
+	    continue;
+        (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 == EUC_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 == UTF16_INPUT) {
+        set_iconv(-TRUE, w_iconv16);
+    } else if (input_f == UTF32_INPUT) {
+        set_iconv(-TRUE, w_iconv32);
+#endif
+    } else {
+        set_iconv(FALSE, e_iconv);
+    }
+
+    {
+        struct input_code *p = input_code_list;
+        while (p->name){
+            status_reinit(p++);
+        }
+    }
+}
+
+/*
+ * Check and Ignore BOM
+ */
+void check_bom(FILE *f)
+{
+    int c2;
+    switch(c2 = (*i_getc)(f)){
+    case 0x00:
+	if((c2 = (*i_getc)(f)) == 0x00){
+	    if((c2 = (*i_getc)(f)) == 0xFE){
+		if((c2 = (*i_getc)(f)) == 0xFF){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_BIG;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFE,f);
+	    }else if(c2 == 0xFF){
+		if((c2 = (*i_getc)(f)) == 0xFE){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_2143;
+			return;
+		    }
+		    (*i_ungetc)(0xFF,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0xFF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0x00,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0x00,f);
+	break;
+    case 0xEF:
+	if((c2 = (*i_getc)(f)) == 0xBB){
+	    if((c2 = (*i_getc)(f)) == 0xBF){
+		if(!input_f){
+		    set_iconv(TRUE, w_iconv);
+		}
+		if (iconv == w_iconv) {
+		    return;
+		}
+		(*i_ungetc)(0xBF,f);
+	    }else (*i_ungetc)(c2,f);
+	    (*i_ungetc)(0xBB,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xEF,f);
+	break;
+    case 0xFE:
+	if((c2 = (*i_getc)(f)) == 0xFF){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_3412;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_f){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_BIG;
+		return;
+	    }
+	    (*i_ungetc)(0xFF,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFE,f);
+	break;
+    case 0xFF:
+	if((c2 = (*i_getc)(f)) == 0xFE){
+	    if((c2 = (*i_getc)(f)) == 0x00){
+		if((c2 = (*i_getc)(f)) == 0x00){
+		    if(!input_f){
+			set_iconv(TRUE, w_iconv32);
+		    }
+		    if (iconv == w_iconv32) {
+			input_endian = ENDIAN_LITTLE;
+			return;
+		    }
+		    (*i_ungetc)(0x00,f);
+		}else (*i_ungetc)(c2,f);
+		(*i_ungetc)(0x00,f);
+	    }else (*i_ungetc)(c2,f);
+	    if(!input_f){
+		set_iconv(TRUE, w_iconv16);
+	    }
+	    if (iconv == w_iconv16) {
+		input_endian = ENDIAN_LITTLE;
+		return;
+	    }
+	    (*i_ungetc)(0xFE,f);
+	}else (*i_ungetc)(c2,f);
+	(*i_ungetc)(0xFF,f);
+	break;
+    default:
+	(*i_ungetc)(c2,f);
+	break;
+    }
+}
+
+/*
+   Conversion main loop. Code detection only. 
+ */
+
+nkf_char kanji_convert(FILE *f)
+{
+    nkf_char    c3, c2=0, c1, c0=0;
+    int is_8bit = FALSE;
+
+    if(input_f == SJIS_INPUT || input_f == EUC_INPUT
+#ifdef UTF8_INPUT_ENABLE
+       || input_f == UTF8_INPUT || input_f == UTF16_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  */
+
+    module_connection();
+    check_bom(f);
+
+    while ((c1 = (*i_getc)(f)) != EOF) {
+#ifdef INPUT_CODE_FIX
+	if (!input_f)
+#endif
+	    code_status(c1);
+        if (c2) {
+            /* second byte */
+            if (c2 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : 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 and not CP5022x UCD */
+			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 */
+#ifdef UTF8_INPUT_ENABLE
+	    if (iconv == w_iconv16) {
+		if (input_endian == ENDIAN_BIG) {
+		    c2 = c1;
+		    if ((c1 = (*i_getc)(f)) != EOF) {
+			if (0xD8 <= c2 && c2 <= 0xDB) {
+			    if ((c0 = (*i_getc)(f)) != EOF) {
+				c0 <<= 8;
+				if ((c3 = (*i_getc)(f)) != EOF) {
+				    c0 |= c3;
+				} else c2 = EOF;
+			    } else c2 = EOF;
+			}
+		    } else c2 = EOF;
+		} else {
+		    if ((c2 = (*i_getc)(f)) != EOF) {
+			if (0xD8 <= c2 && c2 <= 0xDB) {
+			    if ((c3 = (*i_getc)(f)) != EOF) {
+				if ((c0 = (*i_getc)(f)) != EOF) {
+				    c0 <<= 8;
+				    c0 |= c3;
+				} else c2 = EOF;
+			    } else c2 = EOF;
+			}
+		    } else c2 = EOF;
+		}
+		SEND;
+            } else if(iconv == w_iconv32){
+		int c3 = c1;
+		if((c2 = (*i_getc)(f)) != EOF &&
+		   (c1 = (*i_getc)(f)) != EOF &&
+		   (c0 = (*i_getc)(f)) != EOF){
+		    switch(input_endian){
+		    case ENDIAN_BIG:
+			c1 = (c2&0xFF)<<16 | (c1&0xFF)<<8 | (c0&0xFF);
+			break;
+		    case ENDIAN_LITTLE:
+			c1 = (c3&0xFF) | (c2&0xFF)<<8 | (c1&0xFF)<<16;
+			break;
+		    case ENDIAN_2143:
+			c1 = (c3&0xFF)<<16 | (c1&0xFF) | (c0&0xFF)<<8;
+			break;
+		    case ENDIAN_3412:
+			c1 = (c3&0xFF)<<8 | (c2&0xFF) | (c0&0xFF)<<16;
+			break;
+		    }
+		    c2 = 0;
+		}else{
+		    c2 = EOF;
+		}
+		SEND;
+            } else
+#endif
+#ifdef NUMCHAR_OPTION
+            if (is_unicode_capsule(c1)){
+                SEND;
+	    } else
+#endif
+	    if (c1 > ((input_f == JIS_INPUT && ms_ucs_map_f) ? 0x92 : DEL)) {
+                /* 8 bit code */
+                if (!estab_f && !iso8859_f) {
+                    /* not established yet */
+                    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 (c1 == SI && (!is_8bit || mime_decode_mode)) {
+                shift_mode = FALSE; 
+                NEXT;
+            } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
+                shift_mode = TRUE; 
+                NEXT;
+            } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
+                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(nkf_isgraph(ndx)){
-	    nkf_char val = 0;
-	    const unsigned short *ptr;
-	    ptr = x0212_shiftjis[ndx - 0x21];
-	    if (ptr){
-		val = ptr[(c1 & 0x7f) - 0x21];
+                        } 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 == ESC && iconv == s_iconv) {
+		/* ESC in Shift_JIS */
+		if ((c1 = (*i_getc)(f)) == EOF) {
+		    /*  (*oconv)(0, ESC); don't send bogus code */
+		    LAST;
+		} else if (c1 == '$') {
+		    /* J-PHONE emoji */
+		    if ((c1 = (*i_getc)(f)) == EOF) {
+			/*
+			   (*oconv)(0, ESC); don't send bogus code 
+			   (*oconv)(0, '$'); */
+			LAST;
+		    } else {
+			if (('E' <= c1 && c1 <= 'G') ||
+			    ('O' <= c1 && c1 <= 'Q')) {
+			    /*
+			       NUM : 0 1 2 3 4 5
+			       BYTE: G E F O P Q
+			       C%7 : 1 6 0 2 3 4
+			       C%7 : 0 1 2 3 4 5 6
+			       NUM : 2 0 3 4 5 X 1
+			     */
+			    static const int jphone_emoji_first_table[7] = {2, 0, 3, 4, 5, 0, 1};
+			    c0 = (jphone_emoji_first_table[c1 % 7] << 8) - SPACE + 0xE000 + CLASS_UNICODE;
+			    while ((c1 = (*i_getc)(f)) != EOF) {
+				if (SPACE <= c1 && c1 <= 'z') {
+				    (*oconv)(0, c1 + c0);
+				} else break; /* c1 == SO */
+			    }
+			}
+		    }
+		    if (c1 == EOF) LAST;
+		    NEXT;
+		} 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 if (c1 == DEL && input_mode == X0208 ) {
+		/* CP5022x */
+		c2 = c1;
+		NEXT;
+	    } else 
+                SEND;
+        }
+        /* send: */
+	switch(input_mode){
+	case ASCII:
+	    switch ((*iconv)(c2, c1, c0)) {  /* can be EUC / SJIS / UTF-8 / UTF-16 */
+	    case -2:
+		/* 4 bytes UTF-8 */
+		if ((c0 = (*i_getc)(f)) != EOF) {
+		    code_status(c0);
+		    c0 <<= 8;
+		    if ((c3 = (*i_getc)(f)) != EOF) {
+			code_status(c3);
+			(*iconv)(c2, c1, c0|c3);
+		    }
+		}
+		break;
+	    case -1:
+		/* 3 bytes EUC or UTF-8 */
+		if ((c0 = (*i_getc)(f)) != EOF) {
+		    code_status(c0);
+		    (*iconv)(c2, c1, c0);
+		}
+		break;
 	    }
-	    if (val){
-		c2 = val >> 8;
-		c1 = val & 0xff;
-		if (p2) *p2 = c2;
-		if (p1) *p1 = c1;
-		return 0;
+	    break;
+	case X0208:
+	case X0213_1:
+	    if (ms_ucs_map_f &&
+		0x7F <= c2 && c2 <= 0x92 &&
+		0x21 <= c1 && c1 <= 0x7E) {
+		/* CP932 UDC */
+		if(c1 == 0x7F) return 0;
+		c1 = (c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000 + CLASS_UNICODE;
+		c2 = 0;
 	    }
-	    c2 = x0212_shift(c2);
-	}
+	    (*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;
+        c0 = 0;
+        continue;
+        /* goto next_word */
     }
-    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;
+
+    /* 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;
 }
 
-static nkf_char
-s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
+nkf_char
+h_conv(FILE *f, nkf_char c2, nkf_char c1)
+{
+    nkf_char ret, c3, c0;
+    int hold_index;
+
+
+    /** 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.
+     **/
+
+    ret = c1;
+    hold_index = 0;
+    while (hold_index < hold_count){
+        c2 = hold_buf[hold_index++];
+        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 (hold_index < hold_count){
+            c1 = hold_buf[hold_index++];
+        }else{
+            c1 = (*i_getc)(f);
+            if (c1 == EOF){
+                c3 = EOF;
+                break;
+            }
+            code_status(c1);
+        }
+        c0 = 0;
+        switch ((*iconv)(c2, c1, 0)) {  /* can be EUC/SJIS/UTF-8 */
+	case -2:
+	    /* 4 bytes UTF-8 */
+            if (hold_index < hold_count){
+                c0 = hold_buf[hold_index++];
+            } else if ((c0 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    } else {
+                code_status(c0);
+		c0 <<= 8;
+		if (hold_index < hold_count){
+		    c3 = hold_buf[hold_index++];
+		} else if ((c3 = (*i_getc)(f)) == EOF) {
+		    c0 = ret = EOF;
+		    break;
+		} else {
+		    code_status(c3);
+		    (*iconv)(c2, c1, c0|c3);
+		}
+            }
+	    break;
+	case -1:
+	    /* 3 bytes EUC or UTF-8 */
+            if (hold_index < hold_count){
+                c0 = hold_buf[hold_index++];
+            } else if ((c0 = (*i_getc)(f)) == EOF) {
+		ret = EOF;
+		break;
+	    } else {
+                code_status(c0);
+            }
+            (*iconv)(c2, c1, c0);
+            break;
+	}
+	if (c0 == EOF) break;
+    }
+    return ret;
+}
+
+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 char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
+    static const nkf_char shift_jisx0213_s1a3_table[5][2] ={ { 1, 8}, { 3, 4}, { 5,12}, {13,14}, {15, 0} };
 #ifdef SHIFTJIS_CP932
     if (!cp932inv_f && is_ibmext_in_sjis(c2)){
-	val = shiftjis_cp932[c2 - CP932_TABLE_BEGIN][c1 - 0x40];
-	if (val){
-	    c2 = val >> 8;
-	    c1 = val & 0xff;
-	}
+#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;
+        }
     }
     if (cp932inv_f
-	&& CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-	nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-	if (c){
-	    c2 = c >> 8;
-	    c1 = c & 0xff;
-	}
+        && 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 */
 #ifdef X0212_ENABLE
     if (!x0213_f && is_ibmext_in_sjis(c2)){
-	val = shiftjis_x0212[c2 - 0xfa][c1 - 0x40];
-	if (val){
-	    if (val > 0x7FFF){
-		c2 = PREFIX_EUCG3 | ((val >> 8) & 0x7f);
-		c1 = val & 0xff;
-	    }else{
-		c2 = val >> 8;
-		c1 = val & 0xff;
-	    }
-	    if (p2) *p2 = c2;
-	    if (p1) *p1 = c1;
-	    return 0;
-	}
+#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) & 0x7f);
+                c1 = val & 0xff;
+            }else{
+                c2 = val >> 8;
+                c1 = val & 0xff;
+            }
+            if (p2) *p2 = c2;
+            if (p1) *p1 = c1;
+            return 0;
+        }
     }
 #endif
     if(c2 >= 0x80){
@@ -1515,13 +3175,11 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
 		if (0x9E < c1) c2++;
 	    }
 	}else{
-#define         SJ0162  0x00e1          /* 01 - 62 ku offset */
-#define         SJ6394  0x0161          /* 63 - 94 ku offset */
 	    c2 = c2 + c2 - ((c2 <= 0x9F) ? SJ0162 : SJ6394);
 	    if (0x9E < c1) c2++;
 	}
 	if (c1 < 0x9F)
-	    c1 = c1 - ((c1 > DEL) ? SP : 0x1F);
+	    c1 = c1 - ((c1 > DEL) ? SPACE : 0x1F);
 	else {
 	    c1 = c1 - 0x7E;
 	}
@@ -1535,135 +3193,320 @@ s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1)
     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 if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
+	/* CP932 UDC */
+	if(c1 == 0x7F) return 0;
+	c1 = (c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000 + CLASS_UNICODE;
+	c2 = 0;
+    } 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;
+        }
+	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = (c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC + CLASS_UNICODE;
+	    c2 = 0;
+	} else {
+	    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 {
+	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
+	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
+	    c1 = (c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000 + CLASS_UNICODE;
+	    c2 = 0;
+	} else {
+	    c1 &= 0x7f;
+	    c2 &= 0x7f;
+#ifdef SHIFTJIS_CP932
+	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
+		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 */
+        }
+    }
+    (*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_UNICODE | 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;
+    static const int w_iconv_utf8_1st_byte[] =
+    { /* 0xC0 - 0xFF */
+	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
+	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
+    
+    if (c2 < 0 || 0xff < c2) {
+    }else if (c2 == 0) { /* 0 : 1 byte*/
+	c0 = 0;
+    } else if ((c2 & 0xc0) == 0x80) { /* 0x80-0xbf : trail byte */
+	return 0;
+    } else{
+    	switch (w_iconv_utf8_1st_byte[c2 - 0xC0]) {
+	case 21:
+	    if (c1 < 0x80 || 0xBF < c1) return 0;
+	    break;
+	case 30:
+	    if (c0 == 0) return -1;
+	    if (c1 < 0xA0 || 0xBF < c1 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 31:
+	case 33:
+	    if (c0 == 0) return -1;
+	    if ((c1 & 0xc0) != 0x80 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 32:
+	    if (c0 == 0) return -1;
+	    if (c1 < 0x80 || 0x9F < c1 || (c0 & 0xc0) != 0x80)
+		return 0;
+	    break;
+	case 40:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x90 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	case 41:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x80 || 0xBF < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	case 42:
+	    if (c0 == 0) return -2;
+	    if (c1 < 0x80 || 0x8F < c1 || (c0 & 0xc0c0) != 0x8080)
+		return 0;
+	    break;
+	default:
+	    return 0;
+	    break;
+	}
+    }
+    if (c2 == 0 || c2 == EOF){
+    } else if ((c2 & 0xf8) == 0xf0) { /* 4 bytes */
+	c1 = CLASS_UNICODE | ww16_conv(c2, c1, c0);
+	c2 = 0;
+    } 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)
-static void
-nkf_unicode_to_utf8(nkf_char val, int *p1, int *p2, int *p3, int *p4)
+void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0)
 {
     val &= VALUE_MASK;
     if (val < 0x80){
-	*p1 = val;
-	*p2 = 0;
-	*p3 = 0;
-	*p4 = 0;
+        *p2 = val;
+        *p1 = 0;
+        *p0 = 0;
     }else if (val < 0x800){
-	*p1 = 0xc0 | (val >> 6);
-	*p2 = 0x80 | (val & 0x3f);
-	*p3 = 0;
-	*p4 = 0;
-    } else if (nkf_char_unicode_bmp_p(val)) {
-	*p1 = 0xe0 |  (val >> 12);
-	*p2 = 0x80 | ((val >>  6) & 0x3f);
-	*p3 = 0x80 | ( val        & 0x3f);
-	*p4 = 0;
-    } else if (nkf_char_unicode_value_p(val)) {
-	*p1 = 0xe0 |  (val >> 16);
-	*p2 = 0x80 | ((val >> 12) & 0x3f);
-	*p3 = 0x80 | ((val >>  6) & 0x3f);
-	*p4 = 0x80 | ( val        & 0x3f);
+	*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 if (val <= NKF_INT32_C(0x10FFFF)) {
+        *p2 = 0xe0 |  (val >> 16);
+        *p1 = 0x80 | ((val >> 12) & 0x3f);
+        *p0 = 0x8080 | ((val << 2) & 0x3f00)| (val & 0x3f);
     } else {
-	*p1 = 0;
-	*p2 = 0;
-	*p3 = 0;
-	*p4 = 0;
+        *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 >= 0xf8) {
+	val = -1;
+    } else if (c2 >= 0xf0){
+	/* c2: 1st, c1: 2nd, c0: 3rd/4th */
+	val = (c2 & 0x0f) << 18;
+        val |= (c1 & 0x3f) << 12;
+        val |= (c0 & 0x3f00) >> 2;
+        val |= (c0 & 0x3f);
+    }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;
 }
 
-static nkf_char
-nkf_utf8_to_unicode(int c1, int c2, int c3, int c4)
+nkf_char w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
 {
-    nkf_char wc;
-    if (c1 <= 0x7F) {
-	/* single byte */
-	wc = c1;
-    }
-    else if (c1 <= 0xC3) {
-	/* trail byte or invalid */
-	return -1;
-    }
-    else if (c1 <= 0xDF) {
-	/* 2 bytes */
-	wc  = (c1 & 0x1F) << 6;
-	wc |= (c2 & 0x3F);
-    }
-    else if (c1 <= 0xEF) {
-	/* 3 bytes */
-	wc  = (c1 & 0x0F) << 12;
-	wc |= (c2 & 0x3F) << 6;
-	wc |= (c3 & 0x3F);
-    }
-    else if (c2 <= 0xF4) {
-	/* 4 bytes */
-	wc  = (c1 & 0x0F) << 18;
-	wc |= (c2 & 0x3F) << 12;
-	wc |= (c3 & 0x3F) << 6;
-	wc |= (c4 & 0x3F);
-    }
-    else {
-	return -1;
-    }
-    return wc;
+    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_UNICODE | val;
+	    ret = 0;
+	}
+#endif
+    }
+    return ret;
 }
 #endif
 
 #ifdef UTF8_INPUT_ENABLE
-static int
-unicode_to_jis_common2(nkf_char c1, nkf_char c0,
-		       const unsigned short *const *pp, nkf_char psize,
-		       nkf_char *p2, nkf_char *p1)
+nkf_char w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
 {
-    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;
+    nkf_char ret = 0;
+    if ((c2==0 && c1 < 0x80) || c2==EOF) {
+	(*oconv)(c2, c1);
+	return 0;
+    }else if (0xD8 <= c2 && c2 <= 0xDB) {
+	if (c0 < NKF_INT32_C(0xDC00) || NKF_INT32_C(0xDFFF) < c0)
+	    return -2;
+	c1 =  CLASS_UNICODE | ((c2 << 18) + (c1 << 10) + c0 - NKF_INT32_C(0x35FDC00));
+	c2 = 0;
+    }else if ((c2>>3) == 27) { /* unpaired surrogate */
+	/*
+	   return 2;
+	*/
+	return 1;
+    }else ret = w16e_conv(((c2 & 0xff)<<8) + c1, &c2, &c1);
+    if (ret) return ret;
+    (*oconv)(c2, c1);
+    return 0;
+}
 
-    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;
+nkf_char w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
+{
+    int ret = 0;
 
-    c2 = val >> 8;
-    if (val > 0x7FFF){
-	c2 &= 0x7f;
-	c2 |= PREFIX_EUCG3;
+    if ((c2 == 0 && c1 < 0x80) || c2==EOF) {
+    } else if (is_unicode_bmp(c1)) {
+	ret = w16e_conv(c1, &c2, &c1);
+    } else {
+	c2 = 0;
+	c1 =  CLASS_UNICODE | c1;
     }
-    if (c2 == SO) c2 = JIS_X_0201_1976_K;
-    c1 = val & 0xFF;
-    if (p2) *p2 = c2;
-    if (p1) *p1 = c1;
+    if (ret) return ret;
+    (*oconv)(c2, c1);
     return 0;
 }
 
-static int
-unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+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 char no_best_fit_chars_table_C2[] =
+    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 char no_best_fit_chars_table_C2_ms[] =
+    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 char no_best_fit_chars_table_932_C2[] =
+    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 char no_best_fit_chars_table_932_C3[] =
+    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,
@@ -1695,29 +3538,13 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 		}
 	    }else if(ms_ucs_map_f == UCS_MAP_MS){
 		if(c2 == 0xC2 && no_best_fit_chars_table_C2_ms[c1&0x3F]) return 1;
-	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
-		switch(c2){
-		case 0xC2:
-		    switch(c1){
-		    case 0xA2:
-		    case 0xA3:
-		    case 0xA5:
-		    case 0xA6:
-		    case 0xAC:
-		    case 0xAF:
-		    case 0xB8:
-			return 1;
-		    }
-		    break;
-		}
 	    }
 	}
 	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 :
-	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_2bytes_mac :
 	    utf8_to_euc_2bytes;
-	ret =  unicode_to_jis_common2(c2, c1, pp, sizeof_utf8_to_euc_2bytes, p2, p1);
+	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){
@@ -1738,19 +3565,6 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 		    if(c1 == 0x80 || c0 == 0x9C) return 1;
 		    break;
 		}
-	    }else if(ms_ucs_map_f == UCS_MAP_CP10001){
-		switch(c2){
-		case 0xE3:
-		    switch(c1){
-		    case 0x82:
-			if(c0 == 0x94) return 1;
-			break;
-		    case 0x83:
-			if(c0 == 0xBB) return 1;
-			break;
-		    }
-		    break;
-		}
 	    }else{
 		switch(c2){
 		case 0xE2:
@@ -1782,9 +3596,8 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
 	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 :
-	    ms_ucs_map_f == UCS_MAP_CP10001 ? utf8_to_euc_3bytes_mac :
 	    utf8_to_euc_3bytes;
-	ret = unicode_to_jis_common2(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
+	ret = w_iconv_common(c1, c0, ppp[c2 - 0xE0], sizeof_utf8_to_euc_C2, p2, p1);
     }else return -1;
 #ifdef SHIFTJIS_CP932
     if (!ret && !cp932inv_f && is_eucg3(*p2)) {
@@ -1799,476 +3612,341 @@ unicode_to_jis_common(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_c
     return ret;
 }
 
-#ifdef UTF8_OUTPUT_ENABLE
-static nkf_char
-e2w_conv(nkf_char c2, nkf_char c1)
+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 (c2 == JIS_X_0201_1976_K) {
-	if (ms_ucs_map_f == UCS_MAP_CP10001) {
-	    switch (c1) {
-	    case 0x20:
-		return 0xA0;
-	    case 0x7D:
-		return 0xA9;
-	    }
-	}
-	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[c2] :
-		ms_ucs_map_f == UCS_MAP_CP10001 ? euc_to_utf8_2bytes_mac[c2] :
-		euc_to_utf8_2bytes_ms[c2];
-	else
-	    return 0;
+    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 (!p) return 0;
-    c1 = (c1 & 0x7f) - 0x21;
-    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
-	return p[c1];
+    if (c2 == SO) c2 = X0201;
+    c1 = val & 0x7f;
+    if (p2) *p2 = c2;
+    if (p1) *p1 = c1;
     return 0;
 }
-#endif
 
-static nkf_char
-w2e_conv(nkf_char c2, nkf_char c1, nkf_char c0, nkf_char *p2, nkf_char *p1)
+void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c)
 {
-    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 = nkf_char_unicode_new(nkf_utf8_to_unicode(c2, c1, c0, 0));
-	    ret = 0;
+    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;
 	}
-#endif
     }
-    return ret;
+    return;
 }
 
-#ifdef UTF8_INPUT_ENABLE
-static nkf_char
-w16e_conv(nkf_char val, nkf_char *p2, nkf_char *p1)
+void encode_fallback_html(nkf_char c)
 {
-    int c1, c2, c3, c4;
-    nkf_char ret = 0;
-    val &= VALUE_MASK;
-    if (val < 0x80) {
-	*p2 = 0;
-	*p1 = val;
-    }
-    else if (nkf_char_unicode_bmp_p(val)){
-	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	ret =  unicode_to_jis_common(c1, c2, c3, p2, p1);
-	if (ret > 0){
-	    *p2 = 0;
-	    *p1 = nkf_char_unicode_new(val);
-	    ret = 0;
-	}
-    }
-    else {
-	*p2 = 0;
-	*p1 = nkf_char_unicode_new(val);
-    }
-    return ret;
+    (*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;
 }
-#endif
 
-static nkf_char
-e_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+void encode_fallback_xml(nkf_char c)
 {
-    if (c2 == JIS_X_0201_1976_K || c2 == SS2){
-	if (iso2022jp_f && !x0201_f) {
-	    c2 = GETA1; c1 = GETA2;
-	} else {
-	    c2 = JIS_X_0201_1976_K;
-	    c1 &= 0x7f;
-	}
-#ifdef X0212_ENABLE
-    }else if (c2 == 0x8f){
-	if (c0 == 0){
-	    return -1;
-	}
-	if (!cp51932_f && !x0213_f && 0xF5 <= c1 && c1 <= 0xFE && 0xA1 <= c0 && c0 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = nkf_char_unicode_new((c1 - 0xF5) * 94 + c0 - 0xA1 + 0xE3AC);
-	    c2 = 0;
-	} else {
-	    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 == EOF) || (c2 == 0) || c2 < SP || c2 == ISO_8859_1) {
-	/* NOP */
-    } else {
-	if (!cp51932_f && ms_ucs_map_f && 0xF5 <= c2 && c2 <= 0xFE && 0xA1 <= c1 && c1 <= 0xFE) {
-	    /* encoding is eucJP-ms, so invert to Unicode Private User Area */
-	    c1 = nkf_char_unicode_new((c2 - 0xF5) * 94 + c1 - 0xA1 + 0xE000);
-	    c2 = 0;
-	} else {
-	    c1 &= 0x7f;
-	    c2 &= 0x7f;
-#ifdef SHIFTJIS_CP932
-	    if (cp51932_f && 0x79 <= c2 && c2 <= 0x7c){
-		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 */
-	}
-    }
-    (*oconv)(c2, c1);
-    return 0;
+    (*oconv)(0, '&');
+    (*oconv)(0, '#');
+    (*oconv)(0, 'x');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, ';');
+    return;
 }
 
-static nkf_char
-s_iconv(nkf_char c2, nkf_char c1, nkf_char c0)
+void encode_fallback_java(nkf_char c)
 {
-    if (c2 == JIS_X_0201_1976_K || (0xA1 <= c2 && c2 <= 0xDF)) {
-	if (iso2022jp_f && !x0201_f) {
-	    c2 = GETA1; c1 = GETA2;
-	} else {
-	    c1 &= 0x7f;
-	}
-    } else if ((c2 == EOF) || (c2 == 0) || c2 < SP) {
-	/* NOP */
-    } else if (!x0213_f && 0xF0 <= c2 && c2 <= 0xF9 && 0x40 <= c1 && c1 <= 0xFC) {
-	/* CP932 UDC */
-	if(c1 == 0x7F) return 0;
-	c1 = nkf_char_unicode_new((c2 - 0xF0) * 188 + (c1 - 0x40 - (0x7E < c1)) + 0xE000);
-	c2 = 0;
-    } else {
-	nkf_char ret = s2e_conv(c2, c1, &c2, &c1);
-	if (ret) return ret;
+    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)(c2, c1);
-    return 0;
+    (*oconv)(0, hex[(c>>12)&0xF]);
+    (*oconv)(0, hex[(c>> 8)&0xF]);
+    (*oconv)(0, hex[(c>> 4)&0xF]);
+    (*oconv)(0, hex[ c     &0xF]);
+    return;
 }
 
-static nkf_char
-w_iconv(nkf_char c1, nkf_char c2, nkf_char c3)
+void encode_fallback_perl(nkf_char c)
 {
-    nkf_char ret = 0, c4 = 0;
-    static const char w_iconv_utf8_1st_byte[] =
-    { /* 0xC0 - 0xFF */
-	20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-	30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 33, 33,
-	40, 41, 41, 41, 42, 43, 43, 43, 50, 50, 50, 50, 60, 60, 70, 70};
-
-    if (c3 > 0xFF) {
-	c4 = c3 & 0xFF;
-	c3 >>= 8;
-    }
+    (*oconv)(0, '\\');
+    (*oconv)(0, 'x');
+    (*oconv)(0, '{');
+    nkf_each_char_to_hex(oconv, c);
+    (*oconv)(0, '}');
+    return;
+}
 
-    if (c1 < 0 || 0xff < c1) {
-    }else if (c1 == 0) { /* 0 : 1 byte*/
-	c3 = 0;
-    } else if ((c1 & 0xC0) == 0x80) { /* 0x80-0xbf : trail byte */
-	return 0;
-    } else{
-	switch (w_iconv_utf8_1st_byte[c1 - 0xC0]) {
-	case 21:
-	    if (c2 < 0x80 || 0xBF < c2) return 0;
-	    break;
-	case 30:
-	    if (c3 == 0) return -1;
-	    if (c2 < 0xA0 || 0xBF < c2 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 31:
-	case 33:
-	    if (c3 == 0) return -1;
-	    if ((c2 & 0xC0) != 0x80 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 32:
-	    if (c3 == 0) return -1;
-	    if (c2 < 0x80 || 0x9F < c2 || (c3 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 40:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x90 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 41:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x80 || 0xBF < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	case 42:
-	    if (c3 == 0) return -2;
-	    if (c2 < 0x80 || 0x8F < c2 || (c3 & 0xC0) != 0x80 || (c4 & 0xC0) != 0x80)
-		return 0;
-	    break;
-	default:
-	    return 0;
-	    break;
-	}
-    }
-    if (c1 == 0 || c1 == EOF){
-    } else if ((c1 & 0xf8) == 0xf0) { /* 4 bytes */
-	c2 = nkf_char_unicode_new(nkf_utf8_to_unicode(c1, c2, c3, c4));
-	c1 = 0;
-    } else {
-	ret = w2e_conv(c1, c2, c3, &c1, &c2);
-    }
-    if (ret == 0){
-	(*oconv)(c1, c2);
-    }
-    return ret;
+void encode_fallback_subchar(nkf_char c)
+{
+    c = unicode_subchar;
+    (*oconv)((c>>8)&0xFF, c&0xFF);
+    return;
 }
+#endif
 
-#define NKF_ICONV_INVALID_CODE_RANGE -13
-static size_t
-unicode_iconv(nkf_char wc)
+#ifdef UTF8_OUTPUT_ENABLE
+nkf_char e2w_conv(nkf_char c2, nkf_char c1)
 {
-    nkf_char c1, c2;
-    int ret = 0;
+#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 (wc < 0x80) {
-	c2 = 0;
-	c1 = wc;
-    }else if ((wc>>11) == 27) {
-	/* unpaired surrogate */
-	return NKF_ICONV_INVALID_CODE_RANGE;
-    }else if (wc < 0xFFFF) {
-	ret = w16e_conv(wc, &c2, &c1);
-	if (ret) return ret;
-    }else if (wc < 0x10FFFF) {
-	c2 = 0;
-	c1 = nkf_char_unicode_new(wc);
+    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 {
-	return NKF_ICONV_INVALID_CODE_RANGE;
+        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;
     }
-    (*oconv)(c2, c1);
+    if (!p) return 0;
+    c1 = (c1 & 0x7f) - 0x21;
+    if (0<=c1 && c1<sizeof_euc_to_utf8_1byte)
+	return p[c1];
     return 0;
 }
 
-#define NKF_ICONV_NEED_ONE_MORE_BYTE -1
-#define NKF_ICONV_NEED_TWO_MORE_BYTES -2
-#define UTF16_TO_UTF32(lead, trail) (((lead) << 10) + (trail) - NKF_INT32_C(0x35FDC00))
-static size_t
-nkf_iconv_utf_16(int c1, int c2, int c3, int c4)
+void w_oconv(nkf_char c2, nkf_char c1)
 {
-    nkf_char wc;
+    nkf_char c0;
+    nkf_char val;
 
-    if (c1 == EOF) {
-	(*oconv)(EOF, 0);
-	return 0;
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+    	(*o_putc)('\357');
+	(*o_putc)('\273');
+	(*o_putc)('\277');
     }
 
-    if (input_endian == ENDIAN_BIG) {
-	if (0xD8 <= c1 && c1 <= 0xDB) {
-	    if (0xDC <= c3 && c3 <= 0xDF) {
-		wc = UTF16_TO_UTF32(c1 << 8 | c2, c3 << 8 | c4);
-	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
-	} else {
-	    wc = c1 << 8 | c2;
-	}
-    } else {
-	if (0xD8 <= c2 && c2 <= 0xDB) {
-	    if (0xDC <= c4 && c4 <= 0xDF) {
-		wc = UTF16_TO_UTF32(c2 << 8 | c1, c4 << 8 | c3);
-	    } else return NKF_ICONV_NEED_TWO_MORE_BYTES;
-	} else {
-	    wc = c2 << 8 | c1;
-	}
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
     }
 
-    return (*unicode_iconv)(wc);
-}
-
-static nkf_char
-w_iconv16(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    return 0;
-}
-
-static nkf_char
-w_iconv32(nkf_char c2, nkf_char c1, nkf_char c0)
-{
-    return 0;
+#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)(0xF0 | ( 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);
+            }
+        }
+    }
 }
 
-static size_t
-nkf_iconv_utf_32(int c1, int c2, int c3, int c4)
+void w_oconv16(nkf_char c2, nkf_char c1)
 {
-    nkf_char wc;
-
-    if (c1 == EOF) {
-	(*oconv)(EOF, 0);
-	return 0;
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+        if (output_endian == ENDIAN_LITTLE){
+            (*o_putc)((unsigned char)'\377');
+            (*o_putc)('\376');
+        }else{
+            (*o_putc)('\376');
+            (*o_putc)((unsigned char)'\377');
+        }
     }
 
-    switch(input_endian){
-    case ENDIAN_BIG:
-	wc = c2 << 16 | c3 << 8 | c4;
-	break;
-    case ENDIAN_LITTLE:
-	wc = c3 << 16 | c2 << 8 | c1;
-	break;
-    case ENDIAN_2143:
-	wc = c1 << 16 | c4 << 8 | c3;
-	break;
-    case ENDIAN_3412:
-	wc = c4 << 16 | c1 << 8 | c2;
-	break;
-    default:
-	return NKF_ICONV_INVALID_CODE_RANGE;
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
     }
 
-    return (*unicode_iconv)(wc);
-}
+    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 (output_endian == ENDIAN_LITTLE){
+                    (*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
-
-#define output_ascii_escape_sequence(mode) do { \
-	    if (output_mode != ASCII && output_mode != ISO_8859_1) { \
-		    (*o_putc)(ESC); \
-		    (*o_putc)('('); \
-		    (*o_putc)(ascii_intro); \
-		    output_mode = mode; \
-	    } \
-    } while (0)
-
-static void
-output_escape_sequence(int mode)
-{
-    if (output_mode == mode)
-	return;
-    switch(mode) {
-    case ISO_8859_1:
-	(*o_putc)(ESC);
-	(*o_putc)('.');
-	(*o_putc)('A');
-	break;
-    case JIS_X_0201_1976_K:
-	(*o_putc)(ESC);
-	(*o_putc)('(');
-	(*o_putc)('I');
-	break;
-    case JIS_X_0208:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)(kanji_intro);
-	break;
-    case JIS_X_0212:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('D');
-	break;
-    case JIS_X_0213_1:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('Q');
-	break;
-    case JIS_X_0213_2:
-	(*o_putc)(ESC);
-	(*o_putc)('$');
-	(*o_putc)('(');
-	(*o_putc)('P');
-	break;
+    } else if (c2) {
+        nkf_char val = e2w_conv(c2, c1);
+        c2 = (val >> 8) & 0xff;
+        c1 = val & 0xff;
+	if (!val) return;
+    }
+    if (output_endian == ENDIAN_LITTLE){
+        (*o_putc)(c1);
+        (*o_putc)(c2);
+    }else{
+        (*o_putc)(c2);
+        (*o_putc)(c1);
     }
-    output_mode = mode;
 }
 
-static void
-j_oconv(nkf_char c2, nkf_char c1)
+void w_oconv32(nkf_char c2, nkf_char c1)
 {
-#ifdef NUMCHAR_OPTION
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
-	    c2 = c1 & VALUE_MASK;
-	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
-		/* CP5022x UDC */
-		c1 &= 0xFFF;
-		c2 = 0x7F + c1 / 94;
-		c1 = 0x21 + c1 % 94;
-	    } else {
-		if (encode_fallback) (*encode_fallback)(c1);
-		return;
-	    }
-	}
-    }
-#endif
-    if (c2 == 0) {
-	output_ascii_escape_sequence(ASCII);
-	(*o_putc)(c1);
-    }
-    else if (c2 == EOF) {
-	output_ascii_escape_sequence(ASCII);
-	(*o_putc)(EOF);
+    if (output_bom_f) {
+	output_bom_f = FALSE;
+        if (output_endian == ENDIAN_LITTLE){
+            (*o_putc)((unsigned char)'\377');
+            (*o_putc)('\376');
+	    (*o_putc)('\000');
+	    (*o_putc)('\000');
+        }else{
+	    (*o_putc)('\000');
+	    (*o_putc)('\000');
+            (*o_putc)('\376');
+            (*o_putc)((unsigned char)'\377');
+        }
     }
-    else if (c2 == ISO_8859_1) {
-	output_ascii_escape_sequence(ISO_8859_1);
-	(*o_putc)(c1|0x80);
+
+    if (c2 == EOF) {
+        (*o_putc)(EOF);
+        return;
     }
-    else if (c2 == JIS_X_0201_1976_K) {
-	output_escape_sequence(JIS_X_0201_1976_K);
-	(*o_putc)(c1);
-#ifdef X0212_ENABLE
-    } else if (is_eucg3(c2)){
-	output_escape_sequence(x0213_f ? JIS_X_0213_2 : JIS_X_0212);
-	(*o_putc)(c2 & 0x7f);
-	(*o_putc)(c1);
+
+    if (c2 == ISO8859_1) {
+        c1 |= 0x80;
+#ifdef NUMCHAR_OPTION
+    } else if (c2 == 0 && is_unicode_capsule(c1)) {
+	c1 &= VALUE_MASK;
 #endif
-    } else {
-	if(ms_ucs_map_f
-	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
-	   : c2<0x20 || 0x7e<c2 || c1<0x20 || 0x7e<c1) return;
-	output_escape_sequence(x0213_f ? JIS_X_0213_1 : JIS_X_0208);
-	(*o_putc)(c2);
-	(*o_putc)(c1);
+    } else if (c2) {
+        c1 = e2w_conv(c2, c1);
+	if (!c1) return;
+    }
+    if (output_endian == ENDIAN_LITTLE){
+        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
+        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
+        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+	(*o_putc)('\000');
+    }else{
+	(*o_putc)('\000');
+        (*o_putc)((c1 & NKF_INT32_C(0x00FF0000)) >> 16);
+        (*o_putc)((c1 & NKF_INT32_C(0x0000FF00)) >>  8);
+        (*o_putc)( c1 & NKF_INT32_C(0x000000FF));
     }
 }
+#endif
 
-static void
-e_oconv(nkf_char c2, nkf_char c1)
+void e_oconv(nkf_char c2, nkf_char c1)
 {
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
 	    c2 = c1 & VALUE_MASK;
 	    if (x0212_f && 0xE000 <= c2 && c2 <= 0xE757) {
 		/* eucJP-ms UDC */
@@ -2289,68 +3967,143 @@ e_oconv(nkf_char c2, nkf_char c1)
 		if (encode_fallback) (*encode_fallback)(c1);
 		return;
 	    }
-	}
+        }
     }
-
+#endif
     if (c2 == EOF) {
-	(*o_putc)(EOF);
-    } else if (c2 == 0) {
+        (*o_putc)(EOF);
+        return;
+    } else if (c2 == 0) { 
 	output_mode = ASCII;
-	(*o_putc)(c1);
-    } else if (c2 == JIS_X_0201_1976_K) {
-	output_mode = EUC_JP;
-	(*o_putc)(SS2); (*o_putc)(c1|0x80);
-    } else if (c2 == ISO_8859_1) {
-	output_mode = ISO_8859_1;
-	(*o_putc)(c1 | 0x080);
+        (*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 = EUC_JP;
+	output_mode = JAPANESE_EUC;
 #ifdef SHIFTJIS_CP932
-	if (!cp932inv_f){
-	    nkf_char s2, s1;
-	    if (e2s_conv(c2, c1, &s2, &s1) == 0){
-		s2e_conv(s2, s1, &c2, &c1);
-	    }
-	}
-#endif
-	if (c2 == 0) {
+        if (!cp932inv_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);
+            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 & 0x7f;
+	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;
 	    }
-	}else{
-	    (*o_putc)((c2 & 0x7f) | 0x080);
-	    (*o_putc)(c1 | 0x080);
+	    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
-    } else {
-	if (!nkf_isgraph(c1) || !nkf_isgraph(c2)) {
-	    set_iconv(FALSE, 0);
-	    return; /* too late to rescue this char */
+	    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);
 	}
-	output_mode = EUC_JP;
-	(*o_putc)(c2 | 0x080);
-	(*o_putc)(c1 | 0x080);
+#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;
 }
 
-static void
-s_oconv(nkf_char c2, nkf_char c1)
+void s_oconv(nkf_char c2, nkf_char c1)
 {
 #ifdef NUMCHAR_OPTION
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	w16e_conv(c1, &c2, &c1);
-	if (c2 == 0 && nkf_char_unicode_p(c1)){
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
 	    c2 = c1 & VALUE_MASK;
 	    if (!x0213_f && 0xE000 <= c2 && c2 <= 0xE757) {
 		/* CP932 UDC */
 		c1 &= 0xFFF;
-		c2 = c1 / 188 + (cp932inv_f ? 0xF0 : 0xEB);
+		c2 = c1 / 188 + 0xF0;
 		c1 = c1 % 188;
 		c1 += 0x40 + (c1 > 0x3e);
 		(*o_putc)(c2);
@@ -2364,1248 +4117,515 @@ s_oconv(nkf_char c2, nkf_char c1)
     }
 #endif
     if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
+        (*o_putc)(EOF);
+        return;
     } else if (c2 == 0) {
 	output_mode = ASCII;
-	(*o_putc)(c1);
-    } else if (c2 == JIS_X_0201_1976_K) {
+        (*o_putc)(c1);
+    } else if (c2 == X0201) {
 	output_mode = SHIFT_JIS;
-	(*o_putc)(c1|0x80);
-    } else if (c2 == ISO_8859_1) {
-	output_mode = ISO_8859_1;
-	(*o_putc)(c1 | 0x080);
+        (*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);
-	}
+        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 */
-	}
+        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);
+        e2s_conv(c2, c1, &c2, &c1);
 
 #ifdef SHIFTJIS_CP932
-	if (cp932inv_f
-	    && CP932INV_TABLE_BEGIN <= c2 && c2 <= CP932INV_TABLE_END){
-	    nkf_char c = cp932inv[c2 - CP932INV_TABLE_BEGIN][c1 - 0x40];
-	    if (c){
-		c2 = c >> 8;
-		c1 = c & 0xff;
-	    }
-	}
+        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);
+        (*o_putc)(c2);
 	if (prefix_table[(unsigned char)c1]){
-	    (*o_putc)(prefix_table[(unsigned char)c1]);
-	}
-	(*o_putc)(c1);
-    }
-}
-
-#ifdef UTF8_OUTPUT_ENABLE
-static void
-w_oconv(nkf_char c2, nkf_char c1)
-{
-    int c3, c4;
-    nkf_char val;
-
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	(*o_putc)('\357');
-	(*o_putc)('\273');
-	(*o_putc)('\277');
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == 0 && nkf_char_unicode_p(c1)){
-	val = c1 & VALUE_MASK;
-	nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	(*o_putc)(c1);
-	if (c2) (*o_putc)(c2);
-	if (c3) (*o_putc)(c3);
-	if (c4) (*o_putc)(c4);
-	return;
-    }
-
-    if (c2 == 0) {
-	(*o_putc)(c1);
-    } else {
-	val = e2w_conv(c2, c1);
-	if (val){
-	    nkf_unicode_to_utf8(val, &c1, &c2, &c3, &c4);
-	    (*o_putc)(c1);
-	    if (c2) (*o_putc)(c2);
-	    if (c3) (*o_putc)(c3);
-	    if (c4) (*o_putc)(c4);
-	}
-    }
-}
-
-static void
-w_oconv16(nkf_char c2, nkf_char c1)
-{
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	if (output_endian == ENDIAN_LITTLE){
-	    (*o_putc)(0xFF);
-	    (*o_putc)(0xFE);
-	}else{
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0xFF);
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == 0 && nkf_char_unicode_p(c1)) {
-	if (nkf_char_unicode_bmp_p(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 (output_endian == ENDIAN_LITTLE){
-		    (*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;
-	}
-    } else if (c2) {
-	nkf_char val = e2w_conv(c2, c1);
-	c2 = (val >> 8) & 0xff;
-	c1 = val & 0xff;
-	if (!val) return;
-    }
-    if (output_endian == ENDIAN_LITTLE){
-	(*o_putc)(c1);
-	(*o_putc)(c2);
-    }else{
-	(*o_putc)(c2);
-	(*o_putc)(c1);
-    }
-}
-
-static void
-w_oconv32(nkf_char c2, nkf_char c1)
-{
-    if (output_bom_f) {
-	output_bom_f = FALSE;
-	if (output_endian == ENDIAN_LITTLE){
-	    (*o_putc)(0xFF);
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0);
-	    (*o_putc)(0);
-	}else{
-	    (*o_putc)(0);
-	    (*o_putc)(0);
-	    (*o_putc)(0xFE);
-	    (*o_putc)(0xFF);
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_putc)(EOF);
-	return;
-    }
-
-    if (c2 == ISO_8859_1) {
-	c1 |= 0x80;
-    } else if (c2 == 0 && nkf_char_unicode_p(c1)) {
-	c1 &= VALUE_MASK;
-    } else if (c2) {
-	c1 = e2w_conv(c2, c1);
-	if (!c1) return;
-    }
-    if (output_endian == ENDIAN_LITTLE){
-	(*o_putc)( c1        & 0xFF);
-	(*o_putc)((c1 >>  8) & 0xFF);
-	(*o_putc)((c1 >> 16) & 0xFF);
-	(*o_putc)(0);
-    }else{
-	(*o_putc)(0);
-	(*o_putc)((c1 >> 16) & 0xFF);
-	(*o_putc)((c1 >>  8) & 0xFF);
-	(*o_putc)( c1        & 0xFF);
-    }
-}
-#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 */
-#define SCORE_CP932    (SCORE_DEPEND << 1)   /* CP932 $B$K$h$kFI$_49$((B (IBM extended characters) */
-#define SCORE_X0212    (SCORE_CP932 << 1)    /* JIS X 0212 */
-#define SCORE_NO_EXIST (SCORE_X0212 << 1)    /* $BB8:_$7$J$$J8;z(B */
-#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)
-
-static const 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,
-};
-
-static const 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_CP932, SCORE_CP932,
-    SCORE_CP932, SCORE_NO_EXIST, SCORE_NO_EXIST, SCORE_ERROR,
-};
-
-static void
-set_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-	ptr->score |= score;
-    }
-}
-
-static void
-clr_code_score(struct input_code *ptr, nkf_char score)
-{
-    if (ptr){
-	ptr->score &= ~score;
-    }
-}
-
-static 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 == SS2){
-	set_code_score(ptr, SCORE_KANA);
-    }else if (c2 == 0x8f){
-	set_code_score(ptr, SCORE_X0212);
-#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);
-    }
-}
-
-static 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);
-}
-
-static void
-status_push_ch(struct input_code *ptr, nkf_char c)
-{
-    ptr->buf[ptr->index++] = c;
-}
-
-static void
-status_clear(struct input_code *ptr)
-{
-    ptr->stat = 0;
-    ptr->index = 0;
-}
-
-static void
-status_reset(struct input_code *ptr)
-{
-    status_clear(ptr);
-    ptr->score = SCORE_INIT;
-}
-
-static void
-status_reinit(struct input_code *ptr)
-{
-    status_reset(ptr);
-    ptr->_file_stat = 0;
-}
-
-static void
-status_check(struct input_code *ptr, nkf_char c)
-{
-    if (c <= DEL && estab_f){
-	status_reset(ptr);
-    }
-}
-
-static 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;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}else if (0xa1 <= c && c <= 0xdf){
-	    status_push_ch(ptr, SS2);
-	    status_push_ch(ptr, c);
-	    code_score(ptr);
-	    status_clear(ptr);
-	}else if ((0x81 <= c && c < 0xa0) || (0xe0 <= c && c <= 0xea)){
-	    ptr->stat = 1;
-	    status_push_ch(ptr, c);
-	}else if (0xed <= c && c <= 0xee){
-	    ptr->stat = 3;
-	    status_push_ch(ptr, c);
-#ifdef SHIFTJIS_CP932
-	}else if (is_ibmext_in_sjis(c)){
-	    ptr->stat = 2;
-	    status_push_ch(ptr, c);
-#endif /* SHIFTJIS_CP932 */
-#ifdef X0212_ENABLE
-	}else if (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);
+            (*o_putc)(prefix_table[(unsigned char)c1]);
 	}
-	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 */
-	status_disable(ptr);
-	break;
-    case 3:
-	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]);
-	    set_code_score(ptr, SCORE_CP932);
-	    status_clear(ptr);
-	}else{
-	    status_disable(ptr);
-	}
-	break;
+        (*o_putc)(c1);
     }
 }
 
-static void
-e_status(struct input_code *ptr, nkf_char c)
+void j_oconv(nkf_char c2, nkf_char c1)
 {
-    switch (ptr->stat){
-    case -1:
-	status_check(ptr, c);
-	break;
-    case 0:
-	if (c <= DEL){
-	    break;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}else if (SS2 == 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
-static 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;
-	}else if (nkf_char_unicode_p(c)){
-	    break;
-	}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 if (0xf0 <= c && c <= 0xf4){
-	    ptr->stat = 3;
-	    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;
-    case 3:
-	if (0x80 <= c && c <= 0xbf){
-	    if (ptr->index < ptr->stat){
-		status_push_ch(ptr, c);
+#ifdef NUMCHAR_OPTION
+    if (c2 == 0 && is_unicode_capsule(c1)){
+        w16e_conv(c1, &c2, &c1);
+        if (c2 == 0 && is_unicode_capsule(c1)){
+	    c2 = c1 & VALUE_MASK;
+	    if (ms_ucs_map_f && 0xE000 <= c2 && c2 <= 0xE757) {
+		/* CP5022x UDC */
+		c1 &= 0xFFF;
+		c2 = 0x7F + c1 / 94;
+		c1 = 0x21 + c1 % 94;
 	    } else {
-		status_clear(ptr);
+		if (encode_fallback) (*encode_fallback)(c1);
+		return;
 	    }
-	}else{
-	    status_disable(ptr);
-	}
-	break;
+        }
     }
-}
 #endif
-
-static 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){
-	if (!p->status_func) {
-	    ++p;
-	    continue;
-	}
-	if (!p->status_func)
-	    continue;
-	(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
-static nkf_char
-std_getc(FILE *f)
-{
-    if (std_gc_ndx){
-	return std_gc_buf[--std_gc_ndx];
-    }
-    return getc(f);
-}
-#endif /*WIN32DLL*/
-
-static 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
-static void
-std_putc(nkf_char c)
-{
-    if(c!=EOF)
-	putchar(c);
-}
-#endif /*WIN32DLL*/
-
-static unsigned char   hold_buf[HOLD_SIZE*2];
-static int             hold_count = 0;
-static 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);
-}
-
-static int
-h_conv(FILE *f, int c1, int c2)
-{
-    int ret, c4, c3;
-    int hold_index;
-
-
-    /** 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(c1);
-    push_hold_buf(c2);
-
-    while ((c2 = (*i_getc)(f)) != EOF) {
-	if (c2 == ESC){
-	    (*i_ungetc)(c2,f);
-	    break;
-	}
-	code_status(c2);
-	if (push_hold_buf(c2) == EOF || estab_f) {
-	    break;
-	}
-    }
-
-    if (!estab_f) {
-	struct input_code *p = input_code_list;
-	struct input_code *result = p;
-	if (c2 == EOF) {
-	    code_status(c2);
-	}
-	while (p->name) {
-	    if (p->status_func && p->score < result->score) {
-		result = p;
+    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);
 	    }
-	    p++;
-	}
-	set_iconv(TRUE, 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.
-     **/
-
-    ret = c2;
-    hold_index = 0;
-    while (hold_index < hold_count){
-	c1 = hold_buf[hold_index++];
-	if (c1 <= DEL){
-	    (*iconv)(0, c1, 0);
-	    continue;
-	}else if (iconv == s_iconv && 0xa1 <= c1 && c1 <= 0xdf){
-	    (*iconv)(JIS_X_0201_1976_K, c1, 0);
-	    continue;
-	}
-	if (hold_index < hold_count){
-	    c2 = hold_buf[hold_index++];
 	}else{
-	    c2 = (*i_getc)(f);
-	    if (c2 == EOF){
-		c4 = EOF;
-		break;
+	    if(output_mode!=X0212){
+		output_mode = X0212;
+		(*o_putc)(ESC);
+		(*o_putc)('$');
+		(*o_putc)('(');
+		(*o_putc)(X0212&0x7F);
 	    }
-	    code_status(c2);
-	}
-	c3 = 0;
-	switch ((*iconv)(c1, c2, 0)) {  /* can be EUC/SJIS/UTF-8 */
-	case -2:
-	    /* 4 bytes UTF-8 */
-	    if (hold_index < hold_count){
-		c3 = hold_buf[hold_index++];
-	    } else if ((c3 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    } else {
-		code_status(c3);
-		if (hold_index < hold_count){
-		    c4 = hold_buf[hold_index++];
-		} else if ((c4 = (*i_getc)(f)) == EOF) {
-		    c3 = ret = EOF;
-		    break;
-		} else {
-		    code_status(c4);
-		    (*iconv)(c1, c2, (c3<<8)|c4);
-		}
-	    }
-	    break;
-	case -1:
-	    /* 3 bytes EUC or UTF-8 */
-	    if (hold_index < hold_count){
-		c3 = hold_buf[hold_index++];
-	    } else if ((c3 = (*i_getc)(f)) == EOF) {
-		ret = EOF;
-		break;
-	    } else {
-		code_status(c3);
-	    }
-	    (*iconv)(c1, c2, c3);
-	    break;
-	}
-	if (c3 == EOF) break;
-    }
-    return ret;
-}
-
-/*
- * Check and Ignore BOM
- */
-static void
-check_bom(FILE *f)
-{
-    int c2;
-    switch(c2 = (*i_getc)(f)){
-    case 0x00:
-	if((c2 = (*i_getc)(f)) == 0x00){
-	    if((c2 = (*i_getc)(f)) == 0xFE){
-		if((c2 = (*i_getc)(f)) == 0xFF){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_BIG;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFE,f);
-	    }else if(c2 == 0xFF){
-		if((c2 = (*i_getc)(f)) == 0xFE){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_2143;
-			return;
-		    }
-		    (*i_ungetc)(0xFF,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0xFF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0x00,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0x00,f);
-	break;
-    case 0xEF:
-	if((c2 = (*i_getc)(f)) == 0xBB){
-	    if((c2 = (*i_getc)(f)) == 0xBF){
-		if(!input_encoding){
-		    set_iconv(TRUE, w_iconv);
-		}
-		if (iconv == w_iconv) {
-		    return;
-		}
-		(*i_ungetc)(0xBF,f);
-	    }else (*i_ungetc)(c2,f);
-	    (*i_ungetc)(0xBB,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xEF,f);
-	break;
-    case 0xFE:
-	if((c2 = (*i_getc)(f)) == 0xFF){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_3412;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_encoding){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_BIG;
-		return;
-	    }
-	    (*i_ungetc)(0xFF,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFE,f);
-	break;
-    case 0xFF:
-	if((c2 = (*i_getc)(f)) == 0xFE){
-	    if((c2 = (*i_getc)(f)) == 0x00){
-		if((c2 = (*i_getc)(f)) == 0x00){
-		    if(!input_encoding){
-			set_iconv(TRUE, w_iconv32);
-		    }
-		    if (iconv == w_iconv32) {
-			input_endian = ENDIAN_LITTLE;
-			return;
-		    }
-		    (*i_ungetc)(0x00,f);
-		}else (*i_ungetc)(c2,f);
-		(*i_ungetc)(0x00,f);
-	    }else (*i_ungetc)(c2,f);
-	    if(!input_encoding){
-		set_iconv(TRUE, w_iconv16);
-	    }
-	    if (iconv == w_iconv16) {
-		input_endian = ENDIAN_LITTLE;
-		return;
+        }
+        (*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(ms_ucs_map_f
+	   ? c2<0x20 || 0x92<c2 || c1<0x20 || 0x7e<c1
+	   : 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);
 	    }
-	    (*i_ungetc)(0xFE,f);
-	}else (*i_ungetc)(c2,f);
-	(*i_ungetc)(0xFF,f);
-	break;
-    default:
-	(*i_ungetc)(c2,f);
-	break;
+	}else if (output_mode != X0208) {
+            output_mode = X0208;
+            (*o_putc)(ESC);
+            (*o_putc)('$');
+            (*o_putc)(kanji_intro);
+        }
+        (*o_putc)(c2);
+        (*o_putc)(c1);
     }
 }
 
-static struct {
-    int count;
-    nkf_char status;
-    nkf_char buf[3];
-} broken_state;
-
-static void
-init_broken_state(void)
+void base64_conv(nkf_char c2, nkf_char c1)
 {
-    memset(&broken_state, 0, sizeof(broken_state));
-}
-
-static void
-push_broken_buf(c)
-{
-    broken_state.buf[broken_state.count++] = c;
+    mime_prechar(c2, c1);
+    (*o_base64conv)(c2,c1);
 }
 
-static nkf_char
-pop_broken_buf(void)
-{
-    return broken_state.buf[--broken_state.count];
-}
 
-static nkf_char
-broken_getc(FILE *f)
+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;
+    nkf_char c,c1;
 
-    if (broken_state.count > 0) {
-	return pop_broken_buf();
+    if (broken_counter>0) {
+	return broken_buf[--broken_counter];
     }
-    c = (*i_bgetc)(f);
-    if (c=='$' && broken_state.status != ESC
-	&& (input_mode == ASCII || input_mode == JIS_X_0201_1976_K)) {
+    c= (*i_bgetc)(f);
+    if (c=='$' && broken_last != ESC 
+            && (input_mode==ASCII || input_mode==X0201)) {
 	c1= (*i_bgetc)(f);
-	broken_state.status = 0;
+	broken_last = 0;
 	if (c1=='@'|| c1=='B') {
-	    push_broken_buf(c1);
-	    push_broken_buf(c);
+	    broken_buf[0]=c1; broken_buf[1]=c; 
+	    broken_counter=2;
 	    return ESC;
 	} else {
 	    (*i_bungetc)(c1,f);
 	    return c;
 	}
-    } else if (c=='(' && broken_state.status != ESC
-	       && (input_mode == JIS_X_0208 || input_mode == JIS_X_0201_1976_K)) {
+    } else if (c=='(' && broken_last != ESC 
+            && (input_mode==X0208 || input_mode==X0201)) { /* ) */
 	c1= (*i_bgetc)(f);
-	broken_state.status = 0;
+	broken_last = 0;
 	if (c1=='J'|| c1=='B') {
-	    push_broken_buf(c1);
-	    push_broken_buf(c);
+	    broken_buf[0]=c1; broken_buf[1]=c;
+	    broken_counter=2;
 	    return ESC;
 	} else {
 	    (*i_bungetc)(c1,f);
 	    return c;
 	}
     } else {
-	broken_state.status = c;
+	broken_last = c;
 	return c;
     }
 }
 
-static nkf_char
-broken_ungetc(nkf_char c, FILE *f)
+nkf_char broken_ungetc(nkf_char c, FILE *f)
 {
-    if (broken_state.count < 2)
-	push_broken_buf(c);
+    if (broken_counter<2)
+	broken_buf[broken_counter++]=c;
     return c;
 }
 
-static void
-eol_conv(nkf_char c2, nkf_char c1)
+static nkf_char prev_cr = 0;
+
+void cr_conv(nkf_char c2, nkf_char c1)
 {
-    if (guess_f && input_eol != EOF) {
-	if (c2 == 0 && c1 == LF) {
-	    if (!input_eol) input_eol = prev_cr ? CRLF : LF;
-	    else if (input_eol != (prev_cr ? CRLF : LF)) input_eol = EOF;
-	} else if (c2 == 0 && c1 == CR && input_eol == LF) input_eol = EOF;
-	else if (!prev_cr);
-	else if (!input_eol) input_eol = CR;
-	else if (input_eol != CR) input_eol = EOF;
-    }
-    if (prev_cr || (c2 == 0 && c1 == LF)) {
+    if (prev_cr) {
 	prev_cr = 0;
-	if (eolmode_f != LF) (*o_eol_conv)(0, CR);
-	if (eolmode_f != CR) (*o_eol_conv)(0, LF);
+	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);
     }
-    if (c2 == 0 && c1 == CR) prev_cr = CR;
-    else if (c2 != 0 || c1 != LF) (*o_eol_conv)(c2, c1);
 }
 
-/*
-   Return value of fold_conv()
+/* 
+  Return value of fold_conv()
 
-   LF  add newline  and output char
-   CR  add newline  and output nothing
-   SP  space
-   0   skip
-   1   (or else) normal output
+       \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)
+  fold state in prev (previous character)
 
-   >0x80 Japanese (X0208/X0201)
-   <0x80 ASCII
-   LF    new line
-   SP    space
+      >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.
- */
+  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)
 
-static void
-fold_conv(nkf_char c2, nkf_char c1)
-{
+void fold_conv(nkf_char c2, nkf_char c1)
+{ 
     nkf_char prev0;
     nkf_char fold_state;
 
-    if (c1== CR && !fold_preserve_f) {
-	fold_state=0;  /* ignore cr */
-    }else if (c1== LF&&f_prev==CR && fold_preserve_f) {
-	f_prev = LF;
-	fold_state=0;  /* ignore cr */
+    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;
+        if (f_line>0) f_line--;
+        fold_state =  1;
     } else if (c2==EOF && f_line != 0) {    /* close open last line */
-	fold_state = LF;
-    } else if ((c1==LF && !fold_preserve_f)
-	       || ((c1==CR||(c1==LF&&f_prev!=CR))
-		   && fold_preserve_f)) {
-	/* new line */
-	if (fold_preserve_f) {
-	    f_prev = c1;
-	    f_line = 0;
-	    fold_state =  CR;
+            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 == LF && fold_preserve_f)
-		  ) {        /* duplicate newline */
-	    if (f_line) {
-		f_line = 0;
-		fold_state =  LF;    /* 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==SP) {
-		fold_state =  0;
-	    } else {
-		f_prev = c1;
-		if (++f_line<=fold_len)
-		    fold_state =  SP;
-		else {
-		    f_line = 0;
-		    fold_state =  CR;        /* fold and output nothing */
-		}
-	    }
-	}
+                   || (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 = LF;
-	f_line = 0;
-	fold_state =  LF;            /* output newline and clear */
-    } else if ( (c2==0  && c1==SP)||
-	       (c2==0  && c1==TAB)||
-	       (c2=='!'&& c1=='!')) {
-	/* X0208 kankaku or ascii space */
-	if (f_prev == SP) {
-	    fold_state = 0;         /* remove duplicate spaces */
-	} else {
-	    f_prev = SP;
-	    if (++f_line<=fold_len)
-		fold_state = SP;         /* output ASCII space only */
-	    else {
-		f_prev = SP; f_line = 0;
-		fold_state = CR;        /* fold and output nothing */
-	    }
-	}
+        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 == JIS_X_0201_1976_K)
-	    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 =  LF;       /* We can't wait, do fold now */
-	    } else if (c2 == JIS_X_0201_1976_K) {
-		/* 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 (SP<=c1 && c1<=(0xdf&0x7f)) {      /* X0201 */
+        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 = LF;/* add one new f_line before this character */
+		    fold_state = '\n';/* add one new f_line before this character */
 		} else {
 		    f_line = 1;
-		    fold_state = LF;/* add one new f_line before this character */
+		    fold_state = '\n';/* add one new f_line before this character */
 		}
-	    } else if (c2==0) {
-		/* kinsoku point in ASCII */
+            } else if (c2==0) {
+                /* kinsoku point in ASCII */ 
 		if (  c1==')'||    /* { [ ( */
-		    c1==']'||
-		    c1=='}'||
-		    c1=='.'||
-		    c1==','||
-		    c1=='!'||
-		    c1=='?'||
-		    c1=='/'||
-		    c1==':'||
-		    c1==';') {
+                     c1==']'||
+                     c1=='}'||
+                     c1=='.'||
+                     c1==','||
+                     c1=='!'||
+                     c1=='?'||
+                     c1=='/'||
+                     c1==':'||
+                     c1==';' ) {
 		    fold_state = 1;
-		    /* just after special */
+		/* just after special */
 		} else if (!is_alnum(prev0)) {
 		    f_line = char_size(c2,c1);
-		    fold_state = LF;
-		} else if ((prev0==SP) ||   /* ignored new f_line */
-			   (prev0==LF)||        /* ignored new f_line */
-			   (prev0&0x80)) {        /* X0208 - ASCII */
+		    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 = LF;/* 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 = LF;
+                    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 {
+                } else {
 		    f_line = char_size(c2,c1);
-		    fold_state = LF;
-		    /* add one new f_line before this character */
-		}
-	    }
-	}
+                    fold_state = '\n'; 
+                    /* add one new f_line before this character */
+                }
+            }
+        }
     }
     /* terminator process */
     switch(fold_state) {
-    case LF:
-	OCONV_NEWLINE((*o_fconv));
-	(*o_fconv)(c2,c1);
-	break;
-    case 0:
-	return;
-    case CR:
-	OCONV_NEWLINE((*o_fconv));
-	break;
-    case TAB:
-    case SP:
-	(*o_fconv)(0,SP);
-	break;
-    default:
-	(*o_fconv)(c2,c1);
+        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);
     }
 }
 
-static nkf_char z_prev2=0,z_prev1=0;
+nkf_char z_prev2=0,z_prev1=0;
 
-static void
-z_conv(nkf_char c2, nkf_char c1)
+void z_conv(nkf_char c2, nkf_char c1)
 {
 
     /* if (c2) c1 &= 0x7f; assertion */
 
-    if (c2 == JIS_X_0201_1976_K && (c1 == 0x20 || c1 == 0x7D || c1 == 0x7E)) {
-	(*o_zconv)(c2,c1);
-	return;
-    }
-
-    if (x0201_f) {
-	if (z_prev2 == JIS_X_0201_1976_K) {
-	    if (c2 == JIS_X_0201_1976_K) {
-		if (c1 == (0xde&0x7f)) { /* $BByE@(B */
-		    z_prev2 = 0;
-		    (*o_zconv)(dv[(z_prev1-SP)*2], dv[(z_prev1-SP)*2+1]);
-		    return;
-		} else if (c1 == (0xdf&0x7f) && ev[(z_prev1-SP)*2]) {  /* $BH>ByE@(B */
-		    z_prev2 = 0;
-		    (*o_zconv)(ev[(z_prev1-SP)*2], ev[(z_prev1-SP)*2+1]);
-		    return;
-		}
-	    }
-	    z_prev2 = 0;
-	    (*o_zconv)(cv[(z_prev1-SP)*2], cv[(z_prev1-SP)*2+1]);
-	}
-	if (c2 == JIS_X_0201_1976_K) {
-	    if (dv[(c1-SP)*2] || ev[(c1-SP)*2]) {
-		/* wait for $BByE@(B or $BH>ByE@(B */
-		z_prev1 = c1;
-		z_prev2 = c2;
-		return;
-	    } else {
-		(*o_zconv)(cv[(c1-SP)*2], cv[(c1-SP)*2+1]);
-		return;
-	    }
-	}
-    }
-
-    if (c2 == EOF) {
-	(*o_zconv)(c2, c1);
-	return;
-    }
-
-    if (alpha_f&1 && c2 == 0x23) {
-	/* JISX0208 Alphabet */
-	c2 = 0;
-    } else if (c2 == 0x21) {
-	/* JISX0208 Kigou */
-	if (0x21==c1) {
-	    if (alpha_f&2) {
-		c2 = 0;
-		c1 = SP;
-	    } else if (alpha_f&4) {
-		(*o_zconv)(0, SP);
-		(*o_zconv)(0, SP);
-		return;
-	    }
-	} else if (alpha_f&1 && 0x20<c1 && c1<0x7f && fv[c1-0x20]) {
-	    c2 =  0;
-	    c1 = fv[c1-0x20];
-	}
-    }
-
-    if (alpha_f&8 && c2 == 0) {
-	/* HTML Entity */
-	const 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;
-	}
-    }
-
-    if (alpha_f & 16) {
-	/* JIS X 0208 Katakana to JIS X 0201 Katakana */
-	if (c2 == 0x21) {
-	    char c = 0;
-	    switch (c1) {
-	    case 0x23:
-		/* U+3002 (0x8142) Ideographic Full Stop -> U+FF61 (0xA1) Halfwidth Ideographic Full Stop */
-		c = 0xA1;
-		break;
-	    case 0x56:
-		/* U+300C (0x8175) Left Corner Bracket -> U+FF62 (0xA2) Halfwidth Left Corner Bracket */
-		c = 0xA2;
-		break;
-	    case 0x57:
-		/* U+300D (0x8176) Right Corner Bracket -> U+FF63 (0xA3) Halfwidth Right Corner Bracket */
-		c = 0xA3;
-		break;
-	    case 0x22:
-		/* U+3001 (0x8141) Ideographic Comma -> U+FF64 (0xA4) Halfwidth Ideographic Comma */
-		c = 0xA4;
-		break;
-	    case 0x26:
-		/* U+30FB (0x8145) Katakana Middle Dot -> U+FF65 (0xA5) Halfwidth Katakana Middle Dot */
-		c = 0xA5;
-		break;
-	    case 0x3C:
-		/* U+30FC (0x815B) Katakana-Hiragana Prolonged Sound Mark -> U+FF70 (0xB0) Halfwidth Katakana-Hiragana Prolonged Sound Mark */
-		c = 0xB0;
-		break;
-	    case 0x2B:
-		/* U+309B (0x814A) Katakana-Hiragana Voiced Sound Mark -> U+FF9E (0xDE) Halfwidth Katakana Voiced Sound Mark */
-		c = 0xDE;
-		break;
-	    case 0x2C:
-		/* U+309C (0x814B) Katakana-Hiragana Semi-Voiced Sound Mark -> U+FF9F (0xDF) Halfwidth Katakana Semi-Voiced Sound Mark */
-		c = 0xDF;
-		break;
-	    }
-	    if (c) {
-		(*o_zconv)(JIS_X_0201_1976_K, c);
-		return;
-	    }
-	} else if (c2 == 0x25) {
-	    /* JISX0208 Katakana */
-	    static const int fullwidth_to_halfwidth[] =
-	    {
-		0x0000, 0x2700, 0x3100, 0x2800, 0x3200, 0x2900, 0x3300, 0x2A00,
-		0x3400, 0x2B00, 0x3500, 0x3600, 0x365E, 0x3700, 0x375E, 0x3800,
-		0x385E, 0x3900, 0x395E, 0x3A00, 0x3A5E, 0x3B00, 0x3B5E, 0x3C00,
-		0x3C5E, 0x3D00, 0x3D5E, 0x3E00, 0x3E5E, 0x3F00, 0x3F5E, 0x4000,
-		0x405E, 0x4100, 0x415E, 0x2F00, 0x4200, 0x425E, 0x4300, 0x435E,
-		0x4400, 0x445E, 0x4500, 0x4600, 0x4700, 0x4800, 0x4900, 0x4A00,
-		0x4A5E, 0x4A5F, 0x4B00, 0x4B5E, 0x4B5F, 0x4C00, 0x4C5E, 0x4C5F,
-		0x4D00, 0x4D5E, 0x4D5F, 0x4E00, 0x4E5E, 0x4E5F, 0x4F00, 0x5000,
-		0x5100, 0x5200, 0x5300, 0x2C00, 0x5400, 0x2D00, 0x5500, 0x2E00,
-		0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x5B00, 0x0000, 0x5C00,
-		0x0000, 0x0000, 0x2600, 0x5D00, 0x335E, 0x0000, 0x0000, 0x0000,
-		0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-	    };
-	    if (fullwidth_to_halfwidth[c1-0x20]){
-		c2 = fullwidth_to_halfwidth[c1-0x20];
-		(*o_zconv)(JIS_X_0201_1976_K, c2>>8);
-		if (c2 & 0xFF) {
-		    (*o_zconv)(JIS_X_0201_1976_K, c2&0xFF);
-		}
-		return;
-	    }
-	}
+    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) \
-		  )
+      ( 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 \
-		  )
-
-static void
-rot_conv(nkf_char c2, nkf_char c1)
+      ( c < '!' ) ? c: \
+      ( c <= 'O' ) ? (c + 47) : \
+      ( c <= '~' ) ?  (c - 47) : \
+      c \
+)
+
+void rot_conv(nkf_char c2, nkf_char c1)
 {
-    if (c2 == 0 || c2 == JIS_X_0201_1976_K || c2 == ISO_8859_1) {
+    if (c2==0 || c2==X0201 || c2==ISO8859_1) {
 	c1 = rot13(c1);
     } else if (c2) {
 	c1 = rot47(c1);
@@ -3614,64 +4634,61 @@ rot_conv(nkf_char c2, nkf_char c1)
     (*o_rot_conv)(c2,c1);
 }
 
-static void
-hira_conv(nkf_char c2, nkf_char 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 && nkf_enc_unicode_p(output_encoding)) {
-		c2 = 0;
-		c1 = nkf_char_unicode_new(0x3094);
-		(*o_hira_conv)(c2,c1);
-		return;
-	    }
-	} else if (c2 == 0x21 && (c1 == 0x33 || c1 == 0x34)) {
-	    c1 += 2;
-	    (*o_hira_conv)(c2,c1);
-	    return;
-	}
+        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_UNICODE | 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 == nkf_char_unicode_new(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;
-	}
+        if (c2 == 0 && c1 == (CLASS_UNICODE | 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);
 }
 
 
-static void
-iso2022jp_check_conv(nkf_char c2, nkf_char c1)
+void iso2022jp_check_conv(nkf_char c2, nkf_char c1)
 {
-#define RANGE_NUM_MAX 18
     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},
+        {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;
@@ -3700,7 +4717,7 @@ iso2022jp_check_conv(nkf_char c2, nkf_char c1)
 
 /* This converts  =?ISO-2022-JP?B?HOGE HOGE?= */
 
-static const unsigned char *mime_pattern[] = {
+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?",
@@ -3725,16 +4742,16 @@ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
     0,
 };
 
-static const nkf_char mime_encode[] = {
-    EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K,
+const nkf_char mime_encode[] = {
+    JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
 #if defined(UTF8_INPUT_ENABLE)
-    UTF_8, UTF_8,
+    UTF8, UTF8,
 #endif
     ASCII,
     0
 };
 
-static const nkf_char mime_encode_method[] = {
+const nkf_char mime_encode_method[] = {
     'B', 'B','Q', 'B', 'B', 'Q',
 #if defined(UTF8_INPUT_ENABLE)
     'B', 'Q',
@@ -3744,55 +4761,9 @@ static const nkf_char mime_encode_method[] = {
 };
 
 
-/* MIME preprocessor fifo */
-
-#define MIME_BUF_SIZE   (1024)    /* 2^n ring buffer */
-#define MIME_BUF_MASK   (MIME_BUF_SIZE-1)
-#define mime_input_buf(n)        mime_input_state.buf[(n)&MIME_BUF_MASK]
-static struct {
-    unsigned char buf[MIME_BUF_SIZE];
-    unsigned int  top;
-    unsigned int  last;  /* decoded */
-    unsigned int  input; /* undecoded */
-} mime_input_state;
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
-
 #define MAXRECOVER 20
 
-static void
-mime_input_buf_unshift(nkf_char c)
-{
-    mime_input_buf(--mime_input_state.top) = (unsigned char)c;
-}
-
-static nkf_char
-mime_ungetc(nkf_char c, FILE *f)
-{
-    mime_input_buf_unshift(c);
-    return c;
-}
-
-static nkf_char
-mime_ungetc_buf(nkf_char c, FILE *f)
-{
-    if (mimebuf_f)
-	(*i_mungetc_buf)(c,f);
-    else
-	mime_input_buf(--mime_input_state.input) = (unsigned char)c;
-    return c;
-}
-
-static nkf_char
-mime_getc_buf(FILE *f)
-{
-    /* we don't keep eof of mime_input_buf, becase it contains ?= as
-       a terminator. It was checked in mime_integrity. */
-    return ((mimebuf_f)?
-	    (*i_mgetc_buf)(f):mime_input_buf(mime_input_state.input++));
-}
-
-static void
-switch_mime_getc(void)
+void switch_mime_getc(void)
 {
     if (i_getc!=mime_getc) {
 	i_mgetc = i_getc; i_getc = mime_getc;
@@ -3804,8 +4775,7 @@ switch_mime_getc(void)
     }
 }
 
-static void
-unswitch_mime_getc(void)
+void unswitch_mime_getc(void)
 {
     if(mime_f==STRICT_MIME) {
 	i_mgetc = i_mgetc_buf;
@@ -3817,47 +4787,7 @@ unswitch_mime_getc(void)
     mime_iconv_back = NULL;
 }
 
-static 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_state.input = mime_input_state.top;
-    mime_input_state.last = mime_input_state.top;
-
-    while(*p) mime_input_buf(mime_input_state.input++) = *p++;
-    d = 0;
-    q = mime_input_state.input;
-    while((c=(*i_getc)(f))!=EOF) {
-	if (((mime_input_state.input-mime_input_state.top)&MIME_BUF_MASK)==0) {
-	    break;   /* buffer full */
-	}
-	if (c=='=' && d=='?') {
-	    /* checked. skip header, start decode */
-	    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-	    /* mime_last_input = mime_input_state.input; */
-	    mime_input_state.input = q;
-	    switch_mime_getc();
-	    return 1;
-	}
-	if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
-	    break;
-	/* Should we check length mod 4? */
-	mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-	d=c;
-    }
-    /* In case of Incomplete MIME, no MIME decode  */
-    mime_input_buf(mime_input_state.input++) = (unsigned char)c;
-    mime_input_state.last = mime_input_state.input;     /* point undecoded buffer */
-    mime_decode_mode = 1;              /* no decode on mime_input_buf last in mime_getc */
-    switch_mime_getc();         /* anyway we need buffered getc */
-    return 1;
-}
-
-static nkf_char
-mime_begin_strict(FILE *f)
+nkf_char mime_begin_strict(FILE *f)
 {
     nkf_char c1 = 0;
     int i,j,k;
@@ -3870,25 +4800,25 @@ mime_begin_strict(FILE *f)
     p = mime_pattern[j];
     r[0]='='; r[1]='?';
 
-    for(i=2;p[i]>SP;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]) {
+    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;
-	    }
+                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;
-	}
+            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];
 
@@ -3897,19 +4827,35 @@ mime_begin_strict(FILE *f)
     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]);
-	}
+        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;
 }
 
-static nkf_char
-mime_begin(FILE *f)
+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;
@@ -3918,182 +4864,142 @@ mime_begin(FILE *f)
     /* re-read and convert again from mime_buffer.  */
 
     /* =? has been checked */
-    k = mime_input_state.last;
-    mime_input_buf(mime_input_state.last++)='='; mime_input_buf(mime_input_state.last++)='?';
+    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); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
-	if (c1==LF||c1==SP||c1==CR||
-	    c1=='-'||c1=='_'||is_alnum(c1)) continue;
-	if (c1=='=') {
-	    /* Failed. But this could be another MIME preemble */
-	    (*i_ungetc)(c1,f);
-	    mime_input_state.last--;
-	    break;
-	}
-	if (c1!='?') break;
-	else {
-	    /* c1=='?' */
-	    c1 = (*i_getc)(f); mime_input_buf(mime_input_state.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); mime_input_buf(mime_input_state.last++) = (unsigned char)c1;
-	    if (!(++i<MAXRECOVER) || c1==EOF) break;
-	    if (c1!='?') {
-		mime_decode_mode = FALSE;
-	    }
-	    break;
-	}
+        /* 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;
+        /* 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_input_state.last = k;
+    mime_last = k;
     /* do no MIME integrity check */
     return c1;   /* used only for checking EOF */
 }
 
 #ifdef CHECK_OPTION
-static void
-no_putc(nkf_char c)
+void no_putc(nkf_char c)
 {
     ;
 }
 
-static void
-debug(const char *str)
+void debug(const char *str)
 {
     if (debug_f){
-	fprintf(stderr, "%s\n", str ? str : "NULL");
+        fprintf(stderr, "%s\n", str);
     }
 }
 #endif
 
-static void
-set_input_codename(const char *codename)
+void set_input_codename(char *codename)
 {
-    if (!input_codename) {
-	input_codename = codename;
-    } else if (strcmp(codename, input_codename) != 0) {
-	input_codename = "";
-    }
-}
-
-static const char*
-get_guessed_code(void)
-{
-    if (input_codename && !*input_codename) {
-	input_codename = "BINARY";
-    } else {
-	struct input_code *p = find_inputcode_byfunc(iconv);
-	if (!input_codename) {
-	    input_codename = "ASCII";
-	} else if (strcmp(input_codename, "Shift_JIS") == 0) {
-	    if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP932";
-	} else if (strcmp(input_codename, "EUC-JP") == 0) {
-	    if (p->score & (SCORE_X0212))
-		input_codename = "EUCJP-MS";
-	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP51932";
-	} else if (strcmp(input_codename, "ISO-2022-JP") == 0) {
-	    if (p->score & (SCORE_KANA))
-		input_codename = "CP50221";
-	    else if (p->score & (SCORE_DEPEND|SCORE_CP932))
-		input_codename = "CP50220";
-	}
+    if (guess_f && 
+        is_inputcode_set &&
+        strcmp(codename, "") != 0 && 
+        strcmp(codename, input_codename) != 0)
+    {
+        is_inputcode_mixed = TRUE;
     }
-    return input_codename;
+    input_codename = codename;
+    is_inputcode_set = TRUE;
 }
 
 #if !defined(PERL_XS) && !defined(WIN32DLL)
-static void
-print_guessed_code(char *filename)
+void print_guessed_code(char *filename)
 {
-    if (filename != NULL) printf("%s: ", filename);
-    if (input_codename && !*input_codename) {
-	printf("BINARY\n");
-    } else {
-	input_codename = get_guessed_code();
-	if (guess_f == 1) {
-	    printf("%s\n", input_codename);
-	} else {
-	    printf("%s%s\n",
-		   input_codename,
-		   input_eol == CR   ? " (CR)" :
-		   input_eol == LF   ? " (LF)" :
-		   input_eol == CRLF ? " (CRLF)" :
-		   input_eol == EOF  ? " (MIXED NL)" :
-		   "");
-	}
-    }
+    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
+#ifdef INPUT_OPTION 
 
-static nkf_char
-hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
+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;
+        return c1;
     }
     c2 = (*g)(f);
     if (!nkf_isxdigit(c2)){
-	(*u)(c2, f);
-	return c1;
+        (*u)(c2, f);
+        return c1;
     }
     c3 = (*g)(f);
     if (!nkf_isxdigit(c3)){
-	(*u)(c2, f);
-	(*u)(c3, f);
-	return c1;
+        (*u)(c2, f);
+        (*u)(c3, f);
+        return c1;
     }
     return (hex2bin(c2) << 4) | hex2bin(c3);
 }
 
-static nkf_char
-cap_getc(FILE *f)
+nkf_char cap_getc(FILE *f)
 {
     return hex_getc(':', f, i_cgetc, i_cungetc);
 }
 
-static nkf_char
-cap_ungetc(nkf_char c, FILE *f)
+nkf_char cap_ungetc(nkf_char c, FILE *f)
 {
     return (*i_cungetc)(c, f);
 }
 
-static nkf_char
-url_getc(FILE *f)
+nkf_char url_getc(FILE *f)
 {
     return hex_getc('%', f, i_ugetc, i_uungetc);
 }
 
-static nkf_char
-url_ungetc(nkf_char c, FILE *f)
+nkf_char url_ungetc(nkf_char c, FILE *f)
 {
     return (*i_uungetc)(c, f);
 }
 #endif
 
 #ifdef NUMCHAR_OPTION
-static nkf_char
-numchar_getc(FILE *f)
+nkf_char numchar_getc(FILE *f)
 {
     nkf_char (*g)(FILE *) = i_ngetc;
     nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
@@ -4103,51 +5009,50 @@ numchar_getc(FILE *f)
 
     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]);
-		}
-	    }
-	}
+        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 nkf_char_unicode_new(c);
+        return CLASS_UNICODE | c;
     }
     while (i > 0){
-	(*u)(buf[i], f);
-	--i;
+        (*u)(buf[i], f);
+        --i;
     }
     return buf[0];
 }
 
-static nkf_char
-numchar_ungetc(nkf_char c, FILE *f)
+nkf_char numchar_ungetc(nkf_char c, FILE *f)
 {
     return (*i_nungetc)(c, f);
 }
@@ -4156,15 +5061,17 @@ numchar_ungetc(nkf_char c, FILE *f)
 #ifdef UNICODE_NORMALIZATION
 
 /* Normalization Form C */
-static nkf_char
-nfc_getc(FILE *f)
+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 unsigned char *array;
-
+    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;
@@ -4193,37 +5100,14 @@ nfc_getc(FILE *f)
     return buf[0];
 }
 
-static nkf_char
-nfc_ungetc(nkf_char c, FILE *f)
+nkf_char nfc_ungetc(nkf_char c, FILE *f)
 {
     return (*i_nfc_ungetc)(c, f);
 }
 #endif /* UNICODE_NORMALIZATION */
 
 
-static nkf_char
-base64decode(nkf_char c)
-{
-    int             i;
-    if (c > '@') {
-	if (c < '[') {
-	    i = c - 'A';                        /* A..Z 0-25 */
-	} else if (c == '_') {
-	    i = '?'         /* 63 */ ;          /* _  63 */
-	} 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 == '+' || c == '-') {
-	i = '>'             /* 62 */ ;          /* + and -  62 */
-    } else {
-	i = '?'             /* 63 */ ;          /* / 63 */
-    }
-    return (i);
-}
-
-static nkf_char
+nkf_char 
 mime_getc(FILE *f)
 {
     nkf_char c1, c2, c3, c4, cc;
@@ -4233,8 +5117,8 @@ mime_getc(FILE *f)
     char *lwsp_buf_new;
     nkf_char lwsp_size = 128;
 
-    if (mime_input_state.top != mime_input_state.last) {  /* Something is in FIFO */
-	return  mime_input_buf(mime_input_state.top++);
+    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;
@@ -4243,26 +5127,26 @@ mime_getc(FILE *f)
     }
 
     if (mimebuf_f == FIXED_MIME)
-	exit_mode = mime_decode_mode;
+        exit_mode = mime_decode_mode;
     else
-	exit_mode = FALSE;
+        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 SP;
-	if (c1<=SP || DEL<=c1) {
+        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)) {
+        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;
+                
+        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) {
@@ -4271,32 +5155,32 @@ mime_getc(FILE *f)
 	    }
 	    while ((c1=(*i_getc)(f))!=EOF) {
 		switch (c1) {
-		case LF:
+		case NL:
 		case CR:
-		    if (c1==LF) {
-			if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) {
-			    i_ungetc(SP,f);
+		    if (c1==NL) {
+			if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			    i_ungetc(SPACE,f);
 			    continue;
 			} else {
 			    i_ungetc(c1,f);
 			}
-			c1 = LF;
+			c1 = NL;
 		    } else {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == LF) {
-			    if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) {
-				i_ungetc(SP,f);
+			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(LF,f);
+			    i_ungetc(NL,f);
 			} else {
 			    i_ungetc(c1,f);
 			}
 			c1 = CR;
 		    }
 		    break;
-		case SP:
+		case SPACE:
 		case TAB:
 		    lwsp_buf[lwsp_count] = (unsigned char)c1;
 		    if (lwsp_count++>lwsp_size){
@@ -4313,64 +5197,64 @@ mime_getc(FILE *f)
 		}
 		break;
 	    }
-	    if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
+	    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<SP) { /* this is soft wrap */
-	    while((c1 =  (*i_mgetc)(f)) <=SP) {
+            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 */
+            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<=SP) return c2;
-	mime_decode_mode = 'Q'; /* still in MIME */
-	return ((hex2bin(c2)<<4) + hex2bin(c3));
+        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);
+        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.
-     */
+    /* 
+        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))<=SP) {
-	if (c1==EOF)
-	    return (EOF);
+    while ((c1 = (*i_mgetc)(f))<=' ') {
+        if (c1==EOF)
+            return (EOF);
     }
-  mime_c2_retry:
-    if ((c2 = (*i_mgetc)(f))<=SP) {
-	if (c2==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 (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c2;
     }
     if ((c1 == '?') && (c2 == '=')) {
-	input_mode = ASCII;
+        input_mode = ASCII;
 	lwsp_count = 0;
 	lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
 	if (lwsp_buf==NULL) {
@@ -4379,35 +5263,35 @@ mime_getc(FILE *f)
 	}
 	while ((c1=(*i_getc)(f))!=EOF) {
 	    switch (c1) {
-	    case LF:
+	    case NL:
 	    case CR:
-		if (c1==LF) {
-		    if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) {
-			i_ungetc(SP,f);
+		if (c1==NL) {
+		    if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			i_ungetc(SPACE,f);
 			continue;
 		    } else {
 			i_ungetc(c1,f);
 		    }
-		    c1 = LF;
+		    c1 = NL;
 		} else {
 		    if ((c1=(*i_getc)(f))!=EOF) {
-			if (c1==SP) {
-			    i_ungetc(SP,f);
+			if (c1==SPACE) {
+			    i_ungetc(SPACE,f);
 			    continue;
-			} else if ((c1=(*i_getc)(f))!=EOF && (c1==SP||c1==TAB)) {
-			    i_ungetc(SP,f);
+			} else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
+			    i_ungetc(SPACE,f);
 			    continue;
 			} else {
 			    i_ungetc(c1,f);
 			}
-			i_ungetc(LF,f);
+			i_ungetc(NL,f);
 		    } else {
 			i_ungetc(c1,f);
 		    }
 		    c1 = CR;
 		}
 		break;
-	    case SP:
+	    case SPACE:
 	    case TAB:
 		lwsp_buf[lwsp_count] = (unsigned char)c1;
 		if (lwsp_count++>lwsp_size){
@@ -4424,30 +5308,30 @@ mime_getc(FILE *f)
 	    }
 	    break;
 	}
-	if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SP && lwsp_buf[lwsp_count-1] != TAB))) {
+	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;
+        return c1;
     }
-  mime_c3_retry:
-    if ((c3 = (*i_mgetc)(f))<=SP) {
-	if (c3==EOF)
-	    return (EOF);
+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;
+        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c3;
     }
-  mime_c4_retry:
-    if ((c4 = (*i_mgetc)(f))<=SP) {
-	if (c4==EOF)
-	    return (EOF);
+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;
+        if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;  
+        return c4;
     }
 
     mime_decode_mode = mode; /* still in MIME sigh... */
@@ -4460,116 +5344,147 @@ mime_getc(FILE *f)
     t4 = 0x3f & base64decode(c4);
     cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
     if (c2 != '=') {
-	mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
-	cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
-	if (c3 != '=') {
-	    mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
-	    cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
-	    if (c4 != '=')
-		mime_input_buf(mime_input_state.last++) = (unsigned char)cc;
+        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 {
-	return c1;
+        i = '?'             /* 63 */ ;          /* / 63 */
     }
-    return  mime_input_buf(mime_input_state.top++);
+    return (i);
 }
 
 static const char basis_64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
+static nkf_char b64c;
 #define MIMEOUT_BUF_LENGTH (60)
-static struct {
-    char buf[MIMEOUT_BUF_LENGTH+1];
-    int count;
-    nkf_char state;
-} mimeout_state;
-
-/*nkf_char mime_lastchar2, mime_lastchar1;*/
+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')
 
-static void
-open_mime(nkf_char mode)
+void open_mime(nkf_char mode)
 {
     const unsigned char *p;
     int i;
     int j;
     p  = mime_pattern[0];
-    for(i=0;mime_pattern[i];i++) {
+    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_state.count>0 && nkf_isblank(mimeout_state.buf[i])){
-	    (*o_mputc)(mimeout_state.buf[i]);
+	if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
+            (*o_mputc)(mimeout_buf[i]);
 	    i++;
 	}
-	PUT_NEWLINE((*o_mputc));
-	(*o_mputc)(SP);
+	(*o_mputc)(NL);
+	(*o_mputc)(SPACE);
 	base64_count = 1;
-	if (mimeout_state.count>0
-	    && (mimeout_state.buf[i]==SP || mimeout_state.buf[i]==TAB
-		|| mimeout_state.buf[i]==CR || mimeout_state.buf[i]==LF)) {
+	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++;
 	}
     }
-    for (;i<mimeout_state.count;i++) {
-	if (mimeout_state.buf[i]==SP || mimeout_state.buf[i]==TAB
-	    || mimeout_state.buf[i]==CR || mimeout_state.buf[i]==LF) {
-	    (*o_mputc)(mimeout_state.buf[i]);
-	    base64_count ++;
-	} else {
-	    break;
+    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 ++;
+        (*o_mputc)(*p++);
+        base64_count ++;
     }
-    j = mimeout_state.count;
-    mimeout_state.count = 0;
+    j = mimeout_buf_count;
+    mimeout_buf_count = 0;
     for (;i<j;i++) {
-	mime_putc(mimeout_state.buf[i]);
-    }
-}
-
-static void
-mime_prechar(nkf_char c2, nkf_char c1)
-{
-    if (mimeout_mode > 0){
-	if (c2 == EOF){
-	    if (base64_count + mimeout_state.count/3*4> 73){
-		(*o_base64conv)(EOF,0);
-		OCONV_NEWLINE((*o_base64conv));
-		(*o_base64conv)(0,SP);
-		base64_count = 1;
-	    }
-	} else {
-	    if (base64_count + mimeout_state.count/3*4> 66) {
-		(*o_base64conv)(EOF,0);
-		OCONV_NEWLINE((*o_base64conv));
-		(*o_base64conv)(0,SP);
-		base64_count = 1;
-		mimeout_mode = -1;
-	    }
-	}
-    } else if (c2) {
-	if (c2 != EOF && base64_count + mimeout_state.count/3*4> 60) {
-	    mimeout_mode =  (output_mode==ASCII ||output_mode == ISO_8859_1) ? 'Q' : 'B';
-	    open_mime(output_mode);
-	    (*o_base64conv)(EOF,0);
-	    OCONV_NEWLINE((*o_base64conv));
-	    (*o_base64conv)(0,SP);
-	    base64_count = 1;
-	    mimeout_mode = -1;
-	}
+	mime_putc(mimeout_buf[i]);
     }
 }
 
-static void
-close_mime(void)
+void close_mime(void)
 {
     (*o_mputc)('?');
     (*o_mputc)('=');
@@ -4577,315 +5492,290 @@ close_mime(void)
     mimeout_mode = 0;
 }
 
-static void
-eof_mime(void)
+void eof_mime(void)
 {
     switch(mimeout_mode) {
     case 'Q':
     case 'B':
 	break;
     case 2:
-	(*o_mputc)(basis_64[((mimeout_state.state & 0x3)<< 4)]);
+	(*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
 	(*o_mputc)('=');
 	(*o_mputc)('=');
 	base64_count += 3;
 	break;
     case 1:
-	(*o_mputc)(basis_64[((mimeout_state.state & 0xF) << 2)]);
+	(*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
 	(*o_mputc)('=');
 	base64_count += 2;
 	break;
     }
-    if (mimeout_mode > 0) {
+    if (mimeout_mode) {
 	if (mimeout_f!=FIXED_MIME) {
-	    close_mime();
+	    close_mime(); 
 	} else if (mimeout_mode != 'Q')
 	    mimeout_mode = 'B';
     }
 }
 
-static void
-mimeout_addchar(nkf_char c)
+void mimeout_addchar(nkf_char c)
 {
     switch(mimeout_mode) {
     case 'Q':
-	if (c==CR||c==LF) {
+	if (c==CR||c==NL) {
 	    (*o_mputc)(c);
 	    base64_count = 0;
 	} else if(!nkf_isalnum(c)) {
 	    (*o_mputc)('=');
-	    (*o_mputc)(bin2hex(((c>>4)&0xf)));
-	    (*o_mputc)(bin2hex((c&0xf)));
+	    (*o_mputc)(itoh4(((c>>4)&0xf)));
+	    (*o_mputc)(itoh4((c&0xf)));
 	    base64_count += 3;
 	} else {
 	    (*o_mputc)(c);
 	    base64_count++;
 	}
-	break;
+        break;
     case 'B':
-	mimeout_state.state=c;
-	(*o_mputc)(basis_64[c>>2]);
-	mimeout_mode=2;
-	base64_count ++;
-	break;
+        b64c=c;
+        (*o_mputc)(basis_64[c>>2]);
+        mimeout_mode=2;
+        base64_count ++;
+        break;
     case 2:
-	(*o_mputc)(basis_64[((mimeout_state.state & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
-	mimeout_state.state=c;
-	mimeout_mode=1;
-	base64_count ++;
-	break;
+        (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
+        b64c=c;
+        mimeout_mode=1;
+        base64_count ++;
+        break;
     case 1:
-	(*o_mputc)(basis_64[((mimeout_state.state & 0xF) << 2) | ((c & 0xC0) >>6)]);
-	(*o_mputc)(basis_64[c & 0x3F]);
-	mimeout_mode='B';
-	base64_count += 2;
-	break;
+        (*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;
+        break;
     }
 }
 
-static void
-mime_putc(nkf_char c)
+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!=LF) {
-		    (*o_mputc)('=');
-		    PUT_NEWLINE((*o_mputc));
-		}
-		base64_count = 0;
-	    }
-	}else{
-	    if (base64_count > 71){
-		eof_mime();
-		PUT_NEWLINE((*o_mputc));
-		base64_count = 0;
-	    }
-	    if (c == EOF) { /* c==EOF */
-		eof_mime();
-	    }
-	}
-	if (c != EOF) { /* c==EOF */
-	    mimeout_addchar(c);
-	}
-	return;
-    }
-
+        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 */
-	if (mimeout_mode == -1 && mimeout_state.count > 1) open_mime(output_mode);
-	j = mimeout_state.count;
-	mimeout_state.count = 0;
+	j = mimeout_buf_count;
+	mimeout_buf_count = 0;
 	i = 0;
-	if (mimeout_mode > 0) {
-	    if (!nkf_isblank(mimeout_state.buf[j-1])) {
-		for (;i<j;i++) {
-		    if (nkf_isspace(mimeout_state.buf[i]) && base64_count < 71){
-			break;
-		    }
-		    mimeout_addchar(mimeout_state.buf[i]);
-		}
-		eof_mime();
-		for (;i<j;i++) {
-		    mimeout_addchar(mimeout_state.buf[i]);
-		}
-	    } else {
-		for (;i<j;i++) {
-		    mimeout_addchar(mimeout_state.buf[i]);
+	if (mimeout_mode) {
+	    for (;i<j;i++) {
+		if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
+		    break;
 		}
-		eof_mime();
+		mimeout_addchar(mimeout_buf[i]);
+	    }
+	    eof_mime();
+	    for (;i<j;i++) {
+		mimeout_addchar(mimeout_buf[i]);
 	    }
 	} else {
 	    for (;i<j;i++) {
-		mimeout_addchar(mimeout_state.buf[i]);
+		mimeout_addchar(mimeout_buf[i]);
 	    }
 	}
-	return;
-    }
-
-    if (mimeout_state.count > 0){
-	lastchar = mimeout_state.buf[mimeout_state.count - 1];
-    }else{
-	lastchar = -1;
+        return;
     }
 
     if (mimeout_mode=='Q') {
-	if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
-	    if (c == CR || c == LF) {
-		close_mime();
-		(*o_mputc)(c);
-		base64_count = 0;
-		return;
-	    } else if (c <= SP) {
-		close_mime();
-		if (base64_count > 70) {
-		    PUT_NEWLINE((*o_mputc));
-		    base64_count = 0;
-		}
-		if (!nkf_isblank(c)) {
-		    (*o_mputc)(SP);
-		    base64_count++;
-		}
-	    } else {
-		if (base64_count > 70) {
-		    close_mime();
-		    PUT_NEWLINE((*o_mputc));
-		    (*o_mputc)(SP);
-		    base64_count = 1;
-		    open_mime(output_mode);
-		}
-		if (!nkf_noescape_mime(c)) {
-		    mimeout_addchar(c);
-		    return;
-		}
-	    }
-	    (*o_mputc)(c);
-	    base64_count++;
-	}
-	return;
-    }
-
-    if (mimeout_mode <= 0) {
-	if (c <= DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
-	    if (nkf_isspace(c)) {
-		int flag = 0;
-		if (mimeout_mode == -1) {
-		    flag = 1;
-		}
-		if (c==CR || c==LF) {
-		    if (flag) {
-			open_mime(output_mode);
-			output_mode = 0;
-		    } else {
-			base64_count = 0;
-		    }
-		}
-		for (i=0;i<mimeout_state.count;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		    if (mimeout_state.buf[i] == CR || mimeout_state.buf[i] == LF){
-			base64_count = 0;
-		    }else{
-			base64_count++;
-		    }
-		}
-		if (flag) {
-		    eof_mime();
-		    base64_count = 0;
-		    mimeout_mode = 0;
-		}
-		mimeout_state.buf[0] = (char)c;
-		mimeout_state.count = 1;
-	    }else{
-		if (base64_count > 1
-		    && base64_count + mimeout_state.count > 76
-		    && mimeout_state.buf[0] != CR && mimeout_state.buf[0] != LF){
-		    PUT_NEWLINE((*o_mputc));
-		    base64_count = 0;
-		    if (!nkf_isspace(mimeout_state.buf[0])){
-			(*o_mputc)(SP);
-			base64_count++;
-		    }
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    open_mime(output_mode);
-		}
-	    }
-	    return;
-	}else{
-	    if (lastchar==CR || lastchar == LF){
-		for (i=0;i<mimeout_state.count;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		}
-		base64_count = 0;
-		mimeout_state.count = 0;
-	    }
-	    if (lastchar==SP) {
-		for (i=0;i<mimeout_state.count-1;i++) {
-		    (*o_mputc)(mimeout_state.buf[i]);
-		    base64_count++;
-		}
-		mimeout_state.buf[0] = SP;
-		mimeout_state.count = 1;
-	    }
-	    open_mime(output_mode);
-	}
+        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{
-	/* mimeout_mode == 'B', 1, 2 */
-	if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO_8859_1)) {
-	    if (lastchar == CR || lastchar == LF){
-		if (nkf_isblank(c)) {
-		    for (i=0;i<mimeout_state.count;i++) {
-			mimeout_addchar(mimeout_state.buf[i]);
-		    }
-		    mimeout_state.count = 0;
-		} else if (SP<c && c<DEL) {
-		    eof_mime();
-		    for (i=0;i<mimeout_state.count;i++) {
-			(*o_mputc)(mimeout_state.buf[i]);
-		    }
-		    base64_count = 0;
-		    mimeout_state.count = 0;
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		return;
-	    }
-	    if (c==SP || c==TAB || c==CR || c==LF) {
-		for (i=0;i<mimeout_state.count;i++) {
-		    if (SP<mimeout_state.buf[i] && mimeout_state.buf[i]<DEL) {
-			eof_mime();
-			for (i=0;i<mimeout_state.count;i++) {
-			    (*o_mputc)(mimeout_state.buf[i]);
-			    base64_count++;
-			}
-			mimeout_state.count = 0;
-		    }
-		}
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    eof_mime();
-		    for (i=0;i<mimeout_state.count;i++) {
-			(*o_mputc)(mimeout_state.buf[i]);
-			base64_count++;
-		    }
-		    mimeout_state.count = 0;
-		}
-		return;
-	    }
-	    if (mimeout_state.count>0 && SP<c && c!='=') {
-		mimeout_state.buf[mimeout_state.count++] = (char)c;
-		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
-		    j = mimeout_state.count;
-		    mimeout_state.count = 0;
-		    for (i=0;i<j;i++) {
-			mimeout_addchar(mimeout_state.buf[i]);
-		    }
-		}
-		return;
-	    }
-	}
-    }
-    if (mimeout_state.count>0) {
-	j = mimeout_state.count;
-	mimeout_state.count = 0;
+        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_state.buf[i]==CR || mimeout_state.buf[i]==LF)
+	    if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
 		break;
-	    mimeout_addchar(mimeout_state.buf[i]);
+	    mimeout_addchar(mimeout_buf[i]);
 	}
 	if (i<j) {
 	    eof_mime();
 	    base64_count=0;
 	    for (;i<j;i++) {
-		(*o_mputc)(mimeout_state.buf[i]);
+		(*o_mputc)(mimeout_buf[i]);
 	    }
 	    open_mime(output_mode);
 	}
@@ -4893,118 +5783,15 @@ mime_putc(nkf_char c)
     mimeout_addchar(c);
 }
 
-static void
-base64_conv(nkf_char c2, nkf_char c1)
-{
-    mime_prechar(c2, c1);
-    (*o_base64conv)(c2,c1);
-}
-
-#ifdef HAVE_ICONV_H
-typedef struct nkf_iconv_t {
-    iconv_t cd;
-    char *input_buffer;
-    size_t input_buffer_size;
-    char *output_buffer;
-    size_t output_buffer_size;
-}
 
-static nkf_iconv_t
-nkf_iconv_new(char *tocode, char *fromcode)
+#if defined(PERL_XS) || defined(WIN32DLL)
+void reinit(void)
 {
-    nkf_iconv_t converter;
-
-    converter->input_buffer_size = IOBUF_SIZE;
-    converter->input_buffer = malloc(converter->input_buffer_size);
-    if (converter->input_buffer == NULL)
-	perror("can't malloc");
-
-    converter->output_buffer_size = IOBUF_SIZE * 2;
-    converter->output_buffer = malloc(converter->output_buffer_size);
-    if (converter->output_buffer == NULL)
-	perror("can't malloc");
-
-    converter->cd = iconv_open(tocode, fromcode);
-    if (converter->cd == (iconv_t)-1)
     {
-	switch (errno) {
-	case EINVAL:
-	    perror(fprintf("iconv doesn't support %s to %s conversion.", fromcode, tocode));
-	    return -1;
-	default:
-	    perror("can't iconv_open");
-	}
-    }
-}
-
-static size_t
-nkf_iconv_convert(nkf_iconv_t *converter, FILE *input)
-{
-    size_t invalid = (size_t)0;
-    char *input_buffer = converter->input_buffer;
-    size_t input_length = (size_t)0;
-    char *output_buffer = converter->output_buffer;
-    size_t output_length = converter->output_buffer_size;
-    int c;
-
-    do {
-	if (c != EOF) {
-	    while ((c = (*i_getc)(f)) != EOF) {
-		input_buffer[input_length++] = c;
-		if (input_length < converter->input_buffer_size) break;
-	    }
-	}
-
-	size_t ret = iconv(converter->cd, &input_buffer, &input_length, &output_buffer, &output_length);
-	while (output_length-- > 0) {
-	    (*o_putc)(output_buffer[converter->output_buffer_size-output_length]);
-	}
-	if (ret == (size_t) - 1) {
-	    switch (errno) {
-	    case EINVAL:
-		if (input_buffer != converter->input_buffer)
-		    memmove(converter->input_buffer, input_buffer, input_length);
-		break;
-	    case E2BIG:
-		converter->output_buffer_size *= 2;
-		output_buffer = realloc(converter->outbuf, converter->output_buffer_size);
-		if (output_buffer == NULL) {
-		    perror("can't realloc");
-		    return -1;
-		}
-		converter->output_buffer = output_buffer;
-		break;
-	    default:
-		perror("can't iconv");
-		return -1;
-	    }
-	} else {
-	    invalid += ret;
-	}
-    } while (1);
-
-    return invalid;
-}
-
-
-static void
-nkf_iconv_close(nkf_iconv_t *convert)
-{
-    free(converter->inbuf);
-    free(converter->outbuf);
-    iconv_close(converter->cd);
-}
-#endif
-
-
-static void
-reinit(void)
-{
-    {
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    status_reinit(p++);
-	}
+        struct input_code *p = input_code_list;
+        while (p->name){
+            status_reinit(p++);
+        }
     }
     unbuf_f = FALSE;
     estab_f = FALSE;
@@ -5012,14 +5799,19 @@ reinit(void)
     binmode_f = TRUE;
     rot_f = FALSE;
     hira_f = FALSE;
+    input_f = FALSE;
     alpha_f = FALSE;
-    mime_f = MIME_DECODE_DEFAULT;
+    mime_f = STRICT_MIME;
     mime_decode_f = FALSE;
     mimebuf_f = FALSE;
     broken_f = FALSE;
     iso8859_f = FALSE;
     mimeout_f = FALSE;
-    x0201_f = X0201_DEFAULT;
+#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;
@@ -5047,7 +5839,9 @@ reinit(void)
     noout_f = FALSE;
     debug_f = FALSE;
 #endif
-    guess_f = 0;
+    guess_f = FALSE;
+    is_inputcode_mixed = FALSE;
+    is_inputcode_set   = FALSE;
 #ifdef EXEC_IO
     exec_f = 0;
 #endif
@@ -5060,13 +5854,13 @@ reinit(void)
     x0213_f = FALSE;
 #endif
     {
-	int i;
-	for (i = 0; i < 256; i++){
-	    prefix_table[i] = 0;
-	}
+        int i;
+        for (i = 0; i < 256; i++){
+            prefix_table[i] = 0;
+        }
     }
     hold_count = 0;
-    mimeout_state.count = 0;
+    mimeout_buf_count = 0;
     mimeout_mode = 0;
     base64_count = 0;
     f_line = 0;
@@ -5077,9 +5871,11 @@ reinit(void)
     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_eol_conv = no_connection;
+    o_crconv = no_connection;
     o_rot_conv = no_connection;
     o_hira_conv = no_connection;
     o_base64conv = no_connection;
@@ -5096,1427 +5892,149 @@ reinit(void)
     i_mungetc_buf = std_ungetc;
     output_mode = ASCII;
     input_mode =  ASCII;
+    shift_mode =  FALSE;
     mime_decode_mode = FALSE;
     file_out_f = FALSE;
-    eolmode_f = 0;
-    input_eol = 0;
-    prev_cr = 0;
+    crmode_f = 0;
     option_mode = 0;
-    init_broken_state();
+    broken_counter = 0;
+    broken_last = 0;
     z_prev2=0,z_prev1=0;
 #ifdef CHECK_OPTION
     iconv_for_check = 0;
 #endif
-    input_codename = NULL;
-    input_encoding = NULL;
-    output_encoding = NULL;
+    input_codename = "";
 #ifdef WIN32DLL
     reinitdll();
 #endif /*WIN32DLL*/
 }
-
-static int
-module_connection(void)
-{
-    if (input_encoding) set_input_encoding(input_encoding);
-    if (!output_encoding) {
-	output_encoding = nkf_default_encoding();
-    }
-    if (!output_encoding) {
-	if (noout_f || guess_f) output_encoding = nkf_enc_from_index(ISO_2022_JP);
-	else return -1;
-    }
-    set_output_encoding(output_encoding);
-    oconv = nkf_enc_to_oconv(output_encoding);
-    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 (eolmode_f || guess_f) {
-	o_eol_conv = oconv; oconv = eol_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){
-	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_encoding) {
-	set_iconv(-TRUE, nkf_enc_to_iconv(input_encoding));
-    } else {
-	set_iconv(FALSE, e_iconv);
-    }
-
-    {
-	struct input_code *p = input_code_list;
-	while (p->name){
-	    status_reinit(p++);
-	}
-    }
-    return 0;
-}
-
-/*
-   Conversion main loop. Code detection only.
- */
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static nkf_char
-noconvert(FILE *f)
+void no_connection(nkf_char c2, nkf_char c1)
 {
-    nkf_char    c;
-
-    if (nop_f == 2)
-	module_connection();
-    while ((c = (*i_getc)(f)) != EOF)
-	(*o_putc)(c);
-    (*o_putc)(EOF);
-    return 1;
+    no_connection2(c2,c1,0);
 }
-#endif
 
-#define NEXT continue        /* no output, get next */
-#define SKIP c2=0;continue        /* no output, get next */
-#define MORE c2=c1;continue  /* need one more byte */
-#define SEND ;               /* output c1 and c2, get next */
-#define LAST break           /* end of loop, go closing  */
-#define set_input_mode(mode) do { \
-    input_mode = mode; \
-    shift_mode = 0; \
-    set_input_codename("ISO-2022-JP"); \
-    debug("ISO-2022-JP"); \
-} while (0)
-
-static int
-kanji_convert(FILE *f)
+nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
 {
-    nkf_char c1=0, c2=0, c3=0, c4=0;
-    int shift_mode = 0; /* 0, 1, 2, 3 */
-    char g2 = 0;
-    int is_8bit = FALSE;
-
-    if (input_encoding && !nkf_enc_asciicompat(input_encoding)) {
-	is_8bit = TRUE;
-    }
-
-    input_mode = ASCII;
-    output_mode = ASCII;
-
-    if (module_connection() < 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-	fprintf(stderr, "no output encoding given\n");
-#endif
-	return -1;
-    }
-    check_bom(f);
-
-#ifdef UTF8_INPUT_ENABLE
-    if(iconv == w_iconv32){
-	while ((c1 = (*i_getc)(f)) != EOF &&
-	       (c2 = (*i_getc)(f)) != EOF &&
-	       (c3 = (*i_getc)(f)) != EOF &&
-	       (c4 = (*i_getc)(f)) != EOF) {
-	    nkf_iconv_utf_32(c1, c2, c3, c4);
-	}
-	(*i_ungetc)(EOF, f);
-    }
-    else if (iconv == w_iconv16) {
-	while ((c1 = (*i_getc)(f)) != EOF &&
-	       (c2 = (*i_getc)(f)) != EOF) {
-	    if (nkf_iconv_utf_16(c1, c2, 0, 0) == -2 &&
-		(c3 = (*i_getc)(f)) != EOF &&
-		(c4 = (*i_getc)(f)) != EOF) {
-		nkf_iconv_utf_16(c1, c2, c3, c4);
-	    }
-	}
-	(*i_ungetc)(EOF, f);
-    }
-#endif
-
-    while ((c1 = (*i_getc)(f)) != EOF) {
-#ifdef INPUT_CODE_FIX
-	if (!input_encoding)
-#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 {
-			SKIP;
-		    }
-		}
-		else {
-		    /* in case of already established */
-		    if (c1 < 0x40) {
-			/* ignore bogus code */
-			SKIP;
-		    } else {
-			SEND;
-		    }
-		}
-	    }
-	    else {
-		/* 2nd byte of 7 bit code or SJIS */
-		SEND;
-	    }
-	}
-	else {
-	    /* first byte */
-	    if (input_mode == JIS_X_0208 && DEL <= c1 && c1 < 0x92) {
-		/* CP5022x */
-		MORE;
-	    } else if (c1 > DEL) {
-		/* 8 bit code */
-		if (!estab_f && !iso8859_f) {
-		    /* not established yet */
-		    MORE;
-		} else { /* estab_f==TRUE */
-		    if (iso8859_f) {
-			c2 = ISO_8859_1;
-			c1 &= 0x7f;
-			SEND;
-		    }
-		    else if ((iconv == s_iconv && 0xA0 <= c1 && c1 <= 0xDF) ||
-			     (ms_ucs_map_f == UCS_MAP_CP10001 && (c1 == 0xFD || c1 == 0xFE))) {
-			/* JIS X 0201 */
-			c2 = JIS_X_0201_1976_K;
-			c1 &= 0x7f;
-			SEND;
-		    }
-		    else {
-			/* already established */
-			MORE;
-		    }
-		}
-	    } else if (SP < c1 && c1 < DEL) {
-		/* in case of Roman characters */
-		if (shift_mode) {
-		    /* output 1 shifted byte */
-		    if (iso8859_f) {
-			c2 = ISO_8859_1;
-			SEND;
-		    } else if (nkf_byte_jisx0201_katakana_p(c1)){
-			/* output 1 shifted byte */
-			c2 = JIS_X_0201_1976_K;
-			SEND;
-		    } else {
-			/* look like bogus code */
-			SKIP;
-		    }
-		} else if (input_mode == JIS_X_0208 || input_mode == JIS_X_0212 ||
-			   input_mode == JIS_X_0213_1 || input_mode == JIS_X_0213_2) {
-		    /* in case of Kanji shifted */
-		    MORE;
-		} 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;
-			    SKIP;
-			} else if (mime_begin(f) == EOF)
-			    LAST;
-			SKIP;
-		    } else {
-			(*oconv)(0, '=');
-			(*i_ungetc)(c1,f);
-			SKIP;
-		    }
-		} else {
-		    /* normal ASCII code */
-		    SEND;
-		}
-	    } else if (c1 == SI && (!is_8bit || mime_decode_mode)) {
-		shift_mode = 0;
-		SKIP;
-	    } else if (c1 == SO && (!is_8bit || mime_decode_mode)) {
-		shift_mode = 1;
-		SKIP;
-	    } else if (c1 == ESC && (!is_8bit || mime_decode_mode)) {
-		if ((c1 = (*i_getc)(f)) == EOF) {
-		    /*  (*oconv)(0, ESC); don't send bogus code */
-		    LAST;
-		}
-		else if (c1 == '&') {
-		    /* IRR */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    } else {
-			SKIP;
-		    }
-		}
-		else if (c1 == '$') {
-		    /* GZDMx */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			/* don't send bogus code
-			   (*oconv)(0, ESC);
-			   (*oconv)(0, '$'); */
-			LAST;
-		    } else if (c1 == '@' || c1 == 'B') {
-			/* JIS X 0208 */
-			set_input_mode(JIS_X_0208);
-			SKIP;
-		    } else if (c1 == '(') {
-			/* GZDM4 */
-			if ((c1 = (*i_getc)(f)) == EOF) {
-			    /* don't send bogus code
-			       (*oconv)(0, ESC);
-			       (*oconv)(0, '$');
-			       (*oconv)(0, '(');
-			     */
-			    LAST;
-			} else if (c1 == '@'|| c1 == 'B') {
-			    /* JIS X 0208 */
-			    set_input_mode(JIS_X_0208);
-			    SKIP;
-#ifdef X0212_ENABLE
-			} else if (c1 == 'D'){
-			    set_input_mode(JIS_X_0212);
-			    SKIP;
-#endif /* X0212_ENABLE */
-			} else if (c1 == 'O' || c1 == 'Q'){
-			    set_input_mode(JIS_X_0213_1);
-			    SKIP;
-			} else if (c1 == 'P'){
-			    set_input_mode(JIS_X_0213_2);
-			    SKIP;
-			} else {
-			    /* could be some special code */
-			    (*oconv)(0, ESC);
-			    (*oconv)(0, '$');
-			    (*oconv)(0, '(');
-			    (*oconv)(0, c1);
-			    SKIP;
-			}
-		    } else if (broken_f&0x2) {
-			/* accept any ESC-(-x as broken code ... */
-			input_mode = JIS_X_0208;
-			shift_mode = 0;
-			SKIP;
-		    } else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '$');
-			(*oconv)(0, c1);
-			SKIP;
-		    }
-		} else if (c1 == '(') {
-		    /* GZD4 */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			/* don't send bogus code
-			   (*oconv)(0, ESC);
-			   (*oconv)(0, '('); */
-			LAST;
-		    }
-		    else if (c1 == 'I') {
-			/* JIS X 0201 Katakana */
-			set_input_mode(JIS_X_0201_1976_K);
-			SKIP;
-		    }
-		    else if (c1 == 'B' || c1 == 'J' || c1 == 'H') {
-			/* ISO-646IRV:1983 or JIS X 0201 Roman or JUNET */
-			set_input_mode(ASCII);
-			SKIP;
-		    }
-		    else if (broken_f&0x2) {
-			set_input_mode(ASCII);
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '(');
-			SEND;
-		    }
-		}
-		else if (c1 == '.') {
-		    /* G2D6 */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    }
-		    else if (c1 == 'A') {
-			/* ISO-8859-1 */
-			g2 = ISO_8859_1;
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '.');
-			SEND;
-		    }
-		}
-		else if (c1 == 'N') {
-		    /* SS2 */
-		    c1 = (*i_getc)(f);
-		    if (g2 == ISO_8859_1) {
-			c2 = ISO_8859_1;
-			SEND;
-		    }else{
-			(*i_ungetc)(c1, f);
-			/* lonely ESC  */
-			(*oconv)(0, ESC);
-			SEND;
-		    }
-		}
-		else {
-		    /* lonely ESC  */
-		    (*oconv)(0, ESC);
-		    SEND;
-		}
-	    } else if (c1 == ESC && iconv == s_iconv) {
-		/* ESC in Shift_JIS */
-		if ((c1 = (*i_getc)(f)) == EOF) {
-		    /*  (*oconv)(0, ESC); don't send bogus code */
-		    LAST;
-		} else if (c1 == '$') {
-		    /* J-PHONE emoji */
-		    if ((c1 = (*i_getc)(f)) == EOF) {
-			LAST;
-		    } else if (('E' <= c1 && c1 <= 'G') ||
-			       ('O' <= c1 && c1 <= 'Q')) {
-			/*
-			   NUM : 0 1 2 3 4 5
-			   BYTE: G E F O P Q
-			   C%7 : 1 6 0 2 3 4
-			   C%7 : 0 1 2 3 4 5 6
-			   NUM : 2 0 3 4 5 X 1
-			 */
-			static const int jphone_emoji_first_table[7] =
-			{0xE1E0, 0xDFE0, 0xE2E0, 0xE3E0, 0xE4E0, 0xDFE0, 0xE0E0};
-			c3 = nkf_char_unicode_new(jphone_emoji_first_table[c1 % 7]);
-			if ((c1 = (*i_getc)(f)) == EOF) LAST;
-			while (SP <= c1 && c1 <= 'z') {
-			    (*oconv)(0, c1 + c3);
-			    if ((c1 = (*i_getc)(f)) == EOF) LAST;
-			}
-			SKIP;
-		    }
-		    else {
-			(*oconv)(0, ESC);
-			(*oconv)(0, '$');
-			SEND;
-		    }
-		}
-		else {
-		    /* lonely ESC  */
-		    (*oconv)(0, ESC);
-		    SEND;
-		}
-	    } else if (c1 == LF || c1 == CR) {
-		if (broken_f&4) {
-		    input_mode = ASCII; set_iconv(FALSE, 0);
-		    SEND;
-		} else if (mime_decode_f && !mime_decode_mode){
-		    if (c1 == LF) {
-			if ((c1=(*i_getc)(f))!=EOF && c1 == SP) {
-			    i_ungetc(SP,f);
-			    continue;
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = LF;
-			SEND;
-		    } else  { /* if (c1 == CR)*/
-			if ((c1=(*i_getc)(f))!=EOF) {
-			    if (c1==SP) {
-				i_ungetc(SP,f);
-				continue;
-			    } else if (c1 == LF && (c1=(*i_getc)(f))!=EOF && c1 == SP) {
-				i_ungetc(SP,f);
-				continue;
-			    } else {
-				i_ungetc(c1,f);
-			    }
-			    i_ungetc(LF,f);
-			} else {
-			    i_ungetc(c1,f);
-			}
-			c1 = CR;
-			SEND;
-		    }
-		}
-	    } else
-		SEND;
-	}
-	/* send: */
-	switch(input_mode){
-	case ASCII:
-	    switch ((*iconv)(c2, c1, 0)) {  /* can be EUC / SJIS / UTF-8 */
-	    case -2:
-		/* 4 bytes UTF-8 */
-		if ((c3 = (*i_getc)(f)) != EOF) {
-		    code_status(c3);
-		    c3 <<= 8;
-		    if ((c4 = (*i_getc)(f)) != EOF) {
-			code_status(c4);
-			(*iconv)(c2, c1, c3|c4);
-		    }
-		}
-		break;
-	    case -1:
-		/* 3 bytes EUC or UTF-8 */
-		if ((c3 = (*i_getc)(f)) != EOF) {
-		    code_status(c3);
-		    (*iconv)(c2, c1, c3);
-		}
-		break;
-	    }
-	    break;
-	case JIS_X_0208:
-	case JIS_X_0213_1:
-	    if (ms_ucs_map_f &&
-		0x7F <= c2 && c2 <= 0x92 &&
-		0x21 <= c1 && c1 <= 0x7E) {
-		/* CP932 UDC */
-		c1 = nkf_char_unicode_new((c2 - 0x7F) * 94 + c1 - 0x21 + 0xE000);
-		c2 = 0;
-	    }
-	    (*oconv)(c2, c1); /* this is JIS, not SJIS/EUC case */
-	    break;
-#ifdef X0212_ENABLE
-	case JIS_X_0212:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-#endif /* X0212_ENABLE */
-	case JIS_X_0213_2:
-	    (*oconv)(PREFIX_EUCG3 | c2, c1);
-	    break;
-	default:
-	    (*oconv)(input_mode, c1);  /* other special case */
-	}
-
-	c2 = 0;
-	c3 = 0;
-	continue;
-	/* goto next_word */
-    }
-
-    /* epilogue */
-    (*iconv)(EOF, 0, 0);
-    if (!input_codename)
-    {
-	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);
-#ifdef CHECK_OPTION
-	    debug(result->name);
-#endif
-	}
-    }
-    return 0;
+    fprintf(stderr,"nkf internal module connection failure.\n");
+    exit(1);
+    return 0; /* LINT */
 }
 
-/*
- * int options(unsigned char *cp)
- * 
- * return values:
- *    0: success
- *   -1: ArgumentError
- */
-static int
-options(unsigned char *cp)
-{
-    nkf_char i, j;
-    unsigned char *p;
-    unsigned char *cp_back = NULL;
-    nkf_encoding *enc;
-
-    if (option_mode==1)
-	return 0;
-    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 == SP) {        /* ignore the rest of arguments */
-		option_mode = 1;
-		return 0;
-	    }
-	    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] == SP){
-		    p = &cp[j] + 1;
-		    break;
-		}
-		p = 0;
-	    }
-	    if (p == 0) {
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-		fprintf(stderr, "unknown long option: --%s\n", cp);
-#endif
-		return -1;
-	    }
-	    while(*cp && *cp != SP && 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){
-		    enc = nkf_enc_find((char *)p);
-		    if (!enc) continue;
-		    input_encoding = enc;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "oc=") == 0){
-		    enc = nkf_enc_find((char *)p);
-		    if (enc <= 0) continue;
-		    output_encoding = enc;
-		    continue;
-		}
-		if (strcmp(long_option[i].name, "guess=") == 0){
-		    if (p[0] == '0' || p[0] == '1') {
-			guess_f = 1;
-		    } else {
-			guess_f = 2;
-		    }
-		    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 0;
-		}
-		if (strcmp(long_option[i].name, "exec-out") == 0){
-		    exec_f = -1;
-		    return 0;
-		}
-#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;
-		}
+#ifndef PERL_XS
+#ifdef WIN32DLL
+#define fprintf dllprintf
 #endif
-#ifdef UNICODE_NORMALIZATION
-		if (strcmp(long_option[i].name, "utf8mac-input") == 0){
-		    nfc_f = TRUE;
-		    continue;
-		}
+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  Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
 #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;
-		}
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-		fprintf(stderr, "unsupported long option: --%s\n", long_option[i].name);
+#ifdef DEFAULT_CODE_JIS
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
 #endif
-		return -1;
-	    }
-	    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 */
-		cp++;
-		nop_f = TRUE;
-	    } else if (*cp=='2') {
-		/*
-		 * -t with put/get
-		 *
-		 * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
-		 *
-		 */
-		cp++;
-		nop_f = 2;
-	    } else
-		nop_f = TRUE;
-	    continue;
-	case 'j':           /* JIS output */
-	case 'n':
-	    output_encoding = nkf_enc_from_index(ISO_2022_JP);
-	    continue;
-	case 'e':           /* AT&T EUC output */
-	    output_encoding = nkf_enc_from_index(EUCJP_NKF);
-	    continue;
-	case 's':           /* SJIS output */
-	    output_encoding = nkf_enc_from_index(WINDOWS_31J);
-	    continue;
-	case 'l':           /* ISO8859 Latin-1 support, no conversion */
-	    iso8859_f = TRUE;  /* Only compatible with ISO-2022-JP */
-	    input_encoding = nkf_enc_from_index(ISO_8859_1);
-	    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;
+#ifdef DEFAULT_CODE_EUC
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
 #endif
-#ifndef PERL_XS
-	case 'V':
-	    show_configuration();
-	    exit(1);
-	    break;
-	case 'v':
-	    usage();
-	    exit(1);
-	    break;
+#ifdef DEFAULT_CODE_UTF8
+    fprintf(stderr,"j,s,e,w  Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
 #endif
 #ifdef UTF8_OUTPUT_ENABLE
-	case 'w':           /* UTF-8 output */
-	    if (cp[0] == '8') {
-		cp++;
-		if (cp[0] == '0'){
-		    cp++;
-		    output_encoding = nkf_enc_from_index(UTF_8N);
-		} else {
-		    output_bom_f = TRUE;
-		    output_encoding = nkf_enc_from_index(UTF_8_BOM);
-		}
-	    } else {
-		int enc_idx;
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    cp += 2;
-		    enc_idx = UTF_16;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    cp += 2;
-		    enc_idx = UTF_32;
-		} else {
-		    output_encoding = nkf_enc_from_index(UTF_8);
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    output_endian = ENDIAN_LITTLE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		} else {
-		    output_encoding = nkf_enc_from_index(enc_idx);
-		    continue;
-		}
-		if (cp[0] == '0'){
-		    cp++;
-		    enc_idx = enc_idx == UTF_16
-			? (output_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
-			: (output_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
-		} else {
-		    output_bom_f = TRUE;
-		    enc_idx = enc_idx == UTF_16
-			? (output_endian == ENDIAN_LITTLE ? UTF_16LE_BOM : UTF_16BE_BOM)
-			: (output_endian == ENDIAN_LITTLE ? UTF_32LE_BOM : UTF_32BE_BOM);
-		}
-		output_encoding = nkf_enc_from_index(enc_idx);
-	    }
-	    continue;
+    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
-	case 'W':           /* UTF input */
-	    if (cp[0] == '8') {
-		cp++;
-		input_encoding = nkf_enc_from_index(UTF_8);
-	    }else{
-		int enc_idx;
-		if ('1'== cp[0] && '6'==cp[1]) {
-		    cp += 2;
-		    input_endian = ENDIAN_BIG;
-		    enc_idx = UTF_16;
-		} else if ('3'== cp[0] && '2'==cp[1]) {
-		    cp += 2;
-		    input_endian = ENDIAN_BIG;
-		    enc_idx = UTF_32;
-		} else {
-		    input_encoding = nkf_enc_from_index(UTF_8);
-		    continue;
-		}
-		if (cp[0]=='L') {
-		    cp++;
-		    input_endian = ENDIAN_LITTLE;
-		} else if (cp[0] == 'B') {
-		    cp++;
-		    input_endian = ENDIAN_BIG;
-		}
-		enc_idx = enc_idx == UTF_16
-		    ? (input_endian == ENDIAN_LITTLE ? UTF_16LE : UTF_16BE)
-		    : (input_endian == ENDIAN_LITTLE ? UTF_32LE : UTF_32BE);
-		input_encoding = nkf_enc_from_index(enc_idx);
-	    }
-	    continue;
-#endif
-	    /* Input code assumption */
-	case 'J':   /* ISO-2022-JP input */
-	    input_encoding = nkf_enc_from_index(ISO_2022_JP);
-	    continue;
-	case 'E':   /* EUC-JP input */
-	    input_encoding = nkf_enc_from_index(EUCJP_NKF);
-	    continue;
-	case 'S':   /* Windows-31J input */
-	    input_encoding = nkf_enc_from_index(WINDOWS_31J);
-	    continue;
-	case 'Z':   /* Convert X0208 alphabet to asii */
-	    /* alpha_f
-	       bit:0   Convert JIS X 0208 Alphabet to ASCII
-	       bit:1   Convert Kankaku to one space
-	       bit:2   Convert Kankaku to two spaces
-	       bit:3   Convert HTML Entity
-	       bit:4   Convert JIS X 0208 Katakana to JIS X 0201 Katakana
-	     */
-	    while ('0'<= *cp && *cp <='9') {
-		alpha_f |= 1 << (*cp++ - '0');
-	    }
-	    if (!alpha_f) alpha_f = 1;
-	    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
-	       SS2         in EUC, JIS, not in MS Kanji
-	       MS Kanji (0xa0-0xdf)
-	       output  X0201
-	       ESC-(-I     in JIS (0x20-0x5f)
-	       SS2         in EUC (0xa0-0xdf)
-	       0xa0-0xd    in MS Kanji (0xa0-0xdf)
-	     */
-	    continue;
-	case 'X':   /* Convert X0201 kana to X0208 */
-	    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++;
-	    } else {
-		mime_f = STRICT_MIME;
-	    }
-	    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;
+    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
-	case 'c':/* add cr code */
-	    eolmode_f = CRLF;
-	    continue;
-	case 'd':/* delete cr code */
-	    eolmode_f = LF;
-	    continue;
-	case 'I':   /* ISO-2022-JP output */
-	    iso2022jp_f = TRUE;
-	    continue;
-	case 'L':  /* line mode */
-	    if (*cp=='u') {         /* unix */
-		eolmode_f = LF; cp++;
-	    } else if (*cp=='m') { /* mac */
-		eolmode_f = CR; cp++;
-	    } else if (*cp=='w') { /* windows */
-		eolmode_f = CRLF; cp++;
-	    } else if (*cp=='0') { /* no conversion  */
-		eolmode_f = 0; cp++;
-	    }
-	    continue;
-#ifndef PERL_XS
-	case 'g':
-	    if ('2' <= *cp && *cp <= '9') {
-		guess_f = 2;
-		cp++;
-	    } else if (*cp == '0' || *cp == '1') {
-		guess_f = 1;
-		cp++;
-	    } else {
-		guess_f = 1;
-	    }
-	    continue;
+#ifdef NUMCHAR_OPTION
+    fprintf(stderr," --numchar-input   Convert Unicode Character Reference\n");
 #endif
-	case SP:
-	    /* module muliple options in a string are allowed for Perl moudle  */
-	    while(*cp && *cp++!='-');
-	    continue;
-	default:
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-	    fprintf(stderr, "unknown option: -%c\n", *(cp-1));
+#ifdef UTF8_INPUT_ENABLE
+    fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
+    fprintf(stderr,"                   Specify how nkf handles unassigned characters\n");
 #endif
-	    /* bogus option but ignored */
-	    return -1;
-	}
-    }
-    return 0;
+#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();
 }
 
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int
-main(int argc, char **argv)
+void version(void)
 {
-    FILE  *fin;
-    unsigned char  *cp;
-
-    char *outfname = NULL;
-    char *origfname;
-
-#ifdef EASYWIN /*Easy Win */
-    _BufferSize.y = 400;/*Set Scroll Buffer Size*/
-#endif
-#ifdef DEFAULT_CODE_LOCALE
-    setlocale(LC_CTYPE, "");
-#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 (guess_f) {
-#ifdef CHECK_OPTION
-	int debug_f_back = debug_f;
-#endif
-#ifdef EXEC_IO
-	int exec_f_back = exec_f;
-#endif
-#ifdef X0212_ENABLE
-	int x0212_f_back = x0212_f;
-#endif
-	int x0213_f_back = x0213_f;
-	int guess_f_back = guess_f;
-	reinit();
-	guess_f = guess_f_back;
-	mime_f = FALSE;
-#ifdef CHECK_OPTION
-	debug_f = debug_f_back;
-#endif
-#ifdef EXEC_IO
-	exec_f = exec_f_back;
-#endif
-	x0212_f = x0212_f_back;
-	x0213_f = x0213_f_back;
-    }
-
-    if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
-	if (freopen("","wb",stdout) == NULL)
-	    return (-1);
-#else
-    setbinmode(stdout);
+    fprintf(stderr,"Network Kanji Filter Version %s (%s) "
+#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
+                  "for DOS"
 #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);
+#if defined(MSDOS) && defined(__WIN16__)
+                  "for Win16"
 #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;
-	int is_argument_error = FALSE;
-	while (argc--) {
-	    input_codename = NULL;
-	    input_eol = 0;
-#ifdef CHECK_OPTION
-	    iconv_for_check = 0;
+#if defined(MSDOS) && defined(__WIN32__)
+                  "for Win32"
 #endif
-	    if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
-		perror(*(argv-1));
-		is_argument_error = TRUE;
-		continue;
-	    } 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;
+#ifdef __OS2__
+                  "for OS/2"
 #endif
+                  ,NKF_VERSION,NKF_RELEASE_DATE);
+    fprintf(stderr,"\n%s\n",CopyRight);
+}
+#endif /*PERL_XS*/
 
-		    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%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%?%$%`%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);
-			}
-			free(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
-	    }
-	}
-	if (is_argument_error)
-	    return(-1);
-    }
-#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 */
+/* end */
diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h
deleted file mode 100644
index 1dbae54f20..0000000000
--- a/ext/nkf/nkf-utf8/nkf.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 
- * nkf.h - Header file for nkf
- * 
- * $Id$
- */
-
-#ifndef NKF_H
-
-/* Wrapper of configurations */
-
-#ifndef MIME_DECODE_DEFAULT
-#define MIME_DECODE_DEFAULT STRICT_MIME
-#endif
-#ifndef X0201_DEFAULT
-#define X0201_DEFAULT TRUE
-#endif
-
-#if DEFAULT_NEWLINE == 0x0D0A
-#define PUT_NEWLINE(func) do {\
-    func(0x0D);\
-    func(0x0A);\
-} while (0)
-#define OCONV_NEWLINE(func) do {\
-    func(0, 0x0D);\
-    func(0, 0x0A);\
-} while (0)
-#elif DEFAULT_NEWLINE == 0x0D
-#define PUT_NEWLINE(func) func(0x0D)
-#define OCONV_NEWLINE(func) func(0, 0x0D)
-#else
-#define DEFAULT_NEWLINE 0x0A
-#define PUT_NEWLINE(func) func(0x0A)
-#define OCONV_NEWLINE(func) func(0, 0x0A)
-#endif
-#ifdef HELP_OUTPUT_STDERR
-#define HELP_OUTPUT stderr
-#else
-#define HELP_OUTPUT stdout
-#endif
-
-
-/* Compatibility definitions */
-
-#ifdef nkf_char
-#elif defined(INT_IS_SHORT)
-typedef long nkf_char;
-#define NKF_INT32_C(n)   (n##L)
-#else
-typedef int nkf_char;
-#define NKF_INT32_C(n)   (n)
-#endif
-
-#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>
-void  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);
-}
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp)
-#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
-
-#ifdef DEFAULT_CODE_LOCALE
-
-#ifndef __WIN32__ /* not win32 is posix */
-#ifndef HAVE_LANGINFO_H
-#define HAVE_LANGINFO_H
-#endif
-#ifndef HAVE_LOCALE_H
-#define HAVE_LOCALE_H
-#endif
-#endif
-
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#endif /* DEFAULT_CODE_LOCALE */
-
-#define         FALSE   0
-#define         TRUE    1
-
-#ifdef WIN32DLL
-#include "nkf32.h"
-#endif
-
-#endif /* NKF_H */
-
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index fbcd86b442..e43ad553d6 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -1,14 +1,7 @@
-/*
- * utf8tbl.c - Convertion Table for nkf
- *
- * $Id$
- */
-
 #include "config.h"
-#include "utf8tbl.h"
 
 #ifdef UTF8_OUTPUT_ENABLE
-static const unsigned short euc_to_utf8_A1[] = {
+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,
@@ -24,7 +17,7 @@ static const unsigned short euc_to_utf8_A1[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A1_ms[] = {
+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,
@@ -38,7 +31,7 @@ static const unsigned short euc_to_utf8_A1_ms[] = {
  0xFF04, 0xFFE0, 0xFFE1, 0xFF05, 0xFF03, 0xFF06, 0xFF0A, 0xFF20,
  0x00A7, 0x2606, 0x2605, 0x25CB, 0x25CF, 0x25CE, 0x25C7,
 };
-static const unsigned short euc_to_utf8_A2[] = {
+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,
@@ -54,7 +47,7 @@ static const unsigned short euc_to_utf8_A2[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_A2_ms[] = {
+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,
@@ -68,7 +61,7 @@ static const unsigned short euc_to_utf8_A2_ms[] = {
       0,      0, 0x212B, 0x2030, 0x266F, 0x266D, 0x266A, 0x2020,
  0x2021, 0x00B6,      0,      0,      0,      0, 0x25EF,
 };
-static const unsigned short euc_to_utf8_A3[] = {
+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,
@@ -82,7 +75,7 @@ static const unsigned short euc_to_utf8_A3[] = {
  0xFF50, 0xFF51, 0xFF52, 0xFF53, 0xFF54, 0xFF55, 0xFF56, 0xFF57,
  0xFF58, 0xFF59, 0xFF5A,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A4[] = {
+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,
@@ -96,7 +89,7 @@ static const unsigned short euc_to_utf8_A4[] = {
  0x3090, 0x3091, 0x3092, 0x3093,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A5[] = {
+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,
@@ -110,7 +103,7 @@ static const unsigned short euc_to_utf8_A5[] = {
  0x30F0, 0x30F1, 0x30F2, 0x30F3, 0x30F4, 0x30F5, 0x30F6,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A6[] = {
+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,
@@ -124,7 +117,7 @@ static const unsigned short euc_to_utf8_A6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A7[] = {
+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,
@@ -138,7 +131,7 @@ static const unsigned short euc_to_utf8_A7[] = {
  0x044E, 0x044F,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A8[] = {
+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,
@@ -152,7 +145,7 @@ static const unsigned short euc_to_utf8_A8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_A9[] = {
+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,
@@ -166,7 +159,7 @@ static const unsigned short euc_to_utf8_A9[] = {
       0,      0, 0x2488, 0x2489, 0x248A, 0x248B, 0x248C, 0x248D,
  0x248E, 0x248F, 0x2490,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_AA[] = {
+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,
@@ -180,7 +173,7 @@ static const unsigned short euc_to_utf8_AA[] = {
  0x24AF, 0x24B0, 0x24B1, 0x24B2, 0x24B3, 0x24B4, 0x24B5,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_AB[] = {
+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,
@@ -194,7 +187,7 @@ static const unsigned short euc_to_utf8_AB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2116, 0x33CD, 0x2121,      0,
 };
-static const unsigned short euc_to_utf8_AC[] = {
+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,
@@ -208,21 +201,7 @@ static const unsigned short euc_to_utf8_AC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_AC_mac[] = {
-         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, 0x2192, 0x2190, 0x2191,
- 0x2193,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short euc_to_utf8_AD[] = {
+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,
@@ -236,21 +215,7 @@ static const unsigned short euc_to_utf8_AD[] = {
  0x2252, 0x2261, 0x222B, 0x222E, 0x2211, 0x221A, 0x22A5, 0x2220,
  0x221F, 0x22BF, 0x2235, 0x2229, 0x222A,      0, 0x3299,
 };
-static const unsigned short euc_to_utf8_AD_mac[] = {
-         0x65E5, 0x6708, 0x706B, 0x6C34, 0x6728, 0x91D1, 0x571F,
- 0x796D, 0x795D, 0x81EA, 0x81F3, 0x3239, 0x547C, 0x3231, 0x8CC7,
- 0x540D, 0x3232, 0x5B66, 0x8CA1, 0x793E, 0x7279, 0x76E3, 0x4F01,
- 0x5354, 0x52B4, 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, 0x5927, 0x5C0F, 0x32A4, 0x32A5, 0x32A6, 0x32A7, 0x32A8,
- 0x533B, 0x8CA1, 0x512A, 0x52B4, 0x5370, 0x63A7, 0x79D8,
-};
-static const unsigned short euc_to_utf8_AE[] = {
+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,
@@ -264,7 +229,7 @@ static const unsigned short euc_to_utf8_AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0x337F,      0,      0,
 };
-static const unsigned short euc_to_utf8_AF[] = {
+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,
@@ -278,7 +243,7 @@ static const unsigned short euc_to_utf8_AF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_B0[] = {
+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,
@@ -292,7 +257,7 @@ static const unsigned short euc_to_utf8_B0[] = {
  0x7A32, 0x8328, 0x828B, 0x9C2F, 0x5141, 0x5370, 0x54BD, 0x54E1,
  0x56E0, 0x59FB, 0x5F15, 0x98F2, 0x6DEB, 0x80E4, 0x852D,
 };
-static const unsigned short euc_to_utf8_B1[] = {
+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,
@@ -306,7 +271,7 @@ static const unsigned short euc_to_utf8_B1[] = {
  0x8276, 0x82D1, 0x8597, 0x9060, 0x925B, 0x9D1B, 0x5869, 0x65BC,
  0x6C5A, 0x7525, 0x51F9, 0x592E, 0x5965, 0x5F80, 0x5FDC,
 };
-static const unsigned short euc_to_utf8_B2[] = {
+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,
@@ -320,7 +285,7 @@ static const unsigned short euc_to_utf8_B2[] = {
  0x4ECB, 0x4F1A, 0x89E3, 0x56DE, 0x584A, 0x58CA, 0x5EFB, 0x5FEB,
  0x602A, 0x6094, 0x6062, 0x61D0, 0x6212, 0x62D0, 0x6539,
 };
-static const unsigned short euc_to_utf8_B3[] = {
+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,
@@ -334,7 +299,7 @@ static const unsigned short euc_to_utf8_B3[] = {
  0x53F6, 0x691B, 0x6A3A, 0x9784, 0x682A, 0x515C, 0x7AC3, 0x84B2,
  0x91DC, 0x938C, 0x565B, 0x9D28, 0x6822, 0x8305, 0x8431,
 };
-static const unsigned short euc_to_utf8_B4[] = {
+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,
@@ -348,7 +313,7 @@ static const unsigned short euc_to_utf8_B4[] = {
  0x57FA, 0x5947, 0x5B09, 0x5BC4, 0x5C90, 0x5E0C, 0x5E7E, 0x5FCC,
  0x63EE, 0x673A, 0x65D7, 0x65E2, 0x671F, 0x68CB, 0x68C4,
 };
-static const unsigned short euc_to_utf8_B5[] = {
+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,
@@ -362,7 +327,7 @@ static const unsigned short euc_to_utf8_B5[] = {
  0x5DE8, 0x62D2, 0x62E0, 0x6319, 0x6E20, 0x865A, 0x8A31, 0x8DDD,
  0x92F8, 0x6F01, 0x79A6, 0x9B5A, 0x4EA8, 0x4EAB, 0x4EAC,
 };
-static const unsigned short euc_to_utf8_B6[] = {
+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,
@@ -376,7 +341,7 @@ static const unsigned short euc_to_utf8_B6[] = {
  0x99D2, 0x5177, 0x611A, 0x865E, 0x55B0, 0x7A7A, 0x5076, 0x5BD3,
  0x9047, 0x9685, 0x4E32, 0x6ADB, 0x91E7, 0x5C51, 0x5C48,
 };
-static const unsigned short euc_to_utf8_B7[] = {
+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,
@@ -390,7 +355,7 @@ static const unsigned short euc_to_utf8_B7[] = {
  0x5039, 0x5026, 0x5065, 0x517C, 0x5238, 0x5263, 0x55A7, 0x570F,
  0x5805, 0x5ACC, 0x5EFA, 0x61B2, 0x61F8, 0x62F3, 0x6372,
 };
-static const unsigned short euc_to_utf8_B8[] = {
+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,
@@ -404,7 +369,7 @@ static const unsigned short euc_to_utf8_B8[] = {
  0x4E5E, 0x9BC9, 0x4EA4, 0x4F7C, 0x4FAF, 0x5019, 0x5016, 0x5149,
  0x516C, 0x529F, 0x52B9, 0x52FE, 0x539A, 0x53E3, 0x5411,
 };
-static const unsigned short euc_to_utf8_B9[] = {
+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,
@@ -418,7 +383,7 @@ static const unsigned short euc_to_utf8_B9[] = {
  0x544A, 0x56FD, 0x7A40, 0x9177, 0x9D60, 0x9ED2, 0x7344, 0x6F09,
  0x8170, 0x7511, 0x5FFD, 0x60DA, 0x9AA8, 0x72DB, 0x8FBC,
 };
-static const unsigned short euc_to_utf8_BA[] = {
+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,
@@ -432,7 +397,7 @@ static const unsigned short euc_to_utf8_BA[] = {
  0x548B, 0x643E, 0x6628, 0x6714, 0x67F5, 0x7A84, 0x7B56, 0x7D22,
  0x932F, 0x685C, 0x9BAD, 0x7B39, 0x5319, 0x518A, 0x5237,
 };
-static const unsigned short euc_to_utf8_BB[] = {
+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,
@@ -446,7 +411,7 @@ static const unsigned short euc_to_utf8_BB[] = {
  0x8AEE, 0x8CC7, 0x8CDC, 0x96CC, 0x98FC, 0x6B6F, 0x4E8B, 0x4F3C,
  0x4F8D, 0x5150, 0x5B57, 0x5BFA, 0x6148, 0x6301, 0x6642,
 };
-static const unsigned short euc_to_utf8_BC[] = {
+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,
@@ -460,7 +425,7 @@ static const unsigned short euc_to_utf8_BC[] = {
  0x816B, 0x8DA3, 0x9152, 0x9996, 0x5112, 0x53D7, 0x546A, 0x5BFF,
  0x6388, 0x6A39, 0x7DAC, 0x9700, 0x56DA, 0x53CE, 0x5468,
 };
-static const unsigned short euc_to_utf8_BD[] = {
+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,
@@ -474,7 +439,7 @@ static const unsigned short euc_to_utf8_BD[] = {
  0x7F72, 0x66F8, 0x85AF, 0x85F7, 0x8AF8, 0x52A9, 0x53D9, 0x5973,
  0x5E8F, 0x5F90, 0x6055, 0x92E4, 0x9664, 0x50B7, 0x511F,
 };
-static const unsigned short euc_to_utf8_BE[] = {
+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,
@@ -488,7 +453,7 @@ static const unsigned short euc_to_utf8_BE[] = {
  0x60C5, 0x64FE, 0x6761, 0x6756, 0x6D44, 0x72B6, 0x7573, 0x7A63,
  0x84B8, 0x8B72, 0x91B8, 0x9320, 0x5631, 0x57F4, 0x98FE,
 };
-static const unsigned short euc_to_utf8_BF[] = {
+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,
@@ -502,7 +467,7 @@ static const unsigned short euc_to_utf8_BF[] = {
  0x745E, 0x9AC4, 0x5D07, 0x5D69, 0x6570, 0x67A2, 0x8DA8, 0x96DB,
  0x636E, 0x6749, 0x6919, 0x83C5, 0x9817, 0x96C0, 0x88FE,
 };
-static const unsigned short euc_to_utf8_C0[] = {
+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,
@@ -516,7 +481,7 @@ static const unsigned short euc_to_utf8_C0[] = {
  0x6247, 0x64B0, 0x6813, 0x6834, 0x6CC9, 0x6D45, 0x6D17, 0x67D3,
  0x6F5C, 0x714E, 0x717D, 0x65CB, 0x7A7F, 0x7BAD, 0x7DDA,
 };
-static const unsigned short euc_to_utf8_C1[] = {
+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,
@@ -530,7 +495,7 @@ static const unsigned short euc_to_utf8_C1[] = {
  0x8349, 0x8358, 0x846C, 0x84BC, 0x85FB, 0x88C5, 0x8D70, 0x9001,
  0x906D, 0x9397, 0x971C, 0x9A12, 0x50CF, 0x5897, 0x618E,
 };
-static const unsigned short euc_to_utf8_C2[] = {
+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,
@@ -544,7 +509,7 @@ static const unsigned short euc_to_utf8_C2[] = {
  0x5B85, 0x6258, 0x629E, 0x62D3, 0x6CA2, 0x6FEF, 0x7422, 0x8A17,
  0x9438, 0x6FC1, 0x8AFE, 0x8338, 0x51E7, 0x86F8, 0x53EA,
 };
-static const unsigned short euc_to_utf8_C3[] = {
+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,
@@ -558,7 +523,7 @@ static const unsigned short euc_to_utf8_C3[] = {
  0x8A3B, 0x914E, 0x92F3, 0x99D0, 0x6A17, 0x7026, 0x732A, 0x82E7,
  0x8457, 0x8CAF, 0x4E01, 0x5146, 0x51CB, 0x558B, 0x5BF5,
 };
-static const unsigned short euc_to_utf8_C4[] = {
+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,
@@ -572,7 +537,7 @@ static const unsigned short euc_to_utf8_C4[] = {
  0x608C, 0x62B5, 0x633A, 0x63D0, 0x68AF, 0x6C40, 0x7887, 0x798E,
  0x7A0B, 0x7DE0, 0x8247, 0x8A02, 0x8AE6, 0x8E44, 0x9013,
 };
-static const unsigned short euc_to_utf8_C5[] = {
+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,
@@ -586,7 +551,7 @@ static const unsigned short euc_to_utf8_C5[] = {
  0x76D7, 0x6DD8, 0x6E6F, 0x6D9B, 0x706F, 0x71C8, 0x5F53, 0x75D8,
  0x7977, 0x7B49, 0x7B54, 0x7B52, 0x7CD6, 0x7D71, 0x5230,
 };
-static const unsigned short euc_to_utf8_C6[] = {
+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,
@@ -600,7 +565,7 @@ static const unsigned short euc_to_utf8_C6[] = {
  0x8EDF, 0x96E3, 0x6C5D, 0x4E8C, 0x5C3C, 0x5F10, 0x8FE9, 0x5302,
  0x8CD1, 0x8089, 0x8679, 0x5EFF, 0x65E5, 0x4E73, 0x5165,
 };
-static const unsigned short euc_to_utf8_C7[] = {
+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,
@@ -614,7 +579,7 @@ static const unsigned short euc_to_utf8_C7[] = {
  0x67CF, 0x6CCA, 0x767D, 0x7B94, 0x7C95, 0x8236, 0x8584, 0x8FEB,
  0x66DD, 0x6F20, 0x7206, 0x7E1B, 0x83AB, 0x99C1, 0x9EA6,
 };
-static const unsigned short euc_to_utf8_C8[] = {
+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,
@@ -628,7 +593,7 @@ static const unsigned short euc_to_utf8_C8[] = {
  0x8AB9, 0x8CBB, 0x907F, 0x975E, 0x98DB, 0x6A0B, 0x7C38, 0x5099,
  0x5C3E, 0x5FAE, 0x6787, 0x6BD8, 0x7435, 0x7709, 0x7F8E,
 };
-static const unsigned short euc_to_utf8_C9[] = {
+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,
@@ -642,7 +607,7 @@ static const unsigned short euc_to_utf8_C9[] = {
  0x6B66, 0x821E, 0x8461, 0x856A, 0x90E8, 0x5C01, 0x6953, 0x98A8,
  0x847A, 0x8557, 0x4F0F, 0x526F, 0x5FA9, 0x5E45, 0x670D,
 };
-static const unsigned short euc_to_utf8_CA[] = {
+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,
@@ -656,7 +621,7 @@ static const unsigned short euc_to_utf8_CA[] = {
  0x4FF8, 0x5305, 0x5446, 0x5831, 0x5949, 0x5B9D, 0x5CF0, 0x5CEF,
  0x5D29, 0x5E96, 0x62B1, 0x6367, 0x653E, 0x65B9, 0x670B,
 };
-static const unsigned short euc_to_utf8_CB[] = {
+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,
@@ -670,7 +635,7 @@ static const unsigned short euc_to_utf8_CB[] = {
  0x9C52, 0x685D, 0x4EA6, 0x4FE3, 0x53C8, 0x62B9, 0x672B, 0x6CAB,
  0x8FC4, 0x4FAD, 0x7E6D, 0x9EBF, 0x4E07, 0x6162, 0x6E80,
 };
-static const unsigned short euc_to_utf8_CC[] = {
+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,
@@ -684,7 +649,7 @@ static const unsigned short euc_to_utf8_CC[] = {
  0x77E2, 0x5384, 0x5F79, 0x7D04, 0x85AC, 0x8A33, 0x8E8D, 0x9756,
  0x67F3, 0x85AE, 0x9453, 0x6109, 0x6108, 0x6CB9, 0x7652,
 };
-static const unsigned short euc_to_utf8_CD[] = {
+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,
@@ -698,7 +663,7 @@ static const unsigned short euc_to_utf8_CD[] = {
  0x4E71, 0x5375, 0x5D50, 0x6B04, 0x6FEB, 0x85CD, 0x862D, 0x89A7,
  0x5229, 0x540F, 0x5C65, 0x674E, 0x68A8, 0x7406, 0x7483,
 };
-static const unsigned short euc_to_utf8_CE[] = {
+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,
@@ -712,7 +677,7 @@ static const unsigned short euc_to_utf8_CE[] = {
  0x9F62, 0x66A6, 0x6B74, 0x5217, 0x52A3, 0x70C8, 0x88C2, 0x5EC9,
  0x604B, 0x6190, 0x6F23, 0x7149, 0x7C3E, 0x7DF4, 0x806F,
 };
-static const unsigned short euc_to_utf8_CF[] = {
+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,
@@ -726,7 +691,7 @@ static const unsigned short euc_to_utf8_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_D0[] = {
+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,
@@ -740,7 +705,7 @@ static const unsigned short euc_to_utf8_D0[] = {
  0x5043, 0x5047, 0x6703, 0x5055, 0x5050, 0x5048, 0x505A, 0x5056,
  0x506C, 0x5078, 0x5080, 0x509A, 0x5085, 0x50B4, 0x50B2,
 };
-static const unsigned short euc_to_utf8_D1[] = {
+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,
@@ -754,7 +719,7 @@ static const unsigned short euc_to_utf8_D1[] = {
  0x525E, 0x5254, 0x526A, 0x5274, 0x5269, 0x5273, 0x527F, 0x527D,
  0x528D, 0x5294, 0x5292, 0x5271, 0x5288, 0x5291, 0x8FA8,
 };
-static const unsigned short euc_to_utf8_D2[] = {
+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,
@@ -768,7 +733,7 @@ static const unsigned short euc_to_utf8_D2[] = {
  0x5492, 0x547B, 0x5480, 0x5476, 0x5484, 0x5490, 0x5486, 0x54C7,
  0x54A2, 0x54B8, 0x54A5, 0x54AC, 0x54C4, 0x54C8, 0x54A8,
 };
-static const unsigned short euc_to_utf8_D3[] = {
+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,
@@ -782,7 +747,7 @@ static const unsigned short euc_to_utf8_D3[] = {
  0x56BC, 0x56C1, 0x56C3, 0x56C0, 0x56C8, 0x56CE, 0x56D1, 0x56D3,
  0x56D7, 0x56EE, 0x56F9, 0x5700, 0x56FF, 0x5704, 0x5709,
 };
-static const unsigned short euc_to_utf8_D4[] = {
+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,
@@ -796,7 +761,7 @@ static const unsigned short euc_to_utf8_D4[] = {
  0x592D, 0x5932, 0x5938, 0x593E, 0x7AD2, 0x5955, 0x5950, 0x594E,
  0x595A, 0x5958, 0x5962, 0x5960, 0x5967, 0x596C, 0x5969,
 };
-static const unsigned short euc_to_utf8_D5[] = {
+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,
@@ -810,7 +775,7 @@ static const unsigned short euc_to_utf8_D5[] = {
  0x5BF3, 0x5C05, 0x5C07, 0x5C08, 0x5C0D, 0x5C13, 0x5C20, 0x5C22,
  0x5C28, 0x5C38, 0x5C39, 0x5C41, 0x5C46, 0x5C4E, 0x5C53,
 };
-static const unsigned short euc_to_utf8_D6[] = {
+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,
@@ -824,7 +789,7 @@ static const unsigned short euc_to_utf8_D6[] = {
  0x5E5F, 0x5E62, 0x5E64, 0x5E47, 0x5E75, 0x5E76, 0x5E7A, 0x9EBC,
  0x5E7F, 0x5EA0, 0x5EC1, 0x5EC2, 0x5EC8, 0x5ED0, 0x5ECF,
 };
-static const unsigned short euc_to_utf8_D7[] = {
+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,
@@ -838,7 +803,7 @@ static const unsigned short euc_to_utf8_D7[] = {
  0x604A, 0x6046, 0x604D, 0x6063, 0x6043, 0x6064, 0x6042, 0x606C,
  0x606B, 0x6059, 0x6081, 0x608D, 0x60E7, 0x6083, 0x609A,
 };
-static const unsigned short euc_to_utf8_D8[] = {
+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,
@@ -852,7 +817,7 @@ static const unsigned short euc_to_utf8_D8[] = {
  0x61E3, 0x61F6, 0x61FA, 0x61F4, 0x61FF, 0x61FD, 0x61FC, 0x61FE,
  0x6200, 0x6208, 0x6209, 0x620D, 0x620C, 0x6214, 0x621B,
 };
-static const unsigned short euc_to_utf8_D9[] = {
+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,
@@ -866,7 +831,7 @@ static const unsigned short euc_to_utf8_D9[] = {
  0x651D, 0x6417, 0x6428, 0x640F, 0x6467, 0x646F, 0x6476, 0x644E,
  0x652A, 0x6495, 0x6493, 0x64A5, 0x64A9, 0x6488, 0x64BC,
 };
-static const unsigned short euc_to_utf8_DA[] = {
+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,
@@ -880,7 +845,7 @@ static const unsigned short euc_to_utf8_DA[] = {
  0x665F, 0x6662, 0x6670, 0x6683, 0x6688, 0x668E, 0x6689, 0x6684,
  0x6698, 0x669D, 0x66C1, 0x66B9, 0x66C9, 0x66BE, 0x66BC,
 };
-static const unsigned short euc_to_utf8_DB[] = {
+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,
@@ -894,7 +859,7 @@ static const unsigned short euc_to_utf8_DB[] = {
  0x68B5, 0x68A0, 0x68BA, 0x690F, 0x688D, 0x687E, 0x6901, 0x68CA,
  0x6908, 0x68D8, 0x6922, 0x6926, 0x68E1, 0x690C, 0x68CD,
 };
-static const unsigned short euc_to_utf8_DC[] = {
+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,
@@ -908,7 +873,7 @@ static const unsigned short euc_to_utf8_DC[] = {
  0x6A36, 0x6A78, 0x6A47, 0x6A62, 0x6A59, 0x6A66, 0x6A48, 0x6A38,
  0x6A22, 0x6A90, 0x6A8D, 0x6AA0, 0x6A84, 0x6AA2, 0x6AA3,
 };
-static const unsigned short euc_to_utf8_DD[] = {
+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,
@@ -922,7 +887,7 @@ static const unsigned short euc_to_utf8_DD[] = {
  0x6C7E, 0x6C68, 0x6C73, 0x6C92, 0x6C90, 0x6CC4, 0x6CF1, 0x6CD3,
  0x6CBD, 0x6CD7, 0x6CC5, 0x6CDD, 0x6CAE, 0x6CB1, 0x6CBE,
 };
-static const unsigned short euc_to_utf8_DE[] = {
+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,
@@ -936,7 +901,7 @@ static const unsigned short euc_to_utf8_DE[] = {
  0x6EA5, 0x6EC2, 0x6E9F, 0x6F41, 0x6F11, 0x704C, 0x6EEC, 0x6EF8,
  0x6EFE, 0x6F3F, 0x6EF2, 0x6F31, 0x6EEF, 0x6F32, 0x6ECC,
 };
-static const unsigned short euc_to_utf8_DF[] = {
+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,
@@ -950,7 +915,7 @@ static const unsigned short euc_to_utf8_DF[] = {
  0x7195, 0x71A8, 0x71AC, 0x71D7, 0x71B9, 0x71BE, 0x71D2, 0x71C9,
  0x71D4, 0x71CE, 0x71E0, 0x71EC, 0x71E7, 0x71F5, 0x71FC,
 };
-static const unsigned short euc_to_utf8_E0[] = {
+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,
@@ -964,7 +929,7 @@ static const unsigned short euc_to_utf8_E0[] = {
  0x7441, 0x745C, 0x7469, 0x7470, 0x7463, 0x746A, 0x7476, 0x747E,
  0x748B, 0x749E, 0x74A7, 0x74CA, 0x74CF, 0x74D4, 0x73F1,
 };
-static const unsigned short euc_to_utf8_E1[] = {
+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,
@@ -978,7 +943,7 @@ static const unsigned short euc_to_utf8_E1[] = {
  0x7630, 0x763B, 0x7647, 0x7648, 0x7646, 0x765C, 0x7658, 0x7661,
  0x7662, 0x7668, 0x7669, 0x766A, 0x7667, 0x766C, 0x7670,
 };
-static const unsigned short euc_to_utf8_E2[] = {
+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,
@@ -992,7 +957,7 @@ static const unsigned short euc_to_utf8_E2[] = {
  0x789A, 0x788C, 0x78A3, 0x78B5, 0x78AA, 0x78AF, 0x78D1, 0x78C6,
  0x78CB, 0x78D4, 0x78BE, 0x78BC, 0x78C5, 0x78CA, 0x78EC,
 };
-static const unsigned short euc_to_utf8_E3[] = {
+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,
@@ -1006,7 +971,7 @@ static const unsigned short euc_to_utf8_E3[] = {
  0x7AE6, 0x7AED, 0x7AF0, 0x7B02, 0x7B0F, 0x7B0A, 0x7B06, 0x7B33,
  0x7B18, 0x7B19, 0x7B1E, 0x7B35, 0x7B28, 0x7B36, 0x7B50,
 };
-static const unsigned short euc_to_utf8_E4[] = {
+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,
@@ -1020,7 +985,7 @@ static const unsigned short euc_to_utf8_E4[] = {
  0x7CBD, 0x7CC0, 0x7CC5, 0x7CC2, 0x7CD8, 0x7CD2, 0x7CDC, 0x7CE2,
  0x9B3B, 0x7CEF, 0x7CF2, 0x7CF4, 0x7CF6, 0x7CFA, 0x7D06,
 };
-static const unsigned short euc_to_utf8_E5[] = {
+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,
@@ -1034,7 +999,7 @@ static const unsigned short euc_to_utf8_E5[] = {
  0x8FAE, 0x7E7F, 0x7E88, 0x7E89, 0x7E8C, 0x7E92, 0x7E90, 0x7E93,
  0x7E94, 0x7E96, 0x7E8E, 0x7E9B, 0x7E9C, 0x7F38, 0x7F3A,
 };
-static const unsigned short euc_to_utf8_E6[] = {
+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,
@@ -1048,7 +1013,7 @@ static const unsigned short euc_to_utf8_E6[] = {
  0x80DB, 0x80E5, 0x80D9, 0x80DD, 0x80C4, 0x80DA, 0x80D6, 0x8109,
  0x80EF, 0x80F1, 0x811B, 0x8129, 0x8123, 0x812F, 0x814B,
 };
-static const unsigned short euc_to_utf8_E7[] = {
+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,
@@ -1062,7 +1027,7 @@ static const unsigned short euc_to_utf8_E7[] = {
  0x82E3, 0x82DF, 0x82D2, 0x82F4, 0x82F3, 0x82FA, 0x8393, 0x8303,
  0x82FB, 0x82F9, 0x82DE, 0x8306, 0x82DC, 0x8309, 0x82D9,
 };
-static const unsigned short euc_to_utf8_E8[] = {
+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,
@@ -1076,7 +1041,7 @@ static const unsigned short euc_to_utf8_E8[] = {
  0x84A1, 0x8521, 0x84FF, 0x84F4, 0x8517, 0x8518, 0x852C, 0x851F,
  0x8515, 0x8514, 0x84FC, 0x8540, 0x8563, 0x8558, 0x8548,
 };
-static const unsigned short euc_to_utf8_E9[] = {
+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,
@@ -1090,7 +1055,7 @@ static const unsigned short euc_to_utf8_E9[] = {
  0x8737, 0x873B, 0x8725, 0x8729, 0x871A, 0x8760, 0x875F, 0x8778,
  0x874C, 0x874E, 0x8774, 0x8757, 0x8768, 0x876E, 0x8759,
 };
-static const unsigned short euc_to_utf8_EA[] = {
+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,
@@ -1104,7 +1069,7 @@ static const unsigned short euc_to_utf8_EA[] = {
  0x8913, 0x8943, 0x891E, 0x8925, 0x892A, 0x892B, 0x8941, 0x8944,
  0x893B, 0x8936, 0x8938, 0x894C, 0x891D, 0x8960, 0x895E,
 };
-static const unsigned short euc_to_utf8_EB[] = {
+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,
@@ -1118,7 +1083,7 @@ static const unsigned short euc_to_utf8_EB[] = {
  0x8B33, 0x97AB, 0x8B26, 0x8B2B, 0x8B3E, 0x8B28, 0x8B41, 0x8B4C,
  0x8B4F, 0x8B4E, 0x8B49, 0x8B56, 0x8B5B, 0x8B5A, 0x8B6B,
 };
-static const unsigned short euc_to_utf8_EC[] = {
+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,
@@ -1132,7 +1097,7 @@ static const unsigned short euc_to_utf8_EC[] = {
  0x8DDF, 0x8DE3, 0x8DFC, 0x8E08, 0x8E09, 0x8DFF, 0x8E1D, 0x8E1E,
  0x8E10, 0x8E1F, 0x8E42, 0x8E35, 0x8E30, 0x8E34, 0x8E4A,
 };
-static const unsigned short euc_to_utf8_ED[] = {
+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,
@@ -1146,7 +1111,7 @@ static const unsigned short euc_to_utf8_ED[] = {
  0x9005, 0x8FF9, 0x8FFA, 0x9011, 0x9015, 0x9021, 0x900D, 0x901E,
  0x9016, 0x900B, 0x9027, 0x9036, 0x9035, 0x9039, 0x8FF8,
 };
-static const unsigned short euc_to_utf8_EE[] = {
+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,
@@ -1160,7 +1125,7 @@ static const unsigned short euc_to_utf8_EE[] = {
  0x924B, 0x9250, 0x929C, 0x9296, 0x9293, 0x929B, 0x925A, 0x92CF,
  0x92B9, 0x92B7, 0x92E9, 0x930F, 0x92FA, 0x9344, 0x932E,
 };
-static const unsigned short euc_to_utf8_EF[] = {
+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,
@@ -1174,7 +1139,7 @@ static const unsigned short euc_to_utf8_EF[] = {
  0x95DC, 0x95E1, 0x95E5, 0x95E2, 0x9621, 0x9628, 0x962E, 0x962F,
  0x9642, 0x964C, 0x964F, 0x964B, 0x9677, 0x965C, 0x965E,
 };
-static const unsigned short euc_to_utf8_F0[] = {
+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,
@@ -1188,7 +1153,7 @@ static const unsigned short euc_to_utf8_F0[] = {
  0x97F6, 0x97F5, 0x980F, 0x980C, 0x9838, 0x9824, 0x9821, 0x9837,
  0x983D, 0x9846, 0x984F, 0x984B, 0x986B, 0x986F, 0x9870,
 };
-static const unsigned short euc_to_utf8_F1[] = {
+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,
@@ -1202,7 +1167,7 @@ static const unsigned short euc_to_utf8_F1[] = {
  0x9ACF, 0x9AD1, 0x9AD3, 0x9AD4, 0x9ADE, 0x9ADF, 0x9AE2, 0x9AE3,
  0x9AE6, 0x9AEF, 0x9AEB, 0x9AEE, 0x9AF4, 0x9AF1, 0x9AF7,
 };
-static const unsigned short euc_to_utf8_F2[] = {
+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,
@@ -1216,7 +1181,7 @@ static const unsigned short euc_to_utf8_F2[] = {
  0x9D03, 0x9D06, 0x9D2A, 0x9D26, 0x9DAF, 0x9D23, 0x9D1F, 0x9D44,
  0x9D15, 0x9D12, 0x9D41, 0x9D3F, 0x9D3E, 0x9D46, 0x9D48,
 };
-static const unsigned short euc_to_utf8_F3[] = {
+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,
@@ -1230,7 +1195,7 @@ static const unsigned short euc_to_utf8_F3[] = {
  0x9F54, 0x9F63, 0x9F5F, 0x9F60, 0x9F61, 0x9F66, 0x9F67, 0x9F6C,
  0x9F6A, 0x9F77, 0x9F72, 0x9F76, 0x9F95, 0x9F9C, 0x9FA0,
 };
-static const unsigned short euc_to_utf8_F4[] = {
+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,
@@ -1244,7 +1209,7 @@ static const unsigned short euc_to_utf8_F4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_F5[] = {
+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,
@@ -1258,7 +1223,7 @@ static const unsigned short euc_to_utf8_F5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_F9[] = {
+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,
@@ -1272,7 +1237,7 @@ static const unsigned short euc_to_utf8_F9[] = {
  0x5CA6, 0x5CBA, 0x5CF5, 0x5D27, 0x5D53, 0xFA11, 0x5D42, 0x5D6D,
  0x5DB8, 0x5DB9, 0x5DD0, 0x5F21, 0x5F34, 0x5F67, 0x5FB7,
 };
-static const unsigned short euc_to_utf8_FA[] = {
+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,
@@ -1286,7 +1251,7 @@ static const unsigned short euc_to_utf8_FA[] = {
  0x6FF5, 0x7005, 0x7007, 0x7028, 0x7085, 0x70AB, 0x710F, 0x7104,
  0x715C, 0x7146, 0x7147, 0xFA15, 0x71C1, 0x71FE, 0x72B1,
 };
-static const unsigned short euc_to_utf8_FB[] = {
+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,
@@ -1300,7 +1265,7 @@ static const unsigned short euc_to_utf8_FB[] = {
  0x8B7F, 0x8CF0, 0x8CF4, 0x8D12, 0x8D76, 0xFA23, 0x8ECF, 0xFA24,
  0xFA25, 0x9067, 0x90DE, 0xFA26, 0x9115, 0x9127, 0x91DA,
 };
-static const unsigned short euc_to_utf8_FC[] = {
+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,
@@ -1316,7 +1281,7 @@ static const unsigned short euc_to_utf8_FC[] = {
 };
 
 /* Microsoft UCS Mapping Compatible */
-static const unsigned short euc_to_utf8_FC_ms[] = {
+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,
@@ -1332,7 +1297,7 @@ static const unsigned short euc_to_utf8_FC_ms[] = {
 };
 
 #ifdef X0212_ENABLE
-static const unsigned short euc_to_utf8_8FA2[] = {
+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,
@@ -1346,7 +1311,7 @@ static const unsigned short euc_to_utf8_8FA2[] = {
  0x00A4, 0x2116,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FA6[] = {
+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,
@@ -1360,7 +1325,7 @@ static const unsigned short euc_to_utf8_8FA6[] = {
       0, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 0x03CA, 0x0390, 0x03CC,
  0x03C2, 0x03CD, 0x03CB, 0x03B0, 0x03CE,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FA7[] = {
+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,
@@ -1374,7 +1339,7 @@ static const unsigned short euc_to_utf8_8FA7[] = {
       0,      0, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
  0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x045E, 0x045F,
 };
-static const unsigned short euc_to_utf8_8FA9[] = {
+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,
@@ -1388,7 +1353,7 @@ static const unsigned short euc_to_utf8_8FA9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FAA[] = {
+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,
@@ -1402,7 +1367,7 @@ static const unsigned short euc_to_utf8_8FAA[] = {
  0x01D5, 0x0174, 0x00DD, 0x0178, 0x0176, 0x0179, 0x017D, 0x017B,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FAB[] = {
+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,
@@ -1416,7 +1381,7 @@ static const unsigned short euc_to_utf8_8FAB[] = {
  0x01D6, 0x0175, 0x00FD, 0x00FF, 0x0177, 0x017A, 0x017E, 0x017C,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FB0[] = {
+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,
@@ -1430,7 +1395,7 @@ static const unsigned short euc_to_utf8_8FB0[] = {
  0x4F5F, 0x4F63, 0x4F6A, 0x4F6C, 0x4F6E, 0x4F71, 0x4F77, 0x4F78,
  0x4F79, 0x4F7A, 0x4F7D, 0x4F7E, 0x4F81, 0x4F82, 0x4F84,
 };
-static const unsigned short euc_to_utf8_8FB1[] = {
+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,
@@ -1444,7 +1409,7 @@ static const unsigned short euc_to_utf8_8FB1[] = {
  0x5066, 0x5067, 0x506A, 0x506D, 0x5070, 0x5071, 0x503B, 0x5081,
  0x5083, 0x5084, 0x5086, 0x508A, 0x508E, 0x508F, 0x5090,
 };
-static const unsigned short euc_to_utf8_8FB2[] = {
+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,
@@ -1458,7 +1423,7 @@ static const unsigned short euc_to_utf8_8FB2[] = {
  0x5183, 0x5184, 0x518B, 0x518E, 0x5198, 0x519D, 0x51A1, 0x51A3,
  0x51AD, 0x51B8, 0x51BA, 0x51BC, 0x51BE, 0x51BF, 0x51C2,
 };
-static const unsigned short euc_to_utf8_8FB3[] = {
+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,
@@ -1472,7 +1437,7 @@ static const unsigned short euc_to_utf8_8FB3[] = {
  0x52E1, 0x52E5, 0x52E8, 0x52E9, 0x52EA, 0x52EC, 0x52F0, 0x52F1,
  0x52F4, 0x52F6, 0x52F7, 0x5300, 0x5303, 0x530A, 0x530B,
 };
-static const unsigned short euc_to_utf8_8FB4[] = {
+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,
@@ -1486,7 +1451,7 @@ static const unsigned short euc_to_utf8_8FB4[] = {
  0x5444, 0x5447, 0x544D, 0x544F, 0x545E, 0x5462, 0x5464, 0x5466,
  0x5467, 0x5469, 0x546B, 0x546D, 0x546E, 0x5474, 0x547F,
 };
-static const unsigned short euc_to_utf8_8FB5[] = {
+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,
@@ -1500,7 +1465,7 @@ static const unsigned short euc_to_utf8_8FB5[] = {
  0x5597, 0x55A3, 0x55A4, 0x55AD, 0x55B2, 0x55BF, 0x55C1, 0x55C3,
  0x55C6, 0x55C9, 0x55CB, 0x55CC, 0x55CE, 0x55D1, 0x55D2,
 };
-static const unsigned short euc_to_utf8_8FB6[] = {
+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,
@@ -1514,7 +1479,7 @@ static const unsigned short euc_to_utf8_8FB6[] = {
  0x56CC, 0x56CD, 0x56D9, 0x56DC, 0x56DD, 0x56DF, 0x56E1, 0x56E4,
  0x56E5, 0x56E6, 0x56E7, 0x56E8, 0x56F1, 0x56EB, 0x56ED,
 };
-static const unsigned short euc_to_utf8_8FB7[] = {
+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,
@@ -1528,7 +1493,7 @@ static const unsigned short euc_to_utf8_8FB7[] = {
  0x57E7, 0x57E9, 0x57ED, 0x57F0, 0x57F5, 0x57F6, 0x57F8, 0x57FD,
  0x57FE, 0x57FF, 0x5803, 0x5804, 0x5808, 0x5809, 0x57E1,
 };
-static const unsigned short euc_to_utf8_8FB8[] = {
+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,
@@ -1542,7 +1507,7 @@ static const unsigned short euc_to_utf8_8FB8[] = {
  0x5936, 0x593F, 0x5943, 0x5946, 0x5952, 0x5953, 0x5959, 0x595B,
  0x595D, 0x595E, 0x595F, 0x5961, 0x5963, 0x596B, 0x596D,
 };
-static const unsigned short euc_to_utf8_8FB9[] = {
+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,
@@ -1556,7 +1521,7 @@ static const unsigned short euc_to_utf8_8FB9[] = {
  0x5A9C, 0x5A9E, 0x5A9F, 0x5AA0, 0x5AA2, 0x5AA7, 0x5AAC, 0x5AB1,
  0x5AB2, 0x5AB3, 0x5AB5, 0x5AB8, 0x5ABA, 0x5ABB, 0x5ABF,
 };
-static const unsigned short euc_to_utf8_8FBA[] = {
+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,
@@ -1570,7 +1535,7 @@ static const unsigned short euc_to_utf8_8FBA[] = {
  0x5C2B, 0x5C2C, 0x5C2E, 0x5C30, 0x5C32, 0x5C35, 0x5C36, 0x5C59,
  0x5C5A, 0x5C5C, 0x5C62, 0x5C63, 0x5C67, 0x5C68, 0x5C69,
 };
-static const unsigned short euc_to_utf8_8FBB[] = {
+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,
@@ -1584,7 +1549,7 @@ static const unsigned short euc_to_utf8_8FBB[] = {
  0x5DA7, 0x5DAB, 0x5DB0, 0x5DB4, 0x5DB8, 0x5DB9, 0x5DC3, 0x5DC7,
  0x5DCB, 0x5DD0, 0x5DCE, 0x5DD8, 0x5DD9, 0x5DE0, 0x5DE4,
 };
-static const unsigned short euc_to_utf8_8FBC[] = {
+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,
@@ -1598,7 +1563,7 @@ static const unsigned short euc_to_utf8_8FBC[] = {
  0x5F3D, 0x5F3F, 0x5F40, 0x5F44, 0x5F45, 0x5F47, 0x5F4D, 0x5F50,
  0x5F54, 0x5F58, 0x5F5B, 0x5F60, 0x5F63, 0x5F64, 0x5F67,
 };
-static const unsigned short euc_to_utf8_8FBD[] = {
+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,
@@ -1612,7 +1577,7 @@ static const unsigned short euc_to_utf8_8FBD[] = {
  0x608A, 0x608E, 0x6091, 0x6093, 0x6095, 0x6098, 0x609D, 0x609E,
  0x60A2, 0x60A4, 0x60A5, 0x60A8, 0x60B0, 0x60B1, 0x60B7,
 };
-static const unsigned short euc_to_utf8_8FBE[] = {
+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,
@@ -1626,7 +1591,7 @@ static const unsigned short euc_to_utf8_8FBE[] = {
  0x61C0, 0x61C1, 0x61C2, 0x61CE, 0x61CF, 0x61D5, 0x61DC, 0x61DD,
  0x61DE, 0x61DF, 0x61E1, 0x61E2, 0x61E7, 0x61E9, 0x61E5,
 };
-static const unsigned short euc_to_utf8_8FBF[] = {
+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,
@@ -1640,7 +1605,7 @@ static const unsigned short euc_to_utf8_8FBF[] = {
  0x634A, 0x634B, 0x634E, 0x6352, 0x6353, 0x6354, 0x6358, 0x635B,
  0x6365, 0x6366, 0x636C, 0x636D, 0x6371, 0x6374, 0x6375,
 };
-static const unsigned short euc_to_utf8_8FC0[] = {
+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,
@@ -1654,7 +1619,7 @@ static const unsigned short euc_to_utf8_8FC0[] = {
  0x6491, 0x6498, 0x6499, 0x649B, 0x649D, 0x649F, 0x64A1, 0x64A3,
  0x64A6, 0x64A8, 0x64AC, 0x64B3, 0x64BD, 0x64BE, 0x64BF,
 };
-static const unsigned short euc_to_utf8_8FC1[] = {
+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,
@@ -1668,7 +1633,7 @@ static const unsigned short euc_to_utf8_8FC1[] = {
  0x65F4, 0x65F5, 0x65F9, 0x65FE, 0x65FF, 0x6600, 0x6604, 0x6608,
  0x6609, 0x660D, 0x6611, 0x6612, 0x6615, 0x6616, 0x661D,
 };
-static const unsigned short euc_to_utf8_8FC2[] = {
+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,
@@ -1682,7 +1647,7 @@ static const unsigned short euc_to_utf8_8FC2[] = {
  0x670E, 0x6713, 0x6719, 0x671C, 0x6720, 0x6722, 0x6733, 0x673E,
  0x6745, 0x6747, 0x6748, 0x674C, 0x6754, 0x6755, 0x675D,
 };
-static const unsigned short euc_to_utf8_8FC3[] = {
+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,
@@ -1696,7 +1661,7 @@ static const unsigned short euc_to_utf8_8FC3[] = {
  0x6898, 0x689A, 0x689C, 0x68A1, 0x68A3, 0x68A5, 0x68A9, 0x68AA,
  0x68AE, 0x68B2, 0x68BB, 0x68C5, 0x68C8, 0x68CC, 0x68CF,
 };
-static const unsigned short euc_to_utf8_8FC4[] = {
+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,
@@ -1710,7 +1675,7 @@ static const unsigned short euc_to_utf8_8FC4[] = {
  0x69F5, 0x69FE, 0x6A00, 0x6A01, 0x6A03, 0x6A0F, 0x6A11, 0x6A15,
  0x6A1A, 0x6A1D, 0x6A20, 0x6A24, 0x6A28, 0x6A30, 0x6A32,
 };
-static const unsigned short euc_to_utf8_8FC5[] = {
+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,
@@ -1724,7 +1689,7 @@ static const unsigned short euc_to_utf8_8FC5[] = {
  0x6B3F, 0x6B46, 0x6B4A, 0x6B4D, 0x6B52, 0x6B56, 0x6B58, 0x6B5D,
  0x6B60, 0x6B67, 0x6B6B, 0x6B6E, 0x6B70, 0x6B75, 0x6B7D,
 };
-static const unsigned short euc_to_utf8_8FC6[] = {
+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,
@@ -1738,7 +1703,7 @@ static const unsigned short euc_to_utf8_8FC6[] = {
  0x6C98, 0x6C9C, 0x6C9F, 0x6CB0, 0x6CB2, 0x6CB4, 0x6CC2, 0x6CC6,
  0x6CCD, 0x6CCF, 0x6CD0, 0x6CD1, 0x6CD2, 0x6CD4, 0x6CD6,
 };
-static const unsigned short euc_to_utf8_8FC7[] = {
+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,
@@ -1752,7 +1717,7 @@ static const unsigned short euc_to_utf8_8FC7[] = {
  0x6E3C, 0x6E44, 0x6E45, 0x6E48, 0x6E49, 0x6E4B, 0x6E4F, 0x6E51,
  0x6E52, 0x6E53, 0x6E54, 0x6E57, 0x6E5C, 0x6E5D, 0x6E5E,
 };
-static const unsigned short euc_to_utf8_8FC8[] = {
+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,
@@ -1766,7 +1731,7 @@ static const unsigned short euc_to_utf8_8FC8[] = {
  0x6FA0, 0x6FA5, 0x6FA6, 0x6FA7, 0x6FA8, 0x6FAE, 0x6FAF, 0x6FB0,
  0x6FB5, 0x6FB6, 0x6FBC, 0x6FC5, 0x6FC7, 0x6FC8, 0x6FCA,
 };
-static const unsigned short euc_to_utf8_8FC9[] = {
+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,
@@ -1780,7 +1745,7 @@ static const unsigned short euc_to_utf8_8FC9[] = {
  0x7131, 0x7138, 0x7141, 0x7145, 0x7146, 0x7147, 0x714A, 0x714B,
  0x7150, 0x7152, 0x7157, 0x715A, 0x715C, 0x715E, 0x7160,
 };
-static const unsigned short euc_to_utf8_8FCA[] = {
+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,
@@ -1794,7 +1759,7 @@ static const unsigned short euc_to_utf8_8FCA[] = {
  0x72B4, 0x72BE, 0x72C1, 0x72C7, 0x72C9, 0x72CC, 0x72D5, 0x72D6,
  0x72D8, 0x72DF, 0x72E5, 0x72F3, 0x72F4, 0x72FA, 0x72FB,
 };
-static const unsigned short euc_to_utf8_8FCB[] = {
+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,
@@ -1808,7 +1773,7 @@ static const unsigned short euc_to_utf8_8FCB[] = {
  0x73D6, 0x73D9, 0x73DD, 0x73E1, 0x73E3, 0x73E6, 0x73E7, 0x73E9,
  0x73F4, 0x73F5, 0x73F7, 0x73F9, 0x73FA, 0x73FB, 0x73FD,
 };
-static const unsigned short euc_to_utf8_8FCC[] = {
+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,
@@ -1822,7 +1787,7 @@ static const unsigned short euc_to_utf8_8FCC[] = {
  0x74DA, 0x74DB, 0x74DE, 0x74DF, 0x74E4, 0x74E8, 0x74EA, 0x74EB,
  0x74EF, 0x74F4, 0x74FA, 0x74FB, 0x74FC, 0x74FF, 0x7506,
 };
-static const unsigned short euc_to_utf8_8FCD[] = {
+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,
@@ -1836,7 +1801,7 @@ static const unsigned short euc_to_utf8_8FCD[] = {
  0x7619, 0x761B, 0x761C, 0x761D, 0x761E, 0x7623, 0x7625, 0x7626,
  0x7629, 0x762D, 0x7632, 0x7633, 0x7635, 0x7638, 0x7639,
 };
-static const unsigned short euc_to_utf8_8FCE[] = {
+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,
@@ -1850,7 +1815,7 @@ static const unsigned short euc_to_utf8_8FCE[] = {
  0x7742, 0x7745, 0x7746, 0x774A, 0x774D, 0x774E, 0x774F, 0x7752,
  0x7756, 0x7757, 0x775C, 0x775E, 0x775F, 0x7760, 0x7762,
 };
-static const unsigned short euc_to_utf8_8FCF[] = {
+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,
@@ -1864,7 +1829,7 @@ static const unsigned short euc_to_utf8_8FCF[] = {
  0x788F, 0x7894, 0x7898, 0x78A1, 0x789D, 0x789E, 0x789F, 0x78A4,
  0x78A8, 0x78AC, 0x78AD, 0x78B0, 0x78B1, 0x78B2, 0x78B3,
 };
-static const unsigned short euc_to_utf8_8FD0[] = {
+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,
@@ -1878,7 +1843,7 @@ static const unsigned short euc_to_utf8_8FD0[] = {
  0x79B1, 0x79B4, 0x79B8, 0x79BB, 0x79C2, 0x79C4, 0x79C7, 0x79C8,
  0x79CA, 0x79CF, 0x79D4, 0x79D6, 0x79DA, 0x79DD, 0x79DE,
 };
-static const unsigned short euc_to_utf8_8FD1[] = {
+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,
@@ -1892,7 +1857,7 @@ static const unsigned short euc_to_utf8_8FD1[] = {
  0x7AFB, 0x7AFD, 0x7AFE, 0x7B07, 0x7B14, 0x7B1F, 0x7B23, 0x7B27,
  0x7B29, 0x7B2A, 0x7B2B, 0x7B2D, 0x7B2E, 0x7B2F, 0x7B30,
 };
-static const unsigned short euc_to_utf8_8FD2[] = {
+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,
@@ -1906,7 +1871,7 @@ static const unsigned short euc_to_utf8_8FD2[] = {
  0x7C36, 0x7C39, 0x7C3A, 0x7C46, 0x7C4A, 0x7C55, 0x7C51, 0x7C52,
  0x7C53, 0x7C59, 0x7C5A, 0x7C5B, 0x7C5C, 0x7C5D, 0x7C5E,
 };
-static const unsigned short euc_to_utf8_8FD3[] = {
+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,
@@ -1920,7 +1885,7 @@ static const unsigned short euc_to_utf8_8FD3[] = {
  0x7D7B, 0x7D7F, 0x7D81, 0x7D82, 0x7D83, 0x7D85, 0x7D86, 0x7D88,
  0x7D8B, 0x7D8C, 0x7D8D, 0x7D91, 0x7D96, 0x7D97, 0x7D9D,
 };
-static const unsigned short euc_to_utf8_8FD4[] = {
+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,
@@ -1934,7 +1899,7 @@ static const unsigned short euc_to_utf8_8FD4[] = {
  0x7F43, 0x7F44, 0x7F47, 0x7F4F, 0x7F52, 0x7F53, 0x7F5B, 0x7F5C,
  0x7F5D, 0x7F61, 0x7F63, 0x7F64, 0x7F65, 0x7F66, 0x7F6D,
 };
-static const unsigned short euc_to_utf8_8FD5[] = {
+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,
@@ -1948,7 +1913,7 @@ static const unsigned short euc_to_utf8_8FD5[] = {
  0x80A7, 0x80AB, 0x80B8, 0x80B9, 0x80C8, 0x80CD, 0x80CF, 0x80D2,
  0x80D4, 0x80D5, 0x80D7, 0x80D8, 0x80E0, 0x80ED, 0x80EE,
 };
-static const unsigned short euc_to_utf8_8FD6[] = {
+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,
@@ -1962,7 +1927,7 @@ static const unsigned short euc_to_utf8_8FD6[] = {
  0x8213, 0x8214, 0x8219, 0x821A, 0x821D, 0x8221, 0x8222, 0x8228,
  0x8232, 0x8234, 0x823A, 0x8243, 0x8244, 0x8245, 0x8246,
 };
-static const unsigned short euc_to_utf8_8FD7[] = {
+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,
@@ -1976,7 +1941,7 @@ static const unsigned short euc_to_utf8_8FD7[] = {
  0x833A, 0x833C, 0x833D, 0x8342, 0x8343, 0x8344, 0x8347, 0x834D,
  0x834E, 0x8351, 0x8355, 0x8356, 0x8357, 0x8370, 0x8378,
 };
-static const unsigned short euc_to_utf8_8FD8[] = {
+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,
@@ -1990,7 +1955,7 @@ static const unsigned short euc_to_utf8_8FD8[] = {
  0x84A9, 0x84AA, 0x84AF, 0x84B1, 0x84B4, 0x84BA, 0x84BD, 0x84BE,
  0x84C0, 0x84C2, 0x84C7, 0x84C8, 0x84CC, 0x84CF, 0x84D3,
 };
-static const unsigned short euc_to_utf8_8FD9[] = {
+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,
@@ -2004,7 +1969,7 @@ static const unsigned short euc_to_utf8_8FD9[] = {
  0x85C7, 0x85CA, 0x85CB, 0x85CE, 0x85AD, 0x85D8, 0x85DA, 0x85DF,
  0x85E0, 0x85E6, 0x85E8, 0x85ED, 0x85F3, 0x85F6, 0x85FC,
 };
-static const unsigned short euc_to_utf8_8FDA[] = {
+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,
@@ -2018,7 +1983,7 @@ static const unsigned short euc_to_utf8_8FDA[] = {
  0x86FD, 0x8704, 0x8705, 0x8707, 0x870B, 0x870E, 0x870F, 0x8710,
  0x8713, 0x8714, 0x8719, 0x871E, 0x871F, 0x8721, 0x8723,
 };
-static const unsigned short euc_to_utf8_8FDB[] = {
+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,
@@ -2032,7 +1997,7 @@ static const unsigned short euc_to_utf8_8FDB[] = {
  0x8812, 0x8813, 0x8814, 0x8818, 0x881A, 0x881B, 0x881C, 0x881E,
  0x881F, 0x8828, 0x882D, 0x882E, 0x8830, 0x8832, 0x8835,
 };
-static const unsigned short euc_to_utf8_8FDC[] = {
+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,
@@ -2046,7 +2011,7 @@ static const unsigned short euc_to_utf8_8FDC[] = {
  0x894F, 0x8952, 0x8957, 0x895A, 0x895B, 0x895C, 0x8961, 0x8962,
  0x8963, 0x896B, 0x896E, 0x8970, 0x8973, 0x8975, 0x897A,
 };
-static const unsigned short euc_to_utf8_8FDD[] = {
+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,
@@ -2060,7 +2025,7 @@ static const unsigned short euc_to_utf8_8FDD[] = {
  0x8A83, 0x8A86, 0x8A8B, 0x8A8F, 0x8A90, 0x8A92, 0x8A96, 0x8A97,
  0x8A99, 0x8A9F, 0x8AA7, 0x8AA9, 0x8AAE, 0x8AAF, 0x8AB3,
 };
-static const unsigned short euc_to_utf8_8FDE[] = {
+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,
@@ -2074,7 +2039,7 @@ static const unsigned short euc_to_utf8_8FDE[] = {
  0x8C5B, 0x8C5D, 0x8C59, 0x8C63, 0x8C64, 0x8C66, 0x8C68, 0x8C69,
  0x8C6D, 0x8C73, 0x8C75, 0x8C76, 0x8C7B, 0x8C7E, 0x8C86,
 };
-static const unsigned short euc_to_utf8_8FDF[] = {
+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,
@@ -2088,7 +2053,7 @@ static const unsigned short euc_to_utf8_8FDF[] = {
  0x8DF1, 0x8DF2, 0x8DF4, 0x8DFD, 0x8E01, 0x8E04, 0x8E05, 0x8E06,
  0x8E0B, 0x8E11, 0x8E14, 0x8E16, 0x8E20, 0x8E21, 0x8E22,
 };
-static const unsigned short euc_to_utf8_8FE0[] = {
+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,
@@ -2102,7 +2067,7 @@ static const unsigned short euc_to_utf8_8FE0[] = {
  0x8F21, 0x8F23, 0x8F25, 0x8F27, 0x8F28, 0x8F2C, 0x8F2D, 0x8F2E,
  0x8F34, 0x8F35, 0x8F36, 0x8F37, 0x8F3A, 0x8F40, 0x8F41,
 };
-static const unsigned short euc_to_utf8_8FE1[] = {
+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,
@@ -2116,7 +2081,7 @@ static const unsigned short euc_to_utf8_8FE1[] = {
  0x9099, 0x909B, 0x90A0, 0x90A1, 0x90A2, 0x90A5, 0x90B0, 0x90B2,
  0x90B3, 0x90B4, 0x90B6, 0x90BD, 0x90CC, 0x90BE, 0x90C3,
 };
-static const unsigned short euc_to_utf8_8FE2[] = {
+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,
@@ -2130,7 +2095,7 @@ static const unsigned short euc_to_utf8_8FE2[] = {
  0x91A1, 0x91A6, 0x91A8, 0x91AC, 0x91AD, 0x91AE, 0x91B0, 0x91B1,
  0x91B2, 0x91B3, 0x91B6, 0x91BB, 0x91BC, 0x91BD, 0x91BF,
 };
-static const unsigned short euc_to_utf8_8FE3[] = {
+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,
@@ -2144,7 +2109,7 @@ static const unsigned short euc_to_utf8_8FE3[] = {
  0x9276, 0x9277, 0x9278, 0x9279, 0x927B, 0x927C, 0x927D, 0x927F,
  0x9288, 0x9289, 0x928A, 0x928D, 0x928E, 0x9292, 0x9297,
 };
-static const unsigned short euc_to_utf8_8FE4[] = {
+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,
@@ -2158,7 +2123,7 @@ static const unsigned short euc_to_utf8_8FE4[] = {
  0x9358, 0x935A, 0x935E, 0x9364, 0x9365, 0x9367, 0x9369, 0x936A,
  0x936D, 0x936F, 0x9370, 0x9371, 0x9373, 0x9374, 0x9376,
 };
-static const unsigned short euc_to_utf8_8FE5[] = {
+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,
@@ -2172,7 +2137,7 @@ static const unsigned short euc_to_utf8_8FE5[] = {
  0x945C, 0x945F, 0x9461, 0x9463, 0x9468, 0x946B, 0x946D, 0x946E,
  0x946F, 0x9471, 0x9472, 0x9484, 0x9483, 0x9578, 0x9579,
 };
-static const unsigned short euc_to_utf8_8FE6[] = {
+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,
@@ -2186,7 +2151,7 @@ static const unsigned short euc_to_utf8_8FE6[] = {
  0x96B3, 0x96BA, 0x96CA, 0x96D2, 0x5DB2, 0x96D8, 0x96DA, 0x96DD,
  0x96DE, 0x96DF, 0x96E9, 0x96EF, 0x96F1, 0x96FA, 0x9702,
 };
-static const unsigned short euc_to_utf8_8FE7[] = {
+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,
@@ -2200,7 +2165,7 @@ static const unsigned short euc_to_utf8_8FE7[] = {
  0x97F7, 0x97F8, 0x97FA, 0x9807, 0x980A, 0x9819, 0x980D, 0x980E,
  0x9814, 0x9816, 0x981C, 0x981E, 0x9820, 0x9823, 0x9826,
 };
-static const unsigned short euc_to_utf8_8FE8[] = {
+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,
@@ -2214,7 +2179,7 @@ static const unsigned short euc_to_utf8_8FE8[] = {
  0x9958, 0x9959, 0x995B, 0x995C, 0x995E, 0x995F, 0x9960, 0x999B,
  0x999D, 0x999F, 0x99A6, 0x99B0, 0x99B1, 0x99B2, 0x99B5,
 };
-static const unsigned short euc_to_utf8_8FE9[] = {
+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,
@@ -2228,7 +2193,7 @@ static const unsigned short euc_to_utf8_8FE9[] = {
  0x9AE5, 0x9AE7, 0x9AE9, 0x9AEC, 0x9AF2, 0x9AF3, 0x9AF5, 0x9AF9,
  0x9AFA, 0x9AFD, 0x9AFF, 0x9B00, 0x9B01, 0x9B02, 0x9B03,
 };
-static const unsigned short euc_to_utf8_8FEA[] = {
+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,
@@ -2242,7 +2207,7 @@ static const unsigned short euc_to_utf8_8FEA[] = {
  0x9BC8, 0x9BCE, 0x9BD0, 0x9BD7, 0x9BD8, 0x9BDD, 0x9BDF, 0x9BE5,
  0x9BE7, 0x9BEA, 0x9BEB, 0x9BEF, 0x9BF3, 0x9BF7, 0x9BF8,
 };
-static const unsigned short euc_to_utf8_8FEB[] = {
+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,
@@ -2256,7 +2221,7 @@ static const unsigned short euc_to_utf8_8FEB[] = {
  0x9D47, 0x9D4A, 0x9D53, 0x9D54, 0x9D5F, 0x9D63, 0x9D62, 0x9D65,
  0x9D69, 0x9D6A, 0x9D6B, 0x9D70, 0x9D76, 0x9D77, 0x9D7B,
 };
-static const unsigned short euc_to_utf8_8FEC[] = {
+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,
@@ -2270,7 +2235,7 @@ static const unsigned short euc_to_utf8_8FEC[] = {
  0x9EB5, 0x9EC6, 0x9EC8, 0x9ECB, 0x9ED5, 0x9EDF, 0x9EE4, 0x9EE7,
  0x9EEC, 0x9EED, 0x9EEE, 0x9EF0, 0x9EF1, 0x9EF2, 0x9EF5,
 };
-static const unsigned short euc_to_utf8_8FED[] = {
+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,
@@ -2284,7 +2249,7 @@ static const unsigned short euc_to_utf8_8FED[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short euc_to_utf8_8FF3[] = {
+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,
@@ -2298,7 +2263,7 @@ static const unsigned short euc_to_utf8_8FF3[] = {
       0,      0,      0, 0x2170, 0x2171, 0x2172, 0x2173, 0x2174,
  0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x2160, 0x2161,
 };
-static const unsigned short euc_to_utf8_8FF4[] = {
+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,
@@ -2381,33 +2346,6 @@ const unsigned short *const euc_to_utf8_2bytes_ms[] = {
               0, euc_to_utf8_F9, euc_to_utf8_FA, euc_to_utf8_FB,
  euc_to_utf8_FC_ms,              0,              0,
 };
-/* CP10001 */
-const unsigned short *const euc_to_utf8_2bytes_mac[] = {
-                 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_mac, euc_to_utf8_AD_mac, 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[] = {
@@ -2439,7 +2377,7 @@ const unsigned short *const x0212_to_utf8_2bytes[] = {
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
-static const unsigned short utf8_to_euc_C2[] = {
+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,
@@ -2449,7 +2387,7 @@ static const unsigned short utf8_to_euc_C2[] = {
  0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
  0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
 };
-static const unsigned short utf8_to_euc_C2_ms[] = {
+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,
@@ -2459,17 +2397,7 @@ static const unsigned short utf8_to_euc_C2_ms[] = {
  0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
  0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
 };
-static const unsigned short utf8_to_euc_C2_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x0220, 0xA242, 0x2171, 0x2172, 0xA270,   0x5C, 0xA243, 0x2178,
- 0x212F, 0x027D, 0xA26C,      0, 0x224C,      0, 0xA26E, 0xA234,
- 0x216B, 0x215E,      0,      0, 0x212D,      0, 0x2279,      0,
- 0xA231,      0, 0xA26B,      0,      0,      0,      0, 0xA244,
-};
-static const unsigned short utf8_to_euc_C2_932[] = {
+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,
@@ -2479,7 +2407,7 @@ static const unsigned short utf8_to_euc_C2_932[] = {
  0x216B, 0x215E,   0x32,   0x33, 0x212D, 0x264C, 0x2279, 0x2126,
  0x2124,   0x31,   0x6F, 0x2264,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_C3[] = {
+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,
@@ -2489,7 +2417,7 @@ static const unsigned short utf8_to_euc_C3[] = {
  0xA943, 0xAB50, 0xAB52, 0xAB51, 0xAB54, 0xAB58, 0xAB53, 0x2160,
  0xA94C, 0xAB63, 0xAB62, 0xAB65, 0xAB64, 0xAB72, 0xA950, 0xAB73,
 };
-static const unsigned short utf8_to_euc_C3_932[] = {
+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,
@@ -2499,7 +2427,7 @@ static const unsigned short utf8_to_euc_C3_932[] = {
    0x64,   0x6E,   0x6F,   0x6F,   0x6F,   0x6F,   0x6F, 0x2160,
    0x6F,   0x75,   0x75,   0x75,   0x75,   0x79,   0x74,   0x79,
 };
-static const unsigned short utf8_to_euc_C4[] = {
+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,
@@ -2509,7 +2437,7 @@ static const unsigned short utf8_to_euc_C4[] = {
  0xAA44, 0xA945, 0xA926, 0xA946, 0xAA48, 0xAB48, 0xAA49, 0xAB49,
  0xA947, 0xAA4A, 0xAB4A, 0xAA4C, 0xAB4C, 0xAA4B, 0xAB4B, 0xA929,
 };
-static const unsigned short utf8_to_euc_C5[] = {
+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,
@@ -2519,7 +2447,7 @@ static const unsigned short utf8_to_euc_C5[] = {
  0xAA68, 0xAB68, 0xAA6A, 0xAB6A, 0xAA71, 0xAB71, 0xAA74, 0xAB74,
  0xAA73, 0xAA75, 0xAB75, 0xAA77, 0xAB77, 0xAA76, 0xAB76,      0,
 };
-static const unsigned short utf8_to_euc_C7[] = {
+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,
@@ -2529,7 +2457,7 @@ static const unsigned short utf8_to_euc_C7[] = {
       0,      0,      0,      0,      0, 0xAB39,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_CB[] = {
+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,
@@ -2539,7 +2467,7 @@ static const unsigned short utf8_to_euc_CB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_CE[] = {
+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,
@@ -2549,7 +2477,7 @@ static const unsigned short utf8_to_euc_CE[] = {
  0xA67B, 0x2641, 0x2642, 0x2643, 0x2644, 0x2645, 0x2646, 0x2647,
  0x2648, 0x2649, 0x264A, 0x264B, 0x264C, 0x264D, 0x264E, 0x264F,
 };
-static const unsigned short utf8_to_euc_CF[] = {
+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,
@@ -2559,7 +2487,7 @@ static const unsigned short utf8_to_euc_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_D0[] = {
+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,
@@ -2569,7 +2497,7 @@ static const unsigned short utf8_to_euc_D0[] = {
  0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2758, 0x2759,
  0x275A, 0x275B, 0x275C, 0x275D, 0x275E, 0x275F, 0x2760, 0x2761,
 };
-static const unsigned short utf8_to_euc_D1[] = {
+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,
@@ -2579,7 +2507,7 @@ static const unsigned short utf8_to_euc_D1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E280[] = {
+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,
@@ -2589,7 +2517,7 @@ static const unsigned short utf8_to_euc_E280[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0, 0x2131,      0,
 };
-static const unsigned short utf8_to_euc_E280_ms[] = {
+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,
@@ -2599,7 +2527,7 @@ static const unsigned short utf8_to_euc_E280_ms[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0,   0x7E,      0,
 };
-static const unsigned short utf8_to_euc_E280_932[] = {
+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,
@@ -2609,7 +2537,7 @@ static const unsigned short utf8_to_euc_E280_932[] = {
  0x2273,      0, 0x216C, 0x216D,      0,      0,      0,      0,
       0,      0,      0, 0x2228,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E284[] = {
+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,
@@ -2619,17 +2547,7 @@ static const unsigned short utf8_to_euc_E284[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E284_mac[] = {
-      0,      0,      0, 0x216E,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2B7B,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2B7D, 0x027E,      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,
-};
-static const unsigned short utf8_to_euc_E285[] = {
+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,
@@ -2639,17 +2557,7 @@ static const unsigned short utf8_to_euc_E285[] = {
  0xF373, 0xF374, 0xF375, 0xF376, 0xF377, 0xF378, 0xF379, 0xF37A,
  0xF37B, 0xF37C,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E285_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2A21, 0x2A22, 0x2A23, 0x2A24, 0x2A25, 0x2A26, 0x2A27, 0x2A28,
- 0x2A29, 0x2A2A,      0,      0,      0,      0,      0,      0,
- 0x2A35, 0x2A36, 0x2A37, 0x2A38, 0x2A39, 0x2A3A, 0x2A3B, 0x2A3C,
- 0x2A3D, 0x2A3E,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E286[] = {
+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,
@@ -2659,7 +2567,7 @@ static const unsigned short utf8_to_euc_E286[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E287[] = {
+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,
@@ -2669,7 +2577,7 @@ static const unsigned short utf8_to_euc_E287[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E288[] = {
+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,
@@ -2679,7 +2587,7 @@ static const unsigned short utf8_to_euc_E288[] = {
       0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
       0,      0,      0,      0,      0, 0x2266,      0,      0,
 };
-static const unsigned short utf8_to_euc_E288_932[] = {
+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,
@@ -2689,17 +2597,7 @@ static const unsigned short utf8_to_euc_E288_932[] = {
       0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
       0,      0,      0,      0,      0, 0x2266,      0,      0,
 };
-static const unsigned short utf8_to_euc_E288_mac[] = {
- 0x224F,      0, 0x225F, 0x2250,      0,      0,      0, 0x2260,
- 0x223A,      0,      0, 0x223B,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2265,      0,      0, 0x2267, 0x2167, 0x2F22,
- 0x225C,      0,      0,      0,      0, 0x2142,      0, 0x224A,
- 0x224B, 0x2241, 0x2240, 0x2269, 0x226A,      0, 0x2F21,      0,
-      0,      0,      0,      0, 0x2168, 0x2268,      0,      0,
-      0,      0,      0,      0,      0, 0x2266,      0,      0,
-};
-static const unsigned short utf8_to_euc_E289[] = {
+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,
@@ -2709,7 +2607,7 @@ static const unsigned short utf8_to_euc_E289[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E28A[] = {
+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,
@@ -2719,17 +2617,7 @@ static const unsigned short utf8_to_euc_E28A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0, 0x2D79,
 };
-static const unsigned short utf8_to_euc_E28A_mac[] = {
-      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, 0x2F23,
-};
-static const unsigned short utf8_to_euc_E28C[] = {
+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,
@@ -2739,7 +2627,7 @@ static const unsigned short utf8_to_euc_E28C[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E291[] = {
+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,
@@ -2749,17 +2637,7 @@ static const unsigned short utf8_to_euc_E291[] = {
  0x2D31, 0x2D32, 0x2D33, 0x2D34,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E291_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
- 0x2921, 0x2922, 0x2923, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928,
- 0x2929, 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930,
- 0x2931, 0x2932, 0x2933, 0x2934,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E294[] = {
+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,
@@ -2769,7 +2647,7 @@ static const unsigned short utf8_to_euc_E294[] = {
  0x283D,      0,      0, 0x2833, 0x282A,      0,      0, 0x283A,
  0x283F,      0,      0, 0x2835, 0x282B,      0,      0, 0x283B,
 };
-static const unsigned short utf8_to_euc_E295[] = {
+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,
@@ -2779,7 +2657,7 @@ static const unsigned short utf8_to_euc_E295[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E296[] = {
+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,
@@ -2789,7 +2667,7 @@ static const unsigned short utf8_to_euc_E296[] = {
       0,      0, 0x2225, 0x2224,      0,      0,      0,      0,
       0,      0,      0,      0, 0x2227, 0x2226,      0,      0,
 };
-static const unsigned short utf8_to_euc_E297[] = {
+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,
@@ -2799,7 +2677,7 @@ static const unsigned short utf8_to_euc_E297[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E298[] = {
+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,
@@ -2809,7 +2687,7 @@ static const unsigned short utf8_to_euc_E298[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E299[] = {
+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,
@@ -2819,7 +2697,7 @@ static const unsigned short utf8_to_euc_E299[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E380[] = {
+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,
@@ -2829,7 +2707,7 @@ static const unsigned short utf8_to_euc_E380[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E380_932[] = {
+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,
@@ -2839,7 +2717,7 @@ static const unsigned short utf8_to_euc_E380_932[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E381[] = {
+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,
@@ -2849,7 +2727,7 @@ static const unsigned short utf8_to_euc_E381[] = {
  0x2450, 0x2451, 0x2452, 0x2453, 0x2454, 0x2455, 0x2456, 0x2457,
  0x2458, 0x2459, 0x245A, 0x245B, 0x245C, 0x245D, 0x245E, 0x245F,
 };
-static const unsigned short utf8_to_euc_E382[] = {
+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,
@@ -2859,7 +2737,7 @@ static const unsigned short utf8_to_euc_E382[] = {
  0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
  0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
 };
-static const unsigned short utf8_to_euc_E382_932[] = {
+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,
@@ -2869,7 +2747,7 @@ static const unsigned short utf8_to_euc_E382_932[] = {
  0x2530, 0x2531, 0x2532, 0x2533, 0x2534, 0x2535, 0x2536, 0x2537,
  0x2538, 0x2539, 0x253A, 0x253B, 0x253C, 0x253D, 0x253E, 0x253F,
 };
-static const unsigned short utf8_to_euc_E383[] = {
+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,
@@ -2879,7 +2757,7 @@ static const unsigned short utf8_to_euc_E383[] = {
  0x2570, 0x2571, 0x2572, 0x2573, 0x2574, 0x2575, 0x2576,      0,
       0,      0,      0, 0x2126, 0x213C, 0x2133, 0x2134,      0,
 };
-static const unsigned short utf8_to_euc_E388[] = {
+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,
@@ -2889,17 +2767,7 @@ static const unsigned short utf8_to_euc_E388[] = {
       0, 0x2D6A, 0x2D6B,      0,      0,      0,      0,      0,
       0, 0x2D6C,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E388_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2D2E, 0x2D31,      0,      0,      0,      0,      0,
-      0, 0x2D2C,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38A[] = {
+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,
@@ -2909,17 +2777,7 @@ static const unsigned short utf8_to_euc_E38A[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E38A_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2D73, 0x2D74, 0x2D75, 0x2D76,
- 0x2D77,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38C[] = {
+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,
@@ -2929,17 +2787,7 @@ static const unsigned short utf8_to_euc_E38C[] = {
       0,      0,      0,      0,      0,      0, 0x2D47,      0,
       0,      0,      0, 0x2D4F,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E38C_mac[] = {
-      0,      0,      0, 0x2E29,      0,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2E32,      0,      0,
-      0,      0,      0,      0, 0x2E24,      0,      0,      0,
- 0x2E2B,      0,      0,      0,      0,      0,      0,      0,
-      0,      0, 0x2E22, 0x2E34,      0,      0, 0x2E35, 0x2E2D,
-      0,      0,      0, 0x2E37,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2E2A,      0,
-      0,      0,      0, 0x2E36,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38D[] = {
+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,
@@ -2949,17 +2797,7 @@ static const unsigned short utf8_to_euc_E38D[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x2D5F, 0x2D6F, 0x2D6E, 0x2D6D,      0,
 };
-static const unsigned short utf8_to_euc_E38D_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0, 0x2E21, 0x2E2F,      0,      0, 0x2E23,      0,      0,
-      0, 0x2E2E,      0,      0,      0,      0,      0, 0x2E31,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0, 0x2E6A, 0x2E69, 0x2E68, 0x2E67,      0,
-};
-static const unsigned short utf8_to_euc_E38E[] = {
+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,
@@ -2969,17 +2807,7 @@ static const unsigned short utf8_to_euc_E38E[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E38E_mac[] = {
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0, 0x2B2B, 0x2B2D,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0, 0x2B21, 0x2B23, 0x2B29,      0,
-      0, 0x2B27,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E38F[] = {
+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,
@@ -2989,17 +2817,7 @@ static const unsigned short utf8_to_euc_E38F[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E38F_mac[] = {
-      0,      0,      0,      0, 0x2B2E,      0,      0,      0,
-      0,      0,      0,      0,      0, 0x2B7C,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-      0,      0,      0,      0,      0,      0,      0,      0,
-};
-static const unsigned short utf8_to_euc_E4B8[] = {
+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,
@@ -3009,7 +2827,7 @@ static const unsigned short utf8_to_euc_E4B8[] = {
  0xB02D, 0x5025, 0x367A,      0,      0, 0xB02E, 0x5026,      0,
  0x345D, 0x4330,      0, 0x3C67, 0x5027,      0,      0, 0x5028,
 };
-static const unsigned short utf8_to_euc_E4B9[] = {
+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,
@@ -3019,7 +2837,7 @@ static const unsigned short utf8_to_euc_E4B9[] = {
       0, 0x4D70,      0, 0x467D, 0xB039, 0xB03A,      0,      0,
       0, 0xB03B,      0,      0,      0,      0, 0x3425, 0xB03C,
 };
-static const unsigned short utf8_to_euc_E4BA[] = {
+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,
@@ -3029,7 +2847,7 @@ static const unsigned short utf8_to_euc_E4BA[] = {
  0x5037,      0,      0, 0x5038,      0,      0, 0x5039,      0,
       0, 0xB042, 0x3F4D,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E4BB[] = {
+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,
@@ -3039,7 +2857,7 @@ static const unsigned short utf8_to_euc_E4BB[] = {
  0x3644, 0xB04C, 0x4367, 0xB04D,      0, 0xB04E, 0x376F, 0x5043,
       0,      0,      0, 0x4724, 0xF42F, 0xB04F, 0xB050, 0xB051,
 };
-static const unsigned short utf8_to_euc_E4BC[] = {
+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,
@@ -3049,7 +2867,7 @@ static const unsigned short utf8_to_euc_E4BC[] = {
  0x5046, 0xB05E,      0, 0xB060, 0x483C, 0xB061, 0x4E62, 0xB062,
  0x3F2D, 0xB063, 0x3B47, 0xB064, 0x3B77, 0x3240, 0xB065,      0,
 };
-static const unsigned short utf8_to_euc_E4BD[] = {
+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,
@@ -3059,7 +2877,7 @@ static const unsigned short utf8_to_euc_E4BD[] = {
  0x5051, 0xB075,      0, 0x3242,      0, 0x4A3B, 0x504B, 0xB076,
  0xB077, 0xB078, 0xB079, 0x504F, 0x3873, 0xB07A, 0xB07B, 0x3B48,
 };
-static const unsigned short utf8_to_euc_E4BE[] = {
+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,
@@ -3069,7 +2887,7 @@ static const unsigned short utf8_to_euc_E4BE[] = {
       0,      0, 0xB12F,      0,      0, 0x3F2F, 0x4E37, 0xB130,
       0, 0xB131,      0, 0xB132, 0xB133, 0xB134, 0xB135, 0x4A58,
 };
-static const unsigned short utf8_to_euc_E4BF[] = {
+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,
@@ -3079,7 +2897,7 @@ static const unsigned short utf8_to_euc_E4BF[] = {
  0xB144,      0, 0xB145, 0x4750,      0, 0x4936, 0x5068,      0,
  0x4A70,      0, 0x3236,      0, 0xB146, 0xB147, 0x506C, 0xB148,
 };
-static const unsigned short utf8_to_euc_E580[] = {
+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,
@@ -3089,7 +2907,7 @@ static const unsigned short utf8_to_euc_E580[] = {
  0xB15B,      0, 0xB15C, 0xB15D,      0, 0xB15E, 0x3666,      0,
       0, 0x3770,      0, 0xB176,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E581[] = {
+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,
@@ -3099,7 +2917,7 @@ static const unsigned short utf8_to_euc_E581[] = {
  0xB174, 0xB175, 0x3C45,      0, 0x4226, 0x4465, 0x3676,      0,
  0x5079,      0,      0,      0,      0, 0x3536,      0,      0,
 };
-static const unsigned short utf8_to_euc_E582[] = {
+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,
@@ -3109,7 +2927,7 @@ static const unsigned short utf8_to_euc_E582[] = {
  0xB22E,      0, 0x507E, 0x5123, 0x507D, 0x3A44,      0, 0x3D7D,
       0, 0xB22F, 0xB230,      0,      0, 0xB231, 0x3739,      0,
 };
-static const unsigned short utf8_to_euc_E583[] = {
+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,
@@ -3119,7 +2937,7 @@ static const unsigned short utf8_to_euc_E583[] = {
       0, 0xB245, 0xB251,      0, 0xF430, 0x512C, 0xB246,      0,
       0, 0x512B, 0xB247, 0x4A48,      0,      0, 0xB248,      0,
 };
-static const unsigned short utf8_to_euc_E584[] = {
+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,
@@ -3129,7 +2947,7 @@ static const unsigned short utf8_to_euc_E584[] = {
       0, 0xB25F, 0x4C59, 0xB260, 0xB261, 0xB262,      0, 0x5136,
  0xB263, 0xB264, 0x5135, 0x5138, 0x5137,      0,      0, 0x5139,
 };
-static const unsigned short utf8_to_euc_E585[] = {
+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,
@@ -3139,7 +2957,7 @@ static const unsigned short utf8_to_euc_E585[] = {
       0, 0x3626,      0,      0,      0, 0x4A3C, 0x4236, 0x3671,
  0x4535,      0,      0,      0, 0x3773,      0, 0xB26F,      0,
 };
-static const unsigned short utf8_to_euc_E586[] = {
+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,
@@ -3149,7 +2967,7 @@ static const unsigned short utf8_to_euc_E586[] = {
  0x5156, 0x5154, 0x5155, 0x5153, 0x3A63, 0x5157, 0x4C6A, 0x4E64,
  0xB279,      0, 0xB27A,      0, 0xB27B, 0x5158, 0xB27C, 0xB27D,
 };
-static const unsigned short utf8_to_euc_E587[] = {
+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,
@@ -3159,7 +2977,7 @@ static const unsigned short utf8_to_euc_E587[] = {
  0x5160, 0x332E, 0xB32C, 0xB32D, 0xB32E, 0x5161, 0x3627, 0xB32F,
  0x464C, 0x317A, 0x3D50,      0,      0, 0x4821, 0x5162,      0,
 };
-static const unsigned short utf8_to_euc_E588[] = {
+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,
@@ -3169,7 +2987,7 @@ static const unsigned short utf8_to_euc_E588[] = {
  0x457E, 0xB33A, 0xB33B, 0x516A,      0, 0xB33C, 0x4029, 0x3A7E,
  0x3774, 0x516B, 0x3B49, 0x396F, 0xB33D,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E589[] = {
+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,
@@ -3179,7 +2997,7 @@ static const unsigned short utf8_to_euc_E589[] = {
  0x3E6A, 0x517B, 0x3364, 0x5175, 0x5173, 0x414F,      0, 0xB34A,
  0xB34B, 0xB34C,      0,      0,      0, 0x5177,      0, 0x5176,
 };
-static const unsigned short utf8_to_euc_E58A[] = {
+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,
@@ -3189,7 +3007,7 @@ static const unsigned short utf8_to_euc_E58A[] = {
  0xB35E, 0x4E65,      0,      0, 0x4F2B, 0x5225, 0xB35F, 0xB360,
  0xB361, 0x387A, 0xB362, 0xB363, 0x5224, 0xB364, 0x332F,      0,
 };
-static const unsigned short utf8_to_euc_E58B[] = {
+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,
@@ -3199,7 +3017,7 @@ static const unsigned short utf8_to_euc_E58B[] = {
  0xB376, 0xB377, 0x372E, 0x522E, 0xB378, 0x522F, 0xB379, 0xB37A,
  0x5230, 0x5231, 0x3C5B,      0,      0,      0, 0x387B, 0x4C5E,
 };
-static const unsigned short utf8_to_euc_E58C[] = {
+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,
@@ -3209,7 +3027,7 @@ static const unsigned short utf8_to_euc_E58C[] = {
  0xB430, 0x523C, 0xB431, 0x523D,      0, 0xB432,      0,      0,
  0x523E, 0x4924, 0x3668, 0x3065, 0xB433, 0xB434, 0xB435, 0x463F,
 };
-static const unsigned short utf8_to_euc_E58D[] = {
+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,
@@ -3219,7 +3037,7 @@ static const unsigned short utf8_to_euc_E58D[] = {
  0x3075, 0x346D, 0xB440, 0x4228, 0x3551, 0x4D71,      0, 0x524B,
  0x3237, 0xB441,      0, 0x524A,      0,      0, 0xB442, 0x362A,
 };
-static const unsigned short utf8_to_euc_E58E[] = {
+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,
@@ -3229,7 +3047,7 @@ static const unsigned short utf8_to_euc_E58E[] = {
  0x5252,      0, 0xB450, 0x3837, 0xB451, 0xB452, 0x5253, 0xB453,
  0xB454,      0, 0xB455, 0x356E,      0, 0xB456,      0,      0,
 };
-static const unsigned short utf8_to_euc_E58F[] = {
+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,
@@ -3239,7 +3057,7 @@ static const unsigned short utf8_to_euc_E58F[] = {
  0x4266, 0x3C38, 0x3B4B, 0x3126,      0, 0xB463, 0x3370, 0x3966,
  0x3B4A,      0, 0x525D,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E590[] = {
+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,
@@ -3249,7 +3067,7 @@ static const unsigned short utf8_to_euc_E590[] = {
       0, 0xB46C,      0,      0, 0xB46D, 0xB46E, 0x5265,      0,
  0x355B, 0x3F61,      0, 0x4A2D, 0x5263, 0x525F, 0x3863,      0,
 };
-static const unsigned short utf8_to_euc_E591[] = {
+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,
@@ -3259,7 +3077,7 @@ static const unsigned short utf8_to_euc_E591[] = {
  0x526F, 0x526D,      0, 0x4C23, 0xB47D, 0x526A, 0x5273, 0x526E,
       0,      0,      0, 0x5271, 0x3846, 0x4C3F,      0, 0xB47E,
 };
-static const unsigned short utf8_to_euc_E592[] = {
+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,
@@ -3269,7 +3087,7 @@ static const unsigned short utf8_to_euc_E592[] = {
       0, 0xB533, 0x3A69, 0x3331,      0,      0,      0, 0xB534,
  0x5279, 0xB535, 0xB536, 0xB537, 0x5325, 0x3076, 0x5324, 0xB538,
 };
-static const unsigned short utf8_to_euc_E593[] = {
+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,
@@ -3279,7 +3097,7 @@ static const unsigned short utf8_to_euc_E593[] = {
       0,      0, 0x452F,      0,      0,      0, 0xB541,      0,
       0,      0, 0x532E,      0, 0xB542, 0x532B, 0xB543, 0xB544,
 };
-static const unsigned short utf8_to_euc_E594[] = {
+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,
@@ -3289,7 +3107,7 @@ static const unsigned short utf8_to_euc_E594[] = {
       0, 0x3E27, 0xB550, 0x533A,      0, 0xB551, 0xB552,      0,
  0x5339, 0x5330,      0, 0xB553, 0xB554, 0xB555, 0x4243,      0,
 };
-static const unsigned short utf8_to_euc_E595[] = {
+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,
@@ -3299,7 +3117,7 @@ static const unsigned short utf8_to_euc_E595[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0x5341, 0x5346,      0, 0x5342, 0xB565,
 };
-static const unsigned short utf8_to_euc_E596[] = {
+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,
@@ -3309,7 +3127,7 @@ static const unsigned short utf8_to_euc_E596[] = {
  0x3674,      0, 0xB574,      0,      0,      0, 0x3144,      0,
       0,      0,      0,      0,      0,      0,      0, 0xB575,
 };
-static const unsigned short utf8_to_euc_E597[] = {
+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,
@@ -3319,7 +3137,7 @@ static const unsigned short utf8_to_euc_E597[] = {
       0,      0,      0,      0,      0,      0, 0xB628, 0x5353,
       0, 0x5358,      0,      0,      0, 0x5356, 0x5355, 0xB629,
 };
-static const unsigned short utf8_to_euc_E598[] = {
+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,
@@ -3329,7 +3147,7 @@ static const unsigned short utf8_to_euc_E598[] = {
  0xB635, 0x3E7C, 0x535E, 0xB636, 0x535C, 0xB637, 0x535D, 0xB638,
  0x535F, 0xB639,      0, 0xB63A, 0xB63B, 0xB63C,      0, 0xB63D,
 };
-static const unsigned short utf8_to_euc_E599[] = {
+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,
@@ -3339,7 +3157,7 @@ static const unsigned short utf8_to_euc_E599[] = {
       0, 0xB651, 0xB652,      0, 0x4A2E, 0xB653,      0,      0,
  0x4655,      0, 0x4838,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E59A[] = {
+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,
@@ -3349,7 +3167,7 @@ static const unsigned short utf8_to_euc_E59A[] = {
       0, 0xB666,      0, 0xB667, 0x536E,      0, 0x536D, 0xB668,
       0,      0,      0,      0, 0x5370,      0, 0xB669,      0,
 };
-static const unsigned short utf8_to_euc_E59B[] = {
+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,
@@ -3359,7 +3177,7 @@ static const unsigned short utf8_to_euc_E59B[] = {
  0x3A24, 0xB67C, 0x304F, 0x3F5E,      0,      0, 0xB721, 0xB722,
       0, 0x537A, 0x3847,      0,      0, 0x3971,      0, 0x537C,
 };
-static const unsigned short utf8_to_euc_E59C[] = {
+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,
@@ -3369,7 +3187,7 @@ static const unsigned short utf8_to_euc_E59C[] = {
  0x434F,      0,      0, 0xB737, 0xB738,      0,      0, 0x542A,
  0x542B,      0,      0, 0x542D,      0, 0xB739, 0xB73A, 0xB73B,
 };
-static const unsigned short utf8_to_euc_E59D[] = {
+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,
@@ -3379,7 +3197,7 @@ static const unsigned short utf8_to_euc_E59D[] = {
  0xB749, 0xB74A,      0, 0xB74B, 0xB74C, 0xB74D,      0, 0xB74E,
       0, 0xB74F, 0xB750, 0xB751, 0xB752,      0, 0xB753, 0x5434,
 };
-static const unsigned short utf8_to_euc_E59E[] = {
+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,
@@ -3389,7 +3207,7 @@ static const unsigned short utf8_to_euc_E59E[] = {
  0x543B,      0,      0, 0x5438,      0,      0,      0,      0,
  0xB765,      0,      0,      0,      0, 0xB766,      0,      0,
 };
-static const unsigned short utf8_to_euc_E59F[] = {
+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,
@@ -3399,7 +3217,7 @@ static const unsigned short utf8_to_euc_E59F[] = {
  0xB773,      0,      0,      0, 0x3E7D, 0xB774, 0xB775, 0x3C39,
  0xB776, 0x475D, 0x3470,      0, 0x3A6B, 0xB777, 0xB778, 0xB779,
 };
-static const unsigned short utf8_to_euc_E5A0[] = {
+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,
@@ -3409,7 +3227,7 @@ static const unsigned short utf8_to_euc_E5A0[] = {
  0x3161, 0x4A73, 0xB82A,      0, 0x3E6C, 0x4548,      0,      0,
       0, 0xB82B, 0x3A66,      0,      0, 0x544E,      0, 0xB82C,
 };
-static const unsigned short utf8_to_euc_E5A1[] = {
+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,
@@ -3419,7 +3237,7 @@ static const unsigned short utf8_to_euc_E5A1[] = {
  0x544B,      0, 0x5447,      0,      0, 0x3F50,      0,      0,
  0xB838, 0x544F,      0,      0, 0xB839,      0, 0x3D4E, 0xB83A,
 };
-static const unsigned short utf8_to_euc_E5A2[] = {
+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,
@@ -3429,7 +3247,7 @@ static const unsigned short utf8_to_euc_E5A2[] = {
       0, 0xB84D, 0xB84E, 0x4A2F,      0,      0,      0,      0,
  0x5457, 0x5451, 0x5454, 0x5456, 0xB850,      0, 0x3A26,      0,
 };
-static const unsigned short utf8_to_euc_E5A3[] = {
+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,
@@ -3439,7 +3257,7 @@ static const unsigned short utf8_to_euc_E5A3[] = {
  0x403C, 0x306D, 0x4764, 0xB85E,      0,      0,      0, 0x445B,
       0, 0x5465, 0x5464, 0x5466, 0x5467, 0x5468,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5A4[] = {
+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,
@@ -3449,7 +3267,7 @@ static const unsigned short utf8_to_euc_E5A4[] = {
  0xB86D, 0x3C3A, 0x5471, 0xB86E,      0, 0xB86F, 0xB870, 0x3050,
  0x5472,      0,      0,      0,      0,      0, 0x5473, 0xB871,
 };
-static const unsigned short utf8_to_euc_E5A5[] = {
+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,
@@ -3459,7 +3277,7 @@ static const unsigned short utf8_to_euc_E5A5[] = {
       0,      0, 0xB922, 0x3D77, 0x455B, 0xB923, 0xB924,      0,
  0x5521, 0xB925,      0, 0xB926, 0xB927, 0x3925,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5A6[] = {
+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,
@@ -3469,7 +3287,7 @@ static const unsigned short utf8_to_euc_E5A6[] = {
  0xB934,      0, 0x5527, 0xB935,      0,      0,      0, 0xB936,
       0, 0x4B65, 0xB937, 0x3A4A, 0xB938,      0, 0x3E2A,      0,
 };
-static const unsigned short utf8_to_euc_E5A7[] = {
+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,
@@ -3479,7 +3297,7 @@ static const unsigned short utf8_to_euc_E5A7[] = {
       0, 0xB948, 0xB949,      0, 0xB94A,      0, 0x3028, 0xB94B,
       0,      0,      0, 0x3079,      0,      0,      0, 0x3B51,
 };
-static const unsigned short utf8_to_euc_E5A8[] = {
+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,
@@ -3489,7 +3307,7 @@ static const unsigned short utf8_to_euc_E5A8[] = {
  0xB95A,      0,      0,      0,      0, 0x5537, 0x5538,      0,
       0,      0,      0,      0, 0x3E2B,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5A9[] = {
+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,
@@ -3499,7 +3317,7 @@ static const unsigned short utf8_to_euc_E5A9[] = {
       0,      0,      0,      0,      0,      0,      0, 0xB967,
       0,      0, 0xB968, 0xB969,      0,      0, 0xB96A, 0x4C3B,
 };
-static const unsigned short utf8_to_euc_E5AA[] = {
+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,
@@ -3509,7 +3327,7 @@ static const unsigned short utf8_to_euc_E5AA[] = {
       0, 0xB977, 0xB978, 0xB979,      0, 0xB97A,      0,      0,
  0xB97B,      0, 0xB97C, 0xB97D, 0x553C, 0x5540, 0x553D, 0xB97E,
 };
-static const unsigned short utf8_to_euc_E5AB[] = {
+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,
@@ -3519,7 +3337,7 @@ static const unsigned short utf8_to_euc_E5AB[] = {
       0,      0,      0,      0,      0, 0xBA2B, 0xBA2C,      0,
       0,      0, 0x5546, 0x5547,      0, 0xBA2D,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5AC[] = {
+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,
@@ -3529,7 +3347,7 @@ static const unsigned short utf8_to_euc_E5AC[] = {
  0x3145,      0, 0x554B,      0, 0xBA32,      0, 0x554E,      0,
  0xBA39,      0,      0,      0,      0,      0, 0x554F,      0,
 };
-static const unsigned short utf8_to_euc_E5AD[] = {
+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,
@@ -3539,7 +3357,7 @@ static const unsigned short utf8_to_euc_E5AD[] = {
  0x5559, 0x5623,      0, 0x555A,      0, 0x555B,      0,      0,
  0x555C,      0, 0x555E,      0, 0xBA43, 0xBA44, 0xBA45, 0xBA46,
 };
-static const unsigned short utf8_to_euc_E5AE[] = {
+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,
@@ -3549,7 +3367,7 @@ static const unsigned short utf8_to_euc_E5AE[] = {
  0x3A4B, 0xBA56, 0xBA57, 0x3332, 0x3163, 0x3E2C, 0x3248, 0xBA58,
  0x5562, 0x4D46, 0xBA59,      0, 0xBA5A,      0,      0, 0x3D49,
 };
-static const unsigned short utf8_to_euc_E5AF[] = {
+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,
@@ -3559,7 +3377,7 @@ static const unsigned short utf8_to_euc_E5AF[] = {
  0x556E, 0xBA66,      0, 0x5570, 0xBA67, 0x437E, 0x556F,      0,
  0x4023,      0, 0x3B7B,      0,      0, 0xBA68, 0x4250, 0x3C77,
 };
-static const unsigned short utf8_to_euc_E5B0[] = {
+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,
@@ -3569,7 +3387,7 @@ static const unsigned short utf8_to_euc_E5B0[] = {
  0xBA73, 0x3D22, 0xBA74,      0,      0, 0xBA75, 0xBA76,      0,
  0x5579, 0x557A, 0x3C5C, 0x3F2C, 0x4674, 0x3F54, 0x4878, 0x4722,
 };
-static const unsigned short utf8_to_euc_E5B1[] = {
+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,
@@ -3579,7 +3397,7 @@ static const unsigned short utf8_to_euc_E5B1[] = {
  0xBB22, 0x3B33,      0,      0, 0xBB23, 0xBB24, 0x5627,      0,
       0, 0x5628, 0xBB25, 0xBB26, 0xBB27, 0xBB28,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5B2[] = {
+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,
@@ -3589,7 +3407,7 @@ static const unsigned short utf8_to_euc_E5B2[] = {
       0, 0x4252, 0xBB35, 0x3359, 0xBB36, 0xBB37, 0x562F, 0x5631,
  0x345F,      0, 0xBB38, 0x562E, 0x5630,      0, 0x5633,      0,
 };
-static const unsigned short utf8_to_euc_E5B3[] = {
+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,
@@ -3599,7 +3417,7 @@ static const unsigned short utf8_to_euc_E5B3[] = {
  0x4A76, 0xBB3F, 0xBB40,      0, 0xBB41, 0xF43B, 0x4567,      0,
       0,      0, 0x5638, 0x3D54,      0, 0x5637,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5B4[] = {
+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,
@@ -3609,7 +3427,7 @@ static const unsigned short utf8_to_euc_E5B4[] = {
       0, 0xBB4B,      0,      0, 0xBB4C,      0,      0,      0,
       0, 0xBB4D,      0,      0,      0, 0xBB4E,      0, 0xBB4F,
 };
-static const unsigned short utf8_to_euc_E5B5[] = {
+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,
@@ -3619,7 +3437,7 @@ static const unsigned short utf8_to_euc_E5B5[] = {
  0xBB5F,      0,      0, 0x564D,      0,      0, 0x564E,      0,
       0, 0xBB60, 0xBB61,      0,      0,      0, 0xBB62, 0xBB63,
 };
-static const unsigned short utf8_to_euc_E5B6[] = {
+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,
@@ -3629,7 +3447,7 @@ static const unsigned short utf8_to_euc_E5B6[] = {
  0xBB72,      0, 0xE674,      0, 0xBB73,      0,      0, 0x5658,
  0xBB74, 0xBB75, 0x4E66,      0, 0x5659, 0x5656,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5B7[] = {
+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,
@@ -3639,7 +3457,7 @@ static const unsigned short utf8_to_euc_E5B7[] = {
       0, 0x384A, 0x5661, 0x4C26, 0x4743, 0x5662,      0, 0x392B,
  0xBC22, 0xBC23,      0, 0x342C,      0, 0x4327, 0x3652,      0,
 };
-static const unsigned short utf8_to_euc_E5B8[] = {
+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,
@@ -3649,7 +3467,7 @@ static const unsigned short utf8_to_euc_E5B8[] = {
  0x3522,      0, 0xBC2F, 0x4422,      0, 0xBC30, 0x5668, 0x5669,
  0x3E6F,      0,      0,      0,      0, 0x4B39, 0xBC31,      0,
 };
-static const unsigned short utf8_to_euc_E5B9[] = {
+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,
@@ -3659,7 +3477,7 @@ static const unsigned short utf8_to_euc_E5B9[] = {
  0xBC41,      0, 0x3433, 0x4A3F, 0x472F, 0x5674, 0x5675,      0,
  0x392C, 0x3434, 0x5676, 0x3838, 0x4D44, 0x4D29, 0x3476, 0x5678,
 };
-static const unsigned short utf8_to_euc_E5BA[] = {
+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,
@@ -3669,7 +3487,7 @@ static const unsigned short utf8_to_euc_E5BA[] = {
       0, 0xBC4B,      0, 0xBC4C,      0, 0x3043, 0x3D6E, 0x392F,
  0x4D47,      0,      0,      0,      0, 0xBC4D, 0xBC4E, 0xBC4F,
 };
-static const unsigned short utf8_to_euc_E5BB[] = {
+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,
@@ -3679,7 +3497,7 @@ static const unsigned short utf8_to_euc_E5BB[] = {
  0x572D, 0x572B,      0, 0x572C, 0x572E,      0, 0x3164, 0x446E,
  0x572F,      0, 0x377A, 0x3276, 0x4736,      0, 0x5730, 0x467B,
 };
-static const unsigned short utf8_to_euc_E5BC[] = {
+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,
@@ -3689,7 +3507,7 @@ static const unsigned short utf8_to_euc_E5BC[] = {
  0xBC6C, 0x3C65,      0,      0, 0xBC6D, 0x4425, 0xBC6E, 0x362F,
  0x573A,      0,      0, 0xBC6F, 0x492B, 0xBC70, 0x4346, 0xBC71,
 };
-static const unsigned short utf8_to_euc_E5BD[] = {
+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,
@@ -3699,7 +3517,7 @@ static const unsigned short utf8_to_euc_E5BD[] = {
  0x3E34, 0x3146, 0xBD22, 0x5746, 0xBD23, 0xBD24,      0, 0x5747,
  0xBD25, 0x4C72, 0xBD26,      0, 0x4860, 0xBD27, 0xBD28, 0x574A,
 };
-static const unsigned short utf8_to_euc_E5BE[] = {
+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,
@@ -3709,7 +3527,7 @@ static const unsigned short utf8_to_euc_E5BE[] = {
  0xBD35, 0xBD36,      0, 0x4641, 0x4427,      0,      0, 0xF43E,
  0xBD37, 0x4530,      0,      0, 0x5755, 0x352B,      0,      0,
 };
-static const unsigned short utf8_to_euc_E5BF[] = {
+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,
@@ -3719,7 +3537,7 @@ static const unsigned short utf8_to_euc_E5BF[] = {
  0x582D, 0x575A, 0xBD4C, 0xBD4D,      0, 0x4730, 0xBD4E,      0,
  0x5759,      0, 0xBD4F, 0x5757, 0xBD50, 0x397A,      0, 0x575D,
 };
-static const unsigned short utf8_to_euc_E680[] = {
+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,
@@ -3729,7 +3547,7 @@ static const unsigned short utf8_to_euc_E680[] = {
       0, 0x5764,      0, 0xBD5C,      0, 0xBD5D,      0,      0,
       0,      0, 0x576A,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E681[] = {
+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,
@@ -3739,7 +3557,7 @@ static const unsigned short utf8_to_euc_E681[] = {
  0x3366, 0xBD6A,      0,      0,      0, 0x3743,      0, 0x576E,
       0,      0,      0,      0,      0,      0, 0xBD6B, 0xBD6C,
 };
-static const unsigned short utf8_to_euc_E682[] = {
+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,
@@ -3749,7 +3567,7 @@ static const unsigned short utf8_to_euc_E682[] = {
  0xBD7C, 0xBD7D, 0x4861, 0x575C, 0x582C, 0x5830, 0x4C65, 0xBD7E,
  0x5829,      0,      0, 0xBE21, 0x4569, 0x582E, 0xBE22,      0,
 };
-static const unsigned short utf8_to_euc_E683[] = {
+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,
@@ -3759,7 +3577,7 @@ static const unsigned short utf8_to_euc_E683[] = {
  0x4246, 0x583D, 0xBE33, 0x415B, 0x5838, 0xBE34, 0x5835, 0x5836,
  0xBE35, 0x3C66, 0x5839, 0x583C, 0xBE36, 0xBE37,      0,      0,
 };
-static const unsigned short utf8_to_euc_E684[] = {
+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,
@@ -3769,7 +3587,7 @@ static const unsigned short utf8_to_euc_E684[] = {
  0xBE49, 0xBE4A,      0,      0, 0x5848, 0xBE4B, 0xBE4C, 0xBE4D,
       0, 0xBE4E,      0,      0, 0x5846, 0x5849, 0x5841, 0x5845,
 };
-static const unsigned short utf8_to_euc_E685[] = {
+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,
@@ -3779,7 +3597,7 @@ static const unsigned short utf8_to_euc_E685[] = {
  0x3056, 0x5855, 0xBE56, 0x584C, 0x5852, 0x5859, 0x3744, 0x584D,
  0xBE57,      0,      0, 0xBE58, 0xBE59,      0, 0x4D5D, 0xBE5A,
 };
-static const unsigned short utf8_to_euc_E686[] = {
+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,
@@ -3789,7 +3607,7 @@ static const unsigned short utf8_to_euc_E686[] = {
       0,      0, 0x377B,      0,      0,      0, 0x3231,      0,
  0xBE6D, 0xBE6E, 0x586B,      0, 0xBE6F,      0, 0x3438,      0,
 };
-static const unsigned short utf8_to_euc_E687[] = {
+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,
@@ -3799,7 +3617,7 @@ static const unsigned short utf8_to_euc_E687[] = {
       0,      0, 0x4428,      0, 0x5873,      0, 0x5871, 0x5867,
  0x377C,      0, 0x5872,      0, 0x5876, 0x5875, 0x5877, 0x5874,
 };
-static const unsigned short utf8_to_euc_E688[] = {
+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,
@@ -3809,7 +3627,7 @@ static const unsigned short utf8_to_euc_E688[] = {
  0x5925,      0, 0x5926, 0x5927, 0x4257,      0,      0,      0,
  0x384D, 0xBF31,      0, 0x4C61,      0, 0xBF32,      0, 0x4B3C,
 };
-static const unsigned short utf8_to_euc_E689[] = {
+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,
@@ -3819,7 +3637,7 @@ static const unsigned short utf8_to_euc_E689[] = {
       0, 0x3037,      0, 0xBF42,      0,      0, 0x495E,      0,
       0, 0x4863, 0xBF43,      0, 0x592F, 0xBF44, 0x5932, 0x3E35,
 };
-static const unsigned short utf8_to_euc_E68A[] = {
+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,
@@ -3829,7 +3647,7 @@ static const unsigned short utf8_to_euc_E68A[] = {
       0, 0x4A7A,      0, 0xBF4B,      0, 0x4471, 0xBF4C, 0xBF4D,
       0, 0x4B75, 0xBF4E, 0x593B, 0x3221, 0x436A, 0xBF4F, 0xBF50,
 };
-static const unsigned short utf8_to_euc_E68B[] = {
+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,
@@ -3839,7 +3657,7 @@ static const unsigned short utf8_to_euc_E68B[] = {
       0, 0x594A, 0xBF57, 0x377D, 0xBF58, 0x594F, 0x3B22, 0x3969,
       0,      0,      0,      0, 0xBF59, 0xBF5A, 0x3D26, 0x593D,
 };
-static const unsigned short utf8_to_euc_E68C[] = {
+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,
@@ -3849,7 +3667,7 @@ static const unsigned short utf8_to_euc_E68C[] = {
       0,      0,      0,      0,      0, 0xBF67, 0xBF68,      0,
       0, 0xBF69, 0x4472,      0, 0xBF6A, 0x4854, 0x5951, 0x415E,
 };
-static const unsigned short utf8_to_euc_E68D[] = {
+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,
@@ -3859,7 +3677,7 @@ static const unsigned short utf8_to_euc_E68D[] = {
       0, 0xBF7C, 0x377E,      0, 0xBF7D, 0xBF7E, 0x5959, 0x3E39,
  0xC021,      0, 0x4668, 0x4731, 0xC022, 0xC023,      0, 0xC024,
 };
-static const unsigned short utf8_to_euc_E68E[] = {
+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,
@@ -3869,7 +3687,7 @@ static const unsigned short utf8_to_euc_E68E[] = {
       0,      0, 0x3747,      0, 0x444F, 0x595E,      0,      0,
       0,      0,      0, 0x415F,      0, 0xC034, 0x5961,      0,
 };
-static const unsigned short utf8_to_euc_E68F[] = {
+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,
@@ -3879,7 +3697,7 @@ static const unsigned short utf8_to_euc_E68F[] = {
       0,      0, 0xC042, 0xC043, 0x3167, 0xC044, 0x5968,      0,
  0xC045, 0xC046, 0x4D49,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E690[] = {
+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,
@@ -3889,7 +3707,7 @@ static const unsigned short utf8_to_euc_E690[] = {
  0xC055,      0,      0,      0, 0x596B, 0xC056, 0x596F,      0,
       0,      0, 0x3748,      0,      0, 0xC057, 0x3A71, 0xC058,
 };
-static const unsigned short utf8_to_euc_E691[] = {
+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,
@@ -3899,7 +3717,7 @@ static const unsigned short utf8_to_euc_E691[] = {
       0,      0,      0, 0xC068, 0xC069,      0, 0x5976,      0,
  0x4C4E,      0, 0x4022, 0xC06A,      0, 0xC06B,      0,      0,
 };
-static const unsigned short utf8_to_euc_E692[] = {
+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,
@@ -3909,7 +3727,7 @@ static const unsigned short utf8_to_euc_E692[] = {
  0x4071,      0, 0x4B50, 0xC07B,      0,      0,      0,      0,
       0, 0x3349,      0, 0x5A25, 0x597E, 0xC07C, 0xC07D, 0xC07E,
 };
-static const unsigned short utf8_to_euc_E693[] = {
+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,
@@ -3919,7 +3737,7 @@ static const unsigned short utf8_to_euc_E693[] = {
  0xC130, 0x5A28, 0x5A33,      0, 0x5A32, 0xC131, 0x5A31, 0xC132,
       0,      0, 0x5A34, 0xC133,      0, 0x5A36, 0x3E71, 0xC134,
 };
-static const unsigned short utf8_to_euc_E694[] = {
+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,
@@ -3929,7 +3747,7 @@ static const unsigned short utf8_to_euc_E694[] = {
       0, 0xC146,      0,      0, 0x5A3D, 0x5A3E, 0x5A40, 0x5A3F,
  0x5A41, 0x327E, 0xC147, 0x3936, 0xC148, 0xC149, 0x4A7C, 0x402F,
 };
-static const unsigned short utf8_to_euc_E695[] = {
+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,
@@ -3939,7 +3757,7 @@ static const unsigned short utf8_to_euc_E695[] = {
  0x3F74,      0, 0x5A4A,      0, 0x4030, 0x4528,      0, 0x495F,
  0x5A4B,      0, 0xC154,      0,      0, 0xC155,      0,      0,
 };
-static const unsigned short utf8_to_euc_E696[] = {
+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,
@@ -3949,7 +3767,7 @@ static const unsigned short utf8_to_euc_E696[] = {
  0x3F37,      0, 0xC161, 0xC162, 0xC163,      0,      0, 0x5A52,
       0, 0x4A7D,      0,      0, 0x3177, 0x3B5C,      0, 0xC164,
 };
-static const unsigned short utf8_to_euc_E697[] = {
+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,
@@ -3959,7 +3777,7 @@ static const unsigned short utf8_to_euc_E697[] = {
  0xC16E, 0x5A5D, 0xC16F,      0, 0xC170, 0xC171,      0,      0,
       0, 0xC172, 0x3222, 0x5A61,      0,      0, 0xC173, 0xC174,
 };
-static const unsigned short utf8_to_euc_E698[] = {
+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,
@@ -3969,7 +3787,7 @@ static const unsigned short utf8_to_euc_E698[] = {
  0xC22C, 0xC22D,      0, 0xC22E, 0x5A65, 0x5A63, 0x5A64, 0xC230,
       0, 0xC22F,      0, 0xF442, 0x436B,      0,      0, 0x5B26,
 };
-static const unsigned short utf8_to_euc_E699[] = {
+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,
@@ -3979,7 +3797,7 @@ static const unsigned short utf8_to_euc_E699[] = {
  0x5A72,      0,      0, 0xC244, 0x4032, 0xC245, 0x3E3D, 0xC247,
  0xC248, 0xC249, 0x4352, 0xC24A, 0xC24C,      0, 0xC243, 0xC246,
 };
-static const unsigned short utf8_to_euc_E69A[] = {
+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,
@@ -3989,7 +3807,7 @@ static const unsigned short utf8_to_euc_E69A[] = {
       0, 0xC25A, 0xC25B,      0, 0x4B3D, 0xC25C,      0,      0,
  0x5B22, 0x5A7B,      0, 0xC25D, 0x5A7E,      0, 0x5A7D, 0xC25E,
 };
-static const unsigned short utf8_to_euc_E69B[] = {
+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,
@@ -3999,7 +3817,7 @@ static const unsigned short utf8_to_euc_E69B[] = {
  0x5B29,      0, 0x364A, 0x3148, 0x3939, 0x5B2A,      0, 0x5B2B,
  0x3D71, 0x4162, 0xC26D, 0xC23F, 0x5258, 0x413E, 0x413D, 0x4258,
 };
-static const unsigned short utf8_to_euc_E69C[] = {
+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,
@@ -4009,7 +3827,7 @@ static const unsigned short utf8_to_euc_E69C[] = {
       0, 0x3C6B,      0, 0xC276, 0x4B51,      0, 0x5B34, 0x5B37,
  0x5B36,      0, 0x3479,      0,      0, 0x3560, 0xC277, 0x5B33,
 };
-static const unsigned short utf8_to_euc_E69D[] = {
+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,
@@ -4019,7 +3837,7 @@ static const unsigned short utf8_to_euc_E69D[] = {
  0x5B3F, 0x456C, 0x5A5E, 0x5A62, 0xC324, 0x354F, 0xC325, 0x4747,
       0,      0,      0, 0xC326, 0x5B41,      0, 0x3E3E, 0x4844,
 };
-static const unsigned short utf8_to_euc_E69E[] = {
+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,
@@ -4029,7 +3847,7 @@ static const unsigned short utf8_to_euc_E69E[] = {
  0xC331, 0xC332, 0xC333, 0x5B4C, 0x5B4A, 0xC334, 0x324D, 0x5B48,
  0x5B4E, 0x5B54,      0, 0xC335, 0xC336, 0xC337,      0,      0,
 };
-static const unsigned short utf8_to_euc_E69F[] = {
+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,
@@ -4039,7 +3857,7 @@ static const unsigned short utf8_to_euc_E69F[] = {
  0xC345, 0x436C, 0xC346, 0x4C78, 0x3C46, 0x3A74, 0xC347, 0xC348,
       0, 0xC338,      0, 0x3A3A,      0,      0, 0x4B6F, 0x3341,
 };
-static const unsigned short utf8_to_euc_E6A0[] = {
+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,
@@ -4049,7 +3867,7 @@ static const unsigned short utf8_to_euc_E6A0[] = {
  0xC353, 0xC354, 0x5B5E, 0xC355, 0x4073,      0,      0,      0,
  0x334B, 0x3A2C,      0, 0xC356, 0x334A, 0x3A4F,      0, 0xC357,
 };
-static const unsigned short utf8_to_euc_E6A1[] = {
+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,
@@ -4059,7 +3877,7 @@ static const unsigned short utf8_to_euc_E6A1[] = {
  0xC363, 0xC364, 0xC365,      0, 0x5B6F, 0xC366, 0x3233, 0x5B64,
       0, 0xC367, 0xC368, 0xC369, 0xC36A,      0, 0x5B75, 0x5B65,
 };
-static const unsigned short utf8_to_euc_E6A2[] = {
+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,
@@ -4069,7 +3887,7 @@ static const unsigned short utf8_to_euc_E6A2[] = {
  0x3323, 0x3A2D, 0xC379, 0x5B60,      0, 0x5B70, 0x3361,      0,
       0, 0x5B6E, 0x5B72, 0xC37A, 0x456E,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6A3[] = {
+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,
@@ -4079,7 +3897,7 @@ static const unsigned short utf8_to_euc_E6A3[] = {
  0xC42E, 0xC42F, 0x4033,      0,      0, 0xC430, 0xC431,      0,
       0, 0x5C2A, 0x343D, 0xC432, 0xC433, 0xC434,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6A4[] = {
+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,
@@ -4089,7 +3907,7 @@ static const unsigned short utf8_to_euc_E6A4[] = {
  0x5C3F, 0xC43D,      0, 0xC43E, 0x464E, 0xC43F, 0x5C24,      0,
  0xC440, 0x5C3B,      0, 0xC441,      0, 0x5C3D,      0, 0x4458,
 };
-static const unsigned short utf8_to_euc_E6A5[] = {
+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,
@@ -4099,7 +3917,7 @@ static const unsigned short utf8_to_euc_E6A5[] = {
  0xC44F, 0xC450, 0xC451, 0x4760, 0x5C3C, 0x364B,      0, 0x5C34,
  0x5C36, 0x5C33, 0xC452, 0xC453, 0x4F30, 0x335A, 0x5C39, 0xC454,
 };
-static const unsigned short utf8_to_euc_E6A6[] = {
+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,
@@ -4109,7 +3927,7 @@ static const unsigned short utf8_to_euc_E6A6[] = {
       0, 0x5C63, 0x5C45,      0, 0x5C58,      0,      0, 0xC461,
  0xC462,      0, 0xC463, 0x5C50, 0xC464,      0, 0x5C4B, 0x5C48,
 };
-static const unsigned short utf8_to_euc_E6A7[] = {
+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,
@@ -4119,7 +3937,7 @@ static const unsigned short utf8_to_euc_E6A7[] = {
       0, 0xC46E, 0x5C60, 0xC46F,      0, 0xC470,      0,      0,
       0, 0x5C5F,      0, 0x4450,      0, 0x4165, 0xC471, 0x5C5D,
 };
-static const unsigned short utf8_to_euc_E6A8[] = {
+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,
@@ -4129,7 +3947,7 @@ static const unsigned short utf8_to_euc_E6A8[] = {
  0xC47D,      0, 0xC47E,      0, 0xC521, 0x3E41, 0x5C70, 0xC522,
  0x5C77, 0x3C79, 0x3372, 0xC523,      0, 0x432E, 0xC524, 0xC525,
 };
-static const unsigned short utf8_to_euc_E6A9[] = {
+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,
@@ -4139,7 +3957,7 @@ static const unsigned short utf8_to_euc_E6A9[] = {
       0, 0xC534, 0x5C6F, 0xC535,      0,      0,      0,      0,
  0x5C71,      0,      0,      0,      0,      0, 0xC536, 0x3360,
 };
-static const unsigned short utf8_to_euc_E6AA[] = {
+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,
@@ -4149,7 +3967,7 @@ static const unsigned short utf8_to_euc_E6AA[] = {
  0xC545, 0xC546,      0, 0x5D27, 0xC547,      0,      0,      0,
  0x5D26,      0,      0, 0x5D23,      0, 0xC548, 0xC549, 0xC54A,
 };
-static const unsigned short utf8_to_euc_E6AB[] = {
+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,
@@ -4159,7 +3977,7 @@ static const unsigned short utf8_to_euc_E6AB[] = {
  0xC558, 0xC559, 0xC55A,      0,      0,      0,      0,      0,
       0,      0, 0x5D32, 0x5D2F, 0xC55B, 0xC55C,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6AC[] = {
+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,
@@ -4169,7 +3987,7 @@ static const unsigned short utf8_to_euc_E6AC[] = {
       0,      0, 0x4D5F,      0,      0, 0xC56D, 0xC56E, 0x5D38,
  0x5D37, 0x5D3A, 0x353D, 0xC56F,      0, 0x3656, 0x343E, 0xC570,
 };
-static const unsigned short utf8_to_euc_E6AD[] = {
+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,
@@ -4179,7 +3997,7 @@ static const unsigned short utf8_to_euc_E6AD[] = {
  0xC57C,      0,      0, 0x3A50, 0x4E72, 0xC57D,      0,      0,
  0x5D45, 0x5D46,      0, 0x3B60,      0, 0xC57E, 0xC621, 0x5D47,
 };
-static const unsigned short utf8_to_euc_E6AE[] = {
+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,
@@ -4189,7 +4007,7 @@ static const unsigned short utf8_to_euc_E6AE[] = {
  0xC62F, 0x5D54, 0x5D53, 0x5D55, 0x3225, 0x434A,      0, 0x5D56,
  0xC630, 0xC631, 0x3B26, 0x334C, 0x5D57, 0xC632, 0xC633, 0x4542,
 };
-static const unsigned short utf8_to_euc_E6AF[] = {
+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,
@@ -4199,7 +4017,7 @@ static const unsigned short utf8_to_euc_E6AF[] = {
       0, 0xC63F,      0, 0x5D5E,      0,      0,      0, 0xC640,
       0, 0xC641,      0,      0,      0,      0,      0, 0xC642,
 };
-static const unsigned short utf8_to_euc_E6B0[] = {
+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,
@@ -4209,7 +4027,7 @@ static const unsigned short utf8_to_euc_E6B0[] = {
       0,      0,      0, 0xC652, 0x3F65, 0xC653, 0xC654, 0x4939,
  0x314A,      0, 0xC655, 0xC656,      0,      0, 0x4845, 0xC657,
 };
-static const unsigned short utf8_to_euc_E6B1[] = {
+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,
@@ -4219,7 +4037,7 @@ static const unsigned short utf8_to_euc_E6B1[] = {
  0x4241,      0, 0x3562, 0x5D72, 0xC664,      0, 0xC665,      0,
  0xC666, 0xC667, 0x3768, 0xC668,      0, 0x3525, 0x5D70,      0,
 };
-static const unsigned short utf8_to_euc_E6B2[] = {
+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,
@@ -4229,7 +4047,7 @@ static const unsigned short utf8_to_euc_E6B2[] = {
  0xC673, 0x5D7D, 0xC674, 0x324F, 0xC675,      0,      0,      0,
  0x4A28, 0x4C7D, 0x5E21, 0x3C23, 0x3E42, 0x5D78, 0x5D7E, 0x3168,
 };
-static const unsigned short utf8_to_euc_E6B3[] = {
+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,
@@ -4239,7 +4057,7 @@ static const unsigned short utf8_to_euc_E6B3[] = {
  0x4259, 0x5D76, 0xC729, 0x314B, 0xC72A,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6B4[] = {
+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,
@@ -4249,7 +4067,7 @@ static const unsigned short utf8_to_euc_E6B4[] = {
       0, 0xC739, 0x3D27, 0x5E2E,      0, 0x5E2D, 0x5E28,      0,
  0x5E2B, 0xC73A,      0, 0x3368, 0xC73B, 0x5E2A, 0x4749, 0xC73C,
 };
-static const unsigned short utf8_to_euc_E6B5[] = {
+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,
@@ -4259,7 +4077,7 @@ static const unsigned short utf8_to_euc_E6B5[] = {
  0xC744,      0,      0,      0, 0x4D61,      0,      0, 0x3324,
  0x3F3B, 0x5E35,      0,      0, 0xC745,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6B6[] = {
+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,
@@ -4269,7 +4087,7 @@ static const unsigned short utf8_to_euc_E6B6[] = {
       0,      0, 0x3155,      0, 0xC750, 0x5E3E,      0, 0xC751,
  0x5E41, 0xC752,      0,      0, 0x4E43, 0xC753,      0, 0xC754,
 };
-static const unsigned short utf8_to_euc_E6B7[] = {
+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,
@@ -4279,7 +4097,7 @@ static const unsigned short utf8_to_euc_E6B7[] = {
  0xC763, 0x3F3C, 0xF44C, 0x3D5F, 0xC764, 0x4A25, 0xC765, 0x3A2E,
  0xF44B, 0x5E3B, 0x5E49, 0x453A, 0xC766,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6B8[] = {
+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,
@@ -4289,7 +4107,7 @@ static const unsigned short utf8_to_euc_E6B8[] = {
       0,      0, 0xC76C,      0,      0,      0, 0xC76D,      0,
  0x5E62, 0xC76E, 0x5E5D, 0xC76F, 0xC770,      0, 0x5E55,      0,
 };
-static const unsigned short utf8_to_euc_E6B9[] = {
+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,
@@ -4299,7 +4117,7 @@ static const unsigned short utf8_to_euc_E6B9[] = {
       0,      0, 0x5E53, 0xC824,      0,      0, 0x5E59,      0,
       0,      0,      0, 0xC825,      0, 0xC826, 0x4F51, 0x3C3E,
 };
-static const unsigned short utf8_to_euc_E6BA[] = {
+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,
@@ -4309,7 +4127,7 @@ static const unsigned short utf8_to_euc_E6BA[] = {
       0, 0xC82E, 0x5E6C, 0xC82F,      0,      0, 0x4D4F, 0x5E67,
       0,      0, 0x452E, 0xC830,      0, 0x5E69,      0, 0xC831,
 };
-static const unsigned short utf8_to_euc_E6BB[] = {
+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,
@@ -4319,7 +4137,7 @@ static const unsigned short utf8_to_euc_E6BB[] = {
       0,      0, 0x5E7A,      0, 0x4529,      0,      0, 0x5F23,
  0x5E77, 0xC83E,      0, 0xC83F,      0, 0xC840, 0x5E78, 0x5E60,
 };
-static const unsigned short utf8_to_euc_E6BC[] = {
+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,
@@ -4329,7 +4147,7 @@ static const unsigned short utf8_to_euc_E6BC[] = {
  0xC84E, 0x5E7B, 0x5E7D, 0xC84F,      0,      0, 0xC850,      0,
  0x4132,      0,      0, 0xC851, 0xC852,      0, 0x5F21, 0x5E79,
 };
-static const unsigned short utf8_to_euc_E6BD[] = {
+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,
@@ -4339,7 +4157,7 @@ static const unsigned short utf8_to_euc_E6BD[] = {
  0x4459,      0,      0,      0, 0x5F4C,      0,      0,      0,
  0x5F26,      0, 0x5F25,      0, 0x5F2E, 0xC861, 0xC862,      0,
 };
-static const unsigned short utf8_to_euc_E6BE[] = {
+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,
@@ -4349,7 +4167,7 @@ static const unsigned short utf8_to_euc_E6BE[] = {
  0xC877, 0x4543,      0, 0x5F34,      0, 0xC878, 0xC879,      0,
       0, 0x5F38,      0,      0, 0xC87A,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E6BF[] = {
+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,
@@ -4359,7 +4177,7 @@ static const unsigned short utf8_to_euc_E6BF[] = {
  0xC925, 0x5F40,      0, 0x5F2B,      0, 0xC926, 0x6F69,      0,
       0, 0xC927, 0x5F45,      0, 0xC928, 0xC929, 0x5F49,      0,
 };
-static const unsigned short utf8_to_euc_E780[] = {
+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,
@@ -4369,7 +4187,7 @@ static const unsigned short utf8_to_euc_E780[] = {
  0x5F50,      0, 0x5F52,      0, 0xC933,      0,      0, 0xC934,
       0, 0xC935,      0,      0, 0xC936,      0, 0x5F51,      0,
 };
-static const unsigned short utf8_to_euc_E781[] = {
+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,
@@ -4379,7 +4197,7 @@ static const unsigned short utf8_to_euc_E781[] = {
  0x3325,      0,      0,      0,      0, 0xC946, 0xC947,      0,
  0x3564,      0,      0,      0, 0x3C5E, 0x3A52, 0xC948,      0,
 };
-static const unsigned short utf8_to_euc_E782[] = {
+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,
@@ -4389,7 +4207,7 @@ static const unsigned short utf8_to_euc_E782[] = {
  0xC954, 0xC955,      0, 0x5F5B, 0xC956,      0,      0, 0xC957,
  0x5F5A, 0x4540, 0x3059, 0xF42E,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E783[] = {
+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,
@@ -4399,7 +4217,7 @@ static const unsigned short utf8_to_euc_E783[] = {
       0, 0x5F58,      0,      0,      0,      0,      0,      0,
       0, 0x4B23, 0xC961,      0,      0, 0x5F62,      0,      0,
 };
-static const unsigned short utf8_to_euc_E784[] = {
+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,
@@ -4409,7 +4227,7 @@ static const unsigned short utf8_to_euc_E784[] = {
  0xC96F, 0xC970,      0,      0,      0,      0, 0x4133,      0,
  0xC971,      0,      0,      0, 0x3E46,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E785[] = {
+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,
@@ -4419,7 +4237,7 @@ static const unsigned short utf8_to_euc_E785[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0, 0xCA22,      0,      0,      0, 0x407A,      0,      0,
 };
-static const unsigned short utf8_to_euc_E786[] = {
+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,
@@ -4429,7 +4247,7 @@ static const unsigned short utf8_to_euc_E786[] = {
  0xCA2D, 0x472E, 0xCA2E, 0xCA2F,      0,      0,      0,      0,
       0, 0x5F74, 0xCA30,      0,      0,      0, 0x5F75, 0xCA31,
 };
-static const unsigned short utf8_to_euc_E787[] = {
+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,
@@ -4439,7 +4257,7 @@ static const unsigned short utf8_to_euc_E787[] = {
       0,      0,      0,      0,      0, 0x5F7D,      0,      0,
  0xCA3C, 0x6021,      0, 0x5F6E, 0x5F7E,      0, 0xCA3D, 0x6022,
 };
-static const unsigned short utf8_to_euc_E788[] = {
+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,
@@ -4449,7 +4267,7 @@ static const unsigned short utf8_to_euc_E788[] = {
  0x6029,      0, 0x602A,      0, 0xCA4A, 0x3C5F, 0x4963,      0,
  0xCA4B, 0xCA4C, 0x4C6C, 0x602B, 0x602C, 0x4156, 0x3C24, 0x602D,
 };
-static const unsigned short utf8_to_euc_E789[] = {
+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,
@@ -4459,7 +4277,7 @@ static const unsigned short utf8_to_euc_E789[] = {
       0, 0xCA60, 0x4037,      0, 0x6032,      0,      0, 0xCA61,
  0xCA62, 0x4643,      0, 0xCA63, 0xCA64, 0x3823, 0x6033, 0xCA65,
 };
-static const unsigned short utf8_to_euc_E78A[] = {
+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,
@@ -4469,7 +4287,7 @@ static const unsigned short utf8_to_euc_E78A[] = {
       0, 0xCA6F, 0x603C,      0, 0xCA70,      0, 0x3E75,      0,
       0, 0x603B,      0,      0,      0,      0, 0xCA71,      0,
 };
-static const unsigned short utf8_to_euc_E78B[] = {
+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,
@@ -4479,7 +4297,7 @@ static const unsigned short utf8_to_euc_E78B[] = {
       0,      0,      0, 0xCA7B, 0xCA7C,      0,      0, 0x6046,
  0x432C, 0x6045, 0xCA7D, 0xCA7E, 0x4F35, 0x4762, 0xCB21,      0,
 };
-static const unsigned short utf8_to_euc_E78C[] = {
+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,
@@ -4489,7 +4307,7 @@ static const unsigned short utf8_to_euc_E78C[] = {
       0, 0xCB32, 0xCB33,      0, 0x604D, 0xCB34, 0x4D31, 0x4D32,
       0,      0, 0xCB35, 0xCB36,      0, 0xCB37, 0x6051, 0x316E,
 };
-static const unsigned short utf8_to_euc_E78D[] = {
+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,
@@ -4499,7 +4317,7 @@ static const unsigned short utf8_to_euc_E78D[] = {
  0x6058, 0xCB49, 0x334D,      0,      0, 0x605A,      0, 0xCB4A,
  0x6059, 0xCB4B, 0x605C, 0x605B, 0xCB4C,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E78E[] = {
+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,
@@ -4509,7 +4327,7 @@ static const unsigned short utf8_to_euc_E78E[] = {
       0,      0, 0x4E68, 0x605E,      0, 0xCB62,      0, 0xCB63,
       0, 0xCB64,      0, 0x6060, 0xCB65, 0xCB66,      0, 0xCB67,
 };
-static const unsigned short utf8_to_euc_E78F[] = {
+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,
@@ -4519,7 +4337,7 @@ static const unsigned short utf8_to_euc_E78F[] = {
       0, 0x607E,      0,      0, 0xCB78, 0xCB79,      0, 0xCB7A,
  0x6069, 0xCB7B, 0xCB7C, 0xCB7D,      0, 0xCB7E, 0x383D, 0xCC21,
 };
-static const unsigned short utf8_to_euc_E790[] = {
+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,
@@ -4529,7 +4347,7 @@ static const unsigned short utf8_to_euc_E790[] = {
  0xCC34, 0xCC35, 0x606A, 0x4E56, 0x3657, 0x487C, 0x474A,      0,
       0, 0xCC36, 0x606B,      0,      0,      0,      0, 0x606D,
 };
-static const unsigned short utf8_to_euc_E791[] = {
+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,
@@ -4539,7 +4357,7 @@ static const unsigned short utf8_to_euc_E791[] = {
  0x6073, 0xCC49, 0xCC4A, 0x3A3C,      0,      0, 0x6076,      0,
       0,      0,      0,      0,      0,      0, 0x6077,      0,
 };
-static const unsigned short utf8_to_euc_E792[] = {
+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,
@@ -4549,7 +4367,7 @@ static const unsigned short utf8_to_euc_E792[] = {
  0x3444, 0xCC64, 0xCC65,      0,      0, 0xCC66,      0,      0,
       0, 0xCC67,      0, 0xCC68,      0, 0x3C25,      0, 0xCC69,
 };
-static const unsigned short utf8_to_euc_E793[] = {
+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,
@@ -4559,7 +4377,7 @@ static const unsigned short utf8_to_euc_E793[] = {
  0x6127, 0x6128, 0x6126,      0, 0xCC79,      0, 0x4953, 0x612A,
  0x6129,      0, 0xCC7A, 0xCC7B, 0xCC7C,      0,      0, 0xCC7D,
 };
-static const unsigned short utf8_to_euc_E794[] = {
+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,
@@ -4569,7 +4387,7 @@ static const unsigned short utf8_to_euc_E794[] = {
  0x4544, 0x4D33, 0x3943, 0x3F3D,      0,      0, 0xCD2B, 0x434B,
  0x5234, 0xCD2C, 0x442E, 0x3268, 0x6136, 0xCD2D, 0xCD2E, 0xCD2F,
 };
-static const unsigned short utf8_to_euc_E795[] = {
+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,
@@ -4579,7 +4397,7 @@ static const unsigned short utf8_to_euc_E795[] = {
  0x305B, 0xCD3C,      0, 0x3E76, 0x6147,      0, 0x6144, 0x466D,
  0x6143, 0xCD3D, 0xCD3E, 0xCD3F, 0xCD40, 0xCD41, 0xCD42, 0x3526,
 };
-static const unsigned short utf8_to_euc_E796[] = {
+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,
@@ -4589,7 +4407,7 @@ static const unsigned short utf8_to_euc_E796[] = {
       0, 0x6157, 0x4868, 0x6151, 0xCD4D, 0x6153,      0,      0,
  0x6155, 0x3F3E, 0xCD4E,      0, 0x6156, 0x6154, 0x3C40, 0xCD4F,
 };
-static const unsigned short utf8_to_euc_E797[] = {
+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,
@@ -4599,7 +4417,7 @@ static const unsigned short utf8_to_euc_E797[] = {
  0x6162, 0xCD61, 0x6164, 0x6165, 0x4354,      0,      0,      0,
       0, 0xCD62, 0x6163,      0, 0x6160,      0, 0x615E, 0x615F,
 };
-static const unsigned short utf8_to_euc_E798[] = {
+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,
@@ -4609,7 +4427,7 @@ static const unsigned short utf8_to_euc_E798[] = {
  0x6170,      0, 0xCD7A, 0xCD7B, 0x616F, 0xCD7C,      0,      0,
  0xCD7D, 0xCD7E, 0xCE21, 0x6171, 0xCE22,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E799[] = {
+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,
@@ -4619,7 +4437,7 @@ static const unsigned short utf8_to_euc_E799[] = {
  0x617E, 0xCE33, 0x6221,      0, 0xCE34,      0, 0x6222,      0,
  0x6223,      0, 0x482F, 0x4550, 0x6224, 0x4772, 0x4934,      0,
 };
-static const unsigned short utf8_to_euc_E79A[] = {
+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,
@@ -4629,7 +4447,7 @@ static const unsigned short utf8_to_euc_E79A[] = {
  0x622E,      0,      0,      0, 0x622F,      0,      0, 0x7369,
  0x6230, 0x6231, 0x6232,      0,      0, 0xCE48,      0, 0x3B2E,
 };
-static const unsigned short utf8_to_euc_E79B[] = {
+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,
@@ -4639,7 +4457,7 @@ static const unsigned short utf8_to_euc_E79B[] = {
  0xCE55, 0xCE56, 0x4C55,      0, 0x443E,      0, 0xCE57,      0,
  0x416A, 0xCE58,      0, 0x623D, 0xCE59,      0, 0x3D62,      0,
 };
-static const unsigned short utf8_to_euc_E79C[] = {
+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,
@@ -4649,7 +4467,7 @@ static const unsigned short utf8_to_euc_E79C[] = {
       0,      0,      0,      0, 0xCE6A, 0xCE6B, 0xCE6C, 0x6247,
  0x6248, 0xCE6D, 0x442F,      0, 0x3463, 0xCE6E, 0xCE6F,      0,
 };
-static const unsigned short utf8_to_euc_E79D[] = {
+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,
@@ -4659,7 +4477,7 @@ static const unsigned short utf8_to_euc_E79D[] = {
  0xCF25,      0, 0xCF26, 0xCF27, 0xCF28,      0,      0,      0,
       0, 0x6251, 0xCF29,      0,      0, 0xCF2A, 0x6250, 0x624F,
 };
-static const unsigned short utf8_to_euc_E79E[] = {
+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,
@@ -4669,7 +4487,7 @@ static const unsigned short utf8_to_euc_E79E[] = {
  0x6257, 0xCF39,      0, 0x4637,      0, 0xCF3A, 0x6258,      0,
       0, 0x6259,      0, 0x625D, 0x625B, 0x625C, 0xCF3B, 0x625A,
 };
-static const unsigned short utf8_to_euc_E79F[] = {
+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,
@@ -4679,7 +4497,7 @@ static const unsigned short utf8_to_euc_E79F[] = {
  0xCF49, 0xCF4A,      0, 0x4050, 0xCF4B,      0,      0,      0,
  0xCF4C,      0,      0, 0xCF4D, 0x6265,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7A0[] = {
+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,
@@ -4689,7 +4507,7 @@ static const unsigned short utf8_to_euc_E7A0[] = {
  0xCF5A,      0, 0x4B24,      0, 0x474B, 0xCF5B,      0, 0xCF5C,
       0,      0, 0x4557,      0,      0,      0,      0, 0x395C,
 };
-static const unsigned short utf8_to_euc_E7A1[] = {
+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,
@@ -4699,7 +4517,7 @@ static const unsigned short utf8_to_euc_E7A1[] = {
       0,      0, 0x4823,      0, 0x626D,      0,      0,      0,
       0,      0, 0xCF6D,      0, 0x626F,      0, 0xCF6E,      0,
 };
-static const unsigned short utf8_to_euc_E7A2[] = {
+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,
@@ -4709,7 +4527,7 @@ static const unsigned short utf8_to_euc_E7A2[] = {
  0xCF7B, 0xCF7C, 0xCF7D, 0xCF7E,      0, 0x6273,      0,      0,
       0,      0, 0x334E, 0xD021, 0x627B, 0xD022, 0x627A, 0xD023,
 };
-static const unsigned short utf8_to_euc_E7A3[] = {
+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,
@@ -4719,7 +4537,7 @@ static const unsigned short utf8_to_euc_E7A3[] = {
       0,      0, 0xD034, 0xD035, 0x6324,      0, 0xD037, 0xD038,
       0,      0, 0xD039, 0xD03A,      0, 0x6323,      0, 0xD03B,
 };
-static const unsigned short utf8_to_euc_E7A4[] = {
+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,
@@ -4729,7 +4547,7 @@ static const unsigned short utf8_to_euc_E7A4[] = {
  0xF454, 0xD048,      0,      0, 0xD049, 0xD04A,      0,      0,
       0,      0, 0x3C28, 0xD04B, 0x4E69, 0xD04C, 0x3C52, 0xD04D,
 };
-static const unsigned short utf8_to_euc_E7A5[] = {
+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,
@@ -4739,7 +4557,7 @@ static const unsigned short utf8_to_euc_E7A5[] = {
       0,      0, 0xD05C,      0,      0,      0,      0, 0x4578,
       0, 0xD05D, 0x6332, 0xD05E, 0xD05F,      0, 0xD060, 0x6333,
 };
-static const unsigned short utf8_to_euc_E7A6[] = {
+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,
@@ -4749,7 +4567,7 @@ static const unsigned short utf8_to_euc_E7A6[] = {
  0x4729, 0xD070,      0, 0x633A, 0xD071,      0,      0,      0,
  0xD072, 0x633B, 0x633C, 0xD073,      0, 0x3659, 0x3253, 0x4645,
 };
-static const unsigned short utf8_to_euc_E7A7[] = {
+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,
@@ -4759,7 +4577,7 @@ static const unsigned short utf8_to_euc_E7A7[] = {
  0x3E4E, 0xD127,      0,      0,      0,      0,      0,      0,
  0xD128,      0,      0, 0x305C, 0xD129,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7A8[] = {
+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,
@@ -4769,7 +4587,7 @@ static const unsigned short utf8_to_euc_E7A8[] = {
  0xD139, 0x634A, 0x3070,      0, 0xD13A, 0xD13B,      0, 0x634D,
  0xD13C, 0xD13D, 0xD13E, 0x634B, 0x3254, 0x374E, 0x634C, 0x3946,
 };
-static const unsigned short utf8_to_euc_E7A9[] = {
+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,
@@ -4779,7 +4597,7 @@ static const unsigned short utf8_to_euc_E7A9[] = {
  0x6355,      0,      0,      0, 0x376A, 0xD14F, 0x3566,      0,
  0xD150, 0x6356, 0x3675,      0,      0, 0x6357, 0xD151, 0x407C,
 };
-static const unsigned short utf8_to_euc_E7AA[] = {
+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,
@@ -4789,7 +4607,7 @@ static const unsigned short utf8_to_euc_E7AA[] = {
  0x635F,      0,      0, 0xD15F,      0, 0xD160, 0x6360,      0,
       0, 0xD161, 0x312E, 0xD162, 0xD163,      0,      0, 0x6363,
 };
-static const unsigned short utf8_to_euc_E7AB[] = {
+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,
@@ -4799,7 +4617,7 @@ static const unsigned short utf8_to_euc_E7AB[] = {
  0x6372, 0xD16E,      0,      0, 0xD16F,      0, 0x3625,      0,
  0x513F, 0x435D, 0x3C33, 0xD170,      0, 0xD171, 0xD172, 0x3448,
 };
-static const unsigned short utf8_to_euc_E7AC[] = {
+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,
@@ -4809,7 +4627,7 @@ static const unsigned short utf8_to_euc_E7AC[] = {
  0xD17E, 0xD221,      0, 0x6377, 0xD222, 0x637B, 0x637D,      0,
       0, 0x3A7B,      0,      0,      0, 0xD223,      0, 0xD224,
 };
-static const unsigned short utf8_to_euc_E7AD[] = {
+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,
@@ -4819,7 +4637,7 @@ static const unsigned short utf8_to_euc_E7AD[] = {
  0x642B, 0x642C, 0xD231, 0xD232, 0x6429, 0x6427,      0, 0xD233,
       0,      0, 0x6421,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7AE[] = {
+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,
@@ -4829,7 +4647,7 @@ static const unsigned short utf8_to_euc_E7AE[] = {
  0xD240, 0x4822, 0xD241,      0, 0x643E, 0xD242, 0xD243,      0,
  0x4824,      0, 0xD244, 0xD245, 0xD246, 0xD247,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7AF[] = {
+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,
@@ -4839,7 +4657,7 @@ static const unsigned short utf8_to_euc_E7AF[] = {
       0,      0, 0xD254, 0x644A, 0xD255, 0xD256, 0x644E, 0x644B,
  0xD257, 0xD258, 0xD259,      0, 0xD25A,      0, 0xD25B,      0,
 };
-static const unsigned short utf8_to_euc_E7B0[] = {
+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,
@@ -4849,7 +4667,7 @@ static const unsigned short utf8_to_euc_E7B0[] = {
       0, 0xD26D,      0, 0xD26E, 0xD26F,      0, 0xD270, 0x6453,
  0x4876, 0xD271, 0xD272,      0,      0, 0x6455, 0x4E7C, 0x4A6D,
 };
-static const unsigned short utf8_to_euc_E7B1[] = {
+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,
@@ -4859,7 +4677,7 @@ static const unsigned short utf8_to_euc_E7B1[] = {
  0xD327,      0, 0xD328, 0x4A46,      0, 0x6462,      0,      0,
       0, 0xD329,      0,      0, 0xD32A, 0xD32B, 0x4C62,      0,
 };
-static const unsigned short utf8_to_euc_E7B2[] = {
+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,
@@ -4869,7 +4687,7 @@ static const unsigned short utf8_to_euc_E7B2[] = {
  0xD333, 0x646D, 0x646C, 0x646B,      0,      0, 0xD334, 0xD335,
       0, 0x646F, 0xD336, 0xD337, 0xD338, 0x6470, 0x403A, 0xD339,
 };
-static const unsigned short utf8_to_euc_E7B3[] = {
+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,
@@ -4879,7 +4697,7 @@ static const unsigned short utf8_to_euc_E7B3[] = {
       0,      0, 0x647A,      0, 0x647B, 0xD34A, 0x647C,      0,
  0x3B65,      0, 0x647D, 0x374F,      0,      0, 0x356A,      0,
 };
-static const unsigned short utf8_to_euc_E7B4[] = {
+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,
@@ -4889,7 +4707,7 @@ static const unsigned short utf8_to_euc_E7B4[] = {
  0x3A59, 0xD35A, 0x6528, 0x3F42,      0, 0x652A,      0,      0,
       0, 0x3E52, 0x3A30,      0, 0xD35B, 0xD35C, 0xD35D, 0x6529,
 };
-static const unsigned short utf8_to_euc_E7B5[] = {
+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,
@@ -4899,7 +4717,7 @@ static const unsigned short utf8_to_euc_E7B5[] = {
  0xD36D, 0x457D, 0x652F, 0x652C,      0, 0x3328, 0x4064,      0,
  0xD36E, 0x3828, 0xD36F, 0xD370,      0, 0x6538,      0, 0xD371,
 };
-static const unsigned short utf8_to_euc_E7B6[] = {
+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,
@@ -4909,7 +4727,7 @@ static const unsigned short utf8_to_euc_E7B6[] = {
  0x6547, 0x394B, 0x4C56, 0xD425, 0x4456, 0x653D, 0xD426, 0xD427,
  0x6545, 0xD428, 0x653A, 0x433E,      0, 0x653F, 0x303D, 0x4C4A,
 };
-static const unsigned short utf8_to_euc_E7B7[] = {
+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,
@@ -4919,7 +4737,7 @@ static const unsigned short utf8_to_euc_E7B7[] = {
       0, 0xD43A, 0x654D,      0, 0x4E7D, 0xD43B, 0xD43C,      0,
       0, 0xD43D, 0xD43E, 0x654C,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7B8[] = {
+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,
@@ -4929,7 +4747,7 @@ static const unsigned short utf8_to_euc_E7B8[] = {
       0, 0x6554, 0x6560, 0xD44C,      0, 0x655C, 0xD44D, 0x655F,
       0, 0x655D, 0x6561, 0x655B,      0, 0x6541, 0x4053, 0xD44E,
 };
-static const unsigned short utf8_to_euc_E7B9[] = {
+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,
@@ -4939,7 +4757,7 @@ static const unsigned short utf8_to_euc_E7B9[] = {
  0x372B,      0,      0, 0xD45D,      0,      0,      0,      0,
  0xD45E, 0x6568,      0, 0x656C, 0x656B, 0x656F, 0xD45F, 0x6571,
 };
-static const unsigned short utf8_to_euc_E7BA[] = {
+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,
@@ -4949,7 +4767,7 @@ static const unsigned short utf8_to_euc_E7BA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E7BC[] = {
+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,
@@ -4959,7 +4777,7 @@ static const unsigned short utf8_to_euc_E7BC[] = {
       0,      0,      0,      0,      0,      0, 0x344C,      0,
  0x657D,      0, 0x657E, 0xD46C, 0xD46B, 0xD46D, 0xD46E, 0xD46F,
 };
-static const unsigned short utf8_to_euc_E7BD[] = {
+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,
@@ -4969,7 +4787,7 @@ static const unsigned short utf8_to_euc_E7BD[] = {
  0x4833, 0xD521, 0x3D70,      0,      0, 0x474D,      0, 0x486D,
  0x662F, 0x586D,      0,      0,      0, 0xD522, 0xD523, 0xD524,
 };
-static const unsigned short utf8_to_euc_E7BE[] = {
+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,
@@ -4979,7 +4797,7 @@ static const unsigned short utf8_to_euc_E7BE[] = {
       0,      0, 0x663C,      0, 0xD533,      0, 0x663F,      0,
  0x6640, 0x663D,      0,      0, 0xD534, 0x3129,      0, 0xD535,
 };
-static const unsigned short utf8_to_euc_E7BF[] = {
+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,
@@ -4989,7 +4807,7 @@ static const unsigned short utf8_to_euc_E7BF[] = {
  0x344D,      0, 0xD543, 0x664A,      0,      0,      0,      0,
       0, 0x664B, 0xD544, 0x4B5D, 0x4D63, 0xD545, 0xD546, 0xD547,
 };
-static const unsigned short utf8_to_euc_E880[] = {
+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,
@@ -4999,7 +4817,7 @@ static const unsigned short utf8_to_euc_E880[] = {
  0xD55A,      0,      0, 0x3C2A, 0xD55B, 0xD55C, 0x4C6D, 0xD55D,
       0, 0xD55E, 0xD55F, 0x6657, 0xD560, 0x433F, 0xD561, 0x6656,
 };
-static const unsigned short utf8_to_euc_E881[] = {
+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,
@@ -5009,7 +4827,7 @@ static const unsigned short utf8_to_euc_E881[] = {
  0x6662, 0xD568, 0x6661, 0x6660, 0x4430, 0xD569, 0x6663, 0x3F26,
       0, 0x6664,      0,      0,      0, 0x6665, 0x4F38, 0x6666,
 };
-static const unsigned short utf8_to_euc_E882[] = {
+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,
@@ -5019,7 +4837,7 @@ static const unsigned short utf8_to_euc_E882[] = {
       0, 0x394F, 0x3069,      0, 0x3A68,      0,      0,      0,
  0xD572, 0xD573, 0x4759,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E883[] = {
+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,
@@ -5029,7 +4847,7 @@ static const unsigned short utf8_to_euc_E883[] = {
  0xD621, 0x6679, 0xD622, 0xD623, 0x4639,      0, 0xD624,      0,
  0x363B, 0xD625, 0xD626,      0, 0x6726, 0x473D, 0xD627,      0,
 };
-static const unsigned short utf8_to_euc_E884[] = {
+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,
@@ -5039,7 +4857,7 @@ static const unsigned short utf8_to_euc_E884[] = {
  0xD633, 0x4326,      0, 0x473E,      0, 0xD634,      0,      0,
       0, 0x4431, 0xD635,      0, 0xD636,      0, 0x6723,      0,
 };
-static const unsigned short utf8_to_euc_E885[] = {
+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,
@@ -5049,7 +4867,7 @@ static const unsigned short utf8_to_euc_E885[] = {
  0x3978, 0x6727,      0,      0, 0x672B,      0,      0, 0xD644,
  0x4432, 0x4A22, 0x4123,      0,      0,      0,      0, 0x425C,
 };
-static const unsigned short utf8_to_euc_E886[] = {
+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,
@@ -5059,7 +4877,7 @@ static const unsigned short utf8_to_euc_E886[] = {
  0x6738,      0, 0xD652, 0x4137, 0xD653, 0x6739,      0,      0,
  0x673B,      0, 0x673F, 0xD654,      0, 0x673C, 0x673A, 0x473F,
 };
-static const unsigned short utf8_to_euc_E887[] = {
+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,
@@ -5069,7 +4887,7 @@ static const unsigned short utf8_to_euc_E887[] = {
  0xD664, 0xD665, 0xD666, 0x3B6A, 0x4357, 0xD667, 0xD668,      0,
  0xD669, 0xD66A, 0x674A, 0x674B, 0x3131, 0xD66B, 0x674C, 0xD66C,
 };
-static const unsigned short utf8_to_euc_E888[] = {
+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,
@@ -5079,7 +4897,7 @@ static const unsigned short utf8_to_euc_E888[] = {
       0,      0, 0xD678, 0x6758, 0xD679, 0x4249, 0x4775, 0x383F,
  0x6757, 0x4125, 0xD67A,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E889[] = {
+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,
@@ -5089,7 +4907,7 @@ static const unsigned short utf8_to_euc_E889[] = {
       0, 0x6765, 0x3F27,      0, 0xD72B,      0, 0x3170, 0x6766,
  0x6767,      0,      0, 0xD72C,      0, 0xD72D, 0x6768, 0xD72E,
 };
-static const unsigned short utf8_to_euc_E88A[] = {
+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,
@@ -5099,7 +4917,7 @@ static const unsigned short utf8_to_euc_E88A[] = {
  0xD746, 0x3256, 0xD747, 0x4B27, 0xD748,      0,      0, 0xD749,
  0x375D, 0x365C, 0xD74A, 0x676D, 0xD74B, 0x326A, 0xD74C, 0xD74D,
 };
-static const unsigned short utf8_to_euc_E88B[] = {
+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,
@@ -5109,7 +4927,7 @@ static const unsigned short utf8_to_euc_E88B[] = {
       0, 0x3151,      0, 0x6774, 0x6773,      0, 0xD759, 0xD75A,
       0, 0x6779, 0x6775, 0x6778,      0, 0xD75B, 0xD75C,      0,
 };
-static const unsigned short utf8_to_euc_E88C[] = {
+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,
@@ -5119,7 +4937,7 @@ static const unsigned short utf8_to_euc_E88C[] = {
  0xD76D, 0x6825, 0x6824, 0xD76E, 0x6822, 0x6821, 0x4363, 0xD76F,
  0x427B, 0x6827, 0xD770,      0, 0xD771, 0xD772,      0,      0,
 };
-static const unsigned short utf8_to_euc_E88D[] = {
+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,
@@ -5129,7 +4947,7 @@ static const unsigned short utf8_to_euc_E88D[] = {
  0xD77D,      0,      0, 0x683A,      0, 0x683B,      0, 0x3259,
  0xD77E,      0,      0, 0x322E, 0x6838, 0xD821,      0, 0xD822,
 };
-static const unsigned short utf8_to_euc_E88E[] = {
+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,
@@ -5139,7 +4957,7 @@ static const unsigned short utf8_to_euc_E88E[] = {
       0, 0x4D69,      0,      0,      0, 0x6839,      0,      0,
       0,      0,      0,      0,      0, 0x684F, 0xD834, 0xD835,
 };
-static const unsigned short utf8_to_euc_E88F[] = {
+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,
@@ -5149,7 +4967,7 @@ static const unsigned short utf8_to_euc_E88F[] = {
  0x3856, 0x4929, 0x684B,      0, 0x683F,      0, 0xD841, 0x6848,
  0xD842, 0xD843,      0, 0x6852, 0xD844, 0x6843,      0,      0,
 };
-static const unsigned short utf8_to_euc_E890[] = {
+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,
@@ -5159,7 +4977,7 @@ static const unsigned short utf8_to_euc_E890[] = {
       0, 0x337E,      0,      0,      0, 0x6862,      0,      0,
  0x6850, 0xD84E,      0,      0, 0x6855, 0x4D6E,      0,      0,
 };
-static const unsigned short utf8_to_euc_E891[] = {
+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,
@@ -5169,7 +4987,7 @@ static const unsigned short utf8_to_euc_E891[] = {
  0xD861, 0x472C,      0, 0xD862, 0xD863, 0x302A, 0xD864, 0x6858,
  0xD865, 0x6861, 0x4978,      0, 0xD866, 0xD867,      0,      0,
 };
-static const unsigned short utf8_to_euc_E892[] = {
+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,
@@ -5179,7 +4997,7 @@ static const unsigned short utf8_to_euc_E892[] = {
       0, 0xD873, 0x3377,      0, 0xD874,      0,      0,      0,
  0x3E78, 0x6865, 0xD875, 0x686A, 0x4173, 0xD876, 0xD877, 0x6866,
 };
-static const unsigned short utf8_to_euc_E893[] = {
+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,
@@ -5189,7 +5007,7 @@ static const unsigned short utf8_to_euc_E893[] = {
  0xD925, 0xD926, 0xD927,      0, 0x6873,      0,      0, 0xD928,
       0,      0, 0xD92A, 0xD92B, 0x687A, 0xD92C,      0, 0x6872,
 };
-static const unsigned short utf8_to_euc_E894[] = {
+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,
@@ -5199,7 +5017,7 @@ static const unsigned short utf8_to_euc_E894[] = {
       0,      0, 0xD929, 0xD93D, 0xD93E, 0x4222, 0xD93F,      0,
       0,      0,      0,      0,      0, 0x4A43,      0, 0xD940,
 };
-static const unsigned short utf8_to_euc_E895[] = {
+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,
@@ -5209,7 +5027,7 @@ static const unsigned short utf8_to_euc_E895[] = {
       0,      0,      0,      0,      0,      0,      0, 0x6931,
       0, 0xD953, 0xD954, 0xD955,      0, 0xD956, 0x6932, 0xD957,
 };
-static const unsigned short utf8_to_euc_E896[] = {
+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,
@@ -5219,7 +5037,7 @@ static const unsigned short utf8_to_euc_E896[] = {
  0xF461,      0,      0,      0, 0xD967,      0, 0xD968, 0xD969,
  0xD96A, 0x6937, 0x6935,      0, 0xD96B, 0xD96C, 0xD96D, 0xD96E,
 };
-static const unsigned short utf8_to_euc_E897[] = {
+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,
@@ -5229,7 +5047,7 @@ static const unsigned short utf8_to_euc_E897[] = {
       0,      0,      0, 0xD97C,      0,      0, 0xD97D, 0x3D73,
       0, 0x693D, 0x6942, 0x4174, 0xD97E,      0, 0x6941, 0xDA21,
 };
-static const unsigned short utf8_to_euc_E898[] = {
+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,
@@ -5239,7 +5057,7 @@ static const unsigned short utf8_to_euc_E898[] = {
  0x6946,      0,      0,      0,      0,      0, 0xDA31,      0,
  0xDA32,      0, 0xDA33,      0, 0xDA34, 0xDA35,      0, 0x6947,
 };
-static const unsigned short utf8_to_euc_E899[] = {
+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,
@@ -5249,7 +5067,7 @@ static const unsigned short utf8_to_euc_E899[] = {
       0, 0x694D,      0,      0,      0, 0xDA48, 0xDA49, 0xDA4A,
       0, 0x467A, 0xDA4B, 0x303A,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E89A[] = {
+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,
@@ -5259,7 +5077,7 @@ static const unsigned short utf8_to_euc_E89A[] = {
  0x6958, 0xDA57,      0, 0xDA58, 0xDA59, 0xDA5A, 0x6954, 0xDA5B,
  0xDA5C, 0xDA5D,      0,      0,      0,      0,      0, 0xDA5E,
 };
-static const unsigned short utf8_to_euc_E89B[] = {
+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,
@@ -5269,7 +5087,7 @@ static const unsigned short utf8_to_euc_E89B[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0x427D, 0x696C, 0xDA6E, 0x6968, 0xDA6F, 0xDA70, 0x326B,      0,
 };
-static const unsigned short utf8_to_euc_E89C[] = {
+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,
@@ -5279,7 +5097,7 @@ static const unsigned short utf8_to_euc_E89C[] = {
       0, 0xDB24, 0xDB25,      0, 0x696E,      0,      0, 0x6970,
       0, 0xDB26, 0xDB27, 0x6971, 0xDB28, 0xDB29, 0xDB2A, 0x696F,
 };
-static const unsigned short utf8_to_euc_E89D[] = {
+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,
@@ -5289,7 +5107,7 @@ static const unsigned short utf8_to_euc_E89D[] = {
       0, 0xDB35, 0xDB36,      0, 0x697A,      0, 0x4433,      0,
  0x6977,      0,      0, 0xDB37,      0,      0,      0, 0x4768,
 };
-static const unsigned short utf8_to_euc_E89E[] = {
+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,
@@ -5299,7 +5117,7 @@ static const unsigned short utf8_to_euc_E89E[] = {
       0, 0xDB4E,      0, 0x6A30,      0, 0xDB4F,      0,      0,
       0,      0, 0x4D66, 0x6A33,      0, 0x6A2A, 0xDB50, 0xDB51,
 };
-static const unsigned short utf8_to_euc_E89F[] = {
+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,
@@ -5309,7 +5127,7 @@ static const unsigned short utf8_to_euc_E89F[] = {
       0, 0xDB63, 0x6A35, 0xDB64,      0,      0, 0x6A3A, 0x6A3B,
  0xDB65, 0x332A, 0xDB66, 0x3542,      0,      0, 0x6A39, 0xDB67,
 };
-static const unsigned short utf8_to_euc_E8A0[] = {
+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,
@@ -5319,7 +5137,7 @@ static const unsigned short utf8_to_euc_E8A0[] = {
  0xDB7C, 0x6A43, 0xDB7D,      0,      0, 0xDB7E, 0x6A44,      0,
       0, 0x6A45, 0xDC21, 0x6A47, 0xDC22,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8A1[] = {
+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,
@@ -5329,7 +5147,7 @@ static const unsigned short utf8_to_euc_E8A1[] = {
  0x3F6A, 0xDC35, 0x6A55,      0,      0, 0x6A52,      0, 0x436F,
       0, 0xDC36,      0, 0xDC37,      0, 0x6A53, 0x6A50, 0x365E,
 };
-static const unsigned short utf8_to_euc_E8A2[] = {
+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,
@@ -5339,7 +5157,7 @@ static const unsigned short utf8_to_euc_E8A2[] = {
  0x6A5E, 0x6A60,      0,      0, 0x3853, 0x6A54,      0, 0x3041,
       0,      0, 0xDC41,      0,      0, 0xDC42, 0xDC43, 0x6A5F,
 };
-static const unsigned short utf8_to_euc_E8A3[] = {
+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,
@@ -5349,7 +5167,7 @@ static const unsigned short utf8_to_euc_E8A3[] = {
  0xDC51, 0xDC52, 0x6A6C, 0x3E58, 0x6A6A, 0xDC53,      0, 0xDC54,
  0x4D67, 0x6A67,      0,      0, 0x6A69, 0x403D, 0x3F7E,      0,
 };
-static const unsigned short utf8_to_euc_E8A4[] = {
+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,
@@ -5359,7 +5177,7 @@ static const unsigned short utf8_to_euc_E8A4[] = {
  0xDC64, 0xDC65, 0xDC66,      0,      0, 0xDC67, 0x6A79,      0,
  0x6A7A, 0xDC68, 0xDC69, 0x6A78,      0,      0, 0xDC6A,      0,
 };
-static const unsigned short utf8_to_euc_E8A5[] = {
+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,
@@ -5369,7 +5187,7 @@ static const unsigned short utf8_to_euc_E8A5[] = {
  0xDC7B,      0, 0x3D31, 0xDC7C, 0x6B26, 0xDC7D,      0, 0x6B27,
       0,      0, 0xDC7E, 0xDD21, 0xDD22, 0xDD23, 0x6B28, 0x403E,
 };
-static const unsigned short utf8_to_euc_E8A6[] = {
+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,
@@ -5379,7 +5197,7 @@ static const unsigned short utf8_to_euc_E8A6[] = {
  0xDD2E,      0, 0x6B33, 0x3451, 0xDD2F, 0xDD30, 0xDD31, 0xDD32,
       0,      0, 0x6B34,      0, 0xDD33, 0x6B35,      0, 0x6B36,
 };
-static const unsigned short utf8_to_euc_E8A7[] = {
+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,
@@ -5389,7 +5207,7 @@ static const unsigned short utf8_to_euc_E8A7[] = {
       0, 0xDD3D,      0, 0xDD3E, 0x6B3C,      0, 0xDD3F,      0,
  0x6B3D, 0xDD40,      0,      0,      0, 0xDD41,      0, 0xDD42,
 };
-static const unsigned short utf8_to_euc_E8A8[] = {
+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,
@@ -5399,7 +5217,7 @@ static const unsigned short utf8_to_euc_E8A8[] = {
       0, 0x3576,      0, 0x4C75, 0x414A, 0xDD53, 0x6B45, 0xDD54,
       0,      0, 0x3F47, 0x4370, 0x3E5A, 0xDD55, 0xDD56,      0,
 };
-static const unsigned short utf8_to_euc_E8A9[] = {
+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,
@@ -5409,7 +5227,7 @@ static const unsigned short utf8_to_euc_E8A9[] = {
  0x354D, 0x4F43, 0x333A, 0x3E5C,      0, 0xDD67, 0xDD68, 0xDD69,
       0, 0xDD6A, 0xDD6B, 0xDD6C, 0x6B4B,      0, 0xDD6D, 0xDD6E,
 };
-static const unsigned short utf8_to_euc_E8AA[] = {
+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,
@@ -5419,7 +5237,7 @@ static const unsigned short utf8_to_euc_E8AA[] = {
  0x432F,      0, 0x325D, 0xDD7E,      0,      0, 0xDE21, 0xDE22,
       0, 0x4870,      0, 0xDE23, 0x3543,      0, 0xDE24, 0x4434,
 };
-static const unsigned short utf8_to_euc_E8AB[] = {
+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,
@@ -5429,7 +5247,7 @@ static const unsigned short utf8_to_euc_E8AB[] = {
  0xDE32, 0x6B61,      0, 0x6B5E, 0xDE33, 0xDE34, 0xDE35, 0x6B65,
  0x3D74,      0, 0x3841,      0, 0xDE36,      0, 0x427A, 0xDE37,
 };
-static const unsigned short utf8_to_euc_E8AC[] = {
+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,
@@ -5439,7 +5257,7 @@ static const unsigned short utf8_to_euc_E8AC[] = {
  0xDE41,      0,      0, 0x6B70,      0,      0,      0, 0xDE42,
       0, 0x3660,      0,      0, 0xDE43,      0, 0x6B74,      0,
 };
-static const unsigned short utf8_to_euc_E8AD[] = {
+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,
@@ -5449,7 +5267,7 @@ static const unsigned short utf8_to_euc_E8AD[] = {
  0x3544, 0x6641, 0x3E79,      0, 0x6C24,      0, 0xDE52, 0x386E,
  0xDE53, 0xDE54,      0,      0, 0xDE55, 0x6C25, 0xDE56, 0xF466,
 };
-static const unsigned short utf8_to_euc_E8AE[] = {
+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,
@@ -5459,7 +5277,7 @@ static const unsigned short utf8_to_euc_E8AE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8B0[] = {
+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,
@@ -5469,7 +5287,7 @@ static const unsigned short utf8_to_euc_E8B0[] = {
       0,      0,      0,      0,      0,      0,      0, 0x432B,
  0xDE62, 0xDE63, 0x6C2E,      0,      0, 0xDE64, 0xDE65, 0x6C30,
 };
-static const unsigned short utf8_to_euc_E8B1[] = {
+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,
@@ -5479,7 +5297,7 @@ static const unsigned short utf8_to_euc_E8B1[] = {
       0,      0,      0, 0xDE79,      0, 0xDE7A, 0xDE7B,      0,
  0x6C38, 0x493F, 0x6C39, 0xDE7C, 0x6C41,      0, 0xDE7D,      0,
 };
-static const unsigned short utf8_to_euc_E8B2[] = {
+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,
@@ -5489,7 +5307,7 @@ static const unsigned short utf8_to_euc_E8B2[] = {
  0x4C63,      0, 0x6C47, 0x6C48, 0x352E,      0, 0x6C4A, 0x4763,
  0x425F, 0xDF2A, 0xDF2B, 0x4871, 0x453D, 0x6C46,      0, 0x4B47,
 };
-static const unsigned short utf8_to_euc_E8B3[] = {
+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,
@@ -5499,7 +5317,7 @@ static const unsigned short utf8_to_euc_E8B3[] = {
  0xDF39,      0, 0xDF3A,      0, 0xF467, 0xDF3B,      0, 0xDF3C,
  0xDF3D,      0, 0x6C51, 0x6C52, 0x3958, 0x6C50, 0xDF3E, 0xDF3F,
 };
-static const unsigned short utf8_to_euc_E8B4[] = {
+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,
@@ -5509,7 +5327,7 @@ static const unsigned short utf8_to_euc_E8B4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8B5[] = {
+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,
@@ -5519,7 +5337,7 @@ static const unsigned short utf8_to_euc_E8B5[] = {
  0x4176, 0x6C61,      0, 0x6C62, 0x496B,      0, 0xF468, 0x352F,
       0,      0,      0,      0,      0,      0,      0, 0xDF4A,
 };
-static const unsigned short utf8_to_euc_E8B6[] = {
+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,
@@ -5529,7 +5347,7 @@ static const unsigned short utf8_to_euc_E8B6[] = {
       0,      0, 0xDF59, 0x422D,      0, 0xDF5A,      0, 0xDF5B,
       0, 0xDF5C, 0x6C67, 0xDF5D, 0xDF6F,      0, 0x6C66,      0,
 };
-static const unsigned short utf8_to_euc_E8B7[] = {
+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,
@@ -5539,7 +5357,7 @@ static const unsigned short utf8_to_euc_E8B7[] = {
  0xDF6E, 0xDF70, 0xDF71, 0x4437, 0xDF72, 0x4129,      0,      0,
       0,      0,      0,      0, 0x6C72, 0xDF73,      0, 0x6C75,
 };
-static const unsigned short utf8_to_euc_E8B8[] = {
+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,
@@ -5549,7 +5367,7 @@ static const unsigned short utf8_to_euc_E8B8[] = {
  0x6C7C, 0xE024,      0, 0xE025, 0x6C7D, 0x6C7B, 0xE026, 0xE027,
  0xE028, 0xE029,      0,      0,      0, 0xE02A,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8B9[] = {
+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,
@@ -5559,7 +5377,7 @@ static const unsigned short utf8_to_euc_E8B9[] = {
  0xE03C, 0xE03D, 0x6D2D,      0, 0x3D33,      0, 0x6D2C,      0,
       0, 0xE03E, 0xE03F, 0xE040, 0x6D2E,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8BA[] = {
+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,
@@ -5569,7 +5387,7 @@ static const unsigned short utf8_to_euc_E8BA[] = {
  0x6D3C, 0x6D3E,      0, 0xE050,      0, 0xE051,      0,      0,
       0,      0, 0xE052, 0xE053,      0,      0, 0x6D3F,      0,
 };
-static const unsigned short utf8_to_euc_E8BB[] = {
+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,
@@ -5579,7 +5397,7 @@ static const unsigned short utf8_to_euc_E8BB[] = {
  0xE05F, 0xE060,      0,      0,      0,      0,      0, 0xE061,
  0x3C34, 0xE062, 0xE063, 0x6D46, 0x6D45, 0x375A, 0x6D48,      0,
 };
-static const unsigned short utf8_to_euc_E8BC[] = {
+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,
@@ -5589,7 +5407,7 @@ static const unsigned short utf8_to_euc_E8BC[] = {
       0,      0,      0, 0x6D54, 0xE078, 0xE079, 0xE07A, 0xE07B,
  0x4D22, 0x6D56, 0xE07C, 0x6D55,      0,      0, 0x6D59, 0x4D41,
 };
-static const unsigned short utf8_to_euc_E8BD[] = {
+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,
@@ -5599,7 +5417,7 @@ static const unsigned short utf8_to_euc_E8BD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E8BE[] = {
+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,
@@ -5609,7 +5427,7 @@ static const unsigned short utf8_to_euc_E8BE[] = {
  0x4324, 0x3F2B, 0x4740,      0,      0, 0xE133, 0xE134, 0x6D68,
  0xE135,      0, 0x4A55, 0x4454, 0x397E,      0, 0xE136, 0x4329,
 };
-static const unsigned short utf8_to_euc_E8BF[] = {
+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,
@@ -5619,7 +5437,7 @@ static const unsigned short utf8_to_euc_E8BF[] = {
  0x3D52, 0xE146,      0,      0, 0x6D6F, 0xE147, 0xE148, 0x4C42,
  0x6D7E, 0x6D71, 0x6D72, 0xE149,      0, 0x4449, 0xE14A,      0,
 };
-static const unsigned short utf8_to_euc_E980[] = {
+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,
@@ -5629,7 +5447,7 @@ static const unsigned short utf8_to_euc_E980[] = {
       0, 0x3D35, 0x3F4A, 0xE157, 0xE158, 0x6D7C, 0x6D7B, 0xE159,
  0x306F, 0x6D7D,      0,      0, 0x492F,      0, 0x6E27, 0xE15A,
 };
-static const unsigned short utf8_to_euc_E981[] = {
+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,
@@ -5639,7 +5457,7 @@ static const unsigned short utf8_to_euc_E981[] = {
  0xE164,      0, 0x6E2F,      0, 0xE165, 0x3D65, 0x6E2D, 0x412B,
  0x412A, 0xE166, 0x3064,      0, 0x4E4B, 0x6E31,      0, 0x4872,
 };
-static const unsigned short utf8_to_euc_E982[] = {
+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,
@@ -5649,7 +5467,7 @@ static const unsigned short utf8_to_euc_E982[] = {
  0xE176, 0x6E39, 0xE177, 0xE178, 0xE179, 0x6E3A, 0xE17A,      0,
  0x4521,      0,      0,      0,      0, 0xE17B, 0xE17D,      0,
 };
-static const unsigned short utf8_to_euc_E983[] = {
+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,
@@ -5659,7 +5477,7 @@ static const unsigned short utf8_to_euc_E983[] = {
  0xE231,      0,      0,      0, 0xE232, 0x4D39, 0xE22E, 0x363F,
       0,      0,      0,      0,      0, 0x4554, 0xE233, 0xE234,
 };
-static const unsigned short utf8_to_euc_E984[] = {
+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,
@@ -5669,7 +5487,7 @@ static const unsigned short utf8_to_euc_E984[] = {
  0x6E43, 0xE24B, 0x6E42,      0, 0xE24C,      0, 0xE24D, 0xE24E,
       0, 0xE24F, 0xE250,      0, 0xE251, 0xE252,      0,      0,
 };
-static const unsigned short utf8_to_euc_E985[] = {
+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,
@@ -5679,7 +5497,7 @@ static const unsigned short utf8_to_euc_E985[] = {
       0,      0, 0x6E4B, 0x6E4A, 0xE260, 0x395A,      0, 0x3973,
  0x3B40, 0xE261, 0xE262, 0xE263,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E986[] = {
+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,
@@ -5689,7 +5507,7 @@ static const unsigned short utf8_to_euc_E986[] = {
  0xE276, 0xE277, 0xE278, 0xE279, 0x6E54, 0x6E53, 0xE27A,      0,
  0x3E7A,      0, 0x6E55, 0xE27B, 0xE27C, 0xE27D,      0, 0xE27E,
 };
-static const unsigned short utf8_to_euc_E987[] = {
+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,
@@ -5699,7 +5517,7 @@ static const unsigned short utf8_to_euc_E987[] = {
  0xE332, 0xE333,      0,      0,      0, 0x6E60, 0x6E61, 0xE334,
       0, 0xE335,      0, 0xE336, 0x6E5F, 0xE337,      0, 0x6E63,
 };
-static const unsigned short utf8_to_euc_E988[] = {
+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,
@@ -5709,7 +5527,7 @@ static const unsigned short utf8_to_euc_E988[] = {
  0xE34F,      0,      0, 0xE350, 0x4E6B, 0xE351, 0xE352, 0x385A,
  0xE353, 0xE354, 0xE355,      0, 0xE356,      0, 0xE357, 0x6E6F,
 };
-static const unsigned short utf8_to_euc_E989[] = {
+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,
@@ -5719,7 +5537,7 @@ static const unsigned short utf8_to_euc_E989[] = {
  0xE36E, 0x395B,      0,      0,      0, 0xE36F, 0xE370, 0xE371,
  0xE372, 0xE373,      0, 0xE374, 0xE375, 0xE376, 0x4B48, 0xE377,
 };
-static const unsigned short utf8_to_euc_E98A[] = {
+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,
@@ -5729,7 +5547,7 @@ static const unsigned short utf8_to_euc_E98A[] = {
       0,      0, 0xE42A,      0,      0,      0, 0xE42B, 0x6E79,
  0xE42C, 0x6E78, 0xE42D, 0xE42E, 0xE42F, 0xE430,      0, 0xE431,
 };
-static const unsigned short utf8_to_euc_E98B[] = {
+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,
@@ -5739,7 +5557,7 @@ static const unsigned short utf8_to_euc_E98B[] = {
  0xE44F,      0, 0x4946, 0x4372,      0,      0,      0,      0,
  0x3578, 0xE450, 0x6E7C, 0xE451, 0x395D,      0,      0, 0xE452,
 };
-static const unsigned short utf8_to_euc_E98C[] = {
+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,
@@ -5749,7 +5567,7 @@ static const unsigned short utf8_to_euc_E98C[] = {
       0,      0, 0x4F3F, 0xE464, 0xE465, 0x6F26, 0xE466, 0xE467,
       0,      0, 0x6F25, 0x6F27,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E98D[] = {
+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,
@@ -5759,7 +5577,7 @@ static const unsigned short utf8_to_euc_E98D[] = {
  0xE47A, 0xE47B,      0, 0xE47C, 0xE47D, 0x3830, 0xE47E,      0,
       0,      0, 0xE521,      0, 0x6F2A, 0xE522, 0x3E61, 0xE523,
 };
-static const unsigned short utf8_to_euc_E98E[] = {
+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,
@@ -5769,7 +5587,7 @@ static const unsigned short utf8_to_euc_E98E[] = {
  0x6F2D,      0,      0,      0, 0xE537, 0xE538, 0xE539,      0,
       0, 0x6F31, 0xE53A,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E98F[] = {
+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,
@@ -5779,7 +5597,7 @@ static const unsigned short utf8_to_euc_E98F[] = {
       0,      0,      0,      0,      0,      0,      0, 0xE54F,
  0xE550, 0xE54E, 0xE551, 0xE552,      0, 0xE553,      0,      0,
 };
-static const unsigned short utf8_to_euc_E990[] = {
+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,
@@ -5789,7 +5607,7 @@ static const unsigned short utf8_to_euc_E990[] = {
       0, 0xE562, 0xE563, 0xE564, 0xE565, 0x6F44, 0x6F42,      0,
  0x4278,      0, 0x6F46, 0xE566,      0, 0xE568,      0, 0xE567,
 };
-static const unsigned short utf8_to_euc_E991[] = {
+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,
@@ -5799,7 +5617,7 @@ static const unsigned short utf8_to_euc_E991[] = {
  0x6F50, 0xE579, 0xE57A,      0,      0, 0x6F51,      0, 0x6F52,
       0,      0,      0,      0, 0x6F55, 0x6F53, 0x6F56, 0x6F58,
 };
-static const unsigned short utf8_to_euc_E992[] = {
+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,
@@ -5809,7 +5627,7 @@ static const unsigned short utf8_to_euc_E992[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E995[] = {
+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,
@@ -5819,7 +5637,7 @@ static const unsigned short utf8_to_euc_E995[] = {
       0,      0,      0,      0,      0,      0,      0, 0x4439,
  0xE57D, 0xE57E,      0,      0,      0,      0, 0xE621,      0,
 };
-static const unsigned short utf8_to_euc_E996[] = {
+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,
@@ -5829,7 +5647,7 @@ static const unsigned short utf8_to_euc_E996[] = {
       0,      0, 0x315C,      0, 0xE62F,      0, 0xE630,      0,
       0, 0x6F66, 0xE631, 0x6F65, 0x6F64, 0xE632, 0x6F67, 0xE633,
 };
-static const unsigned short utf8_to_euc_E997[] = {
+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,
@@ -5839,7 +5657,7 @@ static const unsigned short utf8_to_euc_E997[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E998[] = {
+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,
@@ -5849,7 +5667,7 @@ static const unsigned short utf8_to_euc_E998[] = {
       0, 0xE64B, 0x4B49, 0xE64C,      0,      0,      0, 0xE64D,
  0xE64E, 0xE64F, 0xE650, 0x414B, 0xE651, 0xE652,      0, 0x3024,
 };
-static const unsigned short utf8_to_euc_E999[] = {
+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,
@@ -5859,7 +5677,7 @@ static const unsigned short utf8_to_euc_E999[] = {
  0x3122,      0, 0x7024, 0x4444, 0xE65B, 0x4E4D, 0x462B, 0x6F7C,
  0x4E26,      0, 0x3831, 0xE65C, 0xE65D, 0x4D5B, 0xE65E, 0xE65F,
 };
-static const unsigned short utf8_to_euc_E99A[] = {
+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,
@@ -5869,7 +5687,7 @@ static const unsigned short utf8_to_euc_E99A[] = {
  0x702E, 0x702C, 0x702D, 0xE670, 0x702F,      0, 0x7030, 0x4E6C,
  0x7031, 0x7032, 0xE671, 0x4049, 0x483B,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E99B[] = {
+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,
@@ -5879,7 +5697,7 @@ static const unsigned short utf8_to_euc_E99B[] = {
  0x4A37, 0xE67C, 0x3140,      0,      0,      0, 0x4E6D, 0x4D6B,
       0, 0x703B, 0xE67D, 0x4545,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E99C[] = {
+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,
@@ -5889,7 +5707,7 @@ static const unsigned short utf8_to_euc_E99C[] = {
  0x7047, 0xE72B, 0x4F2A, 0xE72C,      0,      0,      0,      0,
  0x5B31, 0x7048,      0, 0xF474,      0, 0x7049, 0x704A,      0,
 };
-static const unsigned short utf8_to_euc_E99D[] = {
+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,
@@ -5899,7 +5717,7 @@ static const unsigned short utf8_to_euc_E99D[] = {
       0, 0x7057,      0, 0xE73B, 0x3724,      0, 0xE73C, 0xE73D,
  0xE73E, 0x7058, 0x705C, 0xE73F, 0x705A, 0xE740,      0, 0xE741,
 };
-static const unsigned short utf8_to_euc_E99E[] = {
+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,
@@ -5909,7 +5727,7 @@ static const unsigned short utf8_to_euc_E99E[] = {
       0, 0xE74E, 0xE74F, 0x7065, 0x7066, 0xE750, 0xE751,      0,
  0xE752, 0xE753, 0xE754,      0, 0xE755,      0, 0xE756, 0xE757,
 };
-static const unsigned short utf8_to_euc_E99F[] = {
+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,
@@ -5919,7 +5737,7 @@ static const unsigned short utf8_to_euc_E99F[] = {
       0, 0xE76E, 0x706E, 0x323B, 0xE76F, 0x7071, 0x7070, 0xE770,
  0xE771,      0, 0xE772, 0x3124,      0,      0,      0, 0x3641,
 };
-static const unsigned short utf8_to_euc_E9A0[] = {
+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,
@@ -5929,7 +5747,7 @@ static const unsigned short utf8_to_euc_E9A0[] = {
  0xE824,      0, 0xE825, 0xE826, 0x3150, 0xE827,      0, 0x7077,
  0x7074,      0,      0, 0x4951, 0x4D6A, 0x7078, 0xE829,      0,
 };
-static const unsigned short utf8_to_euc_E9A1[] = {
+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,
@@ -5939,7 +5757,7 @@ static const unsigned short utf8_to_euc_E9A1[] = {
  0x707E, 0x7121,      0, 0x7123, 0x7122,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9A2[] = {
+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,
@@ -5949,7 +5767,7 @@ static const unsigned short utf8_to_euc_E9A2[] = {
  0xE83D, 0x7126,      0,      0, 0xE83E,      0, 0x7127, 0xE83F,
  0xE840,      0, 0xE841, 0xE842,      0,      0,      0, 0xE843,
 };
-static const unsigned short utf8_to_euc_E9A3[] = {
+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,
@@ -5959,7 +5777,7 @@ static const unsigned short utf8_to_euc_E9A3[] = {
       0,      0, 0x307B, 0xE84E, 0x303B,      0, 0xE84F,      0,
       0,      0,      0,      0, 0x3B74, 0x4B30, 0x3E7E,      0,
 };
-static const unsigned short utf8_to_euc_E9A4[] = {
+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,
@@ -5969,7 +5787,7 @@ static const unsigned short utf8_to_euc_E9A4[] = {
       0, 0xE85F, 0xE860, 0xE861, 0xE862, 0xE863,      0,      0,
       0, 0xE864, 0xE865, 0xE866, 0xE867, 0x7139, 0x713A,      0,
 };
-static const unsigned short utf8_to_euc_E9A5[] = {
+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,
@@ -5979,7 +5797,7 @@ static const unsigned short utf8_to_euc_E9A5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9A6[] = {
+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,
@@ -5989,7 +5807,7 @@ static const unsigned short utf8_to_euc_E9A6[] = {
  0xE87B, 0xE87C, 0xE87D, 0x435A, 0x466B, 0xE87E,      0,      0,
       0, 0xE921, 0xE922,      0, 0x7149, 0xE923,      0, 0xE924,
 };
-static const unsigned short utf8_to_euc_E9A7[] = {
+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,
@@ -5999,7 +5817,7 @@ static const unsigned short utf8_to_euc_E9A7[] = {
  0xE931, 0x7151, 0x7152,      0, 0xE932, 0xE933,      0,      0,
  0x7154, 0xE934,      0, 0x7153,      0, 0xE935, 0xE936, 0x3D59,
 };
-static const unsigned short utf8_to_euc_E9A8[] = {
+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,
@@ -6009,7 +5827,7 @@ static const unsigned short utf8_to_euc_E9A8[] = {
  0x462D,      0,      0, 0xE947,      0, 0xE948, 0xE949, 0x715B,
  0xE94A,      0,      0,      0,      0,      0, 0x7160,      0,
 };
-static const unsigned short utf8_to_euc_E9A9[] = {
+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,
@@ -6019,7 +5837,7 @@ static const unsigned short utf8_to_euc_E9A9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9AA[] = {
+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,
@@ -6029,7 +5847,7 @@ static const unsigned short utf8_to_euc_E9AA[] = {
  0x716D,      0, 0xE95A,      0, 0xE95B, 0xE95C, 0xE95D,      0,
  0x333C, 0xE95E,      0, 0xE95F, 0x716E,      0, 0xE960, 0xE961,
 };
-static const unsigned short utf8_to_euc_E9AB[] = {
+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,
@@ -6039,7 +5857,7 @@ static const unsigned short utf8_to_euc_E9AB[] = {
       0, 0x717D, 0xE974, 0xE975, 0x717C, 0xE976,      0, 0x717E,
       0, 0xE977, 0xE978, 0x7221,      0, 0xE979,      0, 0xE97A,
 };
-static const unsigned short utf8_to_euc_E9AC[] = {
+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,
@@ -6049,7 +5867,7 @@ static const unsigned short utf8_to_euc_E9AC[] = {
       0, 0x5D35, 0x722F, 0xEA33, 0xEA34, 0xEA35,      0, 0xEA36,
       0, 0xEA37, 0xEA38, 0x6478, 0x3534, 0xEA39,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9AD[] = {
+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,
@@ -6059,7 +5877,7 @@ static const unsigned short utf8_to_euc_E9AD[] = {
       0,      0, 0xF47C, 0xEA4C, 0x7237, 0xEA4D,      0, 0xEA4E,
  0xEA4F, 0xEA50,      0,      0,      0,      0,      0, 0xEA51,
 };
-static const unsigned short utf8_to_euc_E9AE[] = {
+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,
@@ -6069,7 +5887,7 @@ static const unsigned short utf8_to_euc_E9AE[] = {
  0xEA65, 0xEA66, 0xEA67,      0, 0x7240,      0,      0, 0xEA68,
  0xEA69, 0x7243,      0, 0xEA6A, 0xEA6B,      0, 0xEA6C, 0xEA6D,
 };
-static const unsigned short utf8_to_euc_E9AF[] = {
+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,
@@ -6079,7 +5897,7 @@ static const unsigned short utf8_to_euc_E9AF[] = {
  0x7250, 0x724F, 0x724E, 0xEA7C,      0, 0x3033,      0, 0xEA7D,
  0xEA7E, 0xEB21, 0xEB22,      0,      0, 0xEB23,      0, 0xEB24,
 };
-static const unsigned short utf8_to_euc_E9B0[] = {
+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,
@@ -6089,7 +5907,7 @@ static const unsigned short utf8_to_euc_E9B0[] = {
  0x7260, 0xEB37, 0x7262,      0,      0, 0xEB38, 0xEB39, 0xEB3A,
       0, 0x336F, 0x724D, 0x3137,      0, 0xEB3B, 0x7264,      0,
 };
-static const unsigned short utf8_to_euc_E9B1[] = {
+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,
@@ -6099,7 +5917,7 @@ static const unsigned short utf8_to_euc_E9B1[] = {
  0xEB54,      0, 0xEB55,      0,      0, 0xEB56, 0x7268, 0xEB57,
  0x7269,      0,      0, 0xEB58,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9B3[] = {
+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,
@@ -6109,7 +5927,7 @@ static const unsigned short utf8_to_euc_E9B3[] = {
  0x726C,      0, 0xEB5A, 0x4B31, 0x4C44,      0, 0x4650, 0xEB5B,
       0, 0xEB5C,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9B4[] = {
+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,
@@ -6119,7 +5937,7 @@ static const unsigned short utf8_to_euc_E9B4[] = {
  0xEB66,      0, 0xEB67, 0xEB68, 0xEB69,      0,      0,      0,
       0,      0, 0xEB6A, 0x3963, 0xEB6B, 0xEB6D, 0x727C, 0x727B,
 };
-static const unsigned short utf8_to_euc_E9B5[] = {
+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,
@@ -6129,7 +5947,7 @@ static const unsigned short utf8_to_euc_E9B5[] = {
  0xEB7B,      0, 0x7327,      0,      0,      0, 0xEB7C, 0xEB7D,
       0,      0, 0x732C, 0xEB7E, 0xEC21,      0, 0xEC22,      0,
 };
-static const unsigned short utf8_to_euc_E9B6[] = {
+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,
@@ -6139,7 +5957,7 @@ static const unsigned short utf8_to_euc_E9B6[] = {
       0, 0xEC33, 0x7330,      0, 0x4461, 0xEC34,      0,      0,
  0x7334, 0xEC35, 0x7335, 0x7333, 0xEC36,      0,      0, 0xEC37,
 };
-static const unsigned short utf8_to_euc_E9B7[] = {
+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,
@@ -6149,7 +5967,7 @@ static const unsigned short utf8_to_euc_E9B7[] = {
  0xEC49,      0, 0x4F49, 0xEC4A, 0xEC4B,      0,      0,      0,
  0x733B, 0x426B, 0x3A6D,      0,      0, 0x733F, 0xEC4C,      0,
 };
-static const unsigned short utf8_to_euc_E9B8[] = {
+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,
@@ -6159,7 +5977,7 @@ static const unsigned short utf8_to_euc_E9B8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9B9[] = {
+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,
@@ -6169,7 +5987,7 @@ static const unsigned short utf8_to_euc_E9B9[] = {
       0,      0,      0,      0,      0, 0x7343,      0,      0,
  0x3834, 0x7344, 0xEC59, 0xEC5A, 0xEC5B, 0x7345,      0, 0x3C2F,
 };
-static const unsigned short utf8_to_euc_E9BA[] = {
+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,
@@ -6179,7 +5997,7 @@ static const unsigned short utf8_to_euc_E9BA[] = {
  0xEC6D,      0,      0, 0xEC6E, 0xEC6F, 0xEC70,      0,      0,
  0x7350, 0x396D, 0x4C4D, 0x4B63, 0x5677,      0, 0x5D60, 0x4B7B,
 };
-static const unsigned short utf8_to_euc_E9BB[] = {
+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,
@@ -6189,7 +6007,7 @@ static const unsigned short utf8_to_euc_E9BB[] = {
  0xEC7B, 0xEC7C, 0xEC7D,      0, 0x7360, 0xEC7E, 0x7361, 0x7362,
  0xED21, 0x7363,      0, 0x7364, 0x7365, 0x7366,      0, 0xED22,
 };
-static const unsigned short utf8_to_euc_E9BC[] = {
+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,
@@ -6199,7 +6017,7 @@ static const unsigned short utf8_to_euc_E9BC[] = {
       0, 0xED36, 0xED37,      0, 0xED38,      0,      0, 0xED39,
       0, 0xED3A, 0xED3B, 0x4921, 0xED3C, 0xED3D, 0x736D, 0xED3E,
 };
-static const unsigned short utf8_to_euc_E9BD[] = {
+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,
@@ -6209,7 +6027,7 @@ static const unsigned short utf8_to_euc_E9BD[] = {
  0xED52, 0xED53, 0x737A, 0xED54,      0, 0xED55, 0x737B, 0x7379,
       0,      0, 0xED56,      0,      0, 0xED57,      0,      0,
 };
-static const unsigned short utf8_to_euc_E9BE[] = {
+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,
@@ -6219,7 +6037,7 @@ static const unsigned short utf8_to_euc_E9BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_EFA4[] = {
+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,
@@ -6229,7 +6047,7 @@ static const unsigned short utf8_to_euc_EFA4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_EFA7[] = {
+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,
@@ -6239,7 +6057,7 @@ static const unsigned short utf8_to_euc_EFA7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_EFA8[] = {
+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,
@@ -6249,7 +6067,7 @@ static const unsigned short utf8_to_euc_EFA8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_EFBC[] = {
+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,
@@ -6259,7 +6077,7 @@ static const unsigned short utf8_to_euc_EFBC[] = {
  0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357,
  0x2358, 0x2359, 0x235A, 0x214E, 0x2140, 0x214F, 0x2130, 0x2132,
 };
-static const unsigned short utf8_to_euc_EFBD[] = {
+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,
@@ -6269,7 +6087,7 @@ static const unsigned short utf8_to_euc_EFBD[] = {
  0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
  0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
 };
-static const unsigned short utf8_to_euc_EFBD_ms[] = {
+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,
@@ -6279,7 +6097,7 @@ static const unsigned short utf8_to_euc_EFBD_ms[] = {
  0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37,
  0x0E38, 0x0E39, 0x0E3A, 0x0E3B, 0x0E3C, 0x0E3D, 0x0E3E, 0x0E3F,
 };
-static const unsigned short utf8_to_euc_EFBE[] = {
+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,
@@ -6289,7 +6107,7 @@ static const unsigned short utf8_to_euc_EFBE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short utf8_to_euc_EFBF[] = {
+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,
@@ -6299,7 +6117,7 @@ static const unsigned short utf8_to_euc_EFBF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short *const utf8_to_euc_E2[] = {
+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,
@@ -6317,7 +6135,7 @@ static const unsigned short *const utf8_to_euc_E2[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-static const unsigned short *const utf8_to_euc_E2_ms[] = {
+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,
@@ -6335,7 +6153,7 @@ static const unsigned short *const utf8_to_euc_E2_ms[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-static const unsigned short *const utf8_to_euc_E2_932[] = {
+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,
@@ -6353,25 +6171,7 @@ static const unsigned short *const utf8_to_euc_E2_932[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-static const unsigned short *const utf8_to_euc_E2_mac[] = {
- utf8_to_euc_E280_932,                0,                0,                0,
- utf8_to_euc_E284_mac, utf8_to_euc_E285_mac, utf8_to_euc_E286, utf8_to_euc_E287,
- utf8_to_euc_E288_mac, utf8_to_euc_E289, utf8_to_euc_E28A_mac,                0,
- utf8_to_euc_E28C,                0,                0,                0,
-                0, utf8_to_euc_E291_mac,                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,
-};
-static const unsigned short *const utf8_to_euc_E3[] = {
+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,
@@ -6389,7 +6189,7 @@ static const unsigned short *const utf8_to_euc_E3[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-static const unsigned short *const utf8_to_euc_E3_932[] = {
+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,
@@ -6407,25 +6207,7 @@ static const unsigned short *const utf8_to_euc_E3_932[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
 };
-static const unsigned short *const utf8_to_euc_E3_mac[] = {
- 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_mac,                0, utf8_to_euc_E38A_mac,                0,
- utf8_to_euc_E38C_mac, utf8_to_euc_E38D_mac, utf8_to_euc_E38E_mac, utf8_to_euc_E38F_mac,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-                0,                0,                0,                0,
-};
-static const unsigned short *const utf8_to_euc_E4[] = {
+const unsigned short *const utf8_to_euc_E4[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6443,7 +6225,7 @@ static const unsigned short *const utf8_to_euc_E4[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_E5[] = {
+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,
@@ -6461,7 +6243,7 @@ static const unsigned short *const utf8_to_euc_E5[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_E6[] = {
+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,
@@ -6479,7 +6261,7 @@ static const unsigned short *const utf8_to_euc_E6[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_E7[] = {
+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,
@@ -6497,7 +6279,7 @@ static const unsigned short *const utf8_to_euc_E7[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_E8[] = {
+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,
@@ -6515,7 +6297,7 @@ static const unsigned short *const utf8_to_euc_E8[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_E9[] = {
+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,
@@ -6533,7 +6315,7 @@ static const unsigned short *const utf8_to_euc_E9[] = {
  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,
 };
-static const unsigned short *const utf8_to_euc_EF[] = {
+const unsigned short *const utf8_to_euc_EF[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6551,7 +6333,7 @@ static const unsigned short *const utf8_to_euc_EF[] = {
                 0,                0,                0,                0,
  utf8_to_euc_EFBC, utf8_to_euc_EFBD, utf8_to_euc_EFBE, utf8_to_euc_EFBF,
 };
-static const unsigned short *const utf8_to_euc_EF_ms[] = {
+const unsigned short *const utf8_to_euc_EF_ms[] = {
                 0,                0,                0,                0,
                 0,                0,                0,                0,
                 0,                0,                0,                0,
@@ -6659,36 +6441,6 @@ const unsigned short *const utf8_to_euc_2bytes_932[] = {
               0,              0,              0,              0,
               0,              0,              0,              0,
 };
-const unsigned short *const utf8_to_euc_2bytes_mac[] = {
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              0,              0,
-              0,              0,              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_mac, 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 *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,
@@ -6707,12 +6459,6 @@ const unsigned short *const *const utf8_to_euc_3bytes_932[] = {
  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_mac[] = {
-              0,              0, utf8_to_euc_E2_mac, utf8_to_euc_E3_mac,
- 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
 
@@ -7885,7 +7631,7 @@ const unsigned short shiftjis_x0212[3][189] = {
  },
 };
 
-static const unsigned short x0212_shiftjis_A2[] = {
+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,
@@ -7899,7 +7645,7 @@ static const unsigned short x0212_shiftjis_A2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B0[] = {
+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,
@@ -7913,7 +7659,7 @@ static const unsigned short x0212_shiftjis_B0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B1[] = {
+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,
@@ -7927,7 +7673,7 @@ static const unsigned short x0212_shiftjis_B1[] = {
       0,      0,      0,      0, 0xFA79,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B2[] = {
+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,
@@ -7941,7 +7687,7 @@ static const unsigned short x0212_shiftjis_B2[] = {
       0,      0,      0,      0,      0, 0xFA81,      0,      0,
       0,      0,      0,      0, 0xFA82,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B3[] = {
+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,
@@ -7955,7 +7701,7 @@ static const unsigned short x0212_shiftjis_B3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0, 0xFA89,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B4[] = {
+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,
@@ -7969,7 +7715,7 @@ static const unsigned short x0212_shiftjis_B4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B5[] = {
+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,
@@ -7983,7 +7729,7 @@ static const unsigned short x0212_shiftjis_B5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B7[] = {
+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,
@@ -7997,7 +7743,7 @@ static const unsigned short x0212_shiftjis_B7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B8[] = {
+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,
@@ -8011,7 +7757,7 @@ static const unsigned short x0212_shiftjis_B8[] = {
       0,      0,      0,      0,      0, 0xFAA0,      0, 0xFAA1,
  0xFAA2,      0,      0,      0, 0xFAA3,      0,      0,
 };
-static const unsigned short x0212_shiftjis_B9[] = {
+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,
@@ -8025,7 +7771,7 @@ static const unsigned short x0212_shiftjis_B9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_BA[] = {
+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,
@@ -8039,7 +7785,7 @@ static const unsigned short x0212_shiftjis_BA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_BB[] = {
+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,
@@ -8053,7 +7799,7 @@ static const unsigned short x0212_shiftjis_BB[] = {
       0,      0,      0,      0, 0xFAB4, 0xFAB5,      0,      0,
       0, 0xFAB6,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_BC[] = {
+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,
@@ -8067,7 +7813,7 @@ static const unsigned short x0212_shiftjis_BC[] = {
       0,      0,      0,      0, 0xFA67,      0,      0,      0,
       0,      0,      0,      0,      0,      0, 0xFAB9,
 };
-static const unsigned short x0212_shiftjis_BD[] = {
+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,
@@ -8081,7 +7827,7 @@ static const unsigned short x0212_shiftjis_BD[] = {
  0xFABE,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_BE[] = {
+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,
@@ -8095,7 +7841,7 @@ static const unsigned short x0212_shiftjis_BE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_BF[] = {
+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,
@@ -8109,7 +7855,7 @@ static const unsigned short x0212_shiftjis_BF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C0[] = {
+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,
@@ -8123,7 +7869,7 @@ static const unsigned short x0212_shiftjis_C0[] = {
       0,      0,      0,      0, 0xFACB,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C1[] = {
+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,
@@ -8137,7 +7883,7 @@ static const unsigned short x0212_shiftjis_C1[] = {
       0,      0,      0,      0,      0, 0xFACE,      0,      0,
  0xFAD1,      0,      0,      0, 0xFACF,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C2[] = {
+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,
@@ -8151,7 +7897,7 @@ static const unsigned short x0212_shiftjis_C2[] = {
  0xFADF,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C3[] = {
+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,
@@ -8165,7 +7911,7 @@ static const unsigned short x0212_shiftjis_C3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFA64,      0, 0xFAE7,
 };
-static const unsigned short x0212_shiftjis_C4[] = {
+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,
@@ -8179,7 +7925,7 @@ static const unsigned short x0212_shiftjis_C4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0, 0xFAED,      0,
 };
-static const unsigned short x0212_shiftjis_C5[] = {
+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,
@@ -8193,7 +7939,7 @@ static const unsigned short x0212_shiftjis_C5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C6[] = {
+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,
@@ -8207,7 +7953,7 @@ static const unsigned short x0212_shiftjis_C6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C7[] = {
+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,
@@ -8221,7 +7967,7 @@ static const unsigned short x0212_shiftjis_C7[] = {
  0xFB49,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0, 0xFB47,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C8[] = {
+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,
@@ -8235,7 +7981,7 @@ static const unsigned short x0212_shiftjis_C8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
  0xFB4C,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_C9[] = {
+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,
@@ -8249,7 +7995,7 @@ static const unsigned short x0212_shiftjis_C9[] = {
       0,      0,      0,      0, 0xFB56, 0xFB57,      0,      0,
       0,      0,      0,      0, 0xFB55,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CA[] = {
+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,
@@ -8263,7 +8009,7 @@ static const unsigned short x0212_shiftjis_CA[] = {
       0, 0xFB5C,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CB[] = {
+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,
@@ -8277,7 +8023,7 @@ static const unsigned short x0212_shiftjis_CB[] = {
  0xFB62,      0,      0,      0, 0xFB63,      0,      0,      0,
       0, 0xFB66,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CC[] = {
+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,
@@ -8291,7 +8037,7 @@ static const unsigned short x0212_shiftjis_CC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CD[] = {
+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,
@@ -8305,7 +8051,7 @@ static const unsigned short x0212_shiftjis_CD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CE[] = {
+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,
@@ -8319,7 +8065,7 @@ static const unsigned short x0212_shiftjis_CE[] = {
       0,      0, 0xFB76,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_CF[] = {
+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,
@@ -8333,7 +8079,7 @@ static const unsigned short x0212_shiftjis_CF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D0[] = {
+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,
@@ -8347,7 +8093,7 @@ static const unsigned short x0212_shiftjis_D0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D1[] = {
+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,
@@ -8361,7 +8107,7 @@ static const unsigned short x0212_shiftjis_D1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D2[] = {
+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,
@@ -8375,7 +8121,7 @@ static const unsigned short x0212_shiftjis_D2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D3[] = {
+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,
@@ -8389,7 +8135,7 @@ static const unsigned short x0212_shiftjis_D3[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D4[] = {
+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,
@@ -8403,7 +8149,7 @@ static const unsigned short x0212_shiftjis_D4[] = {
       0,      0, 0xFB90,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D5[] = {
+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,
@@ -8417,7 +8163,7 @@ static const unsigned short x0212_shiftjis_D5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D7[] = {
+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,
@@ -8431,7 +8177,7 @@ static const unsigned short x0212_shiftjis_D7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D8[] = {
+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,
@@ -8445,7 +8191,7 @@ static const unsigned short x0212_shiftjis_D8[] = {
       0,      0,      0,      0, 0xFB99,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_D9[] = {
+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,
@@ -8459,7 +8205,7 @@ static const unsigned short x0212_shiftjis_D9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_DC[] = {
+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,
@@ -8473,7 +8219,7 @@ static const unsigned short x0212_shiftjis_DC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_DD[] = {
+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,
@@ -8487,7 +8233,7 @@ static const unsigned short x0212_shiftjis_DD[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFBA6,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_DE[] = {
+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,
@@ -8501,7 +8247,7 @@ static const unsigned short x0212_shiftjis_DE[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_DF[] = {
+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,
@@ -8515,7 +8261,7 @@ static const unsigned short x0212_shiftjis_DF[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E0[] = {
+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,
@@ -8529,7 +8275,7 @@ static const unsigned short x0212_shiftjis_E0[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E1[] = {
+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,
@@ -8543,7 +8289,7 @@ static const unsigned short x0212_shiftjis_E1[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E2[] = {
+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,
@@ -8557,7 +8303,7 @@ static const unsigned short x0212_shiftjis_E2[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E3[] = {
+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,
@@ -8571,7 +8317,7 @@ static const unsigned short x0212_shiftjis_E3[] = {
       0, 0xFBCD, 0xFBCE,      0,      0,      0,      0,      0,
  0xFA5F,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E4[] = {
+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,
@@ -8585,7 +8331,7 @@ static const unsigned short x0212_shiftjis_E4[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFBDF,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E5[] = {
+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,
@@ -8599,7 +8345,7 @@ static const unsigned short x0212_shiftjis_E5[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E6[] = {
+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,
@@ -8613,7 +8359,7 @@ static const unsigned short x0212_shiftjis_E6[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E7[] = {
+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,
@@ -8627,7 +8373,7 @@ static const unsigned short x0212_shiftjis_E7[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E8[] = {
+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,
@@ -8641,7 +8387,7 @@ static const unsigned short x0212_shiftjis_E8[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_E9[] = {
+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,
@@ -8655,7 +8401,7 @@ static const unsigned short x0212_shiftjis_E9[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_EA[] = {
+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,
@@ -8669,7 +8415,7 @@ static const unsigned short x0212_shiftjis_EA[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_EB[] = {
+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,
@@ -8683,7 +8429,7 @@ static const unsigned short x0212_shiftjis_EB[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0, 0xFC48, 0xFC47,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_EC[] = {
+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,
@@ -8697,7 +8443,7 @@ static const unsigned short x0212_shiftjis_EC[] = {
       0,      0,      0,      0,      0,      0,      0,      0,
       0,      0,      0,      0,      0,      0,      0,
 };
-static const unsigned short x0212_shiftjis_F3[] = {
+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,
@@ -8711,7 +8457,7 @@ static const unsigned short x0212_shiftjis_F3[] = {
       0,      0,      0, 0xFA40, 0xFA41, 0xFA42, 0xFA43, 0xFA44,
  0xFA45, 0xFA46, 0xFA47, 0xFA48, 0xFA49, 0xFA4A, 0xFA4B,
 };
-static const unsigned short x0212_shiftjis_F4[] = {
+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,
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index c3d7709ef7..1f40f0b363 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,55 +1,28 @@
-/*
- * utf8tbl.h - Header file for Convertion Table
- *
- * $Id$
- */
-
 #ifndef _UTF8TBL_H_
 #define _UTF8TBL_H_
 
 #ifdef UTF8_OUTPUT_ENABLE
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
 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 euc_to_utf8_2bytes_mac[];
 extern const unsigned short *const x0212_to_utf8_2bytes[];
 #endif /* UTF8_OUTPUT_ENABLE */
 
 #ifdef UTF8_INPUT_ENABLE
-#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
 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 utf8_to_euc_2bytes_mac[];
 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[];
-extern const unsigned short *const *const utf8_to_euc_3bytes_mac[];
 #endif /* UTF8_INPUT_ENABLE */
 
 #ifdef UNICODE_NORMALIZATION
-
-#define NORMALIZATION_TABLE_LENGTH 942
-#define NORMALIZATION_TABLE_NFC_LENGTH 3
-#define NORMALIZATION_TABLE_NFD_LENGTH 9
-struct normalization_pair {
-    const unsigned char nfc[NORMALIZATION_TABLE_NFC_LENGTH];
-    const unsigned char nfd[NORMALIZATION_TABLE_NFD_LENGTH];
-};
 extern const struct normalization_pair normalization_table[];
 #endif
 
 #ifdef SHIFTJIS_CP932
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END   0xFC
 extern const unsigned short shiftjis_cp932[3][189];
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END   0xEE
 extern const unsigned short cp932inv[2][189];
 #endif /* SHIFTJIS_CP932 */
 
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 24761449d2..2bb0340a64 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -10,8 +10,24 @@
 #define RUBY_NKF_REVISION "$Revision$"
 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#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 */
@@ -40,13 +56,14 @@ static int incsize;
 static VALUE result;
 
 static int
-rb_nkf_putchar(unsigned int c)
+rb_nkf_putchar(c)
+  unsigned int c;
 {
   if (output_ctr >= o_len) {
     o_len += incsize;
     rb_str_resize(result, o_len);
     incsize *= 2;
-    output = (unsigned char *)RSTRING_PTR(result);
+    output = (unsigned char *)RSTRING(result)->ptr;
   }
   output[output_ctr++] = c;
 
@@ -61,26 +78,11 @@ rb_nkf_putchar(unsigned int c)
 #include "nkf-utf8/utf8tbl.c"
 #include "nkf-utf8/nkf.c"
 
-rb_encoding* rb_nkf_enc_get(const char *name)
-{
-    int idx = rb_enc_find_index(name);
-    if (idx < 0) {
-	nkf_encoding *nkf_enc = nkf_enc_find(name);
-	idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
-	if (idx < 0) {
-	    idx = rb_define_dummy_encoding(name);
-	} else {
-	    rb_encoding *rb_enc = rb_enc_from_index(idx);
-	    idx = rb_enc_replicate(name, rb_enc);
-	}
-    }
-    return rb_enc_from_index(idx);
-}
-
-int nkf_split_options(const char *arg)
+int nkf_split_options(arg)
+    const char* arg;
 {
     int count = 0;
-    unsigned char option[256];
+    char option[256];
     int i = 0, j = 0;
     int is_escaped = FALSE;
     int is_single_quoted = FALSE;
@@ -126,81 +128,235 @@ int nkf_split_options(const char *arg)
 
 /*
  *  call-seq:
- *     NKF.nkf(opt, str)   => string
+ *     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.
  */
 
 static VALUE
-rb_nkf_convert(VALUE obj, VALUE opt, VALUE src)
+rb_nkf_kconv(obj, opt, src)
+  VALUE obj, opt, src;
 {
-    reinit();
-    StringValue(opt);
-    nkf_split_options(RSTRING_PTR(opt));
-    if (!output_encoding) rb_raise(rb_eArgError, "no output encoding given");
-
-    switch (nkf_enc_to_index(output_encoding)) {
-    case UTF_8_BOM:    output_encoding = nkf_enc_from_index(UTF_8); break;
-    case UTF_16BE_BOM: output_encoding = nkf_enc_from_index(UTF_16BE); break;
-    case UTF_16LE_BOM: output_encoding = nkf_enc_from_index(UTF_16LE); break;
-    case UTF_32BE_BOM: output_encoding = nkf_enc_from_index(UTF_32BE); break;
-    case UTF_32LE_BOM: output_encoding = nkf_enc_from_index(UTF_32LE); break;
-    }
-    output_bom_f = FALSE;
-
-    incsize = INCSIZE;
-
-    input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
-    i_len = RSTRING_LEN(src);
-    result = rb_str_new(0, i_len*3 + 10);
-
-    output_ctr = 0;
-    output     = (unsigned char *)RSTRING_PTR(result);
-    o_len      = RSTRING_LEN(result);
-    *output    = '\0';
+  char *opt_ptr, *opt_end;
+  volatile VALUE v;
+
+  reinit();
+  StringValue(opt);
+  opt_ptr = RSTRING(opt)->ptr;
+  opt_end = opt_ptr + RSTRING(opt)->len;
+  nkf_split_options(opt_ptr);
+
+  incsize = INCSIZE;
+
+  input_ctr = 0;
+  StringValue(src);
+  input = (unsigned char *)RSTRING(src)->ptr;
+  i_len = RSTRING(src)->len;
+  result = rb_str_new(0, i_len*3 + 10);
+  v = result;
+
+  output_ctr = 0;
+  output     = (unsigned char *)RSTRING(result)->ptr;
+  o_len      = RSTRING(result)->len;
+  *output    = '\0';
+
+  if(x0201_f == WISH_TRUE)
+    x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
+
+  kanji_convert(NULL);
+  RSTRING(result)->ptr[output_ctr] = '\0';
+  RSTRING(result)->len = output_ctr;
+  OBJ_INFECT(result, src);
+
+  return result;
+}
 
-    kanji_convert(NULL);
-    rb_str_set_len(result, output_ctr);
-    OBJ_INFECT(result, src);
 
-    if (mimeout_f)
-	rb_enc_associate(result, rb_usascii_encoding());
-    else
-	rb_enc_associate(result, rb_nkf_enc_get(nkf_enc_name(output_encoding)));
+/*
+ *  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
+ */
 
-    return result;
+static VALUE
+rb_nkf_guess1(obj, src)
+  VALUE obj, src;
+{
+  unsigned char *p;
+  unsigned char *pend;
+  int sequence_counter = 0;
+
+  StringValue(src);
+  p = (unsigned char *)RSTRING(src)->ptr;
+  pend = p + RSTRING(src)->len;
+  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)\
+	sequence_counter = 0;\
+      if (6 <= sequence_counter) {\
+	  sequence_counter = 0;\
+	  return INT2FIX(_EUC);\
+      }\
+  } while (0)
+
+  if (*p == 0xa4)
+    sequence_counter = 1;
+
+  while (p<pend) {
+    if (*p == '\033') {
+      return INT2FIX(_JIS);
+    }
+    if (*p < '\006' || *p == 0x7f || *p == 0xff) {
+      return INT2FIX(_BINARY);
+    }
+    if (0x81 <= *p && *p <= 0x8d) {
+      return INT2FIX(_SJIS);
+    }
+    if (0x8f <= *p && *p <= 0x9f) {
+      return INT2FIX(_SJIS);
+    }
+    if (*p == 0x8e) {	/* SS2 */
+      INCR;
+      if ((0x40 <= *p && *p <= 0x7e) ||
+	  (0x80 <= *p && *p <= 0xa0) ||
+	  (0xe0 <= *p && *p <= 0xfc))
+	return INT2FIX(_SJIS);
+    }
+    else if (0xa1 <= *p && *p <= 0xdf) {
+      INCR;
+      if (0xf0 <= *p && *p <= 0xfe)
+	return INT2FIX(_EUC);
+      if (0xe0 <= *p && *p <= 0xef) {
+	while (p < pend && *p >= 0x40) {
+	  if (*p >= 0x81) {
+	    if (*p <= 0x8d || (0x8f <= *p && *p <= 0x9f)) {
+	      return INT2FIX(_SJIS);
+	    }
+	    else if (0xfd <= *p && *p <= 0xfe) {
+	      return INT2FIX(_EUC);
+	    }
+	  }
+	  INCR;
+	}
+      }
+      else if (*p <= 0x9f) {
+	return INT2FIX(_SJIS);
+      }
+    }
+    else if (0xf0 <= *p && *p <= 0xfe) {
+      return INT2FIX(_EUC);
+    }
+    else if (0xe0 <= *p && *p <= 0xef) {
+      INCR;
+      if ((0x40 <= *p && *p <= 0x7e) ||
+	  (0x80 <= *p && *p <= 0xa0)) {
+	return INT2FIX(_SJIS);
+      }
+      if (0xfd <= *p && *p <= 0xfe) {
+	return INT2FIX(_EUC);
+      }
+    }
+    INCR;
+  }
+  return INT2FIX(_UNKNOWN);
 }
 
 
 /*
  *  call-seq:
- *     NKF.guess(str)  => encoding
- *
- *  Returns guessed encoding of _str_ by nkf routine.
- *
+ *     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_guess(VALUE obj, VALUE src)
+rb_nkf_guess2(obj, src)
+  VALUE obj, src;
 {
-    reinit();
-
-    input_ctr = 0;
-    StringValue(src);
-    input = (unsigned char *)RSTRING_PTR(src);
-    i_len = RSTRING_LEN(src);
-
-    guess_f = TRUE;
-    kanji_convert( NULL );
-    guess_f = FALSE;
+  int code = _BINARY;
+
+  reinit();
+
+  input_ctr = 0;
+  StringValue(src);
+  input = (unsigned char *)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 rb_enc_from_encoding(rb_nkf_enc_get(get_guessed_code()));
+  return INT2FIX( code );
 }
 
 
@@ -209,8 +365,8 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  == Description
  *
- *  This is a Ruby Extension version of nkf (Network Kanji Filter).
- *  It converts the first argument and returns converted result. Conversion
+ *  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.
@@ -232,16 +388,16 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  Output is buffered (DEFAULT), Output is unbuffered.
  *
- *  === -j -s -e -w -w16 -w32
+ *  === -j -s -e -w -w16
  *
  *  Output code is ISO-2022-JP (7bit JIS), Shift_JIS, EUC-JP,
- *  UTF-8N, UTF-16BE, UTF-32BE.
+ *  UTF-8N, UTF-16BE.
  *  Without this option and compile option, ISO-2022-JP is assumed.
  *
- *  === -J -S -E -W -W16 -W32
+ *  === -J -S -E -W -W16
  *
  *  Input assumption is JIS 7 bit, Shift_JIS, EUC-JP,
- *  UTF-8, UTF-16, UTF-32.
+ *  UTF-8, UTF-16LE.
  *
  *  ==== -J
  *
@@ -406,7 +562,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  [Shift_JIS] SJIS, MS-Kanji
  *
- *  [Windows-31J] a.k.a. CP932
+ *  [CP932] a.k.a. Windows-31J
  *
  *  [UTF-8] same as UTF-8N
  *
@@ -424,16 +580,6 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *
  *  [UTF-16LE-BOM] UTF-16 Little Endian with BOM
  *
- *  [UTF-32] same as UTF-32BE
- *
- *  [UTF-32BE] UTF-32 Big Endian without BOM
- *
- *  [UTF-32BE-BOM] UTF-32 Big Endian with BOM
- *
- *  [UTF-32LE] UTF-32 Little Endian without BOM
- *
- *  [UTF-32LE-BOM] UTF-32 Little Endian with BOM
- *
  *  [UTF8-MAC] NKDed UTF-8, a.k.a. UTF8-NFD (input only)
  *
  *  === --fb-{skip, html, xml, perl, java, subchar}
@@ -447,20 +593,10 @@ rb_nkf_guess(VALUE obj, VALUE src)
  *  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.
  *
- *  === --no-cp932ext
+ *  === --disable-cp932ext
  *
  *  Handle the characters extended in CP932 as unassigned characters.
  *
- *  == --no-best-fit-chars
- *
- *  When Unicode to Encoded byte conversion,
- *  don't convert characters which is not round trip safe.
- *  When Unicode to Unicode conversion,
- *  with this and -x option, nkf can be used as UTF converter.
- *  (In other words, without this and -x option, nkf doesn't save some characters)
- *
- *  When nkf convert string which related to path, you should use this opion.
- *
  *  === --cap-input
  *
  *  Decode hex encoded characters.
@@ -477,28 +613,42 @@ rb_nkf_guess(VALUE obj, VALUE src)
 void
 Init_nkf()
 {
-    VALUE mNKF = rb_define_module("NKF");
-
-    rb_define_module_function(mNKF, "nkf", rb_nkf_convert, 2);
-    rb_define_module_function(mNKF, "guess", rb_nkf_guess, 1);
-    rb_define_alias(rb_singleton_class(mNKF), "guess", "guess");
-
-    rb_define_const(mNKF, "AUTO",	Qnil);
-    rb_define_const(mNKF, "NOCONV",	Qnil);
-    rb_define_const(mNKF, "UNKNOWN",	Qnil);
-    rb_define_const(mNKF, "BINARY",	rb_enc_from_encoding(rb_nkf_enc_get("BINARY")));
-    rb_define_const(mNKF, "ASCII",	rb_enc_from_encoding(rb_nkf_enc_get("US-ASCII")));
-    rb_define_const(mNKF, "JIS",	rb_enc_from_encoding(rb_nkf_enc_get("ISO-2022-JP")));
-    rb_define_const(mNKF, "EUC",	rb_enc_from_encoding(rb_nkf_enc_get("EUC-JP")));
-    rb_define_const(mNKF, "SJIS",	rb_enc_from_encoding(rb_nkf_enc_get("Shift_JIS")));
-    rb_define_const(mNKF, "UTF8",	rb_enc_from_encoding(rb_utf8_encoding()));
-    rb_define_const(mNKF, "UTF16",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-16BE")));
-    rb_define_const(mNKF, "UTF32",	rb_enc_from_encoding(rb_nkf_enc_get("UTF-32BE")));
-
+    /* 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");
+
+    /* 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(mNKF, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
+    rb_define_const(mKconv, "VERSION", rb_str_new2(RUBY_NKF_VERSION));
     /* Version of nkf */
-    rb_define_const(mNKF, "NKF_VERSION", rb_str_new2(NKF_VERSION));
+    rb_define_const(mKconv, "NKF_VERSION", rb_str_new2(NKF_VERSION));
     /* Release date of nkf */
-    rb_define_const(mNKF, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
+    rb_define_const(mKconv, "NKF_RELEASE_DATE", rb_str_new2(NKF_RELEASE_DATE));
 }
diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb
new file mode 100644
index 0000000000..a21c1f6c3c
--- /dev/null
+++ b/ext/openssl/lib/net/ftptls.rb
@@ -0,0 +1,53 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::HTTP.
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2003 Blaz Grilc <farmer@gmx.co.uk>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Requirements
+
+= Version
+  $Id$
+  
+= Notes
+  Tested on FreeBSD 5-CURRENT and 4-STABLE
+  - ruby 1.6.8 (2003-01-17) [i386-freebsd5]
+  - OpenSSL 0.9.7a Feb 19 2003
+  - ruby-openssl-0.2.0.p0
+  tested on ftp server: glftpd 1.30
+=end
+
+require 'socket'
+require 'openssl'
+require 'net/ftp'
+
+module Net
+  class FTPTLS < FTP
+    def 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
new file mode 100644
index 0000000000..2b69280432
--- /dev/null
+++ b/ext/openssl/lib/net/telnets.rb
@@ -0,0 +1,251 @@
+=begin
+= $RCSfile$ -- SSL/TLS enhancement for Net::Telnet.
+
+= Info
+  'OpenSSL for Ruby 2' project
+  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
+  All rights reserved.
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id$
+  
+  2001/11/06: Contiributed to Ruby/OpenSSL project.
+
+== class Net::Telnet
+
+This class will initiate SSL/TLS session automaticaly if the server
+sent OPT_STARTTLS. Some options are added for SSL/TLS.
+
+  host = Net::Telnet::new({
+           "Host"       => "localhost",
+           "Port"       => "telnets",
+           ## follows are new options.
+           'CertFile'   => "user.crt",
+           'KeyFile'    => "user.key",
+           'CAFile'     => "/some/where/certs/casert.pem",
+           'CAPath'     => "/some/where/caserts",
+           'VerifyMode' => SSL::VERIFY_PEER,
+           'VerifyCallback' => verify_proc
+         })
+
+Or, the new options ('Cert', 'Key' and 'CACert') are available from
+Michal Rokos's OpenSSL module.
+
+  cert_data = File.open("user.crt"){|io| io.read }
+  pkey_data = File.open("user.key"){|io| io.read }
+  cacert_data = File.open("your_ca.pem"){|io| io.read }
+  host = Net::Telnet::new({
+           "Host"       => "localhost",
+           "Port"       => "telnets",
+           'Cert'       => OpenSSL::X509::Certificate.new(cert_data)
+           'Key'        => OpenSSL::PKey::RSA.new(pkey_data)
+           'CACert'     => OpenSSL::X509::Certificate.new(cacert_data)
+           'CAFile'     => "/some/where/certs/casert.pem",
+           'CAPath'     => "/some/where/caserts",
+           'VerifyMode' => SSL::VERIFY_PEER,
+           'VerifyCallback' => verify_proc
+         })
+
+This class is expected to be a superset of usual Net::Telnet.
+=end
+
+require "net/telnet"
+require "openssl"
+
+module Net
+  class Telnet
+    attr_reader :ssl
+
+    OPT_STARTTLS       =  46.chr # "\056" # "\x2e" # Start TLS
+    TLS_FOLLOWS        =   1.chr # "\001" # "\x01" # FOLLOWS (for STARTTLS)
+
+    alias preprocess_orig preprocess
+
+    def ssl?; @ssl; end
+
+    def preprocess(string)
+      # combine CR+NULL into CR
+      string = string.gsub(/#{CR}#{NULL}/no, CR) if @options["Telnetmode"]
+
+      # combine EOL into "\n"
+      string = string.gsub(/#{EOL}/no, "\n") unless @options["Binmode"]
+
+      string.gsub(/#{IAC}(
+                   [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]|
+                   [#{DO}#{DONT}#{WILL}#{WONT}][#{OPT_BINARY}-#{OPT_EXOPL}]|
+                   #{SB}[#{OPT_BINARY}-#{OPT_EXOPL}]
+                     (#{IAC}#{IAC}|[^#{IAC}])+#{IAC}#{SE}
+                 )/xno) do
+        if    IAC == $1  # handle escaped IAC characters
+          IAC
+        elsif AYT == $1  # respond to "IAC AYT" (are you there)
+          self.write("nobody here but us pigeons" + EOL)
+          ''
+        elsif DO[0] == $1[0]  # respond to "IAC DO x"
+          if    OPT_BINARY[0] == $1[1]
+            @telnet_option["BINARY"] = true
+            self.write(IAC + WILL + OPT_BINARY)
+          elsif OPT_STARTTLS[0] == $1[1]
+            self.write(IAC + WILL + OPT_STARTTLS)
+            self.write(IAC + SB + OPT_STARTTLS + TLS_FOLLOWS + IAC + SE)
+          else
+            self.write(IAC + WONT + $1[1..1])
+          end
+          ''
+        elsif DONT[0] == $1[0]  # respond to "IAC DON'T x" with "IAC WON'T x"
+          self.write(IAC + WONT + $1[1..1])
+          ''
+        elsif WILL[0] == $1[0]  # respond to "IAC WILL x"
+          if    OPT_BINARY[0] == $1[1]
+            self.write(IAC + DO + OPT_BINARY)
+          elsif OPT_ECHO[0] == $1[1]
+            self.write(IAC + DO + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = true
+            self.write(IAC + DO + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        elsif WONT[0] == $1[0]  # respond to "IAC WON'T x"
+          if    OPT_ECHO[0] == $1[1]
+            self.write(IAC + DONT + OPT_ECHO)
+          elsif OPT_SGA[0]  == $1[1]
+            @telnet_option["SGA"] = false
+            self.write(IAC + DONT + OPT_SGA)
+          else
+            self.write(IAC + DONT + $1[1..1])
+          end
+          ''
+        elsif SB[0] == $1[0]    # respond to "IAC SB xxx IAC SE"
+          if    OPT_STARTTLS[0] == $1[1] && TLS_FOLLOWS[0] == $2[0]
+            @sock = OpenSSL::SSL::SSLSocket.new(@sock)
+            @sock.cert            = @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
index 24a9eed136..f10985ed2c 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -19,6 +19,7 @@ require 'openssl.so'
 require 'openssl/bn'
 require 'openssl/cipher'
 require 'openssl/digest'
+require 'openssl/pkcs7'
 require 'openssl/ssl'
 require 'openssl/x509'
 
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 5dabcd5135..761a017487 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -57,10 +57,10 @@ module Buffering
     if size == 0
       if buf
         buf.clear
-        return buf
       else
-        return ""
+        buf = ""
       end
+      return @eof ? nil : buf
     end
     until @eof
       break if size && size <= @rbuffer.size
@@ -78,10 +78,10 @@ module Buffering
     if maxlen == 0
       if buf
         buf.clear
-        return buf
       else
-        return ""
+        buf = ""
       end
+      return @eof ? nil : buf
     end
     if @rbuffer.empty?
       begin
@@ -99,7 +99,7 @@ module Buffering
     ret
   end
 
-  def gets(eol=$/, limit=nil)
+  def gets(eol=$/)
     idx = @rbuffer.index(eol)
     until @eof
       break if idx
@@ -111,9 +111,6 @@ module Buffering
     else
       size = idx ? idx+eol.size : nil
     end
-    if limit and limit >= 0
-      size = [size, limit].min
-    end
     consume_rbuff(size)
   end
 
diff --git a/ext/openssl/lib/openssl/pkcs7.rb b/ext/openssl/lib/openssl/pkcs7.rb
new file mode 100644
index 0000000000..1f88c1de5e
--- /dev/null
+++ b/ext/openssl/lib/openssl/pkcs7.rb
@@ -0,0 +1,25 @@
+=begin
+= $RCSfile$ -- PKCS7
+
+= Licence
+  This program is licenced under the same licence as Ruby.
+  (See the file 'LICENCE'.)
+
+= Version
+  $Id: digest.rb 12148 2007-04-05 05:59:22Z technorama $
+=end
+
+module OpenSSL
+  class PKCS7
+    # This class is only provided for backwards compatibility.  Use OpenSSL::PKCS7 in the future.
+    class PKCS7 < PKCS7
+      def initialize(*args)
+        super(*args)
+
+        warn("Warning: OpenSSL::PKCS7::PKCS7 is deprecated after Ruby 1.9; use OpenSSL::PKCS7 instead")
+      end
+    end
+
+  end # PKCS7
+end # OpenSSL
+
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 948c55f259..f722cb0c45 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -36,6 +36,7 @@ module OpenSSL
 
       def set_params(params={})
         params = DEFAULT_PARAMS.merge(params)
+        self.ssl_version = params.delete(:ssl_version)
         params.each{|name, value| self.__send__("#{name}=", value) }
         if self.verify_mode != OpenSSL::SSL::VERIFY_NONE
           unless self.ca_file or self.ca_path or self.cert_store
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index 1f81e4d5e6..e711bda39c 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -82,8 +82,7 @@ module OpenSSL
 
         def expand_pair(str)
           return nil unless str
-          return str.gsub(Pair){
-            pair = $&
+          return str.gsub(Pair){|pair|
             case pair.size
             when 2 then pair[1,1]
             when 3 then Integer("0x#{pair[1,2]}").chr
@@ -94,7 +93,7 @@ module OpenSSL
 
         def expand_hexstring(str)
           return nil unless str
-          der = str.gsub(HexPair){$&.to_i(16).chr }
+          der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
           a1 = OpenSSL::ASN1.decode(der)
           return a1.value, a1.tag
         end
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 3061a322d1..5a71f73c64 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -25,7 +25,7 @@ typedef char *d2i_of_void();
 
 #if !defined(PEM_read_bio_DSAPublicKey)
 # define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-        (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(void **)x,cb,u)
+        (char *(*)())d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,bp,(char **)x,cb,u)
 #endif
 
 #if !defined(PEM_write_bio_DSAPublicKey)
@@ -37,27 +37,27 @@ typedef char *d2i_of_void();
 
 #if !defined(DSAPrivateKey_dup)
 # define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPrivateKey, \
-	(d2i_of_void *)d2i_DSAPrivateKey,(char *)dsa)
+	(char *(*)())d2i_DSAPrivateKey,(char *)dsa)
 #endif
 
 #if !defined(DSAPublicKey_dup)
 # define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((int (*)())i2d_DSAPublicKey, \
-	(d2i_of_void *)d2i_DSAPublicKey,(char *)dsa)
+	(char *(*)())d2i_DSAPublicKey,(char *)dsa)
 #endif
 
 #if !defined(X509_REVOKED_dup)
 # define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
-	(d2i_of_void *)d2i_X509_REVOKED, (char *)rev)
+	(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, \
-	(d2i_of_void *)d2i_PKCS7_SIGNER_INFO, (char *)si)
+	(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, \
-	(d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
+	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
 #endif
 
 #if !defined(HAVE_EVP_MD_CTX_INIT)
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index b7a5236267..53f476fd65 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -15,7 +15,7 @@
  * String to HEXString conversion
  */
 int
-string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
 {
     static const char hex[]="0123456789abcdef";
     int i, len = 2 * buf_len;
@@ -446,7 +446,7 @@ Init_openssl()
     /*
      * Verify callback Proc index for ext-data
      */
-    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"ossl_verify_cb_idx", 0, 0, 0)) < 0)
+    if ((ossl_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, "ossl_verify_cb_idx", 0, 0, 0)) < 0)
         ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
 
     /*
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 33b0373c53..3cc30ae2e8 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -46,7 +46,11 @@ extern "C" {
 
 #if defined(_WIN32)
 #  define OSSL_NO_CONF_API 1
-#  include <winsock2.h>
+#  ifdef USE_WINSOCK2
+#    include <winsock2.h>
+#  else
+#    include <winsock.h>
+#  endif
 #endif
 #include <errno.h>
 #include <openssl/err.h>
@@ -106,7 +110,7 @@ extern VALUE eOSSLError;
 /*
  * String to HEXString conversion
  */
-int string2hex(const unsigned char *, int, char **, int *);
+int string2hex(char *, int, char **, int *);
 
 /*
  * Data Conversion
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 671bac14c1..8ceea95021 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -33,7 +33,7 @@ asn1time_to_time(ASN1_TIME *time)
 	
     switch (time->type) {
     case V_ASN1_UTCTIME:
-	if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	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");
 	} 
@@ -44,7 +44,7 @@ asn1time_to_time(ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
+	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" );
 	} 
@@ -80,7 +80,7 @@ time_to_time_t(VALUE time)
 VALUE
 asn1str_to_str(ASN1_STRING *str)
 {
-    return rb_str_new((const char *)str->data, str->length);
+    return rb_str_new(str->data, str->length);
 }
 
 /*
@@ -214,7 +214,7 @@ obj_to_asn1bstr(VALUE obj, long unused_bits)
     StringValue(obj);
     if(!(bstr = ASN1_BIT_STRING_new()))
 	ossl_raise(eASN1Error, NULL);
-    ASN1_BIT_STRING_set(bstr, (unsigned char *)RSTRING_PTR(obj), RSTRING_LEN(obj));
+    ASN1_BIT_STRING_set(bstr, RSTRING_PTR(obj), RSTRING_LEN(obj));
     bstr->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); /* clear */
     bstr->flags |= ASN1_STRING_FLAG_BITS_LEFT|(unused_bits&0x07);
 
@@ -307,7 +307,7 @@ static VALUE
 decode_bool(unsigned char* der, int length)
 {
     int bool;
-    const unsigned char *p;
+    unsigned char *p;
 
     p = der;
     if((bool = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
@@ -320,7 +320,7 @@ static VALUE
 decode_int(unsigned char* der, int length)
 {
     ASN1_INTEGER *ai;
-    const unsigned char *p;
+    unsigned char *p;
     VALUE ret; 
     int status = 0;
 
@@ -339,7 +339,7 @@ static VALUE
 decode_bstr(unsigned char* der, int length, long *unused_bits)
 {
     ASN1_BIT_STRING *bstr;
-    const unsigned char *p;
+    unsigned char *p, *buf;
     long len;
     VALUE ret;
 
@@ -347,11 +347,16 @@ decode_bstr(unsigned char* der, int length, long *unused_bits)
     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;
-    ret = rb_str_new((const char *)bstr->data, len);
+    memcpy(buf, bstr->data, len);
     ASN1_BIT_STRING_free(bstr);
+    ret = ossl_buf2str(buf, len);
 
     return ret;
 }
@@ -360,7 +365,7 @@ static VALUE
 decode_enum(unsigned char* der, int length)
 {
     ASN1_ENUMERATED *ai;
-    const unsigned char *p;
+    unsigned char *p;
     VALUE ret; 
     int status = 0;
 
@@ -379,7 +384,7 @@ static VALUE
 decode_null(unsigned char* der, int length)
 {
     ASN1_NULL *null;
-    const unsigned char *p;
+    unsigned char *p;
 
     p = der;
     if(!(null = d2i_ASN1_NULL(NULL, &p, length)))
@@ -393,7 +398,7 @@ static VALUE
 decode_obj(unsigned char* der, int length)
 {
     ASN1_OBJECT *obj;
-    const unsigned char *p;
+    unsigned char *p;
     VALUE ret;
     int nid;
     BIO *bio;
@@ -422,7 +427,7 @@ static VALUE
 decode_time(unsigned char* der, int length)
 {
     ASN1_TIME *time;
-    const unsigned char *p;
+    unsigned char *p;
     VALUE ret;
     int status = 0;
 
@@ -697,7 +702,7 @@ ossl_asn1data_to_der(VALUE self)
     if((length = ASN1_object_size(1, RSTRING_LEN(value), tag)) <= 0)
 	ossl_raise(eASN1Error, NULL);
     der = rb_str_new(0, length);
-    p = (unsigned char *)RSTRING_PTR(der);
+    p = RSTRING_PTR(der);
     ASN1_put_object(&p, is_cons, RSTRING_LEN(value), tag, tag_class);
     memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
     p += RSTRING_LEN(value);
@@ -711,7 +716,6 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 		  int once, int yield)
 {
     unsigned char *start, *p;
-    const unsigned char *p0;
     long len, off = *offset;
     int hlen, tag, tc, j;
     VALUE ary, asn1data, value, tag_class;
@@ -720,9 +724,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
     p = *pp;
     while(length > 0){
 	start = p;
-	p0 = p;
-	j = ASN1_get_object(&p0, &len, &tag, &tc, length);
-	p = (unsigned char *)p0;
+	j = ASN1_get_object(&p, &len, &tag, &tc, length);
 	if(j & 0x80) ossl_raise(eASN1Error, NULL);
 	hlen = p - start;
 	if(yield){
@@ -757,7 +759,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, long depth,
 	    else value = ossl_asn1_decode0(&p, len, &off, depth+1, 0, yield);
 	}
 	else{
-	    value = rb_str_new((const char *)p, len);
+	    value = rb_str_new(p, len);
 	    p += len;
 	    off += len;
 	}
@@ -822,7 +824,7 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = (unsigned char *)RSTRING_PTR(tmp);
+    p = RSTRING_PTR(tmp);
     ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 1);
 
     return Qnil;
@@ -838,7 +840,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = (unsigned char *)RSTRING_PTR(tmp);
+    p = RSTRING_PTR(tmp);
     ary = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 1, 0);
     ret = rb_ary_entry(ary, 0);
 
@@ -855,7 +857,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
-    p = (unsigned char *)RSTRING_PTR(tmp);
+    p = RSTRING_PTR(tmp);
     ret = ossl_asn1_decode0(&p, RSTRING_LEN(tmp), &offset, 0, 0, 0);
 
     return ret;
@@ -923,7 +925,7 @@ ossl_asn1prim_to_der(VALUE self)
 {
     ASN1_TYPE *asn1;
     int tn, tc, explicit;
-    long len, reallen;
+    long length, reallen;
     unsigned char *buf, *p;
     VALUE str;
 
@@ -932,25 +934,27 @@ ossl_asn1prim_to_der(VALUE self)
     explicit = ossl_asn1_is_explicit(self);
     asn1 = ossl_asn1_get_asn1type(self);
 
-    len = ASN1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
-    if(!(buf = OPENSSL_malloc(len))){
+    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);
+    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 <= len);
-    str = ossl_buf2str((char *)buf, reallen); /* buf will be free in ossl_buf2str */
+    assert(reallen <= length);
+    str = ossl_buf2str(buf, reallen); /* buf will be free in ossl_buf2str */
 
     return str;
 }
@@ -972,7 +976,7 @@ ossl_asn1cons_to_der(VALUE self)
     seq_len = ASN1_object_size(1, RSTRING_LEN(value), tag);
     length = ASN1_object_size(1, seq_len, tn);
     str = rb_str_new(0, length);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(tc == V_ASN1_UNIVERSAL)
 	ASN1_put_object(&p, 1, RSTRING_LEN(value), tn, tc);
     else{
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 794c97774f..6856476261 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -131,12 +131,12 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 
     switch (base) {
     case 0:
-	if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+	if (!BN_mpi2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
+	if (!BN_bin2bn(RSTRING_PTR(str), RSTRING_LEN(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -151,7 +151,7 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 	}
 	break;
     default:
-	ossl_raise(rb_eArgError, "invalid radix %d", base);
+	ossl_raise(rb_eArgError, "illegal radix %d", base);
     }
     return self;
 }
@@ -185,13 +185,13 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
     case 0:
 	len = BN_bn2mpi(bn, NULL);
         str = rb_str_new(0, len);
-	if (BN_bn2mpi(bn, (unsigned char *)RSTRING_PTR(str)) != len)
+	if (BN_bn2mpi(bn, RSTRING_PTR(str)) != len)
 	    ossl_raise(eBNError, NULL);
 	break;
     case 2:
 	len = BN_num_bytes(bn);
         str = rb_str_new(0, len);
-	if (BN_bn2bin(bn, (unsigned char *)RSTRING_PTR(str)) != len)
+	if (BN_bn2bin(bn, RSTRING_PTR(str)) != len)
 	    ossl_raise(eBNError, NULL);
 	break;
     case 10:
@@ -203,7 +203,7 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
 	str = ossl_buf2str(buf, strlen(buf));
 	break;
     default:
-	ossl_raise(rb_eArgError, "invalid radix %d", base);
+	ossl_raise(rb_eArgError, "illegal radix %d", base);
     }
 
     return str;
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 38d94a1196..b680dc6e64 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -67,7 +67,7 @@ ossl_cipher_free(EVP_CIPHER_CTX *ctx)
 {
     if (ctx) {
 	EVP_CIPHER_CTX_cleanup(ctx);
-	ruby_xfree(ctx);
+	free(ctx);
     }
 }
 
@@ -186,7 +186,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	 * We deprecated the arguments for this method, but we decided
 	 * keeping this behaviour for backward compatibility.
 	 */
-	const char *cname  = rb_class2name(rb_obj_class(self));
+	char *cname  = rb_class2name(rb_obj_class(self));
 	rb_warn("argumtents for %s#encrypt and %s#decrypt were deprecated; "
                 "use %s#pkcs5_keyivgen to derive key and IV",
                 cname, cname, cname);
@@ -202,7 +202,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	    else memcpy(iv, RSTRING_PTR(init_v), sizeof(iv));
 	}
 	EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), EVP_md5(), iv,
-		       (unsigned char *)RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
+		       RSTRING_PTR(pass), RSTRING_LEN(pass), 1, key, NULL);
 	p_key = key;
 	p_iv = iv;
     }
@@ -279,13 +279,13 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 	StringValue(vsalt);
 	if(RSTRING_LEN(vsalt) != PKCS5_SALT_LEN)
 	    rb_raise(eCipherError, "salt must be an 8-octet string");
-	salt = (unsigned char *)RSTRING_PTR(vsalt);
+	salt = RSTRING_PTR(vsalt);
     }
     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,
-		   (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv); 
+		   RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv); 
     if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
 	ossl_raise(eCipherError, NULL);
     OPENSSL_cleanse(key, sizeof key);
@@ -297,6 +297,26 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
+ *     cipher << data -> string
+ *
+ *  === Parameters
+ *  +data+ is a nonempty string.
+ *
+ * This method is deprecated and not available in 1.9.x or later.
+ */
+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 rb_funcall(self, rb_intern("update"), 1, data);
+}
+
+
+/*
+ *  call-seq:
  *     cipher.update(data [, buffer]) -> string or buffer
  *
  *  === Parameters
@@ -307,14 +327,14 @@ static VALUE
 ossl_cipher_update(int argc, VALUE *argv, VALUE self)
 {
     EVP_CIPHER_CTX *ctx;
-    unsigned char *in;
+    char *in;
     int in_len, out_len;
     VALUE data, str;
 
     rb_scan_args(argc, argv, "11", &data, &str);
 
     StringValue(data);
-    in = (unsigned char *)RSTRING_PTR(data);
+    in = RSTRING_PTR(data);
     if ((in_len = RSTRING_LEN(data)) == 0)
         rb_raise(rb_eArgError, "data must not be empty");
     GetCipher(self, ctx);
@@ -327,7 +347,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
         rb_str_resize(str, out_len);
     }
 
-    if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
+    if (!EVP_CipherUpdate(ctx, RSTRING_PTR(str), &out_len, in, in_len))
 	ossl_raise(eCipherError, NULL);
     assert(out_len < RSTRING_LEN(str));
     rb_str_set_len(str, out_len);
@@ -352,7 +372,7 @@ ossl_cipher_final(VALUE self)
 
     GetCipher(self, ctx);
     str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx));
-    if (!EVP_CipherFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), &out_len))
+    if (!EVP_CipherFinal_ex(ctx, RSTRING_PTR(str), &out_len))
 	ossl_raise(eCipherError, NULL);
     assert(out_len <= RSTRING_LEN(str));
     rb_str_set_len(str, out_len);
@@ -395,7 +415,7 @@ ossl_cipher_set_key(VALUE self, VALUE key)
     if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
         ossl_raise(eCipherError, "key length too short");
 
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, RSTRING_PTR(key), NULL, -1) != 1)
         ossl_raise(eCipherError, NULL);
 
     return key;
@@ -420,7 +440,7 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     if (RSTRING_LEN(iv) < EVP_CIPHER_CTX_iv_length(ctx))
         ossl_raise(eCipherError, "iv length too short");
 
-    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
+    if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, RSTRING_PTR(iv), -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return iv;
@@ -531,6 +551,9 @@ Init_ossl_cipher(void)
     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);
+#if RUBY_VERSION_CODE < 190
+    rb_define_method(cCipher, "<<", ossl_cipher_update_deprecated, 1);
+#endif
     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);
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index baa573d4bb..cc8e324029 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -389,8 +389,6 @@ ossl_config_each(VALUE self)
 {
     CONF *conf;
 
-    RETURN_ENUMERATOR(self, 0, 0);
-
     GetConfig(self, conf);
     lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL);
 
@@ -423,7 +421,7 @@ static VALUE
 ossl_config_inspect(VALUE self)
 {
     VALUE str, ary = ossl_config_get_sections(self);
-    const char *cname = rb_class2name(rb_obj_class(self));
+    char *cname = rb_class2name(rb_obj_class(self));
 
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index ecd52fec9c..879d399fe7 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -96,6 +96,7 @@ 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);
@@ -181,7 +182,7 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
         rb_str_resize(str, EVP_MD_CTX_size(ctx));
     }
 
-    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
+    EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL);
 
     return str;
 }
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index 52651ea880..cd835d1237 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -326,7 +326,7 @@ static VALUE
 ossl_engine_inspect(VALUE self)
 {
     VALUE str;
-    const char *cname = rb_class2name(rb_obj_class(self));
+    char *cname = rb_class2name(rb_obj_class(self));
     
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index aa7644aa5c..ef77d6c427 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -42,7 +42,7 @@ static void
 ossl_hmac_free(HMAC_CTX *ctx)
 {
     HMAC_CTX_cleanup(ctx);
-    ruby_xfree(ctx);
+    free(ctx);
 }
 
 static VALUE
@@ -103,13 +103,13 @@ ossl_hmac_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetHMAC(self, ctx);
-    HMAC_Update(ctx, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data));
+    HMAC_Update(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
 
     return self;
 }
 
 static void
-hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
+hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
 {
     HMAC_CTX final;
 
@@ -132,13 +132,13 @@ static VALUE
 ossl_hmac_digest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char *buf;
-    unsigned int buf_len;
+    char *buf;
+    int buf_len;
     VALUE digest;
 	
     GetHMAC(self, ctx);
     hmac_final(ctx, &buf, &buf_len);
-    digest = ossl_buf2str((char *)buf, buf_len);
+    digest = ossl_buf2str(buf, buf_len);
     
     return digest;
 }
@@ -152,9 +152,8 @@ static VALUE
 ossl_hmac_hexdigest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char *buf;
-    char *hexbuf;
-    unsigned int buf_len;
+    char *buf, *hexbuf;
+    int buf_len;
     VALUE hexdigest;
 	
     GetHMAC(self, ctx);
@@ -193,15 +192,15 @@ ossl_hmac_reset(VALUE self)
 static VALUE
 ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    unsigned char *buf;
-    unsigned int buf_len;
+    char *buf;
+    int buf_len;
 	
     StringValue(key);
     StringValue(data);
     buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
-	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+	       RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
 
-    return rb_str_new((const char *)buf, buf_len);
+    return rb_str_new(buf, buf_len);
 }
 
 /*
@@ -212,16 +211,15 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    unsigned char *buf;
-    char *hexbuf;
-    unsigned int buf_len;
+    char *buf, *hexbuf;
+    int buf_len;
     VALUE hexdigest;
 
     StringValue(key);
     StringValue(data);
 	
     buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
-	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+	       RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
     if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
 	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
     }
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 5ff58c3108..738a203d93 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -56,14 +56,14 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 {
     NETSCAPE_SPKI *spki;
     VALUE buffer;
-    const unsigned char *p;
+    unsigned char *p;
 	
     if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
 	return self;
     }
     StringValue(buffer);
     if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), -1))) {
-	p = (unsigned char *)RSTRING_PTR(buffer);
+	p = RSTRING_PTR(buffer);
 	if (!(spki = d2i_NETSCAPE_SPKI(NULL, &p, RSTRING_LEN(buffer)))) {
 	    ossl_raise(eSPKIError, NULL);
 	}
@@ -87,7 +87,7 @@ ossl_spki_to_der(VALUE self)
     if ((len = i2d_NETSCAPE_SPKI(spki, NULL)) <= 0)
         ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
         ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
@@ -172,7 +172,7 @@ ossl_spki_get_challenge(VALUE self)
 	return rb_str_new(0, 0);
     }
 
-    return rb_str_new((const char *)spki->spkac->challenge->data,
+    return rb_str_new(spki->spkac->challenge->data,
 		      spki->spkac->challenge->length);
 }
 
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index 6c6b5e8c42..1e8e5903bd 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -103,15 +103,15 @@ static VALUE
 ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    const unsigned char *p;
+    unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	OCSP_REQUEST *req = DATA_PTR(self);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char*)RSTRING_PTR(arg);
-	if(!d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg)) && (DATA_PTR(self) = req, 1)){
+	if(!d2i_OCSP_REQUEST((OCSP_REQUEST**)&DATA_PTR(self), &p,
+			     RSTRING_LEN(arg))){
 	    ossl_raise(eOCSPError, "cannot load DER encoded request");
 	}
     }
@@ -134,7 +134,7 @@ ossl_ocspreq_add_nonce(int argc, VALUE *argv, VALUE self)
     else{
 	StringValue(val);
 	GetOCSPReq(self, req);
-	ret = OCSP_request_add1_nonce(req, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
+	ret = OCSP_request_add1_nonce(req, RSTRING_PTR(val), RSTRING_LEN(val));
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
@@ -265,7 +265,7 @@ ossl_ocspreq_to_der(VALUE self)
     if((len = i2d_OCSP_REQUEST(req, NULL)) <= 0)
 	ossl_raise(eOCSPError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_OCSP_REQUEST(req, &p) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
@@ -310,16 +310,15 @@ static VALUE
 ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    const unsigned char *p;
+    unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	OCSP_RESPONSE *res = DATA_PTR(self);
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = (unsigned char *)RSTRING_PTR(arg);
-	if(!d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg)) &&
-	   (DATA_PTR(self) = res, 1)){
+	p = RSTRING_PTR(arg);
+	if(!d2i_OCSP_RESPONSE((OCSP_RESPONSE**)&DATA_PTR(self), &p,
+			      RSTRING_LEN(arg))){
 	    ossl_raise(eOCSPError, "cannot load DER encoded response");
 	}
     }
@@ -378,7 +377,7 @@ ossl_ocspres_to_der(VALUE self)
     if((len = i2d_OCSP_RESPONSE(res, NULL)) <= 0)
 	ossl_raise(eOCSPError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_OCSP_RESPONSE(res, NULL) <= 0)
 	ossl_raise(eOCSPError, NULL);
     ossl_str_adjust(str, p);
@@ -437,7 +436,7 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
     else{
 	StringValue(val);
 	GetOCSPBasicRes(self, bs);
-	ret = OCSP_basic_add1_nonce(bs, (unsigned char *)RSTRING_PTR(val), RSTRING_LEN(val));
+	ret = OCSP_basic_add1_nonce(bs, RSTRING_PTR(val), RSTRING_LEN(val));
     }
     if(!ret) ossl_raise(eOCSPError, NULL);
 
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index a58d5e05e8..2ec69ba8db 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -137,17 +137,15 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     X509 *x509;
     STACK_OF(X509) *x509s = NULL;
     int st = 0;
-    PKCS12 *pkcs = DATA_PTR(self);
 
     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, &pkcs);
-    DATA_PTR(self) = pkcs;
+    d2i_PKCS12_bio(in, (PKCS12 **)&DATA_PTR(self));
     BIO_free(in);
 
     pkey = cert = ca = Qnil;
-    if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
+    if(!PKCS12_parse((PKCS12*)DATA_PTR(self), passphrase, &key, &x509, &x509s))
 	ossl_raise(ePKCS12Error, "PKCS12_parse");
     pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
 		      &st); /* NO DUP */
@@ -183,7 +181,7 @@ ossl_pkcs12_to_der(VALUE self)
     if((len = i2d_PKCS12(p12, NULL)) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_PKCS12(p12, &p) <= 0)
 	ossl_raise(ePKCS12Error, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
index c4476dae38..007889fc94 100644
--- a/ext/openssl/ossl_pkcs5.c
+++ b/ext/openssl/ossl_pkcs5.c
@@ -72,9 +72,7 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU
 
     str = rb_str_new(0, len);
 
-    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass),
-			       (const unsigned char *)RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter),
-			       len, (unsigned char *)RSTRING_PTR(str)) != 1)
+    if (PKCS5_PBKDF2_HMAC_SHA1(RSTRING_PTR(pass), RSTRING_LEN(pass), RSTRING_PTR(salt), RSTRING_LEN(salt), NUM2INT(iter), len, RSTRING_PTR(str)) != 1)
         ossl_raise(ePKCS5, "PKCS5_PBKDF2_HMAC_SHA1");
 
     return str;
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index fe1ef7c5de..6918844779 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -309,7 +309,7 @@ ossl_pkcs7_alloc(VALUE klass)
 static VALUE
 ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 {
-    PKCS7 *p7, *pkcs = DATA_PTR(self);
+    PKCS7 *p7;
     BIO *in;
     VALUE arg;
 
@@ -317,12 +317,10 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    p7 = PEM_read_bio_PKCS7(in, &pkcs, NULL, NULL);
-    DATA_PTR(self) = pkcs;
+    p7 = PEM_read_bio_PKCS7(in, (PKCS7 **)&DATA_PTR(self), NULL, NULL);
     if (!p7) {
-	(void)BIO_reset(in);
-        p7 = d2i_PKCS7_bio(in, &pkcs);
-	DATA_PTR(self) = pkcs;
+	BIO_reset(in);
+        p7 = d2i_PKCS7_bio(in, (PKCS7 **)&DATA_PTR(self));
     }
     BIO_free(in);
     ossl_pkcs7_set_data(self, Qnil);
@@ -780,7 +778,7 @@ ossl_pkcs7_to_der(VALUE self)
     if((len = i2d_PKCS7(pkcs7, NULL)) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_PKCS7(pkcs7, &p) <= 0)
 	ossl_raise(ePKCS7Error, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index fc93fe165c..b295cfc25e 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -164,7 +164,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
 {
     EVP_PKEY *pkey;
     EVP_MD_CTX ctx;
-    unsigned int buf_len;
+    int buf_len;
     VALUE str;
 
     if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
@@ -175,7 +175,7 @@ ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
     StringValue(data);
     EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
     str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
-    if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
+    if (!EVP_SignFinal(&ctx, RSTRING_PTR(str), &buf_len, pkey))
 	ossl_raise(ePKeyError, NULL);
     assert(buf_len <= RSTRING_LEN(str));
     rb_str_set_len(str, buf_len);
@@ -194,7 +194,7 @@ ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
     StringValue(sig);
     StringValue(data);
     EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
-    switch (EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
+    switch (EVP_VerifyFinal(&ctx, RSTRING_PTR(sig), RSTRING_LEN(sig), pkey)) {
     case 0:
 	return Qfalse;
     case 1:
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index 4e58a95bf0..02c3d99ed8 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -169,7 +169,7 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
 	if (!dh){
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    dh = d2i_DHparams_bio(in, NULL);
 	}
 	BIO_free(in);
@@ -254,7 +254,7 @@ ossl_dh_to_der(VALUE self)
     if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
 	ossl_raise(eDHError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
 	ossl_raise(eDHError, NULL);
     ossl_str_adjust(str, p);
@@ -407,7 +407,7 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
     pub_key = GetBNPtr(pub);
     len = DH_size(dh);
     str = rb_str_new(0, len);
-    if ((len = DH_compute_key((unsigned char *)RSTRING_PTR(str), pub_key, dh)) < 0) {
+    if ((len = DH_compute_key(RSTRING_PTR(str), pub_key, dh)) < 0) {
 	ossl_raise(eDHError, NULL);
     }
     rb_str_set_len(str, len);
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index ebde0bbfbd..d9c7fcbe78 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -161,19 +161,19 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!dsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
 	}
 	if (!dsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
 	}
 	if (!dsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    dsa = d2i_DSAPrivateKey_bio(in, NULL);
 	}
 	if (!dsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    dsa = d2i_DSA_PUBKEY_bio(in, NULL);
 	}
 	BIO_free(in);
@@ -289,7 +289,7 @@ ossl_dsa_to_der(VALUE self)
     if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
 	ossl_raise(eDSAError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_func(pkey->pkey.dsa, &p) < 0)
 	ossl_raise(eDSAError, NULL);
     ossl_str_adjust(str, p);
@@ -387,7 +387,7 @@ static VALUE
 ossl_dsa_sign(VALUE self, VALUE data)
 {
     EVP_PKEY *pkey;
-    unsigned int buf_len;
+    int buf_len;
     VALUE str;
 
     GetPKeyDSA(self, pkey);
@@ -396,8 +396,7 @@ ossl_dsa_sign(VALUE self, VALUE data)
 	ossl_raise(eDSAError, "Private DSA key needed!");
     }
     str = rb_str_new(0, ossl_dsa_buf_size(pkey));
-    if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
-		  (unsigned char *)RSTRING_PTR(str),
+    if (!DSA_sign(0, RSTRING_PTR(data), RSTRING_LEN(data), RSTRING_PTR(str),
 		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
 	ossl_raise(eDSAError, NULL);
     }
@@ -421,8 +420,8 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     StringValue(digest);
     StringValue(sig);
     /* type is ignored (0) */
-    ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LEN(digest),
-		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
+    ret = DSA_verify(0, RSTRING_PTR(digest), RSTRING_LEN(digest),
+		     RSTRING_PTR(sig), RSTRING_LEN(sig), pkey->pkey.dsa);
     if (ret < 0) {
 	ossl_raise(eDSAError, NULL);
     }
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index d4285f2069..210054121d 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -186,15 +186,15 @@ static VALUE ossl_ec_key_initialize(int argc, VALUE *argv, VALUE self)
 
             ec = PEM_read_bio_ECPrivateKey(in, NULL, NULL, NULL);
             if (!ec) {
-                (void)BIO_reset(in);
+                BIO_reset(in);
                 ec = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, NULL);
             }
             if (!ec) {
-                (void)BIO_reset(in);
+                BIO_reset(in);
                 ec = d2i_ECPrivateKey_bio(in, NULL);
             }
             if (!ec) {
-                (void)BIO_reset(in);
+                BIO_reset(in);
                 ec = d2i_EC_PUBKEY_bio(in, NULL);
             }
 
@@ -695,7 +695,7 @@ static void ossl_ec_group_free(ossl_ec_group *ec_group)
 {
     if (!ec_group->dont_free && ec_group->group)
         EC_GROUP_clear_free(ec_group->group);
-    ruby_xfree(ec_group);
+    free(ec_group);
 }
 
 static VALUE ossl_ec_group_alloc(VALUE klass)
@@ -767,7 +767,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 
             group = PEM_read_bio_ECPKParameters(in, NULL, NULL, NULL);
             if (!group) {
-                (void)BIO_reset(in);
+                BIO_reset(in);
                 group = d2i_ECPKParameters_bio(in, NULL);
             }
 
@@ -1081,7 +1081,7 @@ static VALUE ossl_ec_group_get_seed(VALUE self)
     if (seed_len == 0)
         return Qnil;
 
-    return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
+    return rb_str_new(EC_GROUP_get0_seed(group), seed_len);
 }
 
 /*  call-seq:
@@ -1096,7 +1096,7 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
     Require_EC_GROUP(self, group);
     StringValue(seed);
 
-    if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
+    if (EC_GROUP_set_seed(group, RSTRING_PTR(seed), RSTRING_LEN(seed)) != RSTRING_LEN(seed))
         ossl_raise(eEC_GROUP, "EC_GROUP_set_seed");
 
     return seed;
@@ -1201,7 +1201,7 @@ static void ossl_ec_point_free(ossl_ec_point *ec_point)
 {
     if (!ec_point->dont_free && ec_point->point)
         EC_POINT_clear_free(ec_point->point);
-    ruby_xfree(ec_point);
+    free(ec_point);
 }
 
 static VALUE ossl_ec_point_alloc(VALUE klass)
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 52f5555f97..9ac69e7ded 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -151,23 +151,23 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
 	in = ossl_obj2bio(arg);
 	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!rsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    rsa = PEM_read_bio_RSAPublicKey(in, NULL, NULL, NULL);
 	}
 	if (!rsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
 	}
 	if (!rsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    rsa = d2i_RSAPrivateKey_bio(in, NULL);
 	}
 	if (!rsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    rsa = d2i_RSAPublicKey_bio(in, NULL);
 	}
 	if (!rsa) {
-	    (void)BIO_reset(in);
+	    BIO_reset(in);
 	    rsa = d2i_RSA_PUBKEY_bio(in, NULL);
 	}
 	BIO_free(in);
@@ -288,7 +288,7 @@ ossl_rsa_to_der(VALUE self)
     if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
 	ossl_raise(eRSAError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_func(pkey->pkey.rsa, &p) < 0)
 	ossl_raise(eRSAError, NULL);
     ossl_str_adjust(str, p);
@@ -315,8 +315,8 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
     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_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+    buf_len = RSA_public_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+				 RSTRING_PTR(str), pkey->pkey.rsa,
 				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
@@ -341,8 +341,8 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
     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_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+    buf_len = RSA_public_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+				 RSTRING_PTR(str), pkey->pkey.rsa,
 				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
@@ -370,8 +370,8 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
     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_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+    buf_len = RSA_private_encrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+				  RSTRING_PTR(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
@@ -400,8 +400,8 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
     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_LEN(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+    buf_len = RSA_private_decrypt(RSTRING_LEN(buffer), RSTRING_PTR(buffer),
+				  RSTRING_PTR(str), pkey->pkey.rsa,
 				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index af61fe33a0..ad830fbc98 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -99,7 +99,7 @@ ossl_rand_bytes(VALUE self, VALUE len)
     int n = NUM2INT(len);
 
     str = rb_str_new(0, n);
-    if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
+    if (!RAND_bytes(RSTRING_PTR(str), n)) {
 	ossl_raise(eRandomError, NULL);
     }
 
@@ -118,7 +118,7 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
     int n = NUM2INT(len);
 
     str = rb_str_new(0, n);
-    if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
+    if (!RAND_pseudo_bytes(RSTRING_PTR(str), n)) {
 	ossl_raise(eRandomError, NULL);
     }
 
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index 83fd2566d5..01b86fec27 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -297,7 +297,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 static VALUE
 ossl_call_session_get_cb(VALUE ary)
 {
-    VALUE ssl_obj, sslctx_obj, cb;
+    VALUE ssl_obj, sslctx_obj, cb, ret;
     
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
@@ -325,7 +325,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
     ssl_obj = (VALUE)ptr;
     ary = rb_ary_new2(2);
     rb_ary_push(ary, ssl_obj);
-    rb_ary_push(ary, rb_str_new((const char *)buf, len));
+    rb_ary_push(ary, rb_str_new(buf, len));
 
     ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state);
     if (state) {
@@ -344,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
 static VALUE
 ossl_call_session_new_cb(VALUE ary)
 {
-    VALUE ssl_obj, sslctx_obj, cb;
+    VALUE ssl_obj, sslctx_obj, cb, ret;
     
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
@@ -387,11 +387,10 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
     return RTEST(ret_obj) ? 1 : 0;
 }
 
-#if 0				/* unused */
 static VALUE
 ossl_call_session_remove_cb(VALUE ary)
 {
-    VALUE sslctx_obj, cb;
+    VALUE sslctx_obj, cb, ret;
     
     Check_Type(ary, T_ARRAY);
     sslctx_obj = rb_ary_entry(ary, 0);
@@ -401,7 +400,6 @@ ossl_call_session_remove_cb(VALUE ary)
 
     return rb_funcall(cb, rb_intern("call"), 1, ary);
 }
-#endif
 
 static void
 ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
@@ -565,7 +563,7 @@ ossl_sslctx_setup(VALUE self)
     val = ossl_sslctx_get_sess_id_ctx(self);
     if (!NIL_P(val)){
 	StringValue(val);
-	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
+	if (!SSL_CTX_set_session_id_context(ctx, RSTRING_PTR(val),
 					    RSTRING_LEN(val))){
 	    ossl_raise(eSSLError, "SSL_CTX_set_session_id_context:");
 	}
@@ -817,6 +815,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
     VALUE arg1;
     SSL_CTX *ctx;
     time_t tm = 0;
+    int cb_state;
 
     rb_scan_args(argc, argv, "01", &arg1);
 
@@ -1345,13 +1344,13 @@ Init_ossl_ssl()
 
     ID_callback_state = rb_intern("@callback_state");
 
-    ossl_ssl_ex_vcb_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_vcb_idx",0,0,0);
-    ossl_ssl_ex_store_p = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_store_p",0,0,0);
-    ossl_ssl_ex_ptr_idx = SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_ptr_idx",0,0,0);
+    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,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
+	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,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
+	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);
diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c
index b236e4d5f6..63c2bbb87a 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -36,6 +36,8 @@ static VALUE ossl_ssl_session_alloc(VALUE klass)
 static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 {
 	SSL_SESSION *ctx = NULL;
+	VALUE obj;
+	unsigned char *p;
 
 	if (RDATA(self)->data)
 		ossl_raise(eSSLSession, "SSL Session already initialized");
@@ -53,7 +55,7 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 		ctx = PEM_read_bio_SSL_SESSION(in, NULL, NULL, NULL);
 
 		if (!ctx) {
-			(void)BIO_reset(in);
+			BIO_reset(in);
 			ctx = d2i_SSL_SESSION_bio(in, NULL);
 		}
 
diff --git a/ext/openssl/ossl_version.h b/ext/openssl/ossl_version.h
index 193ceab089..63878e0d8e 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -11,6 +11,6 @@
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "1.1.0"
+#define OSSL_VERSION "1.0.0"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index a876ed5af2..ca1c59aba9 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -93,14 +93,15 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value;
     X509_ATTRIBUTE *attr;
-    const unsigned char *p;
+    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 = (unsigned char *)RSTRING_PTR(oid);
-	if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = attr, 1)){
+	p = RSTRING_PTR(oid);
+	if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self),
+			       &p, RSTRING_LEN(oid))){
 	    ossl_raise(eX509AttrError, NULL);
 	}
 	return self;
@@ -211,7 +212,7 @@ ossl_x509attr_get_value(VALUE self)
     if(OSSL_X509ATTR_IS_SINGLE(attr)){
 	length = i2d_ASN1_TYPE(attr->value.single, NULL);
 	str = rb_str_new(0, length);
-	p = (unsigned char *)RSTRING_PTR(str);
+	p = RSTRING_PTR(str);
 	i2d_ASN1_TYPE(attr->value.single, &p);
 	ossl_str_adjust(str, p);
     }
@@ -219,7 +220,7 @@ ossl_x509attr_get_value(VALUE self)
 	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 = (unsigned char *)RSTRING_PTR(str);
+	p = RSTRING_PTR(str);
 	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);
@@ -245,7 +246,7 @@ ossl_x509attr_to_der(VALUE self)
     if((len = i2d_X509_ATTRIBUTE(attr, NULL)) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
     rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str)); 
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index fec2d8b1a3..b97f27ffa9 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -134,7 +134,7 @@ static VALUE
 ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509 *x509, *x = DATA_PTR(self);
+    X509 *x509;
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -143,12 +143,10 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    x509 = PEM_read_bio_X509(in, &x, NULL, NULL);
-    DATA_PTR(self) = x;
+    x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL);
     if (!x509) {
-	(void)BIO_reset(in);
-	x509 = d2i_X509_bio(in, &x);
-	DATA_PTR(self) = x;
+	BIO_reset(in);
+	x509 = d2i_X509_bio(in, (X509 **)&DATA_PTR(self));
     }
     BIO_free(in);
     if (!x509) ossl_raise(eX509CertError, NULL);
@@ -192,7 +190,7 @@ ossl_x509_to_der(VALUE self)
     if ((len = i2d_X509(x509, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if (i2d_X509(x509, &p) <= 0)
 	ossl_raise(eX509CertError, NULL);
     ossl_str_adjust(str, p);
@@ -692,7 +690,7 @@ static VALUE
 ossl_x509_inspect(VALUE self)
 {
     VALUE str;
-    const char *cname = rb_class2name(rb_obj_class(self));
+    char *cname = rb_class2name(rb_obj_class(self));
 
     str = rb_str_new2("#<");
     rb_str_cat2(str, cname);
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index 1be9640e6b..be9ddacf48 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -91,7 +91,7 @@ static VALUE
 ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509_CRL *crl, *x = DATA_PTR(self);
+    X509_CRL *crl;
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -99,12 +99,10 @@ ossl_x509crl_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    crl = PEM_read_bio_X509_CRL(in, &x, NULL, NULL);
-    DATA_PTR(self) = x;
+    crl = PEM_read_bio_X509_CRL(in, (X509_CRL **)&DATA_PTR(self), NULL, NULL);
     if (!crl) {
-	(void)BIO_reset(in);
-	crl = d2i_X509_CRL_bio(in, &x);
-	DATA_PTR(self) = x;
+	BIO_reset(in);
+	crl = d2i_X509_CRL_bio(in, (X509_CRL **)&DATA_PTR(self));
     }
     BIO_free(in);
     if (!crl) ossl_raise(eX509CRLError, NULL);
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index b87b027e07..aa9366f901 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -110,7 +110,6 @@ ossl_x509extfactory_alloc(VALUE klass)
     VALUE obj;
 
     MakeX509ExtFactory(klass, obj, ctx);
-    rb_iv_set(obj, "@config", Qnil);
 
     return obj;
 }
@@ -274,15 +273,16 @@ static VALUE
 ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE oid, value, critical;
-    const unsigned char *p;
-    X509_EXTENSION *ext, *x = DATA_PTR(self);
+    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 = (unsigned char *)RSTRING_PTR(oid);
-	if(!d2i_X509_EXTENSION(&x, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = x, 1))
+	p  = RSTRING_PTR(oid);
+	if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self),
+			       &p, RSTRING_LEN(oid)))
 	    ossl_raise(eX509ExtError, NULL);
 	return self;
     }
@@ -409,7 +409,7 @@ ossl_x509ext_to_der(VALUE obj)
     if((len = i2d_X509_EXTENSION(ext, NULL)) <= 0)
 	ossl_raise(eX509ExtError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_X509_EXTENSION(ext, &p) < 0)
 	ossl_raise(eX509ExtError, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 8d80cd5986..b4434d2a34 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -135,12 +135,11 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
 	    rb_block_call(tmp, rb_intern("each"), 0, 0, ossl_x509name_init_i, args);
 	}
 	else{
-	    const unsigned char *p;
+	    unsigned char *p;
 	    VALUE str = ossl_to_der_if_possible(arg);
-	    X509_NAME *x = DATA_PTR(self);
 	    StringValue(str);
-	    p = (unsigned char *)RSTRING_PTR(str);
-	    if(!d2i_X509_NAME(&x, &p, RSTRING_LEN(str)) && (DATA_PTR(self) = x, 1)){
+	    p = RSTRING_PTR(str);
+	    if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING_LEN(str))){
 		ossl_raise(eX509NameError, NULL);
 	    }
 	}
@@ -165,7 +164,7 @@ VALUE ossl_x509name_add_entry(int argc, VALUE *argv, VALUE self)
     if(NIL_P(type)) type = rb_aref(OBJECT_TYPE_TEMPLATE, oid);
     GetX509Name(self, name);
     if (!X509_NAME_add_entry_by_txt(name, RSTRING_PTR(oid), NUM2INT(type),
-		(const unsigned char *)RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
+		RSTRING_PTR(value), RSTRING_LEN(value), -1, 0)) {
 	ossl_raise(eX509NameError, NULL);
     }
 
@@ -246,7 +245,7 @@ ossl_x509name_to_a(VALUE self)
 	}
 	short_name = OBJ_nid2sn(OBJ_ln2nid(long_name));
 	ary = rb_ary_new3(3, rb_str_new2(short_name),
-        		  rb_str_new((const char *)entry->value->data, entry->value->length),
+        		  rb_str_new(entry->value->data, entry->value->length),
         		  INT2FIX(entry->value->type));
 	rb_ary_push(ret, ary);
     }
@@ -320,7 +319,7 @@ ossl_x509name_to_der(VALUE self)
     if((len = i2d_X509_NAME(name, NULL)) <= 0)
 	ossl_raise(eX509NameError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if(i2d_X509_NAME(name, &p) <= 0)
 	ossl_raise(eX509NameError, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 7c1b610159..13a42dddaf 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -99,7 +99,7 @@ static VALUE
 ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
 {
     BIO *in;
-    X509_REQ *req, *x = DATA_PTR(self);
+    X509_REQ *req;
     VALUE arg;
 
     if (rb_scan_args(argc, argv, "01", &arg) == 0) {
@@ -107,12 +107,10 @@ ossl_x509req_initialize(int argc, VALUE *argv, VALUE self)
     }
     arg = ossl_to_der_if_possible(arg);
     in = ossl_obj2bio(arg);
-    req = PEM_read_bio_X509_REQ(in, &x, NULL, NULL);
-    DATA_PTR(self) = x;
+    req = PEM_read_bio_X509_REQ(in, (X509_REQ **)&DATA_PTR(self), NULL, NULL);
     if (!req) {
-	(void)BIO_reset(in);
-	req = d2i_X509_REQ_bio(in, &x);
-	DATA_PTR(self) = x;
+	BIO_reset(in);
+	req = d2i_X509_REQ_bio(in, (X509_REQ **)&DATA_PTR(self));
     }
     BIO_free(in);
     if (!req) ossl_raise(eX509ReqError, NULL);
@@ -173,7 +171,7 @@ ossl_x509req_to_der(VALUE self)
     if ((len = i2d_X509_REQ(req, NULL)) <= 0)
 	ossl_raise(eX509CertError, NULL);
     str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
+    p = RSTRING_PTR(str);
     if (i2d_X509_REQ(req, &p) <= 0)
 	ossl_raise(eX509ReqError, NULL);
     ossl_str_adjust(str, p);
diff --git a/ext/pty/.cvsignore b/ext/pty/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/pty/.cvsignore
+++ b/ext/pty/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 87fbdc6024..5e126fe0cf 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,6 +1,6 @@
 require 'mkmf'
 
-if /mswin|mingw|bccwin/ !~ RUBY_PLATFORM
+if /mswin32|mingw|bccwin32/ !~ RUBY_PLATFORM
   have_header("sys/stropts.h")
   have_func("setresuid")
   have_header("libutil.h")
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index a2cf175673..939335242f 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -1,7 +1,4 @@
-#include	"ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
+#include	"config.h"
 #include	<stdio.h>
 #include	<sys/types.h>
 #include	<sys/stat.h>
@@ -25,9 +22,9 @@
 #endif
 #include <ctype.h>
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "util.h"
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
@@ -119,7 +116,8 @@ char	MasterDevice[] = "/dev/pty%s",
 static VALUE eChildExited;
 
 static VALUE
-echild_status(VALUE self)
+echild_status(self)
+    VALUE self;
 {
     return rb_ivar_get(self, rb_intern("status"));
 }
@@ -131,23 +129,25 @@ struct pty_info {
 };
 
 static void
-raise_from_wait(const char *state, const struct pty_info *info)
+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: %ld", state, (long)info->child_pid);
     exc = rb_exc_new2(eChildExited, buf);
-    rb_iv_set(exc, "status", rb_last_status_get());
+    rb_iv_set(exc, "status", rb_last_status);
     rb_funcall(info->thread, rb_intern("raise"), 1, exc);
 }
 
 static VALUE
-pty_syswait(void *arg)
+pty_syswait(info)
+    struct pty_info *info;
 {
-    const struct pty_info *const info = arg;
-    rb_pid_t cpid;
-    int status;
+    int cpid, status;
 
     for (;;) {
 	cpid = rb_waitpid(info->child_pid, &status, WUNTRACED);
@@ -172,26 +172,31 @@ pty_syswait(void *arg)
     }
 }
 
-static void getDevice(int*, int*, char [DEVICELEN]);
+static void getDevice _((int*, int*, char [DEVICELEN]));
 
 struct exec_info {
     int argc;
     VALUE *argv;
 };
 
+static VALUE pty_exec _((VALUE v));
+
 static VALUE
-pty_exec(VALUE v)
+pty_exec(v)
+    VALUE v;
 {
     struct exec_info *arg = (struct exec_info *)v;
     return rb_f_exec(arg->argc, arg->argv);
 }
 
 static void
-establishShell(int argc, VALUE *argv, struct pty_info *info,
-	       char SlaveName[DEVICELEN])
+establishShell(argc, argv, info, SlaveName)
+    int argc;
+    VALUE *argv;
+    struct pty_info *info;
+    char SlaveName[DEVICELEN];
 {
-    int 		master,slave;
-    rb_pid_t		pid;
+    int 		i,master,slave;
     char		*p, tmp, *getenv();
     struct passwd	*pwent;
     VALUE		v;
@@ -199,7 +204,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     int			status;
 
     if (argc == 0) {
-	const char *shellname;
+	char *shellname;
 
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
@@ -218,13 +223,13 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     getDevice(&master, &slave, SlaveName);
 
     info->thread = rb_thread_current();
-    if ((pid = fork()) < 0) {
+    if((i = fork()) < 0) {
 	close(master);
 	close(slave);
 	rb_sys_fail("fork failed");
     }
 
-    if (pid == 0) {	/* child */
+    if(i == 0) {	/* child */
 	/*
 	 * Set free from process group and controlling terminal
 	 */
@@ -238,9 +243,9 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 #  else /* SETGRP_VOID */
 	if (setpgrp(0, getpid()) == -1)
 	    rb_sys_fail("setpgrp()");
-	{
-	    int i = open("/dev/tty", O_RDONLY);
-	    if (i < 0) rb_sys_fail("/dev/tty");
+	if ((i = open("/dev/tty", O_RDONLY)) < 0)
+	    rb_sys_fail("/dev/tty");
+	else {
 	    if (ioctl(i, TIOCNOTTY, (char *)0))
 		perror("ioctl(TIOCNOTTY)");
 	    close(i);
@@ -284,12 +289,13 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     read(master, &tmp, 1);
     close(slave);
 
-    info->child_pid = pid;
+    info->child_pid = i;
     info->fd = master;
 }
 
 static VALUE
-pty_finalize_syswait(struct pty_info *info)
+pty_finalize_syswait(info)
+    struct pty_info *info;
 {
     rb_thread_kill(info->thread);
     rb_funcall(info->thread, rb_intern("value"), 0);
@@ -298,7 +304,9 @@ pty_finalize_syswait(struct pty_info *info)
 }
 
 static int
-get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
+get_device_once(master, slave, SlaveName, fail)
+    int *master, *slave, fail;
+    char SlaveName[DEVICELEN];
 {
 #if defined HAVE_OPENPTY
 /*
@@ -321,7 +329,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
     }
 
     *slave = open(name, O_RDWR);
-    strlcpy(SlaveName, name, sizeof SlaveName);
+    strncpy(SlaveName, name, sizeof SlaveName);
 
     return 0;
 #else /* HAVE__GETPTY */
@@ -349,7 +357,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
 #endif
 				*master = i;
 				*slave = j;
-				strlcpy(SlaveName, pn, sizeof SlaveName);
+				strncpy(SlaveName, pn, sizeof SlaveName);
 				return 0;
 #if defined I_PUSH && !defined linux
 			    }
@@ -364,7 +372,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
     if (!fail) rb_raise(rb_eRuntimeError, "can't get Master/Slave device");
     return -1;
 #else
-    const char *const *p;
+    char **p;
     char MasterName[DEVICELEN];
 
     for (p = deviceNo; *p != NULL; p++) {
@@ -388,17 +396,22 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
 }
 
 static void
-getDevice(int *master, int *slave, char SlaveName[DEVICELEN])
+getDevice(master, slave, slavename)
+    int *master, *slave;
+    char slavename[DEVICELEN];
 {
-    if (get_device_once(master, slave, SlaveName, 0)) {
+    if (get_device_once(master, slave, slavename, 0)) {
 	rb_gc();
-	get_device_once(master, slave, SlaveName, 1);
+	get_device_once(master, slave, slavename, 1);
     }
 }
 
 /* ruby function: getpty */
 static VALUE
-pty_getpty(int argc, VALUE *argv, VALUE self)
+pty_getpty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE res;
     struct pty_info info;
@@ -414,17 +427,17 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
     establishShell(argc, argv, &info, SlaveName);
 
     rfptr->mode = rb_io_mode_flags("r");
-    rfptr->fd = info.fd;
+    rfptr->f = fdopen(info.fd, "r");
     rfptr->path = strdup(SlaveName);
 
     wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
-    wfptr->fd = dup(info.fd);
+    wfptr->f = fdopen(dup(info.fd), "w");
     wfptr->path = strdup(SlaveName);
 
     res = rb_ary_new2(3);
     rb_ary_store(res,0,(VALUE)rport);
     rb_ary_store(res,1,(VALUE)wport);
-    rb_ary_store(res,2,PIDT2NUM(info.child_pid));
+    rb_ary_store(res,2,INT2FIX(info.child_pid));
 
     thinfo.thread = rb_thread_create(pty_syswait, (void*)&info);
     thinfo.child_pid = info.child_pid;
@@ -439,7 +452,8 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
 
 /* ruby function: protect_signal - obsolete */
 static VALUE
-pty_protect(VALUE self)
+pty_protect(self)
+    VALUE self;
 {
     rb_warn("PTY::protect_signal is no longer needed");
     rb_yield(Qnil);
@@ -448,7 +462,8 @@ pty_protect(VALUE self)
 
 /* ruby function: reset_signal - obsolete */
 static VALUE
-pty_reset_signal(VALUE self)
+pty_reset_signal(self)
+    VALUE self;
 {
     rb_warn("PTY::reset_signal is no longer needed");
     return self;
diff --git a/ext/racc/cparse/.cvsignore b/ext/racc/cparse/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/racc/cparse/.cvsignore
+++ b/ext/racc/cparse/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/racc/cparse/README b/ext/racc/cparse/README
deleted file mode 100644
index 80b4dce311..0000000000
--- a/ext/racc/cparse/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Racc Runtime README
-===================
-
-This directory contains a runtime library of
-Racc parser generator.  If you want to generate
-your own parser, you must get Racc full package.
-Get it from:
-
-  http://raa.ruby-lang.org/list.rhtml?name=racc
-
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index d085158f11..18a26f670f 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -11,7 +11,8 @@
 
 */
 
-#include "ruby/ruby.h"
+#include "ruby.h"
+#include "version.h"
 
 /* -----------------------------------------------------------------------
                         Important Constants
@@ -64,6 +65,9 @@ static ID id_d_e_pop;
 #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));
@@ -84,7 +88,7 @@ num_to_long(VALUE n)
 }
 
 #define AREF(s, idx) \
-    ((0 <= idx && idx < RARRAY_LEN(s)) ? RARRAY_PTR(s)[idx] : Qnil)
+    ((0 <= idx && idx < RARRAY(s)->len) ? RARRAY(s)->ptr[idx] : Qnil)
 
 /* -----------------------------------------------------------------------
                         Parser Stack Interfaces
@@ -97,8 +101,8 @@ static VALUE
 get_stack_tail(VALUE stack, long len)
 {
     if (len < 0) return Qnil;  /* system error */
-    if (len > RARRAY_LEN(stack)) len = RARRAY_LEN(stack);
-    return rb_ary_new4(len, RARRAY_PTR(stack) + RARRAY_LEN(stack) - len);
+    if (len > RARRAY(stack)->len) len = RARRAY(stack)->len;
+    return rb_ary_new4(len, RARRAY(stack)->ptr + RARRAY(stack)->len - len);
 }
 
 static void
@@ -112,10 +116,10 @@ cut_stack_tail(VALUE stack, long len)
 
 #define STACK_INIT_LEN 64
 #define NEW_STACK() rb_ary_new2(STACK_INIT_LEN)
-#define PUSH(s, i) rb_ary_store(s, RARRAY_LEN(s), i)
+#define PUSH(s, i) rb_ary_store(s, RARRAY(s)->len, i)
 #define POP(s) rb_ary_pop(s)
 #define LAST_I(s) \
-    ((RARRAY_LEN(s) > 0) ? RARRAY_PTR(s)[RARRAY_LEN(s) - 1] : Qnil)
+    ((RARRAY(s)->len > 0) ? RARRAY(s)->ptr[RARRAY(s)->len - 1] : Qnil)
 #define GET_TAIL(s, len) get_stack_tail(s, len)
 #define CUT_TAIL(s, len) cut_stack_tail(s, len)
 
@@ -325,23 +329,23 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     v->debug = RTEST(rb_ivar_get(parser, id_yydebug));
 
     Check_Type(arg, T_ARRAY);
-    if (!(13 <= RARRAY_LEN(arg) && RARRAY_LEN(arg) <= 14))
-        rb_raise(RaccBug, "[Racc Bug] wrong arg.size %ld", RARRAY_LEN(arg));
-    v->action_table   = assert_array  (RARRAY_PTR(arg)[ 0]);
-    v->action_check   = assert_array  (RARRAY_PTR(arg)[ 1]);
-    v->action_default = assert_array  (RARRAY_PTR(arg)[ 2]);
-    v->action_pointer = assert_array  (RARRAY_PTR(arg)[ 3]);
-    v->goto_table     = assert_array  (RARRAY_PTR(arg)[ 4]);
-    v->goto_check     = assert_array  (RARRAY_PTR(arg)[ 5]);
-    v->goto_default   = assert_array  (RARRAY_PTR(arg)[ 6]);
-    v->goto_pointer   = assert_array  (RARRAY_PTR(arg)[ 7]);
-    v->nt_base        = assert_integer(RARRAY_PTR(arg)[ 8]);
-    v->reduce_table   = assert_array  (RARRAY_PTR(arg)[ 9]);
-    v->token_table    = assert_hash   (RARRAY_PTR(arg)[10]);
-    v->shift_n        = assert_integer(RARRAY_PTR(arg)[11]);
-    v->reduce_n       = assert_integer(RARRAY_PTR(arg)[12]);
-    if (RARRAY_LEN(arg) > 13) {
-        v->use_result_var = RTEST(RARRAY_PTR(arg)[13]);
+    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]);
+    if (RARRAY(arg)->len > 13) {
+        v->use_result_var = RTEST(RARRAY(arg)->ptr[13]);
     }
     else {
         v->use_result_var = Qtrue;
@@ -416,12 +420,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
                  v->lex_is_iterator ? "yielded" : "returned",
                  rb_class2name(CLASS_OF(block_args)));
     }
-    if (RARRAY_LEN(block_args) != 2) {
+    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",
-                 RARRAY_LEN(block_args));
+                 RARRAY(block_args)->len);
     }
     *tok = AREF(block_args, 0);
     *val = AREF(block_args, 1);
@@ -557,7 +561,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
   accept:
     if (v->debug) rb_funcall(v->parser, id_d_accept, 0);
-    v->retval = RARRAY_PTR(v->vstack)[0];
+    v->retval = RARRAY(v->vstack)->ptr[0];
     v->fin = CP_FIN_ACCEPT;
     return;
 
@@ -617,7 +621,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
       error_pop:
         D_puts("(err) act not found: can't handle error token; pop");
 
-        if (RARRAY_LEN(v->state) <= 1) {
+        if (RARRAY(v->state)->len <= 1) {
             v->retval = Qnil;
             v->fin = CP_FIN_CANTPOP;
             return;
@@ -686,9 +690,9 @@ reduce0(VALUE val, VALUE data, VALUE self)
     VALUE goto_state;
 
     Data_Get_Struct(data, struct cparse_params, v);
-    reduce_len = RARRAY_PTR(v->reduce_table)[v->ruleno];
-    reduce_to  = RARRAY_PTR(v->reduce_table)[v->ruleno+1];
-    method_id  = RARRAY_PTR(v->reduce_table)[v->ruleno+2];
+    reduce_len = RARRAY(v->reduce_table)->ptr[v->ruleno];
+    reduce_to  = RARRAY(v->reduce_table)->ptr[v->ruleno+1];
+    method_id  = RARRAY(v->reduce_table)->ptr[v->ruleno+2];
     len = NUM2LONG(reduce_len);
     mid = value_to_id(method_id);
 
@@ -703,10 +707,10 @@ reduce0(VALUE val, VALUE data, VALUE self)
     else {
         if (mid != id_noreduce) {
             tmp_v = GET_TAIL(v->vstack, len);
-            tmp = RARRAY_PTR(tmp_v)[0];
+            tmp = RARRAY(tmp_v)->ptr[0];
         }
         else {
-            tmp = RARRAY_PTR(v->vstack)[ RARRAY_LEN(v->vstack) - len ];
+            tmp = RARRAY(v->vstack)->ptr[ RARRAY(v->vstack)->len - len ];
         }
         CUT_TAIL(v->vstack, len);
         if (v->debug) {
@@ -735,7 +739,7 @@ reduce0(VALUE val, VALUE data, VALUE self)
     }
 
     /* calculate transition state */
-    if (RARRAY_LEN(v->state) == 0)
+    if (RARRAY(v->state)->len == 0)
         rb_raise(RaccBug, "state stack unexpectedly empty");
     k2 = num_to_long(LAST_I(v->state));
     k1 = num_to_long(reduce_to) - v->nt_base;
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index 3710f6f7e7..dd953a7e15 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,5 +1,4 @@
 # $Id$
 
 require 'mkmf'
-have_func('rb_block_call', 'ruby/ruby.h')
 create_makefile 'racc/cparse'
diff --git a/ext/readline/.cvsignore b/ext/readline/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/readline/.cvsignore
+++ b/ext/readline/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index cd500ceec8..b820c0b32f 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -15,10 +15,6 @@ def have_readline_var(var)
   return have_var(var, $readline_headers)
 end
 
-def have_readline_func(func)
-  return have_func(func, $readline_headers)
-end
-
 dir_config('curses')
 dir_config('ncurses')
 dir_config('termcap')
@@ -46,9 +42,9 @@ else
   end
 end
 
-have_readline_func("rl_filename_completion_function")
-have_readline_func("rl_username_completion_function")
-have_readline_func("rl_completion_matches")
+have_func("rl_filename_completion_function")
+have_func("rl_username_completion_function")
+have_func("rl_completion_matches")
 have_readline_var("rl_deprep_term_function")
 have_readline_var("rl_completion_append_character")
 have_readline_var("rl_basic_word_break_characters")
@@ -58,12 +54,11 @@ 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")
-# workaround for native windows.
-/mswin|bccwin|mingw/ !~ RUBY_PLATFORM && have_readline_var("rl_event_hook")
-have_readline_func("rl_cleanup_after_signal")
-have_readline_func("rl_clear_signals")
-have_readline_func("rl_vi_editing_mode")
-have_readline_func("rl_emacs_editing_mode")
-have_readline_func("replace_history_entry")
-have_readline_func("remove_history")
+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("replace_history_entry")
+have_func("remove_history")
 create_makefile("readline")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 6481e4854f..c9acaadac9 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -1,13 +1,10 @@
 /* readline.c -- GNU Readline module
    Copyright (C) 1997-2001  Shugo Maeda */
 
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-
-#include "ruby/config.h"
+#include "config.h"
 #include <errno.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <string.h>
 #ifdef HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -19,9 +16,9 @@
 #include <editline/readline.h>
 #endif
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/signal.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -29,6 +26,8 @@
 
 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;
@@ -47,11 +46,15 @@ static char **readline_attempted_completion_function(const char *text,
                                                      int start, int end);
 
 #ifdef HAVE_RL_EVENT_HOOK
+#ifdef DOSISH
+#define BUSY_WAIT 1
+#else
 #define BUSY_WAIT 0
+#endif
 
 static int readline_event(void);
 static int
-readline_event(void)
+readline_event()
 {
 #if BUSY_WAIT
     rb_thread_schedule();
@@ -67,21 +70,31 @@ readline_event(void)
 #endif
 
 static VALUE
-readline_readline(int argc, VALUE *argv, VALUE self)
+readline_readline(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE tmp, add_hist, result;
     char *prompt = NULL;
     char *buff;
     int status;
+    rb_io_t *ofp, *ifp;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "02", &tmp, &add_hist) > 0) {
 	SafeStringValue(tmp);
-	prompt = RSTRING_PTR(tmp);
+	prompt = RSTRING(tmp)->ptr;
     }
 
     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) {
@@ -102,10 +115,8 @@ readline_readline(int argc, VALUE *argv, VALUE self)
     if (RTEST(add_hist) && buff) {
 	add_history(buff);
     }
-    if (buff) {
+    if (buff)
 	result = rb_tainted_str_new2(buff);
-	rb_enc_associate(result, rb_locale_encoding());
-    }
     else
 	result = Qnil;
     if (buff) free(buff);
@@ -113,31 +124,9 @@ readline_readline(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-readline_s_set_input(VALUE self, VALUE input)
-{
-    rb_io_t *ifp;
-
-    rb_secure(4);
-    Check_Type(input, T_FILE);
-    GetOpenFile(input, ifp);
-    rl_instream = rb_io_stdio_file(ifp);
-    return input;
-}
-
-static VALUE
-readline_s_set_output(VALUE self, VALUE output)
-{
-    rb_io_t *ofp;
-
-    rb_secure(4);
-    Check_Type(output, T_FILE);
-    GetOpenFile(output, ofp);
-    rl_outstream = rb_io_stdio_file(ofp);
-    return output;
-}
-
-static VALUE
-readline_s_set_completion_proc(VALUE self, VALUE proc)
+readline_s_set_completion_proc(self, proc)
+    VALUE self;
+    VALUE proc;
 {
     rb_secure(4);
     if (!rb_respond_to(proc, rb_intern("call")))
@@ -146,28 +135,35 @@ readline_s_set_completion_proc(VALUE self, VALUE proc)
 }
 
 static VALUE
-readline_s_get_completion_proc(VALUE self)
+readline_s_get_completion_proc(self)
+    VALUE self;
 {
     rb_secure(4);
     return rb_attr_get(mReadline, completion_proc);
 }
 
 static VALUE
-readline_s_set_completion_case_fold(VALUE self, VALUE val)
+readline_s_set_completion_case_fold(self, val)
+    VALUE self;
+    VALUE val;
 {
     rb_secure(4);
     return rb_ivar_set(mReadline, completion_case_fold, val);
 }
 
 static VALUE
-readline_s_get_completion_case_fold(VALUE self)
+readline_s_get_completion_case_fold(self)
+    VALUE self;
 {
     rb_secure(4);
     return rb_attr_get(mReadline, completion_case_fold);
 }
 
 static char **
-readline_attempted_completion_function(const char *text, int start, int end)
+readline_attempted_completion_function(text, start, end)
+    const char *text;
+    int start;
+    int end;
 {
     VALUE proc, ary, temp;
     char **result;
@@ -184,14 +180,14 @@ readline_attempted_completion_function(const char *text, int start, int end)
     ary = rb_funcall(proc, rb_intern("call"), 1, rb_tainted_str_new2(text));
     if (TYPE(ary) != T_ARRAY)
 	ary = rb_Array(ary);
-    matches = RARRAY_LEN(ary);
+    matches = RARRAY(ary)->len;
     if (matches == 0)
 	return NULL;
     result = ALLOC_N(char *, matches + 2);
     for (i = 0; i < matches; i++) {
-	temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
-	result[i + 1] = ALLOC_N(char, RSTRING_LEN(temp) + 1);
-	strcpy(result[i + 1], RSTRING_PTR(temp));
+	temp = rb_obj_as_string(RARRAY(ary)->ptr[i]);
+	result[i + 1] = ALLOC_N(char, RSTRING(temp)->len + 1);
+	strcpy(result[i + 1], RSTRING(temp)->ptr);
     }
     result[matches + 1] = NULL;
 
@@ -231,7 +227,8 @@ readline_attempted_completion_function(const char *text, int start, int end)
 }
 
 static VALUE
-readline_s_vi_editing_mode(VALUE self)
+readline_s_vi_editing_mode(self)
+    VALUE self;
 {
 #ifdef HAVE_RL_VI_EDITING_MODE
     rb_secure(4);
@@ -244,7 +241,8 @@ readline_s_vi_editing_mode(VALUE self)
 }
 
 static VALUE
-readline_s_emacs_editing_mode(VALUE self)
+readline_s_emacs_editing_mode(self)
+    VALUE self;
 {
 #ifdef HAVE_RL_EMACS_EDITING_MODE
     rb_secure(4);
@@ -257,7 +255,8 @@ readline_s_emacs_editing_mode(VALUE self)
 }
 
 static VALUE
-readline_s_set_completion_append_character(VALUE self, VALUE str)
+readline_s_set_completion_append_character(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
     rb_secure(4);
@@ -266,10 +265,10 @@ readline_s_set_completion_append_character(VALUE self, VALUE str)
     }
     else {
 	SafeStringValue(str);
-	if (RSTRING_LEN(str) == 0) {
+	if (RSTRING(str)->len == 0) {
 	    rl_completion_append_character = '\0';
 	} else {
-	    rl_completion_append_character = RSTRING_PTR(str)[0];
+	    rl_completion_append_character = RSTRING(str)->ptr[0];
 	}
     }
     return self;
@@ -280,7 +279,8 @@ readline_s_set_completion_append_character(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_completion_append_character(VALUE self)
+readline_s_get_completion_append_character(self)
+    VALUE self;
 {
 #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
     VALUE str;
@@ -290,7 +290,7 @@ readline_s_get_completion_append_character(VALUE self)
 	return Qnil;
 
     str = rb_str_new("", 1);
-    RSTRING_PTR(str)[0] = rl_completion_append_character;
+    RSTRING(str)->ptr[0] = rl_completion_append_character;
     return str;
 #else
     rb_notimplement();
@@ -299,7 +299,8 @@ readline_s_get_completion_append_character(VALUE self)
 }
 
 static VALUE
-readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_set_basic_word_break_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
     static char *basic_word_break_characters = NULL;
@@ -308,14 +309,14 @@ readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
     SafeStringValue(str);
     if (basic_word_break_characters == NULL) {
 	basic_word_break_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+	    ALLOC_N(char, RSTRING(str)->len + 1);
     }
     else {
-	REALLOC_N(basic_word_break_characters, char, RSTRING_LEN(str) + 1);
+	REALLOC_N(basic_word_break_characters, char, RSTRING(str)->len + 1);
     }
     strncpy(basic_word_break_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
-    basic_word_break_characters[RSTRING_LEN(str)] = '\0';
+	    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
@@ -325,7 +326,8 @@ readline_s_set_basic_word_break_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
+readline_s_get_basic_word_break_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_BASIC_WORD_BREAK_CHARACTERS
     rb_secure(4);
@@ -339,7 +341,8 @@ readline_s_get_basic_word_break_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_set_completer_word_break_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
     static char *completer_word_break_characters = NULL;
@@ -348,14 +351,14 @@ readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
     SafeStringValue(str);
     if (completer_word_break_characters == NULL) {
 	completer_word_break_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+	    ALLOC_N(char, RSTRING(str)->len + 1);
     }
     else {
-	REALLOC_N(completer_word_break_characters, char, RSTRING_LEN(str) + 1);
+	REALLOC_N(completer_word_break_characters, char, RSTRING(str)->len + 1);
     }
     strncpy(completer_word_break_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
-    completer_word_break_characters[RSTRING_LEN(str)] = '\0';
+	    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
@@ -365,7 +368,8 @@ readline_s_set_completer_word_break_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
+readline_s_get_completer_word_break_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_COMPLETER_WORD_BREAK_CHARACTERS
     rb_secure(4);
@@ -379,7 +383,8 @@ readline_s_get_completer_word_break_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_set_basic_quote_characters(VALUE self, VALUE str)
+readline_s_set_basic_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
     static char *basic_quote_characters = NULL;
@@ -388,14 +393,14 @@ readline_s_set_basic_quote_characters(VALUE self, VALUE str)
     SafeStringValue(str);
     if (basic_quote_characters == NULL) {
 	basic_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+	    ALLOC_N(char, RSTRING(str)->len + 1);
     }
     else {
-	REALLOC_N(basic_quote_characters, char, RSTRING_LEN(str) + 1);
+	REALLOC_N(basic_quote_characters, char, RSTRING(str)->len + 1);
     }
     strncpy(basic_quote_characters,
-	    RSTRING_PTR(str), RSTRING_LEN(str));
-    basic_quote_characters[RSTRING_LEN(str)] = '\0';
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    basic_quote_characters[RSTRING(str)->len] = '\0';
     rl_basic_quote_characters = basic_quote_characters;
 
     return self;
@@ -406,7 +411,8 @@ readline_s_set_basic_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_basic_quote_characters(VALUE self, VALUE str)
+readline_s_get_basic_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_BASIC_QUOTE_CHARACTERS
     rb_secure(4);
@@ -420,7 +426,8 @@ readline_s_get_basic_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_set_completer_quote_characters(VALUE self, VALUE str)
+readline_s_set_completer_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
     static char *completer_quote_characters = NULL;
@@ -429,13 +436,14 @@ readline_s_set_completer_quote_characters(VALUE self, VALUE str)
     SafeStringValue(str);
     if (completer_quote_characters == NULL) {
 	completer_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+	    ALLOC_N(char, RSTRING(str)->len + 1);
     }
     else {
-	REALLOC_N(completer_quote_characters, char, RSTRING_LEN(str) + 1);
+	REALLOC_N(completer_quote_characters, char, RSTRING(str)->len + 1);
     }
-    strncpy(completer_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
-    completer_quote_characters[RSTRING_LEN(str)] = '\0';
+    strncpy(completer_quote_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    completer_quote_characters[RSTRING(str)->len] = '\0';
     rl_completer_quote_characters = completer_quote_characters;
 
     return self;
@@ -446,7 +454,8 @@ readline_s_set_completer_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_completer_quote_characters(VALUE self, VALUE str)
+readline_s_get_completer_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_COMPLETER_QUOTE_CHARACTERS
     rb_secure(4);
@@ -460,7 +469,8 @@ readline_s_get_completer_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_set_filename_quote_characters(VALUE self, VALUE str)
+readline_s_set_filename_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
     static char *filename_quote_characters = NULL;
@@ -469,13 +479,14 @@ readline_s_set_filename_quote_characters(VALUE self, VALUE str)
     SafeStringValue(str);
     if (filename_quote_characters == NULL) {
 	filename_quote_characters =
-	    ALLOC_N(char, RSTRING_LEN(str) + 1);
+	    ALLOC_N(char, RSTRING(str)->len + 1);
     }
     else {
-	REALLOC_N(filename_quote_characters, char, RSTRING_LEN(str) + 1);
+	REALLOC_N(filename_quote_characters, char, RSTRING(str)->len + 1);
     }
-    strncpy(filename_quote_characters, RSTRING_PTR(str), RSTRING_LEN(str));
-    filename_quote_characters[RSTRING_LEN(str)] = '\0';
+    strncpy(filename_quote_characters,
+	    RSTRING(str)->ptr, RSTRING(str)->len);
+    filename_quote_characters[RSTRING(str)->len] = '\0';
     rl_filename_quote_characters = filename_quote_characters;
 
     return self;
@@ -486,7 +497,8 @@ readline_s_set_filename_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-readline_s_get_filename_quote_characters(VALUE self, VALUE str)
+readline_s_get_filename_quote_characters(self, str)
+    VALUE self, str;
 {
 #ifdef HAVE_RL_FILENAME_QUOTE_CHARACTERS
     rb_secure(4);
@@ -500,13 +512,16 @@ readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 }
 
 static VALUE
-hist_to_s(VALUE self)
+hist_to_s(self)
+    VALUE self;
 {
     return rb_str_new2("HISTORY");
 }
 
 static VALUE
-hist_get(VALUE self, VALUE index)
+hist_get(self, index)
+    VALUE self;
+    VALUE index;
 {
     HIST_ENTRY *entry;
     int i;
@@ -524,7 +539,10 @@ hist_get(VALUE self, VALUE index)
 }
 
 static VALUE
-hist_set(VALUE self, VALUE index, VALUE str)
+hist_set(self, index, str)
+    VALUE self;
+    VALUE index;
+    VALUE str;
 {
 #ifdef HAVE_REPLACE_HISTORY_ENTRY
     HIST_ENTRY *entry;
@@ -536,7 +554,7 @@ hist_set(VALUE self, VALUE index, VALUE str)
     if (i < 0) {
         i += history_length;
     }
-    entry = replace_history_entry(i, RSTRING_PTR(str), NULL);
+    entry = replace_history_entry(i, RSTRING(str)->ptr, NULL);
     if (entry == NULL) {
 	rb_raise(rb_eIndexError, "invalid index");
     }
@@ -548,16 +566,21 @@ hist_set(VALUE self, VALUE index, VALUE str)
 }
 
 static VALUE
-hist_push(VALUE self, VALUE str)
+hist_push(self, str)
+    VALUE self;
+    VALUE str;
 {
     rb_secure(4);
     SafeStringValue(str);
-    add_history(RSTRING_PTR(str));
+    add_history(RSTRING(str)->ptr);
     return self;
 }
 
 static VALUE
-hist_push_method(int argc, VALUE *argv, VALUE self)
+hist_push_method(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE str;
     
@@ -565,13 +588,14 @@ hist_push_method(int argc, VALUE *argv, VALUE self)
     while (argc--) {
 	str = *argv++;
 	SafeStringValue(str);
-	add_history(RSTRING_PTR(str));
+	add_history(RSTRING(str)->ptr);
     }
     return self;
 }
 
 static VALUE
-rb_remove_history(int index)
+rb_remove_history(index)
+    int index;
 {
 #ifdef HAVE_REMOVE_HISTORY
     HIST_ENTRY *entry;
@@ -593,7 +617,8 @@ rb_remove_history(int index)
 }
 
 static VALUE
-hist_pop(VALUE self)
+hist_pop(self)
+    VALUE self;
 {
     rb_secure(4);
     if (history_length > 0) {
@@ -604,7 +629,8 @@ hist_pop(VALUE self)
 }
 
 static VALUE
-hist_shift(VALUE self)
+hist_shift(self)
+    VALUE self;
 {
     rb_secure(4);
     if (history_length > 0) {
@@ -615,13 +641,12 @@ hist_shift(VALUE self)
 }
 
 static VALUE
-hist_each(VALUE self)
+hist_each(self)
+    VALUE self;
 {
     HIST_ENTRY *entry;
     int i;
 
-    RETURN_ENUMERATOR(self, 0, 0);
-
     rb_secure(4);
     for (i = 0; i < history_length; i++) {
         entry = history_get(history_base + i);
@@ -633,21 +658,25 @@ hist_each(VALUE self)
 }
 
 static VALUE
-hist_length(VALUE self)
+hist_length(self)
+    VALUE self;
 {
     rb_secure(4);
     return INT2NUM(history_length);
 }
 
 static VALUE
-hist_empty_p(VALUE self)
+hist_empty_p(self)
+    VALUE self;
 {
     rb_secure(4);
     return history_length == 0 ? Qtrue : Qfalse;
 }
 
 static VALUE
-hist_delete_at(VALUE self, VALUE index)
+hist_delete_at(self, index)
+    VALUE self;
+    VALUE index;
 {
     int i;
 
@@ -662,7 +691,9 @@ hist_delete_at(VALUE self, VALUE index)
 }
 
 static VALUE
-filename_completion_proc_call(VALUE self, VALUE str)
+filename_completion_proc_call(self, str)
+    VALUE self;
+    VALUE str;
 {
     VALUE result;
     char **matches;
@@ -677,7 +708,7 @@ filename_completion_proc_call(VALUE self, VALUE str)
 	    free(matches[i]);
 	}
 	free(matches);
-	if (RARRAY_LEN(result) >= 2)
+	if (RARRAY(result)->len >= 2)
 	    rb_ary_shift(result);
     }
     else {
@@ -687,7 +718,9 @@ filename_completion_proc_call(VALUE self, VALUE str)
 }
 
 static VALUE
-username_completion_proc_call(VALUE self, VALUE str)
+username_completion_proc_call(self, str)
+    VALUE self;
+    VALUE str;
 {
     VALUE result;
     char **matches;
@@ -702,7 +735,7 @@ username_completion_proc_call(VALUE self, VALUE str)
 	    free(matches[i]);
 	}
 	free(matches);
-	if (RARRAY_LEN(result) >= 2)
+	if (RARRAY(result)->len >= 2)
 	    rb_ary_shift(result);
     }
     else {
@@ -727,10 +760,6 @@ Init_readline()
     mReadline = rb_define_module("Readline");
     rb_define_module_function(mReadline, "readline",
 			      readline_readline, -1);
-    rb_define_singleton_method(mReadline, "input=",
-			       readline_s_set_input, 1);
-    rb_define_singleton_method(mReadline, "output=",
-			       readline_s_set_output, 1);
     rb_define_singleton_method(mReadline, "completion_proc=",
 			       readline_s_set_completion_proc, 1);
     rb_define_singleton_method(mReadline, "completion_proc",
@@ -796,7 +825,8 @@ Init_readline()
 #if defined HAVE_RL_LIBRARY_VERSION
     rb_define_const(mReadline, "VERSION", rb_str_new2(rl_library_version));
 #else
-    rb_define_const(mReadline, "VERSION", rb_str_new2("2.0 or prior version"));
+    rb_define_const(mReadline, "VERSION",
+                    rb_str_new2("2.0 or before version"));
 #endif
 
     rl_attempted_completion_function = readline_attempted_completion_function;
diff --git a/ext/ripper/.cvsignore b/ext/ripper/.cvsignore
deleted file mode 100644
index c9adce0b1a..0000000000
--- a/ext/ripper/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-mkmf.log
-eventids1.c
-eventids2table.c
-ripper.*
-ids1
-ids2
-extconf.h
diff --git a/ext/ripper/README b/ext/ripper/README
deleted file mode 100644
index 0825013ba9..0000000000
--- a/ext/ripper/README
+++ /dev/null
@@ -1,30 +0,0 @@
-Ripper README
-=============
-
-  Ripper is a Ruby script parser.  You can get information
-  by event-based style from the parser.
-
-  !! WARNING !!
-
-  Ripper is still early-alpha version.
-  I never assure any kind of backward compatibility.
-  
-Requirements
-------------
-
-  * ruby 1.9 (support CVS HEAD only)
-  * bison 1.28 or later (Other yaccs do not work)
-
-Usage
------
-
-  See test/ripper/* and sample/ripper/*.
-
-License
--------
-
-  Ruby License.
-
-                                                Minero Aoki
-                                        aamine@loveruby.net
-                                      http://i.loveruby.net
diff --git a/ext/ripper/depend b/ext/ripper/depend
deleted file mode 100644
index 120fdc58e7..0000000000
--- a/ext/ripper/depend
+++ /dev/null
@@ -1,34 +0,0 @@
-GEN  = $(srcdir)/tools/generate.rb
-SRC1 = $(top_srcdir)/parse.y
-SRC2 = $(srcdir)/eventids2.c
-BISON = bison
-
-src: ripper.c eventids1.c eventids2table.c
-
-ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c
-
-.y.c:
-	$(BISON) -t -v -oy.tab.c $<
-	sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
-	@$(RM) y.tab.c
-
-all: check
-static: check
-
-ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
-	$(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@
-
-check: $(GEN) $(SRC1) $(SRC2)
-	$(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
-
-eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
-	$(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@
-
-eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
-	$(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@
-
-# Entries for Ripper maintainer
-
-preproc: ripper.E
-ripper.E: ripper.c
-	$(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
deleted file mode 100644
index 629381448a..0000000000
--- a/ext/ripper/eventids2.c
+++ /dev/null
@@ -1,277 +0,0 @@
-#define tIGNORED_NL      (tLAST_TOKEN + 1)
-#define tCOMMENT         (tLAST_TOKEN + 2)
-#define tEMBDOC_BEG      (tLAST_TOKEN + 3)
-#define tEMBDOC          (tLAST_TOKEN + 4)
-#define tEMBDOC_END      (tLAST_TOKEN + 5)
-#define tSP              (tLAST_TOKEN + 6)
-#define tHEREDOC_BEG     (tLAST_TOKEN + 7)
-#define tHEREDOC_END     (tLAST_TOKEN + 8)
-#define k__END__         (tLAST_TOKEN + 9)
-
-static ID ripper_id_backref;
-static ID ripper_id_backtick;
-static ID ripper_id_comma;
-static ID ripper_id_const;
-static ID ripper_id_cvar;
-static ID ripper_id_embexpr_beg;
-static ID ripper_id_embexpr_end;
-static ID ripper_id_embvar;
-static ID ripper_id_float;
-static ID ripper_id_gvar;
-static ID ripper_id_ident;
-static ID ripper_id_int;
-static ID ripper_id_ivar;
-static ID ripper_id_kw;
-static ID ripper_id_lbrace;
-static ID ripper_id_lbracket;
-static ID ripper_id_lparen;
-static ID ripper_id_nl;
-static ID ripper_id_op;
-static ID ripper_id_period;
-static ID ripper_id_rbrace;
-static ID ripper_id_rbracket;
-static ID ripper_id_rparen;
-static ID ripper_id_semicolon;
-static ID ripper_id_symbeg;
-static ID ripper_id_tstring_beg;
-static ID ripper_id_tstring_content;
-static ID ripper_id_tstring_end;
-static ID ripper_id_words_beg;
-static ID ripper_id_qwords_beg;
-static ID ripper_id_words_sep;
-static ID ripper_id_regexp_beg;
-static ID ripper_id_regexp_end;
-static ID ripper_id_label;
-static ID ripper_id_tlambda;
-static ID ripper_id_tlambeg;
-
-static ID ripper_id_ignored_nl;
-static ID ripper_id_comment;
-static ID ripper_id_embdoc_beg;
-static ID ripper_id_embdoc;
-static ID ripper_id_embdoc_end;
-static ID ripper_id_sp;
-static ID ripper_id_heredoc_beg;
-static ID ripper_id_heredoc_end;
-static ID ripper_id___end__;
-static ID ripper_id_CHAR;
-
-#include "eventids2table.c"
-
-static void
-ripper_init_eventids2(VALUE self)
-{
-    ripper_id_backref = rb_intern("on_backref");
-    ripper_id_backtick = rb_intern("on_backtick");
-    ripper_id_comma = rb_intern("on_comma");
-    ripper_id_const = rb_intern("on_const");
-    ripper_id_cvar = rb_intern("on_cvar");
-    ripper_id_embexpr_beg = rb_intern("on_embexpr_beg");
-    ripper_id_embexpr_end = rb_intern("on_embexpr_end");
-    ripper_id_embvar = rb_intern("on_embvar");
-    ripper_id_float = rb_intern("on_float");
-    ripper_id_gvar = rb_intern("on_gvar");
-    ripper_id_ident = rb_intern("on_ident");
-    ripper_id_int = rb_intern("on_int");
-    ripper_id_ivar = rb_intern("on_ivar");
-    ripper_id_kw = rb_intern("on_kw");
-    ripper_id_lbrace = rb_intern("on_lbrace");
-    ripper_id_lbracket = rb_intern("on_lbracket");
-    ripper_id_lparen = rb_intern("on_lparen");
-    ripper_id_nl = rb_intern("on_nl");
-    ripper_id_op = rb_intern("on_op");
-    ripper_id_period = rb_intern("on_period");
-    ripper_id_rbrace = rb_intern("on_rbrace");
-    ripper_id_rbracket = rb_intern("on_rbracket");
-    ripper_id_rparen = rb_intern("on_rparen");
-    ripper_id_semicolon = rb_intern("on_semicolon");
-    ripper_id_symbeg = rb_intern("on_symbeg");
-    ripper_id_tstring_beg = rb_intern("on_tstring_beg");
-    ripper_id_tstring_content = rb_intern("on_tstring_content");
-    ripper_id_tstring_end = rb_intern("on_tstring_end");
-    ripper_id_words_beg = rb_intern("on_words_beg");
-    ripper_id_qwords_beg = rb_intern("on_qwords_beg");
-    ripper_id_words_sep = rb_intern("on_words_sep");
-    ripper_id_regexp_beg = rb_intern("on_regexp_beg");
-    ripper_id_regexp_end = rb_intern("on_regexp_end");
-    ripper_id_label = rb_intern("on_label");
-    ripper_id_tlambda = rb_intern("on_tlambda");
-    ripper_id_tlambeg = rb_intern("on_tlambeg");
-
-    ripper_id_ignored_nl = rb_intern("on_ignored_nl");
-    ripper_id_comment = rb_intern("on_comment");
-    ripper_id_embdoc_beg = rb_intern("on_embdoc_beg");
-    ripper_id_embdoc = rb_intern("on_embdoc");
-    ripper_id_embdoc_end = rb_intern("on_embdoc_end");
-    ripper_id_sp = rb_intern("on_sp");
-    ripper_id_heredoc_beg = rb_intern("on_heredoc_beg");
-    ripper_id_heredoc_end = rb_intern("on_heredoc_end");
-    ripper_id___end__ = rb_intern("on___end__");
-    ripper_id_CHAR = rb_intern("on_CHAR");
-
-    ripper_init_eventids2_table(self);
-}
-
-static const struct token_assoc {
-    int token;
-    ID *id;
-} token_to_eventid[] = {
-    {' ',		&ripper_id_words_sep},
-    {'!',		&ripper_id_op},
-    {'%',		&ripper_id_op},
-    {'&',		&ripper_id_op},
-    {'*',		&ripper_id_op},
-    {'+',		&ripper_id_op},
-    {'-',		&ripper_id_op},
-    {'/',		&ripper_id_op},
-    {'<',		&ripper_id_op},
-    {'=',		&ripper_id_op},
-    {'>',		&ripper_id_op},
-    {'?',		&ripper_id_op},
-    {'^',		&ripper_id_op},
-    {'|',		&ripper_id_op},
-    {'~',		&ripper_id_op},
-    {':',		&ripper_id_op},
-    {',',		&ripper_id_comma},
-    {'.',		&ripper_id_period},
-    {';',		&ripper_id_semicolon},
-    {'`',		&ripper_id_backtick},
-    {'\n',              &ripper_id_nl},
-    {keyword_alias,	&ripper_id_kw},
-    {keyword_and,	&ripper_id_kw},
-    {keyword_begin,	&ripper_id_kw},
-    {keyword_break,	&ripper_id_kw},
-    {keyword_case,	&ripper_id_kw},
-    {keyword_class,	&ripper_id_kw},
-    {keyword_def,	&ripper_id_kw},
-    {keyword_defined,	&ripper_id_kw},
-    {keyword_do,	&ripper_id_kw},
-    {keyword_do_block,	&ripper_id_kw},
-    {keyword_do_cond,	&ripper_id_kw},
-    {keyword_else,	&ripper_id_kw},
-    {keyword_elsif,	&ripper_id_kw},
-    {keyword_end,	&ripper_id_kw},
-    {keyword_ensure,	&ripper_id_kw},
-    {keyword_false,	&ripper_id_kw},
-    {keyword_for,	&ripper_id_kw},
-    {keyword_if,	&ripper_id_kw},
-    {modifier_if,	&ripper_id_kw},
-    {keyword_in,	&ripper_id_kw},
-    {keyword_module,	&ripper_id_kw},
-    {keyword_next,	&ripper_id_kw},
-    {keyword_nil,	&ripper_id_kw},
-    {keyword_not,	&ripper_id_kw},
-    {keyword_or,	&ripper_id_kw},
-    {keyword_redo,	&ripper_id_kw},
-    {keyword_rescue,	&ripper_id_kw},
-    {modifier_rescue,	&ripper_id_kw},
-    {keyword_retry,	&ripper_id_kw},
-    {keyword_return,	&ripper_id_kw},
-    {keyword_self,	&ripper_id_kw},
-    {keyword_super,	&ripper_id_kw},
-    {keyword_then,	&ripper_id_kw},
-    {keyword_true,	&ripper_id_kw},
-    {keyword_undef,	&ripper_id_kw},
-    {keyword_unless,	&ripper_id_kw},
-    {modifier_unless,	&ripper_id_kw},
-    {keyword_until,	&ripper_id_kw},
-    {modifier_until,	&ripper_id_kw},
-    {keyword_when,	&ripper_id_kw},
-    {keyword_while,	&ripper_id_kw},
-    {modifier_while,	&ripper_id_kw},
-    {keyword_yield,	&ripper_id_kw},
-    {keyword__FILE__,	&ripper_id_kw},
-    {keyword__LINE__,	&ripper_id_kw},
-    {keyword_BEGIN,	&ripper_id_kw},
-    {keyword_END,	&ripper_id_kw},
-    {tAMPER,		&ripper_id_op},
-    {tANDOP,		&ripper_id_op},
-    {tAREF,		&ripper_id_op},
-    {tASET,		&ripper_id_op},
-    {tASSOC,		&ripper_id_op},
-    {tBACK_REF,		&ripper_id_backref},
-    {tCHAR,		&ripper_id_CHAR},
-    {tCMP,		&ripper_id_op},
-    {tCOLON2,		&ripper_id_op},
-    {tCOLON3,		&ripper_id_op},
-    {tCONSTANT,		&ripper_id_const},
-    {tCVAR,		&ripper_id_cvar},
-    {tDOT2,		&ripper_id_op},
-    {tDOT3,		&ripper_id_op},
-    {tEQ,		&ripper_id_op},
-    {tEQQ,		&ripper_id_op},
-    {tFID,		&ripper_id_ident},
-    {tFLOAT,		&ripper_id_float},
-    {tGEQ,		&ripper_id_op},
-    {tGVAR,		&ripper_id_gvar},
-    {tIDENTIFIER,	&ripper_id_ident},
-    {tINTEGER,		&ripper_id_int},
-    {tIVAR,		&ripper_id_ivar},
-    {tLBRACE,		&ripper_id_lbrace},
-    {tLBRACE_ARG,	&ripper_id_lbrace},
-    {'{',       	&ripper_id_lbrace},
-    {'}',       	&ripper_id_rbrace},
-    {tLBRACK,		&ripper_id_lbracket},
-    {'[',       	&ripper_id_lbracket},
-    {']',       	&ripper_id_rbracket},
-    {tLEQ,		&ripper_id_op},
-    {tLPAREN,		&ripper_id_lparen},
-    {tLPAREN_ARG,	&ripper_id_lparen},
-    {'(',		&ripper_id_lparen},
-    {')',		&ripper_id_rparen},
-    {tLSHFT,		&ripper_id_op},
-    {tMATCH,		&ripper_id_op},
-    {tNEQ,		&ripper_id_op},
-    {tNMATCH,		&ripper_id_op},
-    {tNTH_REF,		&ripper_id_backref},
-    {tOP_ASGN,		&ripper_id_op},
-    {tOROP,		&ripper_id_op},
-    {tPOW,		&ripper_id_op},
-    {tQWORDS_BEG,	&ripper_id_qwords_beg},
-    {tREGEXP_BEG,	&ripper_id_regexp_beg},
-    {tREGEXP_END,	&ripper_id_regexp_end},
-    {tRPAREN,		&ripper_id_rparen},
-    {tRSHFT,		&ripper_id_op},
-    {tSTAR,		&ripper_id_op},
-    {tSTRING_BEG,	&ripper_id_tstring_beg},
-    {tSTRING_CONTENT,	&ripper_id_tstring_content},
-    {tSTRING_DBEG,	&ripper_id_embexpr_beg},
-    {tSTRING_DVAR,	&ripper_id_embvar},
-    {tSTRING_END,	&ripper_id_tstring_end},
-    {tSYMBEG,		&ripper_id_symbeg},
-    {tUMINUS,		&ripper_id_op},
-    {tUMINUS_NUM,	&ripper_id_op},
-    {tUPLUS,		&ripper_id_op},
-    {tWORDS_BEG,	&ripper_id_words_beg},
-    {tXSTRING_BEG,	&ripper_id_backtick},
-    {tLABEL,		&ripper_id_label},
-    {tLAMBDA,		&ripper_id_tlambda},
-    {tLAMBEG,		&ripper_id_tlambeg},
-
-    /* ripper specific tokens */
-    {tIGNORED_NL,       &ripper_id_ignored_nl},
-    {tCOMMENT,          &ripper_id_comment},
-    {tEMBDOC_BEG,       &ripper_id_embdoc_beg},
-    {tEMBDOC,           &ripper_id_embdoc},
-    {tEMBDOC_END,       &ripper_id_embdoc_end},
-    {tSP,               &ripper_id_sp},
-    {tHEREDOC_BEG,      &ripper_id_heredoc_beg},
-    {tHEREDOC_END,      &ripper_id_heredoc_end},
-    {k__END__,          &ripper_id___end__},
-    {0, NULL}
-};
-
-static ID
-ripper_token2eventid(int tok)
-{
-    const struct token_assoc *a;
-
-    for (a = token_to_eventid; a->id != NULL; a++) {
-        if (a->token == tok)
-            return *a->id;
-    }
-    if (tok < 256) {
-        return ripper_id_CHAR;
-    }
-    rb_raise(rb_eRuntimeError, "[Ripper FATAL] unknown token %d", tok);
-}
diff --git a/ext/ripper/extconf.rb b/ext/ripper/extconf.rb
deleted file mode 100644
index a41a6af2d8..0000000000
--- a/ext/ripper/extconf.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#!ruby -s
-
-require 'mkmf'
-require 'rbconfig'
-
-def main
-  unless find_executable('bison')
-    unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
-      Logging.message 'missing bison; abort'
-      return
-    end
-  end
-  $objs = %w(ripper.o)
-  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output eventids1.c eventids2table.c)
-  $defs << '-DRIPPER'
-  $defs << '-DRIPPER_DEBUG' if $debug
-  $VPATH << '$(topdir)' << '$(top_srcdir)'
-  $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
-  create_makefile 'ripper'
-end
-
-main
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
deleted file mode 100644
index cb19da334a..0000000000
--- a/ext/ripper/lib/ripper.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'ripper/core'
-require 'ripper/lexer'
-require 'ripper/filter'
-require 'ripper/sexp'
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
deleted file mode 100644
index 35aa54d090..0000000000
--- a/ext/ripper/lib/ripper/core.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2003-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper.so'
-
-class Ripper
-
-  # Parses Ruby program read from _src_.
-  # _src_ must be a String or a IO or a object which has #gets method.
-  def Ripper.parse(src, filename = '(ripper)', lineno = 1)
-    new(src, filename, lineno).parse
-  end
-
-  # This array contains name of parser events.
-  PARSER_EVENTS = PARSER_EVENT_TABLE.keys
-
-  # This array contains name of scanner events.
-  SCANNER_EVENTS = SCANNER_EVENT_TABLE.keys
-
-  # This array contains name of all ripper events.
-  EVENTS = PARSER_EVENTS + SCANNER_EVENTS
-
-  private
-
-  #
-  # Parser Events
-  #
-
-  PARSER_EVENT_TABLE.each do |id, arity|
-    module_eval(<<-End, __FILE__, __LINE__ + 1)
-      def on_#{id}(#{ ('a'..'z').to_a[0, arity].join(', ') })
-        #{arity == 0 ? 'nil' : 'a'}
-      end
-    End
-  end
-
-  # This method is called when weak warning is produced by the parser.
-  # _fmt_ and _args_ is printf style.
-  def warn(fmt, *args)
-  end
-
-  # This method is called when strong warning is produced by the parser.
-  # _fmt_ and _args_ is printf style.
-  def warning(fmt, *args)
-  end
-
-  # This method is called when the parser found syntax error.
-  def compile_error(msg)
-  end
-
-  #
-  # Scanner Events
-  #
-
-  SCANNER_EVENTS.each do |id|
-    module_eval(<<-End, __FILE__, __LINE__ + 1)
-      def on_#{id}(token)
-        token
-      end
-    End
-  end
-
-end
diff --git a/ext/ripper/lib/ripper/filter.rb b/ext/ripper/lib/ripper/filter.rb
deleted file mode 100644
index 898501b23c..0000000000
--- a/ext/ripper/lib/ripper/filter.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/lexer'
-
-class Ripper
-
-  # This class handles only scanner events,
-  # and they are dispatched in the `right' order (same with input).
-  class Filter
-
-    def initialize(src, filename = '-', lineno = 1)
-      @__lexer = Lexer.new(src, filename, lineno)
-      @__line = nil
-      @__col = nil
-    end
-
-    # The file name of the input.
-    def filename
-      @__lexer.filename
-    end
-
-    # The line number of the current token.
-    # This value starts from 1.
-    # This method is valid only in event handlers.
-    def lineno
-      @__line
-    end
-
-    # The column number of the current token.
-    # This value starts from 0.
-    # This method is valid only in event handlers.
-    def column
-      @__col
-    end
-
-    # Starts parsing.  _init_ is a data accumulator.
-    # It is passed to the next event handler (as of Enumerable#inject).
-    def parse(init = nil)
-      data = init
-      @__lexer.lex.each do |pos, event, tok|
-        @__line, @__col = *pos
-        data = if respond_to?(event, true)
-               then __send__(event, tok, data)
-               else on_default(event, tok, data)
-               end
-      end
-      data
-    end
-
-    private
-
-    # This method is called when some event handler have not defined.
-    # _event_ is :on_XXX, _token_ is scanned token, _data_ is a data
-    # accumulator.  The return value of this method is passed to the
-    # next event handler (as of Enumerable#inject).
-    def on_default(event, token, data)
-      data
-    end
-
-  end
-
-end
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
deleted file mode 100644
index 14ef99f034..0000000000
--- a/ext/ripper/lib/ripper/lexer.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/core'
-
-class Ripper
-
-  # Tokenizes Ruby program and returns an Array of String.
-  def Ripper.tokenize(src, filename = '-', lineno = 1)
-    Lexer.new(src, filename, lineno).tokenize
-  end
-
-  # Tokenizes Ruby program and returns an Array of Array,
-  # which is formatted like [[lineno, column], type, token].
-  #
-  #   require 'ripper'
-  #   require 'pp'
-  #
-  #   p Ripper.lex("def m(a) nil end")
-  #     #=> [[[1,  0], :on_kw,     "def"],
-  #          [[1,  3], :on_sp,     " "  ],
-  #          [[1,  4], :on_ident,  "m"  ],
-  #          [[1,  5], :on_lparen, "("  ],
-  #          [[1,  6], :on_ident,  "a"  ],
-  #          [[1,  7], :on_rparen, ")"  ],
-  #          [[1,  8], :on_sp,     " "  ],
-  #          [[1,  9], :on_kw,     "nil"],
-  #          [[1, 12], :on_sp,     " "  ],
-  #          [[1, 13], :on_kw,     "end"]]
-  #
-  def Ripper.lex(src, filename = '-', lineno = 1)
-    Lexer.new(src, filename, lineno).lex
-  end
-
-  class Lexer < ::Ripper   #:nodoc: internal use only
-    def tokenize
-      lex().map {|pos, event, tok| tok }
-    end
-
-    def lex
-      parse().sort_by {|pos, event, tok| pos }
-    end
-
-    def parse
-      @buf = []
-      super
-      @buf
-    end
-
-    private
-
-    SCANNER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__+'/module_eval', __LINE__ + 1)
-        def on_#{event}(tok)
-          @buf.push [[lineno(), column()], :on_#{event}, tok]
-        end
-      End
-    end
-  end
-
-  # [EXPERIMENTAL]
-  # Parses +src+ and return a string which was matched to +pattern+.
-  # +pattern+ should be described as Regexp.
-  #
-  #   require 'ripper'
-  #
-  #   p Ripper.slice('def m(a) nil end', 'ident')                   #=> "m"
-  #   p Ripper.slice('def m(a) nil end', '[ident lparen rparen]+')  #=> "m(a)"
-  #   p Ripper.slice("<<EOS\nstring\nEOS",
-  #                  'heredoc_beg nl $(tstring_content*) heredoc_end', 1)
-  #       #=> "string\n"
-  #
-  def Ripper.slice(src, pattern, n = 0)
-    if m = token_match(src, pattern)
-    then m.string(n)
-    else nil
-    end
-  end
-
-  def Ripper.token_match(src, pattern)   #:nodoc:
-    TokenPattern.compile(pattern).match(src)
-  end
-
-  class TokenPattern   #:nodoc:
-
-    class Error < ::StandardError; end
-    class CompileError < Error; end
-    class MatchError < Error; end
-
-    class << self
-      alias compile new
-    end
-
-    def initialize(pattern)
-      @source = pattern
-      @re = compile(pattern)
-    end
-
-    def match(str)
-      match_list(::Ripper.lex(str))
-    end
-
-    def match_list(tokens)
-      if m = @re.match(map_tokens(tokens))
-      then MatchData.new(tokens, m)
-      else nil
-      end
-    end
-
-    private
-
-    def compile(pattern)
-      if m = /[^\w\s$()\[\]{}?*+\.]/.match(pattern)
-        raise CompileError, "invalid char in pattern: #{m[0].inspect}"
-      end
-      buf = ''
-      pattern.scan(/(?:\w+|\$\(|[()\[\]\{\}?*+\.]+)/) do |tok|
-        case tok
-        when /\w/
-          buf.concat map_token(tok)
-        when '$('
-          buf.concat '('
-        when '('
-          buf.concat '(?:'
-        when /[?*\[\])\.]/
-          buf.concat tok
-        else
-          raise 'must not happen'
-        end
-      end
-      Regexp.compile(buf)
-    rescue RegexpError => err
-      raise CompileError, err.message
-    end
-
-    def map_tokens(tokens)
-      tokens.map {|pos,type,str| map_token(type.to_s.sub(/\Aon_/,'')) }.join
-    end
-
-    MAP = {}
-    seed = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
-    SCANNER_EVENT_TABLE.each do |ev, |
-      raise CompileError, "[RIPPER FATAL] too many system token" if seed.empty?
-      MAP[ev.to_s.sub(/\Aon_/,'')] = seed.shift
-    end
-
-    def map_token(tok)
-      MAP[tok]  or raise CompileError, "unknown token: #{tok}"
-    end
-
-    class MatchData
-      def initialize(tokens, match)
-        @tokens = tokens
-        @match = match
-      end
-
-      def string(n = 0)
-        return nil unless @match
-        match(n).join
-      end
-
-      private
-
-      def match(n = 0)
-        return [] unless @match
-        @tokens[@match.begin(n)...@match.end(n)].map {|pos,type,str| str }
-      end
-    end
-  
-  end
-
-end
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
deleted file mode 100644
index f2260fe8dd..0000000000
--- a/ext/ripper/lib/ripper/sexp.rb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# $Id$
-#
-# Copyright (c) 2004,2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute and/or modify this program under the Ruby License.
-# For details of Ruby License, see ruby/COPYING.
-#
-
-require 'ripper/core'
-
-class Ripper
-
-  # [EXPERIMENTAL]
-  # Parses +src+ and create S-exp tree.
-  # This method is for mainly developper use.
-  #
-  #   require 'ripper'
-  #   require 'pp
-  #
-  #   pp Ripper.sexp("def m(a) nil end")
-  #     #=> [:program,
-  #          [:stmts_add,
-  #           [:stmts_new],
-  #           [:def,
-  #            [:@ident, "m", [1, 4]],
-  #            [:paren, [:params, [[:@ident, "a", [1, 6]]], nil, nil, nil]],
-  #            [:bodystmt,
-  #             [:stmts_add, [:stmts_new], [:var_ref, [:@kw, "nil", [1, 9]]]],
-  #             nil,
-  #             nil,
-  #             nil]]]]
-  #
-  def Ripper.sexp(src, filename = '-', lineno = 1)
-    SexpBuilderPP.new(src, filename, lineno).parse
-  end
-
-  def Ripper.sexp_raw(src, filename = '-', lineno = 1)
-    SexpBuilder.new(src, filename, lineno).parse
-  end
-
-  class SexpBuilderPP < ::Ripper   #:nodoc:
-    private
-
-    PARSER_EVENT_TABLE.each do |event, arity|
-      if /_new\z/ =~ event.to_s and arity == 0
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}
-            []
-          end
-        End
-      elsif /_add\z/ =~ event.to_s
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}(list, item)
-            list.push item
-            list
-          end
-        End
-      else
-        module_eval(<<-End, __FILE__, __LINE__ + 1)
-          def on_#{event}(*args)
-            [:#{event}, *args]
-          end
-        End
-      end
-    end
-
-    SCANNER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def on_#{event}(tok)
-          [:@#{event}, tok, [lineno(), column()]]
-        end
-      End
-    end
-  end
-
-  class SexpBuilder < ::Ripper   #:nodoc:
-    private
-
-    PARSER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def on_#{event}(*args)
-          args.unshift :#{event}
-          args
-        end
-      End
-    end
-
-    SCANNER_EVENTS.each do |event|
-      module_eval(<<-End, __FILE__, __LINE__ + 1)
-        def on_#{event}(tok)
-          [:@#{event}, tok, [lineno(), column()]]
-        end
-      End
-    end
-  end
-
-end
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
deleted file mode 100755
index b19f6e8d5c..0000000000
--- a/ext/ripper/tools/generate-param-macros.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-off = true
-ARGF.each do |line|
-  case line
-  when /RIPPER_PARAMS_DECL_BEGIN/
-    off = false
-  when /RIPPER_PARAMS_DECL_END/
-    exit
-  when /ripper/
-    next if off
-    var = line.scan(/\w+/).last or next
-    base = var.sub(/ripper_/, '')
-    puts %"\#define #{base}\t\t(parser->ripper_#{base})"
-  end
-end
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
deleted file mode 100755
index 0efb997604..0000000000
--- a/ext/ripper/tools/generate.rb
+++ /dev/null
@@ -1,152 +0,0 @@
-# $Id$
-
-require 'optparse'
-
-def main
-  mode = nil
-  ids1src = nil
-  ids2src = nil
-  template = nil
-  output = nil
-
-  parser = @parser = OptionParser.new
-  parser.banner = "Usage: #{File.basename($0)} --mode=MODE [--ids1src=PATH] [--ids2src=PATH] [--output=PATH]"
-  parser.on('--mode=MODE', 'check, eventids1, or eventids2table.') {|m|
-    mode = m
-  }
-  parser.on('--ids1src=PATH', 'A source file of event-IDs 1 (parse.y).') {|path|
-    ids1src = path
-  }
-  parser.on('--ids2src=PATH', 'A source file of event-IDs 2 (eventids2.c).') {|path|
-    ids2src = path
-  }
-  parser.on('--output=PATH', 'An output file.') {|path|
-    output = path
-  }
-  parser.on('--help', 'Prints this message and quit.') {
-    puts parser.help
-    exit true
-  }
-  begin
-    parser.parse!
-  rescue OptionParser::ParseError => err
-    usage err.message
-  end
-  usage 'no mode given' unless mode
-  case mode
-  when 'check'
-    usage 'no --ids1src' unless ids1src
-    usage 'no --ids2src' unless ids2src
-    h = read_ids1_with_locations(ids1src)
-    check_arity h
-    ids2 = read_ids2(ids2src)
-    common = h.keys & ids2
-    unless common.empty?
-      abort "event crash: #{common.join(' ')}"
-    end
-    exit 0
-  when 'eventids1'
-    usage 'no --ids1src' unless ids1src
-    result = generate_eventids1(read_ids1(ids1src))
-  when 'eventids2table'
-    usage 'no --ids2src' unless ids2src
-    result = generate_eventids2_table(read_ids2(ids2src))
-  end
-  if output
-    File.open(output, 'w') {|f|
-      f.write result
-    }
-  else
-    puts result
-  end
-end
-
-def usage(msg)
-  $stderr.puts msg
-  $stderr.puts @parser.help
-  exit false
-end
-
-def generate_eventids1(ids)
-  buf = ""
-  ids.each do |id, arity|
-    buf << %Q[static ID ripper_id_#{id};\n]
-  end
-  buf << %Q[\n]
-  buf << %Q[static void\n]
-  buf << %Q[ripper_init_eventids1(VALUE self)\n]
-  buf << %Q[{\n]
-  buf << %Q[    VALUE h;\n]
-  buf << %Q[    ID id;\n]
-  ids.each do |id, arity|
-    buf << %Q[    ripper_id_#{id} = rb_intern("on_#{id}");\n]
-  end
-  buf << %Q[\n]
-  buf << %Q[    h = rb_hash_new();\n]
-  buf << %Q[    rb_define_const(self, "PARSER_EVENT_TABLE", h);\n]
-  ids.each do |id, arity|
-    buf << %Q[    id = rb_intern("#{id}");\n]
-    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(#{arity}));\n]
-  end
-  buf << %Q[}\n]
-  buf
-end
-
-def generate_eventids2_table(ids)
-  buf = ""
-  buf << %Q[static void\n]
-  buf << %Q[ripper_init_eventids2_table(VALUE self)\n]
-  buf << %Q[{\n]
-  buf << %Q[    VALUE h = rb_hash_new();\n]
-  buf << %Q[    ID id;\n]
-  buf << %Q[    rb_define_const(self, "SCANNER_EVENT_TABLE", h);\n]
-  ids.each do |id|
-    buf << %Q[    id = rb_intern("#{id}");\n]
-    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(1));\n]
-  end
-  buf << %Q[}\n]
-  buf
-end
-
-def read_ids1(path)
-  strip_locations(read_ids1_with_locations(path))
-end
-
-def strip_locations(h)
-  h.map {|event, list| [event, list.first[1]] }\
-      .sort_by {|event, arity| event.to_s }
-end
-
-def check_arity(h)
-  invalid = false
-  h.each do |event, list|
-    unless list.map {|line, arity| arity }.uniq.size == 1
-      invalid = true
-      locations = list.map {|line, a| "#{line}:#{a}" }.join(', ')
-      $stderr.puts "arity crash [event=#{event}]: #{locations}"
-    end
-  end
-  abort if invalid
-end
-
-def read_ids1_with_locations(path)
-  h = {}
-  File.open(path) {|f|
-    f.each do |line|
-      next if /\A\#\s*define\s+s?dispatch/ =~ line
-      next if /ripper_dispatch/ =~ line
-      line.scan(/dispatch(\d)\((\w+)/) do |arity, event|
-        (h[event] ||= []).push [f.lineno, arity.to_i]
-      end
-    end
-  }
-  h
-end
-
-def read_ids2(path)
-  File.open(path) {|f|
-    return f.read.scan(/ripper_id_(\w+)/).flatten.uniq.sort
-  }
-end
-
-main
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
deleted file mode 100755
index 06397cea05..0000000000
--- a/ext/ripper/tools/preproc.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id$
-
-require 'optparse'
-
-def main
-  output = nil
-  parser = OptionParser.new
-  parser.banner = "Usage: #{File.basename($0)} [--output=PATH] <parse.y>"
-  parser.on('--output=PATH', 'An output file.') {|path|
-    output = path
-  }
-  parser.on('--help', 'Prints this message and quit.') {
-    puts parser.help
-    exit true
-  }
-  begin
-    parser.parse!
-  rescue OptionParser::ParseError => err
-    $stderr.puts err.message
-    $stderr.puts parser.help
-    exit false
-  end
-  unless ARGV.size == 1
-    abort "wrong number of arguments (#{ARGV.size} for 1)"
-  end
-  out = ""
-  File.open(ARGV[0]) {|f|
-    prelude f, out
-    grammar f, out
-    usercode f, out
-  }
-  if output
-    File.open(output, 'w') {|f|
-      f.write out
-    }
-  else
-    print out
-  end
-end
-
-def prelude(f, out)
-  while line = f.gets
-    case line
-    when %r</\*%%%\*/>
-      out << '/*' << $/
-    when %r</\*%>
-      out << '*/' << $/
-    when %r<%\*/>
-      out << $/
-    when /\A%%/
-      out << '%%' << $/
-      return
-    when /\A%token/
-      out << line.sub(/<\w+>/, '<val>')
-    when /\A%type/
-      out << line.sub(/<\w+>/, '<val>')
-    else
-      out << line
-    end
-  end
-end
-
-def grammar(f, out)
-  while line = f.gets
-    case line
-    when %r</\*%%%\*/>
-      out << '#if 0' << $/
-    when %r</\*%c%\*/>
-      out << '/*' << $/
-    when %r</\*%c>
-      out << '*/' << $/
-    when %r</\*%>
-      out << '#endif' << $/
-    when %r<%\*/>
-      out << $/
-    when /\A%%/
-      out << '%%' << $/
-      return
-    else
-      out << line
-    end
-  end
-end
-
-def usercode(f, out)
-  while line = f.gets
-    out << line
-  end
-end
-
-main
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
deleted file mode 100755
index 99413c361d..0000000000
--- a/ext/ripper/tools/strip.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-last_is_void = false
-ARGF.each do |line|
-  if line.strip.empty?
-    #puts() unless last_is_void
-    last_is_void = true
-  elsif /\A\#/ === line
-    ;
-  else
-    print line
-    last_is_void = false
-  end
-end
diff --git a/ext/sdbm/.cvsignore b/ext/sdbm/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/sdbm/.cvsignore
+++ b/ext/sdbm/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 1d81778193..5b34824afc 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -12,7 +12,7 @@
 #endif
 
 #include "sdbm.h"
-#include "ruby/config.h"
+#include "config.h"
 
 /*
  * sdbm - ndbm work-alike hashed database library
@@ -143,7 +143,10 @@ static long masks[] = {
 datum nullitem = {NULL, 0};
 
 DBM *
-sdbm_open(register char *file, register int flags, register int mode)
+sdbm_open(file, flags, mode)
+register char *file;
+register int flags;
+register int mode;
 {
 	register DBM *db;
 	register char *dirname;
@@ -172,7 +175,11 @@ sdbm_open(register char *file, register int flags, register int mode)
 }
 
 DBM *
-sdbm_prep(char *dirname, char *pagname, int flags, int mode)
+sdbm_prep(dirname, pagname, flags, mode)
+char *dirname;
+char *pagname;
+int flags;
+int mode;
 {
 	register DBM *db;
 	struct stat dstat;
@@ -228,7 +235,8 @@ sdbm_prep(char *dirname, char *pagname, int flags, int mode)
 }
 
 void
-sdbm_close(register DBM *db)
+sdbm_close(db)
+register DBM *db;
 {
 	if (db == NULL)
 		errno = EINVAL;
@@ -240,7 +248,9 @@ sdbm_close(register DBM *db)
 }
 
 datum
-sdbm_fetch(register DBM *db, datum key)
+sdbm_fetch(db, key)
+register DBM *db;
+datum key;
 {
 	if (db == NULL || bad(key))
 		return errno = EINVAL, nullitem;
@@ -252,7 +262,9 @@ sdbm_fetch(register DBM *db, datum key)
 }
 
 int
-sdbm_delete(register DBM *db, datum key)
+sdbm_delete(db, key)
+register DBM *db;
+datum key;
 {
 	if (db == NULL || bad(key))
 		return errno = EINVAL, -1;
@@ -276,7 +288,11 @@ sdbm_delete(register DBM *db, datum key)
 }
 
 int
-sdbm_store(register DBM *db, datum key, datum val, int flags)
+sdbm_store(db, key, val, flags)
+register DBM *db;
+datum key;
+datum val;
+int flags;
 {
 	int need;
 	register long hash;
@@ -334,7 +350,10 @@ sdbm_store(register DBM *db, datum key, datum val, int flags)
  * giving up.
  */
 static int
-makroom(register DBM *db, long int hash, int need)
+makroom(db, hash, need)
+register DBM *db;
+long hash;
+int need;
 {
 	long newp;
 	char twin[PBLKSIZ];
@@ -431,7 +450,8 @@ makroom(register DBM *db, long int hash, int need)
  * deletions aren't taken into account. (ndbm bug)
  */
 datum
-sdbm_firstkey(register DBM *db)
+sdbm_firstkey(db)
+register DBM *db;
 {
 	if (db == NULL)
 		return errno = EINVAL, nullitem;
@@ -450,7 +470,8 @@ sdbm_firstkey(register DBM *db)
 }
 
 datum
-sdbm_nextkey(register DBM *db)
+sdbm_nextkey(db)
+register DBM *db;
 {
 	if (db == NULL)
 		return errno = EINVAL, nullitem;
@@ -461,7 +482,9 @@ sdbm_nextkey(register DBM *db)
  * all important binary trie traversal
  */
 static int
-getpage(register DBM *db, register long int hash)
+getpage(db, hash)
+register DBM *db;
+register long hash;
 {
 	register int hbit;
 	register long dbit;
@@ -503,7 +526,9 @@ getpage(register DBM *db, register long int hash)
 }
 
 static int
-getdbit(register DBM *db, register long int dbit)
+getdbit(db, dbit)
+register DBM *db;
+register long dbit;
 {
 	register long c;
 	register long dirb;
@@ -524,7 +549,9 @@ getdbit(register DBM *db, register long int dbit)
 }
 
 static int
-setdbit(register DBM *db, register long int dbit)
+setdbit(db, dbit)
+register DBM *db;
+register long dbit;
 {
 	register long c;
 	register long dirb;
@@ -558,7 +585,8 @@ setdbit(register DBM *db, register long int dbit)
  * the page, try the next page in sequence
  */
 static datum
-getnext(register DBM *db)
+getnext(db)
+register DBM *db;
 {
 	datum key;
 
@@ -633,7 +661,9 @@ static int seepair proto((char *, int, char *, int));
  */
 
 static int
-fitpair(char *pag, int need)
+fitpair(pag, need)
+char *pag;
+int need;
 {
 	register int n;
 	register int off;
@@ -650,7 +680,10 @@ fitpair(char *pag, int need)
 }
 
 static void
-putpair(char *pag, datum key, datum val)
+putpair(pag, key, val)
+char *pag;
+datum key;
+datum val;
 {
 	register int n;
 	register int off;
@@ -678,7 +711,9 @@ putpair(char *pag, datum key, datum val)
 }
 
 static datum
-getpair(char *pag, datum key)
+getpair(pag, key)
+char *pag;
+datum key;
 {
 	register int i;
 	register int n;
@@ -698,7 +733,9 @@ getpair(char *pag, datum key)
 
 #ifdef SEEDUPS
 static int
-duppair(char *pag, datum key)
+duppair(pag, key)
+char *pag;
+datum key;
 {
 	register short *ino = (short *) pag;
 	return GET_SHORT(ino,0) > 0 &&
@@ -707,7 +744,9 @@ duppair(char *pag, datum key)
 #endif
 
 static datum
-getnkey(char *pag, int num)
+getnkey(pag, num)
+char *pag;
+int num;
 {
 	datum key;
 	register int off;
@@ -726,7 +765,9 @@ getnkey(char *pag, int num)
 }
 
 static int
-delpair(char *pag, datum key)
+delpair(pag, key)
+char *pag;
+datum key;
 {
 	register int n;
 	register int i;
@@ -796,7 +837,11 @@ delpair(char *pag, datum key)
  * return 0 if not found.
  */
 static int
-seepair(char *pag, register int n, register char *key, register int siz)
+seepair(pag, n, key, siz)
+char *pag;
+register int n;
+register char *key;
+register int siz;
 {
 	register int i;
 	register int off = PBLKSIZ;
@@ -812,7 +857,10 @@ seepair(char *pag, register int n, register char *key, register int siz)
 }
 
 static void
-splpage(char *pag, char *new, long int sbit)
+splpage(pag, new, sbit)
+char *pag;
+char *new;
+long sbit;
 {
 	datum key;
 	datum val;
@@ -853,7 +901,8 @@ splpage(char *pag, char *new, long int sbit)
  * this could be made more rigorous.
  */
 static int
-chkpage(char *pag)
+chkpage(pag)
+char *pag;
 {
 	register int n;
 	register int off;
@@ -893,7 +942,9 @@ chkpage(char *pag)
  *      65587   even better. 
  */
 long
-sdbm_hash(register char *str, register int len)
+sdbm_hash(str, len)
+register char *str;
+register int len;
 {
 	register unsigned long n = 0;
 
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 70480f462b..acadc9b26a 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -3,6 +3,7 @@
   sdbminit.c -
 
   $Author$
+  $Date$
   created at: Fri May  7 08:34:24 JST 1999
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -40,15 +41,17 @@ closed_sdbm()
 }
 
 static void
-free_sdbm(struct dbmdata *dbmp)
+free_sdbm(dbmp)
+    struct dbmdata *dbmp;
 {
 
     if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
-    ruby_xfree(dbmp);
+    free(dbmp);
 }
 
 static VALUE
-fsdbm_close(VALUE obj)
+fsdbm_close(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -60,7 +63,8 @@ fsdbm_close(VALUE obj)
 }
 
 static VALUE
-fsdbm_closed(VALUE obj)
+fsdbm_closed(obj)
+    VALUE obj;
 {
     struct dbmdata *dbmp;
 
@@ -73,14 +77,19 @@ fsdbm_closed(VALUE obj)
     return Qfalse;
 }
 
+static VALUE fsdbm_alloc _((VALUE));
 static VALUE
-fsdbm_alloc(VALUE klass)
+fsdbm_alloc(klass)
+    VALUE klass;
 {
     return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 }
 
 static VALUE
-fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
+fsdbm_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE file, vmode;
     DBM *dbm;
@@ -100,15 +109,15 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 
     dbm = 0;
     if (mode >= 0)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR|O_CREAT, mode);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
     if (!dbm)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDWR, 0);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDWR, 0);
     if (!dbm)
-	dbm = sdbm_open(RSTRING_PTR(file), O_RDONLY, 0);
+	dbm = sdbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
 
     if (!dbm) {
 	if (mode == -1) return Qnil;
-	rb_sys_fail(RSTRING_PTR(file));
+	rb_sys_fail(RSTRING(file)->ptr);
     }
 
     dbmp = ALLOC(struct dbmdata);
@@ -120,7 +129,10 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
+fsdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 
@@ -136,15 +148,16 @@ fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
 }
 
 static VALUE
-fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
+fsdbm_fetch(obj, keystr, ifnone)
+    VALUE obj, keystr, ifnone;
 {
     datum key, value;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     value = sdbm_fetch(dbm, key);
@@ -157,13 +170,17 @@ fsdbm_fetch(VALUE obj, VALUE keystr, VALUE ifnone)
 }
 
 static VALUE
-fsdbm_aref(VALUE obj, VALUE keystr)
+fsdbm_aref(obj, keystr)
+    VALUE obj, keystr;
 {
     return fsdbm_fetch(obj, keystr, Qnil);
 }
 
 static VALUE
-fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
+fsdbm_fetch_m(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE keystr, valstr, ifnone;
 
@@ -176,52 +193,90 @@ fsdbm_fetch_m(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-fsdbm_index(VALUE obj, VALUE valstr)
+fsdbm_index(obj, valstr)
+    VALUE obj, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING_LEN(valstr) &&
-	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
 	    return rb_tainted_str_new(key.dptr, key.dsize);
     }
     return Qnil;
 }
 
 static VALUE
-fsdbm_select(VALUE obj)
+fsdbm_indexes(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
-    VALUE new = rb_ary_new();
-    datum key, val;
-    DBM *dbm;
-    struct dbmdata *dbmp;
+    VALUE new;
+    int i;
 
-    GetDBM2(obj, dbmp, dbm);
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
-	VALUE assoc, v;
-	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);
+    new = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+    }
+
+    return new;
+}
+
+static VALUE
+fsdbm_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
+{
+    VALUE new = rb_ary_new2(argc);
+    int i;
+
+    if (rb_block_given_p()) {
+        datum key, val;
+        DBM *dbm;
+        struct dbmdata *dbmp;
+
+	if (argc > 0) {
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
 	}
-	GetDBM2(obj, dbmp, dbm);
+        GetDBM2(obj, dbmp, dbm);
+        for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+            VALUE assoc, v;
+            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);
+        }
+    }
+    else {
+	rb_warn("SDBM#select(index..) is deprecated; use SDBM#values_at");
+
+        for (i=0; i<argc; i++) {
+            rb_ary_push(new, fsdbm_fetch(obj, argv[i], Qnil));
+        }
     }
 
     return new;
 }
 
 static VALUE
-fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
+fsdbm_values_at(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE new = rb_ary_new2(argc);
     int i;
@@ -234,14 +289,16 @@ fsdbm_values_at(int argc, VALUE *argv, VALUE obj)
 }
 
 static void
-fdbm_modify(VALUE obj)
+fdbm_modify(obj)
+    VALUE obj;
 {
     rb_secure(4);
     if (OBJ_FROZEN(obj)) rb_error_frozen("SDBM");
 }
 
 static VALUE
-fsdbm_delete(VALUE obj, VALUE keystr)
+fsdbm_delete(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, value;
     struct dbmdata *dbmp;
@@ -250,8 +307,8 @@ fsdbm_delete(VALUE obj, VALUE keystr)
 
     fdbm_modify(obj);
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -276,7 +333,8 @@ fsdbm_delete(VALUE obj, VALUE keystr)
 }
 
 static VALUE
-fsdbm_shift(VALUE obj)
+fsdbm_shift(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -299,7 +357,8 @@ fsdbm_shift(VALUE obj)
 }
 
 static VALUE
-fsdbm_delete_if(VALUE obj)
+fsdbm_delete_if(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -322,23 +381,24 @@ fsdbm_delete_if(VALUE obj)
 	GetDBM2(obj, dbmp, dbm);
     }
 
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_PTR(ary)[i];
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	keystr = RARRAY(ary)->ptr[i];
 	StringValue(keystr);
-	key.dptr = RSTRING_PTR(keystr);
-	key.dsize = RSTRING_LEN(keystr);
+	key.dptr = RSTRING(keystr)->ptr;
+	key.dsize = RSTRING(keystr)->len;
 	if (sdbm_delete(dbm, key)) {
 	    rb_raise(rb_eDBMError, "sdbm_delete failed");
 	}
     }
     if (status) rb_jump_tag(status);
-    if (n > 0) dbmp->di_size = n - RARRAY_LEN(ary);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
 
     return obj;
 }
 
 static VALUE
-fsdbm_clear(VALUE obj)
+fsdbm_clear(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -358,7 +418,8 @@ fsdbm_clear(VALUE obj)
 }
 
 static VALUE
-fsdbm_invert(VALUE obj)
+fsdbm_invert(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -376,8 +437,49 @@ fsdbm_invert(VALUE obj)
     return hash;
 }
 
+static VALUE each_pair _((VALUE));
+
+static VALUE
+each_pair(obj)
+    VALUE obj;
+{
+    return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+}
+
+static VALUE fsdbm_store _((VALUE,VALUE,VALUE));
+
+static VALUE
+update_i(pair, dbm)
+    VALUE pair, dbm;
+{
+    Check_Type(pair, T_ARRAY);
+    if (RARRAY(pair)->len < 2) {
+	rb_raise(rb_eArgError, "pair must be [key, value]");
+    }
+    fsdbm_store(dbm, RARRAY(pair)->ptr[0], RARRAY(pair)->ptr[1]);
+    return Qnil;
+}
+
+static VALUE
+fsdbm_update(obj, other)
+    VALUE obj, other;
+{
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
+static VALUE
+fsdbm_replace(obj, other)
+    VALUE obj, other;
+{
+    fsdbm_clear(obj);
+    rb_iterate(each_pair, other, update_i, obj);
+    return obj;
+}
+
 static VALUE
-fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
+fsdbm_store(obj, keystr, valstr)
+    VALUE obj, keystr, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -392,11 +494,11 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
     StringValue(keystr);
     StringValue(valstr);
 
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     dbmp->di_size = -1;
@@ -412,33 +514,8 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 }
 
 static VALUE
-update_i(VALUE pair, VALUE dbm)
-{
-    Check_Type(pair, T_ARRAY);
-    if (RARRAY_LEN(pair) < 2) {
-	rb_raise(rb_eArgError, "pair must be [key, value]");
-    }
-    fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
-    return Qnil;
-}
-
-static VALUE
-fsdbm_update(VALUE obj, VALUE other)
-{
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
-    return obj;
-}
-
-static VALUE
-fsdbm_replace(VALUE obj, VALUE other)
-{
-    fsdbm_clear(obj);
-    rb_block_call(other, rb_intern("each_pair"), 0, 0, update_i, obj);
-    return obj;
-}
-
-static VALUE
-fsdbm_length(VALUE obj)
+fsdbm_length(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -457,7 +534,8 @@ fsdbm_length(VALUE obj)
 }
 
 static VALUE
-fsdbm_empty_p(VALUE obj)
+fsdbm_empty_p(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -480,14 +558,13 @@ fsdbm_empty_p(VALUE obj)
 }
 
 static VALUE
-fsdbm_each_value(VALUE obj)
+fsdbm_each_value(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -498,14 +575,13 @@ fsdbm_each_value(VALUE obj)
 }
 
 static VALUE
-fsdbm_each_key(VALUE obj)
+fsdbm_each_key(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
@@ -515,15 +591,14 @@ fsdbm_each_key(VALUE obj)
 }
 
 static VALUE
-fsdbm_each_pair(VALUE obj)
+fsdbm_each_pair(obj)
+    VALUE obj;
 {
     datum key, val;
     DBM *dbm;
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
@@ -537,7 +612,8 @@ fsdbm_each_pair(VALUE obj)
 }
 
 static VALUE
-fsdbm_keys(VALUE obj)
+fsdbm_keys(obj)
+    VALUE obj;
 {
     datum key;
     struct dbmdata *dbmp;
@@ -554,7 +630,8 @@ fsdbm_keys(VALUE obj)
 }
 
 static VALUE
-fsdbm_values(VALUE obj)
+fsdbm_values(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -572,15 +649,16 @@ fsdbm_values(VALUE obj)
 }
 
 static VALUE
-fsdbm_has_key(VALUE obj, VALUE keystr)
+fsdbm_has_key(obj, keystr)
+    VALUE obj, keystr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(keystr);
-    key.dptr = RSTRING_PTR(keystr);
-    key.dsize = RSTRING_LEN(keystr);
+    key.dptr = RSTRING(keystr)->ptr;
+    key.dsize = RSTRING(keystr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     val = sdbm_fetch(dbm, key);
@@ -589,28 +667,30 @@ fsdbm_has_key(VALUE obj, VALUE keystr)
 }
 
 static VALUE
-fsdbm_has_value(VALUE obj, VALUE valstr)
+fsdbm_has_value(obj, valstr)
+    VALUE obj, valstr;
 {
     datum key, val;
     struct dbmdata *dbmp;
     DBM *dbm;
 
     StringValue(valstr);
-    val.dptr = RSTRING_PTR(valstr);
-    val.dsize = RSTRING_LEN(valstr);
+    val.dptr = RSTRING(valstr)->ptr;
+    val.dsize = RSTRING(valstr)->len;
 
     GetDBM2(obj, dbmp, dbm);
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
-	if (val.dsize == RSTRING_LEN(valstr) &&
-	    memcmp(val.dptr, RSTRING_PTR(valstr), val.dsize) == 0)
+	if (val.dsize == RSTRING(valstr)->len &&
+	    memcmp(val.dptr, RSTRING(valstr)->ptr, val.dsize) == 0)
 	    return Qtrue;
     }
     return Qfalse;
 }
 
 static VALUE
-fsdbm_to_a(VALUE obj)
+fsdbm_to_a(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -629,7 +709,8 @@ fsdbm_to_a(VALUE obj)
 }
 
 static VALUE
-fsdbm_to_hash(VALUE obj)
+fsdbm_to_hash(obj)
+    VALUE obj;
 {
     datum key, val;
     struct dbmdata *dbmp;
@@ -648,7 +729,8 @@ fsdbm_to_hash(VALUE obj)
 }
 
 static VALUE
-fsdbm_reject(VALUE obj)
+fsdbm_reject(obj)
+    VALUE obj;
 {
     return rb_hash_delete_if(fsdbm_to_hash(obj));
 }
@@ -671,7 +753,9 @@ Init_sdbm()
     rb_define_method(rb_cDBM, "[]=", fsdbm_store, 2);
     rb_define_method(rb_cDBM, "store", fsdbm_store, 2);
     rb_define_method(rb_cDBM, "index",  fsdbm_index, 1);
-    rb_define_method(rb_cDBM, "select",  fsdbm_select, 0);
+    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);
diff --git a/ext/socket/.cvsignore b/ext/socket/.cvsignore
index ce98586d91..4088712231 100644
--- a/ext/socket/.cvsignore
+++ b/ext/socket/.cvsignore
@@ -1,5 +1,3 @@
 Makefile
 mkmf.log
 *.def
-constants.h
-extconf.h
diff --git a/ext/socket/depend b/ext/socket/depend
index 7577a6929a..cca6d4e62a 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,9 +1,3 @@
-socket.o: socket.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
-	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h $(hdrdir)/ruby/signal.h \
-	sockport.h constants.h
-getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
-getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h
-
-constants.h: $(srcdir)/mkconstants.rb
-	@echo "generating constants.h"
-	@$(RUBY) $(srcdir)/mkconstants.rb > $@
+socket.o : socket.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/rubyio.h $(hdrdir)/rubysig.h sockport.h
+getnameinfo.o: getnameinfo.c $(topdir)/config.h addrinfo.h sockport.h
+getaddrinfo.o: getaddrinfo.c $(topdir)/config.h addrinfo.h sockport.h
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 7354a0f300..8a13ddba73 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,14 +1,22 @@
 require 'mkmf'
 
 case RUBY_PLATFORM
-when /(ms|bcc)win32|mingw/
+when /bccwin32/
   test_func = "WSACleanup"
   have_library("ws2_32", "WSACleanup")
+when /mswin32|mingw/
+  test_func = "WSACleanup"
+  if with_config("winsock2")
+    have_library("ws2_32", "WSACleanup")
+  else
+    have_library("wsock32", "WSACleanup")
+  end
 when /cygwin/
   test_func = "socket"
 when /beos/
   test_func = "socket"
   have_library("net", "socket")
+  have_func("closesocket")
 when /i386-os2_emx/
   test_func = "socket"
   have_library("socket", "socket")
@@ -86,10 +94,17 @@ if have_struct_member("struct sockaddr_in", "sin_len", headers)
 end
 
 #   doug's fix, NOW add -Dss_family... only if required!
-doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
-if (doug[] or
-    with_cppflags($CPPFLAGS + " -Dss_family=__ss_family -Dss_len=__ss_len", &doug))
-  $defs[-1] = "-DHAVE_SOCKADDR_STORAGE"
+[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
 end
 
 if have_struct_member("struct sockaddr", "sa_len", headers)
@@ -125,11 +140,6 @@ main()
   int passive, gaierr, inet4 = 0, inet6 = 0;
   struct addrinfo hints, *ai, *aitop;
   char straddr[INET6_ADDRSTRLEN], strport[16];
-#ifdef _WIN32
-  WSADATA retdata;
-
-  WSAStartup(MAKEWORD(2, 0), &retdata);
-#endif
 
   for (passive = 0; passive <= 1; passive++) {
     memset(&hints, 0, sizeof(hints));
@@ -260,8 +270,6 @@ end
 have_header("sys/un.h")
 have_header("sys/uio.h")
 
-$distcleanfiles << "constants.h"
-
 if have_func(test_func)
   have_func("hsterror")
   have_func("getipnodebyname") or have_func("gethostbyname2")
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index d97012a3c5..9fb4ebcb06 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -38,9 +38,9 @@
  * - PF_UNSPEC case would be handled in getipnodebyname() with the AI_ALL flag.
  */
 
-#include "ruby/config.h"
+#include "config.h"
 #include <sys/types.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__VMS)
 #include <sys/param.h>
 #if defined(__BEOS__)
 # include <net/socket.h>
@@ -62,6 +62,11 @@
 #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>
@@ -198,7 +203,8 @@ if (pai->ai_flags & AI_CANONNAME) {\
 const
 #endif
 char *
-gai_strerror(int ecode)
+gai_strerror(ecode)
+	int ecode;
 {
 	if (ecode < 0 || ecode > EAI_MAX)
 		ecode = EAI_MAX;
@@ -206,7 +212,8 @@ gai_strerror(int ecode)
 }
 
 void
-freeaddrinfo(struct addrinfo *ai)
+freeaddrinfo(ai)
+	struct addrinfo *ai;
 {
 	struct addrinfo *next;
 
@@ -220,7 +227,8 @@ freeaddrinfo(struct addrinfo *ai)
 }
 
 static int
-str_isnumber(const char *p)
+str_isnumber(p)
+	const char *p;
 {
 	char *q = (char *)p;
 	while (*q) {
@@ -234,7 +242,10 @@ str_isnumber(const char *p)
 #ifndef HAVE_INET_PTON
 
 static int
-inet_pton(int af, const char *hostname, void *pton)
+inet_pton(af, hostname, pton)
+	int af;
+	const char *hostname;
+	void *pton;
 {
 	struct in_addr in;
 
@@ -262,7 +273,10 @@ inet_pton(int af, const char *hostname, void *pton)
 #endif
 
 int
-getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
+getaddrinfo(hostname, servname, hints, res)
+	const char *hostname, *servname;
+	const struct addrinfo *hints;
+	struct addrinfo **res;
 {
 	struct addrinfo sentinel;
 	struct addrinfo *top = NULL;
@@ -428,7 +442,7 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
 			s = socket(afd->a_af, SOCK_DGRAM, 0);
 			if (s < 0)
 				continue;
-#if defined(__BEOS__)
+#if defined(HAVE_CLOSESOCKET)
 			closesocket(s);
 #else
 			close(s);
@@ -529,7 +543,13 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
 }
 
 static int
-get_name(const char *addr, const struct afd *afd, struct addrinfo **res, char *numaddr, struct addrinfo *pai, int port0)
+get_name(addr, afd, res, numaddr, pai, port0)
+	const char *addr;
+	const struct afd *afd;
+	struct addrinfo **res;
+	char *numaddr;
+	struct addrinfo *pai;
+	int port0;
 {
 	u_short port = port0 & 0xffff;
 	struct hostent *hp;
@@ -569,7 +589,12 @@ get_name(const char *addr, const struct afd *afd, struct addrinfo **res, char *n
 }
 
 static int
-get_addr(const char *hostname, int af, struct addrinfo **res, struct addrinfo *pai, int port0)
+get_addr(hostname, af, res, pai, port0)
+	const char *hostname;
+	int af;
+	struct addrinfo **res;
+	struct addrinfo *pai;
+	int port0;
 {
 	u_short port = port0 & 0xffff;
 	struct addrinfo sentinel;
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 6214359cd2..66f7e8818a 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -34,7 +34,7 @@
  *   but INRIA implementation returns EAI_xxx defined for getaddrinfo().
  */
 
-#include "ruby/config.h"
+#include "config.h"
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
@@ -112,7 +112,11 @@ static struct afd {
 
 #ifndef HAVE_INET_NTOP
 static const char *
-inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
+inet_ntop(af, addr, numaddr, numaddr_len)
+	int af;
+	const void *addr;
+	char *numaddr;
+	size_t numaddr_len;
 {
 #ifdef HAVE_INET_NTOA
 	struct in_addr in;
@@ -129,7 +133,14 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 #endif
 
 int
-getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+	const struct sockaddr *sa;
+	size_t salen;
+	char *host;
+	size_t hostlen;
+	char *serv;
+	size_t servlen;
+	int flags;
 {
 	struct afd *afd;
 	struct servent *sp;
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
deleted file mode 100644
index 5212739876..0000000000
--- a/ext/socket/mkconstants.rb
+++ /dev/null
@@ -1,262 +0,0 @@
-$out ||= $stdout
-
-# workaround for NetBSD, OpenBSD and etc.
-$out.puts("#define pseudo_AF_FTIP pseudo_AF_RTIP")
-
-# skip empty lines and comment lines
-DATA.each_line do |s|
-  name, value = s.scan(/\S+/)
-  if name && name[0] != ?#
-    $out.puts("#ifdef #{name}")
-    $out.puts("    sock_define_const(\"#{name}\", #{name});")
-    if value
-    $out.puts("#else")
-    $out.puts("    sock_define_const(\"#{name}\", #{value});")
-    end
-    $out.puts("#endif")
-    $out.puts
-  end
-end
-
-__END__
-
-SOCK_STREAM
-SOCK_DGRAM
-SOCK_RAW
-SOCK_RDM
-SOCK_SEQPACKET
-SOCK_PACKET
-
-AF_INET
-PF_INET
-AF_UNIX
-PF_UNIX
-AF_AX25
-PF_AX25
-AF_IPX
-PF_IPX
-AF_APPLETALK
-PF_APPLETALK
-AF_UNSPEC
-PF_UNSPEC
-AF_LOCAL
-PF_LOCAL
-AF_IMPLINK
-PF_IMPLINK
-AF_PUP
-PF_PUP
-AF_CHAOS
-PF_CHAOS
-AF_NS
-PF_NS
-AF_ISO
-PF_ISO
-AF_OSI
-PF_OSI
-AF_ECMA
-PF_ECMA
-AF_DATAKIT
-PF_DATAKIT
-AF_CCITT
-PF_CCITT
-AF_SNA
-PF_SNA
-AF_DEC
-PF_DEC
-AF_DLI
-PF_DLI
-AF_LAT
-PF_LAT
-AF_HYLINK
-PF_HYLINK
-AF_ROUTE
-PF_ROUTE
-AF_LINK
-PF_LINK
-AF_COIP
-PF_COIP
-AF_CNT
-PF_CNT
-AF_SIP
-PF_SIP
-AF_NDRV
-PF_NDRV
-AF_ISDN
-PF_ISDN
-AF_NATM
-PF_NATM
-AF_SYSTEM
-PF_SYSTEM
-AF_NETBIOS
-PF_NETBIOS
-AF_PPP
-PF_PPP
-AF_ATM
-PF_ATM
-AF_NETGRAPH
-PF_NETGRAPH
-AF_MAX
-PF_MAX
-
-AF_E164
-PF_XTP
-PF_RTIP
-PF_PIP
-PF_KEY
-
-MSG_OOB
-MSG_PEEK
-MSG_DONTROUTE
-MSG_EOR
-MSG_TRUNC
-MSG_CTRUNC
-MSG_WAITALL
-MSG_DONTWAIT
-MSG_EOF
-MSG_FLUSH
-MSG_HOLD
-MSG_SEND
-MSG_HAVEMORE
-MSG_RCVMORE
-MSG_COMPAT
-
-SOL_SOCKET
-SOL_IP
-SOL_IPX
-SOL_AX25
-SOL_ATALK
-SOL_TCP
-SOL_UDP
-
-IPPROTO_IP	0
-IPPROTO_ICMP	1
-IPPROTO_IGMP
-IPPROTO_GGP
-IPPROTO_TCP	6
-IPPROTO_EGP
-IPPROTO_PUP
-IPPROTO_UDP	17
-IPPROTO_IDP
-IPPROTO_HELLO
-IPPROTO_ND
-IPPROTO_TP
-IPPROTO_XTP
-IPPROTO_EON
-IPPROTO_BIP
-IPPROTO_RAW	255
-IPPROTO_MAX
-
-# Some port configuration
-IPPORT_RESERVED		1024
-IPPORT_USERRESERVED	5000
-
-# Some reserved IP v.4 addresses
-INADDR_ANY		0x00000000
-INADDR_BROADCAST	0xffffffff
-INADDR_LOOPBACK		0x7F000001
-INADDR_UNSPEC_GROUP	0xe0000000
-INADDR_ALLHOSTS_GROUP	0xe0000001
-INADDR_MAX_LOCAL_GROUP	0xe00000ff
-INADDR_NONE		0xffffffff
-
-# IP [gs]etsockopt options
-IP_OPTIONS
-IP_HDRINCL
-IP_TOS
-IP_TTL
-IP_RECVOPTS
-IP_RECVRETOPTS
-IP_RECVDSTADDR
-IP_RETOPTS
-IP_MULTICAST_IF
-IP_MULTICAST_TTL
-IP_MULTICAST_LOOP
-IP_ADD_MEMBERSHIP
-IP_DROP_MEMBERSHIP
-IP_DEFAULT_MULTICAST_TTL
-IP_DEFAULT_MULTICAST_LOOP
-IP_MAX_MEMBERSHIPS
-
-SO_DEBUG
-SO_REUSEADDR
-SO_REUSEPORT
-SO_TYPE
-SO_ERROR
-SO_DONTROUTE
-SO_BROADCAST
-SO_SNDBUF
-SO_RCVBUF
-SO_KEEPALIVE
-SO_OOBINLINE
-SO_NO_CHECK
-SO_PRIORITY
-SO_LINGER
-SO_PASSCRED
-SO_PEERCRED
-SO_RCVLOWAT
-SO_SNDLOWAT
-SO_RCVTIMEO
-SO_SNDTIMEO
-SO_ACCEPTCONN
-SO_USELOOPBACK
-SO_ACCEPTFILTER
-SO_DONTTRUNC
-SO_WANTMORE
-SO_WANTOOBFLAG
-SO_NREAD
-SO_NKE
-SO_NOSIGPIPE
-SO_SECURITY_AUTHENTICATION
-SO_SECURITY_ENCRYPTION_TRANSPORT
-SO_SECURITY_ENCRYPTION_NETWORK
-SO_BINDTODEVICE
-SO_ATTACH_FILTER
-SO_DETACH_FILTER
-SO_PEERNAME
-SO_TIMESTAMP
-
-SOPRI_INTERACTIVE
-SOPRI_NORMAL
-SOPRI_BACKGROUND
-
-IPX_TYPE
-
-TCP_NODELAY
-TCP_MAXSEG
-
-EAI_ADDRFAMILY
-EAI_AGAIN
-EAI_BADFLAGS
-EAI_FAIL
-EAI_FAMILY
-EAI_MEMORY
-EAI_NODATA
-EAI_NONAME
-EAI_SERVICE
-EAI_SOCKTYPE
-EAI_SYSTEM
-EAI_BADHINTS
-EAI_PROTOCOL
-EAI_MAX
-
-AI_PASSIVE
-AI_CANONNAME
-AI_NUMERICHOST
-AI_MASK
-AI_ALL
-AI_V4MAPPED_CFG
-AI_ADDRCONFIG
-AI_V4MAPPED
-AI_DEFAULT
-
-NI_MAXHOST
-NI_MAXSERV
-NI_NOFQDN
-NI_NUMERICHOST
-NI_NAMEREQD
-NI_NUMERICSERV
-NI_DGRAM
-
-SHUT_RD		0
-SHUT_WR		1
-SHUT_RDWR	2
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 81c5a8e170..491823ad44 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -3,16 +3,17 @@
   socket.c -
 
   $Author$
+  $Date$
   created at: Thu Mar 31 12:21:29 JST 1994
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2001 Yukihiro Matsumoto
 
 ************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/signal.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
 #include <stdio.h>
 #include <sys/types.h>
 
@@ -24,15 +25,12 @@
 #include <sys/uio.h>
 #endif
 
-#ifdef HAVE_XTI_H
-#include <xti.h>
-#endif
-
 #ifndef _WIN32
 #if defined(__BEOS__)
 # 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
@@ -76,8 +74,11 @@
 #endif
 #include "sockport.h"
 
+#if defined(__vms)
+#include <tcp.h>
+#endif
+
 static int do_not_reverse_lookup = 0;
-#define FMODE_NOREVLOOKUP 0x100
 
 VALUE rb_cBasicSocket;
 VALUE rb_cIPSocket;
@@ -102,8 +103,6 @@ int Rconnect();
 #endif
 #endif
 
-#define BLOCKING_REGION(func, arg) (long)rb_thread_blocking_region((func), (arg), RB_UBF_DFL, 0)
-
 #define INET_CLIENT 0
 #define INET_SERVER 1
 #define INET_SOCKS  2
@@ -144,8 +143,11 @@ static int lookup_order_table[LOOKUP_ORDERS] = {
 };
 
 static int
-ruby_getaddrinfo(char *nodename, char *servname,
-		 struct addrinfo *hints, struct addrinfo **res)
+ruby_getaddrinfo(nodename, servname, hints, res)
+     char *nodename;
+     char *servname;
+     struct addrinfo *hints;
+     struct addrinfo **res;
 {
     struct addrinfo tmp_hints;
     int i, af, error;
@@ -176,8 +178,11 @@ ruby_getaddrinfo(char *nodename, char *servname,
 
 #if defined(_AIX)
 static int
-ruby_getaddrinfo__aix(char *nodename, char *servname,
-		      struct addrinfo *hints, struct addrinfo **res)
+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;
@@ -229,32 +234,30 @@ ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags)
 #endif
 #endif
 
-#ifdef __BEOS__
+#ifdef HAVE_CLOSESOCKET
 #undef close
 #define close closesocket
 #endif
 
 static VALUE
-init_sock(VALUE sock, int fd)
+init_sock(sock, fd)
+    VALUE sock;
+    int fd;
 {
     rb_io_t *fp;
 
     MakeOpenFile(sock, fp);
-    fp->fd = fd;
-    fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    fp->mode |= FMODE_BINMODE;
-#endif
-    if (do_not_reverse_lookup) {
-	fp->mode |= FMODE_NOREVLOOKUP;
-    }
+    fp->f = rb_fdopen(fd, "r");
+    fp->f2 = rb_fdopen(fd, "w");
+    fp->mode = FMODE_READWRITE;
     rb_io_synchronized(fp);
 
     return sock;
 }
 
 static VALUE
-bsock_s_for_fd(VALUE klass, VALUE fd)
+bsock_s_for_fd(klass, fd)
+    VALUE klass, fd;
 {
     rb_io_t *fptr;
     VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
@@ -265,7 +268,10 @@ bsock_s_for_fd(VALUE klass, VALUE fd)
 }
 
 static VALUE
-bsock_shutdown(int argc, VALUE *argv, VALUE sock)
+bsock_shutdown(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     VALUE howto;
     int how;
@@ -284,14 +290,15 @@ bsock_shutdown(int argc, VALUE *argv, VALUE sock)
 	}
     }
     GetOpenFile(sock, fptr);
-    if (shutdown(fptr->fd, how) == -1)
+    if (shutdown(fileno(fptr->f), how) == -1)
 	rb_sys_fail(0);
 
     return INT2FIX(0);
 }
 
 static VALUE
-bsock_close_read(VALUE sock)
+bsock_close_read(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
 
@@ -299,7 +306,7 @@ bsock_close_read(VALUE sock)
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
     }
     GetOpenFile(sock, fptr);
-    shutdown(fptr->fd, 0);
+    shutdown(fileno(fptr->f), 0);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	return rb_io_close(sock);
     }
@@ -309,7 +316,8 @@ bsock_close_read(VALUE sock)
 }
 
 static VALUE
-bsock_close_write(VALUE sock)
+bsock_close_write(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
 
@@ -320,7 +328,7 @@ bsock_close_write(VALUE sock)
     if (!(fptr->mode & FMODE_READABLE)) {
 	return rb_io_close(sock);
     }
-    shutdown(fptr->fd, 1);
+    shutdown(fileno(fptr->f2), 1);
     fptr->mode &= ~FMODE_WRITABLE;
 
     return Qnil;
@@ -372,7 +380,8 @@ bsock_close_write(VALUE sock)
  *
 */
 static VALUE
-bsock_setsockopt(VALUE sock, VALUE lev, VALUE optname, VALUE val)
+bsock_setsockopt(sock, lev, optname, val)
+    VALUE sock, lev, optname, val;
 {
     int level, option;
     rb_io_t *fptr;
@@ -398,13 +407,13 @@ bsock_setsockopt(VALUE sock, VALUE lev, VALUE optname, VALUE val)
 	break;
       default:
 	StringValue(val);
-	v = RSTRING_PTR(val);
-	vlen = RSTRING_LEN(val);
+	v = RSTRING(val)->ptr;
+	vlen = RSTRING(val)->len;
 	break;
     }
 
     GetOpenFile(sock, fptr);
-    if (setsockopt(fptr->fd, level, option, v, vlen) < 0)
+    if (setsockopt(fileno(fptr->f), level, option, v, vlen) < 0)
 	rb_sys_fail(fptr->path);
 
     return INT2FIX(0);
@@ -451,7 +460,8 @@ bsock_setsockopt(VALUE sock, VALUE lev, VALUE optname, VALUE val)
  *   onoff, linger = optval.unpack "ii"
 */
 static VALUE
-bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
+bsock_getsockopt(sock, lev, optname)
+    VALUE sock, lev, optname;
 {
 #if !defined(__BEOS__)
     int level, option;
@@ -463,9 +473,10 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
     option = NUM2INT(optname);
     len = 256;
     buf = ALLOCA_N(char,len);
+    GetOpenFile(sock, fptr);
 
     GetOpenFile(sock, fptr);
-    if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
+    if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
 	rb_sys_fail(fptr->path);
 
     return rb_str_new(buf, len);
@@ -475,120 +486,78 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
 }
 
 static VALUE
-bsock_getsockname(VALUE sock)
+bsock_getsockname(sock)
+    VALUE sock;
 {
     char buf[1024];
     socklen_t len = sizeof buf;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getsockname(fptr->fd, (struct sockaddr*)buf, &len) < 0)
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
 	rb_sys_fail("getsockname(2)");
     return rb_str_new(buf, len);
 }
 
 static VALUE
-bsock_getpeername(VALUE sock)
+bsock_getpeername(sock)
+    VALUE sock;
 {
     char buf[1024];
     socklen_t len = sizeof buf;
     rb_io_t *fptr;
 
     GetOpenFile(sock, fptr);
-    if (getpeername(fptr->fd, (struct sockaddr*)buf, &len) < 0)
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)buf, &len) < 0)
 	rb_sys_fail("getpeername(2)");
     return rb_str_new(buf, len);
 }
 
-struct send_arg {
-    int fd, flags;
-    VALUE mesg;
-    struct sockaddr *to;
-    socklen_t tolen;
-};
-
 static VALUE
-sendto_blocking(void *data)
-{
-    struct send_arg *arg = data;
-    VALUE mesg = arg->mesg;
-    return (VALUE)sendto(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-			 arg->flags, arg->to, arg->tolen);
-}
-
-static VALUE
-send_blocking(void *data)
-{
-    struct send_arg *arg = data;
-    VALUE mesg = arg->mesg;
-    return (VALUE)send(arg->fd, RSTRING_PTR(mesg), RSTRING_LEN(mesg),
-		       arg->flags);
-}
-
-static VALUE
-bsock_send(int argc, VALUE *argv, VALUE sock)
+bsock_send(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
-    struct send_arg arg;
-    VALUE flags, to;
+    VALUE mesg, to;
+    VALUE flags;
     rb_io_t *fptr;
-    int n;
-    rb_blocking_function_t *func;
+    FILE *f;
+    int fd, n;
 
     rb_secure(4);
-    rb_scan_args(argc, argv, "21", &arg.mesg, &flags, &to);
+    rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
 
-    StringValue(arg.mesg);
+    StringValue(mesg);
+    if (!NIL_P(to)) StringValue(to);
+    GetOpenFile(sock, fptr);
+    f = GetWriteFile(fptr);
+    fd = fileno(f);
+    rb_thread_fd_writable(fd);
+  retry:
     if (!NIL_P(to)) {
-	StringValue(to);
-	to = rb_str_new4(to);
-	arg.to = (struct sockaddr *)RSTRING_PTR(to);
-	arg.tolen = RSTRING_LEN(to);
-	func = sendto_blocking;
+        TRAP_BEG;
+	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
+        TRAP_END;
     }
     else {
-	func = send_blocking;
+        TRAP_BEG;
+	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
+        TRAP_END;
     }
-    GetOpenFile(sock, fptr);
-    arg.fd = fptr->fd;
-    arg.flags = NUM2INT(flags);
-    while (rb_thread_fd_writable(arg.fd),
-	   (n = (int)BLOCKING_REGION(func, &arg)) < 0) {
-	if (rb_io_wait_writable(arg.fd)) {
-	    continue;
+    if (n < 0) {
+	if (rb_io_wait_writable(fd)) {
+	    goto retry;
 	}
 	rb_sys_fail("send(2)");
     }
     return INT2FIX(n);
 }
 
-static VALUE
-bsock_do_not_reverse_lookup(VALUE sock)
-{
-    rb_io_t *fptr;
-
-    GetOpenFile(sock, fptr);
-    return (fptr->mode & FMODE_NOREVLOOKUP) ? Qtrue : Qfalse;
-}
-
-static VALUE
-bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
-{
-    rb_io_t *fptr;
-
-    rb_secure(4);
-    GetOpenFile(sock, fptr);
-    if (RTEST(state)) {
-	fptr->mode |= FMODE_NOREVLOOKUP;
-    }
-    else {
-	fptr->mode &= ~FMODE_NOREVLOOKUP;
-    }
-    return sock;
-}
-
-static VALUE ipaddr(struct sockaddr*, int);
+static VALUE ipaddr _((struct sockaddr*));
 #ifdef HAVE_SYS_UN_H
-static VALUE unixaddr(struct sockaddr_un*, socklen_t);
+static VALUE unixaddr _((struct sockaddr_un*, socklen_t));
 #endif
 
 enum sock_recv_type {
@@ -598,81 +567,75 @@ enum sock_recv_type {
     RECV_SOCKET			/* Socket#recvfrom */
 };
 
-struct recvfrom_arg {
-    int fd, flags;
-    VALUE str;
-    socklen_t alen;
-    char buf[1024];
-};
-
 static VALUE
-recvfrom_blocking(void *data)
-{
-    struct recvfrom_arg *arg = data;
-    return (VALUE)recvfrom(arg->fd, RSTRING_PTR(arg->str), RSTRING_LEN(arg->str),
-			   arg->flags, (struct sockaddr*)arg->buf, &arg->alen);
-}
-
-static VALUE
-s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
+s_recvfrom(sock, argc, argv, from)
+    VALUE sock;
+    int argc;
+    VALUE *argv;
+    enum sock_recv_type from;
 {
     rb_io_t *fptr;
-    VALUE str, klass;
-    struct recvfrom_arg arg;
+    VALUE str;
+    char buf[1024];
+    socklen_t alen = sizeof buf;
     VALUE len, flg;
     long buflen;
     long slen;
+    int fd, flags;
 
     rb_scan_args(argc, argv, "11", &len, &flg);
 
-    if (flg == Qnil) arg.flags = 0;
-    else             arg.flags = NUM2INT(flg);
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
     buflen = NUM2INT(len);
 
     GetOpenFile(sock, fptr);
-    if (rb_io_read_pending(fptr)) {
+    if (rb_read_pending(fptr->f)) {
 	rb_raise(rb_eIOError, "recv for buffered IO");
     }
-    arg.fd = fptr->fd;
-    arg.alen = sizeof(arg.buf);
+    fd = fileno(fptr->f);
 
-    arg.str = str = rb_tainted_str_new(0, buflen);
-    klass = RBASIC(str)->klass;
-    RBASIC(str)->klass = 0;
+    str = rb_tainted_str_new(0, buflen);
 
-    while (rb_io_check_closed(fptr),
-	   rb_thread_wait_fd(arg.fd),
-	   (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
-	if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
-	    rb_raise(rb_eRuntimeError, "buffer string modified");
+  retry:
+    rb_str_locktmp(str);
+    rb_thread_wait_fd(fd);
+    TRAP_BEG;
+    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
+    TRAP_END;
+    rb_str_unlocktmp(str);
+
+    if (slen < 0) {
+	if (rb_io_wait_readable(fd)) {
+	    goto retry;
 	}
+	rb_sys_fail("recvfrom(2)");
     }
-
-    RBASIC(str)->klass = klass;
-    if (slen < RSTRING_LEN(str)) {
-	rb_str_set_len(str, slen);
+    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;
+	return (VALUE)str;
       case RECV_IP:
 #if 0
-	if (arg.alen != sizeof(struct sockaddr_in)) {
+	if (alen != sizeof(struct sockaddr_in)) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 #endif
-	if (arg.alen && arg.alen != sizeof(arg.buf)) /* OSX doesn't return a from result for connection-oriented sockets */
-	    return rb_assoc_new(str, ipaddr((struct sockaddr*)arg.buf, fptr->mode & FMODE_NOREVLOOKUP));
+	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);
 
 #ifdef HAVE_SYS_UN_H
       case RECV_UNIX:
-        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)arg.buf, arg.alen));
+        return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf, alen));
 #endif
       case RECV_SOCKET:
-	return rb_assoc_new(str, rb_str_new(arg.buf, arg.alen));
+	return rb_assoc_new(str, rb_str_new(buf, alen));
       default:
 	rb_bug("s_recvfrom called with bad value");
     }
@@ -704,31 +667,32 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 #endif
 
     GetOpenFile(sock, fptr);
-    if (rb_io_read_pending(fptr)) {
+    if (rb_read_pending(fptr->f)) {
 	rb_raise(rb_eIOError, "recvfrom for buffered IO");
     }
-    fd = fptr->fd;
+    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_PTR(str), buflen, flags, (struct sockaddr*)buf, &alen);
+    slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
 
     if (slen < 0) {
 	rb_sys_fail("recvfrom(2)");
     }
-    if (slen < RSTRING_LEN(str)) {
-	rb_str_set_len(str, slen);
+    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;
+	return str;
 
       case RECV_IP:
         if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */
-            addr = ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP);
+            addr = ipaddr((struct sockaddr*)buf);
         break;
 
       case RECV_SOCKET:
@@ -742,7 +706,10 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 }
 
 static VALUE
-bsock_recv(int argc, VALUE *argv, VALUE sock)
+bsock_recv(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     return s_recvfrom(sock, argc, argv, RECV_RECV);
 }
@@ -778,55 +745,53 @@ bsock_recv(int argc, VALUE *argv, VALUE sock)
  * to _recv_nonblock_ fails. 
  *
  * BasicSocket#recv_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  *
  * === See
  * * Socket#recvfrom
  */
 
 static VALUE
-bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
+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(void)
+bsock_do_not_rev_lookup()
 {
     return do_not_reverse_lookup?Qtrue:Qfalse;
 }
 
 static VALUE
-bsock_do_not_rev_lookup_set(VALUE self, VALUE val)
+bsock_do_not_rev_lookup_set(self, val)
+    VALUE self, val;
 {
     rb_secure(4);
     do_not_reverse_lookup = RTEST(val);
     return val;
 }
 
-NORETURN(static void raise_socket_error(const char *, int));
 static void
-raise_socket_error(const char *reason, int error)
-{
-#ifdef EAI_SYSTEM
-    if (error == EAI_SYSTEM) rb_sys_fail(reason);
-#endif
-    rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
-}
-
-static void
-make_ipaddr0(struct sockaddr *addr, char *buf, size_t len)
+make_ipaddr0(addr, buf, len)
+    struct sockaddr *addr;
+    char *buf;
+    size_t len;
 {
     int error;
 
     error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
     if (error) {
-	raise_socket_error("getnameinfo", error);
+	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
     }
 }
 
 static VALUE
-make_ipaddr(struct sockaddr *addr)
+make_ipaddr(addr)
+    struct sockaddr *addr;
 {
     char buf[1024];
 
@@ -835,7 +800,10 @@ make_ipaddr(struct sockaddr *addr)
 }
 
 static void
-make_inetaddr(long host, char *buf, size_t len)
+make_inetaddr(host, buf, len)
+    long host;
+    char *buf;
+    size_t len;
 {
     struct sockaddr_in sin;
 
@@ -847,28 +815,32 @@ make_inetaddr(long host, char *buf, size_t len)
 }
 
 static int
-str_isnumber(const char *p)
+str_isnumber(p)
+        const char *p;
 {
     char *ep;
 
     if (!p || *p == '\0')
        return 0;
     ep = NULL;
-    (void)STRTOUL(p, &ep, 10);
+    (void)strtoul(p, &ep, 10);
     if (ep && *ep == '\0')
        return 1;
     else
        return 0;
 }
 
-static char*
-host_str(VALUE host, char *hbuf, size_t len)
+static char *
+host_str(host, hbuf, len)
+    VALUE host;
+    char *hbuf;
+    size_t len;
 {
     if (NIL_P(host)) {
 	return NULL;
     }
     else if (rb_obj_is_kind_of(host, rb_cInteger)) {
-	long i = NUM2LONG(host);
+	unsigned long i = NUM2ULONG(host);
 
 	make_inetaddr(htonl(i), hbuf, len);
 	return hbuf;
@@ -877,7 +849,7 @@ host_str(VALUE host, char *hbuf, size_t len)
 	char *name;
 
 	SafeStringValue(host);
-	name = RSTRING_PTR(host);
+	name = RSTRING(host)->ptr;
 	if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
 	    make_inetaddr(INADDR_ANY, hbuf, len);
 	}
@@ -885,8 +857,7 @@ host_str(VALUE host, char *hbuf, size_t len)
 	    make_inetaddr(INADDR_BROADCAST, hbuf, len);
 	}
 	else if (strlen(name) >= len) {
-	    rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
-                strlen(name));
+	    rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
 	}
 	else {
 	    strcpy(hbuf, name);
@@ -895,8 +866,11 @@ host_str(VALUE host, char *hbuf, size_t len)
     }
 }
 
-static char*
-port_str(VALUE port, char *pbuf, size_t len)
+static char *
+port_str(port, pbuf, len)
+    VALUE port;
+    char *pbuf;
+    size_t len;
 {
     if (NIL_P(port)) {
 	return 0;
@@ -909,10 +883,9 @@ port_str(VALUE port, char *pbuf, size_t len)
 	char *serv;
 
 	SafeStringValue(port);
-	serv = RSTRING_PTR(port);
+	serv = RSTRING(port)->ptr;
 	if (strlen(serv) >= len) {
-	    rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
-                strlen(serv));
+	    rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
 	}
 	strcpy(pbuf, serv);
 	return pbuf;
@@ -920,14 +893,16 @@ port_str(VALUE port, char *pbuf, size_t len)
 }
 
 #ifndef NI_MAXHOST
-# define 1025
+# define NI_MAXHOST 1025
 #endif
 #ifndef NI_MAXSERV
-# define 32
+# define NI_MAXSERV 32
 #endif
 
 static struct addrinfo*
-sock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
+sock_addrinfo(host, port, socktype, flags)
+    VALUE host, port;
+    int socktype, flags;
 {
     struct addrinfo hints;
     struct addrinfo* res = NULL;
@@ -951,32 +926,32 @@ sock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
 	if (hostp && hostp[strlen(hostp)-1] == '\n') {
 	    rb_raise(rb_eSocket, "newline at the end of hostname");
 	}
-	raise_socket_error("getaddrinfo", error);
+	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;
-	}
+        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 VALUE
-ipaddr(struct sockaddr *sockaddr, int norevlookup)
+ipaddr(sockaddr)
+    struct sockaddr *sockaddr;
 {
     VALUE family, port, addr1, addr2;
     VALUE ary;
@@ -1009,9 +984,8 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup)
 	family = rb_str_new2(pbuf);
 	break;
     }
-
     addr1 = Qnil;
-    if (!norevlookup) {
+    if (!do_not_reverse_lookup) {
 	error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			    NULL, 0, 0);
 	if (! error) {
@@ -1021,7 +995,7 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup)
     error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
 			pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
     if (error) {
-	raise_socket_error("getnameinfo", error);
+	rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
     }
     addr2 = rb_str_new2(hbuf);
     if (addr1 == Qnil) {
@@ -1034,7 +1008,8 @@ ipaddr(struct sockaddr *sockaddr, int norevlookup)
 }
 
 static int
-ruby_socket(int domain, int type, int proto)
+ruby_socket(domain, type, proto)
+    int domain, type, proto;
 {
     int fd;
 
@@ -1049,24 +1024,27 @@ ruby_socket(int domain, int type, int proto)
 }
 
 static int
-wait_connectable0(int fd, rb_fdset_t *fds_w, rb_fdset_t *fds_e)
+wait_connectable(fd)
+    int fd;
 {
     int sockerr;
     socklen_t sockerrlen;
+    fd_set fds_w;
+    fd_set fds_e;
 
     for (;;) {
-	rb_fd_zero(fds_w);
-	rb_fd_zero(fds_e);
+	FD_ZERO(&fds_w);
+	FD_ZERO(&fds_e);
 
-	rb_fd_set(fd, fds_w);
-	rb_fd_set(fd, fds_e);
+	FD_SET(fd, &fds_w);
+	FD_SET(fd, &fds_e);
 
-	rb_thread_select(fd+1, 0, rb_fd_ptr(fds_w), rb_fd_ptr(fds_e), 0);
+	rb_thread_select(fd+1, 0, &fds_w, &fds_e, 0);
 
-	if (rb_fd_isset(fd, fds_w)) {
+	if (FD_ISSET(fd, &fds_w)) {
 	    return 0;
 	}
-	else if (rb_fd_isset(fd, fds_e)) {
+	else if (FD_ISSET(fd, &fds_e)) {
 	    sockerrlen = sizeof(sockerr);
 	    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
 			   &sockerrlen) == 0) {
@@ -1081,46 +1059,6 @@ wait_connectable0(int fd, rb_fdset_t *fds_w, rb_fdset_t *fds_e)
     return 0;
 }
 
-struct wait_connectable_arg {
-    int fd;
-    rb_fdset_t fds_w;
-    rb_fdset_t fds_e;
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-try_wait_connectable(VALUE arg)
-{
-    struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
-    return (VALUE)wait_connectable0(p->fd, &p->fds_w, &p->fds_e);
-}
-
-static VALUE
-wait_connectable_ensure(VALUE arg)
-{
-    struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
-    rb_fd_term(&p->fds_w);
-    rb_fd_term(&p->fds_e);
-    return Qnil;
-}
-#endif
-
-static int
-wait_connectable(int fd)
-{
-    struct wait_connectable_arg arg;
-
-    rb_fd_init(&arg.fds_w);
-    rb_fd_init(&arg.fds_e);
-#ifdef HAVE_RB_FD_INIT
-    arg.fd = fd;
-    return (int)rb_ensure(try_wait_connectable, (VALUE)&arg,
-			  wait_connectable_ensure,(VALUE)&arg);
-#else
-    return wait_connectable0(fd, &arg.fds_w, &arg.fds_e);
-#endif
-}
-
 #ifdef __CYGWIN__
 #define WAIT_IN_PROGRESS 10
 #endif
@@ -1136,48 +1074,53 @@ wait_connectable(int fd)
 #define WAIT_IN_PROGRESS 1
 #endif
 
-struct connect_arg {
-    int fd;
-    const struct sockaddr *sockaddr;
-    socklen_t len;
-};
-
-static VALUE
-connect_blocking(void *data)
-{
-    struct connect_arg *arg = data;
-    return (VALUE)connect(arg->fd, arg->sockaddr, arg->len);
-}
-
-#if defined(SOCKS) && !defined(SOCKS5)
-static VALUE
-socks_connect_blocking(void *data)
-{
-    struct connect_arg *arg = data;
-    return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
-}
-#endif
-
 static int
-ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
+ruby_connect(fd, sockaddr, len, socks)
+    int fd;
+    struct sockaddr *sockaddr;
+    int len;
+    int socks;
 {
     int status;
-    rb_blocking_function_t *func = connect_blocking;
-    struct connect_arg arg;
+    int mode;
 #if WAIT_IN_PROGRESS > 0
     int wait_in_progress = -1;
     int sockerr;
     socklen_t sockerrlen;
 #endif
 
-    arg.fd = fd;
-    arg.sockaddr = sockaddr;
-    arg.len = len;
-#if defined(SOCKS) && !defined(SOCKS5)
-    if (socks) func = socks_connect_blocking;
+#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
+#else
+#ifdef O_NBIO
+# define NONBLOCKING O_NBIO
+#else
+# define NONBLOCKING O_NONBLOCK
+#endif
+#endif
+#ifdef SOCKS5
+    if (!socks)
 #endif
+    fcntl(fd, F_SETFL, mode|NONBLOCKING);
+#endif /* HAVE_FCNTL */
+
     for (;;) {
-	status = (int)BLOCKING_REGION(func, &arg);
+#if defined(SOCKS) && !defined(SOCKS5)
+	if (socks) {
+	    status = Rconnect(fd, sockaddr, len);
+	}
+	else
+#endif
+	{
+	    status = connect(fd, sockaddr, len);
+	}
 	if (status < 0) {
 	    switch (errno) {
 	      case EAGAIN:
@@ -1238,6 +1181,9 @@ ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 		break;
 	    }
 	}
+#ifdef HAVE_FCNTL
+	fcntl(fd, F_SETFL, mode);
+#endif
 	return status;
     }
 }
@@ -1254,7 +1200,8 @@ struct inetsock_arg
 };
 
 static VALUE
-inetsock_cleanup(struct inetsock_arg *arg)
+inetsock_cleanup(arg)
+    struct inetsock_arg *arg;
 {
     if (arg->remote.res) {
 	freeaddrinfo(arg->remote.res);
@@ -1271,12 +1218,13 @@ inetsock_cleanup(struct inetsock_arg *arg)
 }
 
 static VALUE
-init_inetsock_internal(struct inetsock_arg *arg)
+init_inetsock_internal(arg)
+    struct inetsock_arg *arg;
 {
     int type = arg->type;
     struct addrinfo *res;
     int fd, status = 0;
-    const char *syscall = 0;
+    char *syscall;
 
     arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
 				    (type == INET_SERVER) ? AI_PASSIVE : 0);
@@ -1340,8 +1288,9 @@ init_inetsock_internal(struct inetsock_arg *arg)
 }
 
 static VALUE
-init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
-	      VALUE local_host, VALUE local_serv, int type)
+init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
+    VALUE sock, remote_host, remote_serv, local_host, local_serv;
+    int type;
 {
     struct inetsock_arg arg;
     arg.sock = sock;
@@ -1366,7 +1315,10 @@ init_inetsock(VALUE sock, VALUE remote_host, VALUE remote_serv,
  * end to establish the connection.
  */
 static VALUE
-tcp_init(int argc, VALUE *argv, VALUE sock)
+tcp_init(argc, argv, sock)
+     int argc;
+     VALUE *argv;
+     VALUE sock;
 {
     VALUE remote_host, remote_serv;
     VALUE local_host, local_serv;
@@ -1380,7 +1332,8 @@ tcp_init(int argc, VALUE *argv, VALUE sock)
 
 #ifdef SOCKS
 static VALUE
-socks_init(VALUE sock, VALUE host, VALUE serv)
+socks_init(sock, host, serv)
+    VALUE sock, host, serv;
 {
     static init = 0;
 
@@ -1394,7 +1347,8 @@ socks_init(VALUE sock, VALUE host, VALUE serv)
 
 #ifdef SOCKS5
 static VALUE
-socks_s_close(VALUE sock)
+socks_s_close(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
 
@@ -1402,7 +1356,8 @@ socks_s_close(VALUE sock)
 	rb_raise(rb_eSecurityError, "Insecure: can't close socket");
     }
     GetOpenFile(sock, fptr);
-    shutdown(fptr->fd, 2);
+    shutdown(fileno(fptr->f), 2);
+    shutdown(fileno(fptr->f2), 2);
     return rb_io_close(sock);
 }
 #endif
@@ -1411,15 +1366,16 @@ socks_s_close(VALUE sock)
 struct hostent_arg {
     VALUE host;
     struct addrinfo* addr;
-    VALUE (*ipaddr)(struct sockaddr*, size_t);
+    VALUE (*ipaddr)_((struct sockaddr*, size_t));
 };
 
 static VALUE
-make_hostent_internal(struct hostent_arg *arg)
+make_hostent_internal(arg)
+    struct hostent_arg *arg;
 {
     VALUE host = arg->host;
     struct addrinfo* addr = arg->addr;
-    VALUE (*ipaddr)(struct sockaddr*, size_t) = arg->ipaddr;
+    VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
 
     struct addrinfo *ai;
     struct hostent *h;
@@ -1451,14 +1407,23 @@ make_hostent_internal(struct hostent_arg *arg)
     rb_ary_push(ary, names);
     rb_ary_push(ary, INT2NUM(addr->ai_family));
     for (ai = addr; ai; ai = ai->ai_next) {
-	rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
+      /* 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));
+       }
     }
 
     return ary;
 }
 
 static VALUE
-make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr *, size_t))
+make_hostent(host, addr, ipaddr)
+    VALUE host;
+    struct addrinfo* addr;
+    VALUE (*ipaddr)_((struct sockaddr*, size_t));
 {
     struct hostent_arg arg;
 
@@ -1469,22 +1434,27 @@ make_hostent(VALUE host, struct addrinfo *addr, VALUE (*ipaddr)(struct sockaddr
 		     RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
 }
 
-static VALUE
-tcp_sockaddr(struct sockaddr *addr, size_t len)
+VALUE
+tcp_sockaddr(addr, len)
+    struct sockaddr *addr;
+    size_t len;
 {
     return make_ipaddr(addr);
 }
 
 static VALUE
-tcp_s_gethostbyname(VALUE obj, VALUE host)
+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 make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
 }
 
 static VALUE
-tcp_svr_init(int argc, VALUE *argv, VALUE sock)
+tcp_svr_init(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     VALUE arg1, arg2;
 
@@ -1519,7 +1489,7 @@ s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen
 
     rb_secure(3);
     rb_io_set_nonblock(fptr);
-    fd2 = accept(fptr->fd, (struct sockaddr*)sockaddr, len);
+    fd2 = accept(fileno(fptr->f), (struct sockaddr*)sockaddr, len);
     if (fd2 < 0) {
         rb_sys_fail("accept(2)");
     }
@@ -1527,33 +1497,26 @@ s_accept_nonblock(VALUE klass, rb_io_t *fptr, struct sockaddr *sockaddr, socklen
     return init_sock(rb_obj_alloc(klass), fd2);
 }
 
-struct accept_arg {
+static VALUE
+s_accept(klass, fd, sockaddr, len)
+    VALUE klass;
     int fd;
     struct sockaddr *sockaddr;
     socklen_t *len;
-};
-
-static VALUE
-accept_blocking(void *data)
-{
-    struct accept_arg *arg = data;
-    return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
-}
-
-static VALUE
-s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 {
     int fd2;
     int retry = 0;
-    struct accept_arg arg;
 
     rb_secure(3);
-    arg.fd = fd;
-    arg.sockaddr = sockaddr;
-    arg.len = len;
   retry:
     rb_thread_wait_fd(fd);
-    fd2 = BLOCKING_REGION(accept_blocking, &arg);
+#if defined(_nec_ews)
+    fd2 = accept(fd, sockaddr, len);
+#else
+    TRAP_BEG;
+    fd2 = accept(fd, sockaddr, len);
+    TRAP_END;
+#endif
     if (fd2 < 0) {
 	switch (errno) {
 	  case EMFILE:
@@ -1562,6 +1525,8 @@ s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 	    rb_gc();
 	    retry = 1;
 	    goto retry;
+	  case EWOULDBLOCK:
+	    break;
 	  default:
 	    if (!rb_io_wait_readable(fd)) break;
 	    retry = 0;
@@ -1574,15 +1539,16 @@ s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 }
 
 static VALUE
-tcp_accept(VALUE sock)
+tcp_accept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_storage from;
     socklen_t fromlen;
- 
+
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
-    return s_accept(rb_cTCPSocket, fptr->fd,
+    return s_accept(rb_cTCPSocket, fileno(fptr->f),
 		    (struct sockaddr*)&from, &fromlen);
 }
 
@@ -1609,14 +1575,15 @@ tcp_accept(VALUE sock)
  * to TCPServer#accept_nonblock fails. 
  *
  * TCPServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  * 
  * === See
  * * TCPServer#accept
  * * Socket#accept
  */
 static VALUE
-tcp_accept_nonblock(VALUE sock)
+tcp_accept_nonblock(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_storage from;
@@ -1625,11 +1592,12 @@ tcp_accept_nonblock(VALUE sock)
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
     return s_accept_nonblock(rb_cTCPSocket, fptr,
-			     (struct sockaddr *)&from, &fromlen);
+                             (struct sockaddr *)&from, &fromlen);
 }
 
 static VALUE
-tcp_sysaccept(VALUE sock)
+tcp_sysaccept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_storage from;
@@ -1637,7 +1605,7 @@ tcp_sysaccept(VALUE sock)
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
-    return s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
+    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
 }
 
 #ifdef HAVE_SYS_UN_H
@@ -1647,14 +1615,18 @@ struct unixsock_arg {
 };
 
 static VALUE
-unixsock_connect_internal(struct unixsock_arg *arg)
+unixsock_connect_internal(arg)
+    struct unixsock_arg *arg;
 {
-    return (VALUE)ruby_connect(arg->fd, (struct sockaddr*)arg->sockaddr,
-			       sizeof(*arg->sockaddr), 0);
+    return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr),
+			       0);
 }
 
 static VALUE
-init_unixsock(VALUE sock, VALUE path, int server)
+init_unixsock(sock, path, server)
+    VALUE sock;
+    VALUE path;
+    int server;
 {
     struct sockaddr_un sockaddr;
     int fd, status;
@@ -1668,11 +1640,11 @@ init_unixsock(VALUE sock, VALUE path, int server)
 
     MEMZERO(&sockaddr, struct sockaddr_un, 1);
     sockaddr.sun_family = AF_UNIX;
-    if (sizeof(sockaddr.sun_path) <= RSTRING_LEN(path)) {
+    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);
     }
-    memcpy(sockaddr.sun_path, RSTRING_PTR(path), RSTRING_LEN(path));
+    strcpy(sockaddr.sun_path, StringValueCStr(path));
 
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
@@ -1682,8 +1654,7 @@ init_unixsock(VALUE sock, VALUE path, int server)
 	struct unixsock_arg arg;
 	arg.sockaddr = &sockaddr;
 	arg.fd = fd;
-        status = rb_protect((VALUE(*)(VALUE))unixsock_connect_internal,
-			    (VALUE)&arg, &prot);
+        status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
 	if (prot) {
 	    close(fd);
 	    rb_jump_tag(prot);
@@ -1698,9 +1669,9 @@ init_unixsock(VALUE sock, VALUE path, int server)
     if (server) listen(fd, 5);
 
     init_sock(sock, fd);
+    GetOpenFile(sock, fptr);
     if (server) {
-	GetOpenFile(sock, fptr);
-        fptr->path = strdup(RSTRING_PTR(path));
+        fptr->path = strdup(RSTRING(path)->ptr);
     }
 
     return sock;
@@ -1708,7 +1679,8 @@ init_unixsock(VALUE sock, VALUE path, int server)
 #endif
 
 static VALUE
-ip_addr(VALUE sock)
+ip_addr(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_storage addr;
@@ -1716,13 +1688,14 @@ ip_addr(VALUE sock)
 
     GetOpenFile(sock, fptr);
 
-    if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
-    return ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
+    return ipaddr((struct sockaddr*)&addr);
 }
 
 static VALUE
-ip_peeraddr(VALUE sock)
+ip_peeraddr(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_storage addr;
@@ -1730,19 +1703,23 @@ ip_peeraddr(VALUE sock)
 
     GetOpenFile(sock, fptr);
 
-    if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
-    return ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
+    return ipaddr((struct sockaddr*)&addr);
 }
 
 static VALUE
-ip_recvfrom(int argc, VALUE *argv, VALUE sock)
+ip_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     return s_recvfrom(sock, argc, argv, RECV_IP);
 }
 
 static VALUE
-ip_s_getaddress(VALUE obj, VALUE host)
+ip_s_getaddress(obj, host)
+    VALUE obj, host;
 {
     struct sockaddr_storage addr;
     struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
@@ -1755,7 +1732,10 @@ ip_s_getaddress(VALUE obj, VALUE host)
 }
 
 static VALUE
-udp_init(int argc, VALUE *argv, VALUE sock)
+udp_init(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     VALUE arg;
     int socktype = AF_INET;
@@ -1780,7 +1760,8 @@ struct udp_arg
 };
 
 static VALUE
-udp_connect_internal(struct udp_arg *arg)
+udp_connect_internal(arg)
+    struct udp_arg *arg;
 {
     int fd = arg->fd;
     struct addrinfo *res;
@@ -1794,7 +1775,8 @@ udp_connect_internal(struct udp_arg *arg)
 }
 
 static VALUE
-udp_connect(VALUE sock, VALUE host, VALUE port)
+udp_connect(sock, host, port)
+    VALUE sock, host, port;
 {
     rb_io_t *fptr;
     struct udp_arg arg;
@@ -1803,7 +1785,7 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
     rb_secure(3);
     arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
-    arg.fd = fptr->fd;
+    arg.fd = fileno(fptr->f);
     ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
 		    RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
     if (!ret) rb_sys_fail("connect(2)");
@@ -1811,7 +1793,8 @@ udp_connect(VALUE sock, VALUE host, VALUE port)
 }
 
 static VALUE
-udp_bind(VALUE sock, VALUE host, VALUE port)
+udp_bind(sock, host, port)
+    VALUE sock, host, port;
 {
     rb_io_t *fptr;
     struct addrinfo *res0, *res;
@@ -1820,7 +1803,7 @@ udp_bind(VALUE sock, VALUE host, VALUE port)
     res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
     for (res = res0; res; res = res->ai_next) {
-	if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
+	if (bind(fileno(fptr->f), res->ai_addr, res->ai_addrlen) < 0) {
 	    continue;
 	}
 	freeaddrinfo(res0);
@@ -1832,36 +1815,36 @@ udp_bind(VALUE sock, VALUE host, VALUE port)
 }
 
 static VALUE
-udp_send(int argc, VALUE *argv, VALUE sock)
+udp_send(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
-    VALUE flags, host, port;
+    VALUE mesg, flags, host, port;
     rb_io_t *fptr;
+    FILE *f;
     int n;
     struct addrinfo *res0, *res;
-    struct send_arg arg;
 
     if (argc == 2 || argc == 3) {
 	return bsock_send(argc, argv, sock);
     }
     rb_secure(4);
-    rb_scan_args(argc, argv, "4", &arg.mesg, &flags, &host, &port);
+    rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
 
-    StringValue(arg.mesg);
+    StringValue(mesg);
     res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
     GetOpenFile(sock, fptr);
-    arg.fd = fptr->fd;
-    arg.flags = NUM2INT(flags);
+    f = GetWriteFile(fptr);
     for (res = res0; res; res = res->ai_next) {
       retry:
-	arg.to = res->ai_addr;
-	arg.tolen = res->ai_addrlen;
-	rb_thread_fd_writable(arg.fd);
-	n = (int)BLOCKING_REGION(sendto_blocking, &arg);
+	n = sendto(fileno(f), RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
+		   res->ai_addr, res->ai_addrlen);
 	if (n >= 0) {
 	    freeaddrinfo(res0);
 	    return INT2FIX(n);
 	}
-	if (rb_io_wait_writable(fptr->fd)) {
+	if (rb_io_wait_writable(fileno(f))) {
 	    goto retry;
 	}
     }
@@ -1905,7 +1888,7 @@ udp_send(int argc, VALUE *argv, VALUE sock)
  * to _recvfrom_nonblock_ fails. 
  *
  * UDPSocket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  *
  * === See
  * * Socket#recvfrom
@@ -1918,12 +1901,13 @@ udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
 
 #ifdef HAVE_SYS_UN_H
 static VALUE
-unix_init(VALUE sock, VALUE path)
+unix_init(sock, path)
+    VALUE sock, path;
 {
     return init_unixsock(sock, path, 0);
 }
 
-static const char*
+static char *
 unixpath(struct sockaddr_un *sockaddr, socklen_t len)
 {
     if (sockaddr->sun_path < (char*)sockaddr + len)
@@ -1933,7 +1917,8 @@ unixpath(struct sockaddr_un *sockaddr, socklen_t len)
 }
 
 static VALUE
-unix_path(VALUE sock)
+unix_path(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
 
@@ -1941,7 +1926,7 @@ unix_path(VALUE sock)
     if (fptr->path == 0) {
 	struct sockaddr_un addr;
 	socklen_t len = sizeof(addr);
-	if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	    rb_sys_fail(0);
 	fptr->path = strdup(unixpath(&addr, len));
     }
@@ -1949,13 +1934,17 @@ unix_path(VALUE sock)
 }
 
 static VALUE
-unix_svr_init(VALUE sock, VALUE path)
+unix_svr_init(sock, path)
+    VALUE sock, path;
 {
     return init_unixsock(sock, path, 1);
 }
 
 static VALUE
-unix_recvfrom(int argc, VALUE *argv, VALUE sock)
+unix_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     return s_recvfrom(sock, argc, argv, RECV_UNIX);
 }
@@ -1972,25 +1961,14 @@ unix_recvfrom(int argc, VALUE *argv, VALUE sock)
 #define FD_PASSING_BY_MSG_ACCRIGHTS 0
 #endif
 
-struct iomsg_arg {
-    int fd;
-    struct msghdr msg;
-};
-
 static VALUE
-sendmsg_blocking(void *data)
-{
-    struct iomsg_arg *arg = data;
-    return sendmsg(arg->fd, &arg->msg, 0);
-}
-
-static VALUE
-unix_send_io(VALUE sock, VALUE val)
+unix_send_io(sock, val)
+    VALUE sock, val;
 {
 #if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
     int fd;
     rb_io_t *fptr;
-    struct iomsg_arg arg;
+    struct msghdr msg;
     struct iovec vec[1];
     char buf[1];
 
@@ -2004,7 +1982,7 @@ unix_send_io(VALUE sock, VALUE val)
     if (rb_obj_is_kind_of(val, rb_cIO)) {
         rb_io_t *valfptr;
 	GetOpenFile(val, valfptr);
-	fd = valfptr->fd;
+	fd = fileno(valfptr->f);
     }
     else if (FIXNUM_P(val)) {
         fd = FIX2INT(val);
@@ -2015,33 +1993,31 @@ unix_send_io(VALUE sock, VALUE val)
 
     GetOpenFile(sock, fptr);
 
-    arg.msg.msg_name = NULL;
-    arg.msg.msg_namelen = 0;
+    msg.msg_name = NULL;
+    msg.msg_namelen = 0;
 
     /* Linux and Solaris doesn't work if msg_iov is NULL. */
     buf[0] = '\0';
     vec[0].iov_base = buf;
     vec[0].iov_len = 1;
-    arg.msg.msg_iov = vec;
-    arg.msg.msg_iovlen = 1;
+    msg.msg_iov = vec;
+    msg.msg_iovlen = 1;
 
 #if FD_PASSING_BY_MSG_CONTROL
-    arg.msg.msg_control = (caddr_t)&cmsg;
-    arg.msg.msg_controllen = CMSG_LEN(sizeof(int));
-    arg.msg.msg_flags = 0;
+    msg.msg_control = (caddr_t)&cmsg;
+    msg.msg_controllen = CMSG_LEN(sizeof(int));
+    msg.msg_flags = 0;
     MEMZERO((char*)&cmsg, char, sizeof(cmsg));
     cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     *(int *)CMSG_DATA(&cmsg.hdr) = fd;
 #else
-    arg.msg.msg_accrights = (caddr_t)&fd;
-    arg.msg.msg_accrightslen = sizeof(fd);
+    msg.msg_accrights = (caddr_t)&fd;
+    msg.msg_accrightslen = sizeof(fd);
 #endif
 
-    arg.fd = fptr->fd;
-    rb_thread_fd_writable(arg.fd);
-    if ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1)
+    if (sendmsg(fileno(fptr->f), &msg, 0) == -1)
 	rb_sys_fail("sendmsg(2)");
 
     return Qnil;
@@ -2051,20 +2027,29 @@ unix_send_io(VALUE sock, VALUE val)
 #endif
 }
 
-static VALUE
-recvmsg_blocking(void *data)
+#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
+static void
+thread_read_select(fd)
+    int fd;
 {
-    struct iomsg_arg *arg = data;
-    return recvmsg(arg->fd, &arg->msg, 0);
+    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(int argc, VALUE *argv, VALUE sock)
+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)
     VALUE klass, mode;
     rb_io_t *fptr;
-    struct iomsg_arg arg;
+    struct msghdr msg;
     struct iovec vec[2];
     char buf[1];
 
@@ -2084,59 +2069,59 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 
     GetOpenFile(sock, fptr);
 
-    arg.msg.msg_name = NULL;
-    arg.msg.msg_namelen = 0;
+    thread_read_select(fileno(fptr->f));
+
+    msg.msg_name = NULL;
+    msg.msg_namelen = 0;
 
     vec[0].iov_base = buf;
     vec[0].iov_len = sizeof(buf);
-    arg.msg.msg_iov = vec;
-    arg.msg.msg_iovlen = 1;
+    msg.msg_iov = vec;
+    msg.msg_iovlen = 1;
 
 #if FD_PASSING_BY_MSG_CONTROL
-    arg.msg.msg_control = (caddr_t)&cmsg;
-    arg.msg.msg_controllen = CMSG_SPACE(sizeof(int));
-    arg.msg.msg_flags = 0;
+    msg.msg_control = (caddr_t)&cmsg;
+    msg.msg_controllen = CMSG_SPACE(sizeof(int));
+    msg.msg_flags = 0;
     cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
     cmsg.hdr.cmsg_level = SOL_SOCKET;
     cmsg.hdr.cmsg_type = SCM_RIGHTS;
     *(int *)CMSG_DATA(&cmsg.hdr) = -1;
 #else
-    arg.msg.msg_accrights = (caddr_t)&fd;
-    arg.msg.msg_accrightslen = sizeof(fd);
+    msg.msg_accrights = (caddr_t)&fd;
+    msg.msg_accrightslen = sizeof(fd);
     fd = -1;
 #endif
 
-    arg.fd = fptr->fd;
-    rb_thread_wait_fd(arg.fd);
-    if ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1)
+    if (recvmsg(fileno(fptr->f), &msg, 0) == -1)
 	rb_sys_fail("recvmsg(2)");
 
 #if FD_PASSING_BY_MSG_CONTROL
-    if (arg.msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
-	rb_raise(rb_eSocket,
-		 "file descriptor was not passed (msg_controllen=%d, %d expected)",
-		 (int)arg.msg.msg_controllen, (int)CMSG_SPACE(sizeof(int)));
+    if (msg.msg_controllen != CMSG_SPACE(sizeof(int))) {
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (msg_controllen=%d, %d expected)",
+          msg.msg_controllen, CMSG_SPACE(sizeof(int)));
     }
     if (cmsg.hdr.cmsg_len != CMSG_LEN(sizeof(int))) {
-	rb_raise(rb_eSocket,
-		 "file descriptor was not passed (cmsg_len=%d, %d expected)",
-		 (int)cmsg.hdr.cmsg_len, (int)CMSG_LEN(sizeof(int)));
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_len=%d, %d expected)",
+          cmsg.hdr.cmsg_len, CMSG_LEN(sizeof(int)));
     }
     if (cmsg.hdr.cmsg_level != SOL_SOCKET) {
-	rb_raise(rb_eSocket,
-		 "file descriptor was not passed (cmsg_level=%d, %d expected)",
-		 cmsg.hdr.cmsg_level, SOL_SOCKET);
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_level=%d, %d expected)",
+          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 expected)",
-		 cmsg.hdr.cmsg_type, SCM_RIGHTS);
+      rb_raise(rb_eSocket,
+          "file descriptor was not passed (cmsg_type=%d, %d expected)",
+          cmsg.hdr.cmsg_type, SCM_RIGHTS);
     }
 #else
-    if (arg.msg.msg_accrightslen != sizeof(fd)) {
+    if (msg.msg_accrightslen != sizeof(fd)) {
 	rb_raise(rb_eSocket,
-		 "file descriptor was not passed (accrightslen) : %d != %d",
-		 arg.msg.msg_accrightslen, (int)sizeof(fd));
+            "file descriptor was not passed (accrightslen) : %d != %d",
+            msg.msg_accrightslen, sizeof(fd));
     }
 #endif
 
@@ -2164,7 +2149,8 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 }
 
 static VALUE
-unix_accept(VALUE sock)
+unix_accept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_un from;
@@ -2172,7 +2158,7 @@ unix_accept(VALUE sock)
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(struct sockaddr_un);
-    return s_accept(rb_cUNIXSocket, fptr->fd,
+    return s_accept(rb_cUNIXSocket, fileno(fptr->f),
 		    (struct sockaddr*)&from, &fromlen);
 }
 
@@ -2199,14 +2185,15 @@ unix_accept(VALUE sock)
  * to UNIXServer#accept_nonblock fails. 
  *
  * UNIXServer#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  * 
  * === See
  * * UNIXServer#accept
  * * Socket#accept
  */
 static VALUE
-unix_accept_nonblock(VALUE sock)
+unix_accept_nonblock(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_un from;
@@ -2215,11 +2202,12 @@ unix_accept_nonblock(VALUE sock)
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
     return s_accept_nonblock(rb_cUNIXSocket, fptr,
-			     (struct sockaddr *)&from, &fromlen);
+                             (struct sockaddr *)&from, &fromlen);
 }
 
 static VALUE
-unix_sysaccept(VALUE sock)
+unix_sysaccept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_un from;
@@ -2227,20 +2215,21 @@ unix_sysaccept(VALUE sock)
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(struct sockaddr_un);
-    return s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
+    return s_accept(0, fileno(fptr->f), (struct sockaddr*)&from, &fromlen);
 }
 
-#ifdef HAVE_SYS_UN_H
 static VALUE
-unixaddr(struct sockaddr_un *sockaddr, socklen_t len)
+unixaddr(sockaddr, len)
+    struct sockaddr_un *sockaddr;
+    socklen_t len;
 {
     return rb_assoc_new(rb_str_new2("AF_UNIX"),
                         rb_str_new2(unixpath(sockaddr, len)));
 }
-#endif
 
 static VALUE
-unix_addr(VALUE sock)
+unix_addr(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_un addr;
@@ -2248,13 +2237,14 @@ unix_addr(VALUE sock)
 
     GetOpenFile(sock, fptr);
 
-    if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getsockname(2)");
     return unixaddr(&addr, len);
 }
 
 static VALUE
-unix_peeraddr(VALUE sock)
+unix_peeraddr(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     struct sockaddr_un addr;
@@ -2262,14 +2252,16 @@ unix_peeraddr(VALUE sock)
 
     GetOpenFile(sock, fptr);
 
-    if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
+    if (getpeername(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	rb_sys_fail("getpeername(2)");
     return unixaddr(&addr, len);
 }
 #endif
 
 static void
-setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
+setup_domain_and_type(domain, dv, type, tv)
+    VALUE domain, type;
+    int *dv, *tv;
 {
     VALUE tmp;
     char *ptr;
@@ -2278,7 +2270,7 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
     if (!NIL_P(tmp)) {
 	domain = tmp;
 	rb_check_safe_obj(domain);
-	ptr = RSTRING_PTR(domain);
+	ptr = RSTRING(domain)->ptr;
 	if (strcmp(ptr, "AF_INET") == 0)
 	    *dv = AF_INET;
 #ifdef AF_UNIX
@@ -2329,7 +2321,7 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
     if (!NIL_P(tmp)) {
 	type = tmp;
 	rb_check_safe_obj(type);
-	ptr = RSTRING_PTR(type);
+	ptr = RSTRING(type)->ptr;
 	if (strcmp(ptr, "SOCK_STREAM") == 0)
 	    *tv = SOCK_STREAM;
 	else if (strcmp(ptr, "SOCK_DGRAM") == 0)
@@ -2359,7 +2351,8 @@ setup_domain_and_type(VALUE domain, int *dv, VALUE type, int *tv)
 }
 
 static VALUE
-sock_initialize(VALUE sock, VALUE domain, VALUE type, VALUE protocol)
+sock_initialize(sock, domain, type, protocol)
+    VALUE sock, domain, type, protocol;
 {
     int fd;
     int d, t;
@@ -2373,7 +2366,8 @@ sock_initialize(VALUE sock, VALUE domain, VALUE type, VALUE protocol)
 }
 
 static VALUE
-sock_s_socketpair(VALUE klass, VALUE domain, VALUE type, VALUE protocol)
+sock_s_socketpair(klass, domain, type, protocol)
+    VALUE klass, domain, type, protocol;
 {
 #if defined HAVE_SOCKETPAIR
     int d, t, p, sp[2];
@@ -2399,7 +2393,10 @@ sock_s_socketpair(VALUE klass, VALUE domain, VALUE type, VALUE protocol)
 
 #ifdef HAVE_SYS_UN_H
 static VALUE
-unix_s_socketpair(int argc, VALUE *argv, VALUE klass)
+unix_s_socketpair(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE domain, type, protocol;
     domain = INT2FIX(PF_UNIX);
@@ -2526,21 +2523,21 @@ unix_s_socketpair(int argc, VALUE *argv, VALUE klass)
  * * connect function in Microsoft's Winsock functions reference
  */
 static VALUE
-sock_connect(VALUE sock, VALUE addr)
+sock_connect(sock, addr)
+    VALUE sock, addr;
 {
     rb_io_t *fptr;
-    int fd, n;
+    int fd;
 
     StringValue(addr);
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
-    fd = fptr->fd;
-    n = ruby_connect(fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr), 0);
-    if (n < 0) {
+    fd = fileno(fptr->f);
+    if (ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0) < 0) {
 	rb_sys_fail("connect(2)");
     }
 
-    return INT2FIX(n);
+    return INT2FIX(0);
 }
 
 /*
@@ -2582,7 +2579,8 @@ sock_connect(VALUE sock, VALUE addr)
  * * Socket#connect
  */
 static VALUE
-sock_connect_nonblock(VALUE sock, VALUE addr)
+sock_connect_nonblock(sock, addr)
+    VALUE sock, addr;
 {
     rb_io_t *fptr;
     int n;
@@ -2591,7 +2589,7 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
     addr = rb_str_new4(addr);
     GetOpenFile(sock, fptr);
     rb_io_set_nonblock(fptr);
-    n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr));
+    n = connect(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len);
     if (n < 0) {
 	rb_sys_fail("connect(2)");
     }
@@ -2679,13 +2677,14 @@ sock_connect_nonblock(VALUE sock, VALUE addr)
  * * bind function in Microsoft's Winsock functions reference
  */ 
 static VALUE
-sock_bind(VALUE sock, VALUE addr)
+sock_bind(sock, addr)
+    VALUE sock, addr;
 {
     rb_io_t *fptr;
 
     StringValue(addr);
     GetOpenFile(sock, fptr);
-    if (bind(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_LEN(addr)) < 0)
+    if (bind(fileno(fptr->f), (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
 	rb_sys_fail("bind(2)");
 
     return INT2FIX(0);
@@ -2762,7 +2761,8 @@ sock_bind(VALUE sock, VALUE addr)
  * * listen function in Microsoft's Winsock functions reference
  */
 static VALUE
-sock_listen(VALUE sock, VALUE log)
+sock_listen(sock, log)
+    VALUE sock, log;
 {
     rb_io_t *fptr;
     int backlog;
@@ -2770,7 +2770,7 @@ sock_listen(VALUE sock, VALUE log)
     rb_secure(4);
     backlog = NUM2INT(log);
     GetOpenFile(sock, fptr);
-    if (listen(fptr->fd, backlog) < 0)
+    if (listen(fileno(fptr->f), backlog) < 0)
 	rb_sys_fail("listen(2)");
 
     return INT2FIX(0);
@@ -2882,7 +2882,10 @@ sock_listen(VALUE sock, VALUE log)
  *   message.
  */
 static VALUE
-sock_recvfrom(int argc, VALUE *argv, VALUE sock)
+sock_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
 {
     return s_recvfrom(sock, argc, argv, RECV_SOCKET);
 }
@@ -2940,7 +2943,7 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
  * to _recvfrom_nonblock_ fails. 
  *
  * Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  *
  * === See
  * * Socket#recvfrom
@@ -2951,8 +2954,91 @@ 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, '#{client.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(VALUE sock)
+sock_accept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     VALUE sock2;
@@ -2960,14 +3046,14 @@ sock_accept(VALUE sock)
     socklen_t len = sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)buf,&len);
+    sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
 
     return rb_assoc_new(sock2, rb_str_new(buf, len));
 }
 
 /*
  * call-seq:
- * 	socket.accept_nonblock => [client_socket, client_sockaddr]
+ *    socket.accept_nonblock => [client_socket, client_sockaddr]
  * 
  * Accepts an incoming connection using accept(2) after
  * O_NONBLOCK is set for the underlying file descriptor.
@@ -2993,7 +3079,7 @@ sock_accept(VALUE sock)
  * 	puts "The client said, '#{client_socket.readline.chomp}'"
  * 	client_socket.puts "Hello from script one!"
  * 	socket.close
- * 
+ *
  * 	# In another script, start this second
  * 	require 'socket'
  * 	include Socket::Constants
@@ -3008,13 +3094,14 @@ sock_accept(VALUE sock)
  * to _accept_nonblock_ fails. 
  *
  * Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
- * including Errno::EWOULDBLOCK.
+ * including Errno::EAGAIN.
  * 
  * === See
  * * Socket#accept
  */
 static VALUE
-sock_accept_nonblock(VALUE sock)
+sock_accept_nonblock(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     VALUE sock2;
@@ -3066,7 +3153,8 @@ sock_accept_nonblock(VALUE sock)
  * * Socket#accept
  */
 static VALUE
-sock_sysaccept(VALUE sock)
+sock_sysaccept(sock)
+    VALUE sock;
 {
     rb_io_t *fptr;
     VALUE sock2;
@@ -3074,14 +3162,15 @@ sock_sysaccept(VALUE sock)
     socklen_t len = sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = s_accept(0,fptr->fd,(struct sockaddr*)buf,&len);
+    sock2 = s_accept(0,fileno(fptr->f),(struct sockaddr*)buf,&len);
 
     return rb_assoc_new(sock2, rb_str_new(buf, len));
 }
 
 #ifdef HAVE_GETHOSTNAME
 static VALUE
-sock_gethostname(VALUE obj)
+sock_gethostname(obj)
+    VALUE obj;
 {
     char buf[1024];
 
@@ -3098,7 +3187,8 @@ sock_gethostname(VALUE obj)
 #include <sys/utsname.h>
 
 static VALUE
-sock_gethostname(VALUE obj)
+sock_gethostname(obj)
+    VALUE obj;
 {
     struct utsname un;
 
@@ -3108,7 +3198,8 @@ sock_gethostname(VALUE obj)
 }
 #else
 static VALUE
-sock_gethostname(VALUE obj)
+sock_gethostname(obj)
+    VALUE obj;
 {
     rb_notimplement();
 }
@@ -3116,7 +3207,8 @@ sock_gethostname(VALUE obj)
 #endif
 
 static VALUE
-make_addrinfo(struct addrinfo *res0)
+make_addrinfo(res0)
+    struct addrinfo *res0;
 {
     VALUE base, ary;
     struct addrinfo *res;
@@ -3126,10 +3218,7 @@ make_addrinfo(struct addrinfo *res0)
     }
     base = rb_ary_new();
     for (res = res0; res; res = res->ai_next) {
-	ary = ipaddr(res->ai_addr, do_not_reverse_lookup);
-	if (res->ai_canonname) {
-	    RARRAY_PTR(ary)[2] = rb_str_new2(res->ai_canonname);
-	}
+	ary = ipaddr(res->ai_addr);
 	rb_ary_push(ary, INT2FIX(res->ai_family));
 	rb_ary_push(ary, INT2FIX(res->ai_socktype));
 	rb_ary_push(ary, INT2FIX(res->ai_protocol));
@@ -3138,8 +3227,11 @@ make_addrinfo(struct addrinfo *res0)
     return base;
 }
 
-static VALUE
-sock_sockaddr(struct sockaddr *addr, size_t len)
+/* Returns a String containing the binary value of a struct sockaddr. */
+VALUE
+sock_sockaddr(addr, len)
+    struct sockaddr *addr;
+    size_t len;
 {
     char *ptr;
 
@@ -3161,15 +3253,114 @@ sock_sockaddr(struct sockaddr *addr, size_t len)
     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(VALUE obj, VALUE host)
+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);
 }
 
 static VALUE
-sock_s_gethostbyaddr(int argc, VALUE *argv)
+sock_s_gethostbyaddr(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE addr, type;
     struct hostent *h;
@@ -3184,11 +3375,11 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
 	t = NUM2INT(type);
     }
 #ifdef INET6
-    else if (RSTRING_LEN(addr) == 16) {
+    else if (RSTRING(addr)->len == 16) {
 	t = AF_INET6;
     }
 #endif
-    h = gethostbyaddr(RSTRING_PTR(addr), RSTRING_LEN(addr), t);
+    h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
     if (h == NULL) {
 #ifdef HAVE_HSTRERROR
 	extern int h_errno;
@@ -3218,8 +3409,22 @@ sock_s_gethostbyaddr(int argc, VALUE *argv)
     return ary;
 }
 
+/*
+ * 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_getservbyname(int argc, VALUE *argv)
+sock_s_getservbyaname(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE service, proto;
     struct servent *sp;
@@ -3235,36 +3440,135 @@ sock_s_getservbyname(int argc, VALUE *argv)
 	port = ntohs(sp->s_port);
     }
     else {
-	char *s = RSTRING_PTR(service);
+	char *s = RSTRING(service)->ptr;
 	char *end;
 
-	port = STRTOUL(s, &end, 0);
+	port = strtoul(s, &end, 0);
 	if (*end != '\0') {
-	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING_PTR(proto));
+	    rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
 	}
     }
     return INT2FIX(port);
 }
 
-static VALUE
-sock_s_getservbyport(int argc, VALUE *argv)
-{
-    VALUE port, proto;
-    struct servent *sp;
+/*
+Documentation should explain the following:
 
-    rb_scan_args(argc, argv, "11", &port, &proto);
-    if (NIL_P(proto)) proto = rb_str_new2("tcp");
-    StringValue(proto);
+  $ 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]]
 
-    sp = getservbyport(NUM2INT(port),  StringValueCStr(proto));
-    if (!sp) {
-	rb_raise(rb_eSocket, "no such service for port %d/%s", NUM2INT(port), RSTRING_PTR(proto));
-    }
-    return rb_tainted_str_new2(sp->s_name);
-}
+  $ 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(int argc, VALUE *argv)
+sock_s_getaddrinfo(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE host, port, family, socktype, protocol, flags, ret;
     char hbuf[1024], pbuf[1024];
@@ -3324,7 +3628,7 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
     }
     error = getaddrinfo(hptr, pptr, &hints, &res);
     if (error) {
-	raise_socket_error("getaddrinfo", error);
+	rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
     }
 
     ret = make_addrinfo(res);
@@ -3333,7 +3637,9 @@ sock_s_getaddrinfo(int argc, VALUE *argv)
 }
 
 static VALUE
-sock_s_getnameinfo(int argc, VALUE *argv)
+sock_s_getnameinfo(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
     char *hptr, *pptr;
@@ -3355,11 +3661,11 @@ sock_s_getnameinfo(int argc, VALUE *argv)
     tmp = rb_check_string_type(sa);
     if (!NIL_P(tmp)) {
 	sa = tmp;
-	if (sizeof(ss) < RSTRING_LEN(sa)) {
+	if (sizeof(ss) < RSTRING(sa)->len) {
 	    rb_raise(rb_eTypeError, "sockaddr length too big");
 	}
-	memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa));
-	if (RSTRING_LEN(sa) != SA_LEN((struct sockaddr*)&ss)) {
+	memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
+	if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
 	    rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
 	}
 	sap = (struct sockaddr*)&ss;
@@ -3369,17 +3675,17 @@ sock_s_getnameinfo(int argc, VALUE *argv)
     if (!NIL_P(tmp)) {
 	sa = tmp;
 	MEMZERO(&hints, struct addrinfo, 1);
-	if (RARRAY_LEN(sa) == 3) {
-	    af = RARRAY_PTR(sa)[0];
-	    port = RARRAY_PTR(sa)[1];
-	    host = RARRAY_PTR(sa)[2];
+	if (RARRAY(sa)->len == 3) {
+	    af = RARRAY(sa)->ptr[0];
+	    port = RARRAY(sa)->ptr[1];
+	    host = RARRAY(sa)->ptr[2];
 	}
-	else if (RARRAY_LEN(sa) >= 4) {
-	    af = RARRAY_PTR(sa)[0];
-	    port = RARRAY_PTR(sa)[1];
-	    host = RARRAY_PTR(sa)[3];
+	else if (RARRAY(sa)->len >= 4) {
+	    af = RARRAY(sa)->ptr[0];
+	    port = RARRAY(sa)->ptr[1];
+	    host = RARRAY(sa)->ptr[3];
 	    if (NIL_P(host)) {
-		host = RARRAY_PTR(sa)[2];
+		host = RARRAY(sa)->ptr[2];
 	    }
 	    else {
 		/*
@@ -3393,7 +3699,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	}
 	else {
 	    rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
-		     RARRAY_LEN(sa));
+		     RARRAY(sa)->len);
 	}
 	/* host */
 	if (NIL_P(host)) {
@@ -3467,15 +3773,16 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 
   error_exit_addr:
     if (res) freeaddrinfo(res);
-    raise_socket_error("getaddrinfo", error);
+    rb_raise(rb_eSocket, "getaddrinfo: %s", gai_strerror(error));
 
   error_exit_name:
     if (res) freeaddrinfo(res);
-    raise_socket_error("getnameinfo", error);
+    rb_raise(rb_eSocket, "getnameinfo: %s", gai_strerror(error));
 }
 
 static VALUE
-sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
+sock_s_pack_sockaddr_in(self, port, host)
+    VALUE self, port, host;
 {
     struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
     VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
@@ -3488,7 +3795,8 @@ sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
 }
 
 static VALUE
-sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
+sock_s_unpack_sockaddr_in(self, addr)
+    VALUE self, addr;
 {
     struct sockaddr_in * sockaddr;
     VALUE host;
@@ -3512,7 +3820,8 @@ sock_s_unpack_sockaddr_in(VALUE self, VALUE addr)
 
 #ifdef HAVE_SYS_UN_H
 static VALUE
-sock_s_pack_sockaddr_un(VALUE self, VALUE path)
+sock_s_pack_sockaddr_un(self, path)
+    VALUE self, path;
 {
     struct sockaddr_un sockaddr;
     char *sun_path;
@@ -3533,24 +3842,25 @@ sock_s_pack_sockaddr_un(VALUE self, VALUE path)
 }
 
 static VALUE
-sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
+sock_s_unpack_sockaddr_un(self, addr)
+    VALUE self, addr;
 {
     struct sockaddr_un * sockaddr;
-    const char *sun_path;
+    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_LEN(addr)) {
-	rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
-		 RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un));
+    if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
+        rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
+		 RSTRING(addr)->len, sizeof(struct sockaddr_un));
     }
-    sun_path = unixpath(sockaddr, RSTRING_LEN(addr));
-    if (sizeof(struct sockaddr_un) == RSTRING_LEN(addr) &&
+    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_PTR(addr) + RSTRING_LEN(addr)) {
+        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);
@@ -3562,7 +3872,9 @@ sock_s_unpack_sockaddr_un(VALUE self, VALUE addr)
 static VALUE mConst;
 
 static void
-sock_define_const(const char *name, int value)
+sock_define_const(name, value)
+    char *name;
+    int value;
 {
     rb_define_const(rb_cSocket, name, INT2FIX(value));
     rb_define_const(mConst, name, INT2FIX(value));
@@ -3573,7 +3885,7 @@ sock_define_const(const char *name, int value)
  * 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
+ * using +struct sockaddr+ structures packed into Ruby strings, which can be
  * a joy to manipulate.
  * 
  * === Exception Handling
@@ -3617,21 +3929,22 @@ Init_socket()
     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_define_method(rb_cBasicSocket, "do_not_reverse_lookup", bsock_do_not_reverse_lookup, 0);
-    rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup=", bsock_do_not_reverse_lookup_set, 1);
 
     rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
+    rb_define_global_const("IPsocket", rb_cIPSocket);
     rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
     rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
     rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
     rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
 
     rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
+    rb_define_global_const("TCPsocket", rb_cTCPSocket);
     rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
     rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
 
 #ifdef SOCKS
     rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
+    rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
     rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
 #ifdef SOCKS5
     rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
@@ -3639,6 +3952,7 @@ Init_socket()
 #endif
 
     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);
@@ -3646,6 +3960,7 @@ Init_socket()
     rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
 
     rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
+    rb_define_global_const("UDPsocket", rb_cUDPSocket);
     rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
     rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
     rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
@@ -3654,6 +3969,7 @@ Init_socket()
 
 #ifdef HAVE_SYS_UN_H
     rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
+    rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
     rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
     rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
     rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
@@ -3665,6 +3981,7 @@ Init_socket()
     rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
 
     rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
+    rb_define_global_const("UNIXserver", rb_cUNIXServer);
     rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
     rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
     rb_define_method(rb_cUNIXServer, "accept_nonblock", unix_accept_nonblock, 0);
@@ -3691,8 +4008,7 @@ Init_socket()
     rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
     rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
     rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
-    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyname, -1);
-    rb_define_singleton_method(rb_cSocket, "getservbyport", sock_s_getservbyport, -1);
+    rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyaname, -1);
     rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
     rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
     rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
@@ -3706,9 +4022,700 @@ Init_socket()
 
     /* constants */
     mConst = rb_define_module_under(rb_cSocket, "Constants");
-#include "constants.h"
-#ifdef INET6 /* IPv6 is not supported although AF_INET6 is defined on bcc32/mingw */
+    sock_define_const("SOCK_STREAM", SOCK_STREAM);
+    sock_define_const("SOCK_DGRAM", SOCK_DGRAM);
+#ifdef SOCK_RAW
+    sock_define_const("SOCK_RAW", SOCK_RAW);
+#endif
+#ifdef SOCK_RDM
+    sock_define_const("SOCK_RDM", SOCK_RDM);
+#endif
+#ifdef SOCK_SEQPACKET
+    sock_define_const("SOCK_SEQPACKET", SOCK_SEQPACKET);
+#endif
+#ifdef SOCK_PACKET
+    sock_define_const("SOCK_PACKET", SOCK_PACKET);
+#endif
+
+    sock_define_const("AF_INET", AF_INET);
+#ifdef PF_INET
+    sock_define_const("PF_INET", PF_INET);
+#endif
+#ifdef AF_UNIX
+    sock_define_const("AF_UNIX", AF_UNIX);
+    sock_define_const("PF_UNIX", PF_UNIX);
+#endif
+#ifdef AF_AX25
+    sock_define_const("AF_AX25", AF_AX25);
+    sock_define_const("PF_AX25", PF_AX25);
+#endif
+#ifdef AF_IPX
+    sock_define_const("AF_IPX", AF_IPX);
+    sock_define_const("PF_IPX", PF_IPX);
+#endif
+#ifdef AF_APPLETALK
+    sock_define_const("AF_APPLETALK", AF_APPLETALK);
+    sock_define_const("PF_APPLETALK", PF_APPLETALK);
+#endif
+#ifdef AF_UNSPEC
+    sock_define_const("AF_UNSPEC", AF_UNSPEC);
+    sock_define_const("PF_UNSPEC", PF_UNSPEC);
+#endif
+#ifdef INET6
     sock_define_const("AF_INET6", AF_INET6);
+#endif
+#ifdef 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
+    sock_define_const("MSG_PEEK", MSG_PEEK);
+#endif
+#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
+    sock_define_const("SOL_IP", SOL_IP);
+#endif
+#ifdef SOL_IPX
+    sock_define_const("SOL_IPX", SOL_IPX);
+#endif
+#ifdef SOL_AX25
+    sock_define_const("SOL_AX25", SOL_AX25);
+#endif
+#ifdef SOL_ATALK
+    sock_define_const("SOL_ATALK", SOL_ATALK);
+#endif
+#ifdef SOL_TCP
+    sock_define_const("SOL_TCP", SOL_TCP);
+#endif
+#ifdef SOL_UDP
+    sock_define_const("SOL_UDP", SOL_UDP);
+#endif
+
+#ifdef	IPPROTO_IP
+    sock_define_const("IPPROTO_IP", IPPROTO_IP);
+#else
+    sock_define_const("IPPROTO_IP", 0);
+#endif
+#ifdef	IPPROTO_ICMP
+    sock_define_const("IPPROTO_ICMP", IPPROTO_ICMP);
+#else
+    sock_define_const("IPPROTO_ICMP", 1);
+#endif
+#ifdef	IPPROTO_IGMP
+    sock_define_const("IPPROTO_IGMP", IPPROTO_IGMP);
+#endif
+#ifdef	IPPROTO_GGP
+    sock_define_const("IPPROTO_GGP", IPPROTO_GGP);
+#endif
+#ifdef	IPPROTO_TCP
+    sock_define_const("IPPROTO_TCP", IPPROTO_TCP);
+#else
+    sock_define_const("IPPROTO_TCP", 6);
+#endif
+#ifdef	IPPROTO_EGP
+    sock_define_const("IPPROTO_EGP", IPPROTO_EGP);
+#endif
+#ifdef	IPPROTO_PUP
+    sock_define_const("IPPROTO_PUP", IPPROTO_PUP);
+#endif
+#ifdef	IPPROTO_UDP
+    sock_define_const("IPPROTO_UDP", IPPROTO_UDP);
+#else
+    sock_define_const("IPPROTO_UDP", 17);
+#endif
+#ifdef	IPPROTO_IDP
+    sock_define_const("IPPROTO_IDP", IPPROTO_IDP);
+#endif
+#ifdef	IPPROTO_HELLO
+    sock_define_const("IPPROTO_HELLO", IPPROTO_HELLO);
+#endif
+#ifdef	IPPROTO_ND
+    sock_define_const("IPPROTO_ND", IPPROTO_ND);
+#endif
+#ifdef	IPPROTO_TP
+    sock_define_const("IPPROTO_TP", IPPROTO_TP);
+#endif
+#ifdef	IPPROTO_XTP
+    sock_define_const("IPPROTO_XTP", IPPROTO_XTP);
+#endif
+#ifdef	IPPROTO_EON
+    sock_define_const("IPPROTO_EON", IPPROTO_EON);
+#endif
+#ifdef	IPPROTO_BIP
+    sock_define_const("IPPROTO_BIP", IPPROTO_BIP);
+#endif
+/**/
+#ifdef	IPPROTO_RAW
+    sock_define_const("IPPROTO_RAW", IPPROTO_RAW);
+#else
+    sock_define_const("IPPROTO_RAW", 255);
+#endif
+#ifdef	IPPROTO_MAX
+    sock_define_const("IPPROTO_MAX", IPPROTO_MAX);
+#endif
+
+	/* Some port configuration */
+#ifdef	IPPORT_RESERVED
+    sock_define_const("IPPORT_RESERVED", IPPORT_RESERVED);
+#else
+    sock_define_const("IPPORT_RESERVED", 1024);
+#endif
+#ifdef	IPPORT_USERRESERVED
+    sock_define_const("IPPORT_USERRESERVED", IPPORT_USERRESERVED);
+#else
+    sock_define_const("IPPORT_USERRESERVED", 5000);
+#endif
+	/* Some reserved IP v.4 addresses */
+#ifdef	INADDR_ANY
+    sock_define_const("INADDR_ANY", INADDR_ANY);
+#else
+    sock_define_const("INADDR_ANY", 0x00000000);
+#endif
+#ifdef	INADDR_BROADCAST
+    sock_define_const("INADDR_BROADCAST", INADDR_BROADCAST);
+#else
+    sock_define_const("INADDR_BROADCAST", 0xffffffff);
+#endif
+#ifdef	INADDR_LOOPBACK
+    sock_define_const("INADDR_LOOPBACK", INADDR_LOOPBACK);
+#else
+    sock_define_const("INADDR_LOOPBACK", 0x7F000001);
+#endif
+#ifdef	INADDR_UNSPEC_GROUP
+    sock_define_const("INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
+#else
+    sock_define_const("INADDR_UNSPEC_GROUP", 0xe0000000);
+#endif
+#ifdef	INADDR_ALLHOSTS_GROUP
+    sock_define_const("INADDR_ALLHOSTS_GROUP", INADDR_ALLHOSTS_GROUP);
+#else
+    sock_define_const("INADDR_ALLHOSTS_GROUP", 0xe0000001);
+#endif
+#ifdef	INADDR_MAX_LOCAL_GROUP
+    sock_define_const("INADDR_MAX_LOCAL_GROUP", INADDR_MAX_LOCAL_GROUP);
+#else
+    sock_define_const("INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
+#endif
+#ifdef	INADDR_NONE
+    sock_define_const("INADDR_NONE", INADDR_NONE);
+#else
+    sock_define_const("INADDR_NONE", 0xffffffff);
+#endif
+	/* IP [gs]etsockopt options */
+#ifdef	IP_OPTIONS
+    sock_define_const("IP_OPTIONS", IP_OPTIONS);
+#endif
+#ifdef	IP_HDRINCL
+    sock_define_const("IP_HDRINCL", IP_HDRINCL);
+#endif
+#ifdef	IP_TOS
+    sock_define_const("IP_TOS", IP_TOS);
+#endif
+#ifdef	IP_TTL
+    sock_define_const("IP_TTL", IP_TTL);
+#endif
+#ifdef	IP_RECVOPTS
+    sock_define_const("IP_RECVOPTS", IP_RECVOPTS);
+#endif
+#ifdef	IP_RECVRETOPTS
+    sock_define_const("IP_RECVRETOPTS", IP_RECVRETOPTS);
+#endif
+#ifdef	IP_RECVDSTADDR
+    sock_define_const("IP_RECVDSTADDR", IP_RECVDSTADDR);
+#endif
+#ifdef	IP_RETOPTS
+    sock_define_const("IP_RETOPTS", IP_RETOPTS);
+#endif
+#ifdef	IP_MULTICAST_IF
+    sock_define_const("IP_MULTICAST_IF", IP_MULTICAST_IF);
+#endif
+#ifdef	IP_MULTICAST_TTL
+    sock_define_const("IP_MULTICAST_TTL", IP_MULTICAST_TTL);
+#endif
+#ifdef	IP_MULTICAST_LOOP
+    sock_define_const("IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
+#endif
+#ifdef	IP_ADD_MEMBERSHIP
+    sock_define_const("IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
+#endif
+#ifdef	IP_DROP_MEMBERSHIP
+    sock_define_const("IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
+#endif
+#ifdef	IP_DEFAULT_MULTICAST_TTL
+    sock_define_const("IP_DEFAULT_MULTICAST_TTL", IP_DEFAULT_MULTICAST_TTL);
+#endif
+#ifdef	IP_DEFAULT_MULTICAST_LOOP
+    sock_define_const("IP_DEFAULT_MULTICAST_LOOP", IP_DEFAULT_MULTICAST_LOOP);
+#endif
+#ifdef	IP_MAX_MEMBERSHIPS
+    sock_define_const("IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
+#endif
+#ifdef SO_DEBUG
+    sock_define_const("SO_DEBUG", SO_DEBUG);
+#endif
+    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
+#ifdef SO_ERROR
+    sock_define_const("SO_ERROR", SO_ERROR);
+#endif
+#ifdef SO_DONTROUTE
+    sock_define_const("SO_DONTROUTE", SO_DONTROUTE);
+#endif
+#ifdef SO_BROADCAST
+    sock_define_const("SO_BROADCAST", SO_BROADCAST);
+#endif
+#ifdef SO_SNDBUF
+    sock_define_const("SO_SNDBUF", SO_SNDBUF);
+#endif
+#ifdef SO_RCVBUF
+    sock_define_const("SO_RCVBUF", SO_RCVBUF);
+#endif
+#ifdef SO_KEEPALIVE
+    sock_define_const("SO_KEEPALIVE", SO_KEEPALIVE);
+#endif
+#ifdef SO_OOBINLINE
+    sock_define_const("SO_OOBINLINE", SO_OOBINLINE);
+#endif
+#ifdef SO_NO_CHECK
+    sock_define_const("SO_NO_CHECK", SO_NO_CHECK);
+#endif
+#ifdef SO_PRIORITY
+    sock_define_const("SO_PRIORITY", SO_PRIORITY);
+#endif
+#ifdef SO_LINGER
+    sock_define_const("SO_LINGER", SO_LINGER);
+#endif
+#ifdef SO_PASSCRED
+    sock_define_const("SO_PASSCRED", SO_PASSCRED);
+#endif
+#ifdef SO_PEERCRED
+    sock_define_const("SO_PEERCRED", SO_PEERCRED);
+#endif
+#ifdef SO_RCVLOWAT
+    sock_define_const("SO_RCVLOWAT", SO_RCVLOWAT);
+#endif
+#ifdef SO_SNDLOWAT
+    sock_define_const("SO_SNDLOWAT", SO_SNDLOWAT);
+#endif
+#ifdef SO_RCVTIMEO
+    sock_define_const("SO_RCVTIMEO", SO_RCVTIMEO);
+#endif
+#ifdef SO_SNDTIMEO
+    sock_define_const("SO_SNDTIMEO", SO_SNDTIMEO);
+#endif
+#ifdef SO_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);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_TRANSPORT
+    sock_define_const("SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
+#endif
+#ifdef SO_SECURITY_ENCRYPTION_NETWORK
+    sock_define_const("SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
+#endif
+
+#ifdef SO_BINDTODEVICE
+    sock_define_const("SO_BINDTODEVICE", SO_BINDTODEVICE);
+#endif
+#ifdef SO_ATTACH_FILTER
+    sock_define_const("SO_ATTACH_FILTER", SO_ATTACH_FILTER);
+#endif
+#ifdef SO_DETACH_FILTER
+    sock_define_const("SO_DETACH_FILTER", SO_DETACH_FILTER);
+#endif
+#ifdef SO_PEERNAME
+    sock_define_const("SO_PEERNAME", SO_PEERNAME);
+#endif
+#ifdef SO_TIMESTAMP
+    sock_define_const("SO_TIMESTAMP", SO_TIMESTAMP);
+#endif
+
+#ifdef SOPRI_INTERACTIVE
+    sock_define_const("SOPRI_INTERACTIVE", SOPRI_INTERACTIVE);
+#endif
+#ifdef SOPRI_NORMAL
+    sock_define_const("SOPRI_NORMAL", SOPRI_NORMAL);
+#endif
+#ifdef SOPRI_BACKGROUND
+    sock_define_const("SOPRI_BACKGROUND", SOPRI_BACKGROUND);
+#endif
+
+#ifdef IPX_TYPE
+    sock_define_const("IPX_TYPE", IPX_TYPE);
+#endif
+
+#ifdef TCP_NODELAY
+    sock_define_const("TCP_NODELAY", TCP_NODELAY);
+#endif
+#ifdef TCP_MAXSEG
+    sock_define_const("TCP_MAXSEG", TCP_MAXSEG);
+#endif
+
+#ifdef EAI_ADDRFAMILY
+    sock_define_const("EAI_ADDRFAMILY", EAI_ADDRFAMILY);
+#endif
+#ifdef EAI_AGAIN
+    sock_define_const("EAI_AGAIN", EAI_AGAIN);
+#endif
+#ifdef EAI_BADFLAGS
+    sock_define_const("EAI_BADFLAGS", EAI_BADFLAGS);
+#endif
+#ifdef EAI_FAIL
+    sock_define_const("EAI_FAIL", EAI_FAIL);
+#endif
+#ifdef EAI_FAMILY
+    sock_define_const("EAI_FAMILY", EAI_FAMILY);
+#endif
+#ifdef EAI_MEMORY
+    sock_define_const("EAI_MEMORY", EAI_MEMORY);
+#endif
+#ifdef EAI_NODATA
+    sock_define_const("EAI_NODATA", EAI_NODATA);
+#endif
+#ifdef EAI_NONAME
+    sock_define_const("EAI_NONAME", EAI_NONAME);
+#endif
+#ifdef EAI_SERVICE
+    sock_define_const("EAI_SERVICE", EAI_SERVICE);
+#endif
+#ifdef EAI_SOCKTYPE
+    sock_define_const("EAI_SOCKTYPE", EAI_SOCKTYPE);
+#endif
+#ifdef EAI_SYSTEM
+    sock_define_const("EAI_SYSTEM", EAI_SYSTEM);
+#endif
+#ifdef EAI_BADHINTS
+    sock_define_const("EAI_BADHINTS", EAI_BADHINTS);
+#endif
+#ifdef EAI_PROTOCOL
+    sock_define_const("EAI_PROTOCOL", EAI_PROTOCOL);
+#endif
+#ifdef EAI_MAX
+    sock_define_const("EAI_MAX", EAI_MAX);
+#endif
+#ifdef AI_PASSIVE
+    sock_define_const("AI_PASSIVE", AI_PASSIVE);
+#endif
+#ifdef AI_CANONNAME
+    sock_define_const("AI_CANONNAME", AI_CANONNAME);
+#endif
+#ifdef AI_NUMERICHOST
+    sock_define_const("AI_NUMERICHOST", AI_NUMERICHOST);
+#endif
+#ifdef AI_MASK
+    sock_define_const("AI_MASK", AI_MASK);
+#endif
+#ifdef AI_ALL
+    sock_define_const("AI_ALL", AI_ALL);
+#endif
+#ifdef AI_V4MAPPED_CFG
+    sock_define_const("AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
+#endif
+#ifdef AI_ADDRCONFIG
+    sock_define_const("AI_ADDRCONFIG", AI_ADDRCONFIG);
+#endif
+#ifdef AI_V4MAPPED
+    sock_define_const("AI_V4MAPPED", AI_V4MAPPED);
+#endif
+#ifdef AI_DEFAULT
+    sock_define_const("AI_DEFAULT", AI_DEFAULT);
+#endif
+#ifdef NI_MAXHOST
+    sock_define_const("NI_MAXHOST", NI_MAXHOST);
+#endif
+#ifdef NI_MAXSERV
+    sock_define_const("NI_MAXSERV", NI_MAXSERV);
+#endif
+#ifdef NI_NOFQDN
+    sock_define_const("NI_NOFQDN", NI_NOFQDN);
+#endif
+#ifdef NI_NUMERICHOST
+    sock_define_const("NI_NUMERICHOST", NI_NUMERICHOST);
+#endif
+#ifdef NI_NAMEREQD
+    sock_define_const("NI_NAMEREQD", NI_NAMEREQD);
+#endif
+#ifdef NI_NUMERICSERV
+    sock_define_const("NI_NUMERICSERV", NI_NUMERICSERV);
+#endif
+#ifdef NI_DGRAM
+    sock_define_const("NI_DGRAM", NI_DGRAM);
+#endif
+#ifdef SHUT_RD
+    sock_define_const("SHUT_RD", SHUT_RD);
+#else
+    sock_define_const("SHUT_RD", 0);
+#endif
+#ifdef SHUT_WR
+    sock_define_const("SHUT_WR", SHUT_WR);
+#else
+    sock_define_const("SHUT_WR", 1);
+#endif
+#ifdef SHUT_RDWR
+    sock_define_const("SHUT_RDWR", SHUT_RDWR);
+#else
+    sock_define_const("SHUT_RDWR", 2);
+#endif
 }
diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h
index 1bd7eb698b..e1cddf53f4 100644
--- a/ext/socket/sockport.h
+++ b/ext/socket/sockport.h
@@ -3,6 +3,7 @@
   sockport.h -
 
   $Author$
+  $Date$
   created at: Fri Apr 30 23:19:34 JST 1999
 
 ************************************************/
diff --git a/ext/stringio/.cvsignore b/ext/stringio/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/stringio/.cvsignore
+++ b/ext/stringio/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/stringio/README b/ext/stringio/README
index 10dd237de8..c4031f7e97 100644
--- a/ext/stringio/README
+++ b/ext/stringio/README
@@ -1,5 +1,6 @@
 -*- rd -*-
 $Author$
+$Date$
 
 =begin
 
diff --git a/ext/stringio/depend b/ext/stringio/depend
index 338ebde529..cc9eae3f55 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,3 +1,2 @@
-stringio.o: stringio.c $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
-  $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/io.h \
-  $(hdrdir)/ruby/encoding.h 
+stringio.o: stringio.c $(hdrdir)/ruby.h $(topdir)/config.h \
+  $(hdrdir)/defines.h $(hdrdir)/intern.h $(hdrdir)/rubyio.h
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index db243c4e7e..537fc19a4e 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -3,6 +3,7 @@
   stringio.c -
 
   $Author$
+  $Date$
   $RoughId: stringio.c,v 1.13 2002/03/14 03:24:18 nobu Exp $
   created at: Tue Feb 19 04:10:38 JST 2002
 
@@ -12,13 +13,16 @@
 **********************************************************************/
 
 #include "ruby.h"
-#include "ruby/io.h"
+#include "rubyio.h"
+#include "re.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
+
 struct StringIO {
     VALUE string;
     long pos;
@@ -27,9 +31,14 @@ struct StringIO {
     int count;
 };
 
+static struct StringIO* strio_alloc _((void));
 static void strio_mark _((struct StringIO *));
 static void strio_free _((struct StringIO *));
-static void strio_init(int, VALUE *, struct StringIO *);
+static struct StringIO* check_strio _((VALUE));
+static struct StringIO* get_strio _((VALUE));
+static struct StringIO* readable _((struct StringIO *));
+static struct StringIO* writable _((struct StringIO *));
+static void check_modifiable _((struct StringIO *));
 
 #define IS_STRIO(obj) (RDATA(obj)->dmark == (RUBY_DATA_FUNC)strio_mark)
 #define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
@@ -47,7 +56,8 @@ strio_alloc()
 }
 
 static void
-strio_mark(struct StringIO *ptr)
+strio_mark(ptr)
+    struct StringIO *ptr;
 {
     if (ptr) {
 	rb_gc_mark(ptr->string);
@@ -55,7 +65,8 @@ strio_mark(struct StringIO *ptr)
 }
 
 static void
-strio_free(struct StringIO *ptr)
+strio_free(ptr)
+    struct StringIO *ptr;
 {
     if (--ptr->count <= 0) {
 	xfree(ptr);
@@ -63,7 +74,8 @@ strio_free(struct StringIO *ptr)
 }
 
 static struct StringIO*
-check_strio(VALUE self)
+check_strio(self)
+    VALUE self;
 {
     Check_Type(self, T_DATA);
     if (!IS_STRIO(self)) {
@@ -74,7 +86,8 @@ check_strio(VALUE self)
 }
 
 static struct StringIO*
-get_strio(VALUE self)
+get_strio(self)
+    VALUE self;
 {
     struct StringIO *ptr = check_strio(self);
 
@@ -84,18 +97,6 @@ get_strio(VALUE self)
     return ptr;
 }
 
-static VALUE
-strio_substr(struct StringIO *ptr, int pos, int len)
-{
-    VALUE str = ptr->string;
-    rb_encoding *enc = rb_enc_get(str);
-    int rlen = RSTRING_LEN(str) - pos;
-
-    if (len > rlen) len = rlen;
-    if (len < 0) len = 0;
-    return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
-}
-
 #define StringIO(obj) get_strio(obj)
 
 #define CLOSED(ptr) (!((ptr)->flags & FMODE_READWRITE))
@@ -103,7 +104,8 @@ strio_substr(struct StringIO *ptr, int pos, int len)
 #define WRITABLE(ptr) ((ptr)->flags & FMODE_WRITABLE)
 
 static struct StringIO*
-readable(struct StringIO *ptr)
+readable(ptr)
+    struct StringIO *ptr;
 {
     if (!READABLE(ptr)) {
 	rb_raise(rb_eIOError, "not opened for reading");
@@ -112,7 +114,8 @@ readable(struct StringIO *ptr)
 }
 
 static struct StringIO*
-writable(struct StringIO *ptr)
+writable(ptr)
+    struct StringIO *ptr;
 {
     if (!WRITABLE(ptr)) {
 	rb_raise(rb_eIOError, "not opened for writing");
@@ -124,26 +127,97 @@ writable(struct StringIO *ptr)
 }
 
 static void
-check_modifiable(struct StringIO *ptr)
+check_modifiable(ptr)
+    struct StringIO *ptr;
 {
     if (OBJ_FROZEN(ptr->string)) {
 	rb_raise(rb_eIOError, "not modifiable string");
     }
 }
 
+static VALUE strio_s_allocate _((VALUE));
+static VALUE strio_s_open _((int, VALUE *, VALUE));
+static void strio_init _((int, VALUE *, struct StringIO *));
+static VALUE strio_initialize _((int, VALUE *, VALUE));
+static VALUE strio_finalize _((VALUE));
+static VALUE strio_self _((VALUE));
+static VALUE strio_false _((VALUE));
+static VALUE strio_nil _((VALUE));
+static VALUE strio_0 _((VALUE));
+static VALUE strio_first _((VALUE, VALUE));
+static VALUE strio_unimpl _((int, VALUE *, VALUE));
+static VALUE strio_get_string _((VALUE));
+static VALUE strio_set_string _((VALUE, VALUE));
+static VALUE strio_close _((VALUE));
+static VALUE strio_close_read _((VALUE));
+static VALUE strio_close_write _((VALUE));
+static VALUE strio_closed _((VALUE));
+static VALUE strio_closed_read _((VALUE));
+static VALUE strio_closed_write _((VALUE));
+static VALUE strio_eof _((VALUE));
+static VALUE strio_get_lineno _((VALUE));
+static VALUE strio_set_lineno _((VALUE, VALUE));
+static VALUE strio_get_pos _((VALUE));
+static VALUE strio_set_pos _((VALUE, VALUE));
+static VALUE strio_rewind _((VALUE));
+static VALUE strio_seek _((int, VALUE *, VALUE));
+static VALUE strio_get_sync _((VALUE));
+static VALUE strio_each_byte _((VALUE));
+static VALUE strio_each_char _((VALUE));
+static VALUE strio_getc _((VALUE));
+static VALUE strio_ungetc _((VALUE, VALUE));
+static VALUE strio_readchar _((VALUE));
+static VALUE strio_getline _((int, VALUE *, struct StringIO *));
+static VALUE strio_gets _((int, VALUE *, VALUE));
+static VALUE strio_readline _((int, VALUE *, VALUE));
+static VALUE strio_each _((int, VALUE *, VALUE));
+static VALUE strio_readlines _((int, VALUE *, VALUE));
+static VALUE strio_write _((VALUE, VALUE));
+static VALUE strio_putc _((VALUE, VALUE));
+static VALUE strio_read _((int, VALUE *, VALUE));
+static VALUE strio_size _((VALUE));
+static VALUE strio_truncate _((VALUE, VALUE));
+void Init_stringio _((void));
+
+/* Boyer-Moore search: copied from regex.c */
+static void bm_init_skip _((long *, const char *, long));
+static long bm_search _((const char *, long, const char *, long, const long *));
+
 static VALUE
-strio_s_allocate(VALUE klass)
+strio_s_allocate(klass)
+    VALUE 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;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = rb_class_new_instance(argc, argv, klass);
+    if (!rb_block_given_p()) return obj;
+    return rb_ensure(rb_yield, obj, strio_finalize, obj);
+}
+
+/*
  * call-seq: StringIO.new(string=""[, mode])
  *
  * Creates new StringIO instance from with _string_ and _mode_.
  */
 static VALUE
-strio_initialize(int argc, VALUE *argv, VALUE self)
+strio_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct StringIO *ptr = check_strio(self);
 
@@ -156,7 +230,10 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static void
-strio_init(int argc, VALUE *argv, struct StringIO *ptr)
+strio_init(argc, argv, ptr)
+    int argc;
+    VALUE *argv;
+    struct StringIO *ptr;
 {
     VALUE string, mode;
     int trunc = Qfalse;
@@ -187,17 +264,16 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr)
 	ptr->flags = OBJ_FROZEN(string) ? FMODE_READABLE : FMODE_READWRITE;
 	break;
       case 0:
-	string = rb_enc_str_new("", 0, rb_default_external_encoding());
+	string = rb_str_new("", 0);
 	ptr->flags = FMODE_READWRITE;
 	break;
     }
     ptr->string = string;
-    ptr->pos = 0;
-    ptr->lineno = 0;
 }
 
 static VALUE
-strio_finalize(VALUE self)
+strio_finalize(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     ptr->string = Qnil;
@@ -206,25 +282,11 @@ strio_finalize(VALUE self)
 }
 
 /*
- * 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(int argc, VALUE *argv, VALUE klass)
-{
-    VALUE obj = rb_class_new_instance(argc, argv, klass);
-    if (!rb_block_given_p()) return obj;
-    return rb_ensure(rb_yield, obj, strio_finalize, obj);
-}
-
-/*
  * Returns +false+.  Just for compatibility to IO.
  */
 static VALUE
-strio_false(VALUE self)
+strio_false(self)
+    VALUE self;
 {
     StringIO(self);
     return Qfalse;
@@ -234,7 +296,8 @@ strio_false(VALUE self)
  * Returns +nil+.  Just for compatibility to IO.
  */
 static VALUE
-strio_nil(VALUE self)
+strio_nil(self)
+    VALUE self;
 {
     StringIO(self);
     return Qnil;
@@ -244,7 +307,8 @@ strio_nil(VALUE self)
  * Returns *strio* itself.  Just for compatibility to IO.
  */
 static VALUE
-strio_self(VALUE self)
+strio_self(self)
+    VALUE self;
 {
     StringIO(self);
     return self;
@@ -254,7 +318,8 @@ strio_self(VALUE self)
  * Returns 0.  Just for compatibility to IO.
  */
 static VALUE
-strio_0(VALUE self)
+strio_0(self)
+    VALUE self;
 {
     StringIO(self);
     return INT2FIX(0);
@@ -264,7 +329,8 @@ strio_0(VALUE self)
  * Returns the argument unchanged.  Just for compatibility to IO.
  */
 static VALUE
-strio_first(VALUE self, VALUE arg)
+strio_first(self, arg)
+    VALUE self, arg;
 {
     StringIO(self);
     return arg;
@@ -274,7 +340,10 @@ strio_first(VALUE self, VALUE arg)
  * Raises NotImplementedError.
  */
 static VALUE
-strio_unimpl(int argc, VALUE *argv, VALUE self)
+strio_unimpl(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     StringIO(self);
     rb_notimplement();
@@ -287,7 +356,8 @@ strio_unimpl(int argc, VALUE *argv, VALUE self)
  * Returns underlying String object, the subject of IO.
  */
 static VALUE
-strio_get_string(VALUE self)
+strio_get_string(self)
+    VALUE self;
 {
     return StringIO(self)->string;
 }
@@ -299,7 +369,8 @@ strio_get_string(VALUE self)
  * Changes underlying String object, the subject of IO.
  */
 static VALUE
-strio_set_string(VALUE self, VALUE string)
+strio_set_string(self, string)
+    VALUE self, string;
 {
     struct StringIO *ptr = StringIO(self);
 
@@ -320,7 +391,8 @@ strio_set_string(VALUE self, VALUE string)
  * operations; an +IOError+ is raised if such an attempt is made.
  */
 static VALUE
-strio_close(VALUE self)
+strio_close(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (CLOSED(ptr)) {
@@ -338,7 +410,8 @@ strio_close(VALUE self)
  * *strio* is not readable.
  */
 static VALUE
-strio_close_read(VALUE self)
+strio_close_read(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (!READABLE(ptr)) {
@@ -356,7 +429,8 @@ strio_close_read(VALUE self)
  * *strio* is not writeable.
  */
 static VALUE
-strio_close_write(VALUE self)
+strio_close_write(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (!WRITABLE(ptr)) {
@@ -373,7 +447,8 @@ strio_close_write(VALUE self)
  * Returns +true+ if *strio* is completely closed, +false+ otherwise.
  */
 static VALUE
-strio_closed(VALUE self)
+strio_closed(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (!CLOSED(ptr)) return Qfalse;
@@ -387,7 +462,8 @@ strio_closed(VALUE self)
  * Returns +true+ if *strio* is not readable, +false+ otherwise.
  */
 static VALUE
-strio_closed_read(VALUE self)
+strio_closed_read(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (READABLE(ptr)) return Qfalse;
@@ -401,7 +477,8 @@ strio_closed_read(VALUE self)
  * Returns +true+ if *strio* is not writable, +false+ otherwise.
  */
 static VALUE
-strio_closed_write(VALUE self)
+strio_closed_write(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     if (WRITABLE(ptr)) return Qfalse;
@@ -417,16 +494,18 @@ strio_closed_write(VALUE self)
  * opened for reading or an +IOError+ will be raised.
  */
 static VALUE
-strio_eof(VALUE self)
+strio_eof(self)
+    VALUE self;
 {
     struct StringIO *ptr = readable(StringIO(self));
-    if (ptr->pos < RSTRING_LEN(ptr->string)) return Qfalse;
+    if (ptr->pos < RSTRING(ptr->string)->len) return Qfalse;
     return Qtrue;
 }
 
 /* :nodoc: */
 static VALUE
-strio_copy(VALUE copy, VALUE orig)
+strio_copy(copy, orig)
+    VALUE copy, orig;
 {
     struct StringIO *ptr;
 
@@ -453,7 +532,8 @@ strio_copy(VALUE copy, VALUE orig)
  * newline.  See also the  <code>$.</code> variable.
  */
 static VALUE
-strio_get_lineno(VALUE self)
+strio_get_lineno(self)
+    VALUE self;
 {
     return LONG2NUM(StringIO(self)->lineno);
 }
@@ -466,7 +546,8 @@ strio_get_lineno(VALUE self)
  * <code>$.</code> is updated only on the next read.
  */
 static VALUE
-strio_set_lineno(VALUE self, VALUE lineno)
+strio_set_lineno(self, lineno)
+    VALUE self, lineno;
 {
     StringIO(self)->lineno = NUM2LONG(lineno);
     return lineno;
@@ -493,7 +574,10 @@ strio_set_lineno(VALUE self, VALUE lineno)
  * and _mode_ (see StringIO#new).
  */
 static VALUE
-strio_reopen(int argc, VALUE *argv, VALUE self)
+strio_reopen(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     if (!OBJ_TAINTED(self)) rb_secure(4);
     if (argc == 1 && TYPE(*argv) != T_STRING) {
@@ -511,7 +595,8 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
  * Returns the current offset (in bytes) of *strio*.
  */
 static VALUE
-strio_get_pos(VALUE self)
+strio_get_pos(self)
+    VALUE self;
 {
     return LONG2NUM(StringIO(self)->pos);
 }
@@ -523,7 +608,9 @@ strio_get_pos(VALUE self)
  * Seeks to the given position (in bytes) in *strio*.
  */
 static VALUE
-strio_set_pos(VALUE self, VALUE pos)
+strio_set_pos(self, pos)
+    VALUE self;
+    VALUE pos;
 {
     struct StringIO *ptr = StringIO(self);
     long p = NUM2LONG(pos);
@@ -531,6 +618,7 @@ strio_set_pos(VALUE self, VALUE pos)
 	error_inval(0);
     }
     ptr->pos = p;
+    ptr->flags &= ~STRIO_EOF;
     return pos;
 }
 
@@ -542,11 +630,13 @@ strio_set_pos(VALUE self, VALUE pos)
  * +lineno+ to zero.
  */
 static VALUE
-strio_rewind(VALUE self)
+strio_rewind(self)
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     ptr->pos = 0;
     ptr->lineno = 0;
+    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
@@ -558,7 +648,10 @@ strio_rewind(VALUE self)
  * the value of _whence_ (see IO#seek).
  */
 static VALUE
-strio_seek(int argc, VALUE *argv, VALUE self)
+strio_seek(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
@@ -576,7 +669,7 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 	offset += ptr->pos;
 	break;
       case 2:
-	offset += RSTRING_LEN(ptr->string);
+	offset += RSTRING(ptr->string)->len;
 	break;
       default:
 	error_inval("invalid whence");
@@ -585,6 +678,7 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 	error_inval(0);
     }
     ptr->pos = offset;
+    ptr->flags &= ~STRIO_EOF;
     return INT2FIX(0);
 }
 
@@ -595,7 +689,8 @@ strio_seek(int argc, VALUE *argv, VALUE self)
  * Returns +true+ always.
  */
 static VALUE
-strio_get_sync(VALUE self)
+strio_get_sync(self)
+    VALUE self;
 {
     StringIO(self);
     return Qtrue;
@@ -613,7 +708,8 @@ strio_get_sync(VALUE self)
  * See IO#each_byte.
  */
 static VALUE
-strio_each_byte(VALUE self)
+strio_each_byte(self)
+    VALUE self;
 {
     struct StringIO *ptr = readable(StringIO(self));
 
@@ -628,56 +724,37 @@ strio_each_byte(VALUE self)
 
 /*
  * call-seq:
- *   strio.getc   -> string or nil
+ *   strio.getc   -> fixnum or nil
  *
  * See IO#getc.
  */
 static VALUE
-strio_getc(VALUE self)
-{
-    struct StringIO *ptr = readable(StringIO(self));
-    rb_encoding *enc = rb_enc_get(ptr->string);
-    int len;
-    char *p;
-
-    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
-	return Qnil;
-    }
-    p = RSTRING_PTR(ptr->string)+ptr->pos;
-    len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
-    ptr->pos += len;
-    return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
-}
-
-/*
- * call-seq:
- *   strio.getbyte   -> fixnum or nil
- *
- * See IO#getbyte.
- */
-static VALUE
-strio_getbyte(VALUE self)
+strio_getc(self)
+    VALUE self;
 {
     struct StringIO *ptr = readable(StringIO(self));
     int c;
-    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
+    if (ptr->pos >= RSTRING(ptr->string)->len) {
+	ptr->flags |= STRIO_EOF;
 	return Qnil;
     }
-    c = RSTRING_PTR(ptr->string)[ptr->pos++];
+    c = RSTRING(ptr->string)->ptr[ptr->pos++];
     return CHR2FIX(c);
 }
 
 static void
-strio_extend(struct StringIO *ptr, long pos, long len)
+strio_extend(ptr, pos, len)
+    struct StringIO *ptr;
+    long pos, len;
 {
     long olen;
 
     check_modifiable(ptr);
-    olen = RSTRING_LEN(ptr->string);
+    olen = RSTRING(ptr->string)->len;
     if (pos + len > olen) {
 	rb_str_resize(ptr->string, pos + len);
 	if (pos > olen)
-	    MEMZERO(RSTRING_PTR(ptr->string) + olen, char, pos - olen);
+	    MEMZERO(RSTRING(ptr->string)->ptr + olen, char, pos - olen);
     }
     else {
 	rb_str_modify(ptr->string);
@@ -686,7 +763,7 @@ strio_extend(struct StringIO *ptr, long pos, long len)
 
 /*
  * call-seq:
- *   strio.ungetc(string)   -> nil
+ *   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 
@@ -695,37 +772,24 @@ strio_extend(struct StringIO *ptr, long pos, long len)
  * In other case, there is no limitation for multiple pushbacks.
  */
 static VALUE
-strio_ungetc(VALUE self, VALUE c)
+strio_ungetc(self, ch)
+    VALUE self, ch;
 {
     struct StringIO *ptr = readable(StringIO(self));
-    long lpos, clen;
-    char *p, *pend;
-    rb_encoding *enc;
-
-    if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	int cc = FIX2INT(c);
-	char buf[16];
-
-	enc = rb_enc_get(ptr->string);
-	rb_enc_mbcput(cc, buf, enc);
-	c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
-    }
-    else {
-	SafeStringValue(c);
-	enc = rb_enc_check(ptr->string, c);
-    }
-    /* get logical position */
-    lpos = 0; p = RSTRING_PTR(ptr->string); pend = p + ptr->pos - 1;
-    for (;;) {
-	clen = rb_enc_mbclen(p, pend, enc);
-	if (p+clen >= pend) break;
-	p += clen;
-	lpos++;
+    int cc = NUM2INT(ch);
+    long len, pos = ptr->pos;
+
+    if (cc != EOF && pos > 0) {
+	if ((len = RSTRING(ptr->string)->len) < pos-- ||
+	    (unsigned char)RSTRING(ptr->string)->ptr[pos] !=
+	    (unsigned char)cc) {
+	    strio_extend(ptr, pos, 1);
+	    RSTRING(ptr->string)->ptr[pos] = cc;
+	    OBJ_INFECT(ptr->string, self);
+	}
+	--ptr->pos;
+	ptr->flags &= ~STRIO_EOF;
     }
-    rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c);
-    ptr->pos = p - RSTRING_PTR(ptr->string);
-
     return Qnil;
 }
 
@@ -736,7 +800,8 @@ strio_ungetc(VALUE self, VALUE c)
  * See IO#readchar.
  */
 static VALUE
-strio_readchar(VALUE self)
+strio_readchar(self)
+    VALUE self;
 {
     VALUE c = strio_getc(self);
     if (NIL_P(c)) rb_eof_error();
@@ -745,40 +810,44 @@ strio_readchar(VALUE self)
 
 /*
  * call-seq:
- *   strio.readbyte   -> fixnum
- *
- * See IO#readbyte.
- */
-static VALUE
-strio_readbyte(VALUE self)
-{
-    VALUE c = strio_getbyte(self);
-    if (NIL_P(c)) rb_eof_error();
-    return c;
-}
-
-/*
- * call-seq:
  *   strio.each_char {|char| block }  -> strio
  *
  * See IO#each_char.
  */
 static VALUE
-strio_each_char(VALUE self)
+strio_each_char(self)
+    VALUE self;
 {
-    VALUE c;
+    struct StringIO *sio;
+    VALUE str;
+    const char *ptr;
+    size_t len;
 
     RETURN_ENUMERATOR(self, 0, 0);
 
-    while (!NIL_P(c = strio_getc(self))) {
-	rb_yield(c);
+    sio = readable(StringIO(self));
+    str = sio->string;
+    ptr = RSTRING_PTR(str);
+    len = RSTRING_LEN(str);
+
+    while (sio->pos < len) {
+	int pos = sio->pos;
+	char c = ptr[pos];
+        int n = mbclen(c);
+
+	if (len < pos + n) n = len - pos;
+
+	sio->pos += n;
+        rb_yield(rb_str_substr(str, pos, n));
     }
     return self;
 }
 
-/* Boyer-Moore search: copied from regex.c */
 static void
-bm_init_skip(long *skip, const char *pat, long m)
+bm_init_skip(skip, pat, m)
+     long *skip;
+     const char *pat;
+     long m;
 {
     int c;
 
@@ -791,7 +860,12 @@ bm_init_skip(long *skip, const char *pat, long m)
 }
 
 static long
-bm_search(const char *little, long llen, const char *big, long blen, const long *skip)
+bm_search(little, llen, big, blen, skip)
+    const char *little;
+    long llen;
+    const char *big;
+    long blen;
+    const long *skip;
 {
     long i, j, k;
 
@@ -810,75 +884,61 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
 }
 
 static VALUE
-strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
+strio_getline(argc, argv, ptr)
+    int argc;
+    VALUE *argv;
+    struct StringIO *ptr;
 {
     const char *s, *e, *p;
-    long n, limit = 0;
+    long n;
     VALUE str;
 
     if (argc == 0) {
 	str = rb_rs;
     }
     else {
-	VALUE lim, tmp;
-
-	rb_scan_args(argc, argv, "11", &str, &lim);
-	if (!NIL_P(lim)) limit = NUM2LONG(lim);
-	else if (!NIL_P(str) && TYPE(str) != T_STRING) {
-	    tmp = rb_check_string_type(str);
-	    if (NIL_P(tmp)) {
-		limit = NUM2LONG(str);
-		if (limit == 0) return rb_str_new(0,0);
-		str = rb_rs;
-	    }
-	    else {
-		str = tmp;
-	    }
-	}
-	else if (!NIL_P(str)) {
-	    StringValue(str);
-	}
+	rb_scan_args(argc, argv, "1", &str);
+	if (!NIL_P(str)) StringValue(str);
     }
 
-    if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
+    if (ptr->pos >= (n = RSTRING(ptr->string)->len)) {
+	ptr->flags |= STRIO_EOF;
 	return Qnil;
     }
-    s = RSTRING_PTR(ptr->string);
-    e = s + RSTRING_LEN(ptr->string);
+    s = RSTRING(ptr->string)->ptr;
+    e = s + RSTRING(ptr->string)->len;
     s += ptr->pos;
-    if (limit > 0 && s + limit < e) {
-	e = s + limit;
-    }
     if (NIL_P(str)) {
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
     }
-    else if ((n = RSTRING_LEN(str)) == 0) {
+    else if ((n = RSTRING(str)->len) == 0) {
 	p = s;
 	while (*p == '\n') {
 	    if (++p == e) {
+		ptr->flags |= STRIO_EOF;
 		return Qnil;
 	    }
 	}
 	s = p;
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
-		e = p + 1;
+		e = p;
 		break;
 	    }
 	}
-	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s); 
+	str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s); 
     }
     else if (n == 1) {
-	if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
+	if ((p = memchr(s, RSTRING(str)->ptr[0], e - s)) != 0) {
 	    e = p + 1;
 	}
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
     }
     else {
 	if (n < e - s) {
 	    if (e - s < 1024) {
 		for (p = s; p + n <= e; ++p) {
-		    if (MEMCMP(p, RSTRING_PTR(str), char, n) == 0) {
+		    if (MEMCMP(p, RSTRING(str)->ptr, char, n) == 0) {
 			e = p + n;
 			break;
 		    }
@@ -886,30 +946,31 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 	    }
 	    else {
 		long skip[1 << CHAR_BIT], pos;
-		p = RSTRING_PTR(str);
+		p = RSTRING(str)->ptr;
 		bm_init_skip(skip, p, n);
 		if ((pos = bm_search(p, n, s, e - s, skip)) >= 0) {
 		    e = s + pos + n;
 		}
 	    }
 	}
-	str = strio_substr(ptr, ptr->pos, e - s);
+	str = rb_str_substr(ptr->string, ptr->pos, e - s);
     }
-    ptr->pos = e - RSTRING_PTR(ptr->string);
+    ptr->pos = e - RSTRING(ptr->string)->ptr;
     ptr->lineno++;
     return str;
 }
 
 /*
  * call-seq:
- *   strio.gets(sep=$/)     -> string or nil
- *   strio.gets(limit)      -> string or nil
- *   strio.gets(sep, limit) -> string or nil
+ *   strio.gets(sep_string=$/)   -> string or nil
  *
  * See IO#gets.
  */
 static VALUE
-strio_gets(int argc, VALUE *argv, VALUE self)
+strio_gets(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE str = strio_getline(argc, argv, readable(StringIO(self)));
 
@@ -919,14 +980,15 @@ strio_gets(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   strio.readline(sep=$/)     -> string
- *   strio.readline(limit)      -> string or nil
- *   strio.readline(sep, limit) -> string or nil
+ *   strio.readline(sep_string=$/)   -> string
  *
  * See IO#readline.
  */
 static VALUE
-strio_readline(int argc, VALUE *argv, VALUE self)
+strio_readline(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE line = strio_gets(argc, argv, self);
     if (NIL_P(line)) rb_eof_error();
@@ -935,17 +997,16 @@ strio_readline(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   strio.each(sep=$/) {|line| block }         -> strio
- *   strio.each(limit) {|line| block }          -> strio
- *   strio.each(sep, limit) {|line| block }     -> strio
- *   strio.each_line(sep=$/) {|line| block }    -> strio
- *   strio.each_line(limit) {|line| block }     -> strio
- *   strio.each_line(sep,limit) {|line| block } -> strio
+ *   strio.each(sep_string=$/)      {|line| block }  -> strio
+ *   strio.each_line(sep_string=$/) {|line| block }  -> strio
  *
  * See IO#each.
  */
 static VALUE
-strio_each(int argc, VALUE *argv, VALUE self)
+strio_each(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     VALUE line;
@@ -960,14 +1021,15 @@ strio_each(int argc, VALUE *argv, VALUE self)
 
 /*
  * call-seq:
- *   strio.readlines(sep=$/)    ->   array
- *   strio.readlines(limit)     ->   array
- *   strio.readlines(sep,limit) ->   array
+ *   strio.readlines(sep_string=$/)  ->   array
  *
  * See IO#readlines.
  */
 static VALUE
-strio_readlines(int argc, VALUE *argv, VALUE self)
+strio_readlines(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct StringIO *ptr = StringIO(self);
     VALUE ary = rb_ary_new(), line;
@@ -988,27 +1050,27 @@ strio_readlines(int argc, VALUE *argv, VALUE self)
  * Returns the number of bytes written.  See IO#write.
  */
 static VALUE
-strio_write(VALUE self, VALUE str)
+strio_write(self, str)
+    VALUE self, str;
 {
     struct StringIO *ptr = writable(StringIO(self));
     long len, olen;
 
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
-    len = RSTRING_LEN(str);
-    if (len == 0) return INT2FIX(0);
+    len = RSTRING(str)->len;
+    if (!len) return INT2FIX(0);
     check_modifiable(ptr);
-    olen = RSTRING_LEN(ptr->string);
+    olen = RSTRING(ptr->string)->len;
     if (ptr->flags & FMODE_APPEND) {
 	ptr->pos = olen;
     }
     if (ptr->pos == olen) {
-	rb_str_cat(ptr->string, RSTRING_PTR(str), len);
+	rb_str_cat(ptr->string, RSTRING(str)->ptr, len);
     }
     else {
 	strio_extend(ptr, ptr->pos, len);
-	memmove(RSTRING_PTR(ptr->string)+ptr->pos, RSTRING_PTR(str), len);
-	OBJ_INFECT(ptr->string, str);
+	rb_str_update(ptr->string, ptr->pos, len, str);
     }
     OBJ_INFECT(ptr->string, self);
     ptr->pos += len;
@@ -1047,19 +1109,20 @@ strio_write(VALUE self, VALUE str)
  * See IO#putc.
  */
 static VALUE
-strio_putc(VALUE self, VALUE ch)
+strio_putc(self, ch)
+    VALUE self, ch;
 {
     struct StringIO *ptr = writable(StringIO(self));
     int c = NUM2CHR(ch);
     long olen;
 
     check_modifiable(ptr);
-    olen = RSTRING_LEN(ptr->string);
+    olen = RSTRING(ptr->string)->len;
     if (ptr->flags & FMODE_APPEND) {
 	ptr->pos = olen;
     }
     strio_extend(ptr, ptr->pos, 1);
-    RSTRING_PTR(ptr->string)[ptr->pos++] = c;
+    RSTRING(ptr->string)->ptr[ptr->pos++] = c;
     OBJ_INFECT(ptr->string, self);
     return ch;
 }
@@ -1079,7 +1142,10 @@ strio_putc(VALUE self, VALUE ch)
  * See IO#read.
  */
 static VALUE
-strio_read(int argc, VALUE *argv, VALUE self)
+strio_read(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct StringIO *ptr = readable(StringIO(self));
     VALUE str = Qnil;
@@ -1096,7 +1162,12 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	    if (len < 0) {
 		rb_raise(rb_eArgError, "negative length %ld given", len);
 	    }
-	    if (len > 0 && ptr->pos >= RSTRING_LEN(ptr->string)) {
+	    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;
 	    }
@@ -1105,8 +1176,9 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	/* fall through */
       case 0:
 	olen = -1;
-	len = RSTRING_LEN(ptr->string);
+	len = RSTRING(ptr->string)->len;
 	if (len <= ptr->pos) {
+	    ptr->flags |= STRIO_EOF;
 	    if (NIL_P(str)) {
 		str = rb_str_new(0, 0);
 	    }
@@ -1123,21 +1195,22 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
     }
     if (NIL_P(str)) {
-	str = strio_substr(ptr, ptr->pos, len);
+	str = rb_str_substr(ptr->string, ptr->pos, len);
     }
     else {
-	long rest = RSTRING_LEN(ptr->string) - ptr->pos;
+	long rest = RSTRING(ptr->string)->len - ptr->pos;
 	if (len > rest) len = rest;
 	rb_str_resize(str, len);
-	MEMCPY(RSTRING_PTR(str), RSTRING_PTR(ptr->string) + ptr->pos, char, len);
+	MEMCPY(RSTRING(str)->ptr, RSTRING(ptr->string)->ptr + ptr->pos, char, len);
     }
     if (NIL_P(str)) {
-	str = rb_str_new(0, 0);
+	if (!(ptr->flags & STRIO_EOF)) str = rb_str_new(0, 0);
 	len = 0;
     }
     else {
-	ptr->pos += len = RSTRING_LEN(str);
+	ptr->pos += len = RSTRING(str)->len;
     }
+    if (olen < 0 || olen > len) ptr->flags |= STRIO_EOF;
     return str;
 }
 
@@ -1149,10 +1222,13 @@ strio_read(int argc, VALUE *argv, VALUE self)
  * returning +nil+, as well as IO#sysread does.
  */
 static VALUE
-strio_sysread(int argc, VALUE *argv, VALUE self)
+strio_sysread(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE val = strio_read(argc, argv, self);
-    if (NIL_P(val)) {
+    if (NIL_P(val) || RSTRING(val)->len == 0) {
 	rb_eof_error();
     }
     return val;
@@ -1184,13 +1260,14 @@ strio_sysread(int argc, VALUE *argv, VALUE self)
  * Returns the size of the buffer string.
  */
 static VALUE
-strio_size(VALUE self)
+strio_size(self)
+    VALUE self;
 {
     VALUE string = StringIO(self)->string;
     if (NIL_P(string)) {
 	rb_raise(rb_eIOError, "not opened");
     }
-    return ULONG2NUM(RSTRING_LEN(string));
+    return ULONG2NUM(RSTRING(string)->len);
 }
 
 /*
@@ -1201,17 +1278,18 @@ strio_size(VALUE self)
  * must be opened for writing.
  */
 static VALUE
-strio_truncate(VALUE self, VALUE len)
+strio_truncate(self, len)
+    VALUE self, len;
 {
     VALUE string = writable(StringIO(self))->string;
     long l = NUM2LONG(len);
-    long plen = RSTRING_LEN(string);
+    long plen = RSTRING(string)->len;
     if (l < 0) {
 	error_inval("negative legnth");
     }
     rb_str_resize(string, l);
     if (plen < l) {
-	MEMZERO(RSTRING_PTR(string) + plen, char, l - plen);
+	MEMZERO(RSTRING(string)->ptr + plen, char, l - plen);
     }
     return len;
 }
@@ -1265,16 +1343,15 @@ Init_stringio()
     rb_define_method(StringIO, "each_char", strio_each_char, 0);
     rb_define_method(StringIO, "chars", strio_each_char, 0);
     rb_define_method(StringIO, "getc", strio_getc, 0);
+    rb_define_method(StringIO, "getbyte", strio_getc, 0);
     rb_define_method(StringIO, "ungetc", strio_ungetc, 1);
     rb_define_method(StringIO, "readchar", strio_readchar, 0);
-    rb_define_method(StringIO, "getbyte", strio_getbyte, 0);
-    rb_define_method(StringIO, "readbyte", strio_readbyte, 0);
+    rb_define_method(StringIO, "readbyte", strio_readchar, 0);
     rb_define_method(StringIO, "gets", strio_gets, -1);
     rb_define_method(StringIO, "readline", strio_readline, -1);
     rb_define_method(StringIO, "readlines", strio_readlines, -1);
     rb_define_method(StringIO, "read", strio_read, -1);
     rb_define_method(StringIO, "sysread", strio_sysread, -1);
-    rb_define_method(StringIO, "readpartial", strio_sysread, -1);
 
     rb_define_method(StringIO, "write", strio_write, 1);
     rb_define_method(StringIO, "<<", strio_addstr, 1);
diff --git a/ext/strscan/.cvsignore b/ext/strscan/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/strscan/.cvsignore
+++ b/ext/strscan/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 76f6e0b18b..9199574c3f 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1,2 +1 @@
-strscan.o: strscan.c $(hdrdir)/ruby.h $(hdrdir)/re.h $(hdrdir)/regex.h \
-	   $(hdrdir)/oniguruma.h $(topdir)/config.h $(hdrdir)/defines.h
+strscan.o: strscan.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 622bfae214..b5ee20282c 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -8,9 +8,8 @@
     the Ruby License. For details, see the file COPYING.
 */
 
-#include "ruby/ruby.h"
-#include "ruby/re.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
+#include "re.h"
 
 #define STRSCAN_VERSION "0.7.0"
 
@@ -42,13 +41,13 @@ struct strscanner
 #define MATCHED(s)             (s)->flags |= FLAG_MATCHED
 #define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
 
-#define S_PBEG(s)  (RSTRING_PTR((s)->str))
-#define S_LEN(s)  (RSTRING_LEN((s)->str))
+#define S_PBEG(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_RESTLEN(s) (S_LEN(s) - (s)->curr)
 
-#define EOS_P(s) ((s)->curr >= RSTRING_LEN(p->str))
+#define EOS_P(s) ((s)->curr >= RSTRING(p->str)->len)
 
 #define GET_SCANNER(obj,var) do {\
     Data_Get_Struct(obj, struct strscanner, var);\
@@ -63,7 +62,7 @@ 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));
 
-void check_strscan _((VALUE obj));
+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));
@@ -127,20 +126,12 @@ infect(VALUE str, struct strscanner *p)
 }
 
 static VALUE
-str_new(struct strscanner *p, const char *ptr, long len)
-{
-    VALUE str = rb_str_new(ptr, len);
-    rb_enc_copy(str, p->str);
-    return str;
-}
-
-static VALUE
 extract_range(struct strscanner *p, long beg_i, long end_i)
 {
     if (beg_i > S_LEN(p)) return Qnil;
     if (end_i > S_LEN(p))
         end_i = S_LEN(p);
-    return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p);
+    return infect(rb_str_new(S_PBEG(p) + beg_i, end_i - beg_i), p);
 }
 
 static VALUE
@@ -149,7 +140,7 @@ extract_beg_len(struct strscanner *p, long beg_i, long len)
     if (beg_i > S_LEN(p)) return Qnil;
     if (beg_i + len > S_LEN(p))
         len = S_LEN(p) - beg_i;
-    return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
+    return infect(rb_str_new(S_PBEG(p) + beg_i, len), p);
 }
 
 /* =======================================================================
@@ -165,8 +156,8 @@ strscan_mark(struct strscanner *p)
 static void
 strscan_free(struct strscanner *p)
 {
-    onig_region_free(&(p->regs), 0);
-    ruby_xfree(p);
+    re_free_registers(&(p->regs));
+    free(p);
 }
 
 static VALUE
@@ -177,7 +168,7 @@ strscan_s_allocate(VALUE klass)
     p = ALLOC(struct strscanner);
     MEMZERO(p, struct strscanner, 1);
     CLEAR_MATCH_STATUS(p);
-    onig_region_init(&(p->regs));
+    MEMZERO(&(p->regs), struct re_registers, 1);
     p->str = Qnil;
     return Data_Wrap_Struct(klass, strscan_mark, strscan_free, p);
 }
@@ -202,7 +193,7 @@ strscan_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-void
+static void
 check_strscan(VALUE obj)
 {
     if (TYPE(obj) != T_DATA || RDATA(obj)->dmark != (RUBY_DATA_FUNC)strscan_mark) {
@@ -228,13 +219,12 @@ strscan_init_copy(VALUE vself, VALUE vorig)
     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;
-	onig_region_copy(&self->regs, &orig->regs);
+        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;
 }
 
@@ -403,9 +393,7 @@ strscan_set_pos(VALUE self, VALUE v)
 static VALUE
 strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
 {
-    regex_t *rb_reg_prepare_re(VALUE re, VALUE str);
     struct strscanner *p;
-    regex_t *re;
     int ret;
 
     Check_Type(regex, T_REGEXP);
@@ -415,18 +403,21 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
     if (S_RESTLEN(p) < 0) {
         return Qnil;
     }
-    re = rb_reg_prepare_re(regex, p->str);
+    rb_kcode_set_option(regex);
     if (headonly) {
-        ret = onig_match(re, (UChar* )CURPTR(p),
-                         (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                         (UChar* )CURPTR(p), &(p->regs), ONIG_OPTION_NONE);
+        ret = re_match(RREGEXP(regex)->ptr,
+                       CURPTR(p), S_RESTLEN(p),
+                       0,
+                       &(p->regs));
     }
     else {
-        ret = onig_search(re,
-                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                          (UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
-                          &(p->regs), ONIG_OPTION_NONE);
+        ret = re_search(RREGEXP(regex)->ptr,
+                        CURPTR(p), S_RESTLEN(p),
+                        0,
+                        S_RESTLEN(p),
+                        &(p->regs));
     }
+    rb_kcode_reset_option();
 
     if (ret == -2) rb_raise(ScanError, "regexp buffer overflow");
     if (ret < 0) {
@@ -530,11 +521,11 @@ strscan_check(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: scan_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq: scan_full(pattern, return_string_p, advance_pointer_p)
  *
  * Tests whether the given +pattern+ is matched from the current scan pointer.
- * Advances the scan pointer if +advance_pointer_p+ is true.
  * 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".
@@ -545,6 +536,7 @@ strscan_scan_full(VALUE self, VALUE re, VALUE s, VALUE f)
     return strscan_do_scan(self, re, RTEST(s), RTEST(f), 1);
 }
 
+
 /*
  * call-seq: scan_until(pattern)
  *
@@ -573,7 +565,7 @@ strscan_scan_until(VALUE self, VALUE re)
  *   s = StringScanner.new('test string')
  *   s.exist? /s/            # -> 3
  *   s.scan /test/           # -> "test"
- *   s.exist? /s/            # -> 2
+ *   s.exist? /s/            # -> 6
  *   s.exist? /e/            # -> nil
  */
 static VALUE
@@ -624,12 +616,12 @@ strscan_check_until(VALUE self, VALUE re)
 }
 
 /*
- * call-seq: search_full(pattern, advance_pointer_p, return_string_p)
+ * call-seq: search_full(pattern, return_string_p, advance_pointer_p)
  *
  * Scans the string _until_ the +pattern+ is matched.
- * Advances the scan pointer if +advance_pointer_p+, otherwise not.
  * 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
@@ -638,18 +630,26 @@ strscan_search_full(VALUE self, VALUE re, VALUE s, VALUE 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)
 {
-    onig_region_clear(&(p->regs));
-    onig_region_set(&(p->regs), 0, 0, p->curr - p->prev);
+    if (p->regs.allocated == 0) {
+        p->regs.beg = ALLOC_N(int, RE_NREGS);
+        p->regs.end = ALLOC_N(int, RE_NREGS);
+        p->regs.allocated = RE_NREGS;
+    }
+    p->regs.num_regs = 1;
+    p->regs.beg[0] = 0;
+    p->regs.end[0] = p->curr - p->prev;
 }
 
 /*
  * Scans one character and returns it.
- * This method is multibyte character sensitive.
+ * This method is multi-byte character sensitive.
+ * See also #get_byte.
  *
- *   s = StringScanner.new("ab")
+ *   s = StringScanner.new('ab')
  *   s.getch           # => "a"
  *   s.getch           # => "b"
  *   s.getch           # => nil
@@ -669,8 +669,7 @@ strscan_getch(VALUE self)
     CLEAR_MATCH_STATUS(p);
     if (EOS_P(p))
         return Qnil;
-
-    len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
+    len = mbclen(*CURPTR(p));
     if (p->curr + len > S_LEN(p)) {
         len = S_LEN(p) - p->curr;
     }
@@ -684,15 +683,14 @@ strscan_getch(VALUE self)
 
 /*
  * Scans one byte and returns it.
- * This method is not multibyte character sensitive.
- * See also: #getch.
+ * 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
  *
- *   $KCODE = 'EUC'
  *   s = StringScanner.new("\244\242")
  *   s.get_byte         # => "\244"
  *   s.get_byte         # => "\242"
@@ -705,9 +703,9 @@ strscan_get_byte(VALUE self)
 
     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);
@@ -745,13 +743,13 @@ strscan_peek(VALUE self, VALUE vlen)
     long len;
 
     GET_SCANNER(self, p);
-
     len = NUM2LONG(vlen);
-    if (EOS_P(p))
-        return infect(str_new(p, "", 0), p);
-
-    if (p->curr + len > S_LEN(p))
+    if (EOS_P(p)) {
+        return infect(rb_str_new("", 0), p);
+    }
+    if (p->curr + len > S_LEN(p)) {
         len = S_LEN(p) - p->curr;
+    }
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -775,7 +773,7 @@ strscan_peep(VALUE self, VALUE vlen)
  *   s.unscan
  *   s.scan(/../)         # => "te"
  *   s.scan(/\d/)         # => nil
- *   s.unscan             # ScanError: unscan failed: previous match record not exist
+ *   s.unscan             # ScanError: unscan failed: previous match had failed
  */
 static VALUE
 strscan_unscan(VALUE self)
@@ -783,8 +781,9 @@ strscan_unscan(VALUE self)
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    if (! MATCHED_P(p))
-        rb_raise(ScanError, "unscan failed: previous match record not exist");
+    if (! MATCHED_P(p)) {
+        rb_raise(ScanError, "unscan failed: previous match had failed");
+    }
     p->curr = p->prev;
     CLEAR_MATCH_STATUS(p);
     return self;
@@ -892,6 +891,7 @@ strscan_matched(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
+
     return extract_range(p, p->prev + p->regs.beg[0],
                             p->prev + p->regs.end[0]);
 }
@@ -913,6 +913,7 @@ strscan_matched_size(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
+
     return INT2NUM(p->regs.end[0] - p->regs.beg[0]);
 }
 
@@ -977,6 +978,7 @@ strscan_pre_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
+
     return extract_range(p, 0, p->prev + p->regs.beg[0]);
 }
 
@@ -996,6 +998,7 @@ strscan_post_match(VALUE self)
 
     GET_SCANNER(self, p);
     if (! MATCHED_P(p)) return Qnil;
+
     return extract_range(p, p->prev + p->regs.end[0], S_LEN(p));
 }
 
@@ -1010,7 +1013,7 @@ strscan_rest(VALUE self)
 
     GET_SCANNER(self, p);
     if (EOS_P(p)) {
-        return infect(str_new(p, "", 0), p);
+        return infect(rb_str_new("", 0), p);
     }
     return extract_range(p, p->curr, S_LEN(p));
 }
@@ -1028,6 +1031,7 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
+
     i = S_LEN(p) - p->curr;
     return INT2FIX(i);
 }
@@ -1081,7 +1085,7 @@ strscan_inspect(VALUE self)
         len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld @ %s>",
                        rb_class2name(CLASS_OF(self)),
                        p->curr, S_LEN(p),
-                       RSTRING_PTR(b));
+                       RSTRING(b)->ptr);
         return infect(rb_str_new(buf, len), p);
     }
     a = inspect1(p);
@@ -1089,8 +1093,8 @@ strscan_inspect(VALUE self)
     len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s @ %s>",
                    rb_class2name(CLASS_OF(self)),
                    p->curr, S_LEN(p),
-                   RSTRING_PTR(a),
-                   RSTRING_PTR(b));
+                   RSTRING(a)->ptr,
+                   RSTRING(b)->ptr);
     return infect(rb_str_new(buf, len), p);
 }
 
@@ -1241,7 +1245,7 @@ inspect2(struct strscanner *p)
  * There are aliases to several of the methods.
  */
 void
-Init_strscan()
+Init_strscan(void)
 {
     ID id_scanerr = rb_intern("ScanError");
     VALUE tmp;
diff --git a/ext/syck/.cvsignore b/ext/syck/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/syck/.cvsignore
+++ b/ext/syck/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/syck/bytecode.c b/ext/syck/bytecode.c
index 25ba678300..567aaf52a8 100644
--- a/ext/syck/bytecode.c
+++ b/ext/syck/bytecode.c
@@ -4,10 +4,11 @@
  * bytecode.re
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "syck.h"
 #include "gram.h"
 
@@ -164,7 +165,7 @@ sycklex_bytecode_utf8( YYSTYPE *sycklval, SyckParser *parser )
 #line 165 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept = 0;
+	unsigned int yyaccept;
 	goto yy0;
 	++YYCURSOR;
 yy0:
@@ -542,7 +543,7 @@ Directive:
 #line 543 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept = 0;
+	unsigned int yyaccept;
 	goto yy45;
 	++YYCURSOR;
 yy45:
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 73ff5d7a0b..9c8ab8d49b 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -2,13 +2,14 @@
  * emitter.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  * 
  * All Base64 code from Ruby's pack.c.
- * Ruby is Copyright (C) 1993-2007 Yukihiro Matsumoto 
+ * Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto 
  */
-#include "ruby/ruby.h"
+#include "ruby.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -97,7 +98,7 @@ syck_base64dec( char *s, long len )
         }
     }
     *end = '\0';
-    /*RSTRING_LEN(buf) = ptr - RSTRING_PTR(buf);*/
+    /*RSTRING(buf)->len = ptr - RSTRING(buf)->ptr;*/
     return ptr;
 }
 
@@ -105,7 +106,7 @@ syck_base64dec( char *s, long len )
  * Allocate an emitter
  */
 SyckEmitter *
-syck_new_emitter(void)
+syck_new_emitter()
 {
     SyckEmitter *e;
     e = S_ALLOC( SyckEmitter );
@@ -281,10 +282,10 @@ syck_emitter_clear( SyckEmitter *e )
  * Raw write to the emitter buffer.
  */
 void
-syck_emitter_write( SyckEmitter *e, const char *str, long len )
+syck_emitter_write( SyckEmitter *e, char *str, long len )
 {
     long at;
-    ASSERT( str != NULL );
+    ASSERT( str != NULL )
     if ( e->buffer == NULL )
     {
         syck_emitter_clear( e );
@@ -391,7 +392,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
     /* Look for anchor */
     if ( e->anchors != NULL &&
         st_lookup( e->markers, n, (st_data_t *)&oid ) &&
-        st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
+        st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
     {
         if ( e->anchored == NULL )
         {
@@ -437,7 +438,7 @@ end_emit:
  * 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, const char *tag, const char *ignore )
+void syck_emit_tag( SyckEmitter *e, char *tag, char *ignore )
 {
     SyckLevel *lvl;
     if ( tag == NULL ) return;
@@ -456,7 +457,7 @@ void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
             int skip = 4 + strlen( YAML_DOMAIN ) + 1;
             syck_emitter_write( e, tag + skip, taglen - skip );
         } else {
-            const char *subd = tag + 4;
+            char *subd = tag + 4;
             while ( *subd != ':' && *subd != '\0' ) subd++;
             if ( *subd == ':' ) {
                 if ( subd - tag > ( strlen( YAML_DOMAIN ) + 5 ) &&
@@ -538,7 +539,7 @@ void syck_emit_indent( SyckEmitter *e )
  * Basic printable test for LATIN-1 characters.
  */
 int
-syck_scan_scalar( int req_width, const char *cursor, long len )
+syck_scan_scalar( int req_width, char *cursor, long len )
 {
     long i = 0, start = 0;
     int flags = SCAN_NONE;
@@ -638,14 +639,13 @@ syck_scan_scalar( int req_width, const char *cursor, long len )
  * All scalars should be emitted through this function, which determines an appropriate style,
  * tag and indent.
  */
-void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_style, int force_indent, int force_width,
-                       char keep_nl, const char *str, long len )
+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;
-    const char *match_implicit;
     char *implicit;
     
     if ( str == NULL ) str = "";
@@ -659,10 +659,10 @@ void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_
     }
 
     scan = syck_scan_scalar( force_width, str, len );
-    match_implicit = syck_match_implicit( str, len );
+    implicit = syck_match_implicit( str, len );
 
     /* quote strings which default to implicits */
-    implicit = syck_taguri( YAML_DOMAIN, match_implicit, strlen( match_implicit ) );
+    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 {
@@ -773,7 +773,7 @@ void syck_emit_scalar( SyckEmitter *e, const char *tag, enum scalar_style force_
 }
 
 void
-syck_emitter_escape( SyckEmitter *e, const char *src, long len )
+syck_emitter_escape( SyckEmitter *e, char *src, long len )
 {
     int i;
     for( i = 0; i < len; i++ )
@@ -786,8 +786,8 @@ syck_emitter_escape( SyckEmitter *e, const char *src, long len )
             else
             {
                 syck_emitter_write( e, "x", 1 );
-                syck_emitter_write( e, (const char *)hex_table + ((src[i] & 0xF0) >> 4), 1 );
-                syck_emitter_write( e, (const char *)hex_table + (src[i] & 0x0F), 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
@@ -802,13 +802,12 @@ syck_emitter_escape( SyckEmitter *e, const char *src, long len )
 /*
  * Outputs a single-quoted block.
  */
-void
-syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
+void syck_emit_1quoted( SyckEmitter *e, int width, char *str, long len )
 {
     char do_indent = 0;
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
     syck_emitter_write( e, "'", 1 );
     while ( mark < str + len ) {
         if ( do_indent ) {
@@ -850,13 +849,12 @@ syck_emit_1quoted( SyckEmitter *e, int width, const char *str, long len )
 /*
  * Outputs a double-quoted block.
  */
-void
-syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
+void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
 {
     char do_indent = 0;
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
     syck_emitter_write( e, "\"", 1 );
     while ( mark < str + len ) {
         if ( do_indent > 0 ) {
@@ -911,12 +909,11 @@ syck_emit_2quoted( SyckEmitter *e, int width, const char *str, long len )
 /*
  * Outputs a literal block.
  */
-void
-syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
+void syck_emit_literal( SyckEmitter *e, char keep_nl, char *str, long len )
 {
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
     syck_emitter_write( e, "|", 1 );
     if ( keep_nl == NL_CHOMP ) {
         syck_emitter_write( e, "-", 1 );
@@ -947,12 +944,11 @@ syck_emit_literal( SyckEmitter *e, char keep_nl, const char *str, long len )
 /*
  * Outputs a folded block.
  */
-void
-syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long len )
+void syck_emit_folded( SyckEmitter *e, int width, char keep_nl, char *str, long len )
 {
-    const char *mark = str;
-    const char *start = str;
-    const char *end = str;
+    char *mark = str;
+    char *start = str;
+    char *end = str;
     syck_emitter_write( e, ">", 1 );
     if ( keep_nl == NL_CHOMP ) {
         syck_emitter_write( e, "-", 1 );
@@ -997,7 +993,7 @@ syck_emit_folded( SyckEmitter *e, int width, char keep_nl, const char *str, long
 /*
  * Begins emission of a sequence.
  */
-void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
+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 );
@@ -1018,8 +1014,7 @@ void syck_emit_seq( SyckEmitter *e, const char *tag, enum seq_style style )
 /*
  * Begins emission of a mapping.
  */
-void
-syck_emit_map( SyckEmitter *e, const char *tag, enum map_style style )
+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 );
@@ -1223,10 +1218,10 @@ syck_emitter_mark_node( SyckEmitter *e, st_data_t n )
             e->anchors = st_init_numtable();
         }
 
-        if ( ! st_lookup( e->anchors, (st_data_t)oid, (void *)&anchor_name ) )
+        if ( ! st_lookup( e->anchors, (st_data_t)oid, (st_data_t *)&anchor_name ) )
         {
             int idx = 0;
-            const char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
+            char *anc = ( e->anchor_format == NULL ? DEFAULT_ANCHOR_FORMAT : e->anchor_format );
 
             /*
              * Second time hitting this object, let's give it an anchor
diff --git a/ext/syck/handler.c b/ext/syck/handler.c
index d76a72e5cc..56fe838fbd 100644
--- a/ext/syck/handler.c
+++ b/ext/syck/handler.c
@@ -2,11 +2,12 @@
  * handler.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "syck.h"
 
 SYMID 
@@ -36,7 +37,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
     if ( p->bad_anchors != NULL )
     {
         SyckNode *bad;
-        if ( st_lookup( p->bad_anchors, (st_data_t)a, (void *)&bad ) )
+        if ( st_lookup( p->bad_anchors, (st_data_t)a, (st_data_t *)&bad ) )
         {
             if ( n->kind != syck_str_kind )
             {
@@ -49,7 +50,7 @@ syck_hdlr_add_anchor( SyckParser *p, char *a, SyckNode *n )
     {
         p->anchors = st_init_strtable();
     }
-    if ( st_lookup( p->anchors, (st_data_t)a, (void *)&ntmp ) )
+    if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&ntmp ) )
     {
         if ( ntmp != (void *)1 )
         {
@@ -69,7 +70,7 @@ syck_hdlr_remove_anchor( SyckParser *p, char *a )
     {
         p->anchors = st_init_strtable();
     }
-    if ( st_delete( p->anchors, (void *)&atmp, (void *)&ntmp ) )
+    if ( st_delete( p->anchors, (st_data_t *)&atmp, (st_data_t *)&ntmp ) )
     {
         if ( ntmp != (void *)1 )
         {
@@ -86,7 +87,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
 
     if ( p->anchors != NULL )
     {
-        if ( st_lookup( p->anchors, (st_data_t)a, (void *)&n ) )
+        if ( st_lookup( p->anchors, (st_data_t)a, (st_data_t *)&n ) )
         {
             if ( n != (void *)1 )
             {    
@@ -99,7 +100,7 @@ syck_hdlr_get_anchor( SyckParser *p, char *a )
                 {
                     p->bad_anchors = st_init_strtable();
                 }
-                if ( ! st_lookup( p->bad_anchors, (st_data_t)a, (void *)&n ) )
+                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 );
@@ -144,7 +145,7 @@ syck_add_transfer( char *uri, SyckNode *n, int taguri )
 }
 
 char *
-syck_xprivate( const char *type_id, int type_len )
+syck_xprivate( char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, type_len + 14 );
     uri[0] = '\0';
@@ -154,7 +155,7 @@ syck_xprivate( const char *type_id, int type_len )
 }
 
 char *
-syck_taguri( const char *domain, const char *type_id, int type_len )
+syck_taguri( char *domain, char *type_id, int type_len )
 {
     char *uri = S_ALLOC_N( char, strlen( domain ) + type_len + 14 );
     uri[0] = '\0';
diff --git a/ext/syck/implicit.c b/ext/syck/implicit.c
index 126b896f18..d356faf7d9 100644
--- a/ext/syck/implicit.c
+++ b/ext/syck/implicit.c
@@ -4,11 +4,12 @@
  * implicit.re
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "syck.h"
 
 #define YYCTYPE     char
@@ -20,7 +21,7 @@
 void
 try_tag_implicit( SyckNode *n, int taguri )
 {
-    const char *tid = "";
+    char *tid = "";
     switch ( n->kind )
     {
         case syck_str_kind:
@@ -44,10 +45,9 @@ try_tag_implicit( SyckNode *n, int taguri )
     }
 }
 
-const char *
-syck_match_implicit( const char *str, size_t len )
+char *syck_match_implicit( char *str, size_t len )
 {
-    const char *cursor, *limit, *marker = 0;
+    char *cursor, *limit, *marker;
     cursor = str;
     limit = str + len;
 
@@ -1585,7 +1585,7 @@ yy201:	++YYCURSOR;
 
 /* Remove ending fragment and compare types */
 int
-syck_tagcmp( const char *tag1, const char *tag2 )
+syck_tagcmp( char *tag1, char *tag2 )
 {
     if ( tag1 == tag2 ) return 1;
     if ( tag1 == NULL || tag2 == NULL ) return 0;
@@ -1609,9 +1609,9 @@ syck_tagcmp( const char *tag1, const char *tag2 )
 }
 
 char *
-syck_type_id_to_uri( const char *type_id )
+syck_type_id_to_uri( char *type_id )
 {
-    const char *cursor, *limit, *marker = 0;
+    char *cursor, *limit, *marker;
 
     cursor = type_id;
     limit = type_id + strlen( type_id );
@@ -1620,7 +1620,7 @@ syck_type_id_to_uri( const char *type_id )
 #line 1620 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept = 0;
+	unsigned int yyaccept;
 	goto yy202;
 	++YYCURSOR;
 yy202:
diff --git a/ext/syck/node.c b/ext/syck/node.c
index 890eba9d58..28fc78c077 100644
--- a/ext/syck/node.c
+++ b/ext/syck/node.c
@@ -2,11 +2,12 @@
  * node.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "syck.h"
 
 /*
@@ -45,7 +46,7 @@ syck_free_node( SyckNode *n )
 }
 
 SyckNode *
-syck_alloc_map(void)
+syck_alloc_map()
 {
     SyckNode *n;
     struct SyckMap *m;
@@ -64,7 +65,7 @@ syck_alloc_map(void)
 }
 
 SyckNode *
-syck_alloc_seq(void)
+syck_alloc_seq()
 {
     SyckNode *n;
     struct SyckSeq *s;
@@ -82,7 +83,7 @@ syck_alloc_seq(void)
 }
 
 SyckNode *
-syck_alloc_str(void)
+syck_alloc_str()
 {
     SyckNode *n;
     struct SyckStr *s;
@@ -99,13 +100,13 @@ syck_alloc_str(void)
 }
 
 SyckNode *
-syck_new_str( const char *str, enum scalar_style style )
+syck_new_str( char *str, enum scalar_style style )
 {
     return syck_new_str2( str, strlen( str ), style );
 }
 
 SyckNode *
-syck_new_str2( const char *str, long len, enum scalar_style style )
+syck_new_str2( char *str, long len, enum scalar_style style )
 {
     SyckNode *n;
 
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index bdf3c8c79c..76e8279601 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -3,12 +3,12 @@
  * rubyext.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003-2005 why the lucky stiff
  */
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
+#include "ruby.h"
 #include "syck.h"
 #include <sys/types.h>
 #include <time.h>
@@ -49,8 +49,8 @@ typedef struct {
 /*
  * 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, s_each;
-static ID s_tags, s_kind, s_name, s_options, s_type_id, s_type_id_set, s_style, s_style_set, s_value, s_value_set;
+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;
@@ -60,10 +60,10 @@ static VALUE oDefaultResolver, oGenericResolver;
 /*
  * my private collection of numerical oddities.
  */
-static double S_zero(void)    { return 0.0; }
-static double S_one(void) { return 1.0; }
-static double S_inf(void) { return S_one() / S_zero(); }
-static double S_nan(void) { return S_zero() / S_zero(); }
+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 );
 
@@ -71,7 +71,7 @@ static VALUE syck_node_transform( VALUE );
  * handler prototypes
  */
 SYMID rb_syck_load_handler _((SyckParser *, SyckNode *));
-void rb_syck_err_handler _((SyckParser *, const char *));
+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));
@@ -97,14 +97,14 @@ struct emitter_xtra {
  * Convert YAML to bytecode
  */
 VALUE
-rb_syck_compile(VALUE self, VALUE port)
+rb_syck_compile(self, port)
+    VALUE self, port;
 {
     SYMID oid;
     int taint;
     char *ret;
     VALUE bc;
-    bytestring_t *sav = NULL;
-    void *data;
+    bytestring_t *sav; 
 
     SyckParser *parser = syck_new_parser();
     taint = syck_parser_assign_io(parser, &port);
@@ -113,7 +113,7 @@ rb_syck_compile(VALUE self, VALUE port)
     syck_parser_implicit_typing( parser, 0 );
     syck_parser_taguri_expansion( parser, 0 );
     oid = syck_parse( parser );
-    if (syck_lookup_sym( parser, oid, &data )) sav = data;
+    syck_lookup_sym( parser, oid, (char **)&sav );
 
     ret = S_ALLOCA_N( char, strlen( sav->buffer ) + 3 );
     ret[0] = '\0';
@@ -150,8 +150,8 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
         if (!NIL_P(str2))
         {
             StringValue(str2);
-            len = RSTRING_LEN(str2);
-            memcpy( buf + skip, RSTRING_PTR(str2), len );
+            len = RSTRING(str2)->len;
+            memcpy( buf + skip, RSTRING(str2)->ptr, len );
         }
     }
     len += skip;
@@ -164,14 +164,16 @@ rb_syck_io_str_read( char *buf, SyckIoStr *str, long max_size, long skip )
  * (returns tainted? boolean)
  */
 int
-syck_parser_assign_io(SyckParser *parser, VALUE *pport)
+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_PTR(port), RSTRING_LEN(port), NULL );
+        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)) {
@@ -190,7 +192,8 @@ syck_parser_assign_io(SyckParser *parser, VALUE *pport)
  * Get value in hash by key, forcing an empty hash if nil.
  */
 VALUE
-syck_get_hash_aref(VALUE hsh, VALUE key)
+syck_get_hash_aref(hsh, key)
+    VALUE hsh, key;
 {
    VALUE val = rb_hash_aref( hsh, key );
    if ( NIL_P( val ) ) 
@@ -205,7 +208,9 @@ syck_get_hash_aref(VALUE hsh, VALUE key)
  * creating timestamps
  */
 SYMID
-rb_syck_mktime(char *str, long len)
+rb_syck_mktime(str, len)
+    char *str;
+    long len;
 {
     VALUE time;
     char *ptr = str;
@@ -314,7 +319,8 @@ rb_syck_mktime(char *str, long len)
  * (see http://www.yaml.org/type/merge/)
  */
 VALUE
-syck_merge_i(VALUE entry, VALUE hsh )
+syck_merge_i( entry, hsh )
+    VALUE entry, hsh;
 {
     VALUE tmp;
     if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
@@ -329,7 +335,9 @@ syck_merge_i(VALUE entry, VALUE hsh )
  * default handler for ruby.yaml.org types
  */
 int
-yaml_org_handler( SyckNode *n, VALUE *ref )
+yaml_org_handler( n, ref )
+    SyckNode *n;
+    VALUE *ref;
 {
     char *type_id = n->type_id;
     int transferred = 0;
@@ -513,7 +521,6 @@ yaml_org_handler( SyckNode *n, VALUE *ref )
             else if ( strcmp( type_id, "str" ) == 0 )
             {
                 obj = rb_str_new( n->data.str->ptr, n->data.str->len );
-                rb_enc_associate(obj, rb_utf8_encoding());
             }
             else
             {
@@ -568,7 +575,7 @@ yaml_org_handler( SyckNode *n, VALUE *ref )
                             VALUE dup = rb_funcall( tmph, s_dup, 0 );
                             tmp = rb_ary_reverse( tmp );
                             rb_ary_push( tmp, obj );
-                            rb_block_call( tmp, s_each, 0, 0, syck_merge_i, dup );
+                            rb_iterate( rb_each, tmp, syck_merge_i, dup );
                             obj = dup;
                             skip_aset = 1;
                         }
@@ -599,7 +606,9 @@ static void syck_node_mark( SyckNode *n );
  * - Converts data into native Ruby types
  */
 SYMID
-rb_syck_load_handler(SyckParser *p, SyckNode *n)
+rb_syck_load_handler(p, n)
+    SyckParser *p;
+    SyckNode *n;
 {
     VALUE obj = Qnil;
     struct parser_xtra *bonus = (struct parser_xtra *)p->bonus;
@@ -627,7 +636,7 @@ rb_syck_load_handler(SyckParser *p, SyckNode *n)
     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_SIZE(bonus->data)), obj);
+    rb_hash_aset(bonus->data, INT2FIX(RHASH(bonus->data)->tbl->num_entries), obj);
     return obj;
 }
 
@@ -635,7 +644,9 @@ rb_syck_load_handler(SyckParser *p, SyckNode *n)
  * friendly errors.
  */
 void
-rb_syck_err_handler(SyckParser *p, const char *msg)
+rb_syck_err_handler(p, msg)
+    SyckParser *p;
+    char *msg;
 {
     char *endl = p->cursor;
 
@@ -654,7 +665,9 @@ rb_syck_err_handler(SyckParser *p, const char *msg)
  * provide bad anchor object to the parser.
  */
 SyckNode *
-rb_syck_bad_anchor_handler(SyckParser *p, char *a)
+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 );
@@ -666,7 +679,8 @@ rb_syck_bad_anchor_handler(SyckParser *p, char *a)
  * data loaded based on the model requested.
  */
 void
-syck_set_model(VALUE p, VALUE input, VALUE model)
+syck_set_model( p, input, model )
+    VALUE p, input, model;
 {
     SyckParser *parser;
     Data_Get_Struct(p, SyckParser, parser);
@@ -706,7 +720,8 @@ syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
  * mark parser nodes
  */
 static void
-syck_mark_parser(SyckParser *parser)
+syck_mark_parser(parser)
+    SyckParser *parser;
 {
     struct parser_xtra *bonus = (struct parser_xtra *)parser->bonus;
     rb_gc_mark_maybe(parser->root);
@@ -729,7 +744,8 @@ syck_mark_parser(SyckParser *parser)
  * Free the parser and any bonus attachment.
  */
 void
-rb_syck_free_parser(SyckParser *p)
+rb_syck_free_parser(p)
+    SyckParser *p;
 {
     S_FREE( p->bonus );
     syck_free_parser(p);
@@ -740,7 +756,8 @@ rb_syck_free_parser(SyckParser *p)
  */
 VALUE syck_parser_s_alloc _((VALUE));
 VALUE 
-syck_parser_s_alloc(VALUE class)
+syck_parser_s_alloc(class)
+    VALUE class;
 {
     VALUE pobj;
     SyckParser *parser = syck_new_parser();
@@ -759,7 +776,10 @@ syck_parser_s_alloc(VALUE class)
  * YAML::Syck::Parser.initialize( resolver, options )
  */
 static VALUE
-syck_parser_initialize(int argc, VALUE *argv, VALUE self)
+syck_parser_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE options;
     if (rb_scan_args(argc, argv, "01", &options) == 0)
@@ -779,7 +799,8 @@ syck_parser_initialize(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Parser.bufsize = Integer
  */
 static VALUE
-syck_parser_bufsize_set(VALUE self, VALUE size)
+syck_parser_bufsize_set( self, size )
+    VALUE self, size;
 {
     SyckParser *parser;
 
@@ -795,7 +816,8 @@ syck_parser_bufsize_set(VALUE self, VALUE size)
  * YAML::Syck::Parser.bufsize => Integer
  */
 static VALUE
-syck_parser_bufsize_get(VALUE self)
+syck_parser_bufsize_get( self )
+    VALUE self;
 {
     SyckParser *parser;
 
@@ -807,7 +829,10 @@ syck_parser_bufsize_get(VALUE self)
  * YAML::Syck::Parser.load( IO or String )
  */
 VALUE
-syck_parser_load(int argc, VALUE *argv, VALUE self)
+syck_parser_load(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE port, proc, model, input;
     SyckParser *parser;
@@ -834,7 +859,10 @@ syck_parser_load(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Parser.load_documents( IO or String ) { |doc| }
  */
 VALUE
-syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
+syck_parser_load_documents(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE port, proc, v, input, model;
     SyckParser *parser;
@@ -875,7 +903,8 @@ syck_parser_load_documents(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Parser#set_resolver
  */
 VALUE
-syck_parser_set_resolver(VALUE self, VALUE resolver)
+syck_parser_set_resolver( self, resolver )
+    VALUE self, resolver;
 {
     rb_ivar_set( self, s_resolver, resolver );
     return self;
@@ -885,7 +914,8 @@ syck_parser_set_resolver(VALUE self, VALUE resolver)
  * YAML::Syck::Resolver.initialize
  */
 static VALUE
-syck_resolver_initialize(VALUE self)
+syck_resolver_initialize( self )
+    VALUE self;
 {
     rb_ivar_set(self, s_tags, rb_hash_new());
     return self;
@@ -895,7 +925,8 @@ syck_resolver_initialize(VALUE self)
  * YAML::Syck::Resolver#add_type
  */
 VALUE
-syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
+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 );
@@ -906,7 +937,8 @@ syck_resolver_add_type(VALUE self, VALUE taguri, VALUE cls)
  * YAML::Syck::Resolver#use_types_at
  */
 VALUE
-syck_resolver_use_types_at(VALUE self, VALUE hsh)
+syck_resolver_use_types_at( self, hsh )
+    VALUE self, hsh;
 {
     rb_ivar_set( self, s_tags, hsh );
     return Qnil;
@@ -916,7 +948,8 @@ syck_resolver_use_types_at(VALUE self, VALUE hsh)
  * YAML::Syck::Resolver#detect_implicit 
  */
 VALUE
-syck_resolver_detect_implicit(VALUE self, VALUE val)
+syck_resolver_detect_implicit( self, val )
+    VALUE self, val;
 {
     return rb_str_new2( "" );
 }
@@ -925,10 +958,11 @@ syck_resolver_detect_implicit(VALUE self, VALUE val)
  * YAML::Syck::Resolver#node_import
  */
 VALUE
-syck_resolver_node_import(VALUE self, VALUE node)
+syck_resolver_node_import( self, node )
+    VALUE self, node;
 {
     SyckNode *n;
-    VALUE obj = Qnil;
+    VALUE obj;
     int i = 0;
     Data_Get_Struct(node, SyckNode, n);
 
@@ -974,7 +1008,7 @@ syck_resolver_node_import(VALUE self, VALUE node)
                             VALUE dup = rb_funcall( end, s_dup, 0 );
                             v = rb_ary_reverse( v );
                             rb_ary_push( v, obj );
-                            rb_block_call( v, s_each, 0, 0, syck_merge_i, dup );
+                            rb_iterate( rb_each, v, syck_merge_i, dup );
                             obj = dup;
                             skip_aset = 1;
                         }
@@ -1005,15 +1039,16 @@ syck_resolver_node_import(VALUE self, VALUE node)
  * Set instance variables
  */
 VALUE
-syck_set_ivars(VALUE vars, VALUE obj)
+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_LEN(ivname) + 2 );
+    ivn = S_ALLOCA_N( char, RSTRING(ivname)->len + 2 );
     ivn[0] = '@';
     ivn[1] = '\0';
-    strncat( ivn, RSTRING_PTR(ivname), RSTRING_LEN(ivname) );
+    strncat( ivn, RSTRING(ivname)->ptr, RSTRING(ivname)->len );
     rb_iv_set( obj, ivn, rb_ary_entry( vars, 1 ) );
     return Qnil;
 }
@@ -1022,12 +1057,13 @@ syck_set_ivars(VALUE vars, VALUE obj)
  * YAML::Syck::Resolver#const_find
  */
 VALUE
-syck_const_find(VALUE const_name)
+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_LEN(tparts); i++ ) {
+    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 );
@@ -1039,14 +1075,15 @@ syck_const_find(VALUE const_name)
  * YAML::Syck::Resolver#transfer
  */
 VALUE
-syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
+syck_resolver_transfer( self, type, val )
+    VALUE self, type, val;
 {
-    if (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) 
+    if (NIL_P(type) || RSTRING(StringValue(type))->len == 0) 
     {
         type = rb_funcall( self, s_detect_implicit, 1, val );
     }
 
-    if ( ! (NIL_P(type) || RSTRING_LEN(StringValue(type)) == 0) )
+    if ( ! (NIL_P(type) || RSTRING(StringValue(type))->len == 0) )
     {
         VALUE str_xprivate = rb_str_new2( "x-private" );
         VALUE colon = rb_str_new2( ":" );
@@ -1063,7 +1100,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
             VALUE subclass_parts = rb_ary_new();
             VALUE parts = rb_str_split( type, ":" );
 
-            while ( RARRAY_LEN(parts) > 1 )
+            while ( RARRAY(parts)->len > 1 )
             {
                 VALUE partial;
                 rb_ary_unshift( subclass_parts, rb_ary_pop( parts ) );
@@ -1081,7 +1118,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
                 if ( ! NIL_P( target_class ) )
                 {
                     subclass = target_class;
-                    if ( RARRAY_LEN(subclass_parts) > 0 && rb_respond_to( target_class, s_tag_subclasses ) &&
+                    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;
@@ -1140,7 +1177,7 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
                 }
                 else if ( !NIL_P( obj ) && rb_obj_is_instance_of( val, rb_cHash ) )
                 {
-                    rb_block_call( val, s_each, 0, 0, syck_set_ivars, obj );
+                    rb_iterate( rb_each, val, syck_set_ivars, obj );
                 }
             }
             else 
@@ -1170,13 +1207,14 @@ syck_resolver_transfer(VALUE self, VALUE type, VALUE val)
  * YAML::Syck::Resolver#tagurize
  */
 VALUE
-syck_resolver_tagurize(VALUE self, VALUE val)
+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_PTR(tmp) );
+        char *taguri = syck_type_id_to_uri( RSTRING(tmp)->ptr );
         val = rb_str_new2( taguri );
         S_FREE( taguri );
     }
@@ -1188,15 +1226,16 @@ syck_resolver_tagurize(VALUE self, VALUE val)
  * YAML::Syck::DefaultResolver#detect_implicit 
  */
 VALUE
-syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
+syck_defaultresolver_detect_implicit( self, val )
+    VALUE self, val;
 {
-    const char *type_id;
+    char *type_id;
     VALUE tmp = rb_check_string_type(val);
 
     if ( !NIL_P(tmp) )
     {
         val = tmp;
-        type_id = syck_match_implicit( RSTRING_PTR(val), RSTRING_LEN(val) );
+        type_id = syck_match_implicit( RSTRING(val)->ptr, RSTRING(val)->len );
         return rb_str_new2( type_id );
     }
 
@@ -1207,7 +1246,8 @@ syck_defaultresolver_detect_implicit(VALUE self, VALUE val)
  * YAML::Syck::DefaultResolver#node_import
  */
 VALUE
-syck_defaultresolver_node_import(VALUE self, VALUE node)
+syck_defaultresolver_node_import( self, node )
+    VALUE self, node;
 {
     SyckNode *n;
     VALUE obj;
@@ -1223,7 +1263,8 @@ syck_defaultresolver_node_import(VALUE self, VALUE node)
  * YAML::Syck::GenericResolver#node_import
  */
 VALUE
-syck_genericresolver_node_import(VALUE self, VALUE node)
+syck_genericresolver_node_import( self, node )
+    VALUE self, node;
 {
     SyckNode *n;
     int i = 0;
@@ -1240,7 +1281,6 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
         case syck_str_kind:
         {
             v = rb_str_new( n->data.str->ptr, n->data.str->len );
-	    rb_enc_associate(v, rb_utf8_encoding());
             if ( n->data.str->style == scalar_1quote )
             {
                 style = sym_1quote;
@@ -1301,7 +1341,8 @@ syck_genericresolver_node_import(VALUE self, VALUE node)
  * YAML::Syck::BadAlias.initialize
  */
 VALUE
-syck_badalias_initialize(VALUE self, VALUE val)
+syck_badalias_initialize( self, val )
+    VALUE self, val;
 {
     rb_iv_set( self, "@name", val );
     return self;
@@ -1311,7 +1352,8 @@ syck_badalias_initialize(VALUE self, VALUE val)
  * YAML::Syck::BadAlias.<=>
  */
 VALUE
-syck_badalias_cmp(VALUE alias1, VALUE alias2)
+syck_badalias_cmp( alias1, alias2 )
+    VALUE alias1, alias2;
 {
     VALUE str1 = rb_ivar_get( alias1, s_name ); 
     VALUE str2 = rb_ivar_get( alias2, s_name ); 
@@ -1323,7 +1365,8 @@ syck_badalias_cmp(VALUE alias1, VALUE alias2)
  * YAML::DomainType.initialize
  */
 VALUE
-syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
+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 );
@@ -1335,7 +1378,8 @@ syck_domaintype_initialize(VALUE self, VALUE domain, VALUE type_id, VALUE val)
  * YAML::Object.initialize
  */
 VALUE
-syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
+syck_yobject_initialize( self, klass, ivars )
+    VALUE self, klass, ivars;
 {
     rb_iv_set( self, "@class", klass );
     rb_iv_set( self, "@ivars", ivars );
@@ -1346,7 +1390,8 @@ syck_yobject_initialize(VALUE self, VALUE klass, VALUE ivars)
  * YAML::PrivateType.initialize
  */
 VALUE
-syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
+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 );
@@ -1357,7 +1402,8 @@ syck_privatetype_initialize(VALUE self, VALUE type_id, VALUE val)
  * Mark node contents.
  */
 static void
-syck_node_mark(SyckNode *n)
+syck_node_mark( n )
+    SyckNode *n;
 {
     int i;
     rb_gc_mark_maybe( n->id );
@@ -1377,11 +1423,6 @@ syck_node_mark(SyckNode *n)
                 rb_gc_mark( syck_map_read( n, map_value, i ) );
             }
         break;
-
-	case syck_str_kind:
-	default:
-	    /* nothing */
-	break;
     }
 #if 0 /* maybe needed */
     if ( n->shortcut ) syck_node_mark( n->shortcut ); /* caution: maybe cyclic */
@@ -1392,7 +1433,8 @@ syck_node_mark(SyckNode *n)
  * YAML::Syck::Scalar.allocate
  */
 VALUE
-syck_scalar_alloc(VALUE class)
+syck_scalar_alloc( class )
+    VALUE class;
 {
     SyckNode *node = syck_alloc_str();
     VALUE obj = Data_Wrap_Struct( class, syck_node_mark, syck_free_node, node );
@@ -1404,7 +1446,8 @@ syck_scalar_alloc(VALUE class)
  * YAML::Syck::Scalar.initialize
  */
 VALUE
-syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+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 );
@@ -1417,7 +1460,8 @@ syck_scalar_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
  * YAML::Syck::Scalar.style=
  */
 VALUE
-syck_scalar_style_set(VALUE self, VALUE style)
+syck_scalar_style_set( self, style )
+    VALUE self, style;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1455,14 +1499,15 @@ syck_scalar_style_set(VALUE self, VALUE style)
  * YAML::Syck::Scalar.value=
  */
 VALUE
-syck_scalar_value_set(VALUE  self, VALUE val)
+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_PTR(val), RSTRING_LEN(val) );
-    node->data.str->len = RSTRING_LEN(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 );
@@ -1473,7 +1518,8 @@ syck_scalar_value_set(VALUE  self, VALUE val)
  * YAML::Syck::Seq.allocate
  */
 VALUE
-syck_seq_alloc(VALUE class)
+syck_seq_alloc( class )
+    VALUE class;
 {
     SyckNode *node;
     VALUE obj;
@@ -1487,7 +1533,8 @@ syck_seq_alloc(VALUE class)
  * YAML::Syck::Seq.initialize
  */
 VALUE
-syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+syck_seq_initialize( self, type_id, val, style )
+    VALUE self, type_id, val, style;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1503,7 +1550,8 @@ syck_seq_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
  * YAML::Syck::Seq.value=
  */
 VALUE
-syck_seq_value_set(VALUE self, VALUE val)
+syck_seq_value_set( self, val )
+    VALUE self, val;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1512,7 +1560,7 @@ syck_seq_value_set(VALUE self, VALUE val)
     if ( !NIL_P( val ) ) {
         int i;
         syck_seq_empty( node );
-        for ( i = 0; i < RARRAY_LEN( val ); i++ )
+        for ( i = 0; i < RARRAY( val )->len; i++ )
         {
             syck_seq_add( node, rb_ary_entry(val, i) );
         }
@@ -1526,7 +1574,8 @@ syck_seq_value_set(VALUE self, VALUE val)
  * YAML::Syck::Seq.add
  */
 VALUE
-syck_seq_add_m(VALUE self, VALUE val)
+syck_seq_add_m( self, val )
+    VALUE self, val;
 {
     SyckNode *node;
     VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1545,7 +1594,8 @@ syck_seq_add_m(VALUE self, VALUE val)
  * YAML::Syck::Seq.style=
  */
 VALUE
-syck_seq_style_set(VALUE self, VALUE style)
+syck_seq_style_set( self, style )
+    VALUE self, style;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1567,7 +1617,8 @@ syck_seq_style_set(VALUE self, VALUE style)
  * YAML::Syck::Map.allocate
  */
 VALUE
-syck_map_alloc(VALUE class)
+syck_map_alloc( class )
+    VALUE class;
 {
     SyckNode *node;
     VALUE obj;
@@ -1581,7 +1632,8 @@ syck_map_alloc(VALUE class)
  * YAML::Syck::Map.initialize
  */
 VALUE
-syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
+syck_map_initialize( self, type_id, val, style )
+    VALUE self, type_id, val, style;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1597,7 +1649,7 @@ syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
         }
 
         keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY_LEN(keys); i++ )
+        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) );
@@ -1615,7 +1667,8 @@ syck_map_initialize(VALUE self, VALUE type_id, VALUE val, VALUE style)
  * YAML::Syck::Map.value=
  */
 VALUE
-syck_map_value_set(VALUE self, VALUE val)
+syck_map_value_set( self, val )
+    VALUE self, val;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1632,7 +1685,7 @@ syck_map_value_set(VALUE self, VALUE val)
 
         syck_map_empty( node );
         keys = rb_funcall( hsh, s_keys, 0 );
-        for ( i = 0; i < RARRAY_LEN(keys); i++ )
+        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) );
@@ -1647,7 +1700,8 @@ syck_map_value_set(VALUE self, VALUE val)
  * YAML::Syck::Map.add
  */
 VALUE
-syck_map_add_m(VALUE self, VALUE key, VALUE val)
+syck_map_add_m( self, key, val )
+    VALUE self, key, val;
 {
     SyckNode *node;
     VALUE emitter = rb_ivar_get( self, s_emitter );
@@ -1667,7 +1721,8 @@ syck_map_add_m(VALUE self, VALUE key, VALUE val)
  * YAML::Syck::Map.style=
  */
 VALUE
-syck_map_style_set(VALUE self, VALUE style)
+syck_map_style_set( self, style )
+    VALUE self, style;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1689,7 +1744,8 @@ syck_map_style_set(VALUE self, VALUE style)
  * Cloning method for all node types
  */
 VALUE
-syck_node_init_copy(VALUE copy, VALUE orig)
+syck_node_init_copy( copy, orig )
+    VALUE copy, orig;
 {
     SyckNode *copy_n;
     SyckNode *orig_n;
@@ -1712,7 +1768,8 @@ syck_node_init_copy(VALUE copy, VALUE orig)
  * YAML::Syck::Node#type_id=
  */
 VALUE
-syck_node_type_id_set(VALUE self, VALUE type_id)
+syck_node_type_id_set( self, type_id )
+    VALUE self, type_id;
 {
     SyckNode *node;
     Data_Get_Struct( self, SyckNode, node );
@@ -1721,7 +1778,7 @@ syck_node_type_id_set(VALUE self, VALUE type_id)
 
     if ( !NIL_P( type_id ) ) {
         StringValue( type_id );
-        node->type_id = syck_strndup( RSTRING_PTR(type_id), RSTRING_LEN(type_id) );
+        node->type_id = syck_strndup( RSTRING(type_id)->ptr, RSTRING(type_id)->len );
     }
 
     rb_iv_set( self, "@type_id", type_id );
@@ -1732,10 +1789,11 @@ syck_node_type_id_set(VALUE self, VALUE type_id)
  * YAML::Syck::Node.transform
  */
 VALUE
-syck_node_transform(VALUE self)
+syck_node_transform( self )
+    VALUE self;
 {
     VALUE t;
-    SyckNode *n = NULL;
+    SyckNode *n;
     SyckNode *orig_n;
     Data_Get_Struct(self, SyckNode, orig_n);
     t = Data_Wrap_Struct( cNode, syck_node_mark, syck_free_node, 0 );
@@ -1788,7 +1846,9 @@ syck_node_transform(VALUE self)
  * No one could possibly object.
  */
 void
-rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
+rb_syck_emitter_handler(e, data)
+    SyckEmitter *e;
+    st_data_t data;
 {
     SyckNode *n;
     Data_Get_Struct((VALUE)data, SyckNode, n);
@@ -1832,7 +1892,10 @@ rb_syck_emitter_handler(SyckEmitter *e, st_data_t data)
  * Handle output from the emitter
  */
 void 
-rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
+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;
@@ -1848,7 +1911,8 @@ rb_syck_output_handler(SyckEmitter * emitter, char *str, long len)
  * symbol table.
  */
 void
-syck_out_mark(VALUE emitter, VALUE node)
+syck_out_mark( emitter, node )
+    VALUE emitter, node;
 {
     SyckEmitter *emitterPtr;
     struct emitter_xtra *bonus;
@@ -1865,7 +1929,8 @@ syck_out_mark(VALUE emitter, VALUE node)
  * Mark emitter values.
  */
 static void
-syck_mark_emitter(SyckEmitter *emitter)
+syck_mark_emitter(emitter)
+    SyckEmitter *emitter;
 {
     struct emitter_xtra *bonus = (struct emitter_xtra *)emitter->bonus;
     rb_gc_mark( bonus->oid  );
@@ -1877,7 +1942,8 @@ syck_mark_emitter(SyckEmitter *emitter)
  * Free the emitter and any bonus attachment.
  */
 void
-rb_syck_free_emitter(SyckEmitter *e)
+rb_syck_free_emitter(e)
+    SyckEmitter *e;
 {
     S_FREE( e->bonus );
     syck_free_emitter(e);
@@ -1888,7 +1954,8 @@ rb_syck_free_emitter(SyckEmitter *e)
  */
 VALUE syck_emitter_s_alloc _((VALUE));
 VALUE 
-syck_emitter_s_alloc(VALUE class)
+syck_emitter_s_alloc(class)
+    VALUE class;
 {
     VALUE pobj;
     SyckEmitter *emitter = syck_new_emitter();
@@ -1908,7 +1975,10 @@ syck_emitter_s_alloc(VALUE class)
  * YAML::Syck::Emitter.reset( options )
  */
 VALUE
-syck_emitter_reset(int argc, VALUE *argv, VALUE self)
+syck_emitter_reset( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE options, tmp;
     SyckEmitter *emitter;
@@ -1950,7 +2020,10 @@ syck_emitter_reset(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Emitter.emit( object_id ) { |out| ... }
  */
 VALUE
-syck_emitter_emit(int argc, VALUE *argv, VALUE self)
+syck_emitter_emit( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE oid, proc;
     SyckEmitter *emitter;
@@ -1990,7 +2063,8 @@ syck_emitter_emit(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Emitter#node_export
  */
 VALUE
-syck_emitter_node_export(VALUE self, VALUE node)
+syck_emitter_node_export( self, node )
+    VALUE self, node;
 {
     return rb_funcall( node, s_to_yaml, 1, self );
 }
@@ -1999,7 +2073,8 @@ syck_emitter_node_export(VALUE self, VALUE node)
  * YAML::Syck::Emitter#set_resolver
  */
 VALUE
-syck_emitter_set_resolver(VALUE self, VALUE resolver)
+syck_emitter_set_resolver( self, resolver )
+    VALUE self, resolver;
 {
     rb_ivar_set( self, s_resolver, resolver );
     return self;
@@ -2009,7 +2084,8 @@ syck_emitter_set_resolver(VALUE self, VALUE resolver)
  * YAML::Syck::Out::initialize
  */
 VALUE
-syck_out_initialize(VALUE self, VALUE emitter)
+syck_out_initialize( self, emitter )
+    VALUE self, emitter;
 {
     rb_ivar_set( self, s_emitter, emitter );
     return self;
@@ -2019,7 +2095,10 @@ syck_out_initialize(VALUE self, VALUE emitter)
  * YAML::Syck::Out::map
  */
 VALUE
-syck_out_map(int argc, VALUE *argv, VALUE self)
+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) {
@@ -2035,7 +2114,10 @@ syck_out_map(int argc, VALUE *argv, VALUE self)
  * YAML::Syck::Out::seq
  */
 VALUE
-syck_out_seq(int argc, VALUE *argv, VALUE self)
+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) {
@@ -2053,10 +2135,15 @@ syck_out_scalar( self, type_id, str, style )
     VALUE self, type_id, str, style;
  */
 VALUE
-syck_out_scalar(int argc, VALUE *argv, VALUE self)
+syck_out_scalar( argc, argv, self )
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE type_id, str, style, scalar;
-    rb_scan_args(argc, argv, "21", &type_id, &str, &style);
+    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;
@@ -2108,7 +2195,6 @@ Init_syck()
     s_transform = rb_intern( "transform" );
     s_yaml_new = rb_intern("yaml_new");
     s_yaml_initialize = rb_intern("yaml_initialize");
-    s_each = rb_intern("each");
 
     s_tags = rb_intern("@tags");
     s_name = rb_intern("@name");
diff --git a/ext/syck/syck.c b/ext/syck/syck.c
index ccbce4822c..a83c8813c1 100644
--- a/ext/syck/syck.c
+++ b/ext/syck/syck.c
@@ -2,10 +2,11 @@
  * syck.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby/ruby.h"
+#include "ruby.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -18,11 +19,11 @@ void syck_parser_pop_level( SyckParser * );
  * Custom assert
  */
 void 
-syck_assert( const char *file_name, unsigned line_num, const char *expr )
+syck_assert( char *file_name, unsigned line_num )
 {
     fflush( NULL );
-    fprintf( stderr, "\nAssertion failed: %s, line %u: %s\n",
-             file_name, line_num, expr );
+    fprintf( stderr, "\nAssertion failed: %s, line %u\n",
+             file_name, line_num );
     fflush( stderr );
     abort();
 }
@@ -31,7 +32,7 @@ syck_assert( const char *file_name, unsigned line_num, const char *expr )
  * Allocates and copies a string
  */
 char *
-syck_strndup( const char *buf, long len )
+syck_strndup( char *buf, long len )
 {
     char *new = S_ALLOC_N( char, len + 1 );
     S_MEMZERO( new, char, len + 1 );
@@ -154,7 +155,7 @@ syck_parser_set_root_on_error( SyckParser *p, SYMID roer )
  * Allocate the parser
  */
 SyckParser *
-syck_new_parser(void)
+syck_new_parser()
 {
     SyckParser *p;
     p = S_ALLOC( SyckParser );
@@ -177,7 +178,7 @@ syck_new_parser(void)
 }
 
 int
-syck_add_sym( SyckParser *p, void *data )
+syck_add_sym( SyckParser *p, char *data )
 {
     SYMID id = 0;
     if ( p->syms == NULL )
@@ -190,14 +191,10 @@ syck_add_sym( SyckParser *p, void *data )
 }
 
 int
-syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
+syck_lookup_sym( SyckParser *p, SYMID id, char **data )
 {
-    st_data_t data = (st_data_t)*datap;
-    int ret;
     if ( p->syms == NULL ) return 0;
-    ret = st_lookup( p->syms, id, &data );
-    *datap = (void *)data;
-    return ret;
+    return st_lookup( p->syms, id, (st_data_t *)data );
 }
 
 int
@@ -497,7 +494,7 @@ syck_parse( SyckParser *p )
 }
 
 void
-syck_default_error_handler( SyckParser *p, const char *msg )
+syck_default_error_handler( SyckParser *p, char *msg )
 {
     printf( "Error at [Line %d, Col %d]: %s\n", 
         p->linect,
diff --git a/ext/syck/syck.h b/ext/syck/syck.h
index 3df3fab3f0..e7d07e9c0d 100644
--- a/ext/syck/syck.h
+++ b/ext/syck/syck.h
@@ -2,6 +2,7 @@
  * syck.h
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
@@ -18,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "ruby/st.h"
+#include "st.h"
 
 #if defined(__cplusplus)
 extern "C" {
@@ -32,11 +33,14 @@ extern "C" {
 #endif
 
 #if DEBUG
-void syck_assert( const char *, unsigned, const char * );
+  void syck_assert( char *, unsigned );
 # define ASSERT(f) \
-    (( f ) ? (void)0 syck_assert( __FILE__, __LINE__, #f )
+    if ( f ) \
+        {}   \
+    else     \
+        syck_assert( __FILE__, __LINE__ )
 #else
-# define ASSERT(f) ((void)0)
+# define ASSERT(f)
 #endif
 
 #ifndef NULL
@@ -152,7 +156,7 @@ typedef struct _syck_str SyckIoStr;
 typedef struct _syck_level SyckLevel;
 
 typedef SYMID (*SyckNodeHandler)(SyckParser *, SyckNode *);
-typedef void (*SyckErrorHandler)(SyckParser *, const char *);
+typedef void (*SyckErrorHandler)(SyckParser *, char *);
 typedef SyckNode * (*SyckBadAnchorHandler)(SyckParser *, char *);
 typedef long (*SyckIoFileRead)(char *, SyckIoFile *, long, long); 
 typedef long (*SyckIoStrRead)(char *, SyckIoStr *, long, long);
@@ -342,57 +346,57 @@ 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( const char *, int );
-char *syck_taguri( const char *, const char *, int );
-int syck_tagcmp( const char *, const char * );
-int syck_add_sym( SyckParser *, void * );
-int syck_lookup_sym( SyckParser *, SYMID, void ** );
+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( const char * );
+char *syck_type_id_to_uri( char * );
 void try_tag_implicit( SyckNode *, int );
-const char *syck_match_implicit( const char *, size_t );
+char *syck_match_implicit( char *, size_t );
 
 /*
  * API prototypes
  */
-char *syck_strndup( const char *, long );
+char *syck_strndup( char *, long );
 long syck_io_file_read( char *, SyckIoFile *, long, long );
 long syck_io_str_read( char *, SyckIoStr *, long, long );
 char *syck_base64enc( char *, long );
 char *syck_base64dec( char *, long );
-SyckEmitter *syck_new_emitter(void);
+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 *, const char *, long );
-void syck_emitter_escape( SyckEmitter *, const char *, long );
+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 *, const char *, enum scalar_style, int, int, char, const char *, long );
-void syck_emit_1quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_2quoted( SyckEmitter *, int, const char *, long );
-void syck_emit_folded( SyckEmitter *, int, char, const char *, long );
-void syck_emit_literal( SyckEmitter *, char, const char *, long );
-void syck_emit_seq( SyckEmitter *, const char *, enum seq_style );
+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 *, const char *, enum map_style );
+void syck_emit_map( SyckEmitter *, char *, enum map_style );
 void syck_emit_end( SyckEmitter * );
-void syck_emit_tag( SyckEmitter *, const char *, const char * );
+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);
+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, const char *, long );
+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 );
@@ -407,20 +411,20 @@ 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 *, const char * );
+void syck_default_error_handler( SyckParser *, char * );
 SYMID syck_yaml2byte_handler( SyckParser *, SyckNode * );
 char *syck_yaml2byte( char * );
 
 /*
  * Allocation prototypes
  */
-SyckNode *syck_alloc_map(void);
-SyckNode *syck_alloc_seq(void);
-SyckNode *syck_alloc_str(void);
+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( const char *, enum scalar_style );
-SyckNode *syck_new_str2( const char *, long, enum scalar_style );
+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 * );
@@ -442,7 +446,7 @@ long syck_seq_count( SyckNode * );
 /*
  * Lexer prototypes
  */
-void syckerror( const char * );
+void syckerror( char * );
 int syckparse( void * );
 union YYSTYPE;
 int sycklex( union YYSTYPE *, SyckParser * );
diff --git a/ext/syck/token.c b/ext/syck/token.c
index 1b26e66bdb..3c6cd1a9cf 100644
--- a/ext/syck/token.c
+++ b/ext/syck/token.c
@@ -4,10 +4,11 @@
  * token.re
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff
  */
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include "syck.h"
 #include "gram.h"
 
@@ -1116,7 +1117,7 @@ Directive:
 #line 1117 "<stdout>"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept = 0;
+	unsigned int yyaccept;
 	goto yy94;
 	++YYCURSOR;
 yy94:
@@ -2713,7 +2714,7 @@ syckwrap()
 }
 
 void 
-syckerror( const char *msg )
+syckerror( char *msg )
 {
     if ( syck_parser_ptr->error_handler == NULL )
         syck_parser_ptr->error_handler = syck_default_error_handler;
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 1b1ce26c49..821a3cd5b5 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -2,13 +2,14 @@
  * yaml2byte.c
  *
  * $Author$
+ * $Date$
  *
  * Copyright (C) 2003 why the lucky stiff, clark evans
  *
  *   WARNING WARNING WARNING  --- THIS IS *NOT JUST* PLAYING
  *   ANYMORE! -- WHY HAS EMBRACED THIS AS THE REAL THING!
  */ 
-#include "ruby/ruby.h"
+#include "ruby.h"
 #include <syck.h>
 #include <assert.h>
 #define YAMLBYTE_UTF8
@@ -34,7 +35,7 @@ typedef struct {
    long remaining;
    int  printed;
 } bytestring_t;
-bytestring_t *bytestring_alloc(void) {
+bytestring_t *bytestring_alloc() {
     bytestring_t *ret; 
     /*TRACE0("bytestring_alloc()");*/
     ret = S_ALLOC(bytestring_t);
@@ -128,7 +129,6 @@ syck_yaml2byte_handler(p, n)
     char *finish;
     bytestring_t *val = NULL;
     bytestring_t *sav = NULL;
-    void *data;
     /*TRACE0("syck_yaml2byte_handler()");*/
     val = bytestring_alloc();
     if(n->anchor) bytestring_append(val,YAMLBYTE_ANCHOR, n->anchor, NULL);
@@ -189,7 +189,7 @@ syck_yaml2byte_handler(p, n)
             for ( i = 0; i < n->data.list->idx; i++ )
             {
                 oid = syck_seq_read( n, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
+                syck_lookup_sym( p, oid, (char **)&sav );
                 bytestring_extend(val, sav);
             }
             bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -199,10 +199,10 @@ syck_yaml2byte_handler(p, n)
             for ( i = 0; i < n->data.pairs->idx; i++ )
             {
                 oid = syck_map_read( n, map_key, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
+                syck_lookup_sym( p, oid, (char **)&sav );
                 bytestring_extend(val, sav);
                 oid = syck_map_read( n, map_value, i );
-                if (syck_lookup_sym( p, oid, &data )) sav = data;
+                syck_lookup_sym( p, oid, (char **)&sav );
                 bytestring_extend(val, sav);
             }
             bytestring_append(val,YAMLBYTE_END_BRANCH,NULL,NULL);
@@ -218,8 +218,7 @@ syck_yaml2byte(char *yamlstr)
 {
     SYMID oid;
     char *ret;
-    bytestring_t *sav;
-    void *data;
+    bytestring_t *sav; 
 
     SyckParser *parser = syck_new_parser();
     syck_parser_str_auto( parser, yamlstr, NULL );
@@ -229,8 +228,7 @@ syck_yaml2byte(char *yamlstr)
     syck_parser_taguri_expansion( parser, 1 );
     oid = syck_parse( parser );
 
-    if ( syck_lookup_sym( parser, oid, &data ) ) {
-	sav = data;
+    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" );
diff --git a/ext/syslog/.cvsignore b/ext/syslog/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/syslog/.cvsignore
+++ b/ext/syslog/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 4503e35461..ecc49318f7 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -7,8 +7,8 @@
  * $Id$
  */
 
-#include "ruby/ruby.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "util.h"
 #include <syslog.h>
 
 /* Syslog class */
@@ -33,7 +33,7 @@ static void syslog_write(int pri, int argc, VALUE *argv)
 
     str = rb_f_sprintf(argc, argv);
 
-    syslog(pri, "%s", RSTRING_PTR(str));
+    syslog(pri, "%s", RSTRING(str)->ptr);
 }
 
 /* Syslog module methods */
@@ -72,7 +72,7 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self)
 #else
     Check_SafeStr(ident);
 #endif
-    syslog_ident = strdup(RSTRING_PTR(ident));
+    syslog_ident = strdup(RSTRING(ident)->ptr);
 
     if (NIL_P(opt)) {
 	syslog_options = LOG_PID | LOG_CONS;
diff --git a/ext/thread/extconf.rb b/ext/thread/extconf.rb
new file mode 100644
index 0000000000..2f984efc6d
--- /dev/null
+++ b/ext/thread/extconf.rb
@@ -0,0 +1,9 @@
+require 'mkmf'
+
+enable_config('fastthread', true) or exit
+
+if with_config('mem-pools', true)
+  $CPPFLAGS << ' -DUSE_MEM_POOLS'
+end
+
+create_makefile("thread")
diff --git a/ext/thread/lib/thread.rb b/ext/thread/lib/thread.rb
new file mode 100644
index 0000000000..6c533aba39
--- /dev/null
+++ b/ext/thread/lib/thread.rb
@@ -0,0 +1,5 @@
+unless defined? Thread
+  fail "Thread not available for this ruby interpreter"
+end
+
+require 'thread.so'
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
new file mode 100644
index 0000000000..68f172220a
--- /dev/null
+++ b/ext/thread/thread.c
@@ -0,0 +1,1182 @@
+/*
+ * Optimized Ruby Mutex implementation, loosely based on thread.rb by
+ * Yukihiro Matsumoto <matz@ruby-lang.org>
+ *
+ *  Copyright 2006-2007  MenTaLguY <mental@rydia.net>
+ *
+ * RDoc taken from original.
+ *
+ * This file is made available under the same terms as Ruby.
+ */
+
+#include <ruby.h>
+#include <intern.h>
+#include <rubysig.h>
+
+static VALUE rb_cMutex;
+static VALUE rb_cConditionVariable;
+static VALUE rb_cQueue;
+static VALUE rb_cSizedQueue;
+
+static VALUE set_critical(VALUE value);
+
+static VALUE
+thread_exclusive(VALUE (*func)(ANYARGS), VALUE arg)
+{
+    VALUE critical = rb_thread_critical;
+
+    rb_thread_critical = 1;
+    return rb_ensure(func, arg, set_critical, (VALUE)critical);
+}
+
+/*
+ *  call-seq:
+ *     Thread.exclusive { block }   => obj
+ *  
+ *  Wraps a block in Thread.critical, restoring the original value
+ *  upon exit from the critical section, and returns the value of the
+ *  block.
+ */
+
+static VALUE
+rb_thread_exclusive(void)
+{
+    return thread_exclusive(rb_yield, Qundef);
+}
+
+typedef struct _Entry {
+    VALUE value;
+    struct _Entry *next;
+} Entry;
+
+typedef struct _List {
+    Entry *entries;
+    Entry *last_entry;
+    Entry *entry_pool;
+    unsigned long size;
+} List;
+
+static void
+init_list(List *list)
+{
+    list->entries = NULL;
+    list->last_entry = NULL;
+    list->entry_pool = NULL;
+    list->size = 0;
+}
+
+static void
+mark_list(List *list)
+{
+    Entry *entry;
+    for (entry = list->entries; entry; entry = entry->next) {
+        rb_gc_mark(entry->value);
+    }
+}
+
+static void
+free_entries(Entry *first)
+{
+    Entry *next;
+    while (first) {
+        next = first->next;
+        xfree(first);
+        first = next;
+    }
+}
+
+static void
+finalize_list(List *list)
+{
+    free_entries(list->entries);
+    free_entries(list->entry_pool);
+}
+
+static void
+push_list(List *list, VALUE value)
+{
+    Entry *entry;
+
+    if (list->entry_pool) {
+        entry = list->entry_pool;
+        list->entry_pool = entry->next;
+    } else {
+        entry = ALLOC(Entry);
+    }
+
+    entry->value = value;
+    entry->next = NULL;
+
+    if (list->last_entry) {
+        list->last_entry->next = entry;
+    } else {
+        list->entries = entry;
+    }
+    list->last_entry = entry;
+
+    ++list->size;
+}
+
+static void
+push_multiple_list(List *list, VALUE *values, unsigned count)
+{
+    unsigned i;
+    for (i = 0; i < count; i++) {
+        push_list(list, values[i]);
+    }
+}
+
+static void
+recycle_entries(List *list, Entry *first_entry, Entry *last_entry)
+{
+#ifdef USE_MEM_POOLS
+    last_entry->next = list->entry_pool;
+    list->entry_pool = first_entry;
+#else
+    last_entry->next = NULL;
+    free_entries(first_entry);
+#endif
+}
+
+static VALUE
+shift_list(List *list)
+{
+    Entry *entry;
+    VALUE value;
+
+    entry = list->entries;
+    if (!entry) return Qnil;
+
+    list->entries = entry->next;
+    if (entry == list->last_entry) {
+        list->last_entry = NULL;
+    }
+
+    --list->size;
+
+    value = entry->value;
+    recycle_entries(list, entry, entry);
+
+    return value;
+}
+
+static void
+remove_one(List *list, VALUE value)
+{
+    Entry **ref;
+    Entry *prev;
+    Entry *entry;
+
+    for (ref = &list->entries, prev = NULL, entry = list->entries;
+              entry != NULL;
+              ref = &entry->next, prev = entry, entry = entry->next) {
+        if (entry->value == value) {
+            *ref = entry->next;
+            list->size--;
+            if (!entry->next) {
+                list->last_entry = prev;
+            }
+            recycle_entries(list, entry, entry);
+            break;
+        }
+    }
+}
+
+static void
+clear_list(List *list)
+{
+    if (list->last_entry) {
+        recycle_entries(list, list->entries, list->last_entry);
+        list->entries = NULL;
+        list->last_entry = NULL;
+        list->size = 0;
+    }
+}
+
+static VALUE
+array_from_list(List const *list)
+{
+    VALUE ary;
+    Entry *entry;
+    ary = rb_ary_new();
+    for (entry = list->entries; entry; entry = entry->next) {
+        rb_ary_push(ary, entry->value);
+    }
+    return ary;
+}
+
+static VALUE
+wake_thread(VALUE thread)
+{
+    return rb_thread_wakeup_alive(thread);
+}
+
+static VALUE
+run_thread(VALUE thread)
+{
+    thread = wake_thread(thread);
+    if (RTEST(thread) && !rb_thread_critical)
+	rb_thread_schedule();
+    return thread;
+}
+
+static VALUE
+wake_one(List *list)
+{
+    VALUE waking;
+
+    waking = Qnil;
+    while (list->entries && !RTEST(waking)) {
+	waking = wake_thread(shift_list(list));
+    }
+
+    return waking;
+}
+
+static VALUE
+wake_all(List *list)
+{
+    while (list->entries) {
+        wake_one(list);
+    }
+    return Qnil;
+}
+
+static VALUE
+wait_list_inner(List *list)
+{
+    push_list(list, rb_thread_current());
+    rb_thread_stop();
+    return Qnil;
+}
+
+static VALUE
+wait_list_cleanup(List *list)
+{
+    /* cleanup in case of spurious wakeups */
+    remove_one(list, rb_thread_current());
+    return Qnil;
+}
+
+static VALUE
+wait_list(List *list)
+{
+    return rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
+}
+
+static void
+kill_waiting_threads(List *waiting)
+{
+    Entry *entry;
+
+    for (entry = waiting->entries; entry; entry = entry->next) {
+	rb_thread_kill(entry->value);
+    }
+}
+
+/*
+ * Document-class: Mutex
+ *
+ * Mutex implements a simple semaphore that can be used to coordinate access to
+ * shared data from multiple concurrent threads.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *   semaphore = Mutex.new
+ *
+ *   a = Thread.new {
+ *     semaphore.synchronize {
+ *       # access shared resource
+ *     }
+ *   }
+ *
+ *   b = Thread.new {
+ *     semaphore.synchronize {
+ *       # access shared resource
+ *     }
+ *   }
+ *
+ */
+
+typedef struct _Mutex {
+    VALUE owner;
+    List waiting;
+} Mutex;
+
+#define MUTEX_LOCKED_P(mutex) (RTEST((mutex)->owner) && rb_thread_alive_p((mutex)->owner))
+
+static void
+mark_mutex(Mutex *mutex)
+{
+    rb_gc_mark(mutex->owner);
+    mark_list(&mutex->waiting);
+}
+
+static void
+finalize_mutex(Mutex *mutex)
+{
+    finalize_list(&mutex->waiting);
+}
+
+static void
+free_mutex(Mutex *mutex)
+{
+    kill_waiting_threads(&mutex->waiting);
+    finalize_mutex(mutex);
+    xfree(mutex);
+}
+
+static void
+init_mutex(Mutex *mutex)
+{
+    mutex->owner = Qnil;
+    init_list(&mutex->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: Mutex.new
+ * 
+ * Creates a new Mutex
+ *
+ */
+
+static VALUE 
+rb_mutex_alloc(VALUE klass)
+{
+    Mutex *mutex;
+    mutex = ALLOC(Mutex);
+    init_mutex(mutex);
+    return Data_Wrap_Struct(klass, mark_mutex, free_mutex, mutex);
+}
+
+/*
+ * Document-method: locked?
+ * call-seq: locked?
+ *
+ * Returns +true+ if this lock is currently held by some thread.
+ *
+ */
+
+static VALUE
+rb_mutex_locked_p(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+    return MUTEX_LOCKED_P(mutex) ? Qtrue : Qfalse;
+}
+
+/*
+ * Document-method: try_lock
+ * call-seq: try_lock
+ *
+ * Attempts to obtain the lock and returns immediately. Returns +true+ if the
+ * lock was granted.
+ *
+ */
+
+static VALUE
+rb_mutex_try_lock(VALUE self)
+{
+    Mutex *mutex;
+
+    Data_Get_Struct(self, Mutex, mutex);
+
+    if (MUTEX_LOCKED_P(mutex))
+        return Qfalse;
+
+    mutex->owner = rb_thread_current();
+    return Qtrue;
+}
+
+/*
+ * Document-method: lock
+ * call-seq: lock
+ *
+ * Attempts to grab the lock and waits if it isn't available.
+ *
+ */
+
+static VALUE
+lock_mutex(Mutex *mutex)
+{
+    VALUE current;
+    current = rb_thread_current();
+
+    rb_thread_critical = 1;
+
+    if (!MUTEX_LOCKED_P(mutex)) {
+	mutex->owner = current;
+    }
+    else {
+	do {
+	    wait_list(&mutex->waiting);
+	    rb_thread_critical = 1;
+	    if (!MUTEX_LOCKED_P(mutex)) {
+		mutex->owner = current;
+		break;
+	    }
+	} while (mutex->owner != current);
+    }
+
+    rb_thread_critical = 0;
+    return Qnil;
+}
+
+static VALUE
+rb_mutex_lock(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+    lock_mutex(mutex);
+    return self;
+}
+
+/*
+ * Document-method: unlock
+ *
+ * Releases the lock. Returns +nil+ if ref wasn't locked.
+ *
+ */
+
+static VALUE
+unlock_mutex_inner(Mutex *mutex)
+{
+    VALUE waking;
+
+    if (mutex->owner != rb_thread_current()) {
+	rb_raise(rb_eThreadError, "not owner");
+    }
+
+    waking = wake_one(&mutex->waiting);
+    mutex->owner = waking;
+
+    return waking;
+}
+
+static VALUE
+set_critical(VALUE value)
+{
+    rb_thread_critical = (int)value;
+    return Qundef;
+}
+
+static VALUE
+unlock_mutex(Mutex *mutex)
+{
+    VALUE waking = thread_exclusive(unlock_mutex_inner, (VALUE)mutex);
+
+    if (!RTEST(waking)) {
+        return Qfalse;
+    }
+
+    run_thread(waking);
+
+    return Qtrue;
+}
+
+static VALUE
+rb_mutex_unlock(VALUE self)
+{
+    Mutex *mutex;
+    Data_Get_Struct(self, Mutex, mutex);
+
+    if (RTEST(unlock_mutex(mutex))) {
+        return self;
+    } else {
+        return Qnil;
+    }
+}
+
+/*
+ * Document-method: exclusive_unlock
+ * call-seq: exclusive_unlock { ... }
+ *
+ * If the mutex is locked, unlocks the mutex, wakes one waiting thread, and
+ * yields in a critical section.
+ *
+ */
+
+static VALUE
+rb_mutex_exclusive_unlock_inner(Mutex *mutex)
+{
+    VALUE waking;
+    waking = unlock_mutex_inner(mutex);
+    rb_yield(Qundef);
+    return waking;
+}
+
+static VALUE
+rb_mutex_exclusive_unlock(VALUE self)
+{
+    Mutex *mutex;
+    VALUE waking;
+    Data_Get_Struct(self, Mutex, mutex);
+
+    waking = thread_exclusive(rb_mutex_exclusive_unlock_inner, (VALUE)mutex);
+
+    if (!RTEST(waking)) {
+        return Qnil;
+    }
+
+    run_thread(waking);
+
+    return self;
+}
+
+/*
+ * Document-method: synchronize
+ * call-seq: synchronize { ... }
+ *
+ * Obtains a lock, runs the block, and releases the lock when the block
+ * completes.  See the example under Mutex.
+ *
+ */
+
+static VALUE
+rb_mutex_synchronize(VALUE self)
+{
+    rb_mutex_lock(self);
+    return rb_ensure(rb_yield, Qundef, rb_mutex_unlock, self);
+}
+
+/*
+ * Document-class: ConditionVariable
+ *
+ * ConditionVariable objects augment class Mutex. Using condition variables,
+ * it is possible to suspend while in the middle of a critical section until a
+ * resource becomes available.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *
+ *   mutex = Mutex.new
+ *   resource = ConditionVariable.new
+ *
+ *   a = Thread.new {
+ *     mutex.synchronize {
+ *       # Thread 'a' now needs the resource
+ *       resource.wait(mutex)
+ *       # 'a' can now have the resource
+ *     }
+ *   }
+ *
+ *   b = Thread.new {
+ *     mutex.synchronize {
+ *       # Thread 'b' has finished using the resource
+ *       resource.signal
+ *     }
+ *   }
+ *
+ */
+
+typedef struct _ConditionVariable {
+    List waiting;
+} ConditionVariable;
+
+static void
+mark_condvar(ConditionVariable *condvar)
+{
+    mark_list(&condvar->waiting);
+}
+
+static void
+finalize_condvar(ConditionVariable *condvar)
+{
+    finalize_list(&condvar->waiting);
+}
+
+static void
+free_condvar(ConditionVariable *condvar)
+{
+    kill_waiting_threads(&condvar->waiting);
+    finalize_condvar(condvar);
+    xfree(condvar);
+}
+
+static void
+init_condvar(ConditionVariable *condvar)
+{
+    init_list(&condvar->waiting);
+}
+
+/*
+ * Document-method: new
+ * call-seq: ConditionVariable.new
+ *
+ * Creates a new ConditionVariable
+ *
+ */
+
+static VALUE
+rb_condvar_alloc(VALUE klass)
+{
+    ConditionVariable *condvar;
+
+    condvar = ALLOC(ConditionVariable);
+    init_condvar(condvar);
+
+    return Data_Wrap_Struct(klass, mark_condvar, free_condvar, condvar);
+}
+
+/*
+ * Document-method: wait
+ * call-seq: wait
+ *
+ * Releases the lock held in +mutex+ and waits; reacquires the lock on wakeup.
+ *
+ */
+
+static void
+wait_condvar(ConditionVariable *condvar, Mutex *mutex)
+{
+    VALUE waking;
+
+    rb_thread_critical = 1;
+    if (rb_thread_current() != mutex->owner) {
+        rb_thread_critical = 0;
+        rb_raise(rb_eThreadError, "not owner of the synchronization mutex");
+    }
+    waking = unlock_mutex_inner(mutex);
+    if (RTEST(waking)) {
+	wake_thread(waking);
+    }
+    rb_ensure(wait_list, (VALUE)&condvar->waiting, lock_mutex, (VALUE)mutex);
+}
+
+static VALUE
+legacy_exclusive_unlock(VALUE mutex)
+{
+    return rb_funcall(mutex, rb_intern("exclusive_unlock"), 0);
+}
+
+typedef struct {
+    ConditionVariable *condvar;
+    VALUE mutex;
+} legacy_wait_args;
+
+static VALUE
+legacy_wait(VALUE unused, legacy_wait_args *args)
+{
+    wait_list(&args->condvar->waiting);
+    rb_funcall(args->mutex, rb_intern("lock"), 0);
+    return Qnil;
+}
+
+static VALUE
+rb_condvar_wait(VALUE self, VALUE mutex_v)
+{
+    ConditionVariable *condvar;
+    Data_Get_Struct(self, ConditionVariable, condvar);
+
+    if (CLASS_OF(mutex_v) != rb_cMutex) {
+        /* interoperate with legacy mutex */
+        legacy_wait_args args;
+        args.condvar = condvar;
+        args.mutex = mutex_v;
+        rb_iterate(legacy_exclusive_unlock, mutex_v, legacy_wait, (VALUE)&args);
+    } else {
+        Mutex *mutex;
+        Data_Get_Struct(mutex_v, Mutex, mutex);
+        wait_condvar(condvar, mutex);
+    }
+
+    return self;
+}
+
+/*
+ * Document-method: broadcast
+ * call-seq: broadcast
+ *
+ * Wakes up all threads waiting for this condition.
+ *
+ */
+
+static VALUE
+rb_condvar_broadcast(VALUE self)
+{
+    ConditionVariable *condvar;
+
+    Data_Get_Struct(self, ConditionVariable, condvar);
+  
+    thread_exclusive(wake_all, (VALUE)&condvar->waiting);
+    rb_thread_schedule();
+
+    return self;
+}
+
+/*
+ * Document-method: signal
+ * call-seq: signal
+ *
+ * Wakes up the first thread in line waiting for this condition.
+ *
+ */
+
+static void
+signal_condvar(ConditionVariable *condvar)
+{
+    VALUE waking = thread_exclusive(wake_one, (VALUE)&condvar->waiting);
+
+    if (RTEST(waking)) {
+        run_thread(waking);
+    }
+}
+
+static VALUE
+rb_condvar_signal(VALUE self)
+{
+    ConditionVariable *condvar;
+    Data_Get_Struct(self, ConditionVariable, condvar);
+    signal_condvar(condvar);
+    return self;
+}
+
+/*
+ * Document-class: Queue
+ *
+ * This class provides a way to synchronize communication between threads.
+ *
+ * Example:
+ *
+ *   require 'thread'
+ *
+ *   queue = Queue.new
+ *
+ *   producer = Thread.new do
+ *     5.times do |i|
+ *       sleep rand(i) # simulate expense
+ *       queue << i
+ *       puts "#{i} produced"
+ *     end
+ *   end
+ *
+ *   consumer = Thread.new do
+ *     5.times do |i|
+ *       value = queue.pop
+ *       sleep rand(i/2) # simulate expense
+ *       puts "consumed #{value}"
+ *     end
+ *   end
+ *
+ *   consumer.join
+ *
+ */
+
+typedef struct _Queue {
+    Mutex mutex;
+    ConditionVariable value_available;
+    ConditionVariable space_available;
+    List values;
+    unsigned long capacity;
+} Queue;
+
+static void
+mark_queue(Queue *queue)
+{
+    mark_mutex(&queue->mutex);
+    mark_condvar(&queue->value_available);
+    mark_condvar(&queue->space_available);
+    mark_list(&queue->values);
+}
+
+static void
+finalize_queue(Queue *queue)
+{
+    finalize_mutex(&queue->mutex);
+    finalize_condvar(&queue->value_available);
+    finalize_condvar(&queue->space_available);
+    finalize_list(&queue->values);
+}
+
+static void
+free_queue(Queue *queue)
+{
+    kill_waiting_threads(&queue->mutex.waiting);
+    kill_waiting_threads(&queue->space_available.waiting);
+    kill_waiting_threads(&queue->value_available.waiting);
+    finalize_queue(queue);
+    xfree(queue);
+}
+
+static void
+init_queue(Queue *queue)
+{
+    init_mutex(&queue->mutex);
+    init_condvar(&queue->value_available);
+    init_condvar(&queue->space_available);
+    init_list(&queue->values);
+    queue->capacity = 0;
+}
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a new queue.
+ *
+ */
+
+static VALUE
+rb_queue_alloc(VALUE klass)
+{
+    Queue *queue;
+    queue = ALLOC(Queue);
+    init_queue(queue);
+    return Data_Wrap_Struct(klass, mark_queue, free_queue, queue);
+}
+
+static VALUE
+rb_queue_marshal_load(VALUE self, VALUE data)
+{
+    Queue *queue;
+    VALUE array;
+    Data_Get_Struct(self, Queue, queue);
+
+    array = rb_marshal_load(data);
+    if (TYPE(array) != T_ARRAY) {
+	rb_raise(rb_eTypeError, "expected Array of queue data");
+    }
+    if (RARRAY(array)->len < 1) {
+	rb_raise(rb_eArgError, "missing capacity value");
+    }
+    queue->capacity = NUM2ULONG(rb_ary_shift(array));
+    push_multiple_list(&queue->values, RARRAY(array)->ptr, (unsigned)RARRAY(array)->len);
+
+    return self;
+}
+
+static VALUE
+rb_queue_marshal_dump(VALUE self)
+{
+    Queue *queue;
+    VALUE array;
+    Data_Get_Struct(self, Queue, queue);
+
+    array = array_from_list(&queue->values);
+    rb_ary_unshift(array, ULONG2NUM(queue->capacity));
+    return rb_marshal_dump(array, Qnil);
+}
+
+/*
+ * Document-method: clear
+ * call-seq: clear
+ *
+ * Removes all objects from the queue.
+ *
+ */
+
+static VALUE
+rb_queue_clear(VALUE self)
+{
+    Queue *queue;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    clear_list(&queue->values);
+    signal_condvar(&queue->space_available);
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-method: empty?
+ * call-seq: empty?
+ *
+ * Returns +true+ if the queue is empty.
+ *
+ */
+
+static VALUE
+rb_queue_empty_p(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = queue->values.size == 0 ? Qtrue : Qfalse;
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: length
+ * call-seq: length
+ *
+ * Returns the length of the queue.
+ *
+ */
+
+static VALUE
+rb_queue_length(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->values.size);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: num_waiting
+ * call-seq: num_waiting
+ *
+ * Returns the number of threads waiting on the queue.
+ *
+ */
+
+static VALUE
+rb_queue_num_waiting(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->value_available.waiting.size +
+      queue->space_available.waiting.size);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: pop
+ * call_seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue.  If the queue is empty, the calling thread is
+ * suspended until data is pushed onto the queue.  If +non_block+ is true, the
+ * thread isn't suspended, and an exception is raised.
+ *
+ */
+
+static VALUE
+rb_queue_pop(int argc, VALUE *argv, VALUE self)
+{
+    Queue *queue;
+    int should_block;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    if (argc == 0) {
+        should_block = 1;
+    } else if (argc == 1) {
+        should_block = !RTEST(argv[0]);
+    } else {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+
+    lock_mutex(&queue->mutex);
+    if (!queue->values.entries && !should_block) {
+        unlock_mutex(&queue->mutex);
+        rb_raise(rb_eThreadError, "queue empty");
+    }
+
+    while (!queue->values.entries) {
+        wait_condvar(&queue->value_available, &queue->mutex);
+    }
+
+    result = shift_list(&queue->values);
+    if (queue->capacity && queue->values.size < queue->capacity) {
+        signal_condvar(&queue->space_available);
+    }
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue.
+ *
+ */
+
+static VALUE
+rb_queue_push(VALUE self, VALUE value)
+{
+    Queue *queue;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    while (queue->capacity && queue->values.size >= queue->capacity) {
+        wait_condvar(&queue->space_available, &queue->mutex);
+    }
+    push_list(&queue->values, value);
+    signal_condvar(&queue->value_available);
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-class: SizedQueue
+ *
+ * This class represents queues of specified size capacity.  The push operation
+ * may be blocked if the capacity is full.
+ *
+ * See Queue for an example of how a SizedQueue works.
+ *
+ */
+
+/*
+ * Document-method: new
+ * call-seq: new
+ *
+ * Creates a fixed-length queue with a maximum size of +max+.
+ *
+ */
+
+/*
+ * Document-method: max
+ * call-seq: max
+ *
+ * Returns the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max(VALUE self)
+{
+    Queue *queue;
+    VALUE result;
+    Data_Get_Struct(self, Queue, queue);
+
+    lock_mutex(&queue->mutex);
+    result = ULONG2NUM(queue->capacity);
+    unlock_mutex(&queue->mutex);
+
+    return result;
+}
+
+/*
+ * Document-method: max=
+ * call-seq: max=(size)
+ *
+ * Sets the maximum size of the queue.
+ *
+ */
+
+static VALUE
+rb_sized_queue_max_set(VALUE self, VALUE value)
+{
+    Queue *queue;
+    unsigned long new_capacity;
+    unsigned long difference;
+    Data_Get_Struct(self, Queue, queue);
+
+    new_capacity = NUM2ULONG(value);
+
+    if (new_capacity < 1) {
+        rb_raise(rb_eArgError, "value must be positive");
+    }
+
+    lock_mutex(&queue->mutex);
+    if (queue->capacity && new_capacity > queue->capacity) {
+        difference = new_capacity - queue->capacity;
+    } else {
+        difference = 0;
+    }
+    queue->capacity = new_capacity;
+    for (; difference > 0; --difference) {
+        signal_condvar(&queue->space_available);
+    }
+    unlock_mutex(&queue->mutex);
+
+    return self;
+}
+
+/*
+ * Document-method: push
+ * call-seq: push(obj)
+ *
+ * Pushes +obj+ to the queue.  If there is no space left in the queue, waits
+ * until space becomes available.
+ *
+ */
+
+/*
+ * Document-method: pop
+ * call-seq: pop(non_block=false)
+ *
+ * Retrieves data from the queue and runs a waiting thread, if any.
+ *
+ */
+
+/* for marshalling mutexes and condvars */
+
+static VALUE
+dummy_load(VALUE self, VALUE string)
+{
+    return Qnil;
+}
+
+static VALUE
+dummy_dump(VALUE self)
+{
+    return rb_str_new2("");
+}
+
+void
+Init_thread(void)
+{
+    rb_define_singleton_method(rb_cThread, "exclusive", rb_thread_exclusive, 0);
+
+    rb_cMutex = rb_define_class("Mutex", rb_cObject);
+    rb_define_alloc_func(rb_cMutex, rb_mutex_alloc);
+    rb_define_method(rb_cMutex, "marshal_load", dummy_load, 1);
+    rb_define_method(rb_cMutex, "marshal_dump", dummy_dump, 0);
+    rb_define_method(rb_cMutex, "locked?", rb_mutex_locked_p, 0);
+    rb_define_method(rb_cMutex, "try_lock", rb_mutex_try_lock, 0);
+    rb_define_method(rb_cMutex, "lock", rb_mutex_lock, 0);
+    rb_define_method(rb_cMutex, "unlock", rb_mutex_unlock, 0);
+    rb_define_method(rb_cMutex, "exclusive_unlock", rb_mutex_exclusive_unlock, 0);
+    rb_define_method(rb_cMutex, "synchronize", rb_mutex_synchronize, 0);
+
+    rb_cConditionVariable = rb_define_class("ConditionVariable", rb_cObject);
+    rb_define_alloc_func(rb_cConditionVariable, rb_condvar_alloc);
+    rb_define_method(rb_cConditionVariable, "marshal_load", dummy_load, 1);
+    rb_define_method(rb_cConditionVariable, "marshal_dump", dummy_dump, 0);
+    rb_define_method(rb_cConditionVariable, "wait", rb_condvar_wait, 1);
+    rb_define_method(rb_cConditionVariable, "broadcast", rb_condvar_broadcast, 0);
+    rb_define_method(rb_cConditionVariable, "signal", rb_condvar_signal, 0);
+
+    rb_cQueue = rb_define_class("Queue", rb_cObject);
+    rb_define_alloc_func(rb_cQueue, rb_queue_alloc);
+    rb_define_method(rb_cQueue, "marshal_load", rb_queue_marshal_load, 1);
+    rb_define_method(rb_cQueue, "marshal_dump", rb_queue_marshal_dump, 0);
+    rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
+    rb_define_method(rb_cQueue, "empty?", rb_queue_empty_p, 0);
+    rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
+    rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+    rb_define_method(rb_cQueue, "pop", rb_queue_pop, -1);
+    rb_define_method(rb_cQueue, "push", rb_queue_push, 1);
+    rb_alias(rb_cQueue, rb_intern("enq"), rb_intern("push"));
+    rb_alias(rb_cQueue, rb_intern("<<"), rb_intern("push"));
+    rb_alias(rb_cQueue, rb_intern("deq"), rb_intern("pop"));
+    rb_alias(rb_cQueue, rb_intern("shift"), rb_intern("pop"));
+    rb_alias(rb_cQueue, rb_intern("size"), rb_intern("length"));
+
+    rb_cSizedQueue = rb_define_class("SizedQueue", rb_cQueue);
+    rb_define_method(rb_cSizedQueue, "initialize", rb_sized_queue_max_set, 1);
+    rb_define_method(rb_cSizedQueue, "num_waiting", rb_queue_num_waiting, 0);
+    rb_define_method(rb_cSizedQueue, "pop", rb_queue_pop, -1);
+    rb_define_method(rb_cSizedQueue, "push", rb_queue_push, 1);
+    rb_define_method(rb_cSizedQueue, "max", rb_sized_queue_max, 0);
+    rb_define_method(rb_cSizedQueue, "max=", rb_sized_queue_max_set, 1);
+    rb_alias(rb_cSizedQueue, rb_intern("enq"), rb_intern("push"));
+    rb_alias(rb_cSizedQueue, rb_intern("<<"), rb_intern("push"));
+    rb_alias(rb_cSizedQueue, rb_intern("deq"), rb_intern("pop"));
+    rb_alias(rb_cSizedQueue, rb_intern("shift"), rb_intern("pop"));
+}
+
diff --git a/ext/tk/.cvsignore b/ext/tk/.cvsignore
index 90c83ed9b1..44e7f262dc 100644
--- a/ext/tk/.cvsignore
+++ b/ext/tk/.cvsignore
@@ -1,3 +1,3 @@
 Makefile
+mkmf.log
 *.log
-*.def
diff --git a/ext/tk/depend b/ext/tk/depend
index f7ba3229c1..2cd9c400f7 100644
--- a/ext/tk/depend
+++ b/ext/tk/depend
@@ -1,2 +1,2 @@
-tcltklib.o: tcltklib.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
-stubs.o: stubs.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h stubs.h
+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/tk/extconf.rb b/ext/tk/extconf.rb
index be3781251e..4807ea7b40 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -2,15 +2,10 @@
 
 require 'mkmf'
 
+#is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
 is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM)
 #is_macosx = (/darwin/ =~ RUBY_PLATFORM)
 
-have_func("ruby_native_thread_p", "ruby.h")
-have_func("rb_errinfo", "ruby.h")
-have_func("rb_safe_level", "ruby.h")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-have_struct_member("struct RArray", "len", "ruby.h")
-
 def find_framework(tcl_hdr, tk_hdr)
   if framework_dir = with_config("tcltk-framework")
     paths = [framework_dir]
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
index 4bc89a8147..ec718678f0 100644
--- a/ext/tk/lib/multi-tk.rb
+++ b/ext/tk/lib/multi-tk.rb
@@ -28,13 +28,7 @@ class << TclTkIp
     if Thread.current.group != ThreadGroup::Default
       raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
     end
-    obj = __new__(*args)
-    obj.instance_eval{
-      @force_default_encoding ||= [false].taint
-      @encoding ||= [nil].taint
-      def @encoding.to_s; self.join(nil); end
-    }
-    obj
+    __new__(*args)
   end
 end
 
@@ -121,8 +115,7 @@ class MultiTkIp
   BASE_DIR = File.dirname(__FILE__)
 
   WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
-  WITH_ENCODING = defined?(::Encoding.default_external)
-  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+  WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
 
   (@@SLAVE_IP_ID = ['slave'.freeze, '0'.taint]).instance_eval{
     @mutex = Mutex.new
@@ -233,8 +226,8 @@ class MultiTkIp
     def call(*args)
       unless @ip.deleted?
         current = Thread.current
-        backup_ip = current[:callback_ip]
-        current[:callback_ip] = @ip
+        backup_ip = current['callback_ip']
+        current['callback_ip'] = @ip
         begin
           ret = @ip.cb_eval(@cmd, *args)
           fail ret if ret.kind_of?(Exception)
@@ -267,7 +260,7 @@ class MultiTkIp
             fail e
           end
         ensure
-          current[:callback_ip] = backup_ip
+          current['callback_ip'] = backup_ip
         end
       end
     end
@@ -760,23 +753,14 @@ class MultiTkIp
         current[:mutex] = mutex = Mutex.new
         current[:root_check] = cond_var = ConditionVariable.new
 
-        status = [nil]
-        def status.value
-          self[0]
-        end
-        def status.value=(val)
-          self[0] = val
-        end
-        current[:status] = status
-
         begin
-          current[:status].value = interp.mainloop(true)
+          current[:status] = interp.mainloop(true)
         rescue Exception=>e
-          current[:status].value = e
+          current[:status] = e
         ensure
           mutex.synchronize{ cond_var.broadcast }
         end
-        current[:status].value = interp.mainloop(false)
+        current[:status] = interp.mainloop(false)
       }
       until @interp_thread[:interp]
         Thread.pass
@@ -794,12 +778,6 @@ class MultiTkIp
       end
     end
 
-    @interp.instance_eval{
-      @force_default_encoding ||= [false].taint
-      @encoding ||= [nil].taint
-      def @encoding.to_s; self.join(nil); end
-    }
-
     @ip_name = nil
 
     @callback_status = [].taint
@@ -973,9 +951,8 @@ class MultiTkIp
       begin
         class << subclass
           self.methods.each{|m|
-            name = m.to_s
             begin
-              unless name == '__id__' || name == '__send__' || name == 'freeze'
+              unless m == '__id__' || m == '__send__' || m == 'freeze'
                 undef_method(m)
               end
             rescue Exception
@@ -1180,11 +1157,6 @@ class MultiTkIp
     # safe interpreter
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, true)
-    slave_ip.instance_eval{
-      @force_default_encoding ||= [false].taint
-      @encoding ||= [nil].taint
-      def @encoding.to_s; self.join(nil); end
-    }
     @slave_ip_tbl[ip_name] = slave_ip
     def slave_ip.safe_base?
       true
@@ -1227,11 +1199,6 @@ class MultiTkIp
 
     ip_name = _create_slave_ip_name
     slave_ip = @interp.create_slave(ip_name, false)
-    slave_ip.instance_eval{
-      @force_default_encoding ||= [false].taint
-      @encoding ||= [nil].taint
-      def @encoding.to_s; self.join(nil); end
-    }
     slave_ip._invoke('set', 'argv0', name) if name.kind_of?(String)
     slave_ip._invoke('set', 'argv', _keys2opts(keys))
     @interp._invoke('load', '', 'Tk', ip_name)
@@ -1301,21 +1268,9 @@ class MultiTkIp
       # create master-ip
       unless WITH_RUBY_VM
         @interp = TclTkIp.new(name, _keys2opts(tk_opts))
-        @interp.instance_eval{
-          @force_default_encoding ||= [false].taint
-          @encoding ||= [nil].taint
-          def @encoding.to_s; self.join(nil); end
-        }
-
       else ### Ruby 1.9 !!!!!!!!!!!
         @interp_thread = Thread.new{
           Thread.current[:interp] = interp = TclTkIp.new(name, _keys2opts(tk_opts))
-          interp.instance_eval{
-            @force_default_encoding ||= [false].taint
-            @encoding ||= [nil].taint
-            def @encoding.to_s; self.join(nil); end
-          }
-
           #sleep
           TclTkLib.mainloop(true)
         }
@@ -1445,8 +1400,8 @@ class MultiTkIp
 
   def self.__getip
     current = Thread.current
-    if TclTkLib.mainloop_thread? != false && current[:callback_ip]
-      return current[:callback_ip]
+    if TclTkLib.mainloop_thread? != false && current['callback_ip']
+      return current['callback_ip']
     end
     if current.group == ThreadGroup::Default
       @@DEFAULT_MASTER
@@ -2038,12 +1993,12 @@ class MultiTkIp
       cmd = args.shift
     end
     current = Thread.current
-    backup_ip = current[:callback_ip]
-    current[:callback_ip] = self
+    backup_ip = current['callback_ip']
+    current['callback_ip'] = self
     begin
       eval_proc_core(false, cmd, *args)
     ensure
-      current[:callback_ip] = backup_ip
+      current['callback_ip'] = backup_ip
     end
   end
 
@@ -2061,8 +2016,8 @@ class MultiTkIp
     if TclTkLib.mainloop_thread? == true
       # call from eventloop
       current = Thread.current
-      backup_ip = current[:callback_ip]
-      current[:callback_ip] = self
+      backup_ip = current['callback_ip']
+      current['callback_ip'] = self
       begin
         eval_proc_core(false, 
 	               proc{|safe, *params|
@@ -2070,7 +2025,7 @@ class MultiTkIp
                          cmd.call(*params)
                        }, *args)
       ensure
-        current[:callback_ip] = backup_ip
+        current['callback_ip'] = backup_ip
       end
     else
       eval_proc_core(true, 
@@ -2214,11 +2169,6 @@ end
 
 # event loop
 # all master/slave IPs are controled by only one event-loop
-class MultiTkIp
-  def self.default_master?
-    __getip == @@DEFAULT_MASTER
-  end
-end
 class << MultiTkIp
   def mainloop(check_root = true)
     __getip.mainloop(check_root)
@@ -3339,42 +3289,6 @@ class << MultiTkIp
   def encoding_table
     __getip.encoding_table
   end
-
-  def force_default_encoding=(mode)
-    __getip.force_default_encoding=(mode)
-  end
-
-  def force_default_encoding?
-    __getip.force_default_encoding?
-  end
-
-  def default_encoding=(enc)
-    __getip.default_encoding=(enc)
-  end
-
-  def encoding=(enc)
-    __getip.encoding=(enc)
-  end
-
-  def encoding_name
-    __getip.encoding_name
-  end
-
-  def encoding_obj
-    __getip.encoding_obj
-  end
-  alias encoding encoding_name
-  alias default_encoding encoding_name
-
-  def encoding_convertfrom(str, enc=None)
-    __getip.encoding_convertfrom(str, enc)
-  end
-  alias encoding_convert_from encoding_convertfrom
-
-  def encoding_convertto(str, enc=None)
-    __getip.encoding_convertto(str, enc)
-  end
-  alias encoding_convert_to encoding_convertto
 end
 class MultiTkIp
   def encoding_table
@@ -3425,48 +3339,20 @@ end
 
 
 # remove methods for security
-=begin
-class MultiTkIp
-  INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
-  INTERP_MUTEX  = INTERP_THREAD[:mutex]
-  INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
-
-  # undef_method :instance_eval
-  undef_method :instance_variable_get
-  undef_method :instance_variable_set
-end
-
-module TkCore
-  if MultiTkIp::WITH_RUBY_VM && 
-      ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
-    INTERP_THREAD = MultiTkIp::INTERP_THREAD
-    INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
-    INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
-  end
-end
-class MultiTkIp
-  remove_const(:INTERP_THREAD)
-  remove_const(:INTERP_MUTEX)
-  remove_const(:INTERP_ROOT_CHECK)
-end
-=end
 if MultiTkIp::WITH_RUBY_VM && 
     ! MultiTkIp::RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!!
   class MultiTkIp
     INTERP_THREAD = @@DEFAULT_MASTER.instance_variable_get('@interp_thread')
-    INTERP_THREAD_STATUS = INTERP_THREAD[:status]
     INTERP_MUTEX  = INTERP_THREAD[:mutex]
     INTERP_ROOT_CHECK = INTERP_THREAD[:root_check]
   end
   module TkCore
     INTERP_THREAD = MultiTkIp::INTERP_THREAD
-    INTERP_THREAD_STATUS = MultiTkIp::INTERP_THREAD_STATUS
     INTERP_MUTEX  = MultiTkIp::INTERP_MUTEX
     INTERP_ROOT_CHECK = MultiTkIp::INTERP_ROOT_CHECK
   end
   class MultiTkIp
     remove_const(:INTERP_THREAD)
-    remove_const(:INTERP_THREAD_STATUS)
     remove_const(:INTERP_MUTEX)
     remove_const(:INTERP_ROOT_CHECK)
   end
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
index f267900d53..70115a60aa 100644
--- a/ext/tk/lib/remote-tk.rb
+++ b/ext/tk/lib/remote-tk.rb
@@ -88,10 +88,6 @@ class RemoteTkIp
     @slave_ip_tbl = {}
     @slave_ip_top = {}
 
-    @force_default_encoding ||= [false].taint
-    @encoding ||= [nil].taint
-    def @encoding.to_s; self.join(nil); end
-
     @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?
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index c3401dfadb..c5d5b804d2 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -21,17 +21,6 @@ class TclTkIp
     # for RemoteTkIp
     ''
   end
-
-  alias __initialize__ initialize
-  private :__initialize__
-
-  def initialize(*args)
-    __initialize__(*args)
-
-    @force_default_encoding ||= [false].taint
-    @encoding ||= [nil].taint
-    def @encoding.to_s; self.join(nil); end
-  end
 end
 
 # define TkComm module (step 1: basic functions)
@@ -1110,8 +1099,7 @@ module TkCore
   extend TkComm
 
   WITH_RUBY_VM  = Object.const_defined?(:VM) && ::VM.class == Class
-  WITH_ENCODING = defined?(::Encoding.default_external) && true
-  #WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
+  WITH_ENCODING = Object.const_defined?(:Encoding) && ::Encoding.class == Class
 
   unless self.const_defined? :RUN_EVENTLOOP_ON_MAIN_THREAD
     ### Ruby 1.9 !!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1147,26 +1135,17 @@ module TkCore
           Thread.current[:interp] = e
           raise e
         end
-
-        status = [nil]
-        def status.value
-          self[0]
-        end
-        def status.value=(val)
-          self[0] = val
-        end
-
-        Thread.current[:status] = status
+        Thread.current[:status] = nil
         #sleep
 
         begin
-          Thread.current[:status].value = TclTkLib.mainloop(true)
+          Thread.current[:status] = TclTkLib.mainloop(true)
         rescue Exception=>e
-          Thread.current[:status].value = e
+          Thread.current[:status] = e
         ensure
           INTERP_MUTEX.synchronize{ INTERP_ROOT_CHECK.broadcast }
         end
-        Thread.current[:status].value = TclTkLib.mainloop(false)
+        Thread.current[:status] = TclTkLib.mainloop(false)
       }
 
       until INTERP_THREAD[:interp]
@@ -1176,15 +1155,11 @@ module TkCore
       raise INTERP_THREAD[:interp] if INTERP_THREAD[:interp].kind_of? Exception
 
       INTERP = INTERP_THREAD[:interp]
-      INTERP_THREAD_STATUS = INTERP_THREAD[:status]
     end
 
     def INTERP.__getip
       self
     end
-    def INTERP.default_master?
-      true
-    end
 
     INTERP.instance_eval{
       # @tk_cmd_tbl = {}.taint
@@ -1205,10 +1180,6 @@ module TkCore
       @init_ip_env  = [].taint  # table of Procs
       @add_tk_procs = [].taint  # table of [name, args, body]
 
-      @force_default_encoding ||= [false].taint
-      @encoding ||= [nil].taint
-      def @encoding.to_s; self.join(nil); end
-
       @cb_entry_class = Class.new(TkCallbackEntry){
         class << self
           def inspect
@@ -1674,19 +1645,14 @@ module TkCore
     if !TkCore::WITH_RUBY_VM || TkCore::RUN_EVENTLOOP_ON_MAIN_THREAD
       TclTkLib.mainloop(check_root)
     else ### Ruby 1.9 !!!!!
-      unless TkCore::INTERP.default_master?
-        # [MultiTkIp] slave interp ?
-        return TkCore::INTERP._thread_tkwait('window', '.') if check_root
-      end
-
       begin
         TclTkLib.set_eventloop_window_mode(true)
         if check_root
           INTERP_MUTEX.synchronize{
             INTERP_ROOT_CHECK.wait(INTERP_MUTEX)
-            status = INTERP_THREAD_STATUS.value
-            if status && TkCore::INTERP.default_master?
-              INTERP_THREAD_STATUS.value = nil if $SAFE < 4
+            status = INTERP_THREAD[:status]
+            if status
+              INTERP_THREAD[:status] = nil
               raise status if status.kind_of?(Exception)
             end
           }
@@ -2174,7 +2140,7 @@ module Tk
   end
 
   def Tk.exit
-    TkCore::INTERP.has_mainwindow? && tk_call_without_enc('destroy', '.')
+    tk_call_without_enc('destroy', '.')
   end
 
   ################################################
@@ -2526,8 +2492,7 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
         alias default_encoding encoding_name
 
         def tk_encoding_names
-          #TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
-          TkComm.simplelist(TkCore::INTERP._invoke_without_enc('encoding', 'names'))
+          TkComm.simplelist(TkCore::INTERP._invoke_without_enc(Tk::Encoding::ENCNAMES_CMD[0], Tk::Encoding::ENCNAMES_CMD[1]))
        end
         def encoding_names
           self.tk_encoding_names.find_all{|name|
@@ -2661,16 +2626,16 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
 
   class TclTkIp
     def force_default_encoding=(mode)
-      @force_default_encoding[0] = (mode)? true: false
+      @force_default_encoding = (mode)? true: false
     end
 
     def force_default_encoding?
-      @force_default_encoding[0] ||= false
+      @force_default_encoding ||= false
     end
 
     def default_encoding=(name)
-      name = name.name if Tk::WITH_ENCODING && name.kind_of?(::Encoding)
-      @encoding[0] = name.to_s.dup
+      name = name.name if name.kind_of?(::Encoding) if Tk::WITH_ENCODING
+      @encoding = name
     end
 
     # from tkencoding.rb by ttate@jaist.ac.jp
@@ -2681,16 +2646,16 @@ if (/^(8\.[1-9]|9\.|[1-9][0-9])/ =~ Tk::TCL_VERSION && !Tk::JAPANIZED_TK)
     end
 
     def encoding_name
-      (@encoding[0])? @encoding[0].dup: nil
+      (@encoding)? @encoding.dup: nil
     end
     alias encoding encoding_name
     alias default_encoding encoding_name
 
     def encoding_obj
       if Tk::WITH_ENCODING
-        Tk::Encoding.tcl2rb_encoding(@encoding[0])
+        Tk::Encoding.tcl2rb_encoding(@encoding)
       else
-        (@encoding[0])? @encoding[0].dup: nil
+        (@encoding)? @encoding.dup: nil
       end
     end
 
@@ -5501,7 +5466,7 @@ TkWidget = TkWindow
 #Tk.freeze
 
 module Tk
-  RELEASE_DATE = '2008-06-17'.freeze
+  RELEASE_DATE = '2008-05-23'.freeze
 
   autoload :AUTO_PATH,        'tk/variable'
   autoload :TCL_PACKAGE_PATH, 'tk/variable'
diff --git a/ext/tk/lib/tkextlib/tile/treeview.rb b/ext/tk/lib/tkextlib/tile/treeview.rb
index 566e48def3..c978a1a07b 100644
--- a/ext/tk/lib/tkextlib/tile/treeview.rb
+++ b/ext/tk/lib/tkextlib/tile/treeview.rb
@@ -379,12 +379,12 @@ module Tk::Tile::TreeviewConfig
   ###################
 
   def __item_cget_cmd(id)
-    [self.path, *id]
+    [self.path, id[0], id[1]]
   end
   private :__item_cget_cmd
 
   def __item_config_cmd(id)
-    [self.path, *id]
+    [self.path, id[0], id[1]]
   end
   private :__item_config_cmd
 
@@ -638,19 +638,19 @@ module Tk::Tile::TreeviewConfig
 
   # Treeview Tag
   def tagcget(tagOrId, option)
-    __itemcget([:tag, :configure, tagOrId], option)
+    __itemcget([:tag, tagOrId], option)
   end
   def tagcget_strict(tagOrId, option)
-    __itemcget_strict([:tag, :configure, tagOrId], option)
+    __itemcget_strict([:tag, tagOrId], option)
   end
   def tagconfigure(tagOrId, slot, value=None)
-    __itemconfigure([:tag, :configure, tagOrId], slot, value)
+    __itemconfigure([:tag, tagOrId], slot, value)
   end
   def tagconfiginfo(tagOrId, slot=nil)
-    __itemconfiginfo([:tag, :configure, tagOrId], slot)
+    __itemconfiginfo([:tag, tagOrId], slot)
   end
   def current_tagconfiginfo(tagOrId, slot=nil)
-    __current_itemconfiginfo([:tag, :configure, tagOrId], slot)
+    __current_itemconfiginfo([:tag, tagOrId], slot)
   end
   alias tag_cget tagcget
   alias tag_cget_strict tagcget_strict
@@ -943,7 +943,7 @@ class Tk::Tile::Treeview::Tag < TkObject
       TagID_TBL[@tpath][@id] = self
     }
     if keys && keys != None
-      tk_call_without_enc(@tpath, 'tag', 'configure', @id, *hash_kv(keys,true))
+      tk_call_without_enc(@tpath, 'tag', 'configure', *hash_kv(keys, true))
     end
   end
   def id
@@ -1034,8 +1034,7 @@ class Tk::Tile::Treeview < TkWindow
         id.kind_of?(Tk::Tile::Treeview::Tag)
       id.id
     elsif id.kind_of?(Array)
-      # size is 2 or 3
-      id[0..-2] << _get_eval_string(id[-1])
+      [id[0], _get_eval_string(id[1])]
     else
       _get_eval_string(id)
     end
diff --git a/ext/tk/sample/demos-en/msgbox2.rb b/ext/tk/sample/demos-en/msgbox2.rb
index 136a723c73..6fe6c778b3 100644
--- a/ext/tk/sample/demos-en/msgbox2.rb
+++ b/ext/tk/sample/demos-en/msgbox2.rb
@@ -42,7 +42,7 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text 'Message Box'
-    command proc{showMessageBox2 $msgbox2_demo}
+    command proc{showMessageBox $msgbox2_demo}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
@@ -79,7 +79,7 @@ $msgboxType = TkVariable.new('ok')
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
-def showMessageBox2(w)
+def showMessageBox(w)
   button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
                          'title'=>'Message', 'parent'=>w,
                          'message'=>"\"#{$msgboxType.value}\" Type MessageBox",
diff --git a/ext/tk/sample/demos-en/toolbar.rb b/ext/tk/sample/demos-en/toolbar.rb
index 633c52c15d..5cf863717b 100644
--- a/ext/tk/sample/demos-en/toolbar.rb
+++ b/ext/tk/sample/demos-en/toolbar.rb
@@ -70,7 +70,7 @@ if Tk.windowingsystem != 'aqua'
     w.grid_remove
     self.wm_manage
     # self.wm_title('Toolbar') # if you don't want to use its widget name as a window title.
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
   end
   def tbar_base.untearoff(w)
     self.wm_forget
diff --git a/ext/tk/sample/demos-jp/msgbox2.rb b/ext/tk/sample/demos-jp/msgbox2.rb
index e2944c59ed..d61f25129a 100644
--- a/ext/tk/sample/demos-jp/msgbox2.rb
+++ b/ext/tk/sample/demos-jp/msgbox2.rb
@@ -41,7 +41,7 @@ TkFrame.new(base_frame) {|frame|
 
   TkButton.new(frame) {
     text '��å������ܥå���'
-    command proc{showMessageBox2 $msgbox2_demo}
+    command proc{showMessageBox $msgbox2_demo}
   }.pack('side'=>'left', 'expand'=>'yes')
 }.pack('side'=>'bottom', 'fill'=>'x', 'pady'=>'2m')
 
@@ -78,7 +78,7 @@ $msgboxType = TkVariable.new('ok')
                                         'anchor'=>'w', 'fill'=>'x')
 }
 
-def showMessageBox2(w)
+def showMessageBox(w)
   button = Tk.messageBox('icon'=>$msgboxIcon.value, 'type'=>$msgboxType.value, 
                          'title'=>'Message', 'parent'=>w,
                          'message'=>"\"#{$msgboxType.value}\"�����פΥ�å������ܥå���", 
diff --git a/ext/tk/sample/demos-jp/toolbar.rb b/ext/tk/sample/demos-jp/toolbar.rb
index 1bb265d1f8..9cb3834c34 100644
--- a/ext/tk/sample/demos-jp/toolbar.rb
+++ b/ext/tk/sample/demos-jp/toolbar.rb
@@ -73,7 +73,7 @@ if Tk.windowingsystem != 'aqua'
     w.grid_remove
     self.wm_manage
     # self.wm_title('Toolbar') # �⤷���������å�̾�򥦥���ɥ������ȥ�ˤ������ʤ��ʤ顤���������ꤷ�Ƥ�������
-    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(w) }
+    self.wm_protocol('WM_DELETE_WINDOW'){ self.untearoff(self) }
   end
   def tbar_base.untearoff(w)
     self.wm_forget
diff --git a/ext/tk/sample/demos-jp/widget b/ext/tk/sample/demos-jp/widget
index dad85c221f..8eb699e513 100644
--- a/ext/tk/sample/demos-jp/widget
+++ b/ext/tk/sample/demos-jp/widget
@@ -2,8 +2,7 @@
 # -*- coding: euc-jp -*-
 
 # �������������� ( tk.rb �Υ����ɻ��� encoding ����/����˻Ȥ��� )
-#if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
-unless defined?(::Encoding.default_external)
+if RUBY_VERSION < '1.9.0' ### !!!!!!!!!!!!!!
   $KCODE = 'euc'
 else
   DEFAULT_TK_ENCODING = 'EUC-JP'
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw
index 04de3a2022..3fb6dde626 100644
--- a/ext/tk/sample/irbtkw.rbw
+++ b/ext/tk/sample/irbtkw.rbw
@@ -48,20 +48,10 @@ console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console,
                                                          :side=>:right, 
                                                          :expand=>false, 
                                                          :fill=>:y))
-
-# save original I/O
-out = $stdout
-err = $stderr
-
 irb_thread = nil
 ev_loop = Thread.new{
-  begin
-    Tk.mainloop
-  ensure
-    $stdout = out
-    $stderr = err
-    irb_thread.kill if irb_thread
-  end
+  Tk.mainloop
+  irb_thread.kill if irb_thread
 }
 
 # window position control
@@ -152,5 +142,5 @@ console.bind('Control-c'){
 irb_thread.join
 
 # exit
-ev_loop.kill
+ev_thread.kill
 Tk.exit
diff --git a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
index e2b4eec6bc..4a4c2e7eb7 100644
--- a/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
+++ b/ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb
@@ -4,11 +4,7 @@
 #  set $KCODE to 'utf' for a utf8 charecter
 #
 #########################################################
-unless defined?(::Encoding.default_external)
-  $KCODE='utf'
-else
-  DEFAULT_TK_ENCODING = 'UTF-8'
-end
+$KCODE='utf'
 
 require 'tk'
 require 'tkextlib/iwidgets'
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 4388fb294d..6d3b330f0e 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -92,7 +92,7 @@ static DL_HANDLE tcl_dll = (DL_HANDLE)0;
 static DL_HANDLE tk_dll  = (DL_HANDLE)0;
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
 #else
 ruby_open_tcl_dll(appname)
@@ -179,7 +179,7 @@ ruby_open_tk_dll()
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcltk_dll(char *appname)
 #else
 ruby_open_tcltk_dll(appname)
@@ -203,7 +203,7 @@ tk_stubs_init_p()
 
 
 Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
 #else
 ruby_tcl_create_ip_and_stubs_init(st)
@@ -290,7 +290,7 @@ ruby_tcl_stubs_init()
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_init(tcl_ip)
@@ -318,7 +318,7 @@ ruby_tk_stubs_init(tcl_ip)
         if ((*p_Tk_Init)(tcl_ip) == TCL_ERROR)
             return FAIL_Tk_Init;
 
-        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
+        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
             return FAIL_Tk_InitStubs;
 
 #ifdef __MACOS__
@@ -330,7 +330,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_safeinit(tcl_ip)
@@ -357,7 +357,7 @@ ruby_tk_stubs_safeinit(tcl_ip)
         if ((*p_Tk_SafeInit)(tcl_ip) == TCL_ERROR)
             return FAIL_Tk_Init;
 
-        if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0))
+        if (!Tk_InitStubs(tcl_ip, "8.1", 0))
             return FAIL_Tk_InitStubs;
 
 #ifdef __MACOS__
@@ -421,7 +421,7 @@ static int open_tcl_dll = 0;
 static int call_tk_stubs_init = 0;
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
 #else
 ruby_open_tcl_dll(appname)
@@ -450,7 +450,7 @@ ruby_open_tk_dll()
 }
 
 int 
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcltk_dll(char *appname)
 #else
 ruby_open_tcltk_dll(appname)
@@ -473,7 +473,7 @@ tk_stubs_init_p()
 }
 
 Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
 #else
 ruby_tcl_create_ip_and_stubs_init(st)
@@ -506,7 +506,7 @@ ruby_tcl_stubs_init()
 }
 
 int 
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_init(tcl_ip)
@@ -527,7 +527,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_safeinit(tcl_ip)
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index 70894269ec..8701cfef27 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,19 +4,17 @@
  *              Oct. 24, 1997   Y. Matsumoto
  */
 
-#define TCLTKLIB_RELEASE_DATE "2008-06-17"
+#define TCLTKLIB_RELEASE_DATE "2008-05-23"
 
 #include "ruby.h"
 
-#ifdef HAVE_RUBY_SIGNAL_H
+#ifdef RUBY_VM
+/* #include "ruby/ruby.h" */
 #include "ruby/signal.h"
+#include "ruby/encoding.h"
 #else
+/* #include "ruby.h" */
 #include "rubysig.h"
-#endif
-#ifdef HAVE_RUBY_ENCODING_H
-#include "ruby/encoding.h"
-#endif
-#ifndef HAVE_RUBY_RUBY_H
 #include "version.h"
 #endif
 
@@ -33,19 +31,6 @@
 #include <tcl.h>
 #include <tk.h>
 
-#ifndef HAVE_RUBY_NATIVE_THREAD_P
-#define ruby_native_thread_p() is_ruby_native_thread()
-#undef RUBY_USE_NATIVE_THREAD
-#else
-#define RUBY_USE_NATIVE_THREAD 1
-#endif
-#ifndef HAVE_RB_ERRINFO
-#define rb_errinfo() (ruby_errinfo+0) /* cannot be l-value */
-#endif
-#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0) /* cannot be l-value */
-#endif
-
 #include "stubs.h"
 
 #ifndef TCL_ALPHA_RELEASE
@@ -116,16 +101,16 @@ fprintf(stderr, ARG1, ARG2, ARG3); fprintf(stderr, "\n"); fflush(stderr); }
 */
 
 /* release date */
-static const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
+const char tcltklib_release_date[] = TCLTKLIB_RELEASE_DATE;
 
 /* finalize_proc_name */
-static const char finalize_hook_name[] = "INTERP_FINALIZE_HOOK";
+static char *finalize_hook_name = "INTERP_FINALIZE_HOOK";
 
 static void ip_finalize _((Tcl_Interp*));
 
 static int at_exit = 0;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static VALUE cRubyEncoding;
 
 /* encoding */
@@ -188,14 +173,13 @@ static VALUE ip_invoke_real _((int, VALUE*, VALUE));
 static VALUE ip_invoke _((int, VALUE*, VALUE));
 static VALUE ip_invoke_with_position _((int, VALUE*, VALUE, Tcl_QueuePosition));
 static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
-static VALUE callq_safelevel_handler _((VALUE, VALUE));
 
 /* Tcl's object type */
 #if TCL_MAJOR_VERSION >= 8
-static const char Tcl_ObjTypeName_ByteArray[] = "bytearray";
+static char *Tcl_ObjTypeName_ByteArray = "bytearray";
 static Tcl_ObjType *Tcl_ObjType_ByteArray;
 
-static const char Tcl_ObjTypeName_String[]    = "string";
+static char *Tcl_ObjTypeName_String    = "string";
 static Tcl_ObjType *Tcl_ObjType_String;
 
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
@@ -211,7 +195,7 @@ static Tcl_ObjType *Tcl_ObjType_String;
 
 /* safe Tcl_Eval and Tcl_GlobalEval */
 static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 tcl_eval(Tcl_Interp *interp, const char *cmd)
 #else
 tcl_eval(interp, cmd)
@@ -232,7 +216,7 @@ tcl_eval(interp, cmd)
 #define Tcl_Eval tcl_eval
 
 static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 tcl_global_eval(Tcl_Interp *interp, const char *cmd)
 #else
 tcl_global_eval(interp, cmd)
@@ -409,7 +393,7 @@ call_queue_mark(struct call_queue *q)
 
 
 static VALUE eventloop_thread;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 Tcl_ThreadId tk_eventloop_thread_id;  /* native thread ID of Tcl interpreter */
 #endif
 static VALUE eventloop_stack;
@@ -425,15 +409,9 @@ Tcl_Interp  *current_interp;
     : USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
     : DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
 */
-#ifdef RUBY_USE_NATIVE_THREAD
-#define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
-#define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
-#define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 1
-#else /* ! RUBY_USE_NATIVE_THREAD */
 #define CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE 1
 #define USE_TOGGLE_WINDOW_MODE_FOR_IDLE 0
 #define DO_THREAD_SCHEDULE_AT_CALLBACK_DONE 0
-#endif
 
 #if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
 static int have_rb_thread_waiting_for_value = 0;
@@ -446,14 +424,14 @@ static int have_rb_thread_waiting_for_value = 0;
  *  'timer_tick' is a limit of one term of thread scheduling. 
  *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
  */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 #define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
 #define DEFAULT_NO_EVENT_TICK          10/*counts*/
-#define DEFAULT_NO_EVENT_WAIT           1/*milliseconds ( 1 -- 999 ) */
+#define DEFAULT_NO_EVENT_WAIT          10/*milliseconds ( 1 -- 999 ) */
 #define WATCHDOG_INTERVAL              10/*milliseconds ( 1 -- 999 ) */
 #define DEFAULT_TIMER_TICK              0/*milliseconds ( 0 -- 999 ) */
 #define NO_THREAD_INTERRUPT_TIME      100/*milliseconds ( 1 -- 999 ) */
-#else /* ! RUBY_USE_NATIVE_THREAD */
+#else /* ! RUBY_VM */
 #define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
 #define DEFAULT_NO_EVENT_TICK          10/*counts*/
 #define DEFAULT_NO_EVENT_WAIT          20/*milliseconds ( 1 -- 999 ) */
@@ -695,7 +673,7 @@ struct tcltkip {
 #if TCL_NAMESPACE_DEBUG
     Tcl_Namespace *default_ns;   /* default namespace */
 #endif
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     Tcl_ThreadId tk_thread_id;   /* native thread ID of Tcl interpreter */
 #endif
     int has_orig_exit;           /* has original 'exit' command ? */
@@ -888,7 +866,7 @@ tcltkip_init_tk(interp)
     }
 #endif
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr->tk_thread_id = Tcl_GetCurrentThread();
 #endif
 
@@ -1045,12 +1023,12 @@ call_original_exit(ptr, state)
 
     } else {
         /* string interface */
-        CONST84 char **argv;
+        char **argv;
 #define USE_RUBY_ALLOC 0
 #if USE_RUBY_ALLOC
-        argv = ALLOC_N(char *, 3); /* XXXXXXXXXX */
+        argv = (char **)ALLOC_N(char *, 3); /* XXXXXXXXXX */
 #else /* not USE_RUBY_ALLOC */
-        argv = (CONST84 char **)ckalloc(sizeof(char *) * 3);
+        argv = (char **)ckalloc(sizeof(char *) * 3);
 #if 0 /* use Tcl_Preserve/Release */
 	Tcl_Preserve((ClientData)argv); /* XXXXXXXX */
 #endif
@@ -1060,7 +1038,8 @@ call_original_exit(ptr, state)
         argv[1] = Tcl_GetStringFromObj(state_obj, (int*)NULL);
         argv[2] = (char *)NULL;
 
-        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 2, argv);
+        ptr->return_value = (*(info->proc))(info->clientData, ptr->ip, 
+                                            2, (CONST84 char **)argv);
 
 #if USE_RUBY_ALLOC
         free(argv);
@@ -1159,7 +1138,7 @@ _timer_for_tcl(clientData)
     /* tick_counter += event_loop_max; */
 }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 #if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
 static int
 toggle_eventloop_window_mode_for_idle()
@@ -1502,7 +1481,7 @@ static VALUE
 lib_num_of_mainwindows(self)
     VALUE self;
 {
-#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
     return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self);
 #else
     return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL);
@@ -1510,7 +1489,7 @@ lib_num_of_mainwindows(self)
 }
 
 
-#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
 static VALUE
 call_DoOneEvent_core(flag_val)
     VALUE flag_val;
@@ -1555,19 +1534,21 @@ eventloop_sleep(dummy)
 {
     struct timeval t;
 
-    if (no_event_wait <= 0) {
-      return Qnil;
-    }
-
     t.tv_sec = (time_t)0;
     t.tv_usec = (time_t)(no_event_wait*1000.0);
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
 #endif
 
     DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %lx", rb_thread_current());
@@ -1575,11 +1556,17 @@ eventloop_sleep(dummy)
     DUMP2("eventloop_sleep: finish at thread : %lx", rb_thread_current());
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
 #endif
 
     return Qnil;
@@ -1591,7 +1578,7 @@ eventloop_sleep(dummy)
 static int
 get_thread_alone_check_flag()
 {
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
   return 0;
 #else
   set_tcltk_version();
@@ -1703,11 +1690,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
             if (status) {
                 switch (status) {
                 case TAG_RAISE:
+#ifdef RUBY_VM
                     if (NIL_P(rb_errinfo())) {
+#else
+                    if (NIL_P(ruby_errinfo)) {
+#endif
                         rbtk_pending_exception 
                             = rb_exc_new2(rb_eException, "unknown exception");
                     } else {
+#ifdef RUBY_VM
                         rbtk_pending_exception = rb_errinfo();
+#else
+                        rbtk_pending_exception = ruby_errinfo;
+#endif
 
                         if (!NIL_P(rbtk_pending_exception)) {
                             if (rbtk_eventloop_depth == 0) {
@@ -1722,10 +1717,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     break;
 
                 case TAG_FATAL:
+#ifdef RUBY_VM
                     if (NIL_P(rb_errinfo())) {
+#else
+                    if (NIL_P(ruby_errinfo)) {
+#endif
                         rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                     } else {
+#ifdef RUBY_VM
                         rb_exc_raise(rb_errinfo());
+#else
+                        rb_exc_raise(ruby_errinfo);
+#endif
                     }
                 }
             }
@@ -1816,7 +1819,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                 if (NIL_P(eventloop_thread) || current == eventloop_thread) {
                     int st;
                     int status;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 		    if (update_flag) {
 		      st = RTEST(rb_protect(call_DoOneEvent, 
 					    INT2FIX(event_flag), &status)); 
@@ -1852,12 +1855,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     if (status) {
                         switch (status) {
                         case TAG_RAISE:
+#ifdef RUBY_VM
                             if (NIL_P(rb_errinfo())) {
+#else
+                            if (NIL_P(ruby_errinfo)) {
+#endif
                                 rbtk_pending_exception 
                                     = rb_exc_new2(rb_eException, 
                                                   "unknown exception");
                             } else {
+#ifdef RUBY_VM
                                 rbtk_pending_exception = rb_errinfo();
+#else
+                                rbtk_pending_exception = ruby_errinfo;
+#endif
 
                                 if (!NIL_P(rbtk_pending_exception)) {
                                     if (rbtk_eventloop_depth == 0) {
@@ -1872,10 +1883,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                             break;
 
                         case TAG_FATAL:
+#ifdef RUBY_VM
                             if (NIL_P(rb_errinfo())) {
+#else
+                            if (NIL_P(ruby_errinfo)) {
+#endif
                                 rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                             } else {
+#ifdef RUBY_VM
                                 rb_exc_raise(rb_errinfo());
+#else
+                                rb_exc_raise(ruby_errinfo);
+#endif
                             }
                         }
                     }
@@ -1925,12 +1944,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                         if (status) {
                             switch (status) {
                             case TAG_RAISE:
+#ifdef RUBY_VM
                                 if (NIL_P(rb_errinfo())) {
+#else
+                                if (NIL_P(ruby_errinfo)) {
+#endif
                                     rbtk_pending_exception 
                                         = rb_exc_new2(rb_eException, 
                                                       "unknown exception");
                                 } else {
+#ifdef RUBY_VM
                                     rbtk_pending_exception = rb_errinfo();
+#else
+                                    rbtk_pending_exception = ruby_errinfo;
+#endif
 
                                     if (!NIL_P(rbtk_pending_exception)) {
                                         if (rbtk_eventloop_depth == 0) {
@@ -1945,11 +1972,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                                 break;
 
                             case TAG_FATAL:
+#ifdef RUBY_VM
                                 if (NIL_P(rb_errinfo())) {
+#else
+                                if (NIL_P(ruby_errinfo)) {
+#endif
                                     rb_exc_raise(rb_exc_new2(rb_eFatal, 
                                                              "FATAL"));
                                 } else {
+#ifdef RUBY_VM
                                     rb_exc_raise(rb_errinfo());
+#else
+                                    rb_exc_raise(ruby_errinfo);
+#endif
                                 }
                             }
                         }
@@ -2010,7 +2045,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
         }
 
         DUMP1("trap check & thread scheduling");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
         /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX  TODO !!!! */
 #else
         if (update_flag == 0) CHECK_INTS;
@@ -2061,19 +2096,35 @@ lib_eventloop_main(args)
 
     switch (status) {
     case TAG_RAISE:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception 
                 = rb_exc_new2(rb_eException, "unknown exception");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         return Qnil;
 
     case TAG_FATAL:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         return Qnil;
     }
@@ -2119,11 +2170,8 @@ lib_eventloop_ensure(args)
           break; 
         }
 
-#ifdef RUBY_VM
-        if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) {
-#else
+        /* if (RTEST(rb_funcall(eventloop_thread, ID_alive_p, 0, 0))) { */
 	if (RTEST(rb_thread_alive_p(eventloop_thread))) {
-#endif
             DUMP2("eventloop-enshure: wake up parent %lx", eventloop_thread);
             rb_thread_wakeup(eventloop_thread);
 
@@ -2131,7 +2179,7 @@ lib_eventloop_ensure(args)
         }
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (NIL_P(eventloop_thread)) {
         tk_eventloop_thread_id = (Tcl_ThreadId) 0;
     }
@@ -2160,7 +2208,7 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
     tcl_stubs_check();
 
     eventloop_thread = rb_thread_current();
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     tk_eventloop_thread_id = Tcl_GetCurrentThread();
 #endif
 
@@ -2313,7 +2361,7 @@ lib_watchdog_ensure(arg)
     VALUE arg;
 {
     eventloop_thread = Qnil; /* stop eventloops */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     tk_eventloop_thread_id = (Tcl_ThreadId) 0;
 #endif
     return Qnil;
@@ -2327,7 +2375,7 @@ lib_mainloop_watchdog(argc, argv, self)
 {
     VALUE check_rootwidget;
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     rb_raise(rb_eNotImpError, 
 	     "eventloop_watchdog is not implemented on Ruby VM.");
 #endif
@@ -2441,11 +2489,8 @@ lib_thread_callback(argc, argv, self)
     foundEvent = RTEST(lib_eventloop_launcher(/* not check root-widget */0, 0, 
                                               q->done, (Tcl_Interp*)NULL));
 
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(th, ID_alive_p, 0))) {
-#else
+    /* if (RTEST(rb_funcall(th, ID_alive_p, 0))) { */
     if (RTEST(rb_thread_alive_p(th))) {
-#endif
         rb_funcall(th, ID_kill, 0);
         ret = Qnil;
     } else {
@@ -2458,10 +2503,17 @@ lib_thread_callback(argc, argv, self)
     /* ckfree((char*)q); */
 
     if (NIL_P(rbtk_pending_exception)) {
+#ifdef RUBY_VM
         /* return rb_errinfo(); */
         if (status) {
             rb_exc_raise(rb_errinfo());
         }
+#else
+        /* return ruby_errinfo; */
+        if (status) {
+            rb_exc_raise(ruby_errinfo);
+        }
+#endif
     } else {
         VALUE exc = rbtk_pending_exception;
         rbtk_pending_exception = Qnil;
@@ -2676,50 +2728,94 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */
             goto error;
         error:
             str = rb_str_new2("LocalJumpError: ");
+#ifdef RUBY_VM
             rb_str_append(str, rb_obj_as_string(rb_errinfo()));
+#else
+            rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+#endif
             exc = rb_exc_new3(type, str);
             break;
 
         case TAG_RETRY:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: retry");
                 exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_REDO:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: redo");
                 exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_RAISE:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 exc = rb_exc_new2(rb_eException, "unknown exception");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_FATAL:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 exc = rb_exc_new2(rb_eFatal, "FATAL");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_THROW:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: throw");
                 exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
@@ -2827,11 +2923,17 @@ tcl_protect(interp, proc, data)
     int code;
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on tcl_protect()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on tcl_protect()");
+    }
+#endif
 #endif
 
     rb_trap_immediate = 0;
@@ -2944,9 +3046,7 @@ ip_ruby_cmd_receiver_const_get(name)
      char *name;
 {
   volatile VALUE klass = rb_cObject;
-#if 0
   char *head, *tail;
-#endif
   int state;
 
 #if SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
@@ -2996,9 +3096,8 @@ ip_ruby_cmd_receiver_get(str)
      char *str;
 {
   volatile VALUE receiver;
-#if !SUPPORT_NESTED_CONST_AS_IP_RUBY_CMD_RECEIVER
+  volatile VALUE klass = rb_cObject;
   int state;
-#endif
 
   if (str[0] == ':' || ('A' <= str[0] && str[0] <= 'Z')) {
     /* class | module | constant */
@@ -3114,21 +3213,22 @@ ip_ruby_cmd(clientData, interp, argc, argv)
 
     /* get args */
     args = rb_ary_new2(argc - 2);
-#ifdef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
+#else
     RARRAY(args)->len = 0;
 #endif
     for(i = 3; i < argc; i++) {
 #if TCL_MAJOR_VERSION >= 8
         str = Tcl_GetStringFromObj(argv[i], &len);
         DUMP2("arg:%s",str);
-#ifndef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
 	rb_ary_push(args, rb_tainted_str_new(str, len));
 #else
         RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
 #endif
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP2("arg:%s",argv[i]);
-#ifndef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
 	rb_ary_push(args, rb_tainted_str_new2(argv[i]));
 #else
         RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
@@ -3329,11 +3429,17 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_ruby_eval()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_ruby_eval()");
+    }
+#endif
 #endif
 
     Tcl_ResetResult(interp);
@@ -3480,11 +3586,17 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
+    }
+#endif
 #endif
 
     if (rb_thread_alone() 
@@ -3673,11 +3785,17 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 
     Tcl_Preserve(interp);
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_rbVwaitCommand()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
+    }
+#endif
 #endif
 
     Tcl_ResetResult(interp);
@@ -5103,7 +5221,7 @@ ip_finalize(ip)
     }
 
     /* delete root widget */
-#if 0 /* cause SEGV on Ruby 1.9 */
+#if 1
     DUMP1("check `destroy'");
     if (Tcl_GetCommandInfo(ip, "destroy", &info)) {
         DUMP1("call `destroy .'");
@@ -5426,10 +5544,19 @@ ip_init(argc, argv, self)
     Tk_Window mainWin = (Tk_Window)NULL;
 
     /* security check */
+#ifdef RUBY_VM
     if (rb_safe_level() >= 4) {
+#else
+    if (ruby_safe_level >= 4) {
+#endif
         rb_raise(rb_eSecurityError, 
                  "Cannot create a TclTkIp object at level %d", 
-                 rb_safe_level());
+#ifdef RUBY_VM
+                 rb_safe_level()
+#else
+                 ruby_safe_level
+#endif
+                 );
     }
 
     /* create object */
@@ -5437,7 +5564,7 @@ ip_init(argc, argv, self)
     ptr = ALLOC(struct tcltkip);
     /* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
     DATA_PTR(self) = ptr;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr->tk_thread_id = 0;
 #endif
     ptr->ref_count = 0;
@@ -5547,7 +5674,7 @@ ip_init(argc, argv, self)
                           (Tcl_PackageInitProc *) NULL);
 #endif
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
         /* set Tk thread ID */
         ptr->tk_thread_id = Tcl_GetCurrentThread();
 #endif
@@ -5669,7 +5796,7 @@ ip_create_slave_core(interp, argc, argv)
 #endif
 
     /* create slave-ip */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     /* slave->tk_thread_id = 0; */
     slave->tk_thread_id = master->tk_thread_id; /* == current thread */
 #endif
@@ -6096,6 +6223,10 @@ get_str_from_obj(obj)
     int len, binary = 0;
     const char *s;
     volatile VALUE str;
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4)
+    int len2;
+    const char *s2;
+#endif
 
 #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 0
     s = Tcl_GetStringFromObj(obj, &len);
@@ -6104,7 +6235,7 @@ get_str_from_obj(obj)
      /* TCL_VERSION 8.1 -- 8.3 */
     if (Tcl_GetCharLength(obj) != Tcl_UniCharLen(Tcl_GetUnicode(obj))) {
         /* possibly binary string */
-        s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
+        s = Tcl_GetByteArrayFromObj(obj, &len);
         binary = 1;
     } else {
         /* possibly text string */
@@ -6112,7 +6243,7 @@ get_str_from_obj(obj)
     }
 #else /* TCL_VERSION >= 8.4 */
     if (IS_TCL_BYTEARRAY(obj)) {
-      s = (char *)Tcl_GetByteArrayFromObj(obj, &len);
+      s = Tcl_GetByteArrayFromObj(obj, &len);
       binary = 1;
     } else {
       s = Tcl_GetStringFromObj(obj, &len);
@@ -6122,13 +6253,13 @@ get_str_from_obj(obj)
 #endif
     str = s ? rb_str_new(s, len) : rb_str_new2("");
     if (binary) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
       rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
       rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
     } else {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
       rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
       rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -6152,19 +6283,19 @@ get_obj_from_str(str)
         StringValue(enc);
         if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
             /* binary string */
-            return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+            return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
         } else {
             /* text string */
             return Tcl_NewStringObj(s, RSTRING_LEN(str));
         }
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
         /* binary string */
-        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+        return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
 #endif
     } else if (strlen(s) != RSTRING_LEN(str)) {
         /* probably binary string */
-        return Tcl_NewByteArrayObj((const unsigned char *)s, RSTRING_LEN(str));
+        return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
     } else {
         /* probably text string */
         return Tcl_NewStringObj(s, RSTRING_LEN(str));
@@ -6230,13 +6361,8 @@ call_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
     if (RTEST(rb_thread_alive_p(thread)) 
 	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
       DUMP1("caller is not yet ready to receive the result -> pending");
       return 0;
     }
@@ -6285,11 +6411,8 @@ call_queue_handler(evPtr, flags)
     q->thread = (VALUE)NULL;
 
     /* back to caller */
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
     if (RTEST(rb_thread_alive_p(thread))) {
-#endif
       DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
 #if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -6335,7 +6458,7 @@ tk_funcall(func, argc, argv, obj)
         ptr = (struct tcltkip *)NULL;
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr) {
       /* on Tcl interpreter */
       is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0 
@@ -6411,7 +6534,7 @@ tk_funcall(func, argc, argv, obj)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr && ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, 
 			   &(callq->ev), TCL_QUEUE_HEAD); */
@@ -6558,19 +6681,35 @@ ip_eval_real(self, cmd_str, cmd_len)
           ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
           switch(status) {
           case TAG_RAISE:
+#ifdef RUBY_VM
               if (NIL_P(rb_errinfo())) {
+#else
+              if (NIL_P(ruby_errinfo)) {
+#endif
                   rbtk_pending_exception = rb_exc_new2(rb_eException, 
                                                        "unknown exception");
               } else {
+#ifdef RUBY_VM
                   rbtk_pending_exception = rb_errinfo();
+#else
+                  rbtk_pending_exception = ruby_errinfo;
+#endif
               }
               break;
 
           case TAG_FATAL:
+#ifdef RUBY_VM
               if (NIL_P(rb_errinfo())) {
+#else
+              if (NIL_P(ruby_errinfo)) {
+#endif
                   rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
               } else {
+#ifdef RUBY_VM
                   rbtk_pending_exception = rb_errinfo();
+#else
+                  rbtk_pending_exception = ruby_errinfo;
+#endif
               }
           }
 #endif
@@ -6585,26 +6724,11 @@ ip_eval_real(self, cmd_str, cmd_len)
         return rbtk_pending_exception;
     }
 
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
+    if (ptr->return_value == TCL_ERROR) {
         if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
             volatile VALUE exc;
-
-	    switch (ptr->return_value) {
-	    case TCL_RETURN:
-	      exc = create_ip_exc(self, eTkCallbackReturn, 
-				  "ip_eval_real receives TCL_RETURN");
-	    case TCL_BREAK:
-	      exc = create_ip_exc(self, eTkCallbackBreak, 
-				  "ip_eval_real receives TCL_BREAK");
-	    case TCL_CONTINUE:
-	      exc = create_ip_exc(self, eTkCallbackContinue, 
-				  "ip_eval_real receives TCL_CONTINUE");
-	    default:
-	      exc = create_ip_exc(self, rb_eRuntimeError, "%s", 
-				  Tcl_GetStringResult(ptr->ip));
-	    } 
-
+            exc = create_ip_exc(self, rb_eRuntimeError, 
+                                "%s", Tcl_GetStringResult(ptr->ip));
             rbtk_release_ip(ptr);
             rb_thread_critical = thr_crit_bup;
             return exc;
@@ -6646,23 +6770,10 @@ ip_eval_real(self, cmd_str, cmd_len)
         return rbtk_pending_exception;
     }
 
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
+    if (ptr->return_value == TCL_ERROR) {
         volatile VALUE exc;
 
-	switch (ptr->return_value) {
-	case TCL_RETURN:
-	  exc = create_ip_exc(self, eTkCallbackReturn, 
-			      "ip_eval_real receives TCL_RETURN");
-	case TCL_BREAK:
-	  exc = create_ip_exc(self, eTkCallbackBreak, 
-			      "ip_eval_real receives TCL_BREAK");
-	case TCL_CONTINUE:
-	  exc = create_ip_exc(self, eTkCallbackContinue, 
-			       "ip_eval_real receives TCL_CONTINUE");
-	default:
-	  exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
-	} 
+        exc = create_ip_exc(self, rb_eRuntimeError, "%s", ptr->ip->result);
 
         rbtk_release_ip(ptr);
         return exc;
@@ -6712,13 +6823,8 @@ eval_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
     if (RTEST(rb_thread_alive_p(thread)) 
 	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
       DUMP1("caller is not yet ready to receive the result -> pending");
       return 0;
     }
@@ -6739,11 +6845,17 @@ eval_queue_handler(evPtr, flags)
     /* check safe-level */
     if (rb_safe_level() != q->safe_level) {
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
       rb_bug("cross-thread violation on eval_queue_handler()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+      rb_bug("cross-thread violation on eval_queue_handler()");
+    }
+#endif
 #endif
         /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
         q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,-1,q);
@@ -6771,11 +6883,8 @@ eval_queue_handler(evPtr, flags)
     q->thread = (VALUE)NULL;
 
     /* back to caller */
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
     if (RTEST(rb_thread_alive_p(thread))) {
-#endif
       DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
 #if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -6803,7 +6912,7 @@ ip_eval(self, str)
     VALUE str;
 {
     struct eval_queue *evq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     struct tcltkip *ptr;
 #endif
     char *eval_str;
@@ -6820,12 +6929,12 @@ ip_eval(self, str)
     StringValue(str);
     rb_thread_critical = thr_crit_bup;
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr = get_ip(ip_obj);
 #endif
 
     if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
 	&& 
 #endif
@@ -6888,7 +6997,7 @@ ip_eval(self, str)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
       Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
@@ -7110,7 +7219,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
         if (TYPE(str) == T_STRING) {
             volatile VALUE enc;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
             enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0);
 #else
             enc = rb_attr_get(str, ID_at_enc);
@@ -7140,7 +7249,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
             } else {
                 StringValue(enc);
                 if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7160,7 +7269,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
     } else {
         StringValue(encodename);
 	if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	  rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 	  rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7197,7 +7306,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
     rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -7290,14 +7399,14 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             if (!NIL_P(enc)) {
                 StringValue(enc);
                 if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
                     rb_thread_critical = thr_crit_bup;
                     return str;
                 }
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
 	        rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 		rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7342,11 +7451,11 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             StringValue(str);
             tclstr = Tcl_NewStringObj(RSTRING_PTR(str), RSTRING_LEN(str));
 	    Tcl_IncrRefCount(tclstr);
-            s = (char*)Tcl_GetByteArrayFromObj(tclstr, &len);
+            s = Tcl_GetByteArrayFromObj(tclstr, &len);
             str = rb_tainted_str_new(s, len);
 	    s = (char*)NULL;
 	    Tcl_DecrRefCount(tclstr);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
             rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7388,7 +7497,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     if (interp) {
       /* can access encoding_table of TclTkIp */
       /*   ->  try to use encoding_table      */
@@ -7497,7 +7606,7 @@ lib_UTF_backslash_core(self, str, all_bs)
 
     str = rb_str_new(dst_buf, dst_len);
     if (taint_flag) OBJ_TAINT(str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
     rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -7802,19 +7911,35 @@ ip_invoke_core(interp, argc, argv)
     ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
     switch(status) {
     case TAG_RAISE:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eException, 
                                                  "unknown exception");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         break;
         
     case TAG_FATAL:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
     }
 
@@ -7914,24 +8039,11 @@ ip_invoke_core(interp, argc, argv)
 
     rb_thread_critical = thr_crit_bup;
 
-    /* if (ptr->return_value == TCL_ERROR) { */
-    if (ptr->return_value != TCL_OK) {
+    if (ptr->return_value == TCL_ERROR) {
         if (event_loop_abort_on_exc > 0 && !Tcl_InterpDeleted(ptr->ip)) {
-	    switch (ptr->return_value) {
-	    case TCL_RETURN:
-	      return create_ip_exc(interp, eTkCallbackReturn, 
-				   "ip_invoke_core receives TCL_RETURN");
-	    case TCL_BREAK:
-	      return create_ip_exc(interp, eTkCallbackBreak, 
-				   "ip_invoke_core receives TCL_BREAK");
-	    case TCL_CONTINUE:
-	      return create_ip_exc(interp, eTkCallbackContinue, 
-				   "ip_invoke_core receives TCL_CONTINUE");
-	    default:
-	      return create_ip_exc(interp, rb_eRuntimeError, "%s", 
-				   Tcl_GetStringResult(ptr->ip));
-	    } 
 
+            return create_ip_exc(interp, rb_eRuntimeError, 
+                                 "%s", Tcl_GetStringResult(ptr->ip));
         } else {
             if (event_loop_abort_on_exc < 0) {
                 rb_warning("%s (ignore)", Tcl_GetStringResult(ptr->ip));
@@ -8118,13 +8230,8 @@ invoke_queue_handler(evPtr, flags)
         DUMP1("process it on current event-loop");
     }
 
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0))
-	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#else
     if (RTEST(rb_thread_alive_p(thread)) 
 	&& ! RTEST(rb_funcall(thread, ID_stop_p, 0))) {
-#endif
       DUMP1("caller is not yet ready to receive the result -> pending");
       return 0;
     }
@@ -8172,11 +8279,8 @@ invoke_queue_handler(evPtr, flags)
     q->thread = (VALUE)NULL;
 
     /* back to caller */
-#ifdef RUBY_VM
-    if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) {
-#else
+    /* if (RTEST(rb_funcall(thread, ID_alive_p, 0, 0))) { */
     if (RTEST(rb_thread_alive_p(thread))) {
-#endif
       DUMP2("back to caller (caller thread:%lx)", thread);
       DUMP2("               (current thread:%lx)", rb_thread_current());
 #if CONTROL_BY_STATUS_OF_RB_THREAD_WAITING_FOR_VALUE
@@ -8206,7 +8310,7 @@ ip_invoke_with_position(argc, argv, obj, position)
     Tcl_QueuePosition position;
 {
     struct invoke_queue *ivq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     struct tcltkip *ptr;
 #endif
     int  *alloc_done;
@@ -8226,17 +8330,15 @@ ip_invoke_with_position(argc, argv, obj, position)
         rb_raise(rb_eArgError, "command name missing");
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr = get_ip(ip_obj);
-    DUMP2("status: ptr->tk_thread_id %p", ptr->tk_thread_id);
-    DUMP2("status: Tcl_GetCurrentThread %p", Tcl_GetCurrentThread());
-#else
-    DUMP2("status: Tcl_GetCurrentThread %lx", Tcl_GetCurrentThread());
+    DUMP2("status: ptr->tk_thread_id %d", ptr->tk_thread_id);
 #endif
+    DUMP2("status: Tcl_GetCurrentThread %d", Tcl_GetCurrentThread());
     DUMP2("status: eventloopt_thread %lx", eventloop_thread);
 
     if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
 	&& 
 #endif
@@ -8292,7 +8394,7 @@ ip_invoke_with_position(argc, argv, obj, position)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
       Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
@@ -8818,7 +8920,7 @@ lib_split_tklist_core(ip_obj, list_str)
     volatile VALUE ary, elem;
     int idx;
     int taint_flag = OBJ_TAINTED(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     int list_enc_idx;
     volatile VALUE list_ivar_enc;
 #endif
@@ -8836,7 +8938,7 @@ lib_split_tklist_core(ip_obj, list_str)
     }
 
     StringValue(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     list_enc_idx = rb_enc_get_index(list_str);
     list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
 #endif
@@ -8878,7 +8980,7 @@ lib_split_tklist_core(ip_obj, list_str)
 
         for(idx = 0; idx < objc; idx++) {
             elem = get_str_from_obj(objv[idx]);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
 	        rb_enc_associate_index(elem, ENCODING_INDEX_BINARY);
 		rb_ivar_set(elem, ID_at_enc, ENCODING_NAME_BINARY);
@@ -9194,7 +9296,7 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
      VALUE name;
      VALUE error_mode;
 {
-  get_ip(interp);
+  struct tcltkip *ptr = get_ip(interp);
 
   rb_secure(4);
 
@@ -9211,7 +9313,7 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
   }
 #endif
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
   if (RTEST(rb_define_dummy_encoding(RSTRING_PTR(name)))) {
     int idx = rb_enc_find_index(StringValueCStr(name));
     return rb_enc_from_encoding(rb_enc_from_index(idx));
@@ -9236,7 +9338,7 @@ create_dummy_encoding_for_tk(interp, name)
 }
 
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static int
 update_encoding_table(table, interp, error_mode)
      VALUE table;
@@ -9410,7 +9512,7 @@ encoding_table_get_obj_core(table, enc, error_mode)
   }
 }
 
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
 static int
 update_encoding_table(table, interp, error_mode)
@@ -9537,7 +9639,7 @@ encoding_table_get_obj(table, enc)
   return encoding_table_get_obj_core(table, enc, Qtrue);
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static VALUE
 create_encoding_table(interp)
      VALUE interp;
@@ -9627,7 +9729,7 @@ create_encoding_table(interp)
   return table;
 }
 
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
 static VALUE
 create_encoding_table(interp)
@@ -9860,9 +9962,9 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_global_variable(&cRubyEncoding);
-    cRubyEncoding = rb_path2class("Encoding");
+    cRubyEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
 
     ENCODING_INDEX_UTF8   = rb_enc_to_index(rb_utf8_encoding());
     ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
@@ -10118,7 +10220,11 @@ Init_tcltklib()
 
     /* if ruby->nativethread-supprt and tcltklib->doen't, 
        the following will cause link-error. */
+#ifdef RUBY_VM
     ruby_native_thread_p();
+#else
+    is_ruby_native_thread();
+#endif
 
     /* --------------------------------------------------------------- */
 
@@ -10147,8 +10253,6 @@ Init_tcltklib()
     Tcl_ObjType_String    = Tcl_GetObjType(Tcl_ObjTypeName_String);
 
     /* --------------------------------------------------------------- */
-
-    (void)call_original_exit;
 }
 
 /* eof */
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
index 34b91632eb..015bc3a45e 100644
--- a/ext/tk/tkutil/extconf.rb
+++ b/ext/tk/tkutil/extconf.rb
@@ -8,7 +8,6 @@ end
 if has_tk
   require 'mkmf'
   have_func("rb_obj_instance_exec", "ruby.h")
-  have_func("rb_sym_to_s", "ruby.h")
   have_func("strndup", "string.h")
   create_makefile('tkutil')
 end
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index 8155bff5ce..00d719143b 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -11,14 +11,14 @@
 
 #include "ruby.h"
 
-#ifdef HAVE_RUBY_SIGNAL_H
+#ifdef RUBY_VM  /* Ruby 1.9 */
+/* #include "ruby/ruby.h" */
 #include "ruby/signal.h"
-#else
-#include "rubysig.h"
-#endif
-#ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
 #else
+/* #include "ruby.h" */
+#include "rubysig.h"
+#include "version.h"
 #include "st.h"
 #endif
 
@@ -117,8 +117,8 @@ tk_do_callback(argc, argv, self)
                        ID_call, argc - 1, argv + 1);
 }
 
-static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
-static const char cmd_id_prefix[] = "cmd";
+static char *cmd_id_head = "ruby_cmd TkUtil callback ";
+static char *cmd_id_prefix = "cmd";
 
 static VALUE
 tk_install_cmd_core(cmd)
@@ -205,7 +205,6 @@ fromDefaultEnc_toUTF8(str, self)
     return tk_toUTF8(1, argv, self);
 }
 
-#if 0
 static VALUE
 fromUTF8_toDefaultEnc(str, self)
     VALUE str;
@@ -216,7 +215,6 @@ fromUTF8_toDefaultEnc(str, self)
     argv[0] = str;
     return tk_fromUTF8(1, argv, self);
 }
-#endif
 
 static int
 to_strkey(key, value, hash)
@@ -793,7 +791,7 @@ get_eval_string_core(obj, enc_flag, self)
                 return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
             }
         } else {
-#ifdef HAVE_RB_SYM_TO_S
+#ifdef RUBY_VM
             return rb_sym_to_s(obj);
 #else
             return rb_str_new2(rb_id2name(SYM2ID(obj)));
@@ -970,14 +968,12 @@ tcl2rb_bool(self, value)
     }
 }
 
-#if 0
 static VALUE
 tkstr_to_dec(value)
     VALUE value;
 {
     return rb_cstr_to_inum(RSTRING_PTR(value), 10, 1);
 }
-#endif
 
 static VALUE
 tkstr_to_int(value)
@@ -1081,8 +1077,8 @@ tcl2rb_num_or_str(self, value)
 struct cbsubst_info {
     int   full_subst_length;
     int   keylen[CBSUBST_TBL_MAX];
-    char  *key[CBSUBST_TBL_MAX];
-    char  type[CBSUBST_TBL_MAX];
+    unsigned char  *key[CBSUBST_TBL_MAX];
+    unsigned char  type[CBSUBST_TBL_MAX];
     ID    ivar[CBSUBST_TBL_MAX];
     VALUE proc;
     VALUE aliases;
@@ -1104,9 +1100,9 @@ subst_free(ptr)
 
     if (ptr) {
       for(i = 0; i < CBSUBST_TBL_MAX; i++) {
-	if (ptr->key[i] != NULL) {
+	if (ptr->key[i] != (unsigned char *)NULL) {
 	  free(ptr->key[i]);
-	  ptr->key[i] = NULL;
+	  ptr->key[i] = (unsigned char *)NULL;
 	}
       }
       free(ptr);
@@ -1126,7 +1122,7 @@ allocate_cbsubst_info()
 
   for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
     inf->keylen[idx] = 0;
-    inf->key[idx]    = NULL;
+    inf->key[idx]    = (unsigned char *) NULL;
     inf->type[idx]   = '\0';
     inf->ivar[idx]   = (ID) 0;
   }
@@ -1244,7 +1240,7 @@ cbsubst_sym_to_subst(self, sym)
 {
     struct cbsubst_info *inf;
     const char *str;
-    char *buf, *ptr;
+    unsigned char *buf, *ptr;
     int idx, len;
     ID id;
     volatile VALUE ret;
@@ -1277,7 +1273,7 @@ cbsubst_sym_to_subst(self, sym)
       ptr += len;
     } else {
       /* single char */
-      *(ptr++) = (unsigned char)idx;
+      *(ptr++) = idx;
     }
 
     *(ptr++) = ' ';
@@ -1298,7 +1294,7 @@ cbsubst_get_subst_arg(argc, argv, self)
 {
     struct cbsubst_info *inf;
     const char *str;
-    char *buf, *ptr;
+    unsigned char *buf, *ptr;
     int i, idx, len;
     ID id;
     volatile VALUE arg_sym, ret;
@@ -1343,7 +1339,7 @@ cbsubst_get_subst_arg(argc, argv, self)
 	  ptr += len;
 	} else {
 	  /* single char */
-	  *(ptr++) = (unsigned char)idx;
+	  *(ptr++) = idx;
 	}
 
 	*(ptr++) = ' ';
@@ -1368,7 +1364,7 @@ cbsubst_get_subst_key(self, str)
     volatile VALUE ret;
     VALUE keyval;
     int i, len, keylen, idx;
-    char *buf, *ptr, *key;
+    unsigned char *buf, *ptr, *key;
 
     list = rb_funcall(cTclTkLib, ID_split_tklist, 1, str);
     len = RARRAY_LEN(list);
@@ -1376,11 +1372,11 @@ cbsubst_get_subst_key(self, str)
     Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
                     struct cbsubst_info, inf);
 
-    ptr = buf = ALLOC_N(char, inf->full_subst_length + len + 1);
+    ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + len + 1);
 
     for(i = 0; i < len; i++) {
       keyval = RARRAY_PTR(list)[i];
-      key = RSTRING_PTR(keyval);
+      key = (unsigned char*)RSTRING_PTR(keyval);
       if (*key == '%') {
 	if (*(key + 2) == '\0') {
 	  /* single char */
@@ -1390,7 +1386,7 @@ cbsubst_get_subst_key(self, str)
 	  keylen = RSTRING_LEN(keyval) - 1;
 	  for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
 	    if (inf->keylen[idx] != keylen) continue;
-	    if ((unsigned char)inf->key[idx][0] != (unsigned char)*(key + 1)) continue;
+	    if (inf->key[idx][0] != *(key + 1)) continue;
 	    if (strncmp(inf->key[idx], key + 1, keylen)) continue;
 	    break;
 	  }
@@ -1406,7 +1402,7 @@ cbsubst_get_subst_key(self, str)
     }
     *ptr = '\0';
 
-    ret = rb_str_new2(buf);
+    ret = rb_str_new2((const char*)buf);
     free(buf);
     return ret;
 }
@@ -1416,16 +1412,16 @@ cbsubst_get_all_subst_keys(self)
     VALUE self;
 {
     struct cbsubst_info *inf;
-    char *buf, *ptr;
-    char *keys_buf, *keys_ptr;
+    unsigned char *buf, *ptr;
+    unsigned char *keys_buf, *keys_ptr;
     int idx, len;
     volatile VALUE ret;
 
     Data_Get_Struct(rb_const_get(self, ID_SUBST_INFO), 
                     struct cbsubst_info, inf);
 
-    ptr = buf = ALLOC_N(char, inf->full_subst_length + 1);
-    keys_ptr = keys_buf = ALLOC_N(char, CBSUBST_TBL_MAX + 1);
+    ptr = buf = ALLOC_N(unsigned char, inf->full_subst_length + 1);
+    keys_ptr = keys_buf = ALLOC_N(unsigned char, CBSUBST_TBL_MAX + 1);
 
     for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
       if (inf->ivar[idx] == (ID) 0) continue;
@@ -1449,7 +1445,7 @@ cbsubst_get_all_subst_keys(self)
     *ptr = '\0';
     *keys_ptr = '\0';
 
-    ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2(buf));
+    ret = rb_ary_new3(2, rb_str_new2(keys_buf), rb_str_new2((const char*)buf));
 
     free(buf);
     free(keys_buf);
diff --git a/ext/win32ole/doc/win32ole.rd b/ext/win32ole/doc/win32ole.rd
new file mode 100644
index 0000000000..c563ce5d5b
--- /dev/null
+++ b/ext/win32ole/doc/win32ole.rd
@@ -0,0 +1,294 @@
+=begin
+= Win32OLE extension module
+
+== WIN32OLE 
+=== Constants
+: VERSION
+    The version number of WIN32OLE.
+
+: ARGV
+    The argument of the method invoked recently.
+    This constant is used to get value of argument 
+    when the argument is passed by reference.
+
+=== Class Method
+: connect(oleserver)
+   returns running OLE automation object or WIN32OLE object from moniker.
+
+: const_load(ole [,obj])
+   defines the constants of OLE automation
+   server as 'obj' class constants. If 'obj' omitted, the default
+   is WIN32OLE.
+
+: new(oleserver)
+   returns OLE Automation object.
+
+: ole_free(obj)
+   invokes Release method of Dispatch interface of WIN32OLE object.
+   This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_reference_count(obj)
+   returns reference counter of Dispatch interface.
+   This method should not be used because this method exists for debugging WIN32OLE.
+
+: ole_show_help(info [,helpcontext])
+   displays helpfile.
+   The first argument specifies WIN32OLE_TYPE object or WIN32OLE_METHOD object 
+   or helpfile.
+
+=== Method
+: self[property]
+   gets property of OLE object.
+
+: self[property]=
+   sets property of OLE object.
+
+: _invoke(dispid, args, types)
+   runs the early binding method.
+   The dispid specifies Dispatch ID, args specifies the array of arguments,
+   types specifies array of the type of arguments.
+
+: each {...}
+   Iterates over each item of OLE collection which has IEnumVARIANT
+   interface.
+
+: invoke(method, args,...)
+   runs OLE method.
+
+: ole_func_methods
+   returns array of WIN32OLE_METHOD object which corresponds with function.
+
+: ole_get_methods
+   returns array of WIN32OLE_METHOD object which corresponds with get properties.
+
+: ole_method(method)
+   returns WIN32OLE_METHOD object which coreesponds with method 
+   which specified by argument.
+
+: ole_method_help(method)
+   alias of ole_method.
+
+: ole_methods
+   returns WIN32OLE_METHOD object which coreesponds with method.
+
+: ole_obj_help
+   returns WIN32OLE_TYPE object.
+
+: ole_put_methods
+   returns array of WIN32OLE_METHOD object which corresponds with put properties.
+
+: setproperty(property, key, val)
+   set property of OLE object. 
+   This method is used when the property has argument.
+
+   For example, in VB
+     obj.item("key") = val
+   in Win32OLE
+     obj.setproperty("item", "key", val)
+
+
+== WIN32OLE_EVENT class
+
+=== Class Method
+
+: new(ole, interface)
+   The new class method creates OLE event sink object to connect ole.
+   The ole must be WIN32OLE object, and interface is the interface
+   name of event.
+
+: message_loop
+    The message_loop class method translates and dispatches Windows 
+    message.
+
+=== Method
+: on_event([event]){...}
+    defines the callback of event.
+    If event omitted, defines the callback of all events.
+
+: on_event_with_outargs([event]) {...}
+    defines the callback of event.
+    If you want modify argument in callback, 
+
+== WIN32OLE_METHOD
+
+=== Class Methods
+: new(win32ole_type, method)    
+   creates WIN32OLE_METHOD object.
+
+=== Methods
+: dispid
+   returns Dispatch ID.
+
+: event?
+   returns true if the method is event.
+
+: event_interface
+   returns interface name of event if the method is event.
+
+: helpcontext
+   returns help context.
+
+: helpfile
+   returns help file.
+
+: invkind
+   returns invkind.
+
+: invoke_kind
+   returns invoke kind string.
+
+: name
+   returns name of method.
+
+: offset_vtbl
+   returns the offset of Vtbl.
+
+: params
+   returns array of WIN32OLE_PARAM object.
+
+: return_type
+   returns string of return value type of method.
+
+: return_vtype
+   returns number of return value type of method.
+
+: return_type_detail
+   returns detail information of return value type of method.
+
+: size_params
+   returns the size of arguments.
+
+: size_opt_params
+   returns the size of optional arguments.
+
+: visible?
+   returns true if the method is public.
+
+== WIN32OLE_PARAM
+: default
+   returns default value.
+
+: input?
+   returns true if argument is input.
+
+: optional?
+   returns true if argument is optional.
+
+: output?
+   returns true if argument is output.
+
+: name
+   returns name.
+
+: ole_type
+   returns type of argument.
+
+: ole_type_detail
+   returns detail information of type of argument.
+
+: retval?
+   returns true if argument is return value.
+
+== WIN32OLE_TYPE
+=== Class Methods
+: new(typelibrary, class)
+    returns WIN32OLE_TYPE object.
+
+: ole_classes(typelibrary)
+    returns array of WIN32OLE_TYPE objects defined by Type Library.
+
+: progids
+    returns array of ProgID.
+
+: typelibs
+    returns array of type libraries.
+
+=== Methods
+: guid
+   returns GUID.
+
+: helpfile
+   returns helpfile.
+
+: helpcontext
+   returns helpcontext.
+
+: helpstring
+   returns help string.
+
+: major_version
+   returns major version.
+
+: minor_version
+   returns minor version.
+
+: name
+   returns name.
+
+: ole_methods
+   returns array of WIN32OLE_METHOD objects.
+
+: ole_type
+   returns type of class.
+
+: progid
+   returns ProgID if it exists. If not found, then returns nil.
+
+: src_type
+   returns source class when the OLE class is 'Alias'.
+
+: typekind
+   returns number which represents type.
+
+: variables
+   returns array of variables defined in OLE class.
+
+: visible?
+   returns true if the OLE class is public.
+
+== WIN32OLE_VARIABLE
+=== Methods
+: name
+   returns the name.
+
+: ole_type
+   returns type
+
+: ole_type_detail
+   returns detail information of type.
+
+: value
+   returns value.
+
+: variable_kind
+   returns variable kind string.
+
+: varkind
+   returns the number which represents variable kind.
+
+== WIN32OLE::VARIANT
+=== Constants
+  *VT_I4
+  *VT_R4
+  *VT_R8
+  *VT_CY
+  *VT_DATE
+  *VT_BSTR
+  *VT_USERDEFINED
+  *VT_PTR
+  *VT_DISPATCH
+  *VT_ERROR
+  *VT_BOOL
+  *VT_VARIANT
+  *VT_UNKNOWN
+  *VT_I1
+  *VT_UI1
+  *VT_UI2
+  *VT_UI4
+  *VT_INT
+  *VT_UINT
+  *VT_ARRAY
+  *VT_BYREF
+
+=end
+
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index d8534291e4..cee922554a 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -1,6 +1,7 @@
 #----------------------------------
 # extconf.rb
 # $Revision$
+# $Date$
 #----------------------------------
 require 'mkmf'
 
@@ -31,7 +32,6 @@ def create_win32ole_makefile
   end
 end
 
-
 case RUBY_PLATFORM
 when /mswin32/
   $CFLAGS += ' /W3'
diff --git a/ext/win32ole/sample/excel1.rb b/ext/win32ole/sample/excel1.rb
index 2cad84a488..e366a52839 100644
--- a/ext/win32ole/sample/excel1.rb
+++ b/ext/win32ole/sample/excel1.rb
@@ -1,33 +1,22 @@
 require 'win32ole'
 
+#application = WIN32OLE.new('Excel.Application.5')
 application = WIN32OLE.new('Excel.Application')
 
 application.visible = TRUE
 workbook = application.Workbooks.Add();
 worksheet = workbook.Worksheets(1);
-
-=begin
 worksheet.Range("A1:D1").value = ["North","South","East","West"];
 worksheet.Range("A2:B2").value = [5.2, 10];
-
 worksheet.Range("C2").value = 8;
 worksheet.Range("D2").value = 20;
-=end
 
-worksheet.Range("A1:B2").value = [["North","South"],
-                                  [5.2, 10]];
-
-vals = WIN32OLE_VARIANT.new([["East","West"], 
-                             [8, 20]], 
-                            WIN32OLE::VARIANT::VT_ARRAY) 
-worksheet.Range("C1:D2").value = vals
-                                 
 range = worksheet.Range("A1:D2");
 range.Select
 chart = workbook.Charts.Add;
 
 workbook.saved = TRUE;
-sleep 0.5
+
 application.ActiveWorkbook.Close(0);
 application.Quit();
 
diff --git a/ext/win32ole/sample/excel2.rb b/ext/win32ole/sample/excel2.rb
index dbe4178051..46f459b36b 100644
--- a/ext/win32ole/sample/excel2.rb
+++ b/ext/win32ole/sample/excel2.rb
@@ -9,14 +9,14 @@ excel = WIN32OLE.new("excel.application")
 
 # Create and rotate the chart
 
-excel.visible = TRUE;
+excel['Visible'] = TRUE;
 excel.Workbooks.Add();
-excel.Range("a1").value = 3;
-excel.Range("a2").value = 2;
-excel.Range("a3").value = 1;
+excel.Range("a1")['Value'] = 3;
+excel.Range("a2")['Value'] = 2;
+excel.Range("a3")['Value'] = 1;
 excel.Range("a1:a3").Select();
 excelchart = excel.Charts.Add();
-excelchart.type = ChartTypeVal;
+excelchart['Type'] = ChartTypeVal;
 
 i = 30
 i.step(180, 10) do |rot|
diff --git a/ext/win32ole/sample/olegen.rb b/ext/win32ole/sample/olegen.rb
index df6fe7adaa..48d86893fe 100644
--- a/ext/win32ole/sample/olegen.rb
+++ b/ext/win32ole/sample/olegen.rb
@@ -1,5 +1,6 @@
 #-----------------------------
 # olegen.rb
+# $Date$
 # $Revision$
 #-----------------------------
 
@@ -230,7 +231,7 @@ class WIN32COMGen
       v.visible? && v.variable_kind == 'CONSTANT'
     }.each do |v|
       io.print "  "
-      io.print v.name.sub(/^./){$&.upcase}
+      io.print v.name.sub(/^./){|c| c.upcase}
       io.print " = "
       io.puts  v.value
     end
diff --git a/ext/win32ole/tests/oleserver.rb b/ext/win32ole/tests/oleserver.rb
new file mode 100644
index 0000000000..bf721373e5
--- /dev/null
+++ b/ext/win32ole/tests/oleserver.rb
@@ -0,0 +1,10 @@
+require 'win32ole'
+def oletypelib_name(pat)
+  WIN32OLE_TYPE.typelibs.each do |lib|
+    return lib if pat =~ lib
+  end
+end
+module OLESERVER
+  MS_EXCEL_TYPELIB = oletypelib_name(/^Microsoft Excel .* Object Library$/)
+  MS_XML_TYPELIB = oletypelib_name(/^Microsoft XML/)
+end
diff --git a/ext/win32ole/tests/testNIL2VTEMPTY.rb b/ext/win32ole/tests/testNIL2VTEMPTY.rb
new file mode 100644
index 0000000000..555d35fbf3
--- /dev/null
+++ b/ext/win32ole/tests/testNIL2VTEMPTY.rb
@@ -0,0 +1,28 @@
+# This is test script to check that WIN32OLE should convert nil to VT_EMPTY in second try.
+# [ruby-talk:137054]
+
+require 'win32ole'
+require 'test/unit'
+
+class TestNIL2VT_EMPTY < Test::Unit::TestCase
+  def setup
+    fs = WIN32OLE.new('Scripting.FileSystemObject')
+    @path = fs.GetFolder(".").path
+  end
+  def test_openSchema
+    con = nil
+    begin
+      con = WIN32OLE.new('ADODB.Connection')
+      con.connectionString = "Provider=MSDASQL;Extended Properties="
+      con.connectionString +="\"DRIVER={Microsoft Text Driver (*.txt; *.csv)};DBQ=#{@path}\""
+      con.open
+    rescue
+      con = nil
+    end
+    if con
+      rs = con.openSchema(4, [nil,nil,"DUMMY", "TABLE"])
+      assert(rs)
+    end
+  end
+end
+
diff --git a/ext/win32ole/tests/testOLEMETHOD.rb b/ext/win32ole/tests/testOLEMETHOD.rb
new file mode 100644
index 0000000000..390c9999f8
--- /dev/null
+++ b/ext/win32ole/tests/testOLEMETHOD.rb
@@ -0,0 +1,92 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEMETHOD < RUNIT::TestCase
+  include OLESERVER
+  def setup
+    @excel_app = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+  end
+  def test_s_new
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_instance_of(WIN32OLE_METHOD, m)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert_instance_of(WIN32OLE_METHOD, m)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'workbookopen')
+    assert_instance_of(WIN32OLE_METHOD, m)
+  end
+  def test_name
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_equal('Quit', m.name)
+  end
+  def test_to_s
+    m = WIN32OLE_METHOD.new(@excel_app, 'Quit')
+    assert_equal('Quit', "#{m}")
+  end
+  def test_return_type
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal('Range', m.return_type)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal('BSTR', m.return_type)
+  end
+  def test_return_vtype
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal(WIN32OLE::VARIANT::VT_PTR, m.return_vtype)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal(WIN32OLE::VARIANT::VT_BSTR, m.return_vtype)
+  end
+  def test_return_type_detail
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal(['PTR', 'USERDEFINED', 'Range'], m.return_type_detail)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActivePrinter')
+    assert_equal(['BSTR'], m.return_type_detail)
+  end
+
+  def test_invoke_kind
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_equal('PROPERTYGET', m.invoke_kind)
+  end
+  def test_visible
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(m.visible?)
+    m = WIN32OLE_METHOD.new(@excel_app, 'AddRef')
+    assert(!m.visible?)
+  end
+  def test_event
+    m =  WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert(m.event?)
+    m =  WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(!m.event?)
+  end
+  def test_event_interface
+    m = WIN32OLE_METHOD.new(@excel_app, 'WorkbookOpen')
+    assert_equal('AppEvents', m.event_interface)
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_nil(m.event_interface)
+  end
+  def test_helpstring
+    domdoc = WIN32OLE_TYPE.new(MS_XML_TYPELIB, 'DOMDocument')
+    m =  WIN32OLE_METHOD.new(domdoc, 'abort')
+    assert_equal('abort an asynchronous download', m.helpstring)
+  end
+  def test_helpfile
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert_match(/VBAXL.*\.(HLP|CHM)$/i, m.helpfile)
+  end
+  def test_helpcontext
+    m = WIN32OLE_METHOD.new(@excel_app, 'ActiveCell')
+    assert(m.helpcontext > 0)
+  end
+  def test_offset_vtbl
+    m = WIN32OLE_METHOD.new(@excel_app, 'QueryInterface')
+    assert_equal(0, m.offset_vtbl)
+  end
+  def test_dispid
+    tobj = WIN32OLE_TYPE.new('Microsoft Shell Controls And Automation', 'FolderItem2')
+    method = WIN32OLE_METHOD.new(tobj, 'InvokeVerb')
+    assert_equal(1610743824, method.dispid)
+  end
+end
diff --git a/ext/win32ole/tests/testOLEPARAM.rb b/ext/win32ole/tests/testOLEPARAM.rb
new file mode 100644
index 0000000000..4014fadbfc
--- /dev/null
+++ b/ext/win32ole/tests/testOLEPARAM.rb
@@ -0,0 +1,65 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEPARAM < RUNIT::TestCase
+  include OLESERVER
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    sh = classes.find {|c| c.name == 'Worksheet'}
+    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+    param_names = saveas.params.collect{|p| p.name}
+    assert(param_names.size > 0)
+    assert(param_names.include?('Filename'))
+  end
+  def test_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    sh = classes.find {|c| c.name == 'Worksheet'}
+    saveas = sh.ole_methods.find {|m| m.name == 'SaveAs'}
+    param_names = saveas.params.collect{|p| "#{p}"}
+    assert(param_names.include?('Filename'))
+  end
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal('BSTR', f.params[0].ole_type)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal('XlSaveAsAccessMode', f.params[6].ole_type)
+  end
+  def test_ole_type_detail
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal(['BSTR'], f.params[0].ole_type_detail)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert_equal(['USERDEFINED', 'XlSaveAsAccessMode'], f.params[6].ole_type_detail)
+  end
+  def test_input
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(f.params[0].input?)
+  end
+  
+  def test_output
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(!f.params[0].output?)
+  end
+  def test_optional
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    methods = classes.find {|c| c.name == 'Worksheet'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(!f.params[0].optional?)
+    methods = classes.find {|c| c.name == 'Workbook'}.ole_methods
+    f = methods.find {|m| m.name == 'SaveAs'}
+    assert(f.params[0].optional?)
+  end
+end
diff --git a/ext/win32ole/tests/testOLETYPE.rb b/ext/win32ole/tests/testOLETYPE.rb
new file mode 100644
index 0000000000..d4eb1146e1
--- /dev/null
+++ b/ext/win32ole/tests/testOLETYPE.rb
@@ -0,0 +1,96 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLETYPE < RUNIT::TestCase
+  include OLESERVER
+  def test_s_new
+    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+    assert_instance_of(WIN32OLE_TYPE, type)
+  end
+  def test_s_ole_classes
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    assert(classes.size > 0)
+  end
+  def test_s_typelibs
+    libs = WIN32OLE_TYPE.typelibs
+    assert(libs.include?(MS_EXCEL_TYPELIB))
+    assert(libs.include?(MS_XML_TYPELIB))
+  end
+  def test_s_progids
+    progids = WIN32OLE_TYPE.progids
+    assert(progids.include?('Excel.Application'))
+  end
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    class_names = classes.collect{|c|
+      c.name
+    }
+    assert(class_names.include?('Application'))
+  end
+
+  def test_class_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    class_names = classes.collect{|c|
+      "#{c}"
+    }
+    assert(class_names.include?('Application'))
+  end
+
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert_equal('Class', app.ole_type)
+    app = classes.find {|c| c.name == '_Application'}
+    assert_equal('Dispatch', app.ole_type)
+  end
+  def test_typekind
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert_equal(5, app.typekind)
+  end
+  def test_visible
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    app = classes.find {|c| c.name == 'Application'}
+    assert(app.visible?)
+    app = classes.find {|c| c.name == 'IAppEvents'}
+    assert(!app.visible?)
+  end
+  def test_src_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+    domnode = classes.find {|c| c.name == 'DOMNodeType'}
+    assert_equal('tagDOMNodeType', domnode.src_type)
+  end
+  def test_helpstring
+    classes = WIN32OLE_TYPE.ole_classes(MS_XML_TYPELIB)
+    domdoc = classes.find {|c| c.name == 'DOMDocument'}
+    assert_equal('W3C-DOM XML Document', domdoc.helpstring)
+  end
+  def test_variables
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    xlchart = classes.find {|c| c.name == 'XlChartType'}
+    assert(xlchart.variables.size > 0)
+  end
+  def test_ole_methods
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert(worksheet.ole_methods.size > 0)
+  end
+  def test_helpfile
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert_match(/VBAXL.*\.(CHM|HLP)$/, worksheet.helpfile)
+  end
+  def test_helpcontext
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    worksheet = classes.find {|c| c.name == 'Worksheet'}
+    assert_equal(131088, worksheet.helpcontext)
+  end
+  def test_to_s
+    type = WIN32OLE_TYPE.new(MS_EXCEL_TYPELIB, 'Application')
+    assert_equal("Application", "#{type}");
+  end
+end
diff --git a/ext/win32ole/tests/testOLEVARIABLE.rb b/ext/win32ole/tests/testOLEVARIABLE.rb
new file mode 100644
index 0000000000..b4bb0b57d9
--- /dev/null
+++ b/ext/win32ole/tests/testOLEVARIABLE.rb
@@ -0,0 +1,49 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+require 'oleserver'
+
+class TestOLEVARIABLE < RUNIT::TestCase
+  include OLESERVER
+  def test_name
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var_names = chart.variables.collect {|m| m.name}
+    assert(var_names.size > 0)
+    assert(var_names.include?('xl3DColumn'))
+  end
+  def test_to_s
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var_names = chart.variables.collect {|m| "#{m}"}
+    assert(var_names.size > 0)
+    assert(var_names.include?('xl3DColumn'))
+  end
+  def test_ole_type
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal('INT', var.ole_type)
+  end
+  def test_ole_type_detail
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal(['INT'], var.ole_type_detail)
+  end
+
+  def test_value
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert_equal(-4100, var.value)
+  end
+  def test_visible
+    classes = WIN32OLE_TYPE.ole_classes(MS_EXCEL_TYPELIB)
+    chart = classes.find {|c| c.name == 'XlChartType'}
+    var = chart.variables.find {|m| m.name == 'xl3DColumn'}
+    assert(var.visible?)
+  end
+end
diff --git a/ext/win32ole/tests/testVARIANT.rb b/ext/win32ole/tests/testVARIANT.rb
new file mode 100644
index 0000000000..f274778f27
--- /dev/null
+++ b/ext/win32ole/tests/testVARIANT.rb
@@ -0,0 +1,32 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'rubyunit'
+
+require 'win32ole'
+
+class TestWin32OLE_VARIANT < RUNIT::TestCase
+  include WIN32OLE::VARIANT
+  def test_variant
+    assert_equal(2, VT_I2)
+    assert_equal(3, VT_I4)
+    assert_equal(4, VT_R4)
+    assert_equal(5, VT_R8)
+    assert_equal(6, VT_CY)
+    assert_equal(7, VT_DATE)
+    assert_equal(8, VT_BSTR)
+    assert_equal(9, VT_DISPATCH)
+    assert_equal(10, VT_ERROR)
+    assert_equal(11, VT_BOOL)
+    assert_equal(12, VT_VARIANT)
+    assert_equal(13, VT_UNKNOWN)
+    assert_equal(16, VT_I1)
+    assert_equal(17, VT_UI1)
+    assert_equal(18, VT_UI2)
+    assert_equal(19, VT_UI4)
+    assert_equal(22, VT_INT)
+    assert_equal(23, VT_UINT)
+    assert_equal(0x2000, VT_ARRAY)
+    assert_equal(0x4000, VT_BYREF)
+  end
+end
+
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
new file mode 100644
index 0000000000..d7f9dd2543
--- /dev/null
+++ b/ext/win32ole/tests/testWIN32OLE.rb
@@ -0,0 +1,373 @@
+# You need RubyUnit and MS Excel and MSI to run this test script 
+
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+require 'win32ole'
+require 'oleserver'
+
+module EXCEL_CONST
+end
+
+module CONST1
+end
+
+module CONST2
+end
+
+module CONST3
+end
+
+class TestWin32OLE < RUNIT::TestCase
+  include OLESERVER
+  def setup
+    @excel = WIN32OLE.new("Excel.Application")
+    @excel.visible = true
+  end
+  def test_s_new
+    assert_instance_of(WIN32OLE, @excel)
+  end
+  def test_s_new_DCOM
+    rexcel = WIN32OLE.new("Excel.Application", "localhost")
+    assert_instance_of(WIN32OLE, rexcel)
+    rexcel.visible = true
+    rexcel.quit
+  end
+  def test_s_new_from_clsid
+    excel = WIN32OLE.new("{00024500-0000-0000-C000-000000000046}")
+    assert_instance_of(WIN32OLE, excel)
+    excel.quit
+    exc = assert_exception(WIN32OLERuntimeError) {
+      WIN32OLE.new("{000}")
+    }
+    assert_match(/unknown OLE server: `\{000\}'/, exc.message)
+  end
+  def test_s_connect
+    excel2 = WIN32OLE.connect('Excel.Application')
+    assert_instance_of(WIN32OLE, excel2)
+  end
+
+  def test_s_const_load
+    assert(!defined?(EXCEL_CONST::XlTop))
+    WIN32OLE.const_load(@excel, EXCEL_CONST)
+    assert_equal(-4160, EXCEL_CONST::XlTop)
+
+    assert(!defined?(CONST1::XlTop))
+    WIN32OLE.const_load(MS_EXCEL_TYPELIB, CONST1)
+    assert_equal(-4160, CONST1::XlTop)
+  end
+
+  def test_s_codepage
+    assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage)
+  end
+
+  def test_s_codepage_set
+    WIN32OLE.codepage = WIN32OLE::CP_UTF8
+    assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage)
+    WIN32OLE.codepage = WIN32OLE::CP_ACP
+  end
+
+  def test_const_CP_ACP
+    assert_equal(0, WIN32OLE::CP_ACP)
+  end
+
+  def test_const_CP_OEMCP
+    assert_equal(1, WIN32OLE::CP_OEMCP)
+  end
+
+  def test_const_CP_MACCP
+    assert_equal(2, WIN32OLE::CP_MACCP)
+  end
+
+  def test_const_CP_THREAD_ACP
+    assert_equal(3, WIN32OLE::CP_THREAD_ACP)
+  end
+
+  def test_const_CP_SYMBOL
+    assert_equal(42, WIN32OLE::CP_SYMBOL)
+  end
+
+  def test_const_CP_UTF7
+    assert_equal(65000, WIN32OLE::CP_UTF7)
+  end
+
+  def test_const_CP_UTF8
+    assert_equal(65001, WIN32OLE::CP_UTF8)
+  end
+
+  def test_s_codepage_changed
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      WIN32OLE.codepage = WIN32OLE::CP_UTF8
+      sheet.range("A1").value = [0x3042].pack("U*")
+      val = sheet.range("A1").value
+      assert_equal("\343\201\202", val)
+      WIN32OLE.codepage = WIN32OLE::CP_ACP
+      val = sheet.range("A1").value
+      assert_equal("\202\240", val)
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_get_win32ole_object
+    workbooks = @excel.Workbooks;
+    assert_instance_of(WIN32OLE, workbooks)
+  end
+  def test_each
+    workbooks = @excel.Workbooks
+    assert_no_exception {
+      i = 0;
+      workbooks.each do |workbook|
+        print i += 1
+      end
+    }
+    workbooks.add
+    workbooks.add
+    i = 0
+    workbooks.each do |workbook|
+      i+=1
+    end
+    assert_equal(2, i)
+    workbooks.each do |workbook|
+      workbook.saved = true
+    end
+  end
+  def test_setproperty_bracket
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("A1")['Value'] = 10
+      assert_equal(10, sheet.range("A1").value)
+      sheet['Cells', 1, 2] = 10
+      assert_equal(10, sheet.range("B1").value)
+      assert_equal(10, sheet['Cells', 1, 2].value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_convert_bignum
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("A1").value = 999999999
+      sheet.range("A2").value = 9999999999
+      sheet.range("A3").value = "=A1*10 + 9"
+      assert_equal(9999999999, sheet.range("A2").value)
+      assert_equal(9999999999, sheet.range("A3").value)
+      sheet.range("A4").value = "2008/03/04"
+      assert_equal("2008/03/04 00:00:00", sheet.range("A4").value)
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_ole_invoke_with_named_arg
+    book = @excel.workbooks.add
+    sheets = book.worksheets
+    sheet = book.worksheets(1)
+    num = sheets.count
+    begin
+      sheets.add({'count' => 2, 'after'=>sheet})
+      assert_equal(2, sheets.count - num);
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_ole_invoke_with_named_arg_last
+    book = @excel.workbooks.add
+    sheets = book.worksheets
+    sheet = book.worksheets(1)
+    num = sheets.count
+    begin
+      sheets.add(sheet, {'count' => 2})
+      assert_equal(2, sheets.count - num);
+    ensure
+      book.saved = true
+    end
+  end
+
+  def test_setproperty
+    @excel.setproperty('Visible', false)
+    assert_equal(false, @excel.Visible)
+    @excel.setproperty('Visible', true)
+    assert_equal(true, @excel.Visible)
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.setproperty('Cells', 1, 2, 10)
+      assert_equal(10, sheet.range("B1").value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_no_exist_property
+    isok = false
+    begin
+      @excel.unknown_prop = 1
+    rescue WIN32OLERuntimeError
+      isok = true
+    end
+    assert(isok)
+
+    isok = false
+    begin
+      @excel['unknown_prop'] = 2
+    rescue WIN32OLERuntimeError
+      isok = true
+    end
+    assert(isok)
+  end
+
+  def test_setproperty_with_equal
+    book = @excel.workbooks.add
+    sheet = book.worksheets(1)
+    begin
+      sheet.range("B1").value = 10
+      assert_equal(10, sheet.range("B1").value)
+      sheet.range("C1:D1").value = [11, 12]
+      assert_equal(11, sheet.range("C1").value)
+      assert_equal(12, sheet.range("D1").value)
+    ensure
+      book.saved = true
+    end
+  end
+  def test_invoke
+    workbooks = @excel.invoke( 'workbooks' )
+    assert_instance_of(WIN32OLE, workbooks)
+    book = workbooks.invoke( 'add' )
+    assert_instance_of(WIN32OLE, book)
+  end
+  def test_ole_methods
+    methods = @excel.ole_methods
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Quit"))
+  end
+  def test_ole_func_methods
+    methods = @excel.ole_func_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Quit"))
+  end
+  def test_ole_put_methods
+    methods = @excel.ole_put_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Visible"))
+  end
+  def test_ole_get_methods
+    methods = @excel.ole_get_methods
+    assert(methods.size > 0)
+    method_names = methods.collect{|m| m.name}
+    assert(method_names.include?("Visible"))
+  end
+  def test_ole_method_help
+    quit_info = @excel.ole_method_help("Quit")
+    assert_equal(0, quit_info.size_params)
+    assert_equal(0, quit_info.size_opt_params)
+
+    workbooks = @excel.Workbooks
+    add_info = workbooks.ole_method_help("Add")
+    assert_equal(1, add_info.size_params)
+    assert_equal(1, add_info.size_opt_params)
+    assert(add_info.params[0].input?)
+    assert(add_info.params[0].optional?)
+    assert_equal('VARIANT', add_info.params[0].ole_type)
+  end
+  def teardown
+    @excel.quit
+    @excel = nil
+    GC.start
+  end
+end
+
+class TestWin32OLE_WITH_MSI < RUNIT::TestCase
+  def setup
+    installer = WIN32OLE.new("WindowsInstaller.Installer")
+    @record = installer.CreateRecord(2)
+  end
+
+  # Sorry, this test fails. 
+  # Win32OLE does not support this style to set property.
+  # Use Win32OLE#setproperty or Win32OLE#[]= .
+  # def test_invoke
+  #   @record.invoke("StringData", 1, 'cccc')
+  #   assert_equal('cccc', @record.StringData(1))
+  # end
+
+  def test_setproperty
+    @record.setproperty( "StringData", 1, 'dddd')
+    assert_equal('dddd', @record.StringData(1))
+  end
+  def test_bracket_equal_with_arg
+    @record[ "StringData", 1 ] =  'ffff'
+    assert_equal('ffff', @record.StringData(1))
+  end
+
+  def test__invoke
+    shell=WIN32OLE.new('Shell.Application')
+    assert_equal(shell.NameSpace(0).title, shell._invoke(0x60020002, [0], [WIN32OLE::VARIANT::VT_VARIANT]).title)
+  end
+end
+
+# ---------------------
+#
+# a subclass of Win32OLE
+# override new() and connect()
+class MyExcel<WIN32OLE
+    def MyExcel.new 
+        super "Excel.Application"
+    end
+    def MyExcel.connect
+        super "Excel.Application"
+    end
+end
+
+class TestMyExcel < TestWin32OLE
+#
+# because we overrided new() and connect()
+# we need to change the test.
+# also, because the class will be different
+# 
+  def setup
+    @excel = MyExcel.new
+    @excel.visible = true
+  end
+  def test_s_new
+    assert_instance_of(MyExcel, @excel)
+  end
+  def test_s_connect
+    excel2 = MyExcel.connect
+    assert_instance_of(MyExcel, excel2)
+  end
+#
+# const_load didn't like to be called twice,
+# and I don't know how to undefine something in Ruby yet 
+# so, hide the test.
+#
+  private :test_s_const_load
+end
+
+if $0 == __FILE__
+  puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+  if ARGV.size == 0
+	suite = RUNIT::TestSuite.new
+	suite.add_test(TestWin32OLE.suite)
+	suite.add_test(TestMyExcel.suite)
+    begin
+      installer = WIN32OLE.new("WindowsInstaller.Installer")
+      suite.add_test(TestWin32OLE_WITH_MSI.suite)
+    rescue
+      puts "Skip some test with MSI"
+    end
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestWin32OLE.new(testmethod))
+    end
+  end
+  RUNIT::CUI::TestRunner.quiet_mode = true
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/test/win32ole/test_ole_methods.rb b/ext/win32ole/tests/test_ole_methods.rb
index ca1c03b010..ca1c03b010 100644
--- a/test/win32ole/test_ole_methods.rb
+++ b/ext/win32ole/tests/test_ole_methods.rb
diff --git a/ext/win32ole/tests/test_propertyputref.rb b/ext/win32ole/tests/test_propertyputref.rb
new file mode 100644
index 0000000000..befc35ca9c
--- /dev/null
+++ b/ext/win32ole/tests/test_propertyputref.rb
@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'win32ole'
+
+class TestWIN32OLE_PROPERTYPUTREF < Test::Unit::TestCase
+  def setup
+    begin
+      @sapi = WIN32OLE.new('SAPI.SpVoice')
+    rescue WIN32OLERuntimeError
+      @sapi = nil
+    end
+  end
+  def test_sapi
+    if @sapi
+      new_id = @sapi.getvoices.item(2).Id
+      @sapi.voice = @sapi.getvoices.item(2)
+      assert_equal(new_id, @sapi.voice.Id)
+    end
+  end
+end
diff --git a/ext/win32ole/tests/test_win32ole_event.rb b/ext/win32ole/tests/test_win32ole_event.rb
new file mode 100644
index 0000000000..744021dfd2
--- /dev/null
+++ b/ext/win32ole/tests/test_win32ole_event.rb
@@ -0,0 +1,133 @@
+begin
+  require 'win32ole'
+rescue LoadError
+end
+require 'test/unit'
+
+if defined?(WIN32OLE_EVENT)
+  class TestWIN32OLE_EVENT < Test::Unit::TestCase
+    def create_temp_html
+      fso = WIN32OLE.new('Scripting.FileSystemObject')
+      dummy_file = fso.GetTempName + ".html"
+      cfolder = fso.getFolder(".")
+      f = cfolder.CreateTextFile(dummy_file)
+      f.writeLine("<html><body>This is test HTML file for Win32OLE.</body></html>")
+      f.close
+      dummy_path = cfolder.path + "\\" + dummy_file
+      dummy_path
+    end
+
+    def setup
+      @ie = WIN32OLE.new("InternetExplorer.Application")
+      @ie.visible = true
+      @event = ""
+      @event2 = ""
+      @event3 = ""
+      @f = create_temp_html
+    end
+
+    def default_handler(event, *args)
+      @event += event
+    end
+
+    def test_on_event
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event {|*args| default_handler(*args)}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents') 
+        GC.start  
+        sleep 0.1
+      end
+      assert_match(/BeforeNavigate/, @event)
+      assert_match(/NavigateComplete/, @event)
+    end
+
+    def test_on_event2
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event('BeforeNavigate') {|*args| handler1}
+      ev.on_event('BeforeNavigate') {|*args| handler2}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert_equal("handler2", @event2)
+    end
+
+    def test_on_event3
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event {|*args| handler1}
+      ev.on_event {|*args| handler2}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert_equal("handler2", @event2)
+    end
+
+    def test_on_event4
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event{|*args| handler1}
+      ev.on_event{|*args| handler2}
+      ev.on_event('NavigateComplete'){|*args| handler3(*args)}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert(@event3!="")
+      assert("handler2", @event2)
+    end
+
+    def test_on_event5
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event {|*args| default_handler(*args)}
+      ev.on_event('NavigateComplete'){|*args| handler3(*args)}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert_match(/BeforeNavigate/, @event)
+      assert(/NavigateComplete/ !~ @event)
+      assert(@event!="")
+    end
+
+    def test_unadvise
+      ev = WIN32OLE_EVENT.new(@ie, 'DWebBrowserEvents')
+      ev.on_event {|*args| default_handler(*args)}
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert_match(/BeforeNavigate/, @event)
+      ev.unadvise
+      @event = ""
+      @ie.navigate("file:///#{@f}")
+      while @ie.busy
+        sleep 0.1
+      end
+      assert_equal("", @event);
+      assert_raise(WIN32OLERuntimeError) {
+        ev.on_event {|*args| default_handler(*args)}
+      }
+    end
+
+    def handler1
+      @event2 = "handler1"
+    end
+
+    def handler2
+      @event2 = "handler2"
+    end
+
+    def handler3(url)
+      @event3 += url
+    end
+
+    def teardown
+      @ie.quit
+      @ie = nil
+      File.unlink(@f)
+      GC.start
+    end
+  end
+end
diff --git a/ext/win32ole/tests/test_word.rb b/ext/win32ole/tests/test_word.rb
new file mode 100644
index 0000000000..53a6c521ba
--- /dev/null
+++ b/ext/win32ole/tests/test_word.rb
@@ -0,0 +1,37 @@
+#
+# This is test for [ruby-Bugs#3237]
+#
+begin
+  require 'win32ole'
+rescue LoadError
+end
+require "test/unit"
+
+if defined?(WIN32OLE)
+  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
+    
+    def setup
+      begin
+        @obj = WIN32OLE.new('Word.Application')
+      rescue WIN32OLERuntimeError
+        @obj = nil
+      end
+    end
+
+    def test_ole_methods
+      if @obj
+        @obj.visible = true
+        @obj.wordbasic.disableAutoMacros(true)
+        assert(true)
+      end
+    end
+
+    def teardown
+      if @obj
+        @obj.quit
+        @obj = nil
+      end
+    end
+
+  end
+end
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
new file mode 100644
index 0000000000..553ce88509
--- /dev/null
+++ b/ext/win32ole/tests/testall.rb
@@ -0,0 +1,16 @@
+require 'rubyunit'
+require 'win32ole'
+puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
+# RUNIT::CUI::TestRunner.quiet_mode = true
+require "testWIN32OLE"
+require "testOLETYPE"
+require "testOLEPARAM"
+require "testOLEMETHOD"
+require "testOLEVARIABLE"
+require "testVARIANT"
+require "testNIL2VTEMPTY"
+require "test_ole_methods.rb"
+require "test_propertyputref.rb"
+require "test_word.rb"
+require "test_win32ole_event.rb"
+# require "testOLEEVENT"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 6ea4662668..ae0066ffc9 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -12,19 +12,16 @@
  */
 
 /*
+  $Date$
   modified for win32ole (ruby) by Masaki.Suketa <masaki.suketa@nifty.ne.jp>
  */
 
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/encoding.h"
-#include <ctype.h>
+#include "ruby.h"
+#include "st.h"
 #include <windows.h>
 #include <ocidl.h>
 #include <olectl.h>
 #include <ole2.h>
-#include <stdlib.h>
-#include <math.h>
 #ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
 #define va_init_list(a,b) va_start(a,b)
@@ -57,30 +54,6 @@
 #define V_BOOL(X) V_UNION(X,boolVal)
 #endif
 
-#ifndef V_I1REF
-#define V_I1REF(X) V_UNION(X, pcVal)
-#endif
-
-#ifndef U_UI2REF
-#define V_UI2REF(X) V_UNION(X, puiVal)
-#endif
-
-#ifndef V_INT
-#define V_INT(X) V_UNION(X, intVal)
-#endif
-
-#ifndef V_INTREF
-#define V_INTREF(X) V_UNION(X, pintVal)
-#endif
-
-#ifndef V_UINT
-#define V_UINT(X) V_UNION(X, uintVal)
-#endif
-
-#ifndef V_UINTREF
-#define V_UINTREF(X) V_UNION(X, puintVal)
-#endif
-
 #define OLE_RELEASE(X) (X) ? ((X)->lpVtbl->Release(X)) : 0
 
 #define OLE_ADDREF(X) (X) ? ((X)->lpVtbl->AddRef(X)) : 0
@@ -89,7 +62,7 @@
 #define OLE_RELEASE_TYPEATTR(X, Y) ((X)->lpVtbl->ReleaseTypeAttr((X), (Y)))
 
 #define OLE_FREE(x) {\
-    if(g_ole_initialized == TRUE) {\
+    if(gOLEInitialized == Qtrue) {\
         if(x) {\
             OLE_RELEASE(x);\
             (x) = 0;\
@@ -104,28 +77,15 @@
     }\
 }
 
-#ifdef HAVE_LONG_LONG
-#define I8_2_NUM LL2NUM
-#define UI8_2_NUM ULL2NUM
-#define NUM2I8  NUM2LL
-#define NUM2UI8 NUM2ULL
-#else
-#define I8_2_NUM INT2NUM
-#define UI8_2_NUM UINT2NUM
-#define NUM2I8  NUM2INT
-#define NUM2UI8 NUM2UINT
-#endif
-
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "1.2.9"
+#define WIN32OLE_VERSION "0.7.6"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
 
 typedef HWND (WINAPI FNHTMLHELP)(HWND hwndCaller, LPCSTR pszFile,
                                  UINT uCommand, DWORD dwData);
-typedef BOOL (FNENUMSYSEMCODEPAGES) (CODEPAGE_ENUMPROC, DWORD);
 typedef struct {
     struct IEventSinkVtbl * lpVtbl;
 } IEventSink, *PEVENTSINK;
@@ -172,38 +132,31 @@ typedef struct tagIEVENTSINKOBJ {
     DWORD m_cRef;
     IID m_iid;
     int m_event_id;
+    DWORD m_dwCookie;
+    IConnectionPoint *pConnectionPoint;
     ITypeInfo *pTypeInfo;
+    int *ptr_freed;
 }IEVENTSINKOBJ, *PIEVENTSINKOBJ;
 
 VALUE cWIN32OLE;
-VALUE cWIN32OLE_TYPELIB;
 VALUE cWIN32OLE_TYPE;
 VALUE cWIN32OLE_VARIABLE;
 VALUE cWIN32OLE_METHOD;
 VALUE cWIN32OLE_PARAM;
 VALUE cWIN32OLE_EVENT;
-VALUE cWIN32OLE_VARIANT;
-VALUE eWIN32OLERuntimeError;
+VALUE eWIN32OLE_RUNTIME_ERROR;
 VALUE mWIN32OLE_VARIANT;
-VALUE cWIN32OLE_PROPERTY;
 
 static VALUE ary_ole_event;
 static ID id_events;
-static BOOL g_ole_initialized = FALSE;
-static BOOL g_cp_installed = FALSE;
-static BOOL g_lcid_installed = FALSE;
+static BOOL gOLEInitialized = Qfalse;
 static HINSTANCE ghhctrl = NULL;
 static HINSTANCE gole32 = NULL;
 static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
 static VALUE com_hash;
 static IDispatchVtbl com_vtbl;
-static UINT cWIN32OLE_cp = CP_ACP;
-static LCID cWIN32OLE_lcid = LOCALE_SYSTEM_DEFAULT;
-static rb_encoding *cWIN32OLE_enc;
-static UINT g_cp_to_check = CP_ACP;
-static char g_lcid_to_check[8 + 1];
+static UINT  cWIN32OLE_cp = CP_ACP;
 static VARTYPE g_nil_to = VT_ERROR;
-static st_table *enc2cp_table;
 static IMessageFilterVtbl message_filter;
 static IMessageFilter imessage_filter = { &message_filter };
 static IMessageFilter* previous_filter;
@@ -234,9 +187,8 @@ struct oleparamdata {
 };
 
 struct oleeventdata {
-    DWORD dwCookie;
-    IConnectionPoint *pConnectionPoint;
-    long event_id;
+    IEVENTSINKOBJ *pEvent;
+    int freed;
 };
 
 struct oleparam {
@@ -244,301 +196,15 @@ struct oleparam {
     OLECHAR** pNamedArgs;
 };
 
-struct olevariantdata {
-    VARIANT realvar;
-    VARIANT var;
-};
-
-
-static HRESULT ( STDMETHODCALLTYPE QueryInterface )(IDispatch __RPC_FAR *, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject);
-static ULONG ( STDMETHODCALLTYPE AddRef )(IDispatch __RPC_FAR * This);
-static ULONG ( STDMETHODCALLTYPE Release )(IDispatch __RPC_FAR * This);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfoCount )(IDispatch __RPC_FAR * This, UINT __RPC_FAR *pctinfo);
-static HRESULT ( STDMETHODCALLTYPE GetTypeInfo )(IDispatch __RPC_FAR * This, UINT iTInfo, LCID lcid, ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo);
-static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(IDispatch __RPC_FAR * This, REFIID riid, LPOLESTR __RPC_FAR *rgszNames, UINT cNames, LCID lcid, DISPID __RPC_FAR *rgDispId);
-static HRESULT ( STDMETHODCALLTYPE Invoke )( IDispatch __RPC_FAR * This, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS __RPC_FAR *pDispParams, VARIANT __RPC_FAR *pVarResult, EXCEPINFO __RPC_FAR *pExcepInfo, UINT __RPC_FAR *puArgErr);
-static IDispatch* val2dispatch(VALUE val);
-static void time2d(int hh, int mm, int ss, double *pv);
-static void d2time(double v, int *hh, int *mm, int *ss);
-static void civil2jd(int y, int m, int d, long *jd);
-static void jd2civil(long day, int *yy, int *mm, int *dd);
-static void double2time(double v, int *y, int *m, int *d, int *hh, int *mm, int *ss);
-static double time_object2date(VALUE tmobj);
-static VALUE date2time_str(double date);
-static rb_encoding *ole_cp2encoding(UINT cp);
-static UINT ole_encoding2cp(rb_encoding *enc);
-static UINT ole_init_cp();
-static char *ole_wc2mb(LPWSTR pw);
-static VALUE ole_hresult2msg(HRESULT hr);
-static void ole_freeexceptinfo(EXCEPINFO *pExInfo);
-static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo);
-static void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...);
-static void ole_initialize();
-static void ole_msg_loop();
-static void ole_free(struct oledata *pole);
-static void oletype_free(struct oletypedata *poletype);
-static void olemethod_free(struct olemethoddata *polemethod);
-static void olevariable_free(struct olevariabledata *polevar);
-static void oleparam_free(struct oleparamdata *pole);
-static LPWSTR ole_vstr2wc(VALUE vstr);
-static LPWSTR ole_mb2wc(char *pm, int len);
-static VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree);
-static VALUE ole_ary_m_entry(VALUE val, long *pid);
-static void * get_ptr_of_variant(VARIANT *pvar);
-static VALUE is_all_index_under(long *pid, long *pub, long dim);
-static void ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim,  VARTYPE vt);
-static long dimension(VALUE val);
-static long ary_len_of_dim(VALUE ary, long dim);
-static HRESULT ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt);
-static void ole_val2variant(VALUE val, VARIANT *var);
-static void ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt);
-static void ole_val2ptr_variant(VALUE val, VARIANT *var);
-static void ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt);
-static void ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar);
-static void ole_val2variant2(VALUE val, VARIANT *var);
-static VALUE make_inspect(const char *class_name, VALUE detail);
-static VALUE default_inspect(VALUE self, const char *class_name);
-static VALUE ole_set_member(VALUE self, IDispatch *dispatch);
-static VALUE fole_s_allocate(VALUE klass);
-static VALUE create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv);
-static VALUE ary_new_dim(VALUE myary, long *pid, long *plb, long dim);
-static void ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val);
-static VALUE ole_variant2val(VARIANT *pvar);
-static LONG reg_open_key(HKEY hkey, const char *name, HKEY *phkey);
-static LONG reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey);
-static VALUE reg_enum_key(HKEY hkey, DWORD i);
-static VALUE reg_get_val(HKEY hkey, const char *subkey);
-static VALUE reg_get_typelib_file_path(HKEY hkey);
-static VALUE typelib_file_from_clsid(VALUE ole);
-static VALUE typelib_file_from_typelib(VALUE ole);
-static VALUE typelib_file(VALUE ole);
-static void ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self);
-static HRESULT clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid);
-static VALUE ole_create_dcom(int argc, VALUE *argv, VALUE self);
-static VALUE ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_connect(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_const_load(int argc, VALUE *argv, VALUE self);
-static VALUE ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes);
-static ULONG reference_count(struct oledata * pole);
-static VALUE fole_s_reference_count(VALUE self, VALUE obj);
-static VALUE fole_s_free(VALUE self, VALUE obj);
-static HWND ole_show_help(VALUE helpfile, VALUE helpcontext);
-static VALUE fole_s_show_help(int argc, VALUE *argv, VALUE self);
-static VALUE fole_s_get_code_page(VALUE self);
-static BOOL CALLBACK installed_code_page_proc(LPTSTR str);
-static BOOL code_page_installed(UINT cp);
-static VALUE fole_s_set_code_page(VALUE self, VALUE vcp);
-static VALUE fole_s_get_locale(VALUE self);
-static BOOL CALLBACK installed_lcid_proc(LPTSTR str);
-static BOOL lcid_installed(LCID lcid);
-static VALUE fole_s_set_locale(VALUE self, VALUE vlcid);
-static VALUE fole_s_create_guid(VALUE self);
-static VALUE fole_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE hash2named_arg(VALUE pair, struct oleparam* pOp);
-static VALUE set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end);
-static VALUE ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket);
-static VALUE fole_invoke(int argc, VALUE *argv, VALUE self);
-static VALUE ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind);
-static VALUE fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types);
-static VALUE fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE fole_setproperty(int argc, VALUE *argv, VALUE self);
-static VALUE fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self);
-static VALUE ole_propertyput(VALUE self, VALUE property, VALUE value);
-static VALUE fole_free(VALUE self);
-static VALUE ole_each_sub(VALUE pEnumV);
-static VALUE ole_ienum_free(VALUE pEnumV);
-static VALUE fole_each(VALUE self);
-static VALUE fole_missing(int argc, VALUE *argv, VALUE self);
-static VALUE ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask);
-static VALUE ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask);
-static HRESULT typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti);
-static VALUE ole_methods(VALUE self, int mask);
-static VALUE fole_methods(VALUE self);
-static VALUE fole_get_methods(VALUE self);
-static VALUE fole_put_methods(VALUE self);
-static VALUE fole_func_methods(VALUE self);
-static VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
-static VALUE fole_type(VALUE self);
-static VALUE make_oletypelib_obj(VALUE guid, VALUE major_version, VALUE minor_version);
-static VALUE ole_typelib_from_itypelib(ITypeLib *pTypeLib);
-static VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
-static VALUE fole_typelib(VALUE self);
-static VALUE fole_query_interface(VALUE self, VALUE str_iid);
-static VALUE fole_respond_to(VALUE self, VALUE method);
-static HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-static VALUE ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
-static VALUE fole_method_help(VALUE self, VALUE cmdname);
-static VALUE fole_activex_initialize(VALUE self);
-static VALUE foletype_s_ole_classes(VALUE self, VALUE typelib);
-static VALUE foletype_s_typelibs(VALUE self);
-static VALUE foletype_s_progids(VALUE self);
-static VALUE foletype_s_allocate(VALUE klass);
-static VALUE oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
-static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass);
-static VALUE oletypelib_set_member(VALUE self, VALUE typelib, VALUE guid, VALUE version);
-static VALUE foletypelib_s_typelibs(VALUE self);
-static VALUE make_version_str(VALUE major, VALUE minor);
-static VALUE oletypelib_search_registry2(VALUE self, VALUE args);
-static VALUE oletypelib_search_registry(VALUE self, VALUE typelib);
-static VALUE foletypelib_initialize(VALUE self, VALUE args);
-static VALUE foletypelib_guid(VALUE self);
-static VALUE foletypelib_name(VALUE self);
-static VALUE foletypelib_version(VALUE self);
-static VALUE foletypelib_major_version(VALUE self);
-static VALUE foletypelib_minor_version(VALUE self);
-static VALUE oletypelib_path(VALUE guid, VALUE version);
-static VALUE foletypelib_path(VALUE self);
-static void  oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib);
-static VALUE foletypelib_visible(VALUE self);
-static VALUE foletypelib_library_name(VALUE self);
-static VALUE foletypelib_ole_types(VALUE self);
-static VALUE foletypelib_inspect(VALUE self);
-static VALUE foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass);
-static VALUE foletype_name(VALUE self);
-static VALUE ole_ole_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_ole_type(VALUE self);
-static VALUE ole_type_guid(ITypeInfo *pTypeInfo);
-static VALUE foletype_guid(VALUE self);
-static VALUE ole_type_progid(ITypeInfo *pTypeInfo);
-static VALUE foletype_progid(VALUE self);
-static VALUE ole_type_visible(ITypeInfo *pTypeInfo);
-static VALUE foletype_visible(VALUE self);
-static VALUE ole_type_major_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_major_version(VALUE self);
-static VALUE ole_type_minor_version(ITypeInfo *pTypeInfo);
-static VALUE foletype_minor_version(VALUE self);
-static VALUE ole_type_typekind(ITypeInfo *pTypeInfo);
-static VALUE foletype_typekind(VALUE self);
-static VALUE ole_type_helpstring(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpstring(VALUE self);
-static VALUE ole_type_src_type(ITypeInfo *pTypeInfo);
-static VALUE foletype_src_type(VALUE self);
-static VALUE ole_type_helpfile(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpfile(VALUE self);
-static VALUE ole_type_helpcontext(ITypeInfo *pTypeInfo);
-static VALUE foletype_helpcontext(VALUE self);
-static VALUE foletype_ole_typelib(VALUE self);
-static VALUE ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags);
-static VALUE foletype_impl_ole_types(VALUE self);
-static VALUE foletype_source_ole_types(VALUE self);
-static VALUE foletype_default_event_sources(VALUE self);
-static VALUE foletype_default_ole_types(VALUE self);
-static VALUE foletype_inspect(VALUE self);
-static VALUE ole_variables(ITypeInfo *pTypeInfo);
-static VALUE foletype_variables(VALUE self);
-static VALUE foletype_methods(VALUE self);
-static VALUE folevariable_name(VALUE self);
-static VALUE ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type(VALUE self);
-static VALUE ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_ole_type_detail(VALUE self);
-static VALUE ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_value(VALUE self);
-static VALUE ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_visible(VALUE self);
-static VALUE ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_variable_kind(VALUE self);
-static VALUE ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index);
-static VALUE folevariable_varkind(VALUE self);
-static VALUE folevariable_inspect(VALUE self);
-static VALUE olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name);
-static VALUE folemethod_s_allocate(VALUE klass);
-static VALUE folemethod_initialize(VALUE self, VALUE oletype, VALUE method);
-static VALUE folemethod_name(VALUE self);
-static VALUE ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type(VALUE self);
-static VALUE ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_vtype(VALUE self);
-static VALUE ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_return_type_detail(VALUE self);
-static VALUE ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_invkind(VALUE self);
-static VALUE folemethod_invoke_kind(VALUE self);
-static VALUE ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_visible(VALUE self);
-static VALUE ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name);
-static VALUE folemethod_event(VALUE self);
-static VALUE folemethod_event_interface(VALUE self);
-static VALUE ole_method_docinfo_from_type(ITypeInfo *pTypeInfo, UINT method_index, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
-static VALUE ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpstring(VALUE self);
-static VALUE ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpfile(VALUE self);
-static VALUE ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_helpcontext(VALUE self);
-static VALUE ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_dispid(VALUE self);
-static VALUE ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_offset_vtbl(VALUE self);
-static VALUE ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_params(VALUE self);
-static VALUE ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_size_opt_params(VALUE self);
-static VALUE ole_method_params(ITypeInfo *pTypeInfo, UINT method_index);
-static VALUE folemethod_params(VALUE self);
-static VALUE folemethod_inspect(VALUE self);
-static VALUE foleparam_name(VALUE self);
-static VALUE ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type(VALUE self);
-static VALUE ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_ole_type_detail(VALUE self);
-static VALUE ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask);
-static VALUE foleparam_input(VALUE self);
-static VALUE foleparam_output(VALUE self);
-static VALUE foleparam_optional(VALUE self);
-static VALUE foleparam_retval(VALUE self);
-static VALUE ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index);
-static VALUE foleparam_default(VALUE self);
-static VALUE foleparam_inspect(VALUE self);
-static long ole_search_event_at(VALUE ary, VALUE ev);
-static VALUE ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default);
-static void ole_delete_event(VALUE ary, VALUE ev);
-static void hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams);
-static VALUE hash2result(VALUE hash);
-static void ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams);
-static VALUE exec_callback(VALUE arg);
-static VALUE rescue_callback(VALUE arg);
-static HRESULT find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo);
-static HRESULT find_coclass(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **pTypeInfo2, TYPEATTR **pTypeAttr2);
-static HRESULT find_default_source_from_typeinfo(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, ITypeInfo **ppTypeInfo);
-static HRESULT find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo);
-static void ole_event_free(struct oleeventdata *poleev);
-static VALUE fev_s_allocate(VALUE klass);
-static VALUE ev_advise(int argc, VALUE *argv, VALUE self);
-static VALUE fev_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE fev_s_msg_loop(VALUE klass);
-static void add_event_call_back(VALUE obj, VALUE event, VALUE data);
-static VALUE ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg);
-static VALUE fev_on_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self);
-static VALUE fev_off_event(int argc, VALUE *argv, VALUE self);
-static VALUE fev_unadvise(VALUE self);
-static VALUE evs_push(VALUE ev);
-static VALUE evs_delete(long i);
-static VALUE evs_entry(long i);
-static VALUE evs_length();
-static void  olevariant_free(struct olevariantdata *pvar);
-static VALUE folevariant_s_allocate(VALUE klass);
-static VALUE folevariant_s_array(VALUE klass, VALUE dims, VALUE vvt);
-static VALUE folevariant_initialize(VALUE self, VALUE args);
-static long *ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa);
-static void unlock_safe_array(SAFEARRAY *psa);
-static SAFEARRAY *get_locked_safe_array(VALUE val);
-static VALUE folevariant_ary_aref(int argc, VALUE *argv, VALUE self);
-static VOID * val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt);
-static VALUE folevariant_ary_aset(int argc, VALUE *argv, VALUE self);
-static VALUE folevariant_value(VALUE self);
-static VALUE folevariant_vartype(VALUE self);
-static VALUE folevariant_set_value(VALUE self, VALUE val);
-static void init_enc2cp();
-static void free_enc2cp();
+static VALUE folemethod_s_allocate _((VALUE));
+static VALUE olemethod_set_member _((VALUE, ITypeInfo *, ITypeInfo *, int, VALUE));
+static VALUE foletype_s_allocate _((VALUE));
+static VALUE oletype_set_member  _((VALUE, ITypeInfo *, VALUE));
+static VALUE olemethod_from_typeinfo _((VALUE, ITypeInfo *, VALUE));
+static HRESULT ole_docinfo_from_type _((ITypeInfo *, BSTR *, BSTR *, DWORD *, BSTR *));
+static char *ole_wc2mb(LPWSTR);
+static VALUE ole_variant2val(VARIANT*);
+static void ole_val2variant(VALUE, VARIANT*);
   
 static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
     IMessageFilter __RPC_FAR * This,
@@ -703,9 +369,7 @@ static HRESULT ( STDMETHODCALLTYPE GetIDsOfNames )(
     /* [in] */ LCID lcid,
     /* [size_is][out] */ DISPID __RPC_FAR *rgDispId)
 {
-    /*
     Win32OLEIDispatch* p = (Win32OLEIDispatch*)This;
-    */
     char* psz = ole_wc2mb(*rgszNames); // support only one method
     *rgDispId = rb_intern(psz);
     free(psz);
@@ -744,7 +408,8 @@ static /* [local] */ HRESULT ( STDMETHODCALLTYPE Invoke )(
 }
 
 static IDispatch*
-val2dispatch(VALUE val)
+val2dispatch(val)
+    VALUE val;
 {
     struct st_table *tbl = DATA_PTR(com_hash);
     Win32OLEIDispatch* pdisp;
@@ -765,18 +430,22 @@ val2dispatch(VALUE val)
 }
 
 static void
-time2d(int hh, int mm, int ss, double *pv)
+time2d(hh, mm, ss, pv)
+    int hh, mm, ss;
+    double *pv;
 {
     *pv =  (hh * 60.0 * 60.0 + mm * 60.0 + ss) / 86400.0;
 }
 
 static void
-d2time(double v, int *hh, int *mm, int *ss)
+d2time(v, hh, mm, ss)
+    double v;
+    int *hh, *mm, *ss;
 {
     double d_hh, d_mm, d_ss;
     int    i_hh, i_mm, i_ss;
 
-    double d = fabs(v * 86400.0);
+    double d = v * 86400.0;
 
     d_hh = d / 3600.0;
     i_hh = (int)d_hh;
@@ -811,7 +480,9 @@ d2time(double v, int *hh, int *mm, int *ss)
 }
 
 static void
-civil2jd(int y, int m, int d, long *jd)
+civil2jd(y, m, d, jd)
+    int y, m, d;
+    long *jd;
 {
     long a, b;
     if (m <= 2) {
@@ -826,7 +497,9 @@ civil2jd(int y, int m, int d, long *jd)
 }
 
 static void
-jd2civil(long day, int *yy, int *mm, int *dd)
+jd2civil(day, yy, mm, dd)
+    long day;
+    int *yy, *mm, *dd;
 {
     long x, a, b, c, d, e;
     x = (long)(((double)day - 1867216.25) / 36524.25);
@@ -847,7 +520,9 @@ jd2civil(long day, int *yy, int *mm, int *dd)
 }
 
 static void
-double2time(double v, int *y, int *m, int *d, int *hh, int *mm, int *ss)
+double2time(v, y, m, d, hh, mm, ss)
+    double v;
+    int *y, *m, *d, *hh, *mm, *ss;
 {
     long day;
     double t;
@@ -860,7 +535,8 @@ double2time(double v, int *y, int *m, int *d, int *hh, int *mm, int *ss)
 }
 
 static double
-time_object2date(VALUE tmobj)
+time_object2date(tmobj)
+    VALUE tmobj;
 {
     long y, m, d, hh, mm, ss;
     long day;
@@ -877,158 +553,23 @@ time_object2date(VALUE tmobj)
 }
 
 static VALUE
-date2time_str(double date)
+date2time_str(date)
+    double date;
 {
     int y, m, d, hh, mm, ss;
+    char szTime[40];
     double2time(date, &y, &m, &d, &hh, &mm, &ss);
-    return rb_sprintf(
-            "%04d/%02d/%02d %02d:%02d:%02d",
+    sprintf(szTime,
+            "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",
             y, m, d, hh, mm, ss);
+    return rb_str_new2(szTime);
 }
 
-#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
-
-static UINT ole_encoding2cp(rb_encoding *enc)
-{
-    /*
-     * Is there any better solution to convert 
-     * Ruby encoding to Windows codepage???
-     */
-    ENC_MACHING_CP(enc, "Big5", 950);
-    ENC_MACHING_CP(enc, "CP51932", 51932);
-    ENC_MACHING_CP(enc, "CP850", 850);
-    ENC_MACHING_CP(enc, "CP852", 852);
-    ENC_MACHING_CP(enc, "CP855", 855);
-    ENC_MACHING_CP(enc, "CP949", 949);
-    ENC_MACHING_CP(enc, "EUC-JP", 20932); 
-    ENC_MACHING_CP(enc, "EUC-KR", 51949);
-    ENC_MACHING_CP(enc, "EUC-TW", 51950);
-    ENC_MACHING_CP(enc, "GB18030", 54936);
-    ENC_MACHING_CP(enc, "GB2312", 51936);
-    ENC_MACHING_CP(enc, "GBK", 936);
-    ENC_MACHING_CP(enc, "IBM437", 437);
-    ENC_MACHING_CP(enc, "IBM737", 737);
-    ENC_MACHING_CP(enc, "IBM775", 775);
-    ENC_MACHING_CP(enc, "IBM852", 852);
-    ENC_MACHING_CP(enc, "IBM855", 855);
-    ENC_MACHING_CP(enc, "IBM857", 857);
-    ENC_MACHING_CP(enc, "IBM860", 860);
-    ENC_MACHING_CP(enc, "IBM861", 861);
-    ENC_MACHING_CP(enc, "IBM862", 862);
-    ENC_MACHING_CP(enc, "IBM863", 863);
-    ENC_MACHING_CP(enc, "IBM864", 864);
-    ENC_MACHING_CP(enc, "IBM865", 865);
-    ENC_MACHING_CP(enc, "IBM866", 866);
-    ENC_MACHING_CP(enc, "IBM869", 869);
-    ENC_MACHING_CP(enc, "ISO-2022-JP", 50220);
-    ENC_MACHING_CP(enc, "ISO-8859-1", 28591);
-    ENC_MACHING_CP(enc, "ISO-8859-15", 28605);
-    ENC_MACHING_CP(enc, "ISO-8859-2", 28592);
-    ENC_MACHING_CP(enc, "ISO-8859-3", 28593);
-    ENC_MACHING_CP(enc, "ISO-8859-4", 28594);
-    ENC_MACHING_CP(enc, "ISO-8859-5", 28595);
-    ENC_MACHING_CP(enc, "ISO-8859-6", 28596);
-    ENC_MACHING_CP(enc, "ISO-8859-7", 28597);
-    ENC_MACHING_CP(enc, "ISO-8859-8", 28598);
-    ENC_MACHING_CP(enc, "ISO-8859-9", 28599);
-    ENC_MACHING_CP(enc, "KOI8-R", 20866);
-    ENC_MACHING_CP(enc, "KOI8-U", 21866);
-    ENC_MACHING_CP(enc, "Shift_JIS", 932);
-    ENC_MACHING_CP(enc, "UTF-16BE", 1201);
-    ENC_MACHING_CP(enc, "UTF-16LE", 1200);
-    ENC_MACHING_CP(enc, "UTF-7", 65000);
-    ENC_MACHING_CP(enc, "UTF-8", 65001);
-    ENC_MACHING_CP(enc, "Windows-1250", 1250);
-    ENC_MACHING_CP(enc, "Windows-1251", 1251);
-    ENC_MACHING_CP(enc, "Windows-1252", 1252);
-    ENC_MACHING_CP(enc, "Windows-1253", 1253);
-    ENC_MACHING_CP(enc, "Windows-1254", 1254);
-    ENC_MACHING_CP(enc, "Windows-1255", 1255);
-    ENC_MACHING_CP(enc, "Windows-1256", 1256);
-    ENC_MACHING_CP(enc, "Windows-1257", 1257);
-    ENC_MACHING_CP(enc, "Windows-1258", 1258);
-    ENC_MACHING_CP(enc, "Windows-31J", 932);
-    ENC_MACHING_CP(enc, "Windows-874", 874);
-    ENC_MACHING_CP(enc, "eucJP-ms", 20932);
-    return CP_ACP;
-}
-
-static UINT
-ole_init_cp()
-{
-    UINT cp;
-    rb_encoding *encdef;
-    encdef = rb_default_external_encoding();
-    cp = ole_encoding2cp(encdef);
-    if (code_page_installed(cp)) {
-        cWIN32OLE_cp = cp;
-    }
-    return cp;
-}
-
-struct myCPINFOEX {
-  UINT MaxCharSize;
-  BYTE DefaultChar[2];
-  BYTE LeadByte[12];
-  WCHAR UnicodeDefaultChar;
-  UINT CodePage;
-  char CodePageName[MAX_PATH];
-};
-
-static rb_encoding *
-ole_cp2encoding(UINT cp)
-{
-    static BOOL (*pGetCPInfoEx)(UINT, DWORD, struct myCPINFOEX *) = NULL;
-    struct myCPINFOEX* buf;
-    VALUE enc_name;
-    char *enc_cstr;
-    int idx;
-
-    if (!code_page_installed(cp)) {
-	switch(cp) {
-	  case CP_ACP:
-	    cp = GetACP();
-	    break;
-	  case CP_OEMCP:
-	    cp = GetOEMCP();
-	    break;
-	  case CP_MACCP:
-	  case CP_THREAD_ACP:
-	    if (!pGetCPInfoEx) {
-		pGetCPInfoEx = (BOOL (*)(UINT, DWORD, struct myCPINFOEX *))
-		    GetProcAddress(GetModuleHandle("kernel32"), "GetCPInfoEx");
-		if (!pGetCPInfoEx) {
-		    pGetCPInfoEx = (void*)-1;
-		}
-	    }
-	    buf = ALLOCA_N(struct myCPINFOEX, 1);
-	    ZeroMemory(buf, sizeof(struct myCPINFOEX));
-	    if (pGetCPInfoEx == (void*)-1 || !pGetCPInfoEx(cp, 0, buf)) {
-		rb_raise(eWIN32OLERuntimeError, "cannot map codepage to encoding.");
-		break;	/* never reach here */
-	    }
-	    cp = buf->CodePage;
-	    break;
-	  case CP_SYMBOL:
-	  case CP_UTF7:
-	  case CP_UTF8:
-	    // nothing ToDo
-	    break;
-	  default:
-            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
-            break;
-        }
-    }
-
-    enc_name = rb_sprintf("CP%d", cp);
-    idx = rb_enc_find_index(enc_cstr = StringValueCStr(enc_name));
-    if (idx < 0)
-	idx = rb_define_dummy_encoding(enc_cstr);
-    return rb_enc_from_index(idx);
-}
+static void ole_val2variant();
 
 static char *
-ole_wc2mb(LPWSTR pw)
+ole_wc2mb(pw)
+    LPWSTR pw;
 {
     int size;
     LPSTR pm;
@@ -1046,7 +587,8 @@ ole_wc2mb(LPWSTR pw)
 } 
 
 static VALUE
-ole_hresult2msg(HRESULT hr)
+ole_hresult2msg(hr)
+    HRESULT hr;
 {
     VALUE msg = Qnil;
     char *p_msg = NULL;
@@ -1054,13 +596,13 @@ ole_hresult2msg(HRESULT hr)
     DWORD dwCount;
 
     char strhr[100];
-    sprintf(strhr, "    HRESULT error code:0x%08x\n      ", (unsigned)hr);
+    sprintf(strhr, "    HRESULT error code:0x%08lx\n      ", hr);
     msg = rb_str_new2(strhr);
 
     dwCount = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                             FORMAT_MESSAGE_FROM_SYSTEM |
                             FORMAT_MESSAGE_IGNORE_INSERTS,
-                            NULL, hr, cWIN32OLE_lcid,
+                            NULL, hr, LOCALE_SYSTEM_DEFAULT,
                             (LPTSTR)&p_msg, 0, NULL);
     if (dwCount > 0) {
 	term = p_msg + strlen(p_msg);
@@ -1079,7 +621,8 @@ ole_hresult2msg(HRESULT hr)
 }
 
 static void
-ole_freeexceptinfo(EXCEPINFO *pExInfo)
+ole_freeexceptinfo(pExInfo)
+    EXCEPINFO *pExInfo;
 {
     SysFreeString(pExInfo->bstrDescription);
     SysFreeString(pExInfo->bstrSource);
@@ -1087,7 +630,8 @@ ole_freeexceptinfo(EXCEPINFO *pExInfo)
 }
 
 static VALUE
-ole_excepinfo2msg(EXCEPINFO *pExInfo)
+ole_excepinfo2msg(pExInfo)
+    EXCEPINFO *pExInfo;
 {
     char error_code[40];
     char *pSource = NULL;
@@ -1129,7 +673,15 @@ ole_excepinfo2msg(EXCEPINFO *pExInfo)
 }
 
 static void
+#ifdef HAVE_STDARG_PROTOTYPES
 ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...)
+#else
+ole_raise(hr, exc, fmt, va_alist)
+    HRESULT hr;
+    VALUE exc;
+    const char *fmt;
+    va_dcl
+#endif
 {
     va_list args;
     char buf[BUFSIZ];
@@ -1151,7 +703,7 @@ void
 ole_uninitialize()
 {
     OleUninitialize();
-    g_ole_initialized = FALSE;
+    gOLEInitialized = Qfalse;
 }
 
 static void
@@ -1159,12 +711,12 @@ ole_initialize()
 {
     HRESULT hr;
     
-    if(g_ole_initialized == FALSE) {
+    if(gOLEInitialized == Qfalse) {
         hr = OleInitialize(NULL);
         if(FAILED(hr)) {
             ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
         }
-        g_ole_initialized = TRUE;
+        gOLEInitialized = Qtrue;
         /*
          * In some situation, OleUninitialize does not work fine. ;-<
          */
@@ -1189,21 +741,24 @@ ole_msg_loop() {
 }
 
 static void
-ole_free(struct oledata *pole)
+ole_free(pole)
+    struct oledata *pole;
 {
     OLE_FREE(pole->pDispatch);
     free(pole);
 }
 
 static void
-oletype_free(struct oletypedata *poletype)
+oletype_free(poletype)
+    struct oletypedata *poletype;
 {
     OLE_FREE(poletype->pTypeInfo);
     free(poletype);
 }
 
 static void
-olemethod_free(struct olemethoddata *polemethod)
+olemethod_free(polemethod)
+    struct olemethoddata *polemethod;
 {
     OLE_FREE(polemethod->pTypeInfo);
     OLE_FREE(polemethod->pOwnerTypeInfo);
@@ -1211,53 +766,25 @@ olemethod_free(struct olemethoddata *polemethod)
 }
 
 static void
-olevariable_free(struct olevariabledata *polevar)
+olevariable_free(polevar)
+    struct olevariabledata *polevar;
 {
     OLE_FREE(polevar->pTypeInfo);
     free(polevar);
 }
 
 static void
-oleparam_free(struct oleparamdata *pole)
+oleparam_free(pole)
+    struct oleparamdata *pole;
 {
     OLE_FREE(pole->pTypeInfo);
     free(pole);
 }
 
 static LPWSTR
-ole_vstr2wc(VALUE vstr)
-{
-    rb_encoding *enc;
-    int cp;
-    int size;
-    LPWSTR pw;
-    st_data_t data;
-    enc = rb_enc_get(vstr);
-    if (st_lookup(enc2cp_table, (st_data_t)enc, &data)) {
-        cp = data;
-    } else {
-        cp = ole_encoding2cp(enc);
-        if (code_page_installed(cp) ||
-            cp == CP_ACP ||
-            cp == CP_OEMCP ||
-            cp == CP_MACCP ||
-            cp == CP_THREAD_ACP ||
-            cp == CP_SYMBOL ||
-            cp == CP_UTF7 ||
-            cp == CP_UTF8 ) {
-            st_insert(enc2cp_table, (st_data_t)enc, (st_data_t)cp);
-        } else {
-            rb_raise(eWIN32OLERuntimeError, "not installed Windows codepage(%d) according to `%s'", cp, rb_enc_name(enc));
-        }
-    }
-    size = MultiByteToWideChar(cp, 0, StringValuePtr(vstr), -1, NULL, 0);
-    pw = SysAllocStringLen(NULL, size - 1);
-    MultiByteToWideChar(cp, 0, StringValuePtr(vstr), -1, pw, size);
-    return pw;
-}
-
-static LPWSTR
-ole_mb2wc(char *pm, int len)
+ole_mb2wc(pm, len)
+    char *pm;
+    int  len;
 {
     int size;
     LPWSTR pw;
@@ -1268,10 +795,12 @@ ole_mb2wc(char *pm, int len)
 }
 
 static VALUE
-ole_wc2vstr(LPWSTR pw, BOOL isfree)
+ole_wc2vstr(pw, isfree)
+    LPWSTR pw;
+    BOOL isfree;
 {
     char *p = ole_wc2mb(pw);
-    VALUE vstr = rb_enc_str_new(p, strlen(p), cWIN32OLE_enc);
+    VALUE vstr = rb_str_new2(p);
     if(isfree)
         SysFreeString(pw);
     free(p);
@@ -1279,7 +808,9 @@ ole_wc2vstr(LPWSTR pw, BOOL isfree)
 }
 
 static VALUE
-ole_ary_m_entry(VALUE val, long *pid)
+ole_ary_m_entry(val, pid)
+    VALUE val;
+    long *pid;
 {
     VALUE obj = Qnil;
     int i = 0;
@@ -1291,230 +822,40 @@ ole_ary_m_entry(VALUE val, long *pid)
     return obj;
 }
 
-static void *
-get_ptr_of_variant(VARIANT *pvar)
-{
-    switch(V_VT(pvar)) {
-    case VT_UI1:
-        return &V_UI1(pvar);
-        break;
-    case VT_I2:
-        return &V_I2(pvar);
-        break;
-    case VT_UI2:
-        return &V_UI2(pvar);
-        break;
-    case VT_I4:
-        return &V_I4(pvar);
-        break;
-    case VT_UI4:
-        return &V_UI4(pvar);
-        break;
-    case VT_R4:
-        return &V_R4(pvar);
-        break;
-    case VT_R8:
-        return &V_R8(pvar);
-        break;
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-    case VT_I8:
-        return &V_I8(pvar);
-        break;
-    case VT_UI8:
-        return &V_UI8(pvar);
-        break;
-#endif
-    case VT_INT:
-        return &V_INT(pvar);
-        break;
-    case VT_UINT:
-        return &V_UINT(pvar);
-        break;
-    case VT_CY:
-        return &V_CY(pvar);
-        break;
-    case VT_DATE:
-        return &V_DATE(pvar);
-        break;
-    case VT_BSTR:
-        return V_BSTR(pvar);
-        break;
-    case VT_DISPATCH:
-        return V_DISPATCH(pvar);
-        break;
-    case VT_ERROR:
-        return &V_ERROR(pvar);
-        break;
-    case VT_BOOL:
-        return &V_BOOL(pvar);
-        break;
-    case VT_UNKNOWN:
-        return V_UNKNOWN(pvar);
-        break;
-    case VT_ARRAY:
-        return &V_ARRAY(pvar);
-        break;
-    default:
-        return NULL;
-        break;
-    }
-}
-
-static VALUE
-is_all_index_under(long *pid, long *pub, long dim) 
-{
-  long i = 0;
-  for (i = 0; i < dim; i++) {
-    if (pid[i] > pub[i]) {
-      return Qfalse;
-    }
-  }
-  return Qtrue;
-}
-
 static void
-ole_set_safe_array(long n, SAFEARRAY *psa, long *pid, long *pub, VALUE val, long dim,  VARTYPE vt)
+ole_set_safe_array(n, psa, pid, pub, val, dim)
+    long n;
+    SAFEARRAY *psa;
+    long *pid;
+    long *pub;
+    VALUE val;
+    long dim;
 {
     VALUE val1;
-    HRESULT hr = S_OK;
     VARIANT var;
-    VOID *p = NULL;
-    long i = n;
-    while(i >= 0) {
+    VariantInit(&var);
+    if(n < 0) return;
+    if(n == dim) {
         val1 = ole_ary_m_entry(val, pid);
-        VariantInit(&var);
-        p = val2variant_ptr(val1, &var, vt);
-        if (is_all_index_under(pid, pub, dim) == Qtrue) {
-            if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
-                (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
-                rb_raise(eWIN32OLERuntimeError, "element of array does not have IDispatch or IUnknown Interface");
-            }
-            hr = SafeArrayPutElement(psa, pid, p);
-        }
-        if (FAILED(hr)) {
-            ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayPutElement");
-        }
-        pid[i] += 1;
-        if (pid[i] > pub[i]) {
-            pid[i] = 0;
-            i -= 1;
-        } else {
-            i = dim - 1;
-        }
-    }
-}
-
-static long
-dimension(VALUE val) {
-    long dim = 0;
-    long dim1 = 0;
-    long len = 0;
-    long i = 0;
-    if (TYPE(val) == T_ARRAY) {
-        len = RARRAY_LEN(val);
-        for (i = 0; i < len; i++) {
-            dim1 = dimension(rb_ary_entry(val, i));
-            if (dim < dim1) {
-                dim = dim1;
-            }
-        }
-        dim += 1;
-    }
-    return dim;
-}
-
-static long 
-ary_len_of_dim(VALUE ary, long dim) {
-    long ary_len = 0;
-    long ary_len1 = 0;
-    long len = 0;
-    long i = 0;
-    VALUE val;
-    if (dim == 0) {
-        if (TYPE(ary) == T_ARRAY) {
-            ary_len = RARRAY_LEN(ary);
-        }
-    } else {
-        if (TYPE(ary) == T_ARRAY) {
-            len = RARRAY_LEN(ary);
-            for (i = 0; i < len; i++) {
-                val = rb_ary_entry(ary, i);
-                ary_len1 = ary_len_of_dim(val, dim-1);
-                if (ary_len < ary_len1) {
-                    ary_len = ary_len1;
-                }
-            }
-        }
-    }
-    return ary_len;
-}
-
-static HRESULT
-ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    long dim = 0;
-    int  i = 0;
-    HRESULT hr = S_OK;
-
-    SAFEARRAYBOUND *psab = NULL;
-    SAFEARRAY *psa = NULL;
-    long      *pub, *pid;
-
-    Check_Type(val, T_ARRAY);
-
-    dim = dimension(val);
-
-    psab = ALLOC_N(SAFEARRAYBOUND, dim);
-    pub  = ALLOC_N(long, dim);
-    pid  = ALLOC_N(long, dim);
-
-    if(!psab || !pub || !pid) {
-        if(pub) free(pub);
-        if(psab) free(psab);
-        if(pid) free(pid);
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-
-    for (i = 0; i < dim; i++) {
-        psab[i].cElements = ary_len_of_dim(val, i);
-        psab[i].lLbound = 0;
-        pub[i] = psab[i].cElements - 1;
-        pid[i] = 0;
-    }
-    /* Create and fill VARIANT array */
-    if ((vt & ~VT_BYREF) == VT_ARRAY) {
-        vt = (vt | VT_VARIANT);
-    }
-    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
-    if (psa == NULL)
-        hr = E_OUTOFMEMORY;
-    else
-        hr = SafeArrayLock(psa);
-    if (SUCCEEDED(hr)) {
-        ole_set_safe_array(dim-1, psa, pid, pub, val, dim, (VARTYPE)(vt & VT_TYPEMASK));
-        hr = SafeArrayUnlock(psa);
+        ole_val2variant(val1, &var);
+        SafeArrayPutElement(psa, pid, &var);
     }
-
-    if(pub) free(pub);
-    if(psab) free(psab);
-    if(pid) free(pid);
-
-    if (SUCCEEDED(hr)) {
-        V_VT(var) = vt;
-        V_ARRAY(var) = psa;
+    pid[n] += 1;
+    if (pid[n] < pub[n]) {
+        ole_set_safe_array(dim, psa, pid, pub, val, dim);
     }
     else {
-        if (psa != NULL)
-            SafeArrayDestroy(psa);
+        pid[n] = 0;
+        ole_set_safe_array(n-1, psa, pid, pub, val, dim);
     }
-    return hr;
 }
 
 static void
-ole_val2variant(VALUE val, VARIANT *var)
+ole_val2variant(val, var)
+    VALUE val;
+    VARIANT *var;
 {
     struct oledata *pole;
-    struct olevariantdata *pvar;
     if(rb_obj_is_kind_of(val, cWIN32OLE)) {
         Data_Get_Struct(val, struct oledata, pole);
         OLE_ADDREF(pole->pDispatch);
@@ -1522,12 +863,6 @@ ole_val2variant(VALUE val, VARIANT *var)
         V_DISPATCH(var) = pole->pDispatch;
         return;
     }
-    if (rb_obj_is_kind_of(val, cWIN32OLE_VARIANT)) {
-        Data_Get_Struct(val, struct olevariantdata, pvar);
-        VariantCopy(var, &(pvar->var));
-        return;
-    }
-
     if (rb_obj_is_kind_of(val, rb_cTime)) {
         V_VT(var) = VT_DATE;
         V_DATE(var) = time_object2date(val);
@@ -1535,11 +870,66 @@ ole_val2variant(VALUE val, VARIANT *var)
     }
     switch (TYPE(val)) {
     case T_ARRAY:
-        ole_val_ary2variant_ary(val, var, VT_VARIANT|VT_ARRAY);
+    {
+        VALUE val1;
+        long dim = 0;
+        int  i = 0;
+
+        HRESULT hr;
+        SAFEARRAYBOUND *psab;
+        SAFEARRAY *psa;
+        long      *pub, *pid;
+
+        val1 = val;
+        while(TYPE(val1) == T_ARRAY) {
+            val1 = rb_ary_entry(val1, 0);
+            dim += 1;
+        }
+        psab = ALLOC_N(SAFEARRAYBOUND, dim);
+        pub  = ALLOC_N(long, dim);
+        pid  = ALLOC_N(long, dim);
+
+        if(!psab || !pub || !pid) {
+            if(pub) free(pub);
+            if(psab) free(psab);
+            if(pid) free(pid);
+            rb_raise(rb_eRuntimeError, "memory allocation error");
+        }
+        val1 = val;
+        i = 0;
+        while(TYPE(val1) == T_ARRAY) {
+            psab[i].cElements = RARRAY(val1)->len;
+            psab[i].lLbound = 0;
+            pub[i] = psab[i].cElements;
+            pid[i] = 0;
+            i ++;
+            val1 = rb_ary_entry(val1, 0);
+        }
+        /* Create and fill VARIANT array */
+        psa = SafeArrayCreate(VT_VARIANT, dim, psab);
+        if (psa == NULL)
+            hr = E_OUTOFMEMORY;
+        else
+            hr = SafeArrayLock(psa);
+        if (SUCCEEDED(hr)) {
+            ole_set_safe_array(dim-1, psa, pid, pub, val, dim-1);
+            hr = SafeArrayUnlock(psa);
+        }
+        if(pub) free(pub);
+        if(psab) free(psab);
+        if(pid) free(pid);
+
+        if (SUCCEEDED(hr)) {
+            V_VT(var) = VT_VARIANT | VT_ARRAY;
+            V_ARRAY(var) = psa;
+        }
+        else if (psa != NULL)
+            SafeArrayDestroy(psa);
         break;
+    }
     case T_STRING:
         V_VT(var) = VT_BSTR;
-        V_BSTR(var) = ole_vstr2wc(val);
+        V_BSTR(var) = ole_mb2wc(StringValuePtr(val), -1);
         break;
     case T_FIXNUM:
         V_VT(var) = VT_I4;
@@ -1577,290 +967,9 @@ ole_val2variant(VALUE val, VARIANT *var)
 }
 
 static void
-ole_val2variant_ex(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    if (val == Qnil) {
-        if (vt == VT_VARIANT) {
-            ole_val2variant2(val, var);
-        } else {
-            V_VT(var) = (vt & ~VT_BYREF);
-            if (V_VT(var) == VT_DISPATCH) {
-                V_DISPATCH(var) = NULL;
-            } else if (V_VT(var) == VT_UNKNOWN) {
-                V_UNKNOWN(var) = NULL;
-            }
-        }
-        return;
-    }
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-    switch(vt & ~VT_BYREF) {
-    case VT_I8:
-        V_VT(var) = VT_I8;
-        V_I8(var) = NUM2I8 (val);
-        break;
-    case VT_UI8:
-        V_VT(var) = VT_UI8;
-        V_UI8(var) = NUM2UI8(val);
-        break;
-    default:
-        ole_val2variant2(val, var);
-        break;
-    }
-#else  /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
-    ole_val2variant2(val, var);
-#endif
-}
-
-static void
-ole_val2ptr_variant(VALUE val, VARIANT *var)
-{
-    switch (TYPE(val)) {
-    case T_STRING:
-        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
-            *V_BSTRREF(var) = ole_vstr2wc(val);
-        }
-        break;
-    case T_FIXNUM:
-        switch(V_VT(var)) {
-        case (VT_UI1 | VT_BYREF) :
-            *V_UI1REF(var) = NUM2CHR(val);
-            break;
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2INT(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2INT(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_FLOAT:
-        switch(V_VT(var)) {
-        case (VT_I2 | VT_BYREF) :
-            *V_I2REF(var) = (short)NUM2INT(val);
-            break;
-        case (VT_I4 | VT_BYREF) :
-            *V_I4REF(var) = NUM2INT(val);
-            break;
-        case (VT_R4 | VT_BYREF) :
-            *V_R4REF(var) = (float)NUM2DBL(val);
-            break;
-        case (VT_R8 | VT_BYREF) :
-            *V_R8REF(var) = NUM2DBL(val);
-            break;
-        default:
-            break;
-        }
-        break;
-    case T_BIGNUM:
-        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
-            *V_R8REF(var) = rb_big2dbl(val);
-        }
-        break;
-    case T_TRUE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_TRUE;
-        }
-        break;
-    case T_FALSE:
-        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
-            *V_BOOLREF(var) = VARIANT_FALSE;
-        }
-        break;
-    default:
-        break;
-    }
-}
-
-static void
-ole_set_byref(VARIANT *realvar, VARIANT *var,  VARTYPE vt)
-{
-    V_VT(var) = vt;
-    if (vt == (VT_VARIANT|VT_BYREF)) {
-        V_VARIANTREF(var) = realvar;
-    } else {
-        if (V_VT(realvar) != (vt & ~VT_BYREF)) {
-            rb_raise(eWIN32OLERuntimeError, "variant type mismatch");
-        }
-        switch(vt & ~VT_BYREF) {
-        case VT_I1:
-            V_I1REF(var) = &V_I1(realvar);
-            break;
-        case VT_UI1:
-            V_UI1REF(var) = &V_UI1(realvar);
-            break;
-        case VT_I2:
-            V_I2REF(var) = &V_I2(realvar);
-            break;
-        case VT_UI2:
-            V_UI2REF(var) = &V_UI2(realvar);
-            break;
-        case VT_I4:
-            V_I4REF(var) = &V_I4(realvar);
-            break;
-        case VT_UI4:
-            V_UI4REF(var) = &V_UI4(realvar);
-            break;
-        case VT_R4:
-            V_R4REF(var) = &V_R4(realvar);
-            break;
-        case VT_R8:
-            V_R8REF(var) = &V_R8(realvar);
-            break;
-
-#if (_MSC_VER >= 1300)
-        case VT_I8:
-            V_I8REF(var) = &V_I8(realvar);
-            break;
-        case VT_UI8:
-            V_UI8REF(var) = &V_UI8(realvar);
-            break;
-#endif
-        case VT_INT:
-            V_INTREF(var) = &V_INT(realvar);
-            break;
-
-        case VT_UINT:
-            V_UINTREF(var) = &V_UINT(realvar);
-            break;
-
-        case VT_CY:
-            V_CYREF(var) = &V_CY(realvar);
-            break;
-        case VT_DATE:
-            V_DATEREF(var) = &V_DATE(realvar);
-            break;
-        case VT_BSTR:
-            V_BSTRREF(var) = &V_BSTR(realvar);
-            break;
-        case VT_DISPATCH:
-            V_DISPATCHREF(var) = &V_DISPATCH(realvar);
-            break;
-        case VT_ERROR:
-            V_ERRORREF(var) = &V_ERROR(realvar);
-            break;
-        case VT_BOOL:
-            V_BOOLREF(var) = &V_BOOL(realvar);
-            break;
-        case VT_UNKNOWN:
-            V_UNKNOWNREF(var) = &V_UNKNOWN(realvar);
-            break;
-        case VT_ARRAY:
-            V_ARRAYREF(var) = &V_ARRAY(realvar);
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "unknown type specified(setting BYREF):%d", vt);
-            break;
-        }
-    }
-}
-
-static void
-ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar)
-{
-    HRESULT hr = S_OK;
-
-    if (((vt & ~VT_BYREF) ==  (VT_ARRAY | VT_UI1)) && TYPE(val) == T_STRING) {
-        long len = RSTRING_LEN(val);
-        void *pdest = NULL;
-        SAFEARRAY *p = NULL;
-        SAFEARRAY *psa = SafeArrayCreateVector(VT_UI1, 0, len);
-        if (!psa) {
-            rb_raise(rb_eRuntimeError, "fail to SafeArrayCreateVector");
-        }
-        hr = SafeArrayAccessData(psa, &pdest);
-        if (SUCCEEDED(hr)) {
-            memcpy(pdest, RSTRING_PTR(val), len);
-            SafeArrayUnaccessData(psa);
-            V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
-            p = V_ARRAY(&(pvar->realvar));
-            if (p != NULL) {
-                SafeArrayDestroy(p);
-            }
-            V_ARRAY(&(pvar->realvar)) = psa;
-            if (vt & VT_BYREF) {
-                V_VT(&(pvar->var)) = vt;
-                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-            } else {
-                hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-            }
-        } else {
-            if (psa) 
-                SafeArrayDestroy(psa);
-        }
-    } else if (vt & VT_ARRAY) {
-        if (val == Qnil) {
-            V_VT(&(pvar->var)) = vt;
-            if (vt & VT_BYREF) {
-                V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-            }
-        } else {
-            hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
-            if (SUCCEEDED(hr)) {
-                if (vt & VT_BYREF) {
-                    V_VT(&(pvar->var)) = vt;
-                    V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-                } else {
-                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-                }
-            }
-        }
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-    } else if ( (vt & ~VT_BYREF) == VT_I8 || (vt & ~VT_BYREF) == VT_UI8) {
-        ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
-        ole_val2variant_ex(val, &(pvar->var), (vt & ~VT_BYREF));
-        V_VT(&(pvar->var)) = vt;
-        if (vt & VT_BYREF) {
-            ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-        }
-#endif
-    } else {
-        if (val == Qnil) {
-            V_VT(&(pvar->var)) = vt;
-            if (vt == (VT_BYREF | VT_VARIANT)) {
-                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-            } else {
-                V_VT(&(pvar->realvar)) = vt & ~VT_BYREF;
-                if (vt & VT_BYREF) {
-                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-                }
-            }
-        } else {
-            ole_val2variant_ex(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
-            if (vt == (VT_BYREF | VT_VARIANT)) {
-                ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-            } else if (vt & VT_BYREF) {
-                if ( (vt & ~VT_BYREF) != V_VT(&(pvar->realvar))) {
-                    hr = VariantChangeTypeEx(&(pvar->realvar), &(pvar->realvar), 
-                            cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
-                }
-                if (SUCCEEDED(hr)) {
-                    ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
-                }
-            } else {
-                if (vt == V_VT(&(pvar->realvar))) {
-                    hr = VariantCopy(&(pvar->var), &(pvar->realvar));
-                } else {
-                    hr = VariantChangeTypeEx(&(pvar->var), &(pvar->realvar), 
-                            cWIN32OLE_lcid, 0, vt);
-                }
-            }
-        }
-    }
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to change type");
-    }
-}
-
-static void
-ole_val2variant2(VALUE val, VARIANT *var)
+ole_val2variant2(val, var)
+    VALUE val;
+    VARIANT *var;
 {
     g_nil_to = VT_EMPTY;
     ole_val2variant(val, var);
@@ -1868,26 +977,9 @@ ole_val2variant2(VALUE val, VARIANT *var)
 }
 
 static VALUE
-make_inspect(const char *class_name, VALUE detail) 
-{
-    VALUE str;
-    str = rb_str_new2("#<");
-    rb_str_cat2(str, class_name);
-    rb_str_cat2(str, ":");
-    rb_str_concat(str, detail);
-    rb_str_cat2(str, ">");
-    return str;
-}
-
-static VALUE
-default_inspect(VALUE self, const char *class_name) 
-{
-    VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
-    return make_inspect(class_name, detail);
-}
-
-static VALUE
-ole_set_member(VALUE self, IDispatch *dispatch)
+ole_set_member(self, dispatch)
+    VALUE self;
+    IDispatch * dispatch;
 {
     struct oledata *pole;
     Data_Get_Struct(self, struct oledata, pole);
@@ -1899,9 +991,10 @@ ole_set_member(VALUE self, IDispatch *dispatch)
     return self;
 }
 
-
+static VALUE fole_s_allocate _((VALUE));
 static VALUE
-fole_s_allocate(VALUE klass)
+fole_s_allocate(klass)
+    VALUE klass;
 {
     struct oledata *pole;
     VALUE obj;
@@ -1912,7 +1005,11 @@ fole_s_allocate(VALUE klass)
 }
 
 static VALUE
-create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
+create_win32ole_object(klass, pDispatch, argc, argv)
+    VALUE klass;
+    IDispatch *pDispatch;
+    int argc;
+    VALUE *argv;
 {
     VALUE obj = fole_s_allocate(klass);
     ole_set_member(obj, pDispatch);
@@ -1920,40 +1017,8 @@ create_win32ole_object(VALUE klass, IDispatch *pDispatch, int argc, VALUE *argv)
 }
 
 static VALUE
-ary_new_dim(VALUE myary, long *pid, long *plb, long dim) {
-    long i;
-    VALUE obj = Qnil;
-    VALUE pobj = Qnil;
-    long *ids = ALLOC_N(long, dim);
-    if (!ids) {
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-    for(i = 0; i < dim; i++) {
-        ids[i] = pid[i] - plb[i];
-    }
-    obj = myary;
-    pobj = myary;
-    for(i = 0; i < dim-1; i++) {
-        obj = rb_ary_entry(pobj, ids[i]);
-        if (obj == Qnil) {
-            rb_ary_store(pobj, ids[i], rb_ary_new());
-        }
-        obj = rb_ary_entry(pobj, ids[i]);
-        pobj = obj;
-    }
-    if (ids) free(ids);
-    return obj;
-}
-
-static void
-ary_store_dim(VALUE myary, long *pid, long *plb, long dim, VALUE val) {
-    long id = pid[dim - 1] - plb[dim - 1];
-    VALUE obj = ary_new_dim(myary, pid, plb, dim);
-    rb_ary_store(obj, id, val);
-}
-
-static VALUE
-ole_variant2val(VARIANT *pvar)
+ole_variant2val(pvar)
+    VARIANT *pvar;
 {
     VALUE obj = Qnil;
     HRESULT hr;
@@ -1962,70 +1027,75 @@ ole_variant2val(VARIANT *pvar)
 
     if(V_ISARRAY(pvar)) {
         SAFEARRAY *psa = V_ISBYREF(pvar) ? *V_ARRAYREF(pvar) : V_ARRAY(pvar);
-        UINT i = 0;
-        long *pid, *plb, *pub;
+        long i;
+        long *pID, *pLB, *pUB;
         VARIANT variant;
         VALUE val;
-        UINT dim = 0;
+        VALUE val2;
+        int dim = 0;
+
         if (!psa) {
             return obj;
         }
         dim = SafeArrayGetDim(psa);
+
         VariantInit(&variant);
         V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF;
 
-        pid = ALLOC_N(long, dim);
-        plb = ALLOC_N(long, dim);
-        pub = ALLOC_N(long, dim);
+        pID = ALLOC_N(long, dim);
+        pLB = ALLOC_N(long, dim);
+        pUB = ALLOC_N(long, dim);
 
-        if(!pid || !plb || !pub) {
-            if(pid) free(pid);
-            if(plb) free(plb);
-            if(pub) free(pub);
+        if(!pID || !pLB || !pUB) {
+            if(pID) free(pID);
+            if(pLB) free(pLB);
+            if(pUB) free(pUB);
             rb_raise(rb_eRuntimeError, "memory allocation error");
         }
 
+        obj = Qnil;
+
         for(i = 0; i < dim; ++i) {
-            SafeArrayGetLBound(psa, i+1, &plb[i]);
-            SafeArrayGetLBound(psa, i+1, &pid[i]);
-            SafeArrayGetUBound(psa, i+1, &pub[i]);
+            SafeArrayGetLBound(psa, i+1, &pLB[i]);
+            SafeArrayGetLBound(psa, i+1, &pID[i]);
+            SafeArrayGetUBound(psa, i+1, &pUB[i]);
         }
+
         hr = SafeArrayLock(psa);
         if (SUCCEEDED(hr)) {
-            obj = rb_ary_new();
-            i = 0;
-            while (i < dim) {
-                ary_new_dim(obj, pid, plb, dim);
-                hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
-                if (SUCCEEDED(hr)) {
-                    val = ole_variant2val(&variant);
-                    ary_store_dim(obj, pid, plb, dim, val);
-                }
-                for (i = 0; i < dim; ++i) {
-                    if (++pid[i] <= pub[i])
+            val2 = rb_ary_new();
+            while (i >= 0) {
+                hr = SafeArrayPtrOfIndex(psa, pID, &V_BYREF(&variant));
+                if (FAILED(hr))
+                    break;
+
+                val = ole_variant2val(&variant);
+                rb_ary_push(val2, val);
+                for (i = dim-1 ; i >= 0 ; --i) {
+                    if (++pID[i] <= pUB[i])
                         break;
-                    pid[i] = plb[i];
+
+                    pID[i] = pLB[i];
+                    if (i > 0) {
+                        if (obj == Qnil)
+                            obj = rb_ary_new();
+                        rb_ary_push(obj, val2);
+                        val2 = rb_ary_new();
+                    }
                 }
             }
             SafeArrayUnlock(psa);
         }
-        if(pid) free(pid);
-        if(plb) free(plb);
-        if(pub) free(pub);
-        return obj;
+        if(pID) free(pID);
+        if(pLB) free(pLB);
+        if(pUB) free(pUB);
+        return (obj == Qnil) ? val2 : obj;
     }
     switch(V_VT(pvar) & ~VT_BYREF){
     case VT_EMPTY:
         break;
     case VT_NULL:
         break;
-    case VT_I1:
-        if(V_ISBYREF(pvar)) 
-            obj = INT2NUM((long)*V_I1REF(pvar));
-        else 
-            obj = INT2NUM((long)V_I1(pvar));
-        break;
-
     case VT_UI1:
         if(V_ISBYREF(pvar)) 
             obj = INT2NUM((long)*V_UI1REF(pvar));
@@ -2040,13 +1110,6 @@ ole_variant2val(VARIANT *pvar)
             obj = INT2NUM((long)V_I2(pvar));
         break;
 
-    case VT_UI2:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UI2REF(pvar));
-        else 
-            obj = INT2NUM((long)V_UI2(pvar));
-        break;
-
     case VT_I4:
         if(V_ISBYREF(pvar))
             obj = INT2NUM((long)*V_I4REF(pvar));
@@ -2054,50 +1117,6 @@ ole_variant2val(VARIANT *pvar)
             obj = INT2NUM((long)V_I4(pvar));
         break;
 
-    case VT_UI4:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UI4REF(pvar));
-        else 
-            obj = INT2NUM((long)V_UI4(pvar));
-        break;
-
-    case VT_INT:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_INTREF(pvar));
-        else 
-            obj = INT2NUM((long)V_INT(pvar));
-        break;
-
-    case VT_UINT:
-        if(V_ISBYREF(pvar))
-            obj = INT2NUM((long)*V_UINTREF(pvar));
-        else 
-            obj = INT2NUM((long)V_UINT(pvar));
-        break;
-
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-    case VT_I8:
-        if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300)
-            obj = I8_2_NUM(*V_I8REF(pvar));
-#else 
-            obj = Qnil;
-#endif
-        else
-            obj = I8_2_NUM(V_I8(pvar));
-        break;
-    case VT_UI8:
-        if(V_ISBYREF(pvar))
-#if (_MSC_VER >= 1300)
-            obj = UI8_2_NUM(*V_UI8REF(pvar));
-#else
-            obj = Qnil;
-#endif
-        else
-            obj = UI8_2_NUM(V_UI8(pvar));
-        break;
-#endif  /* (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__) */
-
     case VT_R4:
         if(V_ISBYREF(pvar))
             obj = rb_float_new(*V_R4REF(pvar));
@@ -2114,10 +1133,13 @@ ole_variant2val(VARIANT *pvar)
 
     case VT_BSTR:
     {
+        char *p;
         if(V_ISBYREF(pvar))
-            obj = ole_wc2vstr(*V_BSTRREF(pvar), FALSE);
+            p = ole_wc2mb(*V_BSTRREF(pvar));
         else
-            obj = ole_wc2vstr(V_BSTR(pvar), FALSE);
+            p = ole_wc2mb(V_BSTR(pvar));
+        obj = rb_str_new2(p);
+        if(p) free(p);
         break;
     }
 
@@ -2153,10 +1175,10 @@ ole_variant2val(VARIANT *pvar)
 
     case VT_UNKNOWN:
     {
+
         /* get IDispatch interface from IUnknown interface */
         IUnknown *punk;
         IDispatch *pDispatch;
-        void *p;
         HRESULT hr;
 
         if (V_ISBYREF(pvar))
@@ -2165,9 +1187,9 @@ ole_variant2val(VARIANT *pvar)
             punk = V_UNKNOWN(pvar);
 
         if(punk != NULL) {
-           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch, &p);
+           hr = punk->lpVtbl->QueryInterface(punk, &IID_IDispatch,
+                                             (void **)&pDispatch);
            if(SUCCEEDED(hr)) {
-               pDispatch = p;
                obj = create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
            }
         }
@@ -2192,9 +1214,11 @@ ole_variant2val(VARIANT *pvar)
         VARIANT variant;
         VariantInit(&variant);
         hr = VariantChangeTypeEx(&variant, pvar, 
-                                  cWIN32OLE_lcid, 0, VT_BSTR);
+                                  LOCALE_SYSTEM_DEFAULT, 0, VT_BSTR);
         if (SUCCEEDED(hr) && V_VT(&variant) == VT_BSTR) {
-            obj = ole_wc2vstr(V_BSTR(&variant), FALSE);
+            char *p = ole_wc2mb(V_BSTR(&variant));
+            obj = rb_str_new2(p);
+            if(p) free(p);
         }
         VariantClear(&variant);
         break;
@@ -2203,23 +1227,30 @@ ole_variant2val(VARIANT *pvar)
     return obj;
 }
 
-static LONG
-reg_open_key(HKEY hkey, const char *name, HKEY *phkey)
+
+static LONG reg_open_key(hkey, name, phkey)
+    HKEY hkey;
+    const char *name;
+    HKEY *phkey;
 {
     return RegOpenKeyEx(hkey, name, 0, KEY_READ, phkey);
 }
 
-static LONG
-reg_open_vkey(HKEY hkey, VALUE key, HKEY *phkey)
+static LONG reg_open_vkey(hkey, key, phkey)
+    HKEY hkey;
+    VALUE key;
+    HKEY *phkey;
 {
     return reg_open_key(hkey, StringValuePtr(key), phkey);
 }
 
 static VALUE
-reg_enum_key(HKEY hkey, DWORD i)
+reg_enum_key(hkey, i)
+    HKEY hkey;
+    DWORD i;
 {
     char buf[BUFSIZ + 1];
-    DWORD size_buf = sizeof(buf);
+    DWORD size_buf = sizeof(buf) - 1;
     FILETIME ft;
     LONG err = RegEnumKeyEx(hkey, i, buf, &size_buf,
                             NULL, NULL, NULL, &ft);
@@ -2231,84 +1262,59 @@ reg_enum_key(HKEY hkey, DWORD i)
 }
 
 static VALUE
-reg_get_val(HKEY hkey, const char *subkey)
-{
-    char *pbuf;
-    DWORD dwtype = 0;
-    LONG size = 0;
-    VALUE val = Qnil;
-    LONG err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, NULL, &size); 
-
-    if (err == ERROR_SUCCESS) {
-        pbuf = ALLOC_N(char, size + 1);
-        err = RegQueryValueEx(hkey, subkey, NULL, &dwtype, pbuf, &size);
-        if (err == ERROR_SUCCESS) {
-            pbuf[size] = '\0';
-            val = rb_str_new2(pbuf);
-        }
-        free(pbuf);
-    }
-    return val;
-}
-
-static VALUE
-reg_get_val2(HKEY hkey, const char *subkey)
+reg_get_val(hkey, subkey)
+    HKEY hkey;
+    const char *subkey;
 {
-    HKEY hsubkey;
-    LONG err;
-    VALUE val = Qnil;
-    err = RegOpenKeyEx(hkey, subkey, 0, KEY_READ, &hsubkey);
+    char buf[BUFSIZ + 1];
+    LONG size_buf = sizeof(buf) - 1;
+    LONG err = RegQueryValue(hkey, subkey, buf, &size_buf);
     if (err == ERROR_SUCCESS) {
-        val = reg_get_val(hsubkey, NULL);
-        RegCloseKey(hsubkey);
-    }
-    if (val == Qnil) {
-        val = reg_get_val(hkey, subkey);
-    }
-    return val;
-}
-
-static VALUE
-reg_get_typelib_file_path(HKEY hkey)
-{
-    VALUE path = Qnil;
-    path = reg_get_val2(hkey, "win32");
-    if (path == Qnil) {
-        path = reg_get_val2(hkey, "win16");
+        buf[BUFSIZ] = '\0';
+        return rb_str_new2(buf);
     }
-    return path;
+    return Qnil;
 }
 
 static VALUE
-typelib_file_from_clsid(VALUE ole)
+typelib_file_from_clsid(ole)
+    VALUE ole;
 {
+    OLECHAR *pbuf;
+    CLSID clsid;
+    HRESULT hr;
     HKEY hroot, hclsid;
     LONG err;
     VALUE typelib;
-    char path[MAX_PATH + 1];
+    VALUE vclsid;
+    char *pclsid = NULL;
 
+    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
+    hr = CLSIDFromProgID(pbuf, &clsid);
+    SysFreeString(pbuf);
+    if (FAILED(hr)) {
+        return Qnil;
+    }
+    StringFromCLSID(&clsid, &pbuf);
+    vclsid = WC2VSTR(pbuf);
     err = reg_open_key(HKEY_CLASSES_ROOT, "CLSID", &hroot);
     if (err != ERROR_SUCCESS) {
         return Qnil;
     }
-    err = reg_open_key(hroot, StringValuePtr(ole), &hclsid);
+    err = reg_open_key(hroot, StringValuePtr(vclsid), &hclsid);
     if (err != ERROR_SUCCESS) {
         RegCloseKey(hroot);
         return Qnil;
     }
-    typelib = reg_get_val2(hclsid, "InprocServer32");
+    typelib = reg_get_val(hclsid, "InprocServer32");
     RegCloseKey(hroot);
     RegCloseKey(hclsid);
-    if (typelib != Qnil) {
-        ExpandEnvironmentStrings(StringValuePtr(typelib), path, sizeof(path));
-        path[MAX_PATH] = '\0';
-        typelib = rb_str_new2(path);
-    }
     return typelib;
 }
 
 static VALUE
-typelib_file_from_typelib(VALUE ole)
+typelib_file_from_typelib(ole)
+    VALUE ole;
 {
     HKEY htypelib, hclsid, hversion, hlang;
     double fver;
@@ -2338,7 +1344,7 @@ typelib_file_from_typelib(VALUE ole)
             if (ver == Qnil)
                 break;
             err = reg_open_vkey(hclsid, ver, &hversion);
-			if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
+            if (err != ERROR_SUCCESS || fver > atof(StringValuePtr(ver)))
                 continue;
             fver = atof(StringValuePtr(ver));
             typelib = reg_get_val(hversion, NULL);
@@ -2351,7 +1357,7 @@ typelib_file_from_typelib(VALUE ole)
                         break;
                     err = reg_open_vkey(hversion, lang, &hlang);
                     if (err == ERROR_SUCCESS) {
-                        if ((file = reg_get_typelib_file_path(hlang)) != Qnil) 
+                        if ((file = reg_get_val(hlang, "win32")) != Qnil) 
                             found = TRUE;
                         RegCloseKey(hlang);
                     }
@@ -2366,7 +1372,8 @@ typelib_file_from_typelib(VALUE ole)
 }
 
 static VALUE
-typelib_file(VALUE ole)
+typelib_file(ole)
+    VALUE ole;
 {
     VALUE file = typelib_file_from_clsid(ole);
     if (file != Qnil) {
@@ -2376,7 +1383,10 @@ typelib_file(VALUE ole)
 }
 
 static void
-ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
+ole_const_load(pTypeLib, klass, self)
+    ITypeLib *pTypeLib;
+    VALUE klass;
+    VALUE self;
 {
     unsigned int count;
     unsigned int index;
@@ -2439,7 +1449,10 @@ ole_const_load(ITypeLib *pTypeLib, VALUE klass, VALUE self)
 }
 
 static HRESULT
-clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
+clsid_from_remote(host, com, pclsid)
+    VALUE host;
+    VALUE com;
+    CLSID *pclsid;
 {
     HKEY hlm;
     HKEY hpid;
@@ -2461,7 +1474,7 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
         hr = HRESULT_FROM_WIN32(err);
     else {
         len = sizeof(clsid);
-        err = RegQueryValueEx(hpid, (LPBYTE)"", NULL, &dwtype, clsid, &len);
+        err = RegQueryValueEx(hpid, "", NULL, &dwtype, clsid, &len);
         if (err == ERROR_SUCCESS && dwtype == REG_SZ) {
             pbuf  = ole_mb2wc(clsid, -1);
             hr = CLSIDFromString(pbuf, pclsid);
@@ -2477,7 +1490,10 @@ clsid_from_remote(VALUE host, VALUE com, CLSID *pclsid)
 }
 
 static VALUE
-ole_create_dcom(int argc, VALUE *argv, VALUE self)
+ole_create_dcom(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE ole, host, others;
     HRESULT hr;
@@ -2499,7 +1515,7 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
     rb_scan_args(argc, argv, "2*", &ole, &host, &others);
 
-    pbuf  = ole_vstr2wc(ole);
+    pbuf  = ole_mb2wc(StringValuePtr(ole), -1);
     hr = CLSIDFromProgID(pbuf, &clsid);
     if (FAILED(hr))
         hr = clsid_from_remote(host, ole, &clsid);
@@ -2507,17 +1523,17 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
         hr = CLSIDFromString(pbuf, &clsid);
     SysFreeString(pbuf);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "unknown OLE server: `%s'",
                   StringValuePtr(ole));
     memset(&serverinfo, 0, sizeof(COSERVERINFO));    
-    serverinfo.pwszName = ole_vstr2wc(host);
+    serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
     memset(&multi_qi, 0, sizeof(MULTI_QI));
     multi_qi.pIID = &IID_IDispatch;
     hr = gCoCreateInstanceEx(&clsid, NULL, clsctx, &serverinfo, 1, &multi_qi);
     SysFreeString(serverinfo.pwszName);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "failed to create DCOM server `%s' in `%s'",
                   StringValuePtr(ole),
                   StringValuePtr(host));
@@ -2527,12 +1543,15 @@ ole_create_dcom(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
+ole_bind_obj(moniker, argc, argv, self)
+    VALUE moniker;
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     IBindCtx *pBindCtx;
     IMoniker *pMoniker;
     IDispatch *pDispatch;
-    void *p;
     HRESULT hr;
     OLECHAR *pbuf;
     ULONG eaten = 0;
@@ -2541,27 +1560,27 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
 
     hr = CreateBindCtx(0, &pBindCtx);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "failed to create bind context");
     }
 
-    pbuf  = ole_vstr2wc(moniker);
+    pbuf  = ole_mb2wc(StringValuePtr(moniker), -1);
     hr = MkParseDisplayName(pBindCtx, pbuf, &eaten, &pMoniker);
     SysFreeString(pbuf);
     if(FAILED(hr)) {
         OLE_RELEASE(pBindCtx);
-        ole_raise(hr, eWIN32OLERuntimeError,
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
                   "failed to parse display name of moniker `%s'",
                   StringValuePtr(moniker));
     }
     hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL, 
-                                        &IID_IDispatch, &p);
-    pDispatch = p;
+                                        &IID_IDispatch,
+                                        (void**)&pDispatch);
     OLE_RELEASE(pMoniker);
     OLE_RELEASE(pBindCtx);
 
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
                   "failed to bind moniker `%s'",
                   StringValuePtr(moniker));
     }
@@ -2578,7 +1597,10 @@ ole_bind_obj(VALUE moniker, int argc, VALUE *argv, VALUE self)
  *     WIN32OLE.connect('Excel.Application') # => WIN32OLE object which represents running Excel.
  */
 static VALUE
-fole_s_connect(int argc, VALUE *argv, VALUE self)
+fole_s_connect(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE svr_name;
     VALUE others;
@@ -2586,7 +1608,6 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
     CLSID   clsid;
     OLECHAR *pBuf;
     IDispatch *pDispatch;
-    void *p;
     IUnknown *pUnknown;
 
     rb_secure(4);
@@ -2594,13 +1615,13 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
     ole_initialize();
 
     rb_scan_args(argc, argv, "1*", &svr_name, &others);
-    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
+    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
         rb_raise(rb_eSecurityError, "Insecure Object Connection - %s",
                  StringValuePtr(svr_name));
     }
 
     /* get CLSID from OLE server name */
-    pBuf = ole_vstr2wc(svr_name);
+    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
     hr = CLSIDFromProgID(pBuf, &clsid);
     if(FAILED(hr)) {
         hr = CLSIDFromString(pBuf, &clsid);
@@ -2612,14 +1633,14 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
 
     hr = GetActiveObject(&clsid, 0, &pUnknown);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "OLE server `%s' not running", StringValuePtr(svr_name));
     }
-    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, &p);
-    pDispatch = p;
+    hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch,
+                                             (void **)&pDispatch);
     if(FAILED(hr)) {
         OLE_RELEASE(pUnknown);
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "failed to create WIN32OLE server `%s'", 
                   StringValuePtr(svr_name));
     }
@@ -2659,7 +1680,10 @@ fole_s_connect(int argc, VALUE *argv, VALUE self)
  *     puts MSO::MsoLineSingle # => 1
  */
 static VALUE
-fole_s_const_load(int argc, VALUE *argv, VALUE self)
+fole_s_const_load(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE ole;
     VALUE klass;
@@ -2670,7 +1694,7 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
     HRESULT hr;
     OLECHAR *pBuf;
     VALUE file;
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
     
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &ole, &klass);
@@ -2705,11 +1729,11 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
         if (file == Qnil) {
             file = ole;
         }
-        pBuf = ole_vstr2wc(file);
+        pBuf = ole_mb2wc(StringValuePtr(file), -1);
         hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
         SysFreeString(pBuf);
         if (FAILED(hr))
-          ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
+            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
         if(TYPE(klass) != T_NIL) {
             ole_const_load(pTypeLib, klass, self);
         }
@@ -2725,7 +1749,9 @@ fole_s_const_load(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
+ole_classes_from_typelib(pTypeLib, classes)
+    ITypeLib *pTypeLib;
+    VALUE classes;
 {
     
     long count;
@@ -2757,7 +1783,8 @@ ole_types_from_typelib(ITypeLib *pTypeLib, VALUE classes)
 }
 
 static ULONG
-reference_count(struct oledata * pole)
+reference_count(pole)
+    struct oledata * pole;
 {
     ULONG n = 0;
     if(pole->pDispatch) {
@@ -2776,7 +1803,9 @@ reference_count(struct oledata * pole)
  *  exists only for debugging WIN32OLE.
  */
 static VALUE
-fole_s_reference_count(VALUE self, VALUE obj)
+fole_s_reference_count(self, obj)
+    VALUE self;
+    VALUE obj;
 {
     struct oledata * pole;
     OLEData_Get_Struct(obj, pole);
@@ -2793,7 +1822,9 @@ fole_s_reference_count(VALUE self, VALUE obj)
  *  The return value is reference counter of OLE object.
  */
 static VALUE
-fole_s_free(VALUE self, VALUE obj)
+fole_s_free(self, obj)
+    VALUE self;
+    VALUE obj;
 {
     ULONG n = 0;
     struct oledata * pole;
@@ -2807,7 +1838,9 @@ fole_s_free(VALUE self, VALUE obj)
 }
 
 static HWND
-ole_show_help(VALUE helpfile, VALUE helpcontext)
+ole_show_help(helpfile, helpcontext)
+    VALUE helpfile;
+    VALUE helpcontext;
 {
     FNHTMLHELP *pfnHtmlHelp;
     HWND hwnd = 0;
@@ -2839,7 +1872,10 @@ ole_show_help(VALUE helpfile, VALUE helpcontext)
  *     WIN32OLE.ole_show_help(typeobj)
  */
 static VALUE
-fole_s_show_help(int argc, VALUE *argv, VALUE self)
+fole_s_show_help(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE target;
     VALUE helpcontext;
@@ -2878,61 +1914,41 @@ fole_s_show_help(int argc, VALUE *argv, VALUE self)
  *     WIN32OLE.codepage # => WIN32OLE::CP_ACP
  */
 static VALUE
-fole_s_get_code_page(VALUE self)
+fole_s_get_code_page(self)
+    VALUE self;
 {
     return INT2FIX(cWIN32OLE_cp);
 }
 
-static BOOL CALLBACK 
-installed_code_page_proc(LPTSTR str) {
-    if (strtoul(str, NULL, 10) == g_cp_to_check) {
-        g_cp_installed = TRUE;
-        return FALSE;
-    }
-    return TRUE;
-}
-
-static BOOL 
-code_page_installed(UINT cp)
-{
-    g_cp_installed = FALSE;
-    g_cp_to_check = cp;
-    EnumSystemCodePages(installed_code_page_proc, CP_INSTALLED);
-    return g_cp_installed;
-}
-
 /* 
  *  call-seq:
  *     WIN32OLE.codepage = CP
  * 
  *  Sets current codepage.
  *     WIN32OLE.codepage = WIN32OLE::CP_UTF8
- *     WIN32OLE.codepage = 20932
  */
 static VALUE
-fole_s_set_code_page(VALUE self, VALUE vcp)
+fole_s_set_code_page(self, vcp)
+    VALUE self;
+    VALUE vcp;
 {
     UINT cp = FIX2INT(vcp);
 
-    if (code_page_installed(cp)) {
+    switch(cp) {
+    case CP_ACP:
+    case CP_OEMCP:
+    case CP_MACCP:
+    case CP_THREAD_ACP:
+    case CP_SYMBOL:
+    case CP_UTF7:
+    case CP_UTF8:
         cWIN32OLE_cp = cp;
-    } else {
-        switch(cp) {
-        case CP_ACP:
-        case CP_OEMCP:
-        case CP_MACCP:
-        case CP_THREAD_ACP:
-        case CP_SYMBOL:
-        case CP_UTF7:
-        case CP_UTF8:
-            cWIN32OLE_cp = cp;
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8, or installed codepage.");
-            break;
-        }
+        break;
+    default:
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8");
+        break;
     }
-    cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
+
     /*
      * Should this method return old codepage?
      */
@@ -2940,131 +1956,9 @@ fole_s_set_code_page(VALUE self, VALUE vcp)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE.locale -> locale id.
- *
- *  Returns current locale id (lcid). The default locale is
- *  LOCALE_SYSTEM_DEFAULT.
- *
- *     lcid = WIN32OLE.locale
- */
-static VALUE 
-fole_s_get_locale(VALUE self)
-{
-    return INT2FIX(cWIN32OLE_lcid);
-}
-
-static BOOL
-CALLBACK installed_lcid_proc(LPTSTR str)
-{
-    if (strcmp(str, g_lcid_to_check) == 0) {
-        g_lcid_installed = TRUE;
-        return FALSE;
-    }
-    return TRUE;
-}
-
-static BOOL
-lcid_installed(LCID lcid)
-{
-    g_lcid_installed = FALSE;
-    snprintf(g_lcid_to_check, sizeof(g_lcid_to_check), "%08lx", lcid);
-    EnumSystemLocales(installed_lcid_proc, LCID_INSTALLED);
-    return g_lcid_installed;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE.locale = lcid
- *
- *  Sets current locale id (lcid).
- *
- *     WIN32OLE.locale = 1033 # set locale English(U.S)
- *     obj = WIN32OLE_VARIANT.new("$100,000", WIN32OLE::VARIANT::VT_CY)
- *
- */
-static VALUE 
-fole_s_set_locale(VALUE self, VALUE vlcid)
-{
-    LCID lcid = FIX2INT(vlcid);
-    if (lcid_installed(lcid)) {
-        cWIN32OLE_lcid = lcid;
-    } else {
-        switch (lcid) {
-        case LOCALE_SYSTEM_DEFAULT:
-        case LOCALE_USER_DEFAULT:
-            cWIN32OLE_lcid = lcid;
-            break;
-        default:
-            rb_raise(eWIN32OLERuntimeError, "not installed locale: %u", (unsigned int)lcid);
-        }
-    }
-    return Qnil;
-}
-
-/* 
- *  call-seq:
- *     WIN32OLE.create_guid
- * 
- *  Creates GUID.
- *     WIN32OLE.create_guid # => {1CB530F1-F6B1-404D-BCE6-1959BF91F4A8} 
- */
-static VALUE
-fole_s_create_guid(VALUE self)
-{
-    GUID guid;
-    HRESULT hr;
-    OLECHAR bstr[80];
-    int len = 0;
-    hr = CoCreateGuid(&guid);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to create GUID");
-    }
-    len = StringFromGUID2(&guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len == 0) {
-        rb_raise(rb_eRuntimeError, "failed to create GUID(buffer over)");
-    }
-    return ole_wc2vstr(bstr, FALSE);
-}
-
-/*
  * Document-class: WIN32OLE
  *
  *   <code>WIN32OLE</code> objects represent OLE Automation object in Ruby.
- *
- *   By using WIN32OLE, you can access OLE server like VBScript.
- *   
- *   Here is sample script.
- *
- *     require 'win32ole'
- *     
- *     excel = WIN32OLE.new('Excel.Application')
- *     excel.visible = true
- *     workbook = excel.Workbooks.Add();
- *     worksheet = workbook.Worksheets(1);
- *     worksheet.Range("A1:D1").value = ["North","South","East","West"];
- *     worksheet.Range("A2:B2").value = [5.2, 10];
- *     worksheet.Range("C2").value = 8;
- *     worksheet.Range("D2").value = 20;
- *     
- *     range = worksheet.Range("A1:D2");
- *     range.select
- *     chart = workbook.Charts.Add;
- *     
- *     workbook.saved = true;
- *     
- *     excel.ActiveWorkbook.Close(0);
- *     excel.Quit();
- *
- *  Unfortunately, Win32OLE doesn't support the argument passed by 
- *  reference directly.
- *  Instead, Win32OLE provides WIN32OLE::ARGV.
- *  If you want to get the result value of argument passed by reference,
- *  you can use WIN32OLE::ARGV.
- *
- *     oleobj.method(arg1, arg2, refargv3)
- *     puts WIN32OLE::ARGV[2]   # the value of refargv3 after called oleobj.method
- *     
  */
 
 /*
@@ -3081,7 +1975,10 @@ fole_s_create_guid(VALUE self)
  *      WIN32OLE.new('{00024500-0000-0000-C000-000000000046}') # => Excel OLE Automation WIN32OLE object.
  */
 static VALUE
-fole_initialize(int argc, VALUE *argv, VALUE self)
+fole_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE svr_name;
     VALUE host;
@@ -3090,18 +1987,17 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
     CLSID   clsid;
     OLECHAR *pBuf;
     IDispatch *pDispatch;
-    void *p;
 
     rb_secure(4);
     rb_call_super(0, 0);
     rb_scan_args(argc, argv, "11*", &svr_name, &host, &others);
 
-    if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) {
+    if (ruby_safe_level > 0 && OBJ_TAINTED(svr_name)) {
         rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
                  StringValuePtr(svr_name));
     }
     if (!NIL_P(host)) {
-        if (rb_safe_level() > 0 && OBJ_TAINTED(host)) {
+        if (ruby_safe_level > 0 && OBJ_TAINTED(host)) {
             rb_raise(rb_eSecurityError, "Insecure Object Creation - %s",
                      StringValuePtr(svr_name));
         }
@@ -3109,44 +2005,45 @@ fole_initialize(int argc, VALUE *argv, VALUE self)
     }
 
     /* get CLSID from OLE server name */
-    pBuf  = ole_vstr2wc(svr_name);
+    pBuf  = ole_mb2wc(StringValuePtr(svr_name), -1);
     hr = CLSIDFromProgID(pBuf, &clsid);
     if(FAILED(hr)) {
         hr = CLSIDFromString(pBuf, &clsid);
     }
     SysFreeString(pBuf);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "unknown OLE server: `%s'",
                   StringValuePtr(svr_name));
     }
 
     /* get IDispatch interface */
     hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-                          &IID_IDispatch, &p);
-    pDispatch = p;
+                          &IID_IDispatch, (void**)&pDispatch);
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError,
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
                   "failed to create WIN32OLE object from `%s'",
                   StringValuePtr(svr_name));
     }
-
+    
     ole_set_member(self, pDispatch);
     return self;
 }
 
 static VALUE
-hash2named_arg(VALUE pair, struct oleparam* pOp)
+hash2named_arg(pair, pOp)
+    VALUE pair;
+    struct oleparam* pOp;
 {
     unsigned int index, i;
     VALUE key, value;
     index = pOp->dp.cNamedArgs;
 
-    /*---------------------------------------------
-      the data-type of key must be String or Symbol
-    -----------------------------------------------*/
+    /*-------------------------------------
+      the data-type of key must be String
+    ---------------------------------------*/
     key = rb_ary_entry(pair, 0);
-    if(TYPE(key) != T_STRING && TYPE(key) != T_SYMBOL) {
+    if(TYPE(key) != T_STRING) {
         /* clear name of dispatch parameters */
         for(i = 1; i < index + 1; i++) {
             SysFreeString(pOp->pNamedArgs[i]);
@@ -3156,14 +2053,11 @@ hash2named_arg(VALUE pair, struct oleparam* pOp)
             VariantClear(&(pOp->dp.rgvarg[i]));
         }
         /* raise an exception */
-        rb_raise(rb_eTypeError, "wrong argument type (expected String or Symbol)");
-    }
-    if (TYPE(key) == T_SYMBOL) {
-        key = rb_str_new2(rb_id2name(SYM2ID(key)));
+        Check_Type(key, T_STRING);
     }
 
     /* pNamedArgs[0] is <method name>, so "index + 1" */
-    pOp->pNamedArgs[index + 1] = ole_vstr2wc(key);
+    pOp->pNamedArgs[index + 1] = ole_mb2wc(StringValuePtr(key), -1);
 
     value = rb_ary_entry(pair, 1);
     VariantInit(&(pOp->dp.rgvarg[index]));
@@ -3174,7 +2068,9 @@ hash2named_arg(VALUE pair, struct oleparam* pOp)
 }
 
 static VALUE
-set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
+set_argv(realargs, beg, end)
+    VARIANTARG* realargs;
+    unsigned int beg, end;
 {
     VALUE argv = rb_const_get(cWIN32OLE, rb_intern("ARGV"));
 
@@ -3188,9 +2084,13 @@ set_argv(VARIANTARG* realargs, unsigned int beg, unsigned int end)
 }
 
 static VALUE
-ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
+ole_invoke(argc, argv, self, wFlags)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+    USHORT wFlags;
 {
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
     struct oledata *pole;
     HRESULT hr;
     VALUE cmd;
@@ -3211,7 +2111,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
     unsigned int cNamedArgs;
     int n;
     struct oleparam op;
-    struct olevariantdata *pvar;
     memset(&excepinfo, 0, sizeof(EXCEPINFO));
 
     VariantInit(&result);
@@ -3226,20 +2125,14 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
     if(!pole->pDispatch) {
         rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
     }
-    if (is_bracket) {
-        DispID = DISPID_VALUE;
-        argc += 1;
-	rb_ary_unshift(paramS, cmd);
-    } else {
-        wcmdname = ole_vstr2wc(cmd);
-        hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-                &wcmdname, 1, lcid, &DispID);
-        SysFreeString(wcmdname);
-        if(FAILED(hr)) {
-            ole_raise(hr, eWIN32OLERuntimeError, 
-                    "unknown property or method: `%s'",
-                    StringValuePtr(cmd));
-        }
+    wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
+    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
+                                                 &wcmdname, 1, lcid, &DispID);
+    SysFreeString(wcmdname);
+    if(FAILED(hr)) {
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
+                  "unknown property or method `%s'",
+                  StringValuePtr(cmd));
     }
 
     /* pick up last argument of method */
@@ -3256,10 +2149,10 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
         op.dp.cArgs = cNamedArgs + argc - 2;
         op.pNamedArgs = ALLOCA_N(OLECHAR*, cNamedArgs + 1);
         op.dp.rgvarg = ALLOCA_N(VARIANTARG, op.dp.cArgs);
-        rb_block_call(param, rb_intern("each"), 0, 0, hash2named_arg, (VALUE)&op);
+        rb_iterate(rb_each, param, hash2named_arg, (VALUE)&op);
 
         pDispID = ALLOCA_N(DISPID, cNamedArgs + 1);
-        op.pNamedArgs[0] = ole_vstr2wc(cmd);
+        op.pNamedArgs[0] = ole_mb2wc(StringValuePtr(cmd), -1);
         hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch,
                                                     &IID_NULL,
                                                     op.pNamedArgs,
@@ -3274,7 +2167,7 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
             for(i = 0; i < op.dp.cArgs; i++ ) {
                 VariantClear(&op.dp.rgvarg[i]);
             }
-            ole_raise(hr, eWIN32OLERuntimeError, 
+            ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                       "failed to get named argument info: `%s'",
                       StringValuePtr(cmd));
         }
@@ -3298,20 +2191,17 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
             VariantInit(&realargs[n]);
             VariantInit(&op.dp.rgvarg[n]);
             param = rb_ary_entry(paramS, i-cNamedArgs);
-            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
-                Data_Get_Struct(param, struct olevariantdata, pvar);
-                VariantCopy(&op.dp.rgvarg[n], &(pvar->var));
-            } else {
-                ole_val2variant(param, &realargs[n]);
-                V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
-                V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
-            }
+            
+             ole_val2variant(param, &realargs[n]);
+            V_VT(&op.dp.rgvarg[n]) = VT_VARIANT | VT_BYREF;
+             V_VARIANTREF(&op.dp.rgvarg[n]) = &realargs[n];
+
         }
     }
     /* apparent you need to call propput, you need this */
     if (wFlags & DISPATCH_PROPERTYPUT) {
         if (op.dp.cArgs == 0)
-            ole_raise(ResultFromScode(E_INVALIDARG), eWIN32OLERuntimeError, "argument error");
+            return ResultFromScode(E_INVALIDARG);
 
         op.dp.cNamedArgs = 1;
         op.dp.rgdispidNamedArgs = ALLOCA_N( DISPID, 1 );
@@ -3321,7 +2211,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
     hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, 
                                          &IID_NULL, lcid, wFlags, &op.dp, 
                                          &result, &excepinfo, &argErr);
-
     if (FAILED(hr)) {
         /* retry to call args by value */
         if(op.dp.cArgs >= cNamedArgs) {
@@ -3353,14 +2242,12 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
                         &IID_NULL, lcid, wFlags,
                         &op.dp, NULL,
                         &excepinfo, &argErr);
-
             }
             for(i = cNamedArgs; i < op.dp.cArgs; i++) {
                 n = op.dp.cArgs - i + cNamedArgs - 1;
                 VariantClear(&op.dp.rgvarg[n]);
             }
         }
-
         if (FAILED(hr)) {
             /* retry after converting nil to VT_EMPTY */
             if (op.dp.cArgs > cNamedArgs) {
@@ -3388,13 +2275,6 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
     }
     /* clear dispatch parameter */
     if(op.dp.cArgs > cNamedArgs) {
-        for(i = cNamedArgs; i < op.dp.cArgs; i++) {
-            n = op.dp.cArgs - i + cNamedArgs - 1;
-            param = rb_ary_entry(paramS, i-cNamedArgs);
-            if (rb_obj_is_kind_of(param, cWIN32OLE_VARIANT)) {
-                ole_val2variant(param, &realargs[n]);
-            }
-        }
         set_argv(realargs, cNamedArgs, op.dp.cArgs);
     }
     else {
@@ -3405,9 +2285,8 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
 
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `%s': )%s",
-                  StringValuePtr(cmd),
-                  StringValuePtr(v));
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "%s%s",
+                  StringValuePtr(cmd), StringValuePtr(v));
     }
     obj = ole_variant2val(&result);
     VariantClear(&result);
@@ -3428,13 +2307,21 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket)
  *
  */
 static VALUE
-fole_invoke(int argc, VALUE *argv, VALUE self)
+fole_invoke(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
-    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+    return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
 }
 
 static VALUE
-ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
+ole_invoke2(self, dispid, args, types, dispkind)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
+    USHORT dispkind;
 {
     HRESULT hr;
     struct oledata *pole;
@@ -3457,7 +2344,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
     VariantInit(&result);
     OLEData_Get_Struct(self, pole);
 
-    dispParams.cArgs = RARRAY_LEN(args);
+    dispParams.cArgs = RARRAY(args)->len;
     dispParams.rgvarg = ALLOCA_N(VARIANTARG, dispParams.cArgs);
     realargs = ALLOCA_N(VARIANTARG, dispParams.cArgs);
     for (i = 0, j = dispParams.cArgs - 1; i < (int)dispParams.cArgs; i++, j--)
@@ -3488,7 +2375,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
                 SAFEARRAYBOUND rgsabound[1];
                 Check_Type(param, T_ARRAY);
                 rgsabound[0].lLbound = 0;
-                rgsabound[0].cElements = RARRAY_LEN(param);
+                rgsabound[0].cElements = RARRAY(param)->len;
                 v = vt & ~(VT_ARRAY | VT_BYREF);
                 V_ARRAY(&realargs[i]) = SafeArrayCreate(v, 1, rgsabound);
                 V_VT(&realargs[i]) = VT_ARRAY | v;
@@ -3506,7 +2393,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
                     if (v != VT_VARIANT)
                     {
                         VariantChangeTypeEx(&velem, &velem,
-                            cWIN32OLE_lcid, 0, v);
+                            LOCALE_SYSTEM_DEFAULT, 0, v);
                     }
                     switch (v)
                     {
@@ -3545,7 +2432,7 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
                 if ((vt & (~VT_BYREF)) != VT_VARIANT)
                 {
                     hr = VariantChangeTypeEx(&realargs[i], &realargs[i],
-                                             cWIN32OLE_lcid, 0,
+                                             LOCALE_SYSTEM_DEFAULT, 0,
                                              (VARTYPE)(vt & (~VT_BYREF)));
                     if (hr != S_OK)
                     {
@@ -3601,15 +2488,14 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
     }
 
     hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, NUM2INT(dispid),
-                                         &IID_NULL, cWIN32OLE_lcid,
+                                         &IID_NULL, LOCALE_SYSTEM_DEFAULT,
                                          dispkind,
                                          &dispParams, &result,
                                          &excepinfo, &argErr);
 
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in OLE method `<dispatch id:%d>': )%s",
-                  NUM2INT(dispid),
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "_invoke %s",
                   StringValuePtr(v));
     }
 
@@ -3636,7 +2522,11 @@ ole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types, USHORT dispkind)
  *      excel._invoke(302, [], []) #  same effect as excel.Quit
  */
 static VALUE
-fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_invoke2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_METHOD);
 }
@@ -3654,7 +2544,11 @@ fole_invoke2(VALUE self, VALUE dispid, VALUE args, VALUE types)
  *     puts excel._getproperty(558, [], []) # same effect as puts excel.visible
  */
 static VALUE
-fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_getproperty2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYGET);
 }
@@ -3672,78 +2566,59 @@ fole_getproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
  *      excel._setproperty(558, [true], [WIN32OLE::VARIANT::VT_BOOL]) # same effect as excel.visible = true
  */
 static VALUE
-fole_setproperty2(VALUE self, VALUE dispid, VALUE args, VALUE types)
+fole_setproperty2(self, dispid, args, types)
+    VALUE self;
+    VALUE dispid;
+    VALUE args;
+    VALUE types;
 {
     return ole_invoke2(self, dispid, args, types, DISPATCH_PROPERTYPUT);
 }
 
 /*
  *  call-seq:
- *     WIN32OLE[a1, a2, ...]=val 
- * 
- *  Sets the value to WIN32OLE object specified by a1, a2, ...
- *     
- *     dict = WIN32OLE.new('Scripting.Dictionary')
- *     dict.add('ruby', 'RUBY')
- *     dict['ruby'] = 'Ruby' 
- *     puts dict['ruby'] # => 'Ruby'
- *
- *  Remark: You can not use this method to set the property value.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     # excel['Visible'] = true # This is error !!!
- *     excel.Visible = true # You should to use this style to set the property.
- *
- */
-static VALUE
-fole_setproperty_with_bracket(int argc, VALUE *argv, VALUE self)
-{
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, TRUE);
-}
-
-/*
- *  call-seq:
+ *     WIN32OLE['property']=val 
  *     WIN32OLE.setproperty('property', [arg1, arg2,...] val)
  * 
  *  Sets property of OLE object.
  *  When you want to set property with argument, you can use this method.
  *
  *     excel = WIN32OLE.new('Excel.Application')
- *     excel.Visible = true
+ *     excel['Visible'] = true
  *     book = excel.workbooks.add
  *     sheet = book.worksheets(1)
  *     sheet.setproperty('Cells', 1, 2, 10) # => The B1 cell value is 10.
  */
 static VALUE
-fole_setproperty(int argc, VALUE *argv, VALUE self)
+fole_setproperty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT, FALSE);
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYPUT);
 }
 
 /*
  *  call-seq:
- *     WIN32OLE[a1,a2,...] 
+ *     WIN32OLE['property'] 
  * 
- *  Returns the value of Collection specified by a1, a2,....
+ *  Returns property of OLE object.
  *
- *     dict = WIN32OLE.new('Scripting.Dictionary')
- *     dict.add('ruby', 'Ruby')
- *     puts dict['ruby'] # => 'Ruby' (same as `puts dict.item('ruby')')
- *    
- *  Remark: You can not use this method to get the property.
  *     excel = WIN32OLE.new('Excel.Application')
- *     # puts excel['Visible']  This is error !!!
- *     puts excel.Visible # You should to use this style to get the property.
- *
+ *     puts excel['Visible'] # => false
  */
 static VALUE
-fole_getproperty_with_bracket(int argc, VALUE *argv, VALUE self)
+fole_getproperty(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
-    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET, TRUE);
+    return ole_invoke(argc, argv, self, DISPATCH_PROPERTYGET);
 }
 
 static VALUE
-ole_propertyput(VALUE self, VALUE property, VALUE value)
+ole_propertyput(self, property, value)
+    VALUE self, property, value;
 {
     struct oledata *pole;
     unsigned argErr;
@@ -3757,7 +2632,7 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
     VARIANTARG propertyValue[2];
     OLECHAR* pBuf[1];
     VALUE v;
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
     dispParams.rgdispidNamedArgs = &dispIDParam;
     dispParams.rgvarg = propertyValue;
     dispParams.cNamedArgs = 1;
@@ -3770,14 +2645,14 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
     OLEData_Get_Struct(self, pole);
 
     /* get ID from property name */
-    pBuf[0]  = ole_vstr2wc(property);
+    pBuf[0]  = ole_mb2wc(StringValuePtr(property), -1);
     hr = pole->pDispatch->lpVtbl->GetIDsOfNames(pole->pDispatch, &IID_NULL,
                                                 pBuf, 1, lcid, &dispID);
     SysFreeString(pBuf[0]);
     pBuf[0] = NULL;
 
     if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, 
                   "unknown property or method: `%s'",
                   StringValuePtr(property));
     }
@@ -3792,9 +2667,7 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
     }
     if (FAILED(hr)) {
         v = ole_excepinfo2msg(&excepinfo);
-        ole_raise(hr, eWIN32OLERuntimeError, "(in setting property `%s': )%s",
-                  StringValuePtr(property),
-                  StringValuePtr(v));
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, StringValuePtr(v));
     }
     return Qnil;
 }
@@ -3809,7 +2682,8 @@ ole_propertyput(VALUE self, VALUE property, VALUE value)
  *
  */
 static VALUE
-fole_free(VALUE self)
+fole_free(self)
+    VALUE self;
 {
     struct oledata *pole;
     rb_secure(4);
@@ -3820,7 +2694,8 @@ fole_free(VALUE self)
 }
 
 static VALUE
-ole_each_sub(VALUE pEnumV)
+ole_each_sub(pEnumV)
+    VALUE pEnumV;
 {
     VARIANT variant;
     VALUE obj = Qnil;
@@ -3836,7 +2711,8 @@ ole_each_sub(VALUE pEnumV)
 }
 
 static VALUE
-ole_ienum_free(VALUE pEnumV)
+ole_ienum_free(pEnumV)
+    VALUE pEnumV;
 {
     IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
     OLE_RELEASE(pEnum);
@@ -3858,9 +2734,10 @@ ole_ienum_free(VALUE pEnumV)
  *     end
  */
 static VALUE
-fole_each(VALUE self)
+fole_each(self)
+    VALUE self;
 {
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
 
     struct oledata *pole;
 
@@ -3870,9 +2747,6 @@ fole_each(VALUE self)
     VARIANT result;
     HRESULT hr;
     IEnumVARIANT *pEnum = NULL;
-    void *p;
-
-    RETURN_ENUMERATOR(self, 0, 0);
 
     VariantInit(&result);
     dispParams.rgvarg = NULL;
@@ -3890,20 +2764,17 @@ fole_each(VALUE self)
 
     if (FAILED(hr)) {
         VariantClear(&result);
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get IEnum Interface");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
     }
 
-    if (V_VT(&result) == VT_UNKNOWN) {
+    if (V_VT(&result) == VT_UNKNOWN)
         hr = V_UNKNOWN(&result)->lpVtbl->QueryInterface(V_UNKNOWN(&result),
                                                         &IID_IEnumVARIANT,
-                                                        &p);
-        pEnum = p;
-    } else if (V_VT(&result) == VT_DISPATCH) {
+                                                        (void**)&pEnum);
+    else if (V_VT(&result) == VT_DISPATCH)
         hr = V_DISPATCH(&result)->lpVtbl->QueryInterface(V_DISPATCH(&result),
                                                          &IID_IEnumVARIANT,
-                                                         &p);
-        pEnum = p;
-    }
+                                                         (void**)&pEnum);
     if (FAILED(hr) || !pEnum) {
         VariantClear(&result);
         ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
@@ -3921,10 +2792,13 @@ fole_each(VALUE self)
  *  Calls WIN32OLE#invoke method.
  */
 static VALUE
-fole_missing(int argc, VALUE *argv, VALUE self)
+fole_missing(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     ID id;
-    const char* mname;
+    char* mname;
     int n;
     id = rb_to_id(argv[0]);
     mname = rb_id2name(id);
@@ -3933,18 +2807,22 @@ fole_missing(int argc, VALUE *argv, VALUE self)
     }
     n = strlen(mname);
     if(mname[n-1] == '=') {
-        argv[0] = rb_enc_str_new(mname, n-1, cWIN32OLE_enc);
+        argv[0] = rb_str_new(mname, n-1);
 
         return ole_propertyput(self, argv[0], argv[1]);
     }
     else {
-        argv[0] = rb_enc_str_new(mname, n, cWIN32OLE_enc);
-        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET, FALSE);
+        argv[0] = rb_str_new2(mname);
+        return ole_invoke(argc, argv, self, DISPATCH_METHOD|DISPATCH_PROPERTYGET);
     }
 }
 
 static VALUE
-ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE name)
+ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pOwnerTypeInfo;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3955,7 +2833,7 @@ ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALU
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
         hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
@@ -3981,7 +2859,10 @@ ole_method_sub(VALUE self, ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALU
 }
 
 static VALUE
-olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
+olemethod_from_typeinfo(self, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -3991,7 +2872,7 @@ olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
     VALUE method = Qnil;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     method = ole_method_sub(self, 0, pTypeInfo, name);
     if (method != Qnil) {
@@ -4012,7 +2893,11 @@ olemethod_from_typeinfo(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
 }
 
 static VALUE
-ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods, int mask)
+ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
+    ITypeInfo *pOwnerTypeInfo;
+    ITypeInfo *pTypeInfo;
+    VALUE     methods;
+    int       mask;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -4023,7 +2908,7 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
     WORD i;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     for(i = 0; i < pTypeAttr->cFuncs; i++) {
         pstr = NULL;
@@ -4052,7 +2937,9 @@ ole_methods_sub(ITypeInfo *pOwnerTypeInfo, ITypeInfo *pTypeInfo, VALUE methods,
 }
 
 static VALUE
-ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
+ole_methods_from_typeinfo(pTypeInfo, mask)
+    ITypeInfo *pTypeInfo;
+    int mask;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -4062,7 +2949,7 @@ ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
     VALUE methods = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
 
     ole_methods_sub(0, pTypeInfo, methods, mask);
@@ -4081,7 +2968,9 @@ ole_methods_from_typeinfo(ITypeInfo *pTypeInfo, int mask)
 }
 
 static HRESULT
-typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
+typeinfo_from_ole(pole, ppti)
+    struct oledata *pole;
+    ITypeInfo **ppti;
 {
     ITypeInfo *pTypeInfo;
     ITypeLib *pTypeLib;
@@ -4089,7 +2978,7 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
     VALUE type;
     UINT i;
     UINT count;
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
     HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
                                                       0, lcid, &pTypeInfo);
     if(FAILED(hr)) {
@@ -4122,7 +3011,9 @@ typeinfo_from_ole(struct oledata *pole, ITypeInfo **ppti)
 }
 
 static VALUE
-ole_methods(VALUE self, int mask)
+ole_methods(self,mask)
+    VALUE self;
+    int mask;
 {
     ITypeInfo *pTypeInfo;
     HRESULT hr;
@@ -4152,7 +3043,8 @@ ole_methods(VALUE self, int mask)
  *     
  */
 static VALUE
-fole_methods(VALUE self)
+fole_methods( self )
+    VALUE self;
 {
     return ole_methods( self, INVOKE_FUNC | INVOKE_PROPERTYGET | INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
 }
@@ -4168,7 +3060,8 @@ fole_methods(VALUE self)
  *     properties = excel.ole_get_methods
  */
 static VALUE
-fole_get_methods(VALUE self)
+fole_get_methods( self )
+    VALUE self;
 {
     return ole_methods( self, INVOKE_PROPERTYGET);
 }
@@ -4184,9 +3077,10 @@ fole_get_methods(VALUE self)
  *     properties = excel.ole_put_methods
  */
 static VALUE
-fole_put_methods(VALUE self)
+fole_put_methods( self )
+    VALUE self;
 {
-    return ole_methods( self, INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF);
+    return ole_methods( self, INVOKE_PROPERTYPUT | INVOKE_PROPERTYPUTREF);
 }
 
 /*
@@ -4194,58 +3088,39 @@ fole_put_methods(VALUE self)
  *     WIN32OLE#ole_func_methods
  * 
  *  Returns the array of WIN32OLE_METHOD object .
- *  The element of the array is property (settable) of WIN32OLE object.
+ *  The element of the array is functional method of WIN32OLE object.
  *
  *     excel = WIN32OLE.new('Excel.Application')
  *     properties = excel.ole_func_methods
  *
  */
 static VALUE
-fole_func_methods(VALUE self)
+fole_func_methods( self )
+    VALUE self;
 {
     return ole_methods( self, INVOKE_FUNC);
 }
 
-static VALUE
-ole_type_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
-    ITypeLib *pTypeLib;
-    VALUE type = Qnil;
-    HRESULT hr;
-    unsigned int index;
-    BSTR bstr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
-    if(FAILED(hr)) {
-        return Qnil;
-    }
-    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
-                                             &bstr, NULL, NULL, NULL);
-    OLE_RELEASE(pTypeLib);
-    if (FAILED(hr)) {
-        return Qnil;
-    }
-    type = foletype_s_allocate(cWIN32OLE_TYPE);
-    oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
-    return type;
-}
-
 /*
  *   call-seq:
- *      WIN32OLE#ole_type
+ *      WIN32OLE#ole_obj_help
  * 
  *   Returns WIN32OLE_TYPE object.
  *
  *      excel = WIN32OLE.new('Excel.Application')
- *      tobj = excel.ole_type
+ *      tobj = excel.ole_obj_help
  */
 static VALUE
-fole_type(VALUE self)
+fole_obj_help( self )
+    VALUE self;
 {
+    unsigned int index;
     ITypeInfo *pTypeInfo;
+    ITypeLib *pTypeLib;
     HRESULT hr;
     struct oledata *pole;
-    LCID  lcid = cWIN32OLE_lcid;
+    BSTR bstr;
+    LCID  lcid = LOCALE_SYSTEM_DEFAULT;
     VALUE type = Qnil;
 
     OLEData_Get_Struct(self, pole);
@@ -4254,177 +3129,30 @@ fole_type(VALUE self)
     if(FAILED(hr)) {
         ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
     }
-    type = ole_type_from_itypeinfo(pTypeInfo);
-    OLE_RELEASE(pTypeInfo);
-    if (type == Qnil) {
-        rb_raise(rb_eRuntimeError, "failed to create WIN32OLE_TYPE obj from ITypeInfo");
-    }
-    return type;
-}
-
-static VALUE
-make_oletypelib_obj(VALUE guid, VALUE major_version, VALUE minor_version)
-{
-    VALUE args = rb_ary_new();
-    rb_ary_push(args, guid);
-    rb_ary_push(args, major_version);
-    rb_ary_push(args, minor_version);
-    return rb_apply(cWIN32OLE_TYPELIB, rb_intern("new"), args);
-}
-
-static VALUE
-ole_typelib_from_itypelib(ITypeLib *pTypeLib)
-{
-    TLIBATTR *pTLibAttr;
-    OLECHAR bstr[80];
-    VALUE guid = Qnil;
-    VALUE major;
-    VALUE minor;
-    int len = 0;
-    HRESULT hr = S_OK; 
-    hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
-    if (FAILED(hr)) {
-        return Qnil;
-    }
-    len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
-    if (len > 3) {
-        guid = ole_wc2vstr(bstr, FALSE);
-    }
-    major = INT2NUM(pTLibAttr->wMajorVerNum);
-    minor = INT2NUM(pTLibAttr->wMinorVerNum);
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    if (guid == Qnil) {
-        return Qnil;
-    }
-    return make_oletypelib_obj(guid, major, minor);
-}
-
-
-static VALUE
-ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib;
-    unsigned int index;
-    VALUE retval = Qnil;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
+    hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
     if(FAILED(hr)) {
-        return Qnil;
+        OLE_RELEASE(pTypeInfo);
+        ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
     }
-    retval = ole_typelib_from_itypelib(pTypeLib);
-    OLE_RELEASE(pTypeLib);
-    return retval;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object 
- *
- *  Returns the WIN32OLE_TYPELIB object. The object represents the
- *  type library which contains the WIN32OLE object.
- *
- *     excel = WIN32OLE.new('Excel.Application')
- *     tlib = excel.ole_typelib
- *     puts tlib.name  # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-fole_typelib(VALUE self)
-{
-    struct oledata *pole;
-    HRESULT hr;
-    ITypeInfo *pTypeInfo;
-    LCID  lcid = cWIN32OLE_lcid;
-    VALUE vtlib = Qnil;
-
-    OLEData_Get_Struct(self, pole);
-    hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
-                                              0, lcid, &pTypeInfo);
-    if(FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
+    hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
+                                             &bstr, NULL, NULL, NULL);
+    if (SUCCEEDED(hr)) {
+        type = foletype_s_allocate(cWIN32OLE_TYPE);
+        oletype_set_member(type, pTypeInfo, WC2VSTR(bstr));
     }
-    vtlib = ole_typelib_from_itypeinfo(pTypeInfo);
+    OLE_RELEASE(pTypeLib);
     OLE_RELEASE(pTypeInfo);
-    if (vtlib == Qnil) {
-        rb_raise(rb_eRuntimeError, "failed to get type library info.");
-    }
-    return vtlib;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_query_interface(iid) -> WIN32OLE object
- * 
- *  Returns WIN32OLE object for a specific dispatch or dual
- *  interface specified by iid.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ie_web_app = ie.ole_query_interface('{0002DF05-0000-0000-C000-000000000046}') # => WIN32OLE object for dispinterface IWebBrowserApp 
- */
-static VALUE
-fole_query_interface(VALUE self, VALUE str_iid)
-{
-    HRESULT hr;
-    OLECHAR *pBuf;
-    IID iid;
-    struct oledata *pole;
-    IDispatch *pDispatch;
-    void *p;
-         
-    pBuf  = ole_vstr2wc(str_iid);
-    hr = CLSIDFromString(pBuf, &iid);
-    SysFreeString(pBuf);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
-                  "invalid iid: `%s'",
-                  StringValuePtr(str_iid));
-    }
-
-    OLEData_Get_Struct(self, pole);
-    if(!pole->pDispatch) {
-        rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
-    }
 
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &iid,
-                                                 &p);
-    if(FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, 
-                  "failed to get interface `%s'", 
-                  StringValuePtr(str_iid));
-    }
-
-    pDispatch = p;
-    return create_win32ole_object(cWIN32OLE, pDispatch, 0, 0);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE#ole_respond_to?(method) -> true or false
- * 
- *  Returns true when OLE object has OLE method, otherwise returns false.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ie.ole_respond_to?("gohome") => true
- */
-static VALUE
-fole_respond_to(VALUE self, VALUE method)
-{
-    struct oledata *pole;
-    BSTR wcmdname;
-    DISPID DispID;
-    HRESULT hr;
-    rb_secure(4);
-    Check_SafeStr(method);
-    OLEData_Get_Struct(self, pole);
-    wcmdname = ole_vstr2wc(method);
-    hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
-	    &wcmdname, 1, cWIN32OLE_lcid, &DispID);
-    SysFreeString(wcmdname);
-    return SUCCEEDED(hr) ? Qtrue : Qfalse;
+    return type;
 }
 
 static HRESULT
-ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile)
+ole_docinfo_from_type(pTypeInfo, name, helpstr, helpcontext, helpfile)
+    ITypeInfo *pTypeInfo;
+    BSTR *name;
+    BSTR *helpstr; 
+    DWORD *helpcontext;
+    BSTR *helpfile;
 {
     HRESULT hr;
     ITypeLib *pTypeLib;
@@ -4447,7 +3175,10 @@ ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *he
 }
 
 static VALUE
-ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_usertype2val(pTypeInfo, pTypeDesc, typedetails)
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
 {
     HRESULT hr;
     BSTR bstr;
@@ -4471,132 +3202,146 @@ ole_usertype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
     return type;
 }
 
+static VALUE ole_typedesc2val();
 static VALUE
-ole_ptrtype2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails) 
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
 {    
     TYPEDESC *p = pTypeDesc;
     VALUE type = rb_str_new2("");
-
-    if (p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
+    while(p->vt == VT_PTR || p->vt == VT_SAFEARRAY) {
         p = V_UNION1(p, lptdesc);
-        type = ole_typedesc2val(pTypeInfo, p, typedetails);
+        if(strlen(StringValuePtr(type)) == 0) {
+           type = ole_typedesc2val(pTypeInfo, p, typedetails);
+        } else {
+           rb_str_cat(type, ",", 1);
+           rb_str_concat(type, ole_typedesc2val(pTypeInfo, p, typedetails));
+        }
     }
     return type;
 }
 
 static VALUE
-ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
+ole_typedesc2val(pTypeInfo, pTypeDesc, typedetails)
+    ITypeInfo *pTypeInfo;
+    TYPEDESC *pTypeDesc;
+    VALUE typedetails;
 {
     VALUE str;
-    VALUE typestr = Qnil;
     switch(pTypeDesc->vt) {
     case VT_I2:
-        typestr = rb_str_new2("I2");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I2"));
+        return rb_str_new2("I2");
     case VT_I4:
-        typestr = rb_str_new2("I4");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I4"));
+        return rb_str_new2("I4");
     case VT_R4:
-        typestr = rb_str_new2("R4");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("R4"));
+        return rb_str_new2("R4");
     case VT_R8:
-        typestr = rb_str_new2("R8");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("R8"));
+        return rb_str_new2("R8");
     case VT_CY:
-        typestr = rb_str_new2("CY");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("CY"));
+        return rb_str_new2("CY");
     case VT_DATE:
-        typestr = rb_str_new2("DATE");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DATE"));
+        return rb_str_new2("DATE");
     case VT_BSTR:
-        typestr = rb_str_new2("BSTR");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("BSTR"));
+        return rb_str_new2("BSTR");
     case VT_BOOL:
-        typestr = rb_str_new2("BOOL");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("BOOL"));
+        return rb_str_new2("BOOL");
     case VT_VARIANT:
-        typestr = rb_str_new2("VARIANT");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("VARIANT"));
+        return rb_str_new2("VARIANT");
     case VT_DECIMAL:
-        typestr = rb_str_new2("DECIMAL");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DECIMAL"));
+        return rb_str_new2("DECIMAL");
     case VT_I1:
-        typestr = rb_str_new2("I1");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I1"));
+        return rb_str_new2("I1");
     case VT_UI1:
-        typestr = rb_str_new2("UI1");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI1"));
+        return rb_str_new2("UI1");
     case VT_UI2:
-        typestr = rb_str_new2("UI2");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI2"));
+        return rb_str_new2("UI2");
     case VT_UI4:
-        typestr = rb_str_new2("UI4");
-        break;
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI4"));
+        return rb_str_new2("UI4");
     case VT_I8:
-        typestr = rb_str_new2("I8");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("I8"));
+        return rb_str_new2("I8");
     case VT_UI8:
-        typestr = rb_str_new2("UI8");
-        break;
-#endif
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UI8"));
+        return rb_str_new2("UI8");
     case VT_INT:
-        typestr = rb_str_new2("INT");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("INT"));
+        return rb_str_new2("INT");
     case VT_UINT:
-        typestr = rb_str_new2("UINT");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("UINT"));
+        return rb_str_new2("UINT");
     case VT_VOID:
-        typestr = rb_str_new2("VOID");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("VOID"));
+        return rb_str_new2("VOID");
     case VT_HRESULT:
-        typestr = rb_str_new2("HRESULT");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("HRESULT"));
+        return rb_str_new2("HRESULT");
     case VT_PTR:
-        typestr = rb_str_new2("PTR");
         if(typedetails != Qnil)
-            rb_ary_push(typedetails, typestr);
+            rb_ary_push(typedetails, rb_str_new2("PTR"));
         return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
     case VT_SAFEARRAY:
-        typestr = rb_str_new2("SAFEARRAY");
         if(typedetails != Qnil)
-            rb_ary_push(typedetails, typestr);
+            rb_ary_push(typedetails, rb_str_new2("SAFEARRAY"));
         return ole_ptrtype2val(pTypeInfo, pTypeDesc, typedetails);
     case VT_CARRAY:
-        typestr = rb_str_new2("CARRAY");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("CARRAY"));
+        return rb_str_new2("CARRAY");
     case VT_USERDEFINED:
-        typestr = rb_str_new2("USERDEFINED");
-        if (typedetails != Qnil) 
-            rb_ary_push(typedetails, typestr);
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("USERDEFINED"));
         str = ole_usertype2val(pTypeInfo, pTypeDesc, typedetails);
         if (str != Qnil) {
             return str;
         }
-        return typestr;
+        return rb_str_new2("USERDEFINED");
     case VT_UNKNOWN:
-        typestr = rb_str_new2("UNKNOWN");
-        break;
+        return rb_str_new2("UNKNOWN");
     case VT_DISPATCH:
-        typestr = rb_str_new2("DISPATCH");
-        break;
-    case VT_ERROR:
-        typestr = rb_str_new2("ERROR");
-        break;
-    case VT_LPWSTR:
-        typestr = rb_str_new2("LPWSTR");
-        break;
-    case VT_LPSTR:
-        typestr = rb_str_new2("LPSTR");
-        break;
+        if(typedetails != Qnil)
+            rb_ary_push(typedetails, rb_str_new2("DISPATCH"));
+        return rb_str_new2("DISPATCH");
     default:
-        typestr = rb_str_new2("Unknown Type ");
-        rb_str_concat(typestr, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
-        break;
+        str = rb_str_new2("Unknown Type ");
+        rb_str_concat(str, rb_fix2str(INT2FIX(pTypeDesc->vt), 10));
+        return str;
     }
-    if (typedetails != Qnil)
-        rb_ary_push(typedetails, typestr);
-    return typestr;
 }
 
 /*
@@ -4611,12 +3356,15 @@ ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails)
  *
  */
 static VALUE
-fole_method_help(VALUE self, VALUE cmdname)
+fole_method_help( self, cmdname )
+    VALUE self;
+    VALUE cmdname;
 {
     ITypeInfo *pTypeInfo;
     HRESULT hr;
     struct oledata *pole;
     VALUE method, obj;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
 
     Check_SafeStr(cmdname);
     OLEData_Get_Struct(self, pole);
@@ -4627,7 +3375,7 @@ fole_method_help(VALUE self, VALUE cmdname)
     obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
     OLE_RELEASE(pTypeInfo);
     if (obj == Qnil)
-        rb_raise(eWIN32OLERuntimeError, "not found %s",
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
                  StringValuePtr(cmdname));
     return obj;
 }
@@ -4643,7 +3391,7 @@ fole_method_help(VALUE self, VALUE cmdname)
  *  created with MFC should be initialized by calling 
  *  IPersistXXX::InitNew.
  *
- *  If and only if you received the exception "HRESULT error code:
+ *  If and only if you recieved the exception "HRESULT error code:
  *  0x8000ffff catastrophic failure", try this method before
  *  invoking any ole_method.
  *
@@ -4653,18 +3401,18 @@ fole_method_help(VALUE self, VALUE cmdname)
  *  
  */ 
 static VALUE
-fole_activex_initialize(VALUE self) 
+fole_activex_initialize(self)
+    VALUE self; 
 {
     struct oledata *pole;
     IPersistMemory *pPersistMemory;
-    void *p;
 
     HRESULT hr = S_OK;
 
     OLEData_Get_Struct(self, pole);
 
-    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory, &p);
-    pPersistMemory = p;
+    hr = pole->pDispatch->lpVtbl->QueryInterface(pole->pDispatch, &IID_IPersistMemory,
+                                                 (void **)&pPersistMemory);
     if (SUCCEEDED(hr)) {
         hr = pPersistMemory->lpVtbl->InitNew(pPersistMemory);
         OLE_RELEASE(pPersistMemory);
@@ -4674,7 +3422,7 @@ fole_activex_initialize(VALUE self)
     }
 
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "fail to initialize ActiveX control");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "fail to initialize ActiveX control");
     }
 
     return Qnil;
@@ -4685,20 +3433,35 @@ fole_activex_initialize(VALUE self)
  *      WIN32OLE_TYPE.ole_classes(typelib)
  * 
  *   Returns array of WIN32OLE_TYPE objects defined by the <i>typelib</i> type library.
- *   This method will be OBSOLETE. Use WIN32OLE_TYPELIB.new(typelib).ole_classes instead.
  */
 static VALUE
-foletype_s_ole_classes(VALUE self, VALUE typelib)
+foletype_s_ole_classes(self, typelib)
+    VALUE self;
+    VALUE typelib;
 {
-    VALUE obj;
+    VALUE file, classes;
+    OLECHAR * pbuf;
+    ITypeLib *pTypeLib;
+    HRESULT hr;
 
-    /*
-    rb_warn("%s is obsolete; use %s instead.",
-            "WIN32OLE_TYPE.ole_classes",
-            "WIN32OLE_TYPELIB.new(typelib).ole_types");
-    */
-    obj = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("new"), 1, typelib);
-    return rb_funcall(obj, rb_intern("ole_types"), 0);
+    rb_secure(4);
+    classes = rb_ary_new();
+    if(TYPE(typelib) == T_STRING) {
+        file = typelib_file(typelib);
+        if (file == Qnil) {
+            file = typelib;
+        }
+        pbuf = ole_mb2wc(StringValuePtr(file), -1);
+        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
+        if (FAILED(hr))
+          ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
+        SysFreeString(pbuf);
+        ole_classes_from_typelib(pTypeLib, classes);
+        OLE_RELEASE(pTypeLib);
+    } else {
+        rb_raise(rb_eTypeError, "1st argument should be TypeLib string");
+    }
+    return classes;
 }
 
 /*
@@ -4706,18 +3469,48 @@ foletype_s_ole_classes(VALUE self, VALUE typelib)
  *     WIN32OLE_TYPE.typelibs
  * 
  *  Returns array of type libraries.
- *  This method will be OBSOLETE. Use WIN32OLE_TYPELIB.typelibs.collect{|t| t.name} instead.
  *
  */
 static VALUE
-foletype_s_typelibs(VALUE self)
+foletype_s_typelibs(self)
+    VALUE self;
 {
-    /*
-    rb_warn("%s is obsolete. use %s instead.",
-            "WIN32OLE_TYPE.typelibs",
-            "WIN32OLE_TYPELIB.typelibs.collect{t|t.name}");
-    */
-    return rb_eval_string("WIN32OLE_TYPELIB.typelibs.collect{|t|t.name}");
+    HKEY htypelib, hclsid;
+    double fversion;
+    DWORD i, j;
+    LONG err;
+    VALUE clsid;
+    VALUE ver;
+    VALUE v = Qnil;
+    VALUE typelibs = rb_ary_new();
+
+    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
+    if(err != ERROR_SUCCESS) {
+        return typelibs;
+    }
+    for(i = 0; ; i++) {
+        clsid = reg_enum_key(htypelib, i);
+        if (clsid == Qnil)
+            break;
+        err = reg_open_vkey(htypelib, clsid, &hclsid);
+        if (err != ERROR_SUCCESS)
+            continue;
+        fversion = 0;
+        for(j = 0; ; j++) {
+            ver = reg_enum_key(hclsid, j);
+            if (ver == Qnil)
+                break;
+            if (fversion > atof(StringValuePtr(ver)))
+                continue;
+            fversion = atof(StringValuePtr(ver));
+            if ( (v = reg_get_val(hclsid, StringValuePtr(ver))) != Qnil ) {
+                rb_ary_push(typelibs, v);
+            }
+        }
+        RegCloseKey(hclsid);
+    }
+    RegCloseKey(htypelib);
+    return typelibs;
 }
 
 /*
@@ -4727,7 +3520,8 @@ foletype_s_typelibs(VALUE self)
  *  Returns array of ProgID.
  */
 static VALUE
-foletype_s_progids(VALUE self)
+foletype_s_progids(self)
+    VALUE self;
 {
     HKEY hclsids, hclsid;
     DWORD i;
@@ -4747,9 +3541,9 @@ foletype_s_progids(VALUE self)
         err = reg_open_vkey(hclsids, clsid, &hclsid);
         if (err != ERROR_SUCCESS)
             continue;
-        if ((v = reg_get_val2(hclsid, "ProgID")) != Qnil) 
+        if ((v = reg_get_val(hclsid, "ProgID")) != Qnil) 
             rb_ary_push(progids, v);
-        if ((v = reg_get_val2(hclsid, "VersionIndependentProgID")) != Qnil)
+        if ((v = reg_get_val(hclsid, "VersionIndependentProgID")) != Qnil)
             rb_ary_push(progids, v);
         RegCloseKey(hclsid);
     }
@@ -4758,7 +3552,8 @@ foletype_s_progids(VALUE self)
 }
 
 static VALUE
-foletype_s_allocate(VALUE klass)
+foletype_s_allocate(klass)
+    VALUE klass;
 {
     struct oletypedata *poletype;
     VALUE obj;
@@ -4769,7 +3564,10 @@ foletype_s_allocate(VALUE klass)
 }
 
 static VALUE
-oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
+oletype_set_member(self, pTypeInfo, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    VALUE name;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -4780,7 +3578,10 @@ oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name)
 }
 
 static VALUE
-oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
+oleclass_from_typelib(self, pTypeLib, oleclass)
+    VALUE self;
+    ITypeLib *pTypeLib;
+    VALUE oleclass;
 {
     
     long count;
@@ -4812,528 +3613,6 @@ oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass)
 }
 
 /*
- * Document-class: WIN32OLE_TYPELIB
- *
- *   <code>WIN32OLE_TYPELIB</code> objects represent OLE tyblib information.
- */
-
-
-static VALUE
-oletypelib_set_member(VALUE self, VALUE typelib, VALUE guid, VALUE version)
-{
-    rb_ivar_set(self, rb_intern("name"), typelib);
-    rb_ivar_set(self, rb_intern("guid"), guid);
-    rb_ivar_set(self, rb_intern("version"), version);
-    return self;
-}
-
-/*
- *  call-seq:
- *
- *     WIN32OLE_TYPELIB.typelibs
- *
- *  Returns the array of WIN32OLE_TYPELIB object.
- *
- *     tlibs = WIN32OLE_TYPELIB.typelibs
- *
- */
-static VALUE
-foletypelib_s_typelibs(VALUE self)
-{
-    HKEY htypelib, hguid;
-    DWORD i, j;
-    LONG err;
-    VALUE guid;
-    VALUE version;
-    VALUE name = Qnil;
-    VALUE typelibs = rb_ary_new();
-    VALUE typelib = Qnil;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return typelibs;
-    }
-    for(i = 0; ; i++) {
-        guid = reg_enum_key(htypelib, i);
-        if (guid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, guid, &hguid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        for(j = 0; ; j++) {
-            version = reg_enum_key(hguid, j);
-            if (version == Qnil)
-                break;
-            if ( (name = reg_get_val2(hguid, StringValuePtr(version))) != Qnil ) {
-                typelib = rb_funcall(cWIN32OLE_TYPELIB, rb_intern("allocate"), 0);
-                oletypelib_set_member(typelib, name, guid, version);
-                rb_ary_push(typelibs, typelib);
-            }
-        }
-        RegCloseKey(hguid);
-    }
-    RegCloseKey(htypelib);
-    return typelibs;
-}
-
-static VALUE
-make_version_str(VALUE major, VALUE minor)
-{
-    VALUE version_str = Qnil;
-    VALUE minor_str = Qnil;
-    if (major == Qnil) {
-        return Qnil;
-    }
-    version_str = rb_String(major);
-    if (minor != Qnil) {
-        minor_str = rb_String(minor);
-        rb_str_cat2(version_str, ".");
-        rb_str_append(version_str, minor_str);
-    }
-    return version_str;
-}
-
-static VALUE
-oletypelib_search_registry2(VALUE self, VALUE args)
-{
-    HKEY htypelib, hguid, hversion;
-    double fver;
-    DWORD j;
-    LONG err;
-    VALUE found = Qfalse;
-    VALUE tlib;
-    VALUE ver;
-    VALUE version_str;
-    VALUE version = Qnil;
-    VALUE typelib = Qnil;
-
-    VALUE guid = rb_ary_entry(args, 0);
-    version_str = make_version_str(rb_ary_entry(args, 1), rb_ary_entry(args, 2));
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qfalse;
-    }
-    err = reg_open_vkey(htypelib, guid, &hguid);
-    if (err != ERROR_SUCCESS) {
-        RegCloseKey(htypelib);
-        return Qfalse;
-    }
-    if (version_str != Qnil) {
-        err = reg_open_vkey(hguid, version_str, &hversion);
-        if (err == ERROR_SUCCESS) {
-            tlib = reg_get_val(hversion, NULL);
-            if (tlib != Qnil) {
-                typelib = tlib;
-                version = version_str;
-            }
-        }
-        RegCloseKey(hversion);
-    } else {
-        fver = 0.0;
-	    for(j = 0; ;j++) {
-	        ver = reg_enum_key(hguid, j);
-	        if (ver == Qnil)
-	            break;
-	        err = reg_open_vkey(hguid, ver, &hversion);
-	        if (err != ERROR_SUCCESS) 
-	            continue;
-	        tlib = reg_get_val(hversion, NULL);
-	        if (tlib == Qnil) {
-	             RegCloseKey(hversion);
-	             continue;
-	        }
-	        if (fver < atof(StringValuePtr(ver))) {
-	            fver = atof(StringValuePtr(ver));
-	            version = ver;
-	            typelib = tlib;
-	        }
-	        RegCloseKey(hversion);
-	    }
-    }
-    RegCloseKey(hguid);
-    RegCloseKey(htypelib);
-    if (typelib != Qnil) {
-        found = Qtrue;
-        oletypelib_set_member(self, typelib, guid, version);
-    }
-    return found;
-}
-
-static VALUE
-oletypelib_search_registry(VALUE self, VALUE typelib)
-{
-    HKEY htypelib, hguid, hversion;
-    DWORD i, j;
-    LONG err;
-    VALUE found = Qfalse;
-    VALUE tlib;
-    VALUE guid;
-    VALUE ver;
-
-    err = reg_open_key(HKEY_CLASSES_ROOT, "TypeLib", &htypelib);
-    if(err != ERROR_SUCCESS) {
-        return Qfalse;
-    }
-    for(i = 0; !found; i++) {
-        guid = reg_enum_key(htypelib, i);
-        if (guid == Qnil)
-            break;
-        err = reg_open_vkey(htypelib, guid, &hguid);
-        if (err != ERROR_SUCCESS)
-            continue;
-        for(j = 0; found == Qfalse; j++) {
-            ver = reg_enum_key(hguid, j);
-            if (ver == Qnil)
-                break;
-            err = reg_open_vkey(hguid, ver, &hversion);
-            if (err != ERROR_SUCCESS) 
-                continue;
-            tlib = reg_get_val(hversion, NULL);
-            if (tlib == Qnil) {
-                RegCloseKey(hversion);
-                continue;
-            }
-            if (rb_str_cmp(typelib, tlib) == 0) {
-                oletypelib_set_member(self, typelib, guid, ver);
-                found = Qtrue;
-            }
-            RegCloseKey(hversion);
-        }
-        RegCloseKey(hguid);
-    }
-    RegCloseKey(htypelib);
-    return  found;
-}
-
-/*
- * call-seq:
- *    WIN32OLE_TYPELIB.new(typelib [, version1, version2]) -> WIN32OLE_TYPELIB object
- *
- * Returns a new WIN32OLE_TYPELIB object.
- *
- * The first argument <i>typelib</i>  specifies OLE type library name or GUID or 
- * OLE library file.
- * The second argument is major version or version of the type library.
- * The third argument is minor version.
- * The second argument and third argument are optional.
- * If the first argument is type library name, then the second and third argument
- * are ignored.
- *
- *     tlib1 = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library') 
- *     tlib2 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}')
- *     tlib3 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1.3)
- *     tlib4 = WIN32OLE_TYPELIB.new('{00020813-0000-0000-C000-000000000046}', 1, 3)
- *     tlib5 = WIN32OLE_TYPELIB.new("C:\\WINNT\\SYSTEM32\\SHELL32.DLL")
- *     puts tlib1.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib2.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib3.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib4.name  # -> 'Microsoft Excel 9.0 Object Library'
- *     puts tlib5.name  # -> 'Microsoft Shell Controls And Automation'
- *
- */
-static VALUE
-foletypelib_initialize(VALUE self, VALUE args)
-{
-    VALUE found = Qfalse;
-    VALUE typelib = Qnil;
-    int len = 0;
-    OLECHAR * pbuf;
-    ITypeLib *pTypeLib;
-    VALUE retval;
-    HRESULT hr = S_OK;
-
-    len = RARRAY_LEN(args);
-    if (len < 1 || len > 3) {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
-    }
-
-    typelib = rb_ary_entry(args, 0);
-
-    Check_SafeStr(typelib);
-
-    found = oletypelib_search_registry(self, typelib);
-    if (found == Qfalse) {
-        found = oletypelib_search_registry2(self, args);
-    }
-    if (found == Qfalse) {
-        pbuf = ole_vstr2wc(typelib);
-        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
-        SysFreeString(pbuf);
-        if (SUCCEEDED(hr)) {
-            retval = ole_typelib_from_itypelib(pTypeLib);
-            OLE_RELEASE(pTypeLib);
-            if (retval != Qnil) {
-                found = Qtrue;
-                oletypelib_set_member(self, 
-                        rb_ivar_get(retval, rb_intern("name")),
-                        rb_ivar_get(retval, rb_intern("guid")),
-                        rb_ivar_get(retval, rb_intern("version")));
-            }
-        }
-    }
-
-    if (found == Qfalse) {
-        rb_raise(eWIN32OLERuntimeError, "not found type library `%s`",
-                 StringValuePtr(typelib));
-    }
-    return self;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#guid -> The guid string.
- *
- *  Returns guid string which specifies type library.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     guid = tlib.guid # -> '{00020813-0000-0000-C000-000000000046}'
- */
-static VALUE
-foletypelib_guid(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("guid"));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#name -> The type library name
- *
- *  Returns the type library name.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     name = tlib.name # -> 'Microsoft Excel 9.0 Object Library'
- */
-static VALUE
-foletypelib_name(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("name"));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#version -> The type library version. 
- *
- *  Returns the type library version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.version #-> 1.3
- */
-static VALUE
-foletypelib_version(VALUE self)
-{
-    VALUE ver = rb_ivar_get(self, rb_intern("version"));
-    return rb_Float(ver);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#major_version -> The type library major version. 
- *
- *  Returns the type library major version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.major_version # -> 1
- */
-static VALUE
-foletypelib_major_version(VALUE self)
-{
-    VALUE ver = rb_ivar_get(self, rb_intern("version"));
-    VALUE ary = rb_str_split(ver, ".");
-    return rb_Integer(rb_ary_entry(ary, 0));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#minor_version -> The type library minor version. 
- *
- *  Returns the type library minor version.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.minor_version # -> 3
- */
-static VALUE
-foletypelib_minor_version(VALUE self)
-{
-    VALUE ver = rb_ivar_get(self, rb_intern("version"));
-    VALUE ary = rb_str_split(ver, ".");
-    return rb_Integer(rb_ary_entry(ary, 1));
-}
-
-static VALUE
-oletypelib_path(VALUE guid, VALUE version)
-{
-    int k;
-    LONG err;
-    HKEY hkey;
-    HKEY hlang;
-    VALUE lang;
-    VALUE path = Qnil;
-
-    VALUE key = rb_str_new2("TypeLib\\");
-    rb_str_concat(key, guid);
-    rb_str_cat2(key, "\\");
-    rb_str_concat(key, version);
-
-    err = reg_open_vkey(HKEY_CLASSES_ROOT, key, &hkey);
-    if (err != ERROR_SUCCESS) {
-        return Qnil;
-    }
-    for(k = 0; path == Qnil; k++) {
-        lang = reg_enum_key(hkey, k);
-        if (lang == Qnil)
-            break;
-        err = reg_open_vkey(hkey, lang, &hlang);
-        if (err == ERROR_SUCCESS) {
-            path = reg_get_typelib_file_path(hlang);
-            RegCloseKey(hlang);
-        }
-    }
-    RegCloseKey(hkey);
-    return path;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#path -> The type library file path. 
- *
- *  Returns the type library file path.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     puts tlib.path #-> 'C:\...\EXCEL9.OLB'
- */
-static VALUE
-foletypelib_path(VALUE self)
-{
-    VALUE guid = rb_ivar_get(self, rb_intern("guid"));
-    VALUE version = rb_ivar_get(self, rb_intern("version"));
-    return oletypelib_path(guid, version);
-}
-
-static void
-oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib)
-{
-    VALUE path = Qnil;
-    OLECHAR *pbuf;
-    HRESULT hr = S_OK;
-    path = rb_funcall(self, rb_intern("path"), 0);
-    if (path != Qnil) {
-        pbuf = ole_vstr2wc(path);
-        hr = LoadTypeLibEx(pbuf, REGKIND_NONE, ppTypeLib);
-        SysFreeString(pbuf);
-        if (FAILED(hr))
-            ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx from `%s'",
-                      StringValuePtr(path));
-    } else {
-        rb_raise(eWIN32OLERuntimeError, "failed to get type library path");
-    }
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#visible? 
- *
- *  Returns true if the type library information is not hidden.
- *  If wLibFlags of TLIBATTR is 0 or LIBFLAG_FRESTRICTED or LIBFLAG_FHIDDEN,
- *  the method returns false, otherwise, returns true.
- *  If the method fails to access the TLIBATTR information, then
- *  WIN32OLERuntimeError is raised.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.visible? # => true
- */
-static VALUE
-foletypelib_visible(VALUE self)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib = NULL;
-    VALUE visible = Qtrue;
-    TLIBATTR *pTLibAttr;
-
-    oletypelib2itypelib(self, &pTypeLib);
-
-    hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeLib);
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get TLIBATTR information");
-    }
-    if ((pTLibAttr->wLibFlags == 0) ||
-        (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
-        (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {
-        visible = Qfalse;
-    }
-    pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
-    OLE_RELEASE(pTypeLib);
-    return visible;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#library_name 
- *
- *  Returns library name.
- *  If the method fails to access library name, WIN32OLERuntimeError is raised.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.library_name # => Excel
- */
-static VALUE
-foletypelib_library_name(VALUE self)
-{
-    HRESULT hr;
-    ITypeLib *pTypeLib = NULL;
-    VALUE libname = Qnil;
-    BSTR bstr;
-
-    oletypelib2itypelib(self, &pTypeLib);
-    hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
-                                            &bstr, NULL, NULL, NULL);
-    if (FAILED(hr)) {
-        OLE_RELEASE(pTypeLib);
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to get library name");
-    }
-    OLE_RELEASE(pTypeLib);
-    libname = WC2VSTR(bstr);
-    return libname;
-}
-
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#ole_types -> The array of WIN32OLE_TYPE object included the type library.
- *
- *  Returns the type library file path.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     classes = tlib.ole_types.collect{|k| k.name} # -> ['AddIn', 'AddIns' ...] 
- */
-static VALUE
-foletypelib_ole_types(VALUE self)
-{
-    ITypeLib *pTypeLib = NULL;
-    VALUE classes = rb_ary_new();
-    oletypelib2itypelib(self, &pTypeLib);
-    ole_types_from_typelib(pTypeLib, classes);
-    OLE_RELEASE(pTypeLib);
-    return classes;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPELIB#inspect -> String
- *
- *  Returns the type library name with class name.
- *
- *     tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
- *     tlib.inspect # => "<#WIN32OLE_TYPELIB:Microsoft Excel 9.0 Object Library>"
- */
-static VALUE
-foletypelib_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_TYPELIB");
-}
-
-/*
  * Document-class: WIN32OLE_TYPE
  *
  *   <code>WIN32OLE_TYPE</code> objects represent OLE type libarary information.
@@ -5351,7 +3630,10 @@ foletypelib_inspect(VALUE self)
  *          # => WIN32OLE_TYPE object of Application class of Excel. 
  */
 static VALUE
-foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
+foletype_initialize(self, typelib, oleclass)
+    VALUE self;
+    VALUE typelib;
+    VALUE oleclass;
 {
     VALUE file;
     OLECHAR * pbuf;
@@ -5364,14 +3646,14 @@ foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
     if (file == Qnil) {
         file = typelib;
     }
-    pbuf = ole_vstr2wc(file);
+    pbuf = ole_mb2wc(StringValuePtr(file), -1);
     hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
     SysFreeString(pbuf);
     if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
         OLE_RELEASE(pTypeLib);
-        rb_raise(eWIN32OLERuntimeError, "not found `%s` in `%s`",
+        rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
                  StringValuePtr(oleclass), StringValuePtr(typelib));
     }
     OLE_RELEASE(pTypeLib);
@@ -5387,13 +3669,15 @@ foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass)
  *    puts tobj.name  # => Application
  */
 static VALUE
-foletype_name(VALUE self)
+foletype_name(self)
+    VALUE self;
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_ole_type(ITypeInfo *pTypeInfo)
+ole_ole_type(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5447,7 +3731,8 @@ ole_ole_type(ITypeInfo *pTypeInfo)
  *    puts tobj.ole_type  # => Class
  */
 static VALUE
-foletype_ole_type(VALUE self)
+foletype_ole_type(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5455,7 +3740,8 @@ foletype_ole_type(VALUE self)
 }
 
 static VALUE
-ole_type_guid(ITypeInfo *pTypeInfo)
+ole_type_guid(pTypeInfo) 
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5482,7 +3768,8 @@ ole_type_guid(ITypeInfo *pTypeInfo)
  *    puts tobj.guid  # => {00024500-0000-0000-C000-000000000046}
  */
 static VALUE
-foletype_guid(VALUE self)
+foletype_guid(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5490,7 +3777,8 @@ foletype_guid(VALUE self)
 }
 
 static VALUE
-ole_type_progid(ITypeInfo *pTypeInfo)
+ole_type_progid(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5500,7 +3788,7 @@ ole_type_progid(ITypeInfo *pTypeInfo)
     if (FAILED(hr)) 
         return progid;
     hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
-    if (SUCCEEDED(hr)) {
+    if (SUCCEEDED(hr)) { 
         progid = ole_wc2vstr(pbuf, FALSE);
         CoTaskMemFree(pbuf);
     }
@@ -5517,7 +3805,8 @@ ole_type_progid(ITypeInfo *pTypeInfo)
  *    puts tobj.progid  # =>   Excel.Application.9
  */
 static VALUE
-foletype_progid(VALUE self)
+foletype_progid(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5526,7 +3815,8 @@ foletype_progid(VALUE self)
 
 
 static VALUE
-ole_type_visible(ITypeInfo *pTypeInfo)
+ole_type_visible(pTypeInfo) 
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5552,7 +3842,8 @@ ole_type_visible(ITypeInfo *pTypeInfo)
  *    puts tobj.visible  # => true
  */
 static VALUE
-foletype_visible(VALUE self)
+foletype_visible(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5560,14 +3851,15 @@ foletype_visible(VALUE self)
 }
 
 static VALUE
-ole_type_major_version(ITypeInfo *pTypeInfo)
+ole_type_major_version(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     VALUE ver;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMajorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -5582,7 +3874,8 @@ ole_type_major_version(ITypeInfo *pTypeInfo)
  *     puts tobj.major_version # => 8
  */
 static VALUE
-foletype_major_version(VALUE self)
+foletype_major_version(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5590,14 +3883,15 @@ foletype_major_version(VALUE self)
 }
 
 static VALUE
-ole_type_minor_version(ITypeInfo *pTypeInfo)
+ole_type_minor_version(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     VALUE ver;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     ver = INT2FIX(pTypeAttr->wMinorVerNum);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return ver;
@@ -5612,7 +3906,8 @@ ole_type_minor_version(ITypeInfo *pTypeInfo)
  *     puts tobj.minor_version # => 2
  */
 static VALUE
-foletype_minor_version(VALUE self)
+foletype_minor_version(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5620,14 +3915,15 @@ foletype_minor_version(VALUE self)
 }
 
 static VALUE
-ole_type_typekind(ITypeInfo *pTypeInfo)
+ole_type_typekind(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     VALUE typekind;
     TYPEATTR *pTypeAttr;
     HRESULT hr;
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     typekind = INT2FIX(pTypeAttr->typekind);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return typekind;
@@ -5643,7 +3939,8 @@ ole_type_typekind(ITypeInfo *pTypeInfo)
  *
  */
 static VALUE 
-foletype_typekind(VALUE self)
+foletype_typekind(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5651,7 +3948,8 @@ foletype_typekind(VALUE self)
 }
 
 static VALUE
-ole_type_helpstring(ITypeInfo *pTypeInfo)
+ole_type_helpstring(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     BSTR bhelpstr;
@@ -5671,7 +3969,8 @@ ole_type_helpstring(ITypeInfo *pTypeInfo)
  *    puts tobj.helpstring # => Web Browser interface
  */
 static VALUE 
-foletype_helpstring(VALUE self)
+foletype_helpstring(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5679,7 +3978,8 @@ foletype_helpstring(VALUE self)
 }
 
 static VALUE
-ole_type_src_type(ITypeInfo *pTypeInfo)
+ole_type_src_type(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5706,7 +4006,8 @@ ole_type_src_type(ITypeInfo *pTypeInfo)
  *
  */
 static VALUE
-foletype_src_type(VALUE self)
+foletype_src_type(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5714,7 +4015,8 @@ foletype_src_type(VALUE self)
 }
 
 static VALUE
-ole_type_helpfile(ITypeInfo *pTypeInfo)
+ole_type_helpfile(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     BSTR bhelpfile;
@@ -5735,7 +4037,8 @@ ole_type_helpfile(ITypeInfo *pTypeInfo)
  *
  */
 static VALUE
-foletype_helpfile(VALUE self)
+foletype_helpfile(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5743,7 +4046,8 @@ foletype_helpfile(VALUE self)
 }
 
 static VALUE
-ole_type_helpcontext(ITypeInfo *pTypeInfo)
+ole_type_helpcontext(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     DWORD helpcontext;
@@ -5763,158 +4067,17 @@ ole_type_helpcontext(ITypeInfo *pTypeInfo)
  *     puts tobj.helpfile # => 131185
  */
 static VALUE
-foletype_helpcontext(VALUE self)
+foletype_helpcontext(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
     return ole_type_helpcontext(ptype->pTypeInfo);
 }
 
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#ole_typelib
- * 
- *  Returns the WIN32OLE_TYPELIB object which is including the WIN32OLE_TYPE 
- *  object. If it is not found, then returns nil.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     puts tobj.ole_typelib # => 'Microsoft Excel 9.0 Object Library'
- */
 static VALUE
-foletype_ole_typelib(VALUE self)
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_typelib_from_itypeinfo(ptype->pTypeInfo);
-}
-
-static VALUE
-ole_type_impl_ole_types(ITypeInfo *pTypeInfo, int implflags)
-{
-    HRESULT hr;
-    ITypeInfo *pRefTypeInfo;
-    HREFTYPE href;
-    WORD i;
-    VALUE type;
-    TYPEATTR *pTypeAttr;
-    int flags;
-
-    VALUE types = rb_ary_new();
-    hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
-    if (FAILED(hr)) {
-        return types;
-    }
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo, i, &href);
-        if (FAILED(hr))
-            continue;
-        hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo, href, &pRefTypeInfo);
-        if (FAILED(hr)) 
-            continue;
-
-        if ((flags & implflags) == implflags) {
-            type = ole_type_from_itypeinfo(pRefTypeInfo);
-            if (type != Qnil) {
-                rb_ary_push(types, type);
-            }
-        }
-
-        OLE_RELEASE(pRefTypeInfo);
-    }
-    OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
-    return types;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#implemented_ole_types
- * 
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE 
- *  object. 
- *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'Worksheet')
- *     p tobj.implemented_ole_types # => [_Worksheet, DocEvents]
- */
-static VALUE
-foletype_impl_ole_types(VALUE self)
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_impl_ole_types(ptype->pTypeInfo, 0);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#source_ole_types
- * 
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE 
- *  object and having IMPLTYPEFLAG_FSOURCE. 
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer") 
- *     p tobj.source_ole_types
- *     # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>, #<WIN32OLE_TYPE:DWebBrowserEvents>]
- */
-static VALUE
-foletype_source_ole_types(VALUE self)
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#default_event_sources
- * 
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE 
- *  object and having IMPLTYPEFLAG_FSOURCE and IMPLTYPEFLAG_FDEFAULT. 
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer") 
- *     p tobj.default_event_sources  # => [#<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_event_sources(VALUE self)
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FSOURCE|IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#default_ole_types
- * 
- *  Returns the array of WIN32OLE_TYPE object which is implemented by the WIN32OLE_TYPE 
- *  object and having IMPLTYPEFLAG_FDEFAULT.
- *     tobj = WIN32OLE_TYPE.new('Microsoft Internet Controls', "InternetExplorer") 
- *     p tobj.default_ole_types
- *     # => [#<WIN32OLE_TYPE:IWebBrowser2>, #<WIN32OLE_TYPE:DWebBrowserEvents2>]
- */
-static VALUE
-foletype_default_ole_types(VALUE self)
-{
-    struct oletypedata *ptype;
-    Data_Get_Struct(self, struct oletypedata, ptype);
-    return ole_type_impl_ole_types(ptype->pTypeInfo, IMPLTYPEFLAG_FDEFAULT);
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_TYPE#inspect -> String
- *
- *  Returns the type name with class name.
- *
- *     ie = WIN32OLE.new('InternetExplorer.Application')
- *     ie.ole_type.inspect => #<WIN32OLE_TYPE:IWebBrowser2>
- */
-static VALUE
-foletype_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_TYPE");
-}
-
-static VALUE
-ole_variables(ITypeInfo *pTypeInfo)
+ole_variables(pTypeInfo)
+    ITypeInfo *pTypeInfo;
 {
     HRESULT hr;
     TYPEATTR *pTypeAttr;
@@ -5928,7 +4091,7 @@ ole_variables(ITypeInfo *pTypeInfo)
     VALUE variables = rb_ary_new();
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetTypeAttr");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
     }
     
     for(i = 0; i < pTypeAttr->cVars; i++) {
@@ -5978,7 +4141,8 @@ ole_variables(ITypeInfo *pTypeInfo)
  *
  */
 static VALUE
-foletype_variables(VALUE self)
+foletype_variables(self)
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -5998,7 +4162,10 @@ foletype_variables(VALUE self)
  *    # => ['Activate', 'Copy', 'Delete',....]
  */
 static VALUE
-foletype_methods(VALUE self)
+foletype_methods(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     struct oletypedata *ptype;
     Data_Get_Struct(self, struct oletypedata, ptype);
@@ -6032,20 +4199,23 @@ foletype_methods(VALUE self)
  *
  */
 static VALUE
-folevariable_name(VALUE self)
+folevariable_name(self)
+    VALUE self;
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_ole_type(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
     VALUE type;
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
     type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -6072,7 +4242,8 @@ ole_variable_ole_type(ITypeInfo *pTypeInfo, UINT var_index)
  *
  */
 static VALUE
-folevariable_ole_type(VALUE self)
+folevariable_ole_type(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6080,14 +4251,16 @@ folevariable_ole_type(VALUE self)
 }
 
 static VALUE
-ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_ole_type_detail(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
     VALUE type = rb_ary_new();
     hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
     if (FAILED(hr))
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetVarDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
     ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
     pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
     return type;
@@ -6106,7 +4279,8 @@ ole_variable_ole_type_detail(ITypeInfo *pTypeInfo, UINT var_index)
  *
  */
 static VALUE
-folevariable_ole_type_detail(VALUE self)
+folevariable_ole_type_detail(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6114,7 +4288,9 @@ folevariable_ole_type_detail(VALUE self)
 }
 
 static VALUE
-ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_value(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -6138,7 +4314,7 @@ ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
  *     tobj = WIN32OLE_TYPE.new('Microsoft Excel 9.0 Object Library', 'XlSheetType')
  *     variables = tobj.variables
  *     variables.each do |variable|
- *       puts "#{variable.name} #{variable.value}"
+ *       puts "#{variable.name} = #{variable.value}"
  *     end
  *
  *     The result of above script is following:
@@ -6150,7 +4326,8 @@ ole_variable_value(ITypeInfo *pTypeInfo, UINT var_index)
  *
  */    
 static VALUE
-folevariable_value(VALUE self)
+folevariable_value(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6158,7 +4335,9 @@ folevariable_value(VALUE self)
 }
 
 static VALUE
-ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_visible(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -6196,7 +4375,8 @@ ole_variable_visible(ITypeInfo *pTypeInfo, UINT var_index)
  *       
  */
 static VALUE
-folevariable_visible(VALUE self)
+folevariable_visible(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6204,7 +4384,9 @@ folevariable_visible(VALUE self)
 }
 
 static VALUE
-ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_kind(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -6252,7 +4434,8 @@ ole_variable_kind(ITypeInfo *pTypeInfo, UINT var_index)
  *      xlWorksheet CONSTANT
  */
 static VALUE
-folevariable_variable_kind(VALUE self)
+folevariable_variable_kind(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6260,7 +4443,9 @@ folevariable_variable_kind(VALUE self)
 }
 
 static VALUE
-ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
+ole_variable_varkind(pTypeInfo, var_index)
+    ITypeInfo *pTypeInfo;
+    UINT var_index;
 {
     VARDESC *pVarDesc;
     HRESULT hr;
@@ -6292,7 +4477,8 @@ ole_variable_varkind(ITypeInfo *pTypeInfo, UINT var_index)
  *       xlWorksheet 2
  */
 static VALUE
-folevariable_varkind(VALUE self)
+folevariable_varkind(self)
+    VALUE self;
 {
     struct olevariabledata *pvar;
     Data_Get_Struct(self, struct olevariabledata, pvar);
@@ -6300,29 +4486,18 @@ folevariable_varkind(VALUE self)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE_VARIABLE#inspect -> String
- *
- *  Returns the OLE variable name and the value with class name. 
- *
- */
-static VALUE
-folevariable_inspect(VALUE self)
-{
-    VALUE detail = rb_funcall(self, rb_intern("to_s"), 0);
-    rb_str_cat2(detail, "=");
-    rb_str_concat(detail, rb_funcall(rb_funcall(self, rb_intern("value"), 0), rb_intern("inspect"), 0));
-    return make_inspect("WIN32OLE_VARIABLE", detail);
-}
-
-/*
  * Document-class: WIN32OLE_METHOD
  *
  *   <code>WIN32OLE_METHOD</code> objects represent OLE method information.
  */
 
 static VALUE
-olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo, int index, VALUE name)
+olemethod_set_member(self, pTypeInfo, pOwnerTypeInfo, index, name)
+    VALUE self;
+    ITypeInfo *pTypeInfo;
+    ITypeInfo *pOwnerTypeInfo;
+    int index;
+    VALUE name;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6336,7 +4511,8 @@ olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo
 }
 
 static VALUE
-folemethod_s_allocate(VALUE klass)
+folemethod_s_allocate(klass)
+    VALUE klass;
 {
     struct olemethoddata *pmethod;
     VALUE obj;
@@ -6363,7 +4539,10 @@ folemethod_s_allocate(VALUE klass)
  *     method = WIN32OLE_METHOD.new(tobj, 'SaveAs')
  */
 static VALUE
-folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
+folemethod_initialize(self, oletype, method)
+    VALUE self;
+    VALUE oletype;
+    VALUE method;
 {
     struct oletypedata *ptype;
     VALUE obj = Qnil;
@@ -6372,7 +4551,7 @@ folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
         Data_Get_Struct(oletype, struct oletypedata, ptype);
         obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
         if (obj == Qnil) {
-            rb_raise(eWIN32OLERuntimeError, "not found %s",
+            rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
                      StringValuePtr(method));
         }
     }
@@ -6394,13 +4573,16 @@ folemethod_initialize(VALUE self, VALUE oletype, VALUE method)
  *     
  */
 static VALUE
-folemethod_name(VALUE self)
+folemethod_name(self)
+    VALUE self;
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_type(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6408,7 +4590,7 @@ ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     
     type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
@@ -6426,7 +4608,8 @@ ole_method_return_type(ITypeInfo *pTypeInfo, UINT method_index)
  *
  */
 static VALUE
-folemethod_return_type(VALUE self)
+folemethod_return_type(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6434,19 +4617,21 @@ folemethod_return_type(VALUE self)
 }
 
 static VALUE
-ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_vtype(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
-    VALUE vvt;
+    VALUE vt;
 
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr)) 
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     
-    vvt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
+    vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-    return vvt;
+    return vt;
 }
 
 /*
@@ -6460,7 +4645,8 @@ ole_method_return_vtype(ITypeInfo *pTypeInfo, UINT method_index)
  *
  */
 static VALUE
-folemethod_return_vtype(VALUE self)
+folemethod_return_vtype(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6468,7 +4654,9 @@ folemethod_return_vtype(VALUE self)
 }
 
 static VALUE
-ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_return_type_detail(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6494,7 +4682,8 @@ ole_method_return_type_detail(ITypeInfo *pTypeInfo, UINT method_index)
  *     p method.return_type_detail # => ["PTR", "USERDEFINED", "Workbook"]
  */
 static VALUE
-folemethod_return_type_detail(VALUE self)
+folemethod_return_type_detail(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6502,21 +4691,25 @@ folemethod_return_type_detail(VALUE self)
 }
 
 static VALUE
-ole_method_invkind(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_invkind(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
     VALUE invkind;
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if(FAILED(hr)) 
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to GetFuncDesc");
+        ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
     invkind = INT2FIX(pFuncDesc->invkind);
     pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
     return invkind;
 }
 
 static VALUE
-ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_invoke_kind(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    WORD method_index;
 {
     VALUE type = rb_str_new2("UNKNOWN");
     VALUE invkind = ole_method_invkind(pTypeInfo, method_index);
@@ -6546,7 +4739,8 @@ ole_method_invoke_kind(ITypeInfo *pTypeInfo, UINT method_index)
  *
  */
 static VALUE
-folemethod_invkind(VALUE self)
+folemethod_invkind(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6565,7 +4759,8 @@ folemethod_invkind(VALUE self)
  *     puts method.invoke_kind # => "FUNC"
  */
 static VALUE
-folemethod_invoke_kind(VALUE self)
+folemethod_invoke_kind(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6573,7 +4768,9 @@ folemethod_invoke_kind(VALUE self)
 }
 
 static VALUE
-ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_visible(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6602,7 +4799,8 @@ ole_method_visible(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.visible? # => true
  */
 static VALUE
-folemethod_visible(VALUE self)
+folemethod_visible(self) 
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6610,7 +4808,10 @@ folemethod_visible(VALUE self)
 }
 
 static VALUE
-ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
+ole_method_event(pTypeInfo, method_index, method_name)
+    ITypeInfo *pTypeInfo;
+    WORD method_index;
+    VALUE method_name;
 {
     TYPEATTR *pTypeAttr;
     HRESULT hr;
@@ -6684,7 +4885,8 @@ ole_method_event(ITypeInfo *pTypeInfo, UINT method_index, VALUE method_name)
  *
  */
 static VALUE
-folemethod_event(VALUE self)
+folemethod_event(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6705,7 +4907,8 @@ folemethod_event(VALUE self)
  *    puts method.event_interface # =>  WorkbookEvents
  */
 static VALUE
-folemethod_event_interface(VALUE self)
+folemethod_event_interface(self)
+    VALUE self;
 {
     BSTR name;
     struct olemethoddata *pmethod;
@@ -6720,14 +4923,14 @@ folemethod_event_interface(VALUE self)
 }
 
 static VALUE
-ole_method_docinfo_from_type(
-    ITypeInfo *pTypeInfo,
-    UINT method_index,
-    BSTR *name,
-    BSTR *helpstr,
-    DWORD *helpcontext,
-    BSTR *helpfile
-    )
+ole_method_docinfo_from_type(pTypeInfo, method_index, name, helpstr,
+                             helpcontext, helpfile)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    BSTR *name;
+    BSTR *helpstr;
+    DWORD *helpcontext;
+    BSTR *helpfile;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6742,7 +4945,9 @@ ole_method_docinfo_from_type(
 }
 
 static VALUE
-ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpstring(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     HRESULT hr;
     BSTR bhelpstring;
@@ -6765,7 +4970,8 @@ ole_method_helpstring(ITypeInfo *pTypeInfo, UINT method_index)
  *
  */
 static VALUE
-folemethod_helpstring(VALUE self)
+folemethod_helpstring(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6773,7 +4979,9 @@ folemethod_helpstring(VALUE self)
 }
 
 static VALUE
-ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpfile(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     HRESULT hr;
     BSTR bhelpfile;
@@ -6795,7 +5003,8 @@ ole_method_helpfile(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.helpfile # => C:\...\VBAXL9.CHM
  */
 static VALUE
-folemethod_helpfile(VALUE self)
+folemethod_helpfile(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6804,7 +5013,9 @@ folemethod_helpfile(VALUE self)
 }
 
 static VALUE
-ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_helpcontext(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     HRESULT hr;
     DWORD helpcontext = 0;
@@ -6825,7 +5036,8 @@ ole_method_helpcontext(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.helpcontext # => 65717
  */
 static VALUE
-folemethod_helpcontext(VALUE self)
+folemethod_helpcontext(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6833,7 +5045,9 @@ folemethod_helpcontext(VALUE self)
 }
 
 static VALUE
-ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_dispid(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6856,7 +5070,8 @@ ole_method_dispid(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.dispid # => 181
  */
 static VALUE
-folemethod_dispid(VALUE self)
+folemethod_dispid(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6864,7 +5079,9 @@ folemethod_dispid(VALUE self)
 }
 
 static VALUE
-ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_offset_vtbl(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6887,7 +5104,8 @@ ole_method_offset_vtbl(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.offset_vtbl # => 40
  */
 static VALUE
-folemethod_offset_vtbl(VALUE self)
+folemethod_offset_vtbl(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6895,7 +5113,9 @@ folemethod_offset_vtbl(VALUE self)
 }
 
 static VALUE
-ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_size_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6919,7 +5139,8 @@ ole_method_size_params(ITypeInfo *pTypeInfo, UINT method_index)
  *  
  */
 static VALUE
-folemethod_size_params(VALUE self)
+folemethod_size_params(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6927,7 +5148,9 @@ folemethod_size_params(VALUE self)
 }
 
 static VALUE
-ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_size_opt_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6950,7 +5173,8 @@ ole_method_size_opt_params(ITypeInfo *pTypeInfo, UINT method_index)
  *     puts method.size_opt_params # => 4
  */
 static VALUE
-folemethod_size_opt_params(VALUE self)
+folemethod_size_opt_params(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -6958,7 +5182,9 @@ folemethod_size_opt_params(VALUE self)
 }
 
 static VALUE
-ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
+ole_method_params(pTypeInfo, method_index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -6997,7 +5223,6 @@ ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
      return params;
 }
 
-
 /*
  *  call-seq:
  *     WIN32OLE_METHOD#params
@@ -7011,7 +5236,8 @@ ole_method_params(ITypeInfo *pTypeInfo, UINT method_index)
  *                           TextVisualLayout]
  */
 static VALUE
-folemethod_params(VALUE self)
+folemethod_params(self)
+    VALUE self;
 {
     struct olemethoddata *pmethod;
     Data_Get_Struct(self, struct olemethoddata, pmethod);
@@ -7019,19 +5245,6 @@ folemethod_params(VALUE self)
 }
 
 /*
- *  call-seq:
- *     WIN32OLE_METHOD#inspect -> String
- *
- *  Returns the method name with class name.
- *
- */
-static VALUE
-folemethod_inspect(VALUE self)
-{
-    return default_inspect(self, "WIN32OLE_METHOD");
-}
-
-/*
  * Document-class: WIN32OLE_PARAM
  *
  *   <code>WIN32OLE_PARAM</code> objects represent param information of 
@@ -7049,17 +5262,21 @@ folemethod_inspect(VALUE self)
  *     puts param1.name # => Filename
  */
 static VALUE
-foleparam_name(VALUE self)
+foleparam_name(self)
+    VALUE self;
 {
     return rb_ivar_get(self, rb_intern("name"));
 }
 
 static VALUE
-ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_ole_type(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
-    VALUE type = rb_str_new2("unknown type");
+    VALUE type = rb_str_new2("UNKNOWN");
     hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
     if (FAILED(hr))
         return type;
@@ -7080,7 +5297,8 @@ ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
  *     puts param1.ole_type # => VARIANT
  */
 static VALUE 
-foleparam_ole_type(VALUE self)
+foleparam_ole_type(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7089,7 +5307,10 @@ foleparam_ole_type(VALUE self)
 }
 
 static VALUE
-ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_ole_type_detail(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -7114,7 +5335,8 @@ ole_param_ole_type_detail(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
  *     p param1.ole_type_detail # => ["PTR", "USERDEFINED", "Range"]
  */
 static VALUE 
-foleparam_ole_type_detail(VALUE self)
+foleparam_ole_type_detail(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7123,7 +5345,11 @@ foleparam_ole_type_detail(VALUE self)
 }
 
 static VALUE
-ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT mask)
+ole_param_flag_mask(pTypeInfo, method_index, index, mask)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
+    USHORT mask;
 {
     FUNCDESC *pFuncDesc;
     HRESULT hr;
@@ -7147,7 +5373,8 @@ ole_param_flag_mask(ITypeInfo *pTypeInfo, UINT method_index, UINT index, USHORT
  *     param1 = method.params[0]
  *     puts param1.input? # => true
  */
-static VALUE foleparam_input(VALUE self)
+static VALUE foleparam_input(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7174,7 +5401,8 @@ static VALUE foleparam_input(VALUE self)
  *       Headers false
  *       Processed true
  */
-static VALUE foleparam_output(VALUE self)
+static VALUE foleparam_output(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7192,7 +5420,8 @@ static VALUE foleparam_output(VALUE self)
  *     param1 = method.params[0]
  *     puts "#{param1.name} #{param1.optional?}" # => Filename true
  */
-static VALUE foleparam_optional(VALUE self)
+static VALUE foleparam_optional(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7211,7 +5440,8 @@ static VALUE foleparam_optional(VALUE self)
  *     param = method.params[0]
  *     puts "#{param.name} #{param.retval?}"  # => name true
  */
-static VALUE foleparam_retval(VALUE self)
+static VALUE foleparam_retval(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7220,7 +5450,10 @@ static VALUE foleparam_retval(VALUE self)
 }
 
 static VALUE
-ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
+ole_param_default(pTypeInfo, method_index, index)
+    ITypeInfo *pTypeInfo;
+    UINT method_index;
+    UINT index;
 {
     FUNCDESC *pFuncDesc;
     ELEMDESC *pElemDesc;
@@ -7271,7 +5504,8 @@ ole_param_default(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
  *         TextCodepage
  *         TextVisualLayout
  */
-static VALUE foleparam_default(VALUE self)
+static VALUE foleparam_default(self)
+    VALUE self;
 {
     struct oleparamdata *pparam;
     Data_Get_Struct(self, struct oleparamdata, pparam);
@@ -7279,26 +5513,7 @@ static VALUE foleparam_default(VALUE self)
                              pparam->index);
 }
 
-/*
- *  call-seq:
- *     WIN32OLE_PARAM#inspect -> String
- *
- *  Returns the parameter name with class name. If the parameter has default value,
- *  then returns name=value string with class name.
- *
- */
-static VALUE
-foleparam_inspect(VALUE self)
-{
-    VALUE detail = foleparam_name(self);
-    VALUE defval = foleparam_default(self);
-    if (defval != Qnil) {
-        rb_str_cat2(detail, "=");
-        rb_str_concat(detail, rb_funcall(defval, rb_intern("inspect"), 0));
-    }
-    return make_inspect("WIN32OLE_PARAM", detail);
-}
-  
+
 /*
  * Document-class: WIN32OLE_EVENT
  *
@@ -7367,24 +5582,20 @@ STDMETHODIMP EVENTSINK_GetTypeInfo(
 }
 
 STDMETHODIMP EVENTSINK_GetIDsOfNames(
-    PEVENTSINK pEventSink,
+    PEVENTSINK pEV,
     REFIID riid,
     OLECHAR **szNames,
     UINT cNames,
     LCID lcid,
     DISPID *pDispID
     ) {
-    ITypeInfo *pTypeInfo;
-    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
-    pTypeInfo = pEV->pTypeInfo;
-    if (pTypeInfo) {
-	return pTypeInfo->lpVtbl->GetIDsOfNames(pTypeInfo, szNames, cNames, pDispID);
-    }
     return DISP_E_UNKNOWNNAME;
 }
 
 static long
-ole_search_event_at(VALUE ary, VALUE ev)
+ole_search_event_at(ary, ev)
+    VALUE ary;
+    VALUE ev;
 {
     VALUE event;
     VALUE def_event;
@@ -7392,7 +5603,7 @@ ole_search_event_at(VALUE ary, VALUE ev)
     long i, len; 
     long ret = -1;
     def_event = Qnil;
-    len = RARRAY_LEN(ary);
+    len = RARRAY(ary)->len;
     for(i = 0; i < len; i++) {
         event = rb_ary_entry(ary, i);
         event_name = rb_ary_entry(event, 1);
@@ -7411,15 +5622,18 @@ ole_search_event_at(VALUE ary, VALUE ev)
 }
 
 static VALUE
-ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default)
+ole_search_event(ary, ev, is_default)
+    VALUE ary;
+    VALUE ev;
+    BOOL  *is_default;
 {
     VALUE event;
     VALUE def_event;
     VALUE event_name;
-    int i, len;
+    long i, len;
     *is_default = FALSE;
     def_event = Qnil;
-    len = RARRAY_LEN(ary);
+    len = RARRAY(ary)->len;
     for(i = 0; i < len; i++) {
         event = rb_ary_entry(ary, i);
         event_name = rb_ary_entry(event, 1);
@@ -7436,92 +5650,90 @@ ole_search_event(VALUE ary, VALUE ev, BOOL  *is_default)
 }
 
 static void
-ole_delete_event(VALUE ary, VALUE ev)
-{
-    long at = -1;
-    at = ole_search_event_at(ary, ev);
-    if (at >= 0) {
-        rb_ary_delete_at(ary, at);
-    }
-}
-
-static void 
-hash2ptr_dispparams(VALUE hash, ITypeInfo *pTypeInfo, DISPID dispid, DISPPARAMS *pdispparams)
-{
-    BSTR *bstrs;
-    HRESULT hr;
-    UINT len, i;
-    VARIANT *pvar;
+val2ptr_variant(val, var)
     VALUE val;
-    VALUE key;
-    len = 0;
-    bstrs = ALLOCA_N(BSTR, pdispparams->cArgs + 1);
-    hr = pTypeInfo->lpVtbl->GetNames(pTypeInfo, dispid, 
-                                     bstrs, pdispparams->cArgs + 1,
-                                     &len);
-    if (FAILED(hr))
-	return;
-
-    for (i = 0; i < len - 1; i++) {
-	key = WC2VSTR(bstrs[i + 1]);
-        val = rb_hash_aref(hash, INT2FIX(i));
-	if (val == Qnil) 
-	    val = rb_hash_aref(hash, key);
-	if (val == Qnil)
-	    val = rb_hash_aref(hash, rb_str_intern(key));
-        pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        ole_val2ptr_variant(val, pvar);
-    }
-}
-
-static VALUE 
-hash2result(VALUE hash)
+    VARIANT *var;
 {
-    VALUE ret = Qnil;
-    ret = rb_hash_aref(hash, rb_str_new2("return"));
-    if (ret == Qnil)
-	ret = rb_hash_aref(hash, rb_str_intern(rb_str_new2("return")));
-    return ret;
+    switch (TYPE(val)) {
+    case T_STRING:
+        if (V_VT(var) == (VT_BSTR | VT_BYREF)) {
+            *V_BSTRREF(var) = ole_mb2wc(StringValuePtr(val), -1);
+        }
+        break;
+    case T_FIXNUM:
+        switch(V_VT(var)) {
+        case (VT_UI1 | VT_BYREF) :
+            *V_UI1REF(var) = NUM2CHR(val);
+            break;
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2INT(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2INT(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_FLOAT:
+        switch(V_VT(var)) {
+        case (VT_I2 | VT_BYREF) :
+            *V_I2REF(var) = (short)NUM2INT(val);
+            break;
+        case (VT_I4 | VT_BYREF) :
+            *V_I4REF(var) = NUM2INT(val);
+            break;
+        case (VT_R4 | VT_BYREF) :
+            *V_R4REF(var) = (float)NUM2DBL(val);
+            break;
+        case (VT_R8 | VT_BYREF) :
+            *V_R8REF(var) = NUM2DBL(val);
+            break;
+        default:
+            break;
+        }
+        break;
+    case T_BIGNUM:
+        if (V_VT(var) == (VT_R8 | VT_BYREF)) {
+            *V_R8REF(var) = rb_big2dbl(val);
+        }
+        break;
+    case T_TRUE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_TRUE;
+        }
+        break;
+    case T_FALSE:
+        if (V_VT(var) == (VT_BOOL | VT_BYREF)) {
+            *V_BOOLREF(var) = VARIANT_FALSE;
+        }
+        break;
+    default:
+        break;
+    }
 }
 
 static void
-ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams)
+ary2ptr_dispparams(ary, pdispparams)
+    VALUE ary;
+    DISPPARAMS *pdispparams;
 {
     int i;
     VALUE v;
     VARIANT *pvar;
-    for(i = 0; i < RARRAY_LEN(ary) && (unsigned int) i < pdispparams->cArgs; i++) {
+    for(i = 0; i < RARRAY(ary)->len && (unsigned int) i < pdispparams->cArgs; i++) {
         v = rb_ary_entry(ary, i);
         pvar = &pdispparams->rgvarg[pdispparams->cArgs-i-1];
-        ole_val2ptr_variant(v, pvar);
+        val2ptr_variant(v, pvar);
     }
 }
 
-static VALUE
-exec_callback(VALUE arg)
-{
-    VALUE *parg = (VALUE *)arg;
-    VALUE handler = parg[0];
-    VALUE args = parg[1];
-    return rb_apply(handler, rb_intern("call"), args);
-}
-
-static VALUE
-rescue_callback(VALUE arg)
-{
-    
-    VALUE e = rb_errinfo();
-    VALUE bt = rb_funcall(e, rb_intern("backtrace"), 0);
-    VALUE msg = rb_funcall(e, rb_intern("message"), 0);
-    bt = rb_ary_entry(bt, 0);
-    fprintf(stdout, "%s: %s (%s)\n", StringValuePtr(bt), StringValuePtr(msg), rb_obj_classname(e));
-    rb_backtrace();
-    ruby_finalize();
-    exit(-1);
-    
-    return Qnil;
-}
-
 STDMETHODIMP EVENTSINK_Invoke(
     PEVENTSINK pEventSink,
     DISPID dispid,
@@ -7540,15 +5752,13 @@ STDMETHODIMP EVENTSINK_Invoke(
     unsigned int i;
     ITypeInfo *pTypeInfo;
     VARIANT *pvar;
-    VALUE ary, obj, event, handler, args, outargv, ev, result;
-    VALUE arg[2];
-    VALUE is_outarg;
+    VALUE ary, obj, event, handler, args, argv, ev, result;
     BOOL is_default_handler = FALSE;
-    int state;
 
     PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
     pTypeInfo = pEV->pTypeInfo;
-    obj = evs_entry(pEV->m_event_id);
+
+    obj = rb_ary_entry(ary_ole_event, pEV->m_event_id);
     if (!rb_obj_is_kind_of(obj, cWIN32OLE_EVENT)) {
         return NOERROR;
     }
@@ -7578,31 +5788,15 @@ STDMETHODIMP EVENTSINK_Invoke(
         rb_ary_push(args, ole_variant2val(pvar));
     }
     handler = rb_ary_entry(event, 0);
-    is_outarg = rb_ary_entry(event, 3);
-    outargv = Qnil;
-    if (is_outarg == Qtrue) {
-	outargv = rb_ary_new();
-        rb_ary_push(args, outargv);
-    }
 
-    /*
-     * if exception raised in event callback,
-     * then you receive cfp consistency error. 
-     * to avoid this error we use begin rescue end.
-     * and the exception raised then error message print
-     * and exit ruby process by Win32OLE itself.
-     */
-    arg[0] = handler;
-    arg[1] = args;
-    result = rb_protect(exec_callback, (VALUE)arg, &state);
-    if (state != 0) {
-	rescue_callback(Qnil);
+    if (rb_ary_entry(event, 3) == Qtrue) {
+        argv = rb_ary_new();
+        rb_ary_push(args, argv);
+        result = rb_apply(handler, rb_intern("call"), args);
+        ary2ptr_dispparams(argv, pdispparams);
     }
-    if(TYPE(result) == T_HASH) {
-	hash2ptr_dispparams(result, pTypeInfo, dispid, pdispparams);
-	result = hash2result(result);
-    }else if (is_outarg == Qtrue && TYPE(outargv) == T_ARRAY) {
-	ary2ptr_dispparams(outargv, pdispparams);
+    else {
+        result = rb_apply(handler, rb_intern("call"), args);
     }
 
     if (pvarResult) {
@@ -7631,7 +5825,10 @@ EVENTSINK_Constructor() {
     pEv->lpVtbl = &vtEventSink;
     pEv->m_cRef = 0;
     pEv->m_event_id = 0;
+    pEv->m_dwCookie = 0;
+    pEv->pConnectionPoint = NULL;
     pEv->pTypeInfo = NULL;
+    pEv->ptr_freed = NULL;
     return pEv;
 }
 
@@ -7639,14 +5836,17 @@ void EVENTSINK_Destructor(
     PIEVENTSINKOBJ pEVObj
     ) {
     if(pEVObj != NULL) {
-        OLE_RELEASE(pEVObj->pTypeInfo);
+        *(pEVObj->ptr_freed) = 1;
         free(pEVObj);
-        pEVObj = NULL;
     }
 }
 
 static HRESULT
-find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
+find_iid(ole, pitf, piid, ppTypeInfo)
+    VALUE ole;
+    char *pitf;
+    IID *piid;
+    ITypeInfo **ppTypeInfo;
 {
     HRESULT hr;
     IDispatch *pDispatch;
@@ -7665,7 +5865,7 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
     char *pstr;
 
     BOOL is_found = FALSE;
-    LCID    lcid = cWIN32OLE_lcid;
+    LCID    lcid = LOCALE_SYSTEM_DEFAULT;
 
     OLEData_Get_Struct(ole, pole);
 
@@ -7756,130 +5956,22 @@ find_iid(VALUE ole, char *pitf, IID *piid, ITypeInfo **ppTypeInfo)
     return hr;
 }
 
-static HRESULT 
-find_coclass(
-    ITypeInfo *pTypeInfo, 
-    TYPEATTR *pTypeAttr, 
-    ITypeInfo **pCOTypeInfo, 
-    TYPEATTR **pCOTypeAttr)
-{
-    HRESULT hr = E_NOINTERFACE;
-    ITypeLib *pTypeLib;
-    int count;
-    BOOL found = FALSE;
-    ITypeInfo *pTypeInfo2;
-    TYPEATTR *pTypeAttr2;
-    int flags;
-    int i,j;
-    HREFTYPE href;
-    ITypeInfo *pRefTypeInfo;
-    TYPEATTR *pRefTypeAttr;
-
-    hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, NULL);
-    if (FAILED(hr)) {
-	return hr;
-    }
-    count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
-    for (i = 0; i < count && !found; i++) {
-	hr = pTypeLib->lpVtbl->GetTypeInfo(pTypeLib, i, &pTypeInfo2);
-	if (FAILED(hr))
-	    continue;
-	hr = OLE_GET_TYPEATTR(pTypeInfo2, &pTypeAttr2);
-	if (FAILED(hr)) {
-	    OLE_RELEASE(pTypeInfo2);
-	    continue;
-	}
-	if (pTypeAttr2->typekind != TKIND_COCLASS) {
-	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-	    OLE_RELEASE(pTypeInfo2);
-	    continue;
-	}
-	for (j = 0; j < pTypeAttr2->cImplTypes && !found; j++) {
-	    hr = pTypeInfo2->lpVtbl->GetImplTypeFlags(pTypeInfo2, j, &flags);
-	    if (FAILED(hr))
-		continue;
-	    if (!(flags & IMPLTYPEFLAG_FDEFAULT)) 
-		continue;
-	    hr = pTypeInfo2->lpVtbl->GetRefTypeOfImplType(pTypeInfo2, j, &href);
-	    if (FAILED(hr))
-		continue;
-	    hr = pTypeInfo2->lpVtbl->GetRefTypeInfo(pTypeInfo2, href, &pRefTypeInfo);
-	    if (FAILED(hr)) 
-		continue;
-	    hr = OLE_GET_TYPEATTR(pRefTypeInfo, &pRefTypeAttr);
-	    if (FAILED(hr))  {
-		OLE_RELEASE(pRefTypeInfo);
-		continue;
-	    }
-	    if (IsEqualGUID(&(pTypeAttr->guid), &(pRefTypeAttr->guid))) {
-		found = TRUE;
-	    }
-	}
-	if (!found) {
-	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-	    OLE_RELEASE(pTypeInfo2);
-	}
-    }
-    OLE_RELEASE(pTypeLib);
-    if (found) {
-	*pCOTypeInfo = pTypeInfo2;
-	*pCOTypeAttr = pTypeAttr2;
-	hr = S_OK;
-    } else {
-	hr = E_NOINTERFACE;
-    }
-    return hr;
-}
-
 static HRESULT
-find_default_source_from_typeinfo(
-    ITypeInfo *pTypeInfo, 
-    TYPEATTR *pTypeAttr, 
-    ITypeInfo **ppTypeInfo)
-{
-    int i = 0;
-    HRESULT hr = E_NOINTERFACE;
-    int flags;
-    HREFTYPE hRefType;
-    /* Enumerate all implemented types of the COCLASS */
-    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
-        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &flags);
-        if (FAILED(hr))
-            continue;
-
-        /*
-           looking for the [default] [source]
-           we just hope that it is a dispinterface :-)
-        */
-        if ((flags & IMPLTYPEFLAG_FDEFAULT) &&
-            (flags & IMPLTYPEFLAG_FSOURCE)) {
-
-            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
-                                                         i, &hRefType);
-            if (FAILED(hr))
-                continue;
-            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
-                                                   hRefType, ppTypeInfo);
-            if (SUCCEEDED(hr))
-                break;
-        }
-    }
-    return hr;
-}
-
-static HRESULT
-find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
+find_default_source(ole, piid, ppTypeInfo)
+    VALUE ole;
+    IID *piid;
+    ITypeInfo **ppTypeInfo;
 {
     HRESULT hr;
     IProvideClassInfo2 *pProvideClassInfo2;
     IProvideClassInfo *pProvideClassInfo;
-    void *p;
 
     IDispatch *pDispatch;
     ITypeInfo *pTypeInfo;
-    ITypeInfo *pTypeInfo2 = NULL;
     TYPEATTR *pTypeAttr;
-    TYPEATTR *pTypeAttr2 = NULL;
+    int i;
+    int iFlags;
+    HREFTYPE hRefType;
 
     struct oledata *pole;
 
@@ -7887,52 +5979,58 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
     pDispatch = pole->pDispatch;
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IProvideClassInfo2,
-                                           &p);
+                                           (void**)&pProvideClassInfo2);
     if (SUCCEEDED(hr)) {
-        pProvideClassInfo2 = p;
         hr = pProvideClassInfo2->lpVtbl->GetGUID(pProvideClassInfo2,
                                                  GUIDKIND_DEFAULT_SOURCE_DISP_IID,
                                                  piid);
         OLE_RELEASE(pProvideClassInfo2);
-        if (SUCCEEDED(hr)) {
-            hr = find_iid(ole, NULL, piid, ppTypeInfo);
-        }
-    }
-    if (SUCCEEDED(hr)) {
-        return hr;
+        return find_iid(ole, NULL, piid, ppTypeInfo);
     }
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IProvideClassInfo,
-					   &p);
-    if (SUCCEEDED(hr)) {
-        pProvideClassInfo = p;
-        hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
-                                                     &pTypeInfo);
-        OLE_RELEASE(pProvideClassInfo);
-    }
-    if (FAILED(hr)) {
-        hr = pDispatch->lpVtbl->GetTypeInfo(pDispatch, 0, cWIN32OLE_lcid, &pTypeInfo );
-    }
+                                           (void**)&pProvideClassInfo);
+    if (FAILED(hr))
+        return hr;
+
+    hr = pProvideClassInfo->lpVtbl->GetClassInfo(pProvideClassInfo,
+                                                 &pTypeInfo);
+    OLE_RELEASE(pProvideClassInfo);
     if (FAILED(hr))
         return hr;
+
     hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         return hr;
     }
+    /* Enumerate all implemented types of the COCLASS */
+    for (i = 0; i < pTypeAttr->cImplTypes; i++) {
+        hr = pTypeInfo->lpVtbl->GetImplTypeFlags(pTypeInfo, i, &iFlags);
+        if (FAILED(hr))
+            continue;
 
-    *ppTypeInfo = 0;
-    hr = find_default_source_from_typeinfo(pTypeInfo, pTypeAttr, ppTypeInfo);
-    if (!*ppTypeInfo) {
-	hr = find_coclass(pTypeInfo, pTypeAttr, &pTypeInfo2, &pTypeAttr2);
-	if (SUCCEEDED(hr)) {
-	    hr = find_default_source_from_typeinfo(pTypeInfo2, pTypeAttr2, ppTypeInfo);
-	    OLE_RELEASE_TYPEATTR(pTypeInfo2, pTypeAttr2);
-	    OLE_RELEASE(pTypeInfo2);
-	}
+        /*
+           looking for the [default] [source]
+           we just hope that it is a dispinterface :-)
+        */
+        if ((iFlags & IMPLTYPEFLAG_FDEFAULT) &&
+            (iFlags & IMPLTYPEFLAG_FSOURCE)) {
+
+            hr = pTypeInfo->lpVtbl->GetRefTypeOfImplType(pTypeInfo,
+                                                         i, &hRefType);
+            if (FAILED(hr))
+                continue;
+            hr = pTypeInfo->lpVtbl->GetRefTypeInfo(pTypeInfo,
+                                                   hRefType, ppTypeInfo);
+            if (SUCCEEDED(hr))
+                break;
+        }
     }
+
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     OLE_RELEASE(pTypeInfo);
+
     /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
     if (!*ppTypeInfo) {
         if (SUCCEEDED(hr))
@@ -7954,41 +6052,72 @@ find_default_source(VALUE ole, IID *piid, ITypeInfo **ppTypeInfo)
 }
 
 static void
-ole_event_free(struct oleeventdata *poleev)
+ole_event_free(poleev)
+    struct oleeventdata *poleev;
 {
-    OLE_FREE(poleev->pConnectionPoint);
-    free(poleev);
+    ITypeInfo *pti = NULL;
+    IConnectionPoint *pcp = NULL;
+
+    if (poleev->freed == 1) {
+        /* 
+         * this return create memory leak.
+         * but poleev->pEvent->pConnectionPoint shoul'd not be freed
+         * until poleev-> freed == 0.
+         */
+        return;
+    }
+    if(poleev->pEvent) {
+        pti = poleev->pEvent->pTypeInfo;
+        if(pti) OLE_RELEASE(pti);
+        pcp = poleev->pEvent->pConnectionPoint;
+        if(pcp) {
+            pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
+            OLE_RELEASE(pcp);
+        }
+        free(poleev);
+    }
 }
 
+static VALUE fev_s_allocate _((VALUE));
 static VALUE
-fev_s_allocate(VALUE klass)
+fev_s_allocate(klass)
+    VALUE klass;
 {
     VALUE obj;
     struct oleeventdata *poleev;
     obj = Data_Make_Struct(klass,struct oleeventdata,0,ole_event_free,poleev);
-    poleev->dwCookie = 0;
-    poleev->pConnectionPoint = NULL;
-    poleev->event_id = 0;
+    poleev->pEvent = NULL;
     return obj;
 }
 
+/*
+ *  call-seq:
+ *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
+ *
+ *  Returns OLE event object.
+ *  The first argument specifies WIN32OLE object.
+ *  The second argument specifies OLE event name.
+ *     ie = WIN32OLE.new('InternetExplorer.Application')
+ *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
+ */     
 static VALUE
-ev_advise(int argc, VALUE *argv, VALUE self)
+fev_initialize(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
-
     VALUE ole, itf;
     struct oledata *pole;
     char *pitf;
     HRESULT hr;
     IID iid;
-    ITypeInfo *pTypeInfo = 0;
+    ITypeInfo *pTypeInfo;
     IDispatch *pDispatch;
     IConnectionPointContainer *pContainer;
     IConnectionPoint *pConnectionPoint;
     IEVENTSINKOBJ *pIEV;
-    DWORD dwCookie;
+    DWORD dwCookie = 0;
     struct oleeventdata *poleev;
-    void *p;
 
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &ole, &itf);
@@ -7998,7 +6127,7 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     }
 
     if(TYPE(itf) != T_NIL) {
-        if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) {
+        if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
             rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
                      StringValuePtr(itf));
         }
@@ -8017,13 +6146,12 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     pDispatch = pole->pDispatch;
     hr = pDispatch->lpVtbl->QueryInterface(pDispatch,
                                            &IID_IConnectionPointContainer,
-                                           &p);
+                                           (void**)&pContainer);
     if (FAILED(hr)) {
         OLE_RELEASE(pTypeInfo);
         ole_raise(hr, rb_eRuntimeError,
                   "failed to query IConnectionPointContainer");
     }
-    pContainer = p;
 
     hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
                                                  &iid,
@@ -8043,32 +6171,15 @@ ev_advise(int argc, VALUE *argv, VALUE self)
     }
 
     Data_Get_Struct(self, struct oleeventdata, poleev);
-    pIEV->m_event_id
-        = NUM2INT(evs_length());
-    pIEV->pTypeInfo = pTypeInfo;
-    poleev->dwCookie = dwCookie;
-    poleev->pConnectionPoint = pConnectionPoint;
-    poleev->event_id = pIEV->m_event_id;
-
-    return self;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT.new(ole, event) #=> WIN32OLE_EVENT object.
- *
- *  Returns OLE event object.
- *  The first argument specifies WIN32OLE object.
- *  The second argument specifies OLE event name.
- *     ie = WIN32OLE.new('InternetExplorer.Application')
- *     ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
- */     
-static VALUE
-fev_initialize(int argc, VALUE *argv, VALUE self)
-{
-    ev_advise(argc, argv, self);
-    evs_push(self);
-    rb_ivar_set(self, id_events, rb_ary_new());
+    poleev->pEvent = pIEV;
+    poleev->pEvent->m_event_id
+        = NUM2INT(rb_funcall(ary_ole_event, rb_intern("length"), 0));
+    poleev->pEvent->pConnectionPoint = pConnectionPoint;
+    poleev->pEvent->pTypeInfo = pTypeInfo;
+    poleev->pEvent->m_dwCookie = dwCookie;
+    poleev->freed = 0;
+    poleev->pEvent->ptr_freed = &(poleev->freed);
+    rb_ary_push(ary_ole_event, self);
     return self;
 }
 
@@ -8079,7 +6190,8 @@ fev_initialize(int argc, VALUE *argv, VALUE self)
  *  Translates and dispatches Windows message.
  */
 static VALUE
-fev_s_msg_loop(VALUE klass)
+fev_s_msg_loop(klass)
+    VALUE klass;
 {
     ole_msg_loop();
     return Qnil;
@@ -8087,27 +6199,32 @@ fev_s_msg_loop(VALUE klass)
 
 
 static void
-add_event_call_back(VALUE obj, VALUE event, VALUE data)
+add_event_call_back(obj, event, data)
+    VALUE obj;
+    VALUE event;
+    VALUE data;
 {
-    long at = -1;
+    long at;
     VALUE events = rb_ivar_get(obj, id_events);
     if (NIL_P(events) || TYPE(events) != T_ARRAY) {
         events = rb_ary_new();
         rb_ivar_set(obj, id_events, events);
     }
-    ole_delete_event(events, event);
+    at = ole_search_event_at(events, event);
+    if (at > -1) {
+        rb_ary_delete_at(events, at);
+    }
     rb_ary_push(events, data);
 }
 
 static VALUE
-ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
+ev_on_event(argc, argv, self, is_ary_arg)
+    int argc;
+    VALUE *argv;
+    VALUE self;
+    VALUE is_ary_arg;
 {
-    struct oleeventdata *poleev;
     VALUE event, args, data;
-    Data_Get_Struct(self, struct oleeventdata, poleev);
-    if (poleev->pConnectionPoint == NULL) {
-        rb_raise(eWIN32OLERuntimeError, "IConnectionPoint not found. You must call advise at first.");
-    }
     rb_scan_args(argc, argv, "01*", &event, &args);
     if(!NIL_P(event)) {
         Check_SafeStr(event);
@@ -8123,31 +6240,15 @@ ev_on_event(int argc, VALUE *argv, VALUE self, VALUE is_ary_arg)
  * 
  *  Defines the callback event.
  *  If argument is omitted, this method defines the callback of all events.
- *  If you want to modify reference argument in callback, return hash in
- *  callback. If you want to return value to OLE server as result of callback
- *  use `return' or :return.
- *
  *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
+ *    ev = WIN32OLE_EVENT.new(ie, 'DWebBrowserEvents')
  *    ev.on_event("NavigateComplete") {|url| puts url}
- *    ev.on_event() {|ev, *args| puts "#{ev} fired"} 
- *
- *    ev.on_event("BeforeNavigate2") {|*args| 
- *      ...
- *      # set true to BeforeNavigate reference argument `Cancel'.
- *      # Cancel is 7-th argument of BeforeNavigate,
- *      # so you can use 6 as key of hash instead of 'Cancel'.
- *      # The argument is counted from 0. 
- *      # The hash key of 0 means first argument.)
- *      {:Cancel => true}  # or {'Cancel' => true} or {6 => true}
- *    }
- *
- *    ev.on_event(...) {|*args|
- *      {:return => 1, :xxx => yyy}
- *    }
  */
 static VALUE
-fev_on_event(int argc, VALUE *argv, VALUE self)
+fev_on_event(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     return ev_on_event(argc, argv, self, Qfalse);
 }
@@ -8158,536 +6259,26 @@ fev_on_event(int argc, VALUE *argv, VALUE self)
  * 
  *  Defines the callback of event.
  *  If you want modify argument in callback, 
- *  you could use this method instead of WIN32OLE_EVENT#on_event.
- *
- *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
- *    ev.on_event_with_outargs('BeforeNavigate2') {|*args|
- *      args.last[6] = true
- *    }
+ *  you should use this method instead of WIN32OLE_EVENT#on_event.
  */
 static VALUE
-fev_on_event_with_outargs(int argc, VALUE *argv, VALUE self)
+fev_on_event_with_outargs(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     return ev_on_event(argc, argv, self, Qtrue);
 }
 
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#off_event([event])
- * 
- *  removes the callback of event.
- *
- *    ie = WIN32OLE.new('InternetExplorer.Application')
- *    ev = WIN32OLE_EVENT.new(ie)
- *    ev.on_event('BeforeNavigate2') {|*args|
- *      args.last[6] = true
- *    }
- *      ...
- *    ev.off_event('BeforeNavigate2')
- *      ...
- */
-static VALUE
-fev_off_event(int argc, VALUE *argv, VALUE self)
-{
-    VALUE event = Qnil;
-    VALUE events;
-
-    rb_secure(4);
-    rb_scan_args(argc, argv, "01", &event);
-    if(!NIL_P(event)) {
-        Check_SafeStr(event);
-    }
-    events = rb_ivar_get(self, id_events);
-    if (NIL_P(events)) {
-	return Qnil;
-    }
-    ole_delete_event(events, event);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_EVENT#unadvise -> nil
- *
- *  disconnects OLE server. If this method called, then the WIN32OLE_EVENT object
- *  does not receive the OLE server event any more.
- *  This method is trial implementation.
- *
- *      ie = WIN32OLE.new('InternetExplorer.Application')
- *      ev = WIN32OLE_EVENT.new(ie)
- *      ev.on_event() {...}
- *         ...
- *      ev.unadvise
- *
- */
-static VALUE 
-fev_unadvise(VALUE self)
-{
-    struct oleeventdata *poleev;
-    Data_Get_Struct(self, struct oleeventdata, poleev);
-    if (poleev->pConnectionPoint) {
-        ole_msg_loop();
-        evs_delete(poleev->event_id);
-        poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie);
-        OLE_RELEASE(poleev->pConnectionPoint);
-        poleev->pConnectionPoint = NULL;
-    }
-    return Qnil;
-}
-
-static VALUE 
-evs_push(VALUE ev)
-{
-    return rb_ary_push(ary_ole_event, ev);
-}
-
-static VALUE
-evs_delete(long i)
-{
-    rb_ary_store(ary_ole_event, i, Qnil);
-    return Qnil;
-}
-
-static VALUE 
-evs_entry(long i)
-{
-    return rb_ary_entry(ary_ole_event, i);
-}
-
-static VALUE 
-evs_length()
-{
-    return rb_funcall(ary_ole_event, rb_intern("length"), 0);
-}
-
-static void 
-olevariant_free(struct olevariantdata *pvar)
-{
-    VariantClear(&(pvar->realvar));
-    VariantClear(&(pvar->var));
-    free(pvar);
-}
-
-static VALUE
-folevariant_s_allocate(VALUE klass)
-{
-    struct olevariantdata *pvar;
-    VALUE obj;
-    ole_initialize();
-    obj = Data_Make_Struct(klass,struct olevariantdata,0,olevariant_free,pvar);
-    VariantInit(&(pvar->var));
-    VariantInit(&(pvar->realvar));
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.array(ary, vt)
- *
- *  Returns Ruby object wrapping OLE variant whose variant type is VT_ARRAY.
- *  The first argument should be Array object which specifies dimensions 
- *  and each size of dimensions of OLE array.  
- *  The second argument specifies variant type of the element of OLE array.
- *
- *  The following create 2 dimensions OLE array. The first dimensions size
- *  is 3, and the second is 4.
- *
- *     ole_ary = WIN32OLE_VARIANT.array([3,4], VT_I4)
- *     ruby_ary = ole_ary.value # => [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]]
- *
- */     
-static VALUE
-folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt)
-{
-    VALUE obj = Qnil;
-    VARTYPE vt;
-    struct olevariantdata *pvar;
-    SAFEARRAYBOUND *psab = NULL;
-    SAFEARRAY *psa = NULL;
-    UINT dim = 0;
-    UINT i = 0;
-
-    ole_initialize();
-
-    vt = NUM2UINT(vvt);
-    vt = (vt | VT_ARRAY);
-    Check_Type(elems, T_ARRAY);
-    obj = folevariant_s_allocate(klass);
-
-    Data_Get_Struct(obj, struct olevariantdata, pvar);
-    dim = RARRAY_LEN(elems);
-
-    psab = ALLOC_N(SAFEARRAYBOUND, dim);
-
-    if(!psab) {
-        rb_raise(rb_eRuntimeError, "memory allocation error");
-    }
-
-    for (i = 0; i < dim; i++) {
-        psab[i].cElements = FIX2INT(rb_ary_entry(elems, i));
-        psab[i].lLbound = 0;
-    }
-
-    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
-    if (psa == NULL) {
-        if (psab) free(psab);
-        rb_raise(rb_eRuntimeError, "memory allocation error(SafeArrayCreate)");
-    }
-
-    V_VT(&(pvar->var)) = vt;
-    if (vt & VT_BYREF) {
-        V_VT(&(pvar->realvar)) = (vt & ~VT_BYREF);
-        V_ARRAY(&(pvar->realvar)) = psa;
-        V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
-    } else {
-        V_ARRAY(&(pvar->var)) = psa;
-    }
-    if (psab) free(psab);
-    return obj;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.new(val, vartype) #=> WIN32OLE_VARIANT object.
- *
- *  Returns Ruby object wrapping OLE variant.
- *  The first argument specifies Ruby object to convert OLE variant variable.
- *  The second argument specifies VARIANT type. 
- *  In some situation, you need the WIN32OLE_VARIANT object to pass OLE method
- *
- *     shell = WIN32OLE.new("Shell.Application")
- *     folder = shell.NameSpace("C:\\Windows")
- *     item = folder.ParseName("tmp.txt")
- *     # You can't use Ruby String object to call FolderItem.InvokeVerb.
- *     # Instead, you have to use WIN32OLE_VARIANT object to call the method.
- *     shortcut = WIN32OLE_VARIANT.new("Create Shortcut(\&S)")
- *     item.invokeVerb(shortcut)
- *
- */     
-static VALUE
-folevariant_initialize(VALUE self, VALUE args)
-{
-    int len = 0;
-    VARIANT var;
-    VALUE val;
-    VALUE vvt;
-    VARTYPE vt;
-    struct olevariantdata *pvar;
-
-    len = RARRAY_LEN(args);
-    if (len < 1 || len > 3) {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..3)", len);
-    }
-    VariantInit(&var);
-    val = rb_ary_entry(args, 0);
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-    if (len == 1) {
-        ole_val2variant(val, &(pvar->var));
-    } else {
-        vvt = rb_ary_entry(args, 1);
-        vt = NUM2INT(vvt);
-        ole_val2olevariantdata(val, vt, pvar);
-    }
-    vt = V_VT(&pvar->var);
-    return self;
-}
-
-static SAFEARRAY * 
-get_locked_safe_array(VALUE val)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa = NULL;
-    HRESULT hr;
-    Data_Get_Struct(val, struct olevariantdata, pvar);
-    if (!(V_VT(&(pvar->var)) & VT_ARRAY)) {
-        rb_raise(rb_eTypeError, "variant type is not VT_ARRAY.");
-    }
-    psa = V_ISBYREF(&(pvar->var)) ? *V_ARRAYREF(&(pvar->var)) : V_ARRAY(&(pvar->var));
-    if (psa == NULL) {
-        return psa;
-    }
-    hr = SafeArrayLock(psa);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayLock");
-    }
-    return psa;
-}
-
-static long *
-ary2safe_array_index(int ary_size, VALUE *ary, SAFEARRAY *psa)
-{
-    long dim;
-    long *pid;
-    long i;
-    dim = SafeArrayGetDim(psa);
-    if (dim != ary_size) {
-        rb_raise(rb_eArgError, "unmatch number of indices");
-    }
-    pid = ALLOC_N(long, dim);
-    if (pid == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to allocate memory for indices");
-    }
-    for (i = 0; i < dim; i++) {
-        pid[i] = NUM2INT(ary[i]);
-    }
-    return pid;
-}
-
-static void
-unlock_safe_array(SAFEARRAY *psa) 
-{
-    HRESULT hr;
-    hr = SafeArrayUnlock(psa);
-    if (FAILED(hr)) {
-        ole_raise(hr, rb_eRuntimeError, "failed to SafeArrayUnlock");
-    }
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT[i,j,...] #=> element of OLE array.
- *
- *  Returns the element of WIN32OLE_VARIANT object(OLE array).
- *  This method is available only when the variant type of 
- *  WIN32OLE_VARIANT object is VT_ARRAY.
- *
- *  REMARK: 
- *     The all indicies should be 0 or natural number and 
- *     lower than or equal to max indicies.
- *     (This point is different with Ruby Array indicies.)
- *
- *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- *     p obj[0,0] # => 1
- *     p obj[1,0] # => 4
- *     p obj[2,0] # => WIN32OLERuntimeError
- *     p obj[0, -1] # => WIN32OLERuntimeError
- *
- */     
-static VALUE
-folevariant_ary_aref(int argc, VALUE *argv, VALUE self)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa;
-    VALUE val = Qnil;
-    VARIANT variant;
-    long *pid;
-    HRESULT hr;
-
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-    if (!V_ISARRAY(&(pvar->var))) {
-        rb_raise(eWIN32OLERuntimeError, 
-                 "`[]' is not available for this variant type object");
-    }
-    psa = get_locked_safe_array(self);
-    if (psa == NULL) {
-        return val;
-    }
-
-    pid = ary2safe_array_index(argc, argv, psa);
-
-    VariantInit(&variant);
-    V_VT(&variant) = (V_VT(&(pvar->var)) & ~VT_ARRAY) | VT_BYREF;
-    hr = SafeArrayPtrOfIndex(psa, pid, &V_BYREF(&variant));
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPtrOfIndex");
-    }
-    val = ole_variant2val(&variant);
-
-    unlock_safe_array(psa);
-    if (pid) free(pid);
-    return val;
-}
-
-static VOID *
-val2variant_ptr(VALUE val, VARIANT *var, VARTYPE vt)
-{
-    VOID *p = NULL;
-    HRESULT hr = S_OK;
-    ole_val2variant_ex(val, var, vt);
-    if ((vt & ~VT_BYREF) == VT_VARIANT) {
-        p = var;
-    } else {
-        if ( (vt & ~VT_BYREF) != V_VT(var)) {
-            hr = VariantChangeTypeEx(var, var, 
-                    cWIN32OLE_lcid, 0, (VARTYPE)(vt & ~VT_BYREF));
-            if (FAILED(hr)) {
-                ole_raise(hr, rb_eRuntimeError, "failed to change type");
-            }
-        }
-        p = get_ptr_of_variant(var);
-    }
-    if (p == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to get pointer of variant");
-    }
-    return p;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT[i,j,...] = val #=> set the element of OLE array
- *
- *  Set the element of WIN32OLE_VARIANT object(OLE array) to val.
- *  This method is available only when the variant type of 
- *  WIN32OLE_VARIANT object is VT_ARRAY.
- *
- *  REMARK: 
- *     The all indicies should be 0 or natural number and
- *     lower than or equal to max indicies.
- *     (This point is different with Ruby Array indicies.)
- *
- *     obj = WIN32OLE_VARIANT.new([[1,2,3],[4,5,6]])
- *     obj[0,0] = 7
- *     obj[1,0] = 8
- *     p obj.value # => [[7,2,3], [8,5,6]]
- *     obj[2,0] = 9 # => WIN32OLERuntimeError
- *     obj[0, -1] = 9 # => WIN32OLERuntimeError
- *
- */     
-static VALUE
-folevariant_ary_aset(int argc, VALUE *argv, VALUE self)
-{
-    struct olevariantdata *pvar;
-    SAFEARRAY *psa;
-    VARIANT var;
-    VARTYPE vt;
-    long *pid;
-    HRESULT hr;
-    VOID *p = NULL;
-
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-    if (!V_ISARRAY(&(pvar->var))) {
-        rb_raise(eWIN32OLERuntimeError, 
-                 "`[]' is not available for this variant type object");
-    }
-    psa = get_locked_safe_array(self);
-    if (psa == NULL) {
-        rb_raise(rb_eRuntimeError, "failed to get SafeArray pointer");
-    }
-
-    pid = ary2safe_array_index(argc-1, argv, psa);
-
-    VariantInit(&var);
-    vt = (V_VT(&(pvar->var)) & ~VT_ARRAY);
-    p = val2variant_ptr(argv[argc-1], &var, vt);
-    if ((V_VT(&var) == VT_DISPATCH && V_DISPATCH(&var) == NULL) ||
-        (V_VT(&var) == VT_UNKNOWN && V_UNKNOWN(&var) == NULL)) {
-        rb_raise(eWIN32OLERuntimeError, "argument does not have IDispatch or IUnknown Interface");
-    }
-    hr = SafeArrayPutElement(psa, pid, p);
-    if (FAILED(hr)) {
-        ole_raise(hr, eWIN32OLERuntimeError, "failed to SafeArrayPutElement");
-    }
-
-    unlock_safe_array(psa);
-    if (pid) free(pid);
-    return argv[argc-1];
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.value #=> Ruby object.
- *
- *  Returns Ruby object value from OLE variant.
- *     obj = WIN32OLE_VARIANT.new(1, WIN32OLE::VARIANT::VT_BSTR)
- *     obj.value # => "1" (not Fixnum object, but String object "1")
- *
- */     
-static VALUE
-folevariant_value(VALUE self)
-{
-    struct olevariantdata *pvar;
-    VALUE val = Qnil;
-    VARTYPE vt;
-    int dim;
-    SAFEARRAY *psa;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-
-    val = ole_variant2val(&(pvar->var));
-    vt = V_VT(&(pvar->var));
-
-    if ((vt & ~VT_BYREF) == (VT_UI1|VT_ARRAY)) {
-        if (vt & VT_BYREF) {
-            psa = *V_ARRAYREF(&(pvar->var));
-        } else {
-            psa  = V_ARRAY(&(pvar->var));
-        }
-        if (!psa) {
-            return val;
-        }
-        dim = SafeArrayGetDim(psa);
-        if (dim == 1) {
-            val = rb_funcall(val, rb_intern("pack"), 1, rb_str_new2("C*"));
-        }
-    }
-    return val;
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.vartype #=> OLE variant type.
- *
- *  Returns OLE variant type.
- *     obj = WIN32OLE_VARIANT.new("string")
- *     obj.vartype # => WIN32OLE::VARIANT::VT_BSTR 
- *
- */     
-static VALUE
-folevariant_vartype(VALUE self)
-{
-    struct olevariantdata *pvar;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-    return INT2FIX(V_VT(&pvar->var));
-}
-
-/*
- *  call-seq:
- *     WIN32OLE_VARIANT.value = val #=> set WIN32OLE_VARIANT value to val.
- *
- *  Sets variant value to val. If the val type does not match variant value 
- *  type(vartype), then val is changed to match variant value type(vartype) 
- *  before setting val.
- *  Thie method is not available when vartype is VT_ARRAY(except VT_UI1|VT_ARRAY).
- *  If the vartype is VT_UI1|VT_ARRAY, the val should be String object.
- *
- *     obj = WIN32OLE_VARIANT.new(1) # obj.vartype is WIN32OLE::VARIANT::VT_I4
- *     obj.value = 3.2 # 3.2 is changed to 3 when setting value.
- *     p obj.value # => 3 
- */     
-static VALUE
-folevariant_set_value(VALUE self, VALUE val)
-{
-    struct olevariantdata *pvar;
-    VARTYPE vt;
-    Data_Get_Struct(self, struct olevariantdata, pvar);
-    vt = V_VT(&(pvar->var));
-    if (V_ISARRAY(&(pvar->var)) && ((vt & ~VT_BYREF) != (VT_UI1|VT_ARRAY) || TYPE(val) != T_STRING)) {
-        rb_raise(eWIN32OLERuntimeError, 
-                 "`value=' is not available for this variant type object");
-    }
-    ole_val2olevariantdata(val, vt, pvar);
-    return Qnil;
-}
-
-static void 
-init_enc2cp()
-{
-    enc2cp_table = st_init_numtable();
-}
-
-static void
-free_enc2cp()
-{
-    st_free_table(enc2cp_table);
-}
 
 void
 Init_win32ole()
 {
+    rb_global_variable(&ary_ole_event);
     ary_ole_event = rb_ary_new();
-    rb_register_mark_object(ary_ole_event);
     id_events = rb_intern("events");
 
+    rb_global_variable(&com_hash);
     com_vtbl.QueryInterface = QueryInterface;
     com_vtbl.AddRef = AddRef;
     com_vtbl.Release = Release;
@@ -8702,9 +6293,8 @@ Init_win32ole()
     message_filter.HandleInComingCall = mf_HandleInComingCall;
     message_filter.RetryRejectedCall = mf_RetryRejectedCall;
     message_filter.MessagePending = mf_MessagePending;
- 
+
     com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
-    rb_register_mark_object(com_hash);
 
     cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);
 
@@ -8720,18 +6310,16 @@ Init_win32ole()
     rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1);
     rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0);
     rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1);
-    rb_define_singleton_method(cWIN32OLE, "locale", fole_s_get_locale, 0);
-    rb_define_singleton_method(cWIN32OLE, "locale=", fole_s_set_locale, 1);
-    rb_define_singleton_method(cWIN32OLE, "create_guid", fole_s_create_guid, 0);
+
 
     rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1);
-    rb_define_method(cWIN32OLE, "[]", fole_getproperty_with_bracket, -1);
+    rb_define_method(cWIN32OLE, "[]", fole_getproperty, -1);
     rb_define_method(cWIN32OLE, "_invoke", fole_invoke2, 3);
     rb_define_method(cWIN32OLE, "_getproperty", fole_getproperty2, 3);
     rb_define_method(cWIN32OLE, "_setproperty", fole_setproperty2, 3);
 
     /* support propput method that takes an argument */
-    rb_define_method(cWIN32OLE, "[]=", fole_setproperty_with_bracket, -1); 
+    rb_define_method(cWIN32OLE, "[]=", fole_setproperty, -1); 
 
     rb_define_method(cWIN32OLE, "ole_free", fole_free, 0);
 
@@ -8748,30 +6336,20 @@ Init_win32ole()
 
     rb_define_method(cWIN32OLE, "ole_method", fole_method_help, 1);
     rb_define_alias(cWIN32OLE, "ole_method_help", "ole_method");
+    rb_define_method(cWIN32OLE, "ole_obj_help", fole_obj_help, 0);
     rb_define_method(cWIN32OLE, "ole_activex_initialize", fole_activex_initialize, 0);
-    rb_define_method(cWIN32OLE, "ole_type", fole_type, 0);
-    rb_define_alias(cWIN32OLE, "ole_obj_help", "ole_type");
-    rb_define_method(cWIN32OLE, "ole_typelib", fole_typelib, 0);
-    rb_define_method(cWIN32OLE, "ole_query_interface", fole_query_interface, 1);
-    rb_define_method(cWIN32OLE, "ole_respond_to?", fole_respond_to, 1);
 
     rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION));
     rb_define_const(cWIN32OLE, "ARGV", rb_ary_new());
-
-    rb_define_const(cWIN32OLE, "CP_ACP", INT2FIX(CP_ACP));
-    rb_define_const(cWIN32OLE, "CP_OEMCP", INT2FIX(CP_OEMCP));
-    rb_define_const(cWIN32OLE, "CP_MACCP", INT2FIX(CP_MACCP));
-    rb_define_const(cWIN32OLE, "CP_THREAD_ACP", INT2FIX(CP_THREAD_ACP));
-    rb_define_const(cWIN32OLE, "CP_SYMBOL", INT2FIX(CP_SYMBOL));
-    rb_define_const(cWIN32OLE, "CP_UTF7", INT2FIX(CP_UTF7));
-    rb_define_const(cWIN32OLE, "CP_UTF8", INT2FIX(CP_UTF8));
-
-    rb_define_const(cWIN32OLE, "LOCALE_SYSTEM_DEFAULT", INT2FIX(LOCALE_SYSTEM_DEFAULT));
-    rb_define_const(cWIN32OLE, "LOCALE_USER_DEFAULT", INT2FIX(LOCALE_USER_DEFAULT));
+    rb_define_const(cWIN32OLE, "CP_ACP"       ,INT2FIX(CP_ACP));
+    rb_define_const(cWIN32OLE, "CP_OEMCP"     ,INT2FIX(CP_OEMCP));
+    rb_define_const(cWIN32OLE, "CP_MACCP"     ,INT2FIX(CP_MACCP));
+    rb_define_const(cWIN32OLE, "CP_THREAD_ACP",INT2FIX(CP_THREAD_ACP));
+    rb_define_const(cWIN32OLE, "CP_SYMBOL"    ,INT2FIX(CP_SYMBOL));
+    rb_define_const(cWIN32OLE, "CP_UTF7"      ,INT2FIX(CP_UTF7));
+    rb_define_const(cWIN32OLE, "CP_UTF8"      ,INT2FIX(CP_UTF8));
 
     mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT");
-    rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL));
     rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));
     rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4));
     rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4));
@@ -8790,30 +6368,10 @@ Init_win32ole()
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI1", INT2FIX(VT_UI1));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI2", INT2FIX(VT_UI2));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UI4", INT2FIX(VT_UI4));
-#if (_MSC_VER >= 1300) || defined(__CYGWIN__) || defined(__MINGW32__)
-    rb_define_const(mWIN32OLE_VARIANT, "VT_I8", INT2FIX(VT_I8));
-    rb_define_const(mWIN32OLE_VARIANT, "VT_UI8", INT2FIX(VT_UI8));
-#endif
     rb_define_const(mWIN32OLE_VARIANT, "VT_INT", INT2FIX(VT_INT));
     rb_define_const(mWIN32OLE_VARIANT, "VT_UINT", INT2FIX(VT_UINT));
     rb_define_const(mWIN32OLE_VARIANT, "VT_ARRAY", INT2FIX(VT_ARRAY));
     rb_define_const(mWIN32OLE_VARIANT, "VT_BYREF", INT2FIX(VT_BYREF));
-
-    cWIN32OLE_TYPELIB = rb_define_class("WIN32OLE_TYPELIB", rb_cObject);
-    rb_define_singleton_method(cWIN32OLE_TYPELIB, "typelibs", foletypelib_s_typelibs, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "initialize", foletypelib_initialize, -2);
-    rb_define_method(cWIN32OLE_TYPELIB, "guid", foletypelib_guid, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "name", foletypelib_name, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "version", foletypelib_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "major_version", foletypelib_major_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "minor_version", foletypelib_minor_version, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "path", foletypelib_path, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "ole_types", foletypelib_ole_types, 0);
-    rb_define_alias(cWIN32OLE_TYPELIB, "ole_classes", "ole_types");
-    rb_define_method(cWIN32OLE_TYPELIB, "visible?", foletypelib_visible, 0);
-    rb_define_method(cWIN32OLE_TYPELIB, "library_name", foletypelib_library_name, 0);
-    rb_define_alias(cWIN32OLE_TYPELIB, "to_s", "name");
-    rb_define_method(cWIN32OLE_TYPELIB, "inspect", foletypelib_inspect, 0);
     
     cWIN32OLE_TYPE = rb_define_class("WIN32OLE_TYPE", rb_cObject);
     rb_define_singleton_method(cWIN32OLE_TYPE, "ole_classes", foletype_s_ole_classes, 1);
@@ -8827,6 +6385,7 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_TYPE, "progid", foletype_progid, 0);
     rb_define_method(cWIN32OLE_TYPE, "visible?", foletype_visible, 0);
     rb_define_alias(cWIN32OLE_TYPE, "to_s", "name");
+
     rb_define_method(cWIN32OLE_TYPE, "major_version", foletype_major_version, 0);
     rb_define_method(cWIN32OLE_TYPE, "minor_version", foletype_minor_version, 0);
     rb_define_method(cWIN32OLE_TYPE, "typekind", foletype_typekind, 0);
@@ -8835,13 +6394,7 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_TYPE, "helpfile", foletype_helpfile, 0);
     rb_define_method(cWIN32OLE_TYPE, "helpcontext", foletype_helpcontext, 0);
     rb_define_method(cWIN32OLE_TYPE, "variables", foletype_variables, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, 0);
-    rb_define_method(cWIN32OLE_TYPE, "ole_typelib", foletype_ole_typelib, 0);
-    rb_define_method(cWIN32OLE_TYPE, "implemented_ole_types", foletype_impl_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "source_ole_types", foletype_source_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "default_event_sources", foletype_default_event_sources, 0);
-    rb_define_method(cWIN32OLE_TYPE, "default_ole_types", foletype_default_ole_types, 0);
-    rb_define_method(cWIN32OLE_TYPE, "inspect", foletype_inspect, 0);
+    rb_define_method(cWIN32OLE_TYPE, "ole_methods", foletype_methods, -1);
 
     cWIN32OLE_VARIABLE = rb_define_class("WIN32OLE_VARIABLE", rb_cObject);
     rb_define_method(cWIN32OLE_VARIABLE, "name", folevariable_name, 0);
@@ -8851,12 +6404,12 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_VARIABLE, "visible?", folevariable_visible, 0);
     rb_define_method(cWIN32OLE_VARIABLE, "variable_kind", folevariable_variable_kind, 0);
     rb_define_method(cWIN32OLE_VARIABLE, "varkind", folevariable_varkind, 0);
-    rb_define_method(cWIN32OLE_VARIABLE, "inspect", folevariable_inspect, 0);
     rb_define_alias(cWIN32OLE_VARIABLE, "to_s", "name");
 
     cWIN32OLE_METHOD = rb_define_class("WIN32OLE_METHOD", rb_cObject);
     rb_define_alloc_func(cWIN32OLE_METHOD, folemethod_s_allocate);
     rb_define_method(cWIN32OLE_METHOD, "initialize", folemethod_initialize, 2);
+
     rb_define_method(cWIN32OLE_METHOD, "name", folemethod_name, 0);
     rb_define_method(cWIN32OLE_METHOD, "return_type", folemethod_return_type, 0);
     rb_define_method(cWIN32OLE_METHOD, "return_vtype", folemethod_return_vtype, 0);
@@ -8875,7 +6428,6 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_METHOD, "size_opt_params", folemethod_size_opt_params, 0);
     rb_define_method(cWIN32OLE_METHOD, "params", folemethod_params, 0);
     rb_define_alias(cWIN32OLE_METHOD, "to_s", "name");
-    rb_define_method(cWIN32OLE_METHOD, "inspect", folemethod_inspect, 0);
 
     cWIN32OLE_PARAM = rb_define_class("WIN32OLE_PARAM", rb_cObject);
     rb_define_method(cWIN32OLE_PARAM, "name", foleparam_name, 0);
@@ -8887,34 +6439,14 @@ Init_win32ole()
     rb_define_method(cWIN32OLE_PARAM, "retval?", foleparam_retval, 0);
     rb_define_method(cWIN32OLE_PARAM, "default", foleparam_default, 0);
     rb_define_alias(cWIN32OLE_PARAM, "to_s", "name");
-    rb_define_method(cWIN32OLE_PARAM, "inspect", foleparam_inspect, 0);
  
     cWIN32OLE_EVENT = rb_define_class("WIN32OLE_EVENT", rb_cObject);
-    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
+
     rb_define_alloc_func(cWIN32OLE_EVENT, fev_s_allocate);
     rb_define_method(cWIN32OLE_EVENT, "initialize", fev_initialize, -1);
+    rb_define_singleton_method(cWIN32OLE_EVENT, "message_loop", fev_s_msg_loop, 0);
+
     rb_define_method(cWIN32OLE_EVENT, "on_event", fev_on_event, -1);
     rb_define_method(cWIN32OLE_EVENT, "on_event_with_outargs", fev_on_event_with_outargs, -1);
-    rb_define_method(cWIN32OLE_EVENT, "off_event", fev_off_event, -1);
-    rb_define_method(cWIN32OLE_EVENT, "unadvise", fev_unadvise, 0);
-
-    cWIN32OLE_VARIANT = rb_define_class("WIN32OLE_VARIANT", rb_cObject);
-    rb_define_alloc_func(cWIN32OLE_VARIANT, folevariant_s_allocate);
-    rb_define_singleton_method(cWIN32OLE_VARIANT, "array", folevariant_s_array, 2);
-    rb_define_method(cWIN32OLE_VARIANT, "initialize", folevariant_initialize, -2);
-    rb_define_method(cWIN32OLE_VARIANT, "value", folevariant_value, 0);
-    rb_define_method(cWIN32OLE_VARIANT, "value=", folevariant_set_value, 1);
-    rb_define_method(cWIN32OLE_VARIANT, "vartype", folevariant_vartype, 0);
-    rb_define_method(cWIN32OLE_VARIANT, "[]", folevariant_ary_aref, -1);
-    rb_define_method(cWIN32OLE_VARIANT, "[]=", folevariant_ary_aset, -1);
-    rb_define_const(cWIN32OLE_VARIANT, "Empty", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_EMPTY)));
-    rb_define_const(cWIN32OLE_VARIANT, "Null", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_NULL)));
-    rb_define_const(cWIN32OLE_VARIANT, "Nothing", rb_funcall(cWIN32OLE_VARIANT, rb_intern("new"), 2, Qnil, INT2FIX(VT_DISPATCH)));
-
-    eWIN32OLERuntimeError = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
-
-    init_enc2cp();
-    atexit((void (*)(void))free_enc2cp);
-    ole_init_cp();
-    cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
+    eWIN32OLE_RUNTIME_ERROR = rb_define_class("WIN32OLERuntimeError", rb_eRuntimeError);
 }
diff --git a/ext/zlib/.cvsignore b/ext/zlib/.cvsignore
index 814345ece8..4088712231 100644
--- a/ext/zlib/.cvsignore
+++ b/ext/zlib/.cvsignore
@@ -1,4 +1,3 @@
 Makefile
 mkmf.log
 *.def
-extconf.h
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 636ec325ce..306e267856 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -31,7 +31,7 @@
 
 /*--------- Prototypes --------*/
 
-static NORETURN(void raise_zlib_error _((int, const char*)));
+static NORETURN(void raise_zlib_error _((int, const char *)));
 static VALUE rb_zlib_version _((VALUE));
 static VALUE do_checksum _((int, VALUE*, uLong (*) _((uLong, const Bytef*, uInt))));
 static VALUE rb_zlib_adler32 _((int, VALUE*, VALUE));
@@ -43,14 +43,14 @@ static void finalizer_warn _((const char*));
 
 struct zstream;
 struct zstream_funcs;
-static void zstream_init _((struct zstream*, const struct zstream_funcs*));
+static void zstream_init _((struct zstream*, const struct zstream_funcs *));
 static void zstream_expand_buffer _((struct zstream*));
 static void zstream_expand_buffer_into _((struct zstream*, int));
-static void zstream_append_buffer _((struct zstream*, const Bytef*, int));
+static void zstream_append_buffer _((struct zstream*, const char*, int));
 static VALUE zstream_detach_buffer _((struct zstream*));
 static VALUE zstream_shift_buffer _((struct zstream*, int));
 static void zstream_buffer_ungetc _((struct zstream*, int));
-static void zstream_append_input _((struct zstream*, const Bytef*, unsigned int));
+static void zstream_append_input _((struct zstream*, const char*, unsigned int));
 static void zstream_discard_input _((struct zstream*, unsigned int));
 static void zstream_reset_input _((struct zstream*));
 static void zstream_passthrough_input _((struct zstream*));
@@ -111,8 +111,6 @@ static VALUE gzfile_new _((VALUE, const struct zstream_funcs*, void (*) _((struc
 static void gzfile_reset _((struct gzfile*));
 static void gzfile_close _((struct gzfile*, int));
 static void gzfile_write_raw _((struct gzfile*));
-static VALUE gzfile_read_raw_partial _((VALUE));
-static VALUE gzfile_read_raw_rescue _((VALUE));
 static VALUE gzfile_read_raw _((struct gzfile*));
 static int gzfile_read_raw_ensure _((struct gzfile*, int));
 static char *gzfile_read_raw_until_zero _((struct gzfile*, long));
@@ -197,7 +195,9 @@ static VALUE cZError, cStreamEnd, cNeedDict;
 static VALUE cStreamError, cDataError, cMemError, cBufError, cVersionError;
 
 static void
-raise_zlib_error(int err, const char *msg)
+raise_zlib_error(err, msg)
+    int err;
+    const char *msg;
 {
     VALUE exc;
 
@@ -245,7 +245,8 @@ raise_zlib_error(int err, const char *msg)
 /*--- Warning (in finalizer) ---*/
 
 static void
-finalizer_warn(const char *msg)
+finalizer_warn(msg)
+    const char *msg;
 {
     fprintf(stderr, "zlib(finalizer): %s\n", msg);
 }
@@ -257,7 +258,8 @@ finalizer_warn(const char *msg)
  * Returns the string which represents the version of zlib library.
  */
 static VALUE
-rb_zlib_version(VALUE klass)
+rb_zlib_version(klass)
+    VALUE klass;
 {
     VALUE str;
 
@@ -270,7 +272,7 @@ static VALUE
 do_checksum(argc, argv, func)
     int argc;
     VALUE *argv;
-    uLong (*func) _((uLong, const Bytef*, uInt));
+    uLong (*func) _((uLong, const Bytef *, uInt));
 {
     VALUE str, vsum;
     unsigned long sum;
@@ -292,7 +294,7 @@ do_checksum(argc, argv, func)
     }
     else {
 	StringValue(str);
-	sum = func(sum, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
+	sum = func(sum, RSTRING(str)->ptr, RSTRING(str)->len);
     }
     return rb_uint2inum(sum);
 }
@@ -307,7 +309,10 @@ do_checksum(argc, argv, func)
  * FIXME: expression.
  */
 static VALUE
-rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
+rb_zlib_adler32(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     return do_checksum(argc, argv, adler32);
 }
@@ -322,7 +327,10 @@ rb_zlib_adler32(int argc, VALUE *argv, VALUE klass)
  * FIXME: expression.
  */
 static VALUE
-rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
+rb_zlib_crc32(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     return do_checksum(argc, argv, crc32);
 }
@@ -331,7 +339,8 @@ rb_zlib_crc32(int argc, VALUE *argv, VALUE klass)
  * Returns the table for calculating CRC checksum as an array.
  */
 static VALUE
-rb_zlib_crc_table(VALUE obj)
+rb_zlib_crc_table(obj)
+    VALUE obj;
 {
     const unsigned long *crctbl;
     VALUE dst;
@@ -390,19 +399,24 @@ static const struct zstream_funcs inflate_funcs = {
 
 
 static voidpf
-zlib_mem_alloc(voidpf opaque, uInt items, uInt size)
+zlib_mem_alloc(opaque, items, size)
+    voidpf opaque;
+    uInt items, size;
 {
     return xmalloc(items * size);
 }
 
 static void
-zlib_mem_free(voidpf opaque, voidpf address)
+zlib_mem_free(opaque, address)
+    voidpf opaque, address;
 {
-    xfree(address);
+    free(address);
 }
 
 static void
-zstream_init(struct zstream *z, const struct zstream_funcs *func)
+zstream_init(z, func)
+    struct zstream *z;
+    const struct zstream_funcs *func;
 {
     z->flags = 0;
     z->buf = Qnil;
@@ -423,7 +437,8 @@ zstream_init(struct zstream *z, const struct zstream_funcs *func)
 #define zstream_init_inflate(z)   zstream_init((z), &inflate_funcs)
 
 static void
-zstream_expand_buffer(struct zstream *z)
+zstream_expand_buffer(z)
+    struct zstream *z;
 {
     long inc;
 
@@ -432,13 +447,13 @@ zstream_expand_buffer(struct zstream *z)
 	       rb_str_buf_new makes a zero-length string. */
 	z->buf = rb_str_new(0, ZSTREAM_INITIAL_BUFSIZE);
 	z->buf_filled = 0;
-	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+	z->stream.next_out = RSTRING(z->buf)->ptr;
 	z->stream.avail_out = ZSTREAM_INITIAL_BUFSIZE;
 	RBASIC(z->buf)->klass = 0;
 	return;
     }
 
-    if (RSTRING_LEN(z->buf) - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
+    if (RSTRING(z->buf)->len - z->buf_filled >= ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	/* to keep other threads from freezing */
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -451,42 +466,47 @@ zstream_expand_buffer(struct zstream *z)
 	z->stream.avail_out = (inc < ZSTREAM_AVAIL_OUT_STEP_MAX) ?
 	    inc : ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
 }
 
 static void
-zstream_expand_buffer_into(struct zstream *z, int size)
+zstream_expand_buffer_into(z, size)
+    struct zstream *z;
+    int size;
 {
     if (NIL_P(z->buf)) {
 	/* I uses rb_str_new here not rb_str_buf_new because
 	   rb_str_buf_new makes a zero-length string. */
 	z->buf = rb_str_new(0, size);
 	z->buf_filled = 0;
-	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+	z->stream.next_out = RSTRING(z->buf)->ptr;
 	z->stream.avail_out = size;
 	RBASIC(z->buf)->klass = 0;
     }
     else if (z->stream.avail_out != size) {
 	rb_str_resize(z->buf, z->buf_filled + size);
-	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+	z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
 	z->stream.avail_out = size;
     }
 }
 
 static void
-zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
+zstream_append_buffer(z, src, len)
+    struct zstream *z;
+    const char *src;
+    int len;
 {
     if (NIL_P(z->buf)) {
 	z->buf = rb_str_buf_new(len);
-	rb_str_buf_cat(z->buf, (const char*)src, len);
+	rb_str_buf_cat(z->buf, src, len);
 	z->buf_filled = len;
-	z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf);
+	z->stream.next_out = RSTRING(z->buf)->ptr;
 	z->stream.avail_out = 0;
 	RBASIC(z->buf)->klass = 0;
 	return;
     }
 
-    if (RSTRING_LEN(z->buf) < z->buf_filled + len) {
+    if (RSTRING(z->buf)->len < z->buf_filled + len) {
 	rb_str_resize(z->buf, z->buf_filled + len);
 	z->stream.avail_out = 0;
     }
@@ -498,16 +518,17 @@ zstream_append_buffer(struct zstream *z, const Bytef *src, int len)
 	    z->stream.avail_out = 0;
 	}
     }
-    memcpy(RSTRING_PTR(z->buf) + z->buf_filled, src, len);
+    memcpy(RSTRING(z->buf)->ptr + z->buf_filled, src, len);
     z->buf_filled += len;
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
 }
 
 #define zstream_append_buffer2(z,v) \
-    zstream_append_buffer((z),(Bytef*)RSTRING_PTR(v),RSTRING_LEN(v))
+    zstream_append_buffer((z),RSTRING(v)->ptr,RSTRING(v)->len)
 
 static VALUE
-zstream_detach_buffer(struct zstream *z)
+zstream_detach_buffer(z)
+    struct zstream *z;
 {
     VALUE dst;
 
@@ -528,7 +549,9 @@ zstream_detach_buffer(struct zstream *z)
 }
 
 static VALUE
-zstream_shift_buffer(struct zstream *z, int len)
+zstream_shift_buffer(z, len)
+    struct zstream *z;
+    int len;
 {
     VALUE dst;
 
@@ -539,10 +562,10 @@ zstream_shift_buffer(struct zstream *z, int len)
     dst = rb_str_substr(z->buf, 0, len);
     RBASIC(dst)->klass = rb_cString;
     z->buf_filled -= len;
-    memmove(RSTRING_PTR(z->buf), RSTRING_PTR(z->buf) + len,
+    memmove(RSTRING(z->buf)->ptr, RSTRING(z->buf)->ptr + len,
 	    z->buf_filled);
-    z->stream.next_out = (Bytef*)RSTRING_PTR(z->buf) + z->buf_filled;
-    z->stream.avail_out = RSTRING_LEN(z->buf) - z->buf_filled;
+    z->stream.next_out = RSTRING(z->buf)->ptr + z->buf_filled;
+    z->stream.avail_out = RSTRING(z->buf)->len - z->buf_filled;
     if (z->stream.avail_out > ZSTREAM_AVAIL_OUT_STEP_MAX) {
 	z->stream.avail_out = ZSTREAM_AVAIL_OUT_STEP_MAX;
     }
@@ -551,14 +574,16 @@ zstream_shift_buffer(struct zstream *z, int len)
 }
 
 static void
-zstream_buffer_ungetc(struct zstream *z, int c)
+zstream_buffer_ungetc(z, c)
+    struct zstream *z;
+    int c;
 {
-    if (NIL_P(z->buf) || RSTRING_LEN(z->buf) - z->buf_filled == 0) {
+    if (NIL_P(z->buf) || RSTRING(z->buf)->len - z->buf_filled == 0) {
 	zstream_expand_buffer(z);
     }
 
-    memmove(RSTRING_PTR(z->buf) + 1, RSTRING_PTR(z->buf), z->buf_filled);
-    RSTRING_PTR(z->buf)[0] = (char)c;
+    memmove(RSTRING(z->buf)->ptr + 1, RSTRING(z->buf)->ptr, z->buf_filled);
+    RSTRING(z->buf)->ptr[0] = (char)c;
     z->buf_filled++;
     if (z->stream.avail_out > 0) {
 	z->stream.next_out++;
@@ -567,44 +592,51 @@ zstream_buffer_ungetc(struct zstream *z, int c)
 }
 
 static void
-zstream_append_input(struct zstream *z, const Bytef *src, unsigned int len)
+zstream_append_input(z, src, len)
+    struct zstream *z;
+    const char *src;
+    unsigned int len;
 {
     if (len <= 0) return;
 
     if (NIL_P(z->input)) {
 	z->input = rb_str_buf_new(len);
-	rb_str_buf_cat(z->input, (const char*)src, len);
+	rb_str_buf_cat(z->input, src, len);
 	RBASIC(z->input)->klass = 0;
     }
     else {
-	rb_str_buf_cat(z->input, (const char*)src, len);
+	rb_str_buf_cat(z->input, src, len);
     }
 }
 
 #define zstream_append_input2(z,v)\
-    zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
+    zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
 
 static void
-zstream_discard_input(struct zstream *z, unsigned int len)
+zstream_discard_input(z, len)
+    struct zstream *z;
+    unsigned int len;
 {
-    if (NIL_P(z->input) || RSTRING_LEN(z->input) <= len) {
+    if (NIL_P(z->input) || RSTRING(z->input)->len <= len) {
 	z->input = Qnil;
     }
     else {
-	memmove(RSTRING_PTR(z->input), RSTRING_PTR(z->input) + len,
-		RSTRING_LEN(z->input) - len);
-	rb_str_resize(z->input, RSTRING_LEN(z->input) - len);
+	memmove(RSTRING(z->input)->ptr, RSTRING(z->input)->ptr + len,
+		RSTRING(z->input)->len - len);
+	rb_str_resize(z->input, RSTRING(z->input)->len - len);
     }
 }
 
 static void
-zstream_reset_input(struct zstream *z)
+zstream_reset_input(z)
+    struct zstream *z;
 {
     z->input = Qnil;
 }
 
 static void
-zstream_passthrough_input(struct zstream *z)
+zstream_passthrough_input(z)
+    struct zstream *z;
 {
     if (!NIL_P(z->input)) {
 	zstream_append_buffer2(z, z->input);
@@ -613,7 +645,8 @@ zstream_passthrough_input(struct zstream *z)
 }
 
 static VALUE
-zstream_detach_input(struct zstream *z)
+zstream_detach_input(z)
+    struct zstream *z;
 {
     VALUE dst;
 
@@ -625,12 +658,12 @@ zstream_detach_input(struct zstream *z)
 	RBASIC(dst)->klass = rb_cString;
     }
     z->input = Qnil;
-    RBASIC(dst)->klass = rb_cString;
     return dst;
 }
 
 static void
-zstream_reset(struct zstream *z)
+zstream_reset(z)
+    struct zstream *z;
 {
     int err;
 
@@ -647,7 +680,8 @@ zstream_reset(struct zstream *z)
 }
 
 static VALUE
-zstream_end(struct zstream *z)
+zstream_end(z)
+    struct zstream *z;
 {
     int err;
 
@@ -670,20 +704,24 @@ zstream_end(struct zstream *z)
 }
 
 static void
-zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
+zstream_run(z, src, len, flush)
+    struct zstream *z;
+    Bytef *src;
+    uInt len;
+    int flush;
 {
     uInt n;
     int err;
     volatile VALUE guard;
 
     if (NIL_P(z->input) && len == 0) {
-	z->stream.next_in = (Bytef*)"";
+	z->stream.next_in = "";
 	z->stream.avail_in = 0;
     }
     else {
 	zstream_append_input(z, src, len);
-	z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
-	z->stream.avail_in = RSTRING_LEN(z->input);
+	z->stream.next_in = RSTRING(z->input)->ptr;
+	z->stream.avail_in = RSTRING(z->input)->len;
 	/* keep reference to `z->input' so as not to be garbage collected
 	   after zstream_reset_input() and prevent `z->stream.next_in'
 	   from dangling. */
@@ -732,24 +770,27 @@ zstream_run(struct zstream *z, Bytef *src, uInt len, int flush)
 }
 
 static VALUE
-zstream_sync(struct zstream *z, Bytef *src, uInt len)
+zstream_sync(z, src, len)
+    struct zstream *z;
+    Bytef *src;
+    uInt len;
 {
     VALUE rest;
     int err;
 
     if (!NIL_P(z->input)) {
-	z->stream.next_in = (Bytef*)RSTRING_PTR(z->input);
-	z->stream.avail_in = RSTRING_LEN(z->input);
+	z->stream.next_in = RSTRING(z->input)->ptr;
+	z->stream.avail_in = RSTRING(z->input)->len;
 	err = inflateSync(&z->stream);
 	if (err == Z_OK) {
 	    zstream_discard_input(z,
-				  RSTRING_LEN(z->input) - z->stream.avail_in);
+				  RSTRING(z->input)->len - z->stream.avail_in);
 	    zstream_append_input(z, src, len);
 	    return Qtrue;
 	}
 	zstream_reset_input(z);
 	if (err != Z_DATA_ERROR) {
-	    rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
+	    rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
 	    raise_zlib_error(err, z->stream.msg);
 	}
     }
@@ -764,21 +805,23 @@ zstream_sync(struct zstream *z, Bytef *src, uInt len)
 	return Qtrue;
     }
     if (err != Z_DATA_ERROR) {
-	rest = rb_str_new((char*)z->stream.next_in, z->stream.avail_in);
+	rest = rb_str_new(z->stream.next_in, z->stream.avail_in);
 	raise_zlib_error(err, z->stream.msg);
     }
     return Qfalse;
 }
 
 static void
-zstream_mark(struct zstream *z)
+zstream_mark(z)
+    struct zstream *z;
 {
     rb_gc_mark(z->buf);
     rb_gc_mark(z->input);
 }
 
 static void
-zstream_finalize(struct zstream *z)
+zstream_finalize(z)
+    struct zstream *z;
 {
     int err = z->func->end(&z->stream);
     if (err == Z_STREAM_ERROR)
@@ -788,16 +831,19 @@ zstream_finalize(struct zstream *z)
 }
 
 static void
-zstream_free(struct zstream *z)
+zstream_free(z)
+    struct zstream *z;
 {
     if (ZSTREAM_IS_READY(z)) {
 	zstream_finalize(z);
     }
-    xfree(z);
+    free(z);
 }
 
 static VALUE
-zstream_new(VALUE klass, const struct zstream_funcs *funcs)
+zstream_new(klass, funcs)
+    VALUE klass;
+    const struct zstream_funcs *funcs;
 {
     VALUE obj;
     struct zstream *z;
@@ -812,7 +858,8 @@ zstream_new(VALUE klass, const struct zstream_funcs *funcs)
 #define zstream_inflate_new(klass)  zstream_new((klass), &inflate_funcs)
 
 static struct zstream *
-get_zstream(VALUE obj)
+get_zstream(obj)
+    VALUE obj;
 {
     struct zstream *z;
 
@@ -892,7 +939,8 @@ get_zstream(VALUE obj)
  * exception.
  */
 static VALUE
-rb_zstream_end(VALUE obj)
+rb_zstream_end(obj)
+    VALUE obj;
 {
     zstream_end(get_zstream(obj));
     return Qnil;
@@ -903,7 +951,8 @@ rb_zstream_end(VALUE obj)
  * are discarded.
  */
 static VALUE
-rb_zstream_reset(VALUE obj)
+rb_zstream_reset(obj)
+    VALUE obj;
 {
     zstream_reset(get_zstream(obj));
     return Qnil;
@@ -914,12 +963,13 @@ rb_zstream_reset(VALUE obj)
  * Zlib::Inflate#finish for details of this behavior.
  */
 static VALUE
-rb_zstream_finish(VALUE obj)
+rb_zstream_finish(obj)
+    VALUE obj;
 {
     struct zstream *z = get_zstream(obj);
     VALUE dst;
 
-    zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+    zstream_run(z, "", 0, Z_FINISH);
     dst = zstream_detach_buffer(z);
 
     OBJ_INFECT(dst, obj);
@@ -930,7 +980,8 @@ rb_zstream_finish(VALUE obj)
  * Flushes input buffer and returns all data in that buffer.
  */
 static VALUE
-rb_zstream_flush_next_in(VALUE obj)
+rb_zstream_flush_next_in(obj)
+    VALUE obj;
 {
     struct zstream *z;
     VALUE dst;
@@ -945,7 +996,8 @@ rb_zstream_flush_next_in(VALUE obj)
  * Flushes output buffer and returns all data in that buffer.
  */
 static VALUE
-rb_zstream_flush_next_out(VALUE obj)
+rb_zstream_flush_next_out(obj)
+    VALUE obj;
 {
     struct zstream *z;
     VALUE dst;
@@ -961,7 +1013,8 @@ rb_zstream_flush_next_out(VALUE obj)
  * space is allocated automatically, this method returns 0 normally.
  */
 static VALUE
-rb_zstream_avail_out(VALUE obj)
+rb_zstream_avail_out(obj)
+    VALUE obj;
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
@@ -975,7 +1028,8 @@ rb_zstream_avail_out(VALUE obj)
  * method.
  */
 static VALUE
-rb_zstream_set_avail_out(VALUE obj, VALUE size)
+rb_zstream_set_avail_out(obj, size)
+    VALUE obj, size;
 {
     struct zstream *z = get_zstream(obj);
 
@@ -988,18 +1042,20 @@ rb_zstream_set_avail_out(VALUE obj, VALUE size)
  * Returns bytes of data in the input buffer. Normally, returns 0.
  */
 static VALUE
-rb_zstream_avail_in(VALUE obj)
+rb_zstream_avail_in(obj)
+    VALUE obj;
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
-    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING_LEN(z->input)));
+    return INT2FIX(NIL_P(z->input) ? 0 : (int)(RSTRING(z->input)->len));
 }
 
 /*
  * Returns the total bytes of the input data to the stream.  FIXME
  */
 static VALUE
-rb_zstream_total_in(VALUE obj)
+rb_zstream_total_in(obj)
+    VALUE obj;
 {
     return rb_uint2inum(get_zstream(obj)->stream.total_in);
 }
@@ -1008,7 +1064,8 @@ rb_zstream_total_in(VALUE obj)
  * Returns the total bytes of the output data from the stream.  FIXME
  */
 static VALUE
-rb_zstream_total_out(VALUE obj)
+rb_zstream_total_out(obj)
+    VALUE obj;
 {
     return rb_uint2inum(get_zstream(obj)->stream.total_out);
 }
@@ -1019,7 +1076,8 @@ rb_zstream_total_out(VALUE obj)
  * <tt>Zlib::UNKNOWN</tt>.
  */
 static VALUE
-rb_zstream_data_type(VALUE obj)
+rb_zstream_data_type(obj)
+    VALUE obj;
 {
     return INT2FIX(get_zstream(obj)->stream.data_type);
 }
@@ -1028,7 +1086,8 @@ rb_zstream_data_type(VALUE obj)
  * Returns the adler-32 checksum.
  */
 static VALUE
-rb_zstream_adler(VALUE obj)
+rb_zstream_adler(obj)
+    VALUE obj;
 {
 	return rb_uint2inum(get_zstream(obj)->stream.adler);
 }
@@ -1037,7 +1096,8 @@ rb_zstream_adler(VALUE obj)
  * Returns true if the stream is finished.
  */
 static VALUE
-rb_zstream_finished_p(VALUE obj)
+rb_zstream_finished_p(obj)
+    VALUE obj;
 {
     return ZSTREAM_IS_FINISHED(get_zstream(obj)) ? Qtrue : Qfalse;
 }
@@ -1046,7 +1106,8 @@ rb_zstream_finished_p(VALUE obj)
  * Returns true if the stream is closed.
  */
 static VALUE
-rb_zstream_closed_p(VALUE obj)
+rb_zstream_closed_p(obj)
+    VALUE obj;
 {
     struct zstream *z;
     Data_Get_Struct(obj, struct zstream, z);
@@ -1075,7 +1136,8 @@ rb_zstream_closed_p(VALUE obj)
 
 
 static VALUE
-rb_deflate_s_allocate(VALUE klass)
+rb_deflate_s_allocate(klass)
+    VALUE klass;
 {
     return zstream_deflate_new(klass);
 }
@@ -1090,7 +1152,10 @@ rb_deflate_s_allocate(VALUE klass)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
+rb_deflate_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct zstream *z;
     VALUE level, wbits, memlevel, strategy;
@@ -1114,7 +1179,8 @@ rb_deflate_initialize(int argc, VALUE *argv, VALUE obj)
  * Duplicates the deflate stream.
  */
 static VALUE
-rb_deflate_init_copy(VALUE self, VALUE orig)
+rb_deflate_init_copy(self, orig)
+    VALUE self, orig;
 {
     struct zstream *z1, *z2;
     int err;
@@ -1135,12 +1201,13 @@ rb_deflate_init_copy(VALUE self, VALUE orig)
 }
 
 static VALUE
-deflate_run(VALUE args)
+deflate_run(args)
+    VALUE args;
 {
-    struct zstream *z = (struct zstream*)((VALUE*)args)[0];
-    VALUE src = ((VALUE*)args)[1];
+    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+    VALUE src = ((VALUE *)args)[1];
 
-    zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_FINISH);
+    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_FINISH);
     return zstream_detach_buffer(z);
 }
 
@@ -1165,7 +1232,10 @@ deflate_run(VALUE args)
  *
  */
 static VALUE
-rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
+rb_deflate_s_deflate(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     struct zstream z;
     VALUE src, level, dst, args[2];
@@ -1191,15 +1261,18 @@ rb_deflate_s_deflate(int argc, VALUE *argv, VALUE klass)
 }
 
 static void
-do_deflate(struct zstream *z, VALUE src, int flush)
+do_deflate(z, src, flush)
+    struct zstream *z;
+    VALUE src;
+    int flush;
 {
     if (NIL_P(src)) {
-	zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+	zstream_run(z, "", 0, Z_FINISH);
 	return;
     }
     StringValue(src);
-    if (flush != Z_NO_FLUSH || RSTRING_LEN(src) > 0) { /* prevent BUF_ERROR */
-	zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), flush);
+    if (flush != Z_NO_FLUSH || RSTRING(src)->len > 0) { /* prevent BUF_ERROR */
+	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, flush);
     }
 }
 
@@ -1218,7 +1291,10 @@ do_deflate(struct zstream *z, VALUE src, int flush)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
+rb_deflate_deflate(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct zstream *z = get_zstream(obj);
     VALUE src, flush, dst;
@@ -1240,7 +1316,8 @@ rb_deflate_deflate(int argc, VALUE *argv, VALUE obj)
  * preserved in output buffer.
  */
 static VALUE
-rb_deflate_addstr(VALUE obj, VALUE src)
+rb_deflate_addstr(obj, src)
+    VALUE obj, src;
 {
     OBJ_INFECT(obj, src);
     do_deflate(get_zstream(obj), src, Z_NO_FLUSH);
@@ -1257,7 +1334,10 @@ rb_deflate_addstr(VALUE obj, VALUE src)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
+rb_deflate_flush(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct zstream *z = get_zstream(obj);
     VALUE v_flush, dst;
@@ -1266,7 +1346,7 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
     rb_scan_args(argc, argv, "01", &v_flush);
     flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
     if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(z, (Bytef*)"", 0, flush);
+	zstream_run(z, "", 0, flush);
     }
     dst = zstream_detach_buffer(z);
 
@@ -1284,7 +1364,8 @@ rb_deflate_flush(int argc, VALUE *argv, VALUE obj)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
+rb_deflate_params(obj, v_level, v_strategy)
+    VALUE obj, v_level, v_strategy;
 {
     struct zstream *z = get_zstream(obj);
     int level, strategy;
@@ -1293,7 +1374,6 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
     level = ARG_LEVEL(v_level);
     strategy = ARG_STRATEGY(v_strategy);
 
-    zstream_run(z, (Bytef*)"", 0, Z_SYNC_FLUSH);
     err = deflateParams(&z->stream, level, strategy);
     while (err == Z_BUF_ERROR) {
 	rb_warning("deflateParams() returned Z_BUF_ERROR");
@@ -1317,7 +1397,8 @@ rb_deflate_params(VALUE obj, VALUE v_level, VALUE v_strategy)
  * TODO: document better!
  */
 static VALUE
-rb_deflate_set_dictionary(VALUE obj, VALUE dic)
+rb_deflate_set_dictionary(obj, dic)
+    VALUE obj, dic;
 {
     struct zstream *z = get_zstream(obj);
     VALUE src = dic;
@@ -1326,7 +1407,7 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
     OBJ_INFECT(obj, dic);
     StringValue(src);
     err = deflateSetDictionary(&z->stream,
-			       (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+			       RSTRING(src)->ptr, RSTRING(src)->len);
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
     }
@@ -1348,7 +1429,8 @@ rb_deflate_set_dictionary(VALUE obj, VALUE dic)
 
 
 static VALUE
-rb_inflate_s_allocate(VALUE klass)
+rb_inflate_s_allocate(klass)
+    VALUE klass;
 {
     return zstream_inflate_new(klass);
 }
@@ -1362,7 +1444,10 @@ rb_inflate_s_allocate(VALUE klass)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
+rb_inflate_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct zstream *z;
     VALUE wbits;
@@ -1381,13 +1466,14 @@ rb_inflate_initialize(int argc, VALUE *argv, VALUE obj)
 }
 
 static VALUE
-inflate_run(VALUE args)
+inflate_run(args)
+    VALUE args;
 {
-    struct zstream *z = (struct zstream*)((VALUE*)args)[0];
-    VALUE src = ((VALUE*)args)[1];
+    struct zstream *z = (struct zstream *)((VALUE *)args)[0];
+    VALUE src = ((VALUE *)args)[1];
 
-    zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
-    zstream_run(z, (Bytef*)"", 0, Z_FINISH);  /* for checking errors */
+    zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
+    zstream_run(z, "", 0, Z_FINISH);  /* for checking errors */
     return zstream_detach_buffer(z);
 }
 
@@ -1409,7 +1495,8 @@ inflate_run(VALUE args)
  *
  */
 static VALUE
-rb_inflate_s_inflate(VALUE obj, VALUE src)
+rb_inflate_s_inflate(obj, src)
+    VALUE obj, src;
 {
     struct zstream z;
     VALUE dst, args[2];
@@ -1432,15 +1519,17 @@ rb_inflate_s_inflate(VALUE obj, VALUE src)
 }
 
 static void
-do_inflate(struct zstream *z, VALUE src)
+do_inflate(z, src)
+    struct zstream *z;
+    VALUE src;
 {
     if (NIL_P(src)) {
-	zstream_run(z, (Bytef*)"", 0, Z_FINISH);
+	zstream_run(z, "", 0, Z_FINISH);
 	return;
     }
     StringValue(src);
-    if (RSTRING_LEN(src) > 0) { /* prevent Z_BUF_ERROR */
-	zstream_run(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src), Z_SYNC_FLUSH);
+    if (RSTRING(src)->len > 0) { /* prevent Z_BUF_ERROR */
+	zstream_run(z, RSTRING(src)->ptr, RSTRING(src)->len, Z_SYNC_FLUSH);
     }
 }
 
@@ -1459,7 +1548,8 @@ do_inflate(struct zstream *z, VALUE src)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_inflate(VALUE obj, VALUE src)
+rb_inflate_inflate(obj, src)
+    VALUE obj, src;
 {
     struct zstream *z = get_zstream(obj);
     VALUE dst;
@@ -1496,7 +1586,8 @@ rb_inflate_inflate(VALUE obj, VALUE src)
  * preserved in output buffer.
  */
 static VALUE
-rb_inflate_addstr(VALUE obj, VALUE src)
+rb_inflate_addstr(obj, src)
+    VALUE obj, src;
 {
     struct zstream *z = get_zstream(obj);
 
@@ -1527,13 +1618,14 @@ rb_inflate_addstr(VALUE obj, VALUE src)
  * following data of full flush point is preserved in the buffer.
  */
 static VALUE
-rb_inflate_sync(VALUE obj, VALUE src)
+rb_inflate_sync(obj, src)
+    VALUE obj, src;
 {
     struct zstream *z = get_zstream(obj);
 
     OBJ_INFECT(obj, src);
     StringValue(src);
-    return zstream_sync(z, (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+    return zstream_sync(z, RSTRING(src)->ptr, RSTRING(src)->len);
 }
 
 /*
@@ -1544,7 +1636,8 @@ rb_inflate_sync(VALUE obj, VALUE src)
  * <tt>:)</tt>
  */
 static VALUE
-rb_inflate_sync_point_p(VALUE obj)
+rb_inflate_sync_point_p(obj)
+    VALUE obj;
 {
     struct zstream *z = get_zstream(obj);
     int err;
@@ -1566,7 +1659,8 @@ rb_inflate_sync_point_p(VALUE obj)
  * TODO: document better!
  */
 static VALUE
-rb_inflate_set_dictionary(VALUE obj, VALUE dic)
+rb_inflate_set_dictionary(obj, dic)
+    VALUE obj, dic;
 {
     struct zstream *z = get_zstream(obj);
     VALUE src = dic;
@@ -1575,7 +1669,7 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
     OBJ_INFECT(obj, dic);
     StringValue(src);
     err = inflateSetDictionary(&z->stream,
-			       (Bytef*)RSTRING_PTR(src), RSTRING_LEN(src));
+			       RSTRING(src)->ptr, RSTRING(src)->len);
     if (err != Z_OK) {
 	raise_zlib_error(err, z->stream.msg);
     }
@@ -1629,7 +1723,7 @@ rb_inflate_set_dictionary(VALUE obj, VALUE dic)
 #define OS_CODE  OS_UNIX
 #endif
 
-static ID id_write, id_read, id_readpartial, id_flush, id_seek, id_close;
+static ID id_write, id_read, id_flush, id_seek, id_close;
 static VALUE cGzError, cNoFooter, cCRCError, cLengthError;
 
 
@@ -1661,7 +1755,8 @@ struct gzfile {
 
 
 static void
-gzfile_mark(struct gzfile *gz)
+gzfile_mark(gz)
+    struct gzfile *gz;
 {
     rb_gc_mark(gz->io);
     rb_gc_mark(gz->orig_name);
@@ -1670,7 +1765,8 @@ gzfile_mark(struct gzfile *gz)
 }
 
 static void
-gzfile_free(struct gzfile *gz)
+gzfile_free(gz)
+    struct gzfile *gz;
 {
     struct zstream *z = &gz->z;
 
@@ -1680,7 +1776,7 @@ gzfile_free(struct gzfile *gz)
 	}
 	zstream_finalize(z);
     }
-    xfree(gz);
+    free(gz);
 }
 
 static VALUE
@@ -1712,7 +1808,8 @@ gzfile_new(klass, funcs, endfunc)
 #define gzfile_reader_new(gz) gzfile_new((gz),&inflate_funcs,gzfile_reader_end)
 
 static void
-gzfile_reset(struct gzfile *gz)
+gzfile_reset(gz)
+    struct gzfile *gz;
 {
     zstream_reset(&gz->z);
     gz->crc = crc32(0, Z_NULL, 0);
@@ -1721,7 +1818,9 @@ gzfile_reset(struct gzfile *gz)
 }
 
 static void
-gzfile_close(struct gzfile *gz, int closeflag)
+gzfile_close(gz, closeflag)
+    struct gzfile *gz;
+    int closeflag;
 {
     VALUE io = gz->io;
 
@@ -1735,7 +1834,8 @@ gzfile_close(struct gzfile *gz, int closeflag)
 }
 
 static void
-gzfile_write_raw(struct gzfile *gz)
+gzfile_write_raw(gz)
+    struct gzfile *gz;
 {
     VALUE str;
 
@@ -1750,44 +1850,26 @@ gzfile_write_raw(struct gzfile *gz)
 }
 
 static VALUE
-gzfile_read_raw_partial(VALUE arg)
+gzfile_read_raw(gz)
+    struct gzfile *gz;
 {
-    struct gzfile *gz = (struct gzfile*)arg;
     VALUE str;
 
-    str = rb_funcall(gz->io, id_readpartial, 1, INT2FIX(GZFILE_READ_SIZE));
-    Check_Type(str, T_STRING);
-    return str;
-}
-
-static VALUE
-gzfile_read_raw_rescue(VALUE arg)
-{
-    struct gzfile *gz = (struct gzfile*)arg;
-    VALUE str = Qnil;
-    if (rb_obj_is_kind_of(rb_errinfo(), rb_eNoMethodError)) {
-        str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
-        if (!NIL_P(str)) {
-            Check_Type(str, T_STRING);
-        }
+    str = rb_funcall(gz->io, id_read, 1, INT2FIX(GZFILE_READ_SIZE));
+    if (!NIL_P(str)) {
+	Check_Type(str, T_STRING);
     }
-    return str; /* return nil when EOFError */
-}
-
-static VALUE
-gzfile_read_raw(struct gzfile *gz)
-{
-    return rb_rescue2(gzfile_read_raw_partial, (VALUE)gz,
-                      gzfile_read_raw_rescue, (VALUE)gz,
-                      rb_eEOFError, rb_eNoMethodError, (VALUE)0);
+    return str;
 }
 
 static int
-gzfile_read_raw_ensure(struct gzfile *gz, int size)
+gzfile_read_raw_ensure(gz, size)
+    struct gzfile *gz;
+    int size;
 {
     VALUE str;
 
-    while (NIL_P(gz->z.input) || RSTRING_LEN(gz->z.input) < size) {
+    while (NIL_P(gz->z.input) || RSTRING(gz->z.input)->len < size) {
 	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) return Qfalse;
 	zstream_append_input2(&gz->z, str);
@@ -1796,27 +1878,30 @@ gzfile_read_raw_ensure(struct gzfile *gz, int size)
 }
 
 static char *
-gzfile_read_raw_until_zero(struct gzfile *gz, long offset)
+gzfile_read_raw_until_zero(gz, offset)
+    struct gzfile *gz;
+    long offset;
 {
     VALUE str;
     char *p;
 
     for (;;) {
-	p = memchr(RSTRING_PTR(gz->z.input) + offset, '\0',
-		   RSTRING_LEN(gz->z.input) - offset);
+	p = memchr(RSTRING(gz->z.input)->ptr + offset, '\0',
+		   RSTRING(gz->z.input)->len - offset);
 	if (p) break;
 	str = gzfile_read_raw(gz);
 	if (NIL_P(str)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
-	offset = RSTRING_LEN(gz->z.input);
+	offset = RSTRING(gz->z.input)->len;
 	zstream_append_input2(&gz->z, str);
     }
     return p;
 }
 
 static unsigned int
-gzfile_get16(const unsigned char *src)
+gzfile_get16(src)
+    const unsigned char *src;
 {
     unsigned int n;
     n  = *(src++) & 0xff;
@@ -1825,7 +1910,8 @@ gzfile_get16(const unsigned char *src)
 }
 
 static unsigned long
-gzfile_get32(const unsigned char *src)
+gzfile_get32(src)
+    const unsigned char *src;
 {
     unsigned long n;
     n  = *(src++) & 0xff;
@@ -1836,7 +1922,9 @@ gzfile_get32(const unsigned char *src)
 }
 
 static void
-gzfile_set32(unsigned long n, unsigned char *dst)
+gzfile_set32(n, dst)
+    unsigned long n;
+    unsigned char *dst;
 {
     *(dst++) = n & 0xff;
     *(dst++) = (n >> 8) & 0xff;
@@ -1845,9 +1933,10 @@ gzfile_set32(unsigned long n, unsigned char *dst)
 }
 
 static void
-gzfile_make_header(struct gzfile *gz)
+gzfile_make_header(gz)
+    struct gzfile *gz;
 {
-    Bytef buf[10];  /* the size of gzip header */
+    unsigned char buf[10];  /* the size of gzip header */
     unsigned char flags = 0, extraflags = 0;
 
     if (!NIL_P(gz->orig_name)) {
@@ -1878,20 +1967,21 @@ gzfile_make_header(struct gzfile *gz)
 
     if (!NIL_P(gz->orig_name)) {
 	zstream_append_buffer2(&gz->z, gz->orig_name);
-	zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
+	zstream_append_buffer(&gz->z, "\0", 1);
     }
     if (!NIL_P(gz->comment)) {
 	zstream_append_buffer2(&gz->z, gz->comment);
-	zstream_append_buffer(&gz->z, (Bytef*)"\0", 1);
+	zstream_append_buffer(&gz->z, "\0", 1);
     }
 
     gz->z.flags |= GZFILE_FLAG_HEADER_FINISHED;
 }
 
 static void
-gzfile_make_footer(struct gzfile *gz)
+gzfile_make_footer(gz)
+    struct gzfile *gz;
 {
-    Bytef buf[8];  /* 8 is the size of gzip footer */
+    unsigned char buf[8];  /* 8 is the size of gzip footer */
 
     gzfile_set32(gz->crc, buf);
     gzfile_set32(gz->z.stream.total_in, &buf[4]);
@@ -1900,7 +1990,8 @@ gzfile_make_footer(struct gzfile *gz)
 }
 
 static void
-gzfile_read_header(struct gzfile *gz)
+gzfile_read_header(gz)
+    struct gzfile *gz;
 {
     const unsigned char *head;
     long len;
@@ -1910,7 +2001,7 @@ gzfile_read_header(struct gzfile *gz)
 	rb_raise(cGzError, "not in gzip format");
     }
 
-    head = (unsigned char*)RSTRING_PTR(gz->z.input);
+    head = RSTRING(gz->z.input)->ptr;
 
     if (head[0] != GZ_MAGIC1 || head[1] != GZ_MAGIC2) {
 	rb_raise(cGzError, "not in gzip format");
@@ -1948,7 +2039,7 @@ gzfile_read_header(struct gzfile *gz)
 	if (!gzfile_read_raw_ensure(gz, 2)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
-	len = gzfile_get16((Bytef*)RSTRING_PTR(gz->z.input));
+	len = gzfile_get16(RSTRING(gz->z.input)->ptr);
 	if (!gzfile_read_raw_ensure(gz, 2 + len)) {
 	    rb_raise(cGzError, "unexpected end of file");
 	}
@@ -1956,26 +2047,27 @@ gzfile_read_header(struct gzfile *gz)
     }
     if (flags & GZ_FLAG_ORIG_NAME) {
 	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING_PTR(gz->z.input);
-	gz->orig_name = rb_str_new(RSTRING_PTR(gz->z.input), len);
+	len = p - RSTRING(gz->z.input)->ptr;
+	gz->orig_name = rb_str_new(RSTRING(gz->z.input)->ptr, len);
 	OBJ_TAINT(gz->orig_name);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
     if (flags & GZ_FLAG_COMMENT) {
 	p = gzfile_read_raw_until_zero(gz, 0);
-	len = p - RSTRING_PTR(gz->z.input);
-	gz->comment = rb_str_new(RSTRING_PTR(gz->z.input), len);
+	len = p - RSTRING(gz->z.input)->ptr;
+	gz->comment = rb_str_new(RSTRING(gz->z.input)->ptr, len);
 	OBJ_TAINT(gz->comment);  /* for safe */
 	zstream_discard_input(&gz->z, len + 1);
     }
 
-    if (gz->z.input != Qnil && RSTRING_LEN(gz->z.input) > 0) {
+    if (gz->z.input != Qnil && RSTRING(gz->z.input)->len > 0) {
 	zstream_run(&gz->z, 0, 0, Z_SYNC_FLUSH);
     }
 }
 
 static void
-gzfile_check_footer(struct gzfile *gz)
+gzfile_check_footer(gz)
+    struct gzfile *gz;
 {
     unsigned long crc, length;
 
@@ -1985,8 +2077,8 @@ gzfile_check_footer(struct gzfile *gz)
 	rb_raise(cNoFooter, "footer is not found");
     }
 
-    crc = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input));
-    length = gzfile_get32((Bytef*)RSTRING_PTR(gz->z.input) + 4);
+    crc = gzfile_get32(RSTRING(gz->z.input)->ptr);
+    length = gzfile_get32(RSTRING(gz->z.input)->ptr + 4);
 
     gz->z.stream.total_in += 8;  /* to rewind correctly */
     zstream_discard_input(&gz->z, 8);
@@ -2000,7 +2092,10 @@ gzfile_check_footer(struct gzfile *gz)
 }
 
 static void
-gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
+gzfile_write(gz, str, len)
+    struct gzfile *gz;
+    Bytef *str;
+    uInt len;
 {
     if (!(gz->z.flags & GZFILE_FLAG_HEADER_FINISHED)) {
 	gzfile_make_header(gz);
@@ -2015,7 +2110,8 @@ gzfile_write(struct gzfile *gz, Bytef *str, uInt len)
 }
 
 static long
-gzfile_read_more(struct gzfile *gz)
+gzfile_read_more(gz)
+    struct gzfile *gz;
 {
     volatile VALUE str;
 
@@ -2027,8 +2123,8 @@ gzfile_read_more(struct gzfile *gz)
 	    }
 	    break;
 	}
-	if (RSTRING_LEN(str) > 0) { /* prevent Z_BUF_ERROR */
-	    zstream_run(&gz->z, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str),
+	if (RSTRING(str)->len > 0) { /* prevent Z_BUF_ERROR */
+	    zstream_run(&gz->z, RSTRING(str)->ptr, RSTRING(str)->len,
 			Z_SYNC_FLUSH);
 	}
 	if (gz->z.buf_filled > 0) break;
@@ -2037,20 +2133,24 @@ gzfile_read_more(struct gzfile *gz)
 }
 
 static void
-gzfile_calc_crc(struct gzfile *gz, VALUE str)
+gzfile_calc_crc(gz, str)
+    struct gzfile *gz;
+    VALUE str;
 {
-    if (RSTRING_LEN(str) <= gz->ungetc) {
-	gz->ungetc -= RSTRING_LEN(str);
+    if (RSTRING(str)->len <= gz->ungetc) {
+	gz->ungetc -= RSTRING(str)->len;
     }
     else {
-	gz->crc = crc32(gz->crc, (Bytef*)RSTRING_PTR(str) + gz->ungetc,
-			RSTRING_LEN(str) - gz->ungetc);
+	gz->crc = crc32(gz->crc, RSTRING(str)->ptr + gz->ungetc,
+			RSTRING(str)->len - gz->ungetc);
 	gz->ungetc = 0;
     }
 }
 
 static VALUE
-gzfile_read(struct gzfile *gz, int len)
+gzfile_read(gz, len)
+    struct gzfile *gz;
+    int len;
 {
     VALUE dst;
 
@@ -2076,52 +2176,8 @@ gzfile_read(struct gzfile *gz, int len)
 }
 
 static VALUE
-gzfile_readpartial(struct gzfile *gz, int len, VALUE outbuf)
-{
-    VALUE dst;
-
-    if (len < 0)
-        rb_raise(rb_eArgError, "negative length %d given", len);
-
-    if (!NIL_P(outbuf))
-            OBJ_TAINT(outbuf);
-
-    if (len == 0) {
-        if (NIL_P(outbuf))
-            return rb_str_new(0, 0);
-        else {
-            rb_str_resize(outbuf, 0);
-            return outbuf;
-        }
-    }
-    while (!ZSTREAM_IS_FINISHED(&gz->z) && gz->z.buf_filled == 0) {
-	gzfile_read_more(gz);
-    }
-    if (GZFILE_IS_FINISHED(gz)) {
-	if (!(gz->z.flags & GZFILE_FLAG_FOOTER_FINISHED)) {
-	    gzfile_check_footer(gz);
-	}
-        if (!NIL_P(outbuf))
-            rb_str_resize(outbuf, 0);
-	rb_raise(rb_eEOFError, "end of file reached");
-    }
-
-    dst = zstream_shift_buffer(&gz->z, len);
-    gzfile_calc_crc(gz, dst);
-
-    if (NIL_P(outbuf)) {
-        OBJ_TAINT(dst);  /* for safe */
-        return dst;
-    }
-    else {
-        rb_str_resize(outbuf, RSTRING_LEN(dst));
-        memcpy(RSTRING_PTR(outbuf), RSTRING_PTR(dst), RSTRING_LEN(dst));
-        return outbuf;
-    }
-}
-
-static VALUE
-gzfile_read_all(struct gzfile *gz)
+gzfile_read_all(gz)
+    struct gzfile *gz;
 {
     VALUE dst;
 
@@ -2143,14 +2199,17 @@ gzfile_read_all(struct gzfile *gz)
 }
 
 static void
-gzfile_ungetc(struct gzfile *gz, int c)
+gzfile_ungetc(gz, c)
+    struct gzfile *gz;
+    int c;
 {
     zstream_buffer_ungetc(&gz->z, c);
     gz->ungetc++;
 }
 
 static VALUE
-gzfile_writer_end_run(VALUE arg)
+gzfile_writer_end_run(arg)
+    VALUE arg;
 {
     struct gzfile *gz = (struct gzfile *)arg;
 
@@ -2158,7 +2217,7 @@ gzfile_writer_end_run(VALUE arg)
 	gzfile_make_header(gz);
     }
 
-    zstream_run(&gz->z, (Bytef*)"", 0, Z_FINISH);
+    zstream_run(&gz->z, "", 0, Z_FINISH);
     gzfile_make_footer(gz);
     gzfile_write_raw(gz);
 
@@ -2166,7 +2225,8 @@ gzfile_writer_end_run(VALUE arg)
 }
 
 static void
-gzfile_writer_end(struct gzfile *gz)
+gzfile_writer_end(gz)
+    struct gzfile *gz;
 {
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2175,7 +2235,8 @@ gzfile_writer_end(struct gzfile *gz)
 }
 
 static VALUE
-gzfile_reader_end_run(VALUE arg)
+gzfile_reader_end_run(arg)
+    VALUE arg;
 {
     struct gzfile *gz = (struct gzfile *)arg;
 
@@ -2188,7 +2249,8 @@ gzfile_reader_end_run(VALUE arg)
 }
 
 static void
-gzfile_reader_end(struct gzfile *gz)
+gzfile_reader_end(gz)
+    struct gzfile *gz;
 {
     if (ZSTREAM_IS_CLOSING(&gz->z)) return;
     gz->z.flags |= ZSTREAM_FLAG_CLOSING;
@@ -2197,13 +2259,14 @@ gzfile_reader_end(struct gzfile *gz)
 }
 
 static void
-gzfile_reader_rewind(struct gzfile *gz)
+gzfile_reader_rewind(gz)
+    struct gzfile *gz;
 {
     long n;
 
     n = gz->z.stream.total_in;
     if (!NIL_P(gz->z.input)) {
-	n += RSTRING_LEN(gz->z.input);
+	n += RSTRING(gz->z.input)->len;
     }
 
     rb_funcall(gz->io, id_seek, 2, rb_int2inum(-n), INT2FIX(1));
@@ -2211,7 +2274,8 @@ gzfile_reader_rewind(struct gzfile *gz)
 }
 
 static VALUE
-gzfile_reader_get_unused(struct gzfile *gz)
+gzfile_reader_get_unused(gz)
+    struct gzfile *gz;
 {
     VALUE str;
 
@@ -2228,7 +2292,8 @@ gzfile_reader_get_unused(struct gzfile *gz)
 }
 
 static struct gzfile *
-get_gzfile(VALUE obj)
+get_gzfile(obj)
+    VALUE obj;
 {
     struct gzfile *gz;
 
@@ -2254,7 +2319,8 @@ get_gzfile(VALUE obj)
 
 
 static VALUE
-gzfile_ensure_close(VALUE obj)
+gzfile_ensure_close(obj)
+    VALUE obj;
 {
     struct gzfile *gz;
 
@@ -2269,7 +2335,10 @@ gzfile_ensure_close(VALUE obj)
  * See Zlib::GzipReader#wrap and Zlib::GzipWriter#wrap.
  */
 static VALUE
-rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
+rb_gzfile_s_wrap(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE obj = rb_class_new_instance(argc, argv, klass);
 
@@ -2285,7 +2354,11 @@ rb_gzfile_s_wrap(int argc, VALUE *argv, VALUE klass)
  * See Zlib::GzipReader#open and Zlib::GzipWriter#open.
  */
 static VALUE
-gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
+gzfile_s_open(argc, argv, klass, mode)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+    const char *mode;
 {
     VALUE io, filename;
 
@@ -2293,8 +2366,8 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
 	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
     }
     filename = argv[0];
-    FilePathValue(filename);
-    io = rb_file_open(RSTRING_PTR(filename), mode);
+    SafeStringValue(filename);
+    io = rb_file_open(RSTRING(filename)->ptr, mode);
 
     argv[0] = io;
     return rb_gzfile_s_wrap(argc, argv, klass);
@@ -2304,7 +2377,8 @@ gzfile_s_open(int argc, VALUE *argv, VALUE klass, const char *mode)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_to_io(VALUE obj)
+rb_gzfile_to_io(obj)
+    VALUE obj;
 {
     return get_gzfile(obj)->io;
 }
@@ -2313,7 +2387,8 @@ rb_gzfile_to_io(VALUE obj)
  * Returns CRC value of the uncompressed data.
  */
 static VALUE
-rb_gzfile_crc(VALUE obj)
+rb_gzfile_crc(obj)
+    VALUE obj;
 {
     return rb_uint2inum(get_gzfile(obj)->crc);
 }
@@ -2322,7 +2397,8 @@ rb_gzfile_crc(VALUE obj)
  * Returns last modification time recorded in the gzip file header.
  */
 static VALUE
-rb_gzfile_mtime(VALUE obj)
+rb_gzfile_mtime(obj)
+    VALUE obj;
 {
     return rb_time_new(get_gzfile(obj)->mtime, (time_t)0);
 }
@@ -2331,7 +2407,8 @@ rb_gzfile_mtime(VALUE obj)
  * Returns compression level.
  */
 static VALUE
-rb_gzfile_level(VALUE obj)
+rb_gzfile_level(obj)
+    VALUE obj;
 {
     return INT2FIX(get_gzfile(obj)->level);
 }
@@ -2340,7 +2417,8 @@ rb_gzfile_level(VALUE obj)
  * Returns OS code number recorded in the gzip file header.
  */
 static VALUE
-rb_gzfile_os_code(VALUE obj)
+rb_gzfile_os_code(obj)
+    VALUE obj;
 {
     return INT2FIX(get_gzfile(obj)->os_code);
 }
@@ -2350,7 +2428,8 @@ rb_gzfile_os_code(VALUE obj)
  * original filename is not present.
  */
 static VALUE
-rb_gzfile_orig_name(VALUE obj)
+rb_gzfile_orig_name(obj)
+    VALUE obj;
 {
     VALUE str = get_gzfile(obj)->orig_name;
     if (!NIL_P(str)) {
@@ -2365,7 +2444,8 @@ rb_gzfile_orig_name(VALUE obj)
  * is not present.
  */
 static VALUE
-rb_gzfile_comment(VALUE obj)
+rb_gzfile_comment(obj)
+    VALUE obj;
 {
     VALUE str = get_gzfile(obj)->comment;
     if (!NIL_P(str)) {
@@ -2379,7 +2459,8 @@ rb_gzfile_comment(VALUE obj)
  * ???
  */
 static VALUE
-rb_gzfile_lineno(VALUE obj)
+rb_gzfile_lineno(obj)
+    VALUE obj;
 {
     return INT2NUM(get_gzfile(obj)->lineno);
 }
@@ -2388,7 +2469,8 @@ rb_gzfile_lineno(VALUE obj)
  * ???
  */
 static VALUE
-rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
+rb_gzfile_set_lineno(obj, lineno)
+    VALUE obj, lineno;
 {
     struct gzfile *gz = get_gzfile(obj);
     gz->lineno = NUM2INT(lineno);
@@ -2399,7 +2481,8 @@ rb_gzfile_set_lineno(VALUE obj, VALUE lineno)
  * ???
  */
 static VALUE
-rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
+rb_gzfile_set_mtime(obj, mtime)
+    VALUE obj, mtime;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE val;
@@ -2422,7 +2505,8 @@ rb_gzfile_set_mtime(VALUE obj, VALUE mtime)
  * ???
  */
 static VALUE
-rb_gzfile_set_orig_name(VALUE obj, VALUE str)
+rb_gzfile_set_orig_name(obj, str)
+    VALUE obj, str;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE s;
@@ -2432,9 +2516,9 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
 	rb_raise(cGzError, "header is already written");
     }
     s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
+    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
     if (p) {
-	rb_str_resize(s, p - RSTRING_PTR(s));
+	rb_str_resize(s, p - RSTRING(s)->ptr);
     }
     gz->orig_name = s;
     return str;
@@ -2444,7 +2528,8 @@ rb_gzfile_set_orig_name(VALUE obj, VALUE str)
  * ???
  */
 static VALUE
-rb_gzfile_set_comment(VALUE obj, VALUE str)
+rb_gzfile_set_comment(obj, str)
+    VALUE obj, str;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE s;
@@ -2454,9 +2539,9 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
 	rb_raise(cGzError, "header is already written");
     }
     s = rb_str_dup(rb_str_to_str(str));
-    p = memchr(RSTRING_PTR(s), '\0', RSTRING_LEN(s));
+    p = memchr(RSTRING(s)->ptr, '\0', RSTRING(s)->len);
     if (p) {
-	rb_str_resize(s, p - RSTRING_PTR(s));
+	rb_str_resize(s, p - RSTRING(s)->ptr);
     }
     gz->comment = s;
     return str;
@@ -2467,7 +2552,8 @@ rb_gzfile_set_comment(VALUE obj, VALUE str)
  * associated IO object. Returns the associated IO object.
  */
 static VALUE
-rb_gzfile_close(VALUE obj)
+rb_gzfile_close(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE io;
@@ -2483,7 +2569,8 @@ rb_gzfile_close(VALUE obj)
  * object.
  */
 static VALUE
-rb_gzfile_finish(VALUE obj)
+rb_gzfile_finish(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE io;
@@ -2497,7 +2584,8 @@ rb_gzfile_finish(VALUE obj)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_closed_p(VALUE obj)
+rb_gzfile_closed_p(obj)
+    VALUE obj;
 {
     struct gzfile *gz;
     Data_Get_Struct(obj, struct gzfile, gz);
@@ -2508,7 +2596,8 @@ rb_gzfile_closed_p(VALUE obj)
  * ???
  */
 static VALUE
-rb_gzfile_eof_p(VALUE obj)
+rb_gzfile_eof_p(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     return GZFILE_IS_FINISHED(gz) ? Qtrue : Qfalse;
@@ -2518,7 +2607,8 @@ rb_gzfile_eof_p(VALUE obj)
  * Same as IO.
  */
 static VALUE
-rb_gzfile_sync(VALUE obj)
+rb_gzfile_sync(obj)
+    VALUE obj;
 {
     return (get_gzfile(obj)->z.flags & GZFILE_FLAG_SYNC) ? Qtrue : Qfalse;
 }
@@ -2531,7 +2621,8 @@ rb_gzfile_sync(VALUE obj)
  * decreases sharply.
  */
 static VALUE
-rb_gzfile_set_sync(VALUE obj, VALUE mode)
+rb_gzfile_set_sync(obj, mode)
+    VALUE obj, mode;
 {
     struct gzfile *gz = get_gzfile(obj);
 
@@ -2548,7 +2639,8 @@ rb_gzfile_set_sync(VALUE obj, VALUE mode)
  * ???
  */
 static VALUE
-rb_gzfile_total_in(VALUE obj)
+rb_gzfile_total_in(obj)
+    VALUE obj;
 {
     return rb_uint2inum(get_gzfile(obj)->z.stream.total_in);
 }
@@ -2557,7 +2649,8 @@ rb_gzfile_total_in(VALUE obj)
  * ???
  */
 static VALUE
-rb_gzfile_total_out(VALUE obj)
+rb_gzfile_total_out(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     return rb_uint2inum(gz->z.stream.total_out - gz->z.buf_filled);
@@ -2594,7 +2687,8 @@ rb_gzfile_total_out(VALUE obj)
  */
 
 static VALUE
-rb_gzwriter_s_allocate(VALUE klass)
+rb_gzwriter_s_allocate(klass)
+    VALUE klass;
 {
     return gzfile_writer_new(klass);
 }
@@ -2607,7 +2701,10 @@ rb_gzwriter_s_allocate(VALUE klass)
  * this method are found in Zlib::GzipWriter.new and Zlib::GzipWriter#wrap.
  */
 static VALUE
-rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
+rb_gzwriter_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     return gzfile_s_open(argc, argv, klass, "wb");
 }
@@ -2621,7 +2718,10 @@ rb_gzwriter_s_open(int argc, VALUE *argv, VALUE klass)
  * +write+ method that behaves same as write method in IO class.
  */
 static VALUE
-rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
+rb_gzwriter_initialize(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct gzfile *gz;
     VALUE io, level, strategy;
@@ -2651,7 +2751,10 @@ rb_gzwriter_initialize(int argc, VALUE *argv, VALUE obj)
  * +flush+ is omitted.  It is no use giving flush <tt>Zlib::NO_FLUSH</tt>.
  */
 static VALUE
-rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
+rb_gzwriter_flush(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE v_flush;
@@ -2661,7 +2764,7 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
 
     flush = FIXNUMARG(v_flush, Z_SYNC_FLUSH);
     if (flush != Z_NO_FLUSH) {  /* prevent Z_BUF_ERROR */
-	zstream_run(&gz->z, (Bytef*)"", 0, flush);
+	zstream_run(&gz->z, "", 0, flush);
     }
 
     gzfile_write_raw(gz);
@@ -2675,27 +2778,29 @@ rb_gzwriter_flush(int argc, VALUE *argv, VALUE obj)
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_write(VALUE obj, VALUE str)
+rb_gzwriter_write(obj, str)
+    VALUE obj, str;
 {
     struct gzfile *gz = get_gzfile(obj);
 
     if (TYPE(str) != T_STRING) {
 	str = rb_obj_as_string(str);
     }
-    gzfile_write(gz, (Bytef*)RSTRING_PTR(str), RSTRING_LEN(str));
-    return INT2FIX(RSTRING_LEN(str));
+    gzfile_write(gz, RSTRING(str)->ptr, RSTRING(str)->len);
+    return INT2FIX(RSTRING(str)->len);
 }
 
 /*
  * Same as IO.
  */
 static VALUE
-rb_gzwriter_putc(VALUE obj, VALUE ch)
+rb_gzwriter_putc(obj, ch)
+    VALUE obj, ch;
 {
     struct gzfile *gz = get_gzfile(obj);
     char c = NUM2CHR(ch);
 
-    gzfile_write(gz, (Bytef*)&c, 1);
+    gzfile_write(gz, &c, 1);
     return ch;
 }
 
@@ -2781,7 +2886,8 @@ rb_gzwriter_putc(VALUE obj, VALUE ch)
  */
 
 static VALUE
-rb_gzreader_s_allocate(VALUE klass)
+rb_gzreader_s_allocate(klass)
+    VALUE klass;
 {
     return gzfile_reader_new(klass);
 }
@@ -2794,7 +2900,10 @@ rb_gzreader_s_allocate(VALUE klass)
  * are in Zlib::GzipReader.new and ZLib::GzipReader.wrap.
  */
 static VALUE
-rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
+rb_gzreader_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     return gzfile_s_open(argc, argv, klass, "rb");
 }
@@ -2810,7 +2919,8 @@ rb_gzreader_s_open(int argc, VALUE *argv, VALUE klass)
  * exception.
  */
 static VALUE
-rb_gzreader_initialize(VALUE obj, VALUE io)
+rb_gzreader_initialize(obj, io)
+    VALUE obj, io;
 {
     struct gzfile *gz;
     int err;
@@ -2834,7 +2944,8 @@ rb_gzreader_initialize(VALUE obj, VALUE io)
  * object.  The associated IO object needs to respond to the +seek+ method.
  */
 static VALUE
-rb_gzreader_rewind(VALUE obj)
+rb_gzreader_rewind(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     gzfile_reader_rewind(gz);
@@ -2846,7 +2957,8 @@ rb_gzreader_rewind(VALUE obj)
  * +nil+ if the whole gzip file is not parsed yet.
  */
 static VALUE
-rb_gzreader_unused(VALUE obj)
+rb_gzreader_unused(obj)
+    VALUE obj;
 {
     struct gzfile *gz;
     Data_Get_Struct(obj, struct gzfile, gz);
@@ -2857,7 +2969,10 @@ rb_gzreader_unused(VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_read(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE vlen;
@@ -2876,45 +2991,18 @@ rb_gzreader_read(int argc, VALUE *argv, VALUE obj)
 }
 
 /*
- *  call-seq:
- *     gzipreader.readpartial(maxlen [, outbuf]) => string, outbuf
- *
- *  Reads at most <i>maxlen</i> bytes from the gziped stream but
- *  it blocks only if <em>gzipreader</em> has no data immediately available.
- *  If the optional <i>outbuf</i> argument is present,
- *  it must reference a String, which will receive the data.
- *  It raises <code>EOFError</code> on end of file.
- */
-static VALUE
-rb_gzreader_readpartial(int argc, VALUE *argv, VALUE obj)
-{
-    struct gzfile *gz = get_gzfile(obj);
-    VALUE vlen, outbuf;
-    int len;
-
-    rb_scan_args(argc, argv, "11", &vlen, &outbuf);
-
-    len = NUM2INT(vlen);
-    if (len < 0) {
-	rb_raise(rb_eArgError, "negative length %d given", len);
-    }
-    if (!NIL_P(outbuf))
-        Check_Type(outbuf, T_STRING);
-    return gzfile_readpartial(gz, len, outbuf);
-}
-
-/*
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_getc(VALUE obj)
+rb_gzreader_getc(obj)
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     VALUE dst;
 
     dst = gzfile_read(gz, 1);
     if (!NIL_P(dst)) {
-	dst = INT2FIX((unsigned int)(RSTRING_PTR(dst)[0]) & 0xff);
+	dst = INT2FIX((unsigned int)(RSTRING(dst)->ptr[0]) & 0xff);
     }
     return dst;
 }
@@ -2923,7 +3011,8 @@ rb_gzreader_getc(VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readchar(VALUE obj)
+rb_gzreader_readchar(obj)
+    VALUE obj;
 {
     VALUE dst;
     dst = rb_gzreader_getc(obj);
@@ -2937,12 +3026,10 @@ rb_gzreader_readchar(VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_each_byte(VALUE obj)
+rb_gzreader_each_byte(obj)
+    VALUE obj;
 {
     VALUE c;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     while (!NIL_P(c = rb_gzreader_getc(obj))) {
 	rb_yield(c);
     }
@@ -2953,7 +3040,8 @@ rb_gzreader_each_byte(VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_ungetc(VALUE obj, VALUE ch)
+rb_gzreader_ungetc(obj, ch)
+    VALUE obj, ch;
 {
     struct gzfile *gz = get_gzfile(obj);
     gzfile_ungetc(gz, NUM2CHR(ch));
@@ -2961,7 +3049,8 @@ rb_gzreader_ungetc(VALUE obj, VALUE ch)
 }
 
 static void
-gzreader_skip_linebreaks(struct gzfile *gz)
+gzreader_skip_linebreaks(gz)
+    struct gzfile *gz;
 {
     VALUE str;
     char *p;
@@ -2972,7 +3061,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
 	gzfile_read_more(gz);
     }
     n = 0;
-    p = RSTRING_PTR(gz->z.buf);
+    p = RSTRING(gz->z.buf)->ptr;
 
     while (n++, *(p++) == '\n') {
 	if (n >= gz->z.buf_filled) {
@@ -2983,7 +3072,7 @@ gzreader_skip_linebreaks(struct gzfile *gz)
 		gzfile_read_more(gz);
 	    }
 	    n = 0;
-	    p = RSTRING_PTR(gz->z.buf);
+	    p = RSTRING(gz->z.buf)->ptr;
 	}
     }
 
@@ -2992,20 +3081,25 @@ gzreader_skip_linebreaks(struct gzfile *gz)
 }
 
 static void
-rscheck(const char *rsptr, long rslen, VALUE rs)
+rscheck(rsptr, rslen, rs)
+    char *rsptr;
+    long rslen;
+    VALUE rs;
 {
-    if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
+    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
 	rb_raise(rb_eRuntimeError, "rs modified");
 }
 
 static VALUE
-gzreader_gets(int argc, VALUE *argv, VALUE obj)
+gzreader_gets(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     struct gzfile *gz = get_gzfile(obj);
     volatile VALUE rs;
     VALUE dst;
-    const char *rsptr;
-    char *p, *res;
+    char *rsptr, *p, *res;
     long rslen, n;
     int rspara;
 
@@ -3021,19 +3115,19 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 
     if (NIL_P(rs)) {
 	dst = gzfile_read_all(gz);
-	if (RSTRING_LEN(dst) != 0) gz->lineno++;
+	if (RSTRING(dst)->len != 0) gz->lineno++;
 	else
-	    return Qnil;
+		return Qnil;
 	return dst;
     }
 
-    if (RSTRING_LEN(rs) == 0) {
+    if (RSTRING(rs)->len == 0) {
 	rsptr = "\n\n";
 	rslen = 2;
 	rspara = 1;
     } else {
-	rsptr = RSTRING_PTR(rs);
-	rslen = RSTRING_LEN(rs);
+	rsptr = RSTRING(rs)->ptr;
+	rslen = RSTRING(rs)->len;
 	rspara = 0;
     }
 
@@ -3049,13 +3143,13 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
 	gzfile_read_more(gz);
     }
 
-    p = RSTRING_PTR(gz->z.buf);
+    p = RSTRING(gz->z.buf)->ptr;
     n = rslen;
     for (;;) {
 	if (n > gz->z.buf_filled) {
 	    if (ZSTREAM_IS_FINISHED(&gz->z)) break;
 	    gzfile_read_more(gz);
-	    p = RSTRING_PTR(gz->z.buf) + n - rslen;
+	    p = RSTRING(gz->z.buf)->ptr + n - rslen;
 	}
 	if (!rspara) rscheck(rsptr, rslen, rs);
 	res = memchr(p, rsptr[0], (gz->z.buf_filled - n + 1));
@@ -3082,7 +3176,10 @@ gzreader_gets(int argc, VALUE *argv, VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_gets(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE dst;
     dst = gzreader_gets(argc, argv, obj);
@@ -3096,7 +3193,10 @@ rb_gzreader_gets(int argc, VALUE *argv, VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_readline(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE dst;
     dst = rb_gzreader_gets(argc, argv, obj);
@@ -3110,12 +3210,12 @@ rb_gzreader_readline(int argc, VALUE *argv, VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_each(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE str;
-
-    RETURN_ENUMERATOR(obj, 0, 0);
-
     while (!NIL_P(str = gzreader_gets(argc, argv, obj))) {
 	rb_yield(str);
     }
@@ -3126,7 +3226,10 @@ rb_gzreader_each(int argc, VALUE *argv, VALUE obj)
  * See Zlib::GzipReader documentation for a description.
  */
 static VALUE
-rb_gzreader_readlines(int argc, VALUE *argv, VALUE obj)
+rb_gzreader_readlines(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
     VALUE str, dst;
     dst = rb_ary_new();
@@ -3312,7 +3415,6 @@ void Init_zlib()
 #if GZIP_SUPPORT
     id_write = rb_intern("write");
     id_read = rb_intern("read");
-    id_readpartial = rb_intern("readpartial");
     id_flush = rb_intern("flush");
     id_seek = rb_intern("seek");
     id_close = rb_intern("close");
@@ -3371,17 +3473,14 @@ void Init_zlib()
     rb_define_method(cGzipReader, "rewind", rb_gzreader_rewind, 0);
     rb_define_method(cGzipReader, "unused", rb_gzreader_unused, 0);
     rb_define_method(cGzipReader, "read", rb_gzreader_read, -1);
-    rb_define_method(cGzipReader, "readpartial", rb_gzreader_readpartial, -1);
     rb_define_method(cGzipReader, "getc", rb_gzreader_getc, 0);
     rb_define_method(cGzipReader, "readchar", rb_gzreader_readchar, 0);
     rb_define_method(cGzipReader, "each_byte", rb_gzreader_each_byte, 0);
-    rb_define_method(cGzipReader, "bytes", rb_gzreader_each_byte, 0);
     rb_define_method(cGzipReader, "ungetc", rb_gzreader_ungetc, 1);
     rb_define_method(cGzipReader, "gets", rb_gzreader_gets, -1);
     rb_define_method(cGzipReader, "readline", rb_gzreader_readline, -1);
     rb_define_method(cGzipReader, "each", rb_gzreader_each, -1);
     rb_define_method(cGzipReader, "each_line", rb_gzreader_each, -1);
-    rb_define_method(cGzipReader, "lines", rb_gzreader_each, -1);
     rb_define_method(cGzipReader, "readlines", rb_gzreader_readlines, -1);
 
     rb_define_const(mZlib, "OS_CODE", INT2FIX(OS_CODE));
diff --git a/file.c b/file.c
index e8f7b9d84e..ca80795817 100644
--- a/file.c
+++ b/file.c
@@ -3,9 +3,10 @@
   file.c -
 
   $Author$
+  $Date$
   created at: Mon Nov 15 12:24:34 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
@@ -19,10 +20,10 @@
 #include <sys/cygwin.h>
 #endif
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/signal.h"
-#include "ruby/util.h"
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "util.h"
 #include "dln.h"
 
 #ifdef HAVE_UNISTD_H
@@ -32,7 +33,7 @@
 #ifdef HAVE_SYS_FILE_H
 # include <sys/file.h>
 #else
-int flock(int, int);
+int flock _((int, int));
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
@@ -42,10 +43,10 @@ int flock(int, int);
 # define MAXPATHLEN 1024
 #endif
 
-#include <ctype.h>
-
 #include <time.h>
 
+VALUE rb_time_new _((time_t, time_t));
+
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #elif defined HAVE_SYS_UTIME_H
@@ -56,6 +57,10 @@ int flock(int, int);
 #include <pwd.h>
 #endif
 
+#ifndef HAVE_STRING_H
+char *strrchr _((const char*,const char));
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -66,6 +71,9 @@ int flock(int, int);
 #if !defined HAVE_LSTAT && !defined lstat
 #define lstat stat
 #endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko  fseek
+#endif
 
 #ifdef __BEOS__ /* should not change ID if -1 */
 static int
@@ -98,57 +106,24 @@ VALUE rb_cFile;
 VALUE rb_mFileTest;
 VALUE rb_cStat;
 
-static VALUE
-rb_get_path_check(VALUE obj, int check)
-{
-    VALUE tmp;
-    ID to_path;
-
-    if (check) rb_check_safe_obj(obj);
-    tmp = rb_check_string_type(obj);
-    if (!NIL_P(tmp)) goto exit;
-
-
-    CONST_ID(to_path, "to_path");
-    if (rb_respond_to(obj, to_path)) {
-	tmp = rb_funcall(obj, to_path, 0, 0);
-    }
-    else {
-	tmp = obj;
-    }
-  exit:
-    StringValueCStr(tmp);
-    if (check && obj != tmp) {
-	rb_check_safe_obj(tmp);
-    }
-    return rb_str_new4(tmp);
-}
-
-VALUE
-rb_get_path_no_checksafe(VALUE obj)
-{
-    return rb_get_path_check(obj, 0);
-}
-
-VALUE
-rb_get_path(VALUE obj)
-{
-    return rb_get_path_check(obj, 1);
-}
-
+static long apply2files _((void (*)(const char *, void *), VALUE, void *));
 static long
-apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
+apply2files(func, vargs, arg)
+    void (*func)_((const char *, void *));
+    VALUE vargs;
+    void *arg;
 {
     long i;
-    volatile VALUE path;
+    VALUE path;
+    struct RArray *args = RARRAY(vargs);
 
-    rb_secure(4);
-    for (i=0; i<RARRAY_LEN(vargs); i++) {
-	path = rb_get_path(RARRAY_PTR(vargs)[i]);
+    for (i=0; i<args->len; i++) {
+	path = args->ptr[i];
+	SafeStringValue(path);
 	(*func)(StringValueCStr(path), arg);
     }
 
-    return RARRAY_LEN(vargs);
+    return args->len;
 }
 
 /*
@@ -164,7 +139,8 @@ apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg)
  */
 
 static VALUE
-rb_file_path(VALUE obj)
+rb_file_path(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
 
@@ -175,7 +151,9 @@ rb_file_path(VALUE obj)
 }
 
 static VALUE
-stat_new_0(VALUE klass, struct stat *st)
+stat_new_0(klass, st)
+    VALUE klass;
+    struct stat *st;
 {
     struct stat *nst = 0;
 
@@ -183,17 +161,19 @@ stat_new_0(VALUE klass, struct stat *st)
 	nst = ALLOC(struct stat);
 	*nst = *st;
     }
-    return Data_Wrap_Struct(klass, NULL, -1, nst);
+    return Data_Wrap_Struct(klass, NULL, free, nst);
 }
 
 static VALUE
-stat_new(struct stat *st)
+stat_new(st)
+    struct stat *st;
 {
     return stat_new_0(rb_cStat, st);
 }
 
 static struct stat*
-get_stat(VALUE self)
+get_stat(self)
+    VALUE self;
 {
     struct stat* st;
     Data_Get_Struct(self, struct stat, st);
@@ -201,8 +181,6 @@ get_stat(VALUE self)
     return st;
 }
 
-static struct timespec stat_mtimespec(struct stat *st);
-
 /*
  *  call-seq:
  *     stat <=> other_stat    => -1, 0, 1
@@ -217,22 +195,36 @@ static struct timespec stat_mtimespec(struct stat *st);
  */
 
 static VALUE
-rb_stat_cmp(VALUE self, VALUE other)
+rb_stat_cmp(self, other)
+    VALUE self, other;
 {
     if (rb_obj_is_kind_of(other, rb_obj_class(self))) {
-        struct timespec ts1 = stat_mtimespec(get_stat(self));
-        struct timespec ts2 = stat_mtimespec(get_stat(other));
-        if (ts1.tv_sec == ts2.tv_sec) {
-            if (ts1.tv_nsec == ts2.tv_nsec) return INT2FIX(0);
-            if (ts1.tv_nsec < ts2.tv_nsec) return INT2FIX(-1);
-            return INT2FIX(1);
-        }
-        if (ts1.tv_sec < ts2.tv_sec) return INT2FIX(-1);
-        return INT2FIX(1);
+	time_t t1 = get_stat(self)->st_mtime;
+	time_t t2 = get_stat(other)->st_mtime;
+	if (t1 == t2)
+	    return INT2FIX(0);
+	else if (t1 < t2)
+	    return INT2FIX(-1);
+	else
+	    return INT2FIX(1);
     }
     return Qnil;
 }
 
+static VALUE rb_stat_dev _((VALUE));
+static VALUE rb_stat_ino _((VALUE));
+static VALUE rb_stat_mode _((VALUE));
+static VALUE rb_stat_nlink _((VALUE));
+static VALUE rb_stat_uid _((VALUE));
+static VALUE rb_stat_gid _((VALUE));
+static VALUE rb_stat_rdev _((VALUE));
+static VALUE rb_stat_size _((VALUE));
+static VALUE rb_stat_blksize _((VALUE));
+static VALUE rb_stat_blocks _((VALUE));
+static VALUE rb_stat_atime _((VALUE));
+static VALUE rb_stat_mtime _((VALUE));
+static VALUE rb_stat_ctime _((VALUE));
+
 /*
  *  call-seq:
  *     stat.dev    => fixnum
@@ -244,7 +236,8 @@ rb_stat_cmp(VALUE self, VALUE other)
  */
 
 static VALUE
-rb_stat_dev(VALUE self)
+rb_stat_dev(self)
+    VALUE self;
 {
     return INT2NUM(get_stat(self)->st_dev);
 }
@@ -261,7 +254,8 @@ rb_stat_dev(VALUE self)
  */
 
 static VALUE
-rb_stat_dev_major(VALUE self)
+rb_stat_dev_major(self)
+    VALUE self;
 {
 #if defined(major)
     long dev = get_stat(self)->st_dev;
@@ -283,7 +277,8 @@ rb_stat_dev_major(VALUE self)
  */
 
 static VALUE
-rb_stat_dev_minor(VALUE self)
+rb_stat_dev_minor(self)
+    VALUE self;
 {
 #if defined(minor)
     long dev = get_stat(self)->st_dev;
@@ -305,7 +300,8 @@ rb_stat_dev_minor(VALUE self)
  */
 
 static VALUE
-rb_stat_ino(VALUE self)
+rb_stat_ino(self)
+    VALUE self;
 {
 #ifdef HUGE_ST_INO
     return ULL2NUM(get_stat(self)->st_ino);
@@ -328,7 +324,8 @@ rb_stat_ino(VALUE self)
  */
 
 static VALUE
-rb_stat_mode(VALUE self)
+rb_stat_mode(self)
+    VALUE self;
 {
 #ifdef __BORLANDC__
     return UINT2NUM((unsigned short)(get_stat(self)->st_mode));
@@ -350,7 +347,8 @@ rb_stat_mode(VALUE self)
  */
 
 static VALUE
-rb_stat_nlink(VALUE self)
+rb_stat_nlink(self)
+    VALUE self;
 {
     return UINT2NUM(get_stat(self)->st_nlink);
 }
@@ -367,9 +365,10 @@ rb_stat_nlink(VALUE self)
  */
 
 static VALUE
-rb_stat_uid(VALUE self)
+rb_stat_uid(self)
+    VALUE self;
 {
-    return UIDT2NUM(get_stat(self)->st_uid);
+    return UINT2NUM(get_stat(self)->st_uid);
 }
 
 /*
@@ -383,9 +382,10 @@ rb_stat_uid(VALUE self)
  */
 
 static VALUE
-rb_stat_gid(VALUE self)
+rb_stat_gid(self)
+    VALUE self;
 {
-    return GIDT2NUM(get_stat(self)->st_gid);
+    return UINT2NUM(get_stat(self)->st_gid);
 }
 
 
@@ -402,7 +402,8 @@ rb_stat_gid(VALUE self)
  */
 
 static VALUE
-rb_stat_rdev(VALUE self)
+rb_stat_rdev(self)
+    VALUE self;
 {
 #ifdef HAVE_ST_RDEV
     return ULONG2NUM(get_stat(self)->st_rdev);
@@ -423,7 +424,8 @@ rb_stat_rdev(VALUE self)
  */
 
 static VALUE
-rb_stat_rdev_major(VALUE self)
+rb_stat_rdev_major(self)
+    VALUE self;
 {
 #if defined(HAVE_ST_RDEV) && defined(major)
     long rdev = get_stat(self)->st_rdev;
@@ -445,7 +447,8 @@ rb_stat_rdev_major(VALUE self)
  */
 
 static VALUE
-rb_stat_rdev_minor(VALUE self)
+rb_stat_rdev_minor(self)
+    VALUE self;
 {
 #if defined(HAVE_ST_RDEV) && defined(minor)
     long rdev = get_stat(self)->st_rdev;
@@ -465,7 +468,8 @@ rb_stat_rdev_minor(VALUE self)
  */
 
 static VALUE
-rb_stat_size(VALUE self)
+rb_stat_size(self)
+    VALUE self;
 {
     return OFFT2NUM(get_stat(self)->st_size);
 }
@@ -482,7 +486,8 @@ rb_stat_size(VALUE self)
  */
 
 static VALUE
-rb_stat_blksize(VALUE self)
+rb_stat_blksize(self)
+    VALUE self;
 {
 #ifdef HAVE_ST_BLKSIZE
     return ULONG2NUM(get_stat(self)->st_blksize);
@@ -503,7 +508,8 @@ rb_stat_blksize(VALUE self)
  */
 
 static VALUE
-rb_stat_blocks(VALUE self)
+rb_stat_blocks(self)
+    VALUE self;
 {
 #ifdef HAVE_ST_BLOCKS
     return ULONG2NUM(get_stat(self)->st_blocks);
@@ -512,77 +518,6 @@ rb_stat_blocks(VALUE self)
 #endif
 }
 
-static struct timespec
-stat_atimespec(struct stat *st)
-{
-    struct timespec ts;
-    ts.tv_sec = st->st_atime;
-#if defined(HAVE_STRUCT_STAT_ST_ATIM)
-    ts.tv_nsec = st->st_atim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC)
-    ts.tv_nsec = st->st_atimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC)
-    ts.tv_nsec = st->st_atimensec;
-#else
-    ts.tv_nsec = 0;
-#endif
-    return ts;
-}
-
-static VALUE
-stat_atime(struct stat *st)
-{
-    struct timespec ts = stat_atimespec(st);
-    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
-
-static struct timespec
-stat_mtimespec(struct stat *st)
-{
-    struct timespec ts;
-    ts.tv_sec = st->st_mtime;
-#if defined(HAVE_STRUCT_STAT_ST_MTIM)
-    ts.tv_nsec = st->st_mtim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC)
-    ts.tv_nsec = st->st_mtimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC)
-    ts.tv_nsec = st->st_mtimensec;
-#else
-    ts.tv_nsec = 0;
-#endif
-    return ts;
-}
-
-static VALUE
-stat_mtime(struct stat *st)
-{
-    struct timespec ts = stat_mtimespec(st);
-    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
-
-static struct timespec
-stat_ctimespec(struct stat *st)
-{
-    struct timespec ts;
-    ts.tv_sec = st->st_ctime;
-#if defined(HAVE_STRUCT_STAT_ST_CTIM)
-    ts.tv_nsec = st->st_ctim.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_CTIMESPEC)
-    ts.tv_nsec = st->st_ctimespec.tv_nsec;
-#elif defined(HAVE_STRUCT_STAT_ST_CTIMENSEC)
-    ts.tv_nsec = st->st_ctimensec;
-#else
-    ts.tv_nsec = 0;
-#endif
-    return ts;
-}
-
-static VALUE
-stat_ctime(struct stat *st)
-{
-    struct timespec ts = stat_ctimespec(st);
-    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
-}
 
 /*
  *  call-seq:
@@ -596,9 +531,10 @@ stat_ctime(struct stat *st)
  */
 
 static VALUE
-rb_stat_atime(VALUE self)
+rb_stat_atime(self)
+    VALUE self;
 {
-    return stat_atime(get_stat(self));
+    return rb_time_new(get_stat(self)->st_atime, 0);
 }
 
 /*
@@ -612,9 +548,10 @@ rb_stat_atime(VALUE self)
  */
 
 static VALUE
-rb_stat_mtime(VALUE self)
+rb_stat_mtime(self)
+    VALUE self;
 {
-    return stat_mtime(get_stat(self));
+    return rb_time_new(get_stat(self)->st_mtime, 0);
 }
 
 /*
@@ -630,9 +567,10 @@ rb_stat_mtime(VALUE self)
  */
 
 static VALUE
-rb_stat_ctime(VALUE self)
+rb_stat_ctime(self)
+    VALUE self;
 {
-    return stat_ctime(get_stat(self));
+    return rb_time_new(get_stat(self)->st_ctime, 0);
 }
 
 /*
@@ -650,13 +588,14 @@ rb_stat_ctime(VALUE self)
  */
 
 static VALUE
-rb_stat_inspect(VALUE self)
+rb_stat_inspect(self)
+    VALUE self;
 {
     VALUE str;
     int i;
     static const struct {
 	const char *name;
-	VALUE (*func)(VALUE);
+	VALUE (*func)_((VALUE));
     } member[] = {
 	{"dev",	    rb_stat_dev},
 	{"ino",	    rb_stat_ino},
@@ -687,10 +626,16 @@ rb_stat_inspect(VALUE self)
 	rb_str_buf_cat2(str, "=");
 	v = (*member[i].func)(self);
 	if (i == 2) {		/* mode */
-	    rb_str_catf(str, "0%lo", NUM2ULONG(v));
+	    char buf[32];
+
+	    sprintf(buf, "0%lo", NUM2ULONG(v));
+	    rb_str_buf_cat2(str, buf);
 	}
 	else if (i == 0 || i == 6) { /* dev/rdev */
-	    rb_str_catf(str, "0x%lx", NUM2ULONG(v));
+	    char buf[32];
+
+	    sprintf(buf, "0x%lx", NUM2ULONG(v));
+	    rb_str_buf_cat2(str, buf);
 	}
 	else {
 	    rb_str_append(str, rb_inspect(v));
@@ -703,25 +648,29 @@ rb_stat_inspect(VALUE self)
 }
 
 static int
-rb_stat(VALUE file, struct stat *st)
+rb_stat(file, st)
+    VALUE file;
+    struct stat *st;
 {
     VALUE tmp;
 
-    rb_secure(2);
     tmp = rb_check_convert_type(file, T_FILE, "IO", "to_io");
     if (!NIL_P(tmp)) {
 	rb_io_t *fptr;
 
+	rb_secure(2);
 	GetOpenFile(tmp, fptr);
-	return fstat(fptr->fd, st);
+	return fstat(fileno(fptr->f), st);
     }
-    FilePathValue(file);
+    SafeStringValue(file);
     return stat(StringValueCStr(file), st);
 }
 
 #ifdef _WIN32
 static HANDLE
-w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
+w32_io_info(file, st)
+    VALUE *file;
+    BY_HANDLE_FILE_INFORMATION *st;
 {
     VALUE tmp;
     HANDLE f, ret = 0;
@@ -731,11 +680,11 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
 	rb_io_t *fptr;
 
 	GetOpenFile(tmp, fptr);
-	f = (HANDLE)rb_w32_get_osfhandle(fptr->fd);
+	f = (HANDLE)rb_w32_get_osfhandle(fileno(fptr->f));
 	if (f == (HANDLE)-1) return INVALID_HANDLE_VALUE;
     }
     else {
-	FilePathValue(*file);
+	SafeStringValue(*file);
 	f = CreateFile(StringValueCStr(*file), 0,
 	               FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
 	               rb_w32_iswin95() ? 0 : FILE_FLAG_BACKUP_SEMANTICS, NULL);
@@ -763,12 +712,12 @@ w32_io_info(VALUE *file, BY_HANDLE_FILE_INFORMATION *st)
  */
 
 static VALUE
-rb_file_s_stat(VALUE klass, VALUE fname)
+rb_file_s_stat(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
-    rb_secure(4);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (rb_stat(fname, &st) < 0) {
 	rb_sys_fail(StringValueCStr(fname));
     }
@@ -791,13 +740,14 @@ rb_file_s_stat(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_io_stat(VALUE obj)
+rb_io_stat(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstat(fileno(fptr->f), &st) == -1) {
 	rb_sys_fail(fptr->path);
     }
     return stat_new(&st);
@@ -818,15 +768,15 @@ rb_io_stat(VALUE obj)
  */
 
 static VALUE
-rb_file_s_lstat(VALUE klass, VALUE fname)
+rb_file_s_lstat(klass, fname)
+    VALUE klass, fname;
 {
 #ifdef HAVE_LSTAT
     struct stat st;
 
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (lstat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING_PTR(fname));
+	rb_sys_fail(RSTRING(fname)->ptr);
     }
     return stat_new(&st);
 #else
@@ -850,7 +800,8 @@ rb_file_s_lstat(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_lstat(VALUE obj)
+rb_file_lstat(obj)
+    VALUE obj;
 {
 #ifdef HAVE_LSTAT
     rb_io_t *fptr;
@@ -870,7 +821,8 @@ rb_file_lstat(VALUE obj)
 
 #ifndef HAVE_GROUP_MEMBER
 static int
-group_member(GETGROUPS_T gid)
+group_member(gid)
+    GETGROUPS_T gid;
 {
 #ifndef _WIN32
     if (getgid() == gid || getegid() == gid)
@@ -909,11 +861,13 @@ group_member(GETGROUPS_T gid)
 
 #ifndef HAVE_EACCESS
 int
-eaccess(const char *path, int mode)
+eaccess(path, mode)
+     const char *path;
+     int mode;
 {
 #ifdef USE_GETEUID
     struct stat st;
-    rb_uid_t euid;
+    int euid;
 
     if (stat(path, &st) < 0) return -1;
 
@@ -962,30 +916,6 @@ eaccess(const char *path, int mode)
 
 
 /*
- *   File.directory?(file_name)   =>  true or false
- *   File.directory?(file_name)   =>  true or false
- *
- * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
- *
- *    File.directory?(".")
- */
-
-/*
- * Document-method: exist?
- *
- * call-seq:
- *   Dir.exist?(file_name)   =>  true or false
- *   Dir.exists?(file_name)   =>  true or false
- *
- * Returns <code>true</code> if the named file is a directory,
- * <code>false</code> otherwise.
- *
- */
-
-/*
- * Document-method: directory?
- *
  * call-seq:
  *   File.directory?(file_name)   =>  true or false
  *
@@ -995,8 +925,9 @@ eaccess(const char *path, int mode)
  *    File.directory?(".")
  */
 
-VALUE
-rb_file_directory_p(VALUE obj, VALUE fname)
+static VALUE
+test_d(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef S_ISDIR
 #   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
@@ -1009,7 +940,6 @@ rb_file_directory_p(VALUE obj, VALUE fname)
     return Qfalse;
 }
 
-
 /*
  * call-seq:
  *   File.pipe?(file_name)   =>  true or false
@@ -1018,7 +948,8 @@ rb_file_directory_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_pipe_p(VALUE obj, VALUE fname)
+test_p(obj, fname)
+    VALUE obj, fname;
 {
 #ifdef S_IFIFO
 #  ifndef S_ISFIFO
@@ -1042,11 +973,20 @@ rb_file_pipe_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_symlink_p(VALUE obj, VALUE fname)
+test_l(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef S_ISLNK
 #  ifdef _S_ISLNK
 #    define S_ISLNK(m) _S_ISLNK(m)
+#  elif defined __BORLANDC__
+#    ifdef _S_IFLNK
+#      define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == _S_IFLNK)
+#    else
+#      ifdef S_IFLNK
+#        define S_ISLNK(m) (((unsigned short)(m) & S_IFMT) == S_IFLNK)
+#      endif
+#    endif
 #  else
 #    ifdef _S_IFLNK
 #      define S_ISLNK(m) ((m & S_IFMT) == _S_IFLNK)
@@ -1061,8 +1001,7 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
 #ifdef S_ISLNK
     struct stat st;
 
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (lstat(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (S_ISLNK(st.st_mode)) return Qtrue;
 #endif
@@ -1078,11 +1017,20 @@ rb_file_symlink_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_socket_p(VALUE obj, VALUE fname)
+test_S(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef S_ISSOCK
 #  ifdef _S_ISSOCK
 #    define S_ISSOCK(m) _S_ISSOCK(m)
+#  elif defined __BORLANDC__
+#    ifdef _S_IFSOCK
+#      define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == _S_IFSOCK)
+#    else
+#      ifdef S_IFSOCK
+#        define S_ISSOCK(m) (((unsigned short)(m) & S_IFMT) == S_IFSOCK)
+#      endif
+#    endif
 #  else
 #    ifdef _S_IFSOCK
 #      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
@@ -1112,7 +1060,8 @@ rb_file_socket_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_blockdev_p(VALUE obj, VALUE fname)
+test_b(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef S_ISBLK
 #   ifdef S_IFBLK
@@ -1139,7 +1088,8 @@ rb_file_blockdev_p(VALUE obj, VALUE fname)
  * Returns <code>true</code> if the named file is a character device.
  */
 static VALUE
-rb_file_chardev_p(VALUE obj, VALUE fname)
+test_c(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef S_ISCHR
 #   define S_ISCHR(m) ((m & S_IFMT) == S_IFCHR)
@@ -1157,13 +1107,14 @@ rb_file_chardev_p(VALUE obj, VALUE fname)
 /*
  * call-seq:
  *    File.exist?(file_name)    =>  true or false
- *    File.exists?(file_name)   =>  true or false
+ *    File.exists?(file_name)   =>  true or false    (obsolete)
  *
  * Return <code>true</code> if the named file exists.
  */
 
 static VALUE
-rb_file_exist_p(VALUE obj, VALUE fname)
+test_e(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1180,10 +1131,10 @@ rb_file_exist_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_readable_p(VALUE obj, VALUE fname)
+test_r(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (eaccess(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
@@ -1197,49 +1148,14 @@ rb_file_readable_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_readable_real_p(VALUE obj, VALUE fname)
+test_R(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (access(StringValueCStr(fname), R_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
-#ifndef S_IRUGO
-#  define S_IRUGO		(S_IRUSR | S_IRGRP | S_IROTH)
-#endif
-
-#ifndef S_IWUGO
-#  define S_IWUGO		(S_IWUSR | S_IWGRP | S_IWOTH)
-#endif
-
-/*
- * call-seq:
- *    File.world_readable?(file_name)   => fixnum or nil
- *
- * If <i>file_name</i> is readable by others, returns an integer
- * representing the file permission bits of <i>file_name</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *     
- *    File.world_readable?("/etc/passwd")	    # => 420
- *    m = File.world_readable?("/etc/passwd")
- *    sprintf("%o", m)				    # => "644"
- */
-
-static VALUE
-rb_file_world_readable_p(VALUE obj, VALUE fname)
-{
-#ifdef S_IROTH
-    struct stat st;
-
-    if (rb_stat(fname, &st) < 0) return Qnil;
-    if ((st.st_mode & (S_IROTH)) == S_IROTH) {
-	return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
-    }
-#endif
-    return Qnil;
-}
 
 /*
  * call-seq:
@@ -1250,10 +1166,10 @@ rb_file_world_readable_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_writable_p(VALUE obj, VALUE fname)
+test_w(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (eaccess(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
@@ -1267,44 +1183,16 @@ rb_file_writable_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_writable_real_p(VALUE obj, VALUE fname)
+test_W(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (access(StringValueCStr(fname), W_OK) < 0) return Qfalse;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    File.world_writable?(file_name)   => fixnum or nil
- *
- * If <i>file_name</i> is writable by others, returns an integer
- * representing the file permission bits of <i>file_name</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *     
- *    File.world_writable?("/tmp")		    #=> 511
- *    m = File.world_writable?("/tmp")
- *    sprintf("%o", m)				    #=> "777"
- */
-
-static VALUE
-rb_file_world_writable_p(VALUE obj, VALUE fname)
-{
-#ifdef S_IWOTH
-    struct stat st;
-
-    if (rb_stat(fname, &st) < 0) return Qfalse;
-    if ((st.st_mode & (S_IWOTH)) == S_IWOTH) {
-	return UINT2NUM(st.st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
-    }
-#endif
-    return Qnil;
-}
-
-/*
- * call-seq:
  *    File.executable?(file_name)   => true or false
  *
  * Returns <code>true</code> if the named file is executable by the effective
@@ -1312,10 +1200,10 @@ rb_file_world_writable_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_executable_p(VALUE obj, VALUE fname)
+test_x(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (eaccess(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
@@ -1329,10 +1217,10 @@ rb_file_executable_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_executable_real_p(VALUE obj, VALUE fname)
+test_X(obj, fname)
+    VALUE obj, fname;
 {
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (access(StringValueCStr(fname), X_OK) < 0) return Qfalse;
     return Qtrue;
 }
@@ -1350,7 +1238,8 @@ rb_file_executable_real_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_file_p(VALUE obj, VALUE fname)
+test_f(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1368,7 +1257,8 @@ rb_file_file_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_zero_p(VALUE obj, VALUE fname)
+test_z(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1386,7 +1276,8 @@ rb_file_zero_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_size_p(VALUE obj, VALUE fname)
+test_s(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1405,7 +1296,8 @@ rb_file_size_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_owned_p(VALUE obj, VALUE fname)
+test_owned(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1415,7 +1307,8 @@ rb_file_owned_p(VALUE obj, VALUE fname)
 }
 
 static VALUE
-rb_file_rowned_p(VALUE obj, VALUE fname)
+test_rowned(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st;
 
@@ -1434,7 +1327,8 @@ rb_file_rowned_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_grpowned_p(VALUE obj, VALUE fname)
+test_grpowned(obj, fname)
+    VALUE obj, fname;
 {
 #ifndef _WIN32
     struct stat st;
@@ -1447,12 +1341,13 @@ rb_file_grpowned_p(VALUE obj, VALUE fname)
 
 #if defined(S_ISUID) || defined(S_ISGID) || defined(S_ISVTX)
 static VALUE
-check3rdbyte(VALUE fname, int mode)
+check3rdbyte(fname, mode)
+    VALUE fname;
+    int mode;
 {
     struct stat st;
 
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (stat(StringValueCStr(fname), &st) < 0) return Qfalse;
     if (st.st_mode & mode) return Qtrue;
     return Qfalse;
@@ -1467,7 +1362,8 @@ check3rdbyte(VALUE fname, int mode)
  */
 
 static VALUE
-rb_file_suid_p(VALUE obj, VALUE fname)
+test_suid(obj, fname)
+    VALUE obj, fname;
 {
 #ifdef S_ISUID
     return check3rdbyte(fname, S_ISUID);
@@ -1484,7 +1380,8 @@ rb_file_suid_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_sgid_p(VALUE obj, VALUE fname)
+test_sgid(obj, fname)
+    VALUE obj, fname;
 {
 #ifdef S_ISGID
     return check3rdbyte(fname, S_ISGID);
@@ -1501,7 +1398,8 @@ rb_file_sgid_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_sticky_p(VALUE obj, VALUE fname)
+test_sticky(obj, fname)
+    VALUE obj, fname;
 {
 #ifdef S_ISVTX
     return check3rdbyte(fname, S_ISVTX);
@@ -1528,7 +1426,8 @@ rb_file_sticky_p(VALUE obj, VALUE fname)
  */
 
 static VALUE
-rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
+test_identical(obj, fname1, fname2)
+    VALUE obj, fname1, fname2;
 {
 #ifndef DOSISH
     struct stat st1, st2;
@@ -1559,16 +1458,16 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
     if (!f1 || !f2) return Qfalse;
     if (rb_w32_iswin95()) return Qfalse;
 #else
-    FilePathValue(fname1);
+    SafeStringValue(fname1);
     fname1 = rb_str_new4(fname1);
-    FilePathValue(fname2);
-    if (access(RSTRING_PTR(fname1), 0)) return Qfalse;
-    if (access(RSTRING_PTR(fname2), 0)) return Qfalse;
+    SafeStringValue(fname2);
+    if (access(RSTRING(fname1)->ptr, 0)) return Qfalse;
+    if (access(RSTRING(fname2)->ptr, 0)) return Qfalse;
 #endif
     fname1 = rb_file_expand_path(fname1, Qnil);
     fname2 = rb_file_expand_path(fname2, Qnil);
-    if (RSTRING_LEN(fname1) != RSTRING_LEN(fname2)) return Qfalse;
-    if (rb_memcicmp(RSTRING_PTR(fname1), RSTRING_PTR(fname2), RSTRING_LEN(fname1)))
+    if (RSTRING(fname1)->len != RSTRING(fname2)->len) return Qfalse;
+    if (rb_memcicmp(RSTRING(fname1)->ptr, RSTRING(fname2)->ptr, RSTRING(fname1)->len))
 	return Qfalse;
 #endif
     return Qtrue;
@@ -1582,7 +1481,8 @@ rb_file_identical_p(VALUE obj, VALUE fname1, VALUE fname2)
  */
 
 static VALUE
-rb_file_s_size(VALUE klass, VALUE fname)
+rb_file_s_size(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
@@ -1592,7 +1492,8 @@ rb_file_s_size(VALUE klass, VALUE fname)
 }
 
 static VALUE
-rb_file_ftype(const struct stat *st)
+rb_file_ftype(st)
+    struct stat *st;
 {
     const char *t;
 
@@ -1629,7 +1530,7 @@ rb_file_ftype(const struct stat *st)
 	t = "unknown";
     }
 
-    return rb_usascii_str_new2(t);
+    return rb_str_new2(t);
 }
 
 /*
@@ -1648,14 +1549,14 @@ rb_file_ftype(const struct stat *st)
  */
 
 static VALUE
-rb_file_s_ftype(VALUE klass, VALUE fname)
+rb_file_s_ftype(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
     if (lstat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING_PTR(fname));
+	rb_sys_fail(RSTRING(fname)->ptr);
     }
 
     return rb_file_ftype(&st);
@@ -1672,13 +1573,14 @@ rb_file_s_ftype(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_s_atime(VALUE klass, VALUE fname)
+rb_file_s_atime(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
     if (rb_stat(fname, &st) < 0)
 	rb_sys_fail(StringValueCStr(fname));
-    return stat_atime(&st);
+    return rb_time_new(st.st_atime, 0);
 }
 
 /*
@@ -1693,16 +1595,17 @@ rb_file_s_atime(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_atime(VALUE obj)
+rb_file_atime(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstat(fileno(fptr->f), &st) == -1) {
 	rb_sys_fail(fptr->path);
     }
-    return stat_atime(&st);
+    return rb_time_new(st.st_atime, 0);
 }
 
 /*
@@ -1716,13 +1619,14 @@ rb_file_atime(VALUE obj)
  */
 
 static VALUE
-rb_file_s_mtime(VALUE klass, VALUE fname)
+rb_file_s_mtime(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
     if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(RSTRING_PTR(fname));
-    return stat_mtime(&st);
+	rb_sys_fail(RSTRING(fname)->ptr);
+    return rb_time_new(st.st_mtime, 0);
 }
 
 /*
@@ -1736,16 +1640,17 @@ rb_file_s_mtime(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_mtime(VALUE obj)
+rb_file_mtime(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstat(fileno(fptr->f), &st) == -1) {
 	rb_sys_fail(fptr->path);
     }
-    return stat_mtime(&st);
+    return rb_time_new(st.st_mtime, 0);
 }
 
 /*
@@ -1761,13 +1666,14 @@ rb_file_mtime(VALUE obj)
  */
 
 static VALUE
-rb_file_s_ctime(VALUE klass, VALUE fname)
+rb_file_s_ctime(klass, fname)
+    VALUE klass, fname;
 {
     struct stat st;
 
     if (rb_stat(fname, &st) < 0)
-	rb_sys_fail(RSTRING_PTR(fname));
-    return stat_ctime(&st);
+	rb_sys_fail(RSTRING(fname)->ptr);
+    return rb_time_new(st.st_ctime, 0);
 }
 
 /*
@@ -1782,20 +1688,24 @@ rb_file_s_ctime(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_ctime(VALUE obj)
+rb_file_ctime(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
     struct stat st;
 
     GetOpenFile(obj, fptr);
-    if (fstat(fptr->fd, &st) == -1) {
+    if (fstat(fileno(fptr->f), &st) == -1) {
 	rb_sys_fail(fptr->path);
     }
-    return stat_ctime(&st);
+    return rb_time_new(st.st_ctime, 0);
 }
 
+static void chmod_internal _((const char *, void *));
 static void
-chmod_internal(const char *path, void *mode)
+chmod_internal(path, mode)
+    const char *path;
+    void *mode;
 {
     if (chmod(path, *(int *)mode) < 0)
 	rb_sys_fail(path);
@@ -1815,7 +1725,9 @@ chmod_internal(const char *path, void *mode)
  */
 
 static VALUE
-rb_file_s_chmod(int argc, VALUE *argv)
+rb_file_s_chmod(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE vmode;
     VALUE rest;
@@ -1844,7 +1756,8 @@ rb_file_s_chmod(int argc, VALUE *argv)
  */
 
 static VALUE
-rb_file_chmod(VALUE obj, VALUE vmode)
+rb_file_chmod(obj, vmode)
+    VALUE obj, vmode;
 {
     rb_io_t *fptr;
     int mode;
@@ -1854,7 +1767,7 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 
     GetOpenFile(obj, fptr);
 #ifdef HAVE_FCHMOD
-    if (fchmod(fptr->fd, mode) == -1)
+    if (fchmod(fileno(fptr->f), mode) == -1)
 	rb_sys_fail(fptr->path);
 #else
     if (!fptr->path) return Qnil;
@@ -1866,8 +1779,11 @@ rb_file_chmod(VALUE obj, VALUE vmode)
 }
 
 #if defined(HAVE_LCHMOD)
+static void lchmod_internal _((const char *, void *));
 static void
-lchmod_internal(const char *path, void *mode)
+lchmod_internal(path, mode)
+    const char *path;
+    void *mode;
 {
     if (lchmod(path, (int)(VALUE)mode) < 0)
 	rb_sys_fail(path);
@@ -1884,7 +1800,9 @@ lchmod_internal(const char *path, void *mode)
  */
 
 static VALUE
-rb_file_s_lchmod(int argc, VALUE *argv)
+rb_file_s_lchmod(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE vmode;
     VALUE rest;
@@ -1899,7 +1817,9 @@ rb_file_s_lchmod(int argc, VALUE *argv)
 }
 #else
 static VALUE
-rb_file_s_lchmod(int argc, VALUE *argv)
+rb_file_s_lchmod(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     rb_notimplement();
     return Qnil;		/* not reached */
@@ -1907,14 +1827,16 @@ rb_file_s_lchmod(int argc, VALUE *argv)
 #endif
 
 struct chown_args {
-    rb_uid_t owner;
-    rb_gid_t group;
+    int owner, group;
 };
 
+static void chown_internal _((const char *, void *));
 static void
-chown_internal(const char *path, void *arg)
+chown_internal(path, argp)
+    const char *path;
+    void *argp;
 {
-    struct chown_args *args = arg;
+    struct chown_args *args = (struct chown_args *)argp;
     if (chown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
@@ -1935,7 +1857,9 @@ chown_internal(const char *path, void *arg)
  */
 
 static VALUE
-rb_file_s_chown(int argc, VALUE *argv)
+rb_file_s_chown(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE o, g, rest;
     struct chown_args arg;
@@ -1947,13 +1871,13 @@ rb_file_s_chown(int argc, VALUE *argv)
 	arg.owner = -1;
     }
     else {
-	arg.owner = NUM2UIDT(o);
+	arg.owner = NUM2INT(o);
     }
     if (NIL_P(g)) {
 	arg.group = -1;
     }
     else {
-	arg.group = NUM2GIDT(g);
+	arg.group = NUM2INT(g);
     }
 
     n = apply2files(chown_internal, rest, &arg);
@@ -1976,7 +1900,8 @@ rb_file_s_chown(int argc, VALUE *argv)
  */
 
 static VALUE
-rb_file_chown(VALUE obj, VALUE owner, VALUE group)
+rb_file_chown(obj, owner, group)
+    VALUE obj, owner, group;
 {
     rb_io_t *fptr;
     int o, g;
@@ -1990,7 +1915,7 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
     if (chown(fptr->path, o, g) == -1)
 	rb_sys_fail(fptr->path);
 #else
-    if (fchown(fptr->fd, o, g) == -1)
+    if (fchown(fileno(fptr->f), o, g) == -1)
 	rb_sys_fail(fptr->path);
 #endif
 
@@ -1998,10 +1923,13 @@ rb_file_chown(VALUE obj, VALUE owner, VALUE group)
 }
 
 #if defined(HAVE_LCHOWN) && !defined(__CHECKER__)
+static void lchown_internal _((const char *, void *));
 static void
-lchown_internal(const char *path, void *arg)
+lchown_internal(path, argp)
+    const char *path;
+    void *argp;
 {
-    struct chown_args *args = arg;
+    struct chown_args *args = (struct chown_args *)argp;
     if (lchown(path, args->owner, args->group) < 0)
 	rb_sys_fail(path);
 }
@@ -2019,7 +1947,9 @@ lchown_internal(const char *path, void *arg)
  */
 
 static VALUE
-rb_file_s_lchown(int argc, VALUE *argv)
+rb_file_s_lchown(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE o, g, rest;
     struct chown_args arg;
@@ -2031,13 +1961,13 @@ rb_file_s_lchown(int argc, VALUE *argv)
 	arg.owner = -1;
     }
     else {
-	arg.owner = NUM2UIDT(o);
+	arg.owner = NUM2INT(o);
     }
     if (NIL_P(g)) {
 	arg.group = -1;
     }
     else {
-	arg.group = NUM2GIDT(g);
+	arg.group = NUM2INT(g);
     }
 
     n = apply2files(lchown_internal, rest, &arg);
@@ -2045,50 +1975,61 @@ rb_file_s_lchown(int argc, VALUE *argv)
 }
 #else
 static VALUE
-rb_file_s_lchown(int argc, VALUE *argv)
+rb_file_s_lchown(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     rb_notimplement();
 }
 #endif
 
-struct timespec rb_time_timespec(VALUE time);
+struct timeval rb_time_timeval();
 
-#if defined(HAVE_UTIMES)
+static void utime_internal _((const char *, void *));
 
-static void
-utime_internal(const char *path, void *arg)
-{
-    struct timespec *tsp = arg;
-    struct timeval tvbuf[2], *tvp = arg;
-
-#ifdef HAVE_UTIMENSAT
-    static int try_utimensat = 1;
-
-    if (try_utimensat) {
-        struct timespec *tsp = arg;
-        if (utimensat(AT_FDCWD, path, tsp, 0) < 0) {
-            if (errno == ENOSYS) {
-                try_utimensat = 0;
-                goto no_utimensat;
-            }
-            rb_sys_fail(path);
-        }
-        return;
-    }
-no_utimensat:
-#endif
+#if defined(HAVE_UTIMES) && !defined(__CHECKER__)
 
-    if (tsp) {
-        tvbuf[0].tv_sec = tsp[0].tv_sec;
-        tvbuf[0].tv_usec = tsp[0].tv_nsec / 1000;
-        tvbuf[1].tv_sec = tsp[1].tv_sec;
-        tvbuf[1].tv_usec = tsp[1].tv_nsec / 1000;
-        tvp = tvbuf;
-    }
+static void
+utime_internal(path, arg)
+    const char *path;
+    void *arg;
+{
+    struct timeval *tvp = arg;
     if (utimes(path, tvp) < 0)
 	rb_sys_fail(path);
 }
 
+/*
+ * call-seq:
+ *  File.utime(atime, mtime, file_name,...)   =>  integer
+ *
+ * Sets the access and modification times of each
+ * named file to the first two arguments. Returns
+ * the number of file names in the argument list.
+ */
+
+static VALUE
+rb_file_s_utime(argc, argv)
+    int argc;
+    VALUE *argv;
+{
+    VALUE atime, mtime, rest;
+    struct timeval tvs[2], *tvp = NULL;
+    long n;
+
+    rb_secure(2);
+    rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
+
+    if (!NIL_P(atime) || !NIL_P(mtime)) {
+	tvp = tvs;
+	tvp[0] = rb_time_timeval(atime);
+	tvp[1] = rb_time_timeval(mtime);
+    }
+
+    n = apply2files(utime_internal, rest, tvp);
+    return LONG2FIX(n);
+}
+
 #else
 
 #if !defined HAVE_UTIME_H && !defined HAVE_SYS_UTIME_H
@@ -2099,81 +2040,52 @@ struct utimbuf {
 #endif
 
 static void
-utime_internal(const char *path, void *arg)
+utime_internal(path, arg)
+    const char *path;
+    void *arg;
 {
-    struct timespec *tsp = arg;
-    struct utimbuf utbuf, *utp = NULL;
-    if (tsp) {
-        utbuf.actime = tsp[0].tv_sec;
-        utbuf.modtime = tsp[1].tv_sec;
-        utp = &utbuf;
-    }
+    struct utimbuf *utp = arg;
     if (utime(path, utp) < 0)
 	rb_sys_fail(path);
 }
 
-#endif
-
-/*
- * call-seq:
- *  File.utime(atime, mtime, file_name,...)   =>  integer
- *
- * Sets the access and modification times of each
- * named file to the first two arguments. Returns
- * the number of file names in the argument list.
- */
-
 static VALUE
-rb_file_s_utime(int argc, VALUE *argv)
+rb_file_s_utime(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE atime, mtime, rest;
-    struct timespec tss[2], *tsp = NULL;
     long n;
+    struct timeval tv;
+    struct utimbuf utbuf, *utp = NULL;
 
-    rb_secure(2);
     rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest);
 
     if (!NIL_P(atime) || !NIL_P(mtime)) {
-	tsp = tss;
-	tsp[0] = rb_time_timespec(atime);
-	tsp[1] = rb_time_timespec(mtime);
+	utp = &utbuf;
+	tv = rb_time_timeval(atime);
+	utp->actime = tv.tv_sec;
+	tv = rb_time_timeval(mtime);
+	utp->modtime = tv.tv_sec;
     }
 
-    n = apply2files(utime_internal, rest, tsp);
+    n = apply2files(utime_internal, rest, utp);
     return LONG2FIX(n);
 }
 
+#endif
 
-NORETURN(static void sys_fail2(VALUE,VALUE));
+NORETURN(static void sys_fail2 _((VALUE,VALUE)));
 static void
-sys_fail2(VALUE s1, VALUE s2)
+sys_fail2(s1, s2)
+    VALUE s1, s2;
 {
     char *buf;
-#ifdef MAX_PATH
-    const int max_pathlen = MAX_PATH;
-#else
-    const int max_pathlen = MAXPATHLEN;
-#endif
-    const char *e1, *e2;
-    int len = 5;
-    int l1 = RSTRING_LEN(s1), l2 = RSTRING_LEN(s2);
+    int len;
 
-    e1 = e2 = "";
-    if (l1 > max_pathlen) {
-	l1 = max_pathlen - 3;
-	e1 = "...";
-	len += 3;
-    }
-    if (l2 > max_pathlen) {
-	l2 = max_pathlen - 3;
-	e2 = "...";
-	len += 3;
-    }
-    len += l1 + l2;
+    len = RSTRING(s1)->len + RSTRING(s2)->len + 5;
     buf = ALLOCA_N(char, len);
-    snprintf(buf, len, "(%.*s%s, %.*s%s)",
-	     l1, RSTRING_PTR(s1), e1,
-	     l2, RSTRING_PTR(s2), e2);
+    snprintf(buf, len, "%s or %s", RSTRING(s1)->ptr, RSTRING(s2)->ptr);
     rb_sys_fail(buf);
 }
 
@@ -2190,12 +2102,12 @@ sys_fail2(VALUE s1, VALUE s2)
  */
 
 static VALUE
-rb_file_s_link(VALUE klass, VALUE from, VALUE to)
+rb_file_s_link(klass, from, to)
+    VALUE klass, from, to;
 {
 #ifdef HAVE_LINK
-    rb_secure(2);
-    FilePathValue(from);
-    FilePathValue(to);
+    SafeStringValue(from);
+    SafeStringValue(to);
 
     if (link(StringValueCStr(from), StringValueCStr(to)) < 0) {
 	sys_fail2(from, to);
@@ -2220,12 +2132,12 @@ rb_file_s_link(VALUE klass, VALUE from, VALUE to)
  */
 
 static VALUE
-rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
+rb_file_s_symlink(klass, from, to)
+    VALUE klass, from, to;
 {
 #ifdef HAVE_SYMLINK
-    rb_secure(2);
-    FilePathValue(from);
-    FilePathValue(to);
+    SafeStringValue(from);
+    SafeStringValue(to);
 
     if (symlink(StringValueCStr(from), StringValueCStr(to)) < 0) {
 	sys_fail2(from, to);
@@ -2249,7 +2161,8 @@ rb_file_s_symlink(VALUE klass, VALUE from, VALUE to)
  */
 
 static VALUE
-rb_file_s_readlink(VALUE klass, VALUE path)
+rb_file_s_readlink(klass, path)
+    VALUE klass, path;
 {
 #ifdef HAVE_READLINK
     char *buf;
@@ -2257,10 +2170,9 @@ rb_file_s_readlink(VALUE klass, VALUE path)
     int rv;
     VALUE v;
 
-    rb_secure(2);
-    FilePathValue(path);
+    SafeStringValue(path);
     buf = xmalloc(size);
-    while ((rv = readlink(RSTRING_PTR(path), buf, size)) == size
+    while ((rv = readlink(RSTRING(path)->ptr, buf, size)) == size
 #ifdef _AIX
 	    || (rv < 0 && errno == ERANGE) /* quirky behavior of GPFS */
 #endif
@@ -2269,11 +2181,11 @@ rb_file_s_readlink(VALUE klass, VALUE path)
 	buf = xrealloc(buf, size);
     }
     if (rv < 0) {
-	xfree(buf);
-	rb_sys_fail(RSTRING_PTR(path));
+	free(buf);
+	rb_sys_fail(RSTRING(path)->ptr);
     }
     v = rb_tainted_str_new(buf, rv);
-    xfree(buf);
+    free(buf);
 
     return v;
 #else
@@ -2282,8 +2194,11 @@ rb_file_s_readlink(VALUE klass, VALUE path)
 #endif
 }
 
+static void unlink_internal _((const char *, void *));
 static void
-unlink_internal(const char *path, void *arg)
+unlink_internal(path, arg)
+    const char *path;
+    void *arg;
 {
     if (unlink(path) < 0)
 	rb_sys_fail(path);
@@ -2300,7 +2215,8 @@ unlink_internal(const char *path, void *arg)
  */
 
 static VALUE
-rb_file_s_unlink(VALUE klass, VALUE args)
+rb_file_s_unlink(klass, args)
+    VALUE klass, args;
 {
     long n;
 
@@ -2320,13 +2236,13 @@ rb_file_s_unlink(VALUE klass, VALUE args)
  */
 
 static VALUE
-rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
+rb_file_s_rename(klass, from, to)
+    VALUE klass, from, to;
 {
     const char *src, *dst;
+    SafeStringValue(from);
+    SafeStringValue(to);
 
-    rb_secure(2);
-    FilePathValue(from);
-    FilePathValue(to);
     src = StringValueCStr(from);
     dst = StringValueCStr(to);
 #if defined __CYGWIN__
@@ -2367,7 +2283,9 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to)
  */
 
 static VALUE
-rb_file_s_umask(int argc, VALUE *argv)
+rb_file_s_umask(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     int omask = 0;
 
@@ -2402,6 +2320,10 @@ rb_file_s_umask(int argc, VALUE *argv)
 #define USE_NTFS 0
 #endif
 
+#ifdef DOSISH_DRIVE_LETTER
+#include <ctype.h>
+#endif
+
 #if USE_NTFS
 #define istrailinggabage(x) ((x) == '.' || (x) == ' ')
 #else
@@ -2410,7 +2332,7 @@ rb_file_s_umask(int argc, VALUE *argv)
 
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 # if defined(DJGPP)
-#   define CharNext(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
+#   define CharNext(p) ((p) + mblen(p, MB_CUR_MAX))
 # else
 #   define CharNext(p) ((p) + 1)
 # endif
@@ -2418,7 +2340,8 @@ rb_file_s_umask(int argc, VALUE *argv)
 
 #ifdef DOSISH_DRIVE_LETTER
 static inline int
-has_drive_letter(const char *buf)
+has_drive_letter(buf)
+    const char *buf;
 {
     if (ISALPHA(buf[0]) && buf[1] == ':') {
 	return 1;
@@ -2429,7 +2352,8 @@ has_drive_letter(const char *buf)
 }
 
 static char*
-getcwdofdrv(int drv)
+getcwdofdrv(drv)
+    int drv;
 {
     char drive[4];
     char *drvcwd, *oldcwd;
@@ -2446,7 +2370,7 @@ getcwdofdrv(int drv)
     if (chdir(drive) == 0) {
 	drvcwd = my_getcwd();
 	chdir(oldcwd);
-	xfree(oldcwd);
+	free(oldcwd);
     }
     else {
 	/* perhaps the drive is not exist. we return only drive letter */
@@ -2457,7 +2381,8 @@ getcwdofdrv(int drv)
 #endif
 
 static inline char *
-skiproot(const char *path)
+skiproot(path)
+    const char *path;
 {
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(path)) path += 2;
@@ -2468,7 +2393,8 @@ skiproot(const char *path)
 
 #define nextdirsep rb_path_next
 char *
-rb_path_next(const char *s)
+rb_path_next(s)
+    const char *s;
 {
     while (*s && !isdirsep(*s)) {
 	s = CharNext(s);
@@ -2482,7 +2408,8 @@ rb_path_next(const char *s)
 #define skipprefix(path) (path)
 #endif
 char *
-rb_path_skip_prefix(const char *path)
+rb_path_skip_prefix(path)
+    const char *path;
 {
 #if defined(DOSISH_UNC) || defined(DOSISH_DRIVE_LETTER) 
 #ifdef DOSISH_UNC
@@ -2504,7 +2431,8 @@ rb_path_skip_prefix(const char *path)
 
 #define strrdirsep rb_path_last_separator
 char *
-rb_path_last_separator(const char *path)
+rb_path_last_separator(path)
+    const char *path;
 {
     char *last = NULL;
     while (*path) {
@@ -2522,7 +2450,8 @@ rb_path_last_separator(const char *path)
 }
 
 static char *
-chompdirsep(const char *path)
+chompdirsep(path)
+    const char *path;
 {
     while (*path) {
 	if (isdirsep(*path)) {
@@ -2538,7 +2467,8 @@ chompdirsep(const char *path)
 }
 
 char *
-rb_path_end(const char *path)
+rb_path_end(path)
+    const char *path;
 {
     if (isdirsep(*path)) path++;
     return chompdirsep(path);
@@ -2581,26 +2511,25 @@ ntfs_tail(const char *path)
 } while (0)
 
 #define BUFINIT() (\
-    p = buf = RSTRING_PTR(result),\
-    buflen = RSTRING_LEN(result),\
+    p = buf = RSTRING(result)->ptr,\
+    buflen = RSTRING(result)->len,\
     pend = p + buflen)
 
-#define SET_EXTERNAL_ENCODING() (\
-    (void)(extenc || (extenc = rb_default_external_encoding())),\
-    rb_enc_associate(result, extenc))
+#if !defined(TOLOWER)
+#define TOLOWER(c) (ISUPPER(c) ? tolower(c) : (c))
+#endif
 
-static int is_absolute_path(const char*);
+static int is_absolute_path _((const char*));
 
 static VALUE
-file_expand_path(VALUE fname, VALUE dname, VALUE result)
+file_expand_path(fname, dname, result)
+    VALUE fname, dname, result;
 {
     const char *s, *b;
     char *buf, *p, *pend, *root;
     long buflen, dirlen;
     int tainted;
-    rb_encoding *extenc = 0;
 
-    FilePathValue(fname);
     s = StringValuePtr(fname);
     BUFINIT();
     tainted = OBJ_TAINTED(fname);
@@ -2626,7 +2555,6 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 #endif
 	    s++;
 	    tainted = 1;
-	    SET_EXTERNAL_ENCODING();
 	}
 	else {
 #ifdef HAVE_PWD_H
@@ -2681,8 +2609,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 		dirlen = strlen(dir);
 		BUFCHECK(dirlen > buflen);
 		strcpy(buf, dir);
-		xfree(dir);
-		SET_EXTERNAL_ENCODING();
+		free(dir);
 	    }
 	    p = chompdirsep(skiproot(buf));
 	    s += 2;
@@ -2701,8 +2628,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 	    dirlen = strlen(dir);
 	    BUFCHECK(dirlen > buflen);
 	    strcpy(buf, dir);
-	    xfree(dir);
-	    SET_EXTERNAL_ENCODING();
+	    free(dir);
 	}
 #if defined DOSISH || defined __CYGWIN__
 	if (isdirsep(*s)) {
@@ -2723,11 +2649,8 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
     }
     if (p > buf && p[-1] == '/')
 	--p;
-    else {
-	++buflen;
-	BUFCHECK(bdiff >= buflen);
+    else
 	*p = '/';
-    }
 
     p[1] = 0;
     root = skipprefix(buf);
@@ -2842,7 +2765,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 	    *p = '\\';
 	    strlcat(w32buf, p, sizeof(w32buf));
 	    len = strlen(p);
-	    if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) {
+	    if (len > 4 && strcasecmp(p + len - 4, ".lnk") != 0) {
 		lnk_added = 1;
 		strlcat(w32buf, ".lnk", sizeof(w32buf));
 	    }
@@ -2855,7 +2778,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 	    len = strlen(wfd.cFileName);
 #ifdef __CYGWIN__
 	    if (lnk_added && len > 4 &&
-		STRCASECMP(wfd.cFileName + len - 4, ".lnk") == 0) {
+		strcasecmp(wfd.cFileName + len - 4, ".lnk") == 0) {
 		wfd.cFileName[len -= 4] = '\0';
 	    }
 #else
@@ -2876,14 +2799,14 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result)
 
     if (tainted) OBJ_TAINT(result);
     rb_str_set_len(result, p - buf);
-    rb_enc_check(fname, result);
     return result;
 }
 
 VALUE
-rb_file_expand_path(VALUE fname, VALUE dname)
+rb_file_expand_path(fname, dname)
+    VALUE fname, dname;
 {
-    return file_expand_path(fname, dname, rb_usascii_str_new(0, MAXPATHLEN + 2));
+    return file_expand_path(fname, dname, rb_str_new(0, MAXPATHLEN + 2));
 }
 
 /*
@@ -2904,7 +2827,9 @@ rb_file_expand_path(VALUE fname, VALUE dname)
  */
 
 VALUE
-rb_file_s_expand_path(int argc, VALUE *argv)
+rb_file_s_expand_path(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE fname, dname;
 
@@ -2917,7 +2842,9 @@ rb_file_s_expand_path(int argc, VALUE *argv)
 }
 
 static int
-rmext(const char *p, int l1, const char *e)
+rmext(p, l1, e)
+    const char *p, *e;
+    int l1;
 {
     int l2;
 
@@ -2960,7 +2887,9 @@ rmext(const char *p, int l1, const char *e)
  */
 
 static VALUE
-rb_file_s_basename(int argc, VALUE *argv)
+rb_file_s_basename(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE fname, fext, basename;
     const char *name, *p;
@@ -2972,8 +2901,8 @@ rb_file_s_basename(int argc, VALUE *argv)
     if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) {
 	StringValue(fext);
     }
-    FilePathStringValue(fname);
-    if (RSTRING_LEN(fname) == 0 || !*(name = RSTRING_PTR(fname)))
+    StringValue(fname);
+    if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr))
 	return fname;
     name = skipprefix(name);
 #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC
@@ -3019,7 +2948,6 @@ rb_file_s_basename(int argc, VALUE *argv)
 	if (f == RSTRING_LEN(fname)) return fname;
     }
     basename = rb_str_new(p, f);
-    rb_enc_copy(basename, fname);
     OBJ_INFECT(basename, fname);
     return basename;
 }
@@ -3037,12 +2965,12 @@ rb_file_s_basename(int argc, VALUE *argv)
  */
 
 static VALUE
-rb_file_s_dirname(VALUE klass, VALUE fname)
+rb_file_s_dirname(klass, fname)
+    VALUE klass, fname;
 {
     const char *name, *root, *p;
     VALUE dirname;
 
-    FilePathStringValue(fname);
     name = StringValueCStr(fname);
     root = skiproot(name);
 #ifdef DOSISH_UNC
@@ -3057,7 +2985,7 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
 	p = root;
     }
     if (p == name)
-	return rb_usascii_str_new2(".");
+	return rb_str_new2(".");
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(name) && isdirsep(*(name + 2))) {
 	const char *top = skiproot(name + 2);
@@ -3071,7 +2999,6 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
     if (has_drive_letter(name) && root == name + 2 && p - name == 2)
 	rb_str_cat(dirname, ".", 1);
 #endif
-    rb_enc_copy(dirname, fname);
     OBJ_INFECT(dirname, fname);
     return dirname;
 }
@@ -3091,12 +3018,12 @@ rb_file_s_dirname(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_s_extname(VALUE klass, VALUE fname)
+rb_file_s_extname(klass, fname)
+    VALUE klass, fname;
 {
     const char *name, *p, *e;
     VALUE extname;
 
-    FilePathStringValue(fname);
     name = StringValueCStr(fname);
     p = strrdirsep(name);	/* get the last path component */
     if (!p)
@@ -3135,30 +3062,12 @@ rb_file_s_extname(VALUE klass, VALUE fname)
     if (!e || e == name || e+1 == p)	/* no dot, or the only dot is first or end? */
 	return rb_str_new(0, 0);
     extname = rb_str_new(e, p - e);	/* keep the dot, too! */
-    rb_enc_copy(extname, fname);
     OBJ_INFECT(extname, fname);
     return extname;
 }
 
 /*
  *  call-seq:
- *     File.path(path) -> string
- *  
- *  Returns the string representation of the path
- * 
- *     File.path("/dev/null")          #=> "/dev/null"
- *     File.path(Pathname.new("/tmp")) #=> "/tmp"
- *     
- */
-
-static VALUE
-rb_file_s_path(VALUE klass, VALUE fname)
-{
-    return rb_get_path(fname);
-}
-
-/*
- *  call-seq:
  *     File.split(file_name)   => array
  *  
  *  Splits the given string into a directory and a file component and
@@ -3169,78 +3078,86 @@ rb_file_s_path(VALUE klass, VALUE fname)
  */
 
 static VALUE
-rb_file_s_split(VALUE klass, VALUE path)
+rb_file_s_split(klass, path)
+    VALUE klass, path;
 {
-    FilePathStringValue(path);		/* get rid of converting twice */
+    StringValue(path);		/* get rid of converting twice */
     return rb_assoc_new(rb_file_s_dirname(Qnil, path), rb_file_s_basename(1,&path));
 }
 
 static VALUE separator;
 
-static VALUE rb_file_join(VALUE ary, VALUE sep);
+static VALUE rb_file_join _((VALUE ary, VALUE sep));
 
 static VALUE
-file_inspect_join(VALUE ary, VALUE argp, int recur)
+file_inspect_join(ary, arg)
+    VALUE ary;
+    VALUE *arg;
 {
-    VALUE *arg = (VALUE *)argp;
-    if (recur) return rb_usascii_str_new2("[...]");
     return rb_file_join(arg[0], arg[1]);
 }
 
 static VALUE
-rb_file_join(VALUE ary, VALUE sep)
+rb_file_join(ary, sep)
+    VALUE ary, sep;
 {
     long len, i;
+    int taint = 0;
     VALUE result, tmp;
     const char *name, *tail;
 
-    if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
+    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
+    if (OBJ_TAINTED(ary)) taint = 1;
+    if (OBJ_TAINTED(sep)) taint = 1;
 
     len = 1;
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (TYPE(RARRAY_PTR(ary)[i]) == T_STRING) {
-	    len += RSTRING_LEN(RARRAY_PTR(ary)[i]);
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	if (TYPE(RARRAY(ary)->ptr[i]) == T_STRING) {
+	    len += RSTRING(RARRAY(ary)->ptr[i])->len;
 	}
 	else {
 	    len += 10;
 	}
     }
-    if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING_LEN(sep) * RARRAY_LEN(ary) - 1;
+    if (!NIL_P(sep) && TYPE(sep) == T_STRING) {
+	len += RSTRING(sep)->len * RARRAY(ary)->len - 1;
     }
     result = rb_str_buf_new(len);
-    OBJ_INFECT(result, ary);
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	tmp = RARRAY_PTR(ary)[i];
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
 	switch (TYPE(tmp)) {
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    {
+	    if (rb_inspecting_p(tmp)) {
+		tmp = rb_str_new2("[...]");
+	    }
+	    else {
 		VALUE args[2];
 
 		args[0] = tmp;
 		args[1] = sep;
-		tmp = rb_exec_recursive(file_inspect_join, ary, (VALUE)args);
+		tmp = rb_protect_inspect(file_inspect_join, ary, (VALUE)args);
 	    }
 	    break;
 	  default:
-	    FilePathStringValue(tmp);
+	    StringValueCStr(tmp);
 	}
 	name = StringValueCStr(result);
 	if (i > 0 && !NIL_P(sep)) {
 	    tail = chompdirsep(name);
-	    if (RSTRING_PTR(tmp) && isdirsep(RSTRING_PTR(tmp)[0])) {
-		rb_str_set_len(result, tail - name);
+	    if (RSTRING(tmp)->ptr && isdirsep(RSTRING(tmp)->ptr[0])) {
+		RSTRING(result)->len = tail - name;
 	    }
 	    else if (!*tail) {
 		rb_str_buf_append(result, sep);
 	    }
 	}
 	rb_str_buf_append(result, tmp);
+	if (OBJ_TAINTED(tmp)) taint = 1;
     }
 
+    if (taint) OBJ_TAINT(result);
     return result;
 }
 
@@ -3256,7 +3173,8 @@ rb_file_join(VALUE ary, VALUE sep)
  */
 
 static VALUE
-rb_file_s_join(VALUE klass, VALUE args)
+rb_file_s_join(klass, args)
+    VALUE klass, args;
 {
     return rb_file_join(args, separator);
 }
@@ -3277,16 +3195,18 @@ rb_file_s_join(VALUE klass, VALUE args)
  */
 
 static VALUE
-rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
+rb_file_s_truncate(klass, path, len)
+    VALUE klass, path, len;
 {
     off_t pos;
 
     rb_secure(2);
     pos = NUM2OFFT(len);
-    FilePathValue(path);
+    SafeStringValue(path);
+
 #ifdef HAVE_TRUNCATE
     if (truncate(StringValueCStr(path), pos) < 0)
-	rb_sys_fail(RSTRING_PTR(path));
+	rb_sys_fail(RSTRING(path)->ptr);
 #else
 # ifdef HAVE_CHSIZE
     {
@@ -3294,16 +3214,16 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
 
 #  ifdef _WIN32
 	if ((tmpfd = open(StringValueCStr(path), O_RDWR)) < 0) {
-	    rb_sys_fail(RSTRING_PTR(path));
+	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 #  else
 	if ((tmpfd = open(StringValueCStr(path), 0)) < 0) {
-	    rb_sys_fail(RSTRING_PTR(path));
+	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 #  endif
 	if (chsize(tmpfd, pos) < 0) {
 	    close(tmpfd);
-	    rb_sys_fail(RSTRING_PTR(path));
+	    rb_sys_fail(RSTRING(path)->ptr);
 	}
 	close(tmpfd);
     }
@@ -3329,9 +3249,11 @@ rb_file_s_truncate(VALUE klass, VALUE path, VALUE len)
  */
 
 static VALUE
-rb_file_truncate(VALUE obj, VALUE len)
+rb_file_truncate(obj, len)
+    VALUE obj, len;
 {
     rb_io_t *fptr;
+    FILE *f;
     off_t pos;
 
     rb_secure(2);
@@ -3340,13 +3262,15 @@ rb_file_truncate(VALUE obj, VALUE len)
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-    rb_io_flush(obj);
+    f = GetWriteFile(fptr);
+    fflush(f);
+    fseeko(f, (off_t)0, SEEK_CUR);
 #ifdef HAVE_FTRUNCATE
-    if (ftruncate(fptr->fd, pos) < 0)
+    if (ftruncate(fileno(f), pos) < 0)
 	rb_sys_fail(fptr->path);
 #else
 # ifdef HAVE_CHSIZE
-    if (chsize(fptr->fd, pos) < 0)
+    if (chsize(fileno(f), pos) < 0)
 	rb_sys_fail(fptr->path);
 # else
     rb_notimplement();
@@ -3371,24 +3295,54 @@ rb_file_truncate(VALUE obj, VALUE len)
 #ifdef __CYGWIN__
 #include <winerror.h>
 extern unsigned long __attribute__((stdcall)) GetLastError(void);
-#endif
 
-static VALUE
-rb_thread_flock(void *data)
+static int
+cygwin_flock(int fd, int op)
 {
-#ifdef __CYGWIN__
     int old_errno = errno;
-#endif
-    int *op = data, ret = flock(op[0], op[1]);
-
-#ifdef __CYGWIN__
+    int ret = flock(fd, op);
     if (GetLastError() == ERROR_NOT_LOCKED) {
 	ret = 0;
 	errno = old_errno;
     }
+    return ret;
+}
+# define flock(fd, op) cygwin_flock(fd, op)
+#endif
+
+static int
+rb_thread_flock(fd, op, fptr)
+    int fd, op;
+    rb_io_t *fptr;
+{
+    if (rb_thread_alone() || (op & LOCK_NB)) {
+	int ret;
+	TRAP_BEG;
+	ret = flock(fd, op);
+	TRAP_END;
+	return ret;
+    }
+    op |= LOCK_NB;
+    while (flock(fd, op) < 0) {
+	switch (errno) {
+	  case EAGAIN:
+	  case EACCES:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+	  case EWOULDBLOCK:
 #endif
-    return (VALUE)ret;
+	    rb_thread_polling();	/* busy wait */
+	    rb_io_check_closed(fptr);
+	    continue;
+	  default:
+	    return -1;
+	}
+    }
+    return 0;
 }
+#ifdef __CYGWIN__
+# undef flock
+#endif
+#define flock(fd, op) rb_thread_flock(fd, op, fptr)
 
 /*
  *  call-seq:
@@ -3420,41 +3374,37 @@ rb_thread_flock(void *data)
  */
 
 static VALUE
-rb_file_flock(VALUE obj, VALUE operation)
+rb_file_flock(obj, operation)
+    VALUE obj;
+    VALUE operation;
 {
 #ifndef __CHECKER__
     rb_io_t *fptr;
-    int op[2], op1;
+    int op;
 
     rb_secure(2);
-    op[1] = op1 = NUM2INT(operation);
+    op = NUM2INT(operation);
     GetOpenFile(obj, fptr);
-    op[0] = fptr->fd;
 
     if (fptr->mode & FMODE_WRITABLE) {
-	rb_io_flush(obj);
+	fflush(GetWriteFile(fptr));
     }
-    while ((int)rb_thread_blocking_region(rb_thread_flock, op, RB_UBF_DFL, 0) < 0) {
+  retry:
+    if (flock(fileno(fptr->f), op) < 0) {
 	switch (errno) {
 	  case EAGAIN:
 	  case EACCES:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-	    if (op1 & LOCK_NB) return Qfalse;
-	    rb_thread_polling();
-	    rb_io_check_closed(fptr);
-	    continue;
-
+	      return Qfalse;
 	  case EINTR:
 #if defined(ERESTART)
 	  case ERESTART:
 #endif
-	    break;
-
-	  default:
-	    rb_sys_fail(fptr->path);
+	    goto retry;
 	}
+	rb_sys_fail(fptr->path);
     }
 #endif
     return INT2FIX(0);
@@ -3462,18 +3412,19 @@ rb_file_flock(VALUE obj, VALUE operation)
 #undef flock
 
 static void
-test_check(int n, int argc, VALUE *argv)
+test_check(n, argc, argv)
+    int n, argc;
+    VALUE *argv;
 {
     int i;
 
-    rb_secure(2);
     n+=1;
     if (n != argc) rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
     for (i=1; i<n; i++) {
 	switch (TYPE(argv[i])) {
 	  case T_STRING:
 	  default:
-	    FilePathValue(argv[i]);
+	    SafeStringValue(argv[i]);
 	    break;
 	  case T_FILE:
 	    break;
@@ -3543,82 +3494,89 @@ test_check(int n, int argc, VALUE *argv)
  */
 
 static VALUE
-rb_f_test(int argc, VALUE *argv)
+rb_f_test(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     int cmd;
 
     if (argc == 0) rb_raise(rb_eArgError, "wrong number of arguments");
+#if 0 /* 1.7 behavior? */
+    if (argc == 1) {
+	return RTEST(argv[0]) ? Qtrue : Qfalse;
+    }
+#endif
     cmd = NUM2CHR(argv[0]);
-    if (cmd == 0) goto unknown;
+    if (cmd == 0) return Qfalse;
     if (strchr("bcdefgGkloOprRsSuwWxXz", cmd)) {
 	CHECK(1);
 	switch (cmd) {
 	  case 'b':
-	    return rb_file_blockdev_p(0, argv[1]);
+	    return test_b(0, argv[1]);
 
 	  case 'c':
-	    return rb_file_chardev_p(0, argv[1]);
+	    return test_c(0, argv[1]);
 
 	  case 'd':
-	    return rb_file_directory_p(0, argv[1]);
+	    return test_d(0, argv[1]);
 
 	  case 'a':
 	  case 'e':
-	    return rb_file_exist_p(0, argv[1]);
+	    return test_e(0, argv[1]);
 
 	  case 'f':
-	    return rb_file_file_p(0, argv[1]);
+	    return test_f(0, argv[1]);
 
 	  case 'g':
-	    return rb_file_sgid_p(0, argv[1]);
+	    return test_sgid(0, argv[1]);
 
 	  case 'G':
-	    return rb_file_grpowned_p(0, argv[1]);
+	    return test_grpowned(0, argv[1]);
 
 	  case 'k':
-	    return rb_file_sticky_p(0, argv[1]);
+	    return test_sticky(0, argv[1]);
 
 	  case 'l':
-	    return rb_file_symlink_p(0, argv[1]);
+	    return test_l(0, argv[1]);
 
 	  case 'o':
-	    return rb_file_owned_p(0, argv[1]);
+	    return test_owned(0, argv[1]);
 
 	  case 'O':
-	    return rb_file_rowned_p(0, argv[1]);
+	    return test_rowned(0, argv[1]);
 
 	  case 'p':
-	    return rb_file_pipe_p(0, argv[1]);
+	    return test_p(0, argv[1]);
 
 	  case 'r':
-	    return rb_file_readable_p(0, argv[1]);
+	    return test_r(0, argv[1]);
 
 	  case 'R':
-	    return rb_file_readable_real_p(0, argv[1]);
+	    return test_R(0, argv[1]);
 
 	  case 's':
-	    return rb_file_size_p(0, argv[1]);
+	    return test_s(0, argv[1]);
 
 	  case 'S':
-	    return rb_file_socket_p(0, argv[1]);
+	    return test_S(0, argv[1]);
 
 	  case 'u':
-	    return rb_file_suid_p(0, argv[1]);
+	    return test_suid(0, argv[1]);
 
 	  case 'w':
-	    return rb_file_writable_p(0, argv[1]);
+	    return test_w(0, argv[1]);
 
 	  case 'W':
-	    return rb_file_world_writable_p(0, argv[1]);
+	    return test_W(0, argv[1]);
 
 	  case 'x':
-	    return rb_file_executable_p(0, argv[1]);
+	    return test_x(0, argv[1]);
 
 	  case 'X':
-	    return rb_file_executable_real_p(0, argv[1]);
+	    return test_X(0, argv[1]);
 
 	  case 'z':
-	    return rb_file_zero_p(0, argv[1]);
+	    return test_z(0, argv[1]);
 	}
     }
 
@@ -3627,22 +3585,22 @@ rb_f_test(int argc, VALUE *argv)
 
 	CHECK(1);
 	if (rb_stat(argv[1], &st) == -1) {
-	    rb_sys_fail(RSTRING_PTR(argv[1]));
+	    rb_sys_fail(RSTRING(argv[1])->ptr);
 	}
 
 	switch (cmd) {
 	  case 'A':
-	    return stat_atime(&st);
+	    return rb_time_new(st.st_atime, 0);
 	  case 'M':
-	    return stat_mtime(&st);
+	    return rb_time_new(st.st_mtime, 0);
 	  case 'C':
-	    return stat_ctime(&st);
+	    return rb_time_new(st.st_ctime, 0);
 	}
     }
 
     if (cmd == '-') {
 	CHECK(2);
-	return rb_file_identical_p(0, argv[1], argv[2]);
+	return test_identical(0, argv[1], argv[2]);
     }
 
     if (strchr("=<>", cmd)) {
@@ -3666,14 +3624,8 @@ rb_f_test(int argc, VALUE *argv)
 	    return Qfalse;
 	}
     }
-  unknown:
     /* unknown command */
-    if (ISPRINT(cmd)) {
-	rb_raise(rb_eArgError, "unknown command ?%c", cmd);
-    }
-    else {
-	rb_raise(rb_eArgError, "unknown command ?\\x%02X", cmd);
-    }
+    rb_raise(rb_eArgError, "unknown command ?%c", cmd);
     return Qnil;		/* not reached */
 }
 
@@ -3693,8 +3645,10 @@ rb_f_test(int argc, VALUE *argv)
  *  meaningful on all systems. See also <code>Kernel#test</code>.
  */
 
+static VALUE rb_stat_s_alloc _((VALUE));
 static VALUE
-rb_stat_s_alloc(VALUE klass)
+rb_stat_s_alloc(klass)
+    VALUE klass;
 {
     return stat_new_0(klass, 0);
 }
@@ -3709,17 +3663,18 @@ rb_stat_s_alloc(VALUE klass)
  */
 
 static VALUE
-rb_stat_init(VALUE obj, VALUE fname)
+rb_stat_init(obj, fname)
+    VALUE obj, fname;
 {
     struct stat st, *nst;
 
-    rb_secure(2);
-    FilePathValue(fname);
+    SafeStringValue(fname);
+
     if (stat(StringValueCStr(fname), &st) == -1) {
-	rb_sys_fail(RSTRING_PTR(fname));
+	rb_sys_fail(RSTRING(fname)->ptr);
     }
     if (DATA_PTR(obj)) {
-	xfree(DATA_PTR(obj));
+	free(DATA_PTR(obj));
 	DATA_PTR(obj) = NULL;
     }
     nst = ALLOC(struct stat);
@@ -3731,7 +3686,8 @@ rb_stat_init(VALUE obj, VALUE fname)
 
 /* :nodoc: */
 static VALUE
-rb_stat_init_copy(VALUE copy, VALUE orig)
+rb_stat_init_copy(copy, orig)
+    VALUE copy, orig;
 {
     struct stat *nst;
 
@@ -3742,7 +3698,7 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
 	rb_raise(rb_eTypeError, "wrong argument class");
     }
     if (DATA_PTR(copy)) {
-	xfree(DATA_PTR(copy));
+	free(DATA_PTR(copy));
 	DATA_PTR(copy) = 0;
     }
     if (DATA_PTR(orig)) {
@@ -3769,7 +3725,8 @@ rb_stat_init_copy(VALUE copy, VALUE orig)
  */
 
 static VALUE
-rb_stat_ftype(VALUE obj)
+rb_stat_ftype(obj)
+    VALUE obj;
 {
     return rb_file_ftype(get_stat(obj));
 }
@@ -3786,7 +3743,8 @@ rb_stat_ftype(VALUE obj)
  */
 
 static VALUE
-rb_stat_d(VALUE obj)
+rb_stat_d(obj)
+    VALUE obj;
 {
     if (S_ISDIR(get_stat(obj)->st_mode)) return Qtrue;
     return Qfalse;
@@ -3801,7 +3759,8 @@ rb_stat_d(VALUE obj)
  */
 
 static VALUE
-rb_stat_p(VALUE obj)
+rb_stat_p(obj)
+    VALUE obj;
 {
 #ifdef S_IFIFO
     if (S_ISFIFO(get_stat(obj)->st_mode)) return Qtrue;
@@ -3828,7 +3787,8 @@ rb_stat_p(VALUE obj)
  */
 
 static VALUE
-rb_stat_l(VALUE obj)
+rb_stat_l(obj)
+    VALUE obj;
 {
 #ifdef S_ISLNK
     if (S_ISLNK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3849,7 +3809,8 @@ rb_stat_l(VALUE obj)
  */
 
 static VALUE
-rb_stat_S(VALUE obj)
+rb_stat_S(obj)
+    VALUE obj;
 {
 #ifdef S_ISSOCK
     if (S_ISSOCK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3872,7 +3833,8 @@ rb_stat_S(VALUE obj)
  */
 
 static VALUE
-rb_stat_b(VALUE obj)
+rb_stat_b(obj)
+    VALUE obj;
 {
 #ifdef S_ISBLK
     if (S_ISBLK(get_stat(obj)->st_mode)) return Qtrue;
@@ -3894,7 +3856,8 @@ rb_stat_b(VALUE obj)
  */
 
 static VALUE
-rb_stat_c(VALUE obj)
+rb_stat_c(obj)
+    VALUE obj;
 {
     if (S_ISCHR(get_stat(obj)->st_mode)) return Qtrue;
 
@@ -3914,14 +3877,16 @@ rb_stat_c(VALUE obj)
  */
 
 static VALUE
-rb_stat_owned(VALUE obj)
+rb_stat_owned(obj)
+    VALUE obj;
 {
     if (get_stat(obj)->st_uid == geteuid()) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-rb_stat_rowned(VALUE obj)
+rb_stat_rowned(obj)
+    VALUE obj;
 {
     if (get_stat(obj)->st_uid == getuid()) return Qtrue;
     return Qfalse;
@@ -3940,7 +3905,8 @@ rb_stat_rowned(VALUE obj)
  */
 
 static VALUE
-rb_stat_grpowned(VALUE obj)
+rb_stat_grpowned(obj)
+    VALUE obj;
 {
 #ifndef _WIN32
     if (group_member(get_stat(obj)->st_gid)) return Qtrue;
@@ -3960,7 +3926,8 @@ rb_stat_grpowned(VALUE obj)
  */
 
 static VALUE
-rb_stat_r(VALUE obj)
+rb_stat_r(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -3995,7 +3962,8 @@ rb_stat_r(VALUE obj)
  */
 
 static VALUE
-rb_stat_R(VALUE obj)
+rb_stat_R(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -4017,32 +3985,6 @@ rb_stat_R(VALUE obj)
 }
 
 /*
- * call-seq:
- *    stat.world_readable? => fixnum or nil
- *
- * If <i>stat</i> is readable by others, returns an integer
- * representing the file permission bits of <i>stat</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *     
- *    m = File.stat("/etc/passwd").world_readable?  # => 420
- *    sprintf("%o", m)				    # => "644"
- */
-
-static VALUE
-rb_stat_wr(VALUE obj)
-{
-#ifdef S_IROTH
-    if ((get_stat(obj)->st_mode & (S_IROTH)) == S_IROTH) {
-      return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
-    }
-    else {
-      return Qnil;
-    }
-#endif
-}
-
-/*
  *  call-seq:
  *     stat.writable? -> true or false
  *  
@@ -4054,7 +3996,8 @@ rb_stat_wr(VALUE obj)
  */
 
 static VALUE
-rb_stat_w(VALUE obj)
+rb_stat_w(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -4087,7 +4030,8 @@ rb_stat_w(VALUE obj)
  */
 
 static VALUE
-rb_stat_W(VALUE obj)
+rb_stat_W(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -4109,32 +4053,6 @@ rb_stat_W(VALUE obj)
 }
 
 /*
- * call-seq:
- *    stat.world_writable? => fixnum or nil
- *
- * If <i>stat</i> is writable by others, returns an integer
- * representing the file permission bits of <i>stat</i>. Returns
- * <code>nil</code> otherwise. The meaning of the bits is platform
- * dependent; on Unix systems, see <code>stat(2)</code>.
- *     
- *    m = File.stat("/tmp").world_writable?	    # => 511
- *    sprintf("%o", m)				    # => "777"
- */
-
-static VALUE
-rb_stat_ww(VALUE obj)
-{
-#ifdef S_IROTH
-    if ((get_stat(obj)->st_mode & (S_IWOTH)) == S_IWOTH) {
-      return UINT2NUM(get_stat(obj)->st_mode & (S_IRUGO|S_IWUGO|S_IXUGO));
-    }
-    else {
-      return Qnil;
-    }
-#endif
-}
-
-/*
  *  call-seq:
  *     stat.executable?    => true or false
  *  
@@ -4148,7 +4066,8 @@ rb_stat_ww(VALUE obj)
  */
 
 static VALUE
-rb_stat_x(VALUE obj)
+rb_stat_x(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -4181,7 +4100,8 @@ rb_stat_x(VALUE obj)
 
 
 static VALUE
-rb_stat_X(VALUE obj)
+rb_stat_X(obj)
+    VALUE obj;
 {
     struct stat *st = get_stat(obj);
 
@@ -4216,7 +4136,8 @@ rb_stat_X(VALUE obj)
  */
 
 static VALUE
-rb_stat_f(VALUE obj)
+rb_stat_f(obj)
+    VALUE obj;
 {
     if (S_ISREG(get_stat(obj)->st_mode)) return Qtrue;
     return Qfalse;
@@ -4234,7 +4155,8 @@ rb_stat_f(VALUE obj)
  */
 
 static VALUE
-rb_stat_z(VALUE obj)
+rb_stat_z(obj)
+    VALUE obj;
 {
     if (get_stat(obj)->st_size == 0) return Qtrue;
     return Qfalse;
@@ -4252,7 +4174,8 @@ rb_stat_z(VALUE obj)
  */
 
 static VALUE
-rb_stat_s(VALUE obj)
+rb_stat_s(obj)
+    VALUE obj;
 {
     off_t size = get_stat(obj)->st_size;
 
@@ -4272,7 +4195,8 @@ rb_stat_s(VALUE obj)
  */
 
 static VALUE
-rb_stat_suid(VALUE obj)
+rb_stat_suid(obj)
+    VALUE obj;
 {
 #ifdef S_ISUID
     if (get_stat(obj)->st_mode & S_ISUID) return Qtrue;
@@ -4293,7 +4217,8 @@ rb_stat_suid(VALUE obj)
  */
 
 static VALUE
-rb_stat_sgid(VALUE obj)
+rb_stat_sgid(obj)
+    VALUE obj;
 {
 #ifdef S_ISGID
     if (get_stat(obj)->st_mode & S_ISGID) return Qtrue;
@@ -4314,7 +4239,8 @@ rb_stat_sgid(VALUE obj)
  */
 
 static VALUE
-rb_stat_sticky(VALUE obj)
+rb_stat_sticky(obj)
+    VALUE obj;
 {
 #ifdef S_ISVTX
     if (get_stat(obj)->st_mode & S_ISVTX) return Qtrue;
@@ -4325,13 +4251,16 @@ rb_stat_sticky(VALUE obj)
 VALUE rb_mFConst;
 
 void
-rb_file_const(const char *name, VALUE value)
+rb_file_const(name, value)
+    const char *name;
+    VALUE value;
 {
     rb_define_const(rb_mFConst, name, value);
 }
 
 static int
-is_absolute_path(const char *path)
+is_absolute_path(path)
+    const char *path;
 {
 #ifdef DOSISH_DRIVE_LETTER
     if (has_drive_letter(path) && isdirsep(path[2])) return 1;
@@ -4355,10 +4284,12 @@ is_absolute_path(const char *path)
 
 #if ENABLE_PATH_CHECK
 static int
-path_check_0(VALUE path, int execpath)
+path_check_0(fpath, execpath)
+     VALUE fpath;
+     int execpath;
 {
     struct stat st;
-    const char *p0 = StringValueCStr(path);
+    const char *p0 = StringValueCStr(fpath);
     char *p = 0, *s;
 
     if (!is_absolute_path(p0)) {
@@ -4366,11 +4297,11 @@ path_check_0(VALUE path, int execpath)
 	VALUE newpath;
 
 	newpath = rb_str_new2(buf);
-	xfree(buf);
+	free(buf);
 
 	rb_str_cat2(newpath, "/");
 	rb_str_cat2(newpath, p0);
-	p0 = RSTRING_PTR(path = newpath);
+	p0 = RSTRING(fpath = newpath)->ptr;
     }
     for (;;) {
 #ifndef S_IWOTH
@@ -4380,7 +4311,7 @@ path_check_0(VALUE path, int execpath)
 #ifdef S_ISVTX
 	    && !(p && execpath && (st.st_mode & S_ISVTX))
 #endif
-	    && !access(p0, W_OK)) {
+	    ) {
 	    rb_warn("Insecure world writable dir %s in %sPATH, mode 0%o",
 		    p0, (execpath ? "" : "LOAD_"), st.st_mode);
 	    if (p) *p = '/';
@@ -4396,7 +4327,8 @@ path_check_0(VALUE path, int execpath)
 #endif
 
 static int
-fpath_check(const char *path)
+fpath_check(path)
+    const char *path;
 {
 #if ENABLE_PATH_CHECK
     return path_check_0(rb_str_new2(path), Qfalse);
@@ -4406,7 +4338,8 @@ fpath_check(const char *path)
 }
 
 int
-rb_path_check(const char *path)
+rb_path_check(path)
+    const char *path;
 {
 #if ENABLE_PATH_CHECK
     const char *p0, *p, *pend;
@@ -4434,7 +4367,8 @@ rb_path_check(const char *path)
 
 #if defined(__MACOS__) || defined(riscos)
 static int
-is_macos_native_path(const char *path)
+is_macos_native_path(path)
+    const char *path;
 {
     if (strchr(path, ':')) return 1;
     return 0;
@@ -4442,38 +4376,28 @@ is_macos_native_path(const char *path)
 #endif
 
 static int
-file_load_ok(const char *path)
-{
-    return eaccess(path, R_OK) == 0;
-}
-
-#ifdef __CYGWIN__
-static void
-intern_cygwin_path(volatile VALUE *path)
+file_load_ok(file)
+    const char *file;
 {
-    char rubylib[MAXPATHLEN];
-    VALUE str = *path;
-    const char *p = RSTRING_PTR(str);
+    FILE *f;
 
-    if (*p == '\\' || has_drive_letter(p)) {
-	if (cygwin_conv_to_posix_path(p, rubylib) == 0) {
-	    *path = rb_str_new2(rubylib);
-	}
-    }
+    if (!file) return 0;
+    f = fopen(file, "r");
+    if (f == NULL) return 0;
+    fclose(f);
+    return 1;
 }
-#define intern_path(str) intern_cygwin_path(&(str))
-#else
-#define intern_path(str) (void)(str)
-#endif
 
-VALUE rb_get_load_path(void);
+extern VALUE rb_load_path;
 
 int
-rb_find_file_ext(VALUE *filep, const char *const *ext)
+rb_find_file_ext(filep, ext)
+    VALUE *filep;
+    const char * const *ext;
 {
     const char *path, *found;
-    const char *f = RSTRING_PTR(*filep);
-    VALUE fname, load_path;
+    const char *f = RSTRING(*filep)->ptr;
+    VALUE fname;
     long i, j;
 
     if (f[0] == '~') {
@@ -4499,39 +4423,36 @@ rb_find_file_ext(VALUE *filep, const char *const *ext)
 	return 0;
     }
 
-    load_path = rb_get_load_path();
-    if (!load_path) return 0;
+    if (!rb_load_path) return 0;
 
-    for (j=0; ext[j]; j++) {
-	fname = rb_str_dup(*filep);
-	rb_str_cat2(fname, ext[j]);
-	OBJ_FREEZE(fname);
-	for (i = 0; i < RARRAY_LEN(load_path); i++) {
-	    VALUE str = RARRAY_PTR(load_path)[i];
-	    char fbuf[MAXPATHLEN];
-
-	    FilePathValue(str);
-	    if (RSTRING_LEN(str) == 0) continue;
-	    intern_path(str);
-	    path = RSTRING_PTR(str);
-	    found = dln_find_file_r(StringValueCStr(fname), path, fbuf, sizeof(fbuf));
+    Check_Type(rb_load_path, T_ARRAY);
+    for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+	VALUE str = RARRAY(rb_load_path)->ptr[i];
+
+	SafeStringValue(str);
+	if (RSTRING(str)->len == 0) continue;
+	path = RSTRING(str)->ptr;
+	for (j=0; ext[j]; j++) {
+	    fname = rb_str_dup(*filep);
+	    rb_str_cat2(fname, ext[j]);
+	    OBJ_FREEZE(fname);
+	    found = dln_find_file(StringValueCStr(fname), path);
 	    if (found && file_load_ok(found)) {
-		*filep = rb_str_new2(found);
+		*filep = fname;
 		return j+1;
 	    }
 	}
     }
-    RB_GC_GUARD(load_path);
     return 0;
 }
 
 VALUE
-rb_find_file(VALUE path)
+rb_find_file(path)
+    VALUE path;
 {
-    VALUE tmp, load_path;
+    VALUE tmp;
     const char *f = StringValueCStr(path);
     const char *lpath;
-    char fbuf[MAXPATHLEN];
 
     if (f[0] == '~') {
 	path = rb_file_expand_path(path, Qnil);
@@ -4562,25 +4483,24 @@ rb_find_file(VALUE path)
 	rb_raise(rb_eSecurityError, "loading from non-absolute path %s", f);
     }
 
-    load_path = rb_get_load_path();
-    if (load_path) {
+    if (rb_load_path) {
 	long i;
 
+	Check_Type(rb_load_path, T_ARRAY);
 	tmp = rb_ary_new();
-	for (i = 0; i < RARRAY_LEN(load_path); i++) {
-	    VALUE str = RARRAY_PTR(load_path)[i];
-	    FilePathValue(str);
-	    if (RSTRING_LEN(str) > 0) {
-		intern_path(str);
+	for (i=0;i<RARRAY(rb_load_path)->len;i++) {
+	    VALUE str = RARRAY(rb_load_path)->ptr[i];
+	    SafeStringValue(str);
+	    if (RSTRING(str)->len > 0) {
 		rb_ary_push(tmp, str);
 	    }
 	}
 	tmp = rb_ary_join(tmp, rb_str_new2(PATH_SEP));
-	if (RSTRING_LEN(tmp) == 0) {
+	if (RSTRING(tmp)->len == 0) {
 	    lpath = 0;
 	}
 	else {
-	    lpath = RSTRING_PTR(tmp);
+	    lpath = RSTRING(tmp)->ptr;
 	}
     }
     else {
@@ -4590,7 +4510,7 @@ rb_find_file(VALUE path)
     if (!lpath) {
 	return 0;		/* no path, no load */
     }
-    if (!(f = dln_find_file_r(f, lpath, fbuf, sizeof(fbuf)))) {
+    if (!(f = dln_find_file(f, lpath))) {
 	return 0;
     }
     if (rb_safe_level() >= 1 && !fpath_check(f)) {
@@ -4605,7 +4525,10 @@ rb_find_file(VALUE path)
 }
 
 static void
-define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
+define_filetest_function(name, func, argc)
+    const char *name;
+    VALUE (*func)();
+    int argc;
 {
     rb_define_module_function(rb_mFileTest, name, func, argc);
     rb_define_singleton_method(rb_cFile, name, func, argc);
@@ -4645,41 +4568,39 @@ define_filetest_function(const char *name, VALUE (*func)(ANYARGS), int argc)
  */
 
 void
-Init_File(void)
+Init_File()
 {
     rb_mFileTest = rb_define_module("FileTest");
     rb_cFile = rb_define_class("File", rb_cIO);
 
-    define_filetest_function("directory?", rb_file_directory_p, 1);
-    define_filetest_function("exist?", rb_file_exist_p, 1);
-    define_filetest_function("exists?", rb_file_exist_p, 1);
-    define_filetest_function("readable?", rb_file_readable_p, 1);
-    define_filetest_function("readable_real?", rb_file_readable_real_p, 1);
-    define_filetest_function("world_readable?", rb_file_world_readable_p, 1);
-    define_filetest_function("writable?", rb_file_writable_p, 1);
-    define_filetest_function("writable_real?", rb_file_writable_real_p, 1);
-    define_filetest_function("world_writable?", rb_file_world_writable_p, 1);
-    define_filetest_function("executable?", rb_file_executable_p, 1);
-    define_filetest_function("executable_real?", rb_file_executable_real_p, 1);
-    define_filetest_function("file?", rb_file_file_p, 1);
-    define_filetest_function("zero?", rb_file_zero_p, 1);
-    define_filetest_function("size?", rb_file_size_p, 1);
+    define_filetest_function("directory?", test_d, 1);
+    define_filetest_function("exist?", test_e, 1);
+    define_filetest_function("exists?", test_e, 1); /* temporary */
+    define_filetest_function("readable?", test_r, 1);
+    define_filetest_function("readable_real?", test_R, 1);
+    define_filetest_function("writable?", test_w, 1);
+    define_filetest_function("writable_real?", test_W, 1);
+    define_filetest_function("executable?", test_x, 1);
+    define_filetest_function("executable_real?", test_X, 1);
+    define_filetest_function("file?", test_f, 1);
+    define_filetest_function("zero?", test_z, 1);
+    define_filetest_function("size?", test_s, 1);
     define_filetest_function("size", rb_file_s_size, 1);
-    define_filetest_function("owned?", rb_file_owned_p, 1);
-    define_filetest_function("grpowned?", rb_file_grpowned_p, 1);
+    define_filetest_function("owned?", test_owned, 1);
+    define_filetest_function("grpowned?", test_grpowned, 1);
 
-    define_filetest_function("pipe?", rb_file_pipe_p, 1);
-    define_filetest_function("symlink?", rb_file_symlink_p, 1);
-    define_filetest_function("socket?", rb_file_socket_p, 1);
+    define_filetest_function("pipe?", test_p, 1);
+    define_filetest_function("symlink?", test_l, 1);
+    define_filetest_function("socket?", test_S, 1);
 
-    define_filetest_function("blockdev?", rb_file_blockdev_p, 1);
-    define_filetest_function("chardev?", rb_file_chardev_p, 1);
+    define_filetest_function("blockdev?", test_b, 1);
+    define_filetest_function("chardev?", test_c, 1);
 
-    define_filetest_function("setuid?", rb_file_suid_p, 1);
-    define_filetest_function("setgid?", rb_file_sgid_p, 1);
-    define_filetest_function("sticky?", rb_file_sticky_p, 1);
+    define_filetest_function("setuid?", test_suid, 1);
+    define_filetest_function("setgid?", test_sgid, 1);
+    define_filetest_function("sticky?", test_sticky, 1);
 
-    define_filetest_function("identical?", rb_file_identical_p, 2);
+    define_filetest_function("identical?", test_identical, 2);
 
     rb_define_singleton_method(rb_cFile, "stat",  rb_file_s_stat, 1);
     rb_define_singleton_method(rb_cFile, "lstat", rb_file_s_lstat, 1);
@@ -4708,16 +4629,15 @@ Init_File(void)
     rb_define_singleton_method(rb_cFile, "basename", rb_file_s_basename, -1);
     rb_define_singleton_method(rb_cFile, "dirname", rb_file_s_dirname, 1);
     rb_define_singleton_method(rb_cFile, "extname", rb_file_s_extname, 1);
-    rb_define_singleton_method(rb_cFile, "path", rb_file_s_path, 1);
 
-    separator = rb_obj_freeze(rb_usascii_str_new2("/"));
+    separator = rb_obj_freeze(rb_str_new2("/"));
     rb_define_const(rb_cFile, "Separator", separator);
     rb_define_const(rb_cFile, "SEPARATOR", separator);
     rb_define_singleton_method(rb_cFile, "split",  rb_file_s_split, 1);
     rb_define_singleton_method(rb_cFile, "join",   rb_file_s_join, -2);
 
 #ifdef DOSISH
-    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_usascii_str_new2("\\")));
+    rb_define_const(rb_cFile, "ALT_SEPARATOR", rb_obj_freeze(rb_str_new2("\\")));
 #else
     rb_define_const(rb_cFile, "ALT_SEPARATOR", Qnil);
 #endif
@@ -4744,7 +4664,6 @@ Init_File(void)
     rb_file_const("LOCK_NB", INT2FIX(LOCK_NB));
 
     rb_define_method(rb_cFile, "path",  rb_file_path, 0);
-    rb_define_method(rb_cFile, "to_path",  rb_file_path, 0);
     rb_define_global_function("test", rb_f_test, -1);
 
     rb_cStat = rb_define_class_under(rb_cFile, "Stat", rb_cObject);
@@ -4781,10 +4700,8 @@ Init_File(void)
     rb_define_method(rb_cStat, "directory?",  rb_stat_d, 0);
     rb_define_method(rb_cStat, "readable?",  rb_stat_r, 0);
     rb_define_method(rb_cStat, "readable_real?",  rb_stat_R, 0);
-    rb_define_method(rb_cStat, "world_readable?", rb_stat_wr, 0);
     rb_define_method(rb_cStat, "writable?",  rb_stat_w, 0);
     rb_define_method(rb_cStat, "writable_real?",  rb_stat_W, 0);
-    rb_define_method(rb_cStat, "world_writable?", rb_stat_ww, 0);
     rb_define_method(rb_cStat, "executable?",  rb_stat_x, 0);
     rb_define_method(rb_cStat, "executable_real?",  rb_stat_X, 0);
     rb_define_method(rb_cStat, "file?",  rb_stat_f, 0);
diff --git a/gc.c b/gc.c
index eccd164801..111220eb76 100644
--- a/gc.c
+++ b/gc.c
@@ -3,24 +3,21 @@
   gc.c -
 
   $Author$
+  $Date$
   created at: Tue Oct  5 09:44:46 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/signal.h"
-#include "ruby/st.h"
-#include "ruby/node.h"
-#include "ruby/re.h"
-#include "ruby/io.h"
-#include "ruby/util.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-#include "gc.h"
+#include "ruby.h"
+#include "rubysig.h"
+#include "st.h"
+#include "node.h"
+#include "env.h"
+#include "re.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/types.h>
@@ -37,23 +34,14 @@
 #include <windows.h>
 #endif
 
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-# include <valgrind/memcheck.h>
-# ifndef VALGRIND_MAKE_MEM_DEFINED
-#  define VALGRIND_MAKE_MEM_DEFINED(p, n) VALGRIND_MAKE_READABLE(p, n)
-# endif
-# ifndef VALGRIND_MAKE_MEM_UNDEFINED
-#  define VALGRIND_MAKE_MEM_UNDEFINED(p, n) VALGRIND_MAKE_WRITABLE(p, n)
-# endif
-#else
-# define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */
-# define VALGRIND_MAKE_MEM_UNDEFINED(p, n) /* empty */
-#endif
-
-int rb_io_fptr_finalize(struct rb_io_t*);
+void re_free_registers _((struct re_registers*));
+void rb_io_fptr_finalize _((struct rb_io_t*));
 
 #define rb_setjmp(env) RUBY_SETJMP(env)
 #define rb_jmp_buf rb_jmpbuf_t
+#ifdef __CYGWIN__
+int _setjmp(), _longjmp();
+#endif
 
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
@@ -66,9 +54,7 @@ int rb_io_fptr_finalize(struct rb_io_t*);
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifdef _AIX
- #pragma alloca
-#  else
+#  ifndef _AIX
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -84,191 +70,28 @@ void *alloca ();
 #endif
 #endif
 
-#define nomem_error GET_VM()->special_exceptions[ruby_error_nomemory]
-
-#define MARK_STACK_MAX 1024
-
-int ruby_gc_debug_indent = 0;
-
-#undef GC_DEBUG
+static unsigned long malloc_increase = 0;
+static unsigned long malloc_limit = GC_MALLOC_LIMIT;
+static void run_final();
+static VALUE nomem_error;
+static void garbage_collect();
 
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
-#endif
+int ruby_gc_stress = 0;
 
-typedef struct RVALUE {
-    union {
-	struct {
-	    VALUE flags;		/* always 0 for freed obj */
-	    struct RVALUE *next;
-	} free;
-	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;
-	struct RNode   node;
-	struct RMatch  match;
-	struct RRational rational;
-	struct RComplex complex;
-    } as;
-#ifdef GC_DEBUG
-    char *file;
-    int   line;
-#endif
-} RVALUE;
-
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
-#pragma pack(pop)
-#endif
-
-struct heaps_slot {
-    void *membase;
-    RVALUE *slot;
-    int limit;
-};
-
-#define HEAP_MIN_SLOTS 10000
-#define FREE_MIN  4096
-
-struct gc_list {
-    VALUE *varptr;
-    struct gc_list *next;
-};
-
-#define CALC_EXACT_MALLOC_SIZE 0
-
-typedef struct rb_objspace {
-    struct {
-	size_t limit;
-	size_t increase;
-#if CALC_EXACT_MALLOC_SIZE
-	size_t allocated_size;
-	size_t allocations;
-#endif
-    } malloc_params;
-    struct {
-	size_t increment;
-	struct heaps_slot *ptr;
-	size_t length;
-	size_t used;
-	RVALUE *freelist;
-	RVALUE *range[2];
-	RVALUE *freed;
-    } heap;
-    struct {
-	int dont_gc;
-	int during_gc;
-    } flags;
-    struct {
-	st_table *table;
-	RVALUE *deferred;
-    } final;
-    struct {
-	VALUE buffer[MARK_STACK_MAX];
-	VALUE *ptr;
-	int overflow;
-    } markstack;
-    struct gc_list *global_list;
-    unsigned int count;
-    int gc_stress;
-} rb_objspace_t;
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-#define rb_objspace (*GET_VM()->objspace)
-static int ruby_initial_gc_stress = 0;
-int *ruby_initial_gc_stress_ptr = &ruby_initial_gc_stress;
-#else
-static rb_objspace_t rb_objspace = {{GC_MALLOC_LIMIT}, {HEAP_MIN_SLOTS}};
-int *ruby_initial_gc_stress_ptr = &rb_objspace.gc_stress;
-#endif
-#define malloc_limit		objspace->malloc_params.limit
-#define malloc_increase 	objspace->malloc_params.increase
-#define heap_slots		objspace->heap.slots
-#define heaps			objspace->heap.ptr
-#define heaps_length		objspace->heap.length
-#define heaps_used		objspace->heap.used
-#define freelist		objspace->heap.freelist
-#define lomem			objspace->heap.range[0]
-#define himem			objspace->heap.range[1]
-#define heaps_inc		objspace->heap.increment
-#define heaps_freed		objspace->heap.freed
-#define dont_gc 		objspace->flags.dont_gc
-#define during_gc		objspace->flags.during_gc
-#define finalizer_table 	objspace->final.table
-#define deferred_final_list	objspace->final.deferred
-#define mark_stack		objspace->markstack.buffer
-#define mark_stack_ptr		objspace->markstack.ptr
-#define mark_stack_overflow	objspace->markstack.overflow
-#define global_List		objspace->global_list
-#define ruby_gc_stress		objspace->gc_stress
-
-#define need_call_final 	(finalizer_table && finalizer_table->num_entries)
-
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-rb_objspace_t *
-rb_objspace_alloc(void)
-{
-    rb_objspace_t *objspace = malloc(sizeof(rb_objspace_t));
-    memset(objspace, 0, sizeof(*objspace));
-    malloc_limit = GC_MALLOC_LIMIT;
-    ruby_gc_stress = ruby_initial_gc_stress;
-
-    return objspace;
-}
-#endif
-
-/* tiny heap size */
-/* 32KB */
-/*#define HEAP_SIZE 0x8000 */
-/* 128KB */
-/*#define HEAP_SIZE 0x20000 */
-/* 64KB */
-/*#define HEAP_SIZE 0x10000 */
-/* 16KB */
-#define HEAP_SIZE 0x4000
-/* 8KB */
-/*#define HEAP_SIZE 0x2000 */
-/* 4KB */
-/*#define HEAP_SIZE 0x1000 */
-/* 2KB */
-/*#define HEAP_SIZE 0x800 */
-
-#define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
-
-extern st_table *rb_class_tbl;
-
-int ruby_disable_gc_stress = 0;
-
-static void run_final(rb_objspace_t *objspace, VALUE obj);
-static int garbage_collect(rb_objspace_t *objspace);
+NORETURN(void rb_exc_jump _((VALUE)));
 
 void
-rb_global_variable(VALUE *var)
+rb_memerror()
 {
-    rb_gc_register_address(var);
-}
+    rb_thread_t th = rb_curr_thread;
 
-void
-rb_memerror(void)
-{
-    rb_thread_t *th = GET_THREAD();
     if (!nomem_error ||
 	(rb_thread_raised_p(th, RAISED_NOMEMORY) && rb_safe_level() < 4)) {
 	fprintf(stderr, "[FATAL] failed to allocate memory\n");
-	exit(EXIT_FAILURE);
+	exit(1);
     }
     if (rb_thread_raised_p(th, RAISED_NOMEMORY)) {
-	rb_thread_raised_clear(th);
-	GET_THREAD()->errinfo = nomem_error;
-	JUMP_TAG(TAG_RAISE);
+	rb_exc_jump(nomem_error);
     }
     rb_thread_raised_set(th, RAISED_NOMEMORY);
     rb_exc_raise(nomem_error);
@@ -282,9 +105,9 @@ rb_memerror(void)
  */
 
 static VALUE
-gc_stress_get(VALUE self)
+gc_stress_get(self)
+    VALUE self;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     return ruby_gc_stress ? Qtrue : Qfalse;
 }
 
@@ -301,16 +124,17 @@ gc_stress_get(VALUE self)
  */
 
 static VALUE
-gc_stress_set(VALUE self, VALUE bool)
+gc_stress_set(self, bool)
+    VALUE self, bool;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     rb_secure(2);
     ruby_gc_stress = RTEST(bool);
     return bool;
 }
 
-static void *
-vm_xmalloc(rb_objspace_t *objspace, size_t size)
+void *
+ruby_xmalloc(size)
+    long size;
 {
     void *mem;
 
@@ -319,135 +143,74 @@ vm_xmalloc(rb_objspace_t *objspace, size_t size)
     }
     if (size == 0) size = 1;
 
-#if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(size_t);
-#endif
-
-    if ((ruby_gc_stress && !ruby_disable_gc_stress) ||
-	(malloc_increase+size) > malloc_limit) {
-	garbage_collect(objspace);
+    if (ruby_gc_stress || (malloc_increase+size) > malloc_limit) {
+	garbage_collect();
     }
     RUBY_CRITICAL(mem = malloc(size));
     if (!mem) {
-	if (garbage_collect(objspace)) {
-	    RUBY_CRITICAL(mem = malloc(size));
-	}
+	garbage_collect();
+	RUBY_CRITICAL(mem = malloc(size));
 	if (!mem) {
 	    rb_memerror();
 	}
     }
     malloc_increase += size;
 
-#if CALC_EXACT_MALLOC_SIZE
-    objspace->malloc_params.allocated_size += size;
-    objspace->malloc_params.allocations++;
-    ((size_t *)mem)[0] = size;
-    mem = (size_t *)mem + 1;
-#endif
+    return mem;
+}
+
+void *
+ruby_xcalloc(n, size)
+    long n, size;
+{
+    void *mem;
+
+    mem = xmalloc(n * size);
+    memset(mem, 0, n * size);
 
     return mem;
 }
 
-static void *
-vm_xrealloc(rb_objspace_t *objspace, void *ptr, size_t size)
+void *
+ruby_xrealloc(ptr, size)
+    void *ptr;
+    long size;
 {
     void *mem;
 
     if (size < 0) {
 	rb_raise(rb_eArgError, "negative re-allocation size");
     }
-    if (!ptr) return ruby_xmalloc(size);
+    if (!ptr) return xmalloc(size);
     if (size == 0) size = 1;
-    if (ruby_gc_stress && !ruby_disable_gc_stress) garbage_collect(objspace);
-
-#if CALC_EXACT_MALLOC_SIZE
-    size += sizeof(size_t);
-    objspace->malloc_params.allocated_size -= size;
-    ptr = (size_t *)ptr - 1;
-#endif
-
+    if (ruby_gc_stress) garbage_collect();
     RUBY_CRITICAL(mem = realloc(ptr, size));
     if (!mem) {
-	if (garbage_collect(objspace)) {
-	    RUBY_CRITICAL(mem = realloc(ptr, size));
-	}
+	garbage_collect();
+	RUBY_CRITICAL(mem = realloc(ptr, size));
 	if (!mem) {
 	    rb_memerror();
         }
     }
     malloc_increase += size;
 
-#if CALC_EXACT_MALLOC_SIZE
-    objspace->malloc_params.allocated_size += size;
-    ((size_t *)mem)[0] = size;
-    mem = (size_t *)mem + 1;
-#endif
-
     return mem;
 }
 
-static void
-vm_xfree(rb_objspace_t *objspace, void *ptr)
-{
-#if CALC_EXACT_MALLOC_SIZE
-    size_t size;
-    ptr = ((size_t *)ptr) - 1;
-    size = ((size_t*)ptr)[0];
-    objspace->malloc_params.allocated_size -= size;
-    objspace->malloc_params.allocations--;
-#endif
-
-    RUBY_CRITICAL(free(ptr));
-}
-
-void *
-ruby_xmalloc(size_t size)
-{
-    return vm_xmalloc(&rb_objspace, size);
-}
-
-void *
-ruby_xmalloc2(size_t n, size_t size)
-{
-    size_t len = size * n;
-    if (n != 0 && size != len / n) {
-	rb_raise(rb_eArgError, "malloc: possible integer overflow");
-    }
-    return vm_xmalloc(&rb_objspace, len);
-}
-
-void *
-ruby_xcalloc(size_t n, size_t size)
-{
-    void *mem = ruby_xmalloc2(n, size);
-    memset(mem, 0, n * size);
-
-    return mem;
-}
-
-void *
-ruby_xrealloc(void *ptr, size_t size)
-{
-    return vm_xrealloc(&rb_objspace, ptr, size);
-}
-
-void *
-ruby_xrealloc2(void *ptr, size_t n, size_t size)
-{
-    size_t len = size * n;
-    if (n != 0 && size != len / n) {
-	rb_raise(rb_eArgError, "realloc: possible integer overflow");
-    }
-    return ruby_xrealloc(ptr, len);
-}
-
 void
-ruby_xfree(void *x)
+ruby_xfree(x)
+    void *x;
 {
     if (x)
-      vm_xfree(&rb_objspace, x);
+	RUBY_CRITICAL(free(x));
 }
 
+extern int ruby_in_compile;
+static int dont_gc;
+static int during_gc;
+static int need_call_final = 0;
+static st_table *finalizer_table = 0;
+
 
 /*
  *  call-seq:
@@ -463,9 +226,8 @@ ruby_xfree(void *x)
  */
 
 VALUE
-rb_gc_enable(void)
+rb_gc_enable()
 {
-    rb_objspace_t *objspace = &rb_objspace;
     int old = dont_gc;
 
     dont_gc = Qfalse;
@@ -485,9 +247,8 @@ rb_gc_enable(void)
  */
 
 VALUE
-rb_gc_disable(void)
+rb_gc_disable()
 {
-    rb_objspace_t *objspace = &rb_objspace;
     int old = dont_gc;
 
     dont_gc = Qtrue;
@@ -496,17 +257,15 @@ rb_gc_disable(void)
 
 VALUE rb_mGC;
 
-void
-rb_register_mark_object(VALUE obj)
-{
-    VALUE ary = GET_THREAD()->vm->mark_object_ary;
-    rb_ary_push(ary, obj);
-}
+static struct gc_list {
+    VALUE *varptr;
+    struct gc_list *next;
+} *global_List = 0;
 
 void
-rb_gc_register_address(VALUE *addr)
+rb_gc_register_address(addr)
+    VALUE *addr;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     struct gc_list *tmp;
 
     tmp = ALLOC(struct gc_list);
@@ -516,14 +275,14 @@ rb_gc_register_address(VALUE *addr)
 }
 
 void
-rb_gc_unregister_address(VALUE *addr)
+rb_gc_unregister_address(addr)
+    VALUE *addr;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     struct gc_list *tmp = global_List;
 
     if (tmp->varptr == addr) {
 	global_List = tmp->next;
-	xfree(tmp);
+	RUBY_CRITICAL(free(tmp));
 	return;
     }
     while (tmp->next) {
@@ -531,81 +290,125 @@ rb_gc_unregister_address(VALUE *addr)
 	    struct gc_list *t = tmp->next;
 
 	    tmp->next = tmp->next->next;
-	    xfree(t);
+	    RUBY_CRITICAL(free(t));
 	    break;
 	}
 	tmp = tmp->next;
     }
 }
 
+#undef GC_DEBUG
 
-static void
-allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
+void
+rb_global_variable(var)
+    VALUE *var;
 {
-    struct heaps_slot *p;
-    size_t size;
-
-    size = next_heaps_length*sizeof(struct heaps_slot);
-    RUBY_CRITICAL(
-		  if (heaps_used > 0) {
-		      p = (struct heaps_slot *)realloc(heaps, size);
-		      if (p) heaps = p;
-		  }
-		  else {
-		      p = heaps = (struct heaps_slot *)malloc(size);
-		  }
-		  );
-    if (p == 0) rb_memerror();
-    heaps_length = next_heaps_length;
+    rb_gc_register_address(var);
 }
 
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(push, 1) /* magic for reducing sizeof(RVALUE): 24 -> 20 */
+#endif
+
+typedef struct RVALUE {
+    union {
+	struct {
+	    unsigned long flags;	/* always 0 for freed obj */
+	    struct RVALUE *next;
+	} free;
+	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;
+	struct RNode   node;
+	struct RMatch  match;
+	struct RVarmap varmap;
+	struct SCOPE   scope;
+    } as;
+#ifdef GC_DEBUG
+    char *file;
+    int   line;
+#endif
+} RVALUE;
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)
+#pragma pack(pop)
+#endif
+
+static RVALUE *freelist = 0;
+static RVALUE *deferred_final_list = 0;
+
+#define HEAPS_INCREMENT 10
+static struct heaps_slot {
+    void *membase;
+    RVALUE *slot;
+    int limit;
+} *heaps;
+static int heaps_length = 0;
+static int heaps_used   = 0;
+
+#define HEAP_MIN_SLOTS 10000
+static int heap_slots = HEAP_MIN_SLOTS;
+
+#define FREE_MIN  4096
+
+static RVALUE *himem, *lomem;
+
 static void
-assign_heap_slot(rb_objspace_t *objspace)
-{
-    RVALUE *p, *pend, *membase;
-    size_t hi, lo, mid;
-    int objs;
-	
-    objs = HEAP_OBJ_LIMIT;
-    RUBY_CRITICAL(p = (RVALUE*)malloc(HEAP_SIZE));
-    if (p == 0)
-	rb_memerror();
-
-    membase = p;
-    if ((VALUE)p % sizeof(RVALUE) != 0) {
-	p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
-	if ((HEAP_SIZE - HEAP_OBJ_LIMIT * sizeof(RVALUE)) < ((char*)p - (char*)membase)) {
-	    objs--;
-	}
+add_heap()
+{
+    RVALUE *p, *pend;
+
+    if (heaps_used == heaps_length) {
+	/* Realloc heaps */
+	struct heaps_slot *p;
+	int length;
+
+	heaps_length += HEAPS_INCREMENT;
+	length = heaps_length*sizeof(struct heaps_slot);
+	RUBY_CRITICAL(
+	    if (heaps_used > 0) {
+		p = (struct heaps_slot *)realloc(heaps, length);
+		if (p) heaps = p;
+	    }
+	    else {
+		p = heaps = (struct heaps_slot *)malloc(length);
+	    });
+	if (p == 0) rb_memerror();
     }
-    	
 
-    lo = 0;
-    hi = heaps_used;
-    while (lo < hi) {
-	register RVALUE *mid_membase;
-	mid = (lo + hi) / 2;
-	mid_membase = heaps[mid].membase;
-	if (mid_membase < membase) {
-	    lo = mid + 1;
-	}
-	else if (mid_membase > membase) {
-	    hi = mid;
-	}
-	else {
-	    rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, membase, (VALUE)mid);
+    for (;;) {
+	RUBY_CRITICAL(p = (RVALUE*)malloc(sizeof(RVALUE)*(heap_slots+1)));
+	if (p == 0) {
+	    if (heap_slots == HEAP_MIN_SLOTS) {
+		rb_memerror();
+	    }
+	    heap_slots = HEAP_MIN_SLOTS;
+	    continue;
 	}
+        heaps[heaps_used].membase = p;
+        if ((VALUE)p % sizeof(RVALUE) == 0)
+            heap_slots += 1;
+        else
+            p = (RVALUE*)((VALUE)p + sizeof(RVALUE) - ((VALUE)p % sizeof(RVALUE)));
+        heaps[heaps_used].slot = p;
+        heaps[heaps_used].limit = heap_slots;
+	break;
     }
-    if (hi < heaps_used) {
-	MEMMOVE(&heaps[hi+1], &heaps[hi], struct heaps_slot, heaps_used - hi);
-    }
-    heaps[hi].membase = membase;
-    heaps[hi].slot = p;
-    heaps[hi].limit = objs;
-    pend = p + objs;
+    pend = p + heap_slots;
     if (lomem == 0 || lomem > p) lomem = p;
     if (himem < pend) himem = pend;
     heaps_used++;
+    heap_slots *= 1.8;
+    if (heap_slots <= 0) heap_slots = HEAP_MIN_SLOTS;
 
     while (p < pend) {
 	p->as.free.flags = 0;
@@ -614,158 +417,40 @@ assign_heap_slot(rb_objspace_t *objspace)
 	p++;
     }
 }
+#define RANY(o) ((RVALUE*)(o))
 
-static void
-init_heap(rb_objspace_t *objspace)
-{
-    size_t add, i;
-
-    add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
-
-    if ((heaps_used + add) > heaps_length) {
-    	allocate_heaps(objspace, heaps_used + add);
-    }
-
-    for (i = 0; i < add; i++) {
-    	assign_heap_slot(objspace);
-    }
-    heaps_inc = 0;
-}
-
-
-static void
-set_heaps_increment(rb_objspace_t *objspace)
+int 
+rb_during_gc()
 {
-    size_t next_heaps_length = heaps_used * 1.8;
-    heaps_inc = next_heaps_length - heaps_used;
-
-    if (next_heaps_length > heaps_length) {
-	allocate_heaps(objspace, next_heaps_length);
-    }
+    return during_gc;
 }
 
-static int
-heaps_increment(rb_objspace_t *objspace)
+VALUE
+rb_newobj()
 {
-    if (heaps_inc > 0) {
-	assign_heap_slot(objspace);
-	heaps_inc--;
-	return Qtrue;
-    }
-    return Qfalse;
-}
+    VALUE obj;
 
-#define RANY(o) ((RVALUE*)(o))
+    if (during_gc)
+	rb_bug("object allocation during garbage collection phase");
 
-static VALUE
-rb_newobj_from_heap(rb_objspace_t *objspace)
-{
-    VALUE obj;
-	
-    if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) {
-    	if (!heaps_increment(objspace) && !garbage_collect(objspace)) {
-	    rb_memerror();
-	}
-    }
+    if (ruby_gc_stress || !freelist) garbage_collect();
 
     obj = (VALUE)freelist;
     freelist = freelist->as.free.next;
-
     MEMZERO((void*)obj, RVALUE, 1);
 #ifdef GC_DEBUG
-    RANY(obj)->file = rb_sourcefile();
-    RANY(obj)->line = rb_sourceline();
+    RANY(obj)->file = ruby_sourcefile;
+    RANY(obj)->line = ruby_sourceline;
 #endif
-
     return obj;
 }
 
-#if USE_VALUE_CACHE
-static VALUE
-rb_fill_value_cache(rb_thread_t *th)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    int i;
-    VALUE rv;
-
-    /* LOCK */
-    for (i=0; i<RUBY_VM_VALUE_CACHE_SIZE; i++) {
-	VALUE v = rb_newobj_from_heap(objspace);
-
-	th->value_cache[i] = v;
-	RBASIC(v)->flags = FL_MARK;
-    }
-    th->value_cache_ptr = &th->value_cache[0];
-    rv = rb_newobj_from_heap(objspace);
-    /* UNLOCK */
-    return rv;
-}
-#endif
-
-int
-rb_during_gc(void)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    return during_gc;
-}
- 
-VALUE
-rb_newobj(void)
-{
-#if USE_VALUE_CACHE || (defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE)
-    rb_thread_t *th = GET_THREAD();
-#endif
-#if USE_VALUE_CACHE
-    VALUE v = *th->value_cache_ptr;
-#endif
-#if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
-    rb_objspace_t *objspace = th->vm->objspace;
-#else
-    rb_objspace_t *objspace = &rb_objspace;
-#endif
-
-    if (during_gc) {
-	dont_gc = 1;
-	during_gc = 0;
-	rb_bug("object allocation during garbage collection phase");
-    }
-
-#if USE_VALUE_CACHE
-    if (v) {
-	RBASIC(v)->flags = 0;
-	th->value_cache_ptr++;
-    }
-    else {
-	v = rb_fill_value_cache(th);
-    }
-
-#if defined(GC_DEBUG)
-    printf("cache index: %d, v: %p, th: %p\n",
-	   th->value_cache_ptr - th->value_cache, v, th);
-#endif
-    return v;
-#else
-    return rb_newobj_from_heap(objspace);
-#endif
-}
-
-NODE*
-rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
-{
-    NODE *n = (NODE*)rb_newobj();
-
-    n->flags |= T_NODE;
-    nd_set_type(n, type);
-
-    n->u1.value = a0;
-    n->u2.value = a1;
-    n->u3.value = a2;
-
-    return n;
-}
-
 VALUE
-rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree)
+rb_data_object_alloc(klass, datap, dmark, dfree)
+    VALUE klass;
+    void *datap;
+    RUBY_DATA_FUNC dmark;
+    RUBY_DATA_FUNC dfree;
 {
     NEWOBJ(data, struct RData);
     if (klass) Check_Type(klass, T_CLASS);
@@ -777,66 +462,108 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F
     return (VALUE)data;
 }
 
+extern st_table *rb_class_tbl;
+VALUE *rb_gc_stack_start = 0;
 #ifdef __ia64
-#define SET_STACK_END (SET_MACHINE_STACK_END(&th->machine_stack_end), th->machine_register_stack_end = rb_ia64_bsp())
-#else
-#define SET_STACK_END SET_MACHINE_STACK_END(&th->machine_stack_end)
+VALUE *rb_gc_register_stack_start = 0;
 #endif
 
-#define STACK_START (th->machine_stack_start)
-#define STACK_END (th->machine_stack_end)
-#define STACK_LEVEL_MAX (th->machine_stack_maxsize/sizeof(VALUE))
+#ifdef DJGPP
+/* set stack size (http://www.delorie.com/djgpp/v2faq/faq15_9.html) */
+unsigned int _stklen = 0x180000; /* 1.5 kB */
+#endif
 
+#if defined(DJGPP) || defined(_WIN32_WCE)
+static unsigned int STACK_LEVEL_MAX = 65535;
+#elif defined(__human68k__)
+unsigned int _stacksize = 262144;
+# define STACK_LEVEL_MAX (_stacksize - 4096)
+# undef HAVE_GETRLIMIT
+#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
+static size_t STACK_LEVEL_MAX = 655300;
+#else
+# define STACK_LEVEL_MAX 655300
+#endif
+
+#ifdef C_ALLOCA
+# define SET_STACK_END VALUE stack_end; alloca(0);
+# define STACK_END (&stack_end)
+#else
+# if defined(__GNUC__) && defined(USE_BUILTIN_FRAME_ADDRESS) && !defined(__ia64)
+#  if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+__attribute__ ((noinline))
+#  endif
+static void
+stack_end_address(VALUE **stack_end_p)
+{
+    VALUE stack_end;
+    *stack_end_p = &stack_end;
+}
+#  define  SET_STACK_END    VALUE *stack_end; stack_end_address(&stack_end)
+# else
+#  define  SET_STACK_END    VALUE *stack_end = alloca(1)
+# endif
+# define STACK_END (stack_end)
+#endif
 #if STACK_GROW_DIRECTION < 0
-# define STACK_LENGTH  (STACK_START - STACK_END)
+# define STACK_LENGTH  (rb_gc_stack_start - STACK_END)
 #elif STACK_GROW_DIRECTION > 0
-# define STACK_LENGTH  (STACK_END - STACK_START + 1)
+# define STACK_LENGTH  (STACK_END - rb_gc_stack_start + 1)
 #else
-# define STACK_LENGTH  ((STACK_END < STACK_START) ? STACK_START - STACK_END\
-                                           : STACK_END - STACK_START + 1)
+# define STACK_LENGTH  ((STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END\
+                                           : STACK_END - rb_gc_stack_start + 1)
 #endif
-#if !STACK_GROW_DIRECTION
-int ruby_stack_grow_direction;
-int
-ruby_get_stack_grow_direction(VALUE *addr)
+#if STACK_GROW_DIRECTION > 0
+# define STACK_UPPER(x, a, b) a
+#elif STACK_GROW_DIRECTION < 0
+# define STACK_UPPER(x, a, b) b
+#else
+static int grow_direction;
+static int
+stack_grow_direction(addr)
+    VALUE *addr;
 {
-    rb_thread_t *th = GET_THREAD();
     SET_STACK_END;
 
-    if (STACK_END > addr) return ruby_stack_grow_direction = 1;
-    return ruby_stack_grow_direction = -1;
+    if (STACK_END > addr) return grow_direction = 1;
+    return grow_direction = -1;
 }
+# define stack_growup_p(x) ((grow_direction ? grow_direction : stack_grow_direction(x)) > 0)
+# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
 #endif
 
 #define GC_WATER_MARK 512
 
-int
-ruby_stack_length(VALUE **p)
+#define CHECK_STACK(ret) do {\
+    SET_STACK_END;\
+    (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
+} while (0)
+
+size_t
+ruby_stack_length(p)
+    VALUE **p;
 {
-    rb_thread_t *th = GET_THREAD();
     SET_STACK_END;
-    if (p) *p = STACK_UPPER(STACK_END, STACK_START, STACK_END);
+    if (p) *p = STACK_UPPER(STACK_END, rb_gc_stack_start, STACK_END);
     return STACK_LENGTH;
 }
 
 int
-ruby_stack_check(void)
+ruby_stack_check()
 {
     int ret;
-    rb_thread_t *th = GET_THREAD();
-    SET_STACK_END;
-    ret = STACK_LENGTH > STACK_LEVEL_MAX - GC_WATER_MARK;
-#ifdef __ia64
-    if (!ret) {
-        ret = (VALUE*)rb_ia64_bsp() - th->machine_register_stack_start >
-              th->machine_register_stack_maxsize/sizeof(VALUE) - GC_WATER_MARK;
-    }
-#endif
+
+    CHECK_STACK(ret);
     return ret;
 }
 
+#define MARK_STACK_MAX 1024
+static VALUE mark_stack[MARK_STACK_MAX];
+static VALUE *mark_stack_ptr;
+static int mark_stack_overflow;
+
 static void
-init_mark_stack(rb_objspace_t *objspace)
+init_mark_stack()
 {
     mark_stack_overflow = 0;
     mark_stack_ptr = mark_stack;
@@ -844,22 +571,65 @@ init_mark_stack(rb_objspace_t *objspace)
 
 #define MARK_STACK_EMPTY (mark_stack_ptr == mark_stack)
 
-static void gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev);
-static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev);
+static st_table *source_filenames;
+
+char *
+rb_source_filename(f)
+    const char *f;
+{
+    st_data_t name;
+
+    if (!st_lookup(source_filenames, (st_data_t)f, &name)) {
+	long len = strlen(f) + 1;
+	char *ptr = ALLOC_N(char, len + 1);
+	name = (st_data_t)ptr;
+	*ptr++ = 0;
+	MEMCPY(ptr, f, char, len);
+	st_add_direct(source_filenames, (st_data_t)ptr, name);
+	return ptr;
+    }
+    return (char *)name + 1;
+}
+
+static void
+mark_source_filename(f)
+    char *f;
+{
+    if (f) {
+	f[-1] = 1;
+    }
+}
+
+static int
+sweep_source_filename(key, value)
+    char *key, *value;
+{
+    if (*value) {
+	*value = 0;
+	return ST_CONTINUE;
+    }
+    else {
+	free(value);
+	return ST_DELETE;
+    }
+}
+
+static void gc_mark _((VALUE ptr, int lev));
+static void gc_mark_children _((VALUE ptr, int lev));
 
 static void
-gc_mark_all(rb_objspace_t *objspace)
+gc_mark_all()
 {
     RVALUE *p, *pend;
-    size_t i;
+    int i;
 
-    init_mark_stack(objspace);
+    init_mark_stack();
     for (i = 0; i < heaps_used; i++) {
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if ((p->as.basic.flags & FL_MARK) &&
 		(p->as.basic.flags != FL_MARK)) {
-		gc_mark_children(objspace, (VALUE)p, 0);
+		gc_mark_children((VALUE)p, 0);
 	    }
 	    p++;
 	}
@@ -867,171 +637,159 @@ gc_mark_all(rb_objspace_t *objspace)
 }
 
 static void
-gc_mark_rest(rb_objspace_t *objspace)
+gc_mark_rest()
 {
     VALUE tmp_arry[MARK_STACK_MAX];
     VALUE *p;
 
     p = (mark_stack_ptr - mark_stack) + tmp_arry;
-    MEMCPY(tmp_arry, mark_stack, VALUE, p - tmp_arry);
+    MEMCPY(tmp_arry, mark_stack, VALUE, MARK_STACK_MAX);
 
-    init_mark_stack(objspace);
-    while (p != tmp_arry) {
+    init_mark_stack();
+    while(p != tmp_arry){
 	p--;
-	gc_mark_children(objspace, *p, 0);
+	gc_mark_children(*p, 0);
     }
 }
 
 static inline int
-is_pointer_to_heap(rb_objspace_t *objspace, void *ptr)
+is_pointer_to_heap(ptr)
+    void *ptr;
 {
     register RVALUE *p = RANY(ptr);
-    register struct heaps_slot *heap;
-    register size_t hi, lo, mid;
+    register RVALUE *heap_org;
+    register long i;
 
     if (p < lomem || p > himem) return Qfalse;
     if ((VALUE)p % sizeof(RVALUE) != 0) return Qfalse;
 
-    /* check if p looks like a pointer using bsearch*/
-    lo = 0;
-    hi = heaps_used;
-    while (lo < hi) {
-	mid = (lo + hi) / 2;
-	heap = &heaps[mid];
-	if (heap->slot <= p) {
-	    if (p < heap->slot + heap->limit)
-		return Qtrue;
-	    lo = mid + 1;
-	}
-	else {
-	    hi = mid;
-	}
+    /* check if p looks like a pointer */
+    for (i=0; i < heaps_used; i++) {
+	heap_org = heaps[i].slot;
+	if (heap_org <= p && p < heap_org + heaps[i].limit)
+	    return Qtrue;
     }
     return Qfalse;
 }
 
 static void
-mark_locations_array(rb_objspace_t *objspace, register VALUE *x, register long n)
+mark_locations_array(x, n)
+    register VALUE *x;
+    register long n;
 {
     VALUE v;
     while (n--) {
         v = *x;
-        VALGRIND_MAKE_MEM_DEFINED(&v, sizeof(v));
-	if (is_pointer_to_heap(objspace, (void *)v)) {
-	    gc_mark(objspace, v, 0);
+	if (is_pointer_to_heap((void *)v)) {
+	    gc_mark(v, 0);
 	}
 	x++;
     }
 }
 
-static void
-gc_mark_locations(rb_objspace_t *objspace, VALUE *start, VALUE *end)
+void
+rb_gc_mark_locations(start, end)
+    VALUE *start, *end;
 {
     long n;
 
-    if (end <= start) return;
     n = end - start;
-    mark_locations_array(objspace, start, n);
-}
-
-void
-rb_gc_mark_locations(VALUE *start, VALUE *end)
-{
-    gc_mark_locations(&rb_objspace, start, end);
+    mark_locations_array(start,n);
 }
 
-#define rb_gc_mark_locations(start, end) gc_mark_locations(objspace, start, end)
-
-struct mark_tbl_arg {
-    rb_objspace_t *objspace;
-    int lev;
-};
-
 static int
-mark_entry(ID key, VALUE value, st_data_t data)
+mark_entry(key, value, lev)
+    ID key;
+    VALUE value;
+    int lev;
 {
-    struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, value, arg->lev);
+    gc_mark(value, lev);
     return ST_CONTINUE;
 }
 
 static void
-mark_tbl(rb_objspace_t *objspace, st_table *tbl, int lev)
+mark_tbl(tbl, lev)
+    st_table *tbl;
+    int lev;
 {
-    struct mark_tbl_arg arg;
     if (!tbl) return;
-    arg.objspace = objspace;
-    arg.lev = lev;
-    st_foreach(tbl, mark_entry, (st_data_t)&arg);
+    st_foreach(tbl, mark_entry, lev);
 }
 
 void
-rb_mark_tbl(st_table *tbl)
+rb_mark_tbl(tbl)
+    st_table *tbl;
 {
-    mark_tbl(&rb_objspace, tbl, 0);
+    mark_tbl(tbl, 0);
 }
 
 static int
-mark_key(VALUE key, VALUE value, st_data_t data)
+mark_key(key, value, lev)
+    VALUE key, value;
+    int lev;
 {
-    struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, key, arg->lev);
+    gc_mark(key, lev);
     return ST_CONTINUE;
 }
 
 static void
-mark_set(rb_objspace_t *objspace, st_table *tbl, int lev)
+mark_set(tbl, lev)
+    st_table *tbl;
+    int lev;
 {
-    struct mark_tbl_arg arg;
     if (!tbl) return;
-    arg.objspace = objspace;
-    arg.lev = lev;
-    st_foreach(tbl, mark_key, (st_data_t)&arg);
+    st_foreach(tbl, mark_key, lev);
 }
 
 void
-rb_mark_set(st_table *tbl)
+rb_mark_set(tbl)
+    st_table *tbl;
 {
-    mark_set(&rb_objspace, tbl, 0);
+    mark_set(tbl, 0);
 }
 
 static int
-mark_keyvalue(VALUE key, VALUE value, st_data_t data)
+mark_keyvalue(key, value, lev)
+    VALUE key;
+    VALUE value;
+    int lev;
 {
-    struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, key, arg->lev);
-    gc_mark(arg->objspace, value, arg->lev);
+    gc_mark(key, lev);
+    gc_mark(value, lev);
     return ST_CONTINUE;
 }
 
 static void
-mark_hash(rb_objspace_t *objspace, st_table *tbl, int lev)
+mark_hash(tbl, lev)
+    st_table *tbl;
+    int lev;
 {
-    struct mark_tbl_arg arg;
     if (!tbl) return;
-    arg.objspace = objspace;
-    arg.lev = lev;
-    st_foreach(tbl, mark_keyvalue, (st_data_t)&arg);
+    st_foreach(tbl, mark_keyvalue, lev);
 }
 
 void
-rb_mark_hash(st_table *tbl)
+rb_mark_hash(tbl)
+    st_table *tbl;
 {
-    mark_hash(&rb_objspace, tbl, 0);
+    mark_hash(tbl, 0);
 }
 
 void
-rb_gc_mark_maybe(VALUE obj)
+rb_gc_mark_maybe(obj)
+    VALUE obj;
 {
-    if (is_pointer_to_heap(&rb_objspace, (void *)obj)) {
-	gc_mark(&rb_objspace, obj, 0);
+    if (is_pointer_to_heap((void *)obj)) {
+	gc_mark(obj, 0);
     }
 }
 
 #define GC_LEVEL_MAX 250
 
 static void
-gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
+gc_mark(ptr, lev)
+    VALUE ptr;
+    int lev;
 {
     register RVALUE *obj;
 
@@ -1053,17 +811,20 @@ gc_mark(rb_objspace_t *objspace, VALUE ptr, int lev)
 	}
 	return;
     }
-    gc_mark_children(objspace, ptr, lev+1);
+    gc_mark_children(ptr, lev+1);
 }
 
 void
-rb_gc_mark(VALUE ptr)
+rb_gc_mark(ptr)
+    VALUE ptr;
 {
-    gc_mark(&rb_objspace, ptr, 0);
+    gc_mark(ptr, 0);
 }
 
 static void
-gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
+gc_mark_children(ptr, lev)
+    VALUE ptr;
+    int lev;
 {
     register RVALUE *obj = RANY(ptr);
 
@@ -1088,41 +849,40 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	break;
 
       case T_NODE:
+	mark_source_filename(obj->as.node.nd_file);
 	switch (nd_type(obj)) {
 	  case NODE_IF:		/* 1,2,3 */
 	  case NODE_FOR:
 	  case NODE_ITER:
+	  case NODE_CREF:
 	  case NODE_WHEN:
 	  case NODE_MASGN:
 	  case NODE_RESCUE:
 	  case NODE_RESBODY:
 	  case NODE_CLASS:
-	  case NODE_BLOCK_PASS:
-	    gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
+	    gc_mark((VALUE)obj->as.node.u2.node, lev);
 	    /* fall through */
 	  case NODE_BLOCK:	/* 1,3 */
-	  case NODE_OPTBLOCK:
 	  case NODE_ARRAY:
 	  case NODE_DSTR:
 	  case NODE_DXSTR:
 	  case NODE_DREGX:
 	  case NODE_DREGX_ONCE:
+	  case NODE_FBODY:
 	  case NODE_ENSURE:
 	  case NODE_CALL:
 	  case NODE_DEFS:
 	  case NODE_OP_ASGN1:
-	  case NODE_ARGS:
-	    gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+	    gc_mark((VALUE)obj->as.node.u1.node, lev);
 	    /* fall through */
 	  case NODE_SUPER:	/* 3 */
 	  case NODE_FCALL:
 	  case NODE_DEFN:
-	  case NODE_ARGS_AUX:
+	  case NODE_NEWLINE:
 	    ptr = (VALUE)obj->as.node.u3.node;
 	    goto again;
 
-	  case NODE_METHOD:	/* 1,2 */
-	  case NODE_WHILE:
+	  case NODE_WHILE:	/* 1,2 */
 	  case NODE_UNTIL:
 	  case NODE_AND:
 	  case NODE_OR:
@@ -1139,22 +899,22 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	  case NODE_MODULE:
 	  case NODE_ALIAS:
 	  case NODE_VALIAS:
-	  case NODE_ARGSCAT:
-	    gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+	  case NODE_ARGS:
+	    gc_mark((VALUE)obj->as.node.u1.node, lev);
 	    /* fall through */
-	  case NODE_FBODY:	/* 2 */
+	  case NODE_METHOD:	/* 2 */
+	  case NODE_NOT:
 	  case NODE_GASGN:
 	  case NODE_LASGN:
 	  case NODE_DASGN:
 	  case NODE_DASGN_CURR:
 	  case NODE_IASGN:
-	  case NODE_IASGN2:
+	  case NODE_CVDECL:
 	  case NODE_CVASGN:
 	  case NODE_COLON3:
 	  case NODE_OPT_N:
 	  case NODE_EVSTR:
 	  case NODE_UNDEF:
-	  case NODE_POSTEXE:
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
@@ -1171,13 +931,14 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	  case NODE_COLON2:
 	  case NODE_SPLAT:
 	  case NODE_TO_ARY:
+	  case NODE_SVALUE:
 	    ptr = (VALUE)obj->as.node.u1.node;
 	    goto again;
 
 	  case NODE_SCOPE:	/* 2,3 */
+	  case NODE_BLOCK_PASS:
 	  case NODE_CDECL:
-	  case NODE_OPT_ARG:
-	    gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
+	    gc_mark((VALUE)obj->as.node.u3.node, lev);
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
@@ -1198,39 +959,38 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	  case NODE_NIL:
 	  case NODE_TRUE:
 	  case NODE_FALSE:
-	  case NODE_ERRINFO:
 	  case NODE_ATTRSET:
 	  case NODE_BLOCK_ARG:
+	  case NODE_POSTEXE:
 	    break;
 	  case NODE_ALLOCA:
-	    mark_locations_array(objspace,
-				 (VALUE*)obj->as.node.u1.value,
+	    mark_locations_array((VALUE*)obj->as.node.u1.value,
 				 obj->as.node.u3.cnt);
 	    ptr = (VALUE)obj->as.node.u2.node;
 	    goto again;
 
 	  default:		/* unlisted NODE */
-	    if (is_pointer_to_heap(objspace, obj->as.node.u1.node)) {
-		gc_mark(objspace, (VALUE)obj->as.node.u1.node, lev);
+	    if (is_pointer_to_heap(obj->as.node.u1.node)) {
+		gc_mark((VALUE)obj->as.node.u1.node, lev);
 	    }
-	    if (is_pointer_to_heap(objspace, obj->as.node.u2.node)) {
-		gc_mark(objspace, (VALUE)obj->as.node.u2.node, lev);
+	    if (is_pointer_to_heap(obj->as.node.u2.node)) {
+		gc_mark((VALUE)obj->as.node.u2.node, lev);
 	    }
-	    if (is_pointer_to_heap(objspace, obj->as.node.u3.node)) {
-		gc_mark(objspace, (VALUE)obj->as.node.u3.node, lev);
+	    if (is_pointer_to_heap(obj->as.node.u3.node)) {
+		gc_mark((VALUE)obj->as.node.u3.node, lev);
 	    }
 	}
 	return;			/* no need to mark class. */
     }
 
-    gc_mark(objspace, obj->as.basic.klass, lev);
+    gc_mark(obj->as.basic.klass, lev);
     switch (obj->as.basic.flags & T_MASK) {
       case T_ICLASS:
       case T_CLASS:
       case T_MODULE:
-	mark_tbl(objspace, RCLASS_M_TBL(obj), lev);
-	mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
-	ptr = RCLASS_SUPER(obj);
+	mark_tbl(obj->as.klass.m_tbl, lev);
+	mark_tbl(obj->as.klass.iv_tbl, lev);
+	ptr = obj->as.klass.super;
 	goto again;
 
       case T_ARRAY:
@@ -1239,23 +999,24 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	    goto again;
 	}
 	else {
-	    long i, len = RARRAY_LEN(obj);
-	    VALUE *ptr = RARRAY_PTR(obj);
+	    long i, len = obj->as.array.len;
+	    VALUE *ptr = obj->as.array.ptr;
+
 	    for (i=0; i < len; i++) {
-		gc_mark(objspace, *ptr++, lev);
+		gc_mark(*ptr++, lev);
 	    }
 	}
 	break;
 
       case T_HASH:
-	mark_hash(objspace, obj->as.hash.ntbl, lev);
+	mark_hash(obj->as.hash.tbl, lev);
 	ptr = obj->as.hash.ifnone;
 	goto again;
 
       case T_STRING:
 #define STR_ASSOC FL_USER3   /* copied from string.c */
-	if (FL_TEST(obj, RSTRING_NOEMBED) && FL_ANY(obj, ELTS_SHARED|STR_ASSOC)) {
-	    ptr = obj->as.string.as.heap.aux.shared;
+	if (FL_TEST(obj, ELTS_SHARED|STR_ASSOC)) {
+	    ptr = obj->as.string.aux.shared;
 	    goto again;
 	}
 	break;
@@ -1265,96 +1026,90 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
 	break;
 
       case T_OBJECT:
-        {
-            long i, len = ROBJECT_NUMIV(obj);
-	    VALUE *ptr = ROBJECT_IVPTR(obj);
-            for (i  = 0; i < len; i++) {
-		gc_mark(objspace, *ptr++, lev);
-            }
-        }
+	mark_tbl(obj->as.object.iv_tbl, lev);
 	break;
 
       case T_FILE:
-        if (obj->as.file.fptr)
-            gc_mark(objspace, obj->as.file.fptr->tied_io_for_writing, lev);
-        break;
-
       case T_REGEXP:
-        gc_mark(objspace, obj->as.regexp.src, lev);
-        break;
-
       case T_FLOAT:
       case T_BIGNUM:
+      case T_BLKTAG:
 	break;
 
       case T_MATCH:
-	gc_mark(objspace, obj->as.match.regexp, lev);
 	if (obj->as.match.str) {
 	    ptr = obj->as.match.str;
 	    goto again;
 	}
 	break;
 
-      case T_RATIONAL:
-	gc_mark(objspace, obj->as.rational.num, lev);
-	gc_mark(objspace, obj->as.rational.den, lev);
-	break;
+      case T_VARMAP:
+	gc_mark(obj->as.varmap.val, lev);
+	ptr = (VALUE)obj->as.varmap.next;
+	goto again;
+
+      case T_SCOPE:
+	if (obj->as.scope.local_vars && (obj->as.scope.flags & SCOPE_MALLOC)) {
+	    int n = obj->as.scope.local_tbl[0]+1;
+	    VALUE *vars = &obj->as.scope.local_vars[-1];
 
-      case T_COMPLEX:
-	gc_mark(objspace, obj->as.complex.real, lev);
-	gc_mark(objspace, obj->as.complex.image, lev);
+	    while (n--) {
+		gc_mark(*vars++, lev);
+	    }
+	}
 	break;
 
       case T_STRUCT:
 	{
-	    long len = RSTRUCT_LEN(obj);
-	    VALUE *ptr = RSTRUCT_PTR(obj);
+	    long len = obj->as.rstruct.len;
+	    VALUE *ptr = obj->as.rstruct.ptr;
 
 	    while (len--) {
-		gc_mark(objspace, *ptr++, lev);
+		gc_mark(*ptr++, lev);
 	    }
 	}
 	break;
 
       default:
-	rb_bug("rb_gc_mark(): unknown data type 0x%lx(%p) %s",
+	rb_bug("rb_gc_mark(): unknown data type 0x%lx(0x%lx) %s",
 	       obj->as.basic.flags & T_MASK, obj,
-	       is_pointer_to_heap(objspace, obj) ? "corrupted object" : "non object");
+	       is_pointer_to_heap(obj) ? "corrupted object" : "non object");
     }
 }
 
-static void obj_free(rb_objspace_t *, VALUE);
+static int obj_free _((VALUE));
+
+static inline void
+add_freelist(p)
+    RVALUE *p;
+{
+    p->as.free.flags = 0;
+    p->as.free.next = freelist;
+    freelist = p;
+}
 
 static void
-finalize_list(rb_objspace_t *objspace, RVALUE *p)
+finalize_list(p)
+    RVALUE *p;
 {
     while (p) {
 	RVALUE *tmp = p->as.free.next;
-	run_final(objspace, (VALUE)p);
+	run_final((VALUE)p);
 	if (!FL_TEST(p, FL_SINGLETON)) { /* not freeing page */
-            VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
-	    p->as.free.flags = 0;
-	    p->as.free.next = freelist;
-	    freelist = p;
+	    add_freelist(p);
 	}
 	p = tmp;
     }
 }
 
 static void
-free_unused_heaps(rb_objspace_t *objspace)
+free_unused_heaps()
 {
-    size_t i, j;
-    RVALUE *last = 0;
+    int i, j;
 
     for (i = j = 1; j < heaps_used; i++) {
 	if (heaps[i].limit == 0) {
-	    if (!last) {
-		last = heaps[i].membase;
-	    }
-	    else {
-		free(heaps[i].membase);
-	    }
+	    free(heaps[i].membase);
 	    heaps_used--;
 	}
 	else {
@@ -1364,30 +1119,44 @@ free_unused_heaps(rb_objspace_t *objspace)
 	    j++;
 	}
     }
-    if (last) {
-	if (last < heaps_freed) {
-	    free(heaps_freed);
-	    heaps_freed = last;
-	}
-	else {
-	    free(last);
-	}
-    }
 }
 
+#define T_DEFERRED 0x3a
+
+void rb_gc_abort_threads(void);
+
 static void
-gc_sweep(rb_objspace_t *objspace)
+gc_sweep()
 {
     RVALUE *p, *pend, *final_list;
-    size_t freed = 0;
-    size_t i;
-    size_t live = 0, free_min = 0, do_heap_free = 0;
-
-    do_heap_free = (heaps_used * HEAP_OBJ_LIMIT) * 0.65;
-    free_min = (heaps_used * HEAP_OBJ_LIMIT)  * 0.2;
-    if (free_min < FREE_MIN) {
-	do_heap_free = heaps_used * HEAP_OBJ_LIMIT;
+    int freed = 0;
+    int i;
+    unsigned long live = 0;
+    unsigned long free_min = 0;
+
+    for (i = 0; i < heaps_used; i++) {
+        free_min += heaps[i].limit;
+    }
+    free_min = free_min * 0.2;
+    if (free_min < FREE_MIN)
         free_min = FREE_MIN;
+
+    if (ruby_in_compile && ruby_parser_stack_on_heap()) {
+	/* should not reclaim nodes during compilation
+           if yacc's semantic stack is not allocated on machine stack */
+	for (i = 0; i < heaps_used; i++) {
+	    p = heaps[i].slot; pend = p + heaps[i].limit;
+	    while (p < pend) {
+		if (!(p->as.basic.flags&FL_MARK) && BUILTIN_TYPE(p) == T_NODE)
+		    gc_mark((VALUE)p, 0);
+		p++;
+	    }
+	}
+    }
+
+    mark_source_filename(ruby_sourcefile);
+    if (source_filenames) {
+        st_foreach(source_filenames, sweep_source_filename, 0);
     }
 
     freelist = 0;
@@ -1397,27 +1166,28 @@ gc_sweep(rb_objspace_t *objspace)
 	int n = 0;
 	RVALUE *free = freelist;
 	RVALUE *final = final_list;
+	int deferred;
 
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if (!(p->as.basic.flags & FL_MARK)) {
-		if (p->as.basic.flags) {
-		    obj_free(objspace, (VALUE)p);
-		}
-		if (need_call_final && FL_TEST(p, FL_FINALIZE)) {
-		    p->as.free.flags = FL_MARK; /* remain marked */
+		if (p->as.basic.flags &&
+		    ((deferred = obj_free((VALUE)p)) ||
+		     ((FL_TEST(p, FL_FINALIZE)) && need_call_final))) {
+		    if (!deferred) {
+			p->as.free.flags = T_DEFERRED;
+			RDATA(p)->dfree = 0;
+		    }
+		    p->as.free.flags |= FL_MARK;
 		    p->as.free.next = final_list;
 		    final_list = p;
 		}
 		else {
-                    VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
-		    p->as.free.flags = 0;
-		    p->as.free.next = freelist;
-		    freelist = p;
+		    add_freelist(p);
 		}
 		n++;
 	    }
-	    else if (RBASIC(p)->flags == FL_MARK) {
+	    else if (BUILTIN_TYPE(p) == T_DEFERRED) {
 		/* objects to be finalized */
 		/* do nothing remain marked */
 	    }
@@ -1427,12 +1197,12 @@ gc_sweep(rb_objspace_t *objspace)
 	    }
 	    p++;
 	}
-	if (n == heaps[i].limit && freed > do_heap_free) {
+	if (n == heaps[i].limit && freed > free_min) {
 	    RVALUE *pp;
 
 	    heaps[i].limit = 0;
 	    for (pp = final_list; pp != final; pp = pp->as.free.next) {
-		p->as.free.flags |= FL_SINGLETON; /* freeing page mark */
+		pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */
 	    }
 	    freelist = free;	/* cancel this page from freelist */
 	}
@@ -1446,33 +1216,38 @@ gc_sweep(rb_objspace_t *objspace)
     }
     malloc_increase = 0;
     if (freed < free_min) {
-    	set_heaps_increment(objspace);
-	heaps_increment(objspace);
+	add_heap();
     }
     during_gc = 0;
 
     /* clear finalization list */
     if (final_list) {
 	deferred_final_list = final_list;
+	rb_thread_pending = 1;
 	return;
     }
-    free_unused_heaps(objspace);
+    free_unused_heaps();
 }
 
 void
-rb_gc_force_recycle(VALUE p)
+rb_gc_force_recycle(p)
+    VALUE p;
 {
-    rb_objspace_t *objspace = &rb_objspace;
-    VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
-    RANY(p)->as.free.flags = 0;
-    RANY(p)->as.free.next = freelist;
-    freelist = RANY(p);
+    add_freelist(p);
 }
 
-static void
-obj_free(rb_objspace_t *objspace, VALUE obj)
+static inline void
+make_deferred(p)
+    RVALUE *p;
+{
+    p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_DEFERRED;
+}
+
+static int
+obj_free(obj)
+    VALUE obj;
 {
-    switch (RANY(obj)->as.basic.flags & T_MASK) {
+    switch (BUILTIN_TYPE(obj)) {
       case T_NIL:
       case T_FIXNUM:
       case T_TRUE:
@@ -1485,104 +1260,126 @@ obj_free(rb_objspace_t *objspace, VALUE obj)
 	rb_free_generic_ivar((VALUE)obj);
     }
 
-    switch (RANY(obj)->as.basic.flags & T_MASK) {
+    switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
-	if (!(RANY(obj)->as.basic.flags & ROBJECT_EMBED) &&
-            RANY(obj)->as.object.as.heap.ivptr) {
-	    xfree(RANY(obj)->as.object.as.heap.ivptr);
+	if (RANY(obj)->as.object.iv_tbl) {
+	    st_free_table(RANY(obj)->as.object.iv_tbl);
 	}
 	break;
       case T_MODULE:
       case T_CLASS:
 	rb_clear_cache_by_class((VALUE)obj);
-	st_free_table(RCLASS_M_TBL(obj));
-	if (RCLASS_IV_TBL(obj)) {
-	    st_free_table(RCLASS_IV_TBL(obj));
-	}
-	if (RCLASS_IV_INDEX_TBL(obj)) {
-	    st_free_table(RCLASS_IV_INDEX_TBL(obj));
+	st_free_table(RANY(obj)->as.klass.m_tbl);
+	if (RANY(obj)->as.object.iv_tbl) {
+	    st_free_table(RANY(obj)->as.object.iv_tbl);
 	}
-        xfree(RANY(obj)->as.klass.ptr);
 	break;
       case T_STRING:
-	rb_str_free(obj);
+	if (RANY(obj)->as.string.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.string.ptr));
+	}
 	break;
       case T_ARRAY:
-	rb_ary_free(obj);
+	if (RANY(obj)->as.array.ptr && !FL_TEST(obj, ELTS_SHARED)) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.array.ptr));
+	}
 	break;
       case T_HASH:
-	if (RANY(obj)->as.hash.ntbl) {
-	    st_free_table(RANY(obj)->as.hash.ntbl);
+	if (RANY(obj)->as.hash.tbl) {
+	    st_free_table(RANY(obj)->as.hash.tbl);
 	}
 	break;
       case T_REGEXP:
 	if (RANY(obj)->as.regexp.ptr) {
-	    onig_free(RANY(obj)->as.regexp.ptr);
+	    re_free_pattern(RANY(obj)->as.regexp.ptr);
+	}
+	if (RANY(obj)->as.regexp.str) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.regexp.str));
 	}
 	break;
       case T_DATA:
 	if (DATA_PTR(obj)) {
 	    if ((long)RANY(obj)->as.data.dfree == -1) {
-		xfree(DATA_PTR(obj));
+		RUBY_CRITICAL(free(DATA_PTR(obj)));
 	    }
 	    else if (RANY(obj)->as.data.dfree) {
-		(*RANY(obj)->as.data.dfree)(DATA_PTR(obj));
+		make_deferred(RANY(obj));
+		return 1;
 	    }
 	}
 	break;
       case T_MATCH:
-	if (RANY(obj)->as.match.rmatch) {
-            struct rmatch *rm = RANY(obj)->as.match.rmatch;
-	    onig_region_free(&rm->regs, 0);
-            if (rm->char_offset)
-	      xfree(rm->char_offset);
-	    xfree(rm);
+	if (RANY(obj)->as.match.regs) {
+	    re_free_registers(RANY(obj)->as.match.regs);
+	    RUBY_CRITICAL(free(RANY(obj)->as.match.regs));
 	}
 	break;
       case T_FILE:
 	if (RANY(obj)->as.file.fptr) {
-	    rb_io_fptr_finalize(RANY(obj)->as.file.fptr);
+	    struct rb_io_t *fptr = RANY(obj)->as.file.fptr;
+	    make_deferred(RANY(obj));
+	    RDATA(obj)->dfree = (void (*)(void*))rb_io_fptr_finalize;
+	    RDATA(obj)->data = fptr;
+	    return 1;
 	}
 	break;
-      case T_RATIONAL:
-      case T_COMPLEX:
-	break;
       case T_ICLASS:
 	/* iClass shares table with the module */
 	break;
 
       case T_FLOAT:
+      case T_VARMAP:
+      case T_BLKTAG:
 	break;
 
       case T_BIGNUM:
-	if (!(RBASIC(obj)->flags & RBIGNUM_EMBED_FLAG) && RBIGNUM_DIGITS(obj)) {
-	    xfree(RBIGNUM_DIGITS(obj));
+	if (RANY(obj)->as.bignum.digits) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.bignum.digits));
 	}
 	break;
       case T_NODE:
 	switch (nd_type(obj)) {
 	  case NODE_SCOPE:
 	    if (RANY(obj)->as.node.u1.tbl) {
-		xfree(RANY(obj)->as.node.u1.tbl);
+		RUBY_CRITICAL(free(RANY(obj)->as.node.u1.tbl));
 	    }
 	    break;
 	  case NODE_ALLOCA:
-	    xfree(RANY(obj)->as.node.u1.node);
+	    RUBY_CRITICAL(free(RANY(obj)->as.node.u1.node));
 	    break;
 	}
-	return;			/* no need to free iv_tbl */
+	break;			/* no need to free iv_tbl */
+
+      case T_SCOPE:
+	if (RANY(obj)->as.scope.local_vars &&
+            RANY(obj)->as.scope.flags != SCOPE_ALLOCA) {
+	    VALUE *vars = RANY(obj)->as.scope.local_vars-1;
+	    if (!(RANY(obj)->as.scope.flags & SCOPE_CLONE) && vars[0] == 0)
+		RUBY_CRITICAL(free(RANY(obj)->as.scope.local_tbl));
+	    if (RANY(obj)->as.scope.flags & SCOPE_MALLOC)
+		RUBY_CRITICAL(free(vars));
+	}
+	break;
 
       case T_STRUCT:
-	if ((RBASIC(obj)->flags & RSTRUCT_EMBED_LEN_MASK) == 0 &&
-	    RANY(obj)->as.rstruct.as.heap.ptr) {
-	    xfree(RANY(obj)->as.rstruct.as.heap.ptr);
+	if (RANY(obj)->as.rstruct.ptr) {
+	    RUBY_CRITICAL(free(RANY(obj)->as.rstruct.ptr));
 	}
 	break;
 
       default:
-	rb_bug("gc_sweep(): unknown data type 0x%lx(%p)",
-	       RANY(obj)->as.basic.flags & T_MASK, (void*)obj);
+	rb_bug("gc_sweep(): unknown data type 0x%lx(0x%lx)",
+	       RANY(obj)->as.basic.flags & T_MASK, obj);
     }
+
+    return 0;
+}
+
+void
+rb_gc_mark_frame(frame)
+    struct FRAME *frame;
+{
+    gc_mark((VALUE)frame->node, 0);
 }
 
 #ifdef __GNUC__
@@ -1620,92 +1417,73 @@ int rb_setjmp (rb_jmp_buf);
 #endif /* __human68k__ or DJGPP */
 #endif /* __GNUC__ */
 
-#define GC_NOTIFY 0
-
-void rb_vm_mark(void *ptr);
-
 static void
-mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
-{
-    rb_jmp_buf save_regs_gc_mark;
-    VALUE *stack_start, *stack_end;
-
-    SET_STACK_END;
-#if STACK_GROW_DIRECTION < 0
-    stack_start = th->machine_stack_end;
-    stack_end = th->machine_stack_start;
-#elif STACK_GROW_DIRECTION > 0
-    stack_start = th->machine_stack_start;
-    stack_end = th->machine_stack_end + 1;
-#else
-    if (th->machine_stack_end < th->machine_stack_start) {
-        stack_start = th->machine_stack_end;
-        stack_end = th->machine_stack_start;
-    }
-    else {
-        stack_start = th->machine_stack_start;
-        stack_end = th->machine_stack_end + 1;
-    }
-#endif
-
-    FLUSH_REGISTER_WINDOWS;
-    /* This assumes that all registers are saved into the jmp_buf (and stack) */
-    rb_setjmp(save_regs_gc_mark);
-    mark_locations_array(objspace,
-			 (VALUE*)save_regs_gc_mark,
-			 sizeof(save_regs_gc_mark) / sizeof(VALUE));
-
-    rb_gc_mark_locations(stack_start, stack_end);
-#ifdef __ia64
-    rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
-#endif
-#if defined(__human68k__) || defined(__mc68000__)
-    mark_locations_array((VALUE*)((char*)STACK_END + 2),
-			 (STACK_START - STACK_END));
-#endif
-}
-
-void rb_gc_mark_encodings(void);
-
-static int
-garbage_collect(rb_objspace_t *objspace)
+garbage_collect()
 {
     struct gc_list *list;
-    rb_thread_t *th = GET_THREAD();
-
-    if (GC_NOTIFY) printf("start garbage_collect()\n");
+    struct FRAME * volatile frame; /* gcc 2.7.2.3 -O2 bug??  */
+    jmp_buf save_regs_gc_mark;
+    SET_STACK_END;
 
-    if (!heaps) {
-	return Qfalse;
+#ifdef HAVE_NATIVETHREAD
+    if (!is_ruby_native_thread()) {
+	rb_bug("cross-thread violation on rb_gc()");
     }
-
+#endif
     if (dont_gc || during_gc) {
 	if (!freelist) {
-            if (!heaps_increment(objspace)) {
-                set_heaps_increment(objspace);
-                heaps_increment(objspace);
-            }
+	    add_heap();
 	}
-	return Qtrue;
+	return;
     }
+    if (during_gc) return;
     during_gc++;
-    objspace->count++;
 
-    SET_STACK_END;
+    init_mark_stack();
 
-    init_mark_stack(objspace);
-
-    th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm);
+    gc_mark((VALUE)ruby_current_node, 0);
 
+    /* mark frame stack */
+    for (frame = ruby_frame; frame; frame = frame->prev) {
+	rb_gc_mark_frame(frame);
+	if (frame->tmp) {
+	    struct FRAME *tmp = frame->tmp;
+	    while (tmp) {
+		rb_gc_mark_frame(tmp);
+		tmp = tmp->prev;
+	    }
+	}
+    }
+    gc_mark((VALUE)ruby_scope, 0);
+    gc_mark((VALUE)ruby_dyna_vars, 0);
     if (finalizer_table) {
-	mark_tbl(objspace, finalizer_table, 0);
+	mark_tbl(finalizer_table, 0);
     }
 
-    mark_current_machine_context(objspace, th);
-
+    FLUSH_REGISTER_WINDOWS;
+    /* This assumes that all registers are saved into the jmp_buf (and stack) */
+    rb_setjmp(save_regs_gc_mark);
+    mark_locations_array((VALUE*)save_regs_gc_mark, sizeof(save_regs_gc_mark) / sizeof(VALUE *));
+#if STACK_GROW_DIRECTION < 0
+    rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+#elif STACK_GROW_DIRECTION > 0
+    rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#else
+    if ((VALUE*)STACK_END < rb_gc_stack_start)
+	rb_gc_mark_locations((VALUE*)STACK_END, rb_gc_stack_start);
+    else
+	rb_gc_mark_locations(rb_gc_stack_start, (VALUE*)STACK_END + 1);
+#endif
+#ifdef __ia64
+    /* mark backing store (flushed register window on the stack) */
+    /* the basic idea from guile GC code                         */
+    rb_gc_mark_locations(rb_gc_register_stack_start, (VALUE*)rb_ia64_bsp());
+#endif
+#if defined(__human68k__) || defined(__mc68000__)
+    rb_gc_mark_locations((VALUE*)((char*)STACK_END + 2),
+			 (VALUE*)((char*)rb_gc_stack_start + 2));
+#endif
     rb_gc_mark_threads();
-    rb_gc_mark_symbols();
-    rb_gc_mark_encodings();
 
     /* mark protected global variables */
     for (list = global_List; list; list = list->next) {
@@ -1714,7 +1492,7 @@ garbage_collect(rb_objspace_t *objspace)
     rb_mark_end_proc();
     rb_gc_mark_global_tbl();
 
-    mark_tbl(objspace, rb_class_tbl, 0);
+    rb_mark_tbl(rb_class_tbl);
     rb_gc_mark_trap_list();
 
     /* mark generic instance variables for special constants */
@@ -1723,49 +1501,28 @@ garbage_collect(rb_objspace_t *objspace)
     rb_gc_mark_parser();
 
     /* gc_mark objects whose marking are not completed*/
-    while (!MARK_STACK_EMPTY) {
-	if (mark_stack_overflow) {
-	    gc_mark_all(objspace);
-	}
-	else {
-	    gc_mark_rest(objspace);
+    do {
+	while (!MARK_STACK_EMPTY) {
+	    if (mark_stack_overflow){
+		gc_mark_all();
+	    }
+	    else {
+		gc_mark_rest();
+	    }
 	}
-    }
+	rb_gc_abort_threads();
+    } while (!MARK_STACK_EMPTY);
 
-    gc_sweep(objspace);
-
-    if (GC_NOTIFY) printf("end garbage_collect()\n");
-    return Qtrue;
-}
-
-int
-rb_garbage_collect(void)
-{
-    return garbage_collect(&rb_objspace);
+    gc_sweep();
 }
 
 void
-rb_gc_mark_machine_stack(rb_thread_t *th)
+rb_gc()
 {
-    rb_objspace_t *objspace = &rb_objspace;
-#if STACK_GROW_DIRECTION < 0
-    rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
-#elif STACK_GROW_DIRECTION > 0
-    rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
-#else
-    if (th->machine_stack_start < th->machine_stack_end) {
-	rb_gc_mark_locations(th->machine_stack_start, th->machine_stack_end);
-    }
-    else {
-	rb_gc_mark_locations(th->machine_stack_end, th->machine_stack_start);
-    }
-#endif
-#ifdef __ia64
-    rb_gc_mark_locations(th->machine_register_stack_start, th->machine_register_stack_end);
-#endif
+    garbage_collect();
+    rb_gc_finalize_deferred();
 }
 
-
 /*
  *  call-seq:
  *     GC.start                     => nil
@@ -1777,18 +1534,128 @@ rb_gc_mark_machine_stack(rb_thread_t *th)
  */
 
 VALUE
-rb_gc_start(void)
+rb_gc_start()
 {
     rb_gc();
     return Qnil;
 }
 
-#undef Init_stack
+void
+ruby_set_stack_size(size)
+    size_t size;
+{
+#ifndef STACK_LEVEL_MAX
+    STACK_LEVEL_MAX = size / sizeof(VALUE);
+#endif
+}
 
 void
-Init_stack(VALUE *addr)
+Init_stack(addr)
+    VALUE *addr;
 {
-    ruby_init_stack(addr);
+#ifdef __ia64
+    if (rb_gc_register_stack_start == 0) {
+# 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.
+         */
+        rb_gc_register_stack_start = (4ULL<<61);
+# elif defined(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
+#  pragma weak __libc_ia64_register_backing_store_base
+        extern unsigned long __libc_ia64_register_backing_store_base;
+        rb_gc_register_stack_start = (VALUE*)__libc_ia64_register_backing_store_base;
+# endif
+    }
+    {
+        VALUE *bsp = (VALUE*)rb_ia64_bsp();
+        if (rb_gc_register_stack_start == 0 ||
+            bsp < rb_gc_register_stack_start) {
+            rb_gc_register_stack_start = bsp;
+        }
+    }
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+    MEMORY_BASIC_INFORMATION m;
+    memset(&m, 0, sizeof(m));
+    VirtualQuery(&m, &m, sizeof(m));
+    rb_gc_stack_start =
+	STACK_UPPER((VALUE *)&m, (VALUE *)m.BaseAddress,
+		    (VALUE *)((char *)m.BaseAddress + m.RegionSize) - 1);
+#elif defined(STACK_END_ADDRESS)
+    {
+        extern void *STACK_END_ADDRESS;
+        rb_gc_stack_start = STACK_END_ADDRESS;
+    }
+#else
+    if (!addr) addr = (void *)&addr;
+    STACK_UPPER(&addr, addr, ++addr);
+    if (rb_gc_stack_start) {
+	if (STACK_UPPER(&addr,
+			rb_gc_stack_start > addr,
+			rb_gc_stack_start < addr))
+	    rb_gc_stack_start = addr;
+	return;
+    }
+    rb_gc_stack_start = addr;
+#endif
+#ifdef HAVE_GETRLIMIT
+    {
+	struct rlimit rlim;
+
+	if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+	    unsigned int space = rlim.rlim_cur/5;
+
+	    if (space > 1024*1024) space = 1024*1024;
+	    STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+	}
+    }
+#endif
+}
+
+void ruby_init_stack(VALUE *addr
+#ifdef __ia64
+    , void *bsp
+#endif
+    )
+{
+    if (!rb_gc_stack_start ||
+        STACK_UPPER(&addr,
+                    rb_gc_stack_start > addr,
+                    rb_gc_stack_start < addr)) {
+        rb_gc_stack_start = addr;
+    }
+#ifdef __ia64
+    if (!rb_gc_register_stack_start ||
+        (VALUE*)bsp < rb_gc_register_stack_start) {
+        rb_gc_register_stack_start = (VALUE*)bsp;
+    }
+#endif
+#ifdef HAVE_GETRLIMIT
+    {
+        struct rlimit rlim;
+
+        if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+            unsigned int space = rlim.rlim_cur/5;
+
+            if (space > 1024*1024) space = 1024*1024;
+            STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+        }
+    }
+#elif defined _WIN32
+    {
+	MEMORY_BASIC_INFORMATION mi;
+	DWORD size;
+	DWORD space;
+
+	if (VirtualQuery(&mi, &mi, sizeof(mi))) {
+	    size = (char *)mi.BaseAddress - (char *)mi.AllocationBase;
+	    space = size / 5;
+	    if (space > 1024*1024) space = 1024*1024;
+	    STACK_LEVEL_MAX = (size - space) / sizeof(VALUE);
+	}
+    }
+#endif
 }
 
 /*
@@ -1823,29 +1690,24 @@ Init_stack(VALUE *addr)
  */
 
 void
-Init_heap(void)
+Init_heap()
 {
-    init_heap(&rb_objspace);
+    if (!rb_gc_stack_start) {
+	Init_stack(0);
+    }
+    add_heap();
 }
 
 static VALUE
-os_obj_of(rb_objspace_t *objspace, VALUE of)
+os_obj_of(of)
+    VALUE of;
 {
-    size_t i;
-    size_t n = 0;
-    RVALUE *membase = 0;
-    RVALUE *p, *pend;
+    int i;
+    int n = 0;
     volatile VALUE v;
 
-    i = 0;
-    while (i < heaps_used) {
-        while (0 < i && (uintptr_t)membase < (uintptr_t)heaps[i-1].membase)
-            i--;
-        while (i < heaps_used && (uintptr_t)heaps[i].membase <= (uintptr_t)membase )
-            i++;
-        if (heaps_used <= i)
-            break;
-        membase = heaps[i].membase;
+    for (i = 0; i < heaps_used; i++) {
+	RVALUE *p, *pend;
 
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	for (;p < pend; p++) {
@@ -1853,7 +1715,10 @@ os_obj_of(rb_objspace_t *objspace, VALUE of)
 		switch (BUILTIN_TYPE(p)) {
 		  case T_NONE:
 		  case T_ICLASS:
+		  case T_VARMAP:
+		  case T_SCOPE:
 		  case T_NODE:
+		  case T_DEFERRED:
 		    continue;
 		  case T_CLASS:
 		    if (FL_TEST(p, FL_SINGLETON)) continue;
@@ -1869,7 +1734,7 @@ os_obj_of(rb_objspace_t *objspace, VALUE of)
 	}
     }
 
-    return SIZET2NUM(n);
+    return INT2FIX(n);
 }
 
 /*
@@ -1906,7 +1771,10 @@ os_obj_of(rb_objspace_t *objspace, VALUE of)
  */
 
 static VALUE
-os_each_obj(int argc, VALUE *argv, VALUE os)
+os_each_obj(argc, argv, os)
+    int argc;
+    VALUE *argv;
+    VALUE os;
 {
     VALUE of;
 
@@ -1918,7 +1786,61 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
 	rb_scan_args(argc, argv, "01", &of);
     }
     RETURN_ENUMERATOR(os, 1, &of);
-    return os_obj_of(&rb_objspace, of);
+    return os_obj_of(of);
+}
+
+static VALUE finalizers;
+
+/* deprecated
+ */
+
+static VALUE
+add_final(os, block)
+    VALUE os, block;
+{
+    rb_warn("ObjectSpace::add_finalizer is deprecated; use define_finalizer");
+    if (!rb_respond_to(block, rb_intern("call"))) {
+	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
+		 rb_obj_classname(block));
+    }
+    rb_ary_push(finalizers, block);
+    return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+rm_final(os, block)
+    VALUE os, block;
+{
+    rb_warn("ObjectSpace::remove_finalizer is deprecated; use undefine_finalizer");
+    rb_ary_delete(finalizers, block);
+    return block;
+}
+
+/*
+ * deprecated
+ */
+static VALUE
+finals()
+{
+    rb_warn("ObjectSpace::finalizers is deprecated");
+    return finalizers;
+}
+
+/*
+ * deprecated
+ */
+
+static VALUE
+call_final(os, obj)
+    VALUE os, obj;
+{
+    rb_warn("ObjectSpace::call_finalizer is deprecated; use define_finalizer");
+    need_call_final = 1;
+    FL_SET(obj, FL_FINALIZE);
+    return obj;
 }
 
 /*
@@ -1930,9 +1852,9 @@ os_each_obj(int argc, VALUE *argv, VALUE os)
  */
 
 static VALUE
-undefine_final(VALUE os, VALUE obj)
+undefine_final(os, obj)
+    VALUE os, obj;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     if (finalizer_table) {
 	st_delete(finalizer_table, (st_data_t*)&obj, 0);
     }
@@ -1949,9 +1871,11 @@ undefine_final(VALUE os, VALUE obj)
  */
 
 static VALUE
-define_final(int argc, VALUE *argv, VALUE os)
+define_final(argc, argv, os)
+    int argc;
+    VALUE *argv;
+    VALUE os;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     VALUE obj, block, table;
 
     rb_scan_args(argc, argv, "11", &obj, &block);
@@ -1962,9 +1886,10 @@ define_final(int argc, VALUE *argv, VALUE os)
 	rb_raise(rb_eArgError, "wrong type argument %s (should be callable)",
 		 rb_obj_classname(block));
     }
+    need_call_final = 1;
     FL_SET(obj, FL_FINALIZE);
 
-    block = rb_ary_new3(2, INT2FIX(rb_safe_level()), block);
+    block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
 
     if (!finalizer_table) {
 	finalizer_table = st_init_numtable();
@@ -1979,9 +1904,9 @@ define_final(int argc, VALUE *argv, VALUE os)
 }
 
 void
-rb_gc_copy_finalizer(VALUE dest, VALUE obj)
+rb_gc_copy_finalizer(dest, obj)
+    VALUE dest, obj;
 {
-    rb_objspace_t *objspace = &rb_objspace;
     VALUE table;
 
     if (!finalizer_table) return;
@@ -1989,19 +1914,20 @@ rb_gc_copy_finalizer(VALUE dest, VALUE obj)
     if (st_lookup(finalizer_table, obj, &table)) {
 	st_insert(finalizer_table, dest, table);
     }
-    FL_SET(dest, FL_FINALIZE);
+    RBASIC(dest)->flags |= FL_FINALIZE;
 }
 
 static VALUE
-run_single_final(VALUE arg)
+run_single_final(args)
+    VALUE *args;
 {
-    VALUE *args = (VALUE *)arg;
     rb_eval_cmd(args[0], args[1], (int)args[2]);
     return Qnil;
 }
 
 static void
-run_final(rb_objspace_t *objspace, VALUE obj)
+run_final(obj)
+    VALUE obj;
 {
     long i;
     int status, critical_save = rb_thread_critical;
@@ -2010,45 +1936,45 @@ run_final(rb_objspace_t *objspace, VALUE obj)
     objid = rb_obj_id(obj);	/* make obj into id */
     rb_thread_critical = Qtrue;
     args[1] = 0;
-    args[2] = (VALUE)rb_safe_level();
+    args[2] = (VALUE)ruby_safe_level;
+    for (i=0; i<RARRAY(finalizers)->len; i++) {
+	args[0] = RARRAY(finalizers)->ptr[i];
+	if (!args[1]) args[1] = rb_ary_new3(1, objid);
+	rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
+    }
     if (finalizer_table && st_delete(finalizer_table, (st_data_t*)&obj, &table)) {
-	if (!args[1] && RARRAY_LEN(table) > 0) {
-	    args[1] = rb_obj_freeze(rb_ary_new3(1, objid));
-	}
-	for (i=0; i<RARRAY_LEN(table); i++) {
-	    VALUE final = RARRAY_PTR(table)[i];
-	    args[0] = RARRAY_PTR(final)[1];
-	    args[2] = FIX2INT(RARRAY_PTR(final)[0]);
-	    rb_protect(run_single_final, (VALUE)args, &status);
+	for (i=0; i<RARRAY(table)->len; i++) {
+	    VALUE final = RARRAY(table)->ptr[i];
+	    args[0] = RARRAY(final)->ptr[1];
+	    if (!args[1]) args[1] = rb_ary_new3(1, objid);
+	    args[2] = FIX2INT(RARRAY(final)->ptr[0]);
+	    rb_protect((VALUE(*)_((VALUE)))run_single_final, (VALUE)args, &status);
 	}
     }
     rb_thread_critical = critical_save;
 }
 
-static void
-gc_finalize_deferred(rb_objspace_t *objspace)
+void
+rb_gc_finalize_deferred()
 {
     RVALUE *p = deferred_final_list;
 
     deferred_final_list = 0;
     if (p) {
-	finalize_list(objspace, p);
+	finalize_list(p);
+	free_unused_heaps();
     }
-    free_unused_heaps(objspace);
-}
-
-void
-rb_gc_finalize_deferred(void)
-{
-    gc_finalize_deferred(&rb_objspace);
 }
 
 static int
 chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
 {
     RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg;
-    if (p->as.basic.flags & FL_FINALIZE) {
-	p->as.free.flags = FL_MARK; /* remain marked */
+    if ((p->as.basic.flags & (FL_FINALIZE|FL_MARK)) == FL_FINALIZE) {
+	if (BUILTIN_TYPE(p) != T_DEFERRED) {
+	    p->as.free.flags = FL_MARK | T_DEFERRED; /* remain marked */
+	    RDATA(p)->dfree = 0;
+	}
 	p->as.free.next = *final_list;
 	*final_list = p;
     }
@@ -2056,58 +1982,43 @@ chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
 }
 
 void
-rb_gc_call_finalizer_at_exit(void)
+rb_gc_call_finalizer_at_exit()
 {
-    rb_objspace_t *objspace = &rb_objspace;
     RVALUE *p, *pend;
-    size_t i;
+    int i;
 
     /* run finalizers */
     if (need_call_final) {
 	do {
 	    p = deferred_final_list;
 	    deferred_final_list = 0;
-	    finalize_list(objspace, p);
+	    finalize_list(p);
+	    mark_tbl(finalizer_table, 0);
 	    st_foreach(finalizer_table, chain_finalized_object,
 		       (st_data_t)&deferred_final_list);
 	} while (deferred_final_list);
     }
-    /* finalizers are part of garbage collection */
-    during_gc++;
     /* run data object's finalizers */
     for (i = 0; i < heaps_used; i++) {
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	while (p < pend) {
 	    if (BUILTIN_TYPE(p) == T_DATA &&
-		DATA_PTR(p) && RANY(p)->as.data.dfree &&
-		RANY(p)->as.basic.klass != rb_cThread) {
+		DATA_PTR(p) && RANY(p)->as.data.dfree) {
 		p->as.free.flags = 0;
 		if ((long)RANY(p)->as.data.dfree == -1) {
-		    xfree(DATA_PTR(p));
+		    RUBY_CRITICAL(free(DATA_PTR(p)));
 		}
 		else if (RANY(p)->as.data.dfree) {
 		    (*RANY(p)->as.data.dfree)(DATA_PTR(p));
 		}
-                VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
 	    }
 	    else if (BUILTIN_TYPE(p) == T_FILE) {
-		if (rb_io_fptr_finalize(RANY(p)->as.file.fptr)) {
-		    p->as.free.flags = 0;
-                    VALGRIND_MAKE_MEM_UNDEFINED((void*)p, sizeof(RVALUE));
-		}
+		p->as.free.flags = 0;
+		rb_io_fptr_finalize(RANY(p)->as.file.fptr);
 	    }
 	    p++;
 	}
     }
-    during_gc = 0;
-}
-
-void
-rb_gc(void)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    garbage_collect(objspace);
-    gc_finalize_deferred(objspace);
 }
 
 /*
@@ -2124,21 +2035,14 @@ rb_gc(void)
  */
 
 static VALUE
-id2ref(VALUE obj, VALUE objid)
+id2ref(obj, objid)
+    VALUE obj, objid;
 {
-#if SIZEOF_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULONG(x)
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-#define NUM2PTR(x) NUM2ULL(x)
-#endif
-    rb_objspace_t *objspace = &rb_objspace;
-    VALUE ptr;
-    void *p0;
+    unsigned long ptr, p0;
+    int type;
 
     rb_secure(4);
-    ptr = NUM2PTR(objid);
-    p0 = (void *)ptr;
-
+    p0 = ptr = NUM2ULONG(objid);
     if (ptr == Qtrue) return Qtrue;
     if (ptr == Qfalse) return Qfalse;
     if (ptr == Qnil) return Qnil;
@@ -2148,16 +2052,16 @@ id2ref(VALUE obj, VALUE objid)
     if ((ptr % sizeof(RVALUE)) == (4 << 2)) {
         ID symid = ptr / sizeof(RVALUE);
         if (rb_id2name(symid) == 0)
-	    rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
-	return ID2SYM(symid);
+            rb_raise(rb_eRangeError, "%p is not symbol id value", p0);
+        return ID2SYM(symid);
     }
 
-    if (!is_pointer_to_heap(objspace, (void *)ptr) ||
-	BUILTIN_TYPE(ptr) > T_FIXNUM || BUILTIN_TYPE(ptr) == T_ICLASS) {
-	rb_raise(rb_eRangeError, "%p is not id value", p0);
+    if (!is_pointer_to_heap((void *)ptr)||
+	(type = BUILTIN_TYPE(ptr)) > T_SYMBOL || type == T_ICLASS) {
+	rb_raise(rb_eRangeError, "0x%lx is not id value", p0);
     }
     if (BUILTIN_TYPE(ptr) == 0 || RBASIC(ptr)->klass == 0) {
-	rb_raise(rb_eRangeError, "%p is recycled object", p0);
+	rb_raise(rb_eRangeError, "0x%lx is recycled object", p0);
     }
     return (VALUE)ptr;
 }
@@ -2224,176 +2128,19 @@ rb_obj_id(VALUE obj)
         return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
     }
     if (SPECIAL_CONST_P(obj)) {
-        return LONG2NUM((SIGNED_VALUE)obj);
-    }
-    return (VALUE)((SIGNED_VALUE)obj|FIXNUM_FLAG);
-}
-
-static int
-set_zero(st_data_t key, st_data_t val, st_data_t arg)
-{
-    VALUE k = (VALUE)key;
-    VALUE hash = (VALUE)arg;
-    rb_hash_aset(hash, k, INT2FIX(0));
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.count_objects([result_hash]) -> hash
- *
- *  Counts objects for each type.
- *
- *  It returns a hash as:
- *  {:TOTAL=>10000, :FREE=>3011, :T_OBJECT=>6, :T_CLASS=>404, ...}
- *
- *  If the optional argument, result_hash, is given,
- *  it is overwritten and returned.
- *  This is intended to avoid probe effect.
- *
- *  The contents of the returned hash is implementation defined.
- *  It may be changed in future.
- *
- *  This method is not expected to work except C Ruby.
- *
- */
-
-static VALUE
-count_objects(int argc, VALUE *argv, VALUE os)
-{
-    rb_objspace_t *objspace = &rb_objspace;
-    size_t counts[T_MASK+1];
-    size_t freed = 0;
-    size_t total = 0;
-    size_t i;
-    VALUE hash;
-
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
-        if (TYPE(hash) != T_HASH)
-            rb_raise(rb_eTypeError, "non-hash given");
-    }
-
-    for (i = 0; i <= T_MASK; i++) {
-        counts[i] = 0;
-    }
-
-    for (i = 0; i < heaps_used; i++) {
-        RVALUE *p, *pend;
-
-        p = heaps[i].slot; pend = p + heaps[i].limit;
-        for (;p < pend; p++) {
-            if (p->as.basic.flags) {
-                counts[BUILTIN_TYPE(p)]++;
-            }
-            else {
-                freed++;
-            }
-        }
-        total += heaps[i].limit;
-    }
-
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero, hash);
-    }
-    rb_hash_aset(hash, ID2SYM(rb_intern("TOTAL")), SIZET2NUM(total));
-    rb_hash_aset(hash, ID2SYM(rb_intern("FREE")), SIZET2NUM(freed));
-    for (i = 0; i <= T_MASK; i++) {
-        VALUE type;
-        switch (i) {
-#define COUNT_TYPE(t) case t: type = ID2SYM(rb_intern(#t)); break;
-	    COUNT_TYPE(T_NONE);
-	    COUNT_TYPE(T_OBJECT);
-	    COUNT_TYPE(T_CLASS);
-	    COUNT_TYPE(T_MODULE);
-	    COUNT_TYPE(T_FLOAT);
-	    COUNT_TYPE(T_STRING);
-	    COUNT_TYPE(T_REGEXP);
-	    COUNT_TYPE(T_ARRAY);
-	    COUNT_TYPE(T_HASH);
-	    COUNT_TYPE(T_STRUCT);
-	    COUNT_TYPE(T_BIGNUM);
-	    COUNT_TYPE(T_FILE);
-	    COUNT_TYPE(T_DATA);
-	    COUNT_TYPE(T_MATCH);
-	    COUNT_TYPE(T_COMPLEX);
-	    COUNT_TYPE(T_RATIONAL);
-	    COUNT_TYPE(T_NIL);
-	    COUNT_TYPE(T_TRUE);
-	    COUNT_TYPE(T_FALSE);
-	    COUNT_TYPE(T_SYMBOL);
-	    COUNT_TYPE(T_FIXNUM);
-	    COUNT_TYPE(T_UNDEF);
-	    COUNT_TYPE(T_NODE);
-	    COUNT_TYPE(T_ICLASS);
-#undef COUNT_TYPE
-          default:              type = INT2NUM(i); break;
-        }
-        if (counts[i])
-            rb_hash_aset(hash, type, SIZET2NUM(counts[i]));
+        return LONG2NUM((long)obj);
     }
-
-    return hash;
-}
-
-/*
- *  call-seq:
- *     GC.count -> Integer
- *
- *  The number of times GC occured.
- *
- *  It returns the number of times GC occured since the process started.
- *
- */
-
-static VALUE
-gc_count(VALUE self)
-{
-    return UINT2NUM((&rb_objspace)->count);
-}
-
-#if CALC_EXACT_MALLOC_SIZE
-/*
- *  call-seq:
- *     GC.malloc_allocated_size -> Integer
- *
- *  The allocated size by malloc().
- *
- *  It returns the allocated size by malloc().
- */
-
-static VALUE
-gc_malloc_allocated_size(VALUE self)
-{
-    return UINT2NUM((&rb_objspace)->malloc_params.allocated_size);
+    return (VALUE)((long)obj|FIXNUM_FLAG);
 }
 
 /*
- *  call-seq:
- *     GC.malloc_allocations -> Integer
- *
- *  The number of allocated memory object by malloc().
- *
- *  It returns the number of allocated memory object by malloc().
- */
-
-static VALUE
-gc_malloc_allocations(VALUE self)
-{
-    return UINT2NUM((&rb_objspace)->malloc_params.allocations);
-}
-#endif
-
-/*
  *  The <code>GC</code> module provides an interface to Ruby's mark and
  *  sweep garbage collection mechanism. Some of the underlying methods
  *  are also available via the <code>ObjectSpace</code> module.
  */
 
 void
-Init_GC(void)
+Init_GC()
 {
     VALUE rb_mObSpace;
 
@@ -2403,18 +2150,29 @@ Init_GC(void)
     rb_define_singleton_method(rb_mGC, "disable", rb_gc_disable, 0);
     rb_define_singleton_method(rb_mGC, "stress", gc_stress_get, 0);
     rb_define_singleton_method(rb_mGC, "stress=", gc_stress_set, 1);
-    rb_define_singleton_method(rb_mGC, "count", gc_count, 0);
     rb_define_method(rb_mGC, "garbage_collect", rb_gc_start, 0);
 
     rb_mObSpace = rb_define_module("ObjectSpace");
     rb_define_module_function(rb_mObSpace, "each_object", os_each_obj, -1);
     rb_define_module_function(rb_mObSpace, "garbage_collect", rb_gc_start, 0);
+    rb_define_module_function(rb_mObSpace, "add_finalizer", add_final, 1);
+    rb_define_module_function(rb_mObSpace, "remove_finalizer", rm_final, 1);
+    rb_define_module_function(rb_mObSpace, "finalizers", finals, 0);
+    rb_define_module_function(rb_mObSpace, "call_finalizer", call_final, 1);
 
     rb_define_module_function(rb_mObSpace, "define_finalizer", define_final, -1);
     rb_define_module_function(rb_mObSpace, "undefine_finalizer", undefine_final, 1);
 
     rb_define_module_function(rb_mObSpace, "_id2ref", id2ref, 1);
 
+    rb_gc_register_address(&rb_mObSpace);
+    rb_global_variable(&finalizers);
+    rb_gc_unregister_address(&rb_mObSpace);
+    finalizers = rb_ary_new();
+
+    source_filenames = st_init_strtable();
+
+    rb_global_variable(&nomem_error);
     nomem_error = rb_exc_new3(rb_eNoMemError,
 			      rb_obj_freeze(rb_str_new2("failed to allocate memory")));
     OBJ_TAINT(nomem_error);
@@ -2423,11 +2181,4 @@ Init_GC(void)
     rb_define_method(rb_mKernel, "hash", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "__id__", rb_obj_id, 0);
     rb_define_method(rb_mKernel, "object_id", rb_obj_id, 0);
-
-    rb_define_module_function(rb_mObSpace, "count_objects", count_objects, -1);
-
-#if CALC_EXACT_MALLOC_SIZE
-    rb_define_singleton_method(rb_mGC, "malloc_allocated_size", gc_malloc_allocated_size, 0);
-    rb_define_singleton_method(rb_mGC, "malloc_allocations", gc_malloc_allocations, 0);
-#endif
 }
diff --git a/gc.h b/gc.h
deleted file mode 100644
index 29fd6b407c..0000000000
--- a/gc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-
-#ifndef RUBY_GC_H
-#define RUBY_GC_H 1
-
-#if defined(__i386) && defined(__GNUC__)
-#define SET_MACHINE_STACK_END(p) __asm__("mov %%esp, %0" : "=r" (*p))
-#else
-NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p));
-#define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p)
-#define USE_CONSERVATIVE_STACK_END
-#endif
-
-/* for GC debug */
-
-#ifndef RUBY_MARK_FREE_DEBUG
-#define RUBY_MARK_FREE_DEBUG 0
-#endif
-
-#if RUBY_MARK_FREE_DEBUG
-extern int ruby_gc_debug_indent;
-
-static void
-rb_gc_debug_indent(void)
-{
-    printf("%*s", ruby_gc_debug_indent, "");
-}
-
-static void
-rb_gc_debug_body(char *mode, char *msg, int st, void *ptr)
-{
-    if (st == 0) {
-	ruby_gc_debug_indent--;
-    }
-    rb_gc_debug_indent();
-    printf("%s: %s %s (%p)\n", mode, st ? "->" : "<-", msg, ptr);
-
-    if (st) {
-	ruby_gc_debug_indent++;
-    }
-
-    fflush(stdout);
-}
-
-#define RUBY_MARK_ENTER(msg) rb_gc_debug_body("mark", msg, 1, ptr)
-#define RUBY_MARK_LEAVE(msg) rb_gc_debug_body("mark", msg, 0, ptr)
-#define RUBY_FREE_ENTER(msg) rb_gc_debug_body("free", msg, 1, ptr)
-#define RUBY_FREE_LEAVE(msg) rb_gc_debug_body("free", msg, 0, ptr)
-#define RUBY_GC_INFO         rb_gc_debug_indent(); printf
-
-#else
-#define RUBY_MARK_ENTER(msg)
-#define RUBY_MARK_LEAVE(msg)
-#define RUBY_FREE_ENTER(msg)
-#define RUBY_FREE_LEAVE(msg)
-#define RUBY_GC_INFO if(0)printf
-#endif
-
-#define RUBY_MARK_UNLESS_NULL(ptr) if(RTEST(ptr)){rb_gc_mark(ptr);}
-#define RUBY_FREE_UNLESS_NULL(ptr) if(ptr){ruby_xfree(ptr);}
-
-#if STACK_GROW_DIRECTION > 0
-# define STACK_UPPER(x, a, b) a
-#elif STACK_GROW_DIRECTION < 0
-# define STACK_UPPER(x, a, b) b
-#else
-RUBY_EXTERN int ruby_stack_grow_direction;
-int ruby_get_stack_grow_direction(VALUE *addr);
-# define stack_growup_p(x) (			\
-	(ruby_stack_grow_direction ?		\
-	 ruby_stack_grow_direction :		\
-	 ruby_get_stack_grow_direction(x)) > 0)
-# define STACK_UPPER(x, a, b) (stack_growup_p(x) ? a : b)
-#endif
-
-#endif /* RUBY_GC_H */
diff --git a/gem_prelude.rb b/gem_prelude.rb
deleted file mode 100644
index 28bbd8372f..0000000000
--- a/gem_prelude.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
-
-if defined?(Gem) then
-
-  module Kernel
-
-    def gem(gem_name, *version_requirements)
-      Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
-    end
-
-  end
-
-  module Gem
-
-    ConfigMap = {
-      :sitedir => RbConfig::CONFIG["sitedir"],
-      :ruby_version => RbConfig::CONFIG["ruby_version"],
-      :libdir => RbConfig::CONFIG["libdir"],
-      :sitelibdir => RbConfig::CONFIG["sitelibdir"],
-      :arch => RbConfig::CONFIG["arch"],
-      :bindir => RbConfig::CONFIG["bindir"],
-      :EXEEXT => RbConfig::CONFIG["EXEEXT"],
-      :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
-      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"]
-    }
-
-    def self.default_dir
-      if defined? RUBY_FRAMEWORK_VERSION
-        return File.join(File.dirname(ConfigMap[:sitedir]), "Gems")
-      else
-        File.join(ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version])
-      end
-    end
-
-    def self.dir
-      @gem_home ||= nil
-      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
-      @gem_home
-    end
-
-    def self.path
-      @gem_path ||= nil
-      unless @gem_path
-        paths = [ENV['GEM_PATH']]
-        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
-        set_paths(paths.compact.join(File::PATH_SEPARATOR))
-      end
-      @gem_path
-    end
-
-    # Set the Gem home directory (as reported by +dir+).
-    def self.set_home(home)
-      @gem_home = home
-      ensure_gem_subdirectories(@gem_home)
-    end
-
-    def self.set_paths(gpaths)
-      if gpaths
-        @gem_path = gpaths.split(File::PATH_SEPARATOR)
-        @gem_path << Gem.dir
-      else
-        @gem_path = [Gem.dir]
-      end
-      @gem_path.uniq!
-      @gem_path.each do |gp| ensure_gem_subdirectories(gp) end
-    end
-
-    def self.ensure_gem_subdirectories(path)
-    end
-
-    GEM_PRELUDE_METHODS = Gem.methods(false)
-
-    module QuickLoader
-
-      def self.load_full_rubygems_library
-        class << Gem
-          Gem::GEM_PRELUDE_METHODS.each do |method_name|
-            undef_method method_name
-          end
-        end
-
-        Kernel.module_eval do
-          undef_method :gem if method_defined? :gem
-        end
-
-        $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
-                            Gem::ConfigMap[:ruby_version], 'rubygems.rb')
-
-        require 'rubygems'
-      end
-
-      GemPaths = {}
-      GemVersions = {}
-
-      def push_gem_version_on_load_path(gem_name, *version_requirements)
-        if version_requirements.empty?
-          unless GemPaths.has_key?(gem_name)
-            raise LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n") 
-          end
-
-          # highest version gems already active
-          return false
-        else
-          if version_requirements.length > 1
-            QuickLoader.load_full_rubygems_library
-            return gem(gem_name, *version_requirements)
-          end
-
-          requirement, version = version_requirements[0].split
-          requirement.strip!
-
-          if requirement == ">" || requirement == ">="
-            if (GemVersions[gem_name] <=> Gem.calculate_integers_for_gem_version(version)) >= 0
-              return false 
-            end
-          elsif requirement == "~>"
-            loaded_version = GemVersions[gem_name]
-            required_version = Gem.calculate_integers_for_gem_version(version)
-            if loaded_version && (loaded_version[0] == required_version[0])
-              return false
-            end
-          end
-
-          QuickLoader.load_full_rubygems_library
-          gem(gem_name, *version_requirements)
-        end
-      end
-
-      def calculate_integers_for_gem_version(gem_version)
-        numbers = gem_version.split(".").collect {|n| n.to_i}
-        numbers.pop while numbers.last == 0
-        numbers << 0 if numbers.empty?
-        numbers
-      end
-
-      def push_all_highest_version_gems_on_load_path
-        Gem.path.each do |path|
-          gems_directory = File.join(path, "gems")
-          if File.exist?(gems_directory)
-            Dir.entries(gems_directory).each do |gem_directory_name|
-              next if gem_directory_name == "." || gem_directory_name == ".."
-              dash = gem_directory_name.rindex("-")
-              next if dash.nil?
-              gem_name = gem_directory_name[0...dash]
-              current_version = GemVersions[gem_name]
-              new_version = calculate_integers_for_gem_version(gem_directory_name[dash+1..-1])
-              if current_version
-                if (current_version <=> new_version) == -1
-                  GemVersions[gem_name] = new_version
-                  GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
-                end
-              else
-                GemVersions[gem_name] = new_version
-                GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
-              end
-            end
-          end
-        end
-
-        require_paths = []
-
-        GemPaths.values.each do |path|
-          if File.exist?(File.join(path, ".require_paths"))
-            require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)})
-          else
-            require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin"))
-            require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
-          end
-        end
-
-        # "tag" the first require_path inserted into the $LOAD_PATH to enable
-        # indexing correctly with rubygems proper when it inserts an explicitly
-        # gem version
-        unless require_paths.empty?
-          require_paths.first.instance_variable_set(:@gem_prelude_index, true)
-        end
-        # gem directories must come after -I and ENV['RUBYLIB']
-        $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
-      end
-
-      def const_missing(constant)
-        QuickLoader.load_full_rubygems_library
-        if Gem.const_defined?(constant)
-          Gem.const_get(constant)
-        else
-          super
-        end
-      end
-
-      def method_missing(method, *args, &block)
-        QuickLoader.load_full_rubygems_library
-        super unless Gem.respond_to?(method)
-        Gem.send(method, *args, &block)
-      end
-    end
-
-    extend QuickLoader
-
-  end
-
-  begin
-    Gem.push_all_highest_version_gems_on_load_path
-    $" << File.join(Gem::ConfigMap[:libdir], "ruby",
-                    Gem::ConfigMap[:ruby_version], "rubygems.rb")
-  rescue Exception => e
-    puts "Error loading gem paths on load path in gem_prelude"
-    puts e
-    puts e.backtrace.join("\n")
-  end
-
-end
-
diff --git a/golf_prelude.rb b/golf_prelude.rb
deleted file mode 100644
index a224a5a6c7..0000000000
--- a/golf_prelude.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-class Object
-  @@golf_hash = {}
-  def method_missing m, *a, &b
-    t = @@golf_hash[ [m,self.class] ] ||= matching_methods(m)[0]
-    t ? __send__(t, *a, &b) : super
-  end
-
-  def matching_methods(s='', m=callable_methods)
-    r=/^#{s.to_s.gsub(/./){"(.*?)"+Regexp.escape($&)}}/
-    m.grep(r).sort_by do |i|
-      i.to_s.match(r).captures.map(&:size)<<i
-    end
-  end
-
-  def self.const_missing c
-    t = @@golf_hash[ [c,self.class] ] ||= matching_methods(c,constants)[0]
-    t and return const_get(t)
-    raise NameError, "uninitialized constant #{c}", caller(1)
-  end
-
-  def shortest_abbreviation(s='', m=callable_methods)
-    s=s.to_s
-    our_case = (?A..?Z)===s[0]
-    if m.index(s.to_sym)
-      1.upto(s.size){|z|s.scan(/./).combination(z).map{|trial|
-        next unless ((?A..?Z)===trial[0]) == our_case
-        trial*=''
-        return trial if matching_methods(trial,m)[0].to_s==s
-      }}
-    else
-      nil
-    end
-  end
-
-  def callable_methods
-    self.class == Object ? methods + private_methods : methods
-  end
-
-  private
-
-  def h(a='H', b='w', c='!')
-    puts "#{a}ello, #{b}orld#{c}"
-  end
-
-  alias say puts
-
-  def do_while
-    0 while yield
-  end
-
-  def do_until
-    0 until yield
-  end
-end
-
-class Array
-  alias old_to_s to_s
-  alias to_s join
-end
-
-class FalseClass
-  alias old_to_s to_s
-  def to_s
-    ""
-  end
-end
-
-class Integer
-  alias each times
-  include Enumerable
-end
-
-class String
-  alias / split
-
-  def to_a
-    split('')
-  end
-
-  (Array.instance_methods-instance_methods-[:to_ary,:transpose,:flatten,:flatten!,:compact,:compact!,:assoc,:rassoc]).each{|meth|
-    eval"def #{meth}(*args, &block)
-      a=to_a
-      result = a.#{meth}(*args, &block)
-      replace(a.join)
-      if result.class == Array
-        Integer===result[0] ? result.pack('c*') : result.join
-      elsif result.class == Enumerable::Enumerator
-        result.map(&:join).to_enum
-      else
-        result
-      end
-    end"
-  }
-end
-
-class Enumerable::Enumerator
-  alias old_to_s to_s
-  (Array.instance_methods-instance_methods-[:replace]+[:to_s]).each{|meth|
-    eval"def #{meth}(*args, &block)
-      to_a.#{meth}(*args, &block)
-    end"
-  }
-  alias inspect old_to_s
-end
diff --git a/goruby.c b/goruby.c
deleted file mode 100644
index 7cd3a2262b..0000000000
--- a/goruby.c
+++ /dev/null
@@ -1,24 +0,0 @@
-void Init_golf(void); 
-#define ruby_run_node goruby_run_node
-#include "main.c"
-#undef ruby_run_node
-
-RUBY_EXTERN int ruby_run_node(void*);
-RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
-
-static VALUE
-init_golf(VALUE arg)
-{
-    ruby_init_ext("golf", Init_golf);
-    return arg;
-}
-
-int
-goruby_run_node(void *arg)
-{
-    int state;
-    if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
-	return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
-    }
-    return ruby_run_node(arg);
-}
diff --git a/hash.c b/hash.c
index 89139e852f..3f269becb5 100644
--- a/hash.c
+++ b/hash.c
@@ -3,30 +3,40 @@
   hash.c -
 
   $Author$
+  $Date$
   created at: Mon Nov 22 18:51:18 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/st.h"
-#include "ruby/util.h"
-#include "ruby/signal.h"
+#include "ruby.h"
+#include "st.h"
+#include "util.h"
+#include "rubysig.h"
 
 #ifdef __APPLE__
 #include <crt_externs.h>
 #endif
 
-static VALUE rb_hash_s_try_convert(VALUE, VALUE);
-
 #define HASH_DELETED  FL_USER1
 #define HASH_PROC_DEFAULT FL_USER2
 
+static void
+rb_hash_modify(hash)
+    VALUE hash;
+{
+    if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
+    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
+    if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
+}
+
 VALUE
-rb_hash_freeze(VALUE hash)
+rb_hash_freeze(hash)
+    VALUE hash;
 {
     return rb_obj_freeze(hash);
 }
@@ -34,16 +44,18 @@ rb_hash_freeze(VALUE hash)
 VALUE rb_cHash;
 
 static VALUE envtbl;
-static ID id_hash, id_yield, id_default;
+static ID id_hash, id_call, id_default;
 
 static VALUE
-eql(VALUE *args)
+eql(args)
+    VALUE *args;
 {
     return (VALUE)rb_eql(args[0], args[1]);
 }
 
 static int
-rb_any_cmp(VALUE a, VALUE b)
+rb_any_cmp(a, b)
+    VALUE a, b;
 {
     VALUE args[2];
 
@@ -53,7 +65,7 @@ rb_any_cmp(VALUE a, VALUE b)
     }
     if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
 	TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
-	return rb_str_hash_cmp(a, b);
+	return rb_str_cmp(a, b);
     }
     if (a == Qundef || b == Qundef) return -1;
     if (SYMBOL_P(a) && SYMBOL_P(b)) {
@@ -66,13 +78,15 @@ rb_any_cmp(VALUE a, VALUE b)
 }
 
 VALUE
-rb_hash(VALUE obj)
+rb_hash(obj)
+    VALUE obj;
 {
     return rb_funcall(obj, id_hash, 0);
 }
 
 static int
-rb_any_hash(VALUE a)
+rb_any_hash(a)
+    VALUE a;
 {
     VALUE hval;
     int hnum;
@@ -98,16 +112,11 @@ rb_any_hash(VALUE a)
     return RSHIFT(hnum, 1);
 }
 
-static const struct st_hash_type objhash = {
+static struct st_hash_type objhash = {
     rb_any_cmp,
     rb_any_hash,
 };
 
-static const struct st_hash_type identhash = {
-    st_numcmp,
-    st_numhash,
-};
-
 typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
 
 struct foreach_safe_arg {
@@ -117,7 +126,9 @@ struct foreach_safe_arg {
 };
 
 static int
-foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
+foreach_safe_i(key, value, arg)
+    st_data_t key, value;
+    struct foreach_safe_arg *arg;
 {
     int status;
 
@@ -130,7 +141,10 @@ foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
 }
 
 void
-st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
+st_foreach_safe(table, func, a)
+    st_table *table;
+    int (*func)();
+    st_data_t a;
 {
     struct foreach_safe_arg arg;
 
@@ -151,37 +165,40 @@ struct hash_foreach_arg {
 };
 
 static int
-hash_foreach_iter(VALUE key, VALUE value, struct hash_foreach_arg *arg)
+hash_foreach_iter(key, value, arg)
+    VALUE key, value;
+    struct hash_foreach_arg *arg;
 {
     int status;
     st_table *tbl;
 
-    tbl = RHASH(arg->hash)->ntbl;
+    tbl = RHASH(arg->hash)->tbl;
     if (key == Qundef) return ST_CONTINUE;
     status = (*arg->func)(key, value, arg->arg);
-    if (RHASH(arg->hash)->ntbl != tbl) {
+    if (RHASH(arg->hash)->tbl != tbl) {
 	rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
     }
     switch (status) {
       case ST_DELETE:
-	st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
+ 	st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
 	FL_SET(arg->hash, HASH_DELETED);
       case ST_CONTINUE:
-	break;
+ 	break;
       case ST_STOP:
-	return ST_STOP;
+ 	return ST_STOP;
     }
     return ST_CHECK;
 }
 
 static VALUE
-hash_foreach_ensure(VALUE hash)
+hash_foreach_ensure(hash)
+    VALUE hash;
 {
     RHASH(hash)->iter_lev--;
 
     if (RHASH(hash)->iter_lev == 0) {
 	if (FL_TEST(hash, HASH_DELETED)) {
-	    st_cleanup_safe(RHASH(hash)->ntbl, Qundef);
+	    st_cleanup_safe(RHASH(hash)->tbl, Qundef);
 	    FL_UNSET(hash, HASH_DELETED);
 	}
     }
@@ -189,21 +206,23 @@ hash_foreach_ensure(VALUE hash)
 }
 
 static VALUE
-hash_foreach_call(struct hash_foreach_arg *arg)
+hash_foreach_call(arg)
+    struct hash_foreach_arg *arg;
 {
-    if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) {
+    if (st_foreach(RHASH(arg->hash)->tbl, hash_foreach_iter, (st_data_t)arg)) {
  	rb_raise(rb_eRuntimeError, "hash modified during iteration");
     }
     return Qnil;
 }
 
 void
-rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
+rb_hash_foreach(hash, func, farg)
+    VALUE hash;
+    int (*func)();
+    VALUE farg;
 {
     struct hash_foreach_arg arg;
 
-    if (!RHASH(hash)->ntbl)
-        return;
     RHASH(hash)->iter_lev++;
     arg.hash = hash;
     arg.func = (rb_foreach_func *)func;
@@ -211,8 +230,11 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
     rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
 }
 
+static VALUE hash_alloc0 _((VALUE));
+static VALUE hash_alloc _((VALUE));
 static VALUE
-hash_alloc(VALUE klass)
+hash_alloc0(klass)
+    VALUE klass;
 {
     NEWOBJ(hash, struct RHash);
     OBJSETUP(hash, klass, T_HASH);
@@ -222,49 +244,21 @@ hash_alloc(VALUE klass)
     return (VALUE)hash;
 }
 
-VALUE
-rb_hash_new(void)
+static VALUE
+hash_alloc(klass)
+    VALUE klass;
 {
-    return hash_alloc(rb_cHash);
-}
+    VALUE hash = hash_alloc0(klass);
 
-VALUE
-rb_hash_dup(VALUE hash)
-{
-    NEWOBJ(ret, struct RHash);
-    DUPSETUP(ret, hash);
+    RHASH(hash)->tbl = st_init_table(&objhash);
 
-    if (!RHASH_EMPTY_P(hash))
-        ret->ntbl = st_copy(RHASH(hash)->ntbl);
-    if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-        FL_SET(ret, HASH_PROC_DEFAULT);
-    }
-    ret->ifnone = RHASH(hash)->ifnone;
-    return (VALUE)ret;
-}
-
-static void
-rb_hash_modify_check(VALUE hash)
-{
-    if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
-    if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
-}
-
-struct st_table *
-rb_hash_tbl(VALUE hash)
-{
-    if (!RHASH(hash)->ntbl) {
-        RHASH(hash)->ntbl = st_init_table(&objhash);
-    }
-    return RHASH(hash)->ntbl;
+    return hash;
 }
 
-static void
-rb_hash_modify(VALUE hash)
+VALUE
+rb_hash_new()
 {
-    rb_hash_modify_check(hash);
-    rb_hash_tbl(hash);
+    return hash_alloc(rb_cHash);
 }
 
 /*
@@ -303,7 +297,10 @@ rb_hash_modify(VALUE hash)
  */
 
 static VALUE
-rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
+rb_hash_initialize(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
 {
     VALUE ifnone;
 
@@ -337,18 +334,19 @@ rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
  */
 
 static VALUE
-rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
+rb_hash_s_create(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE hash, tmp;
     int i;
 
     if (argc == 1) {
-	tmp = rb_hash_s_try_convert(Qnil, argv[0]);
+	tmp = rb_check_convert_type(argv[0], T_HASH, "Hash", "to_hash");
 	if (!NIL_P(tmp)) {
-	    hash = hash_alloc(klass);
-	    if (RHASH(tmp)->ntbl) {
-		RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
-	    }
+	    hash = hash_alloc0(klass);
+	    RHASH(hash)->tbl = st_copy(RHASH(tmp)->tbl);
 	    return hash;
 	}
 
@@ -380,30 +378,16 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
 }
 
 static VALUE
-to_hash(VALUE hash)
+to_hash(hash)
+    VALUE hash;
 {
     return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
 }
 
-/*
- *  call-seq:
- *     Hash.try_convert(obj) -> hash or nil
- *
- *  Try to convert <i>obj</i> into a hash, using to_hash method.
- *  Returns converted hash or nil if <i>obj</i> cannot be converted
- *  for any reason.
- *
- *     Hash.try_convert({1=>2})   # => {1=>2}
- *     Hash.try_convert("1=>2")   # => nil
- */
-static VALUE
-rb_hash_s_try_convert(VALUE dummy, VALUE hash)
-{
-    return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
-}
-
 static int
-rb_hash_rehash_i(VALUE key, VALUE value, st_table *tbl)
+rb_hash_rehash_i(key, value, tbl)
+    VALUE key, value;
+    st_table *tbl;
 {
     if (key != Qundef) st_insert(tbl, key, value);
     return ST_CONTINUE;
@@ -417,7 +401,7 @@ rb_hash_rehash_i(VALUE key, VALUE value, st_table *tbl)
  *  values of key objects have changed since they were inserted, this
  *  method will reindex <i>hsh</i>. If <code>Hash#rehash</code> is
  *  called while an iterator is traversing the hash, an
- *  <code>RuntimeError</code> will be raised in the iterator.
+ *  <code>IndexError</code> will be raised in the iterator.
  *
  *     a = [ "a", "b" ]
  *     c = [ "c", "d" ]
@@ -430,20 +414,16 @@ rb_hash_rehash_i(VALUE key, VALUE value, st_table *tbl)
  */
 
 static VALUE
-rb_hash_rehash(VALUE hash)
+rb_hash_rehash(hash)
+    VALUE hash;
 {
     st_table *tbl;
 
-    if (RHASH(hash)->iter_lev > 0) {
-	rb_raise(rb_eRuntimeError, "rehash during iteration");
-    }
-    rb_hash_modify_check(hash);
-    if (!RHASH(hash)->ntbl)
-        return hash;
-    tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
+    rb_hash_modify(hash);
+    tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
     rb_hash_foreach(hash, rb_hash_rehash_i, (st_data_t)tbl);
-    st_free_table(RHASH(hash)->ntbl);
-    RHASH(hash)->ntbl = tbl;
+    st_free_table(RHASH(hash)->tbl);
+    RHASH(hash)->tbl = tbl;
 
     return hash;
 }
@@ -463,22 +443,24 @@ rb_hash_rehash(VALUE hash)
  */
 
 VALUE
-rb_hash_aref(VALUE hash, VALUE key)
+rb_hash_aref(hash, key)
+    VALUE hash, key;
 {
     VALUE val;
 
-    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
 	return rb_funcall(hash, id_default, 1, key);
     }
     return val;
 }
 
 VALUE
-rb_hash_lookup(VALUE hash, VALUE key)
+rb_hash_lookup(hash, key)
+    VALUE hash, key;
 {
     VALUE val;
 
-    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
 	return Qnil; /* without Hash#default */
     }
     return val;
@@ -491,7 +473,7 @@ rb_hash_lookup(VALUE hash, VALUE key)
  *
  *  Returns a value from the hash for the given key. If the key can't be
  *  found, there are several options: With no other arguments, it will
- *  raise an <code>KeyError</code> exception; if <i>default</i> is
+ *  raise an <code>IndexError</code> exception; if <i>default</i> is
  *  given, then that will be returned; if the optional code block is
  *  specified, then that will be run and its result returned.
  *
@@ -508,13 +490,16 @@ rb_hash_lookup(VALUE hash, VALUE key)
  *
  *  <em>produces:</em>
  *
- *     prog.rb:2:in `fetch': key not found (KeyError)
+ *     prog.rb:2:in `fetch': key not found (IndexError)
  *      from prog.rb:2
  *
  */
 
 static VALUE
-rb_hash_fetch(int argc, VALUE *argv, VALUE hash)
+rb_hash_fetch(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
 {
     VALUE key, if_none;
     VALUE val;
@@ -526,10 +511,10 @@ rb_hash_fetch(int argc, VALUE *argv, VALUE hash)
     if (block_given && argc == 2) {
 	rb_warn("block supersedes default value argument");
     }
-    if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
+    if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_raise(rb_eKeyError, "key not found");
+	    rb_raise(rb_eIndexError, "key not found");
 	}
 	return if_none;
     }
@@ -558,14 +543,17 @@ rb_hash_fetch(int argc, VALUE *argv, VALUE hash)
  */
 
 static VALUE
-rb_hash_default(int argc, VALUE *argv, VALUE hash)
+rb_hash_default(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
 {
     VALUE key;
 
     rb_scan_args(argc, argv, "01", &key);
     if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
 	if (argc == 0) return Qnil;
-	return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, key);
+	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
     }
     return RHASH(hash)->ifnone;
 }
@@ -591,7 +579,8 @@ rb_hash_default(int argc, VALUE *argv, VALUE hash)
  */
 
 static VALUE
-rb_hash_set_default(VALUE hash, VALUE ifnone)
+rb_hash_set_default(hash, ifnone)
+    VALUE hash, ifnone;
 {
     rb_hash_modify(hash);
     RHASH(hash)->ifnone = ifnone;
@@ -615,7 +604,8 @@ rb_hash_set_default(VALUE hash, VALUE ifnone)
 
 
 static VALUE
-rb_hash_default_proc(VALUE hash)
+rb_hash_default_proc(hash)
+    VALUE hash;
 {
     if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
 	return RHASH(hash)->ifnone;
@@ -624,7 +614,9 @@ rb_hash_default_proc(VALUE hash)
 }
 
 static int
-key_i(VALUE key, VALUE value, VALUE *args)
+index_i(key, value, args)
+    VALUE key, value;
+    VALUE *args;
 {
     if (rb_equal(value, args[0])) {
 	args[1] = key;
@@ -633,55 +625,75 @@ key_i(VALUE key, VALUE value, VALUE *args)
     return ST_CONTINUE;
 }
 
+static VALUE
+rb_hash_delete_key(hash, key)
+    VALUE hash, key;
+{
+    st_data_t ktmp = (st_data_t)key, val;
+
+    if (RHASH(hash)->iter_lev > 0) {
+	if (st_delete_safe(RHASH(hash)->tbl, &ktmp, &val, Qundef)) {
+	    FL_SET(hash, HASH_DELETED);
+	    return (VALUE)val;
+	}
+    }
+    else if (st_delete(RHASH(hash)->tbl, &ktmp, &val))
+	return (VALUE)val;
+    return Qundef;
+}
+
 /*
  *  call-seq:
- *     hsh.key(value)    => key
+ *     hsh.index(value)    => key
  *
  *  Returns the key for a given value. If not found, returns <code>nil</code>.
  *
  *     h = { "a" => 100, "b" => 200 }
- *     h.key(200)   #=> "b"
- *     h.key(999)   #=> nil
+ *     h.index(200)   #=> "b"
+ *     h.index(999)   #=> nil
  *
  */
 
 static VALUE
-rb_hash_key(VALUE hash, VALUE value)
+rb_hash_index(hash, value)
+    VALUE hash, value;
 {
     VALUE args[2];
 
     args[0] = value;
     args[1] = Qnil;
 
-    rb_hash_foreach(hash, key_i, (st_data_t)args);
+    rb_hash_foreach(hash, index_i, (st_data_t)args);
 
     return args[1];
 }
 
-/* :nodoc: */
-static VALUE
-rb_hash_index(VALUE hash, VALUE value)
-{
-    rb_warn("Hash#index is deprecated; use Hash#key");
-    return rb_hash_key(hash, value);
-}
+/*
+ *  call-seq:
+ *     hsh.indexes(key, ...)    => array
+ *     hsh.indices(key, ...)    => array
+ *
+ *  Deprecated in favor of <code>Hash#select</code>.
+ *
+ */
 
 static VALUE
-rb_hash_delete_key(VALUE hash, VALUE key)
+rb_hash_indexes(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
 {
-    st_data_t ktmp = (st_data_t)key, val;
+    VALUE indexes;
+    int i;
 
-    if (!RHASH(hash)->ntbl)
-        return Qundef;
-    if (RHASH(hash)->iter_lev > 0) {
-	if (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, Qundef)) {
-	    FL_SET(hash, HASH_DELETED);
-	    return (VALUE)val;
-	}
+    rb_warn("Hash#%s is deprecated; use Hash#values_at",
+	    rb_id2name(rb_frame_last_func()));
+    indexes = rb_ary_new2(argc);
+    for (i=0; i<argc; i++) {
+	RARRAY(indexes)->ptr[i] = rb_hash_aref(hash, argv[i]);
+	RARRAY(indexes)->len++;
     }
-    else if (st_delete(RHASH(hash)->ntbl, &ktmp, &val))
-	return (VALUE)val;
-    return Qundef;
+    return indexes;
 }
 
 /*
@@ -690,10 +702,9 @@ rb_hash_delete_key(VALUE hash, VALUE key)
  *     hsh.delete(key) {| key | block }  => value
  *
  *  Deletes and returns a key-value pair from <i>hsh</i> whose key is
- *  equal to <i>key</i>. If the key is not found, returns the
- *  <em>default value</em>. If the optional code block is given and the
- *  key is not found, pass in the key and return the result of
- *  <i>block</i>.
+ *  equal to <i>key</i>. If the key is not found, returns <code>nil</code>.
+ *  If the optional code block is given and the key is not found,
+ *  pass in the key and return the result of <i>block</i>.
  *
  *     h = { "a" => 100, "b" => 200 }
  *     h.delete("a")                              #=> 100
@@ -703,7 +714,8 @@ rb_hash_delete_key(VALUE hash, VALUE key)
  */
 
 VALUE
-rb_hash_delete(VALUE hash, VALUE key)
+rb_hash_delete(hash, key)
+    VALUE hash, key;
 {
     VALUE val;
 
@@ -722,7 +734,9 @@ struct shift_var {
 };
 
 static int
-shift_i(VALUE key, VALUE value, struct shift_var *var)
+shift_i(key, value, var)
+    VALUE key, value;
+    struct shift_var *var;
 {
     if (key == Qundef) return ST_CONTINUE;
     if (var->key != Qundef) return ST_STOP;
@@ -732,7 +746,9 @@ shift_i(VALUE key, VALUE value, struct shift_var *var)
 }
 
 static int
-shift_i_safe(VALUE key, VALUE value, struct shift_var *var)
+shift_i_safe(key, value, var)
+    VALUE key, value;
+    struct shift_var *var;
 {
     if (key == Qundef) return ST_CONTINUE;
     var->key = key;
@@ -754,23 +770,31 @@ shift_i_safe(VALUE key, VALUE value, struct shift_var *var)
  */
 
 static VALUE
-rb_hash_shift(VALUE hash)
+rb_hash_shift(hash)
+    VALUE hash;
 {
     struct shift_var var;
 
     rb_hash_modify(hash);
     var.key = Qundef;
-    rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i,
-		    (st_data_t)&var);
+    if (RHASH(hash)->iter_lev > 0) {
+	rb_hash_foreach(hash, shift_i_safe, (st_data_t)&var);
+	if (var.key != Qundef) {
+	    st_data_t key = var.key;
+	    if (st_delete_safe(RHASH(hash)->tbl, &key, 0, Qundef)) {
+		FL_SET(hash, HASH_DELETED);
+	    }
+	}
+    }
+    else {
+	rb_hash_foreach(hash, shift_i, (st_data_t)&var);
+    }
 
     if (var.key != Qundef) {
-	if (RHASH(hash)->iter_lev > 0) {
-	    rb_hash_delete_key(hash, var.key);
-	}
 	return rb_assoc_new(var.key, var.val);
     }
     else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
-	return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, Qnil);
+	return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
     }
     else {
 	return RHASH(hash)->ifnone;
@@ -778,7 +802,8 @@ rb_hash_shift(VALUE hash)
 }
 
 static int
-delete_if_i(VALUE key, VALUE value, VALUE hash)
+delete_if_i(key, value, hash)
+    VALUE key, value, hash;
 {
     if (key == Qundef) return ST_CONTINUE;
     if (RTEST(rb_yield_values(2, key, value))) {
@@ -800,7 +825,8 @@ delete_if_i(VALUE key, VALUE value, VALUE hash)
  */
 
 VALUE
-rb_hash_delete_if(VALUE hash)
+rb_hash_delete_if(hash)
+    VALUE hash;
 {
     RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_modify(hash);
@@ -817,16 +843,15 @@ rb_hash_delete_if(VALUE hash)
  */
 
 VALUE
-rb_hash_reject_bang(VALUE hash)
+rb_hash_reject_bang(hash)
+    VALUE hash;
 {
     int n;
 
     RETURN_ENUMERATOR(hash, 0, 0);
-    if (!RHASH(hash)->ntbl)
-        return Qnil;
-    n = RHASH(hash)->ntbl->num_entries;
+    n = RHASH(hash)->tbl->num_entries;
     rb_hash_delete_if(hash);
-    if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
+    if (n == RHASH(hash)->tbl->num_entries) return Qnil;
     return hash;
 }
 
@@ -841,11 +866,22 @@ rb_hash_reject_bang(VALUE hash)
  */
 
 static VALUE
-rb_hash_reject(VALUE hash)
+rb_hash_reject(hash)
+    VALUE hash;
 {
     return rb_hash_delete_if(rb_obj_dup(hash));
 }
 
+static int
+select_i(key, value, result)
+    VALUE key, value, result;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    if (RTEST(rb_yield_values(2, key, value)))
+	rb_ary_push(result, rb_assoc_new(key, value));
+    return ST_CONTINUE;
+}
+
 /*
  * call-seq:
  *   hsh.values_at(key, ...)   => array
@@ -858,9 +894,12 @@ rb_hash_reject(VALUE hash)
  */
 
 VALUE
-rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
+rb_hash_values_at(argc, argv, hash)
+    int argc;
+    VALUE *argv;
+    VALUE hash;
 {
-    VALUE result = rb_ary_new2(argc);
+    VALUE result = rb_ary_new();
     long i;
 
     for (i=0; i<argc; i++) {
@@ -869,39 +908,34 @@ rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
     return result;
 }
 
-static int
-select_i(VALUE key, VALUE value, VALUE result)
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_yield_values(2, key, value)))
-	rb_hash_aset(result, key, value);
-    return ST_CONTINUE;
-}
-
 /*
  *  call-seq:
- *     hsh.select {|key, value| block}   => a_hash
+ *     hsh.select {|key, value| block}   => array
  *
- *  Returns a new hash consisting of entries which the block returns true.
+ *  Returns a new array consisting of <code>[key,value]</code>
+ *  pairs for which the block returns true.
+ *  Also see <code>Hash.values_at</code>.
  *
  *     h = { "a" => 100, "b" => 200, "c" => 300 }
- *     h.select {|k,v| k > "a"}  #=> {"b" => 200, "c" => 300}
- *     h.select {|k,v| v < 200}  #=> {"a" => 100}
+ *     h.select {|k,v| k > "a"}  #=> [["b", 200], ["c", 300]]
+ *     h.select {|k,v| v < 200}  #=> [["a", 100]]
  */
 
 VALUE
-rb_hash_select(VALUE hash)
+rb_hash_select(hash)
+    VALUE hash;
 {
     VALUE result;
 
     RETURN_ENUMERATOR(hash, 0, 0);
-    result = rb_hash_new();
+    result = rb_ary_new();
     rb_hash_foreach(hash, select_i, result);
     return result;
 }
 
 static int
-clear_i(VALUE key, VALUE value, VALUE dummy)
+clear_i(key, value, dummy)
+    VALUE key, value, dummy;
 {
     return ST_DELETE;
 }
@@ -918,16 +952,12 @@ clear_i(VALUE key, VALUE value, VALUE dummy)
  */
 
 static VALUE
-rb_hash_clear(VALUE hash)
+rb_hash_clear(hash)
+    VALUE hash;
 {
-    rb_hash_modify_check(hash);
-    if (!RHASH(hash)->ntbl)
-        return hash;
-    if (RHASH(hash)->ntbl->num_entries > 0) {
-	if (RHASH(hash)->iter_lev > 0)
-	    rb_hash_foreach(hash, clear_i, 0);
-	else
-	    st_clear(RHASH(hash)->ntbl);
+    rb_hash_modify(hash);
+    if (RHASH(hash)->tbl->num_entries > 0) {
+	rb_hash_foreach(hash, clear_i, 0);
     }
 
     return hash;
@@ -952,21 +982,22 @@ rb_hash_clear(VALUE hash)
  */
 
 VALUE
-rb_hash_aset(VALUE hash, VALUE key, VALUE val)
+rb_hash_aset(hash, key, val)
+    VALUE hash, key, val;
 {
     rb_hash_modify(hash);
-    if (RHASH(hash)->ntbl->type == &identhash ||
-	TYPE(key) != T_STRING || st_lookup(RHASH(hash)->ntbl, key, 0)) {
-	st_insert(RHASH(hash)->ntbl, key, val);
+    if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
+	st_insert(RHASH(hash)->tbl, key, val);
     }
     else {
-	st_add_direct(RHASH(hash)->ntbl, rb_str_new4(key), val);
+	st_add_direct(RHASH(hash)->tbl, rb_str_new4(key), val);
     }
     return val;
 }
 
 static int
-replace_i(VALUE key, VALUE val, VALUE hash)
+replace_i(key, val, hash)
+    VALUE key, val, hash;
 {
     if (key != Qundef) {
 	rb_hash_aset(hash, key, val);
@@ -988,7 +1019,8 @@ replace_i(VALUE key, VALUE val, VALUE hash)
  */
 
 static VALUE
-rb_hash_replace(VALUE hash, VALUE hash2)
+rb_hash_replace(hash, hash2)
+    VALUE hash, hash2;
 {
     hash2 = to_hash(hash2);
     if (hash == hash2) return hash;
@@ -1019,11 +1051,10 @@ rb_hash_replace(VALUE hash, VALUE hash2)
  */
 
 static VALUE
-rb_hash_size(VALUE hash)
+rb_hash_size(hash)
+    VALUE hash;
 {
-    if (!RHASH(hash)->ntbl)
-        return INT2FIX(0);
-    return INT2FIX(RHASH(hash)->ntbl->num_entries);
+    return INT2FIX(RHASH(hash)->tbl->num_entries);
 }
 
 
@@ -1038,13 +1069,17 @@ rb_hash_size(VALUE hash)
  */
 
 static VALUE
-rb_hash_empty_p(VALUE hash)
+rb_hash_empty_p(hash)
+    VALUE hash;
 {
-    return RHASH_EMPTY_P(hash) ? Qtrue : Qfalse;
+    if (RHASH(hash)->tbl->num_entries == 0)
+	return Qtrue;
+    return Qfalse;
 }
 
 static int
-each_value_i(VALUE key, VALUE value)
+each_value_i(key, value)
+    VALUE key, value;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(value);
@@ -1068,7 +1103,8 @@ each_value_i(VALUE key, VALUE value)
  */
 
 static VALUE
-rb_hash_each_value(VALUE hash)
+rb_hash_each_value(hash)
+    VALUE hash;
 {
     RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_value_i, 0);
@@ -1076,7 +1112,8 @@ rb_hash_each_value(VALUE hash)
 }
 
 static int
-each_key_i(VALUE key, VALUE value)
+each_key_i(key, value)
+    VALUE key, value;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(key);
@@ -1099,7 +1136,8 @@ each_key_i(VALUE key, VALUE value)
  *     b
  */
 static VALUE
-rb_hash_each_key(VALUE hash)
+rb_hash_each_key(hash)
+    VALUE hash;
 {
     RETURN_ENUMERATOR(hash, 0, 0);
     rb_hash_foreach(hash, each_key_i, 0);
@@ -1107,7 +1145,43 @@ rb_hash_each_key(VALUE hash)
 }
 
 static int
-each_pair_i(VALUE key, VALUE value)
+each_pair_i(key, value)
+    VALUE key, value;
+{
+    if (key == Qundef) return ST_CONTINUE;
+    rb_yield_values(2, key, value);
+    return ST_CONTINUE;
+}
+
+/*
+ *  call-seq:
+ *     hsh.each_pair {| key_value_array | block } -> hsh
+ *
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ *  and value as parameters.
+ *
+ *     h = { "a" => 100, "b" => 200 }
+ *     h.each_pair {|key, value| puts "#{key} is #{value}" }
+ *
+ *  <em>produces:</em>
+ *
+ *     a is 100
+ *     b is 200
+ *
+ */
+
+static VALUE
+rb_hash_each_pair(hash)
+    VALUE hash;
+{
+    RETURN_ENUMERATOR(hash, 0, 0);
+    rb_hash_foreach(hash, each_pair_i, 0);
+    return hash;
+}
+
+static int
+each_i(key, value)
+    VALUE key, value;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_yield(rb_assoc_new(key, value));
@@ -1117,10 +1191,12 @@ each_pair_i(VALUE key, VALUE value)
 /*
  *  call-seq:
  *     hsh.each {| key, value | block } -> hsh
- *     hsh.each_pair {| key, value | block } -> hsh
  *
- *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
- *  pair as parameters.
+ *  Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
+ *  and value to the block as a two-element array. Because of the assignment
+ *  semantics of block parameters, these elements will be split out if the
+ *  block has two formal parameters. Also see <code>Hash.each_pair</code>, which
+ *  will be marginally more efficient for blocks with two parameters.
  *
  *     h = { "a" => 100, "b" => 200 }
  *     h.each {|key, value| puts "#{key} is #{value}" }
@@ -1133,15 +1209,17 @@ each_pair_i(VALUE key, VALUE value)
  */
 
 static VALUE
-rb_hash_each_pair(VALUE hash)
+rb_hash_each(hash)
+    VALUE hash;
 {
     RETURN_ENUMERATOR(hash, 0, 0);
-    rb_hash_foreach(hash, each_pair_i, 0);
+    rb_hash_foreach(hash, each_i, 0);
     return hash;
 }
 
 static int
-to_a_i(VALUE key, VALUE value, VALUE ary)
+to_a_i(key, value, ary)
+    VALUE key, value, ary;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, rb_assoc_new(key, value));
@@ -1156,11 +1234,12 @@ to_a_i(VALUE key, VALUE value, VALUE ary)
  *  value</i> <code>]</code> arrays.
  *
  *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_a   #=> [["c", 300], ["a", 100], ["d", 400]]
+ *     h.to_a   #=> [["a", 100], ["c", 300], ["d", 400]]
  */
 
 static VALUE
-rb_hash_to_a(VALUE hash)
+rb_hash_to_a(hash)
+    VALUE hash;
 {
     VALUE ary;
 
@@ -1171,13 +1250,38 @@ rb_hash_to_a(VALUE hash)
     return ary;
 }
 
+/*
+ *  call-seq:
+ *     hsh.sort                    => array
+ *     hsh.sort {| a, b | block }  => array
+ *
+ *  Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
+ *  value</i> <code>]</code> arrays and sorts it, using
+ *  <code>Array#sort</code>.
+ *
+ *     h = { "a" => 20, "b" => 30, "c" => 10  }
+ *     h.sort                       #=> [["a", 20], ["b", 30], ["c", 10]]
+ *     h.sort {|a,b| a[1]<=>b[1]}   #=> [["c", 10], ["a", 20], ["b", 30]]
+ *
+ */
+
+static VALUE
+rb_hash_sort(hash)
+    VALUE hash;
+{
+    VALUE entries = rb_hash_to_a(hash);
+    rb_ary_sort_bang(entries);
+    return entries;
+}
+
 static int
-inspect_i(VALUE key, VALUE value, VALUE str)
+inspect_i(key, value, str)
+    VALUE key, value, str;
 {
     VALUE str2;
 
     if (key == Qundef) return ST_CONTINUE;
-    if (RSTRING_LEN(str) > 1) {
+    if (RSTRING(str)->len > 1) {
 	rb_str_cat2(str, ", ");
     }
     str2 = rb_inspect(key);
@@ -1192,11 +1296,11 @@ inspect_i(VALUE key, VALUE value, VALUE str)
 }
 
 static VALUE
-inspect_hash(VALUE hash, VALUE dummy, int recur)
+inspect_hash(hash)
+    VALUE hash;
 {
     VALUE str;
 
-    if (recur) return rb_usascii_str_new2("{...}");
     str = rb_str_buf_new2("{");
     rb_hash_foreach(hash, inspect_i, str);
     rb_str_buf_cat2(str, "}");
@@ -1207,21 +1311,47 @@ inspect_hash(VALUE hash, VALUE dummy, int recur)
 
 /*
  * call-seq:
- *   hsh.to_s   => string
  *   hsh.inspect  => string
  *
  * Return the contents of this hash as a string.
+ */
+
+static VALUE
+rb_hash_inspect(hash)
+    VALUE hash;
+{
+    if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
+	return rb_str_new2("{}");
+    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+    return rb_protect_inspect(inspect_hash, hash, 0);
+}
+
+static VALUE
+to_s_hash(hash)
+    VALUE hash;
+{
+    return rb_ary_to_s(rb_hash_to_a(hash));
+}
+
+/*
+ *  call-seq:
+ *     hsh.to_s   => string
+ *
+ *  Converts <i>hsh</i> to a string by converting the hash to an array
+ *  of <code>[</code> <i>key, value</i> <code>]</code> pairs and then
+ *  converting that array to a string using <code>Array#join</code> with
+ *  the default separator.
  *
  *     h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300  }
- *     h.to_s   #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
+ *     h.to_s   #=> "a100c300d400"
  */
 
 static VALUE
-rb_hash_inspect(VALUE hash)
+rb_hash_to_s(hash)
+    VALUE hash;
 {
-    if (RHASH_EMPTY_P(hash))
-	return rb_usascii_str_new2("{}");
-    return rb_exec_recursive(inspect_hash, hash, 0);
+    if (rb_inspecting_p(hash)) return rb_str_new2("{...}");
+    return rb_protect_inspect(to_s_hash, hash, 0);
 }
 
 /*
@@ -1232,13 +1362,15 @@ rb_hash_inspect(VALUE hash)
  */
 
 static VALUE
-rb_hash_to_hash(VALUE hash)
+rb_hash_to_hash(hash)
+    VALUE hash;
 {
     return hash;
 }
 
 static int
-keys_i(VALUE key, VALUE value, VALUE ary)
+keys_i(key, value, ary)
+    VALUE key, value, ary;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, key);
@@ -1258,7 +1390,8 @@ keys_i(VALUE key, VALUE value, VALUE ary)
  */
 
 static VALUE
-rb_hash_keys(VALUE hash)
+rb_hash_keys(hash)
+    VALUE hash;
 {
     VALUE ary;
 
@@ -1269,7 +1402,8 @@ rb_hash_keys(VALUE hash)
 }
 
 static int
-values_i(VALUE key, VALUE value, VALUE ary)
+values_i(key, value, ary)
+    VALUE key, value, ary;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_ary_push(ary, value);
@@ -1289,7 +1423,8 @@ values_i(VALUE key, VALUE value, VALUE ary)
  */
 
 static VALUE
-rb_hash_values(VALUE hash)
+rb_hash_values(hash)
+    VALUE hash;
 {
     VALUE ary;
 
@@ -1315,18 +1450,19 @@ rb_hash_values(VALUE hash)
  */
 
 static VALUE
-rb_hash_has_key(VALUE hash, VALUE key)
+rb_hash_has_key(hash, key)
+    VALUE hash;
+    VALUE key;
 {
-    if (!RHASH(hash)->ntbl)
-        return Qfalse;
-    if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
+    if (st_lookup(RHASH(hash)->tbl, key, 0)) {
 	return Qtrue;
     }
     return Qfalse;
 }
 
 static int
-rb_hash_search_value(VALUE key, VALUE value, VALUE *data)
+rb_hash_search_value(key, value, data)
+    VALUE key, value, *data;
 {
     if (key == Qundef) return ST_CONTINUE;
     if (rb_equal(value, data[1])) {
@@ -1350,7 +1486,9 @@ rb_hash_search_value(VALUE key, VALUE value, VALUE *data)
  */
 
 static VALUE
-rb_hash_has_value(VALUE hash, VALUE val)
+rb_hash_has_value(hash, val)
+    VALUE hash;
+    VALUE val;
 {
     VALUE data[2];
 
@@ -1361,13 +1499,16 @@ rb_hash_has_value(VALUE hash, VALUE val)
 }
 
 struct equal_data {
-    VALUE result;
+    int result;
     st_table *tbl;
     int eql;
 };
 
 static int
-eql_i(VALUE key, VALUE val1, struct equal_data *data)
+eql_i(key, val1, data)
+    VALUE key;
+    VALUE val1;
+    struct equal_data *data;
 {
     VALUE val2;
 
@@ -1383,8 +1524,12 @@ eql_i(VALUE key, VALUE val1, struct equal_data *data)
     return ST_CONTINUE;
 }
 
+static VALUE recursive_eql _((VALUE, VALUE, int));
 static VALUE
-recursive_eql(VALUE hash, VALUE dt, int recur)
+recursive_eql(hash, dt, recur)
+    VALUE hash;
+    VALUE dt;
+    int recur;
 {
     struct equal_data *data;
 
@@ -1397,7 +1542,9 @@ recursive_eql(VALUE hash, VALUE dt, int recur)
 }
 
 static VALUE
-hash_equal(VALUE hash1, VALUE hash2, int eql)
+hash_equal(hash1, hash2, eql)
+    VALUE hash1, hash2;
+    int eql;			/* compare default value if true */
 {
     struct equal_data data;
 
@@ -1406,24 +1553,17 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
 	if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
 	    return Qfalse;
 	}
-	if (eql)
-	    return rb_eql(hash2, hash1);
-	else
-	    return rb_equal(hash2, hash1);
+	return rb_equal(hash2, hash1);
     }
-    if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
+    if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
 	return Qfalse;
-    if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
-        return Qtrue;
-    if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
-	return Qfalse;
-#if 0
-    if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
-	  FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
-	return Qfalse;
-#endif
+    if (eql) {
+	if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
+	      FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
+	    return Qfalse;
+    }
 
-    data.tbl = RHASH(hash2)->ntbl;
+    data.tbl = RHASH(hash2)->tbl;
     data.eql = eql;
     return rb_exec_recursive(recursive_eql, hash1, (VALUE)&data);
 }
@@ -1448,27 +1588,17 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
  */
 
 static VALUE
-rb_hash_equal(VALUE hash1, VALUE hash2)
+rb_hash_equal(hash1, hash2)
+    VALUE hash1, hash2;
 {
     return hash_equal(hash1, hash2, Qfalse);
 }
 
-/*
- *  call-seq:
- *     hash.eql?(other)  -> true or false
- *
- *  Returns <code>true</code> if <i>hash</i> and <i>other</i> are
- *  both hashes with the same content.
- */
-
-static VALUE
-rb_hash_eql(VALUE hash1, VALUE hash2)
-{
-    return hash_equal(hash1, hash2, Qtrue);
-}
-
 static int
-hash_i(VALUE key, VALUE val, int *hval)
+hash_i(key, val, hval)
+    VALUE key;
+    VALUE val;
+    int *hval;
 {
     if (key == Qundef) return ST_CONTINUE;
     *hval ^= rb_hash(key);
@@ -1476,17 +1606,19 @@ hash_i(VALUE key, VALUE val, int *hval)
     return ST_CONTINUE;
 }
 
+static VALUE recursive_hash _((VALUE, VALUE, int));
 static VALUE
-recursive_hash(VALUE hash, VALUE dummy, int recur)
+recursive_hash(hash, dummy, recur)
+    VALUE hash;
+    VALUE dummy;
+    int recur;
 {
     int hval;
 
     if (recur) {
 	return LONG2FIX(0);
     }
-    if (!RHASH(hash)->ntbl)
-        return LONG2FIX(0);
-    hval = RHASH(hash)->ntbl->num_entries;
+    hval = RHASH(hash)->tbl->num_entries;
     rb_hash_foreach(hash, hash_i, (st_data_t)&hval);
     return INT2FIX(hval);
 }
@@ -1500,13 +1632,32 @@ recursive_hash(VALUE hash, VALUE dummy, int recur)
  */
 
 static VALUE
-rb_hash_hash(VALUE hash)
+rb_hash_hash(hash)
+    VALUE hash;
 {
     return rb_exec_recursive(recursive_hash, hash, 0);
 }
 
+
+/*
+ *  call-seq:
+ *     hash.eql?(other)  -> true or false
+ *
+ *  Returns <code>true</code> if <i>hash</i> and <i>other</i> are
+ *  both hashes with the same content.
+ */
+
+static VALUE
+rb_hash_eql(hash1, hash2)
+    VALUE hash1, hash2;
+{
+    return hash_equal(hash1, hash2, Qtrue);
+}
+
 static int
-rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_invert_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_hash_aset(hash, value, key);
@@ -1521,12 +1672,13 @@ rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
  *  the keys as values.
  *
  *     h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
- *     h.invert   #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
+ *     h.invert   #=> {0=>"a", 100=>"n", 200=>"d", 300=>"y"}
  *
  */
 
 static VALUE
-rb_hash_invert(VALUE hash)
+rb_hash_invert(hash)
+    VALUE hash;
 {
     VALUE h = rb_hash_new();
 
@@ -1535,7 +1687,9 @@ rb_hash_invert(VALUE hash)
 }
 
 static int
-rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_update_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
 {
     if (key == Qundef) return ST_CONTINUE;
     rb_hash_aset(hash, key, value);
@@ -1543,7 +1697,9 @@ rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
 }
 
 static int
-rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
+rb_hash_update_block_i(key, value, hash)
+    VALUE key, value;
+    VALUE hash;
 {
     if (key == Qundef) return ST_CONTINUE;
     if (rb_hash_has_key(hash, key)) {
@@ -1577,7 +1733,8 @@ rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
  */
 
 static VALUE
-rb_hash_update(VALUE hash1, VALUE hash2)
+rb_hash_update(hash1, hash2)
+    VALUE hash1, hash2;
 {
     hash2 = to_hash(hash2);
     if (rb_block_given_p()) {
@@ -1606,158 +1763,12 @@ rb_hash_update(VALUE hash1, VALUE hash2)
  */
 
 static VALUE
-rb_hash_merge(VALUE hash1, VALUE hash2)
+rb_hash_merge(hash1, hash2)
+    VALUE hash1, hash2;
 {
     return rb_hash_update(rb_obj_dup(hash1), hash2);
 }
 
-static int
-assoc_i(VALUE key, VALUE val, VALUE *args)
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_equal(args[0], key))) {
-	args[1] = rb_assoc_new(key, val);
-	return ST_STOP;
-    }
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     hash.assoc(obj)   ->  an_array  or  nil
- *
- *  Searches through the hash comparing _obj_ with the key using <code>==</code>.
- *  Returns the key-value pair (two elements array) or +nil+
- *  if no match is found.  See <code>Array#assoc</code>.
- *
- *     h = {"colors"  => ["red", "blue", "green"],
- *          "letters" => ["a", "b", "c" ]}
- *     h.assoc("letters")  #=> ["letters", ["a", "b", "c"]]
- *     h.assoc("foo")      #=> nil
- */
-
-VALUE
-rb_hash_assoc(VALUE hash, VALUE obj)
-{
-    VALUE args[2];
-
-    args[0] = obj;
-    args[1] = Qnil;
-    rb_hash_foreach(hash, assoc_i, (st_data_t)args);
-    return args[1];
-}
-
-static int
-rassoc_i(VALUE key, VALUE val, VALUE *args)
-{
-    if (key == Qundef) return ST_CONTINUE;
-    if (RTEST(rb_equal(args[0], val))) {
-	args[1] = rb_assoc_new(key, val);
-	return ST_STOP;
-    }
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     hash.rassoc(key) -> an_array or nil
- *
- *  Searches through the hash comparing _obj_ with the value using <code>==</code>.
- *  Returns the first key-value pair (two elements array) that matches. See
- *  also <code>Array#rassoc</code>.
- *
- *     a = {1=> "one", 2 => "two", 3 => "three", "ii" => "two"}
- *     a.rassoc("two")    #=> [2, "two"]
- *     a.rassoc("four")   #=> nil
- */
-
-VALUE
-rb_hash_rassoc(VALUE hash, VALUE obj)
-{
-    VALUE args[2];
-
-    args[0] = obj;
-    args[1] = Qnil;
-    rb_hash_foreach(hash, rassoc_i, (st_data_t)args);
-    return args[1];
-}
-
-/*
- *  call-seq:
- *     hash.flatten -> an_array
- *     hash.flatten(level) -> an_array
- *
- *  Returns a new array that is a one-dimensional flattening of this
- *  hash. That is, for every key or value that is an array, extract
- *  its elements into the new array.  Unlike Array#flatten, this
- *  method does not flatten recursively by default.  If the optional
- *  <i>level</i> argument determines the level of recursion to flatten.
- *
- *     a =  {1=> "one", 2 => [2,"two"], 3 => "three"}
- *     a.flatten    # => [1, "one", 2, [2, "two"], 3, "three"]
- *     a.flatten(2) # => [1, "one", 2, 2, "two", 3, "three"]
- */
-
-static VALUE
-rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
-{
-    VALUE ary, tmp;
-
-    ary = rb_hash_to_a(hash);
-    if (argc == 0) {
-	argc = 1;
-	tmp = INT2FIX(1);
-	argv = &tmp;
-    }
-    rb_funcall2(ary, rb_intern("flatten!"), argc, argv);
-    return ary;
-}
-
-/*
- *  call-seq:
- *     hsh.compare_by_identity => hsh
- *
- *  Makes <i>hsh</i> to compare its keys by their identity, i.e. it
- *  will consider exact same objects as same keys.
- *
- *     h1 = { "a" => 100, "b" => 200, :c => "c" }
- *     h1["a"]        #=> 100
- *     h1.compare_by_identity
- *     h1.compare_by_identity? #=> true
- *     h1["a"]        #=> nil  # different objects.
- *     h1[:c]         #=> "c"  # same symbols are all same.
- *
- */
-
-static VALUE
-rb_hash_compare_by_id(VALUE hash)
-{
-    rb_hash_modify(hash);
-    RHASH(hash)->ntbl->type = &identhash;
-    rb_hash_rehash(hash);
-    return hash;
-}
-
-/*
- *  call-seq:
- *     hsh.compare_by_identity? => true or false
- *
- *  Returns <code>true</code> if <i>hsh</i> will compare its keys by
- *  their identity.  Also see <code>Hash#compare_by_identity</code>.
- *
- */
-
-static VALUE
-rb_hash_compare_by_id_p(VALUE hash)
-{
-    if (!RHASH(hash)->ntbl)
-        return Qfalse;
-    if (RHASH(hash)->ntbl->type == &identhash) {
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
 static int path_tainted = -1;
 
 static char **origenviron;
@@ -1779,7 +1790,9 @@ extern char **environ;
 #endif
 
 static VALUE
-env_str_new(const char *ptr, long len)
+env_str_new(ptr, len)
+    const char *ptr;
+    long len;
 {
     VALUE str = rb_tainted_str_new(ptr, len);
 
@@ -1788,21 +1801,23 @@ env_str_new(const char *ptr, long len)
 }
 
 static VALUE
-env_str_new2(const char *ptr)
+env_str_new2(ptr)
+    const char *ptr;
 {
     if (!ptr) return Qnil;
     return env_str_new(ptr, strlen(ptr));
 }
 
 static VALUE
-env_delete(VALUE obj, VALUE name)
+env_delete(obj, name)
+    VALUE obj, name;
 {
     char *nam, *val;
 
     rb_secure(4);
     SafeStringValue(name);
-    nam = RSTRING_PTR(name);
-    if (strlen(nam) != RSTRING_LEN(name)) {
+    nam = RSTRING(name)->ptr;
+    if (strlen(nam) != RSTRING(name)->len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     val = getenv(nam);
@@ -1811,7 +1826,7 @@ env_delete(VALUE obj, VALUE name)
 
 	ruby_setenv(nam, 0);
 #ifdef ENV_IGNORECASE
-	if (STRCASECMP(nam, PATH_ENV) == 0)
+	if (strcasecmp(nam, PATH_ENV) == 0)
 #else
 	if (strcmp(nam, PATH_ENV) == 0)
 #endif
@@ -1824,7 +1839,8 @@ env_delete(VALUE obj, VALUE name)
 }
 
 static VALUE
-env_delete_m(VALUE obj, VALUE name)
+env_delete_m(obj, name)
+    VALUE obj, name;
 {
     VALUE val;
 
@@ -1834,20 +1850,21 @@ env_delete_m(VALUE obj, VALUE name)
 }
 
 static VALUE
-rb_f_getenv(VALUE obj, VALUE name)
+rb_f_getenv(obj, name)
+    VALUE obj, name;
 {
     char *nam, *env;
 
     rb_secure(4);
     SafeStringValue(name);
-    nam = RSTRING_PTR(name);
-    if (strlen(nam) != RSTRING_LEN(name)) {
+    nam = RSTRING(name)->ptr;
+    if (strlen(nam) != RSTRING(name)->len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     env = getenv(nam);
     if (env) {
 #ifdef ENV_IGNORECASE
-	if (STRCASECMP(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+	if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #else
 	if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #endif
@@ -1863,7 +1880,9 @@ rb_f_getenv(VALUE obj, VALUE name)
 }
 
 static VALUE
-env_fetch(int argc, VALUE *argv)
+env_fetch(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE key, if_none;
     long block_given;
@@ -1876,20 +1895,20 @@ env_fetch(int argc, VALUE *argv)
 	rb_warn("block supersedes default value argument");
     }
     SafeStringValue(key);
-    nam = RSTRING_PTR(key);
-    if (strlen(nam) != RSTRING_LEN(key)) {
+    nam = RSTRING(key)->ptr;
+    if (strlen(nam) != RSTRING(key)->len) {
 	rb_raise(rb_eArgError, "bad environment variable name");
     }
     env = getenv(nam);
     if (!env) {
 	if (block_given) return rb_yield(key);
 	if (argc == 1) {
-	    rb_raise(rb_eKeyError, "key not found");
+	    rb_raise(rb_eIndexError, "key not found");
 	}
 	return if_none;
     }
 #ifdef ENV_IGNORECASE
-    if (STRCASECMP(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
+    if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #else
     if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
 #endif
@@ -1898,13 +1917,14 @@ env_fetch(int argc, VALUE *argv)
 }
 
 static void
-path_tainted_p(char *path)
+path_tainted_p(path)
+    char *path;
 {
     path_tainted = rb_path_check(path)?0:1;
 }
 
 int
-rb_env_path_tainted(void)
+rb_env_path_tainted()
 {
     if (path_tainted < 0) {
 	path_tainted_p(getenv(PATH_ENV));
@@ -1914,7 +1934,8 @@ rb_env_path_tainted(void)
 
 #if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
 static int
-envix(const char *nam)
+envix(nam)
+    const char *nam;
 {
     register int i, len = strlen(nam);
     char **env;
@@ -1923,7 +1944,7 @@ envix(const char *nam)
     for (i = 0; env[i]; i++) {
 	if (
 #ifdef ENV_IGNORECASE
-	    STRNCASECMP(env[i],nam,len) == 0
+	    strncasecmp(env[i],nam,len) == 0
 #else
 	    memcmp(env[i],nam,len) == 0
 #endif
@@ -1936,7 +1957,9 @@ envix(const char *nam)
 #endif
 
 void
-ruby_setenv(const char *name, const char *value)
+ruby_setenv(name, value)
+    const char *name;
+    const char *value;
 {
 #if defined(_WIN32)
     /* The sane way to deal with the environment.
@@ -1984,7 +2007,7 @@ ruby_setenv(const char *name, const char *value)
 	char **envp = origenviron;
 	while (*envp && *envp != environ[i]) envp++;
 	if (!*envp)
-	    xfree(environ[i]);
+	    free(environ[i]);
 	if (!value) {
 	    while (environ[i]) {
 		environ[i] = environ[i+1];
@@ -2016,13 +2039,15 @@ ruby_setenv(const char *name, const char *value)
 }
 
 void
-ruby_unsetenv(const char *name)
+ruby_unsetenv(name)
+    const char *name;
 {
     ruby_setenv(name, 0);
 }
 
 static VALUE
-env_aset(VALUE obj, VALUE nm, VALUE val)
+env_aset(obj, nm, val)
+    VALUE obj, nm, val;
 {
     char *name, *value;
 
@@ -2031,20 +2056,22 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
     }
 
     if (NIL_P(val)) {
-	rb_raise(rb_eTypeError, "cannot assign nil; use Hash#delete instead");
+	env_delete(obj, nm);
+	return Qnil;
     }
+
     StringValue(nm);
     StringValue(val);
-    name = RSTRING_PTR(nm);
-    value = RSTRING_PTR(val);
-    if (strlen(name) != RSTRING_LEN(nm))
+    name = RSTRING(nm)->ptr;
+    value = RSTRING(val)->ptr;
+    if (strlen(name) != RSTRING(nm)->len)
 	rb_raise(rb_eArgError, "bad environment variable name");
-    if (strlen(value) != RSTRING_LEN(val))
+    if (strlen(value) != RSTRING(val)->len)
 	rb_raise(rb_eArgError, "bad environment variable value");
 
     ruby_setenv(name, value);
 #ifdef ENV_IGNORECASE
-    if (STRCASECMP(name, PATH_ENV) == 0) {
+    if (strcasecmp(name, PATH_ENV) == 0) {
 #else
     if (strcmp(name, PATH_ENV) == 0) {
 #endif
@@ -2061,7 +2088,7 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
 }
 
 static VALUE
-env_keys(void)
+env_keys()
 {
     char **env;
     VALUE ary;
@@ -2081,21 +2108,22 @@ env_keys(void)
 }
 
 static VALUE
-env_each_key(VALUE ehash)
+env_each_key(ehash)
+    VALUE ehash;
 {
     VALUE keys;
     long i;
 
     RETURN_ENUMERATOR(ehash, 0, 0);
     keys = env_keys();	/* rb_secure(4); */
-    for (i=0; i<RARRAY_LEN(keys); i++) {
-	rb_yield(RARRAY_PTR(keys)[i]);
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	rb_yield(RARRAY(keys)->ptr[i]);
     }
     return ehash;
 }
 
 static VALUE
-env_values(void)
+env_values()
 {
     VALUE ary;
     char **env;
@@ -2115,28 +2143,29 @@ env_values(void)
 }
 
 static VALUE
-env_each_value(VALUE ehash)
+env_each_value(ehash)
+    VALUE ehash;
 {
     VALUE values;
     long i;
 
     RETURN_ENUMERATOR(ehash, 0, 0);
     values = env_values();	/* rb_secure(4); */
-    for (i=0; i<RARRAY_LEN(values); i++) {
-	rb_yield(RARRAY_PTR(values)[i]);
+    for (i=0; i<RARRAY(values)->len; i++) {
+	rb_yield(RARRAY(values)->ptr[i]);
     }
     return ehash;
 }
 
 static VALUE
-env_each_pair(VALUE ehash)
+env_each_i(ehash, values)
+    VALUE ehash;
+    int values;
 {
     char **env;
     VALUE ary;
     long i;
 
-    RETURN_ENUMERATOR(ehash, 0, 0);
-
     rb_secure(4);
     ary = rb_ary_new();
     env = GET_ENVIRON(environ);
@@ -2150,14 +2179,36 @@ env_each_pair(VALUE ehash)
     }
     FREE_ENVIRON(environ);
 
-    for (i=0; i<RARRAY_LEN(ary); i+=2) {
-	rb_yield(rb_assoc_new(RARRAY_PTR(ary)[i], RARRAY_PTR(ary)[i+1]));
+    for (i=0; i<RARRAY(ary)->len; i+=2) {
+	if (values) {
+	    rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
+	}
+	else {
+	    rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
+	}
     }
     return ehash;
 }
 
 static VALUE
-env_reject_bang(VALUE ehash)
+env_each(ehash)
+    VALUE ehash;
+{
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    return env_each_i(ehash, Qfalse);
+}
+
+static VALUE
+env_each_pair(ehash)
+    VALUE ehash;
+{
+    RETURN_ENUMERATOR(ehash, 0, 0);
+    return env_each_i(ehash, Qtrue);
+}
+
+static VALUE
+env_reject_bang(ehash)
+    VALUE ehash;
 {
     volatile VALUE keys;
     long i;
@@ -2165,12 +2216,12 @@ env_reject_bang(VALUE ehash)
 
     RETURN_ENUMERATOR(ehash, 0, 0);
     keys = env_keys();	/* rb_secure(4); */
-    for (i=0; i<RARRAY_LEN(keys); i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
 	if (!NIL_P(val)) {
-	    if (RTEST(rb_yield_values(2, RARRAY_PTR(keys)[i], val))) {
-		FL_UNSET(RARRAY_PTR(keys)[i], FL_TAINT);
-		env_delete(Qnil, RARRAY_PTR(keys)[i]);
+	    if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
+		FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
+		env_delete(Qnil, RARRAY(keys)->ptr[i]);
 		del++;
 	    }
 	}
@@ -2180,7 +2231,8 @@ env_reject_bang(VALUE ehash)
 }
 
 static VALUE
-env_delete_if(VALUE ehash)
+env_delete_if(ehash)
+    VALUE ehash;
 {
     RETURN_ENUMERATOR(ehash, 0, 0);
     env_reject_bang(ehash);
@@ -2188,7 +2240,9 @@ env_delete_if(VALUE ehash)
 }
 
 static VALUE
-env_values_at(int argc, VALUE *argv)
+env_values_at(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE result;
     long i;
@@ -2202,14 +2256,15 @@ env_values_at(int argc, VALUE *argv)
 }
 
 static VALUE
-env_select(VALUE ehash)
+env_select(ehash)
+    VALUE ehash;
 {
     VALUE result;
     char **env;
 
     RETURN_ENUMERATOR(ehash, 0, 0);
     rb_secure(4);
-    result = rb_hash_new();
+    result = rb_ary_new();
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
@@ -2217,7 +2272,7 @@ env_select(VALUE ehash)
 	    VALUE k = env_str_new(*env, s-*env);
 	    VALUE v = env_str_new2(s+1);
 	    if (RTEST(rb_yield_values(2, k, v))) {
-		rb_hash_aset(result, k, v);
+		rb_ary_push(result, rb_assoc_new(k, v));
 	    }
 	}
 	env++;
@@ -2227,30 +2282,30 @@ env_select(VALUE ehash)
     return result;
 }
 
-VALUE
-rb_env_clear(void)
+static VALUE
+env_clear()
 {
     volatile VALUE keys;
     long i;
 
     keys = env_keys();	/* rb_secure(4); */
-    for (i=0; i<RARRAY_LEN(keys); i++) {
-	VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
 	if (!NIL_P(val)) {
-	    env_delete(Qnil, RARRAY_PTR(keys)[i]);
+	    env_delete(Qnil, RARRAY(keys)->ptr[i]);
 	}
     }
     return envtbl;
 }
 
 static VALUE
-env_to_s(void)
+env_to_s()
 {
-    return rb_usascii_str_new2("ENV");
+    return rb_str_new2("ENV");
 }
 
 static VALUE
-env_inspect(void)
+env_inspect()
 {
     char **env;
     VALUE str, i;
@@ -2281,7 +2336,7 @@ env_inspect(void)
 }
 
 static VALUE
-env_to_a(void)
+env_to_a()
 {
     char **env;
     VALUE ary;
@@ -2302,13 +2357,13 @@ env_to_a(void)
 }
 
 static VALUE
-env_none(void)
+env_none()
 {
     return Qnil;
 }
 
 static VALUE
-env_size(void)
+env_size()
 {
     int i;
     char **env;
@@ -2322,7 +2377,7 @@ env_size(void)
 }
 
 static VALUE
-env_empty_p(void)
+env_empty_p()
 {
     char **env;
 
@@ -2337,46 +2392,34 @@ env_empty_p(void)
 }
 
 static VALUE
-env_has_key(VALUE env, VALUE key)
+env_has_key(env, key)
+    VALUE env, key;
 {
     char *s;
 
     rb_secure(4);
     s = StringValuePtr(key);
-    if (strlen(s) != RSTRING_LEN(key))
+    if (strlen(s) != RSTRING(key)->len)
 	rb_raise(rb_eArgError, "bad environment variable name");
     if (getenv(s)) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-env_assoc(VALUE env, VALUE key)
-{
-    char *s, *e;
-
-    rb_secure(4);
-    s = StringValuePtr(key);
-    if (strlen(s) != RSTRING_LEN(key))
-	rb_raise(rb_eArgError, "bad environment variable name");
-    e = getenv(s);
-    if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
-    return Qnil;
-}
-
-static VALUE
-env_has_value(VALUE dmy, VALUE obj)
+env_has_value(dmy, value)
+    VALUE dmy, value;
 {
     char **env;
 
     rb_secure(4);
-    obj = rb_check_string_type(obj);
-    if (NIL_P(obj)) return Qnil;
+    value = rb_check_string_type(value);
+    if (NIL_P(value)) return Qfalse;
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s++) {
 	    long len = strlen(s);
-	    if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
+	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
 		FREE_ENVIRON(environ);
 		return Qtrue;
 	    }
@@ -2388,22 +2431,23 @@ env_has_value(VALUE dmy, VALUE obj)
 }
 
 static VALUE
-env_rassoc(VALUE dmy, VALUE obj)
+env_index(dmy, value)
+    VALUE dmy, value;
 {
     char **env;
+    VALUE str;
 
     rb_secure(4);
-    obj = rb_check_string_type(obj);
-    if (NIL_P(obj)) return Qnil;
+    StringValue(value);
     env = GET_ENVIRON(environ);
     while (*env) {
 	char *s = strchr(*env, '=');
 	if (s++) {
 	    long len = strlen(s);
-	    if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
-		VALUE result = rb_assoc_new(rb_tainted_str_new(*env, s-*env-1), obj);
+	    if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
+		str = env_str_new(*env, s-*env-1);
 		FREE_ENVIRON(environ);
-		return result;
+		return str;
 	    }
 	}
 	env++;
@@ -2413,39 +2457,32 @@ env_rassoc(VALUE dmy, VALUE obj)
 }
 
 static VALUE
-env_key(VALUE dmy, VALUE value)
+env_indexes(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    char **env;
-    VALUE str;
+    int i;
+    VALUE indexes = rb_ary_new2(argc);
 
+    rb_warn("ENV.%s is deprecated; use ENV.values_at",
+	    rb_id2name(rb_frame_last_func()));
     rb_secure(4);
-    StringValue(value);
-    env = GET_ENVIRON(environ);
-    while (*env) {
-	char *s = strchr(*env, '=');
-	if (s++) {
-	    long len = strlen(s);
-	    if (RSTRING_LEN(value) == len && strncmp(s, RSTRING_PTR(value), len) == 0) {
-		str = env_str_new(*env, s-*env-1);
-		FREE_ENVIRON(environ);
-		return str;
-	    }
+    for (i=0;i<argc;i++) {
+	VALUE tmp = rb_check_string_type(argv[i]);
+	if (NIL_P(tmp)) {
+	    RARRAY(indexes)->ptr[i] = Qnil;
 	}
-	env++;
+	else {
+	    RARRAY(indexes)->ptr[i] = env_str_new2(getenv(RSTRING(tmp)->ptr));
+	}
+	RARRAY(indexes)->len = i+1;
     }
-    FREE_ENVIRON(environ);
-    return Qnil;
-}
 
-static VALUE
-env_index(VALUE dmy, VALUE value)
-{
-    rb_warn("ENV.index is deprecated; use ENV.key");
-    return env_key(dmy, value);
+    return indexes;
 }
 
 static VALUE
-env_to_hash(void)
+env_to_hash()
 {
     char **env;
     VALUE hash;
@@ -2466,13 +2503,13 @@ env_to_hash(void)
 }
 
 static VALUE
-env_reject(void)
+env_reject()
 {
     return rb_hash_delete_if(env_to_hash());
 }
 
 static VALUE
-env_shift(void)
+env_shift()
 {
     char **env;
 
@@ -2482,7 +2519,7 @@ env_shift(void)
 	char *s = strchr(*env, '=');
 	if (s) {
 	    VALUE key = env_str_new(*env, s-*env);
-	    VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
+	    VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
 	    env_delete(Qnil, key);
 	    return rb_assoc_new(key, val);
 	}
@@ -2492,13 +2529,14 @@ env_shift(void)
 }
 
 static VALUE
-env_invert(void)
+env_invert()
 {
     return rb_hash_invert(env_to_hash());
 }
 
 static int
-env_replace_i(VALUE key, VALUE val, VALUE keys)
+env_replace_i(key, val, keys)
+    VALUE key, val, keys;
 {
     if (key != Qundef) {
 	env_aset(Qnil, key, val);
@@ -2510,7 +2548,8 @@ env_replace_i(VALUE key, VALUE val, VALUE keys)
 }
 
 static VALUE
-env_replace(VALUE env, VALUE hash)
+env_replace(env, hash)
+    VALUE env, hash;
 {
     volatile VALUE keys;
     long i;
@@ -2520,14 +2559,15 @@ env_replace(VALUE env, VALUE hash)
     hash = to_hash(hash);
     rb_hash_foreach(hash, env_replace_i, keys);
 
-    for (i=0; i<RARRAY_LEN(keys); i++) {
-	env_delete(env, RARRAY_PTR(keys)[i]);
+    for (i=0; i<RARRAY(keys)->len; i++) {
+	env_delete(env, RARRAY(keys)->ptr[i]);
     }
     return env;
 }
 
 static int
-env_update_i(VALUE key, VALUE val)
+env_update_i(key, val)
+    VALUE key, val;
 {
     if (key != Qundef) {
 	if (rb_block_given_p()) {
@@ -2539,7 +2579,8 @@ env_update_i(VALUE key, VALUE val)
 }
 
 static VALUE
-env_update(VALUE env, VALUE hash)
+env_update(env, hash)
+    VALUE env, hash;
 {
     rb_secure(4);
     if (env == hash) return env;
@@ -2559,15 +2600,45 @@ env_update(VALUE env, VALUE hash)
  *  keys that do not exist in the hash. By default, that value is
  *  <code>nil</code>.
  *
+ *  <code>Hash</code> uses <code>key.eql?</code> to test keys for equality.
+ *  If you need to use instances of your own classes as keys in a <code>Hash</code>,
+ *  it is recommended that you define both the <code>eql?</code> and <code>hash</code>
+ *  methods. The <code>hash</code> method must have the property that
+ *  <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
+ *
+ *    class MyClass
+ *      attr_reader :str
+ *      def initialize(str)
+ *        @str = str
+ *      end
+ *      def eql?(o)
+ *        o.is_a?(MyClass) && str == o.str
+ *      end
+ *      def hash
+ *        @str.hash
+ *      end
+ *    end
+ *
+ *    a = MyClass.new("some string")
+ *    b = MyClass.new("some string")
+ *    a.eql? b  #=> true
+ *
+ *    h = {}
+ *
+ *    h[a] = 1
+ *    h[a]      #=> 1
+ *    h[b]      #=> 1
+ *
+ *    h[b] = 2
+ *    h[a]      #=> 2
+ *    h[b]      #=> 2
  */
 
 void
-Init_Hash(void)
+Init_Hash()
 {
-#undef rb_intern
-
     id_hash = rb_intern("hash");
-    id_yield = rb_intern("yield");
+    id_call = rb_intern("call");
     id_default = rb_intern("default");
 
     rb_cHash = rb_define_class("Hash", rb_cObject);
@@ -2576,14 +2647,13 @@ Init_Hash(void)
 
     rb_define_alloc_func(rb_cHash, hash_alloc);
     rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
-    rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
     rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
     rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
     rb_define_method(rb_cHash,"rehash", rb_hash_rehash, 0);
 
     rb_define_method(rb_cHash,"to_hash", rb_hash_to_hash, 0);
     rb_define_method(rb_cHash,"to_a", rb_hash_to_a, 0);
-    rb_define_method(rb_cHash,"to_s", rb_hash_inspect, 0);
+    rb_define_method(rb_cHash,"to_s", rb_hash_to_s, 0);
     rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
 
     rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
@@ -2596,16 +2666,18 @@ Init_Hash(void)
     rb_define_method(rb_cHash,"default", rb_hash_default, -1);
     rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
     rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
-    rb_define_method(rb_cHash,"key", rb_hash_key, 1);
     rb_define_method(rb_cHash,"index", rb_hash_index, 1);
+    rb_define_method(rb_cHash,"indexes", rb_hash_indexes, -1);
+    rb_define_method(rb_cHash,"indices", rb_hash_indexes, -1);
     rb_define_method(rb_cHash,"size", rb_hash_size, 0);
     rb_define_method(rb_cHash,"length", rb_hash_size, 0);
     rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
 
+    rb_define_method(rb_cHash,"each", rb_hash_each, 0);
     rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
     rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
     rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
-    rb_define_method(rb_cHash,"each", rb_hash_each_pair, 0);
+    rb_define_method(rb_cHash,"sort", rb_hash_sort, 0);
 
     rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
     rb_define_method(rb_cHash,"values", rb_hash_values, 0);
@@ -2623,9 +2695,6 @@ Init_Hash(void)
     rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
     rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
     rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
-    rb_define_method(rb_cHash, "assoc", rb_hash_assoc, 1);
-    rb_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1);
-    rb_define_method(rb_cHash, "flatten", rb_hash_flatten, -1);
 
     rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
     rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
@@ -2634,9 +2703,6 @@ Init_Hash(void)
     rb_define_method(rb_cHash,"key?", rb_hash_has_key, 1);
     rb_define_method(rb_cHash,"value?", rb_hash_has_value, 1);
 
-    rb_define_method(rb_cHash,"compare_by_identity", rb_hash_compare_by_id, 0);
-    rb_define_method(rb_cHash,"compare_by_identity?", rb_hash_compare_by_id_p, 0);
-
 #ifndef __MACOS__ /* environment variables nothing on MacOS. */
     origenviron = environ;
     envtbl = rb_obj_alloc(rb_cObject);
@@ -2646,13 +2712,13 @@ Init_Hash(void)
     rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
     rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
     rb_define_singleton_method(envtbl,"store", env_aset, 2);
-    rb_define_singleton_method(envtbl,"each", env_each_pair, 0);
+    rb_define_singleton_method(envtbl,"each", env_each, 0);
     rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
     rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
     rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
     rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
     rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
-    rb_define_singleton_method(envtbl,"clear", rb_env_clear, 0);
+    rb_define_singleton_method(envtbl,"clear", env_clear, 0);
     rb_define_singleton_method(envtbl,"reject", env_reject, 0);
     rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
     rb_define_singleton_method(envtbl,"select", env_select, 0);
@@ -2664,8 +2730,9 @@ Init_Hash(void)
     rb_define_singleton_method(envtbl,"rehash", env_none, 0);
     rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
     rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
-    rb_define_singleton_method(envtbl,"key", env_key, 1);
     rb_define_singleton_method(envtbl,"index", env_index, 1);
+    rb_define_singleton_method(envtbl,"indexes", env_indexes, -1);
+    rb_define_singleton_method(envtbl,"indices", env_indexes, -1);
     rb_define_singleton_method(envtbl,"size", env_size, 0);
     rb_define_singleton_method(envtbl,"length", env_size, 0);
     rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
@@ -2679,8 +2746,6 @@ Init_Hash(void)
     rb_define_singleton_method(envtbl,"key?", env_has_key, 1);
     rb_define_singleton_method(envtbl,"value?", env_has_value, 1);
     rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
-    rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
-    rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
 
     rb_define_global_const("ENV", envtbl);
 #else /* __MACOS__ */
diff --git a/ia64.s b/ia64.s
index 92415b4e97..ba5241daf2 100644
--- a/ia64.s
+++ b/ia64.s
@@ -6,15 +6,6 @@
 //   void rb_ia64_flushrs(void) { __builtin_ia64_flushrs(); }
 //   void *rb_ia64_bsp(void) { return __builtin_ia64_bsp(); }
 // 
-// Note that rb_ia64_flushrs and rb_ia64_bsp works in its own stack frame.
-// It's because BSP is updated by br.call/brl.call (not alloc instruction).
-// So rb_ia64_flushrs flushes stack frames including caller's one.
-// rb_ia64_bsp returns the address next to caller's register stack frame. 
-//
-// See also
-// Intel Itanium Architecture Software Developer's Manual
-// Volume 2: System Architecture.
-//
 	.file	"ia64.c"
 	.text
 	.align 16
diff --git a/id.c b/id.c
deleted file mode 100644
index a02504d809..0000000000
--- a/id.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/**********************************************************************
-
-  id.c - 
-
-  $Author$
-  created at: Thu Jul 12 04:37:51 2007
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-
-#define extern
-#include "id.h"
-#undef extern
-
-void
-Init_id(void)
-{
-#undef rb_intern
-
-    /* Symbols */
-    symIFUNC = ID2SYM(rb_intern("<IFUNC>"));
-    symCFUNC = ID2SYM(rb_intern("<CFUNC>"));
-
-    /* IDs */
-    idPLUS = rb_intern("+");
-    idMINUS = rb_intern("-");
-    idMULT = rb_intern("*");
-    idDIV = rb_intern("/");
-    idMOD = rb_intern("%");
-    idLT = rb_intern("<");
-    idLTLT = rb_intern("<<");
-    idLE = rb_intern("<=");
-    idGT = rb_intern(">");
-    idGE = rb_intern(">=");
-    idEq = rb_intern("==");
-    idEqq = rb_intern("===");
-    idBackquote = rb_intern("`");
-    idEqTilde = rb_intern("=~");
-    idNot = rb_intern("!");
-    idNeq = rb_intern("!=");
-
-    idAREF = rb_intern("[]");
-    idASET = rb_intern("[]=");
-
-    idEach = rb_intern("each");
-    idTimes = rb_intern("times");
-    idLength = rb_intern("length");
-    idLambda = rb_intern("lambda");
-    idIntern = rb_intern("intern");
-    idGets = rb_intern("gets");
-    idSucc = rb_intern("succ");
-    idEnd = rb_intern("end");
-    idRangeEachLT = rb_intern("Range#each#LT");
-    idRangeEachLE = rb_intern("Range#each#LE");
-    idArrayEach = rb_intern("Array#each");
-    idMethodMissing = rb_intern("method_missing");
-
-    idThrowState = rb_intern("#__ThrowState__");
-
-    idBitblt = rb_intern("bitblt");
-    idAnswer = rb_intern("the_answer_to_life_the_universe_and_everything");
-
-    idSend = rb_intern("send");
-    id__send__ = rb_intern("__send__");
-
-    idRespond_to = rb_intern("respond_to?");
-    idInitialize = rb_intern("initialize");
-
-    id_core_set_method_alias = rb_intern("core_set_method_alias");
-    id_core_set_variable_alias = rb_intern("core_set_variable_alias");
-    id_core_undef_method = rb_intern("core_undef_method");
-    id_core_define_method = rb_intern("core_define_method");
-    id_core_define_singleton_method = rb_intern("core_define_singleton_method");
-    id_core_set_postexe = rb_intern("core_set_postexe");
-}
diff --git a/id.h b/id.h
deleted file mode 100644
index 977dcf57a3..0000000000
--- a/id.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/**********************************************************************
-
-  id.h - 
-
-  $Author: ko1 $
-  created at: Thu Jul 12 04:38:07 2007
-
-  Copyright (C) 2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_ID_H
-#define RUBY_ID_H
-
-extern VALUE symIFUNC;
-extern VALUE symCFUNC;
-
-extern ID idPLUS;
-extern ID idMINUS;
-extern ID idMULT;
-extern ID idDIV;
-extern ID idMOD;
-extern ID idLT;
-extern ID idLTLT;
-extern ID idLE;
-extern ID idGT;
-extern ID idGE;
-extern ID idEq;
-extern ID idEqq;
-extern ID idNeq;
-extern ID idNot;
-extern ID idBackquote;
-extern ID idEqTilde;
-extern ID idThrowState;
-extern ID idAREF;
-extern ID idASET;
-extern ID idIntern;
-extern ID idMethodMissing;
-extern ID idLength;
-extern ID idGets;
-extern ID idSucc;
-extern ID idEach;
-extern ID idLambda;
-extern ID idRangeEachLT;
-extern ID idRangeEachLE;
-extern ID idArrayEach;
-extern ID idTimes;
-extern ID idEnd;
-extern ID idBitblt;
-extern ID idAnswer;
-extern ID idSend;
-extern ID id__send__;
-extern ID idRespond_to;
-extern ID idInitialize;
-
-extern ID id_core_set_method_alias;
-extern ID id_core_set_variable_alias;
-extern ID id_core_undef_method;
-extern ID id_core_define_method;
-extern ID id_core_define_singleton_method;
-extern ID id_core_set_postexe;
-
-#endif /* RUBY_ID_H */
diff --git a/include/ruby.h b/include/ruby.h
deleted file mode 100644
index 2cb3fbf9f7..0000000000
--- a/include/ruby.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
-
-  ruby/mvm.h -
-
-  $Author$
-  created at: Sun 10 12:06:15 Jun JST 2007
-
-  Copyright (C) 2007-2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_H
-#define RUBY_H 1
-
-#define HAVE_RUBY_DEFINES_H     1
-#define HAVE_RUBY_ENCODING_H    1
-#define HAVE_RUBY_INTERN_H      1
-#define HAVE_RUBY_IO_H          1
-#define HAVE_RUBY_MISSING_H     1
-#define HAVE_RUBY_MVM_H         1
-#define HAVE_RUBY_NODE_H        1
-#define HAVE_RUBY_ONIGURUMA_H   1
-#define HAVE_RUBY_RE_H          1
-#define HAVE_RUBY_REGEX_H       1
-#define HAVE_RUBY_RUBY_H        1
-#define HAVE_RUBY_SIGNAL_H      1
-#define HAVE_RUBY_ST_H          1
-#define HAVE_RUBY_UTIL_H        1
-#ifdef _WIN32
-#define HAVE_RUBY_WIN32_H       1
-#endif
-
-#include "ruby/ruby.h"
-#if RUBY_VM
-#include "ruby/mvm.h"
-#endif
-
-extern void ruby_set_debug_option(const char *);
-#endif /* RUBY_H */
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
deleted file mode 100644
index 2be89de5ff..0000000000
--- a/include/ruby/defines.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/************************************************
-
-  defines.h -
-
-  $Author$
-  created at: Wed May 18 00:21:44 JST 1994
-
-************************************************/
-
-#ifndef RUBY_DEFINES_H
-#define RUBY_DEFINES_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#define RUBY
-
-#include <stdlib.h>
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xmalloc2 ruby_xmalloc2
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xrealloc2 ruby_xrealloc2
-#define xfree ruby_xfree
-
-void *xmalloc(size_t);
-void *xmalloc2(size_t,size_t);
-void *xcalloc(size_t,size_t);
-void *xrealloc(void*,size_t);
-void *xrealloc2(void*,size_t,size_t);
-void xfree(void*);
-
-#define STRINGIZE(expr) STRINGIZE0(expr)
-#ifndef STRINGIZE0
-#define STRINGIZE0(expr) #expr
-#endif
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#ifndef _WIN32_WCE
-# define DOSISH_DRIVE_LETTER
-#endif
-#endif
-
-#if defined(__NeXT__) || defined(__APPLE__)
-/* 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
-#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
-#ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
-#endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
-#endif /* NeXT */
-
-#ifdef _WIN32
-#include "ruby/win32.h"
-#endif
-
-#if defined(__VMS)
-#include "vms/vms.h"
-#endif
-
-#if defined(__BEOS__)
-#include <net/socket.h> /* intern.h needs fd_set definition */
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#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 */
-#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")
-# 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 *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
-#else
-#  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#elif defined(riscos)
-#define PATH_SEP ","
-#else
-#define PATH_SEP ":"
-#endif
-#define PATH_SEP_CHAR PATH_SEP[0]
-
-#if defined(__human68k__)
-#define PATH_ENV "path"
-#else
-#define PATH_ENV "PATH"
-#endif
-
-#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
-#define ENV_IGNORECASE
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
-#endif
-
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
-#endif
-
-#ifndef RUBY_PLATFORM
-#define RUBY_PLATFORM "unknown-unknown"
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_DEFINES_H */
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
deleted file mode 100644
index fcd87dc9aa..0000000000
--- a/include/ruby/encoding.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/**********************************************************************
-
-  encoding.h -
-
-  $Author: matz $
-  created at: Thu May 24 11:49:41 JST 2007
-
-  Copyright (C) 2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_ENCODING_H
-#define RUBY_ENCODING_H 1
-
-#include <stdarg.h>
-#include "ruby/oniguruma.h"
-
-#define ENCODING_INLINE_MAX 1023
-#define ENCODING_SHIFT (FL_USHIFT+10)
-#define ENCODING_MASK (ENCODING_INLINE_MAX<<ENCODING_SHIFT)
-
-#define ENCODING_SET_INLINED(obj,i) do {\
-    RBASIC(obj)->flags &= ~ENCODING_MASK;\
-    RBASIC(obj)->flags |= (i) << ENCODING_SHIFT;\
-} while (0)
-#define ENCODING_SET(obj,i) do {\
-    VALUE rb_encoding_set_obj = (obj); \
-    int encoding_set_enc_index = (i); \
-    if (encoding_set_enc_index < ENCODING_INLINE_MAX) \
-        ENCODING_SET_INLINED(rb_encoding_set_obj, encoding_set_enc_index); \
-    else \
-        rb_enc_set_index(rb_encoding_set_obj, encoding_set_enc_index); \
-} while (0)
-
-#define ENCODING_GET_INLINED(obj) ((RBASIC(obj)->flags & ENCODING_MASK)>>ENCODING_SHIFT)
-#define ENCODING_GET(obj) \
-    (ENCODING_GET_INLINED(obj) != ENCODING_INLINE_MAX ? \
-     ENCODING_GET_INLINED(obj) : \
-     rb_enc_get_index(obj))
-
-#define ENCODING_IS_ASCII8BIT(obj) (ENCODING_GET_INLINED(obj) == 0)
-
-#define ENCODING_MAXNAMELEN 42
-
-#define ENC_CODERANGE_MASK	(FL_USER8|FL_USER9)
-#define ENC_CODERANGE_UNKNOWN	0
-#define ENC_CODERANGE_7BIT	FL_USER8
-#define ENC_CODERANGE_VALID	FL_USER9
-#define ENC_CODERANGE_BROKEN	(FL_USER8|FL_USER9)
-#define ENC_CODERANGE(obj) (RBASIC(obj)->flags & ENC_CODERANGE_MASK)
-#define ENC_CODERANGE_ASCIIONLY(obj) (ENC_CODERANGE(obj) == ENC_CODERANGE_7BIT)
-#define ENC_CODERANGE_SET(obj,cr) (RBASIC(obj)->flags = \
-				   (RBASIC(obj)->flags & ~ENC_CODERANGE_MASK) | (cr))
-#define ENC_CODERANGE_CLEAR(obj) ENC_CODERANGE_SET(obj,0)
-
-/* assumed ASCII compatiblity */
-#define ENC_CODERANGE_AND(a, b) \
-    (a == ENC_CODERANGE_7BIT ? b : \
-     a == ENC_CODERANGE_VALID ? (b == ENC_CODERANGE_7BIT ? ENC_CODERANGE_VALID : b) : \
-     ENC_CODERANGE_UNKNOWN)
-
-#define ENCODING_CODERANGE_SET(obj, encindex, cr) \
-    do { \
-        VALUE rb_encoding_coderange_obj = (obj); \
-        ENCODING_SET(rb_encoding_coderange_obj, (encindex)); \
-        ENC_CODERANGE_SET(rb_encoding_coderange_obj, (cr)); \
-    } while (0)
-
-typedef OnigEncodingType rb_encoding;
-
-int rb_enc_replicate(const char *, rb_encoding *);
-int rb_define_dummy_encoding(const char *);
-#define rb_enc_to_index(enc) ((enc) ? ENC_TO_ENCINDEX(enc) : 0)
-int rb_enc_get_index(VALUE obj);
-void rb_enc_set_index(VALUE obj, int encindex);
-int rb_enc_find_index(const char *name);
-int rb_to_encoding_index(VALUE);
-rb_encoding* rb_to_encoding(VALUE);
-rb_encoding* rb_enc_get(VALUE);
-rb_encoding* rb_enc_compatible(VALUE,VALUE);
-rb_encoding* rb_enc_check(VALUE,VALUE);
-VALUE rb_enc_associate_index(VALUE, int);
-VALUE rb_enc_associate(VALUE, rb_encoding*);
-void rb_enc_copy(VALUE dst, VALUE src);
-
-VALUE rb_enc_str_new(const char*, long, rb_encoding*);
-VALUE rb_enc_reg_new(const char*, long, rb_encoding*, int);
-PRINTF_ARGS(VALUE rb_enc_sprintf(rb_encoding *, const char*, ...), 2, 3);
-VALUE rb_enc_vsprintf(rb_encoding *, const char*, va_list);
-long rb_enc_strlen(const char*, const char*, rb_encoding*);
-char* rb_enc_nth(const char*, const char*, int, rb_encoding*);
-VALUE rb_obj_encoding(VALUE);
-VALUE rb_enc_str_buf_cat(VALUE str, const char *ptr, long len, rb_encoding *enc);
-
-/* index -> rb_encoding */
-rb_encoding* rb_enc_from_index(int idx);
-
-/* name -> rb_encoding */
-rb_encoding * rb_enc_find(const char *name);
-
-/* encoding -> name */
-#define rb_enc_name(enc) (enc)->name
-
-/* encoding -> minlen/maxlen */
-#define rb_enc_mbminlen(enc) (enc)->min_enc_len
-#define rb_enc_mbmaxlen(enc) (enc)->max_enc_len
-
-/* -> mbclen (no error notification: 0 < ret <= e-p, no exception) */
-int rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc);
-
-/* -> chlen, invalid or needmore */
-int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc);
-#define MBCLEN_CHARFOUND_P(ret)     ONIGENC_MBCLEN_CHARFOUND_P(ret)
-#define MBCLEN_CHARFOUND_LEN(ret)     ONIGENC_MBCLEN_CHARFOUND_LEN(ret)
-#define MBCLEN_INVALID_P(ret)       ONIGENC_MBCLEN_INVALID_P(ret)
-#define MBCLEN_NEEDMORE_P(ret)      ONIGENC_MBCLEN_NEEDMORE_P(ret)
-#define MBCLEN_NEEDMORE_LEN(ret)      ONIGENC_MBCLEN_NEEDMORE_LEN(ret)
-
-/* -> 0x00..0x7f, -1 */
-int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc);
-
-/* -> code or raise exception */
-int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc);
-#define rb_enc_mbc_to_codepoint(p, e, enc) ONIGENC_MBC_TO_CODE(enc,(UChar*)(p),(UChar*)(e))
-
-/* -> codelen>0 or raise exception */
-int rb_enc_codelen(int code, rb_encoding *enc);
-
-/* code,ptr,encoding -> write buf */
-#define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)(buf))
-
-/* ptr, ptr, encoding -> prev_char */
-#define rb_enc_prev_char(s,p,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)(s),(UChar*)(p))
-/* ptr, ptr, encoding -> next_char */
-#define rb_enc_left_char_head(s,p,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p))
-#define rb_enc_right_char_head(s,p,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p))
-
-/* ptr, ptr, encoding -> newline_or_not */
-#define rb_enc_is_newline(p,end,enc)  ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end))
-
-#define rb_enc_isctype(c,t,enc) ONIGENC_IS_CODE_CTYPE(enc,c,t)
-#define rb_enc_isascii(c,enc) ONIGENC_IS_CODE_ASCII(c)
-#define rb_enc_isalpha(c,enc) ONIGENC_IS_CODE_ALPHA(enc,c)
-#define rb_enc_islower(c,enc) ONIGENC_IS_CODE_LOWER(enc,c)
-#define rb_enc_isupper(c,enc) ONIGENC_IS_CODE_UPPER(enc,c)
-#define rb_enc_isalnum(c,enc) ONIGENC_IS_CODE_ALNUM(enc,c)
-#define rb_enc_isprint(c,enc) ONIGENC_IS_CODE_PRINT(enc,c)
-#define rb_enc_isspace(c,enc) ONIGENC_IS_CODE_SPACE(enc,c)
-#define rb_enc_isdigit(c,enc) ONIGENC_IS_CODE_DIGIT(enc,c)
-
-#define rb_enc_asciicompat(enc) (rb_enc_mbminlen(enc)==1 && !rb_enc_dummy_p(enc))
-
-int rb_enc_casefold(char *to, const char *p, const char *e, rb_encoding *enc);
-int rb_enc_toupper(int c, rb_encoding *enc);
-int rb_enc_tolower(int c, rb_encoding *enc);
-ID rb_intern3(const char*, long, rb_encoding*);
-ID rb_interned_id_p(const char *, long, rb_encoding *);
-int rb_enc_symname_p(const char*, rb_encoding*);
-int rb_enc_str_coderange(VALUE);
-long rb_str_coderange_scan_restartable(const char*, const char*, rb_encoding*, int*);
-int rb_enc_str_asciionly_p(VALUE);
-#define rb_enc_str_asciicompat_p(str) rb_enc_asciicompat(rb_enc_get(str))
-VALUE rb_enc_from_encoding(rb_encoding *enc);
-rb_encoding *rb_ascii8bit_encoding(void);
-rb_encoding *rb_utf8_encoding(void);
-rb_encoding *rb_usascii_encoding(void);
-rb_encoding *rb_locale_encoding(void);
-rb_encoding *rb_filesystem_encoding(void);
-rb_encoding *rb_default_external_encoding(void);
-int rb_ascii8bit_encindex(void);
-int rb_utf8_encindex(void);
-int rb_usascii_encindex(void);
-VALUE rb_enc_default_external(void);
-void rb_enc_set_default_external(VALUE encoding);
-VALUE rb_locale_charmap(VALUE klass);
-long rb_memsearch(const void*,long,const void*,long,rb_encoding*);
-
-RUBY_EXTERN VALUE rb_cEncoding;
-#define enc_initialized_p(enc) ((enc)->ruby_encoding_index != ENC_UNINITIALIZED)
-#define ENC_DUMMY_FLAG (1<<24)
-#define ENC_INDEX_MASK (~(~0U<<24))
-
-#define ENC_TO_ENCINDEX(enc)   ((enc)->ruby_encoding_index & ENC_INDEX_MASK)
-#define ENC_FROM_ENCINDEX(idx) (RARRAY_PTR(rb_encoding_list)[idx])
-#define ENC_FROM_ENCODING(enc) ENC_FROM_ENCINDEX(ENC_TO_ENCINDEX(enc))
-
-#define ENC_DUMMY_P(enc) ((enc)->ruby_encoding_index & ENC_DUMMY_FLAG)
-#define ENC_SET_DUMMY(enc) ((enc)->ruby_encoding_index |= ENC_DUMMY_FLAG)
-
-static inline int
-rb_enc_dummy_p(rb_encoding *enc)
-{
-    return ENC_DUMMY_P(enc) != 0;
-}
-
-VALUE rb_str_transcode(VALUE str, VALUE to);
-
-#endif /* RUBY_ENCODING_H */
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
deleted file mode 100644
index 9a70688546..0000000000
--- a/include/ruby/intern.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/**********************************************************************
-
-  intern.h -
-
-  $Author$
-  created at: Thu Jun 10 14:22:17 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-#ifndef RUBY_INTERN_H
-#define RUBY_INTERN_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifdef HAVE_STDARG_PROTOTYPES
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-#include "ruby/st.h"
-
-/* 
- * Functions and variables that are used by more than one source file of
- * the kernel.
- */
-
-#define ID_ALLOCATOR 1
-
-/* array.c */
-void rb_mem_clear(register VALUE*, register long);
-VALUE rb_assoc_new(VALUE, VALUE);
-VALUE rb_check_array_type(VALUE);
-VALUE rb_ary_new(void);
-VALUE rb_ary_new2(long);
-VALUE rb_ary_new3(long,...);
-VALUE rb_ary_new4(long, const VALUE *);
-void rb_ary_free(VALUE);
-VALUE rb_ary_freeze(VALUE);
-VALUE rb_ary_aref(int, VALUE*, VALUE);
-VALUE rb_ary_subseq(VALUE, long, long);
-void rb_ary_store(VALUE, long, VALUE);
-VALUE rb_ary_dup(VALUE);
-VALUE rb_ary_to_ary(VALUE);
-VALUE rb_ary_to_s(VALUE);
-VALUE rb_ary_push(VALUE, VALUE);
-VALUE rb_ary_pop(VALUE);
-VALUE rb_ary_shift(VALUE);
-VALUE rb_ary_unshift(VALUE, VALUE);
-VALUE rb_ary_entry(VALUE, long);
-VALUE rb_ary_each(VALUE);
-VALUE rb_ary_join(VALUE, VALUE);
-VALUE rb_ary_print_on(VALUE, VALUE);
-VALUE rb_ary_reverse(VALUE);
-VALUE rb_ary_sort(VALUE);
-VALUE rb_ary_sort_bang(VALUE);
-VALUE rb_ary_delete(VALUE, VALUE);
-VALUE rb_ary_delete_at(VALUE, long);
-VALUE rb_ary_clear(VALUE);
-VALUE rb_ary_plus(VALUE, VALUE);
-VALUE rb_ary_concat(VALUE, VALUE);
-VALUE rb_ary_assoc(VALUE, VALUE);
-VALUE rb_ary_rassoc(VALUE, VALUE);
-VALUE rb_ary_includes(VALUE, VALUE);
-VALUE rb_ary_cmp(VALUE, VALUE);
-VALUE rb_ary_replace(VALUE copy, VALUE orig);
-VALUE rb_get_values_at(VALUE, long, int, VALUE*, VALUE(*)(VALUE,long));
-/* bignum.c */
-VALUE rb_big_clone(VALUE);
-void rb_big_2comp(VALUE);
-VALUE rb_big_norm(VALUE);
-void rb_big_resize(VALUE big, long len);
-VALUE rb_uint2big(VALUE);
-VALUE rb_int2big(SIGNED_VALUE);
-VALUE rb_uint2inum(VALUE);
-VALUE rb_int2inum(SIGNED_VALUE);
-VALUE rb_cstr_to_inum(const char*, int, int);
-VALUE rb_str_to_inum(VALUE, int, int);
-VALUE rb_cstr2inum(const char*, int);
-VALUE rb_str2inum(VALUE, int);
-VALUE rb_big2str(VALUE, int);
-VALUE rb_big2str0(VALUE, int, int);
-SIGNED_VALUE rb_big2long(VALUE);
-#define rb_big2int(x) rb_big2long(x)
-VALUE rb_big2ulong(VALUE);
-#define rb_big2uint(x) rb_big2ulong(x)
-#if HAVE_LONG_LONG
-VALUE rb_ll2inum(LONG_LONG);
-VALUE rb_ull2inum(unsigned LONG_LONG);
-LONG_LONG rb_big2ll(VALUE);
-unsigned LONG_LONG rb_big2ull(VALUE);
-#endif  /* HAVE_LONG_LONG */
-void rb_quad_pack(char*,VALUE);
-VALUE rb_quad_unpack(const char*,int);
-int rb_uv_to_utf8(char[6],unsigned long);
-VALUE rb_dbl2big(double);
-double rb_big2dbl(VALUE);
-VALUE rb_big_cmp(VALUE, VALUE);
-VALUE rb_big_eq(VALUE, VALUE);
-VALUE rb_big_plus(VALUE, VALUE);
-VALUE rb_big_minus(VALUE, VALUE);
-VALUE rb_big_mul(VALUE, VALUE);
-VALUE rb_big_div(VALUE, VALUE);
-VALUE rb_big_modulo(VALUE, VALUE);
-VALUE rb_big_divmod(VALUE, VALUE);
-VALUE rb_big_pow(VALUE, VALUE);
-VALUE rb_big_and(VALUE, VALUE);
-VALUE rb_big_or(VALUE, VALUE);
-VALUE rb_big_xor(VALUE, VALUE);
-VALUE rb_big_lshift(VALUE, VALUE);
-VALUE rb_big_rshift(VALUE, VALUE);
-/* rational.c */
-VALUE rb_rational_raw(VALUE, VALUE);
-#define rb_rational_raw1(x) rb_rational_raw(x, INT2FIX(1))
-#define rb_rational_raw2(x,y) rb_rational_raw(x, y)
-VALUE rb_rational_new(VALUE, VALUE);
-#define rb_rational_new1(x) rb_rational_new(x, INT2FIX(1))
-#define rb_rational_new2(x,y) rb_rational_new(x, y)
-VALUE rb_Rational(VALUE, VALUE);
-#define rb_Rational1(x) rb_Rational(x, INT2FIX(1))
-#define rb_Rational2(x,y) rb_Rational(x, y)
-/* complex.c */
-VALUE rb_complex_raw(VALUE, VALUE);
-#define rb_complex_raw1(x) rb_complex_raw(x, INT2FIX(0))
-#define rb_complex_raw2(x,y) rb_complex_raw(x, y)
-VALUE rb_complex_new(VALUE, VALUE);
-#define rb_complex_new1(x) rb_complex_new(x, INT2FIX(0))
-#define rb_complex_new2(x,y) rb_complex_new(x, y)
-VALUE rb_Complex(VALUE, VALUE);
-#define rb_Complex1(x) rb_Complex(x, INT2FIX(0))
-#define rb_Complex2(x,y) rb_Complex(x, y)
-/* class.c */
-VALUE rb_class_boot(VALUE);
-VALUE rb_class_new(VALUE);
-VALUE rb_mod_init_copy(VALUE, VALUE);
-VALUE rb_class_init_copy(VALUE, VALUE);
-VALUE rb_singleton_class_clone(VALUE);
-void rb_singleton_class_attached(VALUE,VALUE);
-VALUE rb_make_metaclass(VALUE, VALUE);
-void rb_check_inheritable(VALUE);
-VALUE rb_class_inherited(VALUE, VALUE);
-VALUE rb_define_class_id(ID, VALUE);
-VALUE rb_module_new(void);
-VALUE rb_define_module_id(ID);
-VALUE rb_mod_included_modules(VALUE);
-VALUE rb_mod_include_p(VALUE, VALUE);
-VALUE rb_mod_ancestors(VALUE);
-VALUE rb_class_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_public_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_protected_instance_methods(int, VALUE*, VALUE);
-VALUE rb_class_private_instance_methods(int, VALUE*, VALUE);
-VALUE rb_obj_singleton_methods(int, VALUE*, VALUE);
-void rb_define_method_id(VALUE, ID, VALUE (*)(ANYARGS), int);
-void rb_frozen_class_p(VALUE);
-void rb_undef(VALUE, ID);
-void rb_define_protected_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
-void rb_define_private_method(VALUE, const char*, VALUE (*)(ANYARGS), int);
-void rb_define_singleton_method(VALUE, const char*, VALUE(*)(ANYARGS), int);
-VALUE rb_singleton_class(VALUE);
-/* compar.c */
-int rb_cmpint(VALUE, VALUE, VALUE);
-NORETURN(void rb_cmperr(VALUE, VALUE));
-/* cont.c */
-VALUE rb_fiber_new(VALUE (*)(ANYARGS), VALUE);
-VALUE rb_fiber_resume(VALUE fib, int argc, VALUE *args);
-VALUE rb_fiber_yield(int argc, VALUE *args);
-VALUE rb_fiber_current(void);
-VALUE rb_fiber_alive_p(VALUE);
-/* enum.c */
-/* enumerator.c */
-VALUE rb_enumeratorize(VALUE, VALUE, int, VALUE *);
-#define RETURN_ENUMERATOR(obj, argc, argv) do {				\
-	if (!rb_block_given_p())					\
-	    return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()),	\
-				    argc, argv);			\
-    } while (0)
-/* error.c */
-VALUE rb_exc_new(VALUE, const char*, long);
-VALUE rb_exc_new2(VALUE, const char*);
-VALUE rb_exc_new3(VALUE, VALUE);
-PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
-PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
-NORETURN(void rb_invalid_str(const char*, const char*));
-PRINTF_ARGS(void rb_compile_error(const char*, int, const char*, ...), 3, 4);
-PRINTF_ARGS(void rb_compile_error_append(const char*, ...), 1, 2);
-NORETURN(void rb_load_fail(const char*));
-NORETURN(void rb_error_frozen(const char*));
-void rb_check_frozen(VALUE);
-/* eval.c */
-int rb_sourceline(void);
-const char *rb_sourcefile(void);
-
-#if defined(NFDBITS) && defined(HAVE_RB_FD_INIT)
-typedef struct {
-    int maxfd;
-    fd_set *fdset;
-} rb_fdset_t;
-
-void rb_fd_init(volatile rb_fdset_t *);
-void rb_fd_term(rb_fdset_t *);
-void rb_fd_zero(rb_fdset_t *);
-void rb_fd_set(int, rb_fdset_t *);
-void rb_fd_clr(int, rb_fdset_t *);
-int rb_fd_isset(int, const rb_fdset_t *);
-void rb_fd_copy(rb_fdset_t *, const fd_set *, int);
-int rb_fd_select(int, rb_fdset_t *, rb_fdset_t *, rb_fdset_t *, struct timeval *);
-
-#define rb_fd_ptr(f)	((f)->fdset)
-#define rb_fd_max(f)	((f)->maxfd)
-
-#else
-
-typedef fd_set rb_fdset_t;
-#define rb_fd_zero(f)	FD_ZERO(f)
-#define rb_fd_set(n, f)	FD_SET(n, f)
-#define rb_fd_clr(n, f)	FD_CLR(n, f)
-#define rb_fd_isset(n, f) FD_ISSET(n, f)
-#define rb_fd_copy(d, s, n) (*(d) = *(s))
-#define rb_fd_ptr(f)	(f)
-#define rb_fd_init(f)	FD_ZERO(f)
-#define rb_fd_term(f)	(void)(f)
-#define rb_fd_max(f)	FD_SETSIZE
-#define rb_fd_select(n, rfds, wfds, efds, timeout)	select(n, rfds, wfds, efds, timeout)
-
-#endif
-
-NORETURN(void rb_exc_raise(VALUE));
-NORETURN(void rb_exc_fatal(VALUE));
-VALUE rb_f_exit(int,VALUE*);
-VALUE rb_f_abort(int,VALUE*);
-void rb_remove_method(VALUE, const char*);
-#define rb_disable_super(klass, name) ((void)0)
-#define rb_enable_super(klass, name) ((void)0)
-#define HAVE_RB_DEFINE_ALLOC_FUNC 1
-typedef VALUE (*rb_alloc_func_t)(VALUE);
-void rb_define_alloc_func(VALUE, rb_alloc_func_t);
-void rb_undef_alloc_func(VALUE);
-rb_alloc_func_t rb_get_alloc_func(VALUE);
-void rb_clear_cache(void);
-void rb_clear_cache_by_class(VALUE);
-void rb_alias(VALUE, ID, ID);
-void rb_attr(VALUE,ID,int,int,int);
-int rb_method_boundp(VALUE, ID, int);
-VALUE rb_eval_cmd(VALUE, VALUE, int);
-int rb_obj_respond_to(VALUE, ID, int);
-int rb_respond_to(VALUE, ID);
-void rb_interrupt(void);
-VALUE rb_apply(VALUE, ID, VALUE);
-void rb_backtrace(void);
-ID rb_frame_this_func(void);
-VALUE rb_obj_instance_eval(int, VALUE*, VALUE);
-VALUE rb_obj_instance_exec(int, VALUE*, VALUE);
-VALUE rb_mod_module_eval(int, VALUE*, VALUE);
-VALUE rb_mod_module_exec(int, VALUE*, VALUE);
-void rb_load(VALUE, int);
-void rb_load_protect(VALUE, int, int*);
-NORETURN(void rb_jump_tag(int));
-int rb_provided(const char*);
-void rb_provide(const char*);
-VALUE rb_f_require(VALUE, VALUE);
-VALUE rb_require_safe(VALUE, int);
-void rb_obj_call_init(VALUE, int, VALUE*);
-VALUE rb_class_new_instance(int, VALUE*, VALUE);
-VALUE rb_block_proc(void);
-VALUE rb_f_lambda(void);
-VALUE rb_proc_new(VALUE (*)(ANYARGS/* VALUE yieldarg[, VALUE procarg] */), VALUE);
-VALUE rb_proc_call(VALUE, VALUE);
-VALUE rb_proc_call_with_block(VALUE, int argc, VALUE *argv, VALUE);
-int rb_proc_arity(VALUE);
-VALUE rb_binding_new(void);
-VALUE rb_obj_method(VALUE, VALUE);
-VALUE rb_method_call(int, VALUE*, VALUE);
-int rb_mod_method_arity(VALUE, ID);
-int rb_obj_method_arity(VALUE, ID);
-VALUE rb_protect(VALUE (*)(VALUE), VALUE, int*);
-void rb_set_end_proc(void (*)(VALUE), VALUE);
-void rb_mark_end_proc(void);
-void rb_exec_end_proc(void);
-void Init_jump(void);
-void ruby_finalize(void);
-NORETURN(void ruby_stop(int));
-int ruby_cleanup(int);
-void rb_gc_mark_threads(void);
-void rb_thread_schedule(void);
-void rb_thread_wait_fd(int);
-int rb_thread_fd_writable(int);
-void rb_thread_fd_close(int);
-int rb_thread_alone(void);
-void rb_thread_polling(void);
-void rb_thread_sleep(int);
-void rb_thread_sleep_forever(void);
-VALUE rb_thread_stop(void);
-VALUE rb_thread_wakeup(VALUE);
-VALUE rb_thread_run(VALUE);
-VALUE rb_thread_kill(VALUE);
-VALUE rb_thread_create(VALUE (*)(ANYARGS), void*);
-void rb_thread_signal_raise(void *, int);
-void rb_thread_signal_exit(void *);
-int rb_thread_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-void rb_thread_wait_for(struct timeval);
-VALUE rb_thread_current(void);
-VALUE rb_thread_main(void);
-VALUE rb_thread_local_aref(VALUE, ID);
-VALUE rb_thread_local_aset(VALUE, ID, VALUE);
-void rb_thread_atfork(void);
-void rb_thread_atfork_before_exec(void);
-VALUE rb_exec_recursive(VALUE(*)(VALUE, VALUE, int),VALUE,VALUE);
-/* file.c */
-VALUE rb_file_s_expand_path(int, VALUE *);
-VALUE rb_file_expand_path(VALUE, VALUE);
-void rb_file_const(const char*, VALUE);
-int rb_find_file_ext(VALUE*, const char* const*);
-VALUE rb_find_file(VALUE);
-char *rb_path_next(const char *);
-char *rb_path_skip_prefix(const char *);
-char *rb_path_last_separator(const char *);
-char *rb_path_end(const char *);
-VALUE rb_file_directory_p(VALUE,VALUE);
-/* gc.c */
-void ruby_set_stack_size(size_t);
-NORETURN(void rb_memerror(void));
-int ruby_stack_check(void);
-int ruby_stack_length(VALUE**);
-int rb_during_gc(void);
-void rb_gc_mark_locations(VALUE*, VALUE*);
-void rb_mark_tbl(struct st_table*);
-void rb_mark_set(struct st_table*);
-void rb_mark_hash(struct st_table*);
-void rb_gc_mark_maybe(VALUE);
-void rb_gc_mark(VALUE);
-void rb_gc_force_recycle(VALUE);
-void rb_gc(void);
-void rb_gc_copy_finalizer(VALUE,VALUE);
-void rb_gc_finalize_deferred(void);
-void rb_gc_call_finalizer_at_exit(void);
-VALUE rb_gc_enable(void);
-VALUE rb_gc_disable(void);
-VALUE rb_gc_start(void);
-/* hash.c */
-void st_foreach_safe(struct st_table *, int (*)(ANYARGS), st_data_t);
-void rb_hash_foreach(VALUE, int (*)(ANYARGS), VALUE);
-VALUE rb_hash(VALUE);
-VALUE rb_hash_new(void);
-VALUE rb_hash_dup(VALUE);
-VALUE rb_hash_freeze(VALUE);
-VALUE rb_hash_aref(VALUE, VALUE);
-VALUE rb_hash_lookup(VALUE, VALUE);
-VALUE rb_hash_aset(VALUE, VALUE, VALUE);
-VALUE rb_hash_delete_if(VALUE);
-VALUE rb_hash_delete(VALUE,VALUE);
-struct st_table *rb_hash_tbl(VALUE);
-int rb_path_check(const char*);
-int rb_env_path_tainted(void);
-VALUE rb_env_clear(void);
-/* io.c */
-#define rb_defout rb_stdout
-RUBY_EXTERN VALUE rb_fs;
-RUBY_EXTERN VALUE rb_output_fs;
-RUBY_EXTERN VALUE rb_rs;
-RUBY_EXTERN VALUE rb_default_rs;
-RUBY_EXTERN VALUE rb_output_rs;
-VALUE rb_io_write(VALUE, VALUE);
-VALUE rb_io_gets(VALUE);
-VALUE rb_io_getbyte(VALUE);
-VALUE rb_io_ungetc(VALUE, VALUE);
-VALUE rb_io_close(VALUE);
-VALUE rb_io_flush(VALUE);
-VALUE rb_io_eof(VALUE);
-VALUE rb_io_binmode(VALUE);
-VALUE rb_io_addstr(VALUE, VALUE);
-VALUE rb_io_printf(int, VALUE*, VALUE);
-VALUE rb_io_print(int, VALUE*, VALUE);
-VALUE rb_io_puts(int, VALUE*, VALUE);
-VALUE rb_io_fdopen(int, int, const char*);
-VALUE rb_file_open(const char*, const char*);
-VALUE rb_gets(void);
-void rb_write_error(const char*);
-void rb_write_error2(const char*, long);
-int rb_io_mode_modenum(const char *mode);
-void rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds);
-int rb_pipe(int *pipes);
-/* marshal.c */
-VALUE rb_marshal_dump(VALUE, VALUE);
-VALUE rb_marshal_load(VALUE);
-void rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE), VALUE (*loader)(VALUE, VALUE));
-/* numeric.c */
-void rb_num_zerodiv(void);
-VALUE rb_num_coerce_bin(VALUE, VALUE, ID);
-VALUE rb_num_coerce_cmp(VALUE, VALUE, ID);
-VALUE rb_num_coerce_relop(VALUE, VALUE, ID);
-VALUE rb_float_new(double);
-VALUE rb_num2fix(VALUE);
-VALUE rb_fix2str(VALUE, int);
-VALUE rb_dbl_cmp(double, double);
-/* object.c */
-int rb_eql(VALUE, VALUE);
-VALUE rb_any_to_s(VALUE);
-VALUE rb_inspect(VALUE);
-VALUE rb_obj_is_instance_of(VALUE, VALUE);
-VALUE rb_obj_is_kind_of(VALUE, VALUE);
-VALUE rb_obj_alloc(VALUE);
-VALUE rb_obj_clone(VALUE);
-VALUE rb_obj_dup(VALUE);
-VALUE rb_obj_init_copy(VALUE,VALUE);
-VALUE rb_obj_taint(VALUE);
-VALUE rb_obj_tainted(VALUE);
-VALUE rb_obj_untaint(VALUE);
-VALUE rb_obj_freeze(VALUE);
-VALUE rb_obj_frozen_p(VALUE);
-VALUE rb_obj_id(VALUE);
-VALUE rb_obj_class(VALUE);
-VALUE rb_class_real(VALUE);
-VALUE rb_class_inherited_p(VALUE, VALUE);
-VALUE rb_convert_type(VALUE,int,const char*,const char*);
-VALUE rb_check_convert_type(VALUE,int,const char*,const char*);
-VALUE rb_check_to_integer(VALUE, const char *);
-VALUE rb_to_int(VALUE);
-VALUE rb_Integer(VALUE);
-VALUE rb_Float(VALUE);
-VALUE rb_String(VALUE);
-VALUE rb_Array(VALUE);
-double rb_cstr_to_dbl(const char*, int);
-double rb_str_to_dbl(VALUE, int);
-/* parse.y */
-RUBY_EXTERN int   ruby_sourceline;
-RUBY_EXTERN char *ruby_sourcefile;
-ID rb_id_attrset(ID);
-void rb_gc_mark_parser(void);
-int rb_is_const_id(ID);
-int rb_is_instance_id(ID);
-int rb_is_class_id(ID);
-int rb_is_local_id(ID);
-int rb_is_junk_id(ID);
-int rb_symname_p(const char*);
-int rb_sym_interned_p(VALUE);
-void rb_gc_mark_symbols(void);
-VALUE rb_backref_get(void);
-void rb_backref_set(VALUE);
-VALUE rb_lastline_get(void);
-void rb_lastline_set(VALUE);
-VALUE rb_sym_all_symbols(void);
-/* process.c */
-void rb_last_status_set(int status, rb_pid_t pid);
-VALUE rb_last_status_get(void);
-struct rb_exec_arg {
-    int argc;
-    VALUE *argv;
-    const char *prog;
-    VALUE options;
-    VALUE redirect_fds;
-};
-int rb_proc_exec_n(int, VALUE*, const char*);
-int rb_proc_exec(const char*);
-VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
-int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
-void rb_exec_arg_fixup(struct rb_exec_arg *e);
-int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
-int rb_exec(const struct rb_exec_arg*);
-rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE);
-VALUE rb_f_exec(int,VALUE*);
-rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
-void rb_syswait(rb_pid_t pid);
-rb_pid_t rb_spawn(int, VALUE*);
-VALUE rb_proc_times(VALUE);
-VALUE rb_detach_process(rb_pid_t pid);
-/* range.c */
-VALUE rb_range_new(VALUE, VALUE, int);
-VALUE rb_range_beg_len(VALUE, long*, long*, long, int);
-/* random.c */
-unsigned long rb_genrand_int32(void);
-double rb_genrand_real(void);
-void rb_reset_random_seed(void);
-/* re.c */
-#define rb_memcmp memcmp
-int rb_memcicmp(const void*,const void*,long);
-void rb_match_busy(VALUE);
-VALUE rb_reg_nth_defined(int, VALUE);
-VALUE rb_reg_nth_match(int, VALUE);
-VALUE rb_reg_last_match(VALUE);
-VALUE rb_reg_match_pre(VALUE);
-VALUE rb_reg_match_post(VALUE);
-VALUE rb_reg_match_last(VALUE);
-#define HAVE_RB_REG_NEW_STR 1
-VALUE rb_reg_new_str(VALUE, int);
-VALUE rb_reg_new(const char *, long, int);
-VALUE rb_reg_match(VALUE, VALUE);
-VALUE rb_reg_match2(VALUE);
-int rb_reg_options(VALUE);
-void rb_set_kcode(const char*);
-const char* rb_get_kcode(void);
-/* ruby.c */
-#define rb_argv rb_get_argv()
-RUBY_EXTERN VALUE rb_argv0;
-VALUE rb_get_argv(void);
-void *rb_load_file(const char*);
-void ruby_script(const char*);
-void ruby_prog_init(void);
-void ruby_set_argv(int, char**);
-void *ruby_process_options(int, char**);
-void ruby_init_loadpath(void);
-void ruby_incpush(const char*);
-/* signal.c */
-VALUE rb_f_kill(int, VALUE*);
-void rb_gc_mark_trap_list(void);
-#ifdef POSIX_SIGNAL
-#define posix_signal ruby_posix_signal
-RETSIGTYPE (*posix_signal(int, RETSIGTYPE (*)(int)))(int);
-#endif
-void ruby_sig_finalize(void);
-void rb_trap_exit(void);
-void rb_trap_exec(void);
-const char *ruby_signal_name(int);
-void ruby_default_signal(int);
-/* sprintf.c */
-VALUE rb_f_sprintf(int, const VALUE*);
-PRINTF_ARGS(VALUE rb_sprintf(const char*, ...), 1, 2);
-VALUE rb_vsprintf(const char*, va_list);
-PRINTF_ARGS(VALUE rb_str_catf(VALUE, const char*, ...), 2, 3);
-VALUE rb_str_vcatf(VALUE, const char*, va_list);
-VALUE rb_str_format(int, const VALUE *, VALUE);
-/* string.c */
-VALUE rb_str_new(const char*, long);
-VALUE rb_str_new2(const char*);
-VALUE rb_str_new3(VALUE);
-VALUE rb_str_new4(VALUE);
-VALUE rb_str_new5(VALUE, const char*, long);
-VALUE rb_tainted_str_new(const char*, long);
-VALUE rb_tainted_str_new2(const char*);
-VALUE rb_str_buf_new(long);
-VALUE rb_str_buf_new2(const char*);
-VALUE rb_str_tmp_new(long);
-VALUE rb_usascii_str_new(const char*, long);
-VALUE rb_usascii_str_new2(const char*);
-void rb_str_free(VALUE);
-void rb_str_shared_replace(VALUE, VALUE);
-VALUE rb_str_buf_append(VALUE, VALUE);
-VALUE rb_str_buf_cat(VALUE, const char*, long);
-VALUE rb_str_buf_cat2(VALUE, const char*);
-VALUE rb_str_buf_cat_ascii(VALUE, const char*);
-VALUE rb_obj_as_string(VALUE);
-VALUE rb_check_string_type(VALUE);
-VALUE rb_str_dup(VALUE);
-VALUE rb_str_locktmp(VALUE);
-VALUE rb_str_unlocktmp(VALUE);
-VALUE rb_str_dup_frozen(VALUE);
-VALUE rb_str_plus(VALUE, VALUE);
-VALUE rb_str_times(VALUE, VALUE);
-long rb_str_sublen(VALUE, long);
-VALUE rb_str_substr(VALUE, long, long);
-VALUE rb_str_subseq(VALUE, long, long);
-void rb_str_modify(VALUE);
-VALUE rb_str_freeze(VALUE);
-void rb_str_set_len(VALUE, long);
-VALUE rb_str_resize(VALUE, long);
-VALUE rb_str_cat(VALUE, const char*, long);
-VALUE rb_str_cat2(VALUE, const char*);
-VALUE rb_str_append(VALUE, VALUE);
-VALUE rb_str_concat(VALUE, VALUE);
-int rb_memhash(const void *ptr, long len);
-int rb_str_hash(VALUE);
-int rb_str_hash_cmp(VALUE,VALUE);
-int rb_str_comparable(VALUE, VALUE);
-int rb_str_cmp(VALUE, VALUE);
-VALUE rb_str_equal(VALUE str1, VALUE str2);
-void rb_str_update(VALUE, long, long, VALUE);
-VALUE rb_str_inspect(VALUE);
-VALUE rb_str_dump(VALUE);
-VALUE rb_str_split(VALUE, const char*);
-void rb_str_associate(VALUE, VALUE);
-VALUE rb_str_associated(VALUE);
-void rb_str_setter(VALUE, ID, VALUE*);
-VALUE rb_str_intern(VALUE);
-VALUE rb_sym_to_s(VALUE);
-VALUE rb_str_length(VALUE);
-size_t rb_str_capacity(VALUE);
-#if defined __GNUC__
-#define rb_str_new2(str) __extension__ (	\
-{						\
-    (__builtin_constant_p(str)) ?		\
-	rb_str_new(str, strlen(str)) :		\
-	rb_str_new2(str);			\
-})
-#define rb_tainted_str_new2(str) __extension__ ( \
-{					       \
-    (__builtin_constant_p(str)) ?	       \
-	rb_tainted_str_new(str, strlen(str)) : \
-	rb_tainted_str_new2(str);	       \
-})
-#define rb_usascii_str_new2(str) __extension__ ( \
-{					       \
-    (__builtin_constant_p(str)) ?	       \
-	rb_usascii_str_new(str, strlen(str)) : \
-	rb_usascii_str_new2(str);	       \
-})
-#define rb_str_buf_new2(str) __extension__ ( \
-{						\
-    (__builtin_constant_p(str)) ?		\
-	rb_str_buf_cat(rb_str_buf_new(strlen(str)), \
-		       str, strlen(str)) :	\
-	rb_str_buf_new2(str);			\
-})
-#define rb_str_buf_cat2(str, ptr) __extension__ ( \
-{						\
-    (__builtin_constant_p(ptr)) ?	        \
-	rb_str_buf_cat(str, ptr, strlen(ptr)) :	\
-	rb_str_buf_cat2(str, ptr);		\
-})
-#define rb_str_cat2(str, ptr) __extension__ (	\
-{						\
-    (__builtin_constant_p(ptr)) ?	        \
-	rb_str_cat(str, ptr, strlen(ptr)) :	\
-	rb_str_cat2(str, ptr);			\
-})
-#endif
-/* struct.c */
-VALUE rb_struct_new(VALUE, ...);
-VALUE rb_struct_define(const char*, ...);
-VALUE rb_struct_alloc(VALUE, VALUE);
-VALUE rb_struct_initialize(VALUE, VALUE);
-VALUE rb_struct_aref(VALUE, VALUE);
-VALUE rb_struct_aset(VALUE, VALUE, VALUE);
-VALUE rb_struct_getmember(VALUE, ID);
-VALUE rb_struct_iv_get(VALUE, const char*);
-VALUE rb_struct_s_members(VALUE);
-VALUE rb_struct_members(VALUE);
-VALUE rb_struct_alloc_noinit(VALUE);
-VALUE rb_struct_define_without_accessor(const char *, VALUE, rb_alloc_func_t, ...);
-/* thread.c */
-typedef void rb_unblock_function_t(void *);
-typedef VALUE rb_blocking_function_t(void *);
-VALUE rb_thread_blocking_region(rb_blocking_function_t *func, void *data1,
-				rb_unblock_function_t *ubf, void *data2);
-#define RB_UBF_DFL ((rb_unblock_function_t *)-1)
-VALUE rb_mutex_new(void);
-VALUE rb_mutex_locked_p(VALUE mutex);
-VALUE rb_mutex_try_lock(VALUE mutex);
-VALUE rb_mutex_lock(VALUE mutex);
-VALUE rb_mutex_unlock(VALUE mutex);
-VALUE rb_mutex_sleep(VALUE self, VALUE timeout);
-VALUE rb_mutex_synchronize(VALUE self);
-VALUE rb_barrier_new(void);
-VALUE rb_barrier_wait(VALUE self);
-VALUE rb_barrier_release(VALUE self);
-/* time.c */
-VALUE rb_time_new(time_t, long);
-VALUE rb_time_nano_new(time_t, long);
-/* variable.c */
-VALUE rb_mod_name(VALUE);
-VALUE rb_class_path(VALUE);
-void rb_set_class_path(VALUE, VALUE, const char*);
-VALUE rb_path2class(const char*);
-void rb_name_class(VALUE, ID);
-VALUE rb_class_name(VALUE);
-void rb_autoload(VALUE, ID, const char*);
-VALUE rb_autoload_load(VALUE, ID);
-VALUE rb_autoload_p(VALUE, ID);
-void rb_gc_mark_global_tbl(void);
-VALUE rb_f_trace_var(int, VALUE*);
-VALUE rb_f_untrace_var(int, VALUE*);
-VALUE rb_f_global_variables(void);
-void rb_alias_variable(ID, ID);
-struct st_table* rb_generic_ivar_table(VALUE);
-void rb_copy_generic_ivar(VALUE,VALUE);
-void rb_mark_generic_ivar(VALUE);
-void rb_mark_generic_ivar_tbl(void);
-void rb_free_generic_ivar(VALUE);
-VALUE rb_ivar_get(VALUE, ID);
-VALUE rb_ivar_set(VALUE, ID, VALUE);
-VALUE rb_ivar_defined(VALUE, ID);
-void rb_ivar_foreach(VALUE, int (*)(ANYARGS), st_data_t);
-VALUE rb_iv_set(VALUE, const char*, VALUE);
-VALUE rb_iv_get(VALUE, const char*);
-VALUE rb_attr_get(VALUE, ID);
-VALUE rb_obj_instance_variables(VALUE);
-VALUE rb_obj_remove_instance_variable(VALUE, VALUE);
-void *rb_mod_const_at(VALUE, void*);
-void *rb_mod_const_of(VALUE, void*);
-VALUE rb_const_list(void*);
-VALUE rb_mod_constants(int, VALUE *, VALUE);
-VALUE rb_mod_remove_const(VALUE, VALUE);
-int rb_const_defined(VALUE, ID);
-int rb_const_defined_at(VALUE, ID);
-int rb_const_defined_from(VALUE, ID);
-VALUE rb_const_get(VALUE, ID);
-VALUE rb_const_get_at(VALUE, ID);
-VALUE rb_const_get_from(VALUE, ID);
-void rb_const_set(VALUE, ID, VALUE);
-VALUE rb_mod_const_missing(VALUE,VALUE);
-VALUE rb_cvar_defined(VALUE, ID);
-void rb_cvar_set(VALUE, ID, VALUE);
-VALUE rb_cvar_get(VALUE, ID);
-void rb_cv_set(VALUE, const char*, VALUE);
-VALUE rb_cv_get(VALUE, const char*);
-void rb_define_class_variable(VALUE, const char*, VALUE);
-VALUE rb_mod_class_variables(VALUE);
-VALUE rb_mod_remove_cvar(VALUE, VALUE);
-/* version.c */
-void ruby_show_version(void);
-void ruby_show_copyright(void);
-
-ID rb_frame_callee(void);
-VALUE rb_str_succ(VALUE);
-VALUE rb_time_succ(VALUE);
-#define Init_stack(addr) ruby_init_stack(addr)
-void rb_frame_pop(void);
-int rb_frame_method_id_and_class(ID *idp, VALUE *klassp);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_INTERN_H */
diff --git a/include/ruby/io.h b/include/ruby/io.h
deleted file mode 100644
index 95be788c08..0000000000
--- a/include/ruby/io.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/**********************************************************************
-
-  rubyio.h -
-
-  $Author$
-  created at: Fri Nov 12 16:47:09 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_IO_H
-#define RUBY_IO_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include "ruby/encoding.h"
-
-#if defined(HAVE_STDIO_EXT_H)
-#include <stdio_ext.h>
-#endif
-
-typedef struct rb_io_t {
-    int fd;                     /* file descriptor */
-    FILE *stdio_file;		/* stdio ptr for read/write if available */
-    int mode;			/* mode flags */
-    rb_pid_t pid;		/* child's pid (for pipes) */
-    int lineno;			/* number of lines read */
-    char *path;			/* pathname for file */
-    void (*finalize)(struct rb_io_t*,int); /* finalize proc */
-    long refcnt;
-    char *wbuf;                 /* wbuf_off + wbuf_len <= wbuf_capa */
-    int wbuf_off;
-    int wbuf_len;
-    int wbuf_capa;
-    char *rbuf;                 /* rbuf_off + rbuf_len <= rbuf_capa */
-    int rbuf_off;
-    int rbuf_len;
-    int rbuf_capa;
-    VALUE tied_io_for_writing;
-    rb_encoding *enc;
-    rb_encoding *enc2;
-} rb_io_t;
-
-#define HAVE_RB_IO_T 1
-
-#define FMODE_READABLE  1
-#define FMODE_WRITABLE  2
-#define FMODE_READWRITE 3
-#define FMODE_APPEND   64
-#define FMODE_CREATE  128
-#define FMODE_BINMODE   4
-#define FMODE_SYNC      8
-#define FMODE_TTY      16
-#define FMODE_DUPLEX   32
-#define FMODE_WSPLIT  0x200
-#define FMODE_WSPLIT_INITIALIZED  0x400
-
-#define GetOpenFile(obj,fp) rb_io_check_closed((fp) = RFILE(rb_io_taint_check(obj))->fptr)
-
-#define MakeOpenFile(obj, fp) do {\
-    if (RFILE(obj)->fptr) {\
-	rb_io_close(obj);\
-	free(RFILE(obj)->fptr);\
-	RFILE(obj)->fptr = 0;\
-    }\
-    fp = 0;\
-    fp = RFILE(obj)->fptr = ALLOC(rb_io_t);\
-    fp->fd = -1;\
-    fp->stdio_file = NULL;\
-    fp->mode = 0;\
-    fp->pid = 0;\
-    fp->lineno = 0;\
-    fp->path = NULL;\
-    fp->finalize = 0;\
-    fp->refcnt = 1;\
-    fp->wbuf = NULL;\
-    fp->wbuf_off = 0;\
-    fp->wbuf_len = 0;\
-    fp->wbuf_capa = 0;\
-    fp->rbuf = NULL;\
-    fp->rbuf_off = 0;\
-    fp->rbuf_len = 0;\
-    fp->rbuf_capa = 0;\
-    fp->tied_io_for_writing = 0;\
-    fp->enc = 0;\
-    fp->enc2 = 0;\
-} while (0)
-
-FILE *rb_io_stdio_file(rb_io_t *fptr);
-
-FILE *rb_fopen(const char*, const char*);
-FILE *rb_fdopen(int, const char*);
-int  rb_io_mode_flags(const char*);
-int  rb_io_modenum_flags(int);
-void rb_io_check_writable(rb_io_t*);
-void rb_io_check_readable(rb_io_t*);
-int rb_io_fptr_finalize(rb_io_t*);
-void rb_io_synchronized(rb_io_t*);
-void rb_io_check_initialized(rb_io_t*);
-void rb_io_check_closed(rb_io_t*);
-int rb_io_wait_readable(int);
-int rb_io_wait_writable(int);
-void rb_io_set_nonblock(rb_io_t *fptr);
-
-VALUE rb_io_taint_check(VALUE);
-NORETURN(void rb_eof_error(void));
-
-void rb_io_read_check(rb_io_t*);
-int rb_io_read_pending(rb_io_t*);
-void rb_read_check(FILE*);
-
-DEPRECATED(int rb_getc(FILE*));
-DEPRECATED(long rb_io_fread(char *, long, FILE *));
-DEPRECATED(long rb_io_fwrite(const char *, long, FILE *));
-DEPRECATED(int rb_read_pending(FILE*));
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_IO_H */
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
deleted file mode 100644
index 0384b995e3..0000000000
--- a/include/ruby/missing.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/************************************************
-
-  missing.h - prototype for *.c in ./missing, and
-  	      for missing timeval struct
-
-  $Author$
-  created at: Sat May 11 23:46:03 JST 2002
-
-************************************************/
-
-#ifndef RUBY_MISSING_H
-#define RUBY_MISSING_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#if defined(HAVE_SYS_TIME_H)
-#  include <sys/time.h>
-#elif !defined(_WIN32)
-#  define time_t long
-struct timeval {
-    time_t tv_sec;	/* seconds */
-    long tv_usec;	/* microseconds */
-};
-#endif
-#if defined(HAVE_SYS_TYPES_H)
-#  include <sys/types.h>
-#endif
-
-#if !defined(HAVE_STRUCT_TIMESPEC)
-struct timespec {
-    time_t tv_sec;	/* seconds */
-    long tv_nsec;	/* nanoseconds */
-};
-#endif
-
-#ifndef HAVE_ACOSH
-extern double acosh(double);
-extern double asinh(double);
-extern double atanh(double);
-#endif
-
-#ifndef HAVE_CRYPT
-extern char *crypt(const char *, const char *);
-#endif
-
-#ifndef HAVE_DUP2
-extern int dup2(int, int);
-#endif
-
-#ifndef HAVE_EACCESS
-extern int eaccess(const char*, int);
-#endif
-
-#ifndef HAVE_FINITE
-extern int finite(double);
-#endif
-
-#ifndef HAVE_FLOCK
-extern int flock(int, int);
-#endif
-
-/*
-#ifndef HAVE_FREXP
-extern double frexp(double, int *);
-#endif
-*/
-
-#ifndef HAVE_HYPOT
-extern double hypot(double, double);
-#endif
-
-#ifndef HAVE_ERF
-extern double erf(double);
-extern double erfc(double);
-#endif
-
-#ifndef HAVE_TGAMMA
-extern double tgamma(double);
-#endif
-
-#ifndef HAVE_LGAMMA_R
-extern double lgamma_r(double, int *);
-#endif
-
-#ifndef HAVE_CBRT
-extern double cbrt(double);
-#endif
-
-#ifndef isinf
-# ifndef HAVE_ISINF
-#  if defined(HAVE_FINITE) && defined(HAVE_ISNAN)
-#  define isinf(x) (!finite(x) && !isnan(x))
-#  else
-extern int isinf(double);
-#  endif
-# endif
-#endif
-
-#ifndef HAVE_ISNAN
-extern int isnan(double);
-#endif
-
-/*
-#ifndef HAVE_MEMCMP
-extern int memcmp(const void *, const void *, size_t);
-#endif
-*/
-
-#ifndef HAVE_MEMMOVE
-extern void *memmove(void *, const void *, size_t);
-#endif
-
-/*
-#ifndef HAVE_MODF
-extern double modf(double, double *);
-#endif
-*/
-
-#ifndef HAVE_STRCHR
-extern char *strchr(const char *, int);
-extern char *strrchr(const char *, int);
-#endif
-
-#ifndef HAVE_STRERROR
-extern char *strerror(int);
-#endif
-
-#ifndef HAVE_STRFTIME
-extern size_t strftime(char *, size_t, const char *, const struct tm *);
-#endif
-
-#ifndef HAVE_STRSTR
-extern char *strstr(const char *, const char *);
-#endif
-
-/*
-#ifndef HAVE_STRTOL
-extern long strtol(const char *, char **, int);
-#endif
-*/
-
-#ifndef HAVE_VSNPRINTF
-# include <stdarg.h>
-extern int snprintf(char *, size_t n, char const *, ...);
-extern int vsnprintf(char *, size_t n, char const *, va_list);
-#endif
-
-#ifndef HAVE_STRLCPY
-extern size_t strlcpy(char *, const char*, size_t);
-#endif
-
-#ifndef HAVE_STRLCAT
-extern size_t strlcat(char *, const char*, size_t);
-#endif
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_MISSING_H */
diff --git a/include/ruby/mvm.h b/include/ruby/mvm.h
deleted file mode 100644
index 24b8cb3fb4..0000000000
--- a/include/ruby/mvm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**********************************************************************
-
-  ruby/mvm.h -
-
-  $Author$
-  created at: Sat May 31 15:17:36 2008
-
-  Copyright (C) 2008 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_MVM_H
-#define RUBY_MVM_H 1
-
-typedef struct rb_vm_struct rb_vm_t;
-typedef struct rb_thread_struct rb_thread_t;
-
-VALUE *ruby_vm_verbose_ptr(rb_vm_t *);
-VALUE *ruby_vm_debug_ptr(rb_vm_t *);
-
-#endif /* RUBY_MVM_H */
diff --git a/include/ruby/node.h b/include/ruby/node.h
deleted file mode 100644
index 5272b0e685..0000000000
--- a/include/ruby/node.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/**********************************************************************
-
-  node.h -
-
-  $Author$
-  created at: Fri May 28 15:14:02 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_NODE_H
-#define RUBY_NODE_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-enum node_type {
-    NODE_METHOD,
-#define NODE_METHOD      NODE_METHOD
-    NODE_FBODY,
-#define NODE_FBODY       NODE_FBODY
-    NODE_CFUNC,
-#define NODE_CFUNC       NODE_CFUNC
-    NODE_SCOPE,
-#define NODE_SCOPE       NODE_SCOPE
-    NODE_BLOCK,
-#define NODE_BLOCK       NODE_BLOCK
-    NODE_IF,
-#define NODE_IF          NODE_IF
-    NODE_CASE,
-#define NODE_CASE        NODE_CASE
-    NODE_WHEN,
-#define NODE_WHEN        NODE_WHEN
-    NODE_OPT_N,
-#define NODE_OPT_N       NODE_OPT_N
-    NODE_WHILE,
-#define NODE_WHILE       NODE_WHILE
-    NODE_UNTIL,
-#define NODE_UNTIL       NODE_UNTIL
-    NODE_ITER,
-#define NODE_ITER        NODE_ITER
-    NODE_FOR,
-#define NODE_FOR         NODE_FOR
-    NODE_BREAK,
-#define NODE_BREAK       NODE_BREAK
-    NODE_NEXT,
-#define NODE_NEXT        NODE_NEXT
-    NODE_REDO,
-#define NODE_REDO        NODE_REDO
-    NODE_RETRY,
-#define NODE_RETRY       NODE_RETRY
-    NODE_BEGIN,
-#define NODE_BEGIN       NODE_BEGIN
-    NODE_RESCUE,
-#define NODE_RESCUE      NODE_RESCUE
-    NODE_RESBODY,
-#define NODE_RESBODY     NODE_RESBODY
-    NODE_ENSURE,
-#define NODE_ENSURE      NODE_ENSURE
-    NODE_AND,
-#define NODE_AND         NODE_AND
-    NODE_OR,
-#define NODE_OR          NODE_OR
-    NODE_MASGN,
-#define NODE_MASGN       NODE_MASGN
-    NODE_LASGN,
-#define NODE_LASGN       NODE_LASGN
-    NODE_DASGN,
-#define NODE_DASGN       NODE_DASGN
-    NODE_DASGN_CURR,
-#define NODE_DASGN_CURR  NODE_DASGN_CURR
-    NODE_GASGN,
-#define NODE_GASGN       NODE_GASGN
-    NODE_IASGN,
-#define NODE_IASGN       NODE_IASGN
-    NODE_IASGN2,
-#define NODE_IASGN2      NODE_IASGN2
-    NODE_CDECL,
-#define NODE_CDECL       NODE_CDECL
-    NODE_CVASGN,
-#define NODE_CVASGN      NODE_CVASGN
-    NODE_CVDECL,
-#define NODE_CVDECL      NODE_CVDECL
-    NODE_OP_ASGN1,
-#define NODE_OP_ASGN1    NODE_OP_ASGN1
-    NODE_OP_ASGN2,
-#define NODE_OP_ASGN2    NODE_OP_ASGN2
-    NODE_OP_ASGN_AND,
-#define NODE_OP_ASGN_AND NODE_OP_ASGN_AND
-    NODE_OP_ASGN_OR,
-#define NODE_OP_ASGN_OR  NODE_OP_ASGN_OR
-    NODE_CALL,
-#define NODE_CALL        NODE_CALL
-    NODE_FCALL,
-#define NODE_FCALL       NODE_FCALL
-    NODE_VCALL,
-#define NODE_VCALL       NODE_VCALL
-    NODE_SUPER,
-#define NODE_SUPER       NODE_SUPER
-    NODE_ZSUPER,
-#define NODE_ZSUPER      NODE_ZSUPER
-    NODE_ARRAY,
-#define NODE_ARRAY       NODE_ARRAY
-    NODE_ZARRAY,
-#define NODE_ZARRAY      NODE_ZARRAY
-    NODE_VALUES,
-#define NODE_VALUES      NODE_VALUES
-    NODE_HASH,
-#define NODE_HASH        NODE_HASH
-    NODE_RETURN,
-#define NODE_RETURN      NODE_RETURN
-    NODE_YIELD,
-#define NODE_YIELD       NODE_YIELD
-    NODE_LVAR,
-#define NODE_LVAR        NODE_LVAR
-    NODE_DVAR,
-#define NODE_DVAR        NODE_DVAR
-    NODE_GVAR,
-#define NODE_GVAR        NODE_GVAR
-    NODE_IVAR,
-#define NODE_IVAR        NODE_IVAR
-    NODE_CONST,
-#define NODE_CONST       NODE_CONST
-    NODE_CVAR,
-#define NODE_CVAR        NODE_CVAR
-    NODE_NTH_REF,
-#define NODE_NTH_REF     NODE_NTH_REF
-    NODE_BACK_REF,
-#define NODE_BACK_REF    NODE_BACK_REF
-    NODE_MATCH,
-#define NODE_MATCH       NODE_MATCH
-    NODE_MATCH2,
-#define NODE_MATCH2      NODE_MATCH2
-    NODE_MATCH3,
-#define NODE_MATCH3      NODE_MATCH3
-    NODE_LIT,
-#define NODE_LIT         NODE_LIT
-    NODE_STR,
-#define NODE_STR         NODE_STR
-    NODE_DSTR,
-#define NODE_DSTR        NODE_DSTR
-    NODE_XSTR,
-#define NODE_XSTR        NODE_XSTR
-    NODE_DXSTR,
-#define NODE_DXSTR       NODE_DXSTR
-    NODE_EVSTR,
-#define NODE_EVSTR       NODE_EVSTR
-    NODE_DREGX,
-#define NODE_DREGX       NODE_DREGX
-    NODE_DREGX_ONCE,
-#define NODE_DREGX_ONCE  NODE_DREGX_ONCE
-    NODE_ARGS,
-#define NODE_ARGS        NODE_ARGS
-    NODE_ARGS_AUX,
-#define NODE_ARGS_AUX    NODE_ARGS_AUX
-    NODE_OPT_ARG,
-#define NODE_OPT_ARG     NODE_OPT_ARG
-    NODE_POSTARG,
-#define NODE_POSTARG     NODE_POSTARG
-    NODE_ARGSCAT,
-#define NODE_ARGSCAT     NODE_ARGSCAT
-    NODE_ARGSPUSH,
-#define NODE_ARGSPUSH    NODE_ARGSPUSH
-    NODE_SPLAT,
-#define NODE_SPLAT       NODE_SPLAT
-    NODE_TO_ARY,
-#define NODE_TO_ARY      NODE_TO_ARY
-    NODE_BLOCK_ARG,
-#define NODE_BLOCK_ARG   NODE_BLOCK_ARG
-    NODE_BLOCK_PASS,
-#define NODE_BLOCK_PASS  NODE_BLOCK_PASS
-    NODE_DEFN,
-#define NODE_DEFN        NODE_DEFN
-    NODE_DEFS,
-#define NODE_DEFS        NODE_DEFS
-    NODE_ALIAS,
-#define NODE_ALIAS       NODE_ALIAS
-    NODE_VALIAS,
-#define NODE_VALIAS      NODE_VALIAS
-    NODE_UNDEF,
-#define NODE_UNDEF       NODE_UNDEF
-    NODE_CLASS,
-#define NODE_CLASS       NODE_CLASS
-    NODE_MODULE,
-#define NODE_MODULE      NODE_MODULE
-    NODE_SCLASS,
-#define NODE_SCLASS      NODE_SCLASS
-    NODE_COLON2,
-#define NODE_COLON2      NODE_COLON2
-    NODE_COLON3,
-#define NODE_COLON3      NODE_COLON3
-    NODE_DOT2,
-#define NODE_DOT2        NODE_DOT2
-    NODE_DOT3,
-#define NODE_DOT3        NODE_DOT3
-    NODE_FLIP2,
-#define NODE_FLIP2       NODE_FLIP2
-    NODE_FLIP3,
-#define NODE_FLIP3       NODE_FLIP3
-    NODE_ATTRSET,
-#define NODE_ATTRSET     NODE_ATTRSET
-    NODE_SELF,
-#define NODE_SELF        NODE_SELF
-    NODE_NIL,
-#define NODE_NIL         NODE_NIL
-    NODE_TRUE,
-#define NODE_TRUE        NODE_TRUE
-    NODE_FALSE,
-#define NODE_FALSE       NODE_FALSE
-    NODE_ERRINFO,
-#define NODE_ERRINFO     NODE_ERRINFO
-    NODE_DEFINED,
-#define NODE_DEFINED     NODE_DEFINED
-    NODE_POSTEXE,
-#define NODE_POSTEXE     NODE_POSTEXE
-    NODE_ALLOCA,
-#define NODE_ALLOCA      NODE_ALLOCA
-    NODE_BMETHOD,
-#define NODE_BMETHOD     NODE_BMETHOD
-    NODE_MEMO,
-#define NODE_MEMO        NODE_MEMO
-    NODE_IFUNC,
-#define NODE_IFUNC       NODE_IFUNC
-    NODE_DSYM,
-#define NODE_DSYM        NODE_DSYM
-    NODE_ATTRASGN,
-#define NODE_ATTRASGN    NODE_ATTRASGN
-    NODE_PRELUDE,
-#define NODE_PRELUDE     NODE_PRELUDE
-    NODE_LAMBDA,
-#define NODE_LAMBDA      NODE_LAMBDA
-    NODE_OPTBLOCK,
-#define NODE_OPTBLOCK    NODE_OPTBLOCK
-    NODE_LAST
-#define NODE_LAST        NODE_LAST
-};
-
-typedef struct RNode {
-    unsigned long flags;
-    char *nd_file;
-    union {
-	struct RNode *node;
-	ID id;
-	VALUE value;
-	VALUE (*cfunc)(ANYARGS);
-	ID *tbl;
-    } u1;
-    union {
-	struct RNode *node;
-	ID id;
-	long argc;
-	VALUE value;
-    } u2;
-    union {
-	struct RNode *node;
-	ID id;
-	long state;
-	struct global_entry *entry;
-	long cnt;
-	VALUE value;
-    } u3;
-} NODE;
-
-#define RNODE(obj)  (R_CAST(RNode)(obj))
-
-/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */
-#define NODE_FL_NEWLINE (((VALUE)1)<<7)
-
-#define NODE_TYPESHIFT 8
-#define NODE_TYPEMASK  (((VALUE)0x7f)<<NODE_TYPESHIFT)
-
-#define nd_type(n) ((int) (((RNODE(n))->flags & NODE_TYPEMASK)>>NODE_TYPESHIFT))
-#define nd_set_type(n,t) \
-    RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|(((t)<<NODE_TYPESHIFT)&NODE_TYPEMASK))
-
-#define NODE_LSHIFT (NODE_TYPESHIFT+7)
-#define NODE_LMASK  (((SIGNED_VALUE)1<<(sizeof(VALUE)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) ((VALUE)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
-#define nd_set_line(n,l) \
-    RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))
-
-#define nd_head  u1.node
-#define nd_alen  u2.argc
-#define nd_next  u3.node
-
-#define nd_cond  u1.node
-#define nd_body  u2.node
-#define nd_else  u3.node
-
-#define nd_orig  u3.value
-
-#define nd_resq  u2.node
-#define nd_ensr  u3.node
-
-#define nd_1st   u1.node
-#define nd_2nd   u2.node
-
-#define nd_stts  u1.node
-
-#define nd_entry u3.entry
-#define nd_vid   u1.id
-#define nd_cflag u2.id
-#define nd_cval  u3.value
-
-#define nd_oid   u1.id
-#define nd_cnt   u3.cnt
-#define nd_tbl   u1.tbl
-
-#define nd_var   u1.node
-#define nd_iter  u3.node
-
-#define nd_value u2.node
-#define nd_aid   u3.id
-
-#define nd_lit   u1.value
-
-#define nd_frml  u2.argc
-#define nd_rest  u1.id
-#define nd_opt   u1.node
-#define nd_pid   u1.id
-#define nd_plen  u2.argc
-
-#define nd_recv  u1.node
-#define nd_mid   u2.id
-#define nd_args  u3.node
-
-#define nd_noex  u3.id
-#define nd_defn  u3.node
-
-#define nd_cfnc  u1.cfunc
-#define nd_argc  u2.argc
-
-#define nd_cpath u1.node
-#define nd_super u3.node
-
-#define nd_modl  u1.id
-#define nd_clss  u1.value
-
-#define nd_beg   u1.node
-#define nd_end   u2.node
-#define nd_state u3.state
-#define nd_rval  u2.value
-
-#define nd_nth   u2.argc
-
-#define nd_tag   u1.id
-#define nd_tval  u2.value
-
-#define nd_visi  u2.argc
-
-#define NEW_NODE(t,a0,a1,a2) rb_node_newnode((t),(VALUE)(a0),(VALUE)(a1),(VALUE)(a2))
-
-#define NEW_METHOD(n,x,v) NEW_NODE(NODE_METHOD,x,n,v)
-#define NEW_FBODY(n,i) NEW_NODE(NODE_FBODY,i,n,0)
-#define NEW_DEFN(i,a,d,p) NEW_NODE(NODE_DEFN,0,i,NEW_SCOPE(a,d))
-#define NEW_DEFS(r,i,a,d) NEW_NODE(NODE_DEFS,r,i,NEW_SCOPE(a,d))
-#define NEW_CFUNC(f,c) NEW_NODE(NODE_CFUNC,f,c,0)
-#define NEW_IFUNC(f,c) NEW_NODE(NODE_IFUNC,f,c,0)
-#define NEW_SCOPE(a,b) NEW_NODE(NODE_SCOPE,local_tbl(),b,a)
-#define NEW_BLOCK(a) NEW_NODE(NODE_BLOCK,a,0,0)
-#define NEW_IF(c,t,e) NEW_NODE(NODE_IF,c,t,e)
-#define NEW_UNLESS(c,t,e) NEW_IF(c,e,t)
-#define NEW_CASE(h,b) NEW_NODE(NODE_CASE,h,b,0)
-#define NEW_WHEN(c,t,e) NEW_NODE(NODE_WHEN,c,t,e)
-#define NEW_OPT_N(b) NEW_NODE(NODE_OPT_N,0,b,0)
-#define NEW_WHILE(c,b,n) NEW_NODE(NODE_WHILE,c,b,n)
-#define NEW_UNTIL(c,b,n) NEW_NODE(NODE_UNTIL,c,b,n)
-#define NEW_FOR(v,i,b) NEW_NODE(NODE_FOR,v,b,i)
-#define NEW_ITER(a,b) NEW_NODE(NODE_ITER,0,NEW_SCOPE(a,b),0)
-#define NEW_LAMBDA(a) NEW_NODE(NODE_LAMBDA,a,0,0)
-#define NEW_BREAK(s) NEW_NODE(NODE_BREAK,s,0,0)
-#define NEW_NEXT(s) NEW_NODE(NODE_NEXT,s,0,0)
-#define NEW_REDO() NEW_NODE(NODE_REDO,0,0,0)
-#define NEW_RETRY() NEW_NODE(NODE_RETRY,0,0,0)
-#define NEW_BEGIN(b) NEW_NODE(NODE_BEGIN,0,b,0)
-#define NEW_RESCUE(b,res,e) NEW_NODE(NODE_RESCUE,b,res,e)
-#define NEW_RESBODY(a,ex,n) NEW_NODE(NODE_RESBODY,n,ex,a)
-#define NEW_ENSURE(b,en) NEW_NODE(NODE_ENSURE,b,0,en)
-#define NEW_RETURN(s) NEW_NODE(NODE_RETURN,s,0,0)
-#define NEW_YIELD(a,s) NEW_NODE(NODE_YIELD,a,0,s)
-#define NEW_LIST(a)  NEW_ARRAY(a)
-#define NEW_ARRAY(a) NEW_NODE(NODE_ARRAY,a,1,0)
-#define NEW_ZARRAY() NEW_NODE(NODE_ZARRAY,0,0,0)
-#define NEW_HASH(a)  NEW_NODE(NODE_HASH,a,0,0)
-#define NEW_MASGN(l,r)   NEW_NODE(NODE_MASGN,l,0,r)
-#define NEW_GASGN(v,val) NEW_NODE(NODE_GASGN,v,val,rb_global_entry(v))
-#define NEW_LASGN(v,val) NEW_NODE(NODE_LASGN,v,val,0)
-#define NEW_DASGN(v,val) NEW_NODE(NODE_DASGN,v,val,0)
-#define NEW_DASGN_CURR(v,val) NEW_NODE(NODE_DASGN_CURR,v,val,0)
-#define NEW_IASGN(v,val) NEW_NODE(NODE_IASGN,v,val,0)
-#define NEW_IASGN2(v,val) NEW_NODE(NODE_IASGN2,v,val,0)
-#define NEW_CDECL(v,val,path) NEW_NODE(NODE_CDECL,v,val,path)
-#define NEW_CVASGN(v,val) NEW_NODE(NODE_CVASGN,v,val,0)
-#define NEW_CVDECL(v,val) NEW_NODE(NODE_CVDECL,v,val,0)
-#define NEW_OP_ASGN1(p,id,a) NEW_NODE(NODE_OP_ASGN1,p,id,a)
-#define NEW_OP_ASGN2(r,i,o,val) NEW_NODE(NODE_OP_ASGN2,r,val,NEW_OP_ASGN22(i,o))
-#define NEW_OP_ASGN22(i,o) NEW_NODE(NODE_OP_ASGN2,i,o,rb_id_attrset(i))
-#define NEW_OP_ASGN_OR(i,val) NEW_NODE(NODE_OP_ASGN_OR,i,val,0)
-#define NEW_OP_ASGN_AND(i,val) NEW_NODE(NODE_OP_ASGN_AND,i,val,0)
-#define NEW_GVAR(v) NEW_NODE(NODE_GVAR,v,0,rb_global_entry(v))
-#define NEW_LVAR(v) NEW_NODE(NODE_LVAR,v,0,0)
-#define NEW_DVAR(v) NEW_NODE(NODE_DVAR,v,0,0)
-#define NEW_IVAR(v) NEW_NODE(NODE_IVAR,v,0,0)
-#define NEW_CONST(v) NEW_NODE(NODE_CONST,v,0,0)
-#define NEW_CVAR(v) NEW_NODE(NODE_CVAR,v,0,0)
-#define NEW_NTH_REF(n)  NEW_NODE(NODE_NTH_REF,0,n,0)
-#define NEW_BACK_REF(n) NEW_NODE(NODE_BACK_REF,0,n,0)
-#define NEW_MATCH(c) NEW_NODE(NODE_MATCH,c,0,0)
-#define NEW_MATCH2(n1,n2) NEW_NODE(NODE_MATCH2,n1,n2,0)
-#define NEW_MATCH3(r,n2) NEW_NODE(NODE_MATCH3,r,n2,0)
-#define NEW_LIT(l) NEW_NODE(NODE_LIT,l,0,0)
-#define NEW_STR(s) NEW_NODE(NODE_STR,s,0,0)
-#define NEW_DSTR(s) NEW_NODE(NODE_DSTR,s,1,0)
-#define NEW_XSTR(s) NEW_NODE(NODE_XSTR,s,0,0)
-#define NEW_DXSTR(s) NEW_NODE(NODE_DXSTR,s,0,0)
-#define NEW_DSYM(s) NEW_NODE(NODE_DSYM,s,0,0)
-#define NEW_EVSTR(n) NEW_NODE(NODE_EVSTR,0,(n),0)
-#define NEW_CALL(r,m,a) NEW_NODE(NODE_CALL,r,m,a)
-#define NEW_FCALL(m,a) NEW_NODE(NODE_FCALL,0,m,a)
-#define NEW_VCALL(m) NEW_NODE(NODE_VCALL,0,m,0)
-#define NEW_SUPER(a) NEW_NODE(NODE_SUPER,0,0,a)
-#define NEW_ZSUPER() NEW_NODE(NODE_ZSUPER,0,0,0)
-#define NEW_ARGS(m,o) NEW_NODE(NODE_ARGS,o,m,0)
-#define NEW_ARGS_AUX(r,b) NEW_NODE(NODE_ARGS_AUX,r,b,0)
-#define NEW_OPT_ARG(i,v) NEW_NODE(NODE_OPT_ARG,i,v,0)
-#define NEW_POSTARG(i,v) NEW_NODE(NODE_POSTARG,i,v,0)
-#define NEW_ARGSCAT(a,b) NEW_NODE(NODE_ARGSCAT,a,b,0)
-#define NEW_ARGSPUSH(a,b) NEW_NODE(NODE_ARGSPUSH,a,b,0)
-#define NEW_SPLAT(a) NEW_NODE(NODE_SPLAT,a,0,0)
-#define NEW_TO_ARY(a) NEW_NODE(NODE_TO_ARY,a,0,0)
-#define NEW_BLOCK_ARG(v) NEW_NODE(NODE_BLOCK_ARG,v,0,local_cnt(v))
-#define NEW_BLOCK_PASS(b) NEW_NODE(NODE_BLOCK_PASS,0,b,0)
-#define NEW_ALIAS(n,o) NEW_NODE(NODE_ALIAS,n,o,0)
-#define NEW_VALIAS(n,o) NEW_NODE(NODE_VALIAS,n,o,0)
-#define NEW_UNDEF(i) NEW_NODE(NODE_UNDEF,0,i,0)
-#define NEW_CLASS(n,b,s) NEW_NODE(NODE_CLASS,n,NEW_SCOPE(0,b),(s))
-#define NEW_SCLASS(r,b) NEW_NODE(NODE_SCLASS,r,NEW_SCOPE(0,b),0)
-#define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(0,b),0)
-#define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0)
-#define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0)
-#define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0)
-#define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0)
-#define NEW_ATTRSET(a) NEW_NODE(NODE_ATTRSET,a,0,0)
-#define NEW_SELF() NEW_NODE(NODE_SELF,0,0,0)
-#define NEW_NIL() NEW_NODE(NODE_NIL,0,0,0)
-#define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0)
-#define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0)
-#define NEW_ERRINFO() NEW_NODE(NODE_ERRINFO,0,0,0)
-#define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0)
-#define NEW_PREEXE(b) NEW_SCOPE(b)
-#define NEW_POSTEXE(b) NEW_NODE(NODE_POSTEXE,0,b,0)
-#define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b)
-#define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a)
-#define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0)
-#define NEW_OPTBLOCK(a) NEW_NODE(NODE_OPTBLOCK,a,0,0)
-
-#define NOEX_PUBLIC    0x00
-#define NOEX_NOSUPER   0x01
-#define NOEX_PRIVATE   0x02
-#define NOEX_PROTECTED 0x04
-#define NOEX_MASK      0x06 /* 1110 */
-
-#define NOEX_UNDEF     NOEX_NOSUPER
-
-#define NOEX_MODFUNC   0x10
-#define NOEX_SUPER     0x20
-#define NOEX_VCALL     0x40
-
-#define NOEX_SAFE(n) (((n) >> 8) & 0x0F)
-#define NOEX_WITH(n, s) ((s << 8) | n)
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, rb_safe_level())
-
-#define CALL_PUBLIC 0
-#define CALL_FCALL  1
-#define CALL_VCALL  2
-#define CALL_SUPER  3
-
-VALUE rb_parser_new(void);
-VALUE rb_parser_end_seen_p(VALUE);
-VALUE rb_parser_encoding(VALUE);
-
-NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int);
-NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int);
-NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int);
-
-NODE *rb_compile_cstr(const char*, const char*, int, int);
-NODE *rb_compile_string(const char*, VALUE, int);
-NODE *rb_compile_file(const char*, VALUE, int);
-
-void rb_add_method(VALUE, ID, NODE *, int);
-NODE *rb_node_newnode(enum node_type,VALUE,VALUE,VALUE);
-
-NODE* rb_method_node(VALUE klass, ID id);
-int rb_node_arity(NODE* node);
-
-struct global_entry *rb_global_entry(ID);
-VALUE rb_gvar_get(struct global_entry *);
-VALUE rb_gvar_set(struct global_entry *, VALUE);
-VALUE rb_gvar_defined(struct global_entry *);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_NODE_H */
diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
deleted file mode 100644
index 1784348e16..0000000000
--- a/include/ruby/oniguruma.h
+++ /dev/null
@@ -1,784 +0,0 @@
-#ifndef ONIGURUMA_H
-#define ONIGURUMA_H
-/**********************************************************************
-  oniguruma.h - Oniguruma (regular expression library)
-**********************************************************************/
-/*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#define ONIGURUMA
-#define ONIGURUMA_VERSION_MAJOR   5
-#define ONIGURUMA_VERSION_MINOR   9
-#define ONIGURUMA_VERSION_TEENY   1
-
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-/* escape Mac OS X/Xcode 2.4/gcc 4.0.1 problem */
-#if defined(__APPLE__) && defined(__GNUC__) && __GNUC__ >= 4
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#ifdef HAVE_STDARG_H
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#ifndef P_
-#if defined(__STDC__) || defined(_WIN32)
-# define P_(args) args
-#else
-# define P_(args) ()
-#endif
-#endif
-
-#ifndef PV_
-#ifdef HAVE_STDARG_PROTOTYPES
-# define PV_(args) args
-#else
-# define PV_(args) ()
-#endif
-#endif
-
-#ifndef ONIG_EXTERN
-#ifdef RUBY_EXTERN
-#define ONIG_EXTERN   RUBY_EXTERN
-#else
-#if defined(_WIN32) && !defined(__GNUC__)
-#if defined(EXPORT) || defined(RUBY_EXPORT)
-#define ONIG_EXTERN   extern __declspec(dllexport)
-#else
-#define ONIG_EXTERN   extern __declspec(dllimport)
-#endif
-#endif
-#endif
-#endif
-
-#ifndef ONIG_EXTERN
-#define ONIG_EXTERN   extern
-#endif
-
-/* PART: character encoding */
-
-#ifndef ONIG_ESCAPE_UCHAR_COLLISION
-#define UChar OnigUChar
-#endif
-
-typedef unsigned char  OnigUChar;
-typedef unsigned long  OnigCodePoint;
-typedef unsigned int   OnigCtype;
-typedef unsigned int   OnigDistance;
-
-#define ONIG_INFINITE_DISTANCE  ~((OnigDistance )0)
-
-typedef unsigned int OnigCaseFoldType; /* case fold flag */
-
-ONIG_EXTERN OnigCaseFoldType OnigDefaultCaseFoldFlag;
-
-/* #define ONIGENC_CASE_FOLD_HIRAGANA_KATAKANA  (1<<1) */
-/* #define ONIGENC_CASE_FOLD_KATAKANA_WIDTH     (1<<2) */
-#define ONIGENC_CASE_FOLD_TURKISH_AZERI         (1<<20)
-#define INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR   (1<<30)
-
-#define ONIGENC_CASE_FOLD_MIN      INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR
-#define ONIGENC_CASE_FOLD_DEFAULT  OnigDefaultCaseFoldFlag
-
-
-#define ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN       3
-#define ONIGENC_GET_CASE_FOLD_CODES_MAX_NUM      13
-/* 13 => Unicode:0x1ffc */
-
-/* code range */
-#define ONIGENC_CODE_RANGE_NUM(range)     ((int )range[0])
-#define ONIGENC_CODE_RANGE_FROM(range,i)  range[((i)*2) + 1]
-#define ONIGENC_CODE_RANGE_TO(range,i)    range[((i)*2) + 2]
-
-typedef struct {
-  int byte_len;  /* argument(original) character(s) byte length */
-  int code_len;  /* number of code */
-  OnigCodePoint code[ONIGENC_MAX_COMP_CASE_FOLD_CODE_LEN];
-} OnigCaseFoldCodeItem;
-
-typedef struct {
-  OnigCodePoint esc;
-  OnigCodePoint anychar;
-  OnigCodePoint anytime;
-  OnigCodePoint zero_or_one_time;
-  OnigCodePoint one_or_more_time;
-  OnigCodePoint anychar_anytime;
-} OnigMetaCharTableType;
-  
-typedef int (*OnigApplyAllCaseFoldFunc)(OnigCodePoint from, OnigCodePoint* to, int to_len, void* arg);
-
-typedef struct OnigEncodingTypeST {
-  int    (*precise_mbc_enc_len)(const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc);
-  const char*   name;
-  int           max_enc_len;
-  int           min_enc_len;
-  int    (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
-  OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
-  int    (*code_to_mbclen)(OnigCodePoint code, struct OnigEncodingTypeST* enc);
-  int    (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf, struct OnigEncodingTypeST* enc);
-  int    (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to, struct OnigEncodingTypeST* enc);
-  int    (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg, struct OnigEncodingTypeST* enc);
-  int    (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[], struct OnigEncodingTypeST* enc);
-  int    (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUChar* p, OnigUChar* end);
-  int    (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype, struct OnigEncodingTypeST* enc);
-  int    (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[], struct OnigEncodingTypeST* enc);
-  OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p, struct OnigEncodingTypeST* enc);
-  int    (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end, struct OnigEncodingTypeST* enc);
-  int ruby_encoding_index;
-} OnigEncodingType;
-
-typedef OnigEncodingType* OnigEncoding;
-
-ONIG_EXTERN OnigEncodingType OnigEncodingASCII;
-
-#define ONIG_ENCODING_ASCII        (&OnigEncodingASCII)
-
-#define ONIG_ENCODING_UNDEF    ((OnigEncoding )0)
-
-
-/* work size */
-#define ONIGENC_CODE_TO_MBC_MAXLEN       7
-#define ONIGENC_MBC_CASE_FOLD_MAXLEN    18
-/* 18: 6(max-byte) * 3(case-fold chars) */
-
-/* character types */
-#define ONIGENC_CTYPE_NEWLINE   0
-#define ONIGENC_CTYPE_ALPHA     1
-#define ONIGENC_CTYPE_BLANK     2
-#define ONIGENC_CTYPE_CNTRL     3
-#define ONIGENC_CTYPE_DIGIT     4
-#define ONIGENC_CTYPE_GRAPH     5
-#define ONIGENC_CTYPE_LOWER     6
-#define ONIGENC_CTYPE_PRINT     7
-#define ONIGENC_CTYPE_PUNCT     8
-#define ONIGENC_CTYPE_SPACE     9
-#define ONIGENC_CTYPE_UPPER    10
-#define ONIGENC_CTYPE_XDIGIT   11
-#define ONIGENC_CTYPE_WORD     12
-#define ONIGENC_CTYPE_ALNUM    13  /* alpha || digit */
-#define ONIGENC_CTYPE_ASCII    14
-#define ONIGENC_MAX_STD_CTYPE  ONIGENC_CTYPE_ASCII
-
-
-#define onig_enc_len(enc,p,e)                ONIGENC_MBC_ENC_LEN(enc, p, e)
-
-#define ONIGENC_IS_UNDEF(enc)          ((enc) == ONIG_ENCODING_UNDEF)
-#define ONIGENC_IS_SINGLEBYTE(enc)     (ONIGENC_MBC_MAXLEN(enc) == 1)
-#define ONIGENC_IS_MBC_HEAD(enc,p,e)   (ONIGENC_MBC_ENC_LEN(enc,p,e) != 1)
-#define ONIGENC_IS_MBC_ASCII(p)           (*(p)   < 128)
-#define ONIGENC_IS_CODE_ASCII(code)       ((code) < 128)
-#define ONIGENC_IS_MBC_WORD(enc,s,end) \
-   ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end))
-
-
-#define ONIGENC_NAME(enc)                      ((enc)->name)
-
-#define ONIGENC_MBC_CASE_FOLD(enc,flag,pp,end,buf) \
-  (enc)->mbc_case_fold(flag,(const OnigUChar** )pp,end,buf,enc)
-#define ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc,s,end) \
-        (enc)->is_allowed_reverse_match(s,end,enc)
-#define ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc,start,s) \
-        (enc)->left_adjust_char_head(start, s, enc)
-#define ONIGENC_APPLY_ALL_CASE_FOLD(enc,case_fold_flag,f,arg) \
-        (enc)->apply_all_case_fold(case_fold_flag,f,arg,enc)
-#define ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc,case_fold_flag,p,end,acs) \
-       (enc)->get_case_fold_codes_by_str(case_fold_flag,p,end,acs,enc)
-#define ONIGENC_STEP_BACK(enc,start,s,n) \
-        onigenc_step_back((enc),(start),(s),(n))
-
-#define ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND(n)   (n)
-#define ONIGENC_MBCLEN_CHARFOUND_P(r)           (0 < (r))
-#define ONIGENC_MBCLEN_CHARFOUND_LEN(r)         (r)
-
-#define ONIGENC_CONSTRUCT_MBCLEN_INVALID()      (-1)
-#define ONIGENC_MBCLEN_INVALID_P(r)             ((r) == -1)
-
-#define ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE(n)    (-1-(n))
-#define ONIGENC_MBCLEN_NEEDMORE_P(r)            ((r) < -1)
-#define ONIGENC_MBCLEN_NEEDMORE_LEN(r)          (-1-(r))
-
-#define ONIGENC_PRECISE_MBC_ENC_LEN(enc,p,e)   (enc)->precise_mbc_enc_len(p,e,enc)
-
-ONIG_EXTERN
-int onigenc_mbclen_approximate P_((const OnigUChar* p,const OnigUChar* e, struct OnigEncodingTypeST* enc));
-
-#define ONIGENC_MBC_ENC_LEN(enc,p,e)           onigenc_mbclen_approximate(p,e,enc)
-#define ONIGENC_MBC_MAXLEN(enc)               ((enc)->max_enc_len)
-#define ONIGENC_MBC_MAXLEN_DIST(enc)           ONIGENC_MBC_MAXLEN(enc)
-#define ONIGENC_MBC_MINLEN(enc)               ((enc)->min_enc_len)
-#define ONIGENC_IS_MBC_NEWLINE(enc,p,end)      (enc)->is_mbc_newline((p),(end),enc)
-#define ONIGENC_MBC_TO_CODE(enc,p,end)         (enc)->mbc_to_code((p),(end),enc)
-#define ONIGENC_CODE_TO_MBCLEN(enc,code)       (enc)->code_to_mbclen(code,enc)
-#define ONIGENC_CODE_TO_MBC(enc,code,buf)      (enc)->code_to_mbc(code,buf,enc)
-#define ONIGENC_PROPERTY_NAME_TO_CTYPE(enc,p,end) \
-  (enc)->property_name_to_ctype(enc,p,end)
-
-#define ONIGENC_IS_CODE_CTYPE(enc,code,ctype)  (enc)->is_code_ctype(code,ctype,enc)
-
-#define ONIGENC_IS_CODE_NEWLINE(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_NEWLINE)
-#define ONIGENC_IS_CODE_GRAPH(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_GRAPH)
-#define ONIGENC_IS_CODE_PRINT(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PRINT)
-#define ONIGENC_IS_CODE_ALNUM(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALNUM)
-#define ONIGENC_IS_CODE_ALPHA(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALPHA)
-#define ONIGENC_IS_CODE_LOWER(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_LOWER)
-#define ONIGENC_IS_CODE_UPPER(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_UPPER)
-#define ONIGENC_IS_CODE_CNTRL(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_CNTRL)
-#define ONIGENC_IS_CODE_PUNCT(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PUNCT)
-#define ONIGENC_IS_CODE_SPACE(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_SPACE)
-#define ONIGENC_IS_CODE_BLANK(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_BLANK)
-#define ONIGENC_IS_CODE_DIGIT(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_DIGIT)
-#define ONIGENC_IS_CODE_XDIGIT(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_XDIGIT)
-#define ONIGENC_IS_CODE_WORD(enc,code) \
-        ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_WORD)
-
-#define ONIGENC_GET_CTYPE_CODE_RANGE(enc,ctype,sbout,ranges) \
-        (enc)->get_ctype_code_range(ctype,sbout,ranges,enc)
-
-ONIG_EXTERN
-OnigUChar* onigenc_step_back P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, int n));
-
-
-/* encoding API */
-ONIG_EXTERN
-int onigenc_init P_((void));
-ONIG_EXTERN
-int onigenc_set_default_encoding P_((OnigEncoding enc));
-ONIG_EXTERN
-OnigEncoding onigenc_get_default_encoding P_((void));
-ONIG_EXTERN
-void  onigenc_set_default_caseconv_table P_((const OnigUChar* table));
-ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head_with_prev P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar** prev));
-ONIG_EXTERN
-OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s));
-ONIG_EXTERN
-OnigUChar* onigenc_get_left_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s));
-ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s));
-ONIG_EXTERN
-int onigenc_strlen P_((OnigEncoding enc, const OnigUChar* p, const OnigUChar* end));
-ONIG_EXTERN
-int onigenc_strlen_null P_((OnigEncoding enc, const OnigUChar* p));
-ONIG_EXTERN
-int onigenc_str_bytelen_null P_((OnigEncoding enc, const OnigUChar* p));
-
-
-
-/* PART: regular expression */
-
-/* config parameters */
-#define ONIG_NREGION                          10
-#define ONIG_MAX_BACKREF_NUM                1000
-#define ONIG_MAX_REPEAT_NUM               100000
-#define ONIG_MAX_MULTI_BYTE_RANGES_NUM     10000
-/* constants */
-#define ONIG_MAX_ERROR_MESSAGE_LEN            90
-
-typedef unsigned int        OnigOptionType;
-
-#define ONIG_OPTION_DEFAULT            ONIG_OPTION_NONE
-
-/* options */
-#define ONIG_OPTION_NONE                 0U
-#define ONIG_OPTION_IGNORECASE           1U
-#define ONIG_OPTION_EXTEND               (ONIG_OPTION_IGNORECASE         << 1)
-#define ONIG_OPTION_MULTILINE            (ONIG_OPTION_EXTEND             << 1)
-#define ONIG_OPTION_SINGLELINE           (ONIG_OPTION_MULTILINE          << 1)
-#define ONIG_OPTION_FIND_LONGEST         (ONIG_OPTION_SINGLELINE         << 1)
-#define ONIG_OPTION_FIND_NOT_EMPTY       (ONIG_OPTION_FIND_LONGEST       << 1)
-#define ONIG_OPTION_NEGATE_SINGLELINE    (ONIG_OPTION_FIND_NOT_EMPTY     << 1)
-#define ONIG_OPTION_DONT_CAPTURE_GROUP   (ONIG_OPTION_NEGATE_SINGLELINE  << 1)
-#define ONIG_OPTION_CAPTURE_GROUP        (ONIG_OPTION_DONT_CAPTURE_GROUP << 1)
-/* options (search time) */
-#define ONIG_OPTION_NOTBOL               (ONIG_OPTION_CAPTURE_GROUP << 1)
-#define ONIG_OPTION_NOTEOL               (ONIG_OPTION_NOTBOL << 1)
-#define ONIG_OPTION_POSIX_REGION         (ONIG_OPTION_NOTEOL << 1)
-#define ONIG_OPTION_MAXBIT               ONIG_OPTION_POSIX_REGION  /* limit */
-
-#define ONIG_OPTION_ON(options,regopt)      ((options) |= (regopt))
-#define ONIG_OPTION_OFF(options,regopt)     ((options) &= ~(regopt))
-#define ONIG_IS_OPTION_ON(options,option)   ((options) & (option))
-
-/* syntax */
-typedef struct {
-  unsigned int   op;
-  unsigned int   op2;
-  unsigned int   behavior;
-  OnigOptionType options;   /* default option */
-  OnigMetaCharTableType meta_char_table;
-} OnigSyntaxType;
-
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxASIS;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixBasic;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixExtended;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxEmacs;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxGrep;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxGnuRegex;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxJava;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl_NG;
-ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
-
-/* predefined syntaxes (see regsyntax.c) */
-#define ONIG_SYNTAX_ASIS               (&OnigSyntaxASIS)
-#define ONIG_SYNTAX_POSIX_BASIC        (&OnigSyntaxPosixBasic)
-#define ONIG_SYNTAX_POSIX_EXTENDED     (&OnigSyntaxPosixExtended)
-#define ONIG_SYNTAX_EMACS              (&OnigSyntaxEmacs)
-#define ONIG_SYNTAX_GREP               (&OnigSyntaxGrep)
-#define ONIG_SYNTAX_GNU_REGEX          (&OnigSyntaxGnuRegex)
-#define ONIG_SYNTAX_JAVA               (&OnigSyntaxJava)
-#define ONIG_SYNTAX_PERL               (&OnigSyntaxPerl)
-#define ONIG_SYNTAX_PERL_NG            (&OnigSyntaxPerl_NG)
-#define ONIG_SYNTAX_RUBY               (&OnigSyntaxRuby)
-
-/* default syntax */
-ONIG_EXTERN const OnigSyntaxType*   OnigDefaultSyntax;
-#define ONIG_SYNTAX_DEFAULT   OnigDefaultSyntax
-
-/* syntax (operators) */
-#define ONIG_SYN_OP_VARIABLE_META_CHARACTERS    (1U<<0)
-#define ONIG_SYN_OP_DOT_ANYCHAR                 (1U<<1)   /* . */
-#define ONIG_SYN_OP_ASTERISK_ZERO_INF           (1U<<2)   /* * */
-#define ONIG_SYN_OP_ESC_ASTERISK_ZERO_INF       (1U<<3)
-#define ONIG_SYN_OP_PLUS_ONE_INF                (1U<<4)   /* + */
-#define ONIG_SYN_OP_ESC_PLUS_ONE_INF            (1U<<5)
-#define ONIG_SYN_OP_QMARK_ZERO_ONE              (1U<<6)   /* ? */
-#define ONIG_SYN_OP_ESC_QMARK_ZERO_ONE          (1U<<7)
-#define ONIG_SYN_OP_BRACE_INTERVAL              (1U<<8)   /* {lower,upper} */
-#define ONIG_SYN_OP_ESC_BRACE_INTERVAL          (1U<<9)   /* \{lower,upper\} */
-#define ONIG_SYN_OP_VBAR_ALT                    (1U<<10)   /* | */
-#define ONIG_SYN_OP_ESC_VBAR_ALT                (1U<<11)  /* \| */
-#define ONIG_SYN_OP_LPAREN_SUBEXP               (1U<<12)  /* (...)   */
-#define ONIG_SYN_OP_ESC_LPAREN_SUBEXP           (1U<<13)  /* \(...\) */
-#define ONIG_SYN_OP_ESC_AZ_BUF_ANCHOR           (1U<<14)  /* \A, \Z, \z */
-#define ONIG_SYN_OP_ESC_CAPITAL_G_BEGIN_ANCHOR  (1U<<15)  /* \G     */
-#define ONIG_SYN_OP_DECIMAL_BACKREF             (1U<<16)  /* \num   */
-#define ONIG_SYN_OP_BRACKET_CC                  (1U<<17)  /* [...]  */
-#define ONIG_SYN_OP_ESC_W_WORD                  (1U<<18)  /* \w, \W */
-#define ONIG_SYN_OP_ESC_LTGT_WORD_BEGIN_END     (1U<<19)  /* \<. \> */
-#define ONIG_SYN_OP_ESC_B_WORD_BOUND            (1U<<20)  /* \b, \B */
-#define ONIG_SYN_OP_ESC_S_WHITE_SPACE           (1U<<21)  /* \s, \S */
-#define ONIG_SYN_OP_ESC_D_DIGIT                 (1U<<22)  /* \d, \D */
-#define ONIG_SYN_OP_LINE_ANCHOR                 (1U<<23)  /* ^, $   */
-#define ONIG_SYN_OP_POSIX_BRACKET               (1U<<24)  /* [:xxxx:] */
-#define ONIG_SYN_OP_QMARK_NON_GREEDY            (1U<<25)  /* ??,*?,+?,{n,m}? */
-#define ONIG_SYN_OP_ESC_CONTROL_CHARS           (1U<<26)  /* \n,\r,\t,\a ... */
-#define ONIG_SYN_OP_ESC_C_CONTROL               (1U<<27)  /* \cx  */
-#define ONIG_SYN_OP_ESC_OCTAL3                  (1U<<28)  /* \OOO */
-#define ONIG_SYN_OP_ESC_X_HEX2                  (1U<<29)  /* \xHH */
-#define ONIG_SYN_OP_ESC_X_BRACE_HEX8            (1U<<30)  /* \x{7HHHHHHH} */
-
-#define ONIG_SYN_OP2_ESC_CAPITAL_Q_QUOTE        (1U<<0)  /* \Q...\E */
-#define ONIG_SYN_OP2_QMARK_GROUP_EFFECT         (1U<<1)  /* (?...) */
-#define ONIG_SYN_OP2_OPTION_PERL                (1U<<2)  /* (?imsx),(?-imsx) */
-#define ONIG_SYN_OP2_OPTION_RUBY                (1U<<3)  /* (?imx), (?-imx)  */
-#define ONIG_SYN_OP2_PLUS_POSSESSIVE_REPEAT     (1U<<4)  /* ?+,*+,++ */
-#define ONIG_SYN_OP2_PLUS_POSSESSIVE_INTERVAL   (1U<<5)  /* {n,m}+   */
-#define ONIG_SYN_OP2_CCLASS_SET_OP              (1U<<6)  /* [...&&..[..]..] */
-#define ONIG_SYN_OP2_QMARK_LT_NAMED_GROUP       (1U<<7)  /* (?<name>...) */
-#define ONIG_SYN_OP2_ESC_K_NAMED_BACKREF        (1U<<8)  /* \k<name> */
-#define ONIG_SYN_OP2_ESC_G_SUBEXP_CALL          (1U<<9)  /* \g<name>, \g<n> */
-#define ONIG_SYN_OP2_ATMARK_CAPTURE_HISTORY     (1U<<10) /* (?@..),(?@<x>..) */
-#define ONIG_SYN_OP2_ESC_CAPITAL_C_BAR_CONTROL  (1U<<11) /* \C-x */
-#define ONIG_SYN_OP2_ESC_CAPITAL_M_BAR_META     (1U<<12) /* \M-x */
-#define ONIG_SYN_OP2_ESC_V_VTAB                 (1U<<13) /* \v as VTAB */
-#define ONIG_SYN_OP2_ESC_U_HEX4                 (1U<<14) /* \uHHHH */
-#define ONIG_SYN_OP2_ESC_GNU_BUF_ANCHOR         (1U<<15) /* \`, \' */
-#define ONIG_SYN_OP2_ESC_P_BRACE_CHAR_PROPERTY  (1U<<16) /* \p{...}, \P{...} */
-#define ONIG_SYN_OP2_ESC_P_BRACE_CIRCUMFLEX_NOT (1U<<17) /* \p{^..}, \P{^..} */
-/* #define ONIG_SYN_OP2_CHAR_PROPERTY_PREFIX_IS (1U<<18) */
-#define ONIG_SYN_OP2_ESC_H_XDIGIT               (1U<<19) /* \h, \H */
-#define ONIG_SYN_OP2_INEFFECTIVE_ESCAPE         (1U<<20) /* \ */
-
-/* syntax (behavior) */
-#define ONIG_SYN_CONTEXT_INDEP_ANCHORS           (1U<<31) /* not implemented */
-#define ONIG_SYN_CONTEXT_INDEP_REPEAT_OPS        (1U<<0)  /* ?, *, +, {n,m} */
-#define ONIG_SYN_CONTEXT_INVALID_REPEAT_OPS      (1U<<1)  /* error or ignore */
-#define ONIG_SYN_ALLOW_UNMATCHED_CLOSE_SUBEXP    (1U<<2)  /* ...)... */
-#define ONIG_SYN_ALLOW_INVALID_INTERVAL          (1U<<3)  /* {??? */
-#define ONIG_SYN_ALLOW_INTERVAL_LOW_ABBREV       (1U<<4)  /* {,n} => {0,n} */
-#define ONIG_SYN_STRICT_CHECK_BACKREF            (1U<<5)  /* /(\1)/,/\1()/ ..*/
-#define ONIG_SYN_DIFFERENT_LEN_ALT_LOOK_BEHIND   (1U<<6)  /* (?<=a|bc) */
-#define ONIG_SYN_CAPTURE_ONLY_NAMED_GROUP        (1U<<7)  /* see doc/RE */
-#define ONIG_SYN_ALLOW_MULTIPLEX_DEFINITION_NAME (1U<<8)  /* (?<x>)(?<x>) */
-#define ONIG_SYN_FIXED_INTERVAL_IS_GREEDY_ONLY   (1U<<9)  /* a{n}?=(?:a{n})? */
-
-/* syntax (behavior) in char class [...] */
-#define ONIG_SYN_NOT_NEWLINE_IN_NEGATIVE_CC      (1U<<20) /* [^...] */
-#define ONIG_SYN_BACKSLASH_ESCAPE_IN_CC          (1U<<21) /* [..\w..] etc.. */
-#define ONIG_SYN_ALLOW_EMPTY_RANGE_IN_CC         (1U<<22)
-#define ONIG_SYN_ALLOW_DOUBLE_RANGE_OP_IN_CC     (1U<<23) /* [0-9-a]=[0-9\-a] */
-/* syntax (behavior) warning */
-#define ONIG_SYN_WARN_CC_OP_NOT_ESCAPED          (1U<<24) /* [,-,] */
-#define ONIG_SYN_WARN_REDUNDANT_NESTED_REPEAT    (1U<<25) /* (?:a*)+ */
-
-/* meta character specifiers (onig_set_meta_char()) */
-#define ONIG_META_CHAR_ESCAPE               0
-#define ONIG_META_CHAR_ANYCHAR              1
-#define ONIG_META_CHAR_ANYTIME              2
-#define ONIG_META_CHAR_ZERO_OR_ONE_TIME     3
-#define ONIG_META_CHAR_ONE_OR_MORE_TIME     4
-#define ONIG_META_CHAR_ANYCHAR_ANYTIME      5
-
-#define ONIG_INEFFECTIVE_META_CHAR          0
-
-/* error codes */
-#define ONIG_IS_PATTERN_ERROR(ecode)   ((ecode) <= -100 && (ecode) > -1000)
-/* normal return */
-#define ONIG_NORMAL                                            0
-#define ONIG_MISMATCH                                         -1
-#define ONIG_NO_SUPPORT_CONFIG                                -2
-
-/* internal error */
-#define ONIGERR_MEMORY                                         -5
-#define ONIGERR_TYPE_BUG                                       -6
-#define ONIGERR_PARSER_BUG                                    -11
-#define ONIGERR_STACK_BUG                                     -12
-#define ONIGERR_UNDEFINED_BYTECODE                            -13
-#define ONIGERR_UNEXPECTED_BYTECODE                           -14
-#define ONIGERR_MATCH_STACK_LIMIT_OVER                        -15
-#define ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED                -21
-#define ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR  -22
-/* general error */
-#define ONIGERR_INVALID_ARGUMENT                              -30 
-/* syntax error */
-#define ONIGERR_END_PATTERN_AT_LEFT_BRACE                    -100
-#define ONIGERR_END_PATTERN_AT_LEFT_BRACKET                  -101
-#define ONIGERR_EMPTY_CHAR_CLASS                             -102
-#define ONIGERR_PREMATURE_END_OF_CHAR_CLASS                  -103
-#define ONIGERR_END_PATTERN_AT_ESCAPE                        -104
-#define ONIGERR_END_PATTERN_AT_META                          -105
-#define ONIGERR_END_PATTERN_AT_CONTROL                       -106
-#define ONIGERR_META_CODE_SYNTAX                             -108
-#define ONIGERR_CONTROL_CODE_SYNTAX                          -109
-#define ONIGERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE             -110
-#define ONIGERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE           -111
-#define ONIGERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS      -112
-#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED      -113
-#define ONIGERR_TARGET_OF_REPEAT_OPERATOR_INVALID            -114
-#define ONIGERR_NESTED_REPEAT_OPERATOR                       -115
-#define ONIGERR_UNMATCHED_CLOSE_PARENTHESIS                  -116
-#define ONIGERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS       -117
-#define ONIGERR_END_PATTERN_IN_GROUP                         -118
-#define ONIGERR_UNDEFINED_GROUP_OPTION                       -119
-#define ONIGERR_INVALID_POSIX_BRACKET_TYPE                   -121
-#define ONIGERR_INVALID_LOOK_BEHIND_PATTERN                  -122
-#define ONIGERR_INVALID_REPEAT_RANGE_PATTERN                 -123
-/* values error (syntax error) */
-#define ONIGERR_TOO_BIG_NUMBER                               -200
-#define ONIGERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE              -201
-#define ONIGERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE     -202
-#define ONIGERR_EMPTY_RANGE_IN_CHAR_CLASS                    -203
-#define ONIGERR_MISMATCH_CODE_LENGTH_IN_CLASS_RANGE          -204
-#define ONIGERR_TOO_MANY_MULTI_BYTE_RANGES                   -205
-#define ONIGERR_TOO_SHORT_MULTI_BYTE_STRING                  -206
-#define ONIGERR_TOO_BIG_BACKREF_NUMBER                       -207
-#define ONIGERR_INVALID_BACKREF                              -208
-#define ONIGERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED         -209
-#define ONIGERR_TOO_LONG_WIDE_CHAR_VALUE                     -212
-#define ONIGERR_EMPTY_GROUP_NAME                             -214
-#define ONIGERR_INVALID_GROUP_NAME                           -215
-#define ONIGERR_INVALID_CHAR_IN_GROUP_NAME                   -216
-#define ONIGERR_UNDEFINED_NAME_REFERENCE                     -217
-#define ONIGERR_UNDEFINED_GROUP_REFERENCE                    -218
-#define ONIGERR_MULTIPLEX_DEFINED_NAME                       -219
-#define ONIGERR_MULTIPLEX_DEFINITION_NAME_CALL               -220
-#define ONIGERR_NEVER_ENDING_RECURSION                       -221
-#define ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY        -222
-#define ONIGERR_INVALID_CHAR_PROPERTY_NAME                   -223
-#define ONIGERR_INVALID_CODE_POINT_VALUE                     -400
-#define ONIGERR_INVALID_WIDE_CHAR_VALUE                      -400
-#define ONIGERR_TOO_BIG_WIDE_CHAR_VALUE                      -401
-#define ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION           -402
-#define ONIGERR_INVALID_COMBINATION_OF_OPTIONS               -403
-
-/* errors related to thread */
-#define ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT                -1001
-
-
-/* must be smaller than BIT_STATUS_BITS_NUM (unsigned int * 8) */
-#define ONIG_MAX_CAPTURE_HISTORY_GROUP   31
-#define ONIG_IS_CAPTURE_HISTORY_GROUP(r, i) \
-  ((i) <= ONIG_MAX_CAPTURE_HISTORY_GROUP && (r)->list && (r)->list[i])
-
-typedef struct OnigCaptureTreeNodeStruct {
-  int group;   /* group number */
-  int beg;
-  int end;
-  int allocated;
-  int num_childs;
-  struct OnigCaptureTreeNodeStruct** childs;
-} OnigCaptureTreeNode;
-
-/* match result region type */
-struct re_registers {
-  int  allocated;
-  int  num_regs;
-  int* beg;
-  int* end;
-  /* extended */
-  OnigCaptureTreeNode* history_root;  /* capture history tree root */
-};
-
-/* capture tree traverse */
-#define ONIG_TRAVERSE_CALLBACK_AT_FIRST   1
-#define ONIG_TRAVERSE_CALLBACK_AT_LAST    2
-#define ONIG_TRAVERSE_CALLBACK_AT_BOTH \
-  ( ONIG_TRAVERSE_CALLBACK_AT_FIRST | ONIG_TRAVERSE_CALLBACK_AT_LAST )
-
-
-#define ONIG_REGION_NOTPOS            -1
-
-typedef struct re_registers   OnigRegion;
-
-typedef struct {
-  OnigEncoding enc;
-  OnigUChar* par;
-  OnigUChar* par_end;
-} OnigErrorInfo;
-
-typedef struct {
-  int lower;
-  int upper;
-} OnigRepeatRange;
-
-typedef void (*OnigWarnFunc) P_((const char* s));
-extern void onig_null_warn P_((const char* s));
-#define ONIG_NULL_WARN       onig_null_warn
-
-#define ONIG_CHAR_TABLE_SIZE   256
-
-/* regex_t state */
-#define ONIG_STATE_NORMAL              0
-#define ONIG_STATE_SEARCHING           1
-#define ONIG_STATE_COMPILING          -1
-#define ONIG_STATE_MODIFY             -2
-
-#define ONIG_STATE(reg) \
-  ((reg)->state > 0 ? ONIG_STATE_SEARCHING : (reg)->state)
-
-typedef struct re_pattern_buffer {
-  /* common members of BBuf(bytes-buffer) */
-  unsigned char* p;         /* compiled pattern */
-  unsigned int used;        /* used space for p */
-  unsigned int alloc;       /* allocated space for p */
-
-  int state;                     /* normal, searching, compiling */
-  int num_mem;                   /* used memory(...) num counted from 1 */
-  int num_repeat;                /* OP_REPEAT/OP_REPEAT_NG id-counter */
-  int num_null_check;            /* OP_NULL_CHECK_START/END id counter */
-  int num_comb_exp_check;        /* combination explosion check */
-  int num_call;                  /* number of subexp call */
-  unsigned int capture_history;  /* (?@...) flag (1-31) */
-  unsigned int bt_mem_start;     /* need backtrack flag */
-  unsigned int bt_mem_end;       /* need backtrack flag */
-  int stack_pop_level;
-  int repeat_range_alloc;
-  OnigRepeatRange* repeat_range;
-
-  OnigEncoding      enc;
-  OnigOptionType    options;
-  const OnigSyntaxType* syntax;
-  OnigCaseFoldType  case_fold_flag;
-  void*             name_table;
-
-  /* optimization info (string search, char-map and anchors) */
-  int            optimize;          /* optimize flag */
-  int            threshold_len;     /* search str-length for apply optimize */
-  int            anchor;            /* BEGIN_BUF, BEGIN_POS, (SEMI_)END_BUF */
-  OnigDistance   anchor_dmin;       /* (SEMI_)END_BUF anchor distance */
-  OnigDistance   anchor_dmax;       /* (SEMI_)END_BUF anchor distance */
-  int            sub_anchor;        /* start-anchor for exact or map */
-  unsigned char *exact;
-  unsigned char *exact_end;
-  unsigned char  map[ONIG_CHAR_TABLE_SIZE]; /* used as BM skip or char-map */
-  int           *int_map;                   /* BM skip for exact_len > 255 */
-  int           *int_map_backward;          /* BM skip for backward search */
-  OnigDistance   dmin;                      /* min-distance of exact or map */
-  OnigDistance   dmax;                      /* max-distance of exact or map */
-
-  /* regex_t link chain */
-  struct re_pattern_buffer* chain;  /* escape compile-conflict */
-} OnigRegexType;
-
-typedef OnigRegexType*  OnigRegex;
-
-#ifndef ONIG_ESCAPE_REGEX_T_COLLISION
-  typedef OnigRegexType  regex_t;
-#endif
-
-
-typedef struct {
-  int             num_of_elements;
-  OnigEncoding    pattern_enc;
-  OnigEncoding    target_enc;
-  OnigSyntaxType* syntax;
-  OnigOptionType  option;
-  OnigCaseFoldType   case_fold_flag;
-} OnigCompileInfo;
-
-/* Oniguruma Native API */
-ONIG_EXTERN
-int onig_init P_((void));
-ONIG_EXTERN
-int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));
-ONIG_EXTERN
-void onig_set_warn_func P_((OnigWarnFunc f));
-ONIG_EXTERN
-void onig_set_verb_warn_func P_((OnigWarnFunc f));
-ONIG_EXTERN
-int onig_new P_((OnigRegex*, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax, OnigErrorInfo* einfo));
-ONIG_EXTERN
-int onig_new_deluxe P_((OnigRegex* reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
-ONIG_EXTERN
-void onig_free P_((OnigRegex));
-ONIG_EXTERN
-int onig_recompile P_((OnigRegex, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigOptionType option, OnigEncoding enc, OnigSyntaxType* syntax, OnigErrorInfo* einfo));
-ONIG_EXTERN
-int onig_recompile_deluxe P_((OnigRegex reg, const OnigUChar* pattern, const OnigUChar* pattern_end, OnigCompileInfo* ci, OnigErrorInfo* einfo));
-ONIG_EXTERN
-int onig_search P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* start, const OnigUChar* range, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-int onig_match P_((OnigRegex, const OnigUChar* str, const OnigUChar* end, const OnigUChar* at, OnigRegion* region, OnigOptionType option));
-ONIG_EXTERN
-OnigRegion* onig_region_new P_((void));
-ONIG_EXTERN
-void onig_region_init P_((OnigRegion* region));
-ONIG_EXTERN
-void onig_region_free P_((OnigRegion* region, int free_self));
-ONIG_EXTERN
-void onig_region_copy P_((OnigRegion* to, OnigRegion* from));
-ONIG_EXTERN
-void onig_region_clear P_((OnigRegion* region));
-ONIG_EXTERN
-int onig_region_resize P_((OnigRegion* region, int n));
-ONIG_EXTERN
-int onig_region_set P_((OnigRegion* region, int at, int beg, int end));
-ONIG_EXTERN
-int onig_name_to_group_numbers P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, int** nums));
-ONIG_EXTERN
-int onig_name_to_backref_number P_((OnigRegex reg, const OnigUChar* name, const OnigUChar* name_end, OnigRegion *region));
-ONIG_EXTERN
-int onig_foreach_name P_((OnigRegex reg, int (*func)(const OnigUChar*, const OnigUChar*,int,int*,OnigRegex,void*), void* arg));
-ONIG_EXTERN
-int onig_number_of_names P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_number_of_captures P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_number_of_capture_histories P_((OnigRegex reg));
-ONIG_EXTERN
-OnigCaptureTreeNode* onig_get_capture_tree P_((OnigRegion* region));
-ONIG_EXTERN
-int onig_capture_tree_traverse P_((OnigRegion* region, int at, int(*callback_func)(int,int,int,int,int,void*), void* arg));
-ONIG_EXTERN
-int onig_noname_group_capture_is_active P_((OnigRegex reg));
-ONIG_EXTERN
-OnigEncoding onig_get_encoding P_((OnigRegex reg));
-ONIG_EXTERN
-OnigOptionType onig_get_options P_((OnigRegex reg));
-ONIG_EXTERN
-OnigCaseFoldType onig_get_case_fold_flag P_((OnigRegex reg));
-ONIG_EXTERN
-const OnigSyntaxType* onig_get_syntax P_((OnigRegex reg));
-ONIG_EXTERN
-int onig_set_default_syntax P_((const OnigSyntaxType* syntax));
-ONIG_EXTERN
-void onig_copy_syntax P_((OnigSyntaxType* to, const OnigSyntaxType* from));
-ONIG_EXTERN
-unsigned int onig_get_syntax_op P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-unsigned int onig_get_syntax_op2 P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-unsigned int onig_get_syntax_behavior P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-OnigOptionType onig_get_syntax_options P_((OnigSyntaxType* syntax));
-ONIG_EXTERN
-void onig_set_syntax_op P_((OnigSyntaxType* syntax, unsigned int op));
-ONIG_EXTERN
-void onig_set_syntax_op2 P_((OnigSyntaxType* syntax, unsigned int op2));
-ONIG_EXTERN
-void onig_set_syntax_behavior P_((OnigSyntaxType* syntax, unsigned int behavior));
-ONIG_EXTERN
-void onig_set_syntax_options P_((OnigSyntaxType* syntax, OnigOptionType options));
-ONIG_EXTERN
-int onig_set_meta_char P_((OnigSyntaxType* syntax, unsigned int what, OnigCodePoint code));
-ONIG_EXTERN
-void onig_copy_encoding P_((OnigEncoding to, OnigEncoding from));
-ONIG_EXTERN
-OnigCaseFoldType onig_get_default_case_fold_flag P_((void));
-ONIG_EXTERN
-int onig_set_default_case_fold_flag P_((OnigCaseFoldType case_fold_flag));
-ONIG_EXTERN
-unsigned int onig_get_match_stack_limit_size P_((void));
-ONIG_EXTERN
-int onig_set_match_stack_limit_size P_((unsigned int size));
-ONIG_EXTERN
-int onig_end P_((void));
-ONIG_EXTERN
-const char* onig_version P_((void));
-ONIG_EXTERN
-const char* onig_copyright P_((void));
-
-#ifdef __cplusplus
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}
-#endif
-
-#endif /* ONIGURUMA_H */
diff --git a/include/ruby/re.h b/include/ruby/re.h
deleted file mode 100644
index cc7f6025a7..0000000000
--- a/include/ruby/re.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-
-  re.h -
-
-  $Author$
-  created at: Thu Sep 30 14:18:32 JST 1993
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_RE_H
-#define RUBY_RE_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "ruby/regex.h"
-
-typedef struct re_pattern_buffer Regexp;
-
-struct rmatch_offset {
-    int beg;
-    int end;
-};
-
-struct rmatch {
-    struct re_registers regs;
-
-    int char_offset_updated;
-    int char_offset_num_allocated;
-    struct rmatch_offset *char_offset;
-};
-
-struct RMatch {
-    struct RBasic basic;
-    VALUE str;
-    struct rmatch *rmatch;
-    VALUE regexp;  /* RRegexp */
-};
-
-#define RMATCH(obj)  (R_CAST(RMatch)(obj))
-#define RMATCH_REGS(obj)  (&(R_CAST(RMatch)(obj))->rmatch->regs)
-
-VALUE rb_reg_regcomp(VALUE);
-int rb_reg_search(VALUE, VALUE, int, int);
-VALUE rb_reg_regsub(VALUE, VALUE, struct re_registers *, VALUE);
-int rb_reg_adjust_startpos(VALUE, VALUE, int, int);
-void rb_match_busy(VALUE);
-VALUE rb_reg_quote(VALUE);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_RE_H */
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
deleted file mode 100644
index a63e2f6a4c..0000000000
--- a/include/ruby/regex.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**********************************************************************
-
-  regex.h -
-
-  $Author$
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef ONIGURUMA_REGEX_H
-#define ONIGURUMA_REGEX_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifdef RUBY
-#include "ruby/oniguruma.h"
-#else
-#include "oniguruma.h"
-#endif
-
-#ifndef ONIG_RUBY_M17N
-
-ONIG_EXTERN OnigEncoding    OnigEncDefaultCharEncoding;
-
-#define mbclen(p,e,enc)  rb_enc_mbclen((p),(e),(enc))
-
-#endif /* ifndef ONIG_RUBY_M17N */
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* ONIGURUMA_REGEX_H */
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
deleted file mode 100644
index eb3d282917..0000000000
--- a/include/ruby/ruby.h
+++ /dev/null
@@ -1,1101 +0,0 @@
-/**********************************************************************
-
-  ruby/ruby.h -
-
-  $Author$
-  created at: Thu Jun 10 14:26:32 JST 1993
-
-  Copyright (C) 1993-2008 Yukihiro Matsumoto
-  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
-  Copyright (C) 2000  Information-technology Promotion Agency, Japan
-
-**********************************************************************/
-
-#ifndef RUBY_RUBY_H
-#define RUBY_RUBY_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef RUBY_LIB
-#include "ruby/config.h"
-#ifdef RUBY_EXTCONF_H
-#include RUBY_EXTCONF_H
-#endif
-#endif
-
-#define NORETURN_STYLE_NEW 1
-#ifndef NORETURN
-# define NORETURN(x) x
-#endif
-#ifndef DEPRECATED
-# define DEPRECATED(x) x
-#endif
-#ifndef NOINLINE
-# define NOINLINE(x) x
-#endif
-
-#ifdef __GNUC__
-#define PRINTF_ARGS(decl, string_index, first_to_check) \
-  decl __attribute__((format(printf, string_index, first_to_check)))
-#else
-#define PRINTF_ARGS(decl, string_index, first_to_check) decl
-#endif
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#ifdef HAVE_INTRINSICS_H
-# include <intrinsics.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "defines.h"
-
-#if defined(HAVE_ALLOCA_H)
-#include <alloca.h>
-#else
-#  ifdef _AIX
-#pragma alloca
-#  endif
-#endif
-
-#if defined(__VMS)
-# pragma builtins
-# define alloca __alloca
-#endif
-
-#if SIZEOF_LONG == SIZEOF_VOIDP
-typedef unsigned long VALUE;
-typedef unsigned long ID;
-# define SIGNED_VALUE long
-# define SIZEOF_VALUE SIZEOF_LONG
-# define PRI_VALUE_PREFIX "l"
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-typedef unsigned LONG_LONG VALUE;
-typedef unsigned LONG_LONG ID;
-# define SIGNED_VALUE LONG_LONG
-# define LONG_LONG_VALUE 1
-# define SIZEOF_VALUE SIZEOF_LONG_LONG
-# define PRI_VALUE_PREFIX "ll"
-#else
-# error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
-#endif
-#define PRIdVALUE PRI_VALUE_PREFIX"d"
-#define PRIiVALUE PRI_VALUE_PREFIX"i"
-#define PRIoVALUE PRI_VALUE_PREFIX"o"
-#define PRIuVALUE PRI_VALUE_PREFIX"u"
-#define PRIxVALUE PRI_VALUE_PREFIX"x"
-#define PRIXVALUE PRI_VALUE_PREFIX"X"
-
-#if SIZEOF_PTRDIFF_T == SIZEOF_INT
-# define PRI_PTRDIFF_PREFIX
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
-# define PRI_PTRDIFF_PREFIX "l"
-#elif SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
-# define PRI_PTRDIFF_PREFIX "ll"
-#endif
-#define PRIdPTRDIFF PRI_PTRDIFF_PREFIX"d"
-#define PRIiPTRDIFF PRI_PTRDIFF_PREFIX"i"
-#define PRIoPTRDIFF PRI_PTRDIFF_PREFIX"o"
-#define PRIuPTRDIFF PRI_PTRDIFF_PREFIX"u"
-#define PRIxPTRDIFF PRI_PTRDIFF_PREFIX"x"
-#define PRIXPTRDIFF PRI_PTRDIFF_PREFIX"X"
-
-#if SIZEOF_SIZE_T == SIZEOF_INT
-# define PRI_SIZE_PREFIX
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define PRI_SIZE_PREFIX "l"
-#elif SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-# define PRI_SIZE_PREFIX "ll"
-#endif
-#define PRIdSIZE PRI_SIZE_PREFIX"d"
-#define PRIiSIZE PRI_SIZE_PREFIX"i"
-#define PRIoSIZE PRI_SIZE_PREFIX"o"
-#define PRIuSIZE PRI_SIZE_PREFIX"u"
-#define PRIxSIZE PRI_SIZE_PREFIX"x"
-#define PRIXSIZE PRI_SIZE_PREFIX"X"
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# ifndef LONG_MAX
-#  ifdef HAVE_LIMITS_H
-#   include <limits.h>
-#  else
-    /* assuming 32bit(2's compliment) long */
-#   define LONG_MAX 2147483647
-#  endif
-# endif
-# ifndef LONG_MIN
-#  define LONG_MIN (-LONG_MAX-1)
-# endif
-# ifndef CHAR_BIT
-#  define CHAR_BIT 8
-# endif
-#endif
-
-#ifdef HAVE_LONG_LONG
-# ifndef LLONG_MAX
-#  ifdef LONG_LONG_MAX
-#   define LLONG_MAX  LONG_LONG_MAX
-#  else
-#   ifdef _I64_MAX
-#    define LLONG_MAX _I64_MAX
-#   else
-    /* assuming 64bit(2's complement) long long */
-#    define LLONG_MAX 9223372036854775807LL
-#   endif
-#  endif
-# endif
-# ifndef LLONG_MIN
-#  ifdef LONG_LONG_MIN
-#   define LLONG_MIN  LONG_LONG_MIN
-#  else
-#   ifdef _I64_MIN
-#    define LLONG_MIN _I64_MIN
-#   else
-#    define LLONG_MIN (-LLONG_MAX-1)
-#   endif
-#  endif
-# endif
-#endif
-
-#define FIXNUM_MAX (LONG_MAX>>1)
-#define FIXNUM_MIN RSHIFT((long)LONG_MIN,1)
-
-#define INT2FIX(i) ((VALUE)(((SIGNED_VALUE)(i))<<1 | FIXNUM_FLAG))
-#define LONG2FIX(i) INT2FIX(i)
-#define rb_fix_new(v) INT2FIX(v)
-VALUE rb_int2inum(SIGNED_VALUE);
-#define INT2NUM(v) rb_int2inum(v)
-#define LONG2NUM(v) INT2NUM(v)
-#define rb_int_new(v) rb_int2inum(v)
-VALUE rb_uint2inum(VALUE);
-#define UINT2NUM(v) rb_uint2inum(v)
-#define ULONG2NUM(v) UINT2NUM(v)
-#define rb_uint_new(v) rb_uint2inum(v)
-
-#ifdef HAVE_LONG_LONG
-VALUE rb_ll2inum(LONG_LONG);
-#define LL2NUM(v) rb_ll2inum(v)
-VALUE rb_ull2inum(unsigned LONG_LONG);
-#define ULL2NUM(v) rb_ull2inum(v)
-#endif
-
-#if SIZEOF_OFF_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define OFFT2NUM(v) LL2NUM(v)
-#elif SIZEOF_OFF_T == SIZEOF_LONG
-# define OFFT2NUM(v) LONG2NUM(v)
-#else
-# define OFFT2NUM(v) INT2NUM(v)
-#endif
-
-#if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
-# define SIZET2NUM(v) ULL2NUM(v)
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-# define SIZET2NUM(v) ULONG2NUM(v)
-#else
-# define SIZET2NUM(v) UINT2NUM(v)
-#endif
-
-#ifndef PIDT2NUM
-#define PIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2PIDT
-#define NUM2PIDT(v) NUM2LONG(v)
-#endif
-#ifndef UIDT2NUM
-#define UIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2UIDT
-#define NUM2UIDT(v) NUM2LONG(v)
-#endif
-#ifndef GIDT2NUM
-#define GIDT2NUM(v) LONG2NUM(v)
-#endif
-#ifndef NUM2GIDT
-#define NUM2GIDT(v) NUM2LONG(v)
-#endif
-
-#define FIX2LONG(x) RSHIFT((SIGNED_VALUE)x,1)
-#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
-#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG)
-#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
-#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
-#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
-
-#define IMMEDIATE_P(x) ((VALUE)(x) & IMMEDIATE_MASK)
-
-#define SYMBOL_P(x) (((VALUE)(x)&~(~(VALUE)0<<RUBY_SPECIAL_SHIFT))==SYMBOL_FLAG)
-#define ID2SYM(x) (((VALUE)(x)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
-#define SYM2ID(x) RSHIFT((unsigned long)x,RUBY_SPECIAL_SHIFT)
-
-/* special contants - i.e. non-zero and non-fixnum constants */
-enum ruby_special_consts {
-    RUBY_Qfalse = 0,
-    RUBY_Qtrue  = 2,
-    RUBY_Qnil   = 4,
-    RUBY_Qundef = 6,
-
-    RUBY_IMMEDIATE_MASK = 0x03,
-    RUBY_FIXNUM_FLAG    = 0x01,
-    RUBY_SYMBOL_FLAG    = 0x0e,
-    RUBY_SPECIAL_SHIFT  = 8
-};
-
-#define Qfalse ((VALUE)RUBY_Qfalse)
-#define Qtrue  ((VALUE)RUBY_Qtrue)
-#define Qnil   ((VALUE)RUBY_Qnil)
-#define Qundef ((VALUE)RUBY_Qundef)	/* undefined value for placeholder */
-#define IMMEDIATE_MASK RUBY_IMMEDIATE_MASK
-#define FIXNUM_FLAG RUBY_FIXNUM_FLAG
-#define SYMBOL_FLAG RUBY_SYMBOL_FLAG
-
-#define RTEST(v) (((VALUE)(v) & ~Qnil) != 0)
-#define NIL_P(v) ((VALUE)(v) == Qnil)
-
-#define CLASS_OF(v) rb_class_of((VALUE)(v))
-
-enum ruby_value_type {
-    RUBY_T_NONE   = 0x00,
-
-    RUBY_T_OBJECT = 0x01,
-    RUBY_T_CLASS  = 0x02,
-    RUBY_T_MODULE = 0x03,
-    RUBY_T_FLOAT  = 0x04,
-    RUBY_T_STRING = 0x05,
-    RUBY_T_REGEXP = 0x06,
-    RUBY_T_ARRAY  = 0x07,
-    RUBY_T_HASH   = 0x08,
-    RUBY_T_STRUCT = 0x09,
-    RUBY_T_BIGNUM = 0x0a,
-    RUBY_T_FILE   = 0x0b,
-    RUBY_T_DATA   = 0x0c,
-    RUBY_T_MATCH  = 0x0d,
-    RUBY_T_COMPLEX  = 0x0e,
-    RUBY_T_RATIONAL = 0x0f,
-
-    RUBY_T_NIL    = 0x11,
-    RUBY_T_TRUE   = 0x12,
-    RUBY_T_FALSE  = 0x13,
-    RUBY_T_SYMBOL = 0x14,
-    RUBY_T_FIXNUM = 0x15,
-
-    RUBY_T_UNDEF  = 0x1b,
-    RUBY_T_NODE   = 0x1c,
-    RUBY_T_ICLASS = 0x1d,
-
-    RUBY_T_MASK   = 0x1f
-};
-
-#define T_NONE   RUBY_T_NONE
-#define T_NIL    RUBY_T_NIL
-#define T_OBJECT RUBY_T_OBJECT
-#define T_CLASS  RUBY_T_CLASS
-#define T_ICLASS RUBY_T_ICLASS
-#define T_MODULE RUBY_T_MODULE
-#define T_FLOAT  RUBY_T_FLOAT
-#define T_STRING RUBY_T_STRING
-#define T_REGEXP RUBY_T_REGEXP
-#define T_ARRAY  RUBY_T_ARRAY
-#define T_HASH   RUBY_T_HASH
-#define T_STRUCT RUBY_T_STRUCT
-#define T_BIGNUM RUBY_T_BIGNUM
-#define T_FILE   RUBY_T_FILE
-#define T_FIXNUM RUBY_T_FIXNUM
-#define T_TRUE   RUBY_T_TRUE
-#define T_FALSE  RUBY_T_FALSE
-#define T_DATA   RUBY_T_DATA
-#define T_MATCH  RUBY_T_MATCH
-#define T_SYMBOL RUBY_T_SYMBOL
-#define T_RATIONAL RUBY_T_RATIONAL
-#define T_COMPLEX RUBY_T_COMPLEX
-#define T_UNDEF  RUBY_T_UNDEF
-#define T_NODE   RUBY_T_NODE
-#define T_MASK   RUBY_T_MASK
-
-#define BUILTIN_TYPE(x) (((struct RBasic*)(x))->flags & T_MASK)
-
-#define TYPE(x) rb_type((VALUE)(x))
-
-#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
-
-void rb_check_type(VALUE,int);
-#define Check_Type(v,t) rb_check_type((VALUE)(v),t)
-
-VALUE rb_str_to_str(VALUE);
-VALUE rb_string_value(volatile VALUE*);
-char *rb_string_value_ptr(volatile VALUE*);
-char *rb_string_value_cstr(volatile VALUE*);
-
-#define StringValue(v) rb_string_value(&(v))
-#define StringValuePtr(v) rb_string_value_ptr(&(v))
-#define StringValueCStr(v) rb_string_value_cstr(&(v))
-
-void rb_check_safe_obj(VALUE);
-void rb_check_safe_str(VALUE);
-#define SafeStringValue(v) do {\
-    StringValue(v);\
-    rb_check_safe_obj(v);\
-} while (0)
-/* obsolete macro - use SafeStringValue(v) */
-#define Check_SafeStr(v) rb_check_safe_str((VALUE)(v))
-
-VALUE rb_get_path(VALUE);
-#define FilePathValue(v) ((v) = rb_get_path(v))
-
-VALUE rb_get_path_no_checksafe(VALUE);
-#define FilePathStringValue(v) ((v) = rb_get_path_no_checksafe(v))
-
-void rb_secure(int);
-int rb_safe_level(void);
-void rb_set_safe_level(int);
-void rb_set_safe_level_force(int);
-void rb_secure_update(VALUE);
-
-VALUE rb_errinfo(void);
-void rb_set_errinfo(VALUE);
-
-SIGNED_VALUE rb_num2long(VALUE);
-VALUE rb_num2ulong(VALUE);
-#define NUM2LONG(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2long((VALUE)x))
-#define NUM2ULONG(x) rb_num2ulong((VALUE)x)
-#if SIZEOF_INT < SIZEOF_LONG
-long rb_num2int(VALUE);
-#define NUM2INT(x) ((int)(FIXNUM_P(x)?FIX2INT(x):rb_num2int((VALUE)x)))
-long rb_fix2int(VALUE);
-#define FIX2INT(x) ((int)rb_fix2int((VALUE)x))
-unsigned long rb_num2uint(VALUE);
-#define NUM2UINT(x) ((unsigned int)rb_num2uint(x))
-unsigned long rb_fix2uint(VALUE);
-#define FIX2UINT(x) ((unsigned int)rb_fix2uint(x))
-#else
-#define NUM2INT(x) ((int)NUM2LONG(x))
-#define NUM2UINT(x) ((unsigned int)NUM2ULONG(x))
-#define FIX2INT(x) ((int)FIX2LONG(x))
-#define FIX2UINT(x) ((unsigned int)FIX2ULONG(x))
-#endif
-
-#ifdef HAVE_LONG_LONG
-LONG_LONG rb_num2ll(VALUE);
-unsigned LONG_LONG rb_num2ull(VALUE);
-# define NUM2LL(x) (FIXNUM_P(x)?FIX2LONG(x):rb_num2ll((VALUE)x))
-# define NUM2ULL(x) rb_num2ull((VALUE)x)
-#endif
-
-#if defined(HAVE_LONG_LONG) && SIZEOF_OFF_T > SIZEOF_LONG
-# define NUM2OFFT(x) ((off_t)NUM2LL(x))
-#else
-# define NUM2OFFT(x) NUM2LONG(x)
-#endif
-
-#if defined(HAVE_LONG_LONG) && SIZEOF_SIZE_T > SIZEOF_LONG
-# define NUM2SIZET(x) ((size_t)NUM2ULL(x))
-#else
-# define NUM2SIZET(x) NUM2ULONG(x)
-#endif
-
-double rb_num2dbl(VALUE);
-#define NUM2DBL(x) rb_num2dbl((VALUE)(x))
-
-/* obsolete API - use StringValue() */
-char *rb_str2cstr(VALUE,long*);
-/* obsolete API - use StringValuePtr() */
-#define STR2CSTR(x) rb_str2cstr((VALUE)(x),0)
-
-#define NUM2CHR(x) (((TYPE(x) == T_STRING)&&(RSTRING_LEN(x)>=1))?\
-                     RSTRING_PTR(x)[0]:(char)(NUM2INT(x)&0xff))
-#define CHR2FIX(x) INT2FIX((long)((x)&0xff))
-
-VALUE rb_newobj(void);
-#define NEWOBJ(obj,type) type *obj = (type*)rb_newobj()
-#define OBJSETUP(obj,c,t) do {\
-    RBASIC(obj)->flags = (t);\
-    RBASIC(obj)->klass = (c);\
-    if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT);\
-} while (0)
-#define CLONESETUP(clone,obj) do {\
-    OBJSETUP(clone,rb_singleton_class_clone((VALUE)obj),RBASIC(obj)->flags);\
-    rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);\
-    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)clone,(VALUE)obj);\
-} while (0)
-#define DUPSETUP(dup,obj) do {\
-    OBJSETUP(dup,rb_obj_class(obj),(RBASIC(obj)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT));\
-    if (FL_TEST(obj, FL_EXIVAR)) rb_copy_generic_ivar((VALUE)dup,(VALUE)obj);\
-} while (0)
-
-struct RBasic {
-    VALUE flags;
-    VALUE klass;
-};
-
-#define ROBJECT_EMBED_LEN_MAX 3
-struct RObject {
-    struct RBasic basic;
-    union {
-	struct {
-	    long numiv;
-	    VALUE *ivptr;
-            struct st_table *iv_index_tbl; /* shortcut for RCLASS_IV_INDEX_TBL(rb_obj_class(obj)) */
-	} heap;
-	VALUE ary[ROBJECT_EMBED_LEN_MAX];
-    } as;
-};
-#define ROBJECT_EMBED FL_USER1
-#define ROBJECT_NUMIV(o) \
-    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
-     ROBJECT_EMBED_LEN_MAX : \
-     ROBJECT(o)->as.heap.numiv)
-#define ROBJECT_IVPTR(o) \
-    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
-     ROBJECT(o)->as.ary : \
-     ROBJECT(o)->as.heap.ivptr)
-#define ROBJECT_IV_INDEX_TBL(o) \
-    ((RBASIC(o)->flags & ROBJECT_EMBED) ? \
-     RCLASS_IV_INDEX_TBL(rb_obj_class(o)) : \
-     ROBJECT(o)->as.heap.iv_index_tbl)
-
-typedef struct {
-    VALUE super;
-    struct st_table *iv_tbl;
-} rb_classext_t;
-
-struct RClass {
-    struct RBasic basic;
-    rb_classext_t *ptr;
-    struct st_table *m_tbl;
-    struct st_table *iv_index_tbl;
-};
-#define RCLASS_IV_TBL(c) (RCLASS(c)->ptr->iv_tbl)
-#define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-#define RCLASS_SUPER(c) (RCLASS(c)->ptr->super)
-#define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl)
-#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
-#define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
-#define RMODULE_SUPER(m) RCLASS_SUPER(m)
-
-struct RFloat {
-    struct RBasic basic;
-    double float_value;
-};
-#define RFLOAT_VALUE(v) (RFLOAT(v)->float_value)
-#define DOUBLE2NUM(dbl)  rb_float_new(dbl)
-
-#define ELTS_SHARED FL_USER2
-
-#define RSTRING_EMBED_LEN_MAX ((sizeof(VALUE)*3)/sizeof(char)-1)
-struct RString {
-    struct RBasic basic;
-    union {
-	struct {
-	    long len;
-	    char *ptr;
-	    union {
-		long capa;
-		VALUE shared;
-	    } aux;
-	} heap;
-	char ary[RSTRING_EMBED_LEN_MAX];
-    } as;
-};
-#define RSTRING_NOEMBED FL_USER1
-#define RSTRING_EMBED_LEN_MASK (FL_USER2|FL_USER3|FL_USER4|FL_USER5|FL_USER6)
-#define RSTRING_EMBED_LEN_SHIFT (FL_USHIFT+2)
-#define RSTRING_LEN(str) \
-    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
-     (long)((RBASIC(str)->flags >> RSTRING_EMBED_LEN_SHIFT) & \
-            (RSTRING_EMBED_LEN_MASK >> RSTRING_EMBED_LEN_SHIFT)) : \
-     RSTRING(str)->as.heap.len)
-#define RSTRING_PTR(str) \
-    (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
-     RSTRING(str)->as.ary : \
-     RSTRING(str)->as.heap.ptr)
-#define RSTRING_END(str) (RSTRING_PTR(str)+RSTRING_LEN(str))
-
-struct RArray {
-    struct RBasic basic;
-    long len;
-    union {
-	long capa;
-	VALUE shared;
-    } aux;
-    VALUE *ptr;
-};
-#define RARRAY_LEN(a) RARRAY(a)->len
-#define RARRAY_PTR(a) RARRAY(a)->ptr
-
-struct RRegexp {
-    struct RBasic basic;
-    struct re_pattern_buffer *ptr;
-    VALUE src;
-    unsigned long usecnt;
-};
-#define RREGEXP_SRC(r) RREGEXP(r)->src
-#define RREGEXP_SRC_PTR(r) RSTRING_PTR(RREGEXP(r)->src)
-#define RREGEXP_SRC_LEN(r) RSTRING_LEN(RREGEXP(r)->src)
-
-struct RHash {
-    struct RBasic basic;
-    struct st_table *ntbl;      /* possibly 0 */
-    int iter_lev;
-    VALUE ifnone;
-};
-/* RHASH_TBL allocates st_table if not available. */
-#define RHASH_TBL(h) rb_hash_tbl(h)
-#define RHASH_ITER_LEV(h) (RHASH(h)->iter_lev)
-#define RHASH_IFNONE(h) (RHASH(h)->ifnone)
-#define RHASH_SIZE(h) (RHASH(h)->ntbl ? RHASH(h)->ntbl->num_entries : 0)
-#define RHASH_EMPTY_P(h) (RHASH_SIZE(h) == 0)
-
-struct RFile {
-    struct RBasic basic;
-    struct rb_io_t *fptr;
-};
-
-struct RRational {
-    struct RBasic basic;
-    VALUE num;
-    VALUE den;
-};
-
-struct RComplex {
-    struct RBasic basic;
-    VALUE real;
-    VALUE image;
-};
-
-struct RData {
-    struct RBasic basic;
-    void (*dmark)(void*);
-    void (*dfree)(void*);
-    void *data;
-};
-
-#define DATA_PTR(dta) (RDATA(dta)->data)
-
-/*
-#define RUBY_DATA_FUNC(func) ((void (*)(void*))func)
-*/
-typedef void (*RUBY_DATA_FUNC)(void*);
-
-VALUE rb_data_object_alloc(VALUE,void*,RUBY_DATA_FUNC,RUBY_DATA_FUNC);
-
-#define Data_Wrap_Struct(klass,mark,free,sval)\
-    rb_data_object_alloc(klass,sval,(RUBY_DATA_FUNC)mark,(RUBY_DATA_FUNC)free)
-
-#define Data_Make_Struct(klass,type,mark,free,sval) (\
-    sval = ALLOC(type),\
-    memset(sval, 0, sizeof(type)),\
-    Data_Wrap_Struct(klass,mark,free,sval)\
-)
-
-#define Data_Get_Struct(obj,type,sval) do {\
-    Check_Type(obj, T_DATA); \
-    sval = (type*)DATA_PTR(obj);\
-} while (0)
-
-#define RSTRUCT_EMBED_LEN_MAX 3
-struct RStruct {
-    struct RBasic basic;
-    union {
-	struct {
-	    long len;
-	    VALUE *ptr;
-	} heap;
-	VALUE ary[RSTRUCT_EMBED_LEN_MAX];
-    } as;
-};
-#define RSTRUCT_EMBED_LEN_MASK (FL_USER2|FL_USER1)
-#define RSTRUCT_EMBED_LEN_SHIFT (FL_USHIFT+1)
-#define RSTRUCT_LEN(st) \
-    ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
-     (long)((RBASIC(st)->flags >> RSTRUCT_EMBED_LEN_SHIFT) & \
-            (RSTRUCT_EMBED_LEN_MASK >> RSTRUCT_EMBED_LEN_SHIFT)) : \
-     RSTRUCT(st)->as.heap.len)
-#define RSTRUCT_PTR(st) \
-    ((RBASIC(st)->flags & RSTRUCT_EMBED_LEN_MASK) ? \
-     RSTRUCT(st)->as.ary : \
-     RSTRUCT(st)->as.heap.ptr)
-
-#define RBIGNUM_EMBED_LEN_MAX ((sizeof(VALUE)*3)/sizeof(BDIGIT))
-struct RBignum {
-    struct RBasic basic;
-    union {
-        struct {
-            long len;
-            BDIGIT *digits;
-        } heap;
-        BDIGIT ary[RBIGNUM_EMBED_LEN_MAX];
-    } as;
-};
-#define RBIGNUM_SIGN_BIT FL_USER1
-/* sign: positive:1, negative:0 */
-#define RBIGNUM_SIGN(b) ((RBASIC(b)->flags & RBIGNUM_SIGN_BIT) != 0)
-#define RBIGNUM_SET_SIGN(b,sign) \
-  ((sign) ? (RBASIC(b)->flags |= RBIGNUM_SIGN_BIT) \
-          : (RBASIC(b)->flags &= ~RBIGNUM_SIGN_BIT))
-#define RBIGNUM_POSITIVE_P(b) RBIGNUM_SIGN(b)
-#define RBIGNUM_NEGATIVE_P(b) (!RBIGNUM_SIGN(b))
-
-#define RBIGNUM_EMBED_FLAG FL_USER2
-#define RBIGNUM_EMBED_LEN_MASK (FL_USER5|FL_USER4|FL_USER3)
-#define RBIGNUM_EMBED_LEN_SHIFT (FL_USHIFT+3)
-#define RBIGNUM_LEN(b) \
-    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
-     (long)((RBASIC(b)->flags >> RBIGNUM_EMBED_LEN_SHIFT) & \
-            (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT)) : \
-     RBIGNUM(b)->as.heap.len)
-/* LSB:RBIGNUM_DIGITS(b)[0], MSB:RBIGNUM_DIGITS(b)[RBIGNUM_LEN(b)-1] */
-#define RBIGNUM_DIGITS(b) \
-    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
-     RBIGNUM(b)->as.ary : \
-     RBIGNUM(b)->as.heap.digits)
-
-#define R_CAST(st)   (struct st*)
-#define RBASIC(obj)  (R_CAST(RBasic)(obj))
-#define ROBJECT(obj) (R_CAST(RObject)(obj))
-#define RCLASS(obj)  (R_CAST(RClass)(obj))
-#define RMODULE(obj) RCLASS(obj)
-#define RFLOAT(obj)  (R_CAST(RFloat)(obj))
-#define RSTRING(obj) (R_CAST(RString)(obj))
-#define RREGEXP(obj) (R_CAST(RRegexp)(obj))
-#define RARRAY(obj)  (R_CAST(RArray)(obj))
-#define RHASH(obj)   (R_CAST(RHash)(obj))
-#define RDATA(obj)   (R_CAST(RData)(obj))
-#define RSTRUCT(obj) (R_CAST(RStruct)(obj))
-#define RBIGNUM(obj) (R_CAST(RBignum)(obj))
-#define RFILE(obj)   (R_CAST(RFile)(obj))
-#define RRATIONAL(obj) (R_CAST(RRational)(obj))
-#define RCOMPLEX(obj) (R_CAST(RComplex)(obj))
-
-#define FL_SINGLETON FL_USER0
-#define FL_MARK      (((VALUE)1)<<5)
-#define FL_RESERVED  (((VALUE)1)<<6) /* will be used in the future GC */
-#define FL_FINALIZE  (((VALUE)1)<<7)
-#define FL_TAINT     (((VALUE)1)<<8)
-#define FL_EXIVAR    (((VALUE)1)<<9)
-#define FL_FREEZE    (((VALUE)1)<<10)
-
-#define FL_USHIFT    11
-
-#define FL_USER0     (((VALUE)1)<<(FL_USHIFT+0))
-#define FL_USER1     (((VALUE)1)<<(FL_USHIFT+1))
-#define FL_USER2     (((VALUE)1)<<(FL_USHIFT+2))
-#define FL_USER3     (((VALUE)1)<<(FL_USHIFT+3))
-#define FL_USER4     (((VALUE)1)<<(FL_USHIFT+4))
-#define FL_USER5     (((VALUE)1)<<(FL_USHIFT+5))
-#define FL_USER6     (((VALUE)1)<<(FL_USHIFT+6))
-#define FL_USER7     (((VALUE)1)<<(FL_USHIFT+7))
-#define FL_USER8     (((VALUE)1)<<(FL_USHIFT+8))
-#define FL_USER9     (((VALUE)1)<<(FL_USHIFT+9))
-#define FL_USER10    (((VALUE)1)<<(FL_USHIFT+10))
-#define FL_USER11    (((VALUE)1)<<(FL_USHIFT+11))
-#define FL_USER12    (((VALUE)1)<<(FL_USHIFT+12))
-#define FL_USER13    (((VALUE)1)<<(FL_USHIFT+13))
-#define FL_USER14    (((VALUE)1)<<(FL_USHIFT+14))
-#define FL_USER15    (((VALUE)1)<<(FL_USHIFT+15))
-#define FL_USER16    (((VALUE)1)<<(FL_USHIFT+16))
-#define FL_USER17    (((VALUE)1)<<(FL_USHIFT+17))
-#define FL_USER18    (((VALUE)1)<<(FL_USHIFT+18))
-#define FL_USER19    (((VALUE)1)<<(FL_USHIFT+19))
-#define FL_USER20    (((VALUE)1)<<(FL_USHIFT+20))
-
-#define SPECIAL_CONST_P(x) (IMMEDIATE_P(x) || !RTEST(x))
-
-#define FL_ABLE(x) (!SPECIAL_CONST_P(x) && BUILTIN_TYPE(x) != T_NODE)
-#define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
-#define FL_ANY(x,f) FL_TEST(x,f)
-#define FL_ALL(x,f) (FL_TEST(x,f) == (f))
-#define FL_SET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags |= (f);} while (0)
-#define FL_UNSET(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags &= ~(f);} while (0)
-#define FL_REVERSE(x,f) do {if (FL_ABLE(x)) RBASIC(x)->flags ^= (f);} while (0)
-
-#define OBJ_TAINTED(x) FL_TEST((x), FL_TAINT)
-#define OBJ_TAINT(x) FL_SET((x), FL_TAINT)
-#define OBJ_INFECT(x,s) do {if (FL_ABLE(x) && FL_ABLE(s)) RBASIC(x)->flags |= RBASIC(s)->flags & FL_TAINT;} while (0)
-
-#define OBJ_FROZEN(x) FL_TEST((x), FL_FREEZE)
-#define OBJ_FREEZE(x) FL_SET((x), FL_FREEZE)
-
-#define ALLOC_N(type,n) (type*)xmalloc2((n),sizeof(type))
-#define ALLOC(type) (type*)xmalloc(sizeof(type))
-#define REALLOC_N(var,type,n) (var)=(type*)xrealloc2((char*)(var),(n),sizeof(type))
-
-#define ALLOCA_N(type,n) (type*)alloca(sizeof(type)*(n))
-
-#define MEMZERO(p,type,n) memset((p), 0, sizeof(type)*(n))
-#define MEMCPY(p1,p2,type,n) memcpy((p1), (p2), sizeof(type)*(n))
-#define MEMMOVE(p1,p2,type,n) memmove((p1), (p2), sizeof(type)*(n))
-#define MEMCMP(p1,p2,type,n) memcmp((p1), (p2), sizeof(type)*(n))
-
-void rb_obj_infect(VALUE,VALUE);
-
-typedef int ruby_glob_func(const char*,VALUE, void*);
-void rb_glob(const char*,void(*)(const char*,VALUE,void*),VALUE);
-int ruby_glob(const char*,int,ruby_glob_func*,VALUE);
-int ruby_brace_glob(const char*,int,ruby_glob_func*,VALUE);
-
-VALUE rb_define_class(const char*,VALUE);
-VALUE rb_define_module(const char*);
-VALUE rb_define_class_under(VALUE, const char*, VALUE);
-VALUE rb_define_module_under(VALUE, const char*);
-
-void rb_include_module(VALUE,VALUE);
-void rb_extend_object(VALUE,VALUE);
-
-void rb_define_variable(const char*,VALUE*);
-void rb_define_virtual_variable(const char*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
-void rb_define_hooked_variable(const char*,VALUE*,VALUE(*)(ANYARGS),void(*)(ANYARGS));
-void rb_define_readonly_variable(const char*,VALUE*);
-void rb_define_const(VALUE,const char*,VALUE);
-void rb_define_global_const(const char*,VALUE);
-
-#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
-void rb_define_method(VALUE,const char*,VALUE(*)(ANYARGS),int);
-void rb_define_module_function(VALUE,const char*,VALUE(*)(ANYARGS),int);
-void rb_define_global_function(const char*,VALUE(*)(ANYARGS),int);
-
-void rb_undef_method(VALUE,const char*);
-void rb_define_alias(VALUE,const char*,const char*);
-void rb_define_attr(VALUE,const char*,int,int);
-
-void rb_global_variable(VALUE*);
-void rb_register_mark_object(VALUE);
-void rb_gc_register_address(VALUE*);
-void rb_gc_unregister_address(VALUE*);
-
-ID rb_intern(const char*);
-ID rb_intern2(const char*, long);
-ID rb_intern_str(VALUE str);
-const char *rb_id2name(ID);
-ID rb_to_id(VALUE);
-VALUE rb_id2str(ID);
-
-#define CONST_ID_CACHE(result, str)			\
-    {							\
-	static ID rb_intern_id_cache;			\
-	if (!rb_intern_id_cache)			\
-	    rb_intern_id_cache = rb_intern2(str, strlen(str));	\
-	result rb_intern_id_cache;			\
-    }
-#define CONST_ID(var, str) \
-    do CONST_ID_CACHE(var =, str) while (0)
-#ifdef __GNUC__
-/* __builtin_constant_p and statement expression is available
- * since gcc-2.7.2.3 at least. */
-#define rb_intern(str) \
-    (__builtin_constant_p(str) ? \
-        __extension__ (CONST_ID_CACHE(/**/, str)) : \
-        rb_intern(str))
-#endif
-
-const char *rb_class2name(VALUE);
-const char *rb_obj_classname(VALUE);
-
-void rb_p(VALUE);
-
-VALUE rb_eval_string(const char*);
-VALUE rb_eval_string_protect(const char*, int*);
-VALUE rb_eval_string_wrap(const char*, int*);
-VALUE rb_funcall(VALUE, ID, int, ...);
-VALUE rb_funcall2(VALUE, ID, int, const VALUE*);
-VALUE rb_funcall3(VALUE, ID, int, const VALUE*);
-int rb_scan_args(int, const VALUE*, const char*, ...);
-VALUE rb_call_super(int, const VALUE*);
-
-VALUE rb_gv_set(const char*, VALUE);
-VALUE rb_gv_get(const char*);
-VALUE rb_iv_get(VALUE, const char*);
-VALUE rb_iv_set(VALUE, const char*, VALUE);
-
-VALUE rb_equal(VALUE,VALUE);
-
-VALUE *rb_ruby_verbose_ptr(void);
-VALUE *rb_ruby_debug_ptr(void);
-#define ruby_verbose (*rb_ruby_verbose_ptr())
-#define ruby_debug   (*rb_ruby_debug_ptr())
-
-PRINTF_ARGS(NORETURN(void rb_raise(VALUE, const char*, ...)), 2, 3);
-PRINTF_ARGS(NORETURN(void rb_fatal(const char*, ...)), 1, 2);
-PRINTF_ARGS(NORETURN(void rb_bug(const char*, ...)), 1, 2);
-NORETURN(void rb_sys_fail(const char*));
-NORETURN(void rb_iter_break(void));
-NORETURN(void rb_exit(int));
-NORETURN(void rb_notimplement(void));
-
-/* reports if `-w' specified */
-PRINTF_ARGS(void rb_warning(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warning(const char *, int, const char*, ...), 3, 4);
-PRINTF_ARGS(void rb_sys_warning(const char*, ...), 1, 2);
-/* reports always */
-PRINTF_ARGS(void rb_warn(const char*, ...), 1, 2);
-PRINTF_ARGS(void rb_compile_warn(const char *, int, const char*, ...), 3, 4);
-
-typedef VALUE rb_block_call_func(VALUE, VALUE, int, VALUE*);
-
-VALUE rb_each(VALUE);
-VALUE rb_yield(VALUE);
-VALUE rb_yield_values(int n, ...);
-VALUE rb_yield_values2(int n, const VALUE *argv);
-VALUE rb_yield_splat(VALUE);
-int rb_block_given_p(void);
-void rb_need_block(void);
-VALUE rb_iterate(VALUE(*)(VALUE),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_block_call(VALUE,ID,int,VALUE*,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_rescue2(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE,...);
-VALUE rb_ensure(VALUE(*)(ANYARGS),VALUE,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_catch(const char*,VALUE(*)(ANYARGS),VALUE);
-VALUE rb_catch_obj(VALUE,VALUE(*)(ANYARGS),VALUE);
-NORETURN(void rb_throw(const char*,VALUE));
-NORETURN(void rb_throw_obj(VALUE,VALUE));
-
-VALUE rb_require(const char*);
-
-#ifdef __ia64
-void ruby_init_stack(VALUE*, void*);
-#define ruby_init_stack(addr) ruby_init_stack(addr, rb_ia64_bsp())
-#else
-void ruby_init_stack(VALUE*);
-#endif
-#define RUBY_INIT_STACK \
-    VALUE variable_in_this_stack_frame; \
-    ruby_init_stack(&variable_in_this_stack_frame);
-void ruby_init(void);
-void *ruby_options(int, char**);
-int ruby_run_node(void *);
-
-RUBY_EXTERN VALUE rb_mKernel;
-RUBY_EXTERN VALUE rb_mComparable;
-RUBY_EXTERN VALUE rb_mEnumerable;
-RUBY_EXTERN VALUE rb_mPrecision;
-RUBY_EXTERN VALUE rb_mErrno;
-RUBY_EXTERN VALUE rb_mFileTest;
-RUBY_EXTERN VALUE rb_mGC;
-RUBY_EXTERN VALUE rb_mMath;
-RUBY_EXTERN VALUE rb_mProcess;
-
-RUBY_EXTERN VALUE rb_cBasicObject;
-RUBY_EXTERN VALUE rb_cObject;
-RUBY_EXTERN VALUE rb_cArray;
-RUBY_EXTERN VALUE rb_cBignum;
-RUBY_EXTERN VALUE rb_cBinding;
-RUBY_EXTERN VALUE rb_cClass;
-RUBY_EXTERN VALUE rb_cCont;
-RUBY_EXTERN VALUE rb_cDir;
-RUBY_EXTERN VALUE rb_cData;
-RUBY_EXTERN VALUE rb_cFalseClass;
-RUBY_EXTERN VALUE rb_cEnumerator;
-RUBY_EXTERN VALUE rb_cFile;
-RUBY_EXTERN VALUE rb_cFixnum;
-RUBY_EXTERN VALUE rb_cFloat;
-RUBY_EXTERN VALUE rb_cHash;
-RUBY_EXTERN VALUE rb_cInteger;
-RUBY_EXTERN VALUE rb_cIO;
-RUBY_EXTERN VALUE rb_cMatch;
-RUBY_EXTERN VALUE rb_cMethod;
-RUBY_EXTERN VALUE rb_cModule;
-RUBY_EXTERN VALUE rb_cNameErrorMesg;
-RUBY_EXTERN VALUE rb_cNilClass;
-RUBY_EXTERN VALUE rb_cNumeric;
-RUBY_EXTERN VALUE rb_cProc;
-RUBY_EXTERN VALUE rb_cRange;
-RUBY_EXTERN VALUE rb_cRational;
-RUBY_EXTERN VALUE rb_cComplex;
-RUBY_EXTERN VALUE rb_cRegexp;
-RUBY_EXTERN VALUE rb_cStat;
-RUBY_EXTERN VALUE rb_cString;
-RUBY_EXTERN VALUE rb_cStruct;
-RUBY_EXTERN VALUE rb_cSymbol;
-RUBY_EXTERN VALUE rb_cThread;
-RUBY_EXTERN VALUE rb_cTime;
-RUBY_EXTERN VALUE rb_cTrueClass;
-RUBY_EXTERN VALUE rb_cUnboundMethod;
-
-RUBY_EXTERN VALUE rb_eException;
-RUBY_EXTERN VALUE rb_eStandardError;
-RUBY_EXTERN VALUE rb_eSystemExit;
-RUBY_EXTERN VALUE rb_eInterrupt;
-RUBY_EXTERN VALUE rb_eSignal;
-RUBY_EXTERN VALUE rb_eFatal;
-RUBY_EXTERN VALUE rb_eArgError;
-RUBY_EXTERN VALUE rb_eEOFError;
-RUBY_EXTERN VALUE rb_eIndexError;
-RUBY_EXTERN VALUE rb_eStopIteration;
-RUBY_EXTERN VALUE rb_eKeyError;
-RUBY_EXTERN VALUE rb_eRangeError;
-RUBY_EXTERN VALUE rb_eIOError;
-RUBY_EXTERN VALUE rb_eRuntimeError;
-RUBY_EXTERN VALUE rb_eSecurityError;
-RUBY_EXTERN VALUE rb_eSystemCallError;
-RUBY_EXTERN VALUE rb_eThreadError;
-RUBY_EXTERN VALUE rb_eTypeError;
-RUBY_EXTERN VALUE rb_eZeroDivError;
-RUBY_EXTERN VALUE rb_eNotImpError;
-RUBY_EXTERN VALUE rb_eNoMemError;
-RUBY_EXTERN VALUE rb_eNoMethodError;
-RUBY_EXTERN VALUE rb_eFloatDomainError;
-RUBY_EXTERN VALUE rb_eLocalJumpError;
-RUBY_EXTERN VALUE rb_eSysStackError;
-RUBY_EXTERN VALUE rb_eRegexpError;
-
-RUBY_EXTERN VALUE rb_eScriptError;
-RUBY_EXTERN VALUE rb_eNameError;
-RUBY_EXTERN VALUE rb_eSyntaxError;
-RUBY_EXTERN VALUE rb_eLoadError;
-
-RUBY_EXTERN VALUE rb_stdin, rb_stdout, rb_stderr;
-
-static inline VALUE
-rb_class_of(VALUE obj)
-{
-    if (IMMEDIATE_P(obj)) {
-	if (FIXNUM_P(obj)) return rb_cFixnum;
-	if (obj == Qtrue)  return rb_cTrueClass;
-	if (SYMBOL_P(obj)) return rb_cSymbol;
-    }
-    else if (!RTEST(obj)) {
-	if (obj == Qnil)   return rb_cNilClass;
-	if (obj == Qfalse) return rb_cFalseClass;
-    }
-    return RBASIC(obj)->klass;
-}
-
-static inline int
-rb_type(VALUE obj)
-{
-    if (IMMEDIATE_P(obj)) {
-	if (FIXNUM_P(obj)) return T_FIXNUM;
-	if (obj == Qtrue) return T_TRUE;
-	if (SYMBOL_P(obj)) return T_SYMBOL;
-	if (obj == Qundef) return T_UNDEF;
-    }
-    else if (!RTEST(obj)) {
-	if (obj == Qnil) return T_NIL;
-	if (obj == Qfalse) return T_FALSE;
-    }
-    return BUILTIN_TYPE(obj);
-}
-
-static inline int
-rb_special_const_p(VALUE obj)
-{
-    if (SPECIAL_CONST_P(obj)) return Qtrue;
-    return Qfalse;
-}
-
-#include "ruby/missing.h"
-#include "ruby/intern.h"
-
-#if defined(EXTLIB) && defined(USE_DLN_A_OUT)
-/* hook for external modules */
-static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
-#endif
-
-#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-/* to link startup code with ObjC support */
-#define RUBY_GLOBAL_SETUP static void objcdummyfunction(void) {objc_msgSend();}
-#else
-#define RUBY_GLOBAL_SETUP
-#endif
-
-void ruby_sysinit(int *, char ***);
-
-#define RUBY_VM 1 /* YARV */
-#define HAVE_NATIVETHREAD
-int ruby_native_thread_p(void);
-
-#define RUBY_EVENT_NONE      0x0000
-#define RUBY_EVENT_LINE      0x0001
-#define RUBY_EVENT_CLASS     0x0002
-#define RUBY_EVENT_END       0x0004
-#define RUBY_EVENT_CALL      0x0008
-#define RUBY_EVENT_RETURN    0x0010
-#define RUBY_EVENT_C_CALL    0x0020
-#define RUBY_EVENT_C_RETURN  0x0040
-#define RUBY_EVENT_RAISE     0x0080
-#define RUBY_EVENT_ALL       0xffff
-#define RUBY_EVENT_VM       0x10000
-#define RUBY_EVENT_SWITCH   0x20000
-#define RUBY_EVENT_COVERAGE 0x40000
-
-typedef unsigned int rb_event_flag_t;
-typedef void (*rb_event_hook_func_t)(rb_event_flag_t, VALUE data, VALUE, ID, VALUE klass);
-
-typedef struct rb_event_hook_struct {
-    rb_event_flag_t flag;
-    rb_event_hook_func_t func;
-    VALUE data;
-    struct rb_event_hook_struct *next;
-} rb_event_hook_t;
-
-void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events,
-		       VALUE data);
-int rb_remove_event_hook(rb_event_hook_func_t func);
-
-/* locale insensitive functions */
-
-#define rb_isascii(c) ((unsigned long)(c) < 128)
-int rb_isalnum(int c);
-int rb_isalpha(int c);
-int rb_isblank(int c);
-int rb_iscntrl(int c);
-int rb_isdigit(int c);
-int rb_isgraph(int c);
-int rb_islower(int c);
-int rb_isprint(int c);
-int rb_ispunct(int c);
-int rb_isspace(int c);
-int rb_isupper(int c);
-int rb_isxdigit(int c);
-int rb_tolower(int c);
-int rb_toupper(int c);
-
-#ifndef ISPRINT
-#define ISASCII(c) rb_isascii((unsigned char)(c))
-#undef ISPRINT
-#define ISPRINT(c) rb_isprint((unsigned char)(c))
-#define ISSPACE(c) rb_isspace((unsigned char)(c))
-#define ISUPPER(c) rb_isupper((unsigned char)(c))
-#define ISLOWER(c) rb_islower((unsigned char)(c))
-#define ISALNUM(c) rb_isalnum((unsigned char)(c))
-#define ISALPHA(c) rb_isalpha((unsigned char)(c))
-#define ISDIGIT(c) rb_isdigit((unsigned char)(c))
-#define ISXDIGIT(c) rb_isxdigit((unsigned char)(c))
-#endif
-#define TOUPPER(c) rb_toupper((unsigned char)(c))
-#define TOLOWER(c) rb_tolower((unsigned char)(c))
-
-int st_strcasecmp(const char *s1, const char *s2);
-int st_strncasecmp(const char *s1, const char *s2, size_t n);
-#define STRCASECMP(s1, s2) (st_strcasecmp(s1, s2))
-#define STRNCASECMP(s1, s2, n) (st_strncasecmp(s1, s2, n))
-
-unsigned long ruby_strtoul(const char *str, char **endptr, int base);
-#define STRTOUL(str, endptr, base) (ruby_strtoul(str, endptr, base))
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-#endif /* RUBY_RUBY_H */
diff --git a/include/ruby/signal.h b/include/ruby/signal.h
deleted file mode 100644
index 62a6c5d13c..0000000000
--- a/include/ruby/signal.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**********************************************************************
-
-  rubysig.h -
-
-  $Author$
-  created at: Wed Aug 16 01:15:38 JST 1995
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBYSIG_H
-#define RUBYSIG_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#include <errno.h>
-
-#ifdef _WIN32
-typedef LONG rb_atomic_t;
-
-# define ATOMIC_TEST(var) InterlockedExchange(&(var), 0)
-# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_INC(var) InterlockedIncrement(&(var))
-# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-
-/* Windows doesn't allow interrupt while system calls */
-# define TRAP_BEG do {\
-    rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 1)
-
-# define TRAP_END\
-    ATOMIC_SET(rb_trap_immediate, trap_immediate);\
-} while (0)
-
-# define RUBY_CRITICAL(statements) do {\
-    rb_atomic_t trap_immediate = ATOMIC_SET(rb_trap_immediate, 0);\
-    statements;\
-    ATOMIC_SET(rb_trap_immediate, trap_immediate);\
-} while (0)
-#else
-typedef int rb_atomic_t;
-
-# define ATOMIC_TEST(var) ((var) ? ((var) = 0, 1) : 0)
-# define ATOMIC_SET(var, val) ((var) = (val))
-# define ATOMIC_INC(var) (++(var))
-# define ATOMIC_DEC(var) (--(var))
-
-# define TRAP_BEG do {\
-    int trap_immediate = rb_trap_immediate;\
-    rb_trap_immediate = 1
-
-# define TRAP_END \
-    rb_trap_immediate = trap_immediate;\
-} while (0)
-
-# define RUBY_CRITICAL(statements) do {\
-    int trap_immediate = rb_trap_immediate;\
-    rb_trap_immediate = 0;\
-    statements;\
-    rb_trap_immediate = trap_immediate;\
-} while (0)
-#endif
-RUBY_EXTERN rb_atomic_t rb_trap_immediate;
-
-RUBY_EXTERN int rb_prohibit_interrupt;
-#define DEFER_INTS (rb_prohibit_interrupt++)
-#define ALLOW_INTS do {\
-    rb_prohibit_interrupt--;\
-} while (0)
-#define ENABLE_INTS (rb_prohibit_interrupt--)
-
-VALUE rb_with_disable_interrupt(VALUE(*)(ANYARGS),VALUE);
-
-RUBY_EXTERN rb_atomic_t rb_trap_pending;
-void rb_trap_restore_mask(void);
-
-RUBY_EXTERN int rb_thread_critical;
-void rb_thread_schedule(void);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBYSIG_H */
diff --git a/include/ruby/st.h b/include/ruby/st.h
deleted file mode 100644
index d23f761e7e..0000000000
--- a/include/ruby/st.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This is a public domain general purpose hash table package written by Peter Moore @ UCB. */
-
-/* @(#) st.h 5.1 89/12/14 */
-
-#ifndef RUBY_ST_H
-#define RUBY_ST_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#if SIZEOF_LONG == SIZEOF_VOIDP
-typedef unsigned long st_data_t;
-#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
-typedef unsigned LONG_LONG st_data_t;
-#else
-# error ---->> st.c requires sizeof(void*) == sizeof(long) to be compiled. <<----
-#endif
-#define ST_DATA_T_DEFINED
-
-#ifndef CHAR_BIT
-# ifdef HAVE_LIMITS_H
-#  include <limits.h>
-# else
-#  define CHAR_BIT 8
-# endif
-#endif
-#ifndef _
-# define _(args) args
-#endif
-#ifndef ANYARGS
-# ifdef __cplusplus
-#   define ANYARGS ...
-# else
-#   define ANYARGS
-# endif
-#endif
-
-typedef struct st_table st_table;
-
-typedef int st_compare_func(st_data_t, st_data_t);
-typedef int st_hash_func(st_data_t);
-
-struct st_hash_type {
-    int (*compare)(ANYARGS /*st_data_t, st_data_t*/); /* st_compare_func* */
-    int (*hash)(ANYARGS /*st_data_t*/);               /* st_hash_func* */
-};
-
-typedef st_data_t st_index_t;
-#define ST_INDEX_BITS (sizeof(st_index_t) * CHAR_BIT)
-
-struct st_table {
-    const struct st_hash_type *type;
-    st_index_t num_bins;
-    unsigned int entries_packed : 1;
-#ifdef __GNUC__
-    __extension__
-#endif
-    st_index_t num_entries : ST_INDEX_BITS - 1;
-    struct st_table_entry **bins;
-    struct st_table_entry *head;
-};
-
-#define st_is_member(table,key) st_lookup(table,key,(st_data_t *)0)
-
-enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE, ST_CHECK};
-
-st_table *st_init_table(const struct st_hash_type *);
-st_table *st_init_table_with_size(const struct st_hash_type *, int);
-st_table *st_init_numtable(void);
-st_table *st_init_numtable_with_size(int);
-st_table *st_init_strtable(void);
-st_table *st_init_strtable_with_size(int);
-st_table *st_init_strcasetable(void);
-st_table *st_init_strcasetable_with_size(int);
-int st_delete(st_table *, st_data_t *, st_data_t *);
-int st_delete_safe(st_table *, st_data_t *, st_data_t *, st_data_t);
-int st_insert(st_table *, st_data_t, st_data_t);
-int st_lookup(st_table *, st_data_t, st_data_t *);
-int st_get_key(st_table *, st_data_t, st_data_t *);
-int st_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-int st_reverse_foreach(st_table *, int (*)(ANYARGS), st_data_t);
-void st_add_direct(st_table *, st_data_t, st_data_t);
-void st_free_table(st_table *);
-void st_cleanup_safe(st_table *, st_data_t);
-void st_clear(st_table *);
-st_table *st_copy(st_table *);
-int st_numcmp(st_data_t, st_data_t);
-int st_numhash(st_data_t);
-int st_strcasecmp(const char *s1, const char *s2);
-int st_strncasecmp(const char *s1, const char *s2, size_t n);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_ST_H */
diff --git a/include/ruby/util.h b/include/ruby/util.h
deleted file mode 100644
index e6e6c95ca4..0000000000
--- a/include/ruby/util.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/**********************************************************************
-
-  util.h -
-
-  $Author$
-  created at: Thu Mar  9 11:55:53 JST 1995
-
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_UTIL_H
-#define RUBY_UTIL_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-#ifndef _
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-#endif
-
-#define scan_oct ruby_scan_oct
-unsigned long ruby_scan_oct(const char *, int, int *);
-#define scan_hex ruby_scan_hex
-unsigned long ruby_scan_hex(const char *, int, int *);
-
-#if defined(MSDOS) || defined(__CYGWIN32__) || defined(_WIN32)
-void ruby_add_suffix(VALUE str, const char *suffix);
-#endif
-
-void ruby_qsort(void *, const int, const int,
-		int (*)(const void *, const void *, void *), void *);
-
-void ruby_setenv(const char *, const char *);
-void ruby_unsetenv(const char *);
-#undef setenv
-#undef unsetenv
-#define setenv(name,val) ruby_setenv(name,val)
-#define unsetenv(name,val) ruby_unsetenv(name);
-
-char *ruby_strdup(const char *);
-#undef strdup
-#define strdup(s) ruby_strdup(s)
-
-char *ruby_getcwd(void);
-#define my_getcwd() ruby_getcwd()
-
-double ruby_strtod(const char *, char **);
-#undef strtod
-#define strtod(s,e) ruby_strtod(s,e)
-
-void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_UTIL_H */
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
deleted file mode 100644
index e871699749..0000000000
--- a/include/ruby/win32.h
+++ /dev/null
@@ -1,571 +0,0 @@
-#ifndef RUBY_WIN32_H
-#define RUBY_WIN32_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-/*
- *  Copyright (c) 1993, Intergraph Corporation
- *
- *  You may distribute under the terms of either the GNU General Public
- *  License or the Artistic License, as specified in the perl README file.
- *
- */
-
-//
-// Definitions for NT port of Perl
-//
-
-
-//
-// Ok now we can include the normal include files.
-//
-
-// #include <stdarg.h> conflict with varargs.h?
-#if !defined(WSAAPI)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
-#define NT 1			/* deprecated */
-
-#ifdef _WIN32_WCE
-#undef CharNext
-#define CharNext CharNextA
-#endif
-
-//
-// We're not using Microsoft's "extensions" to C for
-// Structured Exception Handling (SEH) so we can nuke these
-//
-#undef try
-#undef except
-#undef finally
-#undef leave
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <direct.h>
-#include <process.h>
-#include <time.h>
-#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
-extern "C++" {			/* template without extern "C++" */
-#endif
-#include <math.h>
-#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
-}
-#endif
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_UTIME_H
-# include <sys/utime.h>
-#else
-# include <utime.h>
-#endif
-#include <io.h>
-#include <malloc.h>
-#ifdef __MINGW32__
-# include <stdint.h>
-#else
-# if !defined(_INTPTR_T_DEFINED)
-#  ifdef _WIN64
-typedef __int64 intptr_t;
-#  else
-typedef int intptr_t;
-#  endif
-#  define _INTPTR_T_DEFINED
-# endif
-# if !defined(_UINTPTR_T_DEFINED)
-#  ifdef _WIN64
-typedef unsigned __int64 uintptr_t;
-#  else
-typedef unsigned int uintptr_t;
-#  endif
-#  define _UINTPTR_T_DEFINED
-# endif
-#endif
-#ifndef __MINGW32__
-# define mode_t int
-#endif
-
-#ifdef _M_IX86
-# define WIN95 1
-#else
-# undef  WIN95
-#endif
-
-#ifdef WIN95
-extern DWORD rb_w32_osid(void);
-#define rb_w32_iswinnt()  (rb_w32_osid() == VER_PLATFORM_WIN32_NT)
-#define rb_w32_iswin95()  (rb_w32_osid() == VER_PLATFORM_WIN32_WINDOWS)
-#else
-#define rb_w32_iswinnt()  TRUE
-#define rb_w32_iswin95()  FALSE
-#endif
-
-#define WNOHANG -1
-
-#undef getc
-#undef putc
-#undef fgetc
-#undef fputc
-#undef getchar
-#undef putchar
-#undef fgetchar
-#undef fputchar
-#undef utime
-#undef lseek
-#undef fstat
-#define getc(_stream)		rb_w32_getc(_stream)
-#define getchar()		rb_w32_getc(stdin)
-#define putc(_c, _stream)	rb_w32_putc(_c, _stream)
-#define putchar(_c)		rb_w32_putc(_c, stdout)
-#ifdef RUBY_EXPORT
-#define fgetc(_stream)		getc(_stream)
-#define fputc(_c, _stream)	putc(_c, _stream)
-#define fgetchar()		getchar()
-#define fputchar(_c)		putchar(_c)
-#define utime(_p, _t)		rb_w32_utime(_p, _t)
-#define lseek(_f, _o, _w)	_lseeki64(_f, _o, _w)
-
-#define pipe(p)			_pipe(p, 65536L, _O_NOINHERIT)
-#define close(h)		rb_w32_close(h)
-#define fclose(f)		rb_w32_fclose(f)
-#define read(f, b, s)		rb_w32_read(f, b, s)
-#define write(f, b, s)		rb_w32_write(f, b, s)
-#define getpid()		rb_w32_getpid()
-#define getppid()		rb_w32_getppid()
-#define sleep(x)		rb_w32_Sleep((x)*1000)
-#define Sleep(msec)		(void)rb_w32_Sleep(msec)
-#define fstat(fd,st)		_fstati64(fd,st)
-#ifdef __BORLANDC__
-#define creat(p, m)		_creat(p, m)
-#define eof()			_eof()
-#define filelength(h)		_filelength(h)
-#define mktemp(t)		_mktemp(t)
-#define tell(h)			_tell(h)
-#define _open			_sopen
-#define sopen			_sopen
-#define _fstati64(fd,st)	rb_w32_fstati64(fd,st)
-#undef fopen
-#define fopen(p, m)		rb_w32_fopen(p, m)
-#undef fdopen
-#define fdopen(h, m)		rb_w32_fdopen(h, m)
-#undef fsopen
-#define fsopen(p, m, sh)	rb_w32_fsopen(p, m, sh)
-#endif
-
-#undef execv
-#define execv(path,argv)	rb_w32_aspawn(P_OVERLAY,path,argv)
-#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
-#undef isatty
-#define isatty(h)		rb_w32_isatty(h)
-#endif
-
-#undef mkdir
-#define mkdir(p, m)		rb_w32_mkdir(p, m)
-#undef rmdir
-#define rmdir(p)		rb_w32_rmdir(p)
-#undef unlink
-#define unlink(p)		rb_w32_unlink(p)
-#endif
-
-#if SIZEOF_OFF_T == 8
-#define off_t __int64
-#define stat stati64
-#if defined(__BORLANDC__)
-#define stati64(path, st) rb_w32_stati64(path, st)
-#elif !defined(_MSC_VER) || _MSC_VER < 1400
-#define stati64 _stati64
-#define _stati64(path, st) rb_w32_stati64(path, st)
-#else
-#define stati64 _stat64
-#define _stat64(path, st) rb_w32_stati64(path, st)
-#endif
-#else
-#define stat(path,st)		rb_w32_stat(path,st)
-#define fstat(fd,st)		rb_w32_fstat(fd,st)
-extern int rb_w32_stat(const char *, struct stat *);
-extern int rb_w32_fstat(int, struct stat *);
-#endif
-
-#define strcasecmp		stricmp
-#define strncasecmp		strnicmp
-#define fsync			_commit
-
-#ifdef __MINGW32__
-struct timezone {
-  int tz_minuteswest;
-  int tz_dsttime;
-};
-#undef isascii
-#define isascii __isascii
-#endif
-#define NtInitialize ruby_sysinit
-extern int    rb_w32_cmdvector(const char *, char ***);
-extern rb_pid_t  rb_w32_pipe_exec(const char *, const char *, int, int *, int *);
-extern int    flock(int fd, int oper);
-extern int    rb_w32_is_socket(int);
-extern int    WSAAPI rb_w32_accept(int, struct sockaddr *, int *);
-extern int    WSAAPI rb_w32_bind(int, const struct sockaddr *, int);
-extern int    WSAAPI rb_w32_connect(int, const struct sockaddr *, int);
-extern void   rb_w32_fdset(int, fd_set*);
-extern void   rb_w32_fdclr(int, fd_set*);
-extern int    rb_w32_fdisset(int, fd_set*);
-extern int    WSAAPI rb_w32_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-extern int    WSAAPI rb_w32_getpeername(int, struct sockaddr *, int *);
-extern int    WSAAPI rb_w32_getsockname(int, struct sockaddr *, int *);
-extern int    WSAAPI rb_w32_getsockopt(int, int, int, char *, int *);
-extern int    WSAAPI rb_w32_ioctlsocket(int, long, u_long *);
-extern int    WSAAPI rb_w32_listen(int, int);
-extern int    WSAAPI rb_w32_recv(int, char *, int, int);
-extern int    WSAAPI rb_w32_recvfrom(int, char *, int, int, struct sockaddr *, int *);
-extern int    WSAAPI rb_w32_send(int, const char *, int, int);
-extern int    WSAAPI rb_w32_sendto(int, const char *, int, int, const struct sockaddr *, int);
-extern int    WSAAPI rb_w32_setsockopt(int, int, int, const char *, int);
-extern int    WSAAPI rb_w32_shutdown(int, int);
-extern int    WSAAPI rb_w32_socket(int, int, int);
-extern SOCKET rb_w32_get_osfhandle(int);
-extern struct hostent *WSAAPI rb_w32_gethostbyaddr(const char *, int, int);
-extern struct hostent *WSAAPI rb_w32_gethostbyname(const char *);
-extern int    WSAAPI rb_w32_gethostname(char *, int);
-extern struct protoent *WSAAPI rb_w32_getprotobyname(const char *);
-extern struct protoent *WSAAPI rb_w32_getprotobynumber(int);
-extern struct servent  *WSAAPI rb_w32_getservbyname(const char *, const char *);
-extern struct servent  *WSAAPI rb_w32_getservbyport(int, const char *);
-extern int    rb_w32_socketpair(int, int, int, int *);
-extern char * rb_w32_getcwd(char *, int);
-extern char * rb_w32_getenv(const char *);
-extern int    rb_w32_rename(const char *, const char *);
-extern char **rb_w32_get_environ(void);
-extern void   rb_w32_free_environ(char **);
-extern int    rb_w32_map_errno(DWORD);
-
-#define vsnprintf(s,n,f,l) rb_w32_vsnprintf(s,n,f,l)
-#define snprintf   rb_w32_snprintf
-extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list);
-extern int rb_w32_snprintf(char *, size_t, const char *, ...);
-
-extern int chown(const char *, int, int);
-extern int link(const char *, const char *);
-extern int gettimeofday(struct timeval *, struct timezone *);
-extern rb_pid_t waitpid (rb_pid_t, int *, int);
-extern int rb_w32_argv_size(char *const *);
-extern char *rb_w32_join_argv(char *, char *const *);
-extern rb_pid_t rb_w32_spawn(int, const char *, const char*);
-extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *);
-extern int kill(int, int);
-extern int fcntl(int, int, ...);
-extern rb_pid_t rb_w32_getpid(void);
-extern rb_pid_t rb_w32_getppid(void);
-#if !defined(__BORLANDC__) && !defined(_WIN32_WCE)
-extern int rb_w32_isatty(int);
-#endif
-extern int rb_w32_mkdir(const char *, int);
-extern int rb_w32_rmdir(const char *);
-extern int rb_w32_unlink(const char *);
-extern int rb_w32_stati64(const char *, struct stati64 *);
-
-#ifdef __BORLANDC__
-extern int rb_w32_fstati64(int, struct stati64 *);
-extern off_t _lseeki64(int, off_t, int);
-extern FILE *rb_w32_fopen(const char *, const char *);
-extern FILE *rb_w32_fdopen(int, const char *);
-extern FILE *rb_w32_fsopen(const char *, const char *, int);
-#endif
-
-#include <float.h>
-#if !defined __MINGW32__ || defined __NO_ISOCEXT
-#ifndef isnan
-#define isnan(x) _isnan(x)
-#endif
-#ifndef finite
-#define finite(x) _finite(x)
-#endif
-#ifndef copysign
-#define copysign(a, b) _copysign(a, b)
-#endif
-#ifndef scalb
-#define scalb(a, b) _scalb(a, b)
-#endif
-#endif
-
-#if !defined S_IFIFO && defined _S_IFIFO
-#define S_IFIFO _S_IFIFO
-#endif
-
-#if 0 && defined __BORLANDC__
-#undef S_ISDIR
-#undef S_ISFIFO
-#undef S_ISBLK
-#undef S_ISCHR
-#undef S_ISREG
-#define S_ISDIR(m)  (((unsigned short)(m) & S_IFMT) == S_IFDIR)
-#define S_ISFIFO(m) (((unsigned short)(m) & S_IFMT) == S_IFIFO)
-#define S_ISBLK(m)  (((unsigned short)(m) & S_IFMT) == S_IFBLK)
-#define S_ISCHR(m)  (((unsigned short)(m) & S_IFMT) == S_IFCHR)
-#define S_ISREG(m)  (((unsigned short)(m) & S_IFMT) == S_IFREG)
-#endif
-
-#if !defined S_IRUSR && !defined __MINGW32__
-#define S_IRUSR 0400
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0040
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0004
-#endif
-
-#if !defined S_IWUSR && !defined __MINGW32__
-#define S_IWUSR 0200
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0020
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0002
-#endif
-
-#if !defined S_IXUSR && !defined __MINGW32__
-#define S_IXUSR 0100
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0010
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0001
-#endif
-
-//
-// define this so we can do inplace editing
-//
-
-#define SUFFIX
-extern int       truncate(const char *path, off_t length);
-extern int       ftruncate(int fd, off_t length);
-extern int       fseeko(FILE *stream, off_t offset, int whence);
-extern off_t     ftello(FILE *stream);
-
-//
-// stubs
-//
-extern int       ioctl (int, int, ...);
-extern rb_uid_t  getuid (void);
-extern rb_uid_t  geteuid (void);
-extern rb_gid_t  getgid (void);
-extern rb_gid_t  getegid (void);
-extern int       setuid (rb_uid_t);
-extern int       setgid (rb_gid_t);
-
-extern char *rb_w32_strerror(int);
-
-#ifdef RUBY_EXPORT
-#define strerror(e) rb_w32_strerror(e)
-#endif
-
-#define PIPE_BUF 1024
-
-#define LOCK_SH 1
-#define LOCK_EX 2
-#define LOCK_NB 4
-#define LOCK_UN 8
-
-
-#ifndef SIGINT
-#define SIGINT 2
-#endif
-#ifndef SIGKILL
-#define SIGKILL	9
-#endif
-
-
-/* #undef va_start */
-/* #undef va_end */
-
-/* winsock error map */
-#define EWOULDBLOCK	WSAEWOULDBLOCK
-#define EINPROGRESS	WSAEINPROGRESS
-#define EALREADY	WSAEALREADY
-#define ENOTSOCK	WSAENOTSOCK
-#define EDESTADDRREQ	WSAEDESTADDRREQ
-#define EMSGSIZE	WSAEMSGSIZE
-#define EPROTOTYPE	WSAEPROTOTYPE
-#define ENOPROTOOPT	WSAENOPROTOOPT
-#define EPROTONOSUPPORT	WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP	WSAEOPNOTSUPP
-#define EPFNOSUPPORT	WSAEPFNOSUPPORT
-#define EAFNOSUPPORT	WSAEAFNOSUPPORT
-#define EADDRINUSE	WSAEADDRINUSE
-#define EADDRNOTAVAIL	WSAEADDRNOTAVAIL
-#define ENETDOWN	WSAENETDOWN
-#define ENETUNREACH	WSAENETUNREACH
-#define ENETRESET	WSAENETRESET
-#define ECONNABORTED	WSAECONNABORTED
-#define ECONNRESET	WSAECONNRESET
-#define ENOBUFS		WSAENOBUFS
-#define EISCONN		WSAEISCONN
-#define ENOTCONN	WSAENOTCONN
-#define ESHUTDOWN	WSAESHUTDOWN
-#define ETOOMANYREFS	WSAETOOMANYREFS
-#define ETIMEDOUT	WSAETIMEDOUT
-#define ECONNREFUSED	WSAECONNREFUSED
-#define ELOOP		WSAELOOP
-/*#define ENAMETOOLONG	WSAENAMETOOLONG*/
-#define EHOSTDOWN	WSAEHOSTDOWN
-#define EHOSTUNREACH	WSAEHOSTUNREACH
-/*#define ENOTEMPTY	WSAENOTEMPTY*/
-#define EPROCLIM	WSAEPROCLIM
-#define EUSERS		WSAEUSERS
-#define EDQUOT		WSAEDQUOT
-#define ESTALE		WSAESTALE
-#define EREMOTE		WSAEREMOTE
-
-#define F_SETFL 1
-#define O_NONBLOCK 1
-
-#undef FD_SET
-#define FD_SET(f, s)		rb_w32_fdset(f, s)
-
-#undef FD_CLR
-#define FD_CLR(f, s)		rb_w32_fdclr(f, s)
-
-#undef FD_ISSET
-#define FD_ISSET(f, s)		rb_w32_fdisset(f, s)
-
-#ifdef RUBY_EXPORT
-#undef accept
-#define accept(s, a, l)		rb_w32_accept(s, a, l)
-
-#undef bind
-#define bind(s, a, l)		rb_w32_bind(s, a, l)
-
-#undef connect
-#define connect(s, a, l)	rb_w32_connect(s, a, l)
-
-#undef select
-#define select(n, r, w, e, t)	rb_w32_select(n, r, w, e, t)
-
-#undef getpeername
-#define getpeername(s, a, l)	rb_w32_getpeername(s, a, l)
-
-#undef getsockname
-#define getsockname(s, a, l)	rb_w32_getsockname(s, a, l)
-
-#undef getsockopt
-#define getsockopt(s, v, n, o, l) rb_w32_getsockopt(s, v, n, o, l)
-
-#undef ioctlsocket
-#define ioctlsocket(s, c, a)	rb_w32_ioctlsocket(s, c, a)
-
-#undef listen
-#define listen(s, b)		rb_w32_listen(s, b)
-
-#undef recv
-#define recv(s, b, l, f)	rb_w32_recv(s, b, l, f)
-
-#undef recvfrom
-#define recvfrom(s, b, l, f, fr, frl) rb_w32_recvfrom(s, b, l, f, fr, frl)
-
-#undef send
-#define send(s, b, l, f)	rb_w32_send(s, b, l, f)
-
-#undef sendto
-#define sendto(s, b, l, f, t, tl) rb_w32_sendto(s, b, l, f, t, tl)
-
-#undef setsockopt
-#define setsockopt(s, v, n, o, l) rb_w32_setsockopt(s, v, n, o, l)
-
-#undef shutdown
-#define shutdown(s, h)		rb_w32_shutdown(s, h)
-
-#undef socket
-#define socket(s, t, p)		rb_w32_socket(s, t, p)
-
-#undef gethostbyaddr
-#define gethostbyaddr(a, l, t)	rb_w32_gethostbyaddr(a, l, t)
-
-#undef gethostbyname
-#define gethostbyname(n)	rb_w32_gethostbyname(n)
-
-#undef gethostname
-#define gethostname(n, l)	rb_w32_gethostname(n, l)
-
-#undef getprotobyname
-#define getprotobyname(n)	rb_w32_getprotobyname(n)
-
-#undef getprotobynumber
-#define getprotobynumber(n)	rb_w32_getprotobynumber(n)
-
-#undef getservbyname
-#define getservbyname(n, p)	rb_w32_getservbyname(n, p)
-
-#undef getservbyport
-#define getservbyport(p, pr)	rb_w32_getservbyport(p, pr)
-
-#undef socketpair
-#define socketpair(a, t, p, s)	rb_w32_socketpair(a, t, p, s)
-
-#undef get_osfhandle
-#define get_osfhandle(h)	rb_w32_get_osfhandle(h)
-
-#undef getcwd
-#define getcwd(b, s)		rb_w32_getcwd(b, s)
-
-#undef getenv
-#define getenv(n)		rb_w32_getenv(n)
-
-#undef rename
-#define rename(o, n)		rb_w32_rename(o, n)
-
-#undef times
-#define times(t)		rb_w32_times(t)
-#endif
-
-struct tms {
-	long	tms_utime;
-	long	tms_stime;
-	long	tms_cutime;
-	long	tms_cstime;
-};
-
-int rb_w32_times(struct tms *);
-
-/* thread stuff */
-HANDLE GetCurrentThreadHandle(void);
-int  rb_w32_sleep(unsigned long msec);
-int  rb_w32_putc(int, FILE*);
-int  rb_w32_getc(FILE*);
-int  rb_w32_close(int);
-int  rb_w32_fclose(FILE*);
-size_t rb_w32_read(int, void *, size_t);
-size_t rb_w32_write(int, const void *, size_t);
-int  rb_w32_utime(const char *, const struct utimbuf *);
-int  WINAPI rb_w32_Sleep(unsigned long msec);
-int  rb_w32_wait_events_blocking(HANDLE *events, int num, DWORD timeout);
-
-/*
-== ***CAUTION***
-Since this function is very dangerous, ((*NEVER*))
-* lock any HANDLEs(i.e. Mutex, Semaphore, CriticalSection and so on) or,
-* use anything like TRAP_BEG...TRAP_END block structure,
-in asynchronous_func_t.
-*/
-typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
-uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_WIN32_H */
diff --git a/include/rubyio.h b/include/rubyio.h
deleted file mode 100644
index 59ecedca96..0000000000
--- a/include/rubyio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ruby/io.h"
diff --git a/include/rubysig.h b/include/rubysig.h
deleted file mode 100644
index 9546127938..0000000000
--- a/include/rubysig.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ruby/signal.h"
diff --git a/inits.c b/inits.c
index 5e55d7f69d..947bbbe242 100644
--- a/inits.c
+++ b/inits.c
@@ -3,76 +3,63 @@
   inits.c -
 
   $Author$
+  $Date$
   created at: Tue Dec 28 16:01:58 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "ruby.h"
 
-void Init_Array(void);
-void Init_Bignum(void);
-void Init_Binding(void);
-void Init_Comparable(void);
-void Init_Complex(void);
-void Init_transcode(void);
-void Init_Dir(void);
-void Init_Enumerable(void);
-void Init_Enumerator(void);
-void Init_Exception(void);
-void Init_syserr(void);
-void Init_eval(void);
-void Init_load(void);
-void Init_Proc(void);
-void Init_File(void);
-void Init_GC(void);
-void Init_Hash(void);
-void Init_IO(void);
-void Init_Math(void);
-void Init_marshal(void);
-void Init_Numeric(void);
-void Init_Object(void);
-void Init_pack(void);
-void Init_Precision(void);
-void Init_sym(void);
-void Init_id(void);
-void Init_process(void);
-void Init_RandomSeed(void);
-void Init_Random(void);
-void Init_Range(void);
-void Init_Rational(void);
-void Init_Regexp(void);
-void Init_signal(void);
-void Init_String(void);
-void Init_Struct(void);
-void Init_Time(void);
-void Init_var_tables(void);
-void Init_version(void);
-void Init_ISeq(void);
-void Init_VM(void);
-void Init_Thread(void);
-void Init_Cont(void);
-void Init_top_self(void);
-void Init_Encoding(void);
+void Init_Array _((void));
+void Init_Bignum _((void));
+void Init_Binding _((void));
+void Init_Comparable _((void));
+void Init_Dir _((void));
+void Init_Enumerable _((void));
+void Init_Enumerator _((void));
+void Init_Exception _((void));
+void Init_syserr _((void));
+void Init_eval _((void));
+void Init_load _((void));
+void Init_Proc _((void));
+void Init_Thread _((void));
+void Init_File _((void));
+void Init_GC _((void));
+void Init_Hash _((void));
+void Init_IO _((void));
+void Init_Math _((void));
+void Init_marshal _((void));
+void Init_Numeric _((void));
+void Init_Object _((void));
+void Init_pack _((void));
+void Init_Precision _((void));
+void Init_sym _((void));
+void Init_process _((void));
+void Init_Random _((void));
+void Init_Range _((void));
+void Init_Regexp _((void));
+void Init_signal _((void));
+void Init_String _((void));
+void Init_Struct _((void));
+void Init_Time _((void));
+void Init_var_tables _((void));
+void Init_version _((void));
 
 void
 rb_call_inits()
 {
-    Init_RandomSeed();
     Init_sym();
-    Init_id();
     Init_var_tables();
     Init_Object();
-    Init_top_self();
-    Init_Encoding();
     Init_Comparable();
     Init_Enumerable();
     Init_Precision();
+    Init_eval();
     Init_String();
     Init_Exception();
-    Init_eval();
-    Init_jump();
+    Init_Thread();
     Init_Numeric();
     Init_Bignum();
     Init_syserr();
@@ -81,8 +68,6 @@ rb_call_inits()
     Init_Struct();
     Init_Regexp();
     Init_pack();
-    Init_transcode();
-    Init_marshal();
     Init_Range();
     Init_IO();
     Init_Dir();
@@ -96,11 +81,6 @@ rb_call_inits()
     Init_Math();
     Init_GC();
     Init_Enumerator();
-    Init_VM();
-    Init_ISeq();
-    Init_Thread();
-    Init_Cont();
-    Init_Rational();
-    Init_Complex();
+    Init_marshal();
     Init_version();
 }
diff --git a/insnhelper.h b/insnhelper.h
deleted file mode 100644
index a862f2672e..0000000000
--- a/insnhelper.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/**********************************************************************
-
-  insnhelper.h - helper macros to implement each instructions
-
-  $Author$
-  created at: 04/01/01 15:50:34 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-
-**********************************************************************/
-
-#ifndef RUBY_INSNHELPER_H
-#define RUBY_INSNHELPER_H
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-#include "eval_intern.h"
-#include "vm_core.h"
-#include "vm.h"
-
-/**********************************************************/
-/* deal with stack                                        */
-/**********************************************************/
-
-#define PUSH(x) (SET_SV(x), INC_SP(1))
-#define TOPN(n) (*(GET_SP()-(n)-1))
-#define POPN(n) (DEC_SP(n))
-#define POP()   (DEC_SP(1))
-#define STACK_ADDR_FROM_TOP(n) (GET_SP()-(n))
-
-#define GET_TOS()  (tos)	/* dummy */
-
-/**********************************************************/
-/* deal with registers                                    */
-/**********************************************************/
-
-#define REG_CFP (reg_cfp)
-#define REG_PC  (REG_CFP->pc)
-#define REG_SP  (REG_CFP->sp)
-#define REG_LFP (REG_CFP->lfp)
-#define REG_DFP (REG_CFP->dfp)
-
-#define RESTORE_REGS() do { \
-  REG_CFP = th->cfp; \
-} while (0)
-
-#define REG_A   reg_a
-#define REG_B   reg_b
-
-#ifdef COLLECT_USAGE_ANALYSIS
-#define USAGE_ANALYSIS_REGISTER_HELPER(a, b, v) \
-  (USAGE_ANALYSIS_REGISTER(a, b), (v))
-#else
-#define USAGE_ANALYSIS_REGISTER_HELPER(a, b, v) (v)
-#endif
-
-/* PC */
-#define GET_PC()           (USAGE_ANALYSIS_REGISTER_HELPER(0, 0, REG_PC))
-#define SET_PC(x)          (REG_PC = (USAGE_ANALYSIS_REGISTER_HELPER(0, 1, x)))
-#define GET_CURRENT_INSN() (*GET_PC())
-#define GET_OPERAND(n)     (GET_PC()[(n)])
-#define ADD_PC(n)          (SET_PC(REG_PC + (n)))
-
-#define GET_PC_COUNT()     (REG_PC - GET_ISEQ()->iseq_encoded)
-#define JUMP(dst)          (REG_PC += (dst))
-
-/* FP */
-#define GET_CFP()  (USAGE_ANALYSIS_REGISTER_HELPER(2, 0, REG_CFP))
-#define GET_LFP()  (USAGE_ANALYSIS_REGISTER_HELPER(3, 0, REG_LFP))
-#define SET_LFP(x) (REG_LFP = (USAGE_ANALYSIS_REGISTER_HELPER(3, 1, (x))))
-#define GET_DFP()  (USAGE_ANALYSIS_REGISTER_HELPER(4, 0, REG_DFP))
-#define SET_DFP(x) (REG_DFP = (USAGE_ANALYSIS_REGISTER_HELPER(4, 1, (x))))
-
-/* SP */
-#define GET_SP()   (USAGE_ANALYSIS_REGISTER_HELPER(1, 0, REG_SP))
-#define SET_SP(x)  (REG_SP  = (USAGE_ANALYSIS_REGISTER_HELPER(1, 1, (x))))
-#define INC_SP(x)  (REG_SP += (USAGE_ANALYSIS_REGISTER_HELPER(1, 1, (x))))
-#define DEC_SP(x)  (REG_SP -= (USAGE_ANALYSIS_REGISTER_HELPER(1, 1, (x))))
-#define SET_SV(x)  (*GET_SP() = (x))
-  /* set current stack value as x */
-
-#define GET_SP_COUNT() (REG_SP - th->stack)
-
-/* instruction sequence C struct */
-#define GET_ISEQ() (GET_CFP()->iseq)
-
-/**********************************************************/
-/* deal with variables                                    */
-/**********************************************************/
-
-#define GET_PREV_DFP(dfp)                ((VALUE *)((dfp)[0] & ~0x03))
-
-#define GET_GLOBAL(entry)       rb_gvar_get((struct global_entry*)entry)
-#define SET_GLOBAL(entry, val)  rb_gvar_set((struct global_entry*)entry, val)
-
-#define GET_CONST_INLINE_CACHE(dst) ((IC) * (GET_PC() + (dst) + 1))
-
-/**********************************************************/
-/* deal with values                                       */
-/**********************************************************/
-
-#define GET_SELF() (USAGE_ANALYSIS_REGISTER_HELPER(5, 0, GET_CFP()->self))
-
-/**********************************************************/
-/* deal with control flow 2: method/iterator              */
-/**********************************************************/
-
-#define COPY_CREF(c1, c2) do {  \
-  NODE *__tmp_c2 = (c2); \
-  c1->nd_clss = __tmp_c2->nd_clss; \
-  c1->nd_visi = __tmp_c2->nd_visi; \
-  c1->nd_next = __tmp_c2->nd_next; \
-} while (0)
-
-#define CALL_METHOD(num, blockptr, flag, id, mn, recv, klass) do { \
-    VALUE v = vm_call_method(th, GET_CFP(), num, blockptr, flag, id, mn, recv, klass); \
-    if (v == Qundef) { \
-	RESTORE_REGS(); \
-	NEXT_INSN(); \
-    } \
-    else { \
-	val = v; \
-    } \
-} while (0)
-
-#define GET_BLOCK_PTR() \
-  ((rb_block_t *)(GC_GUARDED_PTR_REF(GET_LFP()[0])))
-
-/**********************************************************/
-/* deal with control flow 3: exception                    */
-/**********************************************************/
-
-
-/**********************************************************/
-/* others                                                 */
-/**********************************************************/
-
-/* optimize insn */
-#define FIXNUM_2_P(a, b) ((a) & (b) & 1)
-#define BASIC_OP_UNREDEFINED_P(op) ((ruby_vm_redefined_flag & (op)) == 0)
-#define HEAP_CLASS_OF(obj) RBASIC(obj)->klass
-
-#define CALL_SIMPLE_METHOD(num, id, recv) do { \
-    VALUE klass = CLASS_OF(recv); \
-    CALL_METHOD(num, 0, 0, id, rb_method_node(klass, id), recv, CLASS_OF(recv)); \
-} while (0)
-
-#endif /* RUBY_INSNHELPER_H */
diff --git a/insns.def b/insns.def
deleted file mode 100644
index a695630ea6..0000000000
--- a/insns.def
+++ /dev/null
@@ -1,2035 +0,0 @@
-/** ##skip -*- mode:c; style:ruby -*-
-  insns.def - YARV instruction definitions
-
-  $Author: $
-  created at: 04/01/01 01:17:55 JST
-
-  Copyright (C) 2004-2007 Koichi Sasada
-*/
-
-/** ##skip
-  instruction comment
-  @c: category
-  @e: english description
-  @j: japanese description
-
-  instruction form:
-    DEFINE_INSN
-    instrunction_name
-    (instruction_operands, ..)
-    (pop_values, ..)
-    (return value)
-    {
-       .. // insn body
-    }
-
- */
-
-
-/**
-  @c nop
-  @e nop
-  @j nop
- */
-DEFINE_INSN
-nop
-()
-()
-()
-{
-    /* none */
-}
-
-/**********************************************************/
-/* deal with variables                                    */
-/**********************************************************/
-
-/**
-  @c variable
-  @e get local variable value (which is pointed by idx).
-  @j idx �Ŏw�肳�ꂽ���[�J���ϐ����X�^�b�N�ɒu���B
- */
-DEFINE_INSN
-getlocal
-(lindex_t idx)
-()
-(VALUE val)
-{
-    val = *(GET_LFP() - idx);
-}
-
-/**
-  @c variable
-  @e set local variable value (which is pointed by idx) as val.
-  @j idx �Ŏw�肳�ꂽ���[�J���ϐ��� val �ɐݒ肷��B
- */
-DEFINE_INSN
-setlocal
-(lindex_t idx)
-(VALUE val)
-()
-{
-    (*(GET_LFP() - idx)) = val;
-}
-
-/**
-  @c variable
-  @e get special local variable ($~, $_, ..) value.
-  @j ����ȃ��[�J���ϐ��i$~, $_, ...�j�̒l�𓾂�B
- */
-DEFINE_INSN
-getspecial
-(VALUE key, rb_num_t type)
-()
-(VALUE val)
-{
-    val = vm_getspecial(th, GET_LFP(), key, type);
-}
-
-/**
-  @c variable
-  @e set special local variable ($~, $_, ...) value as obj.
-  @j ���ʂȃ��[�J���ϐ��i$~, $_, ...�j�̒l����ݒ肷��B
- */
-DEFINE_INSN
-setspecial
-(VALUE key)
-(VALUE obj)
-()
-{
-    lfp_svar_set(th, GET_LFP(), key, obj);
-}
-
-/**
-  @c variable
-  @e get block local variable(which is pointed by idx and level).
-     level means nest level of block, and specify how above this variable.
-  @j level, idx �Ŏw�肳�ꂽ�u���b�N���[�J���ϐ��̒l���X�^�b�N�ɒu���B
-     level �̓u���b�N�̃l�X�g���x���ŁA���i�ォ�������B
- */
-DEFINE_INSN
-getdynamic
-(dindex_t idx, rb_num_t level)
-()
-(VALUE val)
-{
-    int i;
-    VALUE *dfp2 = GET_DFP();
-    for (i = 0; i < level; i++) {
-	dfp2 = GET_PREV_DFP(dfp2);
-    }
-    val = *(dfp2 - idx);
-}
-
-/**
-  @c variable
-  @e set block local variable(which is pointed by 'idx') as val.
-     level means nest level of block, and specify how above this variable.
-  @j level, idx �Ŏw�肳�ꂽ�u���b�N���[�J���ϐ��̒l�� val �ɂ���B
-     level �̓u���b�N�̃l�X�g���x���ŁA���i�ォ�������B
- */
-DEFINE_INSN
-setdynamic
-(dindex_t idx, rb_num_t level)
-(VALUE val)
-()
-{
-    int i;
-    VALUE *dfp2 = GET_DFP();
-    for (i = 0; i < level; i++) {
-	dfp2 = GET_PREV_DFP(dfp2);
-    }
-    *(dfp2 - idx) = val;
-}
-
-/**
-  @c variable
-  @e get instance variable id of obj.
-     if is_local is not 0, search as class local variable.
-  @j self �̃C���X�^���X�ϐ� id �̒l�𓾂�B
- */
-DEFINE_INSN
-getinstancevariable
-(ID id)
-()
-(VALUE val)
-{
-    val = rb_ivar_get(GET_SELF(), id);
-}
-
-/**
-  @c variable
-  @e set instance variable id of obj as val.
-     if is_local is not 0, search as class local variable.
-  @j self �̃C���X�^���X�ϐ� id �� val �ɂ���B
- */
-DEFINE_INSN
-setinstancevariable
-(ID id)
-(VALUE val)
-()
-{
-    rb_ivar_set(GET_SELF(), id, val);
-}
-
-/**
-  @c variable
-  @e get class variable id of klass as val.
-  @j ���݂̃X�R�[�v�̃N���X�ϐ� id �̒l�𓾂�B
- */
-DEFINE_INSN
-getclassvariable
-(ID id)
-()
-(VALUE val)
-{
-    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
-    val = rb_cvar_get(vm_get_cvar_base(cref), id);
-}
-
-/**
-  @c variable
-  @e set class variable id of klass as val.
-  @j klass �̃N���X�ϐ� id �� val �ɂ���B
- */
-DEFINE_INSN
-setclassvariable
-(ID id)
-(VALUE val)
-()
-{
-    NODE * const cref = vm_get_cref(GET_ISEQ(), GET_LFP(), GET_DFP());
-    rb_cvar_set(vm_get_cvar_base(cref), id, val);
-}
-
-/**
-  @c variable
-  @e
-   get constant variable id. if klass is Qnil, constant
-   are searched in current scope. if klass is Qfalse, constant as
-   top level constant. otherwise, get constant under klass
-   class or module.
-  @j �萔 id �̒l�𓾂�B
-   klass �� Qnil �Ȃ�A���̃X�R�[�v�œ�����萔�̒l�𓾂�B
-   Qfalse �Ȃ�A�g�b�v���x���X�R�[�v�𓾂�B
-   ����ȊO�Ȃ�Aklass �N���X�̉��̒萔�𓾂�B
- */
-DEFINE_INSN
-getconstant
-(ID id)
-(VALUE klass)
-(VALUE val)
-{
-    val = vm_get_ev_const(th, GET_ISEQ(), klass, id, 0);
-}
-
-/**
-  @c variable
-  @e
-   set constant variable id. if klass is Qfalse, constant
-   is able to access in this scope. if klass is Qnil, set
-   top level constant. otherwise, set constant under klass
-   class or module.
-
-  @j �萔 id �̒l�� val �ɂ���B
-   klass �� Qfalse �Ȃ�A���̃X�R�[�v�œ�����萔 id �̒l��ݒ肷��B
-   Qnil �Ȃ�A�g�b�v���x���X�R�[�v�̒l��ݒ肷��B
-   ����ȊO�Ȃ�Aklass �N���X�̉��̒萔��ݒ肷��B
- */
-DEFINE_INSN
-setconstant
-(ID id)
-(VALUE val, VALUE cbase)
-()
-{
-    vm_check_if_namespace(cbase);
-    rb_const_set(cbase, id, val);
-    INC_VM_STATE_VERSION();
-}
-
-/**
-  @c variable
-  @e get global variable id.
-  @j �O���[�o���ϐ� id �̒l�𓾂�B
- */
-DEFINE_INSN
-getglobal
-(GENTRY entry)
-()
-(VALUE val)
-{
-    val = GET_GLOBAL(entry);
-}
-
-/**
-  @c variable
-  @e set global variable id as val.
-  @j �O���[�o���ϐ� id �̒l��ݒ肷��B
- */
-DEFINE_INSN
-setglobal
-(GENTRY entry)
-(VALUE val)
-()
-{
-    SET_GLOBAL(entry, val);
-}
-
-
-/**********************************************************/
-/* deal with values                                       */
-/**********************************************************/
-
-/**
-  @c put
-  @e put nil to stack.
-  @j �X�^�b�N�� nil ���v�b�V������B
- */
-DEFINE_INSN
-putnil
-()
-()
-(VALUE val)
-{
-    val = Qnil;
-}
-
-/**
-  @c put
-  @e put self.
-  @j �X�^�b�N�� self ���v�b�V������B
- */
-DEFINE_INSN
-putself
-()
-()
-(VALUE val)
-{
-    val = GET_SELF();
-}
-
-/**
-  @c put
-  @e put some object.
-     i.e. Fixnum, true, false, nil, and so on.
-  @j �I�u�W�F�N�g val ���X�^�b�N�Ƀv�b�V������B
-     i.e. Fixnum, true, false, nil, and so on.
- */
-DEFINE_INSN
-putobject
-(VALUE val)
-()
-(VALUE val)
-{
-    /* */
-}
-
-/**
-  @c put
-  @e put special object.  "value_type" is for expansion.
-  @j ���ʂȃI�u�W�F�N�g val ���X�^�b�N�Ƀv�b�V������B
-     �I�u�W�F�N�g�̎�ނ� value_type �ɂ��D
- */
-DEFINE_INSN
-putspecialobject
-(rb_num_t value_type)
-()
-(VALUE val)
-{
-    switch (value_type) {
-      case VM_SPECIAL_OBJECT_VMCORE:
-	val = rb_mRubyVMFrozenCore;
-	break;
-      case VM_SPECIAL_OBJECT_CBASE:
-	val = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
-	break;
-      default:
-	rb_bug("putspecialobject insn: unknown value_type");
-    }
-}
-
-/**
-  @c put
-  @e put iseq value.
-  @j put iseq value.
- */
-DEFINE_INSN
-putiseq
-(ISEQ iseq)
-()
-(VALUE ret)
-{
-    ret = iseq->self;
-}
-
-/**
-  @c put
-  @e put string val. string will be copied.
-  @j ����������R�s�[���ăX�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-putstring
-(VALUE str)
-()
-(VALUE val)
-{
-    val = rb_str_new3(str);
-}
-
-/**
-  @c put
-  @e put concatenate strings
-  @j �X�^�b�N�g�b�v�̕������ n �A�����C���ʂ��X�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-concatstrings
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
-    int i;
-
-    val = rb_str_new(0, 0);
-    for (i = num - 1; i >= 0; i--) {
-	const VALUE v = TOPN(i);
-	rb_str_append(val, v);
-    }
-    POPN(num);
-}
-
-/**
-  @c put
-  @e to_str
-  @j to_str �̌��ʂ��X�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-tostring
-()
-(VALUE val)
-(VALUE val)
-{
-    val = rb_obj_as_string(val);
-}
-
-/**
-  @c put
-  @e to Regexp
-  @j ������ str �𐳋K�\���ɃR���p�C�����ăX�^�b�N�Ƀv�b�V������B
-     �R���p�C�����Copt �𐳋K�\���̃I�v�V�����Ƃ���B
- */
-DEFINE_INSN
-toregexp
-(rb_num_t opt, rb_num_t cnt)
-(...)
-(VALUE val) // inc += 1 - cnt;
-{
-    VALUE rb_reg_new_ary(VALUE ary, int options);
-    int i;
-    const VALUE ary = rb_ary_new2(cnt);
-    RBASIC(ary)->klass = 0;
-    for (i = 0; i < cnt; i++) {
-        rb_ary_store(ary, cnt-i-1, TOPN(i));
-    }
-    POPN(cnt);
-    val = rb_reg_new_ary(ary, opt);
-}
-
-/**
-  @c put
-  @e put new array.
-  @j �V�����z����X�^�b�N��� num �̒l�ŏ��������Đ������v�b�V������B
- */
-DEFINE_INSN
-newarray
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
-    val = rb_ary_new4((long)num, STACK_ADDR_FROM_TOP(num));
-    POPN(num);
-}
-
-/**
-  @c put
-  @e dup array
-  @j �z�� ary �� dup ���ăX�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-duparray
-(VALUE ary)
-()
-(VALUE val)
-{
-    val = rb_ary_dup(ary);
-}
-
-/**
-  @c put
-  @e expand array to num objects.
-  @j �X�^�b�N�g�b�v�̃I�u�W�F�N�g���z��ł���΁A�����W�J����B
-     �z��I�u�W�F�N�g�̗v�f���� num�ȉ��Ȃ�΁A����� nil ��ςށBnum�ȏ�Ȃ�A
-     num�ȏ�̗v�f�͐؂�̂Ă�B
-     �z��I�u�W�F�N�g�łȂ���΁Anum - 1 �� nil ��ςށB
-     ���� flag ���^�Ȃ�A�c��v�f�̔z���ς�
-     flag: 0x01 - �Ō��z���
-     flag: 0x02 - postarg �p
-     flag: 0x04 - reverse?
- */
-DEFINE_INSN
-expandarray
-(rb_num_t num, rb_num_t flag)
-(..., VALUE ary)
-(...) // inc += num - 1 + (flag & 1 ? 1 : 0);
-{
-    vm_expandarray(GET_CFP(), ary, num, flag);
-}
-
-/**
-  @c put
-  @e concat two arrays
-  @j ��̔z�� ary1, ary2 ��A�����X�^�b�N�փv�b�V������B
- */
-DEFINE_INSN
-concatarray
-()
-(VALUE ary1, VALUE ary2st)
-(VALUE ary)
-{
-    const VALUE ary2 = ary2st;
-    VALUE tmp1 = rb_check_convert_type(ary1, T_ARRAY, "Array", "to_a");
-    VALUE tmp2 = rb_check_convert_type(ary2, T_ARRAY, "Array", "to_a");
-
-    if (NIL_P(tmp1)) {
-	tmp1 = rb_ary_new3(1, ary1);
-    }
-
-    if (NIL_P(tmp2)) {
-	tmp2 = rb_ary_new3(1, ary2);
-    }
-
-    if (tmp1 == ary1) {
-	tmp1 = rb_ary_dup(ary1);
-    }
-    ary = rb_ary_concat(tmp1, tmp2);
-}
-
-/**
-  @c put
-  @e splat array
-  @j �z�� ary �ɑ΂��� to_a ���Ăяo���B
- */
-DEFINE_INSN
-splatarray
-(VALUE flag)
-(VALUE ary)
-(VALUE obj)
-{
-    VALUE tmp = rb_check_convert_type(ary, T_ARRAY, "Array", "to_a");
-    if (NIL_P(tmp)) {
-	tmp = rb_ary_new3(1, ary);
-    }
-    obj = tmp;
-}
-
-/**
-  @c put
-  @e check value is included in ary
-  @j �z�� ary �ɗv�f obj �������Ă��邩�ǂ����`�F�b�N�Bcase/when �ŗ��p����B
- */
-DEFINE_INSN
-checkincludearray
-(VALUE flag)
-(VALUE obj, VALUE ary)
-(VALUE obj, VALUE result)
-{
-    int i;
-    result = Qfalse;
-
-    if (TYPE(ary) != T_ARRAY) {
-	ary = rb_Array(ary);
-    }
-
-    if (flag == Qtrue) {
-	/* NODE_CASE */
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    /* TODO: fix me (use another method dispatch) */
-	    if (RTEST(rb_funcall2(RARRAY_PTR(ary)[i], idEqq, 1, &obj))) {
-		result = Qtrue;
-		break;
-	    }
-	}
-    }
-    else {
-	obj = Qfalse;
-	/* NODE_WHEN */
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    if (RTEST(RARRAY_PTR(ary)[i])) {
-		obj = result = Qtrue;
-		break;
-	    }
-	}
-    }
-}
-
-/**
-  @c put
-  @e put new Hash.
-  @j �V�����n�b�V�����X�^�b�N�g�b�v�� n �������l�Ƃ��Đ�������B
-     n �̓L�[�ƒl�̃y�A�Ȃ̂� 2 �̔{���łȂ���΂Ȃ�Ȃ��B
- */
-DEFINE_INSN
-newhash
-(rb_num_t num)
-(...)
-(VALUE val) // inc += 1 - num;
-{
-    int i;
-    val = rb_hash_new();
-
-    for (i = num; i > 0; i -= 2) {
-	const VALUE v = TOPN(i - 2);
-	const VALUE k = TOPN(i - 1);
-	rb_hash_aset(val, k, v);
-    }
-    POPN(num);
-}
-
-/**
-  @c put
-  @e put new Range object.(Range.new(low, high, flag))
-  @j Range.new(low, high, flag) �̂悤�ȃI�u�W�F�N�g�𐶐����X�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-newrange
-(rb_num_t flag)
-(VALUE low, VALUE high)
-(VALUE val)
-{
-    val = rb_range_new(low, high, flag);
-}
-
-/**********************************************************/
-/* deal with stack operation                              */
-/**********************************************************/
-
-/**
-  @c stack
-  @e pop from stack.
-  @j �X�^�b�N�����|�b�v����B
- */
-DEFINE_INSN
-pop
-()
-(VALUE val)
-()
-{
-    val = val;
-    /* none */
-}
-
-/**
-  @c stack
-  @e duplicate stack top.
-  @j �X�^�b�N�g�b�v���R�s�[���ăX�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-dup
-()
-(VALUE val)
-(VALUE val1, VALUE val2)
-{
-    val1 = val2 = val;
-}
-
-/**
-  @c stack
-  @e duplicate stack top n elements
-  @j �X�^�b�N�g�b�v�� n ���R�s�[���ăX�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-dupn
-(rb_num_t n)
-(...)
-(...) // inc += n;
-{
-    int i;
-    VALUE *sp = STACK_ADDR_FROM_TOP(n);
-    for (i = 0; i < n; i++) {
-	GET_SP()[i] = sp[i];
-    }
-    INC_SP(n);
-}
-
-
-/**
-  @c stack
-  @e swap top 2 vals
-  @j �X�^�b�N�g�b�v�� 2 �̒l����������B
- */
-DEFINE_INSN
-swap
-()
-(VALUE val, VALUE obj)
-(VALUE obj, VALUE val)
-{
-    /* none */
-}
-
-/**
-  @c stack
-  @e for stack caching.
-  @j �X�^�b�N�L���b�V���O�̏�Ԃ𒲐����邽�߂ɕK�v�Ȗ��߁B
- */
-DEFINE_INSN
-reput
-()
-(..., VALUE val)
-(VALUE val) // inc += 0;
-{
-    /* none */
-}
-
-/**
-  @c stack
-  @e get nth stack value from stack top
-  @j �X�^�b�N�g�b�v���� n �ڂ��X�^�b�N�Ƀv�b�V������B
- */
-DEFINE_INSN
-topn
-(rb_num_t n)
-(...)
-(VALUE val) // inc += 1;
-{
-    val = TOPN(n);
-}
-
-/**
-  @c stack
-  @e set Nth stack entry to stack top
-  @j �X�^�b�N�g�b�v�̒l�� n �ڂ̃X�^�b�N�ɃR�s�[
- */
-DEFINE_INSN
-setn
-(rb_num_t n)
-(..., VALUE val)
-(VALUE val) // inc += 0
-{
-    TOPN(n-1) = val;
-}
-
-/**
-  @c stack
-  @e empt current stack
-  @j current stack ����ɂ���B
- */
-DEFINE_INSN
-adjuststack
-(rb_num_t n)
-(...)
-(...) // inc -= n
-{
-    DEC_SP(n);
-}
-
-
-/**********************************************************/
-/* deal with setting                                      */
-/**********************************************************/
-
-/**
-  @c setting
-  @e defined?
-  @j defined? ���s���B
- */
-DEFINE_INSN
-defined
-(rb_num_t type, VALUE obj, VALUE needstr)
-(VALUE v)
-(VALUE val)
-{
-    VALUE klass;
-    const char *expr_type = 0;
-    val = Qnil;
-
-    switch (type) {
-      case DEFINED_IVAR:
-	if (rb_ivar_defined(GET_SELF(), SYM2ID(obj))) {
-	    expr_type = "instance-variable";
-	}
-	break;
-      case DEFINED_IVAR2:
-	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
-	break;
-      case DEFINED_GVAR:
-	if (rb_gvar_defined((struct global_entry *)(obj & ~1))) {
-	    expr_type = "global-variable";
-	}
-	break;
-      case DEFINED_CVAR:
-	klass = vm_get_cbase(GET_ISEQ(), GET_LFP(), GET_DFP());
-	if (rb_cvar_defined(klass, SYM2ID(obj))) {
-	    expr_type = "class variable";
-	}
-	break;
-      case DEFINED_CONST:
-	klass = v;
-	if (vm_get_ev_const(th, GET_ISEQ(), klass, SYM2ID(obj), 1)) {
-	    expr_type = "constant";
-	}
-	break;
-      case DEFINED_FUNC:
-	klass = CLASS_OF(v);
-	if (rb_method_boundp(klass, SYM2ID(obj), 0)) {
-	    expr_type = "method";
-	}
-	break;
-      case DEFINED_METHOD:{
-	  VALUE klass = CLASS_OF(v);
-	  NODE *method = (NODE *) rb_method_node(klass, SYM2ID(obj));
-
-	  if (method) {
-	      if (!(method->nd_noex & NOEX_PRIVATE)) {
-		  if (!((method->nd_noex & NOEX_PROTECTED) &&
-			!rb_obj_is_kind_of(GET_SELF(),
-					   rb_class_real(klass)))) {
-		      expr_type = "method";
-		  }
-	      }
-	  }
-	  break;
-      }
-      case DEFINED_YIELD:
-	if (GET_BLOCK_PTR()) {
-	    expr_type = "yield";
-	}
-	break;
-      case DEFINED_ZSUPER:{
-	  rb_iseq_t *ip = GET_ISEQ();
-	  while (ip) {
-	      if (ip->defined_method_id) {
-		  break;
-	      }
-	      ip = ip->parent_iseq;
-	  }
-	  if (ip) {
-	      VALUE klass = vm_search_normal_superclass(ip->klass, GET_SELF());
-	      if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
-		  expr_type = "super";
-	      }
-	  }
-	  break;
-      }
-      case DEFINED_REF:{
-	  val = vm_getspecial(th, GET_LFP(), Qfalse, FIX2INT(obj));
-	  if (val != Qnil) {
-	      expr_type = "global-variable";
-	  }
-	  break;
-      }
-      default:
-	rb_bug("unimplemented defined? type (VM)");
-	break;
-    }
-    if (expr_type != 0) {
-	if (needstr != Qfalse) {
-	    val = rb_str_new2(expr_type);
-	}
-	else {
-	    val = Qtrue;
-	}
-    }
-}
-
-/**
-  @c setting
-  @e trace
-  @j trace �p�̖��߁B
- */
-DEFINE_INSN
-trace
-(rb_num_t nf)
-()
-()
-{
-    rb_event_flag_t flag = nf;
-
-    EXEC_EVENT_HOOK(th, flag, GET_SELF(), 0, 0 /* TODO: id, klass */);
-}
-
-/**********************************************************/
-/* deal with control flow 1: class/module                 */
-/**********************************************************/
-
-/**
-  @c class/module
-  @e
-   enter class definition scope. if super is Qfalse, and clsas
-   "klass" is defined, it's redefine. otherwise, define "klass" class.
-  @j �N���X��`�X�R�[�v�ֈڍs����B
-   ���� super �� Qfalse �� klass�N���X����`����Ă���΍Ē�`�ł���B
-   �����łȂ���΁Aklass �N���X���`����B
- */
-DEFINE_INSN
-defineclass
-(ID id, ISEQ class_iseq, rb_num_t define_type)
-(VALUE cbase, VALUE super)
-(VALUE val)
-{
-    VALUE klass;
-
-    switch ((int)define_type) {
-      case 0:
-	/* val is dummy.  classdef returns class scope value */
-
-	if (super == Qnil) {
-	    super = rb_cObject;
-	}
-
-	vm_check_if_namespace(cbase);
-
-	/* find klass */
-	if (rb_const_defined_at(cbase, id)) {
-	    /* already exist */
-	    klass = rb_const_get_at(cbase, id);
-	    if (TYPE(klass) != T_CLASS) {
-		rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
-	    }
-
-	    if (super != rb_cObject) {
-		VALUE tmp;
-		tmp = rb_class_real(RCLASS_SUPER(klass));
-
-		if (tmp != super) {
-		    rb_raise(rb_eTypeError, "superclass mismatch for class %s",
-			     rb_id2name(id));
-		}
-	    }
-	}
-	else {
-	    /* new class declaration */
-	    klass = rb_define_class_id(id, super);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
-	    rb_const_set(cbase, id, klass);
-	    rb_class_inherited(super, klass);
-	}
-	break;
-      case 1:
-	/* val is dummy.  classdef returns class scope value */
-	/* super is dummy */
-	klass = rb_singleton_class(cbase);
-	break;
-      case 2:
-	/* val is dummy.  classdef returns class scope value */
-	/* super is dummy */
-
-	vm_check_if_namespace(cbase);
-
-	/* find klass */
-	if (rb_const_defined_at(cbase, id)) {
-	    klass = rb_const_get_at(cbase, id);
-	    /* already exist */
-	    if (TYPE(klass) != T_MODULE) {
-		rb_raise(rb_eTypeError, "%s is not a module", rb_id2name(id));
-	    }
-	}
-	else {
-	    /* new module declaration */
-	    klass = rb_define_module_id(id);
-	    rb_set_class_path(klass, cbase, rb_id2name(id));
-	    rb_const_set(cbase, id, klass);
-	}
-	break;
-      default:
-	rb_bug("unknown defineclass type: %d", (int)define_type);
-    }
-
-    COPY_CREF(class_iseq->cref_stack, vm_cref_push(th, klass, NOEX_PUBLIC));
-
-    /* enter scope */
-    vm_push_frame(th, class_iseq,
-		  VM_FRAME_MAGIC_CLASS, klass, (VALUE) GET_DFP() | 0x02,
-		  class_iseq->iseq_encoded, GET_SP(), 0,
-		  class_iseq->local_size);
-    RESTORE_REGS();
-
-    INC_VM_STATE_VERSION();
-    NEXT_INSN();
-}
-
-
-/**********************************************************/
-/* deal with control flow 2: method/iterator              */
-/**********************************************************/
-
-/**
-  @c method/iterator
-  @e obj.send(id, args..) # args.size => num
-  @j ���\�b�h�Ăяo�����s���B
-  obj.send(id, args..) # args.size => num
-    flag & VM_CALL_ARGS_SPLAT_BIT    != 0 -> splat last arg
-    flag & VM_CALL_ARGS_BLOCKARG_BIT != 0 -> Proc as Block
-    flag & VM_CALL_FCALL_BIT         != 0 -> FCALL ( func() )
-    flag & VM_CALL_VCALL_BIT         != 0 -> VCALL ( func   )
-    ...
- */
-DEFINE_INSN
-send
-(ID op_id, rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag, IC ic)
-(...)
-(VALUE val) // inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
-{
-    NODE *mn;
-    VALUE recv, klass;
-    rb_block_t *blockptr = 0;
-    rb_num_t num = caller_setup_args(th, GET_CFP(), op_flag, op_argc,
-				     (rb_iseq_t *)blockiseq, &blockptr);
-    rb_num_t flag = op_flag;
-    ID id = op_id;
-
-    /* get receiver */
-    recv = (flag & VM_CALL_FCALL_BIT) ? GET_SELF() : TOPN(num);
-    klass = CLASS_OF(recv);
-    mn = vm_method_search(id, klass, ic);
-
-    /* send/funcall optimization */
-    if (flag & VM_CALL_SEND_BIT) {
-	vm_send_optimize(GET_CFP(), &mn, &flag, &num, &id, klass);
-    }
-
-    CALL_METHOD(num, blockptr, flag, id, mn, recv, klass);
-}
-
-/**
-  @c method/iterator
-  @e super(args) # args.size => num
-  @j super �����s����B
-     super(args) # args.size => num
-     flag ���I�y�����h�̈Ӗ��� send �Ɠ����B
- */
-DEFINE_INSN
-invokesuper
-(rb_num_t op_argc, ISEQ blockiseq, rb_num_t op_flag)
-(...)
-(VALUE val) // inc += - (op_argc + ((op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? 1 : 0));
-{
-    rb_block_t *blockptr = !(op_flag & VM_CALL_ARGS_BLOCKARG_BIT) ? GET_BLOCK_PTR() : 0;
-    int num = caller_setup_args(th, GET_CFP(), op_flag, op_argc, blockiseq, &blockptr);
-    VALUE recv, klass;
-    NODE *mn;
-    ID id;
-    const VALUE flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
-
-    recv = GET_SELF();
-    vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass);
-    mn = rb_method_node(klass, id);
-
-    CALL_METHOD(num, blockptr, flag, id, mn, recv, klass);
-}
-
-/**
-  @c method/iterator
-  @e yield(args) # args.size => num, flag shows expand argument or not
-  @j yield �����s����B
-     yield(args) # args.size => num
- */
-DEFINE_INSN
-invokeblock
-(rb_num_t num, rb_num_t flag)
-(...)
-(VALUE val)  // inc += 1 - num;
-{
-    val = vm_invoke_block(th, GET_CFP(), num, flag);
-    if (val == Qundef) {
-	RESTORE_REGS();
-	NEXT_INSN();
-    }
-}
-
-/**
-  @c method/iterator
-  @e return from this scope.
-  @j ���̃X�R�[�v���甲����B
- */
-DEFINE_INSN
-leave
-()
-(VALUE val)
-(VALUE val)
-{
-    if (OPT_CHECKED_RUN) {
-	if (reg_cfp->sp != reg_cfp->bp) {
-	    rb_bug("Stack consistency error (sp: %"PRIdPTRDIFF", bp: %"PRIdPTRDIFF")",
-		   VM_SP_CNT(th, reg_cfp->sp), VM_SP_CNT(th, reg_cfp->bp));
-	}
-    }
-
-    RUBY_VM_CHECK_INTS();
-    vm_pop_frame(th);
-    RESTORE_REGS();
-}
-
-/**
-  @c method/iterator
-  @e return from this vm loop
-  @j VM loop ���甲����B
- */
-DEFINE_INSN
-finish
-()
-(VALUE val)
-(VALUE val)
-{
-#if OPT_CALL_THREADED_CODE
-    rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
-#else
-    th->cfp++;
-    return val;
-#endif
-}
-
-/**********************************************************/
-/* deal with control flow 3: exception                    */
-/**********************************************************/
-
-/**
-  @c exception
-  @e longjump
-  @j ���W�����v���s���B
- */
-DEFINE_INSN
-throw
-(rb_num_t throw_state)
-(VALUE throwobj)
-(VALUE val)
-{
-    RUBY_VM_CHECK_INTS();
-    val = vm_throw(th, GET_CFP(), throw_state, throwobj);
-    THROW_EXCEPTION(val);
-    /* unreachable */
-}
-
-/**********************************************************/
-/* deal with control flow 4: local jump                   */
-/**********************************************************/
-
-/**
-  @c jump
-  @e set PC to (PC + dst).
-  @j PC �� (PC + dst) �ɂ���B
- */
-DEFINE_INSN
-jump
-(OFFSET dst)
-()
-()
-{
-    RUBY_VM_CHECK_INTS();
-    JUMP(dst);
-}
-
-/**
-  @c jump
-  @e if val is not false or nil, set PC to (PC + dst).
-  @j ���� val �� false �� nil �łȂ���΁APC �� (PC + dst) �ɂ���B
- */
-DEFINE_INSN
-branchif
-(OFFSET dst)
-(VALUE val)
-()
-{
-    if (RTEST(val)) {
-	RUBY_VM_CHECK_INTS();
-	JUMP(dst);
-    }
-}
-
-/**
-  @c jump
-  @e if val is false or nil, set PC to (PC + dst).
-  @j ���� val �� false �� nil �Ȃ�΁APC �� (PC + dst) �ɂ���B
- */
-DEFINE_INSN
-branchunless
-(OFFSET dst)
-(VALUE val)
-()
-{
-    if (!RTEST(val)) {
-	RUBY_VM_CHECK_INTS();
-	JUMP(dst);
-    }
-}
-
-
-/**********************************************************/
-/* for optimize                                           */
-/**********************************************************/
-
-/**
-  @c optimize
-  @e inline cache
-  @j �C�����C���L���b�V�����L���Ȃ�A�l���X�^�b�N�Ƀv�b�V������ dst �փW�����v����B
- */
-DEFINE_INSN
-getinlinecache
-(IC ic, OFFSET dst)
-()
-(VALUE val)
-{
-    if (ic->ic_vmstat == GET_VM_STATE_VERSION()) {
-	val = ic->ic_value;
-	JUMP(dst);
-    }
-    else {
-	/* none */
-	val = Qnil;
-    }
-}
-
-/**
-  @c optimize
-  @e inline cache (once)
-  @j once ����������B
- */
-DEFINE_INSN
-onceinlinecache
-(IC ic, OFFSET dst)
-()
-(VALUE val)
-{
-    if (ic->ic_vmstat) {
-	val = ic->ic_value;
-	JUMP(dst);
-    }
-    else {
-	/* none */
-	val = Qnil;
-    }
-}
-
-/**
-  @c optimize
-  @e set inline cache
-  @j �C�����C���L���b�V���̒l��ݒ肷��B
- */
-DEFINE_INSN
-setinlinecache
-(OFFSET dst)
-(VALUE val)
-(VALUE val)
-{
-    IC ic = GET_CONST_INLINE_CACHE(dst);
-
-    ic->ic_value = val;
-    ic->ic_vmstat = GET_VM_STATE_VERSION();
-}
-
-/**
-  @c optimize
-  @e case dispatcher
-  @j case ���ŁA�\�Ȃ�\�����ŃW�����v����B
- */
-DEFINE_INSN
-opt_case_dispatch
-(CDHASH hash, OFFSET else_offset)
-(..., VALUE key)
-() // inc += -1;
-{
-    if (0) {
-	/* TODO: if some === method is overrided */
-    }
-    else {
-	VALUE val;
-	if (st_lookup(RHASH_TBL(hash), key, &val)) {
-	    JUMP(FIX2INT(val));
-	}
-	else {
-	    JUMP(else_offset);
-	}
-    }
-}
-
-/**
-  @c optimize
-  @e check environment
-  @j �����̊g���p�B
- */
-DEFINE_INSN
-opt_checkenv
-()
-()
-()
-{
-    if (GET_CFP()->bp != GET_DFP() + 1) {
-	VALUE *new_dfp = GET_CFP()->bp - 1;
-	/* TODO: copy env and clean stack at creating env? */
-	*new_dfp = *GET_DFP();
-	SET_DFP(new_dfp);
-    }
-}
-
-
-/** simple functions */
-
-/**
-  @c optimize
-  @e optimized X+Y.
-  @j �œK�����ꂽ X+Y�B
- */
-DEFINE_INSN
-opt_plus
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (0) {
-
-    }
-#if 1
-    else if (FIXNUM_2_P(recv, obj) &&
-	     BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
-	/* fixnum + fixnum */
-#ifndef LONG_LONG_VALUE
-	val = (recv + (obj & (~1)));
-	if ((~(recv ^ obj) & (recv ^ val)) &
-	    ((VALUE)0x01 << ((sizeof(VALUE) * CHAR_BIT) - 1))) {
-	    val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
-			      rb_int2big(FIX2LONG(obj)));
-	}
-#else
-	long a, b, c;
-	a = FIX2LONG(recv);
-	b = FIX2LONG(obj);
-	c = a + b;
-	if (FIXABLE(c)) {
-	    val = LONG2FIX(c);
-	}
-	else {
-	    val = rb_big_plus(rb_int2big(a), rb_int2big(b));
-	}
-#endif
-    }
-#endif
-
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (0) {
-	}
-#if 1
-	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
-		 HEAP_CLASS_OF(obj) == rb_cFloat &&
-		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
-	    val = DOUBLE2NUM(RFLOAT_VALUE(recv) + RFLOAT_VALUE(obj));
-	}
-#endif
-
-#if 1
-	else if (HEAP_CLASS_OF(recv) == rb_cString &&
-		 HEAP_CLASS_OF(obj) == rb_cString &&
-		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
-	    val = rb_str_plus(recv, obj);
-	}
-#endif
-#if 1
-	else if (HEAP_CLASS_OF(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_PLUS)) {
-	    val = rb_ary_plus(recv, obj);
-	}
-#endif
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idPLUS, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X-Y.
-  @j �œK�����ꂽ X-Y�B
- */
-DEFINE_INSN
-opt_minus
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MINUS)) {
-	long a, b, c;
-
-	a = FIX2LONG(recv);
-	b = FIX2LONG(obj);
-	c = a - b;
-
-	if (FIXABLE(c)) {
-	    val = LONG2FIX(c);
-	}
-	else {
-	    val = rb_big_minus(rb_int2big(a), rb_int2big(b));
-	}
-    }
-    else {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMINUS, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X*Y.
-  @j �œK�����ꂽ X*Y�B
- */
-DEFINE_INSN
-opt_mult
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
-	long a, b, c;
-
-	a = FIX2LONG(recv);
-	if (a == 0) {
-	    val = recv;
-	}
-	else {
-	    b = FIX2LONG(obj);
-	    c = a * b;
-
-	    if (FIXABLE(c) && c / a == b) {
-		val = LONG2FIX(c);
-	    }
-	    else {
-		val = rb_big_mul(rb_int2big(a), rb_int2big(b));
-	    }
-	}
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (0) {
-	}
-#if 1
-	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
-		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
-		 BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
-	    val = DOUBLE2NUM(RFLOAT_VALUE(recv) * RFLOAT_VALUE(obj));
-	}
-#endif
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMULT, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X/Y.
-  @j �œK�����ꂽ X/Y�B
- */
-DEFINE_INSN
-opt_div
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
-	long x, y, div;
-
-	x = FIX2LONG(recv);
-	y = FIX2LONG(obj);
-	{
-	    /* copied from numeric.c#fixdivmod */
-	    long mod;
-	    if (y == 0)
-		goto INSN_LABEL(normal_dispatch);
-	    if (y < 0) {
-		if (x < 0)
-		    div = -x / -y;
-		else
-		    div = -(x / -y);
-	    }
-	    else {
-		if (x < 0)
-		    div = -(-x / y);
-		else
-		    div = x / y;
-	    }
-	    mod = x - div * y;
-	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
-		mod += y;
-		div -= 1;
-	    }
-	}
-	val = LONG2NUM(div);
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (0) {
-	}
-#if 1
-	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
-		 HEAP_CLASS_OF(obj) == rb_cFloat  &&
-		 BASIC_OP_UNREDEFINED_P(BOP_DIV)) {
-	    val = DOUBLE2NUM(RFLOAT_VALUE(recv) / RFLOAT_VALUE(obj));
-	}
-#endif
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idDIV, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X%Y.
-  @j �œK�����ꂽ X%Y�B
- */
-DEFINE_INSN
-opt_mod
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
-	long x, y, mod;
-
-	x = FIX2LONG(recv);
-	y = FIX2LONG(obj);
-	{
-	    /* copied from numeric.c#fixdivmod */
-	    long div;
-
-	    if (y == 0)
-		rb_num_zerodiv();
-	    if (y < 0) {
-		if (x < 0)
-		    div = -x / -y;
-		else
-		    div = -(x / -y);
-	    }
-	    else {
-		if (x < 0)
-		    div = -(-x / y);
-		else
-		    div = x / y;
-	    }
-	    mod = x - div * y;
-	    if ((mod < 0 && y > 0) || (mod > 0 && y < 0)) {
-		mod += y;
-		div -= 1;
-	    }
-	}
-	val = LONG2FIX(mod);
-    }
-    else if (!SPECIAL_CONST_P(recv) && !SPECIAL_CONST_P(obj)) {
-	if (0) {
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cFloat &&
-		 HEAP_CLASS_OF(obj) == rb_cFloat &&
-		 BASIC_OP_UNREDEFINED_P(BOP_MOD)) {
-	    double x = RFLOAT_VALUE(recv);
-	    double y = RFLOAT_VALUE(obj);
-	    double div, mod;
-
-	    {
-		double z;
-
-		modf(x / y, &z);
-		mod = x - z * y;
-	    }
-
-	    div = (x - mod) / y;
-	    if (y * mod < 0) {
-		mod += y;
-		div -= 1.0;
-	    }
-	    val = DOUBLE2NUM(mod);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idMOD, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X==Y.
-  @j �œK�����ꂽ X==Y�B
- */
-DEFINE_INSN
-opt_eq
-(IC ic)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    val = opt_eq_func(recv, obj, ic);
-
-    if (val == Qundef) {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idEq, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X!=Y.
-  @j �œK�����ꂽ X!=Y�B
- */
-DEFINE_INSN
-opt_neq
-(IC ic1, IC ic2)
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    extern VALUE rb_obj_not_equal(VALUE obj1, VALUE obj2);
-    NODE *mn = vm_method_search(idNeq, CLASS_OF(recv), ic1);
-    val = Qundef;
-
-    if (check_cfunc(mn, rb_obj_not_equal)) {
-	val = opt_eq_func(recv, obj, ic2);
-
-	if (val != Qundef) {
-	    val = RTEST(val) ? Qfalse : Qtrue;
-	}
-    }
-
-    if (val == Qundef) {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idNeq, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X<Y.
-  @j �œK�����ꂽ X<Y�B
- */
-DEFINE_INSN
-opt_lt
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LT)) {
-	SIGNED_VALUE a = recv, b = obj;
-
-	if (a < b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else {
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idLT, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X<=Y.
-  @j �œK�����ꂽ X<=Y�B
- */
-DEFINE_INSN
-opt_le
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LE)) {
-	SIGNED_VALUE a = recv, b = obj;
-
-	if (a <= b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else {
-	/* other */
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idLE, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X>Y.
-  @j �œK�����ꂽ X>Y�B
- */
-DEFINE_INSN
-opt_gt
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GT)) {
-	SIGNED_VALUE a = recv, b = obj;
-
-	if (a > b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else {
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idGT, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized X>=Y.
-  @j �œK�����ꂽ X>=Y�B
- */
-DEFINE_INSN
-opt_ge
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (FIXNUM_2_P(recv, obj) &&
-	BASIC_OP_UNREDEFINED_P(BOP_GE)) {
-	SIGNED_VALUE a = recv, b = obj;
-
-	if (a >= b) {
-	    val = Qtrue;
-	}
-	else {
-	    val = Qfalse;
-	}
-    }
-    else {
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idGE, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e <<
-  @j �œK�����ꂽ X<<Y�B
- */
-DEFINE_INSN
-opt_ltlt
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (!SPECIAL_CONST_P(recv)) {
-	if (0) {
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cString &&
-		 BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
-	    val = rb_str_concat(recv, obj);
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cArray &&
-		 BASIC_OP_UNREDEFINED_P(BOP_LTLT)) {
-	    val = rb_ary_push(recv, obj);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idLTLT, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e []
-  @j �œK�����ꂽ recv[obj]�B
- */
-DEFINE_INSN
-opt_aref
-()
-(VALUE recv, VALUE obj)
-(VALUE val)
-{
-    if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) {
-	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
-	    val = rb_ary_entry(recv, FIX2LONG(obj));
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
-	    val = rb_hash_aref(recv, obj);
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	CALL_SIMPLE_METHOD(1, idAREF, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e recv[obj] = set
-  @j �œK�����ꂽ recv[obj] = set�B
- */
-DEFINE_INSN
-opt_aset
-()
-(VALUE recv, VALUE obj, VALUE set)
-(VALUE val)
-{
-    if (!SPECIAL_CONST_P(recv) &&
-	BASIC_OP_UNREDEFINED_P(BOP_ASET)) {
-	if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) {
-	    rb_ary_store(recv, FIX2LONG(obj), set);
-	    val = set;
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
-	    rb_hash_aset(recv, obj, set);
-	    val = set;
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	PUSH(obj);
-	PUSH(set);
-	CALL_SIMPLE_METHOD(2, idASET, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized length
-  @j �œK�����ꂽ recv.length()�B
- */
-DEFINE_INSN
-opt_length
-()
-(VALUE recv)
-(VALUE val)
-{
-    if (!SPECIAL_CONST_P(recv) &&
-	BASIC_OP_UNREDEFINED_P(BOP_LENGTH)) {
-	if (HEAP_CLASS_OF(recv) == rb_cString) {
-	    val = rb_str_length(recv);
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cArray) {
-	    val = LONG2NUM(RARRAY_LEN(recv));
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cHash) {
-	    val = INT2FIX(RHASH_SIZE(recv));
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(0, idLength, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized succ
-  @j �œK�����ꂽ recv.succ()�B
- */
-DEFINE_INSN
-opt_succ
-()
-(VALUE recv)
-(VALUE val)
-{
-    if (SPECIAL_CONST_P(recv)) {
-	if (FIXNUM_P(recv) &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
-	    const VALUE obj = INT2FIX(1);
-	    /* fixnum + INT2FIX(1) */
-	    val = (recv + (obj & (~1)));
-	    if ((~(recv ^ obj) & (recv ^ val)) & ((unsigned long)LONG_MAX + 1)) {
-		val = rb_big_plus(rb_int2big(FIX2LONG(recv)),
-				  rb_int2big(FIX2LONG(obj)));
-	    }
-	}
-	else {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    else {
-	if (HEAP_CLASS_OF(recv) == rb_cString &&
-	    BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
-	    val = rb_str_succ(recv);
-	}
-	else if (HEAP_CLASS_OF(recv) == rb_cTime &&
-		 BASIC_OP_UNREDEFINED_P(BOP_SUCC)) {
-	    val = rb_time_succ(recv);
-	}
-	else
-	  {
-	    goto INSN_LABEL(normal_dispatch);
-	}
-    }
-    if (0) {
-      INSN_LABEL(normal_dispatch):
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(0, idSucc, recv);
-    }
-}
-
-/**
-  @c optimize
-  @e optimized not
-  @j �œK�����ꂽ recv.!()�B
- */
-DEFINE_INSN
-opt_not
-(IC ic)
-(VALUE recv)
-(VALUE val)
-{
-    extern VALUE rb_obj_not(VALUE obj);
-    NODE *mn = vm_method_search(idNot, CLASS_OF(recv), ic);
-
-    if (check_cfunc(mn, rb_obj_not)) {
-	val = RTEST(recv) ? Qfalse : Qtrue;
-    }
-    else {
-	PUSH(recv);
-	CALL_SIMPLE_METHOD(0, idNot, recv);
-    }
-}
-
-
-/**
-  @c optimize
-  @e optimized regexp match
-  @j �œK�����ꂽ���K�\���}�b�`�B
- */
-DEFINE_INSN
-opt_regexpmatch1
-(VALUE r)
-(VALUE obj)
-(VALUE val)
-{
-    val = rb_reg_match(r, obj);
-}
-
-/**
-  @c optimize
-  @e optimized regexp match 2
-  @j �œK�����ꂽ���K�\���}�b�` 2
- */
-DEFINE_INSN
-opt_regexpmatch2
-()
-(VALUE obj2, VALUE obj1)
-(VALUE val)
-{
-    if (TYPE(obj2) == T_STRING) {
-	val = rb_reg_match(obj1, obj2);
-    }
-    else {
-	val = rb_funcall(obj2, idEqTilde, 1, obj1);
-    }
-}
-
-/**
-  @c optimize
-  @e call native compiled method
-  @j �l�C�e�B�u�R���p�C���������\�b�h���N���B
- */
-DEFINE_INSN
-opt_call_c_function
-(rb_insn_func_t funcptr)
-()
-()
-{
-    reg_cfp = (funcptr)(th, reg_cfp);
-
-    if (reg_cfp == 0) {
-	VALUE err = th->errinfo;
-	th->errinfo = Qnil;
-	THROW_EXCEPTION(err);
-    }
-
-    RESTORE_REGS();
-    NEXT_INSN();
-}
-
-/**
-  @c joke
-  @e BLT
-  @j BLT
- */
-DEFINE_INSN
-bitblt
-()
-()
-(VALUE ret)
-{
-    ret = rb_str_new2("a bit of bacon, lettuce and tomato");
-}
-
-/**
-  @c joke
-  @e The Answer to Life, the Universe, and Everything
-  @j �l���A�F���A���ׂĂ̓����B
- */
-DEFINE_INSN
-answer
-()
-()
-(VALUE ret)
-{
-    ret = INT2FIX(42);
-}
-
diff --git a/instruby.rb b/instruby.rb
index 85fea0ec0f..2903a7c739 100755
--- a/instruby.rb
+++ b/instruby.rb
@@ -205,13 +205,10 @@ exeext = CONFIG["EXEEXT"]
 
 ruby_install_name = CONFIG["ruby_install_name"]
 rubyw_install_name = CONFIG["rubyw_install_name"]
-goruby_install_name = "go" + ruby_install_name
 
 version = CONFIG["ruby_version"]
 bindir = CONFIG["bindir"]
 libdir = CONFIG["libdir"]
-archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"]
-archhdrdir += "/" + CONFIG["arch"]
 rubylibdir = CONFIG["rubylibdir"]
 archlibdir = CONFIG["archdir"]
 sitelibdir = CONFIG["sitelibdir"]
@@ -234,14 +231,12 @@ install?(:local, :arch, :bin, :'bin-arch') do
   if rubyw_install_name and !rubyw_install_name.empty?
     install rubyw_install_name+exeext, bindir, :mode => $prog_mode
   end
-  if File.exist? goruby_install_name+exeext
-    install goruby_install_name+exeext, bindir, :mode => $prog_mode
-  end
   if enable_shared and dll != lib
     install dll, bindir, :mode => $prog_mode
   end
   install lib, libdir, :mode => $prog_mode unless lib == arc
   install arc, libdir, :mode => $data_mode
+  install "config.h", archlibdir, :mode => $data_mode
   install "rbconfig.rb", archlibdir, :mode => $data_mode
   if CONFIG["ARCHFILE"]
     for file in CONFIG["ARCHFILE"].split
@@ -260,19 +255,16 @@ if $extout
   extout = "#$extout"
   install?(:ext, :arch, :'ext-arch') do
     puts "installing extension objects"
-    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir, archhdrdir]
+    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
     if noinst = CONFIG["no_install_files"] and noinst.empty?
       noinst = nil
     end
     install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode)
-    install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode)
   end
   install?(:ext, :comm, :'ext-comm') do
     puts "installing extension scripts"
-    hdrdir = rubyhdrdir + "/ruby"
-    makedirs [rubylibdir, sitelibdir, vendorlibdir, hdrdir]
+    makedirs [rubylibdir, sitelibdir, vendorlibdir]
     install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode)
-    install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode)
   end
 end
 
@@ -280,7 +272,7 @@ install?(:rdoc) do
   if $rdocdir
     puts "installing rdoc"
 
-    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system')
+    ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR)/system')
     Config.expand(ridatadir)
     makedirs [ridatadir]
     install_recursive($rdocdir, ridatadir, :mode => $data_mode)
@@ -359,13 +351,16 @@ install?(:local, :arch, :lib) do
   puts "installing headers"
 
   Dir.chdir(srcdir)
-  makedirs [rubyhdrdir]
-  noinst = []
-  unless RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
-    noinst << "win32.h"
+  makedirs [archlibdir]
+  for f in Dir["*.h"]
+    install f, archlibdir, :mode => $data_mode
+  end
+
+  if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
+    win32libdir = File.join(archlibdir, "win32")
+    makedirs win32libdir
+    install "win32/win32.h", win32libdir, :mode => $data_mode
   end
-  noinst = nil if noinst.empty?
-  install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode)
 end
 
 install?(:local, :comm, :man) do
diff --git a/intern.h b/intern.h
new file mode 100644
index 0000000000..47f0cddaa2
--- /dev/null
+++ b/intern.h
@@ -0,0 +1,531 @@
+/**********************************************************************
+
+  intern.h -
+
+  $Author$
+  $Date$
+  created at: Thu Jun 10 14:22:17 JST 1993
+
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
+  Copyright (C) 2000  Information-technology Promotion Agency, Japan
+
+**********************************************************************/
+
+/* 
+ * Functions and variables that are used by more than one source file of
+ * the kernel.
+ */
+
+#define ID_ALLOCATOR 1
+
+/* array.c */
+void rb_mem_clear _((register VALUE*, register long));
+VALUE rb_assoc_new _((VALUE, VALUE));
+VALUE rb_check_array_type _((VALUE));
+VALUE rb_ary_new _((void));
+VALUE rb_ary_new2 _((long));
+VALUE rb_ary_new3 __((long,...));
+VALUE rb_ary_new4 _((long, const VALUE *));
+VALUE rb_ary_freeze _((VALUE));
+VALUE rb_ary_aref _((int, VALUE*, VALUE));
+void rb_ary_store _((VALUE, long, VALUE));
+VALUE rb_ary_dup _((VALUE));
+VALUE rb_ary_to_ary _((VALUE));
+VALUE rb_ary_to_s _((VALUE));
+VALUE rb_ary_push _((VALUE, VALUE));
+VALUE rb_ary_pop _((VALUE));
+VALUE rb_ary_shift _((VALUE));
+VALUE rb_ary_unshift _((VALUE, VALUE));
+VALUE rb_ary_entry _((VALUE, long));
+VALUE rb_ary_each _((VALUE));
+VALUE rb_ary_join _((VALUE, VALUE));
+VALUE rb_ary_print_on _((VALUE, VALUE));
+VALUE rb_ary_reverse _((VALUE));
+VALUE rb_ary_sort _((VALUE));
+VALUE rb_ary_sort_bang _((VALUE));
+VALUE rb_ary_delete _((VALUE, VALUE));
+VALUE rb_ary_delete_at _((VALUE, long));
+VALUE rb_ary_clear _((VALUE));
+VALUE rb_ary_plus _((VALUE, VALUE));
+VALUE rb_ary_concat _((VALUE, VALUE));
+VALUE rb_ary_assoc _((VALUE, VALUE));
+VALUE rb_ary_rassoc _((VALUE, VALUE));
+VALUE rb_ary_includes _((VALUE, VALUE));
+VALUE rb_ary_cmp _((VALUE, VALUE));
+VALUE rb_protect_inspect _((VALUE(*)(ANYARGS),VALUE,VALUE));
+VALUE rb_inspecting_p _((VALUE));
+VALUE rb_check_array_value _((VALUE));
+VALUE rb_values_at _((VALUE, long, int, VALUE*, VALUE(*) _((VALUE,long))));
+/* bignum.c */
+VALUE rb_big_clone _((VALUE));
+void rb_big_2comp _((VALUE));
+VALUE rb_big_norm _((VALUE));
+VALUE rb_uint2big _((unsigned long));
+VALUE rb_int2big _((long));
+VALUE rb_uint2inum _((unsigned long));
+VALUE rb_int2inum _((long));
+VALUE rb_cstr_to_inum _((const char*, int, int));
+VALUE rb_str_to_inum _((VALUE, int, int));
+VALUE rb_cstr2inum _((const char*, int));
+VALUE rb_str2inum _((VALUE, int));
+VALUE rb_big2str _((VALUE, int));
+VALUE rb_big2str0 _((VALUE, int, int));
+long rb_big2long _((VALUE));
+#define rb_big2int(x) rb_big2long(x)
+unsigned long rb_big2ulong _((VALUE));
+#define rb_big2uint(x) rb_big2ulong(x)
+#if HAVE_LONG_LONG
+VALUE rb_ll2inum _((LONG_LONG));
+VALUE rb_ull2inum _((unsigned LONG_LONG));
+LONG_LONG rb_big2ll _((VALUE));
+unsigned LONG_LONG rb_big2ull _((VALUE));
+#endif  /* HAVE_LONG_LONG */
+void rb_quad_pack _((char*,VALUE));
+VALUE rb_quad_unpack _((const char*,int));
+VALUE rb_dbl2big _((double));
+double rb_big2dbl _((VALUE));
+VALUE rb_big_plus _((VALUE, VALUE));
+VALUE rb_big_minus _((VALUE, VALUE));
+VALUE rb_big_mul _((VALUE, VALUE));
+VALUE rb_big_divmod _((VALUE, VALUE));
+VALUE rb_big_pow _((VALUE, VALUE));
+VALUE rb_big_and _((VALUE, VALUE));
+VALUE rb_big_or _((VALUE, VALUE));
+VALUE rb_big_xor _((VALUE, VALUE));
+VALUE rb_big_lshift _((VALUE, VALUE));
+VALUE rb_big_rand _((VALUE, double*));
+/* class.c */
+VALUE rb_class_boot _((VALUE));
+VALUE rb_class_new _((VALUE));
+VALUE rb_mod_init_copy _((VALUE, VALUE));
+VALUE rb_class_init_copy _((VALUE, VALUE));
+VALUE rb_singleton_class_clone _((VALUE));
+void rb_singleton_class_attached _((VALUE,VALUE));
+VALUE rb_make_metaclass _((VALUE, VALUE));
+void rb_check_inheritable _((VALUE));
+VALUE rb_class_inherited _((VALUE, VALUE));
+VALUE rb_define_class_id _((ID, VALUE));
+VALUE rb_module_new _((void));
+VALUE rb_define_module_id _((ID));
+VALUE rb_mod_included_modules _((VALUE));
+VALUE rb_mod_include_p _((VALUE, VALUE));
+VALUE rb_mod_ancestors _((VALUE));
+VALUE rb_class_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_public_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_class_protected_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_big_rshift(VALUE, VALUE);
+VALUE rb_class_private_instance_methods _((int, VALUE*, VALUE));
+VALUE rb_obj_singleton_methods _((int, VALUE*, VALUE));
+void rb_define_method_id _((VALUE, ID, VALUE (*)(ANYARGS), int));
+void rb_frozen_class_p _((VALUE));
+void rb_undef _((VALUE, ID));
+void rb_define_protected_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_private_method _((VALUE, const char*, VALUE (*)(ANYARGS), int));
+void rb_define_singleton_method _((VALUE, const char*, VALUE(*)(ANYARGS), int));
+VALUE rb_singleton_class _((VALUE));
+/* compar.c */
+int rb_cmpint _((VALUE, VALUE, VALUE));
+NORETURN(void rb_cmperr _((VALUE, VALUE)));
+/* enum.c */
+VALUE rb_block_call _((VALUE, ID, int, VALUE*, VALUE (*)(ANYARGS), VALUE));
+/* enumerator.c */
+VALUE rb_enumeratorize _((VALUE, VALUE, int, VALUE *));
+#define RETURN_ENUMERATOR(obj, argc, argv) do {				\
+	if (!rb_block_given_p())					\
+	    return rb_enumeratorize(obj, ID2SYM(rb_frame_this_func()),	\
+				    argc, argv);			\
+    } while (0)
+/* error.c */
+RUBY_EXTERN int ruby_nerrs;
+VALUE rb_exc_new _((VALUE, const char*, long));
+VALUE rb_exc_new2 _((VALUE, const char*));
+VALUE rb_exc_new3 _((VALUE, VALUE));
+NORETURN(void rb_loaderror __((const char*, ...)));
+NORETURN(void rb_name_error __((ID, const char*, ...)));
+NORETURN(void rb_invalid_str _((const char*, const char*)));
+void rb_compile_error __((const char*, ...));
+void rb_compile_error_append __((const char*, ...));
+NORETURN(void rb_load_fail _((const char*)));
+NORETURN(void rb_error_frozen _((const char*)));
+void rb_check_frozen _((VALUE));
+/* eval.c */
+RUBY_EXTERN struct RNode *ruby_current_node;
+void ruby_set_current_source _((void));
+NORETURN(void rb_exc_raise _((VALUE)));
+NORETURN(void rb_exc_fatal _((VALUE)));
+VALUE rb_f_exit _((int,VALUE*));
+VALUE rb_f_abort _((int,VALUE*));
+void rb_remove_method _((VALUE, const char*));
+#define rb_disable_super(klass, name) ((void)0)
+#define rb_enable_super(klass, name) ((void)0)
+#define HAVE_RB_DEFINE_ALLOC_FUNC 1
+void rb_define_alloc_func _((VALUE, VALUE (*)(VALUE)));
+void rb_undef_alloc_func _((VALUE));
+void rb_clear_cache _((void));
+void rb_clear_cache_by_class _((VALUE));
+void rb_alias _((VALUE, ID, ID));
+void rb_attr _((VALUE,ID,int,int,int));
+int rb_method_boundp _((VALUE, ID, int));
+VALUE rb_dvar_defined _((ID));
+VALUE rb_dvar_curr _((ID));
+VALUE rb_dvar_ref _((ID));
+void rb_dvar_asgn _((ID, VALUE));
+void rb_dvar_push _((ID, VALUE));
+VALUE *rb_svar _((int));
+VALUE rb_eval_cmd _((VALUE, VALUE, int));
+int rb_obj_respond_to _((VALUE, ID, int));
+int rb_respond_to _((VALUE, ID));
+void rb_interrupt _((void));
+VALUE rb_apply _((VALUE, ID, VALUE));
+void rb_backtrace _((void));
+ID rb_frame_last_func _((void));
+ID rb_frame_this_func _((void));
+VALUE rb_obj_instance_eval _((int, VALUE*, VALUE));
+VALUE rb_mod_module_eval _((int, VALUE*, VALUE));
+void rb_load _((VALUE, int));
+void rb_load_protect _((VALUE, int, int*));
+NORETURN(void rb_jump_tag _((int)));
+int rb_provided _((const char*));
+void rb_provide _((const char*));
+VALUE rb_f_require _((VALUE, VALUE));
+VALUE rb_require_safe _((VALUE, int));
+void rb_obj_call_init _((VALUE, int, VALUE*));
+VALUE rb_class_new_instance _((int, VALUE*, VALUE));
+VALUE rb_block_proc _((void));
+VALUE rb_block_dup _((VALUE, VALUE, VALUE));
+VALUE rb_method_dup _((VALUE, VALUE, VALUE));
+VALUE rb_f_lambda _((void));
+VALUE rb_proc_call _((VALUE, VALUE));
+VALUE rb_obj_method _((VALUE, VALUE));
+VALUE rb_protect _((VALUE (*)(VALUE), VALUE, int*));
+void rb_set_end_proc _((void (*)(VALUE), VALUE));
+void rb_mark_end_proc _((void));
+void rb_exec_end_proc _((void));
+void ruby_finalize _((void));
+NORETURN(void ruby_stop _((int)));
+int ruby_cleanup _((int));
+int ruby_exec _((void));
+void rb_gc_mark_threads _((void));
+void rb_thread_start_timer _((void));
+void rb_thread_stop_timer _((void));
+void rb_thread_schedule _((void));
+void rb_thread_wait_fd _((int));
+int rb_thread_fd_writable _((int));
+void rb_thread_fd_close _((int));
+int rb_thread_alone _((void));
+void rb_thread_polling _((void));
+void rb_thread_sleep _((int));
+void rb_thread_sleep_forever _((void));
+VALUE rb_thread_stop _((void));
+VALUE rb_thread_wakeup _((VALUE));
+VALUE rb_thread_wakeup_alive _((VALUE));
+VALUE rb_thread_run _((VALUE));
+VALUE rb_thread_kill _((VALUE));
+VALUE rb_thread_alive_p _((VALUE));
+VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
+void rb_thread_interrupt _((void));
+void rb_thread_trap_eval _((VALUE, int, int));
+void rb_thread_signal_raise _((int));
+void rb_thread_signal_exit _((void));
+int rb_thread_select _((int, fd_set *, fd_set *, fd_set *, struct timeval *));
+void rb_thread_wait_for _((struct timeval));
+VALUE rb_thread_current _((void));
+VALUE rb_thread_main _((void));
+VALUE rb_thread_local_aref _((VALUE, ID));
+VALUE rb_thread_local_aset _((VALUE, ID, VALUE));
+void rb_thread_atfork _((void));
+VALUE rb_exec_recursive _((VALUE(*)(VALUE, VALUE, int),VALUE,VALUE));
+VALUE rb_funcall_rescue __((VALUE, ID, int, ...));
+/* file.c */
+VALUE rb_file_s_expand_path _((int, VALUE *));
+VALUE rb_file_expand_path _((VALUE, VALUE));
+void rb_file_const _((const char*, VALUE));
+int rb_find_file_ext _((VALUE*, const char* const*));
+VALUE rb_find_file _((VALUE));
+char *rb_path_next _((const char *));
+char *rb_path_skip_prefix _((const char *));
+char *rb_path_last_separator _((const char *));
+char *rb_path_end _((const char *));
+VALUE rb_file_directory_p _((VALUE,VALUE));
+/* gc.c */
+NORETURN(void rb_memerror __((void)));
+int ruby_stack_check _((void));
+size_t ruby_stack_length _((VALUE**));
+int rb_during_gc _((void));
+char *rb_source_filename _((const char*));
+void rb_gc_mark_locations _((VALUE*, VALUE*));
+void rb_mark_tbl _((struct st_table*));
+void rb_mark_set _((struct st_table*));
+void rb_mark_hash _((struct st_table*));
+void rb_gc_mark_maybe _((VALUE));
+void rb_gc_mark _((VALUE));
+void rb_gc_force_recycle _((VALUE));
+void rb_gc _((void));
+void rb_gc_copy_finalizer _((VALUE,VALUE));
+void rb_gc_finalize_deferred _((void));
+void rb_gc_call_finalizer_at_exit _((void));
+VALUE rb_gc_enable _((void));
+VALUE rb_gc_disable _((void));
+VALUE rb_gc_start _((void));
+/* hash.c */
+void st_foreach_safe _((struct st_table *, int (*)(ANYARGS), unsigned long));
+void rb_hash_foreach _((VALUE, int (*)(ANYARGS), VALUE));
+VALUE rb_hash _((VALUE));
+VALUE rb_hash_new _((void));
+VALUE rb_hash_freeze _((VALUE));
+VALUE rb_hash_aref _((VALUE, VALUE));
+VALUE rb_hash_lookup _((VALUE, VALUE));
+VALUE rb_hash_aset _((VALUE, VALUE, VALUE));
+VALUE rb_hash_delete_if _((VALUE));
+VALUE rb_hash_delete _((VALUE,VALUE));
+int rb_path_check _((const char*));
+int rb_env_path_tainted _((void));
+/* io.c */
+#define rb_defout rb_stdout
+RUBY_EXTERN VALUE rb_fs;
+RUBY_EXTERN VALUE rb_output_fs;
+RUBY_EXTERN VALUE rb_rs;
+RUBY_EXTERN VALUE rb_default_rs;
+RUBY_EXTERN VALUE rb_output_rs;
+VALUE rb_io_write _((VALUE, VALUE));
+VALUE rb_io_gets _((VALUE));
+VALUE rb_io_getc _((VALUE));
+VALUE rb_io_ungetc _((VALUE, VALUE));
+VALUE rb_io_close _((VALUE));
+VALUE rb_io_eof _((VALUE));
+VALUE rb_io_binmode _((VALUE));
+VALUE rb_io_addstr _((VALUE, VALUE));
+VALUE rb_io_printf _((int, VALUE*, VALUE));
+VALUE rb_io_print _((int, VALUE*, VALUE));
+VALUE rb_io_puts _((int, VALUE*, VALUE));
+VALUE rb_file_open _((const char*, const char*));
+VALUE rb_gets _((void));
+void rb_write_error _((const char*));
+void rb_write_error2 _((const char*, long));
+/* marshal.c */
+VALUE rb_marshal_dump _((VALUE, VALUE));
+VALUE rb_marshal_load _((VALUE));
+/* numeric.c */
+void rb_num_zerodiv _((void));
+VALUE rb_num_coerce_bin _((VALUE, VALUE));
+VALUE rb_num_coerce_cmp _((VALUE, VALUE));
+VALUE rb_num_coerce_relop _((VALUE, VALUE));
+VALUE rb_float_new _((double));
+VALUE rb_num2fix _((VALUE));
+VALUE rb_fix2str _((VALUE, int));
+VALUE rb_dbl_cmp _((double, double));
+/* object.c */
+int rb_eql _((VALUE, VALUE));
+VALUE rb_any_to_s _((VALUE));
+VALUE rb_inspect _((VALUE));
+VALUE rb_obj_is_instance_of _((VALUE, VALUE));
+VALUE rb_obj_is_kind_of _((VALUE, VALUE));
+VALUE rb_obj_alloc _((VALUE));
+VALUE rb_obj_clone _((VALUE));
+VALUE rb_obj_dup _((VALUE));
+VALUE rb_obj_init_copy _((VALUE,VALUE));
+VALUE rb_obj_taint _((VALUE));
+VALUE rb_obj_tainted _((VALUE));
+VALUE rb_obj_untaint _((VALUE));
+VALUE rb_obj_freeze _((VALUE));
+VALUE rb_obj_id _((VALUE));
+VALUE rb_obj_class _((VALUE));
+VALUE rb_class_real _((VALUE));
+VALUE rb_class_inherited_p _((VALUE, VALUE));
+VALUE rb_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_convert_type _((VALUE,int,const char*,const char*));
+VALUE rb_check_to_integer _((VALUE, const char *));
+VALUE rb_to_int _((VALUE));
+VALUE rb_Integer _((VALUE));
+VALUE rb_Float _((VALUE));
+VALUE rb_String _((VALUE));
+VALUE rb_Array _((VALUE));
+double rb_cstr_to_dbl _((const char*, int));
+double rb_str_to_dbl _((VALUE, int));
+/* parse.y */
+RUBY_EXTERN int   ruby_sourceline;
+RUBY_EXTERN char *ruby_sourcefile;
+int ruby_yyparse _((void));
+ID rb_id_attrset _((ID));
+void rb_parser_append_print _((void));
+void rb_parser_while_loop _((int, int));
+int ruby_parser_stack_on_heap _((void));
+void rb_gc_mark_parser _((void));
+int rb_is_const_id _((ID));
+int rb_is_instance_id _((ID));
+int rb_is_class_id _((ID));
+int rb_is_local_id _((ID));
+int rb_is_junk_id _((ID));
+int rb_symname_p _((const char*));
+int rb_sym_interned_p _((VALUE));
+VALUE rb_backref_get _((void));
+void rb_backref_set _((VALUE));
+VALUE rb_lastline_get _((void));
+void rb_lastline_set _((VALUE));
+VALUE rb_sym_all_symbols _((void));
+/* process.c */
+int rb_proc_exec _((const char*));
+VALUE rb_f_exec _((int,VALUE*));
+int rb_waitpid _((int,int*,int));
+void rb_syswait _((int));
+VALUE rb_proc_times _((VALUE));
+VALUE rb_detach_process _((int));
+/* range.c */
+VALUE rb_range_new _((VALUE, VALUE, int));
+VALUE rb_range_beg_len _((VALUE, long*, long*, long, int));
+VALUE rb_length_by_each _((VALUE));
+/* random.c */
+unsigned long rb_genrand_int32(void);
+double rb_genrand_real(void);
+/* re.c */
+int rb_memcmp _((const void*,const void*,long));
+int rb_memcicmp _((const void*,const void*,long));
+long rb_memsearch _((const void*,long,const void*,long));
+VALUE rb_reg_nth_defined _((int, VALUE));
+VALUE rb_reg_nth_match _((int, VALUE));
+VALUE rb_reg_last_match _((VALUE));
+VALUE rb_reg_match_pre _((VALUE));
+VALUE rb_reg_match_post _((VALUE));
+VALUE rb_reg_match_last _((VALUE));
+VALUE rb_reg_new _((const char*, long, int));
+VALUE rb_reg_match _((VALUE, VALUE));
+VALUE rb_reg_match2 _((VALUE));
+int rb_reg_options _((VALUE));
+void rb_set_kcode _((const char*));
+const char* rb_get_kcode _((void));
+void rb_kcode_set_option _((VALUE));
+void rb_kcode_reset_option _((void));
+/* ruby.c */
+RUBY_EXTERN VALUE rb_argv;
+RUBY_EXTERN VALUE rb_argv0;
+void rb_load_file _((const char*));
+void ruby_script _((const char*));
+void ruby_prog_init _((void));
+void ruby_set_argv _((int, char**));
+void ruby_process_options _((int, char**));
+void ruby_load_script _((void));
+void ruby_init_loadpath _((void));
+void ruby_incpush _((const char*));
+/* signal.c */
+VALUE rb_f_kill _((int, VALUE*));
+void rb_gc_mark_trap_list _((void));
+#ifdef POSIX_SIGNAL
+#define posix_signal ruby_posix_signal
+void posix_signal _((int, RETSIGTYPE (*)(int)));
+#endif
+void rb_trap_exit _((void));
+void rb_trap_exec _((void));
+const char *ruby_signal_name _((int));
+void ruby_default_signal _((int));
+/* sprintf.c */
+VALUE rb_f_sprintf _((int, VALUE*));
+VALUE rb_str_format _((int, VALUE*, VALUE));
+/* string.c */
+VALUE rb_str_new _((const char*, long));
+VALUE rb_str_new2 _((const char*));
+VALUE rb_str_new3 _((VALUE));
+VALUE rb_str_new4 _((VALUE));
+VALUE rb_str_new5 _((VALUE, const char*, long));
+VALUE rb_tainted_str_new _((const char*, long));
+VALUE rb_tainted_str_new2 _((const char*));
+VALUE rb_str_buf_new _((long));
+VALUE rb_str_buf_new2 _((const char*));
+VALUE rb_str_tmp_new _((long));
+VALUE rb_str_buf_append _((VALUE, VALUE));
+VALUE rb_str_buf_cat _((VALUE, const char*, long));
+VALUE rb_str_buf_cat2 _((VALUE, const char*));
+VALUE rb_obj_as_string _((VALUE));
+VALUE rb_check_string_type _((VALUE));
+VALUE rb_str_dup _((VALUE));
+VALUE rb_str_locktmp _((VALUE));
+VALUE rb_str_unlocktmp _((VALUE));
+VALUE rb_str_dup_frozen _((VALUE));
+VALUE rb_str_plus _((VALUE, VALUE));
+VALUE rb_str_times _((VALUE, VALUE));
+VALUE rb_str_substr _((VALUE, long, long));
+void rb_str_modify _((VALUE));
+VALUE rb_str_freeze _((VALUE));
+void rb_str_set_len _((VALUE, long));
+VALUE rb_str_resize _((VALUE, long));
+VALUE rb_str_cat _((VALUE, const char*, long));
+VALUE rb_str_cat2 _((VALUE, const char*));
+VALUE rb_str_append _((VALUE, VALUE));
+VALUE rb_str_concat _((VALUE, VALUE));
+int rb_str_hash _((VALUE));
+int rb_str_cmp _((VALUE, VALUE));
+VALUE rb_str_upto _((VALUE, VALUE, int));
+void rb_str_update _((VALUE, long, long, VALUE));
+VALUE rb_str_inspect _((VALUE));
+VALUE rb_str_dump _((VALUE));
+VALUE rb_str_split _((VALUE, const char*));
+void rb_str_associate _((VALUE, VALUE));
+VALUE rb_str_associated _((VALUE));
+void rb_str_setter _((VALUE, ID, VALUE*));
+VALUE rb_str_intern _((VALUE));
+/* struct.c */
+VALUE rb_struct_new __((VALUE, ...));
+VALUE rb_struct_define __((const char*, ...));
+VALUE rb_struct_alloc _((VALUE, VALUE));
+VALUE rb_struct_aref _((VALUE, VALUE));
+VALUE rb_struct_aset _((VALUE, VALUE, VALUE));
+VALUE rb_struct_getmember _((VALUE, ID));
+VALUE rb_struct_iv_get _((VALUE, const char*));
+VALUE rb_struct_s_members _((VALUE));
+VALUE rb_struct_members _((VALUE));
+/* time.c */
+VALUE rb_time_new _((time_t, time_t));
+/* variable.c */
+VALUE rb_mod_name _((VALUE));
+VALUE rb_class_path _((VALUE));
+void rb_set_class_path _((VALUE, VALUE, const char*));
+VALUE rb_path2class _((const char*));
+void rb_name_class _((VALUE, ID));
+VALUE rb_class_name _((VALUE));
+void rb_autoload _((VALUE, ID, const char*));
+VALUE rb_autoload_load _((VALUE, ID));
+VALUE rb_autoload_p _((VALUE, ID));
+void rb_gc_mark_global_tbl _((void));
+VALUE rb_f_trace_var _((int, VALUE*));
+VALUE rb_f_untrace_var _((int, VALUE*));
+VALUE rb_f_global_variables _((void));
+void rb_alias_variable _((ID, ID));
+struct st_table* rb_generic_ivar_table _((VALUE));
+void rb_copy_generic_ivar _((VALUE,VALUE));
+void rb_mark_generic_ivar _((VALUE));
+void rb_mark_generic_ivar_tbl _((void));
+void rb_free_generic_ivar _((VALUE));
+VALUE rb_ivar_get _((VALUE, ID));
+VALUE rb_ivar_set _((VALUE, ID, VALUE));
+VALUE rb_ivar_defined _((VALUE, ID));
+VALUE rb_iv_set _((VALUE, const char*, VALUE));
+VALUE rb_iv_get _((VALUE, const char*));
+VALUE rb_attr_get _((VALUE, ID));
+VALUE rb_obj_instance_variables _((VALUE));
+VALUE rb_obj_remove_instance_variable _((VALUE, VALUE));
+void *rb_mod_const_at _((VALUE, void*));
+void *rb_mod_const_of _((VALUE, void*));
+VALUE rb_const_list _((void*));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_remove_const _((VALUE, VALUE));
+int rb_const_defined _((VALUE, ID));
+int rb_const_defined_at _((VALUE, ID));
+int rb_const_defined_from _((VALUE, ID));
+VALUE rb_const_get _((VALUE, ID));
+VALUE rb_const_get_at _((VALUE, ID));
+VALUE rb_const_get_from _((VALUE, ID));
+void rb_const_set _((VALUE, ID, VALUE));
+VALUE rb_mod_constants _((VALUE));
+VALUE rb_mod_const_missing _((VALUE,VALUE));
+VALUE rb_cvar_defined _((VALUE, ID));
+#define RB_CVAR_SET_4ARGS 1
+void rb_cvar_set _((VALUE, ID, VALUE, int));
+VALUE rb_cvar_get _((VALUE, ID));
+void rb_cv_set _((VALUE, const char*, VALUE));
+VALUE rb_cv_get _((VALUE, const char*));
+void rb_define_class_variable _((VALUE, const char*, VALUE));
+VALUE rb_mod_class_variables _((VALUE));
+VALUE rb_mod_remove_cvar _((VALUE, VALUE));
+/* version.c */
+void ruby_show_version _((void));
+void ruby_show_copyright _((void));
diff --git a/io.c b/io.c
index 52216cff43..7663733d1e 100644
--- a/io.c
+++ b/io.c
@@ -3,35 +3,27 @@
   io.c -
 
   $Author$
+  $Date$
   created at: Fri Oct 15 18:08:59 JST 1993
 
-  Copyright (C) 1993-2007 Yukihiro Matsumoto
+  Copyright (C) 1993-2003 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/io.h"
-#include "ruby/signal.h"
-#include "vm_core.h"
-#include <ctype.h>
-#include <errno.h>
-
-#define free(x) xfree(x)
-
-#if defined(DOSISH) || defined(__CYGWIN__)
-#include <io.h>
+#if defined(__VMS)
+#define _XOPEN_SOURCE
+#define _POSIX_C_SOURCE 2
 #endif
 
-#include <sys/types.h>
-#if !defined(_WIN32) && !defined(__DJGPP__)
-# if defined(__BEOS__)
-#  include <net/socket.h>
-# else
-#  include <sys/socket.h>
-# endif
-#endif
+#include "ruby.h"
+#include "rubyio.h"
+#include "rubysig.h"
+#include "env.h"
+#include "re.h"
+#include <ctype.h>
+#include <errno.h>
 
 #if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN__) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__) || defined(__BEOS__)
 # define NO_SAFE_RENAME
@@ -58,10 +50,19 @@
 #elif defined(HAVE_SYS_FCNTL_H)
 #include <sys/fcntl.h>
 #endif
+#ifdef __CYGWIN__
+#include <io.h>
+#endif
 
 #if !HAVE_OFF_T && !defined(off_t)
 # define off_t  long
 #endif
+#if !HAVE_FSEEKO && !defined(fseeko)
+# define fseeko  fseek
+#endif
+#if !HAVE_FTELLO && !defined(ftello)
+# define ftello  ftell
+#endif
 
 #include <sys/stat.h>
 
@@ -75,16 +76,16 @@
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #ifdef HAVE_SYSCALL_H
 #include <syscall.h>
 #elif defined HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
 
-extern void Init_File(void);
+#include <unistd.h>
+#endif
+
+extern void Init_File _((void));
 
 #ifdef __BEOS__
 # ifndef NOFILE
@@ -93,7 +94,7 @@ extern void Init_File(void);
 #include <net/socket.h>
 #endif
 
-#include "ruby/util.h"
+#include "util.h"
 
 #ifndef O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
@@ -126,106 +127,93 @@ VALUE rb_default_rs;
 
 static VALUE argf;
 
-static ID id_write, id_read, id_getc, id_flush, id_encode, id_readpartial;
-static VALUE sym_mode, sym_perm, sym_extenc, sym_intenc, sym_encoding, sym_open_args;
-
-struct timeval rb_time_interval(VALUE);
+static ID id_write, id_read, id_getc;
 
-struct argf {
-    VALUE filename, current_file;
-    int gets_lineno;
-    int init_p, next_p;
-    VALUE lineno;
-    VALUE argv;
-    char *inplace;
-    int binmode;
-    rb_encoding *enc, *enc2;
-};
+extern char *ruby_inplace_mode;
 
-static int max_file_descriptor = NOFILE;
-#define UPDATE_MAXFD(fd) \
-    do { \
-        if (max_file_descriptor < (fd)) max_file_descriptor = (fd); \
-    } while (0)
+struct timeval rb_time_interval _((VALUE));
 
-#define argf_of(obj) (*(struct argf *)DATA_PTR(obj))
-#define ARGF argf_of(argf)
+static VALUE filename, current_file;
+static int gets_lineno;
+static int init_p = 0, next_p = 0;
+static VALUE lineno = INT2FIX(0);
 
 #ifdef _STDIO_USES_IOSTREAM  /* GNU libc */
 #  ifdef _IO_fpos_t
-#    define STDIO_READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
+#    define READ_DATA_PENDING(fp) ((fp)->_IO_read_ptr != (fp)->_IO_read_end)
+#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+#    define READ_DATA_PENDING_PTR(fp) ((fp)->_IO_read_ptr)
 #  else
-#    define STDIO_READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
+#    define READ_DATA_PENDING(fp) ((fp)->_gptr < (fp)->_egptr)
+#    define READ_DATA_PENDING_COUNT(fp) ((fp)->_egptr - (fp)->_gptr)
+#    define READ_DATA_PENDING_PTR(fp) ((fp)->_gptr)
 #  endif
+#elif defined(_LP64) && (defined(__sun__) || defined(__sun))
+typedef struct _FILE64 {
+  unsigned char        *_ptr;  /* next character from/to here in buffer */
+  unsigned char        *_base; /* the buffer */
+  unsigned char        *_end;  /* the end of the buffer */
+  ssize_t      _cnt;   /* number of available characters in buffer */
+  int          _file;  /* UNIX System file descriptor */
+  unsigned int _flag;  /* the state of the stream */
+  char         __fill[80];     /* filler to bring size to 128 bytes */
+} FILE64;
+#  define READ_DATA_PENDING(fp) (((FILE64*)(fp))->_cnt > 0)
+#  define READ_DATA_PENDING_COUNT(fp) (((FILE64*)(fp))->_cnt)
+#  define READ_DATA_PENDING_PTR(fp) ((char *)((FILE64*)(fp))->_ptr)
 #elif defined(FILE_COUNT)
-#  define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
+#  define READ_DATA_PENDING(fp) ((fp)->FILE_COUNT > 0)
+#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_COUNT)
 #elif defined(FILE_READEND)
-#  define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+#  define READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND)
+#  define READ_DATA_PENDING_COUNT(fp) ((fp)->FILE_READEND - (fp)->FILE_READPTR)
 #elif defined(__BEOS__)
-#  define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0)
+#  define READ_DATA_PENDING(fp) (fp->_state._eof == 0)
 #elif defined(__VMS)
-#  define STDIO_READ_DATA_PENDING(fp) (((unsigned int)(*(fp))->_cnt) > 0)
+#  define READ_DATA_PENDING_COUNT(fp) ((unsigned int)(*(fp))->_cnt)
+#  define READ_DATA_PENDING(fp)       (((unsigned int)(*(fp))->_cnt) > 0)
+#  define READ_DATA_BUFFERED(fp) 0
+#elif defined(__DragonFly__)
+/* FILE is an incomplete struct type since DragonFly BSD 1.4.0 */
+#  define READ_DATA_PENDING(fp) (((struct __FILE_public *)(fp))->_r > 0)
+#  define READ_DATA_PENDING_COUNT(fp) (((struct __FILE_public *)(fp))->_r)
 #else
-#  define STDIO_READ_DATA_PENDING(fp) (!feof(fp))
+/* requires systems own version of the ReadDataPending() */
+extern int ReadDataPending();
+#  define READ_DATA_PENDING(fp) (!feof(fp))
+#  define READ_DATA_BUFFERED(fp) 0
 #endif
-
-#if defined(__VMS)
-#define fopen(file_spec, mode)  fopen(file_spec, mode, "rfm=stmlf")
-#define open(file_spec, flags, mode)  open(file_spec, flags, mode, "rfm=stmlf")
+#ifndef READ_DATA_BUFFERED
+#  define READ_DATA_BUFFERED(fp) READ_DATA_PENDING(fp)
 #endif
 
-#define GetWriteIO(io) rb_io_get_write_io(io)
+#ifndef READ_DATA_PENDING_PTR
+# ifdef FILE_READPTR
+#  define READ_DATA_PENDING_PTR(fp) ((char *)(fp)->FILE_READPTR)
+# endif
+#endif
 
-#define READ_DATA_PENDING(fptr) ((fptr)->rbuf_len)
-#define READ_DATA_PENDING_COUNT(fptr) ((fptr)->rbuf_len)
-#define READ_DATA_PENDING_PTR(fptr) ((fptr)->rbuf+(fptr)->rbuf_off)
-#define READ_DATA_BUFFERED(fptr) READ_DATA_PENDING(fptr)
+#if defined __DJGPP__
+# undef READ_DATA_PENDING_COUNT
+# undef READ_DATA_PENDING_PTR
+#endif
 
-#define READ_CHECK(fptr) do {\
-    if (!READ_DATA_PENDING(fptr)) {\
-	rb_thread_wait_fd((fptr)->fd);\
-	rb_io_check_closed(fptr);\
+#define READ_CHECK(fp) do {\
+    if (!READ_DATA_PENDING(fp)) {\
+	rb_thread_wait_fd(fileno(fp));\
+        rb_io_check_closed(fptr);\
      }\
 } while(0)
 
-#ifndef S_ISSOCK
-#  ifdef _S_ISSOCK
-#    define S_ISSOCK(m) _S_ISSOCK(m)
-#  else
-#    ifdef _S_IFSOCK
-#      define S_ISSOCK(m) ((m & S_IFMT) == _S_IFSOCK)
-#    else
-#      ifdef S_IFSOCK
-#	 define S_ISSOCK(m) ((m & S_IFMT) == S_IFSOCK)
-#      endif
-#    endif
-#  endif
-#endif
-
-#if defined(_WIN32)
-#define is_socket(fd, path)	rb_w32_is_socket(fd)
-#elif !defined(S_ISSOCK)
-#define is_socket(fd, path)	0
-#define shutdown(a,b)	0
-#else
-static int
-is_socket(int fd, const char *path)
-{
-    struct stat sbuf;
-    if (fstat(fd, &sbuf) < 0)
-        rb_sys_fail(path);
-    return S_ISSOCK(sbuf.st_mode);
-}
-#endif
-
 void
-rb_eof_error(void)
+rb_eof_error()
 {
     rb_raise(rb_eEOFError, "end of file reached");
 }
 
 VALUE
-rb_io_taint_check(VALUE io)
+rb_io_taint_check(io)
+    VALUE io;
 {
     if (!OBJ_TAINTED(io) && rb_safe_level() >= 4)
 	rb_raise(rb_eSecurityError, "Insecure: operation on untainted IO");
@@ -234,7 +222,8 @@ rb_io_taint_check(VALUE io)
 }
 
 void
-rb_io_check_initialized(rb_io_t *fptr)
+rb_io_check_initialized(fptr)
+    rb_io_t *fptr;
 {
     if (!fptr) {
 	rb_raise(rb_eIOError, "uninitialized stream");
@@ -242,126 +231,30 @@ rb_io_check_initialized(rb_io_t *fptr)
 }
 
 void
-rb_io_check_closed(rb_io_t *fptr)
+rb_io_check_closed(fptr)
+    rb_io_t *fptr;
 {
     rb_io_check_initialized(fptr);
-    if (fptr->fd < 0) {
+    if (!fptr->f && !fptr->f2) {
 	rb_raise(rb_eIOError, "closed stream");
     }
 }
 
-static int io_fflush(rb_io_t *);
-
-VALUE
-rb_io_get_io(VALUE io)
-{
-    return rb_convert_type(io, T_FILE, "IO", "to_io");
-}
-
-static VALUE
-rb_io_check_io(VALUE io)
-{
-    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
-}
-
-VALUE
-rb_io_get_write_io(VALUE io)
-{
-    VALUE write_io;
-    rb_io_check_initialized(RFILE(io)->fptr);
-    write_io = RFILE(io)->fptr->tied_io_for_writing;
-    if (write_io) {
-        return write_io;
-    }
-    return io;
-}
-
-/*
- *  call-seq:
- *     IO.try_convert(obj) -> io or nil
- *
- *  Try to convert <i>obj</i> into an IO, using to_io method.
- *  Returns converted IO or nil if <i>obj</i> cannot be converted
- *  for any reason.
- *
- *     IO.try_convert(STDOUT)     # => STDOUT
- *     IO.try_convert("STDOUT")   # => nil
- */
-static VALUE
-rb_io_s_try_convert(VALUE dummy, VALUE io)
-{
-    return rb_io_check_io(io);
-}
-
-static void
-io_unread(rb_io_t *fptr)
-{
-    off_t r;
-    rb_io_check_closed(fptr);
-    if (fptr->rbuf_len == 0 || fptr->mode & FMODE_DUPLEX)
-        return;
-    /* xxx: target position may be negative if buffer is filled by ungetc */
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    if (!(fptr->mode & FMODE_BINMODE)) {
-	int len = fptr->rbuf_len;
-	while (fptr->rbuf_len-- > 0) {
-	    if (fptr->rbuf[fptr->rbuf_len] == '\n')
-		++len;
-	}
-	r = lseek(fptr->fd, -len, SEEK_CUR);
-    }
-    else
-#endif
-    r = lseek(fptr->fd, -fptr->rbuf_len, SEEK_CUR);
-    if (r < 0) {
-        if (errno == ESPIPE)
-            fptr->mode |= FMODE_DUPLEX;
-        return;
-    }
-    fptr->rbuf_off = 0;
-    fptr->rbuf_len = 0;
-    return;
-}
-
-static void
-io_ungetc(VALUE str, rb_io_t *fptr)
-{
-    int len = RSTRING_LEN(str);
-
-    if (fptr->rbuf == NULL) {
-        fptr->rbuf_off = 0;
-        fptr->rbuf_len = 0;
-	if (len > 8192)
-	    fptr->rbuf_capa = len;
-	else
-	    fptr->rbuf_capa = 8192;
-        fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
-    }
-    if (fptr->rbuf_capa < len + fptr->rbuf_len) {
-	rb_raise(rb_eIOError, "ungetc failed");
-    }
-    if (fptr->rbuf_off < len) {
-        MEMMOVE(fptr->rbuf+fptr->rbuf_capa-fptr->rbuf_len,
-                fptr->rbuf+fptr->rbuf_off,
-                char, fptr->rbuf_len);
-        fptr->rbuf_off = fptr->rbuf_capa-fptr->rbuf_len;
-    }
-    fptr->rbuf_off-=len;
-    fptr->rbuf_len+=len;
-    MEMMOVE(fptr->rbuf+fptr->rbuf_off, RSTRING_PTR(str), char, len);
-}
+static void io_fflush _((FILE *, rb_io_t *));
 
 static rb_io_t *
-flush_before_seek(rb_io_t *fptr)
+flush_before_seek(fptr)
+    rb_io_t *fptr;
 {
-    io_fflush(fptr);
-    io_unread(fptr);
+    if (fptr->mode & FMODE_WBUF) {
+	io_fflush(GetWriteFile(fptr), fptr);
+    }
     errno = 0;
     return fptr;
 }
 
-#define io_seek(fptr, ofs, whence) lseek(flush_before_seek(fptr)->fd, ofs, whence)
-#define io_tell(fptr) lseek(flush_before_seek(fptr)->fd, 0, SEEK_CUR)
+#define io_seek(fptr, ofs, whence) fseeko(flush_before_seek(fptr)->f, ofs, whence)
+#define io_tell(fptr) ftello(flush_before_seek(fptr)->f)
 
 #ifndef SEEK_CUR
 # define SEEK_SET 0
@@ -372,86 +265,59 @@ flush_before_seek(rb_io_t *fptr)
 #define FMODE_SYNCWRITE (FMODE_SYNC|FMODE_WRITABLE)
 
 void
-rb_io_check_readable(rb_io_t *fptr)
+rb_io_check_readable(fptr)
+    rb_io_t *fptr;
 {
     rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "not opened for reading");
     }
-    if (fptr->wbuf_len) {
-        io_fflush(fptr);
-    }
-    if (fptr->tied_io_for_writing) {
-	rb_io_t *wfptr;
-	GetOpenFile(fptr->tied_io_for_writing, wfptr);
-	io_fflush(wfptr);
+#ifdef NEED_IO_SEEK_BETWEEN_RW
+    if (((fptr->mode & FMODE_WBUF) ||
+	 (fptr->mode & (FMODE_SYNCWRITE|FMODE_RBUF)) == FMODE_SYNCWRITE) &&
+	!feof(fptr->f) &&
+	!fptr->f2) {
+	io_seek(fptr, 0, SEEK_CUR);
     }
-    if (!fptr->enc && fptr->fd == 0) {
-	fptr->enc = rb_default_external_encoding();
-    }
-}
-
-static rb_encoding*
-io_read_encoding(rb_io_t *fptr)
-{
-    if (fptr->enc) {
-	return fptr->enc;
-    }
-    return rb_default_external_encoding();
-}
-
-static rb_encoding*
-io_input_encoding(rb_io_t *fptr)
-{
-    if (fptr->enc2) {
-	return fptr->enc2;
-    }
-    return io_read_encoding(fptr);
+#endif
+    fptr->mode |= FMODE_RBUF;
 }
 
 void
-rb_io_check_writable(rb_io_t *fptr)
+rb_io_check_writable(fptr)
+    rb_io_t *fptr;
 {
     rb_io_check_closed(fptr);
     if (!(fptr->mode & FMODE_WRITABLE)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
-    if (fptr->rbuf_len) {
-        io_unread(fptr);
+    if ((fptr->mode & FMODE_RBUF) && !feof(fptr->f) && !fptr->f2) {
+	io_seek(fptr, 0, SEEK_CUR);
+    }
+    if (!fptr->f2) {
+	fptr->mode &= ~FMODE_RBUF;
     }
 }
 
 int
-rb_read_pending(FILE *fp)
-{
-    return STDIO_READ_DATA_PENDING(fp);
-}
-
-int
-rb_io_read_pending(rb_io_t *fptr)
+rb_read_pending(fp)
+    FILE *fp;
 {
-    return READ_DATA_PENDING(fptr);
+    return READ_DATA_PENDING(fp);
 }
 
 void
-rb_read_check(FILE *fp)
+rb_read_check(fp)
+    FILE *fp;
 {
-    if (!STDIO_READ_DATA_PENDING(fp)) {
+    if (!READ_DATA_PENDING(fp)) {
 	rb_thread_wait_fd(fileno(fp));
     }
 }
 
-void
-rb_io_read_check(rb_io_t *fptr)
-{
-    if (!READ_DATA_PENDING(fptr)) {
-	rb_thread_wait_fd(fptr->fd);
-    }
-    return;
-}
-
 static int
-ruby_dup(int orig)
+ruby_dup(orig)
+    int orig;
 {
     int fd;
 
@@ -468,8 +334,10 @@ ruby_dup(int orig)
     return fd;
 }
 
+static VALUE io_alloc _((VALUE));
 static VALUE
-io_alloc(VALUE klass)
+io_alloc(klass)
+    VALUE klass;
 {
     NEWOBJ(io, struct RFile);
     OBJSETUP(io, klass, T_FILE);
@@ -479,138 +347,33 @@ io_alloc(VALUE klass)
     return (VALUE)io;
 }
 
-#ifndef S_ISREG
-#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
-#endif
-
-static int
-wsplit_p(rb_io_t *fptr)
-{
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
-    int r;
-#endif
-
-    if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
-        struct stat buf;
-        if (fstat(fptr->fd, &buf) == 0 &&
-            !S_ISREG(buf.st_mode)
-#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
-            && (r = fcntl(fptr->fd, F_GETFL)) != -1 &&
-            !(r & O_NONBLOCK)
-#endif
-            ) {
-            fptr->mode |= FMODE_WSPLIT;
-        }
-        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
-    }
-    return fptr->mode & FMODE_WSPLIT;
-}
-
-struct io_internal_struct {
-    int fd;
-    void *buf;
-    size_t capa;
-};
-
-static VALUE
-internal_read_func(void *ptr)
-{
-    struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
-    return read(iis->fd, iis->buf, iis->capa);
-}
-
-static VALUE
-internal_write_func(void *ptr)
-{
-    struct io_internal_struct *iis = (struct io_internal_struct*)ptr;
-    return write(iis->fd, iis->buf, iis->capa);
-}
-
-static int
-rb_read_internal(int fd, void *buf, size_t count)
-{
-    struct io_internal_struct iis;
-    iis.fd = fd;
-    iis.buf = buf;
-    iis.capa = count;
-
-    return rb_thread_blocking_region(internal_read_func, &iis, RB_UBF_DFL, 0);
-}
-
-static int
-rb_write_internal(int fd, void *buf, size_t count)
-{
-    struct io_internal_struct iis;
-    iis.fd = fd;
-    iis.buf = buf;
-    iis.capa = count;
-
-    return rb_thread_blocking_region(internal_write_func, &iis, RB_UBF_DFL, 0);
-}
-
-static int
-io_fflush(rb_io_t *fptr)
+static void
+io_fflush(f, fptr)
+    FILE *f;
+    rb_io_t *fptr;
 {
-    int r, l;
-    int wbuf_off, wbuf_len;
+    int n;
 
-    rb_io_check_closed(fptr);
-    if (fptr->wbuf_len == 0)
-        return 0;
-    if (!rb_thread_fd_writable(fptr->fd)) {
+    if (!rb_thread_fd_writable(fileno(f))) {
         rb_io_check_closed(fptr);
     }
-  retry:
-    if (fptr->wbuf_len == 0)
-        return 0;
-    wbuf_off = fptr->wbuf_off;
-    wbuf_len = fptr->wbuf_len;
-    l = wbuf_len;
-    if (PIPE_BUF < l &&
-        !rb_thread_critical &&
-        !rb_thread_alone() &&
-        wsplit_p(fptr)) {
-        l = PIPE_BUF;
-    }
-    r = rb_write_internal(fptr->fd, fptr->wbuf+wbuf_off, l);
-    /* xxx: Other threads may modify wbuf.
-     * A lock is required, definitely. */
-    rb_io_check_closed(fptr);
-    if (fptr->wbuf_len <= r) {
-        fptr->wbuf_off = 0;
-        fptr->wbuf_len = 0;
-        return 0;
-    }
-    if (0 <= r) {
-        fptr->wbuf_off += r;
-        fptr->wbuf_len -= r;
-        errno = EAGAIN;
-    }
-    if (rb_io_wait_writable(fptr->fd)) {
-        rb_io_check_closed(fptr);
-        goto retry;
+    for (;;) {
+	TRAP_BEG;
+	n = fflush(f);
+	TRAP_END;
+	if (n != EOF) break;
+	if (!rb_io_wait_writable(fileno(f)))
+	    rb_sys_fail(fptr->path);
     }
-    return -1;
-}
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_readable(VALUE p)
-{
-    rb_fdset_t *rfds = (rb_fdset_t *)p;
-
-    return rb_thread_select(rb_fd_max(rfds), rb_fd_ptr(rfds), NULL, NULL, NULL);
+    fptr->mode &= ~FMODE_WBUF;
 }
-#endif
 
 int
-rb_io_wait_readable(int f)
+rb_io_wait_readable(f)
+    int f;
 {
-    rb_fdset_t rfds;
+    fd_set rfds;
 
-    if (f < 0) {
-	rb_raise(rb_eIOError, "closed stream");
-    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -623,14 +386,9 @@ rb_io_wait_readable(int f)
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	rb_fd_init(&rfds);
-	rb_fd_set(f, &rfds);
-#ifdef HAVE_RB_FD_INIT
-	rb_ensure(wait_readable, (VALUE)&rfds,
-		  (VALUE (*)(VALUE))rb_fd_term, (VALUE)&rfds);
-#else
+	FD_ZERO(&rfds);
+	FD_SET(f, &rfds);
 	rb_thread_select(f + 1, &rfds, NULL, NULL, NULL);
-#endif
 	return Qtrue;
 
       default:
@@ -638,24 +396,12 @@ rb_io_wait_readable(int f)
     }
 }
 
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-wait_writable(VALUE p)
-{
-    rb_fdset_t *wfds = (rb_fdset_t *)p;
-
-    return rb_thread_select(rb_fd_max(wfds), NULL, rb_fd_ptr(wfds), NULL, NULL);
-}
-#endif
-
 int
-rb_io_wait_writable(int f)
+rb_io_wait_writable(f)
+    int f;
 {
-    rb_fdset_t wfds;
+    fd_set wfds;
 
-    if (f < 0) {
-	rb_raise(rb_eIOError, "closed stream");
-    }
     switch (errno) {
       case EINTR:
 #if defined(ERESTART)
@@ -668,14 +414,9 @@ rb_io_wait_writable(int f)
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
       case EWOULDBLOCK:
 #endif
-	rb_fd_init(&wfds);
-	rb_fd_set(f, &wfds);
-#ifdef HAVE_RB_FD_INIT
-	rb_ensure(wait_writable, (VALUE)&wfds,
-		  (VALUE (*)(VALUE))rb_fd_term, (VALUE)&wfds);
-#else
+	FD_ZERO(&wfds);
+	FD_SET(f, &wfds);
 	rb_thread_select(f + 1, NULL, &wfds, NULL, NULL);
-#endif
 	return Qtrue;
 
       default:
@@ -683,59 +424,48 @@ rb_io_wait_writable(int f)
     }
 }
 
+#ifndef S_ISREG
+#   define S_ISREG(m) ((m & S_IFMT) == S_IFREG)
+#endif
+
+static int
+wsplit_p(rb_io_t *fptr)
+{
+    FILE *f = GetWriteFile(fptr);
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+    int r;
+#endif
+
+    if (!(fptr->mode & FMODE_WSPLIT_INITIALIZED)) {
+        struct stat buf;
+        if (fstat(fileno(f), &buf) == 0 &&
+            !S_ISREG(buf.st_mode)
+#if defined(HAVE_FCNTL) && defined(F_GETFL) && defined(O_NONBLOCK)
+            && (r = fcntl(fileno(f), F_GETFL)) != -1 &&
+            !(r & O_NONBLOCK)
+#endif
+            ) {
+            fptr->mode |= FMODE_WSPLIT;
+        }
+        fptr->mode |= FMODE_WSPLIT_INITIALIZED;
+    }
+    return fptr->mode & FMODE_WSPLIT;
+}
+
 /* writing functions */
 static long
-io_fwrite(VALUE str, rb_io_t *fptr)
+io_fwrite(str, fptr)
+    VALUE str;
+    rb_io_t *fptr;
 {
     long len, n, r, l, offset = 0;
+    FILE *f = GetWriteFile(fptr);
 
-    /*
-     * If an external encoding was specified and it differs from
-     * the strings encoding then we must transcode before writing.
-     * We must also transcode if two encodings were specified
-     */
-    if (fptr->enc) {
-	/* transcode str before output */
-	/* the methods in transcode.c are static, so call indirectly */
-	/* Can't use encode! because puts writes a frozen newline */
-	if (fptr->enc2) {
-	    str = rb_funcall(str, id_encode, 2,
-			     rb_enc_from_encoding(fptr->enc2),
-			     rb_enc_from_encoding(fptr->enc));
-	}
-	else {
-	    str = rb_funcall(str, id_encode, 1,
-			     rb_enc_from_encoding(fptr->enc));
-	}
-    }
-
-    len = RSTRING_LEN(str);
+    len = RSTRING(str)->len;
     if ((n = len) <= 0) return n;
-    if (fptr->wbuf == NULL && !(fptr->mode & FMODE_SYNC)) {
-        fptr->wbuf_off = 0;
-        fptr->wbuf_len = 0;
-        fptr->wbuf_capa = 8192;
-        fptr->wbuf = ALLOC_N(char, fptr->wbuf_capa);
-    }
-    if ((fptr->mode & (FMODE_SYNC|FMODE_TTY)) ||
-        (fptr->wbuf && fptr->wbuf_capa <= fptr->wbuf_len + len)) {
-        /* xxx: use writev to avoid double write if available */
-        if (fptr->wbuf_len && fptr->wbuf_len+len <= fptr->wbuf_capa) {
-            if (fptr->wbuf_capa < fptr->wbuf_off+fptr->wbuf_len+len) {
-                MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
-                fptr->wbuf_off = 0;
-            }
-            MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
-            fptr->wbuf_len += len;
-            n = 0;
-        }
-        if (io_fflush(fptr) < 0)
-            return -1L;
-        if (n == 0)
-            return len;
-        /* avoid context switch between "a" and "\n" in STDERR.puts "a".
-           [ruby-dev:25080] */
-	if (fptr->stdio_file != stderr && !rb_thread_fd_writable(fptr->fd)) {
+    if (fptr->mode & FMODE_SYNC) {
+	io_fflush(f, fptr);
+	if (!rb_thread_fd_writable(fileno(f))) {
 	    rb_io_check_closed(fptr);
 	}
       retry:
@@ -746,39 +476,70 @@ io_fwrite(VALUE str, rb_io_t *fptr)
             wsplit_p(fptr)) {
             l = PIPE_BUF;
         }
-	r = rb_write_internal(fptr->fd, RSTRING_PTR(str)+offset, l);
-	/* xxx: other threads may modify given string. */
+        TRAP_BEG;
+	r = write(fileno(f), RSTRING(str)->ptr+offset, l);
+        TRAP_END;
         if (r == n) return len;
         if (0 <= r) {
             offset += r;
             n -= r;
             errno = EAGAIN;
         }
-        if (rb_io_wait_writable(fptr->fd)) {
+        if (rb_io_wait_writable(fileno(f))) {
             rb_io_check_closed(fptr);
-	    if (offset < RSTRING_LEN(str))
+	    if (offset < RSTRING(str)->len)
 		goto retry;
         }
         return -1L;
     }
-
-    if (fptr->wbuf_off) {
-        if (fptr->wbuf_len)
-            MEMMOVE(fptr->wbuf, fptr->wbuf+fptr->wbuf_off, char, fptr->wbuf_len);
-        fptr->wbuf_off = 0;
+#if defined(__human68k__) || defined(__vms)
+    do {
+	if (fputc(RSTRING(str)->ptr[offset++], f) == EOF) {
+	    if (ferror(f)) return -1L;
+	    break;
+	}
+    } while (--n > 0);
+#else
+    while (errno = 0, offset += (r = fwrite(RSTRING(str)->ptr+offset, 1, n, f)), (n -= r) > 0) {
+	if (ferror(f)
+#if defined __BORLANDC__
+	    || errno
+#endif
+	) {
+#ifdef __hpux
+	    if (!errno) errno = EAGAIN;
+#elif defined(_WIN32) && !defined(__BORLANDC__)
+	    /* workaround for MSVCRT's bug */
+	    if (!errno) {
+		if (GetLastError() == ERROR_NO_DATA)
+		    errno = EPIPE;
+		else
+		    errno = EBADF;
+	    }
+#endif
+	    if (rb_io_wait_writable(fileno(f))) {
+		rb_io_check_closed(fptr);
+		clearerr(f);
+		if (offset < RSTRING(str)->len)
+		    continue;
+	    }
+	    return -1L;
+	}
     }
-    MEMMOVE(fptr->wbuf+fptr->wbuf_off+fptr->wbuf_len, RSTRING_PTR(str)+offset, char, len);
-    fptr->wbuf_len += len;
-    return len;
+#endif
+    return len - n;
 }
 
 long
-rb_io_fwrite(const char *ptr, long len, FILE *f)
+rb_io_fwrite(ptr, len, f)
+    const char *ptr;
+    long len;
+    FILE *f;
 {
     rb_io_t of;
 
-    of.fd = fileno(f);
-    of.stdio_file = f;
+    of.f = f;
+    of.f2 = NULL;
     of.mode = FMODE_WRITABLE;
     of.path = NULL;
     return io_fwrite(rb_str_new(ptr, len), &of);
@@ -787,50 +548,53 @@ rb_io_fwrite(const char *ptr, long len, FILE *f)
 /*
  *  call-seq:
  *     ios.write(string)    => integer
- *
+ *  
  *  Writes the given string to <em>ios</em>. 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.
- *
+ *     
  *     count = $stdout.write( "This is a test\n" )
  *     puts "That was #{count} bytes of data"
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     This is a test
  *     That was 15 bytes of data
  */
 
 static VALUE
-io_write(VALUE io, VALUE str)
+io_write(io, str)
+    VALUE io, str;
 {
     rb_io_t *fptr;
     long n;
-    VALUE tmp;
 
     rb_secure(4);
-    io = GetWriteIO(io);
-    str = rb_obj_as_string(str);
-    tmp = rb_io_check_io(io);
-    if (NIL_P(tmp)) {
+    if (TYPE(str) != T_STRING)
+	str = rb_obj_as_string(str);
+
+    if (TYPE(io) != T_FILE) {
 	/* port is not IO, call write method for it. */
 	return rb_funcall(io, id_write, 1, str);
     }
-    io = tmp;
-    if (RSTRING_LEN(str) == 0) return INT2FIX(0);
+    if (RSTRING(str)->len == 0) return INT2FIX(0);
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
     n = io_fwrite(str, fptr);
     if (n == -1L) rb_sys_fail(fptr->path);
+    if (!(fptr->mode & FMODE_SYNC)) {
+	fptr->mode |= FMODE_WBUF;
+    }
 
     return LONG2FIX(n);
 }
 
 VALUE
-rb_io_write(VALUE io, VALUE str)
+rb_io_write(io, str)
+    VALUE io, str;
 {
     return rb_funcall(io, id_write, 1, str);
 }
@@ -838,21 +602,21 @@ rb_io_write(VALUE io, VALUE str)
 /*
  *  call-seq:
  *     ios << obj     => ios
- *
+ *  
  *  String Output---Writes <i>obj</i> to <em>ios</em>.
  *  <i>obj</i> will be converted to a string using
  *  <code>to_s</code>.
- *
+ *     
  *     $stdout << "Hello " << "world!\n"
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Hello world!
  */
 
-
 VALUE
-rb_io_addstr(VALUE io, VALUE str)
+rb_io_addstr(io, str)
+    VALUE io, str;
 {
     rb_io_write(io, str);
     return io;
@@ -861,37 +625,31 @@ rb_io_addstr(VALUE io, VALUE str)
 /*
  *  call-seq:
  *     ios.flush    => ios
- *
+ *  
  *  Flushes any buffered data within <em>ios</em> to the underlying
  *  operating system (note that this is Ruby internal buffering only;
  *  the OS may buffer the data as well).
- *
+ *     
  *     $stdout.print "no newline"
  *     $stdout.flush
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     no newline
  */
 
-VALUE
-rb_io_flush(VALUE io)
+static VALUE
+rb_io_flush(io)
+    VALUE io;
 {
     rb_io_t *fptr;
+    FILE *f;
 
-    if (TYPE(io) != T_FILE) {
-        return rb_funcall(io, id_flush, 0);
-    }
-
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
+    rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
 
-    if (fptr->mode & FMODE_WRITABLE) {
-        io_fflush(fptr);
-    }
-    if (fptr->mode & FMODE_READABLE) {
-        io_unread(fptr);
-    }
+    io_fflush(f, fptr);
 
     return io;
 }
@@ -900,9 +658,9 @@ rb_io_flush(VALUE io)
  *  call-seq:
  *     ios.pos     => integer
  *     ios.tell    => integer
- *
+ *  
  *  Returns the current offset (in bytes) of <em>ios</em>.
- *
+ *     
  *     f = File.new("testfile")
  *     f.pos    #=> 0
  *     f.gets   #=> "This is line one\n"
@@ -910,7 +668,8 @@ rb_io_flush(VALUE io)
  */
 
 static VALUE
-rb_io_tell(VALUE io)
+rb_io_tell(io)
+     VALUE io;
 {
     rb_io_t *fptr;
     off_t pos;
@@ -922,7 +681,9 @@ rb_io_tell(VALUE io)
 }
 
 static VALUE
-rb_io_seek(VALUE io, VALUE offset, int whence)
+rb_io_seek(io, offset, whence)
+    VALUE io, offset;
+    int whence;
 {
     rb_io_t *fptr;
     off_t pos;
@@ -931,6 +692,7 @@ rb_io_seek(VALUE io, VALUE offset, int whence)
     GetOpenFile(io, fptr);
     pos = io_seek(fptr, pos, whence);
     if (pos < 0 && errno) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
 
     return INT2FIX(0);
 }
@@ -938,26 +700,29 @@ rb_io_seek(VALUE io, VALUE offset, int whence)
 /*
  *  call-seq:
  *     ios.seek(amount, whence=SEEK_SET) -> 0
- *
+ *  
  *  Seeks to a given offset <i>anInteger</i> in the stream according to
  *  the value of <i>whence</i>:
  *
  *    IO::SEEK_CUR  | Seeks to _amount_ plus current position
  *    --------------+----------------------------------------------------
- *    IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably
+ *    IO::SEEK_END  | Seeks to _amount_ plus end of stream (you probably 
  *                  | want a negative value for _amount_)
  *    --------------+----------------------------------------------------
  *    IO::SEEK_SET  | Seeks to the absolute location given by _amount_
  *
  *  Example:
- *
+ *     
  *     f = File.new("testfile")
  *     f.seek(-13, IO::SEEK_END)   #=> 0
  *     f.readline                  #=> "And so on...\n"
  */
 
 static VALUE
-rb_io_seek_m(int argc, VALUE *argv, VALUE io)
+rb_io_seek_m(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     VALUE offset, ptrname;
     int whence = SEEK_SET;
@@ -972,16 +737,17 @@ rb_io_seek_m(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     ios.pos = integer    => integer
- *
+ *  
  *  Seeks to the given position (in bytes) in <em>ios</em>.
- *
+ *     
  *     f = File.new("testfile")
  *     f.pos = 17
  *     f.gets   #=> "This is line two\n"
  */
 
 static VALUE
-rb_io_set_pos(VALUE io, VALUE offset)
+rb_io_set_pos(io, offset)
+     VALUE io, offset;
 {
     rb_io_t *fptr;
     off_t pos;
@@ -989,7 +755,8 @@ rb_io_set_pos(VALUE io, VALUE offset)
     pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
     pos = io_seek(fptr, pos, SEEK_SET);
-    if (pos < 0) rb_sys_fail(fptr->path);
+    if (pos != 0) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
 
     return OFFT2NUM(pos);
 }
@@ -997,10 +764,10 @@ rb_io_set_pos(VALUE io, VALUE offset)
 /*
  *  call-seq:
  *     ios.rewind    => 0
- *
+ *  
  *  Positions <em>ios</em> to the beginning of input, resetting
  *  <code>lineno</code> to zero.
- *
+ *     
  *     f = File.new("testfile")
  *     f.readline   #=> "This is line one\n"
  *     f.rewind     #=> 0
@@ -1009,49 +776,22 @@ rb_io_set_pos(VALUE io, VALUE offset)
  */
 
 static VALUE
-rb_io_rewind(VALUE io)
+rb_io_rewind(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    if (io_seek(fptr, 0L, 0) < 0) rb_sys_fail(fptr->path);
-    if (io == ARGF.current_file) {
-	ARGF.gets_lineno -= fptr->lineno;
+    if (io_seek(fptr, 0L, 0) != 0) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
+    if (io == current_file) {
+	gets_lineno -= fptr->lineno;
     }
     fptr->lineno = 0;
 
     return INT2FIX(0);
 }
 
-static int
-io_fillbuf(rb_io_t *fptr)
-{
-    int r;
-
-    if (fptr->rbuf == NULL) {
-        fptr->rbuf_off = 0;
-        fptr->rbuf_len = 0;
-        fptr->rbuf_capa = 8192;
-        fptr->rbuf = ALLOC_N(char, fptr->rbuf_capa);
-    }
-    if (fptr->rbuf_len == 0) {
-      retry:
-	{
-	    r = rb_read_internal(fptr->fd, fptr->rbuf, fptr->rbuf_capa);
-	}
-        if (r < 0) {
-            if (rb_io_wait_readable(fptr->fd))
-                goto retry;
-            rb_sys_fail(fptr->path);
-        }
-        fptr->rbuf_off = 0;
-        fptr->rbuf_len = r;
-        if (r == 0)
-            return -1; /* EOF */
-    }
-    return 0;
-}
-
 /*
  *  call-seq:
  *     ios.eof     => true or false
@@ -1085,40 +825,51 @@ io_fillbuf(rb_io_t *fptr)
  */
 
 VALUE
-rb_io_eof(VALUE io)
+rb_io_eof(io)
+    VALUE io;
 {
     rb_io_t *fptr;
+    int ch;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
 
-    if (READ_DATA_PENDING(fptr)) return Qfalse;
-    READ_CHECK(fptr);
-    if (io_fillbuf(fptr) < 0) {
-	return Qtrue;
+    if (feof(fptr->f)) return Qtrue;
+    if (READ_DATA_PENDING(fptr->f)) return Qfalse;
+    READ_CHECK(fptr->f);
+    clearerr(fptr->f);
+    TRAP_BEG;
+    ch = getc(fptr->f);
+    TRAP_END;
+
+    if (ch != EOF) {
+	ungetc(ch, fptr->f);
+	return Qfalse;
     }
-    return Qfalse;
+    rb_io_check_closed(fptr);
+    clearerr(fptr->f);
+    return Qtrue;
 }
 
 /*
  *  call-seq:
  *     ios.sync    => true or false
- *
+ *  
  *  Returns the current ``sync mode'' of <em>ios</em>. When sync mode is
  *  true, all output is immediately flushed to the underlying operating
  *  system and is not buffered by Ruby internally. See also
  *  <code>IO#fsync</code>.
- *
+ *     
  *     f = File.new("testfile")
  *     f.sync   #=> false
  */
 
 static VALUE
-rb_io_sync(VALUE io)
+rb_io_sync(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     return (fptr->mode & FMODE_SYNC) ? Qtrue : Qfalse;
 }
@@ -1126,24 +877,24 @@ rb_io_sync(VALUE io)
 /*
  *  call-seq:
  *     ios.sync = boolean   => boolean
- *
+ *  
  *  Sets the ``sync mode'' to <code>true</code> or <code>false</code>.
  *  When sync mode is true, all output is immediately flushed to the
  *  underlying operating system and is not buffered internally. Returns
  *  the new state. See also <code>IO#fsync</code>.
- *
+ *     
  *     f = File.new("testfile")
  *     f.sync = true
- *
+ *     
  *  <em>(produces no output)</em>
  */
 
 static VALUE
-rb_io_set_sync(VALUE io, VALUE mode)
+rb_io_set_sync(io, mode)
+    VALUE io, mode;
 {
     rb_io_t *fptr;
 
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     if (RTEST(mode)) {
 	fptr->mode |= FMODE_SYNC;
@@ -1157,7 +908,7 @@ rb_io_set_sync(VALUE io, VALUE mode)
 /*
  *  call-seq:
  *     ios.fsync   => 0 or nil
- *
+ *  
  *  Immediately writes all buffered data in <em>ios</em> to disk.
  *  Returns <code>nil</code> if the underlying operating system does not
  *  support <em>fsync(2)</em>. Note that <code>fsync</code> differs from
@@ -1167,16 +918,18 @@ rb_io_set_sync(VALUE io, VALUE mode)
  */
 
 static VALUE
-rb_io_fsync(VALUE io)
+rb_io_fsync(io)
+    VALUE io;
 {
 #ifdef HAVE_FSYNC
     rb_io_t *fptr;
+    FILE *f;
 
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
+    f = GetWriteFile(fptr);
 
-    io_fflush(fptr);
-    if (fsync(fptr->fd) < 0)
+    io_fflush(f, fptr);
+    if (fsync(fileno(f)) < 0)
 	rb_sys_fail(fptr->path);
     return INT2FIX(0);
 #else
@@ -1189,48 +942,49 @@ rb_io_fsync(VALUE io)
  *  call-seq:
  *     ios.fileno    => fixnum
  *     ios.to_i      => fixnum
- *
+ *  
  *  Returns an integer representing the numeric file descriptor for
  *  <em>ios</em>.
- *
+ *     
  *     $stdin.fileno    #=> 0
  *     $stdout.fileno   #=> 1
  */
 
 static VALUE
-rb_io_fileno(VALUE io)
+rb_io_fileno(io)
+    VALUE io;
 {
     rb_io_t *fptr;
     int fd;
 
     GetOpenFile(io, fptr);
-    fd = fptr->fd;
+    fd = fileno(fptr->f);
     return INT2FIX(fd);
 }
 
-
 /*
  *  call-seq:
  *     ios.pid    => fixnum
- *
+ *  
  *  Returns the process ID of a child process associated with
  *  <em>ios</em>. This will be set by <code>IO::popen</code>.
- *
+ *     
  *     pipe = IO.popen("-")
  *     if pipe
  *       $stderr.puts "In parent, child pid is #{pipe.pid}"
  *     else
  *       $stderr.puts "In child, pid is #{$$}"
  *     end
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     In child, pid is 26209
  *     In parent, child pid is 26209
  */
 
 static VALUE
-rb_io_pid(VALUE io)
+rb_io_pid(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
@@ -1240,7 +994,6 @@ rb_io_pid(VALUE io)
     return INT2FIX(fptr->pid);
 }
 
-
 /*
  * call-seq:
  *   ios.inspect   => string
@@ -1249,157 +1002,168 @@ rb_io_pid(VALUE io)
  */
 
 static VALUE
-rb_io_inspect(VALUE obj)
+rb_io_inspect(obj)
+    VALUE obj;
 {
     rb_io_t *fptr;
-    const char *cname;
-    const char *st = "";
+    char *buf;
+    const char *cname, *st = "";
+    long len;
 
     fptr = RFILE(rb_io_taint_check(obj))->fptr;
     if (!fptr || !fptr->path) return rb_any_to_s(obj);
     cname = rb_obj_classname(obj);
-    if (fptr->fd < 0) {
+    len = strlen(cname) + strlen(fptr->path) + 5;
+    if (!(fptr->f || fptr->f2)) {
 	st = " (closed)";
+	len += 9;
     }
-    return rb_sprintf("#<%s:%s%s>", cname, fptr->path, st);
+    buf = ALLOCA_N(char, len);
+    snprintf(buf, len, "#<%s:%s%s>", cname, fptr->path, st);
+    return rb_str_new2(buf);
 }
 
 /*
  *  call-seq:
  *     ios.to_io -> ios
- *
+ *  
  *  Returns <em>ios</em>.
  */
 
 static VALUE
-rb_io_to_io(VALUE io)
+rb_io_to_io(io)
+    VALUE io;
 {
     return io;
 }
 
 /* reading functions */
 static long
-read_buffered_data(char *ptr, long len, rb_io_t *fptr)
+read_buffered_data(ptr, len, f)
+    char *ptr;
+    long len;
+    FILE *f;
 {
     long n;
 
-    n = READ_DATA_PENDING_COUNT(fptr);
+#ifdef READ_DATA_PENDING_COUNT
+    n = READ_DATA_PENDING_COUNT(f);
     if (n <= 0) return 0;
     if (n > len) n = len;
-    MEMMOVE(ptr, fptr->rbuf+fptr->rbuf_off, char, n);
-    fptr->rbuf_off += n;
-    fptr->rbuf_len -= n;
+    return fread(ptr, 1, n, f);
+#else
+    int c;
+
+    for (n = 0; n < len && READ_DATA_PENDING(f) && (c = getc(f)) != EOF; ++n) {
+	*ptr++ = c;
+    }
     return n;
+#endif
 }
 
 static long
-io_fread(VALUE str, long offset, rb_io_t *fptr)
+io_fread(ptr, len, fptr)
+    char *ptr;
+    long len;
+    rb_io_t *fptr;
 {
-    long len = RSTRING_LEN(str) - offset;
     long n = len;
     int c;
-
-    if (READ_DATA_PENDING(fptr) == 0) {
-	while (n > 0) {
-	    c = rb_read_internal(fptr->fd, RSTRING_PTR(str)+offset, n);
-	    if (c == 0) break;
-	    if (c < 0) {
-		rb_sys_fail(fptr->path);
-	    }
-	    offset += c;
-	    if ((n -= c) <= 0) break;
-	    rb_thread_wait_fd(fptr->fd);
-	}
-	return len - n;
-    }
+    int saved_errno;
 
     while (n > 0) {
-	c = read_buffered_data(RSTRING_PTR(str)+offset, n, fptr);
-	if (c > 0) {
-	    offset += c;
-	    if ((n -= c) <= 0) break;
-	}
-	rb_thread_wait_fd(fptr->fd);
-	rb_io_check_closed(fptr);
-	if (io_fillbuf(fptr) < 0) {
+        c = read_buffered_data(ptr, n, fptr->f);
+        if (c < 0) goto eof;
+        if (c > 0) {
+            ptr += c;
+            if ((n -= c) <= 0) break;
+        }
+        rb_thread_wait_fd(fileno(fptr->f));
+        rb_io_check_closed(fptr);
+	clearerr(fptr->f);
+	TRAP_BEG;
+	c = getc(fptr->f);
+	TRAP_END;
+	if (c == EOF) {
+	  eof:
+	    if (ferror(fptr->f)) {
+		switch (errno) {
+		  case EINTR:
+#if defined(ERESTART)
+		  case ERESTART:
+#endif
+		    clearerr(fptr->f);
+		    continue;
+		  case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+		  case EWOULDBLOCK:
+#endif
+		    if (len > n) {
+			clearerr(fptr->f);
+		    }
+                    saved_errno = errno;
+                    rb_warning("nonblocking IO#read is obsolete; use IO#readpartial or IO#sysread");
+                    errno = saved_errno;
+		}
+		if (len == n) return 0;
+	    }
 	    break;
 	}
+	*ptr++ = c;
+	n--;
     }
     return len - n;
 }
 
 long
-rb_io_fread(char *ptr, long len, FILE *f)
+rb_io_fread(ptr, len, f)
+    char *ptr;
+    long len;
+    FILE *f;
 {
     rb_io_t of;
-    VALUE str;
-    long n;
 
-    of.fd = fileno(f);
-    of.stdio_file = f;
-    of.mode = FMODE_READABLE;
-    str = rb_str_new(ptr, len);
-    n = io_fread(str, 0, &of);
-    MEMCPY(ptr, RSTRING_PTR(str), char, n);
-    return n;
+    of.f = f;
+    of.f2 = NULL;
+    return io_fread(ptr, len, &of);
 }
 
 #define SMALLBUF 100
 
 static long
-remain_size(rb_io_t *fptr)
+remain_size(fptr)
+    rb_io_t *fptr;
 {
     struct stat st;
-    off_t siz = READ_DATA_PENDING_COUNT(fptr);
+    off_t siz = BUFSIZ;
     off_t pos;
 
-    if (fstat(fptr->fd, &st) == 0  && S_ISREG(st.st_mode)
+    if (feof(fptr->f)) return 0;
+    if (fstat(fileno(fptr->f), &st) == 0  && S_ISREG(st.st_mode)
 #ifdef __BEOS__
 	&& (st.st_dev > 3)
 #endif
 	)
     {
-	io_fflush(fptr);
-	pos = lseek(fptr->fd, 0, SEEK_CUR);
+	pos = io_tell(fptr);
 	if (st.st_size >= pos && pos >= 0) {
-	    siz += st.st_size - pos;
+	    siz = st.st_size - pos + 1;
 	    if (siz > LONG_MAX) {
 		rb_raise(rb_eIOError, "file too big for single read");
 	    }
 	}
     }
-    else {
-	siz += BUFSIZ;
-    }
     return (long)siz;
 }
 
 static VALUE
-io_enc_str(VALUE str, rb_io_t *fptr)
-{
-    OBJ_TAINT(str);
-    if (fptr->enc2) {
-	/* two encodings, so transcode from enc2 to enc */
-	/* the methods in transcode.c are static, so call indirectly */
-	str = rb_funcall(str, id_encode, 2,
-			 rb_enc_from_encoding(fptr->enc),
-			 rb_enc_from_encoding(fptr->enc2));
-    }
-    else {
-	/* just one encoding, so associate it with the string */
-	rb_enc_associate(str, io_read_encoding(fptr));
-    }
-    return str;
-}
-
-static VALUE
-read_all(rb_io_t *fptr, long siz, VALUE str)
+read_all(fptr, siz, str)
+    rb_io_t *fptr;
+    long siz;
+    VALUE str;
 {
     long bytes = 0;
     long n;
-    long pos = 0;
-    rb_encoding *enc = io_read_encoding(fptr);
-    int cr = fptr->enc2 ? ENC_CODERANGE_BROKEN : 0;
 
     if (siz == 0) siz = BUFSIZ;
     if (NIL_P(str)) {
@@ -1409,32 +1173,32 @@ read_all(rb_io_t *fptr, long siz, VALUE str)
 	rb_str_resize(str, siz);
     }
     for (;;) {
-	READ_CHECK(fptr);
-	n = io_fread(str, bytes, fptr);
+	rb_str_locktmp(str);
+	READ_CHECK(fptr->f);
+	n = io_fread(RSTRING(str)->ptr+bytes, siz-bytes, fptr);
+	rb_str_unlocktmp(str);
 	if (n == 0 && bytes == 0) {
-	    break;
+	    if (!fptr->f) break;
+	    if (feof(fptr->f)) break;
+	    if (!ferror(fptr->f)) break;
+	    rb_sys_fail(fptr->path);
 	}
 	bytes += n;
-	if (cr != ENC_CODERANGE_BROKEN)
-	    pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + bytes, enc, &cr);
 	if (bytes < siz) break;
 	siz += BUFSIZ;
 	rb_str_resize(str, siz);
     }
     if (bytes != siz) rb_str_resize(str, bytes);
-    str = io_enc_str(str, fptr);
-    if (!fptr->enc2) {
-	ENC_CODERANGE_SET(str, cr);
-    }
+    OBJ_TAINT(str);
+
     return str;
 }
 
-void
-rb_io_set_nonblock(rb_io_t *fptr)
+void rb_io_set_nonblock(rb_io_t *fptr)
 {
     int flags;
 #ifdef F_GETFL
-    flags = fcntl(fptr->fd, F_GETFL);
+    flags = fcntl(fileno(fptr->f), F_GETFL);
     if (flags == -1) {
         rb_sys_fail(fptr->path);
     }
@@ -1443,9 +1207,25 @@ rb_io_set_nonblock(rb_io_t *fptr)
 #endif
     if ((flags & O_NONBLOCK) == 0) {
         flags |= O_NONBLOCK;
-        if (fcntl(fptr->fd, F_SETFL, flags) == -1) {
+        if (fcntl(fileno(fptr->f), F_SETFL, flags) == -1) {
+            rb_sys_fail(fptr->path);
+        }
+    }
+    if (fptr->f2) {
+#ifdef F_GETFL
+        flags = fcntl(fileno(fptr->f2), F_GETFL);
+        if (flags == -1) {
             rb_sys_fail(fptr->path);
         }
+#else
+        flags = 0;
+#endif
+        if ((flags & O_NONBLOCK) == 0) {
+            flags |= O_NONBLOCK;
+            if (fcntl(fileno(fptr->f2), F_SETFL, flags) == -1) {
+                rb_sys_fail(fptr->path);
+            }
+        }
     }
 }
 
@@ -1459,15 +1239,15 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
     rb_scan_args(argc, argv, "11", &length, &str);
 
     if ((len = NUM2LONG(length)) < 0) {
-	rb_raise(rb_eArgError, "negative length %ld given", len);
+        rb_raise(rb_eArgError, "negative length %ld given", len);
     }
 
     if (NIL_P(str)) {
-	str = rb_str_new(0, len);
+        str = rb_str_new(0, len);
     }
     else {
-	StringValue(str);
-	rb_str_modify(str);
+        StringValue(str);
+        rb_str_modify(str);
         rb_str_resize(str, len);
     }
     OBJ_TAINT(str);
@@ -1476,24 +1256,30 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
     rb_io_check_readable(fptr);
 
     if (len == 0)
-	return str;
+        return str;
 
-    if (!nonblock)
-        READ_CHECK(fptr);
-    if (RSTRING_LEN(str) != len) {
+    if (!nonblock) {
+        READ_CHECK(fptr->f);
+    }
+    if (RSTRING(str)->len != len) {
       modified:
-	rb_raise(rb_eRuntimeError, "buffer string modified");
+        rb_raise(rb_eRuntimeError, "buffer string modified");
     }
-    n = read_buffered_data(RSTRING_PTR(str), len, fptr);
+    n = read_buffered_data(RSTRING(str)->ptr, len, fptr->f);
     if (n <= 0) {
       again:
-	if (RSTRING_LEN(str) != len) goto modified;
+        if (RSTRING(str)->len != len) goto modified;
         if (nonblock) {
             rb_io_set_nonblock(fptr);
+            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+        }
+        else {
+            TRAP_BEG;
+            n = read(fileno(fptr->f), RSTRING(str)->ptr, len);
+            TRAP_END;
         }
-	n = rb_read_internal(fptr->fd, RSTRING_PTR(str), len);
         if (n < 0) {
-            if (!nonblock && rb_io_wait_readable(fptr->fd))
+            if (!nonblock && rb_io_wait_readable(fileno(fptr->f)))
                 goto again;
             rb_sys_fail(fptr->path);
         }
@@ -1532,7 +1318,7 @@ io_getpartial(int argc, VALUE *argv, VALUE io, int nonblock)
  *  When readpartial doesn't blocks, it returns or raises immediately.
  *  If the buffer is not empty, it returns the data in the buffer.
  *  Otherwise if the stream has some content,
- *  it returns the data in the stream.
+ *  it returns the data in the stream. 
  *  Otherwise if the stream is reached to EOF, it raises EOFError.
  *
  *     r, w = IO.pipe           #               buffer          pipe content
@@ -1624,28 +1410,26 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
  *  The result may also be smaller than string.length (partial write).
  *  The caller should care such errors and partial write.
  *
- *  If the write buffer is not empty, it is flushed at first.
- *
  */
 
 static VALUE
 rb_io_write_nonblock(VALUE io, VALUE str)
 {
     rb_io_t *fptr;
+    FILE *f;
     long n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
 
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
 
-    io_fflush(fptr);
+    f = GetWriteFile(fptr);
 
     rb_io_set_nonblock(fptr);
-    n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
 
     if (n == -1) rb_sys_fail(fptr->path);
 
@@ -1668,14 +1452,15 @@ rb_io_write_nonblock(VALUE io, VALUE str)
  *  <code><i>ios</i>.read(nil)</code> returns <code>""</code>.
  *  <code><i>ios</i>.read(<i>positive-integer</i>)</code> returns nil.
  *
- *  <code><i>ios</i>.read(0)</code> returns <code>""</code>.
- *
  *     f = File.new("testfile")
  *     f.read(16)   #=> "This is line one"
  */
 
 static VALUE
-io_read(int argc, VALUE *argv, VALUE io)
+io_read(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     rb_io_t *fptr;
     long n, len;
@@ -1686,7 +1471,7 @@ io_read(int argc, VALUE *argv, VALUE io)
     if (NIL_P(length)) {
 	if (!NIL_P(str)) StringValue(str);
 	GetOpenFile(io, fptr);
-	rb_io_check_readable(fptr);
+	rb_io_check_readable(fptr);	
 	return read_all(fptr, remain_size(fptr), str);
     }
     len = NUM2LONG(length);
@@ -1695,7 +1480,7 @@ io_read(int argc, VALUE *argv, VALUE io)
     }
 
     if (NIL_P(str)) {
-	str = rb_str_new(0, len);
+	str = rb_tainted_str_new(0, len);
     }
     else {
 	StringValue(str);
@@ -1705,77 +1490,69 @@ io_read(int argc, VALUE *argv, VALUE io)
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
+    if (feof(fptr->f)) return Qnil;
     if (len == 0) return str;
 
-    READ_CHECK(fptr);
-    if (RSTRING_LEN(str) != len) {
+    rb_str_locktmp(str);
+    READ_CHECK(fptr->f);
+    if (RSTRING(str)->len != len) {
 	rb_raise(rb_eRuntimeError, "buffer string modified");
     }
-    n = io_fread(str, 0, fptr);
+    n = io_fread(RSTRING(str)->ptr, len, fptr);
+    rb_str_unlocktmp(str);
     if (n == 0) {
-	if (fptr->fd < 0) return Qnil;
-        rb_str_resize(str, 0);
-        return Qnil;
+	if (!fptr->f) return Qnil;
+	if (feof(fptr->f)) {
+	    rb_str_resize(str, 0);
+	    return Qnil;
+	}
+	if (len > 0) rb_sys_fail(fptr->path);
     }
     rb_str_resize(str, n);
+    RSTRING(str)->len = n;
+    RSTRING(str)->ptr[n] = '\0';
+    OBJ_TAINT(str);
 
     return str;
 }
 
-static void
-rscheck(const char *rsptr, long rslen, VALUE rs)
-{
-    if (!rs) return;
-    if (RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen)
-	rb_raise(rb_eRuntimeError, "rs modified");
-}
-
 static int
-appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
+appendline(fptr, delim, strp)
+    rb_io_t *fptr;
+    int delim;
+    VALUE *strp;
 {
+    FILE *f = fptr->f;
     VALUE str = *strp;
     int c = EOF;
-    long limit = *lp;
+#ifndef READ_DATA_PENDING_PTR
+    char buf[8192];
+    char *bp = buf, *bpe = buf + sizeof buf - 3;
+    int update = Qfalse;
+#endif
 
     do {
-	long pending = READ_DATA_PENDING_COUNT(fptr);
+#ifdef READ_DATA_PENDING_PTR
+	long pending = READ_DATA_PENDING_COUNT(f);
 	if (pending > 0) {
-	    const char *p = READ_DATA_PENDING_PTR(fptr);
-	    const char *e;
+	    const char *p = READ_DATA_PENDING_PTR(f);
+	    const char *e = memchr(p, delim, pending);
 	    long last = 0, len = (c != EOF);
-	    rb_encoding *enc = io_read_encoding(fptr);
-
-	    if (limit > 0 && pending > limit) pending = limit;
-	    e = memchr(p, delim, pending);
 	    if (e) pending = e - p + 1;
 	    len += pending;
 	    if (!NIL_P(str)) {
-		last = RSTRING_LEN(str);
+		last = RSTRING(str)->len;
 		rb_str_resize(str, last + len);
 	    }
 	    else {
 		*strp = str = rb_str_buf_new(len);
-		rb_str_set_len(str, len);
+		RSTRING(str)->len = len;
+		RSTRING(str)->ptr[len] = '\0';
 	    }
 	    if (c != EOF) {
-		RSTRING_PTR(str)[last++] = c;
-	    }
-	    if (limit > 0 && limit == pending) {
-		char *p = fptr->rbuf+fptr->rbuf_off;
-		char *pp = p + limit - 1;
-		char *pl = rb_enc_left_char_head(p, pp, enc);
-
-		if (pl < pp) {
-		    int diff = pp - pl;
-		    pending -= diff;
-		    limit = pending;
-		    rb_str_set_len(str, RSTRING_LEN(str)-diff);
-		}
+		RSTRING(str)->ptr[last++] = c;
 	    }
-	    read_buffered_data(RSTRING_PTR(str) + last, pending, fptr); /* must not fail */
-	    limit -= pending;
-	    *lp = limit;
-	    if (limit == 0) return RSTRING_PTR(str)[RSTRING_LEN(str)-1];
+	    fread(RSTRING(str)->ptr + last, 1, pending, f); /* must not fail */
 	    if (e) return delim;
 	}
 	else if (c != EOF) {
@@ -1785,18 +1562,51 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
 	    }
 	    else {
 		*strp = str = rb_str_buf_new(1);
-		rb_str_resize(str, 1);
-		RSTRING_PTR(str)[0] = c;
+		RSTRING(str)->ptr[RSTRING(str)->len++] = c;
 	    }
 	}
-	rb_thread_wait_fd(fptr->fd);
+	rb_thread_wait_fd(fileno(f));
 	rb_io_check_closed(fptr);
-	if (io_fillbuf(fptr) < 0) {
-	    *lp = limit;
+#else
+	READ_CHECK(f);
+#endif
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c == EOF) {
+	    if (ferror(f)) {
+		clearerr(f);
+		if (!rb_io_wait_readable(fileno(f)))
+		    rb_sys_fail(fptr->path);
+		continue;
+	    }
+#ifdef READ_DATA_PENDING_PTR
 	    return c;
+#endif
+	}
+#ifndef READ_DATA_PENDING_PTR
+	if (c == EOF || (*bp++ = c) == delim || bp == bpe) {
+	    int cnt = bp - buf;
+
+	    if (cnt > 0) {
+		if (!NIL_P(str))
+		    rb_str_cat(str, buf, cnt);
+		else
+		    *strp = str = rb_str_new(buf, cnt);
+	    }
+	    if (c == EOF) {
+		if (update)
+		    return (int)RSTRING(str)->ptr[RSTRING(str)->len-1];
+		return c;
+	    }
+	    bp = buf;
 	}
+	update = Qtrue;
+#endif
     } while (c != delim);
 
+#ifdef READ_DATA_PENDING_PTR
     {
 	char ch = c;
 	if (!NIL_P(str)) {
@@ -1806,160 +1616,97 @@ appendline(rb_io_t *fptr, int delim, VALUE *strp, long *lp)
 	    *strp = str = rb_str_new(&ch, 1);
 	}
     }
+#endif
 
     return c;
 }
 
 static inline int
-swallow(rb_io_t *fptr, int term)
+swallow(fptr, term)
+    rb_io_t *fptr;
+    int term;
 {
+    FILE *f = fptr->f;
+    int c;
+
     do {
+#ifdef READ_DATA_PENDING_PTR
 	long cnt;
-	while ((cnt = READ_DATA_PENDING_COUNT(fptr)) > 0) {
+	while ((cnt = READ_DATA_PENDING_COUNT(f)) > 0) {
 	    char buf[1024];
-	    const char *p = READ_DATA_PENDING_PTR(fptr);
+	    const char *p = READ_DATA_PENDING_PTR(f);
 	    int i;
 	    if (cnt > sizeof buf) cnt = sizeof buf;
 	    if (*p != term) return Qtrue;
 	    i = cnt;
 	    while (--i && *++p == term);
-	    if (!read_buffered_data(buf, cnt - i, fptr)) /* must not fail */
+	    if (!fread(buf, 1, cnt - i, f)) /* must not fail */
 		rb_sys_fail(fptr->path);
 	}
-	rb_thread_wait_fd(fptr->fd);
+	rb_thread_wait_fd(fileno(f));
 	rb_io_check_closed(fptr);
-    } while (io_fillbuf(fptr) == 0);
+#else
+	READ_CHECK(f);
+#endif
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c != term) {
+	    ungetc(c, f);
+	    return Qtrue;
+	}
+    } while (c != EOF);
     return Qfalse;
 }
 
 static VALUE
-rb_io_getline_fast(rb_io_t *fptr, rb_encoding *enc)
+rb_io_getline_fast(fptr, delim)
+    rb_io_t *fptr;
+    unsigned char delim;
 {
     VALUE str = Qnil;
-    int len = 0;
-    long pos = 0;
-    int cr = fptr->enc2 ? ENC_CODERANGE_BROKEN : 0;
-
-    for (;;) {
-	long pending = READ_DATA_PENDING_COUNT(fptr);
+    int c;
 
-	if (pending > 0) {
-	    const char *p = READ_DATA_PENDING_PTR(fptr);
-	    const char *e;
+    while ((c = appendline(fptr, delim, &str)) != EOF && c != delim);
 
-	    e = memchr(p, '\n', pending);
-	    if (e) {
-                pending = e - p + 1;
-	    }
-	    if (NIL_P(str)) {
-		str = rb_str_new(p, pending);
-		fptr->rbuf_off += pending;
-		fptr->rbuf_len -= pending;
-	    }
-	    else {
-		rb_str_resize(str, len + pending);
-		read_buffered_data(RSTRING_PTR(str)+len, pending, fptr);
-	    }
-	    len += pending;
-	    if (cr != ENC_CODERANGE_BROKEN)
-		pos = rb_str_coderange_scan_restartable(RSTRING_PTR(str) + pos, RSTRING_PTR(str) + len, enc, &cr);
-	    if (e) break;
-	}
-	rb_thread_wait_fd(fptr->fd);
-	rb_io_check_closed(fptr);
-	if (io_fillbuf(fptr) < 0) {
-	    if (NIL_P(str)) return Qnil;
-	    break;
-	}
+    if (!NIL_P(str)) {
+	fptr->lineno++;
+	lineno = INT2FIX(fptr->lineno);
+	OBJ_TAINT(str);
     }
 
-    str = io_enc_str(str, fptr);
-    if (!fptr->enc2) ENC_CODERANGE_SET(str, cr);
-    fptr->lineno++;
-    ARGF.lineno = INT2FIX(fptr->lineno);
     return str;
 }
 
-static void
-prepare_getline_args(int argc, VALUE *argv, VALUE *rsp, long *limit, VALUE io)
+static int
+rscheck(rsptr, rslen, rs)
+    const char *rsptr;
+    long rslen;
+    VALUE rs;
 {
-    VALUE lim, rs;
-    rb_io_t *fptr;
-
-    if (argc == 0) {
-	rs = rb_rs;
-	lim = Qnil;
-    }
-    else {
-	rb_scan_args(argc, argv, "11", &rs, &lim);
-	if (!NIL_P(lim)) {
-	    StringValue(rs);
-	}
-	else if (!NIL_P(rs) && TYPE(rs) != T_STRING) {
-	    VALUE tmp = rb_check_string_type(rs);
-
-	    if (NIL_P(tmp)) {
-		lim = rs;
-		rs = rb_rs;
-	    }
-	    else {
-		rs = tmp;
-	    }
-	}
-    }
-    if (!NIL_P(rs)) {
-	rb_encoding *enc_rs, *enc_io;
-
-	GetOpenFile(io, fptr);
-	enc_rs = rb_enc_get(rs);
-	enc_io = io_read_encoding(fptr);
-	if (enc_io != enc_rs &&
-	    (rb_enc_str_coderange(rs) != ENC_CODERANGE_7BIT ||
-	     !rb_enc_asciicompat(enc_io))) {
-            if (rs == rb_default_rs) {
-                rs = rb_enc_str_new(0, 0, enc_io);
-                rb_str_buf_cat_ascii(rs, "\n");
-            }
-            else {
-                rb_raise(rb_eArgError, "encoding mismatch: %s IO with %s RS",
-                         rb_enc_name(enc_io),
-                         rb_enc_name(enc_rs));
-            }
-	}
-	if (fptr->enc2) {
-            VALUE rs2;
-	    rs2 = rb_funcall(rs, id_encode, 2,
-			    rb_enc_from_encoding(fptr->enc2),
-			    rb_enc_from_encoding(fptr->enc));
-            if (!RTEST(rb_str_equal(rs, rs2))) {
-                rs = rs2;
-            }
-	}
-    }
-    *rsp = rs;
-    *limit = NIL_P(lim) ? -1L : NUM2LONG(lim);
+    if (RSTRING(rs)->ptr != rsptr && RSTRING(rs)->len != rslen)
+	rb_raise(rb_eRuntimeError, "rs modified");
+    return 1;
 }
 
+static VALUE rb_io_getline(VALUE rs, VALUE io);
+
 static VALUE
-rb_io_getline_1(VALUE rs, long limit, VALUE io)
+rb_io_getline(rs, io)
+    VALUE rs, io;
 {
     VALUE str = Qnil;
     rb_io_t *fptr;
-    int nolimit = 0;
-    rb_encoding *enc;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (NIL_P(rs)) {
 	str = read_all(fptr, 0, Qnil);
-	if (RSTRING_LEN(str) == 0) return Qnil;
-    }
-    else if (limit == 0) {
-	return rb_enc_str_new(0, 0, io_read_encoding(fptr));
+	if (RSTRING(str)->len == 0) return Qnil;
     }
-    else if (rs == rb_default_rs && limit < 0 &&
-             rb_enc_asciicompat(enc = io_read_encoding(fptr))) {
-	return rb_io_getline_fast(fptr, enc);
+    else if (rs == rb_default_rs) {
+	return rb_io_getline_fast(fptr, '\n');
     }
     else {
 	int c, newline;
@@ -1967,103 +1714,86 @@ rb_io_getline_1(VALUE rs, long limit, VALUE io)
 	long rslen;
 	int rspara = 0;
 
-	rslen = RSTRING_LEN(rs);
+	rslen = RSTRING(rs)->len;
 	if (rslen == 0) {
 	    rsptr = "\n\n";
 	    rslen = 2;
 	    rspara = 1;
 	    swallow(fptr, '\n');
-	    rs = 0;
+	}
+	else if (rslen == 1) {
+	    return rb_io_getline_fast(fptr, (unsigned char)RSTRING(rs)->ptr[0]);
 	}
 	else {
-	    rsptr = RSTRING_PTR(rs);
+	    rsptr = RSTRING(rs)->ptr;
 	}
 	newline = rsptr[rslen - 1];
 
-	enc = io_input_encoding(fptr);
-	while ((c = appendline(fptr, newline, &str, &limit)) != EOF) {
-	    if (c == newline) {
-		const char *s, *p, *pp;
-
-		if (RSTRING_LEN(str) < rslen) continue;
-		s = RSTRING_PTR(str);
-		p = s +  RSTRING_LEN(str) - rslen;
-		pp = rb_enc_left_char_head(s, p, enc);
-		if (pp != p) continue;
-		if (!rspara) rscheck(rsptr, rslen, rs);
-		if (memcmp(p, rsptr, rslen) == 0) break;
-	    }
-	    if (limit == 0) {
-		nolimit = 1;
-		break;
-	    }
-	}
+	while ((c = appendline(fptr, newline, &str)) != EOF &&
+	       (c != newline || RSTRING(str)->len < rslen ||
+		((rspara || rscheck(rsptr,rslen,rs)) && 0) ||
+		memcmp(RSTRING(str)->ptr+RSTRING(str)->len-rslen,rsptr,rslen)));
 
 	if (rspara) {
 	    if (c != EOF) {
 		swallow(fptr, '\n');
 	    }
 	}
-	if (!NIL_P(str)) str = io_enc_str(str, fptr);
     }
 
     if (!NIL_P(str)) {
-	if (!nolimit) {
-	    fptr->lineno++;
-	    ARGF.lineno = INT2FIX(fptr->lineno);
-	}
+	fptr->lineno++;
+	lineno = INT2FIX(fptr->lineno);
+	OBJ_TAINT(str);
     }
 
     return str;
 }
 
-static VALUE
-rb_io_getline(int argc, VALUE *argv, VALUE io)
-{
-    VALUE rs;
-    long limit;
-
-    prepare_getline_args(argc, argv, &rs, &limit, io);
-    return rb_io_getline_1(rs, limit, io);
-}
-
 VALUE
-rb_io_gets(VALUE io)
+rb_io_gets(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    return rb_io_getline_fast(fptr, io_read_encoding(fptr));
+    return rb_io_getline_fast(fptr, '\n');
 }
 
 /*
  *  call-seq:
- *     ios.gets(sep=$/)     => string or nil
- *     ios.gets(limit)      => string or nil
- *     ios.gets(sep, limit) => string or nil
- *
+ *     ios.gets(sep_string=$/)   => string or nil
+ *  
  *  Reads the next ``line'' from the I/O stream; lines are separated by
- *  <i>sep</i>. A separator of <code>nil</code> reads the entire
+ *  <i>sep_string</i>. A separator of <code>nil</code> reads the entire
  *  contents, and a zero-length separator reads the input a paragraph at
  *  a time (two successive newlines in the input separate paragraphs).
  *  The stream must be opened for reading or an <code>IOError</code>
  *  will be raised. The line read in will be returned and also assigned
  *  to <code>$_</code>. Returns <code>nil</code> if called at end of
- *  file.  If the first argument is an integer, or optional second
- *  argument is given, the returning string would not be longer than the
- *  given value.
- *
+ *  file.
+ *     
  *     File.new("testfile").gets   #=> "This is line one\n"
  *     $_                          #=> "This is line one\n"
  */
 
 static VALUE
-rb_io_gets_m(int argc, VALUE *argv, VALUE io)
+rb_io_gets_m(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE str;
+    VALUE rs, str;
 
-    str = rb_io_getline(argc, argv, io);
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
+    str = rb_io_getline(rs, io);
     rb_lastline_set(str);
 
     return str;
@@ -2072,14 +1802,14 @@ rb_io_gets_m(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     ios.lineno    => integer
- *
+ *  
  *  Returns the current line number in <em>ios</em>. The stream must be
  *  opened for reading. <code>lineno</code> counts the number of times
  *  <code>gets</code> is called, rather than the number of newlines
  *  encountered. The two values will differ if <code>gets</code> is
  *  called with a separator other than newline. See also the
  *  <code>$.</code> variable.
- *
+ *     
  *     f = File.new("testfile")
  *     f.lineno   #=> 0
  *     f.gets     #=> "This is line one\n"
@@ -2089,7 +1819,8 @@ rb_io_gets_m(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_io_lineno(VALUE io)
+rb_io_lineno(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
@@ -2101,22 +1832,23 @@ rb_io_lineno(VALUE io)
 /*
  *  call-seq:
  *     ios.lineno = integer    => integer
- *
+ *  
  *  Manually sets the current line number to the given value.
  *  <code>$.</code> is updated only on the next read.
- *
+ *     
  *     f = File.new("testfile")
  *     f.gets                     #=> "This is line one\n"
  *     $.                         #=> 1
  *     f.lineno = 1000
  *     f.lineno                   #=> 1000
- *     $.                         #=> 1         # lineno of last read
+ *     $. # lineno of last read   #=> 1
  *     f.gets                     #=> "This is line two\n"
- *     $.                         #=> 1001      # lineno of last read
+ *     $. # lineno of last read   #=> 1001
  */
 
 static VALUE
-rb_io_set_lineno(VALUE io, VALUE lineno)
+rb_io_set_lineno(io, lineno)
+    VALUE io, lineno;
 {
     rb_io_t *fptr;
 
@@ -2126,18 +1858,44 @@ rb_io_set_lineno(VALUE io, VALUE lineno)
     return lineno;
 }
 
+static void
+lineno_setter(val, id, var)
+    VALUE val;
+    ID id;
+    VALUE *var;
+{
+    gets_lineno = NUM2INT(val);
+    *var = INT2FIX(gets_lineno);
+}
+
+static VALUE
+argf_set_lineno(argf, val)
+    VALUE argf, val;
+{
+    gets_lineno = NUM2INT(val);
+    lineno = INT2FIX(gets_lineno);
+    return Qnil;
+}
+
+static VALUE
+argf_lineno()
+{
+    return lineno;
+}
+
 /*
  *  call-seq:
- *     ios.readline(sep=$/)     => string
- *     ios.readline(limit)      => string
- *     ios.readline(sep, limit) => string
- *
+ *     ios.readline(sep_string=$/)   => string
+ *  
  *  Reads a line as with <code>IO#gets</code>, but raises an
  *  <code>EOFError</code> on end of file.
  */
 
 static VALUE
-rb_io_readline(int argc, VALUE *argv, VALUE io)
+rb_io_readline(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     VALUE line = rb_io_gets_m(argc, argv, io);
 
@@ -2149,31 +1907,37 @@ rb_io_readline(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
- *     ios.readlines(sep=$/)     => array
- *     ios.readlines(limit)      => array
- *     ios.readlines(sep, limit) => array
- *
+ *     ios.readlines(sep_string=$/)  =>   array
+ *  
  *  Reads all of the lines in <em>ios</em>, and returns them in
- *  <i>anArray</i>. Lines are separated by the optional <i>sep</i>. If
- *  <i>sep</i> is <code>nil</code>, the rest of the stream is returned
- *  as a single record.  If the first argument is an integer, or
- *  optional second argument is given, the returning string would not be
- *  longer than the given value. The stream must be opened for reading
- *  or an <code>IOError</code> will be raised.
- *
+ *  <i>anArray</i>. Lines are separated by the optional
+ *  <i>sep_string</i>. If <i>sep_string</i> is <code>nil</code>, the
+ *  rest of the stream is returned as a single record.
+ *  The stream must be opened for reading or an
+ *  <code>IOError</code> will be raised.
+ *     
  *     f = File.new("testfile")
  *     f.readlines[0]   #=> "This is line one\n"
  */
 
 static VALUE
-rb_io_readlines(int argc, VALUE *argv, VALUE io)
+rb_io_readlines(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE line, ary, rs;
-    long limit;
+    VALUE line, ary;
+    VALUE rs;
 
-    prepare_getline_args(argc, argv, &rs, &limit, io);
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
     ary = rb_ary_new();
-    while (!NIL_P(line = rb_io_getline_1(rs, limit, io))) {
+    while (!NIL_P(line = rb_io_getline(rs, io))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -2181,22 +1945,18 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
 
 /*
  *  call-seq:
- *     ios.each(sep=$/) {|line| block }         => ios
- *     ios.each(limit) {|line| block }          => ios
- *     ios.each(sep,limit) {|line| block }      => ios
- *     ios.each_line(sep=$/) {|line| block }    => ios
- *     ios.each_line(limit) {|line| block }     => ios
- *     ios.each_line(sep,limit) {|line| block } => ios
- *
+ *     ios.each(sep_string=$/)      {|line| block }  => ios
+ *     ios.each_line(sep_string=$/) {|line| block }  => ios
+ *  
  *  Executes the block for every line in <em>ios</em>, where lines are
- *  separated by <i>sep</i>. <em>ios</em> must be opened for
+ *  separated by <i>sep_string</i>. <em>ios</em> must be opened for
  *  reading or an <code>IOError</code> will be raised.
- *
+ *     
  *     f = File.new("testfile")
  *     f.each {|line| puts "#{f.lineno}: #{line}" }
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     1: This is line one
  *     2: This is line two
  *     3: This is line three
@@ -2204,14 +1964,23 @@ rb_io_readlines(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_io_each_line(int argc, VALUE *argv, VALUE io)
+rb_io_each_line(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE str, rs;
-    long limit;
+    VALUE str;
+    VALUE rs;
 
     RETURN_ENUMERATOR(io, argc, argv);
-    prepare_getline_args(argc, argv, &rs, &limit, io);
-    while (!NIL_P(str = rb_io_getline_1(rs, limit, io))) {
+    if (argc == 0) {
+	rs = rb_rs;
+    }
+    else {
+	rb_scan_args(argc, argv, "1", &rs);
+	if (!NIL_P(rs)) StringValue(rs);
+    }
+    while (!NIL_P(str = rb_io_getline(rs, io))) {
 	rb_yield(str);
     }
     return io;
@@ -2220,11 +1989,11 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     ios.each_byte {|byte| block }  => ios
- *
+ *  
  *  Calls the given block once for each byte (0..255) in <em>ios</em>,
  *  passing the byte as an argument. The stream must be opened for
  *  reading or an <code>IOError</code> will be raised.
- *
+ *     
  *     f = File.new("testfile")
  *     checksum = 0
  *     f.each_byte {|x| checksum ^= x }   #=> #<File:testfile>
@@ -2232,87 +2001,40 @@ rb_io_each_line(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_io_each_byte(VALUE io)
+rb_io_each_byte(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    char *p, *e;
+    FILE *f;
+    int c;
 
     RETURN_ENUMERATOR(io, 0, 0);
     GetOpenFile(io, fptr);
 
     for (;;) {
-	p = fptr->rbuf+fptr->rbuf_off;
-	e = p + fptr->rbuf_len;
-	while (p < e) {
-	    fptr->rbuf_off++;
-	    fptr->rbuf_len--;
-	    rb_yield(INT2FIX(*p & 0xff));
-	    p++;
-    errno = 0;
-	}
 	rb_io_check_readable(fptr);
-	READ_CHECK(fptr);
-	if (io_fillbuf(fptr) < 0) {
+	f = fptr->f;
+	READ_CHECK(f);
+	clearerr(f);
+	TRAP_BEG;
+	c = getc(f);
+	TRAP_END;
+	if (c == EOF) {
+	    if (ferror(f)) {
+		clearerr(f);
+		if (!rb_io_wait_readable(fileno(f)))
+		    rb_sys_fail(fptr->path);
+		continue;
+	    }
 	    break;
 	}
+	rb_yield(INT2FIX(c & 0xff));
     }
+    if (ferror(f)) rb_sys_fail(fptr->path);
     return io;
 }
 
-static VALUE
-io_getc(rb_io_t *fptr, rb_encoding *enc)
-{
-    int r, n, cr = 0;
-    VALUE str;
-
-    if (io_fillbuf(fptr) < 0) {
-	return Qnil;
-    }
-    if (rb_enc_asciicompat(enc) && ISASCII(fptr->rbuf[fptr->rbuf_off])) {
-	str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
-	fptr->rbuf_off += 1;
-	fptr->rbuf_len -= 1;
-	cr = ENC_CODERANGE_7BIT;
-    }
-    else {
-	r = rb_enc_precise_mbclen(fptr->rbuf+fptr->rbuf_off, fptr->rbuf+fptr->rbuf_off+fptr->rbuf_len, enc);
-	if (MBCLEN_CHARFOUND_P(r) &&
-	    (n = MBCLEN_CHARFOUND_LEN(r)) <= fptr->rbuf_len) {
-	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, n);
-	    fptr->rbuf_off += n;
-	    fptr->rbuf_len -= n;
-	    cr = ENC_CODERANGE_VALID;
-	}
-	else if (MBCLEN_NEEDMORE_P(r)) {
-	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, fptr->rbuf_len);
-	    fptr->rbuf_len = 0;
-	  getc_needmore:
-	    if (io_fillbuf(fptr) != -1) {
-		rb_str_cat(str, fptr->rbuf+fptr->rbuf_off, 1);
-		fptr->rbuf_off++;
-		fptr->rbuf_len--;
-		r = rb_enc_precise_mbclen(RSTRING_PTR(str), RSTRING_PTR(str)+RSTRING_LEN(str), enc);
-		if (MBCLEN_NEEDMORE_P(r)) {
-		    goto getc_needmore;
-		}
-		else if (MBCLEN_CHARFOUND_P(r)) {
-		    cr = ENC_CODERANGE_VALID;
-		}
-	    }
-	}
-	else {
-	    str = rb_str_new(fptr->rbuf+fptr->rbuf_off, 1);
-	    fptr->rbuf_off++;
-	    fptr->rbuf_len--;
-	}
-    }
-    if (!cr) cr = ENC_CODERANGE_BROKEN;
-    str = io_enc_str(str, fptr);
-    if (!fptr->enc2) {
-	ENC_CODERANGE_SET(str, cr);
-    }
-    return str;
-}
+VALUE rb_io_getc _((VALUE));
 
 /*
  *  call-seq:
@@ -2320,33 +2042,43 @@ io_getc(rb_io_t *fptr, rb_encoding *enc)
  *
  *  Calls the given block once for each character in <em>ios</em>,
  *  passing the character as an argument. The stream must be opened for
- *  reading or an <code>IOError</code> will be raised.
+ *  reading or an <code>IOError</code> will be raised.  Multibyte
+ *  characters are dealt with according to $KCODE.
  *
  *     f = File.new("testfile")
  *     f.each_char {|c| print c, ' ' }   #=> #<File:testfile>
  */
 
 static VALUE
-rb_io_each_char(VALUE io)
+rb_io_each_char(io)
+    VALUE io;
 {
-    rb_io_t *fptr;
-    rb_encoding *enc;
-    VALUE c;
+    VALUE ch;
 
     RETURN_ENUMERATOR(io, 0, 0);
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
 
-    enc = io_input_encoding(fptr);
-    READ_CHECK(fptr);
-    while (!NIL_P(c = io_getc(fptr, enc))) {
-        rb_yield(c);
+    while (!NIL_P(ch = rb_io_getc(io))) {
+	unsigned char c;
+	int n;
+	VALUE str;
+
+	c= FIX2INT(ch);
+	n = mbclen(c);
+	str = rb_tainted_str_new((const char *)&c, 1);
+
+	while (--n > 0) {
+	    if (NIL_P(ch = rb_io_getc(io))) {
+		rb_yield(str);
+		return io;
+	    }
+	    c = FIX2INT(ch);
+	    rb_str_cat(str, (const char *)&c, 1);
+	}
+	rb_yield(str);
     }
     return io;
 }
 
-
-
 /*
  *  call-seq:
  *     ios.lines(sep=$/)     => anEnumerator
@@ -2364,7 +2096,10 @@ rb_io_each_char(VALUE io)
  */
 
 static VALUE
-rb_io_lines(int argc, VALUE *argv, VALUE io)
+rb_io_lines(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     return rb_enumeratorize(io, ID2SYM(rb_intern("each_line")), argc, argv);
 }
@@ -2384,141 +2119,85 @@ rb_io_lines(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_io_bytes(VALUE io)
+rb_io_bytes(io)
+    VALUE io;
 {
     return rb_enumeratorize(io, ID2SYM(rb_intern("each_byte")), 0, 0);
 }
 
 /*
  *  call-seq:
- *     ios.chars   => anEnumerator
- *  
- *  Returns an enumerator that gives each character in <em>ios</em>.
- *  The stream must be opened for reading or an <code>IOError</code>
- *  will be raised.
- *     
- *     f = File.new("testfile")
- *     f.chars.to_a  #=> ["h", "e", "l", "l", "o"]
- *     f.rewind
- *     f.chars.sort  #=> ["e", "h", "l", "l", "o"]
- */
-
-static VALUE
-rb_io_chars(VALUE io)
-{
-    return rb_enumeratorize(io, ID2SYM(rb_intern("each_char")), 0, 0);
-}
-
-/*
- *  call-seq:
  *     ios.getc   => fixnum or nil
- *
- *  Reads a one-character string from <em>ios</em>. Returns
+ *  
+ *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
  *  <code>nil</code> if called at end of file.
- *
+ *     
  *     f = File.new("testfile")
- *     f.getc   #=> "8"
- *     f.getc   #=> "1"
+ *     f.getc   #=> 84
+ *     f.getc   #=> 104
  */
 
-static VALUE
-rb_io_getc(VALUE io)
+VALUE
+rb_io_getc(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    rb_encoding *enc;
+    FILE *f;
+    int c;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
+    f = fptr->f;
 
-    enc = io_input_encoding(fptr);
-    READ_CHECK(fptr);
-    return io_getc(fptr, enc);
-}
-int
-rb_getc(FILE *f)
-{
-    int c;
-
-    rb_read_check(f);
+  retry:
+    READ_CHECK(f);
+    clearerr(f);
     TRAP_BEG;
     c = getc(f);
     TRAP_END;
 
-    return c;
-}
-
-/*
- *  call-seq:
- *     ios.readchar   => string
- *
- *  Reads a one-character string from <em>ios</em>. Raises an
- *  <code>EOFError</code> on end of file.
- *
- *     f = File.new("testfile")
- *     f.readchar   #=> "8"
- *     f.readchar   #=> "1"
- */
-
-static VALUE
-rb_io_readchar(VALUE io)
-{
-    VALUE c = rb_io_getc(io);
-
-    if (NIL_P(c)) {
-	rb_eof_error();
+    if (c == EOF) {
+	if (ferror(f)) {
+	    clearerr(f);
+	    if (!rb_io_wait_readable(fileno(f)))
+		rb_sys_fail(fptr->path);
+	    goto retry;
+	}
+	return Qnil;
     }
-    return c;
+    return INT2FIX(c & 0xff);
 }
 
-/*
- *  call-seq:
- *     ios.getbyte   => fixnum or nil
- *
- *  Gets the next 8-bit byte (0..255) from <em>ios</em>. Returns
- *  <code>nil</code> if called at end of file.
- *
- *     f = File.new("testfile")
- *     f.getbyte   #=> 84
- *     f.getbyte   #=> 104
- */
-
-VALUE
-rb_io_getbyte(VALUE io)
+int
+rb_getc(f)
+    FILE *f;
 {
-    rb_io_t *fptr;
     int c;
 
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    READ_CHECK(fptr);
-    if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) && TYPE(rb_stdout) == T_FILE) {
-        rb_io_t *ofp;
-        GetOpenFile(rb_stdout, ofp);
-        if (ofp->mode & FMODE_TTY) {
-            rb_io_flush(rb_stdout);
-        }
+    if (!READ_DATA_PENDING(f)) {
+	rb_thread_wait_fd(fileno(f));
     }
-    if (io_fillbuf(fptr) < 0) {
-	return Qnil;
-    }
-    fptr->rbuf_off++;
-    fptr->rbuf_len--;
-    c = (unsigned char)fptr->rbuf[fptr->rbuf_off-1];
-    return INT2FIX(c & 0xff);
+    clearerr(f);
+    TRAP_BEG;
+    c = getc(f);
+    TRAP_END;
+
+    return c;
 }
 
 /*
  *  call-seq:
- *     ios.readbyte   => fixnum
- *
+ *     ios.readchar   => fixnum
+ *  
  *  Reads a character as with <code>IO#getc</code>, but raises an
  *  <code>EOFError</code> on end of file.
  */
 
 static VALUE
-rb_io_readbyte(VALUE io)
+rb_io_readchar(io)
+    VALUE io;
 {
-    VALUE c = rb_io_getbyte(io);
+    VALUE c = rb_io_getc(io);
 
     if (NIL_P(c)) {
 	rb_eof_error();
@@ -2528,39 +2207,35 @@ rb_io_readbyte(VALUE io)
 
 /*
  *  call-seq:
- *     ios.ungetc(string)   => nil
- *
+ *     ios.ungetc(integer)   => nil
+ *  
  *  Pushes back one character (passed as a parameter) onto <em>ios</em>,
  *  such that a subsequent buffered read will return it. Only one character
  *  may be pushed back before a subsequent read operation (that is,
  *  you will be able to read only the last of several characters that have been pushed
  *  back). Has no effect with unbuffered reads (such as <code>IO#sysread</code>).
- *
+ *     
  *     f = File.new("testfile")   #=> #<File:testfile>
- *     c = f.getc                 #=> "8"
+ *     c = f.getc                 #=> 84
  *     f.ungetc(c)                #=> nil
- *     f.getc                     #=> "8"
+ *     f.getc                     #=> 84
  */
 
 VALUE
-rb_io_ungetc(VALUE io, VALUE c)
+rb_io_ungetc(io, c)
+    VALUE io, c;
 {
     rb_io_t *fptr;
+    int cc = NUM2INT(c);
 
     GetOpenFile(io, fptr);
+    if (!(fptr->mode & FMODE_RBUF))
+	rb_raise(rb_eIOError, "unread stream");
     rb_io_check_readable(fptr);
-    if (NIL_P(c)) return Qnil;
-    if (FIXNUM_P(c)) {
-	int cc = FIX2INT(c);
-	rb_encoding *enc = io_read_encoding(fptr);
-	char buf[16];
 
-	c = rb_str_new(buf, rb_enc_mbcput(cc, buf, enc));
-    }
-    else {
-	SafeStringValue(c);
+    if (ungetc(cc, fptr->f) == EOF && cc != EOF) {
+	rb_raise(rb_eIOError, "ungetc failed");
     }
-    io_ungetc(c, fptr);
     return Qnil;
 }
 
@@ -2568,163 +2243,75 @@ rb_io_ungetc(VALUE io, VALUE c)
  *  call-seq:
  *     ios.isatty   => true or false
  *     ios.tty?     => true or false
- *
+ *  
  *  Returns <code>true</code> if <em>ios</em> is associated with a
  *  terminal device (tty), <code>false</code> otherwise.
- *
+ *     
  *     File.new("testfile").isatty   #=> false
  *     File.new("/dev/tty").isatty   #=> true
  */
 
 static VALUE
-rb_io_isatty(VALUE io)
+rb_io_isatty(io)
+    VALUE io;
 {
     rb_io_t *fptr;
 
     GetOpenFile(io, fptr);
-    if (isatty(fptr->fd) == 0)
+    if (isatty(fileno(fptr->f)) == 0)
 	return Qfalse;
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     ios.close_on_exec?   => true or false
- *
- *  Returns <code>true</code> if <em>ios</em> will be closed on exec.
- *
- *     f = open("/dev/null")
- *     f.close_on_exec?                 #=> false
- *     f.close_on_exec = true
- *     f.close_on_exec?                 #=> true
- *     f.close_on_exec = false
- *     f.close_on_exec?                 #=> false
- */
-
-static VALUE
-rb_io_close_on_exec_p(VALUE io)
-{
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
+static void
+fptr_finalize(fptr, noraise)
     rb_io_t *fptr;
-    VALUE write_io;
-    int fd, ret;
-
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-        GetOpenFile(write_io, fptr);
-        if (fptr && 0 <= (fd = fptr->fd)) {
-            if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail(fptr->path);
-            if (!(ret & FD_CLOEXEC)) return Qfalse;
-        }
-    }
-
-    GetOpenFile(io, fptr);
-    if (fptr && 0 <= (fd = fptr->fd)) {
-        if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail(fptr->path);
-        if (!(ret & FD_CLOEXEC)) return Qfalse;
-    }
-    return Qtrue;
-#else
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#endif
-}
-
-/*
- *  call-seq:
- *     ios.close_on_exec = bool    => true or false
- *
- *  Sets a close-on-exec flag.
- *
- *     f = open("/dev/null")
- *     f.close_on_exec = true
- *     system("cat", "/proc/self/fd/#{f.fileno}") # cat: /proc/self/fd/3: No such file or directory
- *     f.closed?                #=> false
- */
-
-static VALUE
-rb_io_set_close_on_exec(VALUE io, VALUE arg)
+    int noraise;
 {
-#if defined(HAVE_FCNTL) && defined(F_GETFD) && defined(F_SETFD) && defined(FD_CLOEXEC)
-    int flag = RTEST(arg) ? FD_CLOEXEC : 0;
-    rb_io_t *fptr;
-    VALUE write_io;
-    int fd, ret;
-
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-        GetOpenFile(write_io, fptr);
-        if (fptr && 0 <= (fd = fptr->fd)) {
-            if ((ret = fcntl(fptr->fd, F_GETFD)) == -1) rb_sys_fail(fptr->path);
-            if ((ret & FD_CLOEXEC) != flag) {
-                ret = (ret & ~FD_CLOEXEC) | flag;
-                ret = fcntl(fd, F_SETFD, ret);
-                if (ret == -1) rb_sys_fail(fptr->path);
-            }
-        }
-
-    }
-
-    GetOpenFile(io, fptr);
-    if (fptr && 0 <= (fd = fptr->fd)) {
-        if ((ret = fcntl(fd, F_GETFD)) == -1) rb_sys_fail(fptr->path);
-        if ((ret & FD_CLOEXEC) != flag) {
-            ret = (ret & ~FD_CLOEXEC) | flag;
-            ret = fcntl(fd, F_SETFD, ret);
-            if (ret == -1) rb_sys_fail(fptr->path);
-        }
-    }
-#else
-    rb_notimplement();
-#endif
-    return Qnil;
-}
+    int n1 = 0, n2 = 0, f1, f2 = -1;
 
-#define FMODE_PREP (1<<16)
-#define IS_PREP_STDIO(f) ((f)->mode & FMODE_PREP)
-#define PREP_STDIO_NAME(f) ((f)->path)
-
-static void
-fptr_finalize(rb_io_t *fptr, int noraise)
-{
-    int ebadf = 0;
-    if (fptr->wbuf_len) {
-        io_fflush(fptr);
-    }
-    if (IS_PREP_STDIO(fptr) ||
-        fptr->fd <= 2) {
-	return;
-    }
-    if (fptr->stdio_file) {
-        if (fclose(fptr->stdio_file) < 0 && !noraise) {
-            /* fptr->stdio_file is deallocated anyway */
-            fptr->stdio_file = 0;
-            fptr->fd = -1;
-            rb_sys_fail(fptr->path);
-        }
-    }
-    else if (0 <= fptr->fd) {
-        if (close(fptr->fd) < 0 && !noraise) {
-            if (errno != EBADF) {
-                /* fptr->fd is still not closed */
-                rb_sys_fail(fptr->path);
-            }
-            else {
-                /* fptr->fd is already closed. */
-                ebadf = 1;
-            }
-        }
+    errno = 0;
+    if (fptr->f2) {
+	f2 = fileno(fptr->f2);
+	while (n2 = 0, fflush(fptr->f2) < 0) {
+	    n2 = errno;
+	    if (!rb_io_wait_writable(f2)) {
+		break;
+	    }
+	    if (!fptr->f2) break;
+	}
+	if (fclose(fptr->f2) < 0 && n2 == 0) {
+	    n2 = errno;
+	}
+	fptr->f2 = 0;
+    }
+    if (fptr->f) {
+	f1 = fileno(fptr->f);
+	if ((f2 == -1) && (fptr->mode & FMODE_WBUF)) {
+	    while (n1 = 0, fflush(fptr->f) < 0) {
+		n1 = errno;
+		if (!rb_io_wait_writable(f1)) break;
+		if (!fptr->f) break;
+	    }
+	}
+	if (fclose(fptr->f) < 0 && n1 == 0) {
+	    n1 = errno;
+	}
+	fptr->f = 0;
+	if (n1 == EBADF && f1 == f2) {
+	    n1 = 0;
+	}
     }
-    fptr->fd = -1;
-    fptr->stdio_file = 0;
-    fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
-    if (ebadf) {
-        rb_sys_fail(fptr->path);
+    if (!noraise && (n1 || n2)) {
+	errno = (n1 ? n1 : n2);
+	rb_sys_fail(fptr->path);
     }
 }
 
 static void
-rb_io_fptr_cleanup(rb_io_t *fptr, int noraise)
+rb_io_fptr_cleanup(fptr, noraise)
+    rb_io_t *fptr;
+    int noraise;
 {
     if (fptr->finalize) {
 	(*fptr->finalize)(fptr, noraise);
@@ -2734,52 +2321,41 @@ rb_io_fptr_cleanup(rb_io_t *fptr, int noraise)
     }
 }
 
-int
-rb_io_fptr_finalize(rb_io_t *fptr)
+void
+rb_io_fptr_finalize(fptr)
+    rb_io_t *fptr;
 {
-    if (!fptr) return 0;
-    if (fptr->refcnt <= 0 || --fptr->refcnt) return 0;
+    if (!fptr) return;
     if (fptr->path) {
 	free(fptr->path);
-	fptr->path = 0;
-    }
-    if (0 <= fptr->fd)
-	rb_io_fptr_cleanup(fptr, Qtrue);
-    if (fptr->rbuf) {
-        free(fptr->rbuf);
-        fptr->rbuf = 0;
     }
-    if (fptr->wbuf) {
-        free(fptr->wbuf);
-        fptr->wbuf = 0;
-    }
-    free(fptr);
-    return 1;
+    if (!fptr->f && !fptr->f2) return;
+    if (fileno(fptr->f) < 3) return;
+
+    rb_io_fptr_cleanup(fptr, Qtrue);
 }
 
 VALUE
-rb_io_close(VALUE io)
+rb_io_close(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    int fd;
-    VALUE write_io;
-    rb_io_t *write_fptr;
-
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-        write_fptr = RFILE(write_io)->fptr;
-        if (write_fptr && 0 <= write_fptr->fd) {
-            rb_io_fptr_cleanup(write_fptr, Qtrue);
-        }
-    }
+    int fd, fd2;
 
     fptr = RFILE(io)->fptr;
     if (!fptr) return Qnil;
-    if (fptr->fd < 0) return Qnil;
+    if (fptr->f2) {
+	fd2 = fileno(fptr->f2);
+    }
+    else {
+	if (!fptr->f) return Qnil;
+	fd2 = -1;
+    }
 
-    fd = fptr->fd;
+    fd = fileno(fptr->f);
     rb_io_fptr_cleanup(fptr, Qfalse);
     rb_thread_fd_close(fd);
+    if (fd2 >= 0) rb_thread_fd_close(fd2);
 
     if (fptr->pid) {
 	rb_syswait(fptr->pid);
@@ -2792,7 +2368,7 @@ rb_io_close(VALUE io)
 /*
  *  call-seq:
  *     ios.close   => nil
- *
+ *  
  *  Closes <em>ios</em> and flushes any pending writes to the operating
  *  system. The stream is unavailable for any further data operations;
  *  an <code>IOError</code> is raised if such an attempt is made. I/O
@@ -2804,7 +2380,8 @@ rb_io_close(VALUE io)
  */
 
 static VALUE
-rb_io_close_m(VALUE io)
+rb_io_close_m(io)
+    VALUE io;
 {
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
@@ -2815,13 +2392,15 @@ rb_io_close_m(VALUE io)
 }
 
 static VALUE
-io_call_close(VALUE io)
+io_call_close(io)
+    VALUE io;
 {
     return rb_funcall(io, rb_intern("close"), 0, 0);
 }
 
 static VALUE
-io_close(VALUE io)
+io_close(io)
+    VALUE io;
 {
     return rb_rescue(io_call_close, io, 0, 0);
 }
@@ -2829,11 +2408,11 @@ io_close(VALUE io)
 /*
  *  call-seq:
  *     ios.closed?    => true or false
- *
+ *  
  *  Returns <code>true</code> if <em>ios</em> is completely closed (for
  *  duplex streams, both reader and writer), <code>false</code>
  *  otherwise.
- *
+ *     
  *     f = File.new("testfile")
  *     f.close         #=> nil
  *     f.closed?       #=> true
@@ -2844,156 +2423,123 @@ io_close(VALUE io)
  *     f.closed?       #=> true
  */
 
-
 static VALUE
-rb_io_closed(VALUE io)
+rb_io_closed(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    VALUE write_io;
-    rb_io_t *write_fptr;
-
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-        write_fptr = RFILE(write_io)->fptr;
-        if (write_fptr && 0 <= write_fptr->fd) {
-            return Qfalse;
-        }
-    }
 
     fptr = RFILE(io)->fptr;
     rb_io_check_initialized(fptr);
-    return 0 <= fptr->fd ? Qfalse : Qtrue;
+    return (fptr->f || fptr->f2)?Qfalse:Qtrue;
 }
 
 /*
  *  call-seq:
  *     ios.close_read    => nil
- *
+ *  
  *  Closes the read end of a duplex I/O stream (i.e., one that contains
  *  both a read and a write stream, such as a pipe). Will raise an
  *  <code>IOError</code> if the stream is not duplexed.
- *
+ *     
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_read
  *     f.readlines
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     prog.rb:3:in `readlines': not opened for reading (IOError)
  *     	from prog.rb:3
  */
 
 static VALUE
-rb_io_close_read(VALUE io)
+rb_io_close_read(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    VALUE write_io;
+    int n;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
     GetOpenFile(io, fptr);
-    if (is_socket(fptr->fd, fptr->path)) {
-#ifndef SHUT_RD
-# define SHUT_RD 0
-#endif
-        if (shutdown(fptr->fd, SHUT_RD) < 0)
-            rb_sys_fail(fptr->path);
-        fptr->mode &= ~FMODE_READABLE;
-        if (!(fptr->mode & FMODE_WRITABLE))
-            return rb_io_close(io);
-        return Qnil;
+    if (fptr->f2 == 0 && (fptr->mode & FMODE_WRITABLE)) {
+	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
     }
-
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-	rb_io_t *wfptr;
-        fptr_finalize(fptr, Qfalse);
-	GetOpenFile(write_io, wfptr);
-	if (fptr->refcnt < LONG_MAX) {
-	    wfptr->refcnt++;
-	    RFILE(io)->fptr = wfptr;
-	    rb_io_fptr_finalize(fptr);
-	}
-        return Qnil;
+    if (fptr->f2 == 0) {
+	return rb_io_close(io);
     }
+    n = fclose(fptr->f);
+    fptr->mode &= ~FMODE_READABLE;
+    fptr->f = fptr->f2;
+    fptr->f2 = 0;
+    if (n != 0) rb_sys_fail(fptr->path);
 
-    if (fptr->mode & FMODE_WRITABLE) {
-	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
-    }
-    return rb_io_close(io);
+    return Qnil;
 }
 
 /*
  *  call-seq:
  *     ios.close_write   => nil
- *
+ *  
  *  Closes the write end of a duplex I/O stream (i.e., one that contains
  *  both a read and a write stream, such as a pipe). Will raise an
  *  <code>IOError</code> if the stream is not duplexed.
- *
+ *     
  *     f = IO.popen("/bin/sh","r+")
  *     f.close_write
  *     f.print "nowhere"
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     prog.rb:3:in `write': not opened for writing (IOError)
  *     	from prog.rb:3:in `print'
  *     	from prog.rb:3
  */
 
 static VALUE
-rb_io_close_write(VALUE io)
+rb_io_close_write(io)
+    VALUE io;
 {
     rb_io_t *fptr;
-    VALUE write_io;
+    int n;
 
     if (rb_safe_level() >= 4 && !OBJ_TAINTED(io)) {
 	rb_raise(rb_eSecurityError, "Insecure: can't close");
     }
-    write_io = GetWriteIO(io);
-    GetOpenFile(write_io, fptr);
-    if (is_socket(fptr->fd, fptr->path)) {
-#ifndef SHUT_WR
-# define SHUT_WR 1
-#endif
-        if (shutdown(fptr->fd, SHUT_WR) < 0)
-            rb_sys_fail(fptr->path);
-        fptr->mode &= ~FMODE_WRITABLE;
-        if (!(fptr->mode & FMODE_READABLE))
-	    return rb_io_close(write_io);
-        return Qnil;
-    }
-
-    if (fptr->mode & FMODE_READABLE) {
+    GetOpenFile(io, fptr);
+    if (fptr->f2 == 0 && (fptr->mode & FMODE_READABLE)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
-
-    rb_io_close(write_io);
-    if (io != write_io) {
-	GetOpenFile(io, fptr);
-	fptr->tied_io_for_writing = 0;
-	fptr->mode &= ~FMODE_DUPLEX;
+    if (fptr->f2 == 0) {
+	return rb_io_close(io);
     }
+    n = fclose(fptr->f2);
+    fptr->f2 = 0;
+    fptr->mode &= ~FMODE_WRITABLE;
+    if (n != 0) rb_sys_fail(fptr->path);
+
     return Qnil;
 }
 
 /*
  *  call-seq:
  *     ios.sysseek(offset, whence=SEEK_SET)   => integer
- *
+ *  
  *  Seeks to a given <i>offset</i> in the stream according to the value
  *  of <i>whence</i> (see <code>IO#seek</code> for values of
  *  <i>whence</i>). Returns the new offset into the file.
- *
+ *     
  *     f = File.new("testfile")
  *     f.sysseek(-13, IO::SEEK_END)   #=> 53
  *     f.sysread(10)                  #=> "And so on."
  */
 
 static VALUE
-rb_io_sysseek(int argc, VALUE *argv, VALUE io)
+rb_io_sysseek(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     VALUE offset, ptrname;
     int whence = SEEK_SET;
@@ -3005,14 +2551,15 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
     }
     pos = NUM2OFFT(offset);
     GetOpenFile(io, fptr);
-    if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr)) {
+    if ((fptr->mode & FMODE_READABLE) && READ_DATA_BUFFERED(fptr->f)) {
 	rb_raise(rb_eIOError, "sysseek for buffered IO");
     }
-    if ((fptr->mode & FMODE_WRITABLE) && fptr->wbuf_len) {
+    if ((fptr->mode & FMODE_WRITABLE) && (fptr->mode & FMODE_WBUF)) {
 	rb_warn("sysseek for buffered IO");
     }
-    pos = lseek(fptr->fd, pos, whence);
+    pos = lseek(fileno(fptr->f), pos, whence);
     if (pos == -1) rb_sys_fail(fptr->path);
+    clearerr(fptr->f);
 
     return OFFT2NUM(pos);
 }
@@ -3020,38 +2567,40 @@ rb_io_sysseek(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     ios.syswrite(string)   => integer
- *
+ *  
  *  Writes the given string to <em>ios</em> using a low-level write.
  *  Returns the number of bytes written. Do not mix with other methods
  *  that write to <em>ios</em> or you may get unpredictable results.
  *  Raises <code>SystemCallError</code> on error.
- *
+ *     
  *     f = File.new("out", "w")
  *     f.syswrite("ABCDEF")   #=> 6
  */
 
 static VALUE
-rb_io_syswrite(VALUE io, VALUE str)
+rb_io_syswrite(io, str)
+    VALUE io, str;
 {
     rb_io_t *fptr;
+    FILE *f;
     long n;
 
     rb_secure(4);
     if (TYPE(str) != T_STRING)
 	str = rb_obj_as_string(str);
 
-    io = GetWriteIO(io);
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
+    f = GetWriteFile(fptr);
 
-    if (fptr->wbuf_len) {
+    if (fptr->mode & FMODE_WBUF) {
 	rb_warn("syswrite for buffered IO");
     }
-    if (!rb_thread_fd_writable(fptr->fd)) {
+    if (!rb_thread_fd_writable(fileno(f))) {
         rb_io_check_closed(fptr);
     }
     TRAP_BEG;
-    n = write(fptr->fd, RSTRING_PTR(str), RSTRING_LEN(str));
+    n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
     TRAP_END;
 
     if (n == -1) rb_sys_fail(fptr->path);
@@ -3061,22 +2610,23 @@ rb_io_syswrite(VALUE io, VALUE str)
 
 /*
  *  call-seq:
- *     ios.sysread(integer[, outbuf])    => string
- *
+ *     ios.sysread(integer )    => string
+ *  
  *  Reads <i>integer</i> bytes from <em>ios</em> using a low-level
  *  read and returns them as a string. Do not mix with other methods
  *  that read from <em>ios</em> or you may get unpredictable results.
- *  If the optional <i>outbuf</i> argument is present, it must reference
- *  a String, which will receive the data.
  *  Raises <code>SystemCallError</code> on error and
  *  <code>EOFError</code> at end of file.
- *
+ *     
  *     f = File.new("testfile")
  *     f.sysread(16)   #=> "This is line one"
  */
 
 static VALUE
-rb_io_sysread(int argc, VALUE *argv, VALUE io)
+rb_io_sysread(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     VALUE len, str;
     rb_io_t *fptr;
@@ -3098,91 +2648,73 @@ rb_io_sysread(int argc, VALUE *argv, VALUE io)
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
 
-    if (READ_DATA_BUFFERED(fptr)) {
+    if (READ_DATA_BUFFERED(fptr->f)) {
 	rb_raise(rb_eIOError, "sysread for buffered IO");
     }
+    rb_str_locktmp(str);
 
-    n = fptr->fd;
-    rb_thread_wait_fd(fptr->fd);
+    n = fileno(fptr->f);
+    rb_thread_wait_fd(fileno(fptr->f));
     rb_io_check_closed(fptr);
-    if (RSTRING_LEN(str) != ilen) {
+    if (RSTRING(str)->len != ilen) {
 	rb_raise(rb_eRuntimeError, "buffer string modified");
     }
+    TRAP_BEG;
+    n = read(fileno(fptr->f), RSTRING(str)->ptr, ilen);
+    TRAP_END;
 
-    n = rb_read_internal(fptr->fd, RSTRING_PTR(str), ilen);
-
+    rb_str_unlocktmp(str);
     if (n == -1) {
 	rb_sys_fail(fptr->path);
     }
-    rb_str_set_len(str, n);
+    rb_str_resize(str, n);
     if (n == 0 && ilen > 0) {
 	rb_eof_error();
     }
-    rb_str_resize(str, n);
+    RSTRING(str)->len = n;
+    RSTRING(str)->ptr[n] = '\0';
     OBJ_TAINT(str);
 
     return str;
 }
 
-VALUE
-rb_io_binmode(VALUE io)
-{
-    rb_io_t *fptr;
-
-    GetOpenFile(io, fptr);
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    if (!(fptr->mode & FMODE_BINMODE) && READ_DATA_BUFFERED(fptr)) {
-	rb_raise(rb_eIOError, "buffer already filled with text-mode content");
-    }
-    if (0 <= fptr->fd && setmode(fptr->fd, O_BINARY) == -1)
-	rb_sys_fail(fptr->path);
-#endif
-    fptr->mode |= FMODE_BINMODE;
-    return io;
-}
-
 /*
  *  call-seq:
  *     ios.binmode    => ios
- *
+ *  
  *  Puts <em>ios</em> into binary mode. This is useful only in
  *  MS-DOS/Windows environments. Once a stream is in binary mode, it
  *  cannot be reset to nonbinary mode.
  */
 
-static VALUE
-rb_io_binmode_m(VALUE io)
+VALUE
+rb_io_binmode(io)
+    VALUE io;
 {
 #if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    VALUE write_io;
-#endif
+    rb_io_t *fptr;
 
-    rb_io_binmode(io);
+    GetOpenFile(io, fptr);
+#ifdef __human68k__
+    if (fptr->f)
+	fmode(fptr->f, _IOBIN);
+    if (fptr->f2)
+	fmode(fptr->f2, _IOBIN);
+#else
+    if (fptr->f && setmode(fileno(fptr->f), O_BINARY) == -1)
+	rb_sys_fail(fptr->path);
+    if (fptr->f2 && setmode(fileno(fptr->f2), O_BINARY) == -1)
+	rb_sys_fail(fptr->path);
+#endif
 
-#if defined(_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__EMX__)
-    write_io = GetWriteIO(io);
-    if (write_io != io)
-        rb_io_binmode(write_io);
+    fptr->mode |= FMODE_BINMODE;
 #endif
     return io;
 }
 
-/*
- *  call-seq:
- *     ios.binmode?    => true or false
- *
- *  Returns <code>true</code> if <em>ios</em> is binmode.
- */
-static VALUE
-rb_io_binmode_p(VALUE io)
-{
-    rb_io_t *fptr;
-    GetOpenFile(io, fptr);
-    return fptr->mode & FMODE_BINMODE ? Qtrue : Qfalse;
-}
-
-static const char*
-rb_io_flags_mode(int flags)
+const char*
+rb_io_flags_mode(flags)
+    int flags;
 {
 #ifdef O_BINARY
 # define MODE_BINMODE(a,b) ((flags & FMODE_BINMODE) ? (b) : (a))
@@ -3206,12 +2738,13 @@ rb_io_flags_mode(int flags)
 	}
 	return MODE_BINMODE("r+", "rb+");
     }
-    rb_raise(rb_eArgError, "invalid access modenum %o", flags);
+    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
     return NULL;		/* not reached */
 }
 
 int
-rb_io_mode_flags(const char *mode)
+rb_io_mode_flags(mode)
+    const char *mode;
 {
     int flags = 0;
     const char *m = mode;
@@ -3228,29 +2761,33 @@ rb_io_mode_flags(const char *mode)
 	break;
       default:
       error:
-	rb_raise(rb_eArgError, "invalid access mode %s", mode);
+	rb_raise(rb_eArgError, "illegal access mode %s", mode);
     }
 
     while (*m) {
         switch (*m++) {
-	  case 'b':
+        case 'b':
             flags |= FMODE_BINMODE;
             break;
-	  case '+':
+        case '+':
             flags |= FMODE_READWRITE;
             break;
-	  default:
+        case ':':
+            /* forward compatibility */
+            rb_warning("encoding options not supported in 1.8: %s", mode);
+            goto end;
+        default:
             goto error;
-	  case ':':
-	    return flags;
         }
     }
 
+ end:
     return flags;
 }
 
 int
-rb_io_modenum_flags(int mode)
+rb_io_modenum_flags(mode)
+    int mode;
 {
     int flags = 0;
 
@@ -3281,8 +2818,9 @@ rb_io_modenum_flags(int mode)
     return flags;
 }
 
-int
-rb_io_mode_modenum(const char *mode)
+static int
+rb_io_mode_modenum(mode)
+    const char *mode;
 {
     int flags = 0;
     const char *m = mode;
@@ -3299,33 +2837,37 @@ rb_io_mode_modenum(const char *mode)
 	break;
       default:
       error:
-	rb_raise(rb_eArgError, "invalid access mode %s", mode);
+	rb_raise(rb_eArgError, "illegal access mode %s", mode);
     }
 
     while (*m) {
         switch (*m++) {
-	  case 'b':
+        case 'b':
 #ifdef O_BINARY
             flags |= O_BINARY;
 #endif
             break;
-	  case '+':
+        case '+':
             flags = (flags & ~O_ACCMODE) | O_RDWR;
             break;
-	  default:
+        case ':':
+            /* forward compatibility */
+            rb_warning("encoding options not supported in 1.8: %s", mode);
+            goto end;
+        default:
             goto error;
-	  case ':':
-	    return flags;
         }
     }
 
+ end:
     return flags;
 }
 
 #define MODENUM_MAX 4
 
 static const char*
-rb_io_modenum_mode(int flags)
+rb_io_modenum_mode(flags)
+    int flags;
 {
 #ifdef O_BINARY
 # define MODE_BINARY(a,b) ((flags & O_BINARY) ? (b) : (a))
@@ -3346,106 +2888,35 @@ rb_io_modenum_mode(int flags)
       case O_RDWR:
 	return MODE_BINARY("r+", "rb+");
     }
-    rb_raise(rb_eArgError, "invalid access modenum %o", flags);
+    rb_raise(rb_eArgError, "illegal access modenum %o", flags);
     return NULL;		/* not reached */
 }
 
-static void
-mode_enc(rb_io_t *fptr, const char *estr)
-{
-    const char *p0, *p1;
-    char *enc2name;
-    int idx, idx2;
-
-    p0 = strrchr(estr, ':');
-    if (!p0) p1 = estr;
-    else     p1 = p0 + 1;
-    idx = rb_enc_find_index(p1);
-    if (idx >= 0) {
-	fptr->enc = rb_enc_from_index(idx);
-    }
-    else {
-	rb_warn("Unsupported encoding %s ignored", p1);
-    }
-
-    if (p0) {
-	int n = p0 - estr;
-	if (n > ENCODING_MAXNAMELEN) {
-	    idx2 = -1;
-	}
-	else {
-	    enc2name = ALLOCA_N(char, n+1);
-	    memcpy(enc2name, estr, n);
-	    enc2name[n] = '\0';
-	    estr = enc2name;
-	    idx2 = rb_enc_find_index(enc2name);
-	}
-	if (idx2 < 0) {
-	    rb_warn("Unsupported encoding %.*s ignored", n, estr);
-	}
-	else if (idx2 == idx) {
-	    rb_warn("Ignoring internal encoding %.*s: it is identical to external encoding %s",
-		    n, estr, p1);
-	}
-	else {
-	    fptr->enc2 = rb_enc_from_index(idx2);
-	}
-    }
-}
-
-void
-rb_io_mode_enc(rb_io_t *fptr, const char *mode)
-{
-    const char *p = strchr(mode, ':');
-    if (p) {
-	mode_enc(fptr, p+1);
-    }
-}
-
-struct sysopen_struct {
+static int
+rb_sysopen(fname, flags, mode)
     char *fname;
-    int flag;
+    int flags;
     unsigned int mode;
-};
-
-static VALUE
-sysopen_func(void *ptr)
-{
-    struct sysopen_struct *data = ptr;
-    return (VALUE)open(data->fname, data->flag, data->mode);
-}
-
-static int
-rb_sysopen_internal(char *fname, int flags, unsigned int mode)
-{
-    struct sysopen_struct data;
-    data.fname = fname;
-    data.flag = flags;
-    data.mode = mode;
-    return (int)rb_thread_blocking_region(sysopen_func, &data, RB_UBF_DFL, 0);
-}
-
-static int
-rb_sysopen(char *fname, int flags, unsigned int mode)
 {
     int fd;
 
-    fd = rb_sysopen_internal(fname, flags, mode);
+    fd = open(fname, flags, mode);
     if (fd < 0) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    fd = rb_sysopen_internal(fname, flags, mode);
+	    fd = open(fname, flags, mode);
 	}
 	if (fd < 0) {
 	    rb_sys_fail(fname);
 	}
     }
-    UPDATE_MAXFD(fd);
     return fd;
 }
 
 FILE *
-rb_fopen(const char *fname, const char *mode)
+rb_fopen(fname, mode)
+    const char *fname;
+    const char *mode;
 {
     FILE *file;
 
@@ -3464,13 +2935,15 @@ rb_fopen(const char *fname, const char *mode)
 	rb_warn("setvbuf() can't be honoured for %s", fname);
 #endif
 #ifdef __human68k__
-    setmode(fileno(file), O_TEXT);
+    fmode(file, _IOTEXT);
 #endif
     return file;
 }
 
 FILE *
-rb_fdopen(int fd, const char *mode)
+rb_fdopen(fd, mode)
+    int fd;
+    const char *mode;
 {
     FILE *file;
 
@@ -3479,11 +2952,11 @@ rb_fdopen(int fd, const char *mode)
 #endif
     file = fdopen(fd, mode);
     if (!file) {
-	if (
 #if defined(sun)
-	    errno == 0 ||
+	if (errno == 0 || errno == EMFILE || errno == ENFILE) {
+#else
+	if (errno == EMFILE || errno == ENFILE) {
 #endif
-	    errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
 #if defined(sun)
 	    errno = 0;
@@ -3493,14 +2966,14 @@ rb_fdopen(int fd, const char *mode)
 	if (!file) {
 #ifdef _WIN32
 	    if (errno == 0) errno = EINVAL;
-#elif defined(sun)
+#endif
+#if defined(sun)
 	    if (errno == 0) errno = EMFILE;
 #endif
 	    rb_sys_fail(0);
 	}
     }
 
-    /* xxx: should be _IONBF?  A buffer in FILE may have trouble. */
 #ifdef USE_SETVBUF
     if (setvbuf(file, NULL, _IOFBF, 0) != 0)
 	rb_warn("setvbuf() can't be honoured (fd=%d)", fd);
@@ -3508,63 +2981,67 @@ rb_fdopen(int fd, const char *mode)
     return file;
 }
 
-static void
-io_check_tty(rb_io_t *fptr)
-{
-    if (isatty(fptr->fd))
-        fptr->mode |= FMODE_TTY|FMODE_DUPLEX;
-}
-
 static VALUE
-rb_file_open_internal(VALUE io, const char *fname, const char *mode)
+rb_file_open_internal(io, fname, mode)
+    VALUE io;
+    const char *fname, *mode;
 {
     rb_io_t *fptr;
 
     MakeOpenFile(io, fptr);
+
     fptr->mode = rb_io_mode_flags(mode);
-    rb_io_mode_enc(fptr, mode);
     fptr->path = strdup(fname);
-    fptr->fd = rb_sysopen(fptr->path, rb_io_mode_modenum(rb_io_flags_mode(fptr->mode)), 0666);
-    io_check_tty(fptr);
+    fptr->f = rb_fopen(fptr->path, rb_io_flags_mode(fptr->mode));
 
     return io;
 }
 
 VALUE
-rb_file_open(const char *fname, const char *mode)
+rb_file_open(fname, mode)
+    const char *fname, *mode;
 {
     return rb_file_open_internal(io_alloc(rb_cFile), fname, mode);
 }
 
 static VALUE
-rb_file_sysopen_internal(VALUE io, const char *fname, int flags, int mode)
+rb_file_sysopen_internal(io, fname, flags, mode)
+    VALUE io;
+    char *fname;
+    int flags, mode;
 {
     rb_io_t *fptr;
+    int fd;
+    const char *m;
 
     MakeOpenFile(io, fptr);
 
     fptr->path = strdup(fname);
+    m = rb_io_modenum_mode(flags);
     fptr->mode = rb_io_modenum_flags(flags);
-    fptr->fd = rb_sysopen(fptr->path, flags, mode);
-    io_check_tty(fptr);
+    fd = rb_sysopen(fptr->path, flags, mode);
+    fptr->f = rb_fdopen(fd, m);
 
     return io;
 }
 
 VALUE
-rb_file_sysopen(const char *fname, int flags, int mode)
+rb_file_sysopen(fname, flags, mode)
+    const char *fname;
+    int flags, mode;
 {
     return rb_file_sysopen_internal(io_alloc(rb_cFile), fname, flags, mode);
 }
 
-#if defined(__CYGWIN__) || !defined(HAVE_FORK)
+#if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__) || defined(__VMS)
 static struct pipe_list {
     rb_io_t *fptr;
     struct pipe_list *next;
 } *pipe_list;
 
 static void
-pipe_add_fptr(rb_io_t *fptr)
+pipe_add_fptr(fptr)
+    rb_io_t *fptr;
 {
     struct pipe_list *list;
 
@@ -3575,7 +3052,8 @@ pipe_add_fptr(rb_io_t *fptr)
 }
 
 static void
-pipe_del_fptr(rb_io_t *fptr)
+pipe_del_fptr(fptr)
+    rb_io_t *fptr;
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -3598,7 +3076,7 @@ pipe_del_fptr(rb_io_t *fptr)
 }
 
 static void
-pipe_atexit(void)
+pipe_atexit _((void))
 {
     struct pipe_list *list = pipe_list;
     struct pipe_list *tmp;
@@ -3610,20 +3088,27 @@ pipe_atexit(void)
     }
 }
 
+static void pipe_finalize _((rb_io_t *fptr,int));
+
 static void
-pipe_finalize(rb_io_t *fptr, int noraise)
+pipe_finalize(fptr, noraise)
+    rb_io_t *fptr;
+    int noraise;
 {
-#if !defined(HAVE_FORK) && !defined(_WIN32)
+#if !defined (__CYGWIN__) && !defined(_WIN32)
+    extern VALUE rb_last_status;
     int status;
-    if (fptr->stdio_file) {
-	status = pclose(fptr->stdio_file);
+    if (fptr->f) {
+	status = pclose(fptr->f);
+    }
+    if (fptr->f2) {
+	status = pclose(fptr->f2);
     }
-    fptr->fd = -1;
-    fptr->stdio_file = 0;
+    fptr->f = fptr->f2 = 0;
 #if defined DJGPP
     status <<= 8;
 #endif
-    rb_last_status_set(status, fptr->pid);
+    rb_last_status = INT2FIX(status);
 #else
     fptr_finalize(fptr, noraise);
 #endif
@@ -3632,402 +3117,248 @@ pipe_finalize(rb_io_t *fptr, int noraise)
 #endif
 
 void
-rb_io_synchronized(rb_io_t *fptr)
+rb_io_synchronized(fptr)
+    rb_io_t *fptr;
 {
-    rb_io_check_initialized(fptr);
     fptr->mode |= FMODE_SYNC;
 }
 
 void
-rb_io_unbuffered(rb_io_t *fptr)
+rb_io_unbuffered(fptr)
+    rb_io_t *fptr;
 {
     rb_io_synchronized(fptr);
 }
 
-int
-rb_pipe(int *pipes)
-{
-    int ret;
-    ret = pipe(pipes);
-    if (ret == -1) {
-        if (errno == EMFILE || errno == ENFILE) {
-            rb_gc();
-            ret = pipe(pipes);
-        }
-    }
-    if (ret == 0) {
-        UPDATE_MAXFD(pipes[0]);
-        UPDATE_MAXFD(pipes[1]);
-    }
-    return ret;
-}
-
-#ifdef HAVE_FORK
-struct popen_arg {
-    struct rb_exec_arg *execp;
-    int modef;
-    int pair[2];
-    int write_pair[2];
-};
-
-static void
-popen_redirect(struct popen_arg *p)
-{
-    if ((p->modef & FMODE_READABLE) && (p->modef & FMODE_WRITABLE)) {
-        close(p->write_pair[1]);
-        if (p->write_pair[0] != 0) {
-            dup2(p->write_pair[0], 0);
-            close(p->write_pair[0]);
-        }
-        close(p->pair[0]);
-        if (p->pair[1] != 1) {
-            dup2(p->pair[1], 1);
-            close(p->pair[1]);
-        }
-    }
-    else if (p->modef & FMODE_READABLE) {
-        close(p->pair[0]);
-        if (p->pair[1] != 1) {
-            dup2(p->pair[1], 1);
-            close(p->pair[1]);
-        }
-    }
-    else {
-        close(p->pair[1]);
-        if (p->pair[0] != 0) {
-            dup2(p->pair[0], 0);
-            close(p->pair[0]);
-        }
-    }
-}
-
-void
-rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
-{
-    int fd, ret;
-    int max = max_file_descriptor;
-    if (max < maxhint)
-        max = maxhint;
-    for (fd = lowfd; fd <= max; fd++) {
-        if (!NIL_P(noclose_fds) &&
-            RTEST(rb_hash_lookup(noclose_fds, INT2FIX(fd))))
-            continue;
-#ifdef FD_CLOEXEC
-	ret = fcntl(fd, F_GETFD);
-	if (ret != -1 && !(ret & FD_CLOEXEC)) {
-            fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
-        }
-#else
-	close(fd);
-#endif
-    }
-}
-
-static int
-popen_exec(void *pp)
-{
-    struct popen_arg *p = (struct popen_arg*)pp;
-
-    rb_thread_atfork_before_exec();
-    return rb_exec(p->execp);
-}
-#endif
+static VALUE pipe_open(VALUE pstr, const char *pname, const char *mode);
 
 static VALUE
-pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *mode)
+pipe_open(pstr, pname, mode)
+    VALUE pstr;
+    const char *pname, *mode;
 {
     int modef = rb_io_mode_flags(mode);
-    int pid = 0;
     rb_io_t *fptr;
-    VALUE port;
-    rb_io_t *write_fptr;
-    VALUE write_port;
-#if defined(HAVE_FORK)
-    int status;
-    struct popen_arg arg;
-#elif defined(_WIN32)
-    int openmode = rb_io_mode_modenum(mode);
-    const char *exename = NULL;
-    volatile VALUE cmdbuf;
-    struct rb_exec_arg sarg;
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+    FILE *f;
+#else
+    int pid;
+#ifdef _WIN32
+    FILE *fpr, *fpw;
+#else
+    int pr[2], pw[2];
 #endif
-    FILE *fp = 0;
-    int fd = -1;
-    int write_fd = -1;
-    const char *cmd = 0;
-    int argc;
-    VALUE *argv;
+#endif
+    volatile int doexec;
 
-    if (prog)
-        cmd = StringValueCStr(prog);
+    if (!pname) pname = StringValueCStr(pstr);
+    doexec = (strcmp("-", pname) != 0);
 
-    if (!eargp) {
-        /* fork : IO.popen("-") */
-        argc = 0;
-        argv = 0;
-    }
-    else if (eargp->argc) {
-        /* no shell : IO.popen([prog, arg0], arg1, ...) */
-        argc = eargp->argc;
-        argv = eargp->argv;
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS) || defined(_WIN32)
+    if (!doexec) {
+	rb_raise(rb_eNotImpError,
+		 "fork() function is unimplemented on this machine");
     }
+#endif
+
+#if defined(DJGPP) || defined(__human68k__) || defined(__VMS)
+    f = popen(pname, mode);
+    
+    if (!f) rb_sys_fail(pname);
     else {
-        /* with shell : IO.popen(prog) */
-        argc = 0;
-        argv = 0;
-    }
-
-#if defined(HAVE_FORK)
-    arg.execp = eargp;
-    arg.modef = modef;
-    arg.pair[0] = arg.pair[1] = -1;
-    arg.write_pair[0] = arg.write_pair[1] = -1;
-    switch (modef & (FMODE_READABLE|FMODE_WRITABLE)) {
-      case FMODE_READABLE|FMODE_WRITABLE:
-        if (rb_pipe(arg.write_pair) < 0)
-            rb_sys_fail(cmd);
-        if (rb_pipe(arg.pair) < 0) {
-            int e = errno;
-            close(arg.write_pair[0]);
-            close(arg.write_pair[1]);
-            errno = e;
-            rb_sys_fail(cmd);
-        }
-        if (eargp) {
-            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.write_pair[0]));
-            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
-        }
-	break;
-      case FMODE_READABLE:
-        if (rb_pipe(arg.pair) < 0)
-            rb_sys_fail(cmd);
-        if (eargp)
-            rb_exec_arg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
-	break;
-      case FMODE_WRITABLE:
-        if (rb_pipe(arg.pair) < 0)
-            rb_sys_fail(cmd);
-        if (eargp)
-            rb_exec_arg_addopt(eargp, INT2FIX(0), INT2FIX(arg.pair[0]));
-	break;
-      default:
-        rb_sys_fail(cmd);
+	VALUE port = io_alloc(rb_cIO);
+
+	MakeOpenFile(port, fptr);
+	fptr->finalize = pipe_finalize;
+	fptr->mode = modef;
+
+	pipe_add_fptr(fptr);
+	if (modef & FMODE_READABLE) fptr->f  = f;
+	if (modef & FMODE_WRITABLE) {
+	    if (fptr->f) fptr->f2 = f;
+	    else fptr->f = f;
+	    rb_io_synchronized(fptr);
+	}
+	return (VALUE)port;
     }
-    if (eargp) {
-        rb_exec_arg_fixup(arg.execp);
-	pid = rb_fork(&status, popen_exec, &arg, arg.execp->redirect_fds);
+#else
+#ifdef _WIN32
+retry:
+    pid = pipe_exec(pname, rb_io_mode_modenum(mode), &fpr, &fpw);
+    if (pid == -1) {		/* exec failed */
+	if (errno == EAGAIN) {
+	    rb_thread_sleep(1);
+	    goto retry;
+	}
+	rb_sys_fail(pname);
     }
     else {
-	fflush(stdin);		/* is it really needed? */
-	rb_io_flush(rb_stdout);
-	rb_io_flush(rb_stderr);
-	pid = rb_fork(&status, 0, 0, Qnil);
-	if (pid == 0) {		/* child */
-	    popen_redirect(&arg);
-	    rb_io_synchronized(RFILE(orig_stdout)->fptr);
-	    rb_io_synchronized(RFILE(orig_stderr)->fptr);
-	    return Qnil;
+        VALUE port = io_alloc(rb_cIO);
+
+	MakeOpenFile(port, fptr);
+	fptr->mode = modef;
+	fptr->mode |= FMODE_SYNC;
+	fptr->pid = pid;
+
+	if (modef & FMODE_READABLE) {
+	    fptr->f = fpr;
+	}
+	if (modef & FMODE_WRITABLE) {
+	    if (fptr->f) fptr->f2 = fpw;
+	    else fptr->f = fpw;
 	}
+	fptr->finalize = pipe_finalize;
+	pipe_add_fptr(fptr);
+	return (VALUE)port;
     }
+#else
+    if (((modef & FMODE_READABLE) && pipe(pr) == -1) ||
+	((modef & FMODE_WRITABLE) && pipe(pw) == -1))
+	rb_sys_fail(pname);
 
-    /* parent */
-    if (pid == -1) {
-	int e = errno;
-	close(arg.pair[0]);
-	close(arg.pair[1]);
-        if ((modef & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
-            close(arg.write_pair[0]);
-            close(arg.write_pair[1]);
-        }
-	errno = e;
-	rb_sys_fail(cmd);
-    }
-    if ((modef & FMODE_READABLE) && (modef & FMODE_WRITABLE)) {
-        close(arg.pair[1]);
-        fd = arg.pair[0];
-        close(arg.write_pair[0]);
-        write_fd = arg.write_pair[1];
-    }
-    else if (modef & FMODE_READABLE) {
-        close(arg.pair[1]);
-        fd = arg.pair[0];
-    }
-    else {
-        close(arg.pair[0]);
-        fd = arg.pair[1];
+    if (!doexec) {
+	fflush(stdin);		/* is it really needed? */
+	fflush(stdout);
+	fflush(stderr);
     }
-#elif defined(_WIN32)
-    if (argc) {
-	volatile VALUE argbuf;
-	char **args;
-	int i;
 
-	if (argc >= FIXNUM_MAX / sizeof(char *)) {
-	    rb_raise(rb_eArgError, "too many arguments");
+  retry:
+    switch ((pid = fork())) {
+      case 0:			/* child */
+	if (modef & FMODE_READABLE) {
+	    close(pr[0]);
+	    if (pr[1] != 1) {
+		dup2(pr[1], 1);
+		close(pr[1]);
+	    }
 	}
-	argbuf = rb_str_tmp_new((argc+1) * sizeof(char *));
-	args = (void *)RSTRING_PTR(argbuf);
-	for (i = 0; i < argc; ++i) {
-	    args[i] = StringValueCStr(argv[i]);
+	if (modef & FMODE_WRITABLE) {
+	    close(pw[1]);
+	    if (pw[0] != 0) {
+		dup2(pw[0], 0);
+		close(pw[0]);
+	    }
 	}
-	args[i] = NULL;
-	exename = cmd;
-	cmdbuf = rb_str_tmp_new(rb_w32_argv_size(args));
-	cmd = rb_w32_join_argv(RSTRING_PTR(cmdbuf), args);
-	rb_str_resize(argbuf, 0);
-    }
-    if (eargp) {
-	rb_exec_arg_fixup(eargp);
-	rb_run_exec_options(eargp, &sarg);
-    }
-    while ((pid = rb_w32_pipe_exec(cmd, exename, openmode, &fd, &write_fd)) == -1) {
-	/* exec failed */
-	switch (errno) {
-	  case EAGAIN:
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	  case EWOULDBLOCK:
-#endif
+
+	if (doexec) {
+	    int fd;
+
+	    for (fd = 3; fd < NOFILE; fd++)
+		close(fd);
+	    rb_proc_exec(pname);
+	    fprintf(stderr, "%s:%d: command not found: %s\n",
+		    ruby_sourcefile, ruby_sourceline, pname);
+	    _exit(127);
+	}
+	rb_io_synchronized(RFILE(orig_stdout)->fptr);
+	rb_io_synchronized(RFILE(orig_stderr)->fptr);
+	return Qnil;
+
+      case -1:			/* fork failed */
+	if (errno == EAGAIN) {
 	    rb_thread_sleep(1);
-	    break;
-	  default:
-	    if (eargp)
-		rb_run_exec_options(&sarg, NULL);
-	    rb_sys_fail(cmd);
-	    break;
+	    goto retry;
 	}
-    }
-    if (eargp)
-	rb_run_exec_options(&sarg, NULL);
-#else
-    if (argc) {
-	prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
-	cmd = StringValueCStr(prog);
-    }
-    if (eargp) {
-	rb_exec_arg_fixup(eargp);
-	rb_run_exec_options(eargp, &sarg);
-    }
-    fp = popen(cmd, mode);
-    if (eargp)
-	rb_run_exec_options(&sarg, NULL);
-    if (!fp) rb_sys_fail(RSTRING_PTR(prog));
-    fd = fileno(fp);
-#endif
+	else {
+	    int e = errno;
+	    if ((modef & FMODE_READABLE)) {
+		close(pr[0]);
+		close(pr[1]);
+	    }
+	    if ((modef & FMODE_WRITABLE)) {
+		close(pw[0]);
+		close(pw[1]);
+	    }
+	    errno = e;
+	    rb_sys_fail(pname);
+	}
+	break;
 
-    port = io_alloc(rb_cIO);
-    MakeOpenFile(port, fptr);
-    fptr->fd = fd;
-    fptr->stdio_file = fp;
-    fptr->mode = modef | FMODE_SYNC|FMODE_DUPLEX;
-    rb_io_mode_enc(fptr, mode);
-    fptr->pid = pid;
-
-    if (0 <= write_fd) {
-        write_port = io_alloc(rb_cIO);
-        MakeOpenFile(write_port, write_fptr);
-        write_fptr->fd = write_fd;
-        write_fptr->mode = (modef & ~FMODE_READABLE)| FMODE_SYNC|FMODE_DUPLEX;
-        fptr->mode &= ~FMODE_WRITABLE;
-        fptr->tied_io_for_writing = write_port;
-        rb_ivar_set(port, rb_intern("@tied_io_for_writing"), write_port);
-    }
-
-#if defined (__CYGWIN__) || !defined(HAVE_FORK)
-    fptr->finalize = pipe_finalize;
-    pipe_add_fptr(fptr);
-#endif
-    return port;
-}
+      default:			/* parent */
+	if (pid < 0) rb_sys_fail(pname);
+	else {
+	    VALUE port = io_alloc(rb_cIO);
 
-static VALUE
-pipe_open_v(int argc, VALUE *argv, const char *mode)
-{
-    VALUE prog;
-    struct rb_exec_arg earg;
-    prog = rb_exec_arg_init(argc, argv, Qfalse, &earg);
-    return pipe_open(&earg, prog, mode);
-}
+	    MakeOpenFile(port, fptr);
+	    fptr->mode = modef;
+	    fptr->mode |= FMODE_SYNC;
+	    fptr->pid = pid;
 
-static VALUE
-pipe_open_s(VALUE prog, const char *mode)
-{
-    const char *cmd = RSTRING_PTR(prog);
-    int argc = 1;
-    VALUE *argv = &prog;
-    struct rb_exec_arg earg;
+	    if (modef & FMODE_READABLE) {
+		close(pr[1]);
+		fptr->f  = rb_fdopen(pr[0], "r");
+	    }
+	    if (modef & FMODE_WRITABLE) {
+		FILE *f = rb_fdopen(pw[1], "w");
 
-    if (RSTRING_LEN(prog) == 1 && cmd[0] == '-') {
-#if !defined(HAVE_FORK)
-	rb_raise(rb_eNotImpError,
-		 "fork() function is unimplemented on this machine");
+		close(pw[0]);
+		if (fptr->f) fptr->f2 = f;
+		else fptr->f = f;
+	    }
+#if defined (__CYGWIN__)
+	    fptr->finalize = pipe_finalize;
+	    pipe_add_fptr(fptr);
 #endif
-        return pipe_open(0, 0, mode);
+	    return port;
+	}
     }
-
-    rb_exec_arg_init(argc, argv, Qtrue, &earg);
-    return pipe_open(&earg, prog, mode);
+#endif
+#endif
 }
 
 /*
  *  call-seq:
- *     IO.popen(cmd, mode="r")               => io
- *     IO.popen(cmd, mode="r") {|io| block } => obj
- *
- *  Runs the specified command as a subprocess; the subprocess's
+ *     IO.popen(cmd_string, mode="r" )               => io
+ *     IO.popen(cmd_string, mode="r" ) {|io| block } => obj
+ *  
+ *  Runs the specified command string as a subprocess; the subprocess's
  *  standard input and output will be connected to the returned
- *  <code>IO</code> object.  If _cmd_ is a +String+
+ *  <code>IO</code> object. If <i>cmd_string</i> starts with a
  *  ``<code>-</code>'', then a new instance of Ruby is started as the
- *  subprocess.  If <i>cmd</i> is an +Array+ of +String+, then it will
- *  be used as the subprocess's +argv+ bypassing a shell.
- *  The array can contains a hash at first for environments and
- *  a hash at last for options similar to <code>spawn</code>.  The default
- *  mode for the new file object is ``r'', but <i>mode</i> may be set
- *  to any of the modes listed in the description for class IO.
- *
- *  Raises exceptions which <code>IO::pipe</code> and
- *  <code>Kernel::system</code> raise.
- *
+ *  subprocess. The default mode for the new file object is ``r'', but
+ *  <i>mode</i> may be set to any of the modes listed in the description
+ *  for class IO.
+ *     
  *  If a block is given, Ruby will run the command as a child connected
  *  to Ruby with a pipe. Ruby's end of the pipe will be passed as a
  *  parameter to the block.
  *  At the end of block, Ruby close the pipe and sets <code>$?</code>.
  *  In this case <code>IO::popen</code> returns
  *  the value of the block.
- *
- *  If a block is given with a _cmd_ of ``<code>-</code>'',
+ *     
+ *  If a block is given with a <i>cmd_string</i> of ``<code>-</code>'',
  *  the block will be run in two separate processes: once in the parent,
  *  and once in a child. The parent process will be passed the pipe
  *  object as a parameter to the block, the child version of the block
  *  will be passed <code>nil</code>, and the child's standard in and
  *  standard out will be connected to the parent through the pipe. Not
  *  available on all platforms.
- *
+ *     
  *     f = IO.popen("uname")
  *     p f.readlines
  *     puts "Parent is #{Process.pid}"
- *     IO.popen("date") { |f| puts f.gets }
+ *     IO.popen ("date") { |f| puts f.gets }
  *     IO.popen("-") {|f| $stderr.puts "#{Process.pid} is here, f is #{f}"}
  *     p $?
- *     IO.popen(%w"sed -e s|^|<foo>| -e s&$&;zot;&", "r+") {|f|
- *       f.puts "bar"; f.close_write; puts f.gets
- *     }
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     ["Linux\n"]
  *     Parent is 26166
  *     Wed Apr  9 08:53:52 CDT 2003
  *     26169 is here, f is
  *     26166 is here, f is #<IO:0x401b3d44>
  *     #<Process::Status: pid=26166,exited(0)>
- *     <foo>bar;zot;
  */
 
 static VALUE
-rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
+rb_io_s_popen(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     const char *mode;
-    VALUE pname, pmode, port, tmp;
+    VALUE pname, pmode, port;
 
     if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
 	mode = "r";
@@ -4036,25 +3367,16 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
 	mode = rb_io_modenum_mode(FIX2INT(pmode));
     }
     else {
-	mode = StringValueCStr(pmode);
-    }
-    tmp = rb_check_array_type(pname);
-    if (!NIL_P(tmp)) {
-	tmp = rb_ary_dup(tmp);
-	RBASIC(tmp)->klass = 0;
-	port = pipe_open_v(RARRAY_LEN(tmp), RARRAY_PTR(tmp), mode);
-	rb_ary_clear(tmp);
-    }
-    else {
-	SafeStringValue(pname);
-	port = pipe_open_s(pname, mode);
+	mode = rb_io_flags_mode(rb_io_mode_flags(StringValueCStr(pmode)));
     }
+    SafeStringValue(pname);
+    port = pipe_open(pname, 0, mode);
     if (NIL_P(port)) {
 	/* child */
 	if (rb_block_given_p()) {
 	    rb_yield(Qnil);
-            rb_io_flush(rb_stdout);
-            rb_io_flush(rb_stderr);
+	    fflush(stdout);
+	    fflush(stderr);
 	    _exit(0);
 	}
 	return Qnil;
@@ -4066,109 +3388,37 @@ rb_io_s_popen(int argc, VALUE *argv, VALUE klass)
     return port;
 }
 
-static void
-io_set_encoding(VALUE io, VALUE opt)
-{
-    rb_io_t *fptr;
-    VALUE encoding=Qnil, extenc=Qnil, intenc=Qnil;
-    if (!NIL_P(opt)) {
-	VALUE v;
-	v = rb_hash_aref(opt, sym_encoding);
-	if (!NIL_P(v)) encoding = v;
-	v = rb_hash_aref(opt, sym_extenc);
-	if (!NIL_P(v)) extenc = v;
-	v = rb_hash_aref(opt, sym_intenc);
-	if (!NIL_P(v)) intenc = v;
-    }
-    if (!NIL_P(extenc)) {
-	rb_encoding *extencoding = rb_to_encoding(extenc);
-	GetOpenFile(io, fptr);
-	if (!NIL_P(encoding)) {
-	    rb_warn("Ignoring encoding parameter '%s': external_encoding is used",
-		    RSTRING_PTR(encoding));
-	}
-	if (!NIL_P(intenc)) {
-	    rb_encoding *intencoding = rb_to_encoding(intenc);
-	    if (extencoding == intencoding) {
-		rb_warn("Ignoring internal encoding '%s': it is identical to external encoding '%s'",
-			RSTRING_PTR(rb_inspect(intenc)),
-			RSTRING_PTR(rb_inspect(extenc)));
-	    }
-	    else {
-		fptr->enc2 = intencoding;
-	    }
-	}
-	fptr->enc = extencoding;
-    }
-    else {
-	if (!NIL_P(intenc)) {
-	    rb_raise(rb_eArgError, "External encoding must be specified when internal encoding is given");
-	}
-	if (!NIL_P(encoding)) {
-	    GetOpenFile(io, fptr);
-	    mode_enc(fptr, StringValueCStr(encoding));
-	}
-    }
-}
-
 static VALUE
-rb_open_file(int argc, VALUE *argv, VALUE io)
+rb_open_file(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE opt, fname, vmode, perm;
-    const char *mode;
+    VALUE fname, vmode, perm;
+    const char *path, *mode;
     int flags;
     unsigned int fmode;
 
-    opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
-    if (!NIL_P(opt)) {
-	VALUE v;
-	v = rb_hash_aref(opt, sym_mode);
-	if (!NIL_P(v)) vmode = v;
-	v = rb_hash_aref(opt, sym_perm);
-	if (!NIL_P(v)) perm = v;
-	argc -= 1;
-    }
-
     rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-#if defined _WIN32 || defined __APPLE__
-    {
-	static rb_encoding *fs_encoding;
-	rb_encoding *fname_encoding = rb_enc_get(fname);
-	if (!fs_encoding)
-	    fs_encoding = rb_filesystem_encoding();
-	if (rb_usascii_encoding() != fname_encoding
-	    && rb_ascii8bit_encoding() != fname_encoding
-#if defined __APPLE__
-	    && rb_utf8_encoding() != fname_encoding
-#endif
-	    && fs_encoding != fname_encoding) {
-	    static VALUE fs_enc;
-	    if (!fs_enc)
-		fs_enc = rb_enc_from_encoding(fs_encoding);
-	    fname = rb_str_transcode(fname, fs_enc);
-	}
-    }
-#endif
-    FilePathValue(fname);
+    SafeStringValue(fname);
 
+    path = StringValueCStr(fname);
     if (FIXNUM_P(vmode) || !NIL_P(perm)) {
 	if (FIXNUM_P(vmode)) {
 	    flags = FIX2INT(vmode);
 	}
 	else {
 	    SafeStringValue(vmode);
-	    flags = rb_io_mode_modenum(StringValueCStr(vmode));
+	    flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
 	}
 	fmode = NIL_P(perm) ? 0666 :  NUM2UINT(perm);
 
-	rb_file_sysopen_internal(io, RSTRING_PTR(fname), flags, fmode);
+	rb_file_sysopen_internal(io, path, flags, fmode);
     }
     else {
 	mode = NIL_P(vmode) ? "r" : StringValueCStr(vmode);
-	rb_file_open_internal(io, RSTRING_PTR(fname), mode);
+	rb_file_open_internal(io, path, mode);
     }
-
-    io_set_encoding(io, opt);
     return io;
 }
 
@@ -4176,17 +3426,20 @@ rb_open_file(int argc, VALUE *argv, VALUE io)
  *  call-seq:
  *     IO.open(fd, mode_string="r" )               => io
  *     IO.open(fd, mode_string="r" ) {|io| block } => obj
- *
+ *  
  *  With no associated block, <code>open</code> is a synonym for
  *  <code>IO::new</code>. If the optional code block is given, it will
  *  be passed <i>io</i> as an argument, and the IO object will
  *  automatically be closed when the block terminates. In this instance,
  *  <code>IO::open</code> returns the value of the block.
- *
+ *     
  */
 
 static VALUE
-rb_io_s_open(int argc, VALUE *argv, VALUE klass)
+rb_io_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE io = rb_class_new_instance(argc, argv, klass);
 
@@ -4200,16 +3453,18 @@ rb_io_s_open(int argc, VALUE *argv, VALUE klass)
 /*
  *  call-seq:
  *     IO.sysopen(path, [mode, [perm]])  => fixnum
- *
+ *  
  *  Opens the given path, returning the underlying file descriptor as a
  *  <code>Fixnum</code>.
- *
+ *     
  *     IO.sysopen("testfile")   #=> 3
- *
+ *     
  */
 
 static VALUE
-rb_io_s_sysopen(int argc, VALUE *argv)
+rb_io_s_sysopen(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE fname, vmode, perm;
     int flags, fd;
@@ -4217,67 +3472,42 @@ rb_io_s_sysopen(int argc, VALUE *argv)
     char *path;
 
     rb_scan_args(argc, argv, "12", &fname, &vmode, &perm);
-    FilePathValue(fname);
+    SafeStringValue(fname);
 
     if (NIL_P(vmode)) flags = O_RDONLY;
     else if (FIXNUM_P(vmode)) flags = FIX2INT(vmode);
     else {
 	SafeStringValue(vmode);
-	flags = rb_io_mode_modenum(StringValueCStr(vmode));
+	flags = rb_io_mode_modenum(RSTRING(vmode)->ptr);
     }
     if (NIL_P(perm)) fmode = 0666;
     else             fmode = NUM2UINT(perm);
 
-    RB_GC_GUARD(fname) = rb_str_new4(fname);
-    path = RSTRING_PTR(fname);
+    path = ALLOCA_N(char, strlen(RSTRING(fname)->ptr)+1);
+    strcpy(path, RSTRING(fname)->ptr);
     fd = rb_sysopen(path, flags, fmode);
     return INT2NUM(fd);
 }
 
 /*
  *  call-seq:
- *     open(path [, mode_enc [, perm]] )                => io or nil
- *     open(path [, mode_enc [, perm]] ) {|io| block }  => obj
- *
+ *     open(path [, mode [, perm]] )                => io or nil
+ *     open(path [, mode [, perm]] ) {|io| block }  => obj
+ *  
  *  Creates an <code>IO</code> object connected to the given stream,
  *  file, or subprocess.
- *
+ *     
  *  If <i>path</i> does not start with a pipe character
  *  (``<code>|</code>''), treat it as the name of a file to open using
- *  the specified mode (defaulting to ``<code>r</code>'').
- *
- *  The mode_enc is
- *  either a string or an integer.  If it is an integer, it must be
- *  bitwise-or of open(2) flags, such as File::RDWR or File::EXCL.
- *  If it is a string, it is either "mode", "mode:ext_enc", or
- *  "mode:ext_enc:int_enc".
- *  The mode is one of the following:
- *
- *   r: read (default)
- *   w: write
- *   a: append
- *
- *  The mode can be followed by "b" (means binary-mode), or "+"
- *  (means both reading and writing allowed) or both.
- *  If ext_enc (external encoding) is specified,
- *  read string will be tagged by the encoding in reading,
- *  and output string will be converted
- *  to the specified encoding in writing.
- *  If two encoding names,
- *  ext_enc and int_enc (external encoding and internal encoding),
- *  are specified, the read string is converted from ext_enc
- *  to int_enc then tagged with the int_enc in read mode,
- *  and in write mode, the output string will be
- *  converted from int_enc to ext_enc before writing.
- *
- *  If a file is being created, its initial permissions may be
- *  set using the integer third parameter.
- *
+ *  the specified mode (defaulting to ``<code>r</code>''). (See the table
+ *  of valid modes on page 331.) If a file is being created, its initial
+ *  permissions may be set using the integer third parameter.
+ *     
  *  If a block is specified, it will be invoked with the
  *  <code>File</code> object as a parameter, and the file will be
  *  automatically closed when the block terminates. The call
  *  returns the value of the block.
- *
+ *     
  *  If <i>path</i> starts with a pipe character, a subprocess is
  *  created, connected to the caller by a pair of pipes. The returned
  *  <code>IO</code> object may be used to write to the standard input
@@ -4293,27 +3523,27 @@ rb_io_s_sysopen(int argc, VALUE *argv)
  *  will be connected to the child's <code>$stdin</code> and
  *  <code>$stdout</code>. The subprocess will be terminated at the end
  *  of the block.
- *
+ *     
  *     open("testfile") do |f|
  *       print f.gets
  *     end
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     This is line one
- *
+ *     
  *  Open a subprocess and read its output:
- *
+ *     
  *     cmd = open("|date")
  *     print cmd.gets
  *     cmd.close
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Wed Apr  9 08:56:31 CDT 2003
- *
+ *     
  *  Open a subprocess running the same Ruby program:
- *
+ *     
  *     f = open("|-", "w+")
  *     if f == nil
  *       puts "in Child"
@@ -4321,13 +3551,13 @@ rb_io_s_sysopen(int argc, VALUE *argv)
  *     else
  *       puts "Got: #{f.gets}"
  *     end
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Got: in Child
- *
+ *     
  *  Open a subprocess using a block to receive the I/O object:
- *
+ *     
  *     open("|-") do |f|
  *       if f == nil
  *         puts "in Child"
@@ -4335,56 +3565,36 @@ rb_io_s_sysopen(int argc, VALUE *argv)
  *         puts "Got: #{f.gets}"
  *       end
  *     end
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Got: in Child
  */
 
 static VALUE
-rb_f_open(int argc, VALUE *argv)
+rb_f_open(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    ID to_open = 0;
-    int redirect = Qfalse;
-
     if (argc >= 1) {
-	CONST_ID(to_open, "to_open");
-	if (rb_respond_to(argv[0], to_open)) {
-	    redirect = Qtrue;
-	}
-	else {
-	    VALUE tmp = argv[0];
-	    FilePathValue(tmp);
-	    if (NIL_P(tmp)) {
-		redirect = Qtrue;
-	    }
-	    else {
-		char *str = StringValuePtr(tmp);
-		if (str && str[0] == '|') {
-		    argv[0] = rb_str_new(str+1, RSTRING_LEN(tmp)-1);
-		    OBJ_INFECT(argv[0], tmp);
-		    return rb_io_s_popen(argc, argv, rb_cIO);
-		}
-	    }
-	}
-    }
-    if (redirect) {
-	VALUE io = rb_funcall2(argv[0], to_open, argc-1, argv+1);
+	char *str = StringValuePtr(argv[0]);
 
-	if (rb_block_given_p()) {
-	    return rb_ensure(rb_yield, io, io_close, io);
+	if (str[0] == '|') {
+	    VALUE tmp = rb_str_new(str+1, RSTRING(argv[0])->len-1);
+	    OBJ_INFECT(tmp, argv[0]);
+	    argv[0] = tmp;
+	    return rb_io_s_popen(argc, argv, rb_cIO);
 	}
-	return io;
     }
     return rb_io_s_open(argc, argv, rb_cFile);
 }
 
 static VALUE
-rb_io_open(const char *fname, const char *mode)
+rb_io_open(fname, mode)
+    char *fname, *mode;
 {
     if (fname[0] == '|') {
-	VALUE cmd = rb_str_new2(fname+1);
-	return pipe_open_s(cmd, mode);
+	return pipe_open(0, fname+1, mode);
     }
     else {
 	return rb_file_open(fname, mode);
@@ -4392,27 +3602,40 @@ rb_io_open(const char *fname, const char *mode)
 }
 
 static VALUE
-rb_io_open_with_args(int argc, VALUE *argv)
+rb_io_get_io(io)
+    VALUE io;
 {
-    const char *mode;
-    VALUE pname, pmode;
+    return rb_convert_type(io, T_FILE, "IO", "to_io");
+}
 
-    if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
-	mode = "r";
-    }
-    else if (FIXNUM_P(pmode)) {
-	mode = rb_io_modenum_mode(FIX2INT(pmode));
-    }
-    else {
-	mode = StringValueCStr(pmode);
+static VALUE
+rb_io_check_io(io)
+    VALUE io;
+{
+    return rb_check_convert_type(io, T_FILE, "IO", "to_io");
+}
+
+static const char*
+rb_io_mode_string(fptr)
+    rb_io_t *fptr;
+{
+    switch (fptr->mode & FMODE_READWRITE) {
+      case FMODE_READABLE:
+      default:
+	return "r";
+      case FMODE_WRITABLE:
+	return "w";
+      case FMODE_READWRITE:
+	return "r+";
     }
-    return rb_io_open(StringValueCStr(pname), mode);
 }
 
 static VALUE
-io_reopen(VALUE io, VALUE nfile)
+io_reopen(io, nfile)
+    VALUE io, nfile;
 {
     rb_io_t *fptr, *orig;
+    const char *mode;
     int fd, fd2;
     off_t pos = 0;
 
@@ -4424,28 +3647,21 @@ io_reopen(VALUE io, VALUE nfile)
     GetOpenFile(nfile, orig);
 
     if (fptr == orig) return io;
-    if (IS_PREP_STDIO(fptr)) {
-        if ((fptr->stdio_file == stdin && !(orig->mode & FMODE_READABLE)) ||
-            (fptr->stdio_file == stdout && !(orig->mode & FMODE_WRITABLE)) ||
-            (fptr->stdio_file == stderr && !(orig->mode & FMODE_WRITABLE))) {
-	    rb_raise(rb_eArgError,
-		     "%s can't change access mode from \"%s\" to \"%s\"",
-		     PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode),
-		     rb_io_flags_mode(orig->mode));
-	}
-    }
     if (orig->mode & FMODE_READABLE) {
 	pos = io_tell(orig);
     }
-    if (orig->mode & FMODE_WRITABLE) {
-	io_fflush(orig);
+    if (orig->f2) {
+	io_fflush(orig->f2, orig);
+    }
+    else if (orig->mode & FMODE_WRITABLE) {
+	io_fflush(orig->f, orig);
     }
     if (fptr->mode & FMODE_WRITABLE) {
-	io_fflush(fptr);
+	io_fflush(GetWriteFile(fptr), fptr);
     }
 
     /* copy rb_io_t structure */
-    fptr->mode = orig->mode | (fptr->mode & FMODE_PREP);
+    fptr->mode = orig->mode;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
     if (fptr->path) free(fptr->path);
@@ -4453,33 +3669,54 @@ io_reopen(VALUE io, VALUE nfile)
     else fptr->path = 0;
     fptr->finalize = orig->finalize;
 
-    fd = fptr->fd;
-    fd2 = orig->fd;
+    mode = rb_io_mode_string(fptr);
+    fd = fileno(fptr->f);
+    fd2 = fileno(orig->f);
     if (fd != fd2) {
-	if (IS_PREP_STDIO(fptr)) {
+	if (fptr->f == stdin || fptr->f == stdout || fptr->f == stderr) {
+	    clearerr(fptr->f);
 	    /* need to keep stdio objects */
 	    if (dup2(fd2, fd) < 0)
 		rb_sys_fail(orig->path);
 	}
 	else {
-            if (fptr->stdio_file)
-                fclose(fptr->stdio_file);
-            else
-                close(fptr->fd);
-            fptr->stdio_file = 0;
-            fptr->fd = -1;
+	    FILE *f2 = fptr->f2;
+	    int m = fptr->mode;
+	    fclose(fptr->f);
+	    fptr->f = f2;
+	    fptr->f2 = NULL;
+	    fptr->mode &= (m & FMODE_READABLE) ? ~FMODE_READABLE : ~FMODE_WRITABLE;
 	    if (dup2(fd2, fd) < 0)
 		rb_sys_fail(orig->path);
-            fptr->fd = fd;
+	    if (f2) {
+		fptr->f = rb_fdopen(fd, "r");
+		fptr->f2 = f2;
+	    }
+	    else {
+		fptr->f = rb_fdopen(fd, mode);
+	    }
+	    fptr->mode = m;
 	}
 	rb_thread_fd_close(fd);
 	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
-	    if (io_seek(fptr, pos, SEEK_SET) < 0) {
-		rb_sys_fail(fptr->path);
-	    }
-	    if (io_seek(orig, pos, SEEK_SET) < 0) {
+	    io_seek(fptr, pos, SEEK_SET);
+	    io_seek(orig, pos, SEEK_SET);
+	}
+    }
+
+    if (fptr->f2 && fd != fileno(fptr->f2)) {
+	fd = fileno(fptr->f2);
+	if (!orig->f2) {
+	    fclose(fptr->f2);
+	    rb_thread_fd_close(fd);
+	    fptr->f2 = 0;
+	}
+	else if (fd != (fd2 = fileno(orig->f2))) {
+	    fclose(fptr->f2);
+	    rb_thread_fd_close(fd);
+	    if (dup2(fd2, fd) < 0)
 		rb_sys_fail(orig->path);
-	    }
+	    fptr->f2 = rb_fdopen(fd, "w");
 	}
     }
 
@@ -4493,13 +3730,13 @@ io_reopen(VALUE io, VALUE nfile)
 
 /*
  *  call-seq:
- *     ios.reopen(other_IO)         => ios
+ *     ios.reopen(other_IO)         => ios 
  *     ios.reopen(path, mode_str)   => ios
- *
+ *  
  *  Reassociates <em>ios</em> with the I/O stream given in
  *  <i>other_IO</i> or to a new stream opened on <i>path</i>. This may
  *  dynamically change the actual class of this stream.
- *
+ *     
  *     f1 = File.new("testfile")
  *     f2 = File.new("testfile")
  *     f2.readlines[0]   #=> "This is line one\n"
@@ -4508,7 +3745,10 @@ io_reopen(VALUE io, VALUE nfile)
  */
 
 static VALUE
-rb_io_reopen(int argc, VALUE *argv, VALUE file)
+rb_io_reopen(argc, argv, file)
+    int argc;
+    VALUE *argv;
+    VALUE file;
 {
     VALUE fname, nmode;
     const char *mode;
@@ -4522,7 +3762,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 	}
     }
 
-    FilePathValue(fname);
+    SafeStringValue(fname);
     rb_io_taint_check(file);
     fptr = RFILE(file)->fptr;
     if (!fptr) {
@@ -4531,17 +3771,7 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
     }
 
     if (!NIL_P(nmode)) {
-	int flags = rb_io_mode_flags(StringValueCStr(nmode));
-	if (IS_PREP_STDIO(fptr) &&
-            ((fptr->mode & FMODE_READWRITE) & (flags & FMODE_READWRITE)) !=
-            (fptr->mode & FMODE_READWRITE)) {
-	    rb_raise(rb_eArgError,
-		     "%s can't change access mode from \"%s\" to \"%s\"",
-		     PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode),
-		     rb_io_flags_mode(flags));
-	}
-	fptr->mode = flags;
-	rb_io_mode_enc(fptr, StringValueCStr(nmode));
+	fptr->mode = rb_io_mode_flags(StringValueCStr(nmode));
     }
 
     if (fptr->path) {
@@ -4551,32 +3781,27 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 
     fptr->path = strdup(StringValueCStr(fname));
     mode = rb_io_flags_mode(fptr->mode);
-    if (fptr->fd < 0) {
-        fptr->fd = rb_sysopen(fptr->path, rb_io_mode_modenum(mode), 0666);
-	fptr->stdio_file = 0;
+    if (!fptr->f) {
+	fptr->f = rb_fopen(fptr->path, mode);
+	if (fptr->f2) {
+	    fclose(fptr->f2);
+	    fptr->f2 = 0;
+	}
 	return file;
     }
 
-    if (fptr->mode & FMODE_WRITABLE) {
-        io_fflush(fptr);
+    if (freopen(fptr->path, mode, fptr->f) == 0) {
+	rb_sys_fail(fptr->path);
     }
-    fptr->rbuf_off = fptr->rbuf_len = 0;
-
-    if (fptr->stdio_file) {
-        if (freopen(fptr->path, mode, fptr->stdio_file) == 0) {
-            rb_sys_fail(fptr->path);
-        }
-        fptr->fd = fileno(fptr->stdio_file);
 #ifdef USE_SETVBUF
-        if (setvbuf(fptr->stdio_file, NULL, _IOFBF, 0) != 0)
-            rb_warn("setvbuf() can't be honoured for %s", fptr->path);
+    if (setvbuf(fptr->f, NULL, _IOFBF, 0) != 0)
+	rb_warn("setvbuf() can't be honoured for %s", fptr->path);
 #endif
-    }
-    else {
-        if (close(fptr->fd) < 0)
-            rb_sys_fail(fptr->path);
-        fptr->fd = -1;
-        fptr->fd = rb_sysopen(fptr->path, rb_io_mode_modenum(mode), 0666);
+
+    if (fptr->f2) {
+	if (freopen(fptr->path, "w", fptr->f2) == 0) {
+	    rb_sys_fail(fptr->path);
+	}
     }
 
     return file;
@@ -4584,54 +3809,78 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file)
 
 /* :nodoc: */
 static VALUE
-rb_io_init_copy(VALUE dest, VALUE io)
+rb_io_init_copy(dest, io)
+    VALUE dest, io;
 {
     rb_io_t *fptr, *orig;
     int fd;
-    VALUE write_io;
+    const char *mode;
 
     io = rb_io_get_io(io);
     if (dest == io) return dest;
     GetOpenFile(io, orig);
     MakeOpenFile(dest, fptr);
 
-    rb_io_flush(io);
+    if (orig->f2) {
+	io_fflush(orig->f2, orig);
+	fseeko(orig->f, 0L, SEEK_CUR);
+    }
+    else if (orig->mode & FMODE_WRITABLE) {
+	io_fflush(orig->f, orig);
+    }
+    else {
+	fseeko(orig->f, 0L, SEEK_CUR);
+    }
 
     /* copy rb_io_t structure */
-    fptr->mode = orig->mode & ~FMODE_PREP;
+    fptr->mode = orig->mode;
     fptr->pid = orig->pid;
     fptr->lineno = orig->lineno;
     if (orig->path) fptr->path = strdup(orig->path);
     fptr->finalize = orig->finalize;
 
-    fd = ruby_dup(orig->fd);
-    fptr->fd = fd;
-    io_seek(fptr, io_tell(orig), SEEK_SET);
+    switch (fptr->mode & FMODE_READWRITE) {
+      case FMODE_READABLE:
+      default:
+	mode = "r"; break;
+      case FMODE_WRITABLE:
+	mode = "w"; break;
+      case FMODE_READWRITE:
+	if (orig->f2) mode = "r";
+	else          mode = "r+";
+	break;
+    }
+    fd = ruby_dup(fileno(orig->f));
+    fptr->f = rb_fdopen(fd, mode);
+    fseeko(fptr->f, ftello(orig->f), SEEK_SET);
+    if (orig->f2) {
+	if (fileno(orig->f) != fileno(orig->f2)) {
+	    fd = ruby_dup(fileno(orig->f2));
+	}
+	fptr->f2 = rb_fdopen(fd, "w");
+	fseeko(fptr->f2, ftello(orig->f2), SEEK_SET);
+    }
     if (fptr->mode & FMODE_BINMODE) {
 	rb_io_binmode(dest);
     }
 
-    write_io = GetWriteIO(io);
-    if (io != write_io) {
-        write_io = rb_obj_dup(write_io);
-        fptr->tied_io_for_writing = write_io;
-        rb_ivar_set(dest, rb_intern("@tied_io_for_writing"), write_io);
-    }
-
     return dest;
 }
 
 /*
  *  call-seq:
  *     ios.printf(format_string [, obj, ...] )   => nil
- *
+ *  
  *  Formats and writes to <em>ios</em>, converting parameters under
  *  control of the format string. See <code>Kernel#sprintf</code>
  *  for details.
  */
 
 VALUE
-rb_io_printf(int argc, VALUE *argv, VALUE out)
+rb_io_printf(argc, argv, out)
+    int argc;
+    VALUE argv[];
+    VALUE out;
 {
     rb_io_write(out, rb_f_sprintf(argc, argv));
     return Qnil;
@@ -4641,7 +3890,7 @@ rb_io_printf(int argc, VALUE *argv, VALUE out)
  *  call-seq:
  *     printf(io, string [, obj ... ] )    => nil
  *     printf(string [, obj ... ] )        => nil
- *
+ *  
  *  Equivalent to:
  *     io.write(sprintf(string, obj, ...)
  *  or
@@ -4649,7 +3898,9 @@ rb_io_printf(int argc, VALUE *argv, VALUE out)
  */
 
 static VALUE
-rb_f_printf(int argc, VALUE *argv)
+rb_f_printf(argc, argv)
+    int argc;
+    VALUE argv[];
 {
     VALUE out;
 
@@ -4671,7 +3922,7 @@ rb_f_printf(int argc, VALUE *argv)
  *  call-seq:
  *     ios.print()             => nil
  *     ios.print(obj, ...)     => nil
- *
+ *  
  *  Writes the given object(s) to <em>ios</em>. The stream must be
  *  opened for writing. If the output record separator (<code>$\\</code>)
  *  is not <code>nil</code>, it will be appended to the output. If no
@@ -4679,16 +3930,19 @@ rb_f_printf(int argc, VALUE *argv)
  *  strings will be converted by calling their <code>to_s</code> method.
  *  With no argument, prints the contents of the variable <code>$_</code>.
  *  Returns <code>nil</code>.
- *
+ *     
  *     $stdout.print("This is ", 100, " percent.\n")
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     This is 100 percent.
  */
 
 VALUE
-rb_io_print(int argc, VALUE *argv, VALUE out)
+rb_io_print(argc, argv, out)
+    int argc;
+    VALUE *argv;
+    VALUE out;
 {
     int i;
     VALUE line;
@@ -4700,12 +3954,19 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
 	argv = &line;
     }
     for (i=0; i<argc; i++) {
-	rb_io_write(out, argv[i]);
-	if (!NIL_P(rb_output_fs)) {
+	if (!NIL_P(rb_output_fs) && i>0) {
 	    rb_io_write(out, rb_output_fs);
 	}
+	switch (TYPE(argv[i])) {
+	  case T_NIL:
+	    rb_io_write(out, rb_str_new2("nil"));
+	    break;
+	  default:
+	    rb_io_write(out, argv[i]);
+	    break;
+	}
     }
-    if (argc > 0 && !NIL_P(rb_output_rs)) {
+    if (!NIL_P(rb_output_rs)) {
 	rb_io_write(out, rb_output_rs);
     }
 
@@ -4715,7 +3976,7 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
 /*
  *  call-seq:
  *     print(obj, ...)    => nil
- *
+ *  
  *  Prints each object in turn to <code>$stdout</code>. If the output
  *  field separator (<code>$,</code>) is not +nil+, its
  *  contents will appear between each field. If the output record
@@ -4723,20 +3984,22 @@ rb_io_print(int argc, VALUE *argv, VALUE out)
  *  appended to the output. If no arguments are given, prints
  *  <code>$_</code>. Objects that aren't strings will be converted by
  *  calling their <code>to_s</code> method.
- *
+ *     
  *     print "cat", [1,2,3], 99, "\n"
  *     $, = ", "
  *     $\ = "\n"
  *     print "cat", [1,2,3], 99
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     cat12399
  *     cat, 1, 2, 3, 99
  */
 
 static VALUE
-rb_f_print(int argc, VALUE *argv)
+rb_f_print(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     rb_io_print(argc, argv, rb_stdout);
     return Qnil;
@@ -4745,21 +4008,22 @@ rb_f_print(int argc, VALUE *argv)
 /*
  *  call-seq:
  *     ios.putc(obj)    => obj
- *
+ *  
  *  If <i>obj</i> is <code>Numeric</code>, write the character whose
  *  code is <i>obj</i>, otherwise write the first character of the
  *  string representation of  <i>obj</i> to <em>ios</em>.
- *
+ *     
  *     $stdout.putc "A"
  *     $stdout.putc 65
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     AA
  */
 
 static VALUE
-rb_io_putc(VALUE io, VALUE ch)
+rb_io_putc(io, ch)
+    VALUE io, ch;
 {
     char c = NUM2CHR(ch);
 
@@ -4770,34 +4034,31 @@ rb_io_putc(VALUE io, VALUE ch)
 /*
  *  call-seq:
  *     putc(int)   => int
- *
+ *  
  *  Equivalent to:
  *
  *    $stdout.putc(int)
  */
 
 static VALUE
-rb_f_putc(VALUE recv, VALUE ch)
+rb_f_putc(recv, ch)
+    VALUE recv, ch;
 {
-    if (recv == rb_stdout) {
-	return rb_io_putc(recv, ch);
-    }
-    return rb_funcall2(rb_stdout, rb_intern("putc"), 1, &ch);
+    return rb_io_putc(rb_stdout, ch);
 }
 
 static VALUE
-io_puts_ary(VALUE ary, VALUE out, int recur)
+io_puts_ary(ary, out)
+    VALUE ary, out;
 {
     VALUE tmp;
     long i;
 
-    if (recur) {
-	tmp = rb_str_new2("[...]");
-	rb_io_puts(1, &tmp, out);
-	return Qnil;
-    }
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	tmp = RARRAY_PTR(ary)[i];
+    for (i=0; i<RARRAY(ary)->len; i++) {
+	tmp = RARRAY(ary)->ptr[i];
+	if (rb_inspecting_p(tmp)) {
+	    tmp = rb_str_new2("[...]");
+	}
 	rb_io_puts(1, &tmp, out);
     }
     return Qnil;
@@ -4806,17 +4067,17 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
 /*
  *  call-seq:
  *     ios.puts(obj, ...)    => nil
- *
+ *  
  *  Writes the given objects to <em>ios</em> as with
  *  <code>IO#print</code>. Writes a record separator (typically a
  *  newline) after any that do not already end with a newline sequence.
  *  If called with an array argument, writes each element on a new line.
  *  If called without arguments, outputs a single record separator.
- *
+ *     
  *     $stdout.puts("this", "is", "a", "test")
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     this
  *     is
  *     a
@@ -4824,7 +4085,10 @@ io_puts_ary(VALUE ary, VALUE out, int recur)
  */
 
 VALUE
-rb_io_puts(int argc, VALUE *argv, VALUE out)
+rb_io_puts(argc, argv, out)
+    int argc;
+    VALUE *argv;
+    VALUE out;
 {
     int i;
     VALUE line;
@@ -4835,15 +4099,20 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
 	return Qnil;
     }
     for (i=0; i<argc; i++) {
-	line = rb_check_array_type(argv[i]);
-	if (!NIL_P(line)) {
-	    rb_exec_recursive(io_puts_ary, line, out);
-	    continue;
+	if (NIL_P(argv[i])) {
+	    line = rb_str_new2("nil");
+	}
+	else {
+	    line = rb_check_array_type(argv[i]);
+	    if (!NIL_P(line)) {
+		rb_protect_inspect(io_puts_ary, line, out);
+		continue;
+	    }
+	    line = rb_obj_as_string(argv[i]);
 	}
-	line = rb_obj_as_string(argv[i]);
 	rb_io_write(out, line);
-	if (RSTRING_LEN(line) == 0 ||
-            RSTRING_PTR(line)[RSTRING_LEN(line)-1] != '\n') {
+	if (RSTRING(line)->len == 0 ||
+            RSTRING(line)->ptr[RSTRING(line)->len-1] != '\n') {
 	    rb_io_write(out, rb_default_rs);
 	}
     }
@@ -4854,127 +4123,122 @@ rb_io_puts(int argc, VALUE *argv, VALUE out)
 /*
  *  call-seq:
  *     puts(obj, ...)    => nil
- *
- *  Equivalent to
+ *  
+ *  Equivalent to 
  *
  *      $stdout.puts(obj, ...)
  */
 
 static VALUE
-rb_f_puts(int argc, VALUE *argv, VALUE recv)
+rb_f_puts(argc, argv)
+    int argc;
+    VALUE *argv;
 {
-    if (recv == rb_stdout) {
-	return rb_io_puts(argc, argv, recv);
-    }
-    return rb_funcall2(rb_stdout, rb_intern("puts"), argc, argv);
+    rb_io_puts(argc, argv, rb_stdout);
+    return Qnil;
 }
 
 void
-rb_p(VALUE obj) /* for debug print within C code */
+rb_p(obj)			/* for debug print within C code */
+    VALUE obj;
 {
-    VALUE str = rb_obj_as_string(rb_inspect(obj));
-    rb_str_buf_append(str, rb_default_rs);
-    rb_io_write(rb_stdout, str);
+    rb_io_write(rb_stdout, rb_obj_as_string(rb_inspect(obj)));
+    rb_io_write(rb_stdout, rb_default_rs);
 }
 
 /*
  *  call-seq:
- *     p(obj)              => obj
- *     p(obj1, obj2, ...)  => [obj, ...]
- *     p()                 => nil
- *
+ *     p(obj, ...)    => nil
+ *  
  *  For each object, directly writes
  *  _obj_.+inspect+ followed by the current output
  *  record separator to the program's standard output.
- *
+ *     
  *     S = Struct.new(:name, :state)
  *     s = S['dave', 'TX']
  *     p s
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     #<S name="dave", state="TX">
  */
 
 static VALUE
-rb_f_p(int argc, VALUE *argv, VALUE self)
+rb_f_p(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     int i;
-    VALUE ret = Qnil;
 
     for (i=0; i<argc; i++) {
 	rb_p(argv[i]);
     }
-    if (argc == 1) {
-	ret = argv[0];
-    }
-    else if (argc > 1) {
-	ret = rb_ary_new4(argc, argv);
-    }
     if (TYPE(rb_stdout) == T_FILE) {
 	rb_io_flush(rb_stdout);
     }
-    return ret;
+    return Qnil;
 }
 
 /*
  *  call-seq:
  *     obj.display(port=$>)    => nil
- *
+ *  
  *  Prints <i>obj</i> on the given port (default <code>$></code>).
  *  Equivalent to:
- *
+ *     
  *     def display(port=$>)
  *       port.write self
  *     end
- *
+ *     
  *  For example:
- *
+ *     
  *     1.display
  *     "cat".display
  *     [ 4, 5, 6 ].display
  *     puts
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     1cat456
  */
 
 static VALUE
-rb_obj_display(int argc, VALUE *argv, VALUE self)
+rb_obj_display(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     VALUE out;
 
-    if (argc == 0) {
+    if (rb_scan_args(argc, argv, "01", &out) == 0) {
 	out = rb_stdout;
     }
-    else {
-	rb_scan_args(argc, argv, "01", &out);
-    }
+
     rb_io_write(out, self);
 
     return Qnil;
 }
 
 void
-rb_write_error2(const char *mesg, long len)
+rb_write_error2(mesg, len)
+    const char *mesg;
+    long len;
 {
-    if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) {
-	fwrite(mesg, sizeof(char), len, stderr);
-    }
-    else {
-	rb_io_write(rb_stderr, rb_str_new(mesg, len));
-    }
+    rb_io_write(rb_stderr, rb_str_new(mesg, len));
 }
 
 void
-rb_write_error(const char *mesg)
+rb_write_error(mesg)
+    const char *mesg;
 {
     rb_write_error2(mesg, strlen(mesg));
 }
 
 static void
-must_respond_to(ID mid, VALUE val, ID id)
+must_respond_to(mid, val, id)
+    ID mid;
+    VALUE val;
+    ID id;
 {
     if (!rb_respond_to(val, mid)) {
 	rb_raise(rb_eTypeError, "%s must have %s method, %s given",
@@ -4984,93 +4248,100 @@ must_respond_to(ID mid, VALUE val, ID id)
 }
 
 static void
-stdout_setter(VALUE val, ID id, VALUE *variable)
+stdout_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
 {
     must_respond_to(id_write, val, id);
     *variable = val;
 }
 
+static void
+defout_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    stdout_setter(val, id, variable);
+    rb_warn("$defout is obsolete; use $stdout instead");
+}
+
+static void
+deferr_setter(val, id, variable)
+    VALUE val;
+    ID id;
+    VALUE *variable;
+{
+    stdout_setter(val, id, variable);
+    rb_warn("$deferr is obsolete; use $stderr instead");
+}
+
 static VALUE
-prep_io(int fd, int mode, VALUE klass, const char *path)
+prep_stdio(f, mode, klass)
+    FILE *f;
+    int mode;
+    VALUE klass;
 {
     rb_io_t *fp;
     VALUE io = io_alloc(klass);
 
     MakeOpenFile(io, fp);
-    fp->fd = fd;
 #ifdef __CYGWIN__
-    if (!isatty(fd)) {
+    if (!isatty(fileno(f))) {
 	mode |= O_BINARY;
-	setmode(fd, O_BINARY);
+	setmode(fileno(f), O_BINARY);
     }
 #endif
+    fp->f = f;
     fp->mode = mode;
-    io_check_tty(fp);
-    if (path) fp->path = strdup(path);
 
     return io;
 }
 
-VALUE
-rb_io_fdopen(int fd, int mode, const char *path)
-{
-    VALUE klass = rb_cIO;
-
-    if (path && strcmp(path, "-")) klass = rb_cFile;
-    return prep_io(fd, rb_io_modenum_flags(mode), klass, path);
-}
-
-static VALUE
-prep_stdio(FILE *f, int mode, VALUE klass, const char *path)
+static void
+prep_path(io, path)
+    VALUE io;
+    char *path;
 {
     rb_io_t *fptr;
-    VALUE io = prep_io(fileno(f), mode|FMODE_PREP, klass, path);
 
     GetOpenFile(io, fptr);
-    fptr->stdio_file = f;
-
-    return io;
-}
-
-FILE *
-rb_io_stdio_file(rb_io_t *fptr)
-{
-    if (!fptr->stdio_file) {
-        fptr->stdio_file = rb_fdopen(fptr->fd, rb_io_flags_mode(fptr->mode));
-    }
-    return fptr->stdio_file;
+    if (fptr->path) rb_bug("illegal prep_path() call");
+    fptr->path = strdup(path);
 }
 
 /*
  *  call-seq:
  *     IO.new(fd, mode)   => io
- *
+ *  
  *  Returns a new <code>IO</code> object (a stream) for the given
- *  <code>IO</code> object or integer file descriptor and mode
- *  string. See also <code>IO#fileno</code> and
- *  <code>IO::for_fd</code>.
- *
- *     puts IO.new($stdout).fileno # => 1
- *
+ *  integer file descriptor and mode string. See also
+ *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
+ *     
  *     a = IO.new(2,"w")      # '2' is standard error
  *     $stderr.puts "Hello"
  *     a.puts "World"
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Hello
  *     World
  */
 
 static VALUE
-rb_io_initialize(int argc, VALUE *argv, VALUE io)
+rb_io_initialize(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE fnum, mode, orig;
-    rb_io_t *fp, *ofp = NULL;
-    int fd, fmode, flags = O_RDONLY;
+    VALUE fnum, mode;
+    rb_io_t *fp;
+    int fd, flags;
 
     rb_secure(4);
     rb_scan_args(argc, argv, "11", &fnum, &mode);
+    fd = NUM2INT(fnum);
     if (argc == 2) {
 	if (FIXNUM_P(mode)) {
 	    flags = FIX2LONG(mode);
@@ -5080,54 +4351,26 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
 	    flags = rb_io_mode_modenum(StringValueCStr(mode));
 	}
     }
-    orig = rb_io_check_io(fnum);
-    if (NIL_P(orig)) {
-	fd = NUM2INT(fnum);
-        UPDATE_MAXFD(fd);
-	if (argc != 2) {
+    else {
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
-	    flags = fcntl(fd, F_GETFL);
-	    if (flags == -1) rb_sys_fail(0);
+	flags = fcntl(fd, F_GETFL);
+	if (flags == -1) rb_sys_fail(0);
+#else
+	flags = O_RDONLY;
 #endif
-	}
-	MakeOpenFile(io, fp);
-        fp->fd = fd;
-	fp->mode = rb_io_modenum_flags(flags);
-        io_check_tty(fp);
-    }
-    else if (RFILE(io)->fptr) {
-	rb_raise(rb_eRuntimeError, "reinitializing IO");
-    }
-    else {
-	GetOpenFile(orig, ofp);
-	if (ofp->refcnt == LONG_MAX) {
-	    VALUE s = rb_inspect(orig);
-	    rb_raise(rb_eIOError, "too many shared IO for %s", StringValueCStr(s));
-	}
-	if (argc == 2) {
-	    fmode = rb_io_modenum_flags(flags);
-	    if ((ofp->mode ^ fmode) & (FMODE_READWRITE|FMODE_BINMODE)) {
-		if (FIXNUM_P(mode)) {
-		    rb_raise(rb_eArgError, "incompatible mode 0%o", flags);
-		}
-		else {
-		    rb_raise(rb_eArgError, "incompatible mode \"%s\"", RSTRING_PTR(mode));
-		}
-	    }
-	}
-	ofp->refcnt++;
-	RFILE(io)->fptr = ofp;
     }
+    MakeOpenFile(io, fp);
+    fp->mode = rb_io_modenum_flags(flags);
+    fp->f = rb_fdopen(fd, rb_io_modenum_mode(flags));
 
     return io;
 }
 
-
 /*
  *  call-seq:
  *     File.new(filename, mode="r")            => file
  *     File.new(filename [, mode [, perm]])    => file
- *
+ *  
 
  *  Opens the file named by _filename_ according to
  *  _mode_ (default is ``r'') and returns a new
@@ -5145,7 +4388,10 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_file_initialize(int argc, VALUE *argv, VALUE io)
+rb_file_initialize(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     if (RFILE(io)->fptr) {
 	rb_raise(rb_eRuntimeError, "reinitializing File");
@@ -5166,23 +4412,26 @@ rb_file_initialize(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     IO.new(fd, mode_string)   => io
- *
+ *  
  *  Returns a new <code>IO</code> object (a stream) for the given
  *  integer file descriptor and mode string. See also
  *  <code>IO#fileno</code> and <code>IO::for_fd</code>.
- *
+ *     
  *     a = IO.new(2,"w")      # '2' is standard error
  *     $stderr.puts "Hello"
  *     a.puts "World"
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Hello
  *     World
  */
 
 static VALUE
-rb_io_s_new(int argc, VALUE *argv, VALUE klass)
+rb_io_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     if (rb_block_given_p()) {
 	const char *cname = rb_class2name(klass);
@@ -5193,135 +4442,56 @@ rb_io_s_new(int argc, VALUE *argv, VALUE klass)
     return rb_class_new_instance(argc, argv, klass);
 }
 
-
 /*
  *  call-seq:
  *     IO.for_fd(fd, mode)    => io
- *
+ *  
  *  Synonym for <code>IO::new</code>.
- *
+ *     
  */
 
 static VALUE
-rb_io_s_for_fd(int argc, VALUE *argv, VALUE klass)
+rb_io_s_for_fd(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
     VALUE io = rb_obj_alloc(klass);
     rb_io_initialize(argc, argv, io);
     return io;
 }
 
-static void
-argf_mark(void *ptr)
-{
-    struct argf *p = ptr;
-    rb_gc_mark(p->filename);
-    rb_gc_mark(p->current_file);
-    rb_gc_mark(p->lineno);
-    rb_gc_mark(p->argv);
-}
-
-static void
-argf_free(void *ptr)
-{
-    struct argf *p = ptr;
-    free(p->inplace);
-}
-
-static inline void
-argf_init(struct argf *p, VALUE v)
-{
-    p->filename = Qnil;
-    p->current_file = Qnil;
-    p->lineno = Qnil;
-    p->argv = v;
-}
-
-static VALUE
-argf_alloc(VALUE klass)
-{
-    struct argf *p;
-    VALUE argf = Data_Make_Struct(klass, struct argf, argf_mark, argf_free, p);
-
-    argf_init(p, Qnil);
-    return argf;
-}
-
-#undef rb_argv
-#define filename          ARGF.filename
-#define current_file      ARGF.current_file
-#define gets_lineno       ARGF.gets_lineno
-#define init_p            ARGF.init_p
-#define next_p            ARGF.next_p
-#define lineno            ARGF.lineno
-#define ruby_inplace_mode ARGF.inplace
-#define argf_binmode      ARGF.binmode
-#define argf_enc          ARGF.enc
-#define argf_enc2         ARGF.enc2
-#define rb_argv           ARGF.argv
-
-static VALUE
-argf_initialize(VALUE argf, VALUE argv)
-{
-    memset(&ARGF, 0, sizeof(ARGF));
-    argf_init(&ARGF, argv);
-
-    return argf;
-}
-
-static VALUE
-argf_initialize_copy(VALUE argf, VALUE orig)
-{
-    ARGF = argf_of(orig);
-    rb_argv = rb_obj_dup(rb_argv);
-    if (ARGF.inplace) {
-	const char *inplace = ARGF.inplace;
-	ARGF.inplace = 0;
-	ARGF.inplace = ruby_strdup(inplace);
-    }
-    return argf;
-}
-
-static VALUE
-argf_set_lineno(VALUE argf, VALUE val)
-{
-    gets_lineno = NUM2INT(val);
-    lineno = INT2FIX(gets_lineno);
-    return Qnil;
-}
+static int binmode = 0;
 
 static VALUE
-argf_lineno(VALUE argf)
+argf_forward(int argc, VALUE *argv)
 {
-    return lineno;
+    return rb_funcall3(current_file, ruby_frame->last_func, argc, argv);
 }
 
-static VALUE
-argf_forward(int argc, VALUE *argv, VALUE argf)
-{
-    return rb_funcall3(current_file, rb_frame_this_func(), argc, argv);
-}
-
-#define next_argv() argf_next_argv(argf)
-#define ARGF_GENERIC_INPUT_P() \
-    (current_file == rb_stdin && TYPE(current_file) != T_FILE)
 #define ARGF_FORWARD(argc, argv) do {\
-    if (ARGF_GENERIC_INPUT_P())\
-	return argf_forward(argc, argv, argf);\
+  if (TYPE(current_file) != T_FILE)\
+     return argf_forward(argc, argv);\
 } while (0)
 #define NEXT_ARGF_FORWARD(argc, argv) do {\
-    if (!next_argv()) return Qnil;\
-    ARGF_FORWARD(argc, argv);\
+     if (!next_argv()) return Qnil;\
+     ARGF_FORWARD(argc, argv);\
 } while (0)
 
 static void
-argf_close(VALUE file)
+argf_close(file)
+    VALUE file;
 {
-    rb_funcall3(file, rb_intern("close"), 0, 0);
+    if (TYPE(file) == T_FILE)
+	rb_io_close(file);
+    else
+	rb_funcall3(file, rb_intern("close"), 0, 0);
 }
 
 static int
-argf_next_argv(VALUE argf)
+next_argv()
 {
+    extern VALUE rb_argv;
     char *fn;
     rb_io_t *fptr;
     int stdout_binmode = 0;
@@ -5333,7 +4503,7 @@ argf_next_argv(VALUE argf)
     }
 
     if (init_p == 0) {
-	if (!NIL_P(rb_argv) && RARRAY_LEN(rb_argv) > 0) {
+	if (RARRAY(rb_argv)->len > 0) {
 	    next_p = 1;
 	}
 	else {
@@ -5346,7 +4516,7 @@ argf_next_argv(VALUE argf)
     if (next_p == 1) {
 	next_p = 0;
       retry:
-	if (RARRAY_LEN(rb_argv) > 0) {
+	if (RARRAY(rb_argv)->len > 0) {
 	    filename = rb_ary_shift(rb_argv);
 	    fn = StringValueCStr(filename);
 	    if (strlen(fn) == 1 && fn[0] == '-') {
@@ -5357,7 +4527,7 @@ argf_next_argv(VALUE argf)
 		}
 	    }
 	    else {
-		int fr = rb_sysopen(fn, O_RDONLY, 0);
+		FILE *fr = rb_fopen(fn, "r");
 
 		if (ruby_inplace_mode) {
 		    struct stat st;
@@ -5365,12 +4535,12 @@ argf_next_argv(VALUE argf)
 		    struct stat st2;
 #endif
 		    VALUE str;
-		    int fw;
+		    FILE *fw;
 
 		    if (TYPE(rb_stdout) == T_FILE && rb_stdout != orig_stdout) {
 			rb_io_close(rb_stdout);
 		    }
-		    fstat(fr, &st);
+		    fstat(fileno(fr), &st);
 		    if (*ruby_inplace_mode) {
 			str = rb_str_new2(fn);
 #ifdef NO_LONG_FNAME
@@ -5379,15 +4549,15 @@ argf_next_argv(VALUE argf)
 			rb_str_cat2(str, ruby_inplace_mode);
 #endif
 #ifdef NO_SAFE_RENAME
-			(void)close(fr);
-			(void)unlink(RSTRING_PTR(str));
-			(void)rename(fn, RSTRING_PTR(str));
-			fr = rb_sysopen(RSTRING_PTR(str), O_RDONLY, 0);
+			(void)fclose(fr);
+			(void)unlink(RSTRING(str)->ptr);
+			(void)rename(fn, RSTRING(str)->ptr);
+			fr = rb_fopen(RSTRING(str)->ptr, "r");
 #else
-			if (rename(fn, RSTRING_PTR(str)) < 0) {
+			if (rename(fn, RSTRING(str)->ptr) < 0) {
 			    rb_warn("Can't rename %s to %s: %s, skipping file",
-				    fn, RSTRING_PTR(str), strerror(errno));
-			    close(fr);
+				    fn, RSTRING(str)->ptr, strerror(errno));
+			    fclose(fr);
 			    goto retry;
 			}
 #endif
@@ -5399,36 +4569,31 @@ argf_next_argv(VALUE argf)
 			if (unlink(fn) < 0) {
 			    rb_warn("Can't remove %s: %s, skipping file",
 				    fn, strerror(errno));
-			    close(fr);
+			    fclose(fr);
 			    goto retry;
 			}
 #endif
 		    }
-		    fw = rb_sysopen(fn, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+		    fw = rb_fopen(fn, "w");
 #ifndef NO_SAFE_RENAME
-		    fstat(fw, &st2);
+		    fstat(fileno(fw), &st2);
 #ifdef HAVE_FCHMOD
-		    fchmod(fw, st.st_mode);
+		    fchmod(fileno(fw), st.st_mode);
 #else
 		    chmod(fn, st.st_mode);
 #endif
 		    if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) {
-			fchown(fw, st.st_uid, st.st_gid);
+			fchown(fileno(fw), st.st_uid, st.st_gid);
 		    }
 #endif
-		    rb_stdout = prep_io(fw, FMODE_WRITABLE, rb_cFile, fn);
+		    rb_stdout = prep_stdio(fw, FMODE_WRITABLE, rb_cFile);
+		    prep_path(rb_stdout, fn);
 		    if (stdout_binmode) rb_io_binmode(rb_stdout);
 		}
-		current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn);
-	    }
-	    if (argf_binmode) rb_io_binmode(current_file);
-	    if (argf_enc) {
-		rb_io_t *fptr;
-
-		GetOpenFile(current_file, fptr);
-		fptr->enc = argf_enc;
-		fptr->enc2 = argf_enc2;
+		current_file = prep_stdio(fr, FMODE_READABLE, rb_cFile);
+		prep_path(current_file, fn);
 	    }
+	    if (binmode) rb_io_binmode(current_file);
 	}
 	else {
 	    next_p = 1;
@@ -5447,27 +4612,33 @@ argf_next_argv(VALUE argf)
 }
 
 static VALUE
-argf_getline(int argc, VALUE *argv, VALUE argf)
+argf_getline(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE line;
 
   retry:
     if (!next_argv()) return Qnil;
-    if (ARGF_GENERIC_INPUT_P()) {
-	line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
+    if (argc == 0 && rb_rs == rb_default_rs) {
+	line = rb_io_gets(current_file);
     }
     else {
-	if (argc == 0 && rb_rs == rb_default_rs) {
-	    line = rb_io_gets(current_file);
+	VALUE rs;
+
+	if (argc == 0) {
+	    rs = rb_rs;
 	}
 	else {
-	    line = rb_io_getline(argc, argv, current_file);
-	}
-	if (NIL_P(line) && next_p != -1) {
-	    argf_close(current_file);
-	    next_p = 1;
-	    goto retry;
+	    rb_scan_args(argc, argv, "1", &rs);
+	    if (!NIL_P(rs)) StringValue(rs);
 	}
+	line = rb_io_getline(rs, current_file);
+    }
+    if (NIL_P(line) && next_p != -1) {
+	argf_close(current_file);
+	next_p = 1;
+	goto retry;
     }
     if (!NIL_P(line)) {
 	gets_lineno++;
@@ -5476,90 +4647,67 @@ argf_getline(int argc, VALUE *argv, VALUE argf)
     return line;
 }
 
-static VALUE
-argf_lineno_getter(ID id, VALUE *var)
-{
-    VALUE argf = *var;
-    return lineno;
-}
-
-static void
-argf_lineno_setter(VALUE val, ID id, VALUE *var)
-{
-    VALUE argf = *var;
-    int n = NUM2INT(val);
-    gets_lineno = n;
-    lineno = INT2FIX(n);
-}
-
-static VALUE argf_gets(int, VALUE *, VALUE);
-
 /*
  *  call-seq:
- *     gets(sep=$/)    => string or nil
- *     gets(limit)     => string or nil
- *     gets(sep,limit) => string or nil
- *
+ *     gets(separator=$/)    => string or nil
+ *  
  *  Returns (and assigns to <code>$_</code>) the next line from the list
- *  of files in +ARGV+ (or <code>$*</code>), or from standard input if
- *  no files are present on the command line. Returns +nil+ at end of
- *  file. The optional argument specifies the record separator. The
- *  separator is included with the contents of each record. A separator
- *  of +nil+ reads the entire contents, and a zero-length separator
- *  reads the input one paragraph at a time, where paragraphs are
- *  divided by two consecutive newlines.  If the first argument is an
- *  integer, or optional second argument is given, the returning string
- *  would not be longer than the given value.  If multiple filenames are
- *  present in +ARGV+, +gets(nil)+ will read the contents one file at a
- *  time.
- *
+ *  of files in +ARGV+ (or <code>$*</code>), or from standard
+ *  input if no files are present on the command line. Returns
+ *  +nil+ at end of file. The optional argument specifies the
+ *  record separator. The separator is included with the contents of
+ *  each record. A separator of +nil+ reads the entire
+ *  contents, and a zero-length separator reads the input one paragraph
+ *  at a time, where paragraphs are divided by two consecutive newlines.
+ *  If multiple filenames are present in +ARGV+,
+ *  +gets(nil)+ will read the contents one file at a time.
+ *     
  *     ARGV << "testfile"
  *     print while gets
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     This is line one
  *     This is line two
  *     This is line three
  *     And so on...
- *
+ *     
  *  The style of programming using <code>$_</code> as an implicit
  *  parameter is gradually losing favor in the Ruby community.
  */
 
 static VALUE
-rb_f_gets(int argc, VALUE *argv, VALUE recv)
-{
-    if (recv == argf) {
-	return argf_gets(argc, argv, argf);
-    }
-    return rb_funcall2(argf, rb_intern("gets"), argc, argv);
-}
-
-static VALUE
-argf_gets(int argc, VALUE *argv, VALUE argf)
+rb_f_gets(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE line;
 
-    line = argf_getline(argc, argv, argf);
+    if (!next_argv()) return Qnil;
+    if (TYPE(current_file) != T_FILE) {
+	line = rb_funcall3(current_file, rb_intern("gets"), argc, argv);
+    }
+    else {
+	line = argf_getline(argc, argv);
+    }
     rb_lastline_set(line);
     return line;
 }
 
 VALUE
-rb_gets(void)
+rb_gets()
 {
     VALUE line;
 
     if (rb_rs != rb_default_rs) {
-	return rb_f_gets(0, 0, argf);
+	return rb_f_gets(0, 0);
     }
 
   retry:
     if (!next_argv()) return Qnil;
     line = rb_io_gets(current_file);
     if (NIL_P(line) && next_p != -1) {
-	rb_io_close(current_file);
+	argf_close(current_file);
 	next_p = 1;
 	goto retry;
     }
@@ -5572,35 +4720,24 @@ rb_gets(void)
     return line;
 }
 
-static VALUE argf_readline(int, VALUE *, VALUE);
-
 /*
  *  call-seq:
- *     readline(sep=$/)     => string
- *     readline(limit)      => string
- *     readline(sep, limit) => string
- *
+ *     readline(separator=$/)   => string
+ *  
  *  Equivalent to <code>Kernel::gets</code>, except
  *  +readline+ raises +EOFError+ at end of file.
  */
 
 static VALUE
-rb_f_readline(int argc, VALUE *argv, VALUE recv)
-{
-    if (recv == argf) {
-	return argf_readline(argc, argv, argf);
-    }
-    return rb_funcall2(argf, rb_intern("readline"), argc, argv);
-}
-
-static VALUE
-argf_readline(int argc, VALUE *argv, VALUE argf)
+rb_f_readline(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE line;
 
     if (!next_argv()) rb_eof_error();
     ARGF_FORWARD(argc, argv);
-    line = argf_gets(argc, argv, argf);
+    line = rb_f_gets(argc, argv);
     if (NIL_P(line)) {
 	rb_eof_error();
     }
@@ -5608,34 +4745,38 @@ argf_readline(int argc, VALUE *argv, VALUE argf)
     return line;
 }
 
-static VALUE argf_readlines(int, VALUE *, VALUE);
-
 /*
- *  call-seq:
- *     readlines(sep=$/)    => array
- *     readlines(limit)     => array
- *     readlines(sep,limit) => array
- *
- *  Returns an array containing the lines returned by calling
- *  <code>Kernel.gets(<i>sep</i>)</code> until the end of file.
+ * obsolete
  */
 
 static VALUE
-rb_f_readlines(int argc, VALUE *argv, VALUE recv)
+rb_f_getc()
 {
-    if (recv == argf) {
-	return argf_readlines(argc, argv, argf);
+    rb_warn("getc is obsolete; use STDIN.getc instead");
+    if (TYPE(rb_stdin) != T_FILE) {
+	return rb_funcall3(rb_stdin, rb_intern("getc"), 0, 0);
     }
-    return rb_funcall2(argf, rb_intern("readlines"), argc, argv);
+    return rb_io_getc(rb_stdin);
 }
 
+/*
+ *  call-seq:
+ *     readlines(separator=$/)    => array
+ *  
+ *  Returns an array containing the lines returned by calling
+ *  <code>Kernel.gets(<i>separator</i>)</code> until the end of file.
+ */
+
 static VALUE
-argf_readlines(int argc, VALUE *argv, VALUE argf)
+rb_f_readlines(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE line, ary;
 
+    NEXT_ARGF_FORWARD(argc, argv);
     ary = rb_ary_new();
-    while (!NIL_P(line = argf_getline(argc, argv, argf))) {
+    while (!NIL_P(line = argf_getline(argc, argv))) {
 	rb_ary_push(ary, line);
     }
 
@@ -5645,11 +4786,11 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
 /*
  *  call-seq:
  *     `cmd`    => string
- *
+ *  
  *  Returns the standard output of running _cmd_ in a subshell.
  *  The built-in syntax <code>%x{...}</code> uses
  *  this method. Sets <code>$?</code> to the process status.
- *
+ *     
  *     `date`                   #=> "Wed Apr  9 08:56:30 CDT 2003\n"
  *     `ls testdir`.split[1]    #=> "main.rb"
  *     `echo oops && exit 99`   #=> "oops\n"
@@ -5657,14 +4798,15 @@ argf_readlines(int argc, VALUE *argv, VALUE argf)
  */
 
 static VALUE
-rb_f_backquote(VALUE obj, VALUE str)
+rb_f_backquote(obj, str)
+    VALUE obj, str;
 {
     volatile VALUE port;
     VALUE result;
     rb_io_t *fptr;
 
     SafeStringValue(str);
-    port = pipe_open_s(str, "r");
+    port = pipe_open(str, 0, "r");
     if (NIL_P(port)) return rb_str_new(0,0);
 
     GetOpenFile(port, fptr);
@@ -5678,66 +4820,93 @@ rb_f_backquote(VALUE obj, VALUE str)
 #include <sys/select.h>
 #endif
 
+/*
+ *  call-seq:
+ *     IO.select(read_array 
+ *               [, write_array 
+ *               [, error_array 
+ *               [, timeout]]] ) =>  array  or  nil
+ *  
+ *  See <code>Kernel#select</code>.
+ */
+
 static VALUE
-select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fdset_t *fds)
+rb_f_select(argc, argv, obj)
+    int argc;
+    VALUE *argv;
+    VALUE obj;
 {
-    VALUE res, list;
+    VALUE read, write, except, timeout, res, list;
+    fd_set rset, wset, eset, pset;
     fd_set *rp, *wp, *ep;
+    struct timeval *tp, timerec;
     rb_io_t *fptr;
     long i;
     int max = 0, n;
     int interrupt_flag = 0;
     int pending = 0;
-    struct timeval timerec;
 
+    rb_scan_args(argc, argv, "13", &read, &write, &except, &timeout);
+    if (NIL_P(timeout)) {
+	tp = 0;
+    }
+    else {
+	timerec = rb_time_interval(timeout);
+	tp = &timerec;
+    }
+
+    FD_ZERO(&pset);
     if (!NIL_P(read)) {
 	Check_Type(read, T_ARRAY);
-	for (i=0; i<RARRAY_LEN(read); i++) {
-	    GetOpenFile(rb_io_get_io(RARRAY_PTR(read)[i]), fptr);
-	    rb_fd_set(fptr->fd, &fds[0]);
-	    if (READ_DATA_PENDING(fptr)) { /* check for buffered data */
+	rp = &rset;
+	FD_ZERO(rp);
+	for (i=0; i<RARRAY(read)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), rp);
+	    if (READ_DATA_PENDING(fptr->f)) { /* check for buffered data */
 		pending++;
-		rb_fd_set(fptr->fd, &fds[3]);
+		FD_SET(fileno(fptr->f), &pset);
 	    }
-	    if (max < fptr->fd) max = fptr->fd;
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
 	}
 	if (pending) {		/* no blocking if there's buffered data */
 	    timerec.tv_sec = timerec.tv_usec = 0;
 	    tp = &timerec;
 	}
-	rp = rb_fd_ptr(&fds[0]);
     }
     else
 	rp = 0;
 
     if (!NIL_P(write)) {
 	Check_Type(write, T_ARRAY);
-	for (i=0; i<RARRAY_LEN(write); i++) {
-            VALUE write_io = GetWriteIO(rb_io_get_io(RARRAY_PTR(write)[i]));
-	    GetOpenFile(write_io, fptr);
-	    rb_fd_set(fptr->fd, &fds[1]);
-	    if (max < fptr->fd) max = fptr->fd;
+	wp = &wset;
+	FD_ZERO(wp);
+	for (i=0; i<RARRAY(write)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), wp);
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	    if (fptr->f2) {
+		FD_SET(fileno(fptr->f2), wp);
+		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+	    }
 	}
-	wp = rb_fd_ptr(&fds[1]);
     }
     else
 	wp = 0;
 
     if (!NIL_P(except)) {
 	Check_Type(except, T_ARRAY);
-	for (i=0; i<RARRAY_LEN(except); i++) {
-            VALUE io = rb_io_get_io(RARRAY_PTR(except)[i]);
-            VALUE write_io = GetWriteIO(io);
-	    GetOpenFile(io, fptr);
-	    rb_fd_set(fptr->fd, &fds[2]);
-	    if (max < fptr->fd) max = fptr->fd;
-            if (io != write_io) {
-                GetOpenFile(write_io, fptr);
-                rb_fd_set(fptr->fd, &fds[2]);
-                if (max < fptr->fd) max = fptr->fd;
-            }
+	ep = &eset;
+	FD_ZERO(ep);
+	for (i=0; i<RARRAY(except)->len; i++) {
+	    GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+	    FD_SET(fileno(fptr->f), ep);
+	    if (max < fileno(fptr->f)) max = fileno(fptr->f);
+	    if (fptr->f2) {
+		FD_SET(fileno(fptr->f2), ep);
+		if (max < fileno(fptr->f2)) max = fileno(fptr->f2);
+	    }
 	}
-	ep = rb_fd_ptr(&fds[2]);
     }
     else {
 	ep = 0;
@@ -5758,47 +4927,39 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
 
     if (interrupt_flag == 0) {
 	if (rp) {
-	    list = RARRAY_PTR(res)[0];
-	    for (i=0; i< RARRAY_LEN(read); i++) {
-                VALUE obj = rb_ary_entry(read, i);
-                VALUE io = rb_io_get_io(obj);
-		GetOpenFile(io, fptr);
-		if (rb_fd_isset(fptr->fd, &fds[0]) ||
-		    rb_fd_isset(fptr->fd, &fds[3])) {
-		    rb_ary_push(list, obj);
+	    list = RARRAY(res)->ptr[0];
+	    for (i=0; i< RARRAY(read)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(read)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), rp)
+		    || FD_ISSET(fileno(fptr->f), &pset)) {
+		    rb_ary_push(list, rb_ary_entry(read, i));
 		}
 	    }
 	}
 
 	if (wp) {
-	    list = RARRAY_PTR(res)[1];
-	    for (i=0; i< RARRAY_LEN(write); i++) {
-                VALUE obj = rb_ary_entry(write, i);
-                VALUE io = rb_io_get_io(obj);
-                VALUE write_io = GetWriteIO(io);
-		GetOpenFile(write_io, fptr);
-		if (rb_fd_isset(fptr->fd, &fds[1])) {
-		    rb_ary_push(list, obj);
+	    list = RARRAY(res)->ptr[1];
+	    for (i=0; i< RARRAY(write)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(write)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), wp)) {
+		    rb_ary_push(list, rb_ary_entry(write, i));
+		}
+		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), wp)) {
+		    rb_ary_push(list, rb_ary_entry(write, i));
 		}
 	    }
 	}
 
 	if (ep) {
-	    list = RARRAY_PTR(res)[2];
-	    for (i=0; i< RARRAY_LEN(except); i++) {
-                VALUE obj = rb_ary_entry(except, i);
-                VALUE io = rb_io_get_io(obj);
-                VALUE write_io = GetWriteIO(io);
-		GetOpenFile(io, fptr);
-		if (rb_fd_isset(fptr->fd, &fds[2])) {
-		    rb_ary_push(list, obj);
+	    list = RARRAY(res)->ptr[2];
+	    for (i=0; i< RARRAY(except)->len; i++) {
+		GetOpenFile(rb_io_get_io(RARRAY(except)->ptr[i]), fptr);
+		if (FD_ISSET(fileno(fptr->f), ep)) {
+		    rb_ary_push(list, rb_ary_entry(except, i));
+		}
+		else if (fptr->f2 && FD_ISSET(fileno(fptr->f2), ep)) {
+		    rb_ary_push(list, rb_ary_entry(except, i));
 		}
-                else if (io != write_io) {
-                    GetOpenFile(write_io, fptr);
-                    if (rb_fd_isset(fptr->fd, &fds[2])) {
-                        rb_ary_push(list, obj);
-                    }
-                }
 	    }
 	}
     }
@@ -5806,75 +4967,11 @@ select_internal(VALUE read, VALUE write, VALUE except, struct timeval *tp, rb_fd
     return res;			/* returns an empty array on interrupt */
 }
 
-struct select_args {
-    VALUE read, write, except;
-    struct timeval *timeout;
-    rb_fdset_t fdsets[4];
-};
-
-#ifdef HAVE_RB_FD_INIT
-static VALUE
-select_call(VALUE arg)
-{
-    struct select_args *p = (struct select_args *)arg;
-
-    return select_internal(p->read, p->write, p->except, p->timeout, p->fdsets);
-}
-
-static VALUE
-select_end(VALUE arg)
-{
-    struct select_args *p = (struct select_args *)arg;
-    int i;
-
-    for (i = 0; i < sizeof(p->fdsets) / sizeof(p->fdsets[0]); ++i)
-	rb_fd_term(&p->fdsets[i]);
-    return Qnil;
-}
-#endif
-
-/*
- *  call-seq:
- *     IO.select(read_array
- *               [, write_array
- *               [, error_array
- *               [, timeout]]] ) =>  array  or  nil
- *
- *  See <code>Kernel#select</code>.
- */
-
-static VALUE
-rb_f_select(int argc, VALUE *argv, VALUE obj)
-{
-    VALUE timeout;
-    struct select_args args;
-    struct timeval timerec;
-    int i;
-
-    rb_scan_args(argc, argv, "13", &args.read, &args.write, &args.except, &timeout);
-    if (NIL_P(timeout)) {
-	args.timeout = 0;
-    }
-    else {
-	timerec = rb_time_interval(timeout);
-	args.timeout = &timerec;
-    }
-
-    for (i = 0; i < sizeof(args.fdsets) / sizeof(args.fdsets[0]); ++i)
-	rb_fd_init(&args.fdsets[i]);
-
-#ifdef HAVE_RB_FD_INIT
-    return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args);
-#else
-    return select_internal(args.read, args.write, args.except,
-			   args.timeout, args.fdsets);
-#endif
-
-}
-
 #if !defined(MSDOS) && !defined(__human68k__)
 static int
-io_cntl(int fd, int cmd, long narg, int io_p)
+io_cntl(fd, cmd, narg, io_p)
+    int fd, cmd, io_p;
+    long narg;
 {
     int retval;
 
@@ -5899,7 +4996,9 @@ io_cntl(int fd, int cmd, long narg, int io_p)
 #endif
 
 static VALUE
-rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
+rb_io_ctl(io, req, arg, io_p)
+    VALUE io, req, arg;
+    int io_p;
 {
 #if !defined(MSDOS) && !defined(__human68k__)
     int cmd = NUM2ULONG(req);
@@ -5939,23 +5038,28 @@ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
 #endif
 	    rb_str_modify(arg);
 
-	    if (len <= RSTRING_LEN(arg)) {
-		len = RSTRING_LEN(arg);
+	    if (len <= RSTRING(arg)->len) {
+		len = RSTRING(arg)->len;
 	    }
-	    if (RSTRING_LEN(arg) < len) {
+	    if (RSTRING(arg)->len < len) {
 		rb_str_resize(arg, len+1);
 	    }
-	    RSTRING_PTR(arg)[len] = 17;	/* a little sanity check here */
-	    narg = (long)RSTRING_PTR(arg);
+	    RSTRING(arg)->ptr[len] = 17;	/* a little sanity check here */
+	    narg = (long)RSTRING(arg)->ptr;
 	}
     }
     GetOpenFile(io, fptr);
-    retval = io_cntl(fptr->fd, cmd, narg, io_p);
+    retval = io_cntl(fileno(fptr->f), cmd, narg, io_p);
     if (retval < 0) rb_sys_fail(fptr->path);
-    if (TYPE(arg) == T_STRING && RSTRING_PTR(arg)[len] != 17) {
+    if (TYPE(arg) == T_STRING && RSTRING(arg)->ptr[len] != 17) {
 	rb_raise(rb_eArgError, "return value overflowed string");
     }
 
+    if (fptr->f2 && fileno(fptr->f) != fileno(fptr->f2)) {
+	/* call on f2 too; ignore result */
+	io_cntl(fileno(fptr->f2), cmd, narg, io_p);
+    }
+
     if (!io_p && cmd == F_SETFL) {
       if (narg & O_NONBLOCK) {
         fptr->mode |= FMODE_WSPLIT_INITIALIZED;
@@ -5973,11 +5077,10 @@ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
 #endif
 }
 
-
 /*
  *  call-seq:
  *     ios.ioctl(integer_cmd, arg)    => integer
- *
+ *  
  *  Provides a mechanism for issuing low-level commands to control or
  *  query I/O devices. Arguments and results are platform dependent. If
  *  <i>arg</i> is a number, its value is passed directly. If it is a
@@ -5987,7 +5090,10 @@ rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
  */
 
 static VALUE
-rb_io_ioctl(int argc, VALUE *argv, VALUE io)
+rb_io_ioctl(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
     VALUE req, arg;
 
@@ -5998,7 +5104,7 @@ rb_io_ioctl(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     ios.fcntl(integer_cmd, arg)    => integer
- *
+ *  
  *  Provides a mechanism for issuing low-level commands to control or
  *  query file-oriented I/O streams. Arguments and results are platform
  *  dependent. If <i>arg</i> is a number, its value is passed
@@ -6009,7 +5115,10 @@ rb_io_ioctl(int argc, VALUE *argv, VALUE io)
  */
 
 static VALUE
-rb_io_fcntl(int argc, VALUE *argv, VALUE io)
+rb_io_fcntl(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
 #ifdef HAVE_FCNTL
     VALUE req, arg;
@@ -6025,7 +5134,7 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
 /*
  *  call-seq:
  *     syscall(fixnum [, args...])   => integer
- *
+ *  
  *  Calls the operating system function identified by _fixnum_,
  *  passing in the arguments, which must be either +String+
  *  objects, or +Integer+ objects that ultimately fit within
@@ -6033,16 +5142,18 @@ rb_io_fcntl(int argc, VALUE *argv, VALUE io)
  *  on the Atari-ST). The function identified by _fixnum_ is system
  *  dependent. On some Unix systems, the numbers may be obtained from a
  *  header file called <code>syscall.h</code>.
- *
+ *     
  *     syscall 4, 1, "hello\n", 6   # '4' is write(2) on our box
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     hello
  */
 
 static VALUE
-rb_f_syscall(int argc, VALUE *argv)
+rb_f_syscall(argc, argv)
+    int argc;
+    VALUE *argv;
 {
 #if defined(HAVE_SYSCALL) && !defined(__CHECKER__)
 #ifdef atarist
@@ -6142,67 +5253,32 @@ rb_f_syscall(int argc, VALUE *argv)
 #endif
 }
 
+static VALUE io_new_instance _((VALUE));
 static VALUE
-io_new_instance(VALUE args)
+io_new_instance(args)
+    VALUE args;
 {
     return rb_class_new_instance(2, (VALUE*)args+1, *(VALUE*)args);
 }
 
-static void
-io_encoding_set(rb_io_t *fptr, int argc, VALUE v1, VALUE v2)
-{
-    if (NIL_P(v2)) argc = 1;
-    if (argc == 2) {
-	fptr->enc2 = rb_to_encoding(v1);
-	fptr->enc = rb_to_encoding(v2);
-    }
-    else if (argc == 1) {
-	if (NIL_P(v1)) {
-	    fptr->enc = 0;
-	}
-	else {
-	    VALUE tmp = rb_check_string_type(v1);
-	    if (!NIL_P(tmp)) {
-		mode_enc(fptr, StringValueCStr(tmp));
-	    }
-	    else {
-		fptr->enc = rb_to_encoding(v1);
-	    }
-	}
-    }
-}
-
 /*
  *  call-seq:
- *     IO.pipe                    -> [read_io, write_io]
- *     IO.pipe(ext_enc)           -> [read_io, write_io]
- *     IO.pipe("ext_enc:int_enc") -> [read_io, write_io]
- *     IO.pipe(ext_enc, int_enc)  -> [read_io, write_io]
- *
+ *     IO.pipe -> array
+ *  
  *  Creates a pair of pipe endpoints (connected to each other) and
  *  returns them as a two-element array of <code>IO</code> objects:
- *  <code>[</code> <i>read_io</i>, <i>write_io</i> <code>]</code>. Not
+ *  <code>[</code> <i>read_file</i>, <i>write_file</i> <code>]</code>. Not
  *  available on all platforms.
- *
- *  If an encoding (encoding name or encoding object) is specified as an optional argument,
- *  read string from pipe is tagged with the encoding specified.
- *  If the argument is a colon separated two encoding names "A:B",
- *  the read string is converted from encoding A (external encoding)
- *  to encoding B (internal encoding), then tagged with B.
- *  If two optional arguments are specified, those must be
- *  encoding objects or encoding names,
- *  and the first one is the external encoding,
- *  and the second one is the internal encoding.
- *
+ *     
  *  In the example below, the two processes close the ends of the pipe
  *  that they are not using. This is not just a cosmetic nicety. The
  *  read end of a pipe will not generate an end of file condition if
  *  there are any writers with the pipe still open. In the case of the
  *  parent process, the <code>rd.read</code> will never return if it
  *  does not first issue a <code>wr.close</code>.
- *
+ *     
  *     rd, wr = IO.pipe
- *
+ *     
  *     if fork
  *       wr.close
  *       puts "Parent got: <#{rd.read}>"
@@ -6214,27 +5290,27 @@ io_encoding_set(rb_io_t *fptr, int argc, VALUE v1, VALUE v2)
  *       wr.write "Hi Dad"
  *       wr.close
  *     end
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     Sending message to parent
  *     Parent got: <Hi Dad>
  */
 
 static VALUE
-rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
+rb_io_s_pipe(klass)
+    VALUE klass;
 {
-#ifdef __human68k__
-    rb_notimplement();
-    return Qnil;		/* not reached */
-#else
+#ifndef __human68k__
     int pipes[2], state;
-    VALUE r, w, args[3], v1, v2;
-    rb_io_t *fptr;
+    VALUE r, w, args[3];
 
-    rb_scan_args(argc, argv, "02", &v1, &v2);
-    if (rb_pipe(pipes) == -1)
-        rb_sys_fail(0);
+#ifdef _WIN32
+    if (_pipe(pipes, 1024, O_BINARY) == -1)
+#else
+    if (pipe(pipes) == -1)
+#endif
+	rb_sys_fail(0);
 
     args[0] = klass;
     args[1] = INT2NUM(pipes[0]);
@@ -6245,8 +5321,6 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
 	close(pipes[1]);
 	rb_jump_tag(state);
     }
-    GetOpenFile(r, fptr);
-    io_encoding_set(fptr, argc, v1, v2);
     args[1] = INT2NUM(pipes[1]);
     args[2] = INT2FIX(O_WRONLY);
     w = rb_protect(io_new_instance, (VALUE)args, &state);
@@ -6258,64 +5332,25 @@ rb_io_s_pipe(int argc, VALUE *argv, VALUE klass)
     rb_io_synchronized(RFILE(w)->fptr);
 
     return rb_assoc_new(r, w);
+#else
+    rb_notimplement();
+    return Qnil;		/* not reached */
 #endif
 }
 
 struct foreach_arg {
     int argc;
-    VALUE *argv;
+    VALUE sep;
     VALUE io;
 };
 
-static void
-open_key_args(int argc, VALUE *argv, struct foreach_arg *arg)
-{
-    VALUE opt, v;
-
-    FilePathValue(argv[0]);
-    arg->io = 0;
-    arg->argc = argc > 1 ? 1 : 0;
-    arg->argv = argv + 1;
-    if (argc == 1) {
-      no_key:
-	arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r");
-	return;
-    }
-    opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash");
-    if (NIL_P(opt)) goto no_key;
-    if (argc > 2) arg->argc = 1;
-    else arg->argc = 0;
-
-    v = rb_hash_aref(opt, sym_open_args);
-    if (!NIL_P(v)) {
-	VALUE args;
-
-	v = rb_convert_type(v, T_ARRAY, "Array", "to_ary");
-	args = rb_ary_new2(RARRAY_LEN(v)+1);
-	rb_ary_push(args, argv[0]);
-	rb_ary_concat(args, v);
-	MEMCPY(RARRAY_PTR(args)+1, RARRAY_PTR(v), VALUE, RARRAY_LEN(v));
-
-	arg->io = rb_io_open_with_args(RARRAY_LEN(args), RARRAY_PTR(args));
-	return;
-    }
-    v = rb_hash_aref(opt, sym_mode);
-    if (!NIL_P(v)) {
-	arg->io = rb_io_open(RSTRING_PTR(argv[0]), StringValueCStr(v));
-    }
-    else {
-	arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r");
-    }
-
-    io_set_encoding(arg->io, opt);
-}
-
 static VALUE
-io_s_foreach(struct foreach_arg *arg)
+io_s_foreach(arg)
+    struct foreach_arg *arg;
 {
     VALUE str;
 
-    while (!NIL_P(str = rb_io_gets_m(arg->argc, arg->argv, arg->io))) {
+    while (!NIL_P(str = rb_io_getline(arg->sep, arg->io))) {
 	rb_yield(str);
     }
     return Qnil;
@@ -6323,769 +5358,127 @@ io_s_foreach(struct foreach_arg *arg)
 
 /*
  *  call-seq:
- *     IO.foreach(name, sep=$/) {|line| block }     => nil
- *     IO.foreach(name, limit) {|line| block }      => nil
- *     IO.foreach(name, sep, limit) {|line| block } => nil
- *
+ *     IO.foreach(name, sep_string=$/) {|line| block }   => nil
+ *  
  *  Executes the block for every line in the named I/O port, where lines
- *  are separated by <em>sep</em>.
- *
+ *  are separated by <em>sep_string</em>.
+ *     
  *     IO.foreach("testfile") {|x| print "GOT ", x }
- *
+ *     
  *  <em>produces:</em>
- *
+ *     
  *     GOT This is line one
  *     GOT This is line two
  *     GOT This is line three
  *     GOT And so on...
- *
- *  If the last argument is a hash, it's the keyword argument to open.
- *  See <code>IO.read</code> for detail.
- *
- */
+ */     
 
 static VALUE
-rb_io_s_foreach(int argc, VALUE *argv, VALUE self)
+rb_io_s_foreach(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
+    VALUE fname;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
+    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
     RETURN_ENUMERATOR(self, argc, argv);
-    open_key_args(argc, argv, &arg);
+    SafeStringValue(fname);
+
+    if (argc == 1) {
+	arg.sep = rb_default_rs;
+    }
+    else if (!NIL_P(arg.sep)) {
+	StringValue(arg.sep);
+    }
+    arg.io = rb_io_open(StringValueCStr(fname), "r");
     if (NIL_P(arg.io)) return Qnil;
+
     return rb_ensure(io_s_foreach, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_readlines(struct foreach_arg *arg)
+io_s_readlines(arg)
+    struct foreach_arg *arg;
 {
-    return rb_io_readlines(arg->argc, arg->argv, arg->io);
+    return rb_io_readlines(arg->argc, &arg->sep, arg->io);
 }
 
 /*
  *  call-seq:
- *     IO.readlines(name, sep=$/)     => array
- *     IO.readlines(name, limit)      => array
- *     IO.readlines(name, sep, limit) => array
- *
+ *     IO.readlines(name, sep_string=$/)   => array
+ *  
  *  Reads the entire file specified by <i>name</i> as individual
  *  lines, and returns those lines in an array. Lines are separated by
- *  <i>sep</i>.
- *
+ *  <i>sep_string</i>.
+ *     
  *     a = IO.readlines("testfile")
  *     a[0]   #=> "This is line one\n"
- *
- *  If the last argument is a hash, it's the keyword argument to open.
- *  See <code>IO.read</code> for detail.
- *
+ *     
  */
 
 static VALUE
-rb_io_s_readlines(int argc, VALUE *argv, VALUE io)
+rb_io_s_readlines(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
+    VALUE fname;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "13", NULL, NULL, NULL, NULL);
-    open_key_args(argc, argv, &arg);
+    rb_scan_args(argc, argv, "11", &fname, &arg.sep);
+    SafeStringValue(fname);
+
+    arg.argc = argc - 1;
+    arg.io = rb_io_open(StringValueCStr(fname), "r");
     if (NIL_P(arg.io)) return Qnil;
     return rb_ensure(io_s_readlines, (VALUE)&arg, rb_io_close, arg.io);
 }
 
 static VALUE
-io_s_read(struct foreach_arg *arg)
+io_s_read(arg)
+    struct foreach_arg *arg;
 {
-    return io_read(arg->argc, arg->argv, arg->io);
+    return io_read(arg->argc, &arg->sep, arg->io);
 }
 
 /*
  *  call-seq:
  *     IO.read(name, [length [, offset]] )   => string
- *     IO.read(name, [length [, offset]], opt)   => string
- *
+ *  
  *  Opens the file, optionally seeks to the given offset, then returns
  *  <i>length</i> bytes (defaulting to the rest of the file).
  *  <code>read</code> ensures the file is closed before returning.
- *
- *  If the last argument is a hash, it specifies option for internal
- *  open().  The key would be the following.  open_args: is exclusive
- *  to others.
- *
- *   encoding: string or encoding
- *
- *    specifies encoding of the read string.  encoding will be ignored
- *    if length is specified.
- *
- *   mode: string
- *
- *    specifies mode argument for open().  it should start with "r"
- *    otherwise it would cause error.
- *
- *   open_args: array of strings
- *
- *    specifies arguments for open() as an array.
- *
+ *     
  *     IO.read("testfile")           #=> "This is line one\nThis is line two\nThis is line three\nAnd so on...\n"
  *     IO.read("testfile", 20)       #=> "This is line one\nThi"
  *     IO.read("testfile", 20, 10)   #=> "ne one\nThis is line "
  */
 
 static VALUE
-rb_io_s_read(int argc, VALUE *argv, VALUE io)
+rb_io_s_read(argc, argv, io)
+    int argc;
+    VALUE *argv;
+    VALUE io;
 {
-    VALUE offset;
+    VALUE fname, offset;
     struct foreach_arg arg;
 
-    rb_scan_args(argc, argv, "13", NULL, NULL, &offset, NULL);
-    open_key_args(argc, argv, &arg);
+    rb_scan_args(argc, argv, "12", &fname, &arg.sep, &offset);
+    SafeStringValue(fname);
+
+    arg.argc = argc ? 1 : 0;
+    arg.io = rb_io_open(StringValueCStr(fname), "r");
     if (NIL_P(arg.io)) return Qnil;
     if (!NIL_P(offset)) {
-	rb_io_binmode(arg.io);
 	rb_io_seek(arg.io, offset, SEEK_SET);
-	if (arg.argc == 2) arg.argc = 1;
     }
     return rb_ensure(io_s_read, (VALUE)&arg, rb_io_close, arg.io);
 }
 
-struct copy_stream_struct {
-    VALUE src;
-    VALUE dst;
-    off_t copy_length; /* (off_t)-1 if not specified */
-    off_t src_offset; /* (off_t)-1 if not specified */
-
-    int src_fd;
-    int dst_fd;
-    int close_src;
-    int close_dst;
-    off_t total;
-    const char *syserr;
-    int error_no;
-    const char *notimp;
-    rb_fdset_t fds;
-    rb_thread_t *th;
-};
-
-static int
-copy_stream_wait_read(struct copy_stream_struct *stp)
-{
-    int ret;
-    rb_fd_zero(&stp->fds);
-    rb_fd_set(stp->src_fd, &stp->fds);
-    ret = rb_fd_select(rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
-    if (ret == -1) {
-        stp->syserr = "select";
-        stp->error_no = errno;
-        return -1;
-    }
-    return 0;
-}
-
-static int
-copy_stream_wait_write(struct copy_stream_struct *stp)
-{
-    int ret;
-    rb_fd_zero(&stp->fds);
-    rb_fd_set(stp->dst_fd, &stp->fds);
-    ret = rb_fd_select(rb_fd_max(&stp->fds), NULL, &stp->fds, NULL, NULL);
-    if (ret == -1) {
-        stp->syserr = "select";
-        stp->error_no = errno;
-        return -1;
-    }
-    return 0;
-}
-
-#ifdef HAVE_SENDFILE
-
-#ifdef __linux__
-#define USE_SENDFILE
-
-#ifdef HAVE_SYS_SENDFILE_H
-#include <sys/sendfile.h>
-#endif
-
-static ssize_t
-simple_sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
-{
-    return sendfile(out_fd, in_fd, offset, count);
-}
-
-#endif
-
-#endif
-
-#ifdef USE_SENDFILE
-static int
-copy_stream_sendfile(struct copy_stream_struct *stp)
-{
-    struct stat src_stat, dst_stat;
-    ssize_t ss;
-    int ret;
-
-    off_t copy_length;
-    off_t src_offset;
-    int use_pread;
-
-    ret = fstat(stp->src_fd, &src_stat);
-    if (ret == -1) {
-        stp->syserr = "fstat";
-        stp->error_no = errno;
-        return -1;
-    }
-    if (!S_ISREG(src_stat.st_mode))
-        return 0;
-
-    ret = fstat(stp->dst_fd, &dst_stat);
-    if (ret == -1) {
-        stp->syserr = "fstat";
-        stp->error_no = errno;
-        return -1;
-    }
-    if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
-        return 0;
-
-    src_offset = stp->src_offset;
-    use_pread = src_offset != (off_t)-1;
-
-    copy_length = stp->copy_length;
-    if (copy_length == (off_t)-1) {
-        if (use_pread)
-            copy_length = src_stat.st_size - src_offset;
-        else {
-            off_t cur = lseek(stp->src_fd, 0, SEEK_CUR);
-            if (cur == (off_t)-1) {
-                stp->syserr = "lseek";
-                stp->error_no = errno;
-                return -1;
-            }
-            copy_length = src_stat.st_size - cur;
-        }
-    }
-
-retry_sendfile:
-    if (use_pread) {
-        ss = simple_sendfile(stp->dst_fd, stp->src_fd, &src_offset, copy_length);
-    }
-    else {
-        ss = simple_sendfile(stp->dst_fd, stp->src_fd, NULL, copy_length);
-    }
-    if (0 < ss) {
-        stp->total += ss;
-        copy_length -= ss;
-        if (0 < copy_length) {
-            ss = -1;
-            errno = EAGAIN;
-        }
-    }
-    if (ss == -1) {
-        if (errno == EINVAL || errno == ENOSYS)
-            return 0;
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            if (copy_stream_wait_write(stp) == -1)
-                return -1;
-            if (RUBY_VM_INTERRUPTED(stp->th))
-                return -1;
-            goto retry_sendfile;
-        }
-        stp->syserr = "sendfile";
-        stp->error_no = errno;
-        return -1;
-    }
-    return 1;
-}
-#endif
-
-static ssize_t
-copy_stream_read(struct copy_stream_struct *stp, char *buf, int len, off_t offset)
-{
-    ssize_t ss;
-retry_read:
-    if (offset == (off_t)-1)
-        ss = read(stp->src_fd, buf, len);
-    else {
-#ifdef HAVE_PREAD
-        ss = pread(stp->src_fd, buf, len, offset);
-#else
-        stp->notimp = "pread";
-        return -1;
-#endif
-    }
-    if (ss == 0) {
-        return 0;
-    }
-    if (ss == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-            if (copy_stream_wait_read(stp) == -1)
-                return -1;
-            goto retry_read;
-        }
-        if (errno == ENOSYS) {
-            stp->notimp = "pread";
-            return -1;
-        }
-        stp->syserr = offset == (off_t)-1 ?  "read" : "pread";
-        stp->error_no = errno;
-        return -1;
-    }
-    return ss;
-}
-
-static int
-copy_stream_write(struct copy_stream_struct *stp, char *buf, int len)
-{
-    ssize_t ss;
-    int off = 0;
-    while (len) {
-        ss = write(stp->dst_fd, buf+off, len);
-        if (ss == -1) {
-            if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                if (copy_stream_wait_write(stp) == -1)
-                    return -1;
-                continue;
-            }
-            stp->syserr = "write";
-            stp->error_no = errno;
-            return -1;
-        }
-        off += ss;
-        len -= ss;
-        stp->total += ss;
-    }
-    return 0;
-}
-
-static void
-copy_stream_read_write(struct copy_stream_struct *stp)
-{
-    char buf[1024*16];
-    int len;
-    ssize_t ss;
-    int ret;
-    off_t copy_length;
-    int use_eof;
-    off_t src_offset;
-    int use_pread;
-
-    copy_length = stp->copy_length;
-    use_eof = copy_length == (off_t)-1;
-    src_offset = stp->src_offset;
-    use_pread = src_offset != (off_t)-1;
-
-    if (use_pread && stp->close_src) {
-        off_t r;
-        r = lseek(stp->src_fd, src_offset, SEEK_SET);
-        if (r == (off_t)-1) {
-            stp->syserr = "lseek";
-            stp->error_no = errno;
-            return;
-        }
-        src_offset = (off_t)-1;
-        use_pread = 0;
-    }
-
-    while (use_eof || 0 < copy_length) {
-        if (!use_eof && copy_length < sizeof(buf)) {
-            len = copy_length;
-        }
-        else {
-            len = sizeof(buf);
-        }
-        if (use_pread) {
-            ss = copy_stream_read(stp, buf, len, src_offset);
-            if (0 < ss)
-                src_offset += ss;
-        }
-        else {
-            ss = copy_stream_read(stp, buf, len, (off_t)-1);
-        }
-        if (ss <= 0) /* EOF or error */
-            return;
-
-        ret = copy_stream_write(stp, buf, ss);
-        if (ret < 0)
-            return;
-
-        if (!use_eof)
-            copy_length -= ss;
-
-        if (RUBY_VM_INTERRUPTED(stp->th))
-            return;
-    }
-}
-
-static VALUE
-copy_stream_func(void *arg)
-{
-    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-#ifdef USE_SENDFILE
-    int ret;
-#endif
-
-#ifdef USE_SENDFILE
-    ret = copy_stream_sendfile(stp);
-    if (ret != 0)
-        goto finish; /* error or success */
-#endif
-
-    copy_stream_read_write(stp);
-
-#ifdef USE_SENDFILE
-finish:
-#endif
-    return Qnil;
-}
-
-static VALUE
-copy_stream_fallback_body(VALUE arg)
-{
-    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-    const int buflen = 16*1024;
-    VALUE n;
-    VALUE buf = rb_str_buf_new(buflen);
-    long rest = stp->copy_length;
-    off_t off = stp->src_offset;
-
-    while (1) {
-        long numwrote;
-        long l;
-        if (stp->copy_length == (off_t)-1) {
-            l = buflen;
-        }
-        else {
-            if (rest == 0)
-                break;
-            l = buflen < rest ? buflen : rest;
-        }
-        if (stp->src_fd == -1) {
-            rb_funcall(stp->src, id_readpartial, 2, INT2FIX(l), buf);
-        }
-        else {
-            ssize_t ss;
-            rb_thread_wait_fd(stp->src_fd);
-            rb_str_resize(buf, buflen);
-            ss = copy_stream_read(stp, RSTRING_PTR(buf), l, off);
-            if (ss == -1)
-                return Qnil;
-            if (ss == 0)
-                rb_eof_error();
-            rb_str_resize(buf, ss);
-            if (off != (off_t)-1)
-                off += ss;
-        }
-        n = rb_io_write(stp->dst, buf);
-        numwrote = NUM2LONG(n);
-        stp->total += numwrote;
-        rest -= numwrote;
-    }
-
-    return Qnil;
-}
-
-static VALUE
-copy_stream_fallback(struct copy_stream_struct *stp)
-{
-    if (stp->src_fd == -1 && stp->src_offset != (off_t)-1) {
-	rb_raise(rb_eArgError, "cannot specify src_offset for non-IO");
-    }
-    rb_rescue2(copy_stream_fallback_body, (VALUE)stp,
-               (VALUE (*) (ANYARGS))0, (VALUE)0,
-               rb_eEOFError, (VALUE)0);
-    return Qnil;
-}
-
-static VALUE
-copy_stream_body(VALUE arg)
-{
-    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-    VALUE src_io, dst_io;
-    rb_io_t *src_fptr = 0, *dst_fptr = 0;
-    int src_fd, dst_fd;
-
-    stp->th = GET_THREAD();
-
-    stp->total = 0;
-
-    if (stp->src == argf ||
-        !(TYPE(stp->src) == T_FILE ||
-          rb_respond_to(stp->src, rb_intern("to_io")) ||
-          TYPE(stp->src) == T_STRING ||
-          rb_respond_to(stp->src, rb_intern("to_path")))) {
-        src_fd = -1;
-    }
-    else {
-        src_io = rb_check_convert_type(stp->src, T_FILE, "IO", "to_io");
-        if (NIL_P(src_io)) {
-            VALUE args[2];
-            int flags = O_RDONLY;
-#ifdef O_NOCTTY
-            flags |= O_NOCTTY;
-#endif
-            FilePathValue(stp->src);
-            args[0] = stp->src;
-            args[1] = INT2NUM(flags);
-            src_io = rb_class_new_instance(2, args, rb_cFile);
-            stp->src = src_io;
-            stp->close_src = 1;
-        }
-        GetOpenFile(src_io, src_fptr);
-        rb_io_check_readable(src_fptr);
-        src_fd = src_fptr->fd;
-    }
-    stp->src_fd = src_fd;
-
-    if (stp->dst == argf ||
-        !(TYPE(stp->dst) == T_FILE ||
-          rb_respond_to(stp->dst, rb_intern("to_io")) ||
-          TYPE(stp->dst) == T_STRING ||
-          rb_respond_to(stp->dst, rb_intern("to_path")))) {
-        dst_fd = -1;
-    }
-    else {
-        dst_io = rb_check_convert_type(stp->dst, T_FILE, "IO", "to_io");
-        if (NIL_P(dst_io)) {
-            VALUE args[3];
-            int flags = O_WRONLY|O_CREAT|O_TRUNC;
-#ifdef O_NOCTTY
-            flags |= O_NOCTTY;
-#endif
-            FilePathValue(stp->dst);
-            args[0] = stp->dst;
-            args[1] = INT2NUM(flags);
-            args[2] = INT2FIX(0600);
-            dst_io = rb_class_new_instance(3, args, rb_cFile);
-            stp->dst = dst_io;
-            stp->close_dst = 1;
-        }
-        else {
-            dst_io = GetWriteIO(dst_io);
-            stp->dst = dst_io;
-        }
-        GetOpenFile(dst_io, dst_fptr);
-        rb_io_check_writable(dst_fptr);
-        dst_fd = dst_fptr->fd;
-    }
-    stp->dst_fd = dst_fd;
-
-    if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf_len) {
-        long len = src_fptr->rbuf_len;
-        VALUE str;
-        if (stp->copy_length != (off_t)-1 && stp->copy_length < len) {
-            len = stp->copy_length;
-        }
-        str = rb_str_buf_new(len);
-        rb_str_resize(str,len);
-        read_buffered_data(RSTRING_PTR(str), len, src_fptr);
-        if (dst_fptr) /* IO or filename */
-            io_fwrite(str, dst_fptr);
-        else /* others such as StringIO */
-            rb_io_write(stp->dst, str);
-        stp->total += len;
-        if (stp->copy_length != (off_t)-1)
-            stp->copy_length -= len;
-    }
-
-    if (dst_fptr && io_fflush(dst_fptr) < 0) {
-	rb_raise(rb_eIOError, "flush failed");
-    }
-
-    if (stp->copy_length == 0)
-        return Qnil;
-
-    if (src_fd == -1 || dst_fd == -1) {
-        return copy_stream_fallback(stp);
-    }
-
-    rb_fd_init(&stp->fds);
-    rb_fd_set(src_fd, &stp->fds);
-    rb_fd_set(dst_fd, &stp->fds);
-
-    return rb_thread_blocking_region(copy_stream_func, (void*)stp, RB_UBF_DFL, 0);
-}
-
-static VALUE
-copy_stream_finalize(VALUE arg)
-{
-    struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
-    if (stp->close_src) {
-        rb_io_close_m(stp->src);
-    }
-    if (stp->close_dst) {
-        rb_io_close_m(stp->dst);
-    }
-    rb_fd_term(&stp->fds);
-    if (stp->syserr) {
-        errno = stp->error_no;
-        rb_sys_fail(stp->syserr);
-    }
-    if (stp->notimp) {
-	rb_raise(rb_eNotImpError, "%s() not implemented", stp->notimp);
-    }
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     IO.copy_stream(src, dst)
- *     IO.copy_stream(src, dst, copy_length)
- *     IO.copy_stream(src, dst, copy_length, src_offset)
- *
- *  IO.copy_stream copies <i>src</i> to <i>dst</i>.
- *  <i>src</i> and <i>dst</i> is either a filename or an IO.
- *
- *  This method returns the number of bytes copied.
- *
- *  If optional arguments are not given,
- *  the start position of the copy is
- *  the beginning of the filename or
- *  the current file offset of the IO.
- *  The end position of the copy is the end of file.
- *
- *  If <i>copy_length</i> is given,
- *  No more than <i>copy_length</i> bytes are copied.
- *
- *  If <i>src_offset</i> is given,
- *  it specifies the start position of the copy.
- *
- *  When <i>src_offset</i> is specified and
- *  <i>src</i> is an IO,
- *  IO.copy_stream doesn't move the current file offset.
- *
- */
-static VALUE
-rb_io_s_copy_stream(int argc, VALUE *argv, VALUE io)
-{
-    VALUE src, dst, length, src_offset;
-    struct copy_stream_struct st;
-
-    MEMZERO(&st, struct copy_stream_struct, 1);
-
-    rb_scan_args(argc, argv, "22", &src, &dst, &length, &src_offset);
-
-    st.src = src;
-    st.dst = dst;
-
-    if (NIL_P(length))
-        st.copy_length = (off_t)-1;
-    else
-        st.copy_length = NUM2OFFT(length);
-
-    if (NIL_P(src_offset))
-        st.src_offset = (off_t)-1;
-    else
-        st.src_offset = NUM2OFFT(src_offset);
-
-    rb_ensure(copy_stream_body, (VALUE)&st, copy_stream_finalize, (VALUE)&st);
-
-    return OFFT2NUM(st.total);
-}
-
-/*
- *  call-seq:
- *     io.external_encoding   => encoding
- *
- *  Returns the Encoding object that represents the encoding of the file.
- *  If io is write mode and no encoding is specified, returns <code>nil</code>.
- */
-
-static VALUE
-rb_io_external_encoding(VALUE io)
-{
-    rb_io_t *fptr;
-
-    GetOpenFile(io, fptr);
-    if (fptr->enc2) {
-	return rb_enc_from_encoding(fptr->enc2);
-    }
-    if (!fptr->enc && fptr->fd == 0) {
-	fptr->enc = rb_default_external_encoding();
-    }
-    if (fptr->mode & FMODE_WRITABLE) {
-	if (fptr->enc)
-	    return rb_enc_from_encoding(fptr->enc);
-	return Qnil;
-    }
-    return rb_enc_from_encoding(io_read_encoding(fptr));
-}
-
-/*
- *  call-seq:
- *     io.internal_encoding   => encoding
- *
- *  Returns the Encoding of the internal string if conversion is
- *  specified.  Otherwise returns nil.
- */
-
 static VALUE
-rb_io_internal_encoding(VALUE io)
-{
-    rb_io_t *fptr;
-
-    GetOpenFile(io, fptr);
-    if (!fptr->enc2) return Qnil;
-    return rb_enc_from_encoding(io_read_encoding(fptr));
-}
-
-/*
- *  call-seq:
- *     io.set_encoding(ext_enc)           => io
- *     io.set_encoding("ext_enc:int_enc") => io
- *     io.set_encoding(ext_enc, int_enc)  => io
- *
- *  If single argument is specified, read string from io is tagged
- *  with the encoding specified.  If encoding is a colon separated two
- *  encoding names "A:B", the read string is converted from encoding A
- *  (external encoding) to encoding B (internal encoding), then tagged
- *  with B.  If two arguments are specified, those must be encoding
- *  objects or encoding names, and the first one is the external encoding, and the
- *  second one is the internal encoding.
- */
-
-static VALUE
-rb_io_set_encoding(int argc, VALUE *argv, VALUE io)
-{
-    rb_io_t *fptr;
-    VALUE v1, v2;
-
-    rb_scan_args(argc, argv, "11", &v1, &v2);
-    GetOpenFile(io, fptr);
-    io_encoding_set(fptr, argc, v1, v2);
-    return io;
-}
-
-static VALUE
-argf_external_encoding(VALUE argf)
-{
-    if (!RTEST(current_file)) {
-	return rb_enc_from_encoding(rb_default_external_encoding());
-    }
-    return rb_io_external_encoding(rb_io_check_io(current_file));
-}
-
-static VALUE
-argf_internal_encoding(VALUE argf)
-{
-    if (!RTEST(current_file)) {
-	return rb_enc_from_encoding(rb_default_external_encoding());
-    }
-    return rb_io_internal_encoding(rb_io_check_io(current_file));
-}
-
-static VALUE
-argf_set_encoding(int argc, VALUE *argv, VALUE argf)
-{
-    rb_io_t *fptr;
-
-    if (!next_argv()) {
-	rb_raise(rb_eArgError, "no stream to set encoding");
-    }
-    rb_io_set_encoding(argc, argv, current_file);
-    GetOpenFile(current_file, fptr);
-    argf_enc = fptr->enc;
-    argf_enc2 = fptr->enc2;
-    return argf;
-}
-
-static VALUE
-argf_tell(VALUE argf)
+argf_tell()
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to tell");
@@ -7095,7 +5488,10 @@ argf_tell(VALUE argf)
 }
 
 static VALUE
-argf_seek_m(int argc, VALUE *argv, VALUE argf)
+argf_seek_m(argc, argv, self)
+    int argc;
+    VALUE *argv;
+    VALUE self;
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to seek");
@@ -7105,7 +5501,8 @@ argf_seek_m(int argc, VALUE *argv, VALUE argf)
 }
 
 static VALUE
-argf_set_pos(VALUE argf, VALUE offset)
+argf_set_pos(self, offset)
+     VALUE self, offset;
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to set position");
@@ -7115,7 +5512,7 @@ argf_set_pos(VALUE argf, VALUE offset)
 }
 
 static VALUE
-argf_rewind(VALUE argf)
+argf_rewind()
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream to rewind");
@@ -7125,7 +5522,7 @@ argf_rewind(VALUE argf)
 }
 
 static VALUE
-argf_fileno(VALUE argf)
+argf_fileno()
 {
     if (!next_argv()) {
 	rb_raise(rb_eArgError, "no stream");
@@ -7135,7 +5532,7 @@ argf_fileno(VALUE argf)
 }
 
 static VALUE
-argf_to_io(VALUE argf)
+argf_to_io()
 {
     next_argv();
     ARGF_FORWARD(0, 0);
@@ -7143,7 +5540,7 @@ argf_to_io(VALUE argf)
 }
 
 static VALUE
-argf_eof(VALUE argf)
+argf_eof()
 {
     if (current_file) {
 	if (init_p == 0) return Qtrue;
@@ -7156,7 +5553,9 @@ argf_eof(VALUE argf)
 }
 
 static VALUE
-argf_read(int argc, VALUE *argv, VALUE argf)
+argf_read(argc, argv)
+    int argc;
+    VALUE *argv;
 {
     VALUE tmp, str, length;
     long len = 0;
@@ -7175,8 +5574,8 @@ argf_read(int argc, VALUE *argv, VALUE argf)
     if (!next_argv()) {
 	return str;
     }
-    if (ARGF_GENERIC_INPUT_P()) {
-	tmp = argf_forward(argc, argv, argf);
+    if (TYPE(current_file) != T_FILE) {
+	tmp = argf_forward(argc, argv);
     }
     else {
 	tmp = io_read(argc, argv, current_file);
@@ -7191,8 +5590,8 @@ argf_read(int argc, VALUE *argv, VALUE argf)
 	}
     }
     else if (argc >= 1) {
-	if (RSTRING_LEN(str) < len) {
-	    len -= RSTRING_LEN(str);
+	if (RSTRING(str)->len < len) {
+	    len -= RSTRING(str)->len;
 	    argv[0] = INT2NUM(len);
 	    goto retry;
 	}
@@ -7200,134 +5599,35 @@ argf_read(int argc, VALUE *argv, VALUE argf)
     return str;
 }
 
-struct argf_call_arg {
-    int argc;
-    VALUE *argv;
-    VALUE argf;
-};
-
-static VALUE
-argf_forward_call(VALUE arg)
-{
-    struct argf_call_arg *p = (struct argf_call_arg *)arg;
-    argf_forward(p->argc, p->argv, p->argf);
-    return Qnil;
-}
-
-static VALUE
-argf_readpartial(int argc, VALUE *argv, VALUE argf)
-{
-    VALUE tmp, str, length;
-
-    rb_scan_args(argc, argv, "11", &length, &str);
-    if (!NIL_P(str)) {
-        StringValue(str);
-        argv[1] = str;
-    }
-
-    if (!next_argv()) {
-        rb_str_resize(str, 0);
-        rb_eof_error();
-    }
-    if (ARGF_GENERIC_INPUT_P()) {
-	struct argf_call_arg arg;
-	arg.argc = argc;
-	arg.argv = argv;
-	arg.argf = argf;
-	tmp = rb_rescue2(argf_forward_call, (VALUE)&arg,
-			 RUBY_METHOD_FUNC(0), Qnil, rb_eEOFError, (VALUE)0);
-    }
-    else {
-        tmp = io_getpartial(argc, argv, current_file, 0);
-    }
-    if (NIL_P(tmp)) {
-        if (next_p == -1) {
-            rb_eof_error();
-        }
-        argf_close(current_file);
-        next_p = 1;
-        if (RARRAY_LEN(rb_argv) == 0)
-            rb_eof_error();
-        if (NIL_P(str))
-            str = rb_str_new(NULL, 0);
-        return str;
-    }
-    return tmp;
-}
-
 static VALUE
-argf_getc(VALUE argf)
+argf_getc()
 {
-    VALUE ch;
-
-  retry:
-    if (!next_argv()) return Qnil;
-    if (ARGF_GENERIC_INPUT_P()) {
-	ch = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
-    }
-    else {
-	ch = rb_io_getc(current_file);
-    }
-    if (NIL_P(ch) && next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
-	goto retry;
-    }
-
-    return ch;
-}
-
-static VALUE
-argf_getbyte(VALUE argf)
-{
-    VALUE ch;
+    VALUE byte;
 
   retry:
     if (!next_argv()) return Qnil;
     if (TYPE(current_file) != T_FILE) {
-	ch = rb_funcall3(current_file, rb_intern("getbyte"), 0, 0);
-    }
-    else {
-	ch = rb_io_getbyte(current_file);
-    }
-    if (NIL_P(ch) && next_p != -1) {
-	argf_close(current_file);
-	next_p = 1;
-	goto retry;
-    }
-
-    return ch;
-}
-
-static VALUE
-argf_readchar(VALUE argf)
-{
-    VALUE ch;
-
-  retry:
-    if (!next_argv()) rb_eof_error();
-    if (TYPE(current_file) != T_FILE) {
-	ch = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
+	byte = rb_funcall3(current_file, rb_intern("getc"), 0, 0);
     }
     else {
-	ch = rb_io_getc(current_file);
+	byte = rb_io_getc(current_file);
     }
-    if (NIL_P(ch) && next_p != -1) {
+    if (NIL_P(byte) && next_p != -1) {
 	argf_close(current_file);
 	next_p = 1;
 	goto retry;
     }
 
-    return ch;
+    return byte;
 }
 
 static VALUE
-argf_readbyte(VALUE argf)
+argf_readchar()
 {
     VALUE c;
 
     NEXT_ARGF_FORWARD(0, 0);
-    c = argf_getbyte(argf);
+    c = argf_getc();
     if (NIL_P(c)) {
 	rb_eof_error();
     }
@@ -7335,63 +5635,95 @@ argf_readbyte(VALUE argf)
 }
 
 static VALUE
-argf_each_line(int argc, VALUE *argv, VALUE argf)
+argf_each_line(argc, argv, argf)
+    int argc;
+    VALUE *argv;
+    VALUE argf;
 {
+    VALUE str;
+
     RETURN_ENUMERATOR(argf, argc, argv);
-    for (;;) {
-	if (!next_argv()) return Qnil;
-	rb_block_call(current_file, rb_intern("each_line"), argc, argv, rb_yield, 0);
-	next_p = 1;
+    if (!next_argv()) return Qnil;
+    if (TYPE(current_file) != T_FILE) {
+	for (;;) {
+	    if (!next_argv()) return argf;
+	    rb_iterate(rb_each, current_file, rb_yield, 0);
+	    next_p = 1;
+	}
+    }
+    while (!NIL_P(str = argf_getline(argc, argv))) {
+	rb_yield(str);
     }
     return argf;
 }
 
 static VALUE
-argf_each_byte(VALUE argf)
+argf_each_byte(argf)
+    VALUE argf;
 {
+    VALUE byte;
+
     RETURN_ENUMERATOR(argf, 0, 0);
-    for (;;) {
-	if (!next_argv()) return Qnil;
-	rb_block_call(current_file, rb_intern("each_byte"), 0, 0, rb_yield, 0);
-	next_p = 1;
+    while (!NIL_P(byte = argf_getc())) {
+	rb_yield(byte);
     }
+    return argf;
 }
 
 static VALUE
-argf_each_char(VALUE argf)
+argf_each_char(argf)
+    VALUE argf;
 {
+    VALUE ch;
+
     RETURN_ENUMERATOR(argf, 0, 0);
-    for (;;) {
-	if (!next_argv()) return Qnil;
-	rb_block_call(current_file, rb_intern("each_char"), 0, 0, rb_yield, 0);
-	next_p = 1;
+
+    while (!NIL_P(ch = argf_getc())) {
+	unsigned char c;
+	int n;
+	VALUE str, file;
+
+      first_char:
+	c = FIX2INT(ch);
+	n = mbclen(c);
+	str = rb_tainted_str_new((const char *)&c, 1);
+	file = current_file;
+
+	while (--n > 0) {
+	    if (NIL_P(ch = argf_getc())) {
+		rb_yield(str);
+		return argf;
+	    }
+	    if (current_file != file) {
+		rb_yield(str);
+		goto first_char;
+	    }
+	    c = FIX2INT(ch);
+	    rb_str_cat(str, (const char *)&c, 1);
+	}
+	rb_yield(str);
     }
+    return argf;
 }
 
 static VALUE
-argf_filename(VALUE argf)
+argf_filename()
 {
     next_argv();
     return filename;
 }
 
 static VALUE
-argf_filename_getter(ID id, VALUE *var)
-{
-    return argf_filename(*var);
-}
-
-static VALUE
-argf_file(VALUE argf)
+argf_file()
 {
     next_argv();
     return current_file;
 }
 
 static VALUE
-argf_binmode_m(VALUE argf)
+argf_binmode()
 {
-    argf_binmode = 1;
+    binmode = 1;
     next_argv();
     ARGF_FORWARD(0, 0);
     rb_io_binmode(current_file);
@@ -7399,13 +5731,7 @@ argf_binmode_m(VALUE argf)
 }
 
 static VALUE
-argf_binmode_p(VALUE argf)
-{
-    return argf_binmode ? Qtrue : Qfalse;
-}
-
-static VALUE
-argf_skip(VALUE argf)
+argf_skip()
 {
     if (next_p != -1) {
 	argf_close(current_file);
@@ -7415,7 +5741,7 @@ argf_skip(VALUE argf)
 }
 
 static VALUE
-argf_close_m(VALUE argf)
+argf_close_m()
 {
     next_argv();
     argf_close(current_file);
@@ -7427,7 +5753,7 @@ argf_close_m(VALUE argf)
 }
 
 static VALUE
-argf_closed(VALUE argf)
+argf_closed()
 {
     next_argv();
     ARGF_FORWARD(0, 0);
@@ -7435,114 +5761,69 @@ argf_closed(VALUE argf)
 }
 
 static VALUE
-argf_to_s(VALUE argf)
+argf_to_s()
 {
     return rb_str_new2("ARGF");
 }
 
 static VALUE
-argf_inplace_mode_get(VALUE argf)
+opt_i_get()
 {
     if (!ruby_inplace_mode) return Qnil;
     return rb_str_new2(ruby_inplace_mode);
 }
 
-static VALUE
-opt_i_get(ID id, VALUE *var)
-{
-    return argf_inplace_mode_get(*var);
-}
-
-static VALUE
-argf_inplace_mode_set(VALUE argf, VALUE val)
+static void
+opt_i_set(val)
+    VALUE val;
 {
     if (!RTEST(val)) {
 	if (ruby_inplace_mode) free(ruby_inplace_mode);
 	ruby_inplace_mode = 0;
+	return;
     }
-    else {
-	StringValue(val);
-	if (ruby_inplace_mode) free(ruby_inplace_mode);
-	ruby_inplace_mode = 0;
-	ruby_inplace_mode = strdup(RSTRING_PTR(val));
-    }
-    return argf;
-}
-
-static void
-opt_i_set(VALUE val, ID id, VALUE *var)
-{
-    argf_inplace_mode_set(*var, val);
-}
-
-const char *
-ruby_get_inplace_mode(void)
-{
-    return ruby_inplace_mode;
-}
-
-void
-ruby_set_inplace_mode(const char *suffix)
-{
+    StringValue(val);
     if (ruby_inplace_mode) free(ruby_inplace_mode);
     ruby_inplace_mode = 0;
-    if (suffix) ruby_inplace_mode = strdup(suffix);
-}
-
-static VALUE
-argf_argv(VALUE argf)
-{
-    return rb_argv;
-}
-
-static VALUE
-argf_argv_getter(ID id, VALUE *var)
-{
-    return argf_argv(*var);
-}
-
-VALUE
-rb_get_argv(void)
-{
-    return rb_argv;
+    ruby_inplace_mode = strdup(StringValueCStr(val));
 }
 
 /*
  *  Class <code>IO</code> is the basis for all input and output in Ruby.
  *  An I/O stream may be <em>duplexed</em> (that is, bidirectional), and
  *  so may use more than one native operating system stream.
- *
+ *     
  *  Many of the examples in this section use class <code>File</code>,
  *  the only standard subclass of <code>IO</code>. The two classes are
  *  closely associated.
- *
+ *     
  *  As used in this section, <em>portname</em> may take any of the
  *  following forms.
- *
+ *     
  *  * A plain string represents a filename suitable for the underlying
  *    operating system.
- *
+ *     
  *  * A string starting with ``<code>|</code>'' indicates a subprocess.
  *    The remainder of the string following the ``<code>|</code>'' is
  *    invoked as a process with appropriate input/output channels
  *    connected to it.
- *
+ *     
  *  * A string equal to ``<code>|-</code>'' will create another Ruby
  *    instance as a subprocess.
- *
+ *     
  *  Ruby will convert pathnames between different operating system
  *  conventions if possible. For instance, on a Windows system the
  *  filename ``<code>/gumby/ruby/test.rb</code>'' will be opened as
  *  ``<code>\gumby\ruby\test.rb</code>''. When specifying a
  *  Windows-style filename in a Ruby string, remember to escape the
  *  backslashes:
- *
+ *     
  *     "c:\\gumby\\ruby\\test.rb"
- *
+ *     
  *  Our examples here will use the Unix-style forward slashes;
  *  <code>File::SEPARATOR</code> can be used to get the
  *  platform-specific separator character.
- *
+ *     
  *  I/O ports may be opened in any one of several different modes, which
  *  are shown in this section as <em>mode</em>. The mode may
  *  either be a Fixnum or a String. If numeric, it should be
@@ -7559,7 +5840,7 @@ rb_get_argv(void)
  *    -----+--------------------------------------------------------
  *    "r+" |  Read-write, starts at beginning of file.
  *    -----+--------------------------------------------------------
- *    "w"  |  Write-only, truncates existing file
+ *    "w"  |  Write-only, truncates existing file 
  *         |  to zero length or creates a new file for writing.
  *    -----+--------------------------------------------------------
  *    "w+" |  Read-write, truncates existing file to zero length
@@ -7569,10 +5850,10 @@ rb_get_argv(void)
  *         |  otherwise creates a new file for writing.
  *    -----+--------------------------------------------------------
  *    "a+" |  Read-write, starts at end of file if file exists,
- *         |  otherwise creates a new file for reading and
+ *         |  otherwise creates a new file for reading and 
  *         |  writing.
  *    -----+--------------------------------------------------------
- *     "b" |  (DOS/Windows only) Binary file mode (may appear with
+ *     "b" |  (DOS/Windows only) Binary file mode (may appear with 
  *         |  any of the key letters listed above).
  *
  *
@@ -7584,12 +5865,9 @@ rb_get_argv(void)
  */
 
 void
-Init_IO(void)
+Init_IO()
 {
-#undef rb_intern
-
-    VALUE rb_cARGF;
-#ifdef __CYGWIN__
+#ifdef __CYGWIN__ 
 #include <sys/cygwin.h>
     static struct __cygwin_perfile pf[] =
     {
@@ -7608,9 +5886,6 @@ Init_IO(void)
     id_write = rb_intern("write");
     id_read = rb_intern("read");
     id_getc = rb_intern("getc");
-    id_flush = rb_intern("flush");
-    id_encode = rb_intern("encode");
-    id_readpartial = rb_intern("readpartial");
 
     rb_define_global_function("syscall", rb_f_syscall, -1);
 
@@ -7621,6 +5896,7 @@ Init_IO(void)
     rb_define_global_function("puts", rb_f_puts, -1);
     rb_define_global_function("gets", rb_f_gets, -1);
     rb_define_global_function("readline", rb_f_readline, -1);
+    rb_define_global_function("getc", rb_f_getc, 0);
     rb_define_global_function("select", rb_f_select, -1);
 
     rb_define_global_function("readlines", rb_f_readlines, -1);
@@ -7643,9 +5919,7 @@ Init_IO(void)
     rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1);
     rb_define_singleton_method(rb_cIO, "read", rb_io_s_read, -1);
     rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1);
-    rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, -1);
-    rb_define_singleton_method(rb_cIO, "try_convert", rb_io_s_try_convert, 1);
-    rb_define_singleton_method(rb_cIO, "copy_stream", rb_io_s_copy_stream, -1);
+    rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0);
 
     rb_define_method(rb_cIO, "initialize", rb_io_initialize, -1);
 
@@ -7660,6 +5934,7 @@ Init_IO(void)
     rb_define_hooked_variable("$-0", &rb_rs, 0, rb_str_setter);
     rb_define_hooked_variable("$\\", &rb_output_rs, 0, rb_str_setter);
 
+    rb_define_hooked_variable("$.", &lineno, 0, lineno_setter);
     rb_define_virtual_variable("$_", rb_lastline_get, rb_lastline_set);
 
     rb_define_method(rb_cIO, "initialize_copy", rb_io_init_copy, 1);
@@ -7676,7 +5951,7 @@ Init_IO(void)
     rb_define_method(rb_cIO, "each_char",  rb_io_each_char, 0);
     rb_define_method(rb_cIO, "lines",  rb_io_lines, -1);
     rb_define_method(rb_cIO, "bytes",  rb_io_bytes, 0);
-    rb_define_method(rb_cIO, "chars",  rb_io_chars, 0);
+    rb_define_method(rb_cIO, "chars",  rb_io_each_char, 0);
 
     rb_define_method(rb_cIO, "syswrite", rb_io_syswrite, 1);
     rb_define_method(rb_cIO, "sysread",  rb_io_sysread, -1);
@@ -7702,9 +5977,9 @@ Init_IO(void)
     rb_define_method(rb_cIO, "gets",  rb_io_gets_m, -1);
     rb_define_method(rb_cIO, "readline",  rb_io_readline, -1);
     rb_define_method(rb_cIO, "getc",  rb_io_getc, 0);
-    rb_define_method(rb_cIO, "getbyte",  rb_io_getbyte, 0);
+    rb_define_method(rb_cIO, "getbyte",  rb_io_getc, 0);
     rb_define_method(rb_cIO, "readchar",  rb_io_readchar, 0);
-    rb_define_method(rb_cIO, "readbyte",  rb_io_readbyte, 0);
+    rb_define_method(rb_cIO, "readbyte",  rb_io_readchar, 0);
     rb_define_method(rb_cIO, "ungetc",rb_io_ungetc, 1);
     rb_define_method(rb_cIO, "<<",    rb_io_addstr, 1);
     rb_define_method(rb_cIO, "flush", rb_io_flush, 0);
@@ -7719,9 +5994,6 @@ Init_IO(void)
     rb_define_method(rb_cIO, "eof", rb_io_eof, 0);
     rb_define_method(rb_cIO, "eof?", rb_io_eof, 0);
 
-    rb_define_method(rb_cIO, "close_on_exec?", rb_io_close_on_exec_p, 0);
-    rb_define_method(rb_cIO, "close_on_exec=", rb_io_set_close_on_exec, 1);
-
     rb_define_method(rb_cIO, "close", rb_io_close_m, 0);
     rb_define_method(rb_cIO, "closed?", rb_io_closed, 0);
     rb_define_method(rb_cIO, "close_read", rb_io_close_read, 0);
@@ -7729,8 +6001,7 @@ Init_IO(void)
 
     rb_define_method(rb_cIO, "isatty", rb_io_isatty, 0);
     rb_define_method(rb_cIO, "tty?", rb_io_isatty, 0);
-    rb_define_method(rb_cIO, "binmode",  rb_io_binmode_m, 0);
-    rb_define_method(rb_cIO, "binmode?", rb_io_binmode_p, 0);
+    rb_define_method(rb_cIO, "binmode",  rb_io_binmode, 0);
     rb_define_method(rb_cIO, "sysseek", rb_io_sysseek, -1);
 
     rb_define_method(rb_cIO, "ioctl", rb_io_ioctl, -1);
@@ -7738,95 +6009,76 @@ Init_IO(void)
     rb_define_method(rb_cIO, "pid", rb_io_pid, 0);
     rb_define_method(rb_cIO, "inspect",  rb_io_inspect, 0);
 
-    rb_define_method(rb_cIO, "external_encoding", rb_io_external_encoding, 0);
-    rb_define_method(rb_cIO, "internal_encoding", rb_io_internal_encoding, 0);
-    rb_define_method(rb_cIO, "set_encoding", rb_io_set_encoding, -1);
-
     rb_define_variable("$stdin", &rb_stdin);
-    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO, "<STDIN>");
+    rb_stdin = prep_stdio(stdin, FMODE_READABLE, rb_cIO);
     rb_define_hooked_variable("$stdout", &rb_stdout, 0, stdout_setter);
-    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO, "<STDOUT>");
+    rb_stdout = prep_stdio(stdout, FMODE_WRITABLE, rb_cIO);
     rb_define_hooked_variable("$stderr", &rb_stderr, 0, stdout_setter);
-    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE|FMODE_SYNC, rb_cIO, "<STDERR>");
+    rb_stderr = prep_stdio(stderr, FMODE_WRITABLE, rb_cIO);
     rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
     orig_stdout = rb_stdout;
     rb_deferr = orig_stderr = rb_stderr;
 
+    /* variables to be removed in 1.8.1 */
+    rb_define_hooked_variable("$defout", &rb_stdout, 0, defout_setter);
+    rb_define_hooked_variable("$deferr", &rb_stderr, 0, deferr_setter);
+
     /* constants to hold original stdin/stdout/stderr */
     rb_define_global_const("STDIN", rb_stdin);
     rb_define_global_const("STDOUT", rb_stdout);
     rb_define_global_const("STDERR", rb_stderr);
 
-    rb_cARGF = rb_class_new(rb_cObject);
-    rb_set_class_path(rb_cARGF, rb_cObject, "ARGF.class");
-    rb_define_alloc_func(rb_cARGF, argf_alloc);
-
-    rb_include_module(rb_cARGF, rb_mEnumerable);
-
-    rb_define_method(rb_cARGF, "initialize", argf_initialize, -2);
-    rb_define_method(rb_cARGF, "initialize_copy", argf_initialize_copy, 1);
-    rb_define_method(rb_cARGF, "to_s", argf_to_s, 0);
-    rb_define_method(rb_cARGF, "argv", argf_argv, 0);
-
-    rb_define_method(rb_cARGF, "fileno", argf_fileno, 0);
-    rb_define_method(rb_cARGF, "to_i", argf_fileno, 0);
-    rb_define_method(rb_cARGF, "to_io", argf_to_io, 0);
-    rb_define_method(rb_cARGF, "each",  argf_each_line, -1);
-    rb_define_method(rb_cARGF, "each_line",  argf_each_line, -1);
-    rb_define_method(rb_cARGF, "each_byte",  argf_each_byte, 0);
-    rb_define_method(rb_cARGF, "each_char",  argf_each_char, 0);
-    rb_define_method(rb_cARGF, "lines", argf_each_line, -1);
-    rb_define_method(rb_cARGF, "bytes", argf_each_byte, 0);
-    rb_define_method(rb_cARGF, "chars", argf_each_char, 0);
-
-    rb_define_method(rb_cARGF, "read",  argf_read, -1);
-    rb_define_method(rb_cARGF, "readpartial",  argf_readpartial, -1);
-    rb_define_method(rb_cARGF, "readlines", argf_readlines, -1);
-    rb_define_method(rb_cARGF, "to_a", argf_readlines, -1);
-    rb_define_method(rb_cARGF, "gets", argf_gets, -1);
-    rb_define_method(rb_cARGF, "readline", argf_readline, -1);
-    rb_define_method(rb_cARGF, "getc", argf_getc, 0);
-    rb_define_method(rb_cARGF, "getbyte", argf_getbyte, 0);
-    rb_define_method(rb_cARGF, "readchar", argf_readchar, 0);
-    rb_define_method(rb_cARGF, "readbyte", argf_readbyte, 0);
-    rb_define_method(rb_cARGF, "tell", argf_tell, 0);
-    rb_define_method(rb_cARGF, "seek", argf_seek_m, -1);
-    rb_define_method(rb_cARGF, "rewind", argf_rewind, 0);
-    rb_define_method(rb_cARGF, "pos", argf_tell, 0);
-    rb_define_method(rb_cARGF, "pos=", argf_set_pos, 1);
-    rb_define_method(rb_cARGF, "eof", argf_eof, 0);
-    rb_define_method(rb_cARGF, "eof?", argf_eof, 0);
-    rb_define_method(rb_cARGF, "binmode", argf_binmode_m, 0);
-    rb_define_method(rb_cARGF, "binmode?", argf_binmode_p, 0);
-
-    rb_define_method(rb_cARGF, "filename", argf_filename, 0);
-    rb_define_method(rb_cARGF, "path", argf_filename, 0);
-    rb_define_method(rb_cARGF, "file", argf_file, 0);
-    rb_define_method(rb_cARGF, "skip", argf_skip, 0);
-    rb_define_method(rb_cARGF, "close", argf_close_m, 0);
-    rb_define_method(rb_cARGF, "closed?", argf_closed, 0);
-
-    rb_define_method(rb_cARGF, "lineno",   argf_lineno, 0);
-    rb_define_method(rb_cARGF, "lineno=",  argf_set_lineno, 1);
-
-    rb_define_method(rb_cARGF, "inplace_mode", argf_inplace_mode_get, 0);
-    rb_define_method(rb_cARGF, "inplace_mode=", argf_inplace_mode_set, 1);
-
-    rb_define_method(rb_cARGF, "external_encoding", argf_external_encoding, 0);
-    rb_define_method(rb_cARGF, "internal_encoding", argf_internal_encoding, 0);
-    rb_define_method(rb_cARGF, "set_encoding", argf_set_encoding, -1);
-
-    argf = rb_class_new_instance(0, 0, rb_cARGF);
-
     rb_define_readonly_variable("$<", &argf);
+    argf = rb_obj_alloc(rb_cObject);
+    rb_extend_object(argf, rb_mEnumerable);
     rb_define_global_const("ARGF", argf);
 
-    rb_define_hooked_variable("$.", &argf, argf_lineno_getter, argf_lineno_setter);
-    rb_define_hooked_variable("$FILENAME", &argf, argf_filename_getter, 0);
+    rb_define_singleton_method(argf, "to_s", argf_to_s, 0);
+
+    rb_define_singleton_method(argf, "fileno", argf_fileno, 0);
+    rb_define_singleton_method(argf, "to_i", argf_fileno, 0);
+    rb_define_singleton_method(argf, "to_io", argf_to_io, 0);
+    rb_define_singleton_method(argf, "each",  argf_each_line, -1);
+    rb_define_singleton_method(argf, "each_line",  argf_each_line, -1);
+    rb_define_singleton_method(argf, "each_byte",  argf_each_byte, 0);
+    rb_define_singleton_method(argf, "each_char",  argf_each_char, 0);
+    rb_define_singleton_method(argf, "lines",  argf_each_line, -1);
+    rb_define_singleton_method(argf, "bytes",  argf_each_byte, 0);
+    rb_define_singleton_method(argf, "chars",  argf_each_char, 0);
+
+    rb_define_singleton_method(argf, "read",  argf_read, -1);
+    rb_define_singleton_method(argf, "readlines", rb_f_readlines, -1);
+    rb_define_singleton_method(argf, "to_a", rb_f_readlines, -1);
+    rb_define_singleton_method(argf, "gets", rb_f_gets, -1);
+    rb_define_singleton_method(argf, "readline", rb_f_readline, -1);
+    rb_define_singleton_method(argf, "getc", argf_getc, 0);
+    rb_define_singleton_method(argf, "getbyte", argf_getc, 0);
+    rb_define_singleton_method(argf, "readchar", argf_readchar, 0);
+    rb_define_singleton_method(argf, "readbyte", argf_readchar, 0);
+    rb_define_singleton_method(argf, "tell", argf_tell, 0);
+    rb_define_singleton_method(argf, "seek", argf_seek_m, -1);
+    rb_define_singleton_method(argf, "rewind", argf_rewind, 0);
+    rb_define_singleton_method(argf, "pos", argf_tell, 0);
+    rb_define_singleton_method(argf, "pos=", argf_set_pos, 1);
+    rb_define_singleton_method(argf, "eof", argf_eof, 0);
+    rb_define_singleton_method(argf, "eof?", argf_eof, 0);
+    rb_define_singleton_method(argf, "binmode", argf_binmode, 0);
+
+    rb_define_singleton_method(argf, "filename", argf_filename, 0);
+    rb_define_singleton_method(argf, "path", argf_filename, 0);
+    rb_define_singleton_method(argf, "file", argf_file, 0);
+    rb_define_singleton_method(argf, "skip", argf_skip, 0);
+    rb_define_singleton_method(argf, "close", argf_close_m, 0);
+    rb_define_singleton_method(argf, "closed?", argf_closed, 0);
+
+    rb_define_singleton_method(argf, "lineno",   argf_lineno, 0);
+    rb_define_singleton_method(argf, "lineno=",  argf_set_lineno, 1);
+
+    rb_global_variable(&current_file);
+    rb_define_readonly_variable("$FILENAME", &filename);
     filename = rb_str_new2("-");
 
-    rb_define_hooked_variable("$-i", &argf, opt_i_get, opt_i_set);
-    rb_define_hooked_variable("$*", &argf, argf_argv_getter, 0);
+    rb_define_virtual_variable("$-i", opt_i_get, opt_i_set);
 
 #if defined (_WIN32) || defined(DJGPP) || defined(__CYGWIN__) || defined(__human68k__)
     atexit(pipe_atexit);
@@ -7855,17 +6107,8 @@ Init_IO(void)
 #endif
 #ifdef O_BINARY
     rb_file_const("BINARY", INT2FIX(O_BINARY));
-#else
-    rb_file_const("BINARY", INT2FIX(0));
 #endif
 #ifdef O_SYNC
     rb_file_const("SYNC", INT2FIX(O_SYNC));
 #endif
-
-    sym_mode = ID2SYM(rb_intern("mode"));
-    sym_perm = ID2SYM(rb_intern("perm"));
-    sym_extenc = ID2SYM(rb_intern("external_encoding"));
-    sym_intenc = ID2SYM(rb_intern("internal_encoding"));
-    sym_encoding = ID2SYM(rb_intern("encoding"));
-    sym_open_args = ID2SYM(rb_intern("open_args"));
 }
diff --git a/iseq.c b/iseq.c
deleted file mode 100644
index 29b331d97f..0000000000
--- a/iseq.c
+++ /dev/null
@@ -1,1309 +0,0 @@
-/**********************************************************************
-
-  iseq.c -
-
-  $Author$
-  created at: 2006-07-11(Tue) 09:00:03 +0900
-
-  Copyright (C) 2006 Koichi Sasada
-
-**********************************************************************/
-
-#include "ruby/ruby.h"
-#include "ruby/node.h"
-
-/* #define MARK_FREE_DEBUG 1 */
-#include "gc.h"
-#include "vm_core.h"
-
-#include "insns.inc"
-#include "insns_info.inc"
-
-/* compile.c */
-void iseq_compile(VALUE self, NODE *node);
-int iseq_translate_threaded_code(rb_iseq_t *iseq);
-
-VALUE rb_cISeq;
-
-static void
-compile_data_free(struct iseq_compile_data *compile_data)
-{
-    if (compile_data) {
-	struct iseq_compile_data_storage *cur, *next;
-	cur = compile_data->storage_head;
-	while (cur) {
-	    next = cur->next;
-	    ruby_xfree(cur);
-	    cur = next;
-	}
-	ruby_xfree(compile_data);
-    }
-}
-
-static void
-iseq_free(void *ptr)
-{
-    rb_iseq_t *iseq;
-    RUBY_FREE_ENTER("iseq");
-
-    if (ptr) {
-	iseq = ptr;
-	/* It's possible that strings are freed
-         * GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name),
-         *                      RSTRING_PTR(iseq->filename));
-	 */
-	if (iseq->iseq != iseq->iseq_encoded) {
-	    RUBY_FREE_UNLESS_NULL(iseq->iseq_encoded);
-	}
-
-	RUBY_FREE_UNLESS_NULL(iseq->iseq);
-	RUBY_FREE_UNLESS_NULL(iseq->insn_info_table);
-	RUBY_FREE_UNLESS_NULL(iseq->local_table);
-	RUBY_FREE_UNLESS_NULL(iseq->catch_table);
-	RUBY_FREE_UNLESS_NULL(iseq->arg_opt_table);
-	compile_data_free(iseq->compile_data);
-	ruby_xfree(ptr);
-    }
-    RUBY_FREE_LEAVE("iseq");
-}
-
-static void
-iseq_mark(void *ptr)
-{
-    rb_iseq_t *iseq;
-    RUBY_MARK_ENTER("iseq");
-
-    if (ptr) {
-	iseq = ptr;
-	RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
-	RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
-	RUBY_MARK_UNLESS_NULL(iseq->name);
-	RUBY_MARK_UNLESS_NULL(iseq->filename);
-	RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack);
-	RUBY_MARK_UNLESS_NULL(iseq->klass);
-	RUBY_MARK_UNLESS_NULL(iseq->coverage);
-/* 	RUBY_MARK_UNLESS_NULL((VALUE)iseq->node); */
-/*	RUBY_MARK_UNLESS_NULL(iseq->cached_special_block); */
-
-	if (iseq->compile_data != 0) {
-	    RUBY_MARK_UNLESS_NULL(iseq->compile_data->mark_ary);
-	    RUBY_MARK_UNLESS_NULL(iseq->compile_data->err_info);
-	    RUBY_MARK_UNLESS_NULL(iseq->compile_data->catch_table_ary);
-	}
-    }
-    RUBY_MARK_LEAVE("iseq");
-}
-
-static VALUE
-iseq_alloc(VALUE klass)
-{
-    VALUE volatile obj;
-    rb_iseq_t *iseq;
-
-    obj = Data_Make_Struct(klass, rb_iseq_t, iseq_mark, iseq_free, iseq);
-    MEMZERO(iseq, rb_iseq_t, 1);
-    return obj;
-}
-
-static void
-set_relation(rb_iseq_t *iseq, const VALUE parent)
-{
-    const int type = iseq->type;
-    rb_thread_t *th = GET_THREAD();
-
-    /* set class nest stack */
-    if (type == ISEQ_TYPE_TOP) {
-	/* toplevel is private */
-	iseq->cref_stack = NEW_BLOCK(th->top_wrapper ? th->top_wrapper : rb_cObject);
-	iseq->cref_stack->nd_file = 0;
-	iseq->cref_stack->nd_visi = NOEX_PRIVATE;
-    }
-    else if (type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
-	iseq->cref_stack = NEW_BLOCK(0); /* place holder */
-	iseq->cref_stack->nd_file = 0;
-    }
-    else if (RTEST(parent)) {
-	rb_iseq_t *piseq;
-	GetISeqPtr(parent, piseq);
-	iseq->cref_stack = piseq->cref_stack;
-    }
-
-    if (type == ISEQ_TYPE_TOP ||
-	type == ISEQ_TYPE_METHOD || type == ISEQ_TYPE_CLASS) {
-	iseq->local_iseq = iseq;
-    }
-    else if (RTEST(parent)) {
-	rb_iseq_t *piseq;
-	GetISeqPtr(parent, piseq);
-	iseq->local_iseq = piseq->local_iseq;
-    }
-
-    if (RTEST(parent)) {
-	rb_iseq_t *piseq;
-	GetISeqPtr(parent, piseq);
-	iseq->parent_iseq = piseq;
-    }
-}
-
-static VALUE
-prepare_iseq_build(rb_iseq_t *iseq,
-		   VALUE name, VALUE filename,
-		   VALUE parent, VALUE type, VALUE block_opt,
-		   const rb_compile_option_t *option)
-{
-    OBJ_FREEZE(name);
-    OBJ_FREEZE(filename);
-
-    iseq->name = name;
-    iseq->filename = filename;
-    iseq->defined_method_id = 0;
-    iseq->mark_ary = rb_ary_new();
-    RBASIC(iseq->mark_ary)->klass = 0;
-
-    iseq->type = type;
-    iseq->arg_rest = -1;
-    iseq->arg_block = -1;
-    iseq->klass = 0;
-
-    /*
-     * iseq->special_block_builder = GC_GUARDED_PTR_REF(block_opt);
-     * iseq->cached_special_block_builder = 0;
-     * iseq->cached_special_block = 0;
-     */
-
-    iseq->compile_data = ALLOC(struct iseq_compile_data);
-    MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
-    iseq->compile_data->mark_ary = rb_ary_new();
-    RBASIC(iseq->compile_data->mark_ary)->klass = 0;
-
-    iseq->compile_data->storage_head = iseq->compile_data->storage_current =
-      (struct iseq_compile_data_storage *)
-	ALLOC_N(char, INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE +
-		sizeof(struct iseq_compile_data_storage));
-
-    iseq->compile_data->catch_table_ary = rb_ary_new();
-    iseq->compile_data->storage_head->pos = 0;
-    iseq->compile_data->storage_head->next = 0;
-    iseq->compile_data->storage_head->size =
-      INITIAL_ISEQ_COMPILE_DATA_STORAGE_BUFF_SIZE;
-    iseq->compile_data->storage_head->buff =
-      (char *)(&iseq->compile_data->storage_head->buff + 1);
-    iseq->compile_data->option = option;
-
-    set_relation(iseq, parent);
-
-    iseq->coverage = Qfalse;
-    if (!GET_THREAD()->parse_in_eval) {
-	extern VALUE rb_get_coverages(void);
-	VALUE coverages = rb_get_coverages();
-	if (RTEST(coverages)) {
-	    iseq->coverage = rb_hash_lookup(coverages, filename);
-	    if (NIL_P(iseq->coverage)) iseq->coverage = Qfalse;
-	}
-    }
-
-    return Qtrue;
-}
-
-static VALUE
-cleanup_iseq_build(rb_iseq_t *iseq)
-{
-    struct iseq_compile_data *data = iseq->compile_data;
-    VALUE err = data->err_info;
-    iseq->compile_data = 0;
-    compile_data_free(data);
-
-    if (RTEST(err)) {
-	rb_funcall2(err, rb_intern("set_backtrace"), 1, &iseq->filename);
-	rb_exc_raise(err);
-    }
-    return Qtrue;
-}
-
-static rb_compile_option_t COMPILE_OPTION_DEFAULT = {
-    OPT_INLINE_CONST_CACHE, /* int inline_const_cache; */
-    OPT_PEEPHOLE_OPTIMIZATION, /* int peephole_optimization; */
-    OPT_TAILCALL_OPTIMIZATION, /* int tailcall_optimization */
-    OPT_SPECIALISED_INSTRUCTION, /* int specialized_instruction; */
-    OPT_OPERANDS_UNIFICATION, /* int operands_unification; */
-    OPT_INSTRUCTIONS_UNIFICATION, /* int instructions_unification; */
-    OPT_STACK_CACHING, /* int stack_caching; */
-    OPT_TRACE_INSTRUCTION, /* int trace_instruction */
-};
-static const rb_compile_option_t COMPILE_OPTION_FALSE = {0};
-
-static void
-make_compile_option(rb_compile_option_t *option, VALUE opt)
-{
-    if (opt == Qnil) {
-	*option = COMPILE_OPTION_DEFAULT;
-    }
-    else if (opt == Qfalse) {
-	*option = COMPILE_OPTION_FALSE;
-    }
-    else if (opt == Qtrue) {
-	memset(option, 1, sizeof(rb_compile_option_t));
-    }
-    else if (CLASS_OF(opt) == rb_cHash) {
-	*option = COMPILE_OPTION_DEFAULT;
-
-#define SET_COMPILE_OPTION(o, h, mem) \
-  { VALUE flag = rb_hash_aref(h, ID2SYM(rb_intern(#mem))); \
-      if (flag == Qtrue)  { o->mem = 1; } \
-      else if (flag == Qfalse)  { o->mem = 0; } \
-  }
-#define SET_COMPILE_OPTION_NUM(o, h, mem) \
-  { VALUE num = rb_hash_aref(opt, ID2SYM(rb_intern(#mem))); \
-      if (!NIL_P(num)) o->mem = NUM2INT(num); \
-  }
-	SET_COMPILE_OPTION(option, opt, inline_const_cache);
-	SET_COMPILE_OPTION(option, opt, peephole_optimization);
-	SET_COMPILE_OPTION(option, opt, tailcall_optimization);
-	SET_COMPILE_OPTION(option, opt, specialized_instruction);
-	SET_COMPILE_OPTION(option, opt, operands_unification);
-	SET_COMPILE_OPTION(option, opt, instructions_unification);
-	SET_COMPILE_OPTION(option, opt, stack_caching);
-	SET_COMPILE_OPTION(option, opt, trace_instruction);
-	SET_COMPILE_OPTION_NUM(option, opt, debug_level);
-#undef SET_COMPILE_OPTION
-#undef SET_COMPILE_OPTION_NUM
-    }
-    else {
-	rb_raise(rb_eTypeError, "Compile option must be Hash/true/false/nil");
-    }
-}
-
-static VALUE
-make_compile_option_value(rb_compile_option_t *option)
-{
-    VALUE opt = rb_hash_new();
-#define SET_COMPILE_OPTION(o, h, mem) \
-  rb_hash_aset(h, ID2SYM(rb_intern(#mem)), o->mem ? Qtrue : Qfalse)
-#define SET_COMPILE_OPTION_NUM(o, h, mem) \
-  rb_hash_aset(h, ID2SYM(rb_intern(#mem)), INT2NUM(o->mem))
-    {
-	SET_COMPILE_OPTION(option, opt, inline_const_cache);
-	SET_COMPILE_OPTION(option, opt, peephole_optimization);
-	SET_COMPILE_OPTION(option, opt, tailcall_optimization);
-	SET_COMPILE_OPTION(option, opt, specialized_instruction);
-	SET_COMPILE_OPTION(option, opt, operands_unification);
-	SET_COMPILE_OPTION(option, opt, instructions_unification);
-	SET_COMPILE_OPTION(option, opt, stack_caching);
-	SET_COMPILE_OPTION_NUM(option, opt, debug_level);
-    }
-#undef SET_COMPILE_OPTION
-#undef SET_COMPILE_OPTION_NUM
-    return opt;
-}
-
-VALUE
-rb_iseq_new(NODE *node, VALUE name, VALUE filename,
-	      VALUE parent, VALUE type)
-{
-    return rb_iseq_new_with_opt(node, name, filename, parent, type,
-				&COMPILE_OPTION_DEFAULT);
-}
-
-static VALUE
-rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename,
-				VALUE parent, VALUE type, VALUE bopt,
-				const rb_compile_option_t *option)
-{
-    rb_iseq_t *iseq;
-    VALUE self = iseq_alloc(rb_cISeq);
-
-    GetISeqPtr(self, iseq);
-    iseq->self = self;
-
-    prepare_iseq_build(iseq, name, filename, parent, type, bopt, option);
-    iseq_compile(self, node);
-    cleanup_iseq_build(iseq);
-    return self;
-}
-
-VALUE
-rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename,
-		     VALUE parent, VALUE type,
-		     const rb_compile_option_t *option)
-{
-    return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type,
-					   Qfalse, option);
-}
-
-VALUE
-rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename,
-		       VALUE parent, VALUE type, VALUE bopt)
-{
-    return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type,
-					   bopt, &COMPILE_OPTION_DEFAULT);
-}
-
-VALUE iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
-			  VALUE exception, VALUE body);
-
-#define CHECK_ARRAY(v)   rb_convert_type(v, T_ARRAY, "Array", "to_ary")
-#define CHECK_STRING(v)  rb_convert_type(v, T_STRING, "String", "to_str")
-#define CHECK_SYMBOL(v)  rb_convert_type(v, T_SYMBOL, "Symbol", "to_sym")
-static inline VALUE CHECK_INTEGER(VALUE v) {NUM2LONG(v); return v;}
-VALUE
-iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
-{
-    VALUE iseqval = iseq_alloc(rb_cISeq);
-
-    VALUE magic, version1, version2, format_type, misc;
-    VALUE name, filename;
-    VALUE type, body, locals, args, exception;
-
-    VALUE iseq_type;
-    struct st_table *type_map = 0;
-    rb_iseq_t *iseq;
-    rb_compile_option_t option;
-    int i = 0;
-
-    /* [magic, major_version, minor_version, format_type, misc,
-     *  name, filename,
-     *  type, locals, args, exception_table, body]
-     */
-
-    data        = CHECK_ARRAY(data);
-
-    magic       = CHECK_STRING(rb_ary_entry(data, i++));
-    version1    = CHECK_INTEGER(rb_ary_entry(data, i++));
-    version2    = CHECK_INTEGER(rb_ary_entry(data, i++));
-    format_type = CHECK_INTEGER(rb_ary_entry(data, i++));
-    misc        = rb_ary_entry(data, i++); /* TODO */
-
-    name        = CHECK_STRING(rb_ary_entry(data, i++));
-    filename    = CHECK_STRING(rb_ary_entry(data, i++));
-
-    type        = CHECK_SYMBOL(rb_ary_entry(data, i++));
-    locals      = CHECK_ARRAY(rb_ary_entry(data, i++));
-
-    args        = rb_ary_entry(data, i++);
-    if (FIXNUM_P(args) || (args = CHECK_ARRAY(args))) {
-	/* */
-    }
-
-    exception   = CHECK_ARRAY(rb_ary_entry(data, i++));
-    body        = CHECK_ARRAY(rb_ary_entry(data, i++));
-
-    GetISeqPtr(iseqval, iseq);
-    iseq->self = iseqval;
-
-    if (type_map == 0) {
-	type_map = st_init_numtable();
-	st_insert(type_map, ID2SYM(rb_intern("top")), ISEQ_TYPE_TOP);
-	st_insert(type_map, ID2SYM(rb_intern("method")), ISEQ_TYPE_METHOD);
-	st_insert(type_map, ID2SYM(rb_intern("block")), ISEQ_TYPE_BLOCK);
-	st_insert(type_map, ID2SYM(rb_intern("class")), ISEQ_TYPE_CLASS);
-	st_insert(type_map, ID2SYM(rb_intern("rescue")), ISEQ_TYPE_RESCUE);
-	st_insert(type_map, ID2SYM(rb_intern("ensure")), ISEQ_TYPE_ENSURE);
-	st_insert(type_map, ID2SYM(rb_intern("eval")), ISEQ_TYPE_EVAL);
-	st_insert(type_map, ID2SYM(rb_intern("defined_guard")), ISEQ_TYPE_DEFINED_GUARD);
-    }
-
-    if (st_lookup(type_map, type, &iseq_type) == 0) {
-	const char *typename = rb_id2name(type);
-	if (typename)
-	    rb_raise(rb_eTypeError, "unsupport type: :%s", typename);
-	else
-	    rb_raise(rb_eTypeError, "unsupport type: %p", (void *)type);
-    }
-
-    if (parent == Qnil) {
-	parent = 0;
-    }
-
-    make_compile_option(&option, opt);
-    prepare_iseq_build(iseq, name, filename,
-		       parent, iseq_type, 0, &option);
-
-    iseq_build_from_ary(iseq, locals, args, exception, body);
-
-    cleanup_iseq_build(iseq);
-    return iseqval;
-}
-
-static VALUE
-iseq_s_load(int argc, VALUE *argv, VALUE self)
-{
-    VALUE data, opt=Qnil;
-    rb_scan_args(argc, argv, "11", &data, &opt);
-
-    return iseq_load(self, data, 0, opt);
-}
-
-static NODE *
-compile_string(VALUE str, VALUE file, VALUE line)
-{
-    VALUE parser = rb_parser_new();
-    NODE *node = rb_parser_compile_string(parser, StringValueCStr(file),
-					  str, NUM2INT(line));
-
-    if (!node) {
-	rb_exc_raise(GET_THREAD()->errinfo);	/* TODO: check err */
-    }
-    return node;
-}
-
-VALUE
-rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt)
-{
-    rb_compile_option_t option;
-    NODE *node = compile_string(StringValue(src), file, line);
-    rb_thread_t *th = GET_THREAD();
-    make_compile_option(&option, opt);
-
-    if (th->base_block && th->base_block->iseq) {
-	return rb_iseq_new_with_opt(node, th->base_block->iseq->name,
-				    file, th->base_block->iseq->self,
-				    ISEQ_TYPE_EVAL, &option);
-    }
-    else {
-	return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, Qfalse,
-				    ISEQ_TYPE_TOP, &option);
-    }
-}
-
-VALUE
-rb_iseq_compile(VALUE src, VALUE file, VALUE line)
-{
-    return rb_iseq_compile_with_option(src, file, line, Qnil);
-}
-
-static VALUE
-iseq_s_compile(int argc, VALUE *argv, VALUE self)
-{
-    VALUE src, file = Qnil, line = INT2FIX(1), opt = Qnil;
-
-    rb_secure(1);
-
-    rb_scan_args(argc, argv, "13", &src, &file, &line, &opt);
-    file = file == Qnil ? rb_str_new2("<compiled>") : file;
-    line = line == Qnil ? INT2FIX(1) : line;
-
-    return rb_iseq_compile_with_option(src, file, line, opt);
-}
-
-static VALUE
-iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
-{
-    VALUE file, line = INT2FIX(1), opt = Qnil;
-    VALUE parser;
-    VALUE f;
-    NODE *node;
-    const char *fname;
-    rb_compile_option_t option;
-
-    rb_secure(1);
-    rb_scan_args(argc, argv, "11", &file, &opt);
-    fname = StringValueCStr(file);
-
-    f = rb_file_open(fname, "r");
-
-    parser = rb_parser_new();
-    node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
-    make_compile_option(&option, opt);
-    return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, Qfalse,
-				ISEQ_TYPE_TOP, &option);
-}
-
-static VALUE
-iseq_s_compile_option_set(VALUE self, VALUE opt)
-{
-    rb_compile_option_t option;
-    rb_secure(1);
-    make_compile_option(&option, opt);
-    COMPILE_OPTION_DEFAULT = option;
-    return opt;
-}
-
-static VALUE
-iseq_s_compile_option_get(VALUE self)
-{
-    return make_compile_option_value(&COMPILE_OPTION_DEFAULT);
-}
-
-static rb_iseq_t *
-iseq_check(VALUE val)
-{
-    rb_iseq_t *iseq;
-    GetISeqPtr(val, iseq);
-    if (!iseq->name) {
-	rb_raise(rb_eTypeError, "uninitialized InstructionSequence");
-    }
-    return iseq;
-}
-
-static VALUE
-iseq_eval(VALUE self)
-{
-    rb_secure(1);
-    return rb_iseq_eval(self);
-}
-
-static VALUE
-iseq_inspect(VALUE self)
-{
-    rb_iseq_t *iseq = iseq_check(self);
-
-    return rb_sprintf("<ISeq:%s@%s>",
-		      RSTRING_PTR(iseq->name), RSTRING_PTR(iseq->filename));
-}
-
-VALUE iseq_data_to_ary(rb_iseq_t *iseq);
-
-static VALUE
-iseq_to_a(VALUE self)
-{
-    rb_iseq_t *iseq = iseq_check(self);
-    rb_secure(1);
-    return iseq_data_to_ary(iseq);
-}
-
-/* TODO: search algorithm is brute force.
-         this should be binary search or so. */
-
-static struct iseq_insn_info_entry *
-get_insn_info(const rb_iseq_t *iseq, const unsigned long pos)
-{
-    unsigned long i, size = iseq->insn_info_size;
-    struct iseq_insn_info_entry *table = iseq->insn_info_table;
-
-    for (i = 0; i < size; i++) {
-	if (table[i].position == pos) {
-	    return &table[i];
-	}
-    }
-
-    return 0;
-}
-
-static unsigned short
-find_line_no(rb_iseq_t *iseq, unsigned long pos)
-{
-    struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
-    if (entry) {
-	return entry->line_no;
-    }
-    else {
-	return 0;
-    }
-}
-
-static unsigned short
-find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
-{
-    unsigned long i, size = iseqdat->insn_info_size;
-    struct iseq_insn_info_entry *iiary = iseqdat->insn_info_table;
-
-    for (i = 0; i < size; i++) {
-	if (iiary[i].position == pos) {
-	    if (i > 0) {
-		return iiary[i - 1].line_no;
-	    }
-	    else {
-		return 0;
-	    }
-	}
-    }
-
-    return 0;
-}
-
-static VALUE
-insn_operand_intern(rb_iseq_t *iseq,
-		    int insn, int op_no, VALUE op,
-		    int len, int pos, VALUE *pnop, VALUE child)
-{
-    const char *types = insn_op_types(insn);
-    char type = types[op_no];
-    VALUE ret;
-
-    switch (type) {
-      case TS_OFFSET:		/* LONG */
-	ret = rb_sprintf("%ld", pos + len + op);
-	break;
-
-      case TS_NUM:		/* ULONG */
-	ret = rb_sprintf("%lu", op);
-	break;
-
-      case TS_LINDEX:
-	{
-	    rb_iseq_t *ip = iseq->local_iseq;
-	    int lidx = ip->local_size - op;
-	    const char *name = rb_id2name(ip->local_table[lidx]);
-
-	    if (name) {
-		ret = rb_str_new2(name);
-	    }
-	    else {
-		ret = rb_str_new2("*");
-	    }
-	    break;
-	}
-      case TS_DINDEX:{
-	if (insn == BIN(getdynamic) || insn == BIN(setdynamic)) {
-	    rb_iseq_t *ip = iseq;
-	    int level = *pnop, i;
-	    const char *name;
-	    for (i = 0; i < level; i++) {
-		ip = ip->parent_iseq;
-	    }
-	    name = rb_id2name(ip->local_table[ip->local_size - op]);
-
-	    if (!name) {
-		name = "*";
-	    }
-	    ret = rb_str_new2(name);
-	}
-	else {
-	    ret = rb_inspect(INT2FIX(op));
-	}
-	break;
-      }
-      case TS_ID:		/* ID (symbol) */
-	op = ID2SYM(op);
-
-      case TS_VALUE:		/* VALUE */
-	ret = rb_inspect(op);
-	if (CLASS_OF(op) == rb_cISeq) {
-	    rb_ary_push(child, op);
-	}
-	break;
-
-      case TS_ISEQ:		/* iseq */
-	{
-	    rb_iseq_t *iseq = (rb_iseq_t *)op;
-	    if (iseq) {
-		ret = iseq->name;
-		if (child) {
-		    rb_ary_push(child, iseq->self);
-		}
-	    }
-	    else {
-		ret = rb_str_new2("nil");
-	    }
-	    break;
-	}
-      case TS_GENTRY:
-	{
-	    struct global_entry *entry = (struct global_entry *)op;
-	    ret = rb_str_dup(rb_id2str(entry->id));
-	}
-	break;
-
-      case TS_IC:
-	ret = rb_str_new2("<ic>");
-	break;
-
-      case TS_CDHASH:
-	ret = rb_str_new2("<cdhash>");
-	break;
-
-      case TS_FUNCPTR:
-	ret = rb_str_new2("<funcptr>");
-	break;
-
-      default:
-	rb_bug("ruby_iseq_disasm: unknown operand type: %c", type);
-    }
-    return ret;
-}
-
-/**
- * Disassemble a instruction
- * Iseq -> Iseq inspect object
- */
-VALUE
-ruby_iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos,
-		      rb_iseq_t *iseqdat, VALUE child)
-{
-    int insn = iseq[pos];
-    int len = insn_len(insn);
-    int j;
-    const char *types = insn_op_types(insn);
-    VALUE str = rb_str_new(0, 0);
-    const char *insn_name_buff;
-
-    insn_name_buff = insn_name(insn);
-    if (1) {
-	rb_str_catf(str, "%04d %-16s ", pos, insn_name_buff);
-    }
-    else {
-	rb_str_catf(str, "%04d %-16.*s ", pos,
-		    strcspn(insn_name_buff, "_"), insn_name_buff);
-    }
-
-    for (j = 0; types[j]; j++) {
-	const char *types = insn_op_types(insn);
-	VALUE opstr = insn_operand_intern(iseqdat, insn, j, iseq[pos + j + 1],
-					  len, pos, &iseq[pos + j + 2],
-					  child);
-	rb_str_concat(str, opstr);
-
-	if (types[j + 1]) {
-	    rb_str_cat2(str, ", ");
-	}
-    }
-
-    if (1) {
-	int line_no = find_line_no(iseqdat, pos);
-	int prev = find_prev_line_no(iseqdat, pos);
-	if (line_no && line_no != prev) {
-	    long slen = RSTRING_LEN(str);
-	    slen = (slen > 70) ? 0 : (70 - slen);
-	    str = rb_str_catf(str, "%*s(%4d)", (int)slen, "", line_no);
-	}
-    }
-    else {
-	/* for debug */
-	struct iseq_insn_info_entry *entry = get_insn_info(iseqdat, pos);
-	long slen = RSTRING_LEN(str);
-	slen = (slen > 60) ? 0 : (60 - slen);
-	str = rb_str_catf(str, "%*s(line: %d, sp: %d)",
-			  (int)slen, "", entry->line_no, entry->sp);
-    }
-
-    if (ret) {
-	rb_str_cat2(str, "\n");
-	rb_str_concat(ret, str);
-    }
-    else {
-	printf("%s\n", RSTRING_PTR(str));
-    }
-    return len;
-}
-
-static const char *
-catch_type(int type)
-{
-    switch (type) {
-      case CATCH_TYPE_RESCUE:
-	return "rescue";
-      case CATCH_TYPE_ENSURE:
-	return "ensure";
-      case CATCH_TYPE_RETRY:
-	return "retry";
-      case CATCH_TYPE_BREAK:
-	return "break";
-      case CATCH_TYPE_REDO:
-	return "redo";
-      case CATCH_TYPE_NEXT:
-	return "next";
-      default:
-	rb_bug("unknown catch type (%d)", type);
-	return 0;
-    }
-}
-
-VALUE
-ruby_iseq_disasm(VALUE self)
-{
-    rb_iseq_t *iseqdat = iseq_check(self);
-    VALUE *iseq;
-    VALUE str = rb_str_new(0, 0);
-    VALUE child = rb_ary_new();
-    unsigned long size;
-    int i;
-    ID *tbl;
-    enum {header_minlen = 72};
-
-    rb_secure(1);
-
-    iseq = iseqdat->iseq;
-    size = iseqdat->iseq_size;
-
-    rb_str_cat2(str, "== disasm: ");
-
-    rb_str_concat(str, iseq_inspect(iseqdat->self));
-    if ((i = RSTRING_LEN(str)) < header_minlen) {
-	rb_str_resize(str, header_minlen);
-	memset(RSTRING_PTR(str) + i, '=', header_minlen - i);
-    }
-    rb_str_cat2(str, "\n");
-
-    /* show catch table information */
-    if (iseqdat->catch_table_size != 0) {
-	rb_str_cat2(str, "== catch table\n");
-    }
-    for (i = 0; i < iseqdat->catch_table_size; i++) {
-	struct iseq_catch_table_entry *entry = &iseqdat->catch_table[i];
-	rb_str_catf(str,
-		    "| catch type: %-6s st: %04d ed: %04d sp: %04d cont: %04d\n",
-		    catch_type((int)entry->type), (int)entry->start,
-		    (int)entry->end, (int)entry->sp, (int)entry->cont);
-	if (entry->iseq) {
-	    rb_str_concat(str, ruby_iseq_disasm(entry->iseq));
-	}
-    }
-    if (iseqdat->catch_table_size != 0) {
-	rb_str_cat2(str, "|-------------------------------------"
-		    "-----------------------------------\n");
-    }
-
-    /* show local table information */
-    tbl = iseqdat->local_table;
-
-    if (tbl) {
-	rb_str_catf(str,
-		    "local table (size: %d, argc: %d "
-		    "[opts: %d, rest: %d, post: %d, block: %d] s%d)\n",
-		    iseqdat->local_size, iseqdat->argc,
-		    iseqdat->arg_opts, iseqdat->arg_rest,
-		    iseqdat->arg_post_len, iseqdat->arg_block,
-		    iseqdat->arg_simple);
-
-	for (i = 0; i < iseqdat->local_table_size; i++) {
-	    const char *name = rb_id2name(tbl[i]);
-	    char info[0x100];
-	    char argi[0x100] = "";
-	    char opti[0x100] = "";
-
-	    if (iseqdat->arg_opts) {
-		int argc = iseqdat->argc;
-		int opts = iseqdat->arg_opts;
-		if (i >= argc && i < argc + opts - 1) {
-		    snprintf(opti, sizeof(opti), "Opt=%ld",
-			     iseqdat->arg_opt_table[i - argc]);
-		}
-	    }
-
-	    snprintf(argi, sizeof(argi), "%s%s%s%s%s",	/* arg, opts, rest, post  block */
-		     iseqdat->argc > i ? "Arg" : "",
-		     opti,
-		     iseqdat->arg_rest == i ? "Rest" : "",
-		     (iseqdat->arg_post_start <= i &&
-		      i < iseqdat->arg_post_start + iseqdat->arg_post_len) ? "Post" : "",
-		     iseqdat->arg_block == i ? "Block" : "");
-
-	    snprintf(info, sizeof(info), "%s%s%s%s", name ? name : "?",
-		     *argi ? "<" : "", argi, *argi ? ">" : "");
-
-	    rb_str_catf(str, "[%2d] %-11s", iseqdat->local_size - i, info);
-	}
-	rb_str_cat2(str, "\n");
-    }
-
-    /* show each line */
-    for (i = 0; i < size;) {
-	i += ruby_iseq_disasm_insn(str, iseq, i, iseqdat, child);
-    }
-
-    for (i = 0; i < RARRAY_LEN(child); i++) {
-	VALUE isv = rb_ary_entry(child, i);
-	rb_str_concat(str, ruby_iseq_disasm(isv));
-    }
-
-    return str;
-}
-
-static VALUE
-iseq_s_disasm(VALUE klass, VALUE body)
-{
-    extern NODE *rb_method_body(VALUE body);
-    NODE *node;
-    VALUE ret = Qnil;
-
-    rb_secure(1);
-
-    if ((node = rb_method_body(body)) != 0) {
-	if (nd_type(node) == RUBY_VM_METHOD_NODE) {
-	    VALUE iseqval = (VALUE)node->nd_body;
-	    ret = ruby_iseq_disasm(iseqval);
-	}
-    }
-
-    return ret;
-}
-
-const char *
-ruby_node_name(int node)
-{
-    switch (node) {
-#include "node_name.inc"
-      default:
-	rb_bug("unknown node (%d)", node);
-	return 0;
-    }
-}
-
-#define DECL_SYMBOL(name) \
-  static VALUE sym_##name
-
-#define INIT_SYMBOL(name) \
-  sym_##name = ID2SYM(rb_intern(#name))
-
-static VALUE
-register_label(struct st_table *table, int idx)
-{
-    VALUE sym;
-    char buff[8 + (sizeof(idx) * CHAR_BIT * 32 / 100)];
-
-    snprintf(buff, sizeof(buff), "label_%u", idx);
-    sym = ID2SYM(rb_intern(buff));
-    st_insert(table, idx, sym);
-    return sym;
-}
-
-static VALUE
-exception_type2symbol(VALUE type)
-{
-    ID id;
-    switch(type) {
-      case CATCH_TYPE_RESCUE: CONST_ID(id, "rescue"); break;
-      case CATCH_TYPE_ENSURE: CONST_ID(id, "ensure"); break;
-      case CATCH_TYPE_RETRY:  CONST_ID(id, "retry");  break;
-      case CATCH_TYPE_BREAK:  CONST_ID(id, "break");  break;
-      case CATCH_TYPE_REDO:   CONST_ID(id, "redo");   break;
-      case CATCH_TYPE_NEXT:   CONST_ID(id, "next");   break;
-      default:
-	rb_bug("...");
-    }
-    return ID2SYM(id);
-}
-
-static int
-cdhash_each(VALUE key, VALUE value, VALUE ary)
-{
-    rb_ary_push(ary, key);
-    rb_ary_push(ary, value);
-    return ST_CONTINUE;
-}
-
-VALUE
-iseq_data_to_ary(rb_iseq_t *iseq)
-{
-    int i, pos, line = 0;
-    VALUE *seq;
-
-    VALUE val = rb_ary_new();
-    VALUE type; /* Symbol */
-    VALUE locals = rb_ary_new();
-    VALUE args = rb_ary_new();
-    VALUE body = rb_ary_new(); /* [[:insn1, ...], ...] */
-    VALUE nbody;
-    VALUE exception = rb_ary_new(); /* [[....]] */
-    VALUE misc = rb_hash_new();
-
-    static VALUE insn_syms[VM_INSTRUCTION_SIZE];
-    struct st_table *labels_table = st_init_numtable();
-
-    DECL_SYMBOL(top);
-    DECL_SYMBOL(method);
-    DECL_SYMBOL(block);
-    DECL_SYMBOL(class);
-    DECL_SYMBOL(rescue);
-    DECL_SYMBOL(ensure);
-    DECL_SYMBOL(eval);
-    DECL_SYMBOL(defined_guard);
-
-    if (sym_top == 0) {
-	int i;
-	for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
-	    insn_syms[i] = ID2SYM(rb_intern(insn_name(i)));
-	}
-	INIT_SYMBOL(top);
-	INIT_SYMBOL(method);
-	INIT_SYMBOL(block);
-	INIT_SYMBOL(class);
-	INIT_SYMBOL(rescue);
-	INIT_SYMBOL(ensure);
-	INIT_SYMBOL(eval);
-	INIT_SYMBOL(defined_guard);
-    }
-
-    /* type */
-    switch(iseq->type) {
-      case ISEQ_TYPE_TOP:    type = sym_top;    break;
-      case ISEQ_TYPE_METHOD: type = sym_method; break;
-      case ISEQ_TYPE_BLOCK:  type = sym_block;  break;
-      case ISEQ_TYPE_CLASS:  type = sym_class;  break;
-      case ISEQ_TYPE_RESCUE: type = sym_rescue; break;
-      case ISEQ_TYPE_ENSURE: type = sym_ensure; break;
-      case ISEQ_TYPE_EVAL:   type = sym_eval;   break;
-      case ISEQ_TYPE_DEFINED_GUARD: type = sym_defined_guard; break;
-      default: rb_bug("unsupported iseq type");
-    };
-
-    /* locals */
-    for (i=0; i<iseq->local_table_size; i++) {
-	ID lid = iseq->local_table[i];
-	if (lid) {
-	    if (rb_id2str(lid)) rb_ary_push(locals, ID2SYM(lid));
-	}
-	else {
-	    rb_ary_push(locals, ID2SYM(rb_intern("#arg_rest")));
-	}
-    }
-
-    /* args */
-    {
-	/*
-	 * [argc,                 # argc
-	 *  [label1, label2, ...] # opts
-	 *  rest index,
-	 *  post_len
-	 *  post_start
-	 *  block index,
-	 *  simple,
-         * ]
-	 */
-	VALUE arg_opt_labels = rb_ary_new();
-	int j;
-
-	for (j=0; j<iseq->arg_opts; j++) {
-	    rb_ary_push(arg_opt_labels,
-			register_label(labels_table, iseq->arg_opt_table[j]));
-	}
-
-	/* commit */
-	if (iseq->arg_simple == 1) {
-	    args = INT2FIX(iseq->argc);
-	}
-	else {
-	    rb_ary_push(args, INT2FIX(iseq->argc));
-	    rb_ary_push(args, arg_opt_labels);
-	    rb_ary_push(args, INT2FIX(iseq->arg_post_len));
-	    rb_ary_push(args, INT2FIX(iseq->arg_post_start));
-	    rb_ary_push(args, INT2FIX(iseq->arg_rest));
-	    rb_ary_push(args, INT2FIX(iseq->arg_block));
-	    rb_ary_push(args, INT2FIX(iseq->arg_simple));
-	}
-    }
-
-    /* body */
-    for (seq = iseq->iseq; seq < iseq->iseq + iseq->iseq_size; ) {
-	VALUE insn = *seq++;
-	int j, len = insn_len(insn);
-	VALUE *nseq = seq + len - 1;
-	VALUE ary = rb_ary_new2(len);
-
-	rb_ary_push(ary, insn_syms[insn]);
-	for (j=0; j<len-1; j++, seq++) {
-	    switch (insn_op_type(insn, j)) {
-	      case TS_OFFSET: {
-		unsigned int idx = nseq - iseq->iseq + *seq;
-		rb_ary_push(ary, register_label(labels_table, idx));
-		break;
-	      }
-	      case TS_LINDEX:
-	      case TS_DINDEX:
-	      case TS_NUM:
-		rb_ary_push(ary, INT2FIX(*seq));
-		break;
-	      case TS_VALUE:
-		rb_ary_push(ary, *seq);
-		break;
-	      case TS_ISEQ:
-		{
-		    rb_iseq_t *iseq = (rb_iseq_t *)*seq;
-		    if (iseq) {
-			VALUE val = iseq_data_to_ary(iseq);
-			rb_ary_push(ary, val);
-		    }
-		    else {
-			rb_ary_push(ary, Qnil);
-		    }
-		}
-		break;
-	      case TS_GENTRY:
-		{
-		    struct global_entry *entry = (struct global_entry *)*seq;
-		    rb_ary_push(ary, ID2SYM(entry->id));
-		}
-		break;
-	      case TS_IC:
-		rb_ary_push(ary, Qnil);
-		break;
-	      case TS_ID:
-		rb_ary_push(ary, ID2SYM(*seq));
-		break;
-	      case TS_CDHASH:
-		{
-		    VALUE hash = *seq;
-		    VALUE val = rb_ary_new();
-		    int i;
-
-		    rb_hash_foreach(hash, cdhash_each, val);
-
-		    for (i=0; i<RARRAY_LEN(val); i+=2) {
-			VALUE pos = FIX2INT(rb_ary_entry(val, i+1));
-			unsigned int idx = nseq - iseq->iseq + pos;
-
-			rb_ary_store(val, i+1,
-				     register_label(labels_table, idx));
-		    }
-		    rb_ary_push(ary, val);
-		}
-		break;
-	      default:
-		rb_bug("unknown operand: %c", insn_op_type(insn, j));
-	    }
-	}
-	rb_ary_push(body, ary);
-    }
-
-    nbody = body;
-
-    /* exception */
-    for (i=0; i<iseq->catch_table_size; i++) {
-	VALUE ary = rb_ary_new();
-	struct iseq_catch_table_entry *entry = &iseq->catch_table[i];
-	rb_ary_push(ary, exception_type2symbol(entry->type));
-	if (entry->iseq) {
-	    rb_iseq_t *eiseq;
-	    GetISeqPtr(entry->iseq, eiseq);
-	    rb_ary_push(ary, iseq_data_to_ary(eiseq));
-	}
-	else {
-	    rb_ary_push(ary, Qnil);
-	}
-	rb_ary_push(ary, register_label(labels_table, entry->start));
-	rb_ary_push(ary, register_label(labels_table, entry->end));
-	rb_ary_push(ary, register_label(labels_table, entry->cont));
-	rb_ary_push(ary, INT2FIX(entry->sp));
-	rb_ary_push(exception, ary);
-    }
-
-    /* make body with labels and insert line number */
-    body = rb_ary_new();
-
-    for (i=0, pos=0; i<RARRAY_LEN(nbody); i++) {
-	VALUE ary = RARRAY_PTR(nbody)[i];
-	VALUE label;
-
-	if (st_lookup(labels_table, pos, &label)) {
-	    rb_ary_push(body, label);
-	}
-
-	if (iseq->insn_info_table[i].line_no != line) {
-	    line = iseq->insn_info_table[i].line_no;
-	    rb_ary_push(body, INT2FIX(line));
-	}
-
-	rb_ary_push(body, ary);
-	pos += RARRAY_LEN(ary);
-    }
-
-    st_free_table(labels_table);
-
-    rb_hash_aset(misc, ID2SYM(rb_intern("arg_size")), INT2FIX(iseq->arg_size));
-    rb_hash_aset(misc, ID2SYM(rb_intern("local_size")), INT2FIX(iseq->local_size));
-    rb_hash_aset(misc, ID2SYM(rb_intern("stack_max")), INT2FIX(iseq->stack_max));
-
-    /* 
-     * [:magic, :major_version, :minor_version, :format_type, :misc,
-     *  :name, :filename, :type, :locals, :args,
-     *  :catch_table, :bytecode]
-     */
-    rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat"));
-    rb_ary_push(val, INT2FIX(1));
-    rb_ary_push(val, INT2FIX(1));
-    rb_ary_push(val, INT2FIX(1));
-    rb_ary_push(val, misc);
-    rb_ary_push(val, iseq->name);
-    rb_ary_push(val, iseq->filename);
-    rb_ary_push(val, type);
-    rb_ary_push(val, locals);
-    rb_ary_push(val, args);
-    rb_ary_push(val, exception);
-    rb_ary_push(val, body);
-    return val;
-}
-
-struct st_table *
-insn_make_insn_table(void)
-{
-    struct st_table *table;
-    int i;
-    table = st_init_numtable();
-
-    for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
-	st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
-    }
-
-    return table;
-}
-
-/* ruby2cext */
-
-VALUE
-rb_iseq_build_for_ruby2cext(
-    const rb_iseq_t *iseq_template,
-    const rb_insn_func_t *func,
-    const struct iseq_insn_info_entry *insn_info_table,
-    const char **local_table,
-    const VALUE *arg_opt_table,
-    const struct iseq_catch_table_entry *catch_table,
-    const char *name,
-    const char *filename)
-{
-    int i;
-    VALUE iseqval = iseq_alloc(rb_cISeq);
-    rb_iseq_t *iseq;
-    GetISeqPtr(iseqval, iseq);
-
-    /* copy iseq */
-    *iseq = *iseq_template;
-    iseq->name = rb_str_new2(name);
-    iseq->filename = rb_str_new2(filename);
-    iseq->mark_ary = rb_ary_new();
-    iseq->self = iseqval;
-
-    iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
-
-    for (i=0; i<iseq->iseq_size; i+=2) {
-	iseq->iseq[i] = BIN(opt_call_c_function);
-	iseq->iseq[i+1] = (VALUE)func;
-    }
-
-    iseq_translate_threaded_code(iseq);
-
-#define ALLOC_AND_COPY(dst, src, type, size) do { \
-  if (size) { \
-      (dst) = ALLOC_N(type, (size)); \
-      MEMCPY((dst), (src), type, (size)); \
-  } \
-} while (0)
-
-    ALLOC_AND_COPY(iseq->insn_info_table, insn_info_table,
-		   struct iseq_insn_info_entry, iseq->insn_info_size);
-
-    ALLOC_AND_COPY(iseq->catch_table, catch_table,
-		   struct iseq_catch_table_entry, iseq->catch_table_size);
-
-    ALLOC_AND_COPY(iseq->arg_opt_table, arg_opt_table,
-		   VALUE, iseq->arg_opts);
-
-    set_relation(iseq, 0);
-
-    return iseqval;
-}
-
-void
-Init_ISeq(void)
-{
-    /* declare ::VM::InstructionSequence */
-    rb_cISeq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", rb_cObject);
-    rb_define_alloc_func(rb_cISeq, iseq_alloc);
-    rb_define_method(rb_cISeq, "inspect", iseq_inspect, 0);
-    rb_define_method(rb_cISeq, "disasm", ruby_iseq_disasm, 0);
-    rb_define_method(rb_cISeq, "disassemble", ruby_iseq_disasm, 0);
-    rb_define_method(rb_cISeq, "to_a", iseq_to_a, 0);
-    rb_define_method(rb_cISeq, "eval", iseq_eval, 0);
-
-    /* disable this feature because there is no verifier. */
-    /* rb_define_singleton_method(rb_cISeq, "load", iseq_s_load, -1); */
-    (void)iseq_s_load;
-
-    rb_define_singleton_method(rb_cISeq, "compile", iseq_s_compile, -1);
-    rb_define_singleton_method(rb_cISeq, "new", iseq_s_compile, -1);
-    rb_define_singleton_method(rb_cISeq, "compile_file", iseq_s_compile_file, -1);
-    rb_define_singleton_method(rb_cISeq, "compile_option", iseq_s_compile_option_get, 0);
-    rb_define_singleton_method(rb_cISeq, "compile_option=", iseq_s_compile_option_set, 1);
-    rb_define_singleton_method(rb_cISeq, "disasm", iseq_s_disasm, 1);
-    rb_define_singleton_method(rb_cISeq, "disassemble", iseq_s_disasm, 1);
-}
-
diff --git a/keywords b/keywords
index f0d82a7667..6eed5e1f4d 100644
--- a/keywords
+++ b/keywords
@@ -1,51 +1,42 @@
-%{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-%}
-
-struct kwtable;
+struct kwtable {const char *name; int id[2]; enum lex_state state;};
 %%
-__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
-__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
-__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
-BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
-END, {keyword_END, keyword_END}, EXPR_END
-alias, {keyword_alias, keyword_alias}, EXPR_FNAME
-and, {keyword_and, keyword_and}, EXPR_VALUE
-begin, {keyword_begin, keyword_begin}, EXPR_BEG
-break, {keyword_break, keyword_break}, EXPR_MID
-case, {keyword_case, keyword_case}, EXPR_VALUE
-class, {keyword_class, keyword_class}, EXPR_CLASS
-def, {keyword_def, keyword_def}, EXPR_FNAME
-defined?, {keyword_defined, keyword_defined}, EXPR_ARG
-do, {keyword_do, keyword_do}, EXPR_BEG
-else, {keyword_else, keyword_else}, EXPR_BEG
-elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
-end, {keyword_end, keyword_end}, EXPR_END
-ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
-false, {keyword_false, keyword_false}, EXPR_END
-for, {keyword_for, keyword_for}, EXPR_VALUE
-if, {keyword_if, modifier_if}, EXPR_VALUE
-in, {keyword_in, keyword_in}, EXPR_VALUE
-module, {keyword_module, keyword_module}, EXPR_VALUE
-next, {keyword_next, keyword_next}, EXPR_MID
-nil, {keyword_nil, keyword_nil}, EXPR_END
-not, {keyword_not, keyword_not}, EXPR_ARG
-or, {keyword_or, keyword_or}, EXPR_VALUE
-redo, {keyword_redo, keyword_redo}, EXPR_END
-rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
-retry, {keyword_retry, keyword_retry}, EXPR_END
-return, {keyword_return, keyword_return}, EXPR_MID
-self, {keyword_self, keyword_self}, EXPR_END
-super, {keyword_super, keyword_super}, EXPR_ARG
-then, {keyword_then, keyword_then}, EXPR_BEG
-true, {keyword_true, keyword_true}, EXPR_END
-undef, {keyword_undef, keyword_undef}, EXPR_FNAME
-unless, {keyword_unless, modifier_unless}, EXPR_VALUE
-until, {keyword_until, modifier_until}, EXPR_VALUE
-when, {keyword_when, keyword_when}, EXPR_VALUE
-while, {keyword_while, modifier_while}, EXPR_VALUE
-yield, {keyword_yield, keyword_yield}, EXPR_ARG
-%%
-#endif
+__LINE__, {k__LINE__, k__LINE__}, EXPR_END
+__FILE__, {k__FILE__, k__FILE__}, EXPR_END
+BEGIN, {klBEGIN, klBEGIN}, EXPR_END
+END, {klEND, klEND}, EXPR_END
+alias, {kALIAS, kALIAS}, EXPR_FNAME
+and, {kAND, kAND}, EXPR_BEG
+begin, {kBEGIN, kBEGIN}, EXPR_BEG
+break, {kBREAK, kBREAK}, EXPR_MID
+case, {kCASE, kCASE}, EXPR_BEG
+class, {kCLASS, kCLASS}, EXPR_CLASS
+def, {kDEF, kDEF}, EXPR_FNAME
+defined?, {kDEFINED, kDEFINED}, EXPR_ARG
+do, {kDO, kDO}, EXPR_BEG
+else, {kELSE, kELSE}, EXPR_BEG
+elsif, {kELSIF, kELSIF}, EXPR_BEG
+end, {kEND, kEND}, EXPR_END
+ensure, {kENSURE, kENSURE}, EXPR_BEG
+false, {kFALSE, kFALSE}, EXPR_END
+for, {kFOR, kFOR}, EXPR_BEG
+if, {kIF, kIF_MOD}, EXPR_BEG
+in, {kIN, kIN}, EXPR_BEG
+module, {kMODULE, kMODULE}, EXPR_BEG
+next, {kNEXT, kNEXT}, EXPR_MID
+nil, {kNIL, kNIL}, EXPR_END
+not, {kNOT, kNOT}, EXPR_BEG
+or, {kOR, kOR}, EXPR_BEG
+redo, {kREDO, kREDO}, EXPR_END
+rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
+retry, {kRETRY, kRETRY}, EXPR_END
+return, {kRETURN, kRETURN}, EXPR_MID
+self, {kSELF, kSELF}, EXPR_END
+super, {kSUPER, kSUPER}, EXPR_ARG
+then, {kTHEN, kTHEN}, EXPR_BEG
+true, {kTRUE, kTRUE}, EXPR_END
+undef, {kUNDEF, kUNDEF}, EXPR_FNAME
+unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
+until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
+when, {kWHEN, kWHEN}, EXPR_BEG
+while, {kWHILE, kWHILE_MOD}, EXPR_BEG
+yield, {kYIELD, kYIELD}, EXPR_ARG
diff --git a/lex.c b/lex.c
new file mode 100644
index 0000000000..a15309d502
--- /dev/null
+++ b/lex.c
@@ -0,0 +1,136 @@
+/* C code produced by gperf version 2.7.2 */
+/* Command-line: gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' ./keywords  */
+struct kwtable {const char *name; int id[2]; enum lex_state state;};
+
+#define TOTAL_KEYWORDS 40
+#define MIN_WORD_LENGTH 2
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 55
+/* maximum key range = 50, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static unsigned char asso_values[] =
+    {
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 11, 56, 56, 36, 56,  1, 37,
+      31,  1, 56, 56, 56, 56, 29, 56,  1, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56,  1, 56, 32,  1,  2,
+       1,  1,  4, 23, 56, 17, 56, 20,  9,  2,
+       9, 26, 14, 56,  5,  1,  1, 16, 56, 21,
+      20,  9, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
+      56, 56, 56, 56, 56, 56
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+      case 3:
+        hval += asso_values[(unsigned char)str[2]];
+      case 2:
+      case 1:
+        hval += asso_values[(unsigned char)str[0]];
+        break;
+    }
+  return hval + asso_values[(unsigned char)str[len - 1]];
+}
+
+#ifdef __GNUC__
+__inline
+#endif
+struct kwtable *
+rb_reserved_word (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static struct kwtable wordlist[] =
+    {
+      {""}, {""}, {""}, {""}, {""}, {""},
+      {"end", {kEND, kEND}, EXPR_END},
+      {"else", {kELSE, kELSE}, EXPR_BEG},
+      {"case", {kCASE, kCASE}, EXPR_BEG},
+      {"ensure", {kENSURE, kENSURE}, EXPR_BEG},
+      {"module", {kMODULE, kMODULE}, EXPR_BEG},
+      {"elsif", {kELSIF, kELSIF}, EXPR_BEG},
+      {"def", {kDEF, kDEF}, EXPR_FNAME},
+      {"rescue", {kRESCUE, kRESCUE_MOD}, EXPR_MID},
+      {"not", {kNOT, kNOT}, EXPR_BEG},
+      {"then", {kTHEN, kTHEN}, EXPR_BEG},
+      {"yield", {kYIELD, kYIELD}, EXPR_ARG},
+      {"for", {kFOR, kFOR}, EXPR_BEG},
+      {"self", {kSELF, kSELF}, EXPR_END},
+      {"false", {kFALSE, kFALSE}, EXPR_END},
+      {"retry", {kRETRY, kRETRY}, EXPR_END},
+      {"return", {kRETURN, kRETURN}, EXPR_MID},
+      {"true", {kTRUE, kTRUE}, EXPR_END},
+      {"if", {kIF, kIF_MOD}, EXPR_BEG},
+      {"defined?", {kDEFINED, kDEFINED}, EXPR_ARG},
+      {"super", {kSUPER, kSUPER}, EXPR_ARG},
+      {"undef", {kUNDEF, kUNDEF}, EXPR_FNAME},
+      {"break", {kBREAK, kBREAK}, EXPR_MID},
+      {"in", {kIN, kIN}, EXPR_BEG},
+      {"do", {kDO, kDO}, EXPR_BEG},
+      {"nil", {kNIL, kNIL}, EXPR_END},
+      {"until", {kUNTIL, kUNTIL_MOD}, EXPR_BEG},
+      {"unless", {kUNLESS, kUNLESS_MOD}, EXPR_BEG},
+      {"or", {kOR, kOR}, EXPR_BEG},
+      {"next", {kNEXT, kNEXT}, EXPR_MID},
+      {"when", {kWHEN, kWHEN}, EXPR_BEG},
+      {"redo", {kREDO, kREDO}, EXPR_END},
+      {"and", {kAND, kAND}, EXPR_BEG},
+      {"begin", {kBEGIN, kBEGIN}, EXPR_BEG},
+      {"__LINE__", {k__LINE__, k__LINE__}, EXPR_END},
+      {"class", {kCLASS, kCLASS}, EXPR_CLASS},
+      {"__FILE__", {k__FILE__, k__FILE__}, EXPR_END},
+      {"END", {klEND, klEND}, EXPR_END},
+      {"BEGIN", {klBEGIN, klBEGIN}, EXPR_END},
+      {"while", {kWHILE, kWHILE_MOD}, EXPR_BEG},
+      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+      {""},
+      {"alias", {kALIAS, kALIAS}, EXPR_FNAME}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].name;
+
+          if (*str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
diff --git a/lex.c.blt b/lex.c.blt
deleted file mode 100644
index ea2068664e..0000000000
--- a/lex.c.blt
+++ /dev/null
@@ -1,217 +0,0 @@
-/* C code produced by gperf version 3.0.3 */
-/* Command-line: gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' keywords  */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 1 "keywords"
-
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-#line 7 "keywords"
-struct kwtable;
-
-#define TOTAL_KEYWORDS 41
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 8
-#define MAX_HASH_VALUE 50
-/* maximum key range = 43, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const unsigned char asso_values[] =
-    {
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 26, 51, 51, 14, 51, 16,  8,
-      11, 13, 51, 51, 51, 51, 10, 51, 13, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 11, 51, 13,  1, 26,
-       4,  1,  8, 28, 51, 23, 51,  1,  1, 27,
-       5, 19, 21, 51,  8,  3,  3, 11, 51, 21,
-      24, 16, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
-      51, 51, 51, 51, 51, 51
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct kwtable *
-rb_reserved_word (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const struct kwtable wordlist[] =
-    {
-      {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 17 "keywords"
-      {"break", {keyword_break, keyword_break}, EXPR_MID},
-#line 23 "keywords"
-      {"else", {keyword_else, keyword_else}, EXPR_BEG},
-#line 33 "keywords"
-      {"nil", {keyword_nil, keyword_nil}, EXPR_END},
-#line 26 "keywords"
-      {"ensure", {keyword_ensure, keyword_ensure}, EXPR_BEG},
-#line 25 "keywords"
-      {"end", {keyword_end, keyword_end}, EXPR_END},
-#line 42 "keywords"
-      {"then", {keyword_then, keyword_then}, EXPR_BEG},
-#line 34 "keywords"
-      {"not", {keyword_not, keyword_not}, EXPR_ARG},
-#line 27 "keywords"
-      {"false", {keyword_false, keyword_false}, EXPR_END},
-#line 40 "keywords"
-      {"self", {keyword_self, keyword_self}, EXPR_END},
-#line 24 "keywords"
-      {"elsif", {keyword_elsif, keyword_elsif}, EXPR_VALUE},
-#line 37 "keywords"
-      {"rescue", {keyword_rescue, modifier_rescue}, EXPR_MID},
-#line 43 "keywords"
-      {"true", {keyword_true, keyword_true}, EXPR_END},
-#line 46 "keywords"
-      {"until", {keyword_until, modifier_until}, EXPR_VALUE},
-#line 45 "keywords"
-      {"unless", {keyword_unless, modifier_unless}, EXPR_VALUE},
-#line 39 "keywords"
-      {"return", {keyword_return, keyword_return}, EXPR_MID},
-#line 20 "keywords"
-      {"def", {keyword_def, keyword_def}, EXPR_FNAME},
-#line 15 "keywords"
-      {"and", {keyword_and, keyword_and}, EXPR_VALUE},
-#line 22 "keywords"
-      {"do", {keyword_do, keyword_do}, EXPR_BEG},
-#line 49 "keywords"
-      {"yield", {keyword_yield, keyword_yield}, EXPR_ARG},
-#line 28 "keywords"
-      {"for", {keyword_for, keyword_for}, EXPR_VALUE},
-#line 44 "keywords"
-      {"undef", {keyword_undef, keyword_undef}, EXPR_FNAME},
-#line 35 "keywords"
-      {"or", {keyword_or, keyword_or}, EXPR_VALUE},
-#line 30 "keywords"
-      {"in", {keyword_in, keyword_in}, EXPR_VALUE},
-#line 47 "keywords"
-      {"when", {keyword_when, keyword_when}, EXPR_VALUE},
-#line 38 "keywords"
-      {"retry", {keyword_retry, keyword_retry}, EXPR_END},
-#line 29 "keywords"
-      {"if", {keyword_if, modifier_if}, EXPR_VALUE},
-#line 18 "keywords"
-      {"case", {keyword_case, keyword_case}, EXPR_VALUE},
-#line 36 "keywords"
-      {"redo", {keyword_redo, keyword_redo}, EXPR_END},
-#line 32 "keywords"
-      {"next", {keyword_next, keyword_next}, EXPR_MID},
-#line 41 "keywords"
-      {"super", {keyword_super, keyword_super}, EXPR_ARG},
-#line 31 "keywords"
-      {"module", {keyword_module, keyword_module}, EXPR_VALUE},
-#line 16 "keywords"
-      {"begin", {keyword_begin, keyword_begin}, EXPR_BEG},
-#line 10 "keywords"
-      {"__LINE__", {keyword__LINE__, keyword__LINE__}, EXPR_END},
-#line 11 "keywords"
-      {"__FILE__", {keyword__FILE__, keyword__FILE__}, EXPR_END},
-#line 9 "keywords"
-      {"__ENCODING__", {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END},
-#line 13 "keywords"
-      {"END", {keyword_END, keyword_END}, EXPR_END},
-#line 14 "keywords"
-      {"alias", {keyword_alias, keyword_alias}, EXPR_FNAME},
-#line 12 "keywords"
-      {"BEGIN", {keyword_BEGIN, keyword_BEGIN}, EXPR_END},
-#line 21 "keywords"
-      {"defined?", {keyword_defined, keyword_defined}, EXPR_ARG},
-#line 19 "keywords"
-      {"class", {keyword_class, keyword_class}, EXPR_CLASS},
-      {""}, {""},
-#line 48 "keywords"
-      {"while", {keyword_while, modifier_while}, EXPR_VALUE}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 50 "keywords"
-
-#endif
diff --git a/lex.c.src b/lex.c.src
deleted file mode 100644
index f0d82a7667..0000000000
--- a/lex.c.src
+++ /dev/null
@@ -1,51 +0,0 @@
-%{
-struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
-const struct kwtable *rb_reserved_word(const char *, unsigned int);
-#ifndef RIPPER
-%}
-
-struct kwtable;
-%%
-__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
-__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
-__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
-BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
-END, {keyword_END, keyword_END}, EXPR_END
-alias, {keyword_alias, keyword_alias}, EXPR_FNAME
-and, {keyword_and, keyword_and}, EXPR_VALUE
-begin, {keyword_begin, keyword_begin}, EXPR_BEG
-break, {keyword_break, keyword_break}, EXPR_MID
-case, {keyword_case, keyword_case}, EXPR_VALUE
-class, {keyword_class, keyword_class}, EXPR_CLASS
-def, {keyword_def, keyword_def}, EXPR_FNAME
-defined?, {keyword_defined, keyword_defined}, EXPR_ARG
-do, {keyword_do, keyword_do}, EXPR_BEG
-else, {keyword_else, keyword_else}, EXPR_BEG
-elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
-end, {keyword_end, keyword_end}, EXPR_END
-ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
-false, {keyword_false, keyword_false}, EXPR_END
-for, {keyword_for, keyword_for}, EXPR_VALUE
-if, {keyword_if, modifier_if}, EXPR_VALUE
-in, {keyword_in, keyword_in}, EXPR_VALUE
-module, {keyword_module, keyword_module}, EXPR_VALUE
-next, {keyword_next, keyword_next}, EXPR_MID
-nil, {keyword_nil, keyword_nil}, EXPR_END
-not, {keyword_not, keyword_not}, EXPR_ARG
-or, {keyword_or, keyword_or}, EXPR_VALUE
-redo, {keyword_redo, keyword_redo}, EXPR_END
-rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
-retry, {keyword_retry, keyword_retry}, EXPR_END
-return, {keyword_return, keyword_return}, EXPR_MID
-self, {keyword_self, keyword_self}, EXPR_END
-super, {keyword_super, keyword_super}, EXPR_ARG
-then, {keyword_then, keyword_then}, EXPR_BEG
-true, {keyword_true, keyword_true}, EXPR_END
-undef, {keyword_undef, keyword_undef}, EXPR_FNAME
-unless, {keyword_unless, modifier_unless}, EXPR_VALUE
-until, {keyword_until, modifier_until}, EXPR_VALUE
-when, {keyword_when, keyword_when}, EXPR_VALUE
-while, {keyword_while, modifier_while}, EXPR_VALUE
-yield, {keyword_yield, keyword_yield}, EXPR_ARG
-%%
-#endif
diff --git a/lib/.document b/lib/.document
index f6b301327f..2159be8360 100644
--- a/lib/.document
+++ b/lib/.document
@@ -14,6 +14,7 @@ base64.rb
 benchmark.rb
 cgi
 cgi.rb
+cgi-lib.rb
 complex.rb
 csv.rb
 date
@@ -23,6 +24,7 @@ debug.rb
 delegate.rb
 drb
 drb.rb
+e2mmap.rb
 erb.rb
 eregex.rb
 fileutils.rb
@@ -64,7 +66,6 @@ profiler.rb
 pstore.rb
 racc
 rational.rb
-rdoc.rb
 rdoc
 readbytes.rb
 resolv-replace.rb
@@ -80,8 +81,7 @@ set.rb
 shell
 shell.rb
 shellwords.rb
-# TODO: YARV cause error. why ...?
-# singleton.rb
+singleton.rb
 soap
 sync.rb
 tempfile.rb
diff --git a/lib/Env.rb b/lib/Env.rb
new file mode 100644
index 0000000000..452a28659e
--- /dev/null
+++ b/lib/Env.rb
@@ -0,0 +1,18 @@
+# Env.rb -- imports environment variables as global variables, Perlish ;(
+# Usage:
+#
+#  require 'Env'
+#  p $USER
+#  $USER = "matz"
+#  p ENV["USER"]
+
+require 'importenv'
+
+if __FILE__ == $0
+  p $TERM
+  $TERM = nil
+  p $TERM
+  p ENV["TERM"]
+  $TERM = "foo"
+  p ENV["TERM"]
+end
diff --git a/lib/README b/lib/README
index 074741f953..fa2bbd9635 100644
--- a/lib/README
+++ b/lib/README
@@ -1,26 +1,36 @@
 English.rb	lets Perl'ish global variables have English names
+Env.rb		loads importenv.rb
 README		this file
+base64.rb	encodes/decodes base64 (obsolete)
 benchmark.rb	a benchmark utility
+cgi-lib.rb	simple CGI support library (old style)
 cgi.rb		CGI support library
 cgi/session.rb	CGI session class
 complex.rb	complex number support
 csv.rb		CSV parser/generator
 date.rb		date object
 date/format.rb	date parsing and formatting
+date2.rb	date object (obsolete; use date)
 debug.rb	ruby debugger
 delegate.rb	delegates messages to other object
 drb.rb		distributed Ruby
 e2mmap.rb	exception utilities
 erb.rb		tiny eRuby library
+eregex.rb	extended regular expression (just a proof of concept)
 fileutils.rb	file utilities
 finalize.rb	adds finalizer to the object
 find.rb		traverses directory tree
 forwardable.rb	explicit delegation library
+ftools.rb	file tools
 getoptlong.rb	GNU getoptlong compatible
+getopts.rb	parses command line options (use getoptlong)
 gserver.rb	general TCP server
+importenv.rb	imports environment variables as global variables
 ipaddr.rb	defines the IPAddr class
 irb.rb		interactive ruby
+jcode.rb	Japanese text handling (replace String methods)
 logger.rb	simple logging utility
+mailread.rb	reads mail headers
 mathn.rb	extended math operation
 matrix.rb	matrix calculation library
 mkmf.rb		Makefile maker
@@ -38,8 +48,10 @@ open-uri.rb	easy-to-use network interface using URI and Net
 open3.rb	opens subprocess connection stdin/stdout/stderr
 optparse.rb	command line option analysis
 ostruct.rb	python style object
+parsearg.rb	argument parser using getopts
 parsedate.rb	parses date string (obsolete)
 pathname.rb	Object-Oriented Pathname Class
+ping.rb		checks whether host is up, using TCP echo.
 pp.rb		pretty print objects
 prettyprint.rb	pretty printing algorithm
 profile.rb	runs ruby profiler
@@ -48,14 +60,17 @@ pstore.rb	persistent object strage using marshal
 racc/parser.rb	racc (Ruby yACC) runtime
 rational.rb	rational number support
 rdoc	source-code documentation tool
+readbytes.rb	define IO#readbytes
 resolv-replace.rb	replace Socket DNS by resolve.rb
 resolv.rb	DNS resolver in Ruby
 rexml		an XML parser for Ruby, in Ruby
+rubyunit.rb	original Ruby Unit testing framework
 scanf.rb	scanf for Ruby
 set.rb		defines the Set class
 shell.rb	runs commands and does pipeline operations like shell
 shellwords.rb	split into words like shell
 singleton.rb	singleton design pattern library
+soap		SOAP 1.1 implementation
 sync.rb		2 phase lock
 tempfile.rb	temporary file with automatic removal
 test/unit	Ruby Unit Testing Framework
@@ -75,5 +90,7 @@ uri/ldap.rb	ldap scheme support
 uri/mailto.rb	mailto scheme support
 weakref.rb	weak reference class
 webrick.rb	WEB server toolkit
+wsdl		WSDL 1.1 implementation
 xmlrpc		XML-RPC implementation
+xsd		XML Schema Datatypes implementation
 yaml.rb		YAML implementation
diff --git a/lib/base64.rb b/lib/base64.rb
new file mode 100644
index 0000000000..8628d611b2
--- /dev/null
+++ b/lib/base64.rb
@@ -0,0 +1,133 @@
+#
+# = base64.rb: methods for base64-encoding and -decoding stings
+#
+# Author:: Yukihiro Matsumoto 
+# Documentation:: Dave Thomas and Gavin Sinclair
+#
+# Until Ruby 1.8.1, these methods were defined at the top-level.  Now
+# they are in the Base64 module but included in the top-level, where
+# their usage is deprecated.
+#
+# See Base64 for documentation.
+#
+
+require "kconv"
+
+
+# The Base64 module provides for the encoding (#encode64) and decoding
+# (#decode64) of binary data using a Base64 representation.
+# 
+# The following particular features are also provided:
+# - encode into lines of a given length (#b64encode)
+# - decode the special format specified in RFC2047 for the
+#   representation of email headers (decode_b)
+#
+# == Example
+#
+# A simple encoding and decoding. 
+# 
+#     require "base64"
+#
+#     enc   = Base64.encode64('Send reinforcements')
+#                         # -> "U2VuZCByZWluZm9yY2VtZW50cw==\n" 
+#     plain = Base64.decode64(enc)
+#                         # -> "Send reinforcements"
+#
+# The purpose of using base64 to encode data is that it translates any
+# binary data into purely printable characters.  It is specified in
+# RFC 2045 (http://www.faqs.org/rfcs/rfc2045.html).
+
+module Base64
+  module_function
+
+  # Returns the Base64-decoded version of +str+.
+  #
+  #   require 'base64'
+  #   str = 'VGhpcyBpcyBsaW5lIG9uZQpUaGlzIG' +
+  #         'lzIGxpbmUgdHdvClRoaXMgaXMgbGlu' +
+  #         'ZSB0aHJlZQpBbmQgc28gb24uLi4K'
+  #   puts Base64.decode64(str)
+  #
+  # <i>Generates:</i>
+  #
+  #    This is line one
+  #    This is line two
+  #    This is line three
+  #    And so on...
+
+  def decode64(str)
+    str.unpack("m")[0]
+  end
+
+
+  # Decodes text formatted using a subset of RFC2047 (the one used for
+  # mime-encoding mail headers).
+  #
+  # Only supports an encoding type of 'b' (base 64), and only supports
+  # the character sets ISO-2022-JP and SHIFT_JIS (so the only two
+  # encoded word sequences recognized are <tt>=?ISO-2022-JP?B?...=</tt> and
+  # <tt>=?SHIFT_JIS?B?...=</tt>).  Recognition of these sequences is case
+  # insensitive.
+
+  def decode_b(str)
+    str.gsub!(/=\?ISO-2022-JP\?B\?([!->@-~]+)\?=/i) {
+      decode64($1)
+    }
+    str = Kconv::toeuc(str)
+    str.gsub!(/=\?SHIFT_JIS\?B\?([!->@-~]+)\?=/i) {
+      decode64($1)
+    }
+    str = Kconv::toeuc(str)
+    str.gsub!(/\n/, ' ') 
+    str.gsub!(/\0/, '')
+    str
+  end
+
+  # Returns the Base64-encoded version of +str+.
+  #
+  #    require 'base64'
+  #    Base64.b64encode("Now is the time for all good coders\nto learn Ruby")
+  #
+  # <i>Generates:</i>
+  #
+  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+  #    UnVieQ==
+
+  def encode64(bin)
+    [bin].pack("m")
+  end
+
+  # _Prints_ the Base64 encoded version of +bin+ (a +String+) in lines of
+  # +len+ (default 60) characters.
+  #
+  #    require 'base64'
+  #    data = "Now is the time for all good coders\nto learn Ruby" 
+  #    Base64.b64encode(data)
+  #
+  # <i>Generates:</i>
+  #
+  #    Tm93IGlzIHRoZSB0aW1lIGZvciBhbGwgZ29vZCBjb2RlcnMKdG8gbGVhcm4g
+  #    UnVieQ==
+
+  def b64encode(bin, len = 60)
+    encode64(bin).scan(/.{1,#{len}}/) do
+      print $&, "\n"
+    end
+  end 
+
+
+  module Deprecated # :nodoc:
+    include Base64
+
+    for m in Base64.private_instance_methods(false)
+      module_eval %{
+        def #{m}(*args)
+          warn("\#{caller(1)[0]}: #{m} is deprecated; use Base64.#{m} instead")
+          super
+        end
+      }
+    end
+  end
+end
+
+include Base64::Deprecated
diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb
new file mode 100644
index 0000000000..d6b60d66cc
--- /dev/null
+++ b/lib/cgi-lib.rb
@@ -0,0 +1,272 @@
+warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: cgi-lib is deprecated after Ruby 1.8.1; use cgi instead"
+
+=begin
+
+= simple CGI support library
+
+= example
+
+== get form values
+
+	require "cgi-lib.rb"
+	query = CGI.new
+	query['field']   # <== value of 'field'
+	query.keys       # <== array of fields
+
+and query has Hash class methods
+
+
+== get cookie values
+
+	require "cgi-lib.rb"
+	query = CGI.new
+	query.cookie['name']  # <== cookie value of 'name'
+	query.cookie.keys     # <== all cookie names
+
+and query.cookie has Hash class methods
+
+
+== print HTTP header and HTML string to $>
+
+	require "cgi-lib.rb"
+	CGI::print{
+	  CGI::tag("HTML"){
+	    CGI::tag("HEAD"){ CGI::tag("TITLE"){"TITLE"} } +
+	    CGI::tag("BODY"){
+	      CGI::tag("FORM", {"ACTION"=>"test.rb", "METHOD"=>"POST"}){
+	        CGI::tag("INPUT", {"TYPE"=>"submit", "VALUE"=>"submit"})
+	      } +
+	      CGI::tag("HR")
+	    }
+	  }
+	}
+
+
+== make raw cookie string
+
+	require "cgi-lib.rb"
+	cookie1 = CGI::cookie({'name'    => 'name',
+	                       'value'   => 'value',
+	                       'path'    => 'path',   # optional
+	                       'domain'  => 'domain', # optional
+	                       'expires' => Time.now, # optional
+	                       'secure'  => true      # optional
+	                      })
+
+	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== print HTTP header and string to $>
+
+	require "cgi-lib.rb"
+	CGI::print{ "string" }
+	  # == CGI::print("Content-Type: text/html"){ "string" }
+	CGI::print("Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+=== NPH (no-parse-header) mode
+
+	require "cgi-lib.rb"
+	CGI::print("nph"){ "string" }
+	  # == CGI::print("nph", "Content-Type: text/html"){ "string" }
+	CGI::print("nph", "Content-Type: text/html", cookie1, cookie2){ "string" }
+
+
+== make HTML tag string
+
+	require "cgi-lib.rb"
+	CGI::tag("element", {"attribute_name"=>"attribute_value"}){"content"}
+
+
+== make HTTP header string
+
+	require "cgi-lib.rb"
+	CGI::header # == CGI::header("Content-Type: text/html")
+	CGI::header("Content-Type: text/html", cookie1, cookie2)
+
+
+=== NPH (no-parse-header) mode
+
+	CGI::header("nph") # == CGI::header("nph", "Content-Type: text/html")
+	CGI::header("nph", "Content-Type: text/html", cookie1, cookie2)
+
+
+== escape url encode
+
+	require "cgi-lib.rb"
+	url_encoded_string = CGI::escape("string")
+
+
+== unescape url encoded
+
+	require "cgi-lib.rb"
+	string = CGI::unescape("url encoded string")
+
+
+== escape HTML &"<>
+
+	require "cgi-lib.rb"
+	CGI::escapeHTML("string")
+
+
+=end
+
+require "delegate"
+
+class CGI < SimpleDelegator
+
+  CR  = "\015"
+  LF  = "\012"
+  EOL = CR + LF
+
+  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
+  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
+
+  # make rfc1123 date string
+  def CGI::rfc1123_date(time)
+    t = time.clone.gmtime
+    return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT",
+                RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
+                t.hour, t.min, t.sec)
+  end
+
+  # escape url encode
+  def CGI::escape(str)
+    str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) }
+  end
+
+  # unescape url encoded
+  def CGI::unescape(str)
+    str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") }
+  end
+
+  # escape HTML
+  def CGI::escapeHTML(str)
+    str.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+  end
+
+  # offline mode. read name=value pairs on standard input.
+  def read_from_cmdline
+    require "shellwords.rb"
+    words = Shellwords.shellwords(
+              if not ARGV.empty?
+                ARGV.join(' ')
+              else
+                STDERR.print "(offline mode: enter name=value pairs on standard input)\n" if STDIN.tty?
+                readlines.join(' ').gsub(/\n/, '')
+              end.gsub(/\\=/, '%3D').gsub(/\\&/, '%26'))
+
+    if words.find{|x| x =~ /=/} then words.join('&') else words.join('+') end
+  end
+
+  def initialize(input = $stdin)
+
+    @inputs = {}
+    @cookie = {}
+
+    case ENV['REQUEST_METHOD']
+    when "GET"
+      ENV['QUERY_STRING'] or ""
+    when "POST"
+      input.read(Integer(ENV['CONTENT_LENGTH'])) or ""
+    else
+      read_from_cmdline
+    end.split(/[&;]/).each do |x|
+      key, val = x.split(/=/,2).collect{|x|CGI::unescape(x)}
+      if @inputs.include?(key)
+        @inputs[key] += "\0" + (val or "")
+      else
+        @inputs[key] = (val or "")
+      end
+    end
+
+    super(@inputs)
+
+    if ENV.has_key?('HTTP_COOKIE') or ENV.has_key?('COOKIE')
+      (ENV['HTTP_COOKIE'] or ENV['COOKIE']).split(/; /).each do |x|
+        key, val = x.split(/=/,2)
+        key = CGI::unescape(key)
+        val = val.split(/&/).collect{|x|CGI::unescape(x)}.join("\0")
+        if @cookie.include?(key)
+          @cookie[key] += "\0" + val
+        else
+          @cookie[key] = val
+        end
+      end
+    end
+  end
+
+  attr("inputs")
+  attr("cookie")
+
+  # make HTML tag string
+  def CGI::tag(element, attributes = {})
+    "<" + escapeHTML(element) + attributes.collect{|name, value|
+      " " + escapeHTML(name) + '="' + escapeHTML(value) + '"'
+    }.to_s + ">" +
+    (iterator? ? yield.to_s + "</" + escapeHTML(element) + ">" : "")
+  end
+
+  # make raw cookie string
+  def CGI::cookie(options)
+    "Set-Cookie: " + options['name'] + '=' + escape(options['value']) +
+    (options['domain']  ? '; domain='  + options['domain'] : '') +
+    (options['path']    ? '; path='    + options['path']   : '') +
+    (options['expires'] ? '; expires=' + rfc1123_date(options['expires']) : '') +
+    (options['secure']  ? '; secure' : '')
+  end
+
+  # make HTTP header string
+  def CGI::header(*options)
+    if defined?(MOD_RUBY)
+      options.each{|option|
+        option.sub(/(.*?): (.*)/){
+          Apache::request.headers_out[$1] = $2
+        }
+      }
+      Apache::request.send_http_header
+      ''
+    else
+      if options.delete("nph") or (ENV['SERVER_SOFTWARE'] =~ /IIS/)
+        [(ENV['SERVER_PROTOCOL'] or "HTTP/1.0") + " 200 OK",
+         "Date: " + rfc1123_date(Time.now),
+         "Server: " + (ENV['SERVER_SOFTWARE'] or ""),
+         "Connection: close"] +
+        (options.empty? ? ["Content-Type: text/html"] : options)
+      else
+        options.empty? ? ["Content-Type: text/html"] : options
+      end.join(EOL) + EOL + EOL
+    end
+  end
+
+  # print HTTP header and string to $>
+  def CGI::print(*options)
+    $>.print CGI::header(*options) + yield.to_s
+  end
+
+  # print message to $>
+  def CGI::message(message, title = "", header = ["Content-Type: text/html"])
+    if message.kind_of?(Hash)
+      title   = message['title']
+      header  = message['header']
+      message = message['body']
+    end
+    CGI::print(*header){
+      CGI::tag("HTML"){
+        CGI::tag("HEAD"){ CGI.tag("TITLE"){ title } } +
+        CGI::tag("BODY"){ message }
+      }
+    }
+    true
+  end
+
+  # print error message to $> and exit
+  def CGI::error
+    CGI::message({'title'=>'ERROR', 'body'=>
+      CGI::tag("PRE"){
+        "ERROR: " + CGI::tag("STRONG"){ escapeHTML($!.to_s) } + "\n" + escapeHTML($@.join("\n"))
+      }
+    })
+    exit
+  end
+end
diff --git a/lib/cgi.rb b/lib/cgi.rb
index b0c2ef92fe..5279439a08 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -339,8 +339,8 @@ class CGI
   #   url_encoded_string = CGI::escape("'Stop!' said Fred")
   #      # => "%27Stop%21%27+said+Fred"
   def CGI::escape(string)
-    string.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+    string.gsub(/([^ a-zA-Z0-9_.-]+)/n) do
+      '%' + $1.unpack('H2' * $1.size).join('%').upcase
     end.tr(' ', '+')
   end
 
@@ -349,24 +349,17 @@ class CGI
   #   string = CGI::unescape("%27Stop%21%27+said+Fred")
   #      # => "'Stop!' said Fred"
   def CGI::unescape(string)
-    enc = string.encoding
-    string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
-      [$1.delete('%')].pack('H*').force_encoding(enc)
+    string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+      [$1.delete('%')].pack('H*')
     end
   end
 
-  TABLE_FOR_ESCAPE_HTML__ = {
-    '&' => '&amp;',
-    '"' => '&quot;',
-    '<' => '&lt;',
-    '>' => '&gt;',
-  }
 
   # Escape special characters in HTML, namely &\"<>
   #   CGI::escapeHTML('Usage: foo "bar" <baz>')
   #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
   def CGI::escapeHTML(string)
-    string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+    string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
   end
 
 
@@ -374,37 +367,39 @@ class CGI
   #   CGI::unescapeHTML("Usage: foo &quot;bar&quot; &lt;baz&gt;")
   #      # => "Usage: foo \"bar\" <baz>"
   def CGI::unescapeHTML(string)
-    enc = string.encoding
-    string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do
+    string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/n) do
       match = $1.dup
       case match
       when 'amp'                 then '&'
       when 'quot'                then '"'
       when 'gt'                  then '>'
       when 'lt'                  then '<'
-      when /\A#0*(\d+)\z/        then
+      when /\A#0*(\d+)\z/n       then
         if Integer($1) < 256
-          Integer($1).chr.force_encoding(enc)
+          Integer($1).chr
         else
-          "&##{$1};"
+          if Integer($1) < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+            [Integer($1)].pack("U")
+          else
+            "&##{$1};"
+          end
         end
-      when /\A#x([0-9a-f]+)\z/i then
+      when /\A#x([0-9a-f]+)\z/ni then
         if $1.hex < 256
-          $1.hex.chr.force_encoding(enc)
+          $1.hex.chr
         else
-          "&#x#{$1};"
+          if $1.hex < 65536 and ($KCODE[0] == ?u or $KCODE[0] == ?U)
+            [$1.hex].pack("U")
+          else
+            "&#x#{$1};"
+          end
         end
       else
         "&#{match};"
       end
     end
   end
-  def CGI::escape_html(str)
-    escapeHTML(str)
-  end
-  def CGI::unescape_html(str)
-    unescapeHTML(str)
-  end
+
 
   # Escape only the tags of certain HTML elements in +string+.
   #
@@ -450,12 +445,7 @@ class CGI
       string
     end
   end
-  def CGI::escape_element(str)
-    escapeElement(str)
-  end
-  def CGI::unescape_element(str)
-    unescapeElement(str)
-  end
+
 
   # Format a +Time+ object as a String using the format specified by RFC 1123.
   #
@@ -719,13 +709,13 @@ class CGI
       require "nkf"
       case options["charset"]
       when /iso-2022-jp/ni
-        content = NKF::nkf('-j -m0 -x', content)
+        content = NKF::nkf('-m0 -x -j', content)
         options["language"] = "ja" unless options.has_key?("language")
       when /euc-jp/ni
-        content = NKF::nkf('-e -m0 -x', content)
+        content = NKF::nkf('-m0 -x -e', content)
         options["language"] = "ja" unless options.has_key?("language")
       when /shift_jis/ni
-        content = NKF::nkf('-s -m0 -x', content)
+        content = NKF::nkf('-m0 -x -s', content)
         options["language"] = "ja" unless options.has_key?("language")
       end
     end
@@ -968,11 +958,11 @@ class CGI
     end
 
     # Get the cookies as a hash of cookie-name=>Cookie pairs.
-    attr_accessor :cookies
+    attr_accessor("cookies")
 
     # Get the parameters as a hash of name=>values pairs, where
     # values is an Array.
-    attr_reader :params
+    attr("params")
 
     # Set all the parameters.
     def params=(hash)
@@ -983,7 +973,7 @@ class CGI
     def read_multipart(boundary, content_length)
       params = Hash.new([])
       boundary = "--" + boundary
-      quoted_boundary = Regexp.quote(boundary)
+      quoted_boundary = Regexp.quote(boundary, "n")
       buf = ""
       bufsize = 10 * 1024
       boundary_end=""
@@ -1001,9 +991,22 @@ class CGI
 
       loop do
         head = nil
-        body = MorphingBody.new
+        if 10240 < content_length
+          require "tempfile"
+          body = Tempfile.new("CGI")
+        else
+          begin
+            require "stringio"
+            body = StringIO.new
+          rescue LoadError
+            require "tempfile"
+            body = Tempfile.new("CGI")
+          end
+        end
+        body.binmode if defined? body.binmode
 
         until head and /#{quoted_boundary}(?:#{EOL}|--)/n.match(buf)
+
           if (not head) and /#{EOL}#{EOL}/n.match(buf)
             buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
               head = $1.dup
@@ -1058,7 +1061,7 @@ class CGI
         end
 
         /Content-Disposition:.* name="?([^\";\s]*)"?/ni.match(head)
-        name = ($1 || "").dup
+        name = $1.dup
 
         if params.has_key?(name)
           params[name].push(body)
@@ -1099,59 +1102,6 @@ class CGI
     end
     private :read_from_cmdline
 
-    # A wrapper class to use a StringIO object as the body and switch
-    # to a TempFile when the passed threshold is passed.
-    class MorphingBody
-      begin
-        require "stringio"
-        @@small_buffer = lambda{StringIO.new}
-      rescue LoadError
-        require "tempfile"
-        @@small_buffer = lambda{
-          n = Tempfile.new("CGI")
-          n.binmode
-          n
-        }
-      end
-
-      def initialize(morph_threshold = 10240)
-        @threshold = morph_threshold
-        @body = @@small_buffer.call
-        @cur_size = 0
-        @morph_check = true
-      end
-
-      def print(data)
-        if @morph_check && (@cur_size + data.size > @threshold)
-          convert_body
-        end
-        @body.print data
-      end
-      def rewind
-        @body.rewind
-      end
-      def path
-        @body.path
-      end
-
-      # returns the true body object.
-      def extract
-        @body
-      end
-
-      private
-      def convert_body
-        new_body = TempFile.new("CGI")
-        new_body.binmode if defined? @body.binmode
-        new_body.binmode if defined? new_body.binmode
-
-        @body.rewind
-        new_body.print @body.read
-        @body = new_body
-        @morph_check = false
-      end
-    end
-
     # Initialize the data from the query.
     #
     # Handles multipart forms (in particular, forms that involve file uploads).
@@ -1189,6 +1139,29 @@ class CGI
       @multipart
     end
 
+    module Value    # :nodoc:
+      def set_params(params)
+        @params = params
+      end
+      def [](idx, *args)
+        if args.size == 0
+          warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+          @params[idx]
+        else
+          super[idx,*args]
+        end
+      end
+      def first
+        warn "#{caller(1)[0]}:CAUTION! cgi['key'] == cgi.params['key'][0]; if want Array, use cgi.params['key']"
+        self
+      end
+      alias last first
+      def to_a
+        @params || [self]
+      end
+      alias to_ary to_a   	# to be rhs of multiple assignment
+    end
+
     # Get the value for the parameter with a given key.
     #
     # If the parameter has multiple values, only the first will be 
@@ -1207,6 +1180,8 @@ class CGI
         end
       else
         str = if value then value.dup else "" end
+        str.extend(Value)
+        str.set_params(params)
         str
       end
     end
@@ -1288,7 +1263,7 @@ class CGI
             else
               '="' + CGI::escapeHTML(value) + '"'
             end
-          }.join + ">"
+          }.to_s + ">"
       END
       s.sub!(/\Z/, " +") << append if append
       s
@@ -1511,7 +1486,7 @@ class CGI
             value[value.size - 1]
           end
         end
-      }.join
+      }.to_s
     end
 
 
@@ -1591,7 +1566,7 @@ class CGI
       if @output_hidden
         body += @output_hidden.collect{|k,v|
           "<INPUT TYPE=\"HIDDEN\" NAME=\"#{k}\" VALUE=\"#{v}\">"
-        }.join
+        }.to_s
       end
       super(attributes){body}
     end
@@ -1889,7 +1864,7 @@ class CGI
               }
             end
           end
-        }.join
+        }.to_s
       }
 
     end
@@ -1966,7 +1941,7 @@ class CGI
             value[value.size - 1]
           end
         end
-      }.join
+      }.to_s
     end
 
     # Generate a reset button Input element, as a String.
@@ -2296,15 +2271,15 @@ class CGI
       Apache.request.setup_cgi_env
     end
 
-      (class << self; self; end).class_eval do
-        const_set(:CGI_PARAMS,  [1])
-        const_set(:CGI_COOKIES, [2])
-      end
-
     extend QueryExtension
     @multipart = false
-
-    initialize_query()  # set @params, @cookies
+    if defined?(CGI_PARAMS)
+      warn "do not use CGI_PARAMS and CGI_COOKIES"
+      @params = CGI_PARAMS.dup
+      @cookies = CGI_COOKIES.dup
+    else
+      initialize_query()  # set @params, @cookies
+    end
     @output_cookies = nil
     @output_hidden = nil
 
diff --git a/lib/cgi/.document b/lib/cgi/.document
index 4153f97aa5..107f2f317c 100644
--- a/lib/cgi/.document
+++ b/lib/cgi/.document
@@ -1 +1,2 @@
-session.rb
-\ No newline at end of file
+session.rb
+
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index a9cfedd56b..a6e999bc34 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -365,7 +365,7 @@ class CGI
       #          on Unix systems).
       # prefix:: the prefix to add to the session id when generating
       #          the filename for this session's FileStore file.
-      #          Defaults to "cgi_sid_".
+      #          Defaults to the empty string.
       # suffix:: the prefix to add to the session id when generating
       #          the filename for this session's FileStore file.
       #          Defaults to the empty string.
@@ -374,7 +374,7 @@ class CGI
       # not exist, or opened if it does.
       def initialize(session, option={})
 	dir = option['tmpdir'] || Dir::tmpdir
-	prefix = option['prefix'] || 'cgi_sid_'
+	prefix = option['prefix'] || ''
 	suffix = option['suffix'] || ''
 	id = session.session_id
         require 'digest/md5'
@@ -494,42 +494,5 @@ class CGI
 	GLOBAL_HASH_TABLE.delete(@session_id)
       end
     end
-
-    # Dummy session storage class.
-    #
-    # Implements session storage place holder.  No actual storage
-    # will be done.
-    class NullStore
-      # Create a new NullStore instance.
-      #
-      # +session+ is the session this instance is associated with.
-      # +option+ is a list of initialisation options.  None are
-      # currently recognised.
-      def initialize(session, option=nil)
-      end
-
-      # Restore (empty) session state.
-      def restore
-        {}
-      end
-
-      # Update session state.
-      #
-      # A no-op.
-      def update
-      end
-
-      # Close session storage.
-      #
-      # A no-op.
-      def close
-      end
-
-      # Delete the session state.
-      #
-      # A no-op.
-      def delete
-      end
-    end
   end
 end
diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb
index 6039183363..3d204d5dc0 100644
--- a/lib/cgi/session/pstore.rb
+++ b/lib/cgi/session/pstore.rb
@@ -70,7 +70,7 @@ class CGI
       def restore
 	unless @hash
 	  @p.transaction do
-            @hash = @p['hash'] || {}
+           @hash = @p['hash'] || {}
 	  end
 	end
 	@hash
diff --git a/lib/cmath.rb b/lib/cmath.rb
deleted file mode 100644
index 158da4175d..0000000000
--- a/lib/cmath.rb
+++ /dev/null
@@ -1,223 +0,0 @@
-module CMath
-
-  include Math
-
-  alias exp! exp
-  alias log! log
-  alias log10! log10
-  alias sqrt! sqrt
-
-  alias sin! sin
-  alias cos! cos
-  alias tan! tan
-
-  alias sinh! sinh
-  alias cosh! cosh
-  alias tanh! tanh
-
-  alias asin! asin
-  alias acos! acos
-  alias atan! atan
-  alias atan2! atan2
-
-  alias asinh! asinh
-  alias acosh! acosh
-  alias atanh! atanh
-
-  def exp(z)
-    if Complex.generic?(z)
-      exp!(z)
-    else
-      Complex(exp!(z.real) * cos!(z.image),
-	      exp!(z.real) * sin!(z.image))
-    end
-  end
-
-  def log(*args)
-    z, b = args
-    if Complex.generic?(z) and z >= 0 and (b.nil? or b >= 0)
-      log!(*args)
-    else
-      r, theta = z.polar
-      a = Complex(log!(r.abs), theta)
-      if b
-	a /= log(b)
-      end
-      a
-    end
-  end
-
-  def log10(z)
-    if Complex.generic?(z)
-      log10!(z)
-    else
-      log(z) / log!(10)
-    end
-  end
-
-  def sqrt(z)
-    if Complex.generic?(z)
-      if z >= 0
-	sqrt!(z)
-      else
-	Complex(0,sqrt!(-z))
-      end
-    else
-      if z.image < 0
-	sqrt(z.conjugate).conjugate
-      else
-	r = z.abs
-	x = z.real
-	Complex(sqrt!((r + x) / 2), sqrt!((r - x) / 2))
-      end
-    end
-  end
-
-  def sin(z)
-    if Complex.generic?(z)
-      sin!(z)
-    else
-      Complex(sin!(z.real) * cosh!(z.image),
-	      cos!(z.real) * sinh!(z.image))
-    end
-  end
-
-  def cos(z)
-    if Complex.generic?(z)
-      cos!(z)
-    else
-      Complex(cos!(z.real) * cosh!(z.image),
-	      -sin!(z.real) * sinh!(z.image))
-    end
-  end
-
-  def tan(z)
-    if Complex.generic?(z)
-      tan!(z)
-    else
-      sin(z)/cos(z)
-    end
-  end
-
-  def sinh(z)
-    if Complex.generic?(z)
-      sinh!(z)
-    else
-      Complex(sinh!(z.real) * cos!(z.image),
-	      cosh!(z.real) * sin!(z.image))
-    end
-  end
-
-  def cosh(z)
-    if Complex.generic?(z)
-      cosh!(z)
-    else
-      Complex(cosh!(z.real) * cos!(z.image),
-	      sinh!(z.real) * sin!(z.image))
-    end
-  end
-
-  def tanh(z)
-    if Complex.generic?(z)
-      tanh!(z)
-    else
-      sinh(z) / cosh(z)
-    end
-  end
-
-  def asin(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      asin!(z)
-    else
-      -1.0.im * log(1.0.im * z + sqrt(1.0 - z * z))
-    end
-  end
-
-  def acos(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      acos!(z)
-    else
-      -1.0.im * log(z + 1.0.im * sqrt(1.0 - z * z))
-    end
-  end
-
-  def atan(z)
-    if Complex.generic?(z)
-      atan!(z)
-    else
-      1.0.im * log((1.0.im + z) / (1.0.im - z)) / 2.0
-    end
-  end
-
-  def atan2(y,x)
-    if Complex.generic?(y) and Complex.generic?(x)
-      atan2!(y,x)
-    else
-      -1.0.im * log((x + 1.0.im * y) / sqrt(x * x + y * y))
-    end
-  end
-
-  def acosh(z)
-    if Complex.generic?(z) and z >= 1
-      acosh!(z)
-    else
-      log(z + sqrt(z * z - 1.0))
-    end
-  end
-
-  def asinh(z)
-    if Complex.generic?(z)
-      asinh!(z)
-    else
-      log(z + sqrt(1.0 + z * z))
-    end
-  end
-
-  def atanh(z)
-    if Complex.generic?(z) and z >= -1 and z <= 1
-      atanh!(z)
-    else
-      log((1.0 + z) / (1.0 - z)) / 2.0
-    end
-  end
-
-  module_function :exp!
-  module_function :exp
-  module_function :log!
-  module_function :log
-  module_function :log10!
-  module_function :log10
-  module_function :sqrt!
-  module_function :sqrt
-
-  module_function :sin!
-  module_function :sin
-  module_function :cos!
-  module_function :cos
-  module_function :tan!
-  module_function :tan
-
-  module_function :sinh!
-  module_function :sinh
-  module_function :cosh!
-  module_function :cosh
-  module_function :tanh!
-  module_function :tanh
-
-  module_function :asin!
-  module_function :asin
-  module_function :acos!
-  module_function :acos
-  module_function :atan!
-  module_function :atan
-  module_function :atan2!
-  module_function :atan2
-
-  module_function :asinh!
-  module_function :asinh
-  module_function :acosh!
-  module_function :acosh
-  module_function :atanh!
-  module_function :atanh
-
-end
diff --git a/lib/complex.rb b/lib/complex.rb
index 0e88dd5f4f..fbf50ffece 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -1,4 +1,663 @@
-require 'cmath'
+#
+#   complex.rb - 
+#   	$Release Version: 0.5 $
+#   	$Revision: 1.3 $
+#   	$Date: 1998/07/08 10:05:28 $
+#   	by Keiju ISHITSUKA(SHL Japan Inc.)
+#
+# ----
+#
+# complex.rb implements the Complex class for complex numbers.  Additionally,
+# some methods in other Numeric classes are redefined or added to allow greater
+# interoperability with Complex numbers.
+#
+# Complex numbers can be created in the following manner:
+# - <tt>Complex(a, b)</tt>
+# - <tt>Complex.polar(radius, theta)</tt>
+#   
+# Additionally, note the following:
+# - <tt>Complex::I</tt> (the mathematical constant <i>i</i>)
+# - <tt>Numeric#im</tt> (e.g. <tt>5.im -> 0+5i</tt>)
+#
+# The following +Math+ module methods are redefined to handle Complex arguments.
+# They will work as normal with non-Complex arguments.
+#    sqrt exp cos sin tan log log10
+#    cosh sinh tanh acos asin atan atan2 acosh asinh atanh
+#
 
-Object.instance_eval{remove_const :Math}
-Math = CMath
+
+#
+# Numeric is a built-in class on which Fixnum, Bignum, etc., are based.  Here
+# some methods are added so that all number types can be treated to some extent
+# as Complex numbers.
+#
+class Numeric
+  #
+  # Returns a Complex number <tt>(0,<i>self</i>)</tt>.
+  #
+  def im
+    Complex(0, self)
+  end
+  
+  #
+  # The real part of a complex number, i.e. <i>self</i>.
+  #
+  def real
+    self
+  end
+  
+  #
+  # The imaginary part of a complex number, i.e. 0.
+  #
+  def image
+    0
+  end
+  alias imag image
+  
+  #
+  # See Complex#arg.
+  #
+  def arg
+    if self >= 0
+      return 0
+    else
+      return Math::PI
+    end
+  end
+  alias angle arg
+  
+  #
+  # See Complex#polar.
+  #
+  def polar
+    return abs, arg
+  end
+  
+  #
+  # See Complex#conjugate (short answer: returns <i>self</i>).
+  #
+  def conjugate
+    self
+  end
+  alias conj conjugate
+end
+
+
+#
+# Creates a Complex number.  +a+ and +b+ should be Numeric.  The result will be
+# <tt>a+bi</tt>.
+#
+def Complex(a, b = 0)
+  if b == 0 and (a.kind_of?(Complex) or defined? Complex::Unify)
+    a
+  else
+    Complex.new( a.real-b.imag, a.imag+b.real )
+  end
+end
+
+#
+# The complex number class.  See complex.rb for an overview.
+#
+class Complex < Numeric
+  @RCS_ID='-$Id: complex.rb,v 1.3 1998/07/08 10:05:28 keiju Exp keiju $-'
+
+  undef step
+  undef div, divmod
+  undef floor, truncate, ceil, round
+
+  def Complex.generic?(other) # :nodoc:
+    other.kind_of?(Integer) or
+    other.kind_of?(Float) or
+    (defined?(Rational) and other.kind_of?(Rational))
+  end
+
+  #
+  # Creates a +Complex+ number in terms of +r+ (radius) and +theta+ (angle).
+  #
+  def Complex.polar(r, theta)
+    Complex(r*Math.cos(theta), r*Math.sin(theta))
+  end
+
+  #
+  # Creates a +Complex+ number <tt>a</tt>+<tt>b</tt><i>i</i>.
+  #
+  def Complex.new!(a, b=0)
+    new(a,b)
+  end
+
+  def initialize(a, b)
+    raise TypeError, "non numeric 1st arg `#{a.inspect}'" if !a.kind_of? Numeric
+    raise TypeError, "`#{a.inspect}' for 1st arg" if a.kind_of? Complex
+    raise TypeError, "non numeric 2nd arg `#{b.inspect}'" if !b.kind_of? Numeric
+    raise TypeError, "`#{b.inspect}' for 2nd arg" if b.kind_of? Complex
+    @real = a
+    @image = b
+  end
+
+  #
+  # Addition with real or complex number.
+  #
+  def + (other)
+    if other.kind_of?(Complex)
+      re = @real + other.real
+      im = @image + other.image
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real + other, @image)
+    else
+      x , y = other.coerce(self)
+      x + y
+    end
+  end
+  
+  #
+  # Subtraction with real or complex number.
+  #
+  def - (other)
+    if other.kind_of?(Complex)
+      re = @real - other.real
+      im = @image - other.image
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real - other, @image)
+    else
+      x , y = other.coerce(self)
+      x - y
+    end
+  end
+  
+  #
+  # Multiplication with real or complex number.
+  #
+  def * (other)
+    if other.kind_of?(Complex)
+      re = @real*other.real - @image*other.image
+      im = @real*other.image + @image*other.real
+      Complex(re, im)
+    elsif Complex.generic?(other)
+      Complex(@real * other, @image * other)
+    else
+      x , y = other.coerce(self)
+      x * y
+    end
+  end
+  
+  #
+  # Division by real or complex number.
+  #
+  def / (other)
+    if other.kind_of?(Complex)
+      self*other.conjugate/other.abs2
+    elsif Complex.generic?(other)
+      Complex(@real/other, @image/other)
+    else
+      x, y = other.coerce(self)
+      x/y
+    end
+  end
+  
+  def quo(other)
+    Complex(@real.quo(1), @image.quo(1)) / other
+  end
+
+  #
+  # Raise this complex number to the given (real or complex) power.
+  #
+  def ** (other)
+    if other == 0
+      return Complex(1)
+    end
+    if other.kind_of?(Complex)
+      r, theta = polar
+      ore = other.real
+      oim = other.image
+      nr = Math.exp!(ore*Math.log!(r) - oim * theta)
+      ntheta = theta*ore + oim*Math.log!(r)
+      Complex.polar(nr, ntheta)
+    elsif other.kind_of?(Integer)
+      if other > 0
+	x = self
+	z = x
+	n = other - 1
+	while n != 0
+	  while (div, mod = n.divmod(2)
+		 mod == 0)
+	    x = Complex(x.real*x.real - x.image*x.image, 2*x.real*x.image)
+	    n = div
+	  end
+	  z *= x
+	  n -= 1
+	end
+	z
+      else
+	if defined? Rational
+	  (Rational(1) / self) ** -other
+	else
+	  self ** Float(other)
+	end
+      end
+    elsif Complex.generic?(other)
+      r, theta = polar
+      Complex.polar(r**other, theta*other)
+    else
+      x, y = other.coerce(self)
+      x**y
+    end
+  end
+  
+  #
+  # Remainder after division by a real or complex number.
+  #
+  def % (other)
+    if other.kind_of?(Complex)
+      Complex(@real % other.real, @image % other.image)
+    elsif Complex.generic?(other)
+      Complex(@real % other, @image % other)
+    else
+      x , y = other.coerce(self)
+      x % y
+    end
+  end
+  
+#--
+#    def divmod(other)
+#      if other.kind_of?(Complex)
+#        rdiv, rmod = @real.divmod(other.real)
+#        idiv, imod = @image.divmod(other.image)
+#        return Complex(rdiv, idiv), Complex(rmod, rmod)
+#      elsif Complex.generic?(other)
+#        Complex(@real.divmod(other), @image.divmod(other))
+#      else
+#        x , y = other.coerce(self)
+#        x.divmod(y)
+#      end
+#    end
+#++
+  
+  #
+  # Absolute value (aka modulus): distance from the zero point on the complex
+  # plane.
+  #
+  def abs
+    Math.hypot(@real, @image)
+  end
+  
+  #
+  # Square of the absolute value.
+  #
+  def abs2
+    @real*@real + @image*@image
+  end
+  
+  #
+  # Argument (angle from (1,0) on the complex plane).
+  #
+  def arg
+    Math.atan2!(@image, @real)
+  end
+  alias angle arg
+  
+  #
+  # Returns the absolute value _and_ the argument.
+  #
+  def polar
+    return abs, arg
+  end
+  
+  #
+  # Complex conjugate (<tt>z + z.conjugate = 2 * z.real</tt>).
+  #
+  def conjugate
+    Complex(@real, -@image)
+  end
+  alias conj conjugate
+  
+  #
+  # Compares the absolute values of the two numbers.
+  #
+  def <=> (other)
+    self.abs <=> other.abs
+  end
+  
+  #
+  # Test for numerical equality (<tt>a == a + 0<i>i</i></tt>).
+  #
+  def == (other)
+    if other.kind_of?(Complex)
+      @real == other.real and @image == other.image
+    elsif Complex.generic?(other)
+      @real == other and @image == 0
+    else
+      other == self
+    end
+  end
+
+  #
+  # Attempts to coerce +other+ to a Complex number.
+  #
+  def coerce(other)
+    if Complex.generic?(other)
+      return Complex.new!(other), self
+    else
+      super
+    end
+  end
+
+  #
+  # FIXME
+  #
+  def denominator
+    @real.denominator.lcm(@image.denominator)
+  end
+  
+  #
+  # FIXME
+  #
+  def numerator
+    cd = denominator
+    Complex(@real.numerator*(cd/@real.denominator),
+	    @image.numerator*(cd/@image.denominator))
+  end
+  
+  #
+  # Standard string representation of the complex number.
+  #
+  def to_s
+    if @real != 0
+      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+	if @image >= 0
+	  @real.to_s+"+("+@image.to_s+")i"
+	else
+	  @real.to_s+"-("+(-@image).to_s+")i"
+	end
+      else
+	if @image >= 0
+	  @real.to_s+"+"+@image.to_s+"i"
+	else
+	  @real.to_s+"-"+(-@image).to_s+"i"
+	end
+      end
+    else
+      if defined?(Rational) and @image.kind_of?(Rational) and @image.denominator != 1
+	"("+@image.to_s+")i"
+      else
+	@image.to_s+"i"
+      end
+    end
+  end
+  
+  #
+  # Returns a hash code for the complex number.
+  #
+  def hash
+    @real.hash ^ @image.hash
+  end
+  
+  #
+  # Returns "<tt>Complex(<i>real</i>, <i>image</i>)</tt>".
+  #
+  def inspect
+    sprintf("Complex(%s, %s)", @real.inspect, @image.inspect)
+  end
+
+  
+  #
+  # +I+ is the imaginary number.  It exists at point (0,1) on the complex plane.
+  #
+  I = Complex(0,1)
+  
+  # The real part of a complex number.
+  attr :real
+
+  # The imaginary part of a complex number.
+  attr :image
+  alias imag image
+  
+end
+
+class Integer
+
+  unless defined?(1.numerator)
+    def numerator() self end
+    def denominator() 1 end
+
+    def gcd(other)
+      min = self.abs
+      max = other.abs
+      while min > 0
+        tmp = min
+        min = max % min
+        max = tmp
+      end
+      max
+    end
+
+    def lcm(other)
+      if self.zero? or other.zero?
+        0
+      else
+        (self.div(self.gcd(other)) * other).abs
+      end
+    end
+
+  end
+
+end
+
+module Math
+  alias sqrt! sqrt
+  alias exp! exp
+  alias log! log
+  alias log10! log10
+  alias cos! cos
+  alias sin! sin
+  alias tan! tan
+  alias cosh! cosh
+  alias sinh! sinh
+  alias tanh! tanh
+  alias acos! acos
+  alias asin! asin
+  alias atan! atan
+  alias atan2! atan2
+  alias acosh! acosh
+  alias asinh! asinh
+  alias atanh! atanh  
+
+  # Redefined to handle a Complex argument.
+  def sqrt(z)
+    if Complex.generic?(z)
+      if z >= 0
+	sqrt!(z)
+      else
+	Complex(0,sqrt!(-z))
+      end
+    else
+      if z.image < 0
+	sqrt(z.conjugate).conjugate
+      else
+	r = z.abs
+	x = z.real
+	Complex( sqrt!((r+x)/2), sqrt!((r-x)/2) )
+      end
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def exp(z)
+    if Complex.generic?(z)
+      exp!(z)
+    else
+      Complex(exp!(z.real) * cos!(z.image), exp!(z.real) * sin!(z.image))
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def cos(z)
+    if Complex.generic?(z)
+      cos!(z)
+    else
+      Complex(cos!(z.real)*cosh!(z.image),
+	      -sin!(z.real)*sinh!(z.image))
+    end
+  end
+    
+  # Redefined to handle a Complex argument.
+  def sin(z)
+    if Complex.generic?(z)
+      sin!(z)
+    else
+      Complex(sin!(z.real)*cosh!(z.image),
+	      cos!(z.real)*sinh!(z.image))
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def tan(z)
+    if Complex.generic?(z)
+      tan!(z)
+    else
+      sin(z)/cos(z)
+    end
+  end
+
+  def sinh(z)
+    if Complex.generic?(z)
+      sinh!(z)
+    else
+      Complex( sinh!(z.real)*cos!(z.image), cosh!(z.real)*sin!(z.image) )
+    end
+  end
+
+  def cosh(z)
+    if Complex.generic?(z)
+      cosh!(z)
+    else
+      Complex( cosh!(z.real)*cos!(z.image), sinh!(z.real)*sin!(z.image) )
+    end
+  end
+
+  def tanh(z)
+    if Complex.generic?(z)
+      tanh!(z)
+    else
+      sinh(z)/cosh(z)
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def log(z)
+    if Complex.generic?(z) and z >= 0
+      log!(z)
+    else
+      r, theta = z.polar
+      Complex(log!(r.abs), theta)
+    end
+  end
+  
+  # Redefined to handle a Complex argument.
+  def log10(z)
+    if Complex.generic?(z)
+      log10!(z)
+    else
+      log(z)/log!(10)
+    end
+  end
+
+  def acos(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      acos!(z)
+    else
+      -1.0.im * log( z + 1.0.im * sqrt(1.0-z*z) )
+    end
+  end
+
+  def asin(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      asin!(z)
+    else
+      -1.0.im * log( 1.0.im * z + sqrt(1.0-z*z) )
+    end
+  end
+
+  def atan(z)
+    if Complex.generic?(z)
+      atan!(z)
+    else
+      1.0.im * log( (1.0.im+z) / (1.0.im-z) ) / 2.0
+    end
+  end
+
+  def atan2(y,x)
+    if Complex.generic?(y) and Complex.generic?(x)
+      atan2!(y,x)
+    else
+      -1.0.im * log( (x+1.0.im*y) / sqrt(x*x+y*y) )
+    end
+  end
+
+  def acosh(z)
+    if Complex.generic?(z) and z >= 1
+      acosh!(z)
+    else
+      log( z + sqrt(z*z-1.0) )
+    end
+  end
+
+  def asinh(z)
+    if Complex.generic?(z)
+      asinh!(z)
+    else
+      log( z + sqrt(1.0+z*z) )
+    end
+  end
+
+  def atanh(z)
+    if Complex.generic?(z) and z >= -1 and z <= 1
+      atanh!(z)
+    else
+      log( (1.0+z) / (1.0-z) ) / 2.0
+    end
+  end
+
+  module_function :sqrt!
+  module_function :sqrt
+  module_function :exp!
+  module_function :exp
+  module_function :log!
+  module_function :log
+  module_function :log10!
+  module_function :log10
+  module_function :cosh!
+  module_function :cosh
+  module_function :cos!
+  module_function :cos
+  module_function :sinh!
+  module_function :sinh
+  module_function :sin!
+  module_function :sin
+  module_function :tan!
+  module_function :tan
+  module_function :tanh!
+  module_function :tanh
+  module_function :acos!
+  module_function :acos
+  module_function :asin!
+  module_function :asin
+  module_function :atan!
+  module_function :atan
+  module_function :atan2!
+  module_function :atan2
+  module_function :acosh!
+  module_function :acosh
+  module_function :asinh!
+  module_function :asinh
+  module_function :atanh!
+  module_function :atanh
+  
+end
+
+# Documentation comments:
+#  - source: original (researched from pickaxe)
+#  - a couple of fixme's
+#  - RDoc output for Bignum etc. is a bit short, with nothing but an
+#    (undocumented) alias.  No big deal.
diff --git a/lib/csv.rb b/lib/csv.rb
index f60d5b1cb0..f6c12fa285 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1,1892 +1,992 @@
-#!/usr/local/bin/ruby -w
-
-# = csv.rb -- CSV Reading and Writing
-#
-#  Created by James Edward Gray II on 2005-10-31.
-#  Copyright 2005 James Edward Gray II. You can redistribute or modify this code
-#  under the terms of Ruby's license.
-# 
-# See CSV for documentation.
-# 
-# == Description
-# 
-# Welcome to the new and improved CSV.
-# 
-# This version of the CSV library began its life as FasterCSV.  FasterCSV was
-# intended as a replacement to Ruby's then standard CSV library.  It was
-# designed to address concerns users of that library had and it had three
-# primary goals:
-# 
-# 1.  Be significantly faster than CSV while remaining a pure Ruby library.
-# 2.  Use a smaller and easier to maintain code base.  (FasterCSV eventually
-#     grew larger, was also but considerably richer in features.  The parsing
-#     core remains quite small.)
-# 3.  Improve on the CSV interface.
-# 
-# Obviously, the last one is subjective.  I did try to defer to the original
-# interface whenever I didn't have a compelling reason to change it though, so
-# hopefully this won't be too radically different.
-# 
-# We must have met our goals because FasterCSV was renamed to CSV and replaced
-# the original library.
-# 
-# == What's Different From the Old CSV?
-# 
-# I'm sure I'll miss something, but I'll try to mention most of the major
-# differences I am aware of, to help others quickly get up to speed:
-# 
-# === CSV Parsing
-# 
-# * This library has a stricter parser and will throw MalformedCSVErrors on
-#   problematic data.
-# * This library has a less liberal idea of a line ending than CSV.  What you
-#   set as the <tt>:row_sep</tt> is law.  It can auto-detect your line endings
-#   though.
-# * The old library returned empty lines as <tt>[nil]</tt>.  This library calls
-#   them <tt>[]</tt>.
-# * This library has a much faster parser.
-# 
-# === Interface
-# 
-# * CSV now uses Hash-style parameters to set options.
-# * CSV no longer has generate_row() or parse_row().
-# * The old CSV's Reader and Writer classes have been dropped.
-# * CSV::open() is now more like Ruby's open().
-# * CSV objects now support most standard IO methods.
-# * CSV now has a new() method used to wrap objects like String and IO for
-#   reading and writing.
-# * CSV::generate() is different from the old method.
-# * CSV no longer supports partial reads.  It works line-by-line.
-# * CSV no longer allows the instance methods to override the separators for
-#   performance reasons.  They must be set in the constructor.
-# 
-# If you use this library and find yourself missing any functionality I have
-# trimmed, please {let me know}[mailto:james@grayproductions.net].
-# 
-# == Documentation
-# 
-# See CSV for documentation.
-# 
-# == What is CSV, really?
-# 
-# CSV maintains a pretty strict definition of CSV taken directly from
-# {the RFC}[http://www.ietf.org/rfc/rfc4180.txt].  I relax the rules in only one
-# place and that is to make using this library easier.  CSV will parse all valid
-# CSV.
-# 
-# What you don't want to do is feed CSV invalid data.  Because of the way the
-# CSV format works, it's common for a parser to need to read until the end of
-# the file to be sure a field is invalid.  This eats a lot of time and memory.
-# 
-# Luckily, when working with invalid CSV, Ruby's built-in methods will almost
-# always be superior in every way.  For example, parsing non-quoted fields is as
-# easy as:
-# 
-#   data.split(",")
-# 
-# == Questions and/or Comments
-# 
-# Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net]
-# with any questions.
-
-require "forwardable"
-require "English"
-require "enumerator"
-require "date"
-require "stringio"
-
-# 
-# This class provides a complete interface to CSV files and data.  It offers
-# tools to enable you to read and write to and from Strings or IO objects, as
-# needed.
-# 
-# == Reading
-# 
-# === From a File
-# 
-# ==== A Line at a Time
-# 
-#   CSV.foreach("path/to/file.csv") do |row|
-#     # use row here...
-#   end
-# 
-# ==== All at Once
-# 
-#   arr_of_arrs = CSV.read("path/to/file.csv")
-# 
-# === From a String
-# 
-# ==== A Line at a Time
-# 
-#   CSV.parse("CSV,data,String") do |row|
-#     # use row here...
-#   end
-# 
-# ==== All at Once
-# 
-#   arr_of_arrs = CSV.parse("CSV,data,String")
-# 
-# == Writing
-# 
-# === To a File
-# 
-#   CSV.open("path/to/file.csv", "w") do |csv|
-#     csv << ["row", "of", "CSV", "data"]
-#     csv << ["another", "row"]
-#     # ...
-#   end
-# 
-# === To a String
-# 
-#   csv_string = CSV.generate do |csv|
-#     csv << ["row", "of", "CSV", "data"]
-#     csv << ["another", "row"]
-#     # ...
-#   end
-# 
-# == Convert a Single Line
-# 
-#   csv_string = ["CSV", "data"].to_csv   # to CSV
-#   csv_array  = "CSV,String".parse_csv   # from CSV
-# 
-# == Shortcut Interface
-# 
-#   CSV             { |csv_out| csv_out << %w{my data here} }  # to $stdout
-#   CSV(csv = "")   { |csv_str| csv_str << %w{my data here} }  # to a String
-#   CSV($stderr)    { |csv_err| csv_err << %w{my data here} }  # to $stderr
-# 
-class CSV
-  # The version of the installed library.
-  VERSION = "2.0.0".freeze
+# CSV -- module for generating/parsing CSV data.
+# Copyright (C) 2000-2004  NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>.
   
-  # 
-  # A CSV::Row is part Array and part Hash.  It retains an order for the fields
-  # and allows duplicates just as an Array would, but also allows you to access
-  # fields by name just as you could if they were in a Hash.
-  # 
-  # All rows returned by CSV will be constructed from this class, if header row
-  # processing is activated.
-  # 
-  class Row
-    # 
-    # Construct a new CSV::Row from +headers+ and +fields+, which are expected
-    # to be Arrays.  If one Array is shorter than the other, it will be padded
-    # with +nil+ objects.
-    # 
-    # The optional +header_row+ parameter can be set to +true+ to indicate, via
-    # CSV::Row.header_row?() and CSV::Row.field_row?(), that this is a header
-    # row.  Otherwise, the row is assumes to be a field row.
-    # 
-    # A CSV::Row object supports the following Array methods through delegation:
-    # 
-    # * empty?()
-    # * length()
-    # * size()
-    # 
-    def initialize(headers, fields, header_row = false)
-      @header_row = header_row
-      
-      # handle extra headers or fields
-      @row = if headers.size > fields.size
-        headers.each_with_index.map { |header, i| [header, fields[i]] }
-      else
-        fields.each_with_index.map { |field, i| [headers[i], field] }
-      end
+# $Id$
+  
+# This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
+# redistribute it and/or modify it under the same terms of Ruby's license;
+# either the dual license version in 2003, or any later version.
+  
+  
+class CSV
+  class IllegalFormatError < RuntimeError; end
+
+  # deprecated
+  class Cell < String
+    def initialize(data = "", is_null = false)
+      super(is_null ? "" : data)
+    end
+
+    def data
+      to_s
+    end
+  end
+
+  # deprecated
+  class Row < Array
+  end
+
+  # Open a CSV formatted file for reading or writing.
+  #
+  # For reading.
+  #
+  # EXAMPLE 1
+  #   CSV.open('csvfile.csv', 'r') do |row|
+  #     p row
+  #   end
+  #
+  # EXAMPLE 2
+  #   reader = CSV.open('csvfile.csv', 'r')
+  #   row1 = reader.shift
+  #   row2 = reader.shift
+  #   if row2.empty?
+  #     p 'row2 not find.'
+  #   end
+  #   reader.close
+  #
+  # ARGS
+  #   filename: filename to parse.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   reader instance.  To get parse result, see CSV::Reader#each.
+  #
+  #
+  # For writing.
+  #
+  # EXAMPLE 1
+  #   CSV.open('csvfile.csv', 'w') do |writer|
+  #     writer << ['r1c1', 'r1c2']
+  #     writer << ['r2c1', 'r2c2']
+  #     writer << [nil, nil]
+  #   end
+  #
+  # EXAMPLE 2
+  #   writer = CSV.open('csvfile.csv', 'w')
+  #   writer << ['r1c1', 'r1c2'] << ['r2c1', 'r2c2'] << [nil, nil]
+  #   writer.close
+  #
+  # ARGS
+  #   filename: filename to generate.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   writer instance.  See CSV::Writer#<< and CSV::Writer#add_row to know how
+  #   to generate CSV string.
+  #
+  def CSV.open(path, mode, fs = nil, rs = nil, &block)
+    if mode == 'r' or mode == 'rb'
+      open_reader(path, mode, fs, rs, &block)
+    elsif mode == 'w' or mode == 'wb'
+      open_writer(path, mode, fs, rs, &block)
+    else
+      raise ArgumentError.new("'mode' must be 'r', 'rb', 'w', or 'wb'")
     end
-    
-    # Internal data format used to compare equality.
-    attr_reader :row
-    protected   :row
+  end
 
-    ### Array Delegation ###
+  def CSV.foreach(path, rs = nil, &block)
+    open_reader(path, 'r', ',', rs, &block)
+  end
 
-    extend Forwardable
-    def_delegators :@row, :empty?, :length, :size
-    
-    # Returns +true+ if this is a header row.
-    def header_row?
-      @header_row
-    end
-    
-    # Returns +true+ if this is a field row.
-    def field_row?
-      not header_row?
-    end
-    
-    # Returns the headers of this row.
-    def headers
-      @row.map { |pair| pair.first }
+  def CSV.read(path, length = nil, offset = nil)
+    CSV.parse(IO.read(path, length, offset))
+  end
+  
+  def CSV.readlines(path, rs = nil)
+    reader = open_reader(path, 'r', ',', rs)
+    begin
+      reader.collect { |row| row }
+    ensure
+      reader.close
     end
-    
-    # 
-    # :call-seq:
-    #   field( header )
-    #   field( header, offset )
-    #   field( index )
-    # 
-    # This method will fetch the field value by +header+ or +index+.  If a field
-    # is not found, +nil+ is returned.
-    # 
-    # When provided, +offset+ ensures that a header match occurrs on or later
-    # than the +offset+ index.  You can use this to find duplicate headers, 
-    # without resorting to hard-coding exact indices.
-    # 
-    def field(header_or_index, minimum_index = 0)
-      # locate the pair
-      finder = header_or_index.is_a?(Integer) ? :[] : :assoc
-      pair   = @row[minimum_index..-1].send(finder, header_or_index)
+  end
+
+  def CSV.generate(path, fs = nil, rs = nil, &block)
+    open_writer(path, 'w', fs, rs, &block)
+  end
 
-      # return the field if we have a pair
-      pair.nil? ? nil : pair.last
+  # Parse lines from given string or stream.  Return rows as an Array of Arrays.
+  def CSV.parse(str_or_readable, fs = nil, rs = nil, &block)
+    if File.exist?(str_or_readable)
+      STDERR.puts("CSV.parse(filename) is deprecated." +
+        "  Use CSV.open(filename, 'r') instead.")
+      return open_reader(str_or_readable, 'r', fs, rs, &block)
     end
-    alias_method :[], :field
-    
-    # 
-    # :call-seq:
-    #   []=( header, value )
-    #   []=( header, offset, value )
-    #   []=( index, value )
-    # 
-    # Looks up the field by the semantics described in CSV::Row.field() and
-    # assigns the +value+.
-    # 
-    # Assigning past the end of the row with an index will set all pairs between
-    # to <tt>[nil, nil]</tt>.  Assigning to an unused header appends the new
-    # pair.
-    # 
-    def []=(*args)
-      value = args.pop
-      
-      if args.first.is_a? Integer
-        if @row[args.first].nil?  # extending past the end with index
-          @row[args.first] = [nil, value]
-          @row.map! { |pair| pair.nil? ? [nil, nil] : pair }
-        else                      # normal index assignment
-          @row[args.first][1] = value
-        end
-      else
-        index = index(*args)
-        if index.nil?             # appending a field
-          self << [args.first, value]
-        else                      # normal header assignment
-          @row[index][1] = value
-        end
+    if block
+      CSV::Reader.parse(str_or_readable, fs, rs) do |row|
+        yield(row)
       end
+      nil
+    else
+      CSV::Reader.create(str_or_readable, fs, rs).collect { |row| row }
     end
-    
-    # 
-    # :call-seq:
-    #   <<( field )
-    #   <<( header_and_field_array )
-    #   <<( header_and_field_hash )
-    # 
-    # If a two-element Array is provided, it is assumed to be a header and field
-    # and the pair is appended.  A Hash works the same way with the key being
-    # the header and the value being the field.  Anything else is assumed to be
-    # a lone field which is appended with a +nil+ header.
-    # 
-    # This method returns the row for chaining.
-    # 
-    def <<(arg)
-      if arg.is_a?(Array) and arg.size == 2  # appending a header and name
-        @row << arg
-      elsif arg.is_a?(Hash)                  # append header and name pairs
-        arg.each { |pair| @row << pair }
-      else                                   # append field value
-        @row << [nil, arg]
-      end
-      
-      self  # for chaining
+  end
+
+  # Parse a line from given string.  Bear in mind it parses ONE LINE.  Rest of
+  # the string is ignored for example "a,b\r\nc,d" => ['a', 'b'] and the
+  # second line 'c,d' is ignored.
+  #
+  # If you don't know whether a target string to parse is exactly 1 line or
+  # not, use CSV.parse_row instead of this method.
+  def CSV.parse_line(src, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
     end
-    
-    # 
-    # A shortcut for appending multiple fields.  Equivalent to:
-    # 
-    #   args.each { |arg| csv_row << arg }
-    # 
-    # This method returns the row for chaining.
-    # 
-    def push(*args)
-      args.each { |arg| self << arg }
-      
-      self  # for chaining
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
     end
-    
-    # 
-    # :call-seq:
-    #   delete( header )
-    #   delete( header, offset )
-    #   delete( index )
-    # 
-    # Used to remove a pair from the row by +header+ or +index+.  The pair is
-    # located as described in CSV::Row.field().  The deleted pair is returned,
-    # or +nil+ if a pair could not be found.
-    # 
-    def delete(header_or_index, minimum_index = 0)
-      if header_or_index.is_a? Integer  # by index
-        @row.delete_at(header_or_index)
-      else                              # by header
-        @row.delete_at(index(header_or_index, minimum_index))
+    idx = 0
+    res_type = :DT_COLSEP
+    row = []
+    begin
+      while res_type == :DT_COLSEP
+        res_type, idx, cell = parse_body(src, idx, fs, rs)
+        row << cell
       end
+    rescue IllegalFormatError
+      return []
     end
-    
-    # 
-    # The provided +block+ is passed a header and field for each pair in the row
-    # and expected to return +true+ or +false+, depending on whether the pair
-    # should be deleted.
-    # 
-    # This method returns the row for chaining.
-    # 
-    def delete_if(&block)
-      @row.delete_if(&block)
-      
-      self  # for chaining
-    end
-    
-    # 
-    # This method accepts any number of arguments which can be headers, indices,
-    # Ranges of either, or two-element Arrays containing a header and offset.  
-    # Each argument will be replaced with a field lookup as described in
-    # CSV::Row.field().
-    # 
-    # If called with no arguments, all fields are returned.
-    # 
-    def fields(*headers_and_or_indices)
-      if headers_and_or_indices.empty?  # return all fields--no arguments
-        @row.map { |pair| pair.last }
-      else                              # or work like values_at()
-        headers_and_or_indices.inject(Array.new) do |all, h_or_i|
-          all + if h_or_i.is_a? Range
-            index_begin = h_or_i.begin.is_a?(Integer) ? h_or_i.begin :
-                                                        index(h_or_i.begin)
-            index_end   = h_or_i.end.is_a?(Integer)   ? h_or_i.end :
-                                                        index(h_or_i.end)
-            new_range   = h_or_i.exclude_end? ? (index_begin...index_end) :
-                                                (index_begin..index_end)
-            fields.values_at(new_range)
-          else
-            [field(*Array(h_or_i))]
+    row
+  end
+
+  # Create a line from cells.  each cell is stringified by to_s.
+  def CSV.generate_line(row, fs = nil, rs = nil)
+    if row.size == 0
+      return ''
+    end
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    res_type = :DT_COLSEP
+    result_str = ''
+    idx = 0
+    while true
+      generate_body(row[idx], result_str, fs, rs)
+      idx += 1
+      if (idx == row.size)
+        break
+      end
+      generate_separator(:DT_COLSEP, result_str, fs, rs)
+    end
+    result_str
+  end
+  
+  # Parse a line from string.  Consider using CSV.parse_line instead.
+  # To parse lines in CSV string, see EXAMPLE below.
+  #
+  # EXAMPLE
+  #   src = "a,b\r\nc,d\r\ne,f"
+  #   idx = 0
+  #   begin
+  #     parsed = []
+  #     parsed_cells, idx = CSV.parse_row(src, idx, parsed)
+  #     puts "Parsed #{ parsed_cells } cells."
+  #     p parsed
+  #   end while parsed_cells > 0
+  #
+  # ARGS
+  #   src: a CSV data to be parsed.  Must respond '[](idx)'.
+  #     src[](idx) must return a char. (Not a string such as 'a', but 97).
+  #     src[](idx_out_of_bounds) must return nil.  A String satisfies this
+  #     requirement.
+  #   idx: index of parsing location of 'src'.  0 origin.
+  #   out_dev: buffer for parsed cells.  Must respond '<<(aString)'.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   parsed_cells: num of parsed cells.
+  #   idx: index of next parsing location of 'src'.
+  #
+  def CSV.parse_row(src, idx, out_dev, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    idx_backup = idx
+    parsed_cells = 0
+    res_type = :DT_COLSEP
+    begin
+      while res_type != :DT_ROWSEP
+        res_type, idx, cell = parse_body(src, idx, fs, rs)
+        if res_type == :DT_EOS
+          if idx == idx_backup #((parsed_cells == 0) and cell.nil?)
+            return 0, 0
           end
+          res_type = :DT_ROWSEP
         end
-      end
-    end
-    alias_method :values_at, :fields
-    
-    # 
-    # :call-seq:
-    #   index( header )
-    #   index( header, offset )
-    # 
-    # This method will return the index of a field with the provided +header+.
-    # The +offset+ can be used to locate duplicate header names, as described in
-    # CSV::Row.field().
-    # 
-    def index(header, minimum_index = 0)
-      # find the pair
-      index = headers[minimum_index..-1].index(header)
-      # return the index at the right offset, if we found one
-      index.nil? ? nil : index + minimum_index
-    end
-    
-    # Returns +true+ if +name+ is a header for this row, and +false+ otherwise.
-    def header?(name)
-      headers.include? name
-    end
-    alias_method :include?, :header?
-    
-    # 
-    # Returns +true+ if +data+ matches a field in this row, and +false+
-    # otherwise.
-    # 
-    def field?(data)
-      fields.include? data
-    end
-
-    include Enumerable
-    
-    # 
-    # Yields each pair of the row as header and field tuples (much like
-    # iterating over a Hash).
-    # 
-    # Support for Enumerable.
-    # 
-    # This method returns the row for chaining.
-    # 
-    def each(&block)
-      @row.each(&block)
-      
-      self  # for chaining
-    end
-    
-    # 
-    # Returns +true+ if this row contains the same headers and fields in the 
-    # same order as +other+.
-    # 
-    def ==(other)
-      @row == other.row
-    end
-    
-    # 
-    # Collapses the row into a simple Hash.  Be warning that this discards field
-    # order and clobbers duplicate fields.
-    # 
-    def to_hash
-      # flatten just one level of the internal Array
-      Hash[*@row.inject(Array.new) { |ary, pair| ary.push(*pair) }]
-    end
-    
-    # 
-    # Returns the row as a CSV String.  Headers are not used.  Equivalent to:
-    # 
-    #   csv_row.fields.to_csv( options )
-    # 
-    def to_csv(options = Hash.new)
-      fields.to_csv(options)
+        parsed_cells += 1
+        out_dev << cell
+      end
+    rescue IllegalFormatError
+      return 0, 0
+    end
+    return parsed_cells, idx
+  end
+  
+  # Convert a line from cells data to string.  Consider using CSV.generate_line
+  # instead.  To generate multi-row CSV string, see EXAMPLE below.
+  #
+  # EXAMPLE
+  #   row1 = ['a', 'b']
+  #   row2 = ['c', 'd']
+  #   row3 = ['e', 'f']
+  #   src = [row1, row2, row3]
+  #   buf = ''
+  #   src.each do |row|
+  #     parsed_cells = CSV.generate_row(row, 2, buf)
+  #     puts "Created #{ parsed_cells } cells."
+  #   end
+  #   p buf
+  #
+  # ARGS
+  #   src: an Array of String to be converted to CSV string.  Must respond to
+  #     'size' and '[](idx)'.  src[idx] must return String.
+  #   cells: num of cells in a line.
+  #   out_dev: buffer for generated CSV string.  Must respond to '<<(string)'.
+  #   col_sep: Column separator.  ?, by default.  If you want to separate
+  #     fields with semicolon, give ?; here.
+  #   row_sep: Row separator.  nil by default.  nil means "\r\n or \n".  If you
+  #     want to separate records with \r, give ?\r here.
+  #
+  # RETURNS
+  #   parsed_cells: num of converted cells.
+  #
+  def CSV.generate_row(src, cells, out_dev, fs = nil, rs = nil)
+    fs ||= ','
+    if fs.is_a?(Fixnum)
+      fs = fs.chr
+    end
+    if !rs.nil? and rs.is_a?(Fixnum)
+      rs = rs.chr
+    end
+    src_size = src.size
+    if (src_size == 0)
+      if cells == 0
+        generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+      end
+      return 0
+    end
+    res_type = :DT_COLSEP
+    parsed_cells = 0
+    generate_body(src[parsed_cells], out_dev, fs, rs)
+    parsed_cells += 1
+    while ((parsed_cells < cells) and (parsed_cells != src_size))
+      generate_separator(:DT_COLSEP, out_dev, fs, rs)
+      generate_body(src[parsed_cells], out_dev, fs, rs)
+      parsed_cells += 1
+    end
+    if (parsed_cells == cells)
+      generate_separator(:DT_ROWSEP, out_dev, fs, rs)
+    else
+      generate_separator(:DT_COLSEP, out_dev, fs, rs)
     end
-    alias_method :to_s, :to_csv
+    parsed_cells
   end
   
-  # 
-  # A CSV::Table is a two-dimensional data structure for representing CSV
-  # documents.  Tables allow you to work with the data by row or column, 
-  # manipulate the data, and even convert the results back to CSV, if needed.
-  # 
-  # All tables returned by CSV will be constructed from this class, if header
-  # row processing is activated.
-  # 
-  class Table
-    # 
-    # Construct a new CSV::Table from +array_of_rows+, which are expected
-    # to be CSV::Row objects.  All rows are assumed to have the same headers.
-    # 
-    # A CSV::Table object supports the following Array methods through
-    # delegation:
-    # 
-    # * empty?()
-    # * length()
-    # * size()
-    # 
-    def initialize(array_of_rows)
-      @table = array_of_rows
-      @mode  = :col_or_row
-    end
-    
-    # The current access mode for indexing and iteration.
-    attr_reader :mode
-    
-    # Internal data format used to compare equality.
-    attr_reader :table
-    protected   :table
-
-    ### Array Delegation ###
+  # Private class methods.
+  class << self
+  private
 
-    extend Forwardable
-    def_delegators :@table, :empty?, :length, :size
-    
-    # 
-    # Returns a duplicate table object, in column mode.  This is handy for 
-    # chaining in a single call without changing the table mode, but be aware 
-    # that this method can consume a fair amount of memory for bigger data sets.
-    # 
-    # This method returns the duplicate table for chaining.  Don't chain
-    # destructive methods (like []=()) this way though, since you are working
-    # with a duplicate.
-    # 
-    def by_col
-      self.class.new(@table.dup).by_col!
-    end
-    
-    # 
-    # Switches the mode of this table to column mode.  All calls to indexing and
-    # iteration methods will work with columns until the mode is changed again.
-    # 
-    # This method returns the table and is safe to chain.
-    # 
-    def by_col!
-      @mode = :col
-      
-      self
-    end
-    
-    # 
-    # Returns a duplicate table object, in mixed mode.  This is handy for 
-    # chaining in a single call without changing the table mode, but be aware 
-    # that this method can consume a fair amount of memory for bigger data sets.
-    # 
-    # This method returns the duplicate table for chaining.  Don't chain
-    # destructive methods (like []=()) this way though, since you are working
-    # with a duplicate.
-    # 
-    def by_col_or_row
-      self.class.new(@table.dup).by_col_or_row!
-    end
-    
-    # 
-    # Switches the mode of this table to mixed mode.  All calls to indexing and
-    # iteration methods will use the default intelligent indexing system until
-    # the mode is changed again.  In mixed mode an index is assumed to be a row
-    # reference while anything else is assumed to be column access by headers.
-    # 
-    # This method returns the table and is safe to chain.
-    # 
-    def by_col_or_row!
-      @mode = :col_or_row
-      
-      self
-    end
-    
-    # 
-    # Returns a duplicate table object, in row mode.  This is handy for chaining
-    # in a single call without changing the table mode, but be aware that this
-    # method can consume a fair amount of memory for bigger data sets.
-    # 
-    # This method returns the duplicate table for chaining.  Don't chain
-    # destructive methods (like []=()) this way though, since you are working
-    # with a duplicate.
-    # 
-    def by_row
-      self.class.new(@table.dup).by_row!
-    end
-    
-    # 
-    # Switches the mode of this table to row mode.  All calls to indexing and
-    # iteration methods will work with rows until the mode is changed again.
-    # 
-    # This method returns the table and is safe to chain.
-    # 
-    def by_row!
-      @mode = :row
-      
-      self
-    end
-    
-    # 
-    # Returns the headers for the first row of this table (assumed to match all
-    # other rows).  An empty Array is returned for empty tables.
-    # 
-    def headers
-      if @table.empty?
-        Array.new
+    def open_reader(path, mode, fs, rs, &block)
+      file = File.open(path, mode)
+      if block
+        begin
+          CSV::Reader.parse(file, fs, rs) do |row|
+            yield(row)
+          end
+        ensure
+          file.close
+        end
+        nil
       else
-        @table.first.headers
-      end
-    end
-    
-    # 
-    # In the default mixed mode, this method returns rows for index access and
-    # columns for header access.  You can force the index association by first
-    # calling by_col!() or by_row!().
-    # 
-    # Columns are returned as an Array of values.  Altering that Array has no
-    # effect on the table.
-    # 
-    def [](index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and index_or_header.is_a? Integer)
-        @table[index_or_header]
-      else                 # by header
-        @table.map { |row| row[index_or_header] }
+        reader = CSV::Reader.create(file, fs, rs)
+        reader.close_on_terminate
+        reader
       end
     end
-    
-    # 
-    # In the default mixed mode, this method assigns rows for index access and
-    # columns for header access.  You can force the index association by first
-    # calling by_col!() or by_row!().
-    # 
-    # Rows may be set to an Array of values (which will inherit the table's
-    # headers()) or a CSV::Row.
-    # 
-    # Columns may be set to a single value, which is copied to each row of the 
-    # column, or an Array of values.  Arrays of values are assigned to rows top
-    # to bottom in row major order.  Excess values are ignored and if the Array
-    # does not have a value for each row the extra rows will receive a +nil+.
-    # 
-    # Assigning to an existing column or row clobbers the data.  Assigning to
-    # new columns creates them at the right end of the table.
-    # 
-    def []=(index_or_header, value)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and index_or_header.is_a? Integer)
-        if value.is_a? Array
-          @table[index_or_header] = Row.new(headers, value)
-        else
-          @table[index_or_header] = value
+
+    def open_writer(path, mode, fs, rs, &block)
+      file = File.open(path, mode)
+      if block
+        begin
+          CSV::Writer.generate(file, fs, rs) do |writer|
+            yield(writer)
+          end
+        ensure
+          file.close
         end
-      else                 # set column
-        if value.is_a? Array  # multiple values
-          @table.each_with_index do |row, i|
-            if row.header_row?
-              row[index_or_header] = index_or_header
-            else
-              row[index_or_header] = value[i]
+        nil
+      else
+        writer = CSV::Writer.create(file, fs, rs) 
+        writer.close_on_terminate
+        writer
+      end
+    end
+
+    def parse_body(src, idx, fs, rs)
+      fs_str = fs
+      fs_size = fs_str.size
+      rs_str = rs || "\n"
+      rs_size = rs_str.size
+      fs_idx = rs_idx = 0
+      cell = Cell.new
+      state = :ST_START
+      quoted = cr = false
+      c = nil
+      last_idx = idx
+      while c = src[idx]
+        unless quoted
+          fschar = (c == fs_str[fs_idx])
+          rschar = (c == rs_str[rs_idx])
+          # simple 1 char backtrack
+          if !fschar and c == fs_str[0]
+            fs_idx = 0
+            fschar = true
+            if state == :ST_START
+              state = :ST_DATA
+            elsif state == :ST_QUOTE
+              raise IllegalFormatError
+            end
+          end
+          if !rschar and c == rs_str[0]
+            rs_idx = 0
+            rschar = true
+            if state == :ST_START
+              state = :ST_DATA
+            elsif state == :ST_QUOTE
+              raise IllegalFormatError
             end
           end
-        else                  # repeated value
-          @table.each do |row|
-            if row.header_row?
-              row[index_or_header] = index_or_header
+        end
+        if c == ?"
+          fs_idx = rs_idx = 0
+          if cr
+            raise IllegalFormatError
+          end
+          cell << src[last_idx, (idx - last_idx)]
+          last_idx = idx
+          if state == :ST_DATA
+            if quoted
+              last_idx += 1
+              quoted = false
+              state = :ST_QUOTE
             else
-              row[index_or_header] = value
+              raise IllegalFormatError
             end
+          elsif state == :ST_QUOTE
+            cell << c.chr
+            last_idx += 1
+            quoted = true
+            state = :ST_DATA
+          else  # :ST_START
+            quoted = true
+            last_idx += 1
+            state = :ST_DATA
+          end
+        elsif fschar or rschar
+          if fschar
+            fs_idx += 1
+          end
+          if rschar
+            rs_idx += 1
+          end
+          sep = nil
+          if fs_idx == fs_size
+            if state == :ST_START and rs_idx > 0 and fs_idx < rs_idx
+              state = :ST_DATA
+            end
+            cell << src[last_idx, (idx - last_idx - (fs_size - 1))]
+            last_idx = idx
+            fs_idx = rs_idx = 0
+            if cr
+              raise IllegalFormatError
+            end
+            sep = :DT_COLSEP
+          elsif rs_idx == rs_size
+            if state == :ST_START and fs_idx > 0 and rs_idx < fs_idx
+              state = :ST_DATA
+            end
+            if !(rs.nil? and cr)
+              cell << src[last_idx, (idx - last_idx - (rs_size - 1))]
+              last_idx = idx
+            end
+            fs_idx = rs_idx = 0
+            sep = :DT_ROWSEP
+          end
+          if sep
+            if state == :ST_DATA
+              return sep, idx + 1, cell;
+            elsif state == :ST_QUOTE
+              return sep, idx + 1, cell;
+            else  # :ST_START
+              return sep, idx + 1, nil
+            end
+          end
+        elsif rs.nil? and c == ?\r
+          # special \r treatment for backward compatibility
+          fs_idx = rs_idx = 0
+          if cr
+            raise IllegalFormatError
+          end
+          cell << src[last_idx, (idx - last_idx)]
+          last_idx = idx
+          if quoted
+            state = :ST_DATA
+          else
+            cr = true
+          end
+        else
+          fs_idx = rs_idx = 0
+          if state == :ST_DATA or state == :ST_START
+            if cr
+              raise IllegalFormatError
+            end
+            state = :ST_DATA
+          else  # :ST_QUOTE
+            raise IllegalFormatError
           end
         end
+        idx += 1
       end
-    end
-    
-    # 
-    # The mixed mode default is to treat a list of indices as row access,
-    # returning the rows indicated.  Anything else is considered columnar
-    # access.  For columnar access, the return set has an Array for each row
-    # with the values indicated by the headers in each Array.  You can force
-    # column or row mode using by_col!() or by_row!().
-    # 
-    # You cannot mix column and row access.
-    # 
-    def values_at(*indices_or_headers)
-      if @mode == :row or  # by indices
-         ( @mode == :col_or_row and indices_or_headers.all? do |index|
-                                      index.is_a?(Integer)         or
-                                      ( index.is_a?(Range)         and
-                                        index.first.is_a?(Integer) and
-                                        index.last.is_a?(Integer) )
-                                    end )
-        @table.values_at(*indices_or_headers)
-      else                 # by headers
-        @table.map { |row| row.values_at(*indices_or_headers) }
-      end
-    end
-
-    # 
-    # Adds a new row to the bottom end of this table.  You can provide an Array,
-    # which will be converted to a CSV::Row (inheriting the table's headers()),
-    # or a CSV::Row.
-    # 
-    # This method returns the table for chaining.
-    # 
-    def <<(row_or_array)
-      if row_or_array.is_a? Array  # append Array
-        @table << Row.new(headers, row_or_array)
-      else                         # append Row
-        @table << row_or_array
-      end
-      
-      self  # for chaining
-    end
-    
-    # 
-    # A shortcut for appending multiple rows.  Equivalent to:
-    # 
-    #   rows.each { |row| self << row }
-    # 
-    # This method returns the table for chaining.
-    # 
-    def push(*rows)
-      rows.each { |row| self << row }
-      
-      self  # for chaining
-    end
-
-    # 
-    # Removes and returns the indicated column or row.  In the default mixed
-    # mode indices refer to rows and everything else is assumed to be a column
-    # header.  Use by_col!() or by_row!() to force the lookup.
-    # 
-    def delete(index_or_header)
-      if @mode == :row or  # by index
-         (@mode == :col_or_row and index_or_header.is_a? Integer)
-        @table.delete_at(index_or_header)
-      else                 # by header
-        @table.map { |row| row.delete(index_or_header).last }
-      end
-    end
-    
-    # 
-    # Removes any column or row for which the block returns +true+.  In the
-    # default mixed mode or row mode, iteration is the standard row major
-    # walking of rows.  In column mode, interation will +yield+ two element
-    # tuples containing the column name and an Array of values for that column.
-    # 
-    # This method returns the table for chaining.
-    # 
-    def delete_if(&block)
-      if @mode == :row or @mode == :col_or_row  # by index
-        @table.delete_if(&block)
-      else                                      # by header
-        to_delete = Array.new
-        headers.each_with_index do |header, i|
-          to_delete << header if block[[header, self[header]]]
+      if state == :ST_START
+        if fs_idx > 0 or rs_idx > 0
+          state = :ST_DATA
+        else
+          return :DT_EOS, idx, nil
         end
-        to_delete.map { |header| delete(header) }
+      elsif quoted
+        raise IllegalFormatError
+      elsif cr
+        raise IllegalFormatError
       end
-      
-      self  # for chaining
+      cell << src[last_idx, (idx - last_idx)]
+      last_idx = idx
+      return :DT_EOS, idx, cell
     end
-    
-    include Enumerable
-    
-    # 
-    # In the default mixed mode or row mode, iteration is the standard row major
-    # walking of rows.  In column mode, interation will +yield+ two element
-    # tuples containing the column name and an Array of values for that column.
-    # 
-    # This method returns the table for chaining.
-    # 
-    def each(&block)
-      if @mode == :col
-        headers.each { |header| block[[header, self[header]]] }
+  
+    def generate_body(cell, out_dev, fs, rs)
+      if cell.nil?
+        # empty
       else
-        @table.each(&block)
-      end
-      
-      self  # for chaining
-    end
-    
-    # Returns +true+ if all rows of this table ==() +other+'s rows.
-    def ==(other)
-      @table == other.table
-    end
-    
-    # 
-    # Returns the table as an Array of Arrays.  Headers will be the first row,
-    # then all of the field rows will follow.
-    # 
-    def to_a
-      @table.inject([headers]) do |array, row|
-        if row.header_row?
-          array
+        cell = cell.to_s
+        row_data = cell.dup
+        if (row_data.gsub!('"', '""') or
+            row_data.index(fs) or
+            (rs and row_data.index(rs)) or
+            (/[\r\n]/ =~ row_data) or
+            (cell.empty?))
+          out_dev << '"' << row_data << '"'
         else
-          array + [row.fields]
+          out_dev << row_data
         end
       end
     end
     
-    # 
-    # Returns the table as a complete CSV String.  Headers will be listed first,
-    # then all of the field rows.
-    # 
-    def to_csv(options = Hash.new)
-      @table.inject([headers.to_csv(options)]) do |rows, row|
-        if row.header_row?
-          rows
-        else
-          rows + [row.fields.to_csv(options)]
-        end
-      end.join
+    def generate_separator(type, out_dev, fs, rs)
+      case type
+      when :DT_COLSEP
+        out_dev << fs
+      when :DT_ROWSEP
+        out_dev << (rs || "\n")
+      end
     end
-    alias_method :to_s, :to_csv
   end
 
-  # The error thrown when the parser encounters illegal CSV formatting.
-  class MalformedCSVError < RuntimeError; end
-  
-  # 
-  # A FieldInfo Struct contains details about a field's position in the data
-  # source it was read from.  CSV will pass this Struct to some blocks that make
-  # decisions based on field structure.  See CSV.convert_fields() for an
-  # example.
-  # 
-  # <b><tt>index</tt></b>::  The zero-based index of the field in its row.
-  # <b><tt>line</tt></b>::   The line of the data source this row is from.
-  # <b><tt>header</tt></b>:: The header for the column, when available.
-  # 
-  FieldInfo = Struct.new(:index, :line, :header)
-  
-  # A Regexp used to find and convert some common Date formats.
-  DateMatcher     = / \A(?: (\w+,?\s+)?\w+\s+\d{1,2},?\s+\d{2,4} |
-                            \d{4}-\d{2}-\d{2} )\z /x
-  # A Regexp used to find and convert some common DateTime formats.
-  DateTimeMatcher =
-    / \A(?: (\w+,?\s+)?\w+\s+\d{1,2}\s+\d{1,2}:\d{1,2}:\d{1,2},?\s+\d{2,4} |
-            \d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2} )\z /x
-  # 
-  # This Hash holds the built-in converters of CSV that can be accessed by name.
-  # You can select Converters with CSV.convert() or through the +options+ Hash
-  # passed to CSV::new().
-  # 
-  # <b><tt>:integer</tt></b>::    Converts any field Integer() accepts.
-  # <b><tt>:float</tt></b>::      Converts any field Float() accepts.
-  # <b><tt>:numeric</tt></b>::    A combination of <tt>:integer</tt> 
-  #                               and <tt>:float</tt>.
-  # <b><tt>:date</tt></b>::       Converts any field Date::parse() accepts.
-  # <b><tt>:date_time</tt></b>::  Converts any field DateTime::parse() accepts.
-  # <b><tt>:all</tt></b>::        All built-in converters.  A combination of 
-  #                               <tt>:date_time</tt> and <tt>:numeric</tt>.
-  # 
-  # This Hash is intentionally left unfrozen and users should feel free to add
-  # values to it that can be accessed by all CSV objects.
-  # 
-  # To add a combo field, the value should be an Array of names.  Combo fields
-  # can be nested with other combo fields.
-  # 
-  Converters  = { :integer   => lambda { |f| Integer(f)        rescue f },
-                  :float     => lambda { |f| Float(f)          rescue f },
-                  :numeric   => [:integer, :float],
-                  :date      => lambda { |f|
-                    f =~ DateMatcher ? (Date.parse(f) rescue f) : f
-                  },
-                  :date_time => lambda { |f|
-                    f =~ DateTimeMatcher ? (DateTime.parse(f) rescue f) : f
-                  },
-                  :all       => [:date_time, :numeric] }
 
-  # 
-  # This Hash holds the built-in header converters of CSV that can be accessed
-  # by name.  You can select HeaderConverters with CSV.header_convert() or
-  # through the +options+ Hash passed to CSV::new().
-  # 
-  # <b><tt>:downcase</tt></b>::  Calls downcase() on the header String.
-  # <b><tt>:symbol</tt></b>::    The header String is downcased, spaces are
-  #                              replaced with underscores, non-word characters
-  #                              are dropped, and finally to_sym() is called.
-  # 
-  # This Hash is intetionally left unfrozen and users should feel free to add
-  # values to it that can be accessed by all CSV objects.
-  # 
-  # To add a combo field, the value should be an Array of names.  Combo fields
-  # can be nested with other combo fields.
-  # 
-  HeaderConverters = {
-    :downcase => lambda { |h| h.downcase },
-    :symbol   => lambda { |h|
-      h.downcase.tr(" ", "_").delete("^a-z0-9_").to_sym
-    }
-  }
-  
-  # 
-  # The options used when no overrides are given by calling code.  They are:
-  # 
-  # <b><tt>:col_sep</tt></b>::            <tt>","</tt>
-  # <b><tt>:row_sep</tt></b>::            <tt>:auto</tt>
-  # <b><tt>:quote_char</tt></b>::         <tt>'"'</tt>
-  # <b><tt>:converters</tt></b>::         +nil+
-  # <b><tt>:unconverted_fields</tt></b>:: +nil+
-  # <b><tt>:headers</tt></b>::            +false+
-  # <b><tt>:return_headers</tt></b>::     +false+
-  # <b><tt>:header_converters</tt></b>::  +nil+
-  # <b><tt>:skip_blanks</tt></b>::        +false+
-  # <b><tt>:force_quotes</tt></b>::       +false+
-  # 
-  DEFAULT_OPTIONS = { :col_sep            => ",",
-                      :row_sep            => :auto,
-                      :quote_char         => '"', 
-                      :converters         => nil,
-                      :unconverted_fields => nil,
-                      :headers            => false,
-                      :return_headers     => false,
-                      :header_converters  => nil,
-                      :skip_blanks        => false,
-                      :force_quotes       => false }.freeze
-  
-  # 
-  # This method allows you to serialize an Array of Ruby objects to a String or
-  # File of CSV data.  This is not as powerful as Marshal or YAML, but perhaps
-  # useful for spreadsheet and database interaction.
-  # 
-  # Out of the box, this method is intended to work with simple data objects or
-  # Structs.  It will serialize a list of instance variables and/or
-  # Struct.members().
-  # 
-  # If you need need more complicated serialization, you can control the process
-  # by adding methods to the class to be serialized.
-  # 
-  # A class method csv_meta() is responsible for returning the first row of the
-  # document (as an Array).  This row is considered to be a Hash of the form
-  # key_1,value_1,key_2,value_2,...  CSV::load() expects to find a class key
-  # with a value of the stringified class name and CSV::dump() will create this,
-  # if you do not define this method.  This method is only called on the first
-  # object of the Array.
-  # 
-  # The next method you can provide is an instance method called csv_headers().
-  # This method is expected to return the second line of the document (again as
-  # an Array), which is to be used to give each column a header.  By default,
-  # CSV::load() will set an instance variable if the field header starts with an
-  # @ character or call send() passing the header as the method name and
-  # the field value as an argument.  This method is only called on the first
-  # object of the Array.
-  # 
-  # Finally, you can provide an instance method called csv_dump(), which will
-  # be passed the headers.  This should return an Array of fields that can be
-  # serialized for this object.  This method is called once for every object in
-  # the Array.
-  # 
-  # The +io+ parameter can be used to serialize to a File, and +options+ can be
-  # anything CSV::new() accepts.
-  # 
-  def self.dump(ary_of_objs, io = "", options = Hash.new)
-    obj_template = ary_of_objs.first
-    
-    csv = new(io, options)
-    
-    # write meta information
-    begin
-      csv << obj_template.class.csv_meta
-    rescue NoMethodError
-      csv << [:class, obj_template.class]
-    end
+  # CSV formatted string/stream reader.
+  #
+  # EXAMPLE
+  #   read CSV lines untill the first column is 'stop'.
+  #
+  #   CSV::Reader.parse(File.open('bigdata', 'rb')) do |row|
+  #     p row
+  #     break if !row[0].is_null && row[0].data == 'stop'
+  #   end
+  #
+  class Reader
+    include Enumerable
 
-    # write headers
-    begin
-      headers = obj_template.csv_headers
-    rescue NoMethodError
-      headers = obj_template.instance_variables.sort
-      if obj_template.class.ancestors.find { |cls| cls.to_s =~ /\AStruct\b/ }
-        headers += obj_template.members.map { |mem| "#{mem}=" }.sort
-      end
-    end
-    csv << headers
-    
-    # serialize each object
-    ary_of_objs.each do |obj|
-      begin
-        csv << obj.csv_dump(headers)
-      rescue NoMethodError
-        csv << headers.map do |var|
-          if var[0] == ?@
-            obj.instance_variable_get(var)
-          else
-            obj[var[0..-2]]
-          end
+    # Parse CSV data and get lines.  Given block is called for each parsed row.
+    # Block value is always nil.  Rows are not cached for performance reason.
+    def Reader.parse(str_or_readable, fs = ',', rs = nil, &block)
+      reader = Reader.create(str_or_readable, fs, rs)
+      if block
+        reader.each do |row|
+          yield(row)
         end
+        reader.close
+        nil
+      else
+        reader
       end
     end
-    
-    if io.is_a? String
-      csv.string
-    else
-      csv.close
+
+    # Returns reader instance.
+    def Reader.create(str_or_readable, fs = ',', rs = nil)
+      case str_or_readable
+      when IO
+        IOReader.new(str_or_readable, fs, rs)
+      when String
+        StringReader.new(str_or_readable, fs, rs)
+      else
+        IOReader.new(str_or_readable, fs, rs)
+      end
     end
-  end
-  
-  # 
-  # :call-seq:
-  #   filter( options = Hash.new ) { |row| ... }
-  #   filter( input, options = Hash.new ) { |row| ... }
-  #   filter( input, output, options = Hash.new ) { |row| ... }
-  # 
-  # This method is a convenience for building Unix-like filters for CSV data.
-  # Each row is yielded to the provided block which can alter it as needed.  
-  # After the block returns, the row is appended to +output+ altered or not.
-  # 
-  # The +input+ and +output+ arguments can be anything CSV::new() accepts
-  # (generally String or IO objects).  If not given, they default to 
-  # <tt>ARGF</tt> and <tt>$stdout</tt>.
-  # 
-  # The +options+ parameter is also filtered down to CSV::new() after some
-  # clever key parsing.  Any key beginning with <tt>:in_</tt> or 
-  # <tt>:input_</tt> will have that leading identifier stripped and will only
-  # be used in the +options+ Hash for the +input+ object.  Keys starting with
-  # <tt>:out_</tt> or <tt>:output_</tt> affect only +output+.  All other keys 
-  # are assigned to both objects.
-  # 
-  # The <tt>:output_row_sep</tt> +option+ defaults to
-  # <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
-  # 
-  def self.filter(*args)
-    # parse options for input, output, or both
-    in_options, out_options = Hash.new, {:row_sep => $INPUT_RECORD_SEPARATOR}
-    if args.last.is_a? Hash
-      args.pop.each do |key, value|
-        case key.to_s
-        when /\Ain(?:put)?_(.+)\Z/
-          in_options[$1.to_sym] = value
-        when /\Aout(?:put)?_(.+)\Z/
-          out_options[$1.to_sym] = value
-        else
-          in_options[key]  = value
-          out_options[key] = value
+
+    def each
+      while true
+        row = []
+        parsed_cells = get_row(row)
+        if parsed_cells == 0
+          break
         end
+        yield(row)
       end
+      nil
     end
-    # build input and output wrappers
-    input  = new(args.shift || ARGF,    in_options)
-    output = new(args.shift || $stdout, out_options)
-    
-    # read, yield, write
-    input.each do |row|
-      yield row
-      output << row
-    end
-  end
-  
-  # 
-  # This method is intended as the primary interface for reading CSV files.  You
-  # pass a +path+ and any +options+ you wish to set for the read.  Each row of
-  # file will be passed to the provided +block+ in turn.
-  # 
-  # The +options+ parameter can be anything CSV::new() understands.
-  # 
-  def self.foreach(path, options = Hash.new, &block)
-    open(path, options) do |csv|
-      csv.each(&block)
+
+    def shift
+      row = []
+      parsed_cells = get_row(row)
+      row
     end
-  end
 
-  # 
-  # :call-seq:
-  #   generate( str, options = Hash.new ) { |csv| ... }
-  #   generate( options = Hash.new ) { |csv| ... }
-  # 
-  # This method wraps a String you provide, or an empty default String, in a 
-  # CSV object which is passed to the provided block.  You can use the block to
-  # append CSV rows to the String and when the block exits, the final String
-  # will be returned.
-  # 
-  # Note that a passed String *is* modfied by this method.  Call dup() before
-  # passing if you need a new String.
-  # 
-  # The +options+ parameter can be anthing CSV::new() understands.
-  # 
-  def self.generate(*args)
-    # add a default empty String, if none was given
-    if args.first.is_a? String
-      io = StringIO.new(args.shift)
-      io.seek(0, IO::SEEK_END)
-      args.unshift(io)
-    else
-      args.unshift("")
+    def close
+      terminate
     end
-    csv = new(*args)  # wrap
-    yield csv         # yield for appending
-    csv.string        # return final String
-  end
 
-  # 
-  # This method is a shortcut for converting a single row (Array) into a CSV 
-  # String.
-  # 
-  # The +options+ parameter can be anthing CSV::new() understands.
-  # 
-  # The <tt>:row_sep</tt> +option+ defaults to <tt>$INPUT_RECORD_SEPARATOR</tt>
-  # (<tt>$/</tt>) when calling this method.
-  # 
-  def self.generate_line(row, options = Hash.new)
-    options = {:row_sep => $INPUT_RECORD_SEPARATOR}.merge(options)
-    (new("", options) << row).string
-  end
-  
-  # 
-  # This method will return a CSV instance, just like CSV::new(), but the
-  # instance will be cached and returned for all future calls to this method for
-  # the same +data+ object (tested by Object#object_id()) with the same
-  # +options+.
-  # 
-  # If a block is given, the instance is passed to the block and the return
-  # value becomes the return value of the block.
-  # 
-  def self.instance(data = $stdout, options = Hash.new)
-    # create a _signature_ for this method call, data object and options
-    sig = [data.object_id] +
-          options.values_at(*DEFAULT_OPTIONS.keys.sort_by { |sym| sym.to_s })
-    
-    # fetch or create the instance for this signature
-    @@instances ||= Hash.new
-    instance    =   (@@instances[sig] ||= new(data, options))
+  private
 
-    if block_given?
-      yield instance  # run block, if given, returning result
-    else
-      instance        # or return the instance
+    def initialize(dev)
+      raise RuntimeError.new('Do not instanciate this class directly.')
     end
-  end
-  
-  # 
-  # This method is the reading counterpart to CSV::dump().  See that method for
-  # a detailed description of the process.
-  # 
-  # You can customize loading by adding a class method called csv_load() which 
-  # will be passed a Hash of meta information, an Array of headers, and an Array
-  # of fields for the object the method is expected to return.
-  # 
-  # Remember that all fields will be Strings after this load.  If you need
-  # something else, use +options+ to setup converters or provide a custom
-  # csv_load() implementation.
-  # 
-  def self.load(io_or_str, options = Hash.new)
-    csv = new(io_or_str, options)
-    
-    # load meta information
-    meta = Hash[*csv.shift]
-    cls  = meta["class"].split("::").inject(Object) do |c, const|
-      c.const_get(const)
+
+    def get_row(row)
+      raise NotImplementedError.new('Method get_row must be defined in a derived class.')
     end
-    
-    # load headers
-    headers = csv.shift
-    
-    # unserialize each object stored in the file
-    results = csv.inject(Array.new) do |all, row|
-      begin
-        obj = cls.csv_load(meta, headers, row)
-      rescue NoMethodError
-        obj = cls.allocate
-        headers.zip(row) do |name, value|
-          if name[0] == ?@
-            obj.instance_variable_set(name, value)
-          else
-            obj.send(name, value)
-          end
-        end
-      end
-      all << obj
+
+    def terminate
+      # Define if needed.
     end
-    
-    csv.close unless io_or_str.is_a? String
-    
-    results
   end
   
-  # 
-  # :call-seq:
-  #   open( filename, mode="r", options = Hash.new ) { |csv| ... }
-  #   open( filename, mode="r", options = Hash.new )
-  # 
-  # This method opens an IO object, and wraps that with CSV.  This is intended
-  # as the primary interface for writing a CSV file.
-  # 
-  # You may pass any +args+ Ruby's open() understands followed by an optional
-  # Hash containing any +options+ CSV::new() understands.
-  # 
-  # This method works like Ruby's open() call, in that it will pass a CSV object
-  # to a provided block and close it when the block terminates, or it will
-  # return the CSV object when no block is provided.  (*Note*: This is different
-  # from the Ruby 1.8 CSV library which passed rows to the block.  Use
-  # CSV::foreach() for that behavior.)
-  # 
-  # An opened CSV object will delegate to many IO methods, for convenience.  You
-  # may call:
-  # 
-  # * binmode()
-  # * close()
-  # * close_read()
-  # * close_write()
-  # * closed?()
-  # * eof()
-  # * eof?()
-  # * fcntl()
-  # * fileno()
-  # * flush()
-  # * fsync()
-  # * ioctl()
-  # * isatty()
-  # * pid()
-  # * pos()
-  # * reopen()
-  # * seek()
-  # * stat()
-  # * sync()
-  # * sync=()
-  # * tell()
-  # * to_i()
-  # * to_io()
-  # * tty?()
-  # 
-  def self.open(*args)
-    # find the +options+ Hash
-    options = if args.last.is_a? Hash then args.pop else Hash.new end
-    # wrap a File opened with the remaining +args+
-    csv     = new(File.open(*args), options)
-    
-    # handle blocks like Ruby's open(), not like the CSV library
-    if block_given?
-      begin
-        yield csv
-      ensure
-        csv.close
+
+  class StringReader < Reader
+    def initialize(string, fs = ',', rs = nil)
+      @fs = fs
+      @rs = rs
+      @dev = string
+      @idx = 0
+      if @dev[0, 3] == "\xef\xbb\xbf"
+        @idx += 3
       end
-    else
-      csv
     end
-  end
-  
-  # 
-  # :call-seq:
-  #   parse( str, options = Hash.new ) { |row| ... }
-  #   parse( str, options = Hash.new )
-  # 
-  # This method can be used to easily parse CSV out of a String.  You may either
-  # provide a +block+ which will be called with each row of the String in turn,
-  # or just use the returned Array of Arrays (when no +block+ is given).
-  # 
-  # You pass your +str+ to read from, and an optional +options+ Hash containing
-  # anything CSV::new() understands.
-  # 
-  def self.parse(*args, &block)
-    csv = new(*args)
-    if block.nil?  # slurp contents, if no block is given
-      begin
-        csv.read
-      ensure
-        csv.close
+
+  private
+
+    def get_row(row)
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+      if parsed_cells == 0 and next_idx == 0 and @idx != @dev.size
+        raise IllegalFormatError.new
       end
-    else           # or pass each row to a provided block
-      csv.each(&block)
-    end
-  end
-  
-  # 
-  # This method is a shortcut for converting a single line of a CSV String into 
-  # a into an Array.  Note that if +line+ contains multiple rows, anything 
-  # beyond the first row is ignored.
-  # 
-  # The +options+ parameter can be anthing CSV::new() understands.
-  # 
-  def self.parse_line(line, options = Hash.new)
-    new(line, options).shift
-  end
-  
-  # 
-  # Use to slurp a CSV file into an Array of Arrays.  Pass the +path+ to the 
-  # file and any +options+ CSV::new() understands.
-  # 
-  def self.read(path, options = Hash.new)
-    open(path, options) { |csv| csv.read }
-  end
-  
-  # Alias for CSV::read().
-  def self.readlines(*args)
-    read(*args)
-  end
-  
-  # 
-  # A shortcut for:
-  # 
-  #   CSV.read( path, { :headers           => true,
-  #                     :converters        => :numeric,
-  #                     :header_converters => :symbol }.merge(options) )
-  # 
-  def self.table(path, options = Hash.new)
-    read( path, { :headers           => true,
-                  :converters        => :numeric,
-                  :header_converters => :symbol }.merge(options) )
-  end
-  
-  # 
-  # This constructor will wrap either a String or IO object passed in +data+ for
-  # reading and/or writing.  In addition to the CSV instance methods, several IO
-  # methods are delegated.  (See CSV::open() for a complete list.)  If you pass
-  # a String for +data+, you can later retrieve it (after writing to it, for
-  # example) with CSV.string().
-  # 
-  # Note that a wrapped String will be positioned at at the beginning (for 
-  # reading).  If you want it at the end (for writing), use CSV::generate().
-  # If you want any other positioning, pass a preset StringIO object instead.
-  # 
-  # You may set any reading and/or writing preferences in the +options+ Hash.  
-  # Available options are:
-  # 
-  # <b><tt>:col_sep</tt></b>::            The String placed between each field.
-  # <b><tt>:row_sep</tt></b>::            The String appended to the end of each
-  #                                       row.  This can be set to the special
-  #                                       <tt>:auto</tt> setting, which requests
-  #                                       that CSV automatically discover this
-  #                                       from the data.  Auto-discovery reads
-  #                                       ahead in the data looking for the next
-  #                                       <tt>"\r\n"</tt>, <tt>"\n"</tt>, or
-  #                                       <tt>"\r"</tt> sequence.  A sequence
-  #                                       will be selected even if it occurs in
-  #                                       a quoted field, assuming that you
-  #                                       would have the same line endings
-  #                                       there.  If none of those sequences is
-  #                                       found, +data+ is <tt>ARGF</tt>,
-  #                                       <tt>STDIN</tt>, <tt>STDOUT</tt>, or
-  #                                       <tt>STDERR</tt>, or the stream is only
-  #                                       available for output, the default
-  #                                       <tt>$INPUT_RECORD_SEPARATOR</tt>
-  #                                       (<tt>$/</tt>) is used.  Obviously,
-  #                                       discovery takes a little time.  Set
-  #                                       manually if speed is important.
-  # <b><tt>:quote_char</tt></b>::         The character used to quote fields.
-  #                                       This has to be a single character
-  #                                       String.  This is useful for
-  #                                       application that incorrectly use
-  #                                       <tt>'</tt> as the quote character
-  #                                       instead of the correct <tt>"</tt>.
-  #                                       CSV will always consider a double
-  #                                       sequence this character to be an
-  #                                       escaped quote.
-  # <b><tt>:converters</tt></b>::         An Array of names from the Converters
-  #                                       Hash and/or lambdas that handle custom
-  #                                       conversion.  A single converter
-  #                                       doesn't have to be in an Array.
-  # <b><tt>:unconverted_fields</tt></b>:: If set to +true+, an
-  #                                       unconverted_fields() method will be
-  #                                       added to all returned rows (Array or
-  #                                       CSV::Row) that will return the fields
-  #                                       as they were before conversion.  Note
-  #                                       that <tt>:headers</tt> supplied by
-  #                                       Array or String were not fields of the
-  #                                       document and thus will have an empty
-  #                                       Array attached.
-  # <b><tt>:headers</tt></b>::            If set to <tt>:first_row</tt> or 
-  #                                       +true+, the initial row of the CSV
-  #                                       file will be treated as a row of
-  #                                       headers.  If set to an Array, the
-  #                                       contents will be used as the headers.
-  #                                       If set to a String, the String is run
-  #                                       through a call of CSV::parse_line() to
-  #                                       produce an Array of headers.  This
-  #                                       setting causes CSV.shift() to return
-  #                                       rows as CSV::Row objects instead of
-  #                                       Arrays and CSV.read() to return
-  #                                       CSV::Table objects instead of an Array
-  #                                       of Arrays.
-  # <b><tt>:return_headers</tt></b>::     When +false+, header rows are silently
-  #                                       swallowed.  If set to +true+, header
-  #                                       rows are returned in a CSV::Row object
-  #                                       with identical headers and
-  #                                       fields (save that the fields do not go
-  #                                       through the converters).
-  # <b><tt>:header_converters</tt></b>::  Identical in functionality to
-  #                                       <tt>:converters</tt> save that the
-  #                                       conversions are only made to header
-  #                                       rows.
-  # <b><tt>:skip_blanks</tt></b>::        When set to a +true+ value, CSV will
-  #                                       skip over any rows with no content.
-  # <b><tt>:force_quotes</tt></b>::       When set to a +true+ value, CSV will
-  #                                       quote all CSV fields it creates.
-  # 
-  # See CSV::DEFAULT_OPTIONS for the default settings.
-  # 
-  # Options cannot be overriden in the instance methods for performance reasons,
-  # so be sure to set what you want here.
-  # 
-  def initialize(data, options = Hash.new)
-    # build the options for this read/write
-    options = DEFAULT_OPTIONS.merge(options)
-    
-    # create the IO object we will read from
-    @io = if data.is_a? String then StringIO.new(data) else data end
-    
-    init_separators(options)
-    init_parsers(options)
-    init_converters(options)
-    init_headers(options)
-    
-    unless options.empty?
-      raise ArgumentError, "Unknown options:  #{options.keys.join(', ')}."
+      @idx = next_idx
+      parsed_cells
     end
-    
-    # track our own lineno since IO gets confused about line-ends is CSV fields
-    @lineno = 0
-  end
-  
-  # 
-  # The line number of the last row read from this file.  Fields with nested 
-  # line-end characters will not affect this count.
-  # 
-  attr_reader :lineno
-  
-  ### IO and StringIO Delegation ###
-  
-  extend Forwardable
-  def_delegators :@io, :binmode, :close, :close_read, :close_write, :closed?,
-                       :eof, :eof?, :fcntl, :fileno, :flush, :fsync, :ioctl,
-                       :isatty, :pid, :pos, :reopen, :seek, :stat, :string,
-                       :sync, :sync=, :tell, :to_i, :to_io, :tty?
-  
-  # Rewinds the underlying IO object and resets CSV's lineno() counter.
-  def rewind
-    @headers = nil
-    @lineno  = 0
-    
-    @io.rewind
   end
 
-  ### End Delegation ###
-  
-  # 
-  # The primary write method for wrapped Strings and IOs, +row+ (an Array or
-  # CSV::Row) is converted to CSV and appended to the data source.  When a
-  # CSV::Row is passed, only the row's fields() are appended to the output.
-  # 
-  # The data source must be open for writing.
-  # 
-  def <<(row)
-    # handle CSV::Row objects and Hashes
-    row = case row
-      when self.class::Row then row.fields
-      when Hash            then @headers.map { |header| row[header] }
-      else                      row
+
+  class IOReader < Reader
+    def initialize(io, fs = ',', rs = nil)
+      @io = io
+      @fs = fs
+      @rs = rs
+      @dev = CSV::IOBuf.new(@io)
+      @idx = 0
+      if @dev[0] == 0xef and @dev[1] == 0xbb and @dev[2] == 0xbf
+        @idx += 3
+      end
+      @close_on_terminate = false
     end
 
-    @headers =  row if header_row?
-    @lineno  += 1
+    # Tell this reader to close the IO when terminated (Triggered by invoking
+    # CSV::IOReader#close).
+    def close_on_terminate
+      @close_on_terminate = true
+    end
 
-    @io << row.map(&@quote).join(@col_sep) + @row_sep  # quote and separate
-    
-    self  # for chaining
-  end
-  alias_method :add_row, :<<
-  alias_method :puts,    :<<
-  
-  # 
-  # :call-seq:
-  #   convert( name )
-  #   convert { |field| ... }
-  #   convert { |field, field_info| ... }
-  # 
-  # You can use this method to install a CSV::Converters built-in, or provide a
-  # block that handles a custom conversion.
-  # 
-  # If you provide a block that takes one argument, it will be passed the field
-  # and is expected to return the converted value or the field itself.  If your
-  # block takes two arguments, it will also be passed a FieldInfo Struct, 
-  # containing details about the field.  Again, the block should return a 
-  # converted field or the field itself.
-  # 
-  def convert(name = nil, &converter)
-    add_converter(:converters, self.class::Converters, name, &converter)
-  end
+  private
 
-  # 
-  # :call-seq:
-  #   header_convert( name )
-  #   header_convert { |field| ... }
-  #   header_convert { |field, field_info| ... }
-  # 
-  # Identical to CSV.convert(), but for header rows.
-  # 
-  # Note that this method must be called before header rows are read to have any
-  # effect.
-  # 
-  def header_convert(name = nil, &converter)
-    add_converter( :header_converters,
-                   self.class::HeaderConverters,
-                   name,
-                   &converter )
-  end
-  
-  include Enumerable
-  
-  # 
-  # Yields each row of the data source in turn.
-  # 
-  # Support for Enumerable.
-  # 
-  # The data source must be open for reading.
-  # 
-  def each
-    while row = shift
-      yield row
-    end
-  end
-  
-  # 
-  # Slurps the remaining rows and returns an Array of Arrays.
-  # 
-  # The data source must be open for reading.
-  # 
-  def read
-    rows = to_a
-    if @use_headers
-      Table.new(rows)
-    else
-      rows
-    end
-  end
-  alias_method :readlines, :read
-  
-  # Returns +true+ if the next row read will be a header row.
-  def header_row?
-    @use_headers and @headers.nil?
-  end
-  
-  # 
-  # The primary read method for wrapped Strings and IOs, a single row is pulled
-  # from the data source, parsed and returned as an Array of fields (if header
-  # rows are not used) or a CSV::Row (when header rows are used).
-  # 
-  # The data source must be open for reading.
-  # 
-  def shift
-    #########################################################################
-    ### This method is purposefully kept a bit long as simple conditional ###
-    ### checks are faster than numerous (expensive) method calls.         ###
-    #########################################################################
-    
-    # handle headers not based on document content
-    if header_row? and @return_headers and
-       [Array, String].include? @use_headers.class
-      if @unconverted_fields
-        return add_unconverted_fields(parse_headers, Array.new)
-      else
-        return parse_headers
+    def get_row(row)
+      parsed_cells, next_idx = CSV.parse_row(@dev, @idx, row, @fs, @rs)
+      if parsed_cells == 0 and next_idx == 0 and !@dev.is_eos?
+        raise IllegalFormatError.new
       end
+      dropped = @dev.drop(next_idx)
+      @idx = next_idx - dropped
+      parsed_cells
     end
-    
-    # begin with a blank line, so we can always add to it
-    line = ""
 
-    # 
-    # it can take multiple calls to <tt>@io.gets()</tt> to get a full line,
-    # because of \r and/or \n characters embedded in quoted fields
-    # 
-    loop do
-      # add another read to the line
-      (line += @io.gets(@row_sep)) rescue return nil
-      # copy the line so we can chop it up in parsing
-      parse = line.dup
-      parse.sub!(@parsers[:line_end], "")
-      
-      # 
-      # I believe a blank line should be an <tt>Array.new</tt>, not Ruby 1.8
-      # CSV's <tt>[nil]</tt>
-      # 
-      if parse.empty?
-        @lineno += 1
-        if @skip_blanks
-          line = ""
-          next
-        elsif @unconverted_fields
-          return add_unconverted_fields(Array.new, Array.new)
-        elsif @use_headers
-          return self.class::Row.new(Array.new, Array.new)
-        else
-          return Array.new
-        end
+    def terminate
+      if @close_on_terminate
+        @io.close
       end
 
-      # 
-      # shave leading empty fields if needed, because the main parser chokes 
-      # on these
-      # 
-      csv = if parse.sub!(@parsers[:leading_fields], "")
-        [nil] * ($&.length / @col_sep.length)
-      else
-        Array.new
+      if @dev
+        @dev.close
       end
-      # 
-      # then parse the main fields with a hyper-tuned Regexp from 
-      # Mastering Regular Expressions, Second Edition
-      # 
-      parse.gsub!(@parsers[:csv_row]) do
-        csv << if $1.nil?     # we found an unquoted field
-          if $2.empty?        # switch empty unquoted fields to +nil+...
-            nil               # for Ruby 1.8 CSV compatibility
-          else
-            # I decided to take a strict approach to CSV parsing...
-            if $2.count("\r\n").zero?  # verify correctness of field...
-              $2
-            else
-              # or throw an Exception
-              raise MalformedCSVError, "Unquoted fields do not allow " +
-                                       "\\r or \\n (line #{lineno + 1})."
-            end
-          end
-        else                  # we found a quoted field...
-          $1.gsub(@quote_char * 2, @quote_char)  # unescape contents
-        end
-        ""  # gsub!'s replacement, clear the field
+    end
+  end
+
+
+  # CSV formatted string/stream writer.
+  #
+  # EXAMPLE
+  #   Write rows to 'csvout' file.
+  #
+  #   outfile = File.open('csvout', 'wb')
+  #   CSV::Writer.generate(outfile) do |csv|
+  #     csv << ['c1', nil, '', '"', "\r\n", 'c2']
+  #     ...
+  #   end
+  #
+  #   outfile.close
+  #
+  class Writer
+    # Given block is called with the writer instance.  str_or_writable must
+    # handle '<<(string)'.
+    def Writer.generate(str_or_writable, fs = ',', rs = nil, &block)
+      writer = Writer.create(str_or_writable, fs, rs)
+      if block
+        yield(writer)
+        writer.close
+        nil
+      else
+        writer
       end
+    end
+
+    # str_or_writable must handle '<<(string)'.
+    def Writer.create(str_or_writable, fs = ',', rs = nil)
+      BasicWriter.new(str_or_writable, fs, rs)
+    end
 
-      # if parse is empty?(), we found all the fields on the line...
-      if parse.empty?
-        @lineno += 1
+    # dump CSV stream to the device.  argument must be an Array of String.
+    def <<(row)
+      CSV.generate_row(row, row.size, @dev, @fs, @rs)
+      self
+    end
+    alias add_row <<
 
-        # save fields unconverted fields, if needed...
-        unconverted = csv.dup if @unconverted_fields
+    def close
+      terminate
+    end
 
-        # convert fields, if needed...
-        csv = convert_fields(csv) unless @use_headers or @converters.empty?
-        # parse out header rows and handle CSV::Row conversions...
-        csv = parse_headers(csv)  if     @use_headers
+  private
 
-        # inject unconverted fields and accessor, if requested...
-        if @unconverted_fields and not csv.respond_to? :unconverted_fields
-          add_unconverted_fields(csv, unconverted)
-        end
+    def initialize(dev)
+      raise RuntimeError.new('Do not instanciate this class directly.')
+    end
 
-        # return the results
-        break csv
-      end
-      # if we're not empty?() but at eof?(), a quoted field wasn't closed...
-      if @io.eof?
-        raise MalformedCSVError, "Unclosed quoted field on line #{lineno + 1}."
-      end
-      # otherwise, we need to loop and pull some more data to complete the row
+    def terminate
+      # Define if needed.
     end
   end
-  alias_method :gets,     :shift
-  alias_method :readline, :shift
-  
-  private
-  
-  # 
-  # Stores the indicated separators for later use.
-  # 
-  # If auto-discovery was requested for <tt>@row_sep</tt>, this method will read
-  # ahead in the <tt>@io</tt> and try to find one.  +ARGF+, +STDIN+, +STDOUT+,
-  # +STDERR+ and any stream open for output only with a default
-  # <tt>@row_sep</tt> of <tt>$INPUT_RECORD_SEPARATOR</tt> (<tt>$/</tt>).
-  # 
-  # This method also establishes the quoting rules used for CSV output.
-  # 
-  def init_separators(options)
-    # store the selected separators
-    @col_sep    = options.delete(:col_sep)
-    @row_sep    = options.delete(:row_sep)
-    @quote_char = options.delete(:quote_char)
 
-    if @quote_char.length != 1
-      raise ArgumentError, ":quote_char has to be a single character String"
+
+  class BasicWriter < Writer
+    def initialize(str_or_writable, fs = ',', rs = nil)
+      @fs = fs
+      @rs = rs
+      @dev = str_or_writable
+      @close_on_terminate = false
     end
-    
-    # automatically discover row separator when requested
-    if @row_sep == :auto
-      if [ARGF, STDIN, STDOUT, STDERR].include?(@io) or
-         (defined?(Zlib) and @io.class == Zlib::GzipWriter)
-        @row_sep = $INPUT_RECORD_SEPARATOR
-      else
-        begin
-          saved_pos = @io.pos  # remember where we were
-          while @row_sep == :auto
-            # 
-            # if we run out of data, it's probably a single line 
-            # (use a sensible default)
-            # 
-            if @io.eof?
-              @row_sep = $INPUT_RECORD_SEPARATOR
-              break
-            end
-      
-            # read ahead a bit
-            sample =  @io.read(1024)
-            sample += @io.read(1) if sample[-1..-1] == "\r" and not @io.eof?
-      
-            # try to find a standard separator
-            if sample =~ /\r\n?|\n/
-              @row_sep = $&
-              break
-            end
+
+    # Tell this writer to close the IO when terminated (Triggered by invoking
+    # CSV::BasicWriter#close).
+    def close_on_terminate
+      @close_on_terminate = true
+    end
+
+  private
+
+    def terminate
+      if @close_on_terminate
+        @dev.close
+      end
+    end
+  end
+
+private
+
+  # Buffered stream.
+  #
+  # EXAMPLE 1 -- an IO.
+  #   class MyBuf < StreamBuf
+  #     # Do initialize myself before a super class.  Super class might call my
+  #     # method 'read'. (Could be awful for C++ user. :-)
+  #     def initialize(s)
+  #       @s = s
+  #       super()
+  #     end
+  #
+  #     # define my own 'read' method.
+  #     # CAUTION: Returning nil means EnfOfStream.
+  #     def read(size)
+  #       @s.read(size)
+  #     end
+  #
+  #     # release buffers. in Ruby which has GC, you do not have to call this...
+  #     def terminate
+  #       @s = nil
+  #       super()
+  #     end
+  #   end
+  #
+  #   buf = MyBuf.new(STDIN)
+  #   my_str = ''
+  #   p buf[0, 0]               # => '' (null string)
+  #   p buf[0]                  # => 97 (char code of 'a')
+  #   p buf[0, 1]               # => 'a'
+  #   my_str = buf[0, 5]
+  #   p my_str                  # => 'abcde' (5 chars)
+  #   p buf[0, 6]               # => "abcde\n" (6 chars)
+  #   p buf[0, 7]               # => "abcde\n" (6 chars)
+  #   p buf.drop(3)             # => 3 (dropped chars)
+  #   p buf.get(0, 2)           # => 'de' (2 chars)
+  #   p buf.is_eos?             # => false (is not EOS here)
+  #   p buf.drop(5)             # => 3 (dropped chars)
+  #   p buf.is_eos?             # => true (is EOS here)
+  #   p buf[0]                  # => nil (is EOS here)
+  #
+  # EXAMPLE 2 -- String.
+  #   This is a conceptual example.  No pros with this.
+  #
+  #   class StrBuf < StreamBuf
+  #     def initialize(s)
+  #       @str = s
+  #       @idx = 0
+  #       super()
+  #     end
+  #
+  #     def read(size)
+  #       str = @str[@idx, size]
+  #       @idx += str.size
+  #       str
+  #     end
+  #   end
+  #
+  class StreamBuf
+    # get a char or a partial string from the stream.
+    # idx: index of a string to specify a start point of a string to get.
+    # unlike String instance, idx < 0 returns nil.
+    # n: size of a string to get.
+    # returns char at idx if n == nil.
+    # returns a partial string, from idx to (idx + n) if n != nil.  at EOF,
+    # the string size could not equal to arg n.
+    def [](idx, n = nil) 
+      if idx < 0
+        return nil
+      end
+      if (idx_is_eos?(idx))
+        if n and (@offset + idx == buf_size(@cur_buf))
+          # Like a String, 'abc'[4, 1] returns nil and
+          # 'abc'[3, 1] returns '' not nil.
+          return ''
+        else
+          return nil
+        end
+      end
+      my_buf = @cur_buf
+      my_offset = @offset
+      next_idx = idx
+      while (my_offset + next_idx >= buf_size(my_buf))
+        if (my_buf == @buf_tail_idx)
+          unless add_buf
+            break
           end
-          # tricky seek() clone to work around GzipReader's lack of seek()
-          @io.rewind
-          # reset back to the remembered position
-          while saved_pos > 1024  # avoid loading a lot of data into memory
-            @io.read(1024)
-            saved_pos -= 1024
+        end
+        next_idx = my_offset + next_idx - buf_size(my_buf)
+        my_buf += 1
+        my_offset = 0
+      end
+      loc = my_offset + next_idx
+      if !n
+        return @buf_list[my_buf][loc]           # Fixnum of char code.
+      elsif (loc + n - 1 < buf_size(my_buf))
+        return @buf_list[my_buf][loc, n]        # String.
+      else # should do loop insted of (tail) recursive call...
+        res = @buf_list[my_buf][loc, BufSize]
+        size_added = buf_size(my_buf) - loc
+        if size_added > 0
+          idx += size_added
+          n -= size_added
+          ret = self[idx, n]
+          if ret
+            res << ret
           end
-          @io.read(saved_pos) if saved_pos.nonzero?
-        rescue IOError  # stream not opened for reading
-          @row_sep = $INPUT_RECORD_SEPARATOR
         end
-      end
-    end
-    
-    # establish quoting rules
-    do_quote = lambda do |field|
-      @quote_char                                      +
-      String(field).gsub(@quote_char, @quote_char * 2) +
-      @quote_char
-    end
-    @quote = if options.delete(:force_quotes)
-      do_quote
-    else
-      lambda do |field|
-        if field.nil?  # represent +nil+ fields as empty unquoted fields
-          ""
-        else
-          field = String(field)  # Stringify fields
-          # represent empty fields as empty quoted fields
-          if field.empty? or
-             field.count("\r\n#{@col_sep}#{@quote_char}").nonzero?
-            do_quote.call(field)
+        return res
+      end
+    end
+    alias get []
+  
+    # drop a string from the stream.
+    # returns dropped size.  at EOF, dropped size might not equals to arg n.
+    # Once you drop the head of the stream, access to the dropped part via []
+    # or get returns nil.
+    def drop(n)
+      if is_eos?
+        return 0
+      end
+      size_dropped = 0
+      while (n > 0)
+        if !@is_eos or (@cur_buf != @buf_tail_idx)
+          if (@offset + n < buf_size(@cur_buf))
+            size_dropped += n
+            @offset += n
+            n = 0
           else
-            field  # unquoted field
+            size = buf_size(@cur_buf) - @offset
+            size_dropped += size
+            n -= size
+            @offset = 0
+            unless rel_buf
+              unless add_buf
+                break
+              end
+              @cur_buf = @buf_tail_idx
+            end
           end
         end
       end
+      size_dropped
     end
-  end
   
-  # Pre-compiles parsers and stores them by name for access during reads.
-  def init_parsers(options)
-    # store the parser behaviors
-    @skip_blanks = options.delete(:skip_blanks)
-    
-    # prebuild Regexps for faster parsing
-    esc_col_sep = Regexp.escape(@col_sep)
-    esc_row_sep = Regexp.escape(@row_sep)
-    esc_quote   = Regexp.escape(@quote_char)
-    @parsers = {
-      :leading_fields =>
-        /\A(?:#{esc_col_sep})+/,                 # for empty leading fields
-      :csv_row        =>
-        ### The Primary Parser ###
-        / \G(?:^|#{esc_col_sep})                 # anchor the match
-          (?: #{esc_quote}( (?>[^#{esc_quote}]*) # find quoted fields
-                            (?> #{esc_quote*2}
-                                [^#{esc_quote}]* )* )#{esc_quote}
-              |                                  # ... or ...
-              ([^#{esc_quote}#{esc_col_sep}]*)   # unquoted fields
-              )/x,
-        ### End Primary Parser ###
-      :line_end       =>
-        /#{esc_row_sep}\z/                       # safer than chomp!()
-    }
-  end
-  
-  # 
-  # Loads any converters requested during construction.
-  # 
-  # If +field_name+ is set <tt>:converters</tt> (the default) field converters
-  # are set.  When +field_name+ is <tt>:header_converters</tt> header converters
-  # are added instead.
-  # 
-  # The <tt>:unconverted_fields</tt> option is also actived for 
-  # <tt>:converters</tt> calls, if requested.
-  # 
-  def init_converters(options, field_name = :converters)
-    if field_name == :converters
-      @unconverted_fields = options.delete(:unconverted_fields)
+    def is_eos?
+      return idx_is_eos?(0)
     end
-
-    instance_variable_set("@#{field_name}", Array.new)
-    
-    # find the correct method to add the converters
-    convert = method(field_name.to_s.sub(/ers\Z/, ""))
-    
-    # load converters
-    unless options[field_name].nil?
-      # allow a single converter not wrapped in an Array
-      unless options[field_name].is_a? Array
-        options[field_name] = [options[field_name]]
-      end
-      # load each converter...
-      options[field_name].each do |converter|
-        if converter.is_a? Proc  # custom code block
-          convert.call(&converter)
-        else                     # by name
-          convert.call(converter)
-        end
-      end
+  
+    # WARN: Do not instantiate this class directly.  Define your own class
+    # which derives this class and define 'read' instance method.
+    def initialize
+      @buf_list = []
+      @cur_buf = @buf_tail_idx = -1
+      @offset = 0
+      @is_eos = false
+      add_buf
+      @cur_buf = @buf_tail_idx
     end
-    
-    options.delete(field_name)
-  end
   
-  # Stores header row settings and loads header converters, if needed.
-  def init_headers(options)
-    @use_headers    = options.delete(:headers)
-    @return_headers = options.delete(:return_headers)
+  protected
 
-    # headers must be delayed until shift(), in case they need a row of content
-    @headers = nil
-    
-    init_converters(options, :header_converters)
-  end
+    def terminate
+      while (rel_buf); end
+    end
   
-  # 
-  # The actual work method for adding converters, used by both CSV.convert() and
-  # CSV.header_convert().
-  # 
-  # This method requires the +var_name+ of the instance variable to place the
-  # converters in, the +const+ Hash to lookup named converters in, and the
-  # normal parameters of the CSV.convert() and CSV.header_convert() methods.
-  # 
-  def add_converter(var_name, const, name = nil, &converter)
-    if name.nil?  # custom converter
-      instance_variable_get("@#{var_name}") << converter
-    else          # named converter
-      combo = const[name]
-      case combo
-      when Array  # combo converter
-        combo.each do |converter_name|
-          add_converter(var_name, const, converter_name)
-        end
-      else        # individual named converter
-        instance_variable_get("@#{var_name}") << combo
-      end
+    # protected method 'read' must be defined in derived classes.
+    # CAUTION: Returning a string which size is not equal to 'size' means
+    # EnfOfStream.  When it is not at EOS, you must block the callee, try to
+    # read and return the sized string.
+    def read(size) # raise EOFError
+      raise NotImplementedError.new('Method read must be defined in a derived class.')
     end
-  end
   
-  # 
-  # Processes +fields+ with <tt>@converters</tt>, or <tt>@header_converters</tt>
-  # if +headers+ is passed as +true+, returning the converted field set.  Any
-  # converter that changes the field into something other than a String halts
-  # the pipeline of conversion for that field.  This is primarily an efficiency
-  # shortcut.
-  # 
-  def convert_fields(fields, headers = false)
-    # see if we are converting headers or fields
-    converters = headers ? @header_converters : @converters
-    
-    fields.each_with_index.map do |field, index|  # map_with_index
-      converters.each do |converter|
-        field = if converter.arity == 1  # straight field converter
-          converter[field]
-        else                             # FieldInfo converter
-          header = @use_headers && !headers ? @headers[index] : nil
-          converter[field, FieldInfo.new(index, lineno, header)]
-        end
-        break unless field.is_a? String  # short-curcuit pipeline for speed
+  private
+  
+    def buf_size(idx)
+      @buf_list[idx].size
+    end
+
+    def add_buf
+      if @is_eos
+        return false
+      end
+      begin
+        str_read = read(BufSize)
+      rescue EOFError
+        str_read = nil
+      rescue
+        terminate
+        raise
+      end
+      if str_read.nil?
+        @is_eos = true
+        @buf_list.push('')
+        @buf_tail_idx += 1
+        false
+      else
+        @buf_list.push(str_read)
+        @buf_tail_idx += 1
+        true
       end
-      field  # final state of each field, converted or original
     end
-  end
   
-  # 
-  # This methods is used to turn a finished +row+ into a CSV::Row.  Header rows
-  # are also dealt with here, either by returning a CSV::Row with identical
-  # headers and fields (save that the fields do not go through the converters)
-  # or by reading past them to return a field row. Headers are also saved in
-  # <tt>@headers</tt> for use in future rows.
-  # 
-  # When +nil+, +row+ is assumed to be a header row not based on an actual row
-  # of the stream.
-  # 
-  def parse_headers(row = nil)
-    if @headers.nil?                # header row
-      @headers = case @use_headers  # save headers
-      when Array  then @use_headers                         # Array of headers
-      when String then self.class.parse_line(@use_headers)  # CSV header String
-      else             row                                  # first row headers
+    def rel_buf
+      if (@cur_buf < 0)
+        return false
       end
-      
-      # prepare converted and unconverted copies
-      row      = @headers                       if row.nil?
-      @headers = convert_fields(@headers, true)
-      
-      if @return_headers                                     # return headers
-        return self.class::Row.new(@headers, row, true)
-      elsif not [Array, String].include? @use_headers.class  # skip to field row
-        return shift
+      @buf_list[@cur_buf] = nil
+      if (@cur_buf == @buf_tail_idx)
+        @cur_buf = -1
+        return false
+      else
+        @cur_buf += 1
+        return true
       end
     end
-
-    self.class::Row.new(@headers, convert_fields(row))  # field row
-  end
   
-  # 
-  # Thiw methods injects an instance variable <tt>unconverted_fields</tt> into
-  # +row+ and an accessor method for it called unconverted_fields().  The
-  # variable is set to the contents of +fields+.
-  # 
-  def add_unconverted_fields(row, fields)
-    class << row
-      attr_reader :unconverted_fields
+    def idx_is_eos?(idx)
+      (@is_eos and ((@cur_buf < 0) or (@cur_buf == @buf_tail_idx)))
     end
-    row.instance_eval { @unconverted_fields = fields }
-    row
+  
+    BufSize = 1024 * 8
   end
-end
 
-# Another name for CSV::instance().
-def CSV(*args, &block)
-  CSV.instance(*args, &block)
-end
+  # Buffered IO.
+  #
+  # EXAMPLE
+  #   # File 'bigdata' could be a giga-byte size one!
+  #   buf = CSV::IOBuf.new(File.open('bigdata', 'rb'))
+  #   CSV::Reader.new(buf).each do |row|
+  #     p row
+  #     break if row[0].data == 'admin'
+  #   end
+  #
+  class IOBuf < StreamBuf
+    def initialize(s)
+      @s = s
+      super()
+    end
+  
+    def close
+      terminate
+    end
 
-class Array
-  # Equivalent to <tt>CSV::generate_line(self, options)</tt>.
-  def to_csv(options = Hash.new)
-    CSV.generate_line(self, options)
-  end
-end
+  private
 
-class String
-  # Equivalent to <tt>CSV::parse_line(self, options)</tt>.
-  def parse_csv(options = Hash.new)
-    CSV.parse_line(self, options)
+    def read(size)
+      @s.read(size)
+    end
+ 
+    def terminate
+      super()
+    end
   end
 end
diff --git a/lib/date.rb b/lib/date.rb
index d2fc8613b2..19991d60b4 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -328,392 +328,235 @@ class Date
   UNIX_EPOCH_IN_CJD      = 2440588 # :nodoc:
   LD_EPOCH_IN_CJD        = 2299160 # :nodoc:
 
-  t = Module.new do
-
-    private
-
-    def find_fdoy(y, sg) # :nodoc:
-      j = nil
-      1.upto(31) do |d|
-	break if j = _valid_civil?(y, 1, d, sg)
+  # Does a given Julian Day Number fall inside the old-style (Julian)
+  # calendar?
+  #
+  # +jd+ is the Julian Day Number in question. +sg+ may be Date::GREGORIAN,
+  # in which case the answer is false; it may be Date::JULIAN, in which case
+  # the answer is true; or it may a number representing the Day of
+  # Calendar Reform. Date::ENGLAND and Date::ITALY are two possible such
+  # days.
+
+  def self.julian? (jd, sg)
+    case sg
+    when Numeric
+      jd < sg
+    else
+      if $VERBOSE
+	warn("#{caller.shift.sub(/:in .*/, '')}: " \
+"warning: do not use non-numerical object as julian day number anymore")
       end
-      j
+      not sg
     end
+  end
 
-    def find_ldoy(y, sg) # :nodoc:
-      j = nil
-      31.downto(1) do |d|
-	break if j = _valid_civil?(y, 12, d, sg)
-      end
-      j
-    end
+  # Does a given Julian Day Number fall inside the new-style (Gregorian)
+  # calendar?
+  #
+  # The reverse of self.os?  See the documentation for that method for
+  # more details.
+  def self.gregorian? (jd, sg) !julian?(jd, sg) end
 
-    def find_fdom(y, m, sg) # :nodoc:
-      j = nil
-      1.upto(31) do |d|
-	break if j = _valid_civil?(y, m, d, sg)
-      end
-      j
-    end
+  def self.fix_style(jd, sg) # :nodoc:
+    if julian?(jd, sg)
+    then JULIAN
+    else GREGORIAN end
+  end
 
-    def find_ldom(y, m, sg) # :nodoc:
-      j = nil
-      31.downto(1) do |d|
-	break if j = _valid_civil?(y, m, d, sg)
-      end
-      j
-    end
+  private_class_method :fix_style
 
-    # Convert an Ordinal Date to a Julian Day Number.
-    #
-    # +y+ and +d+ are the year and day-of-year to convert.
-    # +sg+ specifies the Day of Calendar Reform.
-    #
-    # Returns the corresponding Julian Day Number.
-    def ordinal_to_jd(y, d, sg=GREGORIAN) # :nodoc:
-      find_fdoy(y, sg) + d - 1
-    end
+  # Convert an Ordinal Date to a Julian Day Number.
+  #
+  # +y+ and +d+ are the year and day-of-year to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Julian Day Number.
+  def self.ordinal_to_jd(y, d, sg=GREGORIAN)
+    civil_to_jd(y, 1, d, sg)
+  end
 
-    # Convert a Julian Day Number to an Ordinal Date.
-    #
-    # +jd+ is the Julian Day Number to convert.
-    # +sg+ specifies the Day of Calendar Reform.
-    #
-    # Returns the corresponding Ordinal Date as
-    # [year, day_of_year]
-    def jd_to_ordinal(jd, sg=GREGORIAN) # :nodoc:
-      y = jd_to_civil(jd, sg)[0]
-      j = find_fdoy(y, sg)
-      doy = jd - j + 1
-      return y, doy
-    end
+  # Convert a Julian Day Number to an Ordinal Date.
+  #
+  # +jd+ is the Julian Day Number to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Ordinal Date as
+  # [year, day_of_year]
+  def self.jd_to_ordinal(jd, sg=GREGORIAN)
+    y = jd_to_civil(jd, sg)[0]
+    doy = jd - civil_to_jd(y - 1, 12, 31, fix_style(jd, sg))
+    return y, doy
+  end
 
-    # Convert a Civil Date to a Julian Day Number.
-    # +y+, +m+, and +d+ are the year, month, and day of the
-    # month.  +sg+ specifies the Day of Calendar Reform.
-    #
-    # Returns the corresponding Julian Day Number.
-    def civil_to_jd(y, m, d, sg=GREGORIAN) # :nodoc:
-      if m <= 2
-	y -= 1
-	m += 12
-      end
-      a = (y / 100.0).floor
-      b = 2 - a + (a / 4.0).floor
-      jd = (365.25 * (y + 4716)).floor +
-	(30.6001 * (m + 1)).floor +
-	d + b - 1524
-      if jd < sg
-	jd -= b
-      end
-      jd
+  # Convert a Civil Date to a Julian Day Number.
+  # +y+, +m+, and +d+ are the year, month, and day of the
+  # month.  +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Julian Day Number.
+  def self.civil_to_jd(y, m, d, sg=GREGORIAN)
+    if m <= 2
+      y -= 1
+      m += 12
     end
-
-    # Convert a Julian Day Number to a Civil Date.  +jd+ is
-    # the Julian Day Number. +sg+ specifies the Day of
-    # Calendar Reform.
-    #
-    # Returns the corresponding [year, month, day_of_month]
-    # as a three-element array.
-    def jd_to_civil(jd, sg=GREGORIAN) # :nodoc:
-      if jd < sg
-	a = jd
-      else
-	x = ((jd - 1867216.25) / 36524.25).floor
-	a = jd + 1 + x - (x / 4.0).floor
-      end
-      b = a + 1524
-      c = ((b - 122.1) / 365.25).floor
-      d = (365.25 * c).floor
-      e = ((b - d) / 30.6001).floor
-      dom = b - d - (30.6001 * e).floor
-      if e <= 13
-	m = e - 1
-	y = c - 4716
-      else
-	m = e - 13
-	y = c - 4715
-      end
-      return y, m, dom
+    a = (y / 100.0).floor
+    b = 2 - a + (a / 4.0).floor
+    jd = (365.25 * (y + 4716)).floor +
+      (30.6001 * (m + 1)).floor +
+      d + b - 1524
+    if julian?(jd, sg)
+      jd -= b
     end
+    jd
+  end
 
-    # Convert a Commercial Date to a Julian Day Number.
-    #
-    # +y+, +w+, and +d+ are the (commercial) year, week of the year,
-    # and day of the week of the Commercial Date to convert.
-    # +sg+ specifies the Day of Calendar Reform.
-    def commercial_to_jd(y, w, d, sg=GREGORIAN) # :nodoc:
-      j = find_fdoy(y, sg) + 3
-      (j - (((j - 1) + 1) % 7)) +
-	7 * (w - 1) +
-	(d - 1)
+  # Convert a Julian Day Number to a Civil Date.  +jd+ is
+  # the Julian Day Number. +sg+ specifies the Day of
+  # Calendar Reform.
+  #
+  # Returns the corresponding [year, month, day_of_month]
+  # as a three-element array.
+  def self.jd_to_civil(jd, sg=GREGORIAN)
+    if julian?(jd, sg)
+      a = jd
+    else
+      x = ((jd - 1867216.25) / 36524.25).floor
+      a = jd + 1 + x - (x / 4.0).floor
     end
-
-    # Convert a Julian Day Number to a Commercial Date
-    #
-    # +jd+ is the Julian Day Number to convert.
-    # +sg+ specifies the Day of Calendar Reform.
-    #
-    # Returns the corresponding Commercial Date as
-    # [commercial_year, week_of_year, day_of_week]
-    def jd_to_commercial(jd, sg=GREGORIAN) # :nodoc:
-      a = jd_to_civil(jd - 3, sg)[0]
-      y = if jd >= commercial_to_jd(a + 1, 1, 1, sg) then a + 1 else a end
-      w = 1 + ((jd - commercial_to_jd(y, 1, 1, sg)) / 7).floor
-      d = (jd + 1) % 7
-      d = 7 if d == 0
-      return y, w, d
+    b = a + 1524
+    c = ((b - 122.1) / 365.25).floor
+    d = (365.25 * c).floor
+    e = ((b - d) / 30.6001).floor
+    dom = b - d - (30.6001 * e).floor
+    if e <= 13
+      m = e - 1
+      y = c - 4716
+    else
+      m = e - 13
+      y = c - 4715
     end
+    return y, m, dom
+  end
 
-    def weeknum_to_jd(y, w, d, f=0, sg=GREGORIAN) # :nodoc:
-      a = find_fdoy(y, sg) + 6
-      (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
-    end
+  # Convert a Commercial Date to a Julian Day Number.
+  #
+  # +y+, +w+, and +d+ are the (commercial) year, week of the year,
+  # and day of the week of the Commercial Date to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  def self.commercial_to_jd(y, w, d, ns=GREGORIAN)
+    jd = civil_to_jd(y, 1, 4, ns)
+    (jd - (((jd - 1) + 1) % 7)) +
+      7 * (w - 1) +
+      (d - 1)
+  end
 
-    def jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
-      y, m, d = jd_to_civil(jd, sg)
-      a = find_fdoy(y, sg) + 6
-      w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
-      return y, w, d
-    end
+  # Convert a Julian Day Number to a Commercial Date
+  #
+  # +jd+ is the Julian Day Number to convert.
+  # +sg+ specifies the Day of Calendar Reform.
+  #
+  # Returns the corresponding Commercial Date as
+  # [commercial_year, week_of_year, day_of_week]
+  def self.jd_to_commercial(jd, sg=GREGORIAN)
+    ns = fix_style(jd, sg)
+    a = jd_to_civil(jd - 3, ns)[0]
+    y = if jd >= commercial_to_jd(a + 1, 1, 1, ns) then a + 1 else a end
+    w = 1 + ((jd - commercial_to_jd(y, 1, 1, ns)) / 7).floor
+    d = (jd + 1) % 7
+    d = 7 if d == 0
+    return y, w, d
+  end
 
-    def nth_kday_to_jd(y, m, n, k, sg=GREGORIAN) # :nodoc:
-      j = if n > 0
-	    find_fdom(y, m, sg) - 1
-	  else
-	    find_ldom(y, m, sg) + 7
-	  end
-      (j - (((j - k) + 1) % 7)) + 7 * n
-    end
+  def self.weeknum_to_jd(y, w, d, f=0, ns=GREGORIAN) # :nodoc:
+    a = civil_to_jd(y, 1, 1, ns) + 6
+    (a - ((a - f) + 1) % 7 - 7) + 7 * w + d
+  end
 
-    def jd_to_nth_kday(jd, sg=GREGORIAN) # :nodoc:
-      y, m, d = jd_to_civil(jd, sg)
-      j = find_fdom(y, m, sg)
-      return y, m, ((jd - j) / 7).floor + 1, jd_to_wday(jd)
-    end
+  def self.jd_to_weeknum(jd, f=0, sg=GREGORIAN) # :nodoc:
+    ns = fix_style(jd, sg)
+    y, m, d = jd_to_civil(jd, ns)
+    a = civil_to_jd(y, 1, 1, ns) + 6
+    w, d = (jd - (a - ((a - f) + 1) % 7) + 7).divmod(7)
+    return y, w, d
+  end
 
-    # Convert an Astronomical Julian Day Number to a (civil) Julian
-    # Day Number.
-    #
-    # +ajd+ is the Astronomical Julian Day Number to convert.
-    # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-    #
-    # Returns the (civil) Julian Day Number as [day_number,
-    # fraction] where +fraction+ is always 1/2.
-    def ajd_to_jd(ajd, of=0) (ajd + of + HALF_DAYS_IN_DAY).divmod(1) end # :nodoc:
-
-    # Convert a (civil) Julian Day Number to an Astronomical Julian
-    # Day Number.
-    #
-    # +jd+ is the Julian Day Number to convert, and +fr+ is a
-    # fractional day.
-    # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
-    #
-    # Returns the Astronomical Julian Day Number as a single
-    # numeric value.
-    def jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end # :nodoc:
-
-    # Convert a fractional day +fr+ to [hours, minutes, seconds,
-    # fraction_of_a_second]
-    def day_fraction_to_time(fr) # :nodoc:
-      ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
-      h,   ss = ss.divmod(3600)
-      min, s  = ss.divmod(60)
-      return h, min, s, fr * 86400
-    end
+  private_class_method :weeknum_to_jd, :jd_to_weeknum
+
+  # Convert an Astronomical Julian Day Number to a (civil) Julian
+  # Day Number.
+  #
+  # +ajd+ is the Astronomical Julian Day Number to convert.
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  #
+  # Returns the (civil) Julian Day Number as [day_number,
+  # fraction] where +fraction+ is always 1/2.
+  def self.ajd_to_jd(ajd, of=0) (ajd + of + HALF_DAYS_IN_DAY).divmod(1) end
 
-    # Convert an +h+ hour, +min+ minutes, +s+ seconds period
-    # to a fractional day.
-    begin
-      Rational(Rational(1, 2), 2) # a challenge
+  # Convert a (civil) Julian Day Number to an Astronomical Julian
+  # Day Number.
+  #
+  # +jd+ is the Julian Day Number to convert, and +fr+ is a
+  # fractional day.
+  # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
+  #
+  # Returns the Astronomical Julian Day Number as a single
+  # numeric value.
+  def self.jd_to_ajd(jd, fr, of=0) jd + fr - of - HALF_DAYS_IN_DAY end
 
-      def time_to_day_fraction(h, min, s)
-	Rational(h * 3600 + min * 60 + s, 86400) # 4p
-      end
-    rescue
-      def time_to_day_fraction(h, min, s)
+  # Convert a fractional day +fr+ to [hours, minutes, seconds,
+  # fraction_of_a_second]
+  def self.day_fraction_to_time(fr)
+    ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
+    h,   ss = ss.divmod(3600)
+    min, s  = ss.divmod(60)
+    return h, min, s, fr
+  end
+
+  # Convert an +h+ hour, +min+ minutes, +s+ seconds period
+  # to a fractional day.
+  begin
+    Rational(Rational(1, 2), 2) # a challenge
+
+    def self.time_to_day_fraction(h, min, s)
+      Rational(h * 3600 + min * 60 + s, 86400) # 4p
+    end
+  rescue
+    def self.time_to_day_fraction(h, min, s)
 	if Integer === h && Integer === min && Integer === s
 	  Rational(h * 3600 + min * 60 + s, 86400) # 4p
 	else
 	  (h * 3600 + min * 60 + s).to_r/86400 # 4p
 	end
-      end
     end
+  end
 
-    # Convert an Astronomical Modified Julian Day Number to an
-    # Astronomical Julian Day Number.
-    def amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end # :nodoc:
-
-    # Convert an Astronomical Julian Day Number to an
-    # Astronomical Modified Julian Day Number.
-    def ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end # :nodoc:
-
-    # Convert a Modified Julian Day Number to a Julian
-    # Day Number.
-    def mjd_to_jd(mjd) mjd + MJD_EPOCH_IN_CJD end # :nodoc:
-
-    # Convert a Julian Day Number to a Modified Julian Day
-    # Number.
-    def jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end # :nodoc:
-
-    # Convert a count of the number of days since the adoption
-    # of the Gregorian Calendar (in Italy) to a Julian Day Number.
-    def ld_to_jd(ld) ld +  LD_EPOCH_IN_CJD end # :nodoc:
-
-    # Convert a Julian Day Number to the number of days since
-    # the adoption of the Gregorian Calendar (in Italy).
-    def jd_to_ld(jd) jd -  LD_EPOCH_IN_CJD end # :nodoc:
-
-    # Convert a Julian Day Number to the day of the week.
-    #
-    # Sunday is day-of-week 0; Saturday is day-of-week 6.
-    def jd_to_wday(jd) (jd + 1) % 7 end # :nodoc:
-
-    # Is +jd+ a valid Julian Day Number?
-    #
-    # If it is, returns it.  In fact, any value is treated as a valid
-    # Julian Day Number.
-    def _valid_jd? (jd, sg=GREGORIAN) jd end # :nodoc:
-
-    # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
-    # Returns the corresponding Julian Day Number if they do, or
-    # nil if they don't.
-    #
-    # +d+ can be a negative number, in which case it counts backwards
-    # from the end of the year (-1 being the last day of the year).
-    # No year wraparound is performed, however, so valid values of
-    # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
-    # -366 .. -1, 1 .. 366 on a leap year.
-    # A date falling in the period skipped in the Day of Calendar Reform
-    # adjustment is not valid.
-    #
-    # +sg+ specifies the Day of Calendar Reform.
-    def _valid_ordinal? (y, d, sg=GREGORIAN) # :nodoc:
-      if d < 0
-	j = find_ldoy(y, sg)
-	ny, nd = jd_to_ordinal(j + d + 1, sg)
-	return unless ny == y
-	d = nd
-      end
-      jd = ordinal_to_jd(y, d, sg)
-      return unless [y, d] == jd_to_ordinal(jd, sg)
-      jd
-    end
+  # Convert an Astronomical Modified Julian Day Number to an
+  # Astronomical Julian Day Number.
+  def self.amjd_to_ajd(amjd) amjd + MJD_EPOCH_IN_AJD end
 
-    # Do year +y+, month +m+, and day-of-month +d+ make a
-    # valid Civil Date?  Returns the corresponding Julian
-    # Day Number if they do, nil if they don't.
-    #
-    # +m+ and +d+ can be negative, in which case they count
-    # backwards from the end of the year and the end of the
-    # month respectively.  No wraparound is performed, however,
-    # and invalid values cause an ArgumentError to be raised.
-    # A date falling in the period skipped in the Day of Calendar
-    # Reform adjustment is not valid.
-    #
-    # +sg+ specifies the Day of Calendar Reform.
-    def _valid_civil? (y, m, d, sg=GREGORIAN) # :nodoc:
-      if m < 0
-	m += 13
-      end
-      if d < 0
-	j = find_ldom(y, m, sg)
-	ny, nm, nd = jd_to_civil(j + d + 1, sg)
-	return unless [ny, nm] == [y, m]
-	d = nd
-      end
-      jd = civil_to_jd(y, m, d, sg)
-      return unless [y, m, d] == jd_to_civil(jd, sg)
-      jd
-    end
+  # Convert an Astronomical Julian Day Number to an
+  # Astronomical Modified Julian Day Number.
+  def self.ajd_to_amjd(ajd) ajd - MJD_EPOCH_IN_AJD end
 
-    # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
-    # valid Commercial Date?  Returns the corresponding Julian
-    # Day Number if they do, nil if they don't.
-    #
-    # Monday is day-of-week 1; Sunday is day-of-week 7.
-    #
-    # +w+ and +d+ can be negative, in which case they count
-    # backwards from the end of the year and the end of the
-    # week respectively.  No wraparound is performed, however,
-    # and invalid values cause an ArgumentError to be raised.
-    # A date falling in the period skipped in the Day of Calendar
-    # Reform adjustment is not valid.
-    #
-    # +sg+ specifies the Day of Calendar Reform.
-    def _valid_commercial? (y, w, d, sg=GREGORIAN) # :nodoc:
-      if d < 0
-	d += 8
-      end
-      if w < 0
-	ny, nw, nd =
-	  jd_to_commercial(commercial_to_jd(y + 1, 1, 1, sg) + w * 7, sg)
-	return unless ny == y
-	w = nw
-      end
-      jd = commercial_to_jd(y, w, d, sg)
-      return unless [y, w, d] == jd_to_commercial(jd, sg)
-      jd
-    end
+  # Convert a Modified Julian Day Number to a Julian
+  # Day Number.
+  def self.mjd_to_jd(mjd) mjd + MJD_EPOCH_IN_CJD end
 
-    def _valid_weeknum? (y, w, d, f, sg=GREGORIAN) # :nodoc:
-      if d < 0
-	d += 7
-      end
-      if w < 0
-	ny, nw, nd, nf =
-	  jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f, sg) + w * 7, f, sg)
-	return unless ny == y
-	w = nw
-      end
-      jd = weeknum_to_jd(y, w, d, f, sg)
-      return unless [y, w, d] == jd_to_weeknum(jd, f, sg)
-      jd
-    end
-
-    def _valid_nth_kday? (y, m, n, k, sg=GREGORIAN) # :nodoc:
-      if k < 0
-	k += 7
-      end
-      if n < 0
-	ny, nm = (y * 12 + m).divmod(12)
-	nm,    = (nm + 1)    .divmod(1)
-	ny, nm, nn, nk =
-	  jd_to_nth_kday(nth_kday_to_jd(ny, nm, 1, k, sg) + n * 7, sg)
-	return unless [ny, nm] == [y, m]
-	n = nn
-      end
-      jd = nth_kday_to_jd(y, m, n, k, sg)
-      return unless [y, m, n, k] == jd_to_nth_kday(jd, sg)
-      jd
-    end
+  # Convert a Julian Day Number to a Modified Julian Day
+  # Number.
+  def self.jd_to_mjd(jd) jd - MJD_EPOCH_IN_CJD end
 
-    # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
-    #
-    # If they do, returns their value as a fraction of a day.  If not,
-    # returns nil.
-    #
-    # The 24-hour clock is used.  Negative values of +h+, +min+, and
-    # +sec+ are treating as counting backwards from the end of the
-    # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
-    # wraparound is performed.
-    def _valid_time? (h, min, s) # :nodoc:
-      h   += 24 if h   < 0
-      min += 60 if min < 0
-      s   += 60 if s   < 0
-      return unless ((0...24) === h &&
-		     (0...60) === min &&
-		     (0...60) === s) ||
-		     (24 == h &&
-		       0 == min &&
-		       0 == s)
-      time_to_day_fraction(h, min, s)
-    end
+  # Convert a count of the number of days since the adoption
+  # of the Gregorian Calendar (in Italy) to a Julian Day Number.
+  def self.ld_to_jd(ld) ld + LD_EPOCH_IN_CJD end
 
-  end
+  # Convert a Julian Day Number to the number of days since
+  # the adoption of the Gregorian Calendar (in Italy).
+  def self.jd_to_ld(jd) jd - LD_EPOCH_IN_CJD end
 
-  extend  t
-  include t
+  # Convert a Julian Day Number to the day of the week.
+  #
+  # Sunday is day-of-week 0; Saturday is day-of-week 6.
+  def self.jd_to_wday(jd) (jd + 1) % 7 end
 
   # Is a year a leap year in the Julian calendar?
   #
@@ -729,49 +572,148 @@ class Date
   class << self; alias_method :leap?, :gregorian_leap? end
   class << self; alias_method :new!, :new end
 
-  def self.valid_jd? (jd, sg=ITALY)
-    !!_valid_jd?(jd, sg)
-  end
+  # Is +jd+ a valid Julian Day Number?
+  #
+  # If it is, returns it.  In fact, any value is treated as a valid
+  # Julian Day Number.
+  def self.valid_jd? (jd, sg=ITALY) jd end
 
+  # Do the year +y+ and day-of-year +d+ make a valid Ordinal Date?
+  # Returns the corresponding Julian Day Number if they do, or
+  # nil if they don't.
+  #
+  # +d+ can be a negative number, in which case it counts backwards
+  # from the end of the year (-1 being the last day of the year).
+  # No year wraparound is performed, however, so valid values of
+  # +d+ are -365 .. -1, 1 .. 365 on a non-leap-year,
+  # -366 .. -1, 1 .. 366 on a leap year.
+  # A date falling in the period skipped in the Day of Calendar Reform
+  # adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_ordinal? (y, d, sg=ITALY)
-    !!_valid_ordinal?(y, d, sg)
+    if d < 0
+      ny, = (y + 1).divmod(1)
+      jd = ordinal_to_jd(ny, d + 1, sg)
+      ns = fix_style(jd, sg)
+      return unless [y] == jd_to_ordinal(jd, sg)[0..0]
+      return unless [ny, 1] == jd_to_ordinal(jd - d, ns)
+    else
+      jd = ordinal_to_jd(y, d, sg)
+      return unless [y, d] == jd_to_ordinal(jd, sg)
+    end
+    jd
   end
 
+  # Do year +y+, month +m+, and day-of-month +d+ make a
+  # valid Civil Date?  Returns the corresponding Julian
+  # Day Number if they do, nil if they don't.
+  #
+  # +m+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # month respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  # A date falling in the period skipped in the Day of Calendar
+  # Reform adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_civil? (y, m, d, sg=ITALY)
-    !!_valid_civil?(y, m, d, sg)
+    if m < 0
+      m += 13
+    end
+    if d < 0
+      ny, nm = (y * 12 + m).divmod(12)
+      nm,    = (nm + 1).divmod(1)
+      jd = civil_to_jd(ny, nm, d + 1, sg)
+      ns = fix_style(jd, sg)
+      return unless [y, m] == jd_to_civil(jd, sg)[0..1]
+      return unless [ny, nm, 1] == jd_to_civil(jd - d, ns)
+    else
+      jd = civil_to_jd(y, m, d, sg)
+      return unless [y, m, d] == jd_to_civil(jd, sg)
+    end
+    jd
   end
 
   class << self; alias_method :valid_date?, :valid_civil? end
 
+  # Do year +y+, week-of-year +w+, and day-of-week +d+ make a
+  # valid Commercial Date?  Returns the corresponding Julian
+  # Day Number if they do, nil if they don't.
+  #
+  # Monday is day-of-week 1; Sunday is day-of-week 7.
+  #
+  # +w+ and +d+ can be negative, in which case they count
+  # backwards from the end of the year and the end of the
+  # week respectively.  No wraparound is performed, however,
+  # and invalid values cause an ArgumentError to be raised.
+  # A date falling in the period skipped in the Day of Calendar
+  # Reform adjustment is not valid.
+  #
+  # +sg+ specifies the Day of Calendar Reform.
   def self.valid_commercial? (y, w, d, sg=ITALY)
-    !!_valid_commercial?(y, w, d, sg)
+    if d < 0
+      d += 8
+    end
+    if w < 0
+      ny, nw, nd =
+	jd_to_commercial(commercial_to_jd(y + 1, 1, 1) + w * 7)
+      return unless ny == y
+      w = nw
+    end
+    jd = commercial_to_jd(y, w, d)
+    return unless gregorian?(jd, sg)
+    return unless [y, w, d] == jd_to_commercial(jd)
+    jd
   end
 
   def self.valid_weeknum? (y, w, d, f, sg=ITALY) # :nodoc:
-    !!_valid_weeknum?(y, w, d, f, sg)
+    if d < 0
+      d += 7
+    end
+    if w < 0
+      ny, nw, nd, nf =
+	jd_to_weeknum(weeknum_to_jd(y + 1, 1, f, f) + w * 7, f)
+      return unless ny == y
+      w = nw
+    end
+    jd = weeknum_to_jd(y, w, d, f)
+    return unless gregorian?(jd, sg)
+    return unless [y, w, d] == jd_to_weeknum(jd, f)
+    jd
   end
 
   private_class_method :valid_weeknum?
 
-  def self.valid_nth_kday? (y, m, n, k, sg=ITALY) # :nodoc:
-    !!_valid_nth_kday?(y, m, n, k, sg)
-  end
-
-  private_class_method :valid_nth_kday?
-
-  def self.valid_time? (h, min, s) # :nodoc:
-    !!_valid_time?(h, min, s)
+  # Do hour +h+, minute +min+, and second +s+ constitute a valid time?
+  #
+  # If they do, returns their value as a fraction of a day.  If not,
+  # returns nil.
+  #
+  # The 24-hour clock is used.  Negative values of +h+, +min+, and
+  # +sec+ are treating as counting backwards from the end of the
+  # next larger unit (e.g. a +min+ of -2 is treated as 58).  No
+  # wraparound is performed.
+  def self.valid_time? (h, min, s)
+    h   += 24 if h   < 0
+    min += 60 if min < 0
+    s   += 60 if s   < 0
+    return unless ((0...24) === h &&
+		   (0...60) === min &&
+		   (0...60) === s) ||
+		  (24 == h &&
+		    0 == min &&
+		    0 == s)
+    time_to_day_fraction(h, min, s)
   end
 
-  private_class_method :valid_time?
-
   # Create a new Date object from a Julian Day Number.
   #
   # +jd+ is the Julian Day Number; if not specified, it defaults to
   # 0.
   # +sg+ specifies the Day of Calendar Reform.
   def self.jd(jd=0, sg=ITALY)
-    jd = _valid_jd?(jd, sg)
+    jd = valid_jd?(jd, sg)
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
@@ -786,7 +728,7 @@ class Date
   #
   # +sg+ specifies the Day of Calendar Reform.
   def self.ordinal(y=-4712, d=1, sg=ITALY)
-    unless jd = _valid_ordinal?(y, d, sg)
+    unless jd = valid_ordinal?(y, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -806,7 +748,7 @@ class Date
   #
   # +sg+ specifies the Day of Calendar Reform.
   def self.civil(y=-4712, m=1, d=1, sg=ITALY)
-    unless jd = _valid_civil?(y, m, d, sg)
+    unless jd = valid_civil?(y, m, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -824,19 +766,19 @@ class Date
   # week respectively.  No wraparound is performed, however,
   # and invalid values cause an ArgumentError to be raised.
   #
-  # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
-  # Julian Day Number day 0.
+  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5, the Day of
+  # Calendar Reform for Italy and the Catholic countries.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.commercial(y=-4712, w=1, d=1, sg=ITALY)
-    unless jd = _valid_commercial?(y, w, d, sg)
+  def self.commercial(y=1582, w=41, d=5, sg=ITALY)
+    unless jd = valid_commercial?(y, w, d, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
   end
 
-  def self.weeknum(y=-4712, w=0, d=1, f=0, sg=ITALY)
-    unless jd = _valid_weeknum?(y, w, d, f, sg)
+  def self.weeknum(y=1582, w=41, d=5, f=0, sg=ITALY) # :nodoc:
+    unless jd = valid_weeknum?(y, w, d, f, sg)
       raise ArgumentError, 'invalid date'
     end
     new!(jd_to_ajd(jd, 0, 0), 0, sg)
@@ -844,15 +786,6 @@ class Date
 
   private_class_method :weeknum
 
-  def self.nth_kday(y=-4712, m=1, n=1, k=1, sg=ITALY)
-    unless jd = _valid_nth_kday?(y, m, n, k, sg)
-      raise ArgumentError, 'invalid date'
-    end
-    new!(jd_to_ajd(jd, 0, 0), 0, sg)
-  end
-
-  private_class_method :nth_kday
-
   def self.rewrite_frags(elem) # :nodoc:
     elem ||= {}
     if seconds = elem[:seconds]
@@ -953,21 +886,21 @@ class Date
     catch :jd do
       a = elem.values_at(:jd)
       if a.all?
-	if jd = _valid_jd?(*(a << sg))
+	if jd = valid_jd?(*(a << sg))
 	  throw :jd, jd
 	end
       end
 
       a = elem.values_at(:year, :yday)
       if a.all?
-	if jd = _valid_ordinal?(*(a << sg))
+	if jd = valid_ordinal?(*(a << sg))
 	  throw :jd, jd
 	end
       end
 
       a = elem.values_at(:year, :mon, :mday)
       if a.all?
-	if jd = _valid_civil?(*(a << sg))
+	if jd = valid_civil?(*(a << sg))
 	  throw :jd, jd
 	end
       end
@@ -977,7 +910,7 @@ class Date
 	a[2] = elem[:wday].nonzero? || 7
       end
       if a.all?
-	if jd = _valid_commercial?(*(a << sg))
+	if jd = valid_commercial?(*(a << sg))
 	  throw :jd, jd
 	end
       end
@@ -987,7 +920,7 @@ class Date
 	a[2] = elem[:cwday] % 7
       end
       if a.all?
-	if jd = _valid_weeknum?(*(a << 0 << sg))
+	if jd = valid_weeknum?(*(a << 0 << sg))
 	  throw :jd, jd
 	end
       end
@@ -1000,7 +933,7 @@ class Date
 	a[2] = (elem[:cwday] - 1) % 7
       end
       if a.all?
-	if jd = _valid_weeknum?(*(a << 1 << sg))
+	if jd = valid_weeknum?(*(a << 1 << sg))
 	  throw :jd, jd
 	end
       end
@@ -1011,7 +944,7 @@ class Date
 
   def self.valid_time_frags? (elem) # :nodoc:
     h, min, s = elem.values_at(:hour, :min, :sec)
-    _valid_time?(h, min, s)
+    valid_time?(h, min, s)
   end
 
   private_class_method :valid_time_frags?
@@ -1062,52 +995,20 @@ class Date
   # Day Number day 0.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01', comp=true, sg=ITALY)
+  def self.parse(str='-4712-01-01', comp=false, sg=ITALY)
     elem = _parse(str, comp)
     new_by_frags(elem, sg)
   end
 
-  def self.iso8601(str='-4712-01-01', sg=ITALY) # :nodoc:
-    elem = _iso8601(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
-    elem = _rfc3339(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.xmlschema(str='-4712-01-01', sg=ITALY) # :nodoc:
-    elem = _xmlschema(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
-    elem = _rfc2822(str)
-    new_by_frags(elem, sg)
-  end
-
-  class << self; alias_method :rfc822, :rfc2822 end
-
-  def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
-    elem = _httpdate(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.jisx0301(str='-4712-01-01', sg=ITALY) # :nodoc:
-    elem = _jisx0301(str)
-    new_by_frags(elem, sg)
-  end
-
   class << self
 
-    def once(*ids) # :nodoc: -- restricted
+    def once(*ids) # :nodoc:
       for id in ids
 	module_eval <<-"end;"
-	  alias_method :__#{id.object_id}__, :#{id.to_s}
-	  private :__#{id.object_id}__
-	  def #{id.to_s}(*args)
-	    @__ca__[#{id.object_id}] ||= __#{id.object_id}__(*args)
+	  alias_method :__#{id.to_i}__, :#{id.to_s}
+	  private :__#{id.to_i}__
+	  def #{id.to_s}(*args, &block)
+	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
 	  end
 	end;
       end
@@ -1136,45 +1037,42 @@ class Date
   #
   # Using one of the factory methods such as Date::civil is
   # generally easier and safer.
-  def initialize(ajd=0, of=0, sg=ITALY)
-    @ajd, @of, @sg = ajd, of, sg
-    @__ca__ = {}
-  end
+  def initialize(ajd=0, of=0, sg=ITALY) @ajd, @of, @sg = ajd, of, sg end
 
   # Get the date as an Astronomical Julian Day Number.
   def ajd() @ajd end
 
   # Get the date as an Astronomical Modified Julian Day Number.
-  def amjd() ajd_to_amjd(@ajd) end
+  def amjd() self.class.ajd_to_amjd(@ajd) end
 
   once :amjd
 
   # Get the date as a Julian Day Number.
-  def jd() ajd_to_jd(@ajd, @of)[0] end
+  def jd() self.class.ajd_to_jd(@ajd, @of)[0] end
 
   # Get any fractional day part of the date.
-  def day_fraction() ajd_to_jd(@ajd, @of)[1] end
+  def day_fraction() self.class.ajd_to_jd(@ajd, @of)[1] end
 
   # Get the date as a Modified Julian Day Number.
-  def mjd() jd_to_mjd(jd) end
+  def mjd() self.class.jd_to_mjd(jd) end
 
   # Get the date as the number of days since the Day of Calendar
   # Reform (in Italy and the Catholic countries).
-  def ld() jd_to_ld(jd) end
+  def ld() self.class.jd_to_ld(jd) end
 
   once :jd, :day_fraction, :mjd, :ld
 
   # Get the date as a Civil Date, [year, month, day_of_month]
-  def civil() jd_to_civil(jd, @sg) end # :nodoc:
+  def civil() self.class.jd_to_civil(jd, @sg) end # :nodoc:
 
   # Get the date as an Ordinal Date, [year, day_of_year]
-  def ordinal() jd_to_ordinal(jd, @sg) end # :nodoc:
+  def ordinal() self.class.jd_to_ordinal(jd, @sg) end # :nodoc:
 
   # Get the date as a Commercial Date, [year, week_of_year, day_of_week]
-  def commercial() jd_to_commercial(jd, @sg) end # :nodoc:
+  def commercial() self.class.jd_to_commercial(jd, @sg) end # :nodoc:
 
-  def weeknum0() jd_to_weeknum(jd, 0, @sg) end # :nodoc:
-  def weeknum1() jd_to_weeknum(jd, 1, @sg) end # :nodoc:
+  def weeknum0() self.class.__send__(:jd_to_weeknum, jd, 0, @sg) end # :nodoc:
+  def weeknum1() self.class.__send__(:jd_to_weeknum, jd, 1, @sg) end # :nodoc:
 
   once :civil, :ordinal, :commercial, :weeknum0, :weeknum1
   private :civil, :ordinal, :commercial, :weeknum0, :weeknum1
@@ -1205,7 +1103,7 @@ class Date
 
   # Get the time of this date as [hours, minutes, seconds,
   # fraction_of_a_second]
-  def time() day_fraction_to_time(day_fraction) end # :nodoc:
+  def time() self.class.day_fraction_to_time(day_fraction) end # :nodoc:
 
   once :time
   private :time
@@ -1219,15 +1117,18 @@ class Date
   # Get the second of this date.
   def sec() time[2] end
 
-  # Get the fraction-of-a-second of this date.
+  # Get the fraction-of-a-second of this date.  The unit is in days.
+  # I do NOT recommend you to use this method.
   def sec_fraction() time[3] end
 
+=begin
   alias_method :minute, :min
   alias_method :second, :sec
   alias_method :second_fraction, :sec_fraction
+=end
 
-  private :hour, :min, :sec, :sec_fraction,
-	  :minute, :second, :second_fraction
+  private :hour, :min, :sec, :sec_fraction
+#	  :minute, :second, :second_fraction
 
   def zone() strftime('%:z') end
 
@@ -1246,7 +1147,7 @@ class Date
 
   # Get the week day of this date.  Sunday is day-of-week 0;
   # Saturday is day-of-week 6.
-  def wday() jd_to_wday(jd) end
+  def wday() self.class.jd_to_wday(jd) end
 
   once :wday
 
@@ -1256,23 +1157,17 @@ class Date
       define_method(n.downcase + '?'){mon == i}
     end
   end
-=end
 
   DAYNAMES.each_with_index do |n, i|
     define_method(n.downcase + '?'){wday == i}
   end
-
-  def nth_kday? (n, k)
-    k == wday && jd === nth_kday_to_jd(year, mon, n, k, start)
-  end
-
-  private :nth_kday?
+=end
 
   # Is the current date old-style (Julian Calendar)?
-  def julian? () jd < @sg end
+  def julian? () self.class.julian?(jd, @sg) end
 
   # Is the current date new-style (Gregorian Calendar)?
-  def gregorian? () !julian? end
+  def gregorian? () self.class.gregorian?(jd, @sg) end
 
   once :julian?, :gregorian?
 
@@ -1286,8 +1181,8 @@ class Date
 
   # Is this a leap year?
   def leap?
-    jd_to_civil(civil_to_jd(year, 3, 1, fix_style) - 1,
-		fix_style)[-1] == 29
+    self.class.jd_to_civil(self.class.civil_to_jd(year, 3, 1, fix_style) - 1,
+		     fix_style)[-1] == 29
   end
 
   once :leap?
@@ -1391,7 +1286,9 @@ class Date
   end
 
   def next_day(n=1) self + n end
-  def prev_day(n=1) self - n end
+# def prev_day(n=1) self - n end
+
+  private :next_day
 
   # Return a new Date one day after this one.
   def next() next_day end
@@ -1408,7 +1305,7 @@ class Date
     y, m = (year * 12 + (mon - 1) + n).divmod(12)
     m,   = (m + 1)                    .divmod(1)
     d = mday
-    d -= 1 until jd2 = _valid_civil?(y, m, d, @sg)
+    d -= 1 until jd2 = self.class.valid_civil?(y, m, d, fix_style)
     self + (jd2 - jd)
   end
 
@@ -1420,13 +1317,15 @@ class Date
   # of the returned Date will be the last day of the target month.
   def << (n) self >> -n end
 
+=begin
   def next_month(n=1) self >> n end
   def prev_month(n=1) self << n end
 
   def next_year(n=1) self >> n * 12 end
   def prev_year(n=1) self << n * 12 end
+=end
 
-  require 'enumerator'
+#  require 'enumerator'
 
   # Step the current date forward +step+ days at a
   # time (or backward, if +step+ is negative) until
@@ -1438,9 +1337,11 @@ class Date
       raise ArgumentError, "step can't be 0"
     end
 =end
+=begin
     unless block_given?
       return to_enum(:step, limit, step)
     end
+=end
     da = self
     op = %w(- <= >=)[step <=> 0]
     while da.__send__(op, limit)
@@ -1479,12 +1380,21 @@ class Date
   def to_s() format('%.4d-%02d-%02d', year, mon, mday) end # 4p
 
   # Dump to Marshal format.
-  def marshal_dump() [@ajd, @of, @sg] end
+  def _dump(limit) Marshal.dump([@ajd, @of, @sg], -1) end
+
+# def self._load(str) new!(*Marshal.load(str)) end
 
   # Load from Marshal format.
-  def marshal_load(a)
-    @ajd, @of, @sg, = a
-    @__ca__ = {}
+  def self._load(str)
+    a = Marshal.load(str)
+    if a.size == 2
+      ajd,     sg = a
+           of = 0
+      ajd -= 1.to_r/2
+    else
+      ajd, of, sg = a
+    end
+    new!(ajd, of, sg)
   end
 
 end
@@ -1519,7 +1429,8 @@ end
 # === sec_fraction()
 #
 # Get the fraction of a second of the time.  This is returned as
-# a +Rational+.
+# a +Rational+.  The unit is in days.
+# I do NOT recommend you to use this method.
 #
 # === zone()
 #
@@ -1553,8 +1464,8 @@ class DateTime < Date
   #
   # All day/time values default to 0.
   def self.jd(jd=0, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = _valid_jd?(jd, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+    unless (jd = valid_jd?(jd, sg)) &&
+	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1578,8 +1489,8 @@ class DateTime < Date
   # +y+ defaults to -4712, and +d+ to 1; this is Julian Day Number
   # day 0.  The time values default to 0.
   def self.ordinal(y=-4712, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = _valid_ordinal?(y, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+    unless (jd = valid_ordinal?(y, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1603,8 +1514,8 @@ class DateTime < Date
   # +y+ defaults to -4712, +m+ to 1, and +d+ to 1; this is Julian Day
   # Number day 0.  The time values default to 0.
   def self.civil(y=-4712, m=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = _valid_civil?(y, m, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+    unless (jd = valid_civil?(y, m, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1627,12 +1538,12 @@ class DateTime < Date
   # +of+ is the offset from UTC as a fraction of a day (defaults to 0).
   # +sg+ specifies the Day of Calendar Reform.
   #
-  # +y+ defaults to -4712, +w+ to 1, and +d+ to 1; this is
-  # Julian Day Number day 0.
+  # +y+ defaults to 1582, +w+ to 41, and +d+ to 5; this is the Day of
+  # Calendar Reform for Italy and the Catholic countries.
   # The time values default to 0.
-  def self.commercial(y=-4712, w=1, d=1, h=0, min=0, s=0, of=0, sg=ITALY)
-    unless (jd = _valid_commercial?(y, w, d, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+  def self.commercial(y=1582, w=41, d=5, h=0, min=0, s=0, of=0, sg=ITALY)
+    unless (jd = valid_commercial?(y, w, d, sg)) &&
+	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1641,9 +1552,9 @@ class DateTime < Date
     new!(jd_to_ajd(jd, fr, of), of, sg)
   end
 
-  def self.weeknum(y=-4712, w=0, d=1, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
-    unless (jd = _valid_weeknum?(y, w, d, f, sg)) &&
-	   (fr = _valid_time?(h, min, s))
+  def self.weeknum(y=1582, w=41, d=5, f=0, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
+    unless (jd = valid_weeknum?(y, w, d, f, sg)) &&
+	   (fr = valid_time?(h, min, s))
       raise ArgumentError, 'invalid date'
     end
     if String === of
@@ -1654,19 +1565,6 @@ class DateTime < Date
 
   private_class_method :weeknum
 
-  def self.nth_kday(y=-4712, m=1, n=1, k=1, h=0, min=0, s=0, of=0, sg=ITALY) # :nodoc:
-    unless (jd = _valid_nth_kday?(y, m, n, k, sg)) &&
-	   (fr = _valid_time?(h, min, s))
-      raise ArgumentError, 'invalid date'
-    end
-    if String === of
-      of = Rational(zone_to_diff(of) || 0, 86400)
-    end
-    new!(jd_to_ajd(jd, fr, of), of, sg)
-  end
-
-  private_class_method :nth_kday
-
   def self.new_by_frags(elem, sg) # :nodoc:
     elem = rewrite_frags(elem)
     elem = complete_frags(elem)
@@ -1715,45 +1613,13 @@ class DateTime < Date
   # Day Number day 0.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.parse(str='-4712-01-01T00:00:00+00:00', comp=true, sg=ITALY)
+  def self.parse(str='-4712-01-01T00:00:00+00:00', comp=false, sg=ITALY)
     elem = _parse(str, comp)
     new_by_frags(elem, sg)
   end
 
-  def self.iso8601(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
-    elem = _iso8601(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.rfc3339(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
-    elem = _rfc3339(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.xmlschema(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
-    elem = _xmlschema(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.rfc2822(str='Mon, 1 Jan -4712 00:00:00 +0000', sg=ITALY) # :nodoc:
-    elem = _rfc2822(str)
-    new_by_frags(elem, sg)
-  end
-
-  class << self; alias_method :rfc822, :rfc2822 end
-
-  def self.httpdate(str='Mon, 01 Jan -4712 00:00:00 GMT', sg=ITALY) # :nodoc:
-    elem = _httpdate(str)
-    new_by_frags(elem, sg)
-  end
-
-  def self.jisx0301(str='-4712-01-01T00:00:00+00:00', sg=ITALY) # :nodoc:
-    elem = _jisx0301(str)
-    new_by_frags(elem, sg)
-  end
-
-  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset,
-	 :minute, :second, :second_fraction
+  public :hour, :min, :sec, :sec_fraction, :zone, :offset, :new_offset
+#	 :minute, :second, :second_fraction
 
   def to_s # 4p
     format('%.4d-%02d-%02dT%02d:%02d:%02d%s',
@@ -1764,39 +1630,53 @@ end
 
 class Time
 
-  def to_time() getlocal end
+#  def to_time() getlocal end
 
   def to_date
-    jd = Date.__send__(:civil_to_jd, year, mon, mday, Date::ITALY)
-    Date.new!(Date.__send__(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
+    jd = Date.civil_to_jd(year, mon, mday, Date::ITALY)
+    Date.new!(Date.jd_to_ajd(jd, 0, 0), 0, Date::ITALY)
   end
 
   def to_datetime
-    jd = DateTime.__send__(:civil_to_jd, year, mon, mday, DateTime::ITALY)
-    fr = DateTime.__send__(:time_to_day_fraction, hour, min, [sec, 59].min) +
-      Rational(nsec, 86400_000_000_000)
+    jd = DateTime.civil_to_jd(year, mon, mday, DateTime::ITALY)
+    fr = DateTime.time_to_day_fraction(hour, min, [sec, 59].min) +
+      Rational(usec, 86400_000_000)
     of = Rational(utc_offset, 86400)
-    DateTime.new!(DateTime.__send__(:jd_to_ajd, jd, fr, of),
-		  of, DateTime::ITALY)
+    DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
   end
 
+  private :to_date, :to_datetime
+
 end
 
 class Date
 
+=begin
   def to_time() Time.local(year, mon, mday) end
   def to_date() self end
-  def to_datetime() DateTime.new!(jd_to_ajd(jd, 0, 0), @of, @sg) end
+  def to_datetime() DateTime.new!(self.class.jd_to_ajd(jd, 0, 0), @of, @sg) end
+=end
 
   # Create a new Date object representing today.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.today(sg=ITALY) Time.now.to_date    .new_start(sg) end
+  def self.today(sg=ITALY)
+    t = Time.now
+    jd = civil_to_jd(t.year, t.mon, t.mday, sg)
+    new!(jd_to_ajd(jd, 0, 0), 0, sg)
+  end
 
   # Create a new DateTime object representing the current time.
   #
   # +sg+ specifies the Day of Calendar Reform.
-  def self.now  (sg=ITALY) Time.now.to_datetime.new_start(sg) end
+  def self.now(sg=ITALY)
+    t = Time.now
+    jd = civil_to_jd(t.year, t.mon, t.mday, sg)
+    fr = time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) +
+      Rational(t.usec, 86400_000_000)
+    of = Rational(t.utc_offset, 86400)
+    new!(jd_to_ajd(jd, fr, of), of, sg)
+  end
 
   private_class_method :now
 
@@ -1804,19 +1684,95 @@ end
 
 class DateTime < Date
 
+=begin
   def to_time
     d = new_offset(0)
     d.instance_eval do
-      Time.utc(year, mon, mday, hour, min, sec +
-	       sec_fraction)
+      Time.utc(year, mon, mday, hour, min, sec,
+	       (sec_fraction * 86400000000).to_i)
     end.
 	getlocal
   end
 
-  def to_date() Date.new!(jd_to_ajd(jd, 0, 0), 0, @sg) end
+  def to_date() Date.new!(self.class.jd_to_ajd(jd, 0, 0), 0, @sg) end
   def to_datetime() self end
+=end
 
   private_class_method :today
   public_class_method  :now
 
 end
+
+class Date
+
+  class << self
+
+    def deprecated_class_method_alias(old, new) # :nodoc:
+      module_eval <<-"end;"
+	class << self
+	  def #{old}(*args, &block)
+	    if $VERBOSE
+	      warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+		   "warning: \#{self}::#{old} is deprecated; " \
+		   "use \#{self}::#{new}")
+	    end
+	    #{new}(*args, &block)
+	  end
+	end
+      end;
+    end
+
+    private :deprecated_class_method_alias
+
+    def deprecated_alias(old, new) # :nodoc:
+      module_eval <<-"end;"
+	def #{old}(*args, &block)
+	  if $VERBOSE
+	    warn("\#{caller.shift.sub(/:in .*/, '')}: " \
+		 "warning: \#{self.class}\##{old} is deprecated; " \
+		 "use \#{self.class}\##{new}")
+	  end
+	  #{new}(*args, &block)
+	end
+      end;
+    end
+
+    private :deprecated_alias
+
+  end
+
+  [ %w(os?	julian?),
+    %w(ns?	gregorian?),
+    %w(exist1?	valid_jd?),
+    %w(exist2?	valid_ordinal?),
+    %w(exist3?	valid_date?),
+    %w(exist?	valid_date?),
+    %w(existw?	valid_commercial?),
+    %w(new0	new!),
+    %w(new1	jd),
+    %w(new2	ordinal),
+    %w(new3	new),
+    %w(neww	commercial)
+  ].each do |old, new|
+    deprecated_class_method_alias(old, new)
+  end
+
+  [ %w(os?	julian?),
+    %w(ns?	gregorian?),
+    %w(sg	start),
+    %w(newsg	new_start),
+    %w(of	offset),
+    %w(newof	new_offset)
+  ].each do |old, new|
+    deprecated_alias(old, new)
+  end
+
+  private :of, :newof
+
+end
+
+class DateTime < Date
+
+  public :of, :newof
+
+end
diff --git a/lib/date/format.rb b/lib/date/format.rb
index 46d2147b89..f89c1344a9 100644
--- a/lib/date/format.rb
+++ b/lib/date/format.rb
@@ -215,9 +215,9 @@ class Date
 	  :emit_a, :emit_ad, :emit_au
 
   def strftime(fmt='%F')
-    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
+    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do |m|
       f = {}
-      m = $&
+      a = $&
       s, w, c = $1, $2, $3
       if s
 	s.scan(/./) do |k|
@@ -257,12 +257,12 @@ class Date
       when 'j'; emit_n(yday, 3, f)
       when 'k'; emit_a(hour, 2, f)
       when 'L'
-	emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f)
+	emit_n((sec_fraction / MILLISECONDS_IN_DAY).floor, 3, f)
       when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
       when 'M', 'OM'; emit_n(min, 2, f)
       when 'm', 'Om'; emit_n(mon, 2, f)
       when 'N'
-	emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f)
+	emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 9, f)
       when 'n'; "\n"
       when 'P'; emit_ad(strftime('%p').downcase, 0, f)
       when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
@@ -326,8 +326,23 @@ class Date
 	([emit_z(sign * hh, 2, f)] + tail).join(sep)
       when '%'; emit_a('%', 0, f)
       when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
+      when '1'
+	if $VERBOSE
+	  warn("warning: strftime: %1 is deprecated; forget this")
+	end
+	emit_n(jd, 1, f)
+      when '2'
+	if $VERBOSE
+	  warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
+	end
+	emit_a(strftime('%Y-%j'), 0, f)
+      when '3'
+	if $VERBOSE
+	  warn("warning: strftime: %3 is deprecated; use '%F'")
+	end
+	emit_a(strftime('%F'), 0, f)
       else
-	m
+	a
       end
     end
   end
@@ -338,18 +353,15 @@ class Date
 
   alias_method :ctime, :asctime
 
+=begin
   def iso8601() strftime('%F') end
 
   def rfc3339() iso8601 end
 
-  def xmlschema() iso8601 end # :nodoc:
-
   def rfc2822() strftime('%a, %-d %b %Y %T %z') end
 
   alias_method :rfc822, :rfc2822
 
-  def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
-
   def jisx0301
     if jd < 2405160
       iso8601
@@ -368,7 +380,6 @@ class Date
     end
   end
 
-=begin
   def beat(n=0)
     i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
     ('@%03d' % i) +
@@ -551,6 +562,23 @@ class Date
 	  return unless str.sub!(/\A%/, '')
 	when '+'
 	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+	when '1'
+	  if $VERBOSE
+	    warn("warning: strptime: %1 is deprecated; forget this")
+	  end
+	  return unless str.sub!(/\A(\d+)/, '')
+	  val = $1.to_i
+	  e.jd = val
+	when '2'
+	  if $VERBOSE
+	    warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
+	  end
+	  return unless _strptime_i(str, '%Y-%j', e)
+	when '3'
+	  if $VERBOSE
+	    warn("warning: strptime: %3 is deprecated; use '%F'")
+	  end
+	  return unless _strptime_i(str, '%F', e)
 	else
 	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
 	end
@@ -852,7 +880,7 @@ class Date
 
   def self._parse_sla(str, e) # :nodoc:
     if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|n, ' ') # '
-      s3e(e, $1, $2, $3)
+      s3e(e, $3, $1, $2)
       true
     end
   end
@@ -1023,7 +1051,7 @@ class Date
 	:_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
 	:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
 
-  def self._parse(str, comp=true)
+  def self._parse(str, comp=false)
     str = str.dup
 
     e = Format::Bag.new
@@ -1089,187 +1117,40 @@ class Date
     e.to_hash
   end
 
-  def self._iso8601(str) # :nodoc:
-    if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
-	      ([-+]?\d{2,})?-\d{3}|
-	      (\d{2}|\d{4})?-w\d{2}-\d|
-	      -w-\d)
-	(t
-	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/inx =~ str
-      _parse(str)
-    elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
-	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
-	      (\d{2}|\d{4})?w\d{2}\d)
-	(t?
-	\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/inx =~ str
-      _parse(str)
-    elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/inx =~ str
-      _parse(str)
-    elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
-	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/inx =~ str
-      _parse(str)
-    end
-  end
-
-  def self._rfc3339(str) # :nodoc:
-    if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
-	(t|\s)
-	\d{2}:\d{2}:\d{2}(\.\d+)?
-	(z|[-+]\d{2}:\d{2})\s*\z/inx =~ str
-      _parse(str)
-    end
-  end
-
-  def self._xmlschema(str) # :nodoc:
-    if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
-	(?:t
-	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
-      e = Format::Bag.new
-      e.year = $1.to_i
-      e.mon = $2.to_i if $2
-      e.mday = $3.to_i if $3
-      e.hour = $4.to_i if $4
-      e.min = $5.to_i if $5
-      e.sec = $6.to_i if $6
-      e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
-      if $8
-	e.zone = $8
-	e.offset = zone_to_diff($8)
-      end
-      e.to_hash
-    elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
-      e = Format::Bag.new
-      e.hour = $1.to_i if $1
-      e.min = $2.to_i if $2
-      e.sec = $3.to_i if $3
-      e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
-      if $5
-	e.zone = $5
-	e.offset = zone_to_diff($5)
-      end
-      e.to_hash
-    elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
-	(z|[-+]\d{2}:\d{2})?\s*\z/inx =~ str
-      e = Format::Bag.new
-      e.mon = $1.to_i if $1
-      e.mday = $2.to_i if $2
-      e.mday = $3.to_i if $3
-      if $4
-	e.zone = $4
-	e.offset = zone_to_diff($4)
-      end
-      e.to_hash
-    end
-  end
-
-  def self._rfc2822(str) # :nodoc:
-    if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
-	\d{1,2}\s+
-	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	-?(\d{2,})\s+ # allow minus, anyway
-	\d{2}:\d{2}(:\d{2})?\s*
-	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/inox =~ str
-      e = _parse(str, false)
-      if $1.size < 4
-	if e[:year] < 50
-	  e[:year] += 2000
-	elsif e[:year] < 1000
-	  e[:year] += 1900
-	end
-      end
-      e
-    end
-  end
-
-  class << self; alias_method :_rfc822, :_rfc2822 end
-
-  def self._httpdate(str) # :nodoc:
-    if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
-	\d{2}\s+
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	-?\d{4}\s+ # allow minus, anyway
-	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/inox =~ str
-      _rfc2822(str)
-    elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
-	\d{2}\s*-\s*
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
-	\d{2}\s+
-	\d{2}:\d{2}:\d{2}\s+
-	gmt\s*\z/inox =~ str
-      _parse(str)
-    elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
-	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
-	\d{1,2}\s+
-	\d{2}:\d{2}:\d{2}\s+
-	\d{4}\s*\z/inox =~ str
-      _parse(str)
-    end
-  end
-
-  def self._jisx0301(str) # :nodoc:
-    if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
-	(t
-	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
-	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/inx =~ str
-      if /\A\s*\d/ =~ str
-	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
-      else
-	_parse(str)
-      end
+  def self.zone_to_diff(zone) # :nodoc:
+    zone = zone.downcase
+    if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+      dst = $1 == 'daylight'
     else
-      _iso8601(str)
+      dst = zone.sub!(/\s+dst\z/, '')
     end
-  end
-
-  t = Module.new do
-
-    private
-
-    def zone_to_diff(zone) # :nodoc:
-      zone = zone.downcase
-      if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
-	dst = $1 == 'daylight'
+    if Format::ZONES.include?(zone)
+      offset = Format::ZONES[zone]
+      offset += 3600 if dst
+    elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+      sign = $1
+      if zone.include?(':')
+	hour, min, sec, = zone.split(':')
+      elsif zone.include?(',') || zone.include?('.')
+	hour, fr, = zone.split(/[,.]/)
+	min = Rational(fr.to_i, 10**fr.size) * 60
       else
-	dst = zone.sub!(/\s+dst\z/, '')
-      end
-      if Format::ZONES.include?(zone)
-	offset = Format::ZONES[zone]
-	offset += 3600 if dst
-      elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
-	sign = $1
-	if zone.include?(':')
-	  hour, min, sec, = zone.split(':')
-	elsif zone.include?(',') || zone.include?('.')
-	  hour, fr, = zone.split(/[,.]/)
-	  min = Rational(fr.to_i, 10**fr.size) * 60
+	case zone.size
+	when 3
+	  hour = zone[0,1]
+	  min = zone[1,2]
 	else
-	  case zone.size
-	  when 3
-	    hour = zone[0,1]
-	    min = zone[1,2]
-	  else
-	    hour = zone[0,2]
-	    min = zone[2,2]
-	    sec = zone[4,2]
-	  end
+	  hour = zone[0,2]
+	  min = zone[2,2]
+	  sec = zone[4,2]
 	end
-	offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
-	offset *= -1 if sign == '-'
       end
-      offset
+      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+      offset *= -1 if sign == '-'
     end
-
+    offset
   end
 
-  extend  t
-  include t
-
 end
 
 class DateTime < Date
@@ -1282,12 +1163,13 @@ class DateTime < Date
     super(str, fmt)
   end
 
+=begin
   def iso8601_timediv(n) # :nodoc:
     strftime('T%T' +
 	     if n < 1
 	       ''
 	     else
-	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+	       '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
 	     end +
 	     '%:z')
   end
@@ -1300,10 +1182,9 @@ class DateTime < Date
 
   def rfc3339(n=0) iso8601(n) end
 
-  def xmlschema(n=0) iso8601(n) end # :nodoc:
-
   def jisx0301(n=0)
     super() + iso8601_timediv(n)
   end
+=end
 
 end
diff --git a/lib/date2.rb b/lib/date2.rb
new file mode 100644
index 0000000000..f7da78f650
--- /dev/null
+++ b/lib/date2.rb
@@ -0,0 +1,5 @@
+# date2 was overridden by date.
+# To be precise, date was overridden by date2,
+# and date2 was renamed to date.
+
+require 'date'
diff --git a/lib/debug.rb b/lib/debug.rb
index 8a2f4f1a12..9ae119f8fb 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -2,8 +2,6 @@
 # Copyright (C) 2000  Information-technology Promotion Agency, Japan
 # Copyright (C) 2000-2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
-require 'continuation'
-
 if $SAFE > 0
   STDERR.print "-r debug.rb is not available in safe mode\n"
   exit 1
@@ -21,6 +19,45 @@ end
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 class DEBUGGER__
+class Mutex
+  def initialize
+    @locker = nil
+    @waiting = []
+    @locked = false;
+  end
+
+  def locked?
+    @locked
+  end
+
+  def lock
+    return if Thread.critical
+    return if @locker == Thread.current
+    while (Thread.critical = true; @locked)
+      @waiting.push Thread.current
+      Thread.stop
+    end
+    @locked = true
+    @locker = Thread.current
+    Thread.critical = false
+    self
+  end
+
+  def unlock
+    return if Thread.critical
+    return unless @locked
+    unless @locker == Thread.current
+      raise RuntimeError, "unlocked by other"
+    end
+    Thread.critical = true
+    t = @waiting.shift
+    @locked = false
+    @locker = nil
+    Thread.critical = false
+    t.run if t
+    self
+  end
+end
 MUTEX = Mutex.new
 
 class Context
@@ -81,14 +118,13 @@ class Context
   end
 
   def check_suspend
-    while MUTEX.synchronize {
-	if @suspend_next
-	  DEBUGGER__.waiting.push Thread.current
-	  @suspend_next = false
-	  true
-	end
-      }
+    return if Thread.critical
+    while (Thread.critical = true; @suspend_next)
+      DEBUGGER__.waiting.push Thread.current
+      @suspend_next = false
+      Thread.stop
     end
+    Thread.critical = false
   end
 
   def trace?
@@ -297,7 +333,7 @@ class Context
 	  if break_points.find{|b| b[1] == 0}
 	    n = 1
 	    stdout.print "Breakpoints:\n"
-	    break_points.each do |b|
+	    for b in break_points
 	      if b[0] and b[1] == 0
 		stdout.printf "  %d %s:%s\n", n, b[2], b[3] 
 	      end
@@ -593,6 +629,7 @@ EOHELP
   def display_list(b, e, file, line)
     stdout.printf "[%d, %d] in %s\n", b, e, file
     if lines = SCRIPT_LINES__[file] and lines != true
+      n = 0
       b.upto(e) do |n|
 	if n > 0 && lines[n-1]
 	  if n == line
@@ -753,12 +790,13 @@ class << DEBUGGER__
   end
 
   def set_trace( arg )
-    MUTEX.synchronize do
-      make_thread_list
-      for th, in @thread_list
-	context(th).set_trace arg
-      end
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      context(th).set_trace arg
     end
+    Thread.critical = saved_crit
     arg
   end
 
@@ -767,29 +805,31 @@ class << DEBUGGER__
   end
 
   def suspend
-    MUTEX.synchronize do
-      make_thread_list
-      for th, in @thread_list
-	next if th == Thread.current
-	context(th).set_suspend
-      end
-    end
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      next if th == Thread.current
+      context(th).set_suspend
+    end
+    Thread.critical = saved_crit
     # Schedule other threads to suspend as soon as possible.
-    Thread.pass
+    Thread.pass unless Thread.critical
   end
 
   def resume
-    MUTEX.synchronize do
-      make_thread_list
-      @thread_list.each do |th,|
-	next if th == Thread.current
-	context(th).clear_suspend
-      end
-      waiting.each do |th|
-	th.run
-      end
-      waiting.clear
-    end
+    saved_crit = Thread.critical
+    Thread.critical = true
+    make_thread_list
+    for th, in @thread_list
+      next if th == Thread.current
+      context(th).clear_suspend
+    end
+    waiting.each do |th|
+      th.run
+    end
+    waiting.clear
+    Thread.critical = saved_crit
     # Schedule other threads to restart as soon as possible.
     Thread.pass
   end
@@ -807,7 +847,7 @@ class << DEBUGGER__
   end
 
   def get_thread(num)
-    th = @thread_list.key(num)
+    th = @thread_list.index(num)
     unless th
       @stdout.print "No thread ##{num}\n"
       throw :debug_error
@@ -904,7 +944,4 @@ stdout.printf "Emacs support available.\n\n"
 set_trace_func proc { |event, file, line, id, binding, klass, *rest|
   DEBUGGER__.context.trace_func event, file, line, id, binding, klass
 }
-RubyVM::InstructionSequence.compile_option = {
-  trace_instruction: true
-}
 end
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 629753fe3a..bd2b5e4813 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -95,15 +95,15 @@
 #    class SimpleDelegator < Delegator
 #      def initialize(obj)
 #        super             # pass obj to Delegator constructor, required
-#        @delegate_sd_obj = obj    # store obj for future use
+#        @_sd_obj = obj    # store obj for future use
 #      end
 # 
 #      def __getobj__
-#        @delegate_sd_obj          # return object we are delegating to, required
+#        @_sd_obj          # return object we are delegating to, required
 #      end
 # 
 #      def __setobj__(obj)
-#        @delegate_sd_obj = obj    # change delegation object, a feature we're providing
+#        @_sd_obj = obj    # change delegation object, a feature we're providing
 #      end
 # 
 #      # ...
@@ -115,102 +115,76 @@
 # implementation, see SimpleDelegator.
 #
 class Delegator
-  preserved = [
-    :__id__, :object_id, :__send__, :public_send, :respond_to?, :send,
-    :instance_eval, :instance_exec, :extend,
-  ]
-  instance_methods.each do |m|
-    next if preserved.include?(m)
-    undef_method m
-  end
+  IgnoreBacktracePat = %r"\A#{Regexp.quote(__FILE__)}:\d+:in `"
 
-  module MethodDelegation
-    #
-    # Pass in the _obj_ to delegate method calls to.  All methods supported by
-    # _obj_ will be delegated to.
-    #
-    def initialize(obj)
-      __setobj__(obj)
+  #
+  # Pass in the _obj_ to delegate method calls to.  All methods supported by
+  # _obj_ will be delegated to.
+  #
+  def initialize(obj)
+    preserved = ::Kernel.public_instance_methods(false)
+    preserved -= ["to_s","to_a","inspect","==","=~","==="]
+    for t in self.class.ancestors
+      preserved |= t.public_instance_methods(false)
+      preserved |= t.private_instance_methods(false)
+      preserved |= t.protected_instance_methods(false)
+      break if t == Delegator
     end
-
-    # Handles the magic of delegation through \_\_getobj\_\_.
-    def method_missing(m, *args, &block)
+    preserved << "singleton_method_added"
+    for method in obj.methods
+      next if preserved.include? method
       begin
-        target = self.__getobj__
-        unless target.respond_to?(m)
-          super(m, *args, &block)
-        else
-          target.__send__(m, *args, &block)
-        end
-      rescue Exception
-        $@.delete_if{|s| %r"\A#{__FILE__}:\d+:in `method_missing'\z"o =~ s}
-        ::Kernel::raise
+	eval <<-EOS, nil, __FILE__, __LINE__+1
+	  def self.#{method}(*args, &block)
+	    begin
+	      __getobj__.__send__(:#{method}, *args, &block)
+	    ensure
+	      $@.delete_if{|s|IgnoreBacktracePat=~s} if $@
+	    end
+	  end
+	EOS
+      rescue SyntaxError
+        raise NameError, "invalid identifier %s" % method, caller(4)
       end
     end
+  end
+  alias initialize_methods initialize
 
-    # 
-    # Checks for a method provided by this the delegate object by fowarding the 
-    # call through \_\_getobj\_\_.
-    # 
-    def respond_to?(m, include_private = false)
-      return true if super
-      return self.__getobj__.respond_to?(m, include_private)
-    end
-
-    # 
-    # Returns true if two objects are considered same.
-    # 
-    def ==(obj)
-      return true if obj.equal?(self)
-      self.__getobj__ == obj
-    end
-
-    # 
-    # Returns true only if two objects are identical.
-    # 
-    def equal?(obj)
-      self.object_id == obj.object_id
-    end
-
-    #
-    # This method must be overridden by subclasses and should return the object
-    # method calls are being delegated to.
-    #
-    def __getobj__
-      raise NotImplementedError, "need to define `__getobj__'"
+  # Handles the magic of delegation through \_\_getobj\_\_.
+  def method_missing(m, *args)
+    target = self.__getobj__
+    unless target.respond_to?(m)
+      super(m, *args)
     end
+    target.__send__(m, *args)
+  end
 
-    #
-    # This method must be overridden by subclasses and change the object delegate
-    # to _obj_.
-    #
-    def __setobj__(obj)
-      raise NotImplementedError, "need to define `__setobj__'"
-    end
+  # 
+  # Checks for a method provided by this the delegate object by fowarding the 
+  # call through \_\_getobj\_\_.
+  # 
+  def respond_to?(m, include_private = false)
+    return true if super
+    return self.__getobj__.respond_to?(m, include_private)
+  end
 
-    # Serialization support for the object returned by \_\_getobj\_\_.
-    def marshal_dump
-      __getobj__
-    end
-    # Reinitializes delegation from a serialized object.
-    def marshal_load(obj)
-      __setobj__(obj)
-    end
+  #
+  # This method must be overridden by subclasses and should return the object
+  # method calls are being delegated to.
+  #
+  def __getobj__
+    raise NotImplementedError, "need to define `__getobj__'"
+  end
 
-    # Clone support for the object returned by \_\_getobj\_\_.
-    def clone
-      new = super
-      new.__setobj__(__getobj__.clone)
-      new
-    end
-    # Duplication support for the object returned by \_\_getobj\_\_.
-    def dup
-      new = super
-      new.__setobj__(__getobj__.dup)
-      new
-    end
+  # Serialization support for the object returned by \_\_getobj\_\_.
+  def marshal_dump
+    __getobj__
+  end
+  # Reinitializes delegation from a serialized object.
+  def marshal_load(obj)
+    initialize_methods(obj)
+    __setobj__(obj)
   end
-  include MethodDelegation
 end
 
 #
@@ -220,9 +194,16 @@ end
 # \_\_setobj\_\_ .
 #
 class SimpleDelegator<Delegator
+
+  # Pass in the _obj_ you would like to delegate method calls to.
+  def initialize(obj)
+    super
+    @_sd_obj = obj
+  end
+
   # Returns the current object method calls are being delegated to.
   def __getobj__
-    @delegate_sd_obj
+    @_sd_obj
   end
 
   #
@@ -241,22 +222,27 @@ class SimpleDelegator<Delegator
   #
   def __setobj__(obj)
     raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
-    @delegate_sd_obj = obj
+    @_sd_obj = obj
   end
-end
 
-# :stopdoc:
-def Delegator.delegating_block(mid)
-  lambda do |*args, &block|
-    begin
-      @delegate_dc_obj.__send__(mid, *args, &block)
-    rescue
-      re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o
-      $!.backtrace.delete_if {|t| re =~ t}
-      raise
-    end
+  # Clone support for the object returned by \_\_getobj\_\_.
+  def clone
+    new = super
+    new.__setobj__(__getobj__.clone)
+    new
+  end
+  # Duplication support for the object returned by \_\_getobj\_\_.
+  def dup
+    new = super
+    new.__setobj__(__getobj__.clone)
+    new
   end
 end
+
+# :stopdoc:
+# backward compatibility ^_^;;;
+Delegater = Delegator
+SimpleDelegater = SimpleDelegator
 # :startdoc:
 
 #
@@ -272,25 +258,53 @@ end
 def DelegateClass(superclass)
   klass = Class.new
   methods = superclass.public_instance_methods(true)
-  methods -= [
-    :__id__, :object_id, :__send__, :public_send, :respond_to?, :send,
-    :==, :equal?, :initialize, :method_missing, :__getobj__, :__setobj__,
-    :clone, :dup, :marshal_dump, :marshal_load, :instance_eval, :instance_exec,
-    :extend,
-  ]
+  methods -= ::Kernel.public_instance_methods(false)
+  methods |= ["to_s","to_a","inspect","==","=~","==="]
   klass.module_eval {
-    include Delegator::MethodDelegation
+    def initialize(obj)  # :nodoc:
+      @_dc_obj = obj
+    end
+    def method_missing(m, *args)  # :nodoc:
+      unless @_dc_obj.respond_to?(m)
+        super(m, *args)
+      end
+      @_dc_obj.__send__(m, *args)
+    end
+    def respond_to?(m, include_private = false)  # :nodoc:
+      return true if super
+      return @_dc_obj.respond_to?(m, include_private)
+    end
     def __getobj__  # :nodoc:
-      @delegate_dc_obj
+      @_dc_obj
     end
     def __setobj__(obj)  # :nodoc:
       raise ArgumentError, "cannot delegate to self" if self.equal?(obj)
-      @delegate_dc_obj = obj
+      @_dc_obj = obj
+    end
+    def clone  # :nodoc:
+      new = super
+      new.__setobj__(__getobj__.clone)
+      new
+    end
+    def dup  # :nodoc:
+      new = super
+      new.__setobj__(__getobj__.clone)
+      new
     end
   }
-  klass.module_eval do
-    methods.each do |method|
-      define_method(method, Delegator.delegating_block(method))
+  for method in methods
+    begin
+      klass.module_eval <<-EOS, __FILE__, __LINE__+1
+        def #{method}(*args, &block)
+	  begin
+	    @_dc_obj.__send__(:#{method}, *args, &block)
+	  ensure
+	    $@.delete_if{|s| ::Delegator::IgnoreBacktracePat =~ s} if $@
+	  end
+	end
+      EOS
+    rescue SyntaxError
+      raise NameError, "invalid identifier %s" % method, caller(3)
     end
   end
   return klass
@@ -309,23 +323,15 @@ if __FILE__ == $0
   p ary.class
   ary.push 25
   p ary
-  ary.push 42
-  ary.each {|x| p x}
 
   foo = Object.new
   def foo.test
     25
   end
-  def foo.iter
-    yield self
-  end
   def foo.error
     raise 'this is OK'
   end
   foo2 = SimpleDelegator.new(foo)
-  p foo2
-  foo2.instance_eval{print "foo\n"}
   p foo.test == foo2.test	# => true
-  p foo2.iter{[55,true]}        # => true
   foo2.error			# raise error!
 end
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 0e6212838e..20e658e611 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1476,10 +1476,10 @@ module DRb
       raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class
       raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
       
-      if obj.private_methods.include?(msg_id)
+      if obj.private_methods.include?(msg_id.to_s)
 	desc = any_to_s(obj)
         raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
-      elsif obj.protected_methods.include?(msg_id)
+      elsif obj.protected_methods.include?(msg_id.to_s)
 	desc = any_to_s(obj)
         raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
       else
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index af52250518..7da8130c2b 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -4,21 +4,16 @@
 =end
 
 require 'drb/drb'
-require 'monitor'
 
 module DRb
   class ExtServ
-    include MonitorMixin
     include DRbUndumped
 
     def initialize(there, name, server=nil)
-      super()
       @server = server || DRb::primary_server
       @name = name
       ro = DRbObject.new(nil, there)
-      synchronize do
-        @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
-      end
+      @invoker = ro.regist(name, DRbObject.new(self, @server.uri))
     end
     attr_reader :server
 
@@ -27,13 +22,11 @@ module DRb
     end
 
     def stop_service
-      synchronize do
-        @invoker.unregist(@name)
-        server = @server
-        @server = nil
-        server.stop_service
-        true
-      end
+      @invoker.unregist(@name)
+      server = @server
+      @server = nil
+      server.stop_service
+      true
     end
 
     def alive?
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index 7da8ace88d..412b2ab9b5 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -20,6 +20,8 @@ module DRb
           end
           if jump_error
             case jump_error.reason
+            when :retry
+              retry
             when :break
               break(jump_error.exit_value)
             else
diff --git a/lib/e2mmap.rb b/lib/e2mmap.rb
index b8d1d44f38..3e2604af5d 100644
--- a/lib/e2mmap.rb
+++ b/lib/e2mmap.rb
@@ -2,6 +2,7 @@
 #   e2mmap.rb - for ruby 1.1
 #   	$Release Version: 2.0$
 #   	$Revision: 1.10 $
+#   	$Date: 1999/02/17 12:33:17 $
 #   	by Keiju ISHITSUKA
 #
 # --
@@ -47,6 +48,8 @@
 #   Foo.Fail ExistingExceptionClass, arg...
 #
 #
+fail "Use Ruby 1.1" if VERSION < "1.1"
+
 module Exception2MessageMapper
   @RCS_ID='-$Id: e2mmap.rb,v 1.10 1999/02/17 12:33:17 keiju Exp keiju $-'
 
@@ -54,9 +57,15 @@ module Exception2MessageMapper
 
   def E2MM.extend_object(cl)
     super
-    cl.bind(self) unless cl < E2MM
+    cl.bind(self) unless cl == E2MM
   end
   
+  # backward compatibility
+  def E2MM.extend_to(b)
+    c = eval("self", b)
+    c.extend(self)
+  end
+
   def bind(cl)
     self.module_eval %[
       def Raise(err = nil, *rest)
@@ -78,8 +87,21 @@ module Exception2MessageMapper
     E2MM.Raise(self, err, *rest)
   end
   alias Fail Raise
-  alias fail Raise
 
+  # backward compatibility
+  alias fail! fail
+  def fail(err = nil, *rest)
+    begin 
+      E2MM.Fail(self, err, *rest)
+    rescue E2MM::ErrNotRegisteredException
+      super
+    end
+  end
+  class << self
+    public :fail
+  end
+
+  
   # def_e2message(c, m)
   #	    c:  exception
   #	    m:  message_form
@@ -105,7 +127,7 @@ module Exception2MessageMapper
   # {[class, exp] => message, ...}
   @MessageMap = {}
 
-  # E2MM.def_e2message(k, e, m)
+  # E2MM.def_exception(k, e, m)
   #	    k:  class to define exception under.
   #	    e:  exception
   #	    m:  message_form
@@ -137,11 +159,12 @@ module Exception2MessageMapper
   #
   def E2MM.Raise(klass = E2MM, err = nil, *rest)
     if form = e2mm_message(klass, err)
-      b = $@.nil? ? caller(1) : $@
+      $! = err.new(sprintf(form, *rest))
+      $@ = caller(1) if $@.nil?
       #p $@
       #p __FILE__
-      b.shift if b[0] =~ /^#{Regexp.quote(__FILE__)}:/
-      raise err, sprintf(form, *rest), b
+      $@.shift if $@[0] =~ /^#{Regexp.quote(__FILE__)}:/
+      raise
     else
       E2MM.Fail E2MM, ErrNotRegisteredException, err.inspect
     end
diff --git a/lib/erb.rb b/lib/erb.rb
index c879941284..f1661f98cb 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -236,11 +236,11 @@
 # Rails, the web application framework, uses ERB to create views.
 #
 class ERB
-  Revision = '$Date::                           $' 	#'
+  Revision = '$Date$' 	#'
 
   # Returns revision information for the erb.rb module.
   def self.version
-    "erb.rb [2.0.4 #{ERB::Revision.split[1]}]"
+    "erb.rb [2.1.0 #{ERB::Revision.split[1]}]"
   end
 end
 
@@ -254,11 +254,13 @@ class ERB
       end
       attr_reader :value
       alias :to_s :value
+
+      def empty?
+        @value.empty?
+      end
     end
 
     class Scanner # :nodoc:
-      SplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
-
       @scanner_map = {}
       def self.regist_scanner(klass, trim_mode, percent)
 	@scanner_map[[trim_mode, percent]] = klass
@@ -283,8 +285,6 @@ class ERB
     end
 
     class TrimScanner < Scanner # :nodoc:
-      TrimSplitRegexp = /(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>\n)|(%>)|(\n)/
-
       def initialize(src, trim_mode, percent)
 	super
 	@trim_mode = trim_mode
@@ -304,13 +304,11 @@ class ERB
       def scan(&block)
 	@stag = nil
 	if @percent
-	  @src.each_line do |line|
+	  @src.each do |line|
 	    percent_line(line, &block)
 	  end
 	else
-	  @src.each_line do |line|
-	    @scan_line.call(line, &block)
-	  end
+          @scan_line.call(@src, &block)
 	end
 	nil
       end
@@ -329,57 +327,66 @@ class ERB
       end
 
       def scan_line(line)
-	line.split(SplitRegexp).each do |token|
-	  next if token.empty?
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            yield(token)
+          end
 	end
       end
 
       def trim_line1(line)
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  if token == "%>\n"
-	    yield('%>')
-	    yield(:cr)
-	    break
-	  end
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            if token == "%>\n"
+              yield('%>')
+              yield(:cr)
+            else
+              yield(token)
+            end
+          end
 	end
       end
 
       def trim_line2(line)
 	head = nil
-	line.split(TrimSplitRegexp).each do |token|
-	  next if token.empty?
-	  head = token unless head
-	  if token == "%>\n"
-	    yield('%>')
-	    if  is_erb_stag?(head)
-	      yield(:cr)
-	    else
-	      yield("\n")
-	    end
-	    break
-	  end
-	  yield(token)
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            head = token unless head
+            if token == "%>\n"
+              yield('%>')
+              if is_erb_stag?(head)
+                yield(:cr)
+              else
+                yield("\n")
+              end
+              head = nil
+            else
+              yield(token)
+              head = nil if token == "\n"
+            end
+          end
 	end
       end
 
-      ExplicitTrimRegexp = /(^[ \t]*<%-)|(-%>\n?\z)|(<%-)|(-%>)|(<%%)|(%%>)|(<%=)|(<%#)|(<%)|(%>)|(\n)/
       def explicit_trim_line(line)
-	line.split(ExplicitTrimRegexp).each do |token|
-	  next if token.empty?
-	  if @stag.nil? && /[ \t]*<%-/ =~ token
-	    yield('<%')
-	  elsif @stag && /-%>\n/ =~ token
-	    yield('%>')
-	    yield(:cr)
-	  elsif @stag && token == '-%>'
-	    yield('%>')
-	  else
-	    yield(token)
-	  end
-	end
+        line.scan(/(.*?)(^[ \t]*<%\-|<%\-|<%%|%%>|<%=|<%#|<%|-%>\n|-%>|%>|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            if @stag.nil? && /[ \t]*<%-/ =~ token
+              yield('<%')
+            elsif @stag && token == "-%>\n"
+              yield('%>')
+              yield(:cr)
+            elsif @stag && token == '-%>'
+              yield('%>')
+            else
+              yield(token)
+            end
+          end
+        end
       end
 
       ERB_STAG = %w(<%= <%# <%)
@@ -392,11 +399,11 @@ class ERB
 
     class SimpleScanner < Scanner # :nodoc:
       def scan
-	@src.each_line do |line|
-	  line.split(SplitRegexp).each do |token|
-	    next if token.empty?
-	    yield(token)
-	  end
+        @src.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>|\n|\z)/m) do |tokens|
+          tokens.each do |token|
+            next if token.empty?
+            yield(token)
+          end
 	end
       end
     end
@@ -407,43 +414,47 @@ class ERB
       require 'strscan'
       class SimpleScanner2 < Scanner # :nodoc:
         def scan
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
+          etag_reg = /(.*?)(%%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
             scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
-            elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
+            yield(scanner[1])
+            yield(scanner[2])
           end
         end
       end
       Scanner.regist_scanner(SimpleScanner2, nil, false)
 
       class PercentScanner < Scanner # :nodoc:
-	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|%>|\n|\z)/
+	def scan(&blk)
+          stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m
+          etag_reg = /(.*?)(%%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
-	    if new_line && @stag.nil?
-	      if scanner.scan(/%%/)
-		yield('%')
-		new_line = false
-		next
-	      elsif scanner.scan(/%/)
-		yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
-		next
-	      end
-	    end
 	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
+            yield(scanner[1])
+
             elem = scanner[2]
-            yield(text) unless text.empty?
-            yield(elem) unless elem.empty?
-	    new_line = (elem == "\n")
+            if elem == '%%'
+              yield('%')
+              inline_scan(scanner.scan(/.*?(\n|\z)/), &blk)
+            elsif elem == '%'
+              yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp))
+            else
+              yield(elem)
+            end
+          end
+        end
+
+        def inline_scan(line)
+          stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m
+          etag_reg = /(.*?)(%%>|%>|\z)/m
+          scanner = StringScanner.new(line)
+          while ! scanner.eos?
+            scanner.scan(@stag ? etag_reg : stag_reg)
+            yield(scanner[1])
+            yield(scanner[2])
           end
         end
       end
@@ -451,31 +462,21 @@ class ERB
 
       class ExplicitScanner < Scanner # :nodoc:
 	def scan
-	  new_line = true
-          stag_reg = /(.*?)(<%%|<%=|<%#|<%-|<%|\n|\z)/
-          etag_reg = /(.*?)(%%>|-%>|%>|\n|\z)/
+          stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m
+          etag_reg = /(.*?)(%%>|-%>|%>|\z)/m
           scanner = StringScanner.new(@src)
           while ! scanner.eos?
-	    if new_line && @stag.nil? && scanner.scan(/[ \t]*<%-/)
-	      yield('<%')
-	      new_line = false
-	      next
-	    end
 	    scanner.scan(@stag ? etag_reg : stag_reg)
-            text = scanner[1]
+            yield(scanner[1])
+
             elem = scanner[2]
-	    new_line = (elem == "\n")
-            yield(text) unless text.empty?
-	    if elem == '-%>'
+            if /[ \t]*<%-/ =~ elem
+              yield('<%')
+            elsif elem == '-%>'
 	      yield('%>')
-	      if scanner.scan(/(\n|\z)/)
-		yield(:cr)
-		new_line = true
-	      end
-	    elsif elem == '<%-'
-	      yield('<%')
+	      yield(:cr) if scanner.scan(/(\n|\z)/)
 	    else
-	      yield(elem) unless elem.empty?
+	      yield(elem)
 	    end
           end
         end
@@ -486,10 +487,10 @@ class ERB
     end
 
     class Buffer # :nodoc:
-      def initialize(compiler, enc=nil)
+      def initialize(compiler)
 	@compiler = compiler
 	@line = []
-        @script = enc ? "#coding:#{enc.to_s}\n" : ""
+	@script = ""
 	@compiler.pre_cmd.each do |x|
 	  push(x)
 	end
@@ -516,16 +517,27 @@ class ERB
       end
     end
 
+    def content_dump(s)
+      n = s.count("\n")
+      if n > 0
+        s.dump + "\n" * n
+      else
+        s.dump
+      end
+    end
+
     def compile(s)
-      out = Buffer.new(self, s.encoding)
+      out = Buffer.new(self)
 
       content = ''
-      scanner = make_scanner(s.dup.force_encoding("ASCII-8BIT"))
+      scanner = make_scanner(s)
       scanner.scan do |token|
+        next if token.nil? 
+        next if token == ''
 	if scanner.stag.nil?
 	  case token
           when PercentLine
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0
+	    out.push("#{@put_cmd} #{content_dump(content)}") if content.size > 0
 	    content = ''
             out.push(token.to_s)
             out.cr
@@ -533,12 +545,11 @@ class ERB
 	    out.cr
 	  when '<%', '<%=', '<%#'
 	    scanner.stag = token
-	    out.push("#{@put_cmd} #{content.dump}") if content.size > 0